diff -r TNG/addnewacct.php TNG1403/addnewacct.php
2,3d1
< include("begin.php");
< include($cms['tngpath'] . "genlib.php");
5c3,4
< include($cms['tngpath'] . "$languages_path$language/text.php");
---
> include("tng_begin.php");
> 
7d5
< include($cms['tngpath'] . "getlang.php");
21c19
< eval("\$email = \$$emailfield;");
---
> $email = $$emailfield;
90c88
< $dt_consented = $tng_user_consent ? $today : "";
---
> $dt_consented = !empty($tng_user_consent) ? $today : "";
111c109
< 	$gedcom = $assignedtree ? $assignedtree : "";
---
> 	$gedcom = !empty($assignedtree) ? $assignedtree : "";
diff -r TNG/admin_add2albumxml.php TNG1403/admin_add2albumxml.php
15a16,17
> 	$curpage = 0;
> 	$pagenav = $prevlink = $firstlink = $lastlink = $nextlink = "";
56c58
< if( $searchtree )
---
> if( !empty($searchtree) )
60c62
< if( $fileext )
---
> if( !empty($fileext) )
62c64
< if( $hsstat )
---
> if( !empty($hsstat) )
64c66
< if( $cemeteryID )
---
> if( !empty($cemeteryID) )
79c81
< $query = "SELECT $media_table.mediaID as mediaID, $medialinkID description, notes, thumbpath, mediatypeID, usecollfolder, datetaken, $media_table.gedcom FROM $media_table $join $wherestr ORDER BY description LIMIT $newoffset" . $maxsearchresults;
---
> $query = "SELECT $media_table.mediaID as mediaID, description, notes, thumbpath, mediatypeID, usecollfolder, datetaken, $media_table.gedcom FROM $media_table $wherestr ORDER BY description LIMIT $newoffset" . $maxsearchresults;
84c86
< 	$query = "SELECT count($media_table.mediaID) as mcount FROM $media_table $join $wherestr";
---
> 	$query = "SELECT count($media_table.mediaID) as mcount FROM $media_table $wherestr";
93c95
< if($albumID) {
---
> if( !empty($albumID) ) {
123a126
> 		$label = $mediatypes_display[$mtypeID] ? $mediatypes_display[$mtypeID] : $text[$mtypeID];
145c148
< 			echo "<a href=\"admin_editmedia.php?mediaID={$row['mediaID']}\" target=\"_blank\"><img border=0 src=\"$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" $size[3]></a>\n";
---
> 			echo "<a href=\"admin_editmedia.php?mediaID={$row['mediaID']}\" target=\"_blank\"><img class=\"adminthumb\" src=\"$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" $size[3]></a>\n";
154c157
< 		echo "<td class=\"lightback\" valign=\"top\"><span class=\"normal\" id=\"mtype_{$row['mediaID']}\">" . $text[$mtypeID] . "&nbsp;</span></td>\n";
---
> 		echo "<td class=\"lightback\" valign=\"top\"><span class=\"normal\" id=\"mtype_{$row['mediaID']}\">" . $label . "&nbsp;</span></td>\n";
diff -r TNG/admin_addalbum.php TNG1403/admin_addalbum.php
27c27
< if( !$alwayson ) $alwayson = 0;
---
> if( empty($alwayson) ) $alwayson = 0;
32a33
> $_SESSION['albumcount'] = isset($_SESSION['albumcount']) ? $_SESSION['albumcount'] + 1 : 1;
diff -r TNG/admin_addassoc.php TNG1403/admin_addassoc.php
7a8
> $admin_login = 1;
26a28
> $passocID = strtoupper($passocID);
32c34
< if($revassoc) {
---
> if(!empty($revassoc)) {
41,42c43,44
< 	$query = "SELECT firstname, lastname, lnprefix, nameorder, prefix, suffix FROM $people_table
< 		WHERE personID=\"$passocID\" AND gedcom=\"$tree\"";
---
> 	$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, title, sex, nameorder, living, private, branch, birthdate, birthdatetr, altbirthdatetr, deathdate
> 		FROM $people_table WHERE personID=\"$passocID\" AND gedcom=\"$tree\"";
diff -r TNG/admin_addbranch.php TNG1403/admin_addbranch.php
27c27
< if(!$dospouses)
---
> if( empty($dospouses) )
36c36
< 	adminwritelog( $admtext['addnewbranch'] . " : $gedcom/$description" );
---
> 	adminwritelog( $admtext['addnewbranch'] . " : $tree/$description" );
42c42
< if($submitx) {
---
> if( !empty($submitx) ) {
diff -r TNG/admin_addcitation.php TNG1403/admin_addcitation.php
7a8
> $admin_login = 1;
37,45d37
< $query = "INSERT INTO $citations_table (gedcom, persfamID, eventID, sourceID, page, quay, citedate, citedatetr, citetext, note, description, ordernum)  
< 	VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?,'', 999)";
< $params = array(&$template,&$tree, &$persfamID, &$eventID, &$sourceID, &$citepage, &$quay, &$citedate, &$citedatetr, &$citetext, &$citenote);
< tng_execute($query,$params);
< $citationID = tng_insert_id();
< 
< $_SESSION['lastcite'] = $tree . "|" . $citationID;
< 
< adminwritelog( $admtext['addnewcite'] . ": $citationID/$tree/$persfamID/$eventID/$sourceID" );
49d40
< $row = tng_fetch_assoc($result);
51,55c42,68
< $citationsrc = "[$sourceID] " . $row['title'];
< $citationsrc = cleanIt($citationsrc);
< $truncated = truncateIt($citationsrc,75);
< header("Content-type:text/html; charset=" . $session_charset);
< echo "{\"id\":\"$citationID\",\"persfamID\":\"$persfamID\",\"tree\":\"$tree\",\"eventID\":\"$eventID\",\"display\":\"$truncated\",\"allow_edit\":$allow_edit,\"allow_delete\":$allow_delete}";
---
> if ($row = tng_fetch_assoc($result)) {
> 	header("Content-type:text/html; charset=" . $session_charset);
> 	$returnvals = "";
> 	if(!isset($events)) $events = [$eventID];
> 	foreach($events as $event) {
> 		$query = "INSERT INTO $citations_table (gedcom, persfamID, eventID, sourceID, page, quay, citedate, citedatetr, citetext, note, description, ordernum)  
> 			VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?,'', 999)";
> 		$params = array(&$template,&$tree, &$persfamID, &$event, &$sourceID, &$citepage, &$quay, &$citedate, &$citedatetr, &$citetext, &$citenote);
> 		tng_execute($query,$params);
> 		$citationID = tng_insert_id();
> 		
> 		$_SESSION['lastcite'] = $tree . "|" . $citationID;
> 		adminwritelog( $admtext['addnewcite'] . ": $citationID/$tree/$persfamID/$event/$sourceID" );
> 		
> 		$citationsrc = "[$sourceID] " . $row['title'];
> 		$citationsrc = cleanIt($citationsrc);
> 		$truncated = truncateIt($citationsrc,75);
> 		if($returnvals) $returnvals .= ",";
> 		$returnvals .= "{\"id\":\"$citationID\",\"persfamID\":\"$persfamID\",\"tree\":\"$tree\",\"eventID\":\"$event\",\"display\":\"$truncated\",\"allow_edit\":$allow_edit,\"allow_delete\":$allow_delete}";
> 	}
> 	echo "[{$returnvals}]";
> }
> else {
> 	header("Content-type:text/html; charset=" . $session_charset);
> 	echo "[{\"display\":\"[$sourceID] - Not a Valid Source - CITATION NOT ADDED!\"}]";
> }
> tng_free_result($result);
diff -r TNG/admin_addcollection.php TNG1403/admin_addcollection.php
7a8
> $admin_login = 1;
diff -r TNG/admin_add_dna_group.php TNG1403/admin_add_dna_group.php
1,32c1,30
< <?php
< include("begin.php");
< include("adminlib.php");
< //$textpart = "dna";
< //include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< $admin_login = 1;
< include("checklogin.php");
< 
< if( !$allow_add ) {
< 	$message = $admtext['norights'];
< 	header( "Location: admin_login.php?message=" . urlencode($message) );
< 	exit;
< }
< 
< require("adminlog.php");
< 
< if (get_magic_quotes_gpc() == 0) {
< 	$dna_group = addslashes($dna_group);
< 	$test_type = addslashes($test_type);
< 	$description = addslashes($description);
< }
< 
< $query = "INSERT INTO $dna_groups_table (dna_group,test_type,gedcom,description,action) VALUES (\"$dna_group\",\"$test_type\",\"$tree\",\"$description\",\"2\")";
< $result = tng_query($query);
< $success = tng_affected_rows();
< 
< adminwritelog( $admtext['addgroup'] . " : $gedcom/$description" );
< 
< 	$message = $admtext['dna_group'] . " $description {$admtext['succadded']}.";
< 	header( "Location: admin_new_dna_group.php?message=$message&amp;test_type=$test_type&amp;tree=$tree" );
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "dna";
> //include("getlang.php");
> include("$mylanguage/admintext.php");
> 
> $admin_login = 1;
> include("checklogin.php");
> 
> if( !$allow_add ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> require("adminlog.php");
> 
> $dna_group = addslashes($dna_group);
> $test_type = addslashes($test_type);
> $description = addslashes($description);
> 
> $query = "INSERT INTO $dna_groups_table (dna_group,test_type,gedcom,description,action) VALUES (\"$dna_group\",\"$test_type\",\"$tree\",\"$description\",\"2\")";
> $result = tng_query($query);
> $success = tng_affected_rows();
> 
> adminwritelog( "<a href=\"admin_dna_groups.php\">{$admtext['addgroup']}: $dna_group</a>" );
> 
> 	$message = $admtext['dna_group'] . " $dna_group {$admtext['succadded']}.";
> 	header( "Location: admin_dna_groups.php?message=$message&amp;dna_group=$dna_group&amp;test_type=$test_type&amp;tree=$tree" );
diff -r TNG/admin_add_dna_test.php TNG1403/admin_add_dna_test.php
19c19
< $thumbpath = stripslashes($thumbpath);
---
> $thumbpath = isset($thumbpath) ? stripslashes($thumbpath) : "";
40a41
> if( !isset($dna_group) ) $dna_group = "";
48a50
> $match_date = convertDate( $match_date );
53,56c55,58
< $template = "sssssssssssssssssssssssss";
< $query = "INSERT IGNORE INTO $dna_tests_table (test_type, test_number, notes, vendor, test_date, personID, gedcom, urls, markers, y_results, hvr1_results, hvr2_results, person_name, confirmed, markeropt, notesopt, linksopt, surnamesopt, private_dna, dna_group, dna_group_desc, surnames, haplogroup, significant_snp, terminal_snp)
< 		VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
< $params = array(&$template,&$test_type, &$test_number, &$notes, &$vendor, &$test_date, &$personID, &$mynewgedcom, &$urls, &$markers, &$y_results, &$hvr1_results, &$hvr2_results, &$person_name, &$confirmed, &$markeropt, &$notesopt, &$linksopt, &$surnamesopt, &$private_dna, &$dna_group, &$dna_group_desc, &$surnames, &$haplogroup, &$signsnp, &$termsnp);
---
> $template = "sssssssssssssssssssssssssssss";
> $query = "INSERT IGNORE INTO $dna_tests_table (test_type, test_number, notes, vendor, test_date, match_date, personID, gedcom, urls, markers, y_results, hvr1_results, hvr2_results, person_name, ydna_confirmed, mtdna_confirmed,markeropt, notesopt, linksopt, surnamesopt, private_dna, private_test, dna_group, dna_group_desc, surnames, mtdna_haplogroup, ydna_haplogroup, significant_snp, terminal_snp)
> 		VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
> $params = array(&$template,&$test_type, &$test_number, &$notes, &$vendor, &$test_date, &$match_date, &$personID, &$mynewgedcom, &$urls, &$markers, &$y_results, &$hvr1_results, &$hvr2_results, &$person_name, &$ydna_confirmed, &$mtdna_confirmed, &$markeropt, &$notesopt, &$linksopt, &$surnamesopt, &$private_dna, &$private_test, &$dna_group, &$dna_group_desc, &$surnames, &$mtdna_haplogroup, &$ydna_haplogroup, &$signsnp, &$termsnp);
69c71
< 	adminwritelog( "<a href=\"admin_edit_dna_test.php?testID=$testID\">{$admtext['addnewtest']}: $testID</a>" );
---
> 	adminwritelog( "<a href=\"admin_edit_dna_test.php?testID=$testID\">{$admtext['addnewdna']}: $testID</a>" );
diff -r TNG/admin_addevent.php TNG1403/admin_addevent.php
7a8
> $admin_login = 1;
101c102
< adminwritelog( "$admtext[addnewevent]: $eventtypeID/$tree/$persfamID" );
---
> adminwritelog( $admtext['addnewevent'] . ": $eventtypeID/$tree/$persfamID" );
diff -r TNG/admin_addeventtype.php TNG1403/admin_addeventtype.php
7a8
> $admin_login = 1;
diff -r TNG/admin_addfamily.php TNG1403/admin_addfamily.php
13c13
< 	$message = "$admtext[norights]";
---
> 	$message = $admtext['norights'];
28a29,30
> if(!isset($newfamily)) $newfamily = "";
> if(!isset($cw)) $cw = "";
72c74
< $template = "sss";
---
> $template = "sssds";
75,76c77,78
< 	$query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,zoom,geoignore,temple) VALUES (?,?,\"0\",\"0\",\"0\",?)";
< 	$params = array(&$template,&$placetree,&$place,&$temple);
---
> 	$query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,zoom,geoignore,temple,changedate,changedby) VALUES (?,?,\"0\",\"0\",\"0\",?,?,?)";
> 	$params = array(&$template,&$placetree,&$place,&$temple,&$newdate,&$currentuser);
97c99
< 	$husborder = $husbrow['husborder'] + 1;
---
> 	$husborder = !empty($husbrow['husborder']) ? ($husbrow['husborder'] + 1) : 0;
116c118
< 	$wifeorder = $wiferow['wifeorder'] + 1;
---
> 	$wifeorder = !empty($wiferow['wifeorder']) ? ($wiferow['wifeorder'] + 1) : 0;
122,123c124,125
< $familyliving = ($living || $husbliving || $wifeliving) ? 1 : 0;
< if( !$private ) $private = 0;
---
> $familyliving = (!empty($living) || $husbliving || $wifeliving) ? 1 : 0;
> if( empty($private) ) $private = 0;
124a127
> $allbranches = "";
130c133
< else
---
> elseif(!empty($branch))
132d134
< if( !$allbranches ) $allbranches = "";
diff -r TNG/admin_addlanguage.php TNG1403/admin_addlanguage.php
34,35c34,40
< $message = $admtext['language'] . " $display {$admtext['succadded']}.";
< header( "Location: admin_languages.php?message=" . urlencode($message) );
---
> if( !empty($submitx) || !empty($message) ) {
> 	$message = $admtext['language'] . " $display {$admtext['succadded']}.";
> 	header( "Location: admin_languages.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_editlanguage.php?languageID=$languageID" );
> }
diff -r TNG/admin_addmedia.php TNG1403/admin_addmedia.php
34c34
< $treestr = $tngconfig['mediatrees'] ? $tree . "/" : "";
---
> $treestr = $tngconfig['mediatrees'] && $tree ? $tree . "/" : "";
37,82d36
< if( $newfile && $newfile != "none" ) {
< 	if( @move_uploaded_file($newfile, $newpath) )
< 		@chmod( $newpath, 0644 );
< 	else {
< 	//improper permissions or folder doesn't exist (root path may be wrong)
< 		$message = $admtext['notcopied'] . " $newpath {$admtext['improperpermissions']}.";
< 		header( "Location: admin_media.php?message=" . urlencode($message) );
< 		exit;
< 	}
< }
< 
< if( substr( $thumbpath, 0, 1 ) == "/" )
< 	$thumbpath = substr( $thumbpath, 1 );
< $newthumbpath = "$rootpath$usefolder/$treestr$thumbpath";
< 
< if( function_exists( 'imageJpeg' ) && $thumbcreate == "auto" ) {
< 	///$cleanpath = $session_charset == "UTF-8" ? utf8_decode($newpath) : $newpath;
< 	//$cleannewthumbpath = $session_charset == "UTF-8" ? utf8_decode($newthumbpath) : $newthumbpath;
< 	if( image_createThumb( $newpath, $newthumbpath, $thumbmaxw, $thumbmaxh, $thumbquality ) ) {
<         $destInfo  = pathInfo( $newthumbpath ); 
<         if( strtoupper( $destInfo['extension'] ) == "GIF" || strtoupper( $destInfo['extension'] ) == "PDF") {
<             $thumbpath = substr_replace( $thumbpath, 'jpg', -3 ); 
<             $newthumbpath = substr_replace( $newthumbpath, 'jpg', -3 ); 
< 		}
< 		@chmod( $newthumbpath, 0644 );
< 	}
< 	else {
< 	//could not create thumbnail (size or type problem) or permissions (root path may be wrong)
< 		$message = $admtext['thumbnailnotcopied'] . " $newthumbpath {$admtext['improper2']}.";
< 		header( "Location: admin_media.php?message=" . urlencode($message) );
< 		exit;
< 	}
< }
< else {
< 	if( $newthumb && $newthumb != "none" ) {
< 		if( @move_uploaded_file($newthumb, $newthumbpath) ) 
< 			@chmod( $newthumbpath, 0644 );
< 		else {
< 		//improper permissions or folder doesn't exist (root path may be wrong)
< 			$message = $admtext['thumbnailnotcopied'] . " $newthumbpath {$admtext['improperpermissions']}.";
< 			header( "Location: admin_media.php?message=" . urlencode($message) );
< 			exit;
< 		}
< 	}
< }
< 
97c51
< if($latitude && $longitude && !$zoom)
---
> if( !empty($latitude) && !empty($longitude) && empty($zoom) )
99c53
< if( $abspath )
---
> if( !empty($abspath) )
103,124c57,77
< if( !$showmap ) $showmap = "0";
< if( !$usenl ) $usenl = 0;
< if( !$alwayson ) $alwayson = 0;
< if( !$newwindow ) $newwindow = 0;
< if( !$usecollfolder ) $usecollfolder = 0;
< if( !$width ) $width = 0;
< if( !$height ) $height = 0;
< if( !$cemeteryID ) $cemeteryID = 0;
< if( !$linktocem ) $linktocem = 0;
< if( !$zoom ) $zoom = 0;
< 
< $fileparts = pathinfo( $path );
< $form = strtoupper( $fileparts['extension'] );
< $newdate = date ("Y-m-d H:i:s", time() + ( 3600 * $time_offset ) );
< $mediakey = $path ? "$usefolder/$path" : time();
< $template = "ssssssssssssssssssssssssssssss";
< $query = "INSERT IGNORE INTO $media_table (mediatypeID,mediakey,gedcom,path,thumbpath,description,notes,width,height,datetaken,placetaken,owner,changedate,changedby,form,alwayson,map,abspath,status,cemeteryID,plot,showmap,linktocem,latitude,longitude,zoom,bodytext,usenl,newwindow,usecollfolder)
< 		VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
< $params = array(&$template, &$mediatypeID, &$mediakey, &$tree, &$path, &$thumbpath, &$description, &$notes, &$width, &$height, &$datetaken, &$placetaken, &$owner, &$newdate, &$currentuser, &$form, &$alwayson, &$imagemap, &$abspath, &$status, &$cemeteryID, &$plot, &$showmap, &$linktocem, &$latitude, &$longitude, &$zoom, &$bodytext, &$usenl, &$newwindow, &$usecollfolder);
< $affected_rows = tng_execute_noerror($query,$params);
< if($affected_rows == 1) {
< 	$mediaID = tng_insert_id();
---
> if( empty($showmap) ) $showmap = "0";
> if( empty($usenl) ) $usenl = 0;
> if( empty($alwayson) ) $alwayson = 0;
> if( empty($newwindow) ) $newwindow = 0;
> if( empty($private) ) $private = 0;
> if( empty($usecollfolder) ) $usecollfolder = 0;
> if( empty($width) ) $width = 0;
> if( empty($height) ) $height = 0;
> if( empty($cemeteryID) ) $cemeteryID = 0;
> if( empty($linktocem) ) $linktocem = 0;
> if( empty($zoom) ) $zoom = 0;
> 
> if(!empty($place)) {
> 	$placetree = $tngconfig['places1tree'] ? "" : $tree;
> 	$query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,latitude,longitude,zoom,geoignore,temple,changedate,changedby) VALUES (\"$placetree\",\"$place\",\"0\",\"$latitude\",\"$longitude\",\"$zoom\",\"0\",\"\",\"$newdate\",\"$currentuser\")";
> 	$result = @tng_query( $query ) or die ($admtext['cannotexecutequery'] . ": $query");
> 	if($tngconfig['autogeo'] && tng_affected_rows() && (!$latitude || !$longitude)) {
> 	    $ID = tng_insert_id();
> 	    $message = geocode($place, 0, $ID);
> 	}
> }
126,132c79,100
< 	if($link_personID) {
< 		$query = "SELECT count(medialinkID) as count FROM $medialinks_table WHERE personID = \"$link_personID\" AND gedcom = \"$link_tree\"";
< 		$result = @tng_query($query);
< 		if( $result ) {
< 			$row = tng_fetch_assoc($result);
< 			$newrow = $row['count'] + 1;
< 			tng_free_result($result);
---
> try {
> 	$fileparts = pathinfo( $path );
> 	$form = strtoupper( $fileparts['extension'] );
> 	$newdate = date ("Y-m-d H:i:s", time() + ( 3600 * $time_offset ) );
> 	$mediakey = $path ? "$usefolder/$path" : time();
> 	$template = "sssssssssssssssssssssssssssssss";
> 	$query = "INSERT IGNORE INTO $media_table (mediatypeID,mediakey,gedcom,path,thumbpath,description,notes,width,height,datetaken,placetaken,owner,changedate,changedby,form,alwayson,map,abspath,status,cemeteryID,plot,showmap,linktocem,latitude,longitude,zoom,bodytext,usenl,newwindow,private,usecollfolder)
> 			VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
> 	$params = array(&$template, &$mediatypeID, &$mediakey, &$tree, &$path, &$thumbpath, &$description, &$notes, &$width, &$height, &$datetaken, &$placetaken, &$owner, &$newdate, &$currentuser, &$form, &$alwayson, &$imagemap, &$abspath, &$status, &$cemeteryID, &$plot, &$showmap, &$linktocem, &$latitude, &$longitude, &$zoom, &$bodytext, &$usenl, &$newwindow, &$private, &$usecollfolder);
> 	$affected_rows = tng_execute_noerror($query,$params);
> 	if($affected_rows == 1) {
> 		$mediaID = tng_insert_id();
> 
> 		if( $newfile && $newfile != "none" ) {
> 			if( @move_uploaded_file($newfile, $newpath) ) 
> 				@chmod( $newpath, 0644 );
> 			else {
> 			//improper permissions or folder doesn't exist (root path may be wrong)
> 				$message = $admtext['notcopied'] . " $newpath {$admtext['improperpermissions']}.";
> 				header( "Location: admin_media.php?message=" . urlencode($message) );
> 				exit;
> 			}
134,135d101
< 		else
< 			$newrow = 1;
137,140c103,139
< 		$defval = "";
< 		/*
< 		if($mediatypeID == "photos" && $thumbpath) {
< 			$query = "SELECT medialinkID FROM $medialinks_table WHERE personID = \"$link_personID\" AND gedcom = \"$link_tree\" AND defphoto = \"1\"";
---
> 		if($thumbpath) {
> 			if( substr( $thumbpath, 0, 1 ) == "/" )
> 				$thumbpath = substr( $thumbpath, 1 );
> 			$newthumbpath = "$rootpath$usefolder/$treestr$thumbpath";
> 
> 			if( function_exists( 'imageJpeg' ) && $thumbcreate == "auto" ) {
> 				///$cleanpath = $session_charset == "UTF-8" ? utf8_decode($newpath) : $newpath;
> 				//$cleannewthumbpath = $session_charset == "UTF-8" ? utf8_decode($newthumbpath) : $newthumbpath;
> 				if( image_createThumb( $newpath, $newthumbpath, $thumbmaxw, $thumbmaxh, $thumbquality ) ) {
> 			        $destInfo  = pathInfo( $newthumbpath ); 
> 			        if( strtoupper( $destInfo['extension'] ) == "GIF" || strtoupper( $destInfo['extension'] ) == "PDF") {
> 			            $thumbpath = substr_replace( $thumbpath, 'jpg', -3 ); 
> 			            $newthumbpath = substr_replace( $newthumbpath, 'jpg', -3 ); 
> 					}
> 					@chmod( $newthumbpath, 0644 );
> 				}
> 				else {
> 				//could not create thumbnail (size or type problem) or permissions (root path may be wrong)
> 					$message = $admtext['thumbnailnotcopied'] . " $newthumbpath {$admtext['improper2']}.";
> 					$thumbpath = "";
> 				}
> 			}
> 			else {
> 				if( $newthumb && $newthumb != "none" ) {
> 					if( @move_uploaded_file($newthumb, $newthumbpath) ) 
> 						@chmod( $newthumbpath, 0644 );
> 					else {
> 					//improper permissions or folder doesn't exist (root path may be wrong)
> 						$message = $admtext['thumbnailnotcopied'] . " $newthumbpath {$admtext['improperpermissions']}.";
> 						$thumbpath = "";
> 					}
> 				}
> 			}
> 		}
> 
> 		if($link_personID) {
> 			$query = "SELECT count(medialinkID) as count FROM $medialinks_table WHERE personID = \"$link_personID\" AND gedcom = \"$link_tree\"";
143c142,143
< 				$defval = 1;
---
> 				$row = tng_fetch_assoc($result);
> 				$newrow = $row['count'] + 1;
146,147c146,147
< 		}
< 		*/
---
> 			else
> 				$newrow = 1;
149,155c149,159
< 		$template = "ssssss";
< 		$query = "INSERT IGNORE INTO $medialinks_table (personID,mediaID,ordernum,gedcom,linktype,eventID,defphoto) VALUES (?,?,?,?,?,'',?)";
< 		$params = array(&$template, &$link_personID, &$mediaID, &$newrow, &$link_tree, &$link_linktype, &$defval);
< 		tng_execute_noerror($query,$params);
< 	}
< 	$query = "UPDATE $mediatypes_table SET disabled=\"0\" where mediatypeID=\"$mediatypeID\"";
< 	$result = @tng_query($query);
---
> 			$defval = "";
> 			/*
> 			if($mediatypeID == "photos" && $thumbpath) {
> 				$query = "SELECT medialinkID FROM $medialinks_table WHERE personID = \"$link_personID\" AND gedcom = \"$link_tree\" AND defphoto = \"1\"";
> 				$result = @tng_query($query);
> 				if( $result ) {
> 					$defval = 1;
> 					tng_free_result($result);
> 				}
> 			}
> 			*/
157c161,167
< 	adminwritelog( "<a href=\"admin_editmedia.php?mediaID=$mediaID\">{$admtext['addnewmedia']}: $mediaID</a>" );
---
> 			$template = "ssssss";
> 			$query = "INSERT IGNORE INTO $medialinks_table (personID,mediaID,ordernum,gedcom,linktype,eventID,defphoto) VALUES (?,?,?,?,?,'',?)";
> 			$params = array(&$template, &$link_personID, &$mediaID, &$newrow, &$link_tree, &$link_linktype, &$defval);
> 			tng_execute_noerror($query,$params);
> 		}
> 		$query = "UPDATE $mediatypes_table SET disabled=\"0\" where mediatypeID=\"$mediatypeID\"";
> 		$result = @tng_query($query);
159,162c169,178
< 	header( "Location: admin_editmedia.php?mediaID=$mediaID&newmedia=1&added=1" );
< }
< else {
< 	$message = $admtext['photonotadded'] . ".";
---
> 		adminwritelog( "<a href=\"admin_editmedia.php?mediaID=$mediaID\">{$admtext['addnewmedia']}: $mediaID</a>" );
> 
> 		header( "Location: admin_editmedia.php?mediaID=$mediaID&newmedia=1&added=1" );
> 	}
> 	else {
> 		$message = $admtext['photonotadded'] . ".";
> 		header( "Location: admin_media.php?message=" . urlencode($message) );
> 	}
> } catch (mysqli_sql_exception $e) {
> 	$message = $admtext['photonotuploaded'] . ".";
diff -r TNG/admin_addnote.php TNG1403/admin_addnote.php
7a8
> $admin_login = 1;
31c32
< if( !$private ) $private = "0";
---
> if( !isset($private) ) $private = "0";
diff -r TNG/admin_addperson2.php TNG1403/admin_addperson2.php
27a28
> if(!isset($altbirthtype)) $altbirthtype = "";
48a50
> /*
65a68
> */
105c108
< 	$template = "ssd";
---
> 	$template = "ssss";
108,109c111,112
< 		$query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,zoom,geoignore,temple) VALUES (?,?,\"0\",\"0\",\"0\",?)";
< 		$params = array(&$template,&$placetree,&$place,&$temple);
---
> 		$query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,zoom,geoignore,temple,changedate,changedby) VALUES (?,?,\"0\",\"0\",\"0\",?,\"$newdate\",?)";
> 		$params = array(&$template,&$placetree,&$place,&$temple,&$currentuser);
120,123c123,126
< 	if( !$allbranches ) $allbranches = "";
< 	if( !$living ) $living = 0;
< 	if( !$private ) $private = 0;
< 	if( !$burialtype ) $burialtype = 0;
---
> 	if( empty($allbranches) ) $allbranches = "";
> 	if( empty($living) ) $living = 0;
> 	if( empty($private) ) $private = 0;
> 	if( empty($burialtype) ) $burialtype = 0;
127c130,131
< 	$query = "INSERT INTO $people_table (personID,firstname,lnprefix,lastname,nickname,prefix,suffix,title,nameorder,living,private,birthdate,birthdatetr,birthplace,sex,altbirthdate,altbirthdatetr,
---
> 	if(!$sex && isset($other_gender)) $sex = $other_gender;
> 	$query = "INSERT INTO $people_table (personID,firstname,lnprefix,lastname,nickname,prefix,suffix,title,nameorder,living,private,birthdate,birthdatetr,birthplace,sex,altbirthtype,altbirthdate,altbirthdatetr,
130c134
< 		VALUES(?,?,?,?,?,?,?,?,'0',?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\"\",\"0\")";
---
> 		VALUES(?,?,?,?,?,?,?,?,'0',?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\"$newdate\",?,?,?,?,?,\"\",\"0\")";
133c137
< 		&$birthplace,&$sex,&$altbirthdate,&$altbirthdatetr,&$altbirthplace,&$deathdate,&$deathdatetr,&$deathplace,&$burialdate,&$burialdatetr,&$burialplace,
---
> 		&$birthplace,&$sex,&$altbirthtype,&$altbirthdate,&$altbirthdatetr,&$altbirthplace,&$deathdate,&$deathdatetr,&$deathplace,&$burialdate,&$burialdatetr,&$burialplace,
135c139
< 		&$newdate,&$tree,&$allbranches,&$currentuser,&$familyID,&$meta);
---
> 		&$tree,&$allbranches,&$currentuser,&$familyID,&$meta);
139c143
< 	$query = "SELECT personID, lastname, firstname, lnprefix, birthdate, altbirthdate, prefix, suffix, nameorder FROM $people_table WHERE ID=\"$ID\"";
---
> 	$query = "SELECT personID, lastname, firstname, lnprefix, birthdate, altbirthdate, birthdatetr, altbirthdatetr, deathdate, deathdatetr, prefix, suffix, title, nickname, nameorder, gedcom, branch, living, private FROM $people_table WHERE ID=\"$ID\"";
200c204
< 		$rval .= "<div id=\"unlinkc_$personID\" class=\"smaller hide-right\"><a href=\"#\" onclick=\"return unlinkChild('$personID','child_unlink');\">{$admtext['remove']}</a> &nbsp; | &nbsp; <a href=\"#\" onclick=\"return unlinkChild('$personID','child_delete');\">{$admtext['text_delete']}</a></div>";
---
> 		$rval .= "<div id=\"unlinkc_$personID\" class=\"smaller hide-right\"><a href=\"#\" onclick=\"return unlinkChild('$personID','child_unlink');\">{$admtext['unlink']}</a> &nbsp; | &nbsp; <a href=\"#\" onclick=\"return unlinkChild('$personID','child_delete');\">{$admtext['text_delete']}</a></div>";
diff -r TNG/admin_addperson.php TNG1403/admin_addperson.php
30a31
> if(!isset($altbirthtype)) $altbirthtype = "";
32a34,35
> if(!isset($newperson)) $newperson = "";
> if(!isset($type)) $type = "";
116c119
< $template = "ssd";
---
> $template = "ssss";
119,120c122,123
< 	$query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,zoom,geoignore,temple) VALUES (?,?,\"0\",\"0\",\"0\",?)";
< 	$params = array(&$template,&$placetree,&$place,&$temple);
---
> 	$query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,zoom,geoignore,temple,changedate,changedby) VALUES (?,?,\"0\",\"0\",\"0\",?,\"$newdate\",?)";
> 	$params = array(&$template,&$placetree,&$place,&$temple,&$currentuser);
127a131
> $allbranches = "";
133c137
< else
---
> elseif(!empty($branch))
135,138c139,141
< if( !$allbranches ) $allbranches = "";
< if( !$living ) $living = 0;
< if( !$private ) $private = 0;
< if( !$burialtype ) $burialtype = 0;
---
> if( empty($living) ) $living = 0;
> if( empty($private) ) $private = 0;
> if( empty($burialtype) ) $burialtype = 0;
140c143,144
< $query = "INSERT INTO $people_table (personID,firstname,lnprefix,lastname,nickname,prefix,suffix,title,nameorder,living,private,birthdate,birthdatetr,birthplace,sex,altbirthdate,altbirthdatetr,
---
> if(!$sex && isset($other_gender)) $sex = $other_gender;
> $query = "INSERT INTO $people_table (personID,firstname,lnprefix,lastname,nickname,prefix,suffix,title,nameorder,living,private,birthdate,birthdatetr,birthplace,sex,altbirthtype,altbirthdate,altbirthdatetr,
143c147
< 	VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\"\",?,\"\",\"0\")";
---
> 	VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\"$newdate\",?,?,?,\"\",?,\"\",\"0\")";
146c150
< 	&$birthplace,&$sex,&$altbirthdate,&$altbirthdatetr,&$altbirthplace,&$deathdate,&$deathdatetr,&$deathplace,&$burialdate,&$burialdatetr,&$burialplace,
---
> 	&$birthplace,&$sex,&$altbirthtype,&$altbirthdate,&$altbirthdatetr,&$altbirthplace,&$deathdate,&$deathdatetr,&$deathplace,&$burialdate,&$burialdatetr,&$burialplace,
148c152
< 	&$newdate,&$tree,&$allbranches,&$currentuser,&$meta);
---
> 	&$tree,&$allbranches,&$currentuser,&$meta);
223c227
< 	$name = $session_charset == "UTF-8" ? getName($row) : utf8_encode(getName($row));
---
> 	$name = $session_charset == "UTF-8" ? getName($row) : mb_convert_encoding(getName($row), 'UTF-8', 'ISO-8859-1');
diff -r TNG/admin_addplace.php TNG1403/admin_addplace.php
37c37
< if( !$temple ) $temple = 0;
---
> if( empty($temple) ) $temple = 0;
43,45c43,47
< $template = "ssssssss";
< $query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,temple,latitude,longitude,zoom,notes,geoignore) VALUES (?,?,?,?,?,?,?,?,'0')";
< $params = array(&$template, &$tree, &$place, &$placelevel, &$temple, &$latitude, &$longitude, &$zoom, &$notes);
---
> $newdate = date ("Y-m-d H:i:s", time() + ( 3600 * $time_offset ) );
> 
> $template = "ssssssssss";
> $query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,temple,latitude,longitude,zoom,notes,geoignore,changedate,changedby) VALUES (?,?,?,?,?,?,?,?,'0',?,?)";
> $params = array(&$template, &$tree, &$place, &$placelevel, &$temple, &$latitude, &$longitude, &$zoom, &$notes, &$newdate, &$currentuser);
60c62,67
< header( "Location: admin_places.php?message=" . urlencode($message) );
---
> if( !empty($submitx) ) {
> 	header( "Location: admin_places.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_editplace.php?ID=$placeID&message=" . urlencode($message) );
> }
diff -r TNG/admin_addrepo.php TNG1403/admin_addrepo.php
56c56
< adminwritelog( "<a href=\"admin_editrepo.php?repoID=$repoID&tree=$tree\">{$admtext['addnewrepo']}: $tree/$repoID</a>" );
---
> adminwritelog( "<a href=\"admin_editrepo.php?repoID=$repoID&amp;tree=$tree\">{$admtext['addnewrepo']}: $tree/$repoID</a>" );
diff -r TNG/admin_addreport.php TNG1403/admin_addreport.php
29,30c29,30
< $query = "INSERT INTO $reports_table (reportname, reportdesc, rank, active, display, criteria, orderby, sqlselect) VALUES (?,?,?,?,?,?,?,?)";
< $params = array(&$template, &$reportname, &$reportdesc, &$rank, &$active, &$display, &$criteria, &$orderby, &$sqlselect);
---
> $query = "INSERT INTO $reports_table (reportname, reportdesc, ranking, active, display, criteria, orderby, sqlselect) VALUES (?,?,?,?,?,?,?,?)";
> $params = array(&$template, &$reportname, &$reportdesc, &$ranking, &$active, &$display, &$criteria, &$orderby, &$sqlselect);
34c34
< adminwritelog( "<a href=\"admin_editreport.php?reportID=$reportID\">{$admtext['addnewreport']}: $reportID/$reportname</a>" );
---
> adminwritelog( "<a href=\"admin_editreport.php?reportID=$reportID\">{$admtext['addnewreport']}: $reportID $reportname</a>" );
37a38,45
> 
> if( !empty($submitx) ) {
> 	$message = $admtext['report'] . " $reportID {$admtext['succadded']}.";
> 	header( "Location: admin_reports.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_editreport.php?reportID=$reportID" );
> }
diff -r TNG/admin_addsource.php TNG1403/admin_addsource.php
11c11
< $error_pfx = $ajax ? "error:" : "";
---
> $error_pfx = !empty($ajax) ? "error:" : "";
Only in TNG1403: admin_addtemplatemsg.php
diff -r TNG/admin_addtlevent.php TNG1403/admin_addtlevent.php
38c38
< $message = $admtext['tlevent'] . " $tleventID {$admtext['succadded']}.";
---
> $message = $admtext['newtleventinfo'] . " $tleventID {$admtext['succadded']}.";
diff -r TNG/admin_addtree.php TNG1403/admin_addtree.php
37,39c37,39
< if( !$disallowgedcreate ) $disallowgedcreate = 0;
< if( !$disallowpdf ) $disallowpdf = 0;
< if( !$private ) $private = 0;
---
> if( empty($disallowgedcreate) ) $disallowgedcreate = 0;
> if( empty($disallowpdf) ) $disallowpdf = 0;
> if( empty($private) ) $private = 0;
47d46
< 	$message = $admtext['tree'] . " $treenamedisp {$admtext['succadded']}.";
50,51c49,57
< 	else
< 		header( "Location: admin_trees.php?message=" . urlencode($message) );
---
> 	else {
> 		if( !empty($submitx) || !empty($message) ) {
> 			$message = $admtext['tree'] . " $treenamedisp {$admtext['succadded']}.";
> 			header( "Location: admin_trees.php?message=" . urlencode($message) );
> 		}
> 		else {
> 			header( "Location: admin_edittree.php?tree=$gedcom" );
> 		}
> 	}
diff -r TNG/admin_adduser.php TNG1403/admin_adduser.php
20c20
< if($gedcom_mult) {
---
> if( !empty($gedcom_mult) ) {
58,66c58,67
< if( !$form_allow_ged ) $form_allow_ged = 0;
< if( !$form_allow_pdf ) $form_allow_pdf = 0;
< if( !$form_allow_living ) $form_allow_living = 0;
< if( !$form_allow_private ) $form_allow_private = 0;
< if( !$form_allow_lds ) $form_allow_lds = 0;
< if( !$form_allow_profile ) $form_allow_profile = 0;
< if( !$no_email ) $no_email = 0;
< if( !$disabled ) $disabled = 0;
< if( !$preflang ) $preflang = 0;
---
> if( empty($form_allow_ged) ) $form_allow_ged = 0;
> if( empty($form_allow_pdf) ) $form_allow_pdf = 0;
> if( empty($form_allow_living) ) $form_allow_living = 0;
> if( empty($form_allow_private) ) $form_allow_private = 0;
> if( empty($form_allow_private_notes) ) $form_allow_private_notes = 0;
> if( empty($form_allow_lds) ) $form_allow_lds = 0;
> if( empty($form_allow_profile) ) $form_allow_profile = 0;
> if( empty($no_email) ) $no_email = 0;
> if( empty($disabled) ) $disabled = 0;
> if( empty($preflang) ) $preflang = 0;
69c70
< $dt_consent = $consented == 1 ? $today : "";
---
> $dt_consent = !empty($consented) && $consented == 1 ? $today : "";
80,83c81,84
< 	$template = "ssssssssssssssssssssssssssssssssss";
< 	$query = "INSERT IGNORE INTO $users_table (description,username,password,password_type,realname,phone,email,website,address,city,state,zip,country,languageID,notes,gedcom,mygedcom,personID,role,allow_edit,allow_add,tentative_edit,allow_delete,allow_lds,allow_living,allow_private,allow_ged,allow_pdf,allow_profile,branch,dt_activated,dt_consented,no_email,disabled)
< 		VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
< 	$params = array(&$template, &$description,&$username,&$password,&$password_type,&$realname,&$phone,&$email,&$website,&$address,&$city,&$state,&$zip,&$country,&$preflang,&$notes,&$gedcom,&$mynewgedcom,&$personID,&$role,&$form_allow_edit,&$form_allow_add,&$form_tentative_edit,&$form_allow_delete,&$form_allow_lds,&$form_allow_living,&$form_allow_private,&$form_allow_ged,&$form_allow_pdf,&$form_allow_profile,&$branch,&$today,&$dt_consent,&$no_email,&$disabled);
---
> 	$template = "sssssssssssssssssssssssssssssssssss";
> 	$query = "INSERT IGNORE INTO $users_table (description,username,password,password_type,realname,phone,email,website,address,city,state,zip,country,languageID,notes,gedcom,mygedcom,personID,role,allow_edit,allow_add,tentative_edit,allow_delete,allow_lds,allow_living,allow_private,allow_private_notes,allow_ged,allow_pdf,allow_profile,branch,dt_activated,dt_consented,no_email,disabled)
> 		VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
> 	$params = array(&$template, &$description,&$username,&$password,&$password_type,&$realname,&$phone,&$email,&$website,&$address,&$city,&$state,&$zip,&$country,&$preflang,&$notes,&$gedcom,&$mynewgedcom,&$personID,&$role,&$form_allow_edit,&$form_allow_add,&$form_tentative_edit,&$form_allow_delete,&$form_allow_lds,&$form_allow_living,&$form_allow_private,&$form_allow_private_notes,&$form_allow_ged,&$form_allow_pdf,&$form_allow_profile,&$branch,&$today,&$dt_consent,&$no_email,&$disabled);
86c87
< 	if( $notify && $email ) {
---
> 	if( !empty($notify) && !empty($email) ) {
89c90
< 		tng_sendmail($owner, $emailaddr, $realname, $email, $admtext['activated'], $welcome, $emailaddr, $emailaddr);
---
> 		tng_sendmail($owner, $emailaddr, $realname, $email, $admtext['subjectline'], $welcome, $emailaddr, $emailaddr);
95d95
< 		$message = $admtext['user'] . " $username {$admtext['succadded']}.";
107c107,113
< header( "Location: admin_users.php?message=" . urlencode($message) );
---
> if( !empty($submitx) || !empty($message) ) {
> 	$message = $admtext['user'] . " $username {$admtext['succadded']}.";
> 	header( "Location: admin_users.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_edituser.php?userID=$userID" );
> }
diff -r TNG/admin_albums.php TNG1403/admin_albums.php
11a12,13
> if( !isset($offset) ) $offset = 0;
> 
13c15
< if( $newsearch ) {
---
> if( !empty($newsearch) ) {
21,24c23,26
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_album_post']['search']);
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_search_album_post']['tree'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_album_post']['search']) ? stripslashes($_COOKIE['tng_search_album_post']['search']) : "";
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_search_album_post']['tree']) ? $_COOKIE['tng_search_album_post']['tree'] : "";
26,27c28,29
< 		$tngpage = $_COOKIE['tng_search_album_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_album_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_album_post']['tngpage']) ? $_COOKIE['tng_search_album_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_album_post']['offset']) ? $_COOKIE['tng_search_album_post']['offset'] : 0;
30a33
> 		if( !isset($tngpage) ) $tngpage = 1;
35,40c38,39
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
< else
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
83d81
< $flags['tabs'] = $tngconfig['tabs'];
89,90d86
< <body background="img/background.gif">
< 
91a88,89
> 	echo tng_adminlayout();
> 
100,103c98,99
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
124c120
< 	$pagenav = get_browseitems_nav( $totrows, "admin_albums.php?searchstring=$searchstring&amp;exactmatch=$exactmatch&amp;offset", $maxsearchresults, 5 );
---
> 	$pagenav = get_browseitems_nav( $totrows, "admin_albums.php?searchstring=$searchstring&amp;offset", $maxsearchresults, 5 );
128c124
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
156,157c152,153
< 			$tmediatypeID = $trow['mediatypeID'];
< 			$tusefolder = $trow['usecollfolder'] ? $mediatypes_assoc[$tmediatypeID] : $mediapath;
---
> 			$tmediatypeID = isset($trow['mediatypeID']) ? $trow['mediatypeID'] : "";
> 			$tusefolder = !empty($trow['usecollfolder']) ? $mediatypes_assoc[$tmediatypeID] : $mediapath;
161c157
< 			if( $trow['thumbpath'] && file_exists( "$rootpath$tusefolder/" . $trow['thumbpath'] ) ) {
---
> 			if( !empty($trow['thumbpath']) && file_exists( "$rootpath$tusefolder/" . $trow['thumbpath'] ) ) {
163c159
< 				echo "<a href=\"admin_editalbum.php?albumID={$row['albumID']}\"><img src=\"$tusefolder/" . str_replace("%2F","/",rawurlencode( $trow['thumbpath'] )) . "\" border=\"0\" $size[3] alt=\"{$row['albumname']}\"></a>";
---
> 				echo "<a href=\"admin_editalbum.php?albumID={$row['albumID']}\"><img src=\"$tusefolder/" . str_replace("%2F","/",rawurlencode( $trow['thumbpath'] )) . "\" class=\"adminthumb\" $size[3] alt=\"{$row['albumname']}\"></a>";
183,184c179,181
< 			$query = "SELECT people.personID as personID2, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder,
< 				$album2entities_table.entityID as personID, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID, reponame
---
> 			$query = "SELECT people.personID as personID2, people.gedcom as pgedcom, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder, people.title,
> 				people.living, people.private, people.branch, people.gedcom, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, $families_table.familyID, $families_table.gedcom as fgedcom, $families_table.branch as fbranch,
> 				$album2entities_table.entityID as personID, $sources_table.title as stitle, $sources_table.sourceID, $sources_table.gedcom as sgedcom, $repositories_table.repoID, reponame, $repositories_table.gedcom as rgedcom
194d190
< 				$prow['allow_living'] = 1;
196c192,195
< 					$alinktext .= "<li>" . getName( $prow ) . " ({$prow['personID2']})</li>\n";
---
> 					$rights = determineLivingPrivateRights($prow);
> 					$prow['allow_living'] = $rights['living'];
> 					$prow['allow_private'] = $rights['private'];
> 					$alinktext .= "<li><a href=\"admin_editperson.php?personID={$prow['personID2']}&tree={$prow['pgedcom']}\">" . getName( $prow ) . " ({$prow['personID2']})</a></li>\n";
199,200c198,199
< 					$sourcetext = $prow['title'] ? "{$admtext['source']}: {$prow['title']}" : "{$admtext['source']}: {$prow['sourceID']}";
< 					$alinktext .= "<li>$sourcetext ({$prow['sourceID']})</li>\n";
---
> 					$sourcetext = $prow['stitle'] ? "{$admtext['source']}: {$prow['stitle']}" : "{$admtext['source']}: {$prow['sourceID']}";
> 					$alinktext .= "<li><a href=\"admin_editsource.php?sourceID={$prow['sourceID']}&tree={$prow['sgedcom']}\">$sourcetext ({$prow['sourceID']})</a></li>\n";
204c203,212
< 					$alinktext .= "<li>$repotext ({$prow['repoID']})</li>\n";
---
> 					$alinktext .= "<li><a href=\"admin_editrepo.php?repoID={$prow['repoID']}&tree={$prow['rgedcom']}\">$repotext ({$prow['repoID']})</a></li>\n";
> 				}
> 				elseif( $prow['familyID'] != NULL ) {
> 					$prow['linktype'] = "F";
> 					$prow['gedcom'] = $prow['fgedcom'];
> 					$prow['branch'] = $prow['fbranch'];
> 					$rights = determineLivingPrivateRights($prow);
> 					$prow['allow_living'] = $rights['living'];
> 					$prow['allow_private'] = $rights['private'];
> 					$alinktext .= "<li><a href=\"admin_editfamily.php?familyID={$prow['familyID']}&tree={$prow['fgedcom']}\">{$admtext['family']}: " . getFamilyName( $prow ) . "</a></li>\n";
206,207d213
< 				elseif( $prow['familyID'] != NULL )
< 					$alinktext .= "<li>{$admtext['family']}: " . getFamilyName( $prow ) . "</li>\n";
228,233c234,237
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
Only in TNG: admin_analyzemods.php
diff -r TNG/admin_associations.php TNG1403/admin_associations.php
7a8
> $admin_login = 1;
10c11
< $query = "SELECT firstname, lastname, lnprefix, nameorder, prefix, suffix, branch, living, private, gedcom FROM $people_table
---
> $query = "SELECT firstname, lastname, lnprefix, nameorder, prefix, suffix, title, branch, living, private, gedcom FROM $people_table
15,19c16,25
< $righttree = checktree($tree);
< $rightbranch = $righttree ? checkbranch($row['branch']) : false;
< $rights = determineLivingPrivateRights($row, $righttree, $rightbranch);
< $row['allow_living'] = $rights['living'];
< $row['allow_private'] = $rights['private'];
---
> $namestr = "";
> if($row) {
> 	$righttree = checktree($tree);
> 	$rightbranch = $righttree ? checkbranch($row['branch']) : false;
> 	$rights = determineLivingPrivateRights($row, $righttree, $rightbranch);
> 	$row['allow_living'] = $rights['living'];
> 	$row['allow_private'] = $rights['private'];
> 
> 	$namestr = getName($row);
> }
21d26
< $namestr = getName($row);
56c61
< 				$query = "SELECT firstname, lastname, lnprefix, nameorder, prefix, suffix, living, private, branch FROM $people_table WHERE personID=\"{$assoc['passocID']}\" AND gedcom=\"$tree\"";
---
> 				$query = "SELECT firstname, lastname, lnprefix, nameorder, prefix, suffix, title, birthplace, birthdate, birthdatetr, deathplace, deathdate, altbirthdate, altbirthdatetr, altbirthplace, burialdate, living, private, branch, gedcom FROM $people_table WHERE personID=\"{$assoc['passocID']}\" AND gedcom=\"$tree\"";
78,79c83,84
< 			$actionstr = $allow_edit ? "<a href=\"#\" onclick=\"return editAssociation({$assoc['assocID']});\" title=\"{$admtext['edit']}\" class=\"smallicon admin-edit-icon\"></a>" : "";
< 			$actionstr .= $allow_delete ? "<a href=\"#\" onclick=\"return deleteAssociation({$assoc['assocID']},'$personID','$tree');\" title=\"{$admtext['text_delete']}\" class=\"smallicon admin-delete-icon\"></a>" : "";
---
> 			$actionstr = $allow_edit ? "<a href=\"#\" onclick=\"return editAssociation({$assoc['assocID']}, '{$tree}');\" title=\"{$admtext['edit']}\" class=\"smallicon admin-edit-icon\"></a>" : "";
> 			$actionstr .= $allow_delete ? "<a href=\"#\" onclick=\"return deleteAssociation({$assoc['assocID']},'$personID','{$assoc['assocID']}','$tree');\" title=\"{$admtext['text_delete']}\" class=\"smallicon admin-delete-icon\"></a>" : "";
diff -r TNG/admin_backup.php TNG1403/admin_backup.php
20a21,22
> $fullbackuppath = !empty($tngconfig['saveconfig']) ? $subroot . $backuppath : $rootpath . $backuppath;
> 
22c24
< 	global $rootpath, $backuppath, $largechunk, $admtext;
---
> 	global $rootpath, $fullbackuppath, $largechunk, $admtext, $dosql, $docreate, $dodrop;
27,28c29,34
< 	$filename = "$rootpath$backuppath/$table.bak";
< 	if( file_exists( $filename ) ) unlink( $filename );
---
> 	$dosql = $dosql == "true" || $dosql == 1 ? true : false;
> 	$docreate = $docreate == "true" || $docreate == 1 ? true : false;
> 	$dodrop = $dodrop == "true"  || $dodrop == 1? true : false;
> 
> 	$filename = $dosql ? "$fullbackuppath/$table.sql" : "$fullbackuppath/$table.bak";
> 	delbackup($table);
32a39,51
> 		$insertline = "";
> 		if($dosql) {
> 			if($docreate) {
> 				if($dodrop) {
> 					fwrite( $fp, "DROP TABLE IF EXISTS $table;\n" );
> 				}
> 				$query = "SHOW CREATE TABLE $table";
> 				$result = tng_query($query);
> 				$row = tng_fetch_array( $result, 'num' );
> 				fwrite( $fp, "$row[1];\n" );
> 			}
> 		}
> 		$firstline = true;
37c56,57
< 			$more_rows = ( $largechunk == tng_num_rows( $result ));
---
> 			$total_chunk_rows = tng_num_rows( $result );
> 			$more_rows = ( $largechunk == $total_chunk_rows);
39c59
< 			if ($writeflds) {
---
> 			if( $writeflds || ($dosql && !$insertline)) {
41c61
< 				for ($i=0; $i < $nflds; $i++) {
---
> 				for($i = 0; $i < $nflds; $i++) {
45c65,74
< 				fwrite($fp, trim($fields,',')."\n");
---
> 				if($dosql) {
> 					if( $total_chunk_rows > 0 ) {
> 						$insertline = "INSERT INTO $table (" . trim($fields,',') . ") VALUES\n";
> 						fwrite($fp, $insertline);
> 					}
> 					else
> 						$insertline = "empty";
> 				}
> 				else
> 					fwrite($fp, trim($fields,',')."\n");
49a79,86
> 				if($firstline)
> 					$firstline = false;
> 				else {
> 					if($dosql)
> 						fwrite($fp, ",\n");
> 					else
> 						fwrite($fp, "\n");
> 				}
52,54c89,94
< 					if($row[$i] == "" && ($fieldtypes[$i] == 3 || $fieldtypes[$i] == 2 || $fieldtypes[$i] == 1)) $row[$i] = "0";
< 					if($row[$i] == "" && ($fieldtypes[$i] == 12)) $row[$i] = "0000-00-00 00:00:00";
< 					$line .= '"' . addslashes( $row[$i] ) . '",';
---
> 					if($row[$i] == "" && isset($fieldtypes[$i]) && ($fieldtypes[$i] == 3 || $fieldtypes[$i] == 2 || $fieldtypes[$i] == 1)) $row[$i] = "0";
> 					if($row[$i] == "" && isset($fieldtypes[$i]) && ($fieldtypes[$i] == 12)) $row[$i] = "0000-00-00 00:00:00";
> 					$line .= '"' . (isset($row[$i]) ? addslashes( $row[$i] ) : $row[$i]) . '",';
> 					$line = preg_replace("/\r/", "\\\\r", $line);
> 					$line = preg_replace("/\n/", "\\\\n", $line);
> 					//$line = preg_replace("/[\n\r]/", "\\\\n", $line);
56c96,103
< 				fwrite($fp, trim($line,',')."\n");
---
> 				if($dosql)
> 					fwrite($fp, "(" . trim($line,',') . ")");
> 				else
> 					fwrite($fp, trim($line,',')."");
> 			}
> 			if(!$dosql) {
> 				fwrite($fp, "\n");
> 				$firstline = true;
59a107,108
> 		if($dosql && $insertline != "empty")
> 			fwrite($fp, ";");
71c120
< 	global $rootpath, $backuppath;
---
> 	global $rootpath, $fullbackuppath;
73c122,124
< 	$filename = "$rootpath$backuppath/$table.bak";
---
> 	$filename = "$fullbackuppath/$table.sql";
> 	if( file_exists( $filename ) ) unlink( $filename );
> 	$filename = "$fullbackuppath/$table.bak";
101c152
< 	$languages_table, $places_table, $states_table, $countries_table, $sources_table, $repositories_table, $citations_table, $reports_table,
---
> 	$image_tags_table, $languages_table, $places_table, $states_table, $countries_table, $sources_table, $repositories_table, $citations_table, $reports_table,
104a156
> foreach($tablelist as $tablecheck) if(!isset(${$tablecheck})) ${$tablecheck} = false;
107,108c159,163
< 	$filename = "$rootpath$backuppath/tng_tablestructure.bak";
< 	if( file_exists( $filename ) ) unlink( $filename );
---
> 	$filename = "$fullbackuppath/tng_tablestructure.sql";
> 	if( file_exists( $filename ) ) 
> 		unlink( $filename );
> 	elseif( file_exists( "$fullbackuppath/tng_tablestructure.bak" ) ) 
> 		unlink( "$fullbackuppath/tng_tablestructure.bak" );
133c188
< 		eval( "\$dothistable = \"\$$table\";" );
---
> 		$dothistable = $$table;
144c199
< 			eval( "\$dothistable = \"\$$table\";" );
---
> 			$dothistable = $$table;
159,162c214,219
< 		$fileflag = $tablename && file_exists("$rootpath$backuppath/$tablename.bak");
< 		$timestamp = getfiletime( "$rootpath$backuppath/$tablename.bak" );
< 		$size = getfilesize("$rootpath$backuppath/$tablename.bak");
< 		$ajaxmsg = "$tablename&$timestamp&$size&" . (($ajaxmsg) ? $ajaxmsg : $admtext['succbackedup']);
---
> 		$ext = $dosql == "true" || $dosql == "1" || $dosql == 1 ? ".sql" : ".bak";
> 		$filename = "$fullbackuppath/$tablename$ext";
> 		$fileflag = $tablename && file_exists($filename);
> 		$timestamp = getfiletime($filename);
> 		$size = getfilesize($filename);
> 		$ajaxmsg = "$tablename&$timestamp&$size&$backuppath/$tablename$ext&" . (($ajaxmsg) ? $ajaxmsg : $admtext['succbackedup']);
diff -r TNG/admin_branches.php TNG1403/admin_branches.php
32,33c32,33
< if( $newsearch ) {
< 	$exptime = 05;
---
> $exptime = 0;
> if( !empty($newsearch) ) {
41,44c41,44
< 	if( !$searchstring )
< 		$searchstring = $_COOKIE['tng_search_branches_post']['search'];
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_tree'];
---
> 	if( empty($searchstring) )
> 		$searchstring =isset($_COOKIE['tng_search_branches_post']['search']) ?  $_COOKIE['tng_search_branches_post']['search'] : "";
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "";
46,47c46,47
< 		$tngpage = $_COOKIE['tng_search_branches_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_branches_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_branches_post']['tngpage']) ? $_COOKIE['tng_search_branches_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_branches_post']['offset']) ? $_COOKIE['tng_search_branches_post']['offset'] : 0;
50c50,51
< 		$exptime = 0;
---
> 		if( !isset($tngpage) ) $tngpage = 1;
> 		if( !isset($offset) ) $offset = 0;
55,58c56,60
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
---
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
> 
> if(!empty($order))
> 	setcookie("tng_search_branches_post[order]", $order, $exptime);
60c62
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> 	$order = isset($_COOKIE['tng_search_branches_post']['order']) ? $_COOKIE['tng_search_branches_post']['order'] : "desc";
61a64
> if( !isset($offset) ) $offset = 0;
80a84,108
> $idsort = "id";
> $descsort = "descup";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "id") {
> 	$orderstr = "branch, $branches_table.description";
> 	$idsort = "<a href=\"admin_branches.php?order=idup\" class=\"lightlink\">{$admtext['branchid']} $descicon</a>";
> }
> else {
> 	$idsort = "<a href=\"admin_branches.php?order=id\" class=\"lightlink\">{$admtext['branchid']} $ascicon</a>";
> 	if($order == "idup")
> 		$orderstr = "branch DESC, $branches_table.description DESC";
> }
> 
> if($order == "desc") {
> 	$orderstr = "$branches_table.description";
> 	$descsort = "<a href=\"admin_branches.php?order=descup\" class=\"lightlink\">{$admtext['description']} $descicon</a>";
> }
> else {
> 	$descsort = "<a href=\"admin_branches.php?order=desc\" class=\"lightlink\">{$admtext['description']} $ascicon</a>";
> 	if($order == "descup")
> 		$orderstr = "$branches_table.description DESC";
> }
> 
84c112,113
< $query = "SELECT $branches_table.gedcom as gedcom, branch, $branches_table.description as description, personID, treename FROM $branches_table LEFT JOIN $trees_table ON $trees_table.gedcom = $branches_table.gedcom $wherestr ORDER BY $branches_table.description LIMIT $newoffset" . $maxsearchresults;
---
> $query = "SELECT $branches_table.gedcom as gedcom, branch, $branches_table.description as description, personID, treename 
> 	FROM $branches_table LEFT JOIN $trees_table ON $trees_table.gedcom = $branches_table.gedcom $wherestr ORDER BY $orderstr LIMIT $newoffset" . $maxsearchresults;
100d128
< $flags['tabs'] = $tngconfig['tabs'];
113,114d140
< <body background="img/background.gif">
< 
115a142,143
> 	echo tng_adminlayout();
> 
123,126c151,152
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
172c198
<   		<input type="submit" name="xbranchaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
>   		<input type="submit" name="xbranchaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
177,179c203,205
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
< 		<tr class="fieldnameback fieldname nw"r>
< 			<td><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></td>
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
> 		<tr>
> 			<td class="fieldnameback fieldname nw"><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></td>
183c209
< 			<td><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</nobr></span></td>
---
> 			<td class="fieldnameback fieldname nw"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</nobr></span></td>
187,192c213,218
< 			<td>&nbsp;<b><?php echo $admtext['id']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $admtext['description']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $admtext['tree']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $text['startingind']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $admtext['people']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $admtext['families']; ?></b>&nbsp;</td>
---
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $idsort; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $descsort; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['tree']; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $text['startingind']; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['people']; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['families']; ?></b>&nbsp;</td>
208c234
< 			echo "<tr id=\"row_{$row['branch']}\"><td class=\"lightback\"><div>$newactionstr</div></td>\n";
---
> 			echo "<tr id=\"row_{$row['branch']}\"><td class=\"lightback\"><div class=\"action-btns\" style=\"width:50px\">$newactionstr</div></td>\n";
210,211c236,237
< 				echo "<td class=\"lightback\" align=\"center\"><input type=\"checkbox\" name=\"del{$row['branch']}&{$row['gedcom']}\" value=\"1\"></td>";
< 			$editlink = "admin_editbranch.php?branch={$row['branch']}&tree={$row['gedcom']}";
---
> 				echo "<td class=\"lightback\" align=\"center\"><input type=\"checkbox\" name=\"del{$row['branch']}&amp;{$row['gedcom']}\" value=\"1\"></td>";
> 			$editlink = "admin_editbranch.php?branch={$row['branch']}&amp;tree={$row['gedcom']}";
234c260
< 		echo $admtext['notrees'];
---
> 		echo $admtext['nobranch'];
238,244c264,267
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_branchlabels.php TNG1403/admin_branchlabels.php
380d379
< $flags['tabs'] = $tngconfig['tabs'];
385,386d383
< <body background="img/background.gif">
< 
387a385,386
> 	echo tng_adminlayout();
> 
451,453c450,452
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_branchmenu.php TNG1403/admin_branchmenu.php
36d35
< $flags['tabs'] = $tngconfig['tabs'];
110,111d108
< <body background="img/background.gif">
< 
112a110,111
> 	echo tng_adminlayout();
> 
150c149
< 		<tr><td colspan="2"><div id="startind1"><br/><strong><?php echo $admtext['startingind']; ?>:</strong></div></td></tr>
---
> 		<tr><td colspan="2"><div id="startind1"><br/><strong><?php echo $text['startingind']; ?>:</strong></div></td></tr>
191c190
< 	<br/><input type="submit" id="labelsub" value="<?php echo $admtext['addlabels']; ?>"> <input type="button" value="<?php echo $admtext['showpeople']; ?>" onclick="window.location.href='admin_showbranch.php?tree=<?php echo $tree; ?>&branch=<?php echo $branch; ?>';">
---
> 	<br/><input type="submit" id="labelsub" value="<?php echo $admtext['addlabels']; ?>"> <input type="button" value="<?php echo $admtext['showpeople']; ?>" onclick="window.location.href='admin_showbranch.php?tree=<?php echo $tree; ?>&amp;branch=<?php echo $branch; ?>';">
197,199c196,198
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_cemeteries.php TNG1403/admin_cemeteries.php
12a13,15
> if(!isset($searchstring)) $searchstring = "";
> if(!isset($tngpage)) $tngpage = "";
> 
14c17
< if( $newsearch ) {
---
> if(!empty($newsearch)) {
19d21
< 	setcookie("tng_search_cemeteries_post[offset]", 0, $exptime);
22c24
< 	if( !$searchstring )
---
> 	if(!$searchstring && isset($_COOKIE['tng_search_cemeteries_post']['search']))
25,26c27,28
< 		$tngpage = $_COOKIE['tng_search_cemeteries_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_cemeteries_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_cemeteries_post']['tngpage']) ? $_COOKIE['tng_search_cemeteries_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_cemeteries_post']['offset']) ? $_COOKIE['tng_search_cemeteries_post']['offset'] : 0;
30,31c32,33
< 		setcookie("tng_search_cemeteries_post[tngpage]", $tngpage, $exptime);
< 		setcookie("tng_search_cemeteries_post[offset]", $offset, $exptime);
---
> 		setcookie("tng_search_cemeteries_post[tngpage]", (isset($tngpage) ? $tngpage : 1), $exptime);
> 		setcookie("tng_search_cemeteries_post[offset]", (isset($offset) ? $offset : 0), $exptime);
34,39c36,38
< if(get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
< else
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> if(!isset($offset)) $offset = 0;
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
98d96
< $flags['tabs'] = $tngconfig['tabs'];
111,112d108
< <body background="img/background.gif">
< 
113a110,111
> 	echo tng_adminlayout();
> 
121,124c119,120
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
144c140
< 	$pagenav = get_browseitems_nav( $totrows, "admin_cemeteries.php?searchstring=$searchstring&amp;exactmatch=$exactmatch&amp;offset", $maxsearchresults, 5 );
---
> 	$pagenav = get_browseitems_nav( $totrows, "admin_cemeteries.php?searchstring=$searchstring&amp;exactmatch=" . (isset($exactmatch) ? $exactmatch : "") . "&amp;offset", $maxsearchresults, 5 );
154c150
<   		<input type="submit" name="xcemaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
>   		<input type="submit" name="xcemaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
160c156
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
193c189
< 		$actionstr .= "<a href=\"" . $showmap_url . "cemeteryID=xxx&amp\" target=\"_blank\" title=\"{$admtext['test']}\" class=\"smallicon admin-test-icon\"></a>";
---
> 		$actionstr .= "<a href=\"" . $showmap_url . "cemeteryID=xxx\" target=\"_blank\" title=\"{$admtext['test']}\" class=\"smallicon admin-test-icon\"></a>";
252,257c248,251
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_changetreeform.php TNG1403/admin_changetreeform.php
7a8
> $admin_login = 1;
74a76,78
> 		<td></td><td><input type="radio" name="operation" value="0" checked/> <?php echo $admtext['move']; ?> &nbsp; <input type="radio" name="operation" value="1"/> <?php echo $admtext['copy']; ?></td>
> 	</tr>
> 	<tr>
diff -r TNG/admin_changetree.php TNG1403/admin_changetree.php
7a8
> $admin_login = 1;
21,49c22,74
< 		$query = "UPDATE $people_table SET gedcom=\"$newtree\", personID=\"$newID\" WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "UPDATE $mostwanted_table SET gedcom=\"$newtree\", personID=\"$newID\" WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "UPDATE $temp_events_table SET gedcom=\"$newtree\", personID=\"$newID\" WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "UPDATE $users_table SET mygedcom=\"$newtree\", personID=\"$newID\" WHERE mygedcom=\"$oldtree\" AND personID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "UPDATE $families_table SET husband=\"\" WHERE gedcom=\"$oldtree\" AND husband=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "UPDATE $families_table SET wife=\"\" WHERE gedcom=\"$oldtree\" AND wife=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "DELETE FROM $branchlinks_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "DELETE FROM $citations_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "DELETE FROM $children_table WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "DELETE FROM $assoc_table WHERE gedcom=\"$oldtree\" AND (personID=\"$entityID\" OR passocID=\"$entityID\")";
< 		$result = tng_query($query);
---
> 		if($operation == "0") {
> 			$query = "UPDATE $people_table SET gedcom=\"$newtree\", personID=\"$newID\" WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "UPDATE $mostwanted_table SET gedcom=\"$newtree\", personID=\"$newID\" WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "UPDATE $temp_events_table SET gedcom=\"$newtree\", personID=\"$newID\" WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "UPDATE $users_table SET mygedcom=\"$newtree\", personID=\"$newID\" WHERE mygedcom=\"$oldtree\" AND personID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "UPDATE $families_table SET husband=\"\" WHERE gedcom=\"$oldtree\" AND husband=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "UPDATE $families_table SET wife=\"\" WHERE gedcom=\"$oldtree\" AND wife=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "DELETE FROM $branchlinks_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "DELETE FROM $citations_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "DELETE FROM $children_table WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "DELETE FROM $assoc_table WHERE gedcom=\"$oldtree\" AND (personID=\"$entityID\" OR passocID=\"$entityID\")";
> 			$result = tng_query($query);
> 		}
> 		else {
> 			$query = "SELECT * FROM $people_table WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
> 			$result = tng_query($query);
> 			$row = tng_fetch_assoc($result);
> 			tng_free_result($result);
> 			
> 			$newrow = array();
> 			foreach($row as $key => $value) {
> 				$newrow[$key] = addslashes($value);
> 			}
> 			$row = $newrow;
> 			$query = "INSERT INTO $people_table (personID,firstname,lnprefix,lastname,nickname,prefix,suffix,title,nameorder,living,private,birthdate,birthdatetr,birthplace,sex,altbirthtype,altbirthdate,
> 				altbirthdatetr,altbirthplace,deathdate,deathdatetr,deathplace,burialdate,burialdatetr,burialplace,burialtype,baptdate,baptdatetr,baptplace,confdate,confdatetr,confplace,initdate,initdatetr,
> 				initplace,endldate,endldatetr,endlplace,changedate,gedcom,branch,changedby,famc,metaphone,edituser,edittime) 
> 				VALUES(\"$newID\",\"{$row['firstname']}\",\"{$row['lnprefix']}\",\"{$row['lastname']}\",\"{$row['nickname']}\",\"{$row['prefix']}\",\"{$row['suffix']}\",\"{$row['title']}\",\"{$row['nameorder']}\",
> 					\"{$row['living']}\",\"{$row['private']}\",\"{$row['birthdate']}\",\"{$row['birthdatetr']}\",\"{$row['birthplace']}\",\"{$row['sex']}\",\"{$row['altbirthtype']}\",\"{$row['altbirthdate']}\",
> 					\"{$row['altbirthdatetr']}\",\"{$row['altbirthplace']}\",\"{$row['deathdate']}\",\"{$row['deathdatetr']}\",\"{$row['deathplace']}\",\"{$row['burialdate']}\",\"{$row['burialdatetr']}\",
> 					\"{$row['burialplace']}\",\"{$row['burialtype']}\",\"{$row['baptdate']}\",\"{$row['baptdatetr']}\",\"{$row['baptplace']}\",\"{$row['confdate']}\",\"{$row['confdatetr']}\",
> 					\"{$row['confplace']}\",\"{$row['initdate']}\",\"{$row['initdatetr']}\",\"{$row['initplace']}\",\"{$row['endldate']}\",\"{$row['endldatetr']}\",\"{$row['endlplace']}\",
> 					\"{$row['changedate']}\",\"$newtree\",\"\",\"$currentuser\",\"{$row['famc']}\",\"{$row['metaphone']}\",\"{$row['edituser']}\",\"{$row['edittime']}\")";
> 			$result = tng_query($query);
> 		}
55,59c80,102
< 		$query = "UPDATE $sources_table SET gedcom=\"$newtree\", sourceID=\"$newID\" WHERE gedcom=\"$oldtree\" AND sourceID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "DELETE FROM $citations_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
< 		$result = tng_query($query);
---
> 		if($operation == "0") {
> 			$query = "UPDATE $sources_table SET gedcom=\"$newtree\", sourceID=\"$newID\" WHERE gedcom=\"$oldtree\" AND sourceID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "DELETE FROM $citations_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
> 			$result = tng_query($query);
> 		}
> 		else {
> 			$query = "SELECT * FROM $sources_table WHERE gedcom=\"$oldtree\" AND sourceID=\"$entityID\"";
> 			$result = tng_query($query);
> 			$row = tng_fetch_assoc($result);
> 			tng_free_result($result);
> 			$newrow = array();
> 			foreach($row as $key => $value) {
> 				$newrow[$key] = addslashes($value);
> 			}
> 			$row = $newrow;
> 			
> 			$query = "INSERT INTO $sources_table (sourceID,shorttitle,title,author,callnum,publisher,repoID,actualtext,changedate,gedcom,changedby,type,other,comments) 
> 				VALUES(\"$newID\",\"{$row['shorttitle']}\",\"{$row['title']}\",\"{$row['author']}\",\"{$row['callnum']}\",\"{$row['publisher']}\",\"\",\"{$row['actualtext']}\",\"{$row['changedate']}\",
> 					\"$newtree\",\"{$row['currentuser']}\",\"{$row['type']}\",\"{$row['other']}\",\"{$row['comments']}\")";
> 			$result = tng_query($query);
> 		}
65,69c108,148
< 		$query = "UPDATE $repositories_table SET gedcom=\"$newtree\", repoID=\"$newID\" WHERE gedcom=\"$oldtree\" AND repoID=\"$entityID\"";
< 		$result = tng_query($query);
< 
< 		$query = "UPDATE $sources_table SET repoID=\"\" WHERE gedcom=\"$oldtree\" AND repoID=\"$entityID\"";
< 		$result = tng_query($query);
---
> 		if($operation == "0") {
> 			$query = "UPDATE $repositories_table SET gedcom=\"$newtree\", repoID=\"$newID\" WHERE gedcom=\"$oldtree\" AND repoID=\"$entityID\"";
> 			$result = tng_query($query);
> 
> 			$query = "UPDATE $sources_table SET repoID=\"\" WHERE gedcom=\"$oldtree\" AND repoID=\"$entityID\"";
> 			$result = tng_query($query);
> 		}
> 		else {
> 			$query = "SELECT * FROM $repositories_table WHERE gedcom=\"$oldtree\" AND repoID=\"$entityID\"";
> 			$result = tng_query($query);
> 			$row = tng_fetch_assoc($result);
> 			tng_free_result($result);
> 			$newrow = array();
> 			foreach($row as $key => $value) {
> 				$newrow[$key] = addslashes($value);
> 			}
> 			$row = $newrow;
> 
> 			if($row['addressID']) {
> 				$query = "SELECT * FROM $address_table WHERE addressID=\"{$row['addressID']}\"";
> 				$result = tng_query($query);
> 				$arow = tng_fetch_assoc($result);
> 				tng_free_result($result);
> 				$addressID = tng_insert_id();
> 				$newrow = array();
> 				foreach($arow as $key => $value) {
> 					$newrow[$key] = addslashes($value);
> 				}
> 				$arow = $newrow;
> 
> 				$query = "INSERT INTO $address_table (addressID,address1, address2, city, state, zip, country, gedcom, phone, email, www) 
> 					VALUES(\"$addressID\",\"{$arow['address1']}\",\"{$arow['address2']}\",\"{$arow['city']}\",\"{$arow['state']}\",\"{$arow['zip']}\",\"{$arow['country']}\",\"{$arow['tree']}\",\"{$arow['phone']}\",\"{$arow['email']}\",\"{$arow['www']}\")";
> 				$result = tng_query($query);
> 			}
> 			else
> 				$addressID = "";
> 			
> 			$query = "INSERT INTO $repositories_table (repoID,reponame,addressID,changedate,gedcom,changedby) 
> 				VALUES(\"$newID\",\"{$row['reponame']}\",\"{$addressID}\",\"{$row['changedate']}\",\"$newtree\",\"{$row['currentuser']}\")";
> 			$result = tng_query($query);
> 		}
74,86c153,177
< $query = "SELECT addressID FROM $events_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\" AND addressID!=\"\"";
< $result = tng_query($query);
< while($row = tng_fetch_assoc($result)) {
< 	$query = "UPDATE $address_table SET gedcom=\"$newtree\" WHERE addressID=\"{$row['addressID']}\"";
< 	$result2 = tng_query($query);
< }
< tng_free_result($result);
< 
< $query = "UPDATE $events_table SET gedcom=\"$newtree\", persfamID=\"$newID\" WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
< $result = tng_query($query);
< 
< $query = "UPDATE $album2entities_table SET gedcom=\"$newtree\", entityID=\"$newID\" WHERE gedcom=\"$oldtree\" AND entityID=\"$entityID\"";
< $result = tng_query($query);
---
> if($operation == "0") {
> 	$query = "SELECT addressID FROM $events_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\" AND addressID!=\"\"";
> 	$result = tng_query($query);
> 	while($row = tng_fetch_assoc($result)) {
> 		$query = "UPDATE $address_table SET gedcom=\"$newtree\" WHERE addressID=\"{$row['addressID']}\"";
> 		$result2 = tng_query($query);
> 	}
> 	tng_free_result($result);
> 
> 	$query = "UPDATE $events_table SET gedcom=\"$newtree\", persfamID=\"$newID\" WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
> 	$result = tng_query($query);
> 
> 	$query = "UPDATE $album2entities_table SET gedcom=\"$newtree\", entityID=\"$newID\" WHERE gedcom=\"$oldtree\" AND entityID=\"$entityID\"";
> 	$result = tng_query($query);
> 
> 	$query = "UPDATE $medialinks_table SET gedcom=\"$newtree\", personID=\"$newID\" WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
> 	$result = tng_query($query);
> 
> 	$query = "SELECT xnoteID FROM $notelinks_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\" AND xnoteID!=\"\"";
> 	$result = tng_query($query);
> 	while($row = tng_fetch_assoc($result)) {
> 		$query = "UPDATE $xnotes_table SET gedcom=\"$newtree\" WHERE ID=\"{$row['xnoteID']}\"";
> 		$result2 = tng_query($query);
> 	}
> 	tng_free_result($result);
88,95c179,183
< $query = "UPDATE $medialinks_table SET gedcom=\"$newtree\", personID=\"$newID\" WHERE gedcom=\"$oldtree\" AND personID=\"$entityID\"";
< $result = tng_query($query);
< 
< $query = "SELECT xnoteID FROM $notelinks_table WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\" AND xnoteID!=\"\"";
< $result = tng_query($query);
< while($row = tng_fetch_assoc($result)) {
< 	$query = "UPDATE $xnotes_table SET gedcom=\"$newtree\" WHERE ID=\"{$row['xnoteID']}\"";
< 	$result2 = tng_query($query);
---
> 	$query = "UPDATE $notelinks_table SET gedcom=\"$newtree\", persfamID=\"$newID\" WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
> 	$result = tng_query($query);
> }
> else {
> 	//insert copies of events, notelinks and notes
97,100d184
< tng_free_result($result);
< 
< $query = "UPDATE $notelinks_table SET gedcom=\"$newtree\", persfamID=\"$newID\" WHERE gedcom=\"$oldtree\" AND persfamID=\"$entityID\"";
< $result = tng_query($query);
diff -r TNG/admin_checkemail.php TNG1403/admin_checkemail.php
7a8
> $admin_login = 1;
diff -r TNG/admin_checkfile.php TNG1403/admin_checkfile.php
6a7
> $admin_login = 1;
diff -r TNG/admin_checkID.php TNG1403/admin_checkID.php
7a8
> $admin_login = 1;
diff -r TNG/admin_citations.php TNG1403/admin_citations.php
7a8
> $admin_login = 1;
20c21,26
< if( $eventtype['display'] ) {
---
> $query = "SELECT altbirthtype FROM $people_table	WHERE personID=\"$persfamID\" AND gedcom=\"$tree\"";
> $presult = tng_query($query);
> $prow = tng_fetch_assoc( $presult );
> tng_free_result($presult);
> 
> if(!empty($eventtype['display'])) {
36c42
< elseif( $eventtype['tag'] )
---
> elseif(!empty($eventtype['tag']))
49c55
< $xnotestr = $noteID ? " OR persfamID = \"$noteID\"" : "";
---
> $xnotestr = isset($noteID) ? " OR persfamID = \"$noteID\"" : "";
72c78
< 			<td class="fieldnameback" width="445"><b><?php echo $admtext['title']; ?></b></td>
---
> 			<td class="fieldnameback" width="445"><b><?php echo $admtext['title2']; ?></b></td>
142a149,190
> <?php
> 	if($eventID != 'SLGC') {
> ?>
> 	<tr><td valign="top"><?php echo $admtext['events']; ?></td>
> 		<td>
> 			<select name="events[]" multiple size="8">
> <?php
> 		if(substr($persfamID,0,1) == $tngconfig['personprefix'] || substr($persfamID,-1) == $tngconfig['personsuffix']) {
> 			$altbirthtag = !empty($prow['altbirthtype']) ? $prow['altbirthtype'] : "CHR";
> 			$stdevents = ['BIRT',$altbirthtag,'DEAT','BURI'];
> 			if(!$ldsdefault)
> 				array_push($stdevents,'BAPL','CONL','INIT','ENDL');
> 		}
> 		elseif(substr($persfamID,0,1) == $tngconfig['familyprefix'] || substr($persfamID,-1) == $tngconfig['familysuffix']) {
> 			$stdevents = ['MARR','DIV'];
> 			if(!$ldsdefault)
> 				array_push($stdevents,'SLGS');
> 		}
> 		foreach($stdevents as $event) {
> 			echo "<option value=\"$event\"";
> 			if($event == $eventID) echo " selected";
> 			echo ">{$admtext[$event]}</option>\n";
> 		}
> 		$query = "SELECT tag, eventID, display, eventdate FROM ($events_table, $eventtypes_table) 
> 			WHERE persfamID = \"$persfamID\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND gedcom = \"$tree\" AND keep = \"1\" AND parenttag = \"\" 
> 			ORDER BY ordernum, tag, description";
> 		$custevents = tng_query($query);
> 		while ( $custevent = tng_fetch_assoc( $custevents ) )	{
> 			$displayval = getEventDisplay( $custevent['display'] );
> 			$eventdate = $custevent['eventdate'] ? " (" . displayDate($custevent['eventdate']) . ")" : "";
> 			echo "<option value=\"{$custevent['eventID']}\"";
> 			if($custevent['eventID'] == $eventID) echo " selected";
> 			echo ">{$displayval}{$eventdate}</option>\n";
> 		}
> 		tng_free_result( $custevents );
> ?>
> 			</select>
> 		</td>
> 	</tr>
> <?php
> 	}
> ?>
162c210
< 		   	<td><?php echo $admtext['title']; ?>: </td>
---
> 		   	<td><?php echo $admtext['title2']; ?>: </td>
diff -r TNG/admin_cleartree.php TNG1403/admin_cleartree.php
20a21
> if(!isset($gedcom)) $gedcom = "";
diff -r TNG/admin_corner.php TNG1403/admin_corner.php
9c9
< <div class="center"><a href="http://lythgoes.net/genealogy/software.php" target="_blank"><img src="img/tnglogo.gif" alt="The Next Generation of Genealogy Sitebuilding" width="113" height="50" border="0"></a></div>
---
> <div class="center"><a href="https://tngsitebuilding.com" target="_blank"><img src="img/tnglogo.gif" alt="The Next Generation of Genealogy Sitebuilding" width="113" height="50" border="0"></a></div>
diff -r TNG/admin_cust_text_update.php TNG1403/admin_cust_text_update.php
83a84,85
> ?>
> <input type="button" class="btn" value="Click to close" onclick="self.close()">
\ No newline at end of file
diff -r TNG/admin_dataimport.php TNG1403/admin_dataimport.php
4c4
< $textpart = "index";
---
> $textpart = "gedimport";
13,14d12
< //$checksecs = $tngconfig['checksecs'] && is_numeric($tngconfig['checksecs']) ? $tngconfig['checksecs'] : 20;
< 
28a27,28
> if( !isset($tngimpcfg['defimpopt']) ) $tngimpcfg['defimpopt'] = 0;
> if( !isset($debug) ) $debug = false;
42d41
< $flags['tabs'] = $tngconfig['tabs'];
62d60
< var checksecs = <?php if(isset($checksecs)) {echo $checksecs * 1000;} else {echo "10000";} ?>;
68a67,71
> var finished_msg = "<?php echo $admtext['finishedimporting']; ?>";
> var importing_msg = "<?php echo $admtext['importinggedcom']; ?>";
> var removeged_msg = "<?php echo $admtext['removeged']; ?>";
> var close_msg = "<?php echo $text['closewindow']; ?>";
> var more_options = "<?php echo $admtext['secondary']; ?>";
86,87d88
< <body background="img/background.gif">
< 
88a90,91
> 	echo tng_adminlayout();
> 
101c104
< 	$datatabs['2'] = array(1,"admin_secondmenu.php",$admtext['secondarymaint'],"second");
---
> 	$datatabs['2'] = array(1,"admin_secondmenu.php",$admtext['secondary'],"second");
104c107
< 	echo displayHeadline($admtext['datamaint'] . " &gt;&gt; " . $admtext['gedimport'],"img/data_icon.gif",$menu,$message);
---
> 	echo displayHeadline($admtext['datamaint'] . " &gt;&gt; " . $admtext['gedimport'], "img/data_icon.gif", $menu, (isset($message) ? $message : ""));
106a110
> <div class="admin-main">
108,110c112,114
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
132,133c136,137
< <tr class="databack">
< <td class="tngshadow" id="desttree">
---
> <tr>
> <td class="tngshadow databack" id="desttree">
145c149
< 	if( $newtree && $newtree == $trees[$treectr] ) echo " selected";
---
> 	if( !empty($newtree) && $newtree == $trees[$treectr] ) echo " selected";
154c158
< 				&nbsp; <input type="button" name="newtree" value="<?php echo $admtext['addnewtree']; ?>" onclick="tnglitbox = new LITBox('admin_newtree.php?beforeimport=yes',{width:600,height:530});">
---
> 				&nbsp; <input type="button" name="newtree" value="<?php echo $admtext['addnewtree']; ?>" onclick="tnglitbox = new LITBox('admin_newtree.php?beforeimport=yes',{width:600,height:560});">
172,173c176,177
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
182c186
< 				<span class="smaller"><em><?php echo $admtext['imphints']; ?></em></span>
---
> 				<span><em><?php echo $admtext['imphints']; ?></em></span>
204c208,215
< 	</table><br/>
---
> 	</table>
> 	<p>
> 		<ul class="normal">
> 			<li><em><?php echo $admtext['stopbackup']; ?></em></li>
> 			<li><em><?php echo $admtext['chkprefixes']; ?></em></li>
> 			<li><em><?php echo $admtext['chkimpsettings']; ?></em></li>
> 		</ul>
> 	</p>
212a224
> </div>
214,216c226,228
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_data_validation.php TNG1403/admin_data_validation.php
18c18
< else
---
> else {
19a20,22
> 	if( empty($tree) && isset( $_COOKIE['tng_val_post']['tree']) )
> 		$tree = $_COOKIE['tng_val_post']['tree'];
> }
31,32c34
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['validation'], $flags );
---
> tng_adminheader( $admtext['dataval'], $flags );
48,49d49
< <body background="img/background.gif">
< 
50a51,52
> 	echo tng_adminlayout();
> 
56d57
< 	$innermenu .= " &nbsp;|&nbsp; <a href=\"$mostwanted_url\" target=\"_blank\" class=\"lightlink\">{$admtext['test']}</a>";
60c61
< 	$reports = array('wr_gender','unk_gender','marr_young','marr_aft_death','marr_bef_birth','died_bef_birth','parents_younger','children_late','not_living','not_dead')
---
> 	$reports = array('wr_gender','unk_gender','marr_young','marr_aft_death','marr_bef_birth','died_bef_birth','parents_younger','children_late','not_living','not_dead');
63,65c64,65
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
78,79c78
< 	if( !$assignedtree )
< 	echo "	<option value=\"\">{$admtext['alltrees']}</option>\n";
---
> 		echo "	<option value=\"\">{$admtext['alltrees']}</option>\n";
83c82
< 		if( $treerow['gedcom'] == $tree ) echo " selected";
---
> 		if( isset($tree) && $treerow['gedcom'] == $tree ) echo " selected";
95c94
< 	<table cellpadding="5" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="5" cellspacing="1" border="0" class="normal rounded-table">
101c100,101
< 	for($i = 1; $i <= count($reports); $i++) {
---
> 	$num_reports = count($reports);
> 	for($i = 1; $i <= $num_reports; $i++) {
112,122c112,116
< 
< <?php
< 
< ?>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_defphotos.php TNG1403/admin_defphotos.php
18c18
< $query = "SELECT DISTINCT personID FROM $medialinks_table WHERE gedcom='$tree'";
---
> $query = "SELECT DISTINCT personID FROM $medialinks_table WHERE linktype != 'C' and linktype != '' and gedcom='$tree'";
59c59
< adminwritelog( $admtext['assigndef'] . ": {$admtext['defsassigned']}: $defsdone;" );
---
> adminwritelog( $admtext['assigndefs'] . ": {$admtext['defsassigned']}: $defsdone;" );
diff -r TNG/admin_deletealbum.php TNG1403/admin_deletealbum.php
24a25,26
> $_SESSION['albumcount'] = isset($_SESSION['albumcount']) ? $_SESSION['albumcount'] - 1 : 0;
> 
diff -r TNG/admin_deleteassoc.php TNG1403/admin_deleteassoc.php
7a8
> $admin_login = 1;
14a16,19
> //delete the association going in the opposite direction
> $query = "DELETE FROM $assoc_table WHERE personID=\"$passocID\" AND passocID=\"$personID\" AND gedcom=\"$tree\"";
> $result = tng_query($query);
> 
diff -r TNG/admin_deletecitation.php TNG1403/admin_deletecitation.php
7a8
> $admin_login = 1;
diff -r TNG/admin_deleteentity.php TNG1403/admin_deleteentity.php
23c23
< $newname = get_magic_quotes_gpc() == 0 ? addslashes( $delitem ) : $delitem;
---
> $newname = addslashes( $delitem );
diff -r TNG/admin_deleteevent.php TNG1403/admin_deleteevent.php
31c31
< $query = "SELECT xnoteID FROM $notelinks_table WHERE eventID=\"$eventID\"";
---
> $query = "DELETE FROM $medialinks_table WHERE eventID=\"$eventID\"";
33,34d32
< $row = tng_fetch_assoc( $result );
< if($result) tng_free_result( $result );
36c34
< $query = "SELECT count(ID) as xcount FROM $notelinks_table WHERE xnoteID=\"{$row['xnoteID']}\"";
---
> $query = "SELECT xnoteID FROM $notelinks_table WHERE eventID=\"$eventID\"";
40,41c38,40
< if( $row['xcount'] == 1 ) {
< 	$query = "DELETE FROM $xnotes_table WHERE ID=\"{$row['xnoteID']}\"";
---
> 
> if(!empty($row['xnoteID'])) {
> 	$query = "SELECT count(ID) as xcount FROM $notelinks_table WHERE xnoteID=\"{$row['xnoteID']}\"";
42a42,47
> 	$row = tng_fetch_assoc( $result );
> 	if($result) tng_free_result( $result );
> 	if( $row['xcount'] == 1 ) {
> 		$query = "DELETE FROM $xnotes_table WHERE ID=\"{$row['xnoteID']}\"";
> 		$result = tng_query($query);
> 	}
diff -r TNG/admin_deletefile.php TNG1403/admin_deletefile.php
16,18c16,25
< $deleted = false;
< if( file_exists( $filename ) )
< 	$deleted = unlink( $filename );
---
> if($upgrade) {
> 	$fullpath = $rootpath . $filename;
> 	if(!empty($dbupgrade) && file_exists($rootpath . $dbupgrade))
> 		unlink($rootpath . $dbupgrade);
> }
> else {
> 	include($subroot . "importconfig.php");
> 	$fullpath = !empty($tngimpcfg['saveconfig']) ? ($subroot . $gedpath . "/" . $filename) : ($rootpath . $gedpath . "/" . $filename);
> }
> $deleted = file_exists( $fullpath ) ? unlink( $fullpath ) : false;
20c27,30
< echo $deleted ? $admtext['deleted'] . "&nbsp;<img src=\"img/tng_check.gif\"/>" : $admtext['notdeleted'];
---
> if($upgrade)
> 	header("Location: admin.php");
> else
> 	echo $deleted ? $admtext['deleted'] . "&nbsp;<img src=\"img/tng_check.gif\"/>" : $admtext['notdeleted'];
diff -r TNG/admin_deletenote.php TNG1403/admin_deletenote.php
7a8
> $admin_login = 1;
diff -r TNG/admin_deleteselected.php TNG1403/admin_deleteselected.php
27c27
< if( $xsrcaction ) {
---
> if( !empty($xsrcaction) ) {
33c33
< elseif( $xrepoaction ) {
---
> elseif( !empty($xrepoaction) ) {
39c39
< elseif( $xperaction ) {
---
> elseif( !empty($xperaction) ) {
45c45
< elseif( $xfamaction ) {
---
> elseif( !empty($xfamaction) ) {
51c51
< elseif( $xplacaction ) {
---
> elseif( !empty($xplacaction) ) {
57c57
< elseif( $xtimeaction ) {
---
> elseif( !empty($xtimeaction) ) {
63c63
< elseif( $xuseraction ) {
---
> elseif( !empty($xuseraction) ) {
69c69
< elseif( $xbranchaction ) {
---
> elseif( !empty($xbranchaction) ) {
75c75,81
< elseif( $xruseraction ) {
---
> elseif( !empty($xtreeaction) ) {
> 	$query = "DELETE FROM $trees_table WHERE 1=0";
> 	$modmsg = "trees";
> 	$id = "gedcom";
> 	$location = "admin_trees.php";
> }
> elseif( !empty($xruseraction) ) {
81c87
< elseif( $xcemaction ) {
---
> elseif( !empty($xcemaction) ) {
87c93
< elseif( $xnoteaction ) {
---
> elseif( !empty($xnoteaction) ) {
105c111
< 		if( $xperaction ) {
---
> 		if( !empty($xperaction) ) {
113c119
< 		elseif( $xfamaction ) {
---
> 		elseif( !empty($xfamaction) ) {
134c140
< 		elseif( $xsrcaction ) {
---
> 		elseif( !empty($xsrcaction) ) {
149c155
< 		elseif( $xrepoaction ) {
---
> 		elseif( !empty($xrepoaction) ) {
171c177
< 		elseif( $xplacaction ) {
---
> 		elseif( !empty($xplacaction) ) {
180c186
< 		elseif( $xtimeaction ) {
---
> 		elseif( !empty($xtimeaction) ) {
185c191,195
< 		elseif( $xuseraction || $xruseraction ) {
---
> 		elseif( !empty($xtreeaction) ) {
> 			include("micro_deletetrees.php");
> 			$items[] = $thisid;
> 		}
> 		elseif( !empty($xuseraction) || !empty($xruseraction) ) {
195c205
< 		elseif( $xbranchaction ) {
---
> 		elseif( !empty($xbranchaction) ) {
202c212
< 		elseif( $xcemaction ) {
---
> 		elseif( !empty($xcemaction) ) {
211c221
< 		elseif( $xnoteaction ) {
---
> 		elseif( !empty($xnoteaction) ) {
223c233
< 	$message = $admtext['changestoallitems'] . " " . $admtext['succsaved'] . ".";
---
> 	$message = $admtext['allitemsdeleted'];
diff -r TNG/admin_diagnostics.php TNG1403/admin_diagnostics.php
26d25
< $flags['tabs'] = $tngconfig['tabs'];
31,32d29
< <body background="img/background.gif">
< 
33a31,32
> 	echo tng_adminlayout();
> 
42c41,42
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback normal">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="rounded-table">
53c53
< 	if ($phpver >= 5.3) { 
---
> 	if ($phpver >= 7.0) { 
219,220c219,221
< 			if (!(dirExists($backuppath))) {
< 				$ftext .= "<p>$orange&nbsp;{$admtext['folderdne']} $backuppath ($rootpath$backuppath)</p>";
---
> 			$fullbackuppath = !empty($tngconfig['saveconfig']) ? $subroot . $backuppath : $rootpath . $backuppath;
> 			if (!(dirExists($fullbackuppath))) {
> 				$ftext .= "<p>$orange&nbsp;{$admtext['folderdne']} $backuppath ($fullbackuppath)</p>";
223,224c224,225
< 				if (!(dirReadWrite($myuserid,$mygroupid,$backuppath))) {
< 					$ftext .= "<p>$orange&nbsp;{$admtext['rofolder']} $backuppath ($rootpath$backuppath)</p>";
---
> 				if (!(dirReadWrite($myuserid,$mygroupid,$fullbackuppath))) {
> 					$ftext .= "<p>$orange&nbsp;{$admtext['rofolder']} $backuppath ($fullbackuppath)</p>";
227,228c228,230
< 			if (!(dirExists($gedpath))) {
< 				$ftext .= "<p>$orange&nbsp;{$admtext['folderdne']} $gedpath ($rootpath$gedpath)</p>";
---
> 			$fullgedpath = !empty($tngimpcfg['saveconfig']) ? $subroot . $gedpath : $rootpath . $gedpath;
> 			if (!(dirExists($fullgedpath))) {
> 				$ftext .= "<p>$orange&nbsp;{$admtext['folderdne']} $gedpath ($fullgedpath)</p>";
231,232c233,234
< 				if (!(dirReadWrite($myuserid,$mygroupid,$gedpath))) {
< 					$ftext .= "<p>$orange&nbsp;{$admtext['rofolder']} $gedpath ($rootpath$gedpath)</p>";
---
> 				if (!(dirReadWrite($myuserid,$mygroupid,$fullgedpath))) {
> 					$ftext .= "<p>$orange&nbsp;{$admtext['rofolder']} $gedpath ($fullgedpath)</p>";
254,256c256
< <?php echo "<div align=\"right\" class=\"normal\">$tng_title, v.$tng_version</div>"; ?>
< </body>
< </html>
---
> </div>
355a356,357
> 
> echo tng_adminfooter();
diff -r TNG/admin_dna_groups.php TNG1403/admin_dna_groups.php
1,229c1,231
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "dna";
< include("$mylanguage/admintext.php");
< 
< $admin_login = 1;
< include("checklogin.php");
< include("version.php");
< 
< if( !$allow_delete || ( $assignedtree && $assignedtree != $tree ) ) {
< 	$message = $admtext['norights'];
< 	header( "Location: admin_login.php?message=" . urlencode($message) );
< 	exit;
< }
< 
< function getGroupCount($tree, $group, $table) {
< 	global $admtext;
< 
< 	$query = "SELECT count(dna_group) as count FROM $table WHERE gedcom = \"$tree\" and dna_group LIKE \"%$group%\"";
< 	$result = tng_query($query);
< 	$row = tng_fetch_assoc($result);
< 	$count = $row['count'];
< 	if(!$count) $count = "0";
<  	tng_free_result($result);
< 
< 	return $count;
< }
< 
< $tng_search_groups = $_SESSION['tng_search_groups'] = 1;
< if( $newsearch ) {
< 	$exptime = 05;
< 	setcookie("tng_search_groups_post[tree]", $tree, $exptime);
< 	setcookie("tng_search_groups_post[tngpage]", 1, $exptime);
< 	setcookie("tng_search_groups_post[offset]", 0, $exptime);
< }
< else {
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_search_groups_post']['tree'];
< 	if( !isset($offset) ) {
< 		$tngpage = $_COOKIE['tng_search_groups_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_groups_post']['offset'];
< 	}
< 	else {
< 		$exptime = 0;
< 		setcookie("tng_search_groups_post[tngpage]", $tngpage, $exptime);
< 		setcookie("tng_search_groups_post[offset]", $offset, $exptime);
< 	}
< }
< 
< if( $offset ) {
< 	$offsetplus = $offset + 1;
< 	$newoffset = "$offset, ";
< }
< else {
< 	$offsetplus = 1;
< 	$newoffset = "";
< 	$tngpage = 1;
< }
< 
< if( $assignedtree ) {
< 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
< 	$tree = $assignedtree;
< }
< else
< 	$wherestr = "";
< $orgtree = $tree;
< $treequery = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
< 
< $wherestr = "";
< if( $tree )
< 	$wherestr .= "WHERE $dna_groups_table.gedcom = \"$tree\"";
< $query = "SELECT $dna_groups_table.gedcom as gedcom, dna_group, $dna_groups_table.description as description, test_type, treename FROM $dna_groups_table LEFT JOIN $trees_table ON $trees_table.gedcom = $dna_groups_table.gedcom $wherestr ORDER BY $dna_groups_table.description LIMIT $newoffset" . $maxsearchresults;
< $result = tng_query($query);
< 
< $numrows = tng_num_rows( $result );
< if( $numrows == $maxsearchresults || $offsetplus > 1 ) {
< 	$query = "SELECT count(dna_group) as gcount FROM $dna_groups_table LEFT JOIN $trees_table ON $trees_table.gedcom = $dna_groups_table.gedcom $wherestr";
< 	$result2 = tng_query($query);
< 	$row = tng_fetch_assoc( $result2 );
< 	$totrows = $row['gcount'];
< 	tng_free_result($result2);
< }
< else
< 	$totrows = $numrows;
< 
< $helplang = findhelp("dna_help.php");
< 
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['dna_groups'], $flags );
< ?>
< <script type="text/javascript">
< function confirmDelete(ID,tree) {
< 	if(confirm('<?php echo $admtext['confgroupdelete']; ?>' ))
< 		deleteIt('dnagroup',ID,tree);
< 	return false;
< }
< </script>
< <script type="text/javascript" src="js/admin.js"></script>
< </head>
< 
< <body background="img/background.gif">
< 
< <?php
< 	$dnatabs['0'] = array(1,"admin_dna_groups.php",$admtext['search'],"findgroup");
< 	$dnatabs['1'] = array($allow_add,"admin_new_dna_group.php",$admtext['addnew'],"addgroup");
< 	$dnatabs['2'] = array(1,"admin_dna_tests.php",$admtext['dna_tests'],"findtest");
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
< 	$menu = doMenu($dnatabs,"findgroup",$innermenu);
< 	echo displayHeadline($admtext['dna_groups'],"img/dna_icon.gif",$menu,$message);
< ?>
< 
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
< 
< 	<form action="admin_dna_groups.php" name="form1" id="form1">
< 	<table>
< 		<tr>
< 			<td><span class="normal"><?php echo $admtext['searchfor']; ?>: </span></td>
< 			<td>
< 				<select name="tree">
< <?php
< 	if( !$assignedtree )
< 		echo "	<option value=\"\">{$admtext['alltrees']}</option>\n";
< 	$treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
< 	while( $treerow = tng_fetch_assoc($treeresult) ) {
< 		echo "	<option value=\"{$treerow['gedcom']}\"";
< 		if( $treerow['gedcom'] == $tree ) echo " selected";
< 		echo ">{$treerow['treename']}</option>\n";
< 	}
< 	tng_free_result($treeresult);
< ?>
< 				</select>
< 			</td>
< 			<td>
< 				<input type="submit" name="submit" value="<?php echo $admtext['search']; ?>" class="aligntop">
< 				<input type="submit" name="submit" value="<?php echo $admtext['reset']; ?>" onClick="document.form1.tree.selectedIndex=0;" class="aligntop">
< 			</td>
< 		</tr>
< 	</table>
< 
< 	<input type="hidden" name="findgroup" value="1"><input type="hidden" name="newsearch" value="1">
< 	</form><br />
< 
< <?php
< 	$numrowsplus = $numrows + $offset;
< 	if( !$numrowsplus ) $offsetplus = 0;
< 	echo displayListLocation($offsetplus,$numrowsplus,$totrows);
< 	$pagenav = get_browseitems_nav( $totrows, "admin_dna_groups.php?offset", $maxsearchresults, 5 );
< 	echo " &nbsp; <span class=\"adminnav\">$pagenav</span></p>";
< ?>
< 	<form action="admin_updateselectedgroup.php" method="post"  name="form2">
< <?php
< 	if( $allow_delete ) {
< ?>
< 		<p class="nw">
< 		<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onClick="toggleAll(1);">
< 		<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onClick="toggleAll(0);">
<   		<input type="submit" name="xdnagroupaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
< 		</p>
< <?php
< 	}
< ?>
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
< 		<tr class="fieldnameback fieldname nw"r>
< 			<td><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></td>
< <?php
< 	if($allow_delete) {
< ?>
< 			<td><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</nobr></span></td>
< <?php
< 	}
< ?>
< 			<td>&nbsp;<b><?php echo $admtext['groupid']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $admtext['description']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $admtext['tree']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $admtext['test_type']; ?></b>&nbsp;</td>
< 			<td>&nbsp;<b><?php echo $admtext['dna_tests']; ?></b>&nbsp;</td>
< 		</tr>
< 
< <?php
< 	if( $numrows ) {
< 		$actionstr = "";
< 		if( $allow_edit )
< 			$actionstr .= "<a href=\"admin_edit_dna_group.php?dna_group=xxx&amp;tree=yyy&amp;test_type=zzz\" title=\"{$admtext['edit']}\" class=\"smallicon admin-edit-icon\"></a>";
< 		if( $allow_delete ) {
< 			if( !$assignedtree )
< 				$actionstr .= "<a href=\"#\" onClick=\"return confirmDelete('xxx','yyy');\" title=\"{$admtext['text_delete']}\" class=\"smallicon admin-delete-icon\"></a>";
< 		}
< 
< 		while( $row = tng_fetch_assoc($result)) {
< 			$newactionstr = preg_replace( "/xxx/", $row['dna_group'], $actionstr );
< 			$newactionstr = preg_replace( "/yyy/", $row['gedcom'], $newactionstr );
< 			$newactionstr = preg_replace( "/zzz/", $row['test_type'], $newactionstr );
< 			echo "<tr id=\"row_{$row['dna_group']}\"><td class=\"lightback\"><div>$newactionstr</div></td>\n";
< 			if($allow_delete)
< 				echo "<td class=\"lightback\" align=\"center\"><input type=\"checkbox\" name=\"dna{$row['dna_group']}\" value=\"1\"></td>";
< 			$editlink = "admin_edit_dna_group.php?dna_group={$row['dna_group']}&tree={$row['gedcom']}";
< 			$id = $allow_edit ? "<a href=\"$editlink\" title=\"{$admtext['edit']}\">" . $row['dna_group'] . "</a>" : $row['dna_group'];
< 
< 			echo "<td class=\"lightback\" nowrap>&nbsp;{$row['dna_group']}</td>\n";
< 			echo "<td class=\"lightback\">&nbsp;{$row['description']}</td>\n";
< 			echo "<td class=\"lightback\">&nbsp;{$row['treename']}&nbsp;</td>\n";
< 			echo "<td class=\"lightback\">{$row['test_type']}&nbsp;</td>\n";
< 			$pcount = getGroupCount($row['gedcom'], $row['dna_group'], $dna_tests_table);
< 			echo "<td class=\"lightback\" style=\"text-align:right\">$pcount&nbsp;</td>\n";
< 			echo "</tr>\n";
< 		}
< 		tng_free_result($result);
< ?>
< 	</table>
< <?php
< 		echo displayListLocation($offsetplus,$numrowsplus,$totrows);
< 		echo " &nbsp; <span class=\"adminnav\">$pagenav</span></p>";
< 	}
< 	else
< 		echo $admtext['notrees'];
< ?>
< 
< 	</div>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "dna";
> include("$mylanguage/admintext.php");
> 
> $admin_login = 1;
> include("checklogin.php");
> include("version.php");
> 
> if( !$allow_delete || ( $assignedtree && $assignedtree != $tree ) ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> function getGroupCount($tree, $group, $table) {
> 	global $admtext;
> 
> 	$query = "SELECT count(dna_group) as count FROM $table WHERE gedcom = \"$tree\" and dna_group = \"$group\"";
> 	$result = tng_query($query);
> 	$row = tng_fetch_assoc($result);
> 	$count = $row['count'];
> 	if(!$count) $count = "0";
>  	tng_free_result($result);
> 
> 	return $count;
> }
> if( !isset($offset) ) $offset = 0;
> 
> $tng_search_groups = $_SESSION['tng_search_groups'] = 1;
> if( !empty($newsearch) ) {
> 	$exptime = 05;
> 	setcookie("tng_search_groups_post[tree]", $tree, $exptime);
> 	setcookie("tng_search_groups_post[tngpage]", 1, $exptime);
> 	setcookie("tng_search_groups_post[offset]", 0, $exptime);
> }
> else {
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_search_groups_post']['tree']) ? $_COOKIE['tng_search_groups_post']['tree'] : "";
> 	if( !isset($offset) ) {
> 		$tngpage = isset($_COOKIE['tng_search_groups_post']['tngpage']) ? $_COOKIE['tng_search_groups_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_groups_post']['offset']) ? $_COOKIE['tng_search_groups_post']['offset'] : 0;
> 	}
> 	else {
> 		$exptime = 0;
> 		if( !isset($tngpage) ) $tngpage = 1;
> 		setcookie("tng_search_groups_post[tngpage]", $tngpage, $exptime);
> 		setcookie("tng_search_groups_post[offset]", $offset, $exptime);
> 	}
> }
> 
> if( $offset ) {
> 	$offsetplus = $offset + 1;
> 	$newoffset = "$offset, ";
> }
> else {
> 	$offsetplus = 1;
> 	$newoffset = "";
> 	$tngpage = 1;
> }
> 
> if( $assignedtree ) {
> 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
> 	$tree = $assignedtree;
> }
> else
> 	$wherestr = "";
> $orgtree = $tree;
> $treequery = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
> 
> $wherestr = "";
> if( $tree )
> 	$wherestr .= "WHERE $dna_groups_table.gedcom = \"$tree\"";
> $query = "SELECT $dna_groups_table.gedcom as gedcom, dna_group, $dna_groups_table.description as description, test_type, treename FROM $dna_groups_table LEFT JOIN $trees_table ON $trees_table.gedcom = $dna_groups_table.gedcom $wherestr ORDER BY $dna_groups_table.description LIMIT $newoffset" . $maxsearchresults;
> $result = tng_query($query);
> 
> $numrows = tng_num_rows( $result );
> if( $numrows == $maxsearchresults || $offsetplus > 1 ) {
> 	$query = "SELECT count(dna_group) as gcount FROM $dna_groups_table LEFT JOIN $trees_table ON $trees_table.gedcom = $dna_groups_table.gedcom $wherestr";
> 	$result2 = tng_query($query);
> 	$row = tng_fetch_assoc( $result2 );
> 	$totrows = $row['gcount'];
> 	tng_free_result($result2);
> }
> else
> 	$totrows = $numrows;
> 
> $helplang = findhelp("dna_help.php");
> 
> tng_adminheader( $admtext['dna_groups'], $flags );
> ?>
> <script type="text/javascript">
> //<![CDATA[
> function confirmDelete(ID,tree) {
> 	if(confirm('<?php echo $admtext['confgroupdelete']; ?>' ))
> 		deleteIt('dnagroup',ID,tree);
> 	return false;
> }
> //]]>
> </script>
> </head>
> 
> <?php
> 	echo tng_adminlayout();
> 
> 	$dnatabs['0'] = array(1,"admin_dna_groups.php",$admtext['search'],"findgroup");
> 	$dnatabs['1'] = array($allow_add,"admin_new_dna_group.php",$admtext['addnew'],"addgroup");
> 	$dnatabs['2'] = array(1,"admin_dna_tests.php",$admtext['dna_tests'],"findtest");
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
> 	$menu = doMenu($dnatabs,"findgroup",$innermenu);
> 	echo displayHeadline($admtext['dna_groups'],"img/dna_icon.gif",$menu,$message);
> ?>
> 
> <div class="admin-main">
> 	<div class="databack admin-block">
> 
> 	<form action="admin_dna_groups.php" name="form1" id="form1">
> 	<table>
> 		<tr>
> 			<td><span class="normal"><?php echo $admtext['tree']; ?>: </span></td>
> 			<td>
> 				<select name="tree">
> <?php
> 	if( !$assignedtree )
> 		echo "	<option value=\"\">{$admtext['alltrees']}</option>\n";
> 	$treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
> 	while( $treerow = tng_fetch_assoc($treeresult) ) {
> 		echo "	<option value=\"{$treerow['gedcom']}\"";
> 		if( $treerow['gedcom'] == $tree ) echo " selected";
> 		echo ">{$treerow['treename']}</option>\n";
> 	}
> 	tng_free_result($treeresult);
> ?>
> 				</select>
> 			</td>
> 			<td>
> 				<input type="submit" name="submit" value="<?php echo $admtext['search']; ?>" class="aligntop">
> 				<input type="submit" name="submit" value="<?php echo $admtext['reset']; ?>" onClick="document.form1.tree.selectedIndex=0;" class="aligntop">
> 			</td>
> 		</tr>
> 	</table>
> 
> 	<input type="hidden" name="findgroup" value="1"><input type="hidden" name="newsearch" value="1">
> 	</form><br />
> 
> <?php
> 	$numrowsplus = $numrows + $offset;
> 	if( !$numrowsplus ) $offsetplus = 0;
> 	echo displayListLocation($offsetplus,$numrowsplus,$totrows);
> 	$pagenav = get_browseitems_nav( $totrows, "admin_dna_groups.php?offset", $maxsearchresults, 5 );
> 	echo " &nbsp; <span class=\"adminnav\">$pagenav</span></p>";
> ?>
> 	<form action="admin_updateselectedgroup.php" method="post"  name="form2">
> <?php
> 	if( $allow_delete ) {
> ?>
> 		<p class="nw">
> 		<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onClick="toggleAll(1);">
> 		<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onClick="toggleAll(0);">
> 		<input type="submit" name="xdnagroupaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
> 		</p>
> <?php
> 	}
> ?>
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
> 		<tr class="fieldnameback fieldname nw">
> 			<td><span class="nw">&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</span></td>
> <?php
> 	if($allow_delete) {
> ?>
> 			<td><span class="fieldname nw">&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</span></td>
> <?php
> 	}
> ?>
> 			<td>&nbsp;<b><?php echo $admtext['groupid']; ?></b>&nbsp;</td>
> 			<td>&nbsp;<b><?php echo $admtext['description']; ?></b>&nbsp;</td>
> 			<td>&nbsp;<b><?php echo $admtext['tree']; ?></b>&nbsp;</td>
> 			<td>&nbsp;<b><?php echo $admtext['test_type']; ?></b>&nbsp;</td>
> 			<td>&nbsp;<b><?php echo $admtext['dna_tests']; ?></b>&nbsp;</td>
> 		</tr>
> 
> <?php
> 	if( $numrows ) {
> 		$actionstr = "";
> 		if( $allow_edit )
> 			$actionstr .= "<a href=\"admin_edit_dna_group.php?dna_group=xxx&amp;tree=yyy&amp;test_type=zzz\" title=\"{$admtext['edit']}\" class=\"smallicon admin-edit-icon\"></a>";
> 		if( $allow_delete ) {
> 			if( !$assignedtree )
> 				$actionstr .= "<a href=\"#\" onClick=\"return confirmDelete('xxx','yyy');\" title=\"{$admtext['text_delete']}\" class=\"smallicon admin-delete-icon\"></a>";
> 		}
> 
> 		while( $row = tng_fetch_assoc($result)) {
> 			$newactionstr = preg_replace( "/xxx/", $row['dna_group'], $actionstr );
> 			$newactionstr = preg_replace( "/yyy/", $row['gedcom'], $newactionstr );
> 			$newactionstr = preg_replace( "/zzz/", $row['test_type'], $newactionstr );
> 			echo "<tr id=\"row_{$row['dna_group']}\"><td class=\"lightback\"><div>$newactionstr</div></td>\n";
> 			if($allow_delete)
> 				echo "<td class=\"lightback\" align=\"center\"><input type=\"checkbox\" name=\"dna{$row['dna_group']}\" value=\"1\"></td>";
> 			$editlink = "admin_edit_dna_group.php?dna_group={$row['dna_group']}&amp;tree={$row['gedcom']}";
> 			$id = $allow_edit ? "<a href=\"$editlink\" title=\"{$admtext['edit']}\">" . $row['dna_group'] . "</a>" : $row['dna_group'];
> 
> 			echo "<td class=\"lightback nw\">&nbsp;{$row['dna_group']}</td>\n";
> 			echo "<td class=\"lightback\">&nbsp;{$row['description']}</td>\n";
> 			echo "<td class=\"lightback\">&nbsp;{$row['treename']}&nbsp;</td>\n";
> 			echo "<td class=\"lightback\">{$row['test_type']}&nbsp;</td>\n";
> 			$pcount = getGroupCount($row['gedcom'], $row['dna_group'], $dna_tests_table);
> 			echo "<td class=\"lightback\" style=\"text-align:right\">$pcount&nbsp;</td>\n";
> 			echo "</tr>\n";
> 		}
> 		tng_free_result($result);
> ?>
> 	</table>
> 	</form>
> <?php
> 		echo displayListLocation($offsetplus,$numrowsplus,$totrows);
> 		echo " &nbsp; <span class=\"adminnav\">$pagenav</span></p>";
> 	} else {
> ?>
> 	</table>
> 	</form>
> <?php
> 		echo $admtext['norecords'];
> 	}
> ?>
> 
> 	</div>
> </div>
> <?php
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_dna_tests.php TNG1403/admin_dna_tests.php
1,304c1,381
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "dna";
< include("personlib.php");
< include("tngdblib.php");
< include("$mylanguage/admintext.php");
< 
< $admin_login = true;
< include("checklogin.php");
< include("version.php");
< 
< if( $newsearch ) {
< 	$exptime = 0;
< 	$searchstring = stripslashes(trim($searchstring));
< 	setcookie("tng_search_dna_post[search]", $searchstring, $exptime);
< 	setcookie("tng_search_dna_post[test_type]", $test_type, $exptime);
< 	setcookie("tng_search_dna_post[tree]", $tree, $exptime);
< 	setcookie("tng_search_dna_post[tngpage]", 1, $exptime);
< 	setcookie("tng_search_dna_post[offset]", 0, $exptime);
< }
< else {
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_dna_post']['search']);
< 	if( !$test_type )
< 		$test_type = $_COOKIE['tng_search_dna_post']['test_type'];
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_search_dna_post']['tree'];
< 	if( !isset($offset) ) {
< 		$tngpage = $_COOKIE['tng_search_dna_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_dna_post']['offset'];
< 	}
< 	else {
< 		$exptime = 0;
< 		setcookie("tng_search_dna_post[tngpage]", $tngpage, $exptime);
< 		setcookie("tng_search_dna_post[offset]", $offset, $exptime);
< 	}
< }
< 
< if( $offset ) {
< 	$offsetplus = $offset + 1;
< 	$newoffset = "$offset, ";
< }
< else {
< 	$offsetplus = 1;
< 	$newoffset = "";
< 	$tngpage = 1;
< }
< 
< if( $assignedtree ) {
< 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
< 	$wherestr2 = " AND $dna_links_table.gedcom = \"$assignedtree\"";
< }
< else {
< 	$wherestr = "";
< 	if($tree) $wherestr2 = " AND $dna_links_table.gedcom = \"$tree\"";
< }
< $orgwherestr = $wherestr;
< $orgtree = $tree;
< 
< $show_dna_test_url = getURL( "show_dna_test", 1 );
< 
< $originalstring = preg_replace("/\"/", "&#34;",$searchstring);
< $searchstring = addslashes($searchstring);
< $wherestr = $searchstring ? "(test_number LIKE \"%$searchstring%\" OR vendor LIKE \"%$searchstring%\" OR urls LIKE \"%$searchstring%\" OR notes LIKE \"%$searchstring%\" OR dna_group LIKE \"%$searchstring%\" OR dna_group_desc LIKE \"%$searchstring%\" OR surnames LIKE \"%$searchstring%\")" : "";
< if( $assignedtree )
< 	$wherestr .= $wherestr ? " AND ($dna_tests_table.gedcom = \"$tree\" || $dna_tests_table.gedcom = \"\")" : "($dna_tests_table.gedcom = \"$tree\" || $dna_tests_table.gedcom = \"\")";
< elseif( $tree )
< 	$wherestr .= $wherestr ? " AND $dna_tests_table.gedcom = \"$tree\"" : "$dna_tests_table.gedcom = \"$tree\"";
< if( $test_type )
< 	$wherestr .= $wherestr ? " AND test_type = \"$test_type\"" : "test_type = \"$test_type\"";
< if( $wherestr ) $wherestr = "WHERE $wherestr";
< 
< $query = "SELECT testID, test_type, test_date, $dna_tests_table.personID, $dna_tests_table.gedcom, test_number, firstname, lastname, lnprefix, nameorder, suffix, prefix, title, person_name, confirmed, markeropt, notesopt, linksopt, surnamesopt, private_dna, dna_group, dna_group_desc, surnames, MD_ancestorID, MRC_ancestorID
< 	FROM $dna_tests_table 
< 	LEFT JOIN $people_table ON $people_table.personID = $dna_tests_table.personID AND $people_table.gedcom = $dna_tests_table.gedcom
< 	$wherestr ORDER BY test_number, test_date LIMIT $newoffset" . $maxsearchresults;
< $result = tng_query($query);
< 
< $numrows = tng_num_rows( $result );
< if( $numrows == $maxsearchresults || $offsetplus > 1 ) {
< 	$query = "SELECT count($dna_tests_table.testID) as tcount FROM $dna_tests_table $wherestr";
< 	$result2 = tng_query($query);
< 	$row = tng_fetch_assoc( $result2 );
< 	$totrows = $row['tcount'];
< 	tng_free_result($result2);
< }
< else
< 	$totrows = $numrows;
< 
< $helplang = findhelp("dna_help.php");
< 
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['dna_tests'], $flags );
< ?>
< <script type="text/javascript">
< var tnglitbox;
< var allow_edit = <?php echo ($allow_edit ? "1" : "0"); ?>;
< var allow_delete = <?php echo ($allow_delete ? "1" : "0"); ?>;
< 
< function resetForm() {
< 	document.form1.searchstring.value='';
< 	document.form1.tree.selectedIndex=0;
< 	document.form1.test_type.selectedIndex=0;
< }
< 
< function confirmDelete(testID) {
< 	if(confirm('<?php echo $admtext["confdeletedna"]; ?>' )){
< 		deleteIt('dna',testID);
< 	}
< 	return false;
< }
< </script>
< <script type="text/javascript" src="js/admin.js"></script>
< </head>
< 
< <body background="img/background.gif">
< 
< <?php
< 	$dnatabs[0] = array(1,"admin_dna_tests.php",$admtext['search'],"findtest");
< 	$dnatabs[1] = array($allow_add,"admin_new_dna_test.php",$admtext['addnew'],"addtest");
< 	$dnatabs[2] = array($allow_add,"admin_dna_groups.php",$admtext['dna_groups'],"dnagroups");
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#modify');\" class=\"lightlink\">{$admtext['help']}</a>";
< 	$menu = doMenu($dnatabs,"findtest",$innermenu);
< 	echo displayHeadline($admtext['dna_tests'],"img/dna_icon.gif",$menu,$message);
< ?>
< 
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
< 
< 	<form action="admin_dna_tests.php" name="form1" id="form1">
< 	<table class="normal">
< 		<tr>
< 			<td><?php echo $admtext['searchfor']; ?>: </td>
< 			<td>
< <?php
< 	$newwherestr = $wherestr;
< 	$wherestr = $orgwherestr;
< 	include("treequery.php");
< 	$wherestr = $newwherestr;
< ?>
< 				<input type="text" name="searchstring" value="<?php echo $originalstring; ?>" class="longfield">
< 				<input type="submit" name="submit" value="<?php echo $admtext['search']; ?>" class="aligntop">
< 				<input type="submit" name="submit" value="<?php echo $admtext['reset']; ?>" onClick="resetForm();" class="aligntop">
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['test_type']; ?>: </td>
< 			<td>
< 				<select name="test_type">
< 					<option value=""></option>
< 					<option value="atDNA"<?php if($test_type == "atDNA") echo " selected"; ?>>atDNA (Autosomal)</option>
< 					<option value="Y-DNA"<?php if($test_type == "Y-DNA") echo " selected"; ?>>Y-DNA</option>
< 					<option value="mtDNA"<?php if($test_type == "mtDNA") echo " selected"; ?>>mtDNA (Mitochondrial)</option>
< 					<option value="X-DNA"<?php if($test_type == "X-DNA") echo " selected"; ?>>X-DNA</option>
< 				</select>
< 			</td>
< 		</tr>
< 	</table>
< 
< 	<input type="hidden" name="findtest" value="1"><input type="hidden" name="newsearch" value="1">
< 	</form><br />
< <?php
< 	$numrowsplus = $numrows + $offset;
< 	if( !$numrowsplus ) $offsetplus = 0;
< 	echo displayListLocation($offsetplus,$numrowsplus,$totrows);
< 	$pagenav = get_browseitems_nav( $totrows, "admin_dna_tests.php?searchstring=$searchstring&amp;test_type=$test_type&amp;offset", $maxsearchresults, 5 );
< 	echo " &nbsp; <span class=\"adminnav\">$pagenav</span></p>";
< ?>
< 	<form action="admin_updateselecteddna.php" method="post"  name="form2">
< <?php
< 	if($allow_media_delete || $allow_media_edit) {
< ?>
< 		<p class="nw">
< 		<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onClick="toggleAll(1);">
< 		<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onClick="toggleAll(0);">&nbsp;&nbsp;
< <?php
< 		if( $allow_delete ) {
< ?>
< 		<input type="submit" name="xdnaaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">&nbsp;&nbsp;
< <?php
< 		}
< ?>
< 		</p>
< <?php
< 	}
< ?>
< 	
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
< 		<tr>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</td>
< <?php
< 	if($allow_edit || $allow_delete) {
< ?>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</td>
< <?php
< 	}
< ?>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['test_type']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['test_number']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['name']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['mda']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['mrca']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['privsection']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $text['testgroup']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['tree']; ?></b>&nbsp;</td>
< 		</tr>
< <?php
< 	if( $numrows ) {
< 		$actionstr = "";
< 		if( $allow_edit )
< 			$actionstr .= "<a href=\"admin_edit_dna_test.php?testID=xxx\" title=\"{$admtext['edit']}\" class=\"smallicon admin-edit-icon\"></a>";
< 		if( $allow_delete )
< 			$actionstr .= "<a href=\"#\" onclick=\"return confirmDelete('xxx');\" title=\"{$admtext['text_delete']}\" class=\"smallicon admin-delete-icon\"></a>";
< 		$actionstr .= "<a href=\"" . $show_dna_test_url . "testID=xxx\" target=\"_blank\" title=\"{$admtext['test']}\" class=\"smallicon admin-test-icon\"></a>";
< 
< 		while( $row = tng_fetch_assoc($result))
< 		{
< 			$newactionstr = preg_replace( "/xxx/", $row['testID'], $actionstr );
< 			echo "<tr id=\"row_{$row['testID']}\"><td class=\"lightback\" valign=\"top\"><div class=\"action-btns\">$newactionstr</div></td>\n";
< 			if($allow_edit || $allow_delete)
< 				echo "<td class=\"lightback\" valign=\"top\" align=\"center\"><input type=\"checkbox\" name=\"dna{$row['testID']}\" value=\"1\"></td>";
< 			$rights = determineLivingPrivateRights($row);
< 			$row['allow_living'] = $rights['living'];
< 			$row['allow_private'] = $rights['private'];
< 			echo "<td class=\"lightback\">&nbsp;{$row['test_type']}</td>\n";
< 			echo "<td class=\"lightback\">&nbsp;{$row['test_number']}</td>\n";
< 			$dbname = getName($row);
< 			if ($dbname)
< 				echo "<td class=\"lightback\">&nbsp;" . $dbname . "</td>\n";
< 			else
< 				echo "<td class=\"lightback\">&nbsp;" . $row['person_name'] . "<br />&nbsp;" . $admtext['person_name'] . "</td>\n";
< 			
< 			$mdanc_namestr = "";
< 			if($row['MD_ancestorID']) {
< 				$dna_anc_result = getPersonDataPlusDates($row['gedcom'], $row['MD_ancestorID']);
< 				$ancrow = tng_fetch_assoc($dna_anc_result);
< 				$dna_righttree = checktree($row['gedcom']);
< 				$dna_rightbranch = $dna_righttree ? checkbranch($row['branch']) : false;
< 				$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
< 				$ancrow['allow_living'] = $dprights['living'];
< 				$ancrow['allow_private'] = $dprights['private'];
< 				$vitalinfo = getBirthInfo($ancrow);
< 				$mdanc_namestr = getName( $ancrow ) . "<br />" . $vitalinfo;
< 
< 				tng_free_result($dna_anc_result);
< 			}
< 			$mrcanc_namestr = "";
< 			if($row['MRC_ancestorID']) {
< 				if ($row['MRC_ancestorID'][0] == $tngconfig['personprefix']) {
< 					$dna_anc_result = getPersonDataPlusDates($row['gedcom'], $row['MRC_ancestorID']);
< 					$ancrow = tng_fetch_assoc($dna_anc_result);
< 					$ancrow['allow_living'] = $ancrow['allow_private'] = 1;
< 					$vitalinfo = getBirthInfo($ancrow);
< 					$mrcanc_namestr = getName( $ancrow ) . "<br />" . $vitalinfo;
< 
< 					tng_free_result($dna_anc_result);
< 				}
< 				else if ($row['MRC_ancestorID'][0] == $tngconfig['familyprefix']) {
< 					$mrcaquery = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$row['MRC_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
< 					$dna_anc_result = tng_query($mrcaquery);
< 					$ancrow = tng_fetch_assoc($dna_anc_result);
< 					tng_free_result($dna_anc_result);
< 
< 					$ancrow['allow_living'] = $ancrow['allow_private'] = 1;
< 
< 					$mrcanc_namestr = getFamilyName( $ancrow );
< 				}
< 			}
< 			$privacy = $row['private_dna'] ? $admtext['text_private'] : $admtext['configsettings'];
< 			$query = "SELECT description FROM $dna_groups_table WHERE dna_group=\"{$row['dna_group']}\"";
< 			$descresult = tng_query($query);
< 			$descrow = tng_fetch_assoc( $descresult );
< 			tng_free_result($descresult);
< 			$group = $row['dna_group'] ? $descrow['description'] : $text['none'];
< 			echo "<td class=\"lightback\">&nbsp;" . $mdanc_namestr . "</td>\n";
< 			echo "<td class=\"lightback\">&nbsp;" . $mrcanc_namestr . "</td>\n";
< 			echo "<td class=\"lightback\">&nbsp;" . $privacy . "</td>\n";
< 			echo "<td class=\"lightback\">&nbsp;" . $group . "</td>\n";
< 			echo "<td class=\"lightback\">&nbsp;" . $row['gedcom'] . "</td>\n";
< 
< 			echo "</tr>\n";
< 		}
< ?>
< 	</table>
< <?php
< 		echo displayListLocation($offsetplus,$numrowsplus,$totrows);
< 		echo " &nbsp; <span class=\"adminnav\">$pagenav</span></p>";
< 	}
< 	else
< 		echo "</table>\n" . $admtext['norecords'];
<   	tng_free_result($result);
< ?>
< 	</form>
< 
< 	</div>
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "dna";
> include("personlib.php");
> include("tngdblib.php");
> include("$mylanguage/admintext.php");
> 
> $admin_login = true;
> include("checklogin.php");
> include("version.php");
> function get_test_groups($test_type, $test_group) {
> 	global $admtext, $dna_groups_table;
> 	$wherestr2 = $test_type ? " AND test_type = \"$test_type\"" : "";
> 	$groupquery = "SELECT dna_group, description, test_type, gedcom FROM $dna_groups_table WHERE description IS NOT NULL $wherestr2 ORDER BY description";
> 	$groupsel = "	<option value=\"\">{$admtext['allgroups']}</option>\n";
> 	$groupresult = tng_query($groupquery);
> 	while( $grouprow = tng_fetch_assoc($groupresult) ) {
> 		$groupsel .= "	<option value=\"{$grouprow['dna_group']}\"";
> 		if( $grouprow['dna_group'] == $test_group ) $groupsel .= " selected";
> 		$groupsel .= ">{$grouprow['description']}</option>\n";
> 	}
> 	tng_free_result($groupresult);
> 	return $groupsel;
> }
> 
> // $tree is not always set when entering with a new search.
> if( !isset($tree) ) $tree = "";
> if( !empty($newsearch) ) {
> 	$exptime = 0;
> 	$searchstring = stripslashes(trim($searchstring));
> 	setcookie("tng_search_dna_post[search]", $searchstring, $exptime);
> 	setcookie("tng_search_dna_post[test_type]", $test_type, $exptime);
> 	setcookie("tng_search_dna_post[test_group]", $test_group, $exptime);
> 	setcookie("tng_search_dna_post[tree]", $tree, $exptime);
> 	setcookie("tng_search_dna_post[tngpage]", 1, $exptime);
> 	setcookie("tng_search_dna_post[offset]", 0, $exptime);
> }
> else {
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_dna_post']['search']) ? stripslashes($_COOKIE['tng_search_dna_post']['search']) : "";
> 	if( empty($test_type) )
> 		$test_type = isset($_COOKIE['tng_search_dna_post']['test_type']) ? $_COOKIE['tng_search_dna_post']['test_type'] : "";
> 	if( empty($test_group) )
> 		$test_group = isset($_COOKIE['tng_search_dna_post']['test_group']) ? $_COOKIE['tng_search_dna_post']['test_group'] : "";
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_search_dna_post']['tree']) ? $_COOKIE['tng_search_dna_post']['tree'] : "";
> 	if( !isset($offset) ) {
> 		$tngpage = isset($_COOKIE['tng_search_dna_post']['tngpage']) ? $_COOKIE['tng_search_dna_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_dna_post']['offset']) ? $_COOKIE['tng_search_dna_post']['offset'] : 0;
> 	}
> 	else {
> 		$exptime = 0;
> 		if( !isset($tngpage) ) $tngpage = 1;
> 		setcookie("tng_search_dna_post[tngpage]", $tngpage, $exptime);
> 		setcookie("tng_search_dna_post[offset]", $offset, $exptime);
> 	}
> }
> 
> if(!isset($offset)) $offset = 0;
> if( $offset ) {
> 	$offsetplus = $offset + 1;
> 	$newoffset = "$offset, ";
> }
> else {
> 	$offsetplus = 1;
> 	$newoffset = "";
> 	$tngpage = 1;
> }
> 
> if( $assignedtree ) {
> 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
> 	$wherestr2 = " AND $dna_links_table.gedcom = \"$assignedtree\"";
> }
> else {
> 	$wherestr = "";
> 	if($tree) $wherestr2 = " AND $dna_links_table.gedcom = \"$tree\"";
> }
> $orgwherestr = $wherestr;
> $orgtree = $tree;
> 
> $show_dna_test_url = getURL( "show_dna_test", 1 );
> 
> $originalstring = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
> $wherestr = $searchstring ? "(test_number LIKE \"%$searchstring%\" OR vendor LIKE \"%$searchstring%\" OR urls LIKE \"%$searchstring%\" OR notes LIKE \"%$searchstring%\" OR dna_group LIKE \"%$searchstring%\" OR dna_group_desc LIKE \"%$searchstring%\" OR surnames LIKE \"%$searchstring%\" OR ydna_haplogroup LIKE \"%$searchstring%\" OR mtdna_haplogroup LIKE \"%$searchstring%\")" : "";
> if( $assignedtree )
> 	$wherestr .= $wherestr ? " AND ($dna_tests_table.gedcom = \"$tree\" || $dna_tests_table.gedcom = \"\")" : "($dna_tests_table.gedcom = \"$tree\" || $dna_tests_table.gedcom = \"\")";
> elseif( $tree )
> 	$wherestr .= $wherestr ? " AND $dna_tests_table.gedcom = \"$tree\"" : "$dna_tests_table.gedcom = \"$tree\"";
> if( $test_type )
> 	$wherestr .= $wherestr ? " AND test_type = \"" . cleanIt($test_type) . "\"" : "test_type = \"" . cleanIt($test_type) . "\"";
> if( $test_group )
> 	$wherestr .= $wherestr ? " AND dna_group = \"" . cleanIt($test_group) . "\"" : "dna_group = \"" . cleanIt($test_group) . "\"";
> if( $wherestr ) $wherestr = "WHERE $wherestr";
> 
> $query = "SELECT testID, test_type, test_date, match_date, ydna_haplogroup, mtdna_haplogroup, $dna_tests_table.personID, $dna_tests_table.gedcom, test_number, firstname, lastname, lnprefix, nameorder, suffix, prefix, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, branch, living, private, person_name, mtdna_confirmed, ydna_confirmed, markeropt, notesopt, linksopt, surnamesopt, private_dna, private_test, dna_group, dna_group_desc, surnames, MD_ancestorID, MRC_ancestorID
> 	FROM $dna_tests_table
> 	LEFT JOIN $people_table ON $people_table.personID = $dna_tests_table.personID AND $people_table.gedcom = $dna_tests_table.gedcom
> 	$wherestr ORDER BY match_date DESC, test_number ASC LIMIT $newoffset" . $maxsearchresults;
> $result = tng_query($query);
> 
> $numrows = tng_num_rows( $result );
> if( $numrows == $maxsearchresults || $offsetplus > 1 ) {
> 	$query = "SELECT count($dna_tests_table.testID) as tcount FROM $dna_tests_table $wherestr";
> 	$result2 = tng_query($query);
> 	$row = tng_fetch_assoc( $result2 );
> 	$totrows = $row['tcount'];
> 	tng_free_result($result2);
> }
> else
> 	$totrows = $numrows;
> 
> $helplang = findhelp("dna_help.php");
> 
> tng_adminheader( $admtext['dna_tests'], $flags );
> ?>
> <script type="text/javascript">
> //<![CDATA[
> var tnglitbox;
> var allow_edit = <?php echo ($allow_edit ? "1" : "0"); ?>;
> var allow_delete = <?php echo ($allow_delete ? "1" : "0"); ?>;
> 
> function resetForm() {
> 	document.form1.searchstring.value='';
> 	if(document.form1.tree) {
> 		document.form1.tree.selectedIndex=0;
> 	}
> 	document.form1.test_type.selectedIndex=0;
> 	document.form1.test_group.selectedIndex=0;
> }
> 
> function confirmDelete(testID) {
> 	if(confirm('<?php echo $admtext["confdeletedna"]; ?>' )){
> 		deleteIt('dna',testID);
> 	}
> 	return false;
> }
> //]]>
> </script>
> </head>
> 
> <?php
> 	echo tng_adminlayout();
> 
> 	$dnatabs[0] = array(1,"admin_dna_tests.php",$admtext['search'],"findtest");
> 	$dnatabs[1] = array($allow_add,"admin_new_dna_test.php",$admtext['addnew'],"addtest");
> 	$dnatabs[2] = array($allow_add,"admin_dna_groups.php",$admtext['dna_groups'],"dnagroups");
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#modify');\" class=\"lightlink\">{$admtext['help']}</a>";
> 	$menu = doMenu($dnatabs,"findtest",$innermenu);
> 	echo displayHeadline($admtext['dna_tests'],"img/dna_icon.gif",$menu,$message);
> ?>
> 
> <div class="admin-main">
> 	<div class="databack admin-block">
> 
> 	<form action="admin_dna_tests.php" name="form1" id="form1">
> 	<table class="normal">
> 		<tr>
> <!--		<td><?php echo $admtext['searchfor']; ?>: </td>  -->
> 			<td>
> <?php
> 	$newwherestr = $wherestr;
> 	$wherestr = $orgwherestr;
> 		$query = "SELECT gedcom, treename FROM $trees_table ORDER BY treename";
> 		$treeresult = tng_query($query);
> 		$numtrees = tng_num_rows($treeresult);
> 		if( $numtrees > 1 ) {
> 			echo $admtext['tree'] . ": ";
> 			$ret = "";
> 			$ret .= "<select name=\"tree\" id=\"tree\" onchange=\"jQuery('#treespinner').show();document.form1.submit();\">\n";
> 			$ret .= "<option value=\"\" ";
> 			if( !$tree ) $ret .= "selected=\"selected\"";
> 			$ret .= ">{$admtext['alltrees']}</option>\n";
> 
> 			while( $row2 = tng_fetch_assoc($treeresult) ) {
> 				$ret .= "<option value=\"{$row2['gedcom']}\"";
> 				if( $tree && $row2['gedcom'] == $tree ) $ret .= " selected=\"selected\"";
> 				$ret .= ">{$row2['treename']}</option>\n";
> 			}
> 			$ret .= "</select>\n";
> 			tng_free_result($treeresult);
> 			$ret .= "&nbsp; <img src=\"{$cms['tngpath']}img/spinner.gif\" style=\"display:none;\" id=\"treespinner\" alt=\"\" class=\"spinner\"/>\n";
> 			echo $ret;
> 		}
> 	echo $admtext['test_type'] . ": ";
> 	$wherestr = $newwherestr;
> ?>
> 				<select name="test_type" id="test_type" onchange="jQuery('#treespinner2').show();document.form1.test_group.selectedIndex = 0;document.form1.submit();">
> 				<option value=""><?php echo $admtext['alltypes']; ?></option>
> 				<option value="atDNA"<?php if($test_type == "atDNA") echo " selected"; ?>><?php echo $admtext['atdna_test']; ?></option>
> 				<option value="Y-DNA"<?php if($test_type == "Y-DNA") echo " selected"; ?>><?php echo $admtext['ydna_test']; ?></option>
> 				<option value="mtDNA"<?php if($test_type == "mtDNA") echo " selected"; ?>><?php echo $admtext['mtdna_test']; ?></option>
> 				<option value="X-DNA"<?php if($test_type == "X-DNA") echo " selected"; ?>><?php echo $admtext['xdna_test']; ?></option>
> 				</select>&nbsp;<img src=<?php echo"{$cms['tngpath']}img/spinner.gif"; ?> style="display:none;" id="treespinner2" alt="" class="spinner">&nbsp;
> 				<?php echo $text['testgroup']; ?>:
> 				<select name="test_group" id="test_group" onchange="jQuery('#treespinner3').show();document.form1.submit();">
> <?php
> echo get_test_groups($test_type, $test_group);
> ?>
> 				</select>&nbsp;<img src=<?php echo"{$cms['tngpath']}img/spinner.gif"; ?> style="display:none;" id="treespinner3" alt="" class="spinner">
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><br /><?php echo $admtext['searchfor']; ?>:
> 				<input type="text" name="searchstring" value="<?php echo $originalstring; ?>">&nbsp;
> 				<input type="submit" name="submit2" value="<?php echo $admtext['search']; ?>" class="aligntop">&nbsp;&nbsp;
> 				<input type="submit" name="reset" value="<?php echo $admtext['reset']; ?>" class="aligntop" onclick="resetForm();">
> 			</td>
> 		</tr>
> 	</table>
> 
> 	<input type="hidden" name="findtest" value="1"><input type="hidden" name="newsearch" value="1">
> 	</form><br />
> <?php
> 	$numrowsplus = $numrows + $offset;
> 	if( !$numrowsplus ) $offsetplus = 0;
> 	echo displayListLocation($offsetplus,$numrowsplus,$totrows);
> 	$pagenav = get_browseitems_nav( $totrows, "admin_dna_tests.php?searchstring=$searchstring&amp;test_type=$test_type&amp;test_group=$test_group&amp;offset", $maxsearchresults, 5 );
> 	echo " &nbsp; <span class=\"adminnav\">$pagenav</span></p>";
> ?>
> 	<form action="admin_updateselecteddna.php" method="post" name="form2">
> <?php
> 	if($allow_media_delete || $allow_media_edit) {
> ?>
> 		<p class="nw">
> 		<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onClick="toggleAll(1);">
> 		<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onClick="toggleAll(0);">&nbsp;&nbsp;
> <?php
> 		if( $allow_delete ) {
> ?>
> 		<input type="submit" name="xdnaaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">&nbsp;&nbsp;
> <?php
> 		}
> ?>
> 		</p>
> <?php
> 	}
> ?>
> 
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
> 		<tr>
> 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</td>
> <?php
> 	if($allow_edit || $allow_delete) {
> ?>
> 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</td>
> <?php
> 	}
> ?>
> 			<td class="fieldnameback fieldname"><b><?php echo $admtext['test_type']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $text['test_number']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $admtext['match_date']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $admtext['name']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $admtext['mda']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $admtext['mrca']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $admtext['keeptest']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $admtext['keepname']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $text['testgroup']; ?></b></td>
> 			<td class="fieldnameback fieldname"><b><?php echo $admtext['tree']; ?></b></td>
> 		</tr>
> <?php
> 	if( $numrows ) {
> 		$actionstr = "";
> 		if( $allow_edit )
> 			$actionstr .= "<a href=\"admin_edit_dna_test.php?testID=xxx\" title=\"{$admtext['edit']}\" class=\"smallicon admin-edit-icon\"></a>";
> 		if( $allow_delete )
> 			$actionstr .= "<a href=\"#\" onclick=\"return confirmDelete('xxx');\" title=\"{$admtext['text_delete']}\" class=\"smallicon admin-delete-icon\"></a>";
> 		$actionstr .= "<a href=\"" . $show_dna_test_url . "testID=xxx\" target=\"_blank\" title=\"{$admtext['test']}\" class=\"smallicon admin-test-icon\"></a>";
> 
> 		while( $row = tng_fetch_assoc($result))
> 		{
> 			$newactionstr = preg_replace( "/xxx/", $row['testID'], $actionstr );
> 			echo "<tr id=\"row_{$row['testID']}\"><td class=\"lightback\" valign=\"top\"><div class=\"action-btns\">$newactionstr</div></td>\n";
> 			if($allow_edit || $allow_delete)
> 				echo "<td class=\"lightback\" valign=\"top\" align=\"center\"><input type=\"checkbox\" name=\"dna{$row['testID']}\" value=\"1\"></td>";
> 			$rights = determineLivingPrivateRights($row);
> 			$row['allow_living'] = $rights['living'];
> 			$row['allow_private'] = $rights['private'];
> 			echo "<td class=\"lightback\">&nbsp;{$row['test_type']}</td>\n";
> 			echo "<td class=\"lightback\">&nbsp;{$row['test_number']}</td>\n";
> 			if($row['match_date'] && $row['match_date'] != "0000-00-00") {
> 				$match_date = formatInternalDate($row['match_date']);
> 				echo "<td class=\"lightback\">&nbsp;$match_date</td>\n";
> 			} else
> 				echo "<td class=\"lightback\">&nbsp;</td>\n";
> 			$dbname = getName($row);
> 			if ($dbname)
> 				echo "<td class=\"lightback\">" . $dbname . "</td>\n";
> 			else
> 				echo "<td class=\"lightback\">" . $row['person_name'] . "<br />&nbsp;" . $admtext['person_name'] . "</td>\n";
> 
> 			$mdanc_namestr = "";
> 			if($row['MD_ancestorID']) {
> 				$dna_anc_result = getPersonDataPlusDates($row['gedcom'], $row['MD_ancestorID']);
> 				$ancrow = tng_fetch_assoc($dna_anc_result);
> 				if( $ancrow ) {
> 					if( empty($tree) ) $tree = $ancrow['gedcom'];
> 					$placesearch_url = getURL( "placesearch", 1 );
> 					$ancrow['birthplace'] = "";
> 					$ancrow['altbirthplace'] = "";
> 					$ancrow['deathplace'] = "";
> 					$ancrow['burialplace'] = "";
> 					$dna_righttree = checktree($row['gedcom']);
> 					$dna_rightbranch = $dna_righttree ? checkbranch($row['branch']) : false;
> 					$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
> 					$ancrow['allow_living'] = $dprights['living'];
> 					$ancrow['allow_private'] = $dprights['private'];
> 					$vitalinfo = getBirthInfo($ancrow);
> 					$mdanc_namestr = getName( $ancrow ) . "<br />" . str_replace( ', ', '  -', trim(ltrim($vitalinfo,",  ")));
> 				}
> 
> 				tng_free_result($dna_anc_result);
> 			}
> 			$mrcanc_namestr = "";
> 			if($row['MRC_ancestorID']) {
> 				if ($row['MRC_ancestorID'][0] == $tngconfig['personprefix']) {
> 					$dna_anc_result = getPersonDataPlusDates($row['gedcom'], $row['MRC_ancestorID']);
> 					$ancrow = tng_fetch_assoc($dna_anc_result);
> 					if( $ancrow ) {
> 						if( empty($tree) ) $tree = $ancrow['gedcom'];
> 						$placesearch_url = getURL( "placesearch", 1 );
> 						$ancrow['birthplace'] = "";
> 						$ancrow['altbirthplace'] = "";
> 						$ancrow['deathplace'] = "";
> 						$ancrow['burialplace'] = "";
> 						$ancrow['allow_living'] = $ancrow['allow_private'] = 1;
> 						$vitalinfo = getBirthInfo($ancrow);
> 						$mrcanc_namestr = getName( $ancrow ) . "<br />" . str_replace( ', ', '  -', trim(ltrim($vitalinfo,",  ")));
> 					}
> 
> 					tng_free_result($dna_anc_result);
> 				}
> 				else if ($row['MRC_ancestorID'][0] == $tngconfig['familyprefix']) {
> 					$mrcaquery = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$row['MRC_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
> 					$dna_anc_result = tng_query($mrcaquery);
> 					$ancrow = tng_fetch_assoc($dna_anc_result);
> 					tng_free_result($dna_anc_result);
> 
> 					if( $ancrow ) {
> 						$ancrow['allow_living'] = $ancrow['allow_private'] = 1;
> 
> 						$famname = getFamilyName( $ancrow );
> 						$fammarried = "<br />&nbsp;&nbsp;<strong>{$text['marrabbr']}</strong>&nbsp;" . $ancrow['marrdate'];
> 						$mrcanc_namestr = $famname . $fammarried;
> 					}
> 				}
> 			}
> 			$privtest = $row['private_test'] ? $admtext['text_private'] : "&nbsp;";
> 			$privacy = $row['private_dna'] ? $admtext['text_private'] : $admtext['configsettings'];
> 			$query = "SELECT description FROM $dna_groups_table WHERE dna_group=\"{$row['dna_group']}\"";
> 			$descresult = tng_query($query);
> 			$descrow = tng_fetch_assoc( $descresult );
> 			tng_free_result($descresult);
> 			$group = $row['dna_group'] ? $descrow['description'] : $text['none'];
> 			echo "<td class=\"lightback\">" . $mdanc_namestr . "</td>\n";
> 			echo "<td class=\"lightback\">" . $mrcanc_namestr . "</td>\n";
> 			echo "<td class=\"lightback\">" . $privtest . "</td>\n";
> 			echo "<td class=\"lightback\">" . $privacy . "</td>\n";
> 			echo "<td class=\"lightback\">" . $group . "</td>\n";
> 			echo "<td class=\"lightback\">" . $row['gedcom'] . "</td>\n";
> 
> 			echo "</tr>\n";
> 		}
> ?>
> 	</table>
> <?php
> 		echo displayListLocation($offsetplus,$numrowsplus,$totrows);
> 		echo " &nbsp; <span class=\"adminnav\">$pagenav</span></p>";
> 	}
> 	else
> 		echo "</table>\n" . $admtext['norecords'];
> 	tng_free_result($result);
> ?>
> 	</form>
> 
> 	</div>
> </div>
> <?php
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editalbum.php TNG1403/admin_editalbum.php
32,35c32,38
< $query3 = "SELECT alinkID, entityID, eventID, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.suffix as suffix, people.nameorder as nameorder, ate.gedcom, treename,
< 	familyID, people.personID as personID, wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder,
< 	husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder,
< 	sourceID, sources.title, repositories.repoID as repoID, reponame, linktype
---
> $query3 = "SELECT alinkID, entityID, eventID, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, people.nameorder as nameorder, people.title as title, ate.gedcom, treename,
> 	people.birthdate, people.birthdatetr, people.altbirthdate, people.altbirthdatetr, people.deathdate, people.deathdatetr, people.living, people.private, people.branch,
> 	familyID, people.personID as personID, wifepeople.personID as wpersonID, wifepeople.personID as wife, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder,
> 	wifepeople.title as wtitle, wifepeople.birthdate as wbirthdate, wifepeople.birthdatetr as wbirthdatetr, wifepeople.altbirthdate as waltbirthdate, wifepeople.altbirthdatetr as waltbirthdatetr, wifepeople.deathdate as wdeathdate, wifepeople.deathdatetr as wdeathdatetr, wifepeople.living as wliving, wifepeople.private as wprivate, wifepeople.branch as wbranch,
> 	husbpeople.personID as hpersonID, husbpeople.personID as husband, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder,
> 	husbpeople.title as htitle, husbpeople.birthdate as hbirthdate, husbpeople.birthdatetr as hbirthdatetr, husbpeople.altbirthdate as haltbirthdate, husbpeople.altbirthdatetr as haltbirthdatetr, husbpeople.deathdate as hdeathdate, husbpeople.deathdatetr as hdeathdatetr, husbpeople.living as hliving, husbpeople.private as hprivate, husbpeople.branch as hbranch,
> 	sourceID, sources.title as stitle, repositories.repoID as repoID, reponame, linktype
45c48
< 	SELECT alinkID, entityID, eventID, null, null, null, null, null, gedcom, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, linktype 
---
> 	SELECT alinkID, entityID, eventID, null, null, null, null, null, null, null, gedcom, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, linktype
63d65
< $flags['tabs'] = $tngconfig['tabs'];
72,74c74,76
< $thismediatypeID = $drow['mediatypeID'];
< $usefolder = $drow['usecollfolder'] ? $mediatypes_assoc[$thismediatypeID] : $mediapath;
< $treestr = $tngconfig['mediatrees'] && $drow['gedcom'] ? $drow['gedcom'] . "/" : "";
---
> $thismediatypeID = isset($drow['mediatypeID']) ? $drow['mediatypeID'] : "";
> $usefolder = !empty($drow['usecollfolder']) ? $mediatypes_assoc[$thismediatypeID] : $mediapath;
> $treestr = $tngconfig['mediatrees'] && !empty($drow['gedcom']) ? $drow['gedcom'] . "/" : "";
77c79
< $photoref = "$usefolder/$treestr" . $drow['thumbpath'];
---
> $photoref = "$usefolder/$treestr" . (isset($drow['thumbpath']) ? $drow['thumbpath'] : "");
79c81
< if( $drow['thumbpath'] && file_exists( "$rootpath$photoref" ) ) {
---
> if( !empty($drow['thumbpath']) && file_exists( "$rootpath$photoref" ) ) {
89c91
< 	$photo = "<img src=\"" . str_replace("%2F","/",rawurlencode( $photoref )) . "?" . time() . "\" border=\"1\" alt=\"\" width=\"$photowtouse\" height=\"$photohtouse\" align=\"left\" style=\"margin-right:10px\">";
---
> 	$photo = "<img src=\"" . str_replace("%2F","/",rawurlencode( $photoref )) . "?" . time() . "\" class=\"adminthumb\" alt=\"\" width=\"$photowtouse\" height=\"$photohtouse\" align=\"left\" style=\"margin-right:10px\">";
95a98
> <?php if(!empty($ref)) { echo "window.opener.location.reload(false);\n"; } ?>
128a132,140
> 
> function validateForm( ) {
> 	var rval = true;
> 	if( document.form1.albumname.value.length == 0 ) {
> 		alert("<?php echo $admtext['enteralbumname']; ?>");
> 		rval = false;
> 	}
> 	return rval;
> }
131,132c143,144
< <script language="JavaScript" src="js/albums.js"></script>
< <script language="JavaScript" src="js/admin.js"></script>
---
> <script src="js/albums.js"></script>
> <script src="js/admin.js"></script>
135,136d146
< <body background="img/background.gif" onload="startMediaSort()">
< 
137a148,149
> 	echo tng_adminlayout(" onload=\"startMediaSort()\"");
> 
147a160
> <div class="admin-main">
149,151c162,164
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
161,162c174,175
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
168c181
< 	<tr><td><?php echo $admtext['albumname']; ?>:</td><td><input type="text" name="albumname" size="50" value="<?php echo $row['albumname']; ?>"></td></tr>
---
> 	<tr><td><?php echo $admtext['albumname']; ?>:</td><td><input type="text" name="albumname" size="50" value="<?php echo htmlspecialchars($row['albumname']); ?>"></td></tr>
184,185c197,198
< <tr class="databack tngshadow">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
196c209
< 			<td class="fieldnameback" style="width:102px">&nbsp;<b><?php echo $admtext['text_sort']; ?></b>&nbsp;</td>
---
> 			<td class="fieldnameback" style="width:106px">&nbsp;<b><?php echo $admtext['text_sort']; ?></b>&nbsp;</td>
199,200c212,213
< 			<td class="fieldnameback" style="width:154px">&nbsp;<b><?php echo $admtext['date']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback" style="width:105px">&nbsp;<b><?php echo $admtext['mediatype']; ?></b>&nbsp;</td>
---
> 			<td class="fieldnameback" style="width:150px">&nbsp;<b><?php echo $admtext['date']; ?></b>&nbsp;</td>
> 			<td class="fieldnameback" style="width:101px">&nbsp;<b><?php echo $admtext['mediatype']; ?></b>&nbsp;</td>
227c240
< 		echo "<td class=\"lightback\" style=\"width:" . ($thumbmaxw+6) . "px;text-align:center;\">";
---
> 		echo "<td class=\"lightback\" style=\"width:" . ($thumbmaxw+10) . "px;text-align:center;\">";
230c243
< 			echo "<a href=\"admin_editmedia.php?mediaID={$lrow['mediaID']}\"><img src=\"$usefolder/$treestr2" . str_replace("%2F","/",rawurlencode( $lrow['thumbpath'] )) . "\" border=\"0\" $size[3] alt=\"" . htmlentities($lrow['description'],ENT_QUOTES) . " \"></a>";
---
> 			echo "<a href=\"admin_editmedia.php?mediaID={$lrow['mediaID']}\"><img src=\"$usefolder/$treestr2" . str_replace("%2F","/",rawurlencode( $lrow['thumbpath'] )) . "\" class=\"adminthumb\" $size[3] alt=\"" . htmlentities($lrow['description'],ENT_QUOTES) . " \"></a>";
265,266c278,279
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
311c324
< 	<table cellpadding="3" cellspacing="1" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" class="rounded-table">
329a343,345
> 				$prights = determineLivingPrivateRights($plink);
> 				$plink['allow_living'] = $prights['living'];
> 				$plink['allow_private'] = $prights['private'];
339a356,364
> 				$husb['title'] = $plink['htitle'];
> 				$husb['living'] = $plink['hliving'];
> 				$husb['private'] = $plink['hprivate'];
> 				$husb['birthdate'] = $plink['hbirthdate'];
> 				$husb['birthdatetr'] = $plink['hbirthdatetr'];
> 				$husb['altbirthdate'] = $plink['haltbirthdate'];
> 				$husb['altbirthdatetr'] = $plink['haltbirthdatetr'];
> 				$husb['deathdate'] = $plink['hdeathdate'];
> 				$husb['deathdatetr'] = $plink['hdeathdatetr'];
340a366,368
> 				$hrights = determineLivingPrivateRights($husb);
> 				$husb['allow_living'] = $hrights['living'];
> 				$husb['allow_private'] = $hrights['private'];
346a375,383
> 				$wife['title'] = $plink['wtitle'];
> 				$wife['living'] = $plink['wliving'];
> 				$wife['private'] = $plink['wprivate'];
> 				$wife['birthdate'] = $plink['wbirthdate'];
> 				$wife['birthdatetr'] = $plink['wbirthdatetr'];
> 				$wife['altbirthdate'] = $plink['waltbirthdate'];
> 				$wife['altbirthdatetr'] = $plink['waltbirthdatetr'];
> 				$wife['deathdate'] = $plink['wdeathdate'];
> 				$wife['deathdatetr'] = $plink['wdeathdatetr'];
347a385,387
> 				$wrights = determineLivingPrivateRights($wife);
> 				$wife['allow_living'] = $wrights['living'];
> 				$wife['allow_private'] = $wrights['private'];
359c399
< 				$name = substr($plink['title'],0,25);
---
> 				$name = substr($plink['stitle'],0,25);
395d434
< 	</div>
399,401c438,441
< <tr class="databack">
< <td class="tngshadow">
< 	<p class="normal">
---
> <tr>
> <td class="tngshadow databack">
> 	<input type="hidden" value="<?php if( isset($cw) ) echo $cw; /*stands for "close window" */ ?>" name="cw">
> 	<input type="hidden" name="albumID" value="<?php echo $albumID; ?>">
403,408c443
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newscreen\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"close\" checked=\"checked\"> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"none\" checked=\"checked\"> {$admtext['saveback']}\n";
---
> 	if(!empty($cw)) {
410,414c445,457
<    </p>
< 
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
< 	<input type="hidden" name="albumID" value="<?php echo "$albumID"; ?>">
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 	} else {
> ?>
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 	}
> ?>
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_albums.php';">
418a462
> </div>
420d463
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
424,425c467,469
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editassoc.php TNG1403/admin_editassoc.php
7a8
> $admin_login = 1;
44,45c45,46
< 		<td valign="top"><input type="text" name="passocID" value="<?php echo $row['passocID']; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
< 		<a href="#" onclick="return findItem(assocType,'passocID','<?php echo $tree; ?>','<?php echo $assignedbranch; ?>');"><img src="img/tng_find.gif" title="<?php echo $admtext['find']; ?>" alt="<?php echo $admtext['find']; ?>" class="alignmiddle" <?php echo $dims; ?>></a></td>
---
> 		<td valign="top"><input type="text" name="passocID" id="passocIDe" value="<?php echo $row['passocID']; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
> 		<a href="#" onclick="return findItem('<?php echo $row['reltype']; ?>','passocIDe','','<?php echo $tree; ?>','<?php echo $assignedbranch; ?>');"><img src="img/tng_find.gif" title="<?php echo $admtext['find']; ?>" alt="<?php echo $admtext['find']; ?>" class="alignmiddle" <?php echo $dims; ?>></a></td>
diff -r TNG/admin_editbranch.php TNG1403/admin_editbranch.php
31,32c31
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['modifytree'], $flags );
---
> tng_adminheader( $admtext['modifybranch'], $flags );
115,116d113
< <body background="img/background.gif">
< 
117a115,116
> 	echo tng_adminlayout();
> 
126,128c125,128
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
170,171c170,173
< 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['save']; ?>">
< 	<input type="submit" name="submitx" accesskey="s" class="btn" value="<?php echo $admtext['saveexit']; ?>">
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_branches.php';">
> 	&nbsp;
179,181c181,184
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editcemetery.php TNG1403/admin_editcemetery.php
4c4,5
< $mapkeystr = $map['key'] && $map['key'] != "1" ? "&key=" . $map['key'] : "";include("adminlib.php");
---
> $mapkeystr = $map['key'] && $map['key'] != "1" ? "&amp;key=" . $map['key'] . "&amp;callback=initMap" : "";
> include("adminlib.php");
19c20,21
< $tng_search_cemeteries = $_SESSION['tng_search_cemeteries'];
---
> if(!isset($tree)) $tree = "";
> $tng_search_cemeteries = !empty($_SESSION['tng_search_cemeteries']) ? $_SESSION['tng_search_cemeteries'] : "";
36d37
< $flags['tabs'] = $tngconfig['tabs'];
45a47
> <?php if(!empty($ref)) { echo "window.opener.location.reload(false);\n"; } ?>
85,86d86
< <body<?php if($map['key']) { if(!$map['startoff']) echo " onload=\"divbox('mapcontainer');\""; } ?> background="img/background.gif">
< 
87a88,90
> 	$onload = $map['key'] && !$map['startoff'] ? " onload=\"divbox('mapcontainer');\"" : "";
> 	echo tng_adminlayout($onload);
> 
92c95
< 	$innermenu .= " &nbsp;|&nbsp; <a href=\"$showmap_url" . "cemeteryID=$cemeteryID&tree=$tree\" target=\"_blank\" class=\"lightlink\">{$admtext['test']}</a>";
---
> 	$innermenu .= " &nbsp;|&nbsp; <a href=\"$showmap_url" . "cemeteryID=$cemeteryID&amp;tree=$tree\" target=\"_blank\" class=\"lightlink\">{$admtext['test']}</a>";
96a100
> <div class="admin-main">
98,100c102,104
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
113c117
< 				<option></option>
---
> 				<option value=""></option>
129c133
< 				<option></option>
---
> 				<option value=""></option>
171,184d174
< 	<tr>
< 		<td colspan="2">
< 		<span class="normal">
< <?php 
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newscreen\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"close\" checked> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"none\" checked> {$admtext['saveback']}\n";
< ?>
< 		</span>
< 		</td>
< 	</tr>
187,188c177,193
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="hidden" value="<?php echo (isset($cw) ? $cw : ""); /*stands for "close window" */ ?>" name="cw">
> <?php
> 	if(!empty($cw)) {
> ?>
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 	} else {
> ?>
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 	}
> ?>
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_cemeteries.php';">
201,204c206,209
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editcitation.php TNG1403/admin_editcitation.php
7a8
> $admin_login = 1;
15,16c16,17
< $row['citetext'] = preg_replace("/\"/", "&#34;",$row[citetext]);
< $row['note'] = preg_replace("/\"/", "&#34;",$row[note]);
---
> $row['citetext'] = preg_replace("/\"/", "&#34;",$row['citetext']);
> $row['note'] = preg_replace("/\"/", "&#34;",$row['note']);
diff -r TNG/admin_editcollection.php TNG1403/admin_editcollection.php
46c46
< 	<tr><td><?php echo $admtext['collpath']; ?>:</td><td><input type="text" name="path" size="50" value="<?php echo $row['path']; ?>"></td></tr>
---
> 	<tr><td><?php echo $admtext['collpath']; ?>:</td><td><input type="text" name="path" size="50" value="<?php echo $row['path']; ?>"><input type="hidden" id="newcoll_org" value="<?php echo $row['path']; ?>"/></td></tr>
diff -r TNG/admin_edit_dna_group.php TNG1403/admin_edit_dna_group.php
1,85c1,107
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "dna";
< //include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< $admin_login = 1;
< include("checklogin.php");
< include("version.php");
< 
< if( !$allow_edit || ( $assignedtree && $assignedtree != $tree ) ) {
< 	$message = $admtext['norights'];
< 	header( "Location: admin_login.php?message=" . urlencode($message) );
< 	exit;
< }
< 
< $query = "SELECT * FROM $dna_groups_table WHERE gedcom = \"$tree\" AND dna_group = \"$dna_group\"";
< $result = tng_query($query);
< $row = tng_fetch_assoc( $result );
< $row['description'] = preg_replace("/\"/", "&#34;",$row['description']);
< tng_free_result($result);
< 
< $query = "SELECT treename FROM $trees_table where gedcom = \"$tree\"";
< $treeresult = tng_query($query);
< $treerow = tng_fetch_assoc( $treeresult );
< tng_free_result( $treeresult );
< 
< $helplang = findhelp("dna_help.php");
< 
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['modifygroup'], $flags );
< ?>
< <script type="text/javascript" src="js/selectutils.js"></script>
< <script type="text/javascript">
< function validateForm( ) {
< 	var rval = true;
< 	var form = document.form1;
< 
< 	if( form1.description.value.length == 0 ) {
< 		alert("<?php echo $admtext['entergroupdesc']; ?>");
< 		rval = false;
< 	}
< 	return rval;
< }
< 
< </script>
< </head>
< 
< <body background="img/background.gif">
< 
< <?php
< 	$dnatabs[0] = array(1,"admin_dna_groups.php",$admtext['search'],"findtest");
< 	$dnatabs[1] = array($allow_add,"admin_new_dna_group.php",$admtext['addgroup'],"addgroup");
< 	$dnatabs[2] = array($allow_edit,"#",$admtext['edit'],"edit");
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#add');\" class=\"lightlink\">{$admtext['help']}</a>";
< 	$menu = doMenu($dnatabs,"edit",$innermenu);
< 	echo displayHeadline($admtext['dna_groups'] . " &gt;&gt; " . $admtext['modifygroup'],"img/dna_icon.gif",$menu,$message);
< ?>
< 
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<form action="admin_update_dna_groups.php" method="post"  name="form1" id="form1" onSubmit="return validateForm();">
< 	<table class="normal">
< 		<tr><td valign="top"><?php echo $admtext['tree']; ?>:</td><td><?php echo $treerow['treename']; ?></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['test_type']; ?>:</td><td><?php echo $test_type; ?></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['groupid']; ?>:</td><td><?php echo $dna_group; ?></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['description']; ?>:</td><td><input type="text" name="description" size="60" value="<?php echo $row['description']; ?>"></td></tr>
< 
< 	</table>
< 	<span class="normal">
< 	<br/></span>
< 	<input type="hidden" name="tree" value="<?php echo $tree; ?>">
< 	<input type="hidden" name="test_type" value="<?php echo $test_type; ?>">
< 	<input type="hidden" name="dna_group" value="<?php echo $dna_group; ?>">
< 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['save']; ?>">
< 	</form>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "dna";
> //include("getlang.php");
> include("$mylanguage/admintext.php");
> 
> $admin_login = 1;
> include("checklogin.php");
> include("version.php");
> 
> if( !$allow_edit || ( $assignedtree && $assignedtree != $tree ) ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> $dna_group = !empty($dna_group) ? cleanIt($dna_group) : "";
> $tree = !empty($tree) ? cleanIt($tree) : "";
> 
> $query = "SELECT * FROM $dna_groups_table WHERE gedcom = \"$tree\" AND dna_group = \"$dna_group\"";
> $result = tng_query($query);
> $row = tng_fetch_assoc( $result );
> if( !isset($row['description']) ) {
> 	header( "Location: admin_dna_groups.php" );
> 	exit;
> }
> $row['description'] = preg_replace("/\"/", "&#34;",$row['description']);
> tng_free_result($result);
> 
> $query = "SELECT treename FROM $trees_table where gedcom = \"$tree\"";
> $treeresult = tng_query($query);
> $treerow = tng_fetch_assoc( $treeresult );
> tng_free_result( $treeresult );
> 
> $helplang = findhelp("dna_help.php");
> 
> tng_adminheader( $admtext['modifygroup'], $flags );
> ?>
> <script type="text/javascript" src="js/selectutils.js"></script>
> <script type="text/javascript">
> //<![CDATA[
> function validateForm( ) {
> 	var rval = true;
> 	var form = document.form1;
> 
> 	if( form1.description.value.length == 0 ) {
> 		alert("<?php echo $admtext['entergroupdesc']; ?>");
> 		rval = false;
> 	}
> 	else if(document.form1.test_type.selectedIndex == 0) {
> 		alert("<?php echo $admtext['selecttype']; ?>");
> 		rval = false;
> 	}
> 	return rval;
> }
> //]]>
> </script>
> </head>
> 
> <?php
> 	echo tng_adminlayout();
> 
> 	$dnatabs[0] = array(1,"admin_dna_groups.php",$admtext['search'],"findtest");
> 	$dnatabs[1] = array($allow_add,"admin_new_dna_group.php",$admtext['addgroup'],"addgroup");
> 	$dnatabs[2] = array($allow_edit,"#",$admtext['edit'],"edit");
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#add');\" class=\"lightlink\">{$admtext['help']}</a>";
> 	$menu = doMenu($dnatabs,"edit",$innermenu);
> 	echo displayHeadline($admtext['dna_groups'] . " &gt;&gt; " . $admtext['modifygroup'],"img/dna_icon.gif",$menu,$message);
> ?>
> 
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr class="databack">
> <td class="tngshadow">
> 	<form action="admin_update_dna_groups.php" method="post"  name="form1" id="form1" onSubmit="return validateForm();">
> 	<table class="normal">
> 		<tr><td valign="top"><?php echo $admtext['tree']; ?>:</td><td><?php echo $treerow['treename']; ?></td></tr>
> 		<tr><td valign="top"><?php echo $admtext['groupid']; ?>:</td><td><?php echo $row['dna_group']; ?></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['test_type']; ?>: </td>
> 			<td>
> 				<select name="test_type">
> 					<option value="">&nbsp;</option>
> 					<option value="atDNA" <?php if ($row['test_type'] == "atDNA")  echo "selected='selected'"; ?>><?php echo $admtext['atdna_test']; ?></option>
> 					<option value="Y-DNA" <?php if ($row['test_type'] == "Y-DNA")  echo "selected='selected'"; ?>><?php echo $admtext['ydna_test']; ?></option>
> 					<option value="mtDNA" <?php if ($row['test_type'] == "mtDNA")  echo "selected='selected'"; ?>><?php echo $admtext['mtdna_test']; ?></option>
> 					<option value="X-DNA" <?php if ($row['test_type'] == "X-DNA")  echo "selected='selected'"; ?>><?php echo $admtext['xdna_test']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td valign="top"><?php echo $admtext['description']; ?>:</td><td><input type="text" name="description" size="60" value="<?php echo $row['description']; ?>"></td></tr>
> 
> 	</table>
> 	<span class="normal">
> 	<br/></span>
> 	<input type="hidden" name="tree" value="<?php echo $tree; ?>">
> 	<input type="hidden" name="dna_group" value="<?php echo $dna_group; ?>">
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['save']; ?>">
> 	</form>
> </td>
> </tr>
> 
> </table>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_edit_dna_test.php TNG1403/admin_edit_dna_test.php
1,423c1,601
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "dna";
< //include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< $admin_login = 1;
< include("checklogin.php");
< include("version.php");
< 
< if( !$allow_edit ) {
< 	$message = $admtext['norights'];
< 	header( "Location: admin_login.php?message=" . urlencode($message) );
< 	exit;
< }
< 
< if( $assignedtree ) {
< 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
< 	$tree = $assignedtree;
< }
< else
< 	$wherestr = "";
< 
< $treequery = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
< $treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
< $treenum = 0;
< while( $treerow = tng_fetch_assoc($treeresult) ) {
< 	$treenum++;
< 	$trees[$treenum] = $treerow['gedcom'];
< 	$treename[$treenum] = $treerow['treename'];
< }
< tng_free_result($treeresult);
< 
< $query = "SELECT * FROM $dna_tests_table WHERE testID = \"$testID\"";
< $result = tng_query($query);
< $row = tng_fetch_assoc( $result );
< tng_free_result($result);
< 
< if($row['personID']) {
< 	$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, branch
< 		FROM $people_table
< 		WHERE personID = \"{$row['personID']}\" AND gedcom = \"{$row['gedcom']}\"";
< 	$result = tng_query($query);
< 	$row2 = tng_fetch_assoc( $result );
< 	$row2['allow_living'] = $row2['allow_private'] = 1;
< 	$takername = "(" . getName($row2) . ")";
< 	tng_free_result($result);
< }
< else
< 	$takername = "";
< 
< if($row['MD_ancestorID']) {
< 	$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, branch
< 		FROM $people_table
< 		WHERE personID = \"{$row['MD_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
< 	$result = tng_query($query);
< 	$row3 = tng_fetch_assoc( $result );
< 	$row3['allow_living'] = $row3['allow_private'] = 1;
< 	$mdancestorname = "(" . getName($row3) . ")";
< 	tng_free_result($result);
< }
< else
< 	$mdancestorname = "";
< if($row['MRC_ancestorID']) {
< 	if ($row['MRC_ancestorID'][0] == $tngconfig['personprefix']) {
< 		$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, branch
< 			FROM $people_table
< 			WHERE personID = \"{$row['MRC_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
< 		$result = tng_query($query);
< 		$row3 = tng_fetch_assoc( $result );
< 		$row3['allow_living'] = $row3['allow_private'] = 1;
< 		$mrcancestorname = "(" . getName($row3) . ")";
< 		tng_free_result($result);
< 	}
< 	else if ($row['MRC_ancestorID'][0] == $tngconfig['familyprefix']) {
< 	    $query = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$row['MRC_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
< 	    $result = tng_query($query);
< 	    $row3 = tng_fetch_assoc($result);
< 		tng_free_result($result);
< 
< 	    $row3['allow_living'] = $row3['allow_private'] = 1;
< 
< 	    $mrcancestorname = "(" . getFamilyName( $row3 ) . ")";
< 	}
< }
< else
< 	$mrcancestorname = $admtext['mrcaiorf'];
< 
< $query = "SELECT $dna_links_table.ID as mlinkID, $dna_links_table.personID as personID, lastname, lnprefix, firstname, prefix, suffix, nameorder, $dna_links_table.gedcom as gedcom, branch, treename, living, private 
< 	FROM $dna_links_table
< 	LEFT JOIN $trees_table as trees ON $dna_links_table.gedcom = trees.gedcom
< 	LEFT JOIN $people_table AS people ON $dna_links_table.personID = people.personID AND $dna_links_table.gedcom = people.gedcom
< 	WHERE testID = \"$testID\" ORDER BY $dna_links_table.ID DESC";
< $result2 = tng_query($query);
< $numlinks = tng_num_rows( $result2 );
< 
< $helplang = findhelp("dna_help.php");
< 
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['modifydna'], $flags );
< ?>
< </head>
< 
< <body background="img/background.gif">
< 
< <?php
< $dnatabs[0] = array(1,"admin_dna_tests.php",$admtext['search'],"findtest");
< $dnatabs[1] = array($allow_add,"admin_new_dna_test.php",$admtext['addnew'],"addtest");
< $dnatabs[2] = array($allow_edit,"#",$admtext['edit'],"edit");
< $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#add');\" class=\"lightlink\">{$admtext['help']}</a> ";
< $innermenu .= "&nbsp;|&nbsp;<a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('on');\">{$text['expandall']}</a> &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('off');\">{$text['collapseall']}</a>";
< $menu = doMenu($dnatabs,"edit",$innermenu);
< echo displayHeadline($admtext['dna_tests'] . " &gt;&gt; " . $admtext['modifydna'], "img/dna_icon.gif",$menu,"");
< 
< $surnamesarr = array();
< $surnamesexc = array();
< $surnamesexc = explode(',', $surnameexcl);
< $pass1 = true;
< 
< function get_ancestor_surnames($personID, $tree, $type) {
<    global $surnamesarr, $surnamesexc, $pass1;
<    
<    $select = "SELECT p.lastname, p.famc, f.husband, f.wife FROM tng_people AS p LEFT JOIN tng_families AS f ON (p.famc = f.familyID AND p.gedcom = f.gedcom) WHERE p.personID = '" . $personID . "' AND p.gedcom = '" . $tree . "'";
<    $result = tng_query($select);
<     while( $surrow = tng_fetch_assoc($result) ) {
<       $father = ($type != "mtDNA") ? $surrow['husband'] : "";
<       $mother = ($type != "Y-DNA") ? $surrow['wife'] : "";
<     if (!in_array($surrow['lastname'], $surnamesarr) && !in_array($surrow['lastname'], $surnamesexc) && !$pass1)
<      array_push($surnamesarr, $surrow['lastname']);
<      $pass1 = false;
<       if ($father) get_ancestor_surnames($father, $tree, $type);
<       if ($mother) get_ancestor_surnames($mother, $tree, $type);
<    }
< tng_free_result($result);
< if ($type == "atDNA") sort($surnamesarr);
< $ancestorstr = implode(', ', $surnamesarr);
< 
< return $ancestorstr;
< }
< ?>
< 
< <form action="admin_update_dna_test.php" method="post" name="form1" id="form1" onsubmit="return validateForm();">
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus0",1,"testinfo",$admtext['testinfo'],$admtext['uplsel']); ?>
< 
< 	<div id="testinfo">
< 	<br/>
< 	<table class="normal">
< 		<tr>
< 			<td><?php echo $admtext['test_type']; ?>:</td>
< 			<td>
< 				<select name="test_type">
< 					<option value=""></option>
< 					<option value="atDNA"<?php if($row['test_type'] == "atDNA") echo " selected"; ?>><?php echo $admtext['atdna_test']; ?></option>
< 					<option value="Y-DNA"<?php if($row['test_type'] == "Y-DNA") echo " selected"; ?>><?php echo $admtext['ydna_test']; ?></option>
< 					<option value="mtDNA"<?php if($row['test_type'] == "mtDNA") echo " selected"; ?>><?php echo $admtext['mtdna_test']; ?></option>
< 					<option value="X-DNA"<?php if($row['test_type'] == "X-DNA") echo " selected"; ?>><?php echo $admtext['xdna_test']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $text['test_number']; ?>:</td>
< 			<td><input type="text" name="test_number" value="<?php echo $row['test_number']; ?>" class="medfield"></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['vendor']; ?>:</td>
< 			<td><input type="text" name="vendor" value="<?php echo $row['vendor']; ?>" class="medfield"></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['test_date']; ?>:</td>
< 			<td><input type="text" name="test_date" value="<?php echo formatInternalDate($row['test_date']); ?>" class="medfield" onblur="checkDate(this);"></td>
< 		</tr>
< 		<tr>
< 			<td colspan="2"><br/><strong><?php echo $admtext['test_taker']; ?></strong></td>
< 		</tr>
< 		<tr>
< 			<td>
< 				<?php echo $admtext['tree']; ?>:
< 			</td>
< 			<td>
< 				<select name="mynewgedcom">
< 				<option value=""></option>
< <?php
< 		for( $j = 1; $j <= $treenum; $j++ ) {
< 			echo "	<option value=\"{$trees[$j]}\"";
< 			if($trees[$j] == $row['gedcom']) echo " selected";
< 			echo ">$treename[$j]</option>\n";
< 		}
< ?>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo "{$admtext['text_and']} {$admtext['personid']} "; ?>:</td>
< 			<td>
< 				<input type="text" name="personID" value="<?php echo $row['personID']; ?>" id="personID" size="20" maxlength="22"> &nbsp;<span><?php echo $takername; ?></span>&nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
< 				<a href="#" onclick="return findItem('I','personID','',document.form1.mynewgedcom.options[document.form1.mynewgedcom.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>">
< 					<img src="img/tng_find.gif" title="<?php echo $admtext['find']; ?>" alt="<?php echo $admtext['find']; ?>" class="alignmiddle" width="20" height="20" border="0" vspace="0" hspace="2">
< 				</a>
< 				<!--<span id="deststrfield"><?php echo $takername; ?></span>-->
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo "{$admtext['text_or']} {$admtext['person_name']} "; ?></td>
< 			<td>
< 			<input type="text" name="person_name" value="<?php echo $row['person_name']; ?>" id="person_name" size="40" maxlength="100"></td>
< 		</tr>
< 		<tr>
< 			<td colspan="2"><strong><?php echo $text['keep_name_private']; ?>:</strong>&nbsp;<input type="checkbox" name="private_dna" value="1"<?php if( $row['private_dna'] ) echo " checked=\"$checked\""; ?>></td>
< 		</tr>
< 		<tr>
< 			<td colspan="2">&nbsp;</td>
< 		</tr>
< 		<tr>
< 			<td><strong><?php echo $admtext['addtotestgroup']; ?>:</strong>&nbsp;</td>
< 			<td>
< 				<select name="dna_group">
< 				<option value=""><?php echo $text['none']; ?></option>
< <?php
< 		$groupsquery = "SELECT * FROM $dna_groups_table ORDER BY description";
< 		$groupsresult = tng_query($groupsquery);
< 		$numgrouprows = tng_num_rows( $groupsresult );
< 		while( $groupsrow = tng_fetch_assoc($groupsresult) ) {
< 		if($row['dna_group'] == $groupsrow['dna_group']) $selectgrp = "selected";
<                  else $selectgrp = "";
< 		echo "	<option value=\"{$groupsrow['dna_group']}\" $selectgrp>{$groupsrow['description']} </option>\n";
< 		}
< 		tng_free_result($groupsresult);
< ?>
< 				</select>
< 			<td>
< 		</tr>
< 		<tr>
< 			<td colspan="2">&nbsp;</td>
< 		</tr>
< 		<?php if($row['test_type'] == "Y-DNA") { ?>
< 		<tr>
< 			<td><?php echo $admtext['markers']; ?>:</td>
< 			<td><input type="text" name="markers" value="<?php echo $row['markers']; ?>" class="medfield"></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['marker_values']; ?>:<br /><?php echo $admtext['separate']; ?></td>
< 			<td><textarea cols="90" rows="3" name="y_results"><?php echo $row['y_results']; ?></textarea></td>
< 		</tr>
< 		<?php }; ?>
< 		<?php if($row['test_type'] != "atDNA") {
< 			$checkedstr = ($row['test_type'] == "mtDNA" || $row['confirmed']) ? "checked" : ""; ?>
< 		<tr>
< 			<td><?php echo $admtext['haplo']; ?>:</td>
< 			<td><input type="text" name="haplogroup" value="<?php echo $row['haplogroup']; ?>" class="medfield">&nbsp;&nbsp;<?php echo $text['confirmed']; ?>:&nbsp;<input type="checkbox" name="confirmed" value="1" <?php echo $checkedstr; ?>></td>
< 		</tr>
< 		<?php };  ?>
< 
< 		<?php if($row['test_type'] == "mtDNA") { ?>
<                 <tr>
< 			<td colspan="2">&nbsp;</td>
< 		</tr>
< 		<tr>
<                         <td><strong><?php echo $admtext['ref_seq']; ?>:</strong>&nbsp;</td>
< 			<td>
< 				<select name="ref_seq">
< 					<option value=""<?php if( $row['ref_seq'] == "" ) echo " selected"; ?>></option>
< 					<option value="rsrs"<?php if( $row['ref_seq'] == "rsrs" ) echo " selected"; ?>><?php echo $admtext['rsrs']; ?></option>
< 					<option value="rcrs"<?php if( $row['ref_seq'] == "rcrs" ) echo " selected"; ?>><?php echo $admtext['rcrs']; ?></option>
< 				</select></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['hvr1_values']; ?>:</td>
< 			<td><input type="text" name="hvr1_results" value="<?php echo $row['hvr1_results']; ?>" style="width:700px;">&nbsp;<?php echo $admtext['separate']; ?></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['hvr2_values']; ?>:</td>
< 			<td><input type="text" name="hvr2_results" value="<?php echo $row['hvr2_results']; ?>" style="width:700px;">&nbsp;<?php echo $admtext['separate']; ?></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['xtra_mut']; ?>:</td>
< 			<td><input type="text" name="xtra_mut" value="<?php echo $row['xtra_mut']; ?>" style="width:700px;">&nbsp;<?php echo $admtext['separate']; ?></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['coding_reg']; ?>:</td>
< 			<td><textarea cols="69" rows="2" name="coding_reg"><?php echo $row['coding_reg']; ?></textarea>&nbsp;<?php echo $admtext['separate']; ?>
<                        </td>
< 		</tr>
< 		<?php }; ?>
< 		<?php if($row['test_type'] == "Y-DNA") { ?>
< 		<tr>
< 			<td><?php echo $admtext['signsnp']; ?>:</td>
< 			<td><input type="text" name="signsnp" value="<?php echo $row['significant_snp']; ?>" class="medfield"></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['termsnp']; ?>:</td>
< 			<td><input type="text" name="termsnp" value="<?php echo $row['terminal_snp']; ?>" class="medfield"></td>
< 		</tr>
< 		<?php }; ?>
< 		<?php if($row['test_type'] != "atDNA") { ?>
< 		<tr>
< 			<td><strong><?php echo $admtext['mdaID']; ?>:</strong></td>
< 			<td><input type="text" name="MD_ancestorID" value="<?php echo $row['MD_ancestorID']; ?>" id="MD_ancestorID" size="20" maxlength="22"><span>&nbsp;<?php echo $mdancestorname; ?></span></td>
< 		</tr>
< 		<?php }; ?>
< 
< 		<tr>
< 			<td><strong><?php echo $admtext['mrcaID']; ?>:</strong></td>
< 			<td><input type="text" name="MRC_ancestorID" value="<?php echo $row['MRC_ancestorID']; ?>" id="MRC_ancestorID" size="20" maxlength="22"><span>&nbsp;<?php echo $mrcancestorname; ?></span></td>
< 		</tr>
< 
< 		<?php 
< 			if ((!$row['surnames'] && $row['test_type'] != "atDNA") && $autofillancsurnames && $row['personID']) 
< 				$ancestorstr = get_ancestor_surnames($row['personID'], $row['gedcom'], $row['test_type']);
<             else 
<             	$ancestorstr = $row['surnames'];
< 			if ($ancsurnameupper)
< 				$ancestorstr = strtoupper($ancestorstr);
< 		?>
< 		<tr>
< 			<td valign="top"><?php echo $admtext['ancestral_surnames']; ?>:</td>
< 			<td><textarea cols="90" rows="10" name="surnames"><?php echo $ancestorstr; ?></textarea></td>
< 		</tr>
< 		<tr>
< 			<td colspan="2">&nbsp;</td>
< 		</tr>
< 		<tr>
< 			<td valign="top"><?php echo $admtext['notes']; ?>:</td>
< 			<td><textarea wrap cols="90" rows="10" name="notes"><?php echo $row['notes']; ?></textarea></td>
< 		</tr>
< 		<tr>
< 			<td valign="top"><?php echo $admtext['admin_notes']; ?>:</td>
< 			<td><textarea wrap cols="90" rows="10" name="admin_notes"><?php echo $row['admin_notes']; ?></textarea></td>
< 		</tr>
< 		<tr>
< 			<td valign="top"><?php echo $admtext['urls']; ?>:</td>
< 			<td><textarea wrap cols="90" rows="3" name="urls"><?php echo $row['urls']; ?></textarea></td>
< 		</tr>
< 		<tr>
< 			<td valign="top"><?php echo $admtext['medialinks']; ?>:</td>
< 			<td><textarea wrap cols="90" rows="3" name="medialinks"><?php echo $row['medialinks']; ?></textarea></td>
< 		</tr>
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr>
< 			<td><strong><?php echo $text['test_info_display']; ?>:</strong>&nbsp;</td><td>
<                     <?php if($row['test_type'] != "X-DNA" && $row['test_type'] != "atDNA") { ?>
< 			<input type="checkbox" name="markeropt" value="1"<?php if( $row['markeropt'] ) echo " checked=\"$checked\""; ?>>&nbsp;<?php echo $text['test_results']; ?>&nbsp;&nbsp;
<                     <?php }; ?>
<                         <input type="checkbox" name="notesopt" value="1"<?php if( $row['notesopt'] ) echo " checked=\"$checked\""; ?>>&nbsp;<?php echo $admtext['notes']; ?>&nbsp;&nbsp;
<                         <input type="checkbox" name="linksopt" value="1"<?php if( $row['linksopt'] ) echo " checked=\"$checked\""; ?>>&nbsp;<?php echo $admtext['urls']; ?>&nbsp;&nbsp;
<                         <input type="checkbox" name="surnamesopt" value="1"<?php if( $row['surnamesopt'] ) echo " checked=\"$checked\""; ?>>&nbsp;<?php echo $admtext['ancestral_surnames']; ?></td>
< 		</tr>
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 	</table>
< 	</div>
< </td>
< </tr>
< 
< <tr class="databack">
< <td class="tngshadow" id="linkstd">
< 	<?php echo displayToggle("plus2",1,"links",$admtext['test_links'] . " (<span id=\"linkcount\">$numlinks</span>)",$admtext['linkssubt']); ?>
< 
< 	<?php include("micro_dnalinks.php"); ?>
< </td>
< </tr>
< 
< <tr class="databack">
< <td class="tngshadow normal">
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
< 	<input type="hidden" value="<?php echo $row['testID']; ?>" name="testID">
< 	<input type="hidden" value="<?php echo $row['personID']; ?>" name="personID_org">
< <?php 
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newtest\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newtest\" value=\"close\" checked=\"checked\"> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newtest\" value=\"none\" checked=\"checked\"> {$admtext['saveback']}\n";
< ?>
< 	<br/><br/><input type="submit" name="submitbtn" class="btn" accesskey="s" value="<?php echo $admtext['save']; ?>">
< </td>
< </tr>
< 
< </table>
< </form>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< <script type="text/javascript">
< var tree = "<?php echo $tree; ?>";
< var tnglitbox;
< <?php
< 	echo "var linkcount = $numlinks;\n";
< 	echo "var confdellink = \"{$admtext['confdellink']}\";\n";
< 	echo "var remove_text = \"{$admtext['removelink']}\";\n";
< ?>
< 
< function validateForm( ) {
< 	var rval = true;
< 
< //req: test number, test type
< 	var frm = document.form1;
< 	if(!frm.test_type.selectedIndex) {
< 		alert("<?php echo $admtext['selecttype']; ?>");
< 		rval = false;
< 	}
< //removed test_number alert
< 	return rval;
< }
< 
< function toggleAll(display) {
< 	toggleSection('testinfo','plus0',display);
< 	return false;
< }
< </script>
< <script type="text/javascript" src="js/net.js?v<?php echo $tng_version; ?>"></script>
< <script type="text/javascript" src="js/admin.js?v<?php echo $tng_version; ?>"></script>
< <script type="text/javascript" src="js/datevalidation.js?v<?php echo $tng_version; ?>"></script>
< <script type="text/javascript" src="js/selectutils.js"></script>
< <script type="text/javascript" src="js/dna_tests.js"></script>
< <script type="text/javascript">
< 	var preferEuro = <?php echo ($tngconfig['preferEuro'] ? $tngconfig['preferEuro'] : "false"); ?>;
< 	var preferDateFormat = '<?php echo $preferDateFormat; ?>';
< 	var findform = document.form1;
< </script>
< </body>
< </html>
\ No newline at end of file
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "dna";
> //include("getlang.php");
> include("$mylanguage/admintext.php");
> 
> $admin_login = 1;
> include("checklogin.php");
> include("version.php");
> 
> if( !$allow_edit ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> if( $assignedtree ) {
> 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
> 	$tree = $assignedtree;
> }
> else
> 	$wherestr = "";
> 
> $treequery = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
> $treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
> $treenum = 0;
> while( $treerow = tng_fetch_assoc($treeresult) ) {
> 	$treenum++;
> 	$trees[$treenum] = $treerow['gedcom'];
> 	$treename[$treenum] = $treerow['treename'];
> }
> tng_free_result($treeresult);
> $testID = !empty($testID) ? cleanIt($testID) : "";
> 
> $query = "SELECT * FROM $dna_tests_table WHERE testID = \"$testID\"";
> $result = tng_query($query);
> $row = tng_fetch_assoc( $result );
> tng_free_result($result);
> if( !isset($row['personID']) ) {
> 	header( "Location: admin_dna_tests.php" );
> 	exit;
> }
> 
> if($row['personID']) {
> 	$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, living, private, branch
> 		FROM $people_table
> 		WHERE personID = \"{$row['personID']}\" AND gedcom = \"{$row['gedcom']}\"";
> 	$result = tng_query($query);
> 	$row2 = tng_fetch_assoc( $result );
> 	if( $row2 ) {
> 		$row2['allow_living'] = $row2['allow_private'] = 1;
> 		$takername = "(" . getName($row2) . ")";
> 	} else {
> 		$takername = "()";
> 	}
> 	tng_free_result($result);
> }
> else
> 	$takername = "";
> 
> if($row['MD_ancestorID']) {
> 	$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, living, private, branch
> 		FROM $people_table
> 		WHERE personID = \"{$row['MD_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
> 	$result = tng_query($query);
> 	$row3 = tng_fetch_assoc( $result );
> 	$row3['allow_living'] = $row3['allow_private'] = 1;
> 	$mdancestorname = "(" . getName($row3) . ")";
> 	tng_free_result($result);
> }
> else
> 	$mdancestorname = "";
> if($row['MRC_ancestorID']) {
> 	if ($row['MRC_ancestorID'][0] == $tngconfig['personprefix']) {
> 		$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, branch
> 			FROM $people_table
> 			WHERE personID = \"{$row['MRC_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
> 		$result = tng_query($query);
> 		$row3 = tng_fetch_assoc( $result );
> 		$row3['allow_living'] = $row3['allow_private'] = 1;
> 		$mrcancestorname = "(" . getName($row3) . ")";
> 		tng_free_result($result);
> 	}
> 	else if ($row['MRC_ancestorID'][0] == $tngconfig['familyprefix']) {
> 	    $query = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$row['MRC_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
> 	    $result = tng_query($query);
> 	    $row3 = tng_fetch_assoc($result);
> 		tng_free_result($result);
> 
> 	    $row3['allow_living'] = $row3['allow_private'] = 1;
> 
> 	    $mrcancestorname = "(" . getFamilyName( $row3 ) . ")";
> 	}
> }
> else
> 	$mrcancestorname = $admtext['mrcaiorf'];
> 
> $query = "SELECT $dna_links_table.ID as mlinkID, $dna_links_table.personID as personID, lastname, lnprefix, firstname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, $dna_links_table.gedcom as gedcom, branch, treename, living, private
> 	FROM $dna_links_table
> 	LEFT JOIN $trees_table as trees ON $dna_links_table.gedcom = trees.gedcom
> 	LEFT JOIN $people_table AS people ON $dna_links_table.personID = people.personID AND $dna_links_table.gedcom = people.gedcom
> 	WHERE testID = \"$testID\" ORDER BY $dna_links_table.ID DESC";
> $result2 = tng_query($query);
> $numlinks = tng_num_rows( $result2 );
> 
> $helplang = findhelp("dna_help.php");
> 
> tng_adminheader( $admtext['modifydna'], $flags );
> ?>
> </head>
> 
> <?php
> echo tng_adminlayout();
> 
> $dnatabs[0] = array(1,"admin_dna_tests.php",$admtext['search'],"findtest");
> $dnatabs[1] = array($allow_add,"admin_new_dna_test.php",$admtext['addnew'],"addtest");
> $dnatabs[2] = array($allow_edit,"#",$admtext['edit'],"edit");
> $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#add');\" class=\"lightlink\">{$admtext['help']}</a> ";
> $innermenu .= "&nbsp;|&nbsp;<a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('on');\">{$text['expandall']}</a> &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('off');\">{$text['collapseall']}</a>";
> $menu = doMenu($dnatabs,"edit",$innermenu);
> echo displayHeadline($admtext['dna_tests'] . " &gt;&gt; " . $admtext['modifydna'], "img/dna_icon.gif",$menu,"");
> 
> $surnamesarr = array();
> $surnamesexc = array();
> $surnamesexc = explode(',', $surnameexcl);
> $pass1 = true;
> 
> function get_ancestor_surnames($personID, $tree, $type) {
>    global $surnamesarr, $surnamesexc, $pass1;
> 
>    $select = "SELECT p.lastname, p.famc, f.husband, f.wife FROM tng_people AS p LEFT JOIN tng_families AS f ON (p.famc = f.familyID AND p.gedcom = f.gedcom) WHERE p.personID = '" . $personID . "' AND p.gedcom = '" . $tree . "'";
>    $result = tng_query($select);
>     while( $surrow = tng_fetch_assoc($result) ) {
>       $father = ($type != "mtDNA") ? $surrow['husband'] : "";
>       $mother = ($type != "Y-DNA") ? $surrow['wife'] : "";
>     if (!in_array($surrow['lastname'], $surnamesarr) && !in_array($surrow['lastname'], $surnamesexc) && !$pass1)
>      array_push($surnamesarr, $surrow['lastname']);
>      $pass1 = false;
>       if ($father) get_ancestor_surnames($father, $tree, $type);
>       if ($mother) get_ancestor_surnames($mother, $tree, $type);
>    }
> tng_free_result($result);
> if ($type == "atDNA") sort($surnamesarr);
> $ancestorstr = implode(', ', $surnamesarr);
> 
> return $ancestorstr;
> }
> $atsurnamesarr = array();
> $atsurnamesexc = array();
> $atsurnamesexc = explode(',', $surnameexcl);
> $perID=array();
> include("tngdblib.php");
> 
> function get_atdna_ancestor_surnames($personID, $tree, $type) {
>    global $atsurnamesarr, $atsurnamesexc, $perID, $numgens;
> 
> $perID[0]=$personID;
> 
> for ($a=0; $a <= $numgens; $a++) {
> 	for($b=0; $b < pow(2,$a); $b++) {
> 		if(isset($perID[pow(2,$a)+$b-1])) {
> 			$tID = pow(2,$a)+$b-1;
> 			$result = getPersonFullPlusDates($tree, $perID[$tID]);
> 			$row = tng_fetch_assoc( $result );
> 			$perName[$tID]= $row['lastname'];
>              if (!in_array($perName[$tID], $atsurnamesarr) && !in_array($perName[$tID], $atsurnamesexc)) array_push($atsurnamesarr, $perName[$tID]);
> 			$result = getFamilyData($tree,$row['famc']);
> 			$rowM = tng_fetch_assoc( $result );
> 			$h = 2*($tID)+1;
> 			$w = 2*($tID)+2;
> 			$perID[$h] = $rowM['husband'];
> 			$perID[$w] = $rowM['wife'];
> 		}
> 	}
> }
> tng_free_result($result);
> $atancestorstr = implode(', ', $atsurnamesarr);
> 
> return $atancestorstr;
> }
> ?>
> 
> <div class="admin-main">
> <form action="admin_update_dna_test.php" method="post" name="form1" id="form1" onsubmit="return validateForm();">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus0",1,"testinfo",$admtext['testinfo'],""); ?>
> 
> 	<div id="testinfo">
> 	<br/>
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['test_type']; ?>:</td>
> 			<td>
> 				<select name="test_type" id="test_type">
> 					<option value="">&nbsp;</option>
> 					<option value="atDNA"<?php if($row['test_type'] == "atDNA") echo " selected"; ?>><?php echo $admtext['atdna_test']; ?></option>
> 					<option value="Y-DNA"<?php if($row['test_type'] == "Y-DNA") echo " selected"; ?>><?php echo $admtext['ydna_test']; ?></option>
> 					<option value="mtDNA"<?php if($row['test_type'] == "mtDNA") echo " selected"; ?>><?php echo $admtext['mtdna_test']; ?></option>
> 					<option value="X-DNA"<?php if($row['test_type'] == "X-DNA") echo " selected"; ?>><?php echo $admtext['xdna_test']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['test_number']; ?>:</td>
> 			<td><input type="text" name="test_number" value="<?php echo htmlspecialchars($row['test_number']); ?>" class="medfield"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['vendor']; ?>:</td>
> 			<td><input type="text" name="vendor" value="<?php echo htmlspecialchars($row['vendor']); ?>" class="medfield"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['test_date']; ?>:</td>
> 			<td><input type="text" name="test_date" value="<?php echo formatInternalDate($row['test_date']); ?>" class="medfield" onblur="checkDate(this);"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['match_date']; ?>:</td>
> 			<td><input type="text" name="match_date" value="<?php echo formatInternalDate($row['match_date']); ?>" class="medfield" onblur="checkDate(this);"></td>
> 		</tr>
> 		<?php if($row['test_type'] == "atDNA") { ?>
> 		<tr>
> 			<td><?php echo $admtext['gedmatchID']; ?>:</td>
> 			<td><input type="text" name="GEDmatchID" value="<?php echo htmlspecialchars($row['GEDmatchID']); ?>" id="GEDmatchID" class="medfield"></td>
> 		</tr>
> 		<?php }; ?>
> 		<tr>
> 			<td><strong><?php echo $admtext['privatetest']; ?>:</strong>&nbsp;</td>
> 			<td>
> 				<select name="private_test">
> 				<option value="0"<?php if( !$row['private_test'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				<option value="1"<?php if( $row['private_test'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td colspan="2"><br/><strong><?php echo $admtext['test_taker']; ?></strong></td>
> 		</tr>
> 		<tr>
> 			<td>
> 				<?php echo $admtext['tree']; ?>:
> 			</td>
> 			<td>
> 				<select name="mynewgedcom">
> 				<option value="">&nbsp;</option>
> <?php
> 		for( $j = 1; $j <= $treenum; $j++ ) {
> 			echo "	<option value=\"{$trees[$j]}\"";
> 			if($trees[$j] == $row['gedcom']) echo " selected";
> 			echo ">$treename[$j]</option>\n";
> 		}
> ?>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo "{$admtext['text_and']} {$admtext['personid']} "; ?>:</td>
> 			<td>
> 				<input type="text" name="personID" value="<?php echo $row['personID']; ?>" id="personID" size="20" maxlength="22"> &nbsp;<span><?php echo $takername; ?></span>&nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
> 				<a href="#" onclick="return findItem('I','personID','',document.form1.mynewgedcom.options[document.form1.mynewgedcom.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>">
> 					<img src="img/tng_find.gif" title="<?php echo $admtext['find']; ?>" alt="<?php echo $admtext['find']; ?>" class="alignmiddle" width="20" height="20" style="border: 0px; margin: 0px 2px;">
> 				</a>
> 				<!--<span id="deststrfield"><?php echo $takername; ?></span>-->
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo "{$admtext['text_or']} {$admtext['person_name']} "; ?></td>
> 			<td>
> 			<input type="text" name="person_name" value="<?php echo htmlspecialchars($row['person_name']); ?>" id="person_name" size="40" maxlength="100"></td>
> 		</tr>
> 		<tr>
> 			<td colspan="2"><strong><?php echo $text['keep_name_private']; ?>:</strong>&nbsp;<input type="checkbox" name="private_dna" value="1"<?php if( $row['private_dna'] ) echo " checked=\"checked\""; ?>></td>
> 		</tr>
> 		<tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 		<tr>
> 			<td><strong><?php echo $admtext['addtotestgroup']; ?>:</strong>&nbsp;</td>
> 			<td>
> 				<select name="dna_group">
> 				<option value=""><?php echo $text['none']; ?></option>
> <?php
> 		$groupsquery = "SELECT * FROM $dna_groups_table WHERE `test_type` = \"{$row['test_type']}\" ORDER BY description";
> 		$groupsresult = tng_query($groupsquery);
> 		$numgrouprows = tng_num_rows( $groupsresult );
> 		while( $groupsrow = tng_fetch_assoc($groupsresult) ) {
> 		if($row['dna_group'] == $groupsrow['dna_group']) $selectgrp = "selected";
>                  else $selectgrp = "";
> 		echo "	<option value=\"{$groupsrow['dna_group']}\" $selectgrp>{$groupsrow['description']} </option>\n";
> 		}
> 		tng_free_result($groupsresult);
> ?>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 		<?php if($row['test_type'] == "Y-DNA") { ?>
> 		<tr>
> 			<td><?php echo $admtext['markers']; ?>:</td>
> 			<td><input type="text" name="markers" value="<?php echo htmlspecialchars($row['markers']); ?>" class="medfield"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['marker_values']; ?>:<br /><?php echo $admtext['separate']; ?>:<br /><?php echo $admtext['multivalues']; ?></td>
> 			<td><textarea cols="90" rows="3" name="y_results"><?php echo htmlspecialchars($row['y_results']); ?></textarea></td>
> 		</tr>
> 		<?php }; ?>
> 		<?php if( $row['test_type'] == "mtDNA" || $row['test_type'] == "atDNA" ) {
> 			$mt_checkedstr = ($row['mtdna_confirmed']) ? "checked" : ""; ?>
> 		<tr>
> 			<td><?php echo $admtext['mtdna_haplogroup']; ?>:</td>
> 			<td><input type="text" name="mtdna_haplogroup" value="<?php echo htmlspecialchars($row['mtdna_haplogroup']); ?>" class="medfield">&nbsp;&nbsp;<?php echo $text['confirmed']; ?>:&nbsp;<input type="checkbox" name="mtdna_confirmed" value="1" <?php echo $mt_checkedstr; ?>>
> 			</td>
> 		</tr>
> 		<?php };
> 		if( $row['test_type'] == "Y-DNA"  || $row['test_type'] == "atDNA") {
> 			$y_checkedstr = ($row['ydna_confirmed']) ? "checked" : ""; ?>
> 		<tr>
> 			<td><?php echo $admtext['ydna_haplogroup']; ?>:</td>
> 			<td><input type="text" name="ydna_haplogroup" value="<?php echo htmlspecialchars($row['ydna_haplogroup']); ?>" class="medfield">&nbsp;&nbsp;<?php echo $text['confirmed']; ?>:&nbsp;<input type="checkbox" name="ydna_confirmed" value="1" <?php echo $y_checkedstr; ?>>
> 			</td>
> 		</tr>
> 		<?php };  ?>
> 
> 		<?php if($row['test_type'] == "mtDNA") { ?>
>                 <tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 		<tr>
>                         <td><strong><?php echo $admtext['ref_seq']; ?>:</strong>&nbsp;</td>
> 			<td>
> 				<select name="ref_seq">
> 					<option value=""<?php if( $row['ref_seq'] == "" ) echo " selected"; ?>></option>
> 					<option value="rsrs"<?php if( $row['ref_seq'] == "rsrs" ) echo " selected"; ?>><?php echo $admtext['rsrs']; ?></option>
> 					<option value="rcrs"<?php if( $row['ref_seq'] == "rcrs" ) echo " selected"; ?>><?php echo $admtext['rcrs']; ?></option>
> 				</select></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['hvr1_values']; ?>:</td>
> 			<td><input type="text" name="hvr1_results" value="<?php echo htmlspecialchars($row['hvr1_results']); ?>" style="width:700px;">&nbsp;<?php echo $admtext['separate']; ?></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['hvr2_values']; ?>:</td>
> 			<td><input type="text" name="hvr2_results" value="<?php echo htmlspecialchars($row['hvr2_results']); ?>" style="width:700px;">&nbsp;<?php echo $admtext['separate']; ?></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['xtra_mut']; ?>:</td>
> 			<td><input type="text" name="xtra_mut" value="<?php echo htmlspecialchars($row['xtra_mut']); ?>" style="width:700px;">&nbsp;<?php echo $admtext['separate']; ?></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['coding_reg']; ?>:</td>
> 			<td><textarea cols="69" rows="2" name="coding_reg"><?php echo htmlspecialchars($row['coding_reg']); ?></textarea>&nbsp;<?php echo $admtext['separate']; ?>
>                        </td>
> 		</tr>
> 		<?php }; ?>
> 		<?php if($row['test_type'] == "Y-DNA") { ?>
> 		<tr>
> 			<td><?php echo $admtext['signsnp']; ?>:</td>
> 			<td><input type="text" name="signsnp" value="<?php echo htmlspecialchars($row['significant_snp']); ?>" class="verylongfield"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['termsnp']; ?>:</td>
> 			<td><input type="text" name="termsnp" value="<?php echo htmlspecialchars($row['terminal_snp']); ?>" class="verylongfield"></td>
> 		</tr>
> 		<?php }; ?>
> 		<?php if($row['test_type'] == "atDNA") { ?>
>         <tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 		<tr>
> 			<td colspan="2"><br/><strong><?php echo $admtext['shared_dna']; ?></strong></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['shared centimorgans']; ?>:</td>
> 			<td><input type="text" name="shared_cMs" value="<?php echo htmlspecialchars($row['shared_cMs']); ?>" id="shared_cMs" size="20" maxlength="22"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['shared_segments']; ?>:</td>
> 			<td><input type="text" name="shared_segments" value="<?php echo htmlspecialchars($row['shared_segments']); ?>" id="shared_segments" size="20" maxlength="22"></td>
> 		</tr>
> 
> 		<tr>
> 			<td colspan="2"><br/><strong><?php echo $admtext['largest_segment']; ?></strong></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['chromosome']; ?>:</td>
> 			<td><input type="text" name="chromosome" value="<?php echo htmlspecialchars($row['chromosome']); ?>" id="chromosome" size="20" maxlength="22"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['segment_start']; ?>:</td>
> 			<td><input type="text" name="segment_start" value="<?php echo htmlspecialchars($row['segment_start']); ?>" id="segment_start" size="20" maxlength="22"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['segment_end']; ?>:</td>
> 			<td><input type="text" name="segment_end" value="<?php echo htmlspecialchars($row['segment_end']); ?>" id="segment_end" size="20" maxlength="22"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['centiMorgans']; ?>:</td>
> 			<td><input type="text" name="centiMorgans" value="<?php echo htmlspecialchars($row['centiMorgans']); ?>" id="centiMorgans" size="20" maxlength="22"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['matchingSNPs']; ?>:</td>
> 			<td><input type="text" name="matching_SNPs" value="<?php echo htmlspecialchars($row['matching_SNPs']); ?>" id="matching_SNPs" size="20" maxlength="22"></td>
> 		</tr>
>         <tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 		<tr>
> 			<td colspan="2"><br/><strong><?php echo $admtext['relationship_section']; ?></strong></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['relationship_range']; ?>:</td>
> 			<td><input type="text" name="relationship_range" value="<?php echo htmlspecialchars($row['relationship_range']); ?>" id="relationship_range" size="80" maxlength="80"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['suggested_relationship']; ?>:</td>
> 			<td><input type="text" name="suggested_relationship" value="<?php echo htmlspecialchars($row['suggested_relationship']); ?>" id="suggested_relationship" size="80" maxlength="80"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['actual_relationship']; ?>:</td>
> 			<td><input type="text" name="actual_relationship" value="<?php echo htmlspecialchars($row['actual_relationship']); ?>" id="actual_relationship" size="40" maxlength="40"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['related_side']; ?>:</td>
> 			<td><input type="text" name="related_side" value="<?php echo htmlspecialchars($row['related_side']); ?>" id="related_side" size="40" maxlength="40"></td>
> 		</tr>
>         <tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 		<tr>
> 			<td><strong><?php echo $admtext['xmatch']; ?>:</strong>&nbsp;</td>
> 			<td>
> 				<select name="x_match">
> 				<option value="0"<?php if( !$row['x_match'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				<option value="1"<?php if( $row['x_match'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
>         <tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 		<?php }; ?>
> 		<tr>
> 			<td colspan="2"><br/><strong><?php echo $admtext['mdaID']; ?></strong></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['personid']; ?>:</td>
> 			<td><input type="text" name="MD_ancestorID" value="<?php echo $row['MD_ancestorID']; ?>" id="MD_ancestorID" size="20" maxlength="22"><span>&nbsp;<?php echo $mdancestorname; ?></span>&nbsp;&nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
> 				<a href="#" onclick="return findItem('I','MD_ancestorID','',document.form1.mynewgedcom.options[document.form1.mynewgedcom.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>">
> 					<img src="img/tng_find.gif" title="<?php echo $admtext['find']; ?>" alt="<?php echo $admtext['find']; ?>" class="alignmiddle" width="20" height="20" style="border: 0px; margin: 0px 2px;">
> 				</a>
> 			</td>
> 		</tr>
> 
> 		<tr>
> 			<td colspan="2"><br/><strong><?php echo $admtext['mrcaID']; ?></strong></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['searchfor'] ; ?></td>
> 			<td><input type="radio" name="mrcatype" value="I" checked="checked" onclick="activateMrcaType('I');"/> <?php echo $admtext['person']; ?> &nbsp;&nbsp;
> 			<input type="radio" name="mrcatype" value="F" onclick="activateMrcaType('F');"/> <?php echo $admtext['family']; ?>
> 			</td>
> 		</tr>
> 
> 		<tr>
> 			<td><span id="person_label"><?php echo $admtext['personid']; ?></span><span id="family_label" style="display:none"><?php echo $admtext['familyid']; ?></span>:</td>
> 			<td valign="top"><input type="text" name="MRC_ancestorID"  value="<?php echo $row['MRC_ancestorID']; ?>" id="MRC_ancestorID"> &nbsp;<?php echo $mrcancestorname; ?>&nbsp;&nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
> 			<a href="#" onclick="return findItem(mrcaType,'MRC_ancestorID','',document.form1.mynewgedcom.options[document.form1.mynewgedcom.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>"><img src="img/tng_find.gif" title="<?php echo $admtext['find']; ?>" alt="<?php echo $admtext['find']; ?>" class="alignmiddle" width="20" height="20" style="border: 0px; margin: 0px 2px;"></a>
> 			</td>
> 		</tr>
> 
> 		<?php
> 			if ((!$row['surnames'] && $row['test_type'] != "atDNA") && $autofillancsurnames && $row['personID'])
> 				$ancestorstr = get_ancestor_surnames($row['personID'], $row['gedcom'], $row['test_type']);
> 			else if ((!$row['surnames'] && $row['test_type'] == "atDNA") && $autofillancsurnames && $row['personID'])
> 				$ancestorstr = get_atdna_ancestor_surnames($row['personID'], $row['gedcom'], $row['test_type']);
>             else
>             	$ancestorstr = $row['surnames'];
> 			if ($ancsurnameupper)
> 				$ancestorstr = strtoupper($ancestorstr);
> 		?>
> 		<tr>
> 			<td valign="top"><?php echo $admtext['ancestral_surnames']; ?>:</td>
> 			<td><textarea cols="90" rows="10" name="surnames"><?php echo $ancestorstr; ?></textarea></td>
> 		</tr>
> 		<tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 		<tr>
> 			<td valign="top"><?php echo $admtext['notes']; ?>:</td>
> 			<td><textarea cols="90" rows="10" name="notes"><?php echo $row['notes']; ?></textarea></td>
> 		</tr>
> 		<tr>
> 			<td valign="top"><?php echo $admtext['admin_notes']; ?>:</td>
> 			<td><textarea cols="90" rows="10" name="admin_notes"><?php echo $row['admin_notes']; ?></textarea></td>
> 		</tr>
> 		<tr>
> 			<td valign="top"><?php echo $admtext['urls']; ?>:</td>
> 			<td><textarea cols="90" rows="3" name="urls"><?php echo $row['urls']; ?></textarea></td>
> 		</tr>
> 		<tr>
> 			<td valign="top"><?php echo $admtext['medialinks']; ?>:</td>
> 			<td><textarea cols="90" rows="3" name="medialinks"><?php echo $row['medialinks']; ?></textarea></td>
> 		</tr>
> 		<tr><td colspan="2">&nbsp;</td></tr>
> 		<tr>
> 			<td><strong><?php echo $text['test_info_display']; ?>:</strong>&nbsp;</td><td>
>                    <?php if($row['test_type'] != "X-DNA" ) { ?>
> 			<input type="checkbox" name="markeropt" value="1"<?php if( $row['markeropt'] ) echo " checked=\"checked\""; ?>>&nbsp;<?php echo $text['test_results']; ?>&nbsp;&nbsp;
>                     <?php }; ?>
>             <input type="checkbox" name="notesopt" value="1"<?php if( $row['notesopt'] ) echo " checked=\"checked\""; ?>>&nbsp;<?php echo $admtext['notes']; ?>&nbsp;&nbsp;
>             <input type="checkbox" name="linksopt" value="1"<?php if( $row['linksopt'] ) echo " checked=\"checked\""; ?>>&nbsp;<?php echo $admtext['urls']; ?>&nbsp;&nbsp;
>             <input type="checkbox" name="surnamesopt" value="1"<?php if( $row['surnamesopt'] ) echo " checked=\"checked\""; ?>>&nbsp;<?php echo $admtext['ancestral_surnames']; ?></td>
> 		</tr>
> 		<tr><td colspan="2">&nbsp;</td></tr>
> 	</table>
> 	</div>
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack" id="linkstd">
> 	<?php $admtext['dnalinkssubt'] = "Link this DNA test to a person";
> 	echo displayToggle("plus2",1,"links",$admtext['test_links'] . " (<span id=\"linkcount\">$numlinks</span>)",$admtext['dnalinkssubt']); ?>
> 
> 	<?php include("micro_dnalinks.php"); ?>
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<input type="hidden" value="<?php if(isset($cw)) echo $cw; /*stands for "close window" */ ?>" name="cw">
> 	<input type="hidden" value="<?php echo $row['testID']; ?>" name="testID">
> 	<input type="hidden" value="<?php echo $row['personID']; ?>" name="personID_org">
> <?php
> 	if(!empty($cw)) {
> ?>
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 	} else {
> ?>
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 	}
> ?>
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_dna_tests.php';">
> </td>
> </tr>
> 
> </table>
> </form>
> </div>
> <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
> <script type="text/javascript">
> //<![CDATA[
> var tree = "<?php echo !empty($tree) ? $tree : ""; ?>";
> var tnglitbox;
> <?php
> 	echo "var linkcount = $numlinks;\n";
> 	echo "var confdellink = \"{$admtext['confdellink']}\";\n";
> 	echo "var remove_text = \"{$admtext['removelink']}\";\n";
> ?>
> 
> function validateForm( ) {
> 	var rval = true;
> 
> //req: test number, test type
> 	var frm = document.form1;
> 	if(!frm.test_type.selectedIndex) {
> 		alert("<?php echo $admtext['selecttype']; ?>");
> 		rval = false;
> 	}
> //removed test_number alert
> 	return rval;
> }
> 
> function toggleAll(display) {
> 	toggleSection('testinfo','plus0',display);
> 	return false;
> }
> //]]>
> </script>
> <script type="text/javascript" src="<?php echo $cms['tngpath'] ;?>js/datevalidation.js?v=<?php echo filemtime($cms['tngpath']."js/datevalidation.js"); ?>"></script>
> <script type="text/javascript" src="<?php echo $cms['tngpath'] ;?>js/selectutils.js?v=<?php echo filemtime($cms['tngpath']."js/selectutils.js"); ?>"></script>
> <script type="text/javascript" src="<?php echo $cms['tngpath'] ;?>js/dna_tests.js?v=<?php echo filemtime($cms['tngpath']."js/dna_tests.js"); ?>"></script>
> <script type="text/javascript">
> //<![CDATA[
> 	var preferEuro = <?php echo (isset($tngconfig['preferEuro']) ? $tngconfig['preferEuro'] : "false"); ?>;
> 	var preferDateFormat = '<?php if( isset($preferDateFormat) ) echo $preferDateFormat; ?>';
> 	var findform = document.form1;
> //]]>
> </script>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editevent.php TNG1403/admin_editevent.php
7a8
> $admin_login = 1;
10c11,13
< $query = "SELECT display, $events_table.eventtypeID as eventtypeID, eventdate, eventplace, age, agency, cause, $events_table.gedcom as gedcom, $events_table.addressID, address1, address2, city, state, zip, country, info, phone, email, www, type FROM ($events_table, $eventtypes_table) LEFT JOIN $address_table on $events_table.addressID = $address_table.addressID WHERE eventID = \"$eventID\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID";
---
> $query = "SELECT display, $events_table.eventtypeID as eventtypeID, eventdate, eventplace, tag, age, agency, cause, $events_table.gedcom as gedcom, $events_table.addressID, address1, address2, city, state, zip, country, info, phone, email, www, type FROM ($events_table, $eventtypes_table) 
> 	LEFT JOIN $address_table on $events_table.addressID = $address_table.addressID 
> 	WHERE eventID = \"$eventID\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID";
14,24c17,27
< $row['eventplace'] = preg_replace("/\"/", "&#34;",$row['eventplace']);
< $row['info'] = preg_replace("/\"/", "&#34;",$row['info']);
< $row['age'] = preg_replace("/\"/", "&#34;",$row['age']);
< $row['agency'] = preg_replace("/\"/", "&#34;",$row['agency']);
< $row['cause'] = preg_replace("/\"/", "&#34;",$row['cause']);
< $row['address1'] = preg_replace("/\"/", "&#34;",$row['address1']);
< $row['address1'] = preg_replace("/\"/", "&#34;",$row['address1']);
< $row['city'] = preg_replace("/\"/", "&#34;",$row['city']);
< $row['state'] = preg_replace("/\"/", "&#34;",$row['state']);
< $row['zip'] = preg_replace("/\"/", "&#34;",$row['zip']);
< $row['country'] = preg_replace("/\"/", "&#34;",$row['country']);
---
> $row['eventplace'] = preg_replace("/\"/", "&#34;",$row['eventplace'] ?? '');
> $row['info'] = preg_replace("/\"/", "&#34;",$row['info'] ?? '');
> $row['age'] = preg_replace("/\"/", "&#34;",$row['age'] ?? '');
> $row['agency'] = preg_replace("/\"/", "&#34;",$row['agency'] ?? '');
> $row['cause'] = preg_replace("/\"/", "&#34;",$row['cause'] ?? '');
> $row['address1'] = preg_replace("/\"/", "&#34;",$row['address1'] ?? '');
> $row['address2'] = preg_replace("/\"/", "&#34;",$row['address2'] ?? '');
> $row['city'] = preg_replace("/\"/", "&#34;",$row['city'] ?? '');
> $row['state'] = preg_replace("/\"/", "&#34;",$row['state'] ?? '');
> $row['zip'] = preg_replace("/\"/", "&#34;",$row['zip'] ?? '');
> $row['country'] = preg_replace("/\"/", "&#34;",$row['country'] ?? '');
42c45
< 	<tr><td><?php echo $admtext['eventplace']; ?>:</td><td valign="top"><input type="text" name="eventplace" id="eventplace" size="40" value="<?php echo $row['eventplace']; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
---
> 	<tr><td><?php echo $admtext['eventplace']; ?>:</td><td valign="top"><input type="text" name="eventplace" id="eventplace" size="70" value="<?php echo $row['eventplace']; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
44c47
< 	<tr><td valign="top"><?php echo $admtext['detail']; ?>:</td><td><textarea name="info" rows="4" cols="40"><?php echo $row['info']; ?></textarea></td></tr>
---
> 	<tr><td valign="top"><?php echo $admtext['detail']; ?>:</td><td><textarea name="info" rows="6" cols="70"><?php echo $row['info']; ?></textarea></td></tr>
49c52
< 			<table class="normal" cellpadding="0"><tr><td><input type="text" name="dupIDs" id="dupIDs" value="<?php echo $row['personID']; ?>" class="medfield"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</td>
---
> 			<table class="normal" cellpadding="0"><tr><td><input type="text" name="dupIDs" id="dupIDs" value="" class="medfield"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</td>
diff -r TNG/admin_editeventtype.php TNG1403/admin_editeventtype.php
26c26
< switch( $row[type] ) {
---
> switch( $row['type'] ) {
43d42
< $flags['tabs'] = $tngconfig['tabs'];
46,47c45,46
< <SCRIPT language="JavaScript" type="text/javascript" src="js/eventtypes.js"></script>
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript" src="js/eventtypes.js"></script>
> <script type="text/javascript">
128c127
< <script language="JavaScript" src="js/admin.js"></script>
---
> <script src="js/admin.js"></script>
131,132d129
< <body background="img/background.gif">
< 
133a131,132
> 	echo tng_adminlayout();
> 
142,144c141,142
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
171c169
< 			<input type="text" name="tag2" size="10" onBlur="if(this.value == 'EVEN') {toggleTdesc(1);} else {toggleTdesc(0);}"> (<?php echo $admtext['ifbothdata']; ?>)
---
> 			<input type="text" name="tag2" size="10" onBlur="if(this.value == 'EVEN' || this.value == '') {toggleTdesc(1);} else {toggleTdesc(0);}"> (<?php echo $admtext['ifbothdata']; ?>)
199,206c197,204
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savechanges']; ?>"></form>
< 	<p class="normal">*<?php echo $admtext['typerequired']; ?></p>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< <SCRIPT language="JavaScript" type="text/javascript">
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_eventtypes.php';">
> 	<p class="normal" id="typereq" style="display:none">*<?php echo $admtext['typerequired']; ?></p>
> 	</form>
> 	</div>
> </div>
> <script type="text/javascript">
209,210c207,209
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editfamily.php TNG1403/admin_editfamily.php
7a8
> $admin_login = 1;
19c20
< $row['notes'] = preg_replace("/\"/", "&#34;",$row['notes']);
---
> //$row['notes'] = preg_replace("/\"/", "&#34;",$row['notes']);
97c98
< $query = "SELECT $people_table.personID as pID, firstname, lastname, lnprefix, prefix, suffix, nameorder, birthdate, altbirthdate, deathdate, burialdate, living, private, branch, $people_table.gedcom FROM $people_table, $children_table WHERE $people_table.personID = $children_table.personID AND $children_table.familyID = \"$familyID\" AND $people_table.gedcom = \"$tree\" AND $children_table.gedcom = \"$tree\" ORDER BY ordernum";
---
> $query = "SELECT $people_table.personID, $people_table.personID as pID, firstname, lastname, lnprefix, prefix, suffix, title, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, burialdate, living, private, branch, $people_table.gedcom FROM $people_table, $children_table WHERE $people_table.personID = $children_table.personID AND $children_table.familyID = \"$familyID\" AND $people_table.gedcom = \"$tree\" AND $children_table.gedcom = \"$tree\" ORDER BY ordernum";
106d106
< $flags['tabs'] = $tngconfig['tabs'];
112a113
> <?php if(!empty($ref)) { echo "window.opener.location.reload(false);\n"; } ?>
168c169
< 	deepOpen('admin_editperson.php?personID=' + id + '&tree=<?php echo $tree; ?>' + '&cw=1','editchild');
---
> 	window.open('admin_editperson.php?personID=' + id + '&tree=<?php echo $tree; ?>' + '&cw=1');
173c174
< 		deepOpen('admin_editperson.php?personID=' + field.value + '&tree=<?php echo $tree; ?>' + '&cw=1','editspouse');
---
> 		window.open('admin_editperson.php?personID=' + field.value + '&tree=<?php echo $tree; ?>' + '&cw=1');
190,191c191,192
< 			width:620,
< 			height:600,
---
> 			width:650,
> 			height:670,
193c194
< 				generateID('person',document.npform.personID);
---
> 				generateID('person',document.npform.personID,document.form1.tree1);
249c250
< 		top.frames['main'].location = 'admin_newmedia.php?personID=<?php echo $familyID; ?>&tree=?php echo $tree; ?>&linktype=F';
---
> 		window.location = 'admin_newmedia.php?personID=<?php echo $familyID; ?>&tree=?php echo $tree; ?>&linktype=F';
265c266
< <script language="JavaScript" src="js/admin.js"></script>
---
> <script src="js/admin.js"></script>
268,269d268
< <body background="img/background.gif">
< 
270a270,271
> 	echo tng_adminlayout();
> 
274c275
< 	$familytabs['3'] = array($allow_edit,"admin_editfamily.php?familyID=$familyID&tree=$tree",$admtext['edit'],"edit");
---
> 	$familytabs['3'] = array($allow_edit,"admin_editfamily.php?familyID=$familyID&amp;tree=$tree",$admtext['edit'],"edit");
277c278
< 	$innermenu .= " &nbsp;|&nbsp; <a href=\"$familygroup_url" . "familyID=$familyID&amp;tree=$tree\" target=\"_blank\" class=\"lightlink\">{$admtext['test']}</a>";
---
> 	$innermenu .= " &nbsp;|&nbsp; <a href=\"$familygroup_url" . "familyID=$familyID&amp;tree=$tree\" target=\"blank\" class=\"lightlink\">{$admtext['test']}</a>";
283a285
> <div class="admin-main">
285,287c287,289
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="normal adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
297c299
< 					echo "<p class=\"normal\"><strong><a href=\"admin_editfamily.php?familyID=$familyID&tree=$tree\" class=\"rounded10 whitebuttonlink tngshadow\">{$admtext['retry']}</a></strong></p>\n";
---
> 					echo "<p class=\"normal\"><strong><a href=\"admin_editfamily.php?familyID=$familyID&amp;tree=$tree\" class=\"rounded10 whitebuttonlink tngshadow\">{$admtext['retry']}</a></strong></p>\n";
300,301c302,303
< 					$notesicon = $gotnotes['general'] ? "admin-note-on-icon" : "admin-note-off-icon";
< 					$citesicon = $gotcites['general'] ? "admin-cite-on-icon" : "admin-cite-off-icon";
---
> 					$notesicon = !empty($gotnotes['general']) ? "admin-note-on-icon" : "admin-note-off-icon";
> 					$citesicon = !empty($gotcites['general']) ? "admin-cite-on-icon" : "admin-cite-off-icon";
303c305,306
< 					echo "<a href=\"#\" onclick=\"document.form1.submit();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
---
> 					$return = !empty($cw) ? "saveclose" : "saveret";
> 					echo "<a href=\"#\" onclick=\"jQuery('#{$return}').click();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
320,321c323,324
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
328c331
< 		$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, nameorder, birthdate, altbirthdate, deathdate, burialdate FROM $people_table WHERE personID = \"{$row['husband']}\" AND gedcom = \"$tree\"";
---
> 		$query = "SELECT personID, lastname, lnprefix, firstname, prefix, suffix, title, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, burialdate, living, private, branch, gedcom FROM $people_table WHERE personID = \"{$row['husband']}\" AND gedcom = \"$tree\"";
350c353
< 		$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, nameorder, birthdate, altbirthdate, deathdate, burialdate FROM $people_table WHERE personID = \"{$row['wife']}\" AND gedcom = \"$tree\"";
---
> 		$query = "SELECT personID, lastname, lnprefix, firstname, prefix, suffix, title, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, burialdate, living, private, branch, gedcom FROM $people_table WHERE personID = \"{$row['wife']}\" AND gedcom = \"$tree\"";
378c381
< 				<input type="checkbox" name="private" value="1"<?php if( $row['private'] ) echo " checked=\"$checked\""; ?>> <?php echo $admtext['text_private']; ?>
---
> 				<input type="checkbox" name="private" value="1"<?php if( $row['private'] ) echo " checked=\"checked\""; ?>> <?php echo $admtext['text_private']; ?>
411c414
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('branchedit'); quitBranchEdit('branchedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('branchedit'); quitEdit('branchedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
413c416
< 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('branch','branchedit','branchlist');">
---
> 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('branch','branchedit','branchlist');">
428,429c431,432
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
434c437
< 	<table class="normal">
---
> 	<table class="normal" id="events_table">
448,450d450
< 	</table>
< 	<br/>
< 	<table class="normal">
452,455c452,456
< 			<td valign="top">
< 				<strong class="subhead" style="color:black"><?php echo $admtext['otherevents']; ?>: &nbsp;</strong>
< <?php
< 	echo "<p><input type=\"button\" value=\"  " . $admtext['addnew'] . "  \" onclick=\"newEvent('F','$familyID','$tree');\"></p>\n";
---
> 			<td colspan="2">
> 				<br/>
> 				<p><strong class="subhead">
> <?php 
> 	echo $admtext['otherevents'] . ": &nbsp;<input type=\"button\" value=\"  {$admtext['addnew']}  \" onclick=\"newEvent('F','$familyID','$tree');\">\n";
456a458
> 				</strong></p>
458c460
< 			<td valign="top">
---
> 		</tr>
462,463d463
< 	   		</td>
< 		</tr>
468,469c468,469
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
548,556c548,557
< <tr class="databack">
< <td class="tngshadow normal">
< <?php 
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newfamily\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newfamily\" value=\"close\" checked=\"checked\"> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newfamily\" value=\"none\" checked=\"checked\"> {$admtext['saveback']}\n";
---
> <tr>
> <td class="tngshadow databack">
> <?php
> 	if(!empty($cw)) {
> ?>
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.close();";
> 	} else {
558c559,568
< 	<br/><br/><input type="submit" class="btn" name="submit2" accesskey="s" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.location.href='admin_families.php';";
> 	}
> ?>
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="<?php echo $close_command; ?>">
> 
561d570
< 	<input type="hidden" name="sealsrc" value="<?php echo $row['sealsrc']; ?>">
564c573
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
---
> 	<input type="hidden" value="<?php echo (isset($cw) ? $cw : ""); /*stands for "close window" */ ?>" name="cw">
574,577c583,585
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editlanguage.php TNG1403/admin_editlanguage.php
25d24
< $flags['tabs'] = $tngconfig['tabs'];
29c28
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
45,46d43
< <body background="img/background.gif">
< 
47a45,46
> 	echo tng_adminlayout();
> 
56,58c55,56
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
70c68
< 			if(is_dir($filename) && $filename != '..' && $filename != '.')
---
> 			if(is_dir($filename) && $filename != '..' && $filename != '.' && $filename != '@eaDir')
104,111c102,110
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>"></form>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_languages.php';">
> 	</form>
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editmedialink.php TNG1403/admin_editmedialink.php
37c37,44
< 	$list = array("NAME","BIRT","CHR","DEAT","BURI");
---
> 	$query = "SELECT altbirthtype FROM $people_table WHERE personID = \"$entityID\" AND gedcom = \"{$row['gedcom']}\"";
> 	$presult = tng_query($query);
> 	$prow = tng_fetch_assoc( $presult );
> 	tng_free_result($presult);
> 
> 	$altbirthtype = $prow['altbirthtype'] ? $prow['altbirthtype'] : explode(',',$tngconfig['altbirth'])[0];
> 	if(empty($altbirthtype)) $altbirthtype = "CHR";
> 	$list = array("NAME","BIRT",$altbirthtype,"DEAT","BURI");
78c85
< <p class="subhead"><strong><?php echo $headline; ?></strong></p>
---
> <br/>
diff -r TNG/admin_editmedia.php TNG1403/admin_editmedia.php
4c4,5
< $mapkeystr = $map['key'] && $map['key'] != "1" ? "&key=" . $map['key'] : "";include("adminlib.php");
---
> $mapkeystr = $map['key'] && $map['key'] != "1" ? "&amp;key=" . $map['key'] . "&amp;callback=initMap" : "";
> include("adminlib.php");
21a23,25
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
> 
25c29
< $row['description'] = preg_replace("/\"/", "&#34;",$row['description']);
---
> $row['description'] = !empty($row['description']) ? preg_replace("/\"/", "&#34;",$row['description']) : "";
27,32c31,40
< $row['datetaken'] = preg_replace("/\"/", "&#34;",$row['datetaken']);
< $row['placetaken'] = preg_replace("/\"/", "&#34;",$row['placetaken']);
< $row['owner'] = preg_replace("/\"/", "&#34;",$row['owner']);
< $row['map'] = preg_replace("/\"/", "&#34;",$row['map']);
< $row['map'] = preg_replace("/>/", "&gt;",$row['map']);
< $row['map'] = preg_replace("/</", "&lt;",$row['map']);
---
> $row['datetaken'] = !empty($row['datetaken']) ? preg_replace("/\"/", "&#34;",$row['datetaken']) : "";
> $row['placetaken'] = !empty($row['placetaken']) ? preg_replace("/\"/", "&#34;",$row['placetaken']) : "";
> $row['owner'] = !empty($row['owner']) ? preg_replace("/\"/", "&#34;",$row['owner']) : "";
> if(!empty($row['map'])) {
> 	$row['map'] = preg_replace("/\"/", "&#34;",$row['map']);
> 	$row['map'] = preg_replace("/>/", "&gt;",$row['map']);
> 	$row['map'] = preg_replace("/</", "&lt;",$row['map']);
> }
> else
> 	$row['map'] = "";
38c46,47
< if($row['abspath']) $row['path'] = preg_replace("/&/", "&amp;",$row['path']);
---
> if($row['abspath']) 
> 	$row['path'] = !empty($row['path']) ? preg_replace("/&/", "&amp;",$row['path']) : "";
42,43c51,52
< $path = stripslashes($path);
< $thumbpath = stripslashes($thumbpath);
---
> $path = isset($path) ? stripslashes($path) : "";
> $thumbpath = isset($thumbpath) ? stripslashes($thumbpath) : "";
48c57
< 	$form = strtoupper($matches[1]);
---
> 	$form = isset($matches[1]) ? strtoupper($matches[1]) : "";
67,70c76,79
< $query = "SELECT $medialinks_table.medialinkID as mlinkID, $medialinks_table.personID as personID, $medialinks_table.eventID, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, people.nameorder as nameorder, altdescription, altnotes, $medialinks_table.gedcom as gedcom, people.branch as branch, treename,
< 	familyID, people.personID as personID2, wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder,
< 	husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder,
< 	sources.sourceID, sources.title, citationID, repositories.repoID as repoID, reponame, defphoto, linktype, dontshow, people.living, people.private, $families_table.living as fliving, $families_table.private as fprivate
---
> $query = "SELECT $medialinks_table.medialinkID as mlinkID, $medialinks_table.personID as personID, $medialinks_table.eventID, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, people.nameorder as nameorder, people.title, people.birthdate, people.birthdatetr, people.altbirthdate, people.altbirthdatetr, people.deathdate, people.deathdatetr, altdescription, altnotes, $medialinks_table.gedcom as gedcom, people.branch as branch, treename,
> 	familyID, people.personID as personID2, wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder, wifepeople.title as wtitle, wifepeople.birthdate as wbirthdate, wifepeople.birthdatetr as wbirthdatetr, wifepeople.altbirthdate as waltbirthdate, wifepeople.altbirthdatetr as waltbirthdatetr, wifepeople.deathdate as wdeathdate, wifepeople.deathdatetr as wdeathdatetr,
> 	husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder, husbpeople.title as htitle, husbpeople.birthdate as hbirthdate, husbpeople.birthdatetr as hbirthdatetr, husbpeople.altbirthdate as haltbirthdate, husbpeople.altbirthdatetr as haltbirthdatetr, husbpeople.deathdate as hdeathdate, husbpeople.deathdatetr as hdeathdatetr,
> 	sources.sourceID, sources.title as sourcetitle, citationID, repositories.repoID as repoID, reponame, defphoto, linktype, dontshow, people.living, people.private, $families_table.living as fliving, $families_table.private as fprivate
88,89d96
< $flags['tabs'] = $tngconfig['tabs'];
< 
105a113
> $treestr = $tngconfig['mediatrees'] ? $row['gedcom'] . "/" : "";
108,109c116,117
< if( $row['thumbpath'] && file_exists("$rootpath$usefolder/" . $row['thumbpath'])) {
< 	$photoinfo = @GetImageSize( "$rootpath$usefolder/" . $row['thumbpath'] );
---
> if( $row['thumbpath'] && file_exists("$rootpath$usefolder/$treestr" . $row['thumbpath'])) {
> 	$photoinfo = @GetImageSize( "$rootpath$usefolder/$treestr" . $row['thumbpath'] );
118c126
< 	$photo = "<img border=0 src=\"$usefolder/" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" width=\"$photowtouse\" height=\"$photohtouse\" style=\"border-color:#000000;margin-right:6px\"></span>\n";
---
> 	$photo = "<img class=\"adminthumb\" src=\"$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" width=\"$photowtouse\" height=\"$photohtouse\" style=\"border-color:#000000;margin-right:6px\"></span>\n";
125c133
< 	$size = @GetImageSize( "$rootpath$usefolder/" . $row['path'] );
---
> 	$size = @GetImageSize( "$rootpath$usefolder/$treestr" . $row['path'] );
148a157,159
> <script>
> <?php if(!empty($ref)) { echo "window.opener.location.reload(false);\n"; } ?>
> </script>
151,152d161
< <body <?php echo "$onload"; ?> background="img/background.gif">
< 
153a163,164
> 	echo tng_adminlayout();
> 
165c176
< 	echo displayHeadline($admtext['media'] . " &gt;&gt; " . $admtext['existingmediainfo'],"img/photos_icon.gif",$menu,"");
---
> 	echo displayHeadline($admtext['media'] . " &gt;&gt; " . $admtext['modifymedia'],"img/photos_icon.gif",$menu,"");
167a179
> <div class="admin-main">
169,171c181,183
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
181c193,194
< 				echo "<a href=\"#\" onclick=\"document.form1.submit();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
---
> 				$return = !empty($cw) ? "saveclose" : "saveret";
> 				echo "<a href=\"#\" onclick=\"jQuery('#{$return}').click();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
192,193c205,206
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
225c238
< 	<tr id="imgrow"><td><?php echo $admtext['imagefiletoupload']; ?>*:</td><td><input type="file" name="newfile" size="60" onChange="populatePath(document.form1.newfile,document.form1.path);"></td></tr>
---
> 	<tr id="imgrow"><td><?php echo $admtext['imagefiletoupload']; ?>*:</td><td><input type="file" name="newfile" size="60" onChange="populatePath(document.form1.newfile,document.form1.path);prepopulateThumb();"></td></tr>
228c241
< 		<td><input type="text" value="<?php if( !$row['abspath'] ) echo $row['path']; ?>" name="path" id="path" size="60"><input type="hidden" value="<?php if( !$row['abspath'] ) echo $row['path']; ?>" id="path_org" name="path_org"><input type="hidden" id="path_last" name="path_last"> <input type="button" value="<?php echo "{$admtext['select']}..."; ?>" name="photoselect" onclick="javascript:var folder = document.form1.usecollfolder[1].checked ? document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value : 'media';FilePicker('path',folder);"></td>
---
> 		<td><input type="text" value="<?php if( !$row['abspath'] ) echo $row['path']; ?>" name="path" id="path" size="60" onchange="prepopulateThumb();"><input type="hidden" value="<?php if( !$row['abspath'] ) echo $row['path']; ?>" id="path_org" name="path_org"><input type="hidden" id="path_last" name="path_last"> <input type="button" value="<?php echo "{$admtext['select']}..."; ?>" name="photoselect" onclick="javascript:var folder = document.form1.usecollfolder[0].checked ? document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value : 'media';FilePicker('path',folder);"></td>
230c243
< 	<tr id="abspathrow" style="display:none"><td><?php echo $admtext['mediaurl']; ?>:</td><td><input type="text" value="<?php if( $row['abspath'] ) echo "$row[path]"; ?>" name="mediaurl" size="60"></td></tr>
---
> 	<tr id="abspathrow" style="display:none"><td><?php echo $admtext['mediaurl']; ?>:</td><td><input type="text" value="<?php if( $row['abspath'] ) echo $row['path']; ?>" name="mediaurl" size="60"></td></tr>
233c246
< 	<tr id="bodytextrow"><td valign="top"><?php echo $admtext['bodytext']; ?>:</td><td><textarea wrap cols="100" rows="11" name="bodytext" id="bodytext"><?php echo $row['bodytext']; ?></textarea></td></tr>
---
> 	<tr id="bodytextrow"><td valign="top"><?php echo $admtext['bodytext']; ?>:</td><td><textarea wrap cols="90" rows="11" name="bodytext" id="bodytext"><?php echo $row['bodytext']; ?></textarea></td></tr>
241,242c254,256
< 			<input type="radio" name="thumbcreate" value="specify" checked="checked" onClick="document.form1.newthumb.style.visibility='visible'; document.form1.thumbselect.style.visibility='visible';"> <?php echo $admtext['specifyimg']; ?> &nbsp;
< 			<input type="radio" name="thumbcreate" value="auto" onClick="document.form1.newthumb.style.visibility='hidden'; document.form1.thumbselect.style.visibility='hidden'; prepopulateThumb(); document.form1.abspath.checked=false;"> <?php echo $admtext['autoimg']; ?></td>
---
> 			<input type="radio" name="thumbcreate" value="auto" onClick="document.form1.newthumb.style.visibility='hidden'; document.form1.thumbselect.style.visibility='hidden'; prepopulateThumb(); document.form1.abspath.checked=false;"> <?php echo $admtext['autoimg']; ?> &nbsp;
> 			<input type="radio" name="thumbcreate" value="specify" checked="checked" onClick="document.form1.newthumb.style.visibility='visible'; document.form1.thumbselect.style.visibility='visible';"> <?php echo $admtext['specifyimg']; ?>
> 		</td>
255c269
< 		<td><input type="text" value="<?php echo $row['thumbpath']; ?>" name="thumbpath" id="thumbpath" size="60"><input type="hidden" value="<?php if( !$row['abspath'] ) echo "$row[thumbpath]"; ?>" id="thumbpath_org" name="thumbpath_org"><input type="hidden" id="thumbpath_last" name="thumbpath_last"> <input type="button" value="<?php echo "$admtext[select]..."; ?>" name="thumbselect" OnClick="javascript:var folder = document.form1.usecollfolder[1].checked ? document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value : 'media';FilePicker('thumbpath',folder);"></td>
---
> 		<td><input type="text" value="<?php echo $row['thumbpath']; ?>" name="thumbpath" id="thumbpath" size="60"><input type="hidden" value="<?php if( !$row['abspath'] ) echo $row['thumbpath']; ?>" id="thumbpath_org" name="thumbpath_org"><input type="hidden" id="thumbpath_last" name="thumbpath_last"> <input type="button" value="<?php echo "{$admtext['select']}..."; ?>" name="thumbselect" OnClick="javascript:var folder = document.form1.usecollfolder[0].checked ? document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value : 'media';FilePicker('thumbpath',folder);"></td>
260,261c274,275
< 			<input type="radio" name="usecollfolder" value="0"<?php if( !$row['usecollfolder'] ) echo " checked"; ?>> <?php echo $admtext['usemedia']; ?> &nbsp;
< 			<input type="radio" name="usecollfolder" value="1"<?php if( $row['usecollfolder'] ) echo " checked"; ?>> <?php echo $admtext['usecollect']; ?>
---
> 			<input type="radio" name="usecollfolder" value="1"<?php if( $row['usecollfolder'] ) echo " checked"; ?>> <?php echo $admtext['usecollect']; ?> &nbsp;
> 			<input type="radio" name="usecollfolder" value="0"<?php if( !$row['usecollfolder'] ) echo " checked"; ?>> <?php echo $admtext['usemedia']; ?>
265c279,281
< 	<tr id="vidrow2"><td><?php echo $admtext['height']; ?>:</td><td><input type="text" name="height" value="<?php echo $row['height']; ?>" size="40"><span class="normal"> (<?php echo $admtext['controller']; ?>)</span></td></tr>
---
> 	<tr id="vidrow2"><td><?php echo $admtext['height']; ?>:</td><td><input type="text" name="height" value="<?php echo $row['height']; ?>" size="40">
> 		<span class="normal"><?php if($form != "PDF") echo "({$admtext['controller']})"; ?></span>
> 	</td></tr>
277,278c293,294
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
284c300
< 	<tr><td valign="top"><?php echo $admtext['title']; ?>:</td><td><textarea wrap cols="70" rows="3" name="description"><?php echo $row['description']; ?></textarea></td></tr>
---
> 	<tr><td valign="top"><?php echo $admtext['title2']; ?>:</td><td><textarea wrap cols="70" rows="3" name="description"><?php echo $row['description']; ?></textarea></td></tr>
325,326c341
< 			<div id="cemchoice"<?php if($row['cemeteryID'] || $mediatypeID == "headstones") echo " style=\"display:none\""; ?>><a href="#" onclick="return toggleCemSelect();"><?php echo $admtext['select']; ?></a></div>
< 			<div id="cemselect"<?php if(!$row['cemeteryID'] && $mediatypeID != "headstones") echo " style=\"display:none\""; ?>>
---
> 			<div id="cemselect">
328c343
< 					<option selected></option>
---
> 					<option value="" selected="selected">&nbsp;</option>
330c345
< $query = "SELECT cemname, cemeteryID, city, county, state, country FROM $cemeteries_table ORDER BY country, state, county, city, cemname";
---
> $query = "SELECT cemname, cemeteryID, city, county, state, country FROM $cemeteries_table ORDER BY cemname, city, county, state, country";
333c348
< 	$cemetery = "{$cemrow['country']}, {$cemrow['state']}, {$cemrow['county']}, {$cemrow['city']}, {$cemrow['cemname']}";
---
> 	$cemetery = "{$cemrow['cemname']} - {$cemrow['city']}, {$cemrow['county']}, {$cemrow['state']}, {$cemrow['country']}";
352a368
> 				<option value="moved"<?php if( $row['status'] == 'moved' ) echo " selected"; ?>><?php echo $admtext['moved']; ?></option>
358,361c374,377
< 	<tr><td valign="top" colspan="2"><input type="checkbox" name="alwayson" value="1"<?php if( $row['alwayson'] ) echo " checked"; ?>> <?php echo $admtext['alwayson']; ?></td></tr>
< 
< <!-- history section -->
< 	<tr id="newwinrow"><td valign="top" colspan="2"><input type="checkbox" name="newwindow" value="1"<?php if( $row['newwindow'] ) echo " checked"; ?>> <?php echo $admtext['newwin']; ?></td></tr>
---
> 	<tr><td colspan="2" />&nbsp;</tr>
> 	<tr><td valign="top" colspan="2"><input type="checkbox" name="alwayson" value="1" id="img_alwayson"<?php if( $row['alwayson'] ) echo " checked"; ?> onchange="if($(this).is(':checked')){$('#img_private').prop('checked',false);}"> <?php echo $admtext['alwayson']; ?></td></tr>
> 	<tr><td valign="top" colspan="2"><input type="checkbox" name="newwindow" value="1"<?php if( $row['newwindow'] ) echo " checked"; ?>> <?php echo $admtext['newwin']; ?></td></tr>
> 	<tr><td valign="top" colspan="2"><input type="checkbox" name="private" value="1" id="img_private"<?php if( $row['private'] ) echo " checked"; ?> onchange="if($(this).is(':checked')){$('#img_alwayson').prop('checked',false);}"> <?php echo $admtext['private']; ?></td></tr>
371,372c387,388
< <tr class="databack">
< <td class="tngshadow" id="linkstd">
---
> <tr>
> <td class="tngshadow databack">
379,418d394
< <tr class="databack">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus3",$placeopen,"placeinfo",$admtext['placetaken'],""); ?>
< 
< 	<div id="placeinfo"<?php if(!$placeopen) echo " style=\"display:none\""; ?>>
< 	<table class="topbuffer normal" width="100%">
< 	<tr>
< 		<td width="150"><?php echo $admtext['placetaken']; ?>:</td>
< 		<td><input type="text" name="place" id="place" value="<?php echo $row['placetaken']; ?>" size="40" style="float:left"><a href="#" onclick="return openFindPlaceForm('place');" title="<?php echo $admtext['find']; ?>" class="smallicon admin-find-icon dn2px"></a></td>
< 	</tr>
< <?php
< 	if( $map['key'] ) {
< ?>
< 	<tr>
< 		<td colspan="2">
< 		<div style="padding:0px 10px 10px 0px">
< <?php
< // draw the map here
< 		include "googlemapdrawthemap.php";
< ?>
< 		</div>
< 		</td>
< 	</tr>
< <?php
< 	}
< ?>
< 	<tr><td><?php echo $admtext['latitude']; ?>:</td><td><input type="text" name="latitude" value="<?php echo $row['latitude']; ?>" size="20" id="latbox"></td></tr>
< 	<tr><td><?php echo $admtext['longitude']; ?>:</td><td><input type="text" name="longitude" value="<?php echo $row['longitude']; ?>" size="20" id="lonbox"></td></tr>
< <?php
< 	if( $map['key'] ) {
< ?>
< 	<tr><td><?php echo $admtext['zoom']; ?>:</td><td><input type="text" name="zoom" value="<?php echo $row['zoom']; ?>" size="20" id="zoombox"></td></tr>
< <?php
< 	}
< ?>
< 	</table>
< 	</div>
< </td>
< </tr>
< 
422,424c398,400
< <tr class="databack">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus4",0,"imagemapdiv",$admtext['imgmap'],$admtext['mapinstr2']); ?>
---
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus3",0,"imagemapdiv",$admtext['imgtags'],$admtext['mapinstr2']); ?>
428c404
< 	<p><?php echo $admtext['mapinstr3']; ?></p>
---
> 	<p style="max-width:700px"><?php echo $admtext['mapinstr3']; ?></p>
435,438c411,418
< 	<?php
< 				for( $j = 1; $j <= $treenum; $j++ )
< 					echo "	<option value=\"$trees[$j]\">$treename[$j]</option>\n";
< 	?>
---
> 			<?php
> 				$lookfortree = !empty($row['gedcom']) ? $row['gedcom'] : $usetree;
> 				for( $j = 1; $j <= $treenum; $j++ ) {
> 					echo "	<option value=\"$trees[$j]\"";
> 					if($trees[$j] == $lookfortree) echo " selected";
> 					echo ">$treename[$j]</option>\n";
> 				}
> 			?>
441,444c421,429
< 		</tr>
< 		<tr>
< 			<td colspan="2">
< 				<?php echo "<strong>{$admtext['forrects']}:</strong><br />{$admtext['rectinstr']}";?>
---
> 			<td>
> 				<select name="linktype" id="linktype">
> 					<option value="I"><?php echo $admtext['person']; ?></option>
> 					<option value="F"><?php echo $admtext['family']; ?></option>
> 					<option value="S"><?php echo $admtext['source']; ?></option>
> 					<option value="R"><?php echo $admtext['repository']; ?></option>
> 					<option value="C"><?php echo $admtext['citation']; ?></option>
> 					<option value="L"><?php echo $admtext['place']; ?></option>
> 				</select>
445a431,433
> 			<td>&nbsp; <?php echo $admtext['text_or']; ?>&nbsp; </td>
> 			<td><?php echo $admtext['title'] . ": "; ?><input type="text" name="urltitle" id="urltitle"/></td>
> 			<td><?php echo $admtext['url'] . ": "; ?><input type="text" name="urladdress" id="urladdress" class="longfield" /></td>
449,450c437,438
< 		$width = $size[0];
< 		$height = $size[1];
---
> 		$width = !empty($size[0]) ? $size[0] : 0;
> 		$height = !empty($size[1]) ? $size[1] : 0;
467c455,456
< 	<div id="imgholder" style="position:relative">
---
> 	<div>
> 	<div id="imgholder" style="position:relative;overflow:auto;max-width:1250px;max-height:800px">
468a458,460
> <?php
> echo getRectangles($mediaID);
> ?>
472c464
< 
---
> 	</div>
480,489c472,490
< <tr class="databack">
< <td class="tngshadow">
< 	<p class="normal">
< <?php
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newmedia\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newmedia\" value=\"close\" checked> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newmedia\" value=\"none\" checked> {$admtext['saveback']}\n";
---
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus4",$placeopen,"placeinfo",$admtext['placetaken'],""); ?>
> 
> 	<div id="placeinfo"<?php if(!$placeopen) echo " style=\"display:none\""; ?>>
> 	<table class="topbuffer normal" width="100%">
> 	<tr>
> 		<td width="150"><?php echo $admtext['placetaken']; ?>:</td>
> 		<td><input type="text" name="place" id="place" value="<?php echo $row['placetaken']; ?>" size="40" style="float:left"><a href="#" onclick="return openFindPlaceForm('place');" title="<?php echo $admtext['find']; ?>" class="smallicon admin-find-icon dn2px"></a></td>
> 	</tr>
> <?php
> 	if( $map['key'] ) {
> ?>
> 	<tr>
> 		<td colspan="2">
> 		<div style="padding:0px 10px 10px 0px">
> <?php
> // draw the map here
> 		include "googlemapdrawthemap.php";
491c492,510
<    </p>
---
> 		</div>
> 		</td>
> 	</tr>
> <?php
> 	}
> ?>
> 	<tr><td><?php echo $admtext['latitude']; ?>:</td><td><input type="text" name="latitude" value="<?php echo $row['latitude']; ?>" size="20" id="latbox"></td></tr>
> 	<tr><td><?php echo $admtext['longitude']; ?>:</td><td><input type="text" name="longitude" value="<?php echo $row['longitude']; ?>" size="20" id="lonbox"></td></tr>
> <?php
> 	if( $map['key'] ) {
> ?>
> 	<tr><td><?php echo $admtext['zoom']; ?>:</td><td><input type="text" name="zoom" value="<?php echo $row['zoom']; ?>" size="20" id="zoombox"></td></tr>
> <?php
> 	}
> ?>
> 	</table>
> 	</div>
> </td>
> </tr>
492a512,513
> <tr>
> <td class="tngshadow databack">
496a518,520
> <?php
> 	if(!empty($cw)) {
> ?>
498c522,537
< 	<input type="submit" name="fsubmit" class="btn" accesskey="s" value="<?php echo $admtext['save']; ?>" />
---
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.close();";
> 	} else {
> ?>
> 	<input type="hidden" value="" name="cw" />
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.location.href='admin_media.php';";
> 	}
> ?>
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="<?php echo $close_command; ?>">
502a542
> </div>
504d543
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
557,558c596,597
< 	if( frm.path.value.length == 0 && frm.mediaurl.value.length == 0 && frm.bodytext.value.length == 0 && frm.mediatypeID.options[frm.mediatypeID.selectedIndex].value != "headstones" ) {
< 		alert("<?php echo $admtext['enterphotopath']; ?>");
---
> 	if(!frm.notes.value.length && !frm.description.value) {
> 		alert("<?php echo $admtext['enterphotodesc']; ?>");
561,562c600,601
< 	else if( frm.thumbpath.value.length == 0 && frm.thumbcreate[1].checked == true ) {
< 		alert("<?php echo $admtext['enterthumbpath']; ?>");
---
> 	else if( frm.path.value.length == 0 && frm.mediaurl.value.length == 0 && frm.bodytext.value.length == 0 && frm.mediatypeID.options[frm.mediatypeID.selectedIndex].value != "headstones" ) {
> 		alert("<?php echo $admtext['enterphotopath']; ?>");
577c616,617
< 		var params = {path: frm.path.value, thumbpath: frm.thumbpath.value, usecollfolder: usecollfolder, mediatypeID: mediatypeID};
---
> 		var thumbpath = frm.newthumb.value ? frm.thumbpath.value : "";
> 		var params = {path: frm.path.value, thumbpath: thumbpath, usecollfolder: usecollfolder, mediatypeID: mediatypeID};
584c624,625
< 				frm.thumbpath.value = vars.thumbpath;
---
> 				if(vars.thumbpath)
> 					frm.thumbpath.value = vars.thumbpath;
596d636
< 	toggleSection('placeinfo','plus3',display);
598c638,639
< 		toggleSection('imagemapdiv','plus4',display);
---
> 		toggleSection('imagemapdiv','plus3',display);
> 	toggleSection('placeinfo','plus4',display);
609,610c650,651
< 	var preferDateFormat = '<?php echo $preferDateFormat; ?>';
< 	switchOnType(document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value);
---
> 	var preferDateFormat = '<?php (isset($preferDateFormat) ? $preferDateFormat : ""); ?>';
> 	switchOnType(document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value, "<?php echo $form; ?>");
621c662
<     new nicEditor({fullPanel : true}).panelInstance('bodytext');
---
>     new nicEditor({fullPanel : true, maxHeight: 300}).panelInstance('bodytext');
628c669
< 	if($added) {
---
> 	if(!empty($added)) {
636c677,810
< var x1,y1;
---
> var boxmoving = false;
> var boxdone = true;
> var poschanged = false;
> var x1,bx,y1,by;
> 
> function saveRectangle(tree, linktype, id, label) {
> 	var current = jQuery('#mlbox');
> 	var pos = current.position();
> 	var imgpos = jQuery('#myimg').position();
> 
> 	params = {
> 		action: 'saverect',
> 		mediaID: '<?php echo $mediaID; ?>',
> 		tree: tree,
> 		linktype: linktype,
> 		label: label,
> 		id: id,
> 		top: Math.round(pos.top - imgpos.top),
> 		left: Math.round(pos.left - imgpos.left),
> 		height: current.height(),
> 		width: current.width()
> 	};
> 	//console.log('rect top: ' + pos.top + ', rect left: ' + pos.left + ', img top: ' + jQuery('#myimg').position().top + ',img left: ' + jQuery('#myimg').position().left);
> 	$("#mlbox").attr({ id: 'mlboxtmp' });
> 	jQuery.ajax({
> 		url: 'ajx_updateorder.php',
> 		data: params,
> 		dataType: 'json',
> 		type: 'POST',
> 		success: function(vars){
> 			//put name in current box
> 			var overhang = 100 - $("#mlboxtmp").width();
> 			var stylestr = "";
> 			if(overhang > 0) {
> 				side = -1 * Math.round(overhang/2);
> 				stylestr = "left:" + side + "px;right:" + side + "px;"; 
> 			}
> 			else
> 				stylestr = "";
> 			$("#mlboxtmp").append('<div class="imagetag" style="top:' + (current.height() + 1) + 'px;' + stylestr + '">'+vars.name+'</div>')
> 			$("#mlboxtmp").attr({ id: 'box_' + vars.id })
> 			//if medialink is new, add that to the page here in a future update
> 		}
> 	});
> }
> 
> function updateRectangle(id) {
> 	var current = jQuery('#'+id);
> 	var pos = current.position();
> 	var imgpos = jQuery('#myimg').position();
> 
> 	params = {
> 		action: 'updaterect',
> 		id: id.substring(4),
> 		top: Math.round(pos.top - imgpos.top),
> 		left: Math.round(pos.left - imgpos.left),
> 		height: current.height(),
> 		width: current.width()
> 	};
> 	jQuery.ajax({
> 		url: 'ajx_updateorder.php',
> 		data: params,
> 		dataType: 'json',
> 		type: 'POST'
> 	});
> }
> 
> function deleteRectangle(id) {
> 	params = {
> 		action: 'delrect',
> 		id: id.substring(4)
> 	};
> 	jQuery.ajax({
> 		url: 'ajx_updateorder.php',
> 		data: params,
> 		dataType: 'json',
> 		type: 'POST'
> 	});
> }
> 
> function wireUpBox(rbox) {
> 	rbox.mousedown(function(e) {
> 		var target = $(e.target);
> 		if(target.hasClass('imagetag'))
> 			target = target.parent();
> 		if(!target.hasClass('delx') && !target.find('.delx').length) {
>             if(!target.hasClass('delx'))
>                 $('.bselected').removeClass('bselected').addClass('bunselected').css('z-index',1);
>             $('.delx').remove();
> 			var delbox = $('<div class="delx">&nbsp;X</div>');
> 			delbox.click(function(e) {
> 				//do ajax to delete rectangle
> 				var deltarget = $(e.target);
> 				//console.log(deltarget.parent().attr('id'));
> 				deleteRectangle(deltarget.parent().attr('id'));
> 				$(e.target).parent().remove();
> 				e.stopPropagation();
> 			});
> 			target.append(delbox);
> 		}
>         target.removeClass('bunselected').addClass('bselected').css('z-index',2);
> 		bx = e.pageX;
> 		by = e.pageY;
> 		boxmoving = true;
> 		poschanged = false;
> 		e.stopPropagation();
> 	});
> 	rbox.mousemove(function(e) {
> 		if(boxmoving) {
> 			//get coords of target
> 			origLeft = parseInt($(e.target).css('left'),10);
> 			origTop = parseInt($(e.target).css('top'),10);
> 			$(e.target).css({
> 				left:e.pageX - bx + origLeft, //offsets
> 				top:e.pageY - by + origTop //offsets
> 			});
> 			if(bx != e.pageX || by != e.pageY) {
> 				poschanged = true
> 				bx = e.pageX;
> 				by = e.pageY;
> 			}
> 		}
> 	});
> 	rbox.mouseup(function(e) {
> 		//if boxmoving, do ajax to save new position
> 		if(poschanged) {
> 			updateRectangle(rbox.attr('id'));
> 			poschanged = false;
> 		}
> 		boxmoving = false;
> 		e.stopPropagation();
> 	});
> 	return rbox;
> }
642,644c816
< 		if($("#mlbox").length)
< 			var a = 1;//$("#mlbox").attr({ id: '' });
< 		else {
---
> 		if(boxdone) {
646d817
< 			//$("#mlbox").attr({ id: '' });
648c819
< 			box = $('<div id="mlbox" class="mlbox bunselected">').hide();
---
> 			box = wireUpBox($('<div id="mlbox" class="mlbox bunselected">').hide());
659a831
> 			boxdone = false;
664d835
< 
666,669c837,865
< 		$("#mlbox").css({
< 			width:Math.abs(e.pageX - x1 - 1), //offsets
< 			height:Math.abs(e.pageY - y1 - 1) //offsets
< 		}).fadeIn();
---
> 		if(!boxdone) {
> 			$("#mlbox").css({
> 				width:Math.abs(e.pageX - x1 - 1), //offsets
> 				height:Math.abs(e.pageY - y1 - 1) //offsets
> 			}).fadeIn();
> 		}
> 	});
> 
> 	$('#myimg').mouseup(function(e) {
> 		if(x1 != e.pageX || y1 != e.pageY) {
> 		    var tree = jQuery('#maptree').val();
> 		    if(jQuery('#urltitle').val()) {
> 		    	saveRectangle('', 'U', jQuery('#urladdress').val(), jQuery('#urltitle').val());
> 		    	jQuery('#urltitle').val('');
> 		    }
> 		   	else
> 				findItem(jQuery('#linktype').val(),'imagemap','',tree, assignedbranch);
> 		}
> 		else
> 			box.remove();
> 		//$("#current").attr({ id: '' });
> 		boxdone = true;
> 	});
> 	$('body').mousedown(function(e) {
> 		if(!$(e.target).hasClass('delx')) {
> 			$('.bselected').removeClass('bselected').addClass('bunselected').css('z-index',1);
> 			$('.delx').remove();
> 			e.stopPropagation();
> 		}
672,675c868,869
< 	$('#myimg').mouseup(function() {
< 	    var tree = jQuery('#maptree').val();
< 		findItem('I','imagemap','',tree, assignedbranch);
< 		$("#current").attr({ id: '' });
---
> 	$('.mlbox').each(function() {
> 		wireUpBox($(this));
680,681c874,876
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editmore.php TNG1403/admin_editmore.php
7a8
> $admin_login = 1;
14,22c15,28
< $row['age'] = preg_replace("/\"/", "&#34;",$row['age']);
< $row['agency'] = preg_replace("/\"/", "&#34;",$row['agency']);
< $row['cause'] = preg_replace("/\"/", "&#34;",$row['cause']);
< $row['address1'] = preg_replace("/\"/", "&#34;",$row['address1']);
< $row['address2'] = preg_replace("/\"/", "&#34;",$row['address2']);
< $row['city'] = preg_replace("/\"/", "&#34;",$row['city']);
< $row['state'] = preg_replace("/\"/", "&#34;",$row['state']);
< $row['zip'] = preg_replace("/\"/", "&#34;",$row['zip']);
< $row['country'] = preg_replace("/\"/", "&#34;",$row['country']);
---
> $row['age'] = isset($row['age']) ? preg_replace("/\"/", "&#34;",$row['age']) : "";
> $row['agency'] = isset($row['agency']) ? preg_replace("/\"/", "&#34;",$row['agency']) : "";
> $row['cause'] = isset($row['cause']) ? preg_replace("/\"/", "&#34;",$row['cause']) : "";
> $row['address1'] = isset($row['address1']) ? preg_replace("/\"/", "&#34;",$row['address1']) : "";
> $row['address2'] = isset($row['address2']) ? preg_replace("/\"/", "&#34;",$row['address2']) : "";
> $row['city'] = isset($row['city']) ? preg_replace("/\"/", "&#34;",$row['city']) : "";
> $row['state'] = isset($row['state']) ? preg_replace("/\"/", "&#34;",$row['state']) : "";
> $row['zip'] = isset($row['zip']) ? preg_replace("/\"/", "&#34;",$row['zip']) : "";
> $row['country'] = isset($row['country']) ? preg_replace("/\"/", "&#34;",$row['country']) : "";
> $row['phone'] = isset($row['phone']) ? preg_replace("/\"/", "&#34;",$row['phone']) : "";
> $row['email'] = isset($row['email']) ? preg_replace("/\"/", "&#34;",$row['email']) : "";
> $row['www'] = isset($row['www']) ? preg_replace("/\"/", "&#34;",$row['www']) : "";
> $row['addressID'] = isset($row['addressID']) ? preg_replace("/\"/", "&#34;",$row['addressID']) : "";
> $row['eventID'] = isset($row['eventID']) ? preg_replace("/\"/", "&#34;",$row['eventID']) : "";
diff -r TNG/admin_editmostwanted.php TNG1403/admin_editmostwanted.php
28a29,37
> 	$row['personID'] = "";
> 	$row['mediaID'] = "";
> 	$row['gedcom'] = "";
> 	$row['mwtype'] = "";
> 	$row['thumbpath'] = "";
> 	$row['usecollfolder'] = "";
> 	$row['mtitle'] = "";
> 	$row['mdesc'] = "";
> 	$row['mediatypeID'] = "";
43c52
< 	<tr><td><?php echo $admtext['title']; ?>:</td><td><input type="text" name="title" size="60" maxlength="128" value="<?php echo $row['title']; ?>" style="width:500px"></td></tr>
---
> 	<tr><td><?php echo $admtext['title2']; ?>:</td><td><input type="text" name="title" size="60" maxlength="128" value="<?php echo $row['title']; ?>" style="width:500px"></td></tr>
129c138
< <input type="submit" name="submit" value="<?php echo $admtext['save']; ?>">
---
> <input type="submit" name="submit" class="btn" value="<?php echo $admtext['save']; ?>">
diff -r TNG/admin_editnote2.php TNG1403/admin_editnote2.php
29d28
< $flags['tabs'] = $tngconfig['tabs'];
44,45d42
< <body background="img/background.gif">
< 
46a44,45
> 	echo tng_adminlayout();
> 
54,56c53,56
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
73,74c73,75
< 	<input type="submit" name="submit" value="<?php echo $admtext['save']; ?>">
< 	<input type="button" name="cancel" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_notelist.php';">
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_notelist.php';">
80,82c81,84
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editnote.php TNG1403/admin_editnote.php
7a8
> $admin_login = 1;
15a17,22
> if( (!$allow_edit && (!$allow_add || !$added)) || ( $assignedtree && $assignedtree != $row['gedcom'] ) ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
32c39,42
< 	<td><textarea wrap cols="60" rows="25" name="note"><?php echo $row['note']; ?></textarea></td></tr>
---
> 	<td><textarea wrap cols="60" rows="25" name="note" id="currnote"><?php echo $row['note']; ?></textarea></td></tr>
> <?php
> 	if($allow_private_notes) {
> ?>
40a51,53
> <?php
> 	}
> ?>
diff -r TNG/admin_editperson.php TNG1403/admin_editperson.php
11a12,14
> if(!isset($cw)) $cw = '';
> if(!isset($added)) $added = 0;
> 
13a17,23
> function initNotesOrCites() {
> 	$notes = array();
> 	$notes['general'] = "";
> 	$notes['NAME'] = "";
> 	return $notes;
> }
> 
15c25
< $query = "SELECT *, DATE_FORMAT(changedate,\"%d %b %Y %H:%i:%s\") as changedate FROM $people_table WHERE personID = \"$personID\" and gedcom = \"$tree\"";
---
> $query = "SELECT *, DATE_FORMAT(changedate,\"%d %b %Y %H:%i:%s\") as changedate, IF(birthdate!='',YEAR(birthdatetr),YEAR(altbirthdatetr)) as birth, IF(deathdate!='',YEAR(deathdatetr),YEAR(burialdatetr)) as death FROM $people_table WHERE personID = \"$personID\" and gedcom = \"$tree\"";
54c64
< $tng_search_people = $_SESSION['tng_search_people'];
---
> $tng_search_people = isset($_SESSION['tng_search_people']) ? $_SESSION['tng_search_people'] : '';
71c81,82
< $query = "SELECT DISTINCT eventID as eventID FROM $notelinks_table WHERE persfamID=\"$personID\" AND gedcom =\"$tree\"";
---
> $privstr = $rights['private_notes'] ? "" : "AND secret != \"1\"";
> $query = "SELECT DISTINCT eventID as eventID FROM $notelinks_table WHERE persfamID=\"$personID\" AND gedcom =\"$tree\" $privstr";
73c84
< $gotnotes = array();
---
> $gotnotes = initNotesOrCites();
82c93
< $gotcites = array();
---
> $gotcites = initNotesOrCites();
103c114
< 	global $people_table, $families_table, $admtext, $tree, $righttree;
---
> 	global $people_table, $families_table, $admtext, $tree, $righttree, $cw;
106c117
< 	$query = "SELECT personID, lastname, lnprefix, firstname, birthdate, birthplace, altbirthdate, altbirthplace, deathdate, burialdate, prefix, suffix, nameorder, sex, $people_table.living, $people_table.private FROM $people_table, $families_table WHERE $people_table.personID = $families_table.$spouse AND $families_table.familyID = \"{$parent['familyID']}\" AND $people_table.gedcom = \"$tree\" AND $families_table.gedcom = \"$tree\"";
---
> 	$query = "SELECT personID, lastname, lnprefix, firstname, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, deathdate, burialdate, title, nickname, prefix, suffix, nameorder, sex, $people_table.branch, $people_table.gedcom, $people_table.living, $people_table.private FROM $people_table, $families_table WHERE $people_table.personID = $families_table.$spouse AND $families_table.familyID = \"{$parent['familyID']}\" AND $people_table.gedcom = \"$tree\" AND $families_table.gedcom = \"$tree\"";
109c120
< 	if( $gotparent ) {
---
> 	if( tng_num_rows($gotparent) ) {
117c128
< 		$prights = determineLivingPrivateRights($row, $righttree);
---
> 		$prights = determineLivingPrivateRights($prow, $righttree);
176a188
> $genders = ['M','F','U',''];
178d189
< $flags['tabs'] = $tngconfig['tabs'];
184a196
> <?php if(!empty($ref)) { echo "window.opener.location.reload(false);\n"; } ?>
198c210
< 	if(jQuery('div#parents div').length > 1)
---
> 	if(jQuery('#parents div.sortrow').length > 1)
218c230
< 	if(jQuery('div#spouses div').length > 1)
---
> 	if(jQuery('#spouses div.sortrow').length > 1)
276c288
< function addNewFamily(radioval,args) {
---
> function addNewFamily(submitval) {
278,279c290
< 		jQuery('#radio'+radioval).attr('checked',true);
< 		document.form1.submit();
---
> 		jQuery('#'+submitval).click();
290c301
< 		top.frames['main'].location = 'admin_newmedia.php?personID=<?php echo $personID; ?>&tree=<?php echo $tree; ?>&linktype=I';
---
> 		window.location = 'admin_newmedia.php?personID=<?php echo $personID; ?>&tree=<?php echo $tree; ?>&linktype=I';
297a309,324
> function onGenderChange(gender) {
> 	if(gender.value == 'M' || gender.value == 'F' || gender.value == 'U') {
> 		jQuery('#other_gender').hide();
> 	} 
> 	else {
> 		jQuery('#other_gender').show();
> 	}
> 
> 	if(gender.value == 'M' || gender.value == 'F') {
> 		jQuery('#addnewspouse').show();
> 	} 
> 	else {
> 		jQuery('#addnewspouse').hide();
> 	}
> }
> 
306c333
< <script language="JavaScript" src="js/admin.js"></script>
---
> <script src="js/admin.js"></script>
309,310d335
< <body background="img/background.gif" onload="startSort()">
< 
311a337,338
> 	echo tng_adminlayout(" onload=\"startSort()\"");
> 
316c343
< 	$peopletabs[4] = array($allow_edit,"admin_editperson.php?personID=$personID&tree=$tree",$admtext['edit'],"edit");
---
> 	$peopletabs[4] = array($allow_edit,"admin_editperson.php?personID=$personID&amp;tree=$tree",$admtext['edit'],"edit");
322a350
> 	if(!isset($message)) $message = "";
325a354
> <div class="admin-main">
327,329c356,358
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback normal">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="normal adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
339c368
< 					echo "<p class=\"normal\"><strong><a href=\"admin_editperson.php?personID=$personID&tree=$tree\" class=\"rounded10 whitebuttonlink tngshadow\">{$admtext['retry']}</a></strong></p>\n";
---
> 					echo "<p class=\"normal\"><strong><a href=\"admin_editperson.php?personID=$personID&amp;tree=$tree\" class=\"rounded10 whitebuttonlink tngshadow\">{$admtext['retry']}</a></strong></p>\n";
342,343c371,372
< 					$notesicon = $gotnotes['general'] ? "admin-note-on-icon" : "admin-note-off-icon";
< 					$citesicon = $gotcites['general'] ? "admin-cite-on-icon" : "admin-cite-off-icon";
---
> 					$notesicon = !empty($gotnotes['general']) ? "admin-note-on-icon" : "admin-note-off-icon";
> 					$citesicon = !empty($gotcites['general']) ? "admin-cite-on-icon" : "admin-cite-off-icon";
345c374,375
< 					echo "<a href=\"#\" onclick=\"document.form1.submit();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
---
> 					$return = !empty($cw) ? "saveclose" : "saveret";
> 					echo "<a href=\"#\" onclick=\"jQuery('#{$return}').click();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
362,363c392,393
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
386,387c416,417
< 				$notesicon = $gotnotes['NAME'] ? "admin-note-on-icon" : "admin-note-off-icon";
< 				$citesicon = $gotcites['NAME'] ? "admin-cite-on-icon" : "admin-cite-off-icon";
---
> 				$notesicon = !empty($gotnotes['NAME']) ? "admin-note-on-icon" : "admin-note-off-icon";
> 				$citesicon = !empty($gotcites['NAME']) ? "admin-cite-on-icon" : "admin-cite-off-icon";
396d425
< 			<td><?php echo $admtext['sex']; ?></td>
404,410d432
< 			<td>
< 				<select name="sex" onchange="if(this.value != 'U') {jQuery('#addnewspouse').show();} else {jQuery('#addnewspouse').hide();}">
< 					<option value="U" <?php if( $row['sex'] == "U" ) echo "selected"; ?>><?php echo $admtext['unknown']; ?></option>
< 					<option value="M" <?php if( $row['sex'] == "M" ) echo "selected"; ?>><?php echo $admtext['male']; ?></option>
< 					<option value="F" <?php if( $row['sex'] == "F" ) echo "selected"; ?>><?php echo $admtext['female']; ?></option>
< 				</select>
< 			</td>
423a446,471
> 		<tr>
> 			<td><?php echo $admtext['sex']; ?></td>
> 			<td colspan="4"></td>
> 		</tr>
> 		<tr>
> 			<td>
> 				<select name="sex" onchange="onGenderChange(this);">
> 					<option value="U" <?php if( $row['sex'] == "U" ) echo "selected"; ?>><?php echo $admtext['unknown']; ?></option>
> 					<option value="M" <?php if( $row['sex'] == "M" ) echo "selected"; ?>><?php echo $admtext['male']; ?></option>
> 					<option value="F" <?php if( $row['sex'] == "F" ) echo "selected"; ?>><?php echo $admtext['female']; ?></option>
> 					<option value="" <?php if( !in_array($row['sex'], $genders) ) echo "selected"; ?>><?php echo $text['other']; ?></option>
> 				</select>
> 			</td>
> 			<td colspan="4">
> 			<?php
> 				if( !in_array($row['sex'], $genders) ) {
> 					 echo "<input type=\"text\" name=\"other_gender\" id=\"other_gender\" value=\"{$row['sex']}\" />\n";
> 				}
> 				else {
> 			?>
> 				<input type="text" name="other_gender" id="other_gender" style="display: none" />
> 			<?php
> 				}
> 			?>
> 			</td>
> 		</tr>
430c478
< 				<input type="checkbox" name="private" value="1"<?php if( $row['private'] ) echo " checked=\"$checked\""; ?>> <?php echo $admtext['text_private']; ?>
---
> 				<input type="checkbox" name="private" value="1"<?php if( $row['private'] ) echo " checked=\"checked\""; ?>> <?php echo $admtext['text_private']; ?>
465c513
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('branchedit'); quitBranchEdit('branchedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('branchedit'); quitEdit('branchedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
467c515
< 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('branch','branchedit','branchlist');">
---
> 		<div id="branchedit" class="lightback pad5 rounded4" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('branch','branchedit','branchlist');">
481,482c529,530
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
487c535
< 	<table class="normal">
---
> 	<table class="normal" id="events_table">
492c540
< 		echo showEventRow('altbirthdate','altbirthplace','CHR',$personID);
---
> 		echo showEventRow('altbirthdate','altbirthplace',(!empty($row['altbirthtype']) ? $row['altbirthtype'] : "ALTBE"),$personID);
504,506d551
< 	</table>
< 	<br/>
< 	<table class="normal">
508,511c553,557
< 			<td valign="top">
< 				<strong class="subhead"><?php echo $admtext['otherevents']; ?>: &nbsp;</strong>
< <?php
< 	echo "<p><input type=\"button\" value=\"  " . $admtext['addnew'] . "  \" onclick=\"newEvent('I','$personID','$tree');\"></p>\n";
---
> 			<td colspan="2">
> 				<br/>
> 				<p><strong class="subhead">
> <?php 
> 	echo $admtext['otherevents'] . ": &nbsp;<input type=\"button\" value=\"  {$admtext['addnew']}  \" onclick=\"newEvent('I','$personID','$tree');\">\n";
512a559
> 				</strong></p>
514c561
< 			<td valign="top">
---
> 		</tr>
518,519d564
< 	   		</td>
< 		</tr>
530,531c575,576
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
533c578
< 	$newparents = $allow_add && ( !$assignedtree || $assignedtree == $tree ) ? "&nbsp; <input type=\"button\" value=\"  " . $admtext['addnew'] . "  \" onClick=\"return addNewFamily('child','child=$personID&tree=$tree&cw=$cw');\">\n" : "";
---
> 	$newparents = $allow_add && ( !$assignedtree || $assignedtree == $tree ) ? "&nbsp; <input type=\"button\" value=\"  " . $admtext['addnew'] . "  \" onClick=\"return addNewFamily('savepar');\">\n" : "";
548c593
< 		echo "<td class=\"lightback normal\">\n";
---
> 		echo "<td class=\"lightback normal rounded10\">\n";
570c615
< 			echo "<td><a href=\"#\" onclick=\"return showCitations('SLGC','$personID::" . $parent['familyID']. "');\" title=\"{$admtext['sources']}\" id=\"citesiconSLGC$personID::" . $parent['familyID'] . "\" class=\"smallicon $citesicon\"></a></td>\n";
---
> 			echo "<td><a href=\"#\" onclick=\"return showCitations('SLGC','$personID::" . $parent['familyID']. "');\" title=\"{$admtext['sources']}\" id=\"citesiconSLGC{$personID}--" . $parent['familyID'] . "\" class=\"smallicon $citesicon\"></a></td>\n";
598,599c643,644
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
602c647
< 	$newspouse = $allow_add && ( !$assignedtree || $assignedtree == $tree ) ? "&nbsp; <input type=\"button\"$display id=\"addnewspouse\" value=\"  " . $admtext['addnew'] . "  \" onClick=\"return addNewFamily('$self','$self=$personID&tree=$tree&cw=$cw');\">\n" : "";
---
> 	$newspouse = $allow_add && ( !$assignedtree || $assignedtree == $tree ) ? "&nbsp; <input type=\"button\"$display id=\"addnewspouse\" value=\"  " . $admtext['addnew'] . "  \" onClick=\"return addNewFamily('savesp');\">\n" : "";
626c671
< 			echo "<td class=\"lightback normal\">\n";
---
> 			echo "<td class=\"lightback normal rounded10\">\n";
632c677
< 				$query = "SELECT personID, lastname, lnprefix, firstname, birthdate, birthplace, altbirthdate, altbirthplace, deathdate, burialdate, prefix, suffix, nameorder, living, private FROM $people_table WHERE personID = \"{$marriagerow[$spouse]}\" AND gedcom = \"$tree\"";
---
> 				$query = "SELECT personID, lastname, lnprefix, firstname, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, deathdate, burialdate, title, nickname, prefix, suffix, nameorder, living, private, gedcom, branch FROM $people_table WHERE personID = \"{$marriagerow[$spouse]}\" AND gedcom = \"$tree\"";
670c715,717
< <?php			if( $marriagerow['marrdate'] || $marriagerow['marrplace'] ) { ?>
---
> <?php			
> 			if( !empty($marriagerow['marrdate']) || !empty($marriagerow['marrplace']) ) {
> ?>
678c725
< 			$query = "SELECT $people_table.personID as pID, firstname, lnprefix, lastname, birthdate, birthplace, altbirthdate, altbirthplace, deathdate, burialdate, haskids, living, private, branch, prefix, suffix, nameorder, frel, mrel FROM ($people_table, $children_table) WHERE $people_table.personID = $children_table.personID AND $children_table.familyID = \"{$marriagerow['familyID']}\" AND $people_table.gedcom = \"$tree\" AND $children_table.gedcom = \"$tree\" ORDER BY ordernum";
---
> 			$query = "SELECT $people_table.personID as pID, $people_table.personID, firstname, lnprefix, lastname, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, deathdate, burialdate, haskids, living, private, branch, $people_table.gedcom, title, nickname, prefix, suffix, nameorder, frel, mrel FROM ($people_table, $children_table) WHERE $people_table.personID = $children_table.personID AND $children_table.familyID = \"{$marriagerow['familyID']}\" AND $people_table.gedcom = \"$tree\" AND $children_table.gedcom = \"$tree\" ORDER BY ordernum";
751,767c798,799
< <tr class="databack">
< <td class="tngshadow">
< 	<p class="normal">
< <?php
< 	echo $admtext['onsave'] . ":<br/>";
< 	if( $allow_add && ( !$assignedtree || $assignedtree == $tree ) ) {
< 		echo "<input type=\"radio\" name=\"newfamily\" id=\"radiochild\" value=\"child\">{$admtext['gotonewfamily']} ($personID) {$admtext['aschild']}<br/>\n";
< 		if( $row['sex'] )
< 			echo "<input type=\"radio\" name=\"newfamily\" id=\"radio$self\" value=\"$self\">{$admtext['gotonewfamily']} ($personID) $selfdisplay<br/>\n";
< 	}
< 	echo "<input type=\"radio\" name=\"newfamily\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newfamily\" value=\"close\" checked> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newfamily\" value=\"none\" checked> {$admtext['saveback']}\n";
< ?>
< 	</p>
---
> <tr>
> <td class="tngshadow databack">
772c804,836
< 	<input type="submit" name="submit2" class="btn" accesskey="s" value="<?php echo $admtext['save']; ?>" />
---
> 
> <?php
> 	if(!empty($cw)) {
> ?>
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.close();";
> 	} else {
> ?>
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.location.href='admin_people.php';";
> 	}
> ?>
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="<?php echo $close_command; ?>">
> 	&nbsp;
> <?php
> 	if( $allow_add && ( !$assignedtree || $assignedtree == $tree ) ) {
> ?>
> 	<input type="submit" name="savepar" id="savepar" class="btn" value="<?php echo $admtext['savenewparent']; ?>" />
> <?php
> 		if( $row['sex'] ) {
> ?>
> 	<input type="submit" name="savesp" id="savesp" class="btn" value="<?php echo $admtext['savenewspouse']; ?>" />
> <?php
> 		}
> 	}
> ?>
> 
794,797c858,861
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editplace.php TNG1403/admin_editplace.php
4c4
< $mapkeystr = $map['key'] && $map['key'] != "1" ? "&key=" . $map['key'] : "";
---
> $mapkeystr = $map['key'] && $map['key'] != "1" ? "&amp;key=" . $map['key'] . "&amp;callback=initMap" : "";
14,15d13
< $tng_search_places = $_SESSION['tng_search_places'];
< 
23c21
< $query = "SELECT * FROM $places_table WHERE $wherestr";
---
> $query = "SELECT *, DATE_FORMAT(changedate,\"%d %b %Y %H:%i:%s\") as changedate FROM $places_table WHERE $wherestr";
51d48
< $flags['tabs'] = $tngconfig['tabs'];
57c54,63
< <script language="JavaScript" src="js/admin.js"></script>
---
> <script src="js/admin.js"></script>
> <script> <?php include("niceditmsgs.php"); ?> </script>
> <script type="text/javascript" src="js/nicedit.js"></script>
> <script type="text/javascript">
> //<![CDATA[
> bkLib.onDomLoaded(function() {
>     new nicEditor({fullPanel: true, maxHeight: 300}).panelInstance('mynotes');
> });
> //]]>
> </script>
58a65
> <?php if(!empty($ref)) { echo "window.opener.location.reload(false);\n"; } ?>
148,149d154
< <body<?php if($map['key']) { if(!$map['startoff']) echo " onload=\"divbox('mapcontainer');\""; } ?> background="img/background.gif">
< 
150a156,167
> 	$onload = $map['key'] && !$map['startoff'] ? " onload=\"divbox('mapcontainer');\"" : "";
> 	echo tng_adminlayout($onload);
> 
> 	if( !isset($tree) ) {
> 		if( !empty($assignedtree) )
> 			$tree = $assignedtree;
> 		elseif(!$tngconfig['places1tree'])
> 			$tree = $row['gedcom'];
> 		else
> 			$tree = "";
> 	}
> 
158c175
< 	$innermenu .= " &nbsp;|&nbsp; <a href=\"admin_newmedia.php?personID={$row['place']}&amp;tree=$tree&amp;linktype=L\" class=\"lightlink\">{$admtext['addmedia']}</a>";
---
> 	$innermenu .= " &nbsp;|&nbsp; <a href=\"admin_newmedia.php?place={$row['place']}&amp;tree=$tree&amp;linktype=L\" class=\"lightlink\">{$admtext['addmedia']}</a>";
163,165c180,181
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
167a184
> 	<p class="smallest"><?php echo $admtext['lastmodified'] . ": {$row['changedate']} ({$row['changedby']})"; ?></p>
197c214
< 	<tr><td><?php echo $admtext['place']; ?>:</td><td><input type="text" value="<?php echo $row['place']; ?>" name="place" id="place" size="50" class="longfield"></td></tr>
---
> 	<tr><td><?php echo $admtext['place']; ?>:</td><td><input type="text" value="<?php echo $row['place']; ?>" name="place" id="place" size="70" class="longfield"></td></tr>
221,223d237
< <?php
< 	if( $map['key'] ) {
< ?>
234a249
> 				<option value="-1"<?php if($row['placelevel'] == -1) echo " selected"; ?>><?php echo $admtext['donotgeocode']; ?></option>
284,287c299
< <?php
< 	}
< ?>
< 	<tr><td valign="top"><?php echo $admtext['notes']; ?>:</td><td><textarea wrap cols="50" rows="5" name="notes"><?php echo $row['notes']; ?></textarea></td></tr>
---
> 	<tr><td valign="top"><?php echo $admtext['notes']; ?>:</td><td><textarea wrap cols="90" rows="5" name="notes" id="mynotes"><?php echo $row['notes']; ?></textarea></td></tr>
296,307d307
< 	<tr>
< 		<td colspan="2">
< <?php
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newscreen\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"close\" checked> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"none\" checked> {$admtext['saveback']}\n";
< ?>
< 		</td>
< 	</tr>
311,318c311,333
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>"></form>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php
> 	if(!empty($cw)) {
> ?>
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.close();";
> 	} else {
> ?>
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.location.href='admin_places.php';";
> 	}
> ?>
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="<?php echo $close_command; ?>">
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editrepo.php TNG1403/admin_editrepo.php
45d44
< $flags['tabs'] = $tngconfig['tabs'];
51a51
> <?php if(!empty($ref)) { echo "window.opener.location.reload(false);\n"; } ?>
59,60d58
< <body background="img/background.gif">
< 
61a60,61
> 	echo tng_adminlayout();
> 
65c65
< 	$repotabs[3] = array($allow_edit,"admin_editrepo.php?repoID=$repoID&tree=$tree",$admtext['edit'],"edit");
---
> 	$repotabs[3] = array($allow_edit,"admin_editrepo.php?repoID=$repoID&amp;tree=$tree",$admtext['edit'],"edit");
73a74
> <div class="admin-main">
75,77c76,78
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
85,86c86,88
< 				$notesicon = "img/" . ($gotnotes['general'] ? "tng_anote_on.gif" : "tng_anote.gif");
< 				echo "<a href=\"#\" onclick=\"document.form1.submit();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
---
> 				$notesicon = !empty($gotnotes['general']) ? "admin-note-on-icon" : "admin-note-off-icon";
> 				$return = !empty($cw) ? "saveclose" : "saveret";
> 				echo "<a href=\"#\" onclick=\"jQuery('#{$return}').click();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
97,99c99,101
< <tr class="databack">
< <td class="tngshadow">
< 	<table class="normal">
---
> <tr>
> <td class="tngshadow databack">
> 	<table class="normal" id="events_table">
103c105
< 			&nbsp;(<a href="#" onclick="return openChangeTree('source','<?php echo $tree; ?>','<?php echo $sourceID; ?>');"><img src="img/ArrowDown.gif" border="0" style="margin-left:-4px;margin-right:-2px"><?php echo $admtext['edit']; ?></a> )
---
> 			&nbsp;(<a href="#" onclick="return openChangeTree('source','<?php echo $tree; ?>','<?php if( isset($sourceID) ) echo $sourceID; ?>');"><img src="img/ArrowDown.gif" border="0" style="margin-left:-4px;margin-right:-2px"><?php echo $admtext['edit']; ?></a> )
116,118d117
< 	</table>
< 	<br/>
< 	<table class="normal">
120,123c119,123
< 			<td valign="top">
< 				<strong class="subhead"><?php echo $admtext['otherevents']; ?>: &nbsp;</strong>
< <?php
< 	echo "<p><input type=\"button\" value=\"  " . $admtext['addnew'] . "  \" onclick=\"newEvent('R','$repoID','$tree');\"></p>\n";
---
> 			<td colspan="2">
> 				<br/>
> 				<p><strong class="subhead">
> <?php 
> 	echo $admtext['otherevents'] . ": &nbsp;<input type=\"button\" value=\"  {$admtext['addnew']}  \" onclick=\"newEvent('R','$repoID','$tree');\">\n";
124a125
> 				</strong></p>
126c127
< 			<td valign="top">
---
> 		</tr>
130,131d130
< 	   		</td>
< 		</tr>
135,136c134,135
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
139,144c138,150
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newscreen\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"close\" checked> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"none\" checked> {$admtext['saveback']}\n";
---
> 	if(!empty($cw)) {
> ?>
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.close();";
> 	} else {
> ?>
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.location.href='admin_repositories.php';";
> 	}
145a152,154
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="<?php echo $close_command; ?>">
150,151c159
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
< 	<input type="submit" name="submit2" class="btn" accesskey="s" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="hidden" value="<?php if( isset($cw) ) echo $cw; /*stands for "close window" */ ?>" name="cw">
156a165
> </div>
158,160c167,169
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editreport.php TNG1403/admin_editreport.php
25,145c25
< $dontdo = array("ADDR","BIRT","CHR","DEAT","BURI","NAME","NICK","TITL","NSFX","NPFX");
< 
< $dfields = array();
< $dfields['personID'] = "personid";
< $dfields['fullname'] = "fullname";
< $dfields['lastfirst'] = "lastfirst";
< $dfields['firstname'] = "firstname";
< $dfields['lastname'] = "lastname";
< $dfields['nickname'] = "nickname";
< $dfields['birthdate'] = "birthdate";
< $dfields['birthplace'] = "birthplace";
< if(!$tngconfig['hidechr']) {
< 	$dfields['altbirthdate'] = "chrdate";
< 	$dfields['altbirthplace'] = "chrplace";
< }
< $dfields['marrdate'] = "marriagedate";
< $dfields['marrplace'] = "marriageplace";
< $dfields['divdate'] = "divdate";
< $dfields['divplace'] = "divplace";
< $dfields['spouseid'] = "spouseid";
< $dfields['spousename'] = "spousename";
< $dfields['deathdate'] = "deathdate";
< $dfields['deathplace'] = "deathplace";
< $dfields['burialdate'] = "burialdate";
< $dfields['burialplace'] = "burialplace";
< $dfields['changedate'] = "lastmodified";
< $dfields['sex'] = "sex";
< $dfields['title'] = "title";
< $dfields['suffix'] = "suffix";
< $dfields['prefix'] = "prefix";
< $dfields['gedcom'] = "tree";
< if( $allow_lds ) {
< 	$dfields['baptdate'] = "ldsbapldate";
< 	$dfields['baptplace'] = "ldsbaplplace";
< 	$dfields['confdate'] = "ldsconfdate";
< 	$dfields['confplace'] = "ldsconfplace";
< 	$dfields['initdate'] = "ldsinitdate";
< 	$dfields['initplace'] = "ldsinitplace";
< 	$dfields['endldate'] = "ldsendldate";
< 	$dfields['endlplace'] = "ldsendlplace";
< 	$dfields['ssealdate'] = "ldssealsdate";
< 	$dfields['ssealplace'] = "ldssealsplace";
< 	$dfields['psealdate'] = "ldssealpdate";
< 	$dfields['psealplace'] = "ldssealpplace";
< }
< 
< $cfields = array();
< $cfields['personID'] = "personid";
< $cfields['firstname'] = "firstname";
< $cfields['lastname'] = "lastname";
< $cfields['lnprefix'] = "lnprefix";
< $cfields['nickname'] = "nickname";
< $cfields['monthonly'] = "monthonlyfrom";
< $cfields['yearonly'] = "yearonlyfrom";
< $cfields['dayonly'] = "dayonlyfrom";
< $cfields['desc'] = "desc";
< $cfields['birthdate'] = "birthdate";
< $cfields['birthdatetr'] = "birthdatetr";
< $cfields['birthplace'] = "birthplace";
< if(!$tngconfig['hidechr']) {
< 	$cfields['altbirthdate'] = "chrdate";
< 	$cfields['altbirthdatetr'] = "chrdatetr";
< 	$cfields['altbirthplace'] = "chrplace";
< }
< $cfields['marrdate'] = "marriagedate";
< $cfields['marrdatetr'] = "marriagedatetr";
< $cfields['marrplace'] = "marriageplace";
< $cfields['divdate'] = "divdate";
< $cfields['divdatetr'] = "divdatetr";
< $cfields['divplace'] = "divplace";
< $cfields['deathdate'] = "deathdate";
< $cfields['deathdatetr'] = "deathdatetr";
< $cfields['deathplace'] = "deathplace";
< $cfields['burialdate'] = "burialdate";
< $cfields['burialdatetr'] = "burialdatetr";
< $cfields['burialplace'] = "burialplace";
< $cfields['changedate'] = "lastmodified";
< $cfields['sex'] = "sex";
< $cfields['title'] = "title";
< $cfields['prefix'] = "prefix";
< $cfields['suffix'] = "suffix";
< $cfields['gedcom'] = "tree";
< if( $allow_lds ) {
< 	$cfields['baptdate'] = "ldsbapldate";
< 	$cfields['baptdatetr'] = "ldsbapldatetr";
< 	$cfields['baptplace'] = "ldsbaplplace";
< 	$cfields['confdate'] = "ldsconfdate";
< 	$cfields['confdatetr'] = "ldsconfdatetr";
< 	$cfields['confplace'] = "ldsconfplace";
< 	$cfields['initdate'] = "ldsinitdate";
< 	$cfields['inittdatetr'] = "ldsinitdatetr";
< 	$cfields['initplace'] = "ldsinitplace";
< 	$cfields['endldate'] = "ldsendldate";
< 	$cfields['endldatetr'] = "ldsendldatetr";
< 	$cfields['endlplace'] = "ldsendlplace";
< 	$cfields['ssealdate'] = "ldssealsdate";
< 	$cfields['ssealdatetr'] = "ldssealsdatetr";
< 	$cfields['ssealplace'] = "ldssealsplace";
< 	$cfields['psealdate'] = "ldssealpdate";
< 	$cfields['psealdatetr'] = "ldssealpdatetr";
< 	$cfields['psealplace'] = "ldssealpplace";
< }
< 
< $ofields = array();
< $ofields['contains'] = "contains";
< $ofields['starts with'] = "startswith";
< $ofields['ends with'] = "endswith";
< $ofields['OR'] = "text_or";
< $ofields['AND'] = "text_and";
< $ofields['currmonth'] = "currentmonth";
< $ofields['currmonthnum'] = "currentmonthnum";
< $ofields['curryear'] = "currentyear";
< $ofields['currday'] = "currentday";
< $ofields['today'] = "today";
< $ofields['to_days'] = "convtodays";
< 
< $subtypes = array();
< $subtypes['dt'] = $admtext['rptdate'];
< $subtypes['tr'] = $admtext['rptdatetr'];
< $subtypes['pl'] = $admtext['place'];
< $subtypes['fa'] = $admtext['fact'];
---
> include("micro_reports.php");
159d38
< $flags['tabs'] = $tngconfig['tabs'];
171c50
< 	else if( document.form1.displayfields.options.length == 0 && document.form1.sqlselect.value.length == 0 ) {
---
> 	else if( jQuery('#displayfields li').length == 0 && document.form1.sqlselect.value.length == 0 ) {
181,182d59
< <body background="img/background.gif">
< 
183a61,62
> 	echo tng_adminlayout();
> 
192,194c71,72
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback normal">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
197,212c75,89
< 	<tr>
< 		<td><span class="normal"><?php echo $admtext['reportname']; ?>:</span></td>
< 		<td>
< 			<input type="text" name="reportname" size="50" maxlength="80" value="<?php echo $row['reportname']; ?>">
< 			<input type="hidden" name="reportnameorg" value="<?php echo $row['reportname']; ?>">
< 		</td>
< 	</tr>
< 	<tr><td valign="top"><span class="normal"><?php echo $admtext['description']; ?>:</span></td><td><textarea cols="50" rows="3" name="reportdesc"><?php echo $row['reportdesc']; ?></textarea></td></tr>
< 	<tr><td valign="top"><span class="normal"><?php echo $admtext['rankpriority']; ?>:</span></td><td><input type="text" name="rank" size="3" maxlength="3" value="<?php echo $row['rank']; ?>"></td></tr>
< 	<tr><td valign="top"><span class="normal"><?php echo $admtext['active']; ?>:</span></td><td><span class="normal"><input type="radio" name="active" value="1" <?php if( $row['active'] ) echo "checked"; ?>> <?php echo $admtext['yes']; ?> &nbsp; <input type="radio" name="active" value="0" <?php if( !$row['active'] ) echo "checked"; ?>> <?php echo $admtext['no']; ?></span></td></tr>
< 	<tr><td valign="top" colspan="2"><span class="normal"><br/>
< 	<img src="img/tng_right.gif" width="17" height="15" border="0" align="middle"> = <?php echo $admtext['add']; ?> &nbsp;&nbsp;
< 	<img src="img/tng_left.gif" width="17" height="15" border="0" align="middle"> = <?php echo $admtext['remove']; ?> &nbsp;&nbsp;
< 	<img src="img/tng_up.gif" width="17" height="15" border="0" align="middle"> = <?php echo $admtext['moveup']; ?> &nbsp;&nbsp;
< 	<img src="img/tng_down.gif" width="17" height="15" border="0" align="middle"> = <?php echo $admtext['movedown']; ?> &nbsp;&nbsp;</span><br/><br/>
< 	<p class="subhead"><b><?php echo $admtext['choosedisplay']; ?>:</b></p></td></tr>
---
> 		<tr>
> 			<td><span class="normal"><?php echo $admtext['reportname']; ?>:</span></td>
> 			<td>
> 				<input type="text" name="reportname" size="50" maxlength="80" value="<?php echo $row['reportname']; ?>">
> 				<input type="hidden" name="reportnameorg" value="<?php echo $row['reportname']; ?>">
> 			</td>
> 		</tr>
> 		<tr><td valign="top"><span class="normal"><?php echo $admtext['description']; ?>:</span></td><td><textarea cols="50" rows="3" name="reportdesc"><?php echo $row['reportdesc']; ?></textarea></td></tr>
> 		<tr><td valign="top"><span class="normal"><?php echo $admtext['rankpriority']; ?>:</span></td><td><input type="text" name="ranking" size="3" maxlength="3" value="<?php echo $row['ranking']; ?>"></td></tr>
> 		<tr><td valign="top"><span class="normal"><?php echo $admtext['active']; ?>:</span></td><td><span class="normal"><input type="radio" name="active" value="1" <?php if( $row['active'] ) echo "checked"; ?>> <?php echo $admtext['yes']; ?> &nbsp; <input type="radio" name="active" value="0" <?php if( !$row['active'] ) echo "checked"; ?>> <?php echo $admtext['no']; ?></span></td></tr>
> 	</table>
> 	<table>
> 	<tr><td valign="top" colspan="2">
> 	<p class="normal"><em><?php echo $admtext['instr']; ?></em></p>
> 	<p class="subhead"><br/><b><?php echo $admtext['choosedisplay']; ?>:</b></p></td></tr>
217c94,95
< 						<select name="availfields" size="15" class="reportcol" onDblClick="AddtoDisplay(document.form1.availfields,document.form1.displayfields);">
---
> 						<div class="reportbox">
> 							<ul id="displayavail" class="reportcol" style="height: 300px">
219,227c97,105
< 						foreach( $dfields as $key=>$value )
< 							echo "<option value=\"$key\">$admtext[$value]</option>\n";
< 						//now do custom event types
< 						foreach( $cetypes as $cerow ) {
< 							$displaymsg = getEventDisplay( $cerow['display'] );
< 							echo "<option value=\"ce_dt_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdate']}</option>\n";
< 							echo "<option value=\"ce_pl_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['place']}</option>\n";
< 							echo "<option value=\"ce_fa_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['fact']}</option>\n";
< 						}
---
> 							foreach( $dfields as $key=>$value )
> 								echo "<li ondblclick=\"add_to_list(this,'displayfields');\">{$admtext[$value]}<span class=\"hidden\">$key</span></li>\n";
> 							//now do custom event types
> 							foreach( $cetypes as $cerow ) {
> 								$displaymsg = getEventDisplay( $cerow['display'] );
> 								echo "<li ondblclick=\"add_to_list(this,'displayfields');\">$displaymsg: {$admtext['rptdate']}<span class=\"hidden\">ce_dt_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'displayfields');\">$displaymsg: {$admtext['place']}<span class=\"hidden\">ce_pl_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'displayfields');\">$displaymsg: {$admtext['fact']}<span class=\"hidden\">ce_fa_{$cerow['eventtypeID']}</span></li>\n";
> 							}
229,233c107,108
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:AddtoDisplay(document.form1.availfields,document.form1.displayfields);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.displayfields);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							</ul>
> 						</div>
236c111,112
< 						<select name="displayfields" size="15" class="reportcol" onDblClick="RemovefromDisplay(document.form1.displayfields);">
---
> 						<div class="reportbox">
> 							<ul id="displayfields" class="reportcol" style="height: 300px">
238,254c114,134
< 							$displayfields = explode( $lineending, $row['display'] );
< 							for( $i = 0; $i < count( $displayfields ) - 1; $i++ ) {
< 								$dfield = $displayfields[$i];
< 								if( $dfield == "lastname, firstname" )
< 									$dfield = "lastfirst";
< 								elseif( $dfield == "firstname, lastname" )
< 									$dfield = "fullname";
< 								if( isset($dfields[$dfield]) ) {
< 									$dtext = $dfields[$dfield];
< 									$displaymsg = $admtext[$dtext];
< 								}
< 								elseif( substr( $dfield, 0, 3 ) == "ce_") {
< 									$eventtypeID = substr( $dfield, 6 );
< 									$subtype = substr( $dfield, 3, 2 );
< 									$stdisplay = $subtypes[$subtype];
< 									$cerow = $cetypes[$eventtypeID];
< 									$displaymsg = getEventDisplay( $cerow['display'] ) . ": " . $stdisplay;
---
> 								$displayfields = explode( $lineending, $row['display'] );
> 								$num_displayfields = count($displayfields) - 1;
> 								for( $i = 0; $i < $num_displayfields; $i++ ) {
> 									$dfield = $displayfields[$i];
> 									if( $dfield == "lastname, firstname" )
> 										$dfield = "lastfirst";
> 									elseif( $dfield == "firstname, lastname" )
> 										$dfield = "fullname";
> 									if( isset($dfields[$dfield]) ) {
> 										$dtext = $dfields[$dfield];
> 										$displaymsg = $admtext[$dtext];
> 									}
> 									elseif( substr( $dfield, 0, 3 ) == "ce_") {
> 										$eventtypeID = substr( $dfield, 6 );
> 										$subtype = substr( $dfield, 3, 2 );
> 										$stdisplay = $subtypes[$subtype];
> 										$cerow = $cetypes[$eventtypeID];
> 										$displaymsg = getEventDisplay( $cerow['display'] ) . ": " . $stdisplay;
> 									}
> 									
> 									echo "<li ondblclick=\"$(this).remove();\">$displaymsg<span class=\"hidden\">$dfield</span></li>\n";
256,258d135
< 								
< 								echo "<option value=\"$dfield\">$displaymsg</option>\n";
< 							}
260,265c137,139
< 						</select><br/><br/>
< 					</td>
< 					<td>
< 						&nbsp;&nbsp;&nbsp;<a href="javascript:Move(document.form1.displayfields,1);"><img src="img/tng_up.gif" alt="<?php echo $admtext['moveup']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;&nbsp;&nbsp;<a href="javascript:RemovefromDisplay(document.form1.displayfields);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;&nbsp;&nbsp;<a href="javascript:Move(document.form1.displayfields,0);"><img src="img/tng_down.gif" alt="<?php echo $admtext['movedown']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
---
> 							</ul>
> 						</div>
> 						<br/>
276c150,151
< 						<select name="availcriteria" size="12" class="reportcol" onDblClick="AddtoDisplay(document.form1.availcriteria,document.form1.finalcriteria);">
---
> 						<div class="reportbox">
> 							<ul id="availcriteria" class="reportcol" style="height: 250px">
278,294c153,169
< 						foreach( $cfields as $key=>$value ) {
< 							if( $key != "desc" )
< 								echo "<option value=\"$key\">" . $admtext[$value] . "</option>\n";
< 						}
< 						echo "<option value=\"living\">{$admtext['livingtrue']}</option>\n";
< 						echo "<option value=\"dead\">{$admtext['livingfalse']}</option>\n";
< 						echo "<option value=\"private\">{$admtext['privatetrue']}</option>\n";
< 						echo "<option value=\"open\">{$admtext['privatefalse']}</option>\n";
< 
< 						//now do custom event types, prefix with "ce_"
< 						foreach( $cetypes as $cerow ) {
< 							$displaymsg = getEventDisplay( $cerow['display'] );
< 							echo "<option value=\"ce_dt_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdate']}</option>\n";
< 							echo "<option value=\"ce_tr_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdatetr']}</option>\n";
< 							echo "<option value=\"ce_pl_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['place']}</option>\n";
< 							echo "<option value=\"ce_fa_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['fact']}</option>\n";
< 						}
---
> 							foreach( $cfields as $key=>$value ) {
> 								if( $key != "desc" )
> 									echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">" . $admtext[$value] . "<span class=\"hidden\">$key</span></li>\n";
> 							}
> 							echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext['livingtrue']}<span class=\"hidden\">living</span></li>\n";
> 							echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext['livingfalse']}<span class=\"hidden\">dead</span></li>\n";
> 							echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext['privatetrue']}<span class=\"hidden\">private</span></li>\n";
> 							echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext['privatefalse']}<span class=\"hidden\">open</span></li>\n";
> 
> 							//now do custom event types, prefix with "ce_"
> 							foreach( $cetypes as $cerow ) {
> 								$displaymsg = getEventDisplay( $cerow['display'] );
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">$displaymsg: {$admtext['rptdate']}<span class=\"hidden\">ce_dt_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">$displaymsg: {$admtext['rptdatetr']}<span class=\"hidden\">ce_tr_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">$displaymsg: {$admtext['place']}<span class=\"hidden\">ce_pl_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">$displaymsg: {$admtext['fact']}<span class=\"hidden\">ce_fa_{$cerow['eventtypeID']}</span></li>\n";
> 							}
296,300c171,172
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:AddtoDisplay(document.form1.availcriteria,document.form1.finalcriteria);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.finalcriteria);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							</ul>
> 						</div>
303c175,176
< 						<select name="finalcriteria" size="28" class="reportcol" onDblClick="RemovefromDisplay(document.form1.finalcriteria);">
---
> 						<div class="reportbox">
> 							<ul id="finalcriteria" class="reportcol" style="height: 610px">
305,329c178,198
< 							$criteriafields = explode( $lineending, $row['criteria'] );
< 							$mnemonics = array("eq","neq","gt","gte","lt","lte");
< 							$symbols = array("=","!=",">",">=","<","<=");
< 							for( $i = 0; $i < count( $criteriafields ) - 1; $i++ ) {
< 								$cfield = preg_replace( "'\"'", "", $criteriafields[$i] );
< 								if( isset($cfields[$cfield]) ) {
< 									$ctext = $cfields[$cfield];
< 									$displaymsg = $admtext[$ctext];
< 								}
< 								elseif( isset($ofields[$cfield]) ) {
< 									$ctext = $ofields[$cfield];
< 									$displaymsg = $admtext[$ctext];
< 								}
< 								elseif( substr( $cfield, 0, 3 ) == "ce_") {
< 									$eventtypeID = substr( $cfield, 6 );
< 									$subtype = substr( $cfield, 3, 2 );
< 									$stdisplay = $subtypes[$subtype];
< 									$cerow = $cetypes[$eventtypeID];
< 									$displaymsg = getEventDisplay( $cerow['display'] ) . ": " . $stdisplay;
< 								}
< 								else {
< 									$position = array_search($cfield,$symbols);
< 									if($position !== false) {
< 										$cfield = $mnemonics[$position];
< 										$displaymsg = $criteriafields[$i];
---
> 								$criteriafields = explode( $lineending, $row['criteria'] );
> 								$mnemonics = array("eq","neq","gt","gte","lt","lte");
> 								$symbols = array("=","!=",">",">=","<","<=");
> 								$num_criteriafields = count($criteriafields) - 1;
> 								for( $i = 0; $i < $num_criteriafields; $i++ ) {
> 									//$cfield = preg_replace( "'\"'", "", $criteriafields[$i] );
> 									$cfield = $criteriafields[$i];
> 									if( isset($cfields[$cfield]) ) {
> 										$ctext = $cfields[$cfield];
> 										$displaymsg = $admtext[$ctext];
> 									}
> 									elseif( isset($ofields[$cfield]) ) {
> 										$ctext = $ofields[$cfield];
> 										$displaymsg = $admtext[$ctext];
> 									}
> 									elseif( substr( $cfield, 0, 3 ) == "ce_") {
> 										$eventtypeID = substr( $cfield, 6 );
> 										$subtype = substr( $cfield, 3, 2 );
> 										$stdisplay = $subtypes[$subtype];
> 										$cerow = $cetypes[$eventtypeID];
> 										$displaymsg = getEventDisplay( $cerow['display'] ) . ": " . $stdisplay;
332,335c201,203
< 										$position = array_search($cfield,$mnemonics);
< 										if($position !== false)
< 											$displaymsg = $symbols[$position];
< 										else
---
> 										$position = array_search($cfield,$symbols);
> 										if($position !== false) {
> 											$cfield = $mnemonics[$position];
336a205,212
> 										}
> 										else {
> 											$position = array_search($cfield,$mnemonics);
> 											if($position !== false)
> 												$displaymsg = $symbols[$position];
> 											else
> 												$displaymsg = $criteriafields[$i];
> 										}
337a214
> 									echo "<li ondblclick=\"$(this).remove();\">$displaymsg<span class=\"hidden\">$cfield</span></li>\n";
339,340d215
< 								echo "<option value=\"$cfield\">$displaymsg</option>\n";
< 							}
342,347c217,218
< 						</select>
< 					</td>
< 					<td width="40" align="center"rowspan="4">
< 						&nbsp;<a href="javascript:Move(document.form1.finalcriteria,1);"><img src="img/tng_up.gif" alt="<?php echo $admtext['moveup']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.finalcriteria);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:Move(document.form1.finalcriteria,0);"><img src="img/tng_down.gif" alt="<?php echo $admtext['movedown']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/><br/><br/><br/><br/><br/><br/>
---
> 							</ul>
> 						</div>
352,359c223,231
< 						<span class="normal"><?php echo $admtext['operators']; ?>:<br/></span>
< 						<select name="availoperators" size="8" class="reportcol" onDblClick="AddtoDisplay(document.form1.availoperators,document.form1.finalcriteria);">
< 							<option value="eq">=</option>
< 							<option value="neq">!=</option>
< 							<option value="gt">&gt;</option>
< 							<option value="gte">&gt;=</option>
< 							<option value="lt">&lt;</option>
< 							<option value="lte">&lt;=</option>
---
> 						<span class="normal indent-tiny"><?php echo $admtext['operators']; ?>:<br/></span>
> 						<div class="reportbox">
> 							<ul id="availoperators" class="reportcol" style="height: 200px">
> 								<li ondblclick="add_to_list(this,'finalcriteria');">=<span class="hidden">eq</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">!=<span class="hidden">neq</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">&gt;<span class="hidden">gt</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">&gt;=<span class="hidden">gte</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">&lt;<span class="hidden">lt</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">&lt;=<span class="hidden">lte</span></li>
361,371c233,241
< 						foreach( $ofields as $key=>$value )
< 							echo "<option value=\"$key\">" . $admtext[$value] . "</option>\n";
< ?>						
< 							<option value="(">(</option>
< 							<option value=")">)</option>
< 							<option value="+">+</option>
< 							<option value="-">-</option>
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:AddtoDisplay(document.form1.availoperators,document.form1.finalcriteria);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							foreach( $ofields as $key=>$value )
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext[$value]}<span class=\"hidden\">$key</span></li>\n";
> 	?>						
> 								<li ondblclick="add_to_list(this,'finalcriteria');">(<span class="hidden">(</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">)<span class="hidden">)</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">+<span class="hidden">+</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">-<span class="hidden">-</span></li>
> 							</ul>
> 						</div>
376,380c246,248
< 						<span class="normal"><?php echo $admtext['constantstring']; ?>:*<br/></span>
< 						<input type="text" name="constantstring" size="20">
< 					</td>
< 					<td width="40" align="center"><br/>
< 						&nbsp;<a href="javascript:AddConstant(document.form1.constantstring,document.form1.finalcriteria,1);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 						<span class="normal indent-tiny"><?php echo $admtext['constantstring']; ?>:*<br/></span>
> 						<input type="text" name="constantstring" class="medfield" onkeypress="return handleKey(event, 1);">&nbsp;
> 						<input type="button" value=">>" style="font-size: 11pt" onclick="AddConstant(document.form1.constantstring,1);"/>
385,389c253,255
< 						<span class="normal"><?php echo $admtext['constantvalue']; ?>:<br/></span>
< 						<input type="text" name="constantvalue" size="20">
< 					</td>
< 					<td width="40" align="center"><br/>
< 						&nbsp;<a href="javascript:AddConstant(document.form1.constantvalue,document.form1.finalcriteria,0);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 						<span class="normal indent-tiny"><?php echo $admtext['constantvalue']; ?>:<br/></span>
> 						<input type="text" name="constantvalue" class="medfield" onkeypress="return handleKey(event, 0);">&nbsp;
> 						<input type="button" value=">>" style="font-size: 11pt" onclick="AddConstant(document.form1.constantvalue,0);"/>
393c259
< 			<span class="normal">*<?php echo $admtext['foremptystring']; ?></span>
---
> 			<span class="normal indent-tiny">*<?php echo $admtext['foremptystring']; ?></span>
401c267,268
< 						<select name="availsort" size="10" class="reportcol" onDblClick="AddtoDisplay(document.form1.availsort,document.form1.finalsort);">
---
> 						<div class="reportbox">
> 							<ul id="availsort" class="reportcol" style="height: 250px">
403,412c270,279
< 						foreach( $cfields as $key=>$value )
< 							echo "<option value=\"$key\">$admtext[$value]</option>\n";
< 						//now do custom event types, prefix with "ce_"
< 						foreach( $cetypes as $cerow ) {
< 							$displaymsg = getEventDisplay( $cerow['display'] );
< 							echo "<option value=\"ce_dt_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdate']}</option>\n";
< 							echo "<option value=\"ce_tr_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdatetr']}</option>\n";
< 							echo "<option value=\"ce_pl_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['place']}</option>\n";
< 							echo "<option value=\"ce_fa_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['fact']}</option>\n";
< 						}
---
> 								foreach( $cfields as $key=>$value )
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">{$admtext[$value]}<span class=\"hidden\">$key</span></li>\n";
> 								//now do custom event types, prefix with "ce_"
> 								foreach( $cetypes as $cerow ) {
> 									$displaymsg = getEventDisplay( $cerow['display'] );
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">$displaymsg: {$admtext['rptdate']}<span class=\"hidden\">ce_dt_{$cerow['eventtypeID']}</span></li>\n";
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">$displaymsg: {$admtext['rptdatetr']}<span class=\"hidden\">ce_tr_{$cerow['eventtypeID']}</span></li>\n";
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">$displaymsg: {$admtext['place']}<span class=\"hidden\">ce_pl_{$cerow['eventtypeID']}</span></li>\n";
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">$displaymsg: {$admtext['fact']}<span class=\"hidden\">ce_fa_{$cerow['eventtypeID']}</span></li>\n";
> 								}
414,418c281,282
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:AddtoDisplay(document.form1.availsort,document.form1.finalsort);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.finalsort);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							</ul>
> 						</div>
421c285,286
< 						<select name="finalsort" size="10" class="reportcol" onDblClick="RemovefromDisplay(document.form1.finalsort);">
---
> 						<div class="reportbox">
> 							<ul id="finalsort" class="reportcol" style="height: 250px">
423,435c288,304
< 							$orderbyfields = explode( $lineending, $row['orderby'] );
< 							for( $i = 0; $i < count( $orderbyfields ) - 1; $i++ ) {
< 								$sfield = $orderbyfields[$i];
< 								if( isset($cfields[$sfield]) ) {
< 									$stext = $cfields[$sfield];
< 									$displaymsg = $admtext[$stext];
< 								}
< 								elseif( substr( $sfield, 0, 3 ) == "ce_") {
< 									$eventtypeID = substr( $sfield, 6 );
< 									$subtype = substr( $sfield, 3, 2 );
< 									$stdisplay = $subtypes[$subtype];
< 									$cerow = $cetypes[$eventtypeID];
< 									$displaymsg = getEventDisplay( $cerow['display'] ) . ": " . $stdisplay;
---
> 								$orderbyfields = explode( $lineending, $row['orderby'] );
> 								$num_orderbyfields = count($orderbyfields) - 1;
> 								for( $i = 0; $i < $num_orderbyfields; $i++ ) {
> 									$sfield = $orderbyfields[$i];
> 									if( isset($cfields[$sfield]) ) {
> 										$stext = $cfields[$sfield];
> 										$displaymsg = $admtext[$stext];
> 									}
> 									elseif( substr( $sfield, 0, 3 ) == "ce_") {
> 										$eventtypeID = substr( $sfield, 6 );
> 										$subtype = substr( $sfield, 3, 2 );
> 										$stdisplay = $subtypes[$subtype];
> 										$cerow = $cetypes[$eventtypeID];
> 										$displaymsg = getEventDisplay( $cerow['display'] ) . ": " . $stdisplay;
> 									}
> 									
> 									echo "<li  ondblclick=\"$(this).remove();\">$displaymsg<span class=\"hidden\">$sfield</span></li>\n";
437,439d305
< 								
< 								echo "<option value=\"$sfield\">$displaymsg</option>\n";
< 							}
441,446c307,308
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:Move(document.form1.finalsort,1);"><img src="img/tng_up.gif" alt="<?php echo $admtext['moveup']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.finalsort);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:Move(document.form1.finalsort,0);"><img src="img/tng_down.gif" alt="<?php echo $admtext['movedown']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							</ul>
> 						</div>
453c315
< 	<tr><td valign="top" colspan="2"><textarea cols="60" rows="4" name="sqlselect"><?php echo $row['sqlselect']; ?></textarea></td></tr>
---
> 	<tr><td valign="top" colspan="2"><textarea cols="100" rows="10" name="sqlselect"><?php echo $row['sqlselect']; ?></textarea></td></tr>
459,460c321,325
< 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['savereport']; ?>">
< 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveexit']; ?>">
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submitx" class="btn saveret" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="submit" name="submit" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_reports.php';">
464,471c329,333
< </td>
< </tr>
< 
< </table>
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_editsource.php TNG1403/admin_editsource.php
53d52
< $flags['tabs'] = $tngconfig['tabs'];
59a59
> <?php if(!empty($ref)) { echo "window.opener.location.reload(false);\n"; } ?>
68,69d67
< <body background="img/background.gif">
< 
70a69,70
> 	echo tng_adminlayout();
> 
72c72
< 	$sourcetabs[1] = array($allow_add,"admin_newsource.php",$admtext[addnew],"addsource");
---
> 	$sourcetabs[1] = array($allow_add,"admin_newsource.php",$admtext['addnew'],"addsource");
74c74
< 	$sourcetabs[3] = array($allow_edit,"admin_editsource.php?sourceID=$sourceID&tree=$tree",$admtext['edit'],"edit");
---
> 	$sourcetabs[3] = array($allow_edit,"admin_editsource.php?sourceID=$sourceID&amp;tree=$tree",$admtext['edit'],"edit");
82a83
> <div class="admin-main">
84,86c85,87
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
94,95c95,97
< 				$notesicon = $gotnotes['general'] ? "admin-note-on-icon" : "admin-note-off-icon";
< 				echo "<a href=\"#\" onclick=\"document.form1.submit();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
---
> 				$notesicon = !empty($gotnotes['general']) ? "admin-note-on-icon" : "admin-note-off-icon";
> 				$return = !empty($cw) ? "saveclose" : "saveret";
> 				echo "<a href=\"#\" onclick=\"jQuery('#{$return}').click();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
106,108c108,110
< <tr class="databack">
< <td class="tngshadow">
< 	<table class="normal">
---
> <tr>
> <td class="tngshadow databack">
> 	<table class="normal" id="events_table">
127a130,136
> 
> $treequery = "SELECT count(gedcom) as treecount FROM $trees_table";
> $treeresult = tng_query($treequery);
> $treerow = tng_fetch_assoc($treeresult);
> $numtrees = $treerow['treecount'];
> tng_free_result($treeresult);
> 
141,144c150
< 	<tr><td valign="top"><?php echo $admtext['actualtext']; ?>:</td><td><textarea cols="50" rows="5" name="actualtext"><?php echo $row['actualtext']; ?></textarea></td></tr>
< 	</table>
< 	<br/>
< 	<table class="normal">
---
> 	<tr><td valign="top"><?php echo $admtext['actualtext']; ?>:</td><td><textarea cols="80" rows="15" name="actualtext"><?php echo $row['actualtext']; ?></textarea></td></tr>
146,149c152,156
< 			<td valign="top">
< 				<strong class="subhead" style="color:black"><?php echo $admtext['otherevents']; ?>: &nbsp;</strong>
< <?php
< 	echo "<p><input type=\"button\" value=\"  " . $admtext['addnew'] . "  \" onclick=\"newEvent('S','$sourceID','$tree');\"></p>\n";
---
> 			<td colspan="2">
> 				<br/>
> 				<p><strong class="subhead">
> <?php 
> 	echo $admtext['otherevents'] . ": &nbsp;<input type=\"button\" value=\"  {$admtext['addnew']}  \" onclick=\"newEvent('S','$sourceID','$tree');\">\n";
150a158
> 				</strong></p>
152c160
< 			<td valign="top">
---
> 		</tr>
156,157d163
< 	   		</td>
< 		</tr>
161,162c167,168
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
165,170c171,183
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newscreen\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $cw )
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"close\" checked> {$text['closewindow']}\n";
< 	else
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"none\" checked> {$admtext['saveback']}\n";
---
> 	if(!empty($cw)) {
> ?>
> 	<input type="submit" name="saveclose" id="saveclose" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveclose" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.close();";
> 	} else {
> ?>
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> <?php
> 		$close_command = "window.location.href='admin_sources.php';";
> 	}
171a185,187
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="<?php echo $close_command; ?>">
175,176c191
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
< 	<input type="submit" class="btn" name="submit2" accesskey="s" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="hidden" value="<?php if( isset($cw) ) echo $cw; /*stands for "close window" */ ?>" name="cw">
181a197
> </div>
183,185c199,201
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
Only in TNG1403: admin_edittemplatemsg.php
diff -r TNG/admin_edittlevent.php TNG1403/admin_edittlevent.php
23d22
< $flags['tabs'] = $tngconfig['tabs'];
54,55d52
< <body background="img/background.gif">
< 
56a54,55
> 	echo tng_adminlayout();
> 
65,67c64,67
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
118,130d117
< 	<tr>
< 		<td colspan="2">
< 		<span class="normal">
< <?php
< 	echo $admtext['onsave'] . ":<br/>";
< 	echo "<input type=\"radio\" name=\"newscreen\" value=\"return\"> {$admtext['savereturn']}<br/>\n";
< 	if( $tng_search_tlevents ) {
< 		echo "<input type=\"radio\" name=\"newscreen\" value=\"none\" checked=\"checked\"> {$admtext['saveback']}\n";
< 	}
< ?>
< 		</span>
< 		</td>
< 	</tr>
133c120,124
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>"></form>
---
> 	<input type="submit" name="saveret" id="saveret" class="btn" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="saveret" id="saveret2" class="btn saveret" accesskey="s" value="<?php echo $admtext['saveback']; ?>" />
> 	<input type="submit" name="savestay" id="savestay" class="btn" value="<?php echo $admtext['savereturn']; ?>" />
> 	<input type="submit" name="savestay" id="savestay2" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>" />
> 	</form>
138,140c129,132
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_edittree.php TNG1403/admin_edittree.php
55d54
< $flags['tabs'] = $tngconfig['tabs'];
58c57
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
70,71d68
< <body background="img/background.gif">
< 
72a70,71
> 	echo tng_adminlayout();
> 
82,84c81,84
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
118c118,122
< 	<input type="hidden" name="tree" value="<?php echo "$tree"; ?>"><input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>"></form>
---
> 	<input type="hidden" name="tree" value="<?php echo "$tree"; ?>">
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_trees.php';">
> 	</form>
123,125c127,130
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_edituser.php TNG1403/admin_edituser.php
17a18,25
> if(!empty($username) && empty($userID)) {
> 	$query = "SELECT userID FROM $users_table WHERE username = \"$username\"";
> 	$result = tng_query($query) or die ("Cannot execute query: $query"); //message is hardcoded because we haven't included the text file yet
> 	$row = tng_fetch_assoc($result);
> 	$userID = $row['userID'];
> 	tng_free_result( $result );
> }
> 
39,45d46
< 
< 	if($langrow['folder']) {
< 		$oldtext = $admtext;
< 		include($cms['tngpath'] . "$languages_path{$langrow['folder']}/admintext.php");
< 		$deftext = $admtext;
< 		$admtext = $oldtext;
< 	}
56d56
< $flags['tabs'] = $tngconfig['tabs'];
78c78
< 	else if( form.email.value.length != 0 && !checkEmail(form.email.value)) {
---
> 	else if( form.email.value.length == 0 || !checkEmail(form.email.value)) {
98,99d97
< <body background="img/background.gif">
< 
100a99,100
> 	echo tng_adminlayout();
> 
105c105
< 	$usertabs['4'] = array(1,"#",$admtext['edit'],"edit");
---
> 	$usertabs[4] = array(1,"#",$admtext['edit'],"edit");
111,113c111,114
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback normal">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
160c161
< 		<tr><td valign="top"><?php echo $admtext['notes']; ?>:</td><td><textarea cols="50" rows="4" name="notes"><?php echo $row['notes']; ?></textarea></td></tr>
---
> 		<tr><td valign="top"><?php echo $admtext['notes']; ?>:</td><td><textarea cols="50" rows="4" name="notes"><?php echo stripcslashes($row['notes']); ?></textarea></td></tr>
249a251
> 		<input type="checkbox" name="form_allow_private_notes" value="1"<?php if( $row['allow_private_notes'] > 0 ) echo " checked=\"checked\""; ?>> <?php echo $admtext['allow_private_notes']; ?><br/>
291a294,296
> 	$totbranches = tng_num_rows( $branchresult ) + 1;
> 	$selectnum = $totbranches < 8 ? $totbranches : 8;
> 
333c338,339
< 	<input type="hidden" name="userID" value="<?php echo "$userID"; ?>">
---
> 	<input type="hidden" name="userID" value="<?php echo isset($userID) ? $userID : ""; ?>">
> 	<input type="hidden" name="newuser" value="<?php echo isset($newuser) ? $newuser : ""; ?>">
336d341
< 	<input type="hidden" name="newuser" value="<?php echo "$newuser"; ?>">
338c343,348
< 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['savechanges']; ?>"></form>
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submitx" class="btn saveret" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_users.php';">
> </form>
349,351c359,362
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_eventtypes.php TNG1403/admin_eventtypes.php
11a12
> $exptime = 0;
13,14c14
< if( $newsearch ) {
< 	$exptime = 05;
---
> if( !empty($newsearch) ) {
24,31c24,27
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_eventtypes_post']['search']);
< 	if( !$etype )
< 		$etype = $_COOKIE['tng_search_eventtypes_post']['etype'];
< 	if( !$stype )
< 		$stype = $_COOKIE['tng_search_eventtypes_post']['stype'];
< 	if( !$onimport )
< 		$onimport = $_COOKIE['tng_search_eventtypes_post']['onimport'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_eventtypes_post']['search']) ? stripslashes($_COOKIE['tng_search_eventtypes_post']['search']) : "";
> 	if( empty($onimport) )
> 		$onimport = isset($_COOKIE['tng_search_eventtypes_post']['onimport']) ? $_COOKIE['tng_search_eventtypes_post']['onimport'] : "";
33,34c29,30
< 		$tngpage = $_COOKIE['tng_search_eventtypes_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_eventtypes_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_eventtypes_post']['tngpage']) ? $_COOKIE['tng_search_eventtypes_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_eventtypes_post']['offset']) ? $_COOKIE['tng_search_eventtypes_post']['offset'] : 0;
37c33,34
< 		$exptime = 0;
---
> 		if( !isset($tngpage) ) $tngpage = 1;
> 		if( !isset($offset) ) $offset = 0;
42a40,50
> if(!isset($etype))
> 	$etype = isset($_COOKIE['tng_search_eventtypes_post']['etype']) ? $_COOKIE['tng_search_eventtypes_post']['etype'] : "";
> if(!isset($stype))
> 	$stype = isset($_COOKIE['tng_search_eventtypes_post']['stype']) ? $_COOKIE['tng_search_eventtypes_post']['stype'] : "";
> if(!empty($order))
> 	setcookie("tng_search_eventtypes_post[order]", $order, 0);
> else
> 	$order = isset($_COOKIE['tng_search_eventtypes_post']['order']) ? $_COOKIE['tng_search_eventtypes_post']['order'] : "tag";
> 
> 
> if( !isset($offset) ) $offset = 0;
52a61,107
> $tagsort = "tag";
> $typesort = "type";
> $dispsort = "disp";
> $evsort = "ev";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "tag") {
> 	$orderstr = "tag, description";
> 	$tagsort = "<a href=\"admin_eventtypes.php?order=tagup\" class=\"lightlink\">{$admtext['tag']} $descicon</a>";
> }
> else {
> 	$tagsort = "<a href=\"admin_eventtypes.php?order=tag\" class=\"lightlink\">{$admtext['tag']} $ascicon</a>";
> 	if($order == "tagup")
> 		$orderstr = "tag DESC, description DESC";
> }
> 
> if($order == "type") {
> 	$orderstr = "type, tag, description";
> 	$typesort = "<a href=\"admin_eventtypes.php?order=typeup\" class=\"lightlink\">{$admtext['typedescription']} $descicon</a>";
> }
> else {
> 	$typesort = "<a href=\"admin_eventtypes.php?order=type\" class=\"lightlink\">{$admtext['typedescription']} $ascicon</a>";
> 	if($order == "typeup")
> 		$orderstr = "type DESC, tag DESC, description DESC";
> }
> 
> if($order == "disp") {
> 	$orderstr = "description, tag";
> 	$dispsort = "<a href=\"admin_eventtypes.php?order=dispup\" class=\"lightlink\">{$admtext['display']} $descicon</a>";
> }
> else {
> 	$dispsort = "<a href=\"admin_eventtypes.php?order=disp\" class=\"lightlink\">{$admtext['display']} $ascicon</a>";
> 	if($order == "dispup")
> 		$orderstr = "description DESC, tag DESC";
> }
> 
> if($order == "ev") {
> 	$orderstr = "total_events DESC, tag";
> 	$evsort = "<a href=\"admin_eventtypes.php?order=evup\" class=\"lightlink\">{$admtext['events']} $ascicon</a>";
> }
> else {
> 	$evsort = "<a href=\"admin_eventtypes.php?order=ev\" class=\"lightlink\">{$admtext['events']} $descicon</a>";
> 	if($order == "evup")
> 		$orderstr = "total_events, tag";
> }
> 
59d113
< $eventsort = $stype == "E" ? "total_events DESC, " : "";
63c117
< 	$wherestr GROUP BY eventtypeID ORDER BY {$eventsort}tag, description LIMIT $newoffset" . $maxsearchresults;
---
> 	$wherestr GROUP BY eventtypeID ORDER BY $orderstr, description LIMIT $newoffset" . $maxsearchresults;
77a132,133
> $search_url = getURL( "search", 1 );
> $famsearch_url = getURL( "famsearch", 1 );
79d134
< $flags['tabs'] = $tngconfig['tabs'];
84c139
< 	if(confirm('<?php echo $admtext['confdeleteevtype']; ?>' ))
---
> 	if(confirm("<?php echo $admtext['confdeleteevtype']; ?>" ))
92,93d146
< <body background="img/background.gif">
< 
94a148,149
> 	echo tng_adminlayout();
> 
102,105c157,158
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
119c172
< 			<td>
---
> 			<td colspan="2">
127,133d179
< 				<?php echo $admtext['sortby']; ?>: 
< 				<select name="stype">
< 					<option value="T"<?php if( !$stype || $stype == "T" ) echo " selected"; ?>><?php echo $admtext['tag']; ?></option>
< 					<option value="E"<?php if( $stype == "E" ) echo " selected"; ?>><?php echo $admtext['events']; ?></option>
< 				</select>
< 			</td>
< 			<td>
158c204
< 		<input type="submit" name="cetaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
> 		<input type="submit" name="cetaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
172c218
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
182,184c228,231
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['tag']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['typedescription']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['display']; ?></b>&nbsp;</td>
---
> 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $tagsort; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $typesort; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $dispsort; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['id']; ?></b>&nbsp;</td>
189c236
< 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['events']; ?></b>&nbsp;</td>
---
> 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $evsort; ?></b>&nbsp;</td>
202a250,252
> 
> 			$tot_events = number_format($row['total_events']);
> 			$args = "mybool=OR&cfq{$row['eventtypeID']}=exists&cpq{$row['eventtypeID']}=exists&cyq{$row['eventtypeID']}=exists";
205a256
> 					$tot_events_str = "<a href=\"{$search_url}{$args}\" target=\"blank\">$tot_events</a>";
208a260
> 					$tot_events_str = "<a href=\"{$famsearch_url}{$args}\" target=\"blank\">$tot_events</a>";
211a264
> 					$tot_events_str = $tot_events;
214a268
> 					$tot_events_str = $tot_events;
235c289
< 			echo "<td class=\"lightback\">&nbsp;{$row['tag']}&nbsp;</td><td class=\"lightback\">&nbsp;{$row['description']}&nbsp;</td><td class=\"lightback\">&nbsp;$displayval&nbsp;</td>";
---
> 			echo "<td class=\"lightback\">&nbsp;{$row['tag']}&nbsp;</td><td class=\"lightback\">&nbsp;{$row['description']}&nbsp;</td><td class=\"lightback\">&nbsp;$displayval&nbsp;</td><td class=\"lightback\">&nbsp;{$row['eventtypeID']}&nbsp;</td>";
237c291
< 			echo "<td class=\"lightback\" style=\"text-align:right\">&nbsp;" . number_format($row['total_events']) . "&nbsp;</td>";
---
> 			echo "<td class=\"lightback\" style=\"text-align:right\">&nbsp;{$tot_events_str}&nbsp;</td>";
253,259c307,310
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_export.php TNG1403/admin_export.php
25a26,29
> else {
> 	$row = array();
> 	$row['gedcom'] = $row['branch'] = "";
> }
38d41
< $flags['tabs'] = $tngconfig['tabs'];
47c50,51
< 	if( document.form1.exportmedia.checked == true )
---
> 	if( document.form1.exportmedia.checked == true ) {
> 		jQuery('#exportmediafiles').prop( "disabled", false );
49c53,56
< 	else
---
> 	}
> 	else {
> 		jQuery('#exportmediafiles').prop( "disabled", true );
> 		jQuery('#exportmediafiles').prop( "checked", false );
50a58
> 	}
55,56d62
< <body background="img/background.gif">
< 
57a64,65
> 	echo tng_adminlayout();
> 
60c68
< 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondarymaint'],"second");
---
> 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondary'],"second");
66,68c74,75
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback normal">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
82c89
< 		if( $treerow['gedcom'] == $tree ) echo " selected";
---
> 		if( !empty($tree) && $treerow['gedcom'] == $tree ) echo " selected";
96a104,106
> 	$totbranches = tng_num_rows( $branchresult ) + 1;
> 	$selectnum = $totbranches < 8 ? $totbranches : 8;
> 
113,115c123,126
< 	<input type="checkbox" name="exprivate" id="exprivate" value="1"> <label for="exprivate"><?php echo $admtext['exprivate']; ?></label> <br/><br/>
< 
< 	<input type="checkbox" name="exportmedia" id="exportmedia" value="1" onClick="toggleStuff();"> <label for="exportmedia"><?php echo $admtext['exportmedia']; ?></label>
---
> 	<input type="checkbox" name="exprivate" id="exprivate" value="1"> <label for="exprivate"><?php echo $admtext['exprivate']; ?></label> &nbsp;&nbsp;
> 	<input type="checkbox" name="exnotes" id="exnotes" value="1"> <label for="exnotes"><?php echo $admtext['exnotes']; ?></label> &nbsp;&nbsp;
> 	<input type="checkbox" name="exportmedia" id="exportmedia" value="1" onClick="toggleStuff();"> <label for="exportmedia"><?php echo $admtext['exportmedia']; ?></label> &nbsp;&nbsp;
> 	<input type="checkbox" name="exportmediafiles" id="exportmediafiles" value="1" disabled> <label for="exportmediafiles"><?php echo $admtext['exportmediafiles']; ?></label>
117c128
< 	<br />
---
> 	<br /><br />
143c154,156
< 				if(isset($locimppath[$msgID]))
---
> 				if(!empty($mediatypes_locpaths[$msgID]))
>                 	$value = strtok($mediatypes_locpaths[$msgID],",");
> 				elseif(!empty($locimppath[$msgID]))
156,162c169,172
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_families.php TNG1403/admin_families.php
11a12,20
> $newsearch = isset($newsearch) ? $newsearch : "";
> $searchstring = isset($searchstring) ? $searchstring : "";
> if(!isset($tree)) $tree = "";
> if(!isset($living)) $living = "";
> if(!isset($exactmatch)) $exactmatch = "";
> if(!isset($spousename)) $spousename = "";
> if(!isset($tngpage)) $tngpage = 0;
> 
> $exptime = 0;
13d21
< 	$exptime = 0;
24c32
< 		$searchstring = stripslashes($_COOKIE['tng_search_families_post']['search']);
---
> 		$searchstring = isset($_COOKIE['tng_search_families_post']['search']) ? stripslashes($_COOKIE['tng_search_families_post']['search']) : "";
26c34
< 		$tree = $_COOKIE['tng_tree'];
---
> 		$tree = isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "";
28c36
< 		$living = $_COOKIE['tng_search_families_post']['living'];
---
> 		$living = isset($_COOKIE['tng_search_families_post']['living']) ? $_COOKIE['tng_search_families_post']['living'] : "";
30c38
< 		$exactmatch = $_COOKIE['tng_search_families_post']['exactmatch'];
---
> 		$exactmatch = isset($_COOKIE['tng_search_families_post']['exactmatch']) ? $_COOKIE['tng_search_families_post']['exactmatch'] : "";
32c40
< 		$spousename = $_COOKIE['tng_search_families_post']['spousename'];
---
> 		$spousename = isset($_COOKIE['tng_search_families_post']['spousename']) ? $_COOKIE['tng_search_families_post']['spousename'] : "";
36,37c44,45
< 		$tngpage = $_COOKIE['tng_search_families_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_families_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_families_post']['tngpage']) ? $_COOKIE['tng_search_families_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_families_post']['offset']) ? $_COOKIE['tng_search_families_post']['offset'] : 0;
40d47
< 		$exptime = 0;
45,48c52,56
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
---
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
> 
> if(!empty($order))
> 	setcookie("tng_search_families_post[order]", $order, $exptime);
50c58
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> 	$order = isset($_COOKIE['tng_search_families_post']['order']) ? $_COOKIE['tng_search_families_post']['order'] : "fname";
51a60
> if(!isset($offset)) $offset = 0;
69a79,84
> $uquery = "SELECT count(userID) as ucount FROM $users_table WHERE allow_living != \"-1\"";
> $uresult = tng_query($uquery) or die ($admtext['cannotexecutequery'] . ": $uquery");
> $urow = tng_fetch_assoc( $uresult );
> $numusers = $urow['ucount'];
> tng_free_result($uresult);
> 
105,109c120
< 
< 	if( $spousename == "husband" )
< 		$allwhere .= addCriteria( "CONCAT_WS(' ',TRIM(firstname)" . ($lnprefixes ? ",TRIM(lnprefix)" : "") . ",TRIM(lastname))", $searchstring, $frontmod );
< 	elseif( $spousename == "wife" )
< 		$allwhere .= addCriteria( "CONCAT_WS(' ',TRIM(firstname)" . ($lnprefixes ? ",TRIM(lnprefix)" : "") . ",TRIM(lastname))", $searchstring, $frontmod );
---
> 	$allwhere .= addCriteria( "CONCAT_WS(' ',TRIM(p1.firstname)" . ($lnprefixes ? ",TRIM(p1.lnprefix)" : "") . ",TRIM(p1.lastname))", $searchstring, $frontmod );
112,130c123,137
< if( $spousename == "husband" )
< 	$allwhere2 .= "AND $people_table.personID = husband ";
< elseif( $spousename == "wife" )
< 	$allwhere2 .= "AND $people_table.personID = wife ";
< 
< if( $allwhere2 ) {
< 	$allwhere2 .= "AND $people_table.gedcom = $trees_table.gedcom";
< 	$allwhere .= " $allwhere2";
< 	if( $tree ) {
< 		$allwhere .= " AND $people_table.gedcom = \"$tree\"";
< 	}
< 	else {
< 		$allwhere .= " AND $people_table.gedcom = $families_table.gedcom";
< 	}
< 	if( $assignedbranch )
< 		$allwhere .= " AND $families_table.branch LIKE \"%$assignedbranch%\"";
< 	$people_join = ", $people_table";
< 	$otherfields = ", firstname, lnprefix, lastname, prefix, suffix, nameorder";
< 	$sortstr = "lastname, lnprefix, firstname,";
---
> if( $spousename == "husband" ) {
> 	$allwhere2 .= "AND p1.personID = husband ";
> 	$otherspouse = "wife";
> }
> elseif( $spousename == "wife" ) {
> 	$allwhere2 .= "AND p1.personID = wife ";
> 	$otherspouse = "husband";
> }
> else
> 	$otherspouse = "";
> 
> $allwhere2 .= "AND p1.gedcom = $trees_table.gedcom";
> $allwhere .= " $allwhere2";
> if( $tree ) {
> 	$allwhere .= " AND p1.gedcom = \"$tree\"";
133,135c140
< 	$people_join = "";
< 	$otherfields = "";
< 	$sortstr = "";
---
> 	$allwhere .= " AND p1.gedcom = $families_table.gedcom";
136a142,149
> if( $assignedbranch )
> 	$allwhere .= " AND $families_table.branch LIKE \"%$assignedbranch%\"";
> $people_join = ", $people_table as p1";
> $otherfields = ", p1.firstname, p1.lnprefix, p1.lastname, p1.prefix, p1.suffix, p1.title, p1.nameorder";
> if($otherspouse)
> 	$otherfields .= ", p2.firstname as p2firstname, p2.lnprefix as p2lnprefix, p2.lastname as p2lastname, p2.prefix as p2prefix, p2.suffix as p2suffix, p2.title as p2title, p2.nameorder as p2nameorder";
> $sortstr = "p1.lastname, p1.lnprefix, p1.firstname,";
> 
142c155,254
< $query = "SELECT $families_table.ID as ID, familyID, husband, wife, marrdate, $families_table.gedcom as gedcom, treename $otherfields FROM ($families_table, $trees_table $people_join) WHERE $allwhere ORDER BY $sortstr familyID LIMIT $newoffset" . $maxsearchresults;
---
> $idsort = "id";
> $marrsort = "marr";
> $fnamesort = "fnameup";
> $mnamesort = "mname";
> $changesort = "change";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "id") {
> 	$orderstr = "familyIDnum, p1.lastname, p1.lnprefix, p1.firstname";
> 	$idsort = "<a href=\"admin_families.php?order=idup\" class=\"lightlink\">{$admtext['id']} $descicon</a>";
> }
> else {
> 	$idsort = "<a href=\"admin_families.php?order=id\" class=\"lightlink\">{$admtext['id']} $ascicon</a>";
> 	if($order == "idup")
> 		$orderstr = "familyIDnum DESC, p1.lastname, p1.lnprefix, p1.firstname";
> }
> if($tngconfig['familysuffix']) {
> 	$len = strlen($tngconfig['familysuffix']);
> 	$idselect = ", CAST(LEFT(familyID, LENGTH(familyID)-$len) AS UNSIGNED) AS familyIDnum";
> }
> elseif($tngconfig['familyprefix']) {
> 	$len = strlen($tngconfig['familyprefix']);
> 	$idselect = ", CAST(RIGHT(familyID, LENGTH(familyID)-$len) AS UNSIGNED) AS familyIDnum";
> }
> else
> 	$idselect = ", CAST(familyID AS UNSIGNED) AS familyIDnum";
> 
> if($order == "fname") {
> 	$orderstr = "p1.lastname, p1.lnprefix, p1.firstname";
> 	$fnamesort = "<a href=\"admin_families.php?order=fnameup\" class=\"lightlink\">{$admtext['husbname']} $descicon</a>";
> }
> else {
> 	$fnamesort = "<a href=\"admin_families.php?order=fname\" class=\"lightlink\">{$admtext['husbname']} $ascicon</a>";
> 	if($order == "fnameup")
> 		$orderstr = "p1.lastname DESC, p1.lnprefix DESC, p1.firstname DESC";
> }
> 
> if($otherspouse) {
> 	if($order == "mname") {
> 		$orderstr = "p2.lastname, p2.lnprefix, p2.firstname";
> 		$mnamesort = "<a href=\"admin_families.php?order=mnameup\" class=\"lightlink\">{$admtext['wifename']} $descicon</a>";
> 	}
> 	else {
> 		$mnamesort = "<a href=\"admin_families.php?order=mname\" class=\"lightlink\">{$admtext['wifename']} $ascicon</a>";
> 		if($order == "mnameup")
> 			$orderstr = "p2.lastname DESC, p2.lnprefix DESC, p2.firstname DESC";
> 	}
> }
> else {
> 	$mnamesort = "";
> 	$orderstr = "";
> }
> 
> if($order == "marr") {
> 	$orderstr = "marrdatetr, p1.lastname, p1.lnprefix, p1.firstname";
> 	$marrsort = "<a href=\"admin_families.php?order=marrup\" class=\"lightlink\">{$admtext['marrdate']}, {$admtext['marriageplace']} $descicon</a>";
> }
> else {
> 	$marrsort = "<a href=\"admin_families.php?order=marr\" class=\"lightlink\">{$admtext['marrdate']}, {$admtext['marriageplace']} $ascicon</a>";
> 	if($order == "marrup")
> 		$orderstr = "marrdatetr DESC, p1.lastname, p1.lnprefix, p1.firstname";
> }
> 
> if($order == "change") {
> 	$orderstr = "$families_table.changedate, p1.lastname, p1.lnprefix, p1.firstname";
> 	$changesort = "<a href=\"admin_families.php?order=changeup\" class=\"lightlink\">{$admtext['lastmodified']} $descicon</a>";
> }
> else {
> 	$changesort = "<a href=\"admin_families.php?order=change\" class=\"lightlink\">{$admtext['lastmodified']} $ascicon</a>";
> 	if($order == "changeup")
> 		$orderstr = "$families_table.changedate DESC, p1.lastname, p1.lnprefix, p1.firstname";
> }
> 
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
> 
> if($otherspouse) {
> 	$from = "$families_table, $trees_table $people_join";
> 	$query = "SELECT $families_table.ID as ID, familyID{$idselect}, husband, wife, marrdate, marrplace, $families_table.private, $families_table.living, $families_table.branch, $families_table.gedcom as gedcom, treename, $families_table.changedby, DATE_FORMAT($families_table.changedate,\"%d %b %Y\") as changedatef, $families_table.changedate as changedate $otherfields 
> 		FROM ($from) 
> 		LEFT JOIN $people_table as p2 ON p2.gedcom = $trees_table.gedcom AND p2.personID = $otherspouse
> 		WHERE $allwhere ORDER BY $orderstr LIMIT $newoffset" . $maxsearchresults;
> }
> else {
> 	$from = $families_table;
> 	$treenamestr = "";
> 	if($searchstring) {
> 		$allwhere = "1=0" . addCriteria( "familyID", $searchstring, $frontmod );
> 		if( $tree ) {
> 			$from .= ", $trees_table";
> 			$allwhere = "($allwhere) AND $families_table.gedcom = \"$tree\" AND $families_table.gedcom = $trees_table.gedcom";
> 			$treenamestr = ", treename";
> 		}
> 	}
> 	else
> 		$allwhere = "husband = \"\" AND wife = \"\"";
> 	$query = "SELECT $families_table.ID as ID, familyID{$idselect}, husband, wife, marrdate, marrplace, private, living, branch, $families_table.gedcom as gedcom, changedby, DATE_FORMAT(changedate,\"%d %b %Y\") as changedatef, changedate as changedate $treenamestr
> 		FROM $from WHERE $allwhere ORDER BY familyID LIMIT $newoffset" . $maxsearchresults;
> }
147c259,260
< 	$query = "SELECT count($families_table.ID) as fcount FROM ($families_table, $trees_table $people_join) WHERE $allwhere";
---
> 	$query = "SELECT count($families_table.ID) as fcount FROM ($from)";
> 	if($allwhere) $query .= " WHERE $allwhere";
160d272
< $flags['tabs'] = $tngconfig['tabs'];
173,174d284
< <body background="img/background.gif">
< 
175a286,287
> 	echo tng_adminlayout();
> 
184,187c296,297
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
211c321
<              </select>
---
>             	</select>
235c345
< 		<input type="submit" name="xfamaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
> 		<input type="submit" name="xfamaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
241c351
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="4" cellspacing="1" border="0" class="normal rounded-table">
251c361
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['id']; ?></b>&nbsp;</nobr></span></td>
---
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $idsort; ?></b>&nbsp;</nobr></span></td>
253,256c363
< <?php
< 	if( $spousename == "husband" )
< 		echo "<td class=\"fieldnameback\"><span class=\"fieldname\"><nobr>&nbsp;<b>{$admtext['husbname']}</b>&nbsp;</nobr></span></td>\n";
< ?>
---
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $fnamesort; ?></b>&nbsp;</nobr></span></td>
258,262c365,366
< <?php
< 	if( $spousename == "wife" )
< 		echo "<td class=\"fieldnameback\"><span class=\"fieldname\"><nobr>&nbsp;<b>{$admtext['wifename']}</b>&nbsp;</nobr></span></td>\n";
< ?>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['marrdate']; ?></b>&nbsp;</nobr></span></td>
---
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $mnamesort; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $marrsort; ?></b>&nbsp;</nobr></span></td>
269a374
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $changesort; ?></b>&nbsp;</nobr></span></td>
293c398
< 			echo "<tr id=\"row_{$row['ID']}\"><td class=\"lightback\"><div class=\"action-btns\">$newactionstr</div></td>\n";
---
> 			echo "<tr id=\"row_{$row['ID']}\"><td class=\"lightback\" valign=\"top\"><div class=\"action-btns\">$newactionstr</div></td>\n";
295,303c400,425
< 				echo "<td class=\"lightback\" align=\"center\"><input type=\"checkbox\" name=\"del{$row['ID']}\" value=\"1\"></td>";
< 			echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;$id&nbsp;</span></td>\n";
< 			echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;{$row['husband']}&nbsp;</span></td>\n";
< 			if( $spousename == "husband" )
< 				echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;" . getName( $row ) . "&nbsp;</span></td>\n";
< 			echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;{$row['wife']}&nbsp;</span></td>\n";
< 			if( $spousename == "wife" )
< 				echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;" . getName( $row ) . "&nbsp;</span></td>\n";
< 			echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;{$row['marrdate']}&nbsp;</span></td>\n";
---
> 				echo "<td class=\"lightback\" align=\"center\" valign=\"top\"><input type=\"checkbox\" name=\"del{$row['ID']}\" value=\"1\"></td>";
> 			echo "<td class=\"lightback\" valign=\"top\">$id</td>\n";
> 			$row2 = $row;
> 			$row2['firstname'] = !empty($row['p2firstname']) ? $row['p2firstname'] : "";
> 			$row2['lastname'] = !empty($row['p2lastname']) ? $row['p2lastname'] : "";
> 			$row2['lnprefix'] = !empty($row['p2lnprefix']) ? $row['p2lnprefix'] : "";
> 			$row2['prefix'] = !empty($row['p2prefix']) ? $row['p2prefix'] : "";
> 			$row2['suffix'] = !empty($row['p2suffix']) ? $row['p2suffix'] : "";
> 			$row2['title'] = !empty($row['p2title']) ? $row['p2title'] : "";
> 			$row2['nameorder'] = !empty($row['p2nameorder']) ? $row['p2nameorder'] : "";
> 			$rights = determineLivingPrivateRights($row2);
> 			$row2['allow_living'] = $rights['living'];
> 			$row2['allow_private'] = $rights['private'];
> 			if( $spousename == "husband" ) {
> 				$husbname = getName($row);
> 				$wifename = getName($row2);
> 			}
> 			else {
> 				$wifename = getName($row);
> 				$husbname = getName($row2);
> 			}
> 			echo "<td class=\"lightback\" valign=\"top\">{$row['husband']}</td>\n";
> 			echo "<td class=\"lightback\" valign=\"top\">$husbname</td>\n";
> 			echo "<td class=\"lightback\" valign=\"top\">{$row['wife']}</td>\n";
> 			echo "<td class=\"lightback\" valign=\"top\">$wifename</td>\n";
> 			echo "<td class=\"lightback\" valign=\"top\">{$row['marrdate']}<br/>{$row['marrplace']}</td>\n";
305c427,429
< 				echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;{$row['treename']}&nbsp;</span></td>\n";
---
> 				echo "<td class=\"lightback\" valign=\"top\">" . (!empty($row['treename']) ? $row['treename'] : "") . "</td>\n";
> 			$changedby = $numusers > 1 ? "{$row['changedby']}: " : "";
> 			echo "<td class=\"lightback\" valign=\"top\">{$changedby}{$row['changedatef']}</td>\n";
321,326c445,448
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_filepicker.php TNG1403/admin_filepicker.php
15,16c15,18
< if( $path == "gedcom" )
< 	$tngpath = $gedpath;
---
> if( $path == "gedcom" ) {
> 	$tngpath = !empty($tngimpcfg['saveconfig']) ? $subroot . $gedpath : $gedpath;
> 	$fulltngpath = !empty($tngimpcfg['saveconfig']) ? $subroot . $gedpath : $rootpath . $gedpath;
> }
23a26
> 	$fulltngpath = $rootpath . $tngpath;
25c28
< elseif($mediatypes_assoc[$path]) {
---
> elseif(!empty($mediatypes_assoc[$path])) {
31a35
> 	$fulltngpath = $rootpath . $tngpath;
36a41
> 	$fulltngpath = $rootpath . $tngpath;
40c45
< if($order)
---
> if(!empty($order))
71,72c76
< 	global $ImageFileTypes, $subdir, $img, $admtext, $text, $page, $rootpath, $path, $tngpath, $pagetotal, $searchstring, $allow_delete, $dims, $tngconfig, $session_charset, $folders, $namedir, $datedir, $order;
< 
---
> 	global $ImageFileTypes, $subdir, $img, $admtext, $text, $page, $rootpath, $path, $tngpath, $fulltngpath, $pagetotal, $searchstring, $allow_delete, $dims, $tngconfig, $session_charset, $folders, $namedir, $datedir, $order, $cms;
74c78
< 	$datefmt = $tngconfig['preferEuro'] == "true" ? "d/m/Y h:i:s A" : "m/d/Y h:i:s A";
---
> 	$datefmt = !empty($tngconfig['preferEuro']) && $tngconfig['preferEuro'] == "true" ? "d/m/Y h:i:s A" : "m/d/Y h:i:s A";
83c87,91
< 	$lRecCount = lCountFiles();
---
> 	$validpath = false;
> 	if( file_exists("$fulltngpath/" . stripslashes($subdir)) && is_dir("$fulltngpath/" . stripslashes($subdir)) ) {
> 		$validpath = true;
> 	}
> 	$lRecCount = lCountFiles($validpath);
89c97,104
< <span class="normal">&nbsp;<?php echo "<b>{$admtext['folder']}:</b> $tngpath/" . stripslashes($subdir); ?></span><br/>
---
> <span class="normal">&nbsp;<?php echo "<b>{$admtext['folder']}:</b> $tngpath/" . stripslashes($subdir); ?> 
> 	&nbsp; | &nbsp; <b><?php echo $admtext['search']; ?>:</b> <input type="text" onkeyup="fpFilterChanged(event, this.value);"></span><br/>
> <?php
> 	if( !$validpath ) {
> 		// The directory doesn't exist, so let the user know.
> 		echo "<tr><td><span class=\"normal\" style=\"color:#FF0000\"><em>" . $admtext['cannotopendir'] . " (" . $tngpath . "/" . stripslashes($subdir) . ") " . $admtext['improperpermissions'] . "</em></span></td></tr>";
> 	}
> ?>
103c118,120
< 	chdir("$rootpath$tngpath/" . stripslashes($subdir));
---
> 	if( file_exists("$fulltngpath/" . stripslashes($subdir)) && is_dir("$fulltngpath/" . stripslashes($subdir)) ) {
> 		chdir("$fulltngpath/" . stripslashes($subdir));
> 	}
155c172
< 				$file_ext = strtoupper( $fileparts["extension"] );
---
> 				$file_ext = isset($fileparts["extension"]) ? strtoupper( $fileparts["extension"] ) : "";
158c175
< 				echo "<tr id=\"row_$nImageNr\">\n";
---
> 				echo "<tr id=\"row_$nImageNr\" class=\"filerow\">\n";
167c184
< 		<td class="lightback"><?php echo $file; ?></td>
---
> 		<td class="lightback filecell"><?php echo $file; ?></td>
191c208
< 				if( $filename != '.' && ($filename != '..' || $subdir != '') && $filename != "@eaDir") {
---
> 				if( $filename != '.' && ($filename != '..' || $subdir != '') && $filename != '@eaDir') {
241,242c258,259
< function lCountFiles() {
< 	global $ImageFileTypes, $subdir, $rootpath, $tngpath, $searchstring, $folders;
---
> function lCountFiles($validpath) {
> 	global $ImageFileTypes, $subdir, $rootpath, $fulltngpath, $searchstring, $folders;
246c263,264
< 	chdir( "$rootpath$tngpath/" . stripslashes($subdir) );
---
> 	if( $validpath )
> 		chdir( "$fulltngpath/" . stripslashes($subdir) );
254c272
< 						$file_ext = strtoupper( $fileparts["extension"] );
---
> 						$file_ext = isset($fileparts["extension"]) ? strtoupper( $fileparts["extension"] ) : "";
359c377
<     $new_array = [];
---
>     $new_array = array();
diff -r TNG/admin_findmwmedia.php TNG1403/admin_findmwmedia.php
28c28
< 			<td><input type="text" name="searchstring" value="<?php echo $searchstring; ?>" id="searchstring"></td>
---
> 			<td><input type="text" name="searchstring" value="<?php if( isset($searchstring) ) echo $searchstring; ?>" id="searchstring"></td>
35c35
< 	<input type="hidden" name="mediatypeID" value="<?php echo $mediatypeID; ?>" />
---
> 	<input type="hidden" name="mediatypeID" value="<?php if( isset($mediatypeID) ) echo $mediatypeID; ?>" />
diff -r TNG/admin_findreview.php TNG1403/admin_findreview.php
11a12,14
> if(!isset($tree)) $tree = "";
> if(!isset($reviewuser)) $reviewuser = "";
> 
14c17
< 	if( $newsearch ) {
---
> 	if(!empty($newsearch)) {
22c25
< 			$tree = $_SESSION['tng_search_preview_post']['tree'];
---
> 			$tree = isset($_SESSION['tng_search_preview_post']['tree']) ? $_SESSION['tng_search_preview_post']['tree'] : "";
24c27
< 			$reviewuser = $_SESSION['tng_search_preview_post']['user'];
---
> 			$reviewuser = isset($_SESSION['tng_search_preview_post']['user']) ? $_SESSION['tng_search_preview_post']['user'] : "";
26,27c29,30
< 			$page = $_SESSION['tng_search_preview_post']['page'];
< 			$offset = $_SESSION['tng_search_preview_post']['offset'];
---
> 			$page = isset($_SESSION['tng_search_preview_post']['page']) ? $_SESSION['tng_search_preview_post']['page'] : 1;
> 			$offset = isset($_SESSION['tng_search_preview_post']['offset']) ? $_SESSION['tng_search_preview_post']['offset'] : 0;
30,31c33,34
< 			$_SESSION['tng_search_preview_post']['page'] = $page;
< 			$_SESSION['tng_search_preview_post']['offset'] = $offset;
---
> 			$page = isset($_SESSION['tng_search_freview_post']['page']) ? $_SESSION['tng_search_freview_post']['page'] : 1;
> 			$offset = isset($_SESSION['tng_search_freview_post']['offset']) ? $_SESSION['tng_search_freview_post']['offset'] : 0;
38c41
< 	if( $newsearch ) {
---
> 	if(!empty($newsearch)) {
46c49
< 			$tree = $_SESSION['tng_search_freview_post']['tree'];
---
> 			$tree = isset($_SESSION['tng_search_freview_post']['tree']) ? $_SESSION['tng_search_freview_post']['tree'] : "";
48c51
< 			$reviewuser = $_SESSION['tng_search_freview_post']['user'];
---
> 			$reviewuser = isset($_SESSION['tng_search_freview_post']['user']) ? $_SESSION['tng_search_freview_post']['user'] : "";
50,51c53,54
< 			$page = $_SESSION['tng_search_freview_post']['page'];
< 			$offset = $_SESSION['tng_search_freview_post']['offset'];
---
> 			$page = isset($_SESSION['tng_search_freview_post']['page']) ? $_SESSION['tng_search_freview_post']['page'] : 1;
> 			$offset = isset($_SESSION['tng_search_freview_post']['offset']) ? $_SESSION['tng_search_freview_post']['offset'] : 0;
62c65
< 
---
> if(!isset($offset)) $offset = 0;
116d118
< $flags['tabs'] = $tngconfig['tabs'];
129,130d130
< <body background="img/background.gif">
< 
131a132,133
> 	echo tng_adminlayout();
> 
153,155c155,156
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
213c214
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
311,314c312
< </td>
< </tr>
< 
< </table>
---
> </div>
316,318c314,316
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_gedcom2.php TNG1403/admin_gedcom2.php
1a2,3
> @ini_set('zlib.output_compression', 0);
> @ini_set('implicit_flush', 1);
2a5
> //@ob_end_clean();  // causes some servers to destroy the session
41c44,49
< if(!$exportmedia) $exportmedia = 0;
---
> $branchmedia = array();
> if(empty($exportmedia)) $exportmedia = 0;
> if(!isset($exliving)) $exliving = 0;
> if(!isset($exprivate)) $exprivate = 0;
> if(!isset($exnotes)) $exnotes = 0;
> if(!isset($exportmediafiles)) $exportmediafiles = 0;
43d50
< $flags['tabs'] = $tngconfig['tabs'];
45a53
> if(empty($tree)) $tree = "";
50c58,60
< 	eval("\$incl['$msgID'] = \${'incl_" . $msgID . "'};");
---
> 	$incl[$msgID] = !empty(${"incl_" . $msgID});
> 	$exppath[$msgID] = "";
> 	$expdir[$msgID] = 0;
52,55c62,65
< 		eval("\$exppath['$msgID'] = \${'exp_path_" . $msgID . "'};");
< 		if( $exppath[$msgID] ) {
< 			if (get_magic_quotes_gpc() )
< 				$exppath[$msgID] = stripslashes( $exppath[$msgID] );
---
> 		$exppath[$msgID] = ${"exp_path_" . $msgID};
> 		if( !empty($exppath[$msgID]) ) {
> 			//if (get_magic_quotes_gpc() )
> 			//$exppath[$msgID] = stripslashes( $exppath[$msgID] );
71,72d80
< <body background="img/background.gif">
< 
73a82,84
> 	echo tng_adminlayout();
> 
> 	$helplang = findhelp("data_help.php");
76c87
< 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondarymaint'],"second");
---
> 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondary'],"second");
78a90
> 	if(!isset($message)) $message = "";
82,83c94,95
< <div class="lightback pad2">
< <div class="databack normal pad5">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
94c106
< 		$eventID = $cite['eventID'] ? $cite['eventID'] : "NAME";
---
> 		$eventID = $cite['eventID'] ? $cite['eventID'] : "-x--general--x-";
122c134
< 				$citestr = "$level SOUR {$cite['description']}$lineending";
---
> 				$citestr = doNote($level, "SOUR", $cite['description']);
138,141c150,153
< 	if( $row['age'] ) $fact .= "$level AGE {$row['age']}$lineending";
< 	if( $row['agency'] ) $fact .= "$level AGNC {$row['agency']}$lineending";
< 	if( $row['cause'] ) $fact .= "$level CAUS {$row['cause']}$lineending";
< 	if( $row['addressID'] ) {
---
> 	if( !empty($row['age']) ) $fact .= "$level AGE {$row['age']}$lineending";
> 	if( !empty($row['agency']) ) $fact .= "$level AGNC {$row['agency']}$lineending";
> 	if( !empty($row['cause']) ) $fact .= "$level CAUS {$row['cause']}$lineending";
> 	if( !empty($row['addressID']) ) {
145c157
< 		if( $row['tag'] != "ADDR" ) {
---
> 		if( !empty($row['tag']) && $row['tag'] != "ADDR" ) {
193c205
< 	global $notelinks_table, $xnotes_table, $tree, $eventtypes_table, $events_table, $admtext, $xnotes;
---
> 	global $notelinks_table, $xnotes_table, $tree, $eventtypes_table, $events_table, $admtext, $xnotes, $exprivate;
194a207
> 	$exprivatestr = $exprivate ? "AND secret != 1" : "";
200c213
< 		WHERE $notelinks_table.persfamID=\"$id\" AND $notelinks_table.gedcom =\"$tree\"
---
> 		WHERE $notelinks_table.persfamID=\"$id\" AND $notelinks_table.gedcom =\"$tree\" $exprivatestr
207c220
< 		if( !is_array( $notearray[$eventid] ) ) $notearray[$eventid] = array();
---
> 		if( !isset($notearray[$eventid]) || !is_array( $notearray[$eventid] ) ) $notearray[$eventid] = array();
248c261
< 					$offset--;
---
> 					$endnext--;
267c280
< 	global $admtext, $savestate, $fp, $saveimport, $saveimport_table, $tree;
---
> 	global $admtext, $savestate, $fp, $saveimport, $saveimport_table, $tree, $exnotes;
270,291c283,309
< 	$notetxt = str_replace("\r","",$notetxt);
< 	if(!preg_match('/^@.+@$/',$notetxt))
< 		$notetxt = str_replace("@","@@",$notetxt);
< 	$notes = preg_split ( '/\r\n|\n/', $notetxt );
< 	//$note = trim( array_shift( $notes ) );
< 	if($level) {
< 		$note = array_shift( $notes );
< 		$noteinfo .= getNoteLine($level, $label, $note, 1);
< 	}
< 	$level++;
< 	foreach ( $notes as $note ) {
< 		//$note = trim($note);
< 		$noteinfo .= getNoteLine($level,"CONT",$note, 0);
< 	}
< 	if($private) 
< 		$noteinfo .= getNoteLine($level,"_PRIVATE","Y",0);
< 
< 	$savestate['ncount']++;
< 	if( $savestate['ncount'] % 10 == 0 ) {
< 		if( $saveimport ) {
< 			$query = "UPDATE $saveimport_table SET ncount=\"{$savestate['ncount']}\" WHERE gedcom = \"$tree\"";
< 			$saveresult = @tng_query( $query ) or die ($admtext['cannotexecutequery'] . ": $query");
---
> 	if(empty($exnotes) || $label != "NOTE") {
> 		$notetxt = str_replace("\r","",$notetxt);
> 		if(!preg_match('/^@.+@$/',$notetxt))
> 			$notetxt = str_replace("@","@@",$notetxt);
> 		$notes = preg_split ( '/\r\n|\n/', $notetxt );
> 		//$note = trim( array_shift( $notes ) );
> 		if($level) {
> 			$note = array_shift( $notes );
> 			$noteinfo .= getNoteLine($level, $label, $note, 1);
> 		}
> 		$level++;
> 		foreach ( $notes as $note ) {
> 			//$note = trim($note);
> 			$noteinfo .= getNoteLine($level,"CONT",$note, 0);
> 		}
> 		if($private) 
> 			$noteinfo .= getNoteLine($level,"_PRIVATE","Y",0);
> 
> 		if($label == "NOTE") {
> 			$savestate['ncount']++;
> 			if( $savestate['ncount'] % 10 == 0 ) {
> 				if( $saveimport ) {
> 					$query = "UPDATE $saveimport_table SET ncount=\"{$savestate['ncount']}\" WHERE gedcom = \"$tree\"";
> 					$saveresult = @tng_query( $query ) or die ($admtext['cannotexecutequery'] . ": $query");
> 				}
> 				echo "<strong>N{$savestate['ncount']}</strong> ";
> 			}
293d310
< 		echo "<strong>N{$savestate['ncount']}</strong> ";
300c317
< 	global $citations;
---
> 	global $citations, $exnotes;
303,307c320,327
< 	if( is_array( $notes ) ) {
< 		foreach( $notes as $notearray ) {
< 			$noteinfo .= doNote( $level, $label, $notearray['text'], $notearray['private'] );
< 			$id = $notearray['id'];
< 			$noteinfo .= writeCitation( $citations[$id], $level + 1 );
---
> 	if(empty($exnotes) || $label != "NOTE") {
> 		if( is_array( $notes ) ) {
> 			foreach( $notes as $notearray ) {
> 				$noteinfo .= doNote( $level, $label, $notearray['text'], $notearray['private'] );
> 				$id = $notearray['id'];
> 				if( !empty($citations[$id]) )
> 					$noteinfo .= writeCitation( $citations[$id], $level + 1 );
> 			}
308a329,330
> 		elseif( $notes )
> 			$noteinfo .= doNote( $level, $label, $notes );
310,311d331
< 	elseif( $notes )
< 		$noteinfo .= doNote( $level, $label, $notes );
316c336
< 	global $xnotes_table, $tree, $admtext, $savestate, $tngconfig, $xnotes, $exliving, $exprivate;
---
> 	global $xnotes_table, $tree, $admtext, $savestate, $tngconfig, $xnotes, $exliving, $exprivate, $exnotes;
320,330c340,352
< 	//if excluding private or living
< 		//join xnotes and notelinks
< 	if($branch || $exliving || $exprivate) {
< 		if( $xnotes ) {
< 			$xnoteinfo = "";
< 			foreach ( $xnotes as $xnote ) {
< 				$query = "SELECT note, noteID FROM $xnotes_table WHERE gedcom =\"$tree\" AND noteID = \"$xnote\" ORDER BY noteID";
< 				$xnotearray = tng_query($query);
< 				$xnotetxt = tng_fetch_assoc( $xnotearray );
< 				$xnotestr .= writeXNote($xnotetxt);
< 				tng_free_result( $xnotearray );
---
> 	if(empty($exnotes)) {
> 		//if excluding private or living
> 			//join xnotes and notelinks
> 		if( !empty($branch) || $exliving || $exprivate) {
> 			if( $xnotes ) {
> 				$xnoteinfo = "";
> 				foreach ( $xnotes as $xnote ) {
> 					$query = "SELECT note, noteID FROM $xnotes_table WHERE gedcom =\"$tree\" AND noteID = \"$xnote\" ORDER BY noteID";
> 					$xnotearray = tng_query($query);
> 					$xnotetxt = tng_fetch_assoc( $xnotearray );
> 					$xnotestr .= writeXNote($xnotetxt);
> 					tng_free_result( $xnotearray );
> 				}
333,335c355,356
< 	}
< 	else {
< 		$prefixlen = strlen( $tngconfig['noteprefix'] ) + 1;
---
> 		else {
> 			$prefixlen = strlen( $tngconfig['noteprefix'] ) + 1;
337,340c358,363
< 		$query = "SELECT note, noteID, (0+SUBSTRING(noteID,$prefixlen)) as num FROM $xnotes_table WHERE gedcom =\"$tree\" AND noteID != \"\" {$savestate['wherestr']} ORDER BY num";
< 		$xnotearray = tng_query($query);
< 		while( $xnotetxt = tng_fetch_assoc( $xnotearray ) ) {
< 			$xnotestr .= writeXNote($xnotetxt);
---
> 			$query = "SELECT note, noteID, (0+SUBSTRING(noteID,$prefixlen)) as num FROM $xnotes_table WHERE gedcom =\"$tree\" AND noteID != \"\" {$savestate['wherestr']} ORDER BY num";
> 			$xnotearray = tng_query($query);
> 			while( $xnotetxt = tng_fetch_assoc( $xnotearray ) ) {
> 				$xnotestr .= writeXNote($xnotetxt);
> 			}
> 			tng_free_result( $xnotearray );
342d364
< 		tng_free_result( $xnotearray );
349c371
< 	global $tree, $admtext, $savestate, $lineending, $citations, $fp, $saveimport, $saveimport_table;
---
> 	global $tree, $admtext, $savestate, $lineending, $citations, $fp, $saveimport, $saveimport_table, $level;
357c379,380
< 	$xnotestr .= writeCitation( $citations['NAME'], $level + 2 );
---
> 	if( !empty($citations['NAME']) )
> 		$xnotestr .= writeCitation( $citations['NAME'], $level + 2 );
365,366c388,389
< 		$savestate['offset'] = ftell($fp);
< 		$query = "UPDATE $saveimport_table SET offset={$savestate['offset']}, lasttype={$savestate['lasttype']}, lastid=\"{$xnotetxt['noteID']}\" WHERE gedcom = \"$tree\"";
---
> 		$savestate['fileoffset'] = ftell($fp);
> 		$query = "UPDATE $saveimport_table SET fileoffset={$savestate['fileoffset']}, lasttype={$savestate['lasttype']}, lastid=\"{$xnotetxt['noteID']}\" WHERE gedcom = \"$tree\"";
387c410
< 		$query = "SELECT notes, altnotes, description, altdescription, path, $media_table.mediaID, mediatypeID, eventID, form, abspath, defphoto 
---
> 		$query = "SELECT notes, altnotes, description, altdescription, path, $media_table.mediaID, mediatypeID, eventID, form, abspath, defphoto, usecollfolder 
395c418
< 			if(isset($incl[$mediatypeID]) || $resume) {
---
> 			if($incl[$mediatypeID] || $resume) {
399a423
> 					$prow['orgpath'] = "";
401a426
> 					$prow['orgpath'] = $prow['path'];
407c432
< 						$prow['form'] = $matches[1];
---
> 						$prow['form'] = isset($matches[1]) ? $matches[1] : "";
418c443
< 				if( !is_array($allmedia[$eventID]) )
---
> 				if( !isset($allmedia[$eventID]) || !is_array($allmedia[$eventID]) )
430c455
< 	global $lineending, $savestate, $mediatypeObjs, $fp, $saveimport, $saveimport_table, $admtext;
---
> 	global $lineending, $savestate, $mediatypeObjs, $fp, $saveimport, $saveimport_table, $admtext, $branch, $branchmedia, $tree, $exportmediafiles;
442a468,474
> 					if($branch) {
> 						$type = $media['mediatypeID'];
> 						if(!isset($branchmedia[$type]))
> 							$branchmedia[$type] = array();
> 						if(!in_array($media,$branchmedia[$type]))
> 							array_push($branchmedia[$type], $media);
> 					}
453a486,487
> 						if($exportmediafiles && !empty($media['orgpath']))
> 							writeToMediaList($media);
465c499
< 						$linktxt .= "$newlevel _TYPE $exportas$lineending";
---
> 						$linktxt .= "$newlevel TYPE $exportas$lineending";
470,471c504,505
< 								$savestate['offset'] = ftell($fp);
< 								$query = "UPDATE $saveimport_table SET offset={$savestate['offset']}, lasttype={$savestate['lasttype']}, lastid=\"{$media['mediaID']}\", scount=\"{$savestate['mcount']}\" WHERE gedcom = \"$tree\"";
---
> 								$savestate['fileoffset'] = ftell($fp);
> 								$query = "UPDATE $saveimport_table SET fileoffset={$savestate['fileoffset']}, lasttype={$savestate['lasttype']}, lastid=\"{$media['mediaID']}\", scount=\"{$savestate['mcount']}\" WHERE gedcom = \"$tree\"";
484a519,528
> function writeToMediaList( $media ) {
> 	global $mediafp, $rootpath, $mediapath, $mediatypes_assoc;
> 
> 	//make sure full server path is included; also include full local path
> 	//when zipping, put in folders if needed
> 	$mediatype = $media['mediatypeID'];
> 	$mediafolder = $media['usecollfolder'] ? $mediatypes_assoc[$mediatype] : $mediapath;
> 	fwrite($mediafp, "{$mediafolder}/{$media['orgpath']}\n");
> }
> 
492c536
< 	if( $cright['both'] ) {
---
> 	if( $crights['both'] ) {
551c595
< 	if( $notes[$tag] )
---
> 	if( !empty($notes[$tag]) )
553c597
< 	if( $media[$tag] )
---
> 	if( !empty($media[$tag]) )
618c662
< 						$query = "SELECT birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, deathdatetr, burialdatetr from $people_table WHERE gedcom = \"$tree\" AND personID = \"{$child['personID']}\"$exlivingstr$exprivatestr";
---
> 						$query = "SELECT birthdate, birthdatetr, birthplace, altbirthtype, altbirthdate, altbirthdatetr, altbirthplace, deathdatetr, burialdatetr from $people_table WHERE gedcom = \"$tree\" AND personID = \"{$child['personID']}\"$exlivingstr$exprivatestr";
632c676
< 	$query = "SELECT sealdate, sealplace, $people_table.personID as personID, familyID, $people_table.gedcom as gedcom 
---
> 	$query = "SELECT sealdate, sealplace, $people_table.personID as personID, familyID, $people_table.gedcom as gedcom, $people_table.branch, $people_table.birthdate, $people_table.birthdatetr, $people_table.altbirthtype, $people_table.altbirthdate, $people_table.altbirthdatetr, $people_table.deathdate, $people_table.deathdatetr, $people_table.living, $people_table.private
657a702,703
> 		if(empty($ind['altbirthtype'])) $ind['altbirthtype'] = "CHR";
> 
672c718
< 				if( $indnotes['NPFX'] )
---
> 				if( !empty($indnotes['NPFX']) )
677c723
< 				if( $indnotes['NSFX'] )
---
> 				if( !empty($indnotes['NSFX']) )
682c728
< 				if( $indnotes['NICK'] )
---
> 				if( !empty($indnotes['NICK']) )
685c731
< 			if( $citations['NAME'] )
---
> 			if( !empty($citations['NAME']) )
689c735
< 				if( $indnotes['TITL'] )
---
> 				if( !empty($indnotes['TITL']) )
697c743
< 			if( $citations['-x--general--x-'] )
---
> 			if( !empty($citations['-x--general--x-']) )
706c752
< 			if( $ind['birthdate'] || $ind['birthplace'] || $indnotes['BIRT'] || $citations['BIRT'] || $extras['BIRT'] ) {
---
> 			if( $ind['birthdate'] || $ind['birthplace'] || !empty($indnotes['BIRT']) || !empty($citations['BIRT']) || !empty($extras['BIRT']) ) {
715c761
< 				if( $citations['BIRT'] )
---
> 				if( !empty($citations['BIRT']) )
717c763,764
< 				$info .= $extras['BIRT'];
---
> 				if( !empty($extras['BIRT']) )
> 					$info .= $extras['BIRT'];
719c766
< 			if( $ind['altbirthdate'] || $ind['altbirthplace'] || $indnotes['CHR'] || $citations['CHR'] || $extras['CHR'] ) {
---
> 			if( $ind['altbirthdate'] || $ind['altbirthplace'] || !empty($indnotes[$ind['altbirthtype']]) || !empty($citations[$ind['altbirthtype']]) || !empty($extras[$ind['altbirthtype']]) ) {
721c768
< 					$info .= "1 CHR Y$lineending";
---
> 					$info .= "1 {$ind['altbirthtype']} Y$lineending";
723c770
< 					$info .= "1 CHR$lineending";
---
> 					$info .= "1 {$ind['altbirthtype']}$lineending";
727,730c774,778
< 				$info .= doNotesAndMedia($indnotes, $indmedia, "CHR", 2 );
< 				if( $citations['CHR'] )
< 					$info .= writeCitation( $citations['CHR'], 2 );
< 				$info .= $extras['CHR'];
---
> 				$info .= doNotesAndMedia($indnotes, $indmedia, $ind['altbirthtype'], 2 );
> 				if( !empty($citations[$ind['altbirthtype']]) )
> 					$info .= writeCitation( $citations[$ind['altbirthtype']], 2 );
> 				if( !empty($extras[$ind['altbirthtype']]) )
> 					$info .= $extras[$ind['altbirthtype']];
733c781
< 		if( $ind['deathdate'] || $ind['deathplace'] || $indnotes['DEAT'] || $citations['DEAT'] || $extras['DEAT'] ) {
---
> 		if( $ind['deathdate'] || $ind['deathplace'] || !empty($indnotes['DEAT']) || !empty($citations['DEAT']) || !empty($extras['DEAT']) ) {
742c790
< 			if( $citations['DEAT'] )
---
> 			if( !empty($citations['DEAT']) )
744c792,793
< 			$info .= $extras['DEAT'];
---
> 			if( !empty($extras['DEAT']) )
> 				$info .= $extras['DEAT'];
746c795
< 		if( $ind['burialdate'] || $ind['burialplace'] || $indnotes['BURI'] || $citations['BURI'] || $extras['BURI'] ) {
---
> 		if( $ind['burialdate'] || $ind['burialplace'] || !empty($indnotes['BURI']) || !empty($citations['BURI']) || !empty($extras['BURI']) ) {
756c805
< 			if( $citations['BURI'] )
---
> 			if( !empty($citations['BURI']) )
758c807,808
< 			$info .= $extras['BURI'];
---
> 			if( !empty($extras['BURI']) )
> 				$info .= $extras['BURI'];
760d809
< 		$info .= $parentdata;
769c818
< 				if( $citations[$eventID] )
---
> 				if( !empty($citations[$eventID]) )
775,778c824,827
< 				$info .= doLDSEvent("BAPL", "bapt", $indnotes, $indmedia, $citations['BAPL'], $extras['BAPL'], $ind);
< 				$info .= doLDSEvent("CONL", "conf", $indnotes, $indmedia, $citations['CONL'], $extras['CONL'], $ind);
< 				$info .= doLDSEvent("INIT", "init", $indnotes, $indmedia, $citations['INIT'], $extras['INIT'], $ind);
< 				$info .= doLDSEvent("ENDL", "endl", $indnotes, $indmedia, $citations['ENDL'], $extras['ENDL'], $ind);
---
> 				$info .= doLDSEvent("BAPL", "bapt", $indnotes, $indmedia, $ind);
> 				$info .= doLDSEvent("CONL", "conf", $indnotes, $indmedia, $ind);
> 				$info .= doLDSEvent("INIT", "init", $indnotes, $indmedia, $ind);
> 				$info .= doLDSEvent("ENDL", "endl", $indnotes, $indmedia, $ind);
782c831
< 			if( $indnotes['-x--general--x-'] )
---
> 			if( !empty($indnotes['-x--general--x-']) )
785c834
< 			if( $indmedia['-x--general--x-'] )
---
> 			if( !empty($indmedia['-x--general--x-']) )
805,806c854,855
< function doLDSEvent($tag, $key, $notes, $media, $citations, $extras, $row) {
< 	global $lineending;
---
> function doLDSEvent($tag, $key, $notes, $media, $row) {
> 	global $lineending, $citations, $extras;
810c859
< 	if( $ind[$key.'date'] || $ind[$key.'place'] ) {
---
> 	if( $row[$key.'date'] || $row[$key.'place'] ) {
825,827c874,877
< 		if( $citations )
< 			$event .= writeCitation( $citations, 2 );
< 		$event .= $extras;
---
> 		if( !empty($citations[$key]) )
> 			$event .= writeCitation( $citations[$key], 2 );
> 		if( !empty($extras[$key]) )
> 			$event .= $extras[$key];
872,885d921
< 			//look up husband and wife
< 			$query = "SELECT personID, living, private, gedcom, branch FROM $people_table WHERE personID = \"{$family['husband']}\" AND gedcom = \"$tree\"";
< 			$result2 = tng_query($query);
< 			$hrow = tng_fetch_assoc($result2);
< 			$frights = determineLivingPrivateRights($hrow, $righttree);
< 			if($frights['both']) {
< 				$query = "SELECT personID, living, private, gedcom, branch FROM $people_table WHERE personID = \"{$family['wife']}\" AND gedcom = \"$tree\"";
< 				$result2 = tng_query($query);
< 				$wrow = tng_fetch_assoc($result2);
< 				$frights = determineLivingPrivateRights($wrow, $righttree);
< 			}
< 			tng_free_result($result2);
< 		}
< 		if( $frights['both'] ) {
890c926
< 			if( $family['marrdate'] || $family['marrplace'] || $famnotes['MARR'] || $citations['MARR'] || $extras['MARR'] || $family['marrtype'] ) {
---
> 			if( $family['marrdate'] || $family['marrplace'] || !empty($famnotes['MARR']) || !empty($citations['MARR']) || !empty($extras['MARR']) || !empty($family['marrtype']) ) {
900c936
< 				if( $citations['MARR'] )
---
> 				if( !empty($citations['MARR']) )
902c938,939
< 				$info .= $extras['MARR'];
---
> 				if( !empty($extras['MARR']) )
> 					$info .= $extras['MARR'];
904c941
< 			if( $family['divdate'] || $family['divplace'] || $famnotes['DIV'] || $citations['DIV'] || $extras['DIV'] ) {
---
> 			if( $family['divdate'] || $family['divplace'] || !empty($famnotes['DIV']) || !empty($citations['DIV']) || !empty($extras['DIV']) ) {
913c950
< 				if( $citations['DIV'] )
---
> 				if( !empty($citations['DIV']) )
915c952,953
< 				$info .= $extras['DIV'];
---
> 				if( !empty($extras['DIV']) )
> 					$info .= $extras['DIV'];
924c962
< 				if( $citations[$eventID] )
---
> 				if( !empty($citations[$eventID]) )
952c990
< 			if( $citations['NAME'] )
---
> 			if( !empty($citations['NAME']) )
955c993
< 			if( $famnotes['-x--general--x-'] )
---
> 			if( !empty($famnotes['-x--general--x-']) )
958c996
< 			if( $fammedia['-x--general--x-'] )
---
> 			if( !empty($fammedia['-x--general--x-']) )
989c1027
< 					if($branch)
---
> 					if($branch && trim($source['repoID']))
1000c1038
< 		if($sourceprefix) {
---
> 		if( !empty($tngconfig['sourceprefix']) ) {
1037c1075
< 	$query = "SELECT tag, description, eventdate, eventplace, info FROM $events_table, $eventtypes_table WHERE persfamID = \"{$source['sourceID']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND type = \"S\" AND gedcom = \"$tree\" AND keep = \"1\" ORDER BY ordernum";
---
> 	$query = "SELECT tag, description, eventdate, eventplace, info, eventID FROM $events_table, $eventtypes_table WHERE persfamID = \"{$source['sourceID']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND type = \"S\" AND gedcom = \"$tree\" AND keep = \"1\" ORDER BY ordernum";
1048c1086
< 	if( $srcnotes['-x--general--x-'] )
---
> 	if( !empty($srcnotes['-x--general--x-']) )
1051c1089
< 	if( $srcmedia['-x--general--x-'] )
---
> 	if( !empty($srcmedia['-x--general--x-']) )
1056,1057c1094,1095
< 		$savestate['offset'] = ftell($fp);
< 		$query = "UPDATE $saveimport_table SET offset={$savestate['offset']}, lasttype={$savestate['lasttype']}, lastid=\"{$source['sourceID']}\", scount=\"{$savestate['scount']}\" WHERE gedcom = \"$tree\"";
---
> 		$savestate['fileoffset'] = ftell($fp);
> 		$query = "UPDATE $saveimport_table SET fileoffset={$savestate['fileoffset']}, lasttype={$savestate['lasttype']}, lastid=\"{$source['sourceID']}\", scount=\"{$savestate['scount']}\" WHERE gedcom = \"$tree\"";
1110c1148
< 	global $tree, $events_table, $eventtypes_table, $admtext, $savestate, $lineending, $saveimport_table;
---
> 	global $tree, $events_table, $eventtypes_table, $admtext, $savestate, $lineending, $saveimport, $saveimport_table, $fp;
1127c1165
< 	if( $reponotes['-x--general--x-'] )
---
> 	if( !empty($reponotes['-x--general--x-']) )
1130c1168
< 	if( $repomedia['-x--general--x-'] )
---
> 	if( !empty($repomedia['-x--general--x-']) )
1135,1136c1173,1174
< 		$savestate['offset'] = ftell($fp);
< 		$query = "UPDATE $saveimport_table SET offset={$savestate['offset']}, lasttype={$savestate['lasttype']}, lastid=\"{$repo['repoID']}\", rcount=\"{$savestate['rcount']}\" WHERE gedcom = \"$tree\"";
---
> 		$savestate['fileoffset'] = ftell($fp);
> 		$query = "UPDATE $saveimport_table SET fileoffset={$savestate['fileoffset']}, lasttype={$savestate['lasttype']}, lastid=\"{$repo['repoID']}\", rcount=\"{$savestate['rcount']}\" WHERE gedcom = \"$tree\"";
1185c1223
< 	    $query = "SELECT $medialinks_table.personID as place, $places_table.notes as notes, latitude, longitude
---
> 	    $query = "SELECT $medialinks_table.personID as place, $places_table.notes as notes, latitude, longitude, placelevel, zoom
1190c1228
< 	        if(!in_array($place,$places))
---
> 	        if(!in_array($row,$places))
1217,1218c1255,1256
< 				$savestate['offset'] = ftell($fp);
< 				$query = "UPDATE $saveimport_table SET offset={$savestate['offset']}, lasttype={$savestate['lasttype']}, lastid=\"" . addslashes($place['place']) . "\", pcount=\"{$savestate['pcount']}\" WHERE gedcom = \"$tree\"";
---
> 				$savestate['fileoffset'] = ftell($fp);
> 				$query = "UPDATE $saveimport_table SET fileoffset={$savestate['fileoffset']}, lasttype={$savestate['lasttype']}, lastid=\"" . addslashes($place['place']) . "\", pcount=\"{$savestate['pcount']}\" WHERE gedcom = \"$tree\"";
1229c1267,1269
< 	$media = getMediaLinks("");
---
> 	global $branchmedia;
> 
> 	$media = count($branchmedia) ? $branchmedia : getMediaLinks("");
1237c1277
< 	echo "<p>{$admtext['ifexportfails']} <a href=\"admin_gedcom2.php?tree=$tree&amp;resume=1\">{$admtext['clickresume']}</a>.</p>$lineending";
---
> 	echo "<p>{$admtext['ifexportfails']} <a href=\"admin_gedcom2.php?tree=$tree&amp;exliving=$exliving&amp;exprivate=$exprivate&amp;exnotes=$exnotes&amp;exportmedia=$exportmedia&amp;exportmediafiles=$exportmediafiles&amp;resume=1\">{$admtext['clickresume']}</a>.</p>$lineending";
1243c1283,1286
< $filename = "$rootpath$gedpath/$tree.ged";
---
> $fullgedpath = !empty($tngimpcfg['saveconfig']) ? $subroot . $gedpath : $rootpath . $gedpath;
> $filename = "$fullgedpath/$tree.ged";
> $zipfilename = "$fullgedpath/$tree.zip";
> $medialist = "$fullgedpath/medialist_$tree.txt";
1248,1249c1291,1292
< 	if( $resume ) {
< 		$checksql = "SELECT filename, offset, lasttype, lastid, icount, fcount, scount, ncount, rcount, mcount, pcount, media from $saveimport_table WHERE gedcom = \"$tree\"";
---
> 	if( !empty($resume) ) {
> 		$checksql = "SELECT filename, fileoffset, lasttype, lastid, icount, fcount, scount, ncount, rcount, mcount, pcount, media from $saveimport_table WHERE gedcom = \"$tree\"";
1255c1298
< 			$savestate['offset'] = $row['offset'];
---
> 			$savestate['fileoffset'] = $row['fileoffset'];
1309c1352
< 		$sql = "INSERT INTO $saveimport_table (filename, offset, gedcom, media)  VALUES(\"$filename\", 0, \"$tree\", \"$exportmedia\")";
---
> 		$sql = "INSERT INTO $saveimport_table (filename, fileoffset, gedcom, media)  VALUES(\"$filename\", 0, \"$tree\", \"$exportmedia\")";
1315c1358
< 	fseek( $fp, $savestate['offset'] );
---
> 	fseek( $fp, $savestate['fileoffset'] );
1318a1362
> 	if( file_exists( $medialist ) ) unlink( $medialist );
1332a1377,1378
> $mediafp = @fopen( $medialist, "a" );
> 
1345,1346c1391,1392
< 	$owneremail = $treerow['email'] ? $treerow['email'] : $emailaddr;
< 	$ownername = $treerow['owner'] ? $treerow['owner'] : $dbowner;
---
> 	$owneremail = !empty($treerow['email']) ? $treerow['email'] : $emailaddr;
> 	$ownername = !empty($treerow['owner']) ? $treerow['owner'] : $dbowner;
1356c1402
< 	. "2 VERS 5.5$lineending"
---
> 	. "2 VERS 5.5.1$lineending"
1369,1371c1415,1417
< $branchstr = $branch ? " AND branch LIKE \"%$branch%\"" : "";
< $exlivingstr = $exliving ? " AND living != \"1\"" : "";
< $exprivatestr = $exprivate ? " AND private != \"1\"" : "";
---
> $branchstr = !empty($branch) ? " AND branch LIKE \"%$branch%\"" : "";
> $exlivingstr = !empty($exliving) ? " AND living != \"1\"" : "";
> $exprivatestr = !empty($exprivate) ? " AND private != \"1\"" : "";
1387c1433,1434
< 		$query = "SELECT personID, $numstr as num, lastname, lnprefix, firstname, sex, title, prefix, suffix, nickname, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, burialtype, baptdate, baptplace, endldate, endlplace, famc, living, private, branch, DATE_FORMAT(changedate,\"%d %b %Y\") as changedate FROM $people_table
---
> 		if( !isset($savestate['wherestr']) ) $savestate['wherestr'] = "";
> 		$query = "SELECT personID, $numstr as num, lastname, lnprefix, firstname, sex, title, prefix, suffix, nickname, birthdate, birthdatetr, birthplace, altbirthtype, altbirthdate, altbirthdatetr, altbirthplace, deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, burialtype, baptdate, baptplace, confdate, confplace, initdate, initplace, endldate, endlplace, famc, living, private, branch, gedcom, DATE_FORMAT(changedate,\"%d %b %Y\") as changedate FROM $people_table
1396,1397c1443,1444
< 						$savestate['offset'] = ftell($fp);
< 						$query = "UPDATE $saveimport_table SET offset={$savestate['offset']}, lasttype={$savestate['lasttype']}, lastid=\"{$ind['personID']}\", icount=\"{$savestate['icount']}\" WHERE gedcom = \"$tree\"";
---
> 						$savestate['fileoffset'] = ftell($fp);
> 						$query = "UPDATE $saveimport_table SET fileoffset={$savestate['fileoffset']}, lasttype={$savestate['lasttype']}, lastid=\"{$ind['personID']}\", icount=\"{$savestate['icount']}\" WHERE gedcom = \"$tree\"";
1417c1464
< 		if($familyprefix) {
---
> 		if( !empty($tngconfig['familyprefix']) ) {
1422c1469
< 			$numstr = "(0+SUBSTRING_INDEX(familyID,\"{\$tngconfig['familyprefix']}\",1))";
---
> 			$numstr = "(0+SUBSTRING_INDEX(familyID,\"{\$tngconfig['familysuffix']}\",1))";
1434,1435c1481,1482
< 						$savestate['offset'] = ftell($fp);
< 						$query = "UPDATE $saveimport_table SET offset={$savestate['offset']}, lasttype={$savestate['lasttype']}, lastid=\"{$fam['familyID']}\", fcount=\"{$savestate['fcount']}\" WHERE gedcom = \"$tree\"";
---
> 						$savestate['fileoffset'] = ftell($fp);
> 						$query = "UPDATE $saveimport_table SET fileoffset={$savestate['fileoffset']}, lasttype={$savestate['lasttype']}, lastid=\"{$fam['familyID']}\", fcount=\"{$savestate['fcount']}\" WHERE gedcom = \"$tree\"";
1482a1530,1550
> 
> $gotzip = false;
> if($exportmediafiles) {
> 	$paths = file($medialist);
> 	if(count($paths)) {
> 		$zip = new ZipArchive;
> 		$res = $zip->open($zipfilename, ZipArchive::CREATE);
> 		if($res === TRUE) {
> 			$zip->addFile($filename, "$tree.ged");
> 			foreach($paths as $path) {
> 				$path = trim($path);
> 				if(file_exists($rootpath . $path))
>                 	$zip->addFile($rootpath . $path, $path);
> 				else
>                 	echo "<br /><strong>" . $admtext['cannotopen'] . ":&nbsp; " . $rootpath . $path . "</strong>\n";
> 			}
> 			$zip->close();
> 			$gotzip = true;
> 		}
> 	}
> }
1488a1557
> 	if( file_exists( $medialist ) ) unlink( $medialist );
1492c1561,1574
< <p class="normal"><a href="<?php echo "$gedpath/$tree" . ".ged" ?>" download><?php echo $admtext['downloadged']; ?></a></p>
---
> <?php
> 	if(empty($tngimpcfg['saveconfig'])){
> ?>
> <p class="normal">
> 	<a href="<?php echo "$gedpath/$tree" . ".ged" ?>" download><?php echo $admtext['downloadged']; ?></a>
> <?php
> 	if($gotzip) {
> 		echo "\n<br/><a href=\"{$gedpath}/{$tree}.zip\" download>{$admtext['downloadzip']}</a>\n";
> 	}
> ?>
> </p>
> <?php
> 	}
> ?>
1496,1498c1578,1580
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_gedimport_eventtypes.php TNG1403/admin_gedimport_eventtypes.php
27a28
> $helplang = findhelp("data_help.php");
29d29
< $flags['tabs'] = $tngconfig['tabs'];
34d33
< <body background="img/background.gif">
35a35,36
> 	echo tng_adminlayout();
> 
38c39
< 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondarymaint'],"second");
---
> 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondary'],"second");
41c42
< 	echo displayHeadline($admtext['datamaint'] . " &gt;&gt; " . $admtext['gedimport'],"img/data_icon.gif",$menu,$message);
---
> 	echo displayHeadline($admtext['datamaint'] . " &gt;&gt; " . $admtext['gedimport'], "img/data_icon.gif", $menu, (isset($message) ? $message : ""));
43,44c44,45
< <div class="lightback pad2">
< <div class="databack normal pad5">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
59c60,61
< 	$localfile = $gedpath == "admin" || $gedpath == "" ? $database : "$rootpath$gedpath/$database";
---
> 	$fullgedpath = !empty($tngimpcfg['saveconfig']) ? $subroot . $gedpath : $rootpath . $gedpath;
> 	$localfile = $gedpath == "admin" || $gedpath == "" ? $database : "$fullgedpath/$database";
166c168
< 						$display = $admtext[$tag] ? $admtext[$tag] : $tag;
---
> 						$display = isset($admtext[$tag]) ? $admtext[$tag] : $tag;
183c185
< 		$id = $matches[1];
---
> 		$id = isset($matches[1]) ? $matches[1] : "";
219c221
< echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; 
---
> echo tng_adminfooter();
221,222d222
< </body>
< </html>
diff -r TNG/admin_gedimport.php TNG1403/admin_gedimport.php
1a2,3
> @ini_set('zlib.output_compression', 0);
> @ini_set('implicit_flush', 1);
4a7
> @ob_end_clean();
20a24,26
> if( empty($tree) && empty($tree1) ) 
> 	exit;
> 
39a46,47
> $fullgedpath = !empty($tngimpcfg['saveconfig']) ? $subroot . $gedpath : $rootpath . $gedpath;
> 
43a52
> if(!isset($del)) $del = "";
47a57,90
> function initEvent() {
> 	$event = array();
> 	$event['DATE'] = "";
> 	$event['PLAC'] = "";
> 	$event['TEMP'] = "";
> 	$event['SOUR'] = "";
> 	$event['FAMC'] = "";
> 	$event['TYPE'] = "";
> 	$event['DATETR'] = "0000-00-00";
> 	$event['parent'] = "";
> 
> 	return $event;
> }
> 
> function initEventHolder() {
> 	$event = array();
> 	$event['INFO'] = initCustomEvent();
> 	$event['TAG'] = "";
> 	$event['TYPE'] = "";
> 
> 	return $event;
> }
> 
> function initCustomEvent() {
> 	$event = initEvent();
> 
> 	$event['AGE'] = "";
> 	$event['AGNC'] = "";
> 	$event['CAUS'] = "";
> 	$event['ADDR'] = "";
> 
> 	return $event;
> }
> 
83d125
< $flags['tabs'] = $tngconfig['tabs'];
88,89d129
< <body background="img/background.gif">
< 
91c131,143
< 	if($old) {
---
> 	if(!empty($old)) {
> 		echo tng_adminlayout();
> 		$helplang = findhelp("data_help.php");
> 		
> 		$allow_export = 1;
> 		if( !$allow_ged && $assignedtree ) {
> 			$query = "SELECT disallowgedcreate FROM $trees_table WHERE gedcom = \"$assignedtree\"";
> 			$disresult = tng_query($query);
> 			$row = tng_fetch_assoc( $disresult );
> 			if($row['disallowgedcreate'])
> 				$allow_export = 0;
> 			tng_free_result($disresult);
> 		}
94c146
< 		$datatabs['2'] = array(1,"admin_secondmenu.php",$admtext['secondarymaint'],"second");
---
> 		$datatabs['2'] = array(1,"admin_secondmenu.php",$admtext['secondary'],"second");
101a154,157
> 	else {
> 		echo "<body>\n";
> 		echo "<div id=\"maincontent\">\n";
> 	}
108c164
< $pciteevents = array("NAME","BIRT","CHR","DEAT","BURI","BAPL","CONL","INIT","ENDL","SLGC");
---
> $pciteevents = array("NAME","BIRT","ALTBE","DEAT","BURI","BAPL","CONL","INIT","ENDL","SLGC");
110a167,169
> if(!empty($importmedia))
> 	initMediaTypes();
> 
112c171
< 	global $rootpath, $gedpath, $savegedfilename, $basefilename;
---
> 	global $rootpath, $fullgedpath, $savegedfilename, $basefilename, $photopath, $importmedia, $mediatypes_assoc, $tree, $tngconfig, $wholepath;
113a173,174
> 	$newgedfilename = $gedfilename;
> 	$treestr = $tngconfig['mediatrees'] && $tree ? ("/" . $tree) : "";
120,121c181
< 					$zip->extractTo("$rootpath$gedpath",$zfile);
< 					unlink($gedfilename);
---
> 					$zip->extractTo($fullgedpath, $zfile);
123,124c183,209
< 					$gedfilename = "$rootpath$gedpath/$zfile";
< 					break;
---
> 					$newgedfilename = "$fullgedpath/$zfile";
> 					if(empty($importmedia))
> 						break;
> 				}
> 				elseif(!empty($importmedia)) { //send all others to photos path as media
> 					if(strpos($zfile, "\\") !== false) {
> 						$needtocopy = true;
> 						$zcopy = str_replace('\\', '/', $zfile);
> 					}
> 					else {
> 						$needtocopy = false;
> 						$zcopy = $zfile;
> 					}
> 					if(!$wholepath || !array_search(strtok($zcopy,"/"), $mediatypes_assoc)) {
> 						$zfileinfo = pathinfo($zcopy);
> 						$destination = $rootpath . $photopath . $treestr;
> 						$filename = $zfileinfo['basename'];
> 					}
> 					else {
> 						$destination = $rootpath;
> 						$filename = $zcopy;
> 					}
> 
> 					if($needtocopy)
> 						copy("zip://".$gedfilename."#".$zfile, $destination . "/" . $filename);
> 					else
> 						$zip->extractTo($destination, $filename);
130c215
< 	return $gedfilename;
---
> 	return $newgedfilename;
137,139c222,231
< $openmsg = "";
< $clearedtogo = "false";
< if( $remotefile && $remotefile != "none" ) {
---
> $errormsg = "";
> $gedfilename = "";
> $clearedtogo = false;
> 
> if($saveimport && empty($resuming)) {
> 	$query = "DELETE from $saveimport_table";
> 	$result = tng_query($query);
> }
> 
> if( !empty($remotefile) && $remotefile != "none" ) {
141c233
< 	$gedfilename = "$rootpath$gedpath/$basefilename";
---
> 	$gedfilename = "$fullgedpath/$basefilename";
151,152c243,245
< 		if( $fp === false )
< 			$openmsg = $admtext['cannotopen'] . " $basefilename. " . $admtext['umps'];
---
> 		if( $fp === false ) {
> 			$errormsg = $admtext['cannotopen'] . " $basefilename. " . $admtext['umps'];
> 		}
155d247
< 			$openmsg = $admtext['importinggedcom'];
157,158c249,250
< 			$clearedtogo = "true";
< 			if($old)
---
> 			$clearedtogo = true;
> 			if(!empty($old))
162,163c254,256
< 	else
< 		$openmsg = $admtext['cannotupload'] . " " . $_FILES['remotefile']['name']. ". " . $admtext['invfperms'];
---
> 	else {
> 		$errormsg = $admtext['cannotupload'] . " " . $_FILES['remotefile']['name']. ". " . $admtext['invfperms'];
> 	}
165,166c258,259
< elseif( $database ) {
< 	$gedfilename = $gedpath == "admin" || $gedpath == "" ? $database : "$rootpath$gedpath/$database";
---
> elseif( !empty($database) ) {
> 	$gedfilename = $gedpath == "admin" || $gedpath == "" ? $database : "$fullgedpath/$database";
168a262
> 	$orgname = $gedfilename;
169a264
> 	//echo "opening $gedfilename ";
172,173c267,269
< 	if( $fp === false )
< 		$openmsg = $admtext['cannotopen'] . " $database";
---
> 	if( $fp === false ) {
> 		$errormsg = $admtext['cannotopen'] . " $database";
> 	}
176d271
< 		$openmsg = $admtext['importinggedcom'];
178,179c273,274
< 		$clearedtogo = "true";
< 		if($old)
---
> 		$clearedtogo = true;
> 		if(!empty($old))
183,184c278,279
< elseif(!$resuming)
< 	$openmsg = $admtext['cannotopen'] . ". " . $admtext['umps'];
---
> elseif(!empty($resuming) && !$resuming)
> 	$errormsg = $admtext['cannotopen'] . ". " . $admtext['umps'];
208,217d302
< 		//get all medialinks+events where eventID is not blank
< 		if($del != "no") {
< 			$medialinks = getMediaLinksToSave();
< 			$num_medialinks = count($medialinks);
< 			
< 			$albumlinks = getAlbumLinksToSave();
< 			$num_albumlinks = count($albumlinks);
< 		}
< 		if( $del == "yes" )
< 			ClearData( $tree );
226,233c311,318
< 	$savestate['offset'] = 0;
< 	$savestate['ucaselast'] = $ucaselast ? 1 : 0;
< 	$savestate['norecalc'] = $norecalc ? 1 : 0;
< 	$savestate['neweronly'] = $neweronly ? 1 : 0;
< 	$savestate['allevents'] = $allevents ? 1 : 0;
< 	$savestate['media'] = $importmedia ? 1 : 0;
< 	$savestate['latlong'] = $importlatlong ? 1 : 0;
< 	$savestate['branch'] = $branch1;
---
> 	$savestate['fileoffset'] = 0;
> 	$savestate['ucaselast'] = !empty($ucaselast) ? 1 : 0;
> 	$savestate['norecalc'] = !empty($norecalc) ? 1 : 0;
> 	$savestate['neweronly'] = !empty($neweronly) ? 1 : 0;
> 	$savestate['allevents'] = !empty($allevents) ? 1 : 0;
> 	$savestate['media'] = !empty($importmedia) ? 1 : 0;
> 	$savestate['latlong'] = !empty($importlatlong) ? 1 : 0;
> 	$savestate['branch'] = !empty($branch1) ? $branch1 : "";
238,242c323,324
< 		$query = "DELETE from $saveimport_table";
< 		$result = @tng_query($query);
< 
< 		$sql = "INSERT INTO $saveimport_table (filename, icount, ioffset, fcount, foffset, scount, soffset, mcount, pcount, ncount, noffset, roffset, offset, delvar, ucaselast, norecalc, neweronly, allevents, media, gedcom, branch)  
< 			VALUES(\"{$savestate['filename']}\", 0, \"{$savestate['ioffset']}\", 0, \"{$savestate['foffset']}\", 0, \"{$savestate['soffset']}\", 0, 0, 0, \"{$savestate['noffset']}\", \"{$savestate['roffset']}\", 0, \"$del\", {$savestate['ucaselast']}, {$savestate['norecalc']}, {$savestate['neweronly']}, {$savestate['allevents']}, $mll, \"$tree\", \"$branch\")";
---
> 		$sql = "INSERT INTO $saveimport_table (filename, icount, ioffset, fcount, foffset, scount, soffset, mcount, pcount, ncount, noffset, roffset, fileoffset, delvar, ucaselast, norecalc, neweronly, allevents, media, gedcom, branch)  
> 			VALUES(\"{$savestate['filename']}\", 0, \"{$savestate['ioffset']}\", 0, \"{$savestate['foffset']}\", 0, \"{$savestate['soffset']}\", 0, 0, 0, \"{$savestate['noffset']}\", \"{$savestate['roffset']}\", 0, \"$del\", {$savestate['ucaselast']}, {$savestate['norecalc']}, {$savestate['neweronly']}, {$savestate['allevents']}, $mll, \"$tree\", \"{$savestate['branch']}\")";
246,247c328,329
< elseif( $saveimport && !$openmsg ){
< 	$checksql = "SELECT filename, icount, ioffset, fcount, foffset, scount, soffset, mcount, pcount, ncount, noffset, offset, ucaselast, norecalc, neweronly, allevents, media, branch, delvar from $saveimport_table WHERE gedcom = \"$tree\"";
---
> elseif( $saveimport && !$errormsg ){
> 	$checksql = "SELECT filename, icount, ioffset, fcount, foffset, scount, soffset, mcount, pcount, ncount, noffset, roffset, fileoffset, ucaselast, norecalc, neweronly, allevents, media, branch, delvar from $saveimport_table WHERE gedcom = \"$tree\"";
265c347
< 		$savestate['offset'] = $row['offset'];
---
> 		$savestate['fileoffset'] = $row['fileoffset'];
280,291c362,366
< 			fseek( $fp, $savestate['offset'] );
< 			//$openmsg = "$savestate['filename'] $admtext['openedtoresume']" . $admtext['importinggedcom'];
< 			$openmsg = $admtext['importinggedcom'];
< 			$clearedtogo = "true";
< 
< 			if($del != "no") {
< 				$medialinks = getMediaLinksToSave();
< 				$num_medialinks = count($medialinks);
< 			
< 				$albumlinks = getAlbumLinksToSave();
< 				$num_albumlinks = count($albumlinks);
< 			}
---
> 			fseek( $fp, $savestate['fileoffset'] );
> 			$clearedtogo = true;
> 		}
> 		else {
> 			$errormsg = $admtext['cannotopen'] . " " . $savestate['filename'] . " " . $admtext['toresume'];
293,294d367
< 		else
< 			$openmsg = $admtext['cannotopen'] . " " . $savestate['filename'] . " " . $admtext['toresume'];
296,297c369,374
< 	else
< 		$openmsg = $admtext['notresumed'] . " " . $admtext['maybedone'];
---
> 	else {
> 		$errormsg = $admtext['notresumed'] . " " . $admtext['maybedone'];
> 	}
> }
> elseif(!$clearedtogo) {
> 	$errormsg = $admtext['notresumed'] . " " . $admtext['turnonsis'];
299,300d375
< elseif(!$openmsg)
< 	$openmsg = $admtext['notresumed'] . " " . $admtext['turnonsis'];
302c377
< if($old) {
---
> if(!empty($old)) {
304c379
<     if($clearedtogo == "true" && $saveimport && (!$remotefile || $remotefile == "none") )
---
>     if($clearedtogo && $saveimport && (!$remotefile || $remotefile == "none") )
310d384
< 	var idivs, timeoutID;
312,357c386,393
< 	var icount = parent.document.getElementById('personcount');
< 	var fcount = parent.document.getElementById('familycount');
< 	var scount = parent.document.getElementById('sourcecount');
< 	var ncount = parent.document.getElementById('notecount');
< 	var mcount = parent.document.getElementById('mediacount');
< 	var pcount = parent.document.getElementById('placecount');
< 	var pbar = parent.document.getElementById('bar');
< 	function updateCount() {
< 		idivs = jQuery('div.impc');
< 		if(idivs.length) {
< 			var ilen = idivs.length - 1;
< 			//console.log('file at ' + idivs['ilen'].down('#pr').innerHTML);
< 			var pr = jQuery(idivs[ilen]).find('#pr');
< 			if(pr.length) pbar.style.width = pr.html();
< 			
< 			var ic = jQuery(idivs[ilen]).find('#ic');
< 			if(ic.length) icount.innerHTML = ic.html();
< 			
< 			var fc = jQuery(idivs[ilen]).find('#fc');
< 			if(fc.length) fcount.innerHTML = fc.html();
< 			
< 			var sc = jQuery(idivs[ilen]).find('#sc');
< 			if(sc.length) scount.innerHTML = sc.html();
< 			
< 			var nc = jQuery(idivs[ilen]).find('#nc');
< 			if(nc.length) ncount.innerHTML = nc.html();
< 			
< 			var mc = jQuery(idivs[ilen]).find('#mc');
< 			if(mc.length) mcount.innerHTML = mc.html();
< 			
< 			var pc = jQuery(idivs[ilen]).find('#pc');
< 			if(pc.length) pcount.innerHTML = pc.html();
< 		}
< 		if(!parent.done)
< 			timeoutID = setTimeout(updateCount, <?php echo $readmsecs; ?>);
< 		else if(!parent.suspended) {
< 			msgdiv.innerHTML = "<?php echo $admtext['finishedimporting']; ?>" + ' &nbsp;<img src="img/tng_check.gif"/>';
< 			showCloseMenu();
< 		}
< 	}
< 	function showCloseMenu() {
< 		var closemsg = '<a href="#" onclick="tnglitbox.remove();return false;"><img src="img/tng_close.gif" border="0" align="left" style="margin-right:5px"/>' + "<?php echo $text['closewindow']; ?>" + '</a>';
< 		if(parent.started)
< 			parent.document.getElementById('implinks').innerHTML = '<span id="toremove"><a href="#" onclick="return removeFile(\'<?php echo $gedfilename; ?>\');">' + "<?php echo $admtext['removeged']; ?>" + '</a></span><p>' + closemsg + ' | <a href="admin_secondmenu.php">' + "<?php echo $admtext['moreoptions']; ?>" + '</a></p>';
< 		else
< 			parent.document.getElementById('implinks').innerHTML = '<p>' + closemsg + '</p>';
---
> <?php
> 	if($errormsg) {
> ?>
> 		clearTimeout('timecheck');
> 		var msgdiv = parent.document.getElementById('importmsg');
> 		msgdiv.innerHTML = "<?php echo $errormsg; ?>";
> 		parent.done = true;
> <?php
359,366c395
< 	var msgdiv = parent.document.getElementById('importmsg');
< 	if(parent.started) {
< 		parent.document.getElementById('impdata').style.visibility="visible";
< 		timeoutID = setTimeout(updateCount, <?php echo $readmsecs; ?>);
< 	}
< 	else
< 		showCloseMenu();
< 	msgdiv.innerHTML = "<?php echo $openmsg; ?>";
---
> ?>
369a399,402
> 	//kill the process intentionally when upload is finished
> 	if($errormsg || (!empty($remotefile) && $remotefile != "none")) {
> 		exit;
> 	}
372,375d404
< //now kill it on purpose so TNG will restart and be able to show the progress bar.
< if(!$old && !$resuming && !$num_medialinks && !$num_albumlinks)
< 	exit;
< 
377d405
< 	@ob_flush();
378a407,417
> 	//get all medialinks+events where eventID is not blank
> 	//if it's the first time or the first resume
> 	if($del != "append" && $del != "no") {
> 		$medialinks = getMediaLinksToSave();
> 		$num_medialinks = count($medialinks);
> 			
> 		$albumlinks = getAlbumLinksToSave();
> 		$num_albumlinks = count($albumlinks);
> 	}
> 	if( (empty($resuming) || !empty($first)) && $del == "yes" )
> 		ClearData( $tree );
397a437
> 	$custnametypes = array("ALIA", "_ADPN", "_HEBN", "_CENS", "_MARNM", "_FRKA", "_RELN", "_CALL", "_OTHN");
405,406c445,447
< 			$id = $matches[1];
< 			switch ( trim($lineinfo['rest']) ) {
---
> 			$id = isset($matches[1]) ? $matches[1] : "";
> 			$rest = trim($lineinfo['rest']);
> 			switch ( $rest ) {
418a460
> 				case "SNOTE":
420c462
< 					getNoteRecord( $id, 0 );
---
> 					getNoteRecord( $id, 0, $rest );
434,435c476,478
< 					if( strtok( $lineinfo['rest'], " " ) == "NOTE" )
< 						getNoteRecord( $id, 0 );
---
> 					$token = strtok( $rest, " " );
> 					if( $token == "NOTE" || $token == "SNOTE" )
> 						getNoteRecord( $id, 0, $token );
438c481
< 							$nextpart = strtok($lineinfo['rest']," ");
---
> 							$nextpart = strtok($rest," ");
440c483
< 							$lineinfo['rest'] = substr($lineinfo['rest'],$len+1);
---
> 							$rest = substr($rest,$len+1);
445c488
< 							getPlaceRecord( $lineinfo['rest'], 0 );
---
> 							getPlaceRecord( $rest, 0 );
454d496
< 		@ob_flush();
478,480c520,522
< 	$treemsg = $tree ? ", " . $admtext['tree'] . ": $tree/" : "";
< 	adminwritelog( "{$admtext['gedimport']}: " . basename($admtext['filename']) . ":{$savestate['filename']}$treemsg; {$savestate['icount']} {$admtext['people']}, {$savestate['fcount']} {$admtext['families']}, {$savestate['scount']} {$admtext['sources']}, {$savestate['ncount']} {$admtext['notes']}, {$savestate['mcount']} {$admtext['media']}, {$savestate['pcount']} {$admtext['places']}" );
<     if($old)
---
> 	$treemsg = $tree ? ", " . $admtext['tree'] . ": $tree" : "";
> 	adminwritelog( "{$admtext['gedimport']}: " . $admtext['filename'] . ": " . basename($savestate['filename']) . "$treemsg; {$savestate['icount']} {$admtext['people']}, {$savestate['fcount']} {$admtext['families']}, {$savestate['scount']} {$admtext['sources']}, {$savestate['ncount']} {$admtext['notes']}, {$savestate['mcount']} {$admtext['media']}, {$savestate['pcount']} {$admtext['places']}" );
>     if(!empty($old)) {
482,483c524,536
<     else {
<     	echo "<div class=\"impc\"><span id=\"pr\">500</span><span id=\"ic\">" . $savestate['icount'] . "</span><span id=\"fc\">" . $savestate['fcount'] . "</span><span id=\"sc\">" . $savestate['scount'] . "</span><span id=\"nc\">" . $savestate['ncount'] . "</span><span id=\"mc\">" . $savestate['mcount'] . "</span><span id=\"pc\">" . $savestate['pcount'] . "</span></div>\n";
---
>     }
>     else
>     	$finalmsg = $admtext['finishingimporting'];
> }
> else
> 	$finalmsg = $admtext['fileuploadfailed'];
> 
> if(!empty($old)) {
> 	echo "<p><a href=\"admin_secondary.php?secaction={$admtext['tracklines']}&amp;tree=$tree\">{$admtext['tracklines']}</a></p>";
> 	echo "<p><a href=\"admin_dataimport.php\">{$admtext['backtodataimport']}</a></p>\n";
> 	echo "</div></div>\n";
> }
> else {
485a539,541
> 	clearTimeout('timecheck');
> 	var msgdiv = parent.document.getElementById('importmsg');
> 	msgdiv.innerHTML = "<?php echo $finalmsg; ?>";
489,490d544
<     }
< }
492,496d545
< if($old) {
< 	echo "<p><a href=\"admin_secondary.php?secaction={$admtext['tracklines']}&tree=$tree\">{$admtext['tracklines']}</a></p>";
< 	echo "<p><a href=\"admin_dataimport.php\">{$admtext['backtodataimport']}</a></p>\n";
< 	echo "</div></div>\n";
< 	echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>";
499,500c548,550
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_genconfig.php TNG1403/admin_genconfig.php
1,1356c1,1422
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "setup";
< //include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< $treeList = array();
< if( $link ) {
< 	$admin_login = 1;
< 	include("checklogin.php");
< 	include("version.php");
< 
< 	if( $assignedtree || !$allow_edit ) {
< 		$message = $admtext['norights'];
< 		header( "Location: admin_login.php?message=" . urlencode($message) );
< 		exit;
< 	}
< 
< 	$query = "SELECT gedcom, treename FROM $trees_table ORDER BY treename";
< 	$result = @tng_query($query);
< 	while( $row = tng_fetch_assoc($result) ) {
< 		$treeList[] = $row;
< 	}
< }
< else
< 	$result = false;
< 
< if( !$rootpath ) {
< 	$rootpath = dirname(__FILE__);
< 	$rootpath .= "/";
< 	if(preg_match("/WIN/i",PHP_OS)) {
< 	    $rootpath = str_replace("\\","/",$rootpath);
< 	}
< }
< 
< if(!$lineendingdisplay) {
< 	if($lineending == "\r\n")
< 		$lineendingdisplay = "\\r\\n";
< 	elseif($lineending == "\r")
< 		$lineendingdisplay = "\\r";
< 	elseif($lineending == "\n") 
< 		$lineendingdisplay = "\\n";
< }
< if( !$tngconfig['maxdesc'] ) $tngconfig['maxdesc'] = $maxdesc;
< if( !$tngconfig['backupdays'] ) $tngconfig['backupdays'] = 30;
< $tngconfig['doctype'] = preg_replace("/\"/", "&#34;",$tngconfig['doctype']);
< $sitename = preg_replace("/\"/", "&#34;",$sitename);
< $site_desc = preg_replace("/\"/", "&#34;",$site_desc);
< $dbowner = preg_replace("/\"/", "&#34;",$dbowner);
< $tngconfig['footermsg'] = preg_replace("/\"/", "&#34;",$tngconfig['footermsg']);
< 
< $helplang = findhelp("config_help.php");
< 
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['modifysettings'], $flags );
< ?>
< <script type="text/javascript">
< function toggleAll(display) {
< 	toggleSection('db','plus0',display);
< 	toggleSection('tables','plus1',display);
< 	toggleSection('folders','plus2',display);
< 	toggleSection('site','plus3',display);
< 	toggleSection('media','plus4',display);
< 	toggleSection('lang','plus5',display);
< 	toggleSection('priv','plus6',display);
< 	toggleSection('names','plus7',display);
< 	toggleSection('cemeteries','plus8',display);
< 	toggleSection('mailreg','plus9',display);
< 	toggleSection('pref','plus10',display);
< 	toggleSection('mobile','plus11',display);
< 	toggleSection('dna','plus12',display);
< 	toggleSection('misc','plus13',display);
< 	return false;
< }
< 
< function flipTreeRestrict(requirelogin) {
< 	if(parseInt(requirelogin)) {
< 		jQuery('#treerestrict').show();
< 		jQuery('#trdisabled').hide();
< 	}
< 	else {
< 		jQuery('#treerestrict').hide();
< 		jQuery('#trdisabled').show();
< 	}
< }
< 
< function toggleAllowReg() {
< 	if(document.form1.disallowreg.selectedIndex == 1) {   //off
< 		jQuery('#autoapp').attr('disabled','disabled');
< 		jQuery('#autotree').attr('disabled','disabled');
< 		jQuery('#ackemail').attr('disabled','disabled');
< 		jQuery('#omitpwd').attr('disabled','disabled');
< 	}
< 	else {
< 		jQuery('#autoapp').attr('disabled','');
< 		jQuery('#autotree').attr('disabled','');
< 		if(document.form1.autoapp.selectedIndex == 0) {
< 			jQuery('#ackemail').attr('disabled','');
< 		}
< 		jQuery('#omitpwd').attr('disabled','');
< 	}
< }
< 
< function toggleAutoApprove() {
< 	if(document.form1.autoapp.selectedIndex == 1) {   //off
< 		jQuery('#ackemail').attr('disabled','disabled');
< 	}
< 	else {
< 		jQuery('#ackemail').attr('disabled','');
< 	}
< }
< 
< function flipPlaces(select) {
< 	if(select.selectedIndex) {
< 		//change to NO
< 		jQuery('#merge').show();
< 		jQuery('#mergeexpl').show();
< 		jQuery('#convert').hide();
< 		jQuery('#convertexpl').hide();
< 		jQuery('#placetree').hide();
< 	}
< 	else {
< 		//change to YES
< 		jQuery('#convert').show();
< 		jQuery('#convertexpl').show();
< 		jQuery('#placetree').show();
< 		jQuery('#merge').hide();
< 		jQuery('#mergeexpl').hide();
< 	}
< }
< 
< function convertPlaces(command) {
< 	var options = {action:command};
< 	if(command == "convert")
< 		options.placetree = jQuery('#placetree').val();
< 	jQuery('#'+command+'expl').html('<img src="' + cmstngpath + 'img/spinner.gif" style="border:0px;vertical-align:middle;">');
< 
< 	jQuery.ajax({
< 		url: 'ajx_placeconvert.php',
< 		data: options,
< 		type: 'GET',
< 		dataType: 'html',
< 		success: function(req) {
<             jQuery('#'+command+'expl').html(req);
<         }
<     });
< 
< 	return false;
< }
< 
< function convertMedia(select) {
< 	var options = {action:select.val()};
< 	jQuery('#mediaexpl').html('<img src="' + cmstngpath + 'img/spinner.gif" style="border:0px;vertical-align:middle;"/>');
< 
< 	jQuery.ajax({
< 		url: 'ajx_mediaconvert.php',
< 		data: options,
< 		type: 'GET',
< 		dataType: 'html',
< 		success: function(req) {
<             jQuery('#mediaexpl').html(req);
<         }
<     });
< 
< 	return false;
< }
< </script>
< <script type="text/javascript" src="js/admin.js"></script>
< </head>
< 
< <body background="img/background.gif">
< 
< <?php
< 	$setuptabs[0] = array(1,"admin_setup.php",$admtext['configuration'],"configuration");
< 	$setuptabs[1] = array(1,"admin_diagnostics.php",$admtext['diagnostics'],"diagnostics");
< 	$setuptabs[2] = array(1,"admin_setup.php?sub=tablecreation",$admtext['tablecreation'],"tablecreation");
< 	$setuptabs[3] = array(1,"#",$admtext['configsettings'],"gen");
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/config_help.php#modify');\" class=\"lightlink\">{$admtext['help']}</a>";
< 	$innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('on');\">{$text['expandall']}</a> &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('off');\">{$text['collapseall']}</a>";
< 	$menu = doMenu($setuptabs,"gen",$innermenu);
< 	echo displayHeadline($admtext['setup'] . " &gt;&gt; " . $admtext['configuration'] . " &gt;&gt; " . $admtext['configsettings'],"img/setup_icon.gif",$menu,"");
< ?>
< 
< <form action="admin_updateconfig.php" method="post" name="form1" >
< 
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus0",0,"db",$admtext['dbsection'],""); ?>
< 
< 	<div id="db" style="display:none">
< 	<table border="0" class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr><td><?php echo $admtext['dbhost']; ?>:</td><td><input type="text" value="<?php echo $database_host; ?>" name="new_database_host" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['dbname']; ?>:</td><td><input type="text" value="<?php echo $database_name; ?>" name="new_database_name" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['dbusername']; ?>:</td><td><input type="text" value="<?php echo $database_username; ?>" name="new_database_username" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['dbpassword']; ?>:</td><td><input type="text" value="<?php echo $database_password; ?>" name="new_database_password" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['dbport']; ?>:</td><td><input type="text" value="<?php echo $database_port; ?>" name="new_database_port" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['dbsocket']; ?>:</td><td><input type="text" value="<?php echo $database_socket; ?>" name="new_database_socket" size="20"></td></tr>
< <?php
< 	$query = "SELECT count(userID) as ucount FROM $users_table";
< 	$uresult = @tng_query($query);
< 	if( $uresult ) {
< 		$urow = tng_fetch_assoc($uresult);
< 		tng_free_result($uresult);
< 	}
< 	else
< 		$urow['ucount'] = 0;
< ?>
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr>
< 			<td><?php echo $admtext['maintmode']; ?>:</td>
< 			<td>
< 				<select name="maint"<?php if(!$urow['ucount']) echo " disabled=\"disabled\""; ?>>
< 					<option value=""<?php if( !$tngconfig['maint'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['off']; ?></option>
< 					<option value="1"<?php if( $tngconfig['maint'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['on']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 	</table>
< 	</div>
< 
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus1",0,"tables",$admtext['tablesection'],""); ?>
< 
< 	<div id="tables" style="display:none"><br/>
< 	<table border="0" cellspacing="0" cellpadding="0" class="normal">
< 		<tr>
< 			<td>
< 				<table class="normal">
< 					<tr><td><?php echo $admtext['people']; ?>:</td><td><input type="text" value="<?php echo $people_table; ?>" name="people_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['families']; ?>:</td><td><input type="text" value="<?php echo $families_table; ?>" name="families_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['children']; ?>:</td><td><input type="text" value="<?php echo $children_table; ?>" name="children_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['albums']; ?>:</td><td><input type="text" value="<?php echo $albums_table; ?>" name="albums_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['album2entitiestable']; ?>:</td><td><input type="text" value="<?php echo $album2entities_table; ?>" name="album2entities_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['albumlinkstable']; ?>:</td><td><input type="text" value="<?php echo $albumlinks_table; ?>" name="albumlinks_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['media']; ?>:</td><td><input type="text" value="<?php echo $media_table; ?>" name="media_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['medialinkstable']; ?>:</td><td><input type="text" value="<?php echo $medialinks_table; ?>" name="medialinks_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['mediatypes']; ?>:</td><td><input type="text" value="<?php echo $mediatypes_table; ?>" name="mediatypes_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['addresstable']; ?>:</td><td><input type="text" value="<?php echo $address_table; ?>" name="address_table" size="20"></td></tr>
< 			 		<tr><td><?php echo $admtext['languages']; ?>:</td><td><input type="text" value="<?php echo $languages_table; ?>" name="languages_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['places']; ?>:</td><td><input type="text" value="<?php echo $places_table; ?>" name="places_table" size="20"></td></tr>
< 				</table>
< 			</td>
< 			<td>&nbsp;</td>
< 			<td>
< 				<table class="normal">
< 					<tr><td><?php echo $admtext['cemeteries']; ?>:</td><td><input type="text" value="<?php echo $cemeteries_table; ?>" name="cemeteries_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['statestable']; ?>:</td><td><input type="text" value="<?php echo $states_table; ?>" name="states_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['countriestable']; ?>:</td><td><input type="text" value="<?php echo $countries_table; ?>" name="countries_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['users']; ?>:</td><td><input type="text" value="<?php echo $users_table; ?>" name="users_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['sources']; ?>:</td><td><input type="text" value="<?php echo $sources_table; ?>" name="sources_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['citations']; ?>:</td><td><input type="text" value="<?php echo $citations_table; ?>" name="citations_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['repositories']; ?>:</td><td><input type="text" value="<?php echo $repositories_table; ?>" name="repositories_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['events']; ?>:</td><td><input type="text" value="<?php echo $events_table; ?>" name="events_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['eventtypes']; ?>:</td><td><input type="text" value="<?php echo $eventtypes_table; ?>" name="eventtypes_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['reports']; ?>:</td><td><input type="text" value="<?php echo $reports_table; ?>" name="reports_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['trees']; ?>:</td><td><input type="text" value="<?php echo $trees_table; ?>" name="trees_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['notes']; ?>:</td><td><input type="text" value="<?php echo $xnotes_table; ?>" name="xnotes_table" size="20"></td></tr>
< 				</table>
< 			</td>
< 			<td>&nbsp;</td>
< 			<td valign="top">
< 				<table class="normal">
< 					<tr><td><?php echo $admtext['notelinkstable']; ?>:</td><td><input type="text" value="<?php echo $notelinks_table; ?>" name="notelinks_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['saveimporttable']; ?>:</td><td><input type="text" value="<?php echo $saveimport_table; ?>" name="saveimport_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['branches']; ?>:</td><td><input type="text" value="<?php echo $branches_table; ?>" name="branches_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['brlinkstable']; ?>:</td><td><input type="text" value="<?php echo $branchlinks_table; ?>" name="branchlinks_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['tleventstable']; ?>:</td><td><input type="text" value="<?php echo $tlevents_table; ?>" name="tlevents_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['temptable']; ?>:</td><td><input type="text" value="<?php echo $temp_events_table; ?>" name="temp_events_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['associations']; ?>:</td><td><input type="text" value="<?php echo $assoc_table; ?>" name="assoc_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['mostwanted']; ?>:</td><td><input type="text" value="<?php echo $mostwanted_table; ?>" name="mostwanted_table" size="20"></td></tr>
< 					<!--<tr><td><?php /*echo $admtext['mhrequests'];*/ ?>:</td><td><input type="text" value="<?php /*echo $mhrequests_table;*/ ?>" name="mhrequests_table" size="20"></td></tr>-->
< 					<tr><td><?php echo $admtext['dna_tests']; ?>:</td><td><input type="text" value="<?php echo $dna_tests_table; ?>" name="dna_tests_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['dna_groups']; ?>:</td><td><input type="text" value="<?php echo $dna_groups_table; ?>" name="dna_groups_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['dna_links']; ?>:</td><td><input type="text" value="<?php echo $dna_links_table; ?>" name="dna_links_table" size="20"></td></tr>
< 					<tr><td><?php echo $admtext['templates']; ?>:</td><td><input type="text" value="<?php echo $templates_table; ?>" name="templates_table" size="20"></td></tr>
< 				</table>
< 			</td>
< 		</tr>
< 	</table>
< 	</div>
< 
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus2",0,"folders",$admtext['foldersection'],""); ?>
< 
< 	<div id="folders" style="display:none">
< 	<table class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr><td class="nw"><?php echo $admtext['rootpath']; ?>:</td><td><input type="text" value="<?php echo $rootpath; ?>" name="newrootpath" class="verylongfield"></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['subroot']; ?>*:</td><td><input type="text" value="<?php echo $tngconfig['subroot']; ?>" name="newsubroot" class="verylongfield"></td>
< 		<tr><td>&nbsp;</td><td>*<?php echo $admtext['srexpl']; ?></td>
< 
< 		<tr><td class="nw"><?php echo $admtext['photopath']; ?>:</td><td><input type="text" value="<?php echo $photopath; ?>" name="photopath" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onclick="makeFolder('photos',document.form1.photopath.value);"> <span id="msg_photos"></span></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['documentpath']; ?>:</td><td><input type="text" value="<?php echo $documentpath; ?>" name="documentpath" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onClick="makeFolder('documents',document.form1.documentpath.value);"> <span id="msg_documents"></span></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['historypath']; ?>:</td><td><input type="text" value="<?php echo $historypath; ?>" name="historypath" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onClick="makeFolder('histories',document.form1.historypath.value);"> <span id="msg_histories"></span></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['headstonepath']; ?>:</td><td><input type="text" value="<?php echo $headstonepath; ?>" name="headstonepath" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onClick="makeFolder('headstones',document.form1.headstonepath.value);"> <span id="msg_headstones"></span></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['mediapath']; ?>:</td><td><input type="text" value="<?php echo $mediapath; ?>" name="mediapath" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onClick="makeFolder('media',document.form1.mediapath.value);"> <span id="msg_media"></span></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['gendex']; ?>:</td><td><input type="text" value="<?php echo $gendexfile; ?>" name="gendexfile" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onClick="makeFolder('gendex',document.form1.gendexfile.value);"> <span id="msg_gendex"></span></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['backuppath']; ?>:</td><td><input type="text" value="<?php echo $backuppath; ?>" name="backuppath" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onClick="makeFolder('backups',document.form1.backuppath.value);"> <span id="msg_backups"></span></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['modspath']; ?>:</td><td><input type="text" value="<?php echo $modspath; ?>" name="modspath" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onClick="makeFolder('mods',document.form1.modspath.value);"> <span id="msg_mods"></span></td></tr>
< 		<tr><td class="nw"><?php echo $admtext['extspath']; ?>:</td><td><input type="text" value="<?php echo $extspath; ?>" name="extspath" class="verylongfield">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onClick="makeFolder('exts',document.form1.extspath.value);"> <span id="msg_exts"></span></td></tr>
< 	</table>
< 	</div>
< 
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus3",0,"site",$admtext['sitesection'],""); ?>
< 
< 	<div id="site" style="display:none">
< 	<table class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr><td><?php echo $admtext['homepage']; ?>:</td><td><input type="text" value="<?php echo $homepage; ?>" name="homepage" size="40"></td></tr>
< 		<tr><td><?php echo $admtext['tngdomain']; ?>:</td><td><input type="text" value="<?php echo $tngdomain; ?>" name="tngdomain" size="40"></td></tr>
< 		<tr><td><?php echo $admtext['sitename']; ?>:</td><td><input type="text" value="<?php echo $sitename; ?>" name="sitename" size="40"></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['site_desc']; ?>:</td><td><textarea name="site_desc" rows="2" cols="65"><?php echo $site_desc; ?></textarea></td></tr>
< 		<tr><td><?php echo $admtext['doctype']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['doctype']; ?>" name="doctype" size="70"></td></tr>
< 		<tr><td><?php echo $admtext['siteowner']; ?>:</td><td><input type="text" value="<?php echo $dbowner; ?>" name="dbowner" size="40"></td></tr>
< 		<tr><td><?php echo $admtext['targetframe']; ?>:</td><td><input type="text" value="<?php echo $target; ?>" name="target" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['customheader']; ?>:</td><td><input type="text" value="<?php echo $customheader; ?>" name="customheader" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['customfooter']; ?>:</td><td><input type="text" value="<?php echo $customfooter; ?>" name="customfooter" size="20"></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['footermsg']; ?>:</td><td><textarea name="tng_footermsg" rows="2" cols="65"><?php echo $tngconfig['footermsg']; ?></textarea></td></tr>
< 		<tr><td><?php echo $admtext['custommeta']; ?>:</td><td><input type="text" value="<?php echo $custommeta; ?>" name="custommeta" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['tabstyle']; ?>:</td>
< 			<td>
< 				<select name="tng_tabs">
< 					<option value="tngtabs1.css"<?php if( $tngconfig['tabs'] == "tngtabs1.css") echo " selected"; ?>>tngtabs1.css</option>
< 					<option value="tngtabs2.css"<?php if( $tngconfig['tabs'] == "tngtabs2.css" ) echo " selected"; ?>>tngtabs2.css</option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['iconloc']; ?>:</td>
< 			<td>
< 				<select name="tng_menu">
< 					<option value="0"<?php if( !$tngconfig['menu'] ) echo " selected"; ?>><?php echo $admtext['topright']; ?></option>
< 					<option value="1"<?php if( $tngconfig['menu'] == 1 ) echo " selected"; ?>><?php echo $admtext['topleft']; ?></option>
< 					<option value="2"<?php if( $tngconfig['menu'] == 2 ) echo " selected"; ?>><?php echo $admtext['nodisplay']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showhome']; ?>:</td>
< 			<td>
< 				<select name="showhome">
< 					<option value="0"<?php if( !$tngconfig['showhome'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['showhome'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showsearch']; ?>:</td>
< 			<td>
< 				<select name="showsearch">
< 					<option value="0"<?php if( !$tngconfig['showsearch'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['showsearch'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['searchchoice']; ?>:</td>
< 			<td>
< 				<select name="searchchoice">
< 					<option value="0"<?php if( !$tngconfig['searchchoice'] ) echo " selected"; ?>><?php echo $admtext['quicksearch']; ?></option>
< 					<option value="1"<?php if( $tngconfig['searchchoice'] ) echo " selected"; ?>><?php echo $admtext['advsearch']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showlogin']; ?>:</td>
< 			<td>
< 				<select name="showlogin">
< 					<option value="0"<?php if( !$tngconfig['showlogin'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['showlogin'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showshare']; ?>:</td>
< 			<td>
< 				<select name="showshare">
< 					<option value="1"<?php if( $tngconfig['showshare'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$tngconfig['showshare'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showprint']; ?>:</td>
< 			<td>
< 				<select name="showprint">
< 					<option value="0"<?php if( !$tngconfig['showprint'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['showprint'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showbmarks']; ?>:</td>
< 			<td>
< 				<select name="showbmarks">
< 					<option value="0"<?php if( !$tngconfig['showbmarks'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['showbmarks'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['hidechr']; ?>:</td>
< 			<td>
< 				<select name="hidechr">
< 					<option value="0"<?php if( !$tngconfig['hidechr'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['hidechr'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr><td><?php echo $admtext['defaulttree']; ?>:</td><td>
< 			<select name="defaulttree">
< 				<option value=""></option>
< <?php
< if( $link && $result ) {
< 	foreach($treeList as $treerow) {
< 		echo "	<option value=\"{$treerow['gedcom']}\"";
< 		if( $defaulttree == $treerow['gedcom'] ) echo " selected";
< 		echo ">{$treerow['treename']}</option>\n";
< 	}
< }
< else
< 	echo "	<option value=\"$defaulttree\" selected>$defaulttree</option>\n";
< ?>
< 			</select>
< 		</td></tr>
< 	</table>
< 	</div>
< 
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus4",0,"media",$admtext['media'],""); ?>
< 
< 	<div id="media" style="display:none">
< 	<table class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr>
< 			<td><?php echo $admtext['photosext']; ?>:</td>
< 			<td>
< 				<select name="photosext">
< 					<option value="jpg"<?php if( $photosext == "jpg" ) echo " selected"; ?>>.jpg</option>
< 					<option value="gif"<?php if( $photosext == "gif" ) echo " selected"; ?>>.gif</option>
< 					<option value="png"<?php if( $photosext == "png" ) echo " selected"; ?>>.png</option>
< 					<option value="bmp"<?php if( $photosext == "bmp" ) echo " selected"; ?>>.bmp</option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showextended']; ?>:</td>
< 			<td>
< 				<select name="showextended">
< 					<option value="1"<?php if( $showextended ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$showextended ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr><td><?php echo $admtext['imgmaxh']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['imgmaxh']; ?>" name="imgmaxh" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['imgmaxw']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['imgmaxw']; ?>" name="imgmaxw" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['thumbprefix']; ?>:</td><td><input type="text" value="<?php echo $thumbprefix; ?>" name="thumbprefix" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['thumbsuffix']; ?>:</td><td><input type="text" value="<?php echo $thumbsuffix; ?>" name="thumbsuffix" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['thumbmaxh']; ?>:</td><td><input type="text" value="<?php echo $thumbmaxh; ?>" name="thumbmaxh" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['thumbmaxw']; ?>:</td><td><input type="text" value="<?php echo $thumbmaxw; ?>" name="thumbmaxw" size="20"></td></tr>
< 		<tr>
< 			<td><?php echo $admtext['usedefthumbs']; ?>:</td>
< 			<td>
< 				<select name="tng_usedefthumbs">
< 					<option value="0"<?php if( !$tngconfig['usedefthumbs'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['usedefthumbs'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr><td><?php echo $admtext['thumbcols']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['thumbcols']; ?>" name="tng_thumbcols" size="20"></td></tr>
< 		<tr><td><?php echo $admtext['maxnoteprev']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['maxnoteprev']; ?>" name="tng_maxnoteprev" size="20"></td></tr>
< 		<tr>
< 			<td><?php echo $admtext['ssenabled']; ?>:</td>
< 			<td>
< 				<select name="tng_ssdisabled">
< 					<option value="0"<?php if( !$tngconfig['ssdisabled'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['ssdisabled'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['ssrepeat']; ?>:</td>
< 			<td>
< 				<select name="tng_ssrepeat">
< 					<option value="1"<?php if( $tngconfig['ssrepeat'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$tngconfig['ssrepeat'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['imgviewer']; ?>:</td>
< 			<td>
< 				<select name="tng_imgviewer">
< 					<option value="0"<?php if( !$tngconfig['imgviewer'] ) echo " selected"; ?>><?php echo $admtext['ldson']; ?></option>
< 					<option value="documents"<?php if( $tngconfig['imgviewer'] == "documents" ) echo " selected"; ?>><?php echo $admtext['docsonly']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['imgvheight']; ?>:</td>
< 			<td>
< 				<select name="tng_imgvheight">
< 					<option value="0"<?php if( $tngconfig['imgvheight'] == 1 ) echo " selected"; ?>><?php echo $admtext['flex']; ?></option>
< 					<option value="640"<?php if( $tngconfig['imgvheight'] == "640" ) echo " selected"; ?>><?php echo $admtext['setheight']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['hidemedia']; ?>:</td>
< 			<td>
< 				<select name="hidemedia">
< 					<option value="1"<?php if( $tngconfig['hidemedia'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$tngconfig['hidemedia'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['mediadel']; ?>:</td>
< 			<td>
< 				<select name="tng_mediadel">
< 					<option value="0"<?php if( !$tngconfig['mediadel'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['mediadel'] == 1 ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="2"<?php if( $tngconfig['mediadel'] == 2 ) echo " selected"; ?>><?php echo $admtext['onrequest']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['mediathumbs']; ?>:</td>
< 			<td>
< 				<select name="tng_mediathumbs">
< 					<option value="1"<?php if( $tngconfig['mediathumbs'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$tngconfig['mediathumbs'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['mediatrees']; ?>:</td>
< 			<td>
< 				<select name="tng_mediatrees" id="tng_mediatrees">
< 					<option value="0"<?php if( !$tngconfig['mediatrees'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['mediatrees'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 				<input type="button" value="<?php echo $admtext['convert']; ?>" id="convertmedia" onclick="convertMedia(jQuery('#tng_mediatrees'));"/>
< 				<div id="mediaexpl" style="display:inline-block"></div>
< 			</td>
< 		</tr>
< 		<tr><td>Favicon:</td><td><input type="text" value="<?php echo $tngconfig['favicon']; ?>" name="favicon" size="20"></td></tr>
< 	</table>
< 	</div>
< 
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus5",0,"lang",$admtext['language'],""); ?>
< 
< 	<div id="lang" style="display:none">
< 	<table class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr>
< 			<td><?php echo $admtext['langfolder']; ?>:</td>
< 			<td>
< 				<select name="language">
< <?php
< 	@chdir($rootpath . $endrootpath . $languages_path);
< 	if( $handle = @opendir('.') ) {
< 		$dirs = array();
< 		while ($filename = readdir( $handle )) {
< 			if(is_dir($filename) && $filename != '..' && $filename != '.')
< 				array_push($dirs, $filename);
< 		}
< 		natcasesort( $dirs );
< 		$found_current = 0;
< 		foreach( $dirs as $dir ) {
< 			echo "<option value=\"$dir\"";
< 			if($dir == $language) {
< 				echo " selected=\"selected\"";
< 				$found_current = 1;
< 			}
< 			echo ">$dir</option>\n";
< 		}
< 		if(!$found_current)
< 			echo "<option value=\"$language\" selected=\"selected\">$language</option>\n";
< 		closedir( $handle );
< 	}
< ?>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['charset']; ?>:</td>
< 			<td>
< 				<select name="charset">
< 					<option value="UTF-8"<?php if( strtoupper($charset) == "UTF-8" ) echo " selected"; ?>>UTF-8</option>
< 					<option value="ISO-8859-1"<?php if( strtoupper($charset) == "ISO-8859-1" ) echo " selected"; ?>>ISO-8859-1 (ANSI)</option>
< 					<option value="ISO-8859-2"<?php if( strtoupper($charset) == "ISO-8859-2" ) echo " selected"; ?>>ISO-8859-2</option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['chooselang']; ?>:</td>
< 			<td>
< 				<select name="chooselang">
< 					<option value="1"<?php if( $chooselang ) echo " selected"; ?>><?php echo $admtext['allow']; ?></option>
< 					<option value="0"<?php if( !$chooselang ) echo " selected"; ?>><?php echo $admtext['disallow']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['norels']; ?>:</td>
< 			<td>
< 				<select name="norels">
< 					<option value=""<?php if( !$norels ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $norels ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 	</table>
< 	</div>
< 
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus6",0,"priv",$admtext['privsection'],""); ?>
< 
< 	<div id="priv" style="display:none">
< 	<table class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr>
< 			<td><?php echo $admtext['requirelogin']; ?>:</td>
< 			<td>
< 				<select name="requirelogin" onchange="flipTreeRestrict(this.options[this.selectedIndex].value);">
< 					<option value="1"<?php if( $requirelogin ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$requirelogin ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['treerestrict']; ?>: &nbsp;&nbsp;</td>
< 			<td><span id="trdisabled"<?php if( $requirelogin ) echo " style=\"display:none\""; ?>><?php echo $admtext['reqloginset']; ?></span>
< 				<select name="treerestrict" id="treerestrict"<?php if( !$requirelogin ) echo " style=\"display:none\""; ?>>
< 					<option value="0"<?php if( !$treerestrict ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $treerestrict ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['ldsdefault']; ?>:</td>
< 			<td>
< 				<select name="ldsdefault">
< 					<option value="0"<?php if( !$ldsdefault ) echo " selected"; ?>><?php echo $admtext['ldson']; ?></option>
< 					<option value="1"<?php if( $ldsdefault == 1 ) echo " selected"; ?>><?php echo $admtext['ldsoff']; ?></option>
< 					<option value="2"<?php if( $ldsdefault == 2 ) echo " selected"; ?>><?php echo $admtext['ldspermit']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['livedefault']; ?>:</td>
< 			<td>
< 				<select name="livedefault">
< 					<option value="2"<?php if( $livedefault == 2 ) echo " selected"; ?>><?php echo $admtext['ldson']; ?></option>
< 					<option value="1"<?php if( $livedefault == 1 ) echo " selected"; ?>><?php echo $admtext['ldsoff']; ?></option>
< 					<option value="0"<?php if( !$livedefault ) echo " selected"; ?>><?php echo $admtext['ldspermit']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['shownames']; ?>:</td>
< 			<td>
< 				<select name="nonames">
< 					<option value="0"<?php if( !$nonames ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $nonames == 1 ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="2"<?php if( $nonames == 2 ) echo " selected"; ?>><?php echo $admtext['initials']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['shownamespr']; ?>:</td>
< 			<td>
< 				<select name="nnpriv">
< 					<option value="0"<?php if( !$tngconfig['nnpriv'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['nnpriv'] == 1 ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="2"<?php if( $tngconfig['nnpriv'] == 2 ) echo " selected"; ?>><?php echo $admtext['initials']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['cookieapproval']; ?>:</td>
< 			<td>
< 				<select name="tng_cookieapproval">
< 					<option value="0"<?php if( !$tngconfig['cookieapproval'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['cookieapproval'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['dataprotectmsg']; ?>:</td>
< 			<td>
< 				<select name="tng_dataprotect">
< 					<option value="0"<?php if( !$tngconfig['dataprotect'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['dataprotect'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['askconsent']; ?>:</td>
< 			<td>
< 				<select name="tng_askconsent">
< 					<option value="0"<?php if( !$tngconfig['askconsent'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['askconsent'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr><td><?php echo $admtext['sitekey']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['sitekey']; ?>" name="rcsitekey" class="longfield"></td></tr>
< 		<tr><td><?php echo $admtext['secret']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['secret']; ?>" name="rcsecret" class="longfield"></td></tr>
< 	</table>
< 	</div>
< 
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus7",0,"names",$admtext['namesection'],""); ?>
< 
< 	<div id="names" style="display:none">
< 	<table class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr>
< 			<td><?php echo $admtext['nameorder']; ?>:</td>
< 			<td>
< 				<select name="nameorder">
< 					<option value=""></option>
< 					<option value="1"<?php if( $nameorder == 1 ) echo " selected"; ?>><?php echo $admtext['western']; ?></option>
< 					<option value="2"<?php if( $nameorder == 2 ) echo " selected"; ?>><?php echo $admtext['oriental']; ?></option>
< 					<option value="3"<?php if( $nameorder == 3 ) echo " selected"; ?>><?php echo $admtext['lnfirst']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['ucsurnames']; ?>:</td>
< 			<td>
< 				<select name="ucsurnames">
< 					<option value="0"<?php if( !$tngconfig['ucsurnames'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['ucsurnames'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['lnprefixes']; ?>:</td>
< 			<td>
< 				<select name="lnprefixes">
< 					<option value="0"<?php if( !$lnprefixes ) echo " selected"; ?>><?php echo $admtext['lntogether']; ?></option>
< 					<option value="1"<?php if( $lnprefixes ) echo " selected"; ?>><?php echo $admtext['lnapart']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr><td colspan="2"><?php echo $admtext['detectpfx']; ?>:</td></tr>
< 		<tr>
< 			<td>&nbsp;&nbsp;<?php echo $admtext['lnpfxnum']; ?>:</td>
< 			<td><input type="text" value="<?php echo $lnpfxnum; ?>" name="lnpfxnum" size="5"/></td>
< 		</tr>
< 		<tr>
< 			<td>&nbsp;&nbsp;<?php echo $admtext['specpfx']; ?>*:</td>
< 			<td><input type="text" value="<?php echo stripslashes($specpfx); ?>" name="specpfx" class="verylongfield"/></td>
< 		</tr>
< 		<tr><td colspan="2">*<?php echo $admtext['commas']; ?></td></tr>
< 	</table>
< 	</div>
< 
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus8",0,"cemeteries",$admtext['cemeteries'],""); ?>
< 
< 	<div id="cemeteries" style="display:none">
< 	<table class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr><td><?php echo $admtext['cemrows']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $tngconfig['cemrows']; ?>" name="cemrows" size="5"></td></tr>
< 		<tr>
< 			<td><?php echo $admtext['cemblanks']; ?>:</td>
< 			<td>
< 				<select name="cemblanks">
< 					<option value="0"<?php if( !$tngconfig['cemblanks'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['cemblanks'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 	</table>
< 	</div>
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus9",0,"mailreg",$admtext['mailreg'],""); ?>
< 
< 	<div id="mailreg" style="display:none">
< 	<table class="normal">
< 		<tr><td><?php echo $admtext['emailaddress']; ?>:</td><td><input type="text" value="<?php echo $emailaddr; ?>" name="emailaddr" size="40"></td></tr>
< 		<tr>
< 			<td><?php echo $admtext['fromadmin']; ?>:</td>
< 			<td>
< 				<select name="fromadmin">
< 					<option value="0"<?php if( !$tngconfig['fromadmin'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['fromadmin'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['allowreg']; ?>:</td>
< 			<td>
< 				<select name="disallowreg" onchange="toggleAllowReg();">
< 					<option value="0"<?php if( !$tngconfig['disallowreg'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['disallowreg'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['revmail']; ?>:</td>
< 			<td>
< 				<select name="revmail">
< 					<option value="0"<?php if( !$tngconfig['revmail'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['revmail'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['autotree']; ?>:</td>
< 			<td>
< 				<select name="autotree" id="autotree">
< 					<option value="0"<?php if( !$tngconfig['autotree'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['autotree'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['autoapp']; ?>:</td>
< 			<td>
< 				<select name="autoapp" id="autoapp" onchange="toggleAutoApprove();">
< 					<option value="0"<?php if( !$tngconfig['autoapp'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['autoapp'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['ackemail']; ?>:</td>
< 			<td>
< 				<select name="ackemail" id="ackemail"<?php if( $tngconfig['autoapp'] ) echo " disabled=\"disabled\""; ?>>
< 					<option value="0"<?php if( !$tngconfig['ackemail'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['ackemail'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['inclpwd']; ?>:</td>
< 			<td>
< 				<select name="omitpwd" id="omitpwd">
< 					<option value="0"<?php if( !$tngconfig['omitpwd'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['omitpwd'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['usesmtp']; ?>:</td>
< 			<td>
< 				<select name="usesmtp" id="usesmtp" onchange="jQuery('#smtpstuff').toggle(200);">
< 					<option value="0"<?php if( !$tngconfig['usesmtp'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['usesmtp'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
<     </table>
< 	<table class="normal" style="margin-left:5px;<?php if(!$tngconfig['usesmtp']) echo " display:none"; ?>" id="smtpstuff">
< 		<tr><td><?php echo $admtext['mailhost']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailhost']; ?>" name="mailhost" size="40"></td></tr>
< 		<tr><td><?php echo $admtext['mailuser']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailuser']; ?>" name="mailuser" size="40"></td></tr>
< 		<tr><td><?php echo $admtext['mailpass']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailpass']; ?>" name="mailpass" size="40"></td></tr>
< 		<tr><td><?php echo $admtext['mailport']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailport']; ?>" name="mailport" size="40"></td></tr>
< 		<tr><td><?php echo $admtext['mailenc']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailenc']; ?>" name="mailenc" size="40"></td></tr>
< 	</table>
< 	</div>
< </td>
< </tr>
< 
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus10",0,"pref",$admtext['prefsection'],""); ?>
< 
< 	<div id="pref" style="display:none">
< 	<table class="normal">
< 		<tr><td><?php echo $admtext['personprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['personprefix']; ?>" name="pprefix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['personsuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['personsuffix']; ?>" name="psuffix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['familyprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['familyprefix']; ?>" name="fprefix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['familysuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['familysuffix']; ?>" name="fsuffix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['sourceprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['sourceprefix']; ?>" name="sprefix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['sourcesuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['sourcesuffix']; ?>" name="ssuffix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['repoprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['repoprefix']; ?>" name="rprefix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['reposuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['reposuffix']; ?>" name="rsuffix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['noteprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['noteprefix']; ?>" name="nprefix" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['notesuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['notesuffix']; ?>" name="nsuffix" size="5"></td></tr>
< 	</table>
< 	</div>
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus11",0,"mobile",$admtext['mobilesection'],""); ?>
< 
< 	<div id="mobile" style="display:none">
< 	<table class="normal">
< 		<tr>
< 			<td><?php echo $admtext['responsivetables']; ?>:</td>
< 			<td>
< 				<select name="responsivetables">
< 					<option value="1"<?php if( $responsivetables ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$responsivetables ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['tabletype']; ?>:</td>
< 			<td>
< 				<select name="tabletype">
< 					<option value="toggle"<?php if( $tabletype == "toggle" ) echo " selected"; ?>>toggle</option>
< 					<option value="stack"<?php if( $tabletype == "stack" ) echo " selected"; ?>>stack</option>
< 					<option value="swipe"<?php if( $tabletype == "swipe" ) echo " selected"; ?>>swipe</option>
< 					<option value="tng"<?php if( $tabletype == "tng" ) echo " selected"; ?>>tng</option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['enablemodeswitch']; ?>:</td>
< 			<td>
< 				<select name="enablemodeswitch">
< 					<option value="1"<?php if( $enablemodeswitch ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$enablemodeswitch ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['enableminimap']; ?>:</td>
< 			<td>
< 				<select name="enableminimap">
< 					<option value="1"<?php if( $enableminimap ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$enableminimap ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 	</table>
< 	</div>
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus12",0,"dna",$text['dna_tests'],""); ?>
< 	<div id="dna" style="display:none">
< 	<table class="normal">
< 		<tr>
< 			<td><?php echo $admtext['hidedna']; ?>:</td>
< 			<td>
< 				<select name="hidedna">
< 					<option value="0"<?php if( !$tngconfig['hidedna'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['hidedna'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< <?php if (!$maxdnasearchresults) $maxdnasearchresults = $maxsearchresults; ?>
< 		<tr><td><?php echo $text['dna_tests'] . ' ' . $admtext['maxsearchresults']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $maxdnasearchresults; ?>" name="maxdnasearchresults" size="3"></td></tr>
< 		<tr><td><?php echo $admtext['show_test_number']; ?>:</td>
< 			<td>
< 				<select name="showtestnumbers">
< 					<option value="1"<?php if( $showtestnumbers ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$showtestnumbers ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 	    <tr>
<             <td><?php echo $admtext['autofillancsunames']; ?>:</td>
< 			<td>
< 				<select name="autofillancsurnames">
< 					<option value="1"<?php if( $autofillancsurnames ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$autofillancsurnames ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 	    <tr>
<             <td><?php echo $admtext['upperancsunames']; ?>:</td>
< 			<td>
< 				<select name="ancsurnameupper">
< 					<option value="1"<?php if( $ancsurnameupper ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$ancsurnameupper ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['excludefromancsn']; ?>*:</td>
< 			<td><input type="text" value="<?php echo stripslashes($surnameexcl); ?>" name="surnameexcl" class="longfield"/></td>
< 		</tr>
< 		<tr> <td colspan="2">*<?php echo $admtext['commas']; ?></td></tr>
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr><td colspan="2"><strong><?php echo $admtext['dnatestscomparecolors']; ?></strong></tr>
< <?php
< 		$mainclass = $bgmain ? 'center' : 'fieldnameback center';
< 		$txtmain = $txtmain ? $txtmain : '#FFFFFF';
< 		$bgmode = $bgmode ? $bgmode : '#D1EEEE';
< 		$txtmode = $txtmode ? $txtmode : '#000000';
< 		$bgfastmut = $bgfastmut ? $bgfastmut : '#69001A';
< 		$txtfastmut = $txtfastmut ? $txtfastmut : '#FFFFFF';
< 		$bg1_12 = $bg1_12 ? $bg1_12 : '#414E68';
< 		$txt1_12 = $txt1_12 ? $txt1_12 : '#FFFFFF';
< 		$bg13_25 = $bg13_25 ? $bg13_25 : '#41678A';
< 		$txt13_25 = $txt13_25 ? $txt13_25 : '#FFFFFF';
< 		$bg26_37 = $bg26_37 ? $bg26_37 : '#2E8899';
< 		$txt26_37 = $txt26_37 ? $txt26_37 : '#FFFFFF';
< 		$bg38_67 = $bg38_67 ? $bg38_67 : '#44A1B8';
< 		$txt38_67 = $txt38_67 ? $txt38_67 : '#FFFFFF';
< 		$bg111 = $bg111 ? $bg111 : '#05B8CC';
< 		$txt111 = $txt111 ? $txt111 : '#FFFFFF';
< ?>
< 		<tr>
< 			<td><?php echo $admtext['mainbackground']; ?>:</td>
< 			<td><input type="text" value="<?php echo stripslashes($bgmain); ?>" name="bgmain" size="7">&nbsp;
< 			<?php echo $admtext['textcolor']; ?>:
< 			<input type="text" value="<?php echo stripslashes($txtmain); ?>" name="txtmain" size="7">&nbsp;&nbsp;
< 			<input type="text" class="<?php echo $mainclass;?>" style="background-color:<?php echo $bgmain;?>; color:<?php echo $txtmain;?>;" value="<?php echo $admtext['textcolor']; ?>" id="exmain" disabled></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['modebackground']; ?>:</td>
< 			<td><input type="text" value="<?php echo stripslashes($bgmode); ?>" name="bgmode" size="7">&nbsp;
< 			<?php echo $admtext['textcolor']; ?>:
< 			<input type="text" value="<?php echo stripslashes($txtmode); ?>" name="txtmode" size="7">&nbsp;&nbsp;
< 			<input type="text" class="center" style="background-color:<?php echo $bgmode;?>; color:<?php echo $txtmode;?>;" value="<?php echo $admtext['textcolor']; ?>" name="exmode" disabled></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['fastmutbackground']; ?>:</td>
< 			<td><input type="text" value="<?php echo stripslashes($bgfastmut); ?>" name="bgfastmut" size="7">&nbsp;
< 			<?php echo $admtext['textcolor']; ?>:
< 			<input type="text" value="<?php echo stripslashes($txtfastmut); ?>" name="txtfastmut" size="7">&nbsp;&nbsp;
< 			<input type="text" class="center" style="background-color:<?php echo $bgfastmut;?>; color:<?php echo $txtfastmut;?>;" value="<?php echo $admtext['textcolor']; ?>" name="exfastmut" disabled></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['background1_12']; ?>:</td>
< 			<td><input type="text" value="<?php echo stripslashes($bg1_12); ?>" name="bg1_12" size="7">&nbsp;
< 			<?php echo $admtext['textcolor']; ?>:
< 			<input type="text" value="<?php echo stripslashes($txt1_12); ?>" name="txt1_12" size="7">&nbsp;&nbsp;
< 			<input type="text" class="center" style="background-color:<?php echo $bg1_12;?>; color:<?php echo $txt1_12;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex1_12" disabled></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['background13_25']; ?>:</td>
< 			<td><input type="text" value="<?php echo stripslashes($bg13_25); ?>" name="bg13_25" size="7">&nbsp;
< 			<?php echo $admtext['textcolor']; ?>:
< 			<input type="text" value="<?php echo stripslashes($txt13_25); ?>" name="txt13_25" size="7">&nbsp;&nbsp;
< 			<input type="text" class="center" style="background-color:<?php echo $bg13_25;?>; color:<?php echo $txt13_25;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex13_25" disabled></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['background26_37']; ?>:</td>
< 			<td><input type="text" value="<?php echo stripslashes($bg26_37); ?>" name="bg26_37" size="7">&nbsp;
< 			<?php echo $admtext['textcolor']; ?>:
< 			<input type="text" value="<?php echo stripslashes($txt26_37); ?>" name="txt26_37" size="7">&nbsp;&nbsp;
< 			<input type="text" class="center" style="background-color:<?php echo $bg26_37;?>; color:<?php echo $txt26_37;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex26_37" disabled></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['background38_67']; ?>:</td>
< 			<td><input type="text" value="<?php echo stripslashes($bg38_67); ?>" name="bg38_67" size="7">&nbsp;
< 			<?php echo $admtext['textcolor']; ?>:
< 			<input type="text" value="<?php echo stripslashes($txt38_67); ?>" name="txt38_67" size="7">&nbsp;&nbsp;
< 			<input type="text" class="center" style="background-color:<?php echo $bg38_67;?>; color:<?php echo $txt38_67;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex38_67" disabled></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['background111']; ?>:</td>
< 			<td><input type="text" value="<?php echo stripslashes($bg111); ?>" name="bg111" size="7">&nbsp;
< 			<?php echo $admtext['textcolor']; ?>:
< 			<input type="text" value="<?php echo stripslashes($txt111); ?>" name="txt111" size="7">&nbsp;&nbsp;
< 			<input type="text" class="center" style="background-color:<?php echo $bg111;?>; color:<?php echo $txt111;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex111" disabled></td>
< 		</tr>
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr><td colspan="2"><?php echo $admtext['getcolorcodes']; ?> -> <a href="http://hnl.name/color-schemer-online/" class="snlink" target="_blank"><?php echo $admtext['colorschemer']; ?></a></td></tr>
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 	</table>
< 	</div>
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus13",0,"misc",$admtext['miscsection'],""); ?>
< 
< 	<div id="misc" style="display:none">
< 	<table class="normal">
< 		<tr><td colspan="2">&nbsp;</td></tr>
< 		<tr><td><?php echo $admtext['maxsearchresults']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $maxsearchresults; ?>" name="maxsearchresults" size="5"></td></tr>
< 		<tr>
< 			<td><?php echo $admtext['indstart']; ?>:</td>
< 			<td colspan="4">
< 				<select name="tng_istart">
< 					<option value="0"<?php if( !$tngconfig['istart'] ) echo " selected"; ?>><?php echo $admtext['allinfo']; ?></option>
< 					<option value="1"<?php if( $tngconfig['istart'] ) echo " selected"; ?>><?php echo $admtext['persinfo']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['shownotes']; ?>:</td>
< 			<td colspan="4">
< 				<select name="notestogether">
< 					<option value="0"<?php if( !$notestogether ) echo " selected"; ?>><?php echo $admtext['notesapart']; ?></option>
< 					<option value="1"<?php if( $notestogether == 1 ) echo " selected"; ?>><?php echo $admtext['notestogether']; ?></option>
< 					<option value="2"<?php if( $notestogether == 2 ) echo " selected"; ?>><?php echo $admtext['notestogether2']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['scrollcite']; ?>:</td>
< 			<td>
< 				<select name="scrollcite">
< 					<option value="1"<?php if( $tngconfig['scrollcite'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="0"<?php if( !$tngconfig['scrollcite'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 
< 		<tr><td><?php echo $admtext['time_offset']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $time_offset; ?>" name="time_offset" size="5">  <?php echo $admtext['servertime'] . " <strong>" . date("D h:i a") . "</strong> "; $new_U=date("U")+$time_offset*3600; echo $admtext['sitetime'] . " <strong>" . date("D h:i a", $new_U) . "</strong>"; ?></td></tr>
< 		<tr><td><?php echo $admtext['edit_timeout']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $tngconfig['edit_timeout']; ?>" name="edit_timeout" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['maxgedcom']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $maxgedcom; ?>" name="maxgedcom" size="5"></td></tr>
< 		<tr><td><?php echo $admtext['change_cutoff']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $change_cutoff; ?>" name="change_cutoff" size="5"> <?php echo $admtext['nocutoff']; ?></td></tr>
< 		<tr><td><?php echo $admtext['change_limit']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $change_limit; ?>" name="change_limit" size="5"></td></tr>
< 		<tr>
< 			<td><?php echo $admtext['datefmt']; ?>:</td>
< 			<td colspan="4">
< 				<select name="prefereuro">
< 					<option value="false"<?php if( $tngconfig['preferEuro'] == "false" ) echo " selected"; ?>><?php echo $admtext['monthfirst']; ?></option>
< 					<option value="true"<?php if( $tngconfig['preferEuro'] == "true" ) echo " selected"; ?>><?php echo $admtext['dayfirst']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['calstart']; ?>:</td>
< 			<td colspan="4">
< 				<select name="calstart">
< 					<option value="0"<?php if( !isset($tngconfig['calstart']) || $tngconfig['calstart'] == "0" ) echo " selected"; ?>><?php echo $text['sunday']; ?></option>
< 					<option value="1"<?php if( $tngconfig['calstart'] == "1" ) echo " selected"; ?>><?php echo $text['monday']; ?></option>
< 					<option value="2"<?php if( $tngconfig['calstart'] == "2" ) echo " selected"; ?>><?php echo $text['tuesday']; ?></option>
< 					<option value="3"<?php if( $tngconfig['calstart'] == "3" ) echo " selected"; ?>><?php echo $text['wednesday']; ?></option>
< 					<option value="4"<?php if( $tngconfig['calstart'] == "4" ) echo " selected"; ?>><?php echo $text['thursday']; ?></option>
< 					<option value="5"<?php if( $tngconfig['calstart'] == "5" ) echo " selected"; ?>><?php echo $text['friday']; ?></option>
< 					<option value="6"<?php if( $tngconfig['calstart'] == "6" ) echo " selected"; ?>><?php echo $text['saturday']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['pardata']; ?>:</td>
< 			<td>
< 				<select name="pardata">
< 					<option value="0"<?php if( !$tngconfig['pardata'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['palldata']; ?></option>
< 					<option value="1"<?php if( $tngconfig['pardata'] == 1 ) echo " selected=\"selected\""; ?>><?php echo $admtext['pstdonly']; ?></option>
< 					<option value="2"<?php if( $tngconfig['pardata'] == 2 ) echo " selected=\"selected\""; ?>><?php echo $admtext['pnoevents']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr><td><?php echo $admtext['lineending']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $lineendingdisplay; ?>" name="lineending" size="5"></td></tr>
< 		<tr>
< 			<td><?php echo $admtext['encrtype']; ?>:</td>
< 			<td>
< 				<select name="password_type">
< <?php
< 	$encrtypes = PasswordTypeList();
< 	foreach($encrtypes as $encrtype) {
< 		$display = $encrtype != "none" ? $encrtype : $admtext['none'];
< 		echo "<option value=\"$encrtype\"";
<         if($encrtype == $tngconfig['password_type']) echo " selected=\"selected\"";
<         echo ">$display</option>\n";
< 	}
< ?>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['places1tree']; ?>:</td>
< 			<td>
< 				<select name="places1tree" id="places1tree" onchange="flipPlaces(this);">
< 					<option value="0"<?php if( !$tngconfig['places1tree'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['places1tree'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 				<input type="button" value="<?php echo $admtext['merge']; ?>" id="merge" onclick="convertPlaces('merge');" style="display:none"/>
< 				<span id="mergeexpl" style="display:none"><?php echo $admtext['mergeexpl']; ?></span>
< 				<select name="placetree" id="placetree" style="display:none">
< <?php
< 	foreach($treeList as $treerow) {
< 		echo "	<option value=\"{$treerow['gedcom']}\">{$treerow['treename']}</option>\n";
< 	}
< ?>
< 				</select>
< 				<input type="button" value="<?php echo $admtext['convert']; ?>" id="convert" onclick="convertPlaces('convert');" style="display:none"/>
< 				<span id="convertexpl" style="display:none"><?php echo $admtext['convexpl']; ?></span>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['autogeo']; ?>:</td>
< 			<td>
< 				<select name="autogeo">
< 					<option value="0"<?php if( !$tngconfig['autogeo'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['autogeo'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['reuseids']; ?>:</td>
< 			<td>
< 				<select name="oldids">
< 					<option value=""<?php if( !$tngconfig['oldids'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['oldids'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['lastimport']; ?>:</td>
< 			<td>
< 				<select name="lastimport">
< 					<option value=""<?php if( !$tngconfig['lastimport'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['lastimport'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showtasks']; ?>:</td>
< 			<td>
< 				<select name="hidetasks">
< 					<option value=""<?php if( !$tngconfig['hidetasks'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['hidetasks'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['showtotals']; ?>:</td>
< 			<td>
< 				<select name="hidetotals">
< 					<option value=""<?php if( !$tngconfig['hidetotals'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 					<option value="1"<?php if( $tngconfig['hidetotals'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr><td><?php echo $admtext['backupdays']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $tngconfig['backupdays']; ?>" name="backupdays" size="5"> <?php echo $admtext['nocutoff']; ?></td></tr>
< 		<tr>
< 			<td><?php echo $admtext['nointernet']; ?>:</td>
< 			<td>
< 				<select name="tng_offline">
< 					<option value=""<?php if( !$tngconfig['offline'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
< 					<option value="1"<?php if( $tngconfig['offline'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< <!--
< 		<tr>
< 			<td><?php /*echo $admtext['showmatches'];*/ ?>:</td>
< 			<td>
< 				<select name="webmatches">
< 					<option value=""<?php /*if( !$tngconfig['webmatches'] ) echo " selected=\"selected\"";*/ ?>><?php /*echo $admtext['yes'];*/ ?></option>
< 					<option value="1"<?php /*if( $tngconfig['webmatches'] ) echo " selected=\"selected\"";*/ ?>><?php /*echo $admtext['no'];*/ ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php /*echo $admtext['mhmatchtype'];*/ ?>:</td>
< 			<td>
< 				<select name="mhmatchtype">
< 					<option value="all"<?php /*if( $tngconfig['mhmatchtype'] == "all" ) echo " selected=\"selected\"";*/ ?>><?php /*echo $admtext['all'];*/ ?></option>
< 					<option value="smart_matches"<?php /*if( $tngconfig['mhmatchtype'] == "smart_matches" ) echo " selected=\"selected\"";*/ ?>>Smart Matches</option>
< 					<option value="record_matches"<?php /*if( $tngconfig['mhmatchtype'] == "record_matches" ) echo " selected=\"selected\"";*/ ?>>Record Matches</option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php /*echo $admtext['mhconfidence'];*/ ?>:</td>
< 			<td>
< 				<select name="mhmatchconf">
< 				<?php
< 					/*
< 					for($c = 20; $c <= 100; $c += 10) {
< 						echo "<option value=\"$c\"";
< 						if( $tngconfig['mhmatchconf'] == $c ) 
< 							echo " selected=\"selected\"";
< 						echo ">$c" . "%</option>\n";
< 					}
< 					*/
< 				?>
< 				</select>
< 			</td>
< 		</tr>
< -->
< 	</table>
< 	</div>
< </td>
< </tr>
< 
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
< 
< 	<input type="hidden" name="cmssupport" value="<?php echo $cms['support']; ?>">
< 	<input type="hidden" name="cmsurl" value="<?php echo $cms['url']; ?>">
< 	<input type="hidden" name="cmstngpath" value="<?php echo $cms['tngpath']; ?>">
< 	<input type="hidden" name="cmsmodule" value="<?php echo $cms['module']; ?>">
< 	<input type="hidden" name="cmscloaklogin" value="<?php echo $cms['cloaklogin']; ?>">
< 	<input type="hidden" name="cmscredits" value="<?php echo $cms['credits']; ?>">
< 
< 	<input type="hidden" value="1" name="safety">
< 	<input type="hidden" value="<?php echo $photos_table; ?>" name="photos_table">
< 	<input type="hidden" value="<?php echo $histories_table; ?>" name="histories_table">
< 	<input type="hidden" value="<?php echo $headstones_table; ?>" name="headstones_table">
< 	<input type="hidden" value="<?php echo $photolinks_table; ?>" name="photolinks_table">
< 	<input type="hidden" value="<?php echo $doclinks_table; ?>" name="doclinks_table">
< 	<input type="hidden" value="<?php echo $hslinks_table; ?>" name="hslinks_table">
< </td>
< </tr>
< 
< </table>
< </form>
< <?php echo "<div align=\"right\" class=\"normal\">$tng_title, v.$tng_version</div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "setup";
> //include("getlang.php");
> include("$mylanguage/admintext.php");
> 
> $treeList = array();
> if( $link ) {
> 	$admin_login = 1;
> 	include("checklogin.php");
> 	include("version.php");
> 
> 	if( $assignedtree || !$allow_edit ) {
> 		$message = $admtext['norights'];
> 		header( "Location: admin_login.php?message=" . urlencode($message) );
> 		exit;
> 	}
> 
> 	$query = "SELECT gedcom, treename FROM $trees_table ORDER BY treename";
> 	$result = @tng_query($query);
> 	while( $row = tng_fetch_assoc($result) ) {
> 		$treeList[] = $row;
> 	}
> }
> else
> 	$result = false;
> 
> if(!$lineendingdisplay) {
> 	if($lineending == "\r\n")
> 		$lineendingdisplay = "\\r\\n";
> 	elseif($lineending == "\r")
> 		$lineendingdisplay = "\\r";
> 	elseif($lineending == "\n")
> 		$lineendingdisplay = "\\n";
> }
> if( !$tngconfig['backupdays'] ) $tngconfig['backupdays'] = 30;
> $tngconfig['doctype'] = preg_replace("/\"/", "&#34;",$tngconfig['doctype']);
> $sitename = preg_replace("/\"/", "&#34;",$sitename);
> $site_desc = preg_replace("/\"/", "&#34;",$site_desc);
> $dbowner = preg_replace("/\"/", "&#34;",$dbowner);
> $tngconfig['footermsg'] = preg_replace("/\"/", "&#34;",$tngconfig['footermsg']);
> if(empty($tngconfig['altbirth'])) $tngconfig['altbirth'] = "CHR,BAPM";
> if(!isset($tngconfig['scrollnotes'])) $tngconfig['scrollnotes'] = 1;
> 
> $helplang = findhelp("config_help.php");
> 
> tng_adminheader( $admtext['modifysettings'], $flags );
> ?>
> <script type="text/javascript">
> function toggleAll(display) {
> 	toggleSection('db','plus0',display);
> 	toggleSection('tables','plus1',display);
> 	toggleSection('folders','plus2',display);
> 	toggleSection('site','plus3',display);
> 	toggleSection('media','plus4',display);
> 	toggleSection('lang','plus5',display);
> 	toggleSection('priv','plus6',display);
> 	toggleSection('names','plus7',display);
> 	toggleSection('cemeteries','plus8',display);
> 	toggleSection('mailreg','plus9',display);
> 	toggleSection('pref','plus10',display);
> 	toggleSection('mobile','plus11',display);
> 	toggleSection('dna','plus12',display);
> 	toggleSection('misc','plus13',display);
> 	return false;
> }
> 
> function flipTreeRestrict(requirelogin) {
> 	if(parseInt(requirelogin)) {
> 		jQuery('#treerestrict').show();
> 		jQuery('#trdisabled').hide();
> 	}
> 	else {
> 		jQuery('#treerestrict').hide();
> 		jQuery('#trdisabled').show();
> 	}
> }
> 
> function toggleAllowReg() {
> 	if(document.form1.disallowreg.selectedIndex == 1) {   //off
> 		jQuery('#autoapp').prop('disabled',true);
> 		jQuery('#autotree').prop('disabled',true);
> 		jQuery('#ackemail').prop('disabled',true);
> 		jQuery('#omitpwd').prop('disabled',true);
> 	}
> 	else {
> 		jQuery('#autoapp').prop('disabled',false);
> 		jQuery('#autotree').prop('disabled',false);
> 		if(document.form1.autoapp.selectedIndex == 0) {
> 			jQuery('#ackemail').prop('disabled',false);
> 		}
> 		jQuery('#omitpwd').prop('disabled',false);
> 	}
> }
> 
> function toggleAutoApprove() {
> 	if(document.form1.autoapp.selectedIndex == 1) {   //off
> 		jQuery('#ackemail').prop('disabled',true);
> 	}
> 	else {
> 		jQuery('#ackemail').prop('disabled',false);
> 	}
> }
> 
> function flipPlaces(select) {
> 	if(select.selectedIndex) {
> 		//change to NO
> 		jQuery('#merge').show();
> 		jQuery('#mergeexpl').show();
> 		jQuery('#convert').hide();
> 		jQuery('#convertexpl').hide();
> 		jQuery('#placetree').hide();
> 	}
> 	else {
> 		//change to YES
> 		jQuery('#convert').show();
> 		jQuery('#convertexpl').show();
> 		jQuery('#placetree').show();
> 		jQuery('#merge').hide();
> 		jQuery('#mergeexpl').hide();
> 	}
> }
> 
> function convertPlaces(command) {
> 	var options = {action:command};
> 	if(command == "convert")
> 		options.placetree = jQuery('#placetree').val();
> 	jQuery('#'+command+'expl').html('<img src="' + cmstngpath + 'img/spinner.gif" style="border:0px;vertical-align:middle;">');
> 
> 	jQuery.ajax({
> 		url: 'ajx_placeconvert.php',
> 		data: options,
> 		type: 'GET',
> 		dataType: 'html',
> 		success: function(req) {
>             jQuery('#'+command+'expl').html(req);
>         }
>     });
> 
> 	return false;
> }
> 
> function convertMedia(select) {
> 	var options = {action:select.val()};
> 	jQuery('#mediaexpl').html('<img src="' + cmstngpath + 'img/spinner.gif" style="border:0px;vertical-align:middle;"/>');
> 
> 	jQuery.ajax({
> 		url: 'ajx_mediaconvert.php',
> 		data: options,
> 		type: 'GET',
> 		dataType: 'html',
> 		success: function(req) {
>             jQuery('#mediaexpl').html(req);
>         }
>     });
> 
> 	return false;
> }
> </script>
> <script type="text/javascript" src="js/admin.js"></script>
> </head>
> 
> <?php
> 	echo tng_adminlayout();
> 
> 	$setuptabs[0] = array(1,"admin_setup.php",$admtext['configuration'],"configuration");
> 	$setuptabs[1] = array(1,"admin_diagnostics.php",$admtext['diagnostics'],"diagnostics");
> 	$setuptabs[2] = array(1,"admin_setup.php?sub=tablecreation",$admtext['tablecreation'],"tablecreation");
> 	$setuptabs[3] = array(1,"#",$admtext['configsettings'],"gen");
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/config_help.php#modify');\" class=\"lightlink\">{$admtext['help']}</a>";
> 	$innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('on');\">{$text['expandall']}</a> &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('off');\">{$text['collapseall']}</a>";
> 	$menu = doMenu($setuptabs,"gen",$innermenu);
> 	echo displayHeadline($admtext['setup'] . " &gt;&gt; " . $admtext['configuration'] . " &gt;&gt; " . $admtext['configsettings'],"img/setup_icon.gif",$menu,"");
> ?>
> 
> <div class="admin-main">
> <form action="admin_updateconfig.php" method="post" name="form1" >
> 
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus0",0,"db",$admtext['dbsection'],""); ?>
> 
> 	<div id="db" style="display:none"><br/>
> 	<table border="0" class="normal">
> 		<tr><td><?php echo $admtext['dbhost']; ?>:</td><td><input type="text" value="<?php echo $database_host; ?>" name="new_database_host" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['dbname']; ?>:</td><td><input type="text" value="<?php echo $database_name; ?>" name="new_database_name" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['dbusername']; ?>:</td><td><input type="text" value="<?php echo $database_username; ?>" name="new_database_username" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['dbpassword']; ?>:</td><td><input type="text" value="<?php echo $database_password; ?>" name="new_database_password" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['dbport']; ?>:</td><td><input type="text" value="<?php echo $database_port; ?>" name="new_database_port" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['dbsocket']; ?>:</td><td><input type="text" value="<?php echo $database_socket; ?>" name="new_database_socket" size="20"></td></tr>
> <?php
> 	$query = "SELECT count(userID) as ucount FROM $users_table";
> 	$uresult = @tng_query($query);
> 	if( $uresult ) {
> 		$urow = tng_fetch_assoc($uresult);
> 		tng_free_result($uresult);
> 	}
> 	else
> 		$urow['ucount'] = 0;
> ?>
> 		<tr><td colspan="2">&nbsp;</td></tr>
> 		<tr>
> 			<td><?php echo $admtext['maintmode']; ?>:</td>
> 			<td>
> 				<select name="maint"<?php if(!$urow['ucount']) echo " disabled=\"disabled\""; ?>>
> 					<option value=""<?php if( !$tngconfig['maint'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['off']; ?></option>
> 					<option value="1"<?php if( $tngconfig['maint'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['on']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 	</table>
> 	</div>
> 
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus1",0,"tables",$admtext['tablesection'],""); ?>
> 
> 	<div id="tables" style="display:none"><br/>
> 	<table border="0" cellspacing="0" cellpadding="0" class="normal">
> 		<tr>
> 			<td valign="top">
> 				<table class="normal">
> 					<tr><td><?php echo $admtext['people']; ?>:</td><td><input type="text" value="<?php echo $people_table; ?>" name="people_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['families']; ?>:</td><td><input type="text" value="<?php echo $families_table; ?>" name="families_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['children']; ?>:</td><td><input type="text" value="<?php echo $children_table; ?>" name="children_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['albums']; ?>:</td><td><input type="text" value="<?php echo $albums_table; ?>" name="albums_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['album2entitiestable']; ?>:</td><td><input type="text" value="<?php echo $album2entities_table; ?>" name="album2entities_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['albumlinkstable']; ?>:</td><td><input type="text" value="<?php echo $albumlinks_table; ?>" name="albumlinks_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['media']; ?>:</td><td><input type="text" value="<?php echo $media_table; ?>" name="media_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['medialinkstable']; ?>:</td><td><input type="text" value="<?php echo $medialinks_table; ?>" name="medialinks_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['mediatypes']; ?>:</td><td><input type="text" value="<?php echo $mediatypes_table; ?>" name="mediatypes_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['addresstable']; ?>:</td><td><input type="text" value="<?php echo $address_table; ?>" name="address_table" size="20"></td></tr>
> 			 		<tr><td><?php echo $admtext['languages']; ?>:</td><td><input type="text" value="<?php echo $languages_table; ?>" name="languages_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['places']; ?>:</td><td><input type="text" value="<?php echo $places_table; ?>" name="places_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['cemeteries']; ?>:</td><td><input type="text" value="<?php echo $cemeteries_table; ?>" name="cemeteries_table" size="20"></td></tr>
> 				</table>
> 			</td>
> 			<td>&nbsp;</td>
> 			<td valign="top">
> 				<table class="normal">
> 					<tr><td><?php echo $admtext['statestable']; ?>:</td><td><input type="text" value="<?php echo $states_table; ?>" name="states_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['countriestable']; ?>:</td><td><input type="text" value="<?php echo $countries_table; ?>" name="countries_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['users']; ?>:</td><td><input type="text" value="<?php echo $users_table; ?>" name="users_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['sources']; ?>:</td><td><input type="text" value="<?php echo $sources_table; ?>" name="sources_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['citations']; ?>:</td><td><input type="text" value="<?php echo $citations_table; ?>" name="citations_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['imgtags']; ?>:</td><td><input type="text" value="<?php echo $image_tags_table; ?>" name="image_tags_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['repositories']; ?>:</td><td><input type="text" value="<?php echo $repositories_table; ?>" name="repositories_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['events']; ?>:</td><td><input type="text" value="<?php echo $events_table; ?>" name="events_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['eventtypes']; ?>:</td><td><input type="text" value="<?php echo $eventtypes_table; ?>" name="eventtypes_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['reports']; ?>:</td><td><input type="text" value="<?php echo $reports_table; ?>" name="reports_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['trees']; ?>:</td><td><input type="text" value="<?php echo $trees_table; ?>" name="trees_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['notes']; ?>:</td><td><input type="text" value="<?php echo $xnotes_table; ?>" name="xnotes_table" size="20"></td></tr>
> 				</table>
> 			</td>
> 			<td>&nbsp;</td>
> 			<td valign="top">
> 				<table class="normal">
> 					<tr><td><?php echo $admtext['notelinkstable']; ?>:</td><td><input type="text" value="<?php echo $notelinks_table; ?>" name="notelinks_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['saveimporttable']; ?>:</td><td><input type="text" value="<?php echo $saveimport_table; ?>" name="saveimport_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['branches']; ?>:</td><td><input type="text" value="<?php echo $branches_table; ?>" name="branches_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['brlinkstable']; ?>:</td><td><input type="text" value="<?php echo $branchlinks_table; ?>" name="branchlinks_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['tleventstable']; ?>:</td><td><input type="text" value="<?php echo $tlevents_table; ?>" name="tlevents_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['temptable']; ?>:</td><td><input type="text" value="<?php echo $temp_events_table; ?>" name="temp_events_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['associations']; ?>:</td><td><input type="text" value="<?php echo $assoc_table; ?>" name="assoc_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['mostwanted']; ?>:</td><td><input type="text" value="<?php echo $mostwanted_table; ?>" name="mostwanted_table" size="20"></td></tr>
> 					<!--<tr><td><?php /*echo $admtext['mhrequests'];*/ ?>:</td><td><input type="text" value="<?php /*echo $mhrequests_table;*/ ?>" name="mhrequests_table" size="20"></td></tr>-->
> 					<tr><td><?php echo $admtext['dna_tests']; ?>:</td><td><input type="text" value="<?php echo $dna_tests_table; ?>" name="dna_tests_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['dna_groups']; ?>:</td><td><input type="text" value="<?php echo $dna_groups_table; ?>" name="dna_groups_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['dna_links']; ?>:</td><td><input type="text" value="<?php echo $dna_links_table; ?>" name="dna_links_table" size="20"></td></tr>
> 					<tr><td><?php echo $admtext['templates']; ?>:</td><td><input type="text" value="<?php echo $templates_table; ?>" name="templates_table" size="20"></td></tr>
> 				</table>
> 			</td>
> 		</tr>
> 	</table>
> 	</div>
> 
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus2",0,"folders",$admtext['foldersection'],""); ?>
> 
> 	<div id="folders" style="display:none"><br/>
> 	<table class="normal">
> 		<tr><td class="nw"><?php echo $admtext['rootpath']; ?>:</td><td><input type="text" value="<?php echo $saved_rootpath; ?>" name="newrootpath" class="verylongfield"></td></tr>
> <?php
> 	if(!$saved_rootpath) {
> ?>
> 		<tr><td>&nbsp;</td><td><?php echo $admtext['default'] . ": " . $rootpath; ?></td>
> <?php
> 	}
> ?>
> 		<tr><td class="nw"><?php echo $admtext['subroot']; ?>*:</td><td><input type="text" value="<?php echo $tngconfig['subroot']; ?>" name="newsubroot" class="verylongfield"></td>
> 		<tr><td>&nbsp;</td><td>*<?php echo $admtext['srexpl']; ?></td>
> 
> 		<tr><td class="nw"><?php echo $admtext['photopath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $photopath; ?>" name="photopath" class="verylongfield"><input type="hidden" id="photos_org" value="<?php echo $photopath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onclick="makeFolder('photos',document.form1.photopath.value);"> <span id="msg_photos"></span></td></tr>
> 		<tr><td class="nw"><?php echo $admtext['documentpath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $documentpath; ?>" name="documentpath" class="verylongfield"><input type="hidden" id="documents_org" value="<?php echo $documentpath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onClick="makeFolder('documents',document.form1.documentpath.value);"> <span id="msg_documents"></span></td></tr>
> 		<tr><td class="nw"><?php echo $admtext['historypath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $historypath; ?>" name="historypath" class="verylongfield"><input type="hidden" id="histories_org" value="<?php echo $historypath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onClick="makeFolder('histories',document.form1.historypath.value);"> <span id="msg_histories"></span></td></tr>
> 		<tr><td class="nw"><?php echo $admtext['headstonepath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $headstonepath; ?>" name="headstonepath" class="verylongfield"><input type="hidden" id="headstones_org" value="<?php echo $headstonepath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onClick="makeFolder('headstones',document.form1.headstonepath.value);"> <span id="msg_headstones"></span></td></tr>
> 		<tr><td class="nw"><?php echo $admtext['mediapath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $mediapath; ?>" name="mediapath" class="verylongfield"><input type="hidden" id="media_org" value="<?php echo $mediapath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onClick="makeFolder('media',document.form1.mediapath.value);"> <span id="msg_media"></span></td></tr>
> 		<tr><td class="nw"><?php echo $admtext['modspath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $modspath; ?>" name="modspath" class="verylongfield"><input type="hidden" id="mods_org" value="<?php echo $modspath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onClick="makeFolder('mods',document.form1.modspath.value);"> <span id="msg_mods"></span></td></tr>
> 		<tr><td class="nw"><?php echo $admtext['extspath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $extspath; ?>" name="extspath" class="verylongfield"><input type="hidden" id="exts_org" value="<?php echo $extspath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onClick="makeFolder('exts',document.form1.extspath.value);"> <span id="msg_exts"></span></td></tr>
> 		<tr><td class="nw"><?php echo $admtext['gendex']; ?>:</td>
> 			<td><input type="text" value="<?php echo $gendexfile; ?>" name="gendexfile" class="verylongfield"><input type="hidden" id="gendex_org" value="<?php echo $gendexfile; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onClick="makeFolder('gendex',document.form1.gendexfile.value);"> <span id="msg_gendex"></span></td></tr>
> 		<tr><td colspan="2">&nbsp;</td></tr>
> 		<tr><td class="nw"><?php echo $admtext['backuppath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $backuppath; ?>" name="backuppath" class="verylongfield"><input type="hidden" id="backups_org" value="<?php echo $backuppath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onClick="makeFolder('backups',document.form1.backuppath.value);"> <span id="msg_backups"></span></td></tr>
> 		<tr><td></td><td><input type="checkbox" name="saveconfig" value="1" <?php if( !empty($tngconfig['saveconfig']) ) { echo "checked=\"checked\""; } ?>> <?php echo $admtext['saveincfg']; ?></td></tr>
> 	</table>
> 	</div>
> 
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus3",0,"site",$admtext['sitesection'],""); ?>
> 
> 	<div id="site" style="display:none"><br/>
> 	<table class="normal">
> 		<tr><td><?php echo $admtext['homepage']; ?>:</td><td><input type="text" value="<?php echo $homepage; ?>" name="homepage" size="40"></td></tr>
> 		<tr><td><?php echo $admtext['tngdomain']; ?>:</td><td><input type="text" value="<?php echo $tngdomain; ?>" name="tngdomain" size="40"></td></tr>
> 		<tr><td><?php echo $admtext['sitename']; ?>:</td><td><input type="text" value="<?php echo $sitename; ?>" name="sitename" size="40"></td></tr>
> 		<tr><td valign="top"><?php echo $admtext['site_desc']; ?>:</td><td><textarea name="site_desc" rows="2" cols="65"><?php echo $site_desc; ?></textarea></td></tr>
> 		<tr><td><?php echo $admtext['doctype']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['doctype']; ?>" name="doctype" size="70"></td></tr>
> 		<tr><td><?php echo $admtext['siteowner']; ?>:</td><td><input type="text" value="<?php echo $dbowner; ?>" name="dbowner" size="40"></td></tr>
> 		<tr><td><?php echo $admtext['customheader']; ?>:</td><td><input type="text" value="<?php echo $customheader; ?>" name="customheader" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['customfooter']; ?>:</td><td><input type="text" value="<?php echo $customfooter; ?>" name="customfooter" size="20"></td></tr>
> 		<tr><td valign="top"><?php echo $admtext['footermsg']; ?>:</td><td><textarea name="tng_footermsg" rows="2" cols="65"><?php echo $tngconfig['footermsg']; ?></textarea></td></tr>
> 		<tr><td><?php echo $admtext['custommeta']; ?>:</td><td><input type="text" value="<?php echo $custommeta; ?>" name="custommeta" size="20"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['iconloc']; ?>:</td>
> 			<td>
> 				<select name="tng_menu">
> 					<option value="0"<?php if( !$tngconfig['menu'] ) echo " selected"; ?>><?php echo $admtext['topright']; ?></option>
> 					<option value="1"<?php if( $tngconfig['menu'] == 1 ) echo " selected"; ?>><?php echo $admtext['topleft']; ?></option>
> 					<option value="2"<?php if( $tngconfig['menu'] == 2 ) echo " selected"; ?>><?php echo $admtext['nodisplay']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showhome']; ?>:</td>
> 			<td>
> 				<select name="showhome">
> 					<option value="0"<?php if( !$tngconfig['showhome'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['showhome'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showsearch']; ?>:</td>
> 			<td>
> 				<select name="showsearch">
> 					<option value="0"<?php if( !$tngconfig['showsearch'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['showsearch'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['searchchoice']; ?>:</td>
> 			<td>
> 				<select name="searchchoice">
> 					<option value="0"<?php if( !$tngconfig['searchchoice'] ) echo " selected"; ?>><?php echo $admtext['quicksearch']; ?></option>
> 					<option value="1"<?php if( $tngconfig['searchchoice'] ) echo " selected"; ?>><?php echo $admtext['advsearch']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showlogin']; ?>:</td>
> 			<td>
> 				<select name="showlogin">
> 					<option value="0"<?php if( !$tngconfig['showlogin'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['showlogin'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showshare']; ?>:</td>
> 			<td>
> 				<select name="showshare">
> 					<option value="1"<?php if( $tngconfig['showshare'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$tngconfig['showshare'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showprint']; ?>:</td>
> 			<td>
> 				<select name="showprint">
> 					<option value="0"<?php if( !$tngconfig['showprint'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['showprint'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showbmarks']; ?>:</td>
> 			<td>
> 				<select name="showbmarks">
> 					<option value="0"<?php if( !$tngconfig['showbmarks'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['showbmarks'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['hidechr']; ?>:</td>
> 			<td>
> 				<select name="hidechr">
> 					<option value="0"<?php if( !$tngconfig['hidechr'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['hidechr'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td><?php echo $admtext['altbirthtypes']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['altbirth']; ?>" name="altbirth" class="longfield"></td></tr>
> 		<tr><td><?php echo $admtext['defaulttree']; ?>:</td><td>
> 			<select name="defaulttree">
> 				<option value=""></option>
> <?php
> if( $link && $result ) {
> 	foreach($treeList as $treerow) {
> 		echo "	<option value=\"{$treerow['gedcom']}\"";
> 		if( $defaulttree == $treerow['gedcom'] ) echo " selected";
> 		echo ">{$treerow['treename']}</option>\n";
> 	}
> }
> else
> 	echo "	<option value=\"$defaulttree\" selected>$defaulttree</option>\n";
> ?>
> 			</select>
> 		</td></tr>
> 		<tr>
> 			<td><?php echo $admtext['sortevents']; ?>:</td>
> 			<td>
> 				<select name="sortbydate">
> 					<option value="0"<?php if( !$tngconfig['sortbydate'] ) echo " selected"; ?>><?php echo $admtext['sortbydate']; ?></option>
> 					<option value="1"<?php if( $tngconfig['sortbydate'] ) echo " selected"; ?>><?php echo $admtext['sortbytype']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 	</table>
> 	</div>
> 
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus4",0,"media",$admtext['media'],""); ?>
> 
> 	<div id="media" style="display:none"><br/>
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['photosext']; ?>:</td>
> 			<td>
> 				<select name="photosext">
> 					<option value="jpg"<?php if( $photosext == "jpg" ) echo " selected"; ?>>.jpg</option>
> 					<option value="gif"<?php if( $photosext == "gif" ) echo " selected"; ?>>.gif</option>
> 					<option value="png"<?php if( $photosext == "png" ) echo " selected"; ?>>.png</option>
> 					<option value="bmp"<?php if( $photosext == "bmp" ) echo " selected"; ?>>.bmp</option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showextended']; ?>:</td>
> 			<td>
> 				<select name="showextended">
> 					<option value="1"<?php if( $showextended ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$showextended ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td><?php echo $admtext['imgmaxh']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['imgmaxh']; ?>" name="imgmaxh" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['imgmaxw']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['imgmaxw']; ?>" name="imgmaxw" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['thumbprefix']; ?>:</td><td><input type="text" value="<?php echo $thumbprefix; ?>" name="thumbprefix" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['thumbsuffix']; ?>:</td><td><input type="text" value="<?php echo $thumbsuffix; ?>" name="thumbsuffix" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['thumbmaxh']; ?>:</td><td><input type="text" value="<?php echo $thumbmaxh; ?>" name="thumbmaxh" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['thumbmaxw']; ?>:</td><td><input type="text" value="<?php echo $thumbmaxw; ?>" name="thumbmaxw" size="20"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['usedefthumbs']; ?>:</td>
> 			<td>
> 				<select name="tng_usedefthumbs">
> 					<option value="0"<?php if( !$tngconfig['usedefthumbs'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['usedefthumbs'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td><?php echo $admtext['maxnoteprev']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['maxnoteprev']; ?>" name="tng_maxnoteprev" size="20"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['ssenabled']; ?>:</td>
> 			<td>
> 				<select name="tng_ssdisabled">
> 					<option value="0"<?php if( !$tngconfig['ssdisabled'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['ssdisabled'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['ssrepeat']; ?>:</td>
> 			<td>
> 				<select name="tng_ssrepeat">
> 					<option value="1"<?php if( $tngconfig['ssrepeat'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$tngconfig['ssrepeat'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['imgviewer']; ?>:</td>
> 			<td>
> 				<select name="tng_imgviewer">
> 					<option value="0"<?php if( !$tngconfig['imgviewer'] ) echo " selected"; ?>><?php echo $admtext['ldson']; ?></option>
> 					<option value="documents"<?php if( $tngconfig['imgviewer'] == "documents" ) echo " selected"; ?>><?php echo $admtext['docsonly']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['imgvheight']; ?>:</td>
> 			<td>
> 				<select name="tng_imgvheight">
> 					<option value="0"<?php if( $tngconfig['imgvheight'] == 0 ) echo " selected"; ?>><?php echo $admtext['flex']; ?></option>
> 					<option value="640"<?php if( $tngconfig['imgvheight'] == "640" ) echo " selected"; ?>><?php echo $admtext['setheight']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['hidemedia']; ?>:</td>
> 			<td>
> 				<select name="hidemedia">
> 					<option value="1"<?php if( $tngconfig['hidemedia'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$tngconfig['hidemedia'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['mediadel']; ?>:</td>
> 			<td>
> 				<select name="tng_mediadel">
> 					<option value="0"<?php if( !$tngconfig['mediadel'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['mediadel'] == 1 ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="2"<?php if( $tngconfig['mediadel'] == 2 ) echo " selected"; ?>><?php echo $admtext['onrequest']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['mediathumbs']; ?>:</td>
> 			<td>
> 				<select name="tng_mediathumbs">
> 					<option value="1"<?php if( $tngconfig['mediathumbs'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$tngconfig['mediathumbs'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['mediatrees']; ?>:</td>
> 			<td>
> 				<select name="tng_mediatrees" id="tng_mediatrees">
> 					<option value="0"<?php if( !$tngconfig['mediatrees'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['mediatrees'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 				<input type="button" value="<?php echo $admtext['convert']; ?>" id="convertmedia" onclick="convertMedia(jQuery('#tng_mediatrees'));"/>
> 				<div id="mediaexpl" style="display:inline-block"></div>
> 			</td>
> 		</tr>
> 		<tr><td>Favicon:</td><td><input type="text" value="<?php echo $tngconfig['favicon']; ?>" name="favicon" size="20"></td></tr>
> 	</table>
> 	</div>
> 
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus5",0,"lang",$admtext['language'],""); ?>
> 
> 	<div id="lang" style="display:none"><br/>
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['langfolder']; ?>:</td>
> 			<td>
> 				<select name="language">
> <?php
> 	@chdir($rootpath . $endrootpath . $languages_path);
> 	if( $handle = @opendir('.') ) {
> 		$dirs = array();
> 		while ($filename = readdir( $handle )) {
> 			if(is_dir($filename) && $filename != '..' && $filename != '.' && $filename != '@eaDir')
> 				array_push($dirs, $filename);
> 		}
> 		natcasesort( $dirs );
> 		$found_current = 0;
> 		foreach( $dirs as $dir ) {
> 			echo "<option value=\"$dir\"";
> 			if($dir == $language) {
> 				echo " selected=\"selected\"";
> 				$found_current = 1;
> 			}
> 			echo ">$dir</option>\n";
> 		}
> 		if(!$found_current)
> 			echo "<option value=\"$language\" selected=\"selected\">$language</option>\n";
> 		closedir( $handle );
> 	}
> ?>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['charset']; ?>:</td>
> 			<td>
> 				<select name="charset">
> 					<option value="UTF-8"<?php if( strtoupper($charset) == "UTF-8" ) echo " selected"; ?>>UTF-8</option>
> 					<option value="ISO-8859-1"<?php if( strtoupper($charset) == "ISO-8859-1" ) echo " selected"; ?>>ISO-8859-1 (ANSI)</option>
> 					<option value="ISO-8859-2"<?php if( strtoupper($charset) == "ISO-8859-2" ) echo " selected"; ?>>ISO-8859-2</option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['chooselang']; ?>:</td>
> 			<td>
> 				<select name="chooselang">
> 					<option value="1"<?php if( $chooselang ) echo " selected"; ?>><?php echo $admtext['allow']; ?></option>
> 					<option value="0"<?php if( !$chooselang ) echo " selected"; ?>><?php echo $admtext['disallow']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['norels']; ?>:</td>
> 			<td>
> 				<select name="norels">
> 					<option value=""<?php if( !$norels ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $norels ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 	</table>
> 	</div>
> 
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus6",0,"priv",$admtext['privsection'],""); ?>
> 
> 	<div id="priv" style="display:none"><br/>
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['requirelogin']; ?>:</td>
> 			<td>
> 				<select name="requirelogin" onchange="flipTreeRestrict(this.options[this.selectedIndex].value);">
> 					<option value="1"<?php if( $requirelogin ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$requirelogin ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['treerestrict']; ?>: &nbsp;&nbsp;</td>
> 			<td><span id="trdisabled"<?php if( $requirelogin ) echo " style=\"display:none\""; ?>><?php echo $admtext['reqloginset']; ?></span>
> 				<select name="treerestrict" id="treerestrict"<?php if( !$requirelogin ) echo " style=\"display:none\""; ?>>
> 					<option value="0"<?php if( !$treerestrict ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $treerestrict ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['ldsdefault']; ?>:</td>
> 			<td>
> 				<select name="ldsdefault">
> 					<option value="0"<?php if( !$ldsdefault ) echo " selected"; ?>><?php echo $admtext['ldson']; ?></option>
> 					<option value="1"<?php if( $ldsdefault == 1 ) echo " selected"; ?>><?php echo $admtext['ldsoff']; ?></option>
> 					<option value="2"<?php if( $ldsdefault == 2 ) echo " selected"; ?>><?php echo $admtext['ldspermit']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['livedefault']; ?>:</td>
> 			<td>
> 				<select name="livedefault">
> 					<option value="2"<?php if( $livedefault == 2 ) echo " selected"; ?>><?php echo $admtext['ldson']; ?></option>
> 					<option value="1"<?php if( $livedefault == 1 ) echo " selected"; ?>><?php echo $admtext['ldsoff']; ?></option>
> 					<option value="0"<?php if( !$livedefault ) echo " selected"; ?>><?php echo $admtext['ldspermit']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['shownames']; ?>:</td>
> 			<td>
> 				<select name="nonames">
> 					<option value="0"<?php if( !$nonames ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $nonames == 1 ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="2"<?php if( $nonames == 2 ) echo " selected"; ?>><?php echo $admtext['initials']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['shownamespr']; ?>:</td>
> 			<td>
> 				<select name="nnpriv">
> 					<option value="0"<?php if( !$tngconfig['nnpriv'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['nnpriv'] == 1 ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="2"<?php if( $tngconfig['nnpriv'] == 2 ) echo " selected"; ?>><?php echo $admtext['initials']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['cookieapproval']; ?>:</td>
> 			<td>
> 				<select name="tng_cookieapproval">
> 					<option value="0"<?php if( !$tngconfig['cookieapproval'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['cookieapproval'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['dataprotectmsg']; ?>:</td>
> 			<td>
> 				<select name="tng_dataprotect">
> 					<option value="0"<?php if( !$tngconfig['dataprotect'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['dataprotect'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['askconsent']; ?>:</td>
> 			<td>
> 				<select name="tng_askconsent">
> 					<option value="0"<?php if( !$tngconfig['askconsent'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['askconsent'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['livingchecked']; ?>:</td>
> 			<td>
> 				<select name="tng_livingunchecked">
> 					<option value="0"<?php if( !$tngconfig['livingunchecked'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['livingunchecked'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['allowsuggest']; ?>:</td>
> 			<td>
> 				<select name="tng_nosuggest">
> 					<option value="0"<?php if( !$tngconfig['nosuggest'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['nosuggest'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['allowcsv']; ?>:</td>
> 			<td>
> 				<select name="tng_allowcsv">
> 					<option value="0"<?php if( !$tngconfig['allowcsv'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['allowcsv'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td><?php echo $admtext['sitekey']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['sitekey']; ?>" name="rcsitekey" class="longfield"></td></tr>
> 		<tr><td><?php echo $admtext['secret']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['secret']; ?>" name="rcsecret" class="longfield"></td></tr>
> 	</table>
> 	</div>
> 
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus7",0,"names",$admtext['namesection'],""); ?>
> 
> 	<div id="names" style="display:none"><br/>
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['nameorder']; ?>:</td>
> 			<td>
> 				<select name="nameorder">
> 					<option value=""></option>
> 					<option value="1"<?php if( $nameorder == 1 ) echo " selected"; ?>><?php echo $admtext['western']; ?></option>
> 					<option value="2"<?php if( $nameorder == 2 ) echo " selected"; ?>><?php echo $admtext['oriental']; ?></option>
> 					<option value="3"<?php if( $nameorder == 3 ) echo " selected"; ?>><?php echo $admtext['lnfirst']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['ucsurnames']; ?>:</td>
> 			<td>
> 				<select name="ucsurnames">
> 					<option value="0"<?php if( !$tngconfig['ucsurnames'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['ucsurnames'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['lnprefixes']; ?>:</td>
> 			<td>
> 				<select name="lnprefixes">
> 					<option value="0"<?php if( !$lnprefixes ) echo " selected"; ?>><?php echo $admtext['lntogether']; ?></option>
> 					<option value="1"<?php if( $lnprefixes ) echo " selected"; ?>><?php echo $admtext['lnapart']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td colspan="2"><?php echo $admtext['detectpfx']; ?>:</td></tr>
> 		<tr>
> 			<td>&nbsp;&nbsp;<?php echo $admtext['lnpfxnum']; ?>:</td>
> 			<td><input type="text" value="<?php echo $lnpfxnum; ?>" name="lnpfxnum" size="5"/></td>
> 		</tr>
> 		<tr>
> 			<td>&nbsp;&nbsp;<?php echo $admtext['specpfx']; ?>*:</td>
> 			<td><input type="text" value="<?php echo stripslashes($specpfx); ?>" name="specpfx" class="verylongfield"/></td>
> 		</tr>
> 		<tr><td colspan="2">*<?php echo $admtext['commas']; ?></td></tr>
> 	</table>
> 	</div>
> 
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus8",0,"cemeteries",$admtext['cemeteries'],""); ?>
> 
> 	<div id="cemeteries" style="display:none"><br/>
> 	<table class="normal">
> 		<tr><td><?php echo $admtext['cemrows']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $tngconfig['cemrows']; ?>" name="cemrows" size="5"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['cemblanks']; ?>:</td>
> 			<td>
> 				<select name="cemblanks">
> 					<option value="0"<?php if( !$tngconfig['cemblanks'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['cemblanks'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 	</table>
> 	</div>
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus9",0,"mailreg",$admtext['mailreg'],""); ?>
> 
> 	<div id="mailreg" style="display:none"><br/>
> 	<table class="normal">
> 		<tr><td><?php echo $admtext['emailaddress']; ?>:</td><td><input type="text" value="<?php echo $emailaddr; ?>" name="emailaddr" size="40"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['fromadmin']; ?>:</td>
> 			<td>
> 				<select name="fromadmin">
> 					<option value="0"<?php if( !$tngconfig['fromadmin'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['fromadmin'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['allowreg']; ?>:</td>
> 			<td>
> 				<select name="disallowreg" onchange="toggleAllowReg();">
> 					<option value="0"<?php if( !$tngconfig['disallowreg'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['disallowreg'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['revmail']; ?>:</td>
> 			<td>
> 				<select name="revmail">
> 					<option value="0"<?php if( !$tngconfig['revmail'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['revmail'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['autotree']; ?>:</td>
> 			<td>
> 				<select name="autotree" id="autotree"<?php if( $tngconfig['disallowreg'] ) echo " disabled"; ?>>
> 					<option value="0"<?php if( !$tngconfig['autotree'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['autotree'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['autoapp']; ?>:</td>
> 			<td>
> 				<select name="autoapp" id="autoapp" onchange="toggleAutoApprove();"<?php if( $tngconfig['disallowreg'] ) echo " disabled"; ?>>
> 					<option value="0"<?php if( !$tngconfig['autoapp'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['autoapp'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['ackemail']; ?>:</td>
> 			<td>
> 				<select name="ackemail" id="ackemail"<?php if( $tngconfig['disallowreg'] || $tngconfig['autoapp'] ) echo " disabled"; ?>>
> 					<option value="0"<?php if( !$tngconfig['ackemail'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['ackemail'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['inclpwd']; ?>:</td>
> 			<td>
> 				<select name="omitpwd" id="omitpwd"<?php if( $tngconfig['disallowreg'] ) echo " disabled"; ?>>
> 					<option value="0"<?php if( !$tngconfig['omitpwd'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['omitpwd'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['usesmtp']; ?>:</td>
> 			<td>
> 				<select name="usesmtp" id="usesmtp" onchange="jQuery('#smtpstuff').toggle(200);">
> 					<option value="0"<?php if( !$tngconfig['usesmtp'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['usesmtp'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
>     </table>
> 	<table class="normal" style="margin-left:5px;<?php if(!$tngconfig['usesmtp']) echo " display:none"; ?>" id="smtpstuff">
> 		<tr><td><?php echo $admtext['mailhost']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailhost']; ?>" name="mailhost" size="40"></td></tr>
> 		<tr><td><?php echo $admtext['mailuser']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailuser']; ?>" name="mailuser" size="40"></td></tr>
> 		<tr><td><?php echo $admtext['mailpass']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailpass']; ?>" name="mailpass" size="40"></td></tr>
> 		<tr><td><?php echo $admtext['mailport']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['mailport']; ?>" name="mailport" size="40"></td></tr>
> 		<tr><td><?php echo $admtext['mailenc']; ?>:</td><td>
> 			<select name="mailenc">
> 				<option value=""<?php if( $tngconfig['mailenc'] != "ssl" && $tngconfig['mailenc'] != "tls" ) echo " selected=\"selected\""; ?>></option>
> 				<option value="ssl"<?php if( $tngconfig['mailenc'] == "ssl" ) echo " selected=\"selected\""; ?>><?php echo "ssl"; ?></option>
> 				<option value="tls"<?php if( $tngconfig['mailenc'] == "tls" ) echo " selected=\"selected\""; ?>><?php echo "tls"; ?></option>
> 				<option value="starttls"<?php if( $tngconfig['mailenc'] == "starttls" ) echo " selected=\"selected\""; ?>><?php echo "starttls"; ?></option>
> 			</select>
> 		</td></tr>
> 	</table>
> 	</div>
> </td>
> </tr>
> 
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus10",0,"pref",$admtext['prefsection'],""); ?>
> 
> 	<div id="pref" style="display:none"><br/>
> 	<table class="normal">
> 		<tr><td><?php echo $admtext['personprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['personprefix']; ?>" name="pprefix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['personsuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['personsuffix']; ?>" name="psuffix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['familyprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['familyprefix']; ?>" name="fprefix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['familysuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['familysuffix']; ?>" name="fsuffix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['sourceprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['sourceprefix']; ?>" name="sprefix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['sourcesuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['sourcesuffix']; ?>" name="ssuffix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['repoprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['repoprefix']; ?>" name="rprefix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['reposuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['reposuffix']; ?>" name="rsuffix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['noteprefix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['noteprefix']; ?>" name="nprefix" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['notesuffix']; ?>:</td><td><input type="text" value="<?php echo $tngconfig['notesuffix']; ?>" name="nsuffix" size="5"></td></tr>
> 	</table>
> 	</div>
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus11",0,"mobile",$admtext['mobilesection'],""); ?>
> 
> 	<div id="mobile" style="display:none"><br/>
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['responsivetables']; ?>:</td>
> 			<td>
> 				<select name="responsivetables">
> 					<option value="1"<?php if( $responsivetables ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$responsivetables ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['tabletype']; ?>:</td>
> 			<td>
> 				<select name="tabletype">
> 					<option value="toggle"<?php if( $tabletype == "toggle" ) echo " selected"; ?>><?php echo (isset($admtext['tt_toggle']) ? $admtext['tt_toggle'] : "toggle"); ?></option>
> 					<option value="stack"<?php if( $tabletype == "stack" ) echo " selected"; ?>><?php echo (isset($admtext['tt_stack']) ? $admtext['tt_stack'] : "stack"); ?></option>
> 					<option value="swipe"<?php if( $tabletype == "swipe" ) echo " selected"; ?>><?php echo (isset($admtext['tt_swipe']) ? $admtext['tt_swipe'] : "swipe"); ?></option>
> 					<option value="tng"<?php if( $tabletype == "tng" ) echo " selected"; ?>>tng</option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['enablemodeswitch']; ?>:</td>
> 			<td>
> 				<select name="enablemodeswitch">
> 					<option value="1"<?php if( $enablemodeswitch ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$enablemodeswitch ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['enableminimap']; ?>:</td>
> 			<td>
> 				<select name="enableminimap">
> 					<option value="1"<?php if( $enableminimap ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$enableminimap ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 	</table>
> 	</div>
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus12",0,"dna",$text['dna_tests'],""); ?>
> 	<div id="dna" style="display:none"><br/>
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['hidedna']; ?>:</td>
> 			<td>
> 				<select name="hidedna">
> 					<option value="0"<?php if( !$tngconfig['hidedna'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['hidedna'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> <?php if(empty($maxdnasearchresults)) $maxdnasearchresults = $maxsearchresults; ?>
> 		<tr><td><?php echo $admtext['maxsearchresults']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $maxdnasearchresults; ?>" name="maxdnasearchresults" size="3"></td></tr>
> 		<tr><td><?php echo $admtext['show_test_number']; ?>:</td>
> 			<td>
> 				<select name="showtestnumbers">
> 					<option value="1"<?php if( $showtestnumbers ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$showtestnumbers ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 	    <tr>
>             <td><?php echo $admtext['autofillancsunames']; ?>:</td>
> 			<td>
> 				<select name="autofillancsurnames">
> 					<option value="1"<?php if( $autofillancsurnames ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$autofillancsurnames ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 	    <tr>
>             <td><?php echo $admtext['upperancsunames']; ?>:</td>
> 			<td>
> 				<select name="ancsurnameupper">
> 					<option value="1"<?php if( $ancsurnameupper ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$ancsurnameupper ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 	    <tr>
>             <td><?php echo $admtext['generation_num']; ?>:</td>
> 			<td>
> 			  <select name="numgens">
> 			  <option value="3">3</option>
> <?php
>     	    for( $i = "4"; $i <= "15"; $i++ ) {
> 		      echo "<option value=\"$i\"";
> 		     if( $i == $numgens ) echo " selected";
> 		      echo ">$i</option>\n";
> 	        }
> ?>
> 			  </select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['excludefromancsn']; ?>*:</td>
> 			<td><input type="text" value="<?php echo stripslashes($surnameexcl); ?>" name="surnameexcl" class="longfield"/></td>
> 		</tr>
> 		<tr> <td colspan="2">*<?php echo $admtext['commas']; ?></td></tr>
> 		<tr><td colspan="2">&nbsp;</td></tr>
> 		<tr><td colspan="2"><strong><?php echo $admtext['dnatestscomparecolors']; ?></strong></tr>
> <?php
> 		$mainclass = $bgmain ? 'center' : 'fieldnameback center';
> 		$txtmain = $txtmain ? $txtmain : '#FFFFFF';
> 		$bgmode = $bgmode ? $bgmode : '#D1EEEE';
> 		$txtmode = $txtmode ? $txtmode : '#000000';
> 		$bgfastmut = $bgfastmut ? $bgfastmut : '#69001A';
> 		$txtfastmut = $txtfastmut ? $txtfastmut : '#FFFFFF';
> 		$bg1_12 = $bg1_12 ? $bg1_12 : '#414E68';
> 		$txt1_12 = $txt1_12 ? $txt1_12 : '#FFFFFF';
> 		$bg13_25 = $bg13_25 ? $bg13_25 : '#41678A';
> 		$txt13_25 = $txt13_25 ? $txt13_25 : '#FFFFFF';
> 		$bg26_37 = $bg26_37 ? $bg26_37 : '#2E8899';
> 		$txt26_37 = $txt26_37 ? $txt26_37 : '#FFFFFF';
> 		$bg38_67 = $bg38_67 ? $bg38_67 : '#44A1B8';
> 		$txt38_67 = $txt38_67 ? $txt38_67 : '#FFFFFF';
> 		$bg111 = $bg111 ? $bg111 : '#05B8CC';
> 		$txt111 = $txt111 ? $txt111 : '#FFFFFF';
> ?>
> 		<tr>
> 			<td><?php echo $admtext['mainbackground']; ?>:</td>
> 			<td><input type="text" value="<?php echo stripslashes($bgmain); ?>" name="bgmain" size="7">&nbsp;
> 			<?php echo $admtext['textcolor']; ?>:
> 			<input type="text" value="<?php echo stripslashes($txtmain); ?>" name="txtmain" size="7">&nbsp;&nbsp;
> 			<input type="text" class="<?php echo $mainclass;?>" style="background-color:<?php echo $bgmain;?>; color:<?php echo $txtmain;?>;" value="<?php echo $admtext['textcolor']; ?>" id="exmain" disabled></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['modebackground']; ?>:</td>
> 			<td><input type="text" value="<?php echo stripslashes($bgmode); ?>" name="bgmode" size="7">&nbsp;
> 			<?php echo $admtext['textcolor']; ?>:
> 			<input type="text" value="<?php echo stripslashes($txtmode); ?>" name="txtmode" size="7">&nbsp;&nbsp;
> 			<input type="text" class="center" style="background-color:<?php echo $bgmode;?>; color:<?php echo $txtmode;?>;" value="<?php echo $admtext['textcolor']; ?>" name="exmode" disabled></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['fastmutbackground']; ?>:</td>
> 			<td><input type="text" value="<?php echo stripslashes($bgfastmut); ?>" name="bgfastmut" size="7">&nbsp;
> 			<?php echo $admtext['textcolor']; ?>:
> 			<input type="text" value="<?php echo stripslashes($txtfastmut); ?>" name="txtfastmut" size="7">&nbsp;&nbsp;
> 			<input type="text" class="center" style="background-color:<?php echo $bgfastmut;?>; color:<?php echo $txtfastmut;?>;" value="<?php echo $admtext['textcolor']; ?>" name="exfastmut" disabled></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['background1_12']; ?>:</td>
> 			<td><input type="text" value="<?php echo stripslashes($bg1_12); ?>" name="bg1_12" size="7">&nbsp;
> 			<?php echo $admtext['textcolor']; ?>:
> 			<input type="text" value="<?php echo stripslashes($txt1_12); ?>" name="txt1_12" size="7">&nbsp;&nbsp;
> 			<input type="text" class="center" style="background-color:<?php echo $bg1_12;?>; color:<?php echo $txt1_12;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex1_12" disabled></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['background13_25']; ?>:</td>
> 			<td><input type="text" value="<?php echo stripslashes($bg13_25); ?>" name="bg13_25" size="7">&nbsp;
> 			<?php echo $admtext['textcolor']; ?>:
> 			<input type="text" value="<?php echo stripslashes($txt13_25); ?>" name="txt13_25" size="7">&nbsp;&nbsp;
> 			<input type="text" class="center" style="background-color:<?php echo $bg13_25;?>; color:<?php echo $txt13_25;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex13_25" disabled></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['background26_37']; ?>:</td>
> 			<td><input type="text" value="<?php echo stripslashes($bg26_37); ?>" name="bg26_37" size="7">&nbsp;
> 			<?php echo $admtext['textcolor']; ?>:
> 			<input type="text" value="<?php echo stripslashes($txt26_37); ?>" name="txt26_37" size="7">&nbsp;&nbsp;
> 			<input type="text" class="center" style="background-color:<?php echo $bg26_37;?>; color:<?php echo $txt26_37;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex26_37" disabled></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['background38_67']; ?>:</td>
> 			<td><input type="text" value="<?php echo stripslashes($bg38_67); ?>" name="bg38_67" size="7">&nbsp;
> 			<?php echo $admtext['textcolor']; ?>:
> 			<input type="text" value="<?php echo stripslashes($txt38_67); ?>" name="txt38_67" size="7">&nbsp;&nbsp;
> 			<input type="text" class="center" style="background-color:<?php echo $bg38_67;?>; color:<?php echo $txt38_67;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex38_67" disabled></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['background111']; ?>:</td>
> 			<td><input type="text" value="<?php echo stripslashes($bg111); ?>" name="bg111" size="7">&nbsp;
> 			<?php echo $admtext['textcolor']; ?>:
> 			<input type="text" value="<?php echo stripslashes($txt111); ?>" name="txt111" size="7">&nbsp;&nbsp;
> 			<input type="text" class="center" style="background-color:<?php echo $bg111;?>; color:<?php echo $txt111;?>;" value="<?php echo $admtext['textcolor']; ?>" name="ex111" disabled></td>
> 		</tr>
> 		<tr><td colspan="2">&nbsp;</td></tr>
> 		<tr><td colspan="2"><?php echo $admtext['getcolorcodes']; ?> -> <a href="http://hnl.name/color-schemer-online/" class="snlink" target="_blank"><?php echo $admtext['colorschemer']; ?></a></td></tr>
> 		<tr><td colspan="2">&nbsp;</td></tr>
> 	</table>
> 	</div>
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus13",0,"misc",$admtext['miscsection'],""); ?>
> 
> 	<div id="misc" style="display:none"><br/>
> 	<table class="normal">
> 		<tr><td><?php echo $admtext['maxsearchresults']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $maxsearchresults; ?>" name="maxsearchresults" size="5"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['indstart']; ?>:</td>
> 			<td colspan="4">
> 				<select name="tng_istart">
> 					<option value="0"<?php if( !$tngconfig['istart'] ) echo " selected"; ?>><?php echo $admtext['allinfo']; ?></option>
> 					<option value="1"<?php if( $tngconfig['istart'] ) echo " selected"; ?>><?php echo $admtext['persinfo']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['shownotes']; ?>:</td>
> 			<td colspan="4">
> 				<select name="notestogether">
> 					<option value="0"<?php if( !$notestogether ) echo " selected"; ?>><?php echo $admtext['notesapart']; ?></option>
> 					<option value="1"<?php if( $notestogether == 1 ) echo " selected"; ?>><?php echo $admtext['notestogether']; ?></option>
> 					<option value="2"<?php if( $notestogether == 2 ) echo " selected"; ?>><?php echo $admtext['notestogether2']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['scrollcite']; ?>:</td>
> 			<td>
> 				<select name="scrollcite">
> 					<option value="1"<?php if( $tngconfig['scrollcite'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$tngconfig['scrollcite'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td>&nbsp;&nbsp; <?php echo $admtext['notes']; ?>:</td>
> 			<td>
> 				<select name="scrollnotes">
> 					<option value="1"<?php if( $tngconfig['scrollnotes'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="0"<?php if( !$tngconfig['scrollnotes'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 
> 		<tr><td><?php echo $admtext['time_offset']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $time_offset; ?>" name="time_offset" size="5">  <?php echo $admtext['servertime'] . " <strong>" . date("D h:i a") . "</strong> "; $new_U=date("U")+$time_offset*3600; echo $admtext['sitetime'] . " <strong>" . date("D h:i a", $new_U) . "</strong>"; ?></td></tr>
> 		<tr><td><?php echo $admtext['edit_timeout']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $tngconfig['edit_timeout']; ?>" name="edit_timeout" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['maxgedcom']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $maxgedcom; ?>" name="maxgedcom" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['change_cutoff']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $change_cutoff; ?>" name="change_cutoff" size="5"> <?php echo $admtext['nocutoff']; ?></td></tr>
> 		<tr><td><?php echo $admtext['change_limit']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $change_limit; ?>" name="change_limit" size="5"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['datefmt']; ?>:</td>
> 			<td colspan="4">
> 				<select name="prefereuro">
> 					<option value="false"<?php if( $tngconfig['preferEuro'] == "false" ) echo " selected"; ?>><?php echo $admtext['monthfirst']; ?></option>
> 					<option value="true"<?php if( $tngconfig['preferEuro'] == "true" ) echo " selected"; ?>><?php echo $admtext['dayfirst']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['calstart']; ?>:</td>
> 			<td colspan="4">
> 				<select name="calstart">
> 					<option value="0"<?php if( !isset($tngconfig['calstart']) || $tngconfig['calstart'] == "0" ) echo " selected"; ?>><?php echo $text['sunday']; ?></option>
> 					<option value="1"<?php if( $tngconfig['calstart'] == "1" ) echo " selected"; ?>><?php echo $text['monday']; ?></option>
> 					<option value="2"<?php if( $tngconfig['calstart'] == "2" ) echo " selected"; ?>><?php echo $text['tuesday']; ?></option>
> 					<option value="3"<?php if( $tngconfig['calstart'] == "3" ) echo " selected"; ?>><?php echo $text['wednesday']; ?></option>
> 					<option value="4"<?php if( $tngconfig['calstart'] == "4" ) echo " selected"; ?>><?php echo $text['thursday']; ?></option>
> 					<option value="5"<?php if( $tngconfig['calstart'] == "5" ) echo " selected"; ?>><?php echo $text['friday']; ?></option>
> 					<option value="6"<?php if( $tngconfig['calstart'] == "6" ) echo " selected"; ?>><?php echo $text['saturday']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['pardata']; ?>:</td>
> 			<td>
> 				<select name="pardata">
> 					<option value="0"<?php if( !$tngconfig['pardata'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['palldata']; ?></option>
> 					<option value="1"<?php if( $tngconfig['pardata'] == 1 ) echo " selected=\"selected\""; ?>><?php echo $admtext['pstdonly']; ?></option>
> 					<option value="2"<?php if( $tngconfig['pardata'] == 2 ) echo " selected=\"selected\""; ?>><?php echo $admtext['pnoevents']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td><?php echo $admtext['lineending']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $lineendingdisplay; ?>" name="lineending" size="5"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['encrtype']; ?>:</td>
> 			<td>
> 				<select name="password_type">
> <?php
> 	$encrtypes = PasswordTypeList();
> 	foreach($encrtypes as $encrtype) {
> 		$display = $encrtype != "none" ? $encrtype : $admtext['none'];
> 		echo "<option value=\"$encrtype\"";
>         if($encrtype == $tngconfig['password_type']) echo " selected=\"selected\"";
>         echo ">$display</option>\n";
> 	}
> ?>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['places1tree']; ?>:</td>
> 			<td>
> 				<select name="places1tree" id="places1tree" onchange="flipPlaces(this);">
> 					<option value="0"<?php if( !$tngconfig['places1tree'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['places1tree'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 				<input type="button" value="<?php echo $admtext['merge']; ?>" id="merge" onclick="convertPlaces('merge');" style="display:none"/>
> 				<span id="mergeexpl" style="display:none"><?php echo $admtext['mergeexpl']; ?></span>
> 				<select name="placetree" id="placetree" style="display:none">
> <?php
> 	foreach($treeList as $treerow) {
> 		echo "	<option value=\"{$treerow['gedcom']}\">{$treerow['treename']}</option>\n";
> 	}
> ?>
> 				</select>
> 				<input type="button" value="<?php echo $admtext['convert']; ?>" id="convert" onclick="convertPlaces('convert');" style="display:none"/>
> 				<span id="convertexpl" style="display:none"><?php echo $admtext['convexpl']; ?></span>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['autogeo']; ?>:</td>
> 			<td>
> 				<select name="autogeo">
> 					<option value="0"<?php if( !$tngconfig['autogeo'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['autogeo'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['reuseids']; ?>:</td>
> 			<td>
> 				<select name="oldids">
> 					<option value=""<?php if( !$tngconfig['oldids'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['oldids'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['lastimport']; ?>:</td>
> 			<td>
> 				<select name="lastimport">
> 					<option value=""<?php if( !$tngconfig['lastimport'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['lastimport'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showtasks']; ?>:</td>
> 			<td>
> 				<select name="hidetasks">
> 					<option value=""<?php if( !$tngconfig['hidetasks'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['hidetasks'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['showtotals']; ?>:</td>
> 			<td>
> 				<select name="hidetotals">
> 					<option value=""<?php if( !$tngconfig['hidetotals'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 					<option value="1"<?php if( $tngconfig['hidetotals'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td><?php echo $admtext['backupdays']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $tngconfig['backupdays']; ?>" name="backupdays" size="5"> <?php echo $admtext['nocutoff']; ?></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['nointernet']; ?>:</td>
> 			<td>
> 				<select name="tng_offline">
> 					<option value=""<?php if( !$tngconfig['offline'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngconfig['offline'] ) echo " selected=\"selected\""; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> <!--
> 		<tr>
> 			<td><?php /*echo $admtext['showmatches'];*/ ?>:</td>
> 			<td>
> 				<select name="webmatches">
> 					<option value=""<?php /*if( !$tngconfig['webmatches'] ) echo " selected=\"selected\"";*/ ?>><?php /*echo $admtext['yes'];*/ ?></option>
> 					<option value="1"<?php /*if( $tngconfig['webmatches'] ) echo " selected=\"selected\"";*/ ?>><?php /*echo $admtext['no'];*/ ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php /*echo $admtext['mhmatchtype'];*/ ?>:</td>
> 			<td>
> 				<select name="mhmatchtype">
> 					<option value="all"<?php /*if( $tngconfig['mhmatchtype'] == "all" ) echo " selected=\"selected\"";*/ ?>><?php /*echo $admtext['all'];*/ ?></option>
> 					<option value="smart_matches"<?php /*if( $tngconfig['mhmatchtype'] == "smart_matches" ) echo " selected=\"selected\"";*/ ?>>Smart Matches</option>
> 					<option value="record_matches"<?php /*if( $tngconfig['mhmatchtype'] == "record_matches" ) echo " selected=\"selected\"";*/ ?>>Record Matches</option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php /*echo $admtext['mhconfidence'];*/ ?>:</td>
> 			<td>
> 				<select name="mhmatchconf">
> 				<?php
> 					/*
> 					for($c = 20; $c <= 100; $c += 10) {
> 						echo "<option value=\"$c\"";
> 						if( $tngconfig['mhmatchconf'] == $c )
> 							echo " selected=\"selected\"";
> 						echo ">$c" . "%</option>\n";
> 					}
> 					*/
> 				?>
> 				</select>
> 			</td>
> 		</tr>
> -->
> 	</table>
> 	</div>
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" class="btn saveret" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submitx" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="submit" name="submitx" accesskey="s" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_setup.php';">
> 
> 	<input type="hidden" name="cmssupport" value="<?php echo $cms['support']; ?>">
> 	<input type="hidden" name="cmsurl" value="<?php echo $cms['url']; ?>">
> 	<input type="hidden" name="cmstngpath" value="<?php echo $cms['tngpath']; ?>">
> 	<input type="hidden" name="cmsmodule" value="<?php echo $cms['module']; ?>">
> 	<input type="hidden" name="cmscloaklogin" value="<?php echo $cms['cloaklogin']; ?>">
> 	<input type="hidden" name="cmscredits" value="<?php echo $cms['credits']; ?>">
> 
> 	<input type="hidden" value="1" name="safety">
> 	<input type="hidden" value="<?php echo $photos_table; ?>" name="photos_table">
> 	<input type="hidden" value="<?php echo $histories_table; ?>" name="histories_table">
> 	<input type="hidden" value="<?php echo $headstones_table; ?>" name="headstones_table">
> 	<input type="hidden" value="<?php echo $photolinks_table; ?>" name="photolinks_table">
> 	<input type="hidden" value="<?php echo $doclinks_table; ?>" name="doclinks_table">
> 	<input type="hidden" value="<?php echo $hslinks_table; ?>" name="hslinks_table">
> </td>
> </tr>
> 
> </table>
> </form>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_generateID.php TNG1403/admin_generateID.php
7a8
> $admin_login = 1;
13,14c14,15
< 	eval( "\$prefix = \$tngconfig['{$type}prefix'];" );
< 	eval( "\$suffix = \$tngconfig['{$type}suffix'];" );
---
> 	$prefix = $tngconfig[$type.'prefix'];
> 	$suffix = $tngconfig[$type.'suffix'];
21c22
< 			$query = "SELECT MAX(0+SUBSTRING($type" . "ID,$prefixlen)) as newID FROM $table WHERE gedcom = \"$tree\" AND $type" . "ID LIKE \"$prefix%\"";
---
> 			$query = "SELECT /* admin_generateID.php */ MAX(0+SUBSTRING($type" . "ID,$prefixlen)) as newID FROM $table WHERE gedcom = \"$tree\" AND $type" . "ID LIKE \"$prefix%\"";
24c25
< 			$query = "SELECT MAX(0+SUBSTRING_INDEX($type" . "ID,'$suffix',1)) as newID FROM $table WHERE gedcom = \"$tree\"";
---
> 			$query = "SELECT /* admin_generateID.php */ MAX(0+SUBSTRING_INDEX($type" . "ID,'$suffix',1)) as newID FROM $table WHERE gedcom = \"$tree\"";
33,37c34,40
< 		if(isset($_COOKIE['tng_'.$type.'lastid_'.$tree]))
< 			$lastid = $_COOKIE['tng_'.$type.'lastid_'.$tree];
< 		else
< 			$lastid = 1;
< 		if(!trim($lastid)) $lastid = 0;
---
> //
> // revision: 20200206 by Butch
> // 
> // removed cookies for saving lastid by user
> // new SQL scan index only to provide next gap
> //
> 		$lastid = 1; 		
40a44
> 
43a48,50
> 			$numpart2 = "SUBSTRING($typestr," . ($preflen + 1) . ", 1)";
> 			// numpart3 restricts the ID's selected to those with the same prefix as current
> 			$numpart3 = "SUBSTRING($typestr, 1, $preflen) = \"$prefix\"";
45a53
> 
48c56,59
< 			$numpart = "CAST(SUBSTRING($typestr,0,LENGTH($typestr - " . ($sufflen + 1) . ")) as SIGNED)";
---
> 			$numpart = "CAST(SUBSTRING($typestr, 1, (length($typestr)- ".$suflen.")) as SIGNED)";
> 			$numpart2 = "SUBSTRING($typestr, 1, 1)";
> 			// numpart3 restricts the ID's selected to those with the same suffix as current
> 			$numpart3 = "SUBSTRING($typestr, -$suflen, $suflen) = \"$suffix\"";
50a62
> 
52a65,66
> 			$numpart2 = "1";
> 			$numpart3 = "1 = 1";
56,62c70,98
< 		$maxrows = 10000;
< 		$nextone = 0;
< 		$newnum = "";
< 		do {
< 			$query = "SELECT $typestr FROM $table WHERE gedcom = \"$tree\" $wherestr
< 				ORDER BY $numpart
< 				LIMIT $nextone, $maxrows";
---
> 		// SQL does the work
> 	
> 		$query = "SELECT /* admin_generateID.php */ ";
> 		// format of output
> 		$query .= "CAST(z.expected AS UNSIGNED) as gap ";
> 		// remainder of SELECT
> 		$query .= "FROM (SELECT ";
> 		$query .= "@rownum:=if (@rownum > 0,@rownum+1,$lastid) AS expected, ";
> 		$query .= "IF(@rownum=$numpart, 0, @rownum:=$numpart) AS got ";
> 		$query .= "FROM (SELECT @rownum:=0) AS a ";
> 		$query .= "Join $table ";
> 		$query .= "WHERE $numpart3 and $numpart2 != '0' and $numpart >= $lastid and gedcom = \"$tree\" ";
> 		$query .= "ORDER BY $numpart) AS z ";
> 		$query .= "WHERE z.got!=0 ";
> 		$query .= "LIMIT 1";
> 
> 		$result = tng_query($query);
> 
> 		if ($result and tng_num_rows($result) > 0) {
> 			$row = tng_fetch_array($result);
> 			$lastid = $row['gap'];
> 		}
> 		else {
> 			if (!$result){
> 				echo "SQL Error ID generation<br>";
> 				die ("Cannot continue");
> 			}
> 			// no gap found so use the last ID number +1
> 			$query = "Select max($numpart+1) as lastID from $table where $numpart3 and gedcom = \"$tree\"";
64,80c100,102
< 			$numrows = tng_num_rows($result);
< 
< 			while(($row = tng_fetch_array($result)) && !$found) {
< 				if($prefix)
< 					$number = intval(substr($row[$typestr],$preflen));
< 				elseif($suffix)
< 					$number = intval(substr($row[$typestr],0,-$suflen));
< 				else
< 					$number = intval($row[$typestr]);
< 
< 				if($number > $lastid) {
< 					$found = true;
< 					$newnum = $lastid;
< 					break;
< 				}
< 				elseif($number == $lastid)
< 					$lastid += 1;
---
> 			if ($result and tng_num_rows($result) > 0) {
> 				$row = tng_fetch_array($result);
> 				$lastid = $row['lastID'];
82,84c104,108
< 			$nextone += $maxrows;
< 		} while(!$found && $numrows == $maxrows);
< 	
---
> 			// default to the initial value of 1 for empty tables
> 			if ($lastid == "" or !is_numeric($lastid)) {
> 				$lastid = 1;
> 			}
> 		}
86c110
< 		setcookie('tng_'.$type.'lastid_'.$tree,$newnum,time()+60*60*24*365);
---
> 
diff -r TNG/admin_generatethumbs.php TNG1403/admin_generatethumbs.php
24c24
< $maxsizeallowed = 1000; //KB
---
> $maxsizeallowed = 5000; //KB
28c28
< $query = "SELECT mediaID, path, thumbpath, mediatypeID, usecollfolder, form, description FROM $media_table where path != \"\"";
---
> $query = "SELECT mediaID, path, thumbpath, mediatypeID, usecollfolder, form, description, gedcom FROM $media_table where path != \"\"";
39a40
> 	$treestr = $tngconfig['mediatrees'] ? $row['gedcom'] . "/" : "";
41c42
< 	if( !$row['form'] ) {
---
> 	if( empty($row['form']) ) {
49,50c50,51
< 	if( trim($row['thumbpath']) && !$repath ) {
< 		if( (!$regenerate && file_exists( "$rootpath$usefolder/" . $row['thumbpath'] )) || !in_array($ext,$imagetypes) )
---
> 	if( !empty($row['thumbpath']) && !$repath ) {
> 		if( (!$regenerate && file_exists( "$rootpath$usefolder/$treestr" . $row['thumbpath'] )) || !in_array($ext,$imagetypes) )
53c54
< 			$newthumbpath = "$rootpath$usefolder/" . $row['thumbpath'];
---
> 			$newthumbpath = "$rootpath$usefolder/$treestr" . $row['thumbpath'];
64c65
< 		$newthumbpath = "$rootpath$usefolder/$thumbpath";
---
> 		$newthumbpath = "$rootpath$usefolder/$treestr$thumbpath";
72c73
< 		$path = "$rootpath$usefolder/" . trim($row['path']);
---
> 		$path = "$rootpath$usefolder/$treestr" . trim($row['path']);
74c75
<         if(strtoupper( $srcInfo['extension'] ) != "PDF") {
---
>         if(strtoupper( $destInfo['extension'] ) != "PDF") {
diff -r TNG/admin_geocodeform.php TNG1403/admin_geocodeform.php
13d12
< $orgtree = $tree;
16d14
< $flags['tabs'] = $tngconfig['tabs'];
22,23d19
< <body background="img/background.gif">
< 
24a21,22
>     echo tng_adminlayout();
> 
29c27
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/places_help.php#modify');\" class=\"lightlink\">{$admtext['help']}</a>";
---
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/places_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
34,36c32,33
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
>     <div class="databack admin-block">
61c58
< 		if( $treerow['gedcom'] == $tree ) echo " selected";
---
> 		if( isset($tree) && $treerow['gedcom'] == $tree ) echo " selected";
102,107c99,103
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
>     </div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_geocode.php TNG1403/admin_geocode.php
15d14
< $orgtree = $tree;
18c17
< if($resetignore) {
---
> if( !empty($resetignore) ) {
23d21
< $flags['tabs'] = $tngconfig['tabs'];
29,30d26
< <body background="img/background.gif">
< 
31a28,29
>     echo tng_adminlayout();
> 
36c34
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/places_help.php#modify');\" class=\"lightlink\">{$admtext['help']}</a>";
---
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/places_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
41,43c39,40
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
>     <div class="databack admin-block">
51c48
< 	$query = "SELECT ID, place FROM $places_table WHERE (latitude = \"\" OR latitude IS NULL) AND (longitude = \"\" OR longitude IS NULL) AND temple != \"1\" AND geoignore != \"1\"$treestr ORDER BY place $limitstr";
---
> 	$query = "SELECT ID, place FROM $places_table WHERE (latitude = \"\" OR latitude IS NULL) AND (longitude = \"\" OR longitude IS NULL) AND temple != \"1\" AND placelevel != \"-1\" AND geoignore != \"1\"$treestr ORDER BY place $limitstr";
77,82c74,78
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
>     </div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_getphotodetails.php TNG1403/admin_getphotodetails.php
37c37
< 			echo "<img src=\"$usefolder/" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" border=\"0\" width=\"$photowtouse\" height=\"$photohtouse\" id=\"img_$ID\" alt=\"{$row['mtitle']}\" />";
---
> 			echo "<img src=\"$usefolder/" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" border=\"0\" width=\"$photowtouse\" height=\"$photohtouse\" id=\"img_$mediaID\" alt=\"{$row['description']}\" />";
diff -r TNG/admin_importconfig.php TNG1403/admin_importconfig.php
29,30c29,31
< if( $localphotopathdisplay && !$locimppath['photos'] ) $locimppath['photos'] = $localphotopathdisplay;
< if( $localdocpathdisplay && !$locimppath['histories'] ) $locimppath['histories'] = $localdocpathdisplay;
---
> if( isset($localphotopathdisplay) && !$locimppath['photos'] ) $locimppath['photos'] = $localphotopathdisplay;
> if( isset($localdocpathdisplay) && !$locimppath['histories'] ) $locimppath['histories'] = $localdocpathdisplay;
> if( !isset($tngimpcfg['saveconfig']) ) $tngimpcfg['saveconfig'] = "";
34d34
< $flags['tabs'] = $tngconfig['tabs'];
40,41d39
< <body background="img/background.gif">
< 
42a41,42
> 	echo tng_adminlayout();
> 
47c47
< 	$innermenu .= "<a href=\"#\" onclick=\"return openHelp('$helplang/importconfig_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/importconfig_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
52,54c52,53
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
57,59c56,59
< 		<tr><td><?php echo $admtext['gedpath']; ?>:</td><td><input type="text" value="<?php echo $gedpath; ?>" name="gedpath" size="50">
< 			<input type="button" value="<?php echo $admtext['makefolder']; ?>" onclick="makeFolder('gedcom',document.form1.gedpath.value);"> <span id="msg_gedcom"></td></tr>
< 		<tr><td><?php echo $admtext['saveimportstate']; ?>:</td><td><input type="checkbox" name="saveimport" value="1" <?php if( $saveimport ) { echo "checked"; } ?>> <?php echo $admtext['allowresume']; ?></td></tr>
---
> 		<tr><td><?php echo $admtext['gedpath']; ?>:</td>
> 			<td><input type="text" value="<?php echo $gedpath; ?>" name="gedpath" size="50"><input type="hidden" id="gedcom_org" value="<?php echo $gedpath; ?>"/>
> 			<input type="button" value="<?php echo $admtext['text_rename']; ?>" onclick="makeFolder('gedcom',document.form1.gedpath.value);">  <span id="msg_gedcom"></span></td></tr>
> 		<tr><td></td><td><input type="checkbox" name="saveconfig" value="1" <?php if( $tngimpcfg['saveconfig'] ) { echo "checked"; } ?>> <?php echo $admtext['saveincfg']; ?></td></tr>
62d61
< 		<!--<tr><td><?php echo $admtext['failint']; ?>:</td><td><input type="text" value="<?php echo $tngimpcfg['checksecs']; ?>" name="checksecs" size="5"></td></tr>-->
97a97
> 		<tr><td><?php echo $admtext['maxmarried']; ?>:</td><td><input type="text" value="<?php echo $tngimpcfg['maxmarriedage']; ?>" name="maxmarriedage" size="5"></td></tr>
105a106,114
> 		<tr>
> 			<td><?php echo $admtext['coerce']; ?>:</td>
> 			<td>
> 				<select name="coerce">
> 					<option value="0"<?php if( !$tngimpcfg['coerce'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $tngimpcfg['coerce'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
107c116,118
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submitx" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_setup.php';">
110,116c121,125
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_languages.php TNG1403/admin_languages.php
17a18,19
> if( !isset($offset) ) $offset = 0;
> 
19c21
< if( $newsearch ) {
---
> if( !empty($newsearch) ) {
26,27c28,29
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_langs_post']['search']);
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_langs_post']['search']) ? stripslashes($_COOKIE['tng_search_langs_post']['search']) : "";
29,30c31,32
< 		$tngpage = $_COOKIE['tng_search_langs_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_langs_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_langs_post']['tngpage']) ? $_COOKIE['tng_search_langs_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_langs_post']['offset']) ? $_COOKIE['tng_search_langs_post']['offset'] : 0;
33a36
> 		if( !isset($tngpage) ) $tngpage = 1;
66d68
< $flags['tabs'] = $tngconfig['tabs'];
72,73d73
< <body background="img/background.gif">
< 
74a75,76
> 	echo tng_adminlayout();
> 
82,85c84,85
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
102c102
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
138,144c138,141
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
Only in TNG: admin_leftbanner.php
Only in TNG1403: admin_leftmenu.php
diff -r TNG/adminlib.php TNG1403/adminlib.php
8a9
> $flags = array();
10,11d10
< $http_user_agent = strtolower($_SERVER["HTTP_USER_AGENT"]);
< $newbrowser = preg_match("/msie/", $http_user_agent) && preg_match("/mac/", $http_user_agent) ? 0 : 1;
13a13
> if(!isset($message)) $message = "";
21c21,24
< 	echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n\n";
---
> 	if( !empty( $flags['modmgr'] ) )
> 		echo "<!DOCTYPE html>\n\n";
> 	else
> 		echo $tngconfig['doctype'] ? $tngconfig['doctype'] . "\n\n" : "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n\n";
23c26
< 	echo "<html>\n<head>\n";
---
> 	echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n";
34c37
< 	if(!$tng_version) $tng_version = "12.0.1";
---
> 	if(!$tng_version) include_once("version.php");
41,42c44,46
< 	if( isset($flags['tabs']) )
< 		echo "<link href=\"{$cms['tngpath']}{$templatepath}css/{$flags['tabs']}\" rel=\"stylesheet\" type=\"text/css\">\n";
---
> 	if( isset( $flags['css'] ) )
> 		echo $flags['css'];
> 	echo "<link href=\"{$cms['tngpath']}{$templatepath}css/tngtabs2.css\" rel=\"stylesheet\" type=\"text/css\">\n";
45,46c49,85
< 	if($sitever != "mobile" && $sitever != "tablet")
< 		echo "<link rel=\"shortcut icon\" href=\"$tngdomain/{$tngconfig['favicon']}\"/>\n";
---
> 	if($sitever != "mobile" && $sitever != "tablet") {
> 		echo "<link rel=\"shortcut icon\" href=\"img/admin/{$tngconfig['favicon']}\" />\n";
> 		// Update to add icons for Windows 8+ and Safari in MacOS El Capitan+.
> 		echo "<link rel=\"mask-icon\" href=\"img/safari-pinned-tab.svg\" color=\"#5bbad5\" />\n";
> 		echo "<meta name=\"msapplication-config\" content=\"img/admin/browserconfig.xml\" />\n";
> 		echo "<meta name=\"msapplication-TileColor\" content=\"#ffffff\" />\n";
> 		echo "<meta name=\"msapplication-TileImage\" content=\"img/admin/ms-icon-144x144.png\" />\n";
> 		echo "<meta name=\"theme-color\" content=\"#ffffff\" />\n";
> 		// Update to add icons for Windows 8+ and Safari in MacOS El Capitan+.
> 	} else {
> 		echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n";
> 		echo "<meta name=\"apple-mobile-web-app-capable\" content=\"yes\" />\n";
> 		echo "<meta name=\"mobile-web-app-capable\" content=\"yes\" />\n";
> 		echo "<meta http-equiv=\"cleartype\" content=\"on\" />\n";
> 
> 		// Update to add icons for Android and iOS 8+.
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"57x57\" href=\"{$cms['tngpath']}img/admin/apple-icon-57x57.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"60x60\" href=\"{$cms['tngpath']}img/admin/apple-icon-60x60.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"72x72\" href=\"{$cms['tngpath']}img/admin/apple-icon-72x72.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"76x76\" href=\"{$cms['tngpath']}img/admin/apple-icon-76x76.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"114x114\" href=\"{$cms['tngpath']}img/admin/apple-icon-114x114.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"120x120\" href=\"{$cms['tngpath']}img/admin/apple-icon-120x120.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"144x144\" href=\"{$cms['tngpath']}img/admin/apple-icon-144x144.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"152x152\" href=\"{$cms['tngpath']}img/admin/apple-icon-152x152.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"{$cms['tngpath']}img/admin/apple-icon-180x180.png\" />\n";
> 		echo "<link rel=\"icon\" type=\"image/png\" sizes=\"192x192\" href=\"{$cms['tngpath']}img/admin/android-icon-192x192.png\" />\n";
> 		echo "<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"{$cms['tngpath']}img/admin/favicon-32x32.png\" />\n";
> 		echo "<link rel=\"icon\" type=\"image/png\" sizes=\"96x96\" href=\"{$cms['tngpath']}img/admin/favicon-96x96.png\" />\n";
> 		echo "<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"{$cms['tngpath']}img/admin/favicon-16x16.png\" />\n";
> 		echo "<link rel=\"manifest\" href=\"img/admin/manifest.json\" />\n";
> 		// Update to add icons for Android and iOS 8 and later.
> 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"144x144\" href=\"{$cms['tngpath']}img/tng-apple-icon-144.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"114x114\" href=\"{$cms['tngpath']}img/tng-apple-icon-114.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"72x72\" href=\"{$cms['tngpath']}img/tng-apple-icon-72.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon-precomposed\" href=\"{$cms['tngpath']}img/tng-apple-icon.png\" />\n";
> 		echo "<link rel=\"shortcut icon\" href=\"img/tng-apple-icon.png\" />\n";
> 	}
63c102
< 		echo "<script src=\"https://code.jquery.com/jquery-3.3.1.min.js\" integrity=\"sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=\" crossorigin=\"anonymous\"></script>\n";
---
> 		echo "<script src=\"https://code.jquery.com/jquery-3.4.1.min.js\" integrity=\"sha384-vk5WoKIaW/vJyUAd9n/wmopsmNhiy+L2Z+SBxGYnUkunIxVxAv/UtMOhba/xskxh\" crossorigin=\"anonymous\"></script>\n";
67,68c106,107
< 		echo "<script type=\"text/javascript\">// <![CDATA[\nwindow.jQuery || document.write(\"<script src='{$cms['tngpath']}js/jquery-3.3.1.min.js?v=910'>\\x3C/script>\")\n//]]></script>\n";
< 		echo "<script type=\"text/javascript\">// <![CDATA[\nwindow.jQuery.ui || document.write(\"<script src='{$cms['tngpath']}js/jquery-ui-1.12.1.min.js?v=910'>\\x3C/script>\")\n//]]></script>\n";
---
> 		echo "<script type=\"text/javascript\">// <![CDATA[\nwindow.jQuery || document.write(\"<script src='{$cms['tngpath']}js/jquery-3.4.1.min.js?v=130'>\\x3C/script>\")\n//]]></script>\n";
> 		echo "<script type=\"text/javascript\">// <![CDATA[\nwindow.jQuery.ui || document.write(\"<script src='{$cms['tngpath']}js/jquery-ui-1.12.1.min.js?v=130'>\\x3C/script>\")\n//]]></script>\n";
71a111
> 	echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/admin.js\"></script>\n";
76a117,188
> function tng_corner($side) {
> 	return "<div class=\"admincorner fl-{$side}\" id=\"corner-{$side}\"><a href=\"https://tngsitebuilding.com\" target=\"_blank\"><img src=\"img/tnglogo.png\" alt=\"The Next Generation of Genealogy Sitebuilding\"></a></div>\n";
> }
> 
> function tng_adminmasthead() {
> 	global $tng_title, $tng_version, $currentuser, $allow_admin, $admtext, $text, $homepage, $tngconfig, $cms, $sitever; 
> 
> 	$helplang = findhelp("index_help.php");
> 
> 	$output = "<div class=\"admintop\">\n";
> 	$output .= "<p class=\"admintitle\" style=\"white-space:nowrap\"><strong>$tng_title, v.$tng_version</strong></p>\n";
> 	$output .= "<span class=\"whitetext normal\" style=\"white-space:nowrap\">\n";
> 	$output .= "<a href=\"admin.php\" class=\"lightlink\">{$admtext['adminhome']}</a>\n";
> 	$output .= "&nbsp;|&nbsp; <a href=\"$homepage\" class=\"lightlink\">{$admtext['publichome']}</a>\n";
> 	if( $allow_admin )
> 		$output .= "&nbsp;|&nbsp; <a href=\"{$cms['tngpath']}adminshowlog.php\" class=\"lightlink\" target=\"main\">{$admtext['showlog']}</a>\n";
> 	if($sitever != "mobile") {
> 		$output .= "&nbsp;|&nbsp; <a href=\"#\" onclick=\"return openHelp('{$helplang}/index_help.php');\" class=\"lightlink\">{$admtext['getstart']}</a>\n";
> 		if($tngconfig['maint'])
> 			$output .= "&nbsp;|&nbsp; <strong><span class=\"yellow\">{$text['mainton']}</span></strong>\n";
> 	}
> 	$output .= "&nbsp;|&nbsp; <a href=\"logout.php?admin_login=1\" class=\"lightlink\" target=\"_parent\">{$admtext['logout']}&nbsp; (<strong>$currentuser</strong>)</a>\n";
> 	$output .= "</span>\n";
> 	$output .= "</div>\n";
> 
> 	return $output;
> }
> 
> function tng_adminlayout($args = "", $showmenu = true) {
> 	global $sitever, $tng_abbrev;
> 
> 	if($sitever == "mobile") $tng_title = $tng_abbrev;
> 	//$class_str = $class ? " class=\"$class\"" : "";
> 	$output = "<body class=\"adminbody\"$args>\n";
> 
> 	$output .= "<div class=\"topbanner sideback whiteheader\">\n";
> 	$output .= $sitever == "standard" ? tng_corner('left') : "";
> 	$output .= $sitever == "standard" ? tng_corner('right') : "";
> 	$output .= tng_adminmasthead();
> 	$output .= "</div>\n";
> 
> 	//left banner
> 	$output .= "<div>\n";
> 	$leftoffset = $mainoffset = "";
> 	if($sitever == "standard") {
> 		if(isset($_SESSION['tng_menuhidden']) && $_SESSION['tng_menuhidden'] == "on") {
> 			$leftoffset = " style=\"left:-135px\"";
> 			$mainoffset = "style=\"padding-left: 26px\"";
> 		}
> 		if($showmenu) {
> 			$output .= "<div id=\"leftmenu\" class=\"leftmenu sideback normal\"$leftoffset>\n";
> 			include("admin_leftmenu.php");
> 			$output .= "</div>\n";
> 		}
> 	}
> 	else
> 		$mainoffset = " style=\"padding-left: 0px;\"";
> 
> 	$classname = $showmenu ? "mainback" : "homeback";
> 	$output .= "<div id=\"maincontent\" class=\"$classname\"$mainoffset>\n";
> 
> 	return $output;
> }
> 
> function tng_adminfooter() {
> 	global $tng_title, $tng_version;
> 	$output = "</div></div>\n";
> 	$output .= "</body>\n</html>\n";
> 
> 	return $output;
> }
> 
80,81c192,193
< 	eval( "\$prefix = \$tngconfig['{$type}prefix'];" );
< 	eval( "\$suffix = \$tngconfig['{$type}suffix'];" );
---
> 	$prefix = $tngconfig[$type.'prefix'];
> 	$suffix = $tngconfig[$type.'suffix'];
112c224
< 	global $newbrowser, $text, $sitever;
---
> 	global $text, $sitever;
117c229
<   	$menu .= $newbrowser ? "<ul id=\"tngnav\">\n" : "<div id=\"tabs\">\n";
---
>   	$menu .= "<ul id=\"tngnav\">\n";
131c243
< 	$menu .= $newbrowser ? "</ul>\n" : "</div>\n";
---
> 	$menu .= "</ul>\n";
142c254
< 	global $people_table, $families_table, $temp_events_table, $assignedbranch, $assignedtree, $admtext;
---
> 	global $people_table, $families_table, $temp_events_table, $assignedbranch, $assignedtree, $admtext, $tree;
199,200c311,312
< 	$rval = "<div class=\"lightback\">\n<div class=\"pad5\">\n";
< 	$rval .= "<img src=\"$icon\" width=\"40\" height=\"40\" align=\"left\" title=\"$headline\" alt=\"$headline\" style=\"margin-right:10px\"><span class=\"plainheader\">$headline</span></div><br />\n";
---
> 	$rval = "<div class=\"admin-header\">\n<div class=\"pad5\">\n";
> 	$rval .= "<img src=\"$icon\" title=\"$headline\" alt=\"$headline\" style=\"vertical-align: top; width: 40px; height: 40px; margin-right: 10px;\"><span class=\"plainheader\">$headline</span></div><br />\n";
219c331
< 	global $admtext, $tree, $gotmore, $gotnotes, $gotcites, $row, $dims, $noclass;
---
> 	global $admtext, $tree, $gotmore, $gotnotes, $gotcites, $row, $dims, $noclass, $currentform, $tngconfig;
221,223c333,335
< 	$notesicon = $gotnotes[$label] ? "admin-note-on-icon" : "admin-note-off-icon";
< 	$citesicon = $gotcites[$label] ? "admin-cite-on-icon" : "admin-cite-off-icon";
< 	$moreicon = $gotmore[$label] ? "admin-more-on-icon" : "admin-more-off-icon";
---
> 	$notesicon = !empty($gotnotes[$label]) ? "admin-note-on-icon" : "admin-note-off-icon";
> 	$citesicon = !empty($gotcites[$label]) ? "admin-cite-on-icon" : "admin-cite-off-icon";
> 	$moreicon = !empty($gotmore[$label]) ? "admin-more-on-icon" : "admin-more-off-icon";
227c339,340
< 	$blurAction = ($label == "DEAT" || $label == "BURI") ? " updateLivingBox(this);" : "";
---
> 	if(!isset($currentform)) $currentform = "document.form1";
> 	$blurAction = ($label == "DEAT" || $label == "BURI") ? " updateLivingBox($currentform,this);" : "";
230c343,359
< 	$short = $noclass ? " style=\"width:100px\"" : " class=\"shortfield\"";
---
> 	if($datefield == "altbirthdate") {
> 		if($label == "ALTBE") {
> 			$label = empty($tngconfig['altbirth']) ? "CHR" : explode(',',$tngconfig['altbirth'])[0];
> 		}
> 		$altbirthtype = "<input type=\"hidden\" name=\"altbirthtype\" id=\"altbirthtype\" value=\"$label\" />";
> 		$type_selector = getAltBirthTypes($label);
> 		$fieldlabel = "<span id=\"altbirthlabel\">" . $admtext[$label] . "</span>";
> 		$dloglabel = "ALTBE";
> 	}
> 	else {
> 		$altbirthtype = "";
> 		$type_selector = "";
> 		$fieldlabel = $admtext[$label];
> 		$dloglabel = $label;
> 	}
> 
> 	$short = $noclass ? " style=\"width:140px\"" : " class=\"shortfield\"";
233,235c362,364
< 	$tr .= "<td>" . $admtext[$label] . ":</td>\n";
< 	$tr .= "<td><input type=\"text\" value=\"" . $row[$datefield] . "\" name=\"$datefield\" onblur=\"checkDate(this);{$blurAction}\" maxlength=\"50\"$short></td>\n";
< 	$tr .= "<td><input type=\"text\" value=\"" . $row[$placefield] . "\" name=\"$placefield\" {$onblur}id=\"$placefield\"$long></td>\n";
---
> 	$tr .= "<td>" . $fieldlabel . ":{$type_selector}</td>\n";
> 	$tr .= "<td><input type=\"text\" value=\"" . (isset($row[$datefield]) ? $row[$datefield] : "") . "\" name=\"$datefield\" onblur=\"checkDate(this);{$blurAction}\" maxlength=\"50\"$short>$altbirthtype</td>\n";
> 	$tr .= "<td><input type=\"text\" class=\"verylongfield\" value=\"" . (isset($row[$placefield]) ? $row[$placefield] : "") . "\" name=\"$placefield\" {$onblur}id=\"$placefield\"$long></td>\n";
241c370
< 		$tr .= "<td><a href=\"#\" onclick=\"return showMore('$label','$persfamID');\" title=\"{$admtext['more']}\" id=\"moreicon$label\" class=\"smallicon $moreicon\"></a></td>\n";
---
> 		$tr .= "<td><a href=\"#\" onclick=\"return showMore('$dloglabel','$persfamID');\" title=\"{$admtext['more']}\" id=\"moreicon$label\" class=\"smallicon $moreicon\"></a></td>\n";
243c372
< 		$tr .= "<td><a href=\"#\" onclick=\"return showNotes('$label','$persfamID');\" title=\"{$admtext['notes']}\" id=\"notesicon$label\" class=\"smallicon $notesicon\"></a></td>\n";
---
> 		$tr .= "<td><a href=\"#\" onclick=\"return showNotes('$dloglabel','$persfamID');\" title=\"{$admtext['notes']}\" id=\"notesicon$label\" class=\"smallicon $notesicon\"></a></td>\n";
245c374
< 		$tr .= "<td><a href=\"#\" onclick=\"return showCitations('$label','$persfamID');\" title=\"{$admtext['sources']}\" id=\"citesicon$label\" class=\"smallicon $citesicon\"></a></td>\n";
---
> 		$tr .= "<td><a href=\"#\" onclick=\"return showCitations('$dloglabel','$persfamID');\" title=\"{$admtext['sources']}\" id=\"citesicon$label\" class=\"smallicon $citesicon\"></a></td>\n";
249a379,400
> function getAltBirthTypes($currentType) {
> 	global $tngconfig, $admtext, $options;
> 
> 	$typestr = " &nbsp;<span class=\"nw\"><a href=\"#\" onclick=\"showEdit('altbirthedit'); quitEdit('altbirthedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\"></a></span>";
> 
> 	$typestr .= "<div id=\"altbirthedit\" class=\"lightback pad5 rounded4\" style=\"position:absolute;display:none;\" onmouseover=\"clearTimeout(dtimer);\" onmouseout=\"closeEdit('altbirth','altbirthedit','altbirthlist');\">\n";
> 		$types = empty($tngconfig['altbirth']) ? ['CHR'] : explode(',',$tngconfig['altbirth']);
> 		$numtypes = count($types);
> 		$typestr .= "<select name=\"altbirth\" id=\"altbirth\" size=\"{$numtypes}\" onchange=\"changeAltBirthType();\">\n";
> 		foreach($types as $type) {
> 			$label = isset($admtext[$type]) ? $admtext[$type] : $type;
> 			$typestr .= "	<option value=\"$type\"";
> 			if( $currentType == $type ) $typestr .= " selected";
> 			$typestr .= ">$label</option>\n";
> 		}
> 
> 		$typestr .= "</select>\n";
> 	$typestr .= "</div>\n";
> 
> 	return $typestr;
> }
> 
268c419
< 	if(!$editconflict) {
---
> 	if(!$editconflict && isset($row['ID'])) {
diff -r TNG/admin_logconfig.php TNG1403/admin_logconfig.php
27a28
> if( !isset($logsaveconfig) ) $logsaveconfig = "";
29d29
< $flags['tabs'] = $tngconfig['tabs'];
34,35d33
< <body background="img/background.gif">
< 
36a35,36
> 	echo tng_adminlayout();
> 
41c41
< 	$innermenu .= "<a href=\"#\" onclick=\"return openHelp('$helplang/logconfig_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/logconfig_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
46,48c46,47
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
50,59c49,59
< 	<table>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['logfilename'] . " " . $admtext['text_public']; ?>:</span></td><td><input type="text" value="<?php echo $logname; ?>" name="logname" size="20"></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['maxloglines'] . " " . $admtext['text_public']; ?>:</span></td><td><input type="text" value="<?php echo $maxloglines; ?>" name="maxloglines" size="5"></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['badhosts']; ?>*:</span></td><td><input type="text" value="<?php echo $badhosts; ?>" name="badhosts" size="80"></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['exusers']; ?>*:</span></td><td><input type="text" value="<?php echo $exusers; ?>" name="exusers" size="80"></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['logfilename'] . " " . $admtext['admin']; ?>:</span></td><td><input type="text" value="<?php echo $adminlogfile; ?>" name="adminlogfile" size="20"></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['maxloglines'] . " " . $admtext['admin']; ?>:</span></td><td><input type="text" value="<?php echo $adminmaxloglines; ?>" name="adminmaxloglines" size="5"></td></tr>
< 		<tr><td valign="top" colspan="2"><span class="normal"><br /><?php echo $admtext['blockemail']; ?><br /><br /></span></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['addrcontains']; ?>*:</span></td><td><input type="text" value="<?php echo $addr_exclude; ?>" name="addr_exclude" size="80"></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['msgcontains']; ?>*:</span></td><td><input type="text" value="<?php echo $msg_exclude; ?>" name="msg_exclude" size="80"></td></tr>
---
> 	<table class="normal">
> 		<tr><td><?php echo $admtext['logfilename'] . " " . $admtext['text_public']; ?>:</td><td><input type="text" value="<?php echo $logname; ?>" name="logname" size="20"></td></tr>
> 		<tr><td><?php echo $admtext['logfilename'] . " " . $admtext['admin']; ?>:</td><td><input type="text" value="<?php echo $adminlogfile; ?>" name="adminlogfile" size="20"></td></tr>
> 		<tr><td></td><td><input type="checkbox" name="logsaveconfig" value="1" <?php if( $logsaveconfig ) { echo "checked"; } ?>> <?php echo $admtext['saveincfg']; ?></td></tr>
> 		<tr><td><?php echo $admtext['maxloglines'] . " " . $admtext['text_public']; ?>:</td><td><input type="text" value="<?php echo $maxloglines; ?>" name="maxloglines" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['maxloglines'] . " " . $admtext['admin']; ?>:</td><td><input type="text" value="<?php echo $adminmaxloglines; ?>" name="adminmaxloglines" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['badhosts']; ?>*:</td><td><input type="text" value="<?php echo $badhosts; ?>" name="badhosts" size="80"></td></tr>
> 		<tr><td><?php echo $admtext['exusers']; ?>*:</td><td><input type="text" value="<?php echo $exusers; ?>" name="exusers" size="80"></td></tr>
> 		<tr><td colspan="2"><br /><?php echo $admtext['blockemail']; ?><br /><br /></td></tr>
> 		<tr><td><?php echo $admtext['addrcontains']; ?>*:</td><td><input type="text" value="<?php echo $addr_exclude; ?>" name="addr_exclude" size="80"></td></tr>
> 		<tr><td><?php echo $admtext['msgcontains']; ?>*:</td><td><input type="text" value="<?php echo $msg_exclude; ?>" name="msg_exclude" size="80"></td></tr>
61c61,63
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submitx" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_setup.php';">
64,70c66,70
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_login.php TNG1403/admin_login.php
10c10
< if(isset( $_SESSION['logged_in'] ) && $_SESSION['session_rp'] == $rootpath && $_SESSION['allow_admin'] && $currentuser) { 
---
> if(isset( $_SESSION['logged_in'] ) && $_SESSION['session_rp'] == $rootpath && $_SESSION['allow_admin'] && !empty($currentuser)) {
17c17
< 	if($admtext[$message])
---
> 	if(!empty($admtext[$message]))
19c19
< 	elseif($text[$message])
---
> 	elseif(!empty($text[$message]))
22,31c22,28
< if( !empty( $email ) ) { 
< 	
< 	$sendmail = 0;
< 
< 	//if username is there too, then look up based on username and get password
< 	if( $username ) {
< 		$query = "SELECT username, realname FROM $users_table WHERE username = \"$username\"";
< 		$result = tng_query($query);
< 		$row = tng_fetch_assoc( $result );
< 		tng_free_result($result);
---
> $sendmail = 0;
> 
> //if username is there too, then look up based on username and get password
> if( !empty($pwdreset) && !empty($username) ) {
> 	$query = "SELECT email, realname, userID FROM $users_table WHERE username = \"$username\" AND reset_pwd_code = \"$pwdreset\"";
> 	$result = tng_query($query);
> 	$row = tng_fetch_assoc( $result );
32a30
> 	if(tng_num_rows($result)) {
34,44c32,38
< 		$query = "UPDATE $users_table SET password = \"" . PasswordEncode($newpassword) . "\", password_type = \"" . PasswordType() . "\" WHERE email = \"$email\" AND username = \"$username\" AND allow_living != \"-1\"";
< 		$result = tng_query($query);
< 		$success = tng_affected_rows();
< 
< 		if( $success ) {
< 			$sendmail = 1;
< 			$content = $text['newpass'] . ": $newpassword";
< 			$message = $text['pwdsent'];
< 		}
< 		else
< 			$message = $text['loginnotsent3'];
---
> 		$query = "UPDATE $users_table SET password = \"" . PasswordEncode($newpassword) . "\", password_type = \"" . PasswordType() . "\" WHERE userID=\"{$row['userID']}\"";
> 		$result2 = tng_query($query);
> 		$sendmail = tng_affected_rows($result);
> 
> 		$content = $text['newpass'] . ": $newpassword";
> 		$message = $text['pwdsent'];
> 		$email = $row['email'];
46,50c40,53
< 	else {
< 		$query = "SELECT username, realname FROM $users_table WHERE email = \"$email\"";
< 		$result = tng_query($query);
< 		$row = tng_fetch_assoc( $result );
< 		tng_free_result($result);
---
> 	else
> 		$message = $text['loginnotsent3'];
> 	tng_free_result($result);
> }
> elseif( !empty( $email ) && !empty($username) ) {
> 	$query = "SELECT realname, userID FROM $users_table WHERE email = \"$email\" AND username = \"$username\" AND allow_living != \"-1\"";
> 	$result = tng_query($query);
> 	$row = tng_fetch_assoc( $result );
> 
> 	if(tng_num_rows($result)) {
> 		$reset_pwd_code = rand(100000,999999);
> 		$query = "UPDATE $users_table SET reset_pwd_code = \"" . $reset_pwd_code . "\" WHERE userID=\"{$row['userID']}\"";
> 		$result2 = tng_query($query);
> 		$sendmail = tng_affected_rows();
52,58c55,56
< 		if( $row['username'] ) {
< 			$sendmail = 1;
< 			$content = "{$text['logininfo']}:\n\n{$admtext['username']}: {$row['username']}";
< 			$message = $text['usersent'];
< 		}
< 		else
< 			$message = $text['loginnotsent2'];
---
> 		$content = $text['pwdcodelink'] . ": $tngdomain/" . getURL('admin_login',1) . "username=$username&pwdreset={$reset_pwd_code}";
> 		$message = $text['pwdcodesent'];
59a58,64
> 	else
> 		$message = $text['loginnotsent3'];
> 	tng_free_result($result);
> }
> elseif( !empty( $email ) ) {
> 	$query = "SELECT username, realname FROM $users_table WHERE email = \"$email\"";
> 	$result = tng_query($query);
61,65c66,70
< 	if( $sendmail ) {
< 		$mailmessage = $content;
< 		$owner = preg_replace("/,/", "", ($sitename ? $sitename : ($dbowner ? $dbowner : "TNG")));
< 
< 		tng_sendmail($owner, $emailaddr, $row['realname'], $email, $text['logininfo'], $mailmessage, $emailaddr, $emailaddr);
---
> 	if( tng_num_rows($result) >= 1 ) { //if there happens to be more than one, just take the first one and don't worry about it
> 		$row = tng_fetch_assoc( $result );
> 		$sendmail = 1;
> 		$content = "{$text['logininfo']}:\n\n{$admtext['username']}: {$row['username']}";
> 		$message = $text['usersent'];
66a72,81
> 	else
> 		$message = $text['loginnotsent2'];
> 	tng_free_result($result);
> }
> 
> if( $sendmail ) {
> 	$mailmessage = $content;
> 	$owner = preg_replace("/,/", "", ($sitename ? $sitename : ($dbowner ? $dbowner : "TNG")));
> 
> 	tng_sendmail($owner, $emailaddr, $row['realname'], $email, $text['logininfo'], $mailmessage, $emailaddr, $emailaddr);
92c107
< 	$_COOKIE[$loggedin]="";
---
> 	setcookie($loggedin, "", time()-3600);
93a109
> $centering = $sitever == "standard" ? "position:relative;margin-top:10%" : "";
97c113
< <table width="100%" border="0" cellpadding="10" bgcolor="#FFFFFF" class="rounded10">
---
> <table border="0" cellpadding="10" bgcolor="#FFFFFF" class="centerbox" style="<?php echo $centering; ?>">
99,100c115,116
< 	<td class="fieldnameback rounded10">
< 		<span class="whiteheader"><font size="6"><?php echo $admtext['login'] . ": " . $admtext['administration']; ?></font></span>
---
> 	<td class="fieldnameback top-rounded-headline">
> 		<h1 class="whitetext">TNG <?php echo $admtext['login'] . ": " . $admtext['administration']; ?></h1>
115c131
< <td class="databack tngshadow rounded10">
---
> <td class="databack bottom-rounded">
117c133
< 			<div class="altab" style="float:left">
---
> 			<div class="altab normal" style="float:left;margin-left:10px;margin-right:40px">
119,136c135,145
< 				<table>
< 				<tr>
< 					<td><span class="normal"><?php echo $admtext['username']; ?>:</span></td>
< 					<td><input type="text" class="loginfont medfield" name="tngusername" size="20" /></td>
< 				</tr>
< 				<tr>
< 					<td><span class="normal"><?php echo $admtext['password']; ?>:</span></td>
< 					<td><input type="password" class="loginfont medfield" name="tngpassword" size="20" /></td>
< 				</tr>
< 				<tr>
< 					<td>&nbsp;</td>
< 					<td><span class="normal"><input type="checkbox" name="remember" value="1" /> <?php echo $admtext['rempass']; ?></span></td>
< 				</tr>
< 				<tr>
< 					<td>&nbsp;</td>
< 					<td><input type="submit" class="btn medfield" value="<?php echo $admtext['login']; ?>" /></td>
< 				</tr>
< 				</table>
---
> 				<p class="admintasks" style="margin-top:8px">
> 					<?php echo $admtext['username']; ?>:<br/>
> 					<input type="text" class="loginfont medfield" name="tngusername" size="20" style="font-size: 16pt; height: auto"/>
> 				</p>
> 				<p class="admintasks">
> 					<?php echo $admtext['password']; ?>:<br/>
> 					<input type="password" class="medpwdfield" name="tngpassword" id="tngpassword" size="20" style="font-size: 16pt; height: auto"/>
> 					<img src="img/pwdon.png" id="pwdicon" class="pwdicon" onclick="togglePwd('tngpassword','pwdicon');"/>
> 				</p>
> 				<p><input type="checkbox" name="remember" value="1" /> <?php echo $admtext['rempass']; ?></p>
> 				<input type="submit" class="btn medfield" value="<?php echo $admtext['login']; ?>" />
139c148
< 				<input type="hidden" name="continue" value="<?php echo $continue; ?>" />
---
> 				<input type="hidden" name="continue" value="<?php echo isset($continue) ? $continue : ""; ?>" />
142,143c151
< 			<div class="altab" style="float:left; width:50px;">&nbsp;&nbsp;&nbsp;</div>
< 			<div class="altab">
---
> 			<div class="altab normal" style="max-width:400px;margin-left:10px;float:left;">
145,160c153,162
< 				<table style="max-width:400px">
< 					<tr>
< 						<td colspan="2"><span class="normal"><?php echo $text['forgot1']; ?></span></td>
< 					</tr>
< 					<tr>
< 						<td nowrap><span class="normal"><?php echo $admtext['email']; ?>:</span></td>
< 						<td><input type="text" name="email"> <input type="submit" value="<?php echo $admtext['go']; ?>" /></td>
< 					</tr>
< 					<tr>
< 						<td colspan="2"><span class="normal"><br /><?php echo $text['forgot2']; ?></span></td>
< 					</tr>
< 					<tr>
< 						<td nowrap><span class="normal"><?php echo $admtext['username']; ?>:</span></td>
< 						<td><input type="text" name="username"> <input type="submit" value="<?php echo $admtext['go']; ?>" /></td>
< 					</tr>
< 				</table>
---
> 					<p><?php echo $text['forgot1']; ?></p>
> 					<p>
> 						<?php echo $admtext['email']; ?>:<br/>
> 						<input type="text" class="medfield" name="email"> <input type="submit" value="<?php echo $admtext['go']; ?>" />
> 					</p>
> 					<p><?php echo $text['forgot2']; ?></p>
> 					<p>
> 						<?php echo $admtext['username']; ?>:<br/>
> 						<input type="text" class="medfield" name="username"> <input type="submit" value="<?php echo $admtext['go']; ?>" />
> 					</p>
167c169
< <script language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
diff -r TNG/adminlog.php TNG1403/adminlog.php
3c3
< 	global $admtext, $currentuserdesc, $rootpath, $time_offset, $subroot;
---
> 	global $admtext, $currentuser, $currentuserdesc, $rootpath, $time_offset, $subroot;
7c7,9
< 	$string .= " ({$admtext['user']}: $currentuserdesc)";
---
> 	$string = "<td class=\"lightback\">$string</td>";
> 
> 	$string .= "<td class=\"lightback\">{$admtext['user']}: <a href=\"admin_edituser.php?username=$currentuser\">$currentuser | $currentuserdesc</a>";
8a11,12
> 	if(isset($logsaveconfig) && $logsaveconfig == 1)
> 		$adminlogfile = $subroot . $adminlogfile;
13,14c17,18
< 	$updated = date ("D d M Y H:i:s", time() + ( 3600 * $time_offset ) );
< 	array_unshift( $lines, "$updated $string.\n" );
---
> 	$updated = date ("D d M Y H:i:s", time() + ( 3600 * intval($time_offset) ) );
> 	array_unshift( $lines, "<tr><td class=\"lightback adminlog\">$updated</td>" . trim($string) . "</tr>\n" );
diff -r TNG/admin_mailusers.php TNG1403/admin_mailusers.php
14d13
< $flags['tabs'] = $tngconfig['tabs'];
17,18c16,17
< <script language="JavaScript" src="js/selectutils.js"></script>
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script src="js/selectutils.js"></script>
> <script type="text/javascript">
38,39d36
< <body background="img/background.gif">
< 
40a38,45
> 	echo tng_adminlayout();
> 
> 	$revquery = "SELECT count(userID) as ucount FROM $users_table WHERE allow_living = \"-1\"";
> 	$revresult = tng_query($revquery) or die ($admtext['cannotexecutequery'] . ": $revquery");
> 	$revrow = tng_fetch_assoc( $revresult );
> 	$revstar = $revrow['ucount'] ? " *" : "";
> 	tng_free_result($revresult);
> 
50,52c55,56
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
54,57c58,61
< 	<table>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['subject']; ?>:</span></td><td><span class="normal"><input type="text" name="subject" size="50" maxlength="50"></span></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['messagetext']; ?>:</span></td><td><span class="normal"><textarea cols="50" rows="15" name="messagetext"></textarea></span></td></tr>
< 		<tr><td valign="top" colspan="2"><span class="normal"><br /><strong><?php echo $admtext['selectgroup']; ?></strong></span></td></tr>
---
> 	<table class="normal">
> 		<tr><td valign="top"><?php echo $admtext['subject']; ?>:</td><td><input type="text" name="subject" size="50" maxlength="50"></td></tr>
> 		<tr><td valign="top"><?php echo $admtext['messagetext']; ?>:</td><td><textarea cols="50" rows="15" name="messagetext"></textarea></td></tr>
> 		<tr><td valign="top" colspan="2"><br /><strong><?php echo $admtext['selectgroup']; ?></strong></td></tr>
59c63
< 		<span class="normal"><?php echo $admtext['tree']; ?>*:</span></td><td><span class="normal">
---
> 		<?php echo $admtext['tree']; ?>*:</td><td>
70c74
< 			</select> </span>
---
> 			</select>
73c77
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['branch']; ?>**:</span></td><td><span class="normal">
---
> 		<tr><td valign="top"><?php echo $admtext['branch']; ?>**:</span></td><td><span class="normal">
76c80
< 				<option value="" selected><?php echo $admtext['nobranch']; ?></option>
---
> 				<option value=""><?php echo $admtext['nobranch']; ?></option>
78c82,85
< 		</span></td></tr>
---
> 		</td></tr>
> 		<tr>
> 			<td colspan="2"><input type="checkbox" name="sendtoadmins" value="1" /> <?php echo $admtext['sendtoadmins']; ?></td>
> 		</tr>
88,91c95,96
< </td>
< </tr>
< 
< </table>
---
> 	</div>
> </div>
93,96c98,100
< <?php
< echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_main.php TNG1403/admin_main.php
154c154,156
< <body background="img/background.gif" class="mainback">
---
> <?php
> 	echo tng_adminlayout("mainback");
> ?>
175c177
< 				$messages .= "<li><a href=\"admin_dataimport.php\">{$admtext['importgedcom2']}</a> or <a href=\"admin_newperson.php\">{$admtext['task_people']}</a></li>\n";
---
> 				$messages .= "<li><a href=\"admin_dataimport.php\">{$admtext['importgedcom2']}</a> | <a href=\"admin_newperson.php\">{$admtext['task_people']}</a></li>\n";
198c200,207
< 				usort($files, create_function('$a,$b', 'return filemtime($a)<filemtime($b);'));
---
> 				usort($files, function($a,$b) {
> 					if(filemtime($a) == filemtime($b))
> 						return 0;
> 					else if(filemtime($a) < filemtime($b))
> 						return 1;
> 					else
> 						return -1;
> 				});
298,300c307,309
< ?>
< </body>
< </html>
\ No newline at end of file
---
> 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/adminmaint.php TNG1403/adminmaint.php
17c17,19
< <body background="img/background.gif">
---
> <?php
> 	echo tng_adminlayout();
> ?>
26,28c28,30
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_makefolder.php TNG1403/admin_makefolder.php
18,20c18,24
< if( @mkdir( $folder, 0777 ) )
< 	echo $admtext['success'];
< elseif(file_exists($folder))
---
> //if backups or gedcom and using config path, then prepend the config path to old and new
> if($type == "gedcom")
> 	include($subroot . "importconfig.php");
> 
> $parent = ($type == "backups" && !empty($tngconfig['saveconfig'])) || ($type == "gedcom" && !empty($tngimpcfg['saveconfig'])) ? $subroot : $rootpath;
> 
> if( file_exists($parent . $newfolder) )
21a26,27
> elseif( (!empty($oldfolder) && file_exists( $parent . $oldfolder ) && @rename( $parent . $oldfolder, $parent . $newfolder )) || @mkdir( $parent . $newfolder, 0755 ) )
> 	echo $admtext['success'];
diff -r TNG/admin_mapconfig.php TNG1403/admin_mapconfig.php
23d22
< $flags['tabs'] = $tngconfig['tabs'];
54,55d52
< <body background="img/background.gif">
< 
56a54,55
> 	echo tng_adminlayout();
> 
61c60
< 	$innermenu .= "<a href=\"#\" onclick=\"return openHelp('$helplang/mapconfig_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/mapconfig_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
66,68c65,66
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="normal lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
160c158,160
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submitx" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_setup.php';">
162,168c162,166
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_medialinksxml.php TNG1403/admin_medialinksxml.php
162d161
< 			if( $thisfamily ) $thisfamily .= "<br/>";
187c186
< 	$lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title'] . "</b>&nbsp;</td>\n";
---
> 	$lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title2'] . "</b>&nbsp;</td>\n";
210c209
< 	$lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title'] . "</b>&nbsp;</td>\n";
---
> 	$lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title2'] . "</b>&nbsp;</td>\n";
diff -r TNG/admin_media.php TNG1403/admin_media.php
11a12
> include_once("tngdblib.php");
15c16,19
< if( $newsearch ) {
---
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
> 
> if(!empty($newsearch)) {
17a22,23
> 	if( !isset($unlinked) ) $unlinked = "";
> 	if( !isset($nothumb) ) $nothumb = "";
21a28
> 	setcookie("tng_search_media_post[nothumb]", $nothumb, $exptime);
29,42c36,52
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_media_post']['search']);
< 	if( !$mediatypeID )
< 		$mediatypeID = $_COOKIE['tng_search_media_post']['mediatypeID'];
< 	if( !$fileext )
< 		$fileext = $_COOKIE['tng_search_media_post']['fileext'];
< 	if( !$unlinked )
< 		$unlinked = $_COOKIE['tng_search_media_post']['unlinked'];
< 	if( !$hsstat )
< 		$hsstat = $_COOKIE['tng_search_media_post']['hsstat'];
< 	if( !$cemeteryID )
< 		$cemeteryID = $_COOKIE['tng_search_media_post']['cemeteryID'];
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_tree'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_media_post']['search']) ? stripslashes($_COOKIE['tng_search_media_post']['search']) : "";
> 	if( empty($mediatypeID) )
> 		$mediatypeID = isset($_COOKIE['tng_search_media_post']['mediatypeID']) ? $_COOKIE['tng_search_media_post']['mediatypeID'] : "";
> 	if( empty($fileext) )
> 		$fileext = isset($_COOKIE['tng_search_media_post']['fileext']) ? $_COOKIE['tng_search_media_post']['fileext'] : "";
> 	if( empty($unlinked) )
> 		$unlinked = isset($_COOKIE['tng_search_media_post']['unlinked']) ? $_COOKIE['tng_search_media_post']['unlinked'] : "";
> 	if( empty($nothumb) )
> 		$nothumb = isset($_COOKIE['tng_search_media_post']['nothumb']) ? $_COOKIE['tng_search_media_post']['nothumb'] : "";
> 	if( empty($hsstat) )
> 		$hsstat = isset($_COOKIE['tng_search_media_post']['hsstat']) ? $_COOKIE['tng_search_media_post']['hsstat'] : "";
> 	if( empty($cemeteryID) )
> 		$cemeteryID = isset($_COOKIE['tng_search_media_post']['cemeteryID']) ? $_COOKIE['tng_search_media_post']['cemeteryID'] : "";
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "";
> 
44,45c54,55
< 		$tngpage = $_COOKIE['tng_search_media_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_media_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_media_post']['tngpage']) ? $_COOKIE['tng_search_media_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_media_post']['offset']) ? $_COOKIE['tng_search_media_post']['offset'] : 0;
54a65,70
> if(!empty($order))
> 	$_SESSION['tng_search_media_order'] = $order;
> else
> 	$order = isset($_SESSION['tng_search_media_order']) ? $_SESSION['tng_search_media_order'] : "title";
> 
> if(!isset($offset)) $offset = 0;
64a81
> $wherestr2 = "";
93,94d109
< 	else
< 		$wherestr .= $wherestr ? " AND (status = \"$hsstat\" OR status IS NULL)" : "(status = \"$hsstat\" OR status IS NULL)";
98c113
< if( $unlinked ) {
---
> if( !empty($unlinked) ) {
102a118,124
> else {
> 	$join = "";
> 	$medialinkID = "";
> }
> if( $nothumb ) {
> 	$wherestr .= $wherestr ? " AND thumbpath = \"\"" : "thumbpath = \"\"";
> }
105c127,152
< $query = "SELECT $media_table.mediaID as mediaID, $medialinkID description, notes, thumbpath, mediatypeID, usecollfolder, latitude, longitude, zoom, $media_table.gedcom 
---
> $titlesort = "titleup";
> $changesort = "change";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "title") {
> 	$orderstr = "description";
> 	$titlesort = "<a href=\"admin_media.php?order=titleup\" class=\"lightlink\">{$admtext['title2']}, {$admtext['description']} $descicon</a>";
> }
> else {
> 	$titlesort = "<a href=\"admin_media.php?order=title\" class=\"lightlink\">{$admtext['title2']}, {$admtext['description']} $ascicon</a>";
> 	if($order == "titleup")
> 		$orderstr = "description DESC";
> }
> 
> if($order == "change") {
> 	$orderstr = "changedate, description";
> 	$changesort = "<a href=\"admin_media.php?order=changeup\" class=\"lightlink\">{$admtext['lastmodified']} $descicon</a>";
> }
> else {
> 	$changesort = "<a href=\"admin_media.php?order=change\" class=\"lightlink\">{$admtext['lastmodified']} $ascicon</a>";
> 	if($order == "changeup")
> 		$orderstr = "changedate DESC, description";
> }
> 
> $query = "SELECT $media_table.mediaID as mediaID, $medialinkID description, notes, path, thumbpath, mediatypeID, abspath, mediakey, usecollfolder, $media_table.gedcom, form, changedby, DATE_FORMAT(changedate,\"%d %b %Y\") as changedatef
107c154
< 	ORDER BY description LIMIT $newoffset" . $maxsearchresults;
---
> 	ORDER BY $orderstr LIMIT $newoffset" . $maxsearchresults;
120a168,173
> $uquery = "SELECT count(userID) as ucount FROM $users_table WHERE allow_living != \"-1\"";
> $uresult = tng_query($uquery) or die ($admtext['cannotexecutequery'] . ": $uquery");
> $urow = tng_fetch_assoc( $uresult );
> $numusers = $urow['ucount'];
> tng_free_result($uresult);
> 
123d175
< $flags['tabs'] = $tngconfig['tabs'];
177a230
> 	document.form1.nothumb.checked = false;
206,207d258
< <body background="img/background.gif">
< 
208a260,261
> 	echo tng_adminlayout();
> 
220,223c273,274
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
245c296,297
< 				&nbsp;&nbsp;<input type="checkbox" name="unlinked" value="1"<?php if( $unlinked ) echo " checked"; ?> /> <?php echo $admtext['unlinked']; ?>
---
> 				&nbsp;&nbsp;<input type="checkbox" name="unlinked" value="1"<?php if( !empty($unlinked) ) echo " checked"; ?> /> <?php echo $admtext['unlinked']; ?>
> 				&nbsp;&nbsp;<input type="checkbox" name="nothumb" value="1"<?php if( $nothumb ) echo " checked"; ?> /> <?php echo $admtext['nothumb']; ?>
258c310
< 		if( $msgID == $mediatypeID ) echo " selected";
---
> 		if( $msgID == $mediatypeID ) echo " selected=\"selected\"";
278,284c330,337
< 					<option value="all"<?php if( $hsstat == "all" ) echo " selected"; ?>>&nbsp;</option>
< 					<option value=""<?php if( !$hsstat ) echo " selected"; ?>><?php echo $admtext['nostatus']; ?></option>
< 					<option value="notyetlocated"<?php if( $hsstat == "notyetlocated" ) echo " selected"; ?>><?php echo $admtext['notyetlocated']; ?></option>
< 					<option value="located"<?php if( $hsstat == "located" ) echo " selected"; ?>><?php echo $admtext['located']; ?></option>
< 					<option value="unmarked"<?php if( $hsstat == "unmarked" ) echo " selected"; ?>><?php echo $admtext['unmarked']; ?></option>
< 					<option value="missing"<?php if( $hsstat == "missing" ) echo " selected"; ?>><?php echo $admtext['missing']; ?></option>
< 					<option value="cremated"<?php if( $hsstat == "cremated" ) echo " selected"; ?>><?php echo $admtext['cremated']; ?></option>
---
> 					<option value="all"<?php if( $hsstat == "all" ) echo " selected=\"selected\""; ?>></option>
> 					<option value=""<?php if( !$hsstat ) echo " selected=\"selected\""; ?>><?php echo $admtext['nostatus']; ?></option>
> 					<option value="notyetlocated"<?php if( $hsstat == "notyetlocated" ) echo " selected=\"selected\""; ?>><?php echo $admtext['notyetlocated']; ?></option>
> 					<option value="located"<?php if( $hsstat == "located" ) echo " selected=\"selected\""; ?>><?php echo $admtext['located']; ?></option>
> 					<option value="unmarked"<?php if( $hsstat == "unmarked" ) echo " selected=\"selected\""; ?>><?php echo $admtext['unmarked']; ?></option>
> 					<option value="missing"<?php if( $hsstat == "missing" ) echo " selected=\"selected\""; ?>><?php echo $admtext['missing']; ?></option>
> 					<option value="moved"<?php if( $hsstat == 'moved' ) echo " selected=\"selected\""; ?>><?php echo $admtext['moved']; ?></option>
> 					<option value="cremated"<?php if( $hsstat == "cremated" ) echo " selected=\"selected\""; ?>><?php echo $admtext['cremated']; ?></option>
292c345
< 				<option selected></option>
---
> 				<option value="" selected="selected"></option>
294c347
< $query = "SELECT cemname, cemeteryID, city, county, state, country FROM $cemeteries_table ORDER BY country, state, county, city, cemname";
---
> $query = "SELECT cemname, cemeteryID, city, county, state, country FROM $cemeteries_table ORDER BY cemname, city, county, state, country";
297c350
< 	$cemetery = "{$cemrow['country']}, {$cemrow['state']}, {$cemrow['county']}, {$cemrow['city']}, {$cemrow['cemname']}";
---
> 	$cemetery = "{$cemrow['cemname']} - {$cemrow['city']}, {$cemrow['county']}, {$cemrow['state']}, {$cemrow['country']}";
299c352
< 	if( $cemeteryID == $cemrow['cemeteryID'] ) echo " selected";
---
> 	if( $cemeteryID == $cemrow['cemeteryID'] ) echo " selected=\"selected\"";
327c380
< 		<input type="submit" name="xphaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">&nbsp;&nbsp;
---
> 		<input type="submit" name="xphaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">&nbsp;&nbsp;
350c403
< 					if($albumrow['albumID'] == $albumID)
---
> 					if(isset($albumID) && $albumrow['albumID'] == $albumID)
364c417
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table class="normal resultstable cell-pad3 rounded-table">
366c419
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></td>
---
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</td>
370c423
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</nobr></td>
---
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</td>
374,379c427,428
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['thumb']; ?></b>&nbsp;</nobr></td>
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo "{$admtext['title']}, {$admtext['description']}"; ?></b>&nbsp;</nobr></td>
< <?php
< 	if($map['key']) {
< ?>
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['googleplace']; ?></b>&nbsp;</nobr></td>
---
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['thumb']; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $titlesort; ?></b>&nbsp;</td>
381d429
< 	}
384c432
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['mediatype']; ?></b>&nbsp;</nobr></td>
---
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['mediatype']; ?></b>&nbsp;</td>
388c436,437
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['linkedto']; ?></b>&nbsp;</nobr></td>
---
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['linkedto']; ?></b>&nbsp;</td>
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $changesort; ?></b>&nbsp;</td>
398a448
> 		$filename = null;
405c455
< 			echo "<tr id=\"row_{$row['mediaID']}\"><td class=\"lightback\" valign=\"top\"><div class=\"action-btns\">$newactionstr</div></td>\n";
---
> 			echo "<tr id=\"row_{$row['mediaID']}\"><td class=\"lightback aligntop\"><div class=\"action-btns\">$newactionstr</div></td>\n";
407,408c457,458
< 				echo "<td class=\"lightback\" valign=\"top\" align=\"center\"><input type=\"checkbox\" name=\"ph{$row['mediaID']}\" value=\"1\"></td>";
< 			echo "<td valign=\"top\" class=\"lightback\" align=\"center\">";
---
> 				echo "<td class=\"lightback aligntop center\"><input type=\"checkbox\" name=\"ph{$row['mediaID']}\" value=\"1\"></td>";
> 			echo "<td class=\"lightback aligntop center\">";
420,421c470
< 				echo "<span class=\"normal\">";
< 				echo "<img border=0 src=\"$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" width=\"$photowtouse\" height=\"$photohtouse\"></span>\n";
---
> 				echo "<img class=\"adminthumb\" src=\"$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" alt=\"" . htmlspecialchars($row['description']) . "\" width=\"$photowtouse\" height=\"$photohtouse\">\n";
422a472,473
> 			elseif( $row['form'] == "TXT" )
> 				echo "<span class=\"normal\">Text</span>\n";
427,441c478,480
< 			echo "<td class=\"lightback\" valign=\"top\"><span class=\"normal\">$description<br />" . truncateIt(getXrefNotes($row['notes']),$maxnoteprev) . "</span></td>\n";
< 			if($map['key']) {
< 				echo "<td nowrap class=\"lightback\" valign=\"top\"><span class=\"normal\">";
< 				$geo = "";
< 				if($row['latitude']) $geo .= $admtext['latitude'] . ": " . number_format($row['latitude'],3);
< 				if($row['longitude']) {
< 					if($geo) $geo .= "<br />";
< 					$geo .= $admtext['longitude'] . ": " . number_format($row['longitude'],3);
< 				}
< 				if($row['zoom']) {
< 					if($geo) $geo .= "<br />";
< 					$geo .= $admtext['zoom'] . ": " . $row['zoom'];
< 				}
< 				echo "$geo&nbsp;</span></td>\n";
< 			}
---
> 
> 			$filename = $filename != $row['path'] ? "<div class=\"smaller\" style=\"color:gray;padding-top:7px\">&gt; {$row['path']}</div>" : ""; 
> 			echo "<td class=\"lightback aligntop\">$description<br />" . truncateIt(getXrefNotes($row['notes']),$maxnoteprev) . "$filename</td>\n";
443,444c482,483
< 				$label = $text[$mtypeID] ? $text[$mtypeID] : $mediatypes_display[$mtypeID];
< 				echo "<td nowrap class=\"lightback normal\" valign=\"top\">&nbsp;" . $label . "&nbsp;</td>\n";
---
> 				$label = !empty($text[$mtypeID]) ? $text[$mtypeID] : $mediatypes_display[$mtypeID];
> 				echo "<td class=\"lightback normal aligntop nw\">&nbsp;" . $label . "&nbsp;</td>\n";
447,448c486,487
< 			$query = "SELECT people.personID as personID2, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder,
< 				$medialinks_table.personID as personID, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID, reponame, linktype, $families_table.gedcom as gedcom
---
> 			$query = "SELECT people.personID as personID2, people.gedcom as pgedcom, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder, people.title, people.birthdate, people.birthdatetr, people.altbirthdate, people.altbirthdatetr, people.deathdate, people.deathdatetr, people.living, people.private, people.branch,
> 				$medialinks_table.personID as personID, $sources_table.title as sourcetitle, $sources_table.sourceID, $sources_table.gedcom as sgedcom, $repositories_table.repoID, reponame, $repositories_table.gedcom as rgedcom, linktype, $families_table.gedcom as gedcom
456a496
> 			$citelinks = array();
462c502
< 					$medialinktext .= "<li>" . getName( $prow ) . " ({$prow['personID2']})</li>\n";
---
> 					$medialinktext .= "<li><a href=\"admin_editperson.php?personID={$prow['personID']}&tree={$prow['pgedcom']}\">" . getName( $prow ) . " ({$prow['personID2']})</a></li>\n";
465,466c505,506
< 					$sourcetext = $prow['title'] ? "{$admtext['source']}: {$prow['title']}" : "{$admtext['source']}: {$prow['sourceID']}";
< 					$medialinktext .= "<li>$sourcetext ({$prow['sourceID']})</li>\n";
---
> 					$sourcetext = $prow['sourcetitle'] ? "{$admtext['source']}: {$prow['sourcetitle']}" : "{$admtext['source']}: {$prow['sourceID']}";
> 					$medialinktext .= "<li><a href=\"admin_editsource.php?sourceID={$prow['personID']}&tree={$prow['sgedcom']}\">$sourcetext ({$prow['sourceID']})</a></li>\n";
470c510
< 					$medialinktext .= "<li>$repotext ({$prow['repoID']})</li>\n";
---
> 					$medialinktext .= "<li><a href=\"admin_editrepo.php?repoID={$prow['personID']}&tree={$prow['rgedcom']}\">$repotext ({$prow['repoID']})</a></li>\n";
473c513,549
< 					$medialinktext .= "<li>{$admtext['family']}: " . getFamilyName( $prow ) . "</li>\n";
---
> 					$medialinktext .= "<li><a href=\"admin_editfamily.php?familyID={$prow['personID']}&tree={$prow['gedcom']}\">{$admtext['family']}: " . getFamilyName( $prow ) . "</a></li>\n";
> 				elseif( !$prow['linktype'] || $prow['linktype'] == "C") {
> 					$query = "SELECT persfamID, sourceID, gedcom from $citations_table WHERE citationID = \"{$prow['personID']}\"";
> 					$cresult = tng_query($query);
> 					if($cresult) {
> 						$crow = tng_fetch_assoc($cresult);
> 						if($crow) {
> 							$persfamID = $crow['persfamID'];
> 							if(!in_array($persfamID, $citelinks)) {
> 								$medialinktext .= "<li>{$admtext['citation']}: ";
> 								$citelinks[] = $persfamID;
> 								if(substr($persfamID,0,1) == $tngconfig['personprefix'] || substr($persfamID,-1) == $tngconfig['personsuffix']) {
> 									$presult2 = getPersonSimple($crow['gedcom'],$persfamID);
> 									if($presult2) {
> 										$cprow = tng_fetch_assoc($presult2);
> 										$cprights = determineLivingPrivateRights($cprow);
> 										$cprow['allow_living'] = $cprights['living'];
> 										$cprow['allow_private'] = $cprights['private'];
> 										$medialinktext .= "<a href=\"admin_editperson.php?personID={$crow['persfamID']}&tree={$crow['gedcom']}\">" . getName( $cprow ) . " ($persfamID)</a>";
> 										tng_free_result($presult2);
> 									}
> 								}
> 								elseif(substr($persfamID,0,1) == $tngconfig['familyprefix'] || substr($persfamID,-1) == $tngconfig['familysuffix']) {
> 									$presult2 = getFamilyData($crow['gedcom'],$persfamID);
> 									if($presult2) {
> 										$famrow = tng_fetch_assoc($presult2);
> 										$familyname = getFamilyName($famrow);
> 										$medialinktext .= "<a href=\"admin_editfamily.php?familyID={$crow['persfamID']}&tree={$crow['gedcom']}\">{$admtext['family']}: $familyname ($persfamID)</a>";
> 										tng_free_result($presult2);
> 									}
> 								}
> 								$medialinktext .= "</li>\n";
> 							}
> 						}
> 						tng_free_result($cresult);
> 					}
> 				}
479c555,557
< 			echo "<td nowrap class=\"lightback normal\" valign=\"top\">$medialinktext</td>\n";
---
> 			echo "<td class=\"lightback normal aligntop nw\">$medialinktext</td>\n";
> 			$changedby = $numusers > 1 && $row['changedby'] ? "{$row['changedby']}: " : "";
> 			echo "<td class=\"lightback aligntop\">{$changedby}{$row['changedatef']}</td>\n";
496,501c574,575
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< <script language="javascript" type="text/javascript">
---
> </div>
> <script type="text/javascript">
504c578,580
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_mediauploader.php TNG1403/admin_mediauploader.php
29a30,32
> if( $assignedtree )
>     $tree = $assignedtree;
> 
73a77
>             'mediatrees' => $options['mediatrees'],
186c190
<         @session_start();
---
>         if(session_status() !== PHP_SESSION_ACTIVE) session_start();
888c892,894
< $mediafolder = $mediatypes_assoc[$mediatypeID];
---
> $treestr = $tngconfig['mediatrees'] && $tree ? ("/" . $tree) : "";
> $mediafolder = $mediatypes_assoc[$mediatypeID] . $treestr;
> 
diff -r TNG/admin_mediaupload.php TNG1403/admin_mediaupload.php
28d27
< $flags['tabs'] = $tngconfig['tabs'];
38c37
< var preferDateFormat = '<?php echo $preferDateFormat; ?>';
---
> var preferDateFormat = '<?php if( isset($preferDateFormat) ) echo $preferDateFormat; ?>';
45c44
< var resheremsg = '<span class="normal">' + "<?php echo $text['reshere']; ?>" + '</span>';
---
> var resheremsg = '<span class="normal">' + '</span>'; //can't remember what this was supposed to be
70,71d68
< 	var rval = true;
< 
74d70
< 		rval = false;
76c72,83
< 	return rval;
---
> 	else
> 		linkStuff('linkerform','masslink');
> 	return false;
> }
> 
> function validateForm2( ) {
> 	if( document.find2.cemeteryID.selectedIndex == 0 ) {
> 		alert("<?php echo $admtext['selectcemetery']; ?>");
> 	}
> 	else
> 		linkStuff('linkerform2','cemlink');
> 	return false;
112,141c119,123
< jQuery(document).ready(function() {
< 	jQuery('#linker').click(function(e) {
< 		e.preventDefault();
< 		if(jQuery('#newlink1').val()) {
< 			var medialist = "";
< 
< 			jQuery('.mediacheck:checked').each(function() {
< 				medialist += (medialist ? "," + this.id : this.id);
< 			});
< 			if(medialist) {
< 				var linkermsg = jQuery('#linkermsg');
< 				linkermsg.html('&nbsp;<img src="img/spinner.gif" />');
< 				
< 				var params = jQuery('#linkerform').serialize();
< 				params += "&medialist=" + medialist + "&action=masslink";
< 				jQuery.ajax({
< 					url: cmstngpath + 'ajx_updateorder.php',
< 					data: params,
< 					dataType: 'html',
< 					success: function(req){
< 						linkermsg.html('<span class="green">' + req + '</span>');
< 						linkermsg.effect("highlight",{},2500);
< 					},
< 					error: function(req) {
< 						linkermsg.html("An error has occurred. Please try again.");
< 					}
< 				});
< 			}
< 		}
< 		return false;
---
> function linkStuff(form_id, action) {
> 	var medialist = "";
> 
> 	jQuery('.mediacheck:checked').each(function() {
> 		medialist += (medialist ? "," + this.id : this.id);
143c125,144
< });
---
> 	if(medialist) {
> 		var linkermsg = jQuery('#linkermsg');
> 		linkermsg.html('&nbsp;<img src="img/spinner.gif" />');
> 		
> 		var params = jQuery('#'+form_id).serialize();
> 		params += "&medialist=" + medialist + "&action=" + action;
> 		jQuery.ajax({
> 			url: cmstngpath + 'ajx_updateorder.php',
> 			data: params,
> 			dataType: 'html',
> 			success: function(req){
> 				linkermsg.html('<span class="green">' + req + '</span>');
> 				linkermsg.effect("highlight",{},2500);
> 			},
> 			error: function(req) {
> 				linkermsg.html("An error has occurred. Please try again.");
> 			}
> 		});
> 	}
> }
154,155d154
< <body background="img/background.gif">
< 
156a156,157
> 	echo tng_adminlayout();
> 
168,170c169,170
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
188c188
< 		if( $row['gedcom'] ) {
---
> 		if( !empty($row['gedcom']) ) {
201c201
< 		if( $row['gedcom'] ) $tree = $row['gedcom'];
---
> 		if( !empty($row['gedcom']) ) $tree = $row['gedcom'];
206c206
< 			if( $treerow['gedcom'] == $row['gedcom'] ) echo " selected";
---
> 			if( isset($row['gedcom']) && $treerow['gedcom'] == $row['gedcom'] ) echo " selected";
213c213,214
< 	$folder = $mediatypes_assoc[$mediatypeID];
---
> 	$treestr = $tngconfig['mediatrees'] && $tree ? ("/" . $tree) : "";
> 	$folder = $mediatypes_assoc[$mediatypeID] . $treestr;
254,263c255,265
< 	<form action="admin_ordermedia.php" method="get" name="find" id="linkerform" onsubmit="return validateForm();">
< 	<table cellspacing="2" class="normal">
< 		<tr>
< 			<td><?php echo $admtext['tree']; ?></td>
< 			<td><?php echo $admtext['linktype']; ?></td>
< 			<td colspan="3"><?php echo $admtext['id']; ?></td>
< 		</tr>
< 		<tr>
< 			<td valign="top">
< 				<select name="tree1">
---
> 	<div style="float:left; margin-right: 20px">
> 		<form action="" method="get" name="find" id="linkerform" onsubmit="return validateForm();">
> 		<table cellspacing="2" class="normal">
> 			<tr>
> 				<td><?php echo $admtext['tree']; ?></td>
> 				<td><?php echo $admtext['linktype']; ?></td>
> 				<td colspan="3"><?php echo $admtext['id']; ?></td>
> 			</tr>
> 			<tr>
> 				<td valign="top">
> 					<select name="tree1">
265,271c267,273
< 	$treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
< 	while( $treerow = tng_fetch_assoc($treeresult) ) {
< 		echo "	<option value=\"{$treerow['gedcom']}\"";
< 		if( $treerow['gedcom'] == $tree ) echo " selected";
< 		echo ">{$treerow['treename']}</option>\n";
< 	}
< 	tng_free_result($treeresult);
---
> 		$treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
> 		while( $treerow = tng_fetch_assoc($treeresult) ) {
> 			echo "	<option value=\"{$treerow['gedcom']}\"";
> 			if( isset($tree) && $treerow['gedcom'] == $tree ) echo " selected";
> 			echo ">{$treerow['treename']}</option>\n";
> 		}
> 		tng_free_result($treeresult);
273,309c275,336
< 				</select>
< 			</td>
< 			<td valign="top">
< 				<select name="linktype1" onchange="toggleEventLink(this.selectedIndex);">
< 					<option value="I"><?php echo $admtext['person']; ?></option>
< 					<option value="F"><?php echo $admtext['family']; ?></option>
< 					<option value="S"><?php echo $admtext['source']; ?></option>
< 					<option value="R"><?php echo $admtext['repository']; ?></option>
< 					<option value="L"><?php echo $admtext['place']; ?></option>
< 				</select>
< 			</td>
< 			<td><input type="text" name="newlink1" id="newlink1" value="<?php echo $personID; ?>" onblur="toggleEventRow(document.find.eventlink1.checked);"></td>
< 			<td><a href="#" onclick="return findItem(document.find.linktype1.options[document.find.linktype1.selectedIndex].value,'newlink1',null,document.find.tree1.options[document.find.tree1.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>" class="smallicon admin-find-icon"></a></td>
< 			<td>
< 		    	<input type="button" class="toggle" value="<?php echo $admtext['selectall']; ?>">
< 				<input type="submit" id="linker" value="<?php echo $admtext['linksel']; ?>"> &nbsp; <span id="linkermsg"></span>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td colspan="2">&nbsp;</td>
< 			<td colspan="2">
< 				<span id="eventlink1" class="normal"><input type="checkbox" name="eventlink1" value="1" onclick="return toggleEventRow(this.checked);" /> <?php echo $admtext['eventlink']; ?></span><br />
< 				<select name="event1" id="eventrow1" style="display:none">
< 					<option value=""></option>
< 				</select>
< 			</td>
< 			<td class="normal" valign="top">&nbsp;</td>
< 		</tr>
< 	</table>
< 
< 	</form>
< 
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
---
> 					</select>
> 				</td>
> 				<td valign="top">
> 					<select name="linktype1" onchange="toggleEventLink(this.selectedIndex);">
> 						<option value="I"><?php echo $admtext['person']; ?></option>
> 						<option value="F"><?php echo $admtext['family']; ?></option>
> 						<option value="S"><?php echo $admtext['source']; ?></option>
> 						<option value="R"><?php echo $admtext['repository']; ?></option>
> 						<option value="L"><?php echo $admtext['place']; ?></option>
> 					</select>
> 				</td>
> 				<td><input type="text" name="newlink1" id="newlink1" value="<?php if( isset($personID) ) echo $personID; ?>" onblur="toggleEventRow(document.find.eventlink1.checked);"></td>
> 				<td><a href="#" onclick="return findItem(document.find.linktype1.options[document.find.linktype1.selectedIndex].value,'newlink1',null,document.find.tree1.options[document.find.tree1.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>" class="smallicon admin-find-icon"></a></td>
> 				<td>
> 			    	<input type="button" class="toggle" value="<?php echo $admtext['selectall']; ?>">
> 					<input type="submit" id="linker" value="<?php echo $admtext['linksel']; ?>">
> 				</td>
> 			</tr>
> 			<tr>
> 				<td colspan="2">&nbsp;</td>
> 				<td colspan="2">
> 					<span id="eventlink1" class="normal"><input type="checkbox" name="eventlink1" value="1" onclick="return toggleEventRow(this.checked);" /> <?php echo $admtext['eventlink']; ?></span><br />
> 					<select name="event1" id="eventrow1" style="display:none">
> 						<option value=""></option>
> 					</select>
> 				</td>
> 				<td class="normal" valign="top">&nbsp;</td>
> 			</tr>
> 		</table>
> 		</form>
> 	</div>
> 	<div>
> 		<form action="" method="get" name="find2" id="linkerform2" onsubmit="return validateForm2();">
> 		<table cellspacing="2" class="normal">
> 			<tr>
> 				<td colspan="3"><?php echo $admtext['cemetery']; ?></td>
> 			</tr>
> 			<tr>
> 				<td valign="top">
> 					<select name="cemeteryID" id="cemeteryID">
> 						<option value="" selected="selected"></option>
> <?php
> $query = "SELECT cemname, cemeteryID, city, county, state, country FROM $cemeteries_table ORDER BY cemname, city, county, state, country";
> $cemresult = tng_query($query);
> while( $cemrow = tng_fetch_assoc($cemresult) ) {
> 	$cemetery = "{$cemrow['cemname']} - {$cemrow['city']}, {$cemrow['county']}, {$cemrow['state']}, {$cemrow['country']}";
> 	echo "		<option value=\"{$cemrow['cemeteryID']}\">$cemetery</option>\n";
> }
> ?>
> 					</select>
> 				</td>
> 				<td>
> 			    	<input type="button" class="toggle" value="<?php echo $admtext['selectall']; ?>">
> 					<input type="submit" id="linker2" value="<?php echo $admtext['linksel']; ?>">
> 				</td>
> 			</tr>
> 		</table>
> 		</form>
> 	</div>
> 	<p style="clear:both"><span id="linkermsg"></span>&nbsp;</p>
> 	</div>
> </div>
354c381
< 				<?php echo $admtext['title'] . "<hr/>\n" . $admtext['description']; ?><br/><br/>
---
> 				<?php echo $admtext['title2'] . "<hr/>\n" . $admtext['description']; ?><br/><br/>
417,418c444,446
< </body>
< </html>
---
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_merge.php TNG1403/admin_merge.php
34c34
< $righttree = checktree($tree);
---
> $righttree = checktree(isset($tree) ? $tree : "");
54a55,56
> $personID1 = isset($personID1) ? strtoupper($personID1) : "";
> $personID2 = isset($personID2) ? strtoupper($personID2) : "";
86c88
< 					if( $p2row[$field] && !$p1row[$field] ) echo " checked";
---
> 					if(!empty($p2row[$field]) && empty($p1row[$field])) echo " checked";
149c151
< 		$srights = determineLivingPrivateRights($fathrow, $righttree);
---
> 		$srights = determineLivingPrivateRights($spouserow, $righttree);
217c219
< 	global $cfirstname, $clastname, $cbirthdate, $cbirthplace, $cdeathdate, $cdeathplace, $cignoreblanks, $csoundex;
---
> 	global $cfirstname, $clastname, $cbirthdate, $cbirthplace, $cchrdate, $cchrplace, $cdeathdate, $cdeathplace, $cignoreblanks, $csoundex;
237a240,247
> 	if( $cchrdate == "yes" && isset($row['altbirthdate'])) {
> 		$criteria .= " AND altbirthdate = \"" . addslashes( $row['altbirthdate'] ) . "\"";
> 		$criteria .= $cignoreblanks == "yes" ? " AND altbirthdate != \"\"" : "";
> 	}
> 	if( $cchrplace == "yes" && isset($row['altbirthplace'])) {
> 		$criteria .= " AND altbirthplace = \"" . addslashes( $row['altbirthplace'] ) . "\"";
> 		$criteria .= $cignoreblanks == "yes" ? " AND altbirthplace = \"\"" : "";
> 	}
301a312,347
> function doDNAtests($personID1, $personID2) {
> 	global $tree, $dna_tests_table, $dna_links_table;
> 
> 	$query = "UPDATE $dna_tests_table set personID = \"$personID1\" WHERE personID = \"$personID2\" AND gedcom = \"$tree\"";
> 	$result = tng_query($query);
> 
> 	$query = "UPDATE $dna_links_table set personID = \"$personID1\" WHERE personID = \"$personID2\" AND gedcom = \"$tree\"";
> 	$result = tng_query($query);
> }
> 
> function removeSpouse($key,$personID) {
> 	global $tree, $families_table;
> 
> 	$varname = substr( $key, 8 );
> 
> 	//blank out person1 spouse, but it could be wife or husband
> 	$query = "UPDATE $families_table set husband = \"\", husborder = \"\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\" AND husband = \"$personID\"";
> 	$chilresult = tng_query_noerror($query);
> 	$query = "UPDATE $families_table set wife = \"\", wifeorder = \"\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\" AND wife = \"$personID\"";
> 	$chilresult = tng_query_noerror($query);
> }
> 
> function getFamilyForSpouse($personID,$otherspouse) {
> 	global $tree, $families_table;
> 
> 	//select union where husband/wife or wife/husband
> 	$query = "(SELECT familyID, husband, wife, husborder, wifeorder FROM $families_table WHERE gedcom = \"$tree\" AND husband = \"$personID\" AND wife = \"" . substr($otherspouse, 6) . "\") UNION
> 		(SELECT familyID, husband, wife, husborder, wifeorder FROM $families_table WHERE gedcom = \"$tree\" AND wife = \"$personID\" AND husband = \"" . substr($otherspouse, 6) . "\")";
> 	//$query = "SELECT familyID, husband, wife, husborder, wifeorder FROM $families_table WHERE gedcom = \"$tree\" AND $p1self = \"$personID1\" AND $p1spouse = \"" . substr($value, 6) . "\"";
> 	$spresult = tng_query($query);
> 	$sprow =  tng_fetch_assoc( $spresult );
> 	tng_free_result($spresult);
> 
> 	return $sprow;
> }
> 
319a366
> if(!isset($mergeaction)) $mergeaction = "";
470,473c517
< 					$query = "SELECT familyID FROM $families_table WHERE gedcom = \"$tree\" AND $p1self = \"$personID1\" AND $p1spouse = \"" . substr($value, 6) . "\"";
< 					$sp1result = tng_query($query);
< 					$sp1row =  tng_fetch_assoc( $sp1result );
< 					tng_free_result($sp1result);
---
> 					$sp1row = getFamilyForSpouse($personID1,$value);
477,479c521,527
< 					if( $ccombineextras )
< 						$query = "UPDATE $medialinks_table set personID = \"{$sp1row['familyID']}\" WHERE personID = \"$varname\" AND gedcom = \"$tree\"";
< 					else
---
> 					$updated = 0;
> 					if( $ccombineextras ) {
> 						$query = "UPDATE IGNORE $medialinks_table set personID = \"{$sp1row['familyID']}\" WHERE personID = \"$varname\" AND gedcom = \"$tree\"";
> 						$mediaresult = tng_query_noerror($query);
> 						$updated = tng_affected_rows();
> 					}
> 					if(!$updated)
505,509c553,554
< 				if( !$_POST[$samespouse] && $p1self ) {
< 					$varname = substr( $key, 8 );
< 
< 					$query = "UPDATE $families_table set $p1self = \"\", $p1spouseorder = \"\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
< 					$chilresult = tng_query_noerror($query);
---
> 				if( !$_POST[$samespouse] ) {
> 					removeSpouse($key, $personID1);
513,517c558
<    				$varname = substr( $key, 8 );
< 
< 				//remove left person from family.
< 				$query = "UPDATE $families_table set $p1self = \"\", $p1spouseorder = \"\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
< 				$chilresult = tng_query_noerror($query);
---
> 				removeSpouse($key, $personID1);
521,530c562,572
< 				if( $p1self ) {
< 					if( $_POST[$xx] ) {
< 						$varname = substr( $key, 6 );
< 
< 						//same spouse, box checked, so we're removing LEFT family, moving kids over to left family
< 						//get families where left person is the husband/wife and right SPOUSE is the wife/husband
< 						$query = "SELECT familyID, $p1spouseorder FROM $families_table WHERE gedcom = \"$tree\" AND $p1self = \"$personID1\" AND $p1spouse = \"" . substr($value, 6) . "\"";
< 						$sp1result = tng_query($query);
< 						$sp1row =  tng_fetch_assoc( $sp1result );
< 						tng_free_result($sp1result);
---
> 				//do we need this check? It won't be true if the person is of unknown gender, but that shouldn't stop us
> 				if( $_POST[$xx] ) {
> 					$varname = substr( $key, 6 );
> 
> 					//same spouse, box checked, so we're removing LEFT family, moving kids over to left family
> 					$sp1row = getFamilyForSpouse($personID1,$value);
> 					//use correct spouse
> 					if($personID1 == $sp1row['husband'])
> 						$query = "UPDATE $families_table set husband = \"$personID1\", wifeorder = \"{$sp1row['wifeorder']}\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
> 					else
> 						$query = "UPDATE $families_table set wife = \"$personID1\", husborder = \"{$sp1row['husborder']}\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
532,533c574,580
< 						$query = "UPDATE $families_table set $p1self = \"$personID1\", $p1spouseorder = \"{$sp1row[$p1spouseorder]}\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
< 						$chilresult = tng_query_noerror($query);
---
> 					$chilresult = tng_query_noerror($query);
> 
> 					//delete family on LEFT
> 					$query = "DELETE from $families_table WHERE familyID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
> 					$famresult = tng_query($query);
> 
> 					doAssociations($varname, $sp1row['familyID']);
535,544c582,584
< 						//delete family on LEFT
< 						$query = "DELETE from $families_table WHERE familyID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
< 						$famresult = tng_query($query);
< 
< 						doAssociations($varname, $sp1row['familyID']);
< 
< 						if( $ccombineextras )
< 							$query = "UPDATE $medialinks_table set personID = \"$varname\" WHERE personID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
< 						else
< 							$query = "DELETE FROM $medialinks_table WHERE personID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
---
> 					$updated = 0;
> 					if( $ccombineextras ) {
> 						$query = "UPDATE IGNORE $medialinks_table set personID = \"$varname\" WHERE personID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
545a586,590
> 						$updated = tng_affected_rows();
> 					}
> 					if(!$updated)
> 						$query = "DELETE FROM $medialinks_table WHERE personID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
> 					$mediaresult = tng_query_noerror($query);
547,549c592,594
< 						//update all people records where FAMC = the deleted family, set FAMC = family on right
< 						$query = "UPDATE $people_table set famc = \"$varname\" WHERE famc = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
< 						$paresult = tng_query_noerror($query);
---
> 					//update all people records where FAMC = the deleted family, set FAMC = family on right
> 					$query = "UPDATE $people_table set famc = \"$varname\" WHERE famc = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
> 					$paresult = tng_query_noerror($query);
551,552c596,600
< 						//move all children from family1 to family2
< 						$query = "UPDATE $children_table set familyID = \"$varname\" WHERE familyID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
---
> 					//move all children from family1 to family2
> 					$query = "UPDATE $children_table set familyID = \"$varname\" WHERE familyID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
> 					$chilresult = tng_query_noerror($query);
> 					if( !$chilresult ) {
> 						$query = "DELETE FROM $children_table WHERE familyID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
554,557c602
< 						if( !$chilresult ) {
< 							$query = "DELETE FROM $children_table WHERE familyID = \"{$sp1row['familyID']}\" AND gedcom = \"$tree\"";
< 							$chilresult = tng_query_noerror($query);
< 						}
---
> 					}
559,560c604,605
< 						if( $ccombinenotes && $sp1row['familyID'])
< 							doNotesCitations( $varname, $sp1row['familyID'], "" );
---
> 					if( $ccombinenotes && $sp1row['familyID'])
> 						doNotesCitations( $varname, $sp1row['familyID'], "" );
562,580c607,612
< 						$query = "UPDATE $events_table set persfamID = \"{$sp1row['familyID']}\" WHERE persfamID = \"$varname\" AND gedcom = \"$tree\"";
< 						$evresult = tng_query_noerror($query);
< 					}
< 					else {
< 						//this means spouses are different, the box has been checked, so they want to keep the right spouse + family
< 						$varname = substr( $key, 6 );
< 
< 						//get families where right person is married to right spouse
< 						$query = "SELECT familyID FROM $families_table WHERE gedcom = \"$tree\" AND $p1self = \"$personID2\" AND $p1spouse = \"$varname\"";
< 						$sp1result = tng_query($query);
< 						$sp1row =  tng_fetch_assoc( $sp1result );
< 						tng_free_result($sp1result);
< 
< 						//get spouse order for left person, add one
< 						$query = "SELECT $p1spouseorder FROM $families_table WHERE gedcom = \"$tree\" AND $p1self = \"$personID1\" ORDER BY $p1spouseorder DESC";
< 						$spresult = tng_query($query);
< 						$sprow =  tng_fetch_assoc( $spresult );
< 						tng_free_result($spresult);
< 						$sporder = $sprow[$p1spouseorder] + 1;
---
> 					$query = "UPDATE $events_table set persfamID = \"{$sp1row['familyID']}\" WHERE persfamID = \"$varname\" AND gedcom = \"$tree\"";
> 					$evresult = tng_query_noerror($query);
> 				}
> 				else {
> 					//this means spouses are different, the box has been checked, so they want to keep the right spouse + family
> 					$varname = substr( $key, 6 );
582,584c614,631
< 						//update those families to have left person married to right spouse, change spouse order
< 						$query = "UPDATE $families_table set $p1self = \"$personID1\", $p1spouseorder = \"$sporder\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
< 						$chilresult = tng_query_noerror($query);
---
> 					//get families where right person is married to right spouse
> 					//do union husband/wife and wife/husband
> 					$sp1row = getFamilyForSpouse($personID2,$value);
> 
> 					//get spouse order for left person, add one
> 					//do union husband/wife and wife/husband
> 					$query = "(SELECT husband, wife, husborder, wifeorder FROM $families_table WHERE gedcom = \"$tree\" AND husband = \"$personID1\") UNION
> 						(SELECT husband, wife, husborder, wifeorder FROM $families_table WHERE gedcom = \"$tree\" AND wife = \"$personID1\") ORDER BY husborder, wifeorder DESC";
> 					//$query = "SELECT $p1spouseorder FROM $families_table WHERE gedcom = \"$tree\" AND $p1self = \"$personID1\" ORDER BY $p1spouseorder DESC";
> 					$spresult = tng_query($query);
> 					$sprow =  tng_fetch_assoc( $spresult );
> 					tng_free_result($spresult);
> 
> 					//update those families to have left person married to right spouse, change spouse order
> 					//use queries above to determine who is who first
> 					if($personID2 == $sp1row['husband']) {
> 						$sporder = $sprow['wifeorder'] + 1;
> 						$query = "UPDATE $families_table set husband = \"$personID1\", wifeorder = \"$sporder\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
585a633,638
> 					elseif($personID2 == $sp1row['wife']) {
> 						$sporder = $sprow['husborder'] + 1;
> 						$query = "UPDATE $families_table set wife = \"$personID1\", husborder = \"$sporder\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
> 					}
> 					//$query = "UPDATE $families_table set $p1self = \"$personID1\", $p1spouseorder = \"$sporder\" WHERE familyID = \"$varname\" AND gedcom = \"$tree\"";
> 					$chilresult = tng_query_noerror($query);
629a683
> 	doDNAtests($personID1, $personID2);
632,635c686,690
< 	if( $p1self ) {
< 		$query = "UPDATE $families_table set $p1self = \"\", $p1spouseorder = \"0\" WHERE $p1self = \"$personID2\" AND gedcom = \"$tree\"";
< 		$chilresult = tng_query($query);
< 	}
---
> 	//use an OR or two separate update queries blank out correct family
> 	$query = "UPDATE $families_table set husband = \"\", wifeorder = \"0\" WHERE husband = \"$personID2\" AND gedcom = \"$tree\"";
> 	$chilresult = tng_query($query);
> 	$query = "UPDATE $families_table set wife = \"\", husborder = \"0\" WHERE wife = \"$personID2\" AND gedcom = \"$tree\"";
> 	$chilresult = tng_query($query);
642a698
> 	$updated = 0;
644c700
< 		$query = "UPDATE $medialinks_table set personID = \"$personID1\", defphoto = \"\" WHERE personID = \"$personID2\" AND gedcom = \"$tree\"";
---
> 		$query = "UPDATE IGNORE $medialinks_table set personID = \"$personID1\", defphoto = \"\" WHERE personID = \"$personID2\" AND gedcom = \"$tree\"";
645a702
> 		$updated = tng_affected_rows();
656c713
< 	else {
---
> 	if(!$updated) {
663,664d719
< 	$personID2 = "";
< 	$p2row = "";
682a738,740
> 
> 	$personID2 = "";
> 	$p2row = "";
689d746
< $flags['tabs'] = $tngconfig['tabs'];
748,749d804
< <body background="img/background.gif">
< 
750a806,807
> 	echo tng_adminlayout();
> 
760,762c817,818
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
778a835
> $firstcols = !$tngconfig['hidechr'] ? 7 : 5;
799c856
< </table><br/>
---
> 	</table><br/>
802c859
< 			<td colspan="5"><span class="normal"><strong><?php echo $admtext['matchthese']; ?></strong></span></td>
---
> 			<td colspan="<?php echo $firstcols; ?>"><span class="normal"><strong><?php echo $admtext['matchthese']; ?></strong></span></td>
816,817c873,874
< 				<input type="checkbox" name="cbirthdate" value="yes"<?php if( $cbirthdate == "yes" ) echo " checked"; ?>> <?php echo $admtext['birthdate']; ?><br/>
< 				<input type="checkbox" name="cbirthplace" value="yes"<?php if( $cbirthplace == "yes" ) echo " checked"; ?>> <?php echo $admtext['birthplace']; ?>
---
> 				<input type="checkbox" name="cbirthdate" value="yes"<?php if( isset($cbirthdate) && $cbirthdate == "yes" ) echo " checked"; ?>> <?php echo $admtext['birthdate']; ?><br/>
> 				<input type="checkbox" name="cbirthplace" value="yes"<?php if( isset($cbirthplace) && $cbirthplace == "yes" ) echo " checked"; ?>> <?php echo $admtext['birthplace']; ?>
820a878,880
> <?php
> 	if(!$tngconfig['hidechr']) {
> ?>
823,824c883,894
< 				<input type="checkbox" name="cdeathdate" value="yes"<?php if( $cdeathdate == "yes" ) echo " checked"; ?>> <?php echo $admtext['deathdate']; ?><br/>
< 				<input type="checkbox" name="cdeathplace" value="yes"<?php if( $cdeathplace == "yes" ) echo " checked"; ?>> <?php echo $admtext['deathplace']; ?>
---
> 				<input type="checkbox" name="cchrdate" value="yes"<?php if( isset($cchrdate) && $cchrdate == "yes" ) echo " checked"; ?>> <?php echo $admtext['chrdate']; ?><br/>
> 				<input type="checkbox" name="cchrplace" value="yes"<?php if( isset($cchrplace) && $cchrplace == "yes" ) echo " checked"; ?>> <?php echo $admtext['chrplace']; ?>
> 				</span>
> 			</td>
> 			<td>&nbsp;&nbsp;&nbsp;</td>
> <?php
> 	}
> ?>
> 			<td>
> 				<span class="normal">
> 				<input type="checkbox" name="cdeathdate" value="yes"<?php if( isset($cdeathdate) && $cdeathdate == "yes" ) echo " checked"; ?>> <?php echo $admtext['deathdate']; ?><br/>
> 				<input type="checkbox" name="cdeathplace" value="yes"<?php if( isset($cdeathplace) && $cdeathplace == "yes" ) echo " checked"; ?>> <?php echo $admtext['deathplace']; ?>
830,831c900,901
< 				<input type="checkbox" name="cignoreblanks" value="yes"<?php if( $cignoreblanks == "yes" ) echo " checked"; ?>> <?php echo $admtext['ignoreblanks']; ?><br/>
< 				<input type="checkbox" name="csoundex" value="yes"<?php if( $csoundex == "yes" ) echo " checked"; ?>> <?php echo $admtext['usesoundex']; ?>*
---
> 				<input type="checkbox" name="cignoreblanks" value="yes"<?php if( isset($cignoreblanks) && $cignoreblanks == "yes" ) echo " checked"; ?>> <?php echo $admtext['ignoreblanks']; ?><br/>
> 				<input type="checkbox" name="csoundex" value="yes"<?php if( isset($csoundex) && $csoundex == "yes" ) echo " checked"; ?>> <?php echo $admtext['usesoundex']; ?>*
856c926
< 		echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['person']} 1 | <a href=\"\" onclick=\"return deepOpen('admin_editperson.php?personID={$p1row['personID']}&amp;tree=$tree&amp;cw=1','edit')\">{$admtext['edit']}</a></strong></td>\n";
---
> 		echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['person']} 1 | <a href=\"\" onclick=\"window.open('admin_editperson.php?personID={$p1row['personID']}&amp;tree=$tree&amp;cw=1');return false;\">{$admtext['edit']}</a></strong></td>\n";
858c928
< 			echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['person']} 2 | <a href=\"\" onclick=\"return deepOpen('admin_editperson.php?personID={$p2row['personID']}&amp;tree=$tree&amp;cw=1','edit')\">{$admtext['edit']}</a></strong></td>\n";
---
> 			echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['person']} 2 | <a href=\"\" onclick=\"window.open('admin_editperson.php?personID={$p2row['personID']}&amp;tree=$tree&amp;cw=1');return false;\">{$admtext['edit']}</a></strong></td>\n";
869c939
< 					$p2row[$ename] .= getEvent( $event );
---
> 					$p2row[$ename] = (isset($p2row[$ename]) ? $p2row[$ename] : "") . getEvent( $event );
887,909c957,969
< 			if( $p2row['sex'] ) { 
< 				if ( $p2row['sex'] == "M" ) { 
< 					$p2spouse = "wife"; $p2self = "husband"; $p2spouseorder = "husborder";
< 				}
< 				elseif( $p2row['sex'] == "F" ) { 
< 					$p2spouse = "husband"; $p2self = "wife"; $p2spouseorder = "wifeorder";
< 				}
< 				else {
< 					$p2spouse = ""; $p2self = ""; $p2spouseorder = "";
< 				}
< 				
< 				if( $p2self ) {
< 					$query = "SELECT $p2spouse, familyID, marrdate, marrplace, sealdate, sealplace FROM $families_table WHERE $families_table.$p2self = \"{$p2row['personID']}\" AND gedcom = \"$tree\" ORDER BY $p2spouseorder";
< 					$marriages2= tng_query($query);
< 	
< 					while ( $marriage = tng_fetch_assoc( $marriages2 ) ) {
< 						$mname = "spouse$marriage[$p2spouse]";
< 						$p2row[$mname] = getSpouse( $marriage, $p2spouse );
< 						if( !in_array( $marriage[$p2spouse], $spouses ) ) {
< 							array_push( $spouses, $marriage[$p2spouse] );
< 		   					$marriages[$marriage[$p2spouse]] = $marriage['familyID'];
< 						}
< 					}
---
> 			//don't need check, then use UNION in query
> 			$query = "(SELECT husband, wife, familyID, marrdate, marrplace, sealdate, sealplace FROM $families_table WHERE husband = \"{$p2row['personID']}\" AND gedcom = \"$tree\") UNION
> 				(SELECT husband, wife, familyID, marrdate, marrplace, sealdate, sealplace FROM $families_table WHERE wife = \"{$p2row['personID']}\" AND gedcom = \"$tree\")";
> 			$marriages2 = tng_query($query);
> 
> 			//figure out which spouse we have
> 			while ( $marriage = tng_fetch_assoc( $marriages2 ) ) {
> 				$p2spouse = $marriage['husband'] == $p2row['personID'] ? "wife" : "husband";
> 				$mname = "spouse$marriage[$p2spouse]";
> 				$p2row[$mname] = getSpouse( $marriage, $p2spouse );
> 				if( !in_array( $marriage[$p2spouse], $spouses ) ) {
> 					array_push( $spouses, $marriage[$p2spouse] );
>    					$marriages[$marriage[$p2spouse]] = $marriage['familyID'];
952,953c1012,1013
< 				$p1row[$ename] .= getEvent( $event );
< 				if($eventlist[$ekey])
---
> 				$p1row[$ename] = (isset($p1row[$ename]) ? $p1row[$ename] : "") . getEvent( $event );
> 				if(!empty($eventlist[$ekey]))
988,1010c1048,1059
< 		if( $p1row['sex'] ) { 
< 			if ( $p1row['sex'] == "M" ) { 
< 				$p1spouse = "wife"; $p1self = "husband"; $p1spouseorder = "husborder";
< 			}
< 			elseif( $p1row['sex'] == "F" ) { 
< 				$p1spouse = "husband"; $p1self = "wife"; $p1spouseorder = "wifeorder";
< 			}
< 			else {
< 				$p1spouse = ""; $p1self = ""; $p1spouseorder = "";
< 			}
< 			
< 			if( $p1self ) {
< 				$query = "SELECT $p1spouse, familyID, marrdate, marrplace, sealdate, sealplace FROM $families_table WHERE $families_table.$p1self = \"{$p1row['personID']}\" AND gedcom = \"$tree\" ORDER BY $p1spouseorder";
< 				$marriages1= tng_query($query);
< 		
< 				while ( $marriage = tng_fetch_assoc( $marriages1 ) ) {
< 					$mname = "spouse" . $marriage[$p1spouse];
< 					$p1row[$mname] = getSpouse( $marriage, $p1spouse );
< 					if( !in_array( $marriage[$p1spouse], $spouses ) ) {
< 						array_push( $spouses, $marriage[$p1spouse] );
< 						$marriages[$marriage[$p1spouse]] = $marriage['familyID'];
< 					}
< 				}
---
> 		$query = "(SELECT husband, wife, familyID, marrdate, marrplace, sealdate, sealplace FROM $families_table WHERE husband = \"{$p1row['personID']}\" AND gedcom = \"$tree\") UNION
> 			(SELECT husband, wife, familyID, marrdate, marrplace, sealdate, sealplace FROM $families_table WHERE wife = \"{$p1row['personID']}\" AND gedcom = \"$tree\")";
> 		$marriages1 = tng_query($query);
> 
> 		//figure out which spouse we have
> 		while ( $marriage = tng_fetch_assoc( $marriages1 ) ) {
> 			$p1spouse = $marriage['husband'] == $p1row['personID'] ? "wife" : "husband";
> 			$mname = "spouse$marriage[$p1spouse]";
> 			$p1row[$mname] = getSpouse( $marriage, $p1spouse );
> 			if( !in_array( $marriage[$p1spouse], $spouses ) ) {
> 				array_push( $spouses, $marriage[$p1spouse] );
> 					$marriages[$marriage[$p1spouse]] = $marriage['familyID'];
1037,1040d1085
< 	</td>
< </tr>
< 
< </table>
1042,1045c1087,1089
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_mergeplacesajax.php TNG1403/admin_mergeplacesajax.php
101c101
< 		$result = @tng_query($query);
---
> 		$result = @tng_query_noerror($query);
106a107,108
> 		$query = "UPDATE $media_table SET placetaken=\"$newplace\" WHERE placetaken=\"$oldplace\" $treestr";
> 		$result = tng_query($query);
diff -r TNG/admin_mergeplaces.php TNG1403/admin_mergeplaces.php
12c12,17
< if($place) {
---
> if( !isset($place) ) $place = "";
> if( !isset($place2) ) $place2 = "";
> 
> if( empty($tree) )
> 	$tree = isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "";
> if( !empty($place) ) {
15c20
< 	setcookie("tng_search_places_post[tree]", $tree, $exptime);
---
> 	setcookie("tng_tree", $tree, 0);
26c31
< 	if(!$tngconfig['places1tree'])
---
> 	if(!$tngconfig['places1tree']) {
27a33,36
> 		$treestr = "&tree=$tree";
> 	}
> 	else
> 		$treestr = "";
37,39c46
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_search_places_post']['tree'];
< 	if($_COOKIE['tng_merge_search_post']['search'])
---
> 	if( !empty($_COOKIE['tng_merge_search_post']['search']) )
41,43c48,52
< 	else if($_COOKIE['tng_merge_places_post']['place']) {
< 		$place = stripslashes($_COOKIE['tng_merge_places_post']['place']);
< 		$place2 = stripslashes($_COOKIE['tng_merge_places_post']['place2']);
---
> 	else {
> 		if( !empty($_COOKIE['tng_merge_places_post']['place']) )
> 			$place = stripslashes($_COOKIE['tng_merge_places_post']['place']);
> 		if( !empty($_COOKIE['tng_merge_places_post']['place2']) )
> 			$place2 = stripslashes($_COOKIE['tng_merge_places_post']['place2']);
47c56
< $treequery = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
---
> $treequery = "SELECT gedcom, treename FROM $trees_table ORDER BY treename";
51d59
< $flags['tabs'] = $tngconfig['tabs'];
68,69d75
< <body background="img/background.gif">
< 
70a77,78
> 	echo tng_adminlayout();
> 
80,82c88,89
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
131c138
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="rounded-table">
149c156
< 			echo "<td class=\"lightback\" valign=\"top\">$display&nbsp;</td>\n";
---
> 			echo "<td class=\"lightback\" valign=\"top\"><a href=\"admin_editplace.php?ID={$row['place']}{$treestr}&cw=1\" target=\"blank\">$display</a>&nbsp;</td>\n";
163,169c170,174
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_mergerepos.php TNG1403/admin_mergerepos.php
157c157
< if( $repoID1 ) {
---
> if( !empty($repoID1) ) {
169c169
< if( $mergeaction == $admtext['nextmatch'] || $mergeaction ==$admtext['nextdup'] ) {
---
> if( isset($mergeaction) && ($mergeaction == $admtext['nextmatch'] || $mergeaction == $admtext['nextdup']) ) {
226c226
< elseif( $repoID2 ) {
---
> elseif( !empty($repoID2) ) {
239c239
< if( $mergeaction == $admtext['merge'] ) {
---
> if( isset($mergeaction) && $mergeaction == $admtext['merge'] ) {
331d330
< $flags['tabs'] = $tngconfig['tabs'];
367,368d365
< <body background="img/background.gif">
< 
369a367,368
> 	echo tng_adminlayout();
> 
378,380c377,378
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow""">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
392c390
< 	if( $treerow['gedcom'] == $tree ) $trees .= " selected";
---
> 	if( !empty($tree) && $treerow['gedcom'] == $tree ) $trees .= " selected";
396c394
< $mergeclass = $repoID1 && $repoID2 ? "class=\"btn\"" : "class=\"disabled\" disabled";
---
> $mergeclass = !empty($repoID1) && !empty($repoID2) ? "class=\"btn\"" : "class=\"disabled\" disabled";
405c403
< 			<td><div style="float:left"><?php echo $admtext['repoid']; ?> 1: <input type="text" name="repoID1" id="repoID1" size="10" value="<?php echo $repoID1; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</div>
---
> 			<td><div style="float:left"><?php echo $admtext['repoid']; ?> 1: <input type="text" name="repoID1" id="repoID1" size="10" value="<?php if( isset($repoID1) ) echo $repoID1; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</div>
408c406
< 			<td><div style="float:left"><?php echo $admtext['repoid']; ?> 2: <input type="text" name="repoID2" id="repoID2" size="10" value="<?php echo $repoID2; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</div>
---
> 			<td><div style="float:left"><?php echo $admtext['repoid']; ?> 2: <input type="text" name="repoID2" id="repoID2" size="10" value="<?php if( isset($repoID2) ) echo $repoID2; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</div>
424,425c422,423
< 				<input type="checkbox" name="ccombinenotes" value="yes"<?php if( $ccombinenotes == "yes" ) echo " checked"; ?>> <?php echo $admtext['combinenotesonly']; ?><br/>
< 				<input type="checkbox" name="ccombineextras" value="yes"<?php if( $ccombineextras == "yes" ) echo " checked"; ?>> <?php echo $admtext['combineextras']; ?>
---
> 				<input type="checkbox" name="ccombinenotes" value="yes"<?php if( isset($ccombinenotes) && $ccombinenotes == "yes" ) echo " checked"; ?>> <?php echo $admtext['combinenotesonly']; ?><br/>
> 				<input type="checkbox" name="ccombineextras" value="yes"<?php if( isset($ccombineextras) && $ccombineextras == "yes" ) echo " checked"; ?>> <?php echo $admtext['combineextras']; ?>
441c439
< 		echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['repo']} 1 | <a href=\"\" onclick=\"deepOpen('admin_editrepo.php?repoID={$r1row['repoID']}&amp;tree=$tree&amp;cw=1','edit')\">{$admtext['edit']}</a></strong></td>\n";
---
> 		echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['repo']} 1 | <a href=\"\" onclick=\"window.open('admin_editrepo.php?repoID={$r1row['repoID']}&amp;tree=$tree&amp;cw=1');return false;\">{$admtext['edit']}</a></strong></td>\n";
443c441
< 			echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['repo']} 2 | <a href=\"\" onclick=\"deepOpen('admin_editrepo.php?repoID={$r2row['repoID']}&amp;tree=$tree&amp;cw=1','edit')\">{$admtext['edit']}</a></strong></td>\n";
---
> 			echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['repo']} 2 | <a href=\"\" onclick=\"window.open('admin_editrepo.php?repoID={$r2row['repoID']}&amp;tree=$tree&amp;cw=1');return false;\">{$admtext['edit']}</a></strong></td>\n";
494c492
< if( $repoID1 || $repoID2 ) {
---
> if( !empty($repoID1) || !empty($repoID2) ) {
507,514c505,509
< 	</td>
< </tr>
< 
< </table>
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_mergesources.php TNG1403/admin_mergesources.php
163c163
< if( $sourceID1 ) {
---
> if( !empty($sourceID1) ) {
175c175
< if( !$mergeaction ) {
---
> if( empty($mergeaction) ) {
179c179
< if( $mergeaction == $admtext['nextmatch'] || $mergeaction ==$admtext['nextdup'] ) {
---
> if( isset($mergeaction) && ($mergeaction == $admtext['nextmatch'] || $mergeaction == $admtext['nextdup']) ) {
238c238
< elseif( $sourceID2 ) {
---
> elseif( !empty($sourceID2) ) {
251c251
< if( $mergeaction == $admtext['merge'] ) {
---
> if( isset($mergeaction) && $mergeaction == $admtext['merge'] ) {
260c260
< 				$updatestr .= ", $varname = \"$s1row[$varname]\" ";
---
> 				$updatestr .= ", $varname = \"" . addslashes($s1row[$varname]) . "\" ";
343d342
< $flags['tabs'] = $tngconfig['tabs'];
379,380d377
< <body background="img/background.gif">
< 
381a379,380
> 	echo tng_adminlayout();
> 
390,392c389,390
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
404c402
< 	if( $treerow['gedcom'] == $tree ) $trees .= " selected";
---
> 	if( !empty($tree) && $treerow['gedcom'] == $tree ) $trees .= " selected";
408c406
< $mergeclass = $sourceID1 && $sourceID2 ? "class=\"btn\"" : "class=\"disabled\" disabled";
---
> $mergeclass = !empty($sourceID1) && !empty($sourceID2) ? "class=\"btn\"" : "class=\"disabled\" disabled";
417c415
< 			<td><div style="float:left"><?php echo $admtext['sourceid']; ?> 1: <input type="text" name="sourceID1" id="sourceID1" size="10" value="<?php echo $sourceID1; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</div>
---
> 			<td><div style="float:left"><?php echo $admtext['sourceid']; ?> 1: <input type="text" name="sourceID1" id="sourceID1" size="10" value="<?php if( isset($sourceID1) ) echo $sourceID1; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</div>
420c418
< 			<td><div style="float:left"><?php echo $admtext['sourceid']; ?> 2: <input type="text" name="sourceID2" id="sourceID2" size="10" value="<?php echo $sourceID2; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</div>
---
> 			<td><div style="float:left"><?php echo $admtext['sourceid']; ?> 2: <input type="text" name="sourceID2" id="sourceID2" size="10" value="<?php if( isset($sourceID2) ) echo $sourceID2; ?>"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;</div>
438,439c436,437
< 				<input type="checkbox" name="cshorttitle" value="yes"<?php if( $cshorttitle ) echo " checked"; ?>> <?php echo $admtext['shorttitle']; ?><br/>
< 				<input type="checkbox" name="clongtitle" value="yes"<?php if( $clongtitle ) echo " checked"; ?>> <?php echo $admtext['title']; ?>
---
> 				<input type="checkbox" name="cshorttitle" value="yes"<?php if( isset($cshorttitle) && $cshorttitle ) echo " checked"; ?>> <?php echo $admtext['shorttitle']; ?><br/>
> 				<input type="checkbox" name="clongtitle" value="yes"<?php if( isset($clongtitle) && $clongtitle ) echo " checked"; ?>> <?php echo $admtext['title2']; ?>
445,446c443,444
< 				<input type="checkbox" name="cauthor" value="yes"<?php if( $cauthor == "yes" ) echo " checked"; ?>> <?php echo $admtext['author']; ?><br/>
< 				<input type="checkbox" name="cpublisher" value="yes"<?php if( $cpublisher == "yes" ) echo " checked"; ?>> <?php echo $admtext['publisher']; ?>
---
> 				<input type="checkbox" name="cauthor" value="yes"<?php if( isset($cauthor) && $cauthor == "yes" ) echo " checked"; ?>> <?php echo $admtext['author']; ?><br/>
> 				<input type="checkbox" name="cpublisher" value="yes"<?php if( isset($cpublisher) && $cpublisher == "yes" ) echo " checked"; ?>> <?php echo $admtext['publisher']; ?>
452,453c450,451
< 				<input type="checkbox" name="crepoID" value="yes"<?php if( $crepoID == "yes" ) echo " checked"; ?>> <?php echo $admtext['repository']; ?><br/>
< 				<input type="checkbox" name="cactualtext" value="yes"<?php if( $cactualtext == "yes" ) echo " checked"; ?>> <?php echo $admtext['actualtext']; ?>
---
> 				<input type="checkbox" name="crepoID" value="yes"<?php if( isset($crepoID) && $crepoID == "yes" ) echo " checked"; ?>> <?php echo $admtext['repository']; ?><br/>
> 				<input type="checkbox" name="cactualtext" value="yes"<?php if( isset($cactualtext) && $cactualtext == "yes" ) echo " checked"; ?>> <?php echo $admtext['actualtext']; ?>
459,460c457,458
< 				<input type="checkbox" name="ccombinenotes" value="yes"<?php if( $ccombinenotes == "yes" ) echo " checked"; ?>> <?php echo $admtext['combinenotesonly']; ?><br/>
< 				<input type="checkbox" name="ccombineextras" value="yes"<?php if( $ccombineextras == "yes" ) echo " checked"; ?>> <?php echo $admtext['combineextras']; ?>
---
> 				<input type="checkbox" name="ccombinenotes" value="yes"<?php if( isset($ccombinenotes) && $ccombinenotes == "yes" ) echo " checked"; ?>> <?php echo $admtext['combinenotesonly']; ?><br/>
> 				<input type="checkbox" name="ccombineextras" value="yes"<?php if( isset($ccombineextras) && $ccombineextras == "yes" ) echo " checked"; ?>> <?php echo $admtext['combineextras']; ?>
466c464
< 				<input type="checkbox" name="cignoreblanks" value="yes"<?php if( $cignoreblanks == "yes" ) echo " checked"; ?>> <?php echo $admtext['ignoreblanks']; ?><br/>
---
> 				<input type="checkbox" name="cignoreblanks" value="yes"<?php if( isset($cignoreblanks) && $cignoreblanks == "yes" ) echo " checked"; ?>> <?php echo $admtext['ignoreblanks']; ?><br/>
482c480
< 		echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['source']} 1 | <a href=\"\" onclick=\"deepOpen('admin_editsource.php?sourceID={$s1row['sourceID']}&amp;tree=$tree&amp;cw=1','edit')\">{$admtext['edit']}</a></strong></td>\n";
---
> 		echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['source']} 1 | <a href=\"\" onclick=\"window.open('admin_editsource.php?sourceID={$s1row['sourceID']}&amp;tree=$tree&amp;cw=1');return false;\">{$admtext['edit']}</a></strong></td>\n";
484c482
< 			echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['source']} 2 | <a href=\"\" onclick=\"deepOpen('admin_editsource.php?sourceID={$s2row['sourceID']}&amp;tree=$tree&amp;cw=1','edit')\">{$admtext['edit']}</a></strong></td>\n";
---
> 			echo "<td colspan=\"3\"><strong class=\"subhead\">{$admtext['source']} 2 | <a href=\"\" onclick=\"window.open('admin_editsource.php?sourceID={$s2row['sourceID']}&amp;tree=$tree&amp;cw=1');return false;\">{$admtext['edit']}</a></strong></td>\n";
540c538
< if( $sourceID1 || $sourceID2 ) {
---
> if( !empty($sourceID1) || !empty($sourceID2) ) {
553,560c551,555
< 	</td>
< </tr>
< 
< </table>
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/adminmeta.php TNG1403/adminmeta.php
2,3c2,3
< #tngnav a {font-size:11px}
< #tabs a {font-size:11px}
---
> #tngnav a {font-size:12px; padding: 0.6em 1em 0.3em 11px;}
> #tabs a {font-size:12px}
diff -r TNG/admin_misc.php TNG1403/admin_misc.php
12,17d11
< if( $assignedtree ) {
< 	$message = $admtext['norights'];
< 	header( "Location: admin_login.php?message=" . urlencode($message) );
< 	exit;
< }
< 
20d13
< $flags['tabs'] = $tngconfig['tabs'];
25,26d17
< <body background="img/background.gif">
< 
27a19,20
> 	echo tng_adminlayout();
> 
37,39c30,34
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
> <?php
> 	if( !$assignedtree ) {
> ?>
43a39,41
> <?php
> }
> ?>
47,50c45
< </td>
< </tr>
< 
< </table>
---
> 	</div>
52,54c47,49
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
Only in TNG1403: admin_modanalyzer.php
diff -r TNG/admin_modeditor.php TNG1403/admin_modeditor.php
3c3
<    Mod Manager 12 parameter editor
---
>    Mod Manager 14.0.0.1 parameter editor
7,8c7,9
< define( 'YES',      "1" );
< define( 'EDITP',     5 );
---
> ob_start('ob_gzhandler');
>  const YES = "1";
>  const NO = "0";
10c11
< $debug = false;
---
> define( 'EDITP',     5 );
12,13c13,14
< include("begin.php");
< include("adminlib.php");
---
> require 'begin.php';
> require 'adminlib.php';
15c16,18
< include("getlang.php");
---
> require $mylanguage.'/admintext.php';
> $helplang = findhelp("modhandler_help.php");
> $thisfile = $_SERVER['PHP_SELF'];
17,18d19
< include("$mylanguage/admintext.php");
< tng_db_connect($database_host,$database_name,$database_username,$database_password,$database_port,$database_socket) or exit;
20,23c21,22
< include("checklogin.php");
< include("version.php");
< include("classes/version.php");
< $thisfile = $_SERVER['PHP_SELF'];
---
> require 'checklogin.php';
> require 'version.php';
25,26c24,48
< include $subroot.'mmconfig.php';
< $helplang = findhelp("modhandler_help.php");
---
> require $subroot.'mmconfig.php';
> require 'classes/version.php';
> require 'classes/mmtabs.inc';
> 
> /* save modlisting mod id for return to modhandler */
> if($id)
> 	$_SESSION['actualmod'] = $id;
> else
> 	$_SESSION['actualmod'] = "";
> 
> // prevent direct URL access to Mod Manager if not the TNG Administrator
> if( $assignedtree || !$allow_edit ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> $cfgfolder = rtrim( $rootpath, "/" ).'/'.trim( $modspath, "/" ).'/';
> $mhuser = isset( $_SESSION['currentuserdesc'] ) ? $_SESSION['currentuser'] : "";
> 
> /***************************************************************
>     1. OUTPUT STD ADMIN PAGE HTML HEADER + ADDITIONS
> ***************************************************************/
> $flags['modmgr'] = true;
> tng_adminheader( $admtext['modmgr'], $flags );
28,30c50,69
< $parts = explode( ".", $tng_version );		// added to determine TNG vNN for
< $tngmodver = "{$admtext['tngmods']} v{$parts[0]}";	// Mods for TNG vNN text display
< $tngmodurl = "Mods_for_TNG_v{$parts[0]}";	// Mods for TNG vNN URL
---
> /* Height of the table display must be set for
> ** each page to account for differences in
> ** heading heights.
> **
> ** The <head> tag must be explicitly closed. */
> echo "
> <style>
>   .tableFixedHead {
>     height:calc( 100vh - 220px ) !important;
>   }
> 
>   .forme:before {
>     display:block;
>     height:34px;
>     margin-top:-34px;
>     content:'';
>   }
> </style>
> </head>
> ";
32,33c71,79
< // SETUP THE PAGE HEADER AND MENUS
< $modtabs = set_horizontal_tabs( $options['show_analyzer'], $options['show_updates'] );
---
> /***************************************************************
>     2. OUTPUT TNG ADMIN TOP BANNER AND LEFT SIDE MENUS
> ***************************************************************/
> echo tng_adminlayout();
> 
> /***************************************************************
>     3. PREPARE MOD MANAGER PAGE TITLE, TABS AND HORZ MENU
> ***************************************************************/
> $modtabs = set_horizontal_tabs( $options['show_analyzer'], $options['show_developer'], $options['show_updates'] );
35,37c81,82
< $menu = "<div class=\"mmmenuwrap\">";
< $menu .= doMenu($modtabs,"modlist",$innermenu);
< $menu .= "</div>";
---
> 
> $menu = doMenu($modtabs,"modlist",$innermenu);
40,41c85
< $headline = displayHeadline($admtext['modmgr'].' - '.ucwords($admtext['edparams']),"img/modmgr_icon.gif",$menu,$message);
< $first_menu=TRUE;
---
> echo $headline = displayHeadline($admtext['modmgr'].' - '.ucwords($admtext['edparams']),"img/modmgr_icon.gif",$menu,$message);
43,44c87,89
< $cfgfolder = rtrim( $rootpath, "/" ).'/'.trim( $modspath, "/" ).'/';
< $mhuser = isset( $_SESSION['currentuserdesc'] ) ? $_SESSION['currentuser'] : "";
---
> /***************************************************************
>     4. MOD EDITOR PAGE CONTENT
> ***************************************************************/
46,47c91,92
< // INITIALIZATIONS FOR MOD OBJECTS
< require 'classes/modobjinits.php';
---
> // Inits for mod objects
> //require 'classes/modobjinits.php';
49,67c94
< /*
< // INITIALIZATIONS FOR MOD OBJECTS
< $objinits = array (
<    'rootpath'     => $rootpath,
<    'subroot'      => $subroot,
<    'modspath'     => $modspath,
<    'extspath'     => $extspath,
<    'options'      => $options,
<    'time_offset'  => $time_offset,
<    'sitever'      => $sitever,
<    'currentuserdesc' => $mhuser,
<    'admtext'      => $admtext,
<    'templatenum'  => $templatenum,
<    'tng_version'  => $tng_version
< );
< */
< /*************************************************************************
< PROCESS POSTED FORM DATA
< *************************************************************************/
---
> // PROCESS POSTED FORM DATA
69c96,97
<    foreach( $_POST as $key => $value ) {
---
>    foreach( $_POST as $key => $value )
>    {
72c100,102
<    if( $submit == "pUpdate" ) {
---
>    if( $submit == "pUpdate" )
>    {
> 	 		$param['val'] = trim( $param['val'], "'\"" );
74,77c104,118
<       $oEdit = new modeditor( $objinits );
<       if( $oEdit->update_parameter( $param ) ) {
<          $action = EDITP;
<          $cfgpath = $param['cfg'];
---
>       $oEdit = new_modeditor();
>       if( $oEdit->update_parameter( $param ) )
>       {
>         $action = EDITP;
>         $cfgpath = $param['cfg'];
> 
>         $qs = $_SERVER['QUERY_STRING'];
>         if( false !== $pos = strpos( $qs, "#forme_" ) )
>         {
>           $qs = substr( $qs, $pos);
>         }
> 
>         $qs .= "#{$param['forme']}";
>         header("Location:admin_modeditor.php?$qs");
> 
84c125,126
<    elseif( $submit == "pRestore" ) {
---
>    elseif( $submit == "pRestore" )
>    {
86,87c128,130
<       $oEdit = new modeditor( $objinits );
<       if( $oEdit->restore_parameter( $param ) ) {
---
>       $oEdit = new_modeditor();
>       if( $oEdit->restore_parameter( $param ) )
>       {
89a133,139
>         $qs = $_SERVER['QUERY_STRING'];
>         if( false !== $pos = strpos( $qs, "#forme_" ) )
>         {
>           $qs = substr( $qs, $pos);
>         }
>         $qs .= "#{$param['forme']}";
>         header("Location:admin_modeditor.php?$qs");
91c141,142
<       else {
---
>       else
>       {
96c147,150
<    elseif( $submit == "pCancel" ) {
---
>    elseif( $submit == "pCancel" )
>    {
>       /* should not reach here - modeditor cancels directly to
>       ** admin_modhandler.*/
100,102c154,155
< /*************************************************************************
< PROCESS QUERY LINE ARGS
< *************************************************************************/
---
> 
> // PROCESS QUERY LINE ARGS
104c157,158
<    foreach( $_GET as $key => $value ) {
---
>    foreach( $_GET as $key => $value )
>    {
114,120d167
< /*************************************************************************
< SHOW PAGE HEADER
< *************************************************************************/
< $flags['tabs'] = $tngconfig['tabs'];
< $flags['modmgr'] = true;
< tng_adminheader( $admtext['modmgr'], $flags );
< 
122,129d168
< echo "
< <style type='text/css'>
< body {
<    margin:0;
<    overflow-y: scroll;
<    min-width:$min_width;
< }
< </style>";
131,138c170,172
< if( $options['fix_header'] == YES && $sitever != 'mobile' ) {
<    $headclass = 'mmhead-fixed';
<    $tableclass = 'm2table-fixed';
< }
< else {
<    $headclass = 'mmhead-scroll';
<    $tableclass = 'm2table-scroll';
< }
---
> // SHOW EDIT FORM
> if( !empty( $action ) && $action == EDITP )
> {
140,152c174,175
< echo "
< </head>
< <body background=\"img/background.gif\">
< <div id=\"mmhead\" class=\"$headclass adminback\">
<    $headline
< </div><!--head-section-->";
< /*************************************************************************
< SHOW EDIT FORM
< *************************************************************************/
< 
< if( !empty( $action ) && $action == EDITP ) {
< 
<    if( !class_exists( "modeditor" ) ) {
---
>    if( !class_exists( "modeditor" ) )
>    {
154c177
<       $oEdit = new modeditor( $objinits );
---
>       $oEdit = new_modeditor();
166,191c189,191
< /*************************************************************************
< SHOW EDIT FORM
< *************************************************************************/
< if( $sitever != 'mobile' && $options['adjust_headers'] ) {
<    echo "
< <script type=\"text/javascript\">
<    window.scroll(0,0);
<    jQuery(document).ready(function() {
<       // set position of the title bar (tbar) relative to mmhead
<       jQuery('#tbar').position({
<          my: 'left top',
<          at: 'left bottom',
<          of: jQuery('#mmhead'),
<          collision: 'none'
<       });
< 
<       // set position of m3table table relative to title bar (tbar)
<       jQuery('#m3table').position({
<          my: 'left top',
<          at: 'left bottom',
<          of: jQuery('#tbar'),
<          collision: 'none'
<       });
<    });
< </script>";
< }
---
> echo tng_adminfooter();
> 
> ob_end_flush();
193,196d192
< echo "
< </body>
< </html>";
< exit;
200,215c196
< function set_horizontal_tabs( $show_analyzer = NO, $show_updates = NO ) {
<    global $admtext;
< 
<    $modtabs = array();
<    $modtabs[0] = array(1, "admin_modhandler.php", $admtext['modlist'],"modlist");
<    $modtabs[1] = array(1,"admin_showmodslog.php",$admtext['viewlog'],"viewlog");
<    $modtabs[2] = array(1,"admin_modoptions.php",$admtext['options'],"options");
<    if ( $show_analyzer == YES) {
<       $modtabs[3] = array(1,"admin_analyzemods.php",$admtext['analyzefiles'],'files');
<       $modtabs[4] = array(1,"admin_modtables.php",$admtext['parsetable'],'parser');
<    }
<    if ( $show_updates == YES )
<       $modtabs[5] = array(1,"admin_modupdates.php",$admtext['recommendedfixes'],'updates');
<    return $modtabs;
< }
< function set_innermenu_links( $tng_version ) {
---
> function set_innermenu_links( $tng_version, $pageID='editor' ) {
224c205,206
<    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
>    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php#$pageID');\" class=\"lightlink\">{$admtext['help']}</a>
> ";
227c209,210
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax\" target=\"_blank\" class=\"lightlink\">{$admtext['modsyntax']}</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax\" target=\"_blank\" class=\"lightlink\">{$admtext['modsyntax']}</a>
> ";
230c213,214
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Guidelines\" target=\"_blank\" class=\"lightlink\">{$admtext['modguidelines']}</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Guidelines\" target=\"_blank\" class=\"lightlink\">{$admtext['modguidelines']}</a>
> ";
233c217,218
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Category:$tngmodurl\" target=\"_blank\" class=\"lightlink\">$tngmodver</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Category:$tngmodurl\" target=\"_blank\" class=\"lightlink\">$tngmodver</a>
> ";
diff -r TNG/admin_modhandler.php TNG1403/admin_modhandler.php
3,8c3,14
<    Mod Manager 12
<       Brian McFadyen: Original concept
<       Rick Bisbee: Main script, Mod List, Analyzer, OOP class library
<       Ken Roy: View Log, Options, Test Manager
<       Robin Richmond: View Log
<       Jeff Robison: Affected Files Display
---
> Mod Manager Mod Handler v14.0.0.1
>   Brian McFadyen: Original concept
>   Rick Bisbee: Main script, Mod List, Analyzer, OOP class library
>   Ken Roy: View Log, Options, Test Manager
>   Robin Richmond: View Log
>   Jeff Robison: Affected Files Display
>   Michel Kirsch: Mod Analyzer updates
>   Michel Kirsch and Ron Krzmarzick: Page Display Positioning
> 
>   This is the Mod Manager controller. It uses class objects to
>   acheive various functional ends - verifying, listing, installing
>   removing, and editing 'mods'.
10,11c16,17
<       Uses class objects to acheive various functionality - listing, installing
<       removing, and editing mod config files.
---
>   This version is the Final refactoring to separate validation
>   functions (Modvalidator) from Modlister.
13,16c19,23
< 
< include("begin.php");
< if( empty( $rootpath ) ) {
<    echo 'Error ',__LINE__,': $rootpath missing! Please contact your system administrator.';exit;
---
> $mmversion = 'mmv14.0.0.1';
> include "begin.php";
> if( empty( $rootpath ) )
> {
>   echo 'Error ',__LINE__,': $rootpath missing! Please contact your system administrator.';exit;
18c25,26
< include("adminlib.php");
---
> 
> include "adminlib.php";
20c28,40
< include("getlang.php");
---
> include "getlang.php";
> 
> include $mylanguage."/admintext.php";
> if( !$alltextloaded )
> {
>   require $mylanguage."/alltext.php";
> }
> 
> $admin_login = true;
> include "checklogin.php";
> include "version.php";
> include "classes/version.php";
> require "classes/mmtabs.inc";
22c42,47
< include("$mylanguage/admintext.php");
---
> /* prevent direct URL access to Mod Manager if not the TNG Administrator. */
> if( $assignedtree || !$allow_edit ) {
>   $message = $admtext['norights'];
>   header( "Location: admin_login.php?message=" . urlencode($message) );
>   exit;
> }
24,27c49,51
< $admin_login = 1;
< include("checklogin.php");
< include("version.php");
< include("classes/version.php");
---
> /* Suppress PHP notices.*/
> if( !isset( $modspath) ) $modspath = '';
> if( !isset( $extspath) ) $extspath = '';
35a60
> define( 'ALL',       0 );
44,58c69
< include $subroot.'mmconfig.php';
< 
< //suppress PHP notices
< if( !isset( $modspath) ) $modspath = '';
< if( !isset( $extspath) ) $extspath = '';
< 
< // VERIFY TNG FILES WRITEABLE
< $message = '';
< if( !is_writable( $rootpath ) )
<    $message .= "{$admtext['checkwrite']} {$admtext['cantwrite']} $rootpath ";
< 
< //echo $message;exit;
< if( !empty( $message ) ) {
<    $message = "<span class=\"msgerror\">$message</span>";
< }
---
> require_once $subroot.'mmconfig.php';
68,73c79,81
< // SETUP THE PAGE HEADER AND MENUS
< $modtabs = set_horizontal_tabs( $options['show_analyzer'], $options['show_developer'], $options['show_updates']);
< $innermenu = set_innermenu_links( $tng_version );
< $menu = "<div class=\"mmmenuwrap\">";
< $menu .= doMenu($modtabs,"modlist",$innermenu);
< $menu .= "</div>";
---
> $message = '';
> if( !is_writable( $rootpath ) )
>    $message .= "{$admtext['checkwrite']} {$admtext['cantwrite']} $rootpath ";
75,76c83,86
< $headline = displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
< $first_menu=TRUE;
---
> //echo $message;exit;
> if( !empty( $message ) ) {
>    $message = "<span class=\"msgerror\">$message</span>";
> }
79c89,90
< $mhuser = isset( $_SESSION['currentuserdesc'] ) ? $_SESSION['currentuser'] : "";
---
> $mhuser = isset( $_SESSION['currentuserdesc'] )
>   ? $_SESSION['currentuser'] : "";
81,98d91
< // INITIALIZATIONS FOR MOD OBJECTS
< require 'classes/modobjinits.php';
< 
< /*
< $objinits = array (
<    'rootpath'     => $rootpath,
<    'subroot'      => $subroot,
<    'modspath'     => $modspath,
<    'extspath'     => $extspath,
<    'options'      => $options,
<    'time_offset'  => $time_offset,
<    'sitever'      => $sitever,
<    'currentuserdesc' => $mhuser,
<    'admtext'      => $admtext,
<    'templatenum'  => $templatenum,
<    'tng_version'  => $tng_version
< );
< *
103,172c96,182
< if( !empty( $_POST ) ) {
<    foreach( $_POST as $key => $value ) {
<       ${$key} = $value;
<    }
< 
<    // APPLY FILTER TO MODLIST FOR BATCH OPS
<    if( !empty( $submit ) ) {
<       if( !empty( $mods ) ) {
<          foreach( $mods as $mod ) {
<             if( isset( $mod['selected'] ) ) {
<                $modlist[] = $cfgfolder.$mod['file'];
<             }
<          }
<       }
< 
<       // INSTALL ALL
<       if( $submit == "installall" ) {
<          include_once 'classes/modinstaller.class.php';
<          $oInstaller = new modinstaller( $objinits );
<          if(!$oInstaller->batch_install( $modlist ) || $options['redirect2log'] == ON_ALL ) {
<             header("Location:admin_showmodslog.php");
<             exit;
<          }
< 		 else {
<             header( "Location:admin_modhandler.php" );
<             exit;
<          }
<       }
< 
<       // REMOVE ALL
<       elseif( $submit == "removeall" ) {
<          include_once 'classes/modremover.class.php';
<          $oRemover = new modremover( $objinits );
<          if( !$oRemover->batch_remove( $modlist ) || $options['redirect2log'] == ON_ALL ) {
<             header("Location:admin_showmodslog.php");
<             exit;
<          }
<  		   else {
<             header( "Location:admin_modhandler.php" );
<             exit;
<          }
<       }
<       // CLEANUP ALL
<       elseif( $submit == "cleanupall" ) {
<          include_once 'classes/modremover.class.php';
<          $oRemover = new modremover( $objinits);
<          if( !$oRemover->batch_remove( $modlist ) || $options['redirect2log'] == ON_ALL ) {
<             header("Location:admin_showmodslog.php");
<             exit;
<          }
< 		 else {
<             header( "Location:admin_modhandler.php" );
<             exit;
<          }
<       }
<       // DELETE ALL
<       elseif( $submit == "deleteall" ) {
< //echo __LINE__;print_r($modlist);exit;
<          include_once 'classes/moddeleter.class.php';
<          $oDeleter = new moddeleter( $objinits);
<          if( !$oDeleter->batch_delete( $modlist ) || $options['redirect2log'] == ON_ALL ) {
<             header( "Location:admin_showmodslog.php");
<             exit;
<          }
< 		 else {
<             header( "Location:admin_modhandler.php" );
<             exit;
<          }
<       }
<    }
---
> if( !empty( $_POST ) )
> {
>   foreach( $_POST as $key => $value )
>   {
>     ${$key} = $value;
>   }
> 
>   // APPLY FILTER TO MODLIST FOR BATCH OPS
>   if( !empty( $submit ) )
>   {
>     if( !empty( $mods ) )
>     {
>       foreach( $mods as $mod )
>       {
>               if( isset( $mod['selected'] ) )
>         {
>           $modlist[] = $cfgfolder.$mod['file'];
>               }
>       }
>     }
> 
>     // INSTALL BATCH
>     if( $submit == "installall" )
>     {
>       include_once 'classes/modinstaller.class.php';
>       // $oInstaller = new modinstaller( $objinits );
>       $oInstaller = new_modinstaller();
>       if(!$oInstaller->batch_install( $modlist )
>         || $options['redirect2log'] == ON_ALL )
>       {
>         header("Location:admin_showmodslog.php");
>         exit;
>       }
>       header('location:admin_modhandler.php');
>       exit;
>       /* Given the redirect, don't think this this will be a problem anymore.
>       */
>       if( function_exists( 'opcache_invalidate' ) )
>       {
>         opcache_invalidate($mylanguage."/cust_text.php");
>       }
>       include $mylanguage."/cust_text.php";
>     }
> 
>     // REMOVE BATCH
>     elseif( $submit == "removeall" )
>     {
>       include_once 'classes/modremover.class.php';
>       $oRemover = new_modremover( );
>       if( !$oRemover->batch_remove( $modlist )
>         || $options['redirect2log'] == ON_ALL )
>       {
>         header("Location:admin_showmodslog.php");
>         exit;
>       }
>       header('location:admin_modhandler.php');
>       exit;
>     }
>     // CLEANUP BATCH
>     elseif( $submit == "cleanupall" )
>     {
>       include_once 'classes/modremover.class.php';
>       $oRemover = new_modremover();
>       if( !$oRemover->batch_remove( $modlist )
>         || $options['redirect2log'] == ON_ALL )
>       {
>         header("Location:admin_showmodslog.php");
>         exit;
>       }
>       header('location:admin_modhandler.php');
>       exit;
>     }
>     // DELETE BATCH
>     elseif( $submit == "deleteall" )
>     {
>       include_once 'classes/moddeleter.class.php';
>       $oDeleter = new_moddeleter();
>       if( !$oDeleter->batch_delete( $modlist )
>         || $options['redirect2log'] == ON_ALL )
>       {
>         header( "Location:admin_showmodslog.php");
>         exit;
>       }
>       header('location:admin_modhandler.php');
>       exit;
>     }
>   }
177,237c187,292
< elseif( !empty( $_GET ) ) {
<    foreach( $_GET as $key => $value ) {
<       ${$key} = $value;
<    }
<    if( isset( $a ) ) {
<       $action = isset( $a ) ? $a : '';
<       $cfgpath = isset( $m ) ? $cfgfolder.$m : '';
< 
<       // INSTALL
<       if( $action == INSTALL ) {
<          include_once 'classes/modinstaller.class.php';
<          $obj = new modinstaller( $objinits );
<          if( !$obj->install( $cfgpath ) || $options['redirect2log'] == ON_ALL ) {
<             header( "Location:admin_showmodslog.php");
<             exit;
<          }
<          else {
<             header( "Location:admin_modhandler.php" );
<             exit;
<          }
<       }
<       // REMOVE
<       elseif( $action == REMOVE ) {
<          include_once 'classes/modremover.class.php';
<          $obj = new modremover( $objinits );
<          if( !$obj->remove( $cfgpath ) || $options['redirect2log'] == ON_ALL ) {
<             header( "Location:admin_showmodslog.php");
<             exit;
<          }
<          else {
<             header( "Location:admin_modhandler.php" );
<             exit;
<          }
<       }
<       // DELETE
<       elseif( $action == DELETE ) {
<          $error = false;
<          include_once 'classes/moddeleter.class.php';
<          $obj = new moddeleter( $objinits );
<          if( !$obj->delete_mod( $cfgpath ) || $options['redirect2log'] == ON_ALL ) {
<             header( "Location:admin_showmodslog.php");
<             exit;
<          }
<          else {
<             header( "Location:admin_modhandler.php" );
<             exit;
<          }
<       }
<       // CLEANUP
<       elseif( $action == CLEANUP ) {
<          include_once 'classes/modremover.class.php';
<          $obj = new modremover( $objinits );
<          $obj->classID = "cleaner";
<          if( !$obj->remove( $cfgpath ) || $options['redirect2log'] == ON_ALL ) {
<             header( "Location:admin_showmodslog.php");
<             exit;
<          }
<          else {
<             header( "Location:admin_modhandler.php" );
<             exit;
<          }
---
> elseif( !empty( $_GET ) || !empty( $_SESSION['got'] ) )
> {
>   /* Remove URL parameter string to prevent duplicate processing if
>   ** page is refreshed.
>   */
>   if( !empty( $_GET ) )
>   {
>     $_SESSION['got'] = $_GET;
>     header('Location:admin_modhandler.php');
>     die;
>   }
>   elseif (!empty($_SESSION['got']))
>   {
>     $_GET = $_SESSION['got'];
>     unset($_SESSION['got']);
>   }
> 
>   foreach( $_GET as $key => $value )
>   {
>     ${$key} = $value;
>   }
>   if( isset( $a ) )
>   {
>     $action = isset( $a ) ? $a : '';
>     $cfgpath = isset( $m ) ? $cfgfolder.$m : '';
> 
>     // INSTALL SINGLE
>     if( $action == INSTALL )
>     {
>       require 'classes/modinstaller.class.php';
>       /* Get initialized modinstaller */
>       $oInstaller = new_modinstaller();
> 
>       if( !$oInstaller->install( $cfgpath )
>         || $options['redirect2log'] == ON_ALL )
>       {
>         header( "Location:admin_showmodslog.php");
>         exit;
>       }
>       else
>       {
>         if( function_exists( 'opcache_invalidate' ) )
>         {
>           opcache_invalidate($mylanguage."/cust_text.php");
>         }
>         include $mylanguage."/cust_text.php";
>         /* Mod Installed - return to modlisting */
>         header( "Location:admin_modhandler.php#flinka".($id-1));
>         exit;
>       }
> 
>     }
>     // REMOVE SINGLE
>     elseif( $action == REMOVE )
>     {
>       include_once 'classes/modremover.class.php';
>       $oRemover = new_modremover( );
>       if( !$oRemover->remove( $cfgpath )
>         || $options['redirect2log'] == ON_ALL )
>       {
>         header( "Location:admin_showmodslog.php ");
>         exit;
>       }
>       else
>       {
>         /* Mod Removed - return to modListing */
>         header( "Location:admin_modhandler.php#flinka".($id-1));
>         exit;
>       }
>     }
>     // DELETE SINGLE
>     elseif( $action == DELETE )
>     {
>       $error = false;
>       include_once 'classes/moddeleter.class.php';
>       $oDeleter = new_moddeleter();
>       if( !$oDeleter->delete_mod( $cfgpath )
>         || $options['redirect2log'] == ON_ALL )
>       {
>         header( "Location:admin_showmodslog.php");
>         exit;
>       }
>       else
>       {
>         /* Mod Deleted - return to modlisting */
>         header( "Location:admin_modhandler.php" );
>         exit;
>       }
>     }
>     // CLEANUP SINGLE
>     elseif( $action == CLEANUP )
>     {
>       include_once 'classes/modremover.class.php';
>       $oRemover = new_modremover();
>       $oRemover->classID = "cleaner";
>       if( !$oRemover->remove( $cfgpath )
>         || $options['redirect2log'] == ON_ALL )
>       {
>         header( "Location:admin_showmodslog.php");
>         exit;
>       }
>       else
>       {
>         /* Mod Cleaned UP - return to modlister */
>         header( "Location:admin_modhandler.php#flinka".($id-1));
>         exit;
239c294,295
<    }
---
>     }
>   }
242d297
< // FILTER IS ONLY RETURNED IF THE 'LOCK' BOX IS CHECKED
244,259d298
< if( !isset( $filter ) ) {
<    // user not asking for filter change
<    if( isset( $_SESSION['filter'] ) ) {
<       $filter = $_SESSION['filter'];
<       $fbox_checked = true;
<    }
<    else {
<       $filter = 0;
<       $fbox_checked = false;
<    }
< }
< else {
<    // filter was set from drop down -- starting over with clean filter checkbox
<    if( isset( $_SESSION['filter'] ) )
<       unset( $_SESSION['filter'] );
< }
261,264c300,323
< /*************************************************************************
< DISPLAY LIST OF MODS
< *************************************************************************/
< $flags['tabs'] = $tngconfig['tabs'];
---
> // Requesting a new filter listing
> if( isset( $newlist ) ) {
>     unset( $_SESSION['filter'] );
>     unset( $_SESSION['modlist'] );
> }
> // submitting with locked filter
> elseif( isset( $_SESSION['filter'] ) ) {
>     $filter = $_SESSION['filter'];
>     $fbox_checked = true;
> }
> // submitted using temporary filter
> elseif( !empty( $filter ) ) {
>     $filter = 0;
> }
> // no filter applied
> elseif( !isset( $filter ) )
> {
>     $filter = 0;
> }
> 
> /***************************************************************
>     OUTPUT STD ADMIN PAGE HTML HEADER + ADDITIONS
> ***************************************************************/
> include 'classes/version.php';
268,275c327,346
< // ADJUST WIDTH FOR MOBILE DEVICES
< $min_width = $sitever == 'mobile' ? '0' : '640px';
< echo "
< <style type='text/css'>
< body {
<    margin:0;
<    overflow-y: scroll;
<    min-width:$min_width;
---
> /* Adjust default tint where template databack is also gray */
> switch($templatenum)
> {
>   case 5:
>     $tint = "#97cba9";
>     break;
>   case 7:
>     $margin_top = "0px";
>   case 8:
>     $tint = "#c3b091";
>     break;
>   case 13:
>   case 19:
>   case 20:
>     $tint = "#435E95";
>     break;
>   default:
>     $tint = "#ddd";
>     $margin_top = "162px";
>     break;
277d347
< </style>";
279,280c349
< // ADJUST LISTING TO BOTTOM OF HEADER MENUS
< $headclass = $options['fix_header'] == YES && $sitever != 'mobile' ? 'mmhead-fixed' : 'mmhead-scroll';
---
> // explicitly close head section
282c351,358
< <script type=\"text/javascript\" src=\"js/admin.js\"></script>
---
> <script type='text/javascript' src='js/modmanager.js'></script>
> <style>
>   .tableFixedHead {
>     height:calc( 100vh - 250px ) !important;
>   }
> </style>";
> echo "
> <!-- mm$mm_version -->
284,287c360,385
< <body background=\"img/background.gif\">
< <div id=\"mmhead\" class=\"$headclass adminback\">
<    $headline
< </div><!--head-section-->";
---
> ";
> 
> /***************************************************************
>     OUTPUT TNG ADMIN TOP BANNER AND LEFT SIDE MENUS
> ***************************************************************/
> /* Argument sets Listener for key click to scroll mod beginning
> ** with entered Letter into view */
> echo tng_adminlayout('onkeydown="scrollto(event);"');
> 
> /***************************************************************
>     OUTPUT MOD MANAGER PAGE TITLE, TABS AND HORZ MENU
> ***************************************************************/
> $modtabs = set_horizontal_tabs( $options['show_analyzer'], $options['show_developer'],
>                                 $options['show_updates']);
> 
> $innermenu = set_innermenu_links( $tng_version );
> $menu = doMenu($modtabs,"modlist",$innermenu);
> 
> echo displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
> 
> /*************************************************************************
> DISPLAY LIST OF MODS
> *************************************************************************/
> echo "
> <div class='admin-main whiteback'>
> ";
289c387,388
< // IMPLEMENT THE 'SELECT MODS TO DISPLAY' FILTER
---
> /* Handle the "Select" filter.
> ** case 1: VIEW SELECT (NO SELECTIONS YET) */
291,298c390
<    $_SESSION['modlist'] = $modlist;
< }
< elseif( $filter == F_SELECT && isset( $_SESSION['modlist']) ) {
<    $modlist = $_SESSION['modlist'];
< }
< else {
<    unset( $_SESSION['modlist'] );
<    $modlist = array();
---
>   $_SESSION['modlist'] = $modlist;
300,301c392,405
< include 'classes/modlister.class.php';
< $oModlist = new modlister( $objinits );
---
> /* case 2: VIEW SELECT (SELECTED SUBSET)*/
> elseif( $filter == F_SELECT && isset( $_SESSION['modlist']) )
> {
>   $modlist = $_SESSION['modlist'];
> }
> else
> {
>   unset( $_SESSION['modlist'] );
>   $modlist = array();
> }
> 
> require_once 'classes/modlister.class.php';
> /* Get initialized modlister object */
> $oModlist = new_modlister();
304d407
< $oModlist->templatenum = $templatenum;
307a411,415
> echo "
> <br /><br />
> </div><!-- admin-main-->
> ";
> 
311,312c419,425
< function set_horizontal_tabs( $show_analyzer = NO, $show_developer = NO, $show_updates = NO ) {
<    global $admtext;
---
> function set_innermenu_links( $tng_version )
> {
>   global $text, $admtext;
> 
>   /* Break out major release component of TNG version */
>   $parts = explode( ".", $tng_version );
>   $tngmodver = "{$admtext['tngmods']} v{$parts[0]}";
314,349c427,452
<    $modtabs = array();
<    $modtabs[0] = array(1, "admin_modhandler.php", $admtext['modlist'],"modlist");
<    $modtabs[1] = array(1,"admin_showmodslog.php",$admtext['viewlog'],"viewlog");
<    $modtabs[2] = array(1,"admin_modoptions.php",$admtext['options'],"options");
<    if ( $show_analyzer == YES)
<       $modtabs[3] = array(1,"admin_analyzemods.php",$admtext['analyzefiles'],'files');
<    if ( $show_developer == YES)
<       $modtabs[4] = array(1,"admin_modtables.php",$admtext['parsetable'],'parser');
<    if ( $show_updates == YES)
<       $modtabs[5] = array(1,"admin_modupdates.php",$admtext['recommendedfixes'],'updates');
<    return $modtabs;
< }
< function set_innermenu_links( $tng_version ) {
<    global $text, $admtext;
< 
<    $parts = explode( ".", $tng_version );		// added to determine TNG vNN for
<    $tngmodver = "{$admtext['tngmods']} v{$parts[0]}";	// Mods for TNG vNN text display
<    $tngmodurl = "Mods_for_TNG_v{$parts[0]}";	// Mods for TNG vNN URL
<    $helplang = findhelp("modhandler_help.php");
< 
<    // inner menu help
<    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
< 
<    // expand & collapse all
<    $innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" id=\"expandall\"> {$text['expandall']}</a>";
<    $innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" id=\"collapseall\">{$text['collapseall']}</a>";
< 
<    // MM syntax
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax\" target=\"_blank\" class=\"lightlink\">{$admtext['modsyntax']}</a>";
< 
<    // mod guidelines
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Guidelines\" target=\"_blank\" class=\"lightlink\">{$admtext['modguidelines']}</a>";
< 
<    // mods for TNGv10
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Category:$tngmodurl\" target=\"_blank\" class=\"lightlink\">$tngmodver</a>";
<    return $innermenu;
---
>   $tngmodurl = "Mods_for_TNG_v{$parts[0]}";
> 
>   $helplang = findhelp("modhandler_help.php");
> 
>   // inner menu help
>   $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php');\" class=\"lightlink\">{$admtext['help']}</a>
> ";
> 
>   // expand & collapse all
>   $innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" id=\"expandall\"> {$text['expandall']}</a>
> ";
>   $innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" id=\"collapseall\">{$text['collapseall']}</a>
> ";
> 
>   // MM syntax
>   $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax\" target=\"_blank\" class=\"lightlink\">{$admtext['modsyntax']}</a>
> ";
> 
>   // mod guidelines
>   $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Guidelines\" target=\"_blank\" class=\"lightlink\">{$admtext['modguidelines']}</a>
> ";
> 
>   // mods for this TNG Version
>   $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Category:$tngmodurl\" target=\"_blank\" class=\"lightlink\">$tngmodver</a>
> ";
>   return $innermenu;
357,358c460,461
<    $admtext['confdelmod1'] :
<    $admtext['confdelmod'];
---
>   $admtext['confdelmod1'] :
>   $admtext['confdelmod'];
364,458c467,541
< //$sitever = 'mobile'; //turns off jQuery positioning for testing
< if( $sitever != 'mobile' && $options['adjust_headers'] ) {
<    echo "
<    window.scroll(0,0);
< 
<    // set position of status bar relative to #mmhead (jQuery UI)
<    jQuery('#fbar').position({
<       my: 'left top',
<       at: 'left bottom',
<       of: jQuery('#mmhead'),
<       collision: 'none'
<    });
< 
<    // set position of listing table relative to filter bar (jQuery UI)
<    jQuery('#mmgrid').position({
<       my: 'left top',
<       at: 'left bottom',
<       of: jQuery('#fbar'),
<       collision: 'none'
<    });
< ";
< }
<    echo"
<    // toggle mod status from other fields
< 	jQuery('.flink').click(function() {
<       var flinkID = jQuery(this).attr('id');
<       var linknum = flinkID.match(/\d+/);
<       var linkID = 'link'+linknum;
<       toggleStatus(linkID);
< 	});
< 
<    // toggle mod status from status field header
< 	jQuery('.modlink').click(function() {
< 		var linkID = jQuery(this).attr('id');
<       toggleStatus(linkID);
< 	});
< 
<    function toggleStatus( linkID ) {
<       var divID = linkID + 'div';
< 		if( jQuery('#' + linkID).hasClass('closed') ) {
<          jQuery('#' + linkID).addClass('opened').removeClass('closed');
< 		   jQuery('#' + divID).show();
<       }
< 		else {
<          jQuery('#' + linkID).addClass('closed').removeClass('opened');
< 			jQuery('#' + divID).hide();
<       }
<    }
< 
<    // close all
<    jQuery('#collapseall').click(function() {
<       jQuery('.modlink').addClass('closed').removeClass('opened');
<       jQuery('.moddiv').hide();
<    });
< 
<    // open all
<    jQuery('#expandall').click(function() {
<       jQuery('.modlink').addClass('opened').removeClass('closed');
<       jQuery('.moddiv').show();
<    });
< 
<    jQuery('#selectAll').click(function(){
<       jQuery('input.sbox').prop('checked',true);
<    });
< 
<    jQuery('#clearAll').click(function(){
<       jQuery('input.sbox').prop('checked',false);
<    });
< 
<    jQuery('#btnDelete').click(function(){
<       if(jQuery('input.sbox:checkbox:checked').length>0 ) {
<          return confirm(\"{$confirm}\");
<       }
<       else {
<          alert(\"{$admtext['noselected']}\" );
<          return false;
<       }
<    });
<    jQuery('#btnInstall, #btnRemove, #btnClean, #btnChoose').click(function(){
<       if( jQuery('input.sbox:checkbox:checked').length>0 ) {
<          return true;
<       }
<       else {
<          alert(\"{$admtext['noselected']}\" );
<          return false;
<       }
<    });
<    jQuery('#stayon').change(function() {
<       if(this.checked) {
<          jQuery.post('classes/ajax_filter.php', {filter:\"$oModlist->filter\"});
<          }
<       else {
<          jQuery.post('classes/ajax_filter.php', {filter:\"0\"});
<       }
<    });
---
> echo"
>   // toggle mod status from other fields
>   jQuery('.flink').click(function() {
>     var flinkID = jQuery(this).attr('id');
>     var linknum = flinkID.match(/\d+/);
>     var linkID = 'link'+linknum;
>     toggleStatus(linkID);
>   });
> 
>   // toggle mod status from status field header
>   jQuery('.modlink').click(function() {
>     var linkID = jQuery(this).attr('id');
>     toggleStatus(linkID);
>   });
> 
>   function toggleStatus( linkID ) {
>     var divID = linkID + 'div';
>     if( jQuery('#' + linkID).hasClass('closed') ) {
>       jQuery('#' + linkID).addClass('opened').removeClass('closed');
>       jQuery('#' + divID).show();
>     }
>     else {
>       jQuery('#' + linkID).addClass('closed').removeClass('opened');
>       jQuery('#' + divID).hide();
>     }
>   }
> 
>   // close all
>   jQuery('#collapseall').click(function()
>   {
>     jQuery('.modlink').addClass('closed').removeClass('opened');
>     jQuery('.moddiv').hide();
>   });
> 
>   // open all
>   jQuery('#expandall').click(function() {
>     jQuery('.modlink').addClass('opened').removeClass('closed');
>     jQuery('.moddiv').show();
>   });
> 
>   jQuery('#selectAll').click(function(){
>     jQuery('input.sbox').prop('checked',true);
>   });
> 
>   jQuery('#clearAll').click(function(){
>     jQuery('input.sbox').prop('checked',false);
>   });
> 
>   jQuery('#btnDelete').click(function(){
>     if(jQuery('input.sbox:checkbox:checked').length>0 ) {
>       return confirm(\"{$confirm}\");
>     }
>     else {
>        alert(\"{$admtext['noselected']}\" );
>        return false;
>     }
>   });
>   jQuery('#btnInstall, #btnRemove, #btnClean, #btnChoose').click(function(){
>     if( jQuery('input.sbox:checkbox:checked').length>0 ) {
>       return true;
>     }
>     else {
>       alert(\"{$admtext['noselected']}\" );
>       return false;
>     }
>   });
>   jQuery('#stayon').change(function() {
>     if(this.checked) {
>       jQuery.post('classes/ajax_filter.php', {filter:\"$oModlist->filter\"});
>     }
>     else {
>       jQuery.post('classes/ajax_filter.php', {filter:\"0\"});
>     }
>   });
> 
462,470d544
< 
< echo "
< <div align=\"center\">
<    <span class=\"normal\">
<       $tng_title, v.$tng_version
<    </span>
< </div>
< </body>
< </html>";
471a546,548
> <?php
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_modoptions.php TNG1403/admin_modoptions.php
2,5c2,9
< 
< // Mod Manager Options written by Ken Roy to incorporate current mods to Mod Manager into the TNG code
< //			and support additional processing options
< // Based on the TNG v10.0.3 admin_modmgroptions.php module
---
> /*
>    Mod Manager v13 User options handler
>       Written by Ken Roy, TNG Test Manager
>       Updated for TNGv13 by Rick Bisbee
> 
>       * Updates code/styling for new TNGv13 Admin pages no longer using iframes.
>       * No changes to core (OOP classes) functionality from TNGv12.
> */
10,11d13
< include("getlang.php");
< 
12a15
> $helplang = findhelp("modhandler_help.php");
14d16
< //tng_db_connect($database_host,$database_name,$database_username,$database_password) or exit;
18c20
< $admvers="TNG12 V4.0 ";
---
> require 'classes/mmtabs.inc';
20,23c22,27
< //$optionsfile = 'classes/mod.class.config.php';
< $optionsfile = $subroot.'mmconfig.php';
< include $optionsfile;
< //echo __FILE__,' ',__LINE__;print_r( $options );exit;
---
> // prevent direct URL access to Mod Manager if not the TNG Administrator
> if( $assignedtree || !$allow_edit ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
25,26c29,31
< define( "YES", 1 );
< define( "NO",  0 );
---
> 
> define( "YES", "1" );
> define( "NO",  "0" );
39,41c44,59
< if (!isset($options['modlogfile'])) $options['modlogfile'] = "modmgrlog.txt";		// Default Mod Log file name
< if (!isset($options['maxloglines'])) $options['maxloglines'] = "200";		// Default Log max transactions
< if (!isset($options['compress_log'])) $options['compress_log'] = "1";		// Default to compress log
---
> $optionsfile = $subroot.'mmconfig.php';
> include $optionsfile;
> 
> /*
>  * SET USER OPTION DEFAULTS IF VALUES ARE NOT IN THE OPTIONS FILE
> */
> // Mod log file name
> if (!isset($options['modlogfile'])) $options['modlogfile'] = "modmgrlog.txt";
> 
> // Log max transactions
> if (!isset($options['maxloglines'])) $options['maxloglines'] = "200";
> 
> // Compress log option
> if (!isset($options['compress_log'])) $options['compress_log'] = YES;
> 
> // Redirect to view log upon Mod processing error
43,55c61,93
< if (!isset($options['sortby'])) $options['sortby'] = "1";		// Default Sort by Mod Name column
< if (!isset($options['delete_partial'])) $options['delete_partial'] = "0";	// do not allow Delete Selected of Partially Installed mods
< if (!isset($options['delete_installed'])) $options['delete_installed'] = "0";	// do not allow deletes of individual Installed mod
< if (!isset($options['log_full_path'])) $options['log_full_path'] = "1";		// Log full path for file actions
< if (!isset($options['compress_names'])) $options['compress_names'] = "0";	// Compress Mod Names
< if (!isset($options['fix_header'])) $options['fix_header'] = "1";	// Use Fixed Headers
< if (!isset($options['show_analyzer'])) $options['show_analyzer'] = "0";		// Default to not show the Analyze TNG Files tab
< if (!isset($options['show_developer'])) $options['show_developer'] = "0";		// Default to not show the Analyze Parser Table tab - added 171209 Ken
< if (!isset($options['show_updates'])) $options['show_updates'] = "1";		// Default to not show the Recommended Updates tab  - added 171209 Ken
< if (!isset($options['use_striping'])) $options['use_striping'] = "1"; 	//Default to striping
< if (!isset($options['stripe_after'])) $options['stripe_after'] = THREE; 	//Default to ledger striping
< if (!isset($options['adjust_headers'])) $options['adjust_headers'] = "0";	// Default to not adjust fixed
< if (!isset($options['delete_support'])) $options['delete_support'] = "0";
---
> 
> // Sort by Mod Name column in Mod listing
> if (!isset($options['sortby'])) $options['sortby'] = MODNAME;
> 
> // Allow Mod deletion in partially installed
> if (!isset($options['delete_partial'])) $options['delete_partial'] = NO;
> 
> // Allow Mod deletion if status = installed
> if (!isset($options['delete_installed'])) $options['delete_installed'] = NO;
> 
> // Log full TNG-relative path for file actions
> if (!isset($options['log_full_path'])) $options['log_full_path'] = YES;
> 
> // Compress Mod names in listing (?)
> if (!isset($options['compress_names'])) $options['compress_names'] = NO;
> 
> // Show the Mod Analyzer tab on MM pages
> if (empty($options['show_analyzer'])) $options['show_analyzer'] = YES;
> 
> /*Analyze only installed mods Mod - #1 - MichelK */
> // Show actions (install, delete,...) in the Mod Analyzer
> if (!isset($options['show_analyzeractions'])) $options['show_analyzeractions'] = NO;
> /*Analyze only installed mods Mod - MichelK */
> 
> // Show the View Parser Tab on MM pages
> if (!isset($options['show_developer'])) $options['show_developer'] = NO;
> 
> // Show the MM Recommended Updates tab
> if (!isset($options['show_updates'])) $options['show_updates'] = YES;
> 
> // When deleting a Mod also delete its support folder
> if (!isset($options['delete_support'])) $options['delete_support'] = NO;
> 
58c96,98
< $flags['tabs'] = $tngconfig['tabs'];
---
> /***************************************************************
>     1. OUTPUT STD ADMIN PAGE HTML HEADER + ADDITIONS
> ***************************************************************/
62,71c102
< echo "
< <script type=\"text/javascript\">
< function toggleAll(display) {
< 	toggleSection('log','plus0',display);
< 	toggleSection('display','plus1',display);
< 	toggleSection('other','plus2',display);
< 	return false;
< }
< </script>";
< 
---
> // Place some styling in the HTML head section
73,78c104,113
< echo "
< <style type='text/css'>
< body {
<    margin:0;
<    overflow-y: scroll;
<    min-width:$min_width;
---
> 
> /* Adjust positioning for problem templates */
> switch($templatenum)
> {
>   case 7:
>     $margin_top = "0px";
>     break;
>   default:
>     $margin_top = "162px";
>     break;
80d114
< </style>";
82c116,128
< $helplang = findhelp("modhandler_help.php");
---
> /* Height of the table display must be set for
> ** each page to account for differences in
> ** heading heights.
> **
> ** The <head> tag must be explicitly closed. */
> echo "
> <style>
>   .tableFixedHead {
>     height:calc( 100vh - 220px ) !important;
>   }
> </style>
> </head>
> ";
83a130,137
> /***************************************************************
>     2. OUTPUT TNG ADMIN TOP BANNER AND LEFT SIDE MENUS
> ***************************************************************/
> echo tng_adminlayout();
> 
> /***************************************************************
>     3. OUTPUT MOD MANAGER PAGE TITLE, TABS AND HORZ MENU
> ***************************************************************/
87,89c141
< $menu = "<div class=\"mmmenuwrap\">";
< $menu .= doMenu($modtabs,"options",$innermenu);
< $menu .= "</div>";
---
> $menu = doMenu($modtabs,"options",$innermenu);
92,93d143
< $headline = displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
< $first_menu=TRUE;
95,106c145
< if( $options['fix_header'] == YES && $sitever != 'mobile' ) {
<    $headclass = 'mmhead-fixed';
<    $tableclass = 'm2table-fixed';
< }
< else {
<    $headclass = 'mmhead-scroll';
<    $tableclass = 'm2table-scroll';
< }
< //$bkgclass = 'tmpbkg'.$templatenum;
< // only adjust css positioning for template 7 -- all others are standard
< //if( $templatenum == 7 )
< //   $tableclass = $tableclass.$templatenum;
---
> echo displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
108,114c147
< echo "
< <script type=\"text/javascript\" src=\"js/admin.js\"></script>
< </head>
< <body background=\"img/background.gif\" style=\"margin:0;\">
< <div id=\"mmhead\" class=\"$headclass adminback\">
<    $headline
< </div><!--head-section-->";
---
> $first_menu=TRUE;
115a149,151
> /***************************************************************
>     4. MOD OPTIONS PAGE CONTENT
> ***************************************************************/
116a153
> <div class='admin-main'>
118d154
< 
120,124c156,170
<       <table id=\"m2table\" width=\"100%\" border=\"0\" cellpadding=\"10\" cellspacing=\"2\" class=\"lightback $tableclass\" style=\"padding: 0px;\">
<       <tr class=\"databack\">
<          <td class=\"tngshadow\">";
< //echo __FILE__,' ',__LINE__;print_r( $options );
< 
---
>     <div class='tableFixedHead roundtop'>
>       <table id='mmtable' class='mmtable'>
>         <thead>
>           <tr>
>             <th class='fieldnameback fieldname mmrounded20 center' style='font-size:medium'>
>               Mod Manager User Preferences
>             </th>
>           </tr>
>         </thead>
>         <tr>
>          <td class=\"tngshadow databack mmrounded20\" style='height:20px;'>";
> 
> /***************************************************************
>   MOD MANAGER LOGS
> ***************************************************************/
171a218
>         <tr><td style='border:0;line-height:.5;'>&nbsp;</td></tr>
173,174c220,221
<             	</table>
<             </div>
---
>       </table>
>       </div>
177,178c224,228
<       <tr class=\"databack tngshadow\">
<          <td class=\"tngshadow\">";
---
>       <tr>
>          <td class=\"tngshadow databack mmrounded20\" style='height:20px;'>";
> /***************************************************************
>   DISPLAY SETTINGS
> ***************************************************************/
192,230c242
<          		<tr>
<          			<td width=\"270px\">{$admtext['fixedheader']}:</td>
<          			<td>
<          				<select name=\"options[fix_header]\">
<          					<option value=".YES; if( $options['fix_header'] == YES ) echo " selected=\"selected\""; echo ">{$admtext['yes']}</option>
<          					<option value=".NO; if( $options['fix_header'] == NO ) echo " selected=\"selected\""; echo ">{$admtext['no']}</option>
<          				</select>
<          			</td>
<          		</tr>
<          		<tr>
<          			<td width=\"270px\">{$admtext['adjusthdrs']}:</td>
<          			<td>
<          				<select name=\"options[adjust_headers]\">
<          					<option value=".YES; if( $options['adjust_headers'] == YES ) echo " selected=\"selected\""; echo ">{$admtext['yes']}</option>
<          					<option value=".NO; if( $options['adjust_headers'] == NO ) echo " selected=\"selected\""; echo ">{$admtext['no']}</option>
<          				</select>
<          			</td>
<          		</tr>
<          		<tr>
<          			<td width=\"270px\">{$admtext['usestriping']}:</td>
<          			<td>
<          				<select name=\"options[use_striping]\">
<          					<option value=".YES; if( $options['use_striping'] == YES ) echo " selected=\"selected\""; echo ">{$admtext['yes']}</option>
<          					<option value=".NO; if( $options['use_striping'] == NO ) echo " selected=\"selected\""; echo ">{$admtext['no']}</option>
<          				</select>
<          			</td>
<          		</tr>
<          		<tr>
<          			<td width=\"270px\">{$admtext['stripeafter']}:</td>
< 					<td>
< 						<select name=\"options[stripe_after]\">
< 							<option value=".ONE; if( $options['stripe_after'] == ONE ) echo " selected=\"selected\""; echo ">1</option>
< 							<option value=".TWO; if( $options['stripe_after'] == TWO ) echo " selected=\"selected\""; echo ">2</option>
< 							<option value=".THREE; if( $options['stripe_after'] == THREE ) echo " selected=\"selected\""; echo ">3</option>
< 							<option value=".FOUR; if( $options['stripe_after'] == FOUR ) echo " selected=\"selected\""; echo ">4</option>
< 							<option value=".FIVE; if( $options['stripe_after'] == FIVE ) echo " selected=\"selected\""; echo ">5</option>
< 						</select>
< 					</td>
<          		</tr>
---
> 
248a261,270
> <!--/*Analyze only installed mods Mod - #2 - MichelK */!-->
>          			<td width=\"270px\">{$admtext['showanalyzeractions']}:</td>
>          			<td>
>          				<select name=\"options[show_analyzeractions]\">
>          					<option value=".YES; if( $options['show_analyzeractions'] == YES ) echo " selected=\"selected\""; echo ">{$admtext['yes']}</option>
>          					<option value=".NO; if( $options['show_analyzeractions'] == NO ) echo " selected=\"selected\""; echo ">{$admtext['no']}</option>
>          				</select>
>          			</td>
>          		</tr>
> <!--/*Analyze only installed mods Mod - MichelK */!-->
266a289
>             <tr><td style='border:0;line-height:.5;'>&nbsp;</td></tr>
271,272c294,298
<      <tr class=\"databack tngshadow\">
<          <td class=\"tngshadow\">";
---
>      <tr>
>          <td class=\"databack tngshadow mmrounded20\" style='height:20px;'>";
> /***************************************************************
>   OTHER
> ***************************************************************/
312a339
>                <tr><td style='border:0;line-height:.5;'>&nbsp;</td></tr> 
316,317c343,344
< 		<tr class=\"databack tngshadow\">
< 			<td class=\"tngshadow\">
---
> 		<tr>
> 			<td class=\"databack tngshadow mmrounded20\" style='height:20px;'>
322c349,352
< 	</form>";
---
>     </div><!-- tableFixedHead --> 
> 	</form>
> 
>   </div><!-- admin-main -->";
326,341c356
< function set_horizontal_tabs( $show_analyzer = NO, $show_developer = NO, $show_updates = NO ) {
<    global $admtext;
<    $modtabs = array();
<    $modtabs[0] = array(1, "admin_modhandler.php", $admtext['modlist'],"modlist");
<    $modtabs[1] = array(1,"admin_showmodslog.php",$admtext['viewlog'],"viewlog");
<    $modtabs[2] = array(1,"admin_modoptions.php",$admtext['options'],"options");
<    if ( $show_analyzer == YES)
<       $modtabs[3] = array(1,"admin_analyzemods.php",$admtext['analyzefiles'],'files');
<    if ( $show_developer == YES)
<       $modtabs[4] = array(1,"admin_modtables.php",$admtext['parsetable'],'parser');
< 
<    if ( $show_updates == YES)
<       $modtabs[5] = array(1,"admin_modupdates.php",$admtext['recommendedfixes'],'updates');
<    return $modtabs;
< }
< function set_innermenu_links( $tng_version ) {
---
> function set_innermenu_links( $tng_version, $pageID='options' ) {
350c365,366
<    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
>    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php#$pageID');\" class=\"lightlink\">{$admtext['help']}</a>
> ";
356c372,373
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax\" target=\"_blank\" class=\"lightlink\">{$admtext['modsyntax']}</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax\" target=\"_blank\" class=\"lightlink\">{$admtext['modsyntax']}</a>
> ";
359c376,377
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Guidelines\" target=\"_blank\" class=\"lightlink\">{$admtext['modguidelines']}</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Guidelines\" target=\"_blank\" class=\"lightlink\">{$admtext['modguidelines']}</a>
> ";
362c380,381
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Category:$tngmodurl\" target=\"_blank\" class=\"lightlink\">$tngmodver</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Category:$tngmodurl\" target=\"_blank\" class=\"lightlink\">$tngmodver</a>
> ";
366d384
< 
370,372c388
< //$sitever = 'mobile'; //turns off jQuery positioning for testing
< if( $sitever != 'mobile' && $options['adjust_headers'] ) {
<    echo "
---
> echo "
374,383c390,394
<    jQuery(document).ready(function() {
<       // set position of m2table relative to mmhead
<       jQuery('#m2table').position({
<          my: 'left top',
<          at: 'left bottom',
<          of: jQuery('#mmhead'),
<          collision: 'none'
<       });
<    })
< </script>";
---
> function toggleAll(display) {
> 	toggleSection('log','plus0',display);
> 	toggleSection('display','plus1',display);
> 	toggleSection('other','plus2',display);
> 	return false;
384a396
> </script>";
386,392c398,399
< echo "
< <div align=\"right\">
<    <span class=\"normal\">$tng_title, v.$tng_version</span>
< </div>
< </body>
< </html>";
< ?>
\ No newline at end of file
---
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_modtables.php TNG1403/admin_modtables.php
3a4,9
> /*************************************************************************
>     TNGv13 admin_modtables.php by William (Rick) Bisbee.
> 
>     Displays the parser table for a selected Mod for debugging
> 
>     Does not implement fixed page header by design
5,6c11,12
<    Standalone class to show parse table for selected mods
< */
---
>     v13 updated by Rick Bisbee to integrate with new TNG Admin pages
>     without iframes
7a14,15
> *************************************************************************/
> ob_start();
11d18
< include 'getlang.php';
17a25,28
> 
> 
> // User preferences
> include $subroot.'mmconfig.php';
18a30,43
> require 'classes/mmtabs.inc';
> 
> // prevent direct URL access to Mod Manager if not the TNG Administrator
> if( $assignedtree || !$allow_edit ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> if( isset( $_GET['modfile'] ) )
> {
>   $modfile = $_GET['modfile'];
> }
> else  $modfile = '';
22a48
> define( 'NO',       "0" );
24,26c50,53
< // USER PREFERENCES
< include $subroot.'mmconfig.php';
< 
---
> // Adjustments
> if( isset( $_GET['sort'] ) ) $_SESSION['sortby'] = $_GET['sort'];
> if( isset( $_SESSION['sortby'] ) ) $options['sortby'] = $_SESSION['sortby'];
> if (!isset($options['compress_log'])) $options['compress_log'] = "0";
31c58,91
< // SETUP THE PAGE HEADER AND MENUS
---
> /***************************************************************
>     1. OUTPUT STD ADMIN PAGE HTML HEADER + ADDITIONS
> ***************************************************************/
> $flags['modmgr'] = true;
> tng_adminheader( $admtext['modmgr'], $flags );
> 
> // Adjust width for mobile devices
> $min_width = $sitever == 'mobile' ? '0' : '640px';
> 
> /* Height of the table display must be set for
> ** each page to account for differences in
> ** heading heights.
> **
> ** The <head> tag must be explicitly closed. */
> echo "
> <script type='text/javascript' src='js/modmanager.js'></script>
> <style>
>   .tableFixedHead {
>     height:calc( 100vh - 280px ) !important;
>   }
> </style>
> </head>
> ";
> 
> /***************************************************************
>     2. OUTPUT TNG ADMIN TOP BANNER AND LEFT SIDE MENUS
> ***************************************************************/
> /* Scroll to first file name beginning with keyclick event
> ** letter into view in the left file listing panel. */
> echo tng_adminlayout('onkeydown="scrollto(event);"');
> 
> /***************************************************************
>     3. PREPARE MOD MANAGER PAGE TITLE, TABS AND HORZ MENU
> ***************************************************************/
34,36c94,95
< $menu = "<div class=\"mmmenuwrap\">";
< $menu .= doMenu($modtabs,"parser",$innermenu);
< $menu .= "</div>";
---
> $menu = doMenu($modtabs,"parser",$innermenu);
> 
38c97
< $headline = displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
---
> echo displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
44,50c103,110
< // ADJUSTMENTS TO USER PREFERENCES (OPTIONS)
< if( isset( $_GET['sort'] ) ) $_SESSION['sortby'] = $_GET['sort'];
< if( isset( $_SESSION['sortby'] ) ) $options['sortby'] = $_SESSION['sortby'];
< if (!isset($options['show_analyzer'])) $options['show_analyzer'] = "0";
< if (!isset($options['compress_log'])) $options['compress_log'] = "0";
< 
< require 'classes/modobjinits.php';
---
> /***************************************************************
>     4. MOD MANAGER PAGE CONTENT
> ***************************************************************/
> 
> // Create a mod parser object
> //require_once 'classes/modobjinits.php';
> include_once 'classes/modvalidator.class.php';
> $oVal = new_modvalidator();
52,71d111
< /*
< // INITIALIZATIONS FOR MOD OBJECTS
< $fpaths = array (
<    'rootpath'  => $rootpath,
<    'subroot'   => $subroot,
<    'modspath'  => $modspath,
<    'extspath'  => $extspath
< );
< 
< $objinits = array (
<    'fpaths'       => $fpaths,
<    'options'      => $options,
<    'time_offset'  => $time_offset,
<    'sitever'      => $sitever,
<    'currentuserdesc' => $mhuser,
<    'admtext'      => $admtext,
<    'templatenum'  => $templatenum,
<    'tng_version'  => $tng_version
< );
< */
73c113
< DISPLAY THE TNG PAGE HEADER
---
>   DISPLAY MOD LISTING
75,77c115,155
< $flags['tabs'] = $tngconfig['tabs'];
< $flags['modmgr'] = true;
< tng_adminheader( $admtext['modmgr'], $flags );
---
> if( empty( $modfile ) )
> {
>   echo "
> <div class='admin-main'>";
>   $modlist = $oVal->get_modfile_names();
>   if( is_numeric( $modlist ) )
>   {
>     header("location:admin_modhandler.php");
>     exit;
>   }
>   natcasesort($modlist);// sort MM lists mod
>   $modnum = 1;
> 
>   echo "
>   <div class='tableFixedHead roundtop'>
>     <table class='mmtable'>
>       <thead>
>         <tr>
>           <th class='fieldnameback fieldname mmround'>
>             {$admtext['selectmod']}
>           </th>
>         </tr>
>       </thead>
>       ";
> 
>   foreach( $modlist as $modfile )
>   {
>     $fl = strtoupper(substr($modfile,0,1));
>     echo "
>     <tr class=\"clink_{$fl}\">
>       <td class='flink databack tngshadow mmrounded' onClick=\"window.location.href='". basename(__FILE__) . "?modfile=$modfile'\">"
>         .$modnum++. "&nbsp;&nbsp;&nbsp;$modfile
>       </td>
>     </tr>";
>   }
> 
>   echo "
>     </table><!-- mmtable -->
>   </div><!-- tableFixedHead -->
> </div><!-- admin-main (1) -->
> ";
79,86c157,158
< // ADJUST WIDTH FOR MOBILE DEVICES
< $min_width = $sitever == 'mobile' ? '0' : '640px';
< echo "
< <style type='text/css'>
< body {
<    margin:0;
<    overflow-y: scroll;
<    min-width:$min_width;
---
>   echo tng_adminfooter();
>    exit;
88,98d159
< </style>";
< 
< // ADJUST LISTING TO BOTTOM OF HEADER MENUS
< $headclass = $options['fix_header'] == YES && $sitever != 'mobile' ? 'mmhead-fixed' : 'mmhead-scroll';
< echo "
< <script type=\"text/javascript\" src=\"js/admin.js\"></script>
< </head>
< <body background=\"img/background.gif\">
< <div id=\"mmhead\" class=\"$headclass adminback\">
<    $headline
< </div><!--head-section-->";
101c162
< CREATE A MOD   OBJECT
---
>   DISPLAY TABLE
103,104c164,165
< include_once 'classes/modparser.class.php';
< $oParse = new modparser($objinits);
---
>   echo "
> <div class='admin-main'>";
106,109c167
< if( $options['fix_header'] ) {
<    $style = "position:absolute;min-width:98%;top:119;left:05;padding:5px;";
< }
< else $style = "min-width:98%;";
---
>   $table = $oVal->validate( $modfile );
111,126c169,196
< if( $options['fix_header'] ) {
<    $pclass = "parse-table";
< }
< else {
<    $pclass = '';
< }
< /*************************************************************************
< DISPLAY THE MOD FILE SELECTION LIST
< *************************************************************************/
< if( empty( $modfile ) ) {
<    $modlist = $oParse->get_modfile_names();
<    $modnum = 1;
<    echo "
< <div id=\"parse-sec\" class=\"lightback parse-table\" style=$style>
<    <h2>{$admtext['selectmod']}</h2>";
<    foreach( $modlist as $modfile ){
---
>   if( !empty( $oVal->parse_error) )
>   {
>     $idx = $oVal->parse_error['text'];
>     echo "$modfile <strong style='color:red'>{$admtext['parsererror']}</strong> Line: ", $oVal->parse_error['line']," ", $oVal->parse_error['tag'], " <span class='mmhighlight'>", $admtext[$idx];
>   exit;
>   }
> 
>     $hdrs = array
>     (
>       'line' => '4%',
>       'name' => '10%',
>       'arg1' => '24%',
>       'arg2' => '22%',
>       'arg3' => '22%',
>       'flag' => '4%',
>       'statkey' => '8%',
>       'eline'=> '4%'
>     );
> 
>     $mod_stat_header = $oVal->get_modstatus_header();
>     $mod_name = $oVal->get_modname();
>     $mod_ver = $oVal->get_modversion();
> 
>     echo "
>     <h1 style='font-size:1.5em'>$mod_name $mod_ver $admtext[$mod_stat_header] </h1>";
> 
>     if( !empty( $table ) )
>     {
128,137c198,202
<       <p>".$modnum++.". <a href=\"".$thisfile."?modfile=$modfile\">$modfile</a></p>";
<    }
<    echo "
< </div>";
<    fix_header($options);
<    echo "
< </body>
< </html>";
<    exit;
< }
---
>   <div class='tableFixedHead'>
>   <table class='mmtable'>
>     <thead>
>       <tr>
> ";
139,145c204,213
< /*************************************************************************
< DISPLAY THE PARSE TABLE
< *************************************************************************/
< $tags = $oParse->parse( $modspath.'/'.$modfile );
< echo "
< <div id=\"parse-sec\" class=\"lightback parse-table\" style=$style>";
< $oParse->show_parse_table( $tags );
---
>       foreach( $hdrs as $hdr => $width )
>       {
>         echo "
>         <th class='fieldnameback fieldname' style='width:$width;'>
>           <div>
>             $hdr
>           </div>
>         </th>
> ";
>       }
147,156c215,249
< echo "
<    <script>
<       document.write('<a href=\"' + document.referrer + '\"><button>".$admtext['backtoprevious']."</button></a>');
<    </script>
< </div>";
<    fix_header($options);
<    echo "
< </body>
< </html>";
< exit;
---
>       echo "
>       </tr>
>     </thead>
> ";
>     }
> 
>     foreach( $table as $row )
>     {
>       foreach( $row as $key => $val )
>       {
>         if( is_string($val) )
>         {
>           $row[$key] = html_entity_decode( foldable_string( $val ) );
>         }
>       }
>       // STYLE STYLES FOR VARIOUS TAG TYPES
>       switch( $row['name'] )
>       {
>         case 'target':
>           $row_style = "style='background-color:#C0EEC0;'";
>           break;
>         case 'name':
>           $row_style = "style='font-weight:bold;font-size:1.2em;'";
>           break;
>         case 'textexists':
>         case 'fileexists':
>         case 'tngversion':
>         case 'goto':
>         case 'label':
>           $row_style = "style='color:#0000f7;'";
>           break;
>         default:
>           $row_style = NULL;
>           break;
>       }
158,164d250
< /*************************************************************************
< FUNCTIONS
< *************************************************************************/
< function fix_header($options) {
<    global $sitever;
<    //$sitever = 'mobile'; //turns off jQuery positioning for testing
<    if( $sitever != 'mobile' && $options['adjust_headers'] ) {
166,177c252
<    <script type=\"text/javascript\">
<       jQuery(document).ready(function() {
<          // set position of parse-sec div relative to mmhead
<          jQuery('#parse-sec').position({
<             my: 'left top',
<             at: 'left bottom',
<             of: jQuery('#mmhead'),
<             collision: 'none'
<          });
<       });
<    </script>";
< }
---
>     <tr $row_style>";
178a254,256
>       foreach( $hdrs as $hdr => $width )
>       {
>         $value = isset($row[$hdr]) ? $row[$hdr] : '';
179a258,277
>         echo "
>       <td class='grayborder'>
> ";
>         switch( $hdr )
>         {
>           case 'line':
>             echo "
>         <div style='text-align:center'>";
>             break;
>           default:
>             echo "
>         <div style='padding:5px'>";
>           break;
>         }
> 
>         echo nl2br(htmlentities( $value ));
>         echo "
>       </div>
>       </td>";
>       }
181c279,282
< }
---
>     /* Close the row */
>         echo "
>     </tr>";
>     } // foreach row
183,184c284,287
< function set_horizontal_tabs( $show_analyzer = NO, $show_developer = NO, $show_updates = NO ) {
<    global $admtext;
---
>     /* Close the table */
>       echo "
>   </table>
>   <div><!-- tableFixedHead -->";
186,198c289,301
<    $modtabs = array();
<    $modtabs[0] = array(1, "admin_modhandler.php", $admtext['modlist'],"modlist");
<    $modtabs[1] = array(1,"admin_showmodslog.php",$admtext['viewlog'],"viewlog");
<    $modtabs[2] = array(1,"admin_modoptions.php",$admtext['options'],"options");
<    if ( $show_analyzer == YES)
<       $modtabs[3] = array(1,"admin_analyzemods.php",$admtext['analyzefiles'],'files');
<    if ( $show_developer == YES)
<       $modtabs[4] = array(1,"admin_modtables.php",$admtext['parsetable'],'parser');
<    if ( $show_updates == YES)
<       $modtabs[5] = array(1,"admin_modupdates.php",$admtext['recommendedfixes'],'updates');
<    return $modtabs;
< }
< function set_innermenu_links( $tng_version ) {
---
> echo "
>   <script>
>     document.write('<a href=\"' + document.referrer + '\"><button>".$admtext['backtoprevious']."</button></a>');
>   </script>
> </div><!-- admin-main (2) -->";
> 
> echo tng_adminfooter();
> exit;
> 
> /*************************************************************************
> FUNCTIONS
> *************************************************************************/
> function set_innermenu_links( $tng_version, $pageID='parser' ) {
207c310
<    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
>    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php#$pageID');\" class=\"lightlink\">{$admtext['help']}</a>";
219a323,327
> 
> function foldable_string( $string ) {
>   return preg_replace('@([\./_])@', '&#8203;$1', $string );
> }
> 
228,251c336
< //$sitever = 'mobile'; //turns off jQuery positioning for testing
< if( $sitever != 'mobile' && $options['adjust_headers'] ) {
<    echo "
<    window.scroll(0,0);
< 
<    // set position of status bar relative to #mmhead (jQuery UI)
<    jQuery('#fbar').position({
<       my: 'left top',
<       at: 'left bottom',
<       of: jQuery('#mmhead'),
<       collision: 'none'
<    });
< 
<    // set position of listing table relative to filter bar (jQuery UI)
<    jQuery('#mmgrid').position({
<       my: 'left top',
<       at: 'left bottom',
<       of: jQuery('#fbar'),
<       collision: 'none'
<    });
< ";
< }
< 
<    echo"
---
> echo "
331a417
> ob_end_fllush();
diff -r TNG/admin_modupdates.php TNG1403/admin_modupdates.php
4a5,10
> /*
>    Mod Manager v13
>       * Updates code/styling for new TNGv13 Admin pages no longer using iframes.
>       * Removes JavaScript positioning of heading and body elements.
>       * No changes to core (OOP classes) functionality from TNGv12.
> */
16c22,35
< $admvers="TNG12 V4.0 ";
---
> $admvers="TNG13 V4.0 ";
> 
> require 'classes/mmtabs.inc';
> 
> // prevent direct URL access to Mod Manager if not the TNG Administrator
> if( $assignedtree || !$allow_edit ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> //suppress PHP notices
> if( !isset( $modspath) ) $modspath = '';
> if( !isset( $extspath) ) $extspath = '';
18c37,38
< include $subroot.'mmconfig.php';
---
> // USER PREFERENCES
> require_once $subroot.'mmconfig.php';
23c43,46
< $flags['tabs'] = $tngconfig['tabs'];
---
> /***************************************************************
>     1. OUTPUT STD ADMIN PAGE HTML HEADER + ADDITIONS
> ***************************************************************/
> 
29,36c52,64
< echo "
< <style type='text/css'>
< body {
<    margin:0;
<    overflow-y: scroll;
<    min-width:$min_width;
< }
< </style>";
---
> 
> // explicitly close head section
> echo "</head>
> ";
> 
> /***************************************************************
>     2. OUTPUT TNG ADMIN TOP BANNER AND LEFT SIDE MENUS
> ***************************************************************/
> echo tng_adminlayout();
> 
> /***************************************************************
>     3. OUTPUT MOD MANAGER PAGE TITLE, TABS AND HORZ MENU
> ***************************************************************/
47,49c75
< $menu = "<div class=\"mmmenuwrap\">";
< $menu .= doMenu($modtabs,"updates",$innermenu);
< $menu .= "</div>";
---
> $menu = doMenu($modtabs,"updates",$innermenu);
52,53c78
< $headline = displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
< $first_menu=TRUE;
---
> echo displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
55,57c80,89
< if( $options['fix_header'] == YES && $sitever != 'mobile' ) {
<    $headclass = 'mmhead-fixed';
<    $tableclass = 'm2table-fixed';
---
> /***************************************************************
>     4. PAGE CONTENT AND FUNCTIONALITY
> ***************************************************************/
> $message = '';
> if( !is_writable( $rootpath ) )
>    $message .= "{$admtext['checkwrite']} {$admtext['cantwrite']} $rootpath ";
> 
> //echo $message;exit;
> if( !empty( $message ) ) {
>    $message = "<span class=\"msgerror\">$message</span>";
59,70d90
< else {
<    $headclass = 'mmhead-scroll';
<    $tableclass = 'm2table-scroll';
< }
< 
< echo "
< <script type=\"text/javascript\" src=\"js/admin.js\"></script>
< </head>
< <body background=\"img/background.gif\" style=\"margin:0;\">
< <div id=\"mmhead\" class=\"$headclass adminback\">
<    $headline
< </div><!--head-section-->";
72,75d91
< /*
< echo "
< 	<form action=\"admin_modupdates.php\" method=\"post\" name=\"form1\" onsubmit=\"return confirm('".$admtext['confirmupdcusttext']."')\">";
< */
77,79c93,128
<       <table id=\"m2table\" width=\"100%\" border=\"0\" cellpadding=\"10\" cellspacing=\"2\" class=\"lightback $tableclass\" style=\"padding: 0px;\">
<       <tr class=\"databack\">
<          <td class=\"tngshadow\">";
---
> <div class='admin-main'>
>   <div class='tableFixedHead rounded top'>
>     <table id=\"mmtable\">
>       <thead>
>         <tr>
>           <th class='fieldnameback fieldname roundtop' style='border:0;'>
>             <h2>{$admtext['recommendedfixes']}</h2>
>           </th>
>         </tr>
>       </thead>
>       <tbody>
>         <tr>
>         <td class='databack'>";
> /***************************************************************
>   TEXT FOR RECOMMENDED UPDATES STARTS HERE
> ***************************************************************/
> echo "
> <h3>{$admtext['updcusttext']}</h3>
> <p>The updated Mod Guidelines recommend that custom text be inserted before the comments at the beginning of the cust_text.php file so that mods do not impact user manual changes made after the comment lines.</p>
> 
> <p>If you have not run the cust_text_update.php script as part of the TNG v12 upgrade, you need to update your cust_text.php files to add a new line to the files andalso update out-of-date line in your existing cust_text.php files which are not replaced during TNG upgrades.</p>
> 
> <p>The new comment line should not be translated in the language files so that it can be used as an anchor to insert custom text before this new comment line by the mod developers</p>.
> 
> <p>If you translate the new comment line, mod installs will fail.</p>
> <p>If you click on the button below your updates will be done for you automatically.";
> /***************************************************************
>   END OF RECOMMENDED UPDATE TEXT
> ***************************************************************/
>   echo "
>           </td>
>         </tr>
> 
>         <tr>
>           <td>&nbsp;</td>
>         </tr>
81,98c130,131
< echo "
< 	<h3>{$admtext['recommendedfixes']}</h3>
< 	<h4>{$admtext['updcusttext']}</h4>";
< 
< 	echo "
< 		<table class=\"normal\">
< 		    <tr>
<                   <td>
<                      <p class=\"normal\">{$admtext['custtextfixes']}</p>
<                      <p class=\"normal\">{$admtext['reasontoupdate']}</p>
<                      <p class=\"normal\">{$admtext['newanchor']}</p>
<                      <p class=\"normal\">{$admtext['translateissue']}</p>
<                   </td>
<                </tr>
< 		         <tr>
< 				   <td>";
< 
< echo "
---
>         <tr>
>           <td>
100c133
<                <input class=\"button space\" style=\"color:green;font-weight:bold\" type=\"button\" value=\"{$admtext['update']}\" onClick=\"if( confirm('{$admtext['confirmupdcusttext']}'))window.open('admin_cust_text_update.php','_blank');\" />
---
>                <input class=\"button space msgapproved\" type=\"button\" value=\"{$admtext['update']}\" onClick=\"if( confirm('{$admtext['confirmupdcusttext']}'))window.open('admin_cust_text_update.php','_blank');\" />
104,125c137,142
<       </table>";
< /*
< echo "
< 		<table class=\"normal\">
< 		    <tr>
<                   <td>
<                      <span class=\"normal\">{$admtext['custtextfixes']}</span>
<                   </td>
<                </tr>
< 		         <tr>
<                   <td>
<                      <input class=\"button space\" type=\"submit\" style=\"color:green;font-weight:bold\" value=\"{$admtext['updcusttext']}\" onclick=\"window.open('admin_cust_text_update.php','_blank')\" />
<                   </td>
<                </tr>
< 			</table>
<       </table>
< 	</form>";
< */
< echo "
< <div align=\"right\">
<    <span class=\"normal\">$tng_title, v.$tng_version</span>
< </div>";
---
>     </table><!-- mmtable -->
>    </div><!-- tableFixedHead -->
> </div><!-- admin-main -->";
> 
> echo tng_adminfooter();
> exit;
130,145c147
< function set_horizontal_tabs( $show_analyzer = NO, $show_developer = NO, $show_updates = NO ) {
<    global $admtext;
< 
<    $modtabs = array();
<    $modtabs[0] = array(1, "admin_modhandler.php", $admtext['modlist'],"modlist");
<    $modtabs[1] = array(1,"admin_showmodslog.php",$admtext['viewlog'],"viewlog");
<    $modtabs[2] = array(1,"admin_modoptions.php",$admtext['options'],"options");
<    if ( $show_analyzer == YES)
<       $modtabs[3] = array(1,"admin_analyzemods.php",$admtext['analyzefiles'],'files');
<    if ( $show_developer == YES)
<       $modtabs[4] = array(1,"admin_modtables.php",$admtext['parsetable'],'parser');
<    if ( $show_updates == YES)
<       $modtabs[5] = array(1,"admin_modupdates.php",$admtext['recommendedfixes'],'updates');
<    return $modtabs;
< }
< function set_innermenu_links( $tng_version ) {
---
> function set_innermenu_links( $tng_version, $pageID='recommended' ) {
154c156
<    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
>    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php#$pageID');\" class=\"lightlink\">{$admtext['help']}</a>";
170,192d171
< /*************************************************************************
< JAVASCRIPT SUPPORT
< *************************************************************************/
< //$sitever = 'mobile'; //turns off jQuery positioning for testing
< if( $sitever != 'mobile' && $options['adjust_headers'] ) {
<    echo "
< <script type=\"text/javascript\">
<    jQuery(document).ready(function() {
<       // set position of m2table relative to mmhead
<       jQuery('#m2table').position({
<          my: 'left top',
<          at: 'left bottom',
<          of: jQuery('#mmhead'),
<          collision: 'none'
<       });
<    })
< </script>";
< }
<    echo "
< </body>
< </html>";
< 
< ?>
\ No newline at end of file
Only in TNG1403: admin_modvalidate.php
diff -r TNG/admin_mostwanted.php TNG1403/admin_mostwanted.php
53c53
< 		echo "<td class=\"lightback\" style=\"width:" . ($thumbmaxw+6) . "px;text-align:center;\">";
---
> 		echo "<td class=\"lightback\" style=\"width:" . ($thumbmaxw+10) . "px;text-align:center;\">";
56c56
< 			echo "<img src=\"$usefolder/" . str_replace("%2F","/",rawurlencode( $lrow['thumbpath'] )) . "\" border=\"0\" $size[3]} id=\"img_{$lrow['mwID']}\" alt=\"{$lrow['mtitle']}\" />";
---
> 			echo "<img src=\"$usefolder/" . str_replace("%2F","/",rawurlencode( $lrow['thumbpath'] )) . "\" class=\"adminthumb\" $size[3]} id=\"img_{$lrow['mwID']}\" alt=\"{$lrow['mtitle']}\" />";
86d85
< $flags['tabs'] = $tngconfig['tabs'];
107,108d105
< <body background="img/background.gif" onLoad="startMostWanted()">
< 
109a107,108
> 	echo tng_adminlayout(" onLoad=\"startMostWanted()\"");
> 
120,122c119,122
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
140,142c140,143
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newalbum.php TNG1403/admin_newalbum.php
20d19
< $flags['tabs'] = $tngconfig['tabs'];
36,37d34
< <body background="img/background.gif">
< 
38a36,37
> 	echo tng_adminlayout();
> 
46a46
> <div class="admin-main">
48,51c48,51
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus0",1,"details",$admtext['existingalbuminfo'],$admtext['infosubt']); ?>
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus0",1,"details",$admtext['newalbuminfo'],$admtext['infosubt']); ?>
70,71c70,71
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
73a74
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_albums.php';">
78,81c79,82
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newbranch.php TNG1403/admin_newbranch.php
31d30
< $flags['tabs'] = $tngconfig['tabs'];
54,55d52
< <body background="img/background.gif">
< 
56a54,55
> 	echo tng_adminlayout();
> 
64,66c63,66
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
75a76
> 		if( empty($firsttree) ) $firsttree = $treerow['gedcom'];
119,120c120,122
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
< 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveexit']; ?>">
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_branches.php';">
126,128c128,131
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newcemetery.php TNG1403/admin_newcemetery.php
4c4,5
< $mapkeystr = $map['key'] && $map['key'] != "1" ? "&key=" . $map['key'] : "";include("adminlib.php");
---
> $mapkeystr = $map['key'] && $map['key'] != "1" ? "&amp;key=" . $map['key'] . "&amp;callback=initMap" : "";
> include("adminlib.php");
27d27
< $flags['tabs'] = $tngconfig['tabs'];
75,76d74
< <body<?php if($map['key']) { if(!$map['startoff']) echo " onload=\"divbox('mapcontainer');\""; } ?> background="img/background.gif">
< 
77a76,78
> 	$onload = $map['key'] && !$map['startoff'] ? " onload=\"divbox('mapcontainer');\"" : "";
> 	echo tng_adminlayout($onload);
> 
84a86
> <div class="admin-main">
86,88c88,90
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
101c103
< 				<option></option>
---
> 				<option value=""></option>
115c117
< 				<option></option>
---
> 				<option value=""></option>
156c158,160
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_cemeteries.php';">
163,166c167,170
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newcollection.php TNG1403/admin_newcollection.php
35c35
< 	<tr><td><?php echo $admtext['localpath']; ?>:</td><td><input type="text" name="localpath" size="50" value="<?php echo $row['localpath']; ?>"></td></tr>
---
> 	<tr><td><?php echo $admtext['localpath']; ?>:</td><td><input type="text" name="localpath" size="50" value="<?php if( isset($row['localpath']) ) echo $row['localpath']; ?>"></td></tr>
diff -r TNG/admin_new_dna_group.php TNG1403/admin_new_dna_group.php
1,106c1,108
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "dna";
< include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< $admin_login = 1;
< include("checklogin.php");
< include("version.php");
< 
< if( !$allow_add ) {
< 	$message = $admtext['norights'];
< 	header( "Location: admin_login.php?message=" . urlencode($message) );
< 	exit;
< }
< 
< if( $assignedtree ) {
< 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
< 	$tree = $assignedtree;
< }
< else
< 	$wherestr = "";
< $orgtree = $tree;
< $treequery = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
< 
< $helplang = findhelp("dna_help.php");
< 
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['addgroup'], $flags );
< ?>
< <script type="text/javascript" src="js/selectutils.js"></script>
< <script type="text/javascript">
< function validateForm( ) {
< 	var rval = true;
< 
< 	document.form1.dna_group.value = document.form1.dna_group.value.replace(/[^a-zA-Z0-9-_]+/g, "");
< 	if( document.form1.dna_group.value.length == 0 ) {
< 		alert("<?php echo $admtext['entergroupid']; ?>");
< 		rval = false;
< 	}
< 	else if( document.form1.description.value.length == 0 ) {
< 		alert("<?php echo $admtext['entergroupdesc']; ?>");
< 		rval = false;
< 	}
< 	return rval;
< }
< var tree = "";
< </script>
< </head>
< 
< <body background="img/background.gif">
< 
< <?php
< 	$dnatabs[0] = array(1,"admin_dna_groups.php",$admtext['search'],"findtest");
< 	$dnatabs[1] = array($allow_add,"admin_new_dna_group.php",$admtext['addgroup'],"addgroup");
< 	$dnatabs[2] = array(1,"admin_dna_tests.php",$admtext['dna_tests'],"findtest");
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#add');\" class=\"lightlink\">{$admtext['help']}</a> ";
< 	$menu = doMenu($dnatabs,"addgroup",$innermenu);
< 	echo displayHeadline($admtext['dna_groups'] . " &gt;&gt; " . $admtext['addgroup'],"img/dna_icon.gif",$menu,$message);
< ?>
< 
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<form action="admin_add_dna_group.php" method="post" name="form1" onsubmit="return validateForm();">
< 	<table class="normal">
< 		<tr>
< 			<td><?php echo $admtext['tree']; ?>: </td>
< 			<td>
< 				<select name="tree" id="tree2">
< <?php
< 	$treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
< 	while( $treerow = tng_fetch_assoc($treeresult) )
< 		echo "	<option value=\"{$treerow['gedcom']}\">{$treerow['treename']}</option>\n";
< 	tng_free_result($treeresult);
< ?>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['test_type']; ?>: </td>
< 			<td>
< 				<select name="test_type">
< 					<option value=""></option>
< 					<option value="atDNA"><?php echo $admtext['atdna_test']; ?></option>
< 					<option value="Y-DNA"><?php echo $admtext['ydna_test']; ?></option>
< 					<option value="mtDNA"><?php echo $admtext['mtdna_test']; ?></option>
< 					<option value="X-DNA"><?php echo $admtext['xdna_test']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr><td valign="top"><?php echo $admtext['groupid']; ?>:</td><td><input type="text" name="dna_group" size="20" maxlength="20"/></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['description']; ?>:</td><td><input type="text" name="description" size="60"></td></tr>
< 
< 	</table>
< 	<br/>
< 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['save']; ?>">
< 	</form>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "dna";
> include("getlang.php");
> include("$mylanguage/admintext.php");
> 
> $admin_login = 1;
> include("checklogin.php");
> include("version.php");
> 
> if( !$allow_add ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> if( $assignedtree ) {
> 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
> 	$tree = $assignedtree;
> }
> else
> 	$wherestr = "";
> $orgtree = isset($tree) ? $tree : "";
> $treequery = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
> 
> $helplang = findhelp("dna_help.php");
> 
> tng_adminheader( $admtext['addgroup'], $flags );
> ?>
> <script type="text/javascript" src="js/selectutils.js"></script>
> <script type="text/javascript">
> //<![CDATA[
> function validateForm( ) {
> 	var rval = true;
> 
> 	document.form1.dna_group.value = document.form1.dna_group.value.replace(/[^a-zA-Z0-9-_]+/g, "");
> 	if( document.form1.dna_group.value.length == 0 ) {
> 		alert("<?php echo $admtext['entergroupid']; ?>");
> 		rval = false;
> 	}
> 	else if( document.form1.description.value.length == 0 ) {
> 		alert("<?php echo $admtext['entergroupdesc']; ?>");
> 		rval = false;
> 	}
> 	else if(document.form1.test_type.selectedIndex == 0 ) {
> 		alert("<?php echo $admtext['selecttype']; ?>");
> 		rval = false;
> 	}
> 	return rval;
> }
> var tree = "";
> //]]>
> </script>
> </head>
> 
> <?php
> 	echo tng_adminlayout();
> 
> 	$dnatabs[0] = array(1,"admin_dna_groups.php",$admtext['search'],"findtest");
> 	$dnatabs[1] = array($allow_add,"admin_new_dna_group.php",$admtext['addgroup'],"addgroup");
> 	$dnatabs[2] = array(1,"admin_dna_tests.php",$admtext['dna_tests'],"findtest");
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#add');\" class=\"lightlink\">{$admtext['help']}</a> ";
> 	$menu = doMenu($dnatabs,"addgroup",$innermenu);
> 	echo displayHeadline($admtext['dna_groups'] . " &gt;&gt; " . $admtext['addgroup'],"img/dna_icon.gif",$menu,$message);
> ?>
> 
> <div class="admin-main">
> 	<div class="databack admin-block">
> 	<form action="admin_add_dna_group.php" method="post" name="form1" onsubmit="return validateForm();">
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['tree']; ?>: </td>
> 			<td>
> 				<select name="tree" id="tree2">
> <?php
> 	$treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
> 	while( $treerow = tng_fetch_assoc($treeresult) )
> 		echo "	<option value=\"{$treerow['gedcom']}\">{$treerow['treename']}</option>\n";
> 	tng_free_result($treeresult);
> ?>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td valign="top"><?php echo $admtext['groupid']; ?>:</td><td><input type="text" name="dna_group" size="20" maxlength="20"/></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['test_type']; ?>: </td>
> 			<td>
> 				<select name="test_type">
> 					<option value="">&nbsp;</option>
> 					<option value="atDNA"><?php echo $admtext['atdna_test']; ?></option>
> 					<option value="Y-DNA"><?php echo $admtext['ydna_test']; ?></option>
> 					<option value="mtDNA"><?php echo $admtext['mtdna_test']; ?></option>
> 					<option value="X-DNA"><?php echo $admtext['xdna_test']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td valign="top"><?php echo $admtext['description']; ?>:</td><td><input type="text" name="description" size="60"></td></tr>
> 
> 	</table>
> 	<br/>
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['save']; ?>">
> 	</form>
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_new_dna_test.php TNG1403/admin_new_dna_test.php
1,184c1,188
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "dna";
< //include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< $admin_login = 1;
< include("checklogin.php");
< include("version.php");
< 
< if( !$allow_add ) {
< 	$message = $admtext['norights'];
< 	header( "Location: admin_login.php?message=" . urlencode($message) );
< 	exit;
< }
< 
< if( $assignedtree ) {
< 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
< 	$tree = $assignedtree;
< }
< else
< 	$wherestr = "";
< 
< $helplang = findhelp("dna_help.php");
< 
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['addnewdna'], $flags );
< ?>
< </head>
< 
< <body background="img/background.gif">
< 
< <?php
< 	$dnatabs[0] = array(1,"admin_dna_tests.php",$admtext['search'],"findtest");
< 	$dnatabs[1] = array($allow_add,"admin_new_dna_test.php",$admtext['addnew'],"addtest");
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#add');\" class=\"lightlink\">{$admtext['help']}</a> ";
< 	$innermenu .= "&nbsp;|&nbsp;<a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('on');\">{$text['expandall']}</a> &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('off');\">{$text['collapseall']}</a>";
< 	$menu = doMenu($dnatabs,"addtest",$innermenu);
< 	echo displayHeadline($admtext['dna_tests'] . " &gt;&gt; " . $admtext['addnewdna'], "img/dna_icon.gif",$menu,"");
< ?>
< 
< <form action="admin_add_dna_test.php" method="post" name="form1" id="form1" onsubmit="return validateForm();">
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<?php echo displayToggle("plus0",1,"testinfo",$admtext['testinfo'],$admtext['uplsel']); ?>
< 
< 	<div id="testinfo">
< 	<br/>
< 	<table class="normal">
< 		<tr>
< 			<td><?php echo $admtext['test_type']; ?>:</td>
< 			<td>
< 				<select name="test_type">
< 					<option value=""></option>
< 					<option value="atDNA"><?php echo $admtext['atdna_test']; ?></option>
< 					<option value="Y-DNA"><?php echo $admtext['ydna_test']; ?></option>
< 					<option value="mtDNA"><?php echo $admtext['mtdna_test']; ?></option>
< 					<option value="X-DNA"><?php echo $admtext['xdna_test']; ?></option>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['test_number']; ?>:</td>
< 			<td><input type="text" name="test_number" class="medfield"></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['vendor']; ?>:</td>
< 			<td><input type="text" name="vendor" class="medfield"></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['test_date']; ?>:</td>
< 			<td><input type="text" name="test_date" class="medfield" onblur="checkDate(this);"></td>
< 		</tr>
< 		<tr>
< 			<td colspan="2"><br/><strong><?php echo $admtext['test_taker']; ?></strong></td>
< 		</tr>
< 		<tr>
< 			<td><?php echo $admtext['tree']; ?>:</td>
< 			<td>
< 				<select name="mynewgedcom">
< 				<option value=""></option>
< <?php
< 		$query = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
< 		$treeresult = tng_query($query);
< 
< 		while( $treerow = tng_fetch_assoc($treeresult) ) {
< 			echo "	<option value=\"{$treerow['gedcom']}\">{$treerow['treename']}</option>\n";
< 		}
< ?>
< 				</select>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo "{$admtext['personid']} "; ?>:</td>
< 			<td>
< 
< 				<input type="text" name="personID" id="personID" size="20" maxlength="22"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
< 				<a href="#" onclick="return findItem('I','personID','',document.form1.mynewgedcom.options[document.form1.mynewgedcom.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>">
< 					<img src="img/tng_find.gif" title="<?php echo $admtext['find']; ?>" alt="<?php echo $admtext['find']; ?>" class="alignmiddle" width="20" height="20" border="0" vspace="0" hspace="2">
< 				</a>
< 				<span id="deststrfield"><?php echo $takername; ?></span>
< 			</td>
< 		</tr>
< 		<tr>
< 			<td><?php echo "{$admtext['text_or']} {$admtext['person_name']} "; ?></td>
< 			<td>
< 			<input type="text" name="person_name" value="<?php echo $row['person_name']; ?>" id="person_name" size="40" maxlength="100"></td>
< 		</tr>
< 		<tr>
< 			<td>&nbsp;<strong><?php echo $text['keep_name_private']; ?>:</strong>&nbsp;<input type="checkbox" name="private_dna" value="1"></td>
< 		</tr>
< 		<tr>
< 			<td colspan="2">&nbsp;</td>
< 		</tr>
< 		<tr>
< 			<td><strong><?php echo $admtext['addtotestgroup']; ?>:</strong>&nbsp;</td>
< 			<td>
< 				<select name="dna_group">
< 				<option value=""><?php echo $text['none']; ?></option>
< <?php
< 		$groupsquery = "SELECT * FROM $dna_groups_table ORDER BY description";
< 		$groupsresult = tng_query($groupsquery);
< 		$numgrouprows = tng_num_rows( $groupsresult );
< 		while( $groupsrow = tng_fetch_assoc($groupsresult) ) {
< 			echo "	<option value=\"{$groupsrow['dna_group']}\">{$groupsrow['description']}</option>\n";
< 		}
< 		tng_free_result($groupsresult);
< ?>
< 				</select>
< 			<td>
< 		</tr>
< 		<tr>
< 			<td colspan="2">&nbsp;</td>
< 		</tr>
< 	</table>
< 	</div>
< </td>
< </tr>
< 
< <tr class="databack">
< <td class="tngshadow">
< 	<p class="normal"><strong><?php echo $admtext['dnalater']; ?></strong></p>
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
< 	<input type="submit" name="submitbtn" class="btn" accesskey="s" value="<?php echo $admtext['savecont']; ?>">
< </td>
< </tr>
< 
< </table>
< </form>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< <script type="text/javascript">
< var tree = "<?php echo $tree; ?>";
< var tnglitbox;
< 
< function validateForm( ) {
< 	var rval = true;
< 
< //req: test number, test type
< 	var frm = document.form1;
< 	if(!frm.test_type.selectedIndex) {
< 		alert("<?php echo $admtext['selecttype']; ?>");
< 		rval = false;
< 	}
< //removed test_number alert
< 	return rval;
< }
< 
< function toggleAll(display) {
< 	toggleSection('testinfo','plus0',display);
< 	return false;
< }
< </script>
< <script type="text/javascript" src="js/net.js?v<?php echo $tng_version; ?>"></script>
< <script type="text/javascript" src="js/admin.js?v<?php echo $tng_version; ?>"></script>
< <script type="text/javascript" src="js/datevalidation.js?v<?php echo $tng_version; ?>"></script>
< <script type="text/javascript" src="js/selectutils.js"></script>
< <script type="text/javascript">
< 	var preferEuro = <?php echo ($tngconfig['preferEuro'] ? $tngconfig['preferEuro'] : "false"); ?>;
< 	var preferDateFormat = '<?php echo $preferDateFormat; ?>';
< </script>
< </body>
< </html>
\ No newline at end of file
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "dna";
> //include("getlang.php");
> include("$mylanguage/admintext.php");
> 
> $admin_login = 1;
> include("checklogin.php");
> include("version.php");
> 
> if( !$allow_add ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> if( $assignedtree ) {
> 	$wherestr = "WHERE gedcom = \"$assignedtree\"";
> 	$tree = $assignedtree;
> }
> else
> 	$wherestr = "";
> 
> $helplang = findhelp("dna_help.php");
> 
> tng_adminheader( $admtext['addnewdna'], $flags );
> ?>
> </head>
> 
> <?php
> 	echo tng_adminlayout();
> 
> 	$dnatabs[0] = array(1,"admin_dna_tests.php",$admtext['search'],"findtest");
> 	$dnatabs[1] = array($allow_add,"admin_new_dna_test.php",$admtext['addnew'],"addtest");
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/dna_help.php#add');\" class=\"lightlink\">{$admtext['help']}</a> ";
> 	$innermenu .= "&nbsp;|&nbsp;<a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('on');\">{$text['expandall']}</a> &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" onClick=\"return toggleAll('off');\">{$text['collapseall']}</a>";
> 	$menu = doMenu($dnatabs,"addtest",$innermenu);
> 	echo displayHeadline($admtext['dna_tests'] . " &gt;&gt; " . $admtext['addnewdna'], "img/dna_icon.gif",$menu,"");
> ?>
> 
> <div class="admin-main">
> <form action="admin_add_dna_test.php" method="post" name="form1" id="form1" onsubmit="return validateForm();">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
> 	<?php echo displayToggle("plus0",1,"testinfo",$admtext['testinfo'],""); ?>
> 
> 	<div id="testinfo">
> 	<br/>
> 	<table class="normal">
> 		<tr>
> 			<td><?php echo $admtext['test_type']; ?>:</td>
> 			<td>
> 				<select name="test_type" id="test_type">
> 					<option value="">&nbsp;</option>
> 					<option value="atDNA"><?php echo $admtext['atdna_test']; ?></option>
> 					<option value="Y-DNA"><?php echo $admtext['ydna_test']; ?></option>
> 					<option value="mtDNA"><?php echo $admtext['mtdna_test']; ?></option>
> 					<option value="X-DNA"><?php echo $admtext['xdna_test']; ?></option>
> 				</select>&nbsp;<img src=<?php echo"{$cms['tngpath']}img/spinner.gif"; ?> style="display:none;" id="treespinner2" alt="" class="spinner">&nbsp;&nbsp;&nbsp;
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['test_number']; ?>:</td>
> 			<td><input type="text" name="test_number" class="medfield"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['vendor']; ?>:</td>
> 			<td><input type="text" name="vendor" class="medfield"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['test_date']; ?>:</td>
> 			<td><input type="text" name="test_date" class="medfield" onblur="checkDate(this);"></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['match_date']; ?>:</td>
> 			<td><input type="text" name="match_date" class="medfield" onblur="checkDate(this);"></td>
> 		</tr>
> 		<?php if(isset($test_type) && $test_type == "atDNA") { ?>
> 		<tr>
> 			<td><?php echo $admtext['gedmatchID']; ?>:</td>
> 			<td><input type="text" name="GEDmatchID" value="" id="GEDmatchID" size="40" maxlength="40"></td>
> 		</tr>
> 		<?php }; ?>
> 		<tr>
> 			<td><strong><?php echo $admtext['privatetest']; ?>:</strong>&nbsp;</td>
> 			<td>
> 				<select name="private_test">
> 				<option value="0"<?php echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 				<option value="1"><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td colspan="2"><br/><strong><?php echo $admtext['test_taker']; ?></strong></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['tree']; ?>:</td>
> 			<td>
> 				<select name="mynewgedcom">
> 				<option value="">&nbsp;</option>
> <?php
> 		$query = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
> 		$treeresult = tng_query($query);
> 
> 		while( $treerow = tng_fetch_assoc($treeresult) ) {
> 			echo "	<option value=\"{$treerow['gedcom']}\">{$treerow['treename']}</option>\n";
> 		}
> ?>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo "{$admtext['personid']} "; ?>:</td>
> 			<td>
> 
> 				<input type="text" name="personID" id="personID" size="20" maxlength="22"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
> 				<a href="#" onclick="return findItem('I','personID','',document.form1.mynewgedcom.options[document.form1.mynewgedcom.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>">
> 					<img src="img/tng_find.gif" title="<?php echo $admtext['find']; ?>" alt="<?php echo $admtext['find']; ?>" class="alignmiddle" width="20" height="20" style="border: 0px; margin: 0px 2px;">
> 				</a>
> 				<span id="deststrfield"></span>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo "{$admtext['text_or']} {$admtext['person_name']} "; ?></td>
> 			<td>
> 			<input type="text" name="person_name" value="" id="person_name" size="40" maxlength="100"></td>
> 		</tr>
> 		<tr>
> 			<td colspan="2">&nbsp;<strong><?php echo $text['keep_name_private']; ?>:</strong>&nbsp;<input type="checkbox" name="private_dna" value="1"></td>
> 		</tr>
> 		<tr>
> 			<td colspan="2">&nbsp;</td>
> 		</tr>
> 	</table>
> 	</div>
> </td>
> </tr>
> 
> <tr>
> <td class="tngshadow databack">
> 	<p class="normal"><strong><?php echo $admtext['dnalater']; ?></strong></p>
> 	<input type="hidden" value="<?php if( isset($cw) ) echo $cw; /*stands for "close window" */ ?>" name="cw">
> 	<input type="submit" name="submitbtn" class="btn" accesskey="s" value="<?php echo $admtext['savecont']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_dna_tests.php';">
> </td>
> </tr>
> 
> </table>
> </form>
> </div>
> <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
> <script type="text/javascript">
> //<![CDATA[
> var tree = "<?php if( isset($tree) ) echo $tree; ?>";
> var tnglitbox;
> 
> function validateForm( ) {
> 	var rval = true;
> 
> //req: test number, test type
> 	var frm = document.form1;
> 	if(!frm.test_type.selectedIndex) {
> 		alert("<?php echo $admtext['selecttype']; ?>");
> 		rval = false;
> 	}
> //removed test_number alert
> 	return rval;
> }
> 
> function toggleAll(display) {
> 	toggleSection('testinfo','plus0',display);
> 	return false;
> }
> //]]>
> </script>
> <script type="text/javascript" src="<?php echo $cms['tngpath'] ;?>js/datevalidation.js?v=<?php echo filemtime($cms['tngpath']."js/datevalidation.js"); ?>"></script>
> <script type="text/javascript" src="<?php echo $cms['tngpath'] ;?>js/selectutils.js?v=<?php echo filemtime($cms['tngpath']."js/selectutils.js"); ?>"></script>
> <script type="text/javascript">
> //<![CDATA[
> 	var preferEuro = <?php echo (isset($tngconfig['preferEuro']) ? $tngconfig['preferEuro'] : "false"); ?>;
> 	var preferDateFormat = '<?php if( isset($preferDateFormat) ) echo $preferDateFormat; ?>';
> //]]>
> </script>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newevent.php TNG1403/admin_newevent.php
20c20
< 	if( $message ) {
---
> 	if(!empty($message)) {
35c35
< 	$query = "SELECT * FROM $eventtypes_table WHERE type = \"$prefix\" ORDER BY tag";
---
> 	$query = "SELECT * FROM $eventtypes_table WHERE keep = \"1\" AND type = \"$prefix\" ORDER BY tag";
59c59
< 	<tr><td><?php echo $admtext['eventplace']; ?>:</td><td valign="top"><input type="text" name="eventplace" id="eventplace" size="40"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
---
> 	<tr><td><?php echo $admtext['eventplace']; ?>:</td><td valign="top"><input type="text" name="eventplace" id="eventplace" size="70"> &nbsp;<?php echo $admtext['text_or']; ?>&nbsp;
61c61
< 	<tr><td valign="top"><?php echo $admtext['detail']; ?>:</td><td><textarea name="info" rows="4" cols="40"></textarea></td></tr>
---
> 	<tr><td valign="top"><?php echo $admtext['detail']; ?>:</td><td><textarea name="info" rows="6" cols="70"></textarea></td></tr>
diff -r TNG/admin_neweventtype.php TNG1403/admin_neweventtype.php
20d19
< $flags['tabs'] = $tngconfig['tabs'];
74,75d72
< <body background="img/background.gif">
< 
76a74,75
> 	echo tng_adminlayout();
> 
84,86c83,84
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
112c110
< 			<input type="text" name="tag2" size="10" onblur="if(this.value == 'EVEN') {toggleTdesc(1);} else {toggleTdesc(0);}"> (<?php echo $admtext['ifbothdata']; ?>)
---
> 			<input type="text" name="tag2" size="10" onblur="if(this.value == 'EVEN' || this.value == '') {toggleTdesc(1);} else {toggleTdesc(0);}"> (<?php echo $admtext['ifbothdata']; ?>)
139,140c137,140
< 	<input type="hidden" name="eventtypeID" value="<?php echo $eventtypeID; ?>"><input type="hidden" name="display" value="">
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
---
> 	<input type="hidden" name="eventtypeID" value="<?php if( isset($eventtypeID) ) echo $eventtypeID; ?>"><input type="hidden" name="display" value="">
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_eventtypes.php';">
142,146c142,143
< 	<p class="normal">*<?php echo $admtext['typerequired']; ?></p>
< </td>
< </tr>
< 
< </table>
---
> 	<p class="normal" id="typereq" style="display:none">*<?php echo $admtext['typerequired']; ?></p>
> 	</div>
148,149c145
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
152c148,150
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newfamily.php TNG1403/admin_newfamily.php
18c18
< if( $child )
---
> if(!empty($child))
20c20
< else if( $husband )
---
> else if(!empty($husband))
22c22
< else if( $wife )
---
> else if(!empty($wife))
28c28
< 	$query = "SELECT personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, branch, gedcom FROM $people_table WHERE personID = \"$newperson\" AND gedcom = \"$tree\"";
---
> 	$query = "SELECT personID, firstname, lnprefix, lastname, prefix, suffix, title, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, living, private, branch, gedcom FROM $people_table WHERE personID = \"$newperson\" AND gedcom = \"$tree\"";
40c40
< if( $husband )
---
> if(!empty($husband))
42c42
< else if( $wife )
---
> else if(!empty($wife))
53c53
< 	$firsttree = $tree ? $tree : (isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "");
---
> 	$firsttree = !empty($tree) ? $tree : (isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "");
62d61
< $flags['tabs'] = $tngconfig['tabs'];
63a63
> if(!isset($tree)) $tree = "";
67c67,68
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
> <?php if(!empty($stay)) { echo "window.opener.location.reload(false);\n"; } ?>
98c99
< 		deepOpen('admin_editperson.php?personID=' + field.value + '&tree=' + tree + '&cw=1','editspouse');
---
> 		window.open('admin_editperson.php?personID=' + field.value + '&tree=' + tree + '&cw=1');
115,116c116,117
< 			width:620,
< 			height:600,
---
> 			width:650,
> 			height:670,
159,160d159
< <body background="img/background.gif" onload="generateID('family',document.form1.familyID,document.form1.tree1);">
< 
161a161,162
> 	echo tng_adminlayout(" onload=\"generateID('family',document.form1.familyID,document.form1.tree1);\"");
> 
170a172
> <div class="admin-main">
172,175c174,177
< <input type="hidden" name="lastperson" value="<?php echo $child; ?>">
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <input type="hidden" name="lastperson" value="<?php echo (isset($child) ? $child : ""); ?>">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
177d178
< 	<tr><td valign="top" colspan="2"><span class="normal"><strong><?php echo $admtext['prefixfamilyid']; ?></strong></span></td></tr>
199d199
< 	$branchlist = explode(",", $row['branch'] );
210,211c210
< 		if($numbranches > 8)
< 			$select = $admtext['scrollbranch'] . "<br/>";
---
> 		$select = $numbranches > 8 ? $admtext['scrollbranch'] . "<br/>" : "";
213,215c212
< 		$select .= "	<option value=\"\"";
< 		if( $row['branch'] == "" ) $select .= " selected";
< 		$select .= ">{$admtext['nobranch']}</option>\n";
---
> 		$select .= "	<option value=\"\" selected>{$admtext['nobranch']}</option>\n";
218c215
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('branchedit'); quitBranchEdit('branchedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('branchedit'); quitEdit('branchedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
220c217
< 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('branch','branchedit','branchlist');">
---
> 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('branch','branchedit','branchlist');">
233c230
< 			<input type="text" name="familyID" value="<?php echo $newID; ?>" size="10" onBlur="this.value=this.value.toUpperCase()">
---
> 			<input type="text" name="familyID" value="<?php echo (isset($newID) ? $newID : ""); ?>" size="10" onBlur="this.value=this.value.toUpperCase()">
235c232
< 			<input type="button" name="lock" value="<?php echo $admtext['lockid']; ?>" onClick="document.form1.newfamily[0].checked = true; if( gatherChildren() ) {document.form1.submit();}">
---
> 			<input type="button" name="lock" value="<?php echo $admtext['lockid']; ?>" onClick="document.form1.newfamily[0].checked = true;">
243,244c240,241
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
250c247
< 		<input type="hidden" name="husband" id="husband" value="<?php echo $husband; ?>">
---
> 		<input type="hidden" name="husband" id="husband" value="<?php echo (isset($husband) ? $husband : ""); ?>">
257c254
< 		<input type="hidden" name="wife" id="wife" value="<?php echo $wife; ?>">
---
> 		<input type="hidden" name="wife" id="wife" value="<?php echo (isset($wife) ? $wife : ""); ?>">
268c265
< 				<input type="checkbox" name="living" value="1" checked="checked"> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
---
> 				<input type="checkbox" name="living" value="1"<?php if(!$tngconfig['livingunchecked']) { echo " checked=\"checked\""; } ?>> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
276,277c273,274
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
301,302c298,299
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
304c301
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
---
> 	<input type="hidden" value="<?php echo (isset($cw) ? $cw : ""); /*stands for "close window" */ ?>" name="cw">
305a303
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_families.php';">
310a309
> </div>
312c311
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
318,319d316
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
diff -r TNG/admin_newlanguage.php TNG1403/admin_newlanguage.php
20d19
< $flags['tabs'] = $tngconfig['tabs'];
24c23
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
40,41d38
< <body background="img/background.gif">
< 
42a40,41
> 	echo tng_adminlayout();
> 
50,52c49,50
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
65c63
< 			if(is_dir($filename) && $filename != '..' && $filename != '.')
---
> 			if(is_dir($filename) && $filename != '..' && $filename != '.' && $filename != '@eaDir')
90,97c88,96
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>"></form>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_languages.php';">
> 	</form>
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newmedia.php TNG1403/admin_newmedia.php
10a11
> include_once("tngdblib.php");
18c19
< if(!$tree) {
---
> if( empty($tree) ) {
28a30
> if( !isset($wherestr) ) $wherestr = "";
41d42
< $flags['tabs'] = $tngconfig['tabs'];
61,62d61
< <body background="img/background.gif">
< 
63a63,64
> 	echo tng_adminlayout();
> 
73a75,90
> 
> 	if(isset($personID)) {
> 		$nameresult = getPersonSimple($tree, $personID);
> 		$namerow = tng_fetch_assoc($nameresult);
> 		$righttree = checktree($tree);
> 		$rightbranch = $righttree ? checkbranch($row['branch']) : false;
> 		$rights = determineLivingPrivateRights($namerow, $righttree, $rightbranch);
> 		$namerow['allow_living'] = $rights['living'];
> 		$namerow['allow_private'] = $rights['private'];
>         $namestr = getName( $namerow );
> 		tng_free_result($nameresult);
> 	}
> 	else {
> 		$personID = isset($place) ? $place : ""; 
> 		$namestr = "";
> 	}
75a93
> <div class="admin-main">
79,82c97,100
< <input type="hidden" name="link_linktype" value="<?php echo $linktype; ?>">
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <input type="hidden" name="link_linktype" value="<?php if( isset($linktype) ) echo $linktype; ?>">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
87c105
< 	<table>
---
> 	<table class="normal">
89c107
< 		<td><span class="normal"><?php echo $admtext['mediatype']; ?>:</span></td>
---
> 		<td><?php echo $admtext['mediatype']; ?>:</td>
108,109c126,127
< 	<tr><td colspan="2"><span class="normal"><strong><br/><?php echo $admtext['imagefile']; ?></strong></span></td></tr>
< 	<tr id="imgrow"><td><span class="normal"><?php echo $admtext['imagefiletoupload']; ?>*:</span></td><td><input type="file" name="newfile" size="60" onchange="populatePath(document.form1.newfile,document.form1.path);"></td></tr>
---
> 	<tr><td colspan="2"><strong><br/><?php echo $admtext['imagefile']; ?></strong></td></tr>
> 	<tr id="imgrow"><td><?php echo $admtext['imagefiletoupload']; ?>*:</td><td><input type="file" name="newfile" size="60" onchange="populatePath(document.form1.newfile,document.form1.path);prepopulateThumb();"></td></tr>
111,112c129,130
< 		<td><span class="normal"><?php echo $admtext['pathwithinphotos']; ?>**:</span></td>
< 		<td><input type="text" name="path" id="path" size="60"><input type="hidden" id="path_org"><input type="hidden" id="path_last"> <input type="button" value="<?php echo $admtext['select'] . "..."; ?>" name="photoselect" onclick="javascript:var folder = document.form1.usecollfolder[1].checked ? document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value : 'media';FilePicker('path',folder);"></td>
---
> 		<td><?php echo $admtext['pathwithinphotos']; ?>**:</td>
> 		<td><input type="text" name="path" id="path" size="60" onchange="prepopulateThumb();"><input type="hidden" id="path_org"><input type="hidden" id="path_last"> <input type="button" value="<?php echo $admtext['select'] . "..."; ?>" name="photoselect" onclick="javascript:var folder = document.form1.usecollfolder[0].checked ? document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value : 'media';FilePicker('path',folder);"></td>
114c132
< 	<tr id="abspathrow" style="display:none"><td valign="top"><span class="normal"><?php echo $admtext['mediaurl']; ?>:</span></td><td><input type="text" name="mediaurl" size="60"></td></tr>
---
> 	<tr id="abspathrow" style="display:none"><td valign="top"><?php echo $admtext['mediaurl']; ?>:</td><td><input type="text" name="mediaurl" size="60"></td></tr>
117c135
< 	<tr id="bodytextrow"><td valign="top"><span class="normal"><?php echo $admtext['bodytext']; ?>:</span></td><td valign="top"><textarea wrap cols="100" rows="12" name="bodytext" id="bodytext"></textarea></td></tr>
---
> 	<tr id="bodytextrow"><td valign="top"><span class="normal"><?php echo $admtext['bodytext']; ?>:</span></td><td valign="top"><textarea wrap cols="90" rows="12" name="bodytext" id="bodytext"></textarea></td></tr>
123,126c141,145
< 		<td valign="top"><span class="normal"><strong><br/><?php echo $admtext['thumbnailfile']; ?></strong></span></td>
< 		<td valign="top"><span class="normal"><br/>
< 			<input type="radio" name="thumbcreate" value="specify" checked onClick="document.form1.newthumb.style.visibility='visible'; document.form1.thumbselect.style.visibility='visible';"> <?php echo $admtext['specifyimg']; ?> &nbsp;
< 			<input type="radio" name="thumbcreate" value="auto" onClick="document.form1.newthumb.style.visibility='hidden'; document.form1.thumbselect.style.visibility='hidden'; prepopulateThumb(); document.form1.abspath.checked=false;"> <?php echo $admtext['autoimg']; ?></span></td>
---
> 		<td valign="top"><strong><br/><?php echo $admtext['thumbnailfile']; ?></strong></td>
> 		<td valign="top"><br/>
> 			<input type="radio" name="thumbcreate" value="auto" checked onClick="document.form1.newthumb.style.visibility='hidden'; document.form1.thumbselect.style.visibility='hidden'; prepopulateThumb(); document.form1.abspath.checked=false;"> <?php echo $admtext['autoimg']; ?> &nbsp;
> 			<input type="radio" name="thumbcreate" value="specify" onClick="document.form1.newthumb.style.visibility='visible'; document.form1.thumbselect.style.visibility='visible';"> <?php echo $admtext['specifyimg']; ?>
> 		</td>
132c151
< 	<tr><td colspan="2"><strong><span class="normal"><br/><?php echo $admtext['thumbnailfile']; ?></strong></span></td></tr>
---
> 	<tr><td colspan="2"><strong><br/><?php echo $admtext['thumbnailfile']; ?></strong></td></tr>
136c155
< 	<tr><td><span class="normal"><?php echo $admtext['imagefiletoupload']; ?>*:</span></td><td><input type="file" name="newthumb" size="60" onChange="populatePath(document.form1.newthumb,document.form1.thumbpath);"></td></tr>
---
> 	<tr><td><?php echo $admtext['imagefiletoupload']; ?>*:</td><td><input type="file" name="newthumb" size="60" style="visibility:hidden" onChange="populatePath(document.form1.newthumb,document.form1.thumbpath);"></td></tr>
138,139c157,158
< 		<td><span class="normal"><?php echo $admtext['pathwithinphotos']; ?>**:</span></td>
< 		<td><input type="text" name="thumbpath" id="thumbpath" size="60"><input type="hidden" id="thumbpath_org"><input type="hidden" id="thumbpath_last"> <input type="button" value="<?php echo $admtext['select'] . "..."; ?>" name="thumbselect" OnClick="javascript:var folder = document.form1.usecollfolder[1].checked ? document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value : 'media';FilePicker('thumbpath',folder);"></td>
---
> 		<td><?php echo $admtext['pathwithinphotos']; ?>**:</td>
> 		<td><input type="text" name="thumbpath" id="thumbpath" size="60"><input type="hidden" id="thumbpath_org"><input type="hidden" id="thumbpath_last"> <input type="button" value="<?php echo $admtext['select'] . "..."; ?>" name="thumbselect" OnClick="javascript:var folder = document.form1.usecollfolder[0].checked ? document.form1.mediatypeID.options[document.form1.mediatypeID.selectedIndex].value : 'media';FilePicker('thumbpath',folder);"></td>
142,145c161,164
< 		<td valign="top"><span class="normal"><strong><br/><?php echo $admtext['put_in']; ?></strong></span></td>
< 		<td valign="top"><span class="normal"><br/>
< 			<input type="radio" name="usecollfolder" value="0"> <?php echo $admtext['usemedia']; ?> &nbsp;
< 			<input type="radio" name="usecollfolder" value="1" checked> <?php echo $admtext['usecollect']; ?></span>
---
> 		<td valign="top"><strong><br/><?php echo $admtext['put_in']; ?></strong></td>
> 		<td valign="top"><br/>
> 			<input type="radio" name="usecollfolder" value="1" checked> <?php echo $admtext['usecollect']; ?> &nbsp;
> 			<input type="radio" name="usecollfolder" value="0"> <?php echo $admtext['usemedia']; ?>
148,149c167,168
< 	<tr id="vidrow1"><td valign="top"><span class="normal"><?php echo $admtext['width']; ?>:</span></td><td><input type="text" name="width" size="40"></td></tr>
< 	<tr id="vidrow2"><td valign="top"><span class="normal"><?php echo $admtext['height']; ?>:</span></td><td><input type="text" name="height" size="40"><span class="normal"> (<?php echo $admtext['controller']; ?>)</span></td></tr>
---
> 	<tr id="vidrow1"><td valign="top"><?php echo $admtext['width']; ?>:</td><td><input type="text" name="width" size="40"></td></tr>
> 	<tr id="vidrow2"><td valign="top"><?php echo $admtext['height']; ?>:</td><td><input type="text" name="height" size="40"><span class="normal"> (<?php echo $admtext['controller']; ?>)</span></td></tr>
161,162c180,181
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
168c187
< 	<tr><td valign="top"><?php echo $admtext['title']; ?>:</td><td><textarea wrap cols="70" rows="3" name="description"></textarea></td></tr>
---
> 	<tr><td valign="top"><?php echo $admtext['title2']; ?>:</td><td><textarea wrap cols="70" rows="3" name="description"><?php echo $namestr; ?></textarea></td></tr>
198c217
< 					<option selected></option>
---
> 					<option value="" selected="selected"></option>
200c219
< $query = "SELECT cemname, cemeteryID, city, county, state, country FROM $cemeteries_table ORDER BY country, state, county, city, cemname";
---
> $query = "SELECT cemname, cemeteryID, city, county, state, country FROM $cemeteries_table ORDER BY cemname, city, county, state, country";
203c222
< 	$cemetery = "{$cemrow['country']}, {$cemrow['state']}, {$cemrow['county']}, {$cemrow['city']}, {$cemrow['cemname']}";
---
> 	$cemetery = "{$cemrow['cemname']} - {$cemrow['city']}, {$cemrow['county']}, {$cemrow['state']}, {$cemrow['country']}";
220a240
> 				<option value="moved"><?php echo $admtext['moved']; ?></option>
226,229c246,248
< 	<tr><td valign="top" colspan="2"><input type="checkbox" name="alwayson" value="1"> <?php echo $admtext['alwayson']; ?></td></tr>
< 
< <!-- history section -->
< 	<tr id="newwinrow"><td valign="top" colspan="2"><input type="checkbox" name="newwindow" value="1"> <?php echo $admtext['newwin']; ?></td></tr>
---
> 	<tr><td valign="top" colspan="2"><input type="checkbox" name="alwayson" value="1" id="img_alwayson" onchange="if($(this).is(':checked')){$('#img_private').prop('checked',false);}"> <?php echo $admtext['alwayson']; ?></td></tr>
> 	<tr><td valign="top" colspan="2"><input type="checkbox" name="newwindow" value="1"> <?php echo $admtext['newwin']; ?></td></tr>
> 	<tr><td valign="top" colspan="2"><input type="checkbox" name="private" value="1" id="img_private" onchange="if($(this).is(':checked')){$('#img_alwayson').prop('checked',false);}"> <?php echo $admtext['private']; ?></td></tr>
240,241c259,260
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
244c263
< 	<input type="hidden" value="<?php echo "$cw"; /*stands for "close window" */ ?>" name="cw">
---
> 	<input type="hidden" value="<?php if( isset($cw) ) echo $cw; /*stands for "close window" */ ?>" name="cw">
245a265
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_media.php';">
251c271,272
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
---
> </div>
> 
298,299c319,320
< 	if( frm.thumbpath.value.length == 0 && frm.thumbcreate[1].checked == true ) {
< 		alert("<?php echo $admtext['enterthumbpath']; ?>");
---
> 	if(!frm.notes.value.length && !frm.description.value) {
> 		alert("<?php echo $admtext['enterphotodesc']; ?>");
314c335,336
< 		var params = {path: frm.path.value, thumbpath: frm.thumbpath.value, usecollfolder: usecollfolder, mediatypeID: mediatypeID};
---
> 		var thumbpath = frm.newthumb.value ? frm.thumbpath.value : "";
> 		var params = {path: frm.path.value, thumbpath: thumbpath, usecollfolder: usecollfolder, mediatypeID: mediatypeID};
321c343,344
< 				frm.thumbpath.value = vars.thumbpath;
---
> 				if(vars.thumbpath)
> 					frm.thumbpath.value = vars.thumbpath;
343c366
< 	var preferDateFormat = '<?php echo $preferDateFormat; ?>';
---
> 	var preferDateFormat = '<?php if( isset($preferDateFormat) ) echo $preferDateFormat; ?>';
353c376
<     new nicEditor({fullPanel : true}).panelInstance('bodytext');
---
>     new nicEditor({fullPanel : true, maxHeight: 300}).panelInstance('bodytext');
357,358c380,382
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newperson2.php TNG1403/admin_newperson2.php
22c22
< if( $father ) {
---
> if( !empty($father) && $father != "undefined" ) {
29c29
< 	$row['lastname'] = $row['lnprefix'] = "";
---
> 	$row['lastname'] = $row['lnprefix'] = $row['branch'] = "";
41c41
< 		if( $parent[$fieldname] == $reltype || $parent[$fieldname] == $admtext[$reltype] ) $pout .= " selected";
---
> 		if( isset($parent[$fieldname]) && ($parent[$fieldname] == $reltype || $parent[$fieldname] == $admtext[$reltype]) ) $pout .= " selected";
55c55
< <form method="post" name="npform"<?php if($needped) {echo " action=\"admin_addperson2.php\"";} else echo " action=\"\" onsubmit=\"return saveNewPerson(this);\""; ?> style="margin-top:10px">
---
> <form method="post" name="npform"<?php if(!empty($needped)) {echo " action=\"admin_addperson2.php\"";} else echo " action=\"\" onsubmit=\"return saveNewPerson(this);\""; ?> style="margin-top:10px">
57d56
< 	<tr><td valign="top" colspan="2"><strong><?php echo $admtext['prefixpersonid']; ?></strong></td></tr>
88d86
< 		<td><?php echo $admtext['sex']; ?></td>
94a93,101
> 		<td><input type="text" name="nickname" class="veryshortfield"></td>
> 		<td><input type="text" name="title" class="veryshortfield"></td>
> 		<td><input type="text" name="prefix" class="veryshortfield"></td>
> 		<td><input type="text" name="suffix" class="veryshortfield"></td>
> 	</tr>
> 	<tr>
> 		<td><?php echo $admtext['sex']; ?></td>
> 	</tr>
> 	<tr>
96c103
< 			<select name="sex">
---
> 			<select name="sex" onchange="if(this.value == 'M' || this.value == 'F' || this.value == 'U') {jQuery('#other_gender').hide();} else {jQuery('#other_gender').show();}">
99a107
> 				<option value=""><?php echo $text['other']; ?></option>
102,105c110
< 		<td><input type="text" name="nickname" class="veryshortfield"></td>
< 		<td><input type="text" name="title" class="veryshortfield"></td>
< 		<td><input type="text" name="prefix" class="veryshortfield"></td>
< 		<td><input type="text" name="suffix" class="veryshortfield"></td>
---
> 		<td colspan="4"><input type="text" name="other_gender" id="other_gender" style="display: none" /></td>
112c117
< 			<input type="checkbox" name="living" value="1" checked="checked"> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
---
> 			<input type="checkbox" name="living" value="1"<?php if(!$tngconfig['livingunchecked']) { echo " checked=\"checked\""; } ?>> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
132,133c137
< 		if($numbranches > 8)
< 			$select = $admtext['scrollbranch'] . "<br/>";
---
> 		$select = $numbranches > 8 ? $admtext['scrollbranch'] . "<br/>" : "";
140c144
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('branchedit2'); quitBranchEdit('branchedit2'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('branchedit2'); quitEdit('branchedit2'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
142c146
< 		<div id="branchedit2" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('branch2','branchedit2','branchlist2');">
---
> 		<div id="branchedit2" class="lightback pad5 rounded4" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('branch2','branchedit2','branchlist2');">
158a163
> 	$currentform = "document.npform";
161c166
< 		echo showEventRow('altbirthdate','altbirthplace','CHR','');
---
> 		echo showEventRow('altbirthdate','altbirthplace','ALTBE','');
183c188
< <input type="hidden" name="needped" value="<?php echo $needped; ?>">
---
> <input type="hidden" name="needped" value="<?php echo (isset($needped) ? $needped : ""); ?>">
diff -r TNG/admin_newperson.php TNG1403/admin_newperson.php
17a18
> if(!isset($cw)) $cw = "";
33d33
< $flags['tabs'] = $tngconfig['tabs'];
70a71,79
> 
> function onGenderChange(gender) {
> 	if(gender.value == 'M' || gender.value == 'F' || gender.value == 'U') {
> 		jQuery('#other_gender').hide();
> 	} 
> 	else {
> 		jQuery('#other_gender').show();
> 	}
> }
72c81
< <script language="JavaScript" src="js/admin.js"></script>
---
> <script src="js/admin.js"></script>
75,76d83
< <body background="img/background.gif" onload="generateID('person',document.form1.personID,document.form1.tree1);">
< 
77a85,86
> 	echo tng_adminlayout(" onload=\"generateID('person',document.form1.personID,document.form1.tree1);\"");
> 
84a94
> 	if(!isset($message)) $message = '';
87a98
> <div class="admin-main">
89,91c100,102
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
93d103
< 	<tr><td valign="top" colspan="2"><span class="normal"><strong><?php echo $admtext['prefixpersonid']; ?></strong></span></td></tr>
119a130
> 	$select = "";
130c141
< 		if( $row['branch'] == "" ) $select .= " selected";
---
> 		if( $assignedbranch == "" ) $select .= " selected";
134c145
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('branchedit'); quitBranchEdit('branchedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('branchedit'); quitEdit('branchedit'); return false;\"><img src=\"img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
136c147
< 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('branch','branchedit','branchlist');">
---
> 		<div id="branchedit" class="lightback pad5 rounded4" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('branch','branchedit','branchlist');">
159,160c170,171
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
184d194
< 			<td><?php echo $admtext['sex']; ?></td>
192,198d201
< 			<td>
< 				<select name="sex">
< 					<option value="U"><?php echo $admtext['unknown']; ?></option>
< 					<option value="M"><?php echo $admtext['male']; ?></option>
< 					<option value="F"><?php echo $admtext['female']; ?></option>
< 				</select>
< 			</td>
211a215,229
> 		<tr>
> 			<td><?php echo $admtext['sex']; ?></td>
> 			<td colspan="4"></td>
> 		</tr>
> 		<tr>
> 			<td>
> 				<select name="sex" onchange="onGenderChange(this);">
> 					<option value="U"><?php echo $admtext['unknown']; ?></option>
> 					<option value="M"><?php echo $admtext['male']; ?></option>
> 					<option value="F"><?php echo $admtext['female']; ?></option>
> 					<option value=""><?php echo $text['other']; ?></option>
> 				</select>
> 			</td>
> 			<td colspan="4"><input type="text" name="other_gender" id="other_gender" style="display: none" /></td>
> 		</tr>
217c235
< 				<input type="checkbox" name="living" value="1" checked="checked"> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
---
> 				<input type="checkbox" name="living" value="1"<?php if(!$tngconfig['livingunchecked']) { echo " checked=\"checked\""; } ?>> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
225,226c243,244
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
236c254
< 		echo showEventRow('altbirthdate','altbirthplace','CHR','');
---
> 		echo showEventRow('altbirthdate','altbirthplace','ALTBE','');
251,252c269,270
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
259a278
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_people.php';">
265,266c284,285
< 
< <SCRIPT language="JavaScript" type="text/javascript">
---
> </div>
> <script type="text/javascript">
272,275c291,293
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newplace.php TNG1403/admin_newplace.php
4c4
< $mapkeystr = $map['key'] && $map['key'] != "1" ? "&key=" . $map['key'] : "";
---
> $mapkeystr = $map['key'] && $map['key'] != "1" ? "&amp;key=" . $map['key'] . "&amp;callback=initMap" : "";
35d34
< $flags['tabs'] = $tngconfig['tabs'];
40a40,41
> <script> <?php include("niceditmsgs.php"); ?> </script>
> <script type="text/javascript" src="js/nicedit.js"></script>
41a43,47
> //<![CDATA[
> bkLib.onDomLoaded(function() {
>     new nicEditor({fullPanel: true, maxHeight: 300}).panelInstance('mynotes');
> });
> 
49a56
> //]]>
57,58d63
< <body<?php if($map['key']) { if(!$map['startoff']) echo " onload=\"divbox('mapcontainer');\""; } ?> background="img/background.gif">
< 
59a65,67
> 	$onload = $map['key'] && !$map['startoff'] ? " onload=\"divbox('mapcontainer');\"" : "";
> 	echo tng_adminlayout($onload);
> 
69,71c77,78
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
96c103
< 	<tr><td><?php echo $admtext['place']; ?>:</td><td><input type="text" name="place" id="place" size="50"></td></tr>
---
> 	<tr><td><?php echo $admtext['place']; ?>:</td><td><input type="text" name="place" id="place" size="70"></td></tr>
120,122d126
< <?php
< 	if( $map['key'] ) {
< ?>
133a138
> 				<option value="-1"><?php echo $admtext['donotgeocode']; ?></option>
142,145c147
< <?php
< 	}
< ?>
< 	<tr><td valign="top"><?php echo $admtext['notes']; ?>:</td><td><textarea wrap cols="50" rows="5" name="notes"></textarea></td></tr>
---
> 	<tr><td valign="top"><?php echo $admtext['notes']; ?>:</td><td><textarea wrap cols="90" rows="5" name="notes" id="mynotes"></textarea></td></tr>
147,154c149,156
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>"></form>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_places.php';">
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newrepo.php TNG1403/admin_newrepo.php
29d28
< $flags['tabs'] = $tngconfig['tabs'];
33c32
< <script language="javascript" type="text/javascript">
---
> <script type="text/javascript">
53,54d51
< <body background="img/background.gif" onload="generateID('repo',document.form1.repoID,document.form1.tree1);">
< 
55a53,54
> 	echo tng_adminlayout(" onload=\"generateID('repo',document.form1.repoID,document.form1.tree1);\"");
> 
63a63
> <div class="admin-main">
65,67c65,67
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
69d68
< 	<tr><td valign="top" colspan="2"><span class="normal"><strong><?php echo $admtext['prefixrepoid']; ?></strong></span></td></tr>
102,103c101,102
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
118,119c117,118
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
121a121
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_repositories.php';">
126,129c126,129
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newreport.php TNG1403/admin_newreport.php
18,138c18
< $dontdo = array("ADDR","BIRT","CHR","DEAT","BURI","NAME","NICK","TITL","NSFX","NPFX");
< 
< $dfields = array();
< $dfields['personID'] = "personid";
< $dfields['fullname'] = "fullname";
< $dfields['lastfirst'] = "lastfirst";
< $dfields['firstname'] = "firstname";
< $dfields['lastname'] = "lastname";
< $dfields['nickname'] = "nickname";
< $dfields['birthdate'] = "birthdate";
< $dfields['birthplace'] = "birthplace";
< if(!$tngconfig['hidechr']) {
< 	$dfields['altbirthdate'] = "chrdate";
< 	$dfields['altbirthplace'] = "chrplace";
< }
< $dfields['marrdate'] = "marriagedate";
< $dfields['marrplace'] = "marriageplace";
< $dfields['divdate'] = "divdate";
< $dfields['divplace'] = "divplace";
< $dfields['spouseid'] = "spouseid";
< $dfields['spousename'] = "spousename";
< $dfields['deathdate'] = "deathdate";
< $dfields['deathplace'] = "deathplace";
< $dfields['burialdate'] = "burialdate";
< $dfields['burialplace'] = "burialplace";
< $dfields['changedate'] = "lastmodified";
< $dfields['sex'] = "sex";
< $dfields['title'] = "title";
< $dfields['prefix'] = "prefix";
< $dfields['suffix'] = "suffix";
< $dfields['gedcom'] = "tree";
< if( $allow_lds ) {
< 	$dfields['baptdate'] = "ldsbapldate";
< 	$dfields['baptplace'] = "ldsbaplplace";
< 	$dfields['confdate'] = "ldsconfdate";
< 	$dfields['confplace'] = "ldsconfplace";
< 	$dfields['initdate'] = "ldsinitdate";
< 	$dfields['initplace'] = "ldsinitplace";
< 	$dfields['endldate'] = "ldsendldate";
< 	$dfields['endlplace'] = "ldsendlplace";
< 	$dfields['ssealdate'] = "ldssealsdate";
< 	$dfields['ssealplace'] = "ldssealsplace";
< 	$dfields['psealdate'] = "ldssealpdate";
< 	$dfields['psealplace'] = "ldssealpplace";
< }
< 
< $cfields = array();
< $cfields['personID'] = "personid";
< $cfields['firstname'] = "firstname";
< $cfields['lastname'] = "lastname";
< $cfields['lnprefix'] = "lnprefix";
< $cfields['nickname'] = "nickname";
< $cfields['monthonly'] = "monthonlyfrom";
< $cfields['yearonly'] = "yearonlyfrom";
< $cfields['dayonly'] = "dayonlyfrom";
< $cfields['desc'] = "desc";
< $cfields['birthdate'] = "birthdate";
< $cfields['birthdatetr'] = "birthdatetr";
< $cfields['birthplace'] = "birthplace";
< if(!$tngconfig['hidechr']) {
< 	$cfields['altbirthdate'] = "chrdate";
< 	$cfields['altbirthdatetr'] = "chrdatetr";
< 	$cfields['altbirthplace'] = "chrplace";
< }
< $cfields['marrdate'] = "marriagedate";
< $cfields['marrdatetr'] = "marriagedatetr";
< $cfields['marrplace'] = "marriageplace";
< $cfields['divdate'] = "divdate";
< $cfields['divdatetr'] = "divdatetr";
< $cfields['divplace'] = "divplace";
< $cfields['deathdate'] = "deathdate";
< $cfields['deathdatetr'] = "deathdatetr";
< $cfields['deathplace'] = "deathplace";
< $cfields['burialdate'] = "burialdate";
< $cfields['burialdatetr'] = "burialdatetr";
< $cfields['burialplace'] = "burialplace";
< $cfields['changedate'] = "lastmodified";
< $cfields['sex'] = "sex";
< $cfields['title'] = "title";
< $cfields['prefix'] = "prefix";
< $cfields['suffix'] = "suffix";
< $cfields['gedcom'] = "tree";
< if( $allow_lds ) {
< 	$cfields['baptdate'] = "ldsbapldate";
< 	$cfields['baptdatetr'] = "ldsbapldatetr";
< 	$cfields['baptplace'] = "ldsbaplplace";
< 	$cfields['confdate'] = "ldsconfdate";
< 	$cfields['confdatetr'] = "ldsconfdatetr";
< 	$cfields['confplace'] = "ldsconfplace";
< 	$cfields['initdate'] = "ldsinitdate";
< 	$cfields['inittdatetr'] = "ldsinitdatetr";
< 	$cfields['initplace'] = "ldsinitplace";
< 	$cfields['endldate'] = "ldsendldate";
< 	$cfields['endldatetr'] = "ldsendldatetr";
< 	$cfields['endlplace'] = "ldsendlplace";
< 	$cfields['ssealdate'] = "ldssealsdate";
< 	$cfields['ssealdatetr'] = "ldssealsdatetr";
< 	$cfields['ssealplace'] = "ldssealsplace";
< 	$cfields['psealdate'] = "ldssealpdate";
< 	$cfields['psealdatetr'] = "ldssealpdatetr";
< 	$cfields['psealplace'] = "ldssealpplace";
< }
< 
< $ofields = array();
< $ofields['contains'] = "contains";
< $ofields['starts with'] = "startswith";
< $ofields['ends with'] = "endswith";
< $ofields['OR'] = "text_or";
< $ofields['AND'] = "text_and";
< $ofields['currmonth'] = "currentmonth";
< $ofields['currmonthnum'] = "currentmonthnum";
< $ofields['curryear'] = "currentyear";
< $ofields['currday'] = "currentday";
< $ofields['today'] = "today";
< $ofields['to_days'] = "convtodays";
< 
< $subtypes = array();
< $subtypes['dt'] = $admtext['rptdate'];
< $subtypes['tr'] = $admtext['rptdatetr'];
< $subtypes['pl'] = $admtext['place'];
< $subtypes['fa'] = $admtext['fact'];
---
> include("micro_reports.php");
152d31
< $flags['tabs'] = $tngconfig['tabs'];
164c43
< 	else if( document.form1.displayfields.options.length == 0 && document.form1.sqlselect.value.length == 0 ) {
---
> 	else if( jQuery('#displayfields li').length == 0 && document.form1.sqlselect.value.length == 0 ) {
174,175d52
< <body background="img/background.gif">
< 
176a54,55
> 	echo tng_adminlayout();
> 
184,186c63,64
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
189,197c67,74
< 	<tr><td><span class="normal"><?php echo $admtext['reportname']; ?>:</span></td><td><input type="text" name="reportname" size="50" maxlength="80"></td></tr>
< 	<tr><td valign="top"><span class="normal"><?php echo $admtext['description']; ?>:</span></td><td><textarea cols="50" rows="3" name="reportdesc"></textarea></td></tr>
< 	<tr><td valign="top"><span class="normal"><?php echo $admtext['rankpriority']; ?>:</span></td><td><input type="text" name="rank" size="3" maxlength="3" value="1"></td></tr>
< 	<tr><td valign="top"><span class="normal"><?php echo $admtext['active']; ?>:</span></td><td><span class="normal"><input type="radio" name="active" value="1"> <?php echo $admtext['yes']; ?> &nbsp; <input type="radio" name="active" value="0" checked> <?php echo $admtext['no']; ?></span></td></tr>
< 	<tr><td valign="top" colspan="2"><span class="normal"><br/>
< 	<img src="img/tng_right.gif" width="17" height="15" border="0" align="middle"> = <?php echo $admtext['add']; ?> &nbsp;&nbsp;
< 	<img src="img/tng_left.gif" width="17" height="15" border="0" align="middle"> = <?php echo $admtext['remove']; ?> &nbsp;&nbsp;
< 	<img src="img/tng_up.gif" width="17" height="15" border="0" align="middle"> = <?php echo $admtext['moveup']; ?> &nbsp;&nbsp;
< 	<img src="img/tng_down.gif" width="17" height="15" border="0" align="middle"> = <?php echo $admtext['movedown']; ?> &nbsp;&nbsp;</span><br/><br/>
---
> 		<tr><td><span class="normal"><?php echo $admtext['reportname']; ?>:</span></td><td><input type="text" name="reportname" size="50" maxlength="80"></td></tr>
> 		<tr><td valign="top"><span class="normal"><?php echo $admtext['description']; ?>:</span></td><td><textarea cols="50" rows="3" name="reportdesc"></textarea></td></tr>
> 		<tr><td valign="top"><span class="normal"><?php echo $admtext['rankpriority']; ?>:</span></td><td><input type="text" name="ranking" size="3" maxlength="3" value="1"></td></tr>
> 		<tr><td valign="top"><span class="normal"><?php echo $admtext['active']; ?>:</span></td><td><span class="normal"><input type="radio" name="active" value="1"> <?php echo $admtext['yes']; ?> &nbsp; <input type="radio" name="active" value="0" checked> <?php echo $admtext['no']; ?></span></td></tr>
> 	</table>
> 	<table>
> 	<tr><td valign="top" colspan="2">
> 	<p class="normal"><em><?php echo $admtext['instr']; ?></em></p>
203c80,81
< 						<select name="availfields" size="15" class="reportcol" onDblClick="AddtoDisplay(document.form1.availfields,document.form1.displayfields);">
---
> 						<div class="reportbox">
> 							<ul id="displayavail" class="reportcol" style="height: 300px">
205,213c83,91
< 						foreach( $dfields as $key=>$value )
< 							echo "<option value=\"$key\">{$admtext[$value]}</option>\n";
< 						//now do custom event types
< 						foreach( $cetypes as $cerow ) {
< 							$displaymsg = getEventDisplay( $cerow['display'] );
< 							echo "<option value=\"ce_dt_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdate']}</option>\n";
< 							echo "<option value=\"ce_pl_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['place']}</option>\n";
< 							echo "<option value=\"ce_fa_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['fact']}</option>\n";
< 						}
---
> 							foreach( $dfields as $key=>$value )
> 								echo "<li ondblclick=\"add_to_list(this,'displayfields');\">{$admtext[$value]}<span class=\"hidden\">$key</span></li>\n";
> 							//now do custom event types
> 							foreach( $cetypes as $cerow ) {
> 								$displaymsg = getEventDisplay( $cerow['display'] );
> 								echo "<li ondblclick=\"add_to_list(this,'displayfields');\">$displaymsg: {$admtext['rptdate']}<span class=\"hidden\">ce_dt_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'displayfields');\">$displaymsg: {$admtext['place']}<span class=\"hidden\">ce_pl_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'displayfields');\">$displaymsg: {$admtext['fact']}<span class=\"hidden\">ce_fa_{$cerow['eventtypeID']}</span></li>\n";
> 							}
215,219c93,94
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:AddtoDisplay(document.form1.availfields,document.form1.displayfields);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.displayfields);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							</ul>
> 						</div>
222,228c97,100
< 						<select name="displayfields" size="15" class="reportcol" onDblClick="RemovefromDisplay(document.form1.displayfields);">
< 						</select><br/><br/>
< 					</td>
< 					<td>
< 						&nbsp;&nbsp;&nbsp;<a href="javascript:Move(document.form1.displayfields,1);"><img src="img/tng_up.gif" alt="<?php echo $admtext['moveup']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;&nbsp;&nbsp;<a href="javascript:RemovefromDisplay(document.form1.displayfields);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;&nbsp;&nbsp;<a href="javascript:Move(document.form1.displayfields,0);"><img src="img/tng_down.gif" alt="<?php echo $admtext['movedown']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
---
> 						<div class="reportbox">
> 							<ul id="displayfields" class="reportcol" style="height: 300px">
> 							</ul>
> 						</div>
239c111,112
< 						<select name="availcriteria" size="12" class="reportcol" onDblClick="AddtoDisplay(document.form1.availcriteria,document.form1.finalcriteria);">
---
> 						<div class="reportbox">
> 							<ul id="availcriteria" class="reportcol" style="height: 250px">
241,257c114,130
< 						foreach( $cfields as $key=>$value ) {
< 							if( $key != "desc" )
< 								echo "<option value=\"$key\">{$admtext[$value]}</option>\n";
< 						}
< 						echo "<option value=\"living\">{$admtext['livingtrue']}</option>\n";
< 						echo "<option value=\"dead\">{$admtext['livingfalse']}</option>\n";
< 						echo "<option value=\"private\">{$admtext['privatetrue']}</option>\n";
< 						echo "<option value=\"open\">{$admtext['privatefalse']}</option>\n";
< 
< 						//now do custom event types, prefix with "ce_"
< 						foreach( $cetypes as $cerow ) {
< 							$displaymsg = getEventDisplay( $cerow['display'] );
< 							echo "<option value=\"ce_dt_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdate']}</option>\n";
< 							echo "<option value=\"ce_tr_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdatetr']}</option>\n";
< 							echo "<option value=\"ce_pl_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['place']}</option>\n";
< 							echo "<option value=\"ce_fa_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['fact']}</option>\n";
< 						}
---
> 							foreach( $cfields as $key=>$value ) {
> 								if( $key != "desc" )
> 									echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">" . $admtext[$value] . "<span class=\"hidden\">$key</span></li>\n";
> 							}
> 							echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext['livingtrue']}<span class=\"hidden\">living</span></li>\n";
> 							echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext['livingfalse']}<span class=\"hidden\">dead</span></li>\n";
> 							echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext['privatetrue']}<span class=\"hidden\">private</span></li>\n";
> 							echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext['privatefalse']}<span class=\"hidden\">open</span></li>\n";
> 
> 							//now do custom event types, prefix with "ce_"
> 							foreach( $cetypes as $cerow ) {
> 								$displaymsg = getEventDisplay( $cerow['display'] );
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">$displaymsg: {$admtext['rptdate']}<span class=\"hidden\">ce_dt_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">$displaymsg: {$admtext['rptdatetr']}<span class=\"hidden\">ce_tr_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">$displaymsg: {$admtext['place']}<span class=\"hidden\">ce_pl_{$cerow['eventtypeID']}</span></li>\n";
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">$displaymsg: {$admtext['fact']}<span class=\"hidden\">ce_fa_{$cerow['eventtypeID']}</span></li>\n";
> 							}
259,263c132,133
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:AddtoDisplay(document.form1.availcriteria,document.form1.finalcriteria);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.finalcriteria);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							</ul>
> 						</div>
266,272c136,139
< 						<select name="finalcriteria" size="28" class="reportcol" onDblClick="RemovefromDisplay(document.form1.finalcriteria);">
< 						</select>
< 					</td>
< 					<td width="40" align="center" rowspan="4">
< 						&nbsp;<a href="javascript:Move(document.form1.finalcriteria,1);"><img src="img/tng_up.gif" alt="<?php echo $admtext['moveup']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.finalcriteria);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:Move(document.form1.finalcriteria,0);"><img src="img/tng_down.gif" alt="<?php echo $admtext['movedown']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/><br/><br/><br/><br/><br/><br/>
---
> 						<div class="reportbox">
> 							<ul id="finalcriteria" class="reportcol" style="height: 610px">
> 							</ul>
> 						</div>
277,284c144,152
< 						<span class="normal"><?php echo $admtext['operators']; ?>:<br/></span>
< 						<select name="availoperators" size="8" class="reportcol" onDblClick="AddtoDisplay(document.form1.availoperators,document.form1.finalcriteria);">
< 							<option value="eq">=</option>
< 							<option value="neq">!=</option>
< 							<option value="gt">&gt;</option>
< 							<option value="gte">&gt;=</option>
< 							<option value="lt">&lt;</option>
< 							<option value="lte">&lt;=</option>
---
> 						<span class="normal indent-tiny"><?php echo $admtext['operators']; ?>:<br/></span>
> 						<div class="reportbox">
> 							<ul id="availoperators" class="reportcol" style="height: 200px">
> 								<li ondblclick="add_to_list(this,'finalcriteria');">=<span class="hidden">eq</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">!=<span class="hidden">neq</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">&gt;<span class="hidden">gt</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">&gt;=<span class="hidden">gte</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">&lt;<span class="hidden">lt</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">&lt;=<span class="hidden">lte</span></li>
286,296c154,162
< 						foreach( $ofields as $key=>$value )
< 							echo "<option value=\"$key\">{$admtext[$value]}</option>\n";
< ?>						
< 							<option value="(">(</option>
< 							<option value=")">)</option>
< 							<option value="+">+</option>
< 							<option value="-">-</option>
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:AddtoDisplay(document.form1.availoperators,document.form1.finalcriteria);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							foreach( $ofields as $key=>$value )
> 								echo "<li ondblclick=\"add_to_list(this,'finalcriteria');\">{$admtext[$value]}<span class=\"hidden\">$key</span></li>\n";
> 	?>						
> 								<li ondblclick="add_to_list(this,'finalcriteria');">(<span class="hidden">(</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">)<span class="hidden">)</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">+<span class="hidden">+</span></li>
> 								<li ondblclick="add_to_list(this,'finalcriteria');">-<span class="hidden">-</span></li>
> 							</ul>
> 						</div>
301,305c167,169
< 						<span class="normal"><?php echo $admtext['constantstring']; ?>:*<br/></span>
< 						<input type="text" name="constantstring" size="20">
< 					</td>
< 					<td width="40" align="center"><br/>
< 						&nbsp;<a href="javascript:AddConstant(document.form1.constantstring,document.form1.finalcriteria,1);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 						<span class="normal indent-tiny"><?php echo $admtext['constantstring']; ?>:*<br/></span>
> 						<input type="text" name="constantstring" class="medfield" onkeypress="return handleKey(event, 1);">&nbsp;
> 						<input type="button" value=">>" style="font-size: 11pt" onclick="AddConstant(document.form1.constantstring,1);"/>
310,314c174,176
< 						<span class="normal"><?php echo $admtext['constantvalue']; ?>:<br/></span>
< 						<input type="text" name="constantvalue" size="20">
< 					</td>
< 					<td width="40" align="center"><br/>
< 						&nbsp;<a href="javascript:AddConstant(document.form1.constantvalue,document.form1.finalcriteria,0);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 						<span class="normal indent-tiny"><?php echo $admtext['constantvalue']; ?>:<br/></span>
> 						<input type="text" name="constantvalue" class="medfield" onkeypress="return handleKey(event, 0);">&nbsp;
> 						<input type="button" value=">>" style="font-size: 11pt" onclick="AddConstant(document.form1.constantvalue,0);"/>
318c180
< 			<span class="normal">*<?php echo $admtext['foremptystring']; ?></span>
---
> 			<span class="normal indent-tiny">*<?php echo $admtext['foremptystring']; ?></span>
326c188,189
< 						<select name="availsort" size="10" class="reportcol" onDblClick="AddtoDisplay(document.form1.availsort,document.form1.finalsort);">
---
> 						<div class="reportbox">
> 							<ul id="availsort" class="reportcol" style="height: 250px">
328,337c191,200
< 						foreach( $cfields as $key=>$value )
< 							echo "<option value=\"$key\">{$admtext[$value]}</option>\n";
< 						//now do custom event types, prefix with "ce_"
< 						foreach( $cetypes as $cerow ) {
< 							$displaymsg = getEventDisplay( $cerow['display'] );
< 							echo "<option value=\"ce_dt_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdate']}</option>\n";
< 							echo "<option value=\"ce_tr_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['rptdatetr']}</option>\n";
< 							echo "<option value=\"ce_pl_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['place']}</option>\n";
< 							echo "<option value=\"ce_fa_{$cerow['eventtypeID']}\">$displaymsg: {$admtext['fact']}</option>\n";
< 						}
---
> 								foreach( $cfields as $key=>$value )
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">{$admtext[$value]}<span class=\"hidden\">$key</span></li>\n";
> 								//now do custom event types, prefix with "ce_"
> 								foreach( $cetypes as $cerow ) {
> 									$displaymsg = getEventDisplay( $cerow['display'] );
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">$displaymsg: {$admtext['rptdate']}<span class=\"hidden\">ce_dt_{$cerow['eventtypeID']}</span></li>\n";
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">$displaymsg: {$admtext['rptdatetr']}<span class=\"hidden\">ce_tr_{$cerow['eventtypeID']}</span></li>\n";
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">$displaymsg: {$admtext['place']}<span class=\"hidden\">ce_pl_{$cerow['eventtypeID']}</span></li>\n";
> 									echo "<li ondblclick=\"add_to_list(this,'finalsort');\">$displaymsg: {$admtext['fact']}<span class=\"hidden\">ce_fa_{$cerow['eventtypeID']}</span></li>\n";
> 								}
339,343c202,203
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:AddtoDisplay(document.form1.availsort,document.form1.finalsort);"><img src="img/tng_right.gif" alt="<?php echo $admtext['add']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.finalsort);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 							</ul>
> 						</div>
346,352c206,209
< 						<select name="finalsort" size="10" class="reportcol" onDblClick="RemovefromDisplay(document.form1.finalsort);">
< 						</select>
< 					</td>
< 					<td width="40" align="center">
< 						&nbsp;<a href="javascript:Move(document.form1.finalsort,1);"><img src="img/tng_up.gif" alt="<?php echo $admtext['moveup']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:RemovefromDisplay(document.form1.finalsort);"><img src="img/tng_left.gif" alt="<?php echo $admtext['remove']; ?>" width="17" height="15" border="0"></a>&nbsp;<br/><br/>
< 						&nbsp;<a href="javascript:Move(document.form1.finalsort,0);"><img src="img/tng_down.gif" alt="<?php echo $admtext['movedown']; ?>" width="17" height="15" border="0"></a>&nbsp;
---
> 						<div class="reportbox">
> 							<ul id="finalsort" class="reportcol" style="height: 250px">
> 							</ul>
> 						</div>
359c216
< 	<tr><td valign="top" colspan="2"><textarea cols="60" rows="4" name="sqlselect"></textarea></td></tr>
---
> 	<tr><td valign="top" colspan="2"><textarea cols="100" rows="10" name="sqlselect"></textarea></td></tr>
364,365c221,223
< 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['savereport']; ?>">
< 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveexit']; ?>">
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_reports.php';">
367,374c225,229
< </td>
< </tr>
< 
< </table>
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newsource.php TNG1403/admin_newsource.php
29d28
< $flags['tabs'] = $tngconfig['tabs'];
33c32
< <script language="javascript" type="text/javascript">
---
> <script type="text/javascript">
49,50d47
< <body background="img/background.gif" onload="generateID('source',document.form1.sourceID,document.form1.tree1);">
< 
51a49,50
> 	echo tng_adminlayout(" onload=\"generateID('source',document.form1.sourceID,document.form1.tree1);\"");
> 
59a59
> <div class="admin-main">
61,63c61,63
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
65d64
< 	<tr><td colspan="2"><strong><?php echo $admtext['prefixsourceid']; ?></strong></td></tr>
98,99c97,98
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
105,106c104,105
< <tr class="databack">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
108a108
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_sources.php';">
113,116c113,116
< 
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newtlevent.php TNG1403/admin_newtlevent.php
20d19
< $flags['tabs'] = $tngconfig['tabs'];
51,52d49
< <body background="img/background.gif">
< 
53a51,52
> 	echo tng_adminlayout();
> 
61,63c60,63
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
118,120c118,121
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_newtree.php TNG1403/admin_newtree.php
19a20,34
> if( !isset($beforeimport) ) $beforeimport = "";
> if( !isset($treename) ) $treename = "";
> if( !isset($description) ) $description = "";
> if( !isset($owner) ) $owner = "";
> if( !isset($email) ) $email = "";
> if( !isset($address) ) $address = "";
> if( !isset($city) ) $city = "";
> if( !isset($state) ) $state = "";
> if( !isset($zip) ) $zip = "";
> if( !isset($country) ) $country = "";
> if( !isset($phone) ) $phone = "";
> if( !isset($private) ) $private = "";
> if( !isset($disallowgedcreate) ) $disallowgedcreate = "";
> if( !isset($disallowpdf) ) $disallowpdf = "";
> 
29,30c44
< 	$flags['tabs'] = $tngconfig['tabs'];
< 	tng_adminheader( $admtext['addnewtree'], $flags );
---
> 		tng_adminheader( $admtext['addnewtree'], $flags );
57,58d70
< <body background="img/background.gif">
< 
59a72,73
> 	echo tng_adminlayout();
> 
69,71c83,97
< <table<?php if(!$beforeimport) echo " width=\"100%\""; ?> border="0" cellpadding="10" cellspacing="2"<?php if(!$beforeimport) echo " class=\"lightback\""; ?>>
< <tr class="databack">
< <td<?php if(!$beforeimport) echo " class=\"tngshadow\""; ?>>
---
> <?php
> 	if(!$beforeimport) {
> ?>
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <?php
> 	}
> 	else {
> ?>
> <table border="0" cellpadding="10" cellspacing="2">
> <?php
> 	}
> ?>
> <tr>
> <td class="<?php if(!$beforeimport) echo "tngshadow "; ?>databack">
92c118,132
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>"> <span id="treemsg" class="normal msgapproved"></span>
---
> <?php
> 	if($beforeimport) {
> 		$close_command = "jQuery('#LB_close').click();";
> ?>
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
> <?php
> 	} else {
> 		$close_command = "window.location.href='admin_trees.php';";
> ?>
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> <?php
> 	}
> ?>
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="<?php echo $close_command; ?>">
97a138
> </div>
99,107c140,141
< if($beforeimport)
< 	echo "</div>";
< else {
< 	echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; 
< ?>
< </body>
< </html>
< <?php
< }
---
> 	if(!$beforeimport)
> 		echo tng_adminfooter();
diff -r TNG/admin_newuser.php TNG1403/admin_newuser.php
33d32
< $flags['tabs'] = $tngconfig['tabs'];
60c59
< 	else if( form.email.value.length != 0 && !checkEmail(form.email.value)) {
---
> 	else if( form.email.value.length == 0 || !checkEmail(form.email.value)) {
80,81d78
< <body background="img/background.gif">
< 
82a80,81
> 	echo tng_adminlayout();
> 
92,94c91,94
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
109c109
< 		<tr><td><?php echo $admtext['website']; ?>:</td><td><input type="text" name="website" size="50" maxlength="128" value="http://"></td></tr>
---
> 		<tr><td><?php echo $admtext['website']; ?>:</td><td><input type="text" name="website" size="50" maxlength="128" value="https://"></td></tr>
234a235
> 		<input type="checkbox" name="form_allow_private_notes" value="1"<?php if( !$row['ucount'] ) echo " checked"; ?>> <?php echo $admtext['allow_private_notes']; ?><br/>
269,271d269
< 		$query = "SELECT branch, gedcom, description FROM $branches_table WHERE gedcom = \"{$row['gedcom']}\" ORDER BY description";
< 		$branchresult = tng_query($query);
< 		
274,278d271
< 		if( $assignedtree ) {
< 			while( $branch = tng_fetch_assoc( $branchresult ) ) {
< 				echo  "	<option value=\"{$branch['branch']}\">{$branch['description']}</option>\n";
< 			}
< 		}
299c292
< 		echo "<b>{$text['firstuser']}</b><input type=\"hidden\" name=\"gedcom\" value=\"\"><input type=\"hidden\" name=\"branch\" value=\"\">";
---
> 		echo "<b>{$admtext['firstuser']}</b><input type=\"hidden\" name=\"gedcom\" value=\"\"><input type=\"hidden\" name=\"branch\" value=\"\">";
306c299,302
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>"></form><br/>
---
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_users.php';">
> 	</form>
317a314
> </div>
322c319
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
333,335c330,331
< echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_notelist.php TNG1403/admin_notelist.php
13d12
< $orgtree = $tree;
16,21c15,17
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = stripslashes(preg_replace("/\"/", "&#34;",$searchstring));
< 	$searchstring = addslashes($searchstring);
< }
< else
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> $searchstring_noquotes = isset($searchstring) ? stripslashes(preg_replace("/\"/", "&#34;",$searchstring)) : "";
> $searchstring = isset($searchstring) ? addslashes($searchstring) : "";
> if(!isset($private)) $private = "";
23,24c19
< 
< if( $newsearch ) {
---
> if( !empty($newsearch) ) {
32,33c27,28
< 	if( !$searchstring ) {
< 		$searchstring_noquotes = $_COOKIE['tng_search_notes_post']['search'];
---
> 	if( empty($searchstring) ) {
> 		$searchstring_noquotes = isset($_COOKIE['tng_search_notes_post']['search']) ? $_COOKIE['tng_search_notes_post']['search'] : "";
36,39c31,34
< 	if( !$private )
< 		$private = $_COOKIE['tng_search_notes_post']['private'];
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_tree'];
---
> 	if( $allow_private_notes && empty($private) )
> 		$private = isset($_COOKIE['tng_search_notes_post']['private']) ? $_COOKIE['tng_search_notes_post']['private'] : "";
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "";
41,42c36,37
< 		$tngpage = $_COOKIE['tng_search_notes_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_notes_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_notes_post']['tngpage']) ? $_COOKIE['tng_search_notes_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_notes_post']['offset']) ? $_COOKIE['tng_search_notes_post']['offset'] : 0;
44a40
> 		if( !isset($tngpage) ) $tngpage = 1;
49a46
> if(!isset($offset)) $offset = 0;
73,74c70,76
< if( $private )
< 	$wherestr .= " AND $notelinks_table.secret != 0";
---
> if($allow_private_notes) {
> 	if( !isset($private) ) $private = "";
> 	if( $private == "yes" )
> 		$wherestr .= " AND $notelinks_table.secret != 0";
> }
> else
> 	$wherestr .= " AND $notelinks_table.secret != 1";
78c80
< 	$wherestr .= " ($xnotes_table.note LIKE '%".$searchstring."%')";
---
> 	$wherestr .= " ($xnotes_table.note LIKE \"%".$searchstring."%\")";
81c83
< $query = "SELECT $xnotes_table.ID as ID, $xnotes_table.note as note, $xnotes_table.gedcom as gedcom
---
> $query = "SELECT $xnotes_table.ID as ID, $xnotes_table.note as note, $notelinks_table.persfamID as personID, $xnotes_table.gedcom as gedcom, secret
99d100
< $flags['tabs'] = $tngconfig['tabs'];
120a122
> 	document.form1.private.value='';
126,127d127
< <body background="img/background.gif">
< 
128a129,130
> 	echo tng_adminlayout();
> 
135,138c137,138
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
164a165,167
> <?php
> 	if($allow_private_notes) {
> ?>
167a171,173
> <?php
> 	}
> ?>
187c193
<   		<input type="submit" name="xnoteaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
>   		<input type="submit" name="xnoteaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
193c199
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
221c227
< 		while( $row = tng_fetch_assoc($result))
---
> 		while( $nrow = tng_fetch_assoc($result))
223,230c229
< 			$newactionstr = preg_replace( "/xxx/", $row['ID'], $actionstr );
< 			echo "<tr id=\"row_{$row['ID']}\"><td class=\"lightback\"><div class=\"action-btns2\">$newactionstr</div></td>\n";
< 			if($allow_delete)
< 				echo "<td class=\"lightback\" align=\"center\"><input type=\"checkbox\" name=\"del{$row['ID']}\" value=\"1\"></td>";
< 
< 			$query = "SELECT $notelinks_table.ID, $notelinks_table.persfamID as personID, $notelinks_table.gedcom, secret
< 				FROM $notelinks_table
< 				WHERE $notelinks_table.xnoteID = \"{$row['ID']}\" ";
---
> 			$noneliving = $noneprivate = $noneprivatenotes = 1;
232d230
< 			$nresult = tng_query($query);
234,238c232,244
< 			while( $nrow = tng_fetch_assoc( $nresult ) ) {
< 				$treetext="";
< 				if(!$tree) {
< 					$query = "SELECT treename FROM " . $trees_table . " WHERE gedcom = \"{$nrow['gedcom']}\"";
< 					$result2 = tng_query($query);
---
> 			$treetext="";
> 			if(!$tree) {
> 				$query = "SELECT treename FROM " . $trees_table . " WHERE gedcom = \"{$nrow['gedcom']}\"";
> 				$result2 = tng_query($query);
> 				$row2 = tng_fetch_assoc($result2);
> 				$treetext = "<td valign='top' class='lightback'>".$row2['treename']."</td>";
> 				tng_free_result($result2);
> 			}
> 
> 			if(!$notelinktext) {
> 				$query = "SELECT * FROM $people_table WHERE personID = \"{$nrow['personID']}\" AND gedcom = \"{$nrow['gedcom']}\"";
> 				$result2 = tng_query($query);
> 				if(tng_num_rows($result2) == 1) {
240c246,257
< 					$treetext = "<td valign='top' class='lightback'>".$row2['treename']."</td>";
---
> 					$note_righttree = checktree($row2['gedcom']);
> 					$note_rightbranch = $note_righttree ? checkbranch($row2['branch']) : false;
> 					$nrights = determineLivingPrivateRights($row2, $note_righttree, $note_rightbranch);
> 					$row2['allow_living']  = $nrights['living'];
> 					$row2['allow_private'] = $nrights['private'];
> 					$row2['allow_private_notes'] = $nrights['private_notes'];
> 
> 					if(!$row2['allow_living']) $noneliving = 0;
> 					if(!$row2['allow_private']) $noneprivate = 0;
> 					if(!$row2['allow_private_notes'] && $nrow['secret'] == 1) $noneprivatenotes = 0;
> 
> 					$notelinktext .= "<li><a href=\"getperson.php?personID={$row2['personID']}&amp;tree={$row2['gedcom']}\" target='_blank'>" . getNameRev($row2) . "</a> ({$row2['personID']})</li>\n";
242a260
> 			}
244,255c262,276
< 				if(!$notelinktext) {
< 					$query = "SELECT * FROM $people_table WHERE personID = \"{$nrow['personID']}\" AND gedcom = \"{$nrow['gedcom']}\"";
< 					$result2 = tng_query($query);
< 					if(tng_num_rows($result2) == 1) {
< 						$row2 = tng_fetch_assoc($result2);
< 						$nrights = determineLivingPrivateRights($row2);
< 						$row2['allow_living']  = $nrights['living'];
< 						$row2['allow_private'] = $nrights['private'];
< 						$notelinktext .= "<li><a href=\"getperson.php?personID={$row2['personID']}&tree={$row2['gedcom']}\" target='_blank'>" . getNameRev($row2) . " ({$row2['personID']})</a></li>\n";
< 						tng_free_result($result2);
< 					}
< 				}
---
> 			if(!$notelinktext) {
> 				$query = "SELECT * FROM $families_table WHERE familyID = \"{$nrow['personID']}\" AND gedcom = \"{$nrow['gedcom']}\"";
> 				$result2 = tng_query($query);
> 				if(tng_num_rows($result2) == 1) {
> 					$row2 = tng_fetch_assoc($result2);
> 					$note_righttree = checktree($row2['gedcom']);
> 					$note_rightbranch = $note_righttree ? checkbranch($row2['branch']) : false;
> 					$nrights = determineLivingPrivateRights($row2, $note_righttree, $note_rightbranch);
> 					$row2['allow_living']  = $nrights['living'];
> 					$row2['allow_private'] = $nrights['private'];
> 					$row2['allow_private_notes'] = $nrights['private_notes'];
> 
> 					if(!$row2['allow_living']) $noneliving = 0;
> 					if(!$row2['allow_private']) $noneprivate = 0;
> 					if(!$row2['allow_private_notes'] && $nrow['secret'] == 1) $noneprivatenotes = 0;
257,267c278,279
< 				if(!$notelinktext) {
< 					$query = "SELECT * FROM $families_table WHERE familyID = \"{$nrow['personID']}\" AND gedcom = \"{$nrow['gedcom']}\"";
< 					$result2 = tng_query($query);
< 					if(tng_num_rows($result2) == 1) {
< 						$row2 = tng_fetch_assoc($result2);
< 						$nrights = determineLivingPrivateRights($row2);
< 						$row2['allow_living']  = $nrights['living'];
< 						$row2['allow_private'] = $nrights['private'];
< 						$notelinktext .= "<li><a href=\"familygroup.php?familyID={$row2['familyID']}&tree={$nrow['gedcom']}\" target='_blank'>{$admtext['family']} {$row2['familyID']}</a></li>\n";
< 						tng_free_result($result2);
< 					}
---
> 					$notelinktext .= "<li><a href=\"familygroup.php?familyID={$row2['familyID']}&amp;tree={$nrow['gedcom']}\" target='_blank'>{$admtext['family']}</a> ({$row2['familyID']})</li>\n";
> 					tng_free_result($result2);
268a281
> 			}
270,277c283,289
< 				if(!$notelinktext) {
< 					$query = "SELECT * FROM $sources_table WHERE sourceID = \"{$nrow['personID']}\" AND gedcom = \"{$nrow['gedcom']}\"";
< 					$result2 = tng_query($query);
< 					if(tng_num_rows($result2) == 1) {
< 						$row2 = tng_fetch_assoc($result2);
< 						$notelinktext .= "<li><a href=\"showsource.php?sourceID={$row2['sourceID']}&tree={$row2['gedcom']}\" target='_blank'>{$admtext['source']} $sourcetext ({$row2['sourceID']})</a></li>\n";
< 						tng_free_result($result2);
< 					}
---
> 			if(!$notelinktext) {
> 				$query = "SELECT * FROM $sources_table WHERE sourceID = \"{$nrow['personID']}\" AND gedcom = \"{$nrow['gedcom']}\"";
> 				$result2 = tng_query($query);
> 				if(tng_num_rows($result2) == 1) {
> 					$row2 = tng_fetch_assoc($result2);
> 					$notelinktext .= "<li><a href=\"showsource.php?sourceID={$row2['sourceID']}&amp;tree={$row2['gedcom']}\" target='_blank'>{$admtext['source']} ({$row2['sourceID']})</a></li>\n";
> 					tng_free_result($result2);
278a291
> 			}
280,287c293,299
< 				if(!$notelinktext) {
< 					$query = "SELECT * FROM $repositories_table WHERE repoID = \"{$nrow['personID']}\" AND gedcom = \"{$nrow['gedcom']}\"";
< 					$result2 = tng_query($query);
< 					if(tng_num_rows($result2) == 1) {
< 						$row2 = tng_fetch_assoc($result2);
< 						$notelinktext .= "<li><a href=\"showrepo.php?repoID={$row2['repoID']}&tree={$row2['gedcom']}\" target='_blank'>{$admtext['repository']} $sourcetext ({$row2['repoID']})</a></li>\n";
< 						tng_free_result($result2);
< 					}
---
> 			if(!$notelinktext) {
> 				$query = "SELECT * FROM $repositories_table WHERE repoID = \"{$nrow['personID']}\" AND gedcom = \"{$nrow['gedcom']}\"";
> 				$result2 = tng_query($query);
> 				if(tng_num_rows($result2) == 1) {
> 					$row2 = tng_fetch_assoc($result2);
> 					$notelinktext .= "<li><a href=\"showrepo.php?repoID={$row2['repoID']}&amp;tree={$row2['gedcom']}\" target='_blank'>{$admtext['repository']} ({$row2['repoID']})</a></li>\n";
> 					tng_free_result($result2);
290d301
< 			tng_free_result( $nresult );
292,293c303,307
< 			if( ($allow_edit && !$assignedtree) || !$row['secret'] ) {
< 				$notetext = cleanIt($row['note']);
---
> 			if( $noneliving && $noneprivate && $noneprivatenotes ) {
> 				$newactionstr = preg_replace( "/xxx/", $nrow['ID'], $actionstr );
> 				echo "<tr id=\"row_{$nrow['ID']}\"><td class=\"lightback\"><div class=\"action-btns2\">$newactionstr</div></td>\n";
> 				$delcheckbox = $allow_delete ? "<input type=\"checkbox\" name=\"del{$nrow['ID']}\" value=\"1\">" : "";
> 				$notetext = cleanIt($nrow['note']);
297c311,313
< 			else
---
> 			else {
> 				echo "<tr id=\"row_{$nrow['ID']}\"><td class=\"lightback\"><div class=\"action-btns2\"></div></td>\n";
> 				$delcheckbox = "";
298a315,322
> 				if(!$noneprivatenotes || !$noneprivate) {
> 					$notetext = $notelinktext = $admtext['text_private'];
> 				}
> 				elseif(!$noneliving)
> 					$notetext = $text['living'];
> 			}
> 			if($allow_delete)
> 				echo "<td class=\"lightback\" align=\"center\">$delcheckbox</td>";
316,321c340,343
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_notes.php TNG1403/admin_notes.php
7a8
> $admin_login = 1;
16c17
< if( $eventtype['display'] ) {
---
> if(!empty($eventtype['display'])) {
32c33
< elseif( $eventtype['tag'] )
---
> elseif(!empty($eventtype['tag']))
44a46
> $wherestr = !$allow_private_notes ? " AND $notelinks_table.secret != \"1\"" : "";
47c49
<         AND persfamID=\"$persfamID\" AND $notelinks_table.gedcom =\"$tree\" AND eventID = \"$eventID\" ORDER BY ordernum, ID";
---
>         AND persfamID=\"$persfamID\" AND $notelinks_table.gedcom =\"$tree\" AND eventID = \"$eventID\" $wherestr ORDER BY ordernum, ID";
85a88,89
> 			if($note['secret'])
> 				$note['note'] = "[{$admtext['private']}] " . $note['note'];
93c97
< 			echo "<td class=\"dragarea\"><img src=\"img/admArrowUp.gif\" alt=\"\"><br/><img src=\"img/admArrowDown.gif\" alt=\"\"></td>";
---
> 			echo "<td class=\"lightback dragarea\"><img src=\"img/admArrowUp.gif\" alt=\"\"><br/><img src=\"img/admArrowDown.gif\" alt=\"\"></td>";
116c120,123
< 	<td><textarea wrap cols="60" rows="25" name="note"></textarea></td></tr>
---
> 	<td><textarea wrap cols="60" rows="25" name="note" id="newnote"></textarea></td></tr>
> <?php
> 	if($allow_private_notes) {
> ?>
117a125,127
> <?php
> 	}
> ?>
diff -r TNG/admin_optimize.php TNG1403/admin_optimize.php
20c20
< 	$tablelist = array($cemeteries_table, $people_table, $families_table, $children_table, $languages_table, $places_table, $states_table,
---
> 	$tablelist = array($cemeteries_table, $people_table, $families_table, $children_table, $languages_table, $places_table, $states_table, $image_tags_table,
diff -r TNG/admin_orderalbumform.php TNG1403/admin_orderalbumform.php
28d27
< $flags['tabs'] = $tngconfig['tabs'];
39c38
< var resheremsg = '<span class="normal">' + "<?php echo $text['reshere']; ?>" + '</span>';;
---
> var resheremsg = '<span class="normal">' + '</span>'; //can't remember what this was supposed to be
64,65d62
< <body background="img/background.gif">
< 
66a64,65
> 	echo tng_adminlayout();
> 
75,77c74,75
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
93c91
< 		if( $treerow['gedcom'] == $tree ) echo " selected";
---
> 		if( !empty($tree) && $treerow['gedcom'] == $tree ) echo " selected";
109c107
< 			<td><input type="text" name="newlink1" id="newlink1" value="<?php echo $personID; ?>"></td>
---
> 			<td><input type="text" name="newlink1" id="newlink1" value="<?php if( isset($personID) ) echo $personID; ?>"></td>
117,123c115,119
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_orderalbums.php TNG1403/admin_orderalbums.php
19c19
< $eventID = $event1;
---
> $eventID = isset($event1) ? $event1 : "";
26c26
< 		$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, nameorder, branch FROM $people_table WHERE personID=\"$personID\" AND gedcom = \"$tree\"";
---
> 		$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, living, private, branch, gedcom FROM $people_table WHERE personID=\"$personID\" AND gedcom = \"$tree\"";
29c29,31
< 		$person['allow_living'] = 1;
---
> 		$rights = determineLivingPrivateRights($person);
> 		$person['allow_living'] = $rights['living'];
> 		$person['allow_private'] = $rights['private'];
70c72
< adminwritelog( "<a href=\"admin_ordermedia.php?personID=$personID&amp;tree=$tree\">$sortstr: $action</a>" );
---
> adminwritelog( "<a href=\"admin_ordermedia.php?personID=$personID&amp;tree=$tree\">$sortstr: $namestr</a>" );
79,80c81,82
< $thismediatypeID = $row['mediatypeID'];
< $usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$thismediatypeID] : $mediapath;
---
> $thismediatypeID = isset($row['mediatypeID']) ? $row['mediatypeID'] : "";
> $usefolder = isset($row['usecollfolder']) ? $mediatypes_assoc[$thismediatypeID] : $mediapath;
83c85
< if( $row['thumbpath'] )
---
> if( !empty($row['thumbpath']) )
116d117
< $flags['tabs'] = $tngconfig['tabs'];
120c121
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
122c123
< var album = "<?php echo $albumID; ?>";
---
> var album = "<?php if( isset($albumID) ) echo $albumID; ?>";
131,132d131
< <body background="img/background.gif" onload="startMediaSort()">
< 
133a133,134
> 	echo tng_adminlayout(" onload=\"startMediaSort()\"");
> 
162c163
< 		$usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
---
> 		$usefolder = !empty($row['usecollfolder']) ? $mediatypes_assoc[$mediatypeID] : $mediapath;
193c194
< 		$checked = $row['defphoto'] ? " checked" : "";
---
> 		$checked = !empty($row['defphoto']) ? " checked" : "";
209,211c210,212
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_ordermediaform.php TNG1403/admin_ordermediaform.php
28d27
< $flags['tabs'] = $tngconfig['tabs'];
41c40
< var resheremsg = '<span class="normal">' + "<?php echo $text['reshere']; ?>" + '</span>';;
---
> var resheremsg = '<span class="normal">' + '</span>'; //can't remember what this was supposed to be
64,65d62
< <body background="img/background.gif">
< 
66a64,65
> 	echo tng_adminlayout();
> 
78,80c77,78
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
97c95
< 		if( $treerow['gedcom'] == $tree ) echo " selected";
---
> 		if( isset($tree) && $treerow['gedcom'] == $tree ) echo " selected";
119c117
< 		if( $msgID == $mediatypeID ) echo " selected";
---
> 		if( isset($mediatypeID) && $msgID == $mediatypeID ) echo " selected";
125c123
< 			<td><input type="text" name="newlink1" id="newlink1" value="<?php echo $personID; ?>" onblur="toggleEventRow(document.find.eventlink1.checked);"></td>
---
> 			<td><input type="text" name="newlink1" id="newlink1" value="<?php if( isset($personID) ) echo $personID; ?>" onblur="toggleEventRow(document.find.eventlink1.checked);"></td>
143,149c141,145
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_ordermedia.php TNG1403/admin_ordermedia.php
19c19
< $eventID = $event1;
---
> $eventID = !empty($event1) ? $event1 : "";
22c22,23
< $sortstr = preg_replace( "/xxx/", $text[$mediatypeID], $admtext['sortmedia'] );
---
> $titlestr = !empty($text[$mediatypeID]) ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
> $sortstr = preg_replace( "/xxx/", $titlestr, $admtext['sortmedia'] );
26c27
< 		$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, nameorder, branch FROM $people_table WHERE personID=\"$personID\" AND gedcom = \"$tree\"";
---
> 		$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, nameorder, title, branch, gedcom FROM $people_table WHERE personID=\"$personID\" AND gedcom = \"$tree\"";
89c90
< $thismediatypeID = $row['mediatypeID'];
---
> $thismediatypeID = isset($row['mediatypeID']) ? $row['mediatypeID'] : "";
105d105
< $flags['tabs'] = $tngconfig['tabs'];
109c109
< $usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$thismediatypeID] : $mediapath;
---
> $usefolder = !empty($row['usecollfolder']) ? $mediatypes_assoc[$thismediatypeID] : $mediapath;
111c111
< if( $row['thumbpath'] )
---
> if( !empty($row['thumbpath']) )
127c127
< 	$photo = "<img src=\"" . str_replace("%2F","/",rawurlencode( $photoref )) . "?" . time() . "\" border=\"1\" alt=\"\" width=\"$photowtouse\" height=\"$photohtouse\" align=\"left\" style=\"margin-right:10px\">";
---
> 	$photo = "<img src=\"" . str_replace("%2F","/",rawurlencode( $photoref )) . "?" . time() . "\" class=\"adminthumb\" alt=\"\" width=\"$photowtouse\" height=\"$photohtouse\" align=\"left\" style=\"margin-right:10px\">";
130c130
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
141,142d140
< <body background="img/background.gif" onLoad="startMediaSort()">
< 
143a142,143
> 	echo tng_adminlayout(" onLoad=\"startMediaSort()\"");
> 
156,158c156,157
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
167,168c166,167
< 			<td class="fieldnameback" style="width:102px">&nbsp;<b><?php echo $admtext['text_sort']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback" style="width:<?php echo ($thumbmaxw+10); ?>px">&nbsp;<b><?php echo $admtext['thumb']; ?></b>&nbsp;</td>
---
> 			<td class="fieldnameback" style="width:105px">&nbsp;<b><?php echo $admtext['text_sort']; ?></b>&nbsp;</td>
> 			<td class="fieldnameback" style="width:100px">&nbsp;<b><?php echo $admtext['thumb']; ?></b>&nbsp;</td>
170,171c169,170
< 			<td class="fieldnameback" style="width:49px;">&nbsp;<b><?php echo $admtext['show']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback" style="width:155px">&nbsp;<b><?php echo $admtext['datetaken']; ?></b>&nbsp;</td>
---
> 			<td class="fieldnameback" style="width:45px;">&nbsp;<b><?php echo $admtext['show']; ?></b>&nbsp;</td>
> 			<td class="fieldnameback" style="width:151px">&nbsp;<b><?php echo $admtext['datetaken']; ?></b>&nbsp;</td>
194c193
<  		echo "<input style=\"width:30px\" class=\"movefields\" name=\"move{$row['medialinkID']}\" id=\"move{$row['medialinkID']}\" value=\"$count\" onkeypress=\"handleMediaEnter('{$row['medialinkID']}',jQuery('#move{$row['medialinkID']}').val(),event);\" />\n";
---
>  		echo "<input class=\"movefields\" name=\"move{$row['medialinkID']}\" id=\"move{$row['medialinkID']}\" value=\"$count\" onkeypress=\"handleMediaEnter('{$row['medialinkID']}',jQuery('#move{$row['medialinkID']}').val(),event);\" />\n";
198c197
< 		echo "<td class=\"lightback\" style=\"width:" . ($thumbmaxw+6) . "px;text-align:center;\">";
---
> 		echo "<td class=\"lightback\" style=\"width:100px;text-align:center;\">";
201c200
< 			echo "<a href=\"admin_editmedia.php?mediaID={$row['mediaID']}\"><img src=\"$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" border=\"0\" $size[3] alt=\"{$row['description']}\"></a>";
---
> 			echo "<a href=\"admin_editmedia.php?mediaID={$row['mediaID']}\"><img src=\"$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] )) . "\" class=\"adminthumb\" $size[3] alt=\"{$row['description']}\"></a>";
202a202,203
> 		elseif( $row['form'] == "TXT" )
> 			echo "<span class=\"normal\">Text</span>\n";
226,227c227,228
< </td>
< </tr>
---
> 	</div>
> </div>
229,232c230,232
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_pedconfig.php TNG1403/admin_pedconfig.php
23d22
< $flags['tabs'] = $tngconfig['tabs'];
26,29c25,28
< <script language="JavaScript" src="js/popupwindow.js"></script>
< <script language="JavaScript" src="js/anchorposition.js"></script>
< <script language="JavaScript" src="js/colorpicker2.js"></script>
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script src="js/popupwindow.js"></script>
> <script src="js/anchorposition.js"></script>
> <script src="js/colorpicker2.js"></script>
> <script type="text/javascript">
44,45d42
< <body background="img/background.gif">
< 
46a44,45
> 	echo tng_adminlayout();
> 
59a59,65
> 
> 	if(!isset($pedigree['maxropt'])) $pedigree['maxropt'] = 99;
> 	if(!isset($pedigree['maxlopt'])) $pedigree['maxlopt'] = 30;
> 	if(!isset($pedigree['showtxtopt'])) $pedigree['showtxtopt'] = false;
> 	if(!isset($pedigree['compactboxopt'])) $pedigree['compactboxopt'] = false;
> 	if(!isset($pedigree['sortbyopt'])) $pedigree['sortbyopt'] = "length";
> 	if(!isset($pedigree['maxmopt'])) $pedigree['maxmopt'] = 9;
61a68
> <div class="admin-main">
63,65c70,72
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
68c75
< 	<div id="ped" style="display:none">
---
> 	<div id="ped" style="display:none"><br/>
70d76
< 		<tr><td colspan="2">&nbsp;</td></tr>
72c78
< 			<td valign="top"><?php echo $admtext['usepopups']; ?>:</td>
---
> 			<td><?php echo $admtext['usepopups']; ?>:</td>
85,92c91,98
< 		<tr><td valign="top"><?php echo $admtext['maxpedgens']; ?>:</td><td><input type="text" value="<?php echo $pedigree['maxgen']; ?>" name="maxgen" size="5"></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['initgens']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $pedigree['initpedgens']; ?>" name="initpedgens" size="5"></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['popupspouses']; ?>:</td><td><input type="radio" name="popupspouses" value="1" <?php if( $pedigree['popupspouses'] ) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="popupspouses" value="0" <?php if( !$pedigree['popupspouses'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['popupkids']; ?>:</td><td><input type="radio" name="popupkids" value="1" <?php if( $pedigree['popupkids']) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="popupkids" value="0" <?php if( !$pedigree['popupkids'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['popupchartlinks']; ?>:</td><td><input type="radio" name="popupchartlinks" value="1" <?php if( $pedigree['popupchartlinks'] ) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="popupchartlinks" value="0" <?php if( !$pedigree['popupchartlinks'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['hideempty']; ?>:</td><td><input type="radio" name="hideempty" value="1" <?php if( $pedigree['hideempty'] ) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="hideempty" value="0" <?php if( !$pedigree['hideempty'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['boxwidth']; ?>:</td><td><input type="text" value="<?php echo $pedigree['boxwidth']; ?>" name="boxwidth" size="10"></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['boxheight']; ?>:</td><td><input type="text" value="<?php echo $pedigree['boxheight']; ?>" name="boxheight" size="10"></td></tr>
---
> 		<tr><td><?php echo $admtext['maxpedgens']; ?>:</td><td><input type="text" value="<?php echo $pedigree['maxgen']; ?>" name="maxgen" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['initgens']; ?>:</td><td colspan="4"><input type="text" value="<?php echo $pedigree['initpedgens']; ?>" name="initpedgens" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['popupspouses']; ?>:</td><td><input type="radio" name="popupspouses" value="1" <?php if( $pedigree['popupspouses'] ) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="popupspouses" value="0" <?php if( !$pedigree['popupspouses'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></td></tr>
> 		<tr><td><?php echo $admtext['popupkids']; ?>:</td><td><input type="radio" name="popupkids" value="1" <?php if( $pedigree['popupkids']) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="popupkids" value="0" <?php if( !$pedigree['popupkids'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></td></tr>
> 		<tr><td><?php echo $admtext['popupchartlinks']; ?>:</td><td><input type="radio" name="popupchartlinks" value="1" <?php if( $pedigree['popupchartlinks'] ) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="popupchartlinks" value="0" <?php if( !$pedigree['popupchartlinks'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></td></tr>
> 		<tr><td><?php echo $admtext['hideempty']; ?>:</td><td><input type="radio" name="hideempty" value="1" <?php if( $pedigree['hideempty'] ) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="hideempty" value="0" <?php if( !$pedigree['hideempty'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></td></tr>
> 		<tr><td><?php echo $admtext['boxwidth']; ?>:</td><td><input type="text" value="<?php echo $pedigree['boxwidth']; ?>" name="boxwidth" size="10"></td></tr>
> 		<tr><td><?php echo $admtext['boxheight']; ?>:</td><td><input type="text" value="<?php echo $pedigree['boxheight']; ?>" name="boxheight" size="10"></td></tr>
94c100
< 			<td valign="top"><?php echo $admtext['boxalign']; ?>:</td>
---
> 			<td><?php echo $admtext['boxalign']; ?>:</td>
103c109
<    		<tr><td valign="top"><?php echo $admtext['boxheightshift']; ?>:</td><td><input type="text" value="<?php echo $pedigree['boxheightshift']; ?>" name="boxheightshift" size="10"></td></tr>
---
>    		<tr><td><?php echo $admtext['boxheightshift']; ?>:</td><td><input type="text" value="<?php echo $pedigree['boxheightshift']; ?>" name="boxheightshift" size="10"></td></tr>
108,111c114,117
< 		<tr><td valign="top"><?php echo $admtext['vboxwidth']; ?>:</td><td><input type="text" value="<?php echo $pedigree['vwidth']; ?>" name="vwidth" size="5"></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['vboxheight']; ?>:</td><td><input type="text" value="<?php echo $pedigree['vheight']; ?>" name="vheight" size="5"></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['vspacing']; ?>:</td><td><input type="text" value="<?php echo $pedigree['vspacing']; ?>" name="vspacing" size="5"></td></tr>
< 		<tr><td valign="top"><?php echo $admtext['boxnamesize']; ?>:</td><td><input type="text" value="<?php echo $pedigree['vfontsize']; ?>" name="vfontsize" size="5"></td></tr>
---
> 		<tr><td><?php echo $admtext['vboxwidth']; ?>:</td><td><input type="text" value="<?php echo $pedigree['vwidth']; ?>" name="vwidth" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['vboxheight']; ?>:</td><td><input type="text" value="<?php echo $pedigree['vheight']; ?>" name="vheight" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['vspacing']; ?>:</td><td><input type="text" value="<?php echo $pedigree['vspacing']; ?>" name="vspacing" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['boxnamesize']; ?>:</td><td><input type="text" value="<?php echo $pedigree['vfontsize']; ?>" name="vfontsize" size="5"></td></tr>
118,119c124,125
< <tr class="databack tngshadow">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
122c128
< 	<div id="desc" style="display:none">
---
> 	<div id="desc" style="display:none"><br/>
124d129
< 		<tr><td colspan="2">&nbsp;</td></tr>
126c131
< 			<td valign="top"><span class="normal"><?php echo $admtext['usepopups']; ?>:</span></td>
---
> 			<td><span class="normal"><?php echo $admtext['usepopups']; ?>:</span></td>
129c134
< 					<option value="2"<?php if( $pedigree['defdesc'] == 2 ) echo " selected"; ?>><?php echo $admtext['stdformat']; ?></option>
---
> 					<option value="2"<?php if( $pedigree['defdesc'] == 2 ) echo " selected"; ?>><?php echo $admtext['pedstandard']; ?></option>
131a137
> 					<option value="4"<?php if( $pedigree['defdesc'] == 4 ) echo " selected"; ?>><?php echo $admtext['pedvertical']; ?></option>
132a139
> 					<option value="5"<?php if( $pedigree['defdesc'] == 5 ) echo " selected"; ?>><?php echo $admtext['dtformat']; ?></option>
136,137c143,144
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['maxpedgens']; ?>:</span></td><td colspan="4"><input type="text" value="<?php echo $pedigree['maxdesc']; ?>" name="maxdesc" size="5"></td></tr>
< 		<tr><td valign="top"><span class="normal"><?php echo $admtext['initgens']; ?>:</span></td><td colspan="4"><input type="text" value="<?php echo $pedigree['initdescgens']; ?>" name="initdescgens" size="5"></td></tr>
---
> 		<tr><td><span class="normal"><?php echo $admtext['maxpedgens']; ?>:</span></td><td colspan="4"><input type="text" value="<?php echo $pedigree['maxdesc']; ?>" name="maxdesc" size="5"></td></tr>
> 		<tr><td><span class="normal"><?php echo $admtext['initgens']; ?>:</span></td><td colspan="4"><input type="text" value="<?php echo $pedigree['initdescgens']; ?>" name="initdescgens" size="5"></td></tr>
139c146
< 			<td valign="top"><span class="normal"><?php echo $admtext['stdesc']; ?>:</span></td>
---
> 			<td><span class="normal"><?php echo $admtext['stdesc']; ?>:</span></td>
148c155
< 			<td valign="top"><span class="normal"><?php echo $admtext['regnotes']; ?>:</span></td>
---
> 			<td><span class="normal"><?php echo $admtext['regnotes']; ?>:</span></td>
157c164
< 			<td valign="top"><span class="normal"><?php echo $admtext['regnosp']; ?>:</span></td>
---
> 			<td><span class="normal"><?php echo $admtext['regnosp']; ?>:</span></td>
165a173,179
> 	<p><strong><?php echo $admtext['vchart']; ?></strong></p>
> 	<table class="normal">
> 		<tr><td><?php echo $admtext['vboxwidth']; ?>:</td><td><input type="text" value="<?php echo $pedigree['dvwidth']; ?>" name="dvwidth" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['vboxheight']; ?>:</td><td><input type="text" value="<?php echo $pedigree['dvheight']; ?>" name="dvheight" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['boxnamesize']; ?>:</td><td><input type="text" value="<?php echo $pedigree['dvfontsize']; ?>" name="dvfontsize" size="5"></td></tr>
> 	</table>
> 	</div>
171,172c185,186
< <tr class="databack tngshadow">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
175c189
< 	<div id="rel" style="display:none">
---
> 	<div id="rel" style="display:none"><br/>
177d190
< 		<tr><td colspan="2">&nbsp;</td></tr>
181a195,230
> 
> 	<p><strong><?php echo $admtext['conchart']; ?></strong></p>
> 	<table class="normal">
> 		<tr><td><?php echo $admtext['maxropt']; ?>:</td><td><input type="text" value="<?php echo $pedigree['maxropt']; ?>" name="maxropt" size="5"></td></tr>
> 		<tr><td><?php echo $admtext['maxlopt']; ?>:</td><td><input type="text" value="<?php echo $pedigree['maxlopt']; ?>" name="maxlopt" size="5"></td></tr>
> 		<tr>
> 			<td><?php echo $admtext['showtxtopt']; ?>:</td>
> 			<td>
> 				<select name="showtxtopt">
> 					<option value="0"<?php if( !$pedigree['showtxtopt'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $pedigree['showtxtopt'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['compactboxopt']; ?>:</td>
> 			<td>
> 				<select name="compactboxopt">
> 					<option value="0"<?php if( !$pedigree['compactboxopt'] ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 					<option value="1"<?php if( $pedigree['compactboxopt'] ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $admtext['sortbyopt']; ?>:</td>
> 			<td>
> 				<select name="sortbyopt">
> 					<option value="length"<?php if( $pedigree['sortbyopt'] == "length" ) echo " selected"; ?>><?php echo $text['bylength']; ?></option>
> 					<option value="marriages"<?php if( $pedigree['sortbyopt'] == "marriages" ) echo " selected"; ?>><?php echo $text['bymarriages']; ?></option>
> 					<option value="none"<?php if( $pedigree['sortbyopt'] == "none" ) echo " selected"; ?>><?php echo $text['none']; ?></option>
> 				</select>
> 			</td>
> 		</tr>
> 		<tr><td><?php echo $admtext['anchoridopt']; ?>:</td><td><input type="text" value="<?php echo $pedigree['anchoridopt']; ?>" name="anchoridopt" size="10"></td></tr>
> 		<tr><td><?php echo $admtext['maxmopt']; ?>:</td><td><input type="text" value="<?php echo $pedigree['maxmopt']; ?>" name="maxmopt" size="5"></td></tr>
> 	</table>
187,188c236,237
< <tr class="databack tngshadow">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
191c240
< 	<div id="time" style="display:none">
---
> 	<div id="time" style="display:none"><br/>
193d241
< 		<tr><td colspan="2">&nbsp;</td></tr>
222,223c270,271
< <tr class="databack tngshadow">
< <td class="tngshadow">
---
> <tr>
> <td class="tngshadow databack">
226c274
< 	<div id="peddesc" style="display:none">
---
> 	<div id="peddesc" style="display:none"><br/>
228d275
< 		<tr><td colspan="3">&nbsp;</td></tr>
246c293
< 						    <select name="pagesize">
---
> 						    <select name="pagesize"><?php if( !isset($pedigree['pagesize']) ) $pedigree['pagesize'] = ""; ?>
265,273d311
< 					<tr>
< 						<td valign="top"><span class="normal"><?php echo $admtext['pedevent']; ?>:</span></td>
< 						<td>
< 							<select name="pedevent">
< 								<option value="down"<?php if( $pedigree['event'] == "down" ) echo " selected"; ?>><?php echo $admtext['mousedown']; ?></option>
< 								<option value="over"<?php if( $pedigree['event'] == "over" ) echo " selected"; ?>><?php echo $admtext['mouseover']; ?></option>
< 							</select>
< 						</td>
< 					</tr>
287c325
< 					<tr><td valign="top"><span class="normal"><?php echo $admtext['inclphotos']; ?>:</span></td><td><span class="normal"><input type="radio" name="inclphotos" value="1" <?php if( $pedigree['popupchartlinks'] ) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="inclphotos" value="0" <?php if( !$pedigree['inclphotos'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></span></td></tr>
---
> 					<tr><td valign="top"><span class="normal"><?php echo $admtext['inclphotos']; ?>:</span></td><td><span class="normal"><input type="radio" name="inclphotos" value="1" <?php if( $pedigree['inclphotos'] ) { echo "checked"; } ?>> <?php echo $admtext['yes']; ?> <input type="radio" name="inclphotos" value="0" <?php if( !$pedigree['inclphotos'] ) { echo "checked"; } ?>> <?php echo $admtext['no']; ?></span></td></tr>
297,299c335,341
< <tr class="databack tngshadow">
< <td class="tngshadow">
< 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['save']; ?>">
---
> <tr>
> <td class="tngshadow databack">
> 	<input type="submit" name="submit" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" class="btn saveret" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submitx" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="submit" name="submitx" accesskey="s" class="btn savestay" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_setup.php';">
305,307c347,350
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_people.php TNG1403/admin_people.php
11a12,18
> $varlist = array('newsearch','searchstring','tree','living','private','exactmatch','nokids','noparents','nospouse' );
> foreach( $varlist as $myvar ) {
>    if( !isset( ${$myvar} ) ) {
>       ${$myvar} = "";
>    }
> }
> 
26c33
< 	if( !$searchstring )
---
> 	if( !$searchstring && isset( $_COOKIE['tng_search_people_post']['search']) )
28c35
< 	if( !$tree )
---
> 	if( !$tree && isset( $_COOKIE['tng_search_people_post']['tree']) )
30c37
< 	if( !$living )
---
> 	if( !$living && isset( $_COOKIE['tng_search_people_post']['living']) )
32c39
< 	if( !$private )
---
> 	if( !$private && isset( $_COOKIE['tng_search_people_post']['private']) )
34c41
< 	if( !$exactmatch )
---
> 	if( !$exactmatch && isset( $_COOKIE['tng_search_people_post']['exactmatch']) )
36c43
< 	if( !$nokids )
---
> 	if( !$nokids && isset( $_COOKIE['tng_search_people_post']['nokids']) )
38c45
< 	if( !$noparents )
---
> 	if( !$noparents && isset( $_COOKIE['tng_search_people_post']['noparents']) )
40c47
< 	if( !$nospouse )
---
> 	if( !$nospouse && isset( $_COOKIE['tng_search_people_post']['nospouse']) )
43,44c50,51
< 		$tngpage = $_COOKIE['tng_search_people_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_people_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_people_post']['tngpage']) ? $_COOKIE['tng_search_people_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_people_post']['offset']) ? $_COOKIE['tng_search_people_post']['offset'] : 0;
47,48c54,55
< 		setcookie("tng_search_people_post[tngpage]", $tngpage, $exptime);
< 		setcookie("tng_search_people_post[offset]", $offset, $exptime);
---
> 		setcookie("tng_search_people_post[tngpage]", (isset($tngpage) ? $tngpage : 1), $exptime);
> 		setcookie("tng_search_people_post[offset]", (isset($offset) ? $offset : 0), $exptime);
51,54c58,62
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
---
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
> 
> if(!empty($order))
> 	setcookie("tng_search_people_post[order]", $order, $exptime);
56c64
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> 	$order = isset($_COOKIE['tng_search_people_post']['order']) ? $_COOKIE['tng_search_people_post']['order'] : "name";
57a66
> if(!isset($offset)) $offset = 0;
75a85,90
> $uquery = "SELECT count(userID) as ucount FROM $users_table WHERE allow_living != \"-1\"";
> $uresult = tng_query($uquery) or die ($admtext['cannotexecutequery'] . ": $uquery");
> $urow = tng_fetch_assoc( $uresult );
> $numusers = $urow['ucount'];
> tng_free_result($uresult);
> 
155,156c170,245
< $query = "SELECT $people_table.ID, $people_table.personID, lastname, firstname, lnprefix, prefix, suffix, nameorder, birthdate, LPAD(SUBSTRING_INDEX(birthdate, ' ', -1),4,'0') as birthyear, birthplace, altbirthdate, LPAD(SUBSTRING_INDEX(altbirthdate, ' ', -1),4,'0') as altbirthyear, altbirthplace, $people_table.gedcom as gedcom, treename $nokidselect
< 	FROM ($people_table, $trees_table) $nokidjoin $noparentjoin $nospousejoin WHERE $allwhere $nokidgroup $nokidhaving ORDER BY lastname, lnprefix, firstname, birthyear, altbirthyear LIMIT $newoffset" . $maxsearchresults;
---
> $idsort = "id";
> $birthsort = "birth";
> $deathsort = "death";
> $namesort = "nameup";
> $changesort = "change";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "id") {
> 	$orderstr = "personIDnum, lastname, lnprefix, firstname";
> 	$idsort = "<a href=\"admin_people.php?order=idup\" class=\"lightlink\">{$admtext['id']} $descicon</a>";
> }
> else {
> 	$idsort = "<a href=\"admin_people.php?order=id\" class=\"lightlink\">{$admtext['id']} $ascicon</a>";
> 	if($order == "idup")
> 		$orderstr = "personIDnum DESC, lastname, lnprefix, firstname";
> }
> if($tngconfig['personsuffix']) {
> 	$len = strlen($tngconfig['personsuffix']);
> 	$idselect = ", CAST(LEFT($people_table.personID, LENGTH($people_table.personID)-$len) AS UNSIGNED) AS personIDnum";
> }
> elseif($tngconfig['personprefix']) {
> 	$len = strlen($tngconfig['personprefix']);
> 	$idselect = ", CAST(RIGHT($people_table.personID, LENGTH($people_table.personID)-$len) AS UNSIGNED) AS personIDnum";
> }
> else
> 	$idselect = ", CAST($people_table.personID AS UNSIGNED) AS personIDnum";
> 
> if($order == "birth") {
> 	$orderstr = "IF(birthdatetr, birthdatetr, altbirthdatetr), lastname, lnprefix, firstname";
> 	$birthsort = "<a href=\"admin_people.php?order=birthup\" class=\"lightlink\">{$admtext['birthdate']}, {$admtext['birthplace']} $descicon</a>";
> }
> else {
> 	$birthsort = "<a href=\"admin_people.php?order=birth\" class=\"lightlink\">{$admtext['birthdate']}, {$admtext['birthplace']} $ascicon</a>";
> 	if($order == "birthup")
> 		$orderstr = "IF(birthdatetr, birthdatetr, altbirthdatetr) DESC, lastname, lnprefix, firstname";
> }
> 
> if($order == "death") {
> 	$orderstr = "IF(deathdatetr, deathdatetr, burialdatetr), lastname, lnprefix, firstname";
> 	$deathsort = "<a href=\"admin_people.php?order=deathup\" class=\"lightlink\">{$admtext['deathdate']}, {$admtext['deathplace']} $descicon</a>";
> }
> else {
> 	$deathsort = "<a href=\"admin_people.php?order=death\" class=\"lightlink\">{$admtext['deathdate']}, {$admtext['deathplace']} $ascicon</a>";
> 	if($order == "deathup")
> 		$orderstr = "IF(deathdatetr, deathdatetr, burialdatetr) DESC, lastname, lnprefix, firstname";
> }
> 
> if($order == "name") {
> 	$orderstr = "lastname, lnprefix, firstname, IF(birthdatetr, birthdatetr, altbirthdatetr)";
> 	$namesort = "<a href=\"admin_people.php?order=nameup\" class=\"lightlink\">{$admtext['name']} $descicon</a>";
> }
> else {
> 	$namesort = "<a href=\"admin_people.php?order=name\" class=\"lightlink\">{$admtext['name']} $ascicon</a>";
> 	if($order == "nameup")
> 		$orderstr = "lastname DESC, lnprefix DESC, firstname DESC, IF(birthdatetr, birthdatetr, altbirthdatetr)";
> }
> 
> if($order == "change") {
> 	$orderstr = "$people_table.changedate, lastname, lnprefix, firstname";
> 	$changesort = "<a href=\"admin_people.php?order=changeup\" class=\"lightlink\">{$admtext['lastmodified']} $descicon</a>";
> }
> else {
> 	$changesort = "<a href=\"admin_people.php?order=change\" class=\"lightlink\">{$admtext['lastmodified']} $ascicon</a>";
> 	if($order == "changeup")
> 		$orderstr = "$people_table.changedate DESC, lastname, lnprefix, firstname";
> }
> 
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
> 
> $query = "SELECT $people_table.ID, $people_table.personID{$idselect}, lastname, firstname, lnprefix, title, prefix, suffix, nameorder, 
> 	birthdate, birthdatetr, LPAD(SUBSTRING_INDEX(birthdate, ' ', -1),4,'0') as birthyear, birthplace, altbirthdate, altbirthdatetr, LPAD(SUBSTRING_INDEX(altbirthdate, ' ', -1),4,'0') as altbirthyear, altbirthplace, 
> 	deathdate, deathplace, burialdate, burialplace, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom as gedcom, treename, $people_table.changedby, DATE_FORMAT($people_table.changedate,\"%d %b %Y\") as changedatef $nokidselect
> 	FROM ($people_table, $trees_table) $nokidjoin $noparentjoin $nospousejoin 
> 	WHERE $allwhere $nokidgroup $nokidhaving ORDER BY $orderstr LIMIT $newoffset" . $maxsearchresults;
182d270
< $flags['tabs'] = $tngconfig['tabs'];
206,207d293
< <body background="img/background.gif">
< 
208a295,296
> 	echo tng_adminlayout();
> 
214a303
> 	if( !isset( $message ) ) $message = '';
218,221c307,308
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
271c358
<   		<input type="submit" name="xperaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
>   		<input type="submit" name="xperaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
277c364
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="4" cellspacing="1" border="0" class="normal rounded-table">
287,290c374,378
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['id']; ?></b>&nbsp;</nobr></span></td>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['name']; ?></b>&nbsp;</nobr></span></td>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['birthdate']; ?></b>&nbsp;</nobr></span></td>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['birthplace']; ?></b>&nbsp;</nobr></span></td>
---
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $idsort; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $namesort; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['thumb']; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $birthsort; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $deathsort; ?></b>&nbsp;</nobr></span></td>
297a386
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $changesort; ?></b>&nbsp;</nobr></span></td>
325a415,426
> 			if ( $row['deathdate'] ) {
> 				$deathdate = $admtext['deathabbr'] . " " . $row['deathdate'];
> 				$deathplace = $row['deathplace'];
> 			}
> 			else if ( $row['burialdate'] ) {
> 				$deathdate = $admtext['burialabbr'] . " " . $row['burialdate'];
> 				$deathplace = $row['burialplace'];
> 			}
> 			else {
> 				$deathdate = "";
> 				$deathplace = $row['deathplace'] ? $row['deathplace'] : $row['burialplace'];
> 			}
338c439
< 			echo "<tr id=\"row_{$row['ID']}\"><td class=\"lightback\"><div class=\"action-btns\">$newactionstr</div></td>\n";
---
> 			echo "<tr id=\"row_{$row['ID']}\"><td class=\"lightback\" valign=\"top\"><div class=\"action-btns\">$newactionstr</div></td>\n";
340,344c441,449
< 				echo "<td class=\"lightback\" align=\"center\"><input type=\"checkbox\" name=\"del{$row['ID']}\" value=\"1\"></td>";
< 			echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;$id&nbsp;</span></td>\n";
< 			echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;" . getName($row) . "&nbsp;</span></td>\n";
< 			echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;$birthdate&nbsp;</span></td>\n";
< 			echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;$birthplace&nbsp;</span></td>\n";
---
> 				echo "<td class=\"lightback\" align=\"center\" valign=\"top\"><input type=\"checkbox\" name=\"del{$row['ID']}\" value=\"1\"></td>";
> 			echo "<td class=\"lightback\" valign=\"top\">$id</td>\n";
> 			$namestr = getName($row);
> 			$photostr = showSmallPhoto( $row['personID'], $namestr, $rights['both'], 40, "I", "", $row['gedcom'] );
> 
> 			echo "<td class=\"lightback\" valign=\"top\">$namestr</td>\n";
> 			echo "<td class=\"lightback thumbholder\" align=\"center\" valign=\"top\">$photostr</td>\n";
> 			echo "<td class=\"lightback\" valign=\"top\">$birthdate<br/>$birthplace</td>\n";
> 			echo "<td class=\"lightback\" valign=\"top\">$deathdate<br/>$deathplace</td>\n";
346c451,453
< 				echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;{$row['treename']}&nbsp;</span></td>\n";
---
> 				echo "<td class=\"lightback\" valign=\"top\">{$row['treename']}</td>\n";
> 			$changedby = $numusers > 1 ? "{$row['changedby']}: " : "";
> 			echo "<td class=\"lightback\" valign=\"top\">{$changedby}{$row['changedatef']}</td>\n";
360d466
< 
362,367c468,471
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_photoimporter.php TNG1403/admin_photoimporter.php
54c54
< 			elseif($needsubdirs && is_dir($filename) && $filename != '..' && $filename != '.') {
---
> 			elseif($needsubdirs && is_dir($filename) && $filename != '..' && $filename != '.' && $filename != '@eaDir') {
72d71
< $flags['tabs'] = $tngconfig['tabs'];
79,80d77
< <body background="img/background.gif">
< 
81a79,80
> 	echo tng_adminlayout();
> 
88c87
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/media_help.php#modify');\" class=\"lightlink\">$admtext[help]</a>";
---
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/media_help.php#modify');\" class=\"lightlink\">{$admtext['help']}</a>";
111,114c110,112
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< 
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_photoimport.php TNG1403/admin_photoimport.php
26,27c26
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['phimport'], $flags );
---
> tng_adminheader( $admtext['import'], $flags );
37c36
< 	if($msgID == $mediatypeID) $moptions .= " selected";
---
> 	if( isset($mediatypeID) && $msgID == $mediatypeID) $moptions .= " selected";
45,46d43
< <body background="img/background.gif">
< 
47a45,46
> 	echo tng_adminlayout();
> 
59,61c58,61
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
95c95
< 		if( $treerow['gedcom'] == $tree ) echo " selected";
---
> 		if( isset($tree) && $treerow['gedcom'] == $tree ) echo " selected";
110c110,111
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
---
> </div>
> 
114c115
< var tree = "<?php echo $tree; ?>";
---
> var tree = "<?php if( isset($tree) ) echo $tree; ?>";
127,128c128,130
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin.php TNG1403/admin.php
1,30c1,426
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "index";
< //include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< $admin_login = 1;
< include("checklogin.php");
< 
< tng_adminheader( $admtext['mainmenu'], "" );
< 
< if($sitever == "mobile" || $sitever == "tablet") {
< ?>
< <frameset rows="54,*,0" framespacing="0" frameborder="0">
<     <frame name="rightbanner" src="admin_rightbanner.php"  id="rightbanner" frameborder="0" scrolling="No" marginwidth="10" marginheight="5" leftmargin="10" rightmargin="0" topmargin="5" bottommargin="0">
< <?php
< }
< else {
< ?>
< <frameset rows="54,*,0" cols="150,*" framespacing="0" frameborder="0">
<     <frame name="corner" src="admin_corner.php" marginwidth="5" marginheight="2" leftmargin="5" rightmargin="5" topmargin="2" bottommargin="4" scrolling="no" frameborder="0">
<     <frame name="rightbanner" src="admin_rightbanner.php"  id="rightbanner" frameborder="0" scrolling="No" marginwidth="10" marginheight="5" leftmargin="10" rightmargin="0" topmargin="5" bottommargin="0">
<     <frame name="leftbanner" src="admin_leftbanner.php" marginwidth="10" marginheight="10" leftmargin="10" topmargin="10" rightmargin="5" scrolling="auto" frameborder="0">
< <?php
< }
< ?>
<     <frame name="main" src="admin_main.php" marginwidth="5" marginheight="5" leftmargin="5" rightmargin="0" topmargin="5" bottommargin="0" scrolling="auto" frameborder="0">
< </frameset>
< </html>
\ No newline at end of file
---
> <?php
> include("begin.php");
> $maint = $tngconfig['maint'];
> include($subroot . "mapconfig.php");
> include("adminlib.php");
> $textpart = "index";
> //include("getlang.php");
> include("$mylanguage/admintext.php");
> $admin_login = 1;
> $menu_count = 0;
> 
> include("checklogin.php");
> 
> if( !$allow_edit && !$allow_add && !$allow_delete && !$allow_media_add && !$allow_media_edit && !$allow_media_delete ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> if( $allow_edit && $allow_add && $allow_delete && !$assignedtree ) {
> 	$upgrades = glob($rootpath . "upgrade-*-14x.html");
> 	if(count($upgrades)) {
> 		header("Location: admin_upgrade.php");
> 		exit;
> 	}
> 	if(!$tngconfig['hidetotals']) {
> 		include 'classes/modvalidator.class.php';
> 		$oVal = new_modvalidator();
> 		$mm_data = $oVal->check_status(false);
> 	}
> }
> 
> include("version.php");
> 
> function adminMenuItem($destination, $label, $number, $icon) {
> 	global $sitever, $menu_count;
> 
> 	$menu = "";
> 	if($sitever == "mobile") {
> 		$iconstr = $msgstr = "";
> 		$subheadstr = " adminsubhead-mobile";
> 	}
> 	else {
> 		$iconstr = "<img src=\"img/{$icon}_icon.gif\" alt=\"{$label}\" class=\"adminicon\">\n";
> 		$subheadstr = "";
> 		$menu_count++;
> 	}
> 
> 	$menu .= "<a href=\"$destination\" class=\"lightlink2 admincell fieldnameback\">\n";
> 	$menu .= $iconstr;
> 	if($number !== "") {
> 		if(is_numeric($number))
> 			$number = number_format($number);
> 		$menu .= "<div class=\"admintotal\"><strong>{$number}</strong></div>\n";
> 	}
> 	$menu .= "<div class=\"adminsubhead{$subheadstr}\"><strong>$label</strong></div>\n";
> 	$menu .= "<div style=\"clear:both\"></div>\n";
> 	$menu .= "</a>\n";
> 
> 	return $menu;
> }
> 
> function getTotal($table, $where = "") {
> 	global $assignedtree, $assignedbranch, $tngconfig;
> 
> 	$total = "";
> 	if(!$tngconfig['hidetotals']) {
> 		if($assignedtree) {
> 			if($where == 1) {
> 				$where = "gedcom = \"$assignedtree\"";
> 				if($assignedbranch)
> 					$where .= " AND branch LIKE \"%{$assignedbranch}%\"";
> 			}
> 			elseif($where == 2)
> 				$where = "gedcom = \"$assignedtree\"";
> 		}
> 
> 		$query = "SELECT count(*) as num FROM $table";
> 		if($where)
> 			$query .= " WHERE $where";
> 		$result = tng_query($query);
> 		$row = tng_fetch_assoc($result);
> 		$total = $row['num']; 
> 	 	tng_free_result($result);
> 	}
> 
>  	return $total;
> }
> 
> function switcherLink($param, $label) {
> 	return "<br/><p class=\"smaller msearch-indent\"><a href=\"admin.php?sitever={$param}\" class=\"fieldnameback lightlink2\" target=\"_top\">&nbsp;{$label}&nbsp;</a></p><br/>\n";
> }
> 
> $admincol = $sitever == "mobile" ? "admincol-mobile" : "admincol";
> 
> tng_adminheader( $admtext['administration'], "" );
> ?>
> <script type="text/javascript" src="js/admin.js?v<?php echo $tng_version; ?>"></script>
> <script type="text/javascript">
> jQuery(document).ready(function(){
> 	var tngadminmsg = getCookie('tngadminmsg');
> 	var tngadminbanner = getCookie('tngadminbanner');
> 	if(tngadminbanner == "collapse") {
> 		jQuery('#banner_toggle').attr('src','img/tng_expand_yellow.gif');
> 		jQuery('#admin-banner').css('height',"70px");
> 		jQuery('a.admincell').css('margin',"5px");
> 		jQuery('a.admincell').css('padding',"8px");
> 		tngadminmsg = "hide";
> 		setCookie('tngadminmsg',tngadminmsg,365);
> 	}
> 	if(tngadminmsg != "hide" && $('#msgs').length) {
> 		jQuery('#plus0').attr('src','img/tng_collapse_yellow.gif');
> 		jQuery('#msgs').toggle(300);
> 	}
> });
> 
> function toggleMsg(section,img) {
> 	if(jQuery('#'+section).css('display') == "none") {
> 		setCookie('tngadminmsg',"",365);
> 		if(getCookie('tngadminbanner') == 'collapse')
> 			toggleBanner();
> 	}
> 	else
> 		setCookie('tngadminmsg',"hide",365);
> 
> 	jQuery('#'+img).attr('src', jQuery('#'+img).attr('src').indexOf('collapse') > 0 ? 'img/tng_expand_yellow.gif' : 'img/tng_collapse_yellow.gif');
> 	jQuery('#'+section).toggle(300);
> 
> 	return false;
> }
> 
> function toggleBanner() {
> 	var tngadminbanner = getCookie('tngadminbanner');
> 	var tngadminmsg = getCookie('tngadminmsg');
> 	if(tngadminbanner == 'collapse') {
> 		jQuery('#banner_toggle').attr('src','img/tng_collapse_yellow.gif');
> 		setCookie('tngadminbanner',"",365);
> 		jQuery('#admin-banner').animate({ height: "200px" });
> 		jQuery('a.admincell').animate({ margin: "7px", padding: "10px" });
> 	}
> 	else {
> 		jQuery('#banner_toggle').attr('src','img/tng_expand_yellow.gif');
> 		setCookie('tngadminbanner',"collapse",365);
> 		jQuery('#admin-banner').animate({ height: "70px" });
> 		jQuery('a.admincell').animate({ margin: "5px", padding: "8px" });
> 		if(tngadminmsg != "hide")
> 			toggleMsg('msgs','plus0');
> 	}
> 	return false;
> }
> 
> function setCookie(cname, cvalue, exdays) {
>     var d = new Date();
>     d.setTime(d.getTime() + (exdays*24*60*60*1000));
>     var expires = "expires="+d.toUTCString();
>     document.cookie = cname + "=" + cvalue + "; " + expires;
> }
> 
> function getCookie(cname) {
>     var name = cname + "=";
>     var ca = document.cookie.split(';');
>     for(var i=0; i<ca.length; i++) {
>         var c = ca[i];
>         while (c.charAt(0)==' ') c = c.substring(1);
>         if (c.indexOf(name) == 0) return c.substring(name.length,c.length);
>     }
>     return "";
> }
> </script>
> </head>
> 
> <?php
> 	$showmenu = false;
> 	echo tng_adminlayout("", $showmenu);
> ?>
> <div class="mainbox">
> <?php
> 	if($sitever != "mobile") {
> 		$num_banners = 5;
> 		$next_banner = rand(1,$num_banners);
> ?>
> 		<div id="admin-banner" class="admin-banner">
> <?php
> 		for($i = $num_banners; $i > 0; $i--) {
> 			echo "<img id=\"admin-banner{$i}\" class=\"admin-banner-img\" src=\"img/admin_banner{$next_banner}.jpg\">\n";
> 			$next_banner = $next_banner == 5 ? 1 : $next_banner + 1;
> 		}
> 		echo "<h1>{$admtext['administration']} <a href=\"#\" onclick=\"return toggleBanner();\" class=\"togglehead\"><img src=\"img/tng_collapse_yellow.gif\" title=\"toggle display\" alt=\"toggle display\" id=\"banner_toggle\" style=\"padding:10px 10px 5px 10px\"></a></h1>\n";
> 	}
> 	$messages = "";
> 	if( $allow_edit || $allow_add || $allow_delete ) {
> 		$total_users = getTotal($users_table);
> 		$total_people = getTotal($people_table, 1);
> 		$total_families = getTotal($families_table, 1);
> 
> 		if( $allow_edit && $allow_add && $allow_delete && !$assignedtree ) {
> 			if(!$total_users)
> 				$messages .= "<li><a href=\"admin_newuser.php\">{$admtext['task_user']}</a></li>\n";
> 
> 			//no tree?
> 			$total_trees = getTotal($trees_table);
> 			if(!$total_trees)
> 				$messages .= "<li><a href=\"admin_newtree.php\">{$admtext['task_tree']}</a></li>\n";
> 
> 			//no people? import
> 			if(!$total_people)
> 				$messages .= "<li><a href=\"admin_dataimport.php\">{$admtext['importgedcom2']}</a> | <a href=\"admin_newperson.php\">{$admtext['task_people']}</a></li>\n";
> 			else if(!$total_families)
> 				$messages .= "<li><a href=\"admin_newfamily.php\">{$admtext['task_families']}</a></li>\n";
> 
> 			//new users to review?
> 			$review_users = getTotal($users_table, "allow_living = \"-1\"");
> 			if($review_users)
> 				$messages .= "<li><a href=\"admin_reviewusers.php\">{$admtext['task_revusers']} ($review_users)</a></li>\n";
> 
> 			//people or families to review?
> 			$review_people = getTotal("$people_table, $temp_events_table", "$people_table.personID = $temp_events_table.personID AND $people_table.gedcom = $temp_events_table.gedcom AND (type = \"I\" OR type = \"C\")");
> 			if($review_people)
> 				$messages .= "<li><a href=\"admin_findreview.php?type=I\">{$admtext['task_revind']} ($review_people)</a></li>\n";
> 			$review_families = getTotal("$families_table, $temp_events_table", "$families_table.familyID = $temp_events_table.familyID AND $families_table.gedcom = $temp_events_table.gedcom AND type = \"F\"");
> 			if($review_families)
> 				$messages .= "<li><a href=\"admin_findreview.php?type=F\">{$admtext['task_revfam']} ($review_families)</a></li>\n";
> 
> 			//last backup more than x days ago?
> 			$backupmsg = "";
> 			$fullbackuppath = !empty($tngconfig['saveconfig']) ? $subroot . $backuppath : $rootpath . $backuppath;
> 			$files = array_merge(glob("$fullbackuppath/*.sql"), glob("$fullbackuppath/*.bak"));
> 			$daysSince = $tngconfig['backupdays'];
> 			if(count($files)) {
> 				//check dates
> 				usort($files, function($a,$b) {
> 					if(filemtime($a) == filemtime($b))
> 						return 0;
> 					else if(filemtime($a) < filemtime($b))
> 						return 1;
> 					else
> 						return -1;
> 				});
> 				$lastBackupTime = filemtime($files[0]);
> 				if($daysSince != "0") {
> 					if(!$daysSince) $daysSince = 30;
> 					if(time() - $lastBackupTime >= 60 * 60 * 24 * $daysSince)
> 						$backupmsg = preg_replace( "/xxx/", $daysSince, $admtext['lastbackup'] );
> 				}
> 			}
> 			else if($total_people && $daysSince != "0") {
> 				//no backup ever done
> 				$backupmsg = $admtext['nobackups'];
> 			}
> 			if($backupmsg)
> 				$messages .= "<li><a href=\"admin_utilities.php\">{$admtext['task_backup']} ($backupmsg)</a></li>\n";
> 
> 			//need map key?
> 			if(!$map['key'] || $map['key'] == "1")
> 				$messages .= "<li><a href=\"admin_mapconfig.php\">{$admtext['task_mapkey']}</a></li>\n";
> 		}
> 	}
> 
> 	$switcher = "";
> 	if($allow_admin) {
> 		$trees = explode(',',$_SESSION['availabletrees']);
> 		if(count($trees) > 1) {
> 			$query = "";
> 			foreach($trees as $t) {
> 				if($query) $query .= " UNION ";
> 				$query .= "SELECT gedcom, treename FROM $trees_table WHERE gedcom = \"$t\"";
> 			}
> 			$query .= " ORDER BY treename";
> 			$result = tng_query($query);
> 			$switcher .= "<form action=\"{$cms['tngpath']}switchtree.php\" target=\"_parent\" name=\"newtreeform\" style=\"display:inline-block\">\n";
> 			$switcher .= "<input type=\"hidden\" name=\"ret\" value=\"admin.php\">\n";
> 			$switcher .= "<select name=\"newtree\" class=\"normal\" onChange=\"document.newtreeform.submit();\">\n";
> 			while( $row = tng_fetch_assoc($result)) {
> 				$switcher .= "<option value=\"{$row['gedcom']}\"";
> 				if( $assignedtree == $row['gedcom'] )
> 					$switcher .= " selected";
> 				$switcher .= ">{$row['treename']}</option>\n";
> 			}
> 			$switcher .= "</select>\n</form>\n";
> 			tng_free_result($result);
> 		}
> 	}
> 	if($chooselang) {
> 		$query = "SELECT languageID, display, folder FROM $languages_table ORDER BY display";
> 		$result = @tng_query($query);
> 
> 		if( $result && tng_num_rows( $result ) ) {
> 			$switcher .= "<form action=\"{$cms['tngpath']}admin_savelanguage.php\" method=\"GET\" target=\"_parent\" name=\"language\" style=\"display:inline-block\">\n";
> 			$switcher .= " &nbsp;<select name=\"newlanguage\" class=\"normal\" onChange=\"document.language.submit();\">\n";
> 
> 			while( $row = tng_fetch_assoc($result)) {
> 				$switcher .= "<option value=\"{$row['languageID']}\"";
> 				if( $languages_path . $row['folder'] == $mylanguage )
> 					$switcher .= " selected";
> 				$switcher .= ">{$row['display']}</option>\n";
> 			}
> 			$switcher .= "</select>\n</form>\n";
> 			tng_free_result($result);
> 		}
> 	}
> 
> 	if($switcher || (!$tngconfig['hidetasks'] && $messages)) {
> 		$messages = "<ul>\n$messages</ul>\n";
> 		$msgarea_class = $sitever != "mobile" ? " tngmsgarea-std" : "";
> 		$msgarea_style = !$tngconfig['hidetasks'] ? " style=\"min-width:400px\"" : ""; 
> ?>
> 			<div class="tngmsgarea<?php echo $msgarea_class; ?>"<?php echo $msgarea_style; ?>>
> 			<?php
> 				if(!$tngconfig['hidetasks'] && $messages) {
> 			?>
> 				<a href="#" onclick="return toggleMsg('msgs','plus0');" class="togglehead">
> 					<img src="img/tng_expand_yellow.gif" title="toggle display" alt="toggle display" id="plus0">
> 					<strong class="th-indent admintasks"><?php echo $admtext['tasks']; ?></strong>
> 				</a>
> 			<?php
> 				if($switcher)
> 					echo "<div style=\"float:right\">\n$switcher\n</div>\n";
> 			?>
> 				<div id="msgs" style="display:none">
> 					<hr/><?php echo $messages; ?>
> 				</div>
> 			<?php
> 				}
> 				else
> 					echo "<div style=\"float:right\">\n$switcher\n</div>\n";
> 			?>
> 			</div>
> <?php
> 	}
> 
> 	$menu = "";
> 	if( $allow_edit || $allow_add || $allow_delete ) {
> 		$menu .= adminMenuItem("admin_people.php", $admtext['people'], $total_people, "people");
> 		$menu .= adminMenuItem("admin_families.php", $admtext['families'], $total_families, "families");
> 		$menu .= adminMenuItem("admin_sources.php", $admtext['sources'], getTotal($sources_table, 2), "sources");
> 		$menu .= adminMenuItem("admin_repositories.php", $admtext['repositories'], getTotal($repositories_table, 2), "repos");
> 	}
> 	if( $allow_edit || $allow_add || $allow_delete || $allow_media_add || $allow_media_edit || $allow_media_delete ) {
> 		$menu .= adminMenuItem("admin_media.php", $admtext['media'], getTotal($media_table, 2), "photos");
> 		$menu .= adminMenuItem("admin_albums.php", $admtext['albums'], getTotal($albums_table), "albums");
> 	}
> 	if( $allow_edit || $allow_add || $allow_delete ) {
> 		$menu .= adminMenuItem("admin_cemeteries.php", $admtext['cemeteries'], getTotal($cemeteries_table), "cemeteries");
> 		$menu .= adminMenuItem("admin_places.php", $admtext['places'], getTotal($places_table, (!$assignedtree || $tngconfig['places1tree'] ? "" : 2)), "places");
> 	}
> 	if( $allow_edit && $allow_add && $allow_delete && !$assignedbranch ) {
> 		$menu .= adminMenuItem("admin_dataimport.php", $admtext['datamaint'], "", "data");
> 	}
> 	if( $allow_edit && $allow_add && $allow_delete && !$assignedtree ) {
> 		$menu .= adminMenuItem("admin_trees.php", $admtext['trees'], $total_trees, "trees");
> 		if( !$assignedbranch ) {
> 			$menu .= adminMenuItem("admin_branches.php", $admtext['branches'], getTotal($branches_table, 2), "branches");
> 		}
> 		$menu .= adminMenuItem("admin_eventtypes.php", $admtext['customeventtypes'], getTotal($eventtypes_table), "customeventtypes");
> 		if(empty($tngconfig['hidedna']))
> 			$menu .= adminMenuItem("admin_dna_tests.php", $admtext['dna_tests'], getTotal($dna_tests_table), "dna");
> 	}
> 	if( $allow_edit || $allow_delete )
> 		$menu .= adminMenuItem("admin_notelist.php", $admtext['notes'], getTotal($notelinks_table,2), "notes");
> 	if( $allow_edit || $allow_add || $allow_delete ) {
> 		$menu .= adminMenuItem("admin_timelineevents.php", $admtext['tlevents'], getTotal($tlevents_table), "tlevents");
> 	}
> 	if( $allow_edit && $allow_add && $allow_delete ) {
> 		$menu .= adminMenuItem("admin_misc.php", $admtext['misc'], "", "misc");
> 	}
> 	if( $allow_edit && $allow_add && $allow_delete && !$assignedtree ) {
> 		$menu .= adminMenuItem("admin_setup.php", $admtext['setup'], "", "setup");
> 		$menu .= adminMenuItem("admin_utilities.php", $admtext['backuprestore'], "", "backuprestore");
> 		$menu .= adminMenuItem("admin_users.php", $admtext['users'], $total_users, "users");
> 		$menu .= adminMenuItem("admin_languages.php", $admtext['languages'], getTotal($languages_table), "languages");
> 		$menu .= adminMenuItem("admin_reports.php", $admtext['reports'], getTotal($reports_table), "reports");
> 		if(!$tngconfig['hidetotals']) {
> 			$mods_installed = $all_mods = 0;
> 	  		if( !empty( $mm_data ) ) {
> 	  			foreach( $mm_data as $index => $subkey ) {
> 	  				if( $subkey['status'] == 1 ) $mods_installed++;
> 	  				$all_mods++;
> 	  			}
> 	  		}
> 			$mods_count = $all_mods != $mods_installed ? $mods_installed . '/' . $all_mods : $all_mods;
> 		}
> 		else
> 			$mods_count = "";
> 		$menu .= adminMenuItem("admin_modhandler.php", $admtext['modmgr'], $mods_count, "modmgr");
> 		//$menu .= adminMenuItem("admin_modhandler.php", $admtext['modmgr'], count(glob("mods/*.cfg")), "modmgr");
> 	}
> 	if($menu_count) {
> 		$rows = ceil($menu_count/3);
> 		$menu_grid_str = " style=\"grid-template-rows: repeat($rows, auto)\"";
> 	}
> 	else
> 		$menu_grid_str = "";
> 	if($sitever != "mobile")
> 		echo "</div>\n"; // end of banner div
> ?>
> 			<div class="<?php echo $admincol; ?>"<?php echo $menu_grid_str; ?>>
> <?php 
> 	echo $menu;
> 
> 	$newsitever = getSiteVersion();
> 	switch($newsitever) {
> 		case "standard":
> 			if($newsitever != $sitever)
> 				echo switcherLink("standard",$text['switchs']);
> 			break;
> 		case "mobile":
> 			if($newsitever != $sitever)
> 				echo switcherLink("mobile",$text['switchm']);
> 			else
> 				echo switcherLink("standard",$text['switchs']);
> 			break;
> 		default: //tablet
> 			$target = $newsitever != $sitever ? "tablet" : "standard";
> 			echo switcherLink($target,$text['switchs']);
> 			echo switcherLink("mobile",$text['switchm']);
> 			break;
> 	}
> ?>
> 			</div>
> 		</div>
> 	</div>
> </div>
> 
> <?php
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_pickcemetery.php TNG1403/admin_pickcemetery.php
7a8
> $admin_login = 1;
diff -r TNG/admin_places.php TNG1403/admin_places.php
13d12
< $orgtree = $tree;
15c14,16
< if( $newsearch ) {
---
> if(!isset($tree))
> 	$tree = "";
> if( !empty($newsearch) ) {
16a18,22
> 	if( !isset($exactmatch) ) $exactmatch = "";
> 	if( !isset($nocoords) ) $nocoords = "";
> 	if( !isset($noevents) ) $noevents = "";
> 	if( !isset($nolevel) ) $nolevel = "";
> 	if( !isset($temples) ) $temples = "";
20a27
> 	setcookie("tng_search_places_post[noevents]", $noevents, $exptime);
27,38c34,47
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_places_post']['search']);
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_tree'];
< 	if( !$exactmatch )
< 		$exactmatch = $_COOKIE['tng_search_places_post']['exactmatch'];
< 	if( !$nocoords )
< 		$nocoords = $_COOKIE['tng_search_places_post']['nocoords'];
< 	if( !$nolevel )
< 		$nolevel = $_COOKIE['tng_search_places_post']['nolevel'];
< 	if( !$temples )
< 		$temples = $_COOKIE['tng_search_places_post']['temples'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_places_post']['search']) ? stripslashes($_COOKIE['tng_search_places_post']['search']) : "";
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "";
> 	if( empty($exactmatch) )
> 		$exactmatch = isset($_COOKIE['tng_search_places_post']['exactmatch']) ? $_COOKIE['tng_search_places_post']['exactmatch'] : "";
> 	if( empty($nocoords) )
> 		$nocoords = isset($_COOKIE['tng_search_places_post']['nocoords']) ? $_COOKIE['tng_search_places_post']['nocoords'] : "";
> 	if( empty($noevents) )
> 		$noevents = isset($_COOKIE['tng_search_places_post']['noevents']) ? $_COOKIE['tng_search_places_post']['noevents'] : "";
> 	if( empty($nolevel) )
> 		$nolevel = isset($_COOKIE['tng_search_places_post']['nolevel']) ? $_COOKIE['tng_search_places_post']['nolevel'] : "";
> 	if( empty($temples) )
> 		$temples = isset($_COOKIE['tng_search_places_post']['temples']) ? $_COOKIE['tng_search_places_post']['temples'] : "";
40,41c49,50
< 		$tngpage = $_COOKIE['tng_search_places_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_places_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_places_post']['tngpage']) ? $_COOKIE['tng_search_places_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_places_post']['offset']) ? $_COOKIE['tng_search_places_post']['offset'] : 0;
43a53
> 		if( !isset($tngpage) ) $tngpage = 1;
48,51c58,62
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
---
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
> 
> if(!empty($order))
> 	setcookie("tng_search_places_post[order]", $order, $exptime);
53c64
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> 	$order = isset($_COOKIE['tng_search_places_post']['order']) ? $_COOKIE['tng_search_places_post']['order'] : "name";
54a66
> if(!isset($offset)) $offset = 0;
84c96
< if( $tree )
---
> if( !empty($tree) )
88a101
> if( !isset($noevents) ) $noevents = "";
156c169,197
< $query = "SELECT ID, place, placelevel, longitude, latitude, zoom, $places_table.gedcom as gedcom $treename 
---
> $placesort = "nameup";
> $changesort = "change";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "name") {
> 	$orderstr = "place, $places_table.gedcom";
> 	$placesort = "<a href=\"admin_places.php?order=nameup\" class=\"lightlink\">{$admtext['place']} $descicon</a>";
> }
> else {
> 	$placesort = "<a href=\"admin_places.php?order=name\" class=\"lightlink\">{$admtext['place']} $ascicon</a>";
> 	if($order == "nameup")
> 		$orderstr = "place DESC, $places_table.gedcom DESC";
> }
> 
> if($order == "change") {
> 	$orderstr = "changedate, place, $places_table.gedcom";
> 	$changesort = "<a href=\"admin_places.php?order=changeup\" class=\"lightlink\">{$admtext['lastmodified']} $descicon</a>";
> }
> else {
> 	$changesort = "<a href=\"admin_places.php?order=change\" class=\"lightlink\">{$admtext['lastmodified']} $ascicon</a>";
> 	if($order == "changeup")
> 		$orderstr = "changedate DESC, place, $places_table.gedcom";
> }
> 
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
> 
> $query = "SELECT ID, place, placelevel, longitude, latitude, zoom, $places_table.gedcom as gedcom, changedby, DATE_FORMAT(changedate,\"%d %b %Y\") as changedatef $treename 
160c201
< $query .= " WHERE $allwhere ORDER BY place, $places_table.gedcom, ID LIMIT $newoffset" . $maxsearchresults;
---
> $query .= " WHERE $allwhere ORDER BY $orderstr LIMIT $newoffset" . $maxsearchresults;
175d215
< $flags['tabs'] = $tngconfig['tabs'];
208,209d247
< <body background="img/background.gif">
< 
210a249,252
> 	echo tng_adminlayout();
> 
> 	if( !isset($place2) ) $place2 = "";
> 
220,223c262,263
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
277c317
<   		<input type="submit" name="xplacaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
>   		<input type="submit" name="xplacaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
283c323
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
293c333
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['place']; ?></b>&nbsp;</nobr></td>
---
> 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $placesort; ?></b>&nbsp;</nobr></td>
314a355
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $changesort; ?></b>&nbsp;</nobr></span></td>
348a390
> 			echo "<td class=\"lightback\" valign=\"top\">{$row['changedatef']}</td>\n";
364,369c406,409
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_renumbermenu.php TNG1403/admin_renumbermenu.php
23d22
< $flags['tabs'] = $tngconfig['tabs'];
28,29d26
< <body background="img/background.gif">
< 
30a28,29
> 	echo tng_adminlayout();
> 
40,42c39,40
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
47c45
< 	<table class="normal">
---
> 	<table class="normal rounded-table">
96,101c94,97
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_renumber.php TNG1403/admin_renumber.php
22d21
< $flags['tabs'] = $tngconfig['tabs'];
27,28d25
< <body background="img/background.gif">
< 
29a27,28
> 	echo tng_adminlayout();
> 
49,50c48,49
< eval( "\$prefix = \$tngconfig['{$type}prefix'];" );
< eval( "\$suffix = \$tngconfig['{$type}suffix'];" );
---
> $prefix = $tngconfig[$type.'prefix'];
> $suffix = $tngconfig[$type.'suffix'];
199a199,201
> 			$query = "UPDATE $image_tags_table SET persfamID=\"$newID\" WHERE gedcom=\"$tree\" AND persfamID=\"" . $row[$id] . "\"";
> 			$result2 = tng_query($query);
> 
239c241,242
< echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>";
---
> 
> echo tng_adminfooter();
241,242d243
< </body>
< </html>
diff -r TNG/admin_reports.php TNG1403/admin_reports.php
19a20,22
> if( !isset($offset) ) $offset = 0;
> if( !isset($activeonly) ) $activeonly = "";
> 
21c24
< if( $newsearch ) {
---
> if( !empty($newsearch) ) {
30,33c33,36
< 	if( !$searchstring )
< 		$searchstring = $_COOKIE['tng_search_reports_post']['search'];
< 	if( !$activeonly )
< 		$activeonly = $_COOKIE['tng_search_reports_post']['activeonly'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_reports_post']['search']) ? stripslashes($_COOKIE['tng_search_reports_post']['search']) : "";
> 	if( empty($activeonly) )
> 		$activeonly = isset($_COOKIE['tng_search_reports_post']['activeonly']) ? $_COOKIE['tng_search_reports_post']['activeonly'] : "";
35,36c38,39
< 		$tngpage = $_COOKIE['tng_search_reports_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_reports_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_reports_post']['tngpage']) ? $_COOKIE['tng_search_reports_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_reports_post']['offset']) ? $_COOKIE['tng_search_reports_post']['offset'] : 0;
39a43
> 		if( !isset($tngpage) ) $tngpage = 1;
64c68
< $query = "SELECT reportID, reportname, reportdesc, rank, active FROM $reports_table $wherestr ORDER BY rank, reportname, reportID LIMIT $newoffset" . $maxsearchresults;
---
> $query = "SELECT reportID, reportname, reportdesc, ranking, active FROM $reports_table $wherestr ORDER BY ranking, reportname, reportID LIMIT $newoffset" . $maxsearchresults;
80d83
< $flags['tabs'] = $tngconfig['tabs'];
93,94d95
< <body background="img/background.gif">
< 
95a97,98
> 	echo tng_adminlayout();
> 
103,106c106,107
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
139c140
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
165c166
< 			echo "<td class=\"lightback\" valign=\"top\">&nbsp;{$row['rank']}</td>\n";
---
> 			echo "<td class=\"lightback\" valign=\"top\">&nbsp;{$row['ranking']}</td>\n";
182,185d182
< </td>
< </tr>
< 
< </table>
187,189c184,186
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_repositories.php TNG1403/admin_repositories.php
12,13c12,13
< if( $newsearch ) {
< 	$exptime = 0;
---
> $exptime = 0;
> if( !empty($newsearch) ) {
21,26c21,26
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_repos_post']['search']);
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_tree'];
< 	if( !$exactmatch )
< 		$exactmatch = $_COOKIE['tng_search_repos_post']['exactmatch'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_repos_post']['search']) ? stripslashes($_COOKIE['tng_search_repos_post']['search']) : "";
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "";
> 	if( empty($exactmatch) )
> 		$exactmatch = isset($_COOKIE['tng_search_repos_post']['exactmatch']) ? $_COOKIE['tng_search_repos_post']['exactmatch'] : "";
28,29c28,29
< 		$tngpage = $_COOKIE['tng_search_repos_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_repos_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_repos_post']['tngpage']) ? $_COOKIE['tng_search_repos_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_repos_post']['offset']) ? $_COOKIE['tng_search_repos_post']['offset'] : 0;
32c32
< 		$exptime = 0;
---
> 		if( !isset($tngpage) ) $tngpage = 1;
37,40c37,41
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
---
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
> 
> if(!empty($order))
> 	setcookie("tng_search_repos_post[order]", $order, $exptime);
42c43
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> 	$order = isset($_COOKIE['tng_search_repos_post']['order']) ? $_COOKIE['tng_search_repos_post']['order'] : "title";
43a45
> if(!isset($offset)) $offset = 0;
61a64,69
> $uquery = "SELECT count(userID) as ucount FROM $users_table WHERE allow_living != \"-1\"";
> $uresult = tng_query($uquery) or die ($admtext['cannotexecutequery'] . ": $uquery");
> $urow = tng_fetch_assoc( $uresult );
> $numusers = $urow['ucount'];
> tng_free_result($uresult);
> 
101c109,156
< $query = "SELECT ID, repoID, reponame, $repositories_table.gedcom as gedcom, treename FROM ($repositories_table, $trees_table) WHERE $allwhere ORDER BY reponame, repoID LIMIT $newoffset" . $maxsearchresults;
---
> $idsort = "id";
> $titlesort = "titleup";
> $changesort = "change";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "id") {
> 	$orderstr = "repoIDnum, reponame";
> 	$idsort = "<a href=\"admin_repositories.php?order=idup\" class=\"lightlink\">{$admtext['repoid']} $descicon</a>";
> }
> else {
> 	$idsort = "<a href=\"admin_repositories.php?order=id\" class=\"lightlink\">{$admtext['repoid']} $ascicon</a>";
> 	if($order == "idup")
> 		$orderstr = "repoIDnum DESC, reponame";
> }
> if($tngconfig['reposuffix']) {
> 	$len = strlen($tngconfig['reposuffix']);
> 	$idselect = ", CAST(LEFT(repoID, LENGTH(repoID)-$len) AS UNSIGNED) AS repoIDnum";
> }
> elseif($tngconfig['repoprefix']) {
> 	$len = strlen($tngconfig['repoprefix']);
> 	$idselect = ", CAST(RIGHT(repoID, LENGTH(repoID)-$len) AS UNSIGNED) AS repoIDnum";
> }
> else
> 	$idselect = ", CAST(repoID AS UNSIGNED) AS repoIDnum";
> 
> if($order == "title") {
> 	$orderstr = "reponame";
> 	$titlesort = "<a href=\"admin_repositories.php?order=titleup\" class=\"lightlink\">{$admtext['title2']} $descicon</a>";
> }
> else {
> 	$titlesort = "<a href=\"admin_repositories.php?order=title\" class=\"lightlink\">{$admtext['title2']} $ascicon</a>";
> 	if($order == "titleup")
> 		$orderstr = "reponame DESC";
> }
> 
> if($order == "change") {
> 	$orderstr = "changedate, reponame";
> 	$changesort = "<a href=\"admin_repositories.php?order=changeup\" class=\"lightlink\">{$admtext['lastmodified']} $descicon</a>";
> }
> else {
> 	$changesort = "<a href=\"admin_repositories.php?order=change\" class=\"lightlink\">{$admtext['lastmodified']} $ascicon</a>";
> 	if($order == "changeup")
> 		$orderstr = "changedate DESC, reponame";
> }
> 
> $query = "SELECT ID, repoID{$idselect}, reponame, $repositories_table.gedcom as gedcom, treename, changedby, DATE_FORMAT(changedate,\"%d %b %Y\") as changedatef 
> 	FROM ($repositories_table, $trees_table) WHERE $allwhere ORDER BY $orderstr LIMIT $newoffset" . $maxsearchresults;
117d171
< $flags['tabs'] = $tngconfig['tabs'];
130,131d183
< <body background="img/background.gif">
< 
132a185,186
> 	echo tng_adminlayout();
> 
141,144c195,196
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
188c240
< 		<input type="submit" name="xrepoaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
> 		<input type="submit" name="xrepoaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
194c246
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
204,205c256,257
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['repoid']; ?></b>&nbsp;</nobr></span></td>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['name']; ?></b>&nbsp;</nobr></span></td>
---
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $idsort; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $titlesort; ?></b>&nbsp;</nobr></span></td>
212a265
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $changesort; ?></b>&nbsp;</nobr></span></td>
237a291,292
> 			$changedby = $numusers > 1 ? "{$row['changedby']}: " : "";
> 			echo "<td class=\"lightback\">{$changedby}{$row['changedatef']}</td>\n";
253,256d307
< </td>
< </tr>
< 
< </table>
258,260c309,311
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_restore.php TNG1403/admin_restore.php
19a20,21
> $fullbackuppath = !empty($tngconfig['saveconfig']) ? $subroot . $backuppath : $rootpath . $backuppath;
> 
21c23
<   global $rootpath, $backuppath, $largechunk, $admtext;
---
>   global $rootpath, $fullbackuppath, $largechunk, $admtext, $dodel;
23,24c25,31
<   $filename = "$rootpath$backuppath/$table.bak";
<   if( !file_exists( $filename ) ) return $admtext['cannotopen'] . " $table.bak";
---
>   $dodel = $dodel == "true" || $dodel == "1" || $dodel == 1 ? true : false;
>   $filename = "$fullbackuppath/$table.sql";
>   if( !file_exists( $filename ) ) {
>   	$filename = "$fullbackuppath/$table.bak";
>   	if( !file_exists( $filename ) )
>   		return $admtext['cannotopen'] . " $table.sql / $table.bak";
>   }
26,27d32
<   $query = "DELETE FROM $table";
<   $result = tng_query($query);
29,40c34,37
<   $fields = array_shift($lines);
<   if (substr($fields,0,1) == '"') { // does this line hold the field list?
<     array_unshift($lines,$fields);  // no - so put the line back on the lines array and build field list from table
<     $query = "SELECT * FROM $table"; // no need for limit as table is empty
<     $result = tng_query($query);
<     $fields = "";
<     $nflds = tng_num_fields($result);
<     for ($i=0; $i < $nflds; $i++) {
<       $fields .= tng_field_info($result,$i,'name') . ',';
<     }
<     $fields = trim($fields,',');
<   }
---
>   if($dodel) {
> 		$query = "DELETE FROM $table";
> 		$result = tng_query($query);
> 	}
42,62c39,109
<   $counter = 0;
<   $values = "";
<   $saveline = "";
<   $startquote = 0;
<   $prevendquote = 0;
< 
<   foreach ( $lines as $line ) {
<     $startquote = substr( $line, 0, 1 ) == "\"" ? 1: 0;
<     if( $startquote && $prevendquote ) {
<       $values .= sprintf("(%s),",rtrim($saveline));
<       $counter++;
<       if( $counter == $largechunk ) {
<       	writechunk($table, $fields, $values);
<         $counter = 0;
<         $values = "";
<       }
<       $saveline = "";
<     }
<     $prevendquote = substr( rtrim( $line ), -1 ) == "\"" && (substr( rtrim( $line ), -3 ) == "\\\\\"" || substr( rtrim( $line ), -2 ) != "\\\"") ? 1: 0;
<     $saveline .= $line;
<   }
---
>   $firstword = substr($lines[0],0,4);
>   $dosql = ($firstword == "DROP" || $firstword == "CREA" || $firstword == "INSE") ? true : false;
> 
> 	if($dosql) {
> 		$query = $insertline = "";
> 		$counter = 0;
> 
>   	foreach ( $lines as $line ) {
>   		if(substr($line,0,6) == "INSERT")
>   			$insertline = $line;
>   		else {
> 	  		$query .= $line;
> 	  		$counter++;
>   		}
>   		if(substr(trim($line),-1) == ";" || $counter == $largechunk) {
>   			if($dodel || substr($line,0,4) != "DROP") {
>   				if($insertline) {
>   					$query = $insertline . $query;
>   					if(substr(trim($line),-1) == ";")
> 	  					$insertline = "";
> 	  				else
> 	  					$query = substr(trim($query), 0, -1) . ";";
>   				}
> 	  			$result = tng_query($query);
> 	  		}
> 				$counter = 0;
>   			$query = "";
>   		}
>   	}
> 	}
> 	else {
> 	  $fields = array_shift($lines);
> 	  if (substr($fields,0,1) == '"') { // does this line hold the field list?
> 	    array_unshift($lines,$fields);  // no - so put the line back on the lines array and build field list from table
> 	    $query = "SELECT * FROM $table"; // no need for limit as table is empty
> 	    $result = tng_query($query);
> 	    $fields = "";
> 	    $nflds = tng_num_fields($result);
> 	    for ($i=0; $i < $nflds; $i++) {
> 	      $fields .= tng_field_info($result,$i,'name') . ',';
> 	    }
> 	    $fields = trim($fields,',');
> 	  }
> 
> 	  $counter = 0;
> 	  $values = "";
> 	  $saveline = "";
> 	  $startquote = 0;
> 	  $prevendquote = 0;
> 
> 	  foreach ( $lines as $line ) {
> 	    $startquote = substr( $line, 0, 1 ) == "\"" ? 1: 0;
> 	    if( $startquote && $prevendquote ) {
> 	      $values .= sprintf("(%s),",rtrim($saveline));
> 	      $counter++;
> 	      if( $counter == $largechunk ) {
> 	      	writechunk($table, $fields, $values);
> 	        $counter = 0;
> 	        $values = "";
> 	      }
> 	      $saveline = "";
> 	    }
> 	    $prevendquote = substr( rtrim( $line ), -1 ) == "\"" && (substr( rtrim( $line ), -3 ) == "\\\\\"" || substr( rtrim( $line ), -2 ) != "\\\"") ? 1: 0;
> 	    $saveline .= $line;
> 	  }
> 
> 	  if( $saveline ) {
> 	    $values .= sprintf("(%s),",rtrim($saveline));
> 	  	writechunk($table, $fields, $values);
> 	  }
> 	}
64,67d110
<   if( $saveline ) {
<     $values .= sprintf("(%s),",rtrim($saveline));
<   	writechunk($table, $fields, $values);
<   }
75,76c118,121
<     $query = "INSERT INTO $table ($fields) VALUES $values";
<     return tng_query($query);
---
>     if($values != "()") {
> 	    $query = "INSERT INTO $table ($fields) VALUES $values";
>   	  return tng_query($query);
>   	}
79c124
< $largechunk = 100;
---
> $largechunk = 1000;
83c128
< 	$filename = "$rootpath$backuppath/tng_tablestructure.bak";
---
> 	$filename = "$fullbackuppath/tng_tablestructure.bak";
100c145
< 			$languages_table, $places_table, $states_table, $countries_table, $sources_table, $repositories_table, $citations_table, $reports_table, $dna_groups_table, $dna_links_table, $dna_tests_table,
---
> 			$image_tags_table, $languages_table, $places_table, $states_table, $countries_table, $sources_table, $repositories_table, $citations_table, $reports_table, $dna_groups_table, $dna_links_table, $dna_tests_table,
103a149,150
> 
>     foreach($tablelist as $tablecheck) if(!isset(${$tablecheck})) ${$tablecheck} = false;
105c152
< 			eval( "\$dothistable = \"\$$table\";" );
---
> 			$dothistable = $$table;
diff -r TNG/admin_review.php TNG1403/admin_review.php
241d240
< $flags['tabs'] = $tngconfig['tabs'];
251,252d249
< <body background="img/background.gif">
< 
253a251,252
> 	echo tng_adminlayout();
> 
274,276c273,275
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
> 
333,336c332,333
< </td>
< </tr>
< 
< </table>
---
> 	</div>
> </div>
338,340c335,337
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_reviewusers.php TNG1403/admin_reviewusers.php
25d24
< $flags['tabs'] = $tngconfig['tabs'];
38,39d36
< <body background="img/background.gif">
< 
40a38,39
> 	echo tng_adminlayout();
> 
43c42
< 	$usertabs[2] = array($allow_edit,"admin_reviewusers.php",$admtext['review'] . $revstar,"review");
---
> 	$usertabs[2] = array($allow_edit,"admin_reviewusers.php",$admtext['review'],"review");
50,52c49,52
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
65c65
<   		<input type="submit" name="xruseraction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
>   		<input type="submit" name="xruseraction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
71c71
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
123,125c123,126
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
Only in TNG: admin_rightbanner.php
diff -r TNG/admin_savelanguage.php TNG1403/admin_savelanguage.php
5,7c5,6
< 
< session_start();
< eval( "\$newlanguage = preg_replace(\"/[^0-9]/\", '', \$newlanguage$instance);" );
---
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
> $newlanguage = preg_replace("/[^0-9]/", "", $newlanguage);
diff -r TNG/admin_savereview.php TNG1403/admin_savereview.php
20,29c20,22
< if (get_magic_quotes_gpc() == 0) {
< 	$eventdate = addslashes($newdate);
< 	$eventplace = addslashes($newplace);
< 	$info = addslashes($newinfo);
< }
< else {
< 	$eventdate = $newdate;
< 	$eventplace = $newplace;
< 	$info = $newinfo;
< }
---
> $eventdate = addslashes($newdate);
> $eventplace = addslashes($newplace);
> $info = addslashes($newinfo);
166c159
< 		adminwritelog( "<a href=\"admin_editfamily.php?familyID=$family&tree=$tree\">$choice ({$admtext['family']}): $tree/{$row['familyID']}</a>" );
---
> 		adminwritelog( "<a href=\"admin_editfamily.php?familyID=$family&amp;tree=$tree\">$choice ({$admtext['family']}): $tree/{$row['familyID']}</a>" );
168c161
< 		adminwritelog( "<a href=\"admin_editperson.php?personID=$personID&tree=$tree\">$choice ({$admtext['person']}): $tree/{$row['personID']}</a>" );
---
> 		adminwritelog( "<a href=\"admin_editperson.php?personID=$personID&amp;tree=$tree\">$choice ({$admtext['person']}): $tree/{$row['personID']}</a>" );
diff -r TNG/admin_savewhatsnewmsg.php TNG1403/admin_savewhatsnewmsg.php
33c33,38
< header( "Location: admin_whatsnewmsg.php?color=$color&message=" . urlencode($message) );
---
> if( !empty($submitx) ) {
> 	header( "Location: admin_misc.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_whatsnewmsg.php?color=$color&message=" . urlencode($message) );
> }
diff -r TNG/admin_secondary.php TNG1403/admin_secondary.php
18,19c18,20
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['secondarymaint'], $flags );
---
> setcookie("tng_sec_post[tree]", $tree, 0);
> 
> tng_adminheader( $admtext['secondary'], $flags );
23,24d23
< <body background="img/background.gif">
< 
25a25,26
> 	echo tng_adminlayout();
> 
28c29
< 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondarymaint'],"second");
---
> 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondary'],"second");
31c32
< 	echo displayHeadline($admtext['datamaint'] . " &gt;&gt; " . $admtext['secondarymaint'] . " &gt;&gt; " . $secaction,"img/data_icon.gif",$menu,$message);
---
> 	echo displayHeadline($admtext['datamaint'] . " &gt;&gt; " . $admtext['secondary'] . " &gt;&gt; " . $secaction, "img/data_icon.gif", $menu, (isset($message) ? $message : ""));
33,35c34,35
< 
< <div class="lightback pad2">
< <div class="databack normal pad5">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
39c39
< $wherestr = "";
---
> $wherestr = $wherestr2 = "";
41c41
< 	echo "<p>" . $admtext['sortingchildren'] . "</p>";
---
> 	echo "<h2>" . $admtext['sortingchildren'] . "</h2>";
68c68
< 	echo "<br/><br/>{$admtext['finishedsort']}<br/>";
---
> 	echo "<br/><br/>{$admtext['finished']}<br/>";
72c72
< 	echo "<p>" . $admtext['sortingspouses'] . "</p>";
---
> 	echo "<h2>" . $admtext['sortingspouses'] . "</h2>";
121c121
< 	echo "<br/><br/>{$admtext['finishedsort']}<br/>";
---
> 	echo "<br/><br/>{$admtext['finished']}<br/>";
140c140
< 	echo "<p>" . $admtext['creatinggendex'] . "</p>";
---
> 	echo "<h2>" . $admtext['creatinggendex'] . "</h2>";
165c165
< 					$line = $person['personID'] . "&tree={$person['gedcom']}|$uclast|" . initials( $person['firstname'] ) . " /$uclast/|$info\n";
---
> 					$line = $person['personID'] . "&amp;tree={$person['gedcom']}|$uclast|" . initials( $person['firstname'] ) . " /$uclast/|$info\n";
167,168c167,168
< 					$line = $person['personID'] . "&tree={$person['gedcom']}|$uclast|{$person['firstname']} /$uclast/|$info\n";
< 				if($session_charset == "UTF-8") $line = utf8_decode($line);
---
> 					$line = $person['personID'] . "&amp;tree={$person['gedcom']}|$uclast|{$person['firstname']} /$uclast/|$info\n";
> 				if($session_charset == "UTF-8") $line = mb_convert_encoding( $line, 'ISO-8859-1', 'UTF-8' );
188,189c188,189
< 		&raquo; <a href="http://www.gendexnetwork.org" target="_blank">GenDexNetwork</a><br/>
< 		&raquo; <a href="http://www.familytreeseeker.com" target="_blank">FamilyTreeSeeker.com</a>
---
> 		<!--&raquo; <a href="https://www.gendexnetwork.org" target="_blank">GenDexNetwork</a><br/>-->
> 		&raquo; <a href="https://www.familytreeseeker.com" target="_blank">FamilyTreeSeeker.com</a>
194c194
< 	echo "<p class=\"normal\">" . $admtext['trackinglines'] . "</p>";
---
> 	echo "<h2>" . $admtext['trackinglines'] . "</h2>";
225c225,226
< 	echo "<p>" . $admtext['relabeling'] . "</p>";
---
> 	$fcount = 0;
> 	echo "<h2>" . $admtext['relabeling'] . "</h2>";
282c283
< 	echo "<p>" . $admtext['evaluating'] . "...</p>";
---
> 	echo "<h2>" . $admtext['evaluating'] . "...</h2>";
308a310
> 	echo "<h2>" . $admtext['refreshliving'] . "...</h2>";
369c371
< 				echo "+<a href=\"admin_editperson.php?personID={$row['personID']}&tree={$row['gedcom']}\">{$row['personID']}</a> ";
---
> 				echo "+<a href=\"admin_editperson.php?personID={$row['personID']}&amp;tree={$row['gedcom']}\">{$row['personID']}</a> ";
376c378
< 				echo "-<a href=\"admin_editperson.php?personID={$row['personID']}&tree={$row['gedcom']}\">{$row['personID']}</a> ";
---
> 				echo "-<a href=\"admin_editperson.php?personID={$row['personID']}&amp;tree={$row['gedcom']}\">{$row['personID']}</a> ";
380c382,384
< 			echo "I$counted ";
---
> 			echo ".";
> 			if($counted % 1000 == 0)
> 				echo "I$counted";
384c388
< 	echo "<br/><br/>{$admtext['finished']}<br/>$changedToDeceased {$admtext['chtodeceased']}, $changedToLiving {$admtext['chtoliving']}.";
---
> 	echo "<br/><br/>{$admtext['finished']}<br/>$changedToDeceased {$admtext['chtodeceased']} (-), $changedToLiving {$admtext['chtoliving']} (+).";
386a391,393
> 	echo "<h2>" . $admtext['makeprivate'] . "...</h2>";
> 
> 	$peopleMadePrivate = 0;
388c395
< 		$peopleMadePrivate = $familiesMadePrivate = $counted = 0;
---
> 		$familiesMadePrivate = $counted = 0;
420d426
< 	if(!$peopleMadePrivate) $peopleMadePrivate = "0";
431,433c437,439
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_secondmenu.php TNG1403/admin_secondmenu.php
12c12
< if( $assignedtree )
---
> if( $assignedtree ) {
14c14,16
< else
---
> 	$tree = $assignedtree;
> }
> else {
15a18,21
> 	if( empty($tree) && isset( $_COOKIE['tng_sec_post']['tree']) )
> 		$tree = $_COOKIE['tng_sec_post']['tree'];
> }
> 
21d26
< $flags['tabs'] = $tngconfig['tabs'];
23a29,40
> <script type="text/javascript" src="js/admin.js"></script>
> <script type="text/javascript">
> jQuery(document).ready(function() {
> 	jQuery('.secutil').bind('click',function(e) {
> 		var linkval = $(this).attr('href');
> 		var treeid = $('#treequeryselect').val();
> 		$(this).attr('href',linkval + treeid);
> 		//window.location.href = linkval + treeid;
> 		//return false;
> 	});
> });
> </script>
26,27d42
< <body background="img/background.gif">
< 
28a44,45
> 	echo tng_adminlayout();
> 
41c58
< 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondarymaint'],"second");
---
> 	$datatabs[2] = array(1,"admin_secondmenu.php",$admtext['secondary'],"second");
44c61,63
< 	echo displayHeadline($admtext['datamaint'] . " &gt;&gt; " . $admtext['secondary'],"img/data_icon.gif",$menu,$message);
---
> 	echo displayHeadline($admtext['datamaint'] . " &gt;&gt; " . $admtext['secondary'], "img/data_icon.gif", $menu, (isset($message) ? $message : ""));
> 
> 	$utils = array($admtext['tracklines'],$admtext['sortchildren'],$admtext['sortspouses'],$admtext['relabelbranches'],$admtext['creategendex'],$admtext['evalmedia'],$admtext['refreshliving'],$admtext['makeprivate']);
47,49c66,67
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
51c69
< 	<span class="normal"><?php echo $admtext['tree'];?>: <select name="tree">
---
> 	<span class="normal"><?php echo $admtext['tree'];?>: <select name="tree" id="treequeryselect">
56c74,76
< 	echo "	<option value=\"{$row['gedcom']}\">{$row['treename']}</option>\n";
---
> 	echo "	<option value=\"{$row['gedcom']}\"";
> 	if( isset($tree) && $row['gedcom'] == $tree ) echo " selected";
> 	echo ">{$row['treename']}</option>\n";
60,68d79
< 	<!-- <input type="submit" name="secaction" value="<?php echo $admtext['creategendex']; ?>">  -->
< 	<input type="submit" name="secaction" value="<?php echo $admtext['tracklines']; ?>">
< 	<input type="submit" name="secaction" value="<?php echo $admtext['sortchildren']; ?>">
< 	<input type="submit" name="secaction" value="<?php echo $admtext['sortspouses']; ?>">
< 	<input type="submit" name="secaction" value="<?php echo $admtext['relabelbranches']; ?>">
< 	<input type="submit" name="secaction" value="<?php echo $admtext['creategendex']; ?>">
< 	<input type="submit" name="secaction" value="<?php echo $admtext['evalmedia']; ?>">
< 	<input type="submit" name="secaction" value="<?php echo $admtext['refreshliving']; ?>">
< 	<input type="submit" name="secaction" value="<?php echo $admtext['makeprivate']; ?>">
69a81,100
> 
> 	<table cellpadding="5" cellspacing="1" border="0" class="normal rounded-table" style="min-width:400px">
> 		<tr>
> 			<td class="fieldnameback fieldname" style="width:10px">&nbsp;<b>#</b>&nbsp;</td>
> 			<td class="fieldnameback fieldname">&nbsp;<b><?php echo $admtext['utility']; ?></b>&nbsp;</td>
> 		</tr>
> <?php
> 	$i = 1;
> 	foreach($utils as $util) {
> ?>
> 		<tr>
> 			<td class="lightback" align="right">&nbsp;<?php echo $i; ?></td>
> 			<td class="lightback">&nbsp;<a href="admin_secondary.php?secaction=<?php echo $util; ?>&amp;tree=<?php echo $assignedtree; ?>" class="secutil"><?php echo $util; ?></a></td>
> 		</tr>
> <?php
> 		$i++;
> 	}
> ?>
> 	</table>
> 
71,72c102,103
< 		&raquo; <a href="http://gendexnetwork.org" target="_blank">GenDex Network</a><br/>
< 		&raquo; <a href="http://www.familytreeseeker.com" target="_blank">FamilyTreeSeeker.com</a>
---
> 		<!-- &raquo; <a href="https://gendexnetwork.org" target="_blank">GenDex Network</a><br/> -->
> 		&raquo; <a href="https://www.familytreeseeker.com" target="_blank">FamilyTreeSeeker.com</a>
74,79c105,109
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/admin_sendmailusers.php TNG1403/admin_sendmailusers.php
20c20
< 	$wherestr = " AND gedcom=\"$gedcom\"";
---
> 	$recipstr = "gedcom=\"$gedcom\"";
22c22,23
< 		$wherestr .= " AND branch=\"$branch\"";
---
> 		$recipstr = "($recipstr AND branch=\"$branch\")";
> 	$wherestr = !empty($sendtoadmins) ? " AND ($recipstr OR gedcom=\"\")" : " AND $recipstr";
diff -r TNG/admin_setup.php TNG1403/admin_setup.php
8a9,15
> if( !$rootpath ) {
> 	$rootpath = dirname(__FILE__) . "/";
> 	if (preg_match("/WIN/i",PHP_OS)) {
> 	    $rootpath = str_replace("\\","/",$rootpath);
> 	}
> }
> 
13c20
< if($subroot != $_GET['sr'])
---
> if(isset($_GET['sr']) && $subroot != $_GET['sr'])
23c30
< if(!$sitever)
---
> if(empty($sitever))
26,28c33,35
< session_start();
< $session_language = $_SESSION['session_language'];
< $session_charset = $_SESSION['session_charset'];
---
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
> $session_language = isset($_SESSION['session_language']) ? $_SESSION['session_language'] : "";
> $session_charset = isset($_SESSION['session_charset']) ? $_SESSION['session_charset'] : "";
45c52
< $result = tng_query_noerror($query);
---
> $result = tng_query($query);
63,64c70
< if( !$sub ) $sub = "configuration";
< $flags['tabs'] = $tngconfig['tabs'];
---
> if(empty($sub)) $sub = "configuration";
69,70d74
< <body background="img/background.gif">
< 
71a76,77
> 	echo tng_adminlayout();
> 
81,83c87,88
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
123,128c128,132
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_showbranch.php TNG1403/admin_showbranch.php
28c28
< $query = "SELECT personID, firstname, lastname, lnprefix, prefix, suffix, branch, gedcom, nameorder, living, private FROM $people_table WHERE gedcom = \"$tree\" and branch LIKE \"%$branch%\" ORDER BY lastname, firstname";
---
> $query = "SELECT personID, firstname, lastname, lnprefix, prefix, suffix, title, branch, gedcom, nameorder, living, private, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr FROM $people_table WHERE gedcom = \"$tree\" and branch LIKE \"%$branch%\" ORDER BY lastname, firstname";
33d32
< $flags['tabs'] = $tngconfig['tabs'];
38,39d36
< <body background="img/background.gif">
< 
40a38,39
> 	echo tng_adminlayout();
> 
42c41
< 	$branchtabs[1] = array($allow_add,"admin_newbranch.php",$admtext[addnew],"addbranch");
---
> 	$branchtabs[1] = array($allow_add,"admin_newbranch.php",$admtext['addnew'],"addbranch");
83,85c82,84
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/adminshowlog.php TNG1403/adminshowlog.php
19a20,23
> if(!isset($selected_user)) $selected_user = "";
> 
> $query = "SELECT username, realname FROM $users_table ORDER BY username";
> $result = tng_query($query);
23,25c27,31
< <body background="img/background.gif">
< <div width="100%" class="lightback">
< 	<div style="padding:10px" class="databack normal">
---
> <?php
> 	echo tng_adminlayout();
> ?>
> <div class="admin-main" style="border-radius:20px">
> 	<div class="databack admin-block">
27,28c33,50
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">	
< 		<tr><td class="fieldnameback fieldname"><?php echo $admtext['mostrecentactions']; ?></td></tr>
---
> 	<form action="adminshowlog.php" method="post"  id="form1" name="form1">
> 	<?php echo $admtext['user']; ?>:
> 	<select name="selected_user" id="selected_user">
> 		<option value=""></option>
> <?php
> while( $row = tng_fetch_assoc($result) ) {
> 	echo "		<option value=\"{$row['username']}\"";
> 	if($selected_user == $row['username'])
> 		echo " selected=\"selected\"";
> 	echo ">{$row['username']} | {$row['realname']}</option>\n";
> }
> ?>
> 	</select>
> 	<input type="submit" name="submit" value="<?php echo $admtext['go']; ?>" class="aligntop">
> 	</form>
> 	<br/>
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">	
> 		<tr><td class="fieldnameback fieldname" colspan="3"><?php echo $admtext['mostrecentactions']; ?></td></tr>
30c52,54
< 	$lines = file( $adminlogfile );
---
> 	if(isset($logsaveconfig) && $logsaveconfig == 1)
>   		$adminlogfile = $subroot . $adminlogfile;
>   	$lines = file( $adminlogfile );
33c57,62
< 		echo "<tr><td class=\"lightback\">$line</td></tr>\n";
---
> 		if(!$selected_user || strpos($line,$selected_user . " |") !== false) {
> 			if(strpos($line,"<tr>") !== 0)
> 				echo "<tr><td colspan=\"3\" class=\"lightback\">$line</td></tr>\n";
> 			else
> 				echo "$line\n";
> 		}
40,42c69,71
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_showmodslog.php TNG1403/admin_showmodslog.php
2,39c2,8
< //  admin_showmodmgrlog.php created from the adminshowlog.php
< //     by Ken Roy to split the Mod Manager action log from the Admin Change log
< //  %version:10.0.3.0%
< // Updated May 3, 2014 by Ken Roy
< //		- to incorporate Rick's Batch processing module
< // Updated May 17, 2014 by Jeff Robison
< //		- to add a Clear Log option to the innermenu
< // Updated May 20, 2014 by Ken Roy
< //		- to add Mod Guidelines, Mod Syntax, and Mods for TNG vnn to the innermenu
< // Updated 21 May 2014 by Jeff Robison
< //		- to fix the header section
< // Updated 22 May 2014 by Ken Roy
< //		- to externalize the fixed header style definitions
< // Updated 13 Oct 2014 by Robin Richmond
< //		- to collapse the details of each mod and open them when the user clicks on an arrow image
< // Updated 14 Oct 2014 19:21 by Robin Richmond
< //		- to incorporate mod handler help file, mod analyzer, and collapse all and expand all button in the menu & inner menu
< // Updated 17 Oct 2014 11:32 by Robin Richmond
< //		- to simplify parsing of the first line of the log entry.
< // Updated 20 Oct 2014 by Ken Roy
< //		- to add options for Analyzer tab and Compress Log
< // Updated 21 Oct 2014 21:58 by Robin Richmond
< //		- to pay attention to the new compress_log option
< // Updated 22 Oct 2014 by Ken Roy
< //		- to display Expand All / Collapse All if $sitever == standard or $options['compress_log'] == YES
< // Updated 22 Oct 2014 18:18 by Robin Richmond
< //		- to use the latest code for identifying legitimate log entries.
< 
< 
< // Note: this code deals with three types of log entries:
< //  1. The newest, GENIII log entries that consist of on physical line that contains multiple HTML lines.
< //     The first line is pipe-delimited and contains the log entry heading.
< //  2. Older (probably generated by test versions of GenIII, but I'm sure) log entries that also
< //     consist of one physical line that contains multiple HTML lines.  The first line is not pipe-
< //     delimited, but it does contains a log entry heading.
< //  3. Even older log entries that consist of multiple physical lines, in reverse chronological
< //     order.  Thus, the first line we encounter is the last line of the log entry.  But we use that
< //    last line as the entry header.
---
> /*
>    Mod Manager v13 Mod log display handler
>       Written by Ken Roy, TNG Test Manager
>       v12 Updated by Ken Roy and Robin Richmond
>       v13 Updated by Rick Bisbee
>       * Updates code/styling for new TNGv13 Admin pages no longer using iframes.
>       * No changes to core (OOP classes) functionality from TNGv12.
41,42c10,22
< include("begin.php");
< include("adminlib.php");
---
>     Note: this code deals with three types of log entries:
> 
>     1. The newest, GENIII log entries that consist of one physical line that contains multiple HTML lines. The first line is pipe-delimited and contains the log entry heading.
> 
>     2. Older (probably generated by test versions of GenIII -- not sure) log entries that also consist of one physical line that contains multiple HTML lines.  The first line is not pipe-delimited, but it does contains a log entry heading.
> 
>     3. Even older log entries that consist of multiple physical lines, in reverse chronological order.  Thus, the first line we encounter is the last line of the log entry.  But we use that last line as the entry header.
> 
>     --Robin Richmond
> 
> */
> require 'begin.php';
> require 'adminlib.php';
44d23
< include("getlang.php");
46,47c25
< include("$mylanguage/admintext.php");
< //include("$mylanguage/admintext.php");
---
> require_once $mylanguage.'/admintext.php';
49d26
< //tng_db_connect($database_host,$database_name,$database_username,$database_password) or exit;
51,52c28,31
< include("checklogin.php");
< include("version.php");
---
> require 'checklogin.php';
> require 'version.php';
> 
> include 'classes/mmtabs.inc';
54,56c33,38
< // temporary: these can be set from an options file
< //include 'classes/mod.class.config.php';
< include $subroot.'mmconfig.php';
---
> // prevent direct URL access to Mod Manager if not the TNG Administrator
> if( $assignedtree || !$allow_edit ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
62c44,47
< $flags['tabs'] = $tngconfig['tabs'];
---
> 
> /***************************************************************
>     1. OUTPUT STD ADMIN PAGE HTML HEADER + ADDITIONS
> ***************************************************************/
66,76c51
< $min_width = $sitever == 'mobile' ? '0' : '640px';
< echo "
< <style type='text/css'>
< body {
<    margin:0;
<    overflow-y: scroll;
<    min-width:$min_width;
< }
< </style>";
< 
< $helplang = findhelp("modmanager_help.php");
---
> require $subroot.'mmconfig.php';
82,96c57
< $parts = explode( ".", $tng_version );
< $tngmodver = "Mods for TNG v{$parts[0]}";
< $modtabs = set_horizontal_tabs( $options['show_analyzer'], $options['show_developer'], $options['show_updates']);
< $innermenu = set_innermenu_links( $tng_version );
< 
< $menu = "<div class=\"mmmenuwrap\">";
< $menu .= doMenu($modtabs,"viewlog",$innermenu);
< $menu .= "</div>";
< if(!isset($message)) $message = "";
< $headline = displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
< //$logheader = $options['maxloglines'] . " " . $admtext['recentactions'];
< $logheader =  $admtext['recentactions'];
< $first_menu=TRUE;
< 
< $clearmmlog = empty( $_GET['clearmmlog'] ) ? false : true;
---
> $min_width = $sitever == 'mobile' ? '0' : '640px';
98,106c59,67
< if( $options['fix_header'] == YES && $sitever != 'mobile' ) {
<    $headclass = 'mmhead-fixed';
<    $ibarclass = 'ibar-fixed';
<    $mmlogclass = 'mmlog-fixed';
< }
< else {
<    $headclass = 'mmhead-scroll';
<    $ibarclass = 'ibar-scroll';
<    $mmlogclass = 'mmlog-scroll';
---
> /* Adjust positioning for problem templates */
> switch($templatenum)
> {
>   case 7:
>     $margin_top = "0px";
>     break;
>   default:
>     $margin_top = "162px";
>     break;
109,117d69
< echo "
< <script type=\"text/javascript\" src=\"js/admin.js\"></script>
< </head>
< <body background=\"img/background.gif\" style=\"margin:0;\">
< <div id=\"mmhead\" class=\"$headclass adminback\">
<    $headline
< </div><!--head-section-->";
< 
< //if ( $sitever == "standard" && $options['compress_log'] == YES) {
121,123c73,78
< 	.action {padding-left:15px; cursor: pointer; background: url(img/tng_expand.gif) no-repeat left center;}
< 	.collapse {background: url(img/tng_collapse.gif) no-repeat left center;
< 	.collapse a { text-decoration: none;}
---
> 	.collapse {
>     background: url(img/tng_collapse.gif) no-repeat left center;
>   }
> 	.collapse a {
>     text-decoration: none;
>   }
125c80,81
< </style>";
---
> </style>
> ";
131c87,126
< //if (isset( $logfilename) ) $options['modlogfile']=$logfilename; //TEMPORARY CODE - get logfilename from querystring parameter
---
> /* Height of the table display must be set for
> ** each page to account for differences in
> ** heading heights.
> **
> ** The <head> tag must be explicitly closed. */
> echo "
> <style>
>   .tableFixedHead {
>     height:calc( 100vh - 220px ) !important;
>   }
> </style>
> </head>
> ";
> 
> /***************************************************************
>     2. OUTPUT TNG ADMIN TOP BANNER AND LEFT SIDE MENUS
> ***************************************************************/
> echo tng_adminlayout();
> 
> /***************************************************************
>     3. PREPARE MOD MANAGER PAGE TITLE, TABS AND HORZ MENU
> ***************************************************************/
> $parts = explode( ".", $tng_version );
> //$tngmodver = "Mods for TNG v{$parts[0]}";
> $modtabs = set_horizontal_tabs( $options['show_analyzer'], $options['show_developer'], $options['show_updates']);
> 
> $innermenu = set_innermenu_links( $tng_version );
> $menu = doMenu($modtabs,"viewlog",$innermenu);
> 
> if(!isset($message)) $message = "";
> echo displayHeadline($admtext['modmgr'],"img/modmgr_icon.gif",$menu,$message);
> 
> $logheader =  $admtext['recentactions'];
> $first_menu=TRUE;
> 
> $clearmmlog = empty( $_GET['clearmmlog'] ) ? false : true;
> 
> /***************************************************************
>     4. MOD MANAGER LOG DISPLAY PAGE CONTENT
> ***************************************************************/
133c128
< if (!isset( $options['modlogfile'])) $options['modlogfile'] = $logfilename; //TEMPORARY CODE - get logfilename from querystring parameter
---
> if (!isset( $options['modlogfile'])) $options['modlogfile'] = $logfilename; 
140,150d134
<    //echo "<table cellpadding=\"3\" cellspacing=\"1\" class=\"normal lightback w100\">\n";
<    //Add the heading with the Mod Manager Recent Actions message
<    //echo "<tr><td colspan=\"$nColumns\" class=\"fieldnameback fieldname\">$logheader</td></tr>";
<    //echo "</table>";
< 
< echo "
< <table id=\"infobar\" class=\"normal lightback $ibarclass\">
<    <tr>
<       <td colspan=\"1\" class=\"fieldnameback fieldname mmpadleft\">$logheader</td>
<    </tr>
< </table>";
153c137,147
< <table id=\"mmlog\" class=\"normal lightback $mmlogclass\">";
---
> <div class='admin-main'>
>   <div class='tableFixedHead roundtop'>
>   <table id=\"mmtable\" class=\"mmtable\">
>     <thead>
>       <tr>
>         <th class='fieldnameback fieldname'>
>           Mod Manager Most Recent Actions
>         </th>
>       </tr>
>     </thead>
>     ";
181c175
< 					echo "<tr class=\"databack mmpadleft moddetails\" $hideDetails id=\"data$actionCount\"><td colspan=\"$nColumns\">$logEntryDetails</td></tr>\n";
---
> 					echo "<tr class=\"databack moddetails\" $hideDetails id=\"data$actionCount\"><td colspan=\"$nColumns\"class='mmpanel'>$logEntryDetails</td></tr>\n";
194a189,191
>             elseif( false !== stripos( $heading, "Clean Up" ) ) {
>                $dynoclass = "partinst";
>             }
210,211c207,208
< 				echo "<tr class=\"$dynoclass mmpadleft\">";
< 				echo "<td class=\"action\" id=\"action$actionCount\">$actionCount. $heading</td></tr>\n";
---
> 				echo "<tr class='$dynoclass'>";
> 				echo "<td class=\"mmrounded action $dynoclass\" id=\"action$actionCount\">$actionCount. $heading</td></tr>\n";
221c218
< 						echo "<tr class=\"databack mmpadleft moddetails\" $hideDetails id=\"data$actionCount\"><td colspan=\"$nColumns\">$logEntryDetails</td></tr>\n";
---
> 						echo "<tr class=\"databack moddetails\" $hideDetails id=\"data$actionCount\"><td colspan=\"$nColumns\">$logEntryDetails</td></tr>\n";
227c224
< 					echo "<tr class=\"databack mmpadleft\">";
---
> 					echo "<tr class=\"databack\">";
240c237
< 						echo "<tr><td class=\"databack mmpadleft\" colspan=\"$nColumns\"><b>?? </b>$line</td></tr>\n";
---
> 						echo "<tr><td class=\"databack\" colspan=\"$nColumns\"><b>?? </b>$line</td></tr>\n";
248c245
< 		echo "<tr class=\"databack mmpadleft moddetails\" $hideDetails id=\"data$actionCount\"><td colspan=\"$nColumns\">$logEntryDetails</td></tr>\n";
---
> 		echo "<tr class=\"databack moddetails\" $hideDetails id=\"data$actionCount\"><td colspan=\"$nColumns\">$logEntryDetails</td></tr>\n";
252c249,252
< 	</table>";
---
> 	</table>
>   </div><!--tableFixedHead-->
> 	<br />
> </div><!-- admin-main-->";
256,271c256
< function set_horizontal_tabs( $show_analyzer = NO, $show_developer = NO, $show_updates = NO ) {
<   global $admtext;
< 
<    $modtabs = array();
<    $modtabs[0] = array(1, "admin_modhandler.php", $admtext['modlist'],"modlist");
<    $modtabs[1] = array(1,"admin_showmodslog.php",$admtext['viewlog'],"viewlog");
<    $modtabs[2] = array(1,"admin_modoptions.php",$admtext['options'],"options");
<    if ( $show_analyzer == YES)
<       $modtabs[3] = array(1,"admin_analyzemods.php",$admtext['analyzefiles'],'files');
<    if ( $show_developer == YES)
<       $modtabs[4] = array(1,"admin_modtables.php",$admtext['parsetable'],'parser');
<    if ( $show_updates == YES)
<       $modtabs[5] = array(1,"admin_modupdates.php",$admtext['recommendedfixes'],'updates');
<     return $modtabs;
< }
< function set_innermenu_links( $tng_version ) {
---
> function set_innermenu_links( $tng_version, $pageID='viewlog' ) {
279c264,265
<    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
>    $innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/modhandler_help.php#$pageID');\" class=\"lightlink\">{$admtext['help']}</a>
> ";
282,283c268,271
<    $innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" id=\"expandall\"> {$text['expandall']}</a>";
<    $innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" id=\"collapseall\">{$text['collapseall']}</a>";
---
>    $innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" id=\"expandall\"> {$text['expandall']}</a>
> ";
>    $innermenu .= " &nbsp;|&nbsp; <a href=\"#\" class=\"lightlink\" id=\"collapseall\">{$text['collapseall']}</a>
> ";
286,288c274,275
<    //if ($options['compress_log'] == YES) {
< 		$innermenu .= " &nbsp;|&nbsp; <a href=\"admin_showmodslog.php?clearmmlog=true\" onclick=\"return confirm( '{$admtext['confirmclearlog']}')\"; class=\"lightlink\">{$admtext['clearlog']}</a>";
<    //}
---
>    $innermenu .= " &nbsp;|&nbsp; <a href=\"admin_showmodslog.php?clearmmlog=true\" onclick=\"return confirm( '{$admtext['confirmclearlog']}')\" class=\"lightlink\">{$admtext['clearlog']}</a>
> ";
291c278,279
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax\" target=\"_blank\" class=\"lightlink\">{$admtext['modsyntax']}</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax\" target=\"_blank\" class=\"lightlink\">{$admtext['modsyntax']}</a>
> ";
294c282,283
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Guidelines\" target=\"_blank\" class=\"lightlink\">{$admtext['modguidelines']}</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Mod_Guidelines\" target=\"_blank\" class=\"lightlink\">{$admtext['modguidelines']}</a>
> ";
297c286,287
<    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Category:$tngmodurl\" target=\"_blank\" class=\"lightlink\">$tngmodver</a>";
---
>    $innermenu .= "&nbsp;&nbsp;|&nbsp;&nbsp;<a href=\"https://tng.lythgoes.net/wiki/index.php?title=Category:$tngmodurl\" target=\"_blank\" class=\"lightlink\">$tngmodver</a>
> ";
303,328d292
< //$sitever = 'mobile'; //bypass jQuery positioning for testing
< if( $sitever != 'mobile' && $options['adjust_headers'] ) {
<    echo "
< <script type=\"text/javascript\">
<    jQuery(document).ready(function() {
< 	   // set position of table relative to inner menu
< 	   jQuery('#infobar').position({
< 	      my: 'left top',
< 	      at: 'left bottom',
< 	      of: jQuery('#mmhead'),
< 	      collision: 'fit'
< 	   });
< 	   // set position of listing table relative to info bar
< 	   jQuery('#mmlog').position({
< 	      my: 'left top',
< 	      at: 'left bottom',
< 	      of: jQuery('#infobar'),
< 	      collision: 'none'
< 	   });
< 	});
< </script>";
< }
<    echo "
< <div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>
< </body>
< </html>";
363a328,329
> <?php
> echo tng_adminfooter();
diff -r TNG/admin_sources.php TNG1403/admin_sources.php
12c12,14
< if( $newsearch ) {
---
> if(empty($exactmatch)) $exactmatch = "";
> 
> if( !empty($newsearch) ) {
21,26c23,28
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_sources_post']['search']);
< 	if( !$tree )
< 		$tree = $_COOKIE['tng_tree'];
< 	if( !$exactmatch )
< 		$exactmatch = $_COOKIE['tng_search_sources_post']['exactmatch'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_sources_post']['search']) ? stripslashes($_COOKIE['tng_search_sources_post']['search']) : "";
> 	if( empty($tree) )
> 		$tree = isset($_COOKIE['tng_tree']) ? $_COOKIE['tng_tree'] : "";
> 	if( empty($exactmatch) )
> 		$exactmatch = isset($_COOKIE['tng_search_sources_post']['exactmatch']) ? $_COOKIE['tng_search_sources_post']['exactmatch'] : "";
28,29c30,31
< 		$tngpage = $_COOKIE['tng_search_sources_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_sources_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_sources_post']['tngpage']) ? $_COOKIE['tng_search_sources_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_sources_post']['offset']) ? $_COOKIE['tng_search_sources_post']['offset'] : 0;
32a35
> 		if( !isset($tngpage) ) $tngpage = 1;
37,40c40,44
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
---
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
> 
> if(!empty($order))
> 	setcookie("tng_search_sources_post[order]", $order, $exptime);
42c46
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> 	$order = isset($_COOKIE['tng_search_sources_post']['order']) ? $_COOKIE['tng_search_sources_post']['order'] : "title";
43a48
> if(!isset($offset)) $offset = 0;
61a67,72
> $uquery = "SELECT count(userID) as ucount FROM $users_table WHERE allow_living != \"-1\"";
> $uresult = tng_query($uquery) or die ($admtext['cannotexecutequery'] . ": $uquery");
> $urow = tng_fetch_assoc( $uresult );
> $numusers = $urow['ucount'];
> tng_free_result($uresult);
> 
106c117,164
< $query = "SELECT sourceID, shorttitle, title, $sources_table.gedcom as gedcom, treename, ID FROM ($sources_table, $trees_table) WHERE $allwhere ORDER BY shorttitle, title LIMIT $newoffset" . $maxsearchresults;
---
> $idsort = "id";
> $titlesort = "titleup";
> $changesort = "change";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "id") {
> 	$orderstr = "sourceIDnum, shorttitle, title";
> 	$idsort = "<a href=\"admin_sources.php?order=idup\" class=\"lightlink\">{$admtext['sourceid']} $descicon</a>";
> }
> else {
> 	$idsort = "<a href=\"admin_sources.php?order=id\" class=\"lightlink\">{$admtext['sourceid']} $ascicon</a>";
> 	if($order == "idup")
> 		$orderstr = "sourceIDnum DESC, shorttitle DESC, title DESC";
> }
> if($tngconfig['sourcesuffix']) {
> 	$len = strlen($tngconfig['sourcesuffix']);
> 	$idselect = ", CAST(LEFT(sourceID, LENGTH(sourceID)-$len) AS UNSIGNED) AS sourceIDnum";
> }
> elseif($tngconfig['sourceprefix']) {
> 	$len = strlen($tngconfig['sourceprefix']);
> 	$idselect = ", CAST(RIGHT(sourceID, LENGTH(sourceID)-$len) AS UNSIGNED) AS sourceIDnum";
> }
> else
> 	$idselect = ", CAST(sourceID AS UNSIGNED) AS sourceIDnum";
> 
> if($order == "title") {
> 	$orderstr = "shorttitle, title";
> 	$titlesort = "<a href=\"admin_sources.php?order=titleup\" class=\"lightlink\">{$admtext['title2']} $descicon</a>";
> }
> else {
> 	$titlesort = "<a href=\"admin_sources.php?order=title\" class=\"lightlink\">{$admtext['title2']} $ascicon</a>";
> 	if($order == "titleup")
> 		$orderstr = "shorttitle DESC, title DESC";
> }
> 
> if($order == "change") {
> 	$orderstr = "changedate, shorttitle, title";
> 	$changesort = "<a href=\"admin_sources.php?order=changeup\" class=\"lightlink\">{$admtext['lastmodified']} $descicon</a>";
> }
> else {
> 	$changesort = "<a href=\"admin_sources.php?order=change\" class=\"lightlink\">{$admtext['lastmodified']} $ascicon</a>";
> 	if($order == "changeup")
> 		$orderstr = "changedate DESC, shorttitle DESC, title DESC";
> }
> 
> $query = "SELECT sourceID{$idselect}, shorttitle, title, $sources_table.gedcom as gedcom, treename, ID, changedby, DATE_FORMAT(changedate,\"%d %b %Y\") as changedatef FROM ($sources_table, $trees_table) 
> 	WHERE $allwhere ORDER BY $orderstr LIMIT $newoffset" . $maxsearchresults;
122d179
< $flags['tabs'] = $tngconfig['tabs'];
135,136d191
< <body background="img/background.gif">
< 
137a193,194
> 	echo tng_adminlayout();
> 
146,149c203,204
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
193c248
< 		<input type="submit" name="xsrcaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
> 		<input type="submit" name="xsrcaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
199c254
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
209,210c264,265
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['sourceid']; ?></b>&nbsp;</nobr></span></td>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['title']; ?></b>&nbsp;</nobr></span></td>
---
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $idsort; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $titlesort; ?></b>&nbsp;</nobr></span></td>
217a273
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $changesort; ?></b>&nbsp;</nobr></span></td>
243a300,301
> 			$changedby = $numusers > 1 ? "{$row['changedby']}: " : "";
> 			echo "<td class=\"lightback\">{$changedby}{$row['changedatef']}</td>\n";
259,261d316
< </td>
< </tr>
< </table>
263,265c318,320
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_tablecreate.php TNG1403/admin_tablecreate.php
23a24,25
> if ( !isset($helplang) ) $helplang = "English";
> 
29d30
< $flags['tabs'] = $tngconfig['tabs'];
34,35d34
< <body background="img/background.gif">
< 
36a36,37
> 	echo tng_adminlayout();
> 
45,47c46,47
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< 	<tr class="databack">
< 		<td class="tngshadow"><span class="normal"><p>
---
> <div class="admin-main">
> 	<div class="databack admin-block">
57,62c57,61
< 		</td>
< 	</tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_templateconfig.php TNG1403/admin_templateconfig.php
27,30c27,32
< 	$key = "t" . $row['template'] . "_" . $row['keyname'];
< 	if($row['language'])
< 		$key .= "_" . $row['language'];
< 	$tmp[$key] = $row['value'];
---
> 	if( is_dir($cms['tngpath'] . "templates/template" . $row['template']) || is_dir($cms['tngpath'] . "templates/" . $row['template'])) {
> 		$key = "t" . $row['template'] . "_" . $row['keyname'];
> 		if($row['language'])
> 			$key .= "_" . $row['language'];
> 		$tmp[$key] = $row['value'];
> 	}
44a47,56
> $treequery = "SELECT gedcom, treename FROM $trees_table ORDER BY treename";
> $treeresult = tng_query($treequery) or die ($admtext['cannotexecutequery'] . ": $treequery");
> $treenum = 0;
> while( $treerow = tng_fetch_assoc($treeresult) ) {
> 	$treenum++;
> 	$trees[$treenum] = $treerow['gedcom'];
> 	$treename[$treenum] = $treerow['treename'];
> }
> tng_free_result($treeresult);
> 
47d58
< $flags['tabs'] = $tngconfig['tabs'];
51a63
> <script type="text/javascript" src="js/selectutils.js"></script>
53a66,69
> 	if(newtemp) {
> 		jQuery('#form_templateswitching').val('1');
> 		jQuery('#topsave').hide();
> 	}
100a117,123
> function getTopValues(flagfield, numfield) {
> 	topflagfield = document.formtop1.form_templateswitching;
> 	flagfield.value = topflagfield.options[topflagfield.selectedIndex].value;
> 	topnumfield = document.formtop2.form_templatenum;
> 	numfield.value = topnumfield.options[topnumfield.selectedIndex].value;
> }
> 
119,120d141
< <body background="img/background.gif">
< 
121a143,144
> 	echo tng_adminlayout();
> 
126c149
< 	$innermenu .= "<a href=\"#\" onclick=\"return openHelp('$helplang/templateconfig_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
---
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/templateconfig_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
131,139c154,166
< <form action="admin_updatetemplateconfig.php" method="post" name="form1" ENCTYPE="multipart/form-data">
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<label for="form_templateswitching"><?php echo $admtext['templateswitching']; ?>:</label>
< 	<select name="form_templateswitching" id="form_templateswitching">
< 		<option value="0"<?php if( !$templateswitching ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
< 		<option value="1"<?php if( $templateswitching ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
< 	</select>
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
> 	<form name="formtop1" action="admin_updatetemplateconfig.php" method="post">
> 		<label for="form_templateswitching"><?php echo $admtext['templateswitching']; ?>:</label>
> 		<select name="form_templateswitching" id="form_templateswitching" onchange="if(jQuery(this).val() == '0') {jQuery('#form_templatenum').val(''); jQuery('#topsave').show(); switchTemplates('')}">
> 			<option value="0"<?php if( !$templateswitching ) echo " selected"; ?>><?php echo $admtext['no']; ?></option>
> 			<option value="1"<?php if( $templateswitching ) echo " selected"; ?>><?php echo $admtext['yes']; ?></option>
> 		</select>
> 		<input type="submit" name="submittop" id="topsave" value="<?php echo $admtext['save']; ?>" style="display:none"/>
> 		<input type="hidden" name="form_templatenum" value=""/>
> 	</form>
142,144c169,172
< <tr class="databack">
< <td class="tngshadow">
< 	<label for="form_templatenum"><b><?php echo $admtext['template']; ?>:</b></label>
---
> <tr>
> <td class="tngshadow databack">
> 	<form name="formtop2">
> 		<label for="form_templatenum"><b><?php echo $admtext['template']; ?>:</b></label>
153,154c181,182
<     			if( is_dir( $filename ) && $filename != "." && $filename != ".." ) {
<                 		$i = substr($filename,0,8) == "template" && is_numeric(substr($filename,8)) ? substr($filename, 8) : $filename;
---
> 			if( is_dir( $filename ) && $filename != "." && $filename != ".." && $filename != '@eaDir' ) {
> 				$i = substr($filename,0,8) == "template" && is_numeric(substr($filename,8)) ? substr($filename, 8) : $filename;
156c184
<                 $sections['t'.$i] = "";
---
> 				$sections['t'.$i] = "";
178,179c206
< 		<input type="submit" name="submittop" accesskey="s" value="<?php echo $admtext['save']; ?>">
< 		<br/>
---
> 	</form>
181c208
< 	<div style="display:none" id="previewscroll" class="scroller">
---
> 	<div style="display:none;" id="previewscroll" class="scroller">
200c227
< 	$textareas = array('mainpara','searchpara','fhpara','fhlinkshis','fhlinkshers','mwpara','featurepara','respara','featurelinks','reslinks','headtitle','headsubtitle','latestnews','featurepara1','featurepara2','featurepara3','featurepara4','featurepara5','featurepara6','featurepara6','featurepara7','photocaption','newstext','featurespara','photocaptionl','photocaptionr');
---
> 	$textareas = array('mainpara','searchpara','fhpara','fhlinkshis','fhlinkshers','mwpara','featurepara','respara','featurelinks','reslinks','headtitle','headsubtitle','latestnews','featurepara1','featurepara2','featurepara3','featurepara4','featurepara5','featurepara6','featurepara7','featurepara8','featurepara9','photocaption','newstext','featurespara','textpara1','textpara2','textpara3','photocaptionl','photocaptionr','snipinfoone','snipinfotwo','quote','mompara','dadpara','spmompara','spdadpara','sidebarpara','footerpara');
202c229,237
< 	$needtrans = array('headline','maintitle','welcome','hisside','herside','headtitle1','headtitle2','headtitle3','momside','dadside','mainpara','featurepara','searchpara','fhpara','mwpara','respara','headtitle','headsubtitle','latestnews','featuretitle1','featuretitle2','featuretitle3','featuretitle4','featuretitle5','featuretitle6','featurepara1','featurepara2','featurepara3','featurepara4','featurepara5','featurepara6','featurepara7','featurepara8','photocaption','newstext','menutitle','phototitlel','photocaptionl','phototitler','photocaptionr','topsurnames','featurespara','sidebarhead1','sidebarhead2','sidebarhead3','texttitle1','texttitle2','texttitle3','textpara1','textpara2','textpara3','subhead1','subhead2');
---
> 	$needtrans = array('headline','maintitle','welcome','hisside','herside','headtitle1','headtitle2','headtitle3','momside','dadside','mainpara','featurepara',
> 		'featurelinks','featurelinktext','searchpara','fhpara','mwpara','respara','headtitle','headsubtitle','latestnews','featuretitle1','featuretitle2','featuretitle3',
> 		'featuretitle4','featuretitle5','featuretitle6','featuretitle7','featuretitle8','featuretitle9','featurepara1','featurepara2','featurepara3','featurepara4',
> 		'featurepara5','featurepara6','featurepara7','featurepara8','featurepara9','photocaption','newstext','menutitle','phototitlel','photocaptionl','phototitler',
> 		'photocaptionr','topsurnames','featurespara','sidebarhead1','sidebarhead2','sidebarhead3','sidebartitle','sidebarsub','sidebarpara','sidebarlinktext',
> 		'texttitle1','texttitle2','texttitle3','textpara1','textpara2','textpara3','subhead1','subhead2','snipinfoone','snipinfotwo','quote','subhead',
> 		'ancestors','momheading','mompara','dadheading','dadpara','spmomheading','spmompara','spdadheading','spdadpara','spmomside','spdadside','storiesheading',
> 		'quotehead','slideheadline','slidetext','slidelinktext','footerheadline','footerlinktext','footerpara','linktext','featuresub','featuretitle','headline',
> 		'snipheadline','snipname','slidetitle','snipsubhead','sniptitle');
206a242,248
> 		$label_parts = explode("-",$label);
> 		if(isset($label_parts[1])) {
> 			$index = " " . $label_parts[1];
> 			$label = $label_parts[0];
> 		}
> 		else
> 			$index = "";
207a250
> 		if( !isset($sections[$n]) ) $sections[$n] = "";
212a256,259
> 		elseif(substr($label, -4) === "tree") {
> 			$type = "select";
> 			$align = "";
> 		}
218,219c265,267
< 		$sections[$n] .= isset($parts[2]) ? "&nbsp;&nbsp;{$admtext[$label]}:" : "{$admtext[$label]}:";
< 		$sections[$n] .= isset($parts[2]) ? "<br/>&nbsp;&nbsp;&nbsp;&nbsp;(" . $languageArray[$parts[2]] . ")" : "";
---
> 		$sections[$n] .= isset($parts[2]) ? "&nbsp;&nbsp;{$admtext[$label]}{$index}:" : ($label != "" ? $admtext[$label] . $index . ":" : $index . ":");
> 		$langName = isset($parts[2]) && isset($languageArray[$parts[2]]) ? $languageArray[$parts[2]] : (!empty($parts[2]) ? $parts[2] : "");
> 		$sections[$n] .= $langName ? "<br/>&nbsp;&nbsp;&nbsp;&nbsp;(" . $langName . ")" : "";
224a273,281
> 		elseif($type == "select") {
> 			$sections[$n] .=  "<select name=\"form_$key\" id=\"form_$key\">\n";
> 			for( $j = 1; $j <= $treenum; $j++ ) {
> 				$sections[$n] .=  "	<option value=\"$trees[$j]\"";
> 				if($value == $trees[$j]) $sections[$n] .= " selected";
> 				$sections[$n] .=  ">$treename[$j]</option>\n";
> 			}
> 			$sections[$n] .=  "</select>\n";
> 		}
239c296,297
< 				$size = @GetImageSize($rootpath . "templates/{$folders[$n]}/$value");
---
> 				$safevalue = strpos($value, "&#34;") != false ? substr($value, 0, strpos($value, "&#34;")) : $value;
> 				$size = @GetImageSize($rootpath . "templates/{$folders[$n]}/$safevalue");
246a305,310
> 			elseif(substr($label, -6) == "person") {
> 				$treefield = str_replace("person","tree",$key);
> 				$sections[$n] .= "<a href=\"#\" onclick=\"return findItem('I','form_{$key}','',$('#form_{$treefield}').val(),'');\" title=\"{$admtext['find']}\">\n";
> 				$sections[$n] .= "<img src=\"img/tng_find.gif\" title=\"{$admtext['find']}\" alt=\"{$admtext['find']}\" class=\"alignmiddle\" width=\"20\" height=\"20\" border=\"0\" vspace=\"0\" hspace=\"2\">\n";
> 				$sections[$n] .= "</a>\n";
> 			}
260c324,326
< 			echo "<div$dispstr class=\"tsection\" id=\"t$i\">\n<table class=\"tstable normal\">\n";
---
> 			echo "<div$dispstr class=\"tsection\" id=\"t$i\">\n";
> 			echo "<form action=\"admin_updatetemplateconfig.php\" method=\"post\" name=\"form$i\" ENCTYPE=\"multipart/form-data\" onsubmit=\"getTopValues(this.form_templateswitching,this.form_templatenum);\">\n";
> 			echo "<table class=\"tstable normal\">\n";
268a335,336
> 			echo "<input type=\"submit\" name=\"submit{$i}\" class=\"btn saveret\" accesskey=\"s\" value=\"{$admtext['saveback']}\">\n";
> 			echo "<input type=\"submit\" name=\"submitx{$i}\" class=\"btn savestay\" accesskey=\"s\" value=\"{$admtext['savereturn']}\">\n";
270c338,345
< 			echo "$section</table>\n</div>\n";
---
> 			echo "$section</table><br/>\n";
> 			echo "<input type=\"submit\" name=\"submit\" class=\"btn\" value=\"{$admtext['saveback']}\">\n";
> 			echo "<input type=\"submit\" name=\"submitx\" accesskey=\"s\" class=\"btn\" value=\"{$admtext['savereturn']}\">\n";
> 			echo "<input type=\"button\" name=\"cancel\" class=\"btn\" value=\"{$text['cancel']}\" onClick=\"window.location.href='admin_setup.php';\">\n";
> 			echo "<input type=\"hidden\" name=\"form_templateswitching\" value=\"\"/>\n";
> 			echo "<input type=\"hidden\" name=\"form_templatenum\" value=\"\"/>\n";
> 			echo "</form>\n";
> 			echo "</div>\n";
274d348
< 	<br/><input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
280,282c354,357
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
Only in TNG1403: admin_templatemsgs.php
diff -r TNG/admin_thumbnails.php TNG1403/admin_thumbnails.php
20d19
< $flags['tabs'] = $tngconfig['tabs'];
34,35d32
< <body background="img/background.gif">
< 
36a34,35
> 	echo tng_adminlayout();
> 
49c48,50
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
---
> <div class="admin-main">
> 
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
52c53
< 	if( function_exists( imageJpeg ) ) {
---
> 	if( function_exists( 'imageJpeg' ) ) {
54,55c55,56
< <tr class="databack">
< <td class="tngshadow normal">
---
> <tr>
> <td class="tngshadow databack">
77,78c78,79
< <tr class="databack">
< <td class="tngshadow normal">
---
> <tr>
> <td class="tngshadow databack">
108,110c109,112
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_timelineevents.php TNG1403/admin_timelineevents.php
11a12,13
> if( !isset($offset) ) $offset = 0;
> 
13c15
< if( $newsearch ) {
---
> if( !empty($newsearch) ) {
21,22c23,24
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_tlevents_post']['search']);
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_tlevents_post']['search']) ? stripslashes($_COOKIE['tng_search_tlevents_post']['search']) : "";
24,25c26,27
< 		$tngpage = $_COOKIE['tng_search_tlevents_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_tlevents_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_tlevents_post']['tngpage']) ? $_COOKIE['tng_search_tlevents_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_tlevents_post']['offset']) ? $_COOKIE['tng_search_tlevents_post']['offset'] : 0;
28a31
> 		if( !isset($tngpage) ) $tngpage = 1;
33,38c36,37
< if (get_magic_quotes_gpc() == 0) {
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
< 	$searchstring = addslashes($searchstring);
< }
< else
< 	$searchstring_noquotes = preg_replace("/\"/", "&#34;",stripslashes($searchstring));
---
> $searchstring_noquotes = preg_replace("/\"/", "&#34;",$searchstring);
> $searchstring = addslashes($searchstring);
50,51c49,50
< $wherestr = $searchstring ? "WHERE evyear LIKE \"%$searchstring%\" OR evdetail LIKE \"%$searchstring%\"" : "";
< $query = "SELECT tleventID, evyear, endyear, evtitle, evdetail FROM $tlevents_table $wherestr ORDER BY ABS(evyear), tleventID LIMIT $newoffset" . $maxsearchresults;
---
> $wherestr = $searchstring ? "WHERE evyear LIKE \"%$searchstring%\" OR evtitle LIKE \"%$searchstring%\" OR evdetail LIKE \"%$searchstring%\"" : "";
> $query = "SELECT tleventID, evyear, endyear, evtitle, evdetail FROM $tlevents_table $wherestr ORDER BY ABS(evyear), evmonth, evday LIMIT $newoffset" . $maxsearchresults;
67d65
< $flags['tabs'] = $tngconfig['tabs'];
73,74d70
< <body background="img/background.gif">
< 
75a72,73
> 	echo tng_adminlayout();
> 
83,86c81,82
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
107c103
<   		<input type="submit" name="xtimeaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
>   		<input type="submit" name="xtimeaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
112c108
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
135c131
< 		while( $rowcount < $numrows && $row = tng_fetch_assoc($result))
---
> 		while( $row = tng_fetch_assoc($result))
159,164c155,158
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_trees.php TNG1403/admin_trees.php
13c13
< if( $newsearch ) {
---
> if( !empty($newsearch) ) {
20,21c20,21
< 	if( !$searchstring )
< 		$searchstring = $_COOKIE['tng_search_trees_post']['search'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_trees_post']['search']) ? $_COOKIE['tng_search_trees_post']['search'] : "";
23,24c23,24
< 		$tngpage = $_COOKIE['tng_search_trees_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_trees_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_trees_post']['tngpage']) ? $_COOKIE['tng_search_trees_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_trees_post']['offset']) ? $_COOKIE['tng_search_trees_post']['offset'] : 0;
64d63
< $flags['tabs'] = $tngconfig['tabs'];
70,71d68
< <body background="img/background.gif">
< 
72a70,71
> 	echo tng_adminlayout();
> 
81,84c80,81
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
99c96,108
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<form action="admin_deleteselected.php" method="post" name="form2">
> <?php
> 	if( $allow_delete ) {
> ?>
> 		<p>
> 		<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onClick="toggleAll(1);">
> 		<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onClick="toggleAll(0);">
>   		<input type="submit" name="xtreeaction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
> 		</p>
> <?php
> 	}
> ?>
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
101a111,117
> <?php
> 	if($allow_delete) {
> ?>
> 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</td>
> <?php
> 	}
> ?>
133a150,151
> 			if($allow_delete)
> 				echo "<td class=\"lightback\" align=\"center\" valign=\"top\"><input type=\"checkbox\" name=\"del{$row['gedcom']}\" value=\"1\"></td>";
153a172
> 	</form>
155,161c174,177
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_updatealbum.php TNG1403/admin_updatealbum.php
19,24c19,23
< if (get_magic_quotes_gpc() == 0) {
< 	$albumname = addslashes($albumname);
< 	$description = addslashes($description);
< 	$keywords = addslashes($keywords);
< }
< if( !$alwayson ) $alwayson = 0;
---
> $albumname = addslashes($albumname);
> $description = addslashes($description);
> $keywords = addslashes($keywords);
> 
> if( empty($alwayson) ) $alwayson = 0;
33,35c32,34
< if( $newscreen == "return" )
< 	header( "Location: admin_editalbum.php?albumID=$albumID" );
< else if( $newscreen == "close" ) {
---
> if( isset($_POST['savestay']) )
> 	header( "Location: admin_editalbum.php?albumID=$albumID&ref=1" );
> else if( isset($_POST['saveclose']) ) {
41c40,41
< 	top.close();
---
> 	window.opener.location.reload(false);
> 	window.open('','_self').close()();
diff -r TNG/admin_updateassoc.php TNG1403/admin_updateassoc.php
7a8
> $admin_login = 1;
25,27c26,27
< if (get_magic_quotes_gpc() == 0) {
< 	$relationship = addslashes($relationship);
< }
---
> $relationship = addslashes($relationship);
> $passocID = strtoupper($passocID);
31a32,33
> if(!isset($personID)) $personID = "";
> 
36,37c38,39
< 	$query = "SELECT firstname, lastname, lnprefix, nameorder, prefix, suffix FROM $people_table
< 		WHERE personID=\"$passocID\" AND gedcom=\"$tree\"";
---
> 	$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, title, sex, nameorder, living, private, branch, birthdate, birthdatetr, altbirthdatetr, deathdate
> 		FROM $people_table WHERE personID=\"$passocID\" AND gedcom=\"$tree\"";
diff -r TNG/admin_updatebranch.php TNG1403/admin_updatebranch.php
19,22c19,21
< if (get_magic_quotes_gpc() == 0) {
< 	$description = addslashes($description);
< }
< if(!$dospouses)
---
> $description = addslashes($description);
> 
> if( empty($dospouses) )
29c28
< if($submitx) {
---
> if( !empty($submitx) ) {
diff -r TNG/admin_updatecemetery.php TNG1403/admin_updatecemetery.php
34,45c34,44
< if (get_magic_quotes_gpc() == 0) {
< 	$cemname = addslashes($cemname);
< 	$city = addslashes($city);
< 	$county = addslashes($county);
< 	$state = addslashes($state);
< 	$country = addslashes($country);
< 	$latitude = addslashes($latitude);
< 	$longitude = addslashes($longitude);
< 	$zoom = addslashes($zoom);
< 	$notes = addslashes($notes);
< 	$place = addslashes($place);
< }
---
> $cemname = addslashes($cemname);
> $city = addslashes($city);
> $county = addslashes($county);
> $state = addslashes($state);
> $country = addslashes($country);
> $latitude = addslashes($latitude);
> $longitude = addslashes($longitude);
> $zoom = addslashes($zoom);
> $notes = addslashes($notes);
> $place = addslashes($place);
> 
89,91c88,90
< if( $newscreen == "return" )
< 	header( "Location: admin_editcemetery.php?cemeteryID=$cemeteryID" );
< else if( $newscreen == "close" ) {
---
> if( isset($_POST['savestay']) )
> 	header( "Location: admin_editcemetery.php?cemeteryID=$cemeteryID&ref=1" );
> else if( isset($_POST['saveclose']) ) {
97c96,97
< 	top.close();
---
> 	window.opener.location.reload(false);
> 	window.open('','_self').close()();
diff -r TNG/admin_updatecitation.php TNG1403/admin_updatecitation.php
7a8
> $admin_login = 1;
26,32c27,31
< if (get_magic_quotes_gpc() == 0) {
< 	$description = addslashes($description);
< 	$citedate = addslashes($citedate);
< 	$citepage = addslashes($citepage);
< 	$citetext = addslashes($citetext);
< 	$citenote = addslashes($citenote);
< }
---
> $description = addslashes($description);
> $citedate = addslashes($citedate);
> $citepage = addslashes($citepage);
> $citetext = addslashes($citetext);
> $citenote = addslashes($citenote);
diff -r TNG/admin_updatecollection.php TNG1403/admin_updatecollection.php
23,24c23,24
< if (get_magic_quotes_gpc() == 0)
< 	$display = addslashes( $display );
---
> $display = addslashes($display);
> $localpath = preg_replace('/\\\\/','\\\\\\\\',$localpath);
diff -r TNG/admin_updateconfig.php TNG1403/admin_updateconfig.php
1,313c1,330
< <?php
< include("begin.php");
< include("processvars.php");
< include("adminlib.php");
< $textpart = "setup";
< //include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< if(!count($_POST)) {
< 	header("Location: admin_main.php");
< 	exit;
< }
< 
< if(!$safety) {
< 	header( "Location: admin_login.php" );
< 	exit;
< }
< 
< if( $link ) {
< 	$admin_login = 1;
< 	include("checklogin.php");
< 	include("version.php");
< 
< 	if( $assignedtree || !$allow_edit ) {
< 		$message = $admtext['norights'];
< 		header( "Location: admin_login.php?message=" . urlencode($message) );
< 		exit;
< 	}
< }
< 
< $sitename = stripslashes($sitename);
< $site_desc = stripslashes($site_desc);
< $dbowner = stripslashes($dbowner);
< $tng_footermsg = stripslashes($tng_footermsg);
< 
< $sitename = preg_replace("/\"/","\\\"",$sitename);
< $site_desc = preg_replace("/\"/","\\\"",$site_desc);
< $dbowner = preg_replace("/\"/","\\\"",$dbowner);
< $tng_footermsg = preg_replace("/\"/","\\\"",$tng_footermsg);
< 
< if (get_magic_quotes_gpc() == 0) {
< 	$doctype = addslashes($doctype);
< }
< 
< require("adminlog.php");
< 
< $fp = @fopen( $subroot . "config.php", "w",1 );
< if( !$fp ) { die ( $admtext['cannotopen'] . " config.php" ); }
< 
< flock( $fp, LOCK_EX );
< 
< if($new_database_username)
< 	$tng_notinstalled = "";
< 
< fwrite( $fp, "<?php\n" );
< fwrite( $fp, "\$database_host = \"$new_database_host\";\n" );
< fwrite( $fp, "\$database_name = \"$new_database_name\";\n" );
< fwrite( $fp, "\$database_username = \"$new_database_username\";\n" );
< fwrite( $fp, "\$database_password = '$new_database_password';\n" );
< fwrite( $fp, "\$database_port = '$new_database_port';\n" );
< fwrite( $fp, "\$database_socket = '$new_database_socket';\n" );
< fwrite( $fp, "\$tngconfig['maint'] = \"$maint\";\n" );
< fwrite( $fp, "\n" );
< fwrite( $fp, "\$people_table = \"$people_table\";\n" );
< fwrite( $fp, "\$families_table = \"$families_table\";\n" );
< fwrite( $fp, "\$children_table = \"$children_table\";\n" );
< fwrite( $fp, "\$albums_table = \"$albums_table\";\n" );
< fwrite( $fp, "\$album2entities_table = \"$album2entities_table\";\n" );
< fwrite( $fp, "\$albumlinks_table = \"$albumlinks_table\";\n" );
< fwrite( $fp, "\$media_table = \"$media_table\";\n" );
< fwrite( $fp, "\$medialinks_table = \"$medialinks_table\";\n" );
< fwrite( $fp, "\$mediatypes_table = \"$mediatypes_table\";\n" );
< fwrite( $fp, "\$address_table = \"$address_table\";\n" );
< fwrite( $fp, "\$languages_table = \"$languages_table\";\n" );
< fwrite( $fp, "\$cemeteries_table = \"$cemeteries_table\";\n" );
< 
< //These next 6 tables are obsolete in v6, but are kept here in case anyone is still using them
< fwrite( $fp, "\$headstones_table = \"$headstones_table\";\n" );
< fwrite( $fp, "\$hslinks_table = \"$hslinks_table\";\n" );
< fwrite( $fp, "\$photos_table = \"$photos_table\";\n" );
< fwrite( $fp, "\$photolinks_table = \"$photolinks_table\";\n" );
< fwrite( $fp, "\$histories_table = \"$histories_table\";\n" );
< fwrite( $fp, "\$doclinks_table = \"$doclinks_table\";\n" );
< 
< fwrite( $fp, "\$states_table = \"$states_table\";\n" );
< fwrite( $fp, "\$countries_table = \"$countries_table\";\n" );
< fwrite( $fp, "\$places_table = \"$places_table\";\n" );
< fwrite( $fp, "\$sources_table = \"$sources_table\";\n" );
< fwrite( $fp, "\$repositories_table = \"$repositories_table\";\n" );
< fwrite( $fp, "\$citations_table = \"$citations_table\";\n" );
< fwrite( $fp, "\$events_table = \"$events_table\";\n" );
< fwrite( $fp, "\$eventtypes_table = \"$eventtypes_table\";\n" );
< fwrite( $fp, "\$rectangles_table = \"$rectangles_table\";\n" );
< fwrite( $fp, "\$reports_table = \"$reports_table\";\n" );
< fwrite( $fp, "\$trees_table = \"$trees_table\";\n" );
< fwrite( $fp, "\$notelinks_table = \"$notelinks_table\";\n" );
< fwrite( $fp, "\$xnotes_table = \"$xnotes_table\";\n" );
< fwrite( $fp, "\$saveimport_table = \"$saveimport_table\";\n" );
< fwrite( $fp, "\$users_table = \"$users_table\";\n" );
< fwrite( $fp, "\$temp_events_table = \"$temp_events_table\";\n" );
< fwrite( $fp, "\$tlevents_table = \"$tlevents_table\";\n" );
< fwrite( $fp, "\$branches_table = \"$branches_table\";\n" );
< fwrite( $fp, "\$branchlinks_table = \"$branchlinks_table\";\n" );
< fwrite( $fp, "\$assoc_table = \"$assoc_table\";\n" );
< fwrite( $fp, "\$mostwanted_table = \"$mostwanted_table\";\n" );
< //fwrite( $fp, "\$mhrequests_table = \"$mhrequests_table\";\n" );
< fwrite( $fp, "\$dna_tests_table = \"$dna_tests_table\";\n" );
< fwrite( $fp, "\$dna_links_table = \"$dna_links_table\";\n" );
< fwrite( $fp, "\$dna_groups_table = \"$dna_groups_table\";\n" );
< fwrite( $fp, "\$templates_table = \"$templates_table\";\n" );
< fwrite( $fp, "\n" );
< if($rootpath != $newrootpath)
< 	$_SESSION['session_rp'] = $newrootpath;
< fwrite( $fp, "\$rootpath = \"$newrootpath\";\n" );
< fwrite( $fp, "\$templatenum = \"$templatenum\";\n" );
< fwrite( $fp, "\$templateswitching = \"$templateswitching\";\n" );
< fwrite( $fp, "\$homepage = \"$homepage\";\n" );
< fwrite( $fp, "\$tngdomain = \"$tngdomain\";\n" );
< fwrite( $fp, "\$sitename = \"$sitename\";\n" );
< fwrite( $fp, "\$site_desc = \"$site_desc\";\n" );
< fwrite( $fp, "\$tngconfig['doctype'] = \"$doctype\";\n" );
< if( !$target ) $target = "_self";
< fwrite( $fp, "\$target = \"$target\";\n" );
< fwrite( $fp, "\$language = \"$language\";\n" );
< fwrite( $fp, "\$charset = \"$charset\";\n" );
< fwrite( $fp, "\$norels = \"$norels\";\n" );
< fwrite( $fp, "\$maxsearchresults = \"$maxsearchresults\";\n" );
< if(!get_magic_quotes_gpc()) $lineending = addslashes($lineending);
< fwrite( $fp, "\$lineendingdisplay = \"$lineending\";\n" );
< fwrite( $fp, "\$lineending = \"" . stripslashes($lineending) . "\";\n" );
< fwrite( $fp, "\$gendexfile = \"$gendexfile\";\n" );
< fwrite( $fp, "\$mediapath = \"$mediapath\";\n" );
< fwrite( $fp, "\$headstonepath = \"$headstonepath\";\n" );
< fwrite( $fp, "\$historypath = \"$historypath\";\n" );
< fwrite( $fp, "\$backuppath = \"$backuppath\";\n" );
< fwrite( $fp, "\$documentpath = \"$documentpath\";\n" );
< fwrite( $fp, "\$photopath = \"$photopath\";\n" );
< fwrite( $fp, "\$photosext = \"$photosext\";\n" );
< fwrite( $fp, "\$modspath = \"$modspath\";\n" );
< fwrite( $fp, "\$extspath = \"$extspath\";\n" );
< fwrite( $fp, "\$showextended = \"$showextended\";\n" );
< fwrite( $fp, "\$tngconfig['imgmaxh'] = \"$imgmaxh\";\n" );
< fwrite( $fp, "\$tngconfig['imgmaxw'] = \"$imgmaxw\";\n" );
< fwrite( $fp, "\$thumbprefix = \"$thumbprefix\";\n" );
< fwrite( $fp, "\$thumbsuffix = \"$thumbsuffix\";\n" );
< fwrite( $fp, "\$thumbmaxh = \"$thumbmaxh\";\n" );
< fwrite( $fp, "\$thumbmaxw = \"$thumbmaxw\";\n" );
< fwrite( $fp, "\$tngconfig['usedefthumbs'] = \"$tng_usedefthumbs\";\n" );
< fwrite( $fp, "\$tngconfig['thumbcols'] = \"$tng_thumbcols\";\n" );
< fwrite( $fp, "\$tngconfig['maxnoteprev'] = \"$tng_maxnoteprev\";\n" );
< fwrite( $fp, "\$tngconfig['ssdisabled'] = \"$tng_ssdisabled\";\n" );
< fwrite( $fp, "\$tngconfig['ssrepeat'] = \"$tng_ssrepeat\";\n" );
< fwrite( $fp, "\$tngconfig['imgviewer'] = \"$tng_imgviewer\";\n" );
< fwrite( $fp, "\$tngconfig['imgvheight'] = \"$tng_imgvheight\";\n" );
< fwrite( $fp, "\$tngconfig['hidemedia'] = \"$hidemedia\";\n" );
< fwrite( $fp, "\$tngconfig['favicon'] = \"$favicon\";\n" );
< fwrite( $fp, "\$customheader = \"$customheader\";\n" );
< fwrite( $fp, "\$customfooter = \"$customfooter\";\n" );
< fwrite( $fp, "\$custommeta = \"$custommeta\";\n" );
< fwrite( $fp, "\$tngconfig['tabs'] = \"$tng_tabs\";\n" );
< fwrite( $fp, "\$tngconfig['menu'] = \"$tng_menu\";\n" );
< fwrite( $fp, "\$tngconfig['istart'] = \"$tng_istart\";\n" );
< fwrite( $fp, "\$tngconfig['showhome'] = \"$showhome\";\n" );
< fwrite( $fp, "\$tngconfig['showsearch'] = \"$showsearch\";\n" );
< fwrite( $fp, "\$tngconfig['searchchoice'] = \"$searchchoice\";\n" );
< fwrite( $fp, "\$tngconfig['showlogin'] = \"$showlogin\";\n" );
< fwrite( $fp, "\$tngconfig['showshare'] = \"$showshare\";\n" );
< fwrite( $fp, "\$tngconfig['showprint'] = \"$showprint\";\n" );
< fwrite( $fp, "\$tngconfig['showbmarks'] = \"$showbmarks\";\n" );
< fwrite( $fp, "\$tngconfig['hidechr'] = \"$hidechr\";\n" );
< fwrite( $fp, "\$tngconfig['hidedna'] = \"$hidedna\";\n" );
< fwrite( $fp, "\$tngconfig['password_type'] = \"$password_type\";\n" );
< fwrite( $fp, "\$tngconfig['places1tree'] = \"$places1tree\";\n" );
< fwrite( $fp, "\$tngconfig['autogeo'] = \"$autogeo\";\n" );
< 
< fwrite( $fp, "\$dbowner = \"$dbowner\";\n" );
< fwrite( $fp, "\$time_offset = \"$time_offset\";\n" );
< fwrite( $fp, "\$tngconfig['edit_timeout'] = \"$edit_timeout\";\n" );
< fwrite( $fp, "\$requirelogin = \"$requirelogin\";\n" );
< fwrite( $fp, "\$treerestrict = \"$treerestrict\";\n" );
< fwrite( $fp, "\$livedefault = \"$livedefault\";\n" );
< fwrite( $fp, "\$ldsdefault = \"$ldsdefault\";\n" );
< fwrite( $fp, "\$chooselang = \"$chooselang\";\n" );
< if(!$chooselang) {
< 	$session_language = $_SESSION['session_language'] = $language;
< 	$session_charset = $_SESSION['session_charset'] = $charset;
< 	setcookie("tnglangfolder", $language, time()+31536000, "/");
< 	setcookie("tngcharset", $charset, time()+31536000, "/");
< }
< fwrite( $fp, "\$nonames = \"$nonames\";\n" );
< fwrite( $fp, "\$tngconfig['nnpriv'] = \"$nnpriv\";\n" );
< fwrite( $fp, "\$notestogether = \"$notestogether\";\n" );
< fwrite( $fp, "\$tngconfig['scrollcite'] = \"$scrollcite\";\n" );
< fwrite( $fp, "\$nameorder = \"$nameorder\";\n" );
< fwrite( $fp, "\$tngconfig['ucsurnames'] = \"$ucsurnames\";\n" );
< fwrite( $fp, "\$lnprefixes = \"$lnprefixes\";\n" );
< fwrite( $fp, "\$lnpfxnum = \"$lnpfxnum\";\n" );
< fwrite( $fp, "\$specpfx = \"" . stripslashes( $specpfx ) . "\";\n" );
< 
< fwrite( $fp, "\$tngconfig['cemrows'] = \"$cemrows\";\n" );
< fwrite( $fp, "\$tngconfig['cemblanks'] = \"$cemblanks\";\n" );
< 
< fwrite( $fp, "\$emailaddr = \"$emailaddr\";\n" );
< fwrite( $fp, "\$tngconfig['fromadmin'] = \"$fromadmin\";\n" );
< fwrite( $fp, "\$tngconfig['disallowreg'] = \"$disallowreg\";\n" );
< fwrite( $fp, "\$tngconfig['revmail'] = \"$revmail\";\n" );
< fwrite( $fp, "\$tngconfig['autoapp'] = \"$autoapp\";\n" );
< fwrite( $fp, "\$tngconfig['autotree'] = \"$autotree\";\n" );
< fwrite( $fp, "\$tngconfig['ackemail'] = \"$ackemail\";\n" );
< fwrite( $fp, "\$tngconfig['omitpwd'] = \"$omitpwd\";\n" );
< fwrite( $fp, "\$tngconfig['usesmtp'] = \"$usesmtp\";\n" );
< fwrite( $fp, "\$tngconfig['mailhost'] = \"$mailhost\";\n" );
< fwrite( $fp, "\$tngconfig['mailuser'] = \"$mailuser\";\n" );
< fwrite( $fp, "\$tngconfig['mailpass'] = \"$mailpass\";\n" );
< fwrite( $fp, "\$tngconfig['mailport'] = \"$mailport\";\n" );
< fwrite( $fp, "\$tngconfig['mailenc'] = \"$mailenc\";\n" );
< 
< fwrite( $fp, "\$maxgedcom = \"$maxgedcom\";\n" );
< fwrite( $fp, "\$change_cutoff = \"$change_cutoff\";\n" );
< fwrite( $fp, "\$change_limit = \"$change_limit\";\n" );
< fwrite( $fp, "\$tngconfig['preferEuro'] = \"$prefereuro\";\n" );
< fwrite( $fp, "\$tngconfig['calstart'] = \"$calstart\";\n" );
< fwrite( $fp, "\$tngconfig['pardata'] = \"$pardata\";\n" );
< fwrite( $fp, "\$tngconfig['oldids'] = \"$oldids\";\n" );
< fwrite( $fp, "\$tngconfig['lastimport'] = \"$lastimport\";\n" );
< fwrite( $fp, "\$defaulttree = \"$defaulttree\";\n" );
< fwrite( $fp, "\$tngconfig['personprefix'] = \"$pprefix\";\n" );
< fwrite( $fp, "\$tngconfig['personsuffix'] = \"$psuffix\";\n" );
< fwrite( $fp, "\$tngconfig['familyprefix'] = \"$fprefix\";\n" );
< fwrite( $fp, "\$tngconfig['familysuffix'] = \"$fsuffix\";\n" );
< fwrite( $fp, "\$tngconfig['sourceprefix'] = \"$sprefix\";\n" );
< fwrite( $fp, "\$tngconfig['sourcesuffix'] = \"$ssuffix\";\n" );
< fwrite( $fp, "\$tngconfig['repoprefix'] = \"$rprefix\";\n" );
< fwrite( $fp, "\$tngconfig['reposuffix'] = \"$rsuffix\";\n" );
< fwrite( $fp, "\$tngconfig['noteprefix'] = \"$nprefix\";\n" );
< fwrite( $fp, "\$tngconfig['notesuffix'] = \"$nsuffix\";\n" );
< fwrite( $fp, "\$responsivetables = \"$responsivetables\";\n" );
< fwrite( $fp, "\$tabletype = \"$tabletype\";\n" );
< fwrite( $fp, "\$enablemodeswitch = \"$enablemodeswitch\";\n" );
< fwrite( $fp, "\$enableminimap = \"$enableminimap\";\n" );
< fwrite( $fp, "\$tngconfig['hidetasks'] = \"$hidetasks\";\n" );
< fwrite( $fp, "\$tngconfig['hidetotals'] = \"$hidetotals\";\n" );
< fwrite( $fp, "\$tngconfig['backupdays'] = \"$backupdays\";\n" );
< fwrite( $fp, "\$tngconfig['offline'] = \"$tng_offline\";\n" );
< //fwrite( $fp, "\$tngconfig['webmatches'] = \"$webmatches\";\n" );
< //fwrite( $fp, "\$tngconfig['mhmatchtype'] = \"$mhmatchtype\";\n" );
< //fwrite( $fp, "\$tngconfig['mhmatchconf'] = \"$mhmatchconf\";\n" );
< fwrite( $fp, "\$tngconfig['cookieapproval'] = \"$tng_cookieapproval\";\n" );
< fwrite( $fp, "\$tngconfig['dataprotect'] = \"$tng_dataprotect\";\n" );
< fwrite( $fp, "\$tngconfig['askconsent'] = \"$tng_askconsent\";\n" );
< fwrite( $fp, "\$tngconfig['sitekey'] = \"$rcsitekey\";\n" );
< fwrite( $fp, "\$tngconfig['secret'] = \"$rcsecret\";\n" );
< fwrite( $fp, "\$tngconfig['mediadel'] = \"$tng_mediadel\";\n" );
< fwrite( $fp, "\$tngconfig['mediathumbs'] = \"$tng_mediathumbs\";\n" );
< fwrite( $fp, "\$tngconfig['mediatrees'] = \"$tng_mediatrees\";\n" );
< fwrite( $fp, "\$tngconfig['footermsg'] = \"$tng_footermsg\";\n" );
< 
< fwrite( $fp, "\$maxdnasearchresults = \"$maxdnasearchresults\";\n" );
< fwrite( $fp, "\$showtestnumbers = \"$showtestnumbers\";\n" );
< fwrite( $fp, "\$autofillancsurnames = \"$autofillancsurnames\";\n" );
< fwrite( $fp, "\$ancsurnameupper = \"$ancsurnameupper\";\n" );
< fwrite( $fp, "\$surnameexcl = \"" . stripslashes( $surnameexcl ) . "\";\n" );
< fwrite( $fp, "\$bgmain = \"" . stripslashes( $bgmain ) . "\";\n" );
< fwrite( $fp, "\$txtmain = \"" . stripslashes( $txtmain ) . "\";\n" );
< fwrite( $fp, "\$bgmode = \"" . stripslashes( $bgmode ) . "\";\n" );
< fwrite( $fp, "\$txtmode = \"" . stripslashes( $txtmode ) . "\";\n" );
< fwrite( $fp, "\$bgfastmut = \"" . stripslashes( $bgfastmut ) . "\";\n" );
< fwrite( $fp, "\$txtfastmut = \"" . stripslashes( $txtfastmut ) . "\";\n" );
< fwrite( $fp, "\$bg1_12 = \"" . stripslashes( $bg1_12 ) . "\";\n" );
< fwrite( $fp, "\$txt1_12 = \"" . stripslashes( $txt1_12 ) . "\";\n" );
< fwrite( $fp, "\$bg13_25 = \"" . stripslashes( $bg13_25 ) . "\";\n" );
< fwrite( $fp, "\$txt13_25 = \"" . stripslashes( $txt13_25 ) . "\";\n" );
< fwrite( $fp, "\$bg26_37 = \"" . stripslashes( $bg26_37 ) . "\";\n" );
< fwrite( $fp, "\$txt26_37 = \"" . stripslashes( $txt26_37 ) . "\";\n" );
< fwrite( $fp, "\$bg38_67 = \"" . stripslashes( $bg38_67 ) . "\";\n" );
< fwrite( $fp, "\$txt38_67 = \"" . stripslashes( $txt38_67 ) . "\";\n" );
< fwrite( $fp, "\$bg111 = \"" . stripslashes( $bg111 ) . "\";\n" );
< fwrite( $fp, "\$txt111 = \"" . stripslashes( $txt111 ) . "\";\n" );
< 
< fwrite( $fp, "\$tng_notinstalled = \"$tng_notinstalled\";\n" );
< fwrite( $fp, "\n" );
< fwrite( $fp, "if(!isset(\$cms['auto'])) {\n" );
< fwrite( $fp, "\$cms['support'] = \"$cmssupport\";\n" );
< fwrite( $fp, "\$cms['url'] = \"$cmsurl\";\n" );
< fwrite( $fp, "if(!isset(\$cms['tngpath']))\n" );
< fwrite( $fp, "    \$cms['tngpath'] = \"$cmstngpath\";\n" );
< fwrite( $fp, "\$cms['module'] = \"$cmsmodule\";\n" );
< fwrite( $fp, "\$cms['cloaklogin'] = \"$cmscloaklogin\";\n" );
< fwrite( $fp, "\$cms['credits'] = \"$cmscredits\";\n" );
< fwrite( $fp, "\$cms['adminurl'] = \"$adminurl\";\n" );
< fwrite( $fp, "}\n" );
< fwrite( $fp, "\n" );
< fwrite( $fp, "@include(\$subroot . \"customconfig.php\");\n" );
< fwrite( $fp, "?>\n" );
< 
< flock( $fp, LOCK_UN );
< fclose( $fp );
< 
< $fp = @fopen( "subroot.php", "w",1 );
< if( $fp ) {
< 	flock( $fp, LOCK_EX );
< 	fwrite( $fp, "<?php\n" );
< 	fwrite( $fp, "@ini_set('error_reporting','2039');\n" );
< 	fwrite( $fp, "\$tngconfig['subroot'] = \"$newsubroot\";\n" );
< 	fwrite( $fp, "\$subroot = \$tngconfig['subroot'] ? \$tngconfig['subroot'] : \"\";\n" );
< 	fwrite( $fp, "?>\n" );
< 	flock( $fp, LOCK_UN );
< 	fclose( $fp );
< }
< adminwritelog( $admtext['modifysettings'] );
< 
< $oldsubroot = $newsubroot != $subroot ? "?sr=$subroot" : "";
< header( "Location: admin_setup.php$oldsubroot" );
---
> <?php
> include("begin.php");
> include("processvars.php");
> include("adminlib.php");
> $textpart = "setup";
> //include("getlang.php");
> include("$mylanguage/admintext.php");
> 
> if(!count($_POST)) {
> 	header("Location: admin.php");
> 	exit;
> }
> 
> if(!$safety) {
> 	header( "Location: admin_login.php" );
> 	exit;
> }
> 
> if( $link ) {
> 	$admin_login = 1;
> 	include("checklogin.php");
> 	include("version.php");
> 
> 	if( $assignedtree || !$allow_edit ) {
> 		$message = $admtext['norights'];
> 		header( "Location: admin_login.php?message=" . urlencode($message) );
> 		exit;
> 	}
> }
> 
> $sitename = stripslashes($sitename);
> $site_desc = stripslashes($site_desc);
> $dbowner = stripslashes($dbowner);
> $tng_footermsg = stripslashes($tng_footermsg);
> 
> $sitename = preg_replace("/\"/","\\\"",$sitename);
> $site_desc = preg_replace("/\"/","\\\"",$site_desc);
> $dbowner = htmlspecialchars(preg_replace("/\"/","\\\"",$dbowner),ENT_NOQUOTES);
> $tng_footermsg = preg_replace("/\"/","\\\"",$tng_footermsg);
> if(empty($altbirth)) $altbirth = "CHR,BAPM";
> 
> $doctype = addslashes($doctype);
> 
> if( !isset($autoapp) ) $autoapp = 0;
> if( !isset($autotree) ) $autotree = 0;
> if( !isset($ackemail) ) $ackemail = 0;
> if( !isset($omitpwd) ) $omitpwd = 1;
> if( !isset($maint) ) $maint = "";
> if( !isset($saveconfig) ) $saveconfig = "";
> 
> require("adminlog.php");
> 
> $fp = @fopen( $subroot . "config.php", "w",1 );
> if( !$fp ) { die ( $admtext['cannotopen'] . " config.php" ); }
> 
> flock( $fp, LOCK_EX );
> 
> if($new_database_username)
> 	$tng_notinstalled = "";
> 
> fwrite( $fp, "<?php\n" );
> fwrite( $fp, "\$database_host = \"$new_database_host\";\n" );
> fwrite( $fp, "\$database_name = \"$new_database_name\";\n" );
> fwrite( $fp, "\$database_username = \"$new_database_username\";\n" );
> fwrite( $fp, "\$database_password = '$new_database_password';\n" );
> fwrite( $fp, "\$database_port = \"$new_database_port\";\n" );
> fwrite( $fp, "\$database_socket = \"$new_database_socket\";\n" );
> fwrite( $fp, "\$tngconfig['maint'] = \"$maint\";\n" );
> fwrite( $fp, "\n" );
> fwrite( $fp, "\$people_table = \"$people_table\";\n" );
> fwrite( $fp, "\$families_table = \"$families_table\";\n" );
> fwrite( $fp, "\$children_table = \"$children_table\";\n" );
> fwrite( $fp, "\$albums_table = \"$albums_table\";\n" );
> fwrite( $fp, "\$album2entities_table = \"$album2entities_table\";\n" );
> fwrite( $fp, "\$albumlinks_table = \"$albumlinks_table\";\n" );
> fwrite( $fp, "\$media_table = \"$media_table\";\n" );
> fwrite( $fp, "\$medialinks_table = \"$medialinks_table\";\n" );
> fwrite( $fp, "\$mediatypes_table = \"$mediatypes_table\";\n" );
> fwrite( $fp, "\$address_table = \"$address_table\";\n" );
> fwrite( $fp, "\$languages_table = \"$languages_table\";\n" );
> fwrite( $fp, "\$cemeteries_table = \"$cemeteries_table\";\n" );
> 
> //These next 6 tables are obsolete in v6, but are kept here in case anyone is still using them
> fwrite( $fp, "\$headstones_table = \"$headstones_table\";\n" );
> fwrite( $fp, "\$hslinks_table = \"$hslinks_table\";\n" );
> fwrite( $fp, "\$photos_table = \"$photos_table\";\n" );
> fwrite( $fp, "\$photolinks_table = \"$photolinks_table\";\n" );
> fwrite( $fp, "\$histories_table = \"$histories_table\";\n" );
> fwrite( $fp, "\$doclinks_table = \"$doclinks_table\";\n" );
> 
> fwrite( $fp, "\$states_table = \"$states_table\";\n" );
> fwrite( $fp, "\$countries_table = \"$countries_table\";\n" );
> fwrite( $fp, "\$places_table = \"$places_table\";\n" );
> fwrite( $fp, "\$sources_table = \"$sources_table\";\n" );
> fwrite( $fp, "\$image_tags_table = \"$image_tags_table\";\n" );
> fwrite( $fp, "\$repositories_table = \"$repositories_table\";\n" );
> fwrite( $fp, "\$citations_table = \"$citations_table\";\n" );
> fwrite( $fp, "\$events_table = \"$events_table\";\n" );
> fwrite( $fp, "\$eventtypes_table = \"$eventtypes_table\";\n" );
> fwrite( $fp, "\$reports_table = \"$reports_table\";\n" );
> fwrite( $fp, "\$trees_table = \"$trees_table\";\n" );
> fwrite( $fp, "\$notelinks_table = \"$notelinks_table\";\n" );
> fwrite( $fp, "\$xnotes_table = \"$xnotes_table\";\n" );
> fwrite( $fp, "\$saveimport_table = \"$saveimport_table\";\n" );
> fwrite( $fp, "\$users_table = \"$users_table\";\n" );
> fwrite( $fp, "\$temp_events_table = \"$temp_events_table\";\n" );
> fwrite( $fp, "\$tlevents_table = \"$tlevents_table\";\n" );
> fwrite( $fp, "\$branches_table = \"$branches_table\";\n" );
> fwrite( $fp, "\$branchlinks_table = \"$branchlinks_table\";\n" );
> fwrite( $fp, "\$assoc_table = \"$assoc_table\";\n" );
> fwrite( $fp, "\$mostwanted_table = \"$mostwanted_table\";\n" );
> //fwrite( $fp, "\$mhrequests_table = \"$mhrequests_table\";\n" );
> fwrite( $fp, "\$dna_tests_table = \"$dna_tests_table\";\n" );
> fwrite( $fp, "\$dna_links_table = \"$dna_links_table\";\n" );
> fwrite( $fp, "\$dna_groups_table = \"$dna_groups_table\";\n" );
> fwrite( $fp, "\$templates_table = \"$templates_table\";\n" );
> fwrite( $fp, "\n" );
> if($saved_rootpath != $newrootpath)
> 	$_SESSION['session_rp'] = $newrootpath;
> fwrite( $fp, "\$rootpath = \"$newrootpath\";\n" );
> fwrite( $fp, "\$templatenum = \"$templatenum\";\n" );
> fwrite( $fp, "\$templateswitching = \"$templateswitching\";\n" );
> fwrite( $fp, "\$homepage = \"$homepage\";\n" );
> fwrite( $fp, "\$tngdomain = \"$tngdomain\";\n" );
> fwrite( $fp, "\$sitename = \"$sitename\";\n" );
> fwrite( $fp, "\$site_desc = \"$site_desc\";\n" );
> fwrite( $fp, "\$tngconfig['doctype'] = \"$doctype\";\n" );
> fwrite( $fp, "\$language = \"$language\";\n" );
> fwrite( $fp, "\$charset = \"$charset\";\n" );
> fwrite( $fp, "\$norels = \"$norels\";\n" );
> fwrite( $fp, "\$maxsearchresults = \"$maxsearchresults\";\n" );
> $lineending = addslashes($lineending);
> fwrite( $fp, "\$lineendingdisplay = \"$lineending\";\n" );
> fwrite( $fp, "\$lineending = \"" . stripslashes($lineending) . "\";\n" );
> fwrite( $fp, "\$mediapath = \"$mediapath\";\n" );
> fwrite( $fp, "\$headstonepath = \"$headstonepath\";\n" );
> fwrite( $fp, "\$historypath = \"$historypath\";\n" );
> fwrite( $fp, "\$documentpath = \"$documentpath\";\n" );
> fwrite( $fp, "\$photopath = \"$photopath\";\n" );
> fwrite( $fp, "\$photosext = \"$photosext\";\n" );
> fwrite( $fp, "\$modspath = \"$modspath\";\n" );
> fwrite( $fp, "\$extspath = \"$extspath\";\n" );
> fwrite( $fp, "\$gendexfile = \"$gendexfile\";\n" );
> fwrite( $fp, "\$backuppath = \"$backuppath\";\n" );
> fwrite( $fp, "\$tngconfig['saveconfig'] = \"$saveconfig\";\n" );
> fwrite( $fp, "\$showextended = \"$showextended\";\n" );
> fwrite( $fp, "\$tngconfig['imgmaxh'] = \"$imgmaxh\";\n" );
> fwrite( $fp, "\$tngconfig['imgmaxw'] = \"$imgmaxw\";\n" );
> fwrite( $fp, "\$thumbprefix = \"$thumbprefix\";\n" );
> fwrite( $fp, "\$thumbsuffix = \"$thumbsuffix\";\n" );
> fwrite( $fp, "\$thumbmaxh = \"$thumbmaxh\";\n" );
> fwrite( $fp, "\$thumbmaxw = \"$thumbmaxw\";\n" );
> fwrite( $fp, "\$tngconfig['usedefthumbs'] = \"$tng_usedefthumbs\";\n" );
> fwrite( $fp, "\$tngconfig['maxnoteprev'] = \"$tng_maxnoteprev\";\n" );
> fwrite( $fp, "\$tngconfig['ssdisabled'] = \"$tng_ssdisabled\";\n" );
> fwrite( $fp, "\$tngconfig['ssrepeat'] = \"$tng_ssrepeat\";\n" );
> fwrite( $fp, "\$tngconfig['imgviewer'] = \"$tng_imgviewer\";\n" );
> fwrite( $fp, "\$tngconfig['imgvheight'] = \"$tng_imgvheight\";\n" );
> fwrite( $fp, "\$tngconfig['hidemedia'] = \"$hidemedia\";\n" );
> fwrite( $fp, "\$tngconfig['favicon'] = \"$favicon\";\n" );
> fwrite( $fp, "\$customheader = \"$customheader\";\n" );
> fwrite( $fp, "\$customfooter = \"$customfooter\";\n" );
> fwrite( $fp, "\$custommeta = \"$custommeta\";\n" );
> fwrite( $fp, "\$tngconfig['menu'] = \"$tng_menu\";\n" );
> fwrite( $fp, "\$tngconfig['istart'] = \"$tng_istart\";\n" );
> fwrite( $fp, "\$tngconfig['showhome'] = \"$showhome\";\n" );
> fwrite( $fp, "\$tngconfig['showsearch'] = \"$showsearch\";\n" );
> fwrite( $fp, "\$tngconfig['searchchoice'] = \"$searchchoice\";\n" );
> fwrite( $fp, "\$tngconfig['showlogin'] = \"$showlogin\";\n" );
> fwrite( $fp, "\$tngconfig['showshare'] = \"$showshare\";\n" );
> fwrite( $fp, "\$tngconfig['showprint'] = \"$showprint\";\n" );
> fwrite( $fp, "\$tngconfig['showbmarks'] = \"$showbmarks\";\n" );
> fwrite( $fp, "\$tngconfig['hidechr'] = \"$hidechr\";\n" );
> fwrite( $fp, "\$tngconfig['altbirth'] = \"$altbirth\";\n" );
> fwrite( $fp, "\$tngconfig['hidedna'] = \"$hidedna\";\n" );
> fwrite( $fp, "\$tngconfig['password_type'] = \"$password_type\";\n" );
> fwrite( $fp, "\$tngconfig['places1tree'] = \"$places1tree\";\n" );
> fwrite( $fp, "\$tngconfig['autogeo'] = \"$autogeo\";\n" );
> 
> fwrite( $fp, "\$dbowner = \"$dbowner\";\n" );
> fwrite( $fp, "\$time_offset = \"$time_offset\";\n" );
> fwrite( $fp, "\$tngconfig['edit_timeout'] = \"$edit_timeout\";\n" );
> fwrite( $fp, "\$requirelogin = \"$requirelogin\";\n" );
> fwrite( $fp, "\$treerestrict = \"$treerestrict\";\n" );
> fwrite( $fp, "\$livedefault = \"$livedefault\";\n" );
> fwrite( $fp, "\$ldsdefault = \"$ldsdefault\";\n" );
> fwrite( $fp, "\$chooselang = \"$chooselang\";\n" );
> if(!$chooselang) {
> 	$session_language = $_SESSION['session_language'] = $language;
> 	$session_charset = $_SESSION['session_charset'] = $charset;
> 	setcookie("tnglangfolder", $language, time()+31536000, "/");
> 	setcookie("tngcharset", $charset, time()+31536000, "/");
> }
> fwrite( $fp, "\$nonames = \"$nonames\";\n" );
> fwrite( $fp, "\$tngconfig['nnpriv'] = \"$nnpriv\";\n" );
> fwrite( $fp, "\$notestogether = \"$notestogether\";\n" );
> fwrite( $fp, "\$tngconfig['scrollcite'] = \"$scrollcite\";\n" );
> fwrite( $fp, "\$tngconfig['scrollnotes'] = \"$scrollnotes\";\n" );
> fwrite( $fp, "\$nameorder = \"$nameorder\";\n" );
> fwrite( $fp, "\$tngconfig['ucsurnames'] = \"$ucsurnames\";\n" );
> fwrite( $fp, "\$lnprefixes = \"$lnprefixes\";\n" );
> fwrite( $fp, "\$lnpfxnum = \"$lnpfxnum\";\n" );
> fwrite( $fp, "\$specpfx = \"" . stripslashes( $specpfx ) . "\";\n" );
> 
> fwrite( $fp, "\$tngconfig['cemrows'] = \"$cemrows\";\n" );
> fwrite( $fp, "\$tngconfig['cemblanks'] = \"$cemblanks\";\n" );
> 
> fwrite( $fp, "\$emailaddr = \"$emailaddr\";\n" );
> fwrite( $fp, "\$tngconfig['fromadmin'] = \"$fromadmin\";\n" );
> fwrite( $fp, "\$tngconfig['disallowreg'] = \"$disallowreg\";\n" );
> fwrite( $fp, "\$tngconfig['revmail'] = \"$revmail\";\n" );
> fwrite( $fp, "\$tngconfig['autoapp'] = \"$autoapp\";\n" );
> fwrite( $fp, "\$tngconfig['autotree'] = \"$autotree\";\n" );
> fwrite( $fp, "\$tngconfig['ackemail'] = \"$ackemail\";\n" );
> fwrite( $fp, "\$tngconfig['omitpwd'] = \"$omitpwd\";\n" );
> fwrite( $fp, "\$tngconfig['usesmtp'] = \"$usesmtp\";\n" );
> fwrite( $fp, "\$tngconfig['mailhost'] = \"$mailhost\";\n" );
> fwrite( $fp, "\$tngconfig['mailuser'] = \"$mailuser\";\n" );
> fwrite( $fp, "\$tngconfig['mailpass'] = \"$mailpass\";\n" );
> fwrite( $fp, "\$tngconfig['mailport'] = \"$mailport\";\n" );
> fwrite( $fp, "\$tngconfig['mailenc'] = \"$mailenc\";\n" );
> 
> fwrite( $fp, "\$maxgedcom = \"$maxgedcom\";\n" );
> fwrite( $fp, "\$change_cutoff = \"$change_cutoff\";\n" );
> fwrite( $fp, "\$change_limit = \"$change_limit\";\n" );
> fwrite( $fp, "\$tngconfig['preferEuro'] = \"$prefereuro\";\n" );
> fwrite( $fp, "\$tngconfig['calstart'] = \"$calstart\";\n" );
> fwrite( $fp, "\$tngconfig['pardata'] = \"$pardata\";\n" );
> fwrite( $fp, "\$tngconfig['oldids'] = \"$oldids\";\n" );
> fwrite( $fp, "\$tngconfig['lastimport'] = \"$lastimport\";\n" );
> fwrite( $fp, "\$defaulttree = \"$defaulttree\";\n" );
> fwrite( $fp, "\$tngconfig['sortbydate'] = \"$sortbydate\";\n" );
> fwrite( $fp, "\$tngconfig['personprefix'] = \"$pprefix\";\n" );
> fwrite( $fp, "\$tngconfig['personsuffix'] = \"$psuffix\";\n" );
> fwrite( $fp, "\$tngconfig['familyprefix'] = \"$fprefix\";\n" );
> fwrite( $fp, "\$tngconfig['familysuffix'] = \"$fsuffix\";\n" );
> fwrite( $fp, "\$tngconfig['sourceprefix'] = \"$sprefix\";\n" );
> fwrite( $fp, "\$tngconfig['sourcesuffix'] = \"$ssuffix\";\n" );
> fwrite( $fp, "\$tngconfig['repoprefix'] = \"$rprefix\";\n" );
> fwrite( $fp, "\$tngconfig['reposuffix'] = \"$rsuffix\";\n" );
> fwrite( $fp, "\$tngconfig['noteprefix'] = \"$nprefix\";\n" );
> fwrite( $fp, "\$tngconfig['notesuffix'] = \"$nsuffix\";\n" );
> fwrite( $fp, "\$responsivetables = \"$responsivetables\";\n" );
> fwrite( $fp, "\$tabletype = \"$tabletype\";\n" );
> fwrite( $fp, "\$enablemodeswitch = \"$enablemodeswitch\";\n" );
> fwrite( $fp, "\$enableminimap = \"$enableminimap\";\n" );
> fwrite( $fp, "\$tngconfig['hidetasks'] = \"$hidetasks\";\n" );
> fwrite( $fp, "\$tngconfig['hidetotals'] = \"$hidetotals\";\n" );
> fwrite( $fp, "\$tngconfig['backupdays'] = \"$backupdays\";\n" );
> fwrite( $fp, "\$tngconfig['offline'] = \"$tng_offline\";\n" );
> //fwrite( $fp, "\$tngconfig['webmatches'] = \"$webmatches\";\n" );
> //fwrite( $fp, "\$tngconfig['mhmatchtype'] = \"$mhmatchtype\";\n" );
> //fwrite( $fp, "\$tngconfig['mhmatchconf'] = \"$mhmatchconf\";\n" );
> fwrite( $fp, "\$tngconfig['cookieapproval'] = \"$tng_cookieapproval\";\n" );
> fwrite( $fp, "\$tngconfig['dataprotect'] = \"$tng_dataprotect\";\n" );
> fwrite( $fp, "\$tngconfig['askconsent'] = \"$tng_askconsent\";\n" );
> fwrite( $fp, "\$tngconfig['livingunchecked'] = \"$tng_livingunchecked\";\n" );
> fwrite( $fp, "\$tngconfig['nosuggest'] = \"$tng_nosuggest\";\n" );
> fwrite( $fp, "\$tngconfig['allowcsv'] = \"$tng_allowcsv\";\n" );
> fwrite( $fp, "\$tngconfig['sitekey'] = \"$rcsitekey\";\n" );
> fwrite( $fp, "\$tngconfig['secret'] = \"$rcsecret\";\n" );
> fwrite( $fp, "\$tngconfig['mediadel'] = \"$tng_mediadel\";\n" );
> fwrite( $fp, "\$tngconfig['mediathumbs'] = \"$tng_mediathumbs\";\n" );
> fwrite( $fp, "\$tngconfig['mediatrees'] = \"$tng_mediatrees\";\n" );
> fwrite( $fp, "\$tngconfig['footermsg'] = \"$tng_footermsg\";\n" );
> 
> fwrite( $fp, "\$maxdnasearchresults = \"$maxdnasearchresults\";\n" );
> fwrite( $fp, "\$showtestnumbers = \"$showtestnumbers\";\n" );
> fwrite( $fp, "\$autofillancsurnames = \"$autofillancsurnames\";\n" );
> fwrite( $fp, "\$numgens = \"$numgens\";\n" );
> fwrite( $fp, "\$ancsurnameupper = \"$ancsurnameupper\";\n" );
> fwrite( $fp, "\$surnameexcl = \"" . stripslashes( $surnameexcl ) . "\";\n" );
> fwrite( $fp, "\$bgmain = \"" . stripslashes( $bgmain ) . "\";\n" );
> fwrite( $fp, "\$txtmain = \"" . stripslashes( $txtmain ) . "\";\n" );
> fwrite( $fp, "\$bgmode = \"" . stripslashes( $bgmode ) . "\";\n" );
> fwrite( $fp, "\$txtmode = \"" . stripslashes( $txtmode ) . "\";\n" );
> fwrite( $fp, "\$bgfastmut = \"" . stripslashes( $bgfastmut ) . "\";\n" );
> fwrite( $fp, "\$txtfastmut = \"" . stripslashes( $txtfastmut ) . "\";\n" );
> fwrite( $fp, "\$bg1_12 = \"" . stripslashes( $bg1_12 ) . "\";\n" );
> fwrite( $fp, "\$txt1_12 = \"" . stripslashes( $txt1_12 ) . "\";\n" );
> fwrite( $fp, "\$bg13_25 = \"" . stripslashes( $bg13_25 ) . "\";\n" );
> fwrite( $fp, "\$txt13_25 = \"" . stripslashes( $txt13_25 ) . "\";\n" );
> fwrite( $fp, "\$bg26_37 = \"" . stripslashes( $bg26_37 ) . "\";\n" );
> fwrite( $fp, "\$txt26_37 = \"" . stripslashes( $txt26_37 ) . "\";\n" );
> fwrite( $fp, "\$bg38_67 = \"" . stripslashes( $bg38_67 ) . "\";\n" );
> fwrite( $fp, "\$txt38_67 = \"" . stripslashes( $txt38_67 ) . "\";\n" );
> fwrite( $fp, "\$bg111 = \"" . stripslashes( $bg111 ) . "\";\n" );
> fwrite( $fp, "\$txt111 = \"" . stripslashes( $txt111 ) . "\";\n" );
> 
> fwrite( $fp, "\$tng_notinstalled = \"$tng_notinstalled\";\n" );
> fwrite( $fp, "\n" );
> fwrite( $fp, "if(!isset(\$cms['auto'])) {\n" );
> fwrite( $fp, "    \$cms['support'] = \"$cmssupport\";\n" );
> fwrite( $fp, "    \$cms['url'] = \"$cmsurl\";\n" );
> fwrite( $fp, "    if(!isset(\$cms['tngpath']))\n" );
> fwrite( $fp, "        \$cms['tngpath'] = \"$cmstngpath\";\n" );
> fwrite( $fp, "    \$cms['module'] = \"$cmsmodule\";\n" );
> fwrite( $fp, "    \$cms['cloaklogin'] = \"$cmscloaklogin\";\n" );
> fwrite( $fp, "    \$cms['credits'] = \"$cmscredits\";\n" );
> if(empty($adminurl)) $adminurl = "";
> fwrite( $fp, "    \$cms['adminurl'] = \"$adminurl\";\n" );
> fwrite( $fp, "}\n" );
> fwrite( $fp, "\n" );
> fwrite( $fp, "@include(\$subroot . \"customconfig.php\");\n" );
> fwrite( $fp, "?>" );
> 
> flock( $fp, LOCK_UN );
> fclose( $fp );
> 
> $fp = @fopen( "subroot.php", "w",1 );
> if( $fp ) {
> 	flock( $fp, LOCK_EX );
> 	fwrite( $fp, "<?php\n" );
> 	fwrite( $fp, "error_reporting(E_ERROR);\n" );
> 	fwrite( $fp, "\$tngconfig = array();\n" );
> 	fwrite( $fp, "\$tngconfig['subroot'] = \"$newsubroot\";\n" );
> 	fwrite( $fp, "\$subroot = \$tngconfig['subroot'] ? \$tngconfig['subroot'] : \"\";\n" );
> 	fwrite( $fp, "?>" );
> 	flock( $fp, LOCK_UN );
> 	fclose( $fp );
> }
> adminwritelog( $admtext['modifysettings'] );
> 
> $oldsubroot = $newsubroot != $subroot ? "?sr=$subroot" : "";
> if( !empty($submitx) ) {
> 	header( "Location: admin_genconfig.php" );
> }
> else {
> 	header( "Location: admin_setup.php$oldsubroot" );
> }
diff -r TNG/admin_update_dna_groups.php TNG1403/admin_update_dna_groups.php
4c4
< //$textpart = "dna";
---
> $textpart = "dna";
18,20c18,19
< if (get_magic_quotes_gpc() == 0) {
< 	$dna_group = addslashes($dna_group);
< }
---
> $dna_group = addslashes($dna_group);
> $description = addslashes($description);
22c21
< $query = "UPDATE $dna_groups_table SET description = \"$description\"  WHERE dna_group=\"$dna_group\"";
---
> $query = "UPDATE $dna_groups_table SET description = \"$description\", test_type = \"$test_type\"  WHERE dna_group=\"$dna_group\"";
28c27
< adminwritelog( "<a href=\"admin_edit_dna_test.php?testID=$testID\">{$admtext['modifydna']}: $testID</a>" );
---
> adminwritelog( "<a href=\"admin_edit_dna_group.php?dna_group=$dna_group&amp;tree=$tree&amp;test_type=$test_type\">{$admtext['modifydnagroup']}: $dna_group</a>" );
30,47c29,30
< if( $newtest == "return" )
< 	header( "Location: admin_edit_dna_group.php?testID=$testID&cw=$cw" );
< else if( $newtest == "close" ) {
< ?>
< <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
< <html>
< <body>
< <script type="text/javascript">
< 	top.close();
< </script>
< </body>
< </html>
< <?php
< }
< else  {
< 	$message = $admtext['changestotest'] . " $test_number {$admtext['succsaved']}.";
< 	header( "Location: admin_dna_tests.php?message=" . urlencode($message) );
< }
---
> $message = $admtext['changestogroup'] . " $dna_group {$admtext['succsaved']}.";
> header( "Location: admin_dna_groups.php?message=" . urlencode($message) );
diff -r TNG/admin_update_dna_test.php TNG1403/admin_update_dna_test.php
19,44c19,43
< if (get_magic_quotes_gpc() == 0) {
< 	$test_number = addslashes($test_number);
< 	$notes = addslashes($notes);
< 	$vendor = addslashes($vendor);
< 	$y_results = addslashes($y_results);
< 	$hvr1_results = addslashes($hvr1_results);
< 	$hvr2_results = addslashes($hvr2_results);
< 	$person_name = addslashes($person_name);
< 	$dna_group = addslashes($dna_group);
< 	//$dna_group_desc = addslashes($group);
< 	$surnames = addslashes($surnames);
< 	$MD_ancestorID = addslashes($MD_ancestorID);
< 	$MRC_ancestorID = addslashes($MRC_ancestorID);
< 	$ref_seq = addslashes($ref_seq);
< 	$xtra_mut = addslashes($xtra_mut);
< 	$coding_reg = str_replace(', ',',',$coding_reg);
< 	$coding_reg = str_replace(',',', ',$coding_reg);
< 	$coding_reg = addslashes($coding_reg);
< 	$admin_notes = addslashes($admin_notes);
< 	$personID = addslashes($personID);
< 	$urls = addslashes($urls);
< 	$markers = addslashes($markers);
< 	$haplogroup = addslashes($haplogroup);
< 	$signsnp = addslashes($signsnp);
< 	$termsnp = addslashes($termsnp);
< }
---
> $test_number = addslashes($test_number);
> $notes = addslashes($notes);
> $vendor = addslashes($vendor);
> $y_results = isset($y_results) ? addslashes($y_results) : "";
> $hvr1_results = isset($hvr1_results) ? addslashes($hvr1_results) : "";
> $hvr2_results = isset($hvr2_results) ? addslashes($hvr2_results) : "";
> $person_name = addslashes($person_name);
> $dna_group = addslashes($dna_group);
> //$dna_group_desc = addslashes($group);
> $surnames = addslashes($surnames);
> $MD_ancestorID = addslashes($MD_ancestorID);
> $MRC_ancestorID = addslashes($MRC_ancestorID);
> $ref_seq = isset($ref_seq) ? addslashes($ref_seq) : "";
> $xtra_mut = isset($xtra_mut) ? addslashes($xtra_mut) : "";
> $coding_reg = isset($coding_reg) ? str_replace(', ',',',$coding_reg) : "";
> $coding_reg = str_replace(',',', ',$coding_reg);
> $coding_reg = addslashes($coding_reg);
> $admin_notes = addslashes($admin_notes);
> $personID = addslashes($personID);
> $urls = addslashes($urls);
> $markers = isset($markers) ? addslashes($markers) : "";
> $haplogroup = isset($haplogroup) ? addslashes($haplogroup) : "";
> $signsnp = isset($signsnp) ? addslashes($signsnp) : "";
> $termsnp = isset($termsnp) ? addslashes($termsnp) : "";
> $medialinks = isset($medialinks) ? addslashes($medialinks) : "";
50,51c49,71
< $dna_group_desc = $dna_group ? $descrow['description'] : "";
< 
---
> $dna_group_desc = $dna_group ? addslashes($descrow['description']) : "";
> $mtdna_confirmed = !empty($mtdna_confirmed) ? $mtdna_confirmed : "";
> $ydna_confirmed = !empty($ydna_confirmed) ? $ydna_confirmed : "";
> $markeropt = !empty($markeropt) ? $markeropt : "";
> $notesopt = !empty($notesopt) ? $notesopt : "";
> $linksopt = !empty($linksopt) ? $linksopt : "";
> $surnamesopt = !empty($surnamesopt) ? $surnamesopt : "";
> $private_dna = !empty($private_dna) ? $private_dna : "";
> $mtdna_haplogroup = !empty($mtdna_haplogroup) ? addslashes($mtdna_haplogroup) : "";
> $ydna_haplogroup = !empty($ydna_haplogroup) ? addslashes($ydna_haplogroup) : "";
> $shared_cMs = !empty($shared_cMs) ? addslashes($shared_cMs) : "";
> $shared_segments = !empty($shared_segments) ? addslashes($shared_segments) : "";
> $chromosome = !empty($chromosome) ? addslashes($chromosome) : "";
> $segment_start = !empty($segment_start) ? addslashes($segment_start) : "";
> $segment_end = !empty($segment_end) ? addslashes($segment_end) : "";
> $centiMorgans = !empty($centiMorgans) ? addslashes($centiMorgans) : "";
> $matching_SNPs = !empty($matching_SNPs) ? addslashes($matching_SNPs) : "";
> $x_match = !empty($x_match) ? $x_match : "";
> $relationship_range = !empty($relationship_range) ? addslashes($relationship_range) : "";
> $suggested_relationship = !empty($suggested_relationship) ? addslashes($suggested_relationship) : "";
> $actual_relationship = !empty($actual_relationship) ? addslashes($actual_relationship) : "";
> $related_side = !empty($related_side) ? addslashes($related_side) : "";
> $GEDmatchID = !empty($GEDmatchID) ? addslashes($GEDmatchID) : "";
53a74
> $match_date = convertDate( $match_date );
57,62c78,83
< $query = "UPDATE $dna_tests_table SET test_type=\"$test_type\", test_number=\"$test_number\", notes=\"$notes\", vendor=\"$vendor\", test_date=\"$test_date\", personID=\"$personID\", 
< 	gedcom=\"$mynewgedcom\", urls=\"$urls\", markers=\"$markers\", y_results=\"$y_results\", hvr1_results=\"$hvr1_results\", hvr2_results=\"$hvr2_results\", person_name = \"$person_name\", 
< 	confirmed = \"$confirmed\", markeropt = \"$markeropt\", notesopt = \"$notesopt\", linksopt = \"$linksopt\", surnamesopt = \"$surnamesopt\", private_dna = \"$private_dna\", 
< 	dna_group = \"$dna_group\", dna_group_desc = \"$dna_group_desc\", surnames = \"$surnames\", MD_ancestorID = \"$MD_ancestorID\", MRC_ancestorID = \"$MRC_ancestorID\", 
< 	admin_notes = \"$admin_notes\", medialinks = \"$medialinks\", ref_seq = \"$ref_seq\", xtra_mut = \"$xtra_mut\", coding_reg = \"$coding_reg\", haplogroup=\"$haplogroup\", 
< 	significant_snp=\"$signsnp\", terminal_snp=\"$termsnp\"  
---
> $query = "UPDATE $dna_tests_table SET test_type=\"$test_type\", test_number=\"$test_number\", notes=\"$notes\", vendor=\"$vendor\", test_date=\"$test_date\", match_date=\"$match_date\",personID=\"$personID\",
> 	gedcom=\"$mynewgedcom\", urls=\"$urls\", markers=\"$markers\", y_results=\"$y_results\", hvr1_results=\"$hvr1_results\", hvr2_results=\"$hvr2_results\", person_name = \"$person_name\",
> 	mtdna_confirmed = \"$mtdna_confirmed\", ydna_confirmed = \"$ydna_confirmed\", markeropt = \"$markeropt\", notesopt = \"$notesopt\", linksopt = \"$linksopt\", surnamesopt = \"$surnamesopt\", private_dna = \"$private_dna\", private_test = \"$private_test\",
> 	dna_group = \"$dna_group\", dna_group_desc = \"$dna_group_desc\", surnames = \"$surnames\", MD_ancestorID = \"$MD_ancestorID\", MRC_ancestorID = \"$MRC_ancestorID\",
> 	admin_notes = \"$admin_notes\", medialinks = \"$medialinks\", ref_seq = \"$ref_seq\", xtra_mut = \"$xtra_mut\", coding_reg = \"$coding_reg\", mtdna_haplogroup=\"$mtdna_haplogroup\", ydna_haplogroup=\"$ydna_haplogroup\", significant_snp=\"$signsnp\", terminal_snp=\"$termsnp\", shared_cMs = \"$shared_cMs\", shared_segments = \"$shared_segments\", chromosome = \"$chromosome\", segment_start = \"$segment_start\", segment_end = \"$segment_end\", centiMorgans = \"$centiMorgans\", matching_SNPs = \"$matching_SNPs\", x_match = \"$x_match\", relationship_range = \"$relationship_range\", suggested_relationship = \"$suggested_relationship\", actual_relationship = \"$actual_relationship\", related_side = \"$related_side\", GEDmatchID = \"$GEDmatchID\"
> 
76c97
< if( $newtest == "return" )
---
> if( isset($_POST['savestay']) )
78c99
< else if( $newtest == "close" ) {
---
> else if( isset($_POST['saveclose']) ) {
diff -r TNG/admin_updateevent.php TNG1403/admin_updateevent.php
7a8
> $admin_login = 1;
33,49c34,48
< if (get_magic_quotes_gpc() == 0) {
< 	$eventdate = addslashes($eventdate);
< 	$eventplace = addslashes($eventplace);
< 	$info = addslashes($info);
< 	$age = addslashes($age);
< 	$agency = addslashes($agency);
< 	$cause = addslashes($cause);
< 	$address1 = addslashes($address1);
< 	$address2 = addslashes($address2);
< 	$city = addslashes($city);
< 	$state = addslashes($state);
< 	$zip = addslashes($zip);
< 	$country = addslashes($country);
< 	$phone = addslashes($phone);
< 	$email = addslashes($email);
< 	$www = addslashes($www);
< }
---
> $eventdate = addslashes($eventdate);
> $eventplace = addslashes($eventplace);
> $info = addslashes($info);
> $age = addslashes($age);
> $agency = addslashes($agency);
> $cause = addslashes($cause);
> $address1 = addslashes($address1);
> $address2 = addslashes($address2);
> $city = addslashes($city);
> $state = addslashes($state);
> $zip = addslashes($zip);
> $country = addslashes($country);
> $phone = addslashes($phone);
> $email = addslashes($email);
> $www = addslashes($www);
81c80,88
< 		$query = "INSERT INTO $events_table (eventtypeID, persfamID, eventdate, eventdatetr, eventplace, age, agency, cause, addressID, info, gedcom, parenttag)  VALUES(\"{$row['eventtypeID']}\", \"$id\", \"$eventdate\", \"$eventdatetr\", \"$eventplace\", \"$age\", \"$agency\", \"$cause\", \"{$row['addressID']}\", \"$info\", \"$tree\", \"\")";
---
> 		$query = "INSERT INTO $events_table (eventtypeID, persfamID, eventdate, eventdatetr, eventplace, age, agency, cause, addressID, info, gedcom, parenttag)  
> 					SELECT \"{$row['eventtypeID']}\", \"$id\", \"$eventdate\", \"$eventdatetr\", \"$eventplace\", \"$age\", \"$agency\", \"$cause\", \"{$row['addressID']}\", \"$info\", \"$tree\", \"\"
> 					FROM DUAL
> 					WHERE exists (select 'x' from $people_table where personid = \"$id\")
> 						OR
> 					exists (select 'x' from $families_table where familyid = \"$id\")
> 						OR
> 					exists (select 'x' from $sources_table where sourceid = \"$id\")	
> 					";	
84,101c91,92
< 	
< 		//do citations
< 		$query = "SELECT * FROM $citations_table WHERE eventID = \"$eventID\"";
< 		$result = tng_query($query);
< 		while($crow = tng_fetch_assoc($result)) {
< 			$iquery = "INSERT INTO $citations_table (gedcom, persfamID, eventID, sourceID, ordernum, description, citedate, citedatetr, citetext, page, quay, note) VALUES(\"{$crow['gedcom']}\",\"$id\",\"$newEventID\",\"{$crow['sourceID']}\",\"{$crow['ordernum']}\",\"{$crow['description']}\",\"{$crow['citedate']}\",\"{$crow['citedatetr']}\",\"{$crow['citetext']}\",\"{$crow['page']}\",\"{$crow['quay']}\",\"{$crow['note']}\")";
< 			$iresult = tng_query($iquery);
< 		}
< 		tng_free_result($result);
< 
< 		//do notes
< 		$query = "SELECT * FROM $notelinks_table WHERE eventID = \"$eventID\"";
< 		$result = tng_query($query);
< 		while($nrow = tng_fetch_assoc($result)) {
< 			$iquery = "INSERT INTO $notelinks_table (persfamID, gedcom, xnoteID, eventID, ordernum, secret) VALUES(\"$id\",\"{$nrow['gedcom']}\",\"{$nrow['xnoteID']}\",\"$newEventID\",\"{$nrow['ordernum']}\",\"{$nrow['secret']}\")";
< 			$iresult = tng_query($iquery);
< 		}
< 		tng_free_result($result);
---
> 		
> 		if ($newEventID ){
103,117c94,142
< 		//do media
< 		$query = "SELECT * FROM $medialinks_table WHERE eventID = \"$eventID\"";
< 		$result = tng_query($query);
< 		while($mrow = tng_fetch_assoc($result)) {
< 			$iquery = "INSERT INTO $medialinks_table (gedcom, linktype, personID, eventID, mediaID, altdescription, altnotes, ordernum, dontshow, defphoto) VALUES(\"{$mrow['gedcom']}\",\"{$mrow['linktype']}\",\"$id\",\"$newEventID\",\"{$mrow['mediaID']}\",\"{$mrow['altdescription']}\",\"{$mrow['altnotes']}\",\"{$mrow['ordernum']}\",\"{$mrow['dontshow']}\",\"{$mrow['defphoto']}\")";
< 			$iresult = tng_query($iquery);
< 		}
< 		tng_free_result($result);
< 
< 		//do albums
< 		$query = "SELECT * FROM $album2entities_table WHERE eventID = \"$eventID\"";
< 		$result = tng_query($query);
< 		while($arow = tng_fetch_assoc($result)) {
< 			$iquery = "INSERT INTO $album2entities_table (gedcom, linktype, entityID, eventID, albumID, ordernum) VALUES(\"{$arow['gedcom']}\",\"{$arow['linktype']}\",\"$id\",\"$newEventID\",\"{$arow['albumID']}\",\"{$arow['ordernum']}\")";
< 			$iresult = tng_query($iquery);
---
> 			//do citations
> 			$query = "SELECT * FROM $citations_table WHERE eventID = \"$eventID\"";
> 			$result = tng_query($query);
> 			while($crow = tng_fetch_assoc($result)) {
> 				$iquery = "INSERT INTO $citations_table (gedcom, persfamID, eventID, sourceID, ordernum, description, citedate, citedatetr, citetext, page, quay, note) VALUES(\"{$crow['gedcom']}\",\"$id\",\"$newEventID\",\"{$crow['sourceID']}\",\"{$crow['ordernum']}\",\"{$crow['description']}\",\"{$crow['citedate']}\",\"{$crow['citedatetr']}\",\"{$crow['citetext']}\",\"{$crow['page']}\",\"{$crow['quay']}\",\"{$crow['note']}\")";
> 				$iresult = tng_query($iquery);
> 			}
> 			tng_free_result($result);
> 
> 			//do notes
> 			$query = "SELECT * FROM $notelinks_table WHERE eventID = \"$eventID\"";
> 			$result = tng_query($query);
> 			while($nrow = tng_fetch_assoc($result)) {
> 				$xquery = "INSERT INTO $xnotes_table (gedcom, note, noteID) SELECT gedcom, note, noteID from $xnotes_table where id =  \"{$nrow['xnoteID']}\" ";
> 				$xresult = tng_query($xquery);
> 				$newNoteID = tng_insert_id();				
> 
> 				$iquery = "INSERT INTO $notelinks_table (persfamID, gedcom, xnoteID, eventID, ordernum, secret) VALUES(\"$id\",\"{$nrow['gedcom']}\",\"$newNoteID\",\"$newEventID\",\"{$nrow['ordernum']}\",\"{$nrow['secret']}\")";
> 				$iresult = tng_query($iquery);
> 				$newNoteID = tng_insert_id();
> 
> 				//do citations attached to this note
> 				$icquery = "SELECT * FROM $citations_table WHERE gedcom = \"{$nrow['gedcom']}\" AND eventID = \"N{$nrow['ID']}\"";
> 				$icresult = tng_query($icquery);
> 				while($crow = tng_fetch_assoc($icresult)) {
> 					$cquery = "INSERT INTO $citations_table (gedcom, persfamID, eventID, sourceID, ordernum, description, citedate, citedatetr, citetext, page, quay, note) VALUES(\"{$crow['gedcom']}\",\"$id\",\"N$newNoteID\",\"{$crow['sourceID']}\",\"{$crow['ordernum']}\",\"{$crow['description']}\",\"{$crow['citedate']}\",\"{$crow['citedatetr']}\",\"{$crow['citetext']}\",\"{$crow['page']}\",\"{$crow['quay']}\",\"{$crow['note']}\")";
> 					$cresult = tng_query($cquery);
> 				}
> 				tng_free_result($icresult);
> 			}
> 			tng_free_result($result);
> 
> 			//do media
> 			$query = "SELECT * FROM $medialinks_table WHERE eventID = \"$eventID\"";
> 			$result = tng_query($query);
> 			while($mrow = tng_fetch_assoc($result)) {
> 				$iquery = "INSERT INTO $medialinks_table (gedcom, linktype, personID, eventID, mediaID, altdescription, altnotes, ordernum, dontshow, defphoto) VALUES(\"{$mrow['gedcom']}\",\"{$mrow['linktype']}\",\"$id\",\"$newEventID\",\"{$mrow['mediaID']}\",\"{$mrow['altdescription']}\",\"{$mrow['altnotes']}\",\"{$mrow['ordernum']}\",\"{$mrow['dontshow']}\",\"{$mrow['defphoto']}\")";
> 				$iresult = tng_query($iquery);
> 			}
> 			tng_free_result($result);
> 
> 			//do albums
> 			$query = "SELECT * FROM $album2entities_table WHERE eventID = \"$eventID\"";
> 			$result = tng_query($query);
> 			while($arow = tng_fetch_assoc($result)) {
> 				$iquery = "INSERT INTO $album2entities_table (gedcom, linktype, entityID, eventID, albumID, ordernum) VALUES(\"{$arow['gedcom']}\",\"{$arow['linktype']}\",\"$id\",\"$newEventID\",\"{$arow['albumID']}\",\"{$arow['ordernum']}\")";
> 				$iresult = tng_query($iquery);
> 			}
> 			tng_free_result($result);
119d143
< 		tng_free_result($result);
diff -r TNG/admin_updateeventtype.php TNG1403/admin_updateeventtype.php
19,23c19,22
< if (get_magic_quotes_gpc() == 0) {
< 	$type = addslashes($type);
< 	$tag2 = addslashes($tag2);
< 	$defdisplay = addslashes($defdisplay);
< }
---
> $type = addslashes($type);
> $tag2 = addslashes($tag2);
> $defdisplay = addslashes($defdisplay);
> 
34,35c33,39
< $message = $admtext['changestoevtype'] . " $eventtypeID {$admtext['succsaved']}.";
< header( "Location: admin_eventtypes.php?message=" . urlencode($message) );
---
> if( !empty($submitx) ) {
> 	$message = $admtext['changestoevtype'] . " $eventtypeID {$admtext['succsaved']}.";
> 	header( "Location: admin_eventtypes.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_editeventtype.php?eventtypeID=$eventtypeID" );
> }
diff -r TNG/admin_updatefamily.php TNG1403/admin_updatefamily.php
7a8
> $admin_login = 1;
24a26
> if( !isset($newfamily) ) $newfamily = "";
35,40c37,41
< 	if (get_magic_quotes_gpc() == 0) {
< 		$marrplace = addslashes($marrplace);
< 		$divplace = addslashes($divplace);
< 		$sealplace = addslashes($sealplace);
< 		$marrtype = addslashes($marrtype);
< 	}
---
> 
> 	$marrplace = addslashes($marrplace);
> 	$divplace = addslashes($divplace);
> 	$sealplace = addslashes($sealplace);
> 	$marrtype = addslashes($marrtype);
66,67c67,68
< 	$familyliving = $living ? $living : 0;
< 	if( !$private ) $private = 0;
---
> 	$familyliving = isset($living) ? $living : 0;
> 	if( empty($private) ) $private = 0;
70a72,73
> 	if( !isset($branch) )
> 		$branch = "";
72a76
> 		if( !isset($allbranches) ) $allbranches = "";
116c120,121
< 	adminwritelog( "<a href=\"admin_editfamily.php?familyID=$familyID&tree=$tree&cw=$cw\">{$admtext['modifyfamily']}: $tree/$familyID</a>" );
---
> 	adminwritelog( "<a href=\"admin_editfamily.php?familyID=$familyID&amp;tree=$tree&amp;cw=$cw\">{$admtext['modifyfamily']}: $tree/$familyID</a>" );
> 	$message = $admtext['changestofamily'] . " $familyID {$admtext['succsaved']}.";
122,127c127,132
< 	header( "Location: admin_newmedia.php?personID=$familyID&tree=$tree&linktype=F&cw=$cw" );
< elseif( $newfamily == "return" )
< 	header( "Location: admin_editfamily.php?familyID=$familyID&tree=$tree&cw=$cw" );
< //else if( $newfamily == "repeat" )
< //	header( "Location: admin_findfamily.php?time=" . microtime() );
< else if( $newfamily == "close" ) {
---
> 	header( "Location: admin_newmedia.php?personID=$familyID&tree=$tree&linktype=F&cw=$cw&ref=1" );
> elseif( isset($_POST['saveret']) )
> 	header( "Location: admin_families.php?message=" . urlencode($message) );
> elseif( isset($_POST['savestay']) )
> 	header( "Location: admin_editfamily.php?familyID=$familyID&tree=$tree&cw=$cw&ref=1" );
> elseif( isset($_POST['saveclose']) ) {
131c136
< <body>
---
> <head>
133c138,140
< 	top.close();
---
> 	window.opener.location.reload(false);
> 	window.open('','_self').close();
> 	window.location.href = "admin_families.php?message=<?php echo urlencode($message); ?>";
134a142,147
> </head>
> <body>
> <p>A change in your browser's default behavior is preventing this window from closing.</p>
> <p>To change this behavior in Firefox, type <i>about:config</i> in the browser address bar and press enter.</p>
> <p>Then search for <i>dom.allow_scripts_to_close_windows</i> and change the value of that setting from False to True.</p>
> <p>For all other browsers, please close this window or tab.</p>
141,144d153
< else {
< 	$message = $admtext['changestofamily'] . " $familyID {$admtext['succsaved']}.";
< 	header( "Location: admin_families.php?message=" . urlencode($message) );
< }
diff -r TNG/admin_updateimportconfig.php TNG1403/admin_updateimportconfig.php
9c9
< 		header("Location: admin_main.php");
---
> 		header("Location: admin.php");
13a14
> 		$admin_login = 1;
28,34c29,33
< 	if (get_magic_quotes_gpc() == 0) {
< 		$localphotopathdisplay = addslashes( $localphotopathdisplay );
< 		$localhistorypathdisplay = addslashes( $localhistorypathdisplay );
< 		$localdocumentpathdisplay = addslashes( $localdocumentpathdisplay );
< 		$localotherpathdisplay = addslashes( $localotherpathdisplay );
< 		$localhspathdisplay = addslashes( $localhspathdisplay );
< 	}
---
> 	$localphotopathdisplay = addslashes( $localphotopathdisplay );
> 	$localhistorypathdisplay = addslashes( $localhistorypathdisplay );
> 	$localdocumentpathdisplay = addslashes( $localdocumentpathdisplay );
> 	$localotherpathdisplay = addslashes( $localotherpathdisplay );
> 	$localhspathdisplay = addslashes( $localhspathdisplay );
38a38,40
> 	if(!isset($saveimport)) $saveimport = "";
> 	if(!isset($assignnames)) $assignnames = "";
> 	if(!isset($saveconfig) ) $saveconfig = "";
44c46,47
< 	fwrite( $fp, "\$saveimport = \"$saveimport\";\n" );
---
> 	fwrite( $fp, "\$tngimpcfg['saveconfig'] = \"$saveconfig\";\n" );
> 	fwrite( $fp, "\$saveimport = \"1\";\n" );
54a58
> 	fwrite( $fp, "\$tngimpcfg['maxmarriedage'] = \"$maxmarriedage\";\n" );
62c66,67
< 	fwrite( $fp, "?>\n" );
---
> 	fwrite( $fp, "\$tngimpcfg['coerce'] = \"$coerce\";\n" );
> 	fwrite( $fp, "?>" );
69c74,79
< 	header( "Location: admin_setup.php" );
---
> 	if( !empty($submitx) ) {
> 		header( "Location: admin_importconfig.php" );
> 	}
> 	else {
> 		header( "Location: admin_setup.php" );
> 	}
diff -r TNG/admin_updatelanguage.php TNG1403/admin_updatelanguage.php
19,22c19,21
< if (get_magic_quotes_gpc() == 0) {
< 	$display = addslashes($display);
< 	$folder = addslashes($folder);
< }
---
> $display = addslashes($display);
> $folder = addslashes($folder);
> 
26c25
< adminwritelog( "<a href=\"editlanguage.php?languageID=$languageID\">{$admtext['modifylanguage']}: $languageID</a>" );
---
> adminwritelog( "<a href=\"admin_editlanguage.php?languageID=$languageID\">{$admtext['modifylanguage']}: $languageID</a>" );
28,29c27,33
< $message = $admtext['changestolanguage'] . " $languageID {$admtext['succsaved']}.";
< header( "Location: admin_languages.php?message=" . urlencode($message) );
---
> if( !empty($submitx) || !empty($message) ) {
> 	$message = $admtext['changestolanguage'] . " $display {$admtext['succsaved']}.";
> 	header( "Location: admin_languages.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_editlanguage.php?languageID=$languageID" );
> }
diff -r TNG/admin_updatelogconfig.php TNG1403/admin_updatelogconfig.php
9c9
< 		header("Location: admin_main.php");
---
> 		header("Location: admin.php");
29a30,32
> 	if( !isset($logsaveconfig) ) $logsaveconfig = "";
> 	$logfile = $logsaveconfig ? "\$subroot . \$logname" : "\$rootpath . \$logname"; 
> 
34c37,38
< 	fwrite( $fp, "\$logfile = \$rootpath . \$logname;\n" );
---
> 	fwrite( $fp, "\$logfile = $logfile;\n" );
> 	fwrite( $fp, "\$logsaveconfig = \"$logsaveconfig\";\n" );
42c46
< 	fwrite( $fp, "?>\n" );
---
> 	fwrite( $fp, "?>" );
46a51,60
> 	$logfile = $logsaveconfig ? $subroot . $logname : $rootpath . $logname; 
> 	$fp = fopen( $logfile, "c" );
>     if( !$fp ) { die ( "{$admtext['cannotopen']} $logname" ); }
>     fclose( $fp );
> 
> 	$adminlogfile = $logsaveconfig ? $subroot . $adminlogfile : $rootpath . $adminlogfile; 
> 	$fp = fopen( $adminlogfile, "c" );
>     if( !$fp ) { die ( "{$admtext['cannotopen']} $adminlogfile" ); }
>     fclose( $fp );
> 
49c63,68
< 	header( "Location: admin_setup.php" );
---
> 	if( !empty($submitx) ) {
> 		header( "Location: admin_logconfig.php" );
> 	}
> 	else {
> 		header( "Location: admin_setup.php" );
> 	}
diff -r TNG/admin_updatemapconfig.php TNG1403/admin_updatemapconfig.php
9c9
< 		header("Location: admin_main.php");
---
> 		header("Location: admin.php");
55c55
< 	fwrite( $fp, "?>\n" );
---
> 	fwrite( $fp, "?>" );
62c62,67
< 	header( "Location: admin_setup.php" );
---
> 	if( !empty($submitx) ) {
> 		header( "Location: admin_mapconfig.php" );
> 	}
> 	else {
> 		header( "Location: admin_setup.php" );
> 	}
diff -r TNG/admin_updatemedia.php TNG1403/admin_updatemedia.php
9a10
> include("geocodelib.php");
46c47
< $treestr = $tngconfig['mediatrees'] ? $tree . "/" : "";
---
> $treestr = $tngconfig['mediatrees'] && $tree ? $tree . "/" : "";
52,66c53,66
< if (get_magic_quotes_gpc() == 0) {
< 	$description = addslashes($description);
< 	$notes = addslashes($notes);
< 	$datetaken = addslashes($datetaken);
< 	$place = addslashes($place);
< 	$owner = addslashes($owner);
< 	$imagemap = addslashes($imagemap);
< 	$bodytext = addslashes($bodytext);
< 	$latitude = addslashes($latitude);
< 	$longitude = addslashes($longitude);
< 	$zoom = addslashes($zoom);
< 	$width = addslashes($width);
< 	$height = addslashes($height);
< 	$plot = addslashes($plot);
< }
---
> $description = addslashes($description);
> $notes = addslashes($notes);
> $datetaken = addslashes($datetaken);
> $place = addslashes($place);
> $owner = addslashes($owner);
> $imagemap = isset($imagemap) ? addslashes($imagemap) : "";
> $bodytext = addslashes($bodytext);
> $latitude = addslashes($latitude);
> $longitude = addslashes($longitude);
> $zoom = isset($zoom) ? addslashes($zoom) : "";
> $width = addslashes($width);
> $height = addslashes($height);
> $plot = addslashes($plot);
> 
73c73
< $form = strtoupper( $fileparts['extension'] );
---
> $form = isset($fileparts['extension']) ? strtoupper( $fileparts['extension'] ) : "";
76c76
< if( $abspath )
---
> if( !empty($abspath) )
80c80
< if( !$showmap ) $showmap = "0";
---
> if( empty($showmap) ) $showmap = "0";
82,83c82,84
< if( !$alwayson ) $alwayson = 0;
< if( !$newwindow ) $newwindow = 0;
---
> if( empty($alwayson) ) $alwayson = 0;
> if( empty($newwindow) ) $newwindow = 0;
> if( empty($private) ) $private = 0;
88c89
< if( !$linktocem ) $linktocem = 0;
---
> if( empty($linktocem) ) $linktocem = 0;
91,107c92,101
< if( $usecollfolder && $mediatypeID != $mediatypeID_org ) {
< 	$oldmediapath = $mediatypes_assoc[$mediatypeID_org] . $treestr;
< 	$newmediapath = $mediatypes_assoc[$mediatypeID] . $treestr;
< 	if( $path_org ) {
< 		$oldpath = "$rootpath$oldmediapath/$path_org";
< 		$newpath = "$rootpath$newmediapath/$path";
< 		if( file_exists( $oldpath ) )
< 			@rename($oldpath, $newpath);
< 	}
< 
< 	if( $thumbpath_org ) {
< 		$oldthumbpath = "$rootpath$oldmediapath/$thumbpath_org";
< 		$newthumbpath = "$rootpath$newmediapath/$thumbpath";
< 		if( file_exists( $oldthumbpath ) )
< 			@rename($oldthumbpath, $newthumbpath);
< 	}
< }
---
> try {
> 	if( $usecollfolder && $mediatypeID != $mediatypeID_org ) {
> 		$oldmediapath = $mediatypes_assoc[$mediatypeID_org] . $treestr;
> 		$newmediapath = $mediatypes_assoc[$mediatypeID] . $treestr;
> 		if( $path_org ) {
> 			$oldpath = "$rootpath$oldmediapath/$path_org";
> 			$newpath = "$rootpath$newmediapath/$path";
> 			if( file_exists( $oldpath ) )
> 				@rename($oldpath, $newpath);
> 		}
109,123c103,108
< $mediakey = $path && $path != $path_org ? "$usefolder/$path" : $mediakey_org;
< if(!$mediakey) $mediakey = time();
< 
< if( substr( $path, 0, 1 ) == "/" )
< 	$path = substr( $path, 1 );
< $newpath = "$rootpath$usefolder/$treestr$path";
< 
< if( $newfile && $newfile != "none" ) {
< 	if( @move_uploaded_file($newfile, $newpath) )
< 		@chmod( $newpath, 0644 );
< 	else {
< 	//improper permissions or folder doesn't exist (root path may be wrong)
< 		$message = $admtext['notcopied'] . " $newpath {$admtext['improperpermissions']}.";
< 		header( "Location: admin_media.php?message=" . urlencode($message) );
< 		exit;
---
> 		if( $thumbpath_org && $thumbpath ) {
> 			$oldthumbpath = "$rootpath$oldmediapath/$thumbpath_org";
> 			$newthumbpath = "$rootpath$newmediapath/$thumbpath";
> 			if( file_exists( $oldthumbpath ) )
> 				@rename($oldthumbpath, $newthumbpath);
> 		}
125d109
< }
127,148c111,120
< if( function_exists( 'imageJpeg' ) && $thumbcreate == "auto" ) {
< 	//$cleanpath = $session_charset == "UTF-8" ? utf8_decode($newpath) : $newpath;
< 	//$cleannewthumbpath = $session_charset == "UTF-8" ? utf8_decode($newthumbpath) : $newthumbpath;
< 	if( image_createThumb( $newpath, $newthumbpath, $thumbmaxw, $thumbmaxh, $thumbquality ) ) {
<         $destInfo  = pathInfo( $newthumbpath );
<         if( strtoupper( $destInfo['extension'] ) == "GIF") {
<             $thumbpath = substr_replace( $thumbpath, 'jpg', -3 );
<             $newthumbpath = substr_replace( $newthumbpath, 'jpg', -3 );
< 		}
< 		@chmod( $newthumbpath, 0644 );
< 	}
< 	else {
< 	//could not create thumbnail (size or type problem) or permissions (root path may be wrong)
< 		$message = $admtext['thumbnailnotcopied'] . " $newthumbpath {$admtext['improper2']}.";
< 		header( "Location: admin_media.php?message=" . urlencode($message) );
< 		exit;
< 	}
< }
< else {
< 	if( $newthumb && $newthumb != "none" ) {
< 		if( @move_uploaded_file($newthumb, $newthumbpath) )
< 			@chmod( $newthumbpath, 0644 );
---
> 	$mediakey = $path && $path != $path_org ? "$usefolder/$path" : $mediakey_org;
> 	if(!$mediakey) $mediakey = time();
> 
> 	if( substr( $path, 0, 1 ) == "/" )
> 		$path = substr( $path, 1 );
> 	$newpath = "$rootpath$usefolder/$treestr$path";
> 
> 	if( $newfile && $newfile != "none" ) {
> 		if( @move_uploaded_file($newfile, $newpath) )
> 			@chmod( $newpath, 0644 );
151c123
< 			$message = $admtext['thumbnailnotcopied'] . " $newthumbpath {$admtext['improperpermissions']}.";
---
> 			$message = $admtext['notcopied'] . " $newpath {$admtext['improperpermissions']}.";
155a128,171
> 
> 	if($thumbpath) {
> 		if( function_exists( 'imageJpeg' ) && $thumbcreate == "auto" ) {
> 			//$cleanpath = $session_charset == "UTF-8" ? utf8_decode($newpath) : $newpath;
> 			//$cleannewthumbpath = $session_charset == "UTF-8" ? utf8_decode($newthumbpath) : $newthumbpath;
> 			if( image_createThumb( $newpath, $newthumbpath, $thumbmaxw, $thumbmaxh, $thumbquality ) ) {
> 		        $destInfo  = pathInfo( $newthumbpath );
> 		        if( strtoupper( $destInfo['extension'] ) == "GIF" || strtoupper( $destInfo['extension'] ) == "PDF") {
> 		            $thumbpath = substr_replace( $thumbpath, 'jpg', -3 );
> 		            $newthumbpath = substr_replace( $newthumbpath, 'jpg', -3 );
> 				}
> 				@chmod( $newthumbpath, 0644 );
> 			}
> 			else {
> 			//could not create thumbnail (size or type problem) or permissions (root path may be wrong)
> 				$message = $admtext['thumbnailnotcopied'] . " $newthumbpath {$admtext['improper2']}.";
> 				$thumbpath = "";
> 			}
> 		}
> 		else {
> 			if( $newthumb && $newthumb != "none" ) {
> 				if( @move_uploaded_file($newthumb, $newthumbpath) )
> 					@chmod( $newthumbpath, 0644 );
> 				else {
> 				//improper permissions or folder doesn't exist (root path may be wrong)
> 					$message = $admtext['thumbnailnotcopied'] . " $newthumbpath {$admtext['improperpermissions']}.";
> 					$thumbpath = "";
> 				}
> 			}
> 		}
> 	}
> } catch (mysqli_sql_exception $e) {
> 	$message = $admtext['photonotuploaded'] . ".";
> 	header( "Location: admin_media.php?message=" . urlencode($message) );
> }
> 
> if(!empty($place)) {
> 	$placetree = $tngconfig['places1tree'] ? "" : $tree;
> 	$query = "INSERT IGNORE INTO $places_table (gedcom,place,placelevel,latitude,longitude,zoom,geoignore,temple,changedate,changedby) VALUES (\"$placetree\",\"$place\",\"0\",\"$latitude\",\"$longitude\",\"$zoom\",\"0\",\"\",\"$newdate\",\"$currentuser\")";
> 	$result = @tng_query( $query ) or die ($admtext['cannotexecutequery'] . ": $query");
> 	if($tngconfig['autogeo'] && tng_affected_rows() && (!$latitude || !$longitude)) {
> 	    $ID = tng_insert_id();
> 	    $message = geocode($place, 0, $ID);
> 	}
158c174
< $query = "UPDATE $media_table SET path=\"$path\",thumbpath=\"$thumbpath\",description=\"$description\",notes=\"$notes\",width=\"$width\",height=\"$height\",datetaken=\"$datetaken\",placetaken=\"$place\",owner=\"$owner\",changedate=\"$newdate\",changedby=\"$currentuser\",form=\"$form\",alwayson=\"$alwayson\",mediatypeID=\"$mediatypeID\",map=\"$imagemap\",abspath=\"$abspath\",gedcom=\"$tree\",status=\"$status\",cemeteryID=\"$cemeteryID\",plot=\"$plot\",showmap=\"$showmap\",linktocem=\"$linktocem\",latitude=\"$latitude\",longitude=\"$longitude\",zoom=\"$zoom\",bodytext=\"$bodytext\",usenl=\"$usenl\",newwindow=\"$newwindow\",usecollfolder=\"$usecollfolder\",mediakey=\"$mediakey\"  WHERE mediaID=\"$mediaID\"";
---
> $query = "UPDATE $media_table SET path=\"$path\",thumbpath=\"$thumbpath\",description=\"$description\",notes=\"$notes\",width=\"$width\",height=\"$height\",datetaken=\"$datetaken\",placetaken=\"$place\",owner=\"$owner\",changedate=\"$newdate\",changedby=\"$currentuser\",form=\"$form\",alwayson=\"$alwayson\",mediatypeID=\"$mediatypeID\",map=\"$imagemap\",abspath=\"$abspath\",gedcom=\"$tree\",status=\"$status\",cemeteryID=\"$cemeteryID\",plot=\"$plot\",showmap=\"$showmap\",linktocem=\"$linktocem\",latitude=\"$latitude\",longitude=\"$longitude\",zoom=\"$zoom\",bodytext=\"$bodytext\",usenl=\"$usenl\",newwindow=\"$newwindow\",private=\"$private\",usecollfolder=\"$usecollfolder\",mediakey=\"$mediakey\"  WHERE mediaID=\"$mediaID\"";
186a203
> $message = $admtext['changestoitem'] . " $mediaID {$admtext['succsaved']}.";
188,190c205,207
< if( $newmedia == "return" )
< 	header( "Location: admin_editmedia.php?mediaID=$mediaID&cw=$cw" );
< else if( $newmedia == "close" ) {
---
> if( isset($_POST['savestay']) )
> 	header( "Location: admin_editmedia.php?mediaID=$mediaID&cw=$cw&ref=1" );
> else if( isset($_POST['saveclose']) ) {
194c211
< <body>
---
> <head>
196c213,215
< 	top.close();
---
> 	window.opener.location.reload(false);
> 	window.open('','_self').close();
> 	window.location.href = "admin_media.php?message=<?php echo urlencode($message); ?>";
197a217,222
> </head>
> <body>
> <p>A change in your browser's default behavior is preventing this window from closing.</p>
> <p>To change this behavior in Firefox, type <i>about:config</i> in the browser address bar and press enter.</p>
> <p>Then search for <i>dom.allow_scripts_to_close_windows</i> and change the value of that setting from False to True.</p>
> <p>For all other browsers, please close this window or tab.</p>
202,203c227
< else  {
< 	$message = $admtext['changestoitem'] . " $mediaID {$admtext['succsaved']}.";
---
> else
205d228
< }
diff -r TNG/admin_updatemodoptions.php TNG1403/admin_updatemodoptions.php
17d16
<    //echo __FILE__,' ',__LINE__;print_r($_POST);exit;
19,20c18,19
<    if( !count($_POST['options'] ) ) {
< 		header("Location: admin_main.php");
---
>    if( empty($_POST['options'] ) ) {
> 		header("Location: admin.php");
38a38
> 
40,52d39
< 	if( !is_writeable($optionsfile) ) {
< 		$_SESSION['err_msg'] = "{$admtext['checkwrite']} {$admtext['cantwrite']} $optionsfile !";
< 		header( "Location: admin_modhandler.php" );  // restored to new Mod Manager screen KCR 140504
<     }
< 	else{
< 		//$optionsfile = "classes/mod.class.config.php";
< 
< 		$optionstring = "<?php";
< 		foreach( $options as $key => $value ) {
< 			$optionstring .= "\n\$options['$key'] = \"$value\";";
< 		}
< 		$optionstring .= "\n?>";
< 		file_put_contents( $optionsfile, $optionstring );
54c41
< 		adminwritelog( $admtext['modifyoptions'] );
---
>   $optionstring = "<?php";
56,57c43,55
< 		header( "Location: admin_modhandler.php" );  // restored to new Mod Manager screen KCR 140504
< 	}
---
>   foreach( $options as $key => $value ) {
>   	$optionstring .= "\n\$options['$key'] = \"$value\";";
>   }
>   $optionstring .= "\n?>";
> 
>   if( false === file_put_contents( $optionsfile, $optionstring ) )
>   {
>     $_SESSION['err_msg'] = "{$admtext['checkwrite']} {$admtext['cantwrite']} $optionsfile";
>   }
> 
>   adminwritelog( $admtext['modifyoptions'] );
> 
>   header( "Location: admin_modhandler.php" );
diff -r TNG/admin_updatemore.php TNG1403/admin_updatemore.php
7a8
> $admin_login = 1;
16a18
> if( !isset($info) ) $info = "";
35,49c37,49
< if (get_magic_quotes_gpc() == 0) {
< 	$info = addslashes($info);
< 	$age = addslashes($age);
< 	$agency = addslashes($agency);
< 	$cause = addslashes($cause);
< 	$address1 = addslashes($address1);
< 	$address2 = addslashes($address2);
< 	$city = addslashes($city);
< 	$state = addslashes($state);
< 	$zip = addslashes($zip);
< 	$country = addslashes($country);
< 	$phone = addslashes($phone);
< 	$email = addslashes($email);
< 	$www = addslashes($www);
< }
---
> $info = addslashes($info);
> $age = addslashes($age);
> $agency = addslashes($agency);
> $cause = addslashes($cause);
> $address1 = addslashes($address1);
> $address2 = addslashes($address2);
> $city = addslashes($city);
> $state = addslashes($state);
> $zip = addslashes($zip);
> $country = addslashes($country);
> $phone = addslashes($phone);
> $email = addslashes($email);
> $www = addslashes($www);
83c83
< 	adminwritelog( "$admtext[addnewevent]: $eventtypeID/$tree/$persfamID" );
---
> 	adminwritelog( $admtext['addnewevent'] . ": $eventtypeID/$tree/$persfamID" );
diff -r TNG/admin_updatemostwanted.php TNG1403/admin_updatemostwanted.php
20a21,22
> 
> $title = addslashes($title);
23,27c25
< //if(get_magic_quotes_gpc() == 0) {
< //	$title = addslashes($title);
< //	$description = addslashes($description);
< //}
< $cleaned = cleanIt($description);
---
> $cleaned = stripslashes($description);
29,30c27,29
< $truncated = strlen($cleaned) > 90 ? substr($truncated,0,strrpos($truncated,' ')) . '&hellip;' : $cleaned;
< $cleantitle = cleanIt($title);
---
> $truncated = strlen($cleaned) > 90 ? substr($truncated,0,strrpos($truncated,' ')) : $cleaned;
> $truncated = cleanIt($truncated) . (strlen($cleaned) > 90 ?  '&hellip;' : "");
> $cleantitle = cleanIt(stripslashes($title));
46d44
< echo $query;
diff -r TNG/admin_updatenote2.php TNG1403/admin_updatenote2.php
19,21c19
< if(get_magic_quotes_gpc() == 0) {
< 	$note = addslashes($note);
< }
---
> $note = addslashes($note);
26c24
< if( !$private ) $private = "0";
---
> if( empty($private) ) $private = "0";
30c28,30
< adminwritelog( $admtext['modifynote'] . ": $ID" );
---
> adminwritelog( $admtext['modifynote'] . ": $xID" );
> 
> $message = $admtext['notechanges'] . " $xID {$admtext['succsaved']}.";
32,33c32,37
< $message = $admtext['notechanges'] . " $ID {$admtext['succsaved']}.";
< header( "Location: admin_notelist.php?message=" . urlencode($message) );
---
> if( !empty($submitx) ) {
> 	header( "Location: admin_notelist.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_editnote2.php?ID=$xID&message=" . urlencode($message) );
> }
diff -r TNG/admin_updatenote.php TNG1403/admin_updatenote.php
7a8
> $admin_login = 1;
19,21c20
< if (get_magic_quotes_gpc() == 0) {
< 	$note = addslashes($note);
< }
---
> $note = addslashes($note);
22a22
> if( !isset($private) ) $private = "0";
30d29
< if( !$private ) $private = "0";
diff -r TNG/admin_updatepedconfig.php TNG1403/admin_updatepedconfig.php
29a30,33
> 	if(!$dvwidth) $dvwidth = 96;
> 	if(!$dvheight) $dvheight = 180;
> 	if(!$dvfontsize) $dvfontsize = 9;
> 
63d66
< 	fwrite( $fp, "\$pedigree['event'] = \"$pedevent\";\n" );
74a78,85
> 	fwrite( $fp, "\$pedigree['maxropt'] = \"$maxropt\";\n" );
> 	fwrite( $fp, "\$pedigree['maxlopt'] = \"$maxlopt\";\n" );
> 	fwrite( $fp, "\$pedigree['showtxtopt'] = \"$showtxtopt\";\n" );
> 	fwrite( $fp, "\$pedigree['compactboxopt'] = \"$compactboxopt\";\n" );
> 	fwrite( $fp, "\$pedigree['sortbyopt'] = \"$sortbyopt\";\n" );
> 	fwrite( $fp, "\$pedigree['anchoridopt'] = \"$anchoridopt\";\n" );
> 	fwrite( $fp, "\$pedigree['maxmopt'] = \"$maxmopt\";\n" );
> 
80a92,94
> 	fwrite( $fp, "\$pedigree['dvwidth'] = \"$dvwidth\";\n" );
> 	fwrite( $fp, "\$pedigree['dvheight'] = \"$dvheight\";\n" );
> 	fwrite( $fp, "\$pedigree['dvfontsize'] = \"$dvfontsize\";\n" );
84,88c98,102
< 	if(!$mpct) $mpct = 0;
< 	if(!$ypct) $ypct = 100-$mpct;
< 	if(!$ypixels) $ypixels = 10;
< 	if(!$ymult) $ymult = 10;
< 	if(!$mpixels) $mpixels = 50;
---
> 	if(empty($mpct)) $mpct = 0;
> 	if(empty($ypct)) $ypct = 100-$mpct;
> 	if(empty($ypixels)) $ypixels = 10;
> 	if(empty($ymult)) $ymult = 10;
> 	if(empty($mpixels)) $mpixels = 50;
96c110
< 	fwrite( $fp, "?>\n" );
---
> 	fwrite( $fp, "?>" );
103c117,122
< 	header( "Location: admin_setup.php" );
---
> 	if( !empty($submitx) ) {
> 		header( "Location: admin_pedconfig.php" );
> 	}
> 	else {
> 		header( "Location: admin_setup.php" );
> 	}
diff -r TNG/admin_updateperson.php TNG1403/admin_updateperson.php
7a8
> $admin_login = 1;
29c30,34
< 	if($newfamily == "ajax" && $session_charset != "UTF-8") {
---
> 	if(empty($altbirthdate)) $altbirthdate = "";
> 	if(empty($altbirthplace)) $altbirthplace = "";
> 	if(empty($altbirthtype)) $altbirthtype = "";
> 
> 	if(!empty($newfamily) && $newfamily == "ajax" && $session_charset != "UTF-8") {
46,62c51,66
< 	if (get_magic_quotes_gpc() == 0) {
< 		$firstname = addslashes($firstname);
< 		$lastname = addslashes($lastname);
< 		$lnprefix = addslashes($lnprefix);
< 		$nickname = addslashes($nickname);
< 		$prefix = addslashes($prefix);
< 		$suffix = addslashes($suffix);
< 		$title = addslashes($title);
< 		$birthplace = addslashes($birthplace);
< 		$altbirthplace = addslashes($altbirthplace);
< 		$deathplace = addslashes($deathplace);
< 		$burialplace = addslashes($burialplace);
< 		$baptplace = addslashes($baptplace);
< 		$confplace = addslashes($confplace);
< 		$initplace = addslashes($initplace);
< 		$endlplace = addslashes($endlplace);
< 	}
---
> 
> 	$firstname = addslashes($firstname);
> 	$lastname = addslashes($lastname);
> 	$lnprefix = addslashes($lnprefix);
> 	$nickname = addslashes($nickname);
> 	$prefix = addslashes($prefix);
> 	$suffix = addslashes($suffix);
> 	$title = addslashes($title);
> 	$birthplace = addslashes($birthplace);
> 	$altbirthplace = addslashes($altbirthplace);
> 	$deathplace = addslashes($deathplace);
> 	$burialplace = addslashes($burialplace);
> 	$baptplace = addslashes($baptplace);
> 	$confplace = addslashes($confplace);
> 	$initplace = addslashes($initplace);
> 	$endlplace = addslashes($endlplace);
74a79,81
> 	if(!isset($branch))
> 		$branch = "";
> 	if(!isset($allbranches)) $allbranches = "";
126,131c133,138
< 			eval( "\$sealpdate = \$sealpdate{$parent['familyID']};" );
< 			eval( "\$sealpplace = \$sealpplace{$parent['familyID']};" );
< 			$sealplace = addslashes( $sealplace );
< 			eval( "\$sealpdatetr = convertdate( \$sealpdate{$parent['familyID']} );" );
< 			eval( "\$frel = \$frel{$parent['familyID']};" );
< 			eval( "\$mrel = \$mrel{$parent['familyID']};" );
---
> 			$sealpdate = ${"sealpdate".$parent['familyID']};
> 			$sealpplace = ${"sealpplace".$parent['familyID']};
> 			$sealplace = isset($sealplace) ? addslashes( $sealplace ) : "";
> 			$sealpdatetr = convertdate( ${"sealpdate".$parent['familyID']} );
> 			$frel = !empty(${"frel".$parent['familyID']}) ? ${"frel".$parent['familyID']} : "";
> 			$mrel = !empty(${"mrel".$parent['familyID']}) ? ${"mrel".$parent['familyID']} : "";
141,143c148,150
< 	if( !$living ) $living = 0;
< 	if( !$private ) $private = 0;
< 	if( !$burialtype ) $burialtype = 0;
---
> 	if( empty($living) ) $living = 0;
> 	if( empty($private) ) $private = 0;
> 	if( empty($burialtype) ) $burialtype = 0;
144a152
> 	if(!$sex && isset($other_gender)) $sex = $other_gender;
146c154
< 		birthdate=\"$birthdate\", birthdatetr=\"$birthdatetr\", birthplace=\"$birthplace\", sex=\"$sex\", altbirthdate=\"$altbirthdate\", altbirthdatetr=\"$altbirthdatetr\", altbirthplace=\"$altbirthplace\",
---
> 		birthdate=\"$birthdate\", birthdatetr=\"$birthdatetr\", birthplace=\"$birthplace\", sex=\"$sex\", altbirthtype=\"$altbirthtype\", altbirthdate=\"$altbirthdate\", altbirthdatetr=\"$altbirthdatetr\", altbirthplace=\"$altbirthplace\",
194c202,203
< 	adminwritelog( "<a href=\"admin_editperson.php?personID=$personID&tree=$tree\">{$admtext['modifyperson']}: $tree/$personID</a>" );
---
> 	adminwritelog( "<a href=\"admin_editperson.php?personID=$personID&amp;tree=$tree\">{$admtext['modifyperson']}: $tree/$personID</a>" );
> 	$message = $admtext['changestoperson'] . " $personID {$admtext['succsaved']}.";
199,202c208,210
< if( $media == "1" )
< 	header( "Location: admin_newmedia.php?personID=$personID&tree=$tree&linktype=I&cw=$cw" );
< elseif( $newfamily == "none" ) {
< 	$message = $admtext['changestoperson'] . " $personID {$admtext['succsaved']}.";
---
> if( isset($media) && $media == "1" )
> 	header( "Location: admin_newmedia.php?personID=$personID&tree=$tree&linktype=I&cw=$cw&ref=1" );
> elseif( isset($_POST['saveret']) )
204,209c212,216
< }
< elseif( $newfamily == "return" )
< 	header( "Location: admin_editperson.php?personID=$personID&tree=$tree&cw=$cw" );
< elseif( $newfamily == "child" )
< 	header( "Location: admin_newfamily.php?child=$personID&tree=$tree&cw=$cw" );
< elseif( $newfamily == "close" ) {
---
> elseif( isset($_POST['savestay']) )
> 	header( "Location: admin_editperson.php?personID=$personID&tree=$tree&cw=$cw&ref=1" );
> elseif( isset($_POST['savepar']) )
> 	header( "Location: admin_newfamily.php?child=$personID&tree=$tree&cw=$cw&ref=1" );
> elseif( isset($_POST['saveclose']) ) {
213c220
< <body>
---
> <head>
215c222,225
< 	top.close();
---
> 	if(!window.opener.location.href.includes("admin_editfamily") && !window.opener.location.href.includes("admin_newfamily"))
> 		window.opener.location.reload(false);
> 	window.open('','_self').close();
> 	window.location.href = "admin_people.php?message=<?php echo urlencode($message); ?>";
216a227,232
> </head>
> <body>
> <p>A change in your browser's default behavior is preventing this window from closing.</p>
> <p>To change this behavior in Firefox, type <i>about:config</i> in the browser address bar and press enter.</p>
> <p>Then search for <i>dom.allow_scripts_to_close_windows</i> and change the value of that setting from False to True.</p>
> <p>For all other browsers, please close this window or tab.</p>
221c237
< elseif( $newfamily == "ajax" ) {
---
> elseif( isset($newfamily) && $newfamily == "ajax" ) {
236c252
< 	$name = $session_charset == "UTF-8" ? getName($row) : utf8_encode(getName($row));
---
> 	$name = $session_charset == "UTF-8" ? getName($row) : mb_convert_encoding(getName($row), 'UTF-8', 'ISO-8859-1');
diff -r TNG/admin_updateplace.php TNG1403/admin_updateplace.php
19,27c19,26
< if (get_magic_quotes_gpc() == 0) {
< 	$place = addslashes($place);
< 	$placelevel = addslashes($placelevel);
< 	$latitude = addslashes($latitude);
< 	$longitude = addslashes($longitude);
< 	$zoom = addslashes($zoom);
< 	$notes = addslashes($notes);
< 	$orgplace = addslashes($orgplace);
< }
---
> $place = addslashes($place);
> $placelevel = !empty($placelevel) ? addslashes($placelevel) : 0;
> $latitude = addslashes($latitude);
> $longitude = addslashes($longitude);
> $zoom = !empty($zoom) ? addslashes($zoom) : 0;
> $notes = addslashes($notes);
> $orgplace = addslashes($orgplace);
> 
34,35c33,34
< if( !$temple ) $temple = 0;
< if( !$tngconfig['places1tree'] && $newtree) {
---
> if( empty($temple) ) $temple = 0;
> if( !$tngconfig['places1tree'] && !empty($newtree) ) {
42c41,43
< $query = "UPDATE $places_table SET place=\"$place\",placelevel=\"$placelevel\",temple=\"$temple\",latitude=\"$latitude\",longitude=\"$longitude\",zoom=\"$zoom\",notes=\"$notes\",geoignore=\"0\"$newtreestr WHERE ID=\"$ID\"";
---
> $newdate = date ("Y-m-d H:i:s", time() + ( 3600 * $time_offset ) );
> 
> $query = "UPDATE $places_table SET place=\"$place\",placelevel=\"$placelevel\",temple=\"$temple\",latitude=\"$latitude\",longitude=\"$longitude\",zoom=\"$zoom\",notes=\"$notes\",geoignore=\"0\",changedate=\"$newdate\",changedby=\"$currentuser\"$newtreestr WHERE ID=\"$ID\"";
59,103c60,111
< if( $propagate && trim($orgplace) ) {
< 	//people
< 	$query = "UPDATE $people_table SET birthplace=\"$place\" WHERE birthplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $people_table SET altbirthplace=\"$place\" WHERE altbirthplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $people_table SET deathplace=\"$place\" WHERE deathplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $people_table SET burialplace=\"$place\" WHERE burialplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $people_table SET baptplace=\"$place\" WHERE baptplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $people_table SET confplace=\"$place\" WHERE confplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $people_table SET initplace=\"$place\" WHERE initplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $people_table SET endlplace=\"$place\" WHERE endlplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	
< 	//families
< 	$query = "UPDATE $families_table SET marrplace=\"$place\" WHERE marrplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $families_table SET divplace=\"$place\" WHERE divplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	$query = "UPDATE $families_table SET sealplace=\"$place\" WHERE sealplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	
< 	//events
< 	$query = "UPDATE $events_table SET eventplace=\"$place\" WHERE eventplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 	
< 	//children
< 	$query = "UPDATE $children_table SET sealplace=\"$place\" WHERE sealplace=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< 
< 	//media
< 	$query = "UPDATE $medialinks_table SET personID=\"$place\" WHERE personID=\"$orgplace\"$updatetreestr";
< 	$result = tng_query($query);
< }
< 
< adminwritelog( "<a href=\"admin_editplace.php?ID=$ID$treeurl\">{$admtext['modifyplace']}: $place</a>" );
< 
< if( $newscreen == "return" )
< 	header( "Location: admin_editplace.php?ID=$ID$treeurl" );
< elseif( $newscreen == "close" ) {
---
> if( !empty($propagate) ) {
> 	$trimmed_orgplace = trim($orgplace);
> 	if( $trimmed_orgplace && (trim($place) != $trimmed_orgplace) ) {
> 		//people
> 		$query = "UPDATE $people_table SET birthplace=\"$place\" WHERE birthplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $people_table SET altbirthplace=\"$place\" WHERE altbirthplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $people_table SET deathplace=\"$place\" WHERE deathplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $people_table SET burialplace=\"$place\" WHERE burialplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $people_table SET baptplace=\"$place\" WHERE baptplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $people_table SET confplace=\"$place\" WHERE confplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $people_table SET initplace=\"$place\" WHERE initplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $people_table SET endlplace=\"$place\" WHERE endlplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		
> 		//families
> 		$query = "UPDATE $families_table SET marrplace=\"$place\" WHERE marrplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $families_table SET divplace=\"$place\" WHERE divplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		$query = "UPDATE $families_table SET sealplace=\"$place\" WHERE sealplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		
> 		//events
> 		$query = "UPDATE $events_table SET eventplace=\"$place\" WHERE eventplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 		
> 		//children
> 		$query = "UPDATE $children_table SET sealplace=\"$place\" WHERE sealplace=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 
> 		//media
> 		$query = "UPDATE $medialinks_table SET personID=\"$place\" WHERE personID=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 
> 		$query = "UPDATE $media_table SET placetaken=\"$place\" WHERE placetaken=\"$orgplace\"$updatetreestr";
> 		$result = tng_query($query);
> 	}
> }
> 
> $message = $admtext['changestoplace'] . " $place {$admtext['succsaved']}.";
> adminwritelog( "<a href=\"admin_editplace.php?ID=$ID" . htmlspecialchars($treeurl) . "\">{$admtext['modifyplace']}: $place</a>" );
> 
> if( isset($_POST['savestay']) )
> 	header( "Location: admin_editplace.php?ID=$ID$treeurl&ref=1" );
> else if( isset($_POST['saveclose']) ) {
109c117,119
< 	top.close();
---
> 	window.opener.location.reload(false);
> 	window.open('','_self').close();
> 	window.location.href = "admin_places.php?message=<?php echo urlencode($message); ?>";
110a121,126
> </head>
> <body>
> <p>A change in your browser's default behavior is preventing this window from closing.</p>
> <p>To change this behavior in Firefox, type <i>about:config</i> in the browser address bar and press enter.</p>
> <p>Then search for <i>dom.allow_scripts_to_close_windows</i> and change the value of that setting from False to True.</p>
> <p>For all other browsers, please close this window or tab.</p>
116d131
< 	$message = $admtext['changestoplace'] . " $place {$admtext['succsaved']}.";
diff -r TNG/admin_updaterepo.php TNG1403/admin_updaterepo.php
19,30c19,28
< if (get_magic_quotes_gpc() == 0) {
< 	$reponame = addslashes($reponame);
< 	$address1 = addslashes($address1);
< 	$address2 = addslashes($address2);
< 	$city = addslashes($city);
< 	$state = addslashes($state);
< 	$zip = addslashes($zip);
< 	$country = addslashes($country);
< 	$phone = addslashes($phone);
< 	$email = addslashes($email);
< 	$www = addslashes($www);
< }
---
> $reponame = addslashes($reponame);
> $address1 = addslashes($address1);
> $address2 = addslashes($address2);
> $city = addslashes($city);
> $state = addslashes($state);
> $zip = addslashes($zip);
> $country = addslashes($country);
> $phone = addslashes($phone);
> $email = addslashes($email);
> $www = addslashes($www);
47c45,46
< adminwritelog( "<a href=\"editrepo.php?repoID=$repoID&tree=$tree\">{$admtext['modifyrepo']}: $tree/$repoID</a>" );
---
> adminwritelog( "<a href=\"editrepo.php?repoID=$repoID&amp;tree=$tree\">{$admtext['modifyrepo']}: $tree/$repoID</a>" );
> $message = $admtext['changestorepo'] . " $repoID {$admtext['succsaved']}.";
49,51c48,50
< if( $newscreen == "return" )
< 	header( "Location: admin_editrepo.php?repoID=$repoID&tree=$tree" );
< else if( $newscreen == "close" ) {
---
> if( isset($_POST['savestay']) )
> 	header( "Location: admin_editrepo.php?repoID=$repoID&tree=$tree&ref=1" );
> else if( isset($_POST['saveclose']) ) {
55c54
< <body>
---
> <head>
57c56,58
< 	top.close();
---
> 	window.opener.location.reload(false);
> 	window.open('','_self').close();
> 	window.location.href = "admin_repositories.php?message=<?php echo urlencode($message); ?>";
58a60,65
> </head>
> <body>
> <p>A change in your browser's default behavior is preventing this window from closing.</p>
> <p>To change this behavior in Firefox, type <i>about:config</i> in the browser address bar and press enter.</p>
> <p>Then search for <i>dom.allow_scripts_to_close_windows</i> and change the value of that setting from False to True.</p>
> <p>For all other browsers, please close this window or tab.</p>
63,64c70
< else {
< 	$message = $admtext['changestorepo'] . " $repoID {$admtext['succsaved']}.";
---
> else
66d71
< }
diff -r TNG/admin_updatereport.php TNG1403/admin_updatereport.php
19,25c19,23
< if (get_magic_quotes_gpc() == 0) {
< 	$reportname = addslashes($reportname);
< 	$reportnameorg = addslashes($reportnameorg);
< 	$reportdesc = addslashes($reportdesc);
< 	$criteria = addslashes($criteria);
< 	$sqlselect = addslashes($sqlselect);
< }
---
> $reportname = addslashes($reportname);
> $reportnameorg = addslashes($reportnameorg);
> $reportdesc = addslashes($reportdesc);
> $criteria = addslashes($criteria);
> $sqlselect = addslashes($sqlselect);
27c25
< if($savecopy) {
---
> if( !empty($savecopy) ) {
39c37
< 	$query = "INSERT INTO $reports_table (reportname, reportdesc, rank, active, display, criteria, orderby, sqlselect) VALUES (\"$reportname\",\"$reportdesc\",\"$rank\",\"$active\",\"$display\",\"$criteria\",\"$orderby\",\"$sqlselect\")";
---
> 	$query = "INSERT INTO $reports_table (reportname, reportdesc, ranking, active, display, criteria, orderby, sqlselect) VALUES (\"$reportname\",\"$reportdesc\",\"$ranking\",\"$active\",\"$display\",\"$criteria\",\"$orderby\",\"$sqlselect\")";
44c42
< 	$query = "UPDATE $reports_table SET reportname=\"$reportname\",reportdesc=\"$reportdesc\",rank=\"$rank\",active=\"$active\",display=\"$display\",criteria=\"$criteria\",orderby=\"$orderby\",sqlselect=\"$sqlselect\" WHERE reportID=\"$reportID\"";
---
> 	$query = "UPDATE $reports_table SET reportname=\"$reportname\",reportdesc=\"$reportdesc\",ranking=\"$ranking\",active=\"$active\",display=\"$display\",criteria=\"$criteria\",orderby=\"$orderby\",sqlselect=\"$sqlselect\" WHERE reportID=\"$reportID\"";
48c46
< adminwritelog( "<a href=\"admin_editreport.php?reportID=$reportID\">{$admtext['modifyreport']}: $reportID</a>" );
---
> adminwritelog( "<a href=\"admin_editreport.php?reportID=$reportID\">{$admtext['modifyreport']}: $reportID $reportname</a>" );
50c48
< if($submitx) {
---
> if( isset($_POST['submitx'] ) ) {
diff -r TNG/admin_updateselectedmedia.php TNG1403/admin_updateselectedmedia.php
108c108
< 		$query = "UPDATE $mediatypes_table SET disabled=\"0\" where mediatypeID=\"$newmediatypeID\"";
---
> 		$query = "UPDATE $mediatypes_table SET disabled=\"0\" where mediatypeID=\"$newmediatype\"";
diff -r TNG/admin_updatesource.php TNG1403/admin_updatesource.php
19,26c19,25
< if (get_magic_quotes_gpc() == 0) {
< 	$shorttitle = addslashes($shorttitle);
< 	$title = addslashes($title);
< 	$author = addslashes($author);
< 	$callnum = addslashes($callnum);
< 	$publisher = addslashes($publisher);
< 	$actualtext = addslashes($actualtext);
< }
---
> $shorttitle = addslashes($shorttitle);
> $title = addslashes($title);
> $author = addslashes($author);
> $callnum = addslashes($callnum);
> $publisher = addslashes($publisher);
> $actualtext = addslashes($actualtext);
> 
32a32
> $message = $admtext['changestosource'] . " $sourceID {$admtext['succsaved']}.";
34,36c34,36
< if( $newscreen == "return" )
< 	header( "Location: admin_editsource.php?sourceID=$sourceID&tree=$tree" );
< else if( $newscreen == "close" ) {
---
> if( isset($_POST['savestay']) )
> 	header( "Location: admin_editsource.php?sourceID=$sourceID&tree=$tree&ref=1" );
> else if( isset($_POST['saveclose']) ) {
40c40
< <body>
---
> <head>
42c42,44
< 	top.close();
---
> 	window.opener.location.reload(false);
> 	window.open('','_self').close();
> 	window.location.href = "admin_sources.php?message=<?php echo urlencode($message); ?>";
43a46,51
> </head>
> <body>
> <p>A change in your browser's default behavior is preventing this window from closing.</p>
> <p>To change this behavior in Firefox, type <i>about:config</i> in the browser address bar and press enter.</p>
> <p>Then search for <i>dom.allow_scripts_to_close_windows</i> and change the value of that setting from False to True.</p>
> <p>For all other browsers, please close this window or tab.</p>
48,49c56
< else {
< 	$message = $admtext['changestosource'] . " $sourceID {$admtext['succsaved']}.";
---
> else
51d57
< }
diff -r TNG/admin_updatetemplateconfig.php TNG1403/admin_updatetemplateconfig.php
4c4
< $textpart = "setup";
---
> $textpart = "templates";
9c9
< 	header("Location: admin_main.php");
---
> 	header("Location: admin.php");
49c49
< $mq = get_magic_quotes_gpc();
---
> //$mq = get_magic_quotes_gpc();
58c58
< 	if ($mq == 0) $newvalue = addslashes($newvalue);
---
> 	$newvalue = addslashes($newvalue);
64a65
> 	$num_keyparts = count($keyparts);
71,73c72,74
< 	$keyname = $keyparts[1];
< 	$num_keyparts = count($keyparts);
< 	$language = $num_keyparts > 2 ? $keyparts[$num_keyparts-1] : "";
---
> 	if($num_keyparts > 1) {
> 		$keyname = $keyparts[1];	
> 		$language = $num_keyparts > 2 ? $keyparts[$num_keyparts-1] : "";
75,81c76,77
< 	//try insert
< 	$query = $insert . "(\"$template\", \"{$orders[$template]}\", \"$keyname\", \"$language\", \"$newvalue\")";
< 	$result = tng_query($query);
< 	$success = tng_affected_rows();
< 	//else try update
< 	if(!$success) {
< 		$query = $update . "value = \"$newvalue\", ordernum = \"{$orders[$template]}\" WHERE template = \"$template\" AND keyname = \"$keyname\" AND language = \"$language\"";
---
> 		//try insert
> 		$query = $insert . "(\"$template\", \"{$orders[$template]}\", \"$keyname\", \"$language\", \"$newvalue\")";
82a79,85
> 		$success = tng_affected_rows();
> 		//else try update
> 		if(!$success) {
> 			$query = $update . "value = \"$newvalue\", ordernum = \"{$orders[$template]}\" WHERE template = \"$template\" AND keyname = \"$keyname\" AND language = \"$language\"";
> 			$result = tng_query($query);
> 		}
> 		//fwrite($fp, "\$tmp['" . $key . "'] = \"$newvalue\";\n");
84d86
< 	//fwrite($fp, "\$tmp['" . $key . "'] = \"$newvalue\";\n");
89c91,97
< header( "Location: admin_setup.php" );
---
> $staying = !empty(${"submitx".$form_templatenum});
> if( !empty($submitx) || $staying ) {
> 	header( "Location: admin_templateconfig.php" );
> }
> else {
> 	header( "Location: admin_setup.php" );
> }
Only in TNG1403: admin_updatetemplatemsg.php
diff -r TNG/admin_updatetlevent.php TNG1403/admin_updatetlevent.php
19,22c19,21
< if (get_magic_quotes_gpc() == 0) {
< 	$evdetail = addslashes($evdetail);
<     $evtitle = addslashes($evtitle);
< }
---
> $evdetail = addslashes($evdetail);
> $evtitle = addslashes($evtitle);
> 
32c31
< if( $newscreen == "return" )
---
> if( isset($_POST['savestay']) )
diff -r TNG/admin_updatetree.php TNG1403/admin_updatetree.php
20,34c20,34
< if (get_magic_quotes_gpc() == 0) {
< 	$treename = addslashes($treename);
< 	$description = addslashes($description);
< 	$owner = addslashes($owner);
< 	$email = addslashes($email);
< 	$address = addslashes($address);
< 	$city = addslashes($city);
< 	$state = addslashes($state);
< 	$country = addslashes($country);
< 	$zip = addslashes($zip);
< 	$phone = addslashes($phone);
< }
< if( !$disallowgedcreate ) $disallowgedcreate = 0;
< if( !$disallowpdf ) $disallowpdf = 0;
< if( !$private ) $private = 0;
---
> 
> $treename = addslashes($treename);
> $description = addslashes($description);
> $owner = addslashes($owner);
> $email = addslashes($email);
> $address = addslashes($address);
> $city = addslashes($city);
> $state = addslashes($state);
> $country = addslashes($country);
> $zip = addslashes($zip);
> $phone = addslashes($phone);
> 
> if( empty($disallowgedcreate) ) $disallowgedcreate = 0;
> if( empty($disallowpdf) ) $disallowpdf = 0;
> if( empty($private) ) $private = 0;
40,41c40,46
< $message = $admtext['changestotree'] . " $treenamedisp {$admtext['succsaved']}.";
< header( "Location: admin_trees.php?message=" . urlencode($message) );
---
> if( !empty($submitx) || !empty($message) ) {
> 	$message = $admtext['tree'] . " $treenamedisp {$admtext['succadded']}.";
> 	header( "Location: admin_trees.php?message=" . urlencode($message) );
> }
> else {
> 	header( "Location: admin_edittree.php?tree=$tree" );
> }
diff -r TNG/admin_updateuser.php TNG1403/admin_updateuser.php
20c20
< if(is_array($gedcom_mult))
---
> if(!empty($gedcom_mult) && is_array($gedcom_mult) && !$gedcom)
22,40c22,42
< 
< if (get_magic_quotes_gpc() == 0) {
< 	$description = addslashes($description);
< 	$username = addslashes($username);
< 	$orguser = addslashes($orguser);
< 	$orgemail = addslashes($orgemail);
< 	$gedcom = addslashes($gedcom);
< 	$branches = addslashes($branch);
< 	$realname = addslashes($realname);
< 	$phone = addslashes($phone);
< 	$email = addslashes($email);
< 	$address = addslashes($address);
< 	$notes = addslashes($notes);
< 	$website = addslashes($website);
< 	$city = addslashes($city);
< 	$state = addslashes($state);
< 	$zip = addslashes($zip);
< 	$country = addslashes($country);
< }
---
> if( !isset($description) ) $description = "";
> if( !isset($gedcom) ) $gedcom = "";
> if( !isset($branch) ) $branch = "";
> if( !isset($notes) ) $notes = "";
> 
> $description = addslashes($description);
> $username = addslashes($username);
> $orguser = addslashes($orguser);
> $orgemail = addslashes($orgemail);
> $gedcom = addslashes($gedcom);
> $branches = addslashes($branch);
> $realname = addslashes($realname);
> $phone = addslashes($phone);
> $email = addslashes($email);
> $address = addslashes($address);
> $notes = addslashes($notes);
> $website = addslashes($website);
> $city = addslashes($city);
> $state = addslashes($state);
> $zip = addslashes($zip);
> $country = addslashes($country);
59,67c61,70
< if( !$form_allow_ged ) $form_allow_ged = 0;
< if( !$form_allow_pdf ) $form_allow_pdf = 0;
< if( !$form_allow_living ) $form_allow_living = 0;
< if( !$form_allow_private ) $form_allow_private = 0;
< if( !$form_allow_lds ) $form_allow_lds = 0;
< if( !$form_allow_profile ) $form_allow_profile = 0;
< if( !$no_email ) $no_email = 0;
< if( !$disabled ) $disabled = 0;
< if( !$preflang ) $preflang = 0;
---
> if( empty($form_allow_ged) ) $form_allow_ged = 0;
> if( empty($form_allow_pdf) ) $form_allow_pdf = 0;
> if( empty($form_allow_living) ) $form_allow_living = 0;
> if( empty($form_allow_private) ) $form_allow_private = 0;
> if( empty($form_allow_private_notes) ) $form_allow_private_notes = 0;
> if( empty($form_allow_lds) ) $form_allow_lds = 0;
> if( empty($form_allow_profile) ) $form_allow_profile = 0;
> if( empty($no_email) ) $no_email = 0;
> if( empty($disabled) ) $disabled = 0;
> if( empty($preflang) ) $preflang = 0;
92c95
< 	$query = "UPDATE $users_table SET description=\"$description\",username=\"$username\",{$pwd_str}realname=\"$realname\",phone=\"$phone\",email=\"$email\",website=\"$website\",address=\"$address\",city=\"$city\",state=\"$state\",zip=\"$zip\",country=\"$country\",languageID=\"$preflang\",notes=\"$notes\",gedcom=\"$gedcom\",mygedcom=\"$mynewgedcom\",personID=\"$personID\",role=\"$role\",allow_edit=\"$form_allow_edit\",allow_add=\"$form_allow_add\",tentative_edit=\"$form_tentative_edit\",allow_delete=\"$form_allow_delete\",allow_lds=\"$form_allow_lds\",allow_living=\"$form_allow_living\",allow_private=\"$form_allow_private\",allow_ged=\"$form_allow_ged\",allow_pdf=\"$form_allow_pdf\",allow_profile=\"$form_allow_profile\",branch=\"$branch\"{$activatedstr}{$consentedstr},no_email=\"$no_email\",disabled=\"$disabled\"
---
> 	$query = "UPDATE $users_table SET description=\"$description\",username=\"$username\",{$pwd_str}realname=\"$realname\",phone=\"$phone\",email=\"$email\",website=\"$website\",address=\"$address\",city=\"$city\",state=\"$state\",zip=\"$zip\",country=\"$country\",languageID=\"$preflang\",notes=\"$notes\",gedcom=\"$gedcom\",mygedcom=\"$mynewgedcom\",personID=\"$personID\",role=\"$role\",allow_edit=\"$form_allow_edit\",allow_add=\"$form_allow_add\",tentative_edit=\"$form_tentative_edit\",allow_delete=\"$form_allow_delete\",allow_lds=\"$form_allow_lds\",allow_living=\"$form_allow_living\",allow_private=\"$form_allow_private\",allow_private_notes=\"$form_allow_private_notes\",allow_ged=\"$form_allow_ged\",allow_pdf=\"$form_allow_pdf\",allow_profile=\"$form_allow_profile\",branch=\"$branch\"{$activatedstr}{$consentedstr},no_email=\"$no_email\",disabled=\"$disabled\"
97c100
< 	if( $notify && $email ) {
---
> 	if( !empty($notify) && $email ) {
131,132c134,141
< else
< 	header( "Location: admin_users.php?message=" . urlencode($message) );
---
> else {
> 	if( !empty($submitx) ) {
> 		header( "Location: admin_users.php?message=" . urlencode($message) );
> 	}
> 	else {
> 		header( "Location: admin_edituser.php?userID=$userID" );
> 	}
> }
Only in TNG1403: admin_upgrade.php
diff -r TNG/admin_users.php TNG1403/admin_users.php
19,20c19,24
< if( $newsearch ) {
< 	$exptime = 0;
---
> $exptime = 0;
> 
> if(!isset($adminonly)) $adminonly = "";
> if(!isset($disabledonly)) $disabledonly = "";
> 
> if( !empty($newsearch) ) {
23a28
> 	setcookie("tng_search_users_post[disabledonly]", $disabledonly, $exptime);
28,31c33,38
< 	if( !$searchstring )
< 		$searchstring = stripslashes($_COOKIE['tng_search_users_post']['search']);
< 	if( !$adminonly )
< 		$adminonly = $_COOKIE['tng_search_users_post']['adminonly'];
---
> 	if( empty($searchstring) )
> 		$searchstring = isset($_COOKIE['tng_search_users_post']['search']) ? stripslashes($_COOKIE['tng_search_users_post']['search']) : "";
> 	if( empty($adminonly) )
> 		$adminonly = isset($_COOKIE['tng_search_users_post']['adminonly']) ? $_COOKIE['tng_search_users_post']['adminonly'] : "";
> 	if( empty($disabledonly) )
> 		$disabledonly = isset($_COOKIE['tng_search_users_post']['disabledonly']) ? $_COOKIE['tng_search_users_post']['disabledonly'] : "";
33,34c40,41
< 		$tngpage = $_COOKIE['tng_search_users_post']['tngpage'];
< 		$offset = $_COOKIE['tng_search_users_post']['offset'];
---
> 		$tngpage = isset($_COOKIE['tng_search_users_post']['tngpage']) ? $_COOKIE['tng_search_users_post']['tngpage'] : 1;
> 		$offset = isset($_COOKIE['tng_search_users_post']['offset']) ? $_COOKIE['tng_search_users_post']['offset'] : 0;
37d43
< 		$exptime = 0;
42a49,54
> if(!empty($order))
> 	setcookie("tng_search_users_post[order]", $order, $exptime);
> else
> 	$order = isset($_COOKIE['tng_search_users_post']['order']) ? $_COOKIE['tng_search_users_post']['order'] : "desc";
> 
> if(!isset($offset)) $offset = 0;
52a65,112
> $unsort = "un";
> $descsort = "descup";
> $namesort = "name";
> $loginsort = "login";
> $descicon = "<img src=\"img/tng_sort_desc.gif\" class=\"sortimg\" alt=\"\" />";
> $ascicon = "<img src=\"img/tng_sort_asc.gif\" class=\"sortimg\" alt=\"\" />";
> 
> if($order == "un") {
> 	$orderstr = "username, description";
> 	$unsort = "<a href=\"admin_users.php?order=unup\" class=\"lightlink\">{$admtext['username']} $descicon</a>";
> }
> else {
> 	$unsort = "<a href=\"admin_users.php?order=un\" class=\"lightlink\">{$admtext['username']} $ascicon</a>";
> 	if($order == "unup")
> 		$orderstr = "username DESC, description";
> }
> 
> if($order == "desc") {
> 	$orderstr = "description";
> 	$descsort = "<a href=\"admin_users.php?order=descup\" class=\"lightlink\">{$admtext['description']} $descicon</a>";
> }
> else {
> 	$descsort = "<a href=\"admin_users.php?order=desc\" class=\"lightlink\">{$admtext['description']} $ascicon</a>";
> 	if($order == "descup")
> 		$orderstr = "description DESC";
> }
> 
> if($order == "name") {
> 	$orderstr = "realname, description";
> 	$namesort = "<a href=\"admin_users.php?order=nameup\" class=\"lightlink\">{$admtext['realname']} / {$admtext['email']} $descicon</a>";
> }
> else {
> 	$namesort = "<a href=\"admin_users.php?order=name\" class=\"lightlink\">{$admtext['realname']} / {$admtext['email']} $ascicon</a>";
> 	if($order == "nameup")
> 		$orderstr = "realname DESC, description DESC";
> }
> 
> if($order == "login") {
> 	$orderstr = "lastlogin, description";
> 	$loginsort = "<a href=\"admin_users.php?order=loginup\" class=\"lightlink\">{$admtext['lastlogin']} $descicon</a>";
> }
> else {
> 	$loginsort = "<a href=\"admin_users.php?order=login\" class=\"lightlink\">{$admtext['lastlogin']} $ascicon</a>";
> 	if($order == "loginup")
> 		$orderstr = "lastlogin DESC, description";
> }
> 
> 
55c115,117
< $query = "SELECT *, DATE_FORMAT(lastlogin,\"%d %b %Y %H:%i:%s\") as lastlogin FROM $users_table WHERE allow_living != \"-1\" $wherestr ORDER BY description LIMIT $newoffset" . $maxsearchresults;
---
> $wherestr .= $disabledonly ? " AND disabled = \"1\"" : "";
> $query = "SELECT *, DATE_FORMAT(lastlogin,\"%d %b %Y %H:%i:%s\") as lastloginf FROM $users_table WHERE allow_living != \"-1\" $wherestr 
> 	ORDER BY $orderstr LIMIT $newoffset" . $maxsearchresults;
77d138
< $flags['tabs'] = $tngconfig['tabs'];
90,91d150
< <body background="img/background.gif">
< 
92a152,153
> 	echo tng_adminlayout();
> 
102,105c163,164
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< 	<div class="normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
114c173
< 				<input type="submit" name="submit" value="<?php echo $admtext['reset']; ?>" onClick="document.form1.searchstring.value=''; document.form1.adminonly.checked=false;" class="aligntop">
---
> 				<input type="submit" name="submit" value="<?php echo $admtext['reset']; ?>" onClick="document.form1.searchstring.value=''; document.form1.adminonly.checked=false; document.form1.disabledonly.checked=false;" class="aligntop">
120c179,180
< 				<input type="checkbox" name="adminonly" value="yes"<?php if( $adminonly == "yes" ) echo " checked"; ?>> <?php echo $admtext['adminonly']; ?>
---
> 				<input type="checkbox" name="adminonly" value="yes"<?php if( $adminonly == "yes" ) echo " checked"; ?>> <?php echo $admtext['adminonly']; ?> &nbsp;&nbsp;
> 				<input type="checkbox" name="disabledonly" value="yes"<?php if( $disabledonly == "yes" ) echo " checked"; ?>> <?php echo $admtext['disabledonly']; ?>
142c202
<   		<input type="submit" name="xuseraction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo $admtext['confdeleterecs']; ?>');">
---
>   		<input type="submit" name="xuseraction" value="<?php echo $admtext['deleteselected']; ?>" onClick="return confirm('<?php echo addslashes($admtext['confdeleterecs']); ?>');">
148c208
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
150c210
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></span></td>
---
> 			<th class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></span></th>
154c214
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</nobr></span></td>
---
> 			<th class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</nobr></span></th>
158,160c218,220
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['username']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['description']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['realname'] . " / " . $admtext['email']; ?></b>&nbsp;</td>
---
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $unsort; ?></b>&nbsp;</th>
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $descsort; ?></b>&nbsp;</th>
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $namesort; ?></b>&nbsp;</th>
162,171c222,231
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['tree']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['branch']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['role']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['living']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['text_private']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b>GED</b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b>PDF</b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['lds']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['lastlogin']; ?></b>&nbsp;</td>
< 			<td class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['disabled']; ?></b>&nbsp;</td>
---
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['tree']; ?></b>&nbsp;</th>
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['branch']; ?></b>&nbsp;</th>
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['role']; ?></b>&nbsp;</th>
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['living']; ?></b>&nbsp;</th>
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['text_private']; ?></b>&nbsp;</th>
> 			<!--<td class="fieldnameback fieldname nw">&nbsp;<b>GED</b>&nbsp;</td>-->
> 			<!--<td class="fieldnameback fieldname nw">&nbsp;<b>PDF</b>&nbsp;</td>-->
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['lds']; ?></b>&nbsp;</th>
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $loginsort; ?></b>&nbsp;</th>
> 			<th class="fieldnameback fieldname nw">&nbsp;<b><?php echo $admtext['disabled']; ?></b>&nbsp;</th>
209,210c269,270
< 			echo "<td class=\"lightback nw\" valign=\"top\">&nbsp;$form_allow_ged&nbsp;</td>\n";
< 			echo "<td class=\"lightback nw\" valign=\"top\">&nbsp;$form_allow_pdf&nbsp;</td>\n";
---
> 			//echo "<td class=\"lightback nw\" valign=\"top\">&nbsp;$form_allow_ged&nbsp;</td>\n";
> 			//echo "<td class=\"lightback nw\" valign=\"top\">&nbsp;$form_allow_pdf&nbsp;</td>\n";
212c272
< 			echo "<td class=\"lightback nw\" valign=\"top\">&nbsp;{$row['lastlogin']}&nbsp;</td>\n";
---
> 			echo "<td class=\"lightback nw\" valign=\"top\">&nbsp;{$row['lastloginf']}&nbsp;</td>\n";
229,235c289,292
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_utilities.php TNG1403/admin_utilities.php
1,322c1,380
< <?php
< include("begin.php");
< include("adminlib.php");
< $textpart = "setup";
< //include("getlang.php");
< include("$mylanguage/admintext.php");
< 
< $admin_login = 1;
< include("checklogin.php");
< include("version.php");
< 
< if( $assignedtree ) {
< 	$message = $admtext['norights'];
< 	header( "Location: admin_login.php?message=" . urlencode($message) );
< 	exit;
< }
< 
< function getfiletime( $filename ) {
< 	global $fileflag, $time_offset;
< 	
< 	$filemodtime = "";
< 	if( $fileflag ) {
< 		$filemod = filemtime( $filename ) + (3600 * $time_offset);
< 		$filemodtime = date("F j, Y h:i:s A", $filemod);
< 	}
< 	return $filemodtime;
< }
< 
< function getfilesize( $filename ) {
< 	global $fileflag;
< 	
< 	$filesize = "";
< 	if( $fileflag ) {
< 		$filesize = ceil( filesize( $filename )/1000 ) . " Kb";
< 	}
< 	return $filesize;
< }
< 
< function doRow( $table_name, $display_name ) {
< 	global $admtext, $rootpath, $backuppath, $fileflag;
< 	
< 	echo "<tr>\n";
< 	echo "<td class=\"lightback\"><div class=\"action-btns\"><a href=\"#\" onclick=\"return startOptimize('$table_name');\" title=\"{$admtext['optimize']}\" class=\"smallicon admin-opt-icon\"></a>";
< 	echo "<a href=\"#\" onclick=\"return startBackup('$table_name');\" title=\"{$admtext['backup']}\" class=\"smallicon admin-save-icon\"></a>";
< 	$fileflag = $table_name && file_exists("$rootpath$backuppath/$table_name.bak");
< 	echo "<a href=\"#\" id=\"rst_$table_name\" onclick=\"if( confirm('{$admtext['surerestore']}') ) {startRestore('$table_name') ;} return false;\" title=\"{$admtext['restore']}\" class=\"smallicon admin-rest-icon\"";
< 	if(!$fileflag) echo " style=\"visibility:hidden\"";
< 	echo "></a>";
< 	echo "</div></td>";
< 	echo "<td class=\"lightback normal\" align=\"center\"><input type=\"checkbox\" class=\"tablechecks\" name=\"$table_name\" value=\"1\" style=\"margin: 0; padding: 0;\"></td>\n";
< 	echo "<td class=\"lightback normal\">$display_name &nbsp;</td>\n";
< 	echo "<td class=\"lightback normal\"><span id=\"time_$table_name\">" . getfiletime( "$rootpath$backuppath/$table_name.bak" ) . "</span>&nbsp;</td>\n";
< 	echo "<td class=\"lightback normal\" align=\"right\"><span id=\"size_$table_name\">" . getfilesize("$rootpath$backuppath/$table_name.bak") . "</span>&nbsp;</td>\n";
< 	echo "<td class=\"lightback normal\"><span id=\"msg_$table_name\"></span>&nbsp;</td>\n";
< 	echo "</tr>\n";
< }
< 
< $helplang = findhelp("backuprestore_help.php");
< 
< if( !$sub ) $sub = "tables";
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['backuprestore'], $flags );
< ?>
< <SCRIPT language="JavaScript" type="text/javascript">
< function toggleAll(flag) {
< 	for( var i = 0; i < document.form1.elements.length; i++ ) {
< 		if( document.form1.elements[i].type == "checkbox" ) {
< 			if( flag )
< 				document.form1.elements[i].checked = true;
< 			else
< 				document.form1.elements[i].checked = false;
< 		}
< 	}
< }
< 
< function startUtility(sel) {
< 	if(sel.selectedIndex < 1) return false;
< 	var checks = jQuery('.tablechecks');
< 	var totalchecked = 0;
< 	checks.each(function(index,item) {
< 		if(item.checked) {
< 			totalchecked = 1;
< 		}
< 	});
< 	if(totalchecked) {
< 		var selval = sel.options[sel.selectedIndex].value;
< 		var form = document.form1;
< 		switch(selval) {
< 			case "backupall":
< 				form.action='admin_backup.php';
< 				form.submit();
< 				break;
< 			case "optimizeall":
< 				form.action='admin_optimize.php';
< 				form.submit();
< 				break;
< 			case "restoreall":
< 				if(confirm('<?php echo $admtext['surerestore']; ?>')) {
< 					form.action='admin_restore.php';
< 					form.submit();
< 				}
< 				break;
< 			case "delete":
< 				if(confirm('<?php echo $admtext['suredelbk']; ?>')) {
< 					form.table.value='del';
< 					form.action='admin_backup.php?table=del';
< 					form.submit();
< 				}
< 				break;
< 		}
< 	}
< 	else {
< 		alert('<?php echo $admtext['seltable']; ?>');
< 		sel.selectedIndex = 0;
< 	}
< 	return false;
< }
< 
< function startBackup(table) {
< 	var params = {table:table};
< 	jQuery('#msg_'+table).html('<img src="img/spinner.gif" />');
< 	jQuery.ajax({
< 		url: 'admin_backup.php',
< 		data: params,
< 		dataType: 'html',
< 		success: function(req) {
< 			var pairs = req.split('&');
< 			var table = pairs[0];
< 			var timestamp = pairs[1];
< 			var size = pairs[2];
< 			var message = pairs[3];
< 			jQuery('#msg_'+table).html(message);
< 			jQuery('#msg_'+table).effect('highlight',{},500);
< 			jQuery('#time_'+table).html(timestamp);
< 			jQuery('#time_'+table).effect('highlight',{},500);
< 			jQuery('#size_'+table).html(size);
< 			jQuery('#size_'+table).effect('highlight',{},500);
< 			jQuery('#rst_'+table).css('visibility','visible');
< 		}
< 	});
< 	return false;
< }
< 
< function startOptimize(table) {
< 	var params = {table:table};
< 	jQuery('#msg_'+table).html('<img src="img/spinner.gif" />');
< 	jQuery.ajax({
< 		url: 'admin_optimize.php',
< 		data: params,
< 		dataType: 'html',
< 		success: function(req) {
< 			var pairs = req.split('&');
< 			var table = pairs[0];
< 			var message = pairs[1];
< 			jQuery('#msg_'+table).html(message);
< 			jQuery('#msg_'+table).effect('highlight',{},500);
< 		}
< 	});
< 	return false;
< }
< 
< function startRestore(table) {
< 	var params = {table:table};
< 	jQuery('#msg_'+table).html('<img src="img/spinner.gif" />');
< 	jQuery.ajax({
< 		url: 'admin_restore.php',
< 		data: params,
< 		dataType: 'html',
< 		success: function(req) {
< 			var pairs = req.split('&');
< 			var table = pairs[0];
< 			var message = pairs[1];
< 			jQuery('#msg_'+table).html(message);
< 			jQuery('#msg_'+table).effect('highlight',{},500);
< 		}
< 	});
< 	return false;
< }
< </script>
< </head>
< 
< <body background="img/background.gif">
< 
< <?php
< 	$utiltabs['0'] = array(1,"admin_utilities.php?sub=tables",$admtext['tables'],"tables");
< 	$utiltabs['1'] = array(1,"admin_utilities.php?sub=structure",$admtext['tablestruct'],"structure");
< 	$utiltabs['2'] = array(1,"admin_renumbermenu.php",$admtext['renumber'],"renumber");
< 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/backuprestore_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
< 	$menu = doMenu($utiltabs,$sub,$innermenu);
< 	$headline = $sub == "tables" ? $admtext['backuprestore'] . " &gt;&gt; " . $admtext['backuprestoretables'] : $admtext['backuprestore'] . " &gt;&gt; " . $admtext['backupstruct'];
< 	echo displayHeadline($headline, "img/backuprestore_icon.gif",$menu,$message);
< ?>
< 
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
< <?php
< 	if( $sub == "tables" ) {
< ?>
< 	<p class="normal"><i><?php echo $admtext['brinstructions']; ?></i></p>
< 
< 	<p class="subhead"><strong><?php echo $admtext['backuprestoretables']; ?></strong></p>
< 	<p class="normal"><?php echo $admtext['backupnote']; ?></p>
< 	<div class="normal">
< 	<form action="" name="form1" id="form1" onsubmit="return startUtility(document.form1.withsel);">
< 	<p>
< 	<input type="hidden" name="table" value="all">
< 	<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onclick="toggleAll(1);">
< 	<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onclick="toggleAll(0);">&nbsp;&nbsp;
< 	<?php echo $admtext['wsel']; ?>
< 	<select name="withsel">
< 		<option value=""></option>
< 		<option value="backupall"><?php echo $admtext['backup']; ?></option>
< 		<option value="optimizeall"><?php echo $admtext['optimize']; ?></option>
< 		<option value="restoreall"><?php echo $admtext['restore']; ?></option>
< 		<option value="delete"><?php echo $admtext['text_delete']; ?></option>
< 	</select>
< 	<input type="submit" name="go" value="<?php echo $admtext['go']; ?>">
< 	</p>
< 
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
< 		<tr>
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></td>
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</nobr></td>
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['table']; ?></b>&nbsp;</nobr></td>
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['lastbackup']; ?></b>&nbsp;</nobr></td>
< 			<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['backupfilesize']; ?></b>&nbsp;</nobr></td>
< 			<td class="fieldnameback fieldname" style="width:200px"><nobr>&nbsp;<b><?php echo $admtext['msg']; ?></b>&nbsp;</nobr></td>
< 		</tr>
< <?php
< 	doRow( $address_table, $admtext['addresstable'] );
< 	doRow( $albums_table, $admtext['albums'] );
< 	doRow( $album2entities_table, $admtext['album2entitiestable'] );
< 	doRow( $albumlinks_table, $admtext['albumlinkstable'] );
< 	doRow( $assoc_table, $admtext['associations'] );
< 	doRow( $branches_table, $admtext['branches'] );
< 	doRow( $branchlinks_table, $admtext['brlinkstable'] );
< 	doRow( $cemeteries_table, $admtext['cemeteries'] );
< 	doRow( $children_table, $admtext['children'] );
< 	doRow( $countries_table, $admtext['countriestable'] );
< 	doRow( $dna_groups_table, $admtext['dna_groups'] );
< 	doRow( $dna_links_table, $admtext['dna_links'] );
< 	doRow( $dna_tests_table, $admtext['dna_tests'] );
< 	doRow( $events_table, $admtext['events'] );
< 	doRow( $eventtypes_table, $admtext['eventtypes'] );
< 	doRow( $families_table, $admtext['families'] );
< 	doRow( $languages_table, $admtext['languages'] );
< 	doRow( $media_table, $admtext['mediatable'] );
< 	doRow( $medialinks_table, $admtext['medialinkstable'] );
< 	doRow( $mediatypes_table, $admtext['mediatypes'] );
< 	doRow( $mostwanted_table, $admtext['mostwanted'] );
< 	doRow( $notelinks_table, $admtext['notelinkstable'] );
< 	doRow( $xnotes_table, $admtext['notes'] );
< 	doRow( $people_table, $admtext['people'] );
< 	doRow( $places_table, $admtext['places'] );
< 	doRow( $reports_table, $admtext['reports'] );
< 	doRow( $sources_table, $admtext['sources'] );
< 	doRow( $repositories_table, $admtext['repositories'] );
< 	doRow( $citations_table, $admtext['citations'] );
< 	doRow( $states_table, $admtext['statestable'] );
< 	doRow( $temp_events_table, $admtext['temptable'] );
< 	doRow( $templates_table, $admtext['templatestable'] );
< 	doRow( $tlevents_table, $admtext['tleventstable'] );
< 	doRow( $trees_table, $admtext['trees'] );
< 	doRow( $users_table, $admtext['users'] );
< ?>
< 	</table>
< 	</form>
< 
< 	</div>
< 
< <?php
< 	}
< 	elseif( $sub == "structure" ) {
< ?>
< 	<p class="normal"><i><?php echo $admtext['brinstructions2']; ?></i></p>
< 
< 	<p class="subhead"><strong><?php echo $admtext['backupstruct']; ?></strong></p>
< 	<div class="normal">
< 	<table cellpadding="3" cellspacing="1" border="0" class="normal">
< 		<tr>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></span></td>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['lastbackup']; ?></b>&nbsp;</nobr></span></td>
< 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['backupfilesize']; ?></b>&nbsp;</nobr></span></td>
< 		</tr>
< 		<tr>
< 			<td class="lightback"><div class="action-btns2"><a href="admin_backup.php?table=struct" title="<?php echo $admtext['backup']; ?>" class="smallicon admin-save-icon"></a>
< <?php
< 	if( file_exists("$rootpath$backuppath/tng_tablestructure.bak") ) {
< 		$fileflag = 1;
< ?>
< 		<a href="admin_restore.php?table=struct" onClick="return confirm('<?php echo $admtext['surerestorets']; ?>');" title="<?php echo $admtext['restore']; ?>" class="smallicon admin-rest-icon"></a>
< <?php
< 	}
< 	else
< 		$fileflag = 0;
< ?>
< 				</div>
< 			</td>
< <?php
< 	if( $fileflag ) {
< 		echo "<td class=\"lightback\"><span class=\"normal\"><nobr>&nbsp;" . getfiletime( "$rootpath$backuppath/tng_tablestructure.bak" ) . "&nbsp;</nobr></span></td>\n";
< 		echo "<td class=\"lightback\" align=\"right\"><span class=\"normal\"><nobr>&nbsp;" . getfilesize("$rootpath$backuppath/tng_tablestructure.bak") . "&nbsp;</nobr></span></td>\n";
< 	}
< 	else {
< 		echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;</span></td>\n";
< 		echo "<td class=\"lightback\" align=\"right\"><span class=\"normal\">&nbsp;</span></td>\n";
< 	}
< ?>
< 		</tr>
< 	</table>
< 
< 	</div>
< <?php
< 	}
< ?>
< </td>
< </tr>
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> <?php
> include("begin.php");
> include("adminlib.php");
> $textpart = "setup";
> //include("getlang.php");
> include("$mylanguage/admintext.php");
> 
> $admin_login = 1;
> include("checklogin.php");
> include("version.php");
> 
> if( $assignedtree ) {
> 	$message = $admtext['norights'];
> 	header( "Location: admin_login.php?message=" . urlencode($message) );
> 	exit;
> }
> 
> $fullbackuppath = !empty($tngconfig['saveconfig']) ? $subroot . $backuppath : $rootpath . $backuppath;
> 
> function getfiletime( $filename ) {
> 	global $fileflag, $time_offset;
> 	
> 	$filemodtime = "";
> 	if( $fileflag ) {
> 		$filemod = filemtime( $filename ) + (3600 * $time_offset);
> 		$filemodtime = date("F j, Y h:i:s A", $filemod);
> 	}
> 	return $filemodtime;
> }
> 
> function getfilesize( $filename ) {
> 	global $fileflag;
> 	
> 	$filesize = "";
> 	if( $fileflag ) {
> 		$filesize = ceil( filesize( $filename )/1000 ) . " Kb";
> 	}
> 	return $filesize;
> }
> 
> function doRow( $table_name, $display_name ) {
> 	global $admtext, $rootpath, $fullbackuppath, $backuppath, $tngconfig, $fileflag, $tngdomain;
> 	
> 	$ext = file_exists("$fullbackuppath/$table_name.sql") ? ".sql" : ".bak";
> 	$filename = "$fullbackuppath/$table_name$ext";
> 	$download = empty($tngconfig['saveconfig']) ? "$tngdomain/$backuppath/$table_name$ext" : "";
> 	echo "<tr>\n";
> 	echo "<td class=\"lightback\"><div class=\"action-btns\" style=\"width:97px\"><a href=\"#\" onclick=\"return startOptimize('$table_name');\" title=\"{$admtext['optimize']}\" class=\"smallicon admin-opt-icon\"></a>";
> 	echo "<a href=\"#\" onclick=\"return startBackup('$table_name');\" title=\"{$admtext['backup']}\" class=\"smallicon admin-save-icon\"></a>";
> 	$fileflag = $table_name && file_exists( $filename );
> 	echo "<a href=\"#\" id=\"rst_$table_name\" onclick=\"if( confirm('{$admtext['surerestore']}') ) {startRestore('$table_name') ;} return false;\" title=\"{$admtext['restore']}\" class=\"smallicon admin-rest-icon\"";
> 	if(!$fileflag) echo " style=\"visibility:hidden\"";
> 	echo "></a>";
> 	echo "<a href=\"$download\" id=\"dl_$table_name\" title=\"{$admtext['download']}\" class=\"smallicon admin-down-icon\"";
> 	if(!$fileflag || empty($download)) echo " style=\"visibility:hidden\"";
> 	echo " download></a>";
> 	echo "</div></td>";
> 	echo "<td class=\"lightback normal\" align=\"center\"><input type=\"checkbox\" class=\"tablechecks\" name=\"$table_name\" value=\"1\" style=\"margin: 0; padding: 0;\"></td>\n";
> 	echo "<td class=\"lightback normal\">$display_name &nbsp;</td>\n";
> 	echo "<td class=\"lightback normal\"><span id=\"time_$table_name\">" . getfiletime( $filename ) . "</span>&nbsp;</td>\n";
> 	echo "<td class=\"lightback normal\" align=\"right\"><span id=\"size_$table_name\">" . getfilesize( $filename ) . "</span>&nbsp;</td>\n";
> 	echo "<td class=\"lightback normal\"><span id=\"msg_$table_name\"></span>&nbsp;</td>\n";
> 	echo "</tr>\n";
> }
> 
> $helplang = findhelp("backuprestore_help.php");
> 
> if( empty($sub) ) $sub = "tables";
> if( !isset($message) ) $message = "";
> tng_adminheader( $admtext['backuprestore'], $flags );
> ?>
> <script type="text/javascript">
> function toggleAll(flag) {
> 	for( var i = 0; i < document.form1.elements.length; i++ ) {
> 		if( document.form1.elements[i].type == "checkbox" && document.form1.elements[i].name.substr(0,2) != "do" ) {
> 			if( flag )
> 				document.form1.elements[i].checked = true;
> 			else
> 				document.form1.elements[i].checked = false;
> 		}
> 	}
> }
> 
> function toggleSQL(el) {
> 	if(!el.checked) {
> 		document.getElementById('docreate').checked = false;
> 		document.getElementById('docreate').disabled = true;
> 		document.getElementById('dodrop').checked = false;
> 		document.getElementById('dodrop').disabled = true;
> 	}
> 	else {
> 		document.getElementById('docreate').disabled = false;
> 		document.getElementById('dodrop').disabled = false;
> 	}
> }
> 
> function toggleCreate(el) {
> 	if(!el.checked) {
> 		document.getElementById('dodrop').checked = false;
> 		document.getElementById('dodrop').disabled = true;
> 	}
> 	else {
> 		document.getElementById('dodrop').disabled = false;
> 	}
> }
> 
> function startUtility(sel) {
> 	if(sel.selectedIndex < 1) return false;
> 	var checks = jQuery('.tablechecks');
> 	var totalchecked = 0;
> 	checks.each(function(index,item) {
> 		if(item.checked) {
> 			totalchecked = 1;
> 		}
> 	});
> 	if(totalchecked) {
> 		var selval = sel.options[sel.selectedIndex].value;
> 		var form = document.form1;
> 		switch(selval) {
> 			case "backupall":
> 				form.action='admin_backup.php';
> 				form.submit();
> 				break;
> 			case "optimizeall":
> 				form.action='admin_optimize.php';
> 				form.submit();
> 				break;
> 			case "restoreall":
> 				if(confirm('<?php echo $admtext['surerestore']; ?>')) {
> 					form.action='admin_restore.php';
> 					form.submit();
> 				}
> 				break;
> 			case "delete":
> 				if(confirm('<?php echo $admtext['suredelbk']; ?>')) {
> 					form.table.value='del';
> 					form.action='admin_backup.php?table=del';
> 					form.submit();
> 				}
> 				break;
> 		}
> 	}
> 	else {
> 		alert('<?php echo $admtext['seltable']; ?>');
> 		sel.selectedIndex = 0;
> 	}
> 	return false;
> }
> 
> function startBackup(table) {
> 	var dosql = document.getElementById('dosql').checked;
> 	var docreate = document.getElementById('docreate').checked;
> 	var dodrop = document.getElementById('dodrop').checked;
> 	var params = {table:table,dosql:dosql,docreate:docreate,dodrop:dodrop};
> 	jQuery('#msg_'+table).html('<img src="img/spinner.gif" />');
> 	jQuery.ajax({
> 		url: 'admin_backup.php',
> 		data: params,
> 		dataType: 'html',
> 		success: function(req) {
> 			var pairs = req.split('&');
> 			var table = pairs[0];
> 			var timestamp = pairs[1];
> 			var size = pairs[2];
> 			var filename = pairs[3];
> 			var message = pairs[4];
> 			jQuery('#msg_'+table).html(message);
> 			jQuery('#msg_'+table).effect('highlight',{},500);
> 			jQuery('#time_'+table).html(timestamp);
> 			jQuery('#time_'+table).effect('highlight',{},500);
> 			jQuery('#size_'+table).html(size);
> 			jQuery('#size_'+table).effect('highlight',{},500);
> 			jQuery('#rst_'+table).css('visibility','visible');
> 			jQuery('#dl_'+table).css('visibility','visible');
> 			jQuery('#dl_'+table).attr('href', filename);
> 		}
> 	});
> 	return false;
> }
> 
> function startOptimize(table) {
> 	var params = {table:table};
> 	jQuery('#msg_'+table).html('<img src="img/spinner.gif" />');
> 	jQuery.ajax({
> 		url: 'admin_optimize.php',
> 		data: params,
> 		dataType: 'html',
> 		success: function(req) {
> 			var pairs = req.split('&');
> 			var table = pairs[0];
> 			var message = pairs[1];
> 			jQuery('#msg_'+table).html(message);
> 			jQuery('#msg_'+table).effect('highlight',{},500);
> 		}
> 	});
> 	return false;
> }
> 
> function startRestore(table) {
> 	var dodel = document.getElementById('dodel').checked;
> 	var params = {table:table,dodel:dodel};
> 	jQuery('#msg_'+table).html('<img src="img/spinner.gif" />');
> 	jQuery.ajax({
> 		url: 'admin_restore.php',
> 		data: params,
> 		dataType: 'html',
> 		success: function(req) {
> 			var pairs = req.split('&');
> 			var table = pairs[0];
> 			var message = pairs[1];
> 			jQuery('#msg_'+table).html(message);
> 			jQuery('#msg_'+table).effect('highlight',{},500);
> 		}
> 	});
> 	return false;
> }
> </script>
> </head>
> 
> <?php
> 	echo tng_adminlayout();
> 
> 	$utiltabs['0'] = array(1,"admin_utilities.php?sub=tables",$admtext['tables'],"tables");
> 	$utiltabs['1'] = array(1,"admin_utilities.php?sub=structure",$admtext['tablestruct'],"structure");
> 	$utiltabs['2'] = array(1,"admin_renumbermenu.php",$admtext['renumber'],"renumber");
> 	$innermenu = "<a href=\"#\" onclick=\"return openHelp('$helplang/backuprestore_help.php');\" class=\"lightlink\">{$admtext['help']}</a>";
> 	$menu = doMenu($utiltabs,$sub,$innermenu);
> 	$headline = $sub == "tables" ? $admtext['backuprestore'] . " &gt;&gt; " . $admtext['backuprestoretables'] : $admtext['backuprestore'] . " &gt;&gt; " . $admtext['backupstruct'];
> 	echo displayHeadline($headline, "img/backuprestore_icon.gif",$menu,$message);
> ?>
> 
> <div class="admin-main">
> 	<div class="databack admin-block">
> <?php
> 	if( $sub == "tables" ) {
> ?>
> 	<p class="normal"><i><?php echo $admtext['brinstructions']; ?></i></p>
> 
> 	<p class="subhead"><strong><?php echo $admtext['backuprestoretables']; ?></strong></p>
> 	<p class="normal"><?php echo $admtext['backupnote']; ?></p>
> 	<div class="normal">
> 	<form action="" name="form1" id="form1" onsubmit="return startUtility(document.form1.withsel);">
> 		<p>
> <?php
> 	echo "{$admtext['onbackup']}: ";
> 	echo "<input type=\"checkbox\" name=\"dosql\" value=\"1\" id=\"dosql\" checked onchange=\"toggleSQL(this);\"> {$admtext['dosql']} &nbsp;";
> 	echo "<input type=\"checkbox\" name=\"docreate\" value=\"1\" id=\"docreate\" checked onchange=\"toggleCreate(this);\"> {$admtext['docreate']} &nbsp;";
> 	echo "<input type=\"checkbox\" name=\"dodrop\" value=\"1\" id=\"dodrop\" checked> {$admtext['dodrop']}";
> 	echo " &nbsp; << <a href=\"#\" onclick=\"return openHelp('$helplang/backuprestore_help.php');\">{$admtext['help']}</a>";
> ?>
> 		</p>
> 		<p>
> <?php
> 	echo "{$admtext['onrestore']}: ";
> 	echo "<input type=\"checkbox\" name=\"dodel\" value=\"1\" id=\"dodel\" checked> {$admtext['dodel']} &nbsp;";
> ?>
> 		</p>
> 		<p>
> 		<input type="hidden" name="table" value="all">
> 		<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onclick="toggleAll(1);">
> 		<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onclick="toggleAll(0);">&nbsp;&nbsp;
> 		<?php echo $admtext['wsel']; ?>
> 		<select name="withsel">
> 			<option value=""></option>
> 			<option value="backupall"><?php echo $admtext['backup']; ?></option>
> 			<option value="optimizeall"><?php echo $admtext['optimize']; ?></option>
> 			<option value="restoreall"><?php echo $admtext['restore']; ?></option>
> 			<option value="delete"><?php echo $admtext['text_delete']; ?></option>
> 		</select>
> 		<input type="submit" name="go" value="<?php echo $admtext['go']; ?>">
> 		</p>
> 
> 		<table cellpadding="3" cellspacing="1" border="0" class="normal rounded-table">
> 			<tr>
> 				<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></td>
> 				<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['select']; ?></b>&nbsp;</nobr></td>
> 				<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['table']; ?></b>&nbsp;</nobr></td>
> 				<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['lastbackup']; ?></b>&nbsp;</nobr></td>
> 				<td class="fieldnameback fieldname"><nobr>&nbsp;<b><?php echo $admtext['backupfilesize']; ?></b>&nbsp;</nobr></td>
> 				<td class="fieldnameback fieldname" style="width:200px"><nobr>&nbsp;<b><?php echo $admtext['msg']; ?></b>&nbsp;</nobr></td>
> 			</tr>
> <?php
> 	doRow( $address_table, $admtext['addresstable'] );
> 	doRow( $albums_table, $admtext['albums'] );
> 	doRow( $album2entities_table, $admtext['album2entitiestable'] );
> 	doRow( $albumlinks_table, $admtext['albumlinkstable'] );
> 	doRow( $assoc_table, $admtext['associations'] );
> 	doRow( $branches_table, $admtext['branches'] );
> 	doRow( $branchlinks_table, $admtext['brlinkstable'] );
> 	doRow( $cemeteries_table, $admtext['cemeteries'] );
> 	doRow( $children_table, $admtext['children'] );
> 	doRow( $countries_table, $admtext['countriestable'] );
> 	doRow( $dna_groups_table, $admtext['dna_groups'] );
> 	doRow( $dna_links_table, $admtext['dna_links'] );
> 	doRow( $dna_tests_table, $admtext['dna_tests'] );
> 	doRow( $events_table, $admtext['events'] );
> 	doRow( $eventtypes_table, $admtext['eventtypes'] );
> 	doRow( $families_table, $admtext['families'] );
> 	doRow( $image_tags_table, $admtext['imgtags'] );
> 	doRow( $languages_table, $admtext['languages'] );
> 	doRow( $media_table, $admtext['mediatable'] );
> 	doRow( $medialinks_table, $admtext['medialinkstable'] );
> 	doRow( $mediatypes_table, $admtext['mediatypes'] );
> 	doRow( $mostwanted_table, $admtext['mostwanted'] );
> 	doRow( $notelinks_table, $admtext['notelinkstable'] );
> 	doRow( $xnotes_table, $admtext['notes'] );
> 	doRow( $people_table, $admtext['people'] );
> 	doRow( $places_table, $admtext['places'] );
> 	doRow( $reports_table, $admtext['reports'] );
> 	doRow( $sources_table, $admtext['sources'] );
> 	doRow( $repositories_table, $admtext['repositories'] );
> 	doRow( $citations_table, $admtext['citations'] );
> 	doRow( $states_table, $admtext['statestable'] );
> 	doRow( $temp_events_table, $admtext['temptable'] );
> 	doRow( $templates_table, $admtext['templatestable'] );
> 	doRow( $tlevents_table, $admtext['tleventstable'] );
> 	doRow( $trees_table, $admtext['trees'] );
> 	doRow( $users_table, $admtext['users'] );
> ?>
> 		</table>
> 	</form>
> 
> 	</div>
> 
> <?php
> 	}
> 	elseif( $sub == "structure" ) {
> ?>
> 	<p class="normal"><i><?php echo $admtext['brinstructions2']; ?></i></p>
> 
> 	<p class="subhead"><strong><?php echo $admtext['backupstruct']; ?></strong></p>
> 	<div class="normal">
> 	<table cellpadding="3" cellspacing="1" border="0" class="normal  rounded-table">
> 		<tr>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['action']; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['lastbackup']; ?></b>&nbsp;</nobr></span></td>
> 			<td class="fieldnameback"><span class="fieldname"><nobr>&nbsp;<b><?php echo $admtext['backupfilesize']; ?></b>&nbsp;</nobr></span></td>
> 		</tr>
> 		<tr>
> 			<td class="lightback"><div class="action-btns"><a href="admin_backup.php?table=struct" title="<?php echo $admtext['backup']; ?>" class="smallicon admin-save-icon"></a>
> <?php
> 	$ext = file_exists("$fullbackuppath/tng_tablestructure.sql") ? ".sql" : ".bak";
> 	$filename = "$fullbackuppath/tng_tablestructure{$ext}";
> 	if( $ext == ".sql" || file_exists($filename) ) {
> 		$fileflag = 1;
> ?>
> 		<a href="admin_restore.php?table=struct" onClick="return confirm('<?php echo $admtext['surerestorets']; ?>');" title="<?php echo $admtext['restore']; ?>" class="smallicon admin-rest-icon"></a>
> <?php
> 		if(empty($tngconfig['saveconfig'])) {
> ?>
> 		<a href="<?php echo "$tngdomain/$backuppath/tng_tablestructure{$ext}"; ?>" title="<?php echo $admtext['download']; ?>" class="smallicon admin-down-icon"></a>
> <?php
> 		}
> 	}
> 	else
> 		$fileflag = 0;
> ?>
> 				</div>
> 			</td>
> <?php
> 	if( $fileflag ) {
> 		echo "<td class=\"lightback\"><span class=\"normal\"><nobr>&nbsp;" . getfiletime( "$fullbackuppath/tng_tablestructure{$ext}" ) . "&nbsp;</nobr></span></td>\n";
> 		echo "<td class=\"lightback\" align=\"right\"><span class=\"normal\"><nobr>&nbsp;" . getfilesize("$fullbackuppath/tng_tablestructure{$ext}") . "&nbsp;</nobr></span></td>\n";
> 	}
> 	else {
> 		echo "<td class=\"lightback\"><span class=\"normal\">&nbsp;</span></td>\n";
> 		echo "<td class=\"lightback\" align=\"right\"><span class=\"normal\">&nbsp;</span></td>\n";
> 	}
> ?>
> 		</tr>
> 	</table>
> 
> 	</div>
> <?php
> 	}
> ?>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_valreport.php TNG1403/admin_valreport.php
21,22c21,23
< $flags['tabs'] = $tngconfig['tabs'];
< tng_adminheader( $admtext['validation'], $flags );
---
> setcookie("tng_val_post[tree]", $tree, 0);
> 
> tng_adminheader( $admtext['dataval'], $flags );
27,28d27
< <body background="img/background.gif">
< 
29a29,30
> 	echo tng_adminlayout();
> 
36d36
< 	$innermenu .= " &nbsp;|&nbsp; <a href=\"$mostwanted_url\" target=\"_blank\" class=\"lightlink\">{$admtext['test']}</a>";
41,43c41
< 	$nameFields = "$people_table.personID, $people_table.lastname, $people_table.firstname, $people_table.lnprefix, $people_table.prefix, $people_table.suffix, $people_table.nameorder, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom";
< 	$hNameFields = "h.personID as hpersonID, h.lastname as hlastname, h.firstname as hfirstname, h.lnprefix as hlnprefix, h.prefix as hprefix, h.suffix as hsuffix, h.nameorder as hnameorder, h.living as hliving, h.private as hprivate, h.branch as hbranch, h.gedcom as hgedcom";
< 	$wNameFields = "w.personID as wpersonID, w.lastname as wlastname, w.firstname as wfirstname, w.lnprefix as wlnprefix, w.prefix as wprefix, w.suffix as wsuffix, w.nameorder as wnameorder, w.living as wliving, w.private as wprivate, w.branch as wbranch, w.gedcom as wgedcom";
---
> 	$nameFields = "$people_table.personID, $people_table.lastname, $people_table.firstname, $people_table.lnprefix, $people_table.prefix, $people_table.suffix, $people_table.nameorder, $people_table.title, $people_table.birthdate, $people_table.birthdatetr, $people_table.altbirthdate, $people_table.altbirthdatetr, $people_table.deathdate, $people_table.deathdatetr, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom";
44a43
> 	if( !isset($offset) ) $offset = 0;
138a138
> 			$select2a = $select2b = $query2 = "";
216,218c216,217
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow normal">
---
> <div class="admin-main">
> 	<div class="databack admin-block">
225c224
< 	<table cellpadding="5" cellspacing="1" border="0" class="normal">
---
> 	<table cellpadding="5" cellspacing="1" border="0" class="normal rounded-table">
229c228,229
< 	for($i = 0; $i < count($display); $i++) {
---
> 	$num_display_headers = count($display);
> 	for($i = 0; $i < $num_display_headers; $i++) {
240c240,241
< 			for($i = 0; $i < count($values); $i++) {
---
> 			$num_values = count($values);
> 			for($i = 0; $i < $num_values; $i++) {
245c246
< 					$value = "<a href=\"admin_editperson.php?personID={$row['personID']}&tree={$row['gedcom']}\" target=\"_blank\">" . getName($row) . "</a>";
---
> 					$value = "<a href=\"admin_editperson.php?personID={$row['personID']}&amp;tree={$row['gedcom']}\" target=\"_blank\">" . getName($row) . "</a>";
248c249
< 					$value = "<a href=\"admin_editfamily.php?familyID={$row['familyID']}&tree={$row['gedcom']}\" target=\"_blank\">{$row['familyID']}</a>";
---
> 					$value = "<a href=\"admin_editfamily.php?familyID={$row['familyID']}&amp;tree={$row['gedcom']}\" target=\"_blank\">{$row['familyID']}</a>";
250c251
< 					$value = "<a href=\"admin_editperson.php?personID={$row['personID']}&tree={$row['gedcom']}\" target=\"_blank\">{$row['personID']}</a>";
---
> 					$value = "<a href=\"admin_editperson.php?personID={$row['personID']}&amp;tree={$row['gedcom']}\" target=\"_blank\">{$row['personID']}</a>";
266,276c267,271
< 
< <?php
< 
< ?>
< </td>
< </tr>
< 
< </table>
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
\ No newline at end of file
---
> 	</div>
> </div>
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/admin_whatsnewmsg.php TNG1403/admin_whatsnewmsg.php
25d24
< $flags['tabs'] = $tngconfig['tabs'];
37,38d35
< <body background="img/background.gif">
< 
39a37,38
> 	echo tng_adminlayout();
> 
50,52c49,52
< <table width="100%" border="0" cellpadding="10" cellspacing="2" class="lightback">
< <tr class="databack">
< <td class="tngshadow">
---
> <div class="admin-main">
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="adm-rounded-table">
> <tr>
> <td class="tngshadow databack">
55,57c55,59
< 	<p class="normal" id="savedmsg" style="<?php if($color) echo "color:$color;"; else echo "display:none;" ?>"><i><?php echo $message; ?></i></p>
< 	<textarea cols="150" rows="20" name="whatsnewmsg" id="whatsnewmsg"><?php if(is_array($contents)) {foreach( $contents as $line ) {echo $line;}} ?></textarea><br />
< 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['save']; ?>">
---
> 	<p class="normal" id="savedmsg" style="<?php if( !empty($color) ) echo "color:$color;"; else echo "display:none;" ?>"><i><?php if( isset($message) ) echo $message; ?></i></p>
> 	<textarea cols="100" rows="20" name="whatsnewmsg" id="whatsnewmsg"><?php if(is_array($contents)) {foreach( $contents as $line ) {echo $line;}} ?></textarea><br />
> 	<input type="submit" name="submitx" class="btn" value="<?php echo $admtext['saveback']; ?>">
> 	<input type="submit" name="submit" accesskey="s" class="btn" value="<?php echo $admtext['savereturn']; ?>">
> 	<input type="button" name="cancel" class="btn" value="<?php echo $text['cancel']; ?>" onClick="window.location.href='admin_misc.php';">
63c65
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
---
> </div>
68c70
<     new nicEditor({fullPanel : true}).panelInstance('whatsnewmsg');
---
>     new nicEditor({fullPanel : true, maxHeight: 300}).panelInstance('whatsnewmsg');
72,73c74,76
< </body>
< </html>
\ No newline at end of file
---
> <?php 
> echo tng_adminfooter();
> ?>
\ No newline at end of file
diff -r TNG/ahnentafel.php TNG1403/ahnentafel.php
1,395c1,409
< <?php
< $textpart = "pedigree";
< include("tng_begin.php");
< 
< if(!$personID) die("no args");
< include($subroot . "pedconfig.php");
< include($cms['tngpath'] . "personlib.php" );
< include($cms['tngpath'] . "reglib.php" );
< 
< $getperson_url = getURL( "getperson", 1 );
< $descend_url = getURL( "descend", 1 );
< $familygroup_url = getURL( "familygroup", 1 );
< $ahnentafel_url = getURL( "ahnentafel", 1 );
< $pedigree_url = getURL( "pedigree", 1 );
< $pedigreetext_url = getURL( "pedigreetext", 1 );
< $extrastree_url = getURL( "extrastree", 1 );
< $pdfform_url = getURL( "rpt_pdfform", 1 );
< $vertical_url = getURL( "verticalchart", 1 );
< $fan_url = getURL( "fan", 1 );
< 
< if($tngmore)
< 	$pedigree['regnotes'] = 1;
< elseif($tngless)
< 	$pedigree['regnotes'] = 0;
< 
< $detail_link = "{$ahnentafel_url}personID=$personID&tree=$tree&parentset=$parentset&generations=$generations";
< if($pedigree['regnotes'])
< 	$detail_link = "<a href=\"{$detail_link}&tngless=1\">{$text['lessdetail']}</a>";
< else
< 	$detail_link = "<a href=\"{$detail_link}&tngmore=1\">{$text['moredetail']}</a>";
< 
< $generation = 1;
< $personcount = 1;
< 
< $currgen = array();
< $nextgen = array();
< $numbers = array();
< $lastgen = array();
< $lastlastgen = array();
< 
< $result = getPersonFullPlusDates($tree, $personID);
< if( !tng_num_rows($result) ) {
< 	tng_free_result($result);
< 	header( "Location: thispagedoesnotexist.html" );
< 	exit;
< }
< 
< $row = tng_fetch_assoc( $result );
< tng_free_result($result);
< $righttree = checktree($tree);
< $rightbranch = $righttree ? checkbranch($row['branch']) : false;
< $rights = determineLivingPrivateRights($row, $righttree, $rightbranch);
< $row['allow_living'] = $rights['living'];
< $row['allow_private'] = $rights['private'];
< $row['name'] = getName( $row );
< //if( $row['name'] == $text['living'] ) $row['firstname'] = $text['living'];
< $firstfirstname = getFirstNameOnly( $row );
< 
< $logname = $tngconfig['nnpriv'] && $row['private'] ? $admtext['text_private'] : ($nonames && $row['living'] ? $text['living'] : $row['name']);
< $row['genlist'] = "";
< $row['number'] = 1;
< $row['spouses'] = getSpouses( $personID, $row['sex'] );
< $lastlastgen[$personID] = 1;
< 
< $treeResult = getTreeSimple($tree);
< $treerow = tng_fetch_assoc($treeResult);
< $disallowgedcreate = $treerow['disallowgedcreate'];
< $allowpdf = !$treerow['disallowpdf'] || ($allow_pdf && $rightbranch);
< tng_free_result($treeResult);
< 
< writelog( "<a href=\"$ahnentafel_url" . "personID=$personID&amp;tree=$tree\">" . xmlcharacters($text['ahnentafel'] . ": $logname ($personID)") . "</a>" );
< preparebookmark( "<a href=\"$ahnentafel_url" . "personID=$personID&amp;tree=$tree\">" . xmlcharacters($text['ahnentafel'] . ": " . $row['name'] . " ($personID)") . "</a>" );
< 
< $flags['tabs'] = $tngconfig['tabs'];
< $flags['scripting'] = "<script type=\"text/javascript\">var tnglitbox;</script>\n";
< tng_header( $row['name'], $flags );
< 
< 	$photostr = showSmallPhoto( $personID, $row['name'], $rights['both'], 0, false, $row['sex'] );
< 	echo tng_DrawHeading( $photostr, $row['name'], getYears( $row ) );
< 
< 	if( !$pedigree['maxgen'] ) $pedigree['maxgen'] = 6;
< 	if( $generations > $pedigree['maxgen'] )
< 	    $generations = intval($pedigree['maxgen']);
<     elseif( !$generations )
< 	    $generations = $pedigree['initpedgens'] >= 2 ? intval($pedigree['initpedgens']) : 2;
< 	else
< 		$generations = intval( $generations );
< 	    
< 	$innermenu = $text['generations'] . ": &nbsp;";
< 	$innermenu .= "<select name=\"generations\" class=\"verysmall\" onchange=\"window.location.href='$ahnentafel_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=' + this.options[this.selectedIndex].value\">\n";
<     for( $i = 1; $i <= $pedigree['maxgen']; $i++ ) {
<         $innermenu .= "<option value=\"$i\"";
<         if( $i == $generations ) $innermenu .= " selected=\"selected\"";
<         $innermenu .= ">$i</option>\n";
<     }
< 	$innermenu .= "</select>&nbsp;&nbsp;&nbsp;\n";
< 	$innermenu .= "<a href=\"$pedigree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=standard&amp;generations=$generations\" class=\"lightlink\" id=\"stdpedlnk\">{$text['pedstandard']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< 	$innermenu .= "<a href=\"$vertical_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=vertical&amp;generations=$generations\" class=\"lightlink\" id=\"pedchartlnk\">{$text['pedvertical']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< 	$innermenu .= "<a href=\"$pedigree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=compact&amp;generations=$generations\" class=\"lightlink\" id=\"compedlnk\">{$text['pedcompact']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< 	$innermenu .= "<a href=\"$pedigree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=box&amp;generations=$generations\" class=\"lightlink\" id=\"boxpedlnk\">{$text['pedbox']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< 	$innermenu .= "<a href=\"$pedigreetext_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=$generations\" class=\"lightlink\">{$text['pedtextonly']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< 	$innermenu .= "<a href=\"$ahnentafel_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=$generations\" class=\"lightlink3\">{$text['ahnentafel']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< 	$innermenu .= "<a href=\"$fan_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=$generations\" class=\"lightlink\">{$text['fanchart']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< 	$innermenu .= "<a href=\"$extrastree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;showall=1&amp;generations=$generations\" class=\"lightlink\">{$text['media']}</a>\n";
< 	if($generations <= 6 && $allowpdf)
< 		$innermenu .= " &nbsp;&nbsp; | &nbsp;&nbsp; <a href=\"#\" class=\"lightlink\" onclick=\"tnglitbox = new LITBox('$pdfform_url" . "pdftype=ped&amp;personID=$personID&amp;tree=$tree&amp;generations=$generations',{width:350,height:350});return false;\">PDF</a>\n";
< 
< 	echo getFORM( "pedigree", "", "form1", "form1" );
< 	echo tng_menu( "I", "pedigree", $personID, $innermenu );
< 	echo "</form>\n";
< ?>
< 
< <div class="titleboxmedium">
< 	<div class="float-right"><?php echo $detail_link; ?></div>
< <?php
< //do self
< echo "<span class=\"subhead\"><strong>{$text['generation']}: 1</strong></span><br/><br />\n";
< echo "<ol style=\"list-style-type:none; padding:0px; margin:0px;\">";
< echo "<li>";
< echo "<table cellpadding=\"0\" cellspacing=\"0\" class=\"aligntop\" ><tr><td width=\"40\" class=\"aligntop\" align=\"right\">";
< echo "$personcount.&nbsp;&nbsp;</td><td>";
< echo showSmallPhoto( $row['personID'], $row['name'], $rights['both'], 0 );
< echo "<a href=\"$getperson_url" . "personID={$row['personID']}&amp;tree=$tree\" name=\"p{$row['personID']}\" id=\"p{$row['personID']}\">{$row['name']}</a>";
< echo getVitalDates( $row, 1 );
< echo getOtherEvents($row);
< if( $rights['both'] && $pedigree['regnotes'] ) {
< 	$notes = buildRegNotes(getRegNotes( $row['personID'], "I" ));
< 	if( $notes ) {
< 		echo "<p>{$text['notes']}:<br/>";
< 		echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
< 	}
< }
< else
< 	$notes = "";
< 
< //do spouse
< while( $spouserow = array_shift( $row['spouses'] ) ) {
< 
< 	if($spouserow['marrdate'] || $spouserow['marrplace']) {
< 		echo "<p>$firstfirstname " . strtolower($text['wasmarried']) . " <a href=\"$getperson_url" . "personID={$spouserow['personID']}&amp;tree=$tree\">{$spouserow['name']}</a>";
< 		echo getSpouseDates( $spouserow );
< 	}
< 	else
< 		echo "<p>$firstfirstname " . strtolower($text['wasmarried']) . " <a href=\"$getperson_url" . "personID={$spouserow['personID']}&amp;tree=$tree\">{$spouserow['name']}</a>.";
< 	$spouseinfo = getVitalDates( $spouserow );
< 	if( $spouseinfo ) {
< 		$spfirstfirstname = getFirstNameOnly( $spouserow );
< 		$spparents = getSpouseParents( $spouserow['personID'], $spouserow['sex'] );
< 		echo " $spfirstfirstname $spparents $spouseinfo";
< 	}
< 	echo " [<a href=\"$familygroup_url" . "familyID={$spouserow['familyID']}&amp;tree=$tree\">{$text['groupsheet']}</a>]";
< 	echo "</p>\n";
< 
< 	if($pedigree['regnotes']) {
< 		$famrights = determineLivingPrivateRights($spouserow, $righttree);
< 		if($famrights['both']) {
< 			$notes = buildRegNotes(getRegNotes( $spouserow['familyID'], "F" ));
< 			if( $notes ) {
< 				echo "<p>{$text['notes']}:<br/>";
< 				echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
< 			}
< 		}
< 	}
< 
< 	$result2 = getChildrenData($tree, $spouserow['familyID']);
< 	if( $result2 && tng_num_rows( $result2 ) ) {
< 		echo "{$text['children']}:\n<ol class=\"ahnblock\">\n";
< 		while( $childrow = tng_fetch_assoc( $result2 ) ) {
< 			$childrow['genlist'] = $newlist;
< 			$crights = determineLivingPrivateRights($childrow, $righttree);
< 			$childrow['allow_living'] = $crights['living'];
< 			$childrow['allow_private'] = $crights['private'];
< 			$childrow['name'] = getName( $childrow );
< 			if( $childrow['name'] == $text['living'] ) $childrow['firstname'] = $text['living'];
< 
< 			echo "<li style=\"list-style-type:lower-roman\"><a href=\"$getperson_url" . "personID={$childrow['personID']}&amp;tree=$tree\">{$childrow['name']}</a>";
< 			echo getVitalDates( $childrow );
< 			echo "</li>\n";
< 		}
< 		echo "</ol>\n";
< 		tng_free_result( $result2 );
< 	}
< }
< //if(!$is_mozilla)
< 	echo "</td></tr></table>";
< echo "<br clear=\"all\" /></li>\n</ol>\n";
< 
< 
< //push famc (family of parents) to nextgen
< $parentfamID = "";
< $locparentset = $parentset;
< $parentscount = 0;
< $parentfamIDs = array();
< $parents = getChildFamily($tree, $personID, "parentorder");
< if ( $parents ) {
< 	$parentscount = tng_num_rows( $parents );
< 	if ( $parentscount > 0 ) {
< 		if ( $locparentset > $parentscount )
< 			$locparentset = $parentscount;
< 		$i = 0;
< 		while ( $parentrow = tng_fetch_assoc( $parents ) ) {
< 			$i++;
< 			if( $i == $locparentset )
< 				$parentfamID = $parentrow['familyID'];
< 			$parentfamIDs[$i] = $parentrow['familyID'];
< 		}
< 		if(!$parentfamID) $parentfamID = $row['famc'];
< 	}
< 	tng_free_result($parents);
< }
< 
< array_push( $currgen, $parentfamID );
< $generation++;
< $personcount = 1;
< $numbers[$parentfamID] = 1;
< 
< //loop through nextgen
< //while there's one to pop and we're less than maxgen
< while( count( $currgen ) && $generation <= $generations ) {
< 	//echo "<span class=\"subhead\"><strong>{$text['generation']}: $generation</strong></span><br />\n";
< 	echo "<span class=\"subhead\"><strong>{$text['generation']}: $generation</strong></span><br /><br />\n";
< 	//echo "<ol class=\"ahnblock normal\">\n";
< 	echo "<ol style=\"list-style-type:none; padding:0px; margin:0px;\">";
< 	while( $nextfamily = array_shift( $currgen ) ) {
< 		$parents = getFamilyData($tree, $nextfamily);
< 		if( $parents ) {
< 			$parentrow = tng_fetch_assoc( $parents );
< 
< 			$famrights = determineLivingPrivateRights($parentrow, $righttree);
< 			$parentrow['allow_living'] = $famrights['living'];
< 			$parentrow['allow_private'] = $famrights['private'];
< 
< 			if( $parentrow['husband'] ) {
< 				$gotfather = getPersonData($tree, $parentrow['husband']);
< 	
< 			     if( $gotfather ) { 		
< 					$fathrow =  tng_fetch_assoc( $gotfather );
< 					if( $fathrow['firstname'] || $fathrow['lastname'] ) {
< 						$personcount = $numbers[$nextfamily] * 2;
< 						$lastgen[$fathrow['personID']] = $personcount;
< 						$frights = determineLivingPrivateRights($fathrow, $righttree);
< 						$fathrow['allow_living'] = $frights['living'];
< 						$fathrow['allow_private'] = $frights['private'];
< 						$fathrow['name'] = getName( $fathrow );
< 						if( $fathrow['name'] == $text['living'] ) $fathrow['firstname'] = $text['living'];
< 
< 						//echo "<li value=\"$personcount\" class=\"aligntop\">";
< 						echo "<li>";
< //						if(!$is_mozilla)
< 							//echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
< 							echo "<table cellpadding=\"0\" cellspacing=\"0\" class=\"aligntop\"><tr><td width=\"40\" class=\"aligntop\" align=\"right\">";
< 							echo "$personcount.&nbsp;&nbsp;</td><td>";
< 						echo showSmallPhoto( $fathrow['personID'], $fathrow['name'], $frights['both'], 0 );
< 						echo "<a href=\"$getperson_url" . "personID={$fathrow['personID']}&amp;tree=$tree\" name=\"p{$fathrow['personID']}\" id=\"p{$fathrow['personID']}\">{$fathrow['name']}</a>";
< 						echo getVitalDates( $fathrow, 1 );
< 						echo getOtherEvents($fathrow);
< 						if( $frights['both'] && $pedigree['regnotes'] ) {
< 							$notes = buildRegNotes(getRegNotes( $fathrow['personID'], "I" ));
< 							if( $notes ) {
< 								echo "<p>{$text['notes']}:<br />";
< 								echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
< 							}
< 						}
< 						else $notes = "";
< 						if( $fathrow['famc'] ) {
< 							if( !in_array( $fathrow['famc'], $nextgen ) )
< 								array_push( $nextgen, $fathrow['famc'] );
< 							if(!$numbers[$fathrow['famc']])
< 								$numbers[$fathrow['famc']] = $personcount;
< 						}
< 					}
< 					tng_free_result( $gotfather );
< 				} 
< 			}
< 
< 			if( $parentrow['wife'] ) {
< 				$gotmother = getPersonData($tree, $parentrow['wife']);
< 
< 				if( $gotmother ) { 
< 					$mothrow =  tng_fetch_assoc( $gotmother );
< 					if( $mothrow['firstname'] || $mothrow['lastname'] ) {
< 						$personcount = $numbers[$nextfamily] * 2 + 1;
< 						$lastgen[$mothrow['personID']] = $personcount;
< 						$mrights = determineLivingPrivateRights($mothrow, $righttree);
< 						$mothrow['allow_living'] = $mrights['living'];
< 						$mothrow['allow_private'] = $mrights['private'];
< 						$mothrow['name'] = getName( $mothrow );
< 						if( $mothrow['name'] == $text['living'] ) $mothrow['firstname'] = $text['living'];
< 
< 						if( $parentrow['husband'] ) {
< 							$firstfirstname = getFirstNameOnly( $fathrow );
<  							$parentrow['both'] = $mothrow['both'];
< 							if($parentrow['marrdate'] || $parentrow['marrplace']) {
< 								echo "<p>$firstfirstname " . strtolower($text['wasmarried']) . " <a href=\"#\" onclick=\"jQuery('html, body').animate({scrollTop: jQuery('#p{$parentrow['wife']}').offset().top-10},'slow'); return false;\">{$mothrow['name']}</a>";
< 								echo getSpouseDates( $parentrow );
< 							}
< 							else
< 								echo "<p>$firstfirstname " . strtolower($text['wasmarried']) . " <a href=\"#\" onclick=\"jQuery('html, body').animate({scrollTop: jQuery('#p{$parentrow['wife']}').offset().top-10},'slow'); return false;\">{$mothrow['name']}</a>.";
< 							$spouseinfo = getVitalDates( $mothrow );
< 							if( $spouseinfo ) {
< 								$spfirstfirstname = getFirstNameOnly( $mothrow );
< 								$spparents = getSpouseParents( $mothrow['personID'], $mothrow['sex'] );
< 								echo " $spfirstfirstname $spparents $spouseinfo";
< 							}
< 							echo " [<a href=\"$familygroup_url" . "familyID=$nextfamily&amp;tree=$tree\">{$text['groupsheet']}</a>]</p>\n";
< //							if(!$is_mozilla)
< 								echo "</td></tr></table>";
< 							echo "<br clear=\"all\" /></li>\n";
< 						}
< 
< 						//echo "<li value=\"$personcount\" class=\"aligntop\">";
< 						echo "<li>";
< //						if(!$is_mozilla)
< 							//echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
< 							echo "<table cellpadding=\"0\" cellspacing=\"0\" class=\"aligntop\"><tr><td width=\"40\" class=\"aligntop\" align=\"right\">";
< 							echo "$personcount.&nbsp;&nbsp;</td><td>";
< 						echo showSmallPhoto( $mothrow['personID'], $mothrow['name'], $mrights['both'], 0 );
< 						echo "<a href=\"$getperson_url" . "personID={$mothrow['personID']}&amp;tree=$tree\" name=\"p{$mothrow['personID']}\" id=\"p{$mothrow['personID']}\">{$mothrow['name']}</a>";
< 						echo getVitalDates( $mothrow, 1 );
< 						echo getOtherEvents($mothrow);
< 						if( $mrights['both'] && $pedigree['regnotes'] ) {
< 							$notes = buildRegNotes(getRegNotes( $mothrow['personID'], "I" ));
< 							if( $notes ) {
< 								echo "<p>{$text['notes']}:<br />";
< 								echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
< 							}
< 						}
< 						else $notes = "";
< 						//echo "</li>\n";
< 						if( $mothrow['famc'] ) {
< 							if( !in_array( $mothrow['famc'], $nextgen ) )
<    								array_push( $nextgen, $mothrow['famc'] );
< 							if(!$numbers[$mothrow['famc']])
< 								$numbers[$mothrow['famc']] = $personcount;
< 						}
< 					}
< 					tng_free_result( $gotmother );
< 				}
< 				if($pedigree['regnotes']) {
< 					$prights = determineLivingPrivateRights($parentrow, $righttree);
< 					if($prights['both']) {
< 						$notes = buildRegNotes(getRegNotes( $nextfamily, "F" ));
< 						if( $notes ) {
< 							echo "<p>{$text['notes']}:<br />";
< 							echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
< 						}
< 					}
< 				}
< 			}
< 
< 			//get children
< 			$result2 = getChildrenData($tree, $nextfamily);
< 			if( $result2 && tng_num_rows( $result2 ) ) {
< 				echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>{$text['children']}:<br />\n<ol class=\"ahnblock\">\n";
< 				while( $childrow = tng_fetch_assoc( $result2 ) ) {
< 					$crights = determineLivingPrivateRights($childrow, $righttree);
< 					$childrow['allow_living'] = $crights['living'];
< 					$childrow['allow_private'] = $crights['private'];
< 					$childrow['name'] = getName( $childrow );
< 					//if( $childrow['name'] == $text['living'] ) $childrow['firstname'] = $text['living'];
< 		
< 					echo "<li style=\"list-style-type:lower-roman\">";
< 					if( $lastlastgen[$childrow['personID']] ) {
< 						echo $lastlastgen[$childrow['personID']] . ". ";
< 						echo "<a href=\"#\" onclick=\"jQuery('html, body').animate({scrollTop: jQuery('#p{$childrow['personID']}').offset().top-10},'slow'); return false;\">{$childrow['name']}</a>";
< 					}
< 					else
< 						echo "<a href=\"$getperson_url" . "personID={$childrow['personID']}&amp;tree=$tree\">{$childrow['name']}</a>";
< 					echo getVitalDates( $childrow );
< 					echo "</li>\n";
< 				}
< 				echo "</ol>\n</td></tr></table>\n";
< 				tng_free_result( $result2 );
< 			}
< //			if(!$is_mozilla)
< 				echo "</td></tr></table>";
< 			echo "<br clear=\"all\" /></li>\n";
< 		}
< 	}
< 	
< 	$currgen = $nextgen;
< 	$lastlastgen = $lastgen;
< 	unset( $nextgen );
< 	unset( $lastgen );
< 	$nextgen = array();
< 	$lastgen = array();
< 	$generation++;
< 	echo "</ol>\n<br />\n";
< }
< ?>
< </div>
< 
< <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/rpt_utils.js"></script>
< <?php
< 	tng_footer( "" );
---
> <?php
> $textpart = "pedigree";
> include("tng_begin.php");
> 
> if(!$personID) die("no args");
> include($subroot . "pedconfig.php");
> include($cms['tngpath'] . "personlib.php" );
> include($cms['tngpath'] . "reglib.php" );
> 
> $getperson_url = getURL( "getperson", 1 );
> $descend_url = getURL( "descend", 1 );
> $familygroup_url = getURL( "familygroup", 1 );
> $familychart_url = getURL( "familychart", 1 );
> $ahnentafel_url = getURL( "ahnentafel", 1 );
> $pedigree_url = getURL( "pedigree", 1 );
> $pedigreetext_url = getURL( "pedigreetext", 1 );
> $extrastree_url = getURL( "extrastree", 1 );
> $pdfform_url = getURL( "rpt_pdfform", 1 );
> $vertical_url = getURL( "verticalchart", 1 );
> $fan_url = getURL( "fan", 1 );
> 
> if(!empty($tngmore))
> 	$pedigree['regnotes'] = 1;
> elseif(!empty($tngless))
> 	$pedigree['regnotes'] = 0;
> 
> $parentset = isset($parentset) ? intval($parentset) : 0;
> 
> $detail_link = "{$ahnentafel_url}personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=$generations";
> if($pedigree['regnotes'])
> 	$detail_link = "<a href=\"{$detail_link}&amp;tngless=1\">{$text['lessdetail']}</a>";
> else
> 	$detail_link = "<a href=\"{$detail_link}&amp;tngmore=1\">{$text['moredetail']}</a>";
> 
> $generation = 1;
> $personcount = 1;
> 
> $currgen = array();
> $nextgen = array();
> $numbers = array();
> $lastgen = array();
> $lastlastgen = array();
> 
> $result = getPersonFullPlusDates($tree, $personID);
> if( !tng_num_rows($result) ) {
> 	tng_free_result($result);
> 	header( "Location: thispagedoesnotexist.html" );
> 	exit;
> }
> 
> $row = tng_fetch_assoc( $result );
> tng_free_result($result);
> $righttree = checktree($tree);
> $rightbranch = $righttree ? checkbranch($row['branch']) : false;
> $rights = determineLivingPrivateRights($row, $righttree, $rightbranch);
> $row['allow_living'] = $rights['living'];
> $row['allow_private'] = $rights['private'];
> $row['name'] = getName( $row );
> //if( $row['name'] == $text['living'] ) $row['firstname'] = $text['living'];
> $firstfirstname = getFirstNameOnly( $row );
> $personsex = $row['sex'];
> 
> $logname = $tngconfig['nnpriv'] && $row['private'] ? $admtext['text_private'] : ($nonames && $row['living'] ? $text['living'] : $row['name']);
> $row['genlist'] = "";
> $row['number'] = 1;
> $row['spouses'] = getSpouses( $personID, $row['sex'] );
> $lastlastgen[$personID] = 1;
> 
> $treeResult = getTreeSimple($tree);
> $treerow = tng_fetch_assoc($treeResult);
> $disallowgedcreate = $treerow['disallowgedcreate'];
> $allowpdf = !$treerow['disallowpdf'] || ($allow_pdf && $rightbranch);
> tng_free_result($treeResult);
> 
> writelog( "<a href=\"$ahnentafel_url" . "personID=$personID&amp;tree=$tree\">" . xmlcharacters($text['ahnentafel'] . ": $logname ($personID)") . "</a>" );
> preparebookmark( "<a href=\"$ahnentafel_url" . "personID=$personID&amp;tree=$tree\">" . xmlcharacters($text['ahnentafel'] . ": " . $row['name'] . " ($personID)") . "</a>" );
> 
> $flags['scripting'] = "<script type=\"text/javascript\">var tnglitbox;</script>\n";
> tng_header( $row['name'], $flags );
> 
> 	$photostr = showSmallPhoto( $personID, $row['name'], $rights['both'], 0, false, $row['sex'] );
> 	echo tng_DrawHeading( $photostr, $row['name'], getYears( $row ) );
> 
> 	if( !$pedigree['maxgen'] ) $pedigree['maxgen'] = 6;
> 	if( $generations > $pedigree['maxgen'] )
> 	    $generations = intval($pedigree['maxgen']);
>     elseif( !$generations )
> 	    $generations = $pedigree['initpedgens'] >= 2 ? intval($pedigree['initpedgens']) : 2;
> 	else
> 		$generations = intval( $generations );
> 
> 	$innermenu = $text['generations'] . ": &nbsp;";
> 	$innermenu .= "<select name=\"generations\" class=\"verysmall\" onchange=\"window.location.href='$ahnentafel_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=' + this.options[this.selectedIndex].value\">\n";
>     for( $i = 1; $i <= $pedigree['maxgen']; $i++ ) {
>         $innermenu .= "<option value=\"$i\"";
>         if( $i == $generations ) $innermenu .= " selected=\"selected\"";
>         $innermenu .= ">$i</option>\n";
>     }
> 	$innermenu .= "</select>&nbsp;&nbsp;&nbsp;\n";
> 	$innermenu .= "<a href=\"$pedigree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=standard&amp;generations=$generations\" class=\"lightlink\" id=\"stdpedlnk\">{$text['pedstandard']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> 	$innermenu .= "<a href=\"$vertical_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=vertical&amp;generations=$generations\" class=\"lightlink\" id=\"pedchartlnk\">{$text['pedvertical']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> 	$innermenu .= "<a href=\"$pedigree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=compact&amp;generations=$generations\" class=\"lightlink\" id=\"compedlnk\">{$text['pedcompact']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> 	$innermenu .= "<a href=\"$pedigree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=box&amp;generations=$generations\" class=\"lightlink\" id=\"boxpedlnk\">{$text['pedbox']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> 	$innermenu .= "<a href=\"$pedigreetext_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=$generations\" class=\"lightlink\">{$text['pedtextonly']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> 	$innermenu .= "<a href=\"$ahnentafel_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=$generations\" class=\"lightlink3\">{$text['ahnentafel']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> 	$innermenu .= "<a href=\"$fan_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=$generations\" class=\"lightlink\">{$text['fanchart']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> 	$innermenu .= "<a href=\"$extrastree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;showall=1&amp;generations=$generations\" class=\"lightlink\">{$text['media']}</a>\n";
> 	if($generations <= 6 && $allowpdf)
> 		$innermenu .= " &nbsp;&nbsp; | &nbsp;&nbsp; <a href=\"#\" class=\"lightlink\" onclick=\"tnglitbox = new LITBox('$pdfform_url" . "pdftype=ped&amp;personID=$personID&amp;tree=$tree&amp;generations=$generations',{width:350,height:350});return false;\">PDF</a>\n";
> 
> 	echo getFORM( "pedigree", "", "form1", "form1" );
> 	echo tng_menu( "I", "pedigree", $personID, $innermenu );
> 	echo "</form>\n";
> ?>
> 
> <div class="titleboxmedium">
> 	<div class="float-right"><?php echo $detail_link; ?></div>
> <?php
> //do self
> echo "<span class=\"subhead\"><strong>{$text['generation']}: 1</strong></span><br/><br />\n";
> echo "<ol style=\"list-style-type:none; padding:0px; margin:0px;\">";
> echo "<li>";
> echo "<table cellpadding=\"0\" cellspacing=\"0\" class=\"aligntop\" ><tr><td width=\"40\" class=\"aligntop\" align=\"right\">";
> echo "$personcount.&nbsp;&nbsp;</td><td>";
> echo showSmallPhoto( $row['personID'], $row['name'], $rights['both'], 0 );
> echo "<a href=\"$getperson_url" . "personID={$row['personID']}&amp;tree=$tree\" name=\"p{$row['personID']}\" id=\"p{$row['personID']}\">{$row['name']}</a>";
> echo getVitalDates( $row, 1 );
> echo getOtherEvents($row);
> if( $rights['both'] && $pedigree['regnotes'] ) {
> 	$notes = buildRegNotes(getRegNotes( $row['personID'], "I" ));
> 	if( $notes ) {
> 		echo "<p>{$text['notes']}:<br/>";
> 		echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
> 	}
> }
> else
> 	$notes = "";
> 
> //do spouse
> while( $spouserow = array_shift( $row['spouses'] ) ) {
> 
> 	$marriagemsg = ($personsex == "F") ? $text['wasmarried_female'] :  $text['wasmarried_male'];
> 	if($spouserow['marrdate'] || $spouserow['marrplace']) {
> 		echo "<p>$firstfirstname " . $marriagemsg . " <a href=\"$getperson_url" . "personID={$spouserow['personID']}&amp;tree=$tree\">{$spouserow['name']}</a>";
> 		echo getSpouseDates( $spouserow, $personsex );
> 	}
> 	else {
> 		$spousename = $spouserow['name'] ? $spouserow['name'] : $text['unknown'];
> 		if(!empty($spouserow['personID']))
> 			echo "<p>{$text['family']}/{$text['spouse']}: <a href=\"$getperson_url" . "personID={$spouserow['personID']}&amp;tree=$tree\">$spousename</a>.";
> 		else
> 			echo "<p>{$text['family']}/{$text['spouse']}: $spousename.";
> 	}
> 	$spouseinfo = getVitalDates( $spouserow );
> 	if( $spouseinfo ) {
> 		$spfirstfirstname = getFirstNameOnly( $spouserow );
> 		$spparents = getSpouseParents( $spouserow['personID'], $spouserow['sex'] );
> 		echo " $spfirstfirstname $spparents $spouseinfo";
> 	}
> 	if(!$tngprint) {
> 		echo " [<a href=\"$familygroup_url" . "familyID={$spouserow['familyID']}&amp;tree=$tree\">{$text['groupsheet']}</a>]";
> 		echo " [<a href=\"$familychart_url" . "familyID={$spouserow['familyID']}&amp;tree=$tree\">{$text['familychart']}</a>]";
> 	}
> 	echo "</p>\n";
> 
> 	if($pedigree['regnotes']) {
> 		$famrights = determineLivingPrivateRights($spouserow, $righttree);
> 		if($famrights['both']) {
> 			$notes = buildRegNotes(getRegNotes( $spouserow['familyID'], "F" ));
> 			if( $notes ) {
> 				echo "<p>{$text['notes']}:<br/>";
> 				echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
> 			}
> 		}
> 	}
> 
> 	$result2 = getChildrenData($tree, $spouserow['familyID']);
> 	if( $result2 && tng_num_rows( $result2 ) ) {
> 		echo "{$text['children']}:\n<ol class=\"ahnblock\">\n";
> 		while( $childrow = tng_fetch_assoc( $result2 ) ) {
> 			//$childrow['genlist'] = $newlist;
> 			$crights = determineLivingPrivateRights($childrow, $righttree);
> 			$childrow['allow_living'] = $crights['living'];
> 			$childrow['allow_private'] = $crights['private'];
> 			$childrow['name'] = getName( $childrow );
> 			if( $childrow['name'] == $text['living'] ) $childrow['firstname'] = $text['living'];
> 
> 			echo "<li style=\"list-style-type:lower-roman\"><a href=\"$getperson_url" . "personID={$childrow['personID']}&amp;tree=$tree\">{$childrow['name']}</a>";
> 			echo getVitalDates( $childrow );
> 			echo "</li>\n";
> 		}
> 		echo "</ol>\n";
> 		tng_free_result( $result2 );
> 	}
> }
> //if(!$is_mozilla)
> 	echo "</td></tr></table>";
> echo "<br clear=\"all\" /></li>\n</ol>\n";
> 
> 
> //push famc (family of parents) to nextgen
> $parentfamID = "";
> $locparentset = $parentset;
> $parentscount = 0;
> $parentfamIDs = array();
> $parents = getChildFamily($tree, $personID, "parentorder");
> if ( $parents ) {
> 	$parentscount = tng_num_rows( $parents );
> 	if ( $parentscount > 0 ) {
> 		if ( $locparentset > $parentscount )
> 			$locparentset = $parentscount;
> 		$i = 0;
> 		while ( $parentrow = tng_fetch_assoc( $parents ) ) {
> 			$i++;
> 			if( $i == $locparentset )
> 				$parentfamID = $parentrow['familyID'];
> 			$parentfamIDs[$i] = $parentrow['familyID'];
> 		}
> 		if(!$parentfamID) $parentfamID = $row['famc'];
> 	}
> 	tng_free_result($parents);
> }
> 
> array_push( $currgen, $parentfamID );
> $generation++;
> $personcount = 1;
> $numbers[$parentfamID] = 1;
> 
> //loop through nextgen
> //while there's one to pop and we're less than maxgen
> while( count( $currgen ) && $generation <= $generations ) {
> 	//echo "<span class=\"subhead\"><strong>{$text['generation']}: $generation</strong></span><br />\n";
> 	echo "<span class=\"subhead\"><strong>{$text['generation']}: $generation</strong></span><br /><br />\n";
> 	//echo "<ol class=\"ahnblock normal\">\n";
> 	echo "<ol style=\"list-style-type:none; padding:0px; margin:0px;\">";
> 	while( $nextfamily = array_shift( $currgen ) ) {
> 		$parents = getFamilyData($tree, $nextfamily);
> 		if( $parents ) {
> 			$parentrow = tng_fetch_assoc( $parents );
> 
> 			$famrights = determineLivingPrivateRights($parentrow, $righttree);
> 			$parentrow['allow_living'] = $famrights['living'];
> 			$parentrow['allow_private'] = $famrights['private'];
> 			$parentrow['both'] = $famrights['both'];
> 
> 			if( $parentrow['husband'] ) {
> 				$gotfather = getPersonData($tree, $parentrow['husband']);
> 
> 				$fathrow =  tng_fetch_assoc( $gotfather );
> 				if( $fathrow ) {
> 					if( $fathrow['firstname'] || $fathrow['lastname'] ) {
> 						$personcount = $numbers[$nextfamily] * 2;
> 						$lastgen[$fathrow['personID']] = $personcount;
> 						$frights = determineLivingPrivateRights($fathrow, $righttree);
> 						$fathrow['allow_living'] = $frights['living'];
> 						$fathrow['allow_private'] = $frights['private'];
> 						$fathrow['name'] = getName( $fathrow );
> 						if( $fathrow['name'] == $text['living'] ) $fathrow['firstname'] = $text['living'];
> 
> 						//echo "<li value=\"$personcount\" class=\"aligntop\">";
> 						echo "<li>";
> //						if(!$is_mozilla)
> 							//echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
> 							echo "<table cellpadding=\"0\" cellspacing=\"0\" class=\"aligntop\"><tr><td width=\"40\" class=\"aligntop\" align=\"right\">";
> 							echo "$personcount.&nbsp;&nbsp;</td><td>";
> 						echo showSmallPhoto( $fathrow['personID'], $fathrow['name'], $frights['both'], 0 );
> 						echo "<a href=\"$getperson_url" . "personID={$fathrow['personID']}&amp;tree=$tree\" name=\"p{$fathrow['personID']}\" id=\"p{$fathrow['personID']}\">{$fathrow['name']}</a>";
> 						echo getVitalDates( $fathrow, 1 );
> 						echo getOtherEvents($fathrow);
> 						if( $frights['both'] && $pedigree['regnotes'] ) {
> 							$notes = buildRegNotes(getRegNotes( $fathrow['personID'], "I" ));
> 							if( $notes ) {
> 								echo "<p>{$text['notes']}:<br />";
> 								echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
> 							}
> 						}
> 						else $notes = "";
> 						if( $fathrow['famc'] ) {
> 							if( !in_array( $fathrow['famc'], $nextgen ) )
> 								array_push( $nextgen, $fathrow['famc'] );
> 							if(empty($numbers[$fathrow['famc']]))
> 								$numbers[$fathrow['famc']] = $personcount;
> 						}
> 					}
> 				}
> 				tng_free_result( $gotfather );
> 			}
> 
> 			if( $parentrow['wife'] ) {
> 				$gotmother = getPersonData($tree, $parentrow['wife']);
> 
> 				$mothrow =  tng_fetch_assoc( $gotmother );
> 				if( $gotmother ) {
> 					if( $mothrow['firstname'] || $mothrow['lastname'] ) {
> 						$personcount = $numbers[$nextfamily] * 2 + 1;
> 						$lastgen[$mothrow['personID']] = $personcount;
> 						$mrights = determineLivingPrivateRights($mothrow, $righttree);
> 						$mothrow['allow_living'] = $mrights['living'];
> 						$mothrow['allow_private'] = $mrights['private'];
> 						$mothrow['name'] = getName( $mothrow );
> 						if( $mothrow['name'] == $text['living'] ) $mothrow['firstname'] = $text['living'];
> 
> 						if( $parentrow['husband'] ) {
> 							$firstfirstname = getFirstNameOnly( $fathrow );
> 							$marriagemsg = ($personsex == "F") ? $text['wasmarried_female'] :  $text['wasmarried_male'];
> 							if($parentrow['marrdate'] || $parentrow['marrplace']) {
> 								echo "<p>$firstfirstname " . $marriagemsg . " <a href=\"#\" onclick=\"jQuery('html, body').animate({scrollTop: jQuery('#p{$parentrow['wife']}').offset().top-50},'slow'); return false;\">{$mothrow['name']}</a>";
> 								echo getSpouseDates( $parentrow, $personsex );
>  							}
> 							else
> 								echo "<p>$firstfirstname " . $marriagemsg . " <a href=\"#\" onclick=\"jQuery('html, body').animate({scrollTop: jQuery('#p{$parentrow['wife']}').offset().top-50},'slow'); return false;\">{$mothrow['name']}</a>.";
> 							$spouseinfo = getVitalDates( $mothrow );
> 							if( $spouseinfo ) {
> 								$spfirstfirstname = getFirstNameOnly( $mothrow );
> 								$spparents = getSpouseParents( $mothrow['personID'], $mothrow['sex'] );
> 								echo " $spfirstfirstname $spparents $spouseinfo";
> 							}
> 							if(!$tngprint)
> 								echo " [<a href=\"$familygroup_url" . "familyID=$nextfamily&amp;tree=$tree\">{$text['groupsheet']}</a>] [<a href=\"$familychart_url" . "familyID=$nextfamily&amp;tree=$tree\">{$text['familychart']}</a>]</p>\n";
> //							if(!$is_mozilla)
> 								echo "</td></tr></table>";
> 							echo "<br clear=\"all\" /></li>\n";
> 						}
> 
> 						//echo "<li value=\"$personcount\" class=\"aligntop\">";
> 						echo "<li>";
> //						if(!$is_mozilla)
> 							//echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
> 							echo "<table cellpadding=\"0\" cellspacing=\"0\" class=\"aligntop\"><tr><td width=\"40\" class=\"aligntop\" align=\"right\">";
> 							echo "$personcount.&nbsp;&nbsp;</td><td>";
> 						echo showSmallPhoto( $mothrow['personID'], $mothrow['name'], $mrights['both'], 0 );
> 						echo "<a href=\"$getperson_url" . "personID={$mothrow['personID']}&amp;tree=$tree\" name=\"p{$mothrow['personID']}\" id=\"p{$mothrow['personID']}\">{$mothrow['name']}</a>";
> 						echo getVitalDates( $mothrow, 1 );
> 						echo getOtherEvents($mothrow);
> 						if( $mrights['both'] && $pedigree['regnotes'] ) {
> 							$notes = buildRegNotes(getRegNotes( $mothrow['personID'], "I" ));
> 							if( $notes ) {
> 								echo "<p>{$text['notes']}:<br />";
> 								echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
> 							}
> 						}
> 						else $notes = "";
> 						//echo "</li>\n";
> 						if( $mothrow['famc'] ) {
> 							if( !in_array( $mothrow['famc'], $nextgen ) )
>    								array_push( $nextgen, $mothrow['famc'] );
> 							if(empty($numbers[$mothrow['famc']]))
> 								$numbers[$mothrow['famc']] = $personcount;
> 						}
> 					}
> 				}
> 				tng_free_result( $gotmother );
> 
> 				if($pedigree['regnotes']) {
> 					$prights = determineLivingPrivateRights($parentrow, $righttree);
> 					if($prights['both']) {
> 						$notes = buildRegNotes(getRegNotes( $nextfamily, "F" ));
> 						if( $notes ) {
> 							echo "<p>{$text['notes']}:<br />";
> 							echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
> 						}
> 					}
> 				}
> 			}
> 
> 			//get children
> 			$result2 = getChildrenData($tree, $nextfamily);
> 			if( $result2 && tng_num_rows( $result2 ) ) {
> 				echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>{$text['children']}:<br />\n<ol class=\"ahnblock\">\n";
> 				while( $childrow = tng_fetch_assoc( $result2 ) ) {
> 					$crights = determineLivingPrivateRights($childrow, $righttree);
> 					$childrow['allow_living'] = $crights['living'];
> 					$childrow['allow_private'] = $crights['private'];
> 					$childrow['name'] = getName( $childrow );
> 					//if( $childrow['name'] == $text['living'] ) $childrow['firstname'] = $text['living'];
> 
> 					echo "<li style=\"list-style-type:lower-roman\">";
> 					if(!empty($lastlastgen[$childrow['personID']])) {
> 						echo $lastlastgen[$childrow['personID']] . ". ";
> 						echo "<a href=\"#\" onclick=\"jQuery('html, body').animate({scrollTop: jQuery('#p{$childrow['personID']}').offset().top-50},'slow'); return false;\">{$childrow['name']}</a>";
> 					}
> 					else
> 						echo "<a href=\"$getperson_url" . "personID={$childrow['personID']}&amp;tree=$tree\">{$childrow['name']}</a>";
> 					echo getVitalDates( $childrow );
> 					echo "</li>\n";
> 				}
> 				echo "</ol>\n</td></tr></table>\n";
> 				tng_free_result( $result2 );
> 			}
> //			if(!$is_mozilla)
> 				echo "</td></tr></table>";
> 			echo "<br clear=\"all\" /></li>\n";
> 		}
> 	}
> 
> 	$currgen = $nextgen;
> 	$lastlastgen = $lastgen;
> 	unset( $nextgen );
> 	unset( $lastgen );
> 	$nextgen = array();
> 	$lastgen = array();
> 	$generation++;
> 	echo "</ol>\n<br />\n";
> }
> ?>
> </div>
> 
> <?php
> 	tng_footer( "" );
diff -r TNG/ajx_addbookmark.php TNG1403/ajx_addbookmark.php
20c20
< $bookmarks = explode("|", $_COOKIE[$ref]);
---
> $bookmarks = isset($_COOKIE[$ref]) ? explode("|", $_COOKIE[$ref]) : [];
diff -r TNG/ajx_caption.php TNG1403/ajx_caption.php
7c7
< tng_db_connect($database_host,$database_name,$database_username,$database_password) or exit;
---
> tng_db_connect($database_host,$database_name,$database_username,$database_password,$database_port,$database_socket) or exit;
diff -r TNG/ajx_delete.php TNG1403/ajx_delete.php
24c24
< $tree = $desc;
---
> $tree = isset($desc) ? $desc : "";
55c55
< 		if($confirm || $tngconfig['mediadel'] == 1)
---
> 		if(!empty($confirm) || $tngconfig['mediadel'] == 1)
81c81
< 		$logmsg = $admtext['tlevent'] . " $id {$admtext['succdeleted']}";
---
> 		$logmsg = $admtext['tlevents'] . ": ID $id {$admtext['succdeleted']}";
90c90
< 		$logmsg = $admtext['note'] . " $id {$admtext['succdeleted']}";
---
> 		$logmsg = $admtext['notes'] . ": ID $id {$admtext['succdeleted']}";
230a231,233
> 		$query = "DELETE FROM $events_table WHERE eventtypeID=\"$id\"";
> 		$result = @tng_query($query);
> 
250,312c253,257
< 		$query = "DELETE from $people_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $families_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $children_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $sources_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $repositories_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $events_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $notelinks_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $xnotes_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $citations_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $places_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $assoc_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $address_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		if( $id ) {
< 			$query = "SELECT mediaID from $media_table WHERE gedcom = \"$id\"";
< 			$result = @tng_query($query);
< 			while($row = tng_fetch_assoc($result)) {
< 				$delquery = "DELETE FROM $albumlinks_table WHERE mediaID=\"{$row['mediaID']}\"";
< 				$delresult = @tng_query($delquery);
< 			}
< 			tng_free_result($result);
< 
< 			$query = "DELETE from $media_table WHERE gedcom = \"$id\"";
< 			$result = @tng_query($query);
< 
< 			$query = "DELETE from $medialinks_table WHERE gedcom = \"$id\"";
< 			$result = @tng_query($query);
< 		}
< 
< 		$query = "DELETE FROM $trees_table WHERE gedcom=\"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $branches_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "DELETE from $branchlinks_table WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
< 
< 		$query = "UPDATE $users_table SET allow_living=\"-1\" WHERE gedcom = \"$id\"";
< 		$result = @tng_query($query);
---
> 		$thisid = $id;
> 		include("micro_deletetrees.php");
> 		
> 		$tquery = "DELETE FROM $trees_table WHERE gedcom=\"$thisid\"";
> 		$result = @tng_query($tquery);
363a309,312
> 	case "msg":
> 		$query = "DELETE FROM $templates_table WHERE id=\"$id\"";
> 		$result = @tng_query($query);
> 		break;
diff -r TNG/ajx_editfamily.php TNG1403/ajx_editfamily.php
107,108c107,108
< <tr class="databack">
< <td class="tngbotshadow">
---
> <tr>
> <td class="tngshadow databack">
140,141c140,141
< <tr class="databack">
< <td class="tngbotshadow">
---
> <tr>
> <td class="tngshadow databack">
196c196
< 				<input type="checkbox" name="private" value="1"<?php if( $row['private'] ) echo " checked=\"$checked\""; ?>> <?php echo $admtext['text_private']; ?>
---
> 				<input type="checkbox" name="private" value="1"<?php if( $row['private'] ) echo " checked=\"checked\""; ?>> <?php echo $admtext['text_private']; ?>
230c230
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('branchedit'); quitBranchEdit('branchedit'); return false;\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('branchedit'); quitEdit('branchedit'); return false;\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
232c232
< 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('branch','branchedit','branchlist');">
---
> 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('branch','branchedit','branchlist');">
247,248c247,248
< <tr class="databack">
< <td class="tngbotshadow">
---
> <tr>
> <td class="tngshadow databack">
267d266
< 		<tr><td colspan="7">&nbsp;</td></tr>
269,272c268,272
< 			<td valign="top"><?php echo $admtext['otherevents']; ?>:</td>
< 			<td colspan="6">
< <?php
< 	echo "<input type=\"button\" value=\"  " . $admtext['addnew'] . "  \" onClick=\"newEvent('F','$familyID','$tree');\">&nbsp;\n";
---
> 			<td colspan="2">
> 				<br/>
> 				<p><strong class="subhead">
> <?php 
> 	echo $admtext['otherevents'] . ": &nbsp;<input type=\"button\" value=\"  {$admtext['addnew']}  \" onclick=\"newEvent('F','$familyID','$tree');\">\n";
274c274,275
< 	   		</td>
---
> 				</strong></p>
> 			</td>
276d276
< 	</table>
279a280
> 	</table>
283,284c284,285
< <tr class="databack">
< <td class="tngbotshadow">
---
> <tr>
> <td class="tngshadow databack">
348d348
< 		<input type="hidden" name="sealsrc" value="<?php echo $row['sealsrc']; ?>">
diff -r TNG/ajx_editperson.php TNG1403/ajx_editperson.php
101c101
< <form action="" method="post" name="form1" id="form1" onsubmit="return updatePerson(this, <?php echo $slot; ?>);">
---
> <form action="" method="post" name="form2" id="form2" onsubmit="return updatePerson(this, <?php echo $slot; ?>);">
103,105c103,105
< <tr class="databack">
< <td class="tngbotshadow">
< 	<div style="float:right"><input type="submit" name="submit2" accesskey="s" class="bigsave" value="<?php echo $admtext['save']; ?>"></div>
---
> <tr>
> <td class="tngshadow databack">
> 	<div style="float:right"><input type="submit" name="submit2" accesskey="s" id="bigsave" class="bigsave" value="<?php echo $admtext['save']; ?>"></div>
116,117c116,117
< 					$notesicon = $gotnotes['general'] ? "admin-note-on-icon" : "admin-note-off-icon";
< 					$citesicon = $gotcites['general'] ? "admin-cite-on-icon" : "admin-cite-off-icon";
---
> 					$notesicon = !empty($gotnotes['general']) ? "admin-note-on-icon" : "admin-note-off-icon";
> 					$citesicon = !empty($gotcites['general']) ? "admin-cite-on-icon" : "admin-cite-off-icon";
119c119
< 					echo "<a href=\"#\" onclick=\"document.form1.submit();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
---
> 					echo "<a href=\"#\" onclick=\"jQuery('#bigsave').click();\" class=\"smallicon si-plus admin-save-icon\">{$admtext['save']}</a>\n";
136,137c136,137
< <tr class="databack">
< <td class="tngbotshadow">
---
> <tr>
> <td class="tngshadow databack">
160,161c160,161
< 				$notesicon = $cms['tngpath'] . "img/" . ($gotnotes['NAME'] ? "tng_anote_on.gif" : "tng_anote.gif");
< 				$citesicon = $cms['tngpath'] . "img/" . ($gotcites['NAME'] ? "tng_cite_on.gif" : "tng_cite.gif");
---
> 				$notesicon = $cms['tngpath'] . "img/" . (!empty($gotnotes['NAME']) ? "tng_anote_on.gif" : "tng_anote.gif");
> 				$citesicon = $cms['tngpath'] . "img/" . (!empty($gotcites['NAME']) ? "tng_cite_on.gif" : "tng_cite.gif");
237c237
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('branchedit'); quitBranchEdit('branchedit'); return false;\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('branchedit'); quitEdit('branchedit'); return false;\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
239c239
< 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('branch','branchedit','branchlist');">
---
> 		<div id="branchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('branch','branchedit','branchlist');">
253,254c253,254
< <tr class="databack">
< <td class="tngbotshadow">
---
> <tr>
> <td class="tngshadow databack">
276d275
< 		<tr><td colspan="7">&nbsp;</td></tr>
278,281c277,281
< 			<td valign="top"><?php echo $admtext['otherevents']; ?>:</td>
< 			<td colspan="6">
< <?php
< 	echo "<input type=\"button\" value=\"  " . $admtext['addnew'] . "  \" onClick=\"newEvent('I','$personID','$tree');\">&nbsp;\n";
---
> 			<td colspan="2">
> 				<br/>
> 				<p><strong class="subhead">
> <?php 
> 	echo $admtext['otherevents'] . ": &nbsp;<input type=\"button\" value=\"  {$admtext['addnew']}  \" onclick=\"newEvent('I','$personID','$tree');\">\n";
283c283,284
< 	   		</td>
---
> 				</strong></p>
> 			</td>
285d285
< 	</table>
304a305
> 	</table>
315,316c316,317
< <tr class="databack">
< <td class="tngbotshadow">
---
> <tr>
> <td class="tngshadow databack">
461,462c462,463
< <tr class="databack">
< <td class="tngbotshadow">
---
> <tr>
> <td class="tngshadow databack">
533c534
< 					$ifkids = $child['haskids'] ? "&gt" : "&nbsp;";
---
> 					$ifkids = $child['haskids'] ? "&gt;" : "&nbsp;";
diff -r TNG/ajx_fampreview.php TNG1403/ajx_fampreview.php
173c173
< 		$query .= "LEFT JOIN $people_table on ($families_table.husband = $people_table.personID OR $families_table.wife = $people_table.personID) AND $families_table.gedcom = $people_table.gedcom WHERE (wife = \"$ind[personID]\" && husband = \"{$ind['personID']}\") AND $people_table.gedcom = \"$tree\"";
---
> 		$query .= "LEFT JOIN $people_table on ($families_table.husband = $people_table.personID OR $families_table.wife = $people_table.personID) AND $families_table.gedcom = $people_table.gedcom WHERE (wife = \"{$ind['personID']}\" && husband = \"{$ind['personID']}\") AND $people_table.gedcom = \"$tree\"";
215c215
< 		$query = "SELECT familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom FROM $families_table, $people_table WHERE $families_table.familyID = \"$ind[famc]\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.wife AND $people_table.gedcom = \"$tree\"";
---
> 		$query = "SELECT familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom FROM $families_table, $people_table WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.wife AND $people_table.gedcom = \"$tree\"";
diff -r TNG/ajx_famtimelinexml.php TNG1403/ajx_famtimelinexml.php
1,221c1,316
< <?php
< $textpart = "timeline";
< include("tng_begin.php");
< 
< include($cms['tngpath'] . "datelib.php");
< 
< $timeline = $_SESSION['timeline'];
< if( !is_array( $timeline ) ) $timeline = array();
< 
< function getTimelineDate($date) {
< 	$ret = array();
< 	
< 	preg_match('/(\d\d\d\d)-(\d\d)-(\d\d).*/', $date, $matches);
< 	if($matches[2] == "00") $matches[2] = "01";
< 	if($matches[3] == "00") $matches[3] = "01";
< 	$ret['year'] = $matches[1];
< 	$ret['date_gmt'] = strftime("%b %d {$ret['year']}", gmmktime(12, 0, 0, $matches[2], $matches[3], 2000))  . " GMT";
< 	
< 	return $ret;
< }
< 
< header('Content-Type: application/xml');
< echo "<?xml version=\"1.0\"";
< if($session_charset)
< 	echo " encoding=\"$session_charset\"";
< echo "?>\n";
< echo "<data>\n";
< 
< $righttree = checktree($timetree);
< 
< foreach( $timeline as $timeentry ) {
< 	parse_str( $timeentry );
< 	$query = "SELECT firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, branch, sex, gedcom, 
< 		birthdate, birthdatetr, birthplace, deathdate, deathdatetr, deathplace, altbirthdate, altbirthdatetr, altbirthplace, burialdate, burialdatetr, burialplace,
< 		IF(birthdatetr !='0000-00-00',birthdatetr,altbirthdatetr) as birth, 
< 		IF(deathdatetr !='0000-00-00',deathdatetr,burialdatetr) as death
< 		FROM $people_table WHERE personID = \"$timeperson\" AND gedcom = \"$timetree\"";
< 	$result = tng_query($query);
< 	$row = tng_fetch_assoc( $result );
< 
< 	$beg_date = getTimelineDate($row['birth']);
< 	$beg_year = $beg_date['year'];
< 	$beg_date_gmt = $beg_date['date_gmt'];
< 	if($row['death'] != "0000-00-00") {
< 		$end_date = getTimelineDate($row['death']);
< 		$end_year = $end_date['year'];
< 		$end_date_gmt = $end_date['date_gmt'];
< 	}
< 	else {
< 		$end_date_gmt = date("M d Y")  . " GMT";
< 		$end_year = "";
< 	}
< 	$rights = determineLivingPrivateRights($row, $righttree);
< 	$row['allow_living'] = $rights['living'];
< 	$row['allow_private'] = $rights['private'];
< 	$name = xmlcharacters(getName($row));
< 	echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $end_date_gmt . "\" title=\"$name ($beg_year - $end_year)\">{$text['birthabbr']} " . displayDate($row['birthdate']) . " - {$text['deathabbr']} " . displayDate($row['deathdate']) . "</event>\n";
< 
< 	if($timeperson == $primary) {
< 		if($row['birthdatetr'] != "0000-00-00") {
< 			$evdate = getTimelineDate($row['birthdatetr']);
< 			$evdate_gmt = $evdate['date_gmt'];
< 			$evdateinfo = displayDate($row['birthdate']);
< 			if($row['birthplace'])
< 				$evdateinfo .= ", " . $row['birthplace'];
< 			echo "<event start=\"" . $evdate_gmt . "\" end=\"" . $evdate_gmt . "\" icon=\"img/green-circle.png\" title=\"{$text['born']} ($name)\">$evdateinfo</event>\n";
< 		}
< 		if($row['altbirthdatetr'] != "0000-00-00") {
< 			$evdate = getTimelineDate($row['altbirthdatetr']);
< 			$evdate_gmt = $evdate['date_gmt'];
< 			$evdateinfo = displayDate($row['altbirthdate']);
< 			if($row['altbirthplace'])
< 				$evdateinfo .= ", " . $row['altbirthplace'];
< 			echo "<event start=\"" . $evdate_gmt . "\" end=\"" . $evdate_gmt . "\" icon=\"img/green-circle.png\" title=\"{$text['christened']} ($name)\">$evdateinfo</event>\n";
< 		}
< 		if($row['deathdatetr'] != "0000-00-00") {
< 			$evdate = getTimelineDate($row['deathdatetr']);
< 			$evdate_gmt = $evdate['date_gmt'];
< 			$evdateinfo = displayDate($row['deathdate']);
< 			if($row['deathplace'])
< 				$evdateinfo .= ", " . $row['deathplace'];
< 			echo "<event start=\"" . $evdate_gmt . "\" end=\"" . $evdate_gmt . "\" icon=\"img/green-circle.png\" title=\"{$text['died']} ($name)\">$evdateinfo</event>\n";
< 		}
< 		if($row['burialdatetr'] != "0000-00-00") {
< 			$evdate = getTimelineDate($row['burialdatetr']);
< 			$evdate_gmt = $evdate['date_gmt'];
< 			$evdateinfo = displayDate($row['burialdate']);
< 			if($row['burialplace'])
< 				$evdateinfo .= ", " . $row['burialplace'];
< 			echo "<event start=\"" . $evdate_gmt . "\" end=\"" . $evdate_gmt . "\" icon=\"img/green-circle.png\" title=\"{$text['buried']} ($name)\">$evdateinfo</event>\n";
< 		}
< 	}
< 	tng_free_result($result);
< 
< 	if($rights['both']) {
< 		$query = "SELECT display, eventdate, eventdatetr, eventplace, info FROM ($events_table, $eventtypes_table)
< 			WHERE persfamID = \"$timeperson\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND gedcom = \"$timetree\" AND keep = \"1\" AND parenttag = \"\"
< 			ORDER BY ordernum, tag, description, eventdatetr, info, eventID";
< 		$custevents = tng_query($query);
< 		while ( $custevent = tng_fetch_assoc( $custevents ) )	{
< 			if($custevent['eventdatetr'] != "0000-00-00") {
< 				$displayval = getEventDisplay( $custevent['display'] );
< 				$eventDate = displayDate($custevent['eventdate']);
< 
< 				$beg_date = getTimelineDate($custevent['eventdatetr']);
< 				$beg_year = $beg_date['year'];
< 				$beg_date_gmt = $beg_date['date_gmt'];
< 				
< 				$end_date = "";
< 				$got_to = stripos($custevent['eventdate'], "to ");
< 				if($got_to) {
< 					$end_date = substr($custevent['eventdate'], $got_to + 3);
< 				}
< 				else {
< 					$got_and = stripos($custevent['eventdate'], "and ");
< 					if($got_and) {
< 						$end_date = substr($custevent['eventdate'], $got_and + 4);
< 					}
< 				}
< 				if($end_date) {
< 					$end_date_array = getTimelineDate(convertDate($end_date));
< 					$end_date_gmt = $end_date_array['date_gmt'];
< 				}
< 				else
< 					$end_date_gmt = $beg_date_gmt;
< 				//if eventdate contains "to" or "and", take the rest of that string and do a similar match for the end date
< 				
< 				$info = $custevent['eventplace'];
< 				$info .= $info && $custevent['info'] ? ": " . xmlcharacters($custevent['info']) : "";
< 				$title = xmlcharacters("$displayval ($eventDate)");
< 				echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $end_date_gmt . "\" icon=\"img/green-circle.png\" title=\" $title\">$info</event>\n";
< 			}
< 		}
< 		tng_free_result( $custevents );
< 
< 		if( $row['sex'] == "M" ) {
< 			$self = "husband"; $spouse = "wife"; $spouseorder = "husborder";
< 		}
< 		elseif( $row['sex'] == "F" ) {
< 			$self = "wife"; $spouse = "husband"; $spouseorder = "wifeorder";
< 		}
< 		else {
< 			$self = ""; $spouse = ""; $spouseorder = "";
< 		}
< 		//get and loop through all marriages (link to people table on opposite spouse) for this person based on gender
< 		if( $spouseorder )
< 			$marriages = getSpouseFamilyDataPlusDates($timetree, $self, $timeperson, $spouseorder);
< 		else
< 			$marriages = getSpouseFamilyDataUnionPlusDates($timetree, $timeperson);
< 		if( !tng_num_rows($marriages) && $spouseorder) {
< 		    $marriages = getSpouseFamilyDataUnionPlusDates($timetree, $timeperson);
< 		}
< 	
< 		while ( $marriagerow =  tng_fetch_assoc( $marriages ) ) {
< 			//do event for marriage date and person (observe living rights)
< 			if(substr($marriagerow['marrdatetr'],0,4) != "0000") {
< 				if( !$spouseorder )
< 					$spouse = $marriagerow['husband'] == $timeperson ? wife : husband;
< 				unset($spouserow);
< 				if( $marriagerow[$spouse] ) {
< 					$spouseresult= getPersonSimple($timetree, $marriagerow[$spouse]);
< 					$spouserow =  tng_fetch_assoc( $spouseresult );
< 					$srights = determineLivingPrivateRights($spouserow, $righttree);
< 					$spouserow['allow_living'] = $srights['living'];
< 					$spouserow['allow_private'] = $srights['private'];
< 					if( $spouserow['firstname'] || $spouserow['lastname'] ) {
< 						$spousename = getName( $spouserow );
< 					}
< 					tng_free_result( $spouseresult );
< 				}
< 		
< 				$rightfbranch = checkbranch( $marriagerow['branch'] ) ? 1 : 0;
< 				$mrights = determineLivingPrivateRights($marriagerow, $righttree, $rightfbranch);
< 				$marriagerow['allow_living'] = $mrights['living'];
< 				$marriagerow['allow_private'] = $mrights['private'];
< 				if( $mrights['both'] ) {
< 					$beg_date = getTimelineDate($marriagerow['marrdatetr']);
< 					$beg_year = $beg_date['year'];
< 					$beg_date_gmt = $beg_date['date_gmt'];
< 					$displayDate = displayDate($marriagerow['marrdate']);
< 		   			
< 					echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $beg_date_gmt . "\" title=\"" . xmlcharacters("{$text['married']} $spousename") . "\">" . xmlcharacters("$displayDate, {$marriagerow['marrplace']}") . "</event>\n";
< 				}
< 			}
< 			//get all children (link to people) born to this marriage
< 			//loop through and make event for each
< 			$children= getChildrenDataPlusDates($timetree, $marriagerow['familyID']);
< 	
< 			while ( $child =  tng_fetch_assoc( $children ) ) {
< 				if( $child['birthdate'] ) {
< 					$date = $child['birthdatetr'];
< 					$displayDate = displayDate($child['birthdate']);
< 					$abbr =  $text['birthabbr'];
< 				}
< 				elseif( $child['altbirthdate'] ) {
< 					$date = $child['altbirthdatetr'];
< 					$displayDate = displayDate($child['altbirthdate']);
< 					$abbr = $text['chrabbr'];
< 				}
< 				if($date && substr($date,0,4) != "0000") {
< 					$crights = determineLivingPrivateRights($child, $righttree);
< 					$child['allow_living'] = $crights['living'];
< 					$child['allow_private'] = $crights['private'];
< 					if( $crights['both'] ) {
< 						if( $child['firstname'] || $child['lastname'] ) {
< 							$childname = getName( $child );
< 						}
< 						$beg_date = getTimelineDate($date);
< 						$beg_year = $beg_date['year'];
< 						$beg_date_gmt = $beg_date['date_gmt'];
< 						echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $beg_date_gmt . "\" title=\"" . xmlcharacters($text['child'] . ": " . $childname) . "\">" . xmlcharacters("$abbr $displayDate") . "</event>\n";
< 					}
< 				}
< 			}
< 			tng_free_result( $children );
< 		}
< 		tng_free_result( $marriages );
< 	}
< }
< 
< echo "</data>\n";
---
> <?php
> $textpart = "timeline";
> include("tng_begin.php");
> 
> include($cms['tngpath'] . "datelib.php");
> 
> $timeline = $_SESSION['timeline'];
> if( !is_array( $timeline ) ) $timeline = array();
> 
> function getTimelineDate($date) {
> 	$ret = array();
> 	
> 	preg_match('/(\d\d\d\d)-(\d\d)-(\d\d).*/', $date, $matches);
> 	if($matches[2] == "00") $matches[2] = "01";
> 	if($matches[3] == "00") $matches[3] = "01";
> 	$ret['year'] = $matches[1];
> 	$ret['date_gmt'] = date("M d Y", gmmktime(12, 0, 0, $matches[2], $matches[3], $ret['year'])) . " GMT";
> 	
> 	return $ret;
> }
> 
> header('Content-Type: application/xml');
> echo "<?xml version=\"1.0\"";
> if($session_charset)
> 	echo " encoding=\"$session_charset\"";
> echo "?>\n";
> echo "<data>\n";
> 
> if( !isset($timetree) ) $timetree = "";
> $righttree = checktree($timetree);
> 
> foreach( $timeline as $timeentry ) {
> 	parse_str( $timeentry, $output );
> 	$query = "SELECT firstname, lnprefix, lastname, prefix, suffix, nameorder, title, living, private, branch, sex, gedcom, 
> 		birthdate, birthdatetr, birthplace, deathdate, deathdatetr, deathplace, altbirthdate, altbirthdatetr, altbirthplace, burialdate, burialdatetr, burialplace,
> 		IF(birthdatetr !='0000-00-00',birthdatetr,altbirthdatetr) as birth, 
> 		IF(deathdatetr !='0000-00-00',deathdatetr,burialdatetr) as death
> 		FROM $people_table WHERE personID = \"{$output['timeperson']}\" AND gedcom = \"{$output['timetree']}\"";
> 	$result = tng_query($query);
> 	$row = tng_fetch_assoc( $result );
> 
> 	$beg_date = getTimelineDate($row['birth']);
> 	$beg_year = $beg_date['year'];
> 	$beg_date_gmt = $beg_date['date_gmt'];
>     $primaryperson_beg_year = $beg_year; //added, to be used if spouse with no birth year
> 	if($row['death'] != "0000-00-00") {
> 		$end_date = getTimelineDate($row['death']);
> 		$end_year = $end_date['year'];
> 		$end_date_gmt = $end_date['date_gmt'];
> 	}
> 	else {
> 		//$end_date_gmt = date("M d Y")  . " GMT";
>         $end_date_gmt = $beg_date_gmt;//added, I prefer this solution to the one in the line above
> 		$end_year = "";
> 	}
> 	$rights = determineLivingPrivateRights($row, $righttree);
> 	$row['allow_living'] = $rights['living'];
> 	$row['allow_private'] = $rights['private'];
> 	$name = xmlcharacters(getName($row));
> 	echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $end_date_gmt . "\" title=\"$name ($beg_year - $end_year)\">{$text['birthabbr']} " . displayDate($row['birthdate']) . " ". $row['birthplace'] . " - {$text['deathabbr']} " . displayDate($row['deathdate']) . " ". $row['deathplace'] . "</event>\n";
> 
>         if($output['timeperson'] == $primary) {
> 		if($row['birthdatetr'] != "0000-00-00") {
> 			$evdate = getTimelineDate($row['birthdatetr']);
> 			$evdate_gmt = $evdate['date_gmt'];
> 			$evdateinfo = displayDate($row['birthdate']);
> 			if($row['birthplace'])
> 				$evdateinfo .= ", " . $row['birthplace'];
> 			//echo "<event start=\"" . $evdate_gmt . "\" end=\"" . $evdate_gmt . "\" icon=\"img/green-circle.png\" title=\"{$text['born']} ($name)\">$evdateinfo</event>\n";
> 		}
> 		if($row['altbirthdatetr'] != "0000-00-00") {
> 			$evdate = getTimelineDate($row['altbirthdatetr']);
> 			$evdate_gmt = $evdate['date_gmt'];
> 			$evdateinfo = displayDate($row['altbirthdate']);
> 			if($row['altbirthplace'])
> 				$evdateinfo .= ", " . $row['altbirthplace'];
> 			//echo "<event start=\"" . $evdate_gmt . "\" end=\"" . $evdate_gmt . "\" icon=\"img/green-circle.png\" title=\"{$text['christened']} ($name)\">$evdateinfo</event>\n";
> 		}
> 		if($row['deathdatetr'] != "0000-00-00") {
> 			$evdate = getTimelineDate($row['deathdatetr']);
> 			$evdate_gmt = $evdate['date_gmt'];
> 			$evdateinfo = displayDate($row['deathdate']);
> 			if($row['deathplace'])
> 				$evdateinfo .= ", " . $row['deathplace'];
> 			echo "<event start=\"" . $evdate_gmt . "\" end=\"" . $evdate_gmt . "\" icon=\"img/green-circle.png\" title=\"{$text['died']} ($name)\">$evdateinfo</event>\n";
> 		}
> 		if($row['burialdatetr'] != "0000-00-00") {
> 			$evdate = getTimelineDate($row['burialdatetr']);
> 			$evdate_gmt = $evdate['date_gmt'];
> 			$evdateinfo = displayDate($row['burialdate']);
> 			if($row['burialplace'])
> 				$evdateinfo .= ", " . $row['burialplace'];
> 			echo "<event start=\"" . $evdate_gmt . "\" end=\"" . $evdate_gmt . "\" icon=\"img/green-circle.png\" title=\"{$text['buried']} ($name)\">$evdateinfo</event>\n";
> 		}
> 	}
> 	tng_free_result($result);
> 
> 	if($rights['both']) {
> 		$query = "SELECT display, eventdate, eventdatetr, eventplace, info FROM ($events_table, $eventtypes_table)
> 			WHERE persfamID = \"{$output['timeperson']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND gedcom = \"{$output['timetree']}\" AND keep = \"1\" AND parenttag = \"\"
> 			ORDER BY ordernum, tag, description, eventdatetr, info, eventID";
> 		$custevents = tng_query($query);
> 		while ( $custevent = tng_fetch_assoc( $custevents ) )	{
> 			if($custevent['eventdatetr'] != "0000-00-00") {
> 				$displayval = getEventDisplay( $custevent['display'] );
> 				$eventDate = displayDate($custevent['eventdate']);
> 
> 				$beg_date = getTimelineDate($custevent['eventdatetr']);
> 				$beg_year = $beg_date['year'];
> 				$beg_date_gmt = $beg_date['date_gmt'];
> 				
> 				$end_date = "";
> 				$got_to = stripos($custevent['eventdate'], "to ");
> 				if($got_to) {
> 					$end_date = substr($custevent['eventdate'], $got_to + 3);
> 				}
> 				else {
> 					$got_and = stripos($custevent['eventdate'], "and ");
> 					if($got_and) {
> 						$end_date = substr($custevent['eventdate'], $got_and + 4);
> 					}
> 				}
> 				if($end_date) {
> 					$end_date_array = getTimelineDate(convertDate($end_date));
> 					$end_date_gmt = $end_date_array['date_gmt'];
> 				}
> 				else
> 					$end_date_gmt = $beg_date_gmt;
> 				//if eventdate contains "to" or "and", take the rest of that string and do a similar match for the end date
> 				
> 				$info = $custevent['eventplace'];
> 				$info .= $info && $custevent['info'] ? ": " . xmlcharacters($custevent['info']) : xmlcharacters($custevent['info']);
> 				$title = xmlcharacters("$displayval ($eventDate)");
> 				echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $end_date_gmt . "\" icon=\"img/green-circle.png\" title=\" $title\">$info</event>\n";
> 			}
> 		}
> 		tng_free_result( $custevents );
> 
> 		if( $row['sex'] == "M" ) {
> 			$self = "husband"; $spouse = "wife"; $spouseorder = "husborder";
> 		}
> 		elseif( $row['sex'] == "F" ) {
> 			$self = "wife"; $spouse = "husband"; $spouseorder = "wifeorder";
> 		}
> 		else {
> 			$self = ""; $spouse = ""; $spouseorder = "";
> 		}
> 		//get and loop through all marriages (link to people table on opposite spouse) for this person based on gender
> 		if( $spouseorder )
> 			$marriages = getSpouseFamilyDataPlusDates($output['timetree'], $self, $output['timeperson'], $spouseorder);
> 		else
> 			$marriages = getSpouseFamilyDataUnionPlusDates($output['timetree'], $output['timeperson']);
> 		if( !tng_num_rows($marriages) && $spouseorder) {
> 		    $marriages = getSpouseFamilyDataUnionPlusDates($output['timetree'], $output['timeperson']);
> 		}
> 	
> 		while ( $marriagerow =  tng_fetch_assoc( $marriages ) ) {
> 			//do event for marriage date and person (observe living rights)
> 			//if(substr($marriagerow['marrdatetr'],0,4) != "0000") { Include even if no marriage date
>             $beg_date_gmt = $end_date_gmt = $spouse_birth_year = $spouse_death_year = ""; //added, to be sure the variables are empty
>             $spousedisplayDate = $spousedeathdate = ""; //added, to be sure the variables are empty
> 				if( !$spouseorder )
> 					$spouse = $marriagerow['husband'] == $output['timeperson'] ? 'wife' : 'husband';
> 				unset($spouserow);
> 				if( $marriagerow[$spouse] ) {
> 					$spouseresult = getPersonFullPlusDates($output['timetree'], $marriagerow[$spouse]);
> 					$spouserow =  tng_fetch_assoc( $spouseresult );
> 					$srights = determineLivingPrivateRights($spouserow, $righttree);
> 					$spouserow['allow_living'] = $srights['living'];
> 					$spouserow['allow_private'] = $srights['private'];
> 					if( $spouserow['firstname'] || $spouserow['lastname'] ) {
> 						$spousename = getName( $spouserow );
> 					}
>                     // Collect data needed to display spouse. 174-215 are new, collecting data for spouse
>                     if( $spouserow['birthdate'] ) {
> 					    $spousedate = $spouserow['birthdatetr'];
>                         $spousebirthplace = $spouserow['birthplace'];
>                         $spousedeathplace = $spouserow['deathplace'];
>                         if($spousedate) {
>                           $get = explode("-",$spousedate);
>                           $spouse_birth_year = $get[0];
>                           $spousebirthdate = $spouse_birth_year;
>                         }
>                         else {
>                           $spouse_birth_year = $spouserow['birthdate'];
>                           $spousebirthdate = $spouserow['birthdate'];
>                         }
> 					    $spousedisplayDate = displayDate($spouserow['birthdate']);
> 					    $abbr =  $text['birthabbr'];
> 				    }
>                     else {
>                       $spouse_birth_year = $primaryperson_beg_year;
>                       $spousebirthdate = "Unknown";
>                     }
>                     if($spouserow['deathdate']) {
>                       $spousedeathdatetr = $spouserow['deathdatetr'];
>                       if($spousedeathdatetr) {
>                         $get = explode("-",$spousedeathdatetr);
>                         $spouse_death_year = $get[0];
>                         $spousedeathdate = $spouse_death_year;
>                       }
>                       else {
>                         $spouse_death_year = $spouserow['deathdate'];
>                         $spousedeathdate = $spouse_death_year;
>                       }
>                       $spousedisplayDatedeath = displayDate($spouserow['deathdate']);
>                       $deathabbr =  $text['deathabbr'];
>                     }
>                     else {
>                       $spousedeathdate = "";
>                       $spousedisplayDatedeath = "";
>                       $year = $spouse_birth_year + 5;
>                       $spouse_death_year = $year;
>                       $deathabbr = "";
>                     }
>                 }
>                tng_free_result( $spouseresult );
> 
> 				$rightfbranch = checkbranch( $marriagerow['branch'] ) ? 1 : 0;
> 				$mrights = determineLivingPrivateRights($marriagerow, $righttree, $rightfbranch);
> 				$marriagerow['allow_living'] = $mrights['living'];
> 				$marriagerow['allow_private'] = $mrights['private'];
> 				if( $mrights['both'] ) {
> 				  if(substr($marriagerow['marrdatetr'],0,4) != "0000") { //added, marriagedate sought if available
> 					$beg_date = getTimelineDate($marriagerow['marrdatetr']);
> 					$beg_year = $beg_date['year'];
> 					$beg_date_gmt = $beg_date['date_gmt'];
> 					$displayDate = displayDate($marriagerow['marrdate']);
> 		   			
> 					echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $beg_date_gmt . "\" icon=\"img/green-circle.png\"   title=\"" . xmlcharacters("{$text['married']} $spousename") . "\">" . xmlcharacters("$displayDate, {$marriagerow['marrplace']}") . "</event>\n";
>                     }
> 				}
> 
>             echo "<event start=\"" . $spouse_birth_year . "\" end=\"" . $spouse_death_year . "\" title=\"$spousename ($spousebirthdate - $spousedeathdate)\">{$text['birthabbr']} " . $spousedisplayDate. " ". $spouserow['birthplace'] . " - {$text['deathabbr']} " . $spousedisplayDatedeath. " ". $spouserow['deathplace'] . "</event>\n";
>             //235-241 are new, to display spouse
>             if ($spouserow['deathdate']) {
>                 $evdateinfo = displayDate($spouserow['deathdate']);
>                 if($spousedeathplace) {;
>     			    $evdateinfo .= ", " . $spousedeathplace;
>                 }
>     			echo "<event start=\"" . $spousedeathdate . "\" end=\"" . $spousedeathdate . "\" icon=\"img/green-circle.png\" title=\"{$text['died']} ($spousename)\">$evdateinfo</event>\n";
>     		}
>             //$beg_date_gmt = $beg_date_gmt = $spouse_birth_year = $spouse_death_year = $spousedeathdate = "";
> 			//get all children (link to people) born to this marriage
> 			//loop through and make event for each
> 			$children= getChildrenDataPlusDates($output['timetree'], $marriagerow['familyID']);
> 	
> 			while ( $child =  tng_fetch_assoc( $children ) ) {
> 				if( $child['birthdate'] ) {
> 					$date = $child['birthdatetr'];
>                     $birthplace = $child['birthplace']; //added
>                     $deathplace = $child['deathplace']; //added
> 					$displayDate = displayDate($child['birthdate']);
> 					$abbr =  $text['birthabbr'];
> 				}
> 				elseif( $child['altbirthdate'] ) {
> 					$date = $child['altbirthdatetr'];
> 					$displayDate = displayDate($child['altbirthdate']);
> 					$abbr = $text['chrabbr'];
> 				}
>                 //added, 260-280 are new, to collect death date and year for children
>                 if($child['deathdate']) {
>                     $deathdate = $child['deathdatetr'];
>                     $displayDatedeath = displayDate($child['deathdate']);
>                     $deathabbr =  $text['deathabbr'];
>                 /*elseif( $child['altdeathdate'] ) {
> 					$deathdate = $child['altdeathdate'];
> 					$displayDate = displayDate($child['altdeathdate']);
> 					$abbr = $text['chrabbr'];
> 				}*/
> 		            $end_date = getTimelineDate($deathdate);
> 		            $end_year = $end_date['year'];
> 		            $end_date_gmt = $end_date['date_gmt'];
> 	            }
> 	            /*else {
> 		            //$end_date_gmt = date("M d Y")  . " GMT";
>                     $end_date_gmt = $beg_date_gmt;
> 		            $end_year = "";
>                     $displayDatedeath = "";
>                     $deathabbr = "";
> 	            }*/
> 				if($date && substr($date,0,4) != "0000") {
> 					$crights = determineLivingPrivateRights($child, $righttree);
> 					$child['allow_living'] = $crights['living'];
> 					$child['allow_private'] = $crights['private'];
> 					if( $crights['both'] ) {
> 						if( $child['firstname'] || $child['lastname'] ) {
> 							$childname = getName( $child );
> 						}
> 						$beg_date = getTimelineDate($date);
> 						$beg_year = $beg_date['year'];
> 						$beg_date_gmt = $beg_date['date_gmt'];
>                         //added, 292-298 are new, if no child deathdate
>                         if(!$child['deathdate']) {
>                           $end_date_gmt = $beg_date_gmt;
> 		                  $end_year = "";
>                           $displayDatedeath = "";
>                           $deathabbr = "";
>                         }
>                         //orginal
> 						//echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $beg_date_gmt . "\" title=\"" . xmlcharacters($text['child'] . ": " . $childname) . "\">" . xmlcharacters("$abbr $displayDate") . "</event>\n";
>                         //with blue line
>                         //echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $end_date_gmt . "\" title=\"$childname ($beg_year - $end_year)\">{$text['birthabbr']} " . $displayDate . " ". $child['birthplace'] . " - {$text['deathabbr']} " . $displayDatedeath . " ". $child['deathplace'] . "</event>\n";
>                         //added, no blue line
>                         echo "<event start=\"" . $beg_date_gmt . "\" end=\"" . $beg_date_gmt . "\" title=\"$childname ($beg_year - $end_year)\">{$text['birthabbr']} " . $displayDate . " ". $child['birthplace'] . " - {$text['deathabbr']} " . $displayDatedeath . " ". $child['deathplace'] . "</event>\n";
>                         
>                     }
> 				}
> 			}
> 			tng_free_result( $children );
> 	   	}
> 		tng_free_result( $marriages );
> 	}
> }
> 
> echo "</data>\n";
Only in TNG1403: ajx_getimportdata.php
diff -r TNG/ajx_getlastcite.php TNG1403/ajx_getlastcite.php
17c17,26
< $title = json_encode(truncateIt($srow['title'],100));
---
> //$title = json_encode(truncateIt($srow['title'],100));
> $title = truncateIt($srow['title'],100);
> if($charset == "UTF-8") {
> 	$title = json_encode($title);
> 	$note = json_encode($row['note']);
> }
> else {
> 	$title = "\"" . $title . "\"";
> 	$note = "\"" . $row['note'] . "\"";
> }
20c29
< echo "{\"sourceID\":\"{$row['sourceID']}\",\"title\":{$title},\"citepage\":" . json_encode($row['page']) . ",\"quay\":\"{$row['quay']}\",\"citedate\":\"{$row['citedate']}\",\"citetext\":" . json_encode($row['citetext']) . ",\"citenote\":" . json_encode($row['note']) . "}";
---
> echo "{\"sourceID\":\"{$row['sourceID']}\",\"title\":{$title},\"citepage\":" . json_encode($row['page']) . ",\"quay\":\"{$row['quay']}\",\"citedate\":\"{$row['citedate']}\",\"citetext\":" . json_encode($row['citetext']) . ",\"citenote\":" . $note . "}";
diff -r TNG/ajx_labels.php TNG1403/ajx_labels.php
144c144
< 			$query = "SELECT firstname, lastname, lnprefix, nameorder, living, private, suffix, title, sex FROM $people_table WHERE personID=\"$personID\" AND gedcom = \"$tree\"";
---
> 			$query = "SELECT personID, firstname, lastname, lnprefix, prefix, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, living, private, suffix, title, branch, gedcom FROM $people_table WHERE personID = \"$personID\" AND gedcom = \"$tree\"";
173a174
> 						$newbranch = "";
199c200
< 			$names .= "<a href=\"admin_editperson.php?personID={$personID}&amp;tree=$tree&amp;cw=1\" target=\"_blank\">" . getName($row) . " ($personID)</a><br/>\n";
---
> 			$names .= "<a href=\"admin_editperson.php?personID={$personID}&amp;tree=$tree&amp;cw=1\" target=\"blank\">" . getName($row) . " ($personID)</a><br/>\n";
241c242
< 				$famnames .= "<a href=\"admin_editfamily.php?familyID={$row['familyID']}&amp;tree={$row['gedcom']}&amp;cw=1\" target=\"_blank\">" . getFamilyName($row) . "</a><br/>\n";
---
> 				$famnames .= "<a href=\"admin_editfamily.php?familyID={$row['familyID']}&amp;tree={$row['gedcom']}&amp;cw=1\" target=\"blank\">" . getFamilyName($row) . "</a><br/>\n";
270a272
> 						$newbranch = "";
diff -r TNG/ajx_login.php TNG1403/ajx_login.php
17a18
> 	$pwdfieldclass = "pwdfield";
diff -r TNG/ajx_logxml.php TNG1403/ajx_logxml.php
9a10,12
> ?>
> <table class="rounded-table" cellspacing="1">
> <?php
12c15,24
< 	echo "$line<br/>\n";
---
> 	if(strpos($line, "<script") === false) {
> 		if(empty($tree) || strpos($line,"tree=$tree\"") !== false || strpos($line,"tree=$tree&") !== false || strpos($line,"tree=") === false) {
> 			if(strpos($line,"<tr>") !== 0)
> 				echo "<tr><td colspan=\"3\" class=\"databack\">$line</td></tr>\n";
> 			else
> 				echo "$line\n";
> 		}
> 	}
> 	else
> 		echo "<tr><td colspan=\"3\" class=\"databack\">" . htmlspecialchars($line) . "<strong>Please investigate this access</strong></td></tr>\n";
14c26,27
< ?>
\ No newline at end of file
---
> ?>
> </table>
\ No newline at end of file
diff -r TNG/ajx_newfamily.php TNG1403/ajx_newfamily.php
97c97
< 				<input type="checkbox" name="living" value="1" checked="checked"> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
---
> 				<input type="checkbox" name="living" value="1"<?php if(!$tngconfig['livingunchecked']) { echo " checked=\"checked\""; } ?>> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
124c124
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('fbranchedit'); quitBranchEdit('fbranchedit'); return false;\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('fbranchedit'); quitEdit('fbranchedit'); return false;\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
126c126
< 		<div id="fbranchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('fbranch','fbranchedit','fbranchlist');">
---
> 		<div id="fbranchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('fbranch','fbranchedit','fbranchlist');">
diff -r TNG/ajx_newperson.php TNG1403/ajx_newperson.php
66c66
< 		echo "<td>$admtext[lnprefix]</td>\n";
---
> 		echo "<td>{$admtext['lnprefix']}</td>\n";
71c71
< 			<td><input type="text" name="firstname" size="30" id="firstname"></td>
---
> 			<td><input type="text" name="firstname" size="30" id="firstname" class="mediumfield"></td>
76c76
< 			<td><input type="text" name="lastname" size="30" value="<?php echo $row['lastname']; ?>"></td>
---
> 			<td><input type="text" name="lastname" size="30" value="<?php echo $row['lastname']; ?>" class="mediumfield"></td>
114c114
< 				<input type="checkbox" name="living" value="1" checked="checked"> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
---
> 				<input type="checkbox" name="living" value="1"<?php if(!$tngconfig['livingunchecked']) { echo " checked=\"checked\""; } ?>> <?php echo $admtext['living']; ?>&nbsp;&nbsp;
124c124
< 	$branchlist = explode(",", $row[branch] );
---
> 	$branchlist = explode(",", $row['branch'] );
141c141
< 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showBranchEdit('pbranchedit'); quitBranchEdit('pbranchedit'); return false;\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
---
> 		echo " &nbsp;<span class=\"nw\">(<a href=\"#\" onclick=\"showEdit('pbranchedit'); quitEdit('pbranchedit'); return false;\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" border=\"0\" style=\"margin-left:-4px;margin-right:-2px\">" . $admtext['edit'] . "</a> )</span><br />";
143c143
< 		<div id="pbranchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(branchtimer);" onmouseout="closeBranchEdit('pbranch','pbranchedit','pbranchlist');">
---
> 		<div id="pbranchedit" class="lightback pad5" style="position:absolute;display:none;" onmouseover="clearTimeout(dtimer);" onmouseout="closeEdit('pbranch','pbranchedit','pbranchlist');">
diff -r TNG/ajx_pedjson.php TNG1403/ajx_pedjson.php
23c23
< 	$result = getPersonData($tree, $currperson);
---
> 	$result = getPersonFullPlusDates($tree, $currperson);
71c71
< 			$bd = $row['altbirthdate']; 
---
> 			$bd = trim($row['altbirthdate']); 
76c76
< 			$bd = $row['birthdate'];
---
> 			$bd = trim($row['birthdate']);
85c85
< 			$dd = $row['burialdate']; 
---
> 			$dd = trim($row['burialdate']); 
90c90
< 			$dd = $row['deathdate'] ;
---
> 			$dd = trim($row['deathdate']) ;
101c101
< 	$person .= "\"babbr\":\"" . $text[$birthabbr] . "\",";
---
> 	$person .= "\"babbr\":\"" . (!empty($birthabbr) ? $text[$birthabbr] : "") . "\",";
104c104
< 	$person .= "\"dabbr\":\"" . $text[$deathabbr] . "\",";
---
> 	$person .= "\"dabbr\":\"" . (!empty($deathabbr) ? $text[$deathabbr] : "") . "\",";
205c205
< 		$childrenresults = getChildrenSimple($tree, $familyID);
---
> 		$childrenresults = getChildrenData($tree, $familyID);
213c213
< 				$children .= "{\"childID\":\"" . $child['pID'] . "\",\"name\":\"" . xmlcharacters( getName( $child ) ) . "\"}";
---
> 				$children .= "{\"childID\":\"" . $child['personID'] . "\",\"name\":\"" . xmlcharacters( getName( $child ) ) . "\"}";
233c233
< 		$marrdate = displayDate( $famrow['marrdate'] );
---
> 		$marrdate = displayDate( trim($famrow['marrdate']) );
314c314
< $parentset = $parentset ? intval($parentset) : 0;
---
> $parentset = !empty($parentset) ? intval($parentset) : 0;
329c329
< if( $personID ) {
---
> if( !empty($personID) ) {
333,334c333,334
< 	eval("\$backpers = \$backpers$newfam;");
< 	eval("\$famc = \$famc$newfam;");
---
> 	$backpers = ${"backpers$newfam"};
> 	$famc = ${"famc$newfam"};
338,339c338,339
< 		eval("\$backpers = \$backpers$newfam;");
< 		eval("\$famc = \$famc$newfam;");
---
> 		$backpers = !empty(${"backpers$newfam"}) ? ${"backpers$newfam"} : "";
> 		$famc = !empty(${"famc$newfam"}) ? ${"famc$newfam"} : "";
diff -r TNG/ajx_perspreview.php TNG1403/ajx_perspreview.php
36a37
> 	$stdex = getStdExtras( $row['personID'] );
39,41c40,42
< 	setEvent( array( "text"=>$text['birth'], "fact"=>$stdex['BIRT'], "date"=>$row['birthdate'], "place"=>$row['birthplace'], "event"=>"BIRT", "entity"=>$personID, "type"=>"I", "np"=>1 ), $row['birthdatetr'] );
< 	setEvent( array( "text"=>$text['christened'], "fact"=>$stdex['CHR'], "date"=>$row['altbirthdate'], "place"=>$row['altbirthplace'], "event"=>"CHR", "entity"=>$personID, "type"=>"I", "np"=>1 ), $row['altbirthdatetr'] );
< 	setEvent( array( "text"=>$text['died'], "fact"=>$stdex['DEAT'], "date"=>$row['deathdate'], "place"=>$row['deathplace'], "event"=>"DEAT", "entity"=>$personID, "type"=>"I", "np"=>1 ), $row['deathdatetr'] );		
---
> 	setEvent( array( "text"=>$text['birth'], "fact"=>(isset($stdex['BIRT']) ? $stdex['BIRT'] : ""), "date"=>$row['birthdate'], "place"=>$row['birthplace'], "event"=>"BIRT", "entity"=>$personID, "type"=>"I", "np"=>1 ), $row['birthdatetr'] );
> 	setEvent( array( "text"=>$text['christened'], "fact"=>(isset($stdex['CHR']) ? $stdex['CHR'] : ""), "date"=>$row['altbirthdate'], "place"=>$row['altbirthplace'], "event"=>"CHR", "entity"=>$personID, "type"=>"I", "np"=>1 ), $row['altbirthdatetr'] );
> 	setEvent( array( "text"=>$text['died'], "fact"=>(isset($stdex['DEAT']) ? $stdex['DEAT'] : ""), "date"=>$row['deathdate'], "place"=>$row['deathplace'], "event"=>"DEAT", "entity"=>$personID, "type"=>"I", "np"=>1 ), $row['deathdatetr'] );
43c44
< 	setEvent( array( "text"=>$burialmsg, "fact"=>$stdex['BURI'], "date"=>$row['burialdate'], "place"=>$row['burialplace'], "event"=>"BURI", "entity"=>$personID, "type"=>"I", "np"=>1 ), $row['burialdatetr'] );
---
> 	setEvent( array( "text"=>$burialmsg, "fact"=>(isset($stdex['BURI']) ? $stdex['BURI'] : ""), "date"=>$row['burialdate'], "place"=>$row['burialplace'], "event"=>"BURI", "entity"=>$personID, "type"=>"I", "np"=>1 ), $row['burialdatetr'] );
117a119
> 		$stdexf = getStdExtras( $parent['familyID'] );
126,127c128,129
< 				setEvent( array( "text"=>$text['married'], "fact"=>$stdexf['MARR'], "date"=>$parentrow['marrdate'], "place"=>$parentrow['marrplace'], "event"=>"MARR", "entity"=>$parentrow['familyID'], "type"=>"F", "nomap"=>1, "np"=>1 ), $parentrow['marrdatetr'] );
< 				setEvent( array( "text"=>$text['divorced'], "fact"=>$stdexf['DIV'], "date"=>$parentrow['divdate'], "place"=>$parentrow['divplace'], "event"=>"DIV", "entity"=>$parentrow['familyID'], "type"=>"F", "nomap"=>1, "np"=>1 ), $parentrow['divdatetr'] );
---
> 				setEvent( array( "text"=>$text['married'], "fact"=>(isset($stdexf['MARR']) ? $stdexf['MARR'] : ""), "date"=>$parentrow['marrdate'], "place"=>$parentrow['marrplace'], "event"=>"MARR", "entity"=>$parentrow['familyID'], "type"=>"F", "nomap"=>1, "np"=>1 ), $parentrow['marrdatetr'] );
> 				setEvent( array( "text"=>$text['divorced'], "fact"=>(isset($stdexf['DIV']) ? $stdexf['DIV'] : ""), "date"=>$parentrow['divdate'], "place"=>$parentrow['divplace'], "event"=>"DIV", "entity"=>$parentrow['familyID'], "type"=>"F", "nomap"=>1, "np"=>1 ), $parentrow['divdatetr'] );
164c166
< 		$spouse = $marriagerow['husband'] == $personID ? wife : husband;
---
> 		$spouse = $marriagerow['husband'] == $personID ? 'wife' : 'husband';
181c183
< 	else
---
> 	else {
182a185,186
> 		$spouserow = array();
> 	}
184c188
< 	if( $spouserow['allow_living'] )
---
> 	if( !empty($spouserow['allow_living']) )
195,197c199,200
< 		setEvent( array( "text"=>$text['married'], "fact"=>$stdexf['MARR'], "date"=>$marriagerow['marrdate'], "place"=>$marriagerow['marrplace'], "event"=>"MARR", "entity"=>$marriagerow['familyID'], "type"=>"F", "np"=>1 ), $marriagerow['marrdatetr'] );
< 		setEvent( array( "text"=>$text['divorced'], "fact"=>$stdexf['DIV'], "date"=>$marriagerow['divdate'], "place"=>$marriagerow['divplace'], "event"=>"DIV", "entity"=>$marriagerow['familyID'], "type"=>"F", "np"=>1 ), $marriagerow['divdatetr'] );
< 
---
> 		setEvent( array( "text"=>$text['married'], "fact"=>(isset($stdexf['MARR']) ? $stdexf['MARR'] : ""), "date"=>$marriagerow['marrdate'], "place"=>$marriagerow['marrplace'], "event"=>"MARR", "entity"=>$marriagerow['familyID'], "type"=>"F", "np"=>1 ), $marriagerow['marrdatetr'] );
> 		setEvent( array( "text"=>$text['divorced'], "fact"=>(isset($stdexf['DIV']) ? $stdexf['DIV'] : ""), "date"=>$marriagerow['divdate'], "place"=>$marriagerow['divplace'], "event"=>"DIV", "entity"=>$marriagerow['familyID'], "type"=>"F", "np"=>1 ), $marriagerow['divdatetr'] );
224c227
< 				$persontext .= "<tr><td valign=\"top\">$ifkids</td><td class=\"unhighlightedchild\" id=\"child{$child['pID']}\">$kidcount. $childname";
---
> 				$persontext .= "<tr><td valign=\"top\">$ifkids</td><td class=\"unhighlightedchild\" id=\"child{$child['personID']}\">$kidcount. $childname";
Only in TNG1403: ajx_remove_event_cookie.php
Only in TNG1403: ajx_setsessionvar.php
diff -r TNG/ajx_showbranch.php TNG1403/ajx_showbranch.php
23c23
< 	$query = "SELECT personID, firstname, lastname, lnprefix, prefix, suffix, branch, gedcom, nameorder, living, private FROM $people_table WHERE gedcom = \"$tree\" and branch LIKE \"%$branch%\" ORDER BY lastname, firstname";
---
> 	$query = "SELECT personID, firstname, lastname, lnprefix, prefix, suffix, title, branch, gedcom, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, living, private FROM $people_table WHERE gedcom = \"$tree\" and branch LIKE \"%$branch%\" ORDER BY lastname, firstname";
34c34
< 		$names .= "<a href=\"admin_editperson.php?personID={$row['personID']}&amp;tree={$row['gedcom']}&amp;cw=1\" target=\"_blank\">" . getName( $row ) . " ({$row['personID']})</a><br />\n";
---
> 		$names .= "<a href=\"admin_editperson.php?personID={$row['personID']}&amp;tree={$row['gedcom']}&amp;cw=1\" target=\"blank\">" . getName( $row ) . " ({$row['personID']})</a><br />\n";
49c49
< 		$names .= "<a href=\"admin_editfamily.php?familyID={$row['familyID']}&amp;tree={$row['gedcom']}&amp;cw=1\" target=\"_blank\">" . getFamilyName( $row ) . "</a><br />\n";
---
> 		$names .= "<a href=\"admin_editfamily.php?familyID={$row['familyID']}&amp;tree={$row['gedcom']}&amp;cw=1\" target=\"blank\">" . getFamilyName( $row ) . "</a><br />\n";
diff -r TNG/ajx_showmediaxml.php TNG1403/ajx_showmediaxml.php
41c41
< if( $noneliving || $imgrow['alwayson'] ) {
---
> if( !$private_media && ($noneliving || $imgrow['alwayson']) ) {
46c46
<     <div class="livingbox rounded10"><?php echo $text['living']; ?></div>
---
>     <div class="livingbox rounded10"><?php echo $description; ?></div>
diff -r TNG/ajx_slideshow.php TNG1403/ajx_slideshow.php
31c31
< 	if( $noneliving || $imgrow['alwayson'] ) {
---
> 	if( !$private_media && ($noneliving || $imgrow['alwayson']) ) {
36c36
<             <div style="width:400px; height:300px; border:1px solid black"><?php echo $text['living']; ?></div>
---
>             <div style="width:400px; height:300px; border:1px solid black"><?php echo $description; ?></div>
diff -r TNG/ajx_smallimage.php TNG1403/ajx_smallimage.php
6a7
> include($cms['tngpath'] . "imageutils.php");
44a46
> $image_resized = tngImageRotate($imagename, $image_resized);
diff -r TNG/ajx_timelinexml.php TNG1403/ajx_timelinexml.php
24c24
< 	$beg_date = strftime("%b %d " . $tlrow['evyear'], gmmktime(12, 0, 0, $tlrow['evmonth'], $tlrow['evday'], 2000));
---
> 	$beg_date = date("M d Y", gmmktime(12, 0, 0, $tlrow['evmonth'], $tlrow['evday'], $tlrow['evyear']));
26a27
> 	$isduration = "";
30c31
< 		$end_date = strftime("%b %d " . $tlrow['endyear'], gmmktime(12, 0, 0, $tlrow['endmonth'], $tlrow['endday'], 2000));
---
> 		$end_date = date("M d Y", gmmktime(12, 0, 0, $tlrow['endmonth'], $tlrow['endday'], $tlrow['endyear']));
37d37
< 		$isduration = "";
diff -r TNG/ajx_tnginstall.php TNG1403/ajx_tnginstall.php
1a2,3
> $fromadmin = 0;
> $maint = "";
11,13c13,15
< session_start();
< $session_language = $_SESSION['session_language'];
< $session_charset = $_SESSION['session_charset'];
---
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
> $session_language = isset($_SESSION['session_language']) ? $_SESSION['session_language'] : "";
> $session_charset = isset($_SESSION['session_charset']) ? $_SESSION['session_charset'] : "";
27c29,32
< $link = tng_connect($database_host, $database_username, $database_password, $database_name, $database_port, $database_socket);
---
> if($database_username && $database_name)
> 	$link = tng_connect($database_host, $database_username, $database_password, $database_name, $database_port, $database_socket);
> else
> 	$link = "";
36c41
< function createtables($collation) {
---
> function createtables($collation, $table_prefix) {
41c46
< 	global $dna_tests_table, $dna_links_table, $dna_groups_table, $templates_table;
---
> 	global $dna_tests_table, $dna_links_table, $dna_groups_table, $templates_table, $image_tags_table;
101c106
< 			eval("\$$foldertype = \"$foldername\";");
---
> 			$$foldertype = $foldername;
108,114c113,119
< 		if(!$rootpath) {
< 			$rootpath = dirname(__FILE__) . "/";
< 			if (preg_match("/WIN/i",PHP_OS)) {
< 			    $rootpath = str_replace("\\","/",$rootpath);
< 			}
< 		}
< 		if(!$tngdomain || $tngdomain == "http://www.yourdomain.com/genealogy") {
---
> 		//if(!$rootpath) {
> 		//	$rootpath = dirname(__FILE__) . "/";
> 		//	if (preg_match("/WIN/i",PHP_OS)) {
> 		//	    $rootpath = str_replace("\\","/",$rootpath);
> 		//	}
> 		//}
> 		if(!$tngdomain) {
117c122,123
< 			$tngdomain = str_replace("\\","/","http://" . $server . dirname($_SERVER['REQUEST_URI']));
---
> 			$protocol = 'https://';
> 			$tngdomain = str_replace("\\","/",$protocol . $server . dirname($_SERVER['REQUEST_URI']));
150c156
< 			$msg = $text['noconn'] . " Host Name, Database Name, Database Username, Database Password.";
---
> 			$msg = $text['noconn'] . " Host Name, Database Name, Database Username, Database Password (and possibly the port or socket, if those are required).";
165c171
< 			eval("\$$key = \"$value\";");
---
> 			$$key = $value;
167,168c173,174
< 		if(!trim($database_port)) $database_port = null;
< 		if(!trim($database_socket)) $database_socket = null;
---
> 		$database_port = !empty($database_port) ? trim($database_port) : null;
> 		$database_socket = !empty($database_socket) ? trim($database_socket) : null;
171c177
< 			$badtables = createtables($collation);
---
> 			$badtables = createtables($collation,$table_prefix ?? "");
189,190c195,196
< 		$query = "INSERT IGNORE INTO $users_table (description,username,password,password_type,realname,phone,email,website,address,city,state,zip,country,notes,gedcom,personID,role,allow_edit,allow_add,tentative_edit,allow_delete,allow_lds,allow_living,allow_private,allow_ged,allow_pdf,allow_profile,branch,dt_activated,no_email) ";
< 		$query .= "VALUES (\"Administrator\",\"$username\",\"$password\",\"$password_type\",\"$realname\",\"\",\"$email\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"admin\",\"1\",\"1\",\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"\",\"$today\",\"0\")";
---
> 		$query = "INSERT IGNORE INTO $users_table (description,username,password,password_type,realname,phone,email,website,address,city,state,zip,country,notes,gedcom,personID,role,allow_edit,allow_add,tentative_edit,allow_delete,allow_lds,allow_living,allow_private,allow_private_notes,allow_ged,allow_pdf,allow_profile,branch,dt_activated,no_email) ";
> 		$query .= "VALUES (\"Administrator\",\"$username\",\"$password\",\"$password_type\",\"$realname\",\"\",\"$email\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"admin\",\"1\",\"1\",\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"\",\"$today\",\"0\")";
213a220
> 			$_SESSION['availabletrees'] = $newtreeid;
223c230
< 			$rootpath = dirname(__FILE__) . "/";
---
> 			$calc_rootpath = dirname(__FILE__) . "/";
225c232
< 			    $rootpath = str_replace("\\","/",$rootpath);
---
> 			    $calc_rootpath = str_replace("\\","/",$calc_rootpath);
228c235,237
< 		$newroot = preg_replace( "/\//", "", $rootpath );
---
> 		else
> 			$calc_rootpath = $rootpath;
> 		$newroot = preg_replace( "/\//", "", $calc_rootpath );
282,283c291,292
< 	fwrite( $fp, "\$database_port = '$database_port';\n" );
< 	fwrite( $fp, "\$database_socket = '$database_socket';\n" );
---
> 	fwrite( $fp, "\$database_port = \"$database_port\";\n" );
> 	fwrite( $fp, "\$database_socket = \"$database_socket\";\n" );
297a307,315
> 
> 	//These next 6 tables are obsolete in v6, but are kept here in in order to not throw errors.
> 	fwrite( $fp, "\$headstones_table = \"\";\n" );
> 	fwrite( $fp, "\$hslinks_table = \"\";\n" );
> 	fwrite( $fp, "\$photos_table = \"\";\n" );
> 	fwrite( $fp, "\$photolinks_table = \"\";\n" );
> 	fwrite( $fp, "\$histories_table = \"\";\n" );
> 	fwrite( $fp, "\$doclinks_table = \"\";\n" );
> 
301a320
> 	fwrite( $fp, "\$image_tags_table = \"$image_tags_table\";\n" );
318c337
< 	fwrite( $fp, "\$mhrequests_table = \"$mhrequests_table\";\n" );
---
> 	//fwrite( $fp, "\$mhrequests_table = \"$mhrequests_table\";\n" );
329,330c348,350
< 	if( !$target ) $target = "_self";
< 	fwrite( $fp, "\$target = \"$target\";\n" );
---
> 	fwrite( $fp, "\$sitename = \"Our Family History\";\n" );
> 	fwrite( $fp, "\$site_desc = \"\";\n" );
> 	fwrite( $fp, "\$tngconfig['doctype'] = \"<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'>\";\n" );
332a353
> 	fwrite( $fp, "\$norels = \"\";\n" );
337d357
< 	fwrite( $fp, "\$gendexfile = \"$gendexfile\";\n" );
340d359
< 	fwrite( $fp, "\$backuppath = \"$backuppath\";\n" );
345a365,367
> 	fwrite( $fp, "\$gendexfile = \"$gendexfile\";\n" );
> 	fwrite( $fp, "\$backuppath = \"$backuppath\";\n" );
> 	fwrite( $fp, "\$tngconfig['saveconfig'] = \"\";\n" );
346a369,370
> 	fwrite( $fp, "\$tngconfig['imgmaxh'] = \"\";\n" );
> 	fwrite( $fp, "\$tngconfig['imgmaxw'] = \"\";\n" );
351c375,381
< 	fwrite( $fp, "\$tngconfig['thumbcols'] = \"{$tngconfig['thumbcols']}\";\n" );
---
> 	fwrite( $fp, "\$tngconfig['usedefthumbs'] = \"1\";\n" );
> 	fwrite( $fp, "\$tngconfig['maxnoteprev'] = \"350\";\n" );
> 	fwrite( $fp, "\$tngconfig['ssdisabled'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['ssrepeat'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['imgviewer'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['imgvheight'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['hidemedia'] = \"0\";\n" );
353d382
< 	fwrite( $fp, "\$newmedialinks = \"$newmedialinks\";\n" );
357d385
< 	fwrite( $fp, "\$tngconfig['tabs'] = \"{$tngconfig['tabs']}\";\n" );
359d386
< 	fwrite( $fp, "\$tngconfig['icons'] = \"{$tngconfig['icons']}\";\n" );
361,362c388,400
< 	
< 	fwrite( $fp, "\$emailaddr = \"$emailaddr\";\n" );
---
> 	fwrite( $fp, "\$tngconfig['showhome'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['showsearch'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['searchchoice'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['showlogin'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['showshare'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['showprint'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['showbmarks'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['hidechr'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['altbirth'] = \"{$tngconfig['altbirth']}\";\n" );
> 	fwrite( $fp, "\$tngconfig['hidedna'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['password_type'] = \"sha256\";\n" );
> 	fwrite( $fp, "\$tngconfig['places1tree'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['autogeo'] = \"0\";\n" );
364a403
> 	fwrite( $fp, "\$tngconfig['edit_timeout'] = \"{$tngconfig['edit_timeout']}\";\n" );
365a405
> 	fwrite( $fp, "\$treerestrict = \"$treerestrict\";\n" );
369a410
> 	fwrite( $fp, "\$tngconfig['nnpriv'] = \"0\";\n" );
370a412,413
> 	fwrite( $fp, "\$tngconfig['scrollcite'] = \"1\";\n" );
> 	fwrite( $fp, "\$tngconfig['scrollnotes'] = \"1\";\n" );
371a415
> 	fwrite( $fp, "\$tngconfig['ucsurnames'] = \"0\";\n" );
375,381c419,435
< 	fwrite( $fp, "\$photosext = \"$photosext\";\n" );
< 	
< 	fwrite( $fp, "\$tngconfig['maxdesc'] = \"{$tngconfig['maxdesc']}\";\n" );
< 	fwrite( $fp, "\$defdesc = \"$defdesc\";\n" );
< 	fwrite( $fp, "\$tngconfig['stdesc'] = \"{$tngconfig['stdesc']}\";\n" );
< 	fwrite( $fp, "\$tngconfig['regnotes'] = \"{$tngconfig['regnotes']}\";\n" );
< 	fwrite( $fp, "\$tngconfig['regnosp'] = \"{$tngconfig['regnosp']}\";\n" );
---
> 	fwrite( $fp, "\$tngconfig['cemrows'] = \"{$tngconfig['cemrows']}\";\n" );
> 	fwrite( $fp, "\$tngconfig['cemblanks'] = \"0\";\n" );
> 
> 	fwrite( $fp, "\$emailaddr = \"$emailaddr\";\n" );
> 	fwrite( $fp, "\$tngconfig['fromadmin'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['disallowreg'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['revmail'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['autoapp'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['autotree'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['ackemail'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['omitpwd'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['usesmtp'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['mailhost'] = \"\";\n" );
> 	fwrite( $fp, "\$tngconfig['mailuser'] = \"\";\n" );
> 	fwrite( $fp, "\$tngconfig['mailpass'] = \"\";\n" );
> 	fwrite( $fp, "\$tngconfig['mailport'] = \"\";\n" );
> 	fwrite( $fp, "\$tngconfig['mailenc'] = \"\";\n" );
385a440,444
> 	fwrite( $fp, "\$tngconfig['preferEuro'] = \"false\";\n" );
> 	fwrite( $fp, "\$tngconfig['calstart'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['pardata'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['oldids'] = \"\";\n" );
> 	fwrite( $fp, "\$tngconfig['lastimport'] = \"\";\n" );
386a446
> 	fwrite( $fp, "\$tngconfig['sortbydate'] = \"{$tngconfig['sortbydate']}\";\n" );
404c464,465
< 	fwrite( $fp, "\$tngconfig['webmatches'] = \"{$tngconfig['webmatches']}\";\n" );
---
> 	fwrite( $fp, "\$tngconfig['offline'] = \"\";\n" );
> 	//fwrite( $fp, "\$tngconfig['webmatches'] = \"{$tngconfig['webmatches']}\";\n" );
406a468,473
> 	fwrite( $fp, "\$tngconfig['cookieapproval'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['dataprotect'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['askconsent'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['livingunchecked'] = \"{$tngconfig['livingunchecked']}\";\n" );
> 	fwrite( $fp, "\$tngconfig['nosuggest'] = \"{$tngconfig['nosuggest']}\";\n" );
> 	fwrite( $fp, "\$tngconfig['allowcsv'] = \"{$tngconfig['allowcsv']}\";\n" );
410a478,502
> 	fwrite( $fp, "\$tngconfig['mediatrees'] = \"0\";\n" );
> 	fwrite( $fp, "\$tngconfig['footermsg'] = \"\";\n" );
> 
> 	fwrite( $fp, "\$maxdnasearchresults = \"50\";\n" );
> 	fwrite( $fp, "\$showtestnumbers = \"0\";\n" );
> 	fwrite( $fp, "\$autofillancsurnames = \"0\";\n" );
> 	fwrite( $fp, "\$numgens = \"3\";\n" );
> 	fwrite( $fp, "\$ancsurnameupper = \"0\";\n" );
> 	fwrite( $fp, "\$surnameexcl = \"\";\n" );
> 	fwrite( $fp, "\$bgmain = \"\";\n" );
> 	fwrite( $fp, "\$txtmain = \"#FFFFFF\";\n" );
> 	fwrite( $fp, "\$bgmode = \"#D1EEEE\";\n" );
> 	fwrite( $fp, "\$txtmode = \"#000000\";\n" );
> 	fwrite( $fp, "\$bgfastmut = \"#69001A\";\n" );
> 	fwrite( $fp, "\$txtfastmut = \"#FFFFFF\";\n" );
> 	fwrite( $fp, "\$bg1_12 = \"#414E68\";\n" );
> 	fwrite( $fp, "\$txt1_12 = \"#FFFFFF\";\n" );
> 	fwrite( $fp, "\$bg13_25 = \"#41678A\";\n" );
> 	fwrite( $fp, "\$txt13_25 = \"#FFFFFF\";\n" );
> 	fwrite( $fp, "\$bg26_37 = \"#2E8899\";\n" );
> 	fwrite( $fp, "\$txt26_37 = \"#FFFFFF\";\n" );
> 	fwrite( $fp, "\$bg38_67 = \"#44A1B8\";\n" );
> 	fwrite( $fp, "\$txt38_67 = \"#FFFFFF\";\n" );
> 	fwrite( $fp, "\$bg111 = \"#05B8CC\";\n" );
> 	fwrite( $fp, "\$txt111 = \"#FFFFFF\";\n" );
414,419c506,513
< 	fwrite( $fp, "\$cms['support'] = \"{$cms['support']}\";\n" );
< 	fwrite( $fp, "\$cms['url'] = \"{$cms['url']}\";\n" );
< 	fwrite( $fp, "\$cms['tngpath'] = \"{$cms['tngpath']}\";\n" );
< 	fwrite( $fp, "\$cms['module'] = \"{$cms['module']}\";\n" );
< 	fwrite( $fp, "\$cms['cloaklogin'] = \"{$cms['cloaklogin']}\";\n" );
< 	fwrite( $fp, "\$cms['credits'] = \"{$cms['credits']}\";\n" );
---
> 	fwrite( $fp, "    \$cms['support'] = \"{$cms['support']}\";\n" );
> 	fwrite( $fp, "    \$cms['url'] = \"{$cms['url']}\";\n" );
> 	fwrite( $fp, "    if(!isset(\$cms['tngpath']))\n" );
> 	fwrite( $fp, "        \$cms['tngpath'] = \"{$cms['tngpath']}\";\n" );
> 	fwrite( $fp, "    \$cms['module'] = \"{$cms['module']}\";\n" );
> 	fwrite( $fp, "    \$cms['cloaklogin'] = \"{$cms['cloaklogin']}\";\n" );
> 	fwrite( $fp, "    \$cms['credits'] = \"{$cms['credits']}\";\n" );
> 	fwrite( $fp, "    \$cms['adminurl'] = \"\";\n" );
423c517
< 	fwrite( $fp, "?>\n" );
---
> 	fwrite( $fp, "?>" );
429a524,528
> 	if ( !isset($localphotopathdisplay) ) $localphotopathdisplay = "";
> 	if ( !isset($localhistorypathdisplay) ) $localhistorypathdisplay = "";
> 	if ( !isset($localdocumentpathdisplay) ) $localdocumentpathdisplay = "";
> 	if ( !isset($localotherpathdisplay) ) $localotherpathdisplay = "";
> 
436a536
> 	fwrite( $fp, "\$tngimpcfg['saveconfig'] = \"\";\n" );
437a538,539
> 	fwrite( $fp, "\$tngimpcfg['rrnum'] = \"{$tngimpcfg['rrnum']}\";\n" );
> 	fwrite( $fp, "\$tngimpcfg['readmsecs'] = \"{$tngimpcfg['readmsecs']}\";\n" );
438a541
> 	fwrite( $fp, "\$tngimpcfg['defimpopt'] = \"{$tngimpcfg['defimpopt']}\";\n" );
441a545,547
> 	fwrite( $fp, "\$tngimpcfg['maxprivyrs'] = \"{$tngimpcfg['maxprivyrs']}\";\n" );
> 	fwrite( $fp, "\$tngimpcfg['maxdecdyrs'] = \"{$tngimpcfg['maxdecdyrs']}\";\n" );
> 	fwrite( $fp, "\$tngimpcfg['maxmarriedage'] = \"{$tngimpcfg['maxmarriedage']}\";\n" );
444a551
> 	fwrite( $fp, "\$locimppath['headstones'] = \"{$locimppath['headstones']}\";\n" );
447c554,556
< 	fwrite( $fp, "?>\n" );
---
> 	fwrite( $fp, "\$tngimpcfg['privnote'] = \"{$tngimpcfg['privnote']}\";\n" );
> 	fwrite( $fp, "\$tngimpcfg['coerce'] = \"{$tngimpcfg['coerce']}\";\n" );
> 	fwrite( $fp, "?>" );
diff -r TNG/ajx_updateorder.php TNG1403/ajx_updateorder.php
23c23
< 	$eventID = $plink['eventID'];
---
> 	$eventID = isset($plink['eventID']) ? $plink['eventID'] : "";
315c315
< 			$query = "DELETE FROM $album2entities_table WHERE alinkID=\"$link\"";
---
> 			$query = "DELETE FROM $album2entities_table WHERE alinkID=\"$sortlink\"";
319c319
< 			$query = "DELETE FROM $medialinks_table WHERE medialinkID=\"$link\"";
---
> 			$query = "DELETE FROM $medialinks_table WHERE medialinkID=\"$sortlink\"";
322c322
< 		$rval = $link;
---
> 		$rval = $sortlink;
364c364
< 		$count = $row2['maxordernum'] + 1;
---
> 		$count = !empty($row2['maxordernum']) ? $row2['maxordernum'] + 1 : 1;
417,421c417,421
< 			if(get_magic_quotes_gpc() == 0) {
< 				$altdescription = addslashes($altdescription);
< 				$altnotes = addslashes($altnotes);
< 			}
< 			$dontshow = $show ? "0" : "1";
---
> 			$altdescription = addslashes($altdescription);
> 			$altnotes = addslashes($altnotes);
> 
> 			$dontshow = !empty($show) ? "0" : "1";
> 			$defphoto = !empty($defphoto) ? $defphoto : "";
441c441
< 			$query = "SELECT count(alinkID) as count FROM $album2entities_table WHERE entityID = \"$entityID\"$treestr";
---
> 			$query = "SELECT count(alinkID) as count FROM $album2entities_table WHERE entityID = \"$entityID\"$treestr";		
445,451c445,447
< 		if( $result ) {
< 			$row = tng_fetch_assoc($result);
< 			$newrow = $row['count'] + 1;
< 			tng_free_result($result);
< 		}
< 		else
< 			$newrow = 1;
---
> 		$row = tng_fetch_assoc($result);
> 		tng_free_result($result);
> 		$newrow = $row ? $row['count'] + 1 : 1;
456c452
< 				$query = "SELECT firstname, lnprefix, lastname, prefix, suffix, title, living, private, nameorder, gedcom, branch FROM $people_table WHERE gedcom = \"$tree\" AND personID = \"$entityID\"";
---
> 				$query = "SELECT personID, firstname, lnprefix, lastname, prefix, suffix, title, living, private, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, gedcom, branch FROM $people_table WHERE gedcom = \"$tree\" AND personID = \"$entityID\"";
470,471c466,467
< 				$query = "SELECT wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder, wifepeople.branch as wbranch,
< 					husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder, husbpeople.branch as hbranch
---
> 				$query = "SELECT wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder, wifepeople.title as wtitle, wifepeople.birthdate as wbirthdate, wifepeople.birthdatetr as wbirthdatetr, wifepeople.altbirthdate as waltbirthdate, wifepeople.altbirthdatetr as waltbirthdatetr, wifepeople.deathdate as wdeathdate, wifepeople.deathdatetr as wdeathdatetr, wifepeople.branch as wbranch, wifepeople.gedcom, wifepeople.living as wliving, wifepeople.private as wprivate,
>                     husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder, husbpeople.title as htitle, husbpeople.birthdate as hbirthdate, husbpeople.birthdatetr as hbirthdatetr, husbpeople.altbirthdate as haltbirthdate, husbpeople.altbirthdatetr as haltbirthdatetr, husbpeople.deathdate as hdeathdate, husbpeople.deathdatetr as hdeathdatetr, husbpeople.branch as hbranch, husbpeople.living as hliving, husbpeople.private as hprivate
484a481,490
>                     $person['title'] = $row['htitle'];
>                     $person['birthdate'] = $row['hbirthdate'];
>                     $person['birthdatetr'] = $row['hbirthdatetr'];
>                     $person['altbirthdate'] = $row['haltbirthdate'];
>                     $person['altbirthdatetr'] = $row['haltbirthdatetr'];
>                     $person['deathdate'] = $row['hdeathdate'];
>                     $person['deathdatetr'] = $row['hdeathdatetr'];
>                     $person['gedcom'] = $row['gedcom'];
>                     $person['living'] = $row['hliving'];
>                     $person['private'] = $row['hprivate'];
501a508,517
>                     $person['title'] = $row['wtitle'];
>                     $person['birthdate'] = $row['wbirthdate'];
>                     $person['birthdatetr'] = $row['wbirthdatetr'];
>                     $person['altbirthdate'] = $row['waltbirthdate'];
>                     $person['altbirthdatetr'] = $row['waltbirthdatetr'];
>                     $person['deathdate'] = $row['wdeathdate'];
>                     $person['deathdatetr'] = $row['wdeathdatetr'];
>                     $person['gedcom'] = $row['gedcom'];
>                     $person['living'] = $row['wliving'];
>                     $person['private'] = $row['wprivate'];
572,580c588,600
< 				$query = "SELECT thumbpath, mediatypeID, usecollfolder FROM $media_table WHERE mediaID = \"$mediaID\"";
< 				$result = tng_query($query);
< 				$row = tng_fetch_assoc($result);
< 				$mediatypeID = $row['mediatypeID'];
< 				$usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
< 				$rval .= "|";
< 				$rval .= $row['thumbpath'] && file_exists( "$rootpath$usefolder/" . $row['thumbpath'] ) ? "1" : "0";
< 				$rval .= "|" . $row['mediatypeID'];
< 				tng_free_result($result);
---
> 				if( $type != "album" ) {
> 					$query = "SELECT thumbpath, mediatypeID, usecollfolder FROM $media_table WHERE mediaID = \"$mediaID\"";
> 					$result = tng_query($query);
> 					$row = tng_fetch_assoc($result);
> 					$mediatypeID = $row['mediatypeID'];
> 					$usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
> 					$rval .= "|";
> 					$rval .= $row['thumbpath'] && file_exists( "$rootpath$usefolder/" . $row['thumbpath'] ) ? "1" : "0";
> 					$rval .= "|" . $row['mediatypeID'];
> 					tng_free_result($result);
> 				}
> 				else
> 					$rval .= "|0|";
598,604c618,620
< 		if( $result ) {
< 			$row = tng_fetch_assoc($result);
< 			$newrow = $row['count'] + 1;
< 			tng_free_result($result);
< 		}
< 		else
< 			$newrow = 1;
---
> 		$row = tng_fetch_assoc($result);
> 		tng_free_result($result);
> 		$newrow = $row ? $row['count'] + 1 : 1;
616c632,643
< 		$rval = "Links created: " . $newlinks;
---
> 		$rval = "{$admtext['newlinks']}: " . $newlinks;
> 		break;
> 	case "cemlink":
> 		$newcemlinks = 0;
> 		$mediaIDs = explode(",",$medialist);
> 		foreach($mediaIDs as $mediaID) {
> 			$query = "UPDATE $media_table SET cemeteryID = \"$cemeteryID\" WHERE mediaID = \"$mediaID\"";
> 			$result = @tng_query($query);
> 			$newcemlinks += tng_affected_rows();
> 		}
> 
> 		$rval = "{$admtext['newcemlinks']}: " . $newcemlinks;
623,628c650,653
< 		if (get_magic_quotes_gpc() == 0) {
< 			$title = addslashes($title);
< 			$description = addslashes($description);
< 			$owner = addslashes($owner);
< 			$datetaken = addslashes($datetaken);
< 		}
---
> 		$title = addslashes($title);
> 		$description = addslashes($description);
> 		$owner = addslashes($owner);
> 		$datetaken = addslashes($datetaken);
643,649c668,670
< 		if( $result ) {
< 			$row = tng_fetch_assoc($result);
< 			$newrow = $row['count'] + 1;
< 			tng_free_result($result);
< 		}
< 		else
< 			$newrow = 1;
---
> 		$row = tng_fetch_assoc($result);
> 		tng_free_result($result);
> 		$newrow = $row ? $row['count'] + 1 : 1;
652c673
< 		$query = "SELECT firstname, lnprefix, lastname, prefix, suffix, title, living, private, nameorder, gedcom, branch FROM $people_table WHERE gedcom = \"$tree\" AND personID = \"$entityID\"";
---
> 		$query = "SELECT personID, firstname, lnprefix, lastname, prefix, suffix, title, living, private, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, gedcom, branch FROM $people_table WHERE gedcom = \"$tree\" AND personID = \"$entityID\"";
677a699,788
> 	case "saverect":
> 		if(!$id) {
> 			$nolink = true;
> 			$id = "label-" . time();
> 		}
> 		else
> 			$nolink = false;
> 		$query = "INSERT INTO $image_tags_table (mediaID,rtop,rleft,rheight,rwidth,gedcom,linktype,persfamID,label) VALUES (\"$mediaID\",\"$top\",\"$left\",\"$height\",\"$width\",\"$tree\",\"$linktype\",\"$id\",\"$label\")";
> 		$result = @tng_query($query);
> 		$rectID = tng_insert_id();
> 
> 		$query = "SELECT count(medialinkID) as count FROM $medialinks_table WHERE personID = \"$id\" AND gedcom = \"$tree\"";
> 		$result = @tng_query($query);
> 		$row = tng_fetch_assoc($result);
> 		tng_free_result($result);
> 		$newrow = $row ? $row['count'] + 1 : 1;
> 
> 		if(!$nolink) {
> 			$query = "INSERT IGNORE INTO $medialinks_table (personID,mediaID,ordernum,gedcom,linktype,eventID) VALUES (\"$id\",\"$mediaID\",\"$newrow\",\"$tree\",\"$linktype\",\"\")";
> 			$result = @tng_query($query);
> 
> 			switch($linktype) {
> 				case "I":
> 					$query = "SELECT lastname, lnprefix, firstname, title, prefix, suffix, nameorder, gedcom, branch, living, private, birthdatetr, altbirthdatetr, deathdatetr, personID FROM $people_table WHERE personID = \"{$id}\" AND gedcom = \"$tree\"";
> 					$result= @tng_query($query) or die ($admtext['cannotexecutequery'] . ": $query");
> 					$row =  tng_fetch_assoc( $result );
> 
> 					$righttree = checktree($tree);
> 					$rightbranch = $righttree ? checkbranch($row['branch']) : false;
> 					$rights = determineLivingPrivateRights($row, $righttree, $rightbranch);
> 					$row['allow_living'] = $rights['living'];
> 					$row['allow_private'] = $rights['private'];
> 
> 					$label = getName( $row );
> 					tng_free_result($result);
> 					break;
> 				case "F":
> 					$query = "SELECT husband, wife, gedcom FROM $families_table WHERE familyID = \"$id\" AND gedcom = \"$tree\"";
> 					$result= @tng_query($query) or die ($admtext['cannotexecutequery'] . ": $query");
> 					$row =  tng_fetch_assoc( $result );
> 					$label = getFamilyName( $row );
> 					tng_free_result($result);
> 					break;
> 				case "S":
> 					$query = "SELECT title FROM $sources_table WHERE sourceID=\"$id\" AND gedcom=\"$tree\"";
> 					$result= @tng_query($query) or die ($admtext['cannotexecutequery'] . ": $query");
> 					$row =  tng_fetch_assoc( $result );
> 					$label = $row['title'] ? $row['title'] : $id;
> 					tng_free_result($result);
> 					break;
> 				case "R":
> 					$query = "SELECT reponame FROM $repositories_table WHERE repoID=\"$id\" AND gedcom=\"$tree\"";
> 					$result= @tng_query($query) or die ($admtext['cannotexecutequery'] . ": $query");
> 					$row =  tng_fetch_assoc( $result );
> 					$label = $row['reponame'] ? $row['reponame'] : $id;
> 					tng_free_result($result);
> 					break;
> 				case "C":
> 					$query = "SELECT title, persfamID, c.sourceID, page FROM $citations_table as c, $sources_table as s 
> 						WHERE citationID = \"$id\" AND c.gedcom = \"$tree\" AND c.gedcom = s.gedcom AND c.sourceID = s.sourceID";
> 					$result= @tng_query($query) or die ($admtext['cannotexecutequery'] . ": $query");
> 					$row =  tng_fetch_assoc( $result );
> 					$label = $row['title'] . " ({$row['persfamID']})";
> 					tng_free_result($result);
> 					break;
> 				case "L":
> 					$query = "SELECT place FROM $places_table WHERE ID=\"$id\"";
> 					$result= @tng_query($query) or die ($admtext['cannotexecutequery'] . ": $query");
> 					$row =  tng_fetch_assoc( $result );
> 					$label = $row['place'];
> 					tng_free_result($result);
> 					break;
> 			}
> 		}
> 
> 		$json = true;
> 		$rval = "{\"name\":\"$label\", \"id\":\"$rectID\"}";
> 
> 		//also get name and return that along with rectangle ID
> 		break;
> 	case "updaterect":
> 		$query = "UPDATE $image_tags_table SET rtop=\"$top\",rleft=\"$left\",rheight=\"$height\",rwidth=\"$width\" WHERE ID = \"$id\"";
> 		$result = @tng_query($query);
> 		$rval = 1;
> 		break;
> 	case "delrect":
> 		$query = "DELETE FROM $image_tags_table WHERE ID = \"$id\"";
> 		$result = @tng_query($query);
> 		$rval = 1;
> 		break;
diff -r TNG/ajx_updateuser.php TNG1403/ajx_updateuser.php
18,33c18,27
< if (get_magic_quotes_gpc() == 0) {
< 	$description = addslashes($description);
< 	$username = addslashes($username);
< 	$gedcom = addslashes($gedcom);
< 	$branches = addslashes($branch);
< 	$realname = addslashes($realname);
< 	$phone = addslashes($phone);
< 	$email = addslashes($email);
< 	$address = addslashes($address);
< 	$notes = addslashes($notes);
< 	$website = addslashes($website);
< 	$city = addslashes($city);
< 	$state = addslashes($state);
< 	$zip = addslashes($zip);
< 	$country = addslashes($country);
< }
---
> $username = addslashes($username);
> $realname = addslashes($realname);
> $phone = addslashes($phone);
> $email = addslashes($email);
> $address = addslashes($address);
> $website = addslashes($website);
> $city = addslashes($city);
> $state = addslashes($state);
> $zip = addslashes($zip);
> $country = addslashes($country);
diff -r TNG/albumlib.php TNG1403/albumlib.php
4c4
< 	global $mediatypes_assoc, $mediapath, $showalbum_url, $tngconfig, $sitever;
---
> 	global $mediatypes_assoc, $mediapath, $showalbum_url, $tngconfig, $sitever, $tree, $livedefault, $allow_private;
6c6
< 	$wherestr2 = $tree ? " AND $medialinks_table.gedcom = \"$tree\"" : "";
---
> 	$wherestr2 = !empty($tree) ? " AND $medialinks_table.gedcom = \"$tree\"" : "";
8c8
< 	$query2 = "SELECT gedcom, path, thumbpath, usecollfolder, mediatypeID, $albumlinks_table.mediaID as mediaID, alwayson, $media_table.gedcom FROM ($media_table, $albumlinks_table)
---
> 	$query2 = "SELECT gedcom, path, thumbpath, usecollfolder, mediatypeID, $albumlinks_table.mediaID as mediaID, alwayson, $media_table.gedcom, private FROM ($media_table, $albumlinks_table)
12,14c12,14
< 	$mediaID = $trow['mediaID'];
< 	$tmediatypeID = $trow['mediatypeID'];
< 	$tusefolder = $trow['usecollfolder'] ? $mediatypes_assoc[$tmediatypeID] : $mediapath;
---
> 	$mediaID = !empty($trow['mediaID']) ? $trow['mediaID'] : "";
> 	$tmediatypeID = !empty($trow['mediatypeID']) ? $trow['mediatypeID'] : "";
> 	$tusefolder = !empty($trow['usecollfolder']) ? $mediatypes_assoc[$tmediatypeID] : $mediapath;
19c19
< 	if( $trow['thumbpath'] && file_exists( "$rootpath$tusefolder/$treestr" . $trow['thumbpath'] ) ) {
---
> 	if( !empty($trow['thumbpath']) && file_exists( "$rootpath$tusefolder/$treestr" . $trow['thumbpath'] ) ) {
21c21
< 		$foundprivate = 0;
---
> 		$foundprivate = $trow['private'] && !$allow_private;
37,38c37,38
< 				$prow['allow_living'] == $rights['living'];
< 				$prow['allow_private'] == $rights['private'];
---
> 				$prow['allow_living'] = $rights['living'];
> 				$prow['allow_private'] = $rights['private'];
diff -r TNG/anniversaries2.php TNG1403/anniversaries2.php
13a14,16
> if( !isset($offset) ) $offset = "";
> if( !isset($tngpage) ) $tngpage = "";
> 
diff -r TNG/anniversaries.php TNG1403/anniversaries.php
7,8c7,8
< $tngyear = preg_replace("/[^0-9]/", "", $tngyear );
< $tngkeywords = preg_replace("/[^A-Za-z0-9]/", "", $tngkeywords );
---
> $tngyear = isset($tngyear) ? preg_replace("/[^0-9]/", "", $tngyear ) : "";
> $tngkeywords = isset($tngkeywords) ? preg_replace("/[^A-Za-z0-9]/", "", $tngkeywords ) : "";
20c20
< if( !$tngneedresults ) {
---
> if( empty($tngneedresults) ) {
25a26,30
> else {
> 	$tngmonth = isset($tngmonth) ? preg_replace("/[^0-9]/", "", $tngmonth ) : "";
> 	$tngdaymonth = isset($tngdaymonth) ? preg_replace("/[^0-9]/", "", $tngdaymonth ) : "";
> 	$tngneedresults = isset($tngneedresults) ? preg_replace("/[^0-9]/", '', $tngneedresults) : "";
> }
33a39,41
> if( !isset($tngevent) ) $tngevent = "";
> if( !isset($offset) ) $offset = 0;
> if( !isset($tngpage) ) $tngpage = "";
230a239
> 	$urlstring = "";
352,355c361,366
< 			$query = "SELECT $families_table.ID, husb.personID as hpersonID, husb.lastname as hlastname, husb.lnprefix as hlnprefix, husb.firstname as hfirstname, 
< 				husb.living as hliving, husb.private as hprivate, husb.branch as hbranch, husb.prefix as hprefix, husb.suffix as hsuffix, husb.nameorder as hnameorder, 
< 				wife.personID as wpersonID, wife.lastname as wlastname, wife.lnprefix as wlnprefix, wife.firstname as wfirstname, 
< 				wife.living as wliving, wife.private as wprivate, wife.branch as wbranch, wife.prefix as wprefix, wife.suffix as wsuffix, wife.nameorder as wnameorder,
---
> 			$query = "SELECT $families_table.ID, husb.personID as hpersonID, husb.lastname as hlastname, husb.lnprefix as hlnprefix, husb.firstname as hfirstname,
> 				husb.living as hliving, husb.private as hprivate, husb.branch as hbranch, husb.prefix as hprefix, husb.suffix as hsuffix, husb.nameorder as hnameorder, husb.title as htitle,
> 				husb.birthdate as hbirthdate, husb.birthdatetr as hbirthdatetr, husb.altbirthdate as haltbirthdate, husb.altbirthdatetr as haltbirthdatetr, husb.deathdate as hdeathdate, husb.deathdatetr as hdeathdatetr,
> 				wife.personID as wpersonID, wife.lastname as wlastname, wife.lnprefix as wlnprefix, wife.firstname as wfirstname,
> 				wife.living as wliving, wife.private as wprivate, wife.branch as wbranch, wife.prefix as wprefix, wife.suffix as wsuffix, wife.nameorder as wnameorder, wife.title as wtitle,
> 				wife.birthdate as wbirthdate, wife.birthdatetr as wbirthdatetr, wife.altbirthdate as waltbirthdate, wife.altbirthdatetr as waltbirthdatetr, wife.deathdate as wdeathdate, wife.deathdatetr as wdeathdatetr,
367c378
< 			$query = "SELECT $people_table.ID, $people_table.personID, lastname, lnprefix, firstname, $people_table.living, $people_table.branch, prefix, suffix, nameorder, $place, $datefield, $people_table.gedcom, treename $familiessortdate $eventsfields
---
> 			$query = "SELECT $people_table.ID, $people_table.personID, lastname, lnprefix, firstname, $people_table.living, $people_table.private, $people_table.branch, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, $place, $datefield, $people_table.gedcom, treename $familiessortdate $eventsfields
414c425
< 				$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 				$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
416c427
< 				$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"whiteback normal\">";
---
> 				$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"thfixed whiteback normal\">";
462a474,481
> 						$row['title'] = $row['htitle'];
> 						$row['birthdate'] = $row['hbirthdate'];
> 						$row['birthdatetr'] = $row['hbirthdatetr'];
> 						$row['altbirthdate'] = $row['haltbirthdate'];
> 						$row['altbirthdatetr'] = $row['haltbirthdatetr'];
> 						$row['deathdate'] = $row['hdeathdate'];
> 						$row['deathdatetr'] = $row['hdeathdatetr'];
> 						$row['gedcom'] = $row['gedcom'];
486a506,513
> 						$row['title'] = $row['wtitle'];
> 						$row['birthdate'] = $row['wbirthdate'];
> 						$row['birthdatetr'] = $row['wbirthdatetr'];
> 						$row['altbirthdate'] = $row['waltbirthdate'];
> 						$row['altbirthdatetr'] = $row['waltbirthdatetr'];
> 						$row['deathdate'] = $row['wdeathdate'];
> 						$row['deathdatetr'] = $row['wdeathdatetr'];
> 						$row['gedcom'] = $row['gedcom'];
517c544,545
< 					$placetxt = $row[$place] ? $row[$place] . " <a href=\"$placesearch_url" . "{$treestr}psearch=" . urlencode( $row[$place] ) . "\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\" /></a>" : truncateIt($row['info'], 75);
---
> 					$info = isset($row['info']) ? truncateIt($row['info'], 75) : "";
> 					$placetxt = $row[$place] ? $row[$place] . " <a href=\"$placesearch_url" . "{$treestr}psearch=" . urlencode( $row[$place] ) . "\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\" /></a>" : $info;
diff -r TNG/api_checklogin.php TNG1403/api_checklogin.php
8a9
> 	$allow_private_notes = $_SESSION['allow_private_notes'];
15c16
< 		$allow_living = $allow_private = $allow_lds = 0;
---
> 		$allow_living = $allow_private = $allow_lds = $allow_private_notes = 0;
18c19
< 		$allow_living = $allow_private = $allow_lds = 1;
---
> 		$allow_living = $allow_private = $allow_lds = $allow_private_notes = 1;
Only in TNG: appendix.html
diff -r TNG/begin.php TNG1403/begin.php
4a5
> $map = array();
12a14,22
> if( !$rootpath ) {
> 	$rootpath = dirname(__FILE__) . "/";
> 	if (preg_match("/WIN/i",PHP_OS)) {
> 	    $rootpath = str_replace("\\","/",$rootpath);
> 	}
> 	$saved_rootpath = "";
> }
> else
> 	$saved_rootpath = $rootpath;
26,28c36,39
< session_start();
< $session_language = $_SESSION['session_language'];
< $session_charset = $_SESSION['session_charset'];
---
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
> $session_language = isset($_SESSION['session_language']) ? $_SESSION['session_language'] : $language;
> $_SESSION['session_language'] = $session_language;
> $session_charset = isset($_SESSION['session_charset']) ? $_SESSION['session_charset'] : $charset;
41,48c52,57
< 	if($result !== FALSE) {
< 		while( $row = tng_fetch_assoc( $result ) ) {
< 			$key = "t" . $row['template'] . "_" . $row['keyname'];
< 			if($row['language'])
< 				$key .= "_" . $row['language'];
< 			$tmp[$key] = $row['value'];
< 		}
< 		tng_free_result($result);
---
> 	$tmp = array();
> 	while( $row = tng_fetch_assoc( $result ) ) {
> 		$key = "t" . $row['template'] . "_" . $row['keyname'];
> 		if($row['language'])
> 			$key .= "_" . $row['language'];
> 		$tmp[$key] = $row['value'];
49a59
> 	tng_free_result($result);
diff -r TNG/branchlibjs.php TNG1403/branchlibjs.php
5a6
> 	echo "var nobranchmsg = \"{$admtext['nobranch']}\";\n";
9a11
> 	if( !isset($wherestr) ) $wherestr = "";
37a40,41
> 	if(tree == "-x--all--x-" || tree == "")
> 		tree = "none";
46,48c50,70
< 		newElem.text = branchnames[tree][i];
< 		newElem.value = branchids[tree][i];
< 		if( !i ) newElem.selected = true;
---
> 		if(tree == "none") {
> 			newElem.text = "";
> 			newElem.value = "";
> 			newElem.selected = true;
> 			formName.branch.options.add(newElem);
> 			var newElem = document.createElement("OPTION");
> 			newElem.text = nobranchmsg;
> 			newElem.value = "";
> 			formName.branch.options.add(newElem);
> 		}
> 		else {
> 			newElem.text = branchnames[tree][i];
> 			newElem.value = branchids[tree][i];
> 			if( !i ) newElem.selected = true;
> 			formName.branch.options.add(newElem);
> 		}
> 	}
> 	if(len > 1) {
> 		var newElem = document.createElement("OPTION");
> 		newElem.text = nobranchmsg;
> 		newElem.value = "-1";
diff -r TNG/browsealbums.php TNG1403/browsealbums.php
23,24c23,24
< 	$str .= "<input type=\"submit\" value=\"$text[search]\" />\n";
< 	$str .= "<input type=\"button\" value=\"$text[tng_reset]\" onclick=\"window.location.href='$browsealbums_noargs_url';\" />&nbsp;&nbsp;&nbsp;";
---
> 	$str .= "<input type=\"submit\" value=\"{$text['search']}\" />\n";
> 	$str .= "<input type=\"button\" value=\"{$text['tng_reset']}\" onclick=\"window.location.href='$browsealbums_noargs_url';\" />&nbsp;&nbsp;&nbsp;";
31a32
> if( !isset($offset) ) $offset = 0;
48c49
< if( $mediasearch )
---
> if( !isset($mediasearch) ) $mediasearch = "";
95c96
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
97c98
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback normal\">";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\">";
122,123c123,124
< 		$families_table.living as fliving, $families_table.private as fprivate, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder,
< 		$album2entities_table.gedcom, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID, reponame, deathdate, burialdate, linktype
---
> 		$families_table.living as fliving, $families_table.private as fprivate, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder, people.title,
> 		$album2entities_table.gedcom, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID, reponame, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, burialdate, linktype
151c152
< 		if( $prow['living'] == NULL && $prow['private'] == NULL && $prow[linktype] == 'F') {
---
> 		if( $prow['living'] == NULL && $prow['private'] == NULL && $prow['linktype'] == 'F') {
202c203
< 		$alblink = "<a href=\"$showalbum_url" . "albumID={$row['albumID']}\">{$row['albumname']}</a>";
---
> 		$alblink = "<a href=\"$showalbum_url" . "albumID={$row['albumID']}\" class=\"media-title\">{$row['albumname']}</a>";
206c207
< 		$alblink = $text['living'];
---
> 		$alblink = "<span class=\"media-title\">{$text['living']}</span>";
224c225
< 	$albumtext .= "<td class=\"databack\" valign=\"top\" align=\"center\"><span class=\"normal\">$arow[acount]&nbsp;</span></td>\n";
---
> 	$albumtext .= "<td class=\"databack\" valign=\"top\" align=\"center\"><span class=\"normal\">{$arow['acount']}&nbsp;</span></td>\n";
232c233
< 	$header = str_replace( "<td class=\"fieldnameback\"><span class=\"fieldname\">&nbsp;<strong>$text[thumb]</strong>&nbsp;</span></td>", "", $header );
---
> 	$header = str_replace( "<td class=\"fieldnameback\"><span class=\"fieldname\">&nbsp;<strong>{$text['thumb']}</strong>&nbsp;</span></td>", "", $header );
diff -r TNG/browsebranches.php TNG1403/browsebranches.php
30a31
> if( !isset($offset) ) $offset = 0;
40a42
> $branchsearch = isset($branchsearch) ? cleanIt(trim($branchsearch)) : "";
46c48
< 	$wherestr = " AND b.gedcom = \"$tree\"";
---
> 	$wherestr .= " AND b.gedcom = \"$tree\"";
96c98
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
98c100
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback normal\">";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\">";
140,143c142,148
< 	$prights = determineLivingPrivateRights($prow);
< 	$prow['allow_living'] = $prights['living'];
< 	$prow['allow_private'] = $prights['private'];
< 	$namestr = getName( $prow );
---
> 	$namestr = "";
> 	if( !empty($prow) ) {
> 		$prights = determineLivingPrivateRights($prow);
> 		$prow['allow_living'] = $prights['living'];
> 		$prow['allow_private'] = $prights['private'];
> 		$namestr = getName( $prow );
> 	}
160c165
< if( $pagenav || $treesearch )
---
> if( $pagenav || $branchsearch )
diff -r TNG/browse_dna_tests.php TNG1403/browse_dna_tests.php
1,407c1,552
< <?php
< $textpart = "dna";
< include("tng_begin.php");
< 
< if($tngconfig['hidedna'] && (!$allow_edit || !$allow_add || $assignedtree)) {
< 	header( "Location: thispagedoesnotexist.html" ); 
< 	exit;
< }
< include($cms['tngpath'] . "functions.php");
< include($cms['tngpath'] . "personlib.php" );
< 
< $browse_dna_tests_url = getURL( "browse_dna_tests", 1 );
< $show_dna_test_url = getURL( "show_dna_test", 1 );
< $showtree_url = getURL( "showtree", 1 );
< $getperson_url = getURL( "getperson", 1 );
< $placesearch_url = getURL( "placesearch", 1 );
< 
< $maxsearchresults = $maxdnasearchresults ? $maxdnasearchresults : $maxsearchresults;
< 
< function get_test_groups($test_type, $test_group) {
< 	global $text, $dna_groups_table;
< 	$wherestr2 = "";
< 	$wherestr2 .= " AND test_type = \"$test_type\"";
< 	$groupquery = "SELECT description, test_type, gedcom FROM $dna_groups_table WHERE description IS NOT NULL $wherestr2 ORDER BY description";
< 	$groupsel = "	<option value=\"\">{$text['allgroups']}</option>\n";
< 	$groupresult = tng_query($groupquery);
< 	while( $grouprow = tng_fetch_assoc($groupresult) ) {
< 		$groupsel .= "	<option value=\"{$grouprow['description']}\"";
< 		if( $grouprow['description'] == $test_group ) $groupsel .= " selected";
< 		$groupsel .= ">{$grouprow['description']}</option>\n";
< 	}
< 	tng_free_result($groupresult);
< 	return $groupsel;
< }
< 
< function doTestSearch( $instance, $pagenav ) {
< 	global $text, $testsearch, $tree, $test_type;
< 
< 	$browse_dna_tests_noargs_url = getURL( "browse_dna_tests", 0 );
< 
< 	$str = "<span class=\"normal\">\n";
< 	$str .= getFORM( "browse_dna_tests", "get", "TestSearch$instance", "" );
< 	$str .= "<input type=\"text\" name=\"testsearch\" value=\"$testsearch\" /> <input type=\"submit\" value=\"{$text['search']}\" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
< 	$str .= $pagenav;
< 	if( $testsearch )
< 		$str .= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$browse_dna_tests_noargs_url\">{$text['browsealltests']}</a>";
< 	$str .= "<input type=\"hidden\" name=\"tree\" value=\"$tree\" />\n";
< 	$str .= "</form></span>\n";
< 	
< 	return $str;
< }
< 
< $max_browse_test_pages = 5;
< if( $offset ) {
< 	$offsetplus = $offset + 1;
< 	$newoffset = "$offset, ";
< }
< else {
< 	$offsetplus = 1;
< 	$newoffset = "";
< 	$page = 1;
< }
< 
< $testsearch = trim($testsearch);
< if( $tree ) {
< 	$wherestr = "WHERE $dna_tests_table.gedcom = \"$tree\"";
< 	if( $testsearch ) $wherestr .= " AND (test_type LIKE \"%$testsearch%\" OR test_number LIKE \"%$testsearch%\" OR vendor LIKE \"%$testsearch%\" OR notes LIKE \"%$testsearch%\" OR dna_group LIKE \"%$testsearch%\" OR dna_group_desc LIKE \"%$testsearch%\" OR surnames LIKE \"%$testsearch%\")";
< 	$join = "INNER JOIN";
< }
< else {
< 	if( $testsearch )
< 		$wherestr = "WHERE test_type LIKE \"%$testsearch%\" OR test_number LIKE \"%$testsearch%\" OR vendor LIKE \"%$testsearch%\" OR notes LIKE \"%$testsearch%\" OR dna_group LIKE \"%$testsearch%\" OR dna_group_desc LIKE \"%$testsearch%\" OR surnames LIKE \"%$testsearch%\"";
< 	else
< 		$wherestr = "";
< 	$join = "LEFT JOIN";
< }
< 
< if($test_type) {
< 	$admtext['dna_tests'] = substr($test_type, 0, -3) . $admtext['dna_tests'];
< 	if($wherestr)
< 		$wherestr .= " AND $dna_tests_table.test_type = \"$test_type\"";
< 	else
< 		$wherestr = "WHERE $dna_tests_table.test_type = \"$test_type\"";
< }
< if($test_group) {
< 	$admtext['dna_tests'] .= ": " . $test_group;
< 	if($wherestr)
< 		$wherestr .= " AND $dna_tests_table.dna_group_desc = \"$test_group\"";
< 	else
< 		$wherestr = "WHERE $dna_tests_table.dna_group_desc = \"$test_group\"";
< }
< 
< $query = "SELECT testID, test_type, test_number, vendor, $dna_tests_table.gedcom, $dna_tests_table.personID, treename, haplogroup, markers, confirmed, person_name, private_dna, dna_group, dna_group_desc, surnames, MD_ancestorID, MRC_ancestorID
< 	FROM $dna_tests_table $join $trees_table on $dna_tests_table.gedcom = $trees_table.gedcom $wherestr 
< 	ORDER BY test_type, dna_group_desc, personID, vendor, test_date LIMIT $newoffset" . $maxsearchresults;
< $result = tng_query($query);
< 
< $numrows = tng_num_rows( $result );
< 
< if( $numrows == $maxsearchresults || $offsetplus > 1 ) {
< 	if( $tree )
< 		$query = "SELECT count(testID) as tcount FROM $dna_tests_table LEFT JOIN $trees_table on $dna_tests_table.gedcom = $trees_table.gedcom $wherestr";
< 	else
< 		$query = "SELECT count(testID) as tcount FROM $dna_tests_table $wherestr";
< 	$result2 = tng_query($query);
< 	$row = tng_fetch_assoc( $result2 );
< 	$totrows = $row['tcount'];
< }
< else
< 	$totrows = $numrows;
< 
< $numrowsplus = $numrows + $offset;
< 
< $treestr = $tree ? " ({$text['tree']}: $tree)" : "";
< $logstring = "<a href=\"$browse_dna_tests_url" . "tree=$tree&amp;offset=$offset&amp;testsearch=$testsearch\">" . xmlcharacters($admtext['dna_tests'].$treestr) . "</a>";
< writelog($logstring);
< preparebookmark($logstring);
< 
< tng_header( $admtext['dna_tests'], $flags );
< ?>
< 
< <h1 class="header"><span class="headericon" id="dna-hdr-icon"></span><?php echo $admtext['dna_tests']; ?></h1><br clear="left"/>
< <?php
< echo "<div class=\"normal\">\n";
< ?>
< 
< 	<form action="browse_dna_tests.php" method="post" name="form1" id="form1">
< 	<table class="normal">
< 		<tr>
< 			<td>
< <?php
< 	if(!$requirelogin || !$treerestrict || !$assignedtree) {
<         $wherestr = $allow_admin ? "" : "WHERE secret != 2";
< 		$query = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
< 		$treeresult = tng_query($query);
< 		$numtrees = tng_num_rows($treeresult);
< 		if( $numtrees > 1 ) {
< 			$ret = "";
< 			$ret .= "<span class=\"normal\">{$text['tree']}: </span>";
< 			$ret .= "<select name=\"tree\" id=\"treeselect\" onchange=\"jQuery('#treespinner').show();document.form1.submit();\">\n";
< 			$ret .= "<option value=\"-x--all--x-\" ";
< 			if( !$tree ) $ret .= "selected=\"selected\"";
< 			$ret .= ">{$text['alltrees']}</option>\n";
< 
< 			while( $row = tng_fetch_assoc($treeresult) ) {
< 				$ret .= "<option value=\"{$row['gedcom']}\"";
< 				if( $tree && $row['gedcom'] == $tree ) $ret .= " selected=\"selected\"";
< 				$ret .= ">{$row['treename']}</option>\n";
< 			}
< 			$ret .= "</select>\n";
< 			tng_free_result($treeresult);
< 			$ret .= "&nbsp; <img src=\"{$cms['tngpath']}img/spinner.gif\" style=\"display:none;\" id=\"treespinner\" alt=\"\" class=\"spinner\"/>\n";
< 			echo $ret;
< 		}
< 	}
< ?>
< 			</td>
< 			<td>
< 				<?php echo $text['test_type']; ?>: 
< 				<select name="test_type" id="test_type" onchange="jQuery('#treespinner2').show();document.form1.test_group.selectedIndex = 0;document.form1.submit();">
< 				<option value=""><?php echo $text['alltypes']; ?></option>
< 				<option value="atDNA"<?php if($test_type == "atDNA") echo " selected"; ?>><?php echo $admtext['atdna_test']; ?></option>
< 				<option value="Y-DNA"<?php if($test_type == "Y-DNA") echo " selected"; ?>><?php echo $admtext['ydna_test']; ?></option>
< 				<option value="mtDNA"<?php if($test_type == "mtDNA") echo " selected"; ?>><?php echo $admtext['mtdna_test']; ?></option>
< 				<option value="X-DNA"<?php if($test_type == "X-DNA") echo " selected"; ?>><?php echo $admtext['xdna_test']; ?></option>
< 				</select>&nbsp;<img src=<?php echo"{$cms['tngpath']}img/spinner.gif"; ?> style="display:none;" id="treespinner2" alt="" class="spinner">&nbsp;&nbsp;&nbsp;
< 			</td>
< 			<td>
<                 <?php echo $text['testgroup']; ?>:
< 				<select name="test_group" id="test_group" onchange="jQuery('#treespinner3').show();document.form1.submit();">
< <?php
< echo get_test_groups($test_type, $test_group);
< ?>
< 			 	</select>&nbsp;<img src=<?php echo"{$cms['tngpath']}img/spinner.gif"; ?> style="display:none;" id="treespinner3" alt="" class="spinner">&nbsp;&nbsp;&nbsp;
<                 <input type="submit" name="reset" value="<?php echo $text['tng_reset']; ?>" onclick="document.form1.test_type.selectedIndex = 0;document.form1.test_group.selectedIndex = 0;">
<                 <br/>
<             </td>
< 		</tr>
< 	</table>
< 	</form>
< <?php
< $_SESSION["ttree"] = $tree;
< $_SESSION["ttype"] = $test_type;
< $_SESSION["tgroup"] = $test_group;
< $_SESSION["tsearch"] = $testsearch;
< 
< if( $totrows )
< 	echo "<p><span class=\"normal\">{$text['matches']} $offsetplus {$text['to']} $numrowsplus {$text['of']} $totrows</span></p>";
< 
< $pagenav = get_browseitems_nav( $totrows, $browse_dna_tests_url . "testsearch=$testsearch&amp;offset", $maxsearchresults, $max_browse_test_pages );
< if( $pagenav || $testsearch ) {
< 	echo doTestSearch( 1, $pagenav );
< 	echo "<br />\n";
< }
< 
< $header = "";
< $headerr = $enableminimap ? " data-tablesaw-minimap" : "";
< $headerr .= $enablemodeswitch ? " data-tablesaw-mode-switch" : "";
< 
< if ($sitever != "standard") {
< 	if ($tabletype == "toggle") {
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"columntoggle\"{$headerr}>\n";
< 	} elseif ($tabletype == "stack") {
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"stack\"{$headerr}>\n";
< 	} elseif ($tabletype == "swipe") {
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"swipe\"{$headerr}>\n";
< 	}
< } else {
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback normal\">";
< }
< echo $header;
< ?>
< <script type="text/javascript">
< function toggleAll( flag ) {
< 	for( var i = 0; i < document.form2.elements.length; i++ ) {
< 		if( document.form2.elements[i].type == "checkbox" ) {
< 			if( flag )
< 				document.form2.elements[i].checked = true;
< 			else
< 				document.form2.elements[i].checked = false;
< 		}
< 	}
< }
< </script>
< <?php if ($test_type == "Y-DNA") {?>
< 	<form action="compare_selected_dna.php" method="post"  name="form2">
< 		<p class="nw">
< 		<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onClick="toggleAll(1);">
< 		<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onClick="toggleAll(0);">&nbsp;&nbsp;
< 		<input type="submit" name="cdnaaction" value="<?php echo $text['compareselected']; ?>">&nbsp;&nbsp;
< 		</p>
< <?php }?>
< 	<thead>
< 		<tr>
< 		<th data-tablesaw-priority="persist" class="fieldnameback nbrcol fieldname">&nbsp;#&nbsp;</th>
< <?php if ($test_type == "Y-DNA") { ?>
< 		<th data-tablesaw-priority="1" class="fieldnameback fieldname">&nbsp;<?php echo $admtext['select']; ?>&nbsp;</th>
< <?php 
< 	}
< ?>
< 		<th data-tablesaw-priority="1" class="fieldnameback fieldname nw">&nbsp;<?php echo $text['test_type']; ?>&nbsp;</th>
< <?php
<     if( $allow_edit || $showtestnumbers ) { ?>
<         <th data-tablesaw-priority="2" class="fieldnameback fieldname nw">&nbsp;<?php echo $text['test_number']; ?>&nbsp;</th>
< <?php 
< 	}
< ?>
< 		<th data-tablesaw-priority="2" class="fieldnameback fieldname nw">&nbsp;<?php echo $text['haplogroup']; ?>&nbsp;</th>
< 		<th data-tablesaw-priority="1" class="fieldnameback fieldname nw">&nbsp;<?php echo $text['takenby']; ?>&nbsp;</th>
< 		<th data-tablesaw-priority="1" class="fieldnameback fieldname nw">&nbsp;<?php echo $admtext['mda']; ?>&nbsp;</th>
< 		<th data-tablesaw-priority="1" class="fieldnameback fieldname nw">&nbsp;<?php echo $admtext['mrca']; ?>&nbsp;</th>
< 		<th data-tablesaw-priority="1" class="fieldnameback fieldname nw">&nbsp;<?php echo $text['testgroup']; ?>&nbsp;</th>
< 		<?php if( $numtrees > 1 ) { ?><th data-tablesaw-priority="5" class="fieldnameback fieldname">&nbsp;<?php echo $text['tree']; ?>&nbsp;</th><?php } ?>
< 		</tr>
< 	</thead>
< <?php
< $i = $offsetplus;
< while( $row = tng_fetch_assoc( $result ) )
< {
< 	$group = $row['dna_group_desc'] ? $row['dna_group_desc'] : $text['none'];
< 	echo "<tr><td valign=\"top\" class=\"databack\">$i</td>\n";
< 	if ($test_type == "Y-DNA")
< 		echo "<td class=\"databack\" valign=\"top\" align=\"center\"><input type=\"checkbox\" name=\"dna{$row['testID']}\" value=\"1\"></td>";
<         $dash = ($row['test_type'] == "Y-DNA") ? "-" : "";
< 	echo "<td valign=\"top\" class=\"databack\"><a href=\"$show_dna_test_url" . "group=$group&amp;testID={$row['testID']}&amp;tree={$row['gedcom']}\">{$row['test_type']}$dash{$row['markers']}</a>&nbsp;</td>";
<        if ($allow_edit || $showtestnumbers)
< 	echo "<td valign=\"top\" class=\"databack\"><a href=\"$show_dna_test_url" . "group=$group&amp;testID={$row['testID']}&amp;tree={$row['gedcom']}\">{$row['test_number']}</a>&nbsp;</td>";
< 	if( $row['haplogroup'] ) {
< 		if( $row['confirmed'] )
< 			$row['haplogroup'] = "<span class='confirmed_haplogroup'>" . $row['haplogroup'] . "</span>";
< 		else
< 			$row['haplogroup'] = "<span class='predicted_haplogroup'>" . $row['haplogroup'] . "</span>";
< 		echo "<td valign=\"top\" class=\"databack nw\">&nbsp;{$row['haplogroup']}</td>";
< 	}
< 	else 
< 		echo "<td valign=\"top\" class=\"databack nw\">&nbsp;N/A&nbsp;</td>";
< 
< 	$dna_pers_result = getPersonData($row['gedcom'], $row['personID']);
< 	$dprow = tng_fetch_assoc($dna_pers_result);
< 	$dna_righttree = checktree($dprow['gedcom']);
< 	$dna_rightbranch = $dna_righttree ? checkbranch($dprow['branch']) : false;
< 	$dprights = determineLivingPrivateRights($dprow, $dna_righttree, $dna_rightbranch);
< 	$dprow['allow_living'] = $dprights['living'];
< 	$dprow['allow_private'] = $dprights['private'];
< 	$dbname = getName( $dprow );
< 	$person_name = $row['person_name'];
< 	$dna_namestr = getName($dprow);
< 	if ($row['private_dna'] && $allow_edit)
< 		$privacy = "&nbsp;(" . $admtext['text_private'] . ")";
< 	else
< 		$privacy = "";
< 	if ($dbname) {
< 		//$dna_namestr .= " ({$row['personID']})";
< 		$vitalinfo = $dprights['both'] ? getBirthInfo($dprow) : "";
< 		$dna_namestr = "<a href=\"$getperson_url" . "personID={$row['personID']}&tree={$row['gedcom']}\">$dna_namestr</a>$privacy $vitalinfo";
< 	} else
< 		$dna_namestr = $person_name . $privacy;
< 	if ($row['private_dna'] && !$allow_edit) $dna_namestr = $admtext['text_private'];
< 	tng_free_result($dna_pers_result);
< 
< 	//query the links table
< 	$query = "SELECT $dna_links_table.personID, lastname, lnprefix, firstname, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, 
< 		deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, 
< 		IF(birthdatetr !='0000-00-00',birthdatetr,altbirthdatetr) as birth, 
< 		IF(deathdatetr !='0000-00-00',deathdatetr,burialdatetr) as death,
< 		prefix, suffix, nameorder, $dna_links_table.gedcom, branch, living, private 
< 		FROM $dna_links_table, $people_table 
< 		WHERE testID = \"{$row['testID']}\" AND $dna_links_table.personID = $people_table.personID AND $dna_links_table.gedcom = $people_table.gedcom
< 		ORDER BY birth DESC, lastname, firstname LIMIT $maxsearchresults";
< 	$presult = tng_query($query);
< 	$numrows = tng_num_rows( $presult );
< 	$dnalinktext = "";
< 	$counter = 1;
< 	while( $prow = tng_fetch_assoc( $presult ) ) {
< 		if($prow['personID'] != $row['personID'] || $prow['gedcom'] != $row['gedcom']) {
< 			if( $dnalinktext ) $dnalinktext .= "<br/>\n";
< 			$righttree = checktree($prow['gedcom']);
< 			$rightbranch = $righttree ? checkbranch($prow['branch']) : false;
< 			$rights = determineLivingPrivateRights($prow, $righttree, $rightbranch);
< 			$name = "$counter. ";
< 			if(!$rights['living'])
< 				$name .= $text['living'];
< 			elseif(!$rights['private'])
< 				$name .= $admtext['text_private'];
< 			else {
< 				$prow['allow_living'] = $rights['living'];
< 				$prow['allow_private'] = $rights['private'];
< 				$vitalinfo = $rights['both'] ? getBirthInfo($prow) : "";
< 				$name .= "<a href=\"$getperson_url" . "personID={$prow['personID']}&amp;tree={$prow['gedcom']}\">" . getName( $prow ) . "</a>$vitalinfo";
< 			}
< 			$counter++;
< 			$dnalinktext .= $name;
< 		}
< 	}
< 	tng_free_result($presult);
< 
< 	if($dnalinktext) {
< 		$more = "<a href=\"#\" onclick=\"\$('#more_{$row['testID']}').slideToggle();return false;\" title=\"{$text['moreind']}\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" alt=\"{$text['more']}\" /></a> ";
< 		$morediv = "<div style=\"display:none\" id=\"more_{$row['testID']}\"><hr class=\"mtitlehr\"/><strong>{$text['indlinked']}:</strong><br/>$dnalinktext</div>";
< 	}
< 	else
< 		$more = $morediv = "";
< 
< 	echo "<td valign=\"top\" class=\"databack\">$more$dna_namestr&nbsp;$morediv</td>";
< 	$mdanc_namestr = "";
< 	if($row['MD_ancestorID']) {
< 		$dna_anc_result = getPersonDataPlusDates($row['gedcom'], $row['MD_ancestorID']);
< 		$ancrow = tng_fetch_assoc($dna_anc_result);
< 		$dna_righttree = checktree($row['gedcom']);
< 		$dna_rightbranch = $dna_righttree ? checkbranch($row['branch']) : false;
< 		$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
< 		$ancrow['allow_living'] = $dprights['living'];
< 		$ancrow['allow_private'] = $dprights['private'];
< 		$vitalinfo = getBirthInfo($ancrow);
< 		$mdanc_namestr = getName( $ancrow ) . "<br />" . $vitalinfo;
< 
< 		tng_free_result($dna_anc_result);
< 	}
< 	$mrcanc_namestr = "";
< 	if($row['MRC_ancestorID']) {
< 		if ($row['MRC_ancestorID'][0] == "I") {
< 			$dna_anc_result = getPersonDataPlusDates($row['gedcom'], $row['MRC_ancestorID']);
< 			$ancrow = tng_fetch_assoc($dna_anc_result);
< 			$dna_righttree = checktree($row['gedcom']);
< 			$dna_rightbranch = $dna_righttree ? checkbranch($row['branch']) : false;
< 			$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
< 			$ancrow['allow_living'] = $dprights['living'];
< 			$ancrow['allow_private'] = $dprights['private'];
< 			$vitalinfo = getBirthInfo($ancrow);
< 			$mrcanc_namestr = getName( $ancrow ) . "<br />" . $vitalinfo;
< 			tng_free_result($dna_anc_result);
< 		}
< 		else if ($row['MRC_ancestorID'][0] == "F") {
< 			$mrcquery = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$row['MRC_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
< 			$mrcresult = tng_query($mrcquery);
< 			$famrow = tng_fetch_assoc($mrcresult);
< 			tng_free_result($mrcresult);
< 
< 			$righttree = checktree($row['gedcom']);
< 			$rightbranch = checkbranch($famrow['branch']);
< 			$rights = determineLivingPrivateRights($famrow, $righttree, $rightbranch);
< 			$famrow['allow_living'] = $rights['living'];
< 			$famrow['allow_private'] = $rights['private'];
< 
< 			$mrcanc_namestr = getFamilyName( $famrow );
< 		}
< 	}
< 	echo "<td valign=\"top\" class=\"databack\">&nbsp;$mdanc_namestr</td>";
< 	echo "<td valign=\"top\" class=\"databack\">&nbsp;$mrcanc_namestr</td>";
< 	echo "<td valign=\"top\" class=\"databack\">$group</td>";
< 	if( $numtrees > 1 )
< 		echo "<td valign=\"top\" class=\"databack nw\"><a href=\"$showtree_url" . "tree={$row['gedcom']}\">{$row['treename']}</a>&nbsp;</td>";
< 	echo "</tr>\n";
< 	$i++;
< }
< tng_free_result($result);
< ?>
< 	</form>
< </table>
< <br />
< </div>
< <?php
< if( $pagenav || $testsearch )
< 	echo doTestSearch( 2, $pagenav ) . "<br />\n";
< 
< tng_footer( "" );
< ?>
---
> <?php
> $textpart = "dna";
> include("tng_begin.php");
> 
> if($tngconfig['hidedna'] && (!$allow_edit || !$allow_add || $assignedtree)) {
> 	header( "Location: thispagedoesnotexist.html" );
> 	exit;
> }
> include($cms['tngpath'] . "functions.php");
> include($cms['tngpath'] . "personlib.php" );
> 
> $browse_dna_tests_url = getURL( "browse_dna_tests", 1 );
> $show_dna_test_url = getURL( "show_dna_test", 1 );
> $showtree_url = getURL( "showtree", 1 );
> $getperson_url = getURL( "getperson", 1 );
> $placesearch_url = getURL( "placesearch", 1 );
> $familygroup_url = getURL( "familygroup", 1 );
> 
> if( empty($_SESSION['tnglastpage']) || strpos($_SESSION['tnglastpage'], "browse_dna_tests.php") === false ) {
> 	unset ($_SESSION['browse_dna']);
> } else {
> 	if( empty($_SESSION['browse_dna']) || !empty($_POST['reset']) ) $_SESSION['browse_dna'] = array();
> 	if( isset($_POST['tree']) ) $_SESSION['browse_dna']['tree'] = $_POST['tree'] == "-x--all--x-" ? "" : $_POST['tree'];
> 	if( isset($_POST['test_type']) ) $_SESSION['browse_dna']['test_type'] = $_POST['test_type'];
> 	if( isset($_POST['test_group']) ) $_SESSION['browse_dna']['test_group'] = $_POST['test_group'];
> 	if( empty($tree) && isset($_SESSION['browse_dna']['tree']) ) $tree = $_SESSION['browse_dna']['tree'];
> 	if( !isset($test_type) && isset($_SESSION['browse_dna']['test_type']) ) $test_type = $_SESSION['browse_dna']['test_type'];
> 	if( !isset($test_group) && isset($_SESSION['browse_dna']['test_group']) ) $test_group = $_SESSION['browse_dna']['test_group'];
> }
> 
> if( !empty($test_type) && $test_type != "atDNA" && $test_type != "mtDNA" && $test_type != "X-DNA" && $test_type != "Y-DNA" ) $test_type = "";
> if( !empty($test_group) ) $test_group = cleanIt($test_group);
> if( !empty($tree) ) $tree = cleanIt($tree);
> 
> $maxsearchresults = $maxdnasearchresults ? $maxdnasearchresults : $maxsearchresults;
> 
> function get_test_groups($test_type, $test_group) {
> 	global $text, $dna_groups_table;
> 	$wherestr2 = $test_type ? " AND test_type = \"$test_type\"" : "";
> 	$groupquery = "SELECT dna_group, description, test_type, gedcom FROM $dna_groups_table WHERE description IS NOT NULL $wherestr2 ORDER BY description";
> 	$groupsel = "	<option value=\"\">{$text['allgroups']}</option>\n";
> 	$groupresult = tng_query($groupquery);
> 	while( $grouprow = tng_fetch_assoc($groupresult) ) {
> 		$groupsel .= "	<option value=\"{$grouprow['dna_group']}\"";
> 		if( $grouprow['dna_group'] == $test_group ) $groupsel .= " selected";
> 		$groupsel .= ">{$grouprow['description']}</option>\n";
> 	}
> 	tng_free_result($groupresult);
> 	return $groupsel;
> }
> 
> function doTestSearch( $instance, $pagenav ) {
> 	global $text, $testsearch, $tree, $test_type;
> 
> 	$browse_dna_tests_noargs_url = getURL( "browse_dna_tests", 0 );
> 
> 	$str = getFORM( "browse_dna_tests", "get", "TestSearch$instance", "" );
> 	$str .= "<input type=\"text\" name=\"testsearch\" value=\"" . htmlspecialchars($testsearch) . "\" /> <input type=\"submit\" value=\"{$text['search']}\" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
> 	$str .= $pagenav;
> 	if( $testsearch )
> 		$str .= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$browse_dna_tests_noargs_url\">{$text['browsealltests']}</a>";
> 	$str .= "<input type=\"hidden\" name=\"tree\" value=\"$tree\" />\n";
> 	$str .= "</form>\n";
> 
> 	return $str;
> }
> 
> $max_browse_test_pages = 5;
> if(!empty($offset)) {
> 	$offsetplus = $offset + 1;
> 	$newoffset = "$offset, ";
> }
> else {
> 	$offsetplus = 1;
> 	$newoffset = "";
> 	$page = 1;
> }
> 
> $testsearch = isset($testsearch) ? trim($testsearch) : '';
> $sqltestsearch = cleanIt($testsearch);
> if( $tree ) {
> 	$wherestr = "WHERE $dna_tests_table.gedcom = \"$tree\"";
> 	if( $sqltestsearch ) $wherestr .= " AND (test_type LIKE \"%$sqltestsearch%\" OR test_number LIKE \"%$sqltestsearch%\" OR vendor LIKE \"%$sqltestsearch%\" OR notes LIKE \"%$sqltestsearch%\" OR dna_group LIKE \"%$sqltestsearch%\" OR dna_group_desc LIKE \"%$sqltestsearch%\" OR surnames LIKE \"%$sqltestsearch%\")";
> 	$join = "INNER JOIN";
> }
> else {
> 	if( $sqltestsearch )
> 		$wherestr = "WHERE test_type LIKE \"%$sqltestsearch%\" OR test_number LIKE \"%$sqltestsearch%\" OR vendor LIKE \"%$sqltestsearch%\" OR notes LIKE \"%$sqltestsearch%\" OR dna_group LIKE \"%$sqltestsearch%\" OR dna_group_desc LIKE \"%$sqltestsearch%\" OR surnames LIKE \"%$sqltestsearch%\"";
> 	else
> 		$wherestr = "";
> 	$join = "LEFT JOIN";
> }
> 
> //	only return tests not marked "keep test private" if user does not have "Allow Private" privilege
> if (!$allow_private) {
> 	if ($wherestr)
> 		$wherestr .= " AND $dna_tests_table.private_test != \"1\" ";
> 	else
> 		$wherestr .= " WHERE $dna_tests_table.private_test != \"1\" ";
> }
> else
> 	$wherestr .= "";
> 
> $test_hdr = $admtext['dna_tests'];
> 
> if(!isset( $test_type )) $test_type = '';
> if($test_type) {
> 	switch ($test_type) {
> 		case "Y-DNA":
> 			$test_hdr = $text['ydna_test'];
> 			break;
> 		case "mtDNA":
> 			$test_hdr = $text['mtdna_test'];
> 			break;
> 		case "atDNA":
> 			$test_hdr = $text['atdna_test'];
> 			break;
> 	}
> 	if($wherestr)
> 		$wherestr .= " AND $dna_tests_table.test_type = \"$test_type\"";
> 	else
> 		$wherestr = "WHERE $dna_tests_table.test_type = \"$test_type\"";
> }
> if(!isset($test_group)) $test_group = '';
> if($test_group) {
> 	$admtext['dna_tests'] .= ": " . $test_group;
> 	if($wherestr)
> 		$wherestr .= " AND $dna_tests_table.dna_group = \"$test_group\"";
> 	else
> 		$wherestr = "WHERE $dna_tests_table.dna_group = \"$test_group\"";
> }
> 
> $query = "SELECT testID, test_type, test_number, vendor, $dna_tests_table.gedcom, $dna_tests_table.personID, treename, ydna_haplogroup, mtdna_haplogroup, markers, ydna_confirmed, mtdna_confirmed, person_name, private_dna, private_test, dna_group, dna_group_desc, surnames, MD_ancestorID, MRC_ancestorID
> 	FROM $dna_tests_table $join $trees_table on $dna_tests_table.gedcom = $trees_table.gedcom $wherestr
> 	ORDER BY test_type, CAST(chromosome AS UNSIGNED), CAST(segment_start AS UNSIGNED), CAST(segment_end AS UNSIGNED), dna_group_desc, personID, vendor, test_date  LIMIT $newoffset" . $maxsearchresults;
> $result = tng_query($query);
> 
> $numrows = tng_num_rows( $result );
> 
> if( $numrows == $maxsearchresults || $offsetplus > 1 ) {
> 	if( $tree )
> 		$query = "SELECT count(testID) as tcount FROM $dna_tests_table LEFT JOIN $trees_table on $dna_tests_table.gedcom = $trees_table.gedcom $wherestr";
> 	else
> 		$query = "SELECT count(testID) as tcount FROM $dna_tests_table $wherestr";
> 	$result2 = tng_query($query);
> 	$row = tng_fetch_assoc( $result2 );
> 	$totrows = $row['tcount'];
> }
> else
> 	$totrows = $numrows;
> 
> if(!isset( $offset )) $offset = 0;
> $numrowsplus = $numrows + $offset;
> 
> $treestr = $tree ? " ({$text['tree']}: $tree)" : "";
> $logstring = "<a href=\"$browse_dna_tests_url" . "tree=$tree&amp;offset=$offset&amp;testsearch=$testsearch\">" . xmlcharacters($admtext['dna_tests'].$treestr) . "</a>";
> writelog($logstring);
> preparebookmark($logstring);
> $flags['scripting'] = "<script type=\"text/javascript\">
> //<![CDATA[
> function resetForm() {
> 	if(document.form1.tree) {
> 		document.form1.tree.selectedIndex=0;
> 	}
> 	document.form1.test_type.selectedIndex=0;
> 	document.form1.test_group.selectedIndex=0;
> }
> //]]>
> </script>";
> tng_header( $admtext['dna_tests'], $flags );
> ?>
> 
> <h1 class="header"><span class="headericon" id="dna-hdr-icon"></span><?php echo $test_hdr; ?></h1><br />
> <?php
> echo "<div class=\"normal\">\n";
> ?>
> 
> 	<form action="browse_dna_tests.php" method="post" name="form1" id="form1">
> 	<table class="normal">
> 		<tr>
> 			<td>
> <?php
> 	$numtrees = 1;
> 	if(!$requirelogin || !$treerestrict || !$assignedtree) {
> 		$wherestr = $allow_admin ? "" : "WHERE secret != 2";
> 		$query = "SELECT gedcom, treename FROM $trees_table $wherestr ORDER BY treename";
> 		$treeresult = tng_query($query);
> 		$numtrees = tng_num_rows($treeresult);
> 		if( $numtrees > 1 ) {
> 			$ret = "";
> 			$ret .= "<span class=\"normal\">{$text['tree']}: </span>";
> 			$ret .= "<select name=\"tree\" id=\"treeselect\" onchange=\"jQuery('#treespinner').show();document.form1.submit();\">\n";
> 			$ret .= "<option value=\"-x--all--x-\" ";
> 			if( !$tree ) $ret .= "selected=\"selected\"";
> 			$ret .= ">{$text['alltrees']}</option>\n";
> 
> 			while( $row = tng_fetch_assoc($treeresult) ) {
> 				$ret .= "<option value=\"{$row['gedcom']}\"";
> 				if( $tree && $row['gedcom'] == $tree ) $ret .= " selected=\"selected\"";
> 				$ret .= ">{$row['treename']}</option>\n";
> 			}
> 			$ret .= "</select>\n";
> 			tng_free_result($treeresult);
> 			$ret .= "&nbsp; <img src=\"{$cms['tngpath']}img/spinner.gif\" style=\"display:none;\" id=\"treespinner\" alt=\"\" class=\"spinner\"/>\n";
> 			echo $ret;
> 		}
> 	}
> ?>
> 			</td>
> 			<td>
> 				<?php echo $text['test_type']; ?>:
> 				<select name="test_type" id="test_type" onchange="jQuery('#treespinner2').show();document.form1.test_group.selectedIndex = 0;document.form1.submit();">
> 				<option value=""><?php echo $text['alltypes']; ?></option>
> 				<option value="atDNA"<?php if($test_type == "atDNA") echo " selected"; ?>><?php echo $admtext['atdna_test']; ?></option>
> 				<option value="Y-DNA"<?php if($test_type == "Y-DNA") echo " selected"; ?>><?php echo $admtext['ydna_test']; ?></option>
> 				<option value="mtDNA"<?php if($test_type == "mtDNA") echo " selected"; ?>><?php echo $admtext['mtdna_test']; ?></option>
> 				<option value="X-DNA"<?php if($test_type == "X-DNA") echo " selected"; ?>><?php echo $admtext['xdna_test']; ?></option>
> 				</select>&nbsp;<img src=<?php echo"{$cms['tngpath']}img/spinner.gif"; ?> style="display:none;" id="treespinner2" alt="" class="spinner">&nbsp;&nbsp;&nbsp;
> 			</td>
> 			<td>
> 				<?php echo $text['testgroup']; ?>:
> 				<select name="test_group" id="test_group" onchange="jQuery('#treespinner3').show();document.form1.submit();">
> <?php
> echo get_test_groups($test_type, $test_group);
> ?>
> 				</select>&nbsp;<img src=<?php echo"{$cms['tngpath']}img/spinner.gif"; ?> style="display:none;" id="treespinner3" alt="" class="spinner">&nbsp;&nbsp;&nbsp;
> 				<input type="submit" name="reset" value="<?php echo $text['tng_reset']; ?>" onclick="resetForm();">
> 			<br/>
> 			</td>
> 		</tr>
> 	</table>
> 	</form>
> <?php
> $_SESSION["ttree"] = $tree;
> $_SESSION["ttype"] = $test_type;
> $_SESSION["tgroup"] = $test_group;
> $_SESSION["tsearch"] = $testsearch;
> 
> if( $totrows )
> 	echo "<p><span class=\"normal\">{$text['matches']} $offsetplus {$text['to']} $numrowsplus {$text['of']} $totrows</span></p>";
> 
> $pagenav = get_browseitems_nav( $totrows, $browse_dna_tests_url . "testsearch=$testsearch&amp;offset", $maxsearchresults, $max_browse_test_pages );
> if( $pagenav || $testsearch ) {
> 	echo doTestSearch( 1, $pagenav );
> 	echo "<br />\n";
> }
> 
> $header = "";
> $headerr = $enableminimap ? " data-tablesaw-minimap" : "";
> $headerr .= $enablemodeswitch ? " data-tablesaw-mode-switch" : "";
> 
> ?>
> <script type="text/javascript">
> //<![CDATA[
> function toggleAll( flag ) {
> 	for( var i = 0; i < document.form2.elements.length; i++ ) {
> 		if( document.form2.elements[i].type == "checkbox" ) {
> 			if( flag )
> 				document.form2.elements[i].checked = true;
> 			else
> 				document.form2.elements[i].checked = false;
> 		}
> 	}
> }
> 
> function validateCompare( ) {
> 	var count = 0;
> 	for( var i = 0; i < document.form2.elements.length; i++ ) {
> 		if( document.form2.elements[i].type == "checkbox" ) {
> 			if( document.form2.elements[i].checked )
> 				count++;
> 		}
> 	}
> 	if( count < 2) {
> 		alert("<?php echo $text['comparemore']; ?>");
> 		return false;
> 	}
> 	return true;
> }
> //]]>
> </script>
> <?php if ($test_type && $test_type != "X-DNA") {
> if ($test_type == "Y-DNA") $compare_url = "compare_selected_ydna.php";
> if ($test_type == "atDNA") $compare_url = "compare_selected_atdna.php";
> if ($test_type == "mtDNA") $compare_url = "compare_selected_mtdna.php";
> ?>
> 	<form action="<?php echo $compare_url;?>" method="post" onsubmit="return validateCompare();" name="form2">
> 		<p class="nw">
> 		<input type="button" name="selectall" value="<?php echo $admtext['selectall']; ?>" onClick="toggleAll(1);">
> 		<input type="button" name="clearall" value="<?php echo $admtext['clearall']; ?>" onClick="toggleAll(0);">&nbsp;&nbsp;
> 		<input type="submit" name="cdnaaction" value="<?php echo $text['compareselected']; ?>">&nbsp;&nbsp;
> 		</p>
> <?php
> 	}
> 
> if ($sitever != "standard") {
> 	if ($tabletype == "toggle") {
> 		$header = "<table class=\"tablesaw thfixed whiteback normal resultstable\" data-tablesaw-mode=\"columntoggle\"{$headerr}>\n";
> 	} elseif ($tabletype == "stack") {
> 		$header = "<table class=\"tablesaw thfixed whiteback normal resultstable\" data-tablesaw-mode=\"stack\"{$headerr}>\n";
> 	} elseif ($tabletype == "swipe") {
> 		$header = "<table class=\"tablesaw thfixed whiteback normal resultstable\" data-tablesaw-mode=\"swipe\"{$headerr}>\n";
> 	}
> } else {
> 	$header = "<table class=\"thfixed whiteback normal resultstable\">";
> }
> echo $header;
> ?>
> 	<thead>
> 		<tr>
> 		<th data-tablesaw-priority="persist" class="fieldnameback nbrcol fieldname resultstable">&nbsp;#&nbsp;</th>
> <?php if ($test_type && $test_type != "X-DNA") { ?>
> 		<th data-tablesaw-priority="1" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $admtext['select']; ?>&nbsp;</th>
> <?php
> 	}
> ?>
> 		<th data-tablesaw-priority="1" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $text['test_type']; ?>&nbsp;</th>
> <?php
> 	if( $allow_edit || $showtestnumbers ) { ?>
> 		<th data-tablesaw-priority="2" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $text['test_number']; ?>&nbsp;</th>
> <?php
> 	}
> ?>
> 		<th data-tablesaw-priority="1" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $text['haplogroup']; ?>&nbsp;</th>
> 		<th data-tablesaw-priority="4" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $text['takenby']; ?>&nbsp;</th>
> 		<th data-tablesaw-priority="2" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $admtext['mda']; ?>&nbsp;</th>
> 		<th data-tablesaw-priority="3" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $admtext['mrca']; ?>&nbsp;</th>
> 		<th data-tablesaw-priority="5" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $text['testgroup']; ?>&nbsp;</th>
> 		<?php if( $numtrees > 1 ) { ?><th data-tablesaw-priority="5" class="fieldnameback fieldname resultstable">&nbsp;<?php echo $text['tree']; ?>&nbsp;</th><?php } ?>
> 		</tr>
> 	</thead>
> <?php
> $i = $offsetplus;
> while( $row = tng_fetch_assoc( $result ) )
> {
> 	if ($row['private_test'] && ( $allow_private) || (!$row['private_test'])) {
> 		//	$group = $row['dna_group_desc'] ? $row['dna_group_desc'] : $text['none'];
> 		$query = "SELECT description FROM $dna_groups_table WHERE dna_group=\"{$row['dna_group']}\"";
> 		$descresult = tng_query($query);
> 		$descrow = tng_fetch_assoc( $descresult );
> 		tng_free_result($descresult);
> 		$group = $row['dna_group'] ? $descrow['description'] : $text['none'];
> 
> 		echo "<tr><td style=\"vertical-align: top;\" class=\"databack\">$i</td>\n";
> 		if ($test_type && $test_type != "X-DNA")
> 			echo "<td class=\"databack\" style=\"vertical-align: top; text-align: center;\"><input type=\"checkbox\" name=\"dna{$row['testID']}\" value=\"1\"></td>";
> 		$dash = ($row['test_type'] == "Y-DNA") ? "-" : "";
> 		echo "<td style=\"vertical-align: top;\" class=\"databack\"><a href=\"$show_dna_test_url" . "group=" . urlencode($group) . "&amp;testID={$row['testID']}&amp;tree={$row['gedcom']}\">{$row['test_type']}$dash" . htmlspecialchars($row['markers']) . "</a>&nbsp;</td>";
> 		if ($allow_edit || $showtestnumbers) {
> 			if ($row['private_test'] )
> 				$privtest = "<br />&nbsp;(" . $admtext['text_private'] . ")";
> 			else
> 				$privtest = "";
> 			echo "<td style=\"vertical-align: top;\" class=\"databack\"><a href=\"$show_dna_test_url" . "group=" . urlencode($group) . "&amp;testID={$row['testID']}&amp;tree={$row['gedcom']}\">" . htmlspecialchars($row['test_number']) . "</a>&nbsp;$privtest</td>";
> 		}
> 		$haplogroup = "&nbsp;";
> 		if( $row['ydna_haplogroup'] && $row['test_type'] == "Y-DNA") {
> 			if( $row['ydna_confirmed'] )
> 				$haplogroup = "<span class='confirmed_haplogroup'>" . htmlspecialchars($row['ydna_haplogroup']) . "</span>";
> 			else
> 				$haplogroup = "<span class='predicted_haplogroup'>" . htmlspecialchars($row['ydna_haplogroup']) . "</span>";
> 		}
> 		if( $row['mtdna_haplogroup'] && $row['test_type'] == "mtDNA") {
> 			if( $row['mtdna_confirmed'] )
> 				$haplogroup = "<span class='confirmed_haplogroup'>" . htmlspecialchars($row['mtdna_haplogroup']) . "</span>";
> 			else
> 				$haplogroup = "<span class='predicted_haplogroup'>" . htmlspecialchars($row['mtdna_haplogroup']) . "</span>";
> 		}
> 		if ($row['test_type'] == "atDNA") {
> 			if ($row['ydna_haplogroup'])
> 				$haplogroup = "Y = " . htmlspecialchars($row['ydna_haplogroup']) . "<br />";
> 			if ($row['mtdna_haplogroup']) {
> 				$haplogroup .= "mt = " . htmlspecialchars($row['mtdna_haplogroup']);
> 			}
> 		}
> 		echo "<td style=\"vertical-align: top;\" class=\"databack nw\">&nbsp;$haplogroup</td>";
> 
> 		$dna_pers_result = getPersonDataPlusDates($row['gedcom'], $row['personID']);
> 		$dprow = tng_fetch_assoc($dna_pers_result);
> 		if($dprow) {
> 			$dna_righttree = checktree($dprow['gedcom']);
> 			$dna_rightbranch = $dna_righttree ? checkbranch($dprow['branch']) : false;
> 			$dprights = determineLivingPrivateRights($dprow, $dna_righttree, $dna_rightbranch);
> 			$dprow['allow_living'] = $dprights['living'];
> 			$dprow['allow_private'] = $dprights['private'];
> 			$dbname = getName( $dprow );
> 			$person_name = htmlspecialchars($row['person_name']);
> 			$dna_namestr = getName($dprow);
> 		} else {
> 			$dbname = "";
> 			$person_name = $row['person_name'];
> 			$dna_namestr = "";
> 		}
> 		if ($row['private_dna'] && $allow_edit)
> 			$privacy = "&nbsp;(" . $admtext['text_private'] . ")";
> 		else
> 			$privacy = "";
> 		if ($dbname) {
> 			//$dna_namestr .= " ({$row['personID']})";
> 			if( empty($tree) ) $tree = $dprow['gedcom'];
> 			$placesearch_url = getURL( "placesearch", 1 );
> 			$dprow['birthplace'] = "";
> 			$dprow['altbirthplace'] = "";
> 			$dprow['deathplace'] = "";
> 			$dprow['burialplace'] = "";
> 			$vitalinfo = $dprights['both'] ? getBirthInfo($dprow) : "";
> 			$dna_namestr = "<a href=\"$getperson_url" . "personID={$row['personID']}&tree={$row['gedcom']}\">$dna_namestr</a>$privacy<br />" . str_replace( ', ', '  -', trim(ltrim($vitalinfo,",  ")));
> 		} else
> 			$dna_namestr = $person_name . $privacy;
> 		if ($row['private_dna'] && !$allow_edit) $dna_namestr = $admtext['text_private'];
> 		tng_free_result($dna_pers_result);
> 
> 		//query the links table
> 		$query = "SELECT $dna_links_table.personID, lastname, lnprefix, firstname, birthdate, birthdatetr, altbirthdate, altbirthdatetr, altbirthplace,
> 			deathdate, deathdatetr, burialdate, burialplace,
> 			IF(birthdatetr !='0000-00-00',birthdatetr,altbirthdatetr) as birth,
> 			IF(deathdatetr !='0000-00-00',deathdatetr,burialdatetr) as death,
> 			prefix, suffix, nameorder, title, $dna_links_table.gedcom, branch, living, private
> 			FROM $dna_links_table, $people_table
> 			WHERE testID = \"{$row['testID']}\" AND $dna_links_table.personID = $people_table.personID AND $dna_links_table.gedcom = $people_table.gedcom
> 			ORDER BY birth DESC, lastname, firstname LIMIT $maxsearchresults";
> 		$presult = tng_query($query);
> 		$numrows = tng_num_rows( $presult );
> 		$dnalinktext = "";
> 		$counter = 1;
> 		while( $prow = tng_fetch_assoc( $presult ) ) {
> 			if($prow['personID'] != $row['personID'] || $prow['gedcom'] != $row['gedcom']) {
> 				if( $dnalinktext ) $dnalinktext .= "<br/>\n";
> 				$righttree = checktree($prow['gedcom']);
> 				$rightbranch = $righttree ? checkbranch($prow['branch']) : false;
> 				$rights = determineLivingPrivateRights($prow, $righttree, $rightbranch);
> 				$name = "$counter. ";
> 				if(!$rights['living'])
> 					$name .= $text['living'];
> 				elseif(!$rights['private'])
> 					$name .= $admtext['text_private'];
> 				else {
> 					$prow['allow_living'] = $rights['living'];
> 					$prow['allow_private'] = $rights['private'];
> 					if( empty($tree) ) $tree = $prow['gedcom'];
> 					$placesearch_url = getURL( "placesearch", 1 );
> 					$prow['birthplace'] = "";
> 					$prow['altbirthplace'] = "";
> 					$prow['deathplace'] = "";
> 					$prow['burialplace'] = "";
> 					$vitalinfo = $rights['both'] ? getBirthInfo($prow) : "";
> 					$name .= "<a href=\"$getperson_url" . "personID={$prow['personID']}&amp;tree={$prow['gedcom']}\">" . getName( $prow ) . "</a><br />" . str_replace( ', ', '  -', trim(ltrim($vitalinfo,",  ")));
> 				}
> 				$counter++;
> 				$dnalinktext .= $name;
> 			}
> 		}
> 		tng_free_result($presult);
> 
> 		if($dnalinktext) {
> 			$more = "<a href=\"#\" onclick=\"\$('#more_{$row['testID']}').slideToggle();return false;\" title=\"{$text['moreind']}\"><img src=\"{$cms['tngpath']}img/ArrowDown.gif\" alt=\"{$text['more']}\" /></a> ";
> 			$morediv = "<div style=\"display:none\" id=\"more_{$row['testID']}\"><hr class=\"mtitlehr\"/><strong>{$text['indlinked']}:</strong><br/>$dnalinktext</div>";
> 		}
> 		else
> 			$more = $morediv = "";
> 
> 		echo "<td style=\"vertical-align: top;\" class=\"databack\">$more$dna_namestr&nbsp;$morediv</td>";
> 		$mdanc_namestr = "";
> 		if($row['MD_ancestorID']) {
> 			$dna_anc_result = getPersonDataPlusDates($row['gedcom'], $row['MD_ancestorID']);
> 			$ancrow = tng_fetch_assoc($dna_anc_result);
> 			if( $ancrow ) {
> 				if( empty($tree) ) $tree = $ancrow['gedcom'];
> 				$placesearch_url = getURL( "placesearch", 1 );
> 				$ancrow['birthplace'] = "";
> 				$ancrow['altbirthplace'] = "";
> 				$ancrow['deathplace'] = "";
> 				$ancrow['burialplace'] = "";
> 				$dna_righttree = checktree($ancrow['gedcom']);
> 				$dna_rightbranch = $dna_righttree ? checkbranch($ancrow['branch']) : false;
> 				$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
> 				$ancrow['allow_living'] = $dprights['living'];
> 				$ancrow['allow_private'] = $dprights['private'];
> 				$vitalinfo = getBirthInfo($ancrow);
> 				$anc_namestr = getName( $ancrow );
> 				$mdanc_namestr = "<a href=\"$getperson_url" . "personID={$row['MD_ancestorID']}&tree={$row['gedcom']}\">$anc_namestr</a>" . "<br />" . str_replace( ', ', '  -', trim(ltrim($vitalinfo,",  ")));
> 			}
> 
> 			tng_free_result($dna_anc_result);
> 		}
> 		$mrcanc_namestr = "";
> 		if($row['MRC_ancestorID']) {
> 			if ($row['MRC_ancestorID'][0] == "I") {
> 				$dna_anc_result = getPersonDataPlusDates($row['gedcom'], $row['MRC_ancestorID']);
> 				$ancrow = tng_fetch_assoc($dna_anc_result);
> 				if( $ancrow ) {
> 					if( empty($tree) ) $tree = $ancrow['gedcom'];
> 					$placesearch_url = getURL( "placesearch", 1 );
> 					$ancrow['birthplace'] = "";
> 					$ancrow['altbirthplace'] = "";
> 					$ancrow['deathplace'] = "";
> 					$ancrow['burialplace'] = "";
> 					$dna_righttree = checktree($ancrow['gedcom']);
> 					$dna_rightbranch = $dna_righttree ? checkbranch($ancrow['branch']) : false;
> 					$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
> 					$ancrow['allow_living'] = $dprights['living'];
> 					$ancrow['allow_private'] = $dprights['private'];
> 					$vitalinfo = getBirthInfo($ancrow);
> 					$anc_namestr = getName( $ancrow );
> 					$mrcanc_namestr = "<a href=\"$getperson_url" . "personID={$row['MRC_ancestorID']}&tree={$row['gedcom']}\">$anc_namestr</a>" . "<br />" . str_replace( ', ', '  -', trim(ltrim($vitalinfo,",  ")));
> 				}
> 				tng_free_result($dna_anc_result);
> 			}
> 			else if ($row['MRC_ancestorID'][0] == "F") {
> 				$mrcquery = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$row['MRC_ancestorID']}\" AND gedcom = \"{$row['gedcom']}\"";
> 				$mrcresult = tng_query($mrcquery);
> 				$famrow = tng_fetch_assoc($mrcresult);
> 				tng_free_result($mrcresult);
> 
> 				if( $famrow ) {
> 					$righttree = checktree($famrow['gedcom']);
> 					$rightbranch = checkbranch($famrow['branch']);
> 					$rights = determineLivingPrivateRights($famrow, $righttree, $rightbranch);
> 					$famrow['allow_living'] = $rights['living'];
> 					$famrow['allow_private'] = $rights['private'];
> 
> 					$famname = getFamilyName( $famrow );
> 					$fammarried = "<br />&nbsp;&nbsp;<strong>{$text['marrabbr']}</strong>&nbsp;" . $famrow['marrdate'];
> 					$mrcanc_namestr = "<a href=\"$familygroup_url" . "familyID={$row['MRC_ancestorID']}&tree={$row['gedcom']}\">$famname</a>" .$fammarried ;
> 				}
> 			}
> 		}
> 		echo "<td style=\"vertical-align: top;\" class=\"databack\">&nbsp;$mdanc_namestr</td>";
> 		echo "<td style=\"vertical-align: top;\" class=\"databack\">&nbsp;$mrcanc_namestr</td>";
> 		echo "<td style=\"vertical-align: top;\" class=\"databack\">$group</td>";
> 		if( $numtrees > 1 )
> 			echo "<td style=\"vertical-align: top;\" class=\"databack nw\"><a href=\"$showtree_url" . "tree={$row['gedcom']}\">{$row['treename']}</a>&nbsp;</td>";
> 		echo "</tr>\n";
> 		$i++;
> 	}
> }
> tng_free_result($result);
> ?>
> 	</table>
> <?php
> if ($test_type && $test_type != "X-DNA") {
> ?>
> </form>
> <?php }?>
> <br />
> </div>
> <?php
> if( $pagenav || $testsearch )
> 	echo doTestSearch( 2, $pagenav ) . "<br />\n";
> 
> tng_footer( "" );
> ?>
diff -r TNG/browsemedia.php TNG1403/browsemedia.php
21c21,24
< $orgmediatypeID = $mediatypeID;
---
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
> 
> if( !isset($mediatypeID) ) $mediatypeID = "";
22a26,28
> if(array_search($mediatypeID, array_column($mediatypes, 'mediatypeID')) === false)
> 	$mediatypeID = '';
> $orgmediatypeID = $mediatypeID;
29c35
< 	$titlestr = $text[$mediatypeID] ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
---
> 	$titlestr = !empty($text[$mediatypeID]) ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
38a45
> 	$hsfields = $hsjoin = "";
42c49
< if( $mediasearch ) {
---
> if( !empty($mediasearch) ) {
45,51c52,53
< 	if (get_magic_quotes_gpc() == 0)
< 		$mediasearch2 = addslashes($mediasearch);
< 	else {
< 		$mediasearch2 = $mediasearch;
< 		$mediasearch = stripslashes($mediasearch);
< 	}
< 	$mediasearch = cleanIt($mediasearch);
---
> 	$mediasearch2 = addslashes(cleanIt($mediasearch));
> 	$mediasearch = cleanIt(stripslashes($mediasearch));
53c55
< else
---
> else {
54a57,58
> 	$mediasearch = "";
> }
55a60
> if( !isset($tnggallery) ) $tnggallery = 0;
58d62
< 	if( !$tngconfig['thumbcols'] ) $tngconfig['thumbcols'] = 10;
83a88
> if( !isset($offset) ) $offset = 0;
104c109
< $query = "SELECT $media_table.mediaID, $media_table.description, $media_table.notes, path, thumbpath, alwayson, usecollfolder, form, mediatypeID, status, plot, newwindow, abspath, $media_table.gedcom $hsfields FROM $media_table";
---
> $query = "SELECT $media_table.mediaID, $media_table.description, $media_table.notes, path, thumbpath, alwayson, usecollfolder, form, mediatypeID, status, plot, newwindow, private, abspath, owner, datetaken, placetaken, $media_table.latitude as mlat, $media_table.longitude as mlong, $media_table.gedcom $hsfields FROM $media_table";
174c179,182
< 	$header .= "<th data-tablesaw-priority=\"3\" class=\"fieldnameback fieldname\">&nbsp;{$text['indlinked']}&nbsp;</th>\n";
---
> 	else {
> 		$header .= "<th data-tablesaw-priority=\"3\" class=\"fieldnameback fieldname\">&nbsp;{$text['info']}&nbsp;</th>\n";
> 	}
> 	$header .= "<th data-tablesaw-priority=\"3\" class=\"fieldnameback fieldname\" style=\"min-width:240px\">&nbsp;{$text['indlinked']}&nbsp;</th>\n";
176c184
< 	$tablewidth = " width=\"100%\"";
---
> 	$tablewidth = " style=\"width:100%\"";
184c192
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" $tablewidth class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n" . $header;
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" $tablewidth class=\"tablesaw whiteback thfixed normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n" . $header;
186c194
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" $tablewidth class=\"whiteback normal\">\n" . $header;
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" $tablewidth class=\"whiteback thfixed normal\">\n" . $header;
203,204c211,212
< 		$families_table.living as fliving, $families_table.private as fprivate, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder,
< 		$medialinks_table.gedcom, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID, reponame, deathdate, burialdate, linktype
---
> 		$families_table.living as fliving, $families_table.private as fprivate, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder, people.title as title,
> 		$medialinks_table.gedcom, $sources_table.title as stitle, $sources_table.sourceID, $repositories_table.repoID, reponame, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, burialdate, linktype
215c223
< 	$foundprivate = 0;
---
> 	$foundprivate = $row['private'] && !$allow_private; //if the image is flagged as private, it starts off that way
217,218c225,226
< 	while( $prow = tng_fetch_assoc( $presult ) )
< 	{
---
> 	$citelinks = array();
> 	while( $prow = tng_fetch_assoc( $presult ) ) {
228,230c236,240
< 			$prow2 = tng_fetch_assoc( $presult2 );
< 			if( $prow2['ccount'] ) $prow['living'] = 1;
< 			tng_free_result( $presult2 );
---
> 			if($presult2) {
> 				$prow2 = tng_fetch_assoc( $presult2 );
> 				if( $prow2['ccount'] ) $prow['living'] = 1;
> 				tng_free_result( $presult2 );
> 			}
237,239c247,251
< 			$prow2 = tng_fetch_assoc( $presult2 );
< 			if( $prow2['ccount'] ) $prow['living'] = 1;
< 			tng_free_result( $presult2 );
---
> 			if($presult2) {
> 				$prow2 = tng_fetch_assoc( $presult2 );
> 				if( $prow2['ccount'] ) $prow['living'] = 1;
> 				tng_free_result( $presult2 );
> 			}
264c276
< 				$sourcetext = $prow['title'] ? $text['source'] . ": " . $prow['title'] : $text['source'] . ": " . $prow['sourceID'];
---
> 				$sourcetext = $prow['stitle'] ? $text['source'] . ": " . $prow['stitle'] : $text['source'] . ": " . $prow['sourceID'];
272a285,319
> 			elseif( !$prow['linktype'] || $prow['linktype'] == "C") {
> 				$query = "SELECT persfamID, sourceID, gedcom from $citations_table WHERE citationID = \"{$prow['personID']}\"";
> 				$cresult = tng_query($query);
> 				if($cresult) {
> 					$crow = tng_fetch_assoc($cresult);
> 					if($crow) {
> 						$persfamID = $crow['persfamID'];
> 						if(!in_array($persfamID, $citelinks)) {
> 							$citelinks[] = $persfamID;
> 							if(substr($persfamID,0,1) == $tngconfig['personprefix'] || substr($persfamID,-1) == $tngconfig['personsuffix']) {
> 								$medialinktext .= "<li><a href=\"$getperson_url" . "personID=$persfamID&amp;tree={$crow['gedcom']}\">";
> 								$presult2 = getPersonSimple($prow['gedcom'],$persfamID);
> 								if($presult2) {
> 									$cprow = tng_fetch_assoc($presult2);
> 									$cprights = determineLivingPrivateRights($cprow);
> 									$cprow['allow_living'] = $cprights['living'];
> 									$cprow['allow_private'] = $cprights['private'];
> 									$medialinktext .= getName( $cprow );
> 									tng_free_result($presult2);
> 								}
> 							}
> 							elseif(substr($persfamID,0,1) == $tngconfig['familyprefix'] || substr($persfamID,-1) == $tngconfig['familysuffix']) {
> 								$presult2 = getFamilyData($prow['gedcom'],$persfamID);
> 								if($presult2) {
> 									$famrow = tng_fetch_assoc($presult2);
> 									$familyname = getFamilyName($famrow);
> 									$medialinktext .= "<li><a href=\"$familygroup_url" . "familyID=$persfamID&amp;tree={$crow['gedcom']}\">{$text['family']}: $familyname";
> 									tng_free_result($presult2);
> 								}
> 							}
> 						}
> 					}
> 					tng_free_result($cresult);
> 				}
> 			}
281c328
< 				$event = $erow['display'] && is_numeric($prow['eventID']) ? getEventDisplay( $erow['display'] ) : ($admtext[$prow['eventID']] ? $admtext[$prow['eventID']] : $prow['eventID']);
---
> 				$event = !empty($erow['display']) && is_numeric($prow['eventID']) ? getEventDisplay( $erow['display'] ) : (!empty($admtext[$prow['eventID']]) ? $admtext[$prow['eventID']] : $prow['eventID']);
285c332
< 			$medialinktext .= "</a>$hstext\n</li>\n";
---
> 			if($medialinktext) $medialinktext .= "</a>$hstext\n</li>\n";
290c337,339
< 	$showPhotoInfo = $row['allow_living'] = $row['alwayson'] || (!$foundprivate && !$foundliving);
---
> 	$row['allow_living'] = !$foundliving || $row['alwayson'];
> 	$row['allow_private'] = !$foundprivate || $row['alwayson'];
> 	$showPhotoInfo = $row['allow_living'] && $row['allow_private'];
314,315c363,364
< 	if( $row['allow_living'] ) {
< 		$description = $showPhotoInfo ? "<a href=\"$href\">{$row['description']}</a>" : $row['description'];
---
> 	if( $row['allow_living'] && $row['allow_private'] ) {
> 		$description = $showPhotoInfo ? "<a href=\"$href\" class=\"media-title\">{$row['description']}</a>" : "<span class=\"media-title\">{$row['description']}</span>";
340c389
< 		$mediatext .= "<tr><td valign=\"top\" class=\"databack\">$i</td>";
---
> 		$mediatext .= "<tr class=\"media-row\"><td valign=\"top\" class=\"databack\">$i</td>";
344c393
< 			if($href && $row['allow_living']) {
---
> 			if($href && $row['allow_living'] && $row['allow_private']) {
353c402
< 			$mediatext .= "</td><td valign=\"top\" class=\"databack\">";
---
> 			$mediatext .= "</td><td valign=\"top\" class=\"databack\" style=\"position:relative\">";
356,357c405,406
< 		else
< 			$mediatext .= "<td valign=\"top\" class=\"databack\" align=\"center\">&nbsp;</td><td valign=\"top\" class=\"databack\">";
---
> 		else 
> 			$mediatext .= "<td valign=\"top\" class=\"databack\" align=\"center\" style=\"position:relative\">&nbsp;</td><td valign=\"top\" class=\"databack\">";
359c408,410
< 		$mediatext .= "$description<br/>$notes&nbsp;</td>";
---
> 		$mediatext .= "$description<br/>$notes\n";
> 		if( $allow_admin && $allow_media_edit )
> 			$mediatext .= "<div class=\"media-edit\"><a href=\"admin_editmedia.php?mediaID={$row['mediaID']}&amp;cw=1\" target=\"blank\"><img src=\"img/tng_edit2.gif\"/></a></div></div></td>";
363c414,416
< 			$mediatext .= "<td valign=\"top\" class=\"databack\" width=\"30%\"><a href=\"$showmap_url" . "cemeteryID={$row['cemeteryID']}\">{$row['cemname']}</a>$plotstr&nbsp;</td>";
---
> 			$mediatext .= "<td valign=\"top\" class=\"databack\"><a href=\"$showmap_url" . "cemeteryID={$row['cemeteryID']}\">{$row['cemname']}</a>$plotstr&nbsp;<br/>\n";
> 			if(!empty($row['mlat']) || !empty($row['mlong'])) $mediatext .= "{$row['mlat']}, {$row['mlong']}<br/>\n";
> 			$mediatext .= "</td>";
365c418,427
< 			$mediatext .= "<td valign=\"top\" class=\"databack\" width=\"30%\">\n";
---
> 			$mediatext .= "<td valign=\"top\" class=\"databack\">\n";
> 		}
> 		else {
> 			$mediatext .= "<td valign=\"top\" class=\"databack\" style=\"width:250px\">\n";
> 			if(!empty($row['owner'])) $mediatext .= "{$text['photoowner']}: {$row['owner']}<br/>\n";
> 			if(!empty($row['datetaken'])) $mediatext .= "{$text['date']}: {$row['datetaken']}<br/>\n";
> 			if(!empty($row['placetaken'])) $mediatext .= "{$text['place']}: {$row['placetaken']}<br/>\n";
> 			if(!empty($row['mlat']) || !empty($row['mlong'])) $mediatext .= "{$row['mlat']}, {$row['mlong']}<br/>\n";
> 			$mediatext .= "</td>\n";
> 			$mediatext .= "<td valign=\"top\" class=\"databack\" style=\"width:175px\">\n";
367,368d428
< 		else
< 			$mediatext .= "<td valign=\"top\" class=\"databack\" width=\"175\">\n";
399a460,471
> ?>
> <script type="text/javascript">
> 	jQuery(document).ready(function() {
> 		jQuery('.media-row').on('mouseover',function(e) {
> 			jQuery(this).find('.media-edit').show();
> 		});
> 		jQuery('.media-row').on('mouseout',function(e) {
> 			jQuery(this).find('.media-edit').hide();
> 		});
> 	});
> </script>
> <?php
diff -r TNG/browsenotes.php TNG1403/browsenotes.php
29a30
> if( !isset($offset) ) $offset = 0;
34a36
> 	$offset = 0;
44c46,47
< if(!$allow_private) $wherestr .= " AND $notelinks_table.secret != \"1\"";
---
> if(!$allow_private_notes) $wherestr .= " AND $notelinks_table.secret != \"1\"";
> if( !isset($notesearch) ) $notesearch = "";
46,52c49,54
< 	if (get_magic_quotes_gpc() == 0)
< 		$notesearch2 = addslashes($notesearch);
< 	else {
< 		$notesearch2 = $notesearch;
< 		$notesearch = stripslashes($notesearch);
< 	}
< 	$notesearch = cleanIt($notesearch);
---
> 	$notesearch = cleanIt(stripslashes($notesearch));
> 	$notesearch2 = "";
> 	$new_str = explode(" ", $notesearch);
>     foreach($new_str as $value) {
>         $notesearch2 .= '+' . $value . ' ';
>     }
54,55c56
< 	$wherestr .= $wherestr ? " AND" : "WHERE";
< 	$wherestr .= " match($xnotes_table.note) against( \"{$notesearch2}*\" in boolean mode)";
---
> 	$wherestr .= " AND match($xnotes_table.note) against( \"{$notesearch2}*\" in boolean mode)";
58c59
< $query = "SELECT $xnotes_table.ID as ID, $xnotes_table.note as note, $notelinks_table.persfamID as personID, $xnotes_table.gedcom as gedcom
---
> $query = "SELECT $xnotes_table.ID as ID, $xnotes_table.note as note, $notelinks_table.persfamID as personID, $xnotes_table.gedcom as gedcom, secret
83c84
< $treestr = $tree ? " ($text[tree]: $tree)" : "";
---
> $treestr = $tree ? " ({$text['tree']}: $tree)" : "";
108c109
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
110c111
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback normal\">";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\">";
126,128c127,128
< 	$noneliving = 1;
< 	$noneprivate = 1;
< 	$query2=$query;
---
> 	$noneliving = $noneprivate = $noneprivatenotes = 1;
> 	$query2 = $query;
130,131d129
< 	if($nrow['secret'])
< 		$nrow['private'] = 1;
153a152
> 			$row2['allow_private_notes'] = $nrights['private_notes'];
155d153
< 			if(!$row2['allow_private']) $noneprivate = 0;
156a155,156
> 			if(!$row2['allow_private']) $noneprivate = 0;
> 			if(!$row2['allow_private_notes'] && $nrow['secret'] == 1) $noneprivatenotes = 0;
158c158
< 			$notelinktext .= "<a href=\"getperson.php?personID={$row2['personID']}&tree={$row2['gedcom']}\">" . getNameRev($row2) . " ({$row2['personID']})</a>\n<br/>\n";
---
> 			$notelinktext .= "<a href=\"{$getperson_url}personID={$row2['personID']}&amp;tree={$row2['gedcom']}\" target='_blank'>" . getNameRev($row2) . "</a> ({$row2['personID']})\n<br/>\n";
170a171
> 			$row2['allow_private_notes'] = $nrights['private_notes'];
172d172
< 			if(!$row2['allow_private']) $noneprivate = 0;
173a174,175
> 			if(!$row2['allow_private']) $noneprivate = 0;
> 			if(!$row2['allow_private_notes'] && $nrow['secret'] == 1) $noneprivatenotes = 0;
175c177
<  			$notelinktext .= "<a href=\"familygroup.php?familyID={$row2['familyID']}&tree={$row2['gedcom']}\" target='_blank'>{$text['family']} {$row2['familyID']}</a>\n<br/>\n";
---
>  			$notelinktext .= "<a href=\"{$familygroup_url}familyID={$row2['familyID']}&amp;tree={$row2['gedcom']}\" target='_blank'>{$text['family']}: " . getFamilyName( $row2 ) . "</a> ({$row2['familyID']})\n<br/>\n";
185c187
< 			$notelinktext .= "<a href=\"showsource.php?sourceID={$row2['sourceID']}&tree={$row2['gedcom']}\" target='_blank'>{$text['source']} $sourcetext ({$row2['sourceID']})</a>\n<br/>\n";
---
> 			$notelinktext .= "<a href=\"{$showsource_url}sourceID={$row2['sourceID']}&amp;tree={$row2['gedcom']}\" target='_blank'>{$text['source']}</a> ({$row2['sourceID']})\n<br/>\n";
195c197
< 			$notelinktext .= "<a href=\"showrepo.php?repoID={$row2['repoID']}&tree={$row2['gedcom']}\" target='_blank'>{$text['repository']} $sourcetext ({$row2['repoID']})</a>\n<br/>\n";
---
> 			$notelinktext .= "<a href=\"showrepo.php?repoID={$row2['repoID']}&amp;tree={$row2['gedcom']}\" target='_blank'>{$text['repository']}</a> ({$row2['repoID']})\n<br/>\n";
202c204
< 	if( $noneliving && $noneprivate )
---
> 	if( $noneliving && $noneprivate && $noneprivatenotes )
diff -r TNG/browserepos.php TNG1403/browserepos.php
27a28
> if( !isset($offset) ) $offset = 0;
38c39
< $reposearch = trim($reposearch);
---
> $reposearch = isset($reposearch) ? cleanIt(trim($reposearch)) : "";
100c101
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"columntoggle\"{$headerr}>\n";
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"columntoggle\"{$headerr}>\n";
102c103
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"stack\"{$headerr}>\n";
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"stack\"{$headerr}>\n";
104c105
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"swipe\"{$headerr}>\n";
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"swipe\"{$headerr}>\n";
107c108
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback normal\">";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\">";
116c117
< 		<?php if( $numtrees > 1 ) { ?><th data-tablesaw-priority="3" class="fieldnameback">&nbsp;<?php echo $text['tree']; ?>&nbsp;</th><?php } ?>
---
> 		<?php if( $numtrees > 1 ) { ?><th data-tablesaw-priority="3" class="fieldnameback fieldname">&nbsp;<?php echo $text['tree']; ?>&nbsp;</th><?php } ?>
diff -r TNG/browsesources.php TNG1403/browsesources.php
29a30
> if( !isset($offset) ) $offset = 0;
40c41
< $sourcesearch = trim($sourcesearch);
---
> $sourcesearch = isset($sourcesearch) ? cleanIt(trim($sourcesearch)) : "";
102c103
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"columntoggle\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"tablesaw thfixed whiteback\" data-tablesaw-mode=\"columntoggle\"" . $headerr;
104c105
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"stack\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"tablesaw thfixed whiteback\" data-tablesaw-mode=\"stack\"" . $headerr;
106c107
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"swipe\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"tablesaw thfixed whiteback\" data-tablesaw-mode=\"swipe\"" . $headerr;
109c110
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback\">\n" . $header;
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback\">\n" . $header;
116c117
< 		<th data-tablesaw-priority="1" class="fieldnameback nw"><span class="fieldname">&nbsp;<?php echo $text['title'] . ", " . $text['author']; ?>&nbsp;</span></th>
---
> 		<th data-tablesaw-priority="1" class="fieldnameback nw"><span class="fieldname">&nbsp;<?php echo $text['title2'] . ", " . $text['author']; ?>&nbsp;</span></th>
diff -r TNG/browsetrees-old.php TNG1403/browsetrees-old.php
18c18
< 	$str .= "<input type=\"text\" name=\"treesearch\" value=\"$treesearch\"> <input type=\"submit\" value=\"$text[search]\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
---
> 	$str .= "<input type=\"text\" name=\"treesearch\" value=\"$treesearch\"> <input type=\"submit\" value=\"{$text['search']}\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
84c84
< 	echo "<td valign=\"top\" class=\"databack\"><span class=\"normal\"><a href=\"$showtree_url" . "tree=$row[gedcom]\">{$row['treename']}</a>&nbsp;</span></td>";
---
> 	echo "<td valign=\"top\" class=\"databack\"><span class=\"normal\"><a href=\"$showtree_url" . "tree={$row['gedcom']}\">{$row['treename']}</a>&nbsp;</span></td>";
diff -r TNG/browsetrees.php TNG1403/browsetrees.php
30a31
> if( !isset($offset) ) $offset = 0;
40a42,43
> if( !isset($treesearch) ) $treesearch = "";
> 
89c92
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
91c94
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback normal\">";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\">";
107c110
< 	$trees = explode(',',$_SESSION['availabletrees']);
---
> 	$trees = isset($_SESSION['availabletrees']) ? explode(',',$_SESSION['availabletrees']) : [];
145c148
< 			echo "<a href=\"$switchtree_url" . "newtree={$row['gedcom']}&ret={$homepage}\">{$text['switch']}</a>";
---
> 			echo "<a href=\"$switchtree_url" . "newtree={$row['gedcom']}&amp;ret={$homepage}\">{$text['switch']}</a>";
Only in TNG1403: cache-begin.php
Only in TNG1403: cache-delete.php
Only in TNG1403: cache-end.php
diff -r TNG/calendar.php TNG1403/calendar.php
4c4
<  * http://www.tngforum.us/index.php?showtopic=779
---
>  * https://tng.community/index.php?showtopic=779
19a20,27
> if( !isset($living) ) $living = "";
> if( !isset($hide) ) $hide = "";
> if( !isset($tree) ) $tree = "";
> if( !isset($m) ) $m = "";
> if( !isset($year) ) $year = "";
> if( !isset($_GET['m']) ) $_GET['m'] = "";
> if( !isset($_GET['y']) ) $_GET['y'] = "";
> 
30,32c38,41
< $flags['scripting'] = "<link href=\"{$cms['tngpath']}css/calendar.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
< $flags['scripting'] .= "
< <script language=\"javascript\">\n
---
> $flags['css'] = "<link href=\"{$cms['tngpath']}css/calendar.css?v=" . (filemtime($rootpath."css/calendar.css")) . "\" rel=\"stylesheet\" type=\"text/css\" />\n";
> $flags['scripting'] = "
> <script type=\"text/javascript\">\n
> //<![CDATA[\n
35a45
> //]]>\n
50c60
< $current = getdate(time());
---
> $current = getdate(time()+ ( 3600 * $time_offset ));
97c107
< $sql = "SELECT personID, gedcom, firstname, nickname, lnprefix, lastname, suffix, living, branch, private, " . implode (', ', $select) . "
---
> $sql = "SELECT personID, gedcom, firstname, nickname, lnprefix, lastname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, living, branch, private, " . implode (', ', $select) . "
113a124,125
> $sql .= " ORDER BY lastname, lnprefix, firstname";
> 
179c191
< $sql = "SELECT familyID, gedcom, husband, wife, living, private, " . implode (', ', $select) . "
---
> $sql = "SELECT familyID, gedcom, husband, wife, living, private, branch, gedcom, " . implode (', ', $select) . "
277c289
< 		if ($row['persfamID']{0} == 'I') {
---
> 		if ($row['persfamID'][0] == 'I') {
301c313
< 		} elseif ($row['persfamID']{0} == 'F') {
---
> 		} elseif ($row['persfamID'][0] == 'F') {
475c487
< <div id="calLegend" class="rounded10">
---
> <div id="calLegend" class="rounded10 databack">
498c510
< 				$text[$row['tag'] . 'date'] = $row['display'];
---
> 				$text[$row['tag'] . 'date'] = getEventDisplay($row['display']);
506d517
< 			$class = 'hidden';
510d520
< 			$class = 'nothidden';
517c527
< 		echo '<li class="flat nw"><a href="' . $args . '" class="' . $class . '" id="cal_' . $key . '">' . $checkbox . '<img src="' . $cms['tngpath'] . 'img/' . $val . '" class="calIcon" alt="" />' . $text[$key . 'date'] . '</a></li>' . "\n";
---
> 		echo '<li class="flat nw"><a href="' . $args . '" class="nothidden" id="cal_' . $key . '">' . $checkbox . '<img src="' . $cms['tngpath'] . 'img/' . $val . '" class="calIcon" alt="" />' . $text[$key . 'date'] . '</a></li>' . "\n";
diff -r TNG/cemeteries.php TNG1403/cemeteries.php
26c26
< $flags['scripting'] = "<link href=\"{$cms['tngpath']}css/cemeteries.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
---
> $flags['css'] = "<link href=\"{$cms['tngpath']}css/cemeteries.css?v=" . (filemtime($rootpath."css/cemeteries.css")) . "\" rel=\"stylesheet\" type=\"text/css\" />\n";
35c35
< function toggleSection(key) {
---
> function toggleCemSection(key) {
101c101
< 							echo "<div class=\"pad3\"><img src=\"" . $cms['tngpath'] . "img/tng_expand.gif\" class=\"expandicon\" title='{$text['expand']}' id='plusminus$divname' onclick=\"return toggleSection('$divname');\" alt=\"\" />\n<a href=\"$headstones_url" . "country=" . urlencode($cemetery['country']) . "&amp;state=" . urlencode($cemetery['state']) . "&amp;county=" . urlencode($cemetery['county']). "&amp;city=" . urlencode($cemetery['city']) . "&amp;tree=$tree\">$txt</a></div>\n";
---
> 							echo "<div class=\"pad3\"><img src=\"" . $cms['tngpath'] . "img/tng_expand.gif\" class=\"expandicon\" title='{$text['expand']}' id='plusminus$divname' onclick=\"return toggleCemSection('$divname');\" alt=\"\" />\n<a href=\"$headstones_url" . "country=" . urlencode($cemetery['country']) . "&amp;state=" . urlencode($cemetery['state']) . "&amp;county=" . urlencode($cemetery['county']). "&amp;city=" . urlencode($cemetery['city']) . "&amp;tree=$tree\">$txt</a></div>\n";
126,127c126,127
<                 	$txt = $cemetery['county'] ? @htmlspecialchars($cemetery['county'], ENT_QUOTES, $session_charset) : $text['nocounty'];
< 					echo "<div class=\"pad3\"><img src=\"" . $cms['tngpath'] . "img/tng_expand.gif\" class=\"expandicon\" title='{$text['expand']}' id='plusminus$divname' onclick=\"return toggleSection('$divname');\" alt=\"\" />\n<a href=\"$headstones_url" . "country=" . urlencode($cemetery['country']) . "&amp;state=" . urlencode($cemetery['state']) . "&amp;county=" . urlencode($cemetery['county']). "&amp;tree=$tree\">$txt</a></div>\n";
---
>                 	$txt = $cemetery['county'] ? $cemetery['county'] : $text['nocounty'];
> 					echo "<div class=\"pad3\"><img src=\"" . $cms['tngpath'] . "img/tng_expand.gif\" class=\"expandicon\" title='{$text['expand']}' id='plusminus$divname' onclick=\"return toggleCemSection('$divname');\" alt=\"\" />\n<a href=\"$headstones_url" . "country=" . urlencode($cemetery['country']) . "&amp;state=" . urlencode($cemetery['state']) . "&amp;county=" . urlencode($cemetery['county']). "&amp;tree=$tree\">$txt</a></div>\n";
147c147
< 			$txt = $cemetery['state'] ? @htmlspecialchars($cemetery['state'], ENT_QUOTES, $session_charset) : $text['nostate'];
---
> 			$txt = $cemetery['state'] ? $cemetery['state'] : $text['nostate'];
diff -r TNG/changelanguage.php TNG1403/changelanguage.php
5c5
< if($cms['events']){include('cmsevents.php'); cms_register();}
---
> if(!empty($cms['events'])){include('cmsevents.php'); cms_register();}
7,8c7,8
< $currentuser = $_SESSION['currentuser'];
< $currentuserdesc = $_SESSION['currentuserdesc'];
---
> $currentuser = isset($_SESSION['currentuser']) ? $_SESSION['currentuser'] : "";
> $currentuserdesc = isset($_SESSION['currentuserdesc']) ? $_SESSION['currentuserdesc'] : "";
22,23c22
< 	$str .= getFORM( "savelanguage", "post", "", "" );
< 	echo "$str";
---
> 	echo getFORM( "savelanguage", "post", "", "" );
29c28
< 		if( $row['folder'] == $mylanguage )
---
> 		if( $languages_path . $row['folder'] == $mylanguage )
diff -r TNG/checklogin.php TNG1403/checklogin.php
4,5c4,5
< 	$currentuser = $_SESSION['currentuser'];
< 	$currentuserdesc = $_SESSION['currentuserdesc'];
---
> 	$currentuser = isset($_SESSION['currentuser']) ? $_SESSION['currentuser'] : '';
> 	$currentuserdesc = isset($_SESSION['currentuserdesc']) ? $_SESSION['currentuserdesc'] : '';
48a49
> 		$allow_private_notes = $_SESSION['allow_private_notes'];
68a70
> 			$allow_private_notes = 1;
74a77,82
> 			if(!$rootpath) {
> 				$rootpath = dirname(__FILE__) . "/";
> 				if (preg_match("/WIN/i",PHP_OS)) {
> 				    $rootpath = str_replace("\\","/",$rootpath);
> 				}
> 			}
81c89
< 				$protocol = $_SERVER['HTTPS'] && $_SERVER['HTTPS'] != "off" ? "https://" : "http://";
---
> 				$protocol = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != "off" ? "https://" : "http://";
117a126
>         		$allow_private_notes = 0;
130,143c139,153
< 		$_SESSION['allow_admin'] = $allow_admin;
< 		$_SESSION['allow_edit'] = $allow_edit;
< 		$_SESSION['allow_add'] = $allow_add;
< 		$_SESSION['tentative_edit'] = $tentative_edit;
< 		$_SESSION['allow_delete'] = $allow_delete;
< 		$_SESSION['allow_media_edit'] = $allow_media_edit;
< 		$_SESSION['allow_media_add'] = $allow_media_add;
< 		$_SESSION['allow_media_delete'] = $allow_media_delete;
< 		$_SESSION['allow_living'] = $allow_living;
< 		$_SESSION['allow_private'] = $allow_private;
< 		$_SESSION['allow_ged'] = $allow_ged;
< 		$_SESSION['allow_pdf'] = $allow_pdf;
< 		$_SESSION['allow_lds'] = $allow_lds;
< 		$_SESSION['allow_profile'] = $allow_profile;
---
> 		$_SESSION['allow_admin'] = isset($allow_admin) ? $allow_admin : 0;
> 		$_SESSION['allow_edit'] = isset($allow_edit) ? $allow_edit : 0;
> 		$_SESSION['allow_add'] = isset($allow_add) ? $allow_add : 0;
> 		$_SESSION['tentative_edit'] = isset($tentative_edit) ? $tentative_edit : 0;
> 		$_SESSION['allow_delete'] = isset($allow_delete) ? $allow_delete : 0;
> 		$_SESSION['allow_media_edit'] = isset($allow_media_edit) ? $allow_media_edit : 0;
> 		$_SESSION['allow_media_add'] = isset($allow_media_add) ? $allow_media_add : 0;
> 		$_SESSION['allow_media_delete'] = isset($allow_media_delete) ? $allow_media_delete : 0;
> 		$_SESSION['allow_living'] = isset($allow_living) ? $allow_living : 0;
> 		$_SESSION['allow_private'] = isset($allow_private) ? $allow_private : 0;
> 		$_SESSION['allow_private_notes'] = isset($allow_private_notes) ? $allow_private_notes : 0;
> 		$_SESSION['allow_ged'] = isset($allow_ged) ? $allow_ged : 0;
> 		$_SESSION['allow_pdf'] = isset($allow_pdf) ? $allow_pdf : 0;
> 		$_SESSION['allow_lds'] = isset($allow_lds) ? $allow_lds : 1;
> 		$_SESSION['allow_profile'] = isset($allow_profile) ? $allow_profile : 0;
Only in TNG1403/classes: mmtabs.inc
diff -r TNG/classes/modbase.class.php TNG1403/classes/modbase.class.php
1c1
< <?php
---
> <?php /*//220926 18:52*/
5,6d4
<    Class is extended by modparser.
< 
15,16c13,15
<    Methods:
<       No public methods
---
>    Public Methods:
>       get_modfile_names
>       get_modlist_sorted
19,110c18,19
< class modbase {
< 
<    // GENERAL FLAGS
<    const YES = "1";
<    const NO = "0";
< 
<    const NOERR       =  0;
<    const ERROR       = -1;
<    const WARNING     = -2;
< 
<    // PARSE TABLE FLAGS
<    const FLAG_OPTIONAL     = '@';
<    const FLAG_NOFOUL       = '^';
<    const FLAG_PROTECTED    = '~';
< 
<    // BUFFER STATUS FLAGS
<    const BYPASS   = '1';
<    const NOFILE   = '2';
<    const NOWRITE  = '3';
<    const ISEMPTY  = '4';
<    const NOFOUL   = '5';
< 
<    // FILE STATE FLAGS
<    const NOPATH = "-1";
<    const NOMODS = "1";
< 
<    // MOD LIST SORT FLAGS
<    const NAMECOL = "0";
<    const FILECOL = "1";
< 
<    // MOD LIST FILTER FLAGS
<    const F_ALL = 0;
<    const F_READY = 1;
<    const F_INSTALLED = 2;
<    const F_CLEAN = 3;
<    const F_BADCFG = 4;
<    const F_SELECT = 5;
< 
<    // MOD OPERATION FLAGS
<    const INSTALL = 1;
<    const REMOVE = 2;
<    const DELETE = 3;
<    const CLEANUP = 4;
<    const EDITP = 5;
<    const UPDATEP = 6;
<    const RESTOREP = 7;
< 
<    // PATH CONSTRUCTION FLAGS
<    const ROOT_DIR    = 0;
<    const MODS_DIR    = 1;
< 
<    // LANGUAGE INDEXES
<    const BADVERSION  = 'badversion';
<    const BOMFOUND    = 'bomfound';
<    const CANTDEL     = 'cantdel';
<    const CANTINST    = 'cantinst';
<    const CANTPROC    = 'cantproc';
<    const CANTUPD     = 'cantupd';
<    const DEFVAL      = 'defval';
<    const EMPTYFILE   = 'emptyfile';
<    const ERRORS      = 'errors';
<    const FILEDEL     = 'filedel';
<    const FILEPERMS   = 'fileperms';
<    const FORMAT      = 'format';
<    const INSTALLED   = 'installed';
<    const LINE        = 'line';
<    const MISSFILE    = 'missfile';
<    const MISSING     = 'missing';
<    const MODREM      = 'modrem';
<    const NOACCESS    = 'noaccess';
<    const NOACT       = 'noact';
<    const NOCFGFILE   = 'nocfgfile';
<    const NOCOMPS     = 'nocomps';
<    const NODESC      = 'nodesc';
<    const NOEND       = 'noend';
<    const NOLOCATION  = 'nolocation';
<    const NOPARAM     = 'noparam';
<    const NOSOURCE    = 'srcfilemissing';
<    const NOTARGET    = 'notarget';
<    const NOTWRITE    = 'notwrite';
<    const NOTINST     = 'notinst';
<    const OK2INST     = 'ok2inst';
<    const PARTINST    = 'partinst';
<    const REQTAG      = 'reqtag';
<    const TAGNOTERM   = 'tagnoterm';
<    const TAGUNK      = 'tagunk';
<    const UNXEND      = 'unxend';
<    const UPDATED     = 'updated';
< 
< /*
<    const YES = "1";
<    const NO = "0";
---
> /* File management */
> $modbase_version = '14.0.0.0 220718-0929';
112,151c21
<    const NOERR       =  0;
<    const ERROR       = -1;
<    const WARNING     = -2;
< 
<    // flags
<    const FLAG_OPTIONAL     = '@';
<    const FLAG_NOFOUL       = '^';
<    const FLAG_PROTECTED    = '~';
< 
<    // file buffer return states
<    const BYPASS   = '1';
<    const NOFILE   = '2';
<    const NOWRITE  = '3';
<    const ISEMPTY  = '4';
<    const NOFOUL   = '5';
< 
<    const NOPATH = "-1";
<    const NOMODS = "1";
< 
<    // sorting
<    const NAMECOL = "0";
<    const FILECOL = "1";
< 
<    // paths
<    const ROOT_DIR    = 0;
<    const MODS_DIR    = 1;
< 
<    // values used for mod_status and logging
<    const ERRORS      = 'errors';
<    const CANTDEL     = 'cantdel';
<    const CANTINST    = 'cantinst';
<    const CANTPROC    = 'cantproc';
<    const FILEDEL     = 'filedel';
<    const CANTUPD     = 'cantupd';
<    const INSTALLED   = 'installed';
<    const MODREM      = 'modrem';
<    const NOTINST     = 'notinst';
<    const OK2INST     = 'ok2inst';
<    const UPDATED     = 'updated';
< */
---
> class modbase {
153,206c23,24
<    protected $enventlog = null;
<    protected $eventlog = '';
<    protected $num_errors = 0;
<    protected $provisional_errors = 0;
< 
<    // initializers
<    protected $rootpath = '';
<    protected $subroot ='';
<    protected $extspath = '';
<    protected $modspath = '';
<    protected $modname = '';
<    protected $version = '';
<    protected $tng_version = '';
<    protected $int_version = 0;
<    protected $time_offset = 0;
<    protected $sitever = 'standard';
<    protected $currentuserdesc = '';
<    protected $admtext = array();
< 
<    // options
<    public    $sortby = 0;
<    protected $modlogfile = 'modmgrlog.txt';
<    protected $maxloglines = 2000;
<    protected $delete_partial = false;
<    protected $delete_installed = false;
<    protected $show_affected_files = true;
<    protected $show_AFnewfile = true;
<    protected $show_AFfilecopies = true;
< 
<    protected $fix_header = 1;
<    protected $use_striping = false;
<    protected $stripe_after = 3;
<    protected $log_full_path = true;
<    protected $wikibase = "https://tng.lythgoes.net/wiki/index.php?title=";
< 
<    // batch processing
<    protected $batch_error = false;
< 
< 	function __construct( $objinits ) {
< 
<       // copy init values to data area
<       foreach( $objinits as $key => $value ) {
<          if( $key == 'options' ) {
<             foreach( $value as $option => $ovalue ) {
<                $this->$option = $ovalue;
<             }
<          }
<          else {
<             $this->$key = $value;
<          }
<          // if visitor is mobile don't use fixed headers
<          if( $this->sitever == 'mobile' ) $this->fix_header = 0;
<       }
<       $this->int_version = $this->version2integer( $this->tng_version );
---
>   const YES = "1";
>   const NO = "0";
208,209c26,172
<       if( !empty( $this->admtext['error'] ) ) {
<          $this->admtext['error'] = "<span class=\"msgerror\"><strong>{$this->admtext['error']}</strong></span>";
---
>   const NOERR       =  0;
>   const ERROR       = -1;
>   const WARNING     = -2;
> 
>   /* Parse table flags */
>   const FLAG_OPTIONAL     = '@';
>   const FLAG_NOFOUL       = '^';
>   const FLAG_PROVISIONAL  = '^';
>   const FLAG_PROTECTED    = '~';
> 
>   /* File buffer status flags */
>   const BYPASS   = '1';
>   const NOFILE   = '2';
>   const NOWRITE  = '3';
>   const ISEMPTY  = '4';
>   const NOFOUL   = '5';
>   const PROVISIONAL = '5';
> 
>   /* File state flags */
>   const NOPATH = "-1";
>   const NOREAD = "-2";
>   const NOMODS =  "1";
> 
>   /* Mod Listing sort flags */
>   const NAMECOL = "0";
>   const FILECOL = "1";
> 
>   /* Mod listing filter flags */
>   const F_ALL = 0;
>   const F_READY = 1;
>   const F_INSTALLED = 2;
>   const F_CLEAN = 3;
>   const F_BADCFG = 4;
>   const F_SELECT = 5;
> 
>   /* Mod operation flags */
>   const INSTALL = 1;
>   const REMOVE = 2;
>   const DELETE = 3;
>   const CLEANUP = 4;
>   const EDITP = 5;
>   const UPDATEP = 6;
>   const RESTOREP = 7;
> 
>   /* Path construction flags */
>   const ROOT_DIR    = 0;
>   const MODS_DIR    = 1;
> 
>   /* Language indexes $into admtext. */
>   const BADVERSION  = 'badversion';
>   const BOMFOUND    = 'bomfound';
>   const CANTDEL     = 'cantdel';
>   const CANTINST    = 'cantinst';
>   const CANTPROC    = 'cantproc';
>   const CANTUPD     = 'cantupd';
>   const DEFVAL      = 'defval';
>   const EMPTYFILE   = 'emptyfile';
>   const ERRORS      = 'errors';
>   const FILEDEL     = 'filedel';
>   const FILEPERMS   = 'fileperms';
>   const FORMAT      = 'format';
>   const INSTALLED   = 'installed';
>   const LINE        = 'line';
>   const MISSFILE    = 'missfile';
>   const MISSING     = 'missing';
>   const MODREM      = 'modrem';
>   const NOACCESS    = 'noaccess';
>   const NOACT       = 'noact';
>   const NOCFGFILE   = 'nocfgfile';
>   const NOCOMPS     = 'nocomps';
>   const NODESC      = 'nodesc';
>   const NOEND       = 'noend';
>   const NOLOCATION  = 'nolocation';
>   const NOPARAM     = 'noparam';
>   const NOSOURCE    = 'srcfilemissing';
>   const NOTARGET    = 'notarget';
>   const NOTWRITE    = 'notwrite';
>   const NOTINST     = 'notinst';
>   const OK2INST     = 'ok2inst';
>   const PARTINST    = 'partinst';
>   const REQTAG      = 'reqtag';
>   const TAGNOTERM   = 'tagnoterm';
>   const TAGUNK      = 'tagunk';
>   const UNXEND      = 'unxend';
>   const UPDATED     = 'updated';
> 
>   protected $eventlog = '';
>   protected $num_errors = 0;
>   protected $provisional_errors = 0;
> 
>   /* Initializers from modobjinits.php */
>   protected $rootpath = '';
>   protected $subroot ='';
>   protected $extspath = '';
>   protected $modspath = '';
>   protected $modname = '';
>   protected $version = '';
>   protected $tng_version = '';
>   protected $int_version = 0;
>   protected $time_offset = 0;
>   protected $sitever = 'standard';
>   protected $currentuserdesc = '';
>   protected $admtext = array();
>   protected $tngdomain = '';
> 
>   protected $sysmsg = '';
> 
>   /* Options */
>   protected $sortby = 0;
>   protected $modlogfile = 'modmgrlog.txt';
>   protected $maxloglines = 2000;
>   protected $delete_partial = false;
>   protected $delete_installed = false;
>   protected $show_affected_files = true;
>   protected $show_AFnewfile = true;
>   protected $show_AFfilecopies = true;
>   protected $delete_support = 0;
>   protected $show_updates = 0;
>   protected $show_developer = 0;
>   protected $show_analyzeractions = 0;
>   protected $show_analyzer = 0;
>   protected $compress_names = 0;
>   protected $redirect2log = 0;
>   protected $compress_log = 0;
> 
>   protected $fix_header = 1;
>   protected $use_striping = false;
>   protected $stripe_after = 3;
>   protected $log_full_path = true;
>   protected $wikibase = "https://tng.lythgoes.net/wiki/index.php?title=";
> 
>   protected $cfgpath = '';
>   protected $cfgfile = '';
> 
>   protected $batch_error = false;
> 
>   function __construct( $objinits )
>   {
>     /* copy init values to data area. */
>     foreach( $objinits as $key => $value )
>     {
>       if( $key == 'options' )
>       {
>         foreach( $value as $option => $ovalue )
>         {
>            $this->$option = $ovalue;
>         }
211,212c174,176
<       if( !empty( $this->admtext['okay']) ) {
<          $this->admtext['okay'] = "<span class=\"msgapproved\"><strong>{$this->admtext['okay']}</strong></span>";
---
>       else
>       {
>         $this->$key = $value;
214c178,194
< 	} // __construct
---
> 
>       /* If visitor is mobile don't use fixed headers. */
>       if( $this->sitever == 'mobile' ) $this->fix_header = 0;
>     }
> 
>     $this->int_version = $this->version2integer( $this->tng_version );
> 
>     if( !empty( $this->admtext['error'] ) )
>     {
>        $this->admtext['error'] = "<span class=\"msgerror\"><strong>{$this->admtext['error']}</strong></span>";
>     }
>     if( !empty( $this->admtext['okay']) )
>     {
>        $this->admtext['okay'] = "<span class=\"msgapproved\"><strong>{$this->admtext['okay']}</strong></span>";
>     }
> 
>   } // __construct
218,247c198,241
<    protected function fix_eol( $buffer )	{
<       return preg_replace( "#(?:\r\n|\r\r\n|[\r\n])#", "\r\n", $buffer );
<    }
< 
<    // remove spaces or tabs in from of CRLF that might prevent target match
<    protected function remove_hidden_whitespace ( $buffer ) {
<       return preg_replace( "#[ \t]*\r\n#", "\r\n", $buffer );
<    }
< 
<    protected function read_file_buffer( $filepath, $flag='' ) {
<       $buffer = '';
< 
<       // UNCOMMENT NEXT LINE TO USE RELATIVE PATHS FOR FILE READS
<       //$filepath = str_replace( $this->rootpath, '', $filepath );
< 
<       // FILEPATH DOES NOT EXIST
<       if( !file_exists( $filepath ) ) {
< //echo __FILE__,__LINE__,$filepath,$flag;exit;
<          if( $flag == self::FLAG_OPTIONAL ) {
<             return self::BYPASS;
<          }
<          elseif( $flag == self::FLAG_NOFOUL ) {
<             $this->provisional_errors++;
<             return self::NOFOUL;
<          }
<          // FLAG_PROTECTED ONLY APPLIES TO FILE COPIES - NO NEED TO ACT HERE
<          else {
<             $this->num_errors++;
<             return self::NOFILE;
<          }
---
>   protected function fix_eol( $buffer )
>   {
>     return preg_replace( "#(?:\r\n|\r\r\n|[\r\n])#", "\r\n", $buffer );
>   }
> 
>   /* Remove spaces or tabs immediately in front of CRLF that might prevent
>   ** target match. */
>   protected function remove_hidden_whitespace ( $buffer )
>   {
>     return preg_replace( "#[ \t]*\r\n#", "\r\n", $buffer );
>   }
> 
>   protected function read_file_buffer( $filepath, $flag='' )
>   {
>     $buffer = '';
>     $retval = '';
> 
>     // UNCOMMENT NEXT LINE TO USE RELATIVE PATHS FOR FILE READS
>     //$filepath = str_replace( $this->rootpath, '', $filepath );
> 
>     while(true)
>     {
>       /* File does not exist. */
>       if( !file_exists( $filepath ) )
>       {
>         if( $flag == self::FLAG_OPTIONAL )
>         {
>           $retval = self::BYPASS;
>           break;
>         }
>         elseif( $flag == self::FLAG_PROVISIONAL )
>         {
>           $this->provisional_errors++;
>           $retval = self::PROVISIONAL;
>           break;
>         }
> 
>         /* "Protected" flag only applies to file copies - no need to act here. */
>         else
>         {
>           $this->num_errors++;
>           $retval = self::NOFILE;
>           break;
>         }
249c243,244
<       // TARGET FILE PATH IS NOT WRITABLE
---
> 
>       /* Target file path is not writable. */
251,253c246,250
<       if( $ext != 'cfg' && !is_writable( $filepath ) ) {
<             $this->num_errors++;
<             return self::NOWRITE;
---
>       if( $ext != 'cfg' && !is_writable( $filepath ) )
>       {
>         $this->num_errors++;
>         $retval = self::NOWRITE;
>         break;
259c256
<       $buffer = $this->fix_eol( file_get_contents( $filepath ) );
---
>       $buffer = $this->fix_eol( file_get_contents( $filepath, false ) );
264,283c261,290
<       if( empty( $buffer ) ) {
<          $this->num_errors++;
<          return self::ISEMPTY;
<       }
< 
<       // GOOD BUFFER
<       return $buffer;
<    } // GET FILE BUFFER
< 
<    protected function write_file_buffer( $filepath, $buffer ) {
< 
<       // UNCOMMENT NEXT LINE TO USE RELATIVE PATHS FOR FILE WRITES
<       //$filepath = str_replace( $this->rootpath, '', $filepath );
< 
<       $fp = fopen( $filepath, 'wb' );
<    	if( !$fp ) {                ;
<    		$_SESSION['err_msg'] = "{$this->admtext['checkwrite']} {$this->admtext['cannotopen']} $filepath ";
<    		return false;
<       }
<    	flock( $fp, LOCK_EX );
---
>       if( empty( $buffer ) )
>       {
>         $this->num_errors++;
>         $retval = self::ISEMPTY;
>         break;
>       }
>       break;
>     } // while(true)
> 
>     if( !empty( $retval ) ) $buffer = $retval;
>     return $buffer;
> 
>   } // read_file_buffer()
> 
>   protected function write_file_buffer( $filepath, $buffer )
>   {
>     /* Uncomment next line to use relative paths for file writes. */
>     //$filepath = str_replace( $this->rootpath, '', $filepath );
> 
>     if( !file_exists( dirname( $filepath ) ) )
>     {
>       return false;
>     }
>     $fp = fopen( $filepath, 'wb' );
>     if( !$fp )
>     {                ;
>       $_SESSION['err_msg'] = "{$this->admtext['checkwrite']} {$this->admtext['cannotopen']} $filepath ";
>       return false;
>     }
>       flock( $fp, LOCK_EX );
285,286c292,293
<    	flock( $fp, LOCK_UN );
<    	fclose( $fp );
---
>       flock( $fp, LOCK_UN );
>       fclose( $fp );
288c295
<    }
---
>   }
292,375c299,387
<    protected function add_logevent( $string ) {
<       $this->eventlog .= "<br />&nbsp;&nbsp;&nbsp;&nbsp;*&nbsp;".$string;
<    }
< 
<    private function create_logfile() {
<       $rootpath = $this->rootpath;
< 
<       $content = "#### Mod Manager Log ".date ("D d M Y h:i:s A", time() + ( 3600 * $this->time_offset ) )." ####";
<       return $this->write_file_buffer( $this->modlogfile, $content );
<    }
< 
<    // begin logging for new event
<    protected function new_logevent( $string ) {
< 
<       // get elements for enhanced header line
<       $datetime = date( "D d M Y h:i:s A", time() + ( 3600 * $this->time_offset ) );
<       if( $this->classID == 'installer' )
<          $operation = "<span class=\"msgbold\">{$this->admtext['install']}</span>";
<       elseif( $this->classID == 'remover' )
<          $operation = "<span class=\"msgbold\">{$this->admtext['uninstall']}</span>";
<       elseif( $this->classID == 'cleaner')
<          $operation = "<span class=\"msgbold\">{$this->admtext['cleanup']}</span>";
<       elseif( $this->classID == 'editor' )
<          $operation = "<span class=\"msgbold\">{$this->admtext['edparams']}</span>";
<       elseif( $this->classID == 'deleter' )
<          $operation = "<span class=\"msgbold\">{$this->admtext['delete']}</span>";
<       else
<          $operation = '';
< 
<       $modname = $this->modname;
<       $modversion = $this->version;
< 
<       $this->eventlog = $datetime.' | '.$operation.' | '.$modname.' '.$modversion.' | zzzxxzzz | '.$this->currentuserdesc.' xxxzzxxx';
<       $this->add_logevent( $string );
<    }
< 
< 
<    protected function write_eventlog( $error=false ) {
<       $mod_status = $this->mod_status;
<       $hlight = empty( $error ) ? ' highlight' : ' hilighterr';
< 
<       // if log file is missing start a new one
<       if( !file_exists( $this->modlogfile ) ) {
<          if( !$this->create_logfile() ) {
<             $_SESSION['err_msg'] = "{$this->admtext['checkwrite']} {$this->admtext['cantwrite']} $this->modlogfile !";
<             unset( $this->eventlog );
<             return false;
<          }
<       }
< 
<       // import existing log lines
<    	$lines = file( $this->modlogfile );
< 
<       // add dynamic results to event log
<       $modstat1 = "<span class=\"msgbold$hlight\">{$this->admtext[$mod_status]}</span>";
<       $modstat2 = " <span class=\"hidden\">$mod_status</span>";
< 
<       $this->eventlog = str_replace( "zzzxxzzz", $modstat1, $this->eventlog );
<       $this->eventlog = str_replace( "xxxzzxxx", $modstat2, $this->eventlog );
< 
<       // add new event log lines to $lines array
<    	array_unshift( $lines, $this->eventlog."\n" );
< 
<    	$fp = @fopen( $this->modlogfile, "w" );
<    	if( !$fp ) {
<    		$_SESSION['err_msg'] = "{$this->admtext['checkwrite']} {$this->admtext['cannotopen']} $this->modlogfile ";
<          unset( $this->eventlog );
<    		return false;
< 	   }
< 
<    	flock( $fp, LOCK_EX );
<    	$linecount = 0;
<    	foreach ( $lines as $line ) {
<    		trim( $line );
<    		if( $line )
<    			fwrite( $fp, $line );
<    		$linecount++;
<    		if( $linecount == $this->maxloglines ) break;
<    	}
<    	flock( $fp, LOCK_UN );
<    	fclose( $fp );
<       unset( $this->eventlog );
<       return;
<    }
---
>   protected function add_logevent( $string )
>   {
>     $this->eventlog .= "<br />&nbsp;&nbsp;&nbsp;&nbsp;*&nbsp;".$string;
>   }
> 
>  private function create_logfile()
>  {
>     $rootpath = $this->rootpath;
> 
>     $content = "#### Mod Manager Log ".date ("D d M Y h:i:s A", time() + ( 3600 * $this->time_offset ) )." ####";
>     return $this->write_file_buffer( $this->modlogfile, $content );
>  }
> 
>   /* Begin the logging for new event. */
>   protected function new_logevent( $string )
>   {
>     /* Get elements for enhanced header line. */
>     $datetime = date( "D d M Y h:i:s A", time() + ( 3600 * $this->time_offset ) );
>     if( $this->classID == 'installer' )
>        $operation = "<span class=\"msgbold\">{$this->admtext['install']}</span>";
>     elseif( $this->classID == 'remover' )
>        $operation = "<span class=\"msgbold\">{$this->admtext['uninstall']}</span>";
>     elseif( $this->classID == 'cleaner')
>        $operation = "<span class=\"msgbold\">{$this->admtext['cleanup']}</span>";
>     elseif( $this->classID == 'editor' )
>        $operation = "<span class=\"msgbold\">{$this->admtext['edparams']}</span>";
>     elseif( $this->classID == 'deleter' )
>        $operation = "<span class=\"msgbold\">{$this->admtext['delete']}</span>";
>     else
>        $operation = '';
> 
>     $modname = $this->modname;
>     $modversion = $this->version;
> 
>     $this->eventlog = $datetime.' | '.$operation.' | '.$modname.' '.$modversion.' | zzzxxzzz | '.$this->currentuserdesc.' xxxzzxxx';
>     $this->add_logevent( $string );
>   }
> 
>   protected function write_eventlog( $error=false )
>   {
>     $mod_status = $this->mod_status;
>     $hlight = empty( $error ) ? ' highlight' : ' hilighterr';
> 
>     // if log file is missing start a new one
>     if( !file_exists( $this->modlogfile ) )
>     {
>        if( !$this->create_logfile() )
>        {
>           $_SESSION['err_msg'] = "{$this->admtext['checkwrite']} {$this->admtext['cantwrite']} $this->modlogfile !";
>           unset( $this->eventlog );
>           return false;
>        }
>     }
> 
>     /* Import existing log lines. */
>    $lines = file( $this->modlogfile );
> 
>     /* Add dynamic results to event log. */
>     $modstat1 = "<span class=\"msgbold$hlight\">{$this->admtext[$mod_status]}</span>";
>     $modstat2 = " <span class=\"hidden\">$mod_status</span>";
> 
>     $this->eventlog = str_replace( "zzzxxzzz", $modstat1, $this->eventlog );
>     $this->eventlog = str_replace( "xxxzzxxx", $modstat2, $this->eventlog );
> 
>     /* Add new event log lines to $lines array. */
>     array_unshift( $lines, $this->eventlog."\n" );
> 
>     $fp = @fopen( $this->modlogfile, "w" );
>     if( !$fp )
>     {
>      $_SESSION['err_msg'] = "{$this->admtext['checkwrite']} {$this->admtext['cannotopen']} $this->modlogfile ";
>        unset( $this->eventlog );
>      return false;
>     }
> 
>     $linecount = 0;
>     foreach ( $lines as $line )
>     {
>       trim( $line );
>       if( $line )
>         fwrite( $fp, $line );
>       $linecount++;
>       if( $linecount == $this->maxloglines ) break;
>     }
>     flock( $fp, LOCK_UN );
>     fclose( $fp );
>     unset( $this->eventlog );
>     return;
>   }
379,400c391,442
<    public function get_modfile_names() {
<       $fileNames = array();
< 
<       if( $handle = opendir($this->modspath ) ) {
<          while( false !== ( $file = readdir( $handle ) ) ) {
<             if( pathinfo( $file, PATHINFO_EXTENSION ) == 'cfg' ) {
<                $fileNames[] = $file;
<             }
<          }
<          closedir( $handle );
<          sort( $fileNames );
<       }
<       return $fileNames;
<    }
< 
<    // returns file names (no path) as array indexes and mod name as array values
<    public function get_modlist_sorted() {
< //echo __LINE__,' ';print_r( $this->sortby);exit;
<       $mod_list = array();
< 
<       if( !is_dir( $this->modspath ) ) {
<          return self::NOPATH;
---
>   public function verify_modspath( $modspath )
>   {
>         /* Return reason for not finding mod names */
>     if( !is_dir( $modspath ) ) return self::NOPATH;
>     if(!is_readable($modspath)) return self::NOREAD;
>     if( count(scandir($modspath)) == 2 ) return self::NOMODS;
>   }
> 
>   public function get_modfile_names()
>   {
>     $modspath = $this->verify_modspath( $this->modspath );
>     if( is_numeric( $modspath ) )
>     {
>       return $modspath;
>     }
> 
>     $fileNames = array();
> 
>     if( $handle = opendir($this->modspath ) )
>     {
>       while( false !== ( $file = readdir( $handle ) ) )
>       {
>         if( pathinfo( $file, PATHINFO_EXTENSION ) == 'cfg' )
>         {
>           $fileNames[] = $file;
>         }
>       }
>       closedir( $handle );
>       natcasesort( $fileNames );
>     }
>     return $fileNames;
>   }
> 
>   /* Returns file names (no path) as array indexes and mod name as array values. */
>   public function get_modlist_sorted()
>   {
>     /* Get file list -- look up names & add to list. */
>     $modfiles = $this->get_modfile_names();
> 
>     /* A returned integer indicates an empty list with a notable condition */
>     if( is_numeric( $modfiles ) ) return $modfiles;
> 
>     $mod_list = array();
>     foreach( $modfiles as $modfile )
>     {
>       $contents = $this->read_file_buffer( $this->rootpath . $this->modspath . '/'.$modfile );
> 
>       /* Handle file access errors, if any. */
>       if( is_numeric( $contents ) )
>       {
>         $mod_list[$modfile] = $this->admtext['noaccess'];
>         continue;
402,403c444
<       // get file list -- look up names & add to list
<       $modfiles = $this->get_modfile_names();
---
>       preg_match('#.*%name:([^%]*).*#s', $contents, $matches);
405,449c446,450
<       foreach( $modfiles as $modfile ) {
<          $contents = $this->read_file_buffer( $this->rootpath . $this->modspath . '/'.$modfile );
< 
<          // HANDLE FILE ACCESS ERRORS IF ANY
<          if( is_numeric( $contents ) ) {
<             $mod_list[$modfile] = $this->admtext['no access'];
<             continue;
<          }
<          preg_match('#.*%name:([^%]*).*#s', $contents, $matches);
<          if( isset( $matches[1] ) )
<             $mod_list[$modfile] = trim( $matches[1] );
<          else
<             $mod_list[$modfile] = '';
<       }
<       if( !count( $mod_list ) ) {
<          return self::NOMODS;
<       }
<       // Natrually sorted by file name - resort by mod name
<       if( $this->sortby == self::NAMECOL ) {
<          // use temporary array because we can't actually change file name
<          $temp = array_map('strtolower', $mod_list);
< 
<          array_multisort( $temp, SORT_ASC, SORT_STRING, $mod_list );
<       }
<       return $mod_list;
<    }
< 
<    // construct full paths for each file
<    protected function resolve_file_path( $path, $relative = self::ROOT_DIR ) {
< //echo __LINE__;print_r($path);exit;
<       // leading slash unnecesary - all paths relative to tng root
<       $path = ltrim( $path, "/" );
< 
<       // set path for TNG config files
<       if( in_array( $path, $this->configs ) ) {
<             return $this->subroot.$path;
<       }
<       elseif ( $relative == self::MODS_DIR ) {
<          $path = $this->resolve_path_vars( $path );
<          return $this->rootpath.$this->modspath.'/'.$path;
<       }
<       else {
<          return $this->rootpath.$this->resolve_path_vars( $path );
<       }
<    }
---
>       if( isset( $matches[1] ) )
>         $mod_list[$modfile] = trim( $matches[1] );
>       else
>         $mod_list[$modfile] = '';
>     }
451,455c452,596
<    protected function resolve_path_vars( $str ) {
<       $str = str_replace( '$modspath', $this->modspath, $str );
<       $str = str_replace( '$extspath', $this->extspath, $str );
<       return $str;
<    }
---
>     if( !count( $mod_list ) )
>     {
>        return self::NOMODS;
>     }
> 
>     /* Natrually sorted by file name - re-sort by mod name. */
>     if( $this->sortby == self::NAMECOL )
>     {
>       /* Use temporary array because we can't actually change file name. */
>       $temp = array_map('strtolower', $mod_list);
>       array_multisort( $temp, SORT_ASC, SORT_STRING, $mod_list );
>     }
>     return $mod_list;
>   }
> 
>   // construct full paths for each file
>   protected function resolve_file_path( $path, $relative = self::ROOT_DIR )
>   {
>     /* Leading slash unnecesary - all paths relative to tng root. */
>     $path = ltrim( $path, " /" );
>     /* set path for TNG config files. */
>     if( in_array( $path, $this->configs ) )
>     {
>       return $this->subroot.$path;
>     }
>     elseif ( $relative == self::MODS_DIR )
>     {
>       $path = $this->resolve_path_vars( $path );
>       return $this->rootpath.$this->modspath.'/'.$path;
>     }
>     else
>     {
>        return $this->rootpath.$this->resolve_path_vars( $path );
>     }
>   }
> 
>   protected function resolve_path_vars( $str )
>   {
>     $str = str_replace( '$modspath', $this->modspath, $str );
>     $str = str_replace( '$extspath', $this->extspath, $str );
>     return $str;
>   }
> 
> 
> /***************************************************************
>   DATA
> ***************************************************************/
>   /* These are TNG files that will be found together at $subroot.
>   ** Important to know if modifying one of them. */
>   protected $configs = array(
>     'config.php',
>     'customconfig.php',
>     'importconfig.php',
>     'logconfig.php',
>     'mapconfig.php',
>     'pedconfig.php',
>     'mmconfig.php'
>   );
> 
>     /* Associative array of directives and their processing functions.
>     **
>     ** The table index is directive name and the value is the associated
>     ** function name. Within each class the functions must be PRIVATE
>     ** to avoid name clash with other classes.
>     **
>     ** $proclist['description'] will return the function name '_description'.
>     ** $proclist[$dirpack] will return the function name for $dirpack.
>     **
>     ** PHP allows a variable to be executed as a function, so $var($arg1, $arg2) will
>     ** execute the function name contained in $var using arguments $arg1 and $arg2.
>     ** This is how the Mod Classes will call the functions named in the table.
>     **
>     ** Editing directive which have 'before' and 'after' modifiers are listed here, but
>     ** are pointed to the basic file_editor function.  For example insert:before
>     ** just points to the '_insert' function which handles both before and after.
>     **
>     ** Directives with 'no_op' for the processing function are not processed
>     ** by modparser derived classes, so technically, they do not need to
>     ** have an associted functions in those classes. However mod parser checks
>     ** this table to confirm that these directives are valid for Mod Manager.
>     **
>     ** Just for readability, the table directive entries should be maintained in
>     ** alphabetical order.
> 
>     ** To add a new directive to Mod Manager, start with an entry here, then create
>     ** the necessary functions for it in the modparser-extended classes.
>     */
>   protected $proclist = array(
>     'author'            => '_author',
>     'copyfile'          => '_copyfile',
>     'copyfile2'         => '_copyfile',
>     'desc'              => '_desc',
>     'description'       => '_description',
>     'end'               => 'no_op',
>     'fileend'           => 'no_op',
>     'fileexists'        => '_fileexists',
>     'fileoptional'      => 'no_op',
>     'files'             => 'no_op',
>     'fileversion'       => 'no_op',
>     'goto'              => '_goto',
>     'insert'            => '_insert',
>     'insert:before'     => '_insert',
>     'insert:after'      => '_insert',
>     'label'             => '_label',
>     'location'          => '_location',
>     'mkdir'             => '_mkdir',
>     'name'              => '_name',
>     'newfile'           => '_newfile',
>     'note'              => '_note',
>     'parameter'         => '_parameter',
>     'private'           => '_private',
>     'replace'           => '_replace',
>     'target'            => '_target',
>     'tngversion'        => '_tngversion',
>     'textexists'        => '_textexists',
>     'triminsert'        => '_triminsert',
>     'triminsert:before' => '_triminsert',
>     'triminsert:after'  => '_triminsert',
>     'trimreplace'       => '_trimreplace',
>     'version'           => '_version',
>     'vinsert'           => '_vinsert',
>     'vinsert:before'    => '_vinsert',
>     'vinsert:after'     => '_vinsert',
>     'wikipage'          => '_wikipage'
>   );
> 
>   /*
>   ** This is a list of directives that modify file content.
>   ** Modparser uses the short versions (insert, triminsert) and the parse table and
>   ** other classes use the long versions (insert:after, triminsert:before) so both
>   ** are listed.
>   */
>   protected $file_modifiers = array(
>     'insert',
>     'insert:before',
>     'insert:after',
>     'triminsert',
>     'triminsert:before',
>     'triminsert:after',
>     'vinsert',
>     'vinsert:before',
>     'vinsert:after',
>     'replace',
>     'trimreplace'
>   );
460,464c601,628
<    protected function version2integer( $version ){
<       // 4-digit integer from string version for comparisons
<       $int_version = str_replace( ".", "", $version );
<       return (int)str_pad( $int_version, 4, "0", STR_PAD_RIGHT );
<    }
---
>   protected function version2integer( $version )
>   {
>     // 4-digit integer from string version for comparisons
>     //$int_version = str_replace( ".", "", $version );
> 
>     /* A string like 121beta will produce 121 not 1210 because it must only contain
>     three or less characters to be padded.  This means alpha characters must be
>     removed prior to padding, or a different function must be used. */
>     $int_version = preg_replace("#[^0-9]#","",$version);
> 
>     $int_version ='';
>     for( $i=0; isset($version[$i]); $i++ )
>     {
>       if( is_numeric($version[$i]) || $version[$i] == '.' )
>       {
>         if( $version[$i] == '.' ) continue;
>         $int_version .= $version[$i];
>       }
>       else
>       {
>         break;
>       }
>     }
> 
>     /* Next line added to handle TNG beta version numbers correctly. */
>     $int_version = substr( $int_version, 0, 4 );
>     return (int)str_pad( $int_version, 4, "0", STR_PAD_RIGHT );
>   }
466c630
< } // CLASS
---
> } // modbase class
diff -r TNG/classes/moddeleter.class.php TNG1403/classes/moddeleter.class.php
3,4c3
<    Mod Manager 12 deleter class
<    It also provide logging services.
---
>   Mod Manager 14 deleter class
6c5,6
<    Data:
---
>   Instantiated by admin_modhandler.php when it gets an instruction from modlister
>     to delete a mod configuration file.
8,10c8,17
<    Methods:
<       public function delete_mod( $cfgpath );
<       public function batch_delete( $cfgpathlist );
---
>   Methods:
>     public function delete_mod( $cfgpath );
>     public function batch_delete( $cfgpathlist );
> 
>   Revised -- Change in behavior:
>     Now it only deletes a support folder if it exists in the mods directory and
>     has exactly the same name_version as the cfg file being deleted. Moddeleter no
>     longer opens the mod file to get the support folder path from copyfile directives.
>     This protects a support file with a generic name or version number which may be
>     used by multiple versions of the same mod.
13c20,21
< include_once 'classes/modbase.class.php';
---
> require_once 'begin.php';
> require_once 'classes/modbase.class.php';
15,16c23,26
< class moddeleter extends modbase {
<    protected $classID = "deleter";
---
> class moddeleter extends modbase
> {
>   protected $classID = "deleter";
>   protected $mod_status = '';
18,19c28,29
<    function __construct( $objinits ) {
<       // pass arguments thru to base class
---
>   function __construct( $objinits )
>   {
21d30
<       //echo __LINE__;print_r(get_defined_vars());exit;
24,70c33,91
<    public function delete_mod( $cfgpath ) {
< 
<       // parse file to get logging info
<       $support_folder = '';
<       //$this->cfgpath = $cfgpath;
<       $cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
<       $contents = file_get_contents( $cfgpath, null, null, 0 );
< 
<       if( preg_match( "#%name:([^%]+)%#", $contents, $matches  ) ) {
<          $this->modname = $matches[1];
<       }
<       else {
<          $this->modname = "no name";
<       }
< 
<       $this->new_logevent( "{$this->admtext['deleting']} <strong>$cfgfile</strong>" );
< 
< 
< 
<       // SEE IF WE HAVE A SUPPORT FOLDER TO DELETE FROM THE MODS DIRECTORY
<       if( $this->delete_support ) {
< 
<          preg_match_all( "#%copyfile[2]?:([^%]+)%#", $contents, $matches );
< 
<          // PATH TO SUPPORT FOLDER FOR DELETION
<          $support_folder = '';
<          foreach( $matches[1] as $match) {
< 
<             // source on left [0], destination on right [1] (discard)
<             $args = explode( ":", $match, $limit = 2 );
<             $args[0] = trim( $args[0], " /" );
< 
<             // only delete source folder in the mods dir
<             if( false !== strpos( $args[0], "../" ) ) continue;
< 
<             // if just file name ignore it
<             $pos = strpos( $args[0], "/");
<             if( $pos === false ) continue;
< 
<             // need to delete top level folder
<             $parts = explode( "/", $args[0], $limit=2 );
<             $support_folder = trim( $parts[0] );
< 
<             if( empty( $support_folder ) ) continue;
< 
<             $support_folder = $this->rootpath.$this->modspath.$support_folder;
< 
---
>   public function delete_mod( $cfgpath )
>   {
>     $success = false;
> 
>     /* This is for the section header of the log. */
>     $this->modname = pathinfo( $cfgpath, PATHINFO_BASENAME );
> 
>     $rel_cfg_filepath = $this->modspath.'/'.pathinfo( $cfgpath, PATHINFO_BASENAME );
> 
>     /* Start logging the deletion event. */
>     $this->new_logevent( "{$this->admtext['deleting']} <strong>$rel_cfg_filepath</strong>" );
> 
>     $support_foldername = pathinfo( $cfgpath, PATHINFO_FILENAME );
>     $abs_support_folderpath = $this->rootpath.$this->modspath."/".$support_foldername;
>     $rel_support_folderpath = $this->modspath.'/'.$support_foldername;  // Short version for log
> 
>     while( true )
>     {
>       if( file_exists( $cfgpath ) )
>       {
> 
>         if( !unlink( $cfgpath ) )
>         //if( !true )
>         {
>           $this->add_logevent( "<span class=\"hilighterr msgbold\"> E".__LINE__." {$this->admtext['cantdel']} {$this->admtext['file']} $rel_cfg_filepath</span>" );
>           $this->mod_status = self::CANTDEL;
>           $success = false;
>           break;
>         }
>         else
>         {
>           $this->add_logevent( "<span class=\"msgapproved\">$rel_cfg_filepath {$this->admtext['filedel']}</span>" );
>           $this->mod_status = self::FILEDEL;
>           $success = true;
>         }
>       }
>       else
>       {
>         /* Mod file not found - this should never happen. Inspect the value of
>         ** $cfgpath coming in, and trace it back to the admin_modhandler where it
>         ** came from.
>         */
>         $this->add_logevent( "<span class=\"hilighterr msgbold\"> E".__LINE__." {$this->admtext['file']} $rel_cfg_filepath {$admtext['missing']}</span>" );
>         $success = false;
>         break;
>       }
> 
>       if( !empty( $this->delete_support ) )
>       {
>         $this->add_logevent( "<strong>{$this->admtext['allowdeletesupport']}</strong>" );
> 
>         /* Attempt to delete a support folder with the same name as that of the mod
>         ** configuration file.
>         */
>         if( file_exists( $abs_support_folderpath) && is_dir( $abs_support_folderpath ) )
>         {
>           if( $this->delete_folder( $abs_support_folderpath ) )
>           {
>             $this->add_logevent( "<span class=\"msgapproved\">$rel_support_folderpath {$this->admtext['folder']} {$this->admtext['deleted']}" );
72,106c93,116
<          }
< 
<          if( !empty( $support_folder ) ) {
< 
<             // DELETE SUPPORT FOLDER - only if mods is parent
<             $parent = pathinfo( $support_folder, PATHINFO_DIRNAME );
<             if( $parent == $this->rootpath.$this->modspath ) {
< 
<                $retstat = $this->delTree( $support_folder );
<                if( $retstat == false ) {
<                   $this->add_logevent( $this->admtext['cantdel'].' '.$support_folder );
<                }
<                else {
<                   $this->add_logevent( $this->admtext['folder'].' '.$support_folder.' '.$this->admtext['deleted'] );
<                }
<             }
<          }
<       } // support folder
< 
< //echo '<br /> line ',__LINE__;exit;
< 
<       if( @!unlink( $cfgpath ) ) {
<          $msg = "<span class=\"hilighterr msgbold\">{$this->admtext['cantdel']} $cfgfile</span>";
<          $this->mod_status = self::CANTDEL;
<          $success = false;
<       }
<       else {
<          $msg = "<span class=\"msgapproved\">$cfgfile {$this->admtext['filedel']}</span>";
<          $this->mod_status = self::FILEDEL;
<          $success = true;
<       }
<       $this->add_logevent( $msg );
<       $this->write_eventlog();
<       return $success;
<    }
---
>           }
>           else
>           {
>             /* Folder may not have been emptied of files for some reason. Check the
>             ** contents of the support folder and trace the destroy_folder() function.
>             */
>             $this->add_logevent( "E".__LINE__." ".$this->admtext['cantdel'].' '.$this->admtext['folder'].' '.$rel_support_folderpath );
>             break;
>           }
>         }
>         else
>         {
>           $this->add_logevent( "<span class=\"msgapproved\">$rel_support_folderpath {$this->admtext['folder']} {$this->admtext['nomatches']}" );         }
>       }
>       break;
>     } // while(true)
> 
>     $this->write_eventlog();
> 
>     /* This determines whether admin_handler returns to the mod listing, or
>     ** goes to the error log.
>     */
>     return $success;
>   }
119,123c129,180
<    private function delTree($dir) {
< 
<       if( !file_exists( $dir ) ) {
<          return true;
<       }
---
>   function delete_folder($dir)
>   {
>     if (!is_dir($dir) || is_link($dir))
>       return unlink($dir);
> 
>     foreach (scandir($dir) as $file)
>     {
>       if ($file == "." || $file == "..") continue;
>       if (!$this->delete_folder($dir."/".$file))
>       {
>         chmod($dir."/".$file, 0777);
>         if (!$this->delete_folder($dir."/".$file)) return false;
>       }
>     }
>     return rmdir($dir);
>   }
> } // moddeleter class
> 
> 
> function new_moddeleter()
> {
>   global $admtext;
> 
>   require 'subroot.php';
>   require $subroot.'mmconfig.php';
>   require $subroot.'config.php';
> 
>   if( !isset( $admtext['modlist'] ) )
>   {
>     $textpart = 'mods';
>     $mylanguage = $_SESSION['session_language'];
>     $session_charset = $_SESSION['session_charset'];
>     require 'languages/'.$mylanguage.'/admintext.php';
>     require 'languages/'.$mylanguage.'/alltext.php';
>   }
> 
>   require 'version.php';
>   $sitever = getSiteVersion();
>   $mhuser = isset( $_SESSION['currentuserdesc'] ) ? $_SESSION['currentuser'] : "";
> 
>   $objinits = array (
>     'rootpath'     => $rootpath,
>     'subroot'      => $subroot,
>     'modspath'     => $modspath,
>     'extspath'     => $extspath,
>     'options'      => $options,
>     'time_offset'  => $time_offset,
>     'sitever'      => $sitever,
>     'currentuserdesc' => $mhuser,
>     'admtext'      => $admtext,
>     'tng_version'  => $tng_version
>   );
125,130c182
<       $files = array_diff(scandir($dir), array('.','..'));
<       foreach ($files as $file) {
<          (is_dir("$dir/$file") && !is_link($dir)) ? $this->delTree("$dir/$file") : unlink("$dir/$file");
<       }
<       return rmdir($dir);
<    }
---
>   return new moddeleter( $objinits );
diff -r TNG/classes/modeditor.class.php TNG1403/classes/modeditor.class.php
1,2c1,2
< <?php
< /* Mod Manager 12 Editor for mod parameters
---
> <?php //202309018
> /* Mod Manager 14 Editor for mod parameters
17,28d16
< /*
<    const UPDATEP = 6;
<    const RESTOREP = 7;
< */
<    protected $classID = 'editor';
< 
<    function __construct( $objinits ) {
<       parent::__construct( $objinits );
<    }
< 
<    public function show_editor( $cfgpath ) {
<       $this->mod_status = '';
30,31c18
<       // GET PARSE TABLE FOR THIS MOD
<       $tags = $this->parse( $cfgpath );
---
> protected $classID = 'editor';
33,34c20,48
<       // GET CONFIG FILE NAME
<       $cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
---
>   function __construct( $objinits ) {
>     parent::__construct( $objinits );
>   }
> 
>   protected $cfg_file_contents = '';
>   protected $is_target = false;
> 
>   protected $active_target_file = '';
>   protected $target_file = '';
>   protected $mod_status = '';
>   protected $target_file_contents = '';
> 
>   public function show_editor( $cfgpath )
>   {
>     $this->mod_status = '';
> 
>     /* Get a parse table for this mod. */
>     $this->parse( $cfgpath );
> 
>     /* Handle fatal parse error. */
>     if( !empty( $this->parse_error ) )
>     {
>       $this->modname = $cfgfile;
>       $this->mod_status = self::ERRORS;
>       $idx = $this->parse_error['text'];
>       $this->add_logevent("<span class=\"msgerror\">$cfgfile</span> <span class=\"hilighterr msgbold\"> E".__LINE__." {$this->admtext[$idx]}</span>");
>       $this->write_eventlog();
>      return false;
>     }
36,37c50,51
<       // LOG THE MOD PARAMETER CHANGE
<       $this->new_logevent( "{$this->admtext['editing']} <strong>$cfgpath</strong>" );
---
>     /* Remove everything but target, parameter and desc directives. */
>     $this->parse_table = $this->clean_parse_table( $this->parse_table);
39,44c53,54
<       if( empty( $tags ) && empty( $this->parse_error ) ) {
<             $this->mod_status = self::CANTUPD;
<             $this->add_logevent( "<span class=\"msgerror\">parse table {$this->admtext['missing']}</span>" );
<             $this->write_eventlog( $error=true );
<             return false;
<       }
---
>     /* Get the mod config file name from the file path. */
>     $cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
46,54c56,113
<       // HANDLE FATAL ERROR
<       if( !empty( $this->parse_error ) ) {
<          $this->modname = $cfgfile;
<          $this->mod_status = self::ERRORS;
<          $idx = $this->parse_error['text'];
<          $this->add_logevent("<span class=\"msgerror\">$cfgfile</span> <span class=\"hilighterr msgbold\">{$this->admtext[$idx]}</span>");
<          $this->write_eventlog();
<          return false;
<       }
---
>     /* log the mod parameter change. */
>     $this->new_logevent( "{$this->admtext['editing']} <strong>$cfgpath</strong>" );
> 
>     if( !$this->open_mod_file( $cfgpath, $readonly=true) )
>     {
>       // Display error and exit
>     }
> 
>     $params_table = array();
> 
>     /* Process parse_table. */
>     for( $i=0; isset( $this->parse_table[$i] ); $i++ )
>     {
>       if( $this->parse_table[$i]['name'] == 'target' )
>       {
>         if( !$this->open_target_file( $this->parse_table[$i], $readonly=true ) )
>         {
>           continue;
>         }
>       }
>       elseif( $this->parse_table[$i]['name'] == 'parameter' )
>       {
>         if( $this->is_target )
>         {
>           $parameter_datapack = $this->parse_table[$i];
>           $i++;
>           $desc_datapack = $this->parse_table[$i];
>           $param = $this->combine_packs( $parameter_datapack, $desc_datapack );
>           $params_table[] = $param;
>         }
>         else
>         {
>           continue;
>         }
>       }
>     } // FOR processing loop
> 
>     $this->display_edit_panels( $params_table );
>     return true;
>   } // show_editor()
> 
>   public function update_parameter( $param )
>   {
>     /*  parameter-desc datapack map
>     **  $param['val'] == current value of parameter in target file
>     **  $param['mod'] == name of mod
>     **  $param['version'] mod version
>     **  $param['def'] == default value of paramete
>     **  $param['tgt'] == target file path
>     **  $param['cfg'] == mod file path
>     **  $param['param'] == variable parameter
>     **  $param['label'] == description detail from %desc directive
>     */
> 
>     $this->modname = $param['mod'];
>     $this->version = $param['version'];
> //echo basename(__FILE__),': ',__LINE__,'<pre>';print_r($param);exit;
>     $this->new_logevent( "{$this->admtext['updparam']} {$param['param']}: <span class=\"msgbold\">{$param['tgt']}</span> {$this->admtext['formodname']} <span class=\"msgbold\">{$param['mod']}</span>"  );
55a115,116
>     $this->cfgpath = $param['cfg'];
>     $this->cfgfile = pathinfo( $param['cfg'], PATHINFO_BASENAME );
57,73c118,126
<       // BUILD A PRELIM TABLE FROM TAGS ARRAY
<       $i = 0; // params array index
<       $k = 0;
<       $params = array();
<       for( $j=0; isset( $tags[$j] ); $j++ ) {
<          if( $tags[$j]['name'] == 'target' ) {
<             $tgtfile = $tags[$j]['arg1'];
<          }
<          elseif( $tags[$j]['name'] == 'parameter' ) {
<             $partable[$i]['file'] = $tgtfile;
<             $partable[$i]['var'] = $tags[$j]['arg1'];
<             $partable[$i]['val'] = $tags[$j]['arg2'];
<             $j++;
<             $partable[$i]['desc'] = $tags[$j]['arg1'];
<             $partable[$i++]['def'] = $tags[$j]['arg2'];
<          }
<       }
---
>     if( !is_writable( $param['cfg'] ) )
>     {
>       $this->mod_status = self::ERRORS;
>       $this->add_logevent( "<span class=\"msgerror\"> E".__LINE__." {$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['cfg']} %parameter:% {$param['param']}</span>" );
>       $this->add_logevent( "{$this->admtext['fileperms']} ({$param['cfg']})" );
>       $this->write_eventlog();
>       header( "Location: admin_showmodslog.php" );
>       exit;
>     }
75,152c128,254
< /*************************************************************************
<          TARGET FILES WITH PARAMETERS
< *************************************************************************/
<       $active_target_file = '';
<       foreach( $partable as $parm ) {
<          if( $parm['file'] != $active_target_file ) {
< 
<             // GET FILE BUFFER FOR EACH NEW FILE
<             $active_target_file = $parm['file'];
<             $atf = str_replace( $this->rootpath, '', $active_target_file );
<             $target_file_contents = $this->read_file_buffer( $parm['file'] );
< 
<             // FILE MUST EXIST OR IT IS AN ERROR
<             if( is_numeric( $target_file_contents ) ) {
<                $num_errors++;
<                $logstring .= "<span class=\"msgerror\">$atf&nbsp;{$this->admtext['tgtmissing']}</span>";
<                $this->add_logevent( $logstring );
<                $this->write_eventlog();
<                return false;
<             }
<          }
< 
< /*************************************************************************
<          PARAMETERS
< *************************************************************************/
< 
<          // GET TARGETED VARIABLE NAME
<          $varname = str_replace( "$", "\\$", $parm['var'] );
<          $varname = str_replace( "[", "\\[", $varname );
<          $varname = str_replace( "]", "\\]", $varname );
< 
<          // GET TARGETED VARIABLE VALUE
<          $reg_exp = "#(".$varname."\\s*=\\s*)(['\"]?)([^;]*);#";
< 
<          if( !preg_match( $reg_exp, $target_file_contents, $matches ) ) {
<             $this->mod_status = self::ERRORS;
<             $this->show_log_errors = true;
< //echo __LINE__;print_r($tags[$j]);exit;
<             $this->add_logevent("<span class=\"msgerror\">{$this->admtext['tgtfile']} $atf</span> <span class=\"hilighterr msgbold\">{$this->admtext['noparam']}: {$parm['var']}</span>");
<             $this->write_eventlog();
<             return false;
<          }
< 
<          // MANAGE SURROUNDING QUOTES IN VARIABLE VALUE
<          $quotes = 0;
<          if( !empty( $matches[2]) ) {
<             if( $matches[2] == "'" ) $quotes = 1;
<             elseif( $matches[2] == '"' ) $quotes = 2;
<          }
< 
<          // REMOVE QUOTES FOR PROCESSING
<          $matches[3] = trim( $matches[3], "'\"" );
< 
<          // escape internal single quotes
<          $matches[3] = str_replace( "'", "\\'", $matches[3] );
< 
<          $params[$k]['val'] = $matches[3];
<          $params[$k]['def'] = $parm['def'];
<          $params[$k]['tgt'] = $atf;
<          $params[$k]['cfg'] = $cfgpath;
<          $params[$k]['param'] = $parm['var'];
<          $params[$k]['quot'] = $quotes;
<          $params[$k++]['label'] = $parm['desc'];
<       } // PARAMS ARRAY
< 
<       if( empty( $params ) ) {
<          $this->mod_status = self::ERRORS;
<          $this->show_log_errors = true;
<          $this->add_logevent("<span class=\"msgerror\">$cfgfile</span> <span class=\"hilighterr msgbold\">{$this->admtext['cantupd']}: $varname</span>");
<          $this->write_eventlog();
<          return false;
<       }
< /*************************************************************************
< SHOW TITLE BAR
< *************************************************************************/
<       // fixed or scrolling header/filter bar ?
<       $tbclass = $this->fix_header == self::YES ? "tbar-fixed" : "tbar-scroll";
<       $tableclass = $this->fix_header == self::YES ? "m3table-fixed" : "m3table-scroll";
---
>     if( !is_writable( $param['tgt'] ) ) {
>       $this->mod_status = self::ERRORS;
>       $this->add_logevent( "<span class=\"msgerror\"> E".__LINE__." {$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['tgt']} %parameter:% {$param['param']}</span>" );
>       $this->add_logevent( "{$this->admtext['fileperms']} ({$param['tgt']})" );
>       $this->write_eventlog();
>       header( "Location: admin_showmodslog.php" );
>       exit;
>     }
>     $success = 0;
>     /*******************************************************************
>     UPDATE TARGET FILE WITH NEW PARAMETER VALUE
>     *******************************************************************/
>     /* Read target file into buffer to update parameter value. */
> //echo basename(__FILE__),': ',__LINE__,'<pre>';print_r($param);exit;
>     $target_file_contents = $this->read_file_buffer( $param['tgt'] );
>     $varname = preg_quote( $param['param'] );
> 	$varval = trim($param['val'],'"');
> 
>     $reg_exp = "#(".$varname."\\s*=\\s*['\"]?)([^'\";]*)#";
>     if( !preg_match( $reg_exp, $target_file_contents, $matches ) )
>     {
>       $this->add_logevent( "<span class=\"msgerror\"> E".__LINE__." {$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['tgt']} %parameter:% {$param['param']}</span>" );
>       $this->mod_status = self::CANTUPD;
>     }
>     else
>     {
>       $success++;
>       $this->add_logevent( "<span class=\"msgapproved\">{$param['param']} {$this->admtext['updated']}</span> ($varval)" );
>       $this->mod_status = self::UPDATED;
> 	}
> 
> 		$searchstr = $matches[1]; // everything before the variable value
> 		$targetstr = $matches[2]; // current value (no quotes)
> 		$length = strlen($targetstr); // length of current value
> 		/* Insert the new data at the end of the targetstr, beteen quotes
> 		** if there are any. */
> 		$rpos = strpos( $target_file_contents, $searchstr ) + strlen($searchstr);
> 
>     if( $rpos !== false )
> 		{
>       $target_file_contents = substr_replace($target_file_contents, $varval, $rpos, $length );
>     }
> 
>     /* Save updated parameter to target file. */
>     $this->write_file_buffer( $param['tgt'], $target_file_contents );
>     unset( $target_file_contents );
> 
>     /*******************************************************************
>     UPDATE MOD CONFIG FILE WITH NEW PARAMETER VALUE t1403
> 			* Prevents validator not installed status
>     *******************************************************************/
>     /* Read mod config file into buffer to update parameter. */
>     $config_file_contents = $this->read_file_buffer( $param['cfg'] );
> 
> 		/* If modconfig file installed the parameter into the target file,
> 		** update the config file %insert-ed value to match that in
> 		** the target file to prevent mod listing error. */
> 		$searchstr = rtrim($searchstr, " =");
> 		$searchstr .= ':';
> 		$ppos = strpos( $config_file_contents, $searchstr );
> 
>     if( $ppos !== false )
> 		{
> 			$ppos +=  + strlen($searchstr);
> 
>       $config_file_contents = substr_replace($config_file_contents, $varval, $ppos, $length );
>     }
> 
>     // update the %parameter line val for backward compatibility
>     $regex = '#%parameter:'.$varname.':\\s*[^%]*%#';
>     $parval = trim( $param['val'], "\"'" );
>     $replacement = "%parameter:".$param['param'].":".$parval."%";
> 
>     /* This will replace all occurrences, so it is important that the same $var name
>     ** not be used for more than one parameter in the mod config file.
>     */
>     $config_file_contents = preg_replace( $regex, $replacement, $config_file_contents );
> 
>     /*******************************************************************
>     UPDATE MOD CONFIG FILE WITH NEW PARAMETER INSERTION VALUE
> 			* Prevents validator not installed status
>     *******************************************************************/
>     /* Save updated parameter to the mod config file. */
> 
> 
> 
>     /*******************************************************************
> 			WRITE UPDATED MOD CONFIG FILE
>     *******************************************************************/
>     $this->write_file_buffer( $param['cfg'], $config_file_contents );
>     $this->write_eventlog();
>     return $success;
>   } // update_parameter()
> 
>   public function restore_parameter( $param )
>   {
>     /*  parameter-desc datapack map
>     **  $param['val'] == current value of parameter in target file
>     **  $param['mod'] == name of mod
>     **  $param['version'] mod version
>     **  $param['def'] == default value of parameter
>     **  $param['tgt'] == target file path
>     **  $param['cfg'] == mod file path
>     **  $param['param'] == variable parameter
>     **  $param['label'] == description detail from %desc directive
>     */
> 	$param['val'] = trim($param['def'],"'\"");
> 
> 	return $this->update_parameter( $param );
>   } // restore_parameter()
> 
>   protected function display_edit_panels( $params_table )
>   {
>     echo "
> <div class='admin-main'>
> <div class='tableFixedHead'>
> <table id='mmtable' class='mmtable'>
> 	<thead>
>   	<tr>
>       <th class='center'>
>         <div class=\"fieldnameback fieldname\">{$this->admtext['edopts']}: $this->cfgfile</div>
>       </th>
>     </tr>
>   </thead>
>   <tr>
>     <td>
> ";
153a256,257
>     if( !is_writable( $this->cfgpath ) )
>     {
155,168d258
< <table id=\"tbar\" class=\"normal lightback $tbclass\">
<    <tr>
<       <td style=\"padding-top:5;\">
<          <div class=\"mmsubhead\">{$this->admtext['edopts']}: $cfgfile</div>
< 	 </td>
<    </tr>
< </table>
< 
< <table id=\"m3table\" class=\"normal lightback $tableclass\">
< <tr>
< <td>";
< 
<       if( !is_writable( $cfgpath ) ) {
<          echo "
171,177c261,271
<       }
<       // show the parameters editing form
<       for( $i=0; isset( $params[$i] ); $i++ ) {
<          $relpath = str_replace( $this->rootpath, '', $params[$i]['tgt'] );
<          echo "
< <form method=\"post\" action=\"\">
< <table class=\"normal tfixed\">
---
>     }
>     // show the parameters editing form
>     $index = 0;
>     foreach( $params_table as $param )
>     {
>       $index++;
>       $formindex = 'forme_'.$index;
>       $relpath = str_replace( $this->rootpath, '', $param['tgt'] );
>       echo "
> <form method='post' action='' class='forme' id=$formindex>
> <table class='nested'>
180c274
<       {$params[$i]['label']}
---
>       {$param['label']}
183,184c277,279
<       <div>$relpath: {$params[$i]['param']}</div>
<       <textarea class=\"w100\" name=\"param[val]\">{$params[$i]['val']}</textarea>
---
>       <div>$relpath: {$param['param']}</div>
>       <textarea class=\"w99\" name=\"param[val]\">{$param['val']}</textarea>
>       <input type='hidden' name='param[forme]' value='$formindex' />
187,191c282,285
<       <input type=\"hidden\" name=\"param[def]\" value=\"{$params[$i]['def']}\" />
<       <input type=\"hidden\" name=\"param[tgt]\" value=\"{$params[$i]['tgt']}\" />
<       <input type=\"hidden\" name=\"param[cfg]\" value=\"{$params[$i]['cfg']}\" />
<       <input type=\"hidden\" name=\"param[param]\" value=\"{$params[$i]['param']}\" />
<       <input type=\"hidden\" name=\"param[quot]\" value=\"{$params[$i]['quot']}\" />
---
>       <input type=\"hidden\" name=\"param[def]\" value=\"{$param['def']}\" />
>       <input type=\"hidden\" name=\"param[tgt]\" value=\"{$param['tgt']}\" />
>       <input type=\"hidden\" name=\"param[cfg]\" value=\"{$param['cfg']}\" />
>       <input type=\"hidden\" name=\"param[param]\" value=\"{$param['param']}\" />
198c292
< </table>
---
> </table><!-- sub mmtable-->
201a296,306
>   $flinka = '';
>   if( !empty( $_SESSION['actualmod'] ) )
>   {
>     $id = $_SESSION['actualmod'];
>     unset( $_SESSION['actualmod'] );
>     if( is_numeric( $id) )
>     {
>       $flinka = '#flinka'.($id-1);
>     }
>   }
> 
205,208c310,311
< <div class=\"lightback edreturn\">
<    <form method=\"post\" action=\"\">
<             <button type=\"submit\" name=\"submit\" value=\"pCancel\">{$this->admtext['return']}</button>
<    </form>
---
> <div class='lightback edreturn'>
>   <button onclick='window.location.href=\"{$this->tngdomain}/admin_modhandler.php$flinka\";'>{$this->admtext['return']}</button>
212c315,318
< </table>";
---
> </table><!-- master mmtable -->
> </div><!-- tableFixedHead -->
> </div><!-- admin-main -->
> ";
214,305c320
<    } // show_editor
< 
<    public function update_parameter( $param ) {
< 
<       $this->modname = $param['mod'];
<       $this->version = $param['version'];
<       $this->new_logevent( "{$this->admtext['updparam']} {$param['param']}: <span class=\"msgbold\">{$param['tgt']}</span> {$this->admtext['formodname']} <span class=\"msgbold\">{$param['mod']}</span>"  );
<       $this->cfgpath = $param['cfg'];
<       $this->cfgfile = pathinfo( $param['cfg'], PATHINFO_BASENAME );
<       if( !is_writable( $param['cfg'] ) ) {
<          $this->mod_status = self::ERRORS;
<          $this->add_logevent( "<span class=\"msgerror\">{$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['cfg']} %parameter:% {$param['param']}</span>" );
<          $this->add_logevent( "{$this->admtext['fileperms']} ({$param['cfg']})" );
<          $this->write_eventlog();
<          header( "Location: admin_showmodslog.php" );
<          exit;
<       }
<       if( !is_writable( $param['tgt'] ) ) {
<          $this->mod_status = self::ERRORS;
<          $this->add_logevent( "<span class=\"msgerror\">{$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['tgt']} %parameter:% {$param['param']}</span>" );
<          $this->add_logevent( "{$this->admtext['fileperms']} ({$param['tgt']})" );
<          $this->write_eventlog();
<          header( "Location: admin_showmodslog.php" );
<          exit;
<       }
<       $success = 0;
<       /*******************************************************************
<       UPDATE TARGET FILE WITH NEW PARAMETER VALUE
<       *******************************************************************/
<        // READ TARGET FILE INTO BUFFER TO UPDATE PARAMETER
<       $target_file_contents = $this->read_file_buffer( $param['tgt'] );
< 
<       // prepare original quoting around variable value
<       $quotes = '';
<       if( $param['quot'] == 1 ) $quotes = "'";
<       elseif( $param['quot'] == 2 ) $quotes = '"';
< 
<       // remove any surrounding single or double quotes from new parameter value
<       $varval = trim( $param['val'], "\"'" );
< 
<       //escape internal single quotes
<       $varval = str_replace( "'", "\\'", $varval );
< 
<       // add original quoting
<       $varval = $quotes.$varval.$quotes;
< 
<       // escape $ sign and brackets in variable name
<       $varname = str_replace( "$", "\\$", $param['param'] );
<       $varname = str_replace( "[", "\\[", $varname );
<       $varname = str_replace( "]", "\\]", $varname );
< 
<       $reg_exp = "#(".$varname."\\s*=\\s*)([^;]*)#";
<       if( !preg_match( $reg_exp, $target_file_contents, $matches ) ) {
<          $this->add_logevent( "<span class=\"msgerror\">{$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['tgt']} %parameter:% {$param['param']}</span>" );
<          $this->mod_status = self::CANTUPD;
<       }
<       else {
<          $success++;
<          $this->add_logevent( "<span class=\"msgapproved\">{$param['param']} {$this->admtext['updated']}</span> ($varval)" );
<          $this->mod_status = self::UPDATED;
<       }
<       // UPDATE THE FIRST OCCURANCE IN THE TARGET FILE
<       $targetstr = $matches[0];
<       $updatestr = $matches[1] . $varval;
<       $pos = strpos($target_file_contents, $targetstr);
<       if( $pos !== false ) {
<          $target_file_contents = substr_replace($target_file_contents, $updatestr, $pos, strlen($targetstr) );
<       }
<       // SAVE UPDATED PARAMETER TO TARGET FILE
<       $this->write_file_buffer( $param['tgt'], $target_file_contents );
<       unset( $target_file_contents );
< 
<       /*******************************************************************
<       UPDATE MOD CONFIG FILE WITH NEW PARAMETER VALUE
<       *******************************************************************/
<       // READ MOD CONFIG FILE INTO BUFFER TO UPDATE PARAMETER
<       $config_file_contents = $this->read_file_buffer( $param['cfg'] );
< 
<       // IF MOD CONFIG FILE HAS INSERTED $VAR=VAL INTO TARGET FILE, UPDATE MOD CONFIG
<       // VALUE TO PREVENT BAD TARGET ERRORS
<       // This will replace all occurrences, so it is important that the same $var name
<       // not be used in more than one location.
<       $config_file_contents = str_replace( $targetstr, $updatestr, $config_file_contents );
< 
<       // update the %parameter line val for backward compatibility
<       $regex = '#%parameter:'.$varname.':\\s*[^%]*%#';
<       $parval = trim( $param['val'], "\"'" );
<       $replacement = "%parameter:".$param['param'].":".$parval."%";
< 
<       // This will replace all occurrences, so it is important that the same $var name
<       // not be used for more than one parameter in the mod config file.
<       $config_file_contents = preg_replace( $regex, $replacement, $config_file_contents );
---
>   } // display_edit_panels()
307,313c322,469
<       // SAVE UPDATED PARAMETER TO MOD CONFIG FILE
<       $this->write_file_buffer( $param['cfg'], $config_file_contents );
<       $this->write_eventlog();
<       return $success;
<    }
< 
<    public function restore_parameter( $param ) {
---
>   protected function open_target_file( $target_datapack, $readonly=false )
>   {
>     /*  %target directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == target
>     **  $datapack['arg1'] == server filepath to target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == optional note
>     **  $datapack['flag'] == optional flag (@)
>     **  $datapack['goto'] == empty
>     */
> 
>     $line = $target_datapack['line'];
>     $flag = $target_datapack['flag'];
>     $target_filepath = $target_datapack['arg1'];
> 
>     /* Remove rootpath portion of target file path for log display.*/
>     $display_path = $flag . str_replace( $this->rootpath, '', $target_filepath );
> 
>     while(true) /* Target directive processing loop */
>     {
>       /* If not readonly and previous target file open, save file contents before
>       ** opening a new one.*/
>       if( !$readonly && !empty( $this->active_target_file ) && !empty( $this->target_file_contents ) )
>       {
>         if( false === $this->write_file_buffer( $this->active_target_file, $this->target_file_contents ) )
>         {
>           $this->num_errors++;
>           $logstring = "<span class='msgerror'>{$this->admtext['cantwrite']} %target:</span><span class='tgtfile'>$display_path  E".__LINE__."</span><span class='tag'>%</span>&nbsp;";
>           $return_flag = false;
>           break;
>         }
>         else
>         {
>           unset( $this->target_file_contents );
>         }
>       }
> 
>       $logstring = "{$this->admtext['line']} $line: <span class='tag'>%target:</span><span class='tgtfile'>$display_path</span><span class='tag'>%</span>&nbsp;";
> 
>       /* init variables for new target file and contents.*/
>       $this->target_file_contents = null;
>       $this->active_target_file = '';
> 
>       /* Read target file contents into a processing buffer.*/
>       $this->target_file_contents = $this->read_file_buffer( $target_filepath, $flag );
> 
>       /* Report file errors if any.*/
>       if( is_numeric( $this->target_file_contents ) )
>       {
>         $code = $this->target_file_contents;
>         $this->target_file_contents = '';
>         $this->is_target = false;
> 
>         if( $code == self::BYPASS )
>         {
>           $logstring .= "{$this->admtext['optmissing']}&nbsp;<span class='msgapproved'>{$this->admtext['bypassed']}</span>";
>           break;
>         }
>         elseif( $code == self::NOFOUL )
>         {
>           $this->num_errors++;
>           $logstring .= "{$this->admtext['tgtmissing']}&nbsp;<span class='msgerror'>{$this->admtext['required']}</span>";
>           break;
>         }
>         elseif( $code == self::NOFILE )
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['tgtmissing']}</span>";
>           $return_flag = false;
>           break;
>         }
>         elseif( $code == self::NOWRITE )
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['notwrite']}</span>";
>           $return_flag = false;
>           break;
>         }
>         elseif( $code == self::ISEMPTY )
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['emptyfile']}</span>";
>           $return_flag = false;
>           break;
>         }
>         else
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['errors']}</span>";
>           $return_flag = false;
>           break;
>         }
>       }
>       else
>       {
>         $this->is_target = true;
>         $this->active_target_file = $target_filepath;
>         $logstring .= "{$this->admtext['opened']}";
>       }
>       break;
>     } // while(true) processing loop
> 
>     $this->add_logevent( $logstring );
> 
> 
>     return $this->is_target;
>   }
> 
>   protected function open_mod_file( $cfgfile )
>   {
>     $file_state = true;
> 
>     /* Remove rootpath portion of target file path for log display.*/
>     $display_path = str_replace( $this->rootpath, '', $cfgfile );
> 
>     $logstring = "<span class='tag'>mod file </span><span class='tgtfile'>$display_path</span>&nbsp;";
> 
>     /* Read mod config file contents into a processing buffer.*/
>     $this->cfg_file_contents = $this->read_file_buffer( $cfgfile );
> 
>     /* Report file errors if any.*/
>     if( is_numeric( $this->cfg_file_contents ) )
>     {
>       $this->cfg_file_contents = '';
>       $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['cannotopen']} $display_path</span>";
>       $file_state = false;
>     }
>     else
>     {
>       $logstring .= "{$this->admtext['opened']}";
>     }
> 
>     $this->add_logevent( $logstring );
> 
>     return $file_state;
>   }
> 
>   /* Combine parameter and desc directive data into one datapack for processing.
>   */
>   protected function combine_packs( $parameter_datapack, $desc_datapack )
>   {
>     $param = array();
>     $varname = preg_quote( $parameter_datapack['arg1'] );
> 	$reg_exp = "#(".$varname."\\s*=\\s*['\"]?)([^'\";]+)#";
>     if( !preg_match( $reg_exp, $this->target_file_contents, $matches ) )
>     {
> 	  //echo basename(__FILE__),': ',__LINE__,'<br/>';var_dump('');exit;
315,334c471
<       $this->modname = $param['mod'];
<       $this->version = $param['version'];
<       $this->new_logevent( "{$this->admtext['restparam']} {$param['param']}: <span class=\"msgbold\">{$param['tgt']}</span> {$this->admtext['formodname']} <span class=\"msgbold\">{$param['mod']}</span>"  );
<       $this->cfgpath = $param['cfg'];
<       $this->cfgfile = pathinfo( $param['cfg'], PATHINFO_BASENAME );
<       if( !is_writable( $param['cfg'] ) ) {
<          $this->add_logevent( "<span class=\"msgerror\">{$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['cfg']} %parameter:% {$param['param']}</span>" );
<          $this->add_logevent( "{$this->admtext['fileperms']} ({$param['cfg']})" );
<          $this->write_eventlog();
<          header( "Location: admin_showmodslog.php" );
<          exit;
<       }
<       if( !is_writable( $param['tgt'] ) ) {
<          $this->add_logevent( "<span class=\"msgerror\">{$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['tgt']} %parameter:% {$param['param']}</span>" );
<          $this->add_logevent( "{$this->admtext['fileperms']} ({$param['tgt']})" );
<          $this->write_eventlog();
<          header( "Location: admin_showmodslog.php" );
<          exit;
<       }
<       $success = 0;
---
>       $this->show_log_errors = true;
336,404c473
<       /*******************************************************************
<       UPDATE TARGET FILE WITH DEFAULT PARAMETER VALUE
<       *******************************************************************/
<       // READ TARGET FILE INTO BUFFER
<       $target_file_contents = $this->read_file_buffer( $param['tgt'] );
< 
<       // remove surrounding single or double quotes from default parameter value
<       $varval = trim( $param['def'], "\"'" );
< 
<       // escape internal single quotes
<       $varval = str_replace( "'", "\\'", $varval );
< 
<       // add original surrounding quotes if any
<       $quotes = '';
<       if( $param['quot'] == 1 ) $quotes = "'";
<       elseif( $param['quot'] == 2 ) $quotes = '"';
<       $varval = $quotes.$varval.$quotes;
< 
<       // escape $ sign and brackets in variabel name
<       // should already have been trimmed and escaped!!
<       $varname = str_replace( "$", "\\$", $param['param'] );
<       $varname = str_replace( "[", "\\[", $varname );
<       $varname = str_replace( "]", "\\]", $varname );
< 
<       $reg_exp = "#([^\w]".$varname."\\s*=\\s*)([^;]*)#";
<       if( !preg_match( $reg_exp, $target_file_contents, $matches ) ) {
<          $this->add_logevent( "<span class=\"msgerror\">{$this->admtext['cantupd']}</span> <span class=\"hilighterr msgbold\">{$param['param']}</span>" );
<          $this->mod_status = self::CANTUPD;
<       }
<       else {
<          $success++;
<          $this->add_logevent( "<span class=\"msgapproved\">{$param['param']} {$this->admtext['updated']}</span> ($varval)" );
<          $this->mod_status = self::UPDATED;
<       }
< 
<       // RESTORE THE FIRST OCCURANCE TO DEFAULT VALUE
<       $targetstr = $matches[0];
<       $updatestr = $matches[1] . $varval;
<       $pos = strpos($target_file_contents, $targetstr);
<       if( $pos !== false ) {
<          $target_file_contents = substr_replace($target_file_contents, $updatestr, $pos, strlen($targetstr) );
<       }
<       // SAVE UPDATED BUFFER TO TARGET FILE
<       $this->write_file_buffer( $param['tgt'], $target_file_contents );
<       unset( $target_file_contents );
< 
<       /*******************************************************************
<       UPDATE MOD CONFIG FILE WITH DEFAULT PARAMETER VALUE
<       *******************************************************************/
<        // READ MOD CONFIG FILE INTO BUFFER
<       $config_file_contents = $this->read_file_buffer( $param['cfg'] );
< 
<       // IF MOD CONFIG FILE INSERTED $VAR=VAL INTO TARGET FILE, UPDATE MOD CONFIG
<       // VALUE TO PREVENT BAD TARGET ERRORS
<       // This will replace all occurrences, so it is important that the same $var name
<       // not be used in more than one location.
<       $config_file_contents = str_replace( $targetstr, $updatestr, $config_file_contents );
< 
<       // update the %parameter line val for backward compatibility
<       $regex = '#%parameter:'.$varname.':'.'[^%]*%#';
<       $varval = trim( $varval, "\"'" );
<       $replacement = "%parameter:".$param['param'].":".$varval."%";
< 
<       // This will replace all occurrences, so it is important that the same $var name
<       // not be used for more than one parameter in the mod config file.
<       $config_file_contents = preg_replace( $regex, $replacement, $config_file_contents );
< 
<       // SAVE DEFAULT PARAMETER VALUE TO MOD CONFIG FILE
<       $this->write_file_buffer( $param['cfg'], $config_file_contents );
---
>       $this->add_logevent("<span class=\"msgerror\"> E".__LINE__." {$this->admtext['tgtfile']} $atf</span> <span class=\"hilighterr msgbold\">{$this->admtext['noparam']}: {$parm['var']}</span>");
406,408c475,562
<       return $success;
<    }
< } // class modparser
---
>       return false;
>     }
> 
>     /* Combine the datapacks */
>     $param['val'] = strlen(trim($matches[2])) == 0 ? '' : $matches[2];
>     $param['def'] = $desc_datapack['arg2'];
>     $param['tgt'] = $this->active_target_file;
>     $param['cfg'] = $this->cfgpath;
>     $param['param'] = $parameter_datapack['arg1'];
>     //$param['quot'] = $quotes;
>     $param['label'] = $desc_datapack['arg1'];
>     return $param;
>   } // combine_packs()
> 
>   /* This function removes all but target - parameter - desc directives from
>   ** parse table to simplify modeditor processing.
>   */
>   protected function clean_parse_table()
>   {
>     $temp_table = array();
>     $target_hold = array();
>     $target_set = false;
> 
>     // make new directories available for file copies
>     for( $i=0; isset($this->parse_table[$i]); $i++ )
>     {
>       switch( $this->parse_table[$i]['name'] )
>       {
>         case 'target':
>           /* Hold target aside until we see it has an associated parameter. */
>           $target_hold = $this->parse_table[$i];
>           $target_set = false;
>           break;
>         case 'parameter':
>           if( !$target_set )
>           {
>             $temp_table[] = $target_hold;
>             $target_set = true;
>           }
>           $temp_table[] = $this->parse_table[$i];
>           break;
>         case 'desc':
>           $temp_table[] = $this->parse_table[$i];
>           if( !empty( $target_hold['name'] ) )
>           break;
>         default:
>           /* Discard the rest */
>           break;;
>       }
>     }
>     return $temp_table;
>   } // clean_parse_table();
> 
> } // class modeditor
> 
> function new_modeditor()
> {
>   global $admtext, $tngconfig;
> 
>   require $tngconfig['subroot'].'mmconfig.php';
>   require $tngconfig['subroot'].'config.php';
> 
>   if( !isset( $admtext['modlist'] ) )
>   {
>     $textpart = 'mods';
>     $mylanguage = $_SESSION['session_language'];
>     require 'languages/'.$mylanguage.'/admintext.php';
>     /* Force reload cust_text.php */
>     require 'languages/'.$mylanguage.'/alltext.php';
>   }
> 
>   require 'version.php';
>   $sitever = getSiteVersion();
>   $mhuser = isset( $_SESSION['currentuserdesc'] ) ? $_SESSION['currentuser'] : "";
> 
>   $objinits = array (
>     'rootpath'     => $rootpath,
>     'subroot'      => $tngconfig['subroot'],
>     'modspath'     => $modspath,
>     'extspath'     => $extspath,
>     'tngdomain'    => $tngdomain,
>     'options'      => $options,
>     'time_offset'  => $time_offset,
>     'sitever'      => $sitever,
>     'currentuserdesc' => $mhuser,
>     'admtext'      => $admtext,
>     'tng_version'  => $tng_version
>   );
410c564,565
< ?>
---
>   return new modeditor( $objinits );
> }
\ No newline at end of file
Only in TNG/classes: modinfo.class.php
diff -r TNG/classes/modinstaller.class.php TNG1403/classes/modinstaller.class.php
3c3,485
<    Mod Manager 12 Mod Installer Class
---
> **  Mod Manager 14.0.0.1 Mod Installer Class
> **
> **  Public Methods:
> **    $this->install( $cfgpath );
> **    $this->batch_install( $cfgpathlist );
> **
> **  This version refactors the previous code to make it more efficient
> **  and easier to maintain.
> **
> **  Graphically we build Modlister and Modinstaller as follows:
> **  Modbase -> Modparser -> Modvalidator -> Modlister
> **  Modbase -> Modparser -> Modinstaller
> **
> **  Modlister has already determined the installation status of each
> **  mod before displaying it, so we do not validate it again before
> **  installing it here.
> **
> **  Modinstaller takes the parse_table and pulls off directive
> **  datapacks one-by-one, and copies or modifies files as directed.
> **
> */
> 
> /* File management */
> $modlister_version = '14.0.0.1 221110-2130';
> 
> require_once 'classes/modparser.class.php';
> 
> class modinstaller extends modparser
> {
>   public function __construct( $objinits )
>   {
>     parent::__construct( $objinits );
>   }
> 
>   protected $classID = "installer";
> 
>     // INITIALIZE STATUS DATA FOR LOGGING
>   protected $locations_required = 0;
>   protected $locations_installed = 0;
>   protected $newdirs_required = 0;
>   protected $newdirs_created = 0;
>   protected $newdirs_excused = 0;
>   protected $newfiles_required = 0;
>   protected $newfiles_created = 0;
>   protected $newfiles_excused = 0;
>   protected $copyfiles_required = 0;
>   protected $copyfiles_copied = 0;
>   protected $copyfiles_excused = 0;
>   protected $statstring ='';
>   protected $num_errors = 0;
> 
>   protected $active_target_file = '';
>   protected $target_file_contents = '';
>   protected $istarget = false;
>   protected $mod_status = '';
> 
>   /* Install a Mod Manager mod by editing target files per config file
>   ** instructions, make new directories and copy or create files
>   ** as directed.*/
>   public function install( $cfgpath )
>   {
>     $this->cfgpath = $cfgpath;
>     $this->cfgfile = $cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
>     $this->parse_error = array();
>     $this->mod_status = '';
> 
>     /* Set the $this->parse_table for this mod. */
>     $this->parse( $cfgpath );
> 
>     /* Start logging the mod installation. */
>     $this->new_logevent( "{$this->admtext['installing']} <strong>$cfgpath</strong>" );
> 
>     if( empty( $this->parse_table ) && empty( $this->parse_error ) ) {
>       $this->mod_status = self::CANTINST;
>       $this->add_logevent( "<span class='msgerror'>parse table {$this->admtext['missing']}</span>" );
>       $this->write_eventlog( $error=true );
>       return false;
>     }
> 
>     /* Handle fatal error if one exists. */
>     if( !empty( $this->parse_error ) ) {
>       $this->modname = $cfgfile;
>       $this->mod_status = self::ERRORS;
>       $idx = $this->parse_error['text'];
>       $this->add_logevent("<span class='msgerror'>$cfgfile</span> <span class='hilighterr msgbold'>{$this->admtext[$idx]}</span>");
>       $this->write_eventlog();
>       return false;
>     }
> 
>     /* Arrange the parse table directives in logical order for installation. */
>     $this->parse_table=$this->arrange_parse_table( $this->parse_table );
> 
>     $this->init_properties();
> 
>     /*************************************************************
>       PROCESS THE PARSE TABLE DIRECTIVES TO INSTALL CURRENT MOD
>         Each $this->parse_table[$i] is a single directive datapack.
>     *************************************************************/
>     for($i=0; isset( $this->parse_table[$i] ); $i++ )
>     {
>       /* PHP allows assignment of a function name to a variable
>       ** and then executing the "variable" with arguments. That lets
>       ** us get the function name associated with this directive from
>       ** $proclist found in the modbase.class.php.
>       */
>       $function = $this->proclist[$this->parse_table[$i]['name']];
> 
>       /***********************************************************/
>       /* Use custom function to set status of this directive.
>       ** If a function processes more than one tag it will advance
>       ** index $i to skip the table entries already processed.
>       **
>       ** ALL FUNCTIONS MUST RETURN $i OR MODLISER WILL CRASH!
>       */
>       $refj = $i; /* For debugging */
> 
>       $i = $this->$function( $i );
>       /***********************************************************/
> 
>       /* We pass the the $i index to processing functions and
>       ** allow them to change it so the processing can skip over
>       ** directives specified by conditional testing.
>       **
>       ** Debug: prevent bad behavior during modinstaller development;
>       ** if the $i index gets unset or reset back to zero by a faulty
>       ** function return, it will cause an infinite loop. So don't allow it.*/
>       if(  $i < $refj )
>       {
>         $this->num_errors++;
>         $logstring = "<span class='msgerror'> E".__LINE__." {$this->admtext['cantinst']} Dispatcher: </span><span class='tgtfile'>Index error!</span>&nbsp;";
>         $this->add_logevent( $logstring );
>         $this->write_eventlog();
>         return;
>       }
> 
>     } /* Main modinstaller processing loop */
> 
>     /*************************************************************
>       DONE PROCESSING - FLUSH LAST BUFFER BACK TO TARGET FILE
>     *************************************************************/
>     if( !empty( $this->active_target_file ) && !empty( $this->target_file_contents ) )
>     {
>       if( false === $this->write_file_buffer( $this->active_target_file,
>                                               $this->target_file_contents ) )
>       {
>         $this->num_errors++;
>         $logstring = "<span class='msgerror'> E".__LINE__." {$this->admtext['cantwrite']} %target:</span><span class='tgtfile'>$display_path</span><span class='tag'>%</span>&nbsp;";
>         $this->add_logevent( $logstring );
>       }
>     }
> 
>     /*************************************************************
>       COMPILE INFORMATION FOR THE MM PROCESSING LOG
>     *************************************************************/
>     if( !$this->num_errors )
>     {
>       /* Compute the final statistics */
>       if( $this->copyfiles_required == ( $this->copyfiles_copied + $this->copyfiles_excused )
>           && ( $this->newfiles_required == ( $this->newfiles_created + $this->newfiles_excused )
>           && ( $this->locations_required == $this->locations_installed )
>           && ( $this->newdirs_required == $this->newdirs_created ) ) )
>       {
>         if( $this->copyfiles_copied == 0
>             && $this->copyfiles_excused == 0
>             && $this->newfiles_created == 0
>             && $this->newfiles_excused == 0
>             && $this->locations_installed == 0 ) {
>           $status = self::OK2INST;
>           $class = "class='msgapproved'";
>         }
>         else
>         {
>           $status = self::INSTALLED;
>           $class = "class='msgapproved'";
>         }
>       }
>     }
>     else
>     {
>       $status = self::ERRORS;
>       $class = "class='msgerror'";
>       $this->batch_error = true;
>     }
> 
>     $this->add_logevent("<span class='msgbold'>{$this->admtext['toterrors']}:</span> $this->num_errors");
> 
>     $installed = strtolower( $this->admtext['installed'] );
> 
>     if( !empty( $this->locations_required ) )
>     {
>       $locations = sprintf( '%d %s &nbsp;&nbsp; %d %s',
>                     $this->locations_required,
>                     '%location:',
>                     $this->locations_installed,
>                     $installed );
>       $this->add_logevent( $locations );
>     }
> 
>     if( !empty( $this->copyfiles_required ) )
>     {
>       $copyfiles = sprintf( '%d %s &nbsp;&nbsp; %d %s &nbsp;&nbsp; %d %s',
>                     $this->copyfiles_required,
>                     '%copyfile:',
>                     $this->copyfiles_copied,
>                     $installed,
>                     $this->copyfiles_excused,
>                     $this->admtext['protected'] );
>       $this->add_logevent( $copyfiles );
>     }
> 
>     if( !empty( $this->newfiles_required ) )
>     {
>       $newfiles = sprintf( '%d %s &nbsp;&nbsp; %d %s &nbsp;&nbsp; %d %s',
>                     $this->newfiles_required,
>                     '%newfile:',
>                     $this->newfiles_created,
>                     $installed,
>                     $this->newfiles_excused,
>                     $this->admtext['protected'] );
>       $this->add_logevent( $newfiles );
>     }
> 
>     if( !empty( $this->newdirs_required) )
>     {
>       $mkdirs = sprintf( '%d %s &nbsp;&nbsp; %d %s &nbsp;&nbsp; %d %s',
>                     $this->newdirs_required,
>                     '%mkdir:',
>                     $this->newdirs_created,
>                     $installed,
>                     $this->newdirs_excused,
>                     $this->admtext['protected']);
>       $this->add_logevent( $mkdirs );
>     }
> 
>     $this->add_logevent("{$this->admtext['status']}: <span $class>{$this->admtext[$status]}</span>");
> 
>     $this->mod_status = $status;
>     $this->write_eventlog();
>     return ( $status == self::OK2INST || $status == self::INSTALLED );
> 
>   } // install()
> 
>   public function batch_install( $cfgpathlist )
>   {
>     foreach( $cfgpathlist as $cfgpath )
>     {
>       if( !$this->install( $cfgpath ) )
>       {
>         $this->batch_error = true;
>       };
>     }
>     return !$this->batch_error;
>   }
> 
>   /*************************************************************
>     DIRECTIVE FUNCTIONS
>       All classes derived from modparser must contain one
>       private function for each mod directive. Functions are named
>       the same as the directive, but with a leading underscore.
> 
>       A function table in modparser.class.php points each
>       directive to its corresponding function, and each
>       class will consult the table, and code the function
>       according to purpose of the class.
> 
>       All function called from the table will use the same
>       same input arguments (may vary from class to class, but
>       must all be the same within the class) and must contain
>       the code necessary to implement the class's purpose.
> 
>       Some functions, for example _insert(), may or may not be
>       called directly by the class processing function. In the
>       case of the mod lister, the optag functions are called
>       by the _location() function.
>   *************************************************************/
> 
>   private function _author( $i )
>   {
>     return $i;
>   }
> 
>   private function _copyfile( $i  )
>   {
>     /*  %copyfile directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == copyfile or copyfile2
>     **  $datapack['arg1'] == full server path to source file
>     **  $datapack['arg2'] == full server path to destination file
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == flag (if any) optional or protected
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     /* Break out the datapack to simplify processing.*/
>     $copyfile_datapack = $this->parse_table[$i];
> 
>     $line = $copyfile_datapack['line'];
>     $flag = $copyfile_datapack['flag'];
> 
>     $copyop = $copyfile_datapack['name']; /* Copyfile or copyfile2 */
> 
>     $source_path = $copyfile_datapack['arg1'];
>     $source_file = pathinfo( $source_path, PATHINFO_BASENAME );
> 
>     $destination_path = $copyfile_datapack['arg2'];
>     $dest_path = str_replace( $this->rootpath, '', $destination_path );
> 
>     $logstring = "{$this->admtext['line']} $line: %<span class='tag'>$copyop:</span>";
>     $logstring .= "<span class='tgtfile'>$flag$dest_path</span>%&nbsp;";
> 
>     $this->copyfiles_required++;
> 
>     while( true )
>     {
>       if( !file_exists( $source_path ) )
>       {
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['srcfilemissing']}</span>";
>         break;
>       }
> 
>       /* Do not overcopy protected file. */
>       if( file_exists( $destination_path ) )
>       {
>         if( $flag == self::FLAG_PROTECTED )
>         {
>           $this->copyfiles_excused++;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['protected']}</span>";
>           break;
>         }
>       }
> 
>       if( @copy( $source_path, $destination_path ) === false )
>       {
>         /* Failed copy excused? */
>         if( $flag == self::FLAG_OPTIONAL ) {
>           $this->copyfiles_excused++;
>           $logstring .= "{$this->admtext['optnocopy']}&nbsp;<span class='msgapproved'>{$this->admtext['bypassed']}</span>";
>           break;
>         }
>         /* Failed copy */
>         else {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['notcopied']}</span>";
>           break;
>         }
>       }
>       else
>       {
>         /* Copy was successful! */
>         $this->copyfiles_copied++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['copied']}</span>";
>         break;
>       }
>       break;
>     } // while(true)
> 
>     $this->add_logevent( $logstring );
>     return $i;
>   }
> 
>   private function _desc( $i  )
>   {
>     return $i;
>   }
> 
>   private function _description( $i  )
>   {
>     return $i;
>   }
> 
>   private function _end( $i  )
>   {
>     return $i;
>   }
> 
>   private function _fileend( $i  )
>   {
>     return $i;
>   }
> 
>   private function _fileexists( $i )
>   {
>     return $i;
>   }
> 
>   private function _fileoptional( $i )
>   {
>     return $i;
> 
>   }
> 
>   private function _files( $i )
>   {
>     return $i;
>   }
> 
>   private function _fileversion( $i )
>   {
>     return $i;
>   }
> 
>   private function _goto( $i )
>   {
>     return $i;
>   }
> 
>   private function _insert( $location_datapack, $insert_datapack, $logstring )
>   {
>     /*  %insert directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == insert:before or insert:after
>     **  $datapack['arg1'] == text to be inserted into the target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     /*
>     ** The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
>     $return_flag = true;
> 
>     $location_block = trim( $location_datapack['arg1'], " \t");
> 
>     /* Trim spaces and tabs from each end of the
>     ** Location snippet block to avoid unnecessary 'bad target' errors.
>     */
>     $location_block = trim( $location_datapack['arg1'], " \t" );
> 
>     /* insert:before, insert:after, vinsert:before, vinsert:after */
>     $insertion_op = $insert_datapack['name'];
> 
>     $insertion_block = $insert_datapack['arg1'];
> 
>     $logstring .= "(%$insertion_op%)&nbsp;";
> 
>     /* The modlister has verified this location as not installed and having unique
>     ** location code. We'll trust that and just go ahead and install the directive
>     ** without testing for those things again.
>     */
> 
>     /* We no longer bother users with fragment errors. We simply move the insertion
>     ** point to the beginning or end of the line and provide CRLF for separation.
>     */
>     if( false !== $p = strpos( $this->target_file_contents, $location_block ) )
>     {
>       /* Position pointer for insertion. */
>       if( $insertion_op == 'insert:after' || $insertion_op == 'vinsert:after' )
>       {
>         /* Snip has been trimmed of spaces and tabs to avoid bad target errors if
>         ** these change for some reason.  Expand from the end of the snip out to the
>         ** CRLF so we don't accidentally insert our snip into the middle of the
>         ** existing location block. The pointer $p will become the insertion point.
>         */
> 
>         $p = $p + strlen( $location_block );
>         while( isset( $this->target_file_contents[$p] ) && $this->target_file_contents[$p] != "\r" )
>         {
>           $p++;
>         }
> 
>         /* Provide separation from location code block. */
>         $insertion_block = "\r\n".$insertion_block;
> 
>         /* Insert the new code into the target file */
>         $this->target_file_contents = substr_replace( $this->target_file_contents, $insertion_block, $p, 0 );
> 
>       }
>       elseif( $insertion_op == 'insert:before' || $insertion_op == 'vinsert:before' )
>       {
>         /* Snip has been trimmed of spaces and tabs to avoid bad target errors if
>         ** these change for some reason.  Expand from the start of the block back to
>         ** the CRLF so we don't accidentally insert our block into the middle of the
>         ** existing location block. The pointer $p will become the insertion point.
>         */
>         while( isset( $this->target_file_contents[$p] ) && $this->target_file_contents[$p] != "\n" )
>         {
>           $p--;
>         }
>         $p++;
5,7c487
<    Public Methods:
<       $this->install( $cfgpath );
<       $this->batch_install( $cfgpathlist );
---
>         $insertion_block = $insertion_block."\r\n";
8a489,569
>         /* Insert the new code into the target file */
>         $this->target_file_contents = substr_replace( $this->target_file_contents, $insertion_block, $p, 0 );
>       }
> 
>       /* Verify success */
>       if( false !== strpos( $this->target_file_contents, $insertion_block ) )
>       {
>         $this->locations_installed++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['installed']}</span>";
>       }
>       else
>       {
>         /* Should never see this error, but write permissions should be checked. */
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['cantinst']}</span>";
>         $this->num_errors++;
>         $return_flag = false;
>       }
>     }
>     else
>     {
>       /* Should never see this error since modlister already checked for a good
>       ** target.
>       */
>       $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['badtarget']}</span>";
>       $this->num_errors++;
>       $return_flag = false;
>     }
> 
>     $this->add_logevent( $logstring );
>     return $return_flag;
>   } // _insert()
> 
>   private function _label( $i )
>   {
>     return $i;
>   }
> 
>   private function _location( $i )
>   {
>     /*  %location directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == location
>     **  $datapack['arg1'] == text to be inserted into the target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     /* Target file must be open to operate on it.*/
>     if( !$this->istarget )
>     {
>       /* Skip over both location and editor directives */
>       return $i+1;
>     }
> 
>     /* Break out the location directive datapack from the parse table.*/
>     $location_datapack = $this->parse_table[$i];
>     $line = $location_datapack['line'];
>     $flag = $location_datapack['flag'];
> 
>     /* A file editing directive always follows %location in the parse table.*/
>     $i++;
>     $modifier_datapack = $this->parse_table[$i];
>     $modifier_name = $modifier_datapack['name'];
> 
>     while( true )
>     {
>       $logstring = "{$this->admtext['line']} $line: <span class='tag'>%location:%</span>&nbsp;";
> 
>       $this->locations_required++;
> /*
>       // TARGET FILE NOT OPENED FOR SOME REASON - NO POINT PROCESSING LOCATIONS
>       if( empty( $this->active_target_file) )
>       {
>         if( $flag == self::FLAG_OPTIONAL )
>         {
>           $this->locations_required--;
>         }
>         break;
>       }
11c572,614
< require_once 'classes/modparser.class.php';
---
>       /* Call the appropriate file editing directive function to install the location. */
>       $function = $this->proclist[$modifier_name];
>       $this->$function( $location_datapack, $modifier_datapack, $logstring );
>       break;
> 
>     } // while
> 
>     return $i;
>   }
> 
>   private function _mkdir( $i )
>   {
>     /*  %mkdir directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == mkdir
>     **  $datapack['arg1'] == directory (folderpath) to be created
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == if any, optinal @
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     $mkdir_datapack = $this->parse_table[$i];
> 
>     $line = $mkdir_datapack['line'];
> 
>     $directory_path = $mkdir_datapack['arg1'];
>     $display_path = str_replace( $this->rootpath, '', $directory_path );
>     $logstring = "{$this->admtext['line']} $line: <span class='tag'>%mkdir:</span><span class='tgtfile'>$display_path</span><span class='tag'>%</span>&nbsp;";
> 
>     $this->newdirs_required++;
> 
>     while( true )
>     {
>       if( file_exists( $directory_path ) )
>       {
>         $this->newdirs_required--;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['exists']}</span>";
>         break;
>       }
> 
>       /* Create the requested directory */
>       mkdir( $directory_path, 0777, true );
13c616,677
< class modinstaller extends modparser {
---
>       if( file_exists( $directory_path ) )
>       {
>         $this->newdirs_created++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['created']}</span>";
>         break;
>       }
>       else
>       {
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['notcreated']}</span>";
>         break;
>       }
>       break;
>     }
>     $this->add_logevent( $logstring );
>     return $i;
>   } // mkdir()
> 
>   private function _name( $i )
>   {
>     return $i;
>   }
> 
>   private function _newfile( $i )
>   {
>     /*  %newfile directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == newfile
>     **  $datapack['arg1'] == filepath for new file
>     **  $datapack['arg2'] == content of new file
>     **  $datapack['arg3'] == version number of new file
>     **  $datapack['flag'] == flag if any
>     **  $datapack['goto'] == empty
>     */
> 
>     /* Only current table entry needed so simplify code */
>     $newfile_datapack = $this->parse_table[$i];
> 
>     $line = $newfile_datapack['line'];
>     $flag = $newfile_datapack['flag'];
> 
>     /* Full server file path.*/
>     $new_filepath = $newfile_datapack['arg1'];
> 
>     /* Short version of file name for display.*/
>     $new_file = str_replace( $this->rootpath, '', $new_filepath );
> 
>     $logstring = "{$this->admtext['line']} $line: <span class='tag'>%newfile:</span><span class='tgtfile'>$flag$new_file</span><span class='tag'>%</span>&nbsp;";
> 
>     $this->newfiles_required++;
> 
>     while( true )
>     {
>        /* Do no overcopy protected file */
>       if( file_exists( $new_filepath ) )
>       {
>         if( $flag == self::FLAG_PROTECTED )
>         {
>           $this->newfiles_excused++;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['protected']}</span>";
>          break;
>         }
>       }
15c679,710
<    protected $classID = "installer";
---
>       $newfile_content = $newfile_datapack['arg2'];
>       if( !empty( $newfile_content ) )
>       {
>         if( false !== $this->write_file_buffer( $new_filepath, $newfile_content ) )
>         {
>           $this->newfiles_created++;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['created']}</span>";
>           break;
>         }
>         // optional file not created?
>         elseif( $flag == self::FLAG_OPTIONAL )
>         {
>           $this->newfiles_excused++;
>           $logstring .= "{$this->admtext['optnotcreated']}&nbsp;<span class='msgapproved'>{$this->admtext['bypassed']}</span>";
>           break;
>         }
>         else
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['notcreated']}</span>";
>           break;
>         }
>       }
>       else
>       {
>           /* No content found for new file */
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['errors']}</span>";
>           break;
>       }
>       break;
>     } // while(true)
17,489c712,835
<    public function __construct( $objinits ) {
<       parent::__construct( $objinits );
<    }
< 
<    public function install( $cfgpath ) {
<       $this->cfgpath = $cfgpath;
<       $this->cfgfile = $cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
<       $this->parse_error = array();
<       $this->mod_status = '';
< 
<       // GET PARSE TABLE FOR THIS MOD
<       $tags = $this->parse( $cfgpath );
<       $tags=$this->arrange_table( $tags );       
< 
<       // LOG THE MOD INSTALLATION
<       $this->new_logevent( "{$this->admtext['installing']} <strong>$cfgpath</strong>" );
< 
<       if( empty( $tags ) && empty( $this->parse_error ) ) {
<             $this->mod_status = self::CANTINST;
<             $this->add_logevent( "<span class=\"msgerror\">parse table {$this->admtext['missing']}</span>" );
<             $this->write_eventlog( $error=true );
<             return false;
<       }
< 
<       // HANDLE FATAL ERROR
<       if( !empty( $this->parse_error ) ) {
<          $this->modname = $cfgfile;
<          $this->mod_status = self::ERRORS;
<          $idx = $this->parse_error['text'];
<          $this->add_logevent("<span class=\"msgerror\">$cfgfile</span> <span class=\"hilighterr msgbold\">{$this->admtext[$idx]}</span>");
<          $this->write_eventlog();
<          return false;
<       }
< 
<       // INITIALIZE STATUS DATA
< 		$locations_required = 0;
< 		$locations_installed = 0;
<       $newdirs_required = 0;
<       $newdirs_created = 0;
<       $newdirs_excused = 0;
<       $newfiles_required = 0;
<       $newfiles_created = 0;
<       $newfiles_excused = 0;
<       $copyfiles_required = 0;
<       $copyfiles_copied = 0;
<       $copyfiles_excused = 0;
<       $statstring ='';
<       $num_errors = 0;
< 
<       // PROCESS PARSE TABLE TO INSTALL THE CURRENT MOD
<       for( $j=0; isset($tags[$j]); $j++ ) {
< 
<          // IGNORE TAGS THAT WON'T BE INSTALLED IN TARGET FILE
<          if( $this->is_infotag( $tags[$j]['name'] ) ) continue;
< 
< /*************************************************************************
<          TARGETS
< *************************************************************************/
<          if( $tags[$j]['name'] == 'target' ) {
<             $flag = $tags[$j]['flag'];
< 
<             // DEPLOYED FILES WILL BE INSTALLED IN ORDER FOUND IN CFG SO IGNORE THIS
<             if( $tags[$j]['arg1'] == 'files') continue;
< 
< 
<             // NEW TARGET FILE? SAVE CURRENT TARGET BUFFER IF ANY;
<             if( !empty( $active_target_file ) && !empty( $target_file_contents ) ) {
<                if( false === $this->write_file_buffer( $active_target_file, $target_file_contents ) ) {
<                   $num_errors++;
<                   $logstring = "<span class=\"msgerror\">{$this->admtext['cantwrite']} %target:</span><span class=\"tgtfile\">$display_path</span><span class=\"tag\">%</span>&nbsp;";
<                   $this->add_logevent( $logstring );
<                }
<                else {
<                   unset( $target_file_contents );
<                }
<             }
< 
<             // INIT VARS FOR NEW TARGET FILE
<             $target_file_contents = null;
<             $active_target_file = $tags[$j]['arg1'];
< 
<             // REMOVE ROOTPATH PORTION OF TARGET FILE PATH FOR LOG DISPLAY
<             $display_path = $flag . str_replace( $this->rootpath, '', $tags[$j]['arg1'] );
< 
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: <span class=\"tag\">%target:</span><span class=\"tgtfile\">$display_path</span><span class=\"tag\">%</span>&nbsp;";
< 
<             // READ TARGET FILE CONTENTS INTO PROCESSING BUFFER
<             $target_file_contents = $this->read_file_buffer(
<                $tags[$j]['arg1'],
<                $flag );
< 
<             // REPORT FILE ERRORS IF ANY
<             if( is_numeric( $target_file_contents ) ) {
<                switch( $target_file_contents ) {
<                   case self::BYPASS:
<                      $logstring .= "{$this->admtext['optmissing']}&nbsp;<span class=\"msgapproved\">{$this->admtext['bypassed']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   case self::NOFOUL:
<                      $num_errors++;
<                      $logstring .= "{$this->admtext['tgtmissing']}&nbsp;<span class=\"msgerror\">{$this->admtext['required']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   case self::NOFILE:
<                      $num_errors++;
<                      $logstring .= "<span class=\"msgerror\">{$this->admtext['tgtmissing']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   case self::NOWRITE:
<                      $num_errors++;
<                      $logstring .= "<span class=\"msgerror\">{$this->admtext['notwrite']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   case self::ISEMPTY:
<                      $num_errors++;
<                      $logstring .= "<span class=\"msgerror\">{$this->admtext['emptyfile']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   default:
<                      break;
<                }
<                // don't try to write to defective file
<                $active_target_file = '';
<                $targt_file_contents = '';
<                $istarget = false;
<             }
<             else {
<                $istarget = true;
<                $active_target_file = $tags[$j]['arg1'];
<                $logstring .= "{$this->admtext['opened']}";
<                $this->add_logevent( $logstring );
<             }
<             continue;
<          } // target
< /*************************************************************************
<          LOCATIONS
< *************************************************************************/
<          if( $tags[$j]['name'] == 'location' ) {
<             if( !$istarget ) continue;
<             $locations_required++;
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: <span class=\"tag\">%location:%</span>&nbsp;";
< 
<             // TARGET FILE NOT OPENED FOR SOME REASON - NO POINT PROCESSING LOCATIONS
<             if( empty( $active_target_file) ) {
<                if( $tags[$j]['flag'] == self::FLAG_OPTIONAL ) {
<                   $locations_required--;
<                }
<                continue;
<             }
<             // TARGET FILE OPEN & READY FOR MODIFICATION
<             else {
<                $tng_code = $tags[$j]['arg1'];
<                $tng_code_trimmed = trim( $tng_code, " \t");
<                $j++; // go to next tag (the optag)
<                $optag = $tags[$j]['name'];
<                $new_code = $tags[$j]['arg1'];
<                $logstring .= "(%.$optag:)&nbsp;";
< 
<                // CONSTRUCT SEARCH AND INSERT/REPLACE STRINGS
<                $block_op = false;
<                switch( $optag ) {
<                   case 'insert:before':
<                   case 'vinsert:before':
<                      $tngcode = $tng_code_trimmed;
<                      $newcode = $new_code."\r\n";
<                      $block_op = true;
<                      break;
<                   case 'insert:after':
<                   case 'vinsert:after':
<                      $tngcode = $tng_code_trimmed;
<                      $newcode = "\r\n".$new_code;
<                      $block_op = true;
<                      break;
<                   case 'replace':
<                      $tngcode = $tng_code_trimmed;
<                      $newcode = $new_code;
<                      $block_op = true;
<                      break;
<                   case 'triminsert:before':
<                      $tngcode = $tng_code;
<                      $newcode = $new_code.$tng_code;
<                      break;
<                   case 'triminsert:after':
<                      $tngcode = $tng_code;
<                      $newcode = $tng_code.$new_code;
<                      break;
<                   case 'trimreplace':
<                      $tngcode = $tng_code;
<                      $newcode = $new_code;
<                      break;
<                   default:
<                      break;
<                }
< 
<                // IF MOD ALREADY INSTALLED ACCEPT IT AND MOVE ON
<                if( false !== strpos( $target_file_contents, $newcode ) ) {
<                   $locations_installed++;
<                   $logstring .= "<span class=\"msgapproved\">{$this->admtext['installed']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
< 
<                // SET POINTER TO BEGINNING OF GOOD TARGET 
<                if( false === $i = strpos( $target_file_contents, $tngcode ) ) {
<                   $num_errors++;
<                   $logstring .= "<span class=\"msgerror\">{$this->admtext['badtarget']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
< 
< 
<                // USE POINTER TO MARK START AND END POSITIONS OF TNG BLOCK IN TARGET FILE
<                if( $block_op ) {
<                   $fragment = false;
<                   // SELECT BLOCK OF TEXT IN TARGET FILE TO OPERATE ON
<                   // set pointer ($p) to beginning of matched text from cfg and move it
<                   // backwards back to end of previous CRLF or top of file,
<                   // skipping white space but checking to see if we have additional
<                   // code -- considered a fragment (incomplete block)
<                   $p = $i;
<                   while( $p > 0 ) {
<                      $p--;
<                      if( $target_file_contents[$p] == "\n" ) {
<                         $p++;
<                         break;
<                      }
<                      if( $target_file_contents[$p] != " " && $target_file_contents[$p] != "\t" ) {
<                         $fragment = true;
<                      }
<                   }
<                   $start = $p;
< 
<                   // set pointer to end of last line of target and move it forward to CRLF
<                   // or end of file, skipping white space but checking for data between
<                   // end of the target and the end of the block (CRLF) making it a fragment
<                   $p = $i + strlen( $tngcode ); // last position in target str
<                   while( true ) {
<                      if( !isset($target_file_contents[$p] ) ) { // EOF - no CRLF
<                         break;
<                      }
<                      if( $target_file_contents[$p] == "\r" ) { // CRLF
<                         break;
<                      }
<                      if( $target_file_contents[$p] != " " && $target_file_contents[$p] != "\t" ) {
<                         $fragment = true;
<                      }
<                      $p++;
<                   }
<                   $end = $p;
<                   $length = ( $end - $start ) + 1;
< 
<                   // SEE THAT %REPLACE:% REPLACES A COMPLETE BLOCK
<                   if( $fragment && $optag == "%replace:%" ) {
<                      $num_errors++;
<                      $logstring .= "<span class=\"msgerror\">{$this->admtext['no_frag']}</span>";
<                      $this->add_logevent( $logstring );
<                      continue;
<                   }
<                }
<                else { // OTHERWISE CFG CODE AND TGT MUST EXACTLY MATCH EACH OTHER
<                   $start = $i;
<                   $length = strlen( $tngcode );
<                   $end = ( $start + $length );
<                }
< 
<                // FIND START POSITION AND LENGTH FOR SUBSTR_REPLACE() FUNCTION
<                // Double quotes here to make these unique (single quotes above)
<                switch( $optag ) {
<                   case "insert:before":
<                   case "vinsert:before":
<                      $pos = $start;
<                      $len = 0; // zero for insert at $pos; # for amount of tgt to replace
<                      break;
<                   case "insert:after":
<                   case "vinsert:after":
<                      $pos = $end;
<                      $len = 0;
<                      break;
<                   case "replace":
<                   case "triminsert:before":
<                   case "triminsert:after":
<                    case "trimreplace":
<                      $pos = $start;
<                      $len = $length;
<                      break;
<                   default:
<                      break;
<                }
< 
<                // modify the target file contents
<                $target_file_contents = substr_replace( $target_file_contents, $newcode, $pos, $len );
< 
<                // test for success
<                if( false !== strpos( $target_file_contents, $newcode ) ) {
<                   $locations_installed++;
<                   $logstring .= "<span class=\"msgapproved\">{$this->admtext['installed']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<                else {
<                   $num_errors++;
<                   $logstring .= "<span class=\"msgerror\">{$this->admtext['badinstall']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<             } // open target file
<          } // locations
< /*************************************************************************
<          COPYFILE OPERATIONS
< *************************************************************************/
<          if( $tags[$j]['name'] == 'copyfile' || $tags[$j]['name'] == 'copyfile2' ) {
<             $flag = $tags[$j]['flag'];
<             $copyop = $tags[$j]['name'];
<             $copyfiles_required++;
<             $source_path = $tags[$j]['arg1'];
<             $source_file = pathinfo( $source_path, PATHINFO_BASENAME );
<             //echo $source_path;exit;
<             $filename = pathinfo( $source_path, PATHINFO_BASENAME );
<             $destination_path = $tags[$j]['arg2'];
<             $dest_path = str_replace( $this->rootpath, '', $destination_path );
< 
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: %<span class=\"tag\">{$tags[$j]['name']}:</span>";
<             $logstring .= "<span class=\"tgtfile\">{$flag}$dest_path</span>%&nbsp;";
< 
<             if( !file_exists( $source_path ) ) {
<                if( $flag == self::FLAG_OPTIONAL ) {
<                   $copyfiles_excused++;
<                   $logstring .= "{$this->admtext['optsrcfilemissing']}&nbsp;<span class=\"msgapproved\">{$this->admtext['bypassed']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<                else {
<                   $num_errors++;
<                   $logstring .= "<span class=\"msgerror\">{$this->admtext['srcfilemissing']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<             }
<             // DO NOT OVERCOPY PROTECTED FILE
<             if( file_exists( $destination_path ) ) {
<                if( $flag == self::FLAG_PROTECTED ) {
<                   $copyfiles_excused++;
<                   $logstring .= "<span class=\"msgapproved\">{$this->admtext['protected']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<             }
< 
<          	if( @copy( $source_path, $destination_path ) === false ) {
<                // failed copy excused?
<                if( $flag == self::FLAG_OPTIONAL ) {
<                   $copyfiles_excused++;
<                   $logstring .= "{$this->admtext['optnocopy']}&nbsp;<span class=\"msgapproved\">{$this->admtext['bypassed']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<                // failed copy
<                else {
<                   $num_errors++;
<                   $logstring .= "<span class=\"msgerror\">{$this->admtext['notcopied']}</span>";
<              		$this->add_logevent( $logstring );
<                   continue;
<                }
<          	}
<             else {
<                // copy was successful
<                $copyfiles_copied++;
<                $logstring .= "<span class=\"msgapproved\">{$this->admtext['copied']}</span>";
<                $this->add_logevent( $logstring);
<                continue;
<          	}
<          }
<  /*************************************************************************
<          NEWFILE OPERATIONS
< *************************************************************************/
<          elseif( $tags[$j]['name'] == 'newfile' ) {
<             $flag = $tags[$j]['flag'];
<             $newfiles_required++;
<             $destination_file = $tags[$j]['arg1'];
<             $dest_file = str_replace( $this->rootpath, '', $destination_file );
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: <span class=\"tag\">%newfile:</span><span class=\"tgtfile\">{$flag}$dest_file</span><span class=\"tag\">%</span>&nbsp;";
< 
<             // DO NOT OVERCOPY PROTECTED FILE
<             if( file_exists( $destination_file ) ) {
<                if( $flag == self::FLAG_PROTECTED ) {
<                   $newfiles_excused++;
<                   $logstring .= "<span class=\"msgapproved\">{$this->admtext['protected']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<             }
< 
<             $newfile_code = $tags[$j]['arg2'];
<             if( !empty( $newfile_code ) ) {
< 			      if( false !== $this->write_file_buffer( $destination_file, $newfile_code ) ) {
<             		$newfiles_created++;
<                   $logstring .= "<span class=\"msgapproved\">{$this->admtext['created']}</span>";
<             		$this->add_logevent( $logstring );
<                   continue;
<                }
<                // optional file not created?
<                elseif( $flag == self::FLAG_OPTIONAL ) {
<                   $newfiles_excused++;
<                   $logstring .= "{$this->admtext['optnotcreated']}&nbsp;<span class=\"msgapproved\">{$this->admtext['bypassed']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<                else {
<                   $num_errors++;
<                   $logstring .= "<span class=\"msgerror\">{$this->admtext['notcreated']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<             }
< 
<          } // newfiles
<          elseif( $tags[$j]['name'] == 'mkdir' ) {
<             $newdirs_required++;
<             $dirpath = $tags[$j]['arg1'];
<             $display_path = str_replace( $this->rootpath, '', $dirpath );
< 
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: <span class=\"tag\">%mkdir:</span><span class=\"tgtfile\">$display_path</span><span class=\"tag\">%</span>&nbsp;";
<             if( file_exists( $dirpath ) ) {
<                $logstring .= "<span class=\"msgapproved\">{$this->admtext['created']}</span>";
<                $this->add_logevent( $logstring );
<                continue;
<             }
<             mkdir( $dirpath, 0777, true );
<             if( file_exists( $dirpath ) ) {
<                $logstring .= "<span class=\"msgapproved\">{$this->admtext['created']}</span>";
<                $this->add_logevent( $logstring );
<                continue;
<             }
<             else {
<                $logstring .= "<span class=\"msgerror\">{$this->admtext['notcreated']}</span>";
<                $this->add_logevent( $logstring );
<                continue;
<             }
<          }
<       } // tags processing loop
< 
<       // Everything processed, flush last buffer to file
<       if( !empty( $active_target_file ) && !empty( $target_file_contents ) ) {
<          if( false === $this->write_file_buffer( $active_target_file, $target_file_contents ) ) {
<             $num_errors++;
<             $logstring = "<span class=\"msgerror\">{$this->admtext['cantwrite']} %target:</span><span class=\"tgtfile\">$display_path</span><span class=\"tag\">%</span>&nbsp;";
<             $this->add_logevent( $logstring );
<          }
<       }
<       if( !$num_errors ) {
< 
<          // compute the final statistics
<          if( $copyfiles_required == ( $copyfiles_copied + $copyfiles_excused ) && ( $newfiles_required == ( $newfiles_created + $newfiles_excused ) && ( $locations_required == $locations_installed ) ) ) {
<             if( $copyfiles_copied == 0 && $copyfiles_excused == 0 && $newfiles_created == 0 && $newfiles_excused == 0 && $locations_installed == 0 ) {
<                $status = self::OK2INST;
<                $class = "class=\"msgapproved\"";
<             }
<             else {
<             $status = self::INSTALLED;
<             $class = "class=\"msgapproved\"";
<             }
<          }
<       }
<       else {
<          $status = self::ERRORS;
<          $class = "class=\"msgerror\"";
<          $this->batch_error = true;
<       }
<       $this->add_logevent("<span class=\"msgbold\">{$this->admtext['toterrors']}:</span> $num_errors");
<       $this->add_logevent("$locations_required {$this->admtext['modsreq']}: $locations_installed {$this->admtext['modsinst']}" );
<       $this->add_logevent("$copyfiles_required {$this->admtext['copiesreq']}: $copyfiles_copied {$this->admtext['filescopied']} and $copyfiles_excused {$this->admtext['excused']}" );
<       $this->add_logevent("$newfiles_required {$this->admtext['newfilesreq']}: $newfiles_created {$this->admtext['nfcreated']} and $newfiles_excused {$this->admtext['excused']}");
< 		$this->add_logevent("{$this->admtext['status']}: <span $class>{$this->admtext[$status]}</span>");
---
>     $this->add_logevent( $logstring );
>     return $i;
>   } // newfile()
> 
>   private function _note( $i )
>   {
>     return $i;
>   }
> 
>   private function _parameter( $i )
>   {
>     return $i;
>   }
> 
>   private function _private( $i )
>   {
>     return $i;
>   }
> 
>   /* Function _replace() is called by _location(), not by the main program. */
>   private function _replace( $location_datapack, $replace_datapack, $logstring )
>   {
>     /*  %replace directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == replace
>     **  $datapack['arg1'] == replacement text for location in target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     $return_flag = true;
> 
>     /* The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     /* Modlister has already checked that the location snip is a complete
>     ** block of text.  No need to do it again - use it as is.
>     */
>     $location_block = $location_datapack['arg1'];
> 
>     $replace_block = $replace_datapack['arg1'];
> 
>     $logstring .= "(%replace:)&nbsp;";
> 
>     /* Directive processing loop */
>     while( true )
>     {
>       /*
>       ** Target file code block has already been cleared for replacement by modlister,
>       ** so just install and verify it here.
>       */
>       $this->target_file_contents = str_replace( $location_block, $replace_block, $this->target_file_contents );
> 
>       /* Verify success */
>       $num_newblock = substr_count( $this->target_file_contents, $replace_block );
> 
>       if( $num_newblock  == 1 )
>       {
>         $this->locations_installed++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['installed']}</span>";
>         break;
>       }
>       else
>       {
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['notinst']}</span>";
>         $return_flag = false;
>         break;
>       }
>       /* Should never reach this point - must have found multiple replacement blocks.
>       ** Check target file.
>       */
>       $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['errors']}</span>";
>       $return_flag = false;
>       break;
>     } // main while true
> 
>     /* Log the results and return to the _location() function */
>     $this->add_logevent( $logstring );
>     return $return_flag;
>   } // replace()
> 
>   private function _target( $i )
>   {
>     /*  %target directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == target
>     **  $datapack['arg1'] == server filepath to target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == optional note
>     **  $datapack['flag'] == optional flag (@)
>     **  $datapack['goto'] == empty
>     */
> 
>     /* Break out target directive datapack */
>     $target_datapack = $this->parse_table[$i];
> 
>     $line = $target_datapack['line'];
>     $flag = $target_datapack['flag'];
>     $target_filepath = $target_datapack['arg1'];
> 
>     /* Remove rootpath portion of target file path for log display.*/
>     $display_path = $flag . str_replace( $this->rootpath, '', $target_filepath );
> 
>     while(true) /* Target directive processing loop */
>     {
>       /* If previous target file open, save file contents before opening a new one.*/
>       if( !empty( $this->active_target_file ) && !empty( $this->target_file_contents ) )
>       {
>         if( false === $this->write_file_buffer( $this->active_target_file, $this->target_file_contents ) )
>         {
>           $this->num_errors++;
>           $logstring = "<span class='msgerror'> E".__LINE__." {$this->admtext['cantwrite']} %target:</span><span class='tgtfile'>$display_path</span><span class='tag'>%</span>&nbsp;";
>           $return_flag = false;
>           break;
>         }
>         else
>         {
>           unset( $this->target_file_contents );
>         }
>       }
491,494c837,967
<       $this->mod_status = $status;
<       $this->write_eventlog();
<       return ( $status == self::OK2INST || $status == self::INSTALLED );
<    } // install
---
>       $logstring = "{$this->admtext['line']} $line: <span class='tag'>%target:</span><span class='tgtfile'>$display_path</span><span class='tag'>%</span>&nbsp;";
> 
>       /* init variables for new target file and contents.*/
>       $this->target_file_contents = null;
>       $this->active_target_file = '';
> 
>       /* Read target file contents into a processing buffer.*/
>       $this->target_file_contents = $this->read_file_buffer( $target_filepath, $flag );
> 
>       /* Report file errors if any.*/
>       if( is_numeric( $this->target_file_contents ) )
>       {
>         $code = $this->target_file_contents;
>         $this->target_file_contents = '';
>         $this->istarget = false;
> 
>         if( $code == self::BYPASS )
>         {
>           $logstring .= "{$this->admtext['optmissing']}&nbsp;<span class='msgapproved'>{$this->admtext['bypassed']}</span>";
>           break;
>         }
>         elseif( $code == self::NOFOUL )
>         {
>           $this->num_errors++;
>           $logstring .= " E".__LINE__." {$this->admtext['tgtmissing']}&nbsp;<span class='msgerror'>{$this->admtext['required']}</span>";
>           break;
>         }
>         elseif( $code == self::NOFILE )
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['tgtmissing']}</span>";
>           $return_flag = false;
>           break;
>         }
>         elseif( $code == self::NOWRITE )
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['notwrite']}</span>";
>           $return_flag = false;
>           break;
>         }
>         elseif( $code == self::ISEMPTY )
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['emptyfile']}</span>";
>           $return_flag = false;
>           break;
>         }
>         else
>         {
>           $this->num_errors++;
>           $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['errors']}</span>";
>           $return_flag = false;
>           break;
>         }
>       }
>       else
>       {
>         $this->istarget = true;
>         $this->active_target_file = $target_filepath;
>         $logstring .= "{$this->admtext['opened']}";
>       }
>       break;
>     } // while(true) processing loop
> 
>     $this->add_logevent( $logstring );
>     return $i;
>   } // _target()
> 
>   private function _tngversion( $i )
>   {
>     /* No conditionals to be installed */
>     return $i;
>   }
> 
>   private function _textexists( $i )
>   {
>     /* No conditionals to be installed */
>     return $i;
>   }
> 
>   private function _triminsert( $location_datapack, $triminsert_datapack, $logstring )
>   {
>     /*  %triminsert directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == trimreplace:before or triminsert:after
>     **  $datapack['arg1'] == text for insertion into target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     $return_flag = true;
> 
>     /* Function is called by _location(), not by the main program.
>     **
>     ** The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     $location_snip = $location_datapack['arg1'];
> 
>     $triminsert_op = $triminsert_datapack['name']; // triminsert:before or triminsert:after
>     $triminsert_snip = $triminsert_datapack['arg1'];
> 
>     $logstring .= "(%$triminsert_op:)&nbsp;";
> 
>     /* Processing loop */
>     while( true )
>     {
>       if( false === $p = strpos( $this->target_file_contents, $location_snip ) )
>       {
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['badtarget']}</span>";
>         $return_flag = false;
>         break; // break out of main loop and log error
>       }
> 
>       /* Create composite text for testing results.*/
>       if( $triminsert_op == 'triminsert:after')
>       {
>         $composite_text = $location_snip.$triminsert_snip;
> 
>         /* Move insertion point to end of the location snippet.*/
>         $p += strlen( $location_snip );
>       }
>       elseif( $triminsert_op == 'triminsert:before')
>       {
>         $composite_text = $triminsert_snip.$location_snip;
>       }
496,500c969,985
<    public function batch_install( $cfgpathlist ) {
<       foreach( $cfgpathlist as $cfgpath ) {
<          if( !$this->install( $cfgpath ) ) {
<             $this->batch_error = true;
<          };
---
>       /* Modify the target file contents. */
>       $this->target_file_contents =
>         substr_replace( $this->target_file_contents, $triminsert_snip, $p, 0 );
> 
>       /* Test for success. */
>       if( false !== strpos( $this->target_file_contents, $composite_text ) )
>       {
>         $this->locations_installed++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['installed']}</span>";
>         break;
>       }
>       else
>       {
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['badinstall']}</span>";
>         $return_flag = false;
>         break;
502,503c987,1174
<       return !$this->batch_error;
<    }
---
> 
>       /* Processing should never reach this location -- prevent infinite looping. */
>       $this->num_errors++;
>       $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['errors']}</span>";
>       $return_flag = false;
>       break;
>     }
> 
>     $this->add_logevent( $logstring );
>     return $return_flag;
>   }
> 
>   private function _trimreplace( $location_datapack, $trimreplace_datapack, $logstring )
>   {
>     /*  %trimreplace directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == trimreplace
>     **  $datapack['arg1'] == replacement text for location in target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     $return_flag = true;
> 
>     /* Function is called by _location(), not by the main program.
>     **
>     ** The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     /* Use location code and replacement exactly as given in mod config file.
>     ** Trimreplace is not a block operations.
>     */
>     $location_snip = $location_datapack['arg1'];
> 
>     $trimreplace_snip = $trimreplace_datapack['arg1'];
> 
>     $logstring .= "(%trimreplace:)&nbsp;";
> 
>     while( true )
>     {
>       if( false === $p = strpos( $this->target_file_contents, $location_snip ) )
>       {
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['badtarget']}</span>";
>         $return_flag = false;
>         break; // break out of main loop and log error
>       }
> 
>       /* Parameters for substr_replace() */
>       $start = $p;
>       $length = strlen( $location_snip );
>       $end = ( $start + $length );
> 
>       /* Modify the target file contents. */
>       $this->target_file_contents =
>         substr_replace( $this->target_file_contents, $trimreplace_snip, $start, $length );
> 
>       /* Test for success. */
>       if( false !== strpos( $this->target_file_contents, $trimreplace_snip ) )
>       {
>         $this->locations_installed++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['installed']}</span>";
>         break;
>       }
>       else
>       {
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['badinstall']}</span>";
>         $return_flag = false;
>         break;
>       }
> 
>       break;
>     }
> 
>     $this->add_logevent( $logstring );
>     return $return_flag;
>   } // _trimreplace()
> 
>   private function _version( $i )
>   {
>     return $i;
>   }
> 
>   private function _vinsert( $location_datapack, $vinsert_datapack, $logstring )
>   {
>     /* Send it on to _insert() to finish installation. */
>     return $this->_insert( $location_datapack, $vinsert_datapack, $logstring );
>   }
> 
>   private function _wikipage( $i )
>   {
>     return $i;
>   }
> 
>   /*************************************************************
>   SUPPORTING FUNCTIONS
>   *************************************************************/
>   protected function init_properties()
>   {
>     // INITIALIZE STATUS DATA
>     $this->locations_required = 0;
>     $this->locations_installed = 0;
>     $this->newdirs_required = 0;
>     $this->newdirs_created = 0;
>     $this->newdirs_excused = 0;
>     $this->newfiles_required = 0;
>     $this->newfiles_created = 0;
>     $this->newfiles_excused = 0;
>     $this->copyfiles_required = 0;
>     $this->copyfiles_copied = 0;
>     $this->copyfiles_excused = 0;
>     $this->statstring ='';
>     $this->num_errors = 0;
> 
>     $active_target_file = '';
>     $target_file_contents = '';
>     $istarget = false;
>     return;
>   }
> 
>   /* Order directives directives in the parse table to best suit installation.
>   */
>   private function arrange_parse_table()
>   {
>     $mkdirs = array();
>     $copyfiles = array();
>     $others = array();
> 
>     // make new directories available for file copies
>     for( $i=0; isset($this->parse_table[$i]); $i++ )
>     {
>       /* Info directives stay at the top of the table.
>       ** When installing a mod mkdir comes before any file copies to it.
>       ** When removing a mod we place the mkdir directives at the end of the table
>       ** so that any files copied to them can be removed first -- (PHP rmdir cannot
>       ** delete a directory with content.)
>       */
>       /* Keep info directives at beginning of table */
> 
>       switch( $this->parse_table[$i]['name'] )
>       {
>         /* Remove directives that won't need to be installed */
>         case 'name':
>         case 'version':
>         case 'description':
>         case 'note':
>         case 'private':
>         case 'author':
>         case 'wikipage':
>           break;
> 
>         /* Collect the mkdir directives */
>         case 'mkdir':
>           $mkdirs[] = $this->parse_table[$i];
>           break;
> 
>         /* Collect file copy and newfile directives */
>           case 'copyfile':
>           case 'copyfile2':
>           case 'newfile':
>             $copyfiles[] = $this->parse_table[$i];
>             break;
>         default:
>             /* Collect all other directives in order found */
>             $others[] = $this->parse_table[$i];
>           break;
>       }
>     }
> 
>     /* Rebuild the parse table */
>     $this->parse_table = array();
> 
>     foreach( $mkdirs as $mkdir)
>       $this->parse_table[] = $mkdir;
> 
>     foreach( $copyfiles as $copyfile )
>       $this->parse_table[] = $copyfile;
> 
>     foreach( $others as $other)
>       $this->parse_table[] = $other;
> 
>     return $this->parse_table;
>   } // arrange_parse_table()
> 
506c1177,1210
< ?>
\ No newline at end of file
---
> function new_modinstaller()
> {
>   global $admtext, $tngconfig;
> 
>   require $tngconfig['subroot'].'mmconfig.php';
>   require $tngconfig['subroot'].'config.php';
> 
>   if( !isset( $admtext['modlist'] ) )
>   {
>     $textpart = 'mods';
>     $mylanguage = $_SESSION['session_language'];
>     require 'languages/'.$mylanguage.'/admintext.php';
>     /* Force reload cust_text.php */
>     require 'languages/'.$mylanguage.'/alltext.php';
>   }
>   require 'version.php';
>   $sitever = getSiteVersion();
>   $mhuser = isset( $_SESSION['currentuserdesc'] ) ? $_SESSION['currentuser'] : "";
> 
>   $objinits = array (
>     'rootpath'     => $rootpath,
>     'subroot'      => $tngconfig['subroot'],
>     'modspath'     => $modspath,
>     'extspath'     => $extspath,
>     'options'      => $options,
>     'time_offset'  => $time_offset,
>     'sitever'      => $sitever,
>     'currentuserdesc' => $mhuser,
>     'admtext'      => $admtext,
>     'tng_version'  => $tng_version
>   );
> 
>   return new modinstaller( $objinits );
> }
\ No newline at end of file
diff -r TNG/classes/modlister.class.php TNG1403/classes/modlister.class.php
3c3
<    Mod Manager 12 Mod Lising Class
---
>    Mod Manager 14.0.0.1 Modlisting Class
5,11c5
<    Class extends modparser.  It lists mod config filesaccording to selectable
<    filters, does basic error checking, shows identifying information, displays
<    installation status and lists files affected.
< 
<    Incorporates 1) mod listing enhancements by Robin Richmond and 2) a button
<    by Jeff Robison to show detailed status for Installed or OK to install mods
<    (default is not to show any detail for them.)
---
>    Construction: Modbase -> Modparser -> Modvalitator -> Modlister
12a7,9
>    Class extends modvalidator.  It lists mod config files according to
>    selectable filters, does basic error checking, shows identifying
>    information, displays installation status and lists files affected.
14,16c11,13
<    Public Methods:
<       $this->list_mods();
< */
---
>    Incorporates 1) mod listing enhancements by Robin Richmond and 2)
>    a button by Jeff Robison to show detailed status for Installed or
>    OK to install mods (default is not to show any detail for them.)
18c15
< include_once 'classes/modparser.class.php';
---
>    Class code refactored in 2022 by Rick Bisbee.
20c17,19
< class modlister extends modparser {
---
>    Public Methods:
>       $this->list_mods(); // list all mods
>       $this->set_modfile(); // set mod list with just one file.
22,54c21
< /*
<    // filter
<    const F_ALL = 0;
<    const F_READY = 1;
<    const F_INSTALLED = 2;
<    const F_CLEAN = 3;
<    const F_BADCFG = 4;
<    const F_SELECT = 5;
< 
<    // sorting
<    const NAMECOL = "0";
<    const FILECOL = "1";
< 
<    // processing
<    const INSTALL = 1;
<    const REMOVE = 2;
<    const DELETE = 3;
<    const CLEANUP = 4;
<    const EDITP = 5;
<    const UPDATEP = 6;
<    const RESTOREP = 7;
< 
<    // status
<    //const OK2INST     = 'ok2inst';
<    const PARTINST    = 'partinst';
<    //const INSTALLED   = 'installed';
<    const NOTINST     = 'notinst';
<    const LINE        = 'line';
< 
<    // errors
<    const NOPARAM     = 'noparam';
<    const NOLOCATION  = 'nolocation';
<    const NOACT       = 'noact';
---
>    PHP function new_modlister();
55a23,40
> if(!isset($id) AND !empty($_SESSION['actualmod']))
> {
>   $id = $_SESSION['actualmod'];
>   $_SESSION['actualmod'] = "";
> }
> 
> /* File management */
> $modlister_version = '14.0.0.1 221107-0615';
> 
> include_once 'classes/modvalidator.class.php';
> 
> #[AllowDynamicProperties]
> class modlister extends modvalidator
> {
>     function __construct( $objinits )
>     {
>       parent::__construct( $objinits );
>     }
57,77c42
<    protected $classID = "lister";
< 
<    public $filter = self::F_ALL;
<    public $fbox_checked = false;
<    public $modlist = array();
< 
<    protected  $parameters = 0;
<    protected $num_errors = 0;
<    protected $num_required = 0;
<    protected $mods_required = 0;
<    protected $copies_required = 0;
<    protected $newfiles_required = 0;
<    protected $newdirs_required = 0;
<    protected $num_installed = 0;
<    protected $mods_installed = 0;
<    protected $copies_installed = 0;
<    protected $newfiles_installed = 0;
<    protected $newdirs_installed = 0;
<    protected $provisional_errors = 0;
<    protected $status_string = '';
<    protected $warning = '';
---
>     protected $classID = "lister";
79,81c44,162
<    function __construct( $objinits ) {
<       parent::__construct( $objinits );
<    }
---
>     public $filter = self::F_ALL;
>     public $fbox_checked = false;
>     public $modlist = array();
>     public $session_sortby = 0;
> 
>     protected $target_file_contents = '';
>     protected $active_target_file = '';
>     protected $is_target = false;
>     protected $affected_files = array();
>     protected $target_location_count = 0;
>     protected $authors = array();
>     protected $isprivate = false;
>     protected $author = array();
>     protected $name = '';
> 
>     protected $borderleft = '';
>     protected $borderbl = '';
> 
>     /* Status message templates - used with sprintf to centralize
>     ** mod listing message styles for ease of maintenance.
>     ** The digit in the name refers to the number of arguments
>     ** required by sprintf(). */
> 
>     /* just the status word */
>     protected $m_approved1 = "<span class='msgapproved'>%s</span>";
> 
>     protected $m_approved1h = "<span class='hilight'>%s</span>";
> 
>     protected $m_approved1p = "<span>%s</span>";
> 
>     /* status word & status word */
>     protected $m_approved1x2 = "%s&nbsp;<span class='msgapproved'>%s</span>";
> 
>     /* Directive name & status word */
>     protected $m_approved2 = "<span style='color:navy'>%%%s</span> <span class='msgapproved'>%s</span>";
> 
>     protected $m_approved2h = "<span style='color:navy'>%%%s</span> <span class='hilight'>%s</span>";
> 
>     protected $m_approved2p = "<span style='color:navy'>%%%s</span> <span>%s</span>";
> 
>     /* error number, status word */
>     protected $m_error2 = "<span class='tag'>v%d&nbsp;</span><span class='hilighterr msgbold'>&nbsp; %s</span>";
> 
>     /* Error number, directive name & status word */
>     protected $m_error3 = "<span class='tag'>v%d&nbsp;</span><span class='hilighterr msgbold'>%%%s %s</span>";
>     protected $m_error3x2 = "<span class='tag'>v%d&nbsp;</span><span class='hilighterr msgbold'>%s %s</span>";
> 
>     public function list_mods()
>     {
>       $this->sysmsg = '';
> 
>       /* Verify that the TNG modspath and extspath are accessible
>       ** and get the mods listing
>       **/
>       while(true)
>       {
>         // DISPLAY BIG SYSTEM MESSAGE IF NO MODFILES ARE FOUND
>         if( empty( $this->modspath ) )
>         {
>           /* $modspath not defined/present in config.php */
>           $this->sysmsg = "<span class='msgerror'>\$modspath {$this->admtext['missing']}";
>           break;
>         }
> 
>         if( empty( $this->extspath ) )
>         {
>           /* $extspath not defined/present in config.php */
>           $this->sysmsg = "<span class='msgerror'>\$extspath {$this->admtext['missing']}";
>           break;
>         }
> 
>         /* Attempt to get mod file listing from mods directory */
>         $modlisting = $this->get_modlisting();
> 
>         if( !is_numeric( $modlisting ) )
>           /* Mod listing succeeded -- break exit the error testing loop */
>           break;
> 
>         if( $modlisting == self::NOPATH )
>         {
>           $this->sysmsg = "{$this->admtext['cannotopendir']}: ".
>                             rtrim($this->modspath, "/")."!";
>           break;
>         }
> 
>         if( $modlisting == self::NOMODS )
>         {
>           $this->admtext['nomods'] = str_replace( "xxx", "cfg",
>                                       $this->admtext['nomods'] );
>           $this->sysmsg = "{$this->admtext['nomods']} - ".
>                             rtrim($this->modspath, "/");
>           break;
>         }
> 
>         if( $modlisting == self::NOREAD )
>         {
>           $this->sysmsg = "{$this->admtext['noaccess']} - ".
>                             rtrim($this->modspath, "/" );
>           break;
>         }
> 
>         if( !empty( $this->sysmsg ) )
>         {
>           break;
>         }
> 
>         $this->sysmsg = "Modlister:line ".__LINE__.' '.$this->admtext['errors'];
>         break;
>       } // verify access to modspath and extspath & and get modfile listing
> 
>       $this->display_filterbar();
>       $this->display_headings();
> 
>       /* If mod folder or mod files inaccessible show system msg and quit */
>       if( !empty( $this->sysmsg ) )
>       {
>         $this->sys_msg( $this->sysmsg );
>         return;
>       }
83c164,165
<    public function list_mods() {
---
>       /* Fix capitalization in admtext array. */
>       $this->admtext['line'] = strtolower( $this->admtext['line'] );
85,87c167,176
<       // SEE IF USER'S MOD OPTIONS FILE NEEDS UPDATING
<       if( !isset( $this->delete_support ) ) {
<          $sysmsg = $this->admtext['updateopts'];
---
>       /* Set borders according to whether selection boxes are displayed. */
>       if( !empty($_POST['filter'] ) )
>       {
>         $this->borderleft = '';
>         $this->borderbl = '';
>       }
>       else
>       {
>         $this->borderleft = 'roundleft';
>         $this->borderbl = 'roundbl';
90c179
<       // APPROVED LIST OF MODFILES PASSED BY FILTER FOR DISPLAY
---
>       /* Approved list of modfiles passed by filter for display. */
92c181,182
<       if( !empty( $this->modlist ) ) {
---
>       if( !empty( $this->modlist ) )
>       {
97,98d186
<       // fix capitalization in admtext array
<       $this->admtext['line'] = strtolower( $this->admtext['line'] );
99a188
>       //$modlisting = $this->get_modlisting();
101c190
<       FILTER WHICH MODS ARE LISTED
---
>       LIST STATUS OF EVERY MOD IN THE MOD DIRECTORY
103c192,194
<       $lockit = "";
---
>       foreach( $modlisting as $cfgfile => $modname )
>       {
>         if( !empty( $selected_mods ) && !in_array( $cfgfile, $selected_mods ) ) continue;
105,128c196,240
<       // SET SELECTED VALUE FROM FILTER DROP DOWN LIST
<       $s0 = $s1 = $s2 = $s3 = $s4 = $s5 = '';
<       ${'s'.$this->filter} = "selected";
< 
<       // FIXED OR SCROLLING HEADER & FILTER BAR?
<       $fbclass = $this->fix_header == self::YES ? "fbar-fixed" : "fbar-scroll";
<       $mmlistclass = $this->fix_header == self::YES ? "mmlist-fixed" : "mmlist-scroll";
< 
<       // SET FILTER BAR ACTION BUTTONS
<       $btnline = $this->setup_filter_line( $this->filter );
< 
<       // FILTER LOCK AND BATCH OPERATIONS FILE SELECTOR
<       if( $this->filter != self::F_ALL ) {
< 
<          // set lock on by default for this filter
<          if( $this->filter == self::F_SELECT ) {
<             $cbchecked = 'checked';
<             $_SESSION['filter'] = self::F_SELECT;
<          }
<          else {
<             $cbchecked = $this->fbox_checked ? "checked" : "";
<          }
<          $lockit .= "
<             {$this->admtext['stayon']}&nbsp;&nbsp;<input type=\"checkbox\" id=\"stayon\" $cbchecked/>";
---
>         // INITIALIZE DYNAMIC ELEMENTS FOR THIS MOD
>         // mod info
>         $this->cfgfile = $cfgfile;
>         $this->cfgpath = $this->rootpath.$this->modspath.'/'.$cfgfile;
>         $this->init_class_properties();
> 
>         $this->parse_table = array();
> 
>         /* Single mod processing loop */
>         while( true )
>         {
>           /* If mod does not validate, break and let display_modline()
>           ** handle the parse error */
>           if( !$this->validate( $this->cfgfile) ) break;
> 
>           /*************************************************************
>           PROCESS PARSE TABLE DIRECTIVES TO LIST STATUS OF CURRENT MOD
>           *************************************************************/
>           for($i=0; isset( $this->parse_table[$i] ); $i++ )
>           {
>             $directive = $this->parse_table[$i];
>             $directive_name = $directive['name'];
> 
>             /* The location directive processes all file modifying
>             ** directives, so bypass them here*/
>             if( in_array( $directive_name, $this->file_modifiers ) )
>               continue;
> 
>             /* PHP allows assignment of a function name to a variable
>             ** and then executing the "variaable" with arguments. We get
>             ** the function name associated with this directive from
>             ** $proclist.*/
>             $function = $this->proclist[$this->parse_table[$i]['name']];
> 
>             /* If for some reason the function lookup fails, publish the
>             ** error. This can happen if the $i index gets unsynched with
>             ** the parse_table -- a definite MM error.*/
>             if( !is_string( $function ) )
>             {
>               $statstring .= sprintf( $this->m_error2,
>                                       __LINE__,
>                                       "modlister ".$this->admtext['errors'] );
>               $this->set_status( $statstring );
>               break;
>             }
130,137c242,665
<          $selectboxes = "
<          <button type=\"button\" id=\"selectAll\">
<             {$this->admtext['selectall']}
<          </button>
<          &nbsp;&nbsp;
<          <button type=\"button\" id=\"clearAll\">
<             {$this->admtext['clearall']}
<          </button>";
---
>             $refj = $i;
>             /***********************************************************/
>             /* Use preset function to set status of this directive.
>             ** If function processes more than one tag it will advance
>             ** index $i to skip the table entries already processed.
>             **
>             ** ALL FUNCTIONS MUST RETURN $i OR MODLISER WILL CRASH!
>             */
>             $i = $this->$function( $i );
>             /***********************************************************/
> 
>             if(  $i < $refj )
>             {
>               $this->parse_error['line'] = $i;
>               $this->parse_error['tag']  = 'L'.__LINE__.
>                 ' <strong>Index </strong>';
>               $this->parse_error['text'] = 'errors';
>             }
> 
>             /* Status Error result? Emit and stop listing. */
>             if( !empty($this->parse_error ) )
>             {
>               break;
>             }
>           }
>           break;
>         } // while(true) - single mod processing loop
> 
>         /* Assign the final status and list the mod */
>         $this->display_modline( $selected_mods );
> 
>       } // All mods processing loop
> 
>       $this->close_listing();
>       return $this->parse_table;
>    } // list_mods()
> 
>   /*************************************************************
>     DIRECTIVE FUNCTIONS
>   *************************************************************/
>   protected function _author( $i )
>   {
>     /*  %author directive datapack map = $this->parse_table[$i]
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == author
>     **  $datapack['arg1'] == name of author
>     **  $datapack['arg2'] == optional link to author's page
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     /* Get the %author directive datapack from the parse table */
>     $author_datapack = $this->parse_table[$i];
> 
>     /* Create an array item in case there are more authors. */
>     $authors = !empty( $author_datapack['arg2'] )
>       ? "<a href='{$author_datapack['arg2']}' target='_blank'>
>           {$author_datapack['arg1']}</a>"
>       : $author_datapack['arg1'];
> 
>     /* Add to global authors array. */
>     $this->authors[] = $authors;
> 
>     return $i;
>   }
> 
>   protected
>   function _copyfile( $i )
>   {
>     /*  %copyfile directive datapack map = $parse_table($i)
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == copyfile or copyfile2
>     **  $datapack['arg1'] == full server path to source file
>     **  $datapack['arg2'] == full server path to destination file
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == flag (if any)
>     **  $datapack['goto'] == empty (not a conditional directive)
>     **  $datapack['statkey'] == status code
>     **  $datapack['eline'] == validation error line if any
>     */
>     $datapack = $this->parse_table[$i];
> 
>     /* Extract listing elements from the datapack */
>    $line = $datapack['line'];
>     $name = $datapack['name'];
>     $srcpath = $datapack['arg1'];
>     $destpath = $datapack['arg2'];
>     $flag = $datapack['flag'];
>     $statkey = $datapack['statkey'];
>     $eline = $datapack['eline'];
> 
>     /* Get the foldable, relative srcpath name for the MM display. */
>     $relsrcpath = $this->foldable_string( str_replace( $this->rootpath, '', $srcpath ) );
> 
>     /* Get the foldable, short relative destpath name for the MM display. */
>     $reldestpath = $this->foldable_string( str_replace( $this->rootpath, '', $destpath ) );
> 
>     if( $name == 'copyfile' )
>     {
>       $this->affected_files['afcopy'][] = $destpath;
>     }
>     elseif( $name == 'copyfile2' )
>     {
>       $this->affected_files['afcopy2'][] = $destpath;
>     }
> 
>     $statstring = "<div class='list-indent'>
>     {$this->admtext['line']} $line: <span class='tag'>%$name: </span>
>     <span class='copyfile'>
>        $flag$reldestpath
>     </span>&nbsp;";
> 
>     switch( $statkey )
>     {
>       case self::vNOTINST:
>         if( $this->modstatus_header == 'partinst' )
>         {
>           $template = $this->m_approved1h;
>         }
>         else
>         {
>           $template = $this->m_approved1p;
>         }
>         $statstring .= sprintf( $template,
>                                 $this->admtext['notcopied'] );
>         break;
> 
>       case self::vNOTINST + self::vOPTIONAL:
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['optional'],
>                                 $this->admtext['notcopied'] );
>         break;
> 
>       case self::vNOTINST + self::vPROTECTED:
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['protected'],
>                                 $this->admtext['notcopied'] );
>         break;
> 
>       case self::vNOTINST + self::vPROVISIONAL:
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['provisional'],
>                                 $this->admtext['notcopied'] );
>         break;
> 
>       case self::vINSTALLED:
>         $statstring .= sprintf( $this->m_approved1,
>                                 $this->admtext['copied'] );
>         break;
> 
>       case self::vINSTALLED + self::vPROTECTED:
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['copied'],
>                                 $this->admtext['protected'] );
>           break;
> 
>       case self::vINSTALLED + self::vOPTIONAL:
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['copied'],
>                                 $this->admtext['optional'] );
>         break;
> 
>        case self::vINSTALLED + self::vPROVISIONAL:
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['copied'],
>                                 $this->admtext['provisional'] );
>         break;
> 
>       case self::vDSTFOLDER + self::vMISSING + self::vPROVISIONAL:
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['nofolder'],
>                                 $this->admtext['provisional'] );
>         break;
> 
>       case self::vDSTFOLDER + self::vMISSING + self::vERROR:
>         $statstring .= sprintf( $this->m_error2,
>                                 $eline, $this->admtext['nofolder'] );
>         break;
> 
>       case self::vSRCFILE + self::vMISSING + self::vERROR:
>         $statstring .= sprintf( $this->m_error2,
>                                 $eline, $this->admtext['srcfilemissing'] );
>         break;
> 
> 
>       default:
>         break;
>     }
> 
>     $this->set_status( $statstring, $relsrcpath );
>     return $i;
>   } // _copyfile()
> 
>   protected function _desc( $i )
>   {
>     /* The %desc data is not displayed */
>     return $i;
>   }
> 
>   protected function _description( $i )
>   {
>     $datapack = $this->parse_table[$i];
> 
>     /* Sets global $this->description.*/
>     $this->description = $datapack['arg1'];
>     return $i;
>   }
> 
>   protected function _fileexists( $i )
>   {
>     /* Modlister does nothing with this directive from the parse table.
>     ** It is for user information only. */
>     return $i;
>   }
> 
>   protected function _goto( $i )
>   {
>     /* Modlister does nothing with this directive from the parse table.
>     ** It is for user information only. */
>     return $i;
>   }
> 
>   /* File modifier functions called by %location: and not from $proclist */
>   protected function _insert( $i, $statstring  )
>   {
>     /*  %insert directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == insert:before or insert:after
>     **  $datapack['arg1'] == code to be inserted into the target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     **  $datapack['statkey'] == valication status code
>     **  $datapack['eline'] == error line if any
>     */
> 
>     /* The status string ($statstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>      /* Index $i points to the %insert datapack.
>      ** Get datapack and extract listing elements */
>     $datapack = $this->parse_table[$i];
>     $name = $datapack['name'];
>     $statkey = $datapack['statkey'];
>     $eline = $datapack['eline'];
> 
>     switch( $statkey )
>     {
>       case self::vLOCCODE + self::vNOCONTENT + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline, "location",
>                                 $this->admtext['nocomps'] );
>         break;
> 
>       case self::vCFGCODE + self::vNOCONTENT + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['nocomps'] );
>         break;
> 
>       case self::vINSTALLED:
>         $statstring .= sprintf( $this->m_approved2,
>                                 $name,
>                                 $this->admtext['installed'] );
>         break;
> 
>       case self::vBADTARGET + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
> 
>                                 $name,
>                                 $this->admtext['badtarget'] );
>         break;
> 
>       case self::vLOCCODE + self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3, $eline, "location", $this->admtext['notunique'] );
>         break;
> 
>       case self::vCFGCODE + self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['notunique'] );
>         break;
> 
>       case self::vNOTINST:
>         if( $this->modstatus_header == 'partinst' )
>         {
>           $template = $this->m_approved2h;
>         }
>         else
>         {
>           $template = $this->m_approved2p;
>         }
>         $statstring .= sprintf( $template,
>                                 $name,
>                                 $this->admtext['notinst'] );
>         break;
> 
>       case self::vERROR:
>         $statstring .= sprintf( $this->error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['errors'] );
>         break;
> 
>       default:
>         break;
>     }
> 
>     /* Add %insert directive status to the mod status display string.*/
>     $this->set_status( $statstring );
>     return $i;
>   } // _insert()
> 
> 
>   protected function _label( $i )
>   {
>     return $i;
>   }
> 
>   protected function _location( $i )
>   {
>     /*  %location directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == location
>     **  $datapack['arg1'] == code to be found in the target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == optional note
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     **  $datapack['statkey'] == empty
>     **  $datapack['eline'] == empty
>     **
>     **  If target file is not open (missing), the %location
>     **  directives will not appear the the parse table, so no
>     **  need to test for a target file here.
>     **
>     **  Errors in %location code are displayed with the file modifier
>     **  directive in the parse table.*/
> 
>     /* Get the %location datapack and break out elements for the
>     ** listing.*/
> 
>     if( !$this->is_target )
>     {
>       $i++;
>       return $i;
>     }
>     $location_datapack = $this->parse_table[$i];
>     $line = $location_datapack['line'];
>     $note = $location_datapack['arg3'];
> 
>     /* Check for special note associated with this location. */
>     $notestr = '';
>     if( !empty( $note ) )
>     {
>       $notestr = "<br /><span class='location-note'>$note</span><br />";
>     }
> 
>     /* A file modifying directive always follows %location in
>     ** the parse table. Point to it here. */
>     $i++;
> 
>     $modifier_datapack = $this->parse_table[$i];
>     $modifier_op = $modifier_datapack['name'];
> 
>     /* Start the status string for this %location directive. */
>     $statstring = "$notestr{$this->admtext['line']} $line: <span class='tag'>%location #$this->target_location_count</span>&nbsp;";
> 
>     /* Increment for next location # */
>     $this->target_location_count++;
> 
>     /* Dispatch the location status string to the file editing
>     ** directive function to finish breaking out and validating
>     ** the location code.*/
>     $function = $this->proclist[$modifier_op];
> 
>     /* Dispatch to modifier function for final processing.*/
>     $i = $this->$function( $i, $statstring );
> 
>     return $i;
>   } // _location()
> 
>   protected function _mkdir( $i )
>   {
>     /*  %mkdir directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == mkdir
>     **  $datapack['arg1'] == directory (folderpath) to be created
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == if any, optinal @
>     **  $datapack['goto'] == empty (not a conditional directive)
>     **  $datapack['statkey'] == installation status
>     **  $datapack['eline'] == validation error line if any
>     */
> 
>     /* Get the datapack from the parse table and break out the
>     ** display values.*/
>     $datapack = $this->parse_table[$i];
>     $line = $datapack['line'];
>     $dest_path = $datapack['arg1'];
>     $flag = $datapack['flag'];
>     $statkey = $datapack['statkey'];
>     $eline = $datapack['eline']; // not used here
> 
>     // USE RELATIVE DESTINATION PATH FOR STATUS DISPLAYS
>     $reldestpath = $flag.str_replace( $this->rootpath, '', $dest_path );
>     $reldestpath = $this->foldable_string( $reldestpath );
> 
>     /* Start the status string */
>     $statstring = "<div class='list-indent'>{$this->admtext['line']} $line: <span class='tag'>%mkdir: </span><span class='mkdir'>$reldestpath</span>&nbsp;";
> 
>     // REPORT ON EXISTENCE OF FOLDER
>     if( $statkey  == self::vNOTINST )
>     {
>       if( $this->modstatus_header == 'partinst' )
>       {
>         $template = $this->m_approved1h;
139,140c667,669
<       else {
<          $selectboxes = '';
---
>       else
>       {
>         $template = $this->m_approved1p;
142,147c671,796
<       /*******************************************************************
<       SHOW THE MOD FILTER BAR
<       *******************************************************************/
<       // MAKE ENGLISH CHOICES CONSISTENT IN FILTER STATUS DROPDOWN MENU
<       $this->admtext['partinst'] = ucfirst( $this->admtext['partinst'] );
<       $this->admtext['cantinst'] = ucfirst( $this->admtext['cantinst'] );
---
>       $statstring .= sprintf( $template,
>                               $this->admtext['nocreated'] );
>     }
>     elseif ( $statkey ==  self::vINSTALLED )
>     {
>       $statstring .= sprintf( $this->m_approved1,
>                               $this->admtext['exists'] );
>     }
>     $this->set_status( $statstring );
>     return $i;
>   } // _mkdir()
> 
> 
>   protected function _name( $i )
>   {
>     /* Sets global $this->name for use in the listing.*/
>     $datapack = $this->parse_table[$i];
>     $this->name = $datapack['arg1'];
>     return $i;
>   }
> 
>  protected function _newfile( $i )
>  {
>     /*  %newfile directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == newfile
>     **  $datapack['arg1'] == filepath for new file
>     **  $datapack['arg2'] == content of new file
>     **  $datapack['arg3'] == version number of new file
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty
>     **  $datapack['statkey'] == installatiion status
>     **  $datapack['eline'] == validation error line if any
>     */
> 
>     /* Get datapack from the parse table and break out elements
>     ** for listing the %newfile directive.*/
>     $datapack = $this->parse_table[$i];
>     $destpath = $datapack['arg1'];
>     $line = $datapack['line'];
>     $flag = $datapack['flag'];
>     $statkey = $datapack['statkey'];
>     $eline = $datapack['eline'];
> 
>     $this->affected_files['afcreate'][] = str_replace( $this->rootpath, '', $destpath );
> 
>     /* Use foldable relative destination path for display */
>     $reldestpath = $this->foldable_string( str_replace( $this->rootpath, '', $destpath ) );
> 
>     /* Start the status string */
>     $statstring = "<div class='list-indent'>{$this->admtext['line']} $line: <span class='tag'>%newfile </span><span class='newfile'>$flag$reldestpath</span>&nbsp;";
> 
>     switch( $statkey )
>     {
>       case self::vINSTALLED + self::vPROTECTED:
>         $statstring .= sprintf( $this->m_approved2,
>                                 $this->admtext['created'],
>                                 $this->admtext['protected'] );
>         break;
> 
>       case self::vINSTALLED:
>         $statstring .= sprintf( $this->m_approved1,
>                                 $this->admtext['created'] );
>         break;
> 
>       case self::vVERSION + self::vERROR:
>         $statstring .= sprintf( $this->m_error2,
>                                 $eline,
>                                 $this->admtext['badversion'] );
>         break;
> 
>       case self::vDSTFOLDER + self::vMISSING + self::vPROVISIONAL:
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['nofolder'],
>                                 $this->admtext['provisional'] );
>         break;
> 
>       case self::vDSTFOLDER + self::vMISSING + self::vERROR:
>         $statstring .= sprintf( $this->m_error2, $eline,
>                                 $this->admtext['nofolder'] );
>         break;
> 
>       case self::vNOTINST:
>         if( $this->modstatus_header == 'partinst' )
>         {
>           $template = $this->m_approved1h;
>         }
>         else
>         {
>           $template = $this->m_approved1p;
>         }
>         $statstring .= sprintf( $template,
>                                 $this->admtext['nocreated'] );
>         break;
> 
>       default:
>         break;
>     }
> 
>     $this->set_status( $statstring );
>     return $i;
>   } // _newfile()
> 
>   protected function _note( $i )
>   {
>     /* add note the global $this->note for use in the listing. */
>     $datapack = $this->parse_table[$i];
>     $this->note = $datapack['arg1'];
>     return $i;
>   }
> 
>   protected function _parameter( $i )
>   {
>     while(true)
>     {
>       if( !$this->is_target   )
>       {
>         $i++; // skip %desc also
>         break;
>       }
> 
>       $datapack = $this->parse_table[$i];
>       $directive_name = $datapack['name'];
>       $parameter = $datapack['arg1'];
>       $value = $datapack['arg2'];
>       $line= $datapack['line'];
149,174c798
<       // RETURN NEW FILTER STATUS TO MODHANDLER FOR REDISPLAY IF CHANGED BY USER
<       echo "
< <form action=\"admin_modhandler.php\" method=\"POST\">
< <table id=\"fbar\" class=\"normal lightback $fbclass\">
<    <tr>
<       <td class=\"fieldnameback fieldname mmpadtop5\">
<          <div class=\"float-left\">
<          &nbsp;{$this->admtext['statusfilter']}:&nbsp;
<          <select name=\"filter\" >
<             <option $s0 value=".self::F_ALL.">{$this->admtext['all']}</option>
<             <option $s1 value=".self::F_READY.">{$this->admtext['ready']}</option>
<             <option $s2 value=".self::F_INSTALLED.">{$this->admtext['installed']}</option>
<             <option $s3 value=".self::F_CLEAN.">{$this->admtext['partinst']}</option>
<             <option $s4 value=".self::F_BADCFG.">{$this->admtext['cantinst']}</option>
<             <option $s5 value=".self::F_SELECT.">{$this->admtext['choose']}</option>
<          </select>
<          <input type=\"submit\" name=\"newlist\" value=\"{$this->admtext['go']}\" />
<          &nbsp;&nbsp;$lockit&nbsp;&nbsp;$selectboxes &nbsp;&nbsp; $btnline
<          </div>
<     </td>
<    </tr>
< </table>";
<       /*******************************************************************
<       GET SORTED CFG FILE NAMES AND PREPARE COLUMN HEADER SORT ICONS
<       *******************************************************************/
<          $modlisting = $this->get_modlist_sorted();
---
>       $this->parameters++;
176,189c800,1001
<       // DISPLAY BIG SYSTEM MESSAGE IF NO MODFILES ARE FOUND
<       if( empty( $this->modspath ) ) {
<          $sysmsg = "<span class=\"msgerror\">\$modspath {$this->admtext['missing']}";
<       }
<       elseif( empty( $this->extspath ) ) {
<          $sysmsg = "<span class=\"msgerror\">\$extspath {$this->admtext['missing']}";
<       }
<       elseif( $modlisting == self::NOPATH ) {
<          $sysmsg = "{$this->admtext['cannotopendir']}: ".rtrim($this->modspath, "/")."!";
<       }
<       elseif ($modlisting == self::NOMODS ) {
<          $this->admtext['nomods'] = str_replace( "xxx", "cfg", $this->admtext['nomods'] );
<          $sysmsg = "{$this->admtext['nomods']} - ".rtrim($this->modspath, "/");
<       }
---
>       /* Start status string */
>       $statstring = "<div class='list-indent'>{$this->admtext['line']} $line: ";
> 
>       $paramstr = $this->foldable_string( "$parameter:$value" );
> 
>       $statstring .= sprintf( $this->m_approved2, $directive_name, $paramstr );
> 
>       $this->set_status( $statstring );
>       $i++; // skip 'desc' - nothing is done with it in the listing
>       break;
>     }
>     return $i;
>   } //_parameter()
> 
>   protected function _private( $i )
>   {
>     $datapack = $this->parse_table[$i];
>     $this->private = $datapack['arg1'];
>     $this->isprivate = true;
>     return $i;
>   }
> 
>   /* @ $i points to the %replace datapack in the parse table
>   ** @ $statstring contains the status string started in the _location function */
>   protected function _replace( $i, $statstring='' )
>   {
>     /*  %replace directive datapack map = $this->parse_table[$i]
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == replace
>     **  $datapack['arg1'] == replacement code for location in target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     **  $datapack['statkey'] == installation status
>     **  $datapack['eline'] == validation error line if any
>     */
> 
>     /* The status string ($statstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     $datapack = $this->parse_table[$i];
>     $name = $datapack['name'];
>     $statkey = $datapack['statkey'];
>     $eline = $datapack['eline'];
> 
>     /* add display messages to the modlister class status string */
>     switch( $statkey)
>     {
>       case self::vCFGCODE + self::vNOCONTENT + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['nocomps'] );
>         break;
> 
>       case self::vLOCCODE + self::vNOCONTENT + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['nocomps'] );
>         break;
> 
>       case self::vINSTALLED:
>         $statstring .= sprintf( $this->m_approved2,
>                                 $name,
>                                 $this->admtext['installed'] );
>         break;
> 
>       case self::vBADTARGET + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['badtarget'] );
>         break;
> 
>       case self::vLOCCODE + self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['notunique'] );
>         break;
> 
>       case self::vCFGCODE + self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['notunique'] );
>         break;
> 
>       case self::vNOTINST:
>         if( $this->modstatus_header == 'partinst' )
>         {
>           $template = $this->m_approved2h;
>         }
>         else
>         {
>           $template = $this->m_approved2p;
>         }
>         $statstring .= sprintf( $template,
>                                 $name,
>                                 $this->admtext['notinst'] );
>         break;
> 
>       case self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['errors'] );
>         break;
> 
>       default:
>         break;
>     }
> 
>     /* Register the complete status string for this mod. */
>     $this->set_status( $statstring );
>     return $i;
>   } // _replace()
> 
>   protected function _target( $i )
>   {
>     /*  %target directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == target
>     **  $datapack['arg1'] == server filepath to target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == optional note
>     **  $datapack['flag'] == optional flag (@)
>     **  $datapack['goto'] == empty
>     **  $datapack['statkey'] == insatallation status code
>     **  $datapack['eline'] == validation error line number if any
>     */
> 
>     /* Get %target datapack from parse table and break out
>     ** display values.*/
>     $datapack = $this->parse_table[$i];
>     $line = $datapack['line'];
>     $name = $datapack['name'];
>     $flag = $datapack['flag'];
>     $statkey = $datapack['statkey'];
>     $target_path = $datapack['arg1'];
>     $note = $datapack['arg3'];
>     $eline = $datapack['eline'];
> 
>     /* Re-init location # for each new target file */
>     $this->target_location_count = 1;
> 
>     /* Only a foldable, relative path is needed for screen display. */
>     $display_path = $this->foldable_string( str_replace( $this->rootpath, '', $target_path ) );
> 
>     /* Maintain affected files list.*/
>     $this->affected_files['afchange'][] = $display_path;
> 
>     /* Handle optional note if one is associated with this target.*/
>     $notestr = '';
>     if( !empty( $note ) )
>     {
>       $notestr = "<div class='target-note'><br />$note</div><br />";
>     }
> 
>     /* start the status display string for this target file. */
>     $statstring = "$notestr<div class='list-indent'>{$this->admtext['line']} $line: <span class='target'><span class='tag'>%$name </span><span class='tgtfile'>$flag$display_path</span></span>&nbsp;";
> 
>     switch( $statkey )
>     {
>       case self::vMISSING + self::vOPTIONAL + self::vBYPASSED:
>         $this->is_target = false;
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['optmissing'],
>                                 $this->admtext['bypassed'] );
>         break;
> 
>       case self::vMISSING + self::vOPTIONAL:
>         $this->is_target = false;
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['optmissing'],
>                                 $this->admtext['willbypass'] );
>         break;
> 
>       case self::vMISSING + self::vPROVISIONAL + self::vERROR: // mod installed
>         $this->is_target = false;
>         $statstring .= sprintf( $this->m_error3x2,
>                                 $eline,
>                                 $this->admtext['tgtmissing'],
>                                 $this->admtext['provisional'] );
>         break;
> 
>       case self::vMISSING + self::vPROVISIONAL: // mod not installed
>         $this->is_target = false;
>         $statstring .= sprintf( $this->m_approved1x2,
>                                 $this->admtext['tgtmissing'],
>                                 $this->admtext['provisional'] );
>         break;
> 
>       case self::vMISSING + self::vERROR:
>         $this->is_target = false;
>         $statstring .= sprintf( $this->m_error2,
>                                 $eline,
>                                 $this->admtext['tgtmissing'] );
>             break;
190a1003,1364
>       case self::vNOWRITE + self::vERROR:
>         $this->is_target = false;
>         $statstring .= sprintf( $this->m_error2,
>                                 $eline,
>                                 $this->admtext['notwrite'] );
>         break;
> 
>       case self::vNOCONTENT + self::vERROR:
>         $this->is_target = false;
>         $statstring .= sprintf( $this->m_error2,
>                                 $eline,
>                                 $this->admtext['emptyfile'] );
>         break;
> 
>       case self::vVERIFIED:
>         $this->is_target = true;
>         $statstring .= sprintf( $this->m_approved1,
>                                 $this->admtext['verified'] );
>         break;
> 
>       default:
>         break;
>     }
> 
>     $this->set_status( $statstring );
>     return $i;
> 
>   } // _target()
> 
> 
>   protected function _tngversion( $i )
>   {
>     return $i;
>   }
> 
>   protected function _textexists( $i )
>   {
>     return $i;
>   }
> 
>   protected function _triminsert( $i, $statstring )
>   {
>     /*  %triminsert directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == replace
>     **  $datapack['arg1'] == code for insertion into target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     **  $datapack['statkey'] == installation status
>     **  $datapack['eline'] == validation error line if any
>     */
> 
>     /* This funtion is called by _location() and not directly by the
>     ** modlister processing loop.
>     **
>     ** The status string ($statstring) has been started in the _location()
>     ** function.  It will be completed and registered here. */
> 
>     /* In spite of the directive name, no trimming or modification is done
>     ** to the raw code. */
> 
>     /* Get %triminsert datapack from the parse table and extract
>     ** status display parameters */
>     $datapack = $this->parse_table[$i];
>     $name = $datapack['name'];
>     $statkey = $datapack['statkey'];
>     $eline = $datapack['eline'];
> 
>     switch( $statkey )
>     {
>       case self::vCFGCODE + self::vNOCONTENT + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline, $name,
>                                 $this->admtext['nocomps'] );
>         break;
> 
>       case self::vINSTALLED:
>         $statstring .= sprintf( $this->m_approved2,
>                                 $name,
>                                 $this->admtext['installed'] );
>         break;
> 
>       case self::vBADTARGET + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline, $name,
>                                 $this->admtext['badtarget'] );
>         break;
> 
>       case self::vLOCCODE + self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name, $this->admtext['notunique'] );
>         break;
> 
>       case self::vCFGCODE + self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['notunique'] );
>         break;
> 
>       case self::vNOTINST:
>         if( $this->modstatus_header == 'partinst' )
>         {
>           $template = $this->m_approved2h;
>         }
>         else
>         {
>           $template = $this->m_approved2p;
>         }
>         $statstring .= sprintf( $template,
>                                 $name,
>                                 $this->admtext['notinst'] );
>         break;
> 
>       case self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline, $name,
>                                 $this->admtext['errors'] );
>         break;
> 
>       default:
>         break;
>     }
> 
>     $this->set_status( $statstring );
>     return $i;
>   } // _triminsert()
> 
>   private function _trimreplace( $i, $statstring )
>   {
>     /*  %trimreplace directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == replace
>     **  $datapack['arg1'] == replacement code for location in target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     **  $datapack['statkey'] == installation status
>     **  $datapack['eline'] == validation error line if any
>     */
> 
>    /* The status string ($statstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     **
>     ** This is a Non block operation - straight replacement, one for one.*/
> 
>     /* Get %trimreplace datapack from parse table and extract elements
>     ** for displaying the directive status.*/
>     $datapack = $this->parse_table[$i];
>     $name = $datapack['name'];
>     $statkey = $datapack['statkey'];
>     $eline = $datapack['eline'];
> 
>     switch( $statkey )
>     {
>       case self::vCFGCODE + self::vNOCONTENT + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['nocomps'] );
>         break;
>       case self::vVERIFIED:
>         $statstring .= sprintf( $this->m_approved2,
>                                 $name,
>                                 $this->admtext['verified'] );
>         break;
>       case self::vINSTALLED:
>         $statstring .= sprintf( $this->m_approved2,
>                                 $name,
>                                 $this->admtext['installed'] );
>         break;
>       case self::vBADTARGET + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['badtarget'] );
>         break;
>       case self::vLOCCODE +  self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 'location',
>                                 $this->admtext['notunique'] );
>         break;
>       case self::vCFGCODE + self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['notunique'] );
>         break;
>       case self::vNOTINST:
>         if( $this->modstatus_header == 'partinst' )
>         {
>           $template = $this->m_approved2h;
>         }
>         else
>         {
>           $template = $this->m_approved2p;
>         }
>         $statstring .= sprintf( $template,
>                                 $name,
>                                 $this->admtext['notinst'] );
>         break;
>       case self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['errors'] );
>         break;
> 
>       default:
>         break;
>     }
> 
>     $this->set_status( $statstring );
>     return $i;
>   } // _trimreplace()
> 
>   protected function _version( $i )
>   {
>     /* Parse_table[$i] is the '%version' datapack. This code assigns the
>     ** version number to $this->version to make it globally accessible.*/
>     $datapack = $this->parse_table[$i];
>     $this->version = $datapack['arg1'];
>     return $i;
>   }
> 
>   /* Function only works with variables. Text is ignored. Additional
>   ** text/commentary can be added separately using the %insert directive.
>   */
>   protected function _vinsert( $i, $statstring )
>   {
>     /*  %vinsert directive datapack map == $this->parse_table[$i]
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == vinsert:before or vinsert:after
>     **  $datapack['arg1'] == vinsert code (variable assignments)
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     **  $datapack['statkey'] == installation status
>     **  $datapack['eline'] == validation error line if any
>     */
> 
>     /* Get %vinsert datapack from the parse table and extract
>     ** values need to display the directive status.*/
>     $datapack = $this->parse_table[$i];
>     $name = $datapack['name'];
>     $statkey = $datapack['statkey'];
>     $eline = $datapack['eline'];
> 
>     switch( $statkey )
>     {
>       case self::vCFGCODE + self::vNOTUNIQUE + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['notunique'] );
>         break;
> 
>       case self::vINSTALLED:
>         $statstring .= sprintf( $this->m_approved2,
>                                 $name,
>                                 $this->admtext['installed'] );
>         break;
> 
>       case self::vPARTINST + self::vERROR:
>         $statstring .= sprintf( $this->m_error3,
>                                 $eline,
>                                 $name,
>                                 $this->admtext['partinst'] );
>         break;
> 
>       case self::vNOTINST:
>         if( $this->modstatus_header == 'partinst' )
>         {
>           $template = $this->m_approved2h;
>         }
>         else
>         {
>           $template = $this->m_approved2p;
>         }
>         $statstring .= sprintf( $template,
>                                 $name,
>                                 $this->admtext['notinst'] );
>         break;
> 
>       default:
>         break;
>     }
> 
>     $this->set_status( $statstring );
>     return $i;
>   } // _vinsert()
> 
>   protected function _wikipage( $i )
>   {
>     $datapack = $this->parse_table[$i];
>     $this->wikipage = $datapack['arg1'];
>     return $i;
>   }
> 
> /**********************************************************************
>   SUPPORTING FUNCTIONS
> **********************************************************************/
>   public function set_configs( $name, $value )
>   {
>     $this->$name = $value;
>     if( $this->$name == $value )
>       return true;
>     return false;
>   }
> 
>   protected function close_listing()
>   {
>     echo "
>    </table><!-- mmtable -->
>    </div><!-- tableFixedHead -->
> </form>
> ";
>   }
> 
>   protected function display_modline( $selected_mods )
>   {
>     static $id = 0;  // mod identifier
>     static $ix = 0;  // mod form index
>     static $dbx = 0; // modline background switching index
> 
>     $status = '';
>     $error = '';
> 
>     // SET STATUS HEADER - set $this->status header ??
>     $this->set_modstatus_header();
> 
>     /* use while loop to provide a single point of return */
>     while(true)
>     {
>       /* Bypass filtered mods */
>       if( !empty( $selected_mods ) && !in_array( $this->cfgfile, $selected_mods ) ) break;
> 
>       if( $this->filter == self::F_INSTALLED ) {
>         if( $this->modstatus_header != self::INSTALLED ) break;
>       }
>       elseif( $this->filter == self::F_READY ) {
>         if( $this->modstatus_header != self::OK2INST ) break;
>       }
>       elseif( $this->filter == self::F_CLEAN ) {
>         if( $this->modstatus_header != self::PARTINST ) break;
>       }
>       elseif( $this->filter == self::F_BADCFG ) {
>         if( $this->modstatus_header != self::CANTINST ) break;
>       }
>       $id++;
> 
>       /* Hide status detail for OK to Install and Installed */
>       if( $this->modstatus_header == self::OK2INST || $this->modstatus_header == self::INSTALLED )
>         $status .= "<div id='hiddenstatus$id' style='display:none;'>" . $this->get_status() . "</div>";
>       else
>         $status = $this->get_status();
192,198c1366,1373
<       // CONFIGURE COLUMN HEADER SORT ICONS
<       $filesort = $namesort = '';
<       if( $this->sortby == self::NAMECOL ) {
<          $filesort = "<a href=\"admin_modhandler.php?sort=".self::FILECOL."\"><img src=\"img/tng_sort_asc.gif\"
<             width=\"15\" height=\"8\" border=\"0\" alt=\"\" title=\"{$this->admtext['text_sort']}\" /></a>";
<          $namesort = "<img src=\"img/tng_sort_desc.gif\"
<             width=\"15\" height=\"8\" border=\"0\" alt=\"\" />";
---
>       // SET STYLES PER STATUS TYPE
>       if( $this->modstatus_header == self::PARTINST )
>       {
>         $status = str_replace(
>            array( "NINST", "NCOPY", "NCREATE" ),
>            array( "hilight", "hilight", "hilight" ),
>            $status
>         );
200,204c1375,1381
<       else {
<          $namesort = "<a href=\"admin_modhandler.php?sort=".self::NAMECOL."\"><img src=\"img/tng_sort_asc.gif\"
<             width=\"15\" eight=\"8\" border=\"0\" alt=\"\" title=\"{$this->admtext['text_sort']}\" /></a>";
<          $filesort = "<img src=\"img/tng_sort_desc.gif\"
<             width=\"15\" eight=\"8\" border=\"0\" alt=\"\" />";
---
>       else
>       {
>         $status = str_replace(
>            array( "NINST", "NCOPY", "NCREATE" ),
>            array( "none", "none", "none" ),
>            $status
>         );
207,224c1384,1393
<       /*******************************************************************
<       SHOW MOD LIST HEADINGS
<       *******************************************************************/
<       // uses bounding table to eliminate jumping during page load
<       echo "
< <table id=\"mmgrid\" class=\"lightback $mmlistclass\">
< <tr class=\"databack\">
< <td class=\"tngshadow\">
< 
< <table class=\"tfixed normal\">
<    <tr>";
< 
<       // SHOW LEFT-SIDE SELECTION BOX HEADING IF A FILTER IS APPLIED
<       if ($this->filter != self::F_ALL) {
<          echo "
< 		<th class=\"fieldnameback fieldname center colselct\">
<          <div class=\"mminner\">&nbsp;{$this->admtext['choose']}</div>
<       </th>";
---
>       /* Create display string for mod author(s) */
>       $author_str = '';
>       $count = count( $this->authors );
>       if( $count > 1 )
>       {
>         $author_str = "<strong>Authors</strong>: ";
>       }
>       elseif( $count == 1 )
>       {
>         $author_str = "<strong>Author</strong>: ";
227,248c1396,1402
<       // DISPLAY THE MOD LISTING ROW HEADINGS
<       echo "
<       <th class=\"fieldnameback fieldname center colmodnm\">{$this->admtext['modname']}&nbsp;&nbsp;$namesort</th>
<       <th class=\"fieldnameback fieldname center colcfgnm\">{$this->admtext['cfgname']}&nbsp;&nbsp;$filesort</th>
<       <th class=\"fieldnameback fieldname center colversn\">{$this->admtext['version']}</th>
<       <th class=\"fieldnameback fieldname center colwiki\">
<          <div class=\"mminner\">
<             {$this->admtext['wiki']}
<          </div>
<       </th>
<       <th class=\"fieldnameback fieldname center colstatus\">{$this->admtext['status']}</th>
<       <th class=\"fieldnameback fieldname center colaflist\"><strong>{$this->admtext['aflist']}</strong></th>
<    <tr>";
< 
<       $id = 0;
<       $ix = 0;
<       $dbx = 0;
<       $dbclass = 'databackalt';
<       // if a system message has been set, show it here and quit
<       if( !empty( $sysmsg ) ) {
<          $this->sys_msg( $sysmsg );
<          return;
---
>       if( !empty( $author_str ) )
>       {
>         foreach( $this->authors as $author )
>         {
>            $author_str .= $author.' & ';
>         }
>         $author_str = rtrim( $author_str, ' &' ) . '<br />';
250,254d1403
<       /*******************************************************************
<             LIST STATUS OF EACH MOD IN THE MOD DIRECTORY
<       *******************************************************************/
<       foreach( $modlisting as $cfgfile => $modname ) {
<         if( !empty( $selected_mods ) && !in_array( $cfgfile, $selected_mods ) ) continue;
256,586c1405,1406
<          // INITIALIZE DYNAMIC ELEMENTS FOR THIS MOD
<          // mod info
<          $this->cfgfile = $cfgfile;
<          $this->cfgpath = $this->rootpath.$this->modspath.'/'.$cfgfile;
<          $this->status_string = '';
<          $this->description = $this->note = $this->private = $this->wikipage = $wikilink = '';
<          $istarget = false;
<          $authors = array();
< 
<          // statistics
<          $this->num_required = 0;
<          $this->mods_required = 0;
<          $this->copies_required = 0;
<          $this->newfiles_required = 0;
<          $this->newdirs_required = 0;
<          $this->num_installed = 0;
<          $this->mods_installed = 0;
<          $this->copies_installed = 0;
<          $this->newfiles_installed = 0;
<          $this->newdirs_installed = 0;
<          $this->parameters = 0;
<          $this->num_errors = 0;
<          $this->provisional_errors = 0;
<          $this->init_status();
< 
<          // init data array for affected_files_listing() function
<          $aff_files = array(
<             'afchange'  => array(),
<             'afcopy'    => array(),
<             'afcopy2'   => array(),
<             'afcreate'  => array()
<          );
< //echo __LINE__;print_r( $this->cfgpath);exit;
<          $tags = $this->parse( $this->cfgpath );
<                   $istarget = false;
< 
<          // PROCESS THE PARSE TABLE USING WHILE LOOP
<          while( empty( $this->parse_error ) ) {
<             $this->warning='';
<             /*************************************************************
<             CHECK FOR MISSING TAGS (REQUIRED)
<             *************************************************************/
<             // REQUIRED TAGS
<             if( false === $this->find_tagname_value( $tags,
<                'name', 'name' ) ) {
<                $this->parse_error['line'] = '0';
<                $this->parse_error['tag']  = '%name:';
<                $this->parse_error['text'] = self::REQTAG; // index into admtext[]
<             }
<             elseif( false === $this->find_tagname_value( $tags,
<                'name', 'version' ) ) {
<                $this->parse_error['line'] = '0';
<                $this->parse_error['tag']  = '%version:';
<                $this->parse_error['text'] = self::REQTAG; // index into admtext[]
<             }
<             elseif( false === $this->find_tagname_value( $tags,
<                'name', 'description' ) ) {
<                $this->parse_error['line'] = '0';
<                $this->parse_error['tag']  = '%description:';
<                $this->parse_error['text'] = self::NOCOMPS; // index into admtext[]
<             }
<             if( !empty( $this->parse_error ) ) {
<                break;
<             }
<             /*************************************************************
<             PROCESS THE PARSE TABLE FOR THE CURRENT MOD
<             *************************************************************/
<             $this->isprivate = false;
<             for( $j=0; isset( $tags[$j] ); $j++ ) {
<                /**********************************************************
<                INFO OR NOT PROCESSED FOR LISTING
<                **********************************************************/
<                switch( $tags[$j]['name'] ) {
<                   case 'private':
<                      $this->isprivate = true;
<                   case 'name':
<                   case 'version':
<                   case 'description':
<                   case 'note':
< 
<                   case 'wikipage':
<                      // create variable from the name and assign its value
<                      $this->{$tags[$j]['name']} = $tags[$j]['arg1'];
<                      continue;
<                   case 'author':
<                      $authors[] = !empty( $tags[$j]['arg2'] ) ?
<                         "<a href=\"{$tags[$j]['arg2']}\" target=\"_blank\">
<                            {$tags[$j]['arg1']}</a>"
<                         : $tags[$j]['arg1'];
<                      $this->authors = $authors;
<                      continue;
<                   case 'desc':
<                      // error - tag should have been processed with parameter
<                      $this->parse_error['line'] = $tags[$j]['line'];
<                      $this->parse_error['tag']  = '%desc:';
<                      $this->parse_error['text'] = self::NOPARAM;
<                      break 3;
<                   case 'replace':
<                   case 'trimreplace':
<                   case 'insert:before':
<                   case 'insert:after':
<                   case 'vinsert:before':
<                   case 'vinsert:after':
<                   case 'triminsert:before':
<                   case 'triminsert:after':
<                      // error- tag should have been processed with location
<                      $this->parse_error['line'] = $tags[$j]['line'];
<                      $this->parse_error['tag']  = '%'.$tags[$j]['name'].':';
<                      $this->parse_error['text'] = self::NOLOCATION;
<                      break 3; // fatal error - break out of parser
<                default:
<                   break;
<                }
<                /**********************************************************
<                TARGETS - GET FILE CONTENTS
<                **********************************************************/
<                if( $tags[$j]['name'] == 'target' ) {
<                   $flag = $tags[$j]['flag'];
<                   if( $tags[$j]['arg1'] == 'files' ) continue;
<                   $target_location_count = 1;
<                   $active_target_file = '';
<                   $istarget = false;
< 
<                   // ONLY A RELATIVE PATH IS NEEDED FOR SCREEN DISPLAYS
<                   $display_path = str_replace( $this->rootpath, '', $tags[$j]['arg1'] );
< 
<                   // MAINTAIN AFFECTED FILES LIST
<                   $aff_files['afchange'][] = $display_path;
< 
<                   // SPECIAL NOTE ASSOCIATED WITH THIS TARGET?
<                   if( !empty( $tags[$j]['arg3'] ) ) {
<                      $notestr = "<div class=\"target-note\">{$tags[$j]['arg3']}</div><br />";
<                   }
<                   else {
<                      $notestr = '';
<                   }
< 
<                   // INCORPORATE ROBIN RICHMOND'S CODE TO BREAK UP LONG LINES OF TEXT FOR DISPLAY
<                   $display_path = $this->foldable_string( $display_path );
< 
<                   $statstring = "$notestr<div class=\"list-indent\">{$this->admtext['line']} {$tags[$j]['line']}: <span class=\"target\">%<span class=\"tag\">target:</span><span class=\"tgtfile\">$flag$display_path</span>%</span>&nbsp;";
< 
<                   // GET CODE FROM TARGET FILE INTO BUFFER FOR EXAMINATION
<                   // function increases global error count if unable to read
<                   $target_file_contents = $this->read_file_buffer(
<                      $tags[$j]['arg1'], $flag );
< 
<                   // NOTE FILE RETRIEVAL ERRORS IF ANY
<                   if( is_numeric( $target_file_contents ) ) {
<                      switch( $target_file_contents ) {
<                         case self::BYPASS: // not an error
<                            if( $this->num_installed > 0 ) {
<                               $statstring .= "{$this->admtext['optmissing']}&nbsp;<span class=\"msgapproved\">{$this->admtext['bypassed']}</span>";
<                            }
<                            else {
<                               $statstring .= "{$this->admtext['optmissing']}&nbsp;<span class=\"msgapproved\">{$this->admtext['willbypass']}</span>";
<                            }
<                            $this->set_status( $statstring );
<                            break;
<                         case self::NOFOUL:
<                            if( $this->num_installed > 0 ) { // mod has been installed
<                               $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['tgtmissing']}&nbsp;{$this->admtext['provisional']}</span>";
<                            }
<                            else { // mod not installed - no error yet
<                               $statstring .= "{$this->admtext['tgtmissing']}&nbsp;<span class=\"msgapproved\">{$this->admtext['provisional']}</span>";
<                            }
<                            $this->set_status( $statstring );
<                            break;
<                         case self::NOFILE:
<                            $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['tgtmissing']}</span>";
<                            $this->set_status( $statstring );
<                            break;
<                         case self::NOWRITE:
<                            $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['notwrite']}</span>";
<                            $this->set_status( $statstring );
<                            break;
<                         case self::ISEMPTY:
<                            $statstring .= "<span class=\"msgerror\">{$this->admtext['emptyfile']}</span>";
<                            $this->set_status( $statstring );
<                            break;
<                         default:
<                            break;
<                      }
<                   }
<                   else {
<                      $statstring .= "{$this->admtext['verified']}";
<                      $this->set_status( $statstring );
<                      $istarget = true;
<                      $active_target_file = $tags[$j]['arg1'];
<                   }
<                   continue;
<                } // TARGETS
< 
<                /**********************************************************
<                PARAMETERS - JUST LOG THEM - MAKE SURE DESC TAG FOLLOWS
<                **********************************************************/
<                elseif( $tags[$j]['name'] == 'parameter' ) {
<                   if( !$istarget ) {
<                      $j++;
<                      continue;
<                   }
<                   // IS THE NEXT TAG DESC (REQUIRED)?
<                   if( $tags[$j+1]['name'] != 'desc' ) {
<                      $this->parse_error['line'] = $tags[$j]['line'];
<                      $this->parse_error['tag']  = '%desc:';
<                      $this->parse_error['text'] = self::REQTAG; // index into admtext[]
<                      break 2; // break out of the entire processing loop
<                   }
<                   $this->parameters++;
<                   $paramstr = $this->foldable_string( "{$tags[$j]['arg1']}:{$tags[$j]['arg2']}" );
<                   $statstring = "<div class=\"list-indent\">{$this->admtext['line']} {$tags[$j]['line']}: %<span class=\"tag\">parameter:$paramstr</span>%&nbsp;";
<                   $this->set_status( $statstring );
<                   $j++; // skip 'desc' - nothing is done with it in the listing
<                   continue;
<                }
<                /**********************************************************
<                LOCATION - VALIDATE OPTAG - TEST VALUES WITH TARGET FILES
<                **********************************************************/
<                elseif( $tags[$j]['name'] == 'location' ) {
<                   if( !$istarget ) {
<                      $j++;
<                      continue;
<                   }
<                   // next tag should be the optag (action tag)
<                   $optag = $tags[$j+1]['name'];
<                     if( !in_array( $optag, $this->optags) ) {
<                      $this->parse_error['line'] = $tags[$j]['line'];
<                      $this->parse_error['tag']  = '%location:';
<                      $this->parse_error['text'] = self::NOACT;
<                      break 2; // break out of the entire processing loop
<                   }
< 
<                   $this->num_required++;
<                   $this->mods_required++;
< 
<                   // SPECIAL NOTE ASSOCIATED WITH THIS LOCATION?
<                   $notestr = '';
< 
< 
<                   if( !empty( $tags[$j]['arg3'] ) ) {
<                      $notestr = "<span class=\"location-note\">{$tags[$j]['arg3']}</span><br />";
<                   }
<                   else {
<                      $notestr = '';
<                   }
< 
<                   $statstring = "$notestr{$this->admtext['line']} {$tags[$j]['line']}: <span class=\"tag\">%location:% #$target_location_count</span>&nbsp;";
<                   $tng_code = $tags[$j]['arg1']; // LOCATION CODE
<                   $j++;
<                   $new_code = $tags[$j]['arg1']; // OPTAG CODE
<                   $tng_code_trimmed = trim( $tng_code, " \t" );
<                   $target_location_count++;
<                   /*******************************************************
<                   CONFIGURE CODE STRINGS DEPENDING ON OPTAG
<                   *******************************************************/
<                   switch ( $optag ) {
<                      case "insert:before":
<                      case "vinsert:before";
<                         $tngcode = $tng_code_trimmed;
<                         $newcode = $new_code."\r\n";
<                         break;
<                      case "insert:after":
<                      case "vinsert:after":
<                         $tngcode = $tng_code_trimmed;
<                         $newcode = "\r\n".$new_code;
<                         break;
<                      case "replace":
<                         $tngcode = $tng_code_trimmed;
<                         $newcode = $new_code;
<                         break;
<                      case "triminsert:before":
<                         $tngcode = $tng_code;
<                         $newcode = $new_code.$tng_code;
<                         break;
<                      case "triminsert:after":
<                         $tngcode = $tng_code;
<                         $newcode = $tng_code.$new_code;
<                         break;
<                      case "trimreplace":
<                         $tngcode = $tng_code;
<                         $newcode = $new_code;
<                         break;
<                      default:
<                         break;
<                   }
< 
<                   // SET GLOBAL STATUS STRING FOR THIS LOCATION
<                   $this->validate_location( $target_file_contents,
<                      $tngcode, $newcode, $optag, $statstring );
<                   continue; // TO NEXT TAG
<                } // location
<                /**********************************************************
<                FILE COPY OPERATIONS - TEST & REPORT STATUS
<                **********************************************************/
<                elseif( $tags[$j]['name'] == 'copyfile' ) {
< 
<                   // MAINTAIN AFFECTED FILES LIST - USE RELATIVE PATH
<                   $aff_files['afcopy'][] = str_replace( $this->rootpath, '', $tags[$j]['arg2'] );
< 
<                   // SET GLOBAL STATUS STRING FOR THIS COPYFILE OP
<                   $this->copyfile_status_check( $tags[$j] );
<                }
<                elseif( $tags[$j]['name'] == 'copyfile2' ) {
<                   // MAINTAIN AFFECTED FILES LIST - USE RELATIVE PATH
<                   $aff_files['afcopy2'][] = str_replace( $this->rootpath, '', $tags[$j]['arg2'] );
< 
<                   // SET GLOBAL STATUS STRING FOR THIS COPYFILE OP
<                   $this->copyfile_status_check( $tags[$j] );
<                   continue;
<                }
<                /**********************************************************
<                NEWFILE - TEST & REPORT STATUS
<                **********************************************************/
<                elseif( $tags[$j]['name'] == 'newfile' ) {
< 
<                   // MAINTAIN AFFECTED FILES LIST - USE RELATIVE PATH
<                   $aff_files['afcreate'][] = str_replace( $this->rootpath, '', $tags[$j]['arg1']);
< 
<                   // SET GLOBAL STATUS STRING FOR THIS NEWFILE
<                   $this->newfile_status_check( $tags[$j] );
<                   continue;
<                }
<                /**********************************************************
<                MKDIR - TEST & REPORT STATUS
<                **********************************************************/
<                elseif( $tags[$j]['name'] == 'mkdir' ) {
< 
<                   // SET GLOBAL STATUS STRING FOR THIS NEWFILE
<                   $this->mkdir_status_check( $tags[$j] );
<                   continue;
<                }
---
>       /* Construct the complete folding status display */
>       $fstatus = $this->format_status( $this->modstatus_header, $error, $status, $author_str,$id );
588,590c1408
<             } // TAGS TABLE PROCESSING
<             break;
<          } // WHILE NO PARSE ERRORS LOOP
---
>       $this->affected_files = $this->affected_files_listing( $id, $this->cfgfile, $this->modname );
592,596c1410,1412
<          /****************************************************************
<          ASSIGN FINAL STATUS TO MOD
<          ****************************************************************/
<          $status = '';
<          $error = '';
---
>       $wikilink = '';
>       if( !empty( $this->wikipage ) ) {
>         $wiki = $this->wikibase.$this->wikipage;
597a1414,1418
>         $wikilink = "
>         <div class='center'>
>           <a href='$wiki' target='_blank'><img class='center' src='classes/wiki16.png' alt='W' style='position:relative;z-index:0;'></a>
>         </div>";
>       }
599,615c1420,1421
< //Debug statistics
< /*
< echo __LINE__,'<br />';
< echo 'num_errors = ', $this->num_errors,'<br />';
< echo 'num_required = ', $this->num_required,'<br />';
< echo 'num_installed = ', $this->num_installed,'<br />';
< echo 'mods_required = ', $this->mods_required,'<br />';
< echo 'mods_installed = ', $this->mods_installed,'<br />';
< echo 'newdirs_required = ', $this->newdirs_required,'<br />';
< echo 'newdirs_installed = ', $this->newdirs_installed,'<br />';
< echo 'copies_required = ', $this->copies_required,'<br />';
< echo 'copies_installed = ', $this->copies_installed,'<br />';
< echo 'newfiles_required = ', $this->newfiles_required,'<br />';
< echo 'newfiles_installed = ', $this->newfiles_installed,'<br />';
< echo 'provisional_errors = ', $this->provisional_errors,'<br />';
< exit;
< */
---
>       /* Mod Line row background index for striping - persists accross all mods. */
>       $dbx++;
617,627d1422
<          $status_header = '';
<          // IF PARSE ERROR COMPLAIN AND QUIT
<          if( !empty( $this->parse_error ) ) {
<             $this->num_errors++;
<             $this->description = $this->admtext['cannotinstall'].". ".$this->admtext['needmodupdate'].'.';
<             $error .= "{$this->admtext['line']} {$this->parse_error['line']}: {$this->parse_error['tag']} <span class=\"msgerror\">
<                {$this->admtext[$this->parse_error['text']]}</span><br />";
<             $this->set_status( $error );
<             $status_header = self::CANTINST;
<             $error = '';
<          }
629,638c1424,1430
<          // MOD PROCESSING COMPLETE - ANALYZE STATISTICS FOR STATUS (FOUR POSSIBLES)
<          else {
<             // Mod uninstalled - no mkdir errors
<             // if the only thing installed is a directory which you may not
<             // be able to remove --- show as uninstalled?
< 
<             if( $this->num_installed == $this->newdirs_installed ) {
<                $this->num_installed = 0;
<                $this->newdirs_installed = 0;
<             }
---
>       /****************************************************************
>       DISPLAY A LISTING LINE FOR THE MOD
>       ****************************************************************/
>       /* Add link for scroll to mod starting with entered keyboard letter */
>       $fl = substr($this->modname,0,1);
>       echo "
>     <tr  class='clink_{$fl} modline listhead'>";
640,646c1432,1442
<             // Mod installed
<             if( $this->num_installed > 0 && (
<                $this->num_installed < $this->num_required ||
<                $this->provisional_errors > 0 ) ) {
<                $this->num_errors += $this->provisional_errors;
<                $status_header = self::PARTINST;
<             }
---
>       if ($this->filter != self::F_ALL)
>       {
>         echo "
>       <td class='flink mmcell databack roundleft'>
>         <div class='mminner mmrightalign checkpad'>
>           <input class='sbox' type='checkbox' name='mods[$ix][selected]' value='1' />
>           <input type='hidden' name='mods[$ix][file]' value='$this->cfgfile' />
>         </div>
>       </td>";
>       $ix++;
>       }
648,667c1444,1457
<             // INSTALLED OR OK TO INSTALL - NO ERRORS
<             elseif( !$this->num_errors ) {
<                if( $this->num_required > 0 ) {
<                   if( $this->num_installed == $this->num_required ) {
<                      $status_header = self::INSTALLED;
<                   }
<                   elseif( $this->num_installed == 0 ) {
<                      $status_header = self::OK2INST;
<                   }
<                }
<             }
<             // CAN'T INSTALL - WARNINGS OR ERRORS NOTED
<             if( empty( $status_header ) ) {
<                $status_header = self::CANTINST;
<                $filtered = array_filter( $aff_files );
<                if( empty( $filtered ) && $this->num_required == 0 ) {
<                   $this->warning = 'Mod makes no changes to target files!';
<                }
<             }
<          }
---
>       echo "
>       <td id='flinka{$id}' class='flink mmcell databack {$this->borderleft}'>
>         <div class='mmcellpad'>
>           $id. <strong>";
> 
>       if( !empty( $this->show_developer ) )
>       {
>         $modname = $this->foldable_string( $this->modname );
>         $namestr = "<a style='text-decoration:none;' href='admin_modtables.php?modfile=$this->cfgfile' title='{$this->admtext['parsetable']}' >$modname</a>";
>       }
>       else
>       {
>         $namestr = $this->foldable_string( $this->modname );
>       }
669,682c1459,1463
<          // OUTPUT FILTERED HERE NOW THAT STATUS OF MOD IS KNOWN
<          if( $this->filter == self::F_INSTALLED ) {
<             if( $status_header != self::INSTALLED ) continue;
<          }
<          elseif( $this->filter == self::F_READY ) {
<             if( $status_header != self::OK2INST ) continue;
<          }
<          elseif( $this->filter == self::F_CLEAN ) {
<             if( $status_header != self::PARTINST ) continue;
<          }
<          elseif( $this->filter == self::F_BADCFG ) {
<             if( $status_header != self::CANTINST ) continue;
<          }
<          $id++;
---
>       echo "
>           $namestr
>           </strong>
>         </div>
>       </td>
684,704c1465,1471
<          // HIDE STATUS DETAIL FOR OK TO INSTALL AND INSTALLED
<    		if( $status_header == self::OK2INST || $status_header == self::INSTALLED )
<             $status .= "<div id='hiddenstatus$id' style='display:none;'>" . $this->get_status() . "</div>";
<    		else
<              $status .= $this->get_status();
< 
<          // SET STYLES PER STATUS TYPE
<          if( $status_header == self::PARTINST ) {
<             $status = str_replace(
<                array( "NINST", "NCOPY", "NCREATE" ),
<                array( "hilight", "hilight", "hilight" ),
<                $status
<             );
<          }
<          else {
<             $status = str_replace(
<                array( "NINST", "NCOPY", "NCREATE" ),
<                array( "none", "none", "none" ),
<                $status
<             );
<          }
---
>       <td id='flinkb{$id}' class='flink mmcell databack'>
>     <!-- only add admtext['show'] to title tooltip if Show Developer is enabled -->
>         <div class='mmcellpad' title='$this->cfgfile'>";
> 
>       if( !empty( $this->show_developer ) )
>       {
>         $cfgfile = $this->foldable_string( $this->cfgfile );
706,719c1473,1479
<          //CREATE DISPLAY STRING FOR MOD AUTHOR(S)
<          $author_str = '';
<          if( count( $authors ) > 1 ) {
<             $author_str = "<strong>Authors</strong>: ";
<          }
<          elseif( count( $authors ) == 1 ) {
<             $author_str = "<strong>Author</strong>: ";
<          }
<          if( !empty( $author_str ) ) {
<             foreach( $authors as $author ) {
<                $author_str .= $author.' & ';
<             }
<             $author_str = rtrim( $author_str, ' &' ) . '<br />';
<          }
---
>         $filestr = "<a style='text-decoration:none;' href='showcfg.php?mod={$this->modspath}/$this->cfgfile'
>           target='_blank' title='{$this->admtext['show']} $this->cfgfile'>$cfgfile</a>";
>       }
>       else
>       {
>         $filestr = $this->foldable_string( $this->cfgfile );
>       }
721,740c1481,1485
<          // CONSTRUCT THE FOLDING STATUS DISPLAY
<          $fstatus = $this->format_status( $status_header, $error, $status, $author_str,$id );
<          $aff_files = $this->affected_files_listing( $id, $cfgfile, $modname, $aff_files );
<          $wikilink = '';
<          if( !empty( $this->wikipage ) ) {
<             $wiki = $this->wikibase.$this->wikipage;
< 
<             $wikilink = "
<             <div class=\"mminner center\">
<                <a href=\"$wiki\" target=\"_blank\"><img class=\"center\" src=\"classes/wiki16.png\"></a>
<             </div>";
<          }
<          if( !$this->use_striping ) {
<             $dbclass = 'databack';
<          }
<          elseif( $this->stripe_after > 0  ) {
<             if( $dbx % $this->stripe_after == 0 ) {
<                $dbclass = $dbclass == 'databack' ? "databackalt" : 'databack';
<             }
<          }
---
>       $version = $this->foldable_string( $this->version );
>       echo "
>           $filestr
>         </div>
>       </td>
742c1487,1489
<          $dbx++;
---
>       <td id='flinkc{$id}' class='flink mmcell databack center'>
>         <div class='mmcellpad'>";
>           echo ltrim( $version, "vV" );
744,793c1491,1492
<          /****************************************************************
<          DISPLAY A LISTING LINE FOR THE MOD
<          ****************************************************************/
<          echo "
<    <tr class=\"modline\">";
<          if ($this->filter != self::F_ALL) {
<             echo "
< 		<td class=\"mmcell $dbclass\">
<          <div class=\"mminner center checkpad\">
<             <input class=\"sbox\" type=\"checkbox\" name=\"mods[$ix][selected]\" value=\"1\" />
<             <input type=\"hidden\" name=\"mods[$ix][file]\" value=\"$this->cfgfile\" target=\"_blank\" />
<          </div>
<       </td>";
<       $ix++;
<          }
<          echo "
<       <td id=\"flinka{$id}\" class=\"flink mmcell $dbclass\">
<          <div class=\"mminner mmcellpad\">
<             $id. <strong>";
<                if( !empty( $this->show_developer ) ) {
<                   $namestr = "<a style=\"text-decoration:none;\" href=\"admin_modtables.php?modfile=$cfgfile\" title=\"{$this->admtext['parsetable']}\" >{$this->modname}</a>";
<                }
<                else {
<                   $namestr = $this->modname;
<                }
< 
<          echo "
<             $namestr
<             </strong>
<          </div>
<       </td>
<       <td id=\"flinkb{$id}\" class=\"flink mmcell $dbclass\">
< 	  <!-- only add admtext['show'] to title tooltip if Show Developer is enabled -->
<          <div class=\"mminner mmcellpad\" title=\"$cfgfile\">";
<                if( !empty( $this->show_developer ) ) {
<                   $filestr = "<a style=\"text-decoration:none;\" href=\"showcfg.php?mod={$this->modspath}/$cfgfile\"
<                      target=\"_blank\" title=\"{$this->admtext['show']} $cfgfile\">$cfgfile</a>";
<                }
<                else {
<                   $filestr = $cfgfile;
<                }
<          echo "
<             $filestr
<          </div>
<       </td>
<       <td id=\"flinkc{$id}\" class=\"flink mmcell $dbclass center\">
<          <div class=\"mminner mmcellpad\">";
<          echo ltrim( $this->version, "vV" );
<          echo "
<          </div>
---
>       echo "
>         </div>
795c1494
<       <td class=\"mmcell $dbclass center mmcellpad\">
---
>       <td class='mmcell databack flink center mmcellpad' >
798,819c1497
<       <td class=\"stcell\">
<          $fstatus
<       </td>
<       <td class=\"afcell\">
<          $aff_files
<       </td>
<    </tr>";
<       }// FOREACH MOD FILE
<          echo "
<    </table>
<    </td><!--tngshadow-->
<    </tr><!--databack-->
<    </table><!--mmlist-->
< </form>";
<       return isset($tags) ? $tags : array();
<    } // FUNCTION LIST MODS
<    /**********************************************************************
<    SUPPORTING FUNCTIONS
<    **********************************************************************/
<    private function foldable_string( $string ) {
<       return preg_replace('@([\./_])@', '&#8203;$1', $string );
<    }
---
> ";
821,823c1499
<    public function set_modfile( $modfile ) {
<       $this->modlist = array( $modfile );
<    }
---
> if( $this->modstatus_header == self::INSTALLED ) {}
825,828c1501,1517
<    public function get_last_status() {
<       return $this->status_header;
<    }
<    protected function validate_location( $buffer, $tngcode, $newcode, $optag, $statstring ) {
---
> switch( $this->modstatus_header )
> {
>   case self::OK2INST:
>     $status_class = 'ok2inst';
>     break;
>   case self::INSTALLED:
>     $status_class = 'installed';
>     break;
>   case self::PARTINST:
>     $status_class = 'partinst';
>     break;
>   case self::CANTINST:
>     $status_class = 'cantinst';
>     break;
>   default:
>     $status_classe = '';
> }
830,931c1519,1522
<       // VINSERT VARIABLES (ANY VALUE) ALREADY INSTALLED
<       if( $optag == 'vinsert:before' || $optag == 'vinsert:after' ) {
<          $num_vars = 0;
<          $vars_installed = 0;
<          preg_match_all( "#(\\$[^\s=]+)\s*=+#sm", $newcode, $matches );
<          $vars = $matches[1];
<          $num_vars = count( $vars );
<          foreach( $vars as $var ) {
<             $count = substr_count( $buffer, $var );
<             if( $count > 1 ) {
<                // VAR IS NOT UNIQUE
<                $this->num_errors++;
<                $statstring .= "$optag:$var&nbsp;<span class=\"hilighterr msgbold\">{$this->admtext['notunique']}</span>";
<                $this->set_status( $statstring );
<                return false;
<             }
<             $vars_installed += $count;
<          }
<          if( $vars_installed > 0 ) {
<             if( $vars_installed == $num_vars ) {
<                // ALL VARS ARE INSTALLED CORRECTLY
<                $this->num_installed++;
<                $this->mods_installed++;
<                $statstring .= $this->admtext['installed'];
<                $this->set_status( $statstring );
<                return true;
<             }
<             elseif( $vars_installed < $num_vars ) {
<                $this->provisional_errors++;
<                $this->num_installed++;
<                $statstring .= "$optag:&nbsp;<span class=\"hilighterr msgbold\">{$this->admtext['partinst']}</span>";
<                $this->set_status( $statstring );
<                return false;
<             }
<          }
<          else {
<             // VARS ARE NOT YET INSTALLED
<             $statstring .= "$optag:&nbsp;<span class=\"NINST\">{$this->admtext['notinst']}</span>";
<             $this->set_status( $statstring );
<             return true;
<          }
<       }
< 
<       // NEW CODE ALREADY INSTALLED
<       $already_installed = substr_count( $buffer, $newcode );
<       if( $already_installed ) {
<          $this->num_installed++;
<          $this->mods_installed++;
<          $statstring .= $this->admtext['installed'];
<          $this->set_status( $statstring );
<          return true;
<       }
<       // NOT INSTALLED YET - CHECK TNG CODE
<       $num_targets = substr_count( $buffer, $tngcode );
< 
<       // INSERTING NEW CODE MIGHT RESULT IN 'NOT UNIQUE' CONDITION
<       if( $num_targets == 1 ) {
<          if( $optag != '%replace:%' && $optag != '%trimreplace:%' ) {
<             if( false !== strpos( $buffer, $newcode ) ) {
<                $this->num_errors++;
<                $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['notunique']}</span>";
<                $this->set_status( $statstring );
<                return false;
<             }
<          }
<       }
< 
<       // MORE THAN ONE TARGET - SO NOT UNIQUE
<       if( $num_targets > 1 ) {
<          $this->num_errors++;
<          $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['notunique']}</span>";
<          $this->set_status( $statstring );
<          return false;
<       }
< 
<       // TNG CODE NOT FOUND - BAD TARGET
<       if( $num_targets == 0 ) {
<          $this->num_errors++;
<          $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['badtarget']}</span>";
<          $this->set_status( $statstring );
<          return false;
<       }
< 
<       // REPLACEMENT FRAGMENT ERROR?
<       // If MM replaced a whole block of code based on a fragment, it would not be
<       // able to restore it upon removal of the mod - so it is an error
<       if( $optag == "replace" ) {
<          $is_fragment = false;
<          if( false !== $i = strpos( $buffer, $tngcode ) ) {
<             // ANY NON WHITE SPACE BEFORE TARGETED TNG CODE ON FIRST LINE?
<             $p = $i;
<             while( $p > 0 ) {
<                $p--;
<                if( $buffer[$p] == "\n" ) {
<                   break;
<                }
<                // NOT WHITE-SPACE? HERE IS A FRAGMENT!
<                if( $buffer[$p] != " " && $buffer[$p] != "\t" ) {
<                   $is_fragment = true;
<                   break;
<                }
<             }
---
> echo "
>       <td class='stcell $status_class'>
>          $fstatus
>       </td>
933,962c1524,1527
<             if( !$is_fragment ) {
<                // CHECK EACH CHAR FOR NON-WHITE SPACE AFTER TARGET CODE ON LAST LINE
<                $p = $i + strlen( $tngcode ); // last position in target str
<                while ( true ) {
<                   if( !isset( $buffer[$p] ) ) { // EOF - no CRLF
<                      break;
<                   }
<                   if( $buffer[$p] == "\r" ) { // CRLF
<                      break;
<                   }
<                   // NOT WHITE-SPACE? HERE IS A FRAGMENT!
<                   if( $buffer[$p] != " " && $buffer[$p] != "\t" ) {
<                      $is_fragment = true;
<                      break;
<                   }
<                   $p++;
<                }
<             }
<          }
<          if( $is_fragment ) {
<             $this->num_errors++;
<             $statstring .= "<span class=\"msgerror\">{$this->admtext['no_frag']}</span>";
<             $this->set_status( $statstring );
<             return false;
<          }
<       }
<       $statstring .= "<span class=\"NINST\">{$this->admtext['notinst']}</span>";
<       $this->set_status( $statstring );
<       return true;
<    } // VALIDATE LOCATION
---
>       <td class='afcell flink borderright'>
>         $this->affected_files
>       </td>
>     </tr>";
964,997c1529,1660
<    protected function copyfile_status_check( $tag ) {
<       $flag = $tag['flag'];
<       $line = $tag['line'];
<       $srcpath = $tag['arg1'];
<       $srcfilename = pathinfo( $tag['arg1'], PATHINFO_BASENAME );
<       $relsrcpath = str_replace( $this->rootpath, '', $tag['arg1'] );
<       // add zero-length spaces to a %copyfile% source and destination paths so that they can wrap.
<       $relsrcpath = $this->foldable_string( $relsrcpath );
<       $destpath = $tag['arg2'];
<       $reldestpath = str_replace( $this->rootpath, '', $tag['arg2'] );
<       $reldestpath = $this->foldable_string( $reldestpath );
<       $statstring = "<div class=\"list-indent\">
<       {$this->admtext['line']} {$tag['line']}: <span class=\"tag\">%{$tag['name']}: </span>
<       <span class=\"copyfile\">
<          $flag$reldestpath
<       </span>&nbsp;";
< 
<       $this->num_required++;
<       $this->copies_required++;
< 
<       // FILE ALREADY COPIED TO DESTINATION
<       if( file_exists( $destpath ) ) {
<          if( $flag == self::FLAG_PROTECTED ) {
<             $statstring .= "<span class=\"msgapproved\">{$this->admtext['protected']}</span>";
<             $this->num_required--;
<             $this->copies_required--;
<          }
<          else {
<             $this->num_installed++;
<             $this->copies_installed++;
<             $statstring .= $this->admtext['copied'];
<          }
<          $this->set_status( $statstring, $relsrcpath );
<          return;
---
>       // Display modline
>       break;
>     }
>     return;
>   } // display_modline()
> 
>   protected function set_modstatus_header()
>   {
>     $this->modstatus_header = '';
>     // IF PARSE ERROR COMPLAIN AND QUIT
>     if( !empty( $this->parse_error ) ) {
>       $this->num_errors++;
>       $this->description = $this->admtext['cannotinstall'].". ".$this->admtext['needmodupdate'].'.';
>       $error = "{$this->admtext['line']} {$this->parse_error['line']}: {$this->parse_error['tag']} <span class='msgerror'>
>          {$this->admtext[$this->parse_error['text']]}</span><br />";
>       $this->set_status( $error );
>       $this->modstatus_header = self::CANTINST;
>       $error = '';
>     }
> 
>     // ANALYZE STATISTICS FOR STATUS (FOUR POSSIBLES)
>     else
>     {
>       // Mod uninstalled - no mkdir errors
>       // if the only thing installed is a directory which you may not
>       // be able to remove --- show as uninstalled
>       if( $this->num_installed == $this->newdirs_installed )
>       {
>         $this->num_installed = 0;
>         $this->newdirs_installed = 0;
>       }
> 
>       // Partially installed
>       if( $this->num_installed > 0 && (
>         $this->num_installed < $this->num_required ||
>         $this->provisional_errors > 0 ) )
>       {
>         $this->num_errors += $this->provisional_errors;
>         $this->modstatus_header = self::PARTINST;
>       }
> 
>       // No errors - Installed or OK to Install
>       elseif( !$this->num_errors )
>       {
>         if( $this->num_required > 0 )
>         {
>           if( $this->num_installed == $this->num_required )
>           {
>              $this->modstatus_header = self::INSTALLED;
>           }
>           elseif( $this->num_installed == 0 )
>           {
>              $this->modstatus_header = self::OK2INST;
>           }
>         }
>       }
> 
>       // CAN'T INSTALL - WARNINGS OR ERRORS NOTED
>       if( empty( $this->modstatus_header ) )
>       {
>         $this->modstatus_header = self::CANTINST;
>         $filtered = array_filter( $this->affected_files );
>         if( empty( $filtered ) && $this->num_required == 0 )
>         {
> 
>         }
>       }
>     }
>   } // set_modstatus_header()
> 
>   protected function init_class_properties()
>   {
>     $this->status_string = '';
>     $this->description = $this->note = $this->private = $this->wikipage = $wikilink = '';
>     $this->is_target   = false;
> 
>     // statistics
>     $this->num_required = 0;
>     $this->mods_required = 0;
>     $this->copies_required = 0;
>     $this->newfiles_required = 0;
>     $this->newdirs_required = 0;
>     $this->num_installed = 0;
>     $this->mods_installed = 0;
>     $this->copies_installed = 0;
>     $this->newfiles_installed = 0;
>     $this->newdirs_installed = 0;
>     $this->parameters = 0;
>     $this->num_errors = 0;
>     $this->provisional_errors = 0;
>     $this->init_status();
>     $this->target_file_contents = '';
>     $this->active_target_file = '';
>     $this->is_target = false;
>     $this->affected_files = array();
>     $this->target_location_count = 0;
> 
>     // init data array for affected_files_listing() function
>     $this->affected_files = array(
>         'afchange'  => array(),
>         'afcopy'    => array(),
>         'afcopy2'   => array(),
>         'afcreate'  => array(),
>         'afnewfile' => array()
>      );
>     $this->warning='';
>     $this->modstatus_header = '';
>     $this->isprivate = false;
> 
>     $this->authors = array();
>      return;
>   } // init_class_properties()
> 
>   private function display_filterbar()
>   {
>     $lockit = "";
> 
>     // SET SELECTED VALUE FROM FILTER DROP DOWN LIST
>     $s0 = $s1 = $s2 = $s3 = $s4 = $s5 = '';
>     ${'s'.$this->filter} = "selected='selected'";
> 
>     // SET FILTER BAR ACTION BUTTONS
>     $btnline = $this->setup_filter_line( $this->filter );
> 
>     // FILTER LOCK AND BATCH OPERATIONS FILE SELECTOR
>     if( $this->filter != self::F_ALL )
>     {
>       // set lock on by default for this filter
>       if( $this->filter == self::F_SELECT )
>       {
>          $cbchecked = 'checked';
>          $_SESSION['filter'] = self::F_SELECT;
999,1025c1662,1664
< 
<       // SOURCE FILE FOR COPY MUST EXIST
<       if( !file_exists( $srcpath ) ) {
<          $this->num_errors++;
<          $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['srcfilemissing']}</span>";
<          $this->set_status( $statstring, $relsrcpath );
<          return;
<       }
< 
<       // DESTINATION FOLDER FOR COPY MUST EXIST IF NOT OPTIONAL OR NOFOUL
<       $thefolder = pathinfo( $destpath, PATHINFO_DIRNAME );
<       if( !file_exists( $thefolder ) ) {
<          if( $flag == self::FLAG_OPTIONAL ) {
<             $this->num_required--;
<             $statstring .= "{$this->admtext['nofolder']}&nbsp;<span class=\"msgapproved\">{$this->admtext['willbypass']}</span>";
<          }
<          elseif( $flag == self::FLAG_NOFOUL ) {
<             $this->num_required--;
<             $this->provisional_errors++;
<             $statstring .= "{$this->admtext['nofolder']}&nbsp;<span class=\"msgapproved\">{$this->admtext['provisional']}</span>";
<          }
<          else {
<             $this->num_errors++;
<             $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['nofolder']}</span>";
<          }
<          $this->set_status( $statstring, $relsrcpath );
<          return;
---
>       else
>       {
>         $cbchecked = $this->fbox_checked ? "checked" : "";
1028,1051c1667,1668
<       $statstring .= "<span class=\"NCOPY\">{$this->admtext['notcopied']}</span>";
<       $this->set_status( $statstring, $relsrcpath );
<       return;
< 
<    } // COPYFILE STATUS CHECK
< 
<    protected function newfile_status_check( $tag ) {
<       $flag = $tag['flag'];
<       $line = $tag['line'];
<       $destpath = $tag['arg1'];
< 
<       // USE RELATIVE DESTINATION PATH FOR DISPLAYS
<       $reldestpath = str_replace( $this->rootpath, '', $tag['arg1'] );
<       $reldestpath = $this->foldable_string( $reldestpath );
< 
<       $statstring = "<div class=\"list-indent\">{$this->admtext['line']} $line: <span class=\"tag\">%newfile: </span><span class=\"newfile\">$flag$reldestpath</span>&nbsp;";
< 
<       if( $flag == self::FLAG_PROTECTED ) {
<          if( file_exists( $destpath ) ) {
<             $statstring .= "<span class=\"msgapproved\">{$this->admtext['protected']}</span>";
<             $this->set_status( $statstring );
<             return;
<          }
<       }
---
>       $lockit .= "
>            {$this->admtext['stayon']}&nbsp;&nbsp;<input type='checkbox' id='stayon' $cbchecked/>";
1053,1054c1670,1712
<       $this->num_required++;
<       $this->newfiles_required++;
---
>         $selectboxes = "
>         <button type='button' id='selectAll'>
>            {$this->admtext['selectall']}
>         </button>
>         &nbsp;&nbsp;
>         <button type='button' id='clearAll'>
>            {$this->admtext['clearall']}
>         </button>";
>      }
>      else
>     {
>        $selectboxes = '';
>     }
> 
>     /*******************************************************************
>     SHOW THE MOD FILTER BAR
>     *******************************************************************/
>     // MAKE ENGLISH CHOICES CONSISTENT IN FILTER STATUS DROPDOWN MENU
>     $this->admtext['partinst'] = ucfirst( $this->admtext['partinst'] );
>     $this->admtext['cantinst'] = ucfirst( $this->admtext['cantinst'] );
> 
>     // RETURN NEW FILTER STATUS TO MODHANDLER FOR REDISPLAY IF CHANGED BY USER
>     echo "
> <form action='admin_modhandler.php' method='post'>
> <table id='fbar' class='lightback fbar'>
>    <tr>
>       <td class='fbar fieldnameback fieldname roundtop'>
>         <div class='float-left'>
>         &nbsp;{$this->admtext['statusfilter']}:&nbsp;
>         <select name='filter' >
>           <option value='".self::F_ALL."' $s0>{$this->admtext['all']}</option>
>           <option value='".self::F_READY."' $s1>{$this->admtext['ready']}</option>
>           <option value='".self::F_INSTALLED."' $s2>{$this->admtext['installed']}</option>
>           <option value='".self::F_CLEAN."' $s3>{$this->admtext['partinst']}</option>
>           <option value='".self::F_BADCFG."' $s4>{$this->admtext['cantinst']}</option>
>           <option value='".self::F_SELECT."' $s5>{$this->admtext['choose']}</option>
>         </select>
>         <input type='submit' name='newlist' value='{$this->admtext['go']}' />
>         &nbsp;&nbsp;$lockit&nbsp;&nbsp;$selectboxes &nbsp;&nbsp; $btnline
>          </div>
>     </td>
>    </tr>
> </table>";
1056,1080c1714
<       // warn if destination folder for new file does not exist
<       $thefolder = pathinfo( $destpath, PATHINFO_DIRNAME );
<       if( !file_exists( $thefolder ) ) {
<          if( $flag == self::FLAG_NOFOUL ) {
<             $this->num_required--;
<             $this->newfiles_required--;
<             $this->provisional_errors++;
<             $statstring .= "<span class=\"tag\">{$this->admtext['nofolder']}&nbsp;</span><span class=\"msgapproved\">{$this->admtext['provisional']}</span>";
<             $this->set_status( $statstring );
<             return;
<          }
<          elseif( $flag == self::FLAG_OPTIONAL ) {
<             $this->num_required--;
<             $this->newfiles_required--;
<             $statstring .= "<span class=\"tag\">{$this->admtext['optmissing']}&nbsp;</span><span class=\"msgapproved\">{$this->admtext['willbypass']}</span>";
<             $this->set_status( $statstring );
<             return;
<          }
<          else {
<             $this->num_errors++;
<             $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['nofolder']}</span>";
<             $this->set_status( $statstring );
<          }
<          return;
<       }
---
>   } // display_filterbar()
1082,1087c1716,1743
<       // IF NEWFILE INSTALLED CHECK VERSION
<       if( file_exists( $destpath ) ) {
<          if( $flag != self::FLAG_OPTIONAL ) {
<             $this->num_installed++;
<             $this->newfiles_installed++;
<          }
---
>   private function display_headings()
>   {
>     // CONFIGURE COLUMN HEADER SORT ICONS
>     if( $this->sortby == self::NAMECOL )
>     {
>       $filesort = "<a href='admin_modhandler.php?sort=".self::FILECOL."'><img src='img/tng_sort_asc.gif'
>             width='15' height='8' alt='' title='{$this->admtext['text_sort']}' /></a>";
>       $namesort = "<img src='img/tng_sort_desc.gif'
>             width='15' height='8' alt='' />";
>     }
>     else
>     {
>       $namesort = "<a href='admin_modhandler.php?sort=".self::NAMECOL."'><img src='img/tng_sort_asc.gif'
>             width='15' height='8' alt='' title='{$this->admtext['text_sort']}' /></a>";
>       $filesort = "<img src='img/tng_sort_desc.gif'
>             width='15' eight='8' alt='' />";
>     }
> 
>     /*******************************************************************
>     SHOW MOD LIST HEADINGS
>     *******************************************************************/
>     // uses bounding table to eliminate jumping during page load
>     echo "
> <div class='tableFixedHead'>
> <table id='modlist' class='mmtable' style='position:relative;'>
>   <thead>
>    <tr>
> ";
1089,1113c1745,1804
<          // match cfg fileversion with installed newfile version
<          if( !preg_match( "#%version:".$tag['arg3']."%#", $tag['arg2'] ) ) {
<             $this->num_installed--;
<             $this->newfiles_installed--;
<             $this->num_errors++;
<             $statstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['badversion']}</span>";
<             $this->set_status( $statstring );
<             return;
<          }
<          $statstring .= $this->admtext['created'];
<          $this->set_status( $statstring );
<          return;
<       }
<       // NEW FILE NOT CREATED YET
<       else {
<          $statstring .= "<span class=\"NCREATE\">{$this->admtext['nocreated']}</span>";
<          $this->set_status( $statstring );
<          return;
<       }
<       if( $flag != self::FLAG_OPTIONAL ) {
<          $this->num_required--;
<          $this->newfiles_required--;
<       }
<       return;
<    } // NEWFILE STATUS CHECK \
---
>     // SHOW LEFT-SIDE SELECTION BOX HEADING IF A FILTER IS APPLIED
>     if ($this->filter != self::F_ALL)
>     {
>       echo "
>     <th class='fieldnameback fieldname center colselct roundbl'>
>       <div class='mminner mmrightalign'>&check;</div>
>     </th>";
>     }
> 
>     // DISPLAY THE MOD LISTING ROW HEADINGS
>     echo "
>       <th class='fieldnameback fieldname center colmodnm $this->borderbl'>{$this->admtext['modname']}&nbsp;&nbsp;$namesort</th>
>       <th class='fieldnameback fieldname center colcfgnm'>{$this->admtext['cfgname']}&nbsp;&nbsp;$filesort</th>
>       <th class='fieldnameback fieldname center colversn'>{$this->admtext['version']}</th>
>       <th class='fieldnameback fieldname center colwiki'>
>          <div class='mminner'>
>             {$this->admtext['wiki']}
>          </div>
>       </th>
>       <th class='fieldnameback fieldname center colstatus'>{$this->admtext['status']} v14 $this->modspath</th>
>       <th class='fieldnameback fieldname center colaflist' style='z-index:10;'><strong>{$this->admtext['aflist']}</strong></th>
>    </tr>
>   </thead>
> ";
>   } // display_headings()
> 
>   protected function get_modlisting()
>   {
>     $modlisting = $this->get_modlist_sorted();
> 
>     $this->sysmsg = '';
> 
>     if( isset( $_SESSION['err_msg'] ) )
>     {
>       $this->sysmsg = $_SESSION['err_msg'];
>       unset( $_SESSION['err_msg'] );
>     }
> 
>     // DISPLAY BIG SYSTEM MESSAGE IF NO MODFILES ARE FOUND
>     if( empty( $this->modspath ) )
>     {
>       $this->sysmsg = "<span class='msgerror'>\$modspath {$this->admtext['missing']}";
>     }
>     elseif( empty( $this->extspath ) )
>     {
>       $this->sysmsg = "<span class='msgerror'>\$extspath {$this->admtext['missing']}";
>     }
>     elseif( $modlisting == self::NOPATH )
>     {
>       $this->sysmsg = "{$this->admtext['cannotopendir']}: ".rtrim($this->modspath, "/")."!";
>     }
>     elseif( $modlisting == self::NOMODS )
>     {
>       $this->admtext['nomods'] = str_replace( "xxx", "cfg", $this->admtext['nomods'] );
>       $this->sysmsg = "{$this->admtext['nomods']} - ".rtrim($this->modspath, "/");
>     }
>     elseif( $modlisting == self::NOREAD )
>     {
>       $this->sysmsg = "{$this->admtext['noaccess']} - ".rtrim($this->modspath, "/" );
>     }
1115,1140c1806,1807
<    protected function mkdir_status_check( $tag ) {
<       $flag = $tag['flag'];
<       $line = $tag['line'];
<       $destpath = $tag['arg1'];
< 
<       // USE RELATIVE DESTINATION PATH FOR STATUS DISPLAYS
<       $reldestpath = $flag.str_replace( $this->rootpath, '', $tag['arg1'] );
<       $reldestpath = $this->foldable_string( $reldestpath );
< 
<       $statstring = "<div class=\"list-indent>{$this->admtext['line']} $line: <span class=\"tag\">%mkdir: </span><span class=\"mkdir\">$reldestpath</span>&nbsp;";
< 
<       $this->num_required++;
<       $this->newdirs_required++;
< 
<       // REPORT ON EXISTENCE OF FOLDER
<       if( !file_exists( $destpath ) ) {
<       // no error
<          $statstring .= "<span class=\"NCREATE\">{$this->admtext['nocreated']}</span>";
<          $this->set_status( $statstring );
<       }
<       else {
<          $this->num_installed++;
<          $this->newdirs_installed++;
<          $statstring .= "<span class=\"none\">{$this->admtext['exists']}</span>";
<          $this->set_status( $statstring );
<       }
---
>     if( !empty( $this->sysmsg ) )
>     {
1142c1809
<    }
---
>     }
1144,1183c1811,1812
<    // SHOW FILTER LINE BUTTONS
<    protected function setup_filter_line( $filter ) {
<       $buttons['installall'] = "\r\n<button type=\"submit\" id=\"btnInstall\"
<          class=\"msgapproved\" name=\"submit\" value=\"installall\">{$this->admtext['installall']}</button>";
<       $buttons['deleteall'] = "\r\n<button type=\"submit\" id=\"btnDelete\"
<          class=\"msgerror\" name=\"submit\" value=\"deleteall\">{$this->admtext['deleteall']}</button>";;
<       $buttons['removeall'] = "\r\n<button type=\"submit\" id=\"btnRemove\"
<          class=\"msgapproved\" name=\"submit\" value=\"removeall\">{$this->admtext['removeall']}</button>";
<       $buttons['cleanupall'] = "\r\n<button type=\"submit\" id=\"btnClean\"
<          class=\"msgapproved\" name=\"submit\" value=\"cleanupall\">{$this->admtext['cleanupall']}</button>";
<       $buttons['selectall'] = "\r\n<button type=\"submit\" id=\"btnChoose\"
<          class=\"msgapproved\" name=\"submit\" value=\"selectall\">{$this->admtext['choose']}</button>";
< 
<       $btnline = "";
<       switch( $filter ) {
<          case self::F_READY:
<             $btnline = $buttons['installall']."\r\n&nbsp;&nbsp;\r\n".$buttons['deleteall'];
<             break;
<          case self::F_INSTALLED:
<             $btnline = $buttons['removeall'];
<             break;
<          case self::F_CLEAN:
<             $btnline = $buttons['cleanupall'];
<             if ($this->delete_partial ) {
<                $btnline .= "\r\n&nbsp;&nbsp;\r\n".$buttons['deleteall'];
<             }
<             break;
<          case self::F_BADCFG:
<             $btnline = $buttons['deleteall'];
<             break;
<          case self::F_SELECT:
<             $btnline = $buttons['selectall'];
<             if( $this->delete_partial && $this->delete_installed ) {
<                $btnline .= "\r\n&nbsp;&nbsp;\r\n".$buttons['deleteall'];
<             }
<             //$btnline = $buttons['selectall'];
<             break;
<          default:
<             $btnline = "\r\n&nbsp;&nbsp;{$this->admtext['choosefilter']}";
<             break;
---
>     return $modlisting;
>   } // get_modlisting()
1185,1187c1814,1866
<       }
<       return $btnline;
<    }
---
>  protected function foldable_string( $string )
>  {
>     return preg_replace('@([\./_])@', '&#8203;$1', $string );
>  }
> 
>  public function set_modfile( $modfile ) {
>     $this->modlist = array( $modfile );
>  }
> 
>  // SHOW FILTER LINE BUTTONS
>  protected function setup_filter_line( $filter )
>  {
>     $buttons['installall'] = "\r\n<button type='submit' id='btnInstall'
>       class='msgapproved' name='submit' value='installall'>{$this->admtext['installall']}</button>";
>     $buttons['deleteall'] = "\r\n<button type='submit' id='btnDelete'
>       class='msgerror' name='submit' value='deleteall'>{$this->admtext['deleteall']}</button>";;
>     $buttons['removeall'] = "\r\n<button type='submit' id='btnRemove'
>       class='msgapproved' name='submit' value='removeall'>{$this->admtext['removeall']}</button>";
>     $buttons['cleanupall'] = "\r\n<button type='submit' id='btnClean'
>       class='msgapproved' name='submit' value='cleanupall'>{$this->admtext['cleanupall']}</button>";
>     $buttons['selectall'] = "\r\n<button type='submit' id='btnChoose'
>       class='msgapproved' name='submit' value='selectall'>{$this->admtext['choose']}</button>";
> 
>     $btnline = "";
>     switch( $filter ) {
>       case self::F_READY:
>         $btnline = $buttons['installall']."\r\n&nbsp;&nbsp;\r\n".$buttons['deleteall'];
>         break;
>       case self::F_INSTALLED:
>         $btnline = $buttons['removeall'];
>         break;
>       case self::F_CLEAN:
>         $btnline = $buttons['cleanupall'];
>         if ($this->delete_partial ) {
>            $btnline .= "\r\n&nbsp;&nbsp;\r\n".$buttons['deleteall'];
>         }
>         break;
>       case self::F_BADCFG:
>         $btnline = $buttons['deleteall'];
>         break;
>       case self::F_SELECT:
>         $btnline = $buttons['selectall'];
>         if( $this->delete_partial && $this->delete_installed ) {
>            $btnline .= "\r\n&nbsp;&nbsp;\r\n".$buttons['deleteall'];
>         }
>         //$btnline = $buttons['selectall'];
>         break;
>       default:
>         $btnline = "\r\n&nbsp;&nbsp;{$this->admtext['choosefilter']}";
>         break;
>     }
>     return $btnline;
>   }
1189c1868,1869
<    protected function set_status( $string, $relsrcpath='' ){
---
>   protected function set_status( $string, $relsrcpath='' )
>   {
1191,1192c1871,1872
<    // closes the status line div before inserting the table for the copyfile display
<    if (substr($string,0,4)=='<div')
---
>     // closes the status line div before inserting the table for the copyfile display
>     if (substr($string,0,4)=='<div')
1195c1875,1876
<       if( !empty( $relsrcpath ) ) {
---
>       if( !empty( $relsrcpath ) )
>       {
1197,1198c1878,1879
<       // In the <table> tag, add a left margin to replace the left margin from the parent <div>
<       $string .= "
---
>         // In the <table> tag, add a left margin to replace the left margin from the parent <div>
>         $string .= "
1201c1882
<             <td class=\"normal fieldnameback fieldname\">
---
>             <td class='normal fieldnameback fieldname'>
1207a1889
> 
1211c1893
<          $string .= '<br />';
---
>         $string .= '<br />';
1213c1895
<    }
---
>   }
1215,1218c1897,1901
<    protected function get_status() {
<       $retstr = "<br style=\"line-height:6px\" /><strong><i><div style=\"padding-bottom:3px;border-bottom:1px solid #000;\">flags:<br />@&nbsp;&nbsp;{$this->admtext['optional']}<br />^&nbsp;&nbsp;{$this->admtext['provisional']}<br />~&nbsp;&nbsp;protected</div></i></strong><br style=\"line-height:6px\" />";
<       return $retstr.$this->status_string;
<    }
---
>   protected function get_status()
>   {
>     $retstr = "<br /><br /><div style='padding-bottom:3px;border-bottom:1px solid #000;'><strong><i>flags:<br />@&nbsp;&nbsp;{$this->admtext['optional']}<br />^&nbsp;&nbsp;{$this->admtext['provisional']}<br />~&nbsp;&nbsp;protected<br /></i></strong></div><br style='line-height:6px' />";
>     return $retstr.$this->status_string;
>   }
1220,1222c1903,1906
<    protected function init_status() {
<       $this->status_string = '';
<    }
---
>   protected function init_status()
>   {
>     $this->status_string = '';
>   }
1224,1226c1908,1911
<    protected function format_status( $status_header, $error, $status, $author_str, $id ) {
<       $this->status_header = $status_header;
<       $btn_install = "<button class=\"msgapproved\" type=\"button\" onclick='window.location.href=\"?a=".self::INSTALL."&m=$this->cfgfile\"'>{$this->admtext['install']}</button>";
---
>   protected function format_status( $status_header, $error, $status, $author_str, $id )
>   {
>     //$this->status_header = $status_header;
>     $btn_install = "<button class='msgapproved' type='button' onclick='window.location.href=\"?a=".self::INSTALL."&id=$id&m=$this->cfgfile\"'>{$this->admtext['install']}</button>";
1228,1230c1913,1915
<       $confirm = empty( $this->delete_support ) ?
<          $this->admtext['confdelmod1'] :
<          $this->admtext['confdelmod'];
---
>     $confirm = empty( $this->delete_support ) ?
>       $this->admtext['confdelmod1'] :
>       $this->admtext['confdelmod'];
1232,1233c1917,1918
<       // javascript messages must contain a single quote character
<       $confirm = str_replace( "'", "\'", $confirm );
---
>     // javascript messages must contain a single quote character
>     $confirm = str_replace( "'", "\'", $confirm );
1235c1920
<       $btn_delete = "<button class=\"msgerror\" type=\"button\" onclick=\"if(confirm('{$confirm}')) {window.location.href='?a=".self::DELETE."&m=$this->cfgfile';}\">{$this->admtext['delete']}</button>";
---
>     $btn_delete = "<button class='msgerror' type='button' onclick=\"if(confirm('{$confirm}')) {window.location.href='?a=".self::DELETE."&id=$id&m=$this->cfgfile';}\">{$this->admtext['delete']}</button>";
1237c1922
<       $btn_remove = "<button class=\"msgapproved\" type=\"button\" onclick='window.location.href=\"?a=".self::REMOVE."&m=$this->cfgfile\"'>{$this->admtext['uninstall']}</button>";
---
>     $btn_remove = "<button class='msgapproved' type='button' onclick='window.location.href=\"?a=".self::REMOVE."&id=$id&m=$this->cfgfile\"'>{$this->admtext['uninstall']}</button>";
1239c1924
<       $btn_cleanup = "<button class=\"msgapproved\" type=\"button\" onclick='window.location.href=\"?a=".self::CLEANUP."&m=$this->cfgfile\"'>{$this->admtext['cleanup']}</button>";
---
>     $btn_cleanup = "<button class='msgapproved' type='button' onclick='window.location.href=\"?a=".self::CLEANUP."&id=$id&m=$this->cfgfile\"'>{$this->admtext['cleanup']}</button>";
1241,1244c1926,1930
<       $btn_edit = '';
<       if( $this->parameters ) {
<          $btn_edit = "<button type=\"button\" onclick='window.location.href=\"admin_modeditor.php?a=".self::EDITP."&m=$this->cfgfile\"'>{$this->admtext['edopts']}</button>";
<       }
---
>     $btn_edit = '';
>     if( $this->parameters )
>     {
>        $btn_edit = "<button type='button' onclick='window.location.href=\"admin_modeditor.php?a=".self::EDITP."&id=$id&m=$this->cfgfile\"'>{$this->admtext['edopts']}</button>";
>     }
1246c1932
< 		// SHOW AVAILABLE FUNCTION BUTTONS IN OPENED STATUS AREA
---
>     // SHOW AVAILABLE FUNCTION BUTTONS IN OPENED STATUS AREA
1248c1934
<       $btn_list = "<button class=\"smallbutton\" type=\"button\"  name=\"listlocation$id\" onclick=\"jQuery('#hiddenstatus$id').show()\">{$this->admtext['detail']}</button>";
---
>       $btn_list = "<button class='smallbutton' type='button'  name='listlocation$id' onclick=\"jQuery('#hiddenstatus$id').show()\">{$this->admtext['detail']}</button>";
1250,1251c1936,1937
<       $btn_list = "<button class=\"smallbutton\" type=\"button\"  name=\"listlocation$id\" onclick=\"if(document.getElementById('hiddenstatus$id').style.display=='none') document.getElementById('hiddenstatus$id').style.display='block'; else document.getElementById('hiddenstatus$id').style.display='none';\">{$this->admtext['detail']}</button>";
<       $options_link = '';
---
>     $btn_list = "<button class='smallbutton' type='button'  name='listlocation$id' onclick=\"if(document.getElementById('hiddenstatus$id').style.display=='none') document.getElementById('hiddenstatus$id').style.display='block'; else document.getElementById('hiddenstatus$id').style.display='none';\">{$this->admtext['detail']}</button>";
>     $options_link = '';
1253,1341c1939,2037
<       $buttons = '';
<       if( $status_header == self::OK2INST ) {
<          $status_header = $this->admtext[$status_header];
<          $style = "ready";
<          $buttons = "<div>
<                   $btn_install
<                   $btn_delete
<                   $btn_list
<                </div>";
<       }
<       elseif( $status_header == self::CANTINST ) {
<          $status_header = $this->admtext[$status_header];
<          $style = "badcfg";
<          $buttons = "<div>
<                   $btn_delete
<                </div>";
<       }
<       elseif( $status_header == self::INSTALLED ) {
<          $status_header = $this->admtext[$status_header];
<          if( !empty( $this->parameters ) ) {
< 			$status_option = $this->admtext['hasoptions'];
<             $status_header .= " [$status_option]";
<          }
<          $style = "installed";
<          $buttons = "<div>
<                   $btn_remove
<                   $btn_edit";
<          if( $this->delete_installed ) {
<             $buttons .=  "
<                $btn_delete";
<          }
< 				$buttons .= " $btn_list";
<          $buttons .= "</div>";
<       }
<       elseif( $status_header == self::PARTINST ) {
<          $status_header = $this->admtext[$status_header];
<          $style = "partinst";
<          $buttons = "<div>
<                   $btn_cleanup
<                   $btn_delete
<                </div>";
<       }
< 
<       if( isset($this->isprivate) && $this->isprivate ) {
<          $status_header .= "&nbsp;&nbsp;<span style=\"font-size:90%;\"><strong>{$this->admtext['privatemod']}</strong> $this->private</span>";
<       }
< 
<       if( !empty( $this->warning ) ) {
<          $status_header .= "&nbsp;&nbsp;<strong><span style=\"font-size:90%;color:#990000;\"><strong>{$this->admtext['noeffect']}</strong></span>";
<       }
< 
<       if( !empty( $this->note ) ) {
<          $status_header .= "&nbsp;&nbsp;<span style=\"font-size:90%;width:100%;\"> $this->note</span>";
<       }
< 
<       if( $this->num_required > 0 ) {
<          $summary = "<hr />
<                <ul class=\"results fieldnameback fieldname\">
<                   <li>{$this->admtext['modsreq']}: $this->mods_required; {$this->admtext['modified']}: $this->mods_installed</li>
<                   <li>{$this->admtext['copiesreq']}: $this->copies_required; {$this->admtext['copied']}: $this->copies_installed</li>
<                   <li>{$this->admtext['newfilesreq']}: $this->newfiles_required; {$this->admtext['created']}: $this->newfiles_installed</li>
<                   <li>{$this->admtext['newdirsreq']}: $this->newdirs_required; {$this->admtext['created']}: $this->newdirs_installed</li>
<                   <li>{$this->admtext['errors']}: $this->num_errors</li>
<                </ul>";
<       }
<       else
<          $summary = '';
< 
< 
<       return "<div class=\"$style\">
<             <span class=\"modlink closed\" id=\"link{$id}\">
<                $status_header
<             </span>
<          </div>
<          <div class=\"moddiv $style\" id=\"link{$id}div\" style=\"display:none;padding:5px;\">
<             $buttons
<             <hr />
<             $author_str
<             $this->description
<             $error
<             $status
<             $summary
<          </div>";
<    } // format status
< 
<    // RETURN AFFECTED FILES POPUP LIST
<    protected function affected_files_listing( $id, $cfgfile, $modname, $aff_files ) {
<       $retstr = "
<          <div class=\"descpop1 nw imgcenter\" title=\"\">
---
>     $buttons = '';
>     if( $status_header == self::OK2INST )
>     {
>        $status_header = $this->admtext[$status_header];
>        $style = "ready";
>        $buttons = "<div>
>                 $btn_install
>                 $btn_delete
>                 $btn_list
>              </div>";
>     }
>     elseif( $status_header == self::CANTINST )
>     {
>       $status_header = $this->admtext[$status_header];
>       $style = "badcfg";
>       $buttons = "<div>
>               $btn_delete
>            </div>";
>     }
>     elseif( $status_header == self::INSTALLED )
>     {
>       $status_header = $this->admtext[$status_header];
>       if( !empty( $this->parameters ) )
>       {
>         $status_option = $this->admtext['hasoptions'];
>         $status_header .= " [$status_option]";
>       }
>       $style = "installed";
>       $buttons = "<div>
>               $btn_remove
>               $btn_edit";
>       if( $this->delete_installed ) {
>         $buttons .=  "
>            $btn_delete";
>       }
>       $buttons .= " $btn_list";
>       $buttons .= "</div>";
>     }
>     elseif( $status_header == self::PARTINST )
>     {
>       $status_header = $this->admtext[$status_header];
>       $style = "partinst";
>       $buttons = "<div>
>                 $btn_cleanup
>                 $btn_delete
>              </div>";
>     }
> 
>     if( isset($this->isprivate) && $this->isprivate )
>     {
>       $status_header .= "&nbsp;&nbsp;<span style='font-size:90%;'><strong>{$this->admtext['privatemod']}</strong> $this->private</span>";
>     }
> 
>     if( !empty( $this->warning ) )
>     {
>       $status_header .= "&nbsp;&nbsp;<strong><span style='font-size:90%;color:#990000;'><strong>{$this->admtext['noeffect']}</strong></span>";
>     }
> 
>     if( !empty( $this->note ) )
>     {
>       $status_header .= "&nbsp;&nbsp;<span style='font-size:90%;width:100%;'> $this->note</span>";
>     }
> 
>     if( $this->num_required > 0 )
>     {
>       $summary = "<hr />
>       <ul class='results fieldnameback fieldname'>
>         <li>{$this->admtext['modsreq']}: $this->mods_required; {$this->admtext['modified']}: $this->mods_installed</li>
>         <li>{$this->admtext['copiesreq']}: $this->copies_required; {$this->admtext['copied']}: $this->copies_installed</li>
>         <li>{$this->admtext['newfilesreq']}: $this->newfiles_required; {$this->admtext['created']}: $this->newfiles_installed</li>
>         <li>{$this->admtext['newdirsreq']}: $this->newdirs_required; {$this->admtext['created']}: $this->newdirs_installed</li>
>         <li>{$this->admtext['errors']}: $this->num_errors</li>
>       </ul>";
>     }
>     else
>        $summary = '';
> 
>     return "
>       <div class='$style'>
>         <span class='modlink closed' id='link{$id}'>
>           $status_header
>         </span>
>        </div>
> 
>        <div class='moddiv $style' id='link{$id}div' style='display:none'>
>           $buttons
>           <hr />
>           $author_str
>           $this->description
>           $error
>           $status
>           $summary
>        </div>";
>   } // format status
> 
>   protected function affected_files_listing( $id, $cfgfile, $modname )
>   {
>     $retstr = "
>          <div class='descpop1 nw imgcenter' title=''>
1343c2039
<             <img border=\"0\" src=\"img/tng_more.gif\" width=\"16\" alt=\"\" />
---
>             <img src='img/tng_more.gif' width='16' alt='' />
1346c2042
<                <table class=\"mmpopuptable\">
---
>                <table class='mmpopuptable'>
1348c2044
<                      <td class=\"normal fieldnameback fieldname mmpopuphdr\">
---
>                      <td class='normal fieldnameback fieldname mmpopuphdr'>
1354,1362c2050,2059
<       $filestr = '';
<       $filestr .= $this->format_affrows( $aff_files['afchange'], "{$this->admtext['target']}" );
<       $filestr .= $this->format_affrows( $aff_files['afcreate'], "{$this->admtext['newfile']}" );
<       $filestr .= $this->format_affrows( $aff_files['afcopy'], "{$this->admtext['copiesfile']}" );
<       $filestr .= $this->format_affrows( $aff_files['afcopy2'], "{$this->admtext['copiesfile2']}" );
< 
<       if( !empty( $filestr ) ) {
<          $retstr .= "
<                <table class=\"whiteback normal cellspace1 mmpad2\">
---
>     $filestr = '';
>     $filestr .= $this->format_affrows( $this->affected_files['afchange'], "{$this->admtext['target']}" );
>     $filestr .= $this->format_affrows( $this->affected_files['afcreate'], "{$this->admtext['newfile']}" );
>     $filestr .= $this->format_affrows( $this->affected_files['afcopy'], "{$this->admtext['copiesfile']}" );
>     $filestr .= $this->format_affrows( $this->affected_files['afcopy2'], "{$this->admtext['copiesfile2']}" );
> 
>     if( !empty( $filestr ) )
>     {
>       $retstr .= "
>                <table class='whiteback normal cellspace1 mmpad2'>
1365c2062
<       }
---
>     }
1367c2064
<       $retstr .= "
---
>     $retstr .= "
1370,1371c2067,2068
<       return $retstr;
<    } // affected_files_listing
---
>     return $retstr;
>   } // affected_files_listing()
1374,1377c2071,2075
<    private function format_affrows( $file_array, $label ) {
<       $retstr = '';
<       if( empty( $file_array ) ) return $retstr;
<          $retstr .= "
---
>   private function format_affrows( $file_array, $label )
>   {
>     $retstr = '';
>     if( empty( $file_array ) ) return $retstr;
>     $retstr .= "
1379,1385c2077,2081
<                      <td class=\"normal fieldnameback fieldname aligntop nw\">$label</td>
<                      <td class=\"normal databack w100 mmpadleft\">";
<       foreach( $file_array as $listing ) {
<          if( $listing == 'files' ) continue;
<          $retstr .= "
<                         $listing<br />";
<       }
---
>                      <td class='normal fieldnameback fieldname aligntop nw'>$label</td>
>                      <td class='normal databack w100 mmpadleft'>";
>     foreach( $file_array as $listing )
>     {
>       if( $listing == 'files' ) continue;
1386a2083,2085
>                         $listing<br />";
>     }
>     $retstr .= "
1391,1394c2090,2094
<    private function sys_msg( $msg ) {
<          echo "
<    <tr>
<       <td colspan=\"6\" class=\"mmsysmsg\">
---
>   private function sys_msg( $msg )
>   {
>     echo "
>     <tr>
>       <td colspan='6' class='mmsysmsg'>
1397,1399c2097,2099
<    </tr>
<    </table>";
<    }
---
>     </tr>
>     </table>";
>   }
1401d2100
< ?>
1402a2102,2138
> function new_modlister()
> {
>   global $admtext, $tngconfig;
> 
>   require $tngconfig['subroot'].'mmconfig.php';
>   require $tngconfig['subroot'].'config.php';
> 
>   if( !isset( $admtext['modlist'] ) )
>   {
>     $textpart = 'mods';
>     $mylanguage = $_SESSION['session_language'];
>     require 'languages/'.$mylanguage.'/admintext.php';
>     $session_charset = $charset;
>     require 'languages/'.$mylanguage.'/alltext.php';
>   }
> 
>   require 'version.php';
>   $sitever = getSiteVersion();
>   $mhuser = isset( $_SESSION['currentuserdesc'] ) ? $_SESSION['currentuser'] : "";
>   $sortby = isset( $_SESSION['sortby'] ) ? $_SESSION['sortby'] : 0;
> 
>   $objinits = array (
>     'rootpath'     => $rootpath,
>     'subroot'      => $tngconfig['subroot'],
>     'modspath'     => $modspath,
>     'extspath'     => $extspath,
>     'options'      => $options,
>     'time_offset'  => $time_offset,
>     'sitever'      => $sitever,
>     'currentuserdesc' => $mhuser,
>     'admtext'      => $admtext,
>     'tng_version'  => $tng_version,
>     'sortby'       => $sortby
>   );
> 
>   return new modlister( $objinits );
> }
\ No newline at end of file
Only in TNG/classes: modobjinits.php
diff -r TNG/classes/modparser.class.php TNG1403/classes/modparser.class.php
1c1
< <?php
---
> <?php /*//220926 18:52*/
3c3
<    Mod Manager 12
---
>   Mod Manager 14
5,15c5,6
<    Class extends modbase and is extended by other MM processing classes that
<    need data from the parse table to perform their tasks.
< 
<    This class parses a mod config file and creates a table ($tags) containing
<    the directives and associated data as found in the file. If a fatal parse error
<    occurs, class returns an empty table and sets a global error array
<    ($this->parse_error) with details.
< 
<    Public Methods:
<       $this->parse();
<       $this->show_parse_table();
---
>   Class extends modbase and is extended by other MM processing classes
>   that need parse table data to perform their tasks.
16a8,87
>   This class parses a mod config file and creates a table containing
>   the directives and associated data as found in the cfg file. If a fatal
>   parse error occurs, class returns a global error array
>   ($this->parse_error) with details.
> 
>   End user classes like modvalidator, modlister, modinstaller and
>   modremover use the parse table to perform their designed functions.
> 
>   All directives and their processing functions are listed in the Proclist
>   array in Modbase.
> 
>   If a new directive is added to the parser, processing functions for it
>   must be added to Modparser, Modvalidator, Modliser, Modinstaller and
>   Modremover using the same function names listed, but with each programmed
>   to provide its own processing according to purpose.
> 
>   Directive functions are private to prevent name clashes with functions
>   of the same name within other processing scripts.
> 
>   Public Methods:
>     $this->parse();
> 
>   Terms and concepts:
> 
>     Token - an array containing raw data about a directive from a mod
>     configuration file. It must be processed into a parse table of
>     directive datapacks to be useable.
> 
>     Directive - A Mod Manager keyword that informs or edits, creates or
>     manipulates target files.
> 
>     Directive datapack - A small array containing all the information
>     necessary for Mod Manager to validate, list, install and uninstall an
>     individual Directive.
> 
>     Parse table - An array of all Directive datapacks from a mod
>     configuration file. Modparser creates the parse table Mod Manager uses
>     it to validate, list, install and remove mods.
> 
>     Dispatcher - We use a feature of PHP that allows us to dispatch each
>     directive from a mod configuration file to its own function specifically
>     designed to turn it into a directive datapack and add it to the mod's
>     parse table.  The main processing loop is very small and very fast.
>     All the code to process a given directive can be found (and understood)
>     in a single function.
> 
>     File modifier - Formerly known as an "optag" it is a type of directive
>     that changes the content of a target file. An example would be %insert:
>     before. File modifiers are grouped because processing them into
>     directive datapacks uses a common code for all of them.
> 
>     Proclist - A list of all valid Mod Manager directives and the name of
>     their individual processing functions is defined in Modbase.  Processing
>     is automatic - for each token we look up its processing function, then
>     dispatch it for conversion into a directive datapack and inclusion into
>     the parse table.
> 
>     Conditional directives - Perform a test on a file or on the TNG
>     environment and guides Modparser processing of tokens, depending on the
>     result of the test. Modparser handles all condtional testing and it only
>     includes in the parse table those directives that meet the criteria of
>     the tests. The result of conditional testing is added to the parse table
>     for information only, to help developers understand the program flow of
>     their mods.
> 
>     How Modparser Works
> 
>     Modparser splits the mod cfg file into sections, each beginning with a
>     directive and including everything up to the next directive.
> 
>     It then creates tokens from the sections, each containing the cfg line
>     number, name, args and blob. Args is everything after the directive name
>     up to the terminator (%).
> 
>     The Blob is everything that follows directive args up to the beginning
>     of the next directive.
> 
>     Finally, Modparser uses _directive() functions to turn the tokens into
>     datapacks and collect them into a parse table available for use by other
>     mod classes.
19c90,91
< include_once 'classes/modbase.class.php';
---
> /* File management */
> $modparser_version = '14.0.0.1 220812-2305';
21,24c93
< class modparser extends modbase {
<    function __construct( $objinits ) {
<       parent::__construct( $objinits );
<    }
---
> require_once 'classes/modbase.class.php';
26,673c95,217
<    // indexes into language text arrays
< /*
<    const BADVERSION  = 'badversion';
<    const BOMFOUND    = 'bomfound';
<    const DEFVAL      = 'defval';
<    const EMPTYFILE   = 'emptyfile';
<    const FORMAT      = 'format';
<    const FILEPERMS   = 'fileperms';
<    const MISSING     = 'missing';
<    const MISSFILE    = 'missfile';
<    const NOACCESS    = 'noaccess';
<    const NOLOCATION  = 'nolocation';
<    const NOCFGFILE   = 'nocfgfile';
<    const NOCOMPS     = 'nocomps';
<    const NODESC      = 'nodesc';
<    const NOEND       = 'noend';
<    const NOSOURCE    = 'srcfilemissing';
<    const NOTARGET    = 'notarget';
<    const NOTWRITE    = 'notwrite';
<    const REQTAG      = 'reqtag';
< 
<    //const SECNOTERM   = 'secnoterm';
<    const TAGNOTERM   = 'tagnoterm';
<    const TAGUNK      = 'tagunk';
<    const UNXEND      = 'unxend';
< 
<    protected $cfgpath = '';
<    protected $cfgfile = '';
<    protected $parse_error = array();
<    protected $classID = '';
< */   
< 
<    protected $optags = array(
<       'replace',
<       'insert:before',
<       'insert:after',
<       'vinsert:before',
<       'vinsert:after',
<       'trimreplace',
<       'triminsert:before',
<       'triminsert:after',
<    );
< 
<    protected $configs = array(
<       'config.php',
<       'customconfig.php',
<       'importconfig.php',
<       'logconfig.php',
<       'mapconfig.php',
<       'pedconfig.php',
<       'mmconfig.php'
<    );
< 
<    // FUNCTION RETURNS TAGS TABLE IF NO ERRORS
<    public function parse( $cfgpath ) {
< 
<       $this->cfgpath = $cfgpath;
<       $this->cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
<       $this->modname = "[{$this->admtext['missing']}]";
<       $this->version = "[???]";
< 
<       // PROCESSING LOOP
<       while( true ) {
<          $this->parse_error = NULL;
<          $taglist= NULL;
<          $tags = NULL;
<          $buffer = NULL;
< 
<          /****************************************************************
<          COPY CFG FILE INTO BUFFER
<          *****************************************************************/
<          $buffer = $this->read_file_buffer( $cfgpath );
<          // HANDLE ACCESS ERRORS
<          if( is_numeric( $buffer ) ) {
<                // CFG file is missing; quit with parsing error
<             if($buffer == self::NOFILE) {
<                $this->parse_error['line'] = '::';
<                $this->parse_error['tag']  = $this->cfgfile;
<                $this->parse_error['text'] = self::NOCFGFILE; // index into admtext[]
<                break; // leave the processing loop and return to caller
<             }
<             elseif( $buffer == self::ISEMPTY ) {
<                // CFG file has no content; quit with parsing error
<                $this->parse_error['line'] = '::';
<                $this->parse_error['tag']  = $this->cfgfile;
<                $this->parse_error['text'] = self::EMPTYFILE; // index into admtext[]
<                break; // leave the processing loop and return to caller
<             }
<          }
< 
<          // allows % inside info tags without terminating them
<          $buffer = str_replace( "\%", '&#037;', $buffer );
<          // no longer needed - remove it
<          $buffer = str_replace( '%target:files%', '', $buffer );
<          /****************************************************************
<          PRE-PROCESSING: CREATE A TAGS-ARGUMENTS LIST FROM CFG FILE
<          ****************************************************************/
< 
<          // split buffer into an array of lines
<          $lines = explode( "\r\n", $buffer );
< 
<          // create sublist with only MM tag lines - retains orig keys
<          $taglines = preg_grep( "#^\s*%\w+:#", $lines );
< 
<          $i=0;
<          foreach( $taglines as $key => $value ) {
< 
<             // break out tagname and arguments for processing
<             preg_match( "#\s*%(\w+):(.*)$#", $value, $matches );
< 
<             // suppress warnings if not set
<             if( !isset( $matches[1] ) ) $matches[1] = '';
<             if( !isset( $matches[2] ) ) $matches[2] = '';
< 
<             // matches[0] - original line
<             // matches[1] - tag name
<             // matches[2] - rest of line
< 
<             // tag name
<             $parts[$i][0] = $matches[1]; // tag name
<             $parts[$i][1] = $key+1;     // cfg line number
<             $i++;
< 
<             // tag & arguments are all on one line
<             if( false !== strpos( $matches[2], "%" ) ) {
<                $splits = explode( "%", $matches[2] );
<                $blob = trim($splits[0]);
<             }
<             else {
<                $blob = $matches[2];
<             }
< 
<             switch( $matches[1] ) {
< 
<                // tags with no arguments
<                case 'end':
<                case 'fileend':
<                case 'fileoptional':
<                   continue 2;
< 
<                // tags with one argument on same line
<                case 'name':
<                case 'version':
<                case 'wikipage':
<                case 'author':
<                case 'target':
<                case 'parameter':
<                case 'copyfile':
<                case 'copyfile2':
<                case 'mkdir':
<                case 'newfile':
<                case 'goto':
<                case 'fileexists':
<                case 'tngversion':
<                case 'label':
<                   $parts[$i][0] = $blob;
<                   $parts[$i][1] = $key+1;
<                   $i++;
<                   break;
< 
<                // tags with no arguments, code block follows
<                case 'insert':
<                case 'vinsert':
<                case 'triminsert':
<                   $parts[$i-1][0] .= ':'.$blob;
<                case 'replace':
<                case 'trimreplace':
<                   $blob = '';
<                   $k=$key+1;
<                   while( isset( $lines[$k]) && !isset( $taglines[$k] ) ) {
<                      $blob .= "\r\n".$lines[$k];
<                      $k++;
<                   }
<                   // remove one crlf from left end of blob
<                   $blob = substr( $blob, 2 );
<                   $parts[$i][0] = $blob;
<                   $parts[$i][1] = $key+1;
<                   $i++;
<                   break;
< 
<                // tags with arguments, code block follows
<                case 'location':
<                case 'fileversion':
<                case 'textexists':
<                   // if arg on same line
<                   $args = trim($splits[0]);
<                   if( !empty( $args ) ) {
<                      $parts[$i][0] = $args;
<                      $parts[$i][1] = $key+1;
<                      $i++;
<                   }
<                   $blob = '';
<                   $k=$key+1;
<                   while( isset( $lines[$k]) && !isset( $taglines[$k] ) ) {
<                      $blob .= "\r\n".$lines[$k];
<                      $k++;
<                   }
<                   // remove one crlf from left end of blob
<                   $blob = substr( $blob, 2 );
<                   $parts[$i][0] = $blob;
<                   $parts[$i][1] = $key+1;
<                   $i++;
< 
<                   break;
< 
<                // tags with possible multi-line arguments
<                case 'private':
<                case 'note':
<                case 'desc':
<                case 'description':
<                   $blob = $matches[2];
<                   $k=$key+1;
<                   while( isset( $lines[$k]) && !isset( $taglines[$k] ) ) {
<                      $blob .= "\r\n".$lines[$k];
<                      $k++;
<                   }
<                   $p = explode( "%", $blob );
<                   $parts[$i][0] = $p[0];
<                   $parts[$i][1] = $key+1;
<                   $i++;
<                   break;
<                default:
<                      $this->parse_error['line'] = $key+1;
<                      $this->parse_error['tag']  = '%'.$matches[1].':';
<                      $this->parse_error['text'] = self::TAGUNK; // index into admtext[]
<                      break;
<                   break;
<             }
<          }
< 
<          /* BUFFER PARTS ARRAY MAP
<          $parts[$i][0] == tagname
<          $parts[$i][1] == line number
<          $parts[$i+1][0] == argument(s) (if require)
<          $taglist[$i+1][1] == tagname line number
<          $taglist[$i+2][0] == code section (if reqired)
<          $taglist[$i+2[1] == tagname line number
<          */
< 
<          /****************************************************************
<          CREATE THE PARSE TABLE ($TAGS) USING THE $PARTS LIST
<          Nr of args in comments refers to args in parse table not cfg tags
<          ****************************************************************/
<          $open_target = '';
<          $j=0;
<          for( $i=0;isset($parts[$i] );$i++ ) {
<             // NEXT PART IF NOT TAG NAME FORMAT
<             if( !preg_match( "#^\w+(:\w+)?$#", $parts[$i][0] ) ) {
<                continue;
<             }
<             switch( $parts[$i][0] ) {
<                // DISCARD - NOT NEEDED AS PRIMARY TAG IN TABLE
<                case 'label':
<                   $i++;
<                case 'end':
<                case 'fileend':
<                case 'fileoptional': // becomes arg to $target: tag
<                   break;
< 
<                // PARSER CONDITIONAL DIRECTIVES
<                case 'goto':
<                   if( $this->classID == 'remover' ) {
<                      $i++;
<                      break;
<                   }
<                   $line = $parts[$i][1];
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $line;
<                   $tags[$j]['name'] = $parts[$i][0];
<                   $tags[$j]['arg1'] = $parts[$i+1][0];
<                   $i++;
<                   $splits = explode( "%", $parts[$i][0] );
<                   $label = $splits[0];
<                   $i = $this->_goto( $parts, $i, $label, $line  );
<                   if( $i == self::ERROR ) {
<                      break 2; // stop parsing and emit error
<                   }
<                   $tags[$j]['arg3'] = 'goto '.$parts[$i][1];
<                   $j++;
<                   break;
<                case 'tngversion':
<                   if( $this->classID == 'remover' ) {
<                      $i++;
<                      break;
<                   }
<                   $line = $parts[$i][1];
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $line;
<                   $tags[$j]['name'] = $parts[$i][0];
<                   $tags[$j]['arg1'] = $parts[$i+1][0];
< 
<                   $i = $this->_tng_version( $parts, $i, $line );
<                   if( $i == self::ERROR ) {
<                      break 2; // stop parsing and emit error
<                   }
<                   $tags[$j]['arg2'] = $this->conditional." (".$this->tng_version.")";
<                   if( $this->conditional == 'false' ) {
<                      $tags[$j]['arg3'] = 'goto '.$parts[$i+1][1];
<                   }
<                   else {
<                      $tags[$j]['arg3'] = 'goto '.$parts[$i][1];
<                   }
<                   $j++;
<                   break;
<                case 'fileexists':
<                   if( $this->classID == 'remover' ) {
<                      $i++;
<                      break;
<                   }
<                   $line = $parts[$i][1];
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $line;
<                   $tags[$j]['name'] = $parts[$i][0];
<                   $tags[$j]['arg1'] = $parts[$i+1][0];
<                   $i = $this->_file_exists( $parts, $i, $line );
<                   if( $i == self::ERROR ) {
<                      break 2; // stop parsing and emit error
<                   }
< 
<                   $tags[$j]['arg2'] = $this->conditional;
<                   if( $this->conditional == 'false' ) {
<                      $tags[$j]['arg3'] = 'goto '.$parts[$i+1][1];
<                   }
<                   else {
<                      $tags[$j]['arg3'] = 'goto '.$parts[$i][1];
<                   }
<                   $j++;
<                   break;
<                case 'textexists':
<                   if( empty($open_target) ) {
<                      $i++;
<                      $j++;
<                      continue;
<                   }
<                   if( $this->classID == 'remover' ) {
<                      $i++;
<                      break;
<                   }
<                   $line = $parts[$i][1];
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $line;
<                   $tags[$j]['name'] = $parts[$i][0];
<                   $tags[$j]['arg1'] = $parts[$i+1][0];
< 
<                   $i = $this->_text_exists( $open_target, $parts, $i, $line );
<                   if( $i == self::ERROR ) {
<                      break 2;
<                   }
<                   $tags[$j]['arg2'] = $this->conditional;
<                   if( $this->conditional == 'false' ) {
<                      $tags[$j]['arg3'] = 'goto '.$parts[$i+2][1];
<                   }
<                   else {
<                      $tags[$j]['arg3'] = 'goto '.$parts[$i][1];
<                   }
<                   $j++;
<                   break;
< 
<                // ONE ARG - ONE LINE
<                case 'name':
<                case 'version':
<                case 'wikipage':
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
<                   $i++;
<                   $tags[$j]['arg1'] = $parts[$i][0];
<                   if( $tags[$j]['name'] == 'name' ) $this->modname = $tags[$j]['arg1'];
<                   if( $tags[$j]['name'] == 'version' ) $this->version = $tags[$j]['arg1'];
<                   $j++;
<                   break;
< 
<                case 'mkdir':
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
< 
<                   // FLAG - OPTIONAL OR PROTECTED
<                   $i++;
<                   $tags[$j]['flag'] = $this->extract_flag( $parts[$i][0] );
<                   $tags[$j]['arg1'] = $this->rootpath.$parts[$i][0];
<                   $j++;
<                   break;
< 
<                // ONE ARG - MULTI LINE
<                case 'private':
<                case 'note':
<                case 'description':
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
< 
<                   $i++;  // blob
<                   $tags[$j]['arg1'] = $this->resolve_path_vars( $parts[$i][0] );
<                   $j++;
<                   break;
< 
<                // ONE ARG - CODE  (OPTAGS REQUIRE %END:% TAGS)
<                case 'location':
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
< 
<                   // next element is a location note
<                   if( $parts[$i][1] == $parts[$i+2][1] ) {
<                      $i++;
<                      $tags[$j]['arg3'] = $parts[$i][0];
<                   }
<                   $i++;
<                   $tags[$j]['arg1'] = $parts[$i][0];
<                   $j++;
<                   break;
<                case 'replace':
<                case 'trimreplace':
<                   // look ahead for end tag
<                   if( $parts[$i+2][0] != 'end' ) {
<                      $this->parse_error['line'] = $parts[$i][1];
<                      $this->parse_error['tag']  = '%'.$parts[$i][0].':';
<                      $this->parse_error['text'] = self::NOEND; // index into admtext[]
<                      break;
<                   }
<                   if( empty( $tags[$j] ) ) {
<                      $tags[$j] = $this->init_tag();
<                   }
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
< 
<                   // GET ASSOCIATED CODE BLOCK FOR ARG1
<                   $i++;
<                   $tags[$j]['arg1'] = $parts[$i][0];
<                   $j++;
<                   break;
< 
<                case 'insert:before':
<                case 'insert:after':
<                case 'triminsert:before':
<                case 'triminsert:after':
<                case 'vinsert:before':
<                case 'vinsert:after':
<                   // look ahead for end tag
<                   if( !isset($parts[$i+2][0]) || $parts[$i+2][0] != 'end' ) {
<                      $this->parse_error['line'] = $parts[$i][1];
<                      $this->parse_error['tag']  = '%'.$parts[$i][0].':';
<                      $this->parse_error['text'] = self::NOEND; // index into admtext[]
<                      break;
<                   }
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
<                   $i++;
<                   $tags[$j]['arg1'] = $parts[$i][0];
<                   $j++;
<                   break;
< 
<                // TWO ARGS - ONE LINE - ARG2 OPTIONAL
<                case 'author':
<                case 'parameter':
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
< 
<                   $i++; // blob
<                   $blob = explode( "%", $parts[$i][0]);
< 
<                   // how many colons (:)?
<                   $count = substr_count( $blob[0], ":" );
< 
<                   // no arg2 (optional param value)
<                   if( $count == 0 ) {
<                      $arg1 = $blob[0];
<                      $arg2 = '';
<                   }
<                   else {
<                      // $limit=2 allows arg2 to contain a colon (:)
<                      $args = explode( ":", $blob[0], $limit=2 );
<                      $arg1 = $args[0];
<                      $arg2 = isset( $args[1] ) ? $args[1] : '';
<                   }
<                   // trim allows theses args on separate lines
<                   $tags[$j]['arg1'] = trim( $arg1 );
<                   $tags[$j]['arg2'] = trim( $arg2 );
<                   $j++;
<                   break;
< 
<                // TWO ARGS - EXTRACT SECOND ARG (DEFAULT) FROM FIRST
<                case 'desc':
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
< 
<                   $i++;
<                   $tags[$j]['arg1'] = $parts[$i][0];
< 
<                   // GET PARAMETER'S DEFAULT VALUE FROM DESC
<                   preg_match_all( "#\(([^\)]*)\)#sm", $parts[$i][0], $matches, PREG_SET_ORDER );
< 
<                   // use last set of parens - can have other sets inside the desc
<                   $arg2 = end( $matches );
<                   $tags[$j]['arg2'] = $arg2[1];
<                   $j++;
<                   break;
< 
<                // TWO ARGS - FILENAME (FIX) + FILEOPTIONAL
<                case 'target':
< 
<                   if( false !== strpos( $parts[$i+1][0], 'files', 0 ) ) break;
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
<                   $i++;
< 
<                   // special note
<                   if( strpos( $parts[$i][0], ":" ) ) {
<                      $args = explode( ":", $parts[$i][0] );
<                      $arg1 = $args[0];
<                      $arg2 = $args[1];
<                   }
<                   else {
<                      $arg1 = $parts[$i][0];
<                      $arg2 = '';
<                   }
< 
<                   $tags[$j]['flag'] = $this->extract_flag( $arg1 );
<                   $arg1 = trim( $arg1 );
<                   //$arg1 = ltrim( $arg1, "/" );
< 
<                   // if is a TNG config file add subroot path
<                   //if( in_array( $arg1, $this->configs ) ) {
<                   //   $arg1 = $this->subroot.$arg1;
<                   //}
<                   //else {
<                   //   $arg1 = $this->rootpath.$arg1;
<                   //}
<                   $arg1 = $this->resolve_file_path( $arg1 );
< 
<                   $tags[$j]['arg1'] = $arg1;
<                   $tags[$j]['arg3'] = $arg2;
< 
<                   // see if fileoptional tag was used
<                   if( $parts[$i+1][0] == 'fileoptional' ) {
<                      $tags[$j]['flag'] = self::FLAG_OPTIONAL;
<                   }
<                   $open_target = $tags[$j]['arg1'];
<                   $j++;
<                   break;
< 
<                // ONE OR TWO ARGS - SOURCE + (DESTINATION)
<                case 'copyfile':
<                case 'copyfile2':
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
< 
<                   $i++; // args blob up to next tag
<                   // one or two args up to terminating %
<                   $args = explode( ":", $parts[$i][0] );
<                   $arg1 = trim( $args[0] );
< 
<                   if( empty( $arg1 ) ) {
<                      $this->parse_error['line'] = $tags[$j]['line'];
<                      $this->parse_error['tag']  = $parts[$i][0];
<                      $this->parse_error['text'] = self::NOSOURCE; // index into admtext[]
<                      break;
<                   }
<                   $tags[$j]['flag'] = $this->extract_flag( $arg1 );
<                   $tags[$j]['arg1'] = $this->resolve_file_path( $arg1, self::MODS_DIR );
<                   //$arg1 = ltrim( $arg1, "/" );
< 
<                   if( !empty( $args[1] ) ) {
<                      $arg2 = trim($args[1]);
<                      $tags[$j]['arg2'] = $this->resolve_file_path( $arg2 );
<                   }
<                   else {
<                      $tags[$j]['arg2'] = $this->rootpath.pathinfo( $tags[$j]['arg1'], PATHINFO_BASENAME );
<                   }
<                   $j++;
<                break;
< 
<                // FOUR ARGS - FILEPATH + CONTENT + VERSION NR + FLAG
<                case 'newfile':
<                   $tags[$j] = $this->init_tag();
<                   $tags[$j]['line'] = $parts[$i][1];
<                   $tags[$j]['name'] = $parts[$i][0];
< 
<                   $i++; // file name
<                   $arg1 = $parts[$i][0];
<                   $tags[$j]['flag'] = $this->extract_flag( $arg1 );
<                   $tags[$j]['arg1'] = $this->resolve_file_path( $arg1 );
< 
<                   // MOVE ON TO VERSION
<                   $i++; // fileversion
<                   if( $parts[$i][0] != 'fileversion' ) {
<                      $this->parse_error['line'] = $tags[$j]['line'];
<                      $this->parse_error['tag']  = '%fileversion:';
<                      $this->parse_error['text'] = self::MISSING; // index into admtext[]
<                      break;
<                   }
< 
<                   $i++; // version #
<                   $tags[$j]['arg3'] = $parts[$i][0];
< 
<                   $i++; // newfile content
<                   $temp = trim( $parts[$i][0] );
<                   if( empty( $temp ) ) {
<                      $this->parse_error['line'] = $tags[$j]['line'];
<                      $this->parse_error['tag']  = 'newfile text';
<                      $this->parse_error['text'] = self::MISSING; // index into admtext[]
<                      break;
<                   }
<                   $tags[$j]['arg2'] = $parts[$i][0];
< 
<                   $i++; // fileend
<                   if( $parts[$i][0] != 'fileend' ) {
<                      $this->parse_error['line'] = $tags[$j]['line'];
<                      $this->parse_error['tag']  = 'newfile %fileend: tag';
<                      $this->parse_error['text'] = self::MISSING; // index into admtext[]
<                      break;
<                   }
<                   $j++;
<                   break;
<                default:
<                   $this->parse_error['line'] = $parts[$i][1];
<                   $this->parse_error['tag']  = '%'.$parts[$i][0].':';
<                   $this->parse_error['text'] = self::TAGUNK; // index into admtext[]
<                   //return array();
<             }
<          } // RAW TAGS PROCESSING LOOP
< 
<          break;
<       } // END PROCESSING LOOP
<       // CFG FILE HAS NOCONTENT
<       if( empty( $this->parse_error ) && empty( $tags ) ) {
<          $this->parse_error['line'] = ':::';
<          $this->parse_error['tag']  = $this->cfgfile;
<          $this->parse_error['text'] = self::UNXEND;
<          return;
<       }
<       //$tags=$this->arrange_table( $tags );
<       return $tags;
<    } // END PARSE FUNCTION
< /***************************************************************
<    FUNCTIONS
< ***************************************************************/
<    protected function arrange_table( $table ) {
<       $newtable = array();
< 
<       // make new directories available for file copies
<       for( $i=0; isset($table[$i]); $i++ ) {
---
> class modparser extends modbase
> {
>   function __construct( $objinits ) {
>     parent::__construct( $objinits );
> 
>     if( empty( $objinits['admtext']['badchar'] ) )
>     {
>       $this->admtext['badchar'] = "char ".$this->admtext['errors'];
>     }
>   }
> 
>   protected $modname;
>   protected $modversion;
>   protected $open_target;
>   protected $is_target;
>   protected $parse_error = array();
>   protected $parse_table = array();
> 
>   /* Function returns a parse table containing processable directive datapacks. */
>   public function parse( $cfgpath )
>   {  
>     $this->cfgpath = $cfgpath;
>     $this->cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
>     $this->is_target = false;
>     $this->parse_error = array();
>     $this->parse_table = array();
> 
>     /* Set these up for the listing in case they are missing from the cfg file */
>     $this->modname = "[{$this->admtext['missing']}]";
>     $this->version = "[???]";
> 
>     /* Begin processing the cfg file. The WHILE loop controls exit from
>     ** processing with a BREAK when finished or if errors are encountered.
>     */
>     while( true )
>     {
>       $buffer = "";
> 
>       /* Read in the mod configuration file */
>       $buffer = $this->read_cfgfile( $cfgpath );
>       if( !empty($this->parse_error) ) break;
> 
>       /****************************************************************
>       A token is an array containing the name of a directive, line
>       number where found in the cfg file, an argument string and
>       a "blob" - that is, content from the end of the directive
>       argument string to the beginning of the next directive. Each
>       token will be converted into a "directive datapack" (array).
> 
>       Token map
>       $token['line'] -- directive line number from mod cfg file
>       $token['name'] -- name of directive, e.g., 'version'
>       $token['args'] -- everything between the first colon (:) and the
>                         arguments terminator (%)
>       $token['blob'] -- everything between the arguments terminator and the
>                         beginning of the next directive.
>       *****************************************************************/
>       $tokens = $this->get_tokens( $buffer );
> 
>       if( !empty($this->parse_error) ) break;
> 
>       /***************************************************************
>       MAIN PARSING ROUTINE
>         Process tokens into directive datapacks and add them to the
>         parse table for output to executive Mod Manager classes.
>       ***************************************************************/
>       for($i=0; isset( $tokens[$i] ); $i++ )
>       {
> 
>         /* If this is a file modifier and the location is missing this
>         ** we have a critical error and must stop processing this one. */
>         if( in_array( $tokens[$i]['name'], $this->file_modifiers ) )
>         {
>           if( $tokens[($i-2)]['name'] != "location")
>           {
>             $this->parse_error['line'] = $tokens[$i]['line'];
>             $this->parse_error['tag']  = 'p'.__LINE__.' %location :';
>             $this->parse_error['text'] = self::MISSING;
>             return;
>           }
>         }
> 
>         /* Lookup directive by name and get its processing function. */
>         if( isset( $this->proclist[$tokens[$i]['name']] ) )
>         {
>           /* PHP allows assignment of a function name to a variable
>           ** and then executing the "variaable" with arguments, so get
>           ** the function name associated with this directive from
>           ** $proclist.
>           */
> 
>           $function = $this->proclist[$tokens[$i]['name']];
> 
>           /* Bypass delimiter directives (e.g. %end:%) that require no
>           ** processing and are not needed in the parse table.
>           */
>           if( $function == 'no_op' ) continue;
> 
>           /* Use the proclist function to construct a directive datapack from
>           ** this token. */
>           $datapack = $this->$function( $tokens, $i );
> 
>           /* Parsing Error result? Emit and stop parsing. */
>           if( !empty($this->parse_error ) ) break;
> 
>           /* If conditional directive, jump to token label at index $i
>           ** to continue processing.
>           */
>           if( !empty( $datapack['goto'] ) ) $i = $datapack['goto'];
> 
>           /* Add this directive datapack to the parse table. */
>           if( !empty( $datapack ) ) $this->parse_table[] = $datapack;
> 
>           continue; // to the next token
>         }
>         else
>         { // Directive name not found in proclist
>           $this->parse_error['line'] = $tokens[$i]['line'];
>           $this->parse_error['tag']  = 'p'.__LINE__.' %'.$tokens[$i]['name'].':';
>           $this->parse_error['text'] = self::TAGUNK;
>           break; // abandon further processing
>         }
>       } // token processing loop
675,707c219,220
<          // leave info tags where they are - move mkdirs to beginning
<          switch ( $table[$i]['name'] ) {
<             case 'name':
<             case 'version':
<             case 'description':
<             case 'note':
<             case 'private':
<             case 'author':
<             case 'mkdir':
<             case 'wikipage':
<                $newtable[] = $table[$i];
<                $table[$i]['name'] = false;
<                break;
<             default:
<                break;
<          }
<       }
<       // next come file copies and newfile
<       for( $i=0; isset($table[$i]); $i++ ) {
<          if( $table[$i]['name'] == 'copyfile' ||
<             $table[$i]['name'] == 'copyfile2' ||
<             $table[$i]['name'] == 'newfile') {
<                $newtable[] = $table[$i];
<                $table[$i]['name'] = false;
<             }
<       }
<       // finally all the rest of the tags in order
<       for( $i=0; isset($table[$i]); $i++ ) {
<          if( !$table[$i]['name'] ) continue;
<          $newtable[] = $table[$i];
<       }
<       return $newtable;
<    }
---
>       break;
>     } // Parse table assembly loop
709,723c222,223
<    private function init_tag() {
<       $tag['line'] = '';
<       $tag['name'] = '';
<       $tag['arg1'] = '';
<       $tag['arg2'] = '';
<       $tag['arg3'] = '';
<       $tag['flag'] = '';
<       return $tag;
<    }
< 
<    private function extract_flag( &$string ) {
< 
<       // look for flag anywhere in the string
<       if( $parts = preg_match( "#([@|^|~]+)#", $string, $matches, PREG_OFFSET_CAPTURE ) ) {
<          $flag = $matches[1][0];
---
>     if( !empty( $this->parse_error ) )
>       return false;
725,726c225
<          // remove flag from string
<          $string = str_replace( $flag, '', $string );
---
>     $this->required_tags_check( $this->parse_table );
728,731c227,228
<          return $flag;
<       }
<       return '';
<    }
---
>     if( !empty( $this->parse_error ) )
>       return false;
733,735c230,237
<    protected function get_line_number( $buffer, $pos ) {
<       return substr_count ( $buffer, "\r\n", 0, $pos+2 ) +1;
<    }
---
>     /* Mod configuration file exists, has content, but no mm directives. */
>     if( empty( $this->parse_error ) && empty( $this->parse_table ) )
>     {
>       $this->parse_error['line'] = ':::';
>       $this->parse_error['tag']  = 'p'.__LINE__.' '.$this->cfgfile;
>       $this->parse_error['text'] = self::UNXEND;
>       return false;
>     }
736a239,240
>     return true;
>   } // End of parse function
738c242,376
<    public function show_parse_table( $tags ) {
---
> /***************************************************************
>   PRIVATE FUNCTIONS TO TURN TOKENS INTO DIRECTIVE RECORDS
>   Each function returns a directive.
> ***************************************************************/
>   private function _author( $tokens, $i )
>   {
>     /* Simple directive with one or two arguments.
>     ** Returns a directive datapack. Individual author
>     ** records will be combined in the mod listing.
>     */
>     return $this->simple2( $tokens, $i );
>   }
> 
>   private function _copyfile( $tokens, $i)
>   {
>     /*  %copyfile directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == copyfile or copyfile2
>     **  $datapack['arg1'] == full server path to source file
>     **  $datapack['arg2'] == full server path to destination file
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == flag (if any)
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     $datapack = $this->simple2( $tokens, $i );
> 
>     if( empty( $datapack['arg1'] ) )
>     {
>       $this->parse_error['line'] = $datapack['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.' '.$datapack['name'];
>       $this->parse_error['text'] = self::NOSOURCE;
> 
>       return $datapack;
>     }
> 
>     /* Use full server path for source file copy. */
>     $datapack['arg1'] = $this->resolve_file_path( $datapack['arg1'],
>                                                   self::MODS_DIR );
> 
>     /* Use full server path for destination file copy. */
>     if( !empty( $datapack['arg2'] ) )
>     {
>       $datapack['arg2'] = $this->resolve_file_path( $datapack['arg2'] );
>     }
>     else
>     {
>       /* Should never happen, but...
>       ** Destination file missing - copy file to root using same name as
>       ** source file. */
>       $datapack['arg2'] = $this->rootpath.
>         pathinfo( $datapack['arg1'], PATHINFO_BASENAME );
>     }
>     return $datapack;
>   } // _copyfile()
> 
>   private function _desc( $tokens, $i )
>   {
>     /*  %desc directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == desc
>     **  $datapack['arg1'] == description including default value in parens
>     **  $datapack['arg2'] == default value for preceding %parameter directive
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty
>     */
> 
>     /* Must directly follow a %parameter directive */
>     if( $tokens[$i-1]['name'] != 'parameter' )
>     {
>       $this->parse_error['line'] = $tokens[$i]['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.' %desc:';
>       $this->parse_error['text'] = self::NOPARAM; // index into admtext[]
>       return;
>     }
> 
>     $datapack = $this->simple1( $tokens, $i );
> 
>     /* Get get all parenthetical expressions from arg1 */
>     preg_match_all( "#\(([^\)]*)\)#sm", $datapack['arg1'], $matches,
>       PREG_SET_ORDER );
> 
>     /* Use data from the LAST set of parens inside the desc for the
>     ** default value.
>     */
>     $arg2 = end( $matches );
> 
>     if( isset( $arg2[1] ) )
>     {
>       $datapack['arg2'] = $arg2[1];
>     }
> 
>     return $datapack;
>   } // _desc()
> 
>   private function _description( $tokens, $i )
>   {
>     return $this->simple1( $tokens, $i );
>   }
> 
>   /* We are processing $tokens in order and creating parse table directive
>   ** records. When conditionally testing for a file, if the file exists we
>   ** jump over tokens and begin processing again from the label given in the
>   ** %fileexists args.
>   */
>   private function _fileexists( $tokens, $i )
>   {
>     /*  %fileexists directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == fileexists
>     **  $datapack['arg1'] == filename to be tested
>     **  $datapack['arg2'] == label to jump to if file exists
>     **  $datapack['arg3'] == message - parse table information only
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == $tokens array index to jump to continue
>     **  processing
>     */
> 
>     /* For modremover, a conditional jump such as this one is ignored -
>     ** modremover will get a parse table with all possible installs for
>     ** removal.
>     */
>     if( !empty( $this->classID ) && $this->classID == 'remover' ) return;
> 
>     $datapack = $this->simple2( $tokens, $i );
> 
>     /* Must have exactly two arguments: a file name and a goto label. */
>     if( !$datapack['arg1'] || !$datapack['arg2'] )
>     {
>       $this->parse_error['line'] = $calling_line;
>       $this->parse_error['tag'] = 'p'.__LINE__.' %fileexists: args';
>       $this->parse_error['text'] = self::ERRORS;
>       return false;
>     }
740c378,379
<    echo "<h2 class=\"parse-table-title\">{$this->admtext['parsertags']}</h2>";
---
>     $filepath = trim( $datapack['arg1'] );
>     $filepath = ltrim( $filepath, " /" );
742,750c381,437
<       if( !empty( $this->parse_error ) ) {
<          echo "<h3>{$this->admtext['parsererror']} {$this->cfgpath}</h3>
< <p class=\"parse-error\">line:{$this->parse_error['line']} {$this->parse_error['tag']} {$this->admtext[$this->parse_error['text']]}</p><br />";
<          return true;
<       }
<       if( !empty( $tags ) ) {
<          echo "
<    <h3>".$this->find_tagname_value( $tags, 'name', 'name' )."&nbsp;&nbsp;&nbsp;(<a href=\"showcfg.php?mod={$this->cfgpath}\" target=\"_blank\">{$this->cfgpath}</a>)&nbsp;&nbsp;&nbsp;".$this->find_tagname_value( $tags, 'name', 'version' )."</h3>
< 	  ",$this->show_table_rows( $tags ), "<br />";
---
>     /* make the path absolute:
>     ** $filepath = $this->rootpath.$filepath;*/
>     $datapack['arg1'] = $filepath = $this->resolve_file_path( $filepath );
> 
>     $label = $datapack['arg2'];
> 
>     $n = $this->find_label( $tokens, $i, $label );
>     if( !empty($this->parserr ) )
>       return $false;
> 
>     if( !file_exists( $filepath ) )
>     {
>       $datapack['arg2'] = 'false';
>       $datapack['arg3'] = lcfirst( $this->admtext['text_continue'] );
>       return $datapack;
>     }
> 
>     /* Set the segments table index to continue
>      * processing from the label, skipping directives
>      * in between. */
>     $datapack['arg2'] = 'true';
>     $datapack['arg3'] = 'goto line '.$tokens[$n]['line'].' ('.$label.')';
> 
>     /*  The segments table "for-loop" will increment past the label.
>      *  To include the label in the parse table, back up the segment
>      *  pointer (index) to just before the 'goto' label. */
>     $datapack['goto'] = $n - 1;
>     return $datapack;
> 
>   } // fileexists()
> 
>   private function _goto( $tokens, $i )
>   {
>     /*  %goto directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == goto
>     **  $datapack['arg1'] == name of label to jump to
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == message - parse table information only
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == index of label to goto
>     */
>     /*  Modremover class ignores conditional jumps. */
>     if( !empty( $this->classID ) && $this->classID == 'remover' ) return;
> 
>     /* goto is a simple directive with one argument - label name */
>     $datapack = $this->simple1( $tokens, $i );
> 
>     /* Must have exactly one arguments */
>     if( empty( $datapack['arg1'] ) )
>     {
>       $this->parse_error['line'] = $datapack['line'];
>       $this->parse_error['tag'] = 'p'.__LINE__.
>               ' %goto label arg';
>       $this->parse_error['text'] = self::MISSING;
>       return false;
>     }
752,753c439
<       }
<    }
---
>     $label = $datapack['arg1'];
755,763c441,442
<    protected function find_tagname_value( $tags, $name, $value ) {
<       foreach( $tags as $tag ) {
<          if( $tag[$name] === $value ) {
<             if( empty( $tag['arg1'] ) )
<                return false;
<             else
<             return $tag['arg1'];
<          }
<       }
---
>     $n = $this->find_label( $tokens, $i, $label );
>     if( !empty($this->parserr ) )
765d443
<    }
767,780c445,446
<    protected function is_infotag( $tagname ) {
<       switch( $tagname ) {
<          case 'name':
<          case 'version':
<          case 'description':
<          case 'note':
<          case 'wikipage':
<             return true;
<             break;
<          default:
<             break;
<       }
<       return false;
<    }
---
>     /* Display the line number and label for the goto jump */
>     $datapack['arg3'] = 'goto line '.$tokens[$n]['line'].' ('.$label.')';
782c448,449
<    private function show_table_rows( $table ) {
---
>      /* don't skip next cfg segment */
>     $datapack['goto'] = $n-1;
784,869c451,573
<       $hdrs = array(
<          'line' => '4%',
<          'name' => '10%',
<          'arg1' => '26%',
<          'arg2' => '26%',
<          'arg3' => '26%',
<          'flag' => '4%'
<       );
< 
<       if( !empty( $table ) ) {
<          echo "
<    <table class=\"normal\" style=\"width:100%;\">
<       <tr>";
<             foreach( $hdrs as $hdr => $width ) {
<                echo "
<          <th class=\"fieldnameback fieldname\" style=\"width:$width;\">
<             <div>
<                $hdr
<             </div>
<          </th>";
<             }
<          echo "
<       </tr>";
<          }
< 
<          foreach( $table as $row ) {
< 
<             // STYLE STYLES FOR VARIOUS TAG TYPES
<             switch( $row['name'] ) {
<                case 'target':
<                   $row_style = "style = \"background-color:#C0EEC0;\"";
<                   break;
<                case 'textexists':
<                case 'fileexists':
<                case 'tngversion':
<                case 'goto':
<                   $row_style = "style=\"color:navy\"";
<                   break;
<                default:
<                   $row_style = NULL;
<                   break;
<             }
< 
<             echo "
<       <tr $row_style>";
< 
<             foreach( $hdrs as $hdr => $width ) {
<                $value = isset($row[$hdr]) ? $row[$hdr] : '';
<                echo "
<          <td class=\"grayborder\">
<             <div>
<                ".htmlentities( $value )."
<             </div>
<          </td>";
<             }
< 
< 
<                echo "
<       </tr>";
<             }
< 
<             echo "
<    </table>";
<    }
<    // @parts - preprocessing array with all mod config file tags and arg blobs
<    // @index - index for the goto statement in the $parts array
<    // @refline - used to associate an error with a line if there is one
<    // @returns index of the label in $parts array or parse error if not found
<    private function _goto( $parts, $index, $label, $refline ) {
<       // check for required number of args for this tag
<       $i=$index;
< //echo __LINE__;print_r(func_get_args());exit;
<       // search for label in $parts and return the index
<       for( $i=$index; isset( $parts[$i] ); $i++ ) {
<          // look at all the label tags
<          if( $parts[$i][0] == 'label') {
<             $i++;
<             $arg = explode( "%", $parts[$i][0] );
<             if( $arg[0] == $label ) {
<                return $i;
<             }
<          }
<       }
<       // label not found
<       $this->parse_error['line'] = $refline;
<       $this->parse_error['tag'] = "label: $label";
---
>     return $datapack;
> 
>   } // goto()
> 
>   private function _insert( $tokens, $i )
>   {
>     /* Returns 'insert' optag directive with code block as arg1 */
>     return $this->file_editor( $tokens, $i );
>   }
> 
>   private function _label( $tokens, $i )
>   {
>     $aValid = array('-', '_');
>     if( !ctype_alnum( str_replace( $aValid, '', $tokens[$i]['args'] ) ) )
>     {
>       //$this->labels[$tokens[$i]['args']] = $i;
>       /* Label name has non-alphanumeric character.
>       ** Case 1: an extra colon was inserted in the
>       ** %label Directive -- %label:done:%
>       ** The second colon would become part of the
>       **name -- invalid character. */
>       $this->parse_error['line'] = $tokens[$i]['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>         ' %label [<strong>'.$tokens[$i]['args'].'</strong>] ';
>       $this->parse_error['text'] = 'badchar';
>     }
>     return $this->simple1( $tokens, $i );
>   }
> 
>   private function _location( $tokens, $i )
>   {
>     /*  %location directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == location
>     **  $datapack['arg1'] == code/text in target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == optional note
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty
>     */
> 
>     /* Must have a target file in the cfg. */
>     if( !$this->is_target )
>     {
>       $this->parse_error['line'] = $tokens[$i]['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' %location:';
>       $this->parse_error['text'] = self::NOTARGET; // index into admtext[]
>       return;
>     }
> 
>     if( empty( trim( $tokens[$i]['blob'] ) ) )
>     {
>       $this->parse_error['line'] = $tokens[$i]['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$tokens[$i]['name'];
>       $this->parse_error['text'] = self::NOCOMPS; // index into admtext[]
>       return;
>     }
> 
>     $datapack = $this->simple1( $tokens, $i );
>     $datapack['arg3'] = $datapack['arg1']; // This would be a note
>     $datapack['arg1'] = $tokens[$i]['blob'];
>     $datapack['arg1'] = substr( $datapack['arg1'], 2 );
>     $datapack['arg1'] = substr( $datapack['arg1'], 0, -2 );
> 
>     /* NOT A PARSING ISSUE BUT HANDLE IT HERE TO AVOID DOING IT IN ALL
>     ** CLASSES.
>     **
>     ** If %location code has leading blank line (CRLF) when there is none in
>     ** the target file, it won't show a bad location error because the leading
>     ** CRLF matches the CRLF at the end of the previous line which is not
>     ** blank. So if there is a leading blank line or lines in the location
>     ** code, we must prepend a CRLF to it to match the one in the previous
>     ** non-blank line in order to get a valid bad target error if there
>     ** is one in the listing.
>     */
> 
>     /* Look ahead to verify presence of %end:% tag. */
>     $i++;
>     if( $tokens[$i]['name'] != 'end')
>     {
>       $this->parse_error['line'] = $datapack['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>         ' '. $datapack['name'];
>       $this->parse_error['text'] = self::NOEND;
>       return;
>     }
> 
>     /* Look ahead again to see if we have a valid file modifier directive
>     ** following location. Sometimes they get mistyped.
>     */
>     $file_modifier_directive = $tokens[$i + 1]['name'];
>     if( !in_array( $file_modifier_directive, $this->file_modifiers ) )
>     {
>       $this->parse_error['line'] = $datapack['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$datapack['name'];
>       $this->parse_error['text'] = self::NOACT;
>       return;
>     }
> 
>     return $datapack;
>   } // _location()
> 
>   private function _mkdir( $tokens, $i )
>   {
>     /*  $mkdir directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == mkdir
>     **  $datapack['arg1'] == server path to create new directory
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == optional flag
>     **  $datapack['goto'] == empty
>     */
>     $datapack = $this->simple1( $tokens, $i );
> 
>     if( !isset( $datapack['arg1'] ) )
>     {
>       $this->parse_error['line'] = $datapack['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$datapack['name']." arg";
871,872c575,576
<       return self::ERROR;
<    }
---
>       return $datapack;
>     }
874,891c578,579
<    // @parts - preprocessing array with all mod config file tags and arg blobs
<    // @index - index for the 'tng_version' tag in the taglist
<    // @refline - cfg file line number for error reporting
<    // RETURNS:
<    // - new $parts index if version is within the spec range (jumps to label)
<    // - next $parts index if version is not found
<    // - self::ERROR (-1) if fatal error occurs
<    private function _tng_version( $parts, $index, $refline ) {
< 
<       $i=$index+1;
<       // check for required number of args for this tag
<       $nr_args = $this->count_args( $parts[$i][0] );
<       if( $nr_args != 3 ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag'] = "%tngverson: arg";
<          $this->parse_error['text'] = self::ERRORS;
<          return self::ERROR;
<       }
---
>     /* Resolve file path to complete server path */
>     $datapack['arg1'] = $this->resolve_file_path( $datapack['arg1'] );
893,938c581,582
<       // get the blob for this tag
<       $i = $index+1;
<       $blob = explode( "%", $parts[$i][0] );
< 
<       // break out start_version:end_version:label
<       $args = explode( ":", $blob[0] );
< 
<       // remove dots from versions and turn into 4-digit integers
<       $start = $this->version2integer( $args[0] );
<       $end = $this->version2integer( $args[1] );
<       $label = $args[2];
< 
<       // check for %label:xxxx%
<       if( !$this->find_label( $parts, $i, $label ) ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag'] = "%tngversion %label:$label%";
<          $this->parse_error['text'] = self::MISSING;
<          return self::ERROR;
<       }
< //echo __LINE__;print_r($this->int_version);exit;
<       // current TNG version does not fall within range continue with nex tag
<       if( $start > $this->int_version || $end < $this->int_version ) {
<          $this->conditional = 'false';
<          return $i;
<       }
<       // else jump to the label and continue building the parse table from there
<       $this->conditional = 'true';
<       return $this->_goto( $parts, $index, $label, $refline );
<    }
<    // @parts - preprocessing array with all mod config file tags and arg blobs
<    // @index - index for the 'fileexists' tag in the taglist
<    // @refline - cfg file line number for error reporting
<    // RETURNS:
<    // - new $parts index if file is found (jumps to label)
<    // - next $parts index if text is not found
<    // - self::ERROR (-1) if fatal error occurs
<    private function _file_exists( $parts, $index, $refline ) {
<       // check for required number of args for this tag
<       $i=$index+1;
<       $nr_args = $this->count_args( $parts[$i][0] );
<       if( $nr_args != 2 ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag'] = "%fileexists: arg";
<          $this->parse_error['text'] = self::ERRORS;
<          return self::ERROR;
<       }
---
>     return $datapack;
>   }  // _mkdir()
940,959c584,614
<       // break out filepath:label% from the blob
<       //$blob = explode( "%", $parts[$i][0] );
<       $args = explode( ":", $parts[$i][0], $limit = 2 );
<       $filepath = trim( $args[0] );
<       $filepath = ltrim( $filepath, "/" );
< 
<       // make the path absolute
<       //$filepath = $this->rootpath.$filepath;
<       $filepath = $this->resolve_file_path( $filepath );
< 
<       // go here if the file exists
<       $label = $args[1];
< 
<       // check for %label:xxxx%
<       if( !$this->find_label( $parts, $i, $label ) ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag'] = "%fileexists %label:$label%";
<          $this->parse_error['text'] = self::MISSING;
<          return self::ERROR;
<       }
---
>   private function _name( $tokens, $i )
>   {
>     $datapack = $this->simple1( $tokens, $i );
>     $this->modname = $datapack['arg1'];
>     return $datapack;
>   }
> 
>   /* Consumes %newfile and following %fileversion tokens. */
>   private function _newfile( $tokens, $i  )
>   {
>     /*  %newfile directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == newfile
>     **  $datapack['arg1'] == filepath for new file
>     **  $datapack['arg2'] == content of new file
>     **  $datapack['arg3'] == version number of new file
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty
>     */
> 
>     /* Break out single file path argument and flag */
>     $datapack = $this->simple1( $tokens, $i );
> 
>     if( empty( $datapack['arg1'] ) )
>     {
>       $this->parse_error['line'] = $datapack['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$datapack['name']." path";
>       $this->parse_error['text'] = self::MISSING;
>       return $datapack;
>     }
961,986c616
<       if( file_exists( $filepath ) ) {
<          $this->conditional = 'true';
<          return $this->_goto( $parts, $index, $label, $refline );
<       }
<       // file does not exists so continue processing with the next tag
<       $this->conditional = 'false';
<       return $i;
<    }
<    // @parts - preprocessing array with all mod config file tags and arg blobs
<    // @index - index for the 'textexists' tag in the taglist
<    // @refline - cfg file line number for error reporting
<    // RETURNS:
<    // - new $parts index if text is found (jumps to label
<    // - next tag index if text is not found
<    // - self::ERROR (-1) if fatal error occurs
<    private function _text_exists( $open_target, $parts, $index, $refline ) {
< 
<       // check for required number of args for this tag
<       $i = $index;
<       $nr_args = $this->count_args( $parts[$i+1][0] );
<       if( $nr_args != 1 ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag'] = "%textexists: arg";
<          $this->parse_error['text'] = self::ERRORS;
<          return self::ERROR;
<       }
---
>     $datapack['arg1'] = $this->resolve_file_path( $datapack['arg1'] );
988,1001c618,619
<       // is there a target file?
<       if( empty( $open_target ) ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag']  = '%textexists: %target: ';
<          $this->parse_error['text'] = self::MISSING; // index into admtext[]
<          return self::ERROR; // leave the processing loop and return to caller
<       }
<       // is there an %end: tag?
<       if( $parts[$i+3][0] != 'end' ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag']  = '%textexists:';
<          $this->parse_error['text'] = self::NOEND; // index into admtext[]
<          return self::ERROR;
<       }
---
>     /* Look ahead to get the file version and code block */
>     $i++;
1003,1015c621,635
<       // get the arg-blob for %textexists: (filename:label%CRLFsearch-textCRLF)
<       $i++;
<       $label = $parts[$i][0];
<       $i++;
<       $text = $parts[$i][0];
< 
<       // check for %label:xxxx%
<       if( !$this->find_label( $parts, $i, $label ) ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag'] = "%textexists: goto label";
<          $this->parse_error['text'] = self::MISSING;
<          return self::ERROR;
<       }
---
>     $datapack['arg2'] = $tokens[$i]['blob'];
>     /* Remove leading and trailing CRLF from code block */
>     $datapack['arg2'] = substr( $datapack['arg2'], 2 );
>     $datapack['arg2'] = substr( $datapack['arg2'], 0, -2 );
> 
>     $datapack['arg3'] = $tokens[$i]['args'];
> 
>     /* Verify that version number was provided in the directive */
>     if( empty( $datapack['arg3'] ) )
>     {
>       $this->parse_error['line'] = $version['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$version['name']." version";
>       $this->parse_error['text'] = self::MISSING;
>     }
1017,1027c637,638
<       if( empty($text) ) {
<          $this->parse_error['line'] = $refline;
<          $this->parse_error['tag'] = "%textexists: {$this->admtext['searchfor']}";
<          $this->parse_error['text'] = self::MISSING;
<          return self::ERROR;
<       }
<       // need flag
<       // if file !exists return 'don't process this tag'
<       if( !file_exists( $open_target ) ) {
<          return $i;
<       }
---
>     return $datapack;
>   } // _newfile()
1028a640,757
>   private function _note( $tokens, $i )
>   {
>     return $this->simple1( $tokens, $i );
>   }
> 
>   private function _parameter( $tokens, $i )
>   {
>     /*  %parameter directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == parameter
>     **  $datapack['arg1'] == target variable
>     **  $datapack['arg2'] == target value
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty
>     */
>     /* There must be a target file in the cfg. */
>     if( !$this->is_target )
>     {
>       $this->parse_error['line'] = $tokens[$i]['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' %parameter:';
>       $this->parse_error['text'] = self::NOTARGET; // index into admtext[]
>       return;
>     }
> 
>     /* Next token must be a 'desc' */
>     if( $tokens[$i+1]['name'] != 'desc' ) {
>       $this->parse_error['line'] = $tokens[$i]['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' %desc:';
>       $this->parse_error['text'] = self::REQTAG; // index into admtext[]
>       return;
>     }
> 
>     return $this->simple2( $tokens, $i );
>   } // _parameter()
> 
>   private function _private( $tokens, $i )
>   {
>     return $this->simple1( $tokens, $i );
>   }
> 
>   private function _replace( $tokens, $i )
>   {
>     return $this->file_editor( $tokens, $i );
>   }
> 
>   private function _target( $tokens, $i )
>   {
>     /*  %target directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == target
>     **  $datapack['arg1'] == filepath to target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == optional note
>     **  $datapack['flag'] == optional flag (@)
>     **  $datapack['goto'] == empty
>     */
> 
>     /* Can have two args - file path and optional note. */
>     $datapack = $this->simple2( $tokens, $i );
> 
>     $datapack['arg1'] = $this->resolve_file_path( $datapack['arg1'] );
> 
>     /* Move arg2 (note) to arg3 for backward compatibility. */
>     if( !empty( $datapack['arg2'] ) )
>     {
>       $datapack['arg3'] = $datapack['arg2'];
>       $datapack['arg2'] = '';
>     }
> 
>     /* Look ahead for fileoptional directive */
>     if( isset( $tokens[$i+1] ) )
>     {
>       if( $tokens[$i+1]['name'] == 'fileoptional' )
>       {
>         $datapack['flag'] = self::FLAG_OPTIONAL;
>       }
>     }
> 
>     /* Set name of new open target globally */
>     $this->open_target = $datapack['arg1'];
>     $this->is_target = true;
>     return( $datapack );
>   } // _target()
> 
>   /* We are processing $tokens in order and creating parse table directive
>   ** records. When conditionally testing for a TNG version, if we have the
>   ** correct version we jump over tokens and begin processing again from the
>   ** label given in the %tngversion args.
>   */
>    private function _tngversion( $tokens, $i )
>   {
>     /*  %tngversion directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == tngversion
>     **  $datapack['arg1'] == low-range:low-range:label
>     **  $datapack['arg2'] == in-range true or false message - info only
>     **  $datapack['arg3'] == goto label or continue message - info only
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == $tokens processing index if test is true
>     */
> 
>     /*  Modremover class ignores conditionals. */
>     if( !empty( $this->classID ) && $this->classID == 'remover' ) return;
> 
>     $datapack = $this->simple3( $tokens, $i );
> 
>     /* Must have exactly three arguments - range low, range-high & label */
>     if( !$datapack['arg1'] || !$datapack['arg2'] || !$datapack['arg3'] )
>     {
>       $this->parse_error['line'] = $datapack['line'];
>       $this->parse_error['tag'] = 'p'.__LINE__.
>               ' %tngverson args';
>       $this->parse_error['text'] = self::MISSING;
>       return false;
>     }
1030c759,766
<       $buffer = $this->read_file_buffer( $open_target );
---
>     // remove dots from versions and turn into 4-digit integers
>     $start = $this->version2integer( $datapack['arg1'] );
>     $end = $this->version2integer( $datapack['arg2'] );
> 
>     $label = $datapack['arg3'];
>     $n = $this->find_label( $tokens, $i, $label );
>     if( !empty($this->parserr ) )
>       return false;
1032,1034c768,867
<       // if target text is ambiguous the mod listing should catch it
<       // so just check for presence here
<       $p = strpos( $buffer, $text );
---
>     /* Assemble arg1 */
>     $datapack['arg1'] = $start.':'.$end.':'.$label;
>     $datapack['arg2'] = '';
> 
>     /* if current TNG version is wrong - continue sequential processing */
>     if( $start > $this->int_version || $end < $this->int_version )
>     {
>       $datapack['arg2'] = 'false ('.$this->tng_version.')';
>       $datapack['arg3'] = lcfirst( $this->admtext['text_continue'] );
>       return $datapack;
>     }
> 
>     /* Current TNG version is correct - goto label */
>     $datapack['arg2'] = 'true ('.$this->tng_version.')';
>     $datapack['arg3'] = 'goto line '.$tokens[$n]['line'].' ('.$label.')';
> 
>      /* don't skip next cfg segment */
>     $datapack['goto'] = $n - 1 ;
>     return $datapack;
>   } // _tngversion()
> 
>   /* We are processing $tokens in order and creating parse table directive
>   ** records. When conditionally testing for existence of text in currently
>   ** open file, if found we jump over tokens and begin processing again from
>   ** the label token given in the %textexists arguments. */
>   private function _textexists( $tokens, $i )
>   {
>     /*  %textexists directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == textexists
>     **  $datapack['arg1'] == text to search for in currently open file
>     **  $datapack['arg2'] == result true or false
>     **  $datapack['arg3'] == "goto label" or "continue" message - info only
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == $tokens processing index if test is true
>     */
> 
>     /*  Modremover class ignores conditional jumps */
>     if( !empty( $this->classID ) && $this->classID == 'remover' ) return;
> 
>     $datapack = $this->init_tag();
>     $datapack['line'] = $tokens[$i]['line'];
>     $datapack['name'] = $tokens[$i]['name'];
> 
>     while(true)
>     {
>       /* Is there an %end:% directive next? */
>       if( $tokens[$i+1]['name'] != 'end' )
>       {
>         $this->parse_error['line'] = $tokens[$i]['line'];
>         $this->parse_error['tag']  = "P".__LINE__." %textexists: ";
>         $this->parse_error['text'] = self::NOEND; // index into admtext[]
>         return false;
>       }
> 
>       /* Must have exactly one arguments - goto label */
>       if( empty( $tokens[$i]['args'] ) )
>       {
>         $this->parse_error['line'] = $tokens[$i]['line'];
>         $this->parse_error['tag'] = "P".__LINE__." %textexists: label";
>         $this->parse_error['text'] = self::MISSING;
>         return false;
>       }
> 
>       /* Is there a target file specified in cfg file? */
>       if( empty( $this->open_target ) )
>       {
>         $this->parse_error['line'] = $tokens[$i]['line'];
>         $this->parse_error['tag']  = "P".__LINE__." %textexists: %target: ";
>         $this->parse_error['text'] = self::MISSING; // index into admtext[]
>         return false;
>       }
> 
>       $label = $tokens[$i]['args'];
> 
>       /* Get index in tokens table containing this $label. */
>       $n = $this->find_label( $tokens, $i, $label );
>       if( !empty( $this->parserr ) )
>         return false;
> 
>       /* Assemble and add the code block removing the final CRlf */
>       $datapack['arg1'] = $tokens[$i]['blob'];
>       $datapack['arg1'] = substr( $datapack['arg1'], 0, -2 );
>       $datapack['arg1'] = substr( $datapack['arg1'], 2 );
> 
>       /* Does target file exist? */
>       if( !file_exists( $this->open_target ) )
>       {
>         // return textexists = false
>         $datapack['arg2'] = 'false - '.$this->admtext['tgtmissing'];
>         $datapack['arg3'] = lcfirst( $this->admtext['text_continue'] );
>         break;
>       }
> 
>       $buffer = $this->read_file_buffer( $this->open_target );
> 
>       /*  If target text is ambiguous the mod listing should catch it
>       **  so just check for presence here.
>       */
>       $p = strpos( $buffer, trim($datapack['arg1']) );
1037,1053d869
<       if( false !== $p ) {
<          $this->conditional = 'true';
<          return $this->_goto( $parts, $index, $label, $refline );
<       }
<       $this->conditional = 'false';
<       return $i;
<    }
< 
<    function find_label( $parts, $index, $label) {
< 
<       for( $i=$index; isset($parts[$i]); $i++ ) {
<          if( $parts[$i][0] == 'label' && $parts[$i+1][0] == $label) {
<                return true;
<          }
<       }
<       return false;
<    }
1055,1062c871,1381
<    function count_args( $argstring ){  // index for tag name
<       $s = explode( "%", $argstring, $limit = 2 );
<       $args = trim( $s[0]);
<       if( empty( $args ) ) {
<          return 0;
<       }
<       return 1 + substr_count( $args, ":" );
<    }
---
>       if( false === $p )
>       {
>         /* Text not found */
>         //$datapack['arg1'] = $datapack['arg2'];
>         $datapack['arg2'] = 'false';
>         $datapack['arg3'] = lcfirst( $this->admtext['text_continue'] );
>         break;
>       }
> 
>       /* Text found */
>       //$datapack['arg1'] = $datapack['arg2'];
>       $datapack['arg2'] = 'true';
>       $datapack['arg3'] = 'goto line '.$tokens[$n]['line'].' ('.$label.')';
> 
>       /*  The segments table for-loop will increment past label.
>        *  To list label in parse table, back up the segments table
>        *  index.
>        */
>       $datapack['goto'] = $n - 1 ;
>       break;
>     } // while(true)
> 
>     return $datapack;
>   } // _textexists
> 
>   private function _triminsert( $tokens, $i )
>   {
>     return $this->file_editor( $tokens, $i );
>   }
> 
>   private function _trimreplace( $tokens, $i )
>   {
>     return $this->file_editor( $tokens, $i );
>   }
> 
>   private function _version( $tokens, $i )
>   {
>     return $this->simple1( $tokens, $i );
>   }
> 
>   private function _vinsert( $tokens, $i )
>   {
>     $datapack = $this->file_editor($tokens, $i);
> 
>     //Remove all but the variables, then send it to _insert() for removal. */
>     ;
>     $lines = explode( "\r\n", $datapack['arg1'] );
> 
>     //echo basename(__FILE__),': ',__LINE__,'<br/>';var_dump($lines);exit;
>     foreach( $lines as $line )
>     {
>       if( preg_match( "#^\s*\\$\w+#", $line ) )
>       {
>         $temp[] = $line;
>       }
>     }
> 
>     $datapack['arg1'] = implode( "\r\n", $temp );
> 
>     return $datapack;
>   }
> 
>   private function _wikipage( $tokens, $i )
>   {
>     return $this->simple1( $tokens, $i );
>   }
> 
> /***************************************************************
>   OTHER SUPPORTING FUNCTIONS
> ***************************************************************/
>   private function read_cfgfile($cfgpath)
>   {
>       $buffer = $this->read_file_buffer( $cfgpath );
> 
>       /* Handle errors from cgf buffer read */
>       if( is_numeric( $buffer ) )
>       {
>         // CFG file is missing; quit with parsing error
>         if($buffer == self::NOFILE)
>         {
>           $this->parse_error['line'] = '::';
>           $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$this->cfgfile;
>           $this->parse_error['text'] = self::NOCFGFILE; // index into admtext[]
>           return; // leave the processing loop and return to caller
>         }
>         elseif( $buffer == self::ISEMPTY )
>         {
>           // CFG file has no content; quit with parsing error
>           $this->parse_error['line'] = '::';
>           $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$this->cfgfile;
>           $this->parse_error['text'] = self::EMPTYFILE; // index into admtext[]
>           return; // leave the processing loop and return to caller
>         }
>       }
> 
>       /* Allows % inside info tags without terminating them. */
>       $buffer = str_replace( "\%", '&#037;', $buffer );
> 
>       /* Deprecated and unnecessary -- delete it. */
>       $buffer = str_replace( '%target:files%', '', $buffer );
> 
>       /* Capture mod name for listing in case parser errors out early */
>       preg_match( "#^\s*%name:([^%]+)%#m", $buffer, $matches );
>       $this->modname = $matches[1];
> 
>       /* Capture mod version for listing in case parser errors out early */
>       preg_match( "#^\s*%version:([^%]+)%#m", $buffer, $matches );
>       $this->version = $matches[1];
> 
>       return $buffer;
>   } // read_cfgfile()
> 
>   private function get_tokens( $buffer )
>   {
>       /* Use a single preg_split() function to split cfg into an array of
>       ** sections, each containing the directive name, arguments line, and
>       ** the "blob" -
>       ** the rest of the section content up to the next directive. The blob
>       ** contains code from the "%location" directive and all the file
>       ** content modifier directives like "%replace."
>       */
>       $sections = preg_split( "#^[ \t]*%(\w+):([^%]*)#m", $buffer, -1, PREG_SPLIT_OFFSET_CAPTURE|PREG_SPLIT_DELIM_CAPTURE );
> 
>       /*
>       ** Combine essential information from each segment into raw tokens
>       ** for final processing into directive records (sub-arrays) per
>       ** specific functions for each.
>       */
> 
>       $tokens = array();
>       for($i=1;isset($sections[$i]);$i+=3)
>       {
>         $token = array();
>         $token['line'] = substr_count( $buffer, "\n", 0, $sections[$i][1] ) + 1;
>         $token['name'] = $sections[$i][0];
>         $token['args'] = $sections[$i+1][0];
>         $token['blob'] = $sections[$i+2][0];
> 
>         /* CHECK FOR / PREVENT DIRECTIVE TERMINATION ERROR
>         ** The $sections regex above adds the directive teriminating
>         ** '%' char to the blob. If the blob does not start with a '%' char
>         ** we have a directive termination error.
>         **
>         ** If the terminated block contains a % character in its text,
>         ** user can use double terminator (%%) at the end of the
>         ** argument to prevent the directive text from being cut off at
>         ** the first % character in the text. In other words,
>         ** a double terminator takes precedenct over a single one.
>         */
>         if( false !== $p = strpos( $token['blob'], '%%%' ) )
>         {
>           /* Yes, a triple terminator to protect a double %%. */
>           $token['args'] .= substr( $token['blob'], 0, $p );
>           $token['blob'] = substr( $token['blob'], $p+3 );
>         }
>         elseif( false !== $p = strpos( $token['blob'], '%%' ) )
>         {
>           $token['args'] .= substr( $token['blob'], 0, $p );
>           $token['blob'] = substr( $token['blob'], $p+2 );
>         }
>         elseif( false !== $p = strpos( $token['blob'], '%' ) )
>         {
>           $token['args'] .= substr( $token['blob'], 0, $p );
>           $token['blob'] = substr( $token['blob'], $p+1 );
>         }
>         else {
>           $this->parse_error['line'] = $token['line'];
>           $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$token['name'];
>           $this->parse_error['text'] = self::TAGNOTERM;
>         break;
>         }
> 
>         $tokens[] = $token;
> 
>       } // Tokens created
> 
>       return $tokens;
> 
>   } // get_tokens()
> 
>   private function init_tag()
>   {
>     $datapack['line'] = '';
>     $datapack['name'] = '';
>     $datapack['arg1'] = '';
>     $datapack['arg2'] = '';
>     $datapack['arg3'] = '';
>     $datapack['flag'] = '';
>     $datapack['goto'] = '';
>     $datapack['statkey'] = '';
>     $datapack['eline'] = '';
>     return $datapack;
>   }
> 
>   /* Parse a token as directive with only one argument. Argument can contain
>   ** colons. */
>   private function simple1( $tokens, $i )
>   {
>     /* Because we assign the whole $token['args'] line to $datapack[arg1],
>     ** directives like %description are allowed to contain colons without
>     ** causing parsing problems.  If we were to explode the line as we do in
>     ** simple2 and simple3, the description could be at least truncated, and
>     ** possibly crash the mod listing.
>     */
>     $datapack = $this->init_tag();
>     $datapack['line'] = $tokens[$i]['line'];
>     $datapack['name'] = $tokens[$i]['name'];
>     $datapack['arg1'] = $tokens[$i]['args'];
>     $datapack['flag'] = $this->extract_flag( $datapack['arg1'] );
>     return $datapack;
>   }
> 
>     /* Parse a token as directive with only two arguments. Only second
>     ** argument can contain colons.
>     */
>   private function simple2( $tokens, $i )
>   {
>     /* Use simple2 to protect colons in the second argument
>     ** (for example %authors).
>     ** Becuase it only splits on the first colon in the arg string, colons in
>     ** the second arguments are safe (will not be split).
>     */
>     $datapack = $this->init_tag();
>     $datapack['line'] = $tokens[$i]['line'];
>     $datapack['name'] = $tokens[$i]['name'];
> 
> 
>     $args = explode( ":", $tokens[$i]['args'], 2 );
> 
>     $datapack['arg1'] = isset( $args[0] ) ? $args[0] : '';
>     $datapack['arg2'] = isset( $args[1] ) ? $args[1] : '';
> 
>     $datapack['flag'] = $this->extract_flag( $datapack['arg1'] );
> 
>     return $datapack;
>   }
> 
>   /* Parse a token as directive with one, two or three arguments. Only third
>   ** argument can contain colons.
>   */
>   private function simple3( $tokens, $i )
>   {
>     /* Do not use this to parse $token['args'] if the directive arguments
>     ** themselves might contain text with colons (:) as they will not split
>     ** correctly. Examples would include %description or %desc
>     ** (use simple1()).
>     */
>     $datapack = $this->init_tag();
>     $datapack['line'] = $tokens[$i]['line'];
>     $datapack['name'] = $tokens[$i]['name'];
> 
>     $args = explode( ":", $tokens[$i]['args'], 3 );
> 
>     $datapack['arg1'] = isset( $args[0] ) ? $args[0] : '';
>     $datapack['arg2'] = isset( $args[1] ) ? $args[1] : '';
>     $datapack['arg3'] = isset( $args[2] ) ? $args[2] : '';
> 
>     $datapack['flag'] = $this->extract_flag( $datapack['arg1'] );
> 
>     return $datapack;
>   }
> 
> /* file_modifiers are directives that change the content of a file.
> ** They share common traits (the instruction and code to replace or
> ** insert text into the file) and can all be processed using the same
> ** code in this function.
>  */
>   private function file_editor( $tokens, $i )
>   {
>     /*  map for all file editing directives
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == name of the file editing directive
>     **  $datapack['arg1'] == new code to replace or be inserted
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty
>     */
> 
>     switch( $tokens[$i]['name'] )
>     {
>       case'insert':
>       case 'vinsert':
>       case 'triminsert':
>         if( empty( $tokens[$i]['args'] ) )
>         {
>           $this->parse_error['line'] = $tokens[$i]['line'];
>           $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$tokens[$i]['name'];
>           $this->parse_error['text'] = 'nocomps';
>           return;
>         }
>         if( $tokens[$i]['args'] != 'before' && $tokens[$i]['args'] != 'after')
>         {
>           $this->parse_error['line'] = $tokens[$i]['line'];
>           $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$tokens[$i]['name'];
>           $this->parse_error['text'] = 'badchar';
>           return;
>         }
>       default:
>         break;
>     }
> 
>     $datapack = $this->simple1( $tokens, $i  );
> 
>     /* Check that certain file_editor directives have positional
>     ** argument 'before' or 'after' */
>     if( $datapack['name'] == 'insert' || $datapack['name'] == 'triminsert'
>         || $datapack['name'] == 'vinsert' )
>     {
>       if( empty( $datapack['arg1'] ) )
>       {
>         $this->parse_error['line'] = $datapack['line'];
>         $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$datapack['name'];
>         $this->parse_error['text'] = self::NOCOMPS;
>         return;
>       }
>     }
> 
>     /* For backward compatibility: Combine file_editor directive name and
>     ** directional indicator from token in 'name' and always place blob
>     ** in 'arg1'
>     */
>     if( !empty( $datapack['arg1'] ) )
>     {
>       $datapack['name'] .= ':'.$datapack['arg1'];
>     }
> 
>     if( empty( trim( $tokens[$i]['blob'] ) ) )
>     {
>       $this->parse_error['line'] = $tokens[$i]['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.' '.$datapack['name'];
>       $this->parse_error['text'] = self::NOCOMPS; // index into admtext[]
>       return;
>     }
> 
>     /* Simple1() does not return blob.  Add blob (code to edit into
>     ** target file.) */
>     $datapack['arg1'] = $tokens[$i]['blob'];
> 
>     /* Remove one leading and one trailing CRLF from blob */
>     $datapack['arg1'] = substr( $datapack['arg1'], 2 );
>     $datapack['arg1'] = substr( $datapack['arg1'], 0, -2 );
> 
>     /* Look ahead to verify presence of an %end:% directive */
>     if( $tokens[$i+1]['name'] != 'end')
>     {
>       $this->parse_error['line'] = $datapack['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' '.$datapack['name'];
>       $this->parse_error['text'] = self::NOEND;
>       return;
>     }
> 
>     return $datapack;
>   }
> 
>   /* Returns index for %label in the tokens table for parser conditional jumps */
>   protected function find_label( $tokens, $i, $label )
>   {
>     $aValid = array('-', '_');
>     if( !ctype_alnum( str_replace( $aValid, '', $label ) ) )
>     {
>       /* Label name has non-alphanumeric character.
>       ** Case 1: an extra colon was unintentionally inserted in the
>       **    %label Directive -- %label:done:%
>       **    The second colon would become part of the name -- invalid
>       **    character. */
>       $this->parse_error['line'] = $tokens[$i]['line'];
>       $this->parse_error['tag']  = 'p'.__LINE__.
>         ' %label [<strong>'.$label.'</strong>] ';
>       $this->parse_error['text'] = "badchar";
>       return false;
>     }
>     else
>     {
>       for( $k=$i+1; isset($tokens[$k]); $k++ )
>       {
>         if( $tokens[$k]['name'] == 'label' )
>         {
>           if( $tokens[$k]['args'] == $label )
>           {
>             return $k;
>           }
>         }
>       }
>     }
>     /* label not found. We only search from the label
>     ** call, if label is placed before the call in the
>     ** mod config file, it will also not be found */
>     $this->parse_error['line'] = $tokens[$i]['line'];
>     $this->parse_error['tag'] = 'p'.__LINE__.
>             " label: $label";
>     $this->parse_error['text'] = self::MISSING;
>     return false;
>   } // find_label()
> 
>   protected function __arrange_table( $parse_table )
>   {
>     $new_table = array();
> 
>     // make new directories available for file copies
>     for( $i=0; isset($parse_table[$i]); $i++ ) {
>       /* Info directives go to beginning of table.
>       ** When installing mod, mkdir moves to beginning of table.
>       ** When removing mod, mkdir goes after file copies so we can
>       ** remove the files first (PHP rmdir cannot delete a directory with
>       ** content.)
>       */
>       switch ( $parse_table[$i]['name'] ) {
>         // Only for installation
>         case 'mkdir':
>           if( isset( $this->classID ) && $this->classID == 'remover' )
>           {
>             break;
>           }
>         case 'name':
>         case 'version':
>         case 'description':
>         case 'note':
>         case 'private':
>         case 'author':
>         case 'wikipage':
>           $new_table[] = $parse_table[$i];
>           $table[$i]['name'] = '';
>           break;
>         default:
>           break;
>       }
>     }
> 
>     // next come file copies and newfile
>     for( $i=0; isset($parse_table[$i]); $i++ )
>     {
>       if( $parse_table[$i]['name'] == 'copyfile' ||
>         $parse_table[$i]['name'] == 'copyfile2' ||
>         $parse_table[$i]['name'] == 'newfile')
>       {
>         $new_table[] = $parse_table[$i];
>         $parse_table[$i]['name'] = '';
>       }
>     }
> 
>     // finally all the file modifiers, mkdirs and others
>     for( $i=0; isset($parse_table[$i]); $i++ ) {
>       if( empty( $parse_table[$i]['name'] ) ) continue;
>       $new_table[] = $parse_table[$i];
>     }
> 
>     return $new_table;
>   }
> 
>   private function extract_flag( &$string )
>   {
>     // look for flag anywhere in the string - should be at beginning, but...
>     if( $parts = preg_match( "#([@|^|~]+)#", $string, $matches, PREG_OFFSET_CAPTURE ) )
>     {
>       $flag = $matches[1][0];
> 
>       /* Remove flag from string -- removes all. */
>       $string = str_replace( $flag, '', $string );
> 
>       return $flag;
>     }
>     return '';
>   }
> 
>   protected function find_tagname_value( $name, $value )
>   {
>     foreach( $this->parse_table as $datapack )
>     {
>       if( $datapack[$name] == $value )
>       {
>         if( empty( $datapack['arg1'] ) )
>           return false;
>         else
>           return $datapack['arg1'];
>       }
>     }
>     return false;
>   }
> 
>   protected function required_tags_check( )
>   {
>     if( false === $this->find_tagname_value( 'name', 'name' ) )
>     {
>        $this->parse_error['line'] = 'n/a';
>        $this->parse_error['tag']  = 'p'.__LINE__.
>               ' %name:';
>        $this->parse_error['text'] = self::REQTAG; // index into admtext[]
>     }
>     elseif( false === $this->find_tagname_value( 'name', 'version' ) )
>     {
>       $this->parse_error['line'] = 'n/a';
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' %version:';
>       $this->parse_error['text'] = self::REQTAG; // index into admtext[]
>     }
>     elseif( false === $this->find_tagname_value( 'name', 'description' ) )
>     {
>       $this->parse_error['line'] = 'n/a';
>       $this->parse_error['tag']  = 'p'.__LINE__.
>               ' %description:';
>       $this->parse_error['text'] = self::NOCOMPS; // index into admtext[]
>     }
>   }
1064c1383,1384
< ?>
---
> 
> ?>
\ No newline at end of file
diff -r TNG/classes/modremover.class.php TNG1403/classes/modremover.class.php
1c1
< <?php
---
> <?php /*//220905 09:38*/
11c11,12
< require_once 'classes/modparser.class.php';
---
> /* File management */
> $modvalidator_version = '14.0.0.0 220718-1224';
13c14
< class modremover extends modparser {
---
> require_once 'classes/modparser.class.php';
15,16c16,17
<    public $classID = "remover";
<    public $modstatus = '';
---
> class modremover extends modparser
> {
18,328c19
<    public function __construct( $objinits ) {
<       parent::__construct( $objinits );
<    }
< 
<    public function remove( $cfgpath ) {
< 
<       $this->cfgpath = $cfgpath;
<       $this->cfgfile = $cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
<       $this->parse_error = array();
<       $this->mod_status = '';
<       $moddirs = array();
< 
<        // GET PARSE TABLE FOR THIS MOD
<       $tags = $this->parse( $cfgpath );
<       $tags=$this->arrange_table( $tags );
< 
<       // LOG THE MOD REMOVAL
<       $this->new_logevent( "{$this->admtext['removing']} <strong>$cfgpath</strong>" );
< 
<       if( empty( $tags ) && empty( $this->parse_error ) ) {
<             $this->mod_status = self::CANTPROC;
<             $this->add_logevent( "<span class=\"msgerror\">parse table {$this->admtext['missing']}</span>" );
<             $this->write_eventlog( $error=true );
<             return false;
<       }
< 
<       // HANDLE FATAL ERROR
<       if( !empty( $this->parse_error ) ) {
<          $this->modname = $cfgfile;
<          $this->mod_status = self::ERRORS;
<          $idx = $this->parse_error['text'];
<          $this->add_logevent("<span class=\"msgerror\">$cfgfile</span> <span class=\"hilighterr msgbold\">{$this->admtext[$idx]}</span>");
<          $this->write_eventlog();
<          return false;
<       }
< 
<       // INITIALIZE STATUS DATA
<       $locations_installed = 0;
<       $locations_removed = 0;
<       $files_installed = 0;
<       $files_removed = 0;
<       $num_errors = 0;
< 
<       // PROCESS PARSE TABLE TO REMOVE THE CURRENT MOD
<       for( $j=0; isset($tags[$j]); $j++ ) {
< 
<          // IGNORE TAGS THAT WON'T BE FOUND IN TARGET FILE
<          if( $this->is_infotag( $tags[$j]['name'] ) ) continue;
< 
<          /****************************************************************
<          TARGETS
<          ****************************************************************/
<          if( $tags[$j]['name'] == 'target' ) {
<          $flag = $tags[$j]['flag'];
< 
<             // DEPLOYED FILES WILL BE DELETED IN ORDER FOUND IN CFG SO IGNORE THIS
<             if( $tags[$j]['arg1'] == 'files') continue;
< 
<             // NEW TARGET FILE? SAVE CURRENT TARGET BUFFER IF ANY;
<             if( !empty( $active_target_file ) && !empty( $target_file_contents ) ) {
<                if( false === $this->write_file_buffer( $active_target_file, $target_file_contents ) ) {
<                   $num_errors++;
<                   $logstring = "<span class=\"msgerror\">{$this->admtext['cantwrite']} %target:</span><span class=\"tgtfile\">{$flag}$display_path</span><span class=\"tag\">%</span>&nbsp;";
<                   $this->add_logevent( $logstring );
<                }
<                unset( $target_file_contents );
<             }
< 
<             // INIT VARS FOR NEW TARGET FILE
<             $fileoptional = false;
<             $target_file_basename = '';
<             $active_target_file = '';
<             $target_file_contents = null;
< 
<             // REMOVE ROOTPATH PORTION OF FILE PATH FOR LOGGING
<             $display_path = str_replace( $this->rootpath, '', $tags[$j]['arg1'] );
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: <span class=\"tag\">%target:</span><span class=\"tgtfile\">{$flag}$display_path</span><span class=\"tag\">%</span>&nbsp;";
< 
<             $fileoptional = $tags[$j]['arg2'] == 'fileoptional' ? true : false;
< 
<             // READ TARGET FILE CONTENTS INTO PROCESSING BUFFER
<             $target_file_contents = $this->read_file_buffer(
<                $tags[$j]['arg1'], $tags[$j]['flag'] );
< 
<             // REPORT FILE ERRORS IF ANY
<             if( is_numeric( $target_file_contents ) ) {
<                switch( $target_file_contents ) {
<                   case self::BYPASS:
<                      // not an error
<                      $logstring .= "{$this->admtext['optmissing']}&nbsp;<span class=\"msgapproved\">{$this->admtext['bypassed']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   case self::NOFOUL:
<                      // $provisional_errors++;
<                      $this->provisional_errors--;
<                      $logstring .= "<span class=\"msgapproved\">{$this->admtext['removed']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   case self::NOFILE:
<                      //$num_errors++;
<                      $logstring .= "<span class=\"\">{$this->admtext['tgtmissing']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   case self::NOWRITE:
<                      //$num_errors++;
<                      $logstring .= "<span class=\"msgerror\">{$this->admtext['notwrite']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   case self::ISEMPTY:
<                      //$num_errors++;
<                      $logstring .= "<span class=\"msgerror\">{$this->admtext['emptyfile']}</span>";
<                      $this->add_logevent( $logstring );
<                      break;
<                   default:
<                      break;
<                }
<                // don't try to write to defective file
<                $active_target_file = '';
<                $targt_file_contents = '';
<             }
<             else {
<                $istarget = true;
<                $active_target_file = $tags[$j]['arg1'];
<                $logstring .= "{$this->admtext['opened']}";
<                $this->add_logevent( $logstring );
<             }
<             continue;  // target file buffer ready - get next tag
<          } // TARGET
<          /****************************************************************
<          LOCATIONS
<          ****************************************************************/
<          elseif( $tags[$j]['name'] == 'location' ) {
<             $locations_installed++;
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: <span class=\"tag\">%location:%</span>&nbsp;";
< 
<             // NO TARGET FILE OPEN - NO POINT PROCESSING LOCATIONS
<             if( empty( $active_target_file) ) {
<                if( $fileoptional ) {
<                   $locations_installed--;
<                }
<                continue;
<             }
<             else {
<             // TARGET FILE OPEN AND READY FOR MODIFICATION
<             $tng_code = $tags[$j]['arg1'];
< 
<             $j++; // go to optag
< //echo __LINE__,' ',print_r( $tags[$j] );exit;
<             $optag = $tags[$j]['name'];
<             $new_code = $tags[$j]['arg1'];
<             $logstring .= "(%$optag:)&nbsp;";
<             }
<             // SET ARGUMENTS FOR PHP SUBSTR_REPLACE() FUNCTION
<             switch( $optag ) {
<                case 'insert:before':
<                   $new_code .= "\r\n";
<                   $len = strlen( $new_code );
<                   $replacement = '';
<                   break;
<                case 'insert:after':
<                   $new_code = "\r\n".$new_code;
<                   $len = strlen( $new_code );
<                   $replacement = '';
<                   break;
<                case 'vinsert:before':
<                   $this->remove_vinserts( $target_file_contents, $optag, $new_code, $logstring );
<                   continue 2; // finished - get next tag
<                case 'vinsert:after':
< //echo __LINE__,' ',$target_file_contents;exit;
<                   $this->remove_vinserts( $target_file_contents, $optag, $new_code, $logstring );
<                   continue 2;  // finished - get next tag
<                case 'replace':
<                case 'trimreplace':
<                   $len = strlen( $new_code );
<                   $replacement = $tng_code;
<                   break;
<                case 'triminsert:before':
<                   $new_code .= $tng_code;
<                   $len = strlen( $new_code );
<                   $replacement = $tng_code;
<                   break;
<                case 'triminsert:after':
<                   $new_code = $tng_code.$new_code;
<                   $len = strlen( $new_code );
<                   $replacement = $tng_code;
<                   break;
<                default:
<                   break;
<             }
<             // WHICH CODE - TNG OR NEW - IS CURRENTLY INSTALLED
<             if( false === $pos = strpos( $target_file_contents, $new_code ) ) {
<                if( false === $pos = strpos( $target_file_contents, $tng_code ) ) {
<                   // file is corrupt
<                }
<                else { // TNG CODE FOUND (NO ACTION REQUIRED) -- REPORT AND MOVE ON
<                   $locations_removed++;
<                   $logstring .= "<span class=\"msgapproved\">{$this->admtext['alreadyrem']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<                }
<             }
<             else { // NEW CODE FOUND -- REPLACE IT WITH ORIGINAL TNG CODE
<                $target_file_contents = substr_replace( $target_file_contents, $replacement, $pos, $len );
<                $locations_removed++;
<                $logstring .= "<span class=\"msgapproved\">{$this->admtext['restored']}</span>";
<                $this->add_logevent( $logstring );
<                continue;
<             }
<          } // location
<          /****************************************************************
<          FILE / FOLDER REMOVAL OPERATIONS
<          ****************************************************************/
<          else {
<             // PREPARE PATH FOR COPIED FILE REMOVALS
<             switch( $tags[$j]['name'] ) {
<                case 'copyfile':
<                case 'copyfile2':
<                   $dest_path = str_replace( $this->rootpath, '', $tags[$j]['arg2'] );
<                   $destination_path = $tags[$j]['arg2'];
<                   $files_installed++;
<                   break;
<                case 'newfile':
<                   $dest_path = str_replace( $this->rootpath, '', $tags[$j]['arg1'] );
<                   $destination_path = $tags[$j]['arg1'];
<                   $files_installed++;
<                   break;
<                case 'mkdir':
<                   $moddirs[] = $tags[$j]['arg1'];
<                   continue 2; // not further handled in processing loop
<                default:
<                   continue 2; // not a tag for processing, continue through the for loop
<             }
<             $flag = $tags[$j]['flag'];
< 
<             // REMOVE FILE AND REPORT STATUS
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: %<span class=\"tag\">{$tags[$j]['name']}:</span><span class=\"tgtfile\">{$flag}$dest_path</span>%&nbsp;";
< 
<             if( !file_exists( $destination_path ) ) {
<                $logstring .= "{$this->admtext['notinst']}&nbsp;<span class=\"msgapproved\">{$this->admtext['bypassed']}</span>";
<                $this->add_logevent( $logstring );
<                continue;
<             }
<             elseif( $flag == self::FLAG_PROTECTED ) {
<                $logstring .= "<span class=\"msgapproved\">{$this->admtext['protected']}</span>";
<                $this->add_logevent( $logstring );
<                continue;
<             }
<       		elseif ( false === unlink( $destination_path ) ) {
<       		   if( $optional ) {
<       		      $logstring .= "<span class=\"msgapproved\">{$this->admtext['cantremok']}</span>";
<                   $this->add_logevent( $logstring );
<                   continue;
<       		   }
<                else {
<                // failed to delete required file
<                   $num_errors++;
<                   $logstring .= "<span class=\"hilighterr msgbold\">{$this->admtext['cantdel']}</span>";
<              		$this->add_logevent( $logstring );
<                   continue;
<                }
<          	}
<             else {
<                $files_removed++;
<                $logstring .= "<span class=\"msgapproved\">{$this->admtext['deleted']}</span>";
<                $this->add_logevent( $logstring );
<                continue;
<          	}
<          }
<       } // tags processing loop
< 
<       // DONE PROCESSING - WRITE LAST TARGET BUFFER TO FILE
<       if( !empty( $active_target_file ) && !empty( $target_file_contents ) ) {
<          if( false === $this->write_file_buffer( $active_target_file, $target_file_contents ) ) {
<             $num_errors++;
<             $logstring = "<span class=\"msgerror\">{$this->admtext['cantwrite']} %target:</span><span class=\"tgtfile\">$display_path</span><span class=\"tag\">%</span>&nbsp;";
<             $this->add_logevent( $logstring );
<          }
<          unset( $target_file_contents );
<       }
< 
<       // REMOVE FOLDERS INSTALLED BY MOD IF EMPTY
<       // do it here so all installed files will be removed first
<       if( count( $moddirs) ) {
<          foreach( $moddirs as $moddir) {
<             $dest_path = str_replace( $this->rootpath, '', $moddir );
<             $logstring = "{$this->admtext['line']} {$tags[$j]['line']}: %<span class=\"tag\">%remdir:</span><span class=\"tgtfile\">$dest_path</span>%&nbsp;";
<             if( false !== rmdir( $moddir ) ) {
<                $logstring .= "<span class=\"msgapproved\">{$this->admtext['removed']}</span>";
<                $this->add_logevent( $logstring );
<             }
<             else {
<                $logstring .= "<span class=\"msgapproved\">{$this->admtext['cantrem']}</span>";
<    		      $this->add_logevent( $logstring );
<             }
<          }
< 
<       }
< 
<       if( !$num_errors ) {
<          $status = self::MODREM;
<          $class = "class=\"msgapproved\"";
<       }
<       else {
<          $status = self::ERRORS;
<          $class = "class=\"msgerror\"";
<       }
< 
<       $this->add_logevent("<span class=\"msgbold\">{$this->admtext['toterrors']}:</span> $num_errors");
<       $this->add_logevent("$locations_installed {$this->admtext['modsinst']}&nbsp;&nbsp;&nbsp;&nbsp; $locations_removed {$this->admtext['modsrem']}" );
<       $this->add_logevent("$files_installed {$this->admtext['filesinst']}&nbsp;&nbsp;&nbsp;&nbsp;$files_removed {$this->admtext['filesrem']}" );
<       $this->add_logevent("{$this->admtext['status']}: <span $class>{$this->admtext[$status]}</span>");
---
>   public $classID = "remover";
330c21,80
<       $this->mod_status = $status;
---
>   protected $locations_found = 0;
>   protected $locations_removed = 0;
>   protected $copyfiles_found = 0;
>   protected $copyfiles_removed = 0;
>   protected $copyfiles_protected = 0;
>   protected $newfiles_found = 0;
>   protected $newfiles_removed = 0;
>   protected $newfiles_protected = 0;
>   protected $directories_found = 0;
>   protected $directories_removed = 0;
>   protected $directories_not_empty = 0;
>   protected $mod_status = '';
> 
> 
>   protected $files_removed = 0;
>   protected $num_errors = 0;
> 
>   public function __construct( $objinits )
>   {
>     parent::__construct( $objinits );
>   }
> 
>   const REMOVED  = 'removed';
> 
>   protected $active_target_file = '';
>   protected $target_file_contents = '';
>   protected $istarget = false;
> 
>   public function remove( $cfgpath )
>   {
>     $this->cfgpath = $cfgpath;
>     $this->cfgfile = $cfgfile = pathinfo( $cfgpath, PATHINFO_BASENAME );
>     $this->parse_error = array();
>     $this->mod_status = '';
>     $newdirs = array();
> 
>     /* Get the parse table for this mod.*/
>     $this->parse( $cfgpath );
> 
>     /* Arrange the directives in best order for removal.*/
>     $this->arrange_parse_table( $this->parse_table );
> 
>     /* Starg logging the removal event.*/
>     $this->new_logevent( "{$this->admtext['removing']} <strong>$cfgpath</strong>" );
> 
>     if( empty( $this->parse_table ) && empty( $this->parse_error ) )
>     {
>       $this->mod_status = self::CANTPROC;
>       $this->add_logevent( "<span class='msgerror'> E".__LINE__." parse table {$this->admtext['missing']}</span>" );
>       $this->write_eventlog( $error=true );
>       return false;
>     }
> 
>     // HANDLE FATAL ERROR
>     if( !empty( $this->parse_error ) )
>     {
>       $this->modname = $cfgfile;
>       $this->mod_status = self::ERRORS;
>       $idx = $this->parse_error['text'];
>       $this->add_logevent("<span class='msgerror'>$cfgfile</span> <span class='hilighterr msgbold'> E".__LINE__." {$this->admtext[$idx]}</span>");
332,333c82,1003
<       return ( $status == self::MODREM );
<    } // remove
---
>       return false;
>     }
> 
>     // INITIALIZE STATUS DATA
>     $this->init_properties();
> 
>     /*************************************************************
>       PROCESS PARSE TABLE DIRECTIVES TO INSTALL CURRENT MOD
>         Each $this->parse_table[$i] is a single directive datapack.
>     *************************************************************/
>     for($i=0; isset( $this->parse_table[$i] ); $i++ )
>     {
>       /* File modifiers are processed by %location and should never show up here.
>       ** If file modifiers are found here it is because they did not have an
>       ** associated location directive and would not have been installed anyway. */
>       if( in_array( $this->parse_table[$i]['name'], $this->file_modifiers ) )
>         continue;
> 
>       /* PHP allows assignment of a function name to a variable
>       ** and then executing the "variaable" with arguments. That lets
>       ** us get the function name associated with this directive from
>       ** $proclist found in the modparser.class.php.
>       */
>       $function = $this->proclist[$this->parse_table[$i]['name']];
> 
>       /***********************************************************/
>       /* Use custom function to set status of this directive.
>       ** If a function processes more than one tag it will advance
>       ** index $i to skip the table entries already processed.
>       */
> 
>       $j = $i; /* For debugging */
> 
>       /* Dispatcher - send directive datapack for processing */
>       $i = $this->$function( $i );
> 
>       /* We pass the the $i index to processing functions and
>       ** allow them to change it so the processing can skip over
>       ** directives specified by conditional testing.
>       **
>       ** Debug: prevent bad behavior during modremover development;
>       ** if the $i index gets unset or reset back to zero by a faulty
>       ** function return, it will cause an infinite loop. Kill it.*/
>       if(  $i < $j ) {
>         echo basename(__FILE__),': ',__LINE__,'<pre>';print_r($this->cfgpath);echo '<br />';
>         echo basename(__FILE__),': ',__LINE__,'<pre>';print_r("Index Error - \$i=$i < \$j=$j<br />");
>         echo basename(__FILE__),': ',__LINE__,'<br/>';var_dump($this->parse_table[$j]);exit;
>       }
> 
>     } /* Main modremover processing loop */
> 
>     /*************************************************************
>       DONE PROCESSING - FLUSH LAST BUFFER BACK TO TARGET FILE
>     *************************************************************/
>     if( !empty( $this->active_target_file ) && !empty( $this->target_file_contents ) )
>     {
>       if( false === $this->write_file_buffer( $this->active_target_file,
>                                               $this->target_file_contents ) )
>       {
>         $this->num_errors++;
>         $logstring = "<span class='msgerror'> E".__LINE__." {$this->admtext['cantwrite']} %target:</span><span class='tgtfile'>$display_path</span><span class='tag'>%</span>&nbsp;";
>         $this->add_logevent( $logstring );
>       }
>     }
> 
>     /*************************************************************
>       COMPILE INFORMATION FOR THE MM REMOVAL LOG ENTRY
>     *************************************************************/
>     if( !$this->num_errors )
>     {
>       /* If all the stats add up we are removed */
>       if( $this->copyfiles_removed == ( $this->copyfiles_found - $this->copyfiles_protected )
>           && ( $this->newfiles_removed == ( $this->newfiles_found - $this->newfiles_protected ) )
>           && ( $this->locations_removed == $this->locations_found )
>           && ( $this->directories_removed == ( $this->directories_found - $this->directories_not_empty ) ) )
>       {
>         $status = self::MODREM;
>         $class = "class='msgapproved'";
>       }
>       else // they don't add up //
>       {
>         $status = self::ERRORS;
>         $class = "class='msgerror'";
>         $this->batch_error = true;
>       }
>     }
>     else
>     {
>       $status = self::ERRORS;
>       $class = "class='msgerror'";
>       $this->batch_error = true;
>     }
> 
>     /* Summarize number of modifications, files, newfiles and directories removed. */
>     $this->add_logevent("<span class='msgbold'>{$this->admtext['toterrors']}:</span> $this->num_errors");
> 
>     if( !empty( $this->locations_found ) )
>     {
>       $locations = sprintf( '%d %s &nbsp;&nbsp; %d %s',
>                     $this->locations_found,
>                     '%location:',
>                     $this->locations_removed,
>                     $this->admtext['removed'] );
>       $this->add_logevent( $locations );
>     }
> 
>     if( !empty( $this->copyfiles_found ) )
>     {
>       $copyfiles = sprintf( '%d %s &nbsp;&nbsp; %d %s &nbsp;&nbsp; %d %s',
>                     $this->copyfiles_found,
>                     '%copyfile:',
>                     $this->copyfiles_removed,
>                     $this->admtext['removed'],
>                     $this->copyfiles_protected,
>                     $this->admtext['protected'] );
>       $this->add_logevent( $copyfiles );
>     }
> 
>     if( !empty( $this->newfiles_found ) )
>     {
>       $newfiles = sprintf( '%d %s &nbsp;&nbsp; %d %s &nbsp;&nbsp; %d %s',
>                     $this->newfiles_found,
>                     '%newfile:',
>                     $this->newfiles_removed,
>                     $this->admtext['removed'],
>                     $this->newfiles_protected,
>                     $this->admtext['protected'] );
>       $this->add_logevent( $newfiles );
>     }
> 
>     if( !empty( $this->directories_found ) )
>     {
>       $mkdirs = sprintf( '%d %s &nbsp;&nbsp; %d %s &nbsp;&nbsp; %d %s &nbsp;&nbsp; %d %s',
>                     $this->directories_found,
>                     '%mkdir:',
>                     $this->directories_removed,
>                     $this->admtext['removed'],
>                     $this->directories_protected,
>                     $this->admtext['protected'],
>                     $this->directories_not_empty,
>                     $this->admtext['cantrem'] );
>       $this->add_logevent( $mkdirs );
>     }
> 
>     $this->add_logevent("{$this->admtext['status']}: <span $class>{$this->admtext[$status]}</span>");
> 
>     $this->mod_status = $status;
>     $this->write_eventlog();
> 
>     /* Determines if modhandler opens the Log to view errors -- see mod options. */
>     return ( $status == self::MODREM );
> 
>   } // remove()
> 
>   /*****************************************************************
>   DIRECTIVE PROCESSING FUNCTIONS
> 
>   The modremover class must contain a private function for each
>   mod directive that may appear in the parse table. Functions are
>   named the same as the directive, but with a leading underscore.
> 
>   The processing loop in modremover dispatches each directive in
>   parse table order to its corresponding function below for removal.
>   *****************************************************************/
>   private function _author( $i )
>   {
>     return $i;
>   }
> 
>   private function _copyfile( $i  )
>   {
>     /*  %copyfile directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == copyfile or copyfile2
>     **  $datapack['arg1'] == full server path to source file
>     **  $datapack['arg2'] == full server path to destination file
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == flag (if any) optional or protected
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     /* Break out the datapack to simplify processing.*/
>     $copyfile_datapack = $this->parse_table[$i];
> 
>     $line = $copyfile_datapack['line'];
>     $copyfile_op = $copyfile_datapack['name'];
>     $flag = $copyfile_datapack['flag'];
> 
>     $destination_path = $copyfile_datapack['arg2'];
>     $dest_path = str_replace( $this->rootpath, '', $destination_path );
> 
>     $logstring = "{$this->admtext['line']} $line: %<span class='tag'>$copyfile_op:</span><span class='tgtfile'>{$flag}$dest_path</span>%&nbsp;";
> 
>     while( true )
>     {
>       if( !file_exists( $destination_path ) )
>       {
>         $logstring .= "{$this->admtext['notinst']}&nbsp;<span class='msgapproved'>{$this->admtext['bypassed']}</span>";
>         break;
>       }
> 
>       $this->copyfiles_found ++;
> 
>       if( $flag == self::FLAG_PROTECTED )
>       {
>         $logstring .= "<span class='msgapproved'>{$this->admtext['protected']}</span>";
>         $this->copyfiles_protected++;
>         break;
>       }
> 
>       if( false === unlink( $destination_path ) )
>       {
>         if( $flag == self::FLAG_OPTIONAL )
>         {
>           $logstring .= "<span class='msgapproved'>{$this->admtext['cantremok']}</span>";
>           break;
> 
>           // failed to delete a copied file
>           $this->num_errors++;
>           $logstring .= "<span class='hilighterr msgbold'> E".__LINE__." {$this->admtext['cantdel']}</span>";
>           break;
>         }
> 
>      	}
> 
>       $this->copyfiles_removed++;
>       $logstring .= "<span class='msgapproved'>{$this->admtext['removed']}</span>";
>       break;
>     } // while(true) processing loop
> 
>     $this->add_logevent( $logstring );
>     return $i;
>   } // _copyfile()
> 
>   private function _desc( $i  )
>   {
>     return $i;
>   }
> 
>   private function _description( $i  )
>   {
>     return $i;
>   }
> 
>   private function _end( $i  )
>   {
>     return $i;
>   }
> 
>   private function _fileend( $i  )
>   {
>     return $i;
>   }
> 
>   private function _fileexists( $i )
>   {
>     return $i;
>   }
> 
>   private function _fileoptional( $i )
>   {
>     return $i;
>   }
> 
>   private function _files( $i )
>   {
>     return $i;
>   }
> 
>   private function _fileversion( $i )
>   {
>     return $i;
>   }
> 
>   private function _goto( $i )
>   {
>     return $i;
>   }
> 
>   /* Remove inserted code/text */
>   private function _insert( $location_datapack, $insert_datapack, $logstring )
>   {
>     /*  %insert directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == insert:before or insert:after
>     **  $datapack['arg1'] == text to be inserted into the target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     /*
>     ** The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     $return_flag = true;
> 
>     /* insert:before, insert:after */
>     $insert_op = $insert_datapack['name'];
> 
>     /* Trim spaces and tabs from each end of the
>     ** Location snippet block to avoid unnecessary 'bad target' errors.
>     */
>     $location_block = trim( $location_datapack['arg1'], " \t" );
> 
>     $insertion_block = $insert_datapack['arg1'];
> 
>     $insertion_block = $insert_op == 'insert:before'
>       ? $insertion_block."\r\n"  : "\r\n".$insertion_block;
> 
>     $logstring .= "(%$insert_op%)&nbsp;";
> 
>     /*
>     ** Modlister has already analyzed the mod file.  The mod is installed
>     ** and there is no non-unique codes, so we'll trust that and just
>     ** uninstall the mod without testing those things again.
>     */
> 
>     if( false !== $p = strpos( $this->target_file_contents, $insertion_block ) )
>     {
>       $this->locations_found++;
>       $len = strlen( $insertion_block);
>       $this->target_file_contents = substr_replace( $this->target_file_contents,'', $p, $len );
> 
>       if( false === strpos( $this->target_file_contents, $insertion_block ) )
>       {
>         $this->locations_removed++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['removed']}</span>";
>       }
>       else
>       {
>         /* Suspect garbage duplicate entries in target file.  Cleaning the mod a
>         ** second time might fix the problem.
>         */
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['cantrem']}</span>";
>         $this->num_errors++;
>         $return_flag = false;
>       }
>     }
>     else
>     {
>       /* Mod insertion not found - already removed. This might be the case for 
>       ** conditional directives or when cleaning up a partially installed mod.
>       */
>       $logstring .= "<span class='msgapproved'>{$this->admtext['alreadyrem']}</span>";
>     }
> 
>     $this->add_logevent( $logstring );
>     return $return_flag;
>   } // _insert()
> 
>   private function _label( $i )
>   {
>     return $i;
>   }
> 
>   private function _location( $i )
>   {
>     /*  %location directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == insert:before or insert:after
>     **  $datapack['arg1'] == code to be inserted into the target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == optional note
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
> 
>     /* Target file must be open to operate on it.*/
>     if( !$this->istarget )
>     {
>       /* Skip over both location and editing directives */
>       return $i+1;
>     }
> 
>     /* Break out the location directive datapack from the parse table.*/
>     $location_datapack = $this->parse_table[$i];
>     $line = $location_datapack['line'];
>     $flag = $location_datapack['flag'];
> 
>     /* A file editing directive always follows %location in the parse table.*/
>     $i++;
>     $modifier_datapack = $this->parse_table[$i];
>     $modifier_op = $modifier_datapack['name'];
> 
>     while( true )
>     {
>       $logstring = "{$this->admtext['line']} $line: <span class='tag'>%location:%</span>&nbsp;";
> 
>       /* Dispatch modifier directive for processing */
>       $function = $this->proclist[$modifier_op];
> 
>       $this->$function( $location_datapack, $modifier_datapack, $logstring );
>       break;
> 
>     } // while(true) processing loop
> 
>     return $i;
>   } // _location
> 
>   private function _mkdir( $i )
>   {
>     /*  %mkdir directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == mkdir
>     **  $datapack['arg1'] == directory (folderpath) to be created
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == if any, optinal @
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     /* Because we rearranged the parse table, any copyfiles and newfiles will
>     ** have already been removed from this directory, so remove the directory if empty.
>     */
> 
>     $mkdir_datapack = $this->parse_table[$i];
> 
>     $line = $mkdir_datapack['line'];
> 
>     $mkdir_directory = $mkdir_datapack['arg1'];
> 
>     if( file_exists( $mkdir_directory ) )
>     {
>       $this->directories_found++;
>     }
> 
>     /* Use short display path for log */
>     $display_path = str_replace( $this->rootpath, '', $mkdir_directory );
> 
>     $logstring = "{$this->admtext['line']} $line: %<span class='tag'>mkdir:</span><span class='tgtfile'>$display_path</span>%&nbsp;";
> 
>     /* Attempt to remove the directory */
>     if( false !== rmdir( $mkdir_directory ) ) {
>       $this->directories_removed++;
>       $logstring .= "<span class='msgapproved'>{$this->admtext['removed']}</span>";
>     }
>     else {
>       $this->directories_not_empty++;
>       $logstring .= "<span class='msgapproved'>{$this->admtext['cantrem']}</span>";
>     }
> 
>     $this->add_logevent( $logstring );
>     return $i;
>   }
> 
>   private function _name( $i )
>   {
> echo basename(__FILE__),': ',__LINE__,'<br/>';var_dump($this->parse_table[$i]);exit;
>     return $i;
>   }
> 
>   private function _newfile( $i )
>   {
>     /*  %newfile directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == newfile
>     **  $datapack['arg1'] == filepath for new file
>     **  $datapack['arg2'] == content of new file
>     **  $datapack['arg3'] == version number of new file
>     **  $datapack['flag'] == flag if any
>     **  $datapack['goto'] == empty
>     */
> 
>     /* Only current table entry needed so simplify code */
>     $newfile_datapack = $this->parse_table[$i];
> 
>     $line = $newfile_datapack['line'];
>     $flag = $newfile_datapack['flag'];
> 
>     /* Full server file path.*/
>     $new_filepath = $newfile_datapack['arg1'];
> 
>     /* Short version of file name for display.*/
>     $new_file = str_replace( $this->rootpath, '', $new_filepath );
> 
>     $logstring = "{$this->admtext['line']} $line: <span class='tag'>%newfile:</span><span class='tgtfile'>$flag$new_file</span><span class='tag'>%</span>&nbsp;";
> 
>     while( true )
>     {
>       if( !file_exists( $new_filepath ) )
>       {
>         /* Not installed */
>         $logstring .= "<span class='msgapproved'>{$this->admtext['alreadyrem']}</span>";
>         break;
>       }
> 
>       $this->newfiles_found++;
> 
>       if( $flag == self::FLAG_PROTECTED )
>       {
>         $this->newfiles_protected++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['protected']}</span>";
>         break;
>       }
> 
>       if( false === unlink( $new_filepath ) )
>       {
>         $this->num_errors++;
>         $logstring .= "<span class='hilighterr msgbold'> E".__LINE__." {$this->admtext['cantdel']}</span>";
>         break;
>       }
> 
>       $this->newfiles_removed++;
>       $logstring .= "<span class='msgapproved'>{$this->admtext['removed']}</span>";
>       break;
>     } // while(true)
> 
>     $this->add_logevent( $logstring );
>     return $i;
>   } // _newfile()
> 
>   private function _note( $i )
>   {
>     return $i;
>   }
> 
>   private function _parameter( $i )
>   {
>     return $i;
>   }
> 
>   private function _private( $i )
>   {
>     return $i;
>   }
> 
>   private function _replace( $location_datapack, $replace_datapack, $logstring )
>   {
>     /*  %replace directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == replace
>     **  $datapack['arg1'] == replacement text for location in target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     $return_flag = true;
> 
>     /* Function is called by _location(), not by the main program.
>     **
>     ** The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     /* Trim spaces and tabs from each end of the
>     ** Location text block to avoid 'bad target' errors. Whatever white space
>     ** leads or trails the location text will remian in the file.
>     */
>     $location_block = $location_datapack['arg1'];
> 
>     $replace_block = $replace_datapack['arg1'];
> 
>     $logstring .= "(%replace:)&nbsp;";
> 
>     /* If replacement text is found, replace it with the original location text. */
>     while( true )
>     {
>       /* Find the replacement code and remove it */
>       if( false !== strpos( $this->target_file_contents, $replace_block ) )
>       {
>         $this->locations_found++;
>         $this->target_file_contents = str_replace( $replace_block, $location_block, $this->target_file_contents, $count );
> 
>         if( $count == 1 )
>         {
>           $this->locations_removed++;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['removed']}</span>";
>           break;
>         }
> 
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['errors']}</span>";
>         $return_flag = false;
>         break;
>       }
> 
>       $logstring .= "<span class='msgapproved'>{$this->admtext['alreadyrem']}</span>";
>       break;
>     } // while(true) processing
> 
>     $this->add_logevent( $logstring );
>     return $return_flag;
>   } // _replace()
> 
>   private function _target( $i )
>   {
>     /*  %target directive map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == target
>     **  $datapack['arg1'] == server filepath to target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == optional note
>     **  $datapack['flag'] == optional flag (@)
>     **  $datapack['goto'] == empty
>     */
> 
>     /* Break out target directive datapack */
>     $target_datapack = $this->parse_table[$i];
> 
>     $line = $target_datapack['line'];
>     $flag = $target_datapack['flag'];
>     $target_filepath = $target_datapack['arg1'];
> 
>     /* Remove rootpath portion of target file path for log display.*/
>     $display_path = $flag . str_replace( $this->rootpath, '', $target_filepath );
> 
>     /* Target directive processing loop - gets target file content into string buffer. */
>     while(true)
>     {
>       /* If previous target file open, save file contents before opening a new one.*/
>       if( !empty( $this->active_target_file ) && !empty( $this->target_file_contents ) )
>       {
>         if( false === $this->write_file_buffer( $this->active_target_file, $this->target_file_contents ) )
>         {
>           $this->num_errors++;
>           $logstring = "<span class='msgerror'> E".__LINE__." {$this->admtext['cantwrite']} %target:</span><span class='tgtfile'>$display_path</span><span class='tag'>%</span>&nbsp;";
>           break;
>         }
>         else
>         {
>           unset( $this->target_file_contents );
>         }
>       }
> 
>       $logstring = "{$this->admtext['line']} $line: <span class='tag'>%target:</span><span class='tgtfile'>$display_path</span><span class='tag'>%</span>&nbsp;";
> 
>       /* init variables for new target file and contents.*/
>       $this->target_file_contents = null;
>       $this->active_target_file = '';
>       $this->istarget = false;
> 
>       /* Read target file contents into a processing buffer.*/
>       $this->target_file_contents = $this->read_file_buffer( $target_filepath, $flag );
> 
>       /* Check status code from file read operation */
>       if( is_numeric( $this->target_file_contents ) )
>       {
>         $code = $this->target_file_contents;
>         $this->target_file_contents = '';
> 
>         if( $code == self::BYPASS )
>         {
>           $logstring .= "{$this->admtext['optmissing']}&nbsp;<span class='msgapproved'>{$this->admtext['bypassed']}</span>";
>           break;
>         }
>         elseif( $code == self::NOFOUL )
>         {
>           $logstring .= "<span class='msgapproved'>{$this->admtext['pronotfound']}</span>";
>           break;
>         }
>         elseif( $code == self::NOFILE )
>         {
>           $this->num_errors--;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['tgtmissing']}</span>";
>           break;
>         }
>         elseif( $code == self::NOWRITE )
>         {
>           $this->num_errors--;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['notwrite']}</span>";
>           break;
>         }
>         elseif( $code == self::ISEMPTY )
>         {
>           $this->num_errors--;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['emptyfile']}</span>";
>           break;
>         }
>         else
>         {
>           $this->num_errors--;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['errors']}</span>";
>           break;
>         }
>       }
>       else
>       {
>         $this->istarget = true;
>         $this->active_target_file = $target_filepath;
>         $logstring .= "{$this->admtext['opened']}";
>       }
>       break;
>     } // while(true) processing loop
> 
>     $this->add_logevent( $logstring );
>     return $i;
>   }
> 
>   private function _tngversion( $i )
>   {
>     return $i;
>   }
> 
>   private function _textexists( $i )
>   {
>     return $i;
>   }
> 
>   private function _triminsert( $location_datapack, $triminsert_datapack, $logstring )
>   {
>     /*  %triminsert directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == trimreplace:before or triminsert:after
>     **  $datapack['arg1'] == text for insertion into target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     $return_flag = true;
> 
>     /* Function is called by _location(), not by the main program.
>     **
>     ** The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     $location_snip = $location_datapack['arg1'];
> 
>     $triminsert_op = $triminsert_datapack['name']; // triminsert:before or triminsert:after
>     $triminsert_snip = $triminsert_datapack['arg1'];
> 
>     $logstring .= "(%$triminsert_op:)&nbsp;";
> 
>     if( $triminsert_op == 'triminsert:after')
>     {
>       $composite_text = $location_snip.$triminsert_snip;
>     }
>     elseif( $triminsert_op == 'triminsert:before')
>     {
>       $composite_text = $triminsert_snip.$location_snip;
>     }
> 
>     /* If composite replacement text is found, replace it with the original
>     ** location text. */
>     while( true )
>     {
> 
>       /* Find location of the triminsert text.*/
>       if( false !== $p = strpos( $this->target_file_contents, $composite_text ) )
>       {
>         $this->locations_found++;
>         $this->target_file_contents = str_replace( $composite_text, $location_snip, $this->target_file_contents, $count );
> 
>         if( $count == 1 )
>         {
>           $this->locations_removed++;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['removed']}</span>";
>           break;
>         }
> 
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['cantrem']}</span>";
>         $return_flag = false;
>         break;
>       }
> 
>       $logstring .= "<span class='msgapproved'>{$this->admtext['alreadyrem']}</span>";
>       break;
>     } // while(true) processing loop
> 
>     $this->add_logevent( $logstring );
>     return $return_flag;
>   } // _triminsert()
> 
>   private function _trimreplace( $location_datapack, $trimreplace_datapack, $logstring )
>   {
>     /*  %trimreplace directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == trimreplace
>     **  $datapack['arg1'] == replacement text for location in target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     $return_flag = true;
> 
>     /* Function is called by _location(), not by the main program.
>     **
>     ** The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     /* Use location code and replacement exactly as given in mod config file.
>     ** Trimreplace is not a block operations.
>     */
>     $location_snip = $location_datapack['arg1'];
> 
>     $trimreplace_snip = $trimreplace_datapack['arg1'];
> 
>     $logstring .= "(%trimreplace:)&nbsp;";
> 
> 
>     /* If replacement text is found, replace it with the original location text. */
>     while( true )
>     {
>       if( false !== strpos( $this->target_file_contents, $trimreplace_snip ) )
>       {
>         $this->locations_found++;
>         $this->target_file_contents = str_replace( $trimreplace_snip, $location_snip, $this->target_file_contents, $count );
> 
>         if( $count == 1 )
>         {
>           $this->locations_removed++;
>           $logstring .= "<span class='msgapproved'>{$this->admtext['removed']}</span>";
>           break;
>         }
> 
>         $this->num_errors++;
>         $logstring .= "<span class='msgerror'> E".__LINE__." {$this->admtext['cantrem']}</span>";
>         $return_flag = false;
>         break;
>       }
> 
>       $logstring .= "<span class='msgapproved'>{$this->admtext['alreadyrem']}</span>";
>       break;
>     } // while(true) processing loop
> 
>     $this->add_logevent( $logstring );
>     return $return_flag;
>   } // _trimreplace()
> 
>   private function _version( $i )
>   {
>     return $i;
>   }
> 
>   private function _vinsert( $location_datapack, $vinsert_datapack, $logstring )
>   {
>     /*  %vinsert directive datapack map
>     **  $datapack['line'] == line number where found in the cfg file
>     **  $datapack['name'] == vinsert:before or vinsert:after
>     **  $datapack['arg1'] == text to be inserted into the target file
>     **  $datapack['arg2'] == empty
>     **  $datapack['arg3'] == empty
>     **  $datapack['flag'] == empty
>     **  $datapack['goto'] == empty (not a conditional directive)
>     */
> 
>     /*
>     ** The log string ($logstring) has been started in the _location()
>     ** function.  It will be completed and registered here.
>     */
> 
>     $return_flag = true;
> 
>     /* Trim spaces and tabs from each end of the
>     ** Location snippet block to avoid unnecessary 'bad target' errors.
>     */
>     $location_block = trim( $location_datapack['arg1'], " \t" );
> 
>     /* vinsert:before, vinsert:after */
>     $vinsert_op = $vinsert_datapack['name'];
> 
>     $vinsert_block = $vinsert_datapack['arg1'];
> 
>     $vinsert_block = $vinsert_op == 'vinsert:before'
>       ? $vinsert_block."\r\n"  : "\r\n".$vinsert_block;
> 
>     $logstring .= "(%$vinsert_op%)&nbsp;";
> 
>     /* Start by replacing variable values with originals in vinsert snippet. */
>     preg_match_all( "#(\\$\w+\s*=\s*)[^;]+;#", $vinsert_block, $matches, PREG_SET_ORDER );
>     $vars = $matches;
> 
>     foreach( $vars as $var )
>     {
>       $this->target_file_contents = preg_replace( "#\\".$var[1]."[^;]+;#m", $var[0], $this->target_file_contents, 1 );
>     }
> 
>     /* Remove the original vinsert vars and values. */
>     if( false !== $p = strpos( $this->target_file_contents, $vinsert_block ) )
>     {
>       $this->locations_found++;
> 
>       // remove $nippet
>       $this->target_file_contents = str_replace( $vinsert_block, '', $this->target_file_contents, $count );
> 
>       /* Test success */
>       if( $count == 1 )
>       {
>         $this->locations_removed++;
>         $logstring .= "<span class='msgapproved'>{$this->admtext['modsrem']}</span>";
>         $this->add_logevent( $logstring );
>       }
>       elseif( $count == 0 )
>       {
>       // unable to remove vinserted
>         $this->num_errors++;
>         $logstring .=  "<span class='msgerror'> E".__LINE__." {$this->admtext['cantdel']}</span>";
>         $this->add_logevent( $logstrint );
>         $return_flag = false;
>       }
>       else /* Something bad happened ... */
>       {
>         $this->num_errors++;
>         $logstring .=  "<span class='msgerror'> E".__LINE__." {$this->admtext['cantdel']}</span>";
>         $this->add_logevent( $logstrint );
>         $return_flag = false;
>       }
>     }
>     else
>     {
>       $this->locations_removed++;
>       $logstring .= "<span class='msgapproved'>{$this->admtext['alreadyrem']}</span>";
>       $this->add_logevent( $logstrint );
>     }
> 
>     return $return_flag;
>   } // _vinsert()
> 
>   private function _wikipage( $i )
>   {
>     return $i;
>   }
336c1006
<    FUNCTIONS
---
>   SUPPORTING FUNCTIONS
338,383c1008,1070
<    private function remove_vinserts( &$buffer, $optag, $newcode, $logstring ) {
< 
<       $this->add_logevent( $logstring );
<       preg_match_all( "#(\\$[^\s=]+)\s*=+#sm", $newcode, $matches );
<       $vars = $matches[1];
< //print_r( $vars );exit;
<       $num_vars = count( $vars );
<       foreach( $vars as $var ) {
<          $terminator = '';
<          $pos = 0;
<          $epos = 0;
<          if( false !== $pos = strpos( $buffer, $var ) ) {
<             if( false !== $qpos = strpos( $buffer, "=", $pos ) ) {
<                // GET TERMINATOR
<                while( isset( $buffer[$qpos+1] ) ) {
<                   $qpos++;
<                   if( $buffer[$qpos] == " " || $buffer[$qpos] == "\t" ) continue;
<                   if( $buffer[$qpos] == "'" ) {
<                      $terminator = "';";
<                      break;
<                   }
<                   if( $buffer[$qpos] == '"' ) {
<                      $terminator = '";';
< 
<                   }
<                   $terminator = ";";
<                   break;
<                }
<                if( false !== $epos = strpos( $buffer, $terminator, $pos ) ) {
<                   $epos = strpos( $buffer, "\r\n", $epos );
<                }
<                $len = ($epos - $pos) + 2; // the crlf too
<                $buffer = substr_replace( $buffer,'',$pos,$len);
<             }
<          }
<          $logstring = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$var&nbsp;<span class=\"msgapproved\">{$this->admtext['removed']}</span>";
<          $this->add_logevent( $logstring );
<       }
<    }
< 
<    public function batch_remove( $cfgpathlist ) {
<       $this->batch_error = false;
<       foreach( $cfgpathlist as $cfgpath ) {
<          if( !$this->remove( $cfgpath ) ) {
<             $this->batch_error = true;
<          };
---
>   private function init_properties()
>   {
>     $this->locations_found = 0;
>     $this->locations_removed = 0;
>     $this->copyfiles_found = 0;
>     $this->copyfiles_removed = 0;
>     $this->copyfiles_protected = 0;
>     $this->newfiles_found = 0;
>     $this->newfiles_removed = 0;
>     $this->newfiles_protected = 0;
>     $this->directories_found = 0;
>     $this->directories_removed = 0;
>     $this->directories_not_empty = 0;
>     $this->num_errors = 0;
>   }
> 
>   /* Order directives directives in the parse table to suit removal.
>   ** For example, uncopy files to a mkdir folder before unmaking it.
>   */
>   private function arrange_parse_table( )
>   {
>     $mkdirs = array();
>     $copyfiles = array();
>     $others = array();
> 
>     // make new directories available for file copies
>     for( $i=0; isset($this->parse_table[$i]); $i++ )
>     {
>       /* Info directives stay at the top of the table.
>       ** When installing a mod mkdir comes before any file copies to it.
>       ** When removing a mod we place the mkdir directives at the end of the table
>       ** so that any files copied to them can be removed first -- (PHP rmdir cannot
>       ** delete a directory with content.)
>       */
>       /* Keep info directives at beginning of table */
> 
>       switch( $this->parse_table[$i]['name'] )
>       {
>         /* Remove directives that won't need to be uninstalled */
>         case 'name':
>         case 'version':
>         case 'description':
>         case 'note':
>         case 'private':
>         case 'author':
>         case 'wikipage':
>           break;
> 
>         /* Collect the mkdir directives */
>         case 'mkdir':
>           $mkdirs[] = $this->parse_table[$i];
>           break;
> 
>         /* Collect file copy and newfile directives */
>           case 'copyfile':
>           case 'copyfile2':
>           case 'newfile':
>             $copyfiles[] = $this->parse_table[$i];
>             break;
>         default:
>             /* Collect all other directives in order found */
>             $others[] = $this->parse_table[$i];
>           break;
385,386c1072,1096
<       return !$this->batch_error;
<    }
---
>     }
> 
>     /* Rebuild the parse table */
>     $this->parse_table = array();
>     foreach( $copyfiles as $copyfile )
>       $this->parse_table[] = $copyfile;
> 
>     foreach( $mkdirs as $mkdir)
>       $this->parse_table[] = $mkdir;
> 
>     foreach( $others as $other)
>       $this->parse_table[] = $other;
> 
>     return $this->parse_table;
>   } // arrange_parse_table()
> 
>   public function batch_remove( $cfgpathlist ) {
>     $this->batch_error = false;
>     foreach( $cfgpathlist as $cfgpath ) {
>        if( !$this->remove( $cfgpath ) ) {
>           $this->batch_error = true;
>        };
>     }
>     return !$this->batch_error;
>   }
389c1099,1132
< ?>
\ No newline at end of file
---
> function new_modremover()
> {
>   global $admtext, $tngconfig;
> 
>   require $tngconfig['subroot'].'mmconfig.php';
>   require $tngconfig['subroot'].'config.php';
> 
>   if( !isset( $admtext['modlist'] ) )
>   {
>     $textpart = 'mods';
>     $mylanguage = $_SESSION['session_language'];
>     require 'languages/'.$mylanguage.'/admintext.php';
>     /* Force reload cust_text.php */
>     require 'languages/'.$mylanguage.'/alltext.php';
>   }
>   require 'version.php';
>   $sitever = getSiteVersion();
>   $mhuser = isset( $_SESSION['currentuserdesc'] ) ? $_SESSION['currentuser'] : "";
> 
>   $objinits = array (
>     'rootpath'     => $rootpath,
>     'subroot'      => $tngconfig['subroot'],
>     'modspath'     => $modspath,
>     'extspath'     => $extspath,
>     'options'      => $options,
>     'time_offset'  => $time_offset,
>     'sitever'      => $sitever,
>     'currentuserdesc' => $mhuser,
>     'admtext'      => $admtext,
>     'tng_version'  => $tng_version
>   );
> 
>   return new modremover( $objinits );
> }
\ No newline at end of file
Only in TNG1403/classes: modvalidator.class.php
diff -r TNG/classes/version.php TNG1403/classes/version.php
1,3c1,2
< <?php // modmanager
< $mm_version = "v12.0 rev 18.03.02.060300";
< ?>
\ No newline at end of file
---
> <?php
> 	$mm_version="v14.0.2.a rev date 2023-02-20 11:25:22";
\ No newline at end of file
Only in TNG1403: class.exception.php
diff -r TNG/class.phpmailer.php TNG1403/class.phpmailer.php
1a2
> 
4,11c5,13
<  * PHP Version 5
<  * @package PHPMailer
<  * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
<  * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
<  * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
<  * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
<  * @author Brent R. Matzelle (original founder)
<  * @copyright 2012 - 2014 Marcus Bointon
---
>  * PHP Version 5.5.
>  *
>  * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
>  *
>  * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
>  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
>  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
>  * @author    Brent R. Matzelle (original founder)
>  * @copyright 2012 - 2020 Marcus Bointon
14,15c16,17
<  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
<  * @note This program is distributed in the hope that it will be useful - WITHOUT
---
>  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
>  * @note      This program is distributed in the hope that it will be useful - WITHOUT
19a22,23
> namespace PHPMailer\PHPMailer;
> 
22c26
<  * @package PHPMailer
---
>  *
30,34c34,61
<     /**
<      * The PHPMailer Version number.
<      * @var string
<      */
<     public $Version = '5.2.22';
---
>     const CHARSET_ASCII = 'us-ascii';
>     const CHARSET_ISO88591 = 'iso-8859-1';
>     const CHARSET_UTF8 = 'utf-8';
> 
>     const CONTENT_TYPE_PLAINTEXT = 'text/plain';
>     const CONTENT_TYPE_TEXT_CALENDAR = 'text/calendar';
>     const CONTENT_TYPE_TEXT_HTML = 'text/html';
>     const CONTENT_TYPE_MULTIPART_ALTERNATIVE = 'multipart/alternative';
>     const CONTENT_TYPE_MULTIPART_MIXED = 'multipart/mixed';
>     const CONTENT_TYPE_MULTIPART_RELATED = 'multipart/related';
> 
>     const ENCODING_7BIT = '7bit';
>     const ENCODING_8BIT = '8bit';
>     const ENCODING_BASE64 = 'base64';
>     const ENCODING_BINARY = 'binary';
>     const ENCODING_QUOTED_PRINTABLE = 'quoted-printable';
> 
>     const ENCRYPTION_STARTTLS = 'tls';
>     const ENCRYPTION_SMTPS = 'ssl';
> 
>     const ICAL_METHOD_REQUEST = 'REQUEST';
>     const ICAL_METHOD_PUBLISH = 'PUBLISH';
>     const ICAL_METHOD_REPLY = 'REPLY';
>     const ICAL_METHOD_ADD = 'ADD';
>     const ICAL_METHOD_CANCEL = 'CANCEL';
>     const ICAL_METHOD_REFRESH = 'REFRESH';
>     const ICAL_METHOD_COUNTER = 'COUNTER';
>     const ICAL_METHOD_DECLINECOUNTER = 'DECLINECOUNTER';
40c67,68
<      * @var integer
---
>      *
>      * @var int|null
42c70
<     public $Priority = null;
---
>     public $Priority;
45a74
>      *
48c77
<     public $CharSet = 'iso-8859-1';
---
>     public $CharSet = self::CHARSET_ISO88591;
51a81
>      *
54c84
<     public $ContentType = 'text/plain';
---
>     public $ContentType = self::CONTENT_TYPE_PLAINTEXT;
58a89
>      *
61c92
<     public $Encoding = '8bit';
---
>     public $Encoding = self::ENCODING_8BIT;
64a96
>      *
70a103
>      *
73c106
<     public $From = 'root@localhost';
---
>     public $From = '';
76a110
>      *
79c113
<     public $FromName = 'Root User';
---
>     public $FromName = '';
82,83c116,120
<      * The Sender email (Return-Path) of the message.
<      * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
---
>      * The envelope sender of the message.
>      * This will usually be turned into a Return-Path header by the receiver,
>      * and is the address that bounces will be sent to.
>      * If not empty, will be passed via `-f` to sendmail or as the 'MAIL FROM' value over SMTP.
>      *
89,98d125
<      * The Return-Path of the message.
<      * If empty, it will be set to either From or Sender.
<      * @var string
<      * @deprecated Email senders should never set a return-path header;
<      * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
<      * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
<      */
<     public $ReturnPath = '';
< 
<     /**
99a127
>      *
106a135
>      *
115a145
>      *
123,125c153,157
<      * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
<      * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
<      * @link http://kigkonsult.se/iCalcreator/
---
>      * To generate iCal event structures, use classes like EasyPeasyICS or iCalcreator.
>      *
>      * @see http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
>      * @see http://kigkonsult.se/iCalcreator/
>      *
130a163,178
>      * Value-array of "method" in Contenttype header "text/calendar"
>      *
>      * @var string[]
>      */
>     protected static $IcalMethods = [
>         self::ICAL_METHOD_REQUEST,
>         self::ICAL_METHOD_PUBLISH,
>         self::ICAL_METHOD_REPLY,
>         self::ICAL_METHOD_ADD,
>         self::ICAL_METHOD_CANCEL,
>         self::ICAL_METHOD_REFRESH,
>         self::ICAL_METHOD_COUNTER,
>         self::ICAL_METHOD_DECLINECOUNTER,
>     ];
> 
>     /**
132c180
<      * @access protected
---
>      *
138a187
>      *
140d188
<      * @access protected
145a194
>      *
147d195
<      * @access protected
154c202,205
<      * @var integer
---
>      *
>      * @see static::STD_LINE_LENGTH
>      *
>      * @var int
160a212
>      *
166a219
>      *
174c227,228
<      * @var boolean
---
>      *
>      * @var bool
179,186d232
<      * Path to PHPMailer plugins.
<      * Useful if the SMTP class is not in the PHP include path.
<      * @var string
<      * @deprecated Should not be needed now there is an autoloader.
<      */
<     public $PluginDir = '';
< 
<     /**
187a234
>      *
196a244,246
>      *
>      * @see PHPMailer::$Helo
>      *
205a256
>      *
206a258
>      *
213a266
>      *
226a280
>      *
233,234c287,288
<      * @var integer
<      * @TODO Why is this needed when the SMTP class takes care of it?
---
>      *
>      * @var int
239c293
<      * The SMTP HELO of the message.
---
>      * The SMTP HELO/EHLO name used for the SMTP connection.
242c296
<      * @var string
---
>      *
243a298,299
>      *
>      * @var string
249c305,306
<      * Options: '', 'ssl' or 'tls'
---
>      * Options: '', static::ENCRYPTION_STARTTLS, or static::ENCRYPTION_SMTPS.
>      *
258c315,316
<      * @var boolean
---
>      *
>      * @var bool
265c323
<      * @var boolean
---
>      *
267a326,327
>      *
>      * @var bool
272a333
>      *
275c336
<     public $SMTPOptions = array();
---
>     public $SMTPOptions = [];
278a340
>      *
284a347
>      *
291c354,355
<      * Options are CRAM-MD5, LOGIN, PLAIN, NTLM, XOAUTH2, attempted in that order if not specified
---
>      * Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2, attempted in that order if not specified.
>      *
297,299c361,363
<      * SMTP realm.
<      * Used for NTLM auth
<      * @var string
---
>      * An instance of the PHPMailer OAuth class.
>      *
>      * @var OAuth
301c365
<     public $Realm = '';
---
>     protected $oauth;
304,306c368,371
<      * SMTP workstation.
<      * Used for NTLM auth
<      * @var string
---
>      * The SMTP server timeout in seconds.
>      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
>      *
>      * @var int
308c373
<     public $Workstation = '';
---
>     public $Timeout = 300;
311,313c376,384
<      * The SMTP server timeout in seconds.
<      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
<      * @var integer
---
>      * Comma separated list of DSN notifications
>      * 'NEVER' under no circumstances a DSN must be returned to the sender.
>      *         If you use NEVER all other notifications will be ignored.
>      * 'SUCCESS' will notify you when your mail has arrived at its destination.
>      * 'FAILURE' will arrive if an error occurred during delivery.
>      * 'DELAY'   will notify you if there is an unusual delay in delivery, but the actual
>      *           delivery's outcome (success or failure) is not yet decided.
>      *
>      * @see https://tools.ietf.org/html/rfc3461 See section 4.1 for more information about NOTIFY
315c386
<     public $Timeout = 300;
---
>     public $dsn = '';
321,326c392,397
<      * * `0` No output
<      * * `1` Commands
<      * * `2` Data and commands
<      * * `3` As 2 plus connection status
<      * * `4` Low-level data output
<      * @var integer
---
>      * @see SMTP::DEBUG_OFF: No output
>      * @see SMTP::DEBUG_CLIENT: Client messages
>      * @see SMTP::DEBUG_SERVER: Client and server messages
>      * @see SMTP::DEBUG_CONNECTION: As SERVER plus connection status
>      * @see SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
>      *
327a399,400
>      *
>      * @var int
337c410
<      *
---
>      * By default PHPMailer will use `echo` if run from a `cli` or `cli-server` SAPI, `html` otherwise.
339c412,413
<      * <code>
---
>      *
>      * ```php
341,342c415,423
<      * </code>
<      * @var string|callable
---
>      * ```
>      *
>      * Alternatively, you can pass in an instance of a PSR-3 compatible logger, though only `debug`
>      * level output is used:
>      *
>      * ```php
>      * $mail->Debugoutput = new myPsr3Logger;
>      * ```
>      *
343a425,426
>      *
>      * @var string|callable|\Psr\Log\LoggerInterface
348,351c431,437
<      * Whether to keep SMTP connection open after each message.
<      * If this is set to true then to close the connection
<      * requires an explicit call to smtpClose().
<      * @var boolean
---
>      * Whether to keep the SMTP connection open after each message.
>      * If this is set to true then the connection will remain open after a send,
>      * and closing the connection will require an explicit call to smtpClose().
>      * It's a good idea to use this if you are sending multiple messages as it reduces overhead.
>      * See the mailing list example for how to use it.
>      *
>      * @var bool
359c445,448
<      * @var boolean
---
>      *
>      * @var bool
>      *
>      * @deprecated 6.0.0 PHPMailer isn't a mailing list manager!
364a454
>      *
366d455
<      * @TODO This should really not be public
368c457
<     public $SingleToArray = array();
---
>     protected $SingleToArray = [];
373,375c462,466
<      * @link https://en.wikipedia.org/wiki/Variable_envelope_return_path
<      * @link http://www.postfix.org/VERP_README.html Postfix VERP info
<      * @var boolean
---
>      *
>      * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
>      * @see http://www.postfix.org/VERP_README.html Postfix VERP info
>      *
>      * @var bool
381c472,473
<      * @var boolean
---
>      *
>      * @var bool
386,393d477
<      * The default line ending.
<      * @note The default remains "\n". We force CRLF where we know
<      *        it must be used via self::CRLF.
<      * @var string
<      */
<     public $LE = "\n";
< 
<     /**
394a479
>      *
401a487
>      *
408a495
>      *
414a502
>      *
415a504
>      *
420a510,525
>      * DKIM Copy header field values for diagnostic use.
>      *
>      * @var bool
>      */
>     public $DKIM_copyHeaderFields = true;
> 
>     /**
>      * DKIM Extra signing headers.
>      *
>      * @example ['List-Unsubscribe', 'List-Help']
>      *
>      * @var array
>      */
>     public $DKIM_extraHeaders = [];
> 
>     /**
421a527
>      *
427a534
>      *
428a536
>      *
442,445c550,553
<      *   boolean $result        result of the send action
<      *   string  $to            email address of the recipient
<      *   string  $cc            cc email addresses
<      *   string  $bcc           bcc email addresses
---
>      *   bool $result        result of the send action
>      *   array   $to            email addresses of the recipients
>      *   array   $cc            cc email addresses
>      *   array   $bcc           bcc email addresses
448a557,559
>      *   string  $extra         extra information of possible use
>      *                          "smtp_transaction_id' => last smtp transaction id
>      *
455,456c566,568
<      * Options: An empty string for PHPMailer default, whitespace for none, or a string to use
<      * @var string
---
>      * Options: An empty string for PHPMailer default, whitespace/null for none, or a string to use.
>      *
>      * @var string|null
462a575,576
>      * The default validator uses PHP's FILTER_VALIDATE_EMAIL filter_var option.
>      *
463a578
>      *
465d579
<      * @static
467c581
<     public static $validator = 'auto';
---
>     public static $validator = 'php';
470a585
>      *
472d586
<      * @access protected
474c588
<     protected $smtp = null;
---
>     protected $smtp;
477a592
>      *
479d593
<      * @access protected
481c595
<     protected $to = array();
---
>     protected $to = [];
484a599
>      *
486d600
<      * @access protected
488c602
<     protected $cc = array();
---
>     protected $cc = [];
491a606
>      *
493d607
<      * @access protected
495c609
<     protected $bcc = array();
---
>     protected $bcc = [];
498a613
>      *
500d614
<      * @access protected
502c616
<     protected $ReplyTo = array();
---
>     protected $ReplyTo = [];
506c620,625
<      * Includes all of $to, $cc, $bcc
---
>      * Includes all of $to, $cc, $bcc.
>      *
>      * @see PHPMailer::$to
>      * @see PHPMailer::$cc
>      * @see PHPMailer::$bcc
>      *
508,509d626
<      * @access protected
<      * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
511c628
<     protected $all_recipients = array();
---
>     protected $all_recipients = [];
518,520c635,638
<      * @var array
<      * @access protected
<      * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
---
>      *
>      * @see PHPMailer::$to
>      * @see PHPMailer::$cc
>      * @see PHPMailer::$bcc
521a640,641
>      *
>      * @var array
523c643
<     protected $RecipientsQueue = array();
---
>     protected $RecipientsQueue = [];
529,530c649
<      * @var array
<      * @access protected
---
>      *
531a651,652
>      *
>      * @var array
533c654
<     protected $ReplyToQueue = array();
---
>     protected $ReplyToQueue = [];
536a658
>      *
538d659
<      * @access protected
540c661
<     protected $attachment = array();
---
>     protected $attachment = [];
543a665
>      *
545d666
<      * @access protected
547c668
<     protected $CustomHeader = array();
---
>     protected $CustomHeader = [];
550a672
>      *
552d673
<      * @access protected
557a679
>      *
559d680
<      * @access protected
564a686
>      *
566d687
<      * @access protected
568c689
<     protected $boundary = array();
---
>     protected $boundary = [];
571c692,693
<      * The array of available languages.
---
>      * The array of available text strings for the current language.
>      *
573d694
<      * @access protected
575c696
<     protected $language = array();
---
>     protected $language = [];
579,580c700,701
<      * @var integer
<      * @access protected
---
>      *
>      * @var int
585a707
>      *
587d708
<      * @access protected
592a714
>      *
594d715
<      * @access protected
599a721
>      *
601d722
<      * @access protected
607a729
>      *
609d730
<      * @access protected
615,616c736,737
<      * @var boolean
<      * @access protected
---
>      *
>      * @var bool
621a743
>      *
623d744
<      * @access protected
627a749,755
>      * The PHPMailer Version number.
>      *
>      * @var string
>      */
>     const VERSION = '6.5.3';
> 
>     /**
628a757,758
>      *
>      * @var int
633a764,765
>      *
>      * @var int
638a771,772
>      *
>      * @var int
643c777,778
<      * SMTP RFC standard line ending.
---
>      * The SMTP standard CRLF line break.
>      * If you want to change line break format, change static::$LE, not this.
648,649c783,807
<      * The maximum line length allowed by RFC 2822 section 2.1.1
<      * @var integer
---
>      * "Folding White Space" a white space string used for line folding.
>      */
>     const FWS = ' ';
> 
>     /**
>      * SMTP RFC standard line ending; Carriage Return, Line Feed.
>      *
>      * @var string
>      */
>     protected static $LE = self::CRLF;
> 
>     /**
>      * The maximum line length supported by mail().
>      *
>      * Background: mail() will sometimes corrupt messages
>      * with headers headers longer than 65 chars, see #818.
>      *
>      * @var int
>      */
>     const MAIL_MAX_LINE_LENGTH = 63;
> 
>     /**
>      * The maximum line length allowed by RFC 2822 section 2.1.1.
>      *
>      * @var int
653a812,821
>      * The lower maximum line length allowed by RFC 2822 section 2.1.1.
>      * This length does NOT include the line break
>      * 76 means that lines will be 77 or 78 chars depending on whether
>      * the line break format is LF or CRLF; both are valid.
>      *
>      * @var int
>      */
>     const STD_LINE_LENGTH = 76;
> 
>     /**
655c823,824
<      * @param boolean $exceptions Should we throw external exceptions?
---
>      *
>      * @param bool $exceptions Should we throw external exceptions?
659,660c828,829
<         if ($exceptions !== null) {
<             $this->exceptions = (boolean)$exceptions;
---
>         if (null !== $exceptions) {
>             $this->exceptions = (bool) $exceptions;
661a831,832
>         //Pick an appropriate debug output format automatically
>         $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
677,684c848,856
<      * but it will do)
<      * @param string $to To
<      * @param string $subject Subject
<      * @param string $body Message Body
<      * @param string $header Additional Header(s)
<      * @param string $params Params
<      * @access private
<      * @return boolean
---
>      * but it will do).
>      *
>      * @param string      $to      To
>      * @param string      $subject Subject
>      * @param string      $body    Message Body
>      * @param string      $header  Additional Header(s)
>      * @param string|null $params  Params
>      *
>      * @return bool
694,697c866,873
< 
<         //Can't use additional_parameters in safe_mode, calling mail() with null params breaks
<         //@link http://php.net/manual/en/function.mail.php
<         if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) {
---
>         //Calling mail() with null params breaks
>         $this->edebug('Sending with mail()');
>         $this->edebug('Sendmail path: ' . ini_get('sendmail_path'));
>         $this->edebug("Envelope sender: {$this->Sender}");
>         $this->edebug("To: {$to}");
>         $this->edebug("Subject: {$subject}");
>         $this->edebug("Headers: {$header}");
>         if (!$this->UseSendmailOptions || null === $params) {
699a876
>             $this->edebug("Additional params: {$params}");
701a879
>         $this->edebug('Result: ' . ($result ? 'true' : 'false'));
703a882
> 
705,706c884,886
<      * Output debugging info via user-defined method.
<      * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
---
>      * Output debugging info via a user-defined method.
>      * Only generates output if debug output is enabled.
>      *
708a889
>      *
715a897,902
>         //Is this a PSR-3 logger?
>         if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
>             $this->Debugoutput->debug($str);
> 
>             return;
>         }
717c904
<         if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
---
>         if (is_callable($this->Debugoutput) && !in_array($this->Debugoutput, ['error_log', 'html', 'echo'])) {
718a906
> 
723a912
>                 /** @noinspection ForgottenDebugOutputInspection */
732,733c921
<                 )
<                 . "<br>\n";
---
>                 ), "<br>\n";
738,743c926,938
<                 $str = preg_replace('/\r\n?/ms', "\n", $str);
<                 echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
<                     "\n",
<                     "\n                   \t                  ",
<                     trim($str)
<                 ) . "\n";
---
>                 $str = preg_replace('/\r\n|\r/m', "\n", $str);
>                 echo gmdate('Y-m-d H:i:s'),
>                 "\t",
>                     //Trim trailing space
>                 trim(
>                     //Indent for readability, except for trailing break
>                     str_replace(
>                         "\n",
>                         "\n                   \t                  ",
>                         trim($str)
>                     )
>                 ),
>                 "\n";
749,750c944,945
<      * @param boolean $isHtml True for HTML mode.
<      * @return void
---
>      *
>      * @param bool $isHtml True for HTML mode
755c950
<             $this->ContentType = 'text/html';
---
>             $this->ContentType = static::CONTENT_TYPE_TEXT_HTML;
757c952
<             $this->ContentType = 'text/plain';
---
>             $this->ContentType = static::CONTENT_TYPE_PLAINTEXT;
763d957
<      * @return void
772d965
<      * @return void
781d973
<      * @return void
787c979
<         if (!stristr($ini_sendmail_path, 'sendmail')) {
---
>         if (false === stripos($ini_sendmail_path, 'sendmail')) {
797d988
<      * @return void
803c994
<         if (!stristr($ini_sendmail_path, 'qmail')) {
---
>         if (false === stripos($ini_sendmail_path, 'qmail')) {
812a1004
>      *
815c1007,1010
<      * @return boolean true on success, false if address already used or invalid in some way
---
>      *
>      * @throws Exception
>      *
>      * @return bool true on success, false if address already used or invalid in some way
824c1019
<      * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
---
>      *
827c1022,1025
<      * @return boolean true on success, false if address already used or invalid in some way
---
>      *
>      * @throws Exception
>      *
>      * @return bool true on success, false if address already used or invalid in some way
836c1034
<      * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
---
>      *
839c1037,1040
<      * @return boolean true on success, false if address already used or invalid in some way
---
>      *
>      * @throws Exception
>      *
>      * @return bool true on success, false if address already used or invalid in some way
847a1049
>      *
850c1052,1055
<      * @return boolean true on success, false if address already used or invalid in some way
---
>      *
>      * @throws Exception
>      *
>      * @return bool true on success, false if address already used or invalid in some way
862c1067,1068
<      * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
---
>      *
>      * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
865,867c1071,1074
<      * @throws phpmailerException
<      * @return boolean true on success, false if address already used or invalid in some way
<      * @access protected
---
>      *
>      * @throws Exception
>      *
>      * @return bool true on success, false if address already used or invalid in some way
873,875c1080,1088
<         if (($pos = strrpos($address, '@')) === false) {
<             // At-sign is misssing.
<             $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
---
>         $pos = strrpos($address, '@');
>         if (false === $pos) {
>             //At-sign is missing.
>             $error_message = sprintf(
>                 '%s (%s): %s',
>                 $this->lang('invalid_address'),
>                 $kind,
>                 $address
>             );
879c1092
<                 throw new phpmailerException($error_message);
---
>                 throw new Exception($error_message);
880a1094
> 
883,886c1097,1100
<         $params = array($kind, $address, $name);
<         // Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
<         if ($this->has8bitChars(substr($address, ++$pos)) and $this->idnSupported()) {
<             if ($kind != 'Reply-To') {
---
>         $params = [$kind, $address, $name];
>         //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
>         if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
>             if ('Reply-To' !== $kind) {
888a1103
> 
891,895c1106,1109
<             } else {
<                 if (!array_key_exists($address, $this->ReplyToQueue)) {
<                     $this->ReplyToQueue[$address] = $params;
<                     return true;
<                 }
---
>             } elseif (!array_key_exists($address, $this->ReplyToQueue)) {
>                 $this->ReplyToQueue[$address] = $params;
> 
>                 return true;
896a1111
> 
899,900c1114,1116
<         // Immediately add standard addresses without IDN.
<         return call_user_func_array(array($this, 'addAnAddress'), $params);
---
> 
>         //Immediately add standard addresses without IDN.
>         return call_user_func_array([$this, 'addAnAddress'], $params);
906c1122,1123
<      * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
---
>      *
>      * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
909,911c1126,1129
<      * @throws phpmailerException
<      * @return boolean true on success, false if address already used or invalid in some way
<      * @access protected
---
>      *
>      * @throws Exception
>      *
>      * @return bool true on success, false if address already used or invalid in some way
915,916c1133,1138
<         if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) {
<             $error_message = $this->lang('Invalid recipient kind: ') . $kind;
---
>         if (!in_array($kind, ['to', 'cc', 'bcc', 'Reply-To'])) {
>             $error_message = sprintf(
>                 '%s: %s',
>                 $this->lang('Invalid recipient kind'),
>                 $kind
>             );
920c1142
<                 throw new phpmailerException($error_message);
---
>                 throw new Exception($error_message);
921a1144
> 
924,925c1147,1153
<         if (!$this->validateAddress($address)) {
<             $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
---
>         if (!static::validateAddress($address)) {
>             $error_message = sprintf(
>                 '%s (%s): %s',
>                 $this->lang('invalid_address'),
>                 $kind,
>                 $address
>             );
929c1157
<                 throw new phpmailerException($error_message);
---
>                 throw new Exception($error_message);
930a1159
> 
933c1162
<         if ($kind != 'Reply-To') {
---
>         if ('Reply-To' !== $kind) {
935c1164
<                 array_push($this->$kind, array($address, $name));
---
>                 $this->{$kind}[] = [$address, $name];
936a1166
> 
939,943c1169,1172
<         } else {
<             if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
<                 $this->ReplyTo[strtolower($address)] = array($address, $name);
<                 return true;
<             }
---
>         } elseif (!array_key_exists(strtolower($address), $this->ReplyTo)) {
>             $this->ReplyTo[strtolower($address)] = [$address, $name];
> 
>             return true;
944a1174
> 
952a1183,1185
>      *
>      * @see http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
>      *
954c1187,1189
<      * @param bool $useimap Whether to use the IMAP extension to parse the list
---
>      * @param bool   $useimap Whether to use the IMAP extension to parse the list
>      * @param string $charset The charset to use when decoding the address list string.
>      *
956d1190
<      * @link http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
958c1192
<     public function parseAddresses($addrstr, $useimap = true)
---
>     public static function parseAddresses($addrstr, $useimap = true, $charset = self::CHARSET_ISO88591)
960,961c1194,1195
<         $addresses = array();
<         if ($useimap and function_exists('imap_rfc822_parse_adrlist')) {
---
>         $addresses = [];
>         if ($useimap && function_exists('imap_rfc822_parse_adrlist')) {
963a1198,1199
>             // Clear any potential IMAP errors to get rid of notices being thrown at end of script.
>             imap_errors();
965,970c1201,1218
<                 if ($address->host != '.SYNTAX-ERROR.') {
<                     if ($this->validateAddress($address->mailbox . '@' . $address->host)) {
<                         $addresses[] = array(
<                             'name' => (property_exists($address, 'personal') ? $address->personal : ''),
<                             'address' => $address->mailbox . '@' . $address->host
<                         );
---
>                 if (
>                     '.SYNTAX-ERROR.' !== $address->host &&
>                     static::validateAddress($address->mailbox . '@' . $address->host)
>                 ) {
>                     //Decode the name part if it's present and encoded
>                     if (
>                         property_exists($address, 'personal') &&
>                         //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
>                         defined('MB_CASE_UPPER') &&
>                         preg_match('/^=\?.*\?=$/s', $address->personal)
>                     ) {
>                         $origCharset = mb_internal_encoding();
>                         mb_internal_encoding($charset);
>                         //Undo any RFC2047-encoded spaces-as-underscores
>                         $address->personal = str_replace('_', '=20', $address->personal);
>                         //Decode the name
>                         $address->personal = mb_decode_mimeheader($address->personal);
>                         mb_internal_encoding($origCharset);
971a1220,1224
> 
>                     $addresses[] = [
>                         'name' => (property_exists($address, 'personal') ? $address->personal : ''),
>                         'address' => $address->mailbox . '@' . $address->host,
>                     ];
982,983c1235,1236
<                     if ($this->validateAddress($address)) {
<                         $addresses[] = array(
---
>                     if (static::validateAddress($address)) {
>                         $addresses[] = [
985,986c1238,1239
<                             'address' => $address
<                         );
---
>                             'address' => $address,
>                         ];
991,995c1244,1261
<                     if ($this->validateAddress($email)) {
<                         $addresses[] = array(
<                             'name' => trim(str_replace(array('"', "'"), '', $name)),
<                             'address' => $email
<                         );
---
>                     $name = trim($name);
>                     if (static::validateAddress($email)) {
>                         //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
>                         //If this name is encoded, decode it
>                         if (defined('MB_CASE_UPPER') && preg_match('/^=\?.*\?=$/s', $name)) {
>                             $origCharset = mb_internal_encoding();
>                             mb_internal_encoding($charset);
>                             //Undo any RFC2047-encoded spaces-as-underscores
>                             $name = str_replace('_', '=20', $name);
>                             //Decode the name
>                             $name = mb_decode_mimeheader($name);
>                             mb_internal_encoding($origCharset);
>                         }
>                         $addresses[] = [
>                             //Remove any surrounding quotes and spaces from the name
>                             'name' => trim($name, '\'" '),
>                             'address' => $email,
>                         ];
999a1266
> 
1004a1272
>      *
1007,1009c1275,1279
<      * @param boolean $auto Whether to also set the Sender address, defaults to true
<      * @throws phpmailerException
<      * @return boolean
---
>      * @param bool   $auto    Whether to also set the Sender address, defaults to true
>      *
>      * @throws Exception
>      *
>      * @return bool
1015,1019c1285,1296
<         // Don't validate now addresses with IDN. Will be done in send().
<         if (($pos = strrpos($address, '@')) === false or
<             (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and
<             !$this->validateAddress($address)) {
<             $error_message = $this->lang('invalid_address') . " (setFrom) $address";
---
>         //Don't validate now addresses with IDN. Will be done in send().
>         $pos = strrpos($address, '@');
>         if (
>             (false === $pos)
>             || ((!$this->has8bitChars(substr($address, ++$pos)) || !static::idnSupported())
>             && !static::validateAddress($address))
>         ) {
>             $error_message = sprintf(
>                 '%s (From): %s',
>                 $this->lang('invalid_address'),
>                 $address
>             );
1023c1300
<                 throw new phpmailerException($error_message);
---
>                 throw new Exception($error_message);
1024a1302
> 
1029,1032c1307,1308
<         if ($auto) {
<             if (empty($this->Sender)) {
<                 $this->Sender = $address;
<             }
---
>         if ($auto && empty($this->Sender)) {
>             $this->Sender = $address;
1033a1310
> 
1041a1319
>      *
1051,1052c1329
<      * @param string $address The email address to check
<      * @param string|callable $patternselect A selector for the validation pattern to use :
---
>      * Validation patterns supported:
1054c1331
<      * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
---
>      * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0;
1059a1337,1338
>      *
>      * ```php
1062a1342,1343
>      * ```
>      *
1064,1066c1345,1349
<      * @return boolean
<      * @static
<      * @access public
---
>      *
>      * @param string          $address       The email address to check
>      * @param string|callable $patternselect Which pattern to use
>      *
>      * @return bool
1070,1071c1353,1354
<         if (is_null($patternselect)) {
<             $patternselect = self::$validator;
---
>         if (null === $patternselect) {
>             $patternselect = static::$validator;
1073c1356,1357
<         if (is_callable($patternselect)) {
---
>         //Don't allow strings as callables, see SECURITY.md and CVE-2021-3603
>         if (is_callable($patternselect) && !is_string($patternselect)) {
1077c1361
<         if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) {
---
>         if (strpos($address, "\n") !== false || strpos($address, "\r") !== false) {
1080,1101d1363
<         if (!$patternselect or $patternselect == 'auto') {
<             //Check this constant first so it works when extension_loaded() is disabled by safe mode
<             //Constant was added in PHP 5.2.4
<             if (defined('PCRE_VERSION')) {
<                 //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
<                 if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
<                     $patternselect = 'pcre8';
<                 } else {
<                     $patternselect = 'pcre';
<                 }
<             } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
<                 //Fall back to older PCRE
<                 $patternselect = 'pcre';
<             } else {
<                 //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
<                 if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
<                     $patternselect = 'php';
<                 } else {
<                     $patternselect = 'noregex';
<                 }
<             }
<         }
1102a1365
>             case 'pcre': //Kept for BC
1104,1106c1367,1379
<                 /**
<                  * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
<                  * @link http://squiloople.com/2009/12/20/email-address-validation/
---
>                 /*
>                  * A more complex and more permissive version of the RFC5322 regex on which FILTER_VALIDATE_EMAIL
>                  * is based.
>                  * In addition to the addresses allowed by filter_var, also permits:
>                  *  * dotless domains: `a@b`
>                  *  * comments: `1234 @ local(blah) .machine .example`
>                  *  * quoted elements: `'"test blah"@example.org'`
>                  *  * numeric TLDs: `a@b.123`
>                  *  * unbracketed IPv4 literals: `a@192.168.0.1`
>                  *  * IPv6 literals: 'first.last@[IPv6:a1::]'
>                  * Not all of these will necessarily work for sending!
>                  *
>                  * @see       http://squiloople.com/2009/12/20/email-address-validation/
1110c1383
<                 return (boolean)preg_match(
---
>                 return (bool) preg_match(
1122,1136d1394
<             case 'pcre':
<                 //An older regex that doesn't need a recent PCRE
<                 return (boolean)preg_match(
<                     '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
<                     '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
<                     '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
<                     '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
<                     '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
<                     '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
<                     '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
<                     '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
<                     '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
<                     '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
<                     $address
<                 );
1138c1396
<                 /**
---
>                 /*
1140c1398,1399
<                  * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
---
>                  *
>                  * @see https://html.spec.whatwg.org/#e-mail-state-(type=email)
1142c1401
<                 return (boolean)preg_match(
---
>                 return (bool) preg_match(
1147,1152d1405
<             case 'noregex':
<                 //No PCRE! Do something _very_ approximate!
<                 //Check the address is 3 chars or longer and contains an @ that's not the first or last char
<                 return (strlen($address) >= 3
<                     and strpos($address, '@') >= 1
<                     and strpos($address, '@') != strlen($address) - 1);
1155c1408
<                 return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
---
>                 return filter_var($address, FILTER_VALIDATE_EMAIL) !== false;
1161,1162c1414,1416
<      * "intl" and "mbstring" PHP extensions.
<      * @return bool "true" if required functions for IDN support are present
---
>      * `intl` and `mbstring` PHP extensions.
>      *
>      * @return bool `true` if required functions for IDN support are present
1164c1418
<     public function idnSupported()
---
>     public static function idnSupported()
1166,1167c1420
<         // @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2.
<         return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding');
---
>         return function_exists('idn_to_ascii') && function_exists('mb_convert_encoding');
1176c1429,1430
<      *   or fails for any reason (e.g. domain has characters not allowed in an IDN)
---
>      *   or fails for any reason (e.g. domain contains characters not allowed in an IDN).
>      *
1177a1432
>      *
1178a1434
>      *
1183,1186c1439,1445
<         // Verify we have required functions, CharSet, and at-sign.
<         if ($this->idnSupported() and
<             !empty($this->CharSet) and
<             ($pos = strrpos($address, '@')) !== false) {
---
>         //Verify we have required functions, CharSet, and at-sign.
>         $pos = strrpos($address, '@');
>         if (
>             !empty($this->CharSet) &&
>             false !== $pos &&
>             static::idnSupported()
>         ) {
1188,1193c1447,1468
<             // Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
<             if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) {
<                 $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet);
<                 if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ?
<                     idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) :
<                     idn_to_ascii($domain)) !== false) {
---
>             //Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
>             if ($this->has8bitChars($domain) && @mb_check_encoding($domain, $this->CharSet)) {
>                 //Convert the domain from whatever charset it's in to UTF-8
>                 $domain = mb_convert_encoding($domain, self::CHARSET_UTF8, $this->CharSet);
>                 //Ignore IDE complaints about this line - method signature changed in PHP 5.4
>                 $errorcode = 0;
>                 if (defined('INTL_IDNA_VARIANT_UTS46')) {
>                     //Use the current punycode standard (appeared in PHP 7.2)
>                     $punycode = idn_to_ascii(
>                         $domain,
>                         \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI |
>                             \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII,
>                         \INTL_IDNA_VARIANT_UTS46
>                     );
>                 } elseif (defined('INTL_IDNA_VARIANT_2003')) {
>                     //Fall back to this old, deprecated/removed encoding
>                     $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_2003);
>                 } else {
>                     //Fall back to a default we don't know about
>                     $punycode = idn_to_ascii($domain, $errorcode);
>                 }
>                 if (false !== $punycode) {
1197a1473
> 
1204,1205c1480,1483
<      * @throws phpmailerException
<      * @return boolean false on error - See the ErrorInfo property for details of the error.
---
>      *
>      * @throws Exception
>      *
>      * @return bool false on error - See the ErrorInfo property for details of the error
1212a1491
> 
1214c1493
<         } catch (phpmailerException $exc) {
---
>         } catch (Exception $exc) {
1219a1499
> 
1226,1227c1506,1509
<      * @throws phpmailerException
<      * @return boolean
---
>      *
>      * @throws Exception
>      *
>      * @return bool
1230a1513,1534
>         if (
>             'smtp' === $this->Mailer
>             || ('mail' === $this->Mailer && (\PHP_VERSION_ID >= 80000 || stripos(PHP_OS, 'WIN') === 0))
>         ) {
>             //SMTP mandates RFC-compliant line endings
>             //and it's also used with mail() on Windows
>             static::setLE(self::CRLF);
>         } else {
>             //Maintain backward compatibility with legacy Linux command line mailers
>             static::setLE(PHP_EOL);
>         }
>         //Check for buggy PHP versions that add a header with an incorrect line break
>         if (
>             'mail' === $this->Mailer
>             && ((\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70017)
>                 || (\PHP_VERSION_ID >= 70100 && \PHP_VERSION_ID < 70103))
>             && ini_get('mail.add_x_header') === '1'
>             && stripos(PHP_OS, 'WIN') === 0
>         ) {
>             trigger_error($this->lang('buggy_php'), E_USER_WARNING);
>         }
> 
1232c1536
<             $this->error_count = 0; // Reset errors
---
>             $this->error_count = 0; //Reset errors
1235c1539
<             // Dequeue recipient and Reply-To addresses with IDN
---
>             //Dequeue recipient and Reply-To addresses with IDN
1238c1542
<                 call_user_func_array(array($this, 'addAnAddress'), $params);
---
>                 call_user_func_array([$this, 'addAnAddress'], $params);
1240,1241c1544,1545
<             if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
<                 throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
---
>             if (count($this->to) + count($this->cc) + count($this->bcc) < 1) {
>                 throw new Exception($this->lang('provide_address'), self::STOP_CRITICAL);
1244,1245c1548,1549
<             // Validate From, Sender, and ConfirmReadingTo addresses
<             foreach (array('From', 'Sender', 'ConfirmReadingTo') as $address_kind) {
---
>             //Validate From, Sender, and ConfirmReadingTo addresses
>             foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
1251,1252c1555,1561
<                 if (!$this->validateAddress($this->$address_kind)) {
<                     $error_message = $this->lang('invalid_address') . ' (punyEncode) ' . $this->$address_kind;
---
>                 if (!static::validateAddress($this->$address_kind)) {
>                     $error_message = sprintf(
>                         '%s (%s): %s',
>                         $this->lang('invalid_address'),
>                         $address_kind,
>                         $this->$address_kind
>                     );
1256c1565
<                         throw new phpmailerException($error_message);
---
>                         throw new Exception($error_message);
1257a1567
> 
1262c1572
<             // Set whether the message is multipart/alternative
---
>             //Set whether the message is multipart/alternative
1264c1574
<                 $this->ContentType = 'multipart/alternative';
---
>                 $this->ContentType = static::CONTENT_TYPE_MULTIPART_ALTERNATIVE;
1268,1270c1578,1580
<             // Refuse to send an empty message unless we are specifically allowing it
<             if (!$this->AllowEmpty and empty($this->Body)) {
<                 throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
---
>             //Refuse to send an empty message unless we are specifically allowing it
>             if (!$this->AllowEmpty && empty($this->Body)) {
>                 throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
1273c1583,1585
<             // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
---
>             //Trim subject consistently
>             $this->Subject = trim($this->Subject);
>             //Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
1276c1588
<             // createBody may have added some headers, so retain them
---
>             //createBody may have added some headers, so retain them
1281,1283c1593,1595
<             // To capture the complete message when using mail(), create
<             // an extra header list which createHeader() doesn't fold in
<             if ($this->Mailer == 'mail') {
---
>             //To capture the complete message when using mail(), create
>             //an extra header list which createHeader() doesn't fold in
>             if ('mail' === $this->Mailer) {
1291c1603
<                     $this->encodeHeader($this->secureHeader(trim($this->Subject)))
---
>                     $this->encodeHeader($this->secureHeader($this->Subject))
1295,1296c1607,1609
<             // Sign with DKIM if enabled
<             if (!empty($this->DKIM_domain)
---
>             //Sign with DKIM if enabled
>             if (
>                 !empty($this->DKIM_domain)
1299c1612,1615
<                    || (!empty($this->DKIM_private) && file_exists($this->DKIM_private))
---
>                     || (!empty($this->DKIM_private)
>                         && static::isPermittedPath($this->DKIM_private)
>                         && file_exists($this->DKIM_private)
>                     )
1307,1308c1623,1624
<                 $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
<                     str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
---
>                 $this->MIMEHeader = static::stripTrailingWSP($this->MIMEHeader) . static::$LE .
>                     static::normalizeBreaks($header_dkim) . static::$LE;
1309a1626
> 
1311c1628
<         } catch (phpmailerException $exc) {
---
>         } catch (Exception $exc) {
1315a1633
> 
1321,1324c1639,1643
<      * Actually send a message.
<      * Send the email via the selected mechanism
<      * @throws phpmailerException
<      * @return boolean
---
>      * Actually send a message via the selected mechanism.
>      *
>      * @throws Exception
>      *
>      * @return bool
1329c1648
<             // Choose the mailer and send through it
---
>             //Choose the mailer and send through it
1339c1658
<                     $sendMethod = $this->Mailer.'Send';
---
>                     $sendMethod = $this->Mailer . 'Send';
1346c1665,1668
<         } catch (phpmailerException $exc) {
---
>         } catch (Exception $exc) {
>             if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
>                 $this->smtp->reset();
>             }
1352a1675
> 
1358,1359c1681
<      * @param string $header The message headers
<      * @param string $body The message body
---
>      *
1361,1363c1683,1689
<      * @throws phpmailerException
<      * @access protected
<      * @return boolean
---
>      *
>      * @param string $header The message headers
>      * @param string $body   The message body
>      *
>      * @throws Exception
>      *
>      * @return bool
1367,1369c1693,1715
<         // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
<         if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
<             if ($this->Mailer == 'qmail') {
---
>         if ($this->Mailer === 'qmail') {
>             $this->edebug('Sending with qmail');
>         } else {
>             $this->edebug('Sending with sendmail');
>         }
>         $header = static::stripTrailingWSP($header) . static::$LE . static::$LE;
>         //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
>         //A space after `-f` is optional, but there is a long history of its presence
>         //causing problems, so we don't use one
>         //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
>         //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
>         //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
>         //Example problem: https://www.drupal.org/node/1057954
> 
>         //PHP 5.6 workaround
>         $sendmail_from_value = ini_get('sendmail_from');
>         if (empty($this->Sender) && !empty($sendmail_from_value)) {
>             //PHP config has a sender address we can use
>             $this->Sender = ini_get('sendmail_from');
>         }
>         //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
>         if (!empty($this->Sender) && static::validateAddress($this->Sender) && self::isShellSafe($this->Sender)) {
>             if ($this->Mailer === 'qmail') {
1375,1379c1721,1726
<             if ($this->Mailer == 'qmail') {
<                 $sendmailFmt = '%s';
<             } else {
<                 $sendmailFmt = '%s -oi -t';
<             }
---
>             //allow sendmail to choose a default envelope sender. It may
>             //seem preferable to force it to use the From header as with
>             //SMTP, but that introduces new problems (see
>             //<https://github.com/PHPMailer/PHPMailer/issues/2298>), and
>             //it has historically worked this way.
>             $sendmailFmt = '%s -oi -t';
1382d1728
<         // TODO: If possible, this should be changed to escapeshellarg.  Needs thorough testing.
1383a1730,1733
>         $this->edebug('Sendmail path: ' . $this->Sendmail);
>         $this->edebug('Sendmail command: ' . $sendmail);
>         $this->edebug('Envelope sender: ' . $this->Sender);
>         $this->edebug("Headers: {$header}");
1387,1392c1737,1744
<                 if (!@$mail = popen($sendmail, 'w')) {
<                     throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
<                 }
<                 fputs($mail, 'To: ' . $toAddr . "\n");
<                 fputs($mail, $header);
<                 fputs($mail, $body);
---
>                 $mail = @popen($sendmail, 'w');
>                 if (!$mail) {
>                     throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
>                 }
>                 $this->edebug("To: {$toAddr}");
>                 fwrite($mail, 'To: ' . $toAddr . "\n");
>                 fwrite($mail, $header);
>                 fwrite($mail, $body);
1393a1746
>                 $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
1395,1396c1748,1749
<                     ($result == 0),
<                     array($toAddr),
---
>                     ($result === 0),
>                     [[$addrinfo['address'], $addrinfo['name']]],
1401c1754,1755
<                     $this->From
---
>                     $this->From,
>                     []
1403,1404c1757,1759
<                 if ($result != 0) {
<                     throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
---
>                 $this->edebug("Result: " . ($result === 0 ? 'true' : 'false'));
>                 if (0 !== $result) {
>                     throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
1408,1409c1763,1765
<             if (!@$mail = popen($sendmail, 'w')) {
<                 throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
---
>             $mail = @popen($sendmail, 'w');
>             if (!$mail) {
>                 throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
1411,1412c1767,1768
<             fputs($mail, $header);
<             fputs($mail, $body);
---
>             fwrite($mail, $header);
>             fwrite($mail, $body);
1415c1771
<                 ($result == 0),
---
>                 ($result === 0),
1421c1777,1778
<                 $this->From
---
>                 $this->From,
>                 []
1423,1424c1780,1782
<             if ($result != 0) {
<                 throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
---
>             $this->edebug("Result: " . ($result === 0 ? 'true' : 'false'));
>             if (0 !== $result) {
>                 throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
1426a1785
> 
1432d1790
<      *
1434c1792
<      * @param string $string The string to be validated
---
>      *
1436,1437c1794,1797
<      * @access protected
<      * @return boolean
---
>      *
>      * @param string $string The string to be validated
>      *
>      * @return bool
1441,1443c1801,1804
<         // Future-proof
<         if (escapeshellcmd($string) !== $string
<             or !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))
---
>         //Future-proof
>         if (
>             escapeshellcmd($string) !== $string
>             || !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
1450c1811
<         for ($i = 0; $i < $length; $i++) {
---
>         for ($i = 0; $i < $length; ++$i) {
1453,1455c1814,1816
<             // All other characters have a special meaning in at least one common shell, including = and +.
<             // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
<             // Note that this does permit non-Latin alphanumeric characters based on the current locale.
---
>             //All other characters have a special meaning in at least one common shell, including = and +.
>             //Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
>             //Note that this does permit non-Latin alphanumeric characters based on the current locale.
1464a1826,1860
>      * Check whether a file path is of a permitted type.
>      * Used to reject URLs and phar files from functions that access local file paths,
>      * such as addAttachment.
>      *
>      * @param string $path A relative or absolute path to a file
>      *
>      * @return bool
>      */
>     protected static function isPermittedPath($path)
>     {
>         //Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1
>         return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path);
>     }
> 
>     /**
>      * Check whether a file path is safe, accessible, and readable.
>      *
>      * @param string $path A relative or absolute path to a file
>      *
>      * @return bool
>      */
>     protected static function fileIsAccessible($path)
>     {
>         if (!static::isPermittedPath($path)) {
>             return false;
>         }
>         $readable = file_exists($path);
>         //If not a UNC path (expected to start with \\), check read permission, see #2069
>         if (strpos($path, '\\\\') !== 0) {
>             $readable = $readable && is_readable($path);
>         }
>         return  $readable;
>     }
> 
>     /**
1465a1862,1864
>      *
>      * @see http://www.php.net/manual/en/book.mail.php
>      *
1467,1471c1866,1870
<      * @param string $body The message body
<      * @link http://www.php.net/manual/en/book.mail.php
<      * @throws phpmailerException
<      * @access protected
<      * @return boolean
---
>      * @param string $body   The message body
>      *
>      * @throws Exception
>      *
>      * @return bool
1475c1874,1876
<         $toArr = array();
---
>         $header = static::stripTrailingWSP($header) . static::$LE . static::$LE;
> 
>         $toArr = [];
1483,1484c1884,1898
<         if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
<             // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
---
>         //A space after `-f` is optional, but there is a long history of its presence
>         //causing problems, so we don't use one
>         //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
>         //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
>         //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
>         //Example problem: https://www.drupal.org/node/1057954
>         //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
> 
>         //PHP 5.6 workaround
>         $sendmail_from_value = ini_get('sendmail_from');
>         if (empty($this->Sender) && !empty($sendmail_from_value)) {
>             //PHP config has a sender address we can use
>             $this->Sender = ini_get('sendmail_from');
>         }
>         if (!empty($this->Sender) && static::validateAddress($this->Sender)) {
1488,1489d1901
<         }
<         if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) {
1494c1906
<         if ($this->SingleTo and count($toArr) > 1) {
---
>         if ($this->SingleTo && count($toArr) > 1) {
1497c1909,1919
<                 $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
---
>                 $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
>                 $this->doCallback(
>                     $result,
>                     [[$addrinfo['address'], $addrinfo['name']]],
>                     $this->cc,
>                     $this->bcc,
>                     $this->Subject,
>                     $body,
>                     $this->From,
>                     []
>                 );
1501c1923
<             $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
---
>             $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From, []);
1507c1929
<             throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
---
>             throw new Exception($this->lang('instantiate'), self::STOP_CRITICAL);
1508a1931
> 
1514c1937,1939
<      * Override this function to load your own SMTP implementation
---
>      * Override this function to load your own SMTP implementation,
>      * or set one with setSMTPInstance.
>      *
1520c1945
<             $this->smtp = new SMTP;
---
>             $this->smtp = new SMTP();
1521a1947,1959
> 
>         return $this->smtp;
>     }
> 
>     /**
>      * Provide an instance to use for SMTP operations.
>      *
>      * @return SMTP
>      */
>     public function setSMTPInstance(SMTP $smtp)
>     {
>         $this->smtp = $smtp;
> 
1528,1529c1966,1970
<      * Uses the PHPMailerSMTP class by default.
<      * @see PHPMailer::getSMTPInstance() to use a different class.
---
>      *
>      * @see PHPMailer::setSMTPInstance() to use a different class.
>      *
>      * @uses \PHPMailer\PHPMailer\SMTP
>      *
1531,1535c1972,1976
<      * @param string $body The message body
<      * @throws phpmailerException
<      * @uses SMTP
<      * @access protected
<      * @return boolean
---
>      * @param string $body   The message body
>      *
>      * @throws Exception
>      *
>      * @return bool
1539c1980,1981
<         $bad_rcpt = array();
---
>         $header = static::stripTrailingWSP($header) . static::$LE . static::$LE;
>         $bad_rcpt = [];
1541c1983
<             throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
---
>             throw new Exception($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
1543,1545c1985,1986
<         if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
<             $smtp_from = $this->Sender;
<         } else {
---
>         //Sender already validated in preSend()
>         if ('' === $this->Sender) {
1546a1988,1989
>         } else {
>             $smtp_from = $this->Sender;
1550c1993
<             throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
---
>             throw new Exception($this->ErrorInfo, self::STOP_CRITICAL);
1553,1554c1996,1998
<         // Attempt to send to all recipients
<         foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
---
>         $callbacks = [];
>         //Attempt to send to all recipients
>         foreach ([$this->to, $this->cc, $this->bcc] as $togroup) {
1556c2000
<                 if (!$this->smtp->recipient($to[0])) {
---
>                 if (!$this->smtp->recipient($to[0], $this->dsn)) {
1558c2002
<                     $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']);
---
>                     $bad_rcpt[] = ['to' => $to[0], 'error' => $error['detail']];
1563c2007,2008
<                 $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
---
> 
>                 $callbacks[] = ['issent' => $isSent, 'to' => $to[0], 'name' => $to[1]];
1567,1569c2012,2014
<         // Only send the DATA command if we have viable recipients
<         if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
<             throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
---
>         //Only send the DATA command if we have viable recipients
>         if ((count($this->all_recipients) > count($bad_rcpt)) && !$this->smtp->data($header . $body)) {
>             throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL);
1570a2016,2018
> 
>         $smtp_transaction_id = $this->smtp->getLastTransactionID();
> 
1576a2025,2038
> 
>         foreach ($callbacks as $cb) {
>             $this->doCallback(
>                 $cb['issent'],
>                 [[$cb['to'], $cb['name']]],
>                 [],
>                 [],
>                 $this->Subject,
>                 $body,
>                 $this->From,
>                 ['smtp_transaction_id' => $smtp_transaction_id]
>             );
>         }
> 
1583,1586c2045
<             throw new phpmailerException(
<                 $this->lang('recipients_failed') . $errstr,
<                 self::STOP_CONTINUE
<             );
---
>             throw new Exception($this->lang('recipients_failed') . $errstr, self::STOP_CONTINUE);
1587a2047
> 
1593a2054
>      *
1595,1598c2056,2061
<      * @uses SMTP
<      * @access public
<      * @throws phpmailerException
<      * @return boolean
---
>      *
>      * @throws Exception
>      *
>      * @uses \PHPMailer\PHPMailer\SMTP
>      *
>      * @return bool
1602c2065
<         if (is_null($this->smtp)) {
---
>         if (null === $this->smtp) {
1607c2070
<         if (is_null($options)) {
---
>         if (null === $options) {
1611c2074
<         // Already connected?
---
>         //Already connected?
1624,1626c2087,2107
<             $hostinfo = array();
<             if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
<                 // Not a valid host entry
---
>             $hostinfo = [];
>             if (
>                 !preg_match(
>                     '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
>                     trim($hostentry),
>                     $hostinfo
>                 )
>             ) {
>                 $this->edebug($this->lang('invalid_hostentry') . ' ' . trim($hostentry));
>                 //Not a valid host entry
>                 continue;
>             }
>             //$hostinfo[1]: optional ssl or tls prefix
>             //$hostinfo[2]: the hostname
>             //$hostinfo[3]: optional port number
>             //The host string prefix can temporarily override the current setting for SMTPSecure
>             //If it's not specified, the default value is used
> 
>             //Check the host name is a valid name or IP address before trying to use it
>             if (!static::isValidHost($hostinfo[2])) {
>                 $this->edebug($this->lang('invalid_host') . ' ' . $hostinfo[2]);
1629,1633d2109
<             // $hostinfo[2]: optional ssl or tls prefix
<             // $hostinfo[3]: the hostname
<             // $hostinfo[4]: optional port number
<             // The host string prefix can temporarily override the current setting for SMTPSecure
<             // If it's not specified, the default value is used
1636,1637c2112,2113
<             $tls = ($this->SMTPSecure == 'tls');
<             if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
---
>             $tls = (static::ENCRYPTION_STARTTLS === $this->SMTPSecure);
>             if ('ssl' === $hostinfo[1] || ('' === $hostinfo[1] && static::ENCRYPTION_SMTPS === $this->SMTPSecure)) {
1639,1641c2115,2117
<                 $tls = false; // Can't have SSL and TLS at the same time
<                 $secure = 'ssl';
<             } elseif ($hostinfo[2] == 'tls') {
---
>                 $tls = false; //Can't have SSL and TLS at the same time
>                 $secure = static::ENCRYPTION_SMTPS;
>             } elseif ('tls' === $hostinfo[1]) {
1643,1644c2119,2120
<                 // tls doesn't use a prefix
<                 $secure = 'tls';
---
>                 //TLS doesn't use a prefix
>                 $secure = static::ENCRYPTION_STARTTLS;
1647,1648c2123,2124
<             $sslext = defined('OPENSSL_ALGO_SHA1');
<             if ('tls' === $secure or 'ssl' === $secure) {
---
>             $sslext = defined('OPENSSL_ALGO_SHA256');
>             if (static::ENCRYPTION_STARTTLS === $secure || static::ENCRYPTION_SMTPS === $secure) {
1651c2127
<                     throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
---
>                     throw new Exception($this->lang('extension_missing') . 'openssl', self::STOP_CRITICAL);
1654c2130
<             $host = $hostinfo[3];
---
>             $host = $hostinfo[2];
1656,1658c2132,2138
<             $tport = (integer)$hostinfo[4];
<             if ($tport > 0 and $tport < 65536) {
<                 $port = $tport;
---
>             if (
>                 array_key_exists(3, $hostinfo) &&
>                 is_numeric($hostinfo[3]) &&
>                 $hostinfo[3] > 0 &&
>                 $hostinfo[3] < 65536
>             ) {
>                 $port = (int) $hostinfo[3];
1669,1673c2149,2153
<                     // * it's not disabled
<                     // * we have openssl extension
<                     // * we are not already using SSL
<                     // * the server offers STARTTLS
<                     if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) {
---
>                     //* it's not disabled
>                     //* we have openssl extension
>                     //* we are not already using SSL
>                     //* the server offers STARTTLS
>                     if ($this->SMTPAutoTLS && $sslext && 'ssl' !== $secure && $this->smtp->getServerExt('STARTTLS')) {
1678c2158
<                             throw new phpmailerException($this->lang('connect_host'));
---
>                             throw new Exception($this->lang('connect_host'));
1680c2160
<                         // We must resend EHLO after TLS negotiation
---
>                         //We must resend EHLO after TLS negotiation
1683,1684c2163,2164
<                     if ($this->SMTPAuth) {
<                         if (!$this->smtp->authenticate(
---
>                     if (
>                         $this->SMTPAuth && !$this->smtp->authenticate(
1688,1689c2168
<                             $this->Realm,
<                             $this->Workstation
---
>                             $this->oauth
1691,1693c2170,2171
<                         ) {
<                             throw new phpmailerException($this->lang('authenticate'));
<                         }
---
>                     ) {
>                         throw new Exception($this->lang('authenticate'));
1694a2173
> 
1696c2175
<                 } catch (phpmailerException $exc) {
---
>                 } catch (Exception $exc) {
1699c2178
<                     // We must have connected, but then failed TLS or Auth, so close connection nicely
---
>                     //We must have connected, but then failed TLS or Auth, so close connection nicely
1704c2183
<         // If we get here, all connection attempts have failed, so close connection hard
---
>         //If we get here, all connection attempts have failed, so close connection hard
1706,1707c2185,2186
<         // As we've caught all exceptions, just report whatever the last one was
<         if ($this->exceptions and !is_null($lastexception)) {
---
>         //As we've caught all exceptions, just report whatever the last one was
>         if ($this->exceptions && null !== $lastexception) {
1709a2189
> 
1715d2194
<      * @return void
1719,1723c2198,2200
<         if (is_a($this->smtp, 'SMTP')) {
<             if ($this->smtp->connected()) {
<                 $this->smtp->quit();
<                 $this->smtp->close();
<             }
---
>         if ((null !== $this->smtp) && $this->smtp->connected()) {
>             $this->smtp->quit();
>             $this->smtp->close();
1729d2205
<      * Returns false if it cannot load the language file.
1731c2207,2210
<      * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr")
---
>      *
>      * @param string $langcode  ISO 639-1 2-character language code (e.g. French is "fr")
>      *                          Optionally, the language code can be enhanced with a 4-character
>      *                          script annotation and/or a 2-character country annotation.
1733,1734c2212,2214
<      * @return boolean
<      * @access public
---
>      *                          Do not set this from user input!
>      *
>      * @return bool Returns true if the requested language was loaded, false otherwise.
1738,1739c2218,2219
<         // Backwards compatibility for renamed language codes
<         $renamed_langcodes = array(
---
>         //Backwards compatibility for renamed language codes
>         $renamed_langcodes = [
1745c2225,2228
<         );
---
>             'rs' => 'sr',
>             'tg' => 'tl',
>             'am' => 'hy',
>         ];
1747c2230
<         if (isset($renamed_langcodes[$langcode])) {
---
>         if (array_key_exists($langcode, $renamed_langcodes)) {
1751,1752c2234,2235
<         // Define full set of translatable strings in English
<         $PHPMAILER_LANG = array(
---
>         //Define full set of translatable strings in English
>         $PHPMAILER_LANG = [
1753a2237,2239
>             'buggy_php' => 'Your version of PHP is affected by a bug that may result in corrupted messages.' .
>                 ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
>                 ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
1758a2245
>             'extension_missing' => 'Extension missing: ',
1763a2251,2253
>             'invalid_header' => 'Invalid header name or value',
>             'invalid_hostentry' => 'Invalid hostentry: ',
>             'invalid_host' => 'Invalid host: ',
1767a2258,2259
>             'smtp_code' => 'SMTP code: ',
>             'smtp_code_ex' => 'Additional SMTP info: ',
1768a2261
>             'smtp_detail' => 'Detail: ',
1771,1772c2264
<             'extension_missing' => 'Extension missing: '
<         );
---
>         ];
1774,1775c2266,2267
<             // Calculate an absolute path so it can work if CWD is not here
<             $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
---
>             //Calculate an absolute path so it can work if CWD is not here
>             $lang_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
1776a2269
> 
1778c2271,2277
<         if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
---
>         $foundlang = true;
>         $langcode  = strtolower($langcode);
>         if (
>             !preg_match('/^(?P<lang>[a-z]{2})(?P<script>_[a-z]{4})?(?P<country>_[a-z]{2})?$/', $langcode, $matches)
>             && $langcode !== 'en'
>         ) {
>             $foundlang = false;
1781,1786c2280,2305
<         $foundlang = true;
<         $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
<         // There is no English translation file
<         if ($langcode != 'en') {
<             // Make sure language file path is readable
<             if (!is_readable($lang_file)) {
---
> 
>         //There is no English translation file
>         if ('en' !== $langcode) {
>             $langcodes = [];
>             if (!empty($matches['script']) && !empty($matches['country'])) {
>                 $langcodes[] = $matches['lang'] . $matches['script'] . $matches['country'];
>             }
>             if (!empty($matches['country'])) {
>                 $langcodes[] = $matches['lang'] . $matches['country'];
>             }
>             if (!empty($matches['script'])) {
>                 $langcodes[] = $matches['lang'] . $matches['script'];
>             }
>             $langcodes[] = $matches['lang'];
> 
>             //Try and find a readable language file for the requested language.
>             $foundFile = false;
>             foreach ($langcodes as $code) {
>                 $lang_file = $lang_path . 'phpmailer.lang-' . $code . '.php';
>                 if (static::fileIsAccessible($lang_file)) {
>                     $foundFile = true;
>                     break;
>                 }
>             }
> 
>             if ($foundFile === false) {
1789,1791c2308,2327
<                 // Overwrite language-specific strings.
<                 // This way we'll never have missing translation keys.
<                 $foundlang = include $lang_file;
---
>                 $lines = file($lang_file);
>                 foreach ($lines as $line) {
>                     //Translation file lines look like this:
>                     //$PHPMAILER_LANG['authenticate'] = 'SMTP-Fehler: Authentifizierung fehlgeschlagen.';
>                     //These files are parsed as text and not PHP so as to avoid the possibility of code injection
>                     //See https://blog.stevenlevithan.com/archives/match-quoted-string
>                     $matches = [];
>                     if (
>                         preg_match(
>                             '/^\$PHPMAILER_LANG\[\'([a-z\d_]+)\'\]\s*=\s*(["\'])(.+)*?\2;/',
>                             $line,
>                             $matches
>                         ) &&
>                         //Ignore unknown translation keys
>                         array_key_exists($matches[1], $PHPMAILER_LANG)
>                     ) {
>                         //Overwrite language-specific strings so we'll never have missing translation keys.
>                         $PHPMAILER_LANG[$matches[1]] = (string)$matches[3];
>                     }
>                 }
1795c2331,2332
<         return (boolean)$foundlang; // Returns false if language not found
---
> 
>         return $foundlang; //Returns false if language not found
1799a2337
>      *
1803a2342,2345
>         if (empty($this->language)) {
>             $this->setLanguage(); // Set the default language.
>         }
> 
1809c2351
<      * @access public
---
>      *
1811,1814c2353,2357
<      * @param array $addr An array of recipient,
<      * where each recipient is a 2-element indexed array with element 0 containing an address
<      * and element 1 containing a name, like:
<      * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
---
>      * @param array  $addr An array of recipients,
>      *                     where each recipient is a 2-element indexed array with element 0 containing an address
>      *                     and element 1 containing a name, like:
>      *                     [['joe@example.com', 'Joe User'], ['zoe@example.com', 'Zoe User']]
>      *
1819c2362
<         $addresses = array();
---
>         $addresses = [];
1823c2366,2367
<         return $type . ': ' . implode(', ', $addresses) . $this->LE;
---
> 
>         return $type . ': ' . implode(', ', $addresses) . static::$LE;
1828,1830c2372,2375
<      * @access public
<      * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
<      *      like array('joe@example.com', 'Joe User')
---
>      *
>      * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name like
>      *                    ['joe@example.com', 'Joe User']
>      *
1835c2380
<         if (empty($addr[1])) { // No name provided
---
>         if (empty($addr[1])) { //No name provided
1837,1840d2381
<         } else {
<             return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
<                 $addr[0]
<             ) . '>';
1841a2383,2385
> 
>         return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') .
>             ' <' . $this->secureHeader($addr[0]) . '>';
1848a2393
>      *
1850,1852c2395,2397
<      * @param integer $length The line length to wrap to
<      * @param boolean $qp_mode Whether to run in Quoted-Printable mode
<      * @access public
---
>      * @param int    $length  The line length to wrap to
>      * @param bool   $qp_mode Whether to run in Quoted-Printable mode
>      *
1858c2403
<             $soft_break = sprintf(' =%s', $this->LE);
---
>             $soft_break = sprintf(' =%s', static::$LE);
1860c2405
<             $soft_break = $this->LE;
---
>             $soft_break = static::$LE;
1862,1866c2407,2411
<         // If utf-8 encoding is used, we will need to make sure we don't
<         // split multibyte characters when we wrap
<         $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
<         $lelen = strlen($this->LE);
<         $crlflen = strlen(self::CRLF);
---
>         //If utf-8 encoding is used, we will need to make sure we don't
>         //split multibyte characters when we wrap
>         $is_utf8 = static::CHARSET_UTF8 === strtolower($this->CharSet);
>         $lelen = strlen(static::$LE);
>         $crlflen = strlen(static::$LE);
1868c2413
<         $message = $this->fixEOL($message);
---
>         $message = static::normalizeBreaks($message);
1870c2415
<         if (substr($message, -$lelen) == $this->LE) {
---
>         if (substr($message, -$lelen) === static::$LE) {
1875c2420
<         $lines = explode($this->LE, $message);
---
>         $lines = explode(static::$LE, $message);
1883c2428
<                 if ($qp_mode and (strlen($word) > $length)) {
---
>                 if ($qp_mode && (strlen($word) > $length)) {
1890,1892c2435,2437
<                             } elseif (substr($word, $len - 1, 1) == '=') {
<                                 $len--;
<                             } elseif (substr($word, $len - 2, 1) == '=') {
---
>                             } elseif ('=' === substr($word, $len - 1, 1)) {
>                                 --$len;
>                             } elseif ('=' === substr($word, $len - 2, 1)) {
1898c2443
<                             $message .= $buf . sprintf('=%s', self::CRLF);
---
>                             $message .= $buf . sprintf('=%s', static::$LE);
1904c2449
<                     while (strlen($word) > 0) {
---
>                     while ($word !== '') {
1911,1913c2456,2458
<                         } elseif (substr($word, $len - 1, 1) == '=') {
<                             $len--;
<                         } elseif (substr($word, $len - 2, 1) == '=') {
---
>                         } elseif ('=' === substr($word, $len - 1, 1)) {
>                             --$len;
>                         } elseif ('=' === substr($word, $len - 2, 1)) {
1917c2462
<                         $word = substr($word, $len);
---
>                         $word = (string) substr($word, $len);
1919,1920c2464,2465
<                         if (strlen($word) > 0) {
<                             $message .= $part . sprintf('=%s', self::CRLF);
---
>                         if ($word !== '') {
>                             $message .= $part . sprintf('=%s', static::$LE);
1932c2477
<                     if (strlen($buf) > $length and $buf_o != '') {
---
>                     if ('' !== $buf_o && strlen($buf) > $length) {
1939c2484
<             $message .= $buf . self::CRLF;
---
>             $message .= $buf . static::$LE;
1949c2494
<      * @access public
---
>      *
1951,1952c2496,2498
<      * @param integer $maxLength Find the last character boundary prior to this length
<      * @return integer
---
>      * @param int    $maxLength   Find the last character boundary prior to this length
>      *
>      * @return int
1962,1963c2508,2509
<                 // Found start of encoded character byte within $lookBack block.
<                 // Check the encoded byte value (the 2 chars after the '=')
---
>                 //Found start of encoded character byte within $lookBack block.
>                 //Check the encoded byte value (the 2 chars after the '=')
1967,1969c2513,2515
<                     // Single byte character.
<                     // If the encoded char was found at pos 0, it will fit
<                     // otherwise reduce maxLength to start of the encoded char
---
>                     //Single byte character.
>                     //If the encoded char was found at pos 0, it will fit
>                     //otherwise reduce maxLength to start of the encoded char
1971c2517
<                         $maxLength = $maxLength - ($lookBack - $encodedCharPos);
---
>                         $maxLength -= $lookBack - $encodedCharPos;
1975,1977c2521,2523
<                     // First byte of a multi byte character
<                     // Reduce maxLength to split at start of character
<                     $maxLength = $maxLength - ($lookBack - $encodedCharPos);
---
>                     //First byte of a multi byte character
>                     //Reduce maxLength to split at start of character
>                     $maxLength -= $lookBack - $encodedCharPos;
1980c2526
<                     // Middle byte of a multi byte character, look further back
---
>                     //Middle byte of a multi byte character, look further back
1984c2530
<                 // No encoded character found
---
>                 //No encoded character found
1987a2534
> 
1996,1997d2542
<      * @access public
<      * @return void
2020c2565
<      * @access public
---
>      *
2027,2030c2572
<         if ($this->MessageDate == '') {
<             $this->MessageDate = self::rfcDate();
<         }
<         $result .= $this->headerLine('Date', $this->MessageDate);
---
>         $result .= $this->headerLine('Date', '' === $this->MessageDate ? self::rfcDate() : $this->MessageDate);
2032,2034c2574,2576
<         // To be created automatically by mail()
<         if ($this->SingleTo) {
<             if ($this->Mailer != 'mail') {
---
>         //The To header is created automatically by mail(), so needs to be omitted here
>         if ('mail' !== $this->Mailer) {
>             if ($this->SingleTo) {
2038,2044c2580,2582
<             }
<         } else {
<             if (count($this->to) > 0) {
<                 if ($this->Mailer != 'mail') {
<                     $result .= $this->addrAppend('To', $this->to);
<                 }
<             } elseif (count($this->cc) == 0) {
---
>             } elseif (count($this->to) > 0) {
>                 $result .= $this->addrAppend('To', $this->to);
>             } elseif (count($this->cc) === 0) {
2047a2586
>         $result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]);
2049,2051c2588
<         $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
< 
<         // sendmail and mail() extract Cc from the header before sending
---
>         //sendmail and mail() extract Cc from the header before sending
2056,2058c2593,2596
<         // sendmail and mail() extract Bcc from the header before sending
<         if ((
<                 $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
---
>         //sendmail and mail() extract Bcc from the header before sending
>         if (
>             (
>                 'sendmail' === $this->Mailer || 'qmail' === $this->Mailer || 'mail' === $this->Mailer
2060c2598
<             and count($this->bcc) > 0
---
>             && count($this->bcc) > 0
2069,2070c2607,2608
<         // mail() sets the subject itself
<         if ($this->Mailer != 'mail') {
---
>         //mail() sets the subject itself
>         if ('mail' !== $this->Mailer) {
2074,2076c2612,2624
<         // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
<         // https://tools.ietf.org/html/rfc5322#section-3.6.4
<         if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) {
---
>         //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
>         //https://tools.ietf.org/html/rfc5322#section-3.6.4
>         if (
>             '' !== $this->MessageID &&
>             preg_match(
>                 '/^<((([a-z\d!#$%&\'*+\/=?^_`{|}~-]+(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)' .
>                 '|("(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]|[\x21\x23-\x5B\x5D-\x7E])' .
>                 '|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*"))@(([a-z\d!#$%&\'*+\/=?^_`{|}~-]+' .
>                 '(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)|(\[(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]' .
>                 '|[\x21-\x5A\x5E-\x7E])|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*\])))>$/Di',
>                 $this->MessageID
>             )
>         ) {
2082c2630
<         if (!is_null($this->Priority)) {
---
>         if (null !== $this->Priority) {
2085c2633
<         if ($this->XMailer == '') {
---
>         if ('' === $this->XMailer) {
2088c2636
<                 'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)'
---
>                 'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
2097c2645
<         if ($this->ConfirmReadingTo != '') {
---
>         if ('' !== $this->ConfirmReadingTo) {
2101c2649
<         // Add custom headers
---
>         //Add custom headers
2118c2666
<      * @access public
---
>      *
2127,2128c2675,2676
<                 $result .= $this->headerLine('Content-Type', 'multipart/related;');
<                 $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
---
>                 $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
>                 $result .= $this->textLine(' boundary="' . $this->boundary[1] . '"');
2134,2135c2682,2683
<                 $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
<                 $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
---
>                 $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_MIXED . ';');
>                 $result .= $this->textLine(' boundary="' . $this->boundary[1] . '"');
2139,2140c2687,2688
<                 $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
<                 $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
---
>                 $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
>                 $result .= $this->textLine(' boundary="' . $this->boundary[1] . '"');
2143c2691
<                 // Catches case 'plain': and case '':
---
>                 //Catches case 'plain': and case '':
2148,2150c2696,2698
<         // RFC1341 part 5 says 7bit is assumed if not specified
<         if ($this->Encoding != '7bit') {
<             // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
---
>         //RFC1341 part 5 says 7bit is assumed if not specified
>         if (static::ENCODING_7BIT !== $this->Encoding) {
>             //RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
2152,2153c2700,2701
<                 if ($this->Encoding == '8bit') {
<                     $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
---
>                 if (static::ENCODING_8BIT === $this->Encoding) {
>                     $result .= $this->headerLine('Content-Transfer-Encoding', static::ENCODING_8BIT);
2155c2703
<                 // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
---
>                 //The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
2161,2164d2708
<         if ($this->Mailer != 'mail') {
<             $result .= $this->LE;
<         }
< 
2171a2716
>      *
2173c2718
<      * @access public
---
>      *
2178c2723,2724
<         return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody;
---
>         return static::stripTrailingWSP($this->MIMEHeader . $this->mailHeader) .
>             static::$LE . static::$LE . $this->MIMEBody;
2182c2728,2729
<      * Create unique ID
---
>      * Create a unique ID to use for boundaries.
>      *
2185,2186c2732,2753
<     protected function generateId() {
<         return md5(uniqid(time()));
---
>     protected function generateId()
>     {
>         $len = 32; //32 bytes = 256 bits
>         $bytes = '';
>         if (function_exists('random_bytes')) {
>             try {
>                 $bytes = random_bytes($len);
>             } catch (\Exception $e) {
>                 //Do nothing
>             }
>         } elseif (function_exists('openssl_random_pseudo_bytes')) {
>             /** @noinspection CryptographicallySecureRandomnessInspection */
>             $bytes = openssl_random_pseudo_bytes($len);
>         }
>         if ($bytes === '') {
>             //We failed to produce a proper random string, so make do.
>             //Use a hash to force the length to the same as the other methods
>             $bytes = hash('sha256', uniqid((string) mt_rand(), true), true);
>         }
> 
>         //We don't care about messing up base64 format here, just want a random string
>         return str_replace(['=', '+', '/'], '', base64_encode(hash('sha256', $bytes, true)));
2192,2193c2759,2761
<      * @access public
<      * @throws phpmailerException
---
>      *
>      * @throws Exception
>      *
2206c2774
<             $body .= $this->getMailMIME() . $this->LE;
---
>             $body .= $this->getMailMIME() . static::$LE;
2214,2215c2782,2783
<         if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
<             $bodyEncoding = '7bit';
---
>         if (static::ENCODING_8BIT === $bodyEncoding && !$this->has8bitChars($this->Body)) {
>             $bodyEncoding = static::ENCODING_7BIT;
2217c2785
<             $bodyCharSet = 'us-ascii';
---
>             $bodyCharSet = static::CHARSET_ASCII;
2221,2222c2789,2790
<         if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) {
<             $bodyEncoding = 'quoted-printable';
---
>         if (static::ENCODING_BASE64 !== $this->Encoding && static::hasLineLongerThanMax($this->Body)) {
>             $bodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
2228,2229c2796,2797
<         if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
<             $altBodyEncoding = '7bit';
---
>         if (static::ENCODING_8BIT === $altBodyEncoding && !$this->has8bitChars($this->AltBody)) {
>             $altBodyEncoding = static::ENCODING_7BIT;
2231c2799
<             $altBodyCharSet = 'us-ascii';
---
>             $altBodyCharSet = static::CHARSET_ASCII;
2235,2236c2803,2804
<         if ('base64' != $altBodyEncoding and self::hasLineLongerThanMax($this->AltBody)) {
<             $altBodyEncoding = 'quoted-printable';
---
>         if (static::ENCODING_BASE64 !== $altBodyEncoding && static::hasLineLongerThanMax($this->AltBody)) {
>             $altBodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
2239c2807
<         $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
---
>         $mimepre = 'This is a multi-part message in MIME format.' . static::$LE . static::$LE;
2245c2813
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
2252c2820
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
2258,2260c2826,2829
<                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
<                 $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
<                 $body .= $this->LE;
---
>                 $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
>                 $body .= $this->textLine(' boundary="' . $this->boundary[2] . '";');
>                 $body .= $this->textLine(' type="' . static::CONTENT_TYPE_TEXT_HTML . '"');
>                 $body .= static::$LE;
2263c2832
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
2265c2834
<                 $body .= $this->LE;
---
>                 $body .= static::$LE;
2270c2839,2844
<                 $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
---
>                 $body .= $this->getBoundary(
>                     $this->boundary[1],
>                     $altBodyCharSet,
>                     static::CONTENT_TYPE_PLAINTEXT,
>                     $altBodyEncoding
>                 );
2272,2273c2846,2852
<                 $body .= $this->LE . $this->LE;
<                 $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
---
>                 $body .= static::$LE;
>                 $body .= $this->getBoundary(
>                     $this->boundary[1],
>                     $bodyCharSet,
>                     static::CONTENT_TYPE_TEXT_HTML,
>                     $bodyEncoding
>                 );
2275c2854
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
2277c2856,2868
<                     $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
---
>                     $method = static::ICAL_METHOD_REQUEST;
>                     foreach (static::$IcalMethods as $imethod) {
>                         if (stripos($this->Ical, 'METHOD:' . $imethod) !== false) {
>                             $method = $imethod;
>                             break;
>                         }
>                     }
>                     $body .= $this->getBoundary(
>                         $this->boundary[1],
>                         '',
>                         static::CONTENT_TYPE_TEXT_CALENDAR . '; method=' . $method,
>                         ''
>                     );
2279c2870
<                     $body .= $this->LE . $this->LE;
---
>                     $body .= static::$LE;
2285c2876,2881
<                 $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
---
>                 $body .= $this->getBoundary(
>                     $this->boundary[1],
>                     $altBodyCharSet,
>                     static::CONTENT_TYPE_PLAINTEXT,
>                     $altBodyEncoding
>                 );
2287c2883
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
2289,2292c2885,2894
<                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
<                 $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
<                 $body .= $this->LE;
<                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
---
>                 $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
>                 $body .= $this->textLine(' boundary="' . $this->boundary[2] . '";');
>                 $body .= $this->textLine(' type="' . static::CONTENT_TYPE_TEXT_HTML . '"');
>                 $body .= static::$LE;
>                 $body .= $this->getBoundary(
>                     $this->boundary[2],
>                     $bodyCharSet,
>                     static::CONTENT_TYPE_TEXT_HTML,
>                     $bodyEncoding
>                 );
2294c2896
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
2296c2898
<                 $body .= $this->LE;
---
>                 $body .= static::$LE;
2302,2305c2904,2912
<                 $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
<                 $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
<                 $body .= $this->LE;
<                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
---
>                 $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
>                 $body .= $this->textLine(' boundary="' . $this->boundary[2] . '"');
>                 $body .= static::$LE;
>                 $body .= $this->getBoundary(
>                     $this->boundary[2],
>                     $altBodyCharSet,
>                     static::CONTENT_TYPE_PLAINTEXT,
>                     $altBodyEncoding
>                 );
2307,2308c2914,2920
<                 $body .= $this->LE . $this->LE;
<                 $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
---
>                 $body .= static::$LE;
>                 $body .= $this->getBoundary(
>                     $this->boundary[2],
>                     $bodyCharSet,
>                     static::CONTENT_TYPE_TEXT_HTML,
>                     $bodyEncoding
>                 );
2310c2922,2938
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
>                 if (!empty($this->Ical)) {
>                     $method = static::ICAL_METHOD_REQUEST;
>                     foreach (static::$IcalMethods as $imethod) {
>                         if (stripos($this->Ical, 'METHOD:' . $imethod) !== false) {
>                             $method = $imethod;
>                             break;
>                         }
>                     }
>                     $body .= $this->getBoundary(
>                         $this->boundary[2],
>                         '',
>                         static::CONTENT_TYPE_TEXT_CALENDAR . '; method=' . $method,
>                         ''
>                     );
>                     $body .= $this->encodeString($this->Ical, $this->Encoding);
>                 }
2312c2940
<                 $body .= $this->LE;
---
>                 $body .= static::$LE;
2318,2321c2946,2954
<                 $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
<                 $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
<                 $body .= $this->LE;
<                 $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
---
>                 $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
>                 $body .= $this->textLine(' boundary="' . $this->boundary[2] . '"');
>                 $body .= static::$LE;
>                 $body .= $this->getBoundary(
>                     $this->boundary[2],
>                     $altBodyCharSet,
>                     static::CONTENT_TYPE_PLAINTEXT,
>                     $altBodyEncoding
>                 );
2323c2956
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
2325,2328c2958,2967
<                 $body .= $this->headerLine('Content-Type', 'multipart/related;');
<                 $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
<                 $body .= $this->LE;
<                 $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
---
>                 $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
>                 $body .= $this->textLine(' boundary="' . $this->boundary[3] . '";');
>                 $body .= $this->textLine(' type="' . static::CONTENT_TYPE_TEXT_HTML . '"');
>                 $body .= static::$LE;
>                 $body .= $this->getBoundary(
>                     $this->boundary[3],
>                     $bodyCharSet,
>                     static::CONTENT_TYPE_TEXT_HTML,
>                     $bodyEncoding
>                 );
2330c2969
<                 $body .= $this->LE . $this->LE;
---
>                 $body .= static::$LE;
2332c2971
<                 $body .= $this->LE;
---
>                 $body .= static::$LE;
2334c2973
<                 $body .= $this->LE;
---
>                 $body .= static::$LE;
2338c2977
<                 // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
---
>                 //Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
2346a2986,2988
>             if ($this->exceptions) {
>                 throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
>             }
2350c2992
<                     throw new phpmailerException($this->lang('extension_missing') . 'openssl');
---
>                     throw new Exception($this->lang('extension_missing') . 'openssl');
2352,2357c2994,2998
<                 // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
<                 $file = tempnam(sys_get_temp_dir(), 'mail');
<                 if (false === file_put_contents($file, $body)) {
<                     throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
<                 }
<                 $signed = tempnam(sys_get_temp_dir(), 'signed');
---
> 
>                 $file = tempnam(sys_get_temp_dir(), 'srcsign');
>                 $signed = tempnam(sys_get_temp_dir(), 'mailsign');
>                 file_put_contents($file, $body);
> 
2364,2365c3005,3006
<                         array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
<                         null
---
>                         ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
>                         []
2372,2373c3013,3014
<                         array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
<                         null,
---
>                         ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
>                         [],
2377a3019,3020
> 
>                 @unlink($file);
2379d3021
<                     @unlink($file);
2384c3026
<                     $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
---
>                     $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE;
2387d3028
<                     @unlink($file);
2389c3030
<                     throw new phpmailerException($this->lang('signing') . openssl_error_string());
---
>                     throw new Exception($this->lang('signing') . openssl_error_string());
2391c3032
<             } catch (phpmailerException $exc) {
---
>             } catch (Exception $exc) {
2397a3039
> 
2403c3045
<      * @access protected
---
>      *
2407a3050
>      *
2413c3056
<         if ($charSet == '') {
---
>         if ('' === $charSet) {
2416c3059
<         if ($contentType == '') {
---
>         if ('' === $contentType) {
2419c3062
<         if ($encoding == '') {
---
>         if ('' === $encoding) {
2424,2426c3067,3069
<         $result .= $this->LE;
<         // RFC1341 part 5 says 7bit is assumed if not specified
<         if ($encoding != '7bit') {
---
>         $result .= static::$LE;
>         //RFC1341 part 5 says 7bit is assumed if not specified
>         if (static::ENCODING_7BIT !== $encoding) {
2429c3072
<         $result .= $this->LE;
---
>         $result .= static::$LE;
2436c3079
<      * @access protected
---
>      *
2437a3081
>      *
2442c3086
<         return $this->LE . '--' . $boundary . '--' . $this->LE;
---
>         return static::$LE . '--' . $boundary . '--' . static::$LE;
2448,2449d3091
<      * @access protected
<      * @return void
2453c3095
<         $type = array();
---
>         $type = [];
2464c3106
<         if ($this->message_type == '') {
---
>         if ('' === $this->message_type) {
2472,2474c3114,3117
<      * @access public
<      * @param string $name
<      * @param string $value
---
>      *
>      * @param string     $name
>      * @param string|int $value
>      *
2479c3122
<         return $name . ': ' . $value . $this->LE;
---
>         return $name . ': ' . $value . static::$LE;
2484c3127
<      * @access public
---
>      *
2485a3129
>      *
2490c3134
<         return $value . $this->LE;
---
>         return $value . static::$LE;
2497,2500c3141,3147
<      * @param string $path Path to the attachment.
<      * @param string $name Overrides the attachment name.
<      * @param string $encoding File encoding (see $Encoding).
<      * @param string $type File extension (MIME) type.
---
>      * Explicitly *does not* support passing URLs; PHPMailer is not an HTTP client.
>      * If you need to do that, fetch the resource yourself and pass it in via a local file or string.
>      *
>      * @param string $path        Path to the attachment
>      * @param string $name        Overrides the attachment name
>      * @param string $encoding    File encoding (see $Encoding)
>      * @param string $type        MIME type, e.g. `image/jpeg`; determined automatically from $path if not specified
2502,2503c3149,3152
<      * @throws phpmailerException
<      * @return boolean
---
>      *
>      * @throws Exception
>      *
>      * @return bool
2505,2506c3154,3160
<     public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
<     {
---
>     public function addAttachment(
>         $path,
>         $name = '',
>         $encoding = self::ENCODING_BASE64,
>         $type = '',
>         $disposition = 'attachment'
>     ) {
2508,2509c3162,3163
<             if (!@is_file($path)) {
<                 throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
---
>             if (!static::fileIsAccessible($path)) {
>                 throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
2512,2514c3166,3168
<             // If a MIME type is not specified, try to work it out from the file name
<             if ($type == '') {
<                 $type = self::filenameToType($path);
---
>             //If a MIME type is not specified, try to work it out from the file name
>             if ('' === $type) {
>                 $type = static::filenameToType($path);
2517,2518c3171,3172
<             $filename = basename($path);
<             if ($name == '') {
---
>             $filename = (string) static::mb_pathinfo($path, PATHINFO_BASENAME);
>             if ('' === $name) {
2520a3175,3177
>             if (!$this->validateEncoding($encoding)) {
>                 throw new Exception($this->lang('encoding') . $encoding);
>             }
2522c3179
<             $this->attachment[] = array(
---
>             $this->attachment[] = [
2528c3185
<                 5 => false, // isStringAttachment
---
>                 5 => false, //isStringAttachment
2530,2533c3187,3189
<                 7 => 0
<             );
< 
<         } catch (phpmailerException $exc) {
---
>                 7 => $name,
>             ];
>         } catch (Exception $exc) {
2538a3195
> 
2540a3198
> 
2545a3204
>      *
2556c3215
<      * @access protected
---
>      *
2558a3218,3220
>      *
>      * @throws Exception
>      *
2563,2566c3225,3228
<         // Return text of body
<         $mime = array();
<         $cidUniq = array();
<         $incl = array();
---
>         //Return text of body
>         $mime = [];
>         $cidUniq = [];
>         $incl = [];
2568c3230
<         // Add all attachments
---
>         //Add all attachments
2570,2572c3232,3234
<             // Check if it is a valid disposition_filter
<             if ($attachment[6] == $disposition_type) {
<                 // Check for string attachment
---
>             //Check if it is a valid disposition_filter
>             if ($attachment[6] === $disposition_type) {
>                 //Check for string attachment
2582,2583c3244,3245
<                 $inclhash = md5(serialize($attachment));
<                 if (in_array($inclhash, $incl)) {
---
>                 $inclhash = hash('sha256', serialize($attachment));
>                 if (in_array($inclhash, $incl, true)) {
2592c3254
<                 if ($disposition == 'inline' && array_key_exists($cid, $cidUniq)) {
---
>                 if ('inline' === $disposition && array_key_exists($cid, $cidUniq)) {
2597c3259
<                 $mime[] = sprintf('--%s%s', $boundary, $this->LE);
---
>                 $mime[] = sprintf('--%s%s', $boundary, static::$LE);
2601c3263
<                         'Content-Type: %s; name="%s"%s',
---
>                         'Content-Type: %s; name=%s%s',
2603,2604c3265,3266
<                         $this->encodeHeader($this->secureHeader($name)),
<                         $this->LE
---
>                         static::quotedString($this->encodeHeader($this->secureHeader($name))),
>                         static::$LE
2610c3272
<                         $this->LE
---
>                         static::$LE
2613,2615c3275,3277
<                 // RFC1341 part 5 says 7bit is assumed if not specified
<                 if ($encoding != '7bit') {
<                     $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
---
>                 //RFC1341 part 5 says 7bit is assumed if not specified
>                 if (static::ENCODING_7BIT !== $encoding) {
>                     $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, static::$LE);
2618,2619c3280,3282
<                 if ($disposition == 'inline') {
<                     $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
---
>                 //Only set Content-IDs on inline attachments
>                 if ((string) $cid !== '' && $disposition === 'inline') {
>                     $mime[] = 'Content-ID: <' . $this->encodeHeader($this->secureHeader($cid)) . '>' . static::$LE;
2622,2626c3285,3286
<                 // If a filename contains any of these chars, it should be quoted,
<                 // but not otherwise: RFC2183 & RFC2045 5.1
<                 // Fixes a warning in IETF's msglint MIME checker
<                 // Allow for bypassing the Content-Disposition header totally
<                 if (!(empty($disposition))) {
---
>                 //Allow for bypassing the Content-Disposition header
>                 if (!empty($disposition)) {
2628c3288
<                     if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
---
>                     if (!empty($encoded_name)) {
2630c3290
<                             'Content-Disposition: %s; filename="%s"%s',
---
>                             'Content-Disposition: %s; filename=%s%s',
2632,2633c3292,3293
<                             $encoded_name,
<                             $this->LE . $this->LE
---
>                             static::quotedString($encoded_name),
>                             static::$LE . static::$LE
2636,2649c3296,3300
<                         if (!empty($encoded_name)) {
<                             $mime[] = sprintf(
<                                 'Content-Disposition: %s; filename=%s%s',
<                                 $disposition,
<                                 $encoded_name,
<                                 $this->LE . $this->LE
<                             );
<                         } else {
<                             $mime[] = sprintf(
<                                 'Content-Disposition: %s%s',
<                                 $disposition,
<                                 $this->LE . $this->LE
<                             );
<                         }
---
>                         $mime[] = sprintf(
>                             'Content-Disposition: %s%s',
>                             $disposition,
>                             static::$LE . static::$LE
>                         );
2652c3303
<                     $mime[] = $this->LE;
---
>                     $mime[] = static::$LE;
2655c3306
<                 // Encode as string attachment
---
>                 //Encode as string attachment
2658,2661d3308
<                     if ($this->isError()) {
<                         return '';
<                     }
<                     $mime[] = $this->LE . $this->LE;
2664,2667d3310
<                     if ($this->isError()) {
<                         return '';
<                     }
<                     $mime[] = $this->LE . $this->LE;
2668a3312,3315
>                 if ($this->isError()) {
>                     return '';
>                 }
>                 $mime[] = static::$LE;
2672c3319
<         $mime[] = sprintf('--%s--%s', $boundary, $this->LE);
---
>         $mime[] = sprintf('--%s--%s', $boundary, static::$LE);
2680c3327,3328
<      * @param string $path The full path to the file
---
>      *
>      * @param string $path     The full path to the file
2682,2683c3330
<      * @throws phpmailerException
<      * @access protected
---
>      *
2686c3333
<     protected function encodeFile($path, $encoding = 'base64')
---
>     protected function encodeFile($path, $encoding = self::ENCODING_BASE64)
2689,2701c3336,3337
<             if (!is_readable($path)) {
<                 throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
<             }
<             $magic_quotes = get_magic_quotes_runtime();
<             if ($magic_quotes) {
<                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
<                     set_magic_quotes_runtime(false);
<                 } else {
<                     //Doesn't exist in PHP 5.4, but we don't need to check because
<                     //get_magic_quotes_runtime always returns false in 5.4+
<                     //so it will never get here
<                     ini_set('magic_quotes_runtime', false);
<                 }
---
>             if (!static::fileIsAccessible($path)) {
>                 throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
2704,2710c3340,3341
<             $file_buffer = $this->encodeString($file_buffer, $encoding);
<             if ($magic_quotes) {
<                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
<                     set_magic_quotes_runtime($magic_quotes);
<                 } else {
<                     ini_set('magic_quotes_runtime', $magic_quotes);
<                 }
---
>             if (false === $file_buffer) {
>                 throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
2711a3343,3344
>             $file_buffer = $this->encodeString($file_buffer, $encoding);
> 
2714a3348,3352
>             $this->edebug($exc->getMessage());
>             if ($this->exceptions) {
>                 throw $exc;
>             }
> 
2722c3360,3361
<      * @param string $str The text to encode
---
>      *
>      * @param string $str      The text to encode
2724c3363,3365
<      * @access public
---
>      *
>      * @throws Exception
>      *
2727c3368
<     public function encodeString($str, $encoding = 'base64')
---
>     public function encodeString($str, $encoding = self::ENCODING_BASE64)
2731,2732c3372,3377
<             case 'base64':
<                 $encoded = chunk_split(base64_encode($str), 76, $this->LE);
---
>             case static::ENCODING_BASE64:
>                 $encoded = chunk_split(
>                     base64_encode($str),
>                     static::STD_LINE_LENGTH,
>                     static::$LE
>                 );
2734,2739c3379,3384
<             case '7bit':
<             case '8bit':
<                 $encoded = $this->fixEOL($str);
<                 // Make sure it ends with a line break
<                 if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
<                     $encoded .= $this->LE;
---
>             case static::ENCODING_7BIT:
>             case static::ENCODING_8BIT:
>                 $encoded = static::normalizeBreaks($str);
>                 //Make sure it ends with a line break
>                 if (substr($encoded, -(strlen(static::$LE))) !== static::$LE) {
>                     $encoded .= static::$LE;
2742c3387
<             case 'binary':
---
>             case static::ENCODING_BINARY:
2745c3390
<             case 'quoted-printable':
---
>             case static::ENCODING_QUOTED_PRINTABLE:
2749a3395,3397
>                 if ($this->exceptions) {
>                     throw new Exception($this->lang('encoding') . $encoding);
>                 }
2751a3400
> 
2756,2760c3405,3411
<      * Encode a header string optimally.
<      * Picks shortest of Q, B, quoted-printable or none.
<      * @access public
<      * @param string $str
<      * @param string $position
---
>      * Encode a header value (not including its label) optimally.
>      * Picks shortest of Q, B, or none. Result includes folding if needed.
>      * See RFC822 definitions for phrase, comment and text positions.
>      *
>      * @param string $str      The header value to encode
>      * @param string $position What context the string will be used in
>      *
2769c3420
<                     // Can't use addslashes as we don't know the value of magic_quotes_sybase
---
>                     //Can't use addslashes as we don't know the value of magic_quotes_sybase
2771,2774c3422,3423
<                     if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
<                         return ($encoded);
<                     } else {
<                         return ("\"$encoded\"");
---
>                     if (($str === $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
>                         return $encoded;
2775a3425,3426
> 
>                     return "\"$encoded\"";
2779c3430
<             /** @noinspection PhpMissingBreakStatementInspection */
---
>             /* @noinspection PhpMissingBreakStatementInspection */
2782c3433
<                 // Intentional fall-through
---
>             //fallthrough
2789,2791c3440,3452
<         //There are no chars that need encoding
<         if ($matchcount == 0) {
<             return ($str);
---
>         if ($this->has8bitChars($str)) {
>             $charset = $this->CharSet;
>         } else {
>             $charset = static::CHARSET_ASCII;
>         }
> 
>         //Q/B encoding adds 8 chars and the charset ("` =?<charset>?[QB]?<content>?=`").
>         $overhead = 8 + strlen($charset);
> 
>         if ('mail' === $this->Mailer) {
>             $maxlen = static::MAIL_MAX_LINE_LENGTH - $overhead;
>         } else {
>             $maxlen = static::MAX_LINE_LENGTH - $overhead;
2794,2795c3455
<         $maxlen = 75 - 7 - strlen($this->CharSet);
<         // Try to select the encoding which should produce the shortest output
---
>         //Select the encoding that produces the shortest output and/or prevents corruption.
2797c3457
<             // More than a third of the content will need encoding, so B encoding will be most efficient
---
>             //More than 1/3 of the content needs encoding, use B-encode.
2799,2808c3459,3463
<             if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) {
<                 // Use a custom function which correctly encodes and wraps long
<                 // multibyte strings without breaking lines within a character
<                 $encoded = $this->base64EncodeWrapMB($str, "\n");
<             } else {
<                 $encoded = base64_encode($str);
<                 $maxlen -= $maxlen % 4;
<                 $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
<             }
<         } else {
---
>         } elseif ($matchcount > 0) {
>             //Less than 1/3 of the content needs encoding, use Q-encode.
>             $encoding = 'Q';
>         } elseif (strlen($str) > $maxlen) {
>             //No encoding needed, but value exceeds max line length, use Q-encode to prevent corruption.
2810,2812c3465,3467
<             $encoded = $this->encodeQ($str, $position);
<             $encoded = $this->wrapText($encoded, $maxlen, true);
<             $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
---
>         } else {
>             //No reformatting needed
>             $encoding = false;
2815,2816c3470,3491
<         $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
<         $encoded = trim(str_replace("\n", $this->LE, $encoded));
---
>         switch ($encoding) {
>             case 'B':
>                 if ($this->hasMultiBytes($str)) {
>                     //Use a custom function which correctly encodes and wraps long
>                     //multibyte strings without breaking lines within a character
>                     $encoded = $this->base64EncodeWrapMB($str, "\n");
>                 } else {
>                     $encoded = base64_encode($str);
>                     $maxlen -= $maxlen % 4;
>                     $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
>                 }
>                 $encoded = preg_replace('/^(.*)$/m', ' =?' . $charset . "?$encoding?\\1?=", $encoded);
>                 break;
>             case 'Q':
>                 $encoded = $this->encodeQ($str, $position);
>                 $encoded = $this->wrapText($encoded, $maxlen, true);
>                 $encoded = str_replace('=' . static::$LE, "\n", trim($encoded));
>                 $encoded = preg_replace('/^(.*)$/m', ' =?' . $charset . "?$encoding?\\1?=", $encoded);
>                 break;
>             default:
>                 return $str;
>         }
2818c3493
<         return $encoded;
---
>         return trim(static::normalizeBreaks($encoded));
2823c3498
<      * @access public
---
>      *
2825c3500,3501
<      * @return boolean
---
>      *
>      * @return bool
2830,2832c3506
<             return (strlen($str) > mb_strlen($str, $this->CharSet));
<         } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
<             return false;
---
>             return strlen($str) > mb_strlen($str, $this->CharSet);
2833a3508,3510
> 
>         //Assume no multibytes (we can't handle without mbstring functions anyway)
>         return false;
2837a3515
>      *
2839c3517,3518
<      * @return boolean
---
>      *
>      * @return bool
2843c3522
<         return (boolean)preg_match('/[\x80-\xFF]/', $text);
---
>         return (bool) preg_match('/[\x80-\xFF]/', $text);
2849,2852c3528,3532
<      * Adapted from a function by paravoid
<      * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
<      * @access public
<      * @param string $str multi-byte text to wrap encode
---
>      * Adapted from a function by paravoid.
>      *
>      * @see http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
>      *
>      * @param string $str       multi-byte text to wrap encode
2853a3534
>      *
2861,2862c3542,3543
<         if ($linebreak === null) {
<             $linebreak = $this->LE;
---
>         if (null === $linebreak) {
>             $linebreak = static::$LE;
2866c3547
<         // Each line must have length <= 75, including $start and $end
---
>         //Each line must have length <= 75, including $start and $end
2868c3549
<         // Average multi-byte ratio
---
>         //Average multi-byte ratio
2870c3551
<         // Base64 has a 4:3 ratio
---
>         //Base64 has a 4:3 ratio
2872a3554
>         $offset = 0;
2879c3561
<                 $lookBack++;
---
>                 ++$lookBack;
2884,2886c3566,3567
<         // Chomp the last linefeed
<         $encoded = substr($encoded, 0, -strlen($linebreak));
<         return $encoded;
---
>         //Chomp the last linefeed
>         return substr($encoded, 0, -strlen($linebreak));
2892c3573
<      * @access public
---
>      *
2894c3575
<      * @param integer $line_max Number of chars allowed on a line before wrapping
---
>      *
2896d3576
<      * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
2898c3578
<     public function encodeQP($string, $line_max = 76)
---
>     public function encodeQP($string)
2900,2928c3580
<         // Use native function if it's available (>= PHP5.3)
<         if (function_exists('quoted_printable_encode')) {
<             return quoted_printable_encode($string);
<         }
<         // Fall back to a pure PHP implementation
<         $string = str_replace(
<             array('%20', '%0D%0A.', '%0D%0A', '%'),
<             array(' ', "\r\n=2E", "\r\n", '='),
<             rawurlencode($string)
<         );
<         return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
<     }
< 
<     /**
<      * Backward compatibility wrapper for an old QP encoding function that was removed.
<      * @see PHPMailer::encodeQP()
<      * @access public
<      * @param string $string
<      * @param integer $line_max
<      * @param boolean $space_conv
<      * @return string
<      * @deprecated Use encodeQP instead.
<      */
<     public function encodeQPphp(
<         $string,
<         $line_max = 76,
<         /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
<     ) {
<         return $this->encodeQP($string, $line_max);
---
>         return static::normalizeBreaks(quoted_printable_encode($string));
2933,2934c3585,3588
<      * @link http://tools.ietf.org/html/rfc2047
<      * @param string $str the text to encode
---
>      *
>      * @see http://tools.ietf.org/html/rfc2047#section-4.2
>      *
>      * @param string $str      the text to encode
2936c3590
<      * @access public
---
>      *
2941c3595
<         // There should not be any EOL in the string
---
>         //There should not be any EOL in the string
2943c3597
<         $encoded = str_replace(array("\r", "\n"), '', $str);
---
>         $encoded = str_replace(["\r", "\n"], '', $str);
2946c3600
<                 // RFC 2047 section 5.3
---
>                 //RFC 2047 section 5.3
2949c3603,3607
<             /** @noinspection PhpMissingBreakStatementInspection */
---
>             /*
>              * RFC 2047 section 5.2.
>              * Build $pattern without including delimiters and []
>              */
>             /* @noinspection PhpMissingBreakStatementInspection */
2951d3608
<                 // RFC 2047 section 5.2
2953,2954c3610
<                 // intentional fall-through
<                 // for this reason we build the $pattern without including delimiters and []
---
>             /* Intentional fall through */
2957,2958c3613,3614
<                 // RFC 2047 section 5.1
<                 // Replace every high ascii, control, =, ? and _ characters
---
>                 //RFC 2047 section 5.1
>                 //Replace every high ascii, control, =, ? and _ characters
2962c3618
<         $matches = array();
---
>         $matches = [];
2964,2966c3620,3622
<             // If the string contains an '=', make sure it's the first thing we replace
<             // so as to avoid double-encoding
<             $eqkey = array_search('=', $matches[0]);
---
>             //If the string contains an '=', make sure it's the first thing we replace
>             //so as to avoid double-encoding
>             $eqkey = array_search('=', $matches[0], true);
2975c3631,3632
<         // Replace every spaces to _ (more readable than =20)
---
>         //Replace spaces with _ (more readable than =20)
>         //RFC 2047 section 4.2(2)
2983,2986c3640,3644
<      * @param string $string String attachment data.
<      * @param string $filename Name of the attachment.
<      * @param string $encoding File encoding (see $Encoding).
<      * @param string $type File extension (MIME) type.
---
>      *
>      * @param string $string      String attachment data
>      * @param string $filename    Name of the attachment
>      * @param string $encoding    File encoding (see $Encoding)
>      * @param string $type        File extension (MIME) type
2988c3646,3649
<      * @return void
---
>      *
>      * @throws Exception
>      *
>      * @return bool True on successfully adding an attachment
2993c3654
<         $encoding = 'base64',
---
>         $encoding = self::ENCODING_BASE64,
2997,3011c3658,3689
<         // If a MIME type is not specified, try to work it out from the file name
<         if ($type == '') {
<             $type = self::filenameToType($filename);
<         }
<         // Append to $attachment array
<         $this->attachment[] = array(
<             0 => $string,
<             1 => $filename,
<             2 => basename($filename),
<             3 => $encoding,
<             4 => $type,
<             5 => true, // isStringAttachment
<             6 => $disposition,
<             7 => 0
<         );
---
>         try {
>             //If a MIME type is not specified, try to work it out from the file name
>             if ('' === $type) {
>                 $type = static::filenameToType($filename);
>             }
> 
>             if (!$this->validateEncoding($encoding)) {
>                 throw new Exception($this->lang('encoding') . $encoding);
>             }
> 
>             //Append to $attachment array
>             $this->attachment[] = [
>                 0 => $string,
>                 1 => $filename,
>                 2 => static::mb_pathinfo($filename, PATHINFO_BASENAME),
>                 3 => $encoding,
>                 4 => $type,
>                 5 => true, //isStringAttachment
>                 6 => $disposition,
>                 7 => 0,
>             ];
>         } catch (Exception $exc) {
>             $this->setError($exc->getMessage());
>             $this->edebug($exc->getMessage());
>             if ($this->exceptions) {
>                 throw $exc;
>             }
> 
>             return false;
>         }
> 
>         return true;
3022,3027c3700,3706
<      * @param string $path Path to the attachment.
<      * @param string $cid Content ID of the attachment; Use this to reference
<      *        the content when using an embedded image in HTML.
<      * @param string $name Overrides the attachment name.
<      * @param string $encoding File encoding (see $Encoding).
<      * @param string $type File MIME type.
---
>      *
>      * @param string $path        Path to the attachment
>      * @param string $cid         Content ID of the attachment; Use this to reference
>      *                            the content when using an embedded image in HTML
>      * @param string $name        Overrides the attachment name
>      * @param string $encoding    File encoding (see $Encoding)
>      * @param string $type        File MIME type
3029c3708,3711
<      * @return boolean True on successfully adding an attachment
---
>      *
>      * @throws Exception
>      *
>      * @return bool True on successfully adding an attachment
3031,3034c3713,3757
<     public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
<     {
<         if (!@is_file($path)) {
<             $this->setError($this->lang('file_access') . $path);
---
>     public function addEmbeddedImage(
>         $path,
>         $cid,
>         $name = '',
>         $encoding = self::ENCODING_BASE64,
>         $type = '',
>         $disposition = 'inline'
>     ) {
>         try {
>             if (!static::fileIsAccessible($path)) {
>                 throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
>             }
> 
>             //If a MIME type is not specified, try to work it out from the file name
>             if ('' === $type) {
>                 $type = static::filenameToType($path);
>             }
> 
>             if (!$this->validateEncoding($encoding)) {
>                 throw new Exception($this->lang('encoding') . $encoding);
>             }
> 
>             $filename = (string) static::mb_pathinfo($path, PATHINFO_BASENAME);
>             if ('' === $name) {
>                 $name = $filename;
>             }
> 
>             //Append to $attachment array
>             $this->attachment[] = [
>                 0 => $path,
>                 1 => $filename,
>                 2 => $name,
>                 3 => $encoding,
>                 4 => $type,
>                 5 => false, //isStringAttachment
>                 6 => $disposition,
>                 7 => $cid,
>             ];
>         } catch (Exception $exc) {
>             $this->setError($exc->getMessage());
>             $this->edebug($exc->getMessage());
>             if ($this->exceptions) {
>                 throw $exc;
>             }
> 
3038,3058d3760
<         // If a MIME type is not specified, try to work it out from the file name
<         if ($type == '') {
<             $type = self::filenameToType($path);
<         }
< 
<         $filename = basename($path);
<         if ($name == '') {
<             $name = $filename;
<         }
< 
<         // Append to $attachment array
<         $this->attachment[] = array(
<             0 => $path,
<             1 => $filename,
<             2 => $name,
<             3 => $encoding,
<             4 => $type,
<             5 => false, // isStringAttachment
<             6 => $disposition,
<             7 => $cid
<         );
3065,3072c3767,3776
<      * Be sure to set the $type to an image type for images:
<      * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
<      * @param string $string The attachment binary data.
<      * @param string $cid Content ID of the attachment; Use this to reference
<      *        the content when using an embedded image in HTML.
<      * @param string $name
<      * @param string $encoding File encoding (see $Encoding).
<      * @param string $type MIME type.
---
>      * If your filename doesn't contain an extension, be sure to set the $type to an appropriate MIME type.
>      *
>      * @param string $string      The attachment binary data
>      * @param string $cid         Content ID of the attachment; Use this to reference
>      *                            the content when using an embedded image in HTML
>      * @param string $name        A filename for the attachment. If this contains an extension,
>      *                            PHPMailer will attempt to set a MIME type for the attachment.
>      *                            For example 'file.jpg' would get an 'image/jpeg' MIME type.
>      * @param string $encoding    File encoding (see $Encoding), defaults to 'base64'
>      * @param string $type        MIME type - will be used in preference to any automatically derived type
3074c3778,3781
<      * @return boolean True on successfully adding an attachment
---
>      *
>      * @throws Exception
>      *
>      * @return bool True on successfully adding an attachment
3080c3787
<         $encoding = 'base64',
---
>         $encoding = self::ENCODING_BASE64,
3084,3086c3791,3819
<         // If a MIME type is not specified, try to work it out from the name
<         if ($type == '' and !empty($name)) {
<             $type = self::filenameToType($name);
---
>         try {
>             //If a MIME type is not specified, try to work it out from the name
>             if ('' === $type && !empty($name)) {
>                 $type = static::filenameToType($name);
>             }
> 
>             if (!$this->validateEncoding($encoding)) {
>                 throw new Exception($this->lang('encoding') . $encoding);
>             }
> 
>             //Append to $attachment array
>             $this->attachment[] = [
>                 0 => $string,
>                 1 => $name,
>                 2 => $name,
>                 3 => $encoding,
>                 4 => $type,
>                 5 => true, //isStringAttachment
>                 6 => $disposition,
>                 7 => $cid,
>             ];
>         } catch (Exception $exc) {
>             $this->setError($exc->getMessage());
>             $this->edebug($exc->getMessage());
>             if ($this->exceptions) {
>                 throw $exc;
>             }
> 
>             return false;
3089,3099d3821
<         // Append to $attachment array
<         $this->attachment[] = array(
<             0 => $string,
<             1 => $name,
<             2 => $name,
<             3 => $encoding,
<             4 => $type,
<             5 => true, // isStringAttachment
<             6 => $disposition,
<             7 => $cid
<         );
3103a3826,3865
>      * Validate encodings.
>      *
>      * @param string $encoding
>      *
>      * @return bool
>      */
>     protected function validateEncoding($encoding)
>     {
>         return in_array(
>             $encoding,
>             [
>                 self::ENCODING_7BIT,
>                 self::ENCODING_QUOTED_PRINTABLE,
>                 self::ENCODING_BASE64,
>                 self::ENCODING_8BIT,
>                 self::ENCODING_BINARY,
>             ],
>             true
>         );
>     }
> 
>     /**
>      * Check if an embedded attachment is present with this cid.
>      *
>      * @param string $cid
>      *
>      * @return bool
>      */
>     protected function cidExists($cid)
>     {
>         foreach ($this->attachment as $attachment) {
>             if ('inline' === $attachment[6] && $cid === $attachment[7]) {
>                 return true;
>             }
>         }
> 
>         return false;
>     }
> 
>     /**
3105,3106c3867,3868
<      * @access public
<      * @return boolean
---
>      *
>      * @return bool
3111c3873
<             if ($attachment[6] == 'inline') {
---
>             if ('inline' === $attachment[6]) {
3114a3877
> 
3120c3883,3884
<      * @return boolean
---
>      *
>      * @return bool
3125c3889
<             if ($attachment[6] == 'attachment') {
---
>             if ('attachment' === $attachment[6]) {
3128a3893
> 
3134c3899,3900
<      * @return boolean
---
>      *
>      * @return bool
3143c3909
<      * @access protected
---
>      *
3145d3910
<      * @return void
3149,3152c3914,3917
<         $RecipientsQueue = $this->RecipientsQueue;
<         foreach ($RecipientsQueue as $address => $params) {
<             if ($params[0] == $kind) {
<                 unset($this->RecipientsQueue[$address]);
---
>         $this->RecipientsQueue = array_filter(
>             $this->RecipientsQueue,
>             static function ($params) use ($kind) {
>                 return $params[0] !== $kind;
3154c3919
<         }
---
>         );
3159d3923
<      * @return void
3166c3930
<         $this->to = array();
---
>         $this->to = [];
3172d3935
<      * @return void
3179c3942
<         $this->cc = array();
---
>         $this->cc = [];
3185d3947
<      * @return void
3192c3954
<         $this->bcc = array();
---
>         $this->bcc = [];
3198d3959
<      * @return void
3202,3203c3963,3964
<         $this->ReplyTo = array();
<         $this->ReplyToQueue = array();
---
>         $this->ReplyTo = [];
>         $this->ReplyToQueue = [];
3208d3968
<      * @return void
3212,3216c3972,3976
<         $this->to = array();
<         $this->cc = array();
<         $this->bcc = array();
<         $this->all_recipients = array();
<         $this->RecipientsQueue = array();
---
>         $this->to = [];
>         $this->cc = [];
>         $this->bcc = [];
>         $this->all_recipients = [];
>         $this->RecipientsQueue = [];
3221d3980
<      * @return void
3225c3984
<         $this->attachment = array();
---
>         $this->attachment = [];
3230d3988
<      * @return void
3234c3992
<         $this->CustomHeader = array();
---
>         $this->CustomHeader = [];
3239c3997
<      * @access protected
---
>      *
3241d3998
<      * @return void
3245,3246c4002,4003
<         $this->error_count++;
<         if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
---
>         ++$this->error_count;
>         if ('smtp' === $this->Mailer && null !== $this->smtp) {
3251c4008
<                     $msg .= ' Detail: '. $lasterror['detail'];
---
>                     $msg .= ' ' . $this->lang('smtp_detail') . $lasterror['detail'];
3254c4011
<                     $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
---
>                     $msg .= ' ' . $this->lang('smtp_code') . $lasterror['smtp_code'];
3257c4014
<                     $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
---
>                     $msg .= ' ' . $this->lang('smtp_code_ex') . $lasterror['smtp_code_ex'];
3266c4023
<      * @access public
---
>      *
3268d4024
<      * @static
3272,3273c4028,4029
<         // Set the time zone to whatever the default is to avoid 500 errors
<         // Will default to UTC if it's not set properly in php.ini
---
>         //Set the time zone to whatever the default is to avoid 500 errors
>         //Will default to UTC if it's not set properly in php.ini
3274a4031
> 
3281c4038
<      * @access protected
---
>      *
3286c4043
<         $result = 'localhost.localdomain';
---
>         $result = '';
3289c4046
<         } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
---
>         } elseif (isset($_SERVER) && array_key_exists('SERVER_NAME', $_SERVER)) {
3295a4053,4056
>         if (!static::isValidHost($result)) {
>             return 'localhost.localdomain';
>         }
> 
3299a4061,4097
>      * Validate whether a string contains a valid value to use as a hostname or IP address.
>      * IPv6 addresses must include [], e.g. `[::1]`, not just `::1`.
>      *
>      * @param string $host The host name or IP address to check
>      *
>      * @return bool
>      */
>     public static function isValidHost($host)
>     {
>         //Simple syntax limits
>         if (
>             empty($host)
>             || !is_string($host)
>             || strlen($host) > 256
>             || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+\])$/', $host)
>         ) {
>             return false;
>         }
>         //Looks like a bracketed IPv6 address
>         if (strlen($host) > 2 && substr($host, 0, 1) === '[' && substr($host, -1, 1) === ']') {
>             return filter_var(substr($host, 1, -1), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false;
>         }
>         //If removing all the dots results in a numeric string, it must be an IPv4 address.
>         //Need to check this first because otherwise things like `999.0.0.0` are considered valid host names
>         if (is_numeric(str_replace('.', '', $host))) {
>             //Is it a valid IPv4 address?
>             return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
>         }
>         if (filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false) {
>             //Is it a syntactically valid hostname?
>             return true;
>         }
> 
>         return false;
>     }
> 
>     /**
3301c4099
<      * @access protected
---
>      *
3302a4101
>      *
3308c4107
<             $this->setLanguage('en'); // set the default language
---
>             $this->setLanguage(); //Set the default language
3312,3314c4111,4113
<             if ($key == 'smtp_connect_failed') {
<                 //Include a link to troubleshooting docs on SMTP connection failure
<                 //this is by far the biggest cause of support questions
---
>             if ('smtp_connect_failed' === $key) {
>                 //Include a link to troubleshooting docs on SMTP connection failure.
>                 //This is by far the biggest cause of support questions
3317a4117
> 
3319,3321d4118
<         } else {
<             //Return the key as a fallback
<             return $key;
3322a4120,4122
> 
>         //Return the key as a fallback
>         return $key;
3327,3328c4127,4128
<      * @access public
<      * @return boolean True if an error did occur.
---
>      *
>      * @return bool True if an error did occur
3332,3350c4132
<         return ($this->error_count > 0);
<     }
< 
<     /**
<      * Ensure consistent line endings in a string.
<      * Changes every end of line from CRLF, CR or LF to $this->LE.
<      * @access public
<      * @param string $str String to fixEOL
<      * @return string
<      */
<     public function fixEOL($str)
<     {
<         // Normalise to \n
<         $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
<         // Now convert LE as needed
<         if ($this->LE !== "\n") {
<             $nstr = str_replace("\n", $this->LE, $nstr);
<         }
<         return $nstr;
---
>         return $this->error_count > 0;
3356,3360c4138,4143
<      * both header name and value (name:value)
<      * @access public
<      * @param string $name Custom header name
<      * @param string $value Header value
<      * @return void
---
>      * both header name and value (name:value).
>      *
>      * @param string      $name  Custom header name
>      * @param string|null $value Header value
>      *
>      * @throws Exception
3364,3368c4147,4159
<         if ($value === null) {
<             // Value passed in as name:value
<             $this->CustomHeader[] = explode(':', $name, 2);
<         } else {
<             $this->CustomHeader[] = array($name, $value);
---
>         if (null === $value && strpos($name, ':') !== false) {
>             //Value passed in as name:value
>             list($name, $value) = explode(':', $name, 2);
>         }
>         $name = trim($name);
>         $value = (null === $value) ? '' : trim($value);
>         //Ensure name is not empty, and that neither name nor value contain line breaks
>         if (empty($name) || strpbrk($name . $value, "\r\n") !== false) {
>             if ($this->exceptions) {
>                 throw new Exception($this->lang('invalid_header'));
>             }
> 
>             return false;
3369a4161,4163
>         $this->CustomHeader[] = [$name, $value];
> 
>         return true;
3373a4168
>      *
3388a4184
>      * Converts data-uri images into embedded attachments.
3390,3395c4186,4195
<      * @access public
<      * @param string $message HTML message string
<      * @param string $basedir Absolute path to a base directory to prepend to relative paths to images
<      * @param boolean|callable $advanced Whether to use the internal HTML to text converter
<      *    or your own custom converter @see PHPMailer::html2text()
<      * @return string $message The transformed message Body
---
>      *
>      * @param string        $message  HTML message string
>      * @param string        $basedir  Absolute path to a base directory to prepend to relative paths to images
>      * @param bool|callable $advanced Whether to use the internal HTML to text converter
>      *                                or your own custom converter
>      * @return string The transformed message body
>      *
>      * @throws Exception
>      *
>      * @see PHPMailer::html2text()
3399c4199
<         preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
---
>         preg_match_all('/(?<!-)(src|background)=["\'](.*)["\']/Ui', $message, $images);
3401,3402c4201,4202
<             if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
<                 // Ensure $basedir has a trailing /
---
>             if (strlen($basedir) > 1 && '/' !== substr($basedir, -1)) {
>                 //Ensure $basedir has a trailing /
3406,3410c4206,4213
<                 // Convert data URIs into embedded images
<                 if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
<                     $data = substr($url, strpos($url, ','));
<                     if ($match[2]) {
<                         $data = base64_decode($data);
---
>                 //Convert data URIs into embedded images
>                 //e.g. "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
>                 $match = [];
>                 if (preg_match('#^data:(image/(?:jpe?g|gif|png));?(base64)?,(.+)#', $url, $match)) {
>                     if (count($match) === 4 && static::ENCODING_BASE64 === $match[2]) {
>                         $data = base64_decode($match[3]);
>                     } elseif ('' === $match[2]) {
>                         $data = rawurldecode($match[3]);
3412c4215,4216
<                         $data = rawurldecode($data);
---
>                         //Not recognised so leave it alone
>                         continue;
3414,3419c4218,4228
<                     $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
<                     if ($this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1])) {
<                         $message = str_replace(
<                             $images[0][$imgindex],
<                             $images[1][$imgindex] . '="cid:' . $cid . '"',
<                             $message
---
>                     //Hash the decoded data, not the URL, so that the same data-URI image used in multiple places
>                     //will only be embedded once, even if it used a different encoding
>                     $cid = substr(hash('sha256', $data), 0, 32) . '@phpmailer.0'; //RFC2392 S 2
> 
>                     if (!$this->cidExists($cid)) {
>                         $this->addStringEmbeddedImage(
>                             $data,
>                             $cid,
>                             'embed' . $imgindex,
>                             static::ENCODING_BASE64,
>                             $match[1]
3421a4231,4235
>                     $message = str_replace(
>                         $images[0][$imgindex],
>                         $images[1][$imgindex] . '="cid:' . $cid . '"',
>                         $message
>                     );
3425c4239
<                     // Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
---
>                     //Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
3427c4241
<                     // Ignore URLs containing parent dir traversal (..)
---
>                     //Ignore URLs containing parent dir traversal (..)
3429,3431c4243,4245
<                     // Do not change urls that are already inline images
<                     && substr($url, 0, 4) !== 'cid:'
<                     // Do not change absolute URLs, including anonymous protocol
---
>                     //Do not change urls that are already inline images
>                     && 0 !== strpos($url, 'cid:')
>                     //Do not change absolute URLs, including anonymous protocol
3434c4248
<                     $filename = basename($url);
---
>                     $filename = static::mb_pathinfo($url, PATHINFO_BASENAME);
3436c4250
<                     if ($directory == '.') {
---
>                     if ('.' === $directory) {
3439,3440c4253,4258
<                     $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
<                     if (strlen($directory) > 1 && substr($directory, -1) != '/') {
---
>                     //RFC2392 S 2
>                     $cid = substr(hash('sha256', $url), 0, 32) . '@phpmailer.0';
>                     if (strlen($basedir) > 1 && '/' !== substr($basedir, -1)) {
>                         $basedir .= '/';
>                     }
>                     if (strlen($directory) > 1 && '/' !== substr($directory, -1)) {
3443,3449c4261,4268
<                     if ($this->addEmbeddedImage(
<                         $basedir . $directory . $filename,
<                         $cid,
<                         $filename,
<                         'base64',
<                         self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
<                     )
---
>                     if (
>                         $this->addEmbeddedImage(
>                             $basedir . $directory . $filename,
>                             $cid,
>                             $filename,
>                             static::ENCODING_BASE64,
>                             static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
>                         )
3460,3463c4279,4282
<         $this->isHTML(true);
<         // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
<         $this->Body = $this->normalizeBreaks($message);
<         $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
---
>         $this->isHTML();
>         //Convert all message body line breaks to LE, makes quoted-printable encoding work much better
>         $this->Body = static::normalizeBreaks($message);
>         $this->AltBody = static::normalizeBreaks($this->html2text($message, $advanced));
3465,3466c4284,4285
<             $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
<                 self::CRLF . self::CRLF;
---
>             $this->AltBody = 'This is an HTML-only message. To view it, activate HTML in your email application.'
>                 . static::$LE;
3467a4287
> 
3475c4295
<      * which was been removed for license reasons in #232.
---
>      * which was removed for license reasons in #232.
3477,3478c4297,4299
<      * <code>
<      * // Use default conversion
---
>      *
>      * ```php
>      * //Use default conversion
3480c4301
<      * // Use your own custom converter
---
>      * //Use your own custom converter
3485,3488c4306,4312
<      * </code>
<      * @param string $html The HTML text to convert
<      * @param boolean|callable $advanced Any boolean value to use the internal converter,
<      *   or provide your own callable for custom conversion.
---
>      * ```
>      *
>      * @param string        $html     The HTML text to convert
>      * @param bool|callable $advanced Any boolean value to use the internal converter,
>      *                                or provide your own callable for custom conversion.
>      *                                *Never* pass user-supplied data into this parameter
>      *
3495a4320
> 
3504a4330
>      *
3506,3508c4332,4333
<      * @access public
<      * @return string MIME type of file.
<      * @static
---
>      *
>      * @return string MIME type of file
3512,3529c4337,4354
<         $mimes = array(
<             'xl'    => 'application/excel',
<             'js'    => 'application/javascript',
<             'hqx'   => 'application/mac-binhex40',
<             'cpt'   => 'application/mac-compactpro',
<             'bin'   => 'application/macbinary',
<             'doc'   => 'application/msword',
<             'word'  => 'application/msword',
<             'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
<             'xltx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
<             'potx'  => 'application/vnd.openxmlformats-officedocument.presentationml.template',
<             'ppsx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
<             'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
<             'sldx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
<             'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
<             'dotx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
<             'xlam'  => 'application/vnd.ms-excel.addin.macroEnabled.12',
<             'xlsb'  => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
---
>         $mimes = [
>             'xl' => 'application/excel',
>             'js' => 'application/javascript',
>             'hqx' => 'application/mac-binhex40',
>             'cpt' => 'application/mac-compactpro',
>             'bin' => 'application/macbinary',
>             'doc' => 'application/msword',
>             'word' => 'application/msword',
>             'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
>             'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
>             'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
>             'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
>             'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
>             'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
>             'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
>             'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
>             'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
>             'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
3531,3548c4356,4373
<             'dll'   => 'application/octet-stream',
<             'dms'   => 'application/octet-stream',
<             'exe'   => 'application/octet-stream',
<             'lha'   => 'application/octet-stream',
<             'lzh'   => 'application/octet-stream',
<             'psd'   => 'application/octet-stream',
<             'sea'   => 'application/octet-stream',
<             'so'    => 'application/octet-stream',
<             'oda'   => 'application/oda',
<             'pdf'   => 'application/pdf',
<             'ai'    => 'application/postscript',
<             'eps'   => 'application/postscript',
<             'ps'    => 'application/postscript',
<             'smi'   => 'application/smil',
<             'smil'  => 'application/smil',
<             'mif'   => 'application/vnd.mif',
<             'xls'   => 'application/vnd.ms-excel',
<             'ppt'   => 'application/vnd.ms-powerpoint',
---
>             'dll' => 'application/octet-stream',
>             'dms' => 'application/octet-stream',
>             'exe' => 'application/octet-stream',
>             'lha' => 'application/octet-stream',
>             'lzh' => 'application/octet-stream',
>             'psd' => 'application/octet-stream',
>             'sea' => 'application/octet-stream',
>             'so' => 'application/octet-stream',
>             'oda' => 'application/oda',
>             'pdf' => 'application/pdf',
>             'ai' => 'application/postscript',
>             'eps' => 'application/postscript',
>             'ps' => 'application/postscript',
>             'smi' => 'application/smil',
>             'smil' => 'application/smil',
>             'mif' => 'application/vnd.mif',
>             'xls' => 'application/vnd.ms-excel',
>             'ppt' => 'application/vnd.ms-powerpoint',
3550,3558c4375,4383
<             'wmlc'  => 'application/vnd.wap.wmlc',
<             'dcr'   => 'application/x-director',
<             'dir'   => 'application/x-director',
<             'dxr'   => 'application/x-director',
<             'dvi'   => 'application/x-dvi',
<             'gtar'  => 'application/x-gtar',
<             'php3'  => 'application/x-httpd-php',
<             'php4'  => 'application/x-httpd-php',
<             'php'   => 'application/x-httpd-php',
---
>             'wmlc' => 'application/vnd.wap.wmlc',
>             'dcr' => 'application/x-director',
>             'dir' => 'application/x-director',
>             'dxr' => 'application/x-director',
>             'dvi' => 'application/x-dvi',
>             'gtar' => 'application/x-gtar',
>             'php3' => 'application/x-httpd-php',
>             'php4' => 'application/x-httpd-php',
>             'php' => 'application/x-httpd-php',
3560,3565c4385,4390
<             'phps'  => 'application/x-httpd-php-source',
<             'swf'   => 'application/x-shockwave-flash',
<             'sit'   => 'application/x-stuffit',
<             'tar'   => 'application/x-tar',
<             'tgz'   => 'application/x-tar',
<             'xht'   => 'application/xhtml+xml',
---
>             'phps' => 'application/x-httpd-php-source',
>             'swf' => 'application/x-shockwave-flash',
>             'sit' => 'application/x-stuffit',
>             'tar' => 'application/x-tar',
>             'tgz' => 'application/x-tar',
>             'xht' => 'application/xhtml+xml',
3567,3592c4392,4425
<             'zip'   => 'application/zip',
<             'mid'   => 'audio/midi',
<             'midi'  => 'audio/midi',
<             'mp2'   => 'audio/mpeg',
<             'mp3'   => 'audio/mpeg',
<             'mpga'  => 'audio/mpeg',
<             'aif'   => 'audio/x-aiff',
<             'aifc'  => 'audio/x-aiff',
<             'aiff'  => 'audio/x-aiff',
<             'ram'   => 'audio/x-pn-realaudio',
<             'rm'    => 'audio/x-pn-realaudio',
<             'rpm'   => 'audio/x-pn-realaudio-plugin',
<             'ra'    => 'audio/x-realaudio',
<             'wav'   => 'audio/x-wav',
<             'bmp'   => 'image/bmp',
<             'gif'   => 'image/gif',
<             'jpeg'  => 'image/jpeg',
<             'jpe'   => 'image/jpeg',
<             'jpg'   => 'image/jpeg',
<             'png'   => 'image/png',
<             'tiff'  => 'image/tiff',
<             'tif'   => 'image/tiff',
<             'eml'   => 'message/rfc822',
<             'css'   => 'text/css',
<             'html'  => 'text/html',
<             'htm'   => 'text/html',
---
>             'zip' => 'application/zip',
>             'mid' => 'audio/midi',
>             'midi' => 'audio/midi',
>             'mp2' => 'audio/mpeg',
>             'mp3' => 'audio/mpeg',
>             'm4a' => 'audio/mp4',
>             'mpga' => 'audio/mpeg',
>             'aif' => 'audio/x-aiff',
>             'aifc' => 'audio/x-aiff',
>             'aiff' => 'audio/x-aiff',
>             'ram' => 'audio/x-pn-realaudio',
>             'rm' => 'audio/x-pn-realaudio',
>             'rpm' => 'audio/x-pn-realaudio-plugin',
>             'ra' => 'audio/x-realaudio',
>             'wav' => 'audio/x-wav',
>             'mka' => 'audio/x-matroska',
>             'bmp' => 'image/bmp',
>             'gif' => 'image/gif',
>             'jpeg' => 'image/jpeg',
>             'jpe' => 'image/jpeg',
>             'jpg' => 'image/jpeg',
>             'png' => 'image/png',
>             'tiff' => 'image/tiff',
>             'tif' => 'image/tiff',
>             'webp' => 'image/webp',
>             'avif' => 'image/avif',
>             'heif' => 'image/heif',
>             'heifs' => 'image/heif-sequence',
>             'heic' => 'image/heic',
>             'heics' => 'image/heic-sequence',
>             'eml' => 'message/rfc822',
>             'css' => 'text/css',
>             'html' => 'text/html',
>             'htm' => 'text/html',
3594,3599c4427,4432
<             'log'   => 'text/plain',
<             'text'  => 'text/plain',
<             'txt'   => 'text/plain',
<             'rtx'   => 'text/richtext',
<             'rtf'   => 'text/rtf',
<             'vcf'   => 'text/vcard',
---
>             'log' => 'text/plain',
>             'text' => 'text/plain',
>             'txt' => 'text/plain',
>             'rtx' => 'text/richtext',
>             'rtf' => 'text/rtf',
>             'vcf' => 'text/vcard',
3601,3613c4434,4453
<             'xml'   => 'text/xml',
<             'xsl'   => 'text/xml',
<             'mpeg'  => 'video/mpeg',
<             'mpe'   => 'video/mpeg',
<             'mpg'   => 'video/mpeg',
<             'mov'   => 'video/quicktime',
<             'qt'    => 'video/quicktime',
<             'rv'    => 'video/vnd.rn-realvideo',
<             'avi'   => 'video/x-msvideo',
<             'movie' => 'video/x-sgi-movie'
<         );
<         if (array_key_exists(strtolower($ext), $mimes)) {
<             return $mimes[strtolower($ext)];
---
>             'ics' => 'text/calendar',
>             'xml' => 'text/xml',
>             'xsl' => 'text/xml',
>             'wmv' => 'video/x-ms-wmv',
>             'mpeg' => 'video/mpeg',
>             'mpe' => 'video/mpeg',
>             'mpg' => 'video/mpeg',
>             'mp4' => 'video/mp4',
>             'm4v' => 'video/mp4',
>             'mov' => 'video/quicktime',
>             'qt' => 'video/quicktime',
>             'rv' => 'video/vnd.rn-realvideo',
>             'avi' => 'video/x-msvideo',
>             'movie' => 'video/x-sgi-movie',
>             'webm' => 'video/webm',
>             'mkv' => 'video/x-matroska',
>         ];
>         $ext = strtolower($ext);
>         if (array_key_exists($ext, $mimes)) {
>             return $mimes[$ext];
3614a4455
> 
3620a4462
>      *
3621a4464
>      *
3623d4465
<      * @static
3627c4469
<         // In case the path is a URL, strip any query string before getting extension
---
>         //In case the path is a URL, strip any query string before getting extension
3632,3633c4474,4476
<         $pathinfo = self::mb_pathinfo($filename);
<         return self::_mime_types($pathinfo['extension']);
---
>         $ext = static::mb_pathinfo($filename, PATHINFO_EXTENSION);
> 
>         return static::_mime_types($ext);
3638,3643c4481,4488
<      * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
<      * Works similarly to the one in PHP >= 5.2.0
<      * @link http://www.php.net/manual/en/function.pathinfo.php#107461
<      * @param string $path A filename or path, does not need to exist as a file
<      * @param integer|string $options Either a PATHINFO_* constant,
<      *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
---
>      * Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe.
>      *
>      * @see http://www.php.net/manual/en/function.pathinfo.php#107461
>      *
>      * @param string     $path    A filename or path, does not need to exist as a file
>      * @param int|string $options Either a PATHINFO_* constant,
>      *                            or a string name to return only the specified piece
>      *
3645d4489
<      * @static
3649,3651c4493,4495
<         $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
<         $pathinfo = array();
<         if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
---
>         $ret = ['dirname' => '', 'basename' => '', 'extension' => '', 'filename' => ''];
>         $pathinfo = [];
>         if (preg_match('#^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^.\\\\/]+?)|))[\\\\/.]*$#m', $path, $pathinfo)) {
3688c4532
<      * `$mail->set('SMTPSecure', 'tls');`
---
>      * `$mail->set('SMTPSecure', static::ENCRYPTION_STARTTLS);`
3690,3695c4534,4539
<      * `$mail->SMTPSecure = 'tls';`
<      * @access public
<      * @param string $name The property name to set
<      * @param mixed $value The value to set the property to
<      * @return boolean
<      * @TODO Should this not be using the __set() magic function?
---
>      * `$mail->SMTPSecure = static::ENCRYPTION_STARTTLS;`.
>      *
>      * @param string $name  The property name to set
>      * @param mixed  $value The value to set the property to
>      *
>      * @return bool
3700a4545
> 
3702,3704d4546
<         } else {
<             $this->setError($this->lang('variable_set') . $name);
<             return false;
3705a4548,4550
>         $this->setError($this->lang('variable_set') . $name);
> 
>         return false;
3710c4555
<      * @access public
---
>      *
3711a4557
>      *
3716c4562
<         return trim(str_replace(array("\r", "\n"), '', $str));
---
>         return trim(str_replace(["\r", "\n"], '', $str));
3722a4569
>      *
3724c4571,4572
<      * @param string $breaktype What kind of line break to use, defaults to CRLF
---
>      * @param string $breaktype What kind of line break to use; defaults to static::$LE
>      *
3726,3727d4573
<      * @access public
<      * @static
3729c4575
<     public static function normalizeBreaks($text, $breaktype = "\r\n")
---
>     public static function normalizeBreaks($text, $breaktype = null)
3731c4577,4619
<         return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
---
>         if (null === $breaktype) {
>             $breaktype = static::$LE;
>         }
>         //Normalise to \n
>         $text = str_replace([self::CRLF, "\r"], "\n", $text);
>         //Now convert LE as needed
>         if ("\n" !== $breaktype) {
>             $text = str_replace("\n", $breaktype, $text);
>         }
> 
>         return $text;
>     }
> 
>     /**
>      * Remove trailing breaks from a string.
>      *
>      * @param string $text
>      *
>      * @return string The text to remove breaks from
>      */
>     public static function stripTrailingWSP($text)
>     {
>         return rtrim($text, " \r\n\t");
>     }
> 
>     /**
>      * Return the current line break format string.
>      *
>      * @return string
>      */
>     public static function getLE()
>     {
>         return static::$LE;
>     }
> 
>     /**
>      * Set the line break format string, e.g. "\r\n".
>      *
>      * @param string $le
>      */
>     protected static function setLE($le)
>     {
>         static::$LE = $le;
3736c4624
<      * @access public
---
>      *
3739c4627
<      * @param string $key_pass Password for private key
---
>      * @param string $key_pass            Password for private key
3752c4640
<      * @access public
---
>      *
3753a4642
>      *
3759c4648,4649
<         for ($i = 0; $i < strlen($txt); $i++) {
---
>         $len = strlen($txt);
>         for ($i = 0; $i < $len; ++$i) {
3761c4651
<             if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
---
>             if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord === 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
3766a4657
> 
3772c4663
<      * @access public
---
>      *
3774c4665,4667
<      * @throws phpmailerException
---
>      *
>      * @throws Exception
>      *
3781c4674
<                 throw new phpmailerException($this->lang('extension_missing') . 'openssl');
---
>                 throw new Exception($this->lang('extension_missing') . 'openssl');
3782a4676
> 
3785,3786c4679,4682
<         $privKeyStr = !empty($this->DKIM_private_string) ? $this->DKIM_private_string : file_get_contents($this->DKIM_private);
<         if ('' != $this->DKIM_passphrase) {
---
>         $privKeyStr = !empty($this->DKIM_private_string) ?
>             $this->DKIM_private_string :
>             file_get_contents($this->DKIM_private);
>         if ('' !== $this->DKIM_passphrase) {
3791,3795c4687,4688
<         //Workaround for missing digest algorithms in old PHP & OpenSSL versions
<         //@link http://stackoverflow.com/a/11117338/333340
<         if (version_compare(PHP_VERSION, '5.3.0') >= 0 and
<             in_array('sha256WithRSAEncryption', openssl_get_md_methods(true))) {
<             if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
---
>         if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
>             if (\PHP_MAJOR_VERSION < 8) {
3797d4689
<                 return base64_encode($signature);
3799,3806d4690
<         } else {
<             $pinfo = openssl_pkey_get_details($privKey);
<             $hash = hash('sha256', $signHeader);
<             //'Magic' constant for SHA256 from RFC3447
<             //@link https://tools.ietf.org/html/rfc3447#page-43
<             $t = '3031300d060960864801650304020105000420' . $hash;
<             $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
<             $eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t);
3808,3811c4692,4695
<             if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) {
<                 openssl_pkey_free($privKey);
<                 return base64_encode($signature);
<             }
---
>             return base64_encode($signature);
>         }
>         if (\PHP_MAJOR_VERSION < 8) {
>             openssl_pkey_free($privKey);
3813c4697
<         openssl_pkey_free($privKey);
---
> 
3819c4703,4707
<      * @access public
---
>      * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
>      * Canonicalized headers should *always* use CRLF, regardless of mailer setting.
>      *
>      * @see https://tools.ietf.org/html/rfc6376#section-3.4.2
>      *
3820a4709
>      *
3825,3826c4714,4722
<         $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
<         $lines = explode("\r\n", $signHeader);
---
>         //Normalize breaks to CRLF (regardless of the mailer)
>         $signHeader = static::normalizeBreaks($signHeader, self::CRLF);
>         //Unfold header lines
>         //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
>         //@see https://tools.ietf.org/html/rfc5322#section-2.2
>         //That means this may break if you do something daft like put vertical tabs in your headers.
>         $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
>         //Break headers out into an array
>         $lines = explode(self::CRLF, $signHeader);
3827a4724,4729
>             //If the header is missing a :, skip it as it's invalid
>             //This is likely to happen because the explode() above will also split
>             //on the trailing LE, leaving an empty line
>             if (strpos($line, ':') === false) {
>                 continue;
>             }
3828a4731
>             //Lower-case header name
3830,3831c4733,4739
<             $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces
<             $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
---
>             //Collapse white space within the value, also convert WSP to space
>             $value = preg_replace('/[ \t]+/', ' ', $value);
>             //RFC6376 is slightly unclear here - it says to delete space at the *end* of each value
>             //But then says to delete space before and after the colon.
>             //Net result is the same as trimming both ends of the value.
>             //By elimination, the same applies to the field name
>             $lines[$key] = trim($heading, " \t") . ':' . trim($value, " \t");
3833,3834c4741,4742
<         $signHeader = implode("\r\n", $lines);
<         return $signHeader;
---
> 
>         return implode(self::CRLF, $lines);
3839c4747,4751
<      * @access public
---
>      * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
>      * Canonicalized bodies should *always* use CRLF, regardless of mailer setting.
>      *
>      * @see https://tools.ietf.org/html/rfc6376#section-3.4.3
>      *
3840a4753
>      *
3845,3853c4758,4759
<         if ($body == '') {
<             return "\r\n";
<         }
<         // stabilize line endings
<         $body = str_replace("\r\n", "\n", $body);
<         $body = str_replace("\n", "\r\n", $body);
<         // END stabilize line endings
<         while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
<             $body = substr($body, 0, strlen($body) - 2);
---
>         if (empty($body)) {
>             return self::CRLF;
3855c4761,4765
<         return $body;
---
>         //Normalize line endings to CRLF
>         $body = static::normalizeBreaks($body, self::CRLF);
> 
>         //Reduce multiple trailing line breaks to a single one
>         return static::stripTrailingWSP($body) . self::CRLF;
3860c4770
<      * @access public
---
>      *
3862,3863c4772,4776
<      * @param string $subject Subject
<      * @param string $body Body
---
>      * @param string $subject      Subject
>      * @param string $body         Body
>      *
>      * @throws Exception
>      *
3868,3890c4781,4873
<         $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms
<         $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
<         $DKIMquery = 'dns/txt'; // Query method
<         $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
<         $subject_header = "Subject: $subject";
<         $headers = explode($this->LE, $headers_line);
<         $from_header = '';
<         $to_header = '';
<         $date_header = '';
<         $current = '';
<         foreach ($headers as $header) {
<             if (strpos($header, 'From:') === 0) {
<                 $from_header = $header;
<                 $current = 'from_header';
<             } elseif (strpos($header, 'To:') === 0) {
<                 $to_header = $header;
<                 $current = 'to_header';
<             } elseif (strpos($header, 'Date:') === 0) {
<                 $date_header = $header;
<                 $current = 'date_header';
<             } else {
<                 if (!empty($$current) && strpos($header, ' =?') === 0) {
<                     $$current .= $header;
---
>         $DKIMsignatureType = 'rsa-sha256'; //Signature & hash algorithms
>         $DKIMcanonicalization = 'relaxed/simple'; //Canonicalization methods of header & body
>         $DKIMquery = 'dns/txt'; //Query method
>         $DKIMtime = time();
>         //Always sign these headers without being asked
>         //Recommended list from https://tools.ietf.org/html/rfc6376#section-5.4.1
>         $autoSignHeaders = [
>             'from',
>             'to',
>             'cc',
>             'date',
>             'subject',
>             'reply-to',
>             'message-id',
>             'content-type',
>             'mime-version',
>             'x-mailer',
>         ];
>         if (stripos($headers_line, 'Subject') === false) {
>             $headers_line .= 'Subject: ' . $subject . static::$LE;
>         }
>         $headerLines = explode(static::$LE, $headers_line);
>         $currentHeaderLabel = '';
>         $currentHeaderValue = '';
>         $parsedHeaders = [];
>         $headerLineIndex = 0;
>         $headerLineCount = count($headerLines);
>         foreach ($headerLines as $headerLine) {
>             $matches = [];
>             if (preg_match('/^([^ \t]*?)(?::[ \t]*)(.*)$/', $headerLine, $matches)) {
>                 if ($currentHeaderLabel !== '') {
>                     //We were previously in another header; This is the start of a new header, so save the previous one
>                     $parsedHeaders[] = ['label' => $currentHeaderLabel, 'value' => $currentHeaderValue];
>                 }
>                 $currentHeaderLabel = $matches[1];
>                 $currentHeaderValue = $matches[2];
>             } elseif (preg_match('/^[ \t]+(.*)$/', $headerLine, $matches)) {
>                 //This is a folded continuation of the current header, so unfold it
>                 $currentHeaderValue .= ' ' . $matches[1];
>             }
>             ++$headerLineIndex;
>             if ($headerLineIndex >= $headerLineCount) {
>                 //This was the last line, so finish off this header
>                 $parsedHeaders[] = ['label' => $currentHeaderLabel, 'value' => $currentHeaderValue];
>             }
>         }
>         $copiedHeaders = [];
>         $headersToSignKeys = [];
>         $headersToSign = [];
>         foreach ($parsedHeaders as $header) {
>             //Is this header one that must be included in the DKIM signature?
>             if (in_array(strtolower($header['label']), $autoSignHeaders, true)) {
>                 $headersToSignKeys[] = $header['label'];
>                 $headersToSign[] = $header['label'] . ': ' . $header['value'];
>                 if ($this->DKIM_copyHeaderFields) {
>                     $copiedHeaders[] = $header['label'] . ':' . //Note no space after this, as per RFC
>                         str_replace('|', '=7C', $this->DKIM_QP($header['value']));
>                 }
>                 continue;
>             }
>             //Is this an extra custom header we've been asked to sign?
>             if (in_array($header['label'], $this->DKIM_extraHeaders, true)) {
>                 //Find its value in custom headers
>                 foreach ($this->CustomHeader as $customHeader) {
>                     if ($customHeader[0] === $header['label']) {
>                         $headersToSignKeys[] = $header['label'];
>                         $headersToSign[] = $header['label'] . ': ' . $header['value'];
>                         if ($this->DKIM_copyHeaderFields) {
>                             $copiedHeaders[] = $header['label'] . ':' . //Note no space after this, as per RFC
>                                 str_replace('|', '=7C', $this->DKIM_QP($header['value']));
>                         }
>                         //Skip straight to the next header
>                         continue 2;
>                     }
>                 }
>             }
>         }
>         $copiedHeaderFields = '';
>         if ($this->DKIM_copyHeaderFields && count($copiedHeaders) > 0) {
>             //Assemble a DKIM 'z' tag
>             $copiedHeaderFields = ' z=';
>             $first = true;
>             foreach ($copiedHeaders as $copiedHeader) {
>                 if (!$first) {
>                     $copiedHeaderFields .= static::$LE . ' |';
>                 }
>                 //Fold long values
>                 if (strlen($copiedHeader) > self::STD_LINE_LENGTH - 3) {
>                     $copiedHeaderFields .= substr(
>                         chunk_split($copiedHeader, self::STD_LINE_LENGTH - 3, static::$LE . self::FWS),
>                         0,
>                         -strlen(static::$LE . self::FWS)
>                     );
3892c4875
<                     $current = '';
---
>                     $copiedHeaderFields .= $copiedHeader;
3893a4877
>                 $first = false;
3894a4879
>             $copiedHeaderFields .= ';' . static::$LE;
3896,3903c4881,4882
<         $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
<         $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
<         $date = str_replace('|', '=7C', $this->DKIM_QP($date_header));
<         $subject = str_replace(
<             '|',
<             '=7C',
<             $this->DKIM_QP($subject_header)
<         ); // Copied header fields (dkim-quoted-printable)
---
>         $headerKeys = ' h=' . implode(':', $headersToSignKeys) . ';' . static::$LE;
>         $headerValues = implode(static::$LE, $headersToSign);
3905,3932c4884,4907
<         $DKIMlen = strlen($body); // Length of body
<         $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body
<         if ('' == $this->DKIM_identity) {
<             $ident = '';
<         } else {
<             $ident = ' i=' . $this->DKIM_identity . ';';
<         }
<         $dkimhdrs = 'DKIM-Signature: v=1; a=' .
<             $DKIMsignatureType . '; q=' .
<             $DKIMquery . '; l=' .
<             $DKIMlen . '; s=' .
<             $this->DKIM_selector .
<             ";\r\n" .
<             "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
<             "\th=From:To:Date:Subject;\r\n" .
<             "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
<             "\tz=$from\r\n" .
<             "\t|$to\r\n" .
<             "\t|$date\r\n" .
<             "\t|$subject;\r\n" .
<             "\tbh=" . $DKIMb64 . ";\r\n" .
<             "\tb=";
<         $toSign = $this->DKIM_HeaderC(
<             $from_header . "\r\n" .
<             $to_header . "\r\n" .
<             $date_header . "\r\n" .
<             $subject_header . "\r\n" .
<             $dkimhdrs
---
>         //Base64 of packed binary SHA-256 hash of body
>         $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body)));
>         $ident = '';
>         if ('' !== $this->DKIM_identity) {
>             $ident = ' i=' . $this->DKIM_identity . ';' . static::$LE;
>         }
>         //The DKIM-Signature header is included in the signature *except for* the value of the `b` tag
>         //which is appended after calculating the signature
>         //https://tools.ietf.org/html/rfc6376#section-3.5
>         $dkimSignatureHeader = 'DKIM-Signature: v=1;' .
>             ' d=' . $this->DKIM_domain . ';' .
>             ' s=' . $this->DKIM_selector . ';' . static::$LE .
>             ' a=' . $DKIMsignatureType . ';' .
>             ' q=' . $DKIMquery . ';' .
>             ' t=' . $DKIMtime . ';' .
>             ' c=' . $DKIMcanonicalization . ';' . static::$LE .
>             $headerKeys .
>             $ident .
>             $copiedHeaderFields .
>             ' bh=' . $DKIMb64 . ';' . static::$LE .
>             ' b=';
>         //Canonicalize the set of headers
>         $canonicalizedHeaders = $this->DKIM_HeaderC(
>             $headerValues . static::$LE . $dkimSignatureHeader
3934,3935c4909,4912
<         $signed = $this->DKIM_Sign($toSign);
<         return $dkimhdrs . $signed . "\r\n";
---
>         $signature = $this->DKIM_Sign($canonicalizedHeaders);
>         $signature = trim(chunk_split($signature, self::STD_LINE_LENGTH - 3, static::$LE . self::FWS));
> 
>         return static::normalizeBreaks($dkimSignatureHeader . $signature);
3939c4916,4918
<      * Detect if a string contains a line longer than the maximum line length allowed.
---
>      * Detect if a string contains a line longer than the maximum line length
>      * allowed by RFC 2822 section 2.1.1.
>      *
3941,3942c4920,4921
<      * @return boolean
<      * @static
---
>      *
>      * @return bool
3946,3947c4925,4947
<         //+2 to include CRLF line break for a 1000 total
<         return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
---
>         return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str);
>     }
> 
>     /**
>      * If a string contains any "special" characters, double-quote the name,
>      * and escape any double quotes with a backslash.
>      *
>      * @param string $str
>      *
>      * @return string
>      *
>      * @see RFC822 3.4.1
>      */
>     public static function quotedString($str)
>     {
>         if (preg_match('/[ ()<>@,;:"\/\[\]?=]/', $str)) {
>             //If the string contains any of these chars, it must be double-quoted
>             //and any double quotes must be escaped with a backslash
>             return '"' . str_replace('"', '\\"', $str) . '"';
>         }
> 
>         //Return the string untouched, it doesn't need quoting
>         return $str;
3952,3953c4952,4953
<      * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
<      * @access public
---
>      * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
>      *
3963,3964c4963,4964
<      * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
<      * @access public
---
>      * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
>      *
3974,3975c4974,4975
<      * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
<      * @access public
---
>      * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
>      *
3985,3986c4985,4986
<      * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
<      * @access public
---
>      * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
>      *
3996,3997c4996,4997
<      * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
<      * @access public
---
>      * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
>      *
4007,4010c5007,5011
<      * @param boolean $isSent
<      * @param array $to
<      * @param array $cc
<      * @param array $bcc
---
>      *
>      * @param bool   $isSent
>      * @param array  $to
>      * @param array  $cc
>      * @param array  $bcc
4013a5015
>      * @param array  $extra
4015c5017
<     protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
---
>     protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from, $extra)
4018,4019c5020
<             $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
<             call_user_func_array($this->action_function, $params);
---
>             call_user_func($this->action_function, $isSent, $to, $cc, $bcc, $subject, $body, $from, $extra);
4022d5022
< }
4024,4029d5023
< /**
<  * PHPMailer exception handler
<  * @package PHPMailer
<  */
< class phpmailerException extends Exception
< {
4031,4032c5025,5035
<      * Prettify error message output
<      * @return string
---
>      * Get the OAuth instance.
>      *
>      * @return OAuth
>      */
>     public function getOAuth()
>     {
>         return $this->oauth;
>     }
> 
>     /**
>      * Set an OAuth instance.
4034c5037
<     public function errorMessage()
---
>     public function setOAuth(OAuth $oauth)
4036,4037c5039
<         $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
<         return $errorMsg;
---
>         $this->oauth = $oauth;
diff -r TNG/class.smtp.php TNG1403/class.smtp.php
1a2
> 
4,11c5,13
<  * PHP Version 5
<  * @package PHPMailer
<  * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
<  * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
<  * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
<  * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
<  * @author Brent R. Matzelle (original founder)
<  * @copyright 2014 Marcus Bointon
---
>  * PHP Version 5.5.
>  *
>  * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
>  *
>  * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
>  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
>  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
>  * @author    Brent R. Matzelle (original founder)
>  * @copyright 2012 - 2020 Marcus Bointon
14,15c16,17
<  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
<  * @note This program is distributed in the hope that it will be useful - WITHOUT
---
>  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
>  * @note      This program is distributed in the hope that it will be useful - WITHOUT
19a22,23
> namespace PHPMailer\PHPMailer;
> 
23c27
<  * @package PHPMailer
---
>  *
30a35
>      *
33c38
<     const VERSION = '5.2.22';
---
>     const VERSION = '6.5.3';
36a42
>      *
39c45
<     const CRLF = "\r\n";
---
>     const LE = "\r\n";
43c49,50
<      * @var integer
---
>      *
>      * @var int
45c52
<     const DEFAULT_SMTP_PORT = 25;
---
>     const DEFAULT_PORT = 25;
48,49c55,60
<      * The maximum line length allowed by RFC 2822 section 2.1.1
<      * @var integer
---
>      * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
>      * *excluding* a trailing CRLF break.
>      *
>      * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6
>      *
>      * @var int
54c65,77
<      * Debug level for no output
---
>      * The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5,
>      * *including* a trailing CRLF line break.
>      *
>      * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.5
>      *
>      * @var int
>      */
>     const MAX_REPLY_LENGTH = 512;
> 
>     /**
>      * Debug level for no output.
>      *
>      * @var int
59c82,84
<      * Debug level to show client -> server messages
---
>      * Debug level to show client -> server messages.
>      *
>      * @var int
64c89,91
<      * Debug level to show client -> server and server -> client messages
---
>      * Debug level to show client -> server and server -> client messages.
>      *
>      * @var int
69c96,98
<      * Debug level to show connection status, client -> server and server -> client messages
---
>      * Debug level to show connection status, client -> server and server -> client messages.
>      *
>      * @var int
74c103,105
<      * Debug level to show all messages
---
>      * Debug level to show all messages.
>      *
>      * @var int
79,102d109
<      * The PHPMailer SMTP Version number.
<      * @var string
<      * @deprecated Use the `VERSION` constant instead
<      * @see SMTP::VERSION
<      */
<     public $Version = '5.2.22';
< 
<     /**
<      * SMTP server port number.
<      * @var integer
<      * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
<      * @see SMTP::DEFAULT_SMTP_PORT
<      */
<     public $SMTP_PORT = 25;
< 
<     /**
<      * SMTP reply line ending.
<      * @var string
<      * @deprecated Use the `CRLF` constant instead
<      * @see SMTP::CRLF
<      */
<     public $CRLF = "\r\n";
< 
<     /**
109,110c116,118
<      * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
<      * @var integer
---
>      * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages.
>      *
>      * @var int
120d127
<      *
122c129,130
<      * <code>
---
>      *
>      * ```php
124,125c132,141
<      * </code>
<      * @var string|callable
---
>      * ```
>      *
>      * Alternatively, you can pass in an instance of a PSR-3 compatible logger, though only `debug`
>      * level output is used:
>      *
>      * ```php
>      * $mail->Debugoutput = new myPsr3Logger;
>      * ```
>      *
>      * @var string|callable|\Psr\Log\LoggerInterface
131,133c147,151
<      * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
<      * @link http://www.postfix.org/VERP_README.html Info on VERP
<      * @var boolean
---
>      *
>      * @see http://en.wikipedia.org/wiki/Variable_envelope_return_path
>      * @see http://www.postfix.org/VERP_README.html Info on VERP
>      *
>      * @var bool
139c157
<      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
---
>      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
141,142c159,162
<      * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
<      * @var integer
---
>      *
>      * @see http://tools.ietf.org/html/rfc2821#section-4.5.3.2
>      *
>      * @var int
148,149c168,170
<      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
<      * @var integer
---
>      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
>      *
>      * @var int
153,162c174,199
< 	/**
< 	 * @var array patterns to extract smtp transaction id from smtp reply
< 	 * Only first capture group will be use, use non-capturing group to deal with it
< 	 * Extend this class to override this property to fulfil your needs.
< 	 */
< 	protected $smtp_transaction_id_patterns = array(
< 		'exim' => '/[0-9]{3} OK id=(.*)/',
< 		'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
< 		'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
< 	);
---
>     /**
>      * Patterns to extract an SMTP transaction id from reply to a DATA command.
>      * The first capture group in each regex will be used as the ID.
>      * MS ESMTP returns the message ID, which may not be correct for internal tracking.
>      *
>      * @var string[]
>      */
>     protected $smtp_transaction_id_patterns = [
>         'exim' => '/[\d]{3} OK id=(.*)/',
>         'sendmail' => '/[\d]{3} 2.0.0 (.*) Message/',
>         'postfix' => '/[\d]{3} 2.0.0 Ok: queued as (.*)/',
>         'Microsoft_ESMTP' => '/[0-9]{3} 2.[\d].0 (.*)@(?:.*) Queued mail for delivery/',
>         'Amazon_SES' => '/[\d]{3} Ok (.*)/',
>         'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
>         'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
>         'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
>         'Mailjet' => '/[\d]{3} OK queued as (.*)/',
>     ];
> 
>     /**
>      * The last transaction ID issued in response to a DATA command,
>      * if one was detected.
>      *
>      * @var string|bool|null
>      */
>     protected $last_smtp_transaction_id;
166c203,204
<      * @var resource
---
>      *
>      * @var ?resource
171a210
>      *
174c213
<     protected $error = array(
---
>     protected $error = [
178,179c217,218
<         'smtp_code_ex' => ''
<     );
---
>         'smtp_code_ex' => '',
>     ];
183a223
>      *
186c226
<     protected $helo_rply = null;
---
>     protected $helo_rply;
194a235
>      *
197c238
<     protected $server_caps = null;
---
>     protected $server_caps;
200a242
>      *
206a249,252
>      *
>      * @param string $str   Debug string to output
>      * @param int    $level The debug level of this message; see DEBUG_* constants
>      *
209,211d254
<      * @param string $str Debug string to output
<      * @param integer $level The debug level of this message; see DEBUG_* constants
<      * @return void
217a261,266
>         //Is this a PSR-3 logger?
>         if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
>             $this->Debugoutput->debug($str);
> 
>             return;
>         }
219c268
<         if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
---
>         if (is_callable($this->Debugoutput) && !in_array($this->Debugoutput, ['error_log', 'html', 'echo'])) {
220a270
> 
230c280
<                 echo htmlentities(
---
>                 echo gmdate('Y-m-d H:i:s'), ' ', htmlentities(
234,235c284
<                 )
<                 . "<br>\n";
---
>                 ), "<br>\n";
240,245c289,301
<                 $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
<                 echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
<                     "\n",
<                     "\n                   \t                  ",
<                     trim($str)
<                 )."\n";
---
>                 $str = preg_replace('/\r\n|\r/m', "\n", $str);
>                 echo gmdate('Y-m-d H:i:s'),
>                 "\t",
>                     //Trim trailing space
>                 trim(
>                     //Indent for readability, except for trailing break
>                     str_replace(
>                         "\n",
>                         "\n                   \t                  ",
>                         trim($str)
>                     )
>                 ),
>                 "\n";
251,256c307,313
<      * @param string $host SMTP server IP or host name
<      * @param integer $port The port number to connect to
<      * @param integer $timeout How long to wait for the connection to open
<      * @param array $options An array of options for stream_context_create()
<      * @access public
<      * @return boolean
---
>      *
>      * @param string $host    SMTP server IP or host name
>      * @param int    $port    The port number to connect to
>      * @param int    $timeout How long to wait for the connection to open
>      * @param array  $options An array of options for stream_context_create()
>      *
>      * @return bool
258c315
<     public function connect($host, $port = null, $timeout = 30, $options = array())
---
>     public function connect($host, $port = null, $timeout = 30, $options = [])
260,266c317
<         static $streamok;
<         //This is enabled by default since 5.0.0 but some providers disable it
<         //Check this once and cache the result
<         if (is_null($streamok)) {
<             $streamok = function_exists('stream_socket_client');
<         }
<         // Clear errors to avoid confusion
---
>         //Clear errors to avoid confusion
268c319
<         // Make sure we are __not__ connected
---
>         //Make sure we are __not__ connected
270c321
<             // Already connected, generate error
---
>             //Already connected, generate error
271a323
> 
275c327
<             $port = self::DEFAULT_SMTP_PORT;
---
>             $port = self::DEFAULT_PORT;
277c329
<         // Connect to the SMTP server
---
>         //Connect to the SMTP server
279c331,332
<             "Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true),
---
>             "Connection: opening to $host:$port, timeout=$timeout, options=" .
>             (count($options) > 0 ? var_export($options, true) : 'array()'),
281a335,382
> 
>         $this->smtp_conn = $this->getSMTPConnection($host, $port, $timeout, $options);
> 
>         if ($this->smtp_conn === false) {
>             //Error info already set inside `getSMTPConnection()`
>             return false;
>         }
> 
>         $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
> 
>         //Get any announcement
>         $this->last_reply = $this->get_lines();
>         $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
>         $responseCode = (int)substr($this->last_reply, 0, 3);
>         if ($responseCode === 220) {
>             return true;
>         }
>         //Anything other than a 220 response means something went wrong
>         //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
>         //https://tools.ietf.org/html/rfc5321#section-3.1
>         if ($responseCode === 554) {
>             $this->quit();
>         }
>         //This will handle 421 responses which may not wait for a QUIT (e.g. if the server is being shut down)
>         $this->edebug('Connection: closing due to error', self::DEBUG_CONNECTION);
>         $this->close();
>         return false;
>     }
> 
>     /**
>      * Create connection to the SMTP server.
>      *
>      * @param string $host    SMTP server IP or host name
>      * @param int    $port    The port number to connect to
>      * @param int    $timeout How long to wait for the connection to open
>      * @param array  $options An array of options for stream_context_create()
>      *
>      * @return false|resource
>      */
>     protected function getSMTPConnection($host, $port = null, $timeout = 30, $options = [])
>     {
>         static $streamok;
>         //This is enabled by default since 5.0.0 but some providers disable it
>         //Check this once and cache the result
>         if (null === $streamok) {
>             $streamok = function_exists('stream_socket_client');
>         }
> 
286,288c387,389
<             set_error_handler(array($this, 'errorHandler'));
<             $this->smtp_conn = stream_socket_client(
<                 $host . ":" . $port,
---
>             set_error_handler([$this, 'errorHandler']);
>             $connection = stream_socket_client(
>                 $host . ':' . $port,
295d395
<             restore_error_handler();
299c399
<                 "Connection: stream_socket_client not available, falling back to fsockopen",
---
>                 'Connection: stream_socket_client not available, falling back to fsockopen',
302,303c402,403
<             set_error_handler(array($this, 'errorHandler'));
<             $this->smtp_conn = fsockopen(
---
>             set_error_handler([$this, 'errorHandler']);
>             $connection = fsockopen(
310d409
<             restore_error_handler();
312,313c411,414
<         // Verify we connected properly
<         if (!is_resource($this->smtp_conn)) {
---
>         restore_error_handler();
> 
>         //Verify we connected properly
>         if (!is_resource($connection)) {
316c417,418
<                 $errno,
---
>                 '',
>                 (string) $errno,
323a426
> 
326,332c429,435
<         $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
<         // SMTP server can take longer to respond, give longer timeout for first read
<         // Windows does not have support for this timeout function
<         if (substr(PHP_OS, 0, 3) != 'WIN') {
<             $max = ini_get('max_execution_time');
<             // Don't bother if unlimited
<             if ($max != 0 && $timeout > $max) {
---
> 
>         //SMTP server can take longer to respond, give longer timeout for first read
>         //Windows does not have support for this timeout function
>         if (strpos(PHP_OS, 'WIN') !== 0) {
>             $max = (int)ini_get('max_execution_time');
>             //Don't bother if unlimited, or if set_time_limit is disabled
>             if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
335c438
<             stream_set_timeout($this->smtp_conn, $timeout, 0);
---
>             stream_set_timeout($connection, $timeout, 0);
337,340c440,441
<         // Get any announcement
<         $announce = $this->get_lines();
<         $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
<         return true;
---
> 
>         return $connection;
345,346c446,447
<      * @access public
<      * @return boolean
---
>      *
>      * @return bool
364,365c465,467
<         // Begin encrypted connection
<         if (!stream_socket_enable_crypto(
---
>         //Begin encrypted connection
>         set_error_handler([$this, 'errorHandler']);
>         $crypto_ok = stream_socket_enable_crypto(
369,372c471,474
<         )) {
<             return false;
<         }
<         return true;
---
>         );
>         restore_error_handler();
> 
>         return (bool) $crypto_ok;
378c480,482
<      * @see hello()
---
>      *
>      * @see    hello()
>      *
381,385c485,488
<      * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2)
<      * @param string $realm The auth realm for NTLM
<      * @param string $workstation The auth workstation for NTLM
<      * @param null|OAuth $OAuth An optional OAuth instance (@see PHPMailerOAuth)
<      * @return bool True if successfully authenticated.* @access public
---
>      * @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2)
>      * @param OAuth  $OAuth    An optional OAuth instance for XOAUTH2 authentication
>      *
>      * @return bool True if successfully authenticated
391,392d493
<         $realm = '',
<         $workstation = '',
396a498
> 
401,402c503
<         // SMTP extensions are available. Let's try to find a proper authentication method
< 
---
>             //SMTP extensions are available; try to find a proper authentication method
405,406c506,508
<                 // 'at this stage' means that auth may be allowed after the stage changes
<                 // e.g. after STARTTLS
---
>                 //'at this stage' means that auth may be allowed after the stage changes
>                 //e.g. after STARTTLS
> 
410,411c512,513
<             self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
<             self::edebug(
---
>             $this->edebug('Auth method requested: ' . ($authtype ?: 'UNSPECIFIED'), self::DEBUG_LOWLEVEL);
>             $this->edebug(
415a518,523
>             //If we have requested a specific auth type, check the server supports it before trying others
>             if (null !== $authtype && !in_array($authtype, $this->server_caps['AUTH'], true)) {
>                 $this->edebug('Requested auth method not available: ' . $authtype, self::DEBUG_LOWLEVEL);
>                 $authtype = null;
>             }
> 
417,418c525,528
<                 foreach (array('CRAM-MD5', 'LOGIN', 'PLAIN', 'NTLM', 'XOAUTH2') as $method) {
<                     if (in_array($method, $this->server_caps['AUTH'])) {
---
>                 //If no auth mechanism is specified, attempt to use these, in this order
>                 //Try CRAM-MD5 first as it's more secure than the others
>                 foreach (['CRAM-MD5', 'LOGIN', 'PLAIN', 'XOAUTH2'] as $method) {
>                     if (in_array($method, $this->server_caps['AUTH'], true)) {
424a535
> 
427c538
<                 self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
---
>                 $this->edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
430c541
<             if (!in_array($authtype, $this->server_caps['AUTH'])) {
---
>             if (!in_array($authtype, $this->server_caps['AUTH'], true)) {
431a543
> 
439c551
<                 // Start authentication
---
>                 //Start authentication
443,448c555,563
<                 // Send encoded username and password
<                 if (!$this->sendCommand(
<                     'User & Password',
<                     base64_encode("\0" . $username . "\0" . $password),
<                     235
<                 )
---
>                 //Send encoded username and password
>                 if (
>                     //Format from https://tools.ietf.org/html/rfc4616#section-2
>                     //We skip the first field (it's forgery), so the string starts with a null byte
>                     !$this->sendCommand(
>                         'User & Password',
>                         base64_encode("\0" . $username . "\0" . $password),
>                         235
>                     )
454c569
<                 // Start authentication
---
>                 //Start authentication
458,468c573
<                 if (!$this->sendCommand("Username", base64_encode($username), 334)) {
<                     return false;
<                 }
<                 if (!$this->sendCommand("Password", base64_encode($password), 235)) {
<                     return false;
<                 }
<                 break;
<             case 'XOAUTH2':
<                 //If the OAuth Instance is not set. Can be a case when PHPMailer is used
<                 //instead of PHPMailerOAuth
<                 if (is_null($OAuth)) {
---
>                 if (!$this->sendCommand('Username', base64_encode($username), 334)) {
471,474c576
<                 $oauth = $OAuth->getOauth64();
< 
<                 // Start authentication
<                 if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
---
>                 if (!$this->sendCommand('Password', base64_encode($password), 235)) {
478,527d579
<             case 'NTLM':
<                 /*
<                  * ntlm_sasl_client.php
<                  * Bundled with Permission
<                  *
<                  * How to telnet in windows:
<                  * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
<                  * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
<                  */
<                 require_once 'extras/ntlm_sasl_client.php';
<                 $temp = new stdClass;
<                 $ntlm_client = new ntlm_sasl_client_class;
<                 //Check that functions are available
<                 if (!$ntlm_client->initialize($temp)) {
<                     $this->setError($temp->error);
<                     $this->edebug(
<                         'You need to enable some modules in your php.ini file: '
<                         . $this->error['error'],
<                         self::DEBUG_CLIENT
<                     );
<                     return false;
<                 }
<                 //msg1
<                 $msg1 = $ntlm_client->typeMsg1($realm, $workstation); //msg1
< 
<                 if (!$this->sendCommand(
<                     'AUTH NTLM',
<                     'AUTH NTLM ' . base64_encode($msg1),
<                     334
<                 )
<                 ) {
<                     return false;
<                 }
<                 //Though 0 based, there is a white space after the 3 digit number
<                 //msg2
<                 $challenge = substr($this->last_reply, 3);
<                 $challenge = base64_decode($challenge);
<                 $ntlm_res = $ntlm_client->NTLMResponse(
<                     substr($challenge, 24, 8),
<                     $password
<                 );
<                 //msg3
<                 $msg3 = $ntlm_client->typeMsg3(
<                     $ntlm_res,
<                     $username,
<                     $realm,
<                     $workstation
<                 );
<                 // send encoded username
<                 return $this->sendCommand('Username', base64_encode($msg3), 235);
529c581
<                 // Start authentication
---
>                 //Start authentication
533c585
<                 // Get the challenge
---
>                 //Get the challenge
536c588
<                 // Build the response
---
>                 //Build the response
539c591
<                 // send encoded credentials
---
>                 //send encoded credentials
540a593,604
>             case 'XOAUTH2':
>                 //The OAuth instance must be set up prior to requesting auth.
>                 if (null === $OAuth) {
>                     return false;
>                 }
>                 $oauth = $OAuth->getOauth64();
> 
>                 //Start authentication
>                 if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
>                     return false;
>                 }
>                 break;
542a607
> 
544a610
> 
551c617,618
<      * in case that function is not available
---
>      * in case that function is not available.
>      *
554c621
<      * @access protected
---
>      *
563,564c630,631
<         // The following borrowed from
<         // http://php.net/manual/en/function.mhash.php#27225
---
>         //The following borrowed from
>         //http://php.net/manual/en/function.mhash.php#27225
566,569c633,636
<         // RFC 2104 HMAC implementation for php.
<         // Creates an md5 HMAC.
<         // Eliminates the need to install mhash to compute a HMAC
<         // by Lance Rushing
---
>         //RFC 2104 HMAC implementation for php.
>         //Creates an md5 HMAC.
>         //Eliminates the need to install mhash to compute a HMAC
>         //by Lance Rushing
571c638
<         $bytelen = 64; // byte length for md5
---
>         $bytelen = 64; //byte length for md5
586,587c653,654
<      * @access public
<      * @return boolean True if connected.
---
>      *
>      * @return bool True if connected
594c661
<                 // The socket is valid but we are not connected
---
>                 //The socket is valid but we are not connected
599a667
> 
602c670,671
<             return true; // everything looks good
---
> 
>             return true; //everything looks good
603a673
> 
609a680
>      *
611,612d681
<      * @access public
<      * @return void
620c689
<             // close the connection and cleanup
---
>             //Close the connection and cleanup
630c699
<      * finializing the mail transaction. $msg_data is the message
---
>      * finalizing the mail transaction. $msg_data is the message
633,634c702,704
<      * and the message body being separated by and additional <CRLF>.
<      * Implements rfc 821: DATA <CRLF>
---
>      * and the message body being separated by an additional <CRLF>.
>      * Implements RFC 821: DATA <CRLF>.
>      *
636,637c706,707
<      * @access public
<      * @return boolean
---
>      *
>      * @return bool
647c717
<          * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
---
>          * According to rfc821 we should not send more than 1000 characters on a single line (including the LE)
654,655c724,725
<         // Normalize line breaks before exploding
<         $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
---
>         //Normalize line breaks before exploding
>         $lines = explode("\n", str_replace(["\r\n", "\r"], "\n", $msg_data));
669,670c739,740
<             $lines_out = array();
<             if ($in_headers and $line == '') {
---
>             $lines_out = [];
>             if ($in_headers && $line === '') {
700,701c770,772
<                 //RFC2821 section 4.5.2
<                 if (!empty($line_out) and $line_out[0] == '.') {
---
>                 //Dot-stuffing as per RFC5321 section 4.5.2
>                 //https://tools.ietf.org/html/rfc5321#section-4.5.2
>                 if (!empty($line_out) && $line_out[0] === '.') {
704c775
<                 $this->client_send($line_out . self::CRLF);
---
>                 $this->client_send($line_out . static::LE, 'DATA');
711c782
<         $this->Timelimit = $this->Timelimit * 2;
---
>         $this->Timelimit *= 2;
712a784
>         $this->recordLastTransactionID();
714a787
> 
723a797
>      *
725,726c799,800
<      * @access public
<      * @return boolean
---
>      *
>      * @return bool
731c805,814
<         return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
---
>         if ($this->sendHello('EHLO', $host)) {
>             return true;
>         }
> 
>         //Some servers shut down the SMTP service here (RFC 5321)
>         if (substr($this->helo_rply, 0, 3) == '421') {
>             return false;
>         }
> 
>         return $this->sendHello('HELO', $host);
736,737c819,820
<      * Low-level implementation used by hello()
<      * @see hello()
---
>      * Low-level implementation used by hello().
>      *
739,741c822,826
<      * @param string $host The hostname to say we are
<      * @access protected
<      * @return boolean
---
>      * @param string $host  The hostname to say we are
>      *
>      * @return bool
>      *
>      * @see hello()
751a837
> 
758,759c844,845
<      * @access protected
<      * @param string $type - 'HELO' or 'EHLO'
---
>      *
>      * @param string $type `HELO` or `EHLO`
763c849
<         $this->server_caps = array();
---
>         $this->server_caps = [];
785c871
<                                 $fields = array();
---
>                                 $fields = [];
803c889,890
<      * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
---
>      * Implements RFC 821: MAIL <SP> FROM:<reverse-path> <CRLF>.
>      *
805,806c892,893
<      * @access public
<      * @return boolean
---
>      *
>      * @return bool
810a898
> 
821,824c909,913
<      * Implements from rfc 821: QUIT <CRLF>
<      * @param boolean $close_on_error Should the connection close if an error occurs?
<      * @access public
<      * @return boolean
---
>      * Implements from RFC 821: QUIT <CRLF>.
>      *
>      * @param bool $close_on_error Should the connection close if an error occurs?
>      *
>      * @return bool
830c919
<         if ($noerror or $close_on_error) {
---
>         if ($noerror || $close_on_error) {
833a923
> 
841c931,932
<      * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
---
>      * Implements from RFC 821: RCPT <SP> TO:<forward-path> <CRLF>.
>      *
843,844c934,937
<      * @access public
<      * @return boolean
---
>      * @param string $dsn     Comma separated list of DSN notifications. NEVER, SUCCESS, FAILURE
>      *                        or DELAY. If you specify NEVER all other notifications are ignored.
>      *
>      * @return bool
846c939
<     public function recipient($address)
---
>     public function recipient($address, $dsn = '')
847a941,959
>         if (empty($dsn)) {
>             $rcpt = 'RCPT TO:<' . $address . '>';
>         } else {
>             $dsn = strtoupper($dsn);
>             $notify = [];
> 
>             if (strpos($dsn, 'NEVER') !== false) {
>                 $notify[] = 'NEVER';
>             } else {
>                 foreach (['SUCCESS', 'FAILURE', 'DELAY'] as $value) {
>                     if (strpos($dsn, $value) !== false) {
>                         $notify[] = $value;
>                     }
>                 }
>             }
> 
>             $rcpt = 'RCPT TO:<' . $address . '> NOTIFY=' . implode(',', $notify);
>         }
> 
850,851c962,963
<             'RCPT TO:<' . $address . '>',
<             array(250, 251)
---
>             $rcpt,
>             [250, 251]
858,860c970,972
<      * Implements rfc 821: RSET <CRLF>
<      * @access public
<      * @return boolean True on success.
---
>      * Implements RFC 821: RSET <CRLF>.
>      *
>      * @return bool True on success
869,873c981,986
<      * @param string $command The command name - not sent to the server
<      * @param string $commandstring The actual command to send
<      * @param integer|array $expect One or more expected integer success codes
<      * @access protected
<      * @return boolean True on success.
---
>      *
>      * @param string    $command       The command name - not sent to the server
>      * @param string    $commandstring The actual command to send
>      * @param int|array $expect        One or more expected integer success codes
>      *
>      * @return bool True on success
878a992
> 
882c996
<         if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) {
---
>         if ((strpos($commandstring, "\n") !== false) || (strpos($commandstring, "\r") !== false)) {
883a998
> 
886c1001
<         $this->client_send($commandstring . self::CRLF);
---
>         $this->client_send($commandstring . static::LE, $command);
889,892c1004,1007
<         // Fetch SMTP code and possible error code explanation
<         $matches = array();
<         if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
<             $code = $matches[1];
---
>         //Fetch SMTP code and possible error code explanation
>         $matches = [];
>         if (preg_match('/^([\d]{3})[ -](?:([\d]\\.[\d]\\.[\d]{1,2}) )?/', $this->last_reply, $matches)) {
>             $code = (int) $matches[1];
894c1009
<             // Cut off error code from each response line
---
>             //Cut off error code from each response line
896c1011,1012
<                 "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
---
>                 "/{$code}[ -]" .
>                 ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
901,902c1017,1018
<             // Fall back to simple parsing if regex fails
<             $code = substr($this->last_reply, 0, 3);
---
>             //Fall back to simple parsing if regex fails
>             $code = (int) substr($this->last_reply, 0, 3);
909c1025
<         if (!in_array($code, (array)$expect)) {
---
>         if (!in_array($code, (array) $expect, true)) {
919a1036
> 
923a1041
> 
935c1053,1054
<      * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
---
>      * Implements RFC 821: SAML <SP> FROM:<reverse-path> <CRLF>.
>      *
937,938c1056,1057
<      * @access public
<      * @return boolean
---
>      *
>      * @return bool
946a1066
>      *
948,949c1068,1069
<      * @access public
<      * @return boolean
---
>      *
>      * @return bool
953c1073
<         return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
---
>         return $this->sendCommand('VRFY', "VRFY $name", [250, 251]);
958,960c1078,1080
<      * Used to keep keep-alives alive, doesn't actually do anything
<      * @access public
<      * @return boolean
---
>      * Used to keep keep-alives alive, doesn't actually do anything.
>      *
>      * @return bool
971,974c1091,1094
<      * and _may_ be implemented in future
<      * Implements from rfc 821: TURN <CRLF>
<      * @access public
<      * @return boolean
---
>      * and _may_ be implemented in future.
>      * Implements from RFC 821: TURN <CRLF>.
>      *
>      * @return bool
979a1100
> 
985,987c1106,1110
<      * @param string $data The data to send
<      * @access public
<      * @return integer|boolean The number of bytes sent to the server or false on error
---
>      *
>      * @param string $data    The data to send
>      * @param string $command Optionally, the command this is part of, used only for controlling debug output
>      *
>      * @return int|bool The number of bytes sent to the server or false on error
989c1112
<     public function client_send($data)
---
>     public function client_send($data, $command = '')
991,992c1114,1128
<         $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
<         return fwrite($this->smtp_conn, $data);
---
>         //If SMTP transcripts are left enabled, or debug output is posted online
>         //it can leak credentials, so hide credentials in all but lowest level
>         if (
>             self::DEBUG_LOWLEVEL > $this->do_debug &&
>             in_array($command, ['User & Password', 'Username', 'Password'], true)
>         ) {
>             $this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
>         } else {
>             $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
>         }
>         set_error_handler([$this, 'errorHandler']);
>         $result = fwrite($this->smtp_conn, $data);
>         restore_error_handler();
> 
>         return $result;
997c1133
<      * @access public
---
>      *
1006,1007c1142,1143
<      * Get SMTP extensions available on the server
<      * @access public
---
>      * Get SMTP extensions available on the server.
>      *
1016,1030c1152,1163
<      * A multipurpose method
<      * The method works in three ways, dependent on argument value and current state
<      *   1. HELO/EHLO was not sent - returns null and set up $this->error
<      *   2. HELO was sent
<      *     $name = 'HELO': returns server name
<      *     $name = 'EHLO': returns boolean false
<      *     $name = any string: returns null and set up $this->error
<      *   3. EHLO was sent
<      *     $name = 'HELO'|'EHLO': returns server name
<      *     $name = any string: if extension $name exists, returns boolean True
<      *       or its options. Otherwise returns boolean False
<      * In other words, one can use this method to detect 3 conditions:
<      *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
<      *  - false returned: the requested feature exactly not exists
<      *  - positive value returned: the requested feature exists
---
>      * Get metadata about the SMTP server from its HELO/EHLO response.
>      * The method works in three ways, dependent on argument value and current state:
>      *   1. HELO/EHLO has not been sent - returns null and populates $this->error.
>      *   2. HELO has been sent -
>      *     $name == 'HELO': returns server name
>      *     $name == 'EHLO': returns boolean false
>      *     $name == any other string: returns null and populates $this->error
>      *   3. EHLO has been sent -
>      *     $name == 'HELO'|'EHLO': returns the server name
>      *     $name == any other string: if extension $name exists, returns True
>      *       or its options (e.g. AUTH mechanisms supported). Otherwise returns False.
>      *
1032c1165,1166
<      * @return mixed
---
>      *
>      * @return string|bool|null
1037a1172
> 
1041d1175
<         // the tight logic knot ;)
1043c1177
<             if ($name == 'HELO') {
---
>             if ('HELO' === $name) {
1046c1180
<             if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
---
>             if ('EHLO' === $name || array_key_exists('EHLO', $this->server_caps)) {
1049c1183,1184
<             $this->setError('HELO handshake was used. Client knows nothing about server extensions');
---
>             $this->setError('HELO handshake was used; No information about server extensions available');
> 
1058c1193
<      * @access public
---
>      *
1072c1207
<      * @access protected
---
>      *
1077c1212
<         // If the connection is bad, give up straight away
---
>         //If the connection is bad, give up straight away
1086a1222,1223
>         $selR = [$this->smtp_conn];
>         $selW = null;
1088,1090c1225,1263
<             $str = @fgets($this->smtp_conn, 515);
<             $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
<             $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL);
---
>             //Must pass vars in here as params are by reference
>             //solution for signals inspired by https://github.com/symfony/symfony/pull/6540
>             set_error_handler([$this, 'errorHandler']);
>             $n = stream_select($selR, $selW, $selW, $this->Timelimit);
>             restore_error_handler();
> 
>             if ($n === false) {
>                 $message = $this->getError()['detail'];
> 
>                 $this->edebug(
>                     'SMTP -> get_lines(): select failed (' . $message . ')',
>                     self::DEBUG_LOWLEVEL
>                 );
> 
>                 //stream_select returns false when the `select` system call is interrupted
>                 //by an incoming signal, try the select again
>                 if (stripos($message, 'interrupted system call') !== false) {
>                     $this->edebug(
>                         'SMTP -> get_lines(): retrying stream_select',
>                         self::DEBUG_LOWLEVEL
>                     );
>                     $this->setError('');
>                     continue;
>                 }
> 
>                 break;
>             }
> 
>             if (!$n) {
>                 $this->edebug(
>                     'SMTP -> get_lines(): select timed-out in (' . $this->Timelimit . ' sec)',
>                     self::DEBUG_LOWLEVEL
>                 );
>                 break;
>             }
> 
>             //Deliberate noise suppression - errors are handled afterwards
>             $str = @fgets($this->smtp_conn, self::MAX_REPLY_LENGTH);
>             $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
1092,1093c1265,1268
<             // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
<             if ((isset($str[3]) and $str[3] == ' ')) {
---
>             //If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
>             //or 4th character is a space or a line break char, we are done reading, break the loop.
>             //String array access is a significant micro-optimisation over strlen
>             if (!isset($str[3]) || $str[3] === ' ' || $str[3] === "\r" || $str[3] === "\n") {
1096c1271
<             // Timed-out? Log and break
---
>             //Timed-out? Log and break
1100c1275
<                     'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
---
>                     'SMTP -> get_lines(): stream timed-out (' . $this->Timeout . ' sec)',
1105,1106c1280,1281
<             // Now check if reads took too long
<             if ($endtime and time() > $endtime) {
---
>             //Now check if reads took too long
>             if ($endtime && time() > $endtime) {
1108c1283
<                     'SMTP -> get_lines(): timelimit reached ('.
---
>                     'SMTP -> get_lines(): timelimit reached (' .
1114a1290
> 
1120c1296,1297
<      * @param boolean $enabled
---
>      *
>      * @param bool $enabled
1129c1306,1307
<      * @return boolean
---
>      *
>      * @return bool
1138,1140c1316,1319
<      * @param string $message The error message
<      * @param string $detail Further detail on the error
<      * @param string $smtp_code An associated SMTP error code
---
>      *
>      * @param string $message      The error message
>      * @param string $detail       Further detail on the error
>      * @param string $smtp_code    An associated SMTP error code
1145c1324
<         $this->error = array(
---
>         $this->error = [
1149,1150c1328,1329
<             'smtp_code_ex' => $smtp_code_ex
<         );
---
>             'smtp_code_ex' => $smtp_code_ex,
>         ];
1155c1334,1335
<      * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
---
>      *
>      * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it
1163a1344
>      *
1173c1354,1355
<      * @param integer $level
---
>      *
>      * @param int $level
1182c1364,1365
<      * @return integer
---
>      *
>      * @return int
1191c1374,1375
<      * @param integer $timeout
---
>      *
>      * @param int $timeout The timeout duration in seconds
1200c1384,1385
<      * @return integer
---
>      *
>      * @return int
1209,1210c1394,1398
<      * @param integer $errno The error number returned by PHP.
<      * @param string $errmsg The error message returned by PHP.
---
>      *
>      * @param int    $errno   The error number returned by PHP
>      * @param string $errmsg  The error message returned by PHP
>      * @param string $errfile The file the error occurred in
>      * @param int    $errline The line number the error occurred on
1212c1400
<     protected function errorHandler($errno, $errmsg)
---
>     protected function errorHandler($errno, $errmsg, $errfile = '', $errline = 0)
1214c1402
<         $notice = 'Connection: Failed to connect to server.';
---
>         $notice = 'Connection failed.';
1217,1218c1405,1406
<             $errno,
<             $errmsg
---
>             $errmsg,
>             (string) $errno
1221c1409
<             $notice . ' Error number ' . $errno . '. "Error notice: ' . $errmsg,
---
>             "$notice Error #$errno: $errmsg [$errfile line $errline]",
1226,1245c1414,1441
< 	/**
< 	 * Will return the ID of the last smtp transaction based on a list of patterns provided
< 	 * in SMTP::$smtp_transaction_id_patterns.
< 	 * If no reply has been received yet, it will return null.
< 	 * If no pattern has been matched, it will return false.
< 	 * @return bool|null|string
< 	 */
< 	public function getLastTransactionID()
< 	{
< 		$reply = $this->getLastReply();
< 
< 		if (empty($reply)) {
< 			return null;
< 		}
< 
< 		foreach($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
< 			if(preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
< 				return $matches[1];
< 			}
< 		}
---
>     /**
>      * Extract and return the ID of the last SMTP transaction based on
>      * a list of patterns provided in SMTP::$smtp_transaction_id_patterns.
>      * Relies on the host providing the ID in response to a DATA command.
>      * If no reply has been received yet, it will return null.
>      * If no pattern was matched, it will return false.
>      *
>      * @return bool|string|null
>      */
>     protected function recordLastTransactionID()
>     {
>         $reply = $this->getLastReply();
> 
>         if (empty($reply)) {
>             $this->last_smtp_transaction_id = null;
>         } else {
>             $this->last_smtp_transaction_id = false;
>             foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
>                 $matches = [];
>                 if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
>                     $this->last_smtp_transaction_id = trim($matches[1]);
>                     break;
>                 }
>             }
>         }
> 
>         return $this->last_smtp_transaction_id;
>     }
1247c1443,1454
< 		return false;
---
>     /**
>      * Get the queue/transaction ID of the last SMTP transaction
>      * If no reply has been received yet, it will return null.
>      * If no pattern was matched, it will return false.
>      *
>      * @return bool|string|null
>      *
>      * @see recordLastTransactionID()
>      */
>     public function getLastTransactionID()
>     {
>         return $this->last_smtp_transaction_id;
Only in TNG1403: compare_selected_atdna.php
diff -r TNG/compare_selected_dna.php TNG1403/compare_selected_dna.php
17d16
< $flags['tabs'] = $tngconfig['tabs'];
Only in TNG1403: compare_selected_mtdna.php
Only in TNG1403: compare_selected_ydna.php
diff -r TNG/config.php TNG1403/config.php
9,45c9,46
< $people_table = "tng_people";
< $families_table = "tng_families";
< $children_table = "tng_children";
< $albums_table = "tng_albums";
< $album2entities_table = "tng_albumplinks";
< $albumlinks_table = "tng_albumlinks";
< $media_table = "tng_media";
< $medialinks_table = "tng_medialinks";
< $mediatypes_table = "tng_mediatypes";
< $address_table = "tng_addresses";
< $languages_table = "tng_languages";
< $cemeteries_table = "tng_cemeteries";
< $states_table = "tng_states";
< $countries_table = "tng_countries";
< $places_table = "tng_places";
< $sources_table = "tng_sources";
< $repositories_table = "tng_repositories";
< $citations_table = "tng_citations";
< $events_table = "tng_events";
< $eventtypes_table = "tng_eventtypes";
< $reports_table = "tng_reports";
< $trees_table = "tng_trees";
< $notelinks_table = "tng_notelinks";
< $xnotes_table = "tng_xnotes";
< $saveimport_table = "tng_saveimport";
< $users_table = "tng_users";
< $temp_events_table = "tng_temp_events";
< $tlevents_table = "tng_timelineevents";
< $branches_table = "tng_branches";
< $branchlinks_table = "tng_branchlinks";
< $assoc_table = "tng_associations";
< $mostwanted_table = "tng_mostwanted";
< $mhrequests_table = "tng_mhrequests";
< $dna_tests_table = "tng_dna_tests";
< $dna_links_table = "tng_dna_links";
< $dna_groups_table = "tng_dna_groups";
< $templates_table = "tng_templates";
---
> $people_table = "people";
> $families_table = "families";
> $children_table = "children";
> $albums_table = "albums";
> $album2entities_table = "albumplinks";
> $albumlinks_table = "albumlinks";
> $media_table = "media";
> $medialinks_table = "medialinks";
> $mediatypes_table = "mediatypes";
> $address_table = "addresses";
> $languages_table = "languages";
> $cemeteries_table = "cemeteries";
> $states_table = "states";
> $countries_table = "countries";
> $places_table = "places";
> $sources_table = "sources";
> $image_tags_table = "image_tags";
> $repositories_table = "repositories";
> $citations_table = "citations";
> $events_table = "events";
> $eventtypes_table = "eventtypes";
> $reports_table = "reports";
> $trees_table = "trees";
> $notelinks_table = "notelinks";
> $xnotes_table = "xnotes";
> $saveimport_table = "saveimport";
> $users_table = "users";
> $temp_events_table = "temp_events";
> $tlevents_table = "timelineevents";
> $branches_table = "branches";
> $branchlinks_table = "branchlinks";
> $assoc_table = "associations";
> $mostwanted_table = "mostwanted";
> $mhrequests_table = "mhrequests";
> $dna_tests_table = "dna_tests";
> $dna_links_table = "dna_links";
> $dna_groups_table = "dna_groups";
> $templates_table = "templates";
49c50
< $templateswitching = 1;
---
> $templateswitching = "1";
55d55
< $target = "_self";
78a79
> $tngconfig['saveconfig'] = "";
80d80
< $tngconfig['thumbcols'] = "10";
82a83
> $tngconfig['scrollnotes'] = "1";
86c87
< $tngconfig['imgvheight'] = "1";
---
> $tngconfig['imgvheight'] = "0";
92d92
< $tngconfig['tabs'] = "tngtabs2.css";
102a103
> $tngconfig['altbirth'] = "CHR,BAPM";
105,106c106,107
< $tngconfig['places1tree'] = 1;
< $tngconfig['autogeo'] = 1;
---
> $tngconfig['places1tree'] = "0";
> $tngconfig['autogeo'] = "0";
115,117c116,118
< $nonames = 0;
< $tngconfig['nnpriv'] = 0;
< $notestogether = 2;
---
> $nonames = "0";
> $tngconfig['nnpriv'] = "0";
> $notestogether = "2";
120c121
< $lnprefixes = "";
---
> $lnprefixes = "0";
123,124c124,125
< $tngconfig['cemrows'] = 40;
< $tngconfig['cemblanks'] = 0;
---
> $tngconfig['cemrows'] = "40";
> $tngconfig['cemblanks'] = "0";
126,127c127,128
< $tngconfig['fromadmin'] = "$fromadmin";
< $tngconfig['disallowreg'] = 0;
---
> $tngconfig['fromadmin'] = "0";
> $tngconfig['disallowreg'] = "0";
143c144
< $tngconfig['pardata'] = 0;
---
> $tngconfig['pardata'] = "0";
146a148,149
> $tngconfig['sortbydate'] = "0";
> $tngconfig['nosuggest'] = "";
163c166
< $tngconfig['backupdays'] = 30;
---
> $tngconfig['backupdays'] = "30";
165d167
< $tngconfig['privateyears'] = 5;
168a171,172
> $tngconfig['livingunchecked'] = "";
> $tngconfig['allowcsv'] = "";
175a180,203
> 
> $maxdnasearchresults = "50";
> $showtestnumbers = "0";
> $autofillancsurnames = "1";
> $numgens = "3";
> $ancsurnameupper = "0";
> $surnameexcl = "";
> $bgmain = "";
> $txtmain = "#FFFFFF";
> $bgmode = "#D1EEEE";
> $txtmode = "#000000";
> $bgfastmut = "#69001A";
> $txtfastmut = "#FFFFFF";
> $bg1_12 = "#414E68";
> $txt1_12 = "#FFFFFF";
> $bg13_25 = "#41678A";
> $txt13_25 = "#FFFFFF";
> $bg26_37 = "#2E8899";
> $txt26_37 = "#FFFFFF";
> $bg38_67 = "#44A1B8";
> $txt38_67 = "#FFFFFF";
> $bg111 = "#05B8CC";
> $txt111 = "#FFFFFF";
> 
188c216
< @include($subroot . "customconfig.php");
---
> include($subroot . "customconfig.php");
Only in TNG1403: connections2.php
Only in TNG1403: connections-form.php
Only in TNG1403: connections-graph.php
Only in TNG1403: connections-lib.php
Only in TNG1403: connections.php
Only in TNG1403: connections-YenBFS.php
diff -r TNG/cookie_approval.php TNG1403/cookie_approval.php
0a1,11
> <?php
>   global $text;
> ?>
> <div class="cookie-banner" style="display: none">
>   <?php echo $text['cookieuse']; ?>
>   <p>
>     <a href="<?php echo getURL( "data_protection_policy", 0 ); ?>"><?php echo $text['viewpolicy']; ?></a>
>   </p>
>   <button class="cookie-close"><?php echo $text['understand']; ?></button>
> </div>
> 
2,8c13,23
<   window.cookieconsent_options = {
<   message: '<?php echo $text['cookieuse']; ?><br/>',
<   dismiss: '<?php echo $text['understand']; ?>',
<   learnMore: '&bull; <?php echo $text['viewpolicy']; ?>',
<   link: '<?php echo getURL( "data_protection_policy", 0 ); ?>',
<   theme: 'light-floating'  //other options: dark-top, dark-bottom
<  };
---
> //<![CDATA[
> jQuery(document).ready(function() {
>   if (localStorage.getItem('cookieSeen') != 'shown') {
>     $('.cookie-banner').show();
>   };
>   $('.cookie-close').click(function() {
>     localStorage.setItem('cookieSeen','shown')
>     $('.cookie-banner').hide();
>   })
> });
> //]]>
10d24
< <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/cookiebanner.js"></script>
\ No newline at end of file
diff -r TNG/css/calendar.css TNG1403/css/calendar.css
9,10d8
< 	background-color:#D6E7FF;
< 	border: 1px solid #5576BE;
52a51
> 	font-size: 8pt;
74c73
< 	border: 1px solid #6687CD;
---
> 	border: 1px solid #999;
80,83c79
< 	border-top: 1px solid #5576BE;
< 	border-left: 1px solid #5576BE;
< 	border-bottom: 2px solid #5576BE;
< 	border-right: 2px solid #5576BE;
---
> 	border: 1px solid #999;
108,111c104,107
< 	border-top: 1px solid #5576BE;
< 	border-left: 1px solid #5576BE;
< 	border-bottom: 2px solid #5576BE;
< 	border-right: 2px solid #5576BE;
---
> 	border-top: 1px solid #999;
> 	border-left: 1px solid #999;
> 	border-bottom: 2px solid #999;
> 	border-right: 2px solid #999;
diff -r TNG/css/cemeteries.css TNG1403/css/cemeteries.css
18d17
< 	height:100%;
Only in TNG1403/css: connections.css
diff -r TNG/css/genstyle.css TNG1403/css/genstyle.css
2c2
< .normal {
---
> .normal, .indleftcol {
4c4
< 	font-size: 12px;
---
> 	font-size: 10pt;
15a16,19
> img {
> 	border: 0px;
> }
> 
87a92
> 	padding: 7px;
95a101
> 	padding: 7px;
100c106
< 	background-color: #CACAF1;  
---
> 	background-color: #CACAF1;
133a140,144
> .popvdescinner {
> 	padding: 3px;
> 	width: 220px;
> }
> 
135d145
< 	-moz-box-shadow:    1px 1px 3px 0px #666;
141d150
< 	-moz-border-radius: 10px;
160c169,180
< 	float:left
---
> 	float:left;
> }
> 
> .vdescboxtable {
> 	height:100%;
> 	float:left;
> 	padding: 5px;
> }
> 
> .vpedlink {
> 	padding: 5px 12px 5px 12px;
> 	position: absolute;
162a183,185
> .rounded20 {
> 	border-radius: 20px;
> }
165,166d187
< 	-moz-border-radius: 10px;
< 	-webkit-border-radius: 10px;
171,172d191
< 	-moz-border-radius: 4px;
< 	-webkit-border-radius: 4px;
175a195,198
> .botbrdr {
> 	border-bottom: 1px solid #fff;
> }
> 
177d199
< 	-moz-box-shadow:    1px 1px 2px 0px #333;
199d220
< 
227a249,331
> 	padding: 7px;
> }
> 
> .adminbody {
> 	margin: 0px;
> }
> 
> .admincorner {
> 	padding: 2px 2px 2px 5px;
> 	background-color: white;
> 	width: 154px;
> 	height: 50px;
> 	text-align: center;
> }
> 
> .fl-left {
> 	float: left;
> }
> 
> .fl-right {
> 	float: right;	
> }
> 
> .admincorner img {
> 	height: 50px;
> 	border: 0px;
> }
> 
> .centerbox {
> 	filter: drop-shadow(3px 3px 4px #444);
> 	border-radius: 20px;
> 	margin: auto;
> }
> 
> #dirarrow {
> 	float:right;
> 	margin-top:160px;
> }
> 
> .admindivider {
> 	width: 80%;
> 	float: left;
> }
> 
> .admintitle {
> 	padding: 0px;
> 	margin: 7px 0px 0px 0px;
> }
> 
> .admintop {
> 	padding-left: 10px;
> 	overflow: hidden;
> 	text-align: center;
> }
> 
> .topbanner {
> 	position: fixed;
> 	top: 0px;
> 	height: 54px;
> 	margin: 0px;
> 	width: 100%;
> 	line-height: 1.4;
> 	z-index: 10;
>     filter: drop-shadow(0px 1px 3px #444);
> }
> 
> .leftmenu {
> 	width: 150px;
> 	height: 100%;
> 	padding:60px 6px 0px 6px;
> 	position: fixed;
> 	line-height: 1.25;
> 	overflow: auto;
> }
> 
> #adminslidebar {
> 	position:absolute;
> 	right:6px;
> 	height:600px;
> 	width:15px;
> 	cursor:pointer;
> 	margin:auto;
> 	z-index: 1;
233d336
< 	margin:6px;
238c341,345
< 	margin:4px;
---
> 	padding:60px 0px 0px 166px;
> }
> 
> .homeback {
> 	padding: 60px 0px 0px 0px;
242,244c349,489
< 	border: 1px solid silver;
< 	background-color: #ffffff;
< 	padding: 1px;
---
> 	width: 100%;
> 	max-width: 1200px;
> 	margin: auto;
> 	position: relative;
> 	height: 100%;
> }
> 
> .mainbox h1 {
> 	float: left;
> 	margin: 10px 0px 0px 20px;
> 	font-size: 36px;
> 	color: #FFF;
> 	text-shadow: 2px 2px 4px black;
> 	position: absolute;
> }
> 
> .admin-banner {
>     height: 200px;
>     margin: 10px 10px 0px 10px;
>     border-radius: 25px;
>     filter: drop-shadow(3px 3px 4px #444);
>     overflow: hidden;
>     position: relative;
> }
> 
> .admin-banner-img {
>     position:absolute;
>     border-radius: 25px;
>     -webkit-animation-name: fade;
>     -webkit-animation-iteration-count: infinite;
>     -webkit-animation-duration: 150s;
>     animation-name: fade;
>     animation-iteration-count: infinite;
>     animation-duration: 150s;
>     animation-timing-function: ease-in-out;
>     filter: linear-gradient(rgba(0,0,0,0.25));
> }
> 
> /* For 3 images
> @-webkit-keyframes fade {
>     0% {opacity: 1;}
>     26.67% {opacity: 1;}
>     33.33% {opacity: 0;}
>     93.33% {opacity: 0;}
>     100% {opacity: 1;}
> }
> @keyframes fade {
>     0% {opacity: 1;}
>     26.67% {opacity: 1;}
>     33.33% {opacity: 0;}
>     93.33% {opacity: 0;}
>     100% {opacity: 1;}
> }
> 
> #admin-banner1 {
>     -webkit-animation-delay: 0;
>     animation-delay: 0;
> }
> #admin-banner2 {
>     -webkit-animation-delay: 25s;
>     animation-delay: 25s;
> }
> #admin-banner3 {
>     -webkit-animation-delay: 50s;
>     animation-delay: 50s;
> }
> */
> 
> @-webkit-keyframes fade {
>     0% {opacity: 1;}
>     16.67% {opacity: 1;}
>     20% {opacity: 0;}
>     96.67% {opacity: 0;}
>     100% {opacity: 1;}
> }
> @keyframes fade {
>     0% {opacity: 1;}
>     16.67% {opacity: 1;}
>     20% {opacity: 0;}
>     96.67% {opacity: 0;}
>     100% {opacity: 1;}
> }
> 
> #admin-banner1 {
>     -webkit-animation-delay: 0;
>     animation-delay: 0;
> }
> #admin-banner2 {
>     -webkit-animation-delay: 30s;
>     animation-delay: 30s;
> }
> #admin-banner3 {
>     -webkit-animation-delay: 60s;
>     animation-delay: 60s;
> }
> #admin-banner4 {
>     -webkit-animation-delay: 90s;
>     animation-delay: 90s;
> }
> #admin-banner5 {
>     -webkit-animation-delay: 120s;
>     animation-delay: 120s;
> }
> 
> .adm-rounded-table {
> 	border-radius: 0px 0px 20px 20px;
> 	background-color: white;
> }
> 
> .adm-rounded-table > tbody > tr, .adm-rounded-table > tbody > tr > td, .tblback > tbody > tr, .tblback > tbody > tr > td {
> 	border-radius: 20px;
> 	padding: 10px;
> }
> 
> .admin-header {
> 	padding: 10px 10px 1px 10px;
> 	border-radius: 20px 20px 0px 0px;
> 	margin-right: 3px;
> 	background-color: #FFFFFF;
> }
> 
> .admin-main {
> 	background-color: white;
> 	margin-right: 3px;
> 	padding: 6px 10px 10px 10px;
> 	border-radius: 0px 0px 20px 20px;
> }
> 
> .admin-block {
> 	border-radius: 15px;
> 	padding: 12px;
> 	overflow: auto;
> }
> 
> .top-rounded-headline {
> 	border-radius: 20px 20px 0px 0px;
> 	padding: 5px 15px 5px 20px;
> }
> 
> .bottom-rounded {
> 	border-radius: 0px 0px 20px 20px;
251a497,508
> .adminsubhead {
> 	margin-right: 40px;
> 	position: absolute;
> 	top: 50%;
> 	transform: translateY(-50%);
> 	left: 75px;
> }
> 
> .adminsubhead-mobile {
> 	left: 20px;
> }
> 
254c511
< 	font-size: 16px;
---
> 	font-size: 18px;
266a524,528
> .admintasks {
> 	font-size: 16px;
> 	margin-bottom: 2px;
> }
> 
268a531,535
> 	position: absolute;
> 	right: 18px;
> 	top: 50%;
> 	transform: translateY(-50%);
> 	font-size: 18px;
332a600,601
> #dna-smicon {background-position: 0px -256px;}
> #next-smicon {background-position: 0px -241px;}
388a658,661
> .media-title {
> 	font-size: 13pt;
> }
> 
403a677,691
> .media-edit {
> 	position:absolute;
> 	bottom:0px;
> 	right:0px;
> 	padding-right:5px;
> 	padding-bottom:5px;
> 	display:none;
> }
> 
> .vertphoto {
> 	max-width:100%; 
> 	max-height:70px;
> 	margin: 0px auto 10px;
> }	
> 
524d811
< 	position: relative;
552,559d838
< textarea {
< 	margin-left: 0px;
< }
< 
< select {
< 	padding: 1px 4px;
< }
< 
564c843
< input[type="button"], input[type="submit"], input[type="reset"], input[type="password"], button, input[type="text"], textarea, select {
---
> input[type="button"], input[type="submit"], input[type="reset"], input[type="password"], input[type="number"], button, input[type="text"], textarea, select {
566,568c845,846
< 	-moz-border-radius: 5px;
< 	-webkit-border-radius: 5px;
< 	border-radius: 5px;
---
> 	-webkit-border-radius: 7px;
> 	border-radius: 7px;
571a850,853
> input[type="password"], button, input[type="text"], input[type="number"], textarea, select {
> 	font-size: 14px;
> }
> 
579a862,866
> textarea {
> 	margin-left: 0px;
> 	border-radius: 10px;
> }
> 
610a898,901
> input.medpwdfield {
> 	width: 240px;
> }
> 
619,620c910,911
< select.mediumfield {
< 	width:170px;
---
> .mediumfield {
> 	width:160px;
650a942,950
> 	padding: 9px;
> }
> 
> .movefields {
> 	border-radius: 8px;
> 	padding: 4px;
> 	width: 30px;
> 	text-align: center;
> 	border: 1px solid gray;
693a994,998
> .admin-down-icon {background-position: 0px -383px;}
> 
> .action-btn {
> 	padding-top: 2px;
> }
708,714c1013,1020
< .thumb, .smallimg, .media-preview {
< 	-moz-box-shadow:    1px 1px 1px 0px #777;
< 	-webkit-box-shadow: 1px 1px 1px 0px #777;
< 	box-shadow:         1px 1px 1px 0px #777;
< 	-moz-border-radius: 4px;
< 	-webkit-border-radius: 4px;
< 	border-radius: 4px;
---
> .thumb, .smallimg, .adminthumb {
> 	border: 0;
> 	box-shadow: 1px 1px 1px 0px #777;
> 	border-radius: 5px;
> }
> 
> #thumbholder a, .thumbholder a {
> 	border-radius: 5px;
746d1051
< 	-moz-border-radius: 4px;
781c1086
< 	filter:alpha(opacity=70);
---
> 	filter:opacity(70%);
794d1098
< 	-moz-border-radius: 8px;
817d1120
< 	-moz-border-radius: 5px 5px 0px 0px;
826d1128
< 	-moz-border-radius: 5px 5px 0px 0px;
832c1134
< 	margin: 0px 0px 0px 5px;
---
> 	margin: 3px 0px 0px 5px;
857c1159
< 	background-image: url(../img/background.gif);
---
> 	margin: 0px;
861a1164,1165
> 	padding: 7px;
> 	font-size: 11pt;
864c1168
< .tngmsgarea .adminsubhead,
---
> .tngmsgarea .admintasks,
884a1189
>     font-size: 9px;
907d1211
< 	line-height: 2em;
936a1241
> 	border-radius: 5px;
943d1247
< 	border:1px solid black;
950a1255
> 	border-radius: 5px;
960c1265
< padding: -3px;
---
> 	padding: 3px;
993c1298,1299
< 	margin:2px 0 0 -15px
---
> 	margin:2px 0 0 -15px;
> 	list-style: none;
1020d1325
< 	-moz-border-radius: 8px;
1036d1340
< 	-moz-border-radius: 0px 4px 4px 0px;
1053,1057c1357,1362
< 	 float:right;
< 	 padding:10px;
< 	 font-size:14pt;
< 	 border:1px solid black;
< 	 margin-right:15%
---
> 	float:right;
> 	padding:10px;
> 	font-size:14pt;
> 	border:1px solid black;
> 	margin-right:15%;
> 	border-radius: 10px;
1070d1374
< 	-moz-border-radius: 10px;
1117a1422,1429
> .reportbox {
> 	border: 1px solid gray;
> 	border-radius: 10px;
> 	background-color: white;
> 	padding: 5px;
> 	margin: 0px 10px 0px 0px;
> }
> 
1119c1431,1466
< 	width:220px;
---
> 	width: 300px;
> 	font-size: 11.5pt;
> 	list-style: none;
> 	line-height: 1.5em;
> 	overflow: auto;
> 	margin: 0;
> 	padding: 2px 8px 2px 2px;
> 	background: #fff url(../img/reportback1.jpg) no-repeat;
> 	background-position: center;
> }
> 
> .reportcol li {
> 	padding: 2px 4px 2px 8px;
> 	border-radius: 10px;
> 	cursor: grab;
> 	background-color: white;
> }
> 
> .reportcol li:hover {
> 	background-color: #e0e0f7;
> }
> 
> 
> .reportcol option {
> 	padding: 3px;
> }
> 
> .report-icon {
> 	margin-bottom: 10px;
> 	width: 17px;
> 	height: 15px;
> 	border: 0;
> }
> 
> .hidden {
> 	visibility: hidden;
1137a1485,1488
> .indent-tiny {
> 	padding-left: 2px;
> }
> 
1151,1154c1502,1503
< 	margin:1px 9px 0px 3px;
< 	-moz-border-radius: 4px;
< 	-webkit-border-radius: 4px;
< 	border-radius: 4px;
---
> 	margin:1px 9px 0px 12px;
> 	border-radius: 6px;
1157a1507,1515
> 	display: grid;
> 	grid-auto-flow: column;
> 	/* top: 210px; */
> 	/* position: absolute; */
> 	width: 100%;
> 	padding-top: 10px;
> }
> 
> .admincol-mobile {
1159,1160c1517,1518
< 	width:50%;
< 	min-width:440px;
---
> 	width:100%;
> 	min-width:354px;
1166,1167c1524,1525
< 	padding:8px;
< 	margin:2px 3px 4px 3px;
---
> 	padding: 10px;
> 	margin: 7px;
1169,1171c1527,1528
< 	-moz-border-radius: 4px;
< 	-webkit-border-radius: 4px;
< 	border-radius: 4px;
---
> 	border-radius: 25px;
> 	position: relative;
1184a1542,1549
> 	min-height: 20px;
> 	font-size: 14px;
> 	box-shadow: 2px 2px 5px 0px #444;
> }
> 
> .tngmsgarea-std {
> 	float: right;
> 	background-color: rgb(150,150,150,0.5);
1197c1562
< 	padding:4px 4px 4px 6px;
---
> 	padding:4px 8px 4px 10px;
1199,1201c1564,1565
< 	-moz-border-radius: 6px;
< 	-webkit-border-radius: 6px;
< 	border-radius: 6px;
---
> 	-webkit-border-radius: 15px;
> 	border-radius: 15px;
1207c1571,1576
< 	filter: dropshadow(color=#000000, offx=1, offy=1);
---
> }
> 
> a.admincell {
> 	filter: drop-shadow(3px 3px 4px #444);
> 	border: 0;
> 	min-height: 20px;
1217c1586
< 	 padding: .2em 0px .3em .7em;
---
> 	 padding: 4px 4px 4px 12px;
1219a1589
> 	 border-radius: 10px;
1226,1227c1596,1598
< 	border-right: 1px solid #777;
< 	border-bottom: 1px solid #777;
---
> 	border-right: 1px solid #ddd;
> 	border-bottom: 1px solid #ddd;
> 	filter: drop-shadow(2px 2px 2px #777);
1234c1605
< .fakelink {
---
> .fakelink, .pubbox {
1237a1609,1612
> .fakelink {
> 	font-size: 9px;
> }
> 
1321c1696
< .tfixed {
---
> .tfixed, .dna-tfixed {
1326a1702,1716
> .tfixed, .thfixed, .dna-tfixed {
> 	border-radius: 8px;
> 	box-shadow: 2px 2px 5px -1px #666;
> }
> 
> .tfixed tr:last-child td:first-child, .thfixed tr:last-child td:first-child, .rc-ll { border-bottom-left-radius: 8px; } 
> .tfixed tr:last-child td:last-child, .thfixed tr:last-child td:last-child, .dna-tfixed tr:last-child td:last-child, .rc-lr { border-bottom-right-radius: 8px; }
> .tfixed tr:first-child td:first-child, .thfixed tr:first-child th:first-child, .rc-ul { border-top-left-radius: 8px; } 
> .tfixed tr:first-child td:last-child, .thfixed tr:first-child th:last-child, .dna-tfixed tr:first-child td:last-child { border-top-right-radius: 8px; }
> 
> .rounded-table tr:last-child td:first-child, .rounded-table tr:last-child td:first-child { border-bottom-left-radius: 8px; } 
> .rounded-table tr:last-child td:last-child, .rounded-table tr:last-child td:last-child { border-bottom-right-radius: 8px; }
> .rounded-table tr:first-child td:first-child, .rounded-table tr:first-child th:first-child { border-top-left-radius: 8px; } 
> .rounded-table tr:first-child td:last-child, .rounded-table tr:first-child th:last-child { border-top-right-radius: 8px; }
> 
1328c1718
< 	width:130px;
---
> 	width:150px;
1344a1735
> 	padding: 0px 15px 0px 5px;
1365,1366c1756,1757
< 	position: relative;
< 	font-size: 11px;
---
> 	/*position: relative;*/
> 	font-size: 12px;
1367a1759
> 	padding: 0.6em 1em 0.3em 11px;
1372,1373c1764,1765
< 	position:relative;
< 	z-index:10;
---
> 	/*position: relative;*/
> 	z-index: 1;
1405d1796
< 	-moz-border-radius: 6px;
1418a1810
> 	display: flex;
1421c1813
< 	margin:1px 0 0 2px;
---
> 	margin:0 0 0 2px;
1425a1818,1821
> div.icons-rt a {
> 	margin: auto 10px auto 0px;
> }
> 
1460d1855
< 	-moz-border-radius: 6px;
1469d1863
< 	-moz-border-radius: 6px;
1481d1874
< 	-moz-box-shadow:    1px 1px 3px 0px #666;
1485d1877
< 	-moz-border-radius: 6px;
1500d1891
< 	-moz-border-radius: 0px;
1511d1901
< 	-moz-border-radius: 0px;
1517d1906
< 	-moz-border-radius: 6px 6px 0px 0px;
1523d1911
< 	-moz-border-radius: 0px 0px 6px 6px;
1566d1953
< 	-moz-border-radius: 0px 6px 6px 0px;
1575d1961
< 	-moz-border-radius: 6px 0px 0px 6px;
1624c2010
< #surnames-hdr-icon, #surnames-icon {background-position: -285px 0px;}
---
> #surnames-hdr-icon, #surnames-icon, #firstnames-icon {background-position: -285px 0px;}
1670d2055
< 	-moz-box-shadow:    1px 1px 3px 0px #666;
1673d2057
< 	-moz-border-radius: 8px;
1688d2071
< 	-moz-border-radius: 6px;
1691d2073
< 	-moz-box-shadow:    1px 1px 3px 0px #666;
1751a2134,2137
> .clearboth {
> 	clear: both;
> }
> 
1759d2144
< 	-moz-border-radius: 8px;
1780a2166,2174
> .pwdfield {
> 	width: 85%;
> }
> 
> .pwdicon {
> 	position: relative;
> 	top: 4px;
> }
> 
1788a2183,2186
> .adminlog {
> 	white-space: nowrap;
> }
> 
1795a2194,2222
> 	 display: inline-block;
> }
> 
> .searchsidebar {
> 	display: inline-block;
> 	position: fixed;
> 	margin-right: 100px;
> }
> 
> .remove-link {
> 	float: right;
> 	padding-right: 8px;
> 	cursor: pointer;
> }
> 
> .cust-event-block {
> 	border-radius: 20px;
> 	padding: 7px 5px 5px 10px;
> 	margin-bottom: 3px;
> 	border: 1px solid #aaa;
> }
> 
> .cust-event-field {
> 	border-radius: 8px;
> 	border: 1px solid gray;
> 	background-color: #FFFFFF;
> 	padding: 3px 5px 3px 5px;
> 	font-size: 14px;
> 	min-height: 16px;
1816a2244
> }
1817a2246,2270
> .cookie-banner {
> 	position: fixed;
> 	bottom: 40px;
> 	/* left: 10%; */
> 	right: 3%;
> 	width: 300px;
> 	padding: 10px 14px;
> 	/* display: flex; */
> 	align-items: center;
> 	justify-content: space-between;
> 	background-color: #eee;
> 	border-radius: 5px;
> 	box-shadow: 2px 2px 4px 3px rgba(0, 0, 0, 0.2);
> 	z-index: 999;
> 	font-size: 14pt;
> }
> .cookie-close {
> 	height: 30px;
> 	background-color: #777;
> 	border: none;
> 	color: white;
> 	border-radius: 2px;
> 	cursor: pointer;
> 	border-radius: 5px;
> 	width: 100%;
1862c2315
< 	border: 1px #FF0000 dashed;
---
> 	border: 1px #009900 solid;
1866c2319
< 	border: 1px #CCC dashed;
---
> 	border: 1px #CCC solid;
1870a2324,2325
> 	border-radius: 5px;
>    	box-shadow: 2px 2px 3px 0px #333;
1873a2329,2360
> #tags {
> 	position:absolute;
> 	left:0;
> 	right:0;
>     margin-left: auto;
>     margin-right: auto;
>     z-index: 1;
> }
> 
> .imagetag {
> 	position:absolute;
> 	/*bottom:0;*/
> 	left:2px;
> 	right:0;
> 	padding:3px;
> 	color:white;
> 	background-color:rgba(0,0,0,0.6);
> 	overflow:visible;
> 	border-radius: 5px 5px 5px 5px;
> 	text-align: center;
> 	min-width: 100px;
> }
> 
> .delx {
> 	background-color: red;
> 	padding:3px;
> 	width:15px;
> 	float:right;
> 	font-weight: bold;
> 	cursor: pointer;
> }
> 
1883a2371,2397
> .scroll-to-top {
>  	display: none;
>  	position: fixed; bottom: 20px; right: 10px;
>  	z-index: 5;
>  	width: 30px;
>  	height: 30px;
>  	padding: 8px;
>  	text-align:center;
>  	color: #ffffff;
> 	text-decoration: none;
> 	background-color: #444;
> 	text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
> 	border-radius: 50%;
> }
> .scroll-to-top:hover {
> 	text-decoration: none;	
> 	background-color: #777;
> 	text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
> }
> .scroll-to-top a, .scroll-to-top a:hover {
> 	text-decoration: none;
> }
> 
> .grabbing { 
>     cursor: grabbing; 
> }
> 
1920d2433
< 	-moz-border-radius: 4px;
1958a2472,2475
> .fambox a:link, .fambox a:visited, .mfambox a:link, .mfambox a:visited {
> 	font-size: 11pt;
> }
> 
1960c2477
<     background-color:#cccccc; 
---
>     background-color:#cccccc;
1969c2486
< 	text-align:right; 
---
> 	text-align:right;
1986c2503
< 	width:100px;
---
> 	width:124px;
2075,2080c2592,2599
< 	height:125px;
<         width:20px;
<         font:9pt Verdana, Arial;
<         font-weight: bold;
<         display: block;
<         text-align: left;
---
> 	height:112px;
> 	width:16px;
> 	font:9pt Verdana, Arial;
> 	font-weight: bold;
> 	display: block;
> 	text-align:left;
> 	margin: auto;
> 	padding: 0.25em;
2101,2102d2619
< 	width: 100%;
< 	height: 400px;
2114c2631
< #fanWrapper { 
---
> #fanWrapper {
2115a2633
> 	padding: 10px;
2157c2675
< 	color: #000 !important; 
---
> 	color: #000 !important;
2160c2678
<  
---
> 
2162,2163c2680,2681
< 	background: #ffffff !important; 
< 	color: #000000 !important; 
---
> 	background: #ffffff !important;
> 	color: #000000 !important;
2169a2688,2728
> .mag-icons {
> 	margin-top:10px;
> 	margin-bottom:5px;
> 	z-index:100;
> 	/*position: absolute;*/
> }
> 
> .mag-icons img {
> 	opacity:0.3;
> }
> 
> .mag-icons img:hover {
> 	opacity:1.0;
> 	cursor:pointer;
> }
> 
> .mag-fixed {
> 	position: fixed;
> 	top: 40px;
> }
> 
> .savestay {
> 	position: fixed;
> 	right: 30px;
> 	top: 260px;
> 	min-width: 150px;
> }
> 
> .saveret {
> 	position: fixed;
> 	right: 30px;
> 	top: 220px;
> 	min-width: 150px;
> }
> 
> @media (max-width: 900px) {
> 	.savestay {
> 		visibility: hidden;
> 	}
> }
> 
2185d2743
<      -moz-user-select: none;
2221a2780,2802
> table.resultstable {
> 	border-spacing: 1px;
> }
> 
> table.dnacomparetable {
> 	border-spacing: 1px;
> 	border: 0px;
> }
> 
> .dnacomparetable th, .dnacomparetable td {
> 	padding: 0px;
> }
> 
> @media (max-width: 1100px) {
> 	#corner-right {
> 		display: none;
> 	}
> 	.searchsidebar {
> 		position: unset;
> 	}
> }
> 
> 
2223,2224c2804,2805
< @media screen and (max-width:1200px) {.media-prev {height:100%; top:50px; background:none;}}
< @media screen and (max-width:640px) {.media-prev {padding: 10px 4px 6px 0;}}
---
> @media screen and (max-width:480px) {.media-prev {height:100%; top:50px; background:none;}}
> @media screen and (max-width:480px) {.media-prev {padding: 10px 4px 6px 0;}}
2228c2809
< 		width: 180px;	
---
> 		width: 180px;
2233c2814
< 		left: 10px; 
---
> 		left: 10px;
2239c2820
< 		left: 50px;	
---
> 		left: 50px;
2241,2243d2821
< 		
< 	}
< }
2245,2248d2822
< @media only screen and (min-width:641px) and (max-width:1100px) {
< 	.media-prev {
< 		left: 50px;	
< 				
2260c2834,2837
< @media only screen and (min-width:320px) and (max-width:480px) {
---
> @media only screen and (max-width:480px) {
> 	.mag-icons img {
> 		width: 30px;
> 	}
2268c2845
< 		width: 280px;
---
> 		width: 245px;
2287a2865,2867
> 	input.longfield {
> 		width: 245px;
> 	}
2307a2888,2901
> .img-right {
> 	margin: 10px 0 10px 10px;
> 	float: right;
> }
> 
> .img-left {
> 	margin: 10px 10px 10px 0;
> 	float: left;
> }
> 
> .cell-pad3 {
> 	padding: 3px;
> }
> 
diff -r TNG/css/img_viewer.css TNG1403/css/img_viewer.css
29c29
<     border: solid 1px #000;
---
>     border: solid 1px #666;
105,106d104
< 	padding-top: 10px;
< 	padding-bottom: 10px;
108c106
< 	border: 1px solid silver;
---
> 	border: 0px;
diff -r TNG/css/media.css TNG1403/css/media.css
19c19
<     margin:10px;
---
>     margin:3px;
diff -r TNG/css/modmanager.css TNG1403/css/modmanager.css
1,7c1,7
< #mmhead-section {
< 	position:fixed;
< 	top:0;
< 	width:99%;
< 	background-image:url(../img/background.gif);
< 	padding:5px 1px 1px 1px;
< 	z-index:1000;
---
> /* Prevents double vertical scroll bars in mm listing */
> html, body {
>   /* removes outer scroll bar */
>   overflow:hidden !important;
> 
>   /* Some templates have height:100% - prevents scrolling */
>   height:auto !important;
9,10c9,13
< #mmpage {
< 	padding-top:110px;
---
> 
> .mainback {
>   /* fixes tng header when using anchor to position in scrollable table */
>   position:fixed;
>   z-index:-200;
12,13c15,17
< #modlist {
< 	padding-top:150px;
---
> 
> form {
>   width:100%;
15,18c19,26
< #mmoutter {width:99.8%;}
< .leftmmanalyzer {
< 	width: 35%;
< 	vertical-align:top;
---
> 
> /***************************************************************
>   TABLES
> ***************************************************************/
> /* Unstyled tables need 'cellspacing="0"' in the MM markup. */
> table {
>     border-collapse: collapse;
>     border-spacing: 0;
20,22c28,40
< .rightmmanalyzer {
< 	width:65%;
< 	vertical-align:top;
---
> 
> /* mmtable2 in admin_analyzemods to prevent
> ** internal tables inheriting from the outer mmtable2
> ** table. All mm pages use mmtable.*/
> table.mmtable2,
> table.mmtable {
> table-layout:fixed;
>   width:100%;
>   border-collapse:separate;
>   border-spacing:2px;
>   margin-left:-2px;
>   margin-top:-2px;
>   font-size:12px;
24,25c42,50
< .mmhighlight {
< 	color:#990000;
---
> 
> table.nested {
>   table-layout:fixed;
>   width:100%;
>   border-collapse:separate;
>   border-spacing:1px;
>   margin-top:-2px;
>   margin-bottom:1px;
>   font-size:12px;
27,28c52,54
< .mmfilenmfont {
< 	font-size:120%;
---
> 
> table.mmtable thead {
>   z-index:3;
30,31c56,61
< .mmlochdr {
< 	color:blue;
---
> 
> /* modlister, admin_analyzemods, admin_modtables
> ** row highlighting */
> table.mmtable>tbody>tr:hover td.flink,
> table.mmtable>tbody>tr:hover td.flink {
>   background-color:#EEEB8D;
33,34c63,65
< .mmkeyword {
< 	color:#AA0000;
---
> 
> table#modlist tr {
>   height:35px;
36,37c67,72
< .mmrightalign {
< 	text-align:right;
---
> 
> 
> /* modlister - affected files popups */
> .cellspace1 {
>   border-spacing: 2px;
>   border-collapse: separate;
39,40c74,81
< .mmlinks {
< 	text-decoration:none;
---
> 
> /***************************************************************
>   TABLES TD (CELLS)
> ***************************************************************/
> /* modlister */
> td.flink {
>   cursor:pointer;
>   vertical-align:top;
42,45c83,87
< .mmhdrtable {width:100%;}
< .mmtable {
< 	width:100%;
<     padding:10px 1px;
---
> 
> td.flink a:visited,
> td.flink a:link {
>   color:#000;
>   text-decoration:none;
47,48c89,97
< .mmpopuptable {
< 	width:100%;
---
> 
> /* added for Mod Manager error messages */
> td.avail{
>   border-bottom:2px solid #00CC7A;
>   border-right:2px solid #00CC7A;
>   border-top:1px solid #00FF33;
>   border-left:1px solid #00FF33;
>   background-color:#FFFFFF;
>   text-align: center;
50,51c99,106
< .mmpad2 {
< 	padding:2px;
---
> 
> td.inst{
>   border-bottom:2px solid #00CC7A;
>   border-right:2px solid #00CC7A;
>   border-top:1px solid #00FF33;
>   border-left:1px solid #00FF33;
>   background-color:#CCFFCC;
>   text-align: center;
53,54c108,132
< .mmpadtop5 {
< 	padding-top:5px;
---
> 
> td.failed{
>   border-bottom:2px solid #CC0000;
>   border-right:2px solid #CC0000;
>   border-top:1px solid #CC0000;
>   border-left:1px solid #CC0000;
>   background-color:#FFE5E5;  /* was FFCCCC in admin_modmanager.php */
> }
> 
> /***************************************************************
>   DIVS
> ***************************************************************/
> /* Wrapped around a table, this allows a it
> ** to scroll underneath its <thead> row */
> div.tableFixedHead {
>   overflow-y:auto;
>   height:100%;
>   height:calc(100vh - 260px);
>   padding:0px;
>   margin:0px;
> }
> 
> div.tableFixedHead thead {
>   position:sticky;
>   top:0;
56,57c134,138
< .mmpadleft {
< 	padding-left:3px;
---
> 
> /* modlister */
> div.list-indent {
>   margin-left:2em;
>   text-indent:-2em;
59,60c140,142
< .mmpopuphdr {
< 	line-height:150%;padding-left:3px;
---
> 
> div.edreturn {
>   padding:1em 0.5em;
63,69c145,147
< /*  Batch Updates columns */
< .ptr {cursor:pointer;}
< .colcb {width:5%;}
< .colmn {width:35%;}
< .colfn {width:35%;}
< .colvr {width:10%;}
< .colst {width:15%;}
---
> div.edreturn form {
>   padding-left:10px;
> }
71,111c149,184
< /*  Mod List columns */
< .colmln {width:15%;}
< .colmld {width:30%;}
< .colmlfn {width:30%;}
< .colmlvr {width:5%;}
< .colmlst {width:20%;}
< 
< div.descpop {
< 	position: relative;
< 	margin: 0 5px 3px 0;
< 	float:right;
< }
< div.descpop div {
< 	position: absolute;
< 	max-height: 200px;
< 	top:-2000px;
< 	right:14px;
< 	visibility: hidden;
< }
< div.descpop:hover div {
< 	visibility: visible;
< 	max-height: 200px;
< 	overflow-y:auto;
< 	top:-75px;
< 	background: #ffffff;
< 	padding: 3px 3px 3px 3px;
< 	border-style:solid;
< 	border-color:black;
< 	border-width:2px;
< 	z-index: 1001;
< }
< 
< @media screen and (max-width:750px) {
< 	div.descpop:hover div {
< 		width:300px;
< 	}
< }
< @media screen and (min-width:750px) {
< 	div.descpop:hover div {
< 		width:500px;
< 	}
---
> /***************************************************************
>   MODLISTER AFFECTED FILES
> ***************************************************************/
> /* modlister - affected files */
> .afcell {
>   vertical-align:top;
>   margin-left:auto;
>   margin-right:auto;
>   text-align:center;
> }
> /* modlister - affected files popups */
> .mmpad2 {
>   padding:2px;
> }
> /* modlister - affected rows - from tngv103 */
> .mmpadleft {
>   padding-left:3px;
> }
> /* modlister - affected files popups */
> .cellspace1 {
>   border-spacing: 1px;
>     border-collapse: separate;
> }
> .imgcenter {
>     left:40%;
>     margin-right:-40%;
> }
> /* modlister -- affected files popups */
> /* from tngv103 */
> .mmpopuptable {
>   width:100%;
> }
> /* modlister - affected files popups */
> /* from tngv103 */
> .mmpopuphdr {
>   line-height:150%;padding-left:3px;
114,121c187,191
< /* added for Mod Manager error messages */
< td.avail{
< 	border-bottom:2px solid #00CC7A;
< 	border-right:2px solid #00CC7A;
< 	border-top:1px solid #00FF33;
< 	border-left:1px solid #00FF33;
< 	background-color:#FFFFFF;
< 	text-align: center;
---
> div.descpop1 {
>   position: relative;
>   width:16px;
>   margin:0;
>   z-index:1;
124,130c194,205
< td.inst{
< 	border-bottom:2px solid #00CC7A;
< 	border-right:2px solid #00CC7A;
< 	border-top:1px solid #00FF33;
< 	border-left:1px solid #00FF33;
< 	background-color:#CCFFCC;
< 	text-align: center;
---
> div.descpop1 div {
>   position: absolute;
>   display:none;
>   right:16px;
>   top:0px;
>   overflow-y:auto;
>   background: #ffffff;
>   padding: 3px 3px 3px 3px;
>   border-style:solid;
>   border-color:black;
>   border-width:2px;
>   /*z-index: 1001;*/
133,138c208,210
< td.failed{
< 	border-bottom:2px solid #CC0000;
< 	border-right:2px solid #CC0000;
< 	border-top:1px solid #CC0000;
< 	border-left:1px solid #CC0000;
< 	background-color:#FFE5E5;  /* was FFCCCC in admin_modmanager.php */
---
> div.descpop1:hover div {
>   display:block;
>   max-height:150px;
141c213,218
< /* The following was added for Mod Manager in TNG 10.1.0  */
---
> @media screen and (max-width:750px)
> {
>   div.descpop1:hover div {
>     width:300px;
>   }
> }
143,145c220,234
< /* modlister row highlighting */
< tr.modline:hover td.mmcell:nth-child(-n+5) {
< 	background-color:#EEEB8D;
---
> @media screen and (min-width:750px)
> {
>   div.descpop1:hover div {
>     width:500px;
>   }
> }
> 
> /***************************************************************
>   GENERAL STYLES
> ***************************************************************/
> /* Adjust TNG .admin-main for padding-left
> ** to line up with TNG adm-innermenu. */
> .admin-main {
>   position:relative;
>   padding-left:12px;
147c236,237
< /* Mod List column widths (layout-fixed) */
---
> 
> /* modlister column widths (layout-fixed) */
155,159c245,250
< /* modlister */
< span.opened {
< 	padding-left:14px;
< 	cursor: pointer;
< 	background: url(../img/tng_collapse.gif) no-repeat left center;
---
> 
> /* admin_showmodslog */
> .mmpanel {
>   border: 1px solid #bbb;
>   padding-top:5px;
>   padding-bottom:5px
161,165c252,273
< /* modlister */
< span.closed {
< 	padding-left:14px;
< 	cursor: pointer;
< 	background: url(../img/tng_expand.gif) no-repeat left center;
---
> 
> /* admin_modhandler, modlister - prevents status
> ** column content overflow */
> .moddiv {
>   overflow:hidden;
>   padding:5px;
> }
> 
> /* MM tabbed scripts */
> .mmrounded {
>   border-radius:8px;
> }
> 
> /* admin_modopotions */
> .mmrounded20 {
>   border-radius:20px;
> }
> 
> /* modlister, MM tabbed scripts */
> .roundtop {
>   border-top-left-radius:10px;
>   border-top-right-radius:10px;
166a275
> 
168,171c277,279
< span.modlink {
< 	display:inline-block;
< 	width:96%;
< 	cursor:pointer;
---
> .roundleft {
>   border-top-left-radius:8px;
>   border-bottom-left-radius:8px;
172a281
> 
174,175c283,284
< td.flink {
< 	cursor:pointer;
---
> .roundbl {
>   border-bottom-left-radius:8px;
176a286
> 
178,182c288,294
< /* mod listing table cells */
< .mmcell, .stcell {
< 	border:1px solid #aaa;
<     vertical-align:top;
<     padding:0 1px;
---
> .hilighterr {
>   background-color: #FFCCF9;
> }
> 
> /* modlister, modinstaller, modremover, modeditor */
> .tag {
>   font-style:italic;
186,190c298,299
< /* used inside table cells to keep content from overflowing into next element */
< div.mminner {
< 	overflow:hidden;
< 	text-overflow:ellipsis;
< 	white-space:nowrap;
---
> .checkpad {padding-left: 0px;
>   padding-top: 0px;
192,193c301,303
< .mmcell {
< 	white-space:nowrap;
---
> 
> .copyfile, .mkdir, .newfile {
>   color:navy;
194a305
> 
196,198c307,308
< .checkpad {
< 	padding-left: 0px;
< 	padding-top: 0px;
---
> .hilight {
>   background-color:yellow;
200,205c310,326
< /* modlister - affected files */
< .afcell {
< 	vertical-align:top;
< 	margin-left:auto;
< 	margin-right:auto;
< 	text-align:center;
---
> 
> .imgcenter {
>   left:40%;
>   margin-right:-40%;
> }
> 
> 
> /* mod listing table cells */
> .mmcell, .stcell {
>   border:1px solid #aaa;
>   vertical-align:top;
>   padding:3px;
> }
> 
> /* modlister status column content */
> .stcell div {
>   padding-right:7px;
206a328
> 
209c331
< 	padding:2px;
---
>   padding:2px;
210a333
> 
213c336
< 	padding-left:3px;
---
>   padding-left:3px;
215,222c338,341
< /* modlister - affected files popups */
< .cellspace1 {
< 	border-spacing: 1px;
<     border-collapse: separate;
< }
< .imgcenter {
<     left:40%;
<     margin-right:-40%;
---
> 
> /* admin_analyzemods */
> .mmpadtop5 {
>   padding-top:5px !important;
223a343
> 
227c347
< 	width:100%;
---
>   width:100%;
228a349
> 
232c353
< 	line-height:150%;padding-left:3px;
---
>   line-height:150%;padding-left:3px;
235,238c356,360
< div.descpop1 {
< 	position: relative;
< 	width:16px;
< 	margin:0;
---
> /* modlister */
> .mmsysmsg {
>   font-size:150%;
>   text-align:center;
>   color:red;   /* was #77777; */
241,252c363,369
< div.descpop1 div {
< 	position: absolute;
< 	display:none;
< 	bottom:-5px;
< 	right:16px;
< 	overflow-y:auto;
< 	background: #ffffff;
< 	padding: 3px 3px 3px 3px;
< 	border-style:solid;
< 	border-color:black;
< 	border-width:2px;
< 	z-index: 1001;
---
> /* modlister */
> .results {
>   list-style-type:square;
>   list-style-position:inside;
>   font-style:italic;
>   font-weight:bold;
>   padding:5px;
255,257c372,376
< div.descpop1:hover div {
< 	display:block;
< 	max-height:150px;
---
> /* modlister */
> span.opened {
>   padding-left:14px;
>   cursor: pointer;
>   background: url(../img/tng_collapse.gif) no-repeat left center;
260,264c379,383
< @media screen and (max-width:750px)
< {
< 	div.descpop1:hover div {
< 		width:300px;
< 	}
---
> /* modlister */
> span.closed {
>   padding-left:14px;
>   cursor: pointer;
>   background: url(../img/tng_expand.gif) no-repeat left center;
267,271c386,391
< @media screen and (min-width:750px)
< {
< 	div.descpop1:hover div {
< 		width:500px;
< 	}
---
> /* modlister */
> span.modlink {
>   display:inline-block;
>   width:96%;
>   padding-left:16px;
>   cursor:pointer;
272a393,399
> 
> .fieldname a:visited,
> .fieldname a:link {
>   color:inherit;
>   cursor:pointer;
> }
> 
274,279c401,402
< .results {
< 	list-style-type:square;
< 	list-style-position:inside;
< 	font-style:italic;
< 	font-weight:bold;
< 	padding:5px;
---
> .target {
>   color:brown;
281,282c404,411
< .w100 {
< 	width:100%;
---
> 
> /* modlister */
> .target-note,
> .location-note {
>   display:inline-block;
>   width:100%;
>   padding-left:3px;
>   border:1px solid gray;
284,285c413,416
< .hidden {
< 	display:none;
---
> 
> /* modlister */
> .tgtfile {
>   font-weight:bold;
287,289c418,424
< /*** modlister status backgrounds ***/
< .ready {
< 	background-color:#F5FFF5;
---
> 
> /* admin_showmodslog */
> .action {
>   cursor: pointer;
>   background: url(../img/tng_expand.gif) no-repeat left center;
>   padding:7px;
>   padding-left:15px;
291,292c426,429
< .installed {
< 	background-color:#C6F6C6;
---
> 
> /* admin_showmodslog */
> .logheader {
>   padding-left:15px;
294,295c431,435
< .partinst {
< 	background-color:#FFE8BD;
---
> 
> /* modlister -- provides space on bottom to show
> ** affected files popup for last couple of rows .*/
> #modlist {
>   padding-bottom:150px;
297,298c437,442
< .badcfg {
< 	background-color:#FFE5E5 !important;
---
> 
> /* modlister filter bar */
> table#fbar {
>   padding-left:2px;
>   width:100%;
>   margin-left:0px;
300,302c444,470
< /* modlister */
< .tag {
< 	font-style:italic;
---
> 
> /*Analyze only installed mods Mod - #1 - MichelK */
> input[type='radio'], label{
>   vertical-align: baseline;
>   padding: 1px;
>   margin: 0px;
>  }
> 
> /* admin_analyzemods */
> .hideoverflow{
>   overflow: hidden;
>   white-space : nowrap;
> }
> 
> /* admin_analyzemods */
> .centerit {
>   text-align: center;
>  }
> 
> /* admin_analyzemods */
> .mmhighlight {
>   color:#990000;
> }
> 
> /* admin_analyzemods */
> .mmfilenmfont {
>   font-size:120%;
303a472,487
> 
> /* admin_analyzemods */
> .mmlochdr {
>   color:blue;
> }
> 
> /* admin_analyzemods */
> .mmkeyword {
>   color:#AA0000;
> }
> 
> /* admin_analyzemods */
> .mmrightalign {
>   text-align:right;
> }
> 
305,306c489,507
< .tgtfile {
< 	font-weight:bold;
---
> .mmpopuptable {
>   width:100%;
> }
> 
> /*modlister */
> .mmpadleft {
>   padding-left:3px;
> }
> 
> /* modlister aff popup img */
> .imgcenter {
>   left:40%;
>   margin-right:-40%;
> }
> 
> /* modlister - affected files popups */
> .mmpopuphdr {
>   line-height:150%;
>   padding-left:3px;
307a509
> 
309,310c511,516
< .hilight {
< 	background-color:yellow;
---
> .results {
>   list-style-type:square;
>   list-style-position:inside;
>   font-style:italic;
>   font-weight:bold;
>   padding:5px;
311a518
> 
313,314c520,521
< .hilighterr {
< 	background-color: #FFCCF9;
---
> .w100 {
>   width:100%;
316,318c523,555
< .mmmenuwrap {
< 	padding-left:5px;
< 	padding-bottom:1px;
---
> 
> /* modeditor */
> .w99 {
>   width:99%;
> }
> 
> .hidden {
>   display:none;
> }
> 
> /*** modlister status backgrounds ***/
> .ready, .ok2inst {
>   background-color:#F5FFF5;
> }
> 
> .installed {
>   background-color:#C6F6C6;
> }
> 
> .partinst {
> background-color:#FFE8BD;
> }
> 
> .badcfg, .cantinst {
>   background-color:#FFE5E5 !important;
> }
> 
> .html, body {
>    height:100%;
> }
> 
> .lightback, .whiteback {
>   border:0px;
320d556
< /* standard tng admin header for all pages */
323,326c559,562
< #mmgrid th, #mmgrid td, #mmgrid td div, .results {
< 	border-radius:3px;
< 	-moz-border-radius:3px;
< 	-webkit-border-radius:3px;
---
> .results {
>   border-radius:6px;
>   -moz-border-radius:6px;
>   -webkit-border-radius:6px;
327a564
> 
330,337c567,568
< 	text-align:center;
< 	padding-top:5px;
< }
< div.edreturn {
< 	padding:1em 0.5em;
< }
< div.edreturn form {
< 	padding-left:10px;
---
> text-align:center;
>   padding-top:5px;
338a570
> 
340,342c572,574
< 	text-align:center;
< 	padding:5;
< 	font-size:12px;
---
> text-align:center;
> padding:5;
> font-size:12px;
345c577
< 	border:1px solid #aaa;
---
> border:1px solid #aaa;
349,351c581,583
< 	border:1px solid #aaa;
< 	vertical-align:top;
< 	padding:5px;
---
>   border:1px solid #888;
>   vertical-align:top;
>   padding:15px;
354c586
< /* Analyser and Edit Parameter  */
---
> /* Analyser and Edit Parameter */
356,357c588,589
< 	width: 35%;
< 	vertical-align:top;
---
>   width: 36%;
>   vertical-align:top;
358a591,592
> 
> /* Analyser and Edit Parameter */
360,361c594,595
< 	width:65%;
< 	vertical-align:top;
---
>   vertical-align:top;
>   min-height:350px;
364,366c598,601
< /***** Styles that depend on current template *****/
< .adminback {
< 	background-image:url(../img/background.gif);
---
> /* bars attached to bottom of head section */
> .fbar {
>   border-color:transparent;
>   border-bottom:1px solid white;
369,384c604,608
< /* Mod Manager table positioning except for Template 7		*/
< /****** Standard TNG Admin Page Header ******/
< .mmhead-fixed {
< 	position:fixed;
< 	top:0;
< }
< .mmhead-scroll {
< 	position:relative;
< 	margin-top:0;
< }
< .mmhead-fixed, .mmhead-scroll {
< 	margin-left:5px;
< 	padding-top:5px;
< 	width: 99.5%;
< 	min-width:640px;
< 	z-index:1000;
---
> /* modlister */
> .mmsysmsg {
>   font-size:150%;
>   text-align:center;
>   color:red;   /* was #77777; */
387,392c611,616
< /****** BARS ATTACHED TO BOTTOM OF HEAD SECTION ******/
< .fbar-fixed, .tbar-fixed, .ibar-fixed {
< 	position:fixed;
< 	top:119px; /*from top of screen*/
< 	left:0;
< 	z-index:1005;
---
> /******************************************************
>   MMv14 Deprecated Styles no longer used
> *******************************************************/
> /*
> .adminback {
> background-image:url(../img/background.gif);
394,396c618,619
< .fbar-scroll, .tbar-scroll, .ibar-scroll {
< 	position:relative;
< 	margin-top:0;
---
>   table.list tr:first-child td:first-child,
>   table.list tr:last-child td:last-child {
398,407c621,623
< /*** common elements ***/
< .fbar-fixed, .fbar-scroll,
< .tbar-fixed, .tbar-scroll,
< .ibar-fixed, .ibar-scroll {
< 	margin-top: 0;
< 	margin-left:5px;
< 	padding-left:5px;
< 	padding-bottom:1px;
< 	width:99.5%;
< 	z-index:1001;
---
> 
> table.list td {
>   padding-left:0px;
410c626,628
< /****************** CONTENT ******************/
---
> table.list tr:first-child td {
>   border-left:0px;
> }
412d629
< /* main page mod listing positioning */
414d630
< 	margin-top:156px; /*from top of screen*/
416c632
< /* m2tables - for secondary MH pages Options and Analyzer */
---
> 
418c634
< 	margin-top:119px; /*from top of screen*/
---
>   padding-left:0px;
420c636
< /* modeditor */
---
> 
422,426c638
< 	margin-top:156px;
< }
< /* View Log */
< table.mmlog-fixed {
< 	margin-top:143px;
---
> margin-top:5px;
431c643
< 	margin-top:0; /*overrides v10.03*/
---
> margin-top:0;
434,438c646,648
< /*** common elements ***/
< table.mmlist-fixed, table.mmlist-scroll,     /* Main page*/
< table.m2table-fixed, table.m2table-scroll,   /* Options, Analyzer */
< table.m3table-fixed, table.m3table-scroll,   /* Mod Editor */
< table.mmlog-fixed, table.mmlog-scroll        /* View Log */
---
> table.mmlist-fixed, table.mmlist-scroll,
> table.m2table-fixed, table.m2table-scroll,
> table.m3table-fixed, table.m3table-scroll,
440,446c650,654
< 	table-layout:fixed;
< 	margin-left:5px;
< 	padding:0;
< 	padding-top:0;
< 	padding-left:5px;
< 	padding-bottom:5px;
< 	width:99.5%;
---
>   table-layout:fixed;
>   padding:0;
>   padding-top:0;
>   width:100%;
>   border:1px solid red;
449,452c657,662
< .mmsysmsg {
< 	font-size:150%;
< 	text-align:center;
< 	color:red;   /* was #77777; */
---
> #mmhead-section {
>   position:fixed;
>   top:0;
>   width:99%;
>   background-image:url(../img/background.gif);
>   padding:5px 1px 1px 1px;
457c667
<    color:#990000;
---
>   color:#990000;
460,462c670,675
< div.list-indent {
<    margin-left:2em;
<    text-indent:-2em;
---
> .parse-table {
>   position:absolute;
>   min-width:98%;
>   top:120;
>   left:05;
>   padding:5px;
465,470c678,680
< .target-note,
< .location-note {
<    display:inline-block;
<    width:100%;
<    padding-left:3px;
<    border:1px solid gray;
---
> .admintop {
>     overflow-x:hidden;
>     white-space:nowrap;
473,474c683,684
< .target {
<    color:brown;
---
> .topbanner {
>     z-index:5;
477,478c687,689
< .copyfile {
<    color:navy;
---
> #tngnav a.here {
>   position:relative;
>   z-index:0 !important;
481,482c692,695
< .newfile {
<    color:navy;
---
> table.list {
>   border-collapse:separate;
>   width:100%;
>   margin-left:-3px;
485,486c698,699
< .mkdir {
<    color:navy;
---
> table.m3table-fixed {
>   margin-top:0;
489,494c702,720
< .parse-table {
< position:absolute;
< min-width:98%;
< top:120;
< left:05;
< padding:5px;
---
> table.mmlist-fixed {
>     margin-top:0 !important;
> }
> 
> #mmpage {
>   padding-top:110px;
> }
> 
> #mmoutter {width:99.8%;}
> 
> .ptr {cursor:pointer;}
> .colcb {width:5%;}
> .colmn {width:35%;}
> .colfn {width:35%;}
> .colvr {width:10%;}
> .colst {width:15%;}
> 
> tr.modline:hover td.mmcell:nth-child(-n+5) {
>   background-color:#EEEB8D;
495a722,795
> 
> .mmmenuwrap {
>   position:relative;
>   padding-bottom:1px;
> }
> 
> .mmcontainer {
>   height:calc(100vh - 180px);
> }
> 
> #mmgrid.lightback {
>   border-bottom:0px;
>   padding-bottom:175px;
> }
> 
> #mmgrid td.tngshadow {
>   border: 0px;
> }
> 
> .mmhead-fixed {
>   top:0;
> }
> .mmhead-scroll {
>   position:relative;
>   margin-top:0;
> }
> .mmhead-fixed, .mmhead-scroll {
>   width: 99.5%;
>   min-width:640px;
> }
> 
> .fbar-scroll, .tbar-scroll, .ibar-scroll {
>   position:relative;
>   margin-top:0;
> }
> 
> .fbar-fixed, .fbar-scroll,
> .tbar-fixed, .tbar-scroll,
> .ibar-fixed, .ibar-scroll {
>   margin-top: 0;
>   padding-bottom:1px;
>   width:99.5%;
>   z-index:1;
> }
> 
> #mmlog {
>   background-color:transparent;
>   border-spacing:0 2px;
>   width: calc( 100% - 4px );
> }
> 
> #mmlog td {
>   border:1px solid #aaa;
> }
> 
> .leftmmanalyzer {
>   width: 34.7%;
>   vertical-align:top;
>   padding-left:7px
> }
> 
> .rightmmanalyzer {
>   width:65%;
>   vertical-align:top;
> }
> 
> .mmlinks {
>   text-decoration:none;
> }
> 
> .mmhdrtable {width:100%;}
> 
> */
> 
diff -r TNG/css/timeline.css TNG1403/css/timeline.css
61a62,63
>     border-radius: 10px;
>     border-color: #ccc;
diff -r TNG/css/tngmobile.css TNG1403/css/tngmobile.css
155a156,159
> .mright {
> 	column-gap: 0px;
> }
> 
192a197,208
> .mmulticol li:last-child a {
> 	-moz-border-radius: 0 0 8px 0;
> 	-webkit-border-radius: 0 0 8px 0;
> 	border-radius: 0 0 8px 0;
> }
> 
> .mmulticollastleft {
> 	-moz-border-radius: 0 0 0 8px;
> 	-webkit-border-radius: 0 0 0 8px;
> 	border-radius: 0 0 0 8px;
> }
> 
diff -r TNG/css/tngprint.css TNG1403/css/tngprint.css
2,3c2,3
< 	text-decoration : none;
< 	color #000;
---
> 	text-decoration: none;
> 	color: #000;
diff -r TNG/datelib.php TNG1403/datelib.php
17a18
> 		$newyear = $newmonth = $newday = 0;
59c60
< 			$tempmonth = trim(substr(strtoupper($dateparts[$ptr]),0,3));
---
> 			$tempmonth = isset($dateparts[$ptr]) ? trim(substr(strtoupper($dateparts[$ptr]),0,3)) : "";
62c63
< 			if( $months[$tempmonth] ) {
---
> 			if( !empty($months[$tempmonth]) ) {
66c67
< 			elseif( $hebrewmonths[$tempmonth] ) {
---
> 			elseif( !empty($hebrewmonths[$tempmonth]) ) {
77c78
< 				$tempday = $dateparts[$ptr];
---
> 				$tempday = isset($dateparts[$ptr]) ? $dateparts[$ptr] : "";
91c92
< 					$str = substr(strtoupper($dateparts[$ptr]),0,3);
---
> 					$str = isset($dateparts[$ptr]) ? substr(strtoupper($dateparts[$ptr]),0,3) : "";
139,140c140,143
<  				$newday = cal_days_in_month(CAL_GREGORIAN, $newmonth, $newyear);
<  				//$newday = date('t', mktime(0, 0, 0, $newmonth, $newyear));
---
>  				if($newyear && function_exists('cal_days_in_month'))
> 					$newday = cal_days_in_month(CAL_GREGORIAN, $newmonth, $newyear);
> 				else
>  					$newday = date('t', mktime(0, 0, 0, $newmonth, $newyear));
Only in TNG: deepindex.php
diff -r TNG/deletelib.php TNG1403/deletelib.php
108c108
< 		$query = "SELECT count(ID) as ccount FROM $children_table WHERE familyID = \"$row[familyID]\" AND gedcom=\"$tree\"";
---
> 		$query = "SELECT count(ID) as ccount FROM $children_table WHERE familyID = \"{$row['familyID']}\" AND gedcom=\"$tree\"";
128c128
< 	if($famrow['husband'])
---
> 	if(!empty($famrow['husband']))
130c130
< 	if($famrow['wife'])
---
> 	if(!empty($famrow['wife']))
diff -r TNG/descend.php TNG1403/descend.php
8a9
> $descendvert_url = getURL( "descendvert", 1 );
10c11,20
< if( $display == "textonly" || ( !$display && !$pedigree['defdesc'] ) ) {
---
> $descendtables_url = getURL( "descendtables", 1 );
> if(empty($generations))
>     $generations = $pedigree['initdescgens'] > 8 ? 8 : $pedigree['initdescgens'];
> if(!$generations) $generations = 6;
> if( $generations > $pedigree['maxdesc'] )
> 	$generations = $pedigree['maxdesc'];
> else
> 	$generations = intval( $generations );
> 
> if( (isset($display) && $display == "textonly") || ( !isset($display) && !$pedigree['defdesc'] ) ) {
14c24
< elseif( $display == "register" || ( !$display && $pedigree['defdesc'] == 1 ) ) {
---
> elseif( (isset($display) && $display == "register") || ( !isset($display) && $pedigree['defdesc'] == 1 ) ) {
17a28,35
> elseif( (isset($display) && $display == "vertical") || ( !isset($display) && $pedigree['defdesc'] == 4 ) ) {
> 	header( "Location: $descendvert_url" . "personID=$personID&tree=$tree&generations=$generations");
> 	exit;
> }
> elseif( (isset($display) && $display == "tables") || ( !isset($display) && $pedigree['defdesc'] == 5 ) ) {
> 	header( "Location: $descendtables_url" . "personID=$personID&tree=$tree&generations=$generations");
> 	exit;
> }
22c40
< if( !$display ) {
---
> if(empty($display)) {
73c91
< $arrltpath = $rootpath . $endrootpath . "img/ArrowRight.gif";
---
> $arrltpath = $rootpath . $endrootpath . "img/ArrowLeft.gif";
162c180
< 			$presult = getPersonData($tree, $parents['husband']);
---
> 			$presult = getPersonFullPlusDates($tree, $parents['husband']);
177c195
< 			$presult = getPersonData($tree, $parents['wife']);
---
> 			$presult = getPersonFullPlusDates($tree, $parents['wife']);
198c216
< 	global $tree, $generations, $cms, $text, $descend_url, $display;
---
> 	global $tree, $generations, $cms, $text, $descend_url, $display, $kidsflag;
224,225c242,243
< 	$boxstr = "";
< 	if( $person['personID'] == $personID ) {
---
> 	$boxstr = $mouseover = $mouseout = $hiddenbox = "";
> 	if( !empty($person['personID']) && $person['personID'] == $personID ) {
240,241c258,260
< 	if( $person['famc'] && $pedigree['popupchartlinks']) {
< 		$iconactions = " onmouseover=\"if(jQuery('#ic$slot').length) jQuery('#ic$slot').show();\" onmouseout=\"if(jQuery('#ic$slot').length) jQuery('#ic$slot').hide();\"";
---
> 	if( !empty($person['famc']) && $pedigree['popupchartlinks'] && $display != "compact") {
> 		$mouseover .= "if(jQuery('#ic$slot').length) jQuery('#ic$slot').show();";
> 		$mouseout .= "if(jQuery('#ic$slot').length) jQuery('#ic$slot').hide();";
243c262
< 		$iconlinks .= "<a href=\"{$pedigree['url']}personID={$person['personID']}&amp;tree=$tree&amp;display=standard&amp;generations=" . $pedigree['initpedgens'] . "\" title=\"{$text['popupnote']}\">{$pedigree['chartlink']}</a>\n";
---
> 		$iconlinks .= "<a href=\"{$pedigree['url']}personID={$person['personID']}&amp;tree=$tree&amp;display=standard&amp;generations=" . $pedigree['initpedgens'] . "\" title=\"{$text['popupnote2']}\">{$pedigree['chartlink']}</a>\n";
248a268,286
> 
> 	if( !empty($person) && $display != "compact" && $pedigree['usepopups'] ) {
>    		$vitalinfo = getVitalDates( $person );
> 		if( $vitalinfo ) {
> 			$mouseover .= "showPopup($numboxes,$top,{$pedigree['boxheight']});";
> 			$mouseout .= "setTimer($numboxes);";
> 	   		$hiddenbox = "<div style=\"position: absolute; top:" . ($top + $pedigree['boxheight'] + (2 * $pedigree['borderwidth']) + $pedigree['shadowoffset'] + 1) . "px;left:" . ($left + intval(($pedigree['boxwidth'] - $pedigree['downarroww'])/2) - 1) . "px;z-index:7;\" class=\"fakelink\">";
> 			$hiddenbox .= "<a href=\"#\" onmouseover=\"showPopup($numboxes,$top," . $pedigree['boxheight'] . ")\">" . $pedigree['downarrow'] . "</a></div>";
> 
> 			$hiddenbox .= "<div class=\"popup\" id=\"popup$numboxes\" style=\"position:absolute; visibility:hidden; background-color:{$pedigree['popupcolor']}; left:" . ($left - $pedigree['borderwidth'] + round($pedigree['shadowoffset']/2)) . "px;z-index:8\" onmouseover=\"cancelTimer($numboxes)\" onmouseout=\"setTimer($numboxes)\">\n";
> 			$hiddenbox .= "<div><div class=\"tngshadow popinner\"><div class=\"pboxpopupdiv\">\n<table cellspacing=\"0\" cellpadding=\"1\" border=\"0\" width=\"100%\">\n";
> 			$hiddenbox .= "$vitalinfo\n</table></div></div></div></div>\n";
> 		}
> 	}
> 	if($mouseover)
> 		$mouseover = " onmouseover=\"$mouseover\"";
> 	if($mouseout)
> 		$mouseout = " onmouseout=\"$mouseout\"";
> 
250c288
< 	$boxstr .= "<div class=\"pedbox $rounded\" id=\"box$numboxes\" style=\"background-color:$bgcolor; top:" . $top . "px; left:" . ($left-$pedigree['borderwidth']) . "px; height:" . $pedigree['boxheight'] . "px; width:{$pedigree['boxwidth']}" . "px; box-shadow:$shadow;border:{$pedigree['borderwidth']}px solid {$pedigree['bordercolor']};\"$iconactions>\n";
---
> 	$boxstr .= "<div class=\"pedbox $rounded\" id=\"box$numboxes\" style=\"background-color:$bgcolor; top:" . $top . "px; left:" . ($left-$pedigree['borderwidth']) . "px; height:" . $pedigree['boxheight'] . "px; width:{$pedigree['boxwidth']}" . "px; box-shadow:$shadow;border:{$pedigree['borderwidth']}px solid {$pedigree['bordercolor']};\"$mouseover$mouseout>\n";
254c292
<     if ( $pedigree['inclphotos'] && $pedigree['usepopups']) {
---
>     if( !empty($person) && $pedigree['inclphotos'] && $pedigree['usepopups']) {
268c306
< 	if( $person['name'] ) {
---
> 	if(!empty($person['name'])) {
279,289c317
< 	if( $display != "compact" && $pedigree['usepopups'] ) {
<    		$vitalinfo = getVitalDates( $person );
< 		if( $vitalinfo ) {
< 	   		$boxstr .= "<div style=\"position: absolute; top:" . ($top + $pedigree['boxheight'] + (2 * $pedigree['borderwidth']) + $pedigree['shadowoffset'] + 1) . "px;left:" . ($left + intval(($pedigree['boxwidth'] - $pedigree['downarroww'])/2) - 1) . "px;z-index:7;\" class=\"fakelink\">";
< 			$boxstr .= "<a href=\"#\" onmouse{$pedigree['event']}=\"showPopup($numboxes,$top," . $pedigree['boxheight'] . ")\">" . $pedigree['downarrow'] . "</a></div>";
< 
< 			$boxstr .= "<div class=\"popup\" id=\"popup$numboxes\" style=\"position:absolute; visibility:hidden; background-color:{$pedigree['popupcolor']}; left:" . ($left - $pedigree['borderwidth'] + round($pedigree['shadowoffset']/2)) . "px;z-index:8\" onmouseover=\"cancelTimer($numboxes)\" onmouseout=\"setTimer($numboxes)\">\n";
< 			$boxstr .= "<div><div class=\"tngshadow popinner\"><div class=\"pboxpopupdiv\">\n<table cellspacing=\"0\" cellpadding=\"1\" border=\"0\" width=\"100%\">\n";
< 			$boxstr .= "$vitalinfo\n</table></div></div></div></div>\n";
< 		}
< 	}
---
> 	$boxstr .= $hiddenbox;
312c340
< 	global $tree, $generations, $pedigree, $righttree, $chart, $descend_url;
---
> 	global $tree, $generations, $pedigree, $righttree, $chart, $descend_url, $display, $text;
316c344
< 	$result = getPersonData($tree, $person);
---
> 	$result = getPersonFullPlusDates($tree, $person);
343c371
< 		$result = getSpouseFamilyMinimal($tree, $self, $person, $spouseorder);
---
> 		$result = getSpouseFamilyData($tree, $self, $person, $spouseorder);
345c373
< 		$result = getSpouseFamilyMinimalUnion($tree, $person);
---
> 		$result = getSpouseFamilyDataUnion($tree, $person);
348c376
< 		$result = getSpouseFamilyMinimalUnion($tree, $person);
---
> 		$result = getSpouseFamilyDataUnion($tree, $person);
358a387,397
> 		if( !$spouse ) {
> 			if( $row['personID'] == $famrow['husband'] ) {
> 				$self = "husband";
> 				$spouse = "wife";
> 				$spouseorder = "husborder";
> 			} else {
> 				$self = "wife";
> 				$spouse = "husband";
> 				$spouseorder = "wifeorder";
> 			}
> 		}
404c443
< 			if( $needtop[$level] ) {
---
> 			if( !empty($needtop[$level]) ) {
419c458
< 			$spouseresult = getPersonData($tree, $famrow[$spouse]);
---
> 			$spouseresult = getPersonFullPlusDates($tree, $famrow[$spouse]);
450c489,501
< 		if($famrow[$spouse] || $marrtot > 1)
---
> 		if($famrow[$spouse] || $marrtot > 1) {
> 			$rightbranch = $righttree ? checkbranch($famrow['branch']) : false;
> 			$rights = determineLivingPrivateRights($famrow, $righttree, $rightbranch);
> 			$famrow['allow_living'] = $rights['living'];
> 			$famrow['allow_private'] = $rights['private'];
> 			if( $famrow[$spouse] ) {
> 				if( $rights['both'] ) {
> 					$spouserow['marrdate'] = $famrow['marrdate'];
> 					$spouserow['marrplace'] = $famrow['marrplace'];
> 				}
> 				else
> 					$spouserow['marrdate'] = $spouserow['marrplace'] = "";
> 			}
451a503
> 	   	}
456c508
< 			if( $top > $maxheight ) $maxheight = $top;
---
> 			if( !isset($maxheight) || $top > $maxheight ) $maxheight = $top;
462c514
< 			setTopMarker($level,$originaltop + ($vslots[$vkey] * $pedigree['diff']),"raising, diff=$pedigree[diff], slots=" . $vslots[$vkey] . ", key=$vkey, 401");
---
> 			setTopMarker($level,$originaltop + ($vslots[$vkey] * $pedigree['diff']),"raising, diff={$pedigree['diff']}, slots=" . $vslots[$vkey] . ", key=$vkey, 401");
473c525
< 		if( $needtop[$level] ) {
---
> 		if( !empty($needtop[$level]) ) {
528c580
< 			if( $numkids ) {
---
> 			if( $numkids && $level < $generations ) {
530,533c582,583
< 					if( $level < $generations ) {
< 						$kidstats = getData( $crow['personID'], $crow['sex'], $level + 1 );
< 						$famslots += $kidstats['slots'];
< 					}
---
> 					$kidstats = getData( $crow['personID'], $crow['sex'], $level + 1 );
> 					$famslots += $kidstats['slots'];
611a662
> 	$marrabbr = $text['capmarrabbr'] . ":";
620a672,680
> 	if( !empty($row['marrdate']) ) {
> 		$vitalinfo .= "<tr>\n<td class=\"pboxpopup normal\" align=\"right\" valign=\"top\">$marrabbr</td>\n";
> 		$vitalinfo .= "<td class=\"pboxpopup normal\" valign=\"top\">" . displayDate( $row['marrdate'] ) . "</td></tr>\n";
> 		$marrabbr = "&nbsp;";
> 	}
> 	if( !empty($row['marrplace']) ) {
> 		$vitalinfo .= "<tr>\n<td class=\"pboxpopup normal\" align=\"right\" valign=\"top\">$marrabbr</td>\n";
> 		$vitalinfo .= "<td class=\"pboxpopup normal\" valign=\"top\">{$row['marrplace']}</td></tr>\n";
> 	}
659d718
< $flags['tabs'] = $tngconfig['tabs'];
686,692d744
< if( !$generations )
<     $generations = $pedigree['initdescgens'] > 8 ? 8 : $pedigree['initdescgens'];
< if(!$generations) $generations = 6;
< if( $generations > $pedigree['maxdesc'] )
< 	$generations = $pedigree['maxdesc'];
< else
< 	$generations = intval( $generations );
694c746
< for( $i = 0; $i < $generations; $i++ )
---
> for( $i = 0; $i < $generations + 1; $i++ )
706a759
> $innermenu .= "<a href=\"$descendvert_url" . "personID=$personID&amp;tree=$tree&amp;&amp;generations=$generations\" class=\"lightlink\">{$text['pedvertical']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
708c761,762
< $innermenu .= "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['regformat']}</a>\n";
---
> $innermenu .= "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['regformat']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> $innermenu .= "<a href=\"$descendtables_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['dtformat']}</a>\n";
714a769
> if( !$tngprint ) {
716,718c771,773
< <p class="normal">
< (<?php echo $text['scrollnote'];
< 	if ( $pedigree['usepopups_real'] ) {
---
> <span class="normal">
> <?php echo $text['scrollnote'];
> 	if(!empty($pedigree['usepopups_real'])) {
721,722c776,777
< ?>)
< </p>
---
> ?>
> </span>
723a779
> }
729c785,789
< $maxwidth += $pedigree['boxwidth'] + $pedigree['borderwidth'] + (2 * $pedigee['offpageimgw']) + 6 + $pedigree['leftindent'];
---
> $maxwidth += $pedigree['boxwidth'] + $pedigree['borderwidth'] + (2 * $pedigree['offpageimgw']) + 6 + $pedigree['leftindent'];
> 
> if( !$tngprint ) {
> 	echo "<div id=\"mag-icons-div\" class=\"mag-icons\"><img src=\"img/zoomin.png\" id=\"zoom-in\" onclick=\"panzoom.zoomIn;\" alt=\"{$text['zoomin']}\"/><img src=\"img/zoomreset.png\" id=\"zoom-reset\" alt=\"{$text['tng_reset']}\"/><img src=\"img/zoomout.png\" id=\"zoom-out\" alt=\"{$text['zoomout']}\"/></div>\n";
> }
731a792,793
> 	<div class="panzoom" id="vcontainer" style="overflow:visible">
> 		<div id="inner" style="position:relative;width:<?php echo $maxwidth; ?>px;height:<?php echo $maxheight > 200 ? $maxheight : 200; ?>px;">
734a797,798
> 		</div>
> 	</div>
759a824,834
> 
> jQuery(document).ready(function() {
> 	jQuery('#inner').draggable();
> 	$("#inner").on("mousedown touchstart", function(e) {
> 	    $(this).addClass('grabbing')
> 	})
> 
> 	$("#inner").on("mouseup touchend", function(e) {
> 	    $(this).removeClass('grabbing')
> 	})
> });
794,795c869,889
< 	if(hDisplace > 0)
< 		ref.offset({left: box.offset().left - hDisplace});
---
> 	if(hDisplace > 0) {
> 		if(vDisplace > 0) {
> 			ref.offset({left: box.offset().left - ref.width() - <?php echo $pedigree['borderwidth']; ?>});
> 			if(box.position().top < vOffset)
> 				vOffset = box.position().top;
> 		}
> 		else
> 			ref.offset({left: box.offset().left - hDisplace});
> 	}
> 	else {
> 		if(vDisplace > 0) {
> 			hDisplace = box.position().left + box.width() + ref.width() - jQuery('#outer').width();
> 			if(hDisplace > 0)
> 				ref.offset({left: box.offset().left - ref.width() - <?php echo $pedigree['borderwidth']; ?>});
> 			else
> 				ref.offset({left: box.offset().left + box.width() + (2 * <?php echo $pedigree['borderwidth']; ?>)});
> 			if(box.position().top < vOffset)
> 				vOffset = box.position().top;
> 		}
> 	}
> 
799a894
> var zoomstep = 0.05;
805c900,901
< <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/rpt_utils.js"></script>
---
> <script src="js/panzoom.min.js"></script>
> <script src="js/tngzoom.js"></script>
Only in TNG1403: descendtables.php
diff -r TNG/descendtext.php TNG1403/descendtext.php
12a13
> $descendtables_url = getURL( "descendtables", 1 );
13a15
> $descendvert_url = getURL( "descendvert", 1 );
186d187
< $flags['tabs'] = $tngconfig['tabs'];
255a257
> 	$innermenu .= "<a href=\"$descendvert_url" . "personID=$personID&amp;tree=$tree&amp;&amp;generations=$generations\" class=\"lightlink\">{$text['pedvertical']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
257c259,260
< 	$innermenu .= "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['regformat']}</a>\n";
---
> 	$innermenu .= "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['regformat']}</a> &nbsp;&nbsp; | &nbsp;&nbsp;\n";
> 	$innermenu .= "<a href=\"$descendtables_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['dtformat']}</a>\n";
289d291
< <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/rpt_utils.js"></script>
Only in TNG1403: descendvert.php
diff -r TNG/desctracker.php TNG1403/desctracker.php
11a12,13
> $descendvert_url = getURL( "descendvert", 1 );
> $descendtables_url = getURL( "descendtables", 1 );
14d15
< $rightbranch = checkbranch($row['branch']);
63,65c64,68
< 	$name = getName( $person );
< 	$nameinfo = "<a href=\"$getperson_url" . "personID={$person['personID']}&amp;tree=$tree\"><span style=\"font-size:11pt\">$name</span></a>";
< 	if( $person['personID'] && $pedigree['inclphotos'] ) {
---
> 	$name = "";
> 	if( !empty($person['personID']) )
> 		$name = getName( $person );
> 	$nameinfo = $name != "" ? "<a href=\"$getperson_url" . "personID={$person['personID']}&amp;tree=$tree\"><span style=\"font-size:11pt\">$name</span></a>" : "";
> 	if( !empty($person['personID']) && $pedigree['inclphotos'] ) {
70,71c73,74
< 	if( $person['allow_living'] && $person['allow_private'] ) {
< 		if( $person['birth'] || $person['death'] ) {
---
> 	if( !empty($person['allow_living']) && !empty($person['allow_private']) ) {
> 		if( !empty($person['birth']) || !empty($person['death']) ) {
73a77,78
> 			$person['birthdate'] = $person['altbirthdate'] = $person['deathdate'] = $person['burialdate'] = "";
> 			$person['birthdatetr'] = $person['altbirthdatetr'] = $person['deathdatetr'] = $person['burialdatetr'] = "0000-00-00"; //Don't do age calculation.
141c146
< 	$nextnextfamily = $items[0];
---
> 	$nextnextfamily = count($items) ? $items[0] : "";
148,150c153,167
< 		if( $result3 ) {
< 			$spouserow = tng_fetch_assoc( $result3 );
< 			$srights = determineLivingPrivateRights($spouserow, $righttree);
---
> 		else {
> 			$result4 = getSpouseFamilyDataUnion($tree, $nextperson);
> 			$whichparent = tng_fetch_assoc( $result4 );
> 			tng_free_result( $result4 );
> 			if( $whichparent['husband'] == $nextperson ) {
> 				$result3 = getParentDataCrossPlusDates($tree, $nextnextfamily, "husband", $row['personID'], "wife");
> 			} else {
> 				$result3 = getParentDataCrossPlusDates($tree, $nextnextfamily, "wife", $row['personID'], "husband");
> 			}
> 		}
> 		$spouserow = tng_fetch_assoc( $result3 );
> 		tng_free_result( $result3 );
> 		if( $spouserow ) {
> 			$rightbranch = $righttree ? checkbranch($spouserow['branch']) : false;
> 			$srights = determineLivingPrivateRights($spouserow, $righttree, $rightbranch);
153d169
< 			tng_free_result( $result3 );
267,268c283,287
< 	if( $result ) {
< 		$row = tng_fetch_assoc( $result );
---
> 	$row = tng_fetch_assoc( $result );
> 	tng_free_result( $result );
> 	$descname = $logname = "";
> 	if( $row ) {
> 		$rightbranch = $righttree ? checkbranch($row['branch']) : false;
284a304,309
> } else {
> 	$descname = "";
> 	$rights['both'] = 0;
> 	$row['allow_living'] = 0;
> 	$row['allow_private'] = 0;
> 	$row['sex'] = "";
287d311
< 	$flags['tabs'] = $tngconfig['tabs'];
296c320
< 	if( !$generations )
---
> 	if( empty($generations) )
304a329
> 	$innermenu .= "<a href=\"$descendvert_url" . "personID=$personID&amp;tree=$tree&amp;&amp;generations=$generations\" class=\"lightlink\">{$text['pedvertical']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
306c331,332
< 	$innermenu .= "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['regformat']}</a>\n";
---
> 	$innermenu .= "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['regformat']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> 	$innermenu .= "<a href=\"$descendtables_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['dtformat']}</a>\n";
352a379,383
> 		$linestart = 0;
> 		$lineend = 0;
> 		$firsthalf = 0;
> 		$secondhalf = 0;
> 		$middle = 0;
362a394
> 				$secondhalf = $childcount > ( $totkids / 2 ) ? 1 : 0;
363a396,398
> 				$linestart = 1;
> 				$lineend = $firsthalf ? 0 : 1;
> 				$middle = $childcount == ( $totkids / 2 + 0.5) ? 1 : 0;
365c400
< 			else
---
> 			else {
366a402,410
> 				$middle = $childcount == ( $totkids / 2 + 0.5) ? 1 : 0;
> 				$middle = $middle || !($childcount < ( $totkids / 2 ) || $childcount > ( $totkids / 2 )) ? 1 : 0;
> 				if ($secondhalf || $middle)
> 					$secondhalf = 1;
> 				if ($firsthalf && ($middle || $childcount > ( $totkids / 2 )))
> 					$lineend = 1;
> 				if (!$linestart && !$lineend && $middle)
> 					$linestart = 1;
> 			}
372c416,420
< 			//echo "tl=$box[topleft], tr=$box[topright], ml=$box[middleleft], mr=$box[middleright], bl=$box[bottomleft], br=$box[bottomright], cc=$childcount, tk=$totkids, gn=$gotnext";
---
> 			
> 			$box['bottomright'] = $more && ((!$lineend && ($firsthalf || $secondhalf) && !$middle) || ($thisisit && !$firsthalf && !$secondhalf) || (!$thisisit && $secondhalf && !$lineend && ($middle && ($totkids % 2 == 1))) || ($firsthalf && $middle && $lineend && ($totkids % 2 == 0))) ? 1 : 0;
> 			$box['bottomleft'] = $more && (($linestart && !$lineend && !$thisisit && $firsthalf) || ($firsthalf && $middle) || ($thisisit && $middle && ($totkids % 2 != 1)) || ($secondhalf && $linestart && !$lineend && !$middle) || ($thisisit && $secondhalf && !$middle)) ? 1 : 0;
> 			//if ($middle) echo "Center: ";
> 			//echo "tl={$box['topleft']}, tr={$box['topright']}, ml={$box['middleleft']}, mr={$box['middleright']}, bl={$box['bottomleft']}, br={$box['bottomright']}, cc=$childcount, tk=$totkids, gn=$gotnext, tii=$thisisit, m=$more, fn={$row['firstname']}, ln={$row['lastname']}, fh=$firsthalf, sh=$secondhalf, ls=$linestart, le=$lineend<br/>\n";
diff -r TNG/dna_test_results_lib.php TNG1403/dna_test_results_lib.php
1,176c1,291
< <?php
< 		//dna tests
< 		//search for dna tests, if any found do the following
< 		$query = "SELECT $dna_tests_table.testID, $dna_tests_table.personID as tpersonID, $dna_tests_table.gedcom as tgedcom, test_type, test_number, test_date, markers, haplogroup, hvr1_results, hvr2_results, y_results, person_name, confirmed, notes, markeropt, notesopt, linksopt, surnamesopt, private_dna,urls, surnames, MD_ancestorID, MRC_ancestorID, admin_notes, medialinks, ref_seq, xtra_mut, coding_reg 
< 			FROM $dna_tests_table, $dna_links_table
< 			WHERE $dna_links_table.personID = \"$personID\" AND $dna_links_table.gedcom = \"$tree\" AND $dna_links_table.testID = $dna_tests_table.testID 
< 			ORDER BY test_type, markers * 1 ASC, test_date, test_number * 1 ASC";
< 		$dna_results = tng_query($query);
< 		$num_tests = tng_num_rows($dna_results);
< 		if($num_tests) {
<             $toggleicon = "<img border=\"0\" src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"toggleicon2\" style=\"cursor:pointer; float:right; padding-top:4px;\" title=\"{$text['expand']}\" alt=\"\" onclick=\"togglednaicon(); \" />";
<             $displaystyle = "display:none";
<             $displayclass = "dnatest";
< 
< 			$uquery = "SELECT $dna_tests_table.testID, $dna_tests_table.personID, $dna_tests_table.gedcom FROM $dna_tests_table, $dna_links_table
< 				WHERE $dna_links_table.personID = \"$personID\" AND $dna_links_table.gedcom = \"$tree\" AND $dna_links_table.testID = $dna_tests_table.testID AND $dna_tests_table.personID != \"$personID\"";
< 			$dna_uresults = tng_query($uquery);
< 			$num_utests = tng_num_rows($dna_uresults);
< 			tng_free_result($dna_uresults);
< 
< 			$num_links = $num_tests;
< 			$num_tests = $num_tests + 2;
<             if ($num_utests) {
< 				$linkedstr = ($num_links > 1 && $num_utests) ? $text['people_have'] : $text['person_has'];
< 				$linkedstr .= "&nbsp;" . $dnanamestr;
<             }
<             else
< 				$linkedstr = $num_links > 1 ? $admtext['dna_tests'] : $text['dna_test'];
< 			$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
< 			$persontext .= "<col class=\"labelcol\"/><col style=\"width:{$datewidth}px\"/><col class=\"takenbycol\"/><col class=\"haplogroupcol\"/><col />\n";
< 
< 			$persontext .= "<tr>\n";
< 			$persontext .= "<td valign=\"top\" class=\"fieldnameback fieldname\" rowspan=\"$num_tests\">{$admtext['dna_tests']}$toggleicon</td>\n";
< 			$persontext .= "<td colspan=\"4\" class=\"fieldnameback fieldname\"><strong>&nbsp;$num_links&nbsp;$linkedstr</strong>&nbsp;<a href=\"#\" title=\"{$text['dna_info_head']}\"><img border=\"0\" src=\"{$cms['tngpath']}img/info_2.png\" width=\"14\" height=\"14\" alt=\"\" onclick=\"tnglitbox = new LITBox('dna_info.php',{overlay:false,width:620,height:200}); return false\"/></a></td></tr><tr id=\"dnatest\" class=\"$displayclass\" style=\"$displaystyle\">\n";
< 			$persontext .= "<th valign=\"top\" class=\"fieldnameback fieldname\">{$text['test_type']}</th><th valign=\"top\" class=\"fieldnameback fieldname\">{$text['takenby']}</a></th><th valign=\"top\" class=\"fieldnameback fieldname\">{$text['haplogroup']}&nbsp;</th><th valign=\"top\" class=\"fieldnameback fieldname\">{$text['test_info']}</th></tr><tr class=\"$displayclass\" style=\"$displaystyle\">\n";
< 		
< 			//for each test, do a row
< 			$testnum = 0;
< 			while($dna_test = tng_fetch_assoc($dna_results)) {
< 				$dna_pers_result = getPersonSimple($dna_test['tgedcom'], $dna_test['tpersonID']);
< 				if($dna_pers_result)
< 					$dprow = tng_fetch_assoc($dna_pers_result);
< 				$dna_righttree = checktree($dna_test['gedcom']);
< 				$dna_rightbranch = $dna_righttree ? checkbranch($prow['branch']) : false;
< 				$dprights = determineLivingPrivateRights($dprow, $dna_righttree, $dna_rightbranch);
< 				$dprow['allow_living'] = $dprights['living'];
< 				$dprow['allow_private'] = $dprights['private'];
< 				$dbname = getName( $dprow );
< 				$person_name = $dna_test['person_name'];
< 				if ($dbname)
< 					$dna_namestr = "<a href=\"$getperson_url" . "personID={$dna_test['tpersonID']}&tree={$dna_test['tgedcom']}\">" . getName( $dprow ) . "</a>";
< 				else
< 					$dna_namestr = $person_name;
< 				if ($dna_test['private_dna'] && !$allow_edit) $dna_namestr = $admtext['text_private'];
< 				tng_free_result($dna_pers_result);	
< 
< 				if($testnum)
< 					$persontext .= "</tr>\n<tr class=\"dnatest\" style=\"display:none\">\n";
< 				$markercount = ($dna_test['test_type'] == "Y-DNA") ? "-{$dna_test['markers']}" : "";
< 				$persontext .= "<td valign=\"top\" class=\"databack\"><a href=\"$dna_test_url" . "testID={$dna_test['testID']}\">{$dna_test['test_type']}$markercount</a></td>\n";
< 				$persontext .= "<td valign=\"top\" class=\"databack\">$dna_namestr";
< 				$test_type = $dna_test['test_type'];
< 				$haplogroup = $dna_test['haplogroup'] ? $dna_test['haplogroup'] : " ";
< 				$ref_seq = $dna_test['ref_seq'];
< 				$hvr1_results = $dna_test['hvr1_results'];
< 				$hvr2_results = $dna_test['hvr2_results'];
< 				$xtra_mut = $dna_test['xtra_mut'];
< 				$coding_reg = $dna_test['coding_reg'];
< 				$y_results = $dna_test['y_results'];
< 				$surnames = $ancsurnameupper ? strtoupper($dna_test['surnames']) : $dna_test['surnames'];
< 				$dna_notes = $dna_test['notes'];
< 				$admin_notes = $dna_test['admin_notes'];
< 
< 				$mdanc_namestr = "";
< 				if($dna_test['MD_ancestorID']) {// Get Most Distant Ancestor info
< 					$dna_anc_result = getPersonData($dna_test['tgedcom'], $dna_test['MD_ancestorID']);
< 					$ancrow = tng_fetch_assoc($dna_anc_result);
< 					$anc_righttree = checktree($dna_test['tgedcom']);
< 					$anc_rightbranch = $anc_righttree ? checkbranch($ancrow['branch']) : false;
< 					$ancrights = determineLivingPrivateRights($ancrow, $anc_righttree, $anc_rightbranch);
< 					$ancrow['allow_living'] = $ancrights['living'];
< 					$ancrow['allow_private'] = $ancrights['private'];
< 					$vitalinfo = getBirthInfo($ancrow);
< 					$mdanc_namestr = getName( $ancrow ) . $vitalinfo;
< 
< 					tng_free_result($dna_anc_result);
< 				}
< 				$mrcanc_namestr = "";
< 				if($dna_test['MRC_ancestorID']) {// Get MRCA Individual info
< 					if ($dna_test['MRC_ancestorID'][0] == "I") {
< 						$dna_anc_result = getPersonData($dna_test['tgedcom'], $dna_test['MRC_ancestorID']);
< 						$ancrow = tng_fetch_assoc($dna_anc_result);
< 						$anc_righttree = checktree($dna_test['tgedcom']);
< 						$anc_rightbranch = $anc_righttree ? checkbranch($ancrow['branch']) : false;
< 						$ancrights = determineLivingPrivateRights($ancrow, $anc_righttree, $anc_rightbranch);
< 						$ancrow['allow_living'] = $ancrights['living'];
< 						$ancrow['allow_private'] = $ancrights['private'];
< 						$vitalinfo = getBirthInfo($ancrow);
< 						$mrcanc_namestr = getName( $ancrow ) . $vitalinfo;
< 
< 						tng_free_result($dna_anc_result);
< 					}
< 					else if ($dna_test['MRC_ancestorID'][0] == "F") {// Get MRCA Family info
< 						$mrcquery = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$dna_test['MRC_ancestorID']}\" AND gedcom = \"{$dna_test['tgedcom']}\"";
< 						$mrcresult = tng_query($mrcquery);
< 						$ancrow = tng_fetch_assoc($mrcresult);
< 						tng_free_result($mrcresult);
< 						$anc_righttree = checktree($dna_test['tgedcom']);
< 						$anc_rightbranch = checkbranch($ancrow['branch']);
< 						$ancrights = determineLivingPrivateRights($ancrow, $anc_righttree, $anc_rightbranch);
< 						$ancrow['allow_living'] = $ancrights['living'];
< 						$ancrow['allow_private'] = $ancrights['private'];
< 						$mrcanc_namestr = $text['family'] . ": " . getFamilyName( $ancrow );
< 					}
< 				}
< 				if( $dna_test['medialinks'] ) {// Get Media Links
< 					$medialinks = showMediaLinks($dna_test['medialinks']);
< 				}
< 				else $medialinks = "";
< 				if( $dna_test['urls'] ) {// Get Relevant Links
< 					$urls = showLinks($dna_test['urls']);
< 					if($urls) $urls = "<ul>$urls</ul>";
< 				}
< 				else 
< 					$urls = "";
< 				// Start test results
< 				if($haplogroup) {
< 					if ($dna_test['confirmed']) 
< 						$haplogroup = "<a class=\"fakelink confirmed_haplogroup\" title=\"{$text['confirmed']}\">" . $haplogroup . "</a>";
< 					else 
< 						$haplogroup = "<a class=\"fakelink predicted_haplogroup\"  title = \"{$text['predicted']}\">" . $haplogroup . "</a>";
< 					$persontext .= "<td valign=\"top\" class=\"databack\">$haplogroup&nbsp;</td>\n";
< 				}
< 				$persontext .= "<td class=\"databack resultscol\">";
< 				$persontext .= $mdanc_namestr ? "<strong>" . $admtext['mda'] . ":</strong><br />" . $mdanc_namestr : "";
< 				$persontext .= $mdanc_namestr ? "<br />" : "";
< 				$persontext .= $mrcanc_namestr ? "<br /><strong>" . $admtext['mrca'] . ":</strong><br />" . $mrcanc_namestr : "";
< 				$persontext .= $mrcanc_namestr ? "<br />" : "";
< 				if ($dna_test['markeropt']) {
< 					$persontext .= $y_results ? "<br /><strong>" . $dna_test['markers'] . "&nbsp;" . $admtext['marker_values'] . ":</strong><br />" . $y_results . "<br />" : "";
< 					if($test_type == "mtDNA") {
< 						if ($ref_seq) {
< 							$persontext .= "<br /><strong>" . $admtext['ref_seq'] . ":</strong><br />";
< 						    if ($ref_seq == "rsrs")
< 								$persontext .= "{$admtext['rsrs']}";
< 						    if ($ref_seq == "rcrs")
< 								$persontext .= "{$admtext['rcrs']}";
< 							$persontext .= "<br />";
< 						}
< 						if ($hvr1_results || $hvr2_results) {
< 							$persontext .= "<br /><strong>" . $admtext['hvr_values'] . ":</strong><br />";
< 							if($hvr1_results)
< 								$persontext .= "{$text['hvr1']} = $hvr1_results<br />";
< 							if($hvr2_results)
< 								$persontext .= "<div>" . nl2br($text['hvr2']) . " = $hvr2_results<br /></div>";
< 						}
< 						$persontext .= $xtra_mut ? "<div><br /><strong>" . nl2br($admtext['xtra_mut']) . ":</strong><br />$xtra_mut</div>" : "";
< 						$persontext .= $allow_admin && $coding_reg ? "<div><br /><strong>" . nl2br($admtext['coding_reg']) . ":</strong><br />" . $coding_reg . "</div>" : "";
< 					}
< 				}
< 				$persontext .= $dna_test['surnamesopt'] && $surnames ? "<br /><strong>" . $admtext['ancestral_surnames'] . ":</strong><br />" . $surnames . "<br />" : "";
< 				$persontext .= $dna_test['linksopt'] && $urls ? "<br /><strong>" . $text['relevant_links'] . ": </strong>" . $urls : "";
< 				$persontext .= $medialinks ? "<br /><strong>" . $admtext['medialinks'] . ": </strong>" . $medialinks : "";
< 				$persontext .= $dna_test['notesopt'] && $dna_notes ? "<br /><strong>" . $text['notes'] . ":</strong><br />" . $dna_notes . "<br />" : "";
< 				$persontext .= $allow_admin && $dna_test['admin_notes'] ? "<br /><strong>" . $admtext['admin_notes'] . ":</strong><br />" . $admin_notes . "<br />" : "";
< 				$persontext .= "</td>\n";
< 
< 				$persontext .= "</td>\n";
< 				$persontext .= "</tr>\n";
< 				$testnum++;
< 			}
< 
< 			$persontext .= "</table>\n";
< 			$persontext .= "<br/>\n";
< 		}
< 		tng_free_result($dna_results);
---
> <?php
> 		//dna tests
>       	$debug = isset($_GET['debug']) ? $_GET['debug'] : false;	//get URL debug parameter
> 		//search for dna tests, if any found do the following
> 		$query = "SELECT $dna_tests_table.testID, $dna_tests_table.personID as tpersonID, $dna_tests_table.gedcom as tgedcom, test_type, test_number, test_date, match_date, markers, mtdna_haplogroup, ydna_haplogroup, hvr1_results, hvr2_results, y_results, person_name, mtdna_confirmed, ydna_confirmed, notes, markeropt, notesopt, linksopt, surnamesopt, private_dna,urls, surnames, MD_ancestorID, MRC_ancestorID, admin_notes, medialinks, ref_seq, xtra_mut, coding_reg, shared_cMs, shared_segments, chromosome, segment_start, segment_end, centiMorgans, matching_SNPs, x_match, relationship_range, suggested_relationship, actual_relationship, related_side, GEDmatchID, private_test
> 			FROM $dna_tests_table, $dna_links_table
> 			WHERE $dna_links_table.personID = \"$personID\" AND $dna_links_table.gedcom = \"$tree\" AND $dna_links_table.testID = $dna_tests_table.testID
> 			ORDER BY match_date DESC, test_type ASC, markers * 1 ASC,  test_number * 1 ASC";
> 		$dna_results = tng_query($query);
> 		$num_tests = tng_num_rows($dna_results);
> 		if ($debug) {
> 			echo "Allow Private - $allow_private<br />";
> 			echo "Number of DNA Tests - $num_tests<br />";
> 		}
> 
> 		// following query added to check if this is a Private Test
> 		$pquery = "SELECT $dna_tests_table.testID, $dna_tests_table.personID as tpersonID, $dna_tests_table.gedcom as tgedcom,private_test
> 			FROM $dna_tests_table, $dna_links_table
> 			WHERE $dna_links_table.personID = \"$personID\" AND $dna_links_table.gedcom = \"$tree\" AND $dna_links_table.testID = $dna_tests_table.testID AND $dna_tests_table.private_test = \"1\"
> 			ORDER BY test_type, markers * 1 ASC, test_date, test_number * 1 ASC";
> 		$priv_results = tng_query($pquery);
> 		$dnarow = tng_fetch_assoc($priv_results);		// added for Private Test check
> 		$num_private = tng_num_rows($priv_results);		// added for Private Test check
> 		if ($debug)
> 			echo "Number of Private DNA Tests - $num_private<br />";
> 
> 		$totnum_tests = $num_tests;
> 
> 		if ( !$allow_private)
> 			$totnum_tests = ($num_tests - $num_private);
> 		if ($debug)
> 			echo "Number of total DNA Tests - $totnum_tests<br />";
> 		if($totnum_tests) {
>             $toggleicon = "<img border=\"0\" src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"toggleicon2\" style=\"cursor:pointer; float:right; padding-top:4px;\" title=\"{$text['expand']}\" alt=\"\" onclick=\"togglednaicon(); \" />";
>             $displaystyle = "display:none";
>             $displayclass = "dnatest";
> 
> 			$uquery = "SELECT $dna_tests_table.testID, $dna_tests_table.personID, $dna_tests_table.gedcom FROM $dna_tests_table, $dna_links_table
> 				WHERE $dna_links_table.personID = \"$personID\" AND $dna_links_table.gedcom = \"$tree\" AND $dna_links_table.testID = $dna_tests_table.testID AND $dna_tests_table.personID != \"$personID\"";
> 			$dna_uresults = tng_query($uquery);
> 			$num_utests = tng_num_rows($dna_uresults);
> 			tng_free_result($dna_uresults);
> 
> 			if ( $allow_private) {
> 				$num_links = $num_tests;
> 				$num_tests = $num_tests + 2;
> 			}
> 			else {
> 				$num_links = $totnum_tests;
> 				$num_tests = $totnum_tests + 2;
> 			}
>             if ($num_utests) {
> 				$linkedstr = ($num_links > 1 && $num_utests) ? $text['testsarelinked'] : $text['testislinked'];
> 				$linkedstr .= "&nbsp;" . $dnanamestr;
>             }
>             else
> 				$linkedstr = $num_links > 1 ? $admtext['dna_tests'] : $text['dna_test'];
> 			$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback dna-tfixed normal\">\n";
> 			$persontext .= "<col class=\"labelcol\"/><col style=\"width:{$datewidth}px\"/><col class=\"takenbycol\"/><col class=\"haplogroupcol\"/><col />\n";
> 
> 			$persontext .= "<tr>\n";
> 			$persontext .= "<td valign=\"top\" class=\"fieldnameback fieldname rc-ul rc-ll\" rowspan=\"$num_tests\">{$admtext['dna_tests']}$toggleicon</td>\n";
>  			$persontext .= "<td colspan=\"4\" class=\"fieldnameback fieldname rc-lr\"><strong>&nbsp;$num_links&nbsp;$linkedstr</strong>&nbsp;<a href=\"#\" title=\"{$text['dna_info_head']}\"><img border=\"0\" src=\"{$cms['tngpath']}img/info_2.png\" width=\"14\" height=\"14\" alt=\"\" onclick=\"tnglitbox = new LITBox('dna_info.php',{overlay:false,width:620,height:200}); return false\"/></a></td></tr><tr id=\"dnatest\" class=\"$displayclass\" style=\"$displaystyle\">\n";
> 			$persontext .= "<th valign=\"top\" class=\"fieldnameback fieldname\">{$text['test_type']}</th><th valign=\"top\" class=\"fieldnameback fieldname\">{$text['takenby']}</th><th valign=\"top\" class=\"fieldnameback fieldname\">{$text['haplogroup']}&nbsp;</th><th valign=\"top\" class=\"fieldnameback fieldname\">{$text['test_info']}</th></tr><tr class=\"$displayclass\" style=\"$displaystyle\">\n";
> 
> 			//for each test, do a row
> 			$testnum = 0;
> 			while($dna_test = tng_fetch_assoc($dna_results)) {
> 			  if ($dna_test['private_test'] && ( $allow_private) || (!$dna_test['private_test'])) {
> 				$dna_pers_result = getPersonSimple($dna_test['tgedcom'], $dna_test['tpersonID']);
> 				$dprow = tng_fetch_assoc($dna_pers_result);
> 				if( $dprow ) {
> 					$dna_righttree = checktree($dna_test['tgedcom']);
> 					$dna_rightbranch = !empty($dna_righttree) ? checkbranch(isset($dprow['branch'])) : false;
> 					$dprights = determineLivingPrivateRights($dprow, $dna_righttree, $dna_rightbranch);
> 					$dprow['allow_living'] = $dprights['living'];
> 					$dprow['allow_private'] = $dprights['private'];
> 					$dbname = getName( $dprow );
> 					$person_name = $dna_test['person_name'];
> 				} else {
> 					$dbname = "";
> 					$person_name = $dna_test['person_name'];
> 				}
> 				if ($dna_test['private_test'])
> 					$privacy = "&nbsp;(" . $text['keep_test_private'] . ")";
> 				else
> 					$privacy = "";
> 				if ($dbname)
> 					$dna_namestr = "<a href=\"$getperson_url" . "personID={$dna_test['tpersonID']}&amp;tree={$dna_test['tgedcom']}\">" . getName( $dprow ) . "</a> $privacy";
> 				else
> 					$dna_namestr = $person_name . $privacy;
> 				if ($dna_test['private_dna'] && !$allow_edit) $dna_namestr = $admtext['text_private'];
> 				tng_free_result($dna_pers_result);
> 
> 				if($testnum) {
> 					$persontext .= "\n<tr class=\"dnatest\" style=\"display:none\">\n";
> 				}
> 				$markercount = ($dna_test['test_type'] == "Y-DNA") ? "-{$dna_test['markers']}" : "";
> 				$persontext .= "<td valign=\"top\" class=\"databack\"><a href=\"$dna_test_url" . "testID={$dna_test['testID']}\">{$dna_test['test_type']}$markercount</a></td>\n";
> 				$persontext .= "<td valign=\"top\" class=\"databack\">$dna_namestr</td>";
> 				$test_type = $dna_test['test_type'];
> 				$haplogroup = "";
> 				if ($dna_test['test_type'] == "Y-DNA")
> 					$haplogroup = $dna_test['ydna_haplogroup'] ? $dna_test['ydna_haplogroup'] : " ";
> 				if ($dna_test['test_type'] == "mtDNA")
> 					$haplogroup = $dna_test['mtdna_haplogroup'] ? $dna_test['mtdna_haplogroup'] : " ";
> 				if ($dna_test['test_type'] == "atDNA") {
> 					if ($dna_test['ydna_haplogroup'])
> 						$haplogroup = "Y = " . $dna_test['ydna_haplogroup'] . "<br />";
> 					if ($dna_test['mtdna_haplogroup']) {
> 						$haplogroup .= "mt = " . $dna_test['mtdna_haplogroup'];
> 					}
> 				}
> 				$ref_seq = $dna_test['ref_seq'];
> 				$hvr1_results = $dna_test['hvr1_results'];
> 				$hvr2_results = $dna_test['hvr2_results'];
> 				$xtra_mut = $dna_test['xtra_mut'];
> 				$coding_reg = $dna_test['coding_reg'];
> 				$shared_cMs = $dna_test['shared_cMs'];
> 				$shared_segments = $dna_test['shared_segments'];
> 				$chromosome = $dna_test['chromosome'];
> 				$segment_start = $dna_test['segment_start'];
> 				$segment_end = $dna_test['segment_end'];
> 				$centiMorgans = $dna_test['centiMorgans'];
> 				$matching_SNPs = $dna_test['matching_SNPs'];
> 				$x_match = $dna_test['x_match'];
> 				$relationship_range = $dna_test['relationship_range'];
> 				$suggested_relationship = $dna_test['suggested_relationship'];
> 				$actual_relationship = $dna_test['actual_relationship'];
> 				$related_side = $dna_test['related_side'];
> 				$GEDmatchID = $dna_test['GEDmatchID'];
> 				$y_results = $dna_test['y_results'];
> 				$surnames = !empty($ancsurnameupper) ? strtoupper($dna_test['surnames']) : $dna_test['surnames'];
> 				$dna_notes = $dna_test['notes'];
> 				$admin_notes = $dna_test['admin_notes'];
> 
> 				$mdanc_namestr = "";
> 				if($dna_test['MD_ancestorID']) {// Get Most Distant Ancestor info
> 					$dna_anc_result = getPersonData($dna_test['tgedcom'], $dna_test['MD_ancestorID']);
> 					$ancrow = tng_fetch_assoc($dna_anc_result);
> 					if( $ancrow ) {
> 						$anc_righttree = checktree($dna_test['tgedcom']);
> 						$anc_rightbranch = $anc_righttree ? checkbranch($ancrow['branch']) : false;
> 						$ancrights = determineLivingPrivateRights($ancrow, $anc_righttree, $anc_rightbranch);
> 						$ancrow['allow_living'] = $ancrights['living'];
> 						$ancrow['allow_private'] = $ancrights['private'];
> 						$vitalinfo = getBirthInfo($ancrow);
> 						$anc_namestr = getName( $ancrow );
> 						$mdanc_namestr = "<a href=\"$getperson_url" . "personID={$dna_test['MD_ancestorID']}&amp;tree={$dna_test['tgedcom']}\">$anc_namestr</a>" . $vitalinfo;
> 					}
> 
> 					tng_free_result($dna_anc_result);
> 				}
> 				$mrcanc_namestr = "";
> 				if($dna_test['MRC_ancestorID']) {// Get MRCA Individual info
> 					if ($dna_test['MRC_ancestorID'][0] == "I") {
> 						$dna_anc_result = getPersonData($dna_test['tgedcom'], $dna_test['MRC_ancestorID']);
> 						$ancrow = tng_fetch_assoc($dna_anc_result);
> 						if( $ancrow ) {
> 							$anc_righttree = checktree($dna_test['tgedcom']);
> 							$anc_rightbranch = $anc_righttree ? checkbranch($ancrow['branch']) : false;
> 							$ancrights = determineLivingPrivateRights($ancrow, $anc_righttree, $anc_rightbranch);
> 							$ancrow['allow_living'] = $ancrights['living'];
> 							$ancrow['allow_private'] = $ancrights['private'];
> 							$vitalinfo = getBirthInfo($ancrow);
> 							$anc_namestr = getName( $ancrow );
> 							$mrcanc_namestr = "<a href=\"$getperson_url" . "personID={$dna_test['MRC_ancestorID']}&amp;tree={$dna_test['tgedcom']}\">$anc_namestr</a>" . $vitalinfo;
> 						}
> 
> 						tng_free_result($dna_anc_result);
> 					}
> 					else if ($dna_test['MRC_ancestorID'][0] == $tngconfig['familyprefix']) {  // Get MRCA Family info
> 						$mrcquery = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$dna_test['MRC_ancestorID']}\" AND gedcom = \"{$dna_test['tgedcom']}\"";
> 						$mrcresult = tng_query($mrcquery);
> 						$ancrow = tng_fetch_assoc($mrcresult);
> 						tng_free_result($mrcresult);
> 						if( $ancrow ) {
> 							$anc_righttree = checktree($dna_test['tgedcom']);
> 							$anc_rightbranch = checkbranch($ancrow['branch']);
> 							$ancrights = determineLivingPrivateRights($ancrow, $anc_righttree, $anc_rightbranch);
> 							$ancrow['allow_living'] = $ancrights['living'];
> 							$ancrow['allow_private'] = $ancrights['private'];
> 							$famname = getFamilyName( $ancrow );
> 							$fammarried = "<br />&nbsp;&nbsp;<strong>{$text['marrabbr']}</strong>&nbsp;" . $ancrow['marrdate'];
> 							$mrcanc_namestr = $text['family'] . ": " . "<a href=\"$familygroup_url" . "familyID={$dna_test['MRC_ancestorID']}&amp;tree={$dna_test['tgedcom']}\">$famname</a>" . $fammarried;
> 						}
> 					}
> 				}
> 				if( $dna_test['medialinks'] ) {// Get Media Links
> 					$medialinks = showMediaLinks($dna_test['medialinks']);
> 				}
> 				else $medialinks = "";
> 				if( $dna_test['urls'] ) {// Get Relevant Links
> 					$urls = showLinks($dna_test['urls'],true);
> 					if($urls) $urls = "<ul>$urls</ul>";
> 				}
> 				else
> 					$urls = "";
> 				// Start test results
>             	if(isset($ydna_haplogroup)) {
> 					if ($dna_test['ydna_confirmed'])
> 						$haplogroup = "<a class=\"fakelink confirmed_haplogroup\" title=\"{$text['confirmed']}\">" . $ydna_haplogroup . "</a>";
> 					else
> 						$haplogroup = "<a class=\"fakelink predicted_haplogroup\"  title = \"{$text['predicted']}\">" . $ydna_haplogroup . "</a>";
> 				}
>             	if(isset($mtdna_haplogroup)) {
> 					if ($dna_test['mtdna_confirmed'])
> 						$haplogroup = "<a class=\"fakelink confirmed_haplogroup\" title=\"{$text['confirmed']}\">" . $mtdna_haplogroup . "</a>";
> 					else
> 						$haplogroup = "<a class=\"fakelink predicted_haplogroup\"  title = \"{$text['predicted']}\">" . $mtdna_haplogroup . "</a>";
> 				}
> 				$persontext .= "<td valign=\"top\" class=\"databack\">$haplogroup&nbsp;</td>\n";
> 				$persontext .= "<td class=\"databack resultscol\">";
> 				if($GEDmatchID) {
> 					$GEDmatch_str = "<a href=\"https://www.gedmatch.com/\" target=\"_blank\">$GEDmatchID</a>";
> 					$persontext .= "<strong>{$admtext['gedmatchID']}</strong> =  $GEDmatch_str <br /><br />";
> 					}
> 				if ($mdanc_namestr)
> 					$persontext .= "<strong>" . $admtext['mda'] . ":</strong><br />" . $mdanc_namestr . "<br /><br />";
> 				if ($mrcanc_namestr)
> 					$persontext .= "<strong>" . $admtext['mrca'] . ":</strong><br />" . $mrcanc_namestr . "<br />";
> 				if ($dna_test['markeropt']) {
> 					$persontext .= $y_results ? "<br /><strong>" . $dna_test['markers'] . "&nbsp;" . $admtext['marker_values'] . ":</strong><br />" . $y_results . "<br />" : "";
> 					if($test_type == "mtDNA") {
> 						if ($ref_seq) {
> 							$persontext .= "<br /><strong>" . $admtext['ref_seq'] . ":</strong><br />";
> 						    if ($ref_seq == "rsrs")
> 								$persontext .= "{$admtext['rsrs']}";
> 						    if ($ref_seq == "rcrs")
> 								$persontext .= "{$admtext['rcrs']}";
> 							$persontext .= "<br />";
> 						}
> 						if ($hvr1_results || $hvr2_results) {
> 							$persontext .= "<br /><strong>" . $admtext['hvr_values'] . ":</strong><br />";
> 							if($hvr1_results)
> 								$persontext .= "{$text['hvr1']} = $hvr1_results<br />";
> 							if($hvr2_results)
> 								$persontext .= "<div>" . nl2br($text['hvr2']) . " = $hvr2_results<br /></div>";
> 						}
> 						$persontext .= $xtra_mut ? "<div><br /><strong>" . nl2br($admtext['xtra_mut']) . ":</strong><br />$xtra_mut</div>" : "";
> 						$persontext .= $allow_admin && $coding_reg ? "<div><br /><strong>" . nl2br($admtext['coding_reg']) . ":</strong><br />" . $coding_reg . "</div>" : "";
> 					}
> 					if($test_type == "atDNA") {
> 						if($shared_cMs) {
> 							$persontext .= "<br /><strong>{$text['shared_dna']}:</strong><br />";
> 							$total_shared = $admtext['shared centimorgans'] . " " . $shared_cMs;
> 							if ($shared_segments)
> 								$total_shared .= " | $shared_segments {$admtext['shared_segments']} ";
> 							else
> 								$total_shared .= " ";
> 							$persontext .= $admtext['shared_dna'] ." =  $total_shared <br />";
> 							}
> 						if($chromosome && $centiMorgans) {
> 							$segment = "{$admtext['chromosome']} $chromosome | $centiMorgans {$admtext['centiMorgans']} ";
> 							$persontext .= $admtext['largest_segment'] ." =  $segment <br />";
> 							}
> 						if($segment_start)
> 							$persontext .= $admtext['segment_start'] ." =  $segment_start <br />";
> 						if($segment_end)
> 							$persontext .= $admtext['segment_end'] ." =  $segment_end <br />";
> 						if($matching_SNPs)
> 							$persontext .= $admtext['matchingSNPs'] ." =  $matching_SNPs <br />";
> 						if($x_match)
> 							$persontext .= $admtext['xmatch'] ." =  {$admtext['yes']} <br />";
> 						if($relationship_range || $suggested_relationship || $actual_relationship || $related_side)
> 							$persontext .= "</div><br /><strong>{$admtext['relationship_section']}:</strong><br /><div>";
> 						if($relationship_range)
> 							$persontext .= $admtext['relationship_range'] ." =  $relationship_range <br />";
> 						if($suggested_relationship)
> 							$persontext .= $admtext['suggested_relationship'] ." =  $suggested_relationship <br />";
> 						if($actual_relationship)
> 							$persontext .= $admtext['actual_relationship'] ." =  $actual_relationship <br />";
> 						if($related_side)
> 							$persontext .= $admtext['related_side'] ." =  $related_side <br />";
> 					}
> 				}
> 				$persontext .= $dna_test['surnamesopt'] && $surnames ? "<br /><strong>" . $admtext['ancestral_surnames'] . ":</strong><br />" . $surnames . "<br />" : "";
> 				$persontext .= $dna_test['linksopt'] && $urls ? "<br /><strong>" . $text['relevant_links'] . ": </strong>" . $urls : "";
> 				$persontext .= $medialinks ? "<br /><strong>" . $admtext['medialinks'] . ": </strong>" . $medialinks : "";
> 				$persontext .= $dna_test['notesopt'] && $dna_notes ? "<br /><strong>" . $text['notes'] . ":</strong><br />" . $dna_notes . "<br />" : "";
> 				$persontext .= $allow_admin && $dna_test['admin_notes'] ? "<br /><strong>" . $admtext['admin_notes'] . ":</strong><br />" . $admin_notes . "<br />" : "";
> 				$persontext .= "</td>\n";
> 				$persontext .= "</tr>\n";
> 				$testnum++;
> 			  }
> 			}
> 
> 			$persontext .= "</table>\n";
> 			$persontext .= "<br/>\n";
> 		}
> 		tng_free_result($dna_results);
Only in TNG1403: error_log
diff -r TNG/eventlib_js.php TNG1403/eventlib_js.php
6,7c6,7
< var preferDateFormat = '<?php echo $preferDateFormat; ?>';
< var tree = "<?php echo $tree; ?>";
---
> var preferDateFormat = '<?php (isset($preferDateFormat) ? $preferDateFormat : ""); ?>';
> var tree = "<?php echo (isset($tree) ? $tree : ""); ?>";
diff -r TNG/eventlib.php TNG1403/eventlib.php
5,6d4
< 	echo "<div id=\"custevents\" style=\"margin-bottom:5px\">\n";
< 
14,25d11
< 	echo "<table id=\"custeventstbl\" class=\"normal\" cellpadding=\"3\" cellspacing=\"1\" border=\"0\"";
< 	if(!$eventcount) echo " style=\"display:none\"";
< 	echo ">";
< 	echo "<tbody id=\"custeventstblbody\">\n";
< 	echo "<tr>\n";
< 	echo "<td class=\"fieldnameback fieldname\" width=\"98\"><nobr>&nbsp;<b>" . $admtext['action'] . "</b>&nbsp;</nobr></td>\n";
< 	echo "<td class=\"fieldnameback fieldname\"><nobr>&nbsp;<b>" . $admtext['event'] . "</b>&nbsp;</nobr></td>\n";
< 	echo "<td class=\"fieldnameback fieldname\"><nobr>&nbsp;<b>" . $admtext['eventdate'] . "</b>&nbsp;&nbsp;&nbsp;</nobr></td>\n";
< 	echo "<td class=\"fieldnameback fieldname\"><nobr>&nbsp;<b>" . $admtext['eventplace'] . "</b>&nbsp;</nobr></td>\n";
< 	echo "<td class=\"fieldnameback fieldname\"><nobr>&nbsp;<b>" . $admtext['detail'] . "</b>&nbsp;</nobr></td>\n";
< 	echo "</tr>\n";
< 
42a29,35
> 			$rowspan = 0;
> 			if($info) $rowspan++;
> 			if($event['eventdate'] || $event['eventplace']) $rowspan++;
> 			if(!$rowspan) {
> 				$rowspan = 1;
> 				$info = "&nbsp;";
> 			}
46,47c39,46
< 			$actionstr = $allow_edit ? "<a href=\"#\" onclick=\"return editEvent({$event['eventID']});\" title=\"{$admtext['edit']}\" class=\"smallicon admin-edit-icon\"></a>" : "";
< 			$actionstr .= $allow_delete ? "<a href=\"#\" onclick=\"return deleteEvent('{$event['eventID']}');\" title=\"{$admtext['text_delete']}\" class=\"smallicon admin-delete-icon\"></a>" : "&nbsp;";
---
> 			if($allow_edit) {
> 				$on_click_edit = " onclick=\"return editEvent({$event['eventID']});\"";
> 				$actionstr = "<td class=\"action-btn\"><a href=\"#\"{$on_click_edit} title=\"{$admtext['edit']}\" class=\"smallicon admin-edit-icon\"></a></td>";
> 			}
> 			else {
> 				$actionstr = $on_click_edit = "";
> 			}
> 			$actionstr .= $allow_delete ? "<td class=\"action-btn\"><a href=\"#\" onclick=\"return deleteEvent('{$event['eventID']}');\" title=\"{$admtext['text_delete']}\" class=\"smallicon admin-delete-icon\"></a></td>" : "&nbsp;";
49,50c48,49
< 				$notesicon = $gotnotes[$event['eventID']] ? "admin-note-on-icon" : "admin-note-off-icon";
< 				$actionstr .= "<a href=\"#\" onclick=\"return showNotes('$event[eventID]','$id');\" title=\"{$admtext['notes']}\" id=\"notesicon{$event['eventID']}\" class=\"smallicon $notesicon\"></a>";
---
> 				$notesicon = !empty($gotnotes[$event['eventID']]) ? "admin-note-on-icon" : "admin-note-off-icon";
> 				$actionstr .= "<td class=\"action-btn\"><a href=\"#\" onclick=\"return showNotes('{$event['eventID']}','$id');\" title=\"{$admtext['notes']}\" id=\"notesicon{$event['eventID']}\" class=\"smallicon $notesicon\"></a></td>";
53,54c52,60
< 				$citesicon = $gotcites[$event['eventID']] ? "admin-cite-on-icon" : "admin-cite-off-icon";
< 				$actionstr .= "<a href=\"#\" onclick=\"return showCitations('{$event['eventID']}','$id');\" title=\"{$admtext['sources']}\" id=\"citesicon{$event['eventID']}\" class=\"smallicon $citesicon\"></a>";
---
> 				$citesicon = !empty($gotcites[$event['eventID']]) ? "admin-cite-on-icon" : "admin-cite-off-icon";
> 				$actionstr .= "<td class=\"action-btn\"><a href=\"#\" onclick=\"return showCitations('{$event['eventID']}','$id');\" title=\"{$admtext['sources']}\" id=\"citesicon{$event['eventID']}\" class=\"smallicon $citesicon\"></a></td>";
> 			}
> 			if($event['eventdate'] || $event['eventplace']) {
> 				echo "<tr class=\"row_{$event['eventID']}\" id=\"row_{$event['eventID']}_top\" valign=\"top\"><td rowspan=\"$rowspan\" class=\"pad5\">{$displayval}:</td>";
> 				echo "<td><div class=\"cust-event-field\"{$on_click_edit}>{$event['eventdate']}&nbsp;</div></td><td><div class=\"cust-event-field\"{$on_click_edit}>{$event['eventplace']}&nbsp;</div></td>";
> 				echo "$actionstr</td></tr>\n";
> 				if($info)
> 					echo "<tr class=\"row_{$event['eventID']}\" id=\"row_{$event['eventID']}_bot\"><td colspan=\"2\"><div class=\"cust-event-field\"{$on_click_edit}>$info</div></td></tr>\n";
56c62,68
< 			echo "<tr id=\"row_{$event['eventID']}\"><td class=\"lightback nw\">$actionstr</td><td class=\"lightback\">$displayval</td><td class=\"lightback\">{$event['eventdate']}&nbsp;</td><td class=\"lightback\">{$event['eventplace']}&nbsp;</td><td class=\"lightback\">$info&nbsp;</td></tr>\n";
---
> 			else {
> 				echo "<tr class=\"row_{$event['eventID']}\" id=\"row_{$event['eventID']}_top\" valign=\"top\">";
> 				echo "<td class=\"pad5\">{$displayval}:</td><td colspan=\"2\"><div class=\"cust-event-field\"{$on_click_edit}>$info</div></td>";
> 				echo "$actionstr</tr>\n";
> 			}
> 			echo "</td>\n";
> 			echo "</tr>\n";
60,63d71
< 
< 	echo "</tbody>\n";
< 	echo "</table>\n";
< 	echo "</div>\n";
diff -r TNG/eventmicro.php TNG1403/eventmicro.php
3c3
< 			$eventstr = $admtext[$eventID] ? $admtext[$eventID] : "";
---
> 			$eventstr = !empty($admtext[$eventID]) ? $admtext[$eventID] : "";
5c5
< 				$query = "SELECT display, eventdate, eventplace, info FROM $events_table, $eventtypes_table WHERE eventID = \"$plink[eventID]\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID";
---
> 				$query = "SELECT display, eventdate, eventplace, info FROM $events_table, $eventtypes_table WHERE eventID = \"{$plink['eventID']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID";
8c8
< 				$displayval = getEventDisplay( $custevent['display'] );
---
> 				$displayval = isset($custevent['display']) ? getEventDisplay( $custevent['display'] ) : "";
10c10
< 				if( $custevent['eventdate'] )
---
> 				if( !empty($custevent['eventdate']) )
12c12
< 				elseif( $custevent['eventplace'] )
---
> 				elseif( !empty($custevent['eventplace']) )
14c14
< 				elseif( $custevent['info'] )
---
> 				elseif( !empty($custevent['info']) )
diff -r TNG/extrastree.php TNG1403/extrastree.php
16a17
> $parentset = isset($parentset) ? intval($parentset) : 0;
96,97c97,98
< 			if( $result2 ) {
< 				$newrow = tng_fetch_assoc( $result2 );
---
> 			$newrow = tng_fetch_assoc( $result2 );
> 			if( $newrow ) {
100d100
< 				tng_free_result($result2);
101a102
> 			tng_free_result($result2);
142d142
< $flags['tabs'] = $tngconfig['tabs'];
154c154
< $innermenu .= "<select name=\"generations\" class=\"verysmall\" onchange=\"window.location.href='$extrastree_url" . "personID=$personID&amp;tree=$tree&amp;showall=$showall&amp;generations=' + this.options[this.selectedIndex].value\">\n";
---
> $innermenu .= "<select name=\"generations\" class=\"verysmall\" onchange=\"window.location.href='$extrastree_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;showall=$showall&amp;generations=' + this.options[this.selectedIndex].value\">\n";
191c191
< 		if( $columns[1][$nextgen] ) {
---
> 		if(!empty($columns[1][$nextgen])) {
203c203
< 		if( $columns[2][$nextgen] ) {
---
> 		if(!empty($columns[2][$nextgen])) {
212d211
< <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/rpt_utils.js"></script>
diff -r TNG/familychart.php TNG1403/familychart.php
8c8
< $reverse = $rev;
---
> include($subroot . "pedconfig.php");
10,12c10,14
< if($tngprint) {
< 	if($familychart['boxwidth'] > 151)
< 		$familychart['boxwidth'] = 151;			#dimensions of individual boxes
---
> $reverse = isset($rev) ? $rev : "";
> 
> if(!empty($tngprint)) {
> 	if($familychart['boxwidth'] > 191)
> 		$familychart['boxwidth'] = 191;			#dimensions of individual boxes
20c22,24
< if(!($familyID || $personID)) die("no args\n");
---
> if( empty($familyID) && empty($personID) ) die("no args\n");
> if( !isset($familyID) ) $familyID = "";
> if( !isset($personID) ) $personID = "";
23c27
< 	$family = array();
---
> 	pageNotFound();
30c34
< $fatherID = $family['husband']['personID'];
---
> $fatherID = isset($family['husband']['personID']) ? $family['husband']['personID'] : "";
35c39
< 		$family['husband']['otherfamilies'] = $temp['otherfamilies']; 	#usually null
---
> 		$family['husband']['otherfamilies'] = isset($temp['otherfamilies']) ? $temp['otherfamilies'] : ""; 	#usually null
37c41
< $motherID = $family['wife']['personID'];
---
> $motherID = isset($family['wife']['personID']) ? $family['wife']['personID'] : "";
41c45
< 	$temp =getChild($matfamily,$motherID);
---
> 	$temp = getChild($matfamily,$motherID);
46c50
< 	$temp=getChild($family,$personID);
---
> 	$temp = getChild($family,$personID);
50c54
< 	echo $text['parentfamily'] . " ".($name ?" {$text['of']} $name " : " {$text['shown']} ")." {$text['isthe']} $admtext[$type] {$text['family']}.";		
---
> 	echo "<p><em>" . $text['parentfamily'] . " ".($name ?" {$text['of']} $name " : " {$text['shown']} ")." {$text['isthe']} $admtext[$type] {$text['family']}.</em></p>";		
55c59
< $famsize = count($family['children']);
---
> $famsize = isset($family['children']) && is_array($family['children']) ? count($family['children']) : 0;
79c83,98
< echo "<div align='left' id='outer' style='position:relative;padding-top:8px;width:100%;height:{$chartheight}px'>\n";
---
> if( !$tngprint ) {
> 	echo "<span class=\"normal\">" . $text['scrollnote'] . "&nbsp;";
> 	echo "<img src=\"{$cms['tngpath']}{$templatepath}img/ArrowDown.gif\" alt=\"\" />" . $text['fcinstrdn'] . "&nbsp;";
> 	echo "<img src=\"{$cms['tngpath']}img/admArrowUp.gif\" alt=\"\" style=\"padding:0px 8px 0px 8px\"/>" . $text['fcinstrup'] . "&nbsp;";
> 	echo "<img src=\"{$cms['tngpath']}img/tng_more.gif\" alt=\"\" style=\"padding:0px 8px 0px 8px; width:14px;\"/>" . $text['fcinstrplus'] . "&nbsp;";
> 	echo "<img src=\"{$cms['tngpath']}img/family_small_icon.gif\" alt=\"\" style=\"padding:0px 8px 0px 8px\"/>" . $text['fcinstrfam'] . "&nbsp;";
> 	echo "</span>";
> 
> 	echo "<div id=\"mag-icons-div\" class=\"mag-icons\"><img src=\"img/zoomin.png\" id=\"zoom-in\" onclick=\"panzoom.zoomIn;\" alt=\"{$text['zoomin']}\"/><img src=\"img/zoomreset.png\" id=\"zoom-reset\" alt=\"{$text['tng_reset']}\"/><img src=\"img/zoomout.png\" id=\"zoom-out\" alt=\"{$text['zoomout']}\"/></div>\n";
> }
> ?>
> <div align='left' id='outer' style='position:relative;padding-top:8px;width:100%;height:<?php echo $chartheight; ?>px'>
> 	<div class="panzoom" id="vcontainer" style="overflow:visible">
> 		<div id="inner" style="position:relative;width:100%;height:<?php echo $chartheight; ?>px">
> 
> <?php
85a105
> ?>
87c107,111
< echo "\n</div>\n";
---
> 		</div>
> 	</div>
> </div>
> <script src="js/panzoom.min.js"></script>
> <script src="js/tngzoom.js"></script>
88a113
> <?php
99,102c124,127
< 	$query="SELECT distinct a.gedcom gedcom,a.familyID familyID,husband,wife, c.personID, c.firstname,c.lastname,c.sex,IF(birthdatetr!='0000-00-00',year(birthdatetr),year(altbirthdatetr)) as birth,IF(deathdatetr !='0000-00-00',year(deathdatetr),year(burialdatetr)) death, marrdate, c.living living, c.private private, c.branch branch, nameorder, lnprefix, title, prefix, suffix, ordernum
< FROM $families_table a left join $children_table b on a.familyID=b.familyID and a.gedcom=b.gedcom join $people_table c on c.personID in (a.husband,a.wife,b.personID) and a.gedcom=c.gedcom
< WHERE a.familyID='$familyID' and a.gedcom='$tree'
< order by b.ordernum";
---
> 	$query="SELECT DISTINCT a.gedcom, a.familyID, husband, wife, c.personID, c.firstname, c.lastname, c.sex, IF(birthdatetr!='0000-00-00', year(birthdatetr), year(altbirthdatetr)) AS birth, IF(deathdatetr !='0000-00-00', year(deathdatetr), year(burialdatetr)) AS death, marrdate, c.birthdate, c.birthdatetr, c.altbirthdate, c.altbirthdatetr, c.deathdate, c.deathdatetr, c.living, c.private, c.branch, c.gedcom, nameorder, lnprefix, title, prefix, suffix, ordernum, a.living AS fliving, a.private AS fprivate, a.branch AS fbranch
> 		FROM $families_table a left join $children_table b on a.familyID=b.familyID and a.gedcom=b.gedcom join $people_table c on c.personID in (a.husband,a.wife,b.personID) and a.gedcom=c.gedcom
> 		WHERE a.familyID='$familyID' and a.gedcom='$tree'
> 		order by b.ordernum";
119c144,146
< 			$res['living'] = $row['living'];
---
> 			$res['living'] = $row['fliving'];
> 			$res['private'] = $row['fprivate'];
> 			$res['branch'] = $row['fbranch'];
129a157,159
> 		if( !isset($res['husband']) ) $res['husband'] = "";
> 		if( !isset($res['wife']) ) $res['wife'] = "";
> 
158c188,191
< 	return $row[0];
---
> 	if( isset($row[0]) ) 
> 		return $row[0];
> 	else
> 		return null;
193a227
> 		$both = 0;
197a232
> 		$both = 0;
221,222c256,259
< 	$leftparent = $reverse ? $family['wife'] : $family['husband'];
< 	$rightparent = $reverse ? $family['husband'] : $family['wife'];
---
> 	$wife = !empty($family['wife']) ? $family['wife'] : "";
> 	$husband = !empty($family['husband']) ? $family['husband'] : "";
> 	$leftparent = $reverse ? $wife : $husband;
> 	$rightparent = $reverse ? $husband : $wife;
245c282
< 	if ($family['children']) {
---
> 	if (!empty($family['children'])) {
274c311
< 	elseif($familychart['livingsymbol'] && !$_SESSION['logged_in'])
---
> 	elseif($familychart['livingsymbol'] && empty($_SESSION['logged_in']) )
275a313,314
> 	else
> 		$life = " ";
298c337
< 	if ($others=$person['otherfamilies']) {
---
> 	if ($others=(isset($person['otherfamilies']) ? $person['otherfamilies'] : null)) {
300c339
< 		($top+$familychart['boxheight']-15)."px;'><img src='img/family_small_icon.gif' onclick='toggle(\"$thisPersonID\");' alt='$text[otherfamilies]' title='$text[otherfamilies]' >
---
> 		($top+$familychart['boxheight']-15)."px;'><img src='img/family_small_icon.gif' onclick='toggle(\"$thisPersonID\");' alt='{$text['otherfamilies']}' title='{$text['otherfamilies']}' >
303c342
< 		    echo "\t<a href='{$family_url}familyID=$other[familyID]&amp;personID=$thisPersonID$andtree'>$other[text]</a><br/>\n";
---
> 		    echo "\t<a href='{$family_url}familyID={$other['familyID']}&amp;personID=$thisPersonID$andtree'>{$other['text']}</a><br/>\n";
323c362
< 		<img src='$cms[tngpath]img/tng_more.gif' onclick='toggle(\"$spouse\");' alt='Other spouses' title='{$text['otherspouses']}' />
---
> 		<img src='{$cms['tngpath']}img/tng_more.gif' onclick='toggle(\"$spouse\");' alt='Other spouses' title='{$text['otherspouses']}' />
327,329c366,369
< 		$sp=0;
< 		while ($fam=$otherfamilies[$sp++]) {
< 			$query = "SELECT personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $people_table.living as living, $people_table.private as private 
---
> 		$count = count($otherfamilies);
> 		for($sp = 0; $sp < $count; $sp++) {
> 			$fam = $otherfamilies[$sp];
> 			$query = "SELECT personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, $people_table.living as living, $people_table.private as private, $people_table.branch as branch, $people_table.gedcom as gedcom
341a382,389
> 			$spousename = "";
> 			if( $spouserow ) {
> 				$righttree = checktree($person['gedcom']);
> 				$rightbranch = $righttree ? checkbranch($person['branch']) : false;
> 
> 				$spouserights = determineLivingPrivateRights($spouserow, $righttree);
> 				$spouserow['allow_living'] = $spouserights['living'];
> 				$spouserow['allow_private'] = $spouserights['private'];
343,350c391,392
< 			$righttree = checktree($person['gedcom']);
< 			$rightbranch = $righttree ? checkbranch($person['branch']) : false;
< 
< 			$spouserights = determineLivingPrivateRights($spouserow, $righttree);
< 			$spouserow['allow_living'] = $spouserights['living'];
< 			$spouserow['allow_private'] = $spouserights['private'];
< 
< 			$spousename = getName( $spouserow );
---
> 				$spousename = getName( $spouserow );
> 			}
353c395
< 			echo "<a href='{$family_url}familyID=$fam&amp;tree=$tree$rev'>$text[familywith] $spousename</a><br />\n";
---
> 			echo "<a href='{$family_url}familyID=$fam&amp;tree=$tree$rev'>{$text['familywith']} $spousename</a><br />\n";
389c431
< 			 'text'=>"$text[showfamily] - $admtext[$type]")); #language independent
---
> 			 'text'=>"{$text['showfamily']} - $admtext[$type]")); #language independent
414c456
< 	$righttree = checktree($person['tree']);
---
> 	$righttree = checktree($person['gedcom']);
421c463
< 	global $text, $flags, $tngconfig, $allow_edit, $rightbranch, $disallowgedcreate, $allowpdf, $nonames, $allowgedcom, $family_url;
---
> 	global $text, $flags, $tngconfig, $allow_edit, $rightbranch, $disallowgedcreate, $allow_pdf, $nonames, $allowgedcom, $family_url;
428c470
<     $familyname = ($f && $m) ? "$f[displayname] / $m[displayname]" : ($f ? $f['displayname'] : ($m ? $m['displayname'] : $family['children'][0]['displayname']));
---
>     $familyname = ($f && $m) ? "{$f['displayname']} / {$m['displayname']}" : ($f ? $f['displayname'] : ($m ? $m['displayname'] : $family['children'][0]['displayname']));
440,443c482,485
< 	writelog( "<a href='$family_url" . "familyID=$familyID&amp;tree=$tree'>{$text['familychart']}: $logname ($familyID)</a>" );
< 	preparebookmark( "<a href='{$family_url}familyID=$familyID&amp;tree=$tree'>{$text['familychart']}: $familyname ($familyID)</a>" );	
< 	$flags['tabs'] = $tngconfig['tabs'];
< 	$flags['scripting'] = famStylesheet();
---
> 	writelog( "<a href=\"$family_url" . "familyID=$familyID&amp;tree=$tree\">{$text['familychart']}: $logname ($familyID)</a>" );
> 	preparebookmark( "<a href=\"{$family_url}familyID=$familyID&amp;tree=$tree\">{$text['familychart']}: $familyname ($familyID)</a>" );	
> 		$flags['scripting'] = famJavaScript();
> 	$flags['css'] = famStylesheet();
452,454c494,496
< 	$treeResult = getTreeSimple($tree);
< 	$treerow = tng_fetch_assoc($treeResult);
< 	$allowpdf = !$treerow['disallowpdf'] || ($allow_pdf && $rightbranch);
---
> 	//$treeResult = getTreeSimple($tree);
> 	//$treerow = tng_fetch_assoc($treeResult);
> 	//$allowpdf = !$treerow['disallowpdf'] || ($allow_pdf && $rightbranch);
462c504
< 	#css and javascript for this module
---
> 	#css for this module
474a517
> /*<![CDATA[*/
478,479c521,522
< 	background-color: $familychart[boxcolor];
< 	box-shadow: 5px 5px 5px $familychart[shadowcolor];
---
> 	background-color: {$familychart['boxcolor']};
> 	box-shadow: 5px 5px 5px {$familychart['shadowcolor']};
485c528
< 	background-color: $familychart[fboxcolor];
---
> 	background-color: {$familychart['fboxcolor']};
538a582
> /*]]>*/
539a584,589
> ";
> }
> 
> function famJavaScript() {
> 	#JavaScript for this module
> 	return "
540a591
> //<![CDATA[
545a597
> //]]>
547d598
< 
diff -r TNG/familygroup.php TNG1403/familygroup.php
16c16
< $placelinkend = "\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\"></a>";
---
> $placelinkend = "\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\"></a>";
75c75
< 		if($event['eventlds'] == "div")
---
> 		if(isset($event['eventlds']) && $event['eventlds'] == "div")
106c106
< 	$rightbranch = checkbranch($ind['branch']);
---
> 	$rightbranch = $righttree ? checkbranch($ind['branch']) : false;
112c112
< 	$haskids = $ind['haskids'] ? "X" : "&nbsp;";
---
> 	$haskids = !empty($ind['haskids']) ? "X" : "&nbsp;";
116c116,119
< 	else $sex = $text['unknown'];
---
> 	else if( $ind['sex'] == "U" ) $sex = $text['unknown'];
> 	else if( !empty($ind['sex']) )
> 		$sex = isset($text[$ind['sex']]) ? $text[$ind['sex']] : $ind['sex'];
> 	else $sex = "";
124a128,131
> 	else
> 		$label = "";
> 	if($label && $sex)
> 		$label .= " |";
127c134
< 	$indtext .= "<table border=\"0\" cellspacing=\"2\" cellpadding=\"0\" width=\"100%\">\n";
---
> 	$indtext .= "<table border=\"0\" cellspacing=\"2\" cellpadding=\"0\" style=\"width:100%\">\n";
131,132c138,139
< 	$indtext .= "<span class=\"normal\">$label | $sex</span><br/><span class=\"subhead\"><b>";
< 	if( $ind['haskids'] )
---
> 	$indtext .= "<span class=\"normal\">$label $sex</span><br/><span class=\"subhead\"><b>";
> 	if( !empty($ind['haskids']) )
137c144
< 		$indtext .= " | <a href=\"{$cms['tngpath']}" . "admin_editperson.php?personID={$ind['personID']}&amp;tree=$tree&amp;cw=1\" target=\"_blank\">{$text['edit']}</a>";
---
> 		$indtext .= " | <a href=\"{$cms['tngpath']}" . "admin_editperson.php?personID={$ind['personID']}&amp;tree=$tree&amp;cw=1\" target=\"blank\">{$text['edit']}</a>";
145c152
< 	$indtext .= $allow_lds_this ? "<col style=\"width:125px\"/><col class=\"eventdatecol\"/><col class=\"labelcol\"/>\n" : "\n";
---
> 	$indtext .= $allow_lds_this ? "<col style=\"width:150px\"/><col class=\"eventdatecol\"/><col class=\"labelcol\"/>\n" : "\n";
147c154
< 	$event['text'] = $text['born'];
---
> 	$event['text'] = $text['birth'];
151a159,161
> 	$event['date'] = "";
> 	$event['place'] = "";
> 	$event['type2'] = "";
163c173,174
< 	$event['event'] = "CHR";
---
> 	list($altbirthtype,$altbirthlabel) = getAltBirthInfo($ind);
> 	$event['event'] = $altbirthtype;
177c188,191
< 		$event['text'] = $text['christened'];
---
> 		$event['text'] = $altbirthlabel;
> 		if( !isset($event['date']) ) $event['date'] = "";
> 		if( !isset($event['place']) ) $event['place'] = "";
> 		if( !isset($event['type2']) ) $event['type2'] = "";
182c196
< 	$event['text'] = $text['died'];
---
> 	$event['text'] = $text['death'];
187a202,204
> 	$event['date'] = "";
> 	$event['place'] = "";
> 	$event['type2'] = "";
199c216
< 	$event['text'] = $ind['burialtype'] ? $text['cremated'] : $text['buried'];
---
> 	$event['text'] = $ind['burialtype'] ? $text['cremation'] : $text['burial'];
204a222,224
> 	$event['date'] = "";
> 	$event['place'] = "";
> 	$event['type2'] = "";
213,214c233,234
< 				$ind['sealdate'] = $sealinfo['sealdate'];
< 				$ind['sealplace'] = $sealinfo['sealplace'];
---
> 				$ind['sealdate'] = isset($sealinfo['sealdate']) ? $sealinfo['sealdate'] : "";
> 				$ind['sealplace'] = isset($sealinfo['sealplace']) ? $sealinfo['sealplace'] : "";
226c246
< 	$query = "SELECT marrdate, marrplace, divdate, divplace, sealdate, sealplace, living, private, branch, marrtype FROM $families_table WHERE familyID = \"$familyID\" AND gedcom = \"$tree\"";
---
> 	$query = "SELECT marrdate, marrplace, divdate, divplace, sealdate, sealplace, living, private, gedcom, branch, marrtype, husband, wife FROM $families_table WHERE familyID = \"$familyID\" AND gedcom = \"$tree\"";
229c249
< 	if( $familyID || $fam['marrtype'] ) {
---
> 	if( $familyID || !empty($fam['marrtype']) ) {
239c259
< 			$event['text'] = $text['married'];
---
> 			$event['text'] = $text['marriage'];
244a265,267
> 			$event['date'] = "";
> 			$event['place'] = "";
> 			$event['type2'] = "";
258a282,285
> 			if( !isset($eventd['date']) ) $eventd['date'] = "";
> 			if( !isset($eventd['place']) ) $eventd['place'] = "";
> 			$eventd['type'] = "";
> 			$eventd['ID'] = "";
272c299
< 	$query = "SELECT familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $families_table.living as fliving, $families_table.private as fprivate, $families_table.branch as branch, $people_table.living as living, $people_table.private as private, marrdate, marrplace, sealdate, sealplace, marrtype FROM $families_table ";
---
> 	$query = "SELECT familyID, personID, firstname, lnprefix, lastname, title, prefix, suffix, nameorder, $families_table.living as fliving, $families_table.private as fprivate, $families_table.branch as branch, $families_table.gedcom as gedcom, birthdate, birthdatetr, altbirthdate, altbirthdatetr, $people_table.living as living, $people_table.private as private, marrdate, marrplace, sealdate, sealplace, marrtype FROM $families_table ";
301c328
< 		$event['text'] = $text['married'];
---
> 		$event['text'] = $text['marriage'];
306a334,336
> 		$event['date'] = "";
> 		$event['place'] = "";
> 		$event['type2'] = "";
319,320c349,350
< 	if( $familyID ) {
< 		$query = "SELECT familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $people_table.living, $people_table.private, $people_table.branch FROM ($families_table, $people_table) WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.husband AND $people_table.gedcom = \"$tree\"";
---
> 	if( $familyID && $ind['famc'] ) {
> 		$query = "SELECT familyID, personID, firstname, lnprefix, lastname, title, prefix, suffix, nameorder, $people_table.birthdate, $people_table.birthdatetr, $people_table.altbirthdate, $people_table.altbirthdatetr, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom FROM ($families_table, $people_table) WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.husband AND $people_table.gedcom = \"$tree\"";
324,326c354,358
< 		$prights = determineLivingPrivateRights($parent, $righttree);
< 		$parent['allow_living'] = $prights['living'];
< 		$parent['allow_private'] = $prights['private'];
---
> 		$fathername = "";
> 		if($parent) {
> 			$prights = determineLivingPrivateRights($parent, $righttree);
> 			$parent['allow_living'] = $prights['living'];
> 			$parent['allow_private'] = $prights['private'];
328c360,361
< 		$fathername = getName( $parent );
---
> 			$fathername = getName( $parent );
> 		}
334c367
< 		$query = "SELECT familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $people_table.living, $people_table.private, $people_table.branch FROM ($families_table, $people_table) WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.wife AND $people_table.gedcom = \"$tree\"";
---
> 		$query = "SELECT familyID, personID, firstname, lnprefix, lastname, title, prefix, suffix, nameorder, $people_table.birthdate, $people_table.birthdatetr, $people_table.altbirthdate, $people_table.altbirthdatetr, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom FROM ($families_table, $people_table) WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.wife AND $people_table.gedcom = \"$tree\"";
338,340c371,375
< 		$prights = determineLivingPrivateRights($parent, $righttree);
< 		$parent['allow_living'] = $prights['living'];
< 		$parent['allow_private'] = $prights['private'];
---
> 		$mothername = "";
> 		if($parent) {
> 			$prights = determineLivingPrivateRights($parent, $righttree);
> 			$parent['allow_living'] = $prights['living'];
> 			$parent['allow_private'] = $prights['private'];
342c377,378
< 		$mothername = getName( $parent );
---
> 			$mothername = getName( $parent );
> 		}
346a383,385
> 	} else if ( $familyID ) {
> 		$indtext .= showFact( $text['father'], "" );
> 		$indtext .= showFact( $text['mother'], "" );
373c412
< $logname = $tngconfig['nnpriv'] && $family['private'] ? $admtext['text_private'] : ($nonames && $famrow['living'] ? $text['living'] : $famname);
---
> $logname = $tngconfig['nnpriv'] && $famrow['private'] ? $admtext['text_private'] : ($nonames && $famrow['living'] ? $text['living'] : $famname);
386d424
< $flags['tabs'] = $tngconfig['tabs'];
388a427,432
> 
> 	if($rights['both'])
> 		tng_header( $text['familygroupfor'] . " $famname $years ", $flags );
> 	else
> 		tng_header( $text['familygroupfor'] . " $famname", $flags );
> 
397,400d440
< 	if($rights['both'])
< 		tng_header( $text['familygroupfor'] . " $famname $years ", $flags );
< 	else
< 		tng_header( $text['familygroupfor'] . " $famname", $flags );
406c446
< 	$fammedia = getMedia( $famrow, "F" );
---
> 	$fammedia = getMedia( $famrow, "F", true );
428c468
< 		$label = $husbrow['sex'] != "M" ? $text['wife'] : $text['husband'];
---
> 		$label = $wiferow['sex'] != "M" ? $text['wife'] : $text['husband'];
434c474
< 	$query = "SELECT $people_table.personID as personID, branch, firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, famc, sex, birthdate, birthplace, altbirthdate, altbirthplace, haskids, deathdate, deathplace, burialdate, burialplace, burialtype, baptdate, baptplace, endldate, endlplace, sealdate, sealplace FROM $people_table, $children_table WHERE $people_table.personID = $children_table.personID AND $children_table.familyID = \"{$famrow['familyID']}\" AND $people_table.gedcom = \"$tree\" AND $children_table.gedcom = \"$tree\" ORDER BY ordernum";
---
> 	$query = "SELECT $people_table.personID as personID, branch, $people_table.gedcom as gedcom, firstname, lnprefix, lastname, title, prefix, suffix, nameorder, living, private, famc, sex, birthdate, birthdatetr, birthplace, altbirthtype, altbirthdate, altbirthdatetr, altbirthplace, haskids, deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, burialtype, baptdate, baptplace, endldate, endlplace, sealdate, sealplace FROM $people_table, $children_table WHERE $people_table.personID = $children_table.personID AND $children_table.familyID = \"{$famrow['familyID']}\" AND $people_table.gedcom = \"$tree\" AND $children_table.gedcom = \"$tree\" ORDER BY ordernum";
469c509
< 			$famtext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" width=\"100%\" class=\"whiteback\">\n";
---
> 			$famtext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" style=\"width:100%\" class=\"whiteback tfixed\">\n";
489c529
< 			$famtext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" width=\"100%\" class=\"whiteback\">\n";
---
> 			$famtext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" style=\"width:100%\" class=\"whiteback tfixed\">\n";
500c540
< 			$famtext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" width=\"100%\" class=\"whiteback\">\n";
---
> 			$famtext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" style=\"width:100%\" class=\"whiteback tfixed\">\n";
507c547
< 				$famtext .= "<li class=\"normal\"><a name=\"cite" . ++$citectr . "\"></a><span class=\"fgcite\">$cite<br />";
---
> 				$famtext .= "<li class=\"normal\"><a name=\"cite" . ++$citectr . "\"></a>$cite<br />";
510c550
< 				$famtext .= "</span></li>\n";
---
> 				$famtext .= "</li>\n";
521c561
< 		$famtext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" width=\"100%\" class=\"whiteback\">\n";
---
> 		$famtext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" style=\"width:100%\" class=\"whiteback\">\n";
529a570,571
> 	else
> 		$notes = false;
628d669
< $flags['more'] = "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/rpt_utils.js\"></script>\n";
diff -r TNG/famsearchform.php TNG1403/famsearchform.php
4c4
< if($cms['events']){include('cmsevents.php'); cms_search();}
---
> if(!empty($cms['events'])){include('cmsevents.php'); cms_search();}
10,31c10,33
< if( $_SESSION['tng_search_ftree'] ) $tree = $_SESSION['tng_search_ftree'];
< $flnqualify = $_SESSION['tng_search_flnqualify'];
< $myflastname = $_SESSION['tng_search_flastname'];
< $ffnqualify = $_SESSION['tng_search_ffnqualify'];
< $myffirstname = $_SESSION['tng_search_ffirstname'];
< $mlnqualify = $_SESSION['tng_search_mlnqualify'];
< $mymlastname = $_SESSION['tng_search_mlastname'];
< $mfnqualify = $_SESSION['tng_search_mfnqualify'];
< $mymfirstname = $_SESSION['tng_search_mfirstname'];
< $fidqualify = $_SESSION['tng_search_fidqualify'];
< $myfamilyid = $_SESSION['tng_search_familyid'];
< $mpqualify = $_SESSION['tng_search_mpqualify'];
< $mymarrplace = $_SESSION['tng_search_marrplace'];
< $myqualify = $_SESSION['tng_search_myqualify'];
< $mymarryear = $_SESSION['tng_search_marryear'];
< $dvpqualify = $_SESSION['tng_search_dvpqualify'];
< $mydivplace = $_SESSION['tng_search_divhplace'];
< $dvyqualify = $_SESSION['tng_search_dvyqualify'];
< $mydivyear = $_SESSION['tng_search_divyear'];
< $mymarrtype = $_SESSION['tng_search_marrtype'];
< $mybool = $_SESSION['tng_search_fbool'];
< $nr = $_SESSION['tng_nr'];
---
> $saved_cust_events = isset($_COOKIE['tng_search_families_post']['cust_events']) ? explode(",",stripslashes($_COOKIE['tng_search_families_post']['cust_events'])) : [];
> 
> if( isset($_SESSION['tng_search_ftree']) ) $tree = $_SESSION['tng_search_ftree'];
> $flnqualify = isset($_SESSION['tng_search_flnqualify']) ? $_SESSION['tng_search_flnqualify'] : "";
> $myflastname = isset($_SESSION['tng_search_flastname']) ? $_SESSION['tng_search_flastname'] : "";
> $ffnqualify = isset($_SESSION['tng_search_ffnqualify']) ? $_SESSION['tng_search_ffnqualify'] : "";
> $myffirstname = isset($_SESSION['tng_search_ffirstname']) ? $_SESSION['tng_search_ffirstname'] : "";
> $mlnqualify = isset($_SESSION['tng_search_mlnqualify']) ? $_SESSION['tng_search_mlnqualify'] : "";
> $mymlastname = isset($_SESSION['tng_search_mlastname']) ? $_SESSION['tng_search_mlastname'] : "";
> $mfnqualify = isset($_SESSION['tng_search_mfnqualify']) ? $_SESSION['tng_search_mfnqualify'] : "";
> $mymfirstname = isset($_SESSION['tng_search_mfirstname']) ? $_SESSION['tng_search_mfirstname'] : "";
> $fidqualify = isset($_SESSION['tng_search_fidqualify']) ? $_SESSION['tng_search_fidqualify'] : "";
> $myfamilyid = isset($_SESSION['tng_search_familyid']) ? $_SESSION['tng_search_familyid'] : "";
> $mpqualify = isset($_SESSION['tng_search_mpqualify']) ? $_SESSION['tng_search_mpqualify'] : "";
> $mymarrplace = isset($_SESSION['tng_search_marrplace']) ? $_SESSION['tng_search_marrplace'] : "";
> $myqualify = isset($_SESSION['tng_search_myqualify']) ? $_SESSION['tng_search_myqualify'] : "";
> $mymarryear = isset($_SESSION['tng_search_marryear']) ? $_SESSION['tng_search_marryear'] : "";
> $dvpqualify = isset($_SESSION['tng_search_dvpqualify']) ? $_SESSION['tng_search_dvpqualify'] : "";
> $mydivplace = isset($_SESSION['tng_search_divplace']) ? $_SESSION['tng_search_divplace'] : "";
> $dvyqualify = isset($_SESSION['tng_search_dvyqualify']) ? $_SESSION['tng_search_dvyqualify'] : "";
> $mydivyear = isset($_SESSION['tng_search_divyear']) ? $_SESSION['tng_search_divyear'] : "";
> $mymarrtype = isset($_SESSION['tng_search_marrtype']) ? $_SESSION['tng_search_marrtype'] : "";
> $mybool = isset($_SESSION['tng_search_fbool']) ? $_SESSION['tng_search_fbool'] : "";
> $nr = isset($_SESSION['tng_nr']) ? $_SESSION['tng_nr'] : $maxsearchresults;
35a38,46
> function displayToggle($id,$state,$target,$headline) {
> 	global $text;
> 
> 	$rval = "<a href=\"#\" onclick=\"return toggleSection('$target','$id');\" class=\"togglehead\" style=\"color:black\"><div class=\"subhead\"><img src=\"img/" . ($state ? "tng_collapse.gif" : "tng_expand.gif") . "\" title=\"{$text['clickdisplay']}\" alt=\"{$text['clickdisplay']}\" width=\"15\" height=\"15\" border=\"0\" id=\"$id\">";
> 	$rval .= "<strong class=\"th-indent\">$headline</strong></div></a>\n";
> 
> 	return $rval;
> }
> 
68c79
< function toggleSection( flag ) {
---
> function toggleEvSection( flag ) {
81a93,105
> function removeEvCookie( item, eventtypeID, type ) {
> 	var params = {eventtypeID: eventtypeID, type: type};
> 	jQuery.ajax({
> 		url: '<?php echo $cms['tngpath']; ?>ajx_remove_event_cookie.php',
> 		data: params,
> 		dataType: 'html',
> 		success: function(req) {
> 			$(item).hide();
> 			toggleSection('evt'+eventtypeID,'arr'+eventtypeID);
> 		}
> 	})
> }
> 
116c140
< 		if( !in_array( $row[tag], $dontdo ) ) {
---
> 		if( !in_array( $row['tag'], $dontdo ) ) {
144c168
< if($msg)
---
> if(!empty($msg))
146a171
> echo "<div class=\"titlebox\" style=\"overflow:auto\">\n";
151c176
< 	<table cellspacing="1" cellpadding="4" class="normal">
---
> 	<table cellspacing="1" cellpadding="4" class="normal rounded-table">
178c203
< 				<input type="text" name="myffirstname" value="<?php echo $myffirstname; ?>" />
---
> 				<input type="text" name="myffirstname" class="longfield" value="<?php echo $myffirstname; ?>" />
194c219
< 				<input type="text" name="myflastname" value="<?php echo $myflastname; ?>" />
---
> 				<input type="text" name="myflastname" class="longfield" value="<?php echo $myflastname; ?>" />
211c236
< 				<input type="text" name="mymfirstname" value="<?php echo $mymfirstname; ?>" />
---
> 				<input type="text" name="mymfirstname" class="longfield" value="<?php echo $mymfirstname; ?>" />
227c252
< 				<input type="text" name="mymlastname" value="<?php echo $mymlastname; ?>" />
---
> 				<input type="text" name="mymlastname" class="longfield" value="<?php echo $mymlastname; ?>" />
244c269
< 				<input type="text" name="myfamilyid" value="<?php echo $myfamilyid; ?>" />
---
> 				<input type="text" name="myfamilyid" class="longfield" value="<?php echo $myfamilyid; ?>" />
260c285
< 				<input type="text" name="mymarrplace" value="<?php echo $mymarrplace; ?>" />
---
> 				<input type="text" name="mymarrplace" class="longfield" value="<?php echo $mymarrplace; ?>" />
276c301
< 				<input type="text" name="mymarryear" value="<?php echo $mymarryear; ?>" />
---
> 				<input type="text" name="mymarryear" class="longfield" value="<?php echo $mymarryear; ?>" />
292c317
< 				<input type="text" name="mydivplace" value="<?php echo $mydivplace; ?>" />
---
> 				<input type="text" name="mydivplace" class="longfield" value="<?php echo $mydivplace; ?>" />
308c333
< 				<input type="text" name="mydivyear" value="<?php echo $mydivyear; ?>" />
---
> 				<input type="text" name="mydivyear" class="longfield" value="<?php echo $mydivyear; ?>" />
320c345
< 			    if( $mtqualify == $item[1] ) echo " selected=\"selected\"";
---
> 			    if( isset($mtqualify) && $mtqualify == $item[1] ) echo " selected=\"selected\"";
325c350
< 				<input type="text" name="mymarrtype" value="<?php echo $mymarrtype; ?>" />
---
> 				<input type="text" name="mymarrtype" class="longfield" value="<?php echo $mymarrtype; ?>" />
332d356
< 	<hr size="1" />
334,336c358,360
< 	<ul id="descendantchart" class="normal">
< 		<li id="expand" class="othersearch"><a href="#" onclick="return toggleSection(1);" class="nounderline"><img src="<?php echo $cms['tngpath']; ?>img/tng_expand.gif" alt="" width="15" height="15" border="0" class="exp-cont" /><?php echo $text['clickdisplay']; ?></a></li>
< 		<li id="contract" class="othersearch" style="display:none;"><a href="#" onclick="return toggleSection(0);" class="nounderline"><img src="<?php echo $cms['tngpath']; ?>img/tng_collapse.gif" alt="" width="15" height="15" border="0" class="exp-cont" /><?php echo $text['clickhide']; ?></a></li>
---
> 	<ul class="normal">
> 		<li id="expand" class="othersearch"><a href="#" onclick="return toggleEvSection(1);" class="nounderline"><img src="<?php echo $cms['tngpath']; ?>img/tng_expand.gif" alt="" width="15" height="15" border="0" class="exp-cont" /><?php echo $text['clickdisplay']; ?></a></li>
> 		<li id="contract" class="othersearch" style="display:none;"><a href="#" onclick="return toggleEvSection(0);" class="nounderline"><img src="<?php echo $cms['tngpath']; ?>img/tng_collapse.gif" alt="" width="15" height="15" border="0" class="exp-cont" /><?php echo $text['clickhide']; ?></a></li>
338,339c362
< 	<table style="display:none" id="otherevents">
< 	<tr><td colspan="3">&nbsp;</td></tr>
---
> 	<div id="otherevents" style="display:none">
353a377
> 		$saved_events_output = $reg_events_output = "";
355,361c379,395
< 			echo "<tr><td colspan=\"3\"><span class=\"normal\">{$row['displaymsg']}</span></td></tr>\n";
< 
< 			echo "<tr>\n";
< 			echo "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['fact']}:</span></td>\n";
< 			echo "<td>\n";
< 			//eval( "\$cfq = \$cfq$row[eventtypeID] = \$_SESSION[tng_search_cfq$row[eventtypeID]];" );
< 			echo "<select name=\"cfq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
---
> 			if(in_array($row['eventtypeID'], $saved_cust_events)) {
> 				$displaystr = "";
> 				$removestr = "{$text['remove']}";
> 			}
> 			else {
> 				$displaystr = " style=\"display:none\"";
> 				$removestr = "";
> 			}
> 			$out = "<div class=\"databack cust-event-block\">\n";
> 			$out .= "<div class=\"smallest remove-link\" onclick=\"removeEvCookie(this,'{$row['eventtypeID']}','people');\">$removestr</div>\n";
> 			$out .= displayToggle("arr{$row['eventtypeID']}",0,"evt{$row['eventtypeID']}",$row['displaymsg']);
> 			$out .= "<div id=\"evt{$row['eventtypeID']}\"{$displaystr}><br/>\n";
> 			$out .= "<table>\n";
> 			$out .= "<tr>\n";
> 			$out .= "<td style=\"padding-right:25px\"><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['fact']}:</span></td>\n";
> 			$out .= "<td>\n";
> 			$out .= "<select name=\"cfq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
363,365c397,398
< 			    echo "<option value=\"$item[1]\"";
< 			    //if( $cfq == $item[1] ) echo " SELECTED";
< 			    echo ">$item[0]</option>\n";
---
> 			    $out .= "<option value=\"$item[1]\"";
> 			    $out .= ">$item[0]</option>\n";
367,377c400,408
< 			echo "</select>\n";
< 			echo "</td>\n";
< 			//eval( "\$cef = \$cef$row[eventtypeID] = \$_SESSION[tng_search_cef$row[eventtypeID]];" );
< 			echo "<td><input type=\"text\" name=\"cef{$row['eventtypeID']}\" value=\"\" /></td>\n";
< 			echo "</tr>\n";
< 
< 			echo "<tr>\n";
< 			echo "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['place']}:</span></td>\n";
< 			echo "<td>\n";
< 			//eval( "\$cpq = \$cpq$row[eventtypeID] = \$_SESSION[tng_search_cpq$row[eventtypeID]];" );
< 			echo "<select name=\"cpq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
---
> 			$out .= "</select>\n";
> 			$out .= "</td>\n";
> 			$out .= "<td><input type=\"text\" name=\"cef{$row['eventtypeID']}\" class=\"longfield\" value=\"\" /></td>\n";
> 			$out .= "</tr>\n";
> 
> 			$out .= "<tr>\n";
> 			$out .= "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['place']}:</span></td>\n";
> 			$out .= "<td>\n";
> 			$out .= "<select name=\"cpq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
379,381c410,411
< 			    echo "<option value=\"$item[1]\"";
< 			    //if( $cpq == $item[1] ) echo " SELECTED";
< 			    echo ">$item[0]</option>\n";
---
> 			    $out .= "<option value=\"$item[1]\"";
> 			    $out .= ">$item[0]</option>\n";
383,393c413,421
< 			echo "</select>\n";
< 			echo "</td>\n";
< 			//eval( "\$cep = \$cep$row[eventtypeID] = \$_SESSION[tng_search_cep$row[eventtypeID]];" );
< 			echo "<td><input type=\"text\" name=\"cep{$row['eventtypeID']}\" value=\"\" /></td>\n";
< 			echo "</tr>\n";
< 
< 			echo "<tr>\n";
< 			echo "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['year']}:</span></td>\n";
< 			//eval( "\$cyq = \$cyq$row[eventtypeID] = \$_SESSION[tng_search_cyq$row[eventtypeID]];" );
< 			echo "<td>\n";
< 			echo "<select name=\"cyq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
---
> 			$out .= "</select>\n";
> 			$out .= "</td>\n";
> 			$out .= "<td><input type=\"text\" name=\"cep{$row['eventtypeID']}\" class=\"longfield\" value=\"\" /></td>\n";
> 			$out .= "</tr>\n";
> 
> 			$out .= "<tr>\n";
> 			$out .= "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['year']}:</span></td>\n";
> 			$out .= "<td>\n";
> 			$out .= "<select name=\"cyq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
397,399c425,426
< 				echo "<option value=\"$item[1]\"";
< 				//if( $cyq == $item[1] ) echo " SELECTED";
< 				echo ">$item[0]</option>\n";
---
> 				$out .= "<option value=\"$item[1]\"";
> 				$out .= ">$item[0]</option>\n";
402,403c429,430
< 			echo "</select>\n";
< 			echo "</td>\n";
---
> 			$out .= "</select>\n";
> 			$out .= "</td>\n";
405,407c432,444
< 			echo "<td><input type=\"text\" name=\"cey$row[eventtypeID]\" value=\"\" /></td>\n";
< 			echo "</tr>\n";
< 		}
---
> 			$out .= "<td><input type=\"text\" name=\"cey{$row['eventtypeID']}\" class=\"longfield\" value=\"\" /></td>\n";
> 			$out .= "</tr>\n";
> 			$out .= "</table>\n";
> 			$out .= "</div>\n</div>\n";
> 			if(in_array($row['eventtypeID'], $saved_cust_events))
> 				$saved_events_output .= $out;
> 			else
> 				$reg_events_output .= $out;
> 	 	}
> 	 	if(!empty($saved_events_output)) {
> 		 	echo $saved_events_output . "<br/>";
> 	 	}
> 		echo $reg_events_output;
409,415c446,447
< 		<tr class="secondsearch">
< 			<td colspan="3"><br/>
< 				<input type="button" value="<?php echo $text['search'];?>" onclick="$('searchbtn').className='fieldnamebacksave';return makeURL();" /> <input type="button" value="<?php echo $text['resetall'];?>" onclick="resetValues();" />
< 			</td>
< 		</tr>
< 	</table>
< 	<hr size="1" />
---
> 		<br/>
> 	</div>
434d465
< 			<td></td>
450d480
< 			<td></td>
453d482
< 	<p></p>
459c488
< 		<a href="<?php echo $cms['tngpath']; ?>searchform.php" class="snlink">&raquo; <?php echo $text['searchnames']; ?></a>
---
> 		<a href="<?php echo $cms['tngpath']; ?>searchform.php" class="snlink">&raquo; <?php echo $text['searchnames']; ?></a><br/>
465a495
> </div>
diff -r TNG/famsearch.php TNG1403/famsearch.php
17c17,27
< $maxsearchresults = $nr ? $nr : ($_SESSION['tng_nr'] ? $_SESSION['tng_nr'] : $maxsearchresults);
---
> $maxsearchresults = !empty($nr) ? $nr : (!empty($_SESSION['tng_nr']) ? $_SESSION['tng_nr'] : $maxsearchresults);
> if(!isset($mybool) || ($mybool != "AND" && $mybool != "OR"))
> 	$mybool = "AND";
> 
> $varlist= array('branch','dvpqualify','dvyqualify','ecount','ffnqualify','fidqualify','flnqualify','mfnqualify','mlnqualify','mpqualify','mtqualify','mydivplace','mydivyear','myfamilyid','myffirstname','myflastname','mymarrplace','mymarrtype','mymarryear','mymfirstname','mymlastname','myqualify','showdeath','showspouse','urlstring');
> foreach($varlist as $var) 
> 	if( !isset(${$var}) ) ${$var} = "";
> 		
> if( !isset($offset) ) $offset = 0;
> 
> $saved_cust_events = isset($_COOKIE['tng_search_families_post']['cust_events']) ? explode(",",stripslashes($_COOKIE['tng_search_families_post']['cust_events'])) : [];
62c72
< $_SESSION['tng_nr'] = $nr;
---
> $_SESSION['tng_nr'] = isset($nr) ? $nr : $maxsearchresults;
73c83
< $orderloc = strpos($_SERVER['QUERY_STRING'],"&order=");
---
> $orderloc = strpos($_SERVER['QUERY_STRING'],"&amp;order=");
79c89
< 	$marrsort = "<a href=\"$search_url$currargs&order=marrup\" class=\"lightlink\">{$text['married']} <img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"sortimg\" /></a>";
---
> 	$marrsort = "<a href=\"$search_url$currargs&amp;order=marrup\" class=\"lightlink\">{$text['married']} <img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"sortimg\" /></a>";
82c92
< 	$marrsort = "<a href=\"$search_url$currargs&order=marr\" class=\"lightlink\">{$text['married']} <img src=\"{$cms['tngpath']}img/tng_sort_asc.gif\" class=\"sortimg\" /></a>";
---
> 	$marrsort = "<a href=\"$search_url$currargs&amp;order=marr\" class=\"lightlink\">{$text['married']} <img src=\"{$cms['tngpath']}img/tng_sort_asc.gif\" class=\"sortimg\" /></a>";
89c99
< 	$divsort = "<a href=\"$search_url$currargs&order=divup\" class=\"lightlink\">{$text['divorced']} <img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"sortimg\" /></a>";
---
> 	$divsort = "<a href=\"$search_url$currargs&amp;order=divup\" class=\"lightlink\">{$text['divorced']} <img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"sortimg\" /></a>";
92c102
< 	$divsort = "<a href=\"$search_url$currargs&order=div\" class=\"lightlink\">{$text['divorced']} <img src=\"{$cms['tngpath']}img/tng_sort_asc.gif\" class=\"sortimg\" /></a>";
---
> 	$divsort = "<a href=\"$search_url$currargs&amp;order=div\" class=\"lightlink\">{$text['divorced']} <img src=\"{$cms['tngpath']}img/tng_sort_asc.gif\" class=\"sortimg\" /></a>";
99c109
< 	$fnamesort = "<a href=\"$search_url$currargs&order=fnameup\" class=\"lightlink\">{$text['fathername']} <img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"sortimg\" /></a>";
---
> 	$fnamesort = "<a href=\"$search_url$currargs&amp;order=fnameup\" class=\"lightlink\">{$text['fathername']} <img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"sortimg\" /></a>";
102c112
< 	$fnamesort = "<a href=\"$search_url$currargs&order=fname\" class=\"lightlink\">{$text['fathername']} <img src=\"{$cms['tngpath']}img/tng_sort_asc.gif\" class=\"sortimg\" /></a>";
---
> 	$fnamesort = "<a href=\"$search_url$currargs&amp;order=fname\" class=\"lightlink\">{$text['fathername']} <img src=\"{$cms['tngpath']}img/tng_sort_asc.gif\" class=\"sortimg\" /></a>";
109c119
< 	$mnamesort = "<a href=\"$search_url$currargs&order=mnameup\" class=\"lightlink\">{$text['mothername']} <img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"sortimg\" /></a>";
---
> 	$mnamesort = "<a href=\"$search_url$currargs&amp;order=mnameup\" class=\"lightlink\">{$text['mothername']} <img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"sortimg\" /></a>";
112c122
< 	$mnamesort = "<a href=\"$search_url$currargs&order=mname\" class=\"lightlink\">{$text['mothername']} <img src=\"{$cms['tngpath']}img/tng_sort_asc.gif\" class=\"sortimg\" /></a>";
---
> 	$mnamesort = "<a href=\"$search_url$currargs&amp;order=mname\" class=\"lightlink\">{$text['mothername']} <img src=\"{$cms['tngpath']}img/tng_sort_asc.gif\" class=\"sortimg\" /></a>";
129c139
< 	elseif( $column == "mother.lastname" )
---
> 	elseif( $column == "mother.lastname" && $lnprefixes )
189c199
< $dontdo = array("MARR","DIV");
---
> $dontdo = array(); //array("MARR","DIV");
242c252
< 	$querystring = "$text[text_for] $querystring";
---
> 	$querystring = "{$text['text_for']} $querystring";
260,261c270,271
< 	father.lastname as flastname, father.lnprefix as flnprefix, father.firstname as ffirstname, father.living as fliving, father.private as fprivate, father.branch as fbranch,
< 	mother.lastname as mlastname, mother.lnprefix as mlnprefix, mother.firstname as mfirstname, mother.living as mliving, mother.private as fprivate, mother.branch as mbranch
---
> 	father.personID as fpersonID, father.lastname as flastname, father.lnprefix as flnprefix, father.firstname as ffirstname, father.title as ftitle, father.prefix as fprefix, father.suffix as fsuffix, father.nameorder as fnameorder, father.birthdate as fbirthdate, father.birthdatetr as fbirthdatetr, father.altbirthdate as faltbirthdate, father.altbirthdatetr as faltbirthdatetr, father.deathdate as fdeathdate, father.living as fliving, father.private as fprivate, father.branch as fbranch,
> 	mother.personID as mpersonID, mother.lastname as mlastname, mother.lnprefix as mlnprefix, mother.firstname as mfirstname, mother.title as mtitle, mother.prefix as mprefix, mother.suffix as msuffix, mother.nameorder as mnameorder, mother.birthdate as mbirthdate, mother.birthdatetr as mbirthdatetr, mother.altbirthdate as maltbirthdate, mother.altbirthdatetr as maltbirthdatetr, mother.deathdate as mdeathdate, mother.living as mliving, mother.private as mprivate, mother.branch as mbranch
336c346
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"columntoggle\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback\" data-tablesaw-mode=\"columntoggle\"" . $headerr;
338c348
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"stack\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback\" data-tablesaw-mode=\"stack\"" . $headerr;
340c350
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"swipe\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback\" data-tablesaw-mode=\"swipe\"" . $headerr;
378a389,396
> 		"title" => $row['ftitle'],
> 		"prefix" => $row['fprefix'],
> 		"suffix" => $row['fsuffix'],
> 		"birthdate" => $row['fbirthdate'],
> 		"birthdatetr" => $row['fbirthdatetr'],
> 		"altbirthdate" => $row['faltbirthdate'],
> 		"altbirthdatetr" => $row['faltbirthdatetr'],
> 		"deathdate" => $row['fdeathdate'],
381c399,401
< 		"branch" => $row['fbranch']
---
> 		"personID" => $row['fpersonID'],
> 		"branch" => $row['fbranch'],
> 		"gedcom" => $row['gedcom']
390a411,418
> 		"title" => $row['mtitle'],
> 		"prefix" => $row['mprefix'],
> 		"suffix" => $row['msuffix'],
> 		"birthdate" => $row['mbirthdate'],
> 		"birthdatetr" => $row['mbirthdatetr'],
> 		"altbirthdate" => $row['maltbirthdate'],
> 		"altbirthdatetr" => $row['maltbirthdatetr'],
> 		"deathdate" => $row['mdeathdate'],
391a420
> 		"private" => $row['mprivate'],
393c422,423
< 		"private" => $row['mprivate']
---
> 		"personID" => $row['mpersonID'],
> 		"gedcom" => $row['gedcom']
diff -r TNG/fan_config.php TNG1403/fan_config.php
26c26
< $fan_width = 65;
---
> $fan_width = 85;
62c62
< $fan_info_height = 80;
---
> $fan_info_height = 85;
63a64
> $fan_info_header = "14pt Arial";
diff -r TNG/fan.php TNG1403/fan.php
9a10
> $parentset = isset($parentset) ? intval($parentset) : 0;
46c47
< $row['name'] = getName( $row );
---
> $namestr = getName( $row );
48c49
< $logname = $tngconfig['nnpriv'] && $row['private'] ? $admtext['text_private'] : ($nonames && $row['living'] ? $text['living'] : $row['name']);
---
> $logname = $tngconfig['nnpriv'] && $row['private'] ? $admtext['text_private'] : ($nonames && $row['living'] ? $text['living'] : $namestr);
59,60c60
< $flags['tabs'] = $tngconfig['tabs'];
< tng_header( "{$text['fanchart']}: {$perName[0]}  Generations: {$generations}",$flags);
---
> tng_header( "{$text['fanchart']}: {$namestr}  Generations: {$generations}",$flags);
62,63c62,63
< $photostr = showSmallPhoto( $personID, $row['name'], $rights['both'], 0, false, $row['sex'] );
< echo tng_DrawHeading( $photostr, $row['name'], getYears( $row ) );
---
> $photostr = showSmallPhoto( $personID, $namestr, $rights['both'], 0, false, $row['sex'] );
> echo tng_DrawHeading( $photostr, $namestr, getYears( $row ) );
75a76,77
> $tData=null;
> $years=null;
80c82
< for ($a=0; $a <= $generations; $a++)
---
> for ($a=0; $a < $generations; $a++)
84c86
< 		if(isset($perID[pow(2,$a)+$b-1]))
---
> 		if(!empty($perID[pow(2,$a)+$b-1]))
95a98
> 			$row['suffix'] = "";
101c104,105
< 			$bio = addslashes($perName[$tID]) . "<br>";
---
> 			$years .= "years[$tID] = ";
> 			$bio = $perName[$tID] . "<br>";
107,118c111,124
< 			$perID[$h] = $rowM['husband'];
< 			$perID[$w] = $rowM['wife'];
< 
< 			$rightsM = determineLivingPrivateRights($rowM, $righttree, $rightbranch);
< 			$rowM['allow_living'] = $rightsM['living'];
< 			$rowM['allow_private'] = $rightsM['private'];
< 
< 			if($rightsM['both'] && ($rowM['marrdate'] || $rowM['marrplace'])) {
< 				$marr = trim($text['married'] . ": " .  displayDate($rowM['marrdate']));
< 				if($rowM['marrdate'] && $rowM['marrplace']) $marr .= ", ";
< 				$marr .= $rowM['marrplace'];
< 				$marriages[$h] = $marriages[$w] = $marr;
---
> 			if(!empty($rowM)) {
> 				$perID[$h] = $rowM['husband'];
> 				$perID[$w] = $rowM['wife'];
> 
> 				$rightsM = determineLivingPrivateRights($rowM, $righttree, $rightbranch);
> 				$rowM['allow_living'] = $rightsM['living'];
> 				$rowM['allow_private'] = $rightsM['private'];
> 
> 				if($rightsM['both'] && ($rowM['marrdate'] || $rowM['marrplace'])) {
> 					$marr = trim($text['married'] . ": " .  displayDate($rowM['marrdate']));
> 					if($rowM['marrdate'] && $rowM['marrplace']) $marr .= ", ";
> 					$marr .= $rowM['marrplace'];
> 					$marriages[$h] = $marriages[$w] = $marr;
> 				}
121a128
> 
141a149,151
> 				$years .= "\"" . strip_tags(justYears($row)) . "\";\n";
> 			} else {
> 				$years .= "\"\";\n";
204c214
< <div id="fanWrapper" style="position:relative;" height="100" width="100">
---
> <div id="fanWrapper" style="position:relative;">
209c219,220
< <script>
---
> <script type="text/javascript">
> // <![CDATA[
218a230,232
> 	var years=[];
> 	{$years}
> 
238c252,271
< 	function placeWrappedText(ctx,pText,originX,originY,gens)
---
> 	var decodeHTML=(function()
> 	{
> 		var element = document.createElement('div');
> 		
> 		function decodeHTMLEntities (str) {
> 			if(str && typeof str === 'string')
> 			{
> 				// strip script/html tags
> 				str = str.replace(/<script[^>]*>([\S\s]*?)<\/script>/gmi, '');
> 				str = str.replace(/<\/?\w(?:[^"'>]|"[^"]*"|'[^']*')*>/gmi, '');
> 				element.innerHTML = str;
> 				str = element.textContent;
> 				element.textContent = '';
> 			}
> 			return str;
> 		}
> 		return decodeHTMLEntities;
> 	})();
> 
> 	function placeWrappedText(ctx,pText,years,originX,originY,gens)
240c273,274
< //		console.log("placeWrappedText: %s",pText);
---
> 		pText=decodeHTML(pText);
> 		//console.log("placeWrappedText: %s",pText);
253,254c287,304
< 			ctx.fillText(pText, originX, originY);
< //			console.log("Placing short name: %s",pText);
---
> 			if(gens > 0 && gens < 4)
> 			{
> 				originY=originY+(fan_line_height[gens]*1.1);
> 				ctx.fillText(pText, originX, originY);
> 			}
> 			else
> 			{
> 				if(years && gens > 4 && gens < 8)
> 					originY=originY-(fan_line_height[gens]*0.2);
> 				ctx.fillText(pText, originX, originY);
> 			}
> 			if(years && gens < 8) {
> 				if(gens > 5)
> 					originY=originY+fan_line_height[gens]*1.3;
> 				else
> 					originY=originY+fan_line_height[gens];
> 				ctx.fillText(years, originX, originY);
> 			}
263c313,411
< 		for (var a=0; a<=parts.length; a++)
---
> 		numDisplayLines=0;
> 		var newparts = new Array(parts[0]);
> 		for (var a=1; a <= parts.length; a++)
> 		{
> 			if(parts.length < 5 || a == 1 || a == parts.length) {
> 				if(parts.slice(start,a-1).join(' ') == '')
> 				{
> 					continue;
> 				}
> 				start=a-1;
> 				numDisplayLines=numDisplayLines+1;
> 				newparts.push(parts[start]);
> 			}
> 		}
> 		parts = newparts;
> 		//if(numDisplayLines <=2)
> 		//	numDisplayLines=numDisplayLines+1;
> 		if(years)
> 			numDisplayLines=numDisplayLines+1;
> 
> 		start=0;
> 
> 		if(gens < 7)
> 		{
> 			if(gens == 0)
> 			{
> 				//4 lines max.  set for 3
> 				if(numDisplayLines > 3)
> 				{
> 					originY=originY-fan_line_height[gens];
> 				}
> 			}
> 			if(gens == 1)
> 			{
> 				//4 lines max.  set for 4
> 				if(numDisplayLines > 4)
> 				{
> 					originY=originY-(fan_line_height[gens]*(4/numDisplayLines));
> 				}
> 				if(numDisplayLines < 4)
> 				{
> 					originY=originY+(fan_line_height[gens]*((4-numDisplayLines)/numDisplayLines));
> 				}
> 			}
> 			else if(gens == 2)
> 			{
> 				//5 lines max.  set for 5
> 				if(numDisplayLines < 5)
> 				{
> 					originY=originY+(fan_line_height[gens]*((5-numDisplayLines)/numDisplayLines));
> 				}
> 			}
> 			else if(gens == 3)
> 			{
> 				//5 lines max.  set for 4
> 				if(numDisplayLines > 4)
> 				{
> 					originY=originY-(fan_line_height[gens]);
> 				}
> 				if(numDisplayLines == 4)
> 				{
> 					//originY=originY-(fan_line_height[gens]/2);
> 				}
> 				if(numDisplayLines < 4)
> 				{
> 					originY=originY+(fan_line_height[gens]*((4-numDisplayLines)/numDisplayLines));
> 				}
> 			}
> 			else if(gens == 4)
> 			{
> 				//5 lines max.  set for 2
> 				if(numDisplayLines > 2)
> 				{
> 					originY=originY-(fan_line_height[gens]*((numDisplayLines-1)*0.5));
> 				}
> 			}
> 			else if(gens == 5)
> 			{
> 				//4 lines max.  set for 2
> 				if(numDisplayLines > 2)
> 				{
> 					originY=originY-(fan_line_height[gens]*((numDisplayLines-1)*0.5));
> 				}
> 			}
> 			else if(gens == 6)
> 			{
> 				//3 lines max.  set for 2
> 				if(numDisplayLines > 2)
> 				{
> 					originY=originY-(fan_line_height[gens]*((numDisplayLines-2)*0.5));
> 				}
> 			}
> 			else
> 			{
> 				//To get here would be an error
> 			}
> 		}
> 
> 		for (var a=1; a <= parts.length; a++)
268a417,420
> 			if(parts.slice(start,a-1).join(' ') === '')
> 			{
> 				continue;
> 			}
270d421
< //			console.log("(%f,%f) printted %s",originX,originY,parts.slice(start,a-1).join(' '));
275c426,429
< //		console.log("(%f,%f) printted %s",originX,originY,parts.slice(start,parts.length).join(' '));
---
> 		if(years && gens < 8) {
> 			originY=originY+fan_line_height[gens];
> 			ctx.fillText(years, originX, originY);
> 		}
284,285d437
< 	document.getElementById('fanWrapper').style.width=ctx.canvas.width;
< 	document.getElementById('fanWrapper').style.height=ctx.canvas.height;
432c584
< 				placeWrappedText(ctx,pText,originX,originY-width/3,a);
---
> 				placeWrappedText(ctx,pText,years[pID],originX,originY-width/3,a);
447c599
< 				placeWrappedText(ctx,pText, 0, -1*(generationDistance(a+1)+generationDistance(a))/div,a);
---
> 				placeWrappedText(ctx,pText,years[pID], 0, -1*(generationDistance(a+1)+generationDistance(a))/div,a);
462c614,616
< 				placeWrappedText(ctx,pText,0,0,a);
---
> 				// var thisyear = a < 7 ? years[pID] : '';
> 				// placeWrappedText(ctx,pText,thisyear,0,0,a);
> 				placeWrappedText(ctx,pText,years[pID],0,0,a);
468a623,633
> 	stylePaddingLeft = 0;
> 	stylePaddingTop  = 1;
> 	styleBorderLeft  = 0;
> 	styleBorderTop   = 1;
> //	// Some pages have fixed-position bars (like the stumbleupon bar) at the top or left of the page
> //	// They will mess up mouse coordinates and this fixes that
> //  // Code here is used to remove the vague issues right at the edges of the fan chart
> 	var html = document.body.parentNode;
> 	htmlTop = html.offsetTop;
> 	htmlLeft = html.offsetLeft;
> 
471,472c636,637
< 		var X = event.clientX - rect.left;
< 		var Y = event.clientY - rect.top;
---
> 		var X = event.clientX - rect.left - styleBorderLeft - stylePaddingLeft - htmlLeft;
> 		var Y = event.clientY - rect.top - styleBorderTop - stylePaddingTop - htmlTop;
500d664
< 
513,514c677,678
< 		var X = event.clientX - fanRect.left;
< 		var Y = event.clientY - fanRect.top;
---
> 		var X = event.clientX - fanRect.left - styleBorderLeft - stylePaddingLeft - htmlLeft;
> 		var Y = event.clientY - fanRect.top - styleBorderTop - stylePaddingTop - htmlTop;
544,545c708,721
< 		var left=event.clientX - fanRect.left;
< 		var top=event.clientY - fanRect.top;
---
> 		var left=event.clientX - fanRect.left - styleBorderLeft - stylePaddingLeft - htmlLeft;
> 		var top=event.clientY - fanRect.top - styleBorderTop - stylePaddingTop - htmlTop;
> 
> 		//Pre-determine canvas size
> 		var infocanvaswidth = {$fan_info_width};
> 		var parts=tData[perID].split('<br>');
> 		ctx.font = '{$fan_info_header}';
> 		for (var p = 0; p < parts.length; p++)
> 		{
> 			parts[p]=decodeHTML(parts[p]);
> 			if (ctx.measureText(parts[p]).width+14 > infocanvaswidth)
> 				infocanvaswidth=ctx.measureText(parts[p]).width+14;
> 				ctx.font = '{$fan_info_style}';
> 		}
548c724,733
< 			left=left-{$fan_info_width}-15;
---
> 		{
> 			if ( (fanCanvas.getContext("2d").canvas.width-infocanvaswidth-15) < 0 )
> 				left = 15;
> 			else {
> 				if ( (left-infocanvaswidth-15) < 0)
> 					left = 15;
> 				else
> 					left = left-infocanvaswidth-15;
> 			}
> 		}
550c735,746
< 			left += 15;
---
> 		{
> 			if ( (left+infocanvaswidth+15) > fanCanvas.getContext("2d").canvas.width )
> 			{
> 				if ((infocanvaswidth) > fanCanvas.getContext("2d").canvas.width)
> 					left = 15;
> 				else {
> 					left = fanCanvas.getContext("2d").canvas.width-infocanvaswidth;
> 				}
> 			}
> 			else
> 				left += 15;
> 		}
559c755
< 			canvas.width={$fan_info_width};
---
> 			canvas.width=infocanvaswidth;
567c763
< 		var parts=tData[perID].split('<br>');
---
> 		//var parts=tData[perID].split('<br>');
569,573c765,769
< 		for (var p = 0; p < parts.length; p++)
< 		{
< 			if (ctx.measureText(parts[p]).width+10 > canvas.width)
< 				canvas.width=ctx.measureText(parts[p]).width+10;
< 		}
---
> 		//for (var p = 0; p < parts.length; p++)
> 		//{
> 		//	if (ctx.measureText(parts[p]).width+10 > canvas.width)
> 		//		canvas.width=ctx.measureText(parts[p]).width+10;
> 		//}
575c771,772
< 		ctx.font = '{$fan_info_style}';
---
> 		ctx.font = '{$fan_info_header}';
> 		var q = 0;
578c775,781
< 			ctx.fillText(parts[p], 5, 5+(p+1)*14);
---
> 			ctx.fillText(parts[p], 5, 5+(q+1)*14);
> 			if(q == 0) {
> 				q = q + 1
> 				ctx.fillText(' ', 5, 5+(q+1)*14);
> 			}
> 			q = q + 1;
> 			ctx.font = '{$fan_info_style}';
589a793
> echo("//]]>\n");
diff -r TNG/featuretemplate.php TNG1403/featuretemplate.php
12c12
< //1a: If you want to skip the login check when displaying this page, remote the comment marks from this line:
---
> //1a: If you want to skip the login check when displaying this page, remove the comment marks from this line:
31a32
> echo "<h1 class=\"header\">$yourtitle</h1><br clear=\"left\"/>\n";
diff -r TNG/findalbummedia.php TNG1403/findalbummedia.php
50c50
<    			if( $treerow['gedcom'] == $tree ) echo " selected";
---
> 			if( isset($tree) && $treerow['gedcom'] == $tree ) echo " selected";
57c57
< 			<td><input type="text" name="searchstring" value="<?php echo $searchstring; ?>" id="searchstring">
---
> 			<td><input type="text" name="searchstring" value="<?php if( isset($searchstring) ) echo $searchstring; ?>" id="searchstring">
83c83
< 				<option selected></option>
---
> 				<option value="" selected="selected"></option>
90c90
< 	if( $cemeteryID == $cemrow['cemeteryID'] ) echo " selected";
---
> 	if( isset($cemeteryID) && $cemeteryID == $cemrow['cemeteryID'] ) echo " selected";
diff -r TNG/findcemetery.php TNG1403/findcemetery.php
95c95,97
< <body background="img/background.gif">
---
> <?php
> 	echo tng_adminlayout();
> ?>
124c126
< 	echo "<p>$admtext[matches]: $numrows</p>";
---
> 	echo "<p>{$admtext['matches']}: $numrows</p>";
172,174c174,176
< <?php echo "<div align=\"right\"><span class=\"normal\">$tng_title, v.$tng_version</span></div>"; ?>
< </body>
< </html>
---
> <?php 
> echo tng_adminfooter();
> ?>
diff -r TNG/findciteform.php TNG1403/findciteform.php
30c30
< 		   	<td><?php echo $admtext['title']; ?>: </td>
---
> 		   	<td><?php echo $admtext['title2']; ?>: </td>
diff -r TNG/findfamilyform.php TNG1403/findfamilyform.php
10c10
< if($mediaID)
---
> if(!empty($mediaID))
12c12
< else if($albumID)
---
> else if(!empty($albumID))
16a17
> if(!isset($branch)) $branch = "";
35,38c36,39
< 			<td><input type="text" name="myhusbname" id="myhusbname" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myhusbname',myhusbname:jQuery('#myhusbname').val(),mywifename:jQuery('#mywifename').val(),myfamilyID:jQuery('#myfamilyID').val(),type:'F',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"></td>
< 			<td><input type="text" name="mywifename" id="mywifename" onkeyup="filterChanged(event, {form:'findform1',fieldId:'mywifename',myhusbname:jQuery('#myhusbname').val(),mywifename:jQuery('#mywifename').val(),myfamilyID:jQuery('#myfamilyID').val(),type:'F',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"></td>
< 			<td><input type="text" name="myfamilyID" id="myfamilyID" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myfamilyID',myhusbname:jQuery('#myhusbname').val(),mywifename:jQuery('#mywifename').val(),myfamilyID:jQuery('#myfamilyID').val(),type:'F',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});">
< 				<input type="submit" value="<?php echo $admtext['search']; ?>"> <input type="button" value="<?php echo $bailtext; ?>" onclick="gotoSection(seclitbox, null);"></td>
---
> 			<td><input type="text" name="myhusbname" id="myhusbname" class="shortfield" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myhusbname',myhusbname:jQuery('#myhusbname').val(),mywifename:jQuery('#mywifename').val(),myfamilyID:jQuery('#myfamilyID').val(),type:'F',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"/></td>
> 			<td><input type="text" name="mywifename" id="mywifename" class="shortfield" onkeyup="filterChanged(event, {form:'findform1',fieldId:'mywifename',myhusbname:jQuery('#myhusbname').val(),mywifename:jQuery('#mywifename').val(),myfamilyID:jQuery('#myfamilyID').val(),type:'F',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"/></td>
> 			<td><input type="text" name="myfamilyID" id="myfamilyID" class="veryshortfield" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myfamilyID',myhusbname:jQuery('#myhusbname').val(),mywifename:jQuery('#mywifename').val(),myfamilyID:jQuery('#myfamilyID').val(),type:'F',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"/>
> 				<input type="submit" value="<?php echo $admtext['search']; ?>"/> <input type="button" value="<?php echo $bailtext; ?>" onclick="gotoSection(seclitbox, null);"/></td>
diff -r TNG/findform.php TNG1403/findform.php
59c59
< 		<tr><td class="normal"><?php echo $admtext['title']; ?></td></tr>
---
> 		<tr><td class="normal"><?php echo $admtext['title2']; ?></td></tr>
74c74
< 		<tr><td class="normal"><?php echo $admtext['title']; ?></td></tr>
---
> 		<tr><td class="normal"><?php echo $admtext['title2']; ?></td></tr>
diff -r TNG/finditems.php TNG1403/finditems.php
24c24,27
< if($albumID) {
---
> if(!isset($albumID)) $albumID = "";
> if(!isset($mediaID)) $mediaID = "";
> 
> if($albumID){
68,69c71,72
< 		$myffirstname = trim($myffirstname);
< 		$myflastname = trim($myflastname);
---
> 		$myffirstname = addslashes(trim($myffirstname));
> 		$myflastname = addslashes(trim($myflastname));
89c92
< 		$more = getLivingPrivateRestrictions("", $myffirstname, $false);
---
> 		$more = getLivingPrivateRestrictions("", $myffirstname, false);
97c100
< 		$query = "SELECT personID, lastname, firstname, lnprefix, birthdate, altbirthdate, deathdate, burialdate, prefix, suffix, nameorder, living, private, branch, gedcom FROM $people_table WHERE $allwhere ORDER BY lastname, lnprefix, firstname LIMIT 250";
---
> 		$query = "SELECT personID, lastname, firstname, lnprefix, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, burialdate, title, prefix, suffix, nameorder, living, private, branch, gedcom FROM $people_table WHERE $allwhere ORDER BY lastname, lnprefix, firstname LIMIT 250";
101c104
<             $lines .= "<tr>\n";
---
>             $lines = "<tr>\n";
137c140
<                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['personID']}');\" id=\"item_{$row['personID']}\">$namestr</a>&nbsp;</td>\n";
---
>                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['personID']}','I');\" id=\"item_{$row['personID']}\">$namestr</a>&nbsp;</td>\n";
185,186c188,192
< 		$query = "SELECT familyID, wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder, wifepeople.living as wliving, wifepeople.private as wprivate, wifepeople.branch as wbranch,
< 			husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder, husbpeople.living as hliving, husbpeople.private as hprivate, husbpeople.branch as hbranch FROM $families_table $joinonwife $joinonhusb WHERE $allwhere $allwhere2 ORDER BY hlastname, hlnprefix, hfirstname LIMIT 250";
---
> 		//$query = "SELECT familyID, wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder, wifepeople.living as wliving, wifepeople.private as wprivate, wifepeople.branch as wbranch,
> 		//	husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder, husbpeople.living as hliving, husbpeople.private as hprivate, husbpeople.branch as hbranch FROM $families_table $joinonwife $joinonhusb WHERE $allwhere $allwhere2 ORDER BY hlastname, hlnprefix, hfirstname LIMIT 250";
> 		$query = "SELECT familyID, wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname, wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, wifepeople.nameorder as wnameorder, wifepeople.title as wtitle, wifepeople.birthdate as wbirthdate, wifepeople.birthdatetr as wbirthdatetr, wifepeople.altbirthdate as waltbirthdate, wifepeople.altbirthdatetr as waltbirthdatetr, wifepeople.deathdate as wdeathdate, wifepeople.living as wliving, wifepeople.private as wprivate, wifepeople.branch as wbranch, wifepeople.gedcom as wgedcom,
> 			husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname, husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, husbpeople.nameorder as hnameorder, husbpeople.title as htitle, husbpeople.birthdate as hbirthdate, husbpeople.birthdatetr as hbirthdatetr, husbpeople.altbirthdate as haltbirthdate, husbpeople.altbirthdatetr as haltbirthdatetr, husbpeople.deathdate as hdeathdate, husbpeople.living as hliving, husbpeople.private as hprivate, husbpeople.branch as hbranch, husbpeople.gedcom as hgedcom 
> 			FROM $families_table $joinonwife $joinonhusb WHERE $allwhere $allwhere2 ORDER BY hlastname, hlnprefix, hfirstname LIMIT 250";
200,207c206,222
<                     $person['firstname'] = $row['hfirstname'];
<                     $person['lnprefix'] = $row['hlnprefix'];
<                     $person['lastname'] = $row['hlastname'];
<                     $person['suffix'] = $row['hsuffix'];
<                     $person['nameorder'] = $row['hnameorder'];
<                     $person['living'] = $row['hliving'];
<                     $person['private'] = $row['hprivate'];
<                     $person['branch'] = $row['hbranch'];
---
> 					$person['personID'] = $row['hpersonID'];
> 					$person['firstname'] = $row['hfirstname'];
> 					$person['lnprefix'] = $row['hlnprefix'];
> 					$person['lastname'] = $row['hlastname'];
> 					$person['prefix'] = $row['hprefix'];
> 					$person['suffix'] = $row['hsuffix'];
> 					$person['nameorder'] = $row['hnameorder'];
> 					$person['title'] = $row['htitle'];
> 					$person['birthdate'] = $row['hbirthdate'];
> 					$person['birthdatetr'] = $row['hbirthdatetr'];
> 					$person['altbirthdate'] = $row['haltbirthdate'];
> 					$person['altbirthdatetr'] = $row['haltbirthdatetr'];
> 					$person['deathdate'] = $row['hdeathdate'];
> 					$person['living'] = $row['hliving'];
> 					$person['private'] = $row['hprivate'];
> 					$person['branch'] = $row['hbranch'];
> 					$person['gedcom'] = $row['hgedcom'];
211c226
<                     $thishusb = getName( $person );
---
> 					$thishusb = getName( $person );
214,222c229,246
<                     if( $thisfamily ) $thisfamily .= "<br/>";
<                     $person['firstname'] = $row['wfirstname'];
<                     $person['lnprefix'] = $row['wlnprefix'];
<                     $person['lastname'] = $row['wlastname'];
<                     $person['suffix'] = $row['wsuffix'];
<                     $person['nameorder'] = $row['wnameorder'];
<                     $person['living'] = $row['wliving'];
<                     $person['private'] = $row['wprivate'];
<                     $person['branch'] = $row['wbranch'];
---
> 					if(!empty($thisfamily)) $thisfamily .= "<br/>";
> 					$person['personID'] = $row['wpersonID'];
> 					$person['firstname'] = $row['wfirstname'];
> 					$person['lnprefix'] = $row['wlnprefix'];
> 					$person['lastname'] = $row['wlastname'];
> 					$person['prefix'] = $row['wprefix'];
> 					$person['suffix'] = $row['wsuffix'];
> 					$person['nameorder'] = $row['wnameorder'];
> 					$person['title'] = $row['wtitle'];
> 					$person['birthdate'] = $row['wbirthdate'];
> 					$person['birthdatetr'] = $row['wbirthdatetr'];
> 					$person['altbirthdate'] = $row['waltbirthdate'];
> 					$person['altbirthdatetr'] = $row['waltbirthdatetr'];
> 					$person['deathdate'] = $row['wdeathdate'];
> 					$person['living'] = $row['wliving'];
> 					$person['private'] = $row['wprivate'];
> 					$person['branch'] = $row['wbranch'];
> 					$person['gedcom'] = $row['wgedcom'];
226c250
<                     $thiswife = getName( $person );
---
> 					$thiswife = getName( $person );
232c256
<                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['familyID']}');\" id=\"item_{$row['familyID']}\">$thishusb</a>&nbsp;</td>\n";
---
>                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['familyID']}','F');\" id=\"item_{$row['familyID']}\">$thishusb</a>&nbsp;</td>\n";
245c269
<             $lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title'] . "</b>&nbsp;</td>\n";
---
>             $lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title2'] . "</b>&nbsp;</td>\n";
254c278
<                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['sourceID']}');\" id=\"item_{$row['sourceID']}\">" . truncateIt($title,100) . "</a>&nbsp;</td></tr>\n";
---
>                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['sourceID']}','S');\" id=\"item_{$row['sourceID']}\">" . truncateIt($title,100) . "</a>&nbsp;</td></tr>\n";
272c296
<             $lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title'] . "</b>&nbsp;</td>\n";
---
>             $lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title2'] . "</b>&nbsp;</td>\n";
285c309
<                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['citationID']}');\" id=\"item_{$row['citationID']}\">" . truncateIt($title,100) . "</a>&nbsp;</td>\n";
---
>                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['citationID']}','C');\" id=\"item_{$row['citationID']}\">" . truncateIt($title,100) . "</a>&nbsp;</td>\n";
301c325
<             $lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title'] . "</b>&nbsp;</td>\n";
---
>             $lines .= "<td class=\"fieldnameback fieldname nw\">&nbsp;<b>" . $admtext['title2'] . "</b>&nbsp;</td>\n";
309c333
<                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['repoID']}');\" id=\"item_{$row['repoID']}\">" . truncateIt($row['reponame'],75) . "</a>&nbsp;</td></tr>\n";
---
>                 $lines .= "<td class=\"lightback\"><a href=\"#\" onclick=\"return retItem('{$row['repoID']}','R');\" id=\"item_{$row['repoID']}\">" . truncateIt($row['reponame'],75) . "</a>&nbsp;</td></tr>\n";
317c341
<         if($temple)
---
>         if(!empty($temple))
336c360
<         		$lines .= "<td class=\"lightback\"><a href=\"#\" onclick='return retItem(\"{$row['ID']}\",true);' class=\"rplace\" id=\"item_{$row['ID']}\">{$row['place']}</a>$notes&nbsp;</td></tr>\n";
---
>         		$lines .= "<td class=\"lightback\"><a href=\"#\" onclick='return retItem(\"{$row['ID']}\",\"L\",true);' class=\"rplace\" id=\"item_{$row['ID']}\">{$row['place']}</a>$notes&nbsp;</td></tr>\n";
diff -r TNG/findpersonform2.php TNG1403/findpersonform2.php
12c12
< 	$subtitle = $admtext[enternamepart2];
---
> 	$subtitle = $admtext['enternamepart2'];
16c16
< 	$subtitle = $admtext[enternamepart];
---
> 	$subtitle = $admtext['enternamepart'];
diff -r TNG/findpersonform.php TNG1403/findpersonform.php
10c10
< if( $type == "map" ) {
---
> if( isset($type) && $type == "map" ) {
17c17
< if($mediaID)
---
> if(!empty($mediaID))
19c19
< else if($albumID)
---
> else if(!empty($albumID))
24a25,26
> if(!isset($branch))
> 	$branch = "";
42,45c44,47
< 			<td><input type="text" name="myffirstname" id="myffirstname" tabindex="1" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myffirstname',myflastname:jQuery('#myflastname').val(),myffirstname:jQuery('#myffirstname').val(),myfpersonID:jQuery('#myfpersonID').val(),type:'I',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"></td>
< 			<td><input type="text" name="myflastname" id="myflastname" tabindex="2" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myflastname',myflastname:jQuery('#myflastname').val(),myffirstname:jQuery('#myffirstname').val(),myfpersonID:jQuery('#myfpersonID').val(),type:'I',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"></td>
< 			<td><input type="text" name="myfpersonID" id="myfpersonID" tabindex="3" class="veryshortfield" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myfpersonID',myflastname:jQuery('#myflastname').val(),myffirstname:jQuery('#myffirstname').val(),myfpersonID:jQuery('#myfpersonID').val(),type:'I',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});">
< 				<input type="submit" value="<?php echo $admtext['search']; ?>"> <input type="button" value="<?php echo $bailtext; ?>" onclick="gotoSection(seclitbox, null);"></td>
---
> 			<td><input type="text" name="myffirstname" id="myffirstname" class="shortfield" tabindex="1" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myffirstname',myflastname:jQuery('#myflastname').val(),myffirstname:jQuery('#myffirstname').val(),myfpersonID:jQuery('#myfpersonID').val(),type:'I',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"/></td>
> 			<td><input type="text" name="myflastname" id="myflastname" class="shortfield" tabindex="2" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myflastname',myflastname:jQuery('#myflastname').val(),myffirstname:jQuery('#myffirstname').val(),myfpersonID:jQuery('#myfpersonID').val(),type:'I',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"/></td>
> 			<td><input type="text" name="myfpersonID" id="myfpersonID" tabindex="3" class="veryshortfield" onkeyup="filterChanged(event, {form:'findform1',fieldId:'myfpersonID',myflastname:jQuery('#myflastname').val(),myffirstname:jQuery('#myffirstname').val(),myfpersonID:jQuery('#myfpersonID').val(),type:'I',tree:'<?php echo $tree; ?>',branch:'<?php echo $branch; ?>',destdiv:'findresults'<?php echo $mediaoption; ?>});"/>
> 				<input type="submit" value="<?php echo $admtext['search']; ?>"/> <input type="button" value="<?php echo $bailtext; ?>" onclick="gotoSection(seclitbox, null);"/></td>
diff -r TNG/findperson.php TNG1403/findperson.php
90c90
< 		$namestr = addslashes( preg_replace('/\"/',"&#34;",getName( $row ) . ($birthdatestr ? " (" . displayDate($birthdate) . ")" : "") . " - $row[personID]"));
---
> 		$namestr = addslashes( preg_replace('/\"/',"&#34;",getName( $row ) . ($birthdatestr ? " (" . displayDate($birthdate) . ")" : "") . " - {$row['personID']}"));
diff -r TNG/findplaceform.php TNG1403/findplaceform.php
13c13
< if($mediaID)
---
> if(!empty($mediaID))
15c15
< else if($albumID)
---
> else if(!empty($albumID))
35c35
< 			<td><input type="submit" value="<?php echo $admtext['search']; ?>"> <input type="button" value="<?php echo $bailtext; ?>" onclick="gotoSection(seclitbox, null);"></td>
---
> 			<td><input type="submit" value="<?php echo $admtext['search']; ?>"/> <input type="button" value="<?php echo $bailtext; ?>" onclick="gotoSection(seclitbox, null);"/></td>
43c43
< 	if($temple) {
---
> 	if(!empty($temple)) {
diff -r TNG/findrepoform.php TNG1403/findrepoform.php
30c30
< 		   	<td><?php echo $admtext['title']; ?>: </td>
---
> 		   	<td><?php echo $admtext['title2']; ?>: </td>
diff -r TNG/findsourceform.php TNG1403/findsourceform.php
30c30
< 		   	<td><?php echo $admtext['title']; ?>: </td>
---
> 		   	<td><?php echo $admtext['title2']; ?>: </td>
diff -r TNG/firstnames100.php TNG1403/firstnames100.php
5c5
< $topnum = preg_replace("/[^0-9]/", '', $topnum);
---
> $topnum = isset($topnum) ? preg_replace("/[^0-9]/", '', $topnum) : "100";
diff -r TNG/firstnames-all.php TNG1403/firstnames-all.php
81,84c81
< $firstnamestr = $lnprefixes ? "TRIM(CONCAT_WS(' ',lnprefix,firstname) )" : "firstname";
< if($tngconfig['ucfirstnames'])
< 	$firstnamestr = "ucase($firstnamestr)";
< $query = "SELECT ucase( $binary $firstnamestr ) as firstname, $firstnamestr as lowername, ucase($binary firstname) as binlast, count( ucase($binary firstname) ) as lncount FROM $people_table WHERE ucase($binary TRIM(firstname)) LIKE \"$urlfirstchar%\" $wherestr2 GROUP BY lowername ORDER by binlast";
---
> $query = "SELECT ucase( SUBSTRING_INDEX( firstname, ' ', 1 ) ) as firstname, SUBSTRING_INDEX( firstname, ' ', 1 ) as lowername, ucase($binary firstname) as binlast, count( ucase($binary firstname) ) as lncount FROM $people_table WHERE ucase($binary TRIM(firstname)) LIKE \"$urlfirstchar%\" $wherestr2 GROUP BY lowername ORDER by binlast";
diff -r TNG/firstnames-oneletter.php TNG1403/firstnames-oneletter.php
11,12c11,12
< $firstchar = mb_substr($firstchar,0,1,$charset);
< $decodedfirstchar = stripslashes(urldecode($firstchar));
---
> $primaryfirstchar = !empty($firstchar) ? mb_substr($firstchar,0,1,$charset) : "";
> $decodedfirstchar = stripslashes(urldecode($primaryfirstchar));
16c16
< $logstring = "<a href=\"$firstnames_oneletter_url" . "firstchar=$firstchar&amp;tree=$tree\">" . xmlcharacters($text['firstnamelist'] . ": {$text['beginswith']} $decodedfirstchar$treestr") . "</a>";
---
> $logstring = "<a href=\"$firstnames_oneletter_url" . "firstchar=$primaryfirstchar&amp;tree=$tree\">" . xmlcharacters($text['firstnamelist'] . ": {$text['beginswith']} $decodedfirstchar$treestr") . "</a>";
20a21,58
> $wherestr = $tree ? "WHERE gedcom = \"$tree\"" : "";
> $treestr = $orgtree ? "&amp;tree=$tree" : "";
> 
> $allwhere = getLivingPrivateRestrictions($people_table, false, false);
> 
> if( $allwhere ) {
> 	$wherestr .= $wherestr ? " AND $allwhere" : "WHERE $allwhere";
> }
> 
> $linkstr = "";
> $nofirstname = urlencode($text['nofirstname']);
> $query = "SELECT ucase(left(firstname,1)) as firstchar, ucase( left(firstname,1) ) as binfirstchar, count( ucase( left( firstname,1) ) ) as lncount FROM $people_table $wherestr GROUP BY binfirstchar ORDER by binfirstchar";
> $result = tng_query($query);
> if( $result ) {
> 	$initialchar = 1;
> 	
> 	while( $firstname = tng_fetch_assoc( $result ) ) {
> 		if( $initialchar != 1 ) { 
> 			$linkstr .= " ";
> 		}
> 		if($session_charset == "UTF-8" && function_exists('mb_substr'))
> 			$firstchar = mb_substr($firstname['firstchar'],0,1,'UTF-8');
> 		else
> 			$firstchar = substr($firstname['firstchar'],0,1);
> 		$firstchar = strtoupper($firstchar);
> 		if( $firstchar == "" )
> 			$linkstr .= "<a href=\"$search_url" . "myfirstname=$nofirstname&amp;fnqualify=startswith&amp;mybool=AND$treestr\" class=\"snlink\">" . $text['nofirstname'] . "</a> ";
> 		else {
> 			//$urlfirstchar = urlencode($firstname[firstchar]);
> 			$urlfirstchar = $firstchar;
> 			//if($charset == "UTF-8") $firstname[firstchar] = utf8_encode($firstname[firstchar]);
> 			$countstr = $text['firstnamesstarting'] . ": " . $firstchar . " (" . number_format($firstname['lncount']) . " " . $text['totalnames'] . ")";
> 			$linkstr .= "<a href=\"$firstnames_oneletter_url" . "firstchar=$urlfirstchar$treestr\" class=\"snlink\" title=\"$countstr\">{$firstchar}</a>";
> 		}
> 		$initialchar++;
> 	}
> 	tng_free_result($result);
> }
25c63
< $hiddenfields[] = array('name' => 'firstchar', 'value' => $firstchar);
---
> $hiddenfields[] = array('name' => 'firstchar', 'value' => $primaryfirstchar);
28a67,73
> <div class="titlebox normal">
> 	<p class="subhead"><strong><?php echo $text['firstnamesstarting']; ?></strong></p>
> 	<p class="firstchars"><?php echo $linkstr; ?></p>
> 	<br/><?php echo "<a href=\"$firstnames_all_url" . "tree=$tree\">{$text['showallfirstnames']}</a> ({$text['sortedalpha']}) &nbsp; | &nbsp; <a href=\"$firstnames_url" . "tree=$tree\">{$text['mainfirstnamepage']}</a>"; ?>
> </div>
> 
> <br />
32d76
< 	<p class="smaller"><?php echo $text['showmatchingfirstnames'] . "&nbsp;&nbsp;&nbsp;<a href=\"$firstnames_url" . "tree=$tree\">{$text['mainfirstnamepage']}</a> &nbsp;|&nbsp; <a href=\"$firstnames_all_url" . "tree=$tree\">{$text['showallfirstnames']}</a>"; ?></p>
34c78
< <table class="sntable">
---
> <table class="sntable normal">
45,49c89,90
< $firstnamestr = $lnprefixes ? "TRIM(CONCAT_WS(' ',lnprefix,firstname) )" : "firstname";
< if($tngconfig['ucfirstnames'])
< 	$firstnamestr = "ucase($firstnamestr)";
< $firstchar = $firstchar == "\"" ? "\\\"" : $firstchar;
< $query = "SELECT ucase( $binary $firstnamestr ) as firstname, $firstnamestr as lowername, ucase($binary firstname) as binlast, count( ucase($binary firstname) ) as lncount FROM $people_table WHERE ucase($binary TRIM(firstname)) LIKE \"$firstchar%\" $wherestr GROUP BY lowername ORDER by binlast";
---
> $primaryfirstchar = $primaryfirstchar == "\"" ? "\\\"" : $primaryfirstchar;
> $query = "SELECT ucase( SUBSTRING_INDEX( firstname, ' ', 1 ) ) as firstname, SUBSTRING_INDEX( firstname, ' ', 1 ) as lowername, ucase($binary firstname) as binlast, count( ucase($binary firstname) ) as lncount FROM $people_table WHERE ucase($binary TRIM(firstname)) LIKE \"$primaryfirstchar%\" $wherestr GROUP BY lowername ORDER by binlast";
63c104
< 		$name = $firstname['firstname'] ? "<a href=\"$search_url" . "myfirstname=$firstname2&amp;lnqualify=equals&amp;mybool=AND$treestr\">{$firstname['lowername']}</a>" : $text['nofirstname'];
---
> 		$name = $firstname['firstname'] ? "<a href=\"$search_url" . "myfirstname=$firstname2&amp;fnqualify=startswith&amp;mybool=AND$treestr\">{$firstname['lowername']}</a>" : $text['nofirstname'];
diff -r TNG/firstnames.php TNG1403/firstnames.php
10c10
< $treestr = $tree ? " ($text[tree]: $tree)" : "";
---
> $treestr = $tree ? " ({$text['tree']}: $tree)" : "";
42,44c42
< 	$wherestr .= $wherestr ? " AND $allwhere" : "WHERE $allwhere";
< 	$wherestr2 .= " AND $allwhere";
< }
---
> 	$wherestr .= $wherestr ? " AND $allwhere" : "WHERE $allwhere";}
61c59
< 			$linkstr .= "<a href=\"$search_url" . "myfirstname=$nofirstname&amp;fnqualify=equals&amp;mybool=AND$treestr\" class=\"snlink\">" . $text['nofirstname'] . "</a> ";
---
> 			$linkstr .= "<a href=\"$search_url" . "myfirstname=$nofirstname&amp;fnqualify=startswith&amp;mybool=AND$treestr\" class=\"snlink\">" . $text['nofirstname'] . "</a> ";
96a95
> 		if(!isset($linkstr2col[$col])) $linkstr2col[$col] = "";
diff -r TNG/font/courier/courierbi.php TNG1403/font/courier/courierbi.php
1,9c1,8
< <?php
< $name='Courier-BoldOblique';
< $type='core';
< $up=-100;
< $ut=50;
< for($i=0;$i<=255;$i++)
< 	$cw[chr($i)]=600;
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Courier-BoldOblique';
> $up = -100;
> $ut = 50;
> for($i=0;$i<=255;$i++)
> 	$cw[chr($i)] = 600;
> ?>
diff -r TNG/font/courier/courierb.php TNG1403/font/courier/courierb.php
1,9c1,8
< <?php
< $name='Courier-Bold';
< $type='core';
< $up=-100;
< $ut=50;
< for($i=0;$i<=255;$i++)
< 	$cw[chr($i)]=600;
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Courier-Bold';
> $up = -100;
> $ut = 50;
> for($i=0;$i<=255;$i++)
> 	$cw[chr($i)] = 600;
> ?>
diff -r TNG/font/courier/courieri.php TNG1403/font/courier/courieri.php
1,9c1,8
< <?php
< $name='Courier-Oblique';
< $type='core';
< $up=-100;
< $ut=50;
< for($i=0;$i<=255;$i++)
< 	$cw[chr($i)]=600;
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Courier-Oblique';
> $up = -100;
> $ut = 50;
> for($i=0;$i<=255;$i++)
> 	$cw[chr($i)] = 600;
> ?>
diff -r TNG/font/courier/courier.php TNG1403/font/courier/courier.php
1,9c1,8
< <?php
< $name='Courier';
< $type='core';
< $up=-100;
< $ut=50;
< for($i=0;$i<=255;$i++)
< 	$cw[chr($i)]=600;
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Courier';
> $up = -100;
> $ut = 50;
> for($i=0;$i<=255;$i++)
> 	$cw[chr($i)] = 600;
> ?>
Only in TNG/font/courier: utf8
diff -r TNG/font/helvetica/helveticabi.php TNG1403/font/helvetica/helveticabi.php
1,32c1,19
< <?php
< $name='Helvetica-BoldOblique';
< $type='core';
< $up=-100;
< $ut=50;
< $cw=array(
< 
< 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
< 
< 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
< 
< 	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
< 
< 	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
< 
< 	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
< 
< 	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
< 
< 	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
< 
< 	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
< 
< 	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
< 
< 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
< 
< 	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
< 
< 	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Helvetica-BoldOblique';
> $up = -100;
> $ut = 50;
> $cw = array(
> 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
> 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
> 	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
> 	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
> 	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
> 	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
> 	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
> 	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
> 	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
> 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
> 	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
> 	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
> ?>
diff -r TNG/font/helvetica/helveticab.php TNG1403/font/helvetica/helveticab.php
1,32c1,19
< <?php
< $name='Helvetica-Bold';
< $type='core';
< $up=-100;
< $ut=50;
< $cw=array(
< 
< 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
< 
< 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
< 
< 	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
< 
< 	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
< 
< 	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
< 
< 	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
< 
< 	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
< 
< 	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
< 
< 	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
< 
< 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
< 
< 	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
< 
< 	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Helvetica-Bold';
> $up = -100;
> $ut = 50;
> $cw = array(
> 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
> 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
> 	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
> 	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
> 	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
> 	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
> 	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
> 	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
> 	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
> 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
> 	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
> 	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
> ?>
diff -r TNG/font/helvetica/helveticai.php TNG1403/font/helvetica/helveticai.php
1,19c1,19
< <?php
< $name='Helvetica-Oblique';
< $type='core';
< $up=-100;
< $ut=50;
< $cw=array(
< 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
< 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
< 	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
< 	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
< 	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
< 	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
< 	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
< 	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
< 	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
< 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
< 	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
< 	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Helvetica-Oblique';
> $up = -100;
> $ut = 50;
> $cw = array(
> 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
> 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
> 	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
> 	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
> 	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
> 	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
> 	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
> 	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
> 	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
> 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
> 	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
> 	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
> ?>
diff -r TNG/font/helvetica/helvetica.php TNG1403/font/helvetica/helvetica.php
1,32c1,19
< <?php
< $name='Helvetica';
< $type='core';
< $up=-100;
< $ut=50;
< $cw=array(
< 
< 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
< 
< 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
< 
< 	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
< 
< 	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
< 
< 	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
< 
< 	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
< 
< 	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
< 
< 	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
< 
< 	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
< 
< 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
< 
< 	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
< 
< 	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Helvetica';
> $up = -100;
> $ut = 50;
> $cw = array(
> 	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
> 	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
> 	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
> 	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
> 	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
> 	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
> 	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
> 	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
> 	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
> 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
> 	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
> 	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
> ?>
Only in TNG/font/helvetica: utf8
diff -r TNG/font/times/timesbi.php TNG1403/font/times/timesbi.php
1,32c1,19
< <?php
< $name='Times-BoldItalic';
< $type='core';
< $up=-100;
< $ut=50;
< $cw=array(
< 
< 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
< 
< 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
< 
< 	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
< 
< 	'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
< 
< 	'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
< 
< 	'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
< 
< 	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
< 
< 	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333,
< 
< 	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
< 
< 	chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
< 
< 	chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
< 
< 	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Times-BoldItalic';
> $up = -100;
> $ut = 50;
> $cw = array(
> 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
> 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
> 	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
> 	'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
> 	'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
> 	'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
> 	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
> 	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333,
> 	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
> 	chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
> 	chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
> 	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
> ?>
diff -r TNG/font/times/timesb.php TNG1403/font/times/timesb.php
1,32c1,19
< <?php
< $name='Times-Bold';
< $type='core';
< $up=-100;
< $ut=50;
< $cw=array(
< 
< 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
< 
< 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
< 
< 	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
< 
< 	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
< 
< 	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
< 
< 	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
< 
< 	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
< 
< 	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
< 
< 	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
< 
< 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
< 
< 	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
< 
< 	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Times-Bold';
> $up = -100;
> $ut = 50;
> $cw = array(
> 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
> 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
> 	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
> 	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
> 	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
> 	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
> 	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
> 	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
> 	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
> 	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
> 	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
> 	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
> ?>
diff -r TNG/font/times/timesi.php TNG1403/font/times/timesi.php
1,32c1,19
< <?php
< $name='Times-Italic';
< $type='core';
< $up=-100;
< $ut=50;
< $cw=array(
< 
< 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
< 
< 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
< 
< 	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
< 
< 	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
< 
< 	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
< 
< 	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
< 
< 	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
< 
< 	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
< 
< 	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
< 
< 	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
< 
< 	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
< 
< 	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Times-Italic';
> $up = -100;
> $ut = 50;
> $cw = array(
> 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
> 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
> 	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
> 	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
> 	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
> 	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
> 	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
> 	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
> 	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
> 	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
> 	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
> 	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
> ?>
diff -r TNG/font/times/times.php TNG1403/font/times/times.php
1,32c1,19
< <?php
< $name='Times-Roman';
< $type='core';
< $up=-100;
< $ut=50;
< $cw=array(
< 
< 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
< 
< 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
< 
< 	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
< 
< 	'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
< 
< 	'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
< 
< 	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
< 
< 	chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
< 
< 	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
< 
< 	chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
< 
< 	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
< 
< 	chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
< 
< 	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
< 
< ?>
---
> <?php
> $type = 'Core';
> $name = 'Times-Roman';
> $up = -100;
> $ut = 50;
> $cw = array(
> 	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
> 	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
> 	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
> 	'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
> 	'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
> 	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
> 	chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
> 	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
> 	chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
> 	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
> 	chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
> 	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
> ?>
Only in TNG/font/times: utf8
Only in TNG/font/unifont/DejaVuSans: dejavusansbi.ttf
Only in TNG1403/font/unifont/DejaVuSans: DejaVuSansBI.ttf
Only in TNG/font/unifont/DejaVuSans: DejaVuSansb.ttf
Only in TNG1403/font/unifont/DejaVuSans: DejaVuSansB.ttf
Only in TNG/font/unifont/DejaVuSans: dejavusansi.ttf
Only in TNG1403/font/unifont/DejaVuSans: DejaVuSansI.ttf
Binary files TNG/font/unifont/DejaVuSans/DejaVuSans.ttf and TNG1403/font/unifont/DejaVuSans/DejaVuSans.ttf differ
Only in TNG/font/unifont/DejaVuSansCondensed: DejaVuSansCondensedbi.ttf
Only in TNG1403/font/unifont/DejaVuSansCondensed: DejaVuSansCondensedBI.ttf
Only in TNG/font/unifont/DejaVuSansCondensed: DejaVuSansCondensedb.ttf
Only in TNG1403/font/unifont/DejaVuSansCondensed: DejaVuSansCondensedB.ttf
Only in TNG/font/unifont/DejaVuSansCondensed: DejaVuSansCondensedi.ttf
Only in TNG1403/font/unifont/DejaVuSansCondensed: DejaVuSansCondensedI.ttf
Binary files TNG/font/unifont/DejaVuSansCondensed/DejaVuSansCondensed.ttf and TNG1403/font/unifont/DejaVuSansCondensed/DejaVuSansCondensed.ttf differ
Only in TNG/font/unifont/DejaVuSansMono: DejaVuSansMonobi.ttf
Only in TNG1403/font/unifont/DejaVuSansMono: DejaVuSansMonoBI.ttf
Only in TNG/font/unifont/DejaVuSansMono: DejaVuSansMonob.ttf
Only in TNG1403/font/unifont/DejaVuSansMono: DejaVuSansMonoB.ttf
Only in TNG/font/unifont/DejaVuSansMono: DejaVuSansMonoi.ttf
Only in TNG1403/font/unifont/DejaVuSansMono: DejaVuSansMonoI.ttf
Binary files TNG/font/unifont/DejaVuSansMono/DejaVuSansMono.ttf and TNG1403/font/unifont/DejaVuSansMono/DejaVuSansMono.ttf differ
Only in TNG/font/unifont/DejaVuSerif: DejaVuSerifbi.ttf
Only in TNG1403/font/unifont/DejaVuSerif: DejaVuSerifBI.ttf
Only in TNG/font/unifont/DejaVuSerif: DejaVuSerifb.ttf
Only in TNG1403/font/unifont/DejaVuSerif: DejaVuSerifB.ttf
Only in TNG/font/unifont/DejaVuSerif: DejaVuSerifi.ttf
Only in TNG1403/font/unifont/DejaVuSerif: DejaVuSerifI.ttf
Binary files TNG/font/unifont/DejaVuSerif/DejaVuSerif.ttf and TNG1403/font/unifont/DejaVuSerif/DejaVuSerif.ttf differ
Only in TNG/font/unifont/DejaVuSerifCondensed: DejaVuSerifCondensedbi.ttf
Only in TNG1403/font/unifont/DejaVuSerifCondensed: DejaVuSerifCondensedBI.ttf
Only in TNG/font/unifont/DejaVuSerifCondensed: DejaVuSerifCondensedb.ttf
Only in TNG1403/font/unifont/DejaVuSerifCondensed: DejaVuSerifCondensedB.ttf
Only in TNG/font/unifont/DejaVuSerifCondensed: DejaVuSerifCondensedi.ttf
Only in TNG1403/font/unifont/DejaVuSerifCondensed: DejaVuSerifCondensedI.ttf
Binary files TNG/font/unifont/DejaVuSerifCondensed/DejaVuSerifCondensed.ttf and TNG1403/font/unifont/DejaVuSerifCondensed/DejaVuSerifCondensed.ttf differ
diff -r TNG/font/unifont/ttfonts.php TNG1403/font/unifont/ttfonts.php
1,1089c1,1090
< <?php
< 
< 
< /*******************************************************************************
< * TTFontFile class                                                             *
< *                                                                              *
< * This class is based on The ReportLab Open Source PDF library                 *
< * written in Python - http://www.reportlab.com/software/opensource/            *
< * together with ideas from the OpenOffice source code and others.              *
< *                                                                              *
< * Version:  1.04                                                               *
< * Date:     2011-09-18                                                         *
< * Author:   Ian Back <ianb@bpm1.com>                                           *
< * License:  LGPL                                                               *
< * Copyright (c) Ian Back, 2010                                                 *
< * This header must be retained in any redistribution or                        *
< * modification of the file.                                                    *
< *                                                                              *
< *******************************************************************************/
< 
< // Define the value used in the "head" table of a created TTF file
< // 0x74727565 "true" for Mac
< // 0x00010000 for Windows
< // Either seems to work for a font embedded in a PDF file
< // when read by Adobe Reader on a Windows PC(!)
< define("_TTF_MAC_HEADER", false);
< 
< 
< // TrueType Font Glyph operators
< define("GF_WORDS",(1 << 0));
< define("GF_SCALE",(1 << 3));
< define("GF_MORE",(1 << 5));
< define("GF_XYSCALE",(1 << 6));
< define("GF_TWOBYTWO",(1 << 7));
< 
< 
< 
< class TTFontFile {
< 
< var $maxUni;
< var $_pos;
< var $numTables;
< var $searchRange;
< var $entrySelector;
< var $rangeShift;
< var $tables;
< var $otables;
< var $filename;
< var $fh;
< var $hmetrics;
< var $glyphPos;
< var $charToGlyph;
< var $ascent;
< var $descent;
< var $name;
< var $familyName;
< var $styleName;
< var $fullName;
< var $uniqueFontID;
< var $unitsPerEm;
< var $bbox;
< var $capHeight;
< var $stemV;
< var $italicAngle;
< var $flags;
< var $underlinePosition;
< var $underlineThickness;
< var $charWidths;
< var $defaultWidth;
< var $maxStrLenRead;
< 
< 	function TTFontFile() {
< 		$this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
< 	}
< 
< 
< 	function getMetrics($file) {
< 		$this->filename = $file;
< 		$this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
< 		$this->_pos = 0;
< 		$this->charWidths = '';
< 		$this->glyphPos = array();
< 		$this->charToGlyph = array();
< 		$this->tables = array();
< 		$this->otables = array();
< 		$this->ascent = 0;
< 		$this->descent = 0;
< 		$this->TTCFonts = array();
< 		$this->version = $version = $this->read_ulong();
< 		if ($version==0x4F54544F) 
< 			die("Postscript outlines are not supported");
< 		if ($version==0x74746366) 
< 			die("ERROR - TrueType Fonts Collections not supported");
< 		if (!in_array($version, array(0x00010000,0x74727565)))
< 			die("Not a TrueType font: version=".$version);
< 		$this->readTableDirectory();
< 		$this->extractInfo();
< 		fclose($this->fh);
< 	}
< 
< 
< 	function readTableDirectory() {
< 	    $this->numTables = $this->read_ushort();
<             $this->searchRange = $this->read_ushort();
<             $this->entrySelector = $this->read_ushort();
<             $this->rangeShift = $this->read_ushort();
<             $this->tables = array();	
<             for ($i=0;$i<$this->numTables;$i++) {
<                 $record = array();
<                 $record['tag'] = $this->read_tag();
<                 $record['checksum'] = array($this->read_ushort(),$this->read_ushort());
<                 $record['offset'] = $this->read_ulong();
<                 $record['length'] = $this->read_ulong();
<                 $this->tables[$record['tag']] = $record;
< 		}
< 	}
< 
< 
< 	function sub32($x, $y) {
< 		$xlo = $x[1];
< 		$xhi = $x[0];
< 		$ylo = $y[1];
< 		$yhi = $y[0];
< 		if ($ylo > $xlo) { $xlo += 1 << 16; $yhi += 1; }
< 		$reslo = $xlo-$ylo;
< 		if ($yhi > $xhi) { $xhi += 1 << 16;  }
< 		$reshi = $xhi-$yhi;
< 		$reshi = $reshi & 0xFFFF;
< 		return array($reshi, $reslo);
< 	}
< 
< 	function calcChecksum($data)  {
< 		if (strlen($data) % 4) { $data .= str_repeat("\0",(4-(strlen($data) % 4))); }
< 		$hi=0x0000;
< 		$lo=0x0000;
< 		for($i=0;$i<strlen($data);$i+=4) {
< 			$hi += (ord($data[$i])<<8) + ord($data[$i+1]);
< 			$lo += (ord($data[$i+2])<<8) + ord($data[$i+3]);
< 			$hi += $lo >> 16;
< 			$lo = $lo & 0xFFFF;
< 			$hi = $hi & 0xFFFF;
< 		}
< 		return array($hi, $lo);
< 	}
< 
< 	function get_table_pos($tag) {
< 		$offset = $this->tables[$tag]['offset'];
< 		$length = $this->tables[$tag]['length'];
< 		return array($offset, $length);
< 	}
< 
< 	function seek($pos) {
< 		$this->_pos = $pos;
< 		fseek($this->fh,$this->_pos);
< 	}
< 
< 	function skip($delta) {
< 		$this->_pos = $this->_pos + $delta;
< 		fseek($this->fh,$this->_pos);
< 	}
< 
< 	function seek_table($tag, $offset_in_table = 0) {
< 		$tpos = $this->get_table_pos($tag);
< 		$this->_pos = $tpos[0] + $offset_in_table;
< 		fseek($this->fh, $this->_pos);
< 		return $this->_pos;
< 	}
< 
< 	function read_tag() {
< 		$this->_pos += 4;
< 		return fread($this->fh,4);
< 	}
< 
< 	function read_short() {
< 		$this->_pos += 2;
< 		$s = fread($this->fh,2);
< 		$a = (ord($s[0])<<8) + ord($s[1]);
< 		if ($a & (1 << 15) ) { $a = ($a - (1 << 16)) ; }
< 		return $a;
< 	}
< 
< 	function unpack_short($s) {
< 		$a = (ord($s[0])<<8) + ord($s[1]);
< 		if ($a & (1 << 15) ) { 
< 			$a = ($a - (1 << 16)); 
< 		}
< 		return $a;
< 	}
< 
< 	function read_ushort() {
< 		$this->_pos += 2;
< 		$s = fread($this->fh,2);
< 		return (ord($s[0])<<8) + ord($s[1]);
< 	}
< 
< 	function read_ulong() {
< 		$this->_pos += 4;
< 		$s = fread($this->fh,4);
< 		// if large uInt32 as an integer, PHP converts it to -ve
< 		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
< 	}
< 
< 	function get_ushort($pos) {
< 		fseek($this->fh,$pos);
< 		$s = fread($this->fh,2);
< 		return (ord($s[0])<<8) + ord($s[1]);
< 	}
< 
< 	function get_ulong($pos) {
< 		fseek($this->fh,$pos);
< 		$s = fread($this->fh,4);
< 		// iF large uInt32 as an integer, PHP converts it to -ve
< 		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
< 	}
< 
< 	function pack_short($val) {
< 		if ($val<0) { 
< 			$val = abs($val);
< 			$val = ~$val;
< 			$val += 1;
< 		}
< 		return pack("n",$val); 
< 	}
< 
< 	function splice($stream, $offset, $value) {
< 		return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value));
< 	}
< 
< 	function _set_ushort($stream, $offset, $value) {
< 		$up = pack("n", $value);
< 		return $this->splice($stream, $offset, $up);
< 	}
< 
< 	function _set_short($stream, $offset, $val) {
< 		if ($val<0) { 
< 			$val = abs($val);
< 			$val = ~$val;
< 			$val += 1;
< 		}
< 		$up = pack("n",$val); 
< 		return $this->splice($stream, $offset, $up);
< 	}
< 
< 	function get_chunk($pos, $length) {
< 		fseek($this->fh,$pos);
< 		if ($length <1) { return ''; }
< 		return (fread($this->fh,$length));
< 	}
< 
< 	function get_table($tag) {
< 		list($pos, $length) = $this->get_table_pos($tag);
< 		if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
< 		fseek($this->fh,$pos);
< 		return (fread($this->fh,$length));
< 	}
< 
< 	function add($tag, $data) {
< 		if ($tag == 'head') {
< 			$data = $this->splice($data, 8, "\0\0\0\0");
< 		}
< 		$this->otables[$tag] = $data;
< 	}
< 
< 
< 
< /////////////////////////////////////////////////////////////////////////////////////////
< /////////////////////////////////////////////////////////////////////////////////////////
< 
< /////////////////////////////////////////////////////////////////////////////////////////
< 
< 	function extractInfo() {
< 		///////////////////////////////////
< 		// name - Naming table
< 		///////////////////////////////////
< 			$this->sFamilyClass = 0;
< 			$this->sFamilySubClass = 0;
< 
< 			$name_offset = $this->seek_table("name");
< 			$format = $this->read_ushort();
< 			if ($format != 0)
< 				die("Unknown name table format ".$format);
< 			$numRecords = $this->read_ushort();
< 			$string_data_offset = $name_offset + $this->read_ushort();
< 			$names = array(1=>'',2=>'',3=>'',4=>'',6=>'');
< 			$K = array_keys($names);
< 			$nameCount = count($names);
< 			for ($i=0;$i<$numRecords; $i++) {
< 				$platformId = $this->read_ushort();
< 				$encodingId = $this->read_ushort();
< 				$languageId = $this->read_ushort();
< 				$nameId = $this->read_ushort();
< 				$length = $this->read_ushort();
< 				$offset = $this->read_ushort();
< 				if (!in_array($nameId,$K)) continue;
< 				$N = '';
< 				if ($platformId == 3 && $encodingId == 1 && $languageId == 0x409) { // Microsoft, Unicode, US English, PS Name
< 					$opos = $this->_pos;
< 					$this->seek($string_data_offset + $offset);
< 					if ($length % 2 != 0)
< 						die("PostScript name is UTF-16BE string of odd length");
< 					$length /= 2;
< 					$N = '';
< 					while ($length > 0) {
< 						$char = $this->read_ushort();
< 						$N .= (chr($char));
< 						$length -= 1;
< 					}
< 					$this->_pos = $opos;
< 					$this->seek($opos);
< 				}
< 				else if ($platformId == 1 && $encodingId == 0 && $languageId == 0) { // Macintosh, Roman, English, PS Name
< 					$opos = $this->_pos;
< 					$N = $this->get_chunk($string_data_offset + $offset, $length);
< 					$this->_pos = $opos;
< 					$this->seek($opos);
< 				}
< 				if ($N && $names[$nameId]=='') {
< 					$names[$nameId] = $N;
< 					$nameCount -= 1;
< 					if ($nameCount==0) break;
< 				}
< 			}
< 			if ($names[6])
< 				$psName = $names[6];
< 			else if ($names[4])
< 				$psName = preg_replace('/ /','-',$names[4]);
< 			else if ($names[1])
< 				$psName = preg_replace('/ /','-',$names[1]);
< 			else
< 				$psName = '';
< 			if (!$psName)
< 				die("Could not find PostScript font name");
< 			$this->name = $psName;
< 			if ($names[1]) { $this->familyName = $names[1]; } else { $this->familyName = $psName; }
< 			if ($names[2]) { $this->styleName = $names[2]; } else { $this->styleName = 'Regular'; }
< 			if ($names[4]) { $this->fullName = $names[4]; } else { $this->fullName = $psName; }
< 			if ($names[3]) { $this->uniqueFontID = $names[3]; } else { $this->uniqueFontID = $psName; }
< 			if ($names[6]) { $this->fullName = $names[6]; }
< 
< 		///////////////////////////////////
< 		// head - Font header table
< 		///////////////////////////////////
< 		$this->seek_table("head");
< 		$this->skip(18); 
< 		$this->unitsPerEm = $unitsPerEm = $this->read_ushort();
< 		$scale = 1000 / $unitsPerEm;
< 		$this->skip(16);
< 		$xMin = $this->read_short();
< 		$yMin = $this->read_short();
< 		$xMax = $this->read_short();
< 		$yMax = $this->read_short();
< 		$this->bbox = array(($xMin*$scale), ($yMin*$scale), ($xMax*$scale), ($yMax*$scale));
< 		$this->skip(3*2);
< 		$indexToLocFormat = $this->read_ushort();
< 		$glyphDataFormat = $this->read_ushort();
< 		if ($glyphDataFormat != 0)
< 			die('Unknown glyph data format '.$glyphDataFormat);
< 
< 		///////////////////////////////////
< 		// hhea metrics table
< 		///////////////////////////////////
< 		// ttf2t1 seems to use this value rather than the one in OS/2 - so put in for compatibility
< 		if (isset($this->tables["hhea"])) {
< 			$this->seek_table("hhea");
< 			$this->skip(4);
< 			$hheaAscender = $this->read_short();
< 			$hheaDescender = $this->read_short();
< 			$this->ascent = ($hheaAscender *$scale);
< 			$this->descent = ($hheaDescender *$scale);
< 		}
< 
< 		///////////////////////////////////
< 		// OS/2 - OS/2 and Windows metrics table
< 		///////////////////////////////////
< 		if (isset($this->tables["OS/2"])) {
< 			$this->seek_table("OS/2");
< 			$version = $this->read_ushort();
< 			$this->skip(2);
< 			$usWeightClass = $this->read_ushort();
< 			$this->skip(2);
< 			$fsType = $this->read_ushort();
< 			if ($fsType == 0x0002 || ($fsType & 0x0300) != 0) {
< 				die('ERROR - Font file '.$this->filename.' cannot be embedded due to copyright restrictions.');
< 				$this->restrictedUse = true;
< 			}
< 			$this->skip(20);
< 			$sF = $this->read_short();
< 			$this->sFamilyClass = ($sF >> 8);
< 			$this->sFamilySubClass = ($sF & 0xFF);
< 			$this->_pos += 10;  //PANOSE = 10 byte length
< 			$panose = fread($this->fh,10);
< 			$this->skip(26);
< 			$sTypoAscender = $this->read_short();
< 			$sTypoDescender = $this->read_short();
< 			if (!$this->ascent) $this->ascent = ($sTypoAscender*$scale);
< 			if (!$this->descent) $this->descent = ($sTypoDescender*$scale);
< 			if ($version > 1) {
< 				$this->skip(16);
< 				$sCapHeight = $this->read_short();
< 				$this->capHeight = ($sCapHeight*$scale);
< 			}
< 			else {
< 				$this->capHeight = $this->ascent;
< 			}
< 		}
< 		else {
< 			$usWeightClass = 500;
< 			if (!$this->ascent) $this->ascent = ($yMax*$scale);
< 			if (!$this->descent) $this->descent = ($yMin*$scale);
< 			$this->capHeight = $this->ascent;
< 		}
< 		$this->stemV = 50 + intval(pow(($usWeightClass / 65.0),2));
< 
< 		///////////////////////////////////
< 		// post - PostScript table
< 		///////////////////////////////////
< 		$this->seek_table("post");
< 		$this->skip(4); 
< 		$this->italicAngle = $this->read_short() + $this->read_ushort() / 65536.0;
< 		$this->underlinePosition = $this->read_short() * $scale;
< 		$this->underlineThickness = $this->read_short() * $scale;
< 		$isFixedPitch = $this->read_ulong();
< 
< 		$this->flags = 4;
< 
< 		if ($this->italicAngle!= 0) 
< 			$this->flags = $this->flags | 64;
< 		if ($usWeightClass >= 600)
< 			$this->flags = $this->flags | 262144;
< 		if ($isFixedPitch)
< 			$this->flags = $this->flags | 1;
< 
< 		///////////////////////////////////
< 		// hhea - Horizontal header table
< 		///////////////////////////////////
< 		$this->seek_table("hhea");
< 		$this->skip(32); 
< 		$metricDataFormat = $this->read_ushort();
< 		if ($metricDataFormat != 0)
< 			die('Unknown horizontal metric data format '.$metricDataFormat);
< 		$numberOfHMetrics = $this->read_ushort();
< 		if ($numberOfHMetrics == 0) 
< 			die('Number of horizontal metrics is 0');
< 
< 		///////////////////////////////////
< 		// maxp - Maximum profile table
< 		///////////////////////////////////
< 		$this->seek_table("maxp");
< 		$this->skip(4); 
< 		$numGlyphs = $this->read_ushort();
< 
< 
< 		///////////////////////////////////
< 		// cmap - Character to glyph index mapping table
< 		///////////////////////////////////
< 		$cmap_offset = $this->seek_table("cmap");
< 		$this->skip(2);
< 		$cmapTableCount = $this->read_ushort();
< 		$unicode_cmap_offset = 0;
< 		for ($i=0;$i<$cmapTableCount;$i++) {
< 			$platformID = $this->read_ushort();
< 			$encodingID = $this->read_ushort();
< 			$offset = $this->read_ulong();
< 			$save_pos = $this->_pos;
< 			if (($platformID == 3 && $encodingID == 1) || $platformID == 0) { // Microsoft, Unicode
< 				$format = $this->get_ushort($cmap_offset + $offset);
< 				if ($format == 4) {
< 					if (!$unicode_cmap_offset) $unicode_cmap_offset = $cmap_offset + $offset;
< 					break;
< 				}
< 			}
< 			$this->seek($save_pos );
< 		}
< 		if (!$unicode_cmap_offset)
< 			die('Font ('.$this->filename .') does not have cmap for Unicode (platform 3, encoding 1, format 4, or platform 0, any encoding, format 4)');
< 
< 
< 		$glyphToChar = array();
< 		$charToGlyph = array();
< 		$this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph );
< 
< 		///////////////////////////////////
< 		// hmtx - Horizontal metrics table
< 		///////////////////////////////////
< 		$this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale);
< 
< 	}
< 
< 
< /////////////////////////////////////////////////////////////////////////////////////////
< /////////////////////////////////////////////////////////////////////////////////////////
< 
< 
< 	function makeSubset($file, &$subset) {
< 		$this->filename = $file;
< 		$this->fh = fopen($file ,'rb') or die('Can\'t open file ' . $file);
< 		$this->_pos = 0;
< 		$this->charWidths = '';
< 		$this->glyphPos = array();
< 		$this->charToGlyph = array();
< 		$this->tables = array();
< 		$this->otables = array();
< 		$this->ascent = 0;
< 		$this->descent = 0;
< 		$this->skip(4);
< 		$this->maxUni = 0;
< 		$this->readTableDirectory();
< 
< 
< 		///////////////////////////////////
< 		// head - Font header table
< 		///////////////////////////////////
< 		$this->seek_table("head");
< 		$this->skip(50); 
< 		$indexToLocFormat = $this->read_ushort();
< 		$glyphDataFormat = $this->read_ushort();
< 
< 		///////////////////////////////////
< 		// hhea - Horizontal header table
< 		///////////////////////////////////
< 		$this->seek_table("hhea");
< 		$this->skip(32); 
< 		$metricDataFormat = $this->read_ushort();
< 		$orignHmetrics = $numberOfHMetrics = $this->read_ushort();
< 
< 		///////////////////////////////////
< 		// maxp - Maximum profile table
< 		///////////////////////////////////
< 		$this->seek_table("maxp");
< 		$this->skip(4);
< 		$numGlyphs = $this->read_ushort();
< 
< 
< 		///////////////////////////////////
< 		// cmap - Character to glyph index mapping table
< 		///////////////////////////////////
< 		$cmap_offset = $this->seek_table("cmap");
< 		$this->skip(2);
< 		$cmapTableCount = $this->read_ushort();
< 		$unicode_cmap_offset = 0;
< 		for ($i=0;$i<$cmapTableCount;$i++) {
< 			$platformID = $this->read_ushort();
< 			$encodingID = $this->read_ushort();
< 			$offset = $this->read_ulong();
< 			$save_pos = $this->_pos;
< 			if (($platformID == 3 && $encodingID == 1) || $platformID == 0) { // Microsoft, Unicode
< 				$format = $this->get_ushort($cmap_offset + $offset);
< 				if ($format == 4) {
< 					$unicode_cmap_offset = $cmap_offset + $offset;
< 					break;
< 				}
< 			}
< 			$this->seek($save_pos );
< 		}
< 
< 		if (!$unicode_cmap_offset)
< 			die('Font ('.$this->filename .') does not have cmap for Unicode (platform 3, encoding 1, format 4, or platform 0, any encoding, format 4)');
< 
< 
< 		$glyphToChar = array();
< 		$charToGlyph = array();
< 		$this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph );
< 
< 		$this->charToGlyph = $charToGlyph;
< 
< 		///////////////////////////////////
< 		// hmtx - Horizontal metrics table
< 		///////////////////////////////////
< 		$scale = 1;	// not used
< 		$this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale);
< 
< 		///////////////////////////////////
< 		// loca - Index to location
< 		///////////////////////////////////
< 		$this->getLOCA($indexToLocFormat, $numGlyphs);
< 
< 		$subsetglyphs = array(0=>0); 
< 		$subsetCharToGlyph = array();
< 		foreach($subset AS $code) {
< 			if (isset($this->charToGlyph[$code])) {
< 				$subsetglyphs[$this->charToGlyph[$code]] = $code;	// Old Glyph ID => Unicode
< 				$subsetCharToGlyph[$code] = $this->charToGlyph[$code];	// Unicode to old GlyphID
< 
< 			}
< 			$this->maxUni = max($this->maxUni, $code);
< 		}
< 
< 		list($start,$dummy) = $this->get_table_pos('glyf');
< 
< 		$glyphSet = array();
< 		ksort($subsetglyphs);
< 		$n = 0;
< 		$fsLastCharIndex = 0;	// maximum Unicode index (character code) in this font, according to the cmap subtable for platform ID 3 and platform- specific encoding ID 0 or 1.
< 		foreach($subsetglyphs AS $originalGlyphIdx => $uni) {
< 			$fsLastCharIndex = max($fsLastCharIndex , $uni);
< 			$glyphSet[$originalGlyphIdx] = $n;	// old glyphID to new glyphID
< 			$n++;
< 		}
< 
< 		ksort($subsetCharToGlyph);
< 		foreach($subsetCharToGlyph AS $uni => $originalGlyphIdx) {
< 			$codeToGlyph[$uni] = $glyphSet[$originalGlyphIdx] ;
< 		}
< 		$this->codeToGlyph = $codeToGlyph;
< 
< 		ksort($subsetglyphs);
< 		foreach($subsetglyphs AS $originalGlyphIdx => $uni) {
< 			$this->getGlyphs($originalGlyphIdx, $start, $glyphSet, $subsetglyphs);
< 		}
< 
< 		$numGlyphs = $numberOfHMetrics = count($subsetglyphs );
< 
< 		//tables copied from the original
< 		$tags = array ('name');
< 		foreach($tags AS $tag) { $this->add($tag, $this->get_table($tag)); }
< 		$tags = array ('cvt ', 'fpgm', 'prep', 'gasp');
< 		foreach($tags AS $tag) {
< 			if (isset($this->tables[$tag])) { $this->add($tag, $this->get_table($tag)); }
< 		}
< 
< 		// post - PostScript
< 		$opost = $this->get_table('post');
< 		$post = "\x00\x03\x00\x00" . substr($opost,4,12) . "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
< 		$this->add('post', $post);
< 
< 		// Sort CID2GID map into segments of contiguous codes
< 		ksort($codeToGlyph);
< 		unset($codeToGlyph[0]);
< 		//unset($codeToGlyph[65535]);
< 		$rangeid = 0;
< 		$range = array();
< 		$prevcid = -2;
< 		$prevglidx = -1;
< 		// for each character
< 		foreach ($codeToGlyph as $cid => $glidx) {
< 			if ($cid == ($prevcid + 1) && $glidx == ($prevglidx + 1)) {
< 				$range[$rangeid][] = $glidx;
< 			} else {
< 				// new range
< 				$rangeid = $cid;
< 				$range[$rangeid] = array();
< 				$range[$rangeid][] = $glidx;
< 			}
< 			$prevcid = $cid;
< 			$prevglidx = $glidx;
< 		}
< 
< 		// cmap - Character to glyph mapping - Format 4 (MS / )
< 		$segCount = count($range) + 1;	// + 1 Last segment has missing character 0xFFFF
< 		$searchRange = 1;
< 		$entrySelector = 0;
< 		while ($searchRange * 2 <= $segCount ) {
< 			$searchRange = $searchRange * 2;
< 			$entrySelector = $entrySelector + 1;
< 		}
< 		$searchRange = $searchRange * 2;
< 		$rangeShift = $segCount * 2 - $searchRange;
< 		$length = 16 + (8*$segCount ) + ($numGlyphs+1);
< 		$cmap = array(0, 1,		// Index : version, number of encoding subtables
< 			3, 1,				// Encoding Subtable : platform (MS=3), encoding (Unicode)
< 			0, 12,			// Encoding Subtable : offset (hi,lo)
< 			4, $length, 0, 		// Format 4 Mapping subtable: format, length, language
< 			$segCount*2,
< 			$searchRange,
< 			$entrySelector,
< 			$rangeShift);
< 
< 		// endCode(s)
< 		foreach($range AS $start=>$subrange) {
< 			$endCode = $start + (count($subrange)-1);
< 			$cmap[] = $endCode;	// endCode(s)
< 		}
< 		$cmap[] =	0xFFFF;	// endCode of last Segment
< 		$cmap[] =	0;	// reservedPad
< 
< 		// startCode(s)
< 		foreach($range AS $start=>$subrange) {
< 			$cmap[] = $start;	// startCode(s)
< 		}
< 		$cmap[] =	0xFFFF;	// startCode of last Segment
< 		// idDelta(s) 
< 		foreach($range AS $start=>$subrange) {
< 			$idDelta = -($start-$subrange[0]);
< 			$n += count($subrange);
< 			$cmap[] = $idDelta;	// idDelta(s)
< 		}
< 		$cmap[] =	1;	// idDelta of last Segment
< 		// idRangeOffset(s) 
< 		foreach($range AS $subrange) {
< 			$cmap[] = 0;	// idRangeOffset[segCount]  	Offset in bytes to glyph indexArray, or 0
< 
< 		}
< 		$cmap[] =	0;	// idRangeOffset of last Segment
< 		foreach($range AS $subrange) {
< 			foreach($subrange AS $glidx) {
< 				$cmap[] = $glidx;
< 			}
< 		}
< 		$cmap[] = 0;	// Mapping for last character
< 		$cmapstr = '';
< 		foreach($cmap AS $cm) { $cmapstr .= pack("n",$cm); }
< 		$this->add('cmap', $cmapstr);
< 
< 
< 		// glyf - Glyph data
< 		list($glyfOffset,$glyfLength) = $this->get_table_pos('glyf');
< 		if ($glyfLength < $this->maxStrLenRead) {
< 			$glyphData = $this->get_table('glyf');
< 		}
< 
< 		$offsets = array();
< 		$glyf = '';
< 		$pos = 0;
< 
< 		$hmtxstr = '';
< 		$xMinT = 0;
< 		$yMinT = 0;
< 		$xMaxT = 0;
< 		$yMaxT = 0;
< 		$advanceWidthMax = 0;
< 		$minLeftSideBearing = 0;
< 		$minRightSideBearing = 0;
< 		$xMaxExtent = 0;
< 		$maxPoints = 0;			// points in non-compound glyph
< 		$maxContours = 0;			// contours in non-compound glyph
< 		$maxComponentPoints = 0;	// points in compound glyph
< 		$maxComponentContours = 0;	// contours in compound glyph
< 		$maxComponentElements = 0;	// number of glyphs referenced at top level
< 		$maxComponentDepth = 0;		// levels of recursion, set to 0 if font has only simple glyphs
< 		$this->glyphdata = array();
< 
< 		foreach($subsetglyphs AS $originalGlyphIdx => $uni) {
< 			// hmtx - Horizontal Metrics
< 			$hm = $this->getHMetric($orignHmetrics, $originalGlyphIdx);	
< 			$hmtxstr .= $hm;
< 
< 			$offsets[] = $pos;
< 			$glyphPos = $this->glyphPos[$originalGlyphIdx];
< 			$glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos;
< 			if ($glyfLength < $this->maxStrLenRead) {
< 				$data = substr($glyphData,$glyphPos,$glyphLen);
< 			}
< 			else {
< 				if ($glyphLen > 0) $data = $this->get_chunk($glyfOffset+$glyphPos,$glyphLen);
< 				else $data = '';
< 			}
< 
< 			if ($glyphLen > 0) {
< 				$up = unpack("n", substr($data,0,2));
< 			}
< 
< 			if ($glyphLen > 2 && ($up[1] & (1 << 15)) ) {	// If number of contours <= -1 i.e. composiste glyph
< 				$pos_in_glyph = 10;
< 				$flags = GF_MORE;
< 				$nComponentElements = 0;
< 				while ($flags & GF_MORE) {
< 					$nComponentElements += 1;	// number of glyphs referenced at top level
< 					$up = unpack("n", substr($data,$pos_in_glyph,2));
< 					$flags = $up[1];
< 					$up = unpack("n", substr($data,$pos_in_glyph+2,2));
< 					$glyphIdx = $up[1];
< 					$this->glyphdata[$originalGlyphIdx]['compGlyphs'][] = $glyphIdx;
< 					$data = $this->_set_ushort($data, $pos_in_glyph + 2, $glyphSet[$glyphIdx]);
< 					$pos_in_glyph += 4;
< 					if ($flags & GF_WORDS) { $pos_in_glyph += 4; }
< 					else { $pos_in_glyph += 2; }
< 					if ($flags & GF_SCALE) { $pos_in_glyph += 2; }
< 					else if ($flags & GF_XYSCALE) { $pos_in_glyph += 4; }
< 					else if ($flags & GF_TWOBYTWO) { $pos_in_glyph += 8; }
< 				}
< 				$maxComponentElements = max($maxComponentElements, $nComponentElements);
< 			}
< 
< 			$glyf .= $data;
< 			$pos += $glyphLen;
< 			if ($pos % 4 != 0) {
< 				$padding = 4 - ($pos % 4);
< 				$glyf .= str_repeat("\0",$padding);
< 				$pos += $padding;
< 			}
< 		}
< 
< 		$offsets[] = $pos;
< 		$this->add('glyf', $glyf);
< 
< 		// hmtx - Horizontal Metrics
< 		$this->add('hmtx', $hmtxstr);
< 
< 		// loca - Index to location
< 		$locastr = '';
< 		if ((($pos + 1) >> 1) > 0xFFFF) {
< 			$indexToLocFormat = 1;        // long format
< 			foreach($offsets AS $offset) { $locastr .= pack("N",$offset); }
< 		}
< 		else {
< 			$indexToLocFormat = 0;        // short format
< 			foreach($offsets AS $offset) { $locastr .= pack("n",($offset/2)); }
< 		}
< 		$this->add('loca', $locastr);
< 
< 		// head - Font header
< 		$head = $this->get_table('head');
< 		$head = $this->_set_ushort($head, 50, $indexToLocFormat);
< 		$this->add('head', $head);
< 
< 
< 		// hhea - Horizontal Header
< 		$hhea = $this->get_table('hhea');
< 		$hhea = $this->_set_ushort($hhea, 34, $numberOfHMetrics);
< 		$this->add('hhea', $hhea);
< 
< 		// maxp - Maximum Profile
< 		$maxp = $this->get_table('maxp');
< 		$maxp = $this->_set_ushort($maxp, 4, $numGlyphs);
< 		$this->add('maxp', $maxp);
< 
< 
< 		// OS/2 - OS/2
< 		$os2 = $this->get_table('OS/2');
< 		$this->add('OS/2', $os2 );
< 
< 		fclose($this->fh);
< 
< 		// Put the TTF file together
< 		$stm = '';
< 		$this->endTTFile($stm);
< 		return $stm ;
< 	}
< 
< 	//////////////////////////////////////////////////////////////////////////////////
< 	// Recursively get composite glyph data
< 	function getGlyphData($originalGlyphIdx, &$maxdepth, &$depth, &$points, &$contours) {
< 		$depth++;
< 		$maxdepth = max($maxdepth, $depth);
< 		if (count($this->glyphdata[$originalGlyphIdx]['compGlyphs'])) {
< 			foreach($this->glyphdata[$originalGlyphIdx]['compGlyphs'] AS $glyphIdx) {
< 				$this->getGlyphData($glyphIdx, $maxdepth, $depth, $points, $contours);
< 			}
< 		}
< 		else if (($this->glyphdata[$originalGlyphIdx]['nContours'] > 0) && $depth > 0) {	// simple
< 			$contours += $this->glyphdata[$originalGlyphIdx]['nContours'];
< 			$points += $this->glyphdata[$originalGlyphIdx]['nPoints'];
< 		}
< 		$depth--;
< 	}
< 
< 
< 	//////////////////////////////////////////////////////////////////////////////////
< 	// Recursively get composite glyphs
< 	function getGlyphs($originalGlyphIdx, &$start, &$glyphSet, &$subsetglyphs) {
< 		$glyphPos = $this->glyphPos[$originalGlyphIdx];
< 		$glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos;
< 		if (!$glyphLen) { 
< 			return;
< 		}
< 		$this->seek($start + $glyphPos);
< 		$numberOfContours = $this->read_short();
< 		if ($numberOfContours < 0) {
< 			$this->skip(8);
< 			$flags = GF_MORE;
< 			while ($flags & GF_MORE) {
< 				$flags = $this->read_ushort();
< 				$glyphIdx = $this->read_ushort();
< 				if (!isset($glyphSet[$glyphIdx])) {
< 					$glyphSet[$glyphIdx] = count($subsetglyphs);	// old glyphID to new glyphID
< 					$subsetglyphs[$glyphIdx] = true;
< 				}
< 				$savepos = ftell($this->fh);
< 				$this->getGlyphs($glyphIdx, $start, $glyphSet, $subsetglyphs);
< 				$this->seek($savepos);
< 				if ($flags & GF_WORDS)
< 					$this->skip(4);
< 				else
< 					$this->skip(2);
< 				if ($flags & GF_SCALE)
< 					$this->skip(2);
< 				else if ($flags & GF_XYSCALE)
< 					$this->skip(4);
< 				else if ($flags & GF_TWOBYTWO)
< 					$this->skip(8);
< 			}
< 		}
< 	}
< 
< 	//////////////////////////////////////////////////////////////////////////////////
< 
< 	function getHMTX($numberOfHMetrics, $numGlyphs, &$glyphToChar, $scale) {
< 		$start = $this->seek_table("hmtx");
< 		$aw = 0;
< 		$this->charWidths = str_pad('', 256*256*2, "\x00");
< 		$nCharWidths = 0;
< 		if (($numberOfHMetrics*4) < $this->maxStrLenRead) {
< 			$data = $this->get_chunk($start,($numberOfHMetrics*4));
< 			$arr = unpack("n*", $data);
< 		}
< 		else { $this->seek($start); }
< 		for( $glyph=0; $glyph<$numberOfHMetrics; $glyph++) {
< 
< 			if (($numberOfHMetrics*4) < $this->maxStrLenRead) {
< 				$aw = $arr[($glyph*2)+1];
< 			}
< 			else {
< 				$aw = $this->read_ushort();
< 				$lsb = $this->read_ushort();
< 			}
< 			if (isset($glyphToChar[$glyph]) || $glyph == 0) {
< 
< 				if ($aw >= (1 << 15) ) { $aw = 0; }	// 1.03 Some (arabic) fonts have -ve values for width
< 					// although should be unsigned value - comes out as e.g. 65108 (intended -50)
< 				if ($glyph == 0) {
< 					$this->defaultWidth = $scale*$aw;
< 					continue;
< 				}
< 				foreach($glyphToChar[$glyph] AS $char) {
< 					if ($char != 0 && $char != 65535) {
<  						$w = intval(round($scale*$aw));
< 						if ($w == 0) { $w = 65535; }
< 						if ($char < 196608) {
< 							$this->charWidths[$char*2] = chr($w >> 8);
< 							$this->charWidths[$char*2 + 1] = chr($w & 0xFF);
< 							$nCharWidths++;
< 						}
< 					}
< 				}
< 			}
< 		}
< 		$data = $this->get_chunk(($start+$numberOfHMetrics*4),($numGlyphs*2));
< 		$arr = unpack("n*", $data);
< 		$diff = $numGlyphs-$numberOfHMetrics;
< 		for( $pos=0; $pos<$diff; $pos++) {
< 			$glyph = $pos + $numberOfHMetrics;
< 			if (isset($glyphToChar[$glyph])) {
< 				foreach($glyphToChar[$glyph] AS $char) {
< 					if ($char != 0 && $char != 65535) {
< 						$w = intval(round($scale*$aw));
< 						if ($w == 0) { $w = 65535; }
< 						if ($char < 196608) {
< 							$this->charWidths[$char*2] = chr($w >> 8);
< 							$this->charWidths[$char*2 + 1] = chr($w & 0xFF);
< 							$nCharWidths++;
< 						}
< 					}
< 				}
< 			}
< 		}
< 		// NB 65535 is a set width of 0
< 		// First bytes define number of chars in font
< 		$this->charWidths[0] = chr($nCharWidths >> 8);
< 		$this->charWidths[1] = chr($nCharWidths & 0xFF);
< 	}
< 
< 	function getHMetric($numberOfHMetrics, $gid) {
< 		$start = $this->seek_table("hmtx");
< 		if ($gid < $numberOfHMetrics) {
< 			$this->seek($start+($gid*4));
< 			$hm = fread($this->fh,4);
< 		}
< 		else {
< 			$this->seek($start+(($numberOfHMetrics-1)*4));
< 			$hm = fread($this->fh,2);
< 			$this->seek($start+($numberOfHMetrics*2)+($gid*2));
< 			$hm .= fread($this->fh,2);
< 		}
< 		return $hm;
< 	}
< 
< 	function getLOCA($indexToLocFormat, $numGlyphs) {
< 		$start = $this->seek_table('loca');
< 		$this->glyphPos = array();
< 		if ($indexToLocFormat == 0) {
< 			$data = $this->get_chunk($start,($numGlyphs*2)+2);
< 			$arr = unpack("n*", $data);
< 			for ($n=0; $n<=$numGlyphs; $n++) {
< 				$this->glyphPos[] = ($arr[$n+1] * 2);
< 			}
< 		}
< 		else if ($indexToLocFormat == 1) {
< 			$data = $this->get_chunk($start,($numGlyphs*4)+4);
< 			$arr = unpack("N*", $data);
< 			for ($n=0; $n<=$numGlyphs; $n++) {
< 				$this->glyphPos[] = ($arr[$n+1]);
< 			}
< 		}
< 		else 
< 			die('Unknown location table format '.$indexToLocFormat);
< 	}
< 
< 
< 	// CMAP Format 4
< 	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
< 		$this->maxUniChar = 0;
< 		$this->seek($unicode_cmap_offset + 2);
< 		$length = $this->read_ushort();
< 		$limit = $unicode_cmap_offset + $length;
< 		$this->skip(2);
< 
< 		$segCount = $this->read_ushort() / 2;
< 		$this->skip(6);
< 		$endCount = array();
< 		for($i=0; $i<$segCount; $i++) { $endCount[] = $this->read_ushort(); }
< 		$this->skip(2);
< 		$startCount = array();
< 		for($i=0; $i<$segCount; $i++) { $startCount[] = $this->read_ushort(); }
< 		$idDelta = array();
< 		for($i=0; $i<$segCount; $i++) { $idDelta[] = $this->read_short(); }		// ???? was unsigned short
< 		$idRangeOffset_start = $this->_pos;
< 		$idRangeOffset = array();
< 		for($i=0; $i<$segCount; $i++) { $idRangeOffset[] = $this->read_ushort(); }
< 
< 		for ($n=0;$n<$segCount;$n++) {
< 			$endpoint = ($endCount[$n] + 1);
< 			for ($unichar=$startCount[$n];$unichar<$endpoint;$unichar++) {
< 				if ($idRangeOffset[$n] == 0)
< 					$glyph = ($unichar + $idDelta[$n]) & 0xFFFF;
< 				else {
< 					$offset = ($unichar - $startCount[$n]) * 2 + $idRangeOffset[$n];
< 					$offset = $idRangeOffset_start + 2 * $n + $offset;
< 					if ($offset >= $limit)
< 						$glyph = 0;
< 					else {
< 						$glyph = $this->get_ushort($offset);
< 						if ($glyph != 0)
< 						   $glyph = ($glyph + $idDelta[$n]) & 0xFFFF;
< 					}
< 				}
< 				$charToGlyph[$unichar] = $glyph;
< 				if ($unichar < 196608) { $this->maxUniChar = max($unichar,$this->maxUniChar); }
< 				$glyphToChar[$glyph][] = $unichar;
< 			}
< 		}
< 	}
< 
< 
< 		// Put the TTF file together
< 	function endTTFile(&$stm) {
< 		$stm = '';
< 		$numTables = count($this->otables);
< 		$searchRange = 1;
< 		$entrySelector = 0;
< 		while ($searchRange * 2 <= $numTables) {
< 			$searchRange = $searchRange * 2;
< 			$entrySelector = $entrySelector + 1;
< 		}
< 		$searchRange = $searchRange * 16;
< 		$rangeShift = $numTables * 16 - $searchRange;
< 
< 		// Header
< 		if (_TTF_MAC_HEADER) {
< 			$stm .= (pack("Nnnnn", 0x74727565, $numTables, $searchRange, $entrySelector, $rangeShift));	// Mac
< 		}
< 		else {
< 			$stm .= (pack("Nnnnn", 0x00010000 , $numTables, $searchRange, $entrySelector, $rangeShift));	// Windows
< 		}
< 
< 		// Table directory
< 		$tables = $this->otables;
< 
< 		ksort ($tables); 
< 		$offset = 12 + $numTables * 16;
< 		foreach ($tables AS $tag=>$data) {
< 			if ($tag == 'head') { $head_start = $offset; }
< 			$stm .= $tag;
< 			$checksum = $this->calcChecksum($data);
< 			$stm .= pack("nn", $checksum[0],$checksum[1]);
< 			$stm .= pack("NN", $offset, strlen($data));
< 			$paddedLength = (strlen($data)+3)&~3;
< 			$offset = $offset + $paddedLength;
< 		}
< 
< 		// Table data
< 		foreach ($tables AS $tag=>$data) {
< 			$data .= "\0\0\0";
< 			$stm .= substr($data,0,(strlen($data)&~3));
< 		}
< 
< 		$checksum = $this->calcChecksum($stm);
< 		$checksum = $this->sub32(array(0xB1B0,0xAFBA), $checksum);
< 		$chk = pack("nn", $checksum[0],$checksum[1]);
< 		$stm = $this->splice($stm,($head_start + 8),$chk);
< 		return $stm ;
< 	}
< 
< 
< 
< 
< }
< 
< 
< ?>
\ No newline at end of file
---
> <?php
> /*******************************************************************************
> * TTFontFile class                                                             *
> *                                                                              *
> * This class is based on The ReportLab Open Source PDF library                 *
> * written in Python - http://www.reportlab.com/software/opensource/            *
> * together with ideas from the OpenOffice source code and others.              *
> *                                                                              *
> * Version:  1.06                                                               *
> * Date:     2022-12-20                                                         *
> * Author:   Ian Back <ianb@bpm1.com>                                           *
> * License:  LGPL                                                               *
> * Copyright (c) Ian Back, 2010                                                 *
> * This header must be retained in any redistribution or                        *
> * modification of the file.                                                    *
> *                                                                              *
> *******************************************************************************/
> 
> // Define the value used in the "head" table of a created TTF file
> // 0x74727565 "true" for Mac
> // 0x00010000 for Windows
> // Either seems to work for a font embedded in a PDF file
> // when read by Adobe Reader on a Windows PC(!)
> define("_TTF_MAC_HEADER", false);
> 
> 
> // TrueType Font Glyph operators
> define("GF_WORDS",(1 << 0));
> define("GF_SCALE",(1 << 3));
> define("GF_MORE",(1 << 5));
> define("GF_XYSCALE",(1 << 6));
> define("GF_TWOBYTWO",(1 << 7));
> 
> 
> 
> class TTFontFile {
> 
> public $maxUni;
> public $maxUniChar;
> public $sFamilyClass;
> public $sFamilySubClass;
> public $_pos;
> public $numTables;
> public $searchRange;
> public $entrySelector;
> public $rangeShift;
> public $tables;
> public $otables;
> public $filename;
> public $fh;
> public $hmetrics;
> public $glyphPos;
> public $charToGlyph;
> public $codeToGlyph;
> public $glyphdata;
> public $ascent;
> public $descent;
> public $TTCFonts;
> public $version;
> public $name;
> public $familyName;
> public $styleName;
> public $fullName;
> public $uniqueFontID;
> public $unitsPerEm;
> public $bbox;
> public $capHeight;
> public $stemV;
> public $italicAngle;
> public $flags;
> public $underlinePosition;
> public $underlineThickness;
> public $charWidths;
> public $defaultWidth;
> public $maxStrLenRead;
> 
> 	function __construct() {
> 		$this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
> 	}
> 
> 
> 	function getMetrics($file) {
> 		$this->filename = $file;
> 		$this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
> 		$this->_pos = 0;
> 		$this->charWidths = '';
> 		$this->glyphPos = array();
> 		$this->charToGlyph = array();
> 		$this->tables = array();
> 		$this->otables = array();
> 		$this->ascent = 0;
> 		$this->descent = 0;
> 		$this->TTCFonts = array();
> 		$this->version = $version = $this->read_ulong();
> 		if ($version==0x4F54544F) 
> 			die("Postscript outlines are not supported");
> 		if ($version==0x74746366) 
> 			die("ERROR - TrueType Fonts Collections not supported");
> 		if (!in_array($version, array(0x00010000,0x74727565)))
> 			die("Not a TrueType font: version=".$version);
> 		$this->readTableDirectory();
> 		$this->extractInfo();
> 		fclose($this->fh);
> 	}
> 
> 
> 	function readTableDirectory() {
> 	    $this->numTables = $this->read_ushort();
>             $this->searchRange = $this->read_ushort();
>             $this->entrySelector = $this->read_ushort();
>             $this->rangeShift = $this->read_ushort();
>             $this->tables = array();	
>             for ($i=0;$i<$this->numTables;$i++) {
>                 $record = array();
>                 $record['tag'] = $this->read_tag();
>                 $record['checksum'] = array($this->read_ushort(),$this->read_ushort());
>                 $record['offset'] = $this->read_ulong();
>                 $record['length'] = $this->read_ulong();
>                 $this->tables[$record['tag']] = $record;
> 		}
> 	}
> 
> 
> 	function sub32($x, $y) {
> 		$xlo = $x[1];
> 		$xhi = $x[0];
> 		$ylo = $y[1];
> 		$yhi = $y[0];
> 		if ($ylo > $xlo) { $xlo += 1 << 16; $yhi += 1; }
> 		$reslo = $xlo-$ylo;
> 		if ($yhi > $xhi) { $xhi += 1 << 16;  }
> 		$reshi = $xhi-$yhi;
> 		$reshi = $reshi & 0xFFFF;
> 		return array($reshi, $reslo);
> 	}
> 
> 	function calcChecksum($data)  {
> 		if (strlen($data) % 4) { $data .= str_repeat("\0",(4-(strlen($data) % 4))); }
> 		$hi=0x0000;
> 		$lo=0x0000;
> 		for($i=0;$i<strlen($data);$i+=4) {
> 			$hi += (ord($data[$i])<<8) + ord($data[$i+1]);
> 			$lo += (ord($data[$i+2])<<8) + ord($data[$i+3]);
> 			$hi += $lo >> 16;
> 			$lo = $lo & 0xFFFF;
> 			$hi = $hi & 0xFFFF;
> 		}
> 		return array($hi, $lo);
> 	}
> 
> 	function get_table_pos($tag) {
> 		$offset = $this->tables[$tag]['offset'];
> 		$length = $this->tables[$tag]['length'];
> 		return array($offset, $length);
> 	}
> 
> 	function seek($pos) {
> 		$this->_pos = $pos;
> 		fseek($this->fh,$this->_pos);
> 	}
> 
> 	function skip($delta) {
> 		$this->_pos = $this->_pos + $delta;
> 		fseek($this->fh,$this->_pos);
> 	}
> 
> 	function seek_table($tag, $offset_in_table = 0) {
> 		$tpos = $this->get_table_pos($tag);
> 		$this->_pos = $tpos[0] + $offset_in_table;
> 		fseek($this->fh, $this->_pos);
> 		return $this->_pos;
> 	}
> 
> 	function read_tag() {
> 		$this->_pos += 4;
> 		return fread($this->fh,4);
> 	}
> 
> 	function read_short() {
> 		$this->_pos += 2;
> 		$s = fread($this->fh,2);
> 		$a = (ord($s[0])<<8) + ord($s[1]);
> 		if ($a & (1 << 15) ) { $a = ($a - (1 << 16)) ; }
> 		return $a;
> 	}
> 
> 	function unpack_short($s) {
> 		$a = (ord($s[0])<<8) + ord($s[1]);
> 		if ($a & (1 << 15) ) { 
> 			$a = ($a - (1 << 16)); 
> 		}
> 		return $a;
> 	}
> 
> 	function read_ushort() {
> 		$this->_pos += 2;
> 		$s = fread($this->fh,2);
> 		return (ord($s[0])<<8) + ord($s[1]);
> 	}
> 
> 	function read_ulong() {
> 		$this->_pos += 4;
> 		$s = fread($this->fh,4);
> 		// if large uInt32 as an integer, PHP converts it to -ve
> 		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
> 	}
> 
> 	function get_ushort($pos) {
> 		fseek($this->fh,$pos);
> 		$s = fread($this->fh,2);
> 		return (ord($s[0])<<8) + ord($s[1]);
> 	}
> 
> 	function get_ulong($pos) {
> 		fseek($this->fh,$pos);
> 		$s = fread($this->fh,4);
> 		// iF large uInt32 as an integer, PHP converts it to -ve
> 		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
> 	}
> 
> 	function pack_short($val) {
> 		if ($val<0) { 
> 			$val = abs($val);
> 			$val = ~$val;
> 			$val += 1;
> 		}
> 		return pack("n",$val); 
> 	}
> 
> 	function splice($stream, $offset, $value) {
> 		return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value));
> 	}
> 
> 	function _set_ushort($stream, $offset, $value) {
> 		$up = pack("n", $value);
> 		return $this->splice($stream, $offset, $up);
> 	}
> 
> 	function _set_short($stream, $offset, $val) {
> 		if ($val<0) { 
> 			$val = abs($val);
> 			$val = ~$val;
> 			$val += 1;
> 		}
> 		$up = pack("n",$val); 
> 		return $this->splice($stream, $offset, $up);
> 	}
> 
> 	function get_chunk($pos, $length) {
> 		fseek($this->fh,$pos);
> 		if ($length <1) { return ''; }
> 		return (fread($this->fh,$length));
> 	}
> 
> 	function get_table($tag) {
> 		list($pos, $length) = $this->get_table_pos($tag);
> 		if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
> 		fseek($this->fh,$pos);
> 		return (fread($this->fh,$length));
> 	}
> 
> 	function add($tag, $data) {
> 		if ($tag == 'head') {
> 			$data = $this->splice($data, 8, "\0\0\0\0");
> 		}
> 		$this->otables[$tag] = $data;
> 	}
> 
> 
> 
> /////////////////////////////////////////////////////////////////////////////////////////
> /////////////////////////////////////////////////////////////////////////////////////////
> 
> /////////////////////////////////////////////////////////////////////////////////////////
> 
> 	function extractInfo() {
> 		///////////////////////////////////
> 		// name - Naming table
> 		///////////////////////////////////
> 			$this->sFamilyClass = 0;
> 			$this->sFamilySubClass = 0;
> 
> 			$name_offset = $this->seek_table("name");
> 			$format = $this->read_ushort();
> 			if ($format != 0)
> 				die("Unknown name table format ".$format);
> 			$numRecords = $this->read_ushort();
> 			$string_data_offset = $name_offset + $this->read_ushort();
> 			$names = array(1=>'',2=>'',3=>'',4=>'',6=>'');
> 			$K = array_keys($names);
> 			$nameCount = count($names);
> 			for ($i=0;$i<$numRecords; $i++) {
> 				$platformId = $this->read_ushort();
> 				$encodingId = $this->read_ushort();
> 				$languageId = $this->read_ushort();
> 				$nameId = $this->read_ushort();
> 				$length = $this->read_ushort();
> 				$offset = $this->read_ushort();
> 				if (!in_array($nameId,$K)) continue;
> 				$N = '';
> 				if ($platformId == 3 && $encodingId == 1 && $languageId == 0x409) { // Microsoft, Unicode, US English, PS Name
> 					$opos = $this->_pos;
> 					$this->seek($string_data_offset + $offset);
> 					if ($length % 2 != 0)
> 						die("PostScript name is UTF-16BE string of odd length");
> 					$length /= 2;
> 					$N = '';
> 					while ($length > 0) {
> 						$char = $this->read_ushort();
> 						$N .= (chr($char));
> 						$length -= 1;
> 					}
> 					$this->_pos = $opos;
> 					$this->seek($opos);
> 				}
> 				else if ($platformId == 1 && $encodingId == 0 && $languageId == 0) { // Macintosh, Roman, English, PS Name
> 					$opos = $this->_pos;
> 					$N = $this->get_chunk($string_data_offset + $offset, $length);
> 					$this->_pos = $opos;
> 					$this->seek($opos);
> 				}
> 				if ($N && $names[$nameId]=='') {
> 					$names[$nameId] = $N;
> 					$nameCount -= 1;
> 					if ($nameCount==0) break;
> 				}
> 			}
> 			if ($names[6])
> 				$psName = $names[6];
> 			else if ($names[4])
> 				$psName = preg_replace('/ /','-',$names[4]);
> 			else if ($names[1])
> 				$psName = preg_replace('/ /','-',$names[1]);
> 			else
> 				$psName = '';
> 			if (!$psName)
> 				die("Could not find PostScript font name");
> 			$this->name = $psName;
> 			if ($names[1]) { $this->familyName = $names[1]; } else { $this->familyName = $psName; }
> 			if ($names[2]) { $this->styleName = $names[2]; } else { $this->styleName = 'Regular'; }
> 			if ($names[4]) { $this->fullName = $names[4]; } else { $this->fullName = $psName; }
> 			if ($names[3]) { $this->uniqueFontID = $names[3]; } else { $this->uniqueFontID = $psName; }
> 			if ($names[6]) { $this->fullName = $names[6]; }
> 
> 		///////////////////////////////////
> 		// head - Font header table
> 		///////////////////////////////////
> 		$this->seek_table("head");
> 		$this->skip(18); 
> 		$this->unitsPerEm = $unitsPerEm = $this->read_ushort();
> 		$scale = 1000 / $unitsPerEm;
> 		$this->skip(16);
> 		$xMin = $this->read_short();
> 		$yMin = $this->read_short();
> 		$xMax = $this->read_short();
> 		$yMax = $this->read_short();
> 		$this->bbox = array(($xMin*$scale), ($yMin*$scale), ($xMax*$scale), ($yMax*$scale));
> 		$this->skip(3*2);
> 		$indexToLocFormat = $this->read_ushort();
> 		$glyphDataFormat = $this->read_ushort();
> 		if ($glyphDataFormat != 0)
> 			die('Unknown glyph data format '.$glyphDataFormat);
> 
> 		///////////////////////////////////
> 		// hhea metrics table
> 		///////////////////////////////////
> 		// ttf2t1 seems to use this value rather than the one in OS/2 - so put in for compatibility
> 		if (isset($this->tables["hhea"])) {
> 			$this->seek_table("hhea");
> 			$this->skip(4);
> 			$hheaAscender = $this->read_short();
> 			$hheaDescender = $this->read_short();
> 			$this->ascent = ($hheaAscender *$scale);
> 			$this->descent = ($hheaDescender *$scale);
> 		}
> 
> 		///////////////////////////////////
> 		// OS/2 - OS/2 and Windows metrics table
> 		///////////////////////////////////
> 		if (isset($this->tables["OS/2"])) {
> 			$this->seek_table("OS/2");
> 			$version = $this->read_ushort();
> 			$this->skip(2);
> 			$usWeightClass = $this->read_ushort();
> 			$this->skip(2);
> 			$fsType = $this->read_ushort();
> 			if ($fsType == 0x0002 || ($fsType & 0x0300) != 0) {
> 				die('ERROR - Font file '.$this->filename.' cannot be embedded due to copyright restrictions.');
> 				$this->restrictedUse = true;
> 			}
> 			$this->skip(20);
> 			$sF = $this->read_short();
> 			$this->sFamilyClass = ($sF >> 8);
> 			$this->sFamilySubClass = ($sF & 0xFF);
> 			$this->_pos += 10;  //PANOSE = 10 byte length
> 			$panose = fread($this->fh,10);
> 			$this->skip(26);
> 			$sTypoAscender = $this->read_short();
> 			$sTypoDescender = $this->read_short();
> 			if (!$this->ascent) $this->ascent = ($sTypoAscender*$scale);
> 			if (!$this->descent) $this->descent = ($sTypoDescender*$scale);
> 			if ($version > 1) {
> 				$this->skip(16);
> 				$sCapHeight = $this->read_short();
> 				$this->capHeight = ($sCapHeight*$scale);
> 			}
> 			else {
> 				$this->capHeight = $this->ascent;
> 			}
> 		}
> 		else {
> 			$usWeightClass = 500;
> 			if (!$this->ascent) $this->ascent = ($yMax*$scale);
> 			if (!$this->descent) $this->descent = ($yMin*$scale);
> 			$this->capHeight = $this->ascent;
> 		}
> 		$this->stemV = 50 + intval(pow(($usWeightClass / 65.0),2));
> 
> 		///////////////////////////////////
> 		// post - PostScript table
> 		///////////////////////////////////
> 		$this->seek_table("post");
> 		$this->skip(4); 
> 		$this->italicAngle = $this->read_short() + $this->read_ushort() / 65536.0;
> 		$this->underlinePosition = $this->read_short() * $scale;
> 		$this->underlineThickness = $this->read_short() * $scale;
> 		$isFixedPitch = $this->read_ulong();
> 
> 		$this->flags = 4;
> 
> 		if ($this->italicAngle!= 0) 
> 			$this->flags = $this->flags | 64;
> 		if ($usWeightClass >= 600)
> 			$this->flags = $this->flags | 262144;
> 		if ($isFixedPitch)
> 			$this->flags = $this->flags | 1;
> 
> 		///////////////////////////////////
> 		// hhea - Horizontal header table
> 		///////////////////////////////////
> 		$this->seek_table("hhea");
> 		$this->skip(32); 
> 		$metricDataFormat = $this->read_ushort();
> 		if ($metricDataFormat != 0)
> 			die('Unknown horizontal metric data format '.$metricDataFormat);
> 		$numberOfHMetrics = $this->read_ushort();
> 		if ($numberOfHMetrics == 0) 
> 			die('Number of horizontal metrics is 0');
> 
> 		///////////////////////////////////
> 		// maxp - Maximum profile table
> 		///////////////////////////////////
> 		$this->seek_table("maxp");
> 		$this->skip(4); 
> 		$numGlyphs = $this->read_ushort();
> 
> 
> 		///////////////////////////////////
> 		// cmap - Character to glyph index mapping table
> 		///////////////////////////////////
> 		$cmap_offset = $this->seek_table("cmap");
> 		$this->skip(2);
> 		$cmapTableCount = $this->read_ushort();
> 		$unicode_cmap_offset = 0;
> 		for ($i=0;$i<$cmapTableCount;$i++) {
> 			$platformID = $this->read_ushort();
> 			$encodingID = $this->read_ushort();
> 			$offset = $this->read_ulong();
> 			$save_pos = $this->_pos;
> 			if (($platformID == 3 && $encodingID == 1) || $platformID == 0) { // Microsoft, Unicode
> 				$format = $this->get_ushort($cmap_offset + $offset);
> 				if ($format == 4) {
> 					if (!$unicode_cmap_offset) $unicode_cmap_offset = $cmap_offset + $offset;
> 					break;
> 				}
> 			}
> 			$this->seek($save_pos );
> 		}
> 		if (!$unicode_cmap_offset)
> 			die('Font ('.$this->filename .') does not have cmap for Unicode (platform 3, encoding 1, format 4, or platform 0, any encoding, format 4)');
> 
> 
> 		$glyphToChar = array();
> 		$charToGlyph = array();
> 		$this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph );
> 
> 		///////////////////////////////////
> 		// hmtx - Horizontal metrics table
> 		///////////////////////////////////
> 		$this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale);
> 
> 	}
> 
> 
> /////////////////////////////////////////////////////////////////////////////////////////
> /////////////////////////////////////////////////////////////////////////////////////////
> 
> 
> 	function makeSubset($file, &$subset) {
> 		$this->filename = $file;
> 		$this->fh = fopen($file ,'rb') or die('Can\'t open file ' . $file);
> 		$this->_pos = 0;
> 		$this->charWidths = '';
> 		$this->glyphPos = array();
> 		$this->charToGlyph = array();
> 		$this->tables = array();
> 		$this->otables = array();
> 		$this->ascent = 0;
> 		$this->descent = 0;
> 		$this->skip(4);
> 		$this->maxUni = 0;
> 		$this->readTableDirectory();
> 
> 
> 		///////////////////////////////////
> 		// head - Font header table
> 		///////////////////////////////////
> 		$this->seek_table("head");
> 		$this->skip(50); 
> 		$indexToLocFormat = $this->read_ushort();
> 		$glyphDataFormat = $this->read_ushort();
> 
> 		///////////////////////////////////
> 		// hhea - Horizontal header table
> 		///////////////////////////////////
> 		$this->seek_table("hhea");
> 		$this->skip(32); 
> 		$metricDataFormat = $this->read_ushort();
> 		$orignHmetrics = $numberOfHMetrics = $this->read_ushort();
> 
> 		///////////////////////////////////
> 		// maxp - Maximum profile table
> 		///////////////////////////////////
> 		$this->seek_table("maxp");
> 		$this->skip(4);
> 		$numGlyphs = $this->read_ushort();
> 
> 
> 		///////////////////////////////////
> 		// cmap - Character to glyph index mapping table
> 		///////////////////////////////////
> 		$cmap_offset = $this->seek_table("cmap");
> 		$this->skip(2);
> 		$cmapTableCount = $this->read_ushort();
> 		$unicode_cmap_offset = 0;
> 		for ($i=0;$i<$cmapTableCount;$i++) {
> 			$platformID = $this->read_ushort();
> 			$encodingID = $this->read_ushort();
> 			$offset = $this->read_ulong();
> 			$save_pos = $this->_pos;
> 			if (($platformID == 3 && $encodingID == 1) || $platformID == 0) { // Microsoft, Unicode
> 				$format = $this->get_ushort($cmap_offset + $offset);
> 				if ($format == 4) {
> 					$unicode_cmap_offset = $cmap_offset + $offset;
> 					break;
> 				}
> 			}
> 			$this->seek($save_pos );
> 		}
> 
> 		if (!$unicode_cmap_offset)
> 			die('Font ('.$this->filename .') does not have cmap for Unicode (platform 3, encoding 1, format 4, or platform 0, any encoding, format 4)');
> 
> 
> 		$glyphToChar = array();
> 		$charToGlyph = array();
> 		$this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph );
> 
> 		$this->charToGlyph = $charToGlyph;
> 
> 		///////////////////////////////////
> 		// hmtx - Horizontal metrics table
> 		///////////////////////////////////
> 		$scale = 1;	// not used
> 		$this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale);
> 
> 		///////////////////////////////////
> 		// loca - Index to location
> 		///////////////////////////////////
> 		$this->getLOCA($indexToLocFormat, $numGlyphs);
> 
> 		$subsetglyphs = array(0=>0); 
> 		$subsetCharToGlyph = array();
> 		foreach($subset AS $code) {
> 			if (isset($this->charToGlyph[$code])) {
> 				$subsetglyphs[$this->charToGlyph[$code]] = $code;	// Old Glyph ID => Unicode
> 				$subsetCharToGlyph[$code] = $this->charToGlyph[$code];	// Unicode to old GlyphID
> 
> 			}
> 			$this->maxUni = max($this->maxUni, $code);
> 		}
> 
> 		list($start,$dummy) = $this->get_table_pos('glyf');
> 
> 		$glyphSet = array();
> 		ksort($subsetglyphs);
> 		$n = 0;
> 		$fsLastCharIndex = 0;	// maximum Unicode index (character code) in this font, according to the cmap subtable for platform ID 3 and platform- specific encoding ID 0 or 1.
> 		foreach($subsetglyphs AS $originalGlyphIdx => $uni) {
> 			$fsLastCharIndex = max($fsLastCharIndex , $uni);
> 			$glyphSet[$originalGlyphIdx] = $n;	// old glyphID to new glyphID
> 			$n++;
> 		}
> 
> 		ksort($subsetCharToGlyph);
> 		foreach($subsetCharToGlyph AS $uni => $originalGlyphIdx) {
> 			$codeToGlyph[$uni] = $glyphSet[$originalGlyphIdx] ;
> 		}
> 		$this->codeToGlyph = $codeToGlyph;
> 
> 		ksort($subsetglyphs);
> 		foreach($subsetglyphs AS $originalGlyphIdx => $uni) {
> 			$this->getGlyphs($originalGlyphIdx, $start, $glyphSet, $subsetglyphs);
> 		}
> 
> 		$numGlyphs = $numberOfHMetrics = count($subsetglyphs );
> 
> 		//tables copied from the original
> 		$tags = array ('name');
> 		foreach($tags AS $tag) { $this->add($tag, $this->get_table($tag)); }
> 		$tags = array ('cvt ', 'fpgm', 'prep', 'gasp');
> 		foreach($tags AS $tag) {
> 			if (isset($this->tables[$tag])) { $this->add($tag, $this->get_table($tag)); }
> 		}
> 
> 		// post - PostScript
> 		$opost = $this->get_table('post');
> 		$post = "\x00\x03\x00\x00" . substr($opost,4,12) . "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
> 		$this->add('post', $post);
> 
> 		// Sort CID2GID map into segments of contiguous codes
> 		ksort($codeToGlyph);
> 		unset($codeToGlyph[0]);
> 		//unset($codeToGlyph[65535]);
> 		$rangeid = 0;
> 		$range = array();
> 		$prevcid = -2;
> 		$prevglidx = -1;
> 		// for each character
> 		foreach ($codeToGlyph as $cid => $glidx) {
> 			if ($cid == ($prevcid + 1) && $glidx == ($prevglidx + 1)) {
> 				$range[$rangeid][] = $glidx;
> 			} else {
> 				// new range
> 				$rangeid = $cid;
> 				$range[$rangeid] = array();
> 				$range[$rangeid][] = $glidx;
> 			}
> 			$prevcid = $cid;
> 			$prevglidx = $glidx;
> 		}
> 
> 		// cmap - Character to glyph mapping - Format 4 (MS / )
> 		$segCount = count($range) + 1;	// + 1 Last segment has missing character 0xFFFF
> 		$searchRange = 1;
> 		$entrySelector = 0;
> 		while ($searchRange * 2 <= $segCount ) {
> 			$searchRange = $searchRange * 2;
> 			$entrySelector = $entrySelector + 1;
> 		}
> 		$searchRange = $searchRange * 2;
> 		$rangeShift = $segCount * 2 - $searchRange;
> 		$length = 16 + (8*$segCount ) + ($numGlyphs+1);
> 		$cmap = array(0, 1,		// Index : version, number of encoding subtables
> 			3, 1,				// Encoding Subtable : platform (MS=3), encoding (Unicode)
> 			0, 12,			// Encoding Subtable : offset (hi,lo)
> 			4, $length, 0, 		// Format 4 Mapping subtable: format, length, language
> 			$segCount*2,
> 			$searchRange,
> 			$entrySelector,
> 			$rangeShift);
> 
> 		// endCode(s)
> 		foreach($range AS $start=>$subrange) {
> 			$endCode = $start + (count($subrange)-1);
> 			$cmap[] = $endCode;	// endCode(s)
> 		}
> 		$cmap[] =	0xFFFF;	// endCode of last Segment
> 		$cmap[] =	0;	// reservedPad
> 
> 		// startCode(s)
> 		foreach($range AS $start=>$subrange) {
> 			$cmap[] = $start;	// startCode(s)
> 		}
> 		$cmap[] =	0xFFFF;	// startCode of last Segment
> 		// idDelta(s) 
> 		foreach($range AS $start=>$subrange) {
> 			$idDelta = -($start-$subrange[0]);
> 			$n += count($subrange);
> 			$cmap[] = $idDelta;	// idDelta(s)
> 		}
> 		$cmap[] =	1;	// idDelta of last Segment
> 		// idRangeOffset(s) 
> 		foreach($range AS $subrange) {
> 			$cmap[] = 0;	// idRangeOffset[segCount]  	Offset in bytes to glyph indexArray, or 0
> 
> 		}
> 		$cmap[] =	0;	// idRangeOffset of last Segment
> 		foreach($range AS $subrange) {
> 			foreach($subrange AS $glidx) {
> 				$cmap[] = $glidx;
> 			}
> 		}
> 		$cmap[] = 0;	// Mapping for last character
> 		$cmapstr = '';
> 		foreach($cmap AS $cm) { $cmapstr .= pack("n",$cm); }
> 		$this->add('cmap', $cmapstr);
> 
> 
> 		// glyf - Glyph data
> 		list($glyfOffset,$glyfLength) = $this->get_table_pos('glyf');
> 		if ($glyfLength < $this->maxStrLenRead) {
> 			$glyphData = $this->get_table('glyf');
> 		}
> 
> 		$offsets = array();
> 		$glyf = '';
> 		$pos = 0;
> 
> 		$hmtxstr = '';
> 		$xMinT = 0;
> 		$yMinT = 0;
> 		$xMaxT = 0;
> 		$yMaxT = 0;
> 		$advanceWidthMax = 0;
> 		$minLeftSideBearing = 0;
> 		$minRightSideBearing = 0;
> 		$xMaxExtent = 0;
> 		$maxPoints = 0;			// points in non-compound glyph
> 		$maxContours = 0;			// contours in non-compound glyph
> 		$maxComponentPoints = 0;	// points in compound glyph
> 		$maxComponentContours = 0;	// contours in compound glyph
> 		$maxComponentElements = 0;	// number of glyphs referenced at top level
> 		$maxComponentDepth = 0;		// levels of recursion, set to 0 if font has only simple glyphs
> 		$this->glyphdata = array();
> 
> 		foreach($subsetglyphs AS $originalGlyphIdx => $uni) {
> 			// hmtx - Horizontal Metrics
> 			$hm = $this->getHMetric($orignHmetrics, $originalGlyphIdx);	
> 			$hmtxstr .= $hm;
> 
> 			$offsets[] = $pos;
> 			$glyphPos = $this->glyphPos[$originalGlyphIdx];
> 			$glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos;
> 			if ($glyfLength < $this->maxStrLenRead) {
> 				$data = substr($glyphData,$glyphPos,$glyphLen);
> 			}
> 			else {
> 				if ($glyphLen > 0) $data = $this->get_chunk($glyfOffset+$glyphPos,$glyphLen);
> 				else $data = '';
> 			}
> 
> 			if ($glyphLen > 0) {
> 				$up = unpack("n", substr($data,0,2));
> 			}
> 
> 			if ($glyphLen > 2 && ($up[1] & (1 << 15)) ) {	// If number of contours <= -1 i.e. composite glyph
> 				$pos_in_glyph = 10;
> 				$flags = GF_MORE;
> 				$nComponentElements = 0;
> 				while ($flags & GF_MORE) {
> 					$nComponentElements += 1;	// number of glyphs referenced at top level
> 					$up = unpack("n", substr($data,$pos_in_glyph,2));
> 					$flags = $up[1];
> 					$up = unpack("n", substr($data,$pos_in_glyph+2,2));
> 					$glyphIdx = $up[1];
> 					$this->glyphdata[$originalGlyphIdx]['compGlyphs'][] = $glyphIdx;
> 					$data = $this->_set_ushort($data, $pos_in_glyph + 2, $glyphSet[$glyphIdx]);
> 					$pos_in_glyph += 4;
> 					if ($flags & GF_WORDS) { $pos_in_glyph += 4; }
> 					else { $pos_in_glyph += 2; }
> 					if ($flags & GF_SCALE) { $pos_in_glyph += 2; }
> 					else if ($flags & GF_XYSCALE) { $pos_in_glyph += 4; }
> 					else if ($flags & GF_TWOBYTWO) { $pos_in_glyph += 8; }
> 				}
> 				$maxComponentElements = max($maxComponentElements, $nComponentElements);
> 			}
> 
> 			$glyf .= $data;
> 			$pos += $glyphLen;
> 			if ($pos % 4 != 0) {
> 				$padding = 4 - ($pos % 4);
> 				$glyf .= str_repeat("\0",$padding);
> 				$pos += $padding;
> 			}
> 		}
> 
> 		$offsets[] = $pos;
> 		$this->add('glyf', $glyf);
> 
> 		// hmtx - Horizontal Metrics
> 		$this->add('hmtx', $hmtxstr);
> 
> 		// loca - Index to location
> 		$locastr = '';
> 		if ((($pos + 1) >> 1) > 0xFFFF) {
> 			$indexToLocFormat = 1;        // long format
> 			foreach($offsets AS $offset) { $locastr .= pack("N",$offset); }
> 		}
> 		else {
> 			$indexToLocFormat = 0;        // short format
> 			foreach($offsets AS $offset) { $locastr .= pack("n",($offset/2)); }
> 		}
> 		$this->add('loca', $locastr);
> 
> 		// head - Font header
> 		$head = $this->get_table('head');
> 		$head = $this->_set_ushort($head, 50, $indexToLocFormat);
> 		$this->add('head', $head);
> 
> 
> 		// hhea - Horizontal Header
> 		$hhea = $this->get_table('hhea');
> 		$hhea = $this->_set_ushort($hhea, 34, $numberOfHMetrics);
> 		$this->add('hhea', $hhea);
> 
> 		// maxp - Maximum Profile
> 		$maxp = $this->get_table('maxp');
> 		$maxp = $this->_set_ushort($maxp, 4, $numGlyphs);
> 		$this->add('maxp', $maxp);
> 
> 
> 		// OS/2 - OS/2
> 		$os2 = $this->get_table('OS/2');
> 		$this->add('OS/2', $os2 );
> 
> 		fclose($this->fh);
> 
> 		// Put the TTF file together
> 		$stm = '';
> 		$this->endTTFile($stm);
> 		return $stm ;
> 	}
> 
> 	//////////////////////////////////////////////////////////////////////////////////
> 	// Recursively get composite glyph data
> 	function getGlyphData($originalGlyphIdx, &$maxdepth, &$depth, &$points, &$contours) {
> 		$depth++;
> 		$maxdepth = max($maxdepth, $depth);
> 		if (count($this->glyphdata[$originalGlyphIdx]['compGlyphs'])) {
> 			foreach($this->glyphdata[$originalGlyphIdx]['compGlyphs'] AS $glyphIdx) {
> 				$this->getGlyphData($glyphIdx, $maxdepth, $depth, $points, $contours);
> 			}
> 		}
> 		else if (($this->glyphdata[$originalGlyphIdx]['nContours'] > 0) && $depth > 0) {	// simple
> 			$contours += $this->glyphdata[$originalGlyphIdx]['nContours'];
> 			$points += $this->glyphdata[$originalGlyphIdx]['nPoints'];
> 		}
> 		$depth--;
> 	}
> 
> 
> 	//////////////////////////////////////////////////////////////////////////////////
> 	// Recursively get composite glyphs
> 	function getGlyphs($originalGlyphIdx, &$start, &$glyphSet, &$subsetglyphs) {
> 		$glyphPos = $this->glyphPos[$originalGlyphIdx];
> 		$glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos;
> 		if (!$glyphLen) { 
> 			return;
> 		}
> 		$this->seek($start + $glyphPos);
> 		$numberOfContours = $this->read_short();
> 		if ($numberOfContours < 0) {
> 			$this->skip(8);
> 			$flags = GF_MORE;
> 			while ($flags & GF_MORE) {
> 				$flags = $this->read_ushort();
> 				$glyphIdx = $this->read_ushort();
> 				if (!isset($glyphSet[$glyphIdx])) {
> 					$glyphSet[$glyphIdx] = count($subsetglyphs);	// old glyphID to new glyphID
> 					$subsetglyphs[$glyphIdx] = true;
> 				}
> 				$savepos = ftell($this->fh);
> 				$this->getGlyphs($glyphIdx, $start, $glyphSet, $subsetglyphs);
> 				$this->seek($savepos);
> 				if ($flags & GF_WORDS)
> 					$this->skip(4);
> 				else
> 					$this->skip(2);
> 				if ($flags & GF_SCALE)
> 					$this->skip(2);
> 				else if ($flags & GF_XYSCALE)
> 					$this->skip(4);
> 				else if ($flags & GF_TWOBYTWO)
> 					$this->skip(8);
> 			}
> 		}
> 	}
> 
> 	//////////////////////////////////////////////////////////////////////////////////
> 
> 	function getHMTX($numberOfHMetrics, $numGlyphs, &$glyphToChar, $scale) {
> 		$start = $this->seek_table("hmtx");
> 		$aw = 0;
> 		$this->charWidths = str_pad('', 256*256*2, "\x00");
> 		$nCharWidths = 0;
> 		if (($numberOfHMetrics*4) < $this->maxStrLenRead) {
> 			$data = $this->get_chunk($start,($numberOfHMetrics*4));
> 			$arr = unpack("n*", $data);
> 		}
> 		else { $this->seek($start); }
> 		for( $glyph=0; $glyph<$numberOfHMetrics; $glyph++) {
> 
> 			if (($numberOfHMetrics*4) < $this->maxStrLenRead) {
> 				$aw = $arr[($glyph*2)+1];
> 			}
> 			else {
> 				$aw = $this->read_ushort();
> 				$lsb = $this->read_ushort();
> 			}
> 			if (isset($glyphToChar[$glyph]) || $glyph == 0) {
> 
> 				if ($aw >= (1 << 15) ) { $aw = 0; }	// 1.03 Some (arabic) fonts have -ve values for width
> 					// although should be unsigned value - comes out as e.g. 65108 (intended -50)
> 				if ($glyph == 0) {
> 					$this->defaultWidth = $scale*$aw;
> 					continue;
> 				}
> 				foreach($glyphToChar[$glyph] AS $char) {
> 					if ($char != 0 && $char != 65535) {
>  						$w = intval(round($scale*$aw));
> 						if ($w == 0) { $w = 65535; }
> 						if ($char < 196608) {
> 							$this->charWidths[$char*2] = chr($w >> 8);
> 							$this->charWidths[$char*2 + 1] = chr($w & 0xFF);
> 							$nCharWidths++;
> 						}
> 					}
> 				}
> 			}
> 		}
> 		$data = $this->get_chunk(($start+$numberOfHMetrics*4),($numGlyphs*2));
> 		$arr = unpack("n*", $data);
> 		$diff = $numGlyphs-$numberOfHMetrics;
> 		for( $pos=0; $pos<$diff; $pos++) {
> 			$glyph = $pos + $numberOfHMetrics;
> 			if (isset($glyphToChar[$glyph])) {
> 				foreach($glyphToChar[$glyph] AS $char) {
> 					if ($char != 0 && $char != 65535) {
> 						$w = intval(round($scale*$aw));
> 						if ($w == 0) { $w = 65535; }
> 						if ($char < 196608) {
> 							$this->charWidths[$char*2] = chr($w >> 8);
> 							$this->charWidths[$char*2 + 1] = chr($w & 0xFF);
> 							$nCharWidths++;
> 						}
> 					}
> 				}
> 			}
> 		}
> 		// NB 65535 is a set width of 0
> 		// First bytes define number of chars in font
> 		$this->charWidths[0] = chr($nCharWidths >> 8);
> 		$this->charWidths[1] = chr($nCharWidths & 0xFF);
> 	}
> 
> 	function getHMetric($numberOfHMetrics, $gid) {
> 		$start = $this->seek_table("hmtx");
> 		if ($gid < $numberOfHMetrics) {
> 			$this->seek($start+($gid*4));
> 			$hm = fread($this->fh,4);
> 		}
> 		else {
> 			$this->seek($start+(($numberOfHMetrics-1)*4));
> 			$hm = fread($this->fh,2);
> 			$this->seek($start+($numberOfHMetrics*2)+($gid*2));
> 			$hm .= fread($this->fh,2);
> 		}
> 		return $hm;
> 	}
> 
> 	function getLOCA($indexToLocFormat, $numGlyphs) {
> 		$start = $this->seek_table('loca');
> 		$this->glyphPos = array();
> 		if ($indexToLocFormat == 0) {
> 			$data = $this->get_chunk($start,($numGlyphs*2)+2);
> 			$arr = unpack("n*", $data);
> 			for ($n=0; $n<=$numGlyphs; $n++) {
> 				$this->glyphPos[] = ($arr[$n+1] * 2);
> 			}
> 		}
> 		else if ($indexToLocFormat == 1) {
> 			$data = $this->get_chunk($start,($numGlyphs*4)+4);
> 			$arr = unpack("N*", $data);
> 			for ($n=0; $n<=$numGlyphs; $n++) {
> 				$this->glyphPos[] = ($arr[$n+1]);
> 			}
> 		}
> 		else 
> 			die('Unknown location table format '.$indexToLocFormat);
> 	}
> 
> 
> 	// CMAP Format 4
> 	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
> 		$this->maxUniChar = 0;
> 		$this->seek($unicode_cmap_offset + 2);
> 		$length = $this->read_ushort();
> 		$limit = $unicode_cmap_offset + $length;
> 		$this->skip(2);
> 
> 		$segCount = $this->read_ushort() / 2;
> 		$this->skip(6);
> 		$endCount = array();
> 		for($i=0; $i<$segCount; $i++) { $endCount[] = $this->read_ushort(); }
> 		$this->skip(2);
> 		$startCount = array();
> 		for($i=0; $i<$segCount; $i++) { $startCount[] = $this->read_ushort(); }
> 		$idDelta = array();
> 		for($i=0; $i<$segCount; $i++) { $idDelta[] = $this->read_short(); }		// ???? was unsigned short
> 		$idRangeOffset_start = $this->_pos;
> 		$idRangeOffset = array();
> 		for($i=0; $i<$segCount; $i++) { $idRangeOffset[] = $this->read_ushort(); }
> 
> 		for ($n=0;$n<$segCount;$n++) {
> 			$endpoint = ($endCount[$n] + 1);
> 			for ($unichar=$startCount[$n];$unichar<$endpoint;$unichar++) {
> 				if ($idRangeOffset[$n] == 0)
> 					$glyph = ($unichar + $idDelta[$n]) & 0xFFFF;
> 				else {
> 					$offset = ($unichar - $startCount[$n]) * 2 + $idRangeOffset[$n];
> 					$offset = $idRangeOffset_start + 2 * $n + $offset;
> 					if ($offset >= $limit)
> 						$glyph = 0;
> 					else {
> 						$glyph = $this->get_ushort($offset);
> 						if ($glyph != 0)
> 						   $glyph = ($glyph + $idDelta[$n]) & 0xFFFF;
> 					}
> 				}
> 				$charToGlyph[$unichar] = $glyph;
> 				if ($unichar < 196608) { $this->maxUniChar = max($unichar,$this->maxUniChar); }
> 				$glyphToChar[$glyph][] = $unichar;
> 			}
> 		}
> 	}
> 
> 
> 		// Put the TTF file together
> 	function endTTFile(&$stm) {
> 		$stm = '';
> 		$numTables = count($this->otables);
> 		$searchRange = 1;
> 		$entrySelector = 0;
> 		while ($searchRange * 2 <= $numTables) {
> 			$searchRange = $searchRange * 2;
> 			$entrySelector = $entrySelector + 1;
> 		}
> 		$searchRange = $searchRange * 16;
> 		$rangeShift = $numTables * 16 - $searchRange;
> 
> 		// Header
> 		if (_TTF_MAC_HEADER) {
> 			$stm .= (pack("Nnnnn", 0x74727565, $numTables, $searchRange, $entrySelector, $rangeShift));	// Mac
> 		}
> 		else {
> 			$stm .= (pack("Nnnnn", 0x00010000 , $numTables, $searchRange, $entrySelector, $rangeShift));	// Windows
> 		}
> 
> 		// Table directory
> 		$tables = $this->otables;
> 
> 		ksort ($tables); 
> 		$offset = 12 + $numTables * 16;
> 		foreach ($tables AS $tag=>$data) {
> 			if ($tag == 'head') { $head_start = $offset; }
> 			$stm .= $tag;
> 			$checksum = $this->calcChecksum($data);
> 			$stm .= pack("nn", $checksum[0],$checksum[1]);
> 			$stm .= pack("NN", $offset, strlen($data));
> 			$paddedLength = (strlen($data)+3)&~3;
> 			$offset = $offset + $paddedLength;
> 		}
> 
> 		// Table data
> 		foreach ($tables AS $tag=>$data) {
> 			$data .= "\0\0\0";
> 			$stm .= substr($data,0,(strlen($data)&~3));
> 		}
> 
> 		$checksum = $this->calcChecksum($stm);
> 		$checksum = $this->sub32(array(0xB1B0,0xAFBA), $checksum);
> 		$chk = pack("nn", $checksum[0],$checksum[1]);
> 		$stm = $this->splice($stm,($head_start + 8),$chk);
> 		return $stm ;
> 	}
> 
> }
> 
> ?>
diff -r TNG/footer.php TNG1403/footer.php
5c5
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/fpdf.php TNG1403/fpdf.php
5,6c5,6
< * Version: 1.81                                                                *
< * Date:    2015-12-20                                                          *
---
> * Version: 1.85                                                                *
> * Date:    2022-11-10                                                          *
10,11d9
< define('FPDF_VERSION','1.81');
< 
13a12
> const VERSION = '1.85';
20a20
> protected $iconv;              // whether iconv is available
67a68
> protected $CreationDate;       // document creation date
76,77d76
< 	// Some checks
< 	$this->_dochecks();
103a103
> 	$this->iconv = function_exists('iconv');
167a168,169
> 	// Metadata
> 	$this->metadata = array('Producer'=>'FPDF '.self::VERSION);
235c237
< 	$this->metadata['Title'] = $isUTF8 ? $title : utf8_encode($title);
---
> 	$this->metadata['Title'] = $isUTF8 ? $title : $this->_UTF8encode($title);
241c243
< 	$this->metadata['Author'] = $isUTF8 ? $author : utf8_encode($author);
---
> 	$this->metadata['Author'] = $isUTF8 ? $author : $this->_UTF8encode($author);
247c249
< 	$this->metadata['Subject'] = $isUTF8 ? $subject : utf8_encode($subject);
---
> 	$this->metadata['Subject'] = $isUTF8 ? $subject : $this->_UTF8encode($subject);
253c255
< 	$this->metadata['Keywords'] = $isUTF8 ? $keywords : utf8_encode($keywords);
---
> 	$this->metadata['Keywords'] = $isUTF8 ? $keywords : $this->_UTF8encode($keywords);
259c261
< 	$this->metadata['Creator'] = $isUTF8 ? $creator : utf8_encode($creator);
---
> 	$this->metadata['Creator'] = $isUTF8 ? $creator : $this->_UTF8encode($creator);
412,413c414
< 	$s = (string)$s;
< 	$cw = &$this->CurrentFont['cw'];
---
> 	$cw = $this->CurrentFont['cw'];
414a416
> 	$s = (string)$s;
517c519
< 	$this->CurrentFont = &$this->fonts[$fontkey];
---
> 	$this->CurrentFont = $this->fonts[$fontkey];
529c531
< 	if($this->page>0)
---
> 	if($this->page>0 && isset($this->CurrentFont))
561a564
> 	$txt = (string)$txt;
563c566
< 	if($this->underline && $txt!='')
---
> 	if($this->underline && $txt!=='')
621a625
> 	$txt = (string)$txt;
661c665
< 	$cw = &$this->CurrentFont['cw'];
---
> 	$cw = $this->CurrentFont['cw'];
665c669
< 	$s = str_replace("\r",'',$txt);
---
> 	$s = str_replace("\r",'',(string)$txt);
776c780
< 	$cw = &$this->CurrentFont['cw'];
---
> 	$cw = $this->CurrentFont['cw'];
779c783
< 	$s = str_replace("\r",'',$txt);
---
> 	$s = str_replace("\r",'',(string)$txt);
1013c1017
< 			header('Content-Type: application/x-download');
---
> 			header('Content-Type: application/pdf');
1037,1046d1040
< protected function _dochecks()
< {
< 	// Check mbstring overloading
< 	if(ini_get('mbstring.func_overload') & 2)
< 		$this->Error('mbstring overloading must be disabled');
< 	// Ensure runtime magic quotes are disabled
< 	if(get_magic_quotes_runtime())
< 		@set_magic_quotes_runtime(0);
< }
< 
1089a1084
> 	$this->PageLinks[$this->page] = array();
1128d1122
< 		$this->CurRotation = $rotation;
1130a1125
> 	$this->CurRotation = $rotation;
1171,1175c1166,1189
< 		$value = utf8_encode($value);
< 	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false)
< 		return $param.'="'.rawurlencode($value).'"';
< 	else
< 		return $param."*=UTF-8''".rawurlencode($value);
---
> 		$value = $this->_UTF8encode($value);
> 	return $param."*=UTF-8''".rawurlencode($value);
> }
> 
> protected function _UTF8encode($s)
> {
> 	// Convert ISO-8859-1 to UTF-8
> 	if($this->iconv)
> 		return iconv('ISO-8859-1','UTF-8',$s);
> 	$res = '';
> 	$nb = strlen($s);
> 	for($i=0;$i<$nb;$i++)
> 	{
> 		$c = $s[$i];
> 		$v = ord($c);
> 		if($v>=128)
> 		{
> 			$res .= chr(0xC0 | ($v >> 6));
> 			$res .= chr(0x80 | ($v & 0x3F));
> 		}
> 		else
> 			$res .= $c;
> 	}
> 	return $res;
1181a1196,1197
> 	if($this->iconv)
> 		return $res.iconv('UTF-8','UTF-16BE',$s);
1228c1244
< protected function _dounderline($x, $y, $width, $txt)
---
> protected function _dounderline($x, $y, $txt)
1444c1460
< 	// Add a line to the document
---
> 	// Add a line to the current page
1447,1448d1462
< 	elseif($this->state==1)
< 		$this->_put($s);
1450a1465,1466
> 	elseif($this->state==1)
> 		$this->Error('Invalid call');
1456a1473
> 	// Add a line to the document
1496a1514,1536
> protected function _putlinks($n)
> {
> 	foreach($this->PageLinks[$n] as $pl)
> 	{
> 		$this->_newobj();
> 		$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
> 		$s = '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
> 		if(is_string($pl[4]))
> 			$s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
> 		else
> 		{
> 			$l = $this->links[$pl[4]];
> 			if(isset($this->PageInfo[$l[0]]['size']))
> 				$h = $this->PageInfo[$l[0]]['size'][1];
> 			else
> 				$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
> 			$s .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
> 		}
> 		$this->_put($s);
> 		$this->_put('endobj');
> 	}
> }
> 
1507c1547
< 	if(isset($this->PageLinks[$n]))
---
> 	if(!empty($this->PageLinks[$n]))
1509,1510c1549
< 		// Links
< 		$annots = '/Annots [';
---
> 		$s = '/Annots [';
1512,1527c1551,1553
< 		{
< 			$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
< 			$annots .= '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
< 			if(is_string($pl[4]))
< 				$annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
< 			else
< 			{
< 				$l = $this->links[$pl[4]];
< 				if(isset($this->PageInfo[$l[0]]['size']))
< 					$h = $this->PageInfo[$l[0]]['size'][1];
< 				else
< 					$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
< 				$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
< 			}
< 		}
< 		$this->_put($annots.']');
---
> 			$s .= $pl[5].' 0 R ';
> 		$s .= ']';
> 		$this->_put($s);
1536a1563,1564
> 	// Link annotations
> 	$this->_putlinks($n);
1542,1545c1570,1580
< 	for($n=1;$n<=$nb;$n++)
< 		$this->PageInfo[$n]['n'] = $this->n+1+2*($n-1);
< 	for($n=1;$n<=$nb;$n++)
< 		$this->_putpage($n);
---
> 	$n = $this->n;
> 	for($i=1;$i<=$nb;$i++)
> 	{
> 		$this->PageInfo[$i]['n'] = ++$n;
> 		$n++;
> 		foreach($this->PageLinks[$i] as &$pl)
> 			$pl[5] = ++$n;
> 		unset($pl);
> 	}
> 	for($i=1;$i<=$nb;$i++)
> 		$this->_putpage($i);
1550,1552c1585,1588
< 	for($n=1;$n<=$nb;$n++)
< 		$kids .= $this->PageInfo[$n]['n'].' 0 R ';
< 	$this->_put($kids.']');
---
> 	for($i=1;$i<=$nb;$i++)
> 		$kids .= $this->PageInfo[$i]['n'].' 0 R ';
> 	$kids .= ']';
> 	$this->_put($kids);
1659c1695
< 			$cw = &$font['cw'];
---
> 			$cw = $font['cw'];
1824,1825c1860,1861
< 	$this->metadata['Producer'] = 'FPDF '.FPDF_VERSION;
< 	$this->metadata['CreationDate'] = 'D:'.@date('YmdHis');
---
> 	$date = @date('YmdHisO', $this->CreationDate);
> 	$this->metadata['CreationDate'] = 'D:'.substr($date,0,-2)."'".substr($date,-2)."'";
1895a1932
> 	$this->CreationDate = time();
diff -r TNG/functions.php TNG1403/functions.php
7c7
< 	return $row[$itemname];
---
> 	return isset($row[$itemname]) ? $row[$itemname] : "";
68c68
< 	global $getperson_url, $livedefault, $whatsnew, $wherestr2, $showmap_url, $thumbmaxw, $events_table, $eventtypes_table, $altstr, $tngconfig, $maxmediafilesize;
---
> 	global $getperson_url, $livedefault, $whatsnew, $wherestr2, $showmap_url, $thumbmaxw, $events_table, $eventtypes_table, $altstr, $tngconfig, $maxmediafilesize, $allow_private;
77c77
< 	$query = "SELECT distinct $media_table.mediaID as mediaID, description $altstr, $media_table.notes, thumbpath, path, form, mediatypeID, $media_table.gedcom as gedcom, alwayson, usecollfolder, DATE_FORMAT(changedate,'%e %b %Y') as changedatef, changedby, status, plot, abspath, newwindow $hsfields";
---
> 	$query = "SELECT distinct $media_table.mediaID as mediaID, description $altstr, $media_table.notes, thumbpath, path, form, mediatypeID, $media_table.gedcom as gedcom, alwayson, usecollfolder, private, DATE_FORMAT(changedate,'%e %b %Y') as changedatef, changedby, status, plot, abspath, newwindow $hsfields";
94c94
< 	$titlemsg = $text[$mediatypeID] ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
---
> 	$titlemsg = !empty($text[$mediatypeID]) ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
104a105,107
> 	    if(!isset($row['altnotes'])) $row['altnotes'] = "";
> 	    if(!isset($row['altdescription'])) $row['altdescription'] = "";
> 
110c113,114
< 			people.prefix as prefix, people.suffix as suffix, nameorder, $medialinks_table.gedcom as gedcom, treename, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID,reponame, deathdate, burialdate, linktype
---
> 			people.prefix as prefix, people.suffix as suffix, nameorder, people.title, $medialinks_table.gedcom as gedcom, treename, $sources_table.title AS stitle, $sources_table.sourceID, $repositories_table.repoID,reponame, linktype,
> 			birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, burialdate
120c124
< 		$foundprivate = 0;
---
> 		$foundprivate = $row['private'] && !$allow_private; //if the image is flagged as private, it starts off that way
139c143
< 			
---
> 
160c164
< 				$sourcetext = $prow['title'] ? $text['source'] . ": " . $prow['title'] : $text['source'] . ": " . $prow['sourceID'];
---
> 				$sourcetext = $prow['stitle'] ? $text['source'] . ": " . $prow['stitle'] : $text['source'] . ": " . $prow['sourceID'];
177c181
< 				$event = $erow['display'] && is_numeric($prow['eventID']) ? getEventDisplay( $erow['display'] ) : ($admtext[$prow['eventID']] ? $admtext[$prow['eventID']] : $prow['eventID']);
---
> 				$event = !empty($erow['display']) && is_numeric($prow['eventID']) ? getEventDisplay( $erow['display'] ) : (!empty($admtext[$prow['eventID']]) ? $admtext[$prow['eventID']] : $prow['eventID']);
186c190,192
< 		$showPhotoInfo = $row['allow_living'] = $row['alwayson'] || (!$foundprivate && !$foundliving);
---
> 		$row['allow_living'] = !$foundliving || $row['alwayson'];
> 		$row['allow_private'] = !$foundprivate || $row['alwayson'];
> 		$showPhotoInfo = $row['allow_living'] && $row['allow_private'];
194,195c200,201
< 		if( $row['allow_living'] ) {
< 			$description = $showPhotoInfo ? "<a href=\"$href\">$description</a>" : $description;
---
> 		if( $row['allow_living'] && $row['allow_private'] ) {
> 			$description = $showPhotoInfo ? "<a href=\"$href\" class=\"media-title\">$description</a>" : "<span class=\"media-title\">$description</span>";
200c206
< 				$description = $text['livingphoto'];
---
> 				$description = "<span class=\"media-title\">{$text['livingphoto']}</span>";
diff -r TNG/gedcom.php TNG1403/gedcom.php
16a17
> $placelist = array();
40c41
< 		if( $ind['famc'] && ( $generation < $maxgcgen ) ) {
---
> 		if( $ind['famc'] && ( $generation <= $maxgcgen ) ) {
149c150,153
< 	if( $custevent['eventplace'] )  $info .= "2 PLAC {$custevent['eventplace']}$lineending";
---
> 	if( $custevent['eventplace'] ) {
> 		$info .= "2 PLAC {$custevent['eventplace']}$lineending";
> 		savePlace($custevent['eventplace']);
> 	}
171c175
< 		if( !is_array( $notearray[$eventid] ) ) $notearray[$eventid] = array();
---
> 		if( !isset($notearray[$eventid]) || !is_array( $notearray[$eventid] ) ) $notearray[$eventid] = array();
206c210
< 			$note = substr( $note, 0, $offset );   // moved line above close - Réal
---
> 			$note = substr( $note, 0, $offset );   // moved line above close - Réal
263c267,268
< 		 	$noteinfo .= writeCitation( $citations[$id], $level + 1 );
---
> 			if( !empty($citations[$id]) )
> 				$noteinfo .= writeCitation( $citations[$id], $level + 1 );
265a271,272
> 	elseif( $notes )
> 		$noteinfo .= doNote( $level, $label, $notes );
299c306
< 		if(!$gotfamily[$parents]) {
---
> 		if(empty($gotfamily[$parents])) {
337c344
< 				$query = "SELECT familyID, $children_table.personID as personID, sealdate, sealplace, mrel, frel, living, private, branch FROM $children_table, $people_table WHERE familyID = \"$parents\" AND $children_table.gedcom = \"$tree\" AND $children_table.personID = $people_table.personID AND $children_table.gedcom = $people_table.gedcom ORDER BY ordernum";
---
> 				$query = "SELECT familyID, $children_table.personID as personID, sealdate, sealplace, mrel, frel, living, private, $children_table.gedcom, branch, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr FROM $children_table, $people_table WHERE familyID = \"$parents\" AND $children_table.gedcom = \"$tree\" AND $children_table.personID = $people_table.personID AND $children_table.gedcom = $people_table.gedcom ORDER BY ordernum";
364c371
< 	$crights = determineLivingPrivateRights($row, $righttree);
---
> 	$crights = determineLivingPrivateRights($child, $righttree);
369c376
< 		if( $rights['lds'] && $ldsOK ) {
---
> 		if( $crights['lds'] && $ldsOK ) {
382c389
< 						if( $tok )
---
> 						if( $tok ) {
383a391,392
> 							savePlace($tok);
> 						}
385c394
< 					else
---
> 					else {
386a396,397
> 						savePlace($chile['sealplace']);
> 					}
388c399
< 				if( $childnotes['SLGC'] )
---
> 				if( !empty($childnotes['SLGC']) )
390c401
< 				if( $citations['SLGC'] ) { 
---
> 				if( !empty($citations['SLGC']) ) {
402c413
< 	$query = "SELECT lastname, lnprefix, firstname, sex, title, prefix, suffix, nameorder, nickname, birthdate, birthplace, altbirthdate, altbirthplace, deathdate, deathplace, burialdate, burialplace, burialtype, baptdate, baptplace, confdate, confplace, initdate, initplace, endldate, endlplace, famc, living, private, branch, DATE_FORMAT(changedate,\"%d %b %Y\") as changedate FROM $people_table WHERE personID = \"$person\" AND gedcom = \"$tree\"";
---
> 	$query = "SELECT lastname, lnprefix, firstname, sex, title, prefix, suffix, nameorder, nickname, birthdate, birthplace, altbirthtype, altbirthdate, altbirthplace, deathdate, deathplace, burialdate, burialplace, burialtype, baptdate, baptplace, confdate, confplace, initdate, initplace, endldate, endlplace, famc, living, private, gedcom, branch, DATE_FORMAT(changedate,\"%d %b %Y\") as changedate FROM $people_table WHERE personID = \"$person\" AND gedcom = \"$tree\"";
404,405c415,417
< 	if( $result ) {
< 		$ind = tng_fetch_assoc( $result );
---
> 	$ind = tng_fetch_assoc( $result );
> 	$info = "";
> 	if( $ind ) {
406a419
> 		if(empty($ind['altbirthtype'])) $ind['altbirthtype'] = "CHR";
426c439
< 			if( $indnotes['NAME'] )
---
> 			if( !empty($indnotes['NAME']) )
430c443
< 				if( $indnotes['NPFX'] )
---
> 				if( !empty($indnotes['NPFX']) )
435c448
< 				if( $indnotes['NSFX'] )
---
> 				if( !empty($indnotes['NSFX']) )
440c453
< 				if( $indnotes['NICK'] )
---
> 				if( !empty($indnotes['NICK']) )
443c456
< 			if( $citations['NAME'] )
---
> 			if( !empty($citations['NAME']) )
447c460
< 				if( $indnotes['TITL'] )
---
> 				if( !empty($indnotes['TITL']) )
455c468
< 			if( $citations['-x--general--x-'] )
---
> 			if( !empty($citations['-x--general--x-']) )
466c479
< 			if( $ind['birthdate'] || $ind['birthplace'] || $indnotes['BIRT'] || $citations['BIRT'] || $extras['BIRT'] ) {
---
> 			if( $ind['birthdate'] || $ind['birthplace'] || !empty($indnotes['BIRT']) || !empty($citations['BIRT']) || !empty($extras['BIRT']) ) {
472c485,488
< 					if( $ind['birthplace'] ) { $info .= "2 PLAC {$ind['birthplace']}$lineending"; }
---
> 					if( $ind['birthplace'] ) {
> 						$info .= "2 PLAC {$ind['birthplace']}$lineending";
> 						savePlace($ind['birthplace']);
> 					}
474c490
< 				if( $indnotes['BIRT'] )
---
> 				if( !empty($indnotes['BIRT']) )
476c492
< 				if( $citations['BIRT'] )
---
> 				if( !empty($citations['BIRT']) )
478c494,495
< 				$info .= $extras['BIRT'];
---
> 				if( !empty($extras['BIRT']) )
> 					$info .= $extras['BIRT'];
480c497
< 			if( $ind['altbirthdate'] || $ind['altbirthplace'] || $indnotes['CHR'] || $citations['CHR'] || $extras['CHR'] ) {
---
> 			if( $ind['altbirthdate'] || $ind['altbirthplace'] || !empty($indnotes[$ind['altbirthtype']]) || !empty($citations[$ind['altbirthtype']]) || !empty($extras[$ind['altbirthtype']]) ) {
482c499
< 					$info .= "1 CHR Y$lineending";
---
> 					$info .= "1 {$ind['altbirthtype']} Y$lineending";
484c501
< 					$info .= "1 CHR$lineending";
---
> 					$info .= "1 {$ind['altbirthtype']}$lineending";
486c503,506
< 					if( $ind['altbirthplace'] ) { $info .= "2 PLAC {$ind['altbirthplace']}$lineending"; }
---
> 					if( $ind['altbirthplace'] ) {
> 						$info .= "2 PLAC {$ind['altbirthplace']}$lineending";
> 						savePlace($ind['altbirthplace']);
> 					}
488,492c508,513
< 				if( $indnotes['CHR'] )
< 					$info .= writeNote( 2, "NOTE", $indnotes['CHR'] );
< 				if( $citations['CHR'] )
< 					$info .= writeCitation( $citations['CHR'], 2 );
< 				$info .= $extras['CHR'];
---
> 				if( !empty($indnotes[$ind['altbirthtype']]) )
> 					$info .= writeNote( 2, "NOTE", $indnotes[$ind['altbirthtype']] );
> 				if( !empty($citations[$ind['altbirthtype']]) )
> 					$info .= writeCitation( $citations[$ind['altbirthtype']], 2 );
> 				if( !empty($extras[$ind['altbirthtype']]) )
> 					$info .= $extras[$ind['altbirthtype']];
494c515
< 			if( $ind['deathdate'] || $ind['deathplace'] || $indnotes['DEAT'] || $citations['DEAT'] || $extras['DEAT'] ) {
---
> 			if( $ind['deathdate'] || $ind['deathplace'] || !empty($indnotes['DEAT']) || !empty($citations['DEAT']) || !empty($extras['DEAT']) ) {
500c521,524
< 					if( $ind['deathplace'] ) { $info .= "2 PLAC {$ind['deathplace']}$lineending"; }
---
> 					if( $ind['deathplace'] ) {
> 						$info .= "2 PLAC {$ind['deathplace']}$lineending";
> 						savePlace($ind['deathplace']);
> 					}
502c526
< 				if( $indnotes['DEAT'] )
---
> 				if( !empty($indnotes['DEAT']) )
504c528
< 				if( $citations['DEAT'] )
---
> 				if( !empty($citations['DEAT']) )
506c530,531
< 				$info .= $extras['DEAT'];
---
> 				if( !empty($extras['DEAT']) )
> 					$info .= $extras['DEAT'];
508c533
< 			if( $ind['burialdate'] || $ind['burialplace'] || $indnotes['BURI'] || $citations['BURI'] || $extras['BURI'] ) {
---
> 			if( $ind['burialdate'] || $ind['burialplace'] || !empty($indnotes['BURI']) || !empty($citations['BURI']) || !empty($extras['BURI']) ) {
515c540,543
< 					if( $ind['burialplace'] ) { $info .= "2 PLAC {$ind['burialplace']}$lineending"; }
---
> 					if( $ind['burialplace'] ) {
> 						$info .= "2 PLAC {$ind['burialplace']}$lineending";
> 						savePlace($ind['burialplace']);
> 					}
517c545
< 				if( $indnotes['BURI'] )
---
> 				if( !empty($indnotes['BURI']) )
519c547
< 				if( $citations['BURI'] )
---
> 				if( !empty($citations['BURI']) )
521c549,550
< 				$info .= $extras['BURI'];
---
> 				if( !empty($extras['BURI']) )
> 					$info .= $extras['BURI'];
529c558
< 				if( $indnotes[$eventID] )
---
> 				if( !empty($indnotes[$eventID]) )
531c560
< 				if( $citations[$eventID] )
---
> 				if( !empty($citations[$eventID]) )
550c579
< 			if( $indnotes['-x--general--x-'] )
---
> 			if( !empty($indnotes['-x--general--x-']) )
576c605
< 				if( $tok )
---
> 				if( $tok ) {
577a607,608
> 					savePlace($tok);
> 				}
579c610
< 			else
---
> 			else {
580a612,613
> 				savePlace($row[$key.'place']);
> 			}
595c628
< 	if($famarray[$familyID]) return $famarray[$familyID];
---
> 	if(!empty($famarray[$familyID])) return $famarray[$familyID];
615c648
< 			if( $family['marrdate'] || $family['marrplace'] || $famnotes['MARR'] || $citations['MARR'] || $extras['MARR'] || $family['marrtype'] ) {
---
> 			if( $family['marrdate'] || $family['marrplace'] || !empty($famnotes['MARR']) || !empty($citations['MARR']) || !empty($extras['MARR']) || $family['marrtype'] ) {
621c654,657
< 					if( $family['marrplace'] ) { $info .= "2 PLAC {$family['marrplace']}$lineending"; }
---
> 					if( $family['marrplace'] ) {
> 						$info .= "2 PLAC {$family['marrplace']}$lineending";
> 						savePlace($family['marrplace']);
> 					}
624c660
< 				if( $famnotes['MARR'] )
---
> 				if( !empty($famnotes['MARR']) )
626c662
< 				if( $citations['MARR'] )
---
> 				if( !empty($citations['MARR']) )
628c664,665
< 				$info .= $extras['MARR'];
---
> 				if( !empty($extras['MARR']) )
> 					$info .= $extras['MARR'];
630c667
< 			if( $family['divdate'] || $family['divplace'] || $famnotes['DIV'] || $citations['DIV'] || $extras['DIV'] ) {
---
> 			if( $family['divdate'] || $family['divplace'] || !empty($famnotes['DIV']) || !empty($citations['DIV']) || !empty($extras['DIV']) ) {
636c673,676
< 					if( $family['divplace'] ) { $info .= "2 PLAC {$family['divplace']}$lineending"; }
---
> 					if( $family['divplace'] ) {
> 						$info .= "2 PLAC {$family['divplace']}$lineending";
> 						savePlace($family['divplace']);
> 					}
638c678
< 				if( $famnotes['DIV'] )
---
> 				if( !empty($famnotes['DIV']) )
640c680
< 				if( $citations['DIV'] )
---
> 				if( !empty($citations['DIV']) )
642c682,683
< 				$info .= $extras['DIV'];
---
> 				if( !empty($extras['DIV']) )
> 					$info .= $extras['DIV'];
650c691
< 				if( $famnotes[$eventID] )
---
> 				if( !empty($famnotes[$eventID]) )
652c693
< 				if( $citations[$eventID] )
---
> 				if( !empty($citations[$eventID]) )
666c707
< 							if( $tok )
---
> 							if( $tok ) {
667a709,710
> 								savePlace($tok);
> 							}
669c712
< 						else
---
> 						else {
670a714,715
> 							savePlace($fam['sealplace']);
> 						}
672c717
< 					if( $famnotes['SLGS'] )
---
> 					if( !empty($famnotes['SLGS']) )
674c719
< 					if( $citations['SLGS'] )
---
> 					if( !empty($citations['SLGS']) )
676c721,722
< 					$info .= $extras['SLGS'];
---
> 					if( !empty($extras['SLGS']) )
> 						$info .= $extras['SLGS'];
679c725
< 			if( $citations['NAME'] )
---
> 			if( !empty($citations['NAME']) )
682c728
< 			if( $famnotes['-x--general--x-'] )
---
> 			if( !empty($famnotes['-x--general--x-']) )
721c767
< 			if( !$famarray[$family['familyID']]) {
---
> 			if( empty($famarray[$family['familyID']]) ) {
734,735c780,781
< 				if( $generation > 0 ) {
< 					$query = "SELECT $children_table.personID as personID, familyID, mrel, frel, living, private, branch FROM $children_table, $people_table WHERE familyID = \"{$family['familyID']}\" AND $children_table.personID = $people_table.personID AND $children_table.gedcom = \"$tree\" AND $people_table.gedcom = \"$tree\" ORDER BY ordernum";
---
> 				if( $generation > 0 && $generation <= $maxgcgen ) {
> 					$query = "SELECT $children_table.personID as personID, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, familyID, mrel, frel, living, private, $children_table.gedcom, branch FROM $children_table, $people_table WHERE familyID = \"{$family['familyID']}\" AND $children_table.personID = $people_table.personID AND $children_table.gedcom = \"$tree\" AND $people_table.gedcom = \"$tree\" ORDER BY ordernum";
770d815
< 				if( $source['callnum'] ) { echo "1 CALN {$source['callnum']}$lineending"; }
789c834
< 				if( $srcnotes['-x--general--x-'] )
---
> 				if( !empty($srcnotes['-x--general--x-']) )
830c875,911
< if( $maxgcgen > 0 || $type == "all" ) {
---
> function savePlace($place) {
> 	global $placelist;
> 
> 	if(!in_array($place,$placelist))
> 		array_push($placelist, $place);
> }
> 
> function doPlaces() {
>     global $placelist, $tngconfig, $tree, $admtext, $places_table, $lineending;
> 
>     if($tngconfig['places1tree'])
>         $treestr = "";
>     else
>         $treestr = "AND $places_table.gedcom = \"$tree\"";
> 
> 	foreach ($placelist as $place){
> 		$query = "SELECT place, notes, latitude, longitude, placelevel, zoom FROM $places_table WHERE place = \"" . addslashes($place) . "\" $treestr";
> 		$result = @tng_query($query) or die($admtext['cannotexecutequery'] . ": $query");
> 
> 		$row = tng_fetch_assoc( $result );
> 		if($row['latitude'] || $row['longitude'] || $row['notes']) {
> 	 		echo "0 _PLAC {$row['place']}$lineending";
> 	        if($row['latitude'] || $row['longitude']) {
> 	            echo "1 MAP$lineending";
> 	            echo "2 LATI {$row['latitude']}$lineending";
> 	            echo "2 LONG {$row['longitude']}$lineending";
> 	            echo "2 ZOOM {$row['zoom']}$lineending";
> 	            echo "2 PLEV {$row['placelevel']}$lineending";
> 	        }
> 	        if($row['notes'])
> 	            echo writeNote( 1, "NOTE", $row['notes'] );
> 	    }
> 		tng_free_result( $result );
>     }
> }
> 
> if( $maxgcgen >= 0 || $type == "all" ) {
835c916
< 	$query = "SELECT firstname, lnprefix, lastname, suffix, living, private, branch FROM $people_table WHERE personID = \"$personID\" AND $people_table.gedcom = \"$tree\"";
---
> 	$query = "SELECT firstname, lnprefix, lastname, title, prefix, suffix, living, private, branch, gedcom FROM $people_table WHERE personID = \"$personID\" AND $people_table.gedcom = \"$tree\"";
848c929
< 		    $filenamestr = utf8_decode( $filenamestr );
---
> 		    $filenamestr = mb_convert_encoding( $filenamestr, 'ISO-8859-1', 'UTF-8' );
871c952
< 	. "2 VERS 5.5$lineending"
---
> 	. "2 VERS 5.5.1$lineending"
878c959
< 	. "1 DEST Gedcom55$lineending";
---
> 	. "1 DEST 5.5.1$lineending";
888a970
> 		if(!$maxgcgen) $generation++;
942a1025
> 	doPlaces();
diff -r TNG/gedform.php TNG1403/gedform.php
4a5,6
> if( empty($personID) ) die("missing required arguments\n");
> 
19c21
< $disallowgedcreate = $row['disallowgedcreate'];
---
> $disallowgedcreate = $treerow['disallowgedcreate'];
27,28c29
< $flags['tabs'] = $tngconfig['tabs'];
< $flags['scripting'] = "<script language=\"JavaScript\" type=\"text/javascript\">
---
> $flags['scripting'] = "<script type=\"text/javascript\">
59c60
< <table border="0" cellspacing="1" cellpadding="4" class="whiteback">
---
> <table border="0" cellspacing="1" cellpadding="4" class="tfixed whiteback" style="width:80%">
70a72
> 	<option value="0">0</option>
73,74c75,78
< 	for( $i = 1; $i <= $maxgedcom; $i++ )
< 		echo "<option value=\"$i\">$i</option>\n";
---
> 	for( $i = 1; $i <= $maxgedcom; $i++ ) {
> 		$selected = $i == 1 ? " selected=\"selected\"" : "";
> 		echo "<option value=\"$i\"{$selected}>$i</option>\n";
> 	}
diff -r TNG/gedimport_families.php TNG1403/gedimport_families.php
1a2,14
> function initFamily() {
> 	$info = array();
> 
> 	$info['MARR'] = initEvent();
> 	$info['SLGS'] = initEvent();
> 	$info['DIV'] = initEvent();
> 
> 	$info['HUSB'] = "";
> 	$info['WIFE'] = "";
> 
> 	return $info;
> }
> 
6c19
< 	$familyID = adjustID( $familyID, $savestate['foffset'] );
---
> 	$familyID = adjustID( $familyID, $savestate['foffset'], "F" );
9c22
< 	$info = array(); 
---
> 	$info = initFamily(); 
11,12d23
< 	$info['MARR'] = array();
< 	$info['SLGS'] = array();
34c45
< 					$info[$tag] = adjustID( $matches[1], $savestate['ioffset'] );
---
> 					$info[$tag] = adjustID( $matches[1], $savestate['ioffset'], "I" );
42c53
< 						$events[$custeventctr] = array();
---
> 						$events[$custeventctr] = initEventHolder();
54,55c65,79
< 						if( isset( $info[$tag]['FACT'] ) && !isset( $info[$tag]['DATE'] ) && !isset( $info[$tag]['PLAC'] ) ) $info[$tag]['DATE'] = $info[$tag]['FACT'];
< 						if( isset( $info[$tag]['extra'] ) ) {
---
> 						if(!empty($info[$tag]['FACT'])) {
> 							if(empty( $info[$tag]['DATE'] ) && empty( $info[$tag]['PLAC'] ) ) 
> 								$info[$tag]['DATE'] = $info[$tag]['FACT'];
> 							elseif($info[$tag]['FACT'] != "Y") {
> 								if(empty($info[$tag]['NOTES'])) {
> 									$info[$tag]['NOTES'] = array();
> 									$notectr = 0;
> 								}
> 								else
> 									$notectr = count($info[$tag]['NOTES']);
> 								$info[$tag]['NOTES'][$notectr] = array("NOTE"=>$info[$tag]['FACT'], "TAG"=>$tag, "XNOTE"=>"");
> 								dumpnotes( $info[$tag]['NOTES'] );
> 							}
> 						}
> 						if( !empty( $info[$tag]['extra'] ) ) {
58c82
< 							$events[$custeventctr] = array();
---
> 							$events[$custeventctr] = initEventHolder();
65c89,90
< 								$events[$custeventctr]['INFO']['SOUR'] = "";
---
> 								$events[$custeventctr]['INFO']['SOUR'] = array();
> 								$events[$custeventctr]['INFO']['MEDIA'] = "";
97c122
< 					$child = adjustID( $matches[1], $savestate['ioffset'] );
---
> 					$child = adjustID( $matches[1], $savestate['ioffset'], "I" );
128c153
< 					$thisassoc['asso'] = adjustID( $matches[1], $countertouse );
---
> 					$thisassoc['asso'] = adjustID( $matches[1], $countertouse, $thisassoc['reltype'] );
134a160
> 				case "SNOTE":
136d161
< 					$notecount++;
139,140c164,165
< 					if( $matches[1] ) {
< 						$stdnotes[$notecount]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'] );
---
> 					if( !empty($matches[1]) ) {
> 						$stdnotes[$notecount]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'], "N" );
146c171
< 						$stdnotes[$notecount]['NOTE'] .= addslashes($lineinfo['rest']);
---
> 						$stdnotes[$notecount]['NOTE'] = (isset($stdnotes[$notecount]['NOTE']) ? $stdnotes[$notecount]['NOTE'] : "") . addslashes($lineinfo['rest']);
151d175
< 						$ncitecount++;
152a177
> 						$ncitecount++;
153a179
> 					$notecount++;
160c186
< 						$mminfo[$mmcount]['OBJE'] = $matches[1] ? $matches[1] : $mminfo[$mmcount]['FILE'];
---
> 						$mminfo[$mmcount]['OBJE'] = !empty($matches[1]) ? $matches[1] : $mminfo[$mmcount]['FILE'];
168c194
< 					$cite[$citecount] = handleSource( $familyID, $prevlevel, $prevtag, $prevtype );
---
> 					$cite[$citecount] = handleSource( $familyID, $prevlevel );
182a209,215
> 	//determine if living
> 	if( !$living && !empty($info['MARR']['DATE']) && !empty($tngimpcfg['maxmarriedage'])) {
> 		$marryear = $info['MARR']['DATETR'];
> 		$marryear = strtok($marryear,"-");
> 		if( date( "Y" ) - $marryear < $tngimpcfg['maxmarriedage'] ) $living = 1;
> 	}
> 
184,186d216
< 	if( !$info['MARR']['DATETR'] ) $info['MARR']['DATETR'] = "0000-00-00";
< 	if( !$info['DIV']['DATETR'] ) $info['DIV']['DATETR'] = "0000-00-00";
< 	if( !$info['SLGS']['DATETR'] ) $info['SLGS']['DATETR'] = "0000-00-00";
229,230c259,262
< 			for( $notectr = 1; $notectr <= $notecount; $notectr++ )
< 				saveNote( $familyID, $stdnotes[$notectr]['TAG'], $stdnotes[$notectr] );
---
> 			for( $notectr = 0; $notectr < $notecount; $notectr++ ) {
> 				if(isset($stdnotes[$notectr]))
> 					saveNote( $familyID, $stdnotes[$notectr]['TAG'], $stdnotes[$notectr] );
> 			}
246c278
< 			if( is_array($info[$stdevtype]['MEDIA']) ) {
---
> 			if( isset($info[$stdevtype]['MEDIA']) && is_array($info[$stdevtype]['MEDIA']) ) {
diff -r TNG/gedimport_misc.php TNG1403/gedimport_misc.php
25,28c25,28
< 		$lineinfo['level'] = trim($matches[1]);
< 		$lineinfo['tag'] = trim($matches[2]);
< 		$lineinfo['rest'] = trim($matches[3], $lineending );
< 		//echo "$line: -$lineinfo['level']- -$lineinfo['tag']- -$lineinfo['rest']-<br/>\n";
---
> 		$lineinfo['level'] = isset($matches[1]) ? trim($matches[1]) : "";
> 		$lineinfo['tag'] = isset($matches[2]) ? trim($matches[2]) : "";
> 		$lineinfo['rest'] = isset($matches[3]) ? trim($matches[3], $lineending ) : "";
> 		//echo "$line: -$lineinfo['long']- -$lineinfo['tag']- -$lineinfo['rest']-<br/>\n";
40,41c40,71
< function adjustID( $ID, $offset ) {
< 	global $trim_it, $trimsize;
---
> function adjustID( $ID, $offset, $type ) {
> 	global $trim_it, $trimsize, $tngimpcfg, $tngconfig;
> 
> 	preg_match( "/^(\D*)(\d*)(\D*)/", $ID, $matches );
> 	$prefix = $matches[1];
> 	$numericpart = $matches[2];
> 	$suffix = $matches[3];
> 
> 	if(isset($tngimpcfg['coerce']) && $tngimpcfg['coerce'] ) {
> 		switch($type) {
> 			case "I":
> 				$prefix = $tngconfig['personprefix'];
> 				$suffix = $tngconfig['personsuffix'];
> 				break;
> 			case "F":
> 				$prefix = $tngconfig['familyprefix'];
> 				$suffix = $tngconfig['familysuffix'];
> 				break;
> 			case "S":
> 				$prefix = $tngconfig['sourceprefix'];
> 				$suffix = $tngconfig['sourcesuffix'];
> 				break;
> 			case "R":
> 				$prefix = $tngconfig['repoprefix'];
> 				$suffix = $tngconfig['reposuffix'];
> 				break;
> 			case "N":
> 				$prefix = $tngconfig['noteprefix'];
> 				$suffix = $tngconfig['notesuffix'];
> 				break;
> 		}
> 	}
45,48d74
< 		preg_match( "/^(\D*)(\d*)(\D*)/", $ID, $matches );
< 		$prefix = $matches[1];
< 		$numericpart = $matches[2];
< 		$postfix = $matches[3];
50,51c76,77
< 		$thistrim = $trimsize[$prefix] ? $trimsize[$prefix] : strlen( $numericpart );
< 		$newID = $prefix . str_pad( $numericpart + $offset, $thistrim, "0", STR_PAD_LEFT ) . $postfix;
---
> 		$thistrim = (!empty($prefix) && $trimsize[$prefix]) ? $trimsize[$prefix] : strlen( $numericpart );
> 		$newID = $prefix . str_pad( $numericpart + $offset, $thistrim, "0", STR_PAD_LEFT ) . $suffix;
54c80
< 		$newID = $ID;
---
> 		$newID = $prefix . $numericpart . $suffix;
62c88
< 	$moreinfo = array();
---
> 	$moreinfo = initCustomEvent();
89a116
> 				case "_DATE":
94a122,127
> 				case "SDATE":
> 					if(empty($moreinfo['DATE']))
> 						$moreinfo['DATE'] = addslashes( trim($lineinfo['rest']) );
> 					$moreinfo['DATETR'] = convertDate( $moreinfo['DATE'] );
> 					$lineinfo = getLine();
> 					break;
98c131
< 				case "ALIA":
---
> 				case "ALIA": case "_ADPN": case "_HEBN": case "_CENS": case "_MARNM": case "_FRKA": case "_RELN": case "_CALL": case "_OTHN":
119a153,154
> 					if(!isset($address))
> 						$address = initAddress();
124a160,163
> 					//if your gedcom file is splitting the burial place name and putting part of it on the BURI line, uncomment the next 3 lines to fix that
> 					//if($prevtag == "BURI" && $moreinfo['FACT']) {
> 					//	$moreinfo['PLAC'] = $moreinfo['PLAC'] ? $moreinfo['FACT'] . ", " . $moreinfo['PLAC'] : $moreinfo['PLAC'];
> 					//}
131c170
< 					$moreinfo[$tag] = adjustID( $matches[1], $savestate['foffset'] );
---
> 					$moreinfo[$tag] = adjustID( $matches[1], $savestate['foffset'], "F" );
134a174
> 				case "SNOTE":
135a176
> 				case "_TEXT":
142,143c183,184
< 					if( $matches[1] ) {
< 						$moreinfo['NOTES'][$notecnt]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'] );
---
> 					if( !empty($matches[1]) ) {
> 						$moreinfo['NOTES'][$notecnt]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'], "N" );
198c239
< 						$mminfo[$mmcount]['OBJE'] = $matches[1] ? $matches[1] : $mminfo[$mmcount]['FILE'];
---
> 						$mminfo[$mmcount]['OBJE'] = !empty($matches[1]) ? $matches[1] : $mminfo[$mmcount]['FILE'];
223c264
< 	if( is_array( $address ) ) {
---
> 	if( isset($address) && is_array( $address ) ) {
235c276
< 	$event = array();
---
> 	$event = initEventHolder();
271c312
< 	$thisevent = strtoupper($prefix . "_" . $tag . "_" . $event['TYPE']);
---
> 	$thisevent = strtoupper($prefix . "_" . $tag . "_" . (isset($event['TYPE']) ? $event['TYPE'] : ""));
275c316
< 			$event['INFO'] = getMoreInfo( $id, $lineinfo['level'], $tag, $event['TYPE'] );
---
> 			$event['INFO'] = getMoreInfo( $id, $lineinfo['level'], $tag, (isset($event['TYPE']) ? $event['TYPE'] : "") );
283a325,340
> function initAddress() {
> 	$address = array();
> 
> 	$address['ADR1'] = "";
> 	$address['ADR2'] = "";
> 	$address['CITY'] = "";
> 	$address['STAE'] = "";
> 	$address['POST'] = "";
> 	$address['CTRY'] = "";
> 	$address['WWW'] = "";
> 	$address['EMAIL'] = "";
> 	$address['PHON'] = "";
> 
> 	return $address;
> }
> 
287c344
< 	$address = array();
---
> 	$address = initAddress();
304c361
< 			$address[$addrtag] .= addslashes($lineinfo['rest']);
---
> 			$address[$addrtag] = (isset($address[$addrtag]) ? $address[$addrtag] : "") . addslashes( $lineinfo['rest'] );
309c366
< 			$address[$addrtag] .= addslashes( $lineinfo['rest'] );
---
> 			$address[$addrtag] = (isset($address[$addrtag]) ? $address[$addrtag] : "") . addslashes( $lineinfo['rest'] );
389c446
< 	global $savestate, $tree, $admtext, $lineinfo, $places_table, $link, $tngconfig;
---
> 	global $savestate, $tree, $admtext, $lineinfo, $places_table, $link, $tngconfig, $currentuser;
398a456
> 	$changedate = "";
406a465
> 				case "_PLAC":
416a476
> 				case "SNOTE":
450c510
<  		if($info['NAMC'])
---
>  		if(!empty($info['NAMC']))
453,454c513
<         $treeval = $tngconfig['places1tree'] ? "" : $tree;
< 		if($tngconfig['places1tree'])
---
> 		if(!empty($tngconfig['places1tree']))
460c519,523
< 		$query = "INSERT IGNORE INTO $places_table (place,gedcom,longitude,latitude,zoom,placelevel,temple,notes,geoignore) VALUES(\"$place\", \"$treeval\", \"{$map['long']}\", \"{$map['lati']}\", \"{$map['zoom']}\", \"{$map['placelevel']}\", \"$temple\", \"$note\", \"0\" )";
---
> 		$changedate = !empty($changedate) ? date( "Y-m-d H:i:s", strtotime( $changedate ) ) : "";
> 		if(!$savestate['latlong']) {
> 			$map['long'] = $map['lati'] = "";
> 		}
> 		$query = "INSERT IGNORE INTO $places_table (place,gedcom,longitude,latitude,zoom,placelevel,temple,notes,geoignore,changedate,changedby) VALUES(\"$place\", \"$treeval\", \"{$map['long']}\", \"{$map['lati']}\", \"{$map['zoom']}\", \"{$map['placelevel']}\", \"$temple\", \"$note\", \"0\", \"$changedate\", \"$currentuser\")";
536a600,607
> 				case "CHAN":
> 					$lineinfo = getLine();
> 					$changedate = addslashes( $lineinfo['rest'] );
> 					if( $changedate ) {
> 						$changedate = date( "Y-m-d H:i:s", strtotime( $changedate ) );
> 						$lineinfo = getLine();
> 					}
> 					break;
600c671
< 			@ob_flush();
---
> 			if(ob_get_contents()) ob_flush();
604,616d674
< 	else if( $allcount % $writeinterval == 0 ) {
< 		$newtext = "<div class=\"impc\"><span id=\"pr\">$newwidth</span>";
< 		if($savestate['icount']) $newtext .= "<span id=\"ic\">" . $savestate['icount'] . "</span>";
< 		if($savestate['fcount']) $newtext .= "<span id=\"fc\">" . $savestate['fcount'] . "</span>";
< 		if($savestate['scount']) $newtext .= "<span id=\"sc\">" . $savestate['scount'] . "</span>";
< 		if($savestate['ncount']) $newtext .= "<span id=\"nc\">" . $savestate['ncount'] . "</span>";
< 		if($savestate['mcount']) $newtext .= "<span id=\"mc\">" . $savestate['mcount'] . "</span>";
< 		if($savestate['pcount']) $newtext .= "<span id=\"pc\">" . $savestate['pcount'] . "</span>";
< 		$newtext.= "</div>\n";
< 		echo $newtext;
< 		@ob_flush();
< 		@flush();
< 	}
618c676
< 		$query = "UPDATE $saveimport_table SET icount = {$savestate['icount']}, fcount = {$savestate['fcount']}, scount = {$savestate['scount']}, mcount = {$savestate['mcount']}, ncount = {$savestate['ncount']}, mcount = {$savestate['mcount']}, pcount = {$savestate['pcount']}, offset = $offset WHERE gedcom = \"$tree\"";
---
> 		$query = "UPDATE $saveimport_table SET icount = {$savestate['icount']}, fcount = {$savestate['fcount']}, scount = {$savestate['scount']}, mcount = {$savestate['mcount']}, ncount = {$savestate['ncount']}, mcount = {$savestate['mcount']}, pcount = {$savestate['pcount']}, fileoffset = $offset, barwidth = $newwidth WHERE gedcom = \"$tree\"";
627c685
< 	if( $mm['path'] && $assignnames ) {
---
> 	if( !empty($mm['path']) && $assignnames ) {
631c689
< 		$newname = $mm['FILE'];
---
> 		$newname = isset($mm['FILE']) ? $mm['FILE'] : "";
686c744
< 	$moreinfo = array();
---
> 	$moreinfo = initMultimedia();
716a775
> 			case "SNOTE":
718a778
> 			case "_TEXT":
723d782
< 				$lineinfo = getLine();
725,727c784,793
< 				if( $moreinfo['CHAN'] ) {
< 					$moreinfo['CHAN'] = date( "Y-m-d H:i:s", strtotime( $moreinfo['CHAN'] ) );
< 					$lineinfo = getLine();
---
> 				$lineinfo = getLine();
> 				if(!$moreinfo['CHAN']) {
> 					$moreinfo['CHAN'] = addslashes( $lineinfo['rest'] );
> 					if( $moreinfo['CHAN'] ) {
> 						$lineinfo = getLine();
> 						if( $lineinfo['tag'] == "TIME" ) {
> 							$moreinfo['CHAN'] .= " " . preg_replace("/\./",":",$lineinfo['rest']);
> 							$lineinfo = getLine();
> 						}
> 					}
728a795,796
> 				if($moreinfo['CHAN'])
> 					$moreinfo['CHAN'] = date( "Y-m-d H:i:s", strtotime( $moreinfo['CHAN'] ) );
739a808,812
> 			case "_PLAC":
> 			case "PLAC":
> 				$moreinfo['placetaken'] = addslashes( trim($lineinfo['rest']) );
> 				$lineinfo = getLine();
> 				break;
744a818,820
> 			case "_PRIV":
> 				$moreinfo['private'] = 1;
> 				break;
750c826
< 	if( !$moreinfo['FORM'] && $moreinfo['FILE'] ) {
---
> 	if( !$moreinfo['FORM'] && !empty($moreinfo['FILE']) ) {
764,773c840,851
< 	$mediatypeID = $mediaobj['mediatypeID'];
< 	$found = false;
< 	foreach($locimppath as $locMediatypeID => $pathlist) {
< 		if($pathlist) {
< 			$paths = explode(",", $pathlist);
< 			foreach( $paths as $path ) {
< 				if( substr_count( $mediaobj['FILE'], $path ) ) {
< 					$mediatypeID = $locMediatypeID;
< 					$found = true;
< 					break;
---
> 	$mediatypeID = isset($mediaobj['mediatypeID']) ? $mediaobj['mediatypeID'] : "";
> 	if(!empty($mediaobj['FILE'])) {
> 		$found = false;
> 		foreach($locimppath as $locMediatypeID => $pathlist) {
> 			if($pathlist) {
> 				$paths = explode(",", $pathlist);
> 				foreach( $paths as $path ) {
> 					if( substr_count( $mediaobj['FILE'], $path ) ) {
> 						$mediatypeID = $locMediatypeID;
> 						$found = true;
> 						break;
> 					}
775a854
> 			if($found) break;
777d855
< 		if($found) break;
857c935,936
< 		if(!$mm['CHAN'] && !$tngimpcfg['chdate']) $mm['CHAN'] = $today;
---
> 		if(!isset($mm['CHAN'])) $mm['CHAN'] = "";
> 		if(empty($mm['CHAN']) && !$tngimpcfg['chdate']) $mm['CHAN'] = $today;
860c939
< 		$query = "INSERT IGNORE INTO $media_table (gedcom, mediatypeID, mediakey, path, description, notes, form, usecollfolder, datetaken, changedate) VALUES(\"$tree\", \"{$mm['mediatypeID']}\", \"{$mm['OBJE']}\", \"{$mm['FILE']}\", \"{$mm['TITL']}\", \"{$mm['NOTE']}\", \"{$mm['FORM']}\", \"1\", \"{$mm['datetaken']}\", \"{$mm['CHAN']}\")";
---
> 		$query = "INSERT IGNORE INTO $media_table (gedcom, mediatypeID, mediakey, path, description, notes, form, usecollfolder, datetaken, placetaken, private, changedate) VALUES(\"$tree\", \"{$mm['mediatypeID']}\", \"{$mm['OBJE']}\", \"{$mm['FILE']}\", \"{$mm['TITL']}\", \"{$mm['NOTE']}\", \"{$mm['FORM']}\", \"1\", \"{$mm['datetaken']}\", \"{$mm['placetaken']}\", \"{$mm['private']}\", \"{$mm['CHAN']}\")";
881c960
< 					if( $mm['FILE'] || $mm['TITL'] || $mm['NOTE'] || $mm['datetaken'] ) {
---
> 					if( $mm['FILE'] || $mm['TITL'] || $mm['NOTE'] || $mm['datetaken'] || $mm['placetaken'] ) {
887c966,968
< 						$query = "UPDATE $media_table SET path=\"{$mm['FILE']}\"$descstr$notestr$datestr, form=\"{$mm['FORM']}\"$changedatestr WHERE gedcom = \"$tree\" AND mediakey = \"{$mm['OBJE']}\"";
---
> 						$placestr = $mm['placetaken'] ? ", placetaken=\"{$mm['placetaken']}\"" : "";
> 						$privstr = $mm['private'] ? ", private=\"{$mm['private']}\"" : "";
> 						$query = "UPDATE $media_table SET path=\"{$mm['FILE']}\"$descstr$notestr$datestr$placestr$privstr, form=\"{$mm['FORM']}\"$changedatestr WHERE gedcom = \"$tree\" AND mediakey = \"{$mm['OBJE']}\"";
955a1037,1054
> function initMultimedia() {
> 	$mminfo = array();
> 
> 	$mminfo['FORM'] = "";
> 	$mminfo['defphoto'] = "";
> 	$mminfo['TITL'] = "";
> 	$mminfo['NOTE'] = "";
> 	$mminfo['datetaken'] = "";
> 	$mminfo['linktype'] = "";
> 	$mminfo['saved'] = "";
> 	$mminfo['path'] = "";
> 	$mminfo['mediatypeID'] = "";
> 	$mminfo['private'] = 0;
> 	$mminfo['placetaken'] = "";
> 
> 	return $mminfo;
> }
> 
966a1066
> 	$mminfo = initMultimedia();
989c1089
< 						$newstr= mmd($chars[$ptr]) . mmd($chars[$ptr+1]) . mmd($chars[$ptr+2]) . mmd($chars[$ptr+3]);
---
> 						$newstr = mmd($chars[$ptr]) . mmd(isset($chars[$ptr+1]) ? $chars[$ptr+1] : "") . mmd(isset($chars[$ptr+2]) ? $chars[$ptr+2] : "") . mmd(isset($chars[$ptr+3]) ? $chars[$ptr+3] : "");
1011c1111
< 						$lastperiod = strrpos($moreinfo['FILE'],".");
---
> 						$lastperiod = strrpos($mminfo['FILE'],".");
1036a1137,1141
> 				case "_PLAC":
> 				case "PLAC":
> 					$mminfo['placetaken'] = addslashes( trim($lineinfo['rest']) );
> 					$lineinfo = getLine();
> 					break;
1040a1146
> 				case "SNOTE":
1042a1149
> 				case "_TEXT":
1085,1086c1192,1193
< 			if(!$mminfo['TITL']) $mminfo['TITL'] = $mminfo['FILE'];
< 			$query = "INSERT IGNORE INTO $media_table (gedcom, mediakey, path, thumbpath, description, notes, form, mediatypeID, usecollfolder, datetaken, changedate) VALUES(\"$tree\", \"{$mminfo['ID']}\", \"{$mminfo['FILE']}\", \"$thumbpath\", \"{$mminfo['TITL']}\", \"{$mminfo['NOTE']}\", \"{$mminfo['FORM']}\", \"{$mminfo['mediatypeID']}\", \"{$mminfo['ucf']}\", \"{$mminfo['datetaken']}\", \"$inschangedt\")";
---
> 			if(empty($mminfo['TITL'])) $mminfo['TITL'] = $mminfo['FILE'];
> 			$query = "INSERT IGNORE INTO $media_table (gedcom, mediakey, path, thumbpath, description, notes, form, mediatypeID, usecollfolder, datetaken, placetaken, private, changedate) VALUES(\"$tree\", \"{$mminfo['ID']}\", \"{$mminfo['FILE']}\", \"$thumbpath\", \"{$mminfo['TITL']}\", \"{$mminfo['NOTE']}\", \"{$mminfo['FORM']}\", \"{$mminfo['mediatypeID']}\", \"{$mminfo['ucf']}\", \"{$mminfo['datetaken']}\", \"{$mminfo['placetaken']}\", \"{$mminfo['private']}\", \"$inschangedt\")";
1099c1206
< 				$query = "UPDATE $media_table SET path=\"{$mminfo['FILE']}\", description=\"{$mminfo['TITL']}\", notes=\"{$mminfo['NOTE']}\", form=\"{$mminfo['FORM']}\", datetaken=\"{$mminfo['datetaken']}\",$mediatypeIDstr changedate=\"$inschangedt\" WHERE gedcom = \"$tree\" AND mediakey = \"{$mminfo['ID']}\"";
---
> 				$query = "UPDATE $media_table SET path=\"{$mminfo['FILE']}\", description=\"{$mminfo['TITL']}\", notes=\"{$mminfo['NOTE']}\", form=\"{$mminfo['FORM']}\", datetaken=\"{$mminfo['datetaken']}\", placetaken=\"{$mminfo['placetaken']}\", private=\"{$mminfo['private']}\",$mediatypeIDstr changedate=\"$inschangedt\" WHERE gedcom = \"$tree\" AND mediakey = \"{$mminfo['ID']}\"";
1120d1226
< 	if( !$cite['DATETR'] ) $cite['DATETR'] = "0000-00-00";
1125c1231
< 	if( is_array($cite['MEDIA']) ) {
---
> 	if( isset($cite['MEDIA']) && is_array($cite['MEDIA']) ) {
1153,1154c1259,1262
< 		if(function_exists('mb_strimwidth'))
< 			$note['NOTE'] = mb_strimwidth($note['NOTE'],0,$max_note_length,"",$session_charset);
---
> 		if(function_exists('mb_strimwidth')) {
> 			$note['NOTE'] = mb_strimwidth((isset($note['NOTE']) ? $note['NOTE'] : ""),0,$max_note_length,"",$session_charset);
> 			$note['XNOTE'] = mb_strimwidth((isset($note['XNOTE']) ? $note['XNOTE'] : ""),0,$max_note_length,"",$session_charset);
> 		}
1161c1269
< 	$privlen = strlen($tngimpcfg['privnote']);
---
> 	$privlen = isset($tngimpcfg['privnote']) ? strlen($tngimpcfg['privnote']) : 0;
1171c1279
< function getNoteRecord( $noteID, $prevlevel ) {
---
> function getNoteRecord( $noteID, $prevlevel, $notelabel ) {
1174c1282
< 	$noteID = adjustID( $noteID, $savestate['noffset'] );
---
> 	$noteID = adjustID( $noteID, $savestate['noffset'], "N" );
1180c1288
< 	preg_match( "/^NOTE ?(.*)$/", $lineinfo['rest'], $matches );
---
> 	preg_match( "/^{$notelabel} ?(.*)$/", $lineinfo['rest'], $matches );
1186c1294
< 	if( $lineinfo['level'] && ( $lineinfo['tag'] == "NOTE" || $lineinfo['tag'] == "CONT" || $lineinfo['tag'] == "CONC" ) ) {
---
> 	if( $lineinfo['level'] && ( $lineinfo['tag'] == $notelabel || $lineinfo['tag'] == "CONT" || $lineinfo['tag'] == "CONC" ) ) {
1194d1301
< 		$notectr++;
1195a1303
> 		$notectr++;
1216c1324
< 	$privlen = strlen($tngimpcfg['privnote']);
---
> 	$privlen = isset($tngimpcfg['privnote']) ? strlen($tngimpcfg['privnote']) : 0;
1236d1343
< 		$notecount++;
1237a1345
> 		$notecount++;
1257c1365
< 			$display = $admtext[$event];
---
> 			$display = isset($admtext[$event]) ? $admtext[$event] : "";
1260c1368
< 		$eventinfo = $eventptr['FACT'];
---
> 		$eventinfo = isset($eventptr['FACT']) ? $eventptr['FACT'] : "";
1263c1371
< 		if( !$custevents[$eventtype] ) {
---
> 		if( empty($custevents[$eventtype]) ) {
1276d1383
<    			if( !$eventptr['DATETR'] ) $eventptr['DATETR'] = "0000-00-00";
1279c1386
< 			if($matches[1]) $eventinfo = "@" . adjustId($matches[1],$savestate['noffset']) . "@";
---
> 			if(!empty($matches[1])) $eventinfo = "@" . adjustId($matches[1],$savestate['noffset'], "N") . "@";
1328c1435
< 				if( is_array($eventptr['MEDIA']) ) {
---
> 				if( isset($eventptr['MEDIA']) && is_array($eventptr['MEDIA']) ) {
diff -r TNG/gedimport_people.php TNG1403/gedimport_people.php
10a11,35
> $altbirthtypes = !empty($tngconfig['altbirth']) ? explode(',',$tngconfig['altbirth']) : ['CHR'];
> 
> function initIndividual() {
> 	$info = array();
> 
> 	$info['BIRT'] = initEvent();
> 	$info['ALTBE'] = initEvent();
> 	$info['DEAT'] = initEvent();
> 	$info['BURI'] = initEvent();
> 	$info['BAPL'] = initEvent();
> 	$info['CONL'] = initEvent();
> 	$info['INIT'] = initEvent();
> 	$info['ENDL'] = initEvent();
> 	$info['SLGC'] = initEvent();
> 
> 	$info['SURN'] = "";
> 	$info['GIVN'] = "";
> 	$info['SEX'] = "";
> 	$info['NICK'] = "";
> 	$info['TITL'] = "";
> 	$info['NPFX'] = "";
> 	$info['NSFX'] = "";
> 
> 	return $info;
> }
13,14c38,39
< 	global $link, $people_table, $children_table, $events_table, $families_table, $tree, $admtext, $citations_table, $assoc_table, $pciteevents;
< 	global $savestate, $lineinfo, $custeventlist, $notelinks_table, $stdnotes, $notecount, $lineending, $branchlinks_table;
---
> 	global $link, $people_table, $children_table, $families_table, $tree, $admtext, $citations_table, $assoc_table, $pciteevents;
> 	global $savestate, $lineinfo, $custeventlist, $custnametypes, $notelinks_table, $stdnotes, $notecount, $lineending, $branchlinks_table;
15a41
> 	global $altbirthtypes, $altbirthtype, $cite, $mminfo;
17c43
< 	$personID = adjustID( $personID, $savestate['ioffset'] );
---
> 	$personID = adjustID( $personID, $savestate['ioffset'], "I" );
20c46
< 	$info = array(); 
---
> 	$info = initIndividual();
23,24c49
< 	$burialtype = 0;
< 	$info['BIRT'] = $info['DEAT'] = $info['BURI'] = $info['BAPL'] = $info['CONL'] = $info['INIT'] = $info['ENDL'] = $info['NAME'] = $info['SLGC'] = array();
---
> 	$burialtype = $burialcount = 0;
38a64
> 	$altbirthtype = "";
46a73,74
> 			$altbe = in_array($tag,$altbirthtypes) && empty($altbirthtype) ? $tag : "!!!"; //intentionally won't match anything
> 
50c78
< 					if( isset($info['GIVN']) || isset($info['SURN']) ) {
---
> 					if( !empty($info['GIVN']) || !empty($info['SURN']) ) {
52c80,81
< 						for( $i = 1; $i <= 3; $i++ ) {
---
> 						$num_matches = count($matches);
> 						for( $i = 1; $i < $num_matches; $i++ ) {
60c89
< 						$events[$custeventctr] = array();
---
> 						$events[$custeventctr] = initEventHolder();
72c101
< 						$info['SURN'] = addslashes(trim($matches[2]));
---
> 						$info['SURN'] = !empty($matches[2]) ? addslashes(trim($matches[2])) : "";
75c104,105
< 							for( $i=0; $i < count( $arrayLower ); $i++ ) {
---
> 							$num_arrayLower = count($arrayLower);
> 							for( $i=0; $i < $num_arrayLower; $i++ ) {
79c109
< 						if( $matches[1] ) {
---
> 						if( !empty($matches[1]) ) {
87c117
< 						elseif( $matches[3] )
---
> 						elseif( !empty($matches[3]) )
89c119
< 						elseif( !$matches[2] )
---
> 						elseif( empty($matches[2]) )
94,95c124,128
< 						if( $info['NAME']['NICK'] ) {
< 							if( $info['NICK'] ) $info['NICK'] .= ", ";
---
> 						if( !empty($info['NAME']['NICK']) ) {
> 							if(!isset($info['NICK'])) 
> 								$info['NICK'] = "";
> 							elseif( !empty($info['NICK']) )
> 								$info['NICK'] .= ", ";
98c131
< 						if( $info['NAME']['NPFX'] )
---
> 						if( !empty($info['NAME']['NPFX']) )
100c133
< 						if( $info['NAME']['NSFX'] )
---
> 						if( !empty($info['NAME']['NSFX']) )
102c135
< 						if( $info['NAME']['TITL'] )
---
> 						if( !empty($info['NAME']['TITL']) )
104,113c137,147
< 						//this may be just a quickie fix for ALIA
< 						if( $info['NAME']['ALIA'] ) {
< 							$custeventctr++;
< 							$events[$custeventctr] = array();
< 							$events[$custeventctr]['TAG'] = "ALIA";
< 							$thisevent = $prefix . "_ALIA_";
< 							//make sure it's a keeper before continuing by checking against type_tag_desc list
< 							if( in_array( $thisevent, $custeventlist ) ) {
< 								$events[$custeventctr]['INFO'] = array();
< 								$events[$custeventctr]['INFO']['FACT'] = $info['NAME']['ALIA'];
---
> 						foreach($custnametypes as $cn) {
> 							if( !empty($info['NAME'][$cn]) ) {
> 								$custeventctr++;
> 								$events[$custeventctr] = initEventHolder();
> 								$events[$custeventctr]['TAG'] = $cn;
> 								$thisevent = $prefix . "_{$cn}_";
> 								//make sure it's a keeper before continuing by checking against type_tag_desc list
> 								if( $savestate['allevents'] || in_array( $thisevent, $custeventlist ) ) {
> 									$events[$custeventctr]['INFO'] = initCustomEvent();
> 									$events[$custeventctr]['INFO']['FACT'] = $info['NAME'][$cn];
> 								}
123c157
< 					if( isset( $info[$tag] ) ) {
---
> 					if( !empty( $info[$tag] ) ) {
125c159
< 						$events[$custeventctr] = array();
---
> 						$events[$custeventctr] = initEventHolder();
140c174
< 					if(isset($info['BURI'])) {
---
> 					if( $burialcount ) {
149d182
< 				case "CHR":
156a190
> 				case "INIL":
157a192
> 				case $altbe:
160c195
< 						$events[$custeventctr] = array();
---
> 						$events[$custeventctr] = initEventHolder();
175,176c210,211
< 						if( isset($info[$tag]['FACT']) && $info[$tag]['FACT']) {
< 							if(!isset( $info[$tag]['DATE'] ) && !isset( $info[$tag]['PLAC'] ) ) 
---
> 						if(!empty($info[$tag]['FACT'])) {
> 							if(empty( $info[$tag]['DATE'] ) && empty( $info[$tag]['PLAC'] ) ) 
179c214
< 								if(!isset($info[$tag]['NOTES'])) {
---
> 								if(empty($info[$tag]['NOTES'])) {
181c216
< 									$notectr = 1;
---
> 									$notectr = 0;
189c224
< 						if( isset($info[$tag]['extra']) ) {
---
> 						if( !empty($info[$tag]['extra']) ) {
192c227
< 							$events[$custeventctr] = array();
---
> 							$events[$custeventctr] = initEventHolder();
196c231
< 							if( in_array( $thisevent, $custeventlist ) ) {
---
> 							if( $savestate['allevents'] || in_array( $thisevent, $custeventlist ) ) {
199c234
< 								$events[$custeventctr]['INFO']['SOUR'] = "";
---
> 								$events[$custeventctr]['INFO']['SOUR'] = array();
203c238,247
< 						$info[$tag]['more'] = 1;
---
> 						foreach($info[$tag] as $item) {
> 							if(!empty($item) && $item != "0000-00-00") {
> 								$info[$tag]['more'] = 1;
> 								break;
> 							}
> 						}
> 						if($tag == $altbe) {
> 							$altbirthtype = $tag;
> 							$info['ALTBE'] = $info[$tag];
> 						}
204a249
> 					if( $tag == "BURI" ) $burialcount++;
207d251
< 					$lineinfo = getLine();
209,212c253,256
< 					if( $changedate ) {
< 						$lineinfo = getLine();
< 						if( $lineinfo['tag'] == "TIME" ) {
< 							$changedate .= " " . preg_replace("/\./",":",$lineinfo['rest']);
---
> 					$lineinfo = getLine();
> 					if(!$changedate) {
> 						$changedate = addslashes( $lineinfo['rest'] );
> 						if( $changedate ) {
213a258,261
> 							if( $lineinfo['tag'] == "TIME" ) {
> 								$changedate .= " " . preg_replace("/\./",":",$lineinfo['rest']);
> 								$lineinfo = getLine();
> 							}
215d262
< 						$changedate = date( "Y-m-d H:i:s", strtotime( $changedate ) );
216a264,265
> 					if($changedate)
> 						$changedate = date( "Y-m-d H:i:s", strtotime( $changedate ) );
220c269
< 					$famc = adjustID( $matches[1], $savestate['foffset'] );
---
> 					$famc = adjustID( $matches[1], $savestate['foffset'], "F" );
237c286,287
< 						if( !$info['SLGC']['DATETR'] ) $info['SLGC']['DATETR'] = "0000-00-00";
---
> 						if( empty($info['SLGC']['DATETR']) ) $info['SLGC']['DATETR'] = "0000-00-00";
> 						if(!isset($slgcplace)) $slgcplace = "";
241c291
< 						if( !$success && ( $info['SLGC']['DATE'] || $slgplace || $info['SLGC']['SOUR'] ) ) {
---
> 						if( !$success && ( $info['SLGC']['DATE'] || $slgcplace || $info['SLGC']['SOUR'] ) ) {
263c313
< 					$thisassoc['asso'] = adjustID( $matches[1], $countertouse );
---
> 					$thisassoc['asso'] = adjustID( $matches[1], $countertouse, $thisassoc['reltype'] );
275c325
< 						$slgcplace = trim( $info['SLGC']['TEMP'] . " " . $info['SLGC']['PLAC'] );
---
> 						$slgcplace = trim( (isset($info['SLGC']['TEMP']) ? $info['SLGC']['TEMP'] : "") . " " . (isset($info['SLGC']['PLAC']) ? $info['SLGC']['PLAC'] : "") );
284c334
< 						if( !$success && ( $info['SLGC']['DATE'] || $slgplace || $info['SLGC']['SOUR'] ) ) {
---
> 						if( !$success && ( $info['SLGC']['DATE'] || $slgcplace || $info['SLGC']['SOUR'] ) ) {
298c348
< 					$spouses[$spousecount] = adjustID( $matches[1], $savestate['foffset'] );
---
> 					$spouses[$spousecount] = adjustID( $matches[1], $savestate['foffset'], "F" );
308c358
< 						$mminfo[$mmcount]['OBJE'] = $matches[1] ? $matches[1] : $mminfo[$mmcount]['FILE'];
---
> 						$mminfo[$mmcount]['OBJE'] = !empty($matches[1]) ? $matches[1] : $mminfo[$mmcount]['FILE'];
315a366
> 				case "SNOTE":
317d367
< 					$notecount++;
320,321c370,371
< 					if( $matches[1] ) {
< 						$stdnotes[$notecount]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'] );
---
> 					if( !empty($matches[1]) ) {
> 						$stdnotes[$notecount]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'], "N" );
327c377
< 						$stdnotes[$notecount]['NOTE'] .= addslashes($lineinfo['rest']);
---
> 						$stdnotes[$notecount]['NOTE'] = (isset($stdnotes[$notecount]['NOTE']) ? $stdnotes[$notecount]['NOTE'] : "") . addslashes($lineinfo['rest']);
332d381
< 						$ncitecount++;
333a383
> 						$ncitecount++;
337d386
< 						$notecount--;
338a388,389
> 					else
> 						$notecount++;
342c393
< 					$cite[$citecount] = handleSource( $personID, $prevlevel, $prevtag, $prevtype );
---
> 					$cite[$citecount] = handleSource( $personID, $prevlevel );
391c442
< 	if( $info['TITL'] && $info['TITL'] == $info['NSFX'] )
---
> 	if( isset($info['TITL']) && isset($info['NSFX']) && $info['TITL'] == $info['NSFX'] )
393c444
< 	
---
> 
395,397c446,448
< 	if( !$living && !$info['DEAT']['more'] && !$info['BURI']['more'] && $info['BIRT']['TYPE'] != "stillborn") {
< 		if( $info['BIRT']['DATE'] || $info['CHR']['DATE']) {
< 			$birthyear = $info['BIRT']['DATE'] ? $info['BIRT']['DATETR'] : $info['CHR']['DATETR'];
---
> 	if( !$living && empty($info['DEAT']['more']) && empty($info['BURI']['more']) && ((isset($info['BIRT']['TYPE']) ? $info['BIRT']['TYPE'] : "") != "stillborn")) {
> 		if( !empty($info['BIRT']['DATE']) || !empty($info['ALTBE']['DATE'])) {
> 			$birthyear = !empty($info['BIRT']['DATE']) ? $info['BIRT']['DATETR'] : $info['ALTBE']['DATETR'];
409c460
< 	if($info['DEAT']['DATE'] && ($tngimpcfg['maxprivyrs'] || $tngimpcfg['maxdecdyrs'])) {
---
> 	if(!empty($info['DEAT']['DATE']) && (!empty($tngimpcfg['maxprivyrs']) || !empty($tngimpcfg['maxdecdyrs']))) {
479c530,531
< 		
---
> 
> 	if( empty($info['SEX']) ) $info['SEX'] = "U";
481,488d532
< 	if( !$info['BIRT']['DATETR'] ) $info['BIRT']['DATETR'] = "0000-00-00";
< 	if( !$info['CHR']['DATETR'] ) $info['CHR']['DATETR'] = "0000-00-00";
< 	if( !$info['DEAT']['DATETR'] ) $info['DEAT']['DATETR'] = "0000-00-00";
< 	if( !$info['BURI']['DATETR'] ) $info['BURI']['DATETR'] = "0000-00-00";
< 	if( !$info['BAPL']['DATETR'] ) $info['BAPL']['DATETR'] = "0000-00-00";
< 	if( !$info['CONL']['DATETR'] ) $info['CONL']['DATETR'] = "0000-00-00";
< 	if( !$info['INIT']['DATETR'] ) $info['INIT']['DATETR'] = "0000-00-00";
< 	if( !$info['ENDL']['DATETR'] ) $info['ENDL']['DATETR'] = "0000-00-00";
490c534
< 		altbirthdate, altbirthdatetr, altbirthplace, deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, burialtype, nickname, title, prefix, suffix,
---
> 		altbirthtype, altbirthdate, altbirthdatetr, altbirthplace, deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, burialtype, nickname, title, prefix, suffix,
493c537
< 		\"" . $info['BIRT']['PLAC'] . "\", \"" . $info['CHR']['DATE'] . "\", \"" . $info['CHR']['DATETR'] . "\", \"" . $info['CHR']['PLAC'] . "\",
---
> 		\"" . $info['BIRT']['PLAC'] . "\", \"" . $altbirthtype . "\", \"" . $info['ALTBE']['DATE'] . "\", \"" . $info['ALTBE']['DATETR'] . "\", \"" . $info['ALTBE']['PLAC'] . "\",
518c562
< 				sex=\"{$info['SEX']}\", altbirthdate=\"" . $info['CHR']['DATE'] . "\", altbirthdatetr=\"" . $info['CHR']['DATETR'] . "\", altbirthplace=\"" . $info['CHR']['PLAC'] . "\",
---
> 				sex=\"{$info['SEX']}\", altbirthtype=\"" . $altbirthtype . "\", altbirthdate=\"" . $info['ALTBE']['DATE'] . "\", altbirthdatetr=\"" . $info['ALTBE']['DATETR'] . "\", altbirthplace=\"" . $info['ALTBE']['PLAC'] . "\",
545,546c589,592
< 			for( $notectr = 1; $notectr <= $notecount; $notectr++ )
< 				saveNote( $personID, $stdnotes[$notectr]['TAG'], $stdnotes[$notectr] );
---
> 			for( $notectr = 0; $notectr < $notecount; $notectr++ ) {
> 				if(isset($stdnotes[$notectr]))
> 					saveNote( $personID, $stdnotes[$notectr]['TAG'], $stdnotes[$notectr] );
> 			}
552c598,601
< 				$query = "INSERT INTO $assoc_table (gedcom, personID, passocID, relationship, reltype) VALUES( \"$tree\", \"$personID\", \"{$assoc['asso']}\", \"{$assoc['rela']}\", \"{$assoc['reltype']}\" )";
---
> 				$asso = !empty($assoc['asso']) ? $assoc['asso'] : "";
> 				$rela = !empty($assoc['rela']) ? $assoc['rela'] : "";
> 				$reltype = !empty($assoc['reltype']) ? $assoc['reltype'] : "";
> 				$query = "INSERT INTO $assoc_table (gedcom, personID, passocID, relationship, reltype) VALUES( \"$tree\", \"$personID\", \"$asso\", \"$rela\", \"$reltype\" )";
561,562c610,613
< 			if( isset( $info[$citeevent]['SOUR'] ) )
< 				processCitations( $personID, $citeevent, $info[$citeevent]['SOUR'] );
---
> 			if( isset( $info[$citeevent]['SOUR'] ) ) {
> 				$tag = $citeevent == "ALTBE" ? $altbirthtype : $citeevent;
> 				processCitations( $personID, $tag, $info[$citeevent]['SOUR'] );
> 			}
598c649,650
< 			if( is_array($info[$stdevtype]['MEDIA']) ) {
---
> 			$tag = $stdevtype == "ALTBE" ? $altbirthtype : $stdevtype;
> 			if( isset($info[$stdevtype]['MEDIA']) && is_array($info[$stdevtype]['MEDIA']) ) {
601c653
< 				processMedia( $emcount, $eminfo, $personID, $stdevtype );
---
> 				processMedia( $emcount, $eminfo, $personID, $tag );
diff -r TNG/gedimport_sources.php TNG1403/gedimport_sources.php
1a2,14
> function initCitation() {
> 	$cite = array();
> 
> 	$cite['DATETR'] = "0000-00-00";
> 	$cite['DATE'] = "";
> 	$cite['TEXT'] = "";
> 	$cite['PAGE'] = "";
> 	$cite['QUAY'] = "";
> 	$cite['NOTE'] = "";
> 
> 	return $cite;
> }
> 
3c16
< 	global $tree, $lineinfo, $admtext, $custevents, $stdevents, $citations_table, $savestate;
---
> 	global $tree, $lineinfo, $admtext, $custevents, $stdevents, $citations_table, $savestate, $notecount;
5c18
< 	$cite = array();
---
> 	$cite = initCitation();
7,8c20,21
< 	if( $matches[1] ) {
< 		$cite['sourceID'] = adjustID( $matches[1], $savestate['soffset'] );
---
> 	if( !empty($matches[1]) ) {
> 		$cite['sourceID'] = adjustID( $matches[1], $savestate['soffset'], "S" );
27c40,47
< 				$cite['DATETR'] = convertDate( $cite['DATE'] );
---
> 				if(empty($cite['DATETR'])) 
> 					$cite['DATETR'] = convertDate( $cite['DATE'] );
> 				$lineinfo = getLine();
> 				break;
> 			case "SDATE":
> 				if(empty($cite['DATE']))
> 					$cite['DATE'] = addslashes( trim($lineinfo['rest']) );
> 				$cite['DATETR'] = convertDate( $moreinfo['DATE'] );
35a56
> 			case "SNOTE":
37c58,59
< 				$notecount++;
---
> 			case "_TEXT":
> 				//$notecount++;
39,40c61,64
< 				if( $matches[1] ) {
< 					$cite[$tag] = "@" . adjustID( $matches[1], $savestate['noffset'] ) . "@";
---
> 				if(empty($cite[$tag]))
> 					$cite[$tag] = "";
> 				if( !empty($matches[1]) ) {
> 					$cite[$tag] .= "@" . adjustID( $matches[1], $savestate['noffset'], "N" ) . "@";
44c68
< 					$cite[$tag] = addslashes($lineinfo['rest']);
---
> 					$cite[$tag] .= addslashes($lineinfo['rest']);
54c78
< 					$mminfo[$mmcount]['OBJE'] = $matches[1] ? $matches[1] : $mminfo[$mmcount]['FILE'];
---
> 					$mminfo[$mmcount]['OBJE'] = !empty($matches[1]) ? $matches[1] : $mminfo[$mmcount]['FILE'];
81a106,118
> function initSource() {
> 	$info = array();
> 
> 	$info['CALN'] = "";
> 	$info['AUTH'] = "";
> 	$info['PUBL'] = "";
> 	$info['ABBR'] = "";
> 	$info['REPO'] = "";
> 	$info['TEXT'] = "";
> 
> 	return $info;
> }
> 
86c123
< 	$sourceID = adjustID( $sourceID, $savestate['soffset'] );
---
> 	$sourceID = adjustID( $sourceID, $savestate['soffset'], "S" );
89c126
< 	$info = array(); 
---
> 	$info = initSource(); 
114d150
< 					$lineinfo = getLine();
116,119c152,155
< 					if( $changedate ) {
< 						$lineinfo = getLine();
< 						if( $lineinfo['tag'] == "TIME" ) {
< 							$changedate .= " " . $lineinfo['rest'];
---
> 					$lineinfo = getLine();
> 					if(!$changedate) {
> 						$changedate = addslashes( $lineinfo['rest'] );
> 						if( $changedate ) {
120a157,160
> 							if( $lineinfo['tag'] == "TIME" ) {
> 								$changedate .= " " . preg_replace("/\./",":",$lineinfo['rest']);
> 								$lineinfo = getLine();
> 							}
122d161
< 						$changedate = date( "Y-m-d H:i:s", strtotime( $changedate ) );
123a163,164
> 					if($changedate)
> 						$changedate = date( "Y-m-d H:i:s", strtotime( $changedate ) );
130a172
> 				case "SNOTE":
132d173
< 					$notecount++;
135,136c176,177
< 					if( $matches[1] ) {
< 						$stdnotes[$notecount]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'] );
---
> 					if( !empty($matches[1]) ) {
> 						$stdnotes[$notecount]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'], "N" );
142c183
< 						$stdnotes[$notecount]['NOTE'] .= addslashes($lineinfo['rest']);
---
> 						$stdnotes[$notecount]['NOTE'] = (isset($stdnotes[$notecount]['NOTE']) ? $stdnotes[$notecount]['NOTE'] : "") . addslashes($lineinfo['rest']);
149a191
> 					$notecount++;
156c198
< 						$mminfo[$mmcount]['OBJE'] = $matches[1] ? $matches[1] : $mminfo[$mmcount]['FILE'];
---
> 						$mminfo[$mmcount]['OBJE'] = !empty($matches[1]) ? $matches[1] : $mminfo[$mmcount]['FILE'];
164c206
< 					if( $matches[1] )
---
> 					if( !empty($matches[1]) )
183c225
<    	if (empty($info['CALN']) && !empty($info['REFN']))
---
>    	if(empty($info['CALN']) && !empty($info['REFN']))
184a227,228
> 	if(empty($info['TITL']))
> 		$info['TITL'] = "";
214c258
< 			for( $notectr = 1; $notectr <= $notecount; $notectr++ )
---
> 			for( $notectr = 0; $notectr < $notecount; $notectr++ )
257c301
< 	$repoID = adjustID( $repoID, $savestate['roffset'] );
---
> 	$repoID = adjustID( $repoID, $savestate['roffset'], "R" );
283d326
< 					$lineinfo = getLine();
285,288c328,331
< 					if( $changedate ) {
< 						$lineinfo = getLine();
< 						if( $lineinfo['tag'] == "TIME" ) {
< 							$changedate .= " " . $lineinfo['rest'];
---
> 					$lineinfo = getLine();
> 					if(!$changedate) {
> 						$changedate = addslashes( $lineinfo['rest'] );
> 						if( $changedate ) {
289a333,336
> 							if( $lineinfo['tag'] == "TIME" ) {
> 								$changedate .= " " . preg_replace("/\./",":",$lineinfo['rest']);
> 								$lineinfo = getLine();
> 							}
291d337
< 						$changedate = date( "Y-m-d H:i:s", strtotime( $changedate ) );
292a339,340
> 					if($changedate)
> 						$changedate = date( "Y-m-d H:i:s", strtotime( $changedate ) );
293a342
> 				case "SNOTE":
295d343
< 					$notecount++;
298,299c346,347
< 					if( $matches[1] ) {
< 						$stdnotes[$notecount]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'] );
---
> 					if( !empty($matches[1]) ) {
> 						$stdnotes[$notecount]['XNOTE'] = adjustID( $matches[1], $savestate['noffset'], "N" );
305c353
< 						$stdnotes[$notecount]['NOTE'] .= addslashes($lineinfo['rest']);
---
> 						$stdnotes[$notecount]['NOTE'] = addslashes($lineinfo['rest']);
312a361
> 					$notecount++;
319c368
< 						$mminfo[$mmcount]['OBJE'] = $matches[1] ? $matches[1] : $mminfo[$mmcount]['FILE'];
---
> 						$mminfo[$mmcount]['OBJE'] = !empty($matches[1]) ? $matches[1] : $mminfo[$mmcount]['FILE'];
366c415
< 			for( $notectr = 1; $notectr <= $notecount; $notectr++ )
---
> 			for( $notectr = 0; $notectr < $notecount; $notectr++ )
371c420
< 		if( is_array( $address ) ) {
---
> 		if( !empty( $address ) ) {
380c429
< ?>
---
> ?>
\ No newline at end of file
diff -r TNG/gedimport_trees.php TNG1403/gedimport_trees.php
46,47c46,47
< 	//$query = "DELETE from $medialinks_table WHERE gedcom = \"$tree\" AND citationID != ''";
< 	//$result = tng_query($query);
---
> 	$query = "DELETE from $medialinks_table WHERE gedcom = \"$tree\" AND (linktype = '' OR linktype = 'C')";
> 	$result = tng_query($query);
diff -r TNG/genlib.php TNG1403/genlib.php
1,1338c1,1421
< <?php
< if(isset($_GET['cms']) || isset($_POST['cms'])) die("Sorry!");
< include_once($cms['tngpath'] . "pwdlib.php");
< include_once($cms['tngpath'] . "globallib.php");
< @include_once($cms['tngpath'] . "mediatypes.php");
< @include_once($cms['tngpath'] . "tngfiletypes.php");
< include_once($cms['tngpath'] . "version.php");
< checkMaintenanceMode(0);
< if(!empty($needMap)) {
<     include($subroot . "mapconfig.php");
< 	$mapkeystr = $map['key'] && $map['key'] != "1" ? "&key=" . $map['key'] : "";
<     if($map['key'])
<         include_once($cms['tngpath'] . "googlemaplib.php");
< }
< @include($cms['tngpath'] . "tngrobots.php");
< 
< $isConnected = isConnected();
< 
< $htmldocs = array("HTML","PHP","HTM");
< $http_user_agent = strtolower($_SERVER["HTTP_USER_AGENT"]);
< $newbrowser = preg_match("/msie/", $http_user_agent) && preg_match("/mac/", $http_user_agent) ? 0 : 1;
< $gotlastpage = false;
< $flags = array();
< $flags['error'] = $error;
< 
< if( $cms['support'] == "phpnuke" ) {
< 	if( $multilingual == "1" ) {
< 		$newlanguage = strtoupper(substr($currentlang,0,1)) . substr($currentlang, 1); ;
< 		session_start();
< 		$session_language = $_SESSION['session_language'] = $newlanguage;
< 	}
< }
< elseif( $cms['support'] == "postnuke" ) {
< }
< 
< if(empty($tree)) $tree = "";
< if($requirelogin && $treerestrict && $_SESSION['assignedtree']) {
< 	if(!$tree)
< 		$tree = $_SESSION['assignedtree'];
< 	elseif($tree != $_SESSION['assignedtree']) {
< 		header("Location:$homepage");
< 		exit;
< 	}
< }
< $orgtree = $tree;
< if( !$tree && $defaulttree ) {
< 	$tree = $defaulttree;
< }
< elseif( $tree == "-x--all--x-" )
< 	$tree = "";
< 
< 
< function tng_header( $title, $flags ) {
< 	global $custommeta, $customheader, $cms, $session_charset, $tngprint, $sitename, $site_desc, $tngconfig, $tngdomain, $responsivetables;
< 	global $text, $map, $browser, $templatepath, $tng_title, $tng_version, $tng_date, $tng_copyright, $sitever, $templatenum, $tmp, $http, $isConnected;
< 
< 	initMediaTypes();
< 
< 	//echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\">\n\n";
< 	//echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n\n";
< 	header("Content-type:text/html;charset=" . $session_charset);
< 	echo $tngconfig['doctype'] ? $tngconfig['doctype'] . "\n\n" : "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n\n";
< 	if( !$cms['support'] )
< 		echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n";
< 	else
< 		echo $cms['credits'];
< 	//$siteprefix = $sitename ? ($title ? ": " . stripslashes($sitename) : stripslashes($sitename)) : "";
< 	//$title = preg_replace("/\"/", "",$title);
< 	$siteprefix = $sitename ? @htmlspecialchars($title ? ": " . $sitename : $sitename, ENT_QUOTES, $session_charset) : "";
< 	$title = @htmlspecialchars($title, ENT_QUOTES, $session_charset);
< 	echo "<title>$title$siteprefix</title>\n";
< 	echo "<meta name=\"Keywords\" content=\"$title\" />\n";
< 	//echo "<meta name=\"Description\" content=\"" . preg_replace("/\"/", "", $title . $siteprefix) . "\" />\n";
< 	echo "<meta name=\"Description\" content=\"" . $title . $siteprefix . "\" />\n";
< 	if( $session_charset )
< 		echo "<meta http-equiv=\"Content-type\" content=\"text/html; charset=$session_charset\" />\n";
< 	if( isset( $flags['norobots'] ) )
< 		echo $flags['norobots'];
< 	if( isset( $flags['autorefresh'] ) && $flags['autorefresh'] == 1 )
< 		echo "<meta http-equiv=\"refresh\" content=\"30\" />\n";
< 	if($sitever == "mobile" || $sitever == "tablet") {
< 		echo "<meta name=\"HandheldFriendly\" content=\"True\" />\n";
< 		echo "<meta name=\"MobileOptimized\" content=\"320\" />\n";
< 		echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n";
< 		echo "<meta name=\"apple-mobile-web-app-capable\" content=\"yes\" />\n";
< 		echo "<meta http-equiv=\"cleartype\" content=\"on\" />\n";
< 
< 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"144x144\" href=\"$tngdomain/img/tng-apple-icon-144.png\"/>\n";
< 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"114x114\" href=\"$tngdomain/img/tng-apple-icon-114.png\"/>\n";
< 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"72x72\" href=\"$tngdomain/img/tng-apple-icon-72.png\"/>\n";
< 		echo "<link rel=\"apple-touch-icon-precomposed\" href=\"$tngdomain/img/tng-apple-icon.png\"/>\n";
< 		echo "<link rel=\"shortcut icon\" href=\"$tngdomain/img/tng-apple-icon.png\"/>\n";
< 	}
< 	elseif($tngconfig['favicon'])
< 		echo "<link rel=\"shortcut icon\" href=\"$tngdomain/{$tngconfig['favicon']}\"/>\n";
< 
< 	if(!$tng_version) $tng_version = "12.0.0";
< 	if($sitever != "standard" && $responsivetables) 
< 		echo "<link href=\"{$cms['tngpath']}css/tablesaw.bare.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
< 	echo "<link href=\"{$cms['tngpath']}css/genstyle.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
< 	if( isset( $flags['tabs'] ) )
< 		echo "<link href=\"{$cms['tngpath']}{$templatepath}css/{$flags['tabs']}?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
< 	echo "<link href=\"{$cms['tngpath']}{$templatepath}css/templatestyle.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
< 	if($sitever == "mobile") {
< 		echo "<link href=\"{$cms['tngpath']}css/tngmobile.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
< 		echo "<link href=\"{$cms['tngpath']}{$templatepath}css/tngmobile.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
< 	}
< 	
< 	if($isConnected) {
< 		echo "<script src=\"https://code.jquery.com/jquery-3.3.1.min.js\" integrity=\"sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=\" crossorigin=\"anonymous\"></script>\n";
< 		echo "<script src=\"https://code.jquery.com/ui/1.12.1/jquery-ui.min.js\" integrity=\"sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU=\" crossorigin=\"anonymous\"></script>\n";
< 	}
< 	else {
< 		echo "<script type=\"text/javascript\">// <![CDATA[\nwindow.jQuery || document.write(\"<script src='{$cms['tngpath']}js/jquery-3.3.1.min.js?v=910'>\\x3C/script>\")\n//]]></script>\n";
< 		echo "<script type=\"text/javascript\">// <![CDATA[\nwindow.jQuery.ui || document.write(\"<script src='{$cms['tngpath']}js/jquery-ui-1.12.1.min.js?v=910'>\\x3C/script>\")\n//]]></script>\n";
< 	}
< 	echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/net.js\"></script>\n";
< 
<  	if( isset( $flags['scripting'] ) )
< 		echo $flags['scripting'];
< 	echo "<link href=\"{$cms['tngpath']}{$templatepath}css/mytngstyle.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
< 
< 	if($tngconfig['showshare'] && $isConnected && $sitever != "mobile") {
< 		$w = $http == "https" ? "ws" : "w";
< 		echo "<script type=\"text/javascript\" src=\"{$http}://{$w}.sharethis.com/button/buttons.js\"></script>\n";
< 		echo "<script type=\"text/javascript\">stLight.options({publisher: \"be4e16ed-3cf4-460b-aaa4-6ac3d0e3004b\",doNotHash:true,doNotCopy:true,hashAddressBar:false});</script>\n";
< 	}
< 
< 	//echo "<script type=\"text/javascript\" src=\"{$http}://s7.addthis.com/js/250/addthis_widget.js#pubid=xa-4e568cff0f533c7f\"></script>\n";
< 	if( $tngconfig['menu'] < 2 && !$tngprint && $sitever != "mobile" ) {
< 		echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/tngmenuhover2.js\"></script>\n";
< 	}
< 
< 	if ($sitever != "standard" && $responsivetables) {
< 		echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/tablesaw.js\"></script>\n";
< 		echo "<!--[if lt IE 9]>";
< 		echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/respond.js\"></script>\n";
< 		echo "<![endif]-->";
< 	}
< 
< 	echo "<script type=\"text/javascript\">\n" . "var tnglitbox;\nvar share = 0;\nvar closeimg = \"{$cms['tngpath']}img/tng_close.gif\";\n";
< 	echo "var smallimage_url = '" . getURL("ajx_smallimage",1) . "';\nvar cmstngpath='{$cms['tngpath']}';\nvar loadingmsg = '{$text['loading']}';\n";
< 	echo "var expand_msg = \"{$text['expand']}\";\nvar collapse_msg = \"{$text['collapse']}\";\n";
< 	if(isset($flags['error']) && $flags['error']) {
< 		$login_url = getURL( "ajx_login", 1 );
< 		echo "jQuery(document).ready(function(){openLogin('{$login_url}p=" . urlencode($cms['tngpath']) . "&message={$flags['error']}');});\n";
< 	}
< 	echo "</script>\n";
< 	//echo "<style type=\"text/css\">.media-prev {background: transparent url({$cms['tngpath']}img/media-prevbg.png) no-repeat 0 0;}\n.person-prev {background: transparent url({$cms['tngpath']}img/person-prevbg.png) no-repeat 0 0;}</style>\n";
< 	echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"{$cms['tngpath']}tngrss.php\" />\n";
< 
< 	if($tngconfig['cookieapproval'] && strpos($_SERVER['REQUEST_URI'],"/data_protection_policy.php") === FALSE)
< 		include($cms['tngpath'] . "cookie_approval.php");
< 
< 	@include( $custommeta );
< 	if( $tngprint )
< 		echo "<link href=\"{$cms['tngpath']}css/tngprint.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
< 	echo "<!-- $tng_title, v.$tng_version ($tng_date), Written by Darrin Lythgoe, $tng_copyright -->\n";
< 
< 	$icons = "";
< 	if($sitever == "mobile") {
< 		if(!isset($flags['nomobile']) || !$flags['nomobile']) {
< 			$icons = tng_mobileicons($title);
< 			$icons .= "<div id=\"mcontent\">\n";
< 		}
< 		echo "<style>\n{$tngconfig['mmenustyle']}</style>\n";
< 	}
< 
< 	if( !$cms['support'] ) {
< 		echo "</head>\n";
< 		if( $sitever != "mobile" && !$tngprint && (!isset($flags['noheader']) || !$flags['noheader']) )
< 			include( $templatepath . $customheader );
< 		elseif(!isset($flags['nobody']) || !$flags['nobody'] || $sitever == "mobile") {
< 			$class = !empty($flags['homeclass']) ? $flags['homeclass'] : "publicbody";
< 			echo "<body class=\"{$class}\">\n";
< 		}
< 	}
< 	if( $sitever != "mobile" && (!isset($flags['noicons']) || !$flags['noicons']) )
< 		$icons = tng_icons( 1, $title );
< 	echo $icons;  //from above
< 
< 	if(!$cms['support'] && $sitever == "mobile" && !$tngprint && (!isset($flags['noheader']) || !$flags['noheader'])) {
< 		$ttitle = "t{$templatenum}_maintitle";
< 		if($tmp[$ttitle])
< 			$mtitle = str_replace(array("<br />","<br>")," ", getTemplateMessage($ttitle));
< 		else {
< 			$ttitle = "t{$templatenum}_headtitle";
< 			$i = 1;
< 			$mtitle = "";
< 			while($tmp[$ttitle . $i]) {
< 				$mtitle .= getTemplateMessage($ttitle . $i) . " ";
< 				$i++;
< 			}
< 		}
< 		if($mtitle)
< 			echo "<h3 class=\"mmaintitle\">" . $mtitle . "</h3><hr class=\"mtitlehr\"/><br/>\n";
< 	}
< 	
< 	if($tngconfig['maint'])
< 		echo "<span class=\"fieldnameback yellow\" style=\"padding:3px\"><strong>{$text['mainton']}</strong></span><br /><br />\n";
< }
< 
< function tng_footer( $flags ) {
< 	global $customfooter, $cms, $tngprint, $map, $text, $dbowner, $tngdomain, $sitename, $templatepath, $sitever, $tng_version, $tngconfig;
< 
< 	$needtherest = true;
< 	if( $tngprint ) {
< 		$printfooter = $sitename;
< 		if($dbowner) {
< 			if($printfooter) $printfooter .= " - ";
< 			$suggest_url = getURL( "suggest", 1 );
< 			if($tngconfig['dataprotect'] && strpos($_SERVER['REQUEST_URI'],"/data_protection_policy.php") === FALSE) {
< 				$dataprotect_url = getURL( "data_protection_policy", 0 );
< 				$data_protection_link = " | <a href=\"{$dataprotect_url}\" class=\"footer\" title=\"{$text['dataprotect']}\" target=\"_blank\">{$text['dataprotect']}</a>.\n";
< 			}
< 			else
< 				$data_protection_link = "";
< 	    	$printfooter .= $text['maintby'] . " <a href=\"$suggest_url\" class=\"footer\" title=\"{$text['contactus']}\">$dbowner</a>.{$data_protection_link}";
< 		}
< 		echo "<p class=\"smaller\">" . $printfooter . "<br/>\n$tngdomain</p>";
< 	}
< 	else {
< 		if($sitever == "mobile") {
< 			echo tng_basicfooter($flags);
< 			if(!isset($flags['nomobile']) || !$flags['nomobile'])
<  				echo "</div>\n";
< 		}
< 		else {
< 			if(isset($flags['basicfooter']) && $flags['basicfooter']) {
< 				echo tng_basicfooter($flags);
< 				$needtherest = false;
< 			}
< 			else {
< 				include( $templatepath . $customfooter );
< 			}
< 		}
< 	}
< 	if($needtherest) {
< 		if( isset( $flags['more'] ) )
< 			echo $flags['more'];
< 		if(!$tngprint)
< 			echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/litbox.js\"></script>\n";
< 		if($map['key'] && $map['pins'])
< 			tng_map_pins();
< 
< 		if(!isset($flags['noend']) || !$flags['noend']) include($cms['tngpath'] . "end.php" );
< 	}
< }
< 
< function tng_basicfooter($flags) {
< 	global $text, $cms, $tng_version, $sitever, $http, $tngconfig, $tree, $personID;
< 
< 	$footer = "";
< 	$newsitever = getSiteVersion();
< 	//echo "ver=$sitever, nsv=$newsitever";
< 	if($sitever == "mobile" || $newsitever != "standard") {
< 		$thispage = getScriptName(false);
< 		$thispage = preg_replace('/\??\&?sitever=(mobile|standard|tablet)/',"",$thispage);
< 		$con = strpos($thispage, "?") == false ? "?" : "&amp;";
< 
< 		if($sitever == "mobile") {
< 			$gotover = $newsitever == "mobile" ? "standard" : $newsitever;
< 			$message = $text['switchs'];
< 		}
< 		else {
< 			$gotover = "mobile";
< 			$message = $text['switchm'];
< 		}
< 		$footer .= "<p class=\"smaller center\">\n";
< 		$footer .= "<a href=\"$thispage{$con}sitever=$gotover\" class=\"fieldnameback lightlink2 rounded4\">&nbsp;{$message}&nbsp;</a>\n";
< 		$footer .= "</p><br/>\n";
< 	}
< 	include($cms['tngpath'] . "stdsitecredit.php");
< 	$footer .= $sitecredit;
< 	/*if(!$tngconfig['webmatches'] && $personID) {
< ?>
< 		<script type="text/javascript">
< 			jQuery(document).ready(function(){
< 				var params = {tree: '<?php echo $tree; ?>', personID: '<?php echo $personID; ?>'};
< 				jQuery.ajax({
< 					url: '<?php echo $cms['tngpath']; ?>mhtng.php',
< 					data: params,
< 					dataType: 'html',
< 					success: function(req) {
< 						jQuery('#nameheader').append(req);
< 					}
< 				})
< 			});
< 		</script>
< <?php
< 	}
< 	*/
< 	if(isset($flags['imgprev'])) {
< ?>
< 		<script type="text/javascript">
< 		jQuery(document).ready(function() {
< 			jQuery('.media-preview').on('mouseover touchstart',function(e) {
< 				e.preventDefault();
< 				var items = this.id.match(/img-(\d+)-(\d+)-(.*)/);
< 				var key = items[2] && items[2] != "0" ? items[1]+"_"+items[2] : items[1];
< 				if(jQuery('#prev'+key).css('display') == "none")
< 					showPreview(items[1],items[2],items[3],key,'<?php echo $sitever; ?>');
< 				else
< 					closePreview(key);
< 			});
< 			jQuery('.media-preview').on('mouseout',function(e) {
< 				var items = this.id.match(/img-(\d+)-(\d+)-(.*)/);
< 				var key = items[2] && items[2] != "0" ? items[1]+"_"+items[2] : items[1];
< 				closePreview(key);
< 			});
< 			jQuery(document).on('click touchstart', '.prev-close img', function(e) {
< 				var items;
< 				items = this.id.match(/close-(\d+)_(\d+)/);
< 				if(!items)
< 					items = this.id.match(/close-(\d+)/);
< 				var key = items[2] && items[2] != "0" ? items[1]+"_"+items[2] : items[1];
< 				closePreview(key);
< 			});
< 		});
< 		</script>
< <?php
< 	}
< 
< 	return $footer;
< }
< 
< function getSmallPhoto( $medialink ) {
< 	global $rootpath, $photopath, $documentpath, $headstonepath, $historypath, $mediapath, $mediatypes_assoc, $thumbmaxw, $thumbmaxh;
< 	global $cms, $mediatypes_thumbs, $sitever, $tnggallery;
< 
< 	if(!$thumbmaxh) $thumbmaxh = 100;		// defaults to 100px if not specified
< 	if(!$thumbmaxw) $thumbmaxw = 80;		// defaults to 80px if not specified
< 
< 	$mediatypeID = $medialink['mediatypeID'];
< 	$usefolder = $medialink['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
< 	//determine $usefolder based on mediatypeID and usecollfolder
< 
< 	$treestr = $tngconfig['mediatrees'] && $medialink['gedcom'] ? $medialink['gedcom'] . "/" : "";
< 	if($medialink['allow_living'] && $medialink['thumbpath'] && file_exists("$rootpath$usefolder/$treestr" . $medialink['thumbpath'])) {
< 		$thumb = $cms['tngpath'] . "$usefolder/" . str_replace("%2F","/",rawurlencode( $medialink['thumbpath'] ));
< 		$photoinfo = @GetImageSize( "$rootpath$usefolder/$treestr" . $medialink['thumbpath'] );
< 
< 		if( $photoinfo[0] <= $thumbmaxw && $photoinfo[1] <= $thumbmaxh ) {
< 			$photohtouse = $photoinfo[1];
< 			$photowtouse = $photoinfo[0];
< 		}
< 		else {
< 			if( $photoinfo[0] > $photoinfo[1] ) {
< 				$photowtouse = $thumbmaxw;
< 				$photohtouse = intval( $thumbmaxw * $photoinfo[1] / $photoinfo[0] ) ;
< 			}
< 			else {
< 				$photohtouse = $thumbmaxh;
< 				$photowtouse = intval( $thumbmaxh * $photoinfo[0] / $photoinfo[1] ) ;
< 			}
< 		}
< 		//$dimensions = " width=\"$photowtouse\" height=\"$photohtouse\"";
< 		$dimensions = " height=\"$photohtouse\"";
< 		$class = " class=\"thumb\"";
< 	}
< 	else {
< 		$thumb = $cms['tngpath'] . "img/" . $mediatypes_thumbs[$mediatypeID];
< 		$dimensions = $class = "";
< 	}
< 
< 	$altmsg = $medialink['allow_living'] ? str_replace("\"","'",$medialink['description']) : "";
< 	$cleantitle = $tnggallery ? $altmsg : "";
< 	$imgsrc = "<img src=\"$thumb\" border=\"0\" $dimensions alt=\"$altmsg\" title=\"$cleantitle\"$class />";
< 
< 	return $imgsrc;
< }
< 
< function tng_DrawHeading($photostr, $namestr, $years) {
< 	global $tngconfig;
< 	if( $photostr )
< 		$outputstr = "<div style=\"float:left; padding-right:5px\">$photostr</div><h1 class=\"header fn\" id=\"nameheader\" style=\"margin-bottom:5px\">$namestr</h1><span class=\"normal\">$years</span>\n";
< 	else {
< 		$outputstr = "<h1 class=\"header fn\" id=\"nameheader\" style=\"margin-bottom:5px\">$namestr</h1>";
< 		if($years)
< 			$outputstr .= "<span class=\"normal\">$years</span><br />\n";
< 	}
< 	$outputstr .= "<br clear=\"all\" /><br />\n";
< 	if(!$tngconfig['webmatches'])
< 		echo "<div id=\"mhmatches\"></div>\n";
< 
< 	return $outputstr;
< }
< 
< function getSurnameOnly( $row ) {
< 	global $text, $admtext, $tngconfig;
< 
< 	$nonames = showNames($row);
< 	if( $row['allow_living'] || $nonames != 1 ) {
< 		$namestr = trim( $row['lnprefix'] . " " . $row['lastname'] );
< 		if($tngconfig['ucsurnames']) $namestr = tng_strtoupper($namestr);
< 	}
< 	elseif( $row['private'] )
< 		$namestr = $admtext['text_private'];
< 	else
< 		$namestr = $text['living'];
< 
< 	return $namestr;
< }
< 
< function getFirstNameOnly( $row ) {
< 	global $text, $admtext;
< 
< 	$nonames = showNames($row);
< 	if( ($row['allow_living'] && $row['allow_private']) || !$nonames )
< 		$namestr = strtok( $row['firstname'], " " );
< 	elseif( $nonames == 2 )
< 		$namestr = initials( $row['firstname'] );
< 	elseif( $row['private'] )
< 		$namestr = $admtext['text_private'];
< 	else
< 		$namestr = $text['living'];
< 
< 	return $namestr;
< }
< 
< function tng_menu( $enttype, $currpage, $entityID, $innermenu ) {
< 	global $tree, $text, $disallowgedcreate, $target, $allow_admin, $allow_edit, $currentuser;
< 	global $rightbranch, $cms, $allow_ged, $emailaddr, $newbrowser, $tngprint, $flags, $sitever;
< 
< 	$nexttab = 0;
< 	if( !$tngprint ) {
< 		$menu = "<div id=\"tngmenu\">\n";
< 		$menu .= $newbrowser ? "<ul id=\"tngnav\">\n" : "<div id=\"tabs\">\n";
< 		$choices = "";
< 		if( $enttype == "I" ) {
< 			$getperson_url = getURL( "getperson", 1 );
< 			$pedigree_url = getURL( "pedigree", 1 );
< 			$descend_url = getURL( "descend", 1 );
< 			$gedform_url = getURL( "gedform", 1 );
< 			$relateform_url = getURL( "relateform", 1 );
< 			$timeline_url = getURL( "timeline", 1 );
< 			$familychart_url = getURL( "familychart", 1 );
< 
< 			$choices .= doMenuItem( $nexttab++, $getperson_url . "personID=$entityID&amp;tree=$tree" , "ind", $text['indinfo'], $currpage, "person" );
< 			$choices .= doMenuItem( $nexttab++, $familychart_url . "personID=$entityID&amp;tree=$tree" , "fam", $text['family'], $currpage, "familychart" );
< 			$choices .= doMenuItem( $nexttab++, $pedigree_url . "personID=$entityID&amp;tree=$tree" , "ped", $text['ancestors'], $currpage, "pedigree" );
< 			$choices .= doMenuItem( $nexttab++, $descend_url . "personID=$entityID&amp;tree=$tree" , "desc", $text['descendants'], $currpage, "descend" );
< 			$choices .= doMenuItem( $nexttab++, $relateform_url . "primaryID=$entityID&amp;tree=$tree" , "rel", $text['relationship'], $currpage, "relate" );
< 			$choices .= doMenuItem( $nexttab++, $timeline_url . "primaryID=$entityID&amp;tree=$tree" , "time", $text['timeline'], $currpage, "timeline" );
< 			if( !$disallowgedcreate || ($allow_ged && $rightbranch) )
< 				$choices .= doMenuItem( $nexttab++, "$gedform_url" . "personID=$entityID&amp;tree=$tree" , "ged", $text['extractgedcom'], $currpage, "gedcom" );
< 			$editstr = "admin_editperson.php?person";
< 		}
< 		elseif( $enttype == "F" ) {
< 			$familygroup_url = getURL( "familygroup", 1 );
< 			$familychart_url = getURL( "familychart", 1 );
< 
< 			$choices .= doMenuItem( $nexttab++, "$familychart_url" . "familyID=$entityID&amp;tree=$tree" , "fam", $text['familychart'], $currpage, "familychart" );
< 			$choices .= doMenuItem( $nexttab++, "$familygroup_url" . "familyID=$entityID&amp;tree=$tree" , "rel", $text['groupsheet'], $currpage, "family" );
< 			$editstr = "admin_editfamily.php?family";
< 		}
< 		elseif( $enttype == "S" ) {
< 			$showsource_url = getURL( "showsource", 1 );
< 
< 			$choices .= doMenuItem( $nexttab++, "$showsource_url" . "sourceID=$entityID&amp;tree=$tree" , "ged", $text['source'], $currpage, "source" );
< 			$editstr = "admin_editsource.php?source";
< 		}
< 		elseif( $enttype == "R" ) {
< 			$showrepo_url = getURL( "showrepo", 1 );
< 
< 			$choices .= doMenuItem( $nexttab++, "$showrepo_url" . "repoID=$entityID&amp;tree=$tree" , "ged", $text['repository'], $currpage, "repo" );
< 			$editstr = "admin_editrepo.php?repo";
< 		}
< 		elseif( $enttype == "D" ) {
< 			$show_dna_test_url = getURL( "show_dna_test", 1 );
< 			if (!$_SESSION["ttree"]) $_SESSION["ttree"] = "-x--all--x-";
< 			$browse_dna_tests_url = getURL( "browse_dna_tests", 1 ) . "tree=" . $_SESSION["ttree"] . "&amp;test_type=" . $_SESSION["ttype"] . "&amp;test_group=" . $_SESSION["tgroup"] . "&amp;testsearch=" . $_SESSION["tsearch"];
< 
< 			$choices .= doMenuItem( $nexttab++, "$browse_dna_tests_url" , "ged", $text['all_dna_tests'], $currpage, "alldna" );
< 			$choices .= doMenuItem( $nexttab++, "$show_dna_test_url" . "testID=$entityID" , "ged", $text['dna_test'], $currpage, "dna" );
< 			$editstr = "admin_edit_dna_test.php?test";
< 		}
< 		elseif( $enttype == "L" ) {
< 			$placesearch_url = getURL( "placesearch", 1 );
< 
< 			$treestr = $tngconfig['places1tree'] ? "" : "&amp;tree=$tree";
< 			$choices .= doMenuItem( $nexttab++, "$placesearch_url" . "psearch=$entityID$treestr" , "place", $text['place'], $currpage, "place" );
< 			$editstr = "admin_editplace.php?";
< 			$entityID = urlencode($entityID);
< 		}
< 		if( $allow_edit && $rightbranch ) {
< 			$choices .= doMenuItem( $nexttab, $cms['tngpath'] . "$editstr" . "ID=$entityID&amp;tree=$tree&amp;cw=1\" target=\"_blank", "sugg", $text['edit'], $currpage, "" );
< 		}
< 		elseif( $emailaddr ) {
< 			$suggest_url = getURL( "suggest", 1 );
< 			$choices .= doMenuItem( $nexttab, "$suggest_url" . "enttype=$enttype&amp;ID=$entityID&amp;tree=$tree", "sugg", $text['suggest'], $currpage, "suggest" );
< 		}
< 		if($sitever == "mobile") {
< 			$menu .= "<li>\n<a class=\"here\">\n<select id=\"tngtabselect\" onchange=\"window.location.href=this.options[this.selectedIndex].value\">\n$choices</select>\n</a>\n</li>\n";
< 		}
< 		else
< 			$menu .= $choices;
< 		$menu .= $newbrowser ? "</ul>\n" : "</div>\n";
< 		$menu .= "</div>\n";
< 		$menu .= "<div id=\"pub-innermenu\" class=\"fieldnameback fieldname smaller rounded4\">\n";
< 		$menu .= $innermenu;
< 		$menu .= "</div><br/>\n";
< 
<         if ($flags['tabs'] == "tngtabs1.css") {
<             $more = "";
<             for ($i = 7; $i <= $nexttab; $i++) {
<                 $offset = 140 + ($i-6) * 25;
<                 $more .= "\t#a$i {left: -{$offset}px;}\n";
<                 $more .= "\t#tngnav a#a$i {left: -{$offset}px;}\n";
<             }
<             if($more) {
<                 if(!isset($flags['more'])) $flags['more'] = "";
<                 $flags['more'] .= "\n<style type=\"text/css\">\n\t<!--\n$more\t-->\n</style>\n";
<             }
<         }
< 	}
< 	else $menu = "";
< 
< 	return $menu;
< }
< 
< //DEPRECATED
< function tng_coreicons( ) {
< 	return "";
< }
< 
< function tng_smallIcon($options) {
< 	global $sitever;
< 	$target = "";
< 	
< 	$url = isset($options['url']) ? $options['url'] : "#";
< 	$onclick = isset($options['onclick']) ? "onclick=\"{$options['onclick']}\"" : "";
< 	$targetloc = $target ? "target=\"$target\"" : "";
< 	$class = $sitever == "mobile" ? "mobileicon" : (isset($options['class']) ? $options['class'] : "tngsmallicon");
< 	$rel = isset($options['rel']) ? "rel=\"{$options['rel']}\"" : "";
< 	
< 	if($sitever == "mobile") {
< 		$begin = "<li>";
< 		$end = "</li>\n";
< 	}
< 	else {
< 		$begin = " ";
< 		$end = "\n";
< 	}
< 	
< 	$link = "$begin<a href=\"$url\" $onclick $targetloc $rel title=\"{$options['label']}\" class=\"$class\" id=\"{$options['id']}-smicon\">{$options['label']}</a>$end";
< 		
< 	return $link;
< }
<  
< function tng_getLeftIcons() {
< 	global $tngconfig, $text, $homepage, $currentuser, $allow_profile, $cms, $target, $sitever;
< 	
<     if(!isset($tngconfig['menucount']))
<         $tngconfig['menucount'] = 0;
< 
< 	$left_icons = "";
< 	if( !$tngconfig['showhome'] ) {
< 		$left_icons .= tng_smallIcon(array('url'=>getURL( $homepage, 0, ""), 'label'=>$text['homepage'], 'id'=>"home"));
< 		$tngconfig['menucount']++;
< 	}
<    	if( !$tngconfig['showsearch'] ) {
< 		$params = array('url'=>getURL( "searchform", 0 ), 'label'=>$text['search'], 'id'=>"search");
< 		if(!$tngconfig['searchchoice'] && $sitever != "mobile")
< 			$params['onclick'] = "return openSearch();";
< 		$left_icons .= tng_smallIcon($params);
< 		$tngconfig['menucount']++;
< 	}
< 
< 	$profilelink = $userparen = "";
< 	if($currentuser) {
< 		if($allow_profile && $sitever != "mobile") {
< 	      	$editprofile_url = getURL( "ajx_editprofile", 1 );
< 			$profilelink = tng_smallIcon(array('label'=>($sitever == "mobile" ? $text['editprofile'] : "({$text['editprofile']}: $currentuser)"),
< 				'class'=>"tngsmallicon3", 'id'=>"profile", 
< 				'onclick'=>"tnglitbox = new LITBox('{$editprofile_url}p=" . urlencode($cms['tngpath']) . "',{width:520,height:560}); return false"));
< 			$tngconfig['menucount']++;
< 		}
< 		else 
< 			$userparen = " ($currentuser)";
< 	}
< 	if( !$tngconfig['showlogin'] ) {
< 		if( $currentuser ) {
< 			if( !$cms['cloaklogin'] || $cms['cloaklogin'] == "both" )
< 				$left_icons .= tng_smallIcon(array('url'=>getURL( "logout", 1 ) . "session=" . session_name(), 'label'=>$text['logout'] . $userparen, 'id'=>"log"));
< 		}
< 		else {
< 			if( !$cms['cloaklogin'] || $cms['cloaklogin'] == "both" ) {
< 				$login_url = getURL( "ajx_login", 1 );
< 				$left_icons .= tng_smallIcon(array('label'=>$text['login'], 'id'=>"log", 'onclick'=>"return openLogin('{$login_url}p=" . urlencode($cms['tngpath']) . "');"));
< 			}
< 		}
< 		$tngconfig['menucount']++;
< 	}
< 	$left_icons .= $profilelink;
< 
< 	return $left_icons;
< }
< 
< function tng_getRightIcons() {
< 	global $text, $tngconfig, $cms, $gotlastpage, $sitever, $isConnected;
< 
< 	$addbookmark_url = getURL( "ajx_addbookmark", 1 );
< 
< 	$right_icons = "";
< 	if( $tngconfig['showshare'] && $isConnected && $sitever != "mobile")
< 		$right_icons .= tng_smallIcon(array('label'=>$text['share'], 'id'=>"share", 'onclick'=>"jQuery('#shareicons').toggle(200); if(!share) { jQuery('#share-smicon').html('{$text['hide']}'); share=1;} else { jQuery('#share-smicon').html('{$text['share']}'); share=0; }; return false;"));
< 
< 	if( !$tngconfig['showprint'] && $sitever != "mobile") {
< 		$print_url = getScriptName();
< 	 	if(preg_match("/\?/",$print_url))
< 			$print_url .= "&amp;tngprint=1";
< 		else
< 			$print_url .= "?tngprint=1";
< 		$right_icons .= tng_smallIcon(array('label'=>$text['tngprint'], 'id'=>"print", 'rel'=>"nofollow", 'onclick'=>"newwindow=window.open('$print_url','tngprint','width=850,height=600,status=no,resizable=yes,scrollbars=yes'); newwindow.focus(); return false;"));
< 	}
< 
< 	if( !$tngconfig['showbmarks'] && $gotlastpage ) {
< 		$right_icons .= tng_smallIcon(array('label'=>$text['bookmark'], 'id'=>"bmk", 'onclick'=>"tnglitbox = new LITBox('{$addbookmark_url}p=" . urlencode($cms['tngpath']) . "',{width:350,height:100}); return false;"));
< 		$tngconfig['menucount']++;
< 	}
< 
< 	return $right_icons;
< }
< 
< function tng_getFindMenu() {
< 	global $tngconfig, $time_offset;
< 
< 	$menu = tngddrow(getURL( "surnames", 0 ), "surnames-icon", "", "surnames");
< 	$menu .= tngddrow(getURL( "firstnames", 0 ), "surnames-icon", "", "firstnames");
< 	$menu .= tngddrow(getURL( "searchform", 0 ), "search-icon", "", "searchnames");
< 	$menu .= tngddrow(getURL( "famsearchform", 0 ), "fsearch-icon", "", "searchfams");
< 	$menu .= tngddrow(getURL( "searchsite", 0 ), "searchsite-icon", "", "searchsitemenu");
< 	$menu .= tngddrow(getURL( "places", 0 ), "places-icon", "", "places");
< 	$menu .= tngddrow(getURL( "anniversaries", 0 ), "dates-icon", "", "dates");
< 	$tngmonth = date("m", time() + ( 3600 * $time_offset ) );
< 	$menu .= tngddrow(getURL( "calendar", 1 ) . "m=$tngmonth", "calendar-icon", "", "calendar");
< 	$menu .= tngddrow(getURL( "cemeteries", 0 ), "cemeteries-icon", "", "cemeteries");
< 	$menu .= tngddrow(getURL( "bookmarks", 0 ), "bookmarks-icon", "", "bookmarks");
< 
< 	$tngconfig['menucount'] += 8;
< 
< 	global $findmenulinks;
< 	if( isset( $findmenulinks ) ) {
< 		$menu .= custom_links( $findmenulinks );
< 	}
< 
< 	return $menu;
< }
< 
< function tng_getMediaMenu() {
< 	global $mediatypes, $tngconfig;
< 	
< 	$menu = "";
< 	foreach( $mediatypes as $mediatype ) {
< 		if(!$mediatype['disabled']) {
< 			$menu .= tngddrow(getURL( "browsemedia", 1 ) . "mediatypeID=" . $mediatype['ID'], $mediatype['ID'] . "-icon", $mediatype['icon'], $mediatype['display'], true);
< 			$tngconfig['menucount']++;
< 		}
< 	}
< 	$menu .= tngddrow(getURL( "browsealbums", 0 ), "albums-icon", "", "albums");
< 	$menu .= tngddrow(getURL( "browsemedia", 0 ), "media-icon", "", "allmedia");
< 	$tngconfig['menucount'] += 2;
< 
< 	global $mediamenulinks;
< 	if( isset( $mediamenulinks ) ) {
< 		$menu .= custom_links( $mediamenulinks );
< 	}
< 
< 	return $menu;
< }
< 
< function tng_getInfoMenu($title) {
< 	global $allow_admin, $cms, $tngconfig;
< 	
< 	$menu = tngddrow(getURL( "whatsnew", 0 ), "whatsnew-icon", "", "whatsnew");
< 	$menu .= tngddrow(getURL( "mostwanted", 0 ), "mw-icon", "", "mostwanted");
< 	$menu .= tngddrow(getURL( "reports", 0 ), "reports-icon", "", "reports");
< 	$menu .= tngddrow(getURL( "statistics", 0 ), "stats-icon", "", "databasestatistics");
< 	$menu .= tngddrow(getURL( "browsetrees", 0 ), "trees-icon", "", "trees");
< 	$menu .= tngddrow(getURL( "browsebranches", 0 ), "branches-icon", "", "branches");
< 	$menu .= tngddrow(getURL( "browsenotes", 0 ), "notes-icon", "", "notes");
< 	$menu .= tngddrow(getURL( "browsesources", 0 ), "sources-icon", "", "sources");
< 	$menu .= tngddrow(getURL( "browserepos", 0 ), "repos-icon", "", "repositories");
< 	if(!$tngconfig['hidedna'])
< 		$menu .= tngddrow(getURL( "browse_dna_tests", 0 ), "dna-icon", "", "dna_tests");
< 	if( $allow_admin ) {
< 		$menu .= tngddrow(($cms['adminurl'] ? $cms['adminurl'] : $cms['tngpath']."admin.php"), "admin-icon", "", "administration");
< 		$menu .= tngddrow(getURL( "showlog", 0 ), "unlock-icon", "", "mnushowlog");
< 		$tngconfig['menucount'] += 2;
< 	}
< 	$menu .= tngddrow(getURL( "suggest", 1 ) . "page=" . urlencode(str_replace("?", "", $title)), "contact-icon", "", "contactus");
< 	$tngconfig['menucount'] += 10;  //everything except the 2 admin links
< 
< 	global $infomenulinks;
< 	if( isset( $infomenulinks ) ) {
< 		$menu .= custom_links( $infomenulinks );
< 	}
< 
< 	return $menu;
< }
< 
< function tng_getLanguageSelect($instance) {
< 	global $chooselang, $languages_table, $mylanguage, $languages_path;
< 
< 	$menu = "";
< 	if( $chooselang ) {
< 		$query = "SELECT languageID, display, folder FROM $languages_table ORDER BY display";
< 		$result = tng_query($query);
< 		$numlangs = tng_num_rows( $result );
< 
< 		if( $numlangs > 1 ) {
< 			$menu .= "<li class=\"langmenu\">\n";
< 			$menu .= getFORM( "savelanguage2", "get", "tngmenu$instance", "" );
< 			$menu .= "<select name=\"newlanguage$instance\" id=\"newlanguage$instance\" style=\"font-size:9pt;\" onchange=\"document.tngmenu$instance.submit();\">";
< 
< 			while( $row = tng_fetch_assoc($result)) {
< 				$menu .= "<option value=\"{$row['languageID']}\"";
< 				if( $languages_path . $row['folder'] == $mylanguage )
< 					$menu .= " selected=\"selected\"";
< 				$menu .= ">{$row['display']}</option>\n";
< 			}
< 			$menu .= "</select>\n";
< 			$menu .= "<input type=\"hidden\" name=\"instance\" value=\"$instance\" /></form>\n";
< 			$menu .= "</li>\n";
< 		}
< 
< 		tng_free_result($result);
< 	}
< 
< 	return $menu;
< }
< 
< function tng_getLangMenu($title) {
< 	global $chooselang, $languages_table, $mylanguage, $languages_path, $text, $tngconfig;
< 
< 	$menu = "";
< 	if( $chooselang ) {
< 		$query = "SELECT languageID, display, folder FROM $languages_table ORDER BY display";
< 		$result = tng_query($query);
< 		$numlangs = tng_num_rows( $result );
< 
< 		if( $numlangs > 1 ) {
< 			while( $row = tng_fetch_assoc($result)) {
< 				$prefix = $languages_path . $row['folder'] == $mylanguage ? "*" : "";
< 				$menu .= tngddrow(getURL( "savelanguage2", 1 ) . "newlanguage=" . $row['languageID'], "", "", $prefix . $row['display'], true);
< 				$tngconfig['menucount']++;
< 			}
< 			if($menu)
< 				$menu = "<ul id=\"mlangmenu\" class=\"mright\">\n" . $menu . "</ul>\n";
< 		}
< 
< 		tng_free_result($result);
< 	}
< 
< 	return $menu;
< }
< 
< function get_menustyle($key,$itemcount) {
< 	$mmenustyle = "";
< 	if($itemcount) {
< 		$moffset = 50 * $itemcount;
< 		$mmenustyle .= "ul#m" . $key . "menu {-webkit-transform: translate3d(0,-" . $moffset . "px,0);}\n";
< 		$mmenustyle .= "ul#m" . $key . "menu {-moz-transform: translate3d(0,-" . $moffset . "px,0);}\n";
< 		$mmenustyle .= "ul#m" . $key . "menu {transform: translate3d(0,-" . $moffset . "px,0);}\n";
< 	}
< 	return $mmenustyle;
< }
< 
< function tng_mobileicons($title) {
< 	global $text, $tngconfig, $custommenu, $custmenu, $custommobilemenu, $custommenulinks;
< 	
< 	//container, full width, fixed at top
< 	//get left & right icons, put in single list
< 	//get menus, link to icons
< 	//do something with languages
< 	$menu = "<div id=\"tngheader\">\n";
< 	$menu .= "<div id=\"mast\">\n";
< 	$menu .= "<div class=\"mhead\">\n";
< 	$menu .= "<a href=\"\" id=\"mcore\" onclick=\"return toggleMobileMenu('core');\"></a>\n";
< 
< 	$tngconfig['mmenustyle'] = "";
< 	$tngconfig['menucount'] = 0;
< 	$menu .= "<ul id=\"mcoremenu\">\n";
< 	$menu .= tng_getLeftIcons();
< 	$menu .= tng_getRightIcons();
< 	$menu .= "</ul>\n";
< 	$tngconfig['mmenustyle'] .= get_menustyle("core",$tngconfig['menucount']);
< 
< 	$menuicons = "<div id=\"mmenus\">\n";
< 	$menuitems = "";
< 	
< 	$tngconfig['menucount'] = 0;
< 	$finditems = tng_getFindMenu();
< 	if($tngconfig['menucount']) {
< 		$menuitems .= "<ul id=\"mfindmenu\" class=\"mright\">\n" . $finditems . "</ul>\n";
< 		$menuicons .= "<a href=\"\" class=\"mmenu\" id=\"mmenu-find\" title=\"{$text['find_menu']}\" onclick=\"return toggleMobileMenu('find');\"></a>\n";
< 		$tngconfig['mmenustyle'] .= get_menustyle("find",$tngconfig['menucount']);
< 	}
< 
< 	$tngconfig['menucount'] = 0;
< 	$mediaitems = tng_getMediaMenu();
< 	if($tngconfig['menucount']) {
< 		$menuitems .= "<ul id=\"mmediamenu\" class=\"mright\">\n" . $mediaitems . "</ul>\n";
< 		$menuicons .= "<a href=\"\" class=\"mmenu\" id=\"mmenu-media\" title=\"{$text['media']}\" onclick=\"return toggleMobileMenu('media');\"></a>\n";
< 		$tngconfig['mmenustyle'] .= get_menustyle("media",$tngconfig['menucount']);
< 	}
< 	
< 	$tngconfig['menucount'] = 0;
< 	$infoitems = tng_getInfoMenu($title);
< 	if($tngconfig['menucount']) {
< 		$menuitems .= "<ul id=\"minfomenu\" class=\"mright\">\n" . $infoitems . "</ul>\n";
< 		$menuicons .= "<a href=\"\" class=\"mmenu\" id=\"mmenu-info\" title=\"{$text['info']}\" onclick=\"return toggleMobileMenu('info');\"></a>\n";
< 		$tngconfig['mmenustyle'] .= get_menustyle("info",$tngconfig['menucount']);
< 	}
< 	
< 	//hook for custom dropdown options
< 	$tngconfig['menucount'] = 0;
< 	if(isset($custommobilemenu))
< 		eval($custommobilemenu);
< 	//Rick Bisbee's mod
< 	elseif(isset($custmenu)) {
< 		$items = custom_links( $custommenulinks );
< 		$menuitems .= custom_menu( $custmenu, $items, true );
< 		$menuicons .= "<a href=\"\" class=\"mmenu\" id=\"mmenu-cust\" title=\"{$custmenu['title_text']}\" onclick=\"return toggleMobileMenu('cust');\"></a>\n";
< 		$tngconfig['mmenustyle'] .= get_menustyle("cust",$tngconfig['menucount']);
< 	}
< 
< 	$tngconfig['menucount'] = 0;
< 	$menuitems .= tng_getLangMenu($title);
< 	if($tngconfig['menucount']) {
< 		$menuicons .= "<a href=\"\" class=\"mmenu\" id=\"mmenu-lang\" title=\"{$text['language']}\" onclick=\"return toggleMobileMenu('lang');\"></a>\n";
< 		$tngconfig['mmenustyle'] .= get_menustyle("lang",$tngconfig['menucount']);
< 	}
< 
< 	$menuicons .= "</div>\n";
< 	$menu .= $menuicons . $menuitems . "</div>\n</div>\n</div>\n";
< 
< 	//return both menu and transform style
< 	return $menu;
< }
< 
< function tng_icons( $instance, $title = "" ) {
< 	global $text, $tngconfig, $customshare, $cms, $tngprint, $custommenu, $custmenu, $custommenulinks, $sitever;
< 
< 	$fullmenu = "";
< 	if( $tngprint ) {
< 		$fullmenu .= "<div style=\"float:right\"><b><a href=\"javascript:{document.getElementById('printlink').style.visibility='hidden'; window.print();}\" style=\"text-decoration:underline\" id=\"printlink\">&gt;&gt; {$text['tngprint']} &lt;&lt;</a></b></div>\n";
< 	}
< 	else {
< 
< 		if( $tngconfig['menu'] == 1 ) {
< 			$iconalign = "float-left";
< 			//$innerborder = "";
< 		}
< 		else {
< 			$iconalign = " float-right";
< 			//$innerborder = " style=\"border-right:1px solid #aaaaaa\"";
< 		}
< 
< 		$left_icons = tng_getLeftIcons();
< 		if($left_icons)
< 			$left_icons = "<div class=\"icons\">\n{$left_icons}&nbsp;\n</div>\n";
< 
< 		$right_icons = tng_getRightIcons();
< 
< 		$langmenu = tng_getLanguageSelect($instance);
< 
< 		$menu = "";
< 		if($tngconfig['menu'] < 2) {
< 			$menu .= "<li><a href=\"#\" class=\"menulink\">{$text['find_menu']}</a>\n";
< 			$menu .= "<ul>\n";
< 			$menu .= tng_getFindMenu();
< 			$menu .= "</ul>\n";
< 			$menu .= "</li>\n";
< 
< 			$menu .= "<li><a href=\"#\" class=\"menulink\">{$text['media']}</a>\n";
< 			$menu .= "<ul>\n";
< 			$menu .= tng_getMediaMenu();
< 			$menu .= "</ul>\n";
< 			$menu .= "</li>\n";
< 
< 			$menu .= "<li><a href=\"#\" class=\"menulink\">{$text['info']}</a>\n";
< 			$last = !$langmenu && !isset($custommenu) ? " class=\"last\"" : "";
< 			$menu .= "<ul{$last}>\n";
< 			$menu .= tng_getInfoMenu($title);
< 			$menu .= "</ul>\n";
< 			$menu .= "</li>\n";
< 
< 			//hook for custom dropdown options
< 			if(isset($custommenu))
< 				eval($custommenu);
< 			//Rick Bisbee's mod
< 			elseif(isset($custmenu)) {
< 				$items = custom_links( $custommenulinks );
< 				$menu .= custom_menu( $custmenu, $items );
< 			}
< 		}
< 
< 		$menu .= $langmenu;
< 
< 		$outermenu = $rightmenu = "";
< 
< 		if($tngconfig['menu'] != 1)
< 			$outermenu .= $left_icons;
< 
< 		if($menu) {
<  			$outermenu .= "<ul class=\"tngdd $iconalign\" id=\"tngdd\">\n";
< 
< 			if($tngconfig['menu'] != 1)
< 				$outermenu .= "<li class=\"langmenu stubmenu\"><br/></li>\n";
< 
< 			$outermenu .= $menu;
< 
< 			if($tngconfig['menu'] == 1)
< 				$outermenu .= "<li class=\"langmenu stubmenu-rt\"><br/></li>\n";
< 
< 			$outermenu .= "</ul>\n";
< 		}
< 
< 		if($tngconfig['menu'] == 2 && !$langmenu) {
< 			$outermenu .= "<div class=\"icons-rt in-bar\">\n$right_icons\n</div>\n";
< 			$shift_str = " shift100left";
< 		}
< 		else
< 			$shift_str = "";
< 
< 		if($outermenu) {
< 			$fullmenu .= "<div class=\"menucontainer\">\n";
< 			$fullmenu .= "<div class=\"innercontainer\">\n";
< 
< 			$fullmenu .= $outermenu;
< 
< 			$fullmenu .= "</div>\n";
< 			$fullmenu .= "</div>\n";
< 
< 			if(!$tngconfig['searchchoice'] && !$tngconfig['showsearch']) {
< 				$searchform_url = getURL( "searchform", 0 );
< 				$famsearch_url = getURL( "famsearchform", 0 );
< 				$searchsite_url = getURL( "searchsite", 0 );
< 
< 				$fullmenu .= '<div id="searchdrop" class="slidedown" style="display:none;">';
< 				$fullmenu .= "<a href=\"#\" onclick=\"jQuery('#searchdrop').slideUp(200);return false;\" style=\"float:right\"><img src=\"{$cms['tngpath']}img/tng_close.gif\" border=\"0\" alt=\"\"/></a>";
< 				$fullmenu .= "<span class=\"subhead\"><strong>{$text['search']}</strong> | <a href=\"$searchform_url\">{$text['mnuadvancedsearch']}</a> | <a href=\"$famsearch_url\">{$text['searchfams']}</a> | <a href=\"$searchsite_url\">{$text['searchsitemenu']}</a></span><br/><br/>";
< 				$fullmenu .= getFORM( "search", "get", "", "") . "\n";
< 				$fullmenu .= "<label for=\"searchfirst\">{$text['firstname']}: </label><input type=\"text\" name=\"myfirstname\" id=\"searchfirst\"/> &nbsp;\n";
< 				$fullmenu .= "<label for=\"searchlast\">{$text['lastname']}: </label><input type=\"text\" name=\"mylastname\" id=\"searchlast\"/> &nbsp;\n";
< 				$fullmenu .= "<label for=\"searchid\">{$text['id']}: </label><input type=\"text\" class=\"veryshortfield\" name=\"mypersonid\" id=\"searchid\"/> &nbsp;\n";
< 				$fullmenu .= "<input type=\"hidden\" name=\"idqualify\" value=\"equals\"/>\n";
< 				$fullmenu .= "<input type=\"submit\" value=\"{$text['search']}\"/></form></div>";
< 			}
< 		}
< 
< 		if($tngconfig['menu'] == 1)
< 			$fullmenu .= $left_icons;
< 
< 		$sharemenu = "";
< 		if( $tngconfig['showshare'] && $sitever != "mobile" ) {
< 	        $sharemenu .= "<div id=\"shareicons\" style=\"display:none\">\n";
< 			$sharemenu .= "<span class='st_facebook_hcount' displayText='Facebook'></span>\n";
< 			$sharemenu .= "<span class='st_twitter_hcount' displayText='Tweet'></span>\n";
< 			$sharemenu .= "<span class='st_pinterest_hcount' displayText='Pinterest'></span>\n";
< 			$sharemenu .= "<span class='st_googleplus_hcount' displayText='Google +'></span>\n";
< 	        if(isset($customshare))
< 	        	eval($customshare);
< 			$sharemenu .= "</div>\n";
< 		}
< 
< 		if($sharemenu || $right_icons || $tngconfig['menu'] < 2 || $numlangs) {
< 			$fullmenu .= "<div class=\"icons-rt$shift_str\">";
< 			$fullmenu .= $sharemenu;
< 
< 			if($tngconfig['menu'] < 2 || $numlangs)
< 				$fullmenu .= $right_icons;
< 
< 			$fullmenu .= "</div>\n";
< 
< 			if($tngconfig['menu'] == 1)
< 				$fullmenu .= "<br style=\"clear:both\" /><br />\n";
< 		}
< 
< 		if($menu) {
< 			$fullmenu .= '<script type="text/javascript">';
< 			$fullmenu .= 'var tngdd=new tngdd.dd("tngdd");';
< 			$fullmenu .= 'tngdd.init("tngdd","menuhover");';
< 			$fullmenu .= "</script>\n";
< 		}
< 
< 	}
< 
< 	return $fullmenu;
< }
< 
< function tngddrow($link, $id, $thumb, $label, $labelliteral = false) {
< 	global $cms, $text, $sitever;
< 
< 	$uselabel = $labelliteral ? $label : $text[$label];
< 	if($sitever == "mobile") {
< 		$ddrow = "<li><a href=\"$link\" class=\"mobileicon\" id=\"$id\" title=\"$uselabel\">$uselabel</a></li>\n";
< 	}
< 	else {
< 		$ddrow = "<li><a href=\"$link\">";
< 		if($thumb)
< 			$ddrow .= "<img src=\"{$cms['tngpath']}$thumb\" class=\"menu-icon\" alt=\"\" />";
< 		else
< 			$ddrow .= "<span class=\"menu-icon\" id=\"$id\"></span>";
< 		$ddrow .= " <span class=\"menu-label\">$uselabel</span></a></li>\n";
< 	}
< 
< 	return $ddrow;
< }
< 
< function treeDropdown($forminfo) {
< 	global $text, $requirelogin, $assignedtree, $trees_table, $time_offset, $treerestrict, $cms, $tree, $numtrees, $tngconfig;
< 
< 	$ret = "";
< 	if(!$requirelogin || !$treerestrict || !$assignedtree) {
< 		$query = "SELECT gedcom, treename, lastimportdate FROM $trees_table ORDER BY treename";
< 		$treeresult = tng_query($query);
< 		$numtrees = tng_num_rows($treeresult);
< 		$foundtree = false;
< 
< 		if( $numtrees > 1 ) {
< 			if($forminfo['startform'])
< 				$ret .= getFORM( $forminfo['action'], $forminfo['method'], $forminfo['name'], $forminfo['id'] );
< 			$ret .= "<span class=\"normal\">{$text['tree']}: </span>";
< 			$ret .= treeSelect($treeresult, $forminfo['name']);
< 			$ret .= "&nbsp; <img src=\"{$cms['tngpath']}img/spinner.gif\" style=\"display:none;\" id=\"treespinner\" alt=\"\" class=\"spinner\"/>\n";
< 			if(is_array($forminfo['hidden'])) {
< 				foreach($forminfo['hidden'] as $hidden)
< 					$ret .= "<input type=\"hidden\" name=\"" . $hidden['name'] . "\" value=\"" . $hidden['value'] . "\" />\n";
< 			}
< 			//$ret .= "<input type=\"submit\" value=\"$text[go]\" />\n";
< 			if($forminfo['endform'])
< 				$ret .= "</form><br/>\n";
< 			else
< 				$ret .= "<br/><br/>\n";
< 			$treeresult = tng_query($query);
< 			if($tree) {
< 				$foundtree = true;
< 				while( $row = tng_fetch_assoc($treeresult) ) {
< 					if($row['gedcom'] == $tree) break;
< 				}
< 			}
< 		}
< 		else {
< 			$foundtree = true;
< 			$row = tng_fetch_assoc( $treeresult );
< 		}
< 		if( $tngconfig['lastimport'] && $foundtree && $forminfo['lastimport']) {
< 			$lastimport = $row['lastimportdate'];
< 
< 			if( $lastimport ) {
< 				$importtime = strtotime($lastimport);
< 				if(substr($lastimport,11,8) != "00:00:00")
< 					$importtime += ($time_offset * 3600);
< 				$importdate = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' ? strftime("%#d %b %Y %H:%M:%S",$importtime) : strftime("%e %b %Y %H:%M:%S",$importtime);
< 				echo "<p class=\"normal\">{$text['lastimportdate']}: " . displayDate($importdate) . "</p>";
< 			}
< 		}
< 		tng_free_result($treeresult);
< 	}
< 	return $ret;
< }
< 
< function treeSelect($treeresult, $formname = null, $onchange = null) {
< 	global $text, $tree;
< 
< 	$ret = "<select name=\"tree\" id=\"treeselect\"";
< 	if($formname)
< 		$ret .= " onchange=\"jQuery('#treespinner').show();document.$formname.submit();\"";
< 	elseif($onchange)
< 		$ret .= " onchange=\"$onchange\"";
< 	$ret .= ">\n";
< 	$ret .= "<option value=\"-x--all--x-\" ";
< 	if( !$tree ) $ret .= "selected=\"selected\"";
< 	$ret .= ">{$text['alltrees']}</option>\n";
< 
< 	while( $row = tng_fetch_assoc($treeresult) ) {
< 		$ret .= "<option value=\"{$row['gedcom']}\"";
< 		if( $tree && $row['gedcom'] == $tree ) $ret .= " selected=\"selected\"";
< 		$ret .= ">{$row['treename']}</option>\n";
< 	}
< 	$ret .= "</select>\n";
< 	return $ret;
< }
< 
< function getMediaHREF($row,$mlflag) {
< 	global $mediatypes_assoc, $mediapath, $htmldocs, $imagetypes, $videotypes, $recordingtypes, $notrunc;
< 
< 	$histories_url = getURL( "histories", 1 );
< 	$showmedia_url = getURL( "showmedia", 1 );
< 
< 	$uselink = "";
< 
< 	if( $row['form'] )
< 		$form = strtoupper($row['form']);
< 	else {
< 		preg_match( "/\.(.+)$/", $row['path'], $matches );
< 		$form = strtoupper($matches[1]);
< 	}
< 	$thismediatype = $row['mediatypeID'];
< 	$usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$thismediatype] : $mediapath;
< 
< 
< 	//if($mlflag != 1) 
< 	//	$notrunc = 1;  //ok, I'm not sure if this is really needed, so I'm commenting it out
< 	if( !$row['abspath'] && (in_array($form,$imagetypes) || in_array($form,$videotypes) || in_array($form,$recordingtypes) || !$form) ) {
< 		$uselink = $showmedia_url . "mediaID=" . $row['mediaID'];
< 		if( $mlflag == 1 )
< 			$uselink .= "&amp;medialinkID=" . $row['medialinkID'];
< 		elseif( $mlflag == 2 )
< 			$uselink .= "&amp;albumlinkID=" . $row['albumlinkID'];
< 		elseif( $mlflag == 3 )
< 			$uselink .= "&amp;cemeteryID=" . $row['cemeteryID'];
< 		//$uselink .= $row['all'] ? "&amp;all=1" : "";
< 	}
< 	else {
< 		if($row['abspath'] || substr($row['path'],0,4) == "http" || substr($row['path'],0,1) == "/")
< 			$uselink = $row['path'];
< 		elseif( in_array( $form, $htmldocs ) && $cms['support'] )
< 			$uselink = $histories_url . "inc=" . $row['path'];
< 		else {
< 			$url = rawurlencode( $row['path'] );
< 			$url = str_replace("%2F","/",$url);
< 			$url = str_replace("%3F","?",$url);
< 			$url = str_replace("%23","#",$url);
< 			$url = str_replace("%26","&",$url);
< 			$url = str_replace("%3D","=",$url);
< 			$uselink = "$usefolder/$url";
< 		}
< 	}
< 	if($row['newwindow'])
< 		$uselink .= "\" target=\"_blank";
< 
< 	return $uselink;
< }
< 
< function insertLinks($notes) {
< 	if($notes) {
< 		$pos = 0;
< 		$notepos = array();
< 		while (($pos = strpos($notes, "http", $pos)) !== FALSE) {
< 			if( $pos ) $prevchar = substr( $notes, $pos - 1, 1 );
< 			if( $pos == 0 || ($prevchar != "\"" && $prevchar != "=") )
< 		    	$notepos[] = $pos++;
< 			else
< 				$pos++;
< 		}
< 		$posidx = count($notepos);
< 		while( $posidx > 0 ) {
< 			$actual = $posidx - 1;
< 			$pos = $notepos[$actual];
< 			$firstpart = substr($notes,0,$pos);
< 			$rest = substr($notes,$pos);
< 			$linkstr = strtok($rest," ,<\n\r");
< 			if( substr( $linkstr, -1 ) == "." ) $linkstr = substr( $linkstr, 0, -1 );
< 			$lastpart = substr($notes,$pos + strlen($linkstr));
< 			$notes = $firstpart . "<a href=\"$linkstr\" target=\"_blank\">$linkstr</a>" . $lastpart;
< 			$posidx--;
< 		}
< 	}
< 
< 	return $notes;
< }
< 
< function getTemplateMessage($key) {
< 	global $tmp, $session_language;
< 
< 	$langkey = $key . "_" . $session_language;
< 
< 	return isset($tmp[$langkey]) ? $tmp[$langkey] : $tmp[$key];
< }
< 
< function showLinks($linkList, $newtab = false, $class = null, $inner_html = null) {
< 	$links = explode("\r",$linkList);
< 	$finishedList = "";
< 	if(count($links) == 1)
< 		$links = explode("\n",$linkList);
< 	foreach($links as $link) {
< 		$parts = explode(",", $link);
< 		$len = count($parts);
< 		if($len == 1) {
< 			$title = $href = $parts[0];
< 		}
< 		elseif($len == 2) {
< 			$title = trim($parts[0]);
< 			$href = trim($parts[1]);
< 		}
< 		else {
< 			$href = trim(array_pop($parts));
< 			$title = implode("", $parts);
< 		}
< 		$target = $newtab ? " target=\"_blank\"" : "";
< 		$finishedList .= "<li";
< 		if($class) $finishedList .= " class=\"$class\"";
< 		if($inner_html)
< 			$html = preg_replace( "/xxx/", $title, $inner_html );
< 		else
< 			$html = $title;
< 		$finishedList .= "><a href=\"$href\" title=\"$title\"$target>$html</a></li>\n";
< 	}
< 	return $finishedList;
< }
< 
< function showMediaLinks($linkList) {
<    global $media_table, $rootpath, $photopath, $documentpath, $headstonepath, $historypath, $mediapath, $mediatypes_assoc, $thumbmaxw, $thumbmaxh, $cms, $mediatypes_thumbs, $sitever;
< 	$links = explode(",",$linkList);
< 	$finishedmedList = "";
< 
< 	foreach($links as $link) {
< 		$thumbquery = "SELECT * FROM $media_table WHERE mediaID = \"$link\"";
< 		$thumbresult = tng_query($thumbquery);
< 		$thumbrow = tng_fetch_assoc( $thumbresult );
< 		tng_free_result( $thumbresult );
< 		$mediatypeID = $thumbrow['mediatypeID'];
< 		$usefolder = $thumbrow['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
< 		$thumb = $cms['tngpath'] . "$usefolder/" . str_replace("%2F","/",rawurlencode( $thumbrow['thumbpath'] ));
< 		$title = $thumbrow['altdescription'] ? $thumbrow['altdescription']:$thumbrow['description'];
< 		$imgsrc = "<img src=\"$thumb\" border=\"0\" alt=\"$title\" title=\"$title\" class=\"thumb\" />";
< 		$href = getMediaHREF($thumbrow,0);
< 		$finishedmedList .= "<br /><a href=\"$href\" title=\"$title\" target=\"_blank\">" . $imgsrc . "</a>&nbsp;<a href=\"$href\" title=\"$title\" target=\"_blank\" style=\"vertical-align:top;\">$title</a><br />";
< 	}
< 	return $finishedmedList;
< }
< 
< function custom_menu( $custmenu, $items, $mobile = false ) {
< 	global $text;
< 
< 	if( isset($custmenu['title_text'])) {
< 		$mtext = $custmenu['title_text'];
< 	}
< 	elseif( isset($custmenu['title_index']) ) {
< 		$mtext = $text[$custmenu['title_index']];
< 	}
< 	// Check for deprecated options
< 	elseif(isset($custmenu['text'])) {
< 		if( $custmenu['literal'] == true ) {
< 			$mtext = $custmenu['text'];
< 		}
< 		else {
< 			$mtext = $text[$custmenu['text']];
< 		}
< 	}
< 	else
< 		$mtext = "Other";
< 
< 	if($mobile) {
< 		$menu = "<ul id=\"mcustmenu\" class=\"mright\">\n" . $items . "</ul>\n";
< 	}
< 	else {
< 		$menu = "<li><a href=\"#\" class=\"menulink\">$mtext</a>\n";
< 		$menu .= "<ul class=\"last\">\n" . $items . "\n</ul>\n";
< 		$menu .= "</li>\n";
< 	}
< 
< 	return $menu;
< }
< 
< function custom_links( $linkdefs ) {
< 	global $cms, $text, $allow_admin, $currentuser, $users_table, $tngconfig;
< 
< 	$menustr = '';
< 	for( $i=0; isset($linkdefs[$i]); $i++ ) {
< 		if( isset($linkdefs[$i]['admin']) && $linkdefs[$i]['admin']) {
< 			if( !$allow_admin ) continue;
< 			$query = "SELECT role FROM $users_table WHERE username='$currentuser'";
< 			$result = tng_query( $query ) or die( "cannot execute query: $query" );
< 			$row = tng_fetch_assoc( $result );
< 			if( $row['role'] != 'admin' ) continue;
< 		}
< 
< 		if( !isset( $linkdefs[$i]['target'] ) ) continue;
< //echo "doingx $i<br>";
< 		$target = $linkdefs[$i]['target'];
< 		$linkpath = !empty( $linkdefs[$i]['external'] ) ? '' : $cms['tngpath'];
< 
< 		// add options to target section
< 		if( !empty( $linkdefs[$i]['tip_text'] ) ){
< 			$target .= "\" title=\"{$linkdefs[$i]['tip_text']}";
< 		}
< 		elseif( isset( $linkdefs[$i]['tip_index'] ) ) {
< 			$target .= "\" title=\"{$text[$linkdefs[$i]['tip_index']]}";
< 		}
< 		if( isset( $linkdefs[$i]['newwin'] ) ) {
< 			$target .= "\" target=\"_blank";
< 		}
< 		// set label for the link
< 		if( isset( $linkdefs[$i]['label_text'] ) ) {
< 			$label = $linkdefs[$i]['label_text'];
< 			$literal = true;
< 		}
< 		elseif( isset( $linkdefs[$i]['label_index'] ) ) {
< 			$label = $linkdefs[$i]['label_index'];
< 			$literal = false;
< 		}
< 		// handle deprecated defs
< 		elseif( isset( $linkdefs[$i]['text'] ) ) {
< 			if( $linkdefs[$i]['literal'] ) {
< 				$literal = true;
< 				$label = $linkdefs[$i]['text'];
< 			}
< 			else {
< 				$label = $text[$linkdefs[$i]['text']];
< 				$literal = false;
< 			}
< 		}
< 		if( empty( $linkdefs[$i]['sprite'] ) )
< 			$linkdefs[$i]['sprite'] = '';
< 		if( empty( $linkdefs[$i]['icon'] ) )
< 			$linkdefs[$i]['icon'] = '';
< 		//echo $linkpath.$target . " " . $linkdefs[$i]['sprite'] . " " . $linkdefs[$i]['icon'] . " " . $label . " " . $literal . "<br>";
< 		$menustr .= tngddrow(
< 			$linkpath.$target,
< 			$linkdefs[$i]['sprite'],
< 			$linkdefs[$i]['icon'],
< 			$label,
< 			$literal
< 		);
< 		$tngconfig['menucount']++;
< 	}
< 
< //debugPrint($linkdefs);
< 	return $menustr;
< }
< 
< function findlangfolder( $file ) {
< 	global $mylanguage, $language;
< 
< 	if( file_exists("$mylanguage/$file") )
< 		$foundlang = "$mylanguage";
< 	elseif( file_exists("languages/$language/$file") )
< 		$foundlang = "languages/$language";
< 	else
< 		$foundlang = "languages/English";
< 		
< 	return $foundlang;
< }
---
> <?php
> if(isset($_GET['cms']) || isset($_POST['cms'])) die("Sorry!");
> include_once($cms['tngpath'] . "pwdlib.php");
> include_once($cms['tngpath'] . "globallib.php");
> @include_once($cms['tngpath'] . "mediatypes.php");
> @include_once($cms['tngpath'] . "tngfiletypes.php");
> include_once($cms['tngpath'] . "version.php");
> checkMaintenanceMode(0);
> if(!empty($needMap)) {
>     include($subroot . "mapconfig.php");
> 	$mapkeystr = $map['key'] && $map['key'] != "1" ? "&amp;key=" . $map['key'] . "&amp;callback=initMap" : "";
>     if($map['key'])
>         include_once($cms['tngpath'] . "googlemaplib.php");
> }
> $flags = array();
> @include($cms['tngpath'] . "tngrobots.php");
> 
> $isConnected = isConnected();
> 
> $htmldocs = array("HTML","PHP","HTM");
> $gotlastpage = false;
> $flags['error'] = $error;
> 
> if(empty($tree)) $tree = "";
> if($requirelogin && $treerestrict && !empty($_SESSION['assignedtree'])) {
> 	if(!$tree)
> 		$tree = $_SESSION['assignedtree'];
> 	elseif($tree != $_SESSION['assignedtree']) {
> 		header("Location:$homepage");
> 		exit;
> 	}
> }
> $orgtree = $tree;
> if( !$tree && $defaulttree ) {
> 	$tree = $defaulttree;
> }
> elseif( $tree == "-x--all--x-" )
> 	$tree = "";
> 
> 
> function tng_header( $title, $flags ) {
> 	global $custommeta, $customheader, $cms, $session_charset, $tngprint, $sitename, $site_desc, $tngconfig, $tngdomain, $responsivetables;
> 	global $text, $map, $browser, $templatepath, $tng_title, $tng_version, $tng_date, $tng_copyright, $sitever, $templatenum, $tmp, $http, $isConnected;
> 	global $fbOGimage, $pageURL;
> 
> 	initMediaTypes();
> 
> 	//echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\">\n\n";
> 	//echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n\n";
> 	header("Content-type:text/html;charset=" . $session_charset);
> 	echo !empty($tngconfig['doctype']) ? $tngconfig['doctype'] . "\n\n" : "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\">\n\n";
> 	if( !$cms['support'] )
> 		echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n";
> 	else
> 		echo $cms['credits'];
> 	//$siteprefix = $sitename ? ($title ? ": " . stripslashes($sitename) : stripslashes($sitename)) : "";
> 	//$title = preg_replace("/\"/", "",$title);
> 	$siteprefix = $sitename ? @htmlspecialchars($title ? ": " . $sitename : $sitename, ENT_QUOTES, $session_charset) : "";
> 	$title = @htmlspecialchars($title, ENT_QUOTES, $session_charset);
> 	echo "<title>$title$siteprefix</title>\n";
> 	echo "<meta name=\"Keywords\" content=\"$site_desc\" />\n";
> 	//echo "<meta name=\"Description\" content=\"" . preg_replace("/\"/", "", $title . $siteprefix) . "\" />\n";
> 	echo "<meta name=\"Description\" content=\"" . $title . $siteprefix . "\" />\n";
> 
> 	if($fbOGimage) {
> 	    echo "<meta property=\"og:title\" content=\"" . $sitename . "\"/>\n";
> 	    echo "<meta property=\"og:description\" content=\"" . $title . "\"/>\n";
> 	    echo "<meta property=\"og:url\" content=\"" . $tngdomain . "/" . $pageURL . "\" />\n";
> 	    echo "<meta property=\"og:type\" content=\"website\"/>\n";
> 	    echo $fbOGimage."\n";
> 	}
> 
> 	if( $session_charset )
> 		echo "<meta http-equiv=\"Content-type\" content=\"text/html; charset=$session_charset\" />\n";
> 	if( isset( $flags['norobots'] ) )
> 		echo $flags['norobots'];
> 	if( isset( $flags['autorefresh'] ) && $flags['autorefresh'] == 1 )
> 		echo "<meta http-equiv=\"refresh\" content=\"30\" />\n";
> 	if($sitever == "mobile" || $sitever == "tablet") {
> 		echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n";
> 		echo "<meta name=\"apple-mobile-web-app-capable\" content=\"yes\" />\n";
> 		echo "<meta name=\"mobile-web-app-capable\" content=\"yes\" />\n";
> 		echo "<meta http-equiv=\"cleartype\" content=\"on\" />\n";
> 
> 		// Update to add icons for Android and iOS 8+.
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"57x57\" href=\"{$cms['tngpath']}img/public/apple-icon-57x57.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"60x60\" href=\"{$cms['tngpath']}img/public/apple-icon-60x60.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"72x72\" href=\"{$cms['tngpath']}img/public/apple-icon-72x72.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"76x76\" href=\"{$cms['tngpath']}img/public/apple-icon-76x76.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"114x114\" href=\"{$cms['tngpath']}img/public/apple-icon-114x114.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"120x120\" href=\"{$cms['tngpath']}img/public/apple-icon-120x120.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"144x144\" href=\"{$cms['tngpath']}img/public/apple-icon-144x144.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"152x152\" href=\"{$cms['tngpath']}img/public/apple-icon-152x152.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"{$cms['tngpath']}img/public/apple-icon-180x180.png\" />\n";
> 		echo "<link rel=\"icon\" type=\"image/png\" sizes=\"192x192\" href=\"{$cms['tngpath']}img/public/android-icon-192x192.png\" />\n";
> 		echo "<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"{$cms['tngpath']}img/public/favicon-32x32.png\" />\n";
> 		echo "<link rel=\"icon\" type=\"image/png\" sizes=\"96x96\" href=\"{$cms['tngpath']}img/public/favicon-96x96.png\" />\n";
> 		echo "<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"{$cms['tngpath']}img/public/favicon-16x16.png\" />\n";
> 		echo "<link rel=\"manifest\" href=\"img/public/manifest.json\" />\n";
> 		// Update to add icons for Android and iOS 8 and later.
> 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"144x144\" href=\"{$cms['tngpath']}img/tng-apple-icon-144.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"114x114\" href=\"{$cms['tngpath']}img/tng-apple-icon-114.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon-precomposed\" sizes=\"72x72\" href=\"{$cms['tngpath']}img/tng-apple-icon-72.png\" />\n";
> 		echo "<link rel=\"apple-touch-icon-precomposed\" href=\"{$cms['tngpath']}img/tng-apple-icon.png\" />\n";
> 		echo "<link rel=\"shortcut icon\" href=\"{$cms['tngpath']}img/tng-apple-icon.png\" />\n";
> 	}
> 	elseif($tngconfig['favicon']) {
> 		echo "<link rel=\"shortcut icon\" href=\"{$cms['tngpath']}img/public/{$tngconfig['favicon']}\" />\n";
> 		// Update to add icons for Windows 8+ and Safari in MacOS El Capitan+.
> 		echo "<link rel=\"mask-icon\" href=\"{$cms['tngpath']}img/public/safari-pinned-tab.svg\" color=\"#5bbad5\" />\n";
> 		echo "<meta name=\"msapplication-config\" content=\"{$cms['tngpath']}img/public/browserconfig.xml\" />\n";
> 		echo "<meta name=\"msapplication-TileColor\" content=\"#ffffff\" />\n";
> 		echo "<meta name=\"msapplication-TileImage\" content=\"{$cms['tngpath']}img/public/ms-icon-144x144.png\" />\n";
> 		echo "<meta name=\"theme-color\" content=\"#ffffff\" />\n";
> 		// Update to add icons for Windows 8+ and Safari in MacOS El Capitan+.
> 	}
> 
> 	if(!$tng_version) include_once("version.php");
> 	if($sitever != "standard" && $responsivetables) 
> 		echo "<link href=\"{$cms['tngpath']}css/tablesaw.bare.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
> 	echo "<link href=\"{$cms['tngpath']}css/genstyle.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
> 	if( isset( $flags['css'] ) )
> 		echo $flags['css'];
> 	echo "<link href=\"{$cms['tngpath']}{$templatepath}css/tngtabs2.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
> 	echo "<link href=\"{$cms['tngpath']}{$templatepath}css/templatestyle.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
> 	if($sitever == "mobile") {
> 		echo "<link href=\"{$cms['tngpath']}css/tngmobile.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
> 		echo "<link href=\"{$cms['tngpath']}{$templatepath}css/tngmobile.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
> 	}
> 	
> 	if($isConnected) {
> 		echo "<script src=\"https://code.jquery.com/jquery-3.4.1.min.js\" type=\"text/javascript\" integrity=\"sha384-vk5WoKIaW/vJyUAd9n/wmopsmNhiy+L2Z+SBxGYnUkunIxVxAv/UtMOhba/xskxh\" crossorigin=\"anonymous\"></script>\n";
> 		echo "<script src=\"https://code.jquery.com/ui/1.12.1/jquery-ui.min.js\" type=\"text/javascript\" integrity=\"sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU=\" crossorigin=\"anonymous\"></script>\n";
> 	}
> 	else {
> 		echo "<script type=\"text/javascript\">// <![CDATA[\nwindow.jQuery || document.write(\"<script src='{$cms['tngpath']}js/jquery-3.4.1.min.js?v=910'>\\x3C/script>\")\n//]]></script>\n";
> 		echo "<script type=\"text/javascript\">// <![CDATA[\nwindow.jQuery.ui || document.write(\"<script src='{$cms['tngpath']}js/jquery-ui-1.12.1.min.js?v=910'>\\x3C/script>\")\n//]]></script>\n";
> 	}
> 	echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/net.js\"></script>\n";
> 
>  	if( isset( $flags['scripting'] ) )
> 		echo $flags['scripting'];
> 	echo "<link href=\"{$cms['tngpath']}{$templatepath}css/mytngstyle.css?v=$tng_version\" rel=\"stylesheet\" type=\"text/css\" />\n";
> 
> 	if(!empty($tngconfig['showshare']) && $isConnected && $sitever != "mobile") {
> 		$w = $http == "https" ? "ws" : "w";
> 		echo "<script type=\"text/javascript\" src=\"{$http}://{$w}.sharethis.com/button/buttons.js\"></script>\n";
> 		echo "<script type=\"text/javascript\">stLight.options({publisher: \"be4e16ed-3cf4-460b-aaa4-6ac3d0e3004b\",doNotHash:true,doNotCopy:true,hashAddressBar:false});</script>\n";
> 	}
> 
> 	//echo "<script type=\"text/javascript\" src=\"{$http}://s7.addthis.com/js/250/addthis_widget.js#pubid=xa-4e568cff0f533c7f\"></script>\n";
> 	if( $tngconfig['menu'] < 2 && !$tngprint && $sitever != "mobile" ) {
> 		echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/tngmenuhover2.js\"></script>\n";
> 	}
> 
> 	if ($sitever != "standard" && $responsivetables) {
> 		echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/tablesaw.js\"></script>\n";
> 		echo "<!--[if lt IE 9]>";
> 		echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/respond.js\"></script>\n";
> 		echo "<![endif]-->";
> 	}
> 
> 	echo "<script type=\"text/javascript\">\n// <![CDATA[\nvar tnglitbox;\nvar share = 0;\nvar closeimg = \"{$cms['tngpath']}img/tng_close.gif\";\n";
> 	echo "var smallimage_url = '" . getURL("ajx_smallimage",1) . "';\nvar cmstngpath='{$cms['tngpath']}';\nvar loadingmsg = '{$text['loading']}';\n";
> 	echo "var expand_msg = \"{$text['expand']}\";\nvar collapse_msg = \"{$text['collapse']}\";\n";
> 	if(isset($flags['error']) && $flags['error']) {
> 		$login_url = getURL( "ajx_login", 1 );
> 		echo "jQuery(document).ready(function(){openLogin('{$login_url}p=" . urlencode($cms['tngpath']) . "&message={$flags['error']}');});\n";
> 	}
> 	echo "//]]>\n</script>\n";
> 	//echo "<style type=\"text/css\">.media-prev {background: transparent url({$cms['tngpath']}img/media-prevbg.png) no-repeat 0 0;}\n.person-prev {background: transparent url({$cms['tngpath']}img/person-prevbg.png) no-repeat 0 0;}</style>\n";
> 	echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"{$cms['tngpath']}tngrss.php\" />\n";
> 
> 	@include( $custommeta );
> 	if( $tngprint )
> 		echo "<link href=\"{$cms['tngpath']}css/tngprint.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
> 	echo "<!-- $tng_title, v.$tng_version ($tng_date), Written by Darrin Lythgoe, $tng_copyright -->\n";
> 
> 	$icons = "";
> 	if($sitever == "mobile") {
> 		if(!isset($flags['nomobile']) || !$flags['nomobile']) {
> 			$icons = tng_mobileicons($title);
> 			$icons .= "<div id=\"mcontent\">\n";
> 		}
> 		echo "<style>\n{$tngconfig['mmenustyle']}</style>\n";
> 	}
> 
> 	if( !$cms['support'] ) {
> 		echo "</head>\n";
> 		if( $sitever != "mobile" && !$tngprint && (!isset($flags['noheader']) || !$flags['noheader']) )
> 			include( $templatepath . $customheader );
> 		elseif(!isset($flags['nobody']) || !$flags['nobody'] || $sitever == "mobile") {
> 			$class = !empty($flags['homeclass']) ? $flags['homeclass'] : "publicbody";
> 			echo "<body class=\"{$class}\">\n";
> 			echo "<div class=\"scroll-to-top\"><a href=\"#\"><img src=\"{$cms['tngpath']}img/backtotop.png\" alt=\"\" /></a></div>\n";
> 		}
> 	}
> 	if( $sitever != "mobile" && (!isset($flags['noicons']) || !$flags['noicons']) )
> 		$icons = tng_icons( $title );
> 	echo $icons;  //from above
> 
> 	if(!$cms['support'] && $sitever == "mobile" && !$tngprint && (!isset($flags['noheader']) || !$flags['noheader'])) {
> 		$ttitle = "t{$templatenum}_maintitle";
> 		if(isset($tmp[$ttitle]))
> 			$mtitle = str_replace(array("<br />","<br>")," ", getTemplateMessage($ttitle));
> 		else {
> 			$ttitle = "t{$templatenum}_headtitle";
> 			$i = 1;
> 			$mtitle = "";
> 			while(isset($tmp[$ttitle . $i])) {
> 				$mtitle .= getTemplateMessage($ttitle . $i) . " ";
> 				$i++;
> 			}
> 		}
> 		if($mtitle)
> 			echo "<h3 class=\"mmaintitle\">" . $mtitle . "</h3><hr class=\"mtitlehr\"/><br/>\n";
> 	}
> 	
> 	if(!empty($tngconfig['cookieapproval']) && strpos($_SERVER['REQUEST_URI'],"/data_protection_policy.php") === FALSE)
> 		include($cms['tngpath'] . "cookie_approval.php");
> 
> 	if($tngconfig['maint'])
> 		echo "<span class=\"fieldnameback yellow\" style=\"padding:3px\"><strong>{$text['mainton']}</strong></span><br /><br />\n";
> }
> 
> function tng_footer( $flags ) {
> 	global $customfooter, $cms, $tngprint, $map, $text, $dbowner, $tngdomain, $sitename, $templatepath, $sitever, $tng_version, $tngconfig;
> 
> 	$needtherest = true;
> 	if( $tngprint ) {
> 		$printfooter = $sitename;
> 		if($dbowner) {
> 			if($printfooter) $printfooter .= " - ";
> 			$suggest_url = getURL( "suggest", 1 );
> 			if($tngconfig['dataprotect'] && strpos($_SERVER['REQUEST_URI'],"/data_protection_policy.php") === FALSE) {
> 				$dataprotect_url = getURL( "data_protection_policy", 0 );
> 				$data_protection_link = " | <a href=\"{$dataprotect_url}\" class=\"footer\" title=\"{$text['dataprotect']}\" target=\"_blank\">{$text['dataprotect']}</a>.\n";
> 			}
> 			else
> 				$data_protection_link = "";
> 	    	$printfooter .= $text['maintby'] . " <a href=\"$suggest_url\" class=\"footer\" title=\"{$text['contactus']}\">$dbowner</a>.{$data_protection_link}";
> 		}
> 		echo "<p class=\"smaller\">" . $printfooter . "<br/>\n$tngdomain</p>";
> 	}
> 	else {
> 		if($sitever == "mobile") {
> 			echo tng_basicfooter($flags);
> 			if(!isset($flags['nomobile']) || !$flags['nomobile'])
>  				echo "</div>\n";
> 		}
> 		else {
> 			if(isset($flags['basicfooter']) && $flags['basicfooter']) {
> 				echo tng_basicfooter($flags);
> 				$needtherest = false;
> 			}
> 			else {
> 				include( $templatepath . $customfooter );
> 			}
> 		}
> 	}
> 	if($needtherest) {
> 		if( isset( $flags['more'] ) )
> 			echo $flags['more'];
> 		if(!$tngprint)
> 			echo "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/litbox.js\"></script>\n";
> 		if(!empty($map['key']) && !empty($map['pins']))
> 			tng_map_pins();
> 
> 		if(!isset($flags['noend']) || !$flags['noend']) include($cms['tngpath'] . "end.php" );
> 	}
> }
> 
> function tng_basicfooter($flags) {
> 	global $text, $cms, $tng_version, $sitever, $http, $tngconfig, $tree, $personID, $flags, $templatepath;
> 
> 	$footer = "";
> 	$newsitever = getSiteVersion();
> 	//echo "ver=$sitever, nsv=$newsitever";
> 	if($sitever == "mobile" || $newsitever != "standard") {
> 		$thispage = getScriptName(false);
> 		$thispage = preg_replace('/\??\&?sitever=(mobile|standard|tablet)/',"",$thispage);
> 		$con = strpos($thispage, "?") == false ? "?" : "&amp;";
> 
> 		if($sitever == "mobile") {
> 			$gotover = $newsitever == "mobile" ? "standard" : $newsitever;
> 			$message = $text['switchs'];
> 			if(file_exists($cms['tngpath'] . $templatepath . "mobile_footer.php"))
> 				include($cms['tngpath'] . $templatepath . "mobile_footer.php");
> 		}
> 		else {
> 			$gotover = "mobile";
> 			$message = $text['switchm'];
> 		}
> 		$footer .= "<p class=\"smaller center\">\n";
> 		$footer .= "<a href=\"$thispage{$con}sitever=$gotover\" class=\"fieldnameback lightlink2 rounded4\">&nbsp;{$message}&nbsp;</a>\n";
> 		$footer .= "</p><br/>\n";
> 	}
> 	include($cms['tngpath'] . "stdsitecredit.php");
> 	$footer .= $sitecredit;
> 
> 	if(isset($flags['imgprev'])) {
> ?>
> 		<script type="text/javascript">
> 		//<![CDATA[
> 		jQuery(document).ready(function() {
> 			jQuery('.media-preview img').on('mouseover touchstart',function(e) {
> 				e.preventDefault();
> 				var items = this.parentElement.id.match(/img-(\d+)-(\d+)-(.*)/);
> 				var key = items[2] && items[2] != "0" ? items[1]+"_"+items[2] : items[1];
> 				if(jQuery('#prev'+key).css('display') == "none")
> 					showPreview(items[1],items[2],items[3],key,'<?php echo $sitever; ?>');
> 				else
> 					closePreview(key);
> 			});
> 			jQuery('.media-preview img').on('mouseout',function(e) {
> 				var items = this.parentElement.id.match(/img-(\d+)-(\d+)-(.*)/);
> 				var key = items[2] && items[2] != "0" ? items[1]+"_"+items[2] : items[1];
> 				closePreview(key);
> 			});
> 			jQuery(document).on('click touchstart', '.prev-close img', function(e) {
> 				var items;
> 				items = this.id.match(/close-(\d+)_(\d+)/);
> 				if(!items)
> 					items = this.id.match(/close-(\d+)/);
> 				var key = items[2] && items[2] != "0" ? items[1]+"_"+items[2] : items[1];
> 				closePreview(key);
> 			});
> 		});
> 		//]]>
> 		</script>
> <?php
> 	}
> 
> 	return $footer;
> }
> 
> function getSmallPhoto( $medialink ) {
> 	global $rootpath, $photopath, $documentpath, $headstonepath, $historypath, $mediapath, $mediatypes_assoc, $thumbmaxw, $thumbmaxh;
> 	global $cms, $mediatypes_thumbs, $sitever, $tnggallery, $tngconfig;
> 
> 	if(!$thumbmaxh) $thumbmaxh = 100;		// defaults to 100px if not specified
> 	if(!$thumbmaxw) $thumbmaxw = 80;		// defaults to 80px if not specified
> 
> 	$mediatypeID = $medialink['mediatypeID'];
> 	$usefolder = $medialink['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
> 	//determine $usefolder based on mediatypeID and usecollfolder
> 
> 	$treestr = !empty($tngconfig['mediatrees']) && $medialink['gedcom'] ? $medialink['gedcom'] . "/" : "";
> 	if((($medialink['allow_living'] && $medialink['allow_private']) || $medialink['alwayson']) && $medialink['thumbpath'] && file_exists("$rootpath$usefolder/$treestr" . $medialink['thumbpath'])) {
> 		$thumb = $cms['tngpath'] . "$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $medialink['thumbpath'] ));
> 		$photoinfo = @GetImageSize( "$rootpath$usefolder/$treestr" . $medialink['thumbpath'] );
> 
> 		if( $photoinfo[0] <= $thumbmaxw && $photoinfo[1] <= $thumbmaxh ) {
> 			$photohtouse = $photoinfo[1];
> 			$photowtouse = $photoinfo[0];
> 		}
> 		else {
> 			if( $photoinfo[0] > $photoinfo[1] ) {
> 				$photowtouse = $thumbmaxw;
> 				$photohtouse = intval( $thumbmaxw * $photoinfo[1] / $photoinfo[0] ) ;
> 			}
> 			else {
> 				$photohtouse = $thumbmaxh;
> 				$photowtouse = intval( $thumbmaxh * $photoinfo[0] / $photoinfo[1] ) ;
> 			}
> 		}
> 		//$dimensions = " width=\"$photowtouse\" height=\"$photohtouse\"";
> 		$dimensions = " height=\"$photohtouse\"";
> 		$class = " class=\"thumb\"";
> 	}
> 	else {
> 		$thumb = $cms['tngpath'] . "img/$treestr" . $mediatypes_thumbs[$mediatypeID];
> 		$dimensions = $class = "";
> 	}
> 	if(!isset($medialink['description'])) $medialink['description'] = '';
> 	$altmsg = $medialink['allow_living'] ? str_replace("\"","'",$medialink['description']) : "";
> 	$imgsrc = "<img src=\"$thumb\" $dimensions alt=\"$altmsg\" title=\"$altmsg\"$class />";
> 
> 	return $imgsrc;
> }
> 
> function tng_DrawHeading($photostr, $namestr, $years) {
> 	global $tngconfig;
> 	if( $photostr )
> 		$outputstr = "<div style=\"float:left; padding-right:5px\">$photostr</div><h1 class=\"header fn\" id=\"nameheader\" style=\"margin-bottom:5px\">$namestr</h1><span class=\"normal\">$years</span>\n";
> 	else {
> 		$outputstr = "<h1 class=\"header fn\" id=\"nameheader\" style=\"margin-bottom:5px\">$namestr</h1>";
> 		if($years)
> 			$outputstr .= "<span class=\"normal\">$years</span><br />\n";
> 	}
> 	$outputstr .= "<br clear=\"all\" /><br />\n";
> 
> 	return $outputstr;
> }
> 
> function getSurnameOnly( $row ) {
> 	global $text, $admtext, $tngconfig;
> 
> 	$nonames = showNames($row);
> 	if( $row['allow_living'] || $nonames != 1 ) {
> 		$namestr = trim( $row['lnprefix'] . " " . $row['lastname'] );
> 		if($tngconfig['ucsurnames']) $namestr = tng_strtoupper($namestr);
> 	}
> 	elseif( $row['private'] )
> 		$namestr = $admtext['text_private'];
> 	else
> 		$namestr = $text['living'];
> 
> 	return $namestr;
> }
> 
> function getFirstNameOnly( $row ) {
> 	global $text, $admtext;
> 
> 	$nonames = showNames($row);
> 	if( ($row['allow_living'] && $row['allow_private']) || !$nonames )
> 		$namestr = strtok( $row['firstname'], " " );
> 	elseif( $nonames == 2 )
> 		$namestr = initials( $row['firstname'] );
> 	elseif( $row['private'] )
> 		$namestr = $admtext['text_private'];
> 	else
> 		$namestr = $text['living'];
> 
> 	return $namestr;
> }
> 
> function tng_menu( $enttype, $currpage, $entityID, $innermenu ) {
> 	global $tree, $text, $disallowgedcreate, $target, $allow_admin, $allow_edit, $currentuser;
> 	global $rightbranch, $cms, $allow_ged, $emailaddr, $tngprint, $flags, $sitever, $tngconfig;
> 
> 	$nexttab = 0;
> 	if( !$tngprint ) {
> 		$menu = "<div id=\"tngmenu\">\n";
> 		$menu .= "<ul id=\"tngnav\">\n";
> 		$choices = $editstr = "";
> 		if( $enttype == "I" ) {
> 			$getperson_url = getURL( "getperson", 1 );
> 			$pedigree_url = getURL( "pedigree", 1 );
> 			$descend_url = getURL( "descend", 1 );
> 			$gedform_url = getURL( "gedform", 1 );
> 			$relateform_url = getURL( "relateform", 1 );
> 			$timeline_url = getURL( "timeline", 1 );
> 			$familychart_url = getURL( "familychart", 1 );
> 
> 			$choices .= doMenuItem( $nexttab++, $getperson_url . "personID=$entityID&amp;tree=$tree" , "ind", $text['indinfo'], $currpage, "person" );
> 			$choices .= doMenuItem( $nexttab++, $pedigree_url . "personID=$entityID&amp;tree=$tree" , "ped", $text['ancestors'], $currpage, "pedigree" );
> 			$choices .= doMenuItem( $nexttab++, $descend_url . "personID=$entityID&amp;tree=$tree" , "desc", $text['descendants'], $currpage, "descend" );
> 			$choices .= doMenuItem( $nexttab++, $relateform_url . "primaryID=$entityID&amp;tree=$tree" , "rel", $text['relationship'], $currpage, "relate" );
> 			$choices .= doMenuItem( $nexttab++, $timeline_url . "primaryID=$entityID&amp;tree=$tree" , "time", $text['timeline'], $currpage, "timeline" );
> 			$choices .= doMenuItem( $nexttab++, $familychart_url . "personID=$entityID&amp;tree=$tree" , "fam", $text['family'], $currpage, "familychart" );
> 			if( !$disallowgedcreate || ($allow_ged && $rightbranch) )
> 				$choices .= doMenuItem( $nexttab++, "$gedform_url" . "personID=$entityID&amp;tree=$tree" , "ged", $text['extractgedcom'], $currpage, "gedcom" );
> 			$editstr = "admin_editperson.php?person";
> 		}
> 		elseif( $enttype == "F" ) {
> 			$familygroup_url = getURL( "familygroup", 1 );
> 			$familychart_url = getURL( "familychart", 1 );
> 
> 			$choices .= doMenuItem( $nexttab++, "$familychart_url" . "familyID=$entityID&amp;tree=$tree" , "fam", $text['familychart'], $currpage, "familychart" );
> 			$choices .= doMenuItem( $nexttab++, "$familygroup_url" . "familyID=$entityID&amp;tree=$tree" , "rel", $text['groupsheet'], $currpage, "family" );
> 			$editstr = "admin_editfamily.php?family";
> 		}
> 		elseif( $enttype == "S" ) {
> 			$showsource_url = getURL( "showsource", 1 );
> 
> 			$choices .= doMenuItem( $nexttab++, "$showsource_url" . "sourceID=$entityID&amp;tree=$tree" , "ged", $text['source'], $currpage, "source" );
> 			$editstr = "admin_editsource.php?source";
> 		}
> 		elseif( $enttype == "R" ) {
> 			$showrepo_url = getURL( "showrepo", 1 );
> 
> 			$choices .= doMenuItem( $nexttab++, "$showrepo_url" . "repoID=$entityID&amp;tree=$tree" , "ged", $text['repository'], $currpage, "repo" );
> 			$editstr = "admin_editrepo.php?repo";
> 		}
> 		elseif( substr($enttype, 0, 1) == "D" ) {
> 			switch ($enttype) {
> 				case "DCAT":
> 					$compare_url = getURL( "compare_selected_atdna", 1 );
> 					break;
> 				case "DCMT":
> 					$compare_url = getURL( "compare_selected_mtdna", 1 );
> 					break;
> 				case "DCY":
> 					$compare_url = getURL( "compare_selected_ydna", 1 );
> 					break;
> 				default:
> 					$show_url = getURL( "show_dna_test", 1 ) . "testID=" . $entityID;
> 					$editstr = "admin_edit_dna_test.php?test";
> 					break;
> 			}
> 			if ( empty($_SESSION["ttree"]) ) $_SESSION["ttree"] = "-x--all--x-";
> 			if ( empty($_SESSION["ttype"]) ) $_SESSION["ttype"] = "";
> 			if ( empty($_SESSION["tgroup"]) ) $_SESSION["tgroup"] = "";
> 			if ( empty($_SESSION["tsearch"]) ) $_SESSION["tsearch"] = "";
> 			$browse_dna_tests_url = getURL( "browse_dna_tests", 1 );
> 			$browse_all_dna_tests_url = $browse_dna_tests_url . "tree=-x--all--x-&amp;test_type=&amp;test_group=&amp;testsearch=";
> 			$browse_dna_tests_url = $browse_dna_tests_url . "tree=" . $_SESSION["ttree"] . "&amp;test_type=" . $_SESSION["ttype"] . "&amp;test_group=" . $_SESSION["tgroup"] . "&amp;testsearch=" . $_SESSION["tsearch"];
> 
> 			$choices .= doMenuItem( $nexttab++, $browse_all_dna_tests_url, "ged", $text['all_dna_tests'], $currpage, "alldna" );
> 			if( $enttype != "D" || $browse_all_dna_tests_url != $browse_dna_tests_url )
> 				$choices .= doMenuItem( $nexttab++, $browse_dna_tests_url, "print", $text['dna_tests'], $currpage, "dnatests" );
> 			$choices .= doMenuItem( $nexttab++, $enttype == "D" ? $show_url : $compare_url, "dna", $enttype == "D" ? $text['dna_test'] : $text['compareselected'], $currpage, $enttype == "D" ? "dna" : "compare" );
> 		}
> 		elseif( $enttype == "L" ) {
> 			$placesearch_url = getURL( "placesearch", 1 );
> 
> 			$treestr = $tngconfig['places1tree'] ? "" : "&amp;tree=$tree";
> 			$choices .= doMenuItem( $nexttab++, "$placesearch_url" . "psearch=$entityID$treestr" , "place", $text['place'], $currpage, "place" );
> 			$editstr = "admin_editplace.php?";
> 			$entityID = urlencode($entityID);
> 		}
> 		if( $allow_edit && $rightbranch && $editstr ) {
> 			$choices .= doMenuItem( $nexttab, $cms['tngpath'] . "$editstr" . "ID=$entityID&amp;tree=$tree&amp;cw=1\" target=\"blank", "sugg", $text['edit'], $currpage, "" );
> 		}
> 		elseif( !$tngconfig['nosuggest'] && $emailaddr && $editstr ) {
> 			$suggest_url = getURL( "suggest", 1 );
> 			$choices .= doMenuItem( $nexttab, "$suggest_url" . "enttype=$enttype&amp;ID=$entityID&amp;tree=$tree", "sugg", $text['suggest'], $currpage, "suggest" );
> 		}
> 		if($sitever == "mobile") {
> 			$menu .= "<li>\n<a class=\"here\">\n<select id=\"tngtabselect\" onchange=\"window.location.href=this.options[this.selectedIndex].value\">\n$choices</select>\n</a>\n</li>\n";
> 		}
> 		else
> 			$menu .= $choices;
> 		$menu .= "</ul>\n";
> 		$menu .= "</div>\n";
> 		$menu .= "<div id=\"pub-innermenu\" class=\"fieldnameback fieldname smaller rounded4\">\n";
> 		$menu .= $innermenu;
> 		$menu .= "</div><br/>\n";
> 	}
> 	else $menu = "";
> 
> 	return $menu;
> }
> 
> //DEPRECATED
> function tng_coreicons( ) {
> 	return "";
> }
> 
> function tng_smallIcon($options) {
> 	global $sitever;
> 	$target = "";
> 	
> 	$url = isset($options['url']) ? $options['url'] : "#";
> 	$onclick = isset($options['onclick']) ? "onclick=\"{$options['onclick']}\"" : "";
> 	$targetloc = $target ? "target=\"$target\"" : "";
> 	$class = $sitever == "mobile" ? "mobileicon" : (isset($options['class']) ? $options['class'] : "tngsmallicon");
> 	$rel = isset($options['rel']) ? "rel=\"{$options['rel']}\"" : "";
> 	
> 	if($sitever == "mobile") {
> 		$begin = "<li>";
> 		$end = "</li>\n";
> 	}
> 	else {
> 		$begin = " ";
> 		$end = "\n";
> 	}
> 	
> 	$link = "$begin<a href=\"$url\" $onclick $targetloc $rel title=\"{$options['label']}\" class=\"$class\" id=\"{$options['id']}-smicon\">{$options['label']}</a>$end";
> 		
> 	return $link;
> }
>  
> function tng_getLeftIcons() {
> 	global $tngconfig, $text, $homepage, $currentuser, $allow_profile, $cms, $target, $sitever;
> 	
>     if(!isset($tngconfig['menucount']))
>         $tngconfig['menucount'] = 0;
> 
> 	$left_icons = "";
> 	if( empty($tngconfig['showhome']) ) {
> 		$left_icons .= tng_smallIcon(array('url'=>getURL( $homepage, 0, ""), 'label'=>$text['homepage'], 'id'=>"home"));
> 		$tngconfig['menucount']++;
> 	}
>    	if( empty($tngconfig['showsearch']) ) {
> 		$params = array('url'=>getURL( "searchform", 0 ), 'label'=>$text['search'], 'id'=>"search");
> 		if(empty($tngconfig['searchchoice']) && $sitever != "mobile")
> 			$params['onclick'] = "return openSearch();";
> 		$left_icons .= tng_smallIcon($params);
> 		$tngconfig['menucount']++;
> 	}
> 
> 	$profilelink = $userparen = "";
> 	if($currentuser) {
> 		if($allow_profile && $sitever != "mobile") {
> 	      	$editprofile_url = getURL( "ajx_editprofile", 1 );
> 			$profilelink = tng_smallIcon(array('label'=>($sitever == "mobile" ? $text['editprofile'] : "({$text['editprofile']}: $currentuser)"),
> 				'class'=>"tngsmallicon3", 'id'=>"profile", 
> 				'onclick'=>"tnglitbox = new LITBox('{$editprofile_url}p=" . urlencode($cms['tngpath']) . "',{width:520,height:560}); return false"));
> 			$tngconfig['menucount']++;
> 		}
> 		else 
> 			$userparen = " ($currentuser)";
> 	}
> 	if( empty($tngconfig['showlogin']) ) {
> 		if( $currentuser ) {
> 			if( !$cms['cloaklogin'] || $cms['cloaklogin'] == "both" )
> 				$left_icons .= tng_smallIcon(array('url'=>getURL( "logout", 1 ) . "session=" . session_name(), 'label'=>$text['logout'] . $userparen, 'id'=>"log"));
> 		}
> 		else {
> 			if( !$cms['cloaklogin'] || $cms['cloaklogin'] == "both" ) {
> 				$login_url = getURL( "ajx_login", 1 );
> 				$left_icons .= tng_smallIcon(array('label'=>$text['login'], 'id'=>"log", 'onclick'=>"return openLogin('{$login_url}p=" . urlencode($cms['tngpath']) . "');"));
> 			}
> 		}
> 		$tngconfig['menucount']++;
> 	}
> 	$left_icons .= $profilelink;
> 
> 	return $left_icons;
> }
> 
> function tng_getRightIcons($showlangselect) {
> 	global $text, $tngconfig, $cms, $gotlastpage, $sitever, $isConnected;
> 
> 	$addbookmark_url = getURL( "ajx_addbookmark", 1 );
> 
> 	$right_icons = "";
> 	if( !empty($tngconfig['showshare']) && $isConnected && $sitever != "mobile")
> 		$right_icons .= tng_smallIcon(array('label'=>$text['share'], 'id'=>"share", 'onclick'=>"jQuery('#shareicons').toggle(200); if(!share) { jQuery('#share-smicon').html('{$text['hide']}'); share=1;} else { jQuery('#share-smicon').html('{$text['share']}'); share=0; }; return false;"));
> 
> 	if( empty($tngconfig['showprint']) && $sitever != "mobile") {
> 		$print_url = getScriptName();
> 	 	if(preg_match("/\?/",$print_url))
> 			$print_url .= "&amp;tngprint=1";
> 		else
> 			$print_url .= "?tngprint=1";
> 		$right_icons .= tng_smallIcon(array('label'=>$text['tngprint'], 'id'=>"print", 'rel'=>"nofollow", 'onclick'=>"newwindow=window.open('$print_url','tngprint','width=850,height=600,status=no,resizable=yes,scrollbars=yes'); newwindow.focus(); return false;"));
> 	}
> 
> 	if( empty($tngconfig['showbmarks']) && $gotlastpage ) {
> 		$right_icons .= tng_smallIcon(array('label'=>$text['bookmark'], 'id'=>"bmk", 'onclick'=>"tnglitbox = new LITBox('{$addbookmark_url}p=" . urlencode($cms['tngpath']) . "',{width:350,height:100}); return false;"));
> 		$tngconfig['menucount']++;
> 	}
> 
> 	if($showlangselect)
> 		$right_icons .= tng_getLanguageSelect(1);
> 
> 	return $right_icons;
> }
> 
> function tng_getFindMenu() {
> 	global $tngconfig, $time_offset;
> 
> 	$menu = array();
> 	$menu[] = tngddrow(getURL( "surnames", 0 ), "surnames-icon", "", "surnames");
> 	$menu[] = tngddrow(getURL( "firstnames", 0 ), "firstnames-icon", "", "firstnames");
> 	$menu[] = tngddrow(getURL( "searchform", 0 ), "search-icon", "", "searchnames");
> 	$menu[] = tngddrow(getURL( "famsearchform", 0 ), "fsearch-icon", "", "searchfams");
> 	$menu[] = tngddrow(getURL( "searchsite", 0 ), "searchsite-icon", "", "searchsitemenu");
> 	$menu[] = tngddrow(getURL( "places", 0 ), "places-icon", "", "places");
> 	$menu[] = tngddrow(getURL( "anniversaries", 0 ), "dates-icon", "", "dates");
> 	$tngmonth = date("m", time() + ( 3600 * intval($time_offset) ) );
> 	$menu[] = tngddrow(getURL( "calendar", 1 ) . "m=$tngmonth", "calendar-icon", "", "calendar");
> 	$menu[] = tngddrow(getURL( "cemeteries", 0 ), "cemeteries-icon", "", "cemeteries");
> 	$menu[] = tngddrow(getURL( "bookmarks", 0 ), "bookmarks-icon", "", "bookmarks");
> 
> 	$tngconfig['menucount'] += 10;
> 
> 	global $findmenulinks;
> 	if( isset( $findmenulinks ) ) {
> 		$menu = array_merge($menu,custom_links( $findmenulinks ));
> 	}
> 
> 	return $menu;
> }
> 
> function tng_getMediaMenu() {
> 	global $mediatypes, $tngconfig;
> 	
> 	$menu = array();
> 	foreach( $mediatypes as $mediatype ) {
> 		if(!$mediatype['disabled']) {
> 			$menu[] = tngddrow(getURL( "browsemedia", 1 ) . "mediatypeID=" . $mediatype['ID'], $mediatype['ID'] . "-icon", $mediatype['icon'], $mediatype['display'], true);
> 			$tngconfig['menucount']++;
> 		}
> 	}
> 	if(!empty($_SESSION['albumcount']))
> 		$menu[] = tngddrow(getURL( "browsealbums", 0 ), "albums-icon", "", "albums");
> 	$menu[] = tngddrow(getURL( "browsemedia", 0 ), "media-icon", "", "allmedia");
> 	$tngconfig['menucount'] += 2;
> 
> 	global $mediamenulinks;
> 	if( isset( $mediamenulinks ) ) {
> 		$menu = array_merge($menu,custom_links( $mediamenulinks ));
> 	}
> 
> 	return $menu;
> }
> 
> function tng_getInfoMenu($title) {
> 	global $allow_admin, $cms, $tngconfig;
> 	
> 	$menu = array();
> 	$menu[] = tngddrow(getURL( "whatsnew", 0 ), "whatsnew-icon", "", "whatsnew");
> 	$menu[] = tngddrow(getURL( "mostwanted", 0 ), "mw-icon", "", "mostwanted");
> 	$menu[] = tngddrow(getURL( "reports", 0 ), "reports-icon", "", "reports");
> 	$menu[] = tngddrow(getURL( "statistics", 0 ), "stats-icon", "", "databasestatistics");
> 	$menu[] = tngddrow(getURL( "browsetrees", 0 ), "trees-icon", "", "trees");
> 	$menu[] = tngddrow(getURL( "browsebranches", 0 ), "branches-icon", "", "branches");
> 	$menu[] = tngddrow(getURL( "browsenotes", 0 ), "notes-icon", "", "notes");
> 	$menu[] = tngddrow(getURL( "browsesources", 0 ), "sources-icon", "", "sources");
> 	$menu[] = tngddrow(getURL( "browserepos", 0 ), "repos-icon", "", "repositories");
> 	if(empty($tngconfig['hidedna'])) {
> 		$menu[] = tngddrow(getURL( "browse_dna_tests", 0 ), "dna-icon", "", "dna_tests");
> 		$tngconfig['menucount']++;
> 	}
> 	if( $allow_admin ) {
> 		$menu[] = tngddrow((!empty($cms['adminurl']) ? $cms['adminurl'] : $cms['tngpath']."admin.php"), "admin-icon", "", "administration");
> 		$menu[] = tngddrow(getURL( "showlog", 0 ), "unlock-icon", "", "mnushowlog");
> 		$tngconfig['menucount'] += 2;
> 	}
> 	$menu[] = tngddrow(getURL( "suggest", 1 ) . "page=" . urlencode(str_replace("?", "", $title)), "contact-icon", "", "contactus");
> 	$tngconfig['menucount'] += 10;  //everything except the 2 admin links
> 
> 	global $infomenulinks;
> 	if( isset( $infomenulinks ) ) {
> 		$menu = array_merge($menu,custom_links( $infomenulinks ));
> 	}
> 
> 	return $menu;
> }
> 
> function tng_getLanguageSelect($instance) {
> 	global $chooselang, $languages_table, $mylanguage, $languages_path;
> 
> 	$menu = "";
> 	if( $chooselang ) {
> 		$query = "SELECT languageID, display, folder FROM $languages_table ORDER BY display";
> 		$result = tng_query($query);
> 		$numlangs = tng_num_rows( $result );
> 
> 		if( $numlangs > 1 ) {
> 			$menu .= getFORM( "savelanguage2", "get", "tngmenu$instance", "" );
> 			$menu .= "<select name=\"newlanguage$instance\" id=\"newlanguage$instance\" style=\"font-size:9pt;\" onchange=\"document.tngmenu$instance.submit();\">";
> 
> 			while( $row = tng_fetch_assoc($result)) {
> 				$menu .= "<option value=\"{$row['languageID']}\"";
> 				if( $languages_path . $row['folder'] == $mylanguage )
> 					$menu .= " selected=\"selected\"";
> 				$menu .= ">{$row['display']}</option>\n";
> 			}
> 			$menu .= "</select>\n";
> 			$menu .= "<input type=\"hidden\" name=\"instance\" value=\"$instance\" /></form>\n";
> 		}
> 
> 		tng_free_result($result);
> 	}
> 
> 	return $menu;
> }
> 
> function tng_getLangMenu($title) {
> 	global $chooselang, $languages_table, $mylanguage, $languages_path, $text, $tngconfig;
> 
> 	$menuitems = array();
> 	$menustr = "";
> 	if( $chooselang ) {
> 		$query = "SELECT languageID, display, folder FROM $languages_table ORDER BY display";
> 		$result = tng_query($query);
> 		$numlangs = tng_num_rows( $result );
> 
> 		if( $numlangs > 1 ) {
> 			while( $row = tng_fetch_assoc($result)) {
> 				$prefix = $languages_path . $row['folder'] == $mylanguage ? "*" : "";
> 				$menuitems[] = tngddrow(getURL( "savelanguage2", 1 ) . "newlanguage=" . $row['languageID'], "", "", $prefix . $row['display'], true);
> 				$tngconfig['menucount']++;
> 			}
> 			if(!empty($menuitems)) {
> 				if(count($menuitems) % 2)
> 					$menuitems[] = tngddrow("", "", "", "", true);
> 				if(count($menuitems) > 10) {
> 					$cols = " style=\"columns:2; -webkit-columns:2; -webkit-column-gap:0px;\"";
> 					$multicolclass = " mmulticol";
> 					$left_bottom = count($menuitems)/2 - 1;
> 					$menuitems[$left_bottom] = str_replace("mobileicon", "mobileicon mmulticollastleft", $menuitems[$left_bottom]);
> 				}
> 				else
> 					$cols = $multicolclass = "";
> 				$menucontent = implode("",$menuitems);
> 				$menustr = "<ul id=\"mlangmenu\" class=\"mright{$multicolclass}\"$cols>\n" . $menucontent . "</ul>\n";
> 			}
> 		}
> 
> 		tng_free_result($result);
> 	}
> 
> 	return $menustr;
> }
> 
> function get_menustyle($key,$itemcount) {
> 	$mmenustyle = "";
> 	if($itemcount) {
> 		$moffset = 50 * $itemcount;
> 		$mmenustyle .= "ul#m" . $key . "menu {-webkit-transform: translate3d(0,-" . $moffset . "px,0);}\n";
> 		$mmenustyle .= "ul#m" . $key . "menu {transform: translate3d(0,-" . $moffset . "px,0);}\n";
> 	}
> 	return $mmenustyle;
> }
> 
> function tng_mobileicons($title) {
> 	global $text, $tngconfig, $custommenu, $custmenu, $custommobilemenu, $custommenulinks;
> 	
> 	//container, full width, fixed at top
> 	//get left & right icons, put in single list
> 	//get menus, link to icons
> 	//do something with languages
> 	$menu = "<div id=\"tngheader\">\n";
> 	$menu .= "<div id=\"mast\">\n";
> 	$menu .= "<div class=\"mhead\">\n";
> 	$menu .= "<a href=\"\" id=\"mcore\" onclick=\"return toggleMobileMenu('core');\"></a>\n";
> 
> 	$tngconfig['mmenustyle'] = "";
> 	$tngconfig['menucount'] = 0;
> 	$menu .= "<ul id=\"mcoremenu\">\n";
> 	$menu .= tng_getLeftIcons();
> 	$menu .= tng_getRightIcons(false);
> 	$menu .= "</ul>\n";
> 	$tngconfig['mmenustyle'] .= get_menustyle("core",$tngconfig['menucount']);
> 
> 	$menuicons = "<div id=\"mmenus\">\n";
> 	$menuitems = "";
> 	
> 	$tngconfig['menucount'] = 0;
> 	$finditems = tng_getFindMenu();
> 	if($tngconfig['menucount']) {
> 		$cols = $multicolclass = "";
> 		if(count($finditems) > 10) {
> 			$cols = " style=\"columns:2; -webkit-columns:2; -webkit-column-gap:0px;\"";
> 			$multicolclass = " mmulticol";
> 			if(count($finditems) % 2)
> 				$finditems[] = tngddrow("", "", "", "", true);
> 			$left_bottom = count($finditems)/2 - 1;
> 			$finditems[$left_bottom] = str_replace("mobileicon", "mobileicon mmulticollastleft", $finditems[$left_bottom]);
> 		}
> 		$findcontent = implode("",$finditems);
> 		$menuitems .= "<ul id=\"mfindmenu\" class=\"mright{$multicolclass}\"$cols>\n" . $findcontent . "</ul>\n";
> 		$menuicons .= "<a href=\"\" class=\"mmenu\" id=\"mmenu-find\" title=\"{$text['find_menu']}\" onclick=\"return toggleMobileMenu('find');\"></a>\n";
> 		$tngconfig['mmenustyle'] .= get_menustyle("find",$tngconfig['menucount']);
> 	}
> 
> 	$tngconfig['menucount'] = 0;
> 	$mediaitems = tng_getMediaMenu();
> 	if($tngconfig['menucount']) {
> 		$cols = $multicolclass = "";
> 		if(count($mediaitems) > 10) {
> 			$cols = " style=\"columns:2; -webkit-columns:2; -webkit-column-gap:0px;\"";
> 			$multicolclass = " mmulticol";
> 			if(count($mediaitems) % 2)
> 				$mediaitems[] = tngddrow("", "", "", "", true);
> 			$left_bottom = count($mediaitems)/2 - 1;
> 			$mediaitems[$left_bottom] = str_replace("mobileicon", "mobileicon mmulticollastleft", $mediaitems[$left_bottom]);
> 		}
> 		$mediacontent = implode("",$mediaitems);
> 		$menuitems .= "<ul id=\"mmediamenu\" class=\"mright{$multicolclass}\"$cols>\n" . $mediacontent . "</ul>\n";
> 		$menuicons .= "<a href=\"\" class=\"mmenu\" id=\"mmenu-media\" title=\"{$text['media']}\" onclick=\"return toggleMobileMenu('media');\"></a>\n";
> 		$tngconfig['mmenustyle'] .= get_menustyle("media",$tngconfig['menucount']);
> 	}
> 	
> 	$tngconfig['menucount'] = 0;
> 	$infoitems = tng_getInfoMenu($title);
> 	if($tngconfig['menucount']) {
> 		$cols = $multicolclass = "";
> 		if(count($infoitems) > 10) {
> 			$cols = " style=\"columns:2; -webkit-columns:2; -webkit-column-gap:0px;\"";
> 			$multicolclass = " mmulticol";
> 			if(count($infoitems) % 2)
> 				$infoitems[] = tngddrow("", "", "", "", true);
> 			$left_bottom = count($infoitems)/2 - 1;
> 			$infoitems[$left_bottom] = str_replace("mobileicon", "mobileicon mmulticollastleft", $infoitems[$left_bottom]);
> 		}
> 		$infocontent = implode("",$infoitems);
> 		$menuitems .= "<ul id=\"minfomenu\" class=\"mright{$multicolclass}\"$cols>\n" . $infocontent . "</ul>\n";
> 		$menuicons .= "<a href=\"\" class=\"mmenu\" id=\"mmenu-info\" title=\"{$text['info']}\" onclick=\"return toggleMobileMenu('info');\"></a>\n";
> 		$tngconfig['mmenustyle'] .= get_menustyle("info",$tngconfig['menucount']);
> 	}
> 	
> 	//hook for custom dropdown options
> 	$tngconfig['menucount'] = 0;
> 	if(isset($custmenu['title_text']))
> 		$mtext = $custmenu['title_text'];
> 	elseif(isset($custmenu['title_index']))
> 		$mtext = $text[$custmenu['title_index']];
> 	else
> 		$mtext = "";
> 
> 	if(isset($custommobilemenu))
> 		eval($custommobilemenu);
> 	//Rick Bisbee's mod
> 	elseif(isset($custmenu)) {
> 		$items = implode("",custom_links( $custommenulinks ));
> 		$menuitems .= custom_menu( $custmenu, $items, true );
> 		$cust_title = isset($custmenu['title_text']) ? $custmenu['title_text'] : "";
> 		$menuicons .= "<a href=\"\" id=\"mmenu-cust\" class=\"mmenu\" title=\"$mtext\" onclick=\"return toggleMobileMenu('cust');\"></a>\n";
> 		$tngconfig['mmenustyle'] .= get_menustyle("cust",$tngconfig['menucount']);
> 	}
> 
> 	$tngconfig['menucount'] = 0;
> 	$menuitems .= tng_getLangMenu($title);
> 	if($tngconfig['menucount']) {
> 		$menuicons .= "<a href=\"\" id=\"mmenu-lang\" class=\"mmenu\" title=\"{$text['language']}\" onclick=\"return toggleMobileMenu('lang');\"></a>\n";
> 		$tngconfig['mmenustyle'] .= get_menustyle("lang",$tngconfig['menucount']);
> 	}
> 
> 	$menuicons .= "</div>\n";
> 	$menu .= $menuicons . $menuitems . "</div>\n</div>\n</div>\n";
> 
> 	//return both menu and transform style
> 	return $menu;
> }
> 
> function tng_icons( $title = "" ) {
> 	global $text, $tngconfig, $customshare, $cms, $tngprint, $custommenu, $custmenu, $custommenulinks, $sitever, $chooselang;
> 
> 	$fullmenu = "";
> 	if( $tngprint ) {
> 		$fullmenu .= "<div style=\"float:right\"><b><a href=\"javascript:{document.getElementById('printlink').style.visibility='hidden'; window.print();}\" style=\"text-decoration:underline\" id=\"printlink\">&gt;&gt; {$text['tngprint']} &lt;&lt;</a></b></div>\n";
> 	}
> 	else {
> 
> 		if( $tngconfig['menu'] == 1 ) {
> 			$iconalign = "float-left";
> 			//$innerborder = "";
> 		}
> 		else {
> 			$iconalign = " float-right";
> 			//$innerborder = " style=\"border-right:1px solid #aaaaaa\"";
> 		}
> 
> 		$left_icons = tng_getLeftIcons();
> 		if($left_icons) {
> 			$iconmargin = $tngconfig['menu'] == 2 && $chooselang ? " style=\"margin-top:2px\"" : "";
> 			$left_icons = "<div class=\"icons\"$iconmargin>\n{$left_icons}&nbsp;\n</div>\n";
> 		}
> 
> 		$right_icons = tng_getRightIcons(true);
> 
> 		$menu = "";
> 		if($tngconfig['menu'] < 2) {
> 			$menu .= "<li><a href=\"#\" class=\"menulink\">{$text['find_menu']}</a>\n";
> 			$menu .= "<ul>\n";
> 			$menu .= implode("",tng_getFindMenu());
> 			$menu .= "</ul>\n";
> 			$menu .= "</li>\n";
> 
> 			$menu .= "<li><a href=\"#\" class=\"menulink\">{$text['media']}</a>\n";
> 			$menu .= "<ul>\n";
> 			$menu .= implode("",tng_getMediaMenu());
> 			$menu .= "</ul>\n";
> 			$menu .= "</li>\n";
> 
> 			$menu .= "<li><a href=\"#\" class=\"menulink\">{$text['info']}</a>\n";
> 			$last = !isset($custommenu) ? " class=\"last\"" : "";
> 			$menu .= "<ul{$last}>\n";
> 			$menu .= implode("",tng_getInfoMenu($title));
> 			$menu .= "</ul>\n";
> 			$menu .= "</li>\n";
> 
> 			//hook for custom dropdown options
> 			if(isset($custommenu))
> 				eval($custommenu);
> 			//Rick Bisbee's mod
> 			elseif(isset($custmenu)) {
> 				$items = implode("",custom_links( $custommenulinks ));
> 				$menu .= custom_menu( $custmenu, $items );
> 			}
> 			$innerstyle = "";
> 		}
> 		else
> 			$innerstyle = " style=\"height:25px\"";
> 
> 		$outermenu = $rightmenu = "";
> 
> 		if($menu) {
>  			$outermenu .= "<ul class=\"tngdd $iconalign\" id=\"tngdd\">\n";
> 
> 			if($tngconfig['menu'] != 1)
> 				$outermenu .= "<li class=\"langmenu stubmenu\"><br/></li>\n";
> 
> 			$outermenu .= $menu;
> 
> 			if($tngconfig['menu'] == 1)
> 				$outermenu .= "<li class=\"langmenu stubmenu-rt\"><br/></li>\n";
> 
> 			$outermenu .= "</ul>\n";
> 		}
> 		if($tngconfig['menu'] != 1)
> 			$outermenu .= $left_icons;
> 
> 		if($tngconfig['menu'] == 2 && empty($langmenu)) {
> 			$outermenu .= "<div class=\"icons-rt in-bar\">\n$right_icons\n</div>\n";
> 			$shift_str = " shift100left";
> 		}
> 		else
> 			$shift_str = "";
> 
> 		if($outermenu) {
> 			$fullmenu .= "<div class=\"menucontainer\">\n";
> 			$fullmenu .= "<div class=\"innercontainer\"$innerstyle>\n";
> 
> 			$fullmenu .= $outermenu;
> 
> 			$fullmenu .= "</div>\n";
> 			$fullmenu .= "</div>\n";
> 
> 			if(empty($tngconfig['searchchoice']) && empty($tngconfig['showsearch'])) {
> 				$searchform_url = getURL( "searchform", 0 );
> 				$famsearch_url = getURL( "famsearchform", 0 );
> 				$searchsite_url = getURL( "searchsite", 0 );
> 
> 				$fullmenu .= '<div id="searchdrop" class="slidedown" style="display:none;">';
> 				$fullmenu .= "<a href=\"#\" onclick=\"jQuery('#searchdrop').slideUp(200);return false;\" style=\"float:right\"><img src=\"{$cms['tngpath']}img/tng_close.gif\" alt=\"\"/></a>";
> 				$fullmenu .= "<span class=\"subhead\"><strong>{$text['search']}</strong> | <a href=\"$searchform_url\">{$text['mnuadvancedsearch']}</a> | <a href=\"$famsearch_url\">{$text['searchfams']}</a> | <a href=\"$searchsite_url\">{$text['searchsitemenu']}</a></span><br/><br/>";
> 				$fullmenu .= getFORM( "search", "get", "", "") . "\n";
> 				$fullmenu .= "<label for=\"searchfirst\">{$text['firstname']}: </label><input type=\"text\" name=\"myfirstname\" id=\"searchfirst\"/> &nbsp;\n";
> 				$fullmenu .= "<label for=\"searchlast\">{$text['lastname']}: </label><input type=\"text\" name=\"mylastname\" id=\"searchlast\"/> &nbsp;\n";
> 				$fullmenu .= "<label for=\"searchid\">{$text['id']}: </label><input type=\"text\" class=\"veryshortfield\" name=\"mypersonid\" id=\"searchid\"/> &nbsp;\n";
> 				$fullmenu .= "<input type=\"hidden\" name=\"idqualify\" value=\"equals\"/>\n";
> 				$fullmenu .= "<input type=\"submit\" value=\"{$text['search']}\"/></form></div>";
> 			}
> 		}
> 
> 		if($tngconfig['menu'] == 1)
> 			$fullmenu .= $left_icons;
> 
> 		$sharemenu = "";
> 		if( !empty($tngconfig['showshare']) && $sitever != "mobile" ) {
> 	        $sharemenu .= "<div id=\"shareicons\" style=\"display:none\">\n";
> 			$sharemenu .= "<span class='st_facebook_hcount' displayText='Facebook'></span>\n";
> 			$sharemenu .= "<span class='st_twitter_hcount' displayText='Tweet'></span>\n";
> 			$sharemenu .= "<span class='st_pinterest_hcount' displayText='Pinterest'></span>\n";
> 	        if(isset($customshare))
> 	        	eval($customshare);
> 			$sharemenu .= "</div>\n";
> 		}
> 
> 		if($sharemenu || $right_icons || $tngconfig['menu'] < 2 || !empty($numlangs)) {
> 			$fullmenu .= "<div class=\"icons-rt$shift_str\">";
> 			$fullmenu .= $sharemenu;
> 
> 			if($tngconfig['menu'] < 2 || !empty($numlangs))
> 				$fullmenu .= $right_icons;
> 
> 			$fullmenu .= "</div>\n";
> 
> 			if($tngconfig['menu'] == 1)
> 				$fullmenu .= "<br style=\"clear:both\" /><br />\n";
> 		}
> 
> 		if($menu) {
> 			$fullmenu .= '<script type="text/javascript">';
> 			$fullmenu .= 'var tngdd=new tngdd.dd("tngdd");';
> 			$fullmenu .= 'tngdd.init("tngdd","menuhover");';
> 			$fullmenu .= "</script>\n";
> 		}
> 
> 	}
> 
> 	return $fullmenu;
> }
> 
> function tngddrow($link, $id, $thumb, $label, $labelliteral = false) {
> 	global $cms, $text, $sitever;
> 	static $id_counter = 1;
> 
> 	$uselabel = $labelliteral ? $label : $text[$label];
> 	if($id == "")
> 		$id = "tng_menu_row_" . $id_counter++;
> 	if($sitever == "mobile") {
> 		$ddrow = "<li><a href=\"$link\" class=\"mobileicon\" id=\"$id\" title=\"$uselabel\">$uselabel</a></li>\n";
> 	}
> 	else {
> 		$ddrow = "<li><a href=\"$link\">";
> 		if($thumb)
> 			$ddrow .= "<img src=\"{$cms['tngpath']}$thumb\" class=\"menu-icon\" alt=\"\" />";
> 		else
> 			$ddrow .= "<span class=\"menu-icon\" id=\"$id\"></span>";
> 		$ddrow .= " <span class=\"menu-label\">$uselabel</span></a></li>\n";
> 	}
> 
> 	return $ddrow;
> }
> 
> function treeDropdown($forminfo) {
> 	global $text, $requirelogin, $assignedtree, $trees_table, $time_offset, $treerestrict, $cms, $tree, $numtrees, $tngconfig;
> 
> 	$ret = "";
> 	if(!$requirelogin || !$treerestrict || !$assignedtree) {
> 		$query = "SELECT gedcom, treename, lastimportdate FROM $trees_table ORDER BY treename";
> 		$treeresult = tng_query($query);
> 		$numtrees = tng_num_rows($treeresult);
> 		$foundtree = false;
> 
> 		if( $numtrees > 1 ) {
> 			if($forminfo['startform'])
> 				$ret .= getFORM( $forminfo['action'], $forminfo['method'], $forminfo['name'], $forminfo['id'] );
> 			$ret .= "<span class=\"normal\">{$text['tree']}: </span>";
> 			$ret .= treeSelect($treeresult, $forminfo['name']);
> 			$ret .= "&nbsp; <img src=\"{$cms['tngpath']}img/spinner.gif\" style=\"display:none;\" id=\"treespinner\" alt=\"\" class=\"spinner\"/>\n";
> 			if(isset($forminfo['hidden']) && is_array($forminfo['hidden'])) {
> 				foreach($forminfo['hidden'] as $hidden)
> 					$ret .= "<input type=\"hidden\" name=\"" . $hidden['name'] . "\" value=\"" . $hidden['value'] . "\" />\n";
> 			}
> 			//$ret .= "<input type=\"submit\" value=\"$text[go]\" />\n";
> 			if($forminfo['endform'])
> 				$ret .= "</form><br/>\n";
> 			else
> 				$ret .= "<br/><br/>\n";
> 			$treeresult = tng_query($query);
> 			if($tree) {
> 				$foundtree = true;
> 				while( $row = tng_fetch_assoc($treeresult) ) {
> 					if($row['gedcom'] == $tree) break;
> 				}
> 			}
> 		}
> 		else {
> 			$foundtree = true;
> 			$row = tng_fetch_assoc( $treeresult );
> 		}
> 		if( !empty($tngconfig['lastimport']) && $foundtree && !empty($forminfo['lastimport'])) {
> 			$lastimport = $row['lastimportdate'];
> 
> 			if( $lastimport ) {
> 				$importtime = strtotime($lastimport);
> 				if(substr($lastimport,11,8) != "00:00:00")
> 					$importtime += ($time_offset * 3600);
> 				$importdate = strlen(date("j", $importtime)) == 1 ? date(" j M Y H:i:s", $importtime) : date("j M Y H:i:s", $importtime);
> 				echo "<p class=\"normal\">{$text['lastimportdate']}: " . displayDate($importdate) . "</p>";
> 			}
> 		}
> 		tng_free_result($treeresult);
> 	}
> 	return $ret;
> }
> 
> function treeSelect($treeresult, $formname = null, $onchange = null) {
> 	global $text, $tree;
> 
> 	$ret = "<select name=\"tree\" id=\"treeselect\"";
> 	if($formname)
> 		$ret .= " onchange=\"jQuery('#treespinner').show();document.$formname.submit();\"";
> 	elseif($onchange)
> 		$ret .= " onchange=\"$onchange\"";
> 	$ret .= ">\n";
> 	$ret .= "<option value=\"-x--all--x-\" ";
> 	if( !$tree ) $ret .= "selected=\"selected\"";
> 	$ret .= ">{$text['alltrees']}</option>\n";
> 
> 	while( $row = tng_fetch_assoc($treeresult) ) {
> 		$ret .= "<option value=\"{$row['gedcom']}\"";
> 		if( $tree && $row['gedcom'] == $tree ) $ret .= " selected=\"selected\"";
> 		$ret .= ">{$row['treename']}</option>\n";
> 	}
> 	$ret .= "</select>\n";
> 	return $ret;
> }
> 
> function getMediaHREF($row,$mlflag) {
> 	global $mediatypes_assoc, $mediapath, $htmldocs, $imagetypes, $videotypes, $recordingtypes, $notrunc, $cms;
> 
> 	$histories_url = getURL( "histories", 1 );
> 	$showmedia_url = getURL( "showmedia", 1 );
> 
> 	$uselink = "";
> 
> 	if( $row['form'] )
> 		$form = strtoupper($row['form']);
> 	else {
> 		preg_match( "/\.(.+)$/", $row['path'], $matches );
> 		$form = isset($matches[1]) ? strtoupper($matches[1]) : '';
> 	}
> 	$thismediatype = $row['mediatypeID'];
> 	$usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$thismediatype] : $mediapath;
> 
> 
> 	//if($mlflag != 1) 
> 	//	$notrunc = 1;  //ok, I'm not sure if this is really needed, so I'm commenting it out
> 	$other_acceptable_form_types = ["PDF","TXT","DOC","DOCX"];
> 	if( !$row['abspath'] && (in_array($form,$imagetypes) || in_array($form,$videotypes) || in_array($form,$recordingtypes) || in_array($form,$other_acceptable_form_types) || !$form) ) {
> 		$uselink = $showmedia_url . "mediaID=" . $row['mediaID'];
> 		if( $mlflag == 1 && !empty($row['medialinkID']))
> 			$uselink .= "&amp;medialinkID=" . $row['medialinkID'];
> 		elseif( $mlflag == 2 && !empty($row['albumlinkID']))
> 			$uselink .= "&amp;albumlinkID=" . $row['albumlinkID'];
> 		elseif( $mlflag == 3 && !empty($row['cemeteryID']))
> 			$uselink .= "&amp;cemeteryID=" . $row['cemeteryID'];
> 		//$uselink .= $row['all'] ? "&amp;all=1" : "";
> 	}
> 	else {
> 		if($row['abspath'] || substr($row['path'],0,4) == "http" || substr($row['path'],0,1) == "/")
> 			$uselink = $row['path'];
> 		elseif( in_array( $form, $htmldocs ) && $cms['support'] )
> 			$uselink = $histories_url . "inc=" . $row['path'];
> 		else {
> 			$url = rawurlencode( $row['path'] );
> 			$url = str_replace("%2F","/",$url);
> 			$url = str_replace("%3F","?",$url);
> 			$url = str_replace("%23","#",$url);
> 			$url = str_replace("%26","&",$url);
> 			$url = str_replace("%3D","=",$url);
> 			$uselink = "$usefolder/$url";
> 		}
> 	}
> 	if(!empty($row['newwindow']))
> 		$uselink .= "\" target=\"_blank";
> 
> 	return $uselink;
> }
> 
> function insertLinks($notes) {
> 	if($notes) {
> 		$pos = 0;
> 		$notepos = array();
> 		while (($pos = strpos($notes, "http", $pos)) !== FALSE) {
> 			if( $pos ) $prevchar = substr( $notes, $pos - 1, 1 );
> 			if( $pos == 0 || ($prevchar != "\"" && $prevchar != "=") )
> 		    	$notepos[] = $pos++;
> 			else
> 				$pos++;
> 		}
> 		$posidx = count($notepos);
> 		while( $posidx > 0 ) {
> 			$actual = $posidx - 1;
> 			$pos = $notepos[$actual];
> 			$firstpart = substr($notes,0,$pos);
> 			$rest = substr($notes,$pos);
> 			$linkstr = strtok($rest," <\n\r");
> 			if( substr( $linkstr, -1 ) == "." ) $linkstr = substr( $linkstr, 0, -1 );
> 			$lastpart = substr($notes,$pos + strlen($linkstr));
> 			$notes = $firstpart . "<a href=\"$linkstr\" target=\"_blank\">$linkstr</a>" . $lastpart;
> 			$posidx--;
> 		}
> 	}
> 
> 	return $notes;
> }
> 
> function getTemplateMessage($key) {
> 	global $tmp, $session_language;
> 
> 	$langkey = $key . "_" . $session_language;
> 
> 	return isset($tmp[$langkey]) ? $tmp[$langkey] : $tmp[$key];
> }
> 
> function showLinks($linkList, $newtab = false, $class = null, $inner_html = null) {
> 	$links = explode("\r",$linkList);
> 	$finishedList = "";
> 	if(count($links) == 1)
> 		$links = explode("\n",$linkList);
> 	$orgtab = $newtab;
> 	foreach($links as $link) {
> 		$newtab = $orgtab;
> 		$parts = explode(",", $link);
> 		$len = count($parts);
> 		if($len == 1) {
> 			$title = $href = $parts[0];
> 		}
> 		elseif($len == 2) {
> 			$title = trim($parts[0]);
> 			$href = trim($parts[1]);
> 		}
> 		elseif($len == 3) {
> 			$title = trim($parts[0]);
> 			$href = trim($parts[1]);
> 			$newtab = true;
> 		}
> 		else {
> 			$href = trim(array_pop($parts));
> 			$title = implode("", $parts);
> 		}
> 		$target = $newtab ? " target=\"_blank\"" : "";
> 		$finishedList .= "<li";
> 		if($class) $finishedList .= " class=\"$class\"";
> 		if($inner_html)
> 			$html = preg_replace( "/xxx/", $title, $inner_html );
> 		else
> 			$html = $title;
> 		$finishedList .= "><a href=\"$href\" title=\"$title\"$target>$html</a></li>\n";
> 	}
> 	return $finishedList;
> }
> 
> function showMediaLinks($linkList) {
>    global $media_table, $rootpath, $photopath, $documentpath, $headstonepath, $historypath, $mediapath, $mediatypes_assoc, $thumbmaxw, $thumbmaxh, $cms, $mediatypes_thumbs, $sitever;
> 	$links = explode(",",$linkList);
> 	$finishedmedList = "";
> 
> 	foreach($links as $link) {
> 		$thumbquery = "SELECT * FROM $media_table WHERE mediaID = \"$link\"";
> 		$thumbresult = tng_query($thumbquery);
> 		$thumbrow = tng_fetch_assoc( $thumbresult );
> 		tng_free_result( $thumbresult );
> 		if( !empty($thumbrow) ) {
> 			$mediatypeID = $thumbrow['mediatypeID'];
> 			$usefolder = $thumbrow['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
> 			$thumb = $cms['tngpath'] . "$usefolder/" . str_replace("%2F","/",rawurlencode( $thumbrow['thumbpath'] ));
> 			$title = !empty($thumbrow['altdescription']) ? $thumbrow['altdescription'] : $thumbrow['description'];
> 			$imgsrc = "<img src=\"$thumb\" alt=\"$title\" title=\"$title\" class=\"thumb\" />";
> 			$href = getMediaHREF($thumbrow,0);
> 			$finishedmedList .= "<br /><a href=\"$href\" title=\"$title\" target=\"_blank\">" . $imgsrc . "</a>&nbsp;<a href=\"$href\" title=\"$title\" target=\"_blank\" style=\"vertical-align:top;\">$title</a><br />";
> 		}
> 	}
> 	return $finishedmedList;
> }
> 
> function custom_menu( $custmenu, $items, $mobile = false ) {
> 	global $text;
> 
> 	if( isset($custmenu['title_text'])) {
> 		$mtext = $custmenu['title_text'];
> 	}
> 	elseif( isset($custmenu['title_index']) ) {
> 		$mtext = $text[$custmenu['title_index']];
> 	}
> 	// Check for deprecated options
> 	elseif(isset($custmenu['text'])) {
> 		if( $custmenu['literal'] == true ) {
> 			$mtext = $custmenu['text'];
> 		}
> 		else {
> 			$mtext = $text[$custmenu['text']];
> 		}
> 	}
> 	else
> 		$mtext = "Other";
> 
> 	if($mobile) {
> 		$menu = "<ul id=\"mcustmenu\" class=\"mright\">\n" . $items . "</ul>\n";
> 	}
> 	else {
> 		$menu = "<li><a href=\"#\" class=\"menulink\">$mtext</a>\n";
> 		$menu .= "<ul class=\"last\">\n" . $items . "\n</ul>\n";
> 		$menu .= "</li>\n";
> 	}
> 
> 	return $menu;
> }
> 
> function custom_links( $linkdefs ) {
> 	global $cms, $text, $allow_admin, $currentuser, $users_table, $tngconfig;
> 
> 	$menu = array();
> 	for( $i=0; isset($linkdefs[$i]); $i++ ) {
> 		if( isset($linkdefs[$i]['admin']) && $linkdefs[$i]['admin']) {
> 			if( !$allow_admin ) continue;
> 			$query = "SELECT role FROM $users_table WHERE username='$currentuser'";
> 			$result = tng_query( $query ) or die( "cannot execute query: $query" );
> 			$row = tng_fetch_assoc( $result );
> 			if( $row['role'] != 'admin' ) continue;
> 		}
> 
> 		if( isset( $linkdefs[$i]['user'] ) && $linkdefs[$i]['user'] === true && !$currentuser ) continue;
> 		if( !isset( $linkdefs[$i]['target'] ) ) continue;
> //echo "doingx $i<br>";
> 		$target = $linkdefs[$i]['target'];
> 		$linkpath = !empty( $linkdefs[$i]['external'] ) ? '' : $cms['tngpath'];
> 
> 		// add options to target section
> 		if( !empty( $linkdefs[$i]['tip_text'] ) ){
> 			$target .= "\" title=\"{$linkdefs[$i]['tip_text']}";
> 		}
> 		elseif( isset( $linkdefs[$i]['tip_index'] ) ) {
> 			$target .= "\" title=\"{$text[$linkdefs[$i]['tip_index']]}";
> 		}
> 		if( isset( $linkdefs[$i]['newwin'] ) ) {
> 			$target .= "\" target=\"_blank";
> 		}
> 		// set label for the link
> 		if( isset( $linkdefs[$i]['label_text'] ) ) {
> 			$label = $linkdefs[$i]['label_text'];
> 			$literal = true;
> 		}
> 		elseif( isset( $linkdefs[$i]['label_index'] ) ) {
> 			$label = $linkdefs[$i]['label_index'];
> 			$literal = false;
> 		}
> 		// handle deprecated defs
> 		elseif( isset( $linkdefs[$i]['text'] ) ) {
> 			if( $linkdefs[$i]['literal'] ) {
> 				$literal = true;
> 				$label = $linkdefs[$i]['text'];
> 			}
> 			else {
> 				$label = $text[$linkdefs[$i]['text']];
> 				$literal = false;
> 			}
> 		}
> 		if( empty( $linkdefs[$i]['sprite'] ) )
> 			$linkdefs[$i]['sprite'] = '';
> 		if( empty( $linkdefs[$i]['icon'] ) )
> 			$linkdefs[$i]['icon'] = '';
> 		//echo $linkpath.$target . " " . $linkdefs[$i]['sprite'] . " " . $linkdefs[$i]['icon'] . " " . $label . " " . $literal . "<br>";
> 		$menu[] = tngddrow(
> 			$linkpath.$target,
> 			$linkdefs[$i]['sprite'],
> 			$linkdefs[$i]['icon'],
> 			$label,
> 			$literal
> 		);
> 		$tngconfig['menucount']++;
> 	}
> 
> //debugPrint($linkdefs);
> 	return $menu;
> }
> 
> function findlangfolder( $file ) {
> 	global $mylanguage, $language;
> 
> 	if( file_exists("$mylanguage/$file") )
> 		$foundlang = "$mylanguage";
> 	elseif( file_exists("languages/$language/$file") )
> 		$foundlang = "languages/$language";
> 	else
> 		$foundlang = "languages/English";
> 		
> 	return $foundlang;
> }
diff -r TNG/geocodelib.php TNG1403/geocodelib.php
4c4
< $base_url = "{$http}://maps.googleapis.com/maps/api/geocode/xml?";
---
> $base_url = "https://maps.googleapis.com/maps/api/geocode/xml?key=" . $map['key'];
15c15
<         $request_url = $base_url . "address=" . urlencode($address);
---
>         $request_url = $base_url . "&address=" . urlencode($address);
49c49
<                     $message = "$lat, $lng  &mdash; <a href=\"admin_editplace.php?ID=$id&amp;cw=1\" target=\"_blank\">{$admtext['edit']}</a>";
---
>                     $message = "$lat, $lng  &mdash; <a href=\"admin_editplace.php?ID=$id&amp;cw=1\" target=\"blank\">{$admtext['edit']}</a>";
55c55
<                     $message = "<strong>{$admtext['toomany']}</strong> &mdash; <a href=\"admin_editplace.php?ID=$id&amp;cw=1\" target=\"_blank\">{$admtext['edit']}</a>";
---
>                     $message = "<strong>{$admtext['toomany']}</strong> &mdash; <a href=\"admin_editplace.php?ID=$id&amp;cw=1\" target=\"blank\">{$admtext['edit']}</a>";
57c57
<                 if($delay)
---
>                 if( !empty($delay) )
70c70
<                 $message = "<strong>{$admtext['nogeocode']} ($status)</strong> &mdash; <a href=\"admin_editplace.php?ID=$id&amp;cw=1\" target=\"_blank\">{$admtext['edit']}</a>";
---
>                 $message = "<strong>{$admtext['nogeocode']} ($status)</strong> &mdash; <a href=\"admin_editplace.php?ID=$id&amp;cw=1\" target=\"blank\">{$admtext['edit']}</a>";
72c72
<             if($delay) {
---
>             if( !empty($delay) ) {
diff -r TNG/getlang.php TNG1403/getlang.php
13c13
< 	if( $_COOKIE[$langcookiename] ) {
---
> 	if( !empty($_COOKIE[$langcookiename]) ) {
16,17c16,23
< 		$session_charset = $_SESSION['session_charset'] = $_COOKIE[$charcookiename];
< 		$session_norels = $_SESSION['session_norels'] = $_COOKIE[$norelscookiename];
---
> 		if(isset($_COOKIE[$charcookiename]))
> 			$session_charset = $_SESSION['session_charset'] = $_COOKIE[$charcookiename];
> 		else
> 			$session_charset = $_SESSION['session_charset'] = "";
> 		if(isset($_COOKIE[$norelscookiename]))
> 			$session_norels = $_SESSION['session_norels'] = $_COOKIE[$norelscookiename];
> 		else
> 			$session_norels = $_SESSION['session_norels'] = "";
19c25
< 	elseif($lang) {
---
> 	elseif(!empty($lang)) {
28,29c34,37
< 	else
< 		$file_exists = file_exists($rootpath . $endrootpath . "$mylanguage/text.php");
---
> 	else {
> 		if(!isset($endrootpath)) $endrootpath = '';
> 		$file_exists = file_exists($rootpath . $endrootpath . "$mylanguage/text.php");	
> 	}
diff -r TNG/getperson.php TNG1403/getperson.php
6,7c6,7
< if(!$personID) {header( "Location: thispagedoesnotexist.html" ); exit;}
< if($tngprint) {
---
> if(empty($personID)) pageNotFound();
> if(!empty($tngprint)) {
36d35
< $indnotes = getNotes( $personID, "I" );
38a38,47
> $indexlist = array( 'BIRT','CHR','BAPL','CONL','INIT','ENDL','DEAT','BURI' );
> if(!empty($tngconfig['altbirth']))
> 	$indexlist = array_unique(array_merge($indexlist, explode(",",$tngconfig['altbirth'])));
> 
> foreach( $indexlist as $myindex )
> 	if( !isset( $stdex[$myindex] ) ) $stdex[$myindex] = '';
> 
> if(!isset($tngconfig['scrollnotes'])) $tngconfig['scrollnotes'] = 1;
> $notearea = $tngconfig['scrollnotes'] ? " class=\"notearea\"" : "";
> 
42,43c51
< 	header( "Location: thispagedoesnotexist.html" );
< 	exit;
---
> 	pageNotFound();
60a69,70
> $indnotes = getNotes( $personID, "I" );
> 
67c77,88
< $logname = $tngconfig['nnpriv'] && $row['private'] ? $admtext['text_private'] : ($nonames && $row['living'] ? $text['living'] : $namestr);
---
> $ldjson = array();
> $ldjsonparents = array();
> $ldjson += ['@type' => "Person"];
> $ldjson += ['@id' => $getperson_url . "personID=$personID&amp;tree=$tree"];
> $ldjson += ['name' => getFirstNameOnly($row)];
> $ldjson += ['familyName' => getSurnameOnly($row)];
> $ldjson += ['birthPlace' => $row['birthplace']];
> $ldjson += ['birthDate' => $row['birthdatetr']];
> $ldjson += ['deathPlace' => $row['deathplace']];
> $ldjson += ['deathDate' => $row['deathdatetr']];
> 
> $logname = !empty($tngconfig['nnpriv']) && $row['private'] ? $admtext['text_private'] : ($nonames && $row['living'] ? $text['living'] : $namestr);
78c99
< 		$branchstr .= $brrow['description'] ? $brrow['description'] : $branch;
---
> 		$branchstr .= !empty($brrow['description']) ? $brrow['description'] : $branch;
91d111
< $flags['tabs'] = $tngconfig['tabs'];
93c113,114
< if(!$tngconfig['hidedna']) {
---
> $flags['scripting'] .= "<script type=\"application/ld+json\">\n" . json_encode($ldjson, JSON_UNESCAPED_SLASHES) . "\n</script>\n";
> if(empty($tngconfig['hidedna'])) {
95c116
< <script type = 'text/javascript' language = 'javascript'>
---
> <script type = 'text/javascript'>
142c163,165
< getCitations( $personID );
---
> if($rights['both']) {
> 	getCitations( $personID );
> }
165c188
< 	if( $tng_extras ) {
---
> 	if(!empty($tng_extras)) {
175c198
< 	$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
---
> 	$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
190,202c213,235
< 		setEvent( array( "text"=>$text['born'], "fact"=>$stdex['BIRT'], "date"=>$row['birthdate'], "place"=>$row['birthplace'], "event"=>"BIRT", "entity"=>$personID, "type"=>"I" ), $row['birthdatetr'] );
< 		setEvent( array( "text"=>$text['christened'], "fact"=>$stdex['CHR'], "date"=>$row['altbirthdate'], "place"=>$row['altbirthplace'], "event"=>"CHR", "entity"=>$personID, "type"=>"I" ), $row['altbirthdatetr'] );
< 	}
< 	if ( $row['sex'] == "M" ) { 
< 		$sex = $text['male']; $spouse = "wife"; $self = "husband"; $spouseorder = "husborder";
< 	}
< 	else if ($row['sex'] == "F" ) { 
< 		$sex = $text['female']; $spouse = "husband"; $self = "wife"; $spouseorder = "wifeorder";
< 	}
< 	else { 
< 		$sex = $text['unknown'];   $spouseorder = "";
< 	}
< 	setEvent( array( "text"=>$text['gender'], "fact"=>$sex ), $nodate );
---
> 		setEvent( array( "text"=>$text['birth'], "fact"=>$stdex['BIRT'], "date"=>$row['birthdate'], "place"=>$row['birthplace'], "event"=>"BIRT", "entity"=>$personID, "type"=>"I" ), $row['birthdatetr'] );
> 
> 		list($altbirthtype, $altbirthlabel) = getAltBirthInfo($row);
> 		setEvent( array( "text"=>$altbirthlabel, "fact"=>$stdex[$altbirthtype], "date"=>$row['altbirthdate'], "place"=>$row['altbirthplace'], "event"=>$altbirthtype, "entity"=>$personID, "type"=>"I" ), $row['altbirthdatetr'] );
> 
> 		if( $row['sex'] == "M" ) {
> 			$sex = $text['male']; $spouse = "wife"; $self = "husband"; $spouseorder = "husborder";
> 		}
> 		elseif($row['sex'] == "F" ) {
> 			$sex = $text['female']; $spouse = "husband"; $self = "wife"; $spouseorder = "wifeorder";
> 		}
> 		else {
> 			$spouseorder = "";
> 			if($row['sex'] == "U")
> 				$sex = $text['unknown'];
> 			elseif(!empty($row['sex']))
> 				$sex = !empty($text[$row['sex']]) ? $text[$row['sex']] : $row['sex'];
> 			else
> 				$sex = "";
> 		}
> 		if(!empty($sex))
> 			setEvent( array( "text"=>$text['gender'], "fact"=>$sex ), $nodate );
> 		doCustomEvents($personID,"I");
204d236
< 	if($rights['both']) {
212,215c244,245
< 		doCustomEvents($personID,"I");
< 
< 		setEvent( array( "text"=>$text['died'], "fact"=>$stdex['DEAT'], "date"=>$row['deathdate'], "place"=>$row['deathplace'], "event"=>"DEAT", "entity"=>$personID, "type"=>"I" ), $row['deathdatetr'] );
< 		$burialmsg = $row['burialtype'] ? $text['cremated'] : $text['buried'];
---
> 		setEvent( array( "text"=>$text['death'], "fact"=>$stdex['DEAT'], "date"=>$row['deathdate'], "place"=>$row['deathplace'], "event"=>"DEAT", "entity"=>$personID, "type"=>"I" ), $row['deathdatetr'] );
> 		$burialmsg = $row['burialtype'] ? $text['cremation'] : $text['burial'];
219c249,250
< 	ksort( $events );
---
> 	if(empty($tngconfig['sortbydate']))
> 		ksort( $events );
241c272
< 			$persontext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\"><div class=\"notearea\">$notes</div></td>\n";
---
> 			$persontext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\"><div{$notearea}>$notes</div></td>\n";
252c283
< 			$row['changedate'] .= "<a href=\"{$cms['tngpath']}admin_editperson.php?personID=$personID&amp;tree=$tree&amp;cw=1\" target=\"_blank\">{$text['edit']}</a>";
---
> 			$row['changedate'] .= "<a href=\"{$cms['tngpath']}admin_editperson.php?personID=$personID&amp;tree=$tree&amp;cw=1\" target=\"blank\">{$text['edit']}</a>";
266c297
< 	
---
> 
270c301
< 			$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
---
> 			$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
277,278c308,309
< 	
< 		     if( $gotfather ) { 		
---
> 
> 		    if( tng_num_rows($gotfather) ) {
294c325,326
< 						if($age) $fatherlink .= " &nbsp;({$text['age']} $age)";
---
> 						$agelabel = isset($text[$fathrow['sex'].'age']) ? $text[$fathrow['sex'].'age'] : $text['age'];
> 						if($age) $fatherlink .= " ($agelabel $age)";
301c333
< 					$relstr = $admtext[$rel] ? $admtext[$rel] : $rel;
---
> 					$relstr = isset($admtext[$rel]) ? $admtext[$rel] : $rel;
309c341
< 			if( $gotmother ) {
---
> 			if( tng_num_rows($gotmother) ) {
325c357,358
< 						if($age) $motherlink .= " &nbsp;({$text['age']} $age)" ;
---
> 						$agelabel = isset($text[$mothrow['sex'].'age']) ? $text[$mothrow['sex'].'age'] : $text['age'];
> 						if($age) $motherlink .= " ($agelabel $age)" ;
332c365
< 					$relstr = $admtext[$rel] ? $admtext[$rel] : $rel;
---
> 					$relstr = isset($admtext[$rel]) ? $admtext[$rel] : $rel;
338c371
< 			if( $rights['both'] && $rights['lds'] && $tngconfig['pardata'] < 2 )
---
> 			if( $rights['both'] && $rights['lds'] && (empty($tngconfig['pardata']) || $tngconfig['pardata'] < 2 ))
346c379
< 			if($tngconfig['pardata'] < 2) {
---
> 			if(empty($tngconfig['pardata']) || $tngconfig['pardata'] < 2) {
351,352c384,388
< 				if($prights['both'] && (!$gotfather || $frights['both']) && (!$gotmother || $mrights['both'])) {
< 					if(!$tngconfig['pardata']) {
---
> 				if($prights['both'] && (empty($fathrow) || $frights['both']) && (empty($mothrow) || $mrights['both'])) {
> 					$stdexf = getStdExtras( $parent['familyID'] );
> 					if(!isset($stdexf['MARR'])) $stdexf['MARR'] = '';
> 					if(!isset($stdexf['DIV'])) $stdexf['DIV'] = '';
> 					if(empty($tngconfig['pardata'])) {
355,356c391
< 						$stdexf = getStdExtras( $parent['familyID'] );
< 						if( $parent['marrtype'] ) {
---
> 						if( !empty($parent['marrtype']) ) {
362,363c397,398
< 					setEvent( array( "text"=>$text['married'], "fact"=>$stdexf['MARR'], "date"=>$parentrow['marrdate'], "place"=>$parentrow['marrplace'], "event"=>"MARR", "entity"=>$parentrow['familyID'], "type"=>"F", "nomap"=>1 ), $parentrow['marrdatetr'] );
< 					setEvent( array( "text"=>$text['divorced'], "fact"=>$stdexf['DIV'], "date"=>$parentrow['divdate'], "place"=>$parentrow['divplace'], "event"=>"DIV", "entity"=>$parentrow['familyID'], "type"=>"F", "nomap"=>1 ), $parentrow['divdatetr'] );
---
> 					setEvent( array( "text"=>$text['marriage'], "fact"=>$stdexf['MARR'], "date"=>$parentrow['marrdate'], "place"=>$parentrow['marrplace'], "event"=>"MARR", "entity"=>$parentrow['familyID'], "type"=>"F", "nomap"=>1 ), $parentrow['marrdatetr'] );
> 					setEvent( array( "text"=>$text['divorce'], "fact"=>$stdexf['DIV'], "date"=>$parentrow['divdate'], "place"=>$parentrow['divplace'], "event"=>"DIV", "entity"=>$parentrow['familyID'], "type"=>"F", "nomap"=>1 ), $parentrow['divdatetr'] );
365c400
< 					if(!$tngconfig['pardata'])
---
> 					if(empty($tngconfig['pardata'])) {
367,368d401
< 
< 					if(!$tngconfig['pardata']) {
373c406,407
< 					ksort( $events );
---
> 					if(empty($tngconfig['sortbydate']))
> 						ksort( $events );
383c417
< 					if(!$tngconfig['pardata']) {
---
> 					if(empty($tngconfig['pardata'])) {
393c427
< 							$persontext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\"><span class=\"normal\"><div class=\"notearea\">$famnotes2</div></span></td>\n";
---
> 							$persontext .= "<td valign=\"top\" class=\"databack normal\" colspan=\"2\"><div{$notearea}>$famnotes2</div></td>\n";
396c430
< 						
---
> 
423c457
< 		$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
---
> 		$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
429a464,468
> 
> 		if(!isset($stdexf['MARR'])) $stdexf['MARR'] = '';
> 		if(!isset($stdexf['DIV']))  $stdexf['DIV'] = '';
> 		if(!isset($stdexf['SLGS'])) $stdexf['SLGS'] = '';
> 
453c492,493
< 					if($age) $spouselink .= " &nbsp;({$text['age']} $age)";
---
> 					$agelabel = isset($text[$spouserow['sex'].'age']) ? $text[$spouserow['sex'].'age'] : $text['age'];
> 					if($age) $spouselink .= " ($agelabel $age)";
468c508
< 		$rightfbranch = checkbranch( $marriagerow['branch'] ) ? 1 : 0;
---
> 		$rightfbranch = $righttree ? checkbranch($marriagerow['branch']) : false;
477,478c517,518
< 			setEvent( array( "text"=>$text['married'], "fact"=>$stdexf['MARR'], "date"=>$marriagerow['marrdate'], "place"=>$marriagerow['marrplace'], "event"=>"MARR", "entity"=>$marriagerow['familyID'], "type"=>"F" ), $marriagerow['marrdatetr'] );
< 			setEvent( array( "text"=>$text['divorced'], "fact"=>$stdexf['DIV'], "date"=>$marriagerow['divdate'], "place"=>$marriagerow['divplace'], "event"=>"DIV", "entity"=>$marriagerow['familyID'], "type"=>"F" ), $marriagerow['divdatetr'] );
---
> 			setEvent( array( "text"=>$text['marriage'], "fact"=>$stdexf['MARR'], "date"=>$marriagerow['marrdate'], "place"=>$marriagerow['marrplace'], "event"=>"MARR", "entity"=>$marriagerow['familyID'], "type"=>"F" ), $marriagerow['marrdatetr'] );
> 			setEvent( array( "text"=>$text['divorce'], "fact"=>$stdexf['DIV'], "date"=>$marriagerow['divdate'], "place"=>$marriagerow['divplace'], "event"=>"DIV", "entity"=>$marriagerow['familyID'], "type"=>"F" ), $marriagerow['divdatetr'] );
485c525,526
< 			ksort( $events );
---
> 			if(empty($tngconfig['sortbydate']))
> 				ksort( $events );
504c545
< 				$persontext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\"><span class=\"normal\"><div class=\"notearea\">$famnotes2</div></span></td>\n";
---
> 				$persontext .= "<td valign=\"top\" class=\"databack normal\" colspan=\"2\"><div{$notearea}>$famnotes2</div></td>\n";
519c560
< 			$persontext .= "<table cellpadding = \"0\" cellspacing = \"0\" width=\"100%\">\n";
---
> 			$persontext .= "<table cellpadding = \"0\" cellspacing = \"0\" style=\"width: 100%\">\n";
535c576,577
< 						if($age) $persontext .= " &nbsp;({$text['age']} $age)";
---
> 						$agelabel = isset($text[$child['sex'].'age']) ? $text[$child['sex'].'age'] : $text['age'];
> 						if($age) $persontext .= " ($agelabel $age)";
538c580
< 						$frelstr = isset($admtext[$frel]) ? $admtext[$frel] : $child['frel'];
---
> 						$frelstr = $text['father'] . ": " . (isset($admtext[$frel]) ? $admtext[$frel] : $child['frel']);
541c583
< 						$mrelstr = isset($admtext[$mrel]) ? $admtext[$mrel] : $child['mrel'];
---
> 						$mrelstr = $text['mother'] . ": " . (isset($admtext[$mrel]) ? $admtext[$mrel] : $child['mrel']);
544c586
< 						if($child['mrel'] && $child['mrel'] != $child['frel']) $persontext .= " &nbsp;[$mrelstr]";
---
> 						if($child['mrel']) $persontext .= " &nbsp;[$mrelstr]";
562a605
> 		$persontext .= showEvent( array( "text"=>$text['familyid'], "date"=>$marriagerow['familyID'], "place"=>"<a href=\"$familygroup_url" . "familyID={$marriagerow['familyID']}&amp;tree=$tree\">{$text['groupsheet']}</a>&nbsp; | &nbsp;<a href='{$familychart_url}familyID={$marriagerow['familyID']}&amp;tree=$tree'>{$text['familychart']}</a>", "np"=>1 ) );
567c610
< 				$marriagerow['changedate'] .= "<a href=\"{$cms['tngpath']}admin_editfamily.php?familyID={$marriagerow['familyID']}&amp;tree=$tree&amp;cw=1\" target=\"_blank\">{$text['edit']}</a>";
---
> 				$marriagerow['changedate'] .= "<a href=\"{$cms['tngpath']}admin_editfamily.php?familyID={$marriagerow['familyID']}&amp;tree=$tree&amp;cw=1\" target=\"blank\">{$text['edit']}</a>";
571d613
< 		$persontext .= showEvent( array( "text"=>$text['familyid'], "date"=>$marriagerow['familyID'], "place"=>"<a href=\"$familygroup_url" . "familyID={$marriagerow['familyID']}&amp;tree=$tree\">{$text['groupsheet']}</a>&nbsp; | &nbsp;<a href='{$familychart_url}familyID={$marriagerow['familyID']}&amp;tree=$tree'>{$text['familychart']}</a>", "np"=>1 ) );
581c623
< 		$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
---
> 		$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
598c640
< 		while( list($key, $val) = each($locations2map) ) {
---
> 		foreach($locations2map as $key => $val)    {
614c656
< 			$description = $val['description'];
---
> 			$description = is_array($val['description']) ? implode(",",$val['description']) : $val['description'];
625,626c667,668
< 						$locations2map[$key]['htmlcontent'] = "<div class=\"mapballoon normal\" style=\"margin-top:10px\"><strong>{$val['fixedplace']}</strong><br /><br />$event: $dateforlocalballoon";
< 						$locations2map[$key]['htmlcontent'] .= "<br /><br /><a href=\"{$http}://maps.google.com/maps?f=q{$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($directionballoontext)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $directionplace</div>";
---
> 						$locations2map[$key]['htmlcontent'] = "<div class=\"mapballoon normal\" style=\"margin-top:10px\"><strong>{$val['fixedplace']}</strong><br /><br />" . addslashes($event) . ": $dateforlocalballoon";
> 						$locations2map[$key]['htmlcontent'] .= "<br /><br /><a href=\"{$http}://maps.google.com/maps?f=q&amp;hl={$text['glang']}&amp;daddr=$lat,$long($directionballoontext)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $directionplace</div>";
635c677
< 								$locations2map[$thiskey]['htmlcontent'] = str_replace("</div>","<br/>$event: $dateforlocalballoon</div>",$locations2map[$thiskey]['htmlcontent']);
---
> 								$locations2map[$thiskey]['htmlcontent'] = str_replace("</div>","<br/><br/>$event: $dateforlocalballoon</div>",$locations2map[$thiskey]['htmlcontent']);
640c682
< 					$persontext .= "<a href=\"{$http}://maps.google.com/maps?f=q{$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($directionballoontext)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target= \"_blank\"><img src=\"{$cms['tngpath']}google_marker.php?image=$pinplacelevel.png&amp;text=$thismarker\" alt=\"{$text['googlemaplink']}\" border=\"0\" width= \"20\" height=\"34\" /></a>";
---
> 					$persontext .= "<a href=\"{$http}://maps.google.com/maps?f=q&amp;hl={$text['glang']}&amp;daddr=$lat,$long($directionballoontext)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target= \"_blank\"><img src=\"{$cms['tngpath']}google_marker.php?image=$pinplacelevel.png&amp;text=$thismarker\" alt=\"{$text['googlemaplink']}\" border=\"0\" width= \"20\" height=\"34\" /></a>";
654c696
< 		$persontext .= "<tr><td><span class=\"smaller\"><img src=\"{$cms['tngpath']}img/earth.gif\" border=\"0\" alt=\"\" width=\"15\" height=\"15\" align=\"left\" />&nbsp;= <a href=\"http://earth.google.com/download-earth.html\" target=\"_blank\" title=\"{$text['download']}\">{$text['googleearthlink']}</a>&nbsp;</span></td></tr></table>\n";
---
> 		$persontext .= "<tr><td><span class=\"smaller\"><img src=\"{$cms['tngpath']}img/earth.gif\" border=\"0\" alt=\"\" width=\"15\" height=\"15\" align=\"left\" />&nbsp;= <a href=\"https://earth.google.com/\" target=\"_blank\" title=\"{$text['download']}\">{$text['googleearthlink']}</a>&nbsp;</span></td></tr></table>\n";
669c711
< 	if( !$tng_extras ) {
---
> 	if( empty($tng_extras) ) {
687c729
< 			$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
---
> 			$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
701c743
< 		$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
---
> 		$persontext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
706c748
< 		if($tngconfig['scrollcite'])
---
> 		if(!empty($tngconfig['scrollcite']))
718c760
< 		if($tngconfig['scrollcite'])
---
> 		if(!empty($tngconfig['scrollcite']))
727c769
< 	if( $media || $notes || $citedispctr || $map['key'] ) {
---
> 	if( !empty($media) || $notes || $citedispctr || $map['key'] ) {
729c771
< 			if( $tng_extras )
---
> 			if( !empty($tng_extras) )
736c778
< 		$innermenu = $num_collapsed ? "<div style=\"float:right\"><a href=\"#\" onclick=\"{$showdnatest}return toggleCollapsed(0)\" class=\"lightlink\">{$text['expandall']}</a> &nbsp | &nbsp; <a href=\"#\" onclick=\"{$hidednatest}return toggleCollapsed(1)\" class=\"lightlink\">{$text['collapseall']}</a> &nbsp;</div>" : "";
---
> 		$innermenu = $num_collapsed ? "<div style=\"float:right\"><a href=\"#\" onclick=\"{$showdnatest}return toggleCollapsed(0)\" class=\"lightlink\">{$text['expandall']}</a> &nbsp; | &nbsp; <a href=\"#\" onclick=\"{$hidednatest}return toggleCollapsed(1)\" class=\"lightlink\">{$text['collapseall']}</a> &nbsp;</div>" : "";
738c780
< 		if( $media )
---
> 		if( !empty($media) )
750c792
<     if($allowpdf)
---
>    if($allowpdf)
762c804
< 	if( $media ) {
---
> 	if( !empty($media) ) {
785c827
< 	if( $media )
---
> 	if( !empty($media) )
816c858
< 	$flags['more'] .= "\n<script language=\"JavaScript\" type=\"text/javascript\">";
---
> 	$flags['more'] .= "\n<script type=\"text/javascript\">";
821d862
< $flags['more'] .= "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/rpt_utils.js\"></script>\n";
diff -r TNG/globallib.php TNG1403/globallib.php
1,1207c1,1455
< <?php
< @ini_set( "session.bug_compat_warn", "0" );
< @ini_set( "allow_url_fopen", "0" );
< $http = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' )) ? 'https' : 'http';
< 
< @set_time_limit(0);
< //set binary to "binary" for more sensitive searches
< $binary = "";
< $notrunc = 0; //don't truncate if link doesn't go to showmedia
< $envelope = false;
< 
< if( isset($offset) && $offset && !is_numeric($offset) ) die ("invalid offset");
< //$endrootpath = "";
< 
< $newroot = preg_replace( "/\//", "", $rootpath );
< $newroot = preg_replace( "/ /", "", $newroot );
< $newroot = preg_replace( "/\./", "", $newroot );
< $errorcookiename = "tngerror_$newroot";
< if( isset($_COOKIE[$errorcookiename]) ) {
< 	$message = $_COOKIE[$errorcookiename];
< 	$error = $message;
< 	setcookie("tngerror_$newroot", "", time()-31536000, "/");
< }
< else
< 	$error = "";
< 
< function debugPrint($obj) {
< 	echo "<pre>\n";
< 	print_r($obj);
< 	echo "</pre>\n";
< }
< 
< function constructName($firstnames, $lastnames, $title, $suffix, $order) {
< 	if($title) $title .= " ";
< 	if($firstnames) $firstnames .= " ";
< 
< 	switch($order) {
< 		case "3":
< 			if($lastnames && $firstnames) $lastnames .= ",";
< 			if($lastnames) $lastnames .= " ";
< 			$namestr = trim("$lastnames $title$firstnames$suffix");
< 			break;
< 		case "2":
< 			if($lastnames) $lastnames .= " ";
< 			$namestr = trim("$title$lastnames$firstnames");
< 			if($suffix) $namestr .= ", $suffix";
< 			break;
< 		default:
< 			$namestr = trim("$title$firstnames$lastnames");
< 			if($suffix) $namestr .= ", $suffix";
< 			break;
< 	}
< 
< 	return preg_replace('/\s\s+/'," ",$namestr);
< }
< 
< function getName( $row, $hcard = null ) {
< 	global $nameorder;
< 
< 	$locnameorder = $row['nameorder'] ? $row['nameorder'] : ($nameorder ? $nameorder : 1);
< 	$namestr = getNameUniversal($row, $locnameorder, $hcard);
< 
< 	return $namestr;
< }
< 
< function getNameRev( $row, $hcard = null ) {
< 	global $nameorder;
< 
< 	$locnameorder = $row['nameorder'] ? $row['nameorder'] : ($nameorder ? $nameorder : 1);
< 	if($locnameorder != 2) $locnameorder = 3;
< 	$namestr = getNameUniversal($row, $locnameorder, $hcard);
< 
< 	return $namestr;
< }
< 
< function getNameUniversal($row, $order, $hcard=null) {
< 	global $text, $admtext, $tngconfig, $nonames;
< 
< 	//$nonames = showNames($row);
< 	$lastname = trim( $row['lnprefix']." ".$row['lastname'] );
< 	if($tngconfig['ucsurnames']) $lastname = tng_strtoupper($lastname);
< 	if($hcard) {
< 		$lastname = "<span class=\"family-name\">" . $lastname . "</span>";
< 		$title = $suffix = "";
< 	}
< 	else {
< 		$title = $row['title'] && ($row['title'] == $row['prefix']) ? $row['title'] : trim($row['title'] . " " . $row['prefix']);
< 		$suffix = $row['suffix'];
< 	}
< 	if( ($row['allow_living'] || !$nonames) && ($row['allow_private'] || !$tngconfig['nnpriv']) ) {
< 		$firstname = $hcard ? "<span class=\"given-name\">" . $row['firstname'] . "</span>" : $row['firstname'];
< 		$namestr = constructName($firstname, $lastname, $title, $suffix, $order);
< 	}
< 	elseif( $row['living'] && !$row['allow_living'] && $nonames == 1 )
< 		$namestr = $text['living'];
< 	elseif( $row['private'] && !$row['allow_private'] && $tngconfig['nnpriv'] == 1 )
< 		$namestr = $admtext['text_private'];
< 	else {  //initials
< 		$firstname = $hcard ? "<span class=\"given-name\">" . initials( $row['firstname']) . "</span>" : initials( $row['firstname']);
< 		$namestr = constructName($firstname, $lastname, $title, $suffix, $order);
< 	}
< 
< 	if($hcard) $namestr = "<span class=\"n\">$namestr</span>";
< 	return $namestr;
< }
< 
< function getFamilyName( $row ) {
< 	global $text, $people_table;
< 
< 	$righttree = checktree($row['gedcom']);
< 
< 	$hquery = "SELECT firstname, lnprefix, lastname, title, prefix, suffix, living, private, branch, nameorder, gedcom FROM $people_table WHERE personID = \"{$row['husband']}\" AND gedcom = \"{$row['gedcom']}\"";
< 	$hresult = tng_query($hquery) or die ($text['cannotexecutequery'] . ": $hquery");
< 	$hrow = tng_fetch_assoc( $hresult );
< 
< 	$hrights = determineLivingPrivateRights($hrow, $righttree);
< 	$hrow['allow_living'] = $hrights['living'];
< 	$hrow['allow_private'] = $hrights['private'];
< 
< 	$husbname = getName( $hrow );
< 	tng_free_result( $hresult );
< 
< 	$wquery = "SELECT firstname, lnprefix, lastname, title, prefix, suffix, living, private, branch, nameorder, gedcom FROM $people_table WHERE personID = \"{$row['wife']}\" AND gedcom = \"{$row['gedcom']}\"";
< 	$wresult = tng_query($wquery) or die ($text['cannotexecutequery'] . ": $wquery");
< 	$wrow = tng_fetch_assoc( $wresult );
< 
< 	$wrights = determineLivingPrivateRights($wrow, $righttree);
< 	$wrow['allow_living'] = $wrights['living'];
< 	$wrow['allow_private'] = $wrights['private'];
< 
< 	$wifename = getName( $wrow );
< 	tng_free_result( $wresult );
< 
< 	return "$husbname / $wifename";
< }
< 
< function initials( $name ) {
< 	global $session_charset;
< 
< 	$newname = "";
<     if($session_charset == "UTF-8") $name = utf8_decode($name);
< 
< 	$token = strtok( $name, " " );
< 	do{
< 		if( substr( $token, 0, 1 ) != "(" ) { //In case there is a name in brackets, in which case ignore
< 			if($session_charset == "UTF-8")
< 				$newname .= utf8_encode(substr( $token, 0, 1 )) . ".";
< 			else
< 				$newname .= substr( $token, 0, 1 ) . ".";
< 		}
< 		$token = strtok(" ");
< 	}
< 	while( $token != "" );
< 
< 	return $newname;
< }
< 
< function showNames($row) {
< 	global $nonames, $tngconfig;
< 
< 	return $row['private'] ? $tngconfig['nnpriv'] : $nonames;
< }
< 
< function getGenderIcon($gender, $valign) {
< 	global $text, $cms;
< 
< 	$icon = "";
< 	if($gender) {
< 		if($gender == "M") $genderstr = "male";
< 		elseif($gender == "F") $genderstr = "female";
< 		if($genderstr)
< 			$icon = "<img src=\"{$cms['tngpath']}img/tng_$genderstr.gif\" width=\"11\" height=\"11\" border=\"0\" alt=\"" . $text[$genderstr] . "\" style=\"vertical-align: " . $valign . "px;\"/>";
< 	}
< 	return $icon;
< }
< 
< function getURL( $destination, $args, $ext=".php") {
<         global $cms;
< 
< 	if( $cms['support'] ) {
< 		if (class_exists('TNGcms')) {
< 			$url=TNGcms::getURL($destination, $args, $ext=".php", $cms);
< 		}
< 		else
< 			$url = $args ? $cms['url'] . "=$destination&" : $cms['url'] . "=$destination";
< 	}
< 	else
< 		$url = $args ? $cms['tngpath'] . $destination . $ext . "?" : $cms['tngpath'] . $destination . $ext;
< 
< 	return $url;
< }
< 
< function getFORM( $action, $method, $name, $id, $onsubmit=null ) {
< 	global $cms;
< 
<     if( !$cms['support'] )
<         $url = $action ? $cms['tngpath'] . $action . ".php" : "";
<     elseif(class_exists('TNGcms'))
<         return TNGcms::getFORM($action, $method, $name, $id, $cms);
<     elseif($cms['support']=="joomla")  // backwards compatibility
<         $url = "index.php";
<     elseif($cms['support']=="zikula")  // backwards compatibility
<         $url = "index.php";
<     else
<         $url = "modules.php";          // backwards compatibility
< 
< 	$formstr = "<form action=\"$url\"";
< 	if( $method )
< 		$formstr .= " method=\"$method\"";
< 	if( $name )
< 		$formstr .= " name=\"$name\"";
< 	if( $id )
< 		$formstr .= " id=\"$id\"";
< 	if( $onsubmit )
< 		$formstr .= " onsubmit=\"$onsubmit\"";
< 
< 	$formstr .= ">\n";
< 
< 	if( $cms['support'] ) {
< 		if ($cms['support']=="joomla") {
< 			$formstr .="<input type=\"hidden\" name=\"option\" value= \"com_tngbridge\" />\n";
< 			$formstr .="<input type=\"hidden\" name=\"Itemid\" value=\"39\" /> \n";
< 			$formstr .="<input type=\"hidden\" name=\"url\" value=\"$action\" /> \n";
< 		}
<         elseif($cms['support']=="zikula") {
<             $formstr .= "<input type=\"hidden\" name=\"module\" value=\"{$cms['module']}\" />\n";
<             $formstr .= "<input type=\"hidden\" name=\"show\" value=\"$action\" />\n";
<         }
< 		else {
< 			$formstr .= "<input type=\"hidden\" name=\"op\" value=\"modload\" />\n";
< 			$formstr .= "<input type=\"hidden\" name=\"name\" value=\"{$cms['module']}\" />\n";
< 			$formstr .= "<input type=\"hidden\" name=\"file\" value=\"$action\" />\n";
< 		}
< 	}
< 
< 	return $formstr;
< }
< 
< function isPhoto($row) {
< 	global $imagetypes;
< 
< 	if( $row['form'] )
< 		$form = strtoupper($row['form']);
< 	else {
< 		preg_match( "/\.(.+)$/", $row['path'], $matches );
< 		$form = strtoupper($matches[1]);
< 	}
< 
< 	if($row['path'] && !$row['abspath'] && in_array($form,$imagetypes))
< 		return true;
< 	else
< 		return false;
< }
< 
< function getEventDisplay( $displaystr ) {
< 	global $mylanguage, $languages_path;
< 	
< 	$dispvalues = explode( "|", $displaystr );
< 	$numvalues = count( $dispvalues );
< 	if( $numvalues > 1 ) {
< 		$displayval = "";
< 		for( $i = 0; $i < $numvalues; $i += 2 ) {
< 			$lang = $dispvalues[$i]; 
< 			if( $mylanguage == $languages_path . $lang ) {
< 				$displayval = $dispvalues[$i+1];
< 				break;
< 			}
< 		}
< 	}
< 	else
< 		$displayval = $displaystr;
< 		
< 	return $displayval;
< }
< 
< function checkbranch( $branch ) {
< 	global $assignedbranch;
< 
< 	return ( !$assignedbranch || ( FALSE !== ( $pos = strpos( $branch, $assignedbranch, 0 ) ) ) ) ? 1 : 0;
< }
< 
< function checktree( $tree ) {
< 	global $assignedtree;
< 
< 	return ( !$assignedtree || $tree == $assignedtree );
< }
< 
< //The following function is now obsolete
< function determineLivingRights($row, $usedb = 0, $allow_living_db = 0, $allow_private_db = 0) {
< 	global $livedefault, $allow_living, $allow_private, $rightbranch, $tree;
< 
<     $allow_living_loc = $usedb ? $allow_living_db : $allow_living;
<     $allow_private_loc = $usedb ? $allow_private_db : $allow_private;
< 
< 	$rightbranch = checkbranch($row['branch']) ? 1 : 0;
< 	//echo "myg=" . $_SESSION['mygedcom'] . ", myp=" . $_SESSION['mypersonID'] . "rp=" . $row['personID'] . "<br>";
< 	//change $tree back to $row[gedcom] after all calling pages can be updated
<     $living = $row['living'];
<     $private = $row['private'];
< 
<     if(!$private && !$living) {
<         $livingrights = 1;
<     }
<     else {
<         $yes_living = $yes_private = true;
<         $user_person = $_SESSION['mypersonID'] && $_SESSION['mygedcom'] == $tree && $_SESSION['mypersonID'] == $row['personID'];
<         if($living) {
<             if($livedefault != 2) {   //everyone has living rights
<                 if((!$allow_living_loc || !$rightbranch) && !$user_person) {
<                     $yes_living = false;
<                     //echo "fn={$row['firstname']}, al=$allow_living, br={$row['branch']}, rb=$rightbranch, up=$user_person<br>";
<                 }
<             }
<         }
<         if($private) {
<             if((!$allow_private_loc || !$rightbranch) && !$user_person)
<                 $yes_private = false;
<         }
<         $livingrights = $yes_living && $yes_private ? 1 : 0;
<     }
< 	//$livingrights = ((!$row['private'] || $allow_private) && (!$row['living'] || $livedefault == 2)) || ($allow_living && $rightbranch) || ($_SESSION['mypersonID'] && $_SESSION['mygedcom'] == $tree && $_SESSION['mypersonID'] == $row['personID']) ? 1 : 0;
< 	
< 	return $livingrights;
< }
< //end obsolete function
< 
< function determineLivingPrivateRights($row, $pagerighttree = -1, $pagerightbranch = -1) {
< 	global $livedefault, $ldsdefault, $allow_living, $allow_private, $allow_lds, $tree;
< 
< 	$rights = array('private' => true, 'living' => true, 'lds' => (!$ldsdefault ? true : false));
<  
< 	$living = $livedefault == 2 ? false : $row['living'];
<     $private = $row['private'];
< 
<     if($private || $living || $ldsdefault == 2) {
< 		//check tree
< 		$righttree = $pagerighttree >= 0 ? $pagerighttree : checktree($row['gedcom']);
< 		$righttreebranch = $pagerightbranch >= 0 ? $pagerightbranch : ($righttree ? checkbranch($row['branch']) : false);
<     	$user_person = $_SESSION['mypersonID'] && $_SESSION['mygedcom'] == $tree && $_SESSION['mypersonID'] == $row['personID'];
< 
<     	if($living && (!$allow_living || !$righttreebranch) && !$user_person)
<     		$rights['living'] = false;
<     		
<     	if($private && (!$allow_private || !$righttreebranch) && !$user_person)
<     		$rights['private'] = false;
< 
< 		if($ldsdefault == 2 && (($allow_lds && $righttreebranch) || $user_person))
< 			$rights['lds'] = true;
< 		//echo $righttree . " " . $righttreebranch . " " . $row['branch'] . " | ";
<     }
<    	$rights['both'] = $rights['private'] && $rights['living'];
< 
< 	return $rights;
< }
< 
< function determineLDSRights($notree = false) {
< 	global $ldsdefault, $allow_lds, $tree, $assignedtree;
< 
< 	$treeOK = !$tree || $notree || !$assignedtree || $tree == $assignedtree;
< 	$ldsOK = !$ldsdefault || ($ldsdefault == 2 && $allow_lds && $treeOK) ? true : false;
< 
< 	return $ldsOK;
< }
< 
< function getLivingPrivateRestrictions($table, $firstname, $allOtherInput) {
< 	global $livedefault, $nonames, $tngconfig, $allow_living, $allow_private, $assignedtree, $assignedbranch, $people_table;
< 	
< 	$query = "";
< 	if($table) $table .= ".";
< 	$limitedLivingRights = $allow_living && !$livedefault;
< 	$limitedPrivateRights = $allow_private;
< 	$allLivingRights = $livedefault == 2 || ($allow_living && !$assignedtree);
< 	$allPrivateRights = $allow_private && !$assignedtree;
< 	$livingNameRestrictions = $livedefault == 1 || (!$livedefault && ($nonames == 1 || ($nonames == 2 && $firstname)) && !$allLivingRights);
< 	$privateNameRestrictions = ($tngconfig['nnpriv'] == 1 || ($tngconfig['nnpriv'] == 2 && $firstname)) && !$allPrivateRights;
< 	
< 	if($livingNameRestrictions || $privateNameRestrictions || $allOtherInput) {
< 		$atreestr = $matchperson = "";
< 		if($_SESSION['mypersonID'] && $table == $people_table) {
< 			//this is me (current user)
< 			$matchperson = " OR ({$table}gedcom = \"{$_SESSION['mygedcom']}\" AND {$table}personID = \"{$_SESSION['mypersonID']}\")";
< 		}
< 		if($assignedtree) {
< 			//rights are limited to a tree or tree+branch
< 			$atreestr = $assignedbranch ? " OR ({$table}gedcom = \"$assignedtree\" AND {$table}branch LIKE \"%$assignedbranch%\")" : " OR {$table}gedcom = \"$assignedtree\"";
< 		}
< 		if(($livingNameRestrictions && $privateNameRestrictions) || ($allOtherInput && !$allLivingRights && !$allPrivateRights)) {
< 			if($limitedLivingRights && $limitedPrivateRights)
< 				$query .= "(({$table}living != 1 && {$table}private != 1)$atreestr$matchperson)";
< 			elseif($limitedLivingRights)
< 				$query .= "({$table}private != 1 && ({$table}living != 1$atreestr$matchperson))";
< 			elseif($limitedPrivateRights)
< 				$query .= "({$table}living != 1 && ({$table}private != 1$atreestr$matchperson))";
< 			else 
< 				$query .= "(({$table}living !=1 && {$table}private != 1)$matchperson)";
< 		}
< 		else {
< 			if($livingNameRestrictions || ($allOtherInput && !$allLivingRights)) {
< 				if($limitedLivingRights)
< 					$query .= "({$table}living != 1$atreestr$matchperson)";
< 				else 
< 					$query .= "({$table}living != 1$matchperson)";
< 			}
< 			elseif($privateNameRestrictions || ($allOtherInput && !$allPrivateRights)) {
< 				if($limitedPrivateRights)
< 					$query .= "({$table}private != 1$atreestr$matchperson)";
< 				else 
< 					$query .= "({$table}private != 1$matchperson)";
< 			}
< 		}
< 	}
< 	
< 	return $query;
< }
< 
< function checkLivingLinks($itemID) {
< 	global $livedefault, $assignedtree, $assignedbranch, $people_table, $text, $medialinks_table, $sources_table, $citations_table, $families_table, $allow_living, $allow_private;
< 
< 	if(($livedefault == 2 || $allow_living) && $allow_private && !$assignedtree)
< 		return true;
< 
< 	$icriteria = $fcriteria = "";
< 	if (!$allow_living && !$allow_private) {
< 		// Viewer can not see media of Living individuals regardless of tree/branch,
< 		// So need to check all links to this media for living individuals (don't narrow the search.)
< 		$icriteria = $fcriteria = "AND (living = 1 OR private = 1)";
< 	}
< 	else {
< 		// Viewer can see some media of Living individuals, now figure if there are some the viewer should not see
< 		if( $assignedtree && $livedefault != 2 ) {
< 			// Should not be able to see Living individuals in other Trees, so narrow search to those other Trees
< 			$icriteria = "$people_table.gedcom != \"$assignedtree\"";
< 			$fcriteria = "$families_table.gedcom != \"$assignedtree\"";
< 
< 			if ($assignedbranch ) { // Note: must have a Tree selected to have a Branch
< 				// Should not be able to see Living individuals in other Branches either, so need to check for those too.
< 				$bcriteria = "OR !(branch LIKE \"%$assignedbranch%\")";
< 				$icriteria = "($icriteria $bcriteria)";
< 				$fcriteria = "($fcriteria $bcriteria)";
< 			}
< 		}
< 		if(!$allow_living && $livedefault != 2) {
< 			$icriteria = $icriteria ? "AND (living = 1 OR ($icriteria AND private = 1))" : "AND living = 1";
< 			$fcriteria = $fcriteria ? "AND (living = 1 OR ($fcriteria AND private = 1))" : "AND living = 1";
< 		}
< 		elseif(!$allow_private) {  //!$allow_private_db
< 			$icriteria = $icriteria ? "AND (private = 1 OR ($icriteria AND living = 1))" : "AND private = 1";
< 			$fcriteria = $fcriteria ? "AND (private = 1 OR ($fcriteria AND living = 1))" : "AND private = 1";
< 		}
< 		else {
< 			if($icriteria) $icriteria = "AND $icriteria AND (living = 1 OR private = 1)";
< 			if($fcriteria) $fcriteria = "AND $fcriteria AND (living = 1 OR private = 1)";
< 		}
< 	}
< 
< 	if($icriteria) {
< 		// Now find Living individuals linked to the media that fit the criteria set above.
< 		$query = "SELECT count(*) as pcount
< 			FROM ($medialinks_table, $people_table)
< 			WHERE $medialinks_table.personID = $people_table.personID
< 				AND $medialinks_table.gedcom = $people_table.gedcom
< 				AND $medialinks_table.mediaID = '$itemID'
< 				$icriteria";
< 		$result = tng_query($query);
< 		$row = tng_fetch_assoc( $result );
< 		tng_free_result( $result );
< 		if( $row['pcount'] )
< 			return false;  // found at least one
< 	}
< 
< 	if($fcriteria) {
< 		$query = "SELECT count(*) as pcount
< 			FROM ($medialinks_table, $families_table)
< 			WHERE $medialinks_table.personID = $families_table.familyID
< 				AND $medialinks_table.gedcom = $families_table.gedcom
< 				AND $medialinks_table.mediaID = '$itemID'
< 				$fcriteria";
< 		$result = tng_query($query);
< 		$row = tng_fetch_assoc( $result );
< 		tng_free_result( $result );
< 		if( $row['pcount'] )
< 			return false;  // found at least one
< 	}
< 	/*
<  	$query = "SELECT count(*) as pcount
< 		FROM ($medialinks_table, $sources_table, $citations_table, $people_table)
< 		WHERE $medialinks_table.personID = $sources_table.sourceID
< 			AND $medialinks_table.gedcom = $sources_table.gedcom
< 			AND $medialinks_table.gedcom = $citations_table.gedcom
< 			AND $medialinks_table.gedcom = $people_table.gedcom
< 			AND $sources_table.sourceID = $citations_table.sourceID
< 			AND $citations_table.persfamID = $people_table.personID
< 			AND $medialinks_table.mediaID = '$itemID'
< 			AND living = 1 $criteria";
< 	$result = tng_query($query);
< 	$row = tng_fetch_assoc( $result );
<    	tng_free_result( $result );
< 	if( $row['pcount'] )
< 		return false;
< 
<  	$query = "SELECT count(*) as pcount
< 		FROM ($medialinks_table, $sources_table, $citations_table, $families_table)
< 		WHERE $medialinks_table.personID = $sources_table.sourceID
< 			AND $medialinks_table.gedcom = $sources_table.gedcom
< 			AND $medialinks_table.gedcom = $citations_table.gedcom
< 			AND $medialinks_table.gedcom = $families_table.gedcom
< 			AND $sources_table.sourceID = $citations_table.sourceID
< 			AND $citations_table.persfamID = $families_table.familyID
< 			AND $medialinks_table.mediaID = '$itemID'
< 			AND living = 1 $fcriteria";
< 	$result = tng_query($query);
< 	$row = tng_fetch_assoc( $result );
<    	tng_free_result( $result );
< 	if( $row['pcount'] )
< 		return false;
< 	*/
< 
<     // so we made it here ok, so there must not be any Living individulals linked to this media
<     return true;
< }
< 
< function checkMediaFileSize($path) {
< 	global $maxmediafilesize;
< 
< 	return file_exists($path) && filesize($path) < $maxmediafilesize;
< }
< 
< function getScriptName($replace = true) {
< 	global $_SERVER;
< 
< 	$scriptname = $_SERVER['REQUEST_URI'] ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME'] . "?" . $_SERVER['QUERY_STRING'];
< 	if($replace) {
< 		$scriptname = str_replace("&","&amp;",$scriptname);
< 		$scriptname = str_replace("amp;amp;", "amp;", $scriptname);
< 	}
< 	
< 	return $scriptname;
< }
< 
< function getScriptPath() {
< 	$uri = getScriptName();
< 	return dirname($uri);
< }
< 
< function get_browseitems_nav( $total, $address, $perpage, $pagenavpages ) {
< 	global $tngpage, $totalpages, $tree, $text, $orgtree, $test_type, $test_group;
< 
< 	if( !$tngpage ) $tngpage = 1;
< 	if( !$perpage ) $perpage = 50;
< 
< 	if( $total <= $perpage )
< 		return "";
< 
< 	$totalpages = ceil( $total / $perpage );
< 	if ( $tngpage > $totalpages ) $tngpage = $totalpages;
< 
< 	if( $tngpage > 1 ) {
< 		$prevpage = $tngpage-1;
< 		$navoffset = ( ( $prevpage * $perpage ) - $perpage );
< 		$prevlink = " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$prevpage\" class=\"snlink\" title=\"{$text['text_prev']}\">&laquo;{$text['text_prev']}</a> ";
< 	}
< 	if ($tngpage<$totalpages) {
< 		$nextpage = $tngpage+1;
< 		$navoffset = (($nextpage * $perpage) - $perpage);
< 		$nextlink = "<a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$nextpage\" class=\"snlink\" title=\"{$text['text_next']}\">{$text['text_next']}&raquo;</a>";
< 	}
< 	while( $curpage++ < $totalpages ) {
<    	$navoffset = ( ($curpage - 1 ) * $perpage );
< 		if( ( $curpage <= $tngpage - $pagenavpages || $curpage >= $tngpage + $pagenavpages ) && $pagenavpages ) {
< 			if( $curpage == 1 )
< 				$firstlink = " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$curpage\" class=\"snlink\" title=\"{$text['firstpage']}\">&laquo;1</a> ... ";
< 		    if( $curpage == $totalpages )
< 				$lastlink = "... <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$curpage\" class=\"snlink\" title=\"{$text['lastpage']}\">$totalpages&raquo;</a>";
< 		}
< 		else {
< 			if( $curpage == $tngpage )
< 				$pagenav .= " <span class=\"snlink snlinkact\">$curpage</span> ";
< 			else
< 				$pagenav .= " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$curpage\" class=\"snlink\">$curpage</a> ";
< 		}
< 	}
< 	if($firstlink || $lastlink) {
< 		$gotolink = " <span class=\"snlink\"><input type=\"text\" class=\"tngpage minifield\" placeholder=\"{$text['page']} #\" name=\"tngpage\" onkeyup=\"if(pageEnter(this,event)) {goToPage(this.next(),'$address','$orgtree',$perpage);}\"/> <input type=\"button\" value=\"{$text['go']}\" class=\"minibutton\" onclick=\"goToPage(this,'$address','$orgtree',$perpage);\"/></span>";
< 	}
< 	else
< 		$gotolink = "";
< 	$pagenav = "<span class=\"normal\">$prevlink $firstlink $pagenav $lastlink $nextlink$gotolink</span>";
< 	
< 	return $pagenav;
< }
< 
< function doMenuItem( $index, $link, $image, $label, $page, $thispage ) {
< 	global $sitever;
< 
< 	if($sitever == "mobile") {
< 		$selected = $page == $thispage ? " selected" : "";
< 		$item = "<option value=\"$link\"$selected>$label</option>\n";
< 	}
< 	else {
< 		$class = $page == $thispage ? " class=\"here\"" : "";
< 		$imagetext = $image ? "<span class=\"tngsmallicon2\" id=\"{$image}-smicon\"></span>" : "";
< 		$item = "<li><a id=\"a$index\" href=\"$link\"$class>$imagetext$label</a></li>\n";
< 	}
< 
< 	return $item;
< }
< 
< function displayDate( $date ) {
< 	global $dates;
< 
< 	$newdate = "";
< 	$dateparts = explode( " ", $date );
< 	foreach( $dateparts as $datepart ) {
< 		if( !is_numeric( $datepart ) ) {
< 			$datepartu = strtoupper( $datepart );
< 			if( isset( $dates[$datepartu] ) )
< 				$datepart = $dates[$datepartu];
< 			elseif( $datepartu == "AND" )
< 				$datepart = $dates['TEXT_AND'];
< 			elseif( $datepartu == "@#DJULIAN@" )
< 				$datepart = "[J]";
< 		}
< 		$newdate .= $newdate ? " $datepart" : $datepart;
< 	}
< 
< 	return $newdate;
< }
< 
< function xmlcharacters($string) {
<     $string = str_replace(array('&','"','\''), array('&amp;','&quot;','&apos;'), $string);
<     return preg_replace('/&amp;([A-Za-z]+;|#[0-9]+;)/',"&$1", $string);
< }
< 
< function generatePassword($flag) {
<   $password = "";
<   $possible = $flag ? "bcdfghjkmnpqrstvwxyz" : "0123456789bcdfghjkmnpqrstvwxyz";
<   $length = 8;
< 
<   $i = 0;
<   while( $i < $length ) {
<     $char = substr( $possible, mt_rand( 0, strlen( $possible ) - 1 ), 1 );
<     if( !strstr( $password, $char ) ) {
<       $password .= $char;
<       $i++;
<     }
<   }
< 
<   return $password;
< }
< 
< function getXrefNotes($noteref, $tree="") {
< 	global $xnotes_table;
< 
< 	preg_match( "/^@(\S+)@/", $noteref, $matches );
< 	if( $matches[1] ) {
< 		$query = "SELECT note from $xnotes_table WHERE noteID = \"$matches[1]\" AND gedcom=\"$tree\"";
< 		$xnoteres = @tng_query( $query );
< 		if( $xnoteres ) {
< 			$xnote = tng_fetch_assoc( $xnoteres );
< 			$note = trim( $xnote['note'] );
< 		}
< 		tng_free_result($xnoteres);
< 	}
< 	else
< 		$note = $noteref;
< 	return $note;
< }
< 
< function getDatePrefix($datestr) {
< 	global $dates;
< 	
< 	$prefix = "";
< 	if($datestr) {
< 		$orgstr = $datestr;
< 		$datestr = strtoupper($datestr);
< 		$prefixes = array($dates['BEF'], $dates['AFT'], $dates['ABT'], $dates['CAL'], $dates['EST']);
< 		foreach($prefixes as $str) {
< 			if(strpos($datestr, strtoupper($str)) === 0) {
< 				$prefix = $str . " ";
< 				break;
< 			}
< 		}
< 	}
< 	return $prefix;
< }
< 
< function getDisplayYear($datestr,$trueyear) {
< 	global $dates;
< 
< 	if($datestr == "Y") 
< 		$display = $dates['Y'];
< 	else {
< 		$newstr = displayDate($datestr);  //translated
< 		$prefix = getDatePrefix($newstr);  //first part of translated string
< 		$rest = trim(substr($newstr,strlen($prefix)));
< 		$parts = explode(" ",$rest);
< 		$numParts = count($parts);
< 		$lastPart = $parts[$numParts-1];
< 		if(is_numeric($lastPart))
< 			$display = $prefix . $lastPart;
< 		else
< 			$display = $trueyear ? $prefix . $trueyear : $newstr;
< 	}
< 	//echo "dd=$datestr, ds=$newstr, np=$numParts, r=$rest, lp=" . $parts[$numParts-1];
< 
< 	return $display;
< }
< 
< function getYears( $row ) {
< 	global $dates;
< 
< 	$years = getGenderIcon( $row['sex'], -1 );
< 	if( $row['allow_living'] && $row['allow_private'] ) {
< 		$deathdate = $row['deathdate'] ? $row['deathdate'] : $row['burialdate'];
< 		$displaydeath = getDisplayYear($deathdate, $row['death']);
< 
< 		$birthdate = $row['birthdate'] ? $row['birthdate'] : $row['altbirthdate'];
< 		$displaybirth = getDisplayYear($birthdate, $row['birth']);
< 
< 		if( $displaybirth || $displaydeath ) {
< 			$years .= " $displaybirth - $displaydeath";
< 			$age = age($row);
< 			if($age)
< 				$years .= " &nbsp;($age)";
< 		}
< 	}
< 
< 	return $years;
< }
< 
< function justYears( $row ) {
< 	if( $row['allow_living'] && $row['allow_private'] ) {
< 		$deathdate = $row['deathdate'] ? $row['deathdate'] : $row['burialdate'];
< 		$displaydeath = getDisplayYear($deathdate, $row['death']);
< 
< 		$birthdate = $row['birthdate'] ? $row['birthdate'] : $row['altbirthdate'];
< 		$displaybirth = getDisplayYear($birthdate, $row['birth']);
< 
< 		if( $displaybirth || $displaydeath ) {
< 			$years = "<span class=\"pedyears\">$displaybirth-$displaydeath</span>";
< 		}
< 	}
< 
< 	return $years;
< }
< 
< function age($row) {
< 	// If person is living calculate todays age
< 	$datum_1_tr = $row['birthdatetr'];
< 	$datum_1 = $row['birthdate'];
< 	$datum_alt_1_tr = $row['altbirthdatetr'];
< 	$datum_alt_1 = $row['altbirthdate'];
< 	$datum_2_tr = $row['deathdatetr'];
< 	$datum_2 = $row['deathdate'];
< 	$datum_alt_2_tr = $row['burialdatetr'];
< 	$datum_alt_2 = $row['burialdate'];
< 	$age = "";
< 
< 	if($row['living'] == "1" && !$datum_2 && !$datum_alt_2) {
< 		// Today
< 		$datum_2_tr = date ("Y-m-d", time() + ( 3600 * $time_offset ) );
< 	}
< 
< 	// Only if one of the FROM and one of the TO dates are filled
< 	if(($datum_1_tr != "0000-00-00" || $datum_alt_1_tr != "0000-00-00") && ($datum_2_tr != "0000-00-00" || $datum_alt_2_tr != "0000-00-00")) {
< 
< 	// FROM date
< 	// $datum1 = result datum1
< 	// $datum_1_tr = date numeric, Datum_1 = date alfanumeric
< 	// $datum_alt_1_tr = alternative date numeric, $datum_alt_1 = alternative date alfanumeric
< 
< 		if($datum_1_tr != "0000-00-00") {
< 			$datum1 = $datum_1_tr;
< 			if(substr($datum_1, 0, 3) == "BEF")
< 			$sign1 = ">";
< 			else {
< 				if (substr($datum_1, 0, 3) == "AFT") {
< 					$sign1 = "&lt;";
< 					$datum1 = substr_replace($datum1, "12-31", 5);
< 				}
< 				else {
< 					if(substr($datum_1, 1, 4) == substr($datum1, 0, 4)) {
< 						$sign1 = "~";
< 						$datum1 = substr_replace($datum1, "07-15", 5);
< 					}
< 					else {
< 						if(substr($datum_1, 0, 2) < 1) {
< 							$sign1 = "~";
< 							$datum1 = substr_replace($datum1, "15", 8);
< 						}
< 					}
< 				}
< 			}
< 		}
< 		else {
< 			$datum1 = $datum_alt_1_tr;
< 			$sign1 = "~";
< 			if(substr($datum_alt_1, 0, 3) == "BEF")
< 				$sign1 = ">";
< 			else {
< 				if(substr($datum_alt_1, 0, 3) == "AFT") {
< 					$sign1 = "&lt;";
< 					$datum1 = substr_replace($datum1, "12-31", 5);
< 				}
< 				else {
< 					if(substr($datum_alt_1, 1, 4) == substr($datum1, 0, 4))
< 				  		$datum1 = substr_replace($datum1, "07-15", 5);
< 					else {
< 						if(substr($datum_alt_1, 0, 2) < 1)
< 							$datum1 = substr_replace($datum1, "15", 8);
< 					}
< 				}
< 			}
< 		}
< 
< 		// TO date
< 		// $datum2 = result datum2
< 		// $datum_2_tr = date numeric, Datum_2 = datum alfanumeric
< 		// $datum_alt_2_tr = alternative date numeric, $datum_alt_2 = alternative date alfanumeric
< 
< 		if($datum_2_tr != "0000-00-00") {
< 			$datum2 = $datum_2_tr;
< 			if(substr($datum_2, 0, 3) == "BEF")
< 				$sign2 = "&lt;";
< 			else {
< 				if(substr($datum_2, 0, 3) == "AFT") {
< 					$sign2 = "&gt;";
< 					$datum2 = substr_replace($datum2, "12-31", 5);
< 				}
< 				else {
< 					if(substr($datum_2, 1, 4) == substr($datum2, 0, 4))
< 						$datum2 = substr_replace($datum2, "07-15", 5);
< 					else {
< 						if(substr($datum2, 8, 2) < 1)
< 							$datum2 = substr_replace($datum2, "15", 8);
< 					}
< 				}
< 			}
< 		}
< 		else {
< 			$datum2 = $datum_alt_2_tr;
< 			$sign2 = "~";
< 			if(substr($datum_alt_2, 0, 3) == "BEF")
< 				$sign2 = "&lt;";
< 			else {
< 				if(substr($datum_alt_2, 0, 3) == "AFT") {
< 					$sign2 = "&gt;";
< 					$datum2 = substr_replace($datum2, "12-31", 5);
< 				}
< 				else {
< 					if(substr($datum_alt_2, 1, 4) == substr($datum2, 0, 4))
< 						$datum2 = substr_replace($datum2, "07-15", 5);
< 					else {
< 						if(substr($datum_alt_2, 0, 2) < 1)
< 							$datum2 = substr_replace($datum2, "15", 8);
< 					}
< 				}
< 			}
< 		}
< 
< 		// age = date2 - date1
< 
< 		$datum1 = substr($datum1, 0, 4) . substr($datum1, 5, 2) . substr($datum1, 8, 2);
< 		$datum2 = substr($datum2, 0, 4) . substr($datum2, 5, 2) . substr($datum2, 8, 2);
< 		$age = $datum2 - $datum1;
< 
< 	// format age
< 
< 		if($age < 0)
< 			$age = "";
< 		else {
< 			if($age >= 0 && $age < 10000)
< 				$age = "0 ";
< 			else {
< 				if($age > 9999 && $age < 100000)
< 					$age = substr($age, 0, 1);
< 				else {
< 					if($age > 99999 && $age < 1000000)
< 						$age = substr($age, 0, 2);
< 					else {
< 						if($age > 999999)
< 							$age = substr($age, 0, 3);
< 					}
< 				}
< 			}
< 		}
< 
< 		// format sign
< 
< 		if ((($sign1 == "<") || ($sign1 == ">")) && (($sign2 == "<") || ($sign2 == ">")))
< 			$sign = "~";
< 		else {
< 			if (($sign1 == "~") || ($sign2 == "~"))
< 				$sign = "~";
< 			else {
< 				if ($sign1 && $sign1 <> " ") $sign = $sign1;
< 				if ($sign2 && $sign2 <> " ") $sign = $sign2;
< 			}
< 		}
< 
< 		if ($age && $sign <> "")
< 			$age = $sign . " " . $age;
< 
< 	}
< 
< 	if ($age <> "") {
< 		global $text;
< 		$age .= " {$text['years']}";
< 	}
< 
< 	return $age;
< }
< 
< function showSmallPhoto( $persfamID, $alttext, $rights, $height, $type=false, $gender="" ) {
< 	global $rootpath, $photopath, $documentpath, $headstonepath, $historypath, $mediapath, $mediatypes_assoc;
< 	global $photosext, $tree, $medialinks_table, $media_table, $text, $cms, $admtext, $tngconfig;
< 
< 	$photo = "";
< 	$photocheck = "";
< 
< 	$query = "SELECT $media_table.mediaID, medialinkID, alwayson, thumbpath, mediatypeID, usecollfolder, newwindow, $media_table.gedcom FROM ($media_table, $medialinks_table)
< 		WHERE personID = \"$persfamID\" AND $medialinks_table.gedcom = \"$tree\" AND $media_table.mediaID = $medialinks_table.mediaID AND defphoto = '1'";
< 	$result = tng_query($query);
< 	$row = tng_fetch_assoc( $result );
< 
< 	if($row['thumbpath']) {
< 		$targettext = $row['newwindow'] ? " target=\"_blank\"" : "";
< 
< 		if( $adm || $row['alwayson'] || $rights || checkLivingLinks($row['mediaID'])) {
< 			$treestr = $tngconfig['mediatrees'] && $row['gedcom'] ? $row['gedcom'] . "/" : "";
< 			$mediatypeID = $row['mediatypeID'];
< 			$usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
< 			$photocheck = "$usefolder/$treestr" . $row['thumbpath'];
< 			$photoref = $cms['tngpath'] . "$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] ));
< 			if($type)
< 				$prefix = "<a href=\"{$cms['tngpath']}admin_editmedia.php?mediaID={$row['mediaID']}\"$targettext>";
< 			else {
< 				$showmedia_url = getURL( "showmedia", 1 );
< 				$prefix = "<a href=\"$showmedia_url" . "mediaID={$row['mediaID']}&amp;medialinkID={$row['medialinkID']}\" title=\"" . str_replace("\"","&#34;",$alttext) . "\"$targettext>";
< 			}
< 			$suffix = "</a>";
< 		}
< 	}
< 	elseif($rights) {
< 		$photoref = $photocheck = $tree ? "$photopath/$tree.$persfamID.$photosext" : "$photopath/$persfamID.$photosext";
< 		$prefix = $suffix = "";
< 	}
< 
< 	$gotfile = $photocheck ? file_exists( "$rootpath$photocheck" ) : false;
< 	if(!$gotfile) {
< 		if($type) {
< 			$query = "SELECT medialinkID FROM ($media_table, $medialinks_table)
< 				WHERE personID = \"$persfamID\" AND $medialinks_table.gedcom = \"$tree\" AND $media_table.mediaID = $medialinks_table.mediaID AND mediatypeID = \"photos\" AND thumbpath != \"\"";
< 			$result2 = tng_query($query);
< 			$numphotos = tng_num_rows($result2);
< 			tng_free_result($result2);
< 			if($numphotos) {
< 				//if photos exist, show box with link to sort page where they can pick a default
< 				$photo = "<a href=\"admin_ordermedia.php?newlink1=$persfamID&tree1=$tree&mediatypeID=photos&linktype1=$type\" class=\"smaller\" style=\"display:block;padding:8px;border:1px solid black;margin-right:6px;text-align:center\">{$admtext['choosedef']}</a>";
< 			}
< 		}
< 		elseif( $gender && $tngconfig['usedefthumbs'] ) {
< 			if($gender == "M") {
< 				$photocheck = "img/male.jpg";
< 			}
< 			elseif ($gender == "F") {
< 				$photocheck = "img/female.jpg";
< 			}
< 			$photoref = $cms['tngpath'] . $photocheck;
< 			$gotfile = file_exists( "$rootpath$photocheck" );
< 		}
< 	}
< 	if( $gotfile ) {
< 		$border = $height ? 0 : 1;
< 		$align = $height ? "" : " style=\"float:left;\"";
< 		$photoinfo = @GetImageSize( "$rootpath$photocheck" );
< 		$photohtouse = $height ? $height : 100;
< 		if( $photoinfo[1] <= $photohtouse ) {
< 			$photohtouse = $photoinfo[1];
< 			$photowtouse = $photoinfo[0];
< 		}
< 		else
< 			$photowtouse = intval( $photohtouse * $photoinfo[0] / $photoinfo[1] ) ;
< 		$photo = "$prefix<img src=\"$photoref\" border=\"$border\" alt=\"" . str_replace("\"","&#34;",$alttext) . "\" width=\"$photowtouse\" height=\"$photohtouse\" class=\"smallimg\"{$align}/>$suffix";
< 	}
< 	tng_free_result( $result );
< 
< 	return $photo;
< }
< 
< function placeImage($place) {
< 	global $placesearch_url, $cms;
< 
< 	return "<a href=\"$placesearch_url" . "psearch=" . urlencode($place) . "\" class=\"pl\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" alt=\"\" class=\"placeimg\"/></a>";
< }
< 
< function checkMaintenanceMode($area){
< 	global $tngconfig;
< 
< 	if(strpos($_SERVER['SCRIPT_NAME'],"/suggest.php") === FALSE && strpos($_SERVER['SCRIPT_NAME'],"admin") === FALSE && isset($tngconfig['maint']) && $tngconfig['maint'] 
< 		&& (!$_SESSION['allow_admin'] || $_SESSION['assignedtree']) && strpos($_SERVER['SCRIPT_NAME'],"/index.") === FALSE) {
< 		$maint_url = $area ? "adminmaint.php" : getURL("maint",0);
< 		header("Location:$maint_url");
< 		exit;
< 	}
< }
< 
< function cleanIt($string) {
< 	global $session_charset;
< 	$string = @htmlspecialchars(preg_replace("/\n/"," ",$string), ENT_QUOTES, $session_charset);
< 	$string = preg_replace("/\"/", "&#34;",$string);
< 	$string = preg_replace("/</", "&lt;",$string);
< 	$string = preg_replace("/>/", "&gt;",$string);
< 	$string = preg_replace("/\t/", "&#09;",$string);
< 	$string = str_replace("`","",$string);
< 	$string = tng_real_escape_string($string);
< 
< 	return $string;
< }
< 
< function filterString($string) {
< 	$string = strip_tags($string);
< 	$string = tng_real_escape_string($string);
< 
< 	return $string;
< }
< 
< 
< function truncateIt($string,$length) {
< 	global $notrunc;
< 
< 	if($length > 0 && !$notrunc && strlen($string) > $length) {
< 		$truncated = substr(strip_tags($string),0,$length);
< 		$truncated = substr($truncated,0,strrpos($truncated,' ')) . '&hellip;';
< 	}
< 	else
< 		$truncated = $string;
< 	return $truncated;
< }
< 
< function tng_strtoupper($string) {
< 	global $session_charset;
< 
< 	$ucharset = strtoupper($session_charset);
< 	$enc = function_exists('mb_detect_encoding') ? @mb_detect_encoding($string) : "";
< 	if($enc && strtoupper($enc) == "UTF-8" && $ucharset == "UTF-8")
< 		$string = mb_strtoupper($string, "UTF-8");
< 	else
< 		$string = strtoupper($string);
< 
< 	return $string;
< }
< 
< function tng_strtolower($string) {
< 	global $session_charset;
< 
< 	$ucharset = strtoupper($session_charset);
< 	$enc = function_exists('mb_detect_encoding') ? @mb_detect_encoding($string) : "";
< 	if($enc && strtoupper($enc) == "UTF-8" && $ucharset == "UTF-8")
< 		$string = mb_strtolower($string, "UTF-8");
< 	else
< 		$string = strtolower($string);
< 
< 	return $string;
< }
< 
< function tng_utf8_decode($text) {
< 	global $session_charset;
< 
< 	$ucharset = strtoupper($session_charset);
< 	if($ucharset == "ISO-8859-1") {
< 		$text = utf8_decode($text);
< 	}
< 	elseif($ucharset == "ISO-8859-2") {
< 		$text = utf82iso88592($text);
< 	}
< 	return $text;
< }
< 
< function utf82iso88592_chris($text) {
<     if (function_exists('mb_convert_encoding'))
<         return mb_convert_encoding ($text,'ISO-8859-2','UTF-8');
<     return str_replace(array("\xC4\x85", "\xC4\x84","\xC4\x87","\xC4\x86","\xC4\x99","\xC4\x98","\xC5\x82","\xC5\x81",
<     	"\xC3\xB3","\xC3\x93","\xC5\x9B","\xC5\x9A","\xC5\xBC","\xC5\xBB","\xC5\xBA","\xC5\xB9","\xc5\x84","\xc5\x83"),
<     	array("\xB1","\xA1","\xE6","\xC6","\xEA","\xCA","\xB3","\xA3","\xF3","\xD3","\xB6","\xA6","\xBF","\xAF","\xBC","\xAC","\xF1","\xD1"), $text
<     );
< }
< 
< function utf82iso88592($text) {
< 	$text = str_replace("\xC4\x85", '±', $text);
< 	$text = str_replace("\xC4\x84", '¡', $text);
< 	$text = str_replace("\xC4\x87", 'æ', $text);
< 	$text = str_replace("\xC4\x86", 'Æ', $text);
< 	$text = str_replace("\xC4\x99", 'ê', $text);
< 	$text = str_replace("\xC4\x98", 'Ê', $text);
< 	$text = str_replace("\xC5\x82", '³', $text);
< 	$text = str_replace("\xC5\x81", '£', $text);
< 	$text = str_replace("\xC3\xB3", 'ó', $text);
< 	$text = str_replace("\xC3\x93", 'Ó', $text);
< 	$text = str_replace("\xC5\x9B", '¶', $text);
< 	$text = str_replace("\xC5\x9A", '¦', $text);
< 	$text = str_replace("\xC5\xBC", '¿', $text);
< 	$text = str_replace("\xC5\xBB", '¯', $text);
< 	$text = str_replace("\xC5\xBA", '¼', $text);
< 	$text = str_replace("\xC5\xB9", '¬', $text);
< 	$text = str_replace("\xc5\x84", 'ñ', $text);
< 	$text = str_replace("\xc5\x83", 'Ñ', $text);
< 
< 	return $text;
< }
< 
< function getAllTextPath() {
< 	global $rootpath, $mylanguage, $language, $languages_path, $endrootpath, $cms, $text, $admtext, $dates;
< 
< 	$rootpath = trim($rootpath);
< 	if($rootpath && strpos($rootpath,"http") !== 0 ) {
< 		$thislanguage = trim($mylanguage ? $mylanguage : $languages_path . $language);
< 		if(strpos($thislanguage,"http") !== 0) {
< 			if($cms['support'])
< 				@include_once($rootpath . $cms['tngpath'] . "$thislanguage/alltext.php");
< 			else
< 				@include_once($rootpath . $endrootpath . "$thislanguage/alltext.php");
< 		}
< 	}
< }
< 
< function attachPrefixSuffix($entityID, $type) {
< 	global $tngconfig;
< 
< 	switch($type) {
< 		case "I":
< 			$prefix = $tngconfig['personprefix'];
< 			$suffix = $tngconfig['personsuffix'];
< 			break;
< 		case "F":
< 			$prefix = $tngconfig['familyprefix'];
< 			$suffix = $tngconfig['familysuffix'];
< 			break;
< 		case "S":
< 			$prefix = $tngconfig['sourceprefix'];
< 			$suffix = $tngconfig['sourcesuffix'];
< 			break;
< 		case "R":
< 			$prefix = $tngconfig['repoprefix'];
< 			$suffix = $tngconfig['reposuffix'];
< 			break;
< 		default:
< 			$prefix = $suffix = "";
< 			break;
< 	}
< 	$entityID = tng_utf8_decode(trim($entityID));
< 	$prefixlen = strlen($prefix);
< 	$suffixlen = strlen($suffix);
< 	$entity_prefix = substr($entityID,0,$prefixlen);
< 	$entity_suffix = substr($entityID,-1 * $suffixlen);
< 	if($prefix && $entity_prefix != $prefix) $entityID = $prefix . $entityID;
< 	if($suffix && $entity_suffix != $suffix) $entityID = $entityID . $suffix;
< 
< 	return $entityID;
< }
< 
< function formatInternalDate($truedate) {
< 	if($truedate == "0000-00-00")
< 		return "";
< 	$parts = explode("-",$truedate);
< 	$newdate = "";
< 	$numparts = 0;
< 	foreach($parts as $part) {
< 		if($part != "0000" && $part != "00") 
< 			$numparts++;
< 		elseif($part == "00")
< 			$part = "01";
< 		if($newdate)
< 			$newdate .= "-";
< 		$newdate .= $part;
< 	}
< 
< 	if($numparts == 1)
< 		$formatted = $parts[0];
< 	else {
< 		$newdate = date_create($newdate);
< 		if($numparts == 2)
< 			$formatted = date_format($newdate,"M Y");
< 		else
< 			$formatted = date_format($newdate,"j M Y");
< 	}
< 
< 	return $formatted;
< }
< 
< function isConnected() {
< 	global $tngconfig;
< 
< 	if($tngconfig['offline'])
< 		return false;
< 	else
< 		return true;
< 
<     // use 80 for http or 443 for https protocol
<     //$connected = @fsockopen("www.google.com", 80);
<     //if ($connected){
<     //    fclose($connected);
<     //    return true; 
<     //}
<     //else
< 	//    return false;
< }
---
> <?php
> @ini_set( "session.bug_compat_warn", "0" );
> @ini_set( "allow_url_fopen", "0" );
> $http = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' )) ? 'https' : 'http';
> 
> @set_time_limit(0);
> //set binary to "binary" for more sensitive searches
> $binary = "";
> $notrunc = 0; //don't truncate if link doesn't go to showmedia
> $envelope = false;
> 
> if( isset($offset) && $offset && !is_numeric($offset) ) die ("invalid offset");
> //$endrootpath = "";
> 
> $newroot = preg_replace( "/\//", "", $rootpath );
> $newroot = preg_replace( "/ /", "", $newroot );
> $newroot = preg_replace( "/\./", "", $newroot );
> $errorcookiename = "tngerror_$newroot";
> if( isset($_COOKIE[$errorcookiename]) ) {
> 	$message = $_COOKIE[$errorcookiename];
> 	$error = $message;
> 	setcookie("tngerror_$newroot", "", time()-31536000, "/");
> }
> else
> 	$error = "";
> 
> function debugPrint($obj) {
> 	echo "<pre>\n";
> 	print_r($obj);
> 	echo "</pre>\n";
> }
> 
> function pageNotFound() {
> 	header('HTTP/1.0 404 Not Found');
> 	die;
> }
> 
> function constructName($firstnames, $lastnames, $title, $suffix, $order) {
> 	if($title) $title .= " ";
> 	if($firstnames) $firstnames .= " ";
> 
> 	switch($order) {
> 		case "3":
> 			if($lastnames && $firstnames) $lastnames .= ",";
> 			if($lastnames) $lastnames .= " ";
> 			$namestr = trim("$lastnames $title$firstnames$suffix");
> 			break;
> 		case "2":
> 			if($lastnames) $lastnames .= " ";
> 			$namestr = trim("$title$lastnames$firstnames");
> 			if($suffix) $namestr .= ", $suffix";
> 			break;
> 		default:
> 			$namestr = trim("$title$firstnames$lastnames");
> 			if($suffix) $namestr .= ", $suffix";
> 			break;
> 	}
> 
> 	return preg_replace('/\s\s+/'," ",$namestr);
> }
> 
> function getName( $row, $hcard = null ) {
> 	global $nameorder;
> 
> 	$locnameorder = !empty($row['nameorder']) ? $row['nameorder'] : (!empty($nameorder) ? $nameorder : 1);
> 	$namestr = getNameUniversal($row, $locnameorder, $hcard);
> 
> 	return $namestr;
> }
> 
> function getNameRev( $row, $hcard = null ) {
> 	global $nameorder;
> 
> 	$locnameorder = !empty($row['nameorder']) ? $row['nameorder'] : (!empty($nameorder) ? $nameorder : 1);
> 	if($locnameorder != 2) $locnameorder = 3;
> 	$namestr = getNameUniversal($row, $locnameorder, $hcard);
> 
> 	return $namestr;
> }
> 
> function getNameUniversal($row, $order, $hcard=null) {
> 	global $text, $admtext, $tngconfig, $nonames;
> 
> 	$indexlist= array('lastname','firstname','lnprefix','allow_living','allow_private');
> 	foreach($indexlist as $index) 
> 		if(!isset($row[$index])) $row[$index] = '';
> 
> 	//$nonames = showNames($row);
> 	$lastname = trim( $row['lnprefix']." ".$row['lastname'] );
> 	if(!empty($tngconfig['ucsurnames'])) $lastname = tng_strtoupper($lastname);
> 	if($hcard) {
> 		$lastname = "<span class=\"family-name\">" . $lastname . "</span>";
> 		$title = $suffix = "";
> 	}
> 	else {
> 		if( !isset($row['title'])) $row['title'] = '';
> 		if( !isset($row['prefix'])) $row['prefix'] = '';
> 		$title = $row['title'] && ($row['title'] == $row['prefix']) ? $row['title'] : trim($row['title'] . " " . $row['prefix']);
> 
> 		$suffix = isset($row['suffix']) ? $row['suffix'] : '';
> 	}
> 	if( ($row['allow_living'] || !$nonames) && ($row['allow_private'] || !$tngconfig['nnpriv']) ) {
> 		$firstname = $hcard ? "<span class=\"given-name\">" . $row['firstname'] . "</span>" : $row['firstname'];
> 		$namestr = constructName($firstname, $lastname, $title, $suffix, $order);
> 	}
> 	elseif( $row['living'] && !$row['allow_living'] && $nonames == 1 )
> 		$namestr = $text['living'];
> 	elseif( $row['private'] && !$row['allow_private'] && $tngconfig['nnpriv'] == 1 )
> 		$namestr = $admtext['text_private'];
> 	else {  //initials
> 		$firstname = $hcard ? "<span class=\"given-name\">" . initials( $row['firstname']) . "</span>" : initials( $row['firstname']);
> 		$namestr = constructName($firstname, $lastname, "", $suffix, $order); //title intentionally omitted
> 	}
> 
> 	if($hcard) $namestr = "<span class=\"n\">$namestr</span>";
> 	return $namestr;
> }
> 
> function getFamilyName( $row ) {
> 	global $text, $people_table;
> 
> 	$righttree = checktree($row['gedcom']);
> 
> 	$hquery = "SELECT personID, firstname, lnprefix, lastname, title, prefix, suffix, birthdate, birthdatetr, altbirthdate, altbirthdatetr, living, private, branch, nameorder, gedcom FROM $people_table WHERE personID = \"{$row['husband']}\" AND gedcom = \"{$row['gedcom']}\"";
> 	$hresult = tng_query($hquery) or die ($text['cannotexecutequery'] . ": $hquery");
> 	$hrow = tng_fetch_assoc( $hresult );
> 
> 	if($hrow != null) {
> 		$hrights = determineLivingPrivateRights($hrow, $righttree);
> 		$hrow['allow_living'] = $hrights['living'];
> 		$hrow['allow_private'] = $hrights['private'];
> 		$husbname = getName( $hrow );
> 	}
> 	else
> 		$husbname = "";
> 	tng_free_result( $hresult );
> 
> 	$wquery = "SELECT personID, firstname, lnprefix, lastname, title, prefix, suffix, birthdate, birthdatetr, altbirthdate, altbirthdatetr, living, private, branch, nameorder, gedcom FROM $people_table WHERE personID = \"{$row['wife']}\" AND gedcom = \"{$row['gedcom']}\"";
> 	$wresult = tng_query($wquery) or die ($text['cannotexecutequery'] . ": $wquery");
> 	$wrow = tng_fetch_assoc( $wresult );
> 
> 	if($wrow != null) {
> 		$wrights = determineLivingPrivateRights($wrow, $righttree);
> 		$wrow['allow_living'] = $wrights['living'];
> 		$wrow['allow_private'] = $wrights['private'];
> 		$wifename = getName( $wrow );
> 	}
> 	else
> 		$wifename = "";
> 	tng_free_result( $wresult );
> 
> 	return "$husbname / $wifename";
> }
> 
> function initials ($allnames) {
>     $initials = "";
>     $allnames = preg_replace('/[^\p{L}( )-]/u',"",$allnames); // remove UTF non-letter leaving ( )-
>     $names = explode(" ",$allnames);
> 
>     foreach($names as $name) {
>         $name = preg_replace('/^-|-$/',"",$name); // leave hyphens only inside name (just for case)
>         $chars = preg_split("//u", $name, -1, PREG_SPLIT_NO_EMPTY); // array of UTF chars
>         if(empty($chars) || (reset($chars) == "(" && end($chars) == ")" )) // spec case - name in brackets - ignore
>            continue;
>         elseif(in_array("-",$chars)) { // spec case - compound name like Jean-Marie
>             $initials .= $chars[0];
>             foreach($chars as $pos=>$ch) {
>             	if($ch=="-")
>             		$initials .= "-{$chars[$pos+1]}";
>             }
>         }
>         else
>             $initials .= "$chars[0].";
>     }
> 
>     return $initials;
> }
> 
> function showNames($row) {
> 	global $nonames, $tngconfig;
> 
> 	return $row['private'] ? $tngconfig['nnpriv'] : $nonames;
> }
> 
> function getGenderIcon($gender, $valign) {
> 	global $text, $cms;
> 
> 	$icon = $genderstr = "";
> 	if($gender) {
> 		if($gender == "M") $genderstr = "male";
> 		elseif($gender == "F") $genderstr = "female";
> 		if($genderstr)
> 			$icon = "<img src=\"{$cms['tngpath']}img/tng_$genderstr.gif\" width=\"11\" height=\"11\" alt=\"" . $text[$genderstr] . "\" style=\"vertical-align: " . $valign . "px; border: 0px;\"/>";
> 	}
> 	return $icon;
> }
> 
> function getAltBirthInfo($row) {
> 	global $tngconfig, $text, $admtext;
> 
> 	if(!empty($row['altbirthtype']))
> 		$altbirthtype = $row['altbirthtype'];
> 	else
> 		$altbirthtype = empty($tngconfig['altbirth']) ? "CHR" : explode(',',$tngconfig['altbirth'])[0];
> 
> 	$label = isset($admtext[$altbirthtype]) ? $admtext[$altbirthtype] : $altbirthtype;
> 
> 	return [$altbirthtype, $label];
> }
> 
> function getURL( $destination, $args, $ext=".php") {
>         global $cms;
> 
> 	if( $cms['support'] ) {
> 		if (class_exists('TNGcms')) {
> 			$url=TNGcms::getURL($destination, $args, $ext=".php", $cms);
> 		}
> 		else
> 			$url = $args ? $cms['url'] . "=$destination&amp;" : $cms['url'] . "=$destination";
> 	}
> 	else
> 		$url = $args ? $cms['tngpath'] . $destination . $ext . "?" : $cms['tngpath'] . $destination . $ext;
>     if (substr($url, -2) == '//')
>         $url = substr($url, 0, -1);
> 
> 	return $url;
> }
> 
> function getFORM( $action, $method, $name, $id, $onsubmit=null ) {
> 	global $cms;
> 
>     if( !$cms['support'] )
>         $url = $action ? $cms['tngpath'] . $action . ".php" : "";
>     elseif(class_exists('TNGcms'))
>         return TNGcms::getFORM($action, $method, $name, $id, $cms);
>     elseif($cms['support']=="joomla")  // backwards compatibility
>         $url = "index.php";
>     elseif($cms['support']=="zikula")  // backwards compatibility
>         $url = "index.php";
>     else
>         $url = "modules.php";          // backwards compatibility
> 
> 	$formstr = "<form action=\"" . (empty($url) ? "javascript:void(0);" : $url) . "\"";
> 	if( $method )
> 		$formstr .= " method=\"$method\"";
> 	if( $name )
> 		$formstr .= " name=\"$name\"";
> 	if( $id )
> 		$formstr .= " id=\"$id\"";
> 	if( $onsubmit )
> 		$formstr .= " onsubmit=\"$onsubmit\"";
> 
> 	$formstr .= ">\n";
> 
> 	if( $cms['support'] ) {
> 		if ($cms['support']=="joomla") {
> 			$formstr .="<input type=\"hidden\" name=\"option\" value= \"com_tngbridge\" />\n";
> 			$formstr .="<input type=\"hidden\" name=\"Itemid\" value=\"39\" /> \n";
> 			$formstr .="<input type=\"hidden\" name=\"url\" value=\"$action\" /> \n";
> 		}
>         elseif($cms['support']=="zikula") {
>             $formstr .= "<input type=\"hidden\" name=\"module\" value=\"{$cms['module']}\" />\n";
>             $formstr .= "<input type=\"hidden\" name=\"show\" value=\"$action\" />\n";
>         }
> 		else {
> 			$formstr .= "<input type=\"hidden\" name=\"op\" value=\"modload\" />\n";
> 			$formstr .= "<input type=\"hidden\" name=\"name\" value=\"{$cms['module']}\" />\n";
> 			$formstr .= "<input type=\"hidden\" name=\"file\" value=\"$action\" />\n";
> 		}
> 	}
> 
> 	return $formstr;
> }
> 
> function isPhoto($row) {
> 	global $imagetypes;
> 
> 	if( $row['form'] )
> 		$form = strtoupper($row['form']);
> 	else {
> 		preg_match( "/\.(.+)$/", $row['path'], $matches );
>  		$form = isset($matches[1]) ? strtoupper($matches[1]) : '';
> 	}
> 
> 	if($row['path'] && !$row['abspath'] && in_array($form,$imagetypes))
> 		return true;
> 	else
> 		return false;
> }
> 
> function getEventDisplay( $displaystr ) {
> 	global $mylanguage, $languages_path;
> 
> 	$dispvalues = explode( "|", $displaystr );
> 	$numvalues = count( $dispvalues );
> 	if( $numvalues > 1 ) {
> 		$displayval = "";
> 		for( $i = 0; $i < $numvalues; $i += 2 ) {
> 			$lang = $dispvalues[$i];
> 			if( $mylanguage == $languages_path . $lang ) {
> 				$displayval = $dispvalues[$i+1];
> 				break;
> 			}
> 		}
> 	}
> 	else
> 		$displayval = $displaystr;
> 
> 	return $displayval;
> }
> 
> function checkbranch( $branch ) {
> 	global $assignedbranch;
> 
> 	return ( !$assignedbranch || ( FALSE !== ( $pos = strpos( $branch, $assignedbranch, 0 ) ) ) ) ? 1 : 0;
> }
> 
> function checktree( $tree ) {
> 	global $assignedtree;
> 
> 	return ( !$assignedtree || $tree == $assignedtree );
> }
> 
> //The following function is now obsolete
> function determineLivingRights($row, $usedb = 0, $allow_living_db = 0, $allow_private_db = 0) {
> 	global $livedefault, $allow_living, $allow_private, $rightbranch, $tree;
> 
>     $allow_living_loc = $usedb ? $allow_living_db : $allow_living;
>     $allow_private_loc = $usedb ? $allow_private_db : $allow_private;
> 
> 	$rightbranch = checkbranch($row['branch']) ? 1 : 0;
> 	//echo "myg=" . $_SESSION['mygedcom'] . ", myp=" . $_SESSION['mypersonID'] . "rp=" . $row['personID'] . "<br>";
> 	//change $tree back to $row[gedcom] after all calling pages can be updated
>     $living = $row['living'];
>     $private = $row['private'];
> 
>     if(!$private && !$living) {
>         $livingrights = 1;
>     }
>     else {
>         $yes_living = $yes_private = true;
>  		if(!empty($row['personID']))
> 			$user_person = !empty($_SESSION['mypersonID']) && $_SESSION['mygedcom'] == $tree && $_SESSION['mypersonID'] == $row['personID'];
> 		else
> 			$user_person = !empty($_SESSION['mypersonID']) && $_SESSION['mygedcom'] == $tree && ($_SESSION['mypersonID'] == $row['husband'] || $_SESSION['mypersonID'] == $row['wife']);
>         if($living) {
>             if($livedefault != 2) {   //everyone has living rights
>                 if((!$allow_living_loc || !$rightbranch) && !$user_person) {
>                     $yes_living = false;
>                     //echo "fn={$row['firstname']}, al=$allow_living, br={$row['branch']}, rb=$rightbranch, up=$user_person<br>";
>                 }
>             }
>         }
>         if($private) {
>             if((!$allow_private_loc || !$rightbranch) && !$user_person)
>                 $yes_private = false;
>         }
>         $livingrights = $yes_living && $yes_private ? 1 : 0;
>     }
> 	//$livingrights = ((!$row['private'] || $allow_private) && (!$row['living'] || $livedefault == 2)) || ($allow_living && $rightbranch) || ($_SESSION['mypersonID'] && $_SESSION['mygedcom'] == $tree && $_SESSION['mypersonID'] == $row['personID']) ? 1 : 0;
> 
> 	return $livingrights;
> }
> //end obsolete function
> 
> function determineLivingPrivateRights($row, $pagerighttree = -1, $pagerightbranch = -1) {
> 	global $livedefault, $ldsdefault, $allow_living, $allow_private, $allow_private_notes, $allow_lds, $tree;
> 
> 	if(!isset($row['living'])) $row['living'] = 0;
> 	if(!isset($row['private'])) $row['private'] = 0;
> 	if(!isset($row['branch'])) $row['branch'] = '';
> 	if(!isset($row['gedcom'])) $row['gedcom'] = '';
> 	if(!isset($row['personID'] )) $row['personID'] = '';
> 
> 	$rights = array('private' => true, 'living' => true, 'private_notes' => true, 'lds' => (!$ldsdefault ? true : false));
> 
> 	$living = $livedefault == 2 ? false : $row['living'];
>     $private = $row['private'];
> 
> 	//check tree
> 	$righttree = $pagerighttree >= 0 ? $pagerighttree : checktree($row['gedcom']);
> 	$righttreebranch = $pagerightbranch >= 0 ? $pagerightbranch : ($righttree ? checkbranch($row['branch']) : false);
> 	if(!empty($row['personID']))
> 		$user_person = !empty($_SESSION['mypersonID']) && $_SESSION['mygedcom'] == $tree && $_SESSION['mypersonID'] == $row['personID'];
> 	else
> 		$user_person = !empty($_SESSION['mypersonID']) && $_SESSION['mygedcom'] == $tree && ((!empty($row['husband']) && $_SESSION['mypersonID'] == $row['husband']) || (!empty($row['wife']) && $_SESSION['mypersonID'] == $row['wife']));
> 
>     if($private || $living || $ldsdefault == 2) {
>     	if($living && (!$allow_living || !$righttreebranch) && !$user_person)
>     		$rights['living'] = false;
> 
>     	if($private && (!$allow_private || !$righttreebranch) && !$user_person)
>     		$rights['private'] = false;
> 
> 		if($ldsdefault == 2 && (($allow_lds && $righttreebranch) || $user_person))
> 			$rights['lds'] = true;
> 		//echo $righttree . " " . $righttreebranch . " " . $row['branch'] . " | ";
>     }
>    	$rights['both'] = $rights['private'] && $rights['living'];
> 
> 	if((!$allow_private_notes || !$righttreebranch) && !$user_person)
> 		$rights['private_notes'] = false;
> 
> 	return $rights;
> }
> 
> function determineLDSRights($notree = false) {
> 	global $ldsdefault, $allow_lds, $tree, $assignedtree;
> 
> 	$treeOK = !$tree || $notree || !$assignedtree || $tree == $assignedtree;
> 	$ldsOK = !$ldsdefault || ($ldsdefault == 2 && $allow_lds && $treeOK) ? true : false;
> 
> 	return $ldsOK;
> }
> 
> function getLivingPrivateRestrictions($table, $firstname, $allOtherInput) {
> 	global $livedefault, $nonames, $tngconfig, $allow_living, $allow_private, $assignedtree, $assignedbranch, $people_table;
> 
> 	$query = "";
> 	if($table) $table .= ".";
> 	$limitedLivingRights = $allow_living && !$livedefault;
> 	$limitedPrivateRights = $allow_private;
> 	$allLivingRights = $livedefault == 2 || ($allow_living && !$assignedtree);
> 	$allPrivateRights = $allow_private && !$assignedtree;
> 	$livingNameRestrictions = $livedefault == 1 || (!$livedefault && ($nonames == 1 || ($nonames == 2 && $firstname)) && !$allLivingRights);
> 	$privateNameRestrictions = ($tngconfig['nnpriv'] == 1 || ($tngconfig['nnpriv'] == 2 && $firstname)) && !$allPrivateRights;
> 
> 	if($livingNameRestrictions || $privateNameRestrictions || $allOtherInput) {
> 		$atreestr = $matchperson = "";
> 		if(isset($_SESSION['mypersonID']) && ($table == $people_table || $table == "p.")) {			//this is me (current user)
> 			$matchperson = " OR ({$table}gedcom = \"{$_SESSION['mygedcom']}\" AND {$table}personID = \"{$_SESSION['mypersonID']}\")";
> 		}
> 		if($assignedtree) {
> 			//rights are limited to a tree or tree+branch
> 			$atreestr = $assignedbranch ? " OR ({$table}gedcom = \"$assignedtree\" AND {$table}branch LIKE \"%$assignedbranch%\")" : " OR {$table}gedcom = \"$assignedtree\"";
> 		}
> 		if(($livingNameRestrictions && $privateNameRestrictions) || ($allOtherInput && !$allLivingRights && !$allPrivateRights)) {
> 			if($limitedLivingRights && $limitedPrivateRights)
> 				$query .= "(({$table}living != 1 && {$table}private != 1)$atreestr$matchperson)";
> 			elseif($limitedLivingRights)
> 				$query .= "({$table}private != 1 && ({$table}living != 1$atreestr$matchperson))";
> 			elseif($limitedPrivateRights)
> 				$query .= "({$table}living != 1 && ({$table}private != 1$atreestr$matchperson))";
> 			else
> 				$query .= "(({$table}living !=1 && {$table}private != 1)$matchperson)";
> 		}
> 		else {
> 			if($livingNameRestrictions || ($allOtherInput && !$allLivingRights)) {
> 				if($limitedLivingRights)
> 					$query .= "({$table}living != 1$atreestr$matchperson)";
> 				else
> 					$query .= "({$table}living != 1$matchperson)";
> 			}
> 			elseif($privateNameRestrictions || ($allOtherInput && !$allPrivateRights)) {
> 				if($limitedPrivateRights)
> 					$query .= "({$table}private != 1$atreestr$matchperson)";
> 				else
> 					$query .= "({$table}private != 1$matchperson)";
> 			}
> 		}
> 	}
> 
> 	return $query;
> }
> 
> function checkLivingLinks($itemID) {
> 	global $livedefault, $assignedtree, $assignedbranch, $people_table, $text, $medialinks_table, $sources_table, $citations_table, $families_table, $allow_living, $allow_private;
> 
> 	if(($livedefault == 2 || $allow_living) && $allow_private && !$assignedtree)
> 		return true;
> 
> 	$icriteria = $fcriteria = "";
> 	if (!$allow_living && !$allow_private) {
> 		// Viewer can not see media of Living individuals regardless of tree/branch,
> 		// So need to check all links to this media for living individuals (don't narrow the search.)
> 		$icriteria = $fcriteria = "AND (living = 1 OR private = 1)";
> 	}
> 	else {
> 		// Viewer can see some media of Living individuals, now figure if there are some the viewer should not see
> 		if( $assignedtree && $livedefault != 2 ) {
> 			// Should not be able to see Living individuals in other Trees, so narrow search to those other Trees
> 			$icriteria = "$people_table.gedcom != \"$assignedtree\"";
> 			$fcriteria = "$families_table.gedcom != \"$assignedtree\"";
> 
> 			if ($assignedbranch ) { // Note: must have a Tree selected to have a Branch
> 				// Should not be able to see Living individuals in other Branches either, so need to check for those too.
> 				$bcriteria = "OR !(branch LIKE \"%$assignedbranch%\")";
> 				$icriteria = "($icriteria $bcriteria)";
> 				$fcriteria = "($fcriteria $bcriteria)";
> 			}
> 		}
> 		if(!$allow_living && $livedefault != 2) {
> 			$icriteria = $icriteria ? "AND (living = 1 OR ($icriteria AND private = 1))" : "AND living = 1";
> 			$fcriteria = $fcriteria ? "AND (living = 1 OR ($fcriteria AND private = 1))" : "AND living = 1";
> 		}
> 		elseif(!$allow_private) {  //!$allow_private_db
> 			$icriteria = $icriteria ? "AND (private = 1 OR ($icriteria AND living = 1))" : "AND private = 1";
> 			$fcriteria = $fcriteria ? "AND (private = 1 OR ($fcriteria AND living = 1))" : "AND private = 1";
> 		}
> 		else {
> 			if($icriteria) $icriteria = "AND $icriteria AND (living = 1 OR private = 1)";
> 			if($fcriteria) $fcriteria = "AND $fcriteria AND (living = 1 OR private = 1)";
> 		}
> 	}
> 
> 	if($icriteria) {
> 		// Now find Living individuals linked to the media that fit the criteria set above.
> 		$query = "SELECT count(*) as pcount
> 			FROM ($medialinks_table, $people_table)
> 			WHERE $medialinks_table.personID = $people_table.personID
> 				AND $medialinks_table.gedcom = $people_table.gedcom
> 				AND $medialinks_table.mediaID = '$itemID'
> 				$icriteria";
> 		$result = tng_query($query);
> 		$row = tng_fetch_assoc( $result );
> 		tng_free_result( $result );
> 		if( $row['pcount'] )
> 			return false;  // found at least one
> 	}
> 
> 	if($fcriteria) {
> 		$query = "SELECT count(*) as pcount
> 			FROM ($medialinks_table, $families_table)
> 			WHERE $medialinks_table.personID = $families_table.familyID
> 				AND $medialinks_table.gedcom = $families_table.gedcom
> 				AND $medialinks_table.mediaID = '$itemID'
> 				$fcriteria";
> 		$result = tng_query($query);
> 		$row = tng_fetch_assoc( $result );
> 		tng_free_result( $result );
> 		if( $row['pcount'] )
> 			return false;  // found at least one
> 	}
> 	/*
>  	$query = "SELECT count(*) as pcount
> 		FROM ($medialinks_table, $sources_table, $citations_table, $people_table)
> 		WHERE $medialinks_table.personID = $sources_table.sourceID
> 			AND $medialinks_table.gedcom = $sources_table.gedcom
> 			AND $medialinks_table.gedcom = $citations_table.gedcom
> 			AND $medialinks_table.gedcom = $people_table.gedcom
> 			AND $sources_table.sourceID = $citations_table.sourceID
> 			AND $citations_table.persfamID = $people_table.personID
> 			AND $medialinks_table.mediaID = '$itemID'
> 			AND living = 1 $criteria";
> 	$result = tng_query($query);
> 	$row = tng_fetch_assoc( $result );
>    	tng_free_result( $result );
> 	if( $row['pcount'] )
> 		return false;
> 
>  	$query = "SELECT count(*) as pcount
> 		FROM ($medialinks_table, $sources_table, $citations_table, $families_table)
> 		WHERE $medialinks_table.personID = $sources_table.sourceID
> 			AND $medialinks_table.gedcom = $sources_table.gedcom
> 			AND $medialinks_table.gedcom = $citations_table.gedcom
> 			AND $medialinks_table.gedcom = $families_table.gedcom
> 			AND $sources_table.sourceID = $citations_table.sourceID
> 			AND $citations_table.persfamID = $families_table.familyID
> 			AND $medialinks_table.mediaID = '$itemID'
> 			AND living = 1 $fcriteria";
> 	$result = tng_query($query);
> 	$row = tng_fetch_assoc( $result );
>    	tng_free_result( $result );
> 	if( $row['pcount'] )
> 		return false;
> 	*/
> 
>     // so we made it here ok, so there must not be any Living individulals linked to this media
>     return true;
> }
> 
> function checkMediaFileSize($path) {
> 	global $maxmediafilesize;
> 
> 	return file_exists($path) && filesize($path) < $maxmediafilesize;
> }
> 
> function getScriptName($replace = true) {
> 	global $_SERVER;
> 
> 	$scriptname = $_SERVER['REQUEST_URI'] ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME'] . "?" . $_SERVER['QUERY_STRING'];
> 	if($replace) {
> 		$scriptname = str_replace("&","&amp;",$scriptname);
> 		$scriptname = str_replace("amp;amp;", "amp;", $scriptname);
> 	}
> 
> 	return $scriptname;
> }
> 
> function getScriptPath() {
> 	$uri = getScriptName();
> 	return dirname($uri);
> }
> 
> function get_browseitems_nav( $total, $address, $perpage, $pagenavpages ) {
> 	global $tngpage, $totalpages, $tree, $text, $orgtree, $test_type, $test_group;
> 
> 	$pagenav = $firstlink = $lastlink = $nextlink = $prevlink = "";
> 	$curpage = 0;
> 
> 	if( !$tngpage ) $tngpage = 1;
> 	if( !$perpage ) $perpage = 50;
> 
> 	if( $total <= $perpage )
> 		return "";
> 
> 	$totalpages = ceil( $total / $perpage );
> 	if ( $tngpage > $totalpages ) $tngpage = $totalpages;
> 
> 	if( $tngpage > 1 ) {
> 		$prevpage = $tngpage-1;
> 		$navoffset = ( ( $prevpage * $perpage ) - $perpage );
> 		if ( !empty($test_type) || !empty($test_group) )
> 			$prevlink = " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$prevpage\" class=\"snlink\" title=\"{$text['text_prev']}\">&laquo;{$text['text_prev']}</a> ";
> 		else
> 			$prevlink = " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;tngpage=$prevpage\" class=\"snlink\" title=\"{$text['text_prev']}\">&laquo;{$text['text_prev']}</a> ";
> 	}
> 	if ($tngpage<$totalpages) {
> 		$nextpage = $tngpage+1;
> 		$navoffset = (($nextpage * $perpage) - $perpage);
> 		if ( !empty($test_type) || !empty($test_group) )
> 			$nextlink = "<a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$nextpage\" class=\"snlink\" title=\"{$text['text_next']}\">{$text['text_next']}&raquo;</a>";
> 		else
> 			$nextlink = "<a href=\"$address=$navoffset&amp;tree=$orgtree&amp;tngpage=$nextpage\" class=\"snlink\" title=\"{$text['text_next']}\">{$text['text_next']}&raquo;</a>";
> 	}
> 	while( $curpage++ < $totalpages ) {
>    	$navoffset = ( ($curpage - 1 ) * $perpage );
> 		if( ( $curpage <= $tngpage - $pagenavpages || $curpage >= $tngpage + $pagenavpages ) && $pagenavpages ) {
> 			if( $curpage == 1 ) {
> 				if ( !empty($test_type) || !empty($test_group) )
> 					$firstlink = " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$curpage\" class=\"snlink\" title=\"{$text['firstpage']}\">&laquo;1</a> ... ";
> 				else
> 					$firstlink = " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;tngpage=$curpage\" class=\"snlink\" title=\"{$text['firstpage']}\">&laquo;1</a> ... ";
> 			}
> 		    if( $curpage == $totalpages ) {
> 				if ( !empty($test_type) || !empty($test_group) )
> 					$lastlink = "... <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$curpage\" class=\"snlink\" title=\"{$text['lastpage']}\">$totalpages&raquo;</a>";
> 				else
> 					$lastlink = "... <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;tngpage=$curpage\" class=\"snlink\" title=\"{$text['lastpage']}\">$totalpages&raquo;</a>";
> 			}
> 		}
> 		else {
> 			if( $curpage == $tngpage )
> 				$pagenav .= " <span class=\"snlink snlinkact\">$curpage</span> ";
> 			else {
> 				if ( !empty($test_type) || !empty($test_group) )
> 					$pagenav .= " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;test_type=$test_type&amp;test_group=$test_group&amp;tngpage=$curpage\" class=\"snlink\">$curpage</a> ";
> 				else
> 					$pagenav .= " <a href=\"$address=$navoffset&amp;tree=$orgtree&amp;tngpage=$curpage\" class=\"snlink\">$curpage</a> ";
> 			}
> 		}
> 	}
> 	if($firstlink || $lastlink) {
> 		$gotolink = " <span class=\"snlink\"><input type=\"text\" class=\"tngpage minifield\" placeholder=\"{$text['page']} #\" name=\"tngpage\" onkeyup=\"if(pageEnter(this,event)) {goToPage($(this).next(),'$address','$orgtree',$perpage);}\"/> <input type=\"button\" value=\"{$text['go']}\" class=\"minibutton\" onclick=\"goToPage(this,'$address','$orgtree',$perpage);\"/></span>";
> 	}
> 	else
> 		$gotolink = "";
> 	$pagenav = "<span class=\"normal\">$prevlink $firstlink $pagenav $lastlink $nextlink$gotolink</span>";
> 
> 	return $pagenav;
> }
> 
> function doMenuItem( $index, $link, $image, $label, $page, $thispage ) {
> 	global $sitever;
> 
> 	if($sitever == "mobile") {
> 		$selected = $page == $thispage ? " selected" : "";
> 		$item = "<option value=\"$link\"$selected>$label</option>\n";
> 	}
> 	else {
> 		$class = $page == $thispage ? " class=\"here\"" : "";
> 		$imagetext = $image ? "<span class=\"tngsmallicon2\" id=\"{$image}-smicon\"></span>" : "";
> 		$item = "<li><a id=\"a$index\" href=\"$link\"$class>$imagetext$label</a></li>\n";
> 	}
> 
> 	return $item;
> }
> 
> function displayDate( $date = "" ) {
> 	global $dates;
> 
> 	$newdate = "";
> 	if(!empty($date)) {
> 		$dateparts = explode( " ", $date );
> 		foreach( $dateparts as $datepart ) {
> 			if( !is_numeric( $datepart ) ) {
> 				$datepartu = strtoupper( $datepart );
> 				if( isset( $dates[$datepartu] ) )
> 					$datepart = $dates[$datepartu];
> 				elseif( $datepartu == "AND" )
> 					$datepart = $dates['TEXT_AND'];
> 				elseif( $datepartu == "@#DJULIAN@" )
> 					$datepart = "[J]";
> 			}
> 			$newdate .= $newdate ? " $datepart" : $datepart;
> 		}
> 	}
> 
> 	return $newdate;
> }
> 
> //added in 12.1.1 for Register and Ahnentafel reports
> function printDate( $datetr, $date = "" ) {
> 	global $dates, $text;
> 
> 	$newdate = "";
> 	$prefix = 0;			//	added to displayDate function
> 	$dateparts = explode( " ", $date );
> 	foreach( $dateparts as $datepart ) {
> 		if( !is_numeric( $datepart ) ) {
> 			$datepartu = strtoupper( $datepart );
> 			if( isset( $dates[$datepartu] ) ) {
> 				$datepart = $dates[$datepartu];
> 				$dtprefix = in_array($datepartu, array("ABT", "ABT.", "ABOUT", "AFT", "AFT.", "AFTER", "BEF", "BEF.", "BEFORE", "BET", "BET.", "BETWEEN", "CAL", "CAL.", "EST", "EST."));
> 				if ( $dtprefix ) {
> 					$prefix = 1;
> 					switch ($datepartu) {
> 						case "ABT":
> 							$datepart = tng_strtolower($dates['ABOUT']);
> 							break;
> 						case "ABT.":
> 							$datepart = tng_strtolower($dates['ABOUT']);
> 							break;
> 						case "AFT":
> 							$datepart = tng_strtolower($dates['AFTER']);
> 							break;
> 						case "AFT.":
> 							$datepart = tng_strtolower($dates['AFTER']);
> 							break;
> 						case "BEF":
> 							$datepart = tng_strtolower($dates['BEFORE']);
> 							break;
> 						case "BEF.":
> 							$datepart = tng_strtolower($dates['BEFORE']);
> 							break;
> 						case "BET":
> 							$datepart = tng_strtolower($dates['BETWEEN']);
> 							break;
> 						case "BET.":
> 							$datepart = tng_strtolower($dates['BETWEEN']);
> 							break;
> 						case "CAL":
> 							$datepart = tng_strtolower($dates['CAL']);
> 							break;
> 						case "CAL.":
> 							$datepart = tng_strtolower($dates['CAL']);
> 							break;
> 						case "EST":
> 							$datepart = tng_strtolower($dates['EST']);
> 							break;
> 						case "EST.":
> 							$datepart = tng_strtolower($dates['EST']);
> 							break;
> 						default:
> 							$datepart = tng_strtolower($datepart);
> 							break;
> 					}
> 				}
> 			}
> 			elseif( $datepartu == "AND" )
> 				$datepart = $dates['TEXT_AND'];
> 			elseif( $datepartu == "@#DJULIAN@" )
> 				$datepart = "[J]";
> 		}
> 		$newdate .= $newdate ? (" " . $datepart) : $datepart;
> 	}
> 	if ( $prefix == 0 && substr_count($newdate," ") == 2 ) {
> 		$newdate = " " . trim($text['onthisdate']) . " " . $newdate;
> 	}
> 	elseif ( !empty($newdate) && $prefix == 0 )
> 		$newdate = " " . trim($text['inthisyear']) . " " . $newdate;
> 	elseif ( $newdate != "" )
> 		$newdate = " " . $newdate;
> 
> 	return $newdate;
> }
> 
> function xmlcharacters($string) {
> 	if(empty($string)) return "";
>    	$string = str_replace(array('&','"','\''), array('&amp;','&quot;','&apos;'), $string);
>    	return preg_replace('/&amp;([A-Za-z]+;|#[0-9]+;)/',"&$1", $string);
> }
> 
> function generatePassword($flag) {
>   $password = "";
>   $possible = $flag ? "bcdfghjkmnpqrstvwxyz" : "0123456789bcdfghjkmnpqrstvwxyz";
>   $length = 8;
> 
>   $i = 0;
>   while( $i < $length ) {
>     $char = substr( $possible, mt_rand( 0, strlen( $possible ) - 1 ), 1 );
>     if( !strstr( $password, $char ) ) {
>       $password .= $char;
>       $i++;
>     }
>   }
> 
>   return $password;
> }
> 
> function getXrefNotes($noteref, $tree="") {
> 	global $xnotes_table;
> 
> 	preg_match( "/^@(\S+)@/", $noteref, $matches );
> 	if( isset( $matches[1] ) ) {
> 		$query = "SELECT note from $xnotes_table WHERE noteID = \"$matches[1]\" AND gedcom=\"$tree\"";
> 		$xnoteres = @tng_query( $query );
> 		if( $xnoteres ) {
> 			$xnote = tng_fetch_assoc( $xnoteres );
> 			$note = trim( $xnote['note'] );
> 		}
> 		tng_free_result($xnoteres);
> 	}
> 	else
> 		$note = $noteref;
> 	return $note;
> }
> 
> function getDatePrefix($datestr) {
> 	global $dates;
> 
> 	$prefix = "";
> 	if($datestr) {
> 		$orgstr = $datestr;
> 		$firststr = strtok(strtoupper($datestr)," ");
> 		$prefixes = array($dates['BEF'], $dates['AFT'], $dates['ABT'], $dates['CAL'], $dates['EST']);
> 		foreach($prefixes as $str) {
> 			if($firststr == strtoupper($str)) {
> 				$prefix = $str . " ";
> 				break;
> 			}
> 		}
> 	}
> 	return $prefix;
> }
> 
> function getDisplayYear($datestr,$trueyear) {
> 	global $dates;
> 
> 	if($datestr == "Y")
> 		$display = $dates['Y'];
> 	else {
> 		$newstr = displayDate($datestr);  //translated
> 		$prefix = getDatePrefix($newstr);  //first part of translated string
> 		$rest = trim(substr($newstr,strlen($prefix)));
> 		$parts = explode(" ",$rest);
> 		$numParts = count($parts);
> 		$lastPart = $parts[$numParts-1];
> 		if(is_numeric($lastPart))
> 			$display = $prefix . $lastPart;
> 		else
> 			$display = $trueyear ? $prefix . $trueyear : $newstr;
> 	}
> 	//echo "dd=$datestr, ds=$newstr, np=$numParts, r=$rest, lp=" . $parts[$numParts-1];
> 
> 	return $display;
> }
> 
> function getYears( $row ) {
> 	global $dates;
> 
> 	if(!isset($row['death'])) $row['death'] = '';
> 	if(!isset($row['birth'])) $row['birth'] = '';
> 
> 	if( $row['allow_living'] && $row['allow_private'] ) {
> 		$years = getGenderIcon( $row['sex'], -1 );
> 		$deathdate = $row['deathdate'] ? $row['deathdate'] : $row['burialdate'];
> 		$displaydeath = getDisplayYear($deathdate, $row['death']);
> 
> 		$birthdate = $row['birthdate'] ? $row['birthdate'] : $row['altbirthdate'];
> 		$displaybirth = getDisplayYear($birthdate, $row['birth']);
> 
> 		if( $displaybirth || $displaydeath ) {
> 			$years .= " $displaybirth - $displaydeath";
> 			$age = age($row);
> 			if($age)
> 				$years .= " &nbsp;($age)";
> 		}
> 	}
> 	else
> 		$years = "";
> 
> 	return $years;
> }
> 
> function justYears( $row ) {
> 	$years = "";
> 	if( $row['allow_living'] && $row['allow_private'] ) {
> 		$deathdate = $row['deathdate'] ? $row['deathdate'] : $row['burialdate'];
> 		$displaydeath = getDisplayYear($deathdate, $row['death']);
> 
> 		$birthdate = $row['birthdate'] ? $row['birthdate'] : $row['altbirthdate'];
> 		$displaybirth = getDisplayYear($birthdate, $row['birth']);
> 
> 		if( $displaybirth || $displaydeath ) {
> 			$years = "<span class=\"pedyears\">$displaybirth-$displaydeath</span>";
> 		}
> 	}
> 
> 	return $years;
> }
> 
> function age($row) {
> 	global $time_offset;
> 
> 	// If person is living calculate todays age
> 	$datum_1_tr = $row['birthdatetr'];
> 	$datum_1 = $row['birthdate'];
> 	$datum_alt_1_tr = $row['altbirthdatetr'];
> 	$datum_alt_1 = $row['altbirthdate'];
> 	$datum_2_tr = $row['deathdatetr'];
> 	$datum_2 = $row['deathdate'];
> 	$datum_alt_2_tr = $row['burialdatetr'];
> 	$datum_alt_2 = $row['burialdate'];
> 	$age = $sign = $sign1 = $sign2 = '';
> 
> 	if($row['living'] == "1" && !$datum_2 && !$datum_alt_2) {
> 		// Today
> 		$datum_2_tr = date ("Y-m-d", time() + ( 3600 * $time_offset ) );
> 	}
> 
> 	// Only if one of the FROM and one of the TO dates are filled
> 	if(($datum_1_tr != "0000-00-00" || $datum_alt_1_tr != "0000-00-00") && ($datum_2_tr != "0000-00-00" || $datum_alt_2_tr != "0000-00-00")) {
> 
> 	// FROM date
> 	// $datum1 = result datum1
> 	// $datum_1_tr = date numeric, Datum_1 = date alfanumeric
> 	// $datum_alt_1_tr = alternative date numeric, $datum_alt_1 = alternative date alfanumeric
> 
> 		if($datum_1_tr != "0000-00-00") {
> 			$datum1 = $datum_1_tr;
> 			if(substr($datum_1, 0, 3) == "BEF")
> 			$sign1 = ">";
> 			else {
> 				if (substr($datum_1, 0, 3) == "AFT") {
> 					$sign1 = "&lt;";
> 					$datum1 = substr_replace($datum1, "12-31", 5);
> 				}
> 				else {
> 					if(substr($datum_1, 1, 4) == substr($datum1, 0, 4)) {
> 						$sign1 = "~";
> 						$datum1 = substr_replace($datum1, "07-15", 5);
> 					}
> 					else {
> 						if(substr($datum_1, 0, 2) < 1) {
> 							$sign1 = "~";
> 							$datum1 = substr_replace($datum1, "15", 8);
> 						}
> 					}
> 				}
> 			}
> 		}
> 		else {
> 			$datum1 = $datum_alt_1_tr;
> 			$sign1 = "~";
> 			if(substr($datum_alt_1, 0, 3) == "BEF")
> 				$sign1 = ">";
> 			else {
> 				if(substr($datum_alt_1, 0, 3) == "AFT") {
> 					$sign1 = "&lt;";
> 					$datum1 = substr_replace($datum1, "12-31", 5);
> 				}
> 				else {
> 					if(substr($datum_alt_1, 1, 4) == substr($datum1, 0, 4))
> 				  		$datum1 = substr_replace($datum1, "07-15", 5);
> 					else {
> 						if(substr($datum_alt_1, 0, 2) < 1)
> 							$datum1 = substr_replace($datum1, "15", 8);
> 					}
> 				}
> 			}
> 		}
> 
> 		// TO date
> 		// $datum2 = result datum2
> 		// $datum_2_tr = date numeric, Datum_2 = datum alfanumeric
> 		// $datum_alt_2_tr = alternative date numeric, $datum_alt_2 = alternative date alfanumeric
> 
> 		if($datum_2_tr != "0000-00-00") {
> 			$datum2 = $datum_2_tr;
> 			if(substr($datum_2, 0, 3) == "BEF")
> 				$sign2 = "&lt;";
> 			else {
> 				if(substr($datum_2, 0, 3) == "AFT") {
> 					$sign2 = "&gt;";
> 					$datum2 = substr_replace($datum2, "12-31", 5);
> 				}
> 				else {
> 					if(substr($datum_2, 1, 4) == substr($datum2, 0, 4))
> 						$datum2 = substr_replace($datum2, "07-15", 5);
> 					else {
> 						if(substr($datum2, 8, 2) < 1)
> 							$datum2 = substr_replace($datum2, "15", 8);
> 					}
> 				}
> 			}
> 		}
> 		else {
> 			$datum2 = $datum_alt_2_tr;
> 			$sign2 = "~";
> 			if(substr($datum_alt_2, 0, 3) == "BEF")
> 				$sign2 = "&lt;";
> 			else {
> 				if(substr($datum_alt_2, 0, 3) == "AFT") {
> 					$sign2 = "&gt;";
> 					$datum2 = substr_replace($datum2, "12-31", 5);
> 				}
> 				else {
> 					if(substr($datum_alt_2, 1, 4) == substr($datum2, 0, 4))
> 						$datum2 = substr_replace($datum2, "07-15", 5);
> 					else {
> 						if(substr($datum_alt_2, 0, 2) < 1)
> 							$datum2 = substr_replace($datum2, "15", 8);
> 					}
> 				}
> 			}
> 		}
> 
> 		// age = date2 - date1
> 
> 		$datum1 = substr($datum1, 0, 4) . substr($datum1, 5, 2) . substr($datum1, 8, 2);
> 		$datum2 = substr($datum2, 0, 4) . substr($datum2, 5, 2) . substr($datum2, 8, 2);
> 		$age = $datum2 - $datum1;
> 
> 	// format age
> 
> 		if($age < 0)
> 			$age = "";
> 		else {
> 			if($age >= 0 && $age < 10000)
> 				$age = "0 ";
> 			else {
> 				if($age > 9999 && $age < 100000)
> 					$age = substr($age, 0, 1);
> 				else {
> 					if($age > 99999 && $age < 1000000)
> 						$age = substr($age, 0, 2);
> 					else {
> 						if($age > 999999)
> 							$age = substr($age, 0, 3);
> 					}
> 				}
> 			}
> 		}
> 
> 		// format sign
> 		if ((($sign1 == "<") || ($sign1 == ">")) && (($sign2 == "<") || ($sign2 == ">")))
> 			$sign = "~";
> 		else {
> 			if (($sign1 == "~") || ($sign2 == "~"))
> 				$sign = "~";
> 			else {
> 				if ($sign1 && $sign1 <> " ") $sign = $sign1;
> 				if ($sign2 && $sign2 <> " ") $sign = $sign2;
> 			}
> 		}
> 
> 		if ($age && $sign <> "")
> 			$age = $sign . " " . $age;
> 
> 	}
> 
> 	if ($age <> "") {
> 		global $text;
> 		$age .= $age != 1 ? " {$text['years']}" : " {$text['oneyear']}";
> 	}
> 
> 	return $age;
> }
> 
> function showSmallPhoto( $persfamID, $alttext, $rights, $height, $type=false, $gender="", $rowtree="" ) {
> 	global $rootpath, $photopath, $documentpath, $headstonepath, $historypath, $mediapath, $mediatypes_assoc;
> 	global $photosext, $tree, $medialinks_table, $media_table, $text, $cms, $admtext, $tngconfig, $allow_private;
> 
> 	$photo = "";
> 	$photocheck = "";
> 	$prefix = $suffix = "";
> 	if(!$rowtree) $rowtree = $tree;
> 
> 	$query = "SELECT $media_table.mediaID, medialinkID, alwayson, private, thumbpath, mediatypeID, usecollfolder, newwindow, $media_table.gedcom FROM ($media_table, $medialinks_table)
> 		WHERE personID = \"$persfamID\" AND $medialinks_table.gedcom = \"$rowtree\" AND $media_table.mediaID = $medialinks_table.mediaID AND defphoto = '1'";
> 	$result = tng_query($query);
> 	$row = tng_fetch_assoc( $result );
> 
> 	if(!empty($row['thumbpath'])) {
> 		$targettext = $row['newwindow'] ? " target=\"blank\"" : "";
> 
> 		if( $row['alwayson'] || (($rights || checkLivingLinks($row['mediaID'])) && (!$row['private'] || $allow_private))) {
> 			$treestr = $tngconfig['mediatrees'] && $row['gedcom'] ? $row['gedcom'] . "/" : "";
> 			$mediatypeID = $row['mediatypeID'];
> 			$usefolder = $row['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
> 			$photocheck = "$usefolder/$treestr" . $row['thumbpath'];
> 			$photoref = $cms['tngpath'] . "$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] ));
> 			if($type)
> 				$prefix = "<a href=\"{$cms['tngpath']}admin_editmedia.php?mediaID={$row['mediaID']}\"$targettext>";
> 			else {
> 				$showmedia_url = getURL( "showmedia", 1 );
> 				$prefix = "<a href=\"$showmedia_url" . "mediaID={$row['mediaID']}&amp;medialinkID={$row['medialinkID']}\" title=\"" . str_replace("\"","&#34;",$alttext) . "\"$targettext>";
> 			}
> 			$suffix = "</a>";
> 		}
> 	}
> 	elseif($rights) {
> 		$photoref = $photocheck = $rowtree ? "$photopath/$rowtree.$persfamID.$photosext" : "$photopath/$persfamID.$photosext";
> 	}
> 
> 	$gotfile = $photocheck ? file_exists( "$rootpath$photocheck" ) : false;
> 	if(!$gotfile) {
> 		if($type) {
> 			$query = "SELECT medialinkID FROM ($media_table, $medialinks_table)
> 				WHERE personID = \"$persfamID\" AND $medialinks_table.gedcom = \"$rowtree\" AND $media_table.mediaID = $medialinks_table.mediaID AND mediatypeID = \"photos\" AND thumbpath != \"\"";
> 			$result2 = tng_query($query);
> 			$numphotos = tng_num_rows($result2);
> 			tng_free_result($result2);
> 			if($numphotos) {
> 				//if photos exist, show box with link to sort page where they can pick a default
> 				$photo = "<a href=\"admin_ordermedia.php?newlink1=$persfamID&tree1=$rowtree&mediatypeID=photos&linktype1=$type\" class=\"smaller\" style=\"display:block;padding:8px;border:1px solid black;margin-right:6px;text-align:center\">{$admtext['choosedef']}</a>";
> 			}
> 		}
> 		elseif( $gender && !empty($tngconfig['usedefthumbs']) ) {
> 			if($gender == "M") {
> 				$photocheck = "img/male.jpg";
> 			}
> 			elseif ($gender == "F") {
> 				$photocheck = "img/female.jpg";
> 			}
> 			if($photocheck) {
> 				$photoref = $cms['tngpath'] . $photocheck;
> 				$gotfile = file_exists( "$rootpath$photocheck" );
> 			}
> 		}
> 	}
> 	if( $gotfile ) {
> 		$border = $height ? 0 : 1;
> 		$align = $height ? "" : " style=\"float:left;\"";
> 		$photoinfo = @GetImageSize( "$rootpath$photocheck" );
> 		$photohtouse = $height ? $height : 100;
> 		if( $photoinfo[1] <= $photohtouse ) {
> 			$photohtouse = $photoinfo[1];
> 			$photowtouse = $photoinfo[0];
> 		}
> 		else
> 			$photowtouse = intval( $photohtouse * $photoinfo[0] / $photoinfo[1] ) ;
> 		$photo = "$prefix<img src=\"$photoref\" border=\"$border\" alt=\"" . str_replace("\"","&#34;",$alttext) . "\" width=\"$photowtouse\" height=\"$photohtouse\" class=\"smallimg\"{$align}/>$suffix";
> 	}
> 	tng_free_result( $result );
> 
> 	return $photo;
> }
> 
> function placeImage($place) {
> 	global $placesearch_url, $cms;
> 
> 	return "<a href=\"$placesearch_url" . "psearch=" . urlencode($place) . "\" class=\"pl\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" alt=\"\" class=\"placeimg\"/></a>";
> }
> 
> function checkMaintenanceMode($area){
> 	global $tngconfig;
> 
> 	if(strpos($_SERVER['SCRIPT_NAME'],"/suggest.php") === FALSE && strpos($_SERVER['SCRIPT_NAME'],"admin") === FALSE && isset($tngconfig['maint']) && $tngconfig['maint']
> 		&& (empty($_SESSION['allow_admin']) || !empty($_SESSION['assignedtree'])) && strpos($_SERVER['SCRIPT_NAME'],"/index.") === FALSE) {
> 		$maint_url = $area ? "adminmaint.php" : getURL("maint",0);
> 		header("Location:$maint_url");
> 		exit;
> 	}
> }
> 
> function cleanIt($string) {
> 	global $session_charset;
> 	$string = @htmlspecialchars(preg_replace("/\n/"," ",$string), ENT_QUOTES, $session_charset);
> 	$string = preg_replace("/\"/", "&#34;",$string);
> 	$string = preg_replace("/</", "&lt;",$string);
> 	$string = preg_replace("/>/", "&gt;",$string);
> 	$string = preg_replace("/=/", "",$string);
> 	$string = preg_replace("/\t/", "&#09;",$string);
> 	$string = str_replace("`","&#96",$string);
> 	$string = tng_real_escape_string($string);
> 
> 	return $string;
> }
> 
> function cleanItLite($string) {
> 	global $session_charset;
> 	$string = preg_replace("/\"/", "&#34;",$string);
> 	$string = preg_replace("/</", "&lt;",$string);
> 	$string = preg_replace("/>/", "&gt;",$string);
> 	$string = preg_replace("/=/", "",$string);
> 	$string = preg_replace("/\t/", "&#09;",$string);
> 	$string = str_replace("`","&#96",$string);
> 
> 	return $string;
> }
> 
> function filterString($string) {
> 	$string = strip_tags($string);
> 	$string = tng_real_escape_string($string);
> 
> 	return $string;
> }
> 
> 
> function truncateIt($string,$length) {
> 	global $notrunc;
> 
> 	if($length > 0 && !$notrunc && strlen($string) > $length) {
> 		$truncated = substr(strip_tags($string),0,$length);
> 		$truncated = substr($truncated,0,strrpos($truncated,' ')) . '&hellip;';
> 	}
> 	else
> 		$truncated = $string;
> 	return $truncated;
> }
> 
> function tng_strtoupper($string) {
> 	global $session_charset;
> 
> 	$ucharset = strtoupper($session_charset);
> 	$enc = function_exists('mb_detect_encoding') ? @mb_detect_encoding($string) : "";
> 	if($enc && strtoupper($enc) == "UTF-8" && $ucharset == "UTF-8")
> 		$string = mb_strtoupper($string, "UTF-8");
> 	else
> 		$string = strtoupper($string);
> 
> 	return $string;
> }
> 
> function tng_strtolower($string) {
> 	global $session_charset;
> 
> 	$ucharset = strtoupper($session_charset);
> 	$enc = function_exists('mb_detect_encoding') ? @mb_detect_encoding($string) : "";
> 	if($enc && strtoupper($enc) == "UTF-8" && $ucharset == "UTF-8")
> 		$string = mb_strtolower($string, "UTF-8");
> 	else
> 		$string = strtolower($string);
> 
> 	return $string;
> }
> 
> function tng_utf8_decode($text) {
> 	global $session_charset;
> 
> 	$ucharset = strtoupper($session_charset);
> 	if($ucharset == "ISO-8859-1") {
> 		$text = mb_convert_encoding( $text, 'ISO-8859-1', 'UTF-8' );
> 	}
> 	elseif($ucharset == "ISO-8859-2") {
> 		$text = utf82iso88592($text);
> 	}
> 	return $text;
> }
> 
> function utf82iso88592_chris($text) {
>     if (function_exists('mb_convert_encoding'))
>         return mb_convert_encoding ($text,'ISO-8859-2','UTF-8');
>     return str_replace(array("\xC4\x85", "\xC4\x84","\xC4\x87","\xC4\x86","\xC4\x99","\xC4\x98","\xC5\x82","\xC5\x81",
>     	"\xC3\xB3","\xC3\x93","\xC5\x9B","\xC5\x9A","\xC5\xBC","\xC5\xBB","\xC5\xBA","\xC5\xB9","\xc5\x84","\xc5\x83"),
>     	array("\xB1","\xA1","\xE6","\xC6","\xEA","\xCA","\xB3","\xA3","\xF3","\xD3","\xB6","\xA6","\xBF","\xAF","\xBC","\xAC","\xF1","\xD1"), $text
>     );
> }
> 
> function utf82iso88592($text) {
> 	$text = str_replace("\xC4\x85", '±', $text);
> 	$text = str_replace("\xC4\x84", '¡', $text);
> 	$text = str_replace("\xC4\x87", 'æ', $text);
> 	$text = str_replace("\xC4\x86", 'Æ', $text);
> 	$text = str_replace("\xC4\x99", 'ê', $text);
> 	$text = str_replace("\xC4\x98", 'Ê', $text);
> 	$text = str_replace("\xC5\x82", '³', $text);
> 	$text = str_replace("\xC5\x81", '£', $text);
> 	$text = str_replace("\xC3\xB3", 'ó', $text);
> 	$text = str_replace("\xC3\x93", 'Ó', $text);
> 	$text = str_replace("\xC5\x9B", '¶', $text);
> 	$text = str_replace("\xC5\x9A", '¦', $text);
> 	$text = str_replace("\xC5\xBC", '¿', $text);
> 	$text = str_replace("\xC5\xBB", '¯', $text);
> 	$text = str_replace("\xC5\xBA", '¼', $text);
> 	$text = str_replace("\xC5\xB9", '¬', $text);
> 	$text = str_replace("\xc5\x84", 'ñ', $text);
> 	$text = str_replace("\xc5\x83", 'Ñ', $text);
> 
> 	return $text;
> }
> 
> function getAllTextPath() {
> 	global $rootpath, $mylanguage, $language, $languages_path, $endrootpath, $cms, $text, $admtext, $dates, $session_charset;
> 
> 	$rootpath = trim($rootpath);
> 	if($rootpath && strpos($rootpath,"http") !== 0 ) {
> 		$thislanguage = trim($mylanguage ? $mylanguage : $languages_path . $language);
> 		if(strpos($thislanguage,"http") !== 0) {
> 			if($cms['support'])
> 				@include_once($rootpath . $cms['tngpath'] . "$thislanguage/alltext.php");
> 			else
> 				@include_once($rootpath . $endrootpath . "$thislanguage/alltext.php");
> 		}
> 	}
> }
> 
> function attachPrefixSuffix($entityID, $type) {
> 	global $tngconfig;
> 
> 	switch($type) {
> 		case "I":
> 			$prefix = $tngconfig['personprefix'];
> 			$suffix = $tngconfig['personsuffix'];
> 			break;
> 		case "F":
> 			$prefix = $tngconfig['familyprefix'];
> 			$suffix = $tngconfig['familysuffix'];
> 			break;
> 		case "S":
> 			$prefix = $tngconfig['sourceprefix'];
> 			$suffix = $tngconfig['sourcesuffix'];
> 			break;
> 		case "R":
> 			$prefix = $tngconfig['repoprefix'];
> 			$suffix = $tngconfig['reposuffix'];
> 			break;
> 		default:
> 			$prefix = $suffix = "";
> 			break;
> 	}
> 	$entityID = tng_utf8_decode(trim($entityID));
> 	$prefixlen = strlen($prefix);
> 	$suffixlen = strlen($suffix);
> 	$entity_prefix = substr($entityID,0,$prefixlen);
> 	$entity_suffix = substr($entityID,-1 * $suffixlen);
> 	if($prefix && $entity_prefix != $prefix && is_numeric($entity_prefix)) $entityID = $prefix . $entityID;
> 	if($suffix && $entity_suffix != $suffix && is_numeric($entity_suffix)) $entityID = $entityID . $suffix;
> 
> 	return $entityID;
> }
> 
> function formatInternalDate($truedate) {
> 	if($truedate == "0000-00-00")
> 		return "";
> 	$parts = explode("-",$truedate);
> 	$newdate = "";
> 	$numparts = 0;
> 	foreach($parts as $part) {
> 		if($part != "0000" && $part != "00")
> 			$numparts++;
> 		elseif($part == "00")
> 			$part = "01";
> 		if($newdate)
> 			$newdate .= "-";
> 		$newdate .= $part;
> 	}
> 
> 	if($numparts == 1)
> 		$formatted = $parts[0];
> 	else {
> 		$newdate = date_create($newdate);
> 		if($numparts == 2)
> 			$formatted = date_format($newdate,"M Y");
> 		else
> 			$formatted = date_format($newdate,"j M Y");
> 	}
> 
> 	return $formatted;
> }
> 
> function isConnected() {
> 	global $tngconfig;
> 
> 	if(!empty($tngconfig['offline']))
> 		return false;
> 	else
> 		return true;
> 
>     // use 80 for http or 443 for https protocol
>     //$connected = @fsockopen("www.google.com", 80);
>     //if ($connected){
>     //    fclose($connected);
>     //    return true;
>     //}
>     //else
> 	//    return false;
> }
> 
> function getImageTags($mediaID) {
>     global $image_tags_table, $people_table, $families_table, $sources_table, $repositories_table, $places_table;
> 
>     $query = "SELECT i.ID, rtop, rleft, rwidth, rheight, linktype, label, i.gedcom, persfamID, people.living as living, people.private as private, people.branch as branch,
>         familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, 
>         people.prefix as prefix, people.suffix as suffix, nameorder, people.title as title, place,
>         s.title as stitle, s.sourceID, r.repoID, reponame, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, burialdate
>         FROM $image_tags_table AS i
>         LEFT JOIN $people_table AS people ON i.persfamID = people.personID AND i.gedcom = people.gedcom
>         LEFT JOIN $families_table AS f ON i.persfamID = f.familyID AND i.gedcom = f.gedcom
>         LEFT JOIN $sources_table AS s ON i.persfamID = s.sourceID AND i.gedcom = s.gedcom
>         LEFT JOIN $repositories_table AS r ON i.persfamID = r.repoID AND i.gedcom = r.gedcom
>         LEFT JOIN $places_table AS places ON i.persfamID = places.ID
>         WHERE mediaID = \"$mediaID\"";
>         
>     return tng_query($query);
> }
> 
> function getImageTagInfo($tag) {
> 	global $admtext, $citations_table, $sources_table, $tngconfig;
> 	
> 	switch($tag['linktype']) {
> 		case "I":
> 			$righttree = checktree($tag['gedcom']);
> 			$rightbranch = $righttree ? checkbranch($tag['branch']) : false;
> 			$rights = determineLivingPrivateRights($tag, $righttree, $rightbranch);
> 			$tag['allow_living'] = $rights['living'];
> 			$tag['allow_private'] = $rights['private'];
> 			$label = getName($tag);
> 			$getperson_url = getURL( "getperson", 1 );
> 			$media_link_url = "{$getperson_url}tree={$tag['gedcom']}&personID={$tag['persfamID']}";
> 			break;
> 		case "F":
> 			$label = getFamilyName( $tag );
> 			$familygroup_url = getURL( "familygroup", 1 );
> 			$media_link_url = "{$familygroup_url}familyID={$tag['persfamID']}&tree={$tag['gedcom']}";
> 			break;
> 		case "S":
> 			$label = $tag['stitle'] ? $tag['stitle'] : $tag['sourceID'];
> 			$showsource_url = getURL( "showsource", 1 );
> 			$media_link_url = "{$showsource_url}sourceID={$tag['persfamID']}&tree={$tag['gedcom']}";
> 			break;
> 		case "R":
> 			$label = $tag['reponame'] ? $tag['reponame'] : $tag['repoID'];
> 			$showrepo_url = getURL( "showrepo", 1 );
> 			$media_link_url = "{$showrepo_url}repoID={$tag['persfamID']}&tree={$tag['gedcom']}";
> 			break;
> 		case "C":
> 			$query = "SELECT title, c.sourceID, persfamID, page FROM $citations_table as c, $sources_table as s 
> 				WHERE citationID = \"{$tag['persfamID']}\" AND c.gedcom = s.gedcom AND c.sourceID = s.sourceID";
> 			$result= @tng_query($query) or die ($admtext['cannotexecutequery'] . ": $query");
> 			$row =  tng_fetch_assoc( $result );
> 			$label = $row['title'] . " ({$row['persfamID']})";
> 			$showsource_url = getURL( "showsource", 1 );
> 			$media_link_url = "{$showsource_url}sourceID={$row['sourceID']}&tree={$tag['gedcom']}";
> 			break;
> 		case "L":
> 			$label = $tag['place'];
> 			$treestr = $tngconfig['places1tree'] ? "" : "&tree={$tag['gedcom']}";
> 			$placesearch_url = getURL( "placesearch", 1 );
> 			$media_link_url = "{$placesearch_url}psearch={$tag['place']}$treestr";
> 			break;
> 		case "U":
> 			$label = $tag['label'];
> 			$media_link_url = strpos($tag['persfamID'], "label-") === 0 ? "" : $tag['persfamID'];
> 			break;
> 		default:
> 			$label = "error";
> 			$media_link_url = "";
> 			break;			
> 	}
> 
> 	return [$label, $media_link_url];
> }
diff -r TNG/googleearthbylatlong.php TNG1403/googleearthbylatlong.php
21c21
< header('Content-Disposition: inline; filename="tng.kml"');
---
> header('Content-Disposition: inline; filename="' . $name . '.kml"');
diff -r TNG/googlemapdrawthemap.php TNG1403/googlemapdrawthemap.php
11c11
< 	$searchstring = $row['place'] ? $row['place'] : $admtext['searchstring'];
---
> 	$searchstring = !empty($row['place']) ? $row['place'] : $admtext['searchstring'];
15c15
< 	if(!$row['place'])
---
> 	if( empty($row['place']) )
22c22,23
< 	echo "<span class=\"normal\"><br /><a href=\"javascript:newwindow=window.open('{$http}://maps.google.com/maps?f=q" . $text['glang']."$mcharsetstr&q=".$row['place'] . "', 'googlehelp'); newwindow.focus();\"> {$admtext['difficultmap']}</a> | <a href=\"javascript:newwindow=window.open('$maphelplang/places_googlemap_help.php', 'newwindow', 'height=500,width=600,resizable=yes,scrollbars=yes'); newwindow.focus();\">{$admtext['maphelp']}</a></span>\n";
---
> 	$glang = isset($text['glang']) ? $text['glang'] : "en";
> 	echo "<span class=\"normal\"><br /><a href=\"javascript:newwindow=window.open('{$http}://maps.google.com/maps?f=q&amp;hl=" . $glang ."$mcharsetstr&amp;q=". (isset($row['place']) ? $row['place'] : "") . "', 'googlehelp'); newwindow.focus();\"> {$admtext['difficultmap']}</a> | <a href=\"javascript:newwindow=window.open('$maphelplang/places_googlemap_help.php', 'newwindow', 'height=500,width=600,resizable=yes,scrollbars=yes'); newwindow.focus();\">{$admtext['maphelp']}</a></span>\n";
diff -r TNG/googlemaplib2.php TNG1403/googlemaplib2.php
31d30
< //var placelevel = <?php echo $placelevel; ?>;
59c58
< 	if(jQuery('#location').val() && jQuery('#latbox').val()=="" && jQuery('#lonbox').val()=="")
---
> 	if(jQuery('#location').val() && jQuery('#placelevel').val()!='-1'  && jQuery('#latbox').val()=="" && jQuery('#lonbox').val()=="")
diff -r TNG/googlemaplib.php TNG1403/googlemaplib.php
25c25
< 	while (list($key, $val) = each($locations2map)) {
---
> 	foreach($locations2map as $key => $val) {
69c69
< 		while(list($key, $val) = each($locations2map)) {
---
> 		foreach($locations2map as $key => $val) {
77c77
< 			$uniqueplace = $val['place'] . " " . $lat . $long;
---
> 			$uniqueplace = isset($val['place']) ? $val['place'] : "" . " " . $lat . $long;
diff -r TNG/headstones.php TNG1403/headstones.php
7c7
< $mapkeystr = $map['key'] && $map['key'] != "1" ? "&key=" . $map['key'] : "";
---
> $mapkeystr = $map['key'] && $map['key'] != "1" ? "&amp;key=" . $map['key'] . "&amp;callback=initMap" : "";
19a20
> if(!isset($flags['scripting'])) $flags['scripting'] = "";
24,36c25,39
< if(!isset($max_cemeteries)) $max_cemeteries = 5;
< 
< $city = preg_replace("/[<>{};!=]/", '', $city);
< $county = preg_replace("/[<>{};!=]/", '', $county);
< $state = preg_replace("/[<>{};!=]/", '', $state);
< $country = preg_replace("/[<>{};!=]/", '', $country);
< 
< if (get_magic_quotes_gpc() == 0) {
< 	$city = addslashes($city);
< 	$county = addslashes($county);
< 	$state = addslashes($state);
< 	$country = addslashes($country);
< }
---
> $cemnewoffset = 0;
> $cemoffsetplus = 0;
> if(!isset($max_cemeteries)) $max_cemeteries = 100;
> $mcharsetstr = "&amp;oe=$session_charset";
> 
> $city = isset($city) ? preg_replace("/[<>{};!=]/", '', $city) : "";
> $county = isset($county) ? preg_replace("/[<>{};!=]/", '', $county) : "";
> $state = isset($state) ? preg_replace("/[<>{};!=]/", '', $state) : "";
> $country = isset($country) ? preg_replace("/[<>{};!=]/", '', $country) : "";
> 
> $city = addslashes($city);
> $county = addslashes($county);
> $state = addslashes($state);
> $country = addslashes($country);
> if(!isset($cemeteryID)) $cemeteryID = "";
41c44
< 	if( $cemoffset ) {
---
> 	if(!empty($cemoffset)) {
68a72
> $totrows = 0;
92c96
< if(!$tngpage && !$cemeteryID && $cemresult && tng_num_rows($cemresult) == 1) {
---
> if(empty($tngpage) && !$cemeteryID && $cemresult && tng_num_rows($cemresult) == 1) {
96a101,103
> } else {
> 	// Initialize the cemeteryID for use in the link on line 118.
> 	$cemetery['cemeteryID'] = "";
99c106
< if( $offset ) {
---
> if(!empty($offset)) {
152c159
< 	$query = "SELECT DISTINCT $media_table.mediaID, description, notes, path, thumbpath, status, plot, showmap, usecollfolder, form, mediatypeID, abspath, newwindow
---
> 	$query = "SELECT DISTINCT $media_table.mediaID, description, notes, path, thumbpath, status, plot, showmap, usecollfolder, form, mediatypeID, abspath, newwindow, latitude, longitude
157a165
> 		$cemetery['cemeteryID'] = "";
197,199c205,207
< 		$lat = $cemetery['latitude'];
< 		$long = $cemetery['longitude'];
< 		$zoom = $cemetery['zoom'] ? $cemetery['zoom'] : 10;
---
> 		$lat = isset($cemetery['latitude']) ? $cemetery['latitude'] : "";
> 		$long = isset($cemetery['longitude']) ? $cemetery['longitude'] : "";
> 		$zoom = isset($cemetery['zoom']) ? $cemetery['zoom'] : 10;
204c212
< 	 		$cemeteryplace = "{$cemetery['city']}, {$cemetery['county']}, {$cemetery['state']}, {$cemetery['country']}";
---
> 	 		$cemeteryplace = "{$cemetery['cemname']}, {$cemetery['city']}, {$cemetery['county']}, {$cemetery['state']}, {$cemetery['country']}";
209c217
< 			$codednotes .= "<br /><br /><a href=\"{$http}://maps.google.com/maps?f=q{$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($remoteballoontext)\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $localballooncemeteryname";
---
> 			$codednotes .= "<br /><br /><a href=\"{$http}://maps.google.com/maps?f=q&amp;hl={$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($remoteballoontext)\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $localballooncemeteryname";
212c220
< 			$body .= "<a href=\"{$http}://maps.google.com/maps?f=q{$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($remoteballoontext)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target=\"_blank\"><img src=\"{$cms['tngpath']}google_marker.php?image=$pinplacelevel2.png&amp;text=$l2mCount\" alt=\"\" border=\"0\" align=\"left\" style=\"padding-right:5px\" /></a>";
---
> 			$body .= "<a href=\"{$http}://maps.google.com/maps?f=q&amp;hl={$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($remoteballoontext)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target=\"_blank\"><img src=\"{$cms['tngpath']}google_marker.php?image=$pinplacelevel2.png&amp;text=$l2mCount\" alt=\"\" border=\"0\" align=\"left\" style=\"padding-right:5px\" /></a>";
229c237
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
231c239
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback normal\">";
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\" style=\"width:100%\">";
298c306
< 		$hs['allow_living'] = 1;
---
> 		$hs['allow_living'] = $hs['allow_private'] = 1;
335c343
< 	echo "<div id=\"map\" class=\"rounded10 cemmap\"></div>\n";
---
> 	echo "<div id=\"map\" style=\"width: {$map['hstw']}; height: {$map['hsth']};\" class=\"rounded10 cemmap\"></div>\n";
337c345
< if($toppagenav)
---
> if(!empty($toppagenav))
diff -r TNG/heatmap.php TNG1403/heatmap.php
12,13c12,13
< $heatmap = $mtype == "h" || !isset($mtype);
< $markermap = $mtype == "m" || !isset($mtype);
---
> $heatmap = !isset($mtype) || $mtype == "h" ;
> $markermap = !isset($mtype) || $mtype == "m";
15c15,16
< tng_query_noerror(" SET OPTION SQL_BIG_SELECTS = 1 " );
---
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
53,54c54,55
< if($psearch) {
< 	$query = "SELECT place, latitude, longitude, notes FROM $places_table WHERE place LIKE \"%$psearch%\" AND latitude != \"\" AND longitude != \"\"";
---
> if( !empty($psearch) ) {
> 	$query = "SELECT place, latitude, longitude, notes FROM $places_table WHERE place REGEXP \"[[:<:]]{$psearch}[[:>:]]\" AND latitude != \"\" AND longitude != \"\"";
62c63
< elseif($firstchar) {
---
> elseif( !empty($firstchar) ) {
71,82c72,83
< elseif($mylastname || $myfirstname || $mypersonid || $mybirthplace || $mybirthyear || $myaltbirthplace || $mydeathplace || $mydeathyear || $myburialplace || $myburialyear || $mygender || $branch) {
< 	$mylastname = trim(stripslashes($mylastname));
< 	$myfirstname = trim(stripslashes($myfirstname));
< 	$mypersonid = trim(stripslashes($mypersonid));
< 	$mybirthplace = trim(stripslashes($mybirthplace));
< 	$mybirthyear = trim(stripslashes($mybirthyear));
< 	$myaltbirthplace = trim(stripslashes($myaltbirthplace));
< 	$myaltbirthyear = trim(stripslashes($myaltbirthyear));
< 	$mydeathplace = trim(stripslashes($mydeathplace));
< 	$mydeathyear = trim(stripslashes($mydeathyear));
< 	$myburialplace = trim(stripslashes($myburialplace));
< 	$myburialyear = trim(stripslashes($myburialyear));
---
> elseif( !empty($mylastname) || !empty($myfirstname) || !empty($mypersonid) || !empty($mybirthplace) || !empty($mybirthyear) || !empty($myaltbirthplace) || !empty($mydeathplace) || !empty($mydeathyear) || !empty($myburialplace) || !empty($myburialyear) || !empty($mygender) || !empty($branch) ) {
> 	$mylastname = !empty($mylastname) ? trim(stripslashes($mylastname)) : "";
> 	$myfirstname = !empty($myfirstname) ? trim(stripslashes($myfirstname)) : "";
> 	$mypersonid = !empty($mypersonid) ? trim(stripslashes($mypersonid)) : "";
> 	$mybirthplace = !empty($mybirthplace) ? trim(stripslashes($mybirthplace)) : "";
> 	$mybirthyear = !empty($mybirthyear) ? trim(stripslashes($mybirthyear)) : "";
> 	$myaltbirthplace = !empty($myaltbirthplace) ? trim(stripslashes($myaltbirthplace)) : "";
> 	$myaltbirthyear = !empty($myaltbirthyear) ? trim(stripslashes($myaltbirthyear)) : "";
> 	$mydeathplace = !empty($mydeathplace) ? trim(stripslashes($mydeathplace)) : "";
> 	$mydeathyear = !empty($mydeathyear) ? trim(stripslashes($mydeathyear)) : "";
> 	$myburialplace = !empty($myburialplace) ? trim(stripslashes($myburialplace)) : "";
> 	$myburialyear = !empty($myburialyear) ? trim(stripslashes($myburialyear)) : "";
85c86
< 	$currargs = $orderloc > 0 ? substr($_SERVER['QUERY_STRING'],0,$orderloc) : $_SERVER['QUERY_STRING'];
---
> 	$currargs = isset($orderloc) && $orderloc > 0 ? substr($_SERVER['QUERY_STRING'],0,$orderloc) : $_SERVER['QUERY_STRING'];
91c92
< 	if( $mylastname || $lnqualify == "exists" || $lnqualify == "dnexist" )  {
---
> 	if( !empty($mylastname) || (isset($lnqualify) && ($lnqualify == "exists" || $lnqualify == "dnexist")) )  {
98c99
< 	if( $myfirstname || $fnqualify == "exists" || $fnqualify == "dnexist" ) {
---
> 	if( !empty($myfirstname) || (isset($fnqualify) && ($fnqualify == "exists" || $fnqualify == "dnexist")) ) {
103c104
< 		if($idqualify == "equals" && is_numeric($mypersonid)) $mypersonid = $personprefix . $mypersonid . $personsuffix;
---
> 		if($idqualify == "equals" && is_numeric($mypersonid)) $mypersonid = $tngconfig['personprefix'] . $mypersonid . $tngconfig['personsuffix'];
106c107
< 	if( $mytitle || $tqualify == "exists" || $tqualify == "dnexist" ) {
---
> 	if( !empty($mytitle) || (isset($tqualify) && ($tqualify == "exists" || $tqualify == "dnexist")) ) {
109c110
< 	if( $myprefix || $pfqualify == "exists" || $pfqualify == "dnexist" ) {
---
> 	if( !empty($myprefix) || (isset($pfqualify) && ($pfqualify == "exists" || $pfqualify == "dnexist")) ) {
112c113
< 	if( $mysuffix || $sfqualify == "exists" || $sfqualify == "dnexist" ) {
---
> 	if( !empty($mysuffix) || (isset($sfqualify) && ($sfqualify == "exists" || $sfqualify == "dnexist")) ) {
115c116
< 	if( $mynickname || $nnqualify == "exists" || $nnqualify == "dnexist" ) {
---
> 	if( !empty($mynickname) || (isset($nnqualify) && ($nnqualify == "exists" || $nnqualify == "dnexist")) ) {
118c119
< 	if( $mybirthplace || $bpqualify == "exists" || $bpqualify == "dnexist" ) {
---
> 	if( !empty($mybirthplace) || (isset($bpqualify) && ($bpqualify == "exists" || $bpqualify == "dnexist")) ) {
121c122
< 	if( $mybirthyear || $byqualify == "exists" || $byqualify == "dnexist" ) {
---
> 	if( !empty($mybirthyear) || (isset($byqualify) && ($byqualify == "exists" || $byqualify == "dnexist")) ) {
124c125
< 	if( $myaltbirthplace || $cpqualify == "exists" || $cpqualify == "dnexist" ) {
---
> 	if( !empty($myaltbirthplace) || (isset($cpqualify) && ($cpqualify == "exists" || $cpqualify == "dnexist")) ) {
127c128
< 	if( $myaltbirthyear || $cyqualify == "exists" || $cyqualify == "dnexist" ) {
---
> 	if( !empty($myaltbirthyear) || (isset($cyqualify) && ($cyqualify == "exists" || $cyqualify == "dnexist")) ) {
130c131
< 	if( $mydeathplace || $dpqualify == "exists" || $dpqualify == "dnexist" ) {
---
> 	if( !empty($mydeathplace) || (isset($dpqualify) && ($dpqualify == "exists" || $dpqualify == "dnexist")) ) {
133c134
< 	if( $mydeathyear || $dyqualify == "exists" || $dyqualify == "dnexist" ) {
---
> 	if( !empty($mydeathyear) || (isset($dyqualify) && ($dyqualify == "exists" || $dyqualify == "dnexist")) ) {
136c137
< 	if( $myburialplace || $brpqualify == "exists" || $brpqualify == "dnexist" ) {
---
> 	if( !empty($myburialplace) || (isset($brpqualify) && ($brpqualify == "exists" || $brpqualify == "dnexist")) ) {
139c140
< 	if( $myburialyear || $bryqualify == "exists" || $bryqualify == "dnexist" ) {
---
> 	if( !empty($myburialyear) || (isset($bryqualify) && ($bryqualify == "exists" || $bryqualify == "dnexist")) ) {
142c143
< 	if( $mygender ) {
---
> 	if( !empty($mygender) ) {
175c176
< 	$gotInput = $mytitle || $myprefix || $mysuffix || $mynickname || $mybirthplace || $mydeathplace || $mybirthyear || $mydeathyear || $ecount;
---
> 	$gotInput = !empty($mytitle) || !empty($myprefix) || !empty($mysuffix) || !empty($mynickname) || !empty($mybirthplace) || !empty($mydeathplace) || !empty($mybirthyear) || !empty($mydeathyear) || !empty($ecount);
178c179
< 	if($more) {
---
> 	if( !empty($more) ) {
197c198
< 			IF(birthplace, birthplace, altbirthplace) as birthp, birthdate, altbirthdate, p.gedcom ";
---
> 			IF(birthplace, birthplace, altbirthplace) as birthp, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, p.gedcom ";
224c225,226
< if( $map['key'] && $isConnected)
---
> if( $map['key'] && $isConnected) {
> 	if( !isset($flags['scripting']) ) $flags['scripting'] = "";
225a228
> }
231a235
> if( !isset($querystring) ) $querystring = "";
258c262
< 		$person->name = "<a href=\"{$getperson_url}personID={$row['personID']}&tree={$row['gedcom']}\">" . getName($row) . "</a>";
---
> 		$person->name = "<a href=\"{$getperson_url}personID={$row['personID']}&amp;tree={$row['gedcom']}\">" . getName($row) . "</a>";
277a282,283
> 			$rawbirthplace = !empty($person->birthplace) ? $person->birthplace : "";
> 			$rawbirthdate = !empty($person->birthdate) ? $person->birthdate : "";
280,282c286,288
< 				$person->name = utf8_encode($person->name);
< 				$birthplace = utf8_encode($person->birthplace);
< 				$birthdate = utf8_encode($person->birthdate);
---
> 				$person->name = mb_convert_encoding($person->name, 'UTF-8', 'ISO-8859-1');
> 				$birthplace = mb_convert_encoding($rawbirthplace, 'UTF-8', 'ISO-8859-1');
> 				$birthdate = mb_convert_encoding($rawbirthdate, 'UTF-8', 'ISO-8859-1');
288c294
< 			$birthplace = json_encode(trim($person->birthplace));
---
> 			$birthplace = json_encode(trim($rawbirthplace));
291c297
< 			$birthdate = json_encode(trim($person->birthdate));
---
> 			$birthdate = json_encode(trim($rawbirthdate));
302,305c308,311
< 		$thisplace = utf8_encode(trim($place->place));
< 		$notes = utf8_encode(trim($place->notes));
< 		$latitude = utf8_encode($place->latitude);
< 		$longitude = utf8_encode($place->longitude);
---
> 		$thisplace = mb_convert_encoding(trim($place->place), 'UTF-8', 'ISO-8859-1');
> 		$notes = mb_convert_encoding(trim($place->notes), 'UTF-8', 'ISO-8859-1');
> 		$latitude = mb_convert_encoding($place->latitude, 'UTF-8', 'ISO-8859-1');
> 		$longitude = mb_convert_encoding($place->longitude, 'UTF-8', 'ISO-8859-1');
347c353
< 	var imageUrl = 'http://chart.apis.google.com/chart?cht=mm&chs=24x32&chco=FFFFFF,008CFF,000000&ext=.png';
---
> 	var imageUrl = 'https://chart.apis.google.com/chart?cht=mm&chs=24x32&chco=FFFFFF,008CFF,000000&ext=.png';
368c374
< 			var imageUrl = 'http://chart.apis.google.com/chart?cht=mm&chs=24x32&chco=FFFFFF,008CFF,000000&ext=.png';
---
> 			var imageUrl = 'https://chart.apis.google.com/chart?cht=mm&chs=24x32&chco=FFFFFF,008CFF,000000&ext=.png';
388c394
< 	           imagePath: 'https://cdn.rawgit.com/googlemaps/js-marker-clusterer/gh-pages/images/m' 
---
> 	           imagePath: 'img/m'
diff -r TNG/historytemplate.php TNG1403/historytemplate.php
15c15
< //1a: If you want to skip the login check when displaying this page, remote the comment marks from this line:
---
> //1a: If you want to skip the login check when displaying this page, remove the comment marks from this line:
17a18
> $cms['tngpath'] = "../";
40a42
> echo "<h1 class=\"header\">$yourtitle</h1><br clear=\"left\"/>\n";
53c55
< http://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Getting_Started</p>
---
> https://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Getting_Started</p>
diff -r TNG/imageutils.php TNG1403/imageutils.php
36c36
< 		if($session_charset == "UTF-8") $dest = utf8_decode($dest);
---
> 		//if($session_charset == "UTF-8") $dest = utf8_decode($dest);
92a93,97
> 				if( strtolower($destInfo['extension']) == "gif" || strtolower($destInfo['extension']) == "png" ) {
> 					imagecolortransparent($destImage, imagecolorallocatealpha($destImage, 0, 0, 0, 127));
> 					imagealphablending($destImage, false);
> 					imagesavealpha($destImage, true);
> 				}
129,162c134
< 						if(function_exists('exif_read_data')) {
< 					        $exif = @exif_read_data($src);
< 		        			if($exif !== false) {
< 								//get the orientation
< 								$ort = $exif['Orientation'];
< 
< 								//determine what oreientation the image was taken at
< 								switch($ort) {
< 									case 2: // horizontal flip
< 										tngImageFlip($destImage);
< 										break;
< 									case 3: // 180 rotate left
< 										$destImage = imagerotate($destImage, 180, -1);
< 										break;
< 									case 4: // vertical flip
< 										tngImageFlip($destImage);
< 										break;
< 									case 5: // vertical flip + 90 rotate right
< 										tngImageFlip($destImage);
< 										$destImage = imagerotate($destImage, -90, -1);
< 										break;
< 									case 6: // 90 rotate right
< 										$destImage = imagerotate($destImage, -90, -1);
< 										break;
< 									case 7: // horizontal flip + 90 rotate right
< 										tngImageFlip($destImage);
< 										$destImage = imagerotate($destImage, -90, -1);
< 										break;
< 									case 8: // 90 rotate left
< 										$destImage = imagerotate($destImage, 90, -1);
< 										break;
< 								}
< 							}
< 						}
---
> 						$destImage = tngImageRotate($src, $destImage);
177a150,187
> function tngImageRotate($src, $destImage) {
> 	if(function_exists('exif_read_data')) {
>         $exif = @exif_read_data($src);
> 		if($exif !== false) {
> 			//get the orientation
> 			$ort = isset($exif['Orientation']) ? $exif['Orientation'] : "";
> 
> 			//determine what oreientation the image was taken at
> 			switch($ort) {
> 				case 2: // horizontal flip
> 					tngImageFlip($destImage);
> 					break;
> 				case 3: // 180 rotate left
> 					$destImage = imagerotate($destImage, 180, imagecolorallocatealpha($destImage, 0, 0, 0 , 127));
> 					break;
> 				case 4: // vertical flip
> 					tngImageFlip($destImage);
> 					break;
> 				case 5: // vertical flip + 90 rotate right
> 					tngImageFlip($destImage);
> 					$destImage = imagerotate($destImage, -90, imagecolorallocatealpha($destImage, 0, 0, 0 , 127));
> 					break;
> 				case 6: // 90 rotate right
> 					$destImage = imagerotate($destImage, -90, imagecolorallocatealpha($destImage, 0, 0, 0 , 127));
> 					break;
> 				case 7: // horizontal flip + 90 rotate right
> 					tngImageFlip($destImage);
> 					$destImage = imagerotate($destImage, -90, imagecolorallocatealpha($destImage, 0, 0, 0 , 127));
> 					break;
> 				case 8: // 90 rotate left
> 					$destImage = imagerotate($destImage, 90, imagecolorallocatealpha($destImage, 0, 0, 0 , 127));
> 					break;
> 			}
> 		}
> 	}
> 	return $destImage;
> }
> 
Only in TNG1403/img: admin
Only in TNG1403/img: admin_background.jpg
Only in TNG1403/img: admin_banner1.jpg
Only in TNG1403/img: admin_banner2.jpg
Only in TNG1403/img: admin_banner3.jpg
Only in TNG1403/img: admin_banner4.jpg
Only in TNG1403/img: admin_banner5.jpg
Binary files TNG/img/admin_icon_sprites.png and TNG1403/img/admin_icon_sprites.png differ
Only in TNG1403/img: ArrowDownYellow.gif
Only in TNG1403/img: arrowright2.gif
Only in TNG1403/img: ArrowUpYellow.gif
Only in TNG1403/img: backtotop.png
Only in TNG1403/img: eye-slash2.png
Only in TNG1403/img: eye-slash.webp
Only in TNG1403/img: m1.png
Only in TNG1403/img: m2.png
Only in TNG1403/img: m3.png
Only in TNG1403/img: m4.png
Only in TNG1403/img: m5.png
Only in TNG1403/img: public
Only in TNG1403/img: pwdoff.png
Only in TNG1403/img: pwdon.png
Only in TNG1403/img: reportback1.jpg
Only in TNG1403/img: tng_collapse_yellow.gif
Only in TNG1403/img: tng_expand_yellow.gif
Only in TNG1403/img: tnglogo.png
Binary files TNG/img/tng_small_icon_sprites.gif and TNG1403/img/tng_small_icon_sprites.gif differ
Only in TNG1403/img: zoomin.png
Only in TNG1403/img: zoomout.png
Only in TNG1403/img: zoomreset.png
diff -r TNG/img_newwin.php TNG1403/img_newwin.php
21c21
<     <script language="JavaScript" type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/img_viewer.js"></script>
---
>     <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/img_viewer.js"></script>
31c31
< <iframe name="iframe1" id="iframe1" src="<?php echo getURL("img_viewer",1); ?>sa=1&mediaID=<?php echo $_GET['mediaID']; ?>&medialinkID=<?php echo $_GET['medialinkID']; ?>" width="100%" height="1" onLoad="calcHeight(1);" frameborder="0" marginheight="0" marginwidth="0" scrolling="no">
---
> <iframe name="iframe1" id="iframe1" src="<?php echo getURL("img_viewer",1); ?>sa=1&amp;mediaID=<?php echo $_GET['mediaID']; ?>&amp;medialinkID=<?php echo $_GET['medialinkID']; ?>" width="100%" height="1" onLoad="calcHeight(1);" frameborder="0" marginheight="0" marginwidth="0" scrolling="no">
diff -r TNG/img_viewer.php TNG1403/img_viewer.php
4a5,7
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
> 
37a41,46
> if( !isset($personID) ) $personID = "";
> if( !isset($albumID) ) $albumID = "";
> if( !isset($albumlinkID) ) $albumlinkID = "";
> if( !isset($cemeteryID) ) $cemeteryID = "";
> if( !isset($eventID) ) $eventID = "";
> 
41c50,51
< $flags['scripting'] = "<link href=\"{$cms['tngpath']}css/img_viewer.css\" rel=\"stylesheet\" type=\"text/css\">\n<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/img_viewer.js\"></script>";
---
> $flags['css'] = "<link href=\"{$cms['tngpath']}css/img_viewer.css?v=" . (filemtime($rootpath."css/img_viewer.css")) . "\" rel=\"stylesheet\" type=\"text/css\">";
> $flags['scripting'] = "<script type=\"text/javascript\" src=\"{$cms['tngpath']}js/img_viewer.js\"></script>";
47c57
< echo '<body style="background-image: none">';
---
> echo '<body style="background-image: none; background-color: inherit;">';
89a100,101
>     $headheight = 100;
>     echo "<div style=\"height:{$headheight}px;overflow:scroll\">\n";
91a104
>     echo "</div>\n";
93c106
< else 
---
> else {
94a108,109
>     $headheight = 0;
> }
103c118,121
< 	echo "var pan_msg = \"{$text['pan']}\";\n";
---
> 	if($sitever != "mobile") 
> 		echo "var pan_msg = \"{$text['pan']}\";\n";
> 	else
> 		echo "var pan_msg = \"\"\n";
113c131,157
< 	echo "if(parent.document.getElementById(window.name)) {viewer = imageViewer(\"imgviewer\", \"$mediasrc\", \"$width\", \"$height\", $sa, \"$mediaID\", \"$medialinkID\", \"".urlencode($imgrow['description'])."\");}\n";
---
>     echo "var rectangles = new Array();\n";
>     echo "var rect;\n";
> 
> //get rectangles
> //loop and create js rectangles var
> 	$result = getImageTags($mediaID);
> 
> 	while( $row = tng_fetch_assoc($result) ) {
> 		list($label, $media_link_url) = getImageTagInfo($row);
> 		$row['rtop'] += $headheight;
> 
> 		echo "rect = new Object();\n";
> 		echo "\n";
> 		echo "rect.id = \"{$row['ID']}\";\n";
> 		echo "rect.link = \"{$media_link_url}\";\n";
> 		echo "rect.top = \"{$row['rtop']}\";\n";
> 		echo "rect.left = \"{$row['rleft']}\";\n";
> 		echo "rect.width = \"{$row['rwidth']}\";\n";
> 		echo "rect.height = \"{$row['rheight']}\";\n";
> 		echo "rect.personid = \"{$row['persfamID']}\";\n";
> 		echo "rect.tree = \"{$row['gedcom']}\";\n";
> 		echo "rect.text = \"{$label}\";\n";
> 		echo "rectangles.push(rect);\n";
> 	}
> 	tng_free_result($result);
> 
> 	echo "if(parent.document.getElementById(window.name)) {viewer = imageViewer(\"imgviewer\", \"$mediasrc\", \"$width\", \"$height\", $sa, \"$mediaID\", \"$medialinkID\", \"".urlencode($imgrow['description'])."\", rectangles);}\n";
diff -r TNG/importconfig.php TNG1403/importconfig.php
2a3
> $tngimpcfg['saveconfig'] = "";
7,10c8,11
< $tngimpcfg['defimpopt'] = 0;
< $tngimpcfg['chdate'] = 0;
< $tngimpcfg['livingreqbirth'] = 0;
< $tngimpcfg['maxlivingage'] = 110;
---
> $tngimpcfg['defimpopt'] = "0";
> $tngimpcfg['chdate'] = "0";
> $tngimpcfg['livingreqbirth'] = "0";
> $tngimpcfg['maxlivingage'] = "110";
12a14
> $tngimpcfg['maxmarriedage'] = "0";
18c20
< $wholepath = "";
---
> $wholepath = "0";
20c22,23
< ?>
---
> $tngimpcfg['coerce'] = "0";
> ?>
\ No newline at end of file
Only in TNG: index_html.html
diff -r TNG/index_plus_header_footer.php TNG1403/index_plus_header_footer.php
3,5c3,5
< include($cms[tngpath] . "genlib.php");
< include($cms[tngpath] . "getlang.php");
< include($cms[tngpath] . "$mylanguage/text.php");
---
> include($cms['tngpath'] . "genlib.php");
> include($cms['tngpath'] . "getlang.php");
> include($cms['tngpath'] . "$mylanguage/text.php");
7c7
< include($cms[tngpath] . "checklogin.php");
---
> include($cms['tngpath'] . "checklogin.php");
9c9
< tng_header( $text[homepage], $flags );
---
> tng_header( $text['homepage'], $flags );
13c13
< <h1><?php echo $text[mnuheader]; ?></h1>
---
> <h1><?php echo $text['mnuheader']; ?></h1>
17c17
< 		echo "<p><strong>$text[welcome], $currentuserdesc.</strong></p>\n";
---
> 		echo "<p><strong>{$text['welcome']}, $currentuserdesc.</strong></p>\n";
21c21
< <h2><?php echo $text[mnusearchfornames]; ?></h2>
---
> <h2><?php echo $text['mnusearchfornames']; ?></h2>
25,26c25,26
< 	<tr><td><span class="normal"><?php echo $text[mnulastname]; ?>: </span><br/><input type="text" name="mylastname" size="14"></td></tr>
< 	<tr><td><span class="normal"><?php echo $text[mnufirstname]; ?>:</span><br/><input type="text" name="myfirstname" size="14"></td></tr>
---
> 	<tr><td><span class="normal"><?php echo $text['mnulastname']; ?>: </span><br/><input type="text" name="mylastname" size="14"></td></tr>
> 	<tr><td><span class="normal"><?php echo $text['mnufirstname']; ?>:</span><br/><input type="text" name="myfirstname" size="14"></td></tr>
31c31
< <h2><?php echo $text[mnufeatures]; ?></h2>
---
> <h2><?php echo $text['mnufeatures']; ?></h2>
36c36
< 		echo "<li><a href=\"logout.php\">$text[mnulogout]</a></li>\n";
---
> 		echo "<li><a href=\"logout.php\">{$text['mnulogout']}</a></li>\n";
39c39
< 		echo "<li><a href=\"login.php\">$text[mnulogon]</a></li>\n";
---
> 		echo "<li><a href=\"login.php\">{$text['mnulogon']}</a></li>\n";
41,63c41,63
< 	echo "<li><a href=\"newacctform.php\">$text[mnuregister]</a></li>\n";
< 	echo "<li><a href=\"searchform.php\">$text[mnuadvancedsearch]</a></li>\n";
< 	echo "<li><a href=\"surnames.php\">$text[mnulastnames]</a></li>\n";
< 	echo "<li><a href=\"bookmarks.php\">$text[bookmarks]</a></li>\n";
< 	echo "<li><a href=\"statistics.php\">$text[mnustatistics]</a></li>\n";
< 	echo "<li><a href=\"browsemedia.php?mediatypeID=photos\">$text[mnuphotos]</a></li>\n";
< 	echo "<li><a href=\"browsemedia.php?mediatypeID=histories\">$text[mnuhistories]</a></li>\n";
< 	echo "<li><a href=\"browsemedia.php?mediatypeID=documents\">$text[documents]</a></li>\n";
< 	echo "<li><a href=\"browsemedia.php?mediatypeID=videos\">$text[videos]</a></li>\n";
< 	echo "<li><a href=\"browsemedia.php?mediatypeID=recordings\">$text[recordings]</a></li>\n";
< 	echo "<li><a href=\"browsealbums.php\">$text[albums]</a></li>\n";
< 	echo "<li><a href=\"browsemedia.php\">$text[allmedia]</a></li>\n";
< 	echo "<li><a href=\"cemeteries.php\">$text[mnucemeteries]</a></li>\n";
< 	echo "<li><a href=\"browseheadstones.php\">$text[mnutombstones]</a></li>\n";
< 	echo "<li><a href=\"places.php\">$text[places]</a></li>\n";
< 	echo "<li><a href=\"browsenotes.php\">$text[notes]</a></li>\n";
< 	echo "<li><a href=\"anniversaries.php\">$text[anniversaries]</a></li>\n";
< 	echo "<li><a href=\"reports.php\">$text[mnureports]</a></li>\n";
< 	echo "<li><a href=\"browsesources.php\">$text[mnusources]</a></li>\n";
< 	echo "<li><a href=\"browserepos.php\">$text[repositories]</a></li>\n";
< 	echo "<li><a href=\"whatsnew.php\">$text[mnuwhatsnew]</a></li>\n";
< 	echo "<li><a href=\"mostwanted.php\">$text[mostwanted]</a></li>\n";
< 	echo "<li><a href=\"changelanguage.php\">$text[mnulanguage]</a></li>\n";
---
> 	echo "<li><a href=\"newacctform.php\">{$text['mnuregister']}</a></li>\n";
> 	echo "<li><a href=\"searchform.php\">{$text['mnuadvancedsearch']}</a></li>\n";
> 	echo "<li><a href=\"surnames.php\">{$text['mnulastnames']}</a></li>\n";
> 	echo "<li><a href=\"bookmarks.php\">{$text['bookmarks']}</a></li>\n";
> 	echo "<li><a href=\"statistics.php\">{$text['mnustatistics']}</a></li>\n";
> 	echo "<li><a href=\"browsemedia.php?mediatypeID=photos\">{$text['mnuphotos']}</a></li>\n";
> 	echo "<li><a href=\"browsemedia.php?mediatypeID=histories\">{$text['mnuhistories']}</a></li>\n";
> 	echo "<li><a href=\"browsemedia.php?mediatypeID=documents\">{$text['documents']}</a></li>\n";
> 	echo "<li><a href=\"browsemedia.php?mediatypeID=videos\">{$text['videos']}</a></li>\n";
> 	echo "<li><a href=\"browsemedia.php?mediatypeID=recordings\">{$text['recordings']}</a></li>\n";
> 	echo "<li><a href=\"browsealbums.php\">{$text['albums']}</a></li>\n";
> 	echo "<li><a href=\"browsemedia.php\">{$text['allmedia']}</a></li>\n";
> 	echo "<li><a href=\"cemeteries.php\">{$text['mnucemeteries']}</a></li>\n";
> 	echo "<li><a href=\"browseheadstones.php\">{$text['mnutombstones']}</a></li>\n";
> 	echo "<li><a href=\"places.php\">{$text['places']}</a></li>\n";
> 	echo "<li><a href=\"browsenotes.php\">{$text['notes']}</a></li>\n";
> 	echo "<li><a href=\"anniversaries.php\">{$text['anniversaries']}</a></li>\n";
> 	echo "<li><a href=\"reports.php\">{$text['mnureports']}</a></li>\n";
> 	echo "<li><a href=\"browsesources.php\">{$text['mnusources']}</a></li>\n";
> 	echo "<li><a href=\"browserepos.php\">{$text['repositories']}</a></li>\n";
> 	echo "<li><a href=\"whatsnew.php\">{$text['mnuwhatsnew']}</a></li>\n";
> 	echo "<li><a href=\"mostwanted.php\">{$text['mostwanted']}</a></li>\n";
> 	echo "<li><a href=\"changelanguage.php\">{$text['mnulanguage']}</a></li>\n";
65,66c65,66
< 		echo "<li><a href=\"admin.php\">$text[mnuadmin]</a></li>\n";
< 		echo "<li><a href=\"showlog.php\">$text[mnushowlog]</a></li>\n";
---
> 		echo "<li><a href=\"admin.php\">{$text['mnuadmin']}</a></li>\n";
> 		echo "<li><a href=\"showlog.php\">{$text['mnushowlog']}</a></li>\n";
68c68
< 	echo "<li><a href=\"suggest.php\">$text[contactus]</a></li>\n";
---
> 	echo "<li><a href=\"suggest.php\">{$text['contactus']}</a></li>\n";
diff -r TNG/js/admin.js TNG1403/js/admin.js
40,71d39
< function toggleSection(section,img,display) {
< 	if(display == 'on') {
< 		jQuery('#'+img).attr('src','img/tng_collapse.gif');
< 		var doit = true;
< 		if(section == "modifyexisting") {
< 			var agent = navigator.userAgent.toLowerCase();
< 			if(agent.indexOf('safari')!=-1) doit = false;
< 		}
< 		if(doit)
< 			jQuery('#'+section).fadeIn(300);
< 		else
< 			jQuery('#'+section).show();
< 	}
< 	else if(display == 'off') {
< 		jQuery('#'+img).attr('src','img/tng_expand.gif');
< 		jQuery('#'+section).fadeOut(300);
< 	}
< 	else {
< 		jQuery('#'+img).attr('src', jQuery('#'+img).attr('src').indexOf('collapse') > 0 ? 'img/tng_expand.gif' : 'img/tng_collapse.gif');
< 		var doit = true;
< 		if(section == "addmedia") {
< 			var agent = navigator.userAgent.toLowerCase();
< 			if(agent.indexOf('safari')!=-1 && agent.indexOf('version/3') == -1) doit = false;
< 		}
< 		if(doit)
< 			jQuery('#'+section).toggle(300);
< 		else
< 			jQuery('#'+section.css('display', jQuery('#'+section).css('display') == 'none' ? '' : 'none'));
< 	}
< 	return false;
< }
< 
74c42,43
< 	var params = {folder:name};
---
> 	var oldfolder = jQuery('#'+folder+'_org').val();
> 	var params = {type:folder,oldfolder:oldfolder,newfolder:name};
81a51
> 			jQuery('#'+folder+'_org').val(name);
122c92
< function updateLivingBox(field) {
---
> function updateLivingBox(form, field) {
124c94,112
< 		document.form1.living.checked = false;
---
> 		form.living.checked = false;
> }
> 
> function toggleAdminMenu(arrow) {
> 	if(jQuery('#leftmenu').position().left == 0) {
> 		jQuery('#leftmenu').css('overflow','hidden');
> 		jQuery('#leftmenu').animate({left: '-=135'}, 250, 'swing');
> 		jQuery('#maincontent').animate({'paddingLeft': '-=135px'}, 250, 'swing');
> 		jQuery('#dirarrow').attr('src','img/ArrowRight.gif');
> 		jQuery('#leftmenu a').fadeOut(300);
> 		jQuery.ajax({url:'ajx_setsessionvar.php',data:{varname:'tng_menuhidden',varvalue:'on'}});
> 	} else {
> 		jQuery('#leftmenu').css('overflow','auto');
> 		jQuery('#maincontent').animate({'paddingLeft': '+=135px'}, 250, 'swing');
> 		jQuery('#leftmenu').animate({left: '+=135'}, 250, 'swing');
> 		jQuery('#dirarrow').attr('src','img/ArrowLeft.gif');
> 		jQuery('#leftmenu a').fadeIn(300);
> 		jQuery.ajax({url:'ajx_setsessionvar.php',data:{varname:'tng_menuhidden',varvalue:'off'}});
> 	}
127,130d114
< function deepOpen(url,winName) {
< 	window.open('deepindex.php?page=' + encodeURIComponent(url,winName));
< 	return false;
< }
\ No newline at end of file
diff -r TNG/js/albums.js TNG1403/js/albums.js
1,9d0
< function validateForm( ) {
< 	var rval = true;
< 	if( document.form1.albumname.value.length == 0 ) {
< 		alert("<?php echo $admtext[enteralbumname]; ?>");
< 		rval = false;
< 	}
< 	return rval;
< }
< 
172c163
< 	tnglitbox = new LITBox('findalbummedia.php',{width:750,height:540});
---
> 	tnglitbox = new LITBox('findalbummedia.php',{width:800,height:600});
diff -r TNG/js/cookiebanner.js TNG1403/js/cookiebanner.js
1,3c1
< !function(){if(!window.hasCookieConsent){window.hasCookieConsent=!0;var e="cookieconsent_options",t="update_cookieconsent_options",n="cookieconsent_dismissed",i="//s3.amazonaws.com/valao-cloud/cookie-hinweis/";if(!(document.cookie.indexOf(n)>-1)){"function"!=typeof String.prototype.trim&&(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")});var o,s={isArray:function(e){var t=Object.prototype.toString.call(e);return"[object Array]"==t},isObject:function(e){return"[object Object]"==Object.prototype.toString.call(e)},each:function(e,t,n,i){if(s.isObject(e)&&!i)for(var o in e)e.hasOwnProperty(o)&&t.call(n,e[o],o,e);else for(var r=0,c=e.length;c>r;r++)t.call(n,e[r],r,e)},merge:function(e,t){e&&s.each(t,function(t,n){s.isObject(t)&&s.isObject(e[n])?s.merge(e[n],t):e[n]=t})},bind:function(e,t){return function(){return e.apply(t,arguments)}},queryObject:function(e,t){var n,i=0,o=e;for(t=t.split(".");(n=t[i++])&&o.hasOwnProperty(n)&&(o=o[n]);)if(i===t.length)return o;return null},setCookie:function(e,t,n){var i=new Date;n=n||365,i.setDate(i.getDate()+n),document.cookie=e+"="+t+"; expires="+i.toUTCString()+"; path=/"},addEventListener:function(e,t,n){e.addEventListener?e.addEventListener(t,n):e.attachEvent("on"+t,n)}},r=function(){var e="data-cc-event",t="data-cc-if",n=function(e,t,i){return s.isArray(t)?s.each(t,function(t){n(e,t,i)}):void(e.addEventListener?e.addEventListener(t,i):e.attachEvent("on"+t,i))},i=function(e,t){return e.replace(/\{\{(.*?)\}\}/g,function(e,n){for(var i,o=n.split("||");token=o.shift();){if(token=token.trim(),'"'===token[0])return token.slice(1,token.length-1);if(i=s.queryObject(t,token))return i}return""})},o=function(e){var t=document.createElement("div");return t.innerHTML=e,t.children[0]},r=function(e,t,n){var i=e.parentNode.querySelectorAll("["+t+"]");s.each(i,function(e){var i=e.getAttribute(t);n(e,i)},window,!0)},c=function(t,i){r(t,e,function(e,t){var o=t.split(":"),r=s.queryObject(i,o[1]);n(e,o[0],s.bind(r,i))})},a=function(e,n){r(e,t,function(e,t){var i=s.queryObject(n,t);i||e.parentNode.removeChild(e)})};return{build:function(e,t){s.isArray(e)&&(e=e.join("")),e=i(e,t);var n=o(e);return c(n,t),a(n,t),n}}}(),c={options:{message:"Diese Website nutzt Cookies, um bestm&ouml;gliche Funktionalit&auml;t bieten zu k&ouml;nnen. ",dismiss:"Got it!",learnMore:"More info",link:null,container:null,theme:"light-floating",markup:['<div class="cc_banner-wrapper {{containerClasses}}">','<div class="cc_banner cc_container cc_container--open">','<a href="#null" data-cc-event="click:dismiss" class="cc_btn cc_btn_accept_all">{{options.dismiss}}</a>','<p class="cc_message">{{options.message}} <a rel="nofollow" data-cc-if="options.link" class="cc_more_info" href="{{options.link || "#null"}}">{{options.learnMore}}</a></p>',"</div>","</div>"]},init:function(){var t=window[e];t&&this.setOptions(t),this.setContainer(),this.options.theme?this.loadTheme(this.render):this.render()},setOptionsOnTheFly:function(e){this.setOptions(e),this.render()},setOptions:function(e){s.merge(this.options,e)},setContainer:function(){this.container=this.options.container?document.querySelector(this.options.container):document.body,this.containerClasses="",navigator.appVersion.indexOf("MSIE 8")>-1&&(this.containerClasses+=" cc_ie8")},loadTheme:function(e){var t=this.options.theme;-1===t.indexOf(".css")&&(t=i+t+".css");var n=document.createElement("link");n.rel="stylesheet",n.type="text/css",n.href=t;var o=!1;n.onload=s.bind(function(){!o&&e&&(e.call(this),o=!0)},this),document.getElementsByTagName("head")[0].appendChild(n)},render:function(){this.element&&this.element.parentNode&&(this.element.parentNode.removeChild(this.element),delete this.element),this.element=r.build(this.options.markup,this),this.container.firstChild?this.container.insertBefore(this.element,this.container.firstChild):this.container.appendChild(this.element)},dismiss:function(e){e.preventDefault&&e.preventDefault(),e.returnValue=!1,this.setDismissedCookie(),this.container.removeChild(this.element)},setDismissedCookie:function(){s.setCookie(n,"yes")}},a=!1;(o=function(){a||"complete"!=document.readyState||(c.init(),a=!0,window[t]=s.bind(c.setOptionsOnTheFly,c))})(),s.addEventListener(document,"readystatechange",o)}}}(); (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
< new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
< })(window,document,'script','dataLayer','GTM-TVL985');
\ No newline at end of file
---
> !function(){if(!window.hasCookieHinweis){window.hasCookieHinweis=!0;var e="CookieHinweis_options",t="update_CookieHinweis_options",n="CookieHinweis_agree",i="//s3.eu-central-1.amazonaws.com/website-tutor/cookiehinweis/";if(!(document.cookie.indexOf(n)>-1)){"function"!=typeof String.prototype.trim&&(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")});var o,s={isArray:function(e){var t=Object.prototype.toString.call(e);return"[object Array]"==t},isObject:function(e){return"[object Object]"==Object.prototype.toString.call(e)},each:function(e,t,n,i){if(s.isObject(e)&&!i)for(var o in e)e.hasOwnProperty(o)&&t.call(n,e[o],o,e);else for(var r=0,c=e.length;c>r;r++)t.call(n,e[r],r,e)},merge:function(e,t){e&&s.each(t,function(t,n){s.isObject(t)&&s.isObject(e[n])?s.merge(e[n],t):e[n]=t})},bind:function(e,t){return function(){return e.apply(t,arguments)}},queryObject:function(e,t){var n,i=0,o=e;for(t=t.split(".");(n=t[i++])&&o.hasOwnProperty(n)&&(o=o[n]);)if(i===t.length)return o;return null},setCookie:function(e,t,n){var i=new Date;n=n||365,i.setDate(i.getDate()+n),document.cookie=e+"="+t+"; expires="+i.toUTCString()+"; path=/"},addEventListener:function(e,t,n){e.addEventListener?e.addEventListener(t,n):e.attachEvent("on"+t,n)}},r=function(){var e="data-cc-event",t="data-cc-if",n=function(e,t,i){return s.isArray(t)?s.each(t,function(t){n(e,t,i)}):void(e.addEventListener?e.addEventListener(t,i):e.attachEvent("on"+t,i))},i=function(e,t){return e.replace(/\{\{(.*?)\}\}/g,function(e,n){for(var i,o=n.split("||");token=o.shift();){if(token=token.trim(),'"'===token[0])return token.slice(1,token.length-1);if(i=s.queryObject(t,token))return i}return""})},o=function(e){var t=document.createElement("div");return t.innerHTML=e,t.children[0]},r=function(e,t,n){var i=e.parentNode.querySelectorAll("["+t+"]");s.each(i,function(e){var i=e.getAttribute(t);n(e,i)},window,!0)},c=function(t,i){r(t,e,function(e,t){var o=t.split(":"),r=s.queryObject(i,o[1]);n(e,o[0],s.bind(r,i))})},a=function(e,n){r(e,t,function(e,t){var i=s.queryObject(n,t);i||e.parentNode.removeChild(e)})};return{build:function(e,t){s.isArray(e)&&(e=e.join("")),e=i(e,t);var n=o(e);return c(n,t),a(n,t),n}}}(),c={options:{message:"Diese Website nutzt Cookies, um bestm&ouml;gliche Funktionalit&auml;t bieten zu k&ouml;nnen. ",agree:"Ok, verstanden",learnMore:"Mehr Informationen",link:null,container:null,theme:"dunkel-unten",markup:['<div class="cc_banner-wrapper {{containerClasses}}">','<div class="cc_banner cc_container cc_container--open">','<a href="#null" data-cc-event="click:agree" class="cc_btn cc_btn_accept_all">{{options.agree}}</a>','<p class="cc_message">{{options.message}} <a rel="nofollow" data-cc-if="options.link" class="cc_more_info" href="{{options.link || "#null"}}">{{options.learnMore}}</a></p>',"</div>","</div>"]},init:function(){var t=window[e];t&&this.setOptions(t),this.setContainer(),this.options.theme?this.loadTheme(this.render):this.render()},setOptionsOnTheFly:function(e){this.setOptions(e),this.render()},setOptions:function(e){s.merge(this.options,e)},setContainer:function(){this.container=this.options.container?document.querySelector(this.options.container):document.body,this.containerClasses="",navigator.appVersion.indexOf("MSIE 8")>-1&&(this.containerClasses+=" cc_ie8")},loadTheme:function(e){var t=this.options.theme;-1===t.indexOf(".css")&&(t=i+t+".css");var n=document.createElement("link");n.rel="stylesheet",n.type="text/css",n.href=t;var o=!1;n.onload=s.bind(function(){!o&&e&&(e.call(this),o=!0)},this),document.getElementsByTagName("head")[0].appendChild(n)},render:function(){this.element&&this.element.parentNode&&(this.element.parentNode.removeChild(this.element),delete this.element),this.element=r.build(this.options.markup,this),this.container.firstChild?this.container.insertBefore(this.element,this.container.firstChild):this.container.appendChild(this.element)},agree:function(e){e.preventDefault&&e.preventDefault(),e.returnValue=!1,this.setAgreedCookie(),this.container.removeChild(this.element)},setAgreedCookie:function(){s.setCookie(n,"yes")}},a=!1;(o=function(){a||"complete"!=document.readyState||(c.init(),a=!0,window[t]=s.bind(c.setOptionsOnTheFly,c))})(),s.addEventListener(document,"readystatechange",o)}}}();
\ No newline at end of file
diff -r TNG/js/dataimport.js TNG1403/js/dataimport.js
4a5,6
> var lastcount = 0;
> var currcount;
9a12,22
> var needcheck = false;
> 
> var reset_restarts = 15;
> var restarts_left = reset_restarts;
> var tree = "";
> var treeselect;
> var already_checking = false;
> var first_pause = true;
> var data_interval = 3000;
> var first_check = true;
> var first_wait = 0;
13d25
< 	var treeselect = document.form1.tree1;
24a37,38
> 			tree = form.tree1.options[form.tree1.selectedIndex].value;
> 			treeselect = document.form1.tree1;
28,31c42,53
< 			if(form.remotefile.value.length)
< 				popup += uploading + ' ' + form.remotefile.value;
< 			else
< 				popup += opening + ' ' + form.database.value;
---
> 			var filename = '';
> 			if(form.remotefile.value.length) {
> 				filename = form.remotefile.value.split('\\').pop().split('/').pop();
> 				popup += uploading + ' ' + filename;
> 				implinksstyle = ' style="display:none"';
> 				form.database.value = "";
> 			}
> 			else {
> 				filename = form.database.value;
> 				popup += opening + ' ' + filename;
> 				implinksstyle = '';
> 			}
33c55
< 			popup += '<div id="impdata" style="visibility:hidden">\n';
---
> 			popup += '<div id="impdata"">\n';
42c64
< 			popup += '<br/><div id="implinks" class="subhead"><a href="#" onclick="return suspendimport();">'+stopmsg+'</a>';
---
> 			popup += '<br/><div id="implinks" class="subhead"' + implinksstyle + '><a href="#" onclick="return suspendimport();">'+stopmsg+'</a>';
45c67
< 				popup += ' |  <a href="admin_gedimport.php?tree=' + treeval + '&resuming=1" id="resumelink" target="results" onclick="resumeimport();">'+resumemsg+'</a>';
---
> 				popup += ' |  <a href="admin_gedimport.php?resuming=1&tree=' + treeval + '" id="resumelink" target="results" onclick="resumeimport();">'+resumemsg+'</a>';
47c69,71
< 			popup += '</div>\n<div id="errormsg"></div>';
---
> 			popup += '</div>\n';
> 			popup += '<div id="closelinks" class="subhead" style="display:none"><a href="admin_secondmenu.php?tree=' + tree + '">' + more_options + '</a> | <span id="toremove"><a href="#" onclick="return removeFile(' + "'" + filename + "'" + ');">' + removeged_msg + '</a></span>'
> 			popup += '<p><a href="#" onclick="tnglitbox.remove();return false;"><img src="img/tng_close.gif" border="0" align="left" style="margin-right:5px"/>' + close_msg + '</a></p></div>';
50a75,80
> 
> 			if(form.database.value.length)
> 				first_wait = form.remotefile.value.split('.').pop().toLowerCase() == "zip" ? 10000 : 5000;
> 				//console.log('STARTING, wait' + first_wait);
> 				timecheck = setDataCheck(first_wait);
> 			//}
59c89
< 	if(submitted && started && !done && !suspended) {
---
> 	if(started && !done && !suspended && !document.form1.database.value.length) {
61,62c91,95
< 		var treeselect = document.form1.tree1;
< 		self.frames[0].location.href = "admin_gedimport.php?tree="+treeselect.options[treeselect.selectedIndex].value+"&resuming=1";
---
> 		treeselect = document.form1.tree1;
> 		var del = $('input[name="del"]:checked').val();
> 		//console.log('starting over in iframeloaded, normal the first time');
> 		self.frames[0].location.href = "admin_gedimport.php?resuming=1&first=1&del="+del+"&tree="+treeselect.options[treeselect.selectedIndex].value;
> 		jQuery('#implinks').show();
64,66c97
< 		//may not be necessary with "onload"
< 		//v12: putting it back so we can restart if we're not getting partial out
< 		timecheck = setTimeout(checkIfDone, checksecs);
---
> 		//timecheck = setDataCheck(data_interval);
79a111
> 	timecheck = setTimeout(getImportData, data_interval);
92a125
> 	clearTimeout(timecheck);
97,107c130,203
< function checkIfDone() {
< 	if(started && !done && !suspended) {
< 		//console.log('still going at '+lastptr);
< 		if(lastptr == $('#bar').width()) {
< 			var treeselect = document.form1.tree1;
< 			self.frames[0].location.href = "admin_gedimport.php?tree="+treeselect.options[treeselect.selectedIndex].value+"&resuming=1";
< 		}
< 		else {
< 			lastptr = $('#bar').width();
< 		}
< 		timecheck = setTimeout(checkIfDone, checksecs);
---
> function setDataCheck(time_interval) {
> 	clearTimeout(timecheck);
> 	return setTimeout(getImportData, time_interval);
> }
> 
> function getImportData() {
> 	//console.log('do ajax call to get import data');
> 	if((first_check || !done) && !suspended && !already_checking) {
> 		already_checking = true;
> 		var params = {tree: tree};
> 		jQuery.ajax({
> 			url: 'ajx_getimportdata.php',
> 			data: params,
> 			dataType: 'json',
> 			success: function(vars){
> 				if(vars.error) {
> 					//console.log(vars.error);
> 					done = true;
> 					jQuery('#importmsg').html(vars.error);
> 				}
> 				else {
> 					currcount = vars.icount + vars.fcount + vars.scount + vars.ncount + vars.mcount + vars.pcount;
> 					needcheck = true;
> 					if(vars.barwidth == lastptr && currcount == lastcount && !done) { //no progress
> 						if(first_pause) {
> 							first_pause = false;
> 							wait = 10000;
> 						}
> 						else if(!done) {
> 							//console.log('second call to import data and no progress, hard restart');
> 							treeselect = document.form1.tree1;
> 							self.frames[0].location.href = "admin_gedimport.php?resuming=1&tree="+treeselect.options[treeselect.selectedIndex].value;
> 							if(restarts_left) {
> 								timecheck = setDataCheck(data_interval);
> 								first_pause = true;
> 								restarts_left--;
> 								needcheck = false;
> 							}
> 							else {
> 								done = true;
> 								jQuery('#importmsg').html("Import timed out, unable to restart");
> 							}
> 						}
> 					}
> 					else {
> 						jQuery('#importmsg').html(importing_msg);
> 						jQuery('#personcount').html(vars.icount);
> 						jQuery('#familycount').html(vars.fcount);
> 						jQuery('#sourcecount').html(vars.scount);
> 						jQuery('#notecount').html(vars.ncount);
> 						jQuery('#mediacount').html(vars.mcount);
> 						jQuery('#placecount').html(vars.pcount);
> 
> 						jQuery('#bar').width(vars.barwidth);
> 						lastptr = vars.barwidth;
> 						lastcount = currcount;
> 						if(vars.barwidth == 500) 
> 							done = true;
> 						else {
> 							restarts_left = reset_restarts;
> 							wait = data_interval;
> 						}
> 						//console.log('counts updated, bar at ' + vars.barwidth + '. check again in 3 secs');
> 					}
> 					if(!suspended && needcheck) {
> 						if(!done)
> 							timecheck = setDataCheck(wait);
> 						else
> 							onComplete();
> 					}
> 				}
> 				already_checking = false;
> 			}
> 		});
108a205,213
> 	if(done) 
> 		onComplete();
> }
> 
> function onComplete() {
> 	jQuery('#bar').width(500);
> 	jQuery('#implinks').hide();
> 	jQuery('#closelinks').show();
> 	jQuery('#importmsg').html(finished_msg);
144c249
< 					var treeselect = document.form1.tree1;
---
> 					treeselect = document.form1.tree1;
diff -r TNG/js/editfamily.js TNG1403/js/editfamily.js
27,30c27,29
< 						jQuery('#child_'+personID).remove();
< 						childcount -= 1;
< 						jQuery('#childcount').html(childcount);
< 					}
---
> 					jQuery('#child_'+personID).remove();
> 					childcount -= 1;
> 					jQuery('#childcount').html(childcount);
diff -r TNG/js/eventtypes.js TNG1403/js/eventtypes.js
54c54
< 	if( flag )
---
> 	if( flag ) {
56c56,58
< 	else
---
> 		jQuery('#typereq').fadeIn(400);
> 	}
> 	else {
57a60,61
> 		jQuery('#typereq').fadeOut(400);
> 	}
diff -r TNG/js/img_utils.js TNG1403/js/img_utils.js
1c1
< <script language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
diff -r TNG/js/img_viewer.js TNG1403/js/img_viewer.js
172,188c172,218
< 	map = document.getElementById('imgMapViewer');
< 	if (canvas.zoom == 0 || canvas.zoom == -1) {
< 	    zoom = canvas.image.height / canvas.image.fullHeight;
< 	}
< 	else {
< 	    zoom = canvas.zoom;
< 	}
< 	for (var i = 0; i < map.areas.length; i++) {
< 	    area = map.areas[i];
< 	    var coords = new Array;
< 	    coords = canvas.origmap[i].split(',');
< 	    var newCoords = new Array;
< 	    for (var j = 0; j < coords.length; j++) {
< 		newCoords.push(Math.floor(coords[j] * zoom));
< 	    }
< 	    area.coords = newCoords.join(',');
< 	}
---
>     	map = document.getElementById('imgMapViewer');
>     	if (canvas.zoom == 0 || canvas.zoom == -1) {
>     	    zoom = canvas.image.height / canvas.image.fullHeight;
>     	}
>     	else {
>     	    zoom = canvas.zoom;
>     	}
>     	for (var i = 0; i < map.areas.length; i++) {
>     	    area = map.areas[i];
>     	    var coords = new Array;
>     	    coords = canvas.origmap[i].split(',');
>     	    var newCoords = new Array;
>     	    for (var j = 0; j < coords.length; j++) {
>     		newCoords.push(Math.floor(coords[j] * zoom));
>     	    }
>     	    area.coords = newCoords.join(',');
>     	}
>         var tags = canvas.tags;
>         if(tags) {
>             var newFontSize = tags.origFontSize * zoom;
>             if(zoom < .75) 
>                 newFontSize = 8;
>             else if(zoom < 1)
>                 newFontSize = 10;
>             else if(zoom < 1.5)
>                 newFontSize = 12;
>             else
>                 newFontSize = 14;
>             tags.style.fontSize = newFontSize + 'px';
>             var overhang, side;
>             for(var i = 0; i < tags.childNodes.length; i++) {
>                 tag = tags.childNodes[i];
>                 tag.style.width = (tag.origWidth * zoom) + 'px';
>                 tag.style.height = (tag.origHeight * zoom) + 'px';
>                 tag.style.left = (tag.origLeft * zoom) + 'px';
>                 tag.style.top = ((tag.origTop - canvas.offset) * zoom + canvas.offset) + 'px';
>                 label = tag.childNodes[0];
>                 label_top = (tag.origHeight * zoom) + 1;
>                 label.style.top = label_top + 'px';
>                 overhang = 100 - parseInt(tag.origWidth * zoom);
>                 if(overhang > 0) {
>                     side = -1 * Math.round(overhang/2);
>                     label.style.left = side + 'px';
>                     label.style.right = side + 'px';
>                 } 
>             }
>         }
225a256,262
>     var tags = canvas.tags;
>     if(tags) {
>         tags.style.width = img.width + 'px';
>         tags.style.height = img.height + 'px';
>         tags.style.top = '38px';
>         tags.style.left = 0;
>     }
312a350,356
>     var tags = canvas.tags;
>     if(tags) {
>         tags.style.width = img.width + 'px';
>         tags.style.height = img.height  + 'px';
>         tags.style.top = '38px';
>         tags.style.left = 0;
>     }
376c420
< function imageViewer(baseID, imgURL, fullWidth, fullHeight, standalone, mediaID, medialinkID, title) {
---
> function imageViewer(baseID, imgURL, fullWidth, fullHeight, standalone, mediaID, medialinkID, title, rectangles) {
391a436,493
>     if (standalone == true) {
>         canvas.offset = 100;  //height of title at top of page
>     }
>     else {
>         canvas.offset = 0;
>     }
> 
>     if(rectangles.length) {
>         var tags = document.createElement('div');
> 
>         tags.id = "tags";
>         tags.style.width = fullWidth + 'px';
>         tags.style.height = fullHeight + 'px';
>         tags.origFontSize = 12;
>         tags.style.fontSize = "12px";
> 
>         var box, label, label_top, overhang, side;
>         for(var i=0; i < rectangles.length; i++) {
>             rect = rectangles[i];
> 
>             label = document.createElement('div');
>             label.className = "imagetag";
>             label_top = parseInt(rect.height) + 1;
>             label.style.top = label_top + 'px';
>             //label.style.visibility = 'hidden';
>             label.innerHTML = rect.text;
>             overhang = 100 - parseInt(rect.width);
>             if(overhang > 0) {
>                 side = -1 * Math.round(overhang/2);
>                 label.style.left = side + 'px';
>                 label.style.right = side + 'px';
>             } 
> 
>             box = document.createElement('div');
>             box.id = 'box_' + rect.id;
>             box.className = "mlbox bunselected";
>             if(rect.link)
>                 box.className += " pubbox";
>             box.style.position = 'absolute';
>             box.style.top = rect.top + 'px';
>             box.style.left = rect.left + 'px';
>             box.style.width = rect.width + 'px';
>             box.style.height = rect.height + 'px';
>             box.style.opacity = '0';
>             box.origTop = rect.top;
>             box.origLeft = rect.left;
>             box.origWidth = rect.width;
>             box.origHeight = rect.height;
>             box.personid = rect.personid;
>             box.tree = rect.tree;
>             box.link = rect.link;
>             box.onmouseover = handleTagMouseOver;
>             box.onmouseout = handleTagMouseOut;
>             box.onclick = handleTagClick;
>             box.appendChild(label);
>             tags.appendChild(box);
>         }
>     }
416a519
>  
418a522,527
>     if(rectangles.length) {
>         canvas.tags = tags;
>         canvas.appendChild(tags);
>     }
>     //canvas.appendChild(test);
> 
423,430c532,539
< 	area = map.areas[i];
< 	canvas.origmap[i] = area.coords;
< 	if (standalone == true) {
< 	    area.target = '_blank';
< 	}
< 	else {
< 	    area.target = '_parent';
< 	}
---
>     	area = map.areas[i];
>     	canvas.origmap[i] = area.coords;
>     	if (standalone == true) {
>     	    area.target = '_blank';
>     	}
>     	else {
>     	    area.target = '_parent';
>     	}
613,614c722,725
< 	enableContainer.style.display = "none";
< 	controllerContainer.style.display = "";
---
>     	enableContainer.style.display = "none";
>     	controllerContainer.style.display = "";
>         if(rectangles.length)
>             tags.style.display = "";
627a739,740
>     if(rectangles.length)
>         tags.style.display = "none";
656a770,784
> function handleTagMouseOver(e) { 
>     this.style.opacity = '1';
>     //this.childNodes[0].style.visibility = 'visible';
> }
> 
> function handleTagMouseOut(e) { 
>     this.style.opacity = typeof(parent.toggle_off) == 'undefined' ? 0 : parent.toggle_off;
>     //this.childNodes[0].style.visibility = 'hidden';
> }
> 
> function handleTagClick(e) {
>     if(this.link)
>         parent.location.href = this.link;
> }
> 
741a870
>         var tags = this.tags;
744,759c873,896
< 		// compute top and left coordinates
< 		var top = lastTop + (e.clientY - lastY);
< 		if (top > 0) { top = 0; }
< 		var left = lastLeft + (e.clientX - lastX);
< 		if (left > 0) { left = 0; }
< 
< 		if (img.panH == true) 
< 		    if (img.width + left < img.bodyw) { left = img.bodyw - img.width; }
< 
< 		if (img.panV == true) 
< 		    if (img.height + top < img.bodyh) { top = img.bodyh - img.height; }
< 		//document.getElementById('debug').innerHTML = 'DEBUG: ('+top+')('+img.width+')('+img.height+')('+img.bodyw+')('+img.bodyh+')('+this.offsetTop+')';
< 
< 		// pan the image
< 		if (img.panV) { img.style.top  = top + 'px'; }
< 		if (img.panH) { img.style.left = left + 'px'; }
---
>     		// compute top and left coordinates
>     		var top = lastTop + (e.clientY - lastY);
>     		if (top > 0) { top = 0; }
>     		var left = lastLeft + (e.clientX - lastX);
>     		if (left > 0) { left = 0; }
> 
>     		if (img.panH == true) 
>     		    if (img.width + left < img.bodyw) { left = img.bodyw - img.width; }
> 
>     		if (img.panV == true) 
>     		    if (img.height + top < img.bodyh) { top = img.bodyh - img.height; }
>     		//document.getElementById('debug').innerHTML = 'DEBUG: ('+top+')('+img.width+')('+img.height+')('+img.bodyw+')('+img.bodyh+')('+this.offsetTop+')';
> 
>     		// pan the image
>     		if (img.panV) { 
>                 img.style.top  = top + 'px'; 
>                 if(tags)
>                     tags.style.top = (top + 38) + 'px';
>             }
>     		if (img.panH) { 
>                 img.style.left = left + 'px'; 
>                 if(tags)
>                     tags.style.left = left + 'px';
>             }
Only in TNG/js: jquery-1.8.3.min.js
Only in TNG/js: jquery-3.3.1.min.js
Only in TNG1403/js: jquery-3.4.1.min.js
Only in TNG/js: jquery-ui-1.9.2.js
diff -r TNG/js/litbox.js TNG1403/js/litbox.js
20a21,22
>    this.ready = true;
>    
51,56c53
< 	 	var tempvar = this.getAjax(this.url);
< 		this.d4.innerHTML = tempvar;
<         	//jQuery.get(this.url, function(html) {
<         		//jQuery(self.d4).html(html);
< 			//self.display();
<         	//});
---
> 		    this.getAjax(this);
58c55,57
<          case 'alert' : this.d4.innerHTML = this.url;
---
>          case 'alert' : 
> 			this.d4.innerHTML = this.url;
> 		    this.display();
73a73
> 			this.display();
75c75
< 		this.display();
---
> 
111c111
<       this.close.innerHTML='<img src="' + closeimg + '" border="0">';
---
>       this.close.innerHTML='<img src="' + closeimg + '" border="0" alt="">';
248c248
<    getAjax: function(url){
---
>    getAjax: function(litboxObj) {
250c250
<       /*@cc_on @*/
---
>      /*@cc_on @*/
263a264
> 	  
266,267c267,281
<       if(url != ""){
<          xmlhttp.open("GET", url, false);
---
>       if(litboxObj.url != ""){
>          xmlhttp.open("GET", litboxObj.url, true);
>          xmlhttp.onload = function (e) {
>            if (xmlhttp.readyState === 4) {
>              if (xmlhttp.status === 200) {
>                litboxObj.d4.innerHTML = xmlhttp.responseText;
> 			   litboxObj.display();
>              } else {
>                console.error(xmlhttp.statusText);
>              }
>            }
>          };
>          xmlhttp.onerror = function (e) {
>            console.error(xmlhttp.statusText);
>          };
269d282
<          return xmlhttp.responseText;
306c319
< 	var newwindow = window.open(filename, 'newwindow', 'height=700,width=800,resizable=yes,scrollbars=yes');
---
> 	var newwindow = window.open(filename, 'newwindow', 'height=800,width=650,resizable=yes,scrollbars=yes');
310c323
< }
\ No newline at end of file
---
> }
diff -r TNG/js/mediafind.js TNG1403/js/mediafind.js
206a207,209
> 				jQuery('#sort_'+linkID+' [href]').attr('href', function(i,a) {
> 					return a.replace( /(event1=)[0-9]+/ig, '$1'+eventID.options[eventID.selectedIndex].value );
> 				});
213a217
> 				jQuery('#sort_'+linkID).effect('highlight',{},1400);
263c267
< 					var linkID = parseInt(req);
---
> 					//var linkID = parseInt(req);
289c293
< 					var sortlink = type != "album" && linktype != "C" ? ' (<a href="admin_ordermedia.php?tree1=' + treeID + '&linktype1=' + linktype + '&mediatypeID=' + mediatypeID + '&newlink1=' + entityID + '&event1=">' + sortmsg + '</a>)' : '';
---
> 					var sortlink = type != "album" && linktype != "C" ? ' (<a href="admin_ordermedia.php?tree1=' + treeID + '&amp;linktype1=' + linktype + '&amp;mediatypeID=' + mediatypeID + '&amp;newlink1=' + entityID + '&amp;event1=">' + sortmsg + '</a>)' : '';
diff -r TNG/js/mediautils.js TNG1403/js/mediautils.js
27a28,29
> 	if(gsControlName == "path")
> 		prepopulateThumb();
75,76c77,78
<         else
<                 dest.value = source.value;
---
>    else
>       dest.value = source.value;
87c89
< 		imgmap.style.display='none';
---
> 		//imgmap.style.display='none';
111c113
< function switchOnType(mtypeIndex) {
---
> function switchOnType(mtypeIndex, ext) {
140c142
< 	if( mediatypeID == "videos" ) {
---
> 	if( mediatypeID == "videos" || ext == "PDF") {
170,171c172,173
< 			document.form1.thumbcreate[0].checked = 'true';
< 			document.form1.thumbcreate[1].style.visibility = 'hidden';
---
> 			document.form1.thumbcreate[1].checked = 'true';
> 			document.form1.thumbcreate[0].style.visibility = 'hidden';
182c184
< 			document.form1.thumbcreate[1].style.visibility = 'visible';
---
> 			document.form1.thumbcreate[0].style.visibility = 'visible';
535c537
< 	var params = {type:type,link:link,action:'remsort'};
---
> 	var params = {type:type,sortlink:link,action:'remsort'};
Only in TNG1403/js: modmanager.js
diff -r TNG/js/mostwanted.js TNG1403/js/mostwanted.js
29c29
< 	mwlitbox = new LITBox('admin_editmostwanted.php?mwtype='+mwtype+'&ID='+ID,{width:645,height:440});
---
> 	mwlitbox = new LITBox('admin_editmostwanted.php?mwtype='+mwtype+'&ID='+ID,{width:645,height:540});
diff -r TNG/js/net.js TNG1403/js/net.js
76c76
< 		jQuery('#prev'+entitystr).html('<div id="ld'+entitystr+'"><img src="' + cmstngpath + 'img/spinner.gif" style="border:0px"> '+loadingmsg+'</div><a href="' + cmstngpath + 'showmedia.php?mediaID=' + mediaID + '&medialinkID=' + medialinkID + '"><img src="' + smallimage_url + 'mediaID=' + mediaID + '&path=' + encodeURIComponent(path) + '" style="display:none" onload="jQuery(\'#ld\'+\'' + entitystr + '\').hide(); this.style.display=\'\';"/></a>' + caption_div);
---
> 		jQuery('#prev'+entitystr).html('<div id="ld'+entitystr+'"><img src="' + cmstngpath + 'img/spinner.gif" style="border:0px"> '+loadingmsg+'</div><a href="' + cmstngpath + 'showmedia.php?mediaID=' + mediaID + '&amp;medialinkID=' + medialinkID + '"><img src="' + smallimage_url + 'mediaID=' + mediaID + '&amp;path=' + encodeURIComponent(path) + '" style="display:none" onload="jQuery(\'#ld\'+\'' + entitystr + '\').hide(); this.style.display=\'\';"/></a>' + caption_div);
136a137
> 		jQuery('#checkmsg').html('');
163c164
< 	var domains = ",AC,AD,AE,AERO,AF,AG,AI,AL,AM,AN,AO,AQ,AR,ARPA,AS,AT,AU,AW,AX,AZ,BA,BB,BD,BE,BF,BG,BH,BI,BIZ,BJ,BM,BN,BO,BR,BS,BT,BV,BW,BY,BZ,CA,CAT,CC,CD,CF,CG,CH,CI,CK,CL,CM,CN,CO,COM,COOP,CR,CU,CV,CX,CY,CZ,DE,DJ,DK,DM,DO,DZ,EC,EDU,EE,EG,ER,ES,ET,EU,FI,FJ,FK,FM,FO,FR,GA,GB,GD,GE,GF,GG,GH,GI,GL,GM,GN,GOV,GP,GQ,GR,GS,GT,GU,GW,GY,HK,HM,HN,HR,HT,HU,ID,IE,IL,IM,IN,INFO,INT,IO,IQ,IR,IS,IT,JE,JM,JO,JOBS,JP,KE,KG,KH,KI,KM,KN,KR,KW,KY,KZ,LA,LB,LC,LI,LK,LR,LS,LT,LU,LV,LY,MA,MC,MD,ME,MG,MH,MIL,MK,ML,MM,MN,MO,MOBI,MP,MQ,MR,MS,MT,MU,MUSEUM,MV,MW,MX,MY,MZ,NA,NAME,NC,NE,NET,NF,NG,NI,NL,NO,NP,NR,NU,NZ,OM,ONLINE,ORG,PA,PE,PF,PG,PH,PK,PL,PM,PN,PR,PRO,PS,PT,PW,PY,QA,RE,RO,RU,RW,SA,SB,SC,SD,SE,SG,SH,SI,SJ,SK,SL,SM,SN,SO,SR,ST,SU,SV,SY,SZ,TC,TD,TEL,TF,TG,TH,TJ,TK,TL,TM,TN,TO,TP,TR,TRAVEL,TT,TV,TW,TZ,UA,UG,UK,UM,US,UY,UZ,VA,VC,VE,VG,VI,VN,VU,WF,WORLD,WS,YE,YT,YU,ZA,ZM,ZW,";
---
> 	var domains = ",AC,AD,AE,AERO,AF,AG,AI,AL,AM,AN,AO,AQ,AR,ARPA,AS,AT,AU,AW,AX,AZ,BA,BB,BD,BE,BF,BG,BH,BI,BIZ,BJ,BM,BN,BO,BR,BS,BT,BV,BW,BY,BZ,CA,CAT,CC,CD,CF,CG,CH,CI,CK,CL,CM,CN,CO,COM,COOP,CR,CU,CV,CX,CY,CZ,DE,DEV,DJ,DK,DM,DO,DZ,EC,EDU,EE,EG,EMAIL,ER,ES,ET,EU,FAMILY,FI,FJ,FK,FM,FO,FR,GA,GB,GD,GE,GF,GG,GH,GI,GL,GM,GMX,GN,GOV,GP,GQ,GR,GS,GT,GU,GW,GY,HK,HM,HN,HR,HT,HU,ID,IE,IL,IM,IN,INFO,INT,IO,IQ,IR,IS,IT,JE,JM,JO,JOBS,JP,KE,KG,KH,KI,KIWI,KM,KN,KR,KW,KY,KZ,LA,LB,LC,LI,LIMO,LK,LR,LS,LT,LU,LV,LY,MA,MC,MD,ME,MG,MH,MIL,MK,ML,MM,MN,MO,MOBI,MP,MQ,MR,MS,MT,MU,MUSEUM,MV,MW,MX,MY,MZ,NA,NAME,NC,NE,NET,NF,NG,NI,NL,NO,NP,NR,NU,NZ,OM,ONE,ONLINE,ORG,PA,PE,PF,PG,PH,PK,PL,PM,PN,PR,PRO,PS,PT,PW,PY,QA,RE,RO,RU,RW,SA,SB,SC,SD,SE,SG,SH,SI,SJ,SK,SL,SM,SN,SO,SR,ST,SU,SV,SY,SZ,TC,TD,TEL,TF,TG,TH,TJ,TK,TL,TM,TN,TO,TP,TR,TRAVEL,TT,TV,TW,TZ,UA,UG,UK,UM,US,UY,UZ,VA,VC,VE,VG,VI,VN,VU,WF,WORLD,WS,YE,YT,YU,ZA,ZM,ZW,";
230c231
< 			affectedRows.show();
---
> 			affectedRows.toggle();
245a247,317
> function toggleSection(section,img,display) {
> 	if(display == 'on') {
> 		jQuery('#'+img).attr('src','img/tng_collapse.gif');
> 		var doit = true;
> 		if(section == "modifyexisting") {
> 			var agent = navigator.userAgent.toLowerCase();
> 			if(agent.indexOf('safari')!=-1) doit = false;
> 		}
> 		if(doit)
> 			jQuery('#'+section).fadeIn(300);
> 		else
> 			jQuery('#'+section).show();
> 	}
> 	else if(display == 'off') {
> 		jQuery('#'+img).attr('src','img/tng_expand.gif');
> 		jQuery('#'+section).fadeOut(300);
> 	}
> 	else {
> 		jQuery('#'+img).attr('src', jQuery('#'+img).attr('src').indexOf('collapse') > 0 ? 'img/tng_expand.gif' : 'img/tng_collapse.gif');
> 		var doit = true;
> 		if(section == "addmedia") {
> 			var agent = navigator.userAgent.toLowerCase();
> 			if(agent.indexOf('safari')!=-1 && agent.indexOf('version/3') == -1) doit = false;
> 		}
> 		if(doit)
> 			jQuery('#'+section).toggle(300);
> 		else
> 			jQuery('#'+section.css('display', jQuery('#'+section).css('display') == 'none' ? '' : 'none'));
> 	}
> 	return false;
> }
> 
> function togglePwd(fieldname,button) {
> 	if($('#'+fieldname).prop('type') == 'password') {
> 		$('#'+fieldname).prop('type','text');
> 		$('#'+button).attr('src','img/pwdoff.png');
> 	}
> 	else {
> 		$('#'+fieldname).prop('type','password');
> 		$('#'+button).attr('src','img/pwdon.png');
> 	}
> }
> 
> var fileTimeoutId = 0;
> function fpFilterChanged(event, searchTerm) {
> 	clearTimeout(fileTimeoutId);		
> 
> 	var keycode;
> 	if(event) keycode = event.keyCode;
> 	else if(e) keycode = e.which;
> 	else return true;
> 
> 	if(keycode == 9 || keycode == 13) return false;
> 	fileTimeoutId = setTimeout(function() {
> 		applyFileFilter(searchTerm)
> 	},500);
> }
> 
> function applyFileFilter(searchTerm) {
> 	//use jQuery to get all file rows
> 	var termlen = searchTerm.length;
> 	jQuery('tr.filerow').each(function(index, item){
> 		if(jQuery(item).find('td.lightback.filecell').html().toLowerCase().includes(searchTerm.toLowerCase()))
> 			jQuery(item).show();
> 		else
> 			jQuery(item).hide();
> 	});
> 
> 	return false;
> }
> 
250a323,324
> window.initMap = function(){};
> 
276a351,363
> 	$('.scroll-to-top').hide();
> 		//Check to see if the window is top if not then display button
> 		$(window).scroll(function () {
> 		if ($(this).scrollTop() > 300) {
> 			$('.scroll-to-top').fadeIn();
> 		} else {
> 			$('.scroll-to-top').fadeOut();
> 		}
> 	});
> 	$('.scroll-to-top').click(function () {
> 		$('html, body').animate({ scrollTop: 0 }, 800);
> 		return false;
> 	});
diff -r TNG/js/nicedit.js TNG1403/js/nicedit.js
72c72
< var nicLinkButton=nicEditorAdvancedButton.extend({addPane:function(){this.ln=this.ne.selectedInstance.selElm().parentTag("A");this.addForm({"":{type:"title",txt:"Add/Edit Link"},href:{type:"text",txt:"URL",value:"http://",style:{width:"150px"}},title:{type:"text",txt:"Title"},target:{type:"select",txt:"Open In",options:{"":"Current Window",_blank:"New Window"},style:{width:"100px"}}},this.ln)},submit:function(C){var A=this.inputs.href.value;if(A=="http://"||A==""){alert("You must enter a URL to Create a Link");return false}this.removePane();if(!this.ln){var B="javascript:nicTemp();";this.ne.nicCommand("createlink",B);this.ln=this.findElm("A","href",B)}if(this.ln){this.ln.setAttributes({href:this.inputs.href.value,title:this.inputs.title.value,target:this.inputs.target.options[this.inputs.target.selectedIndex].value})}}});nicEditors.registerPlugin(nicPlugin,nicLinkOptions);
---
> var nicLinkButton=nicEditorAdvancedButton.extend({addPane:function(){this.ln=this.ne.selectedInstance.selElm().parentTag("A");this.addForm({"":{type:"title",txt:"Add/Edit Link"},href:{type:"text",txt:"URL",value:"http://",style:{width:"150px"}},title:{type:"text",txt:"Title"},target:{type:"select",txt:"Open In",options:{"":"Current Window",_blank:"New Window"},style:{width:"100px"}}},this.ln)},submit:function(C){var A=this.inputs.href.value;if(A=="http://"||A==""){alert("You must enter a URL to Create a Link");return false}this.removePane();if(!this.ln){var B=this.inputs.title.value;this.ne.nicCommand("createlink",B);this.ln=this.findElm("A","href",B)}if(this.ln){this.ln.setAttributes({href:this.inputs.href.value,title:this.inputs.title.value,target:this.inputs.target.options[this.inputs.target.selectedIndex].value})}}});nicEditors.registerPlugin(nicPlugin,nicLinkOptions);
Only in TNG1403/js: panzoom.min.js
diff -r TNG/js/reports.js TNG1403/js/reports.js
2,4c2,4
< 	var displayfields = document.form1.displayfields;
< 	var criteriafields = document.form1.finalcriteria;
< 	var orderbyfields = document.form1.finalsort;
---
> 	var displayfields = jQuery('#displayfields li');
> 	var criteriafields = jQuery('#finalcriteria li');
> 	var orderbyfields = jQuery('#finalsort li');
9,10c9,10
< 	for( var i = 0; i < displayfields.options.length; i++ ) {
< 		displayfield.value = displayfield.value + displayfields.options[i].value + "\r\n";
---
> 	for( var i = 0; i < displayfields.length; i++ ) {
> 		displayfield.value = displayfield.value + displayfields[i].firstElementChild.innerHTML + "\r\n";
13,16c13,15
< 	for( var j = 0; j < criteriafields.options.length; j++ ) {
< 		if( criteriafields.options[j].text.substr(0,1) == "\"" )
< 			criteriafields.options[j].value = "\"" + criteriafields.options[j].value + "\"";
< 		criteriafield.value = criteriafield.value + criteriafields.options[j].value + "\r\n";
---
> 	for( var j = 0; j < criteriafields.length; j++ ) {
> 
> 		criteriafield.value = criteriafield.value + criteriafields[j].firstElementChild.innerHTML + "\r\n";
19,20c18,19
< 	for( var k = 0; k < orderbyfields.options.length; k++ ) {
< 		orderbyfield.value = orderbyfield.value + orderbyfields.options[k].value + "\r\n";
---
> 	for( var k = 0; k < orderbyfields.length; k++ ) {
> 		orderbyfield.value = orderbyfield.value + orderbyfields[k].firstElementChild.innerHTML + "\r\n";
24c23,30
< function AddConstant(source, dest, flag) {
---
> function add_to_list(item,listname) {
> 	var newitem = $(item).clone().prop('ondblclick',"").appendTo($('#'+listname));
>    	jQuery('#'+listname+' li').last().dblclick(function(){
>    		this.remove();
>    	});
> }
> 
> function AddConstant(source, flag) {
26,38c32,35
< 		if( flag )
< 			var newval = "\"" + source.value + "\"";
< 		else
< 			var newval = source.value;
< 		if(navigator.appName == "Netscape") {
< 			dest.options[dest.options.length] = new Option(newval,source.value,false,false)
< 		}
< 		else if( navigator.appName == "Microsoft Internet Explorer") {
< 			var newElem = document.createElement("OPTION");
< 			newElem.text = newval;
< 			newElem.value = source.value;
< 			dest.options.add(newElem);
< 		}	
---
> 		var newval = flag ? "\"" + source.value + "\"" : source.value;
> 		var newli = jQuery('<li>' + newval + '<span class="hidden">' + newval + '</span>');
> 		newli.dblclick(this.remove);
> 		newli.appendTo($('#finalcriteria'));
40c37,95
< }
\ No newline at end of file
---
> }
> 
> function handleKey(event, flag) {
>     if (event.keyCode == 13) {
>         event.preventDefault();
>         AddConstant(event.target,flag);
>         return false;
>     }
>     return true;
> }
> 
> jQuery(document).ready(function() {
> 	$( "#displayfields" ).sortable({
> 	    revert: true,
> 	    update: function(ev) {
> 	    	jQuery(ev.originalEvent.target).width('');
> 	    	jQuery(ev.originalEvent.target).prop('ondblclick',"").dblclick(this.remove);
> 	    }
> 	});
> 	$( "#displayavail li" ).draggable({
> 	    connectToSortable: "#displayfields",
> 	    helper: "clone",
> 	    revert: "invalid",
> 	    width: "none"
> 	});
> 	$( "#finalcriteria" ).sortable({
> 	    revert: true,
> 	    update: function(ev) {
> 	    	jQuery(ev.originalEvent.target).width('');
> 	    	jQuery(ev.originalEvent.target).prop('ondblclick',"").dblclick(this.remove);
> 	    }
> 	});
> 	$( "#availcriteria li" ).draggable({
> 	    connectToSortable: "#finalcriteria",
> 	    helper: "clone",
> 	    revert: "invalid",
> 	    width: "none"
> 	});
> 	$( "#availoperators li" ).draggable({
> 	    connectToSortable: "#finalcriteria",
> 	    helper: "clone",
> 	    revert: "invalid",
> 	    width: "none"
> 	});
> 	$( "#finalsort" ).sortable({
> 	    revert: true,
> 	    update: function(ev) {
> 	    	jQuery(ev.originalEvent.target).width('');
> 	    	jQuery(ev.originalEvent.target).prop('ondblclick',"").dblclick(this.remove);
> 	    }
> 	});
> 	$( "#availsort li" ).draggable({
> 	    connectToSortable: "#finalsort",
> 	    helper: "clone",
> 	    revert: "invalid",
> 	    width: "none"
> 	});
> 	$( "ul, li" ).disableSelection();	
> })
diff -r TNG/js/search.js TNG1403/js/search.js
4c4
< 		var matches = /p(\w*)_t(\w*):*(\w*)/.exec(item.id);
---
> 		var matches = /p(\w*)_t([a-zA-Z0-9_-]*):*(\w*)/.exec(item.id);
diff -r TNG/js/selectutils.js TNG1403/js/selectutils.js
1,45d0
< function AddtoDisplay(source, dest) {
< 	if( source.options[source.selectedIndex].selected ) {
< 		if(navigator.appName == "Netscape") {
< 			dest.options[dest.options.length] = new Option(source.options[source.selectedIndex].text,source.options[source.selectedIndex].value,false,false)
< 		}
< 		else if( navigator.appName == "Microsoft Internet Explorer") {
< 			var newElem = document.createElement("OPTION");
< 			newElem.text = source.options[source.selectedIndex].text;
< 			newElem.value = source.options[source.selectedIndex].value;
< 			dest.options.add(newElem);
< 		}
< 	}
< }
< 
< function RemovefromDisplay(fieldlist) {
< 	if( fieldlist.options[fieldlist.selectedIndex].selected ) {
< 		if(navigator.appName == "Netscape") {
< 			fieldlist.options[fieldlist.selectedIndex] = null;
< 		}
< 		else if( navigator.appName == "Microsoft Internet Explorer") {
< 			fieldlist.options.remove(fieldlist.selectedIndex);
< 		}
< 	}
< }
< 
< function Move(fieldlist, dir) {
< 	var tempval = fieldlist.options[fieldlist.selectedIndex].value;
< 	var temptxt = fieldlist.options[fieldlist.selectedIndex].text;
< 
< 	if(dir) {
< 		fieldlist.options[fieldlist.selectedIndex].value = fieldlist.options[fieldlist.selectedIndex - 1].value;
< 		fieldlist.options[fieldlist.selectedIndex - 1].value = tempval;
< 		fieldlist.options[fieldlist.selectedIndex].text = fieldlist.options[fieldlist.selectedIndex - 1].text;
< 		fieldlist.options[fieldlist.selectedIndex - 1].text = temptxt;
< 		fieldlist.selectedIndex--;
< 	}
< 	else {
< 		fieldlist.options[fieldlist.selectedIndex].value = fieldlist.options[fieldlist.selectedIndex + 1].value;
< 		fieldlist.options[fieldlist.selectedIndex + 1].value = tempval;
< 		fieldlist.options[fieldlist.selectedIndex].text = fieldlist.options[fieldlist.selectedIndex + 1].text;
< 		fieldlist.options[fieldlist.selectedIndex + 1].text = temptxt;
< 		fieldlist.selectedIndex++;
< 	}
< }
< 
95c50
< 	tnglitbox = new LITBox('admin_changetreeform.php?entity='+entity+'&oldtree='+tree+'&entityID='+id,{width:420,height:250});
---
> 	tnglitbox = new LITBox('admin_changetreeform.php?entity='+entity+'&oldtree='+tree+'&entityID='+id,{width:420,height:300});
106c61
< function insertCell(row,index,classname,content) {
---
> function insertCell(row,index,classname,content,colspan,rowspan) {
109a65,68
> 	if(colspan)
> 		cell.colSpan = colspan;
> 	if(rowspan)
> 		cell.rowSpan = rowspan;
131a91,103
> function insertActionButtons(row,index,vars,notesflag,citesflag) {
> 	if(vars.allow_edit)
> 		insertCell(row,index++,'action-btn',"<a href=\"#\" onclick=\"return editEvent"+"('"+vars.id+"');\" title=\""+editmsg+"\" class=\"smallicon admin-edit-icon\"></a>");
> 	if(vars.allow_delete)
> 		insertCell(row,index++,'action-btn',"<a href=\"#\" onclick=\"return deleteEvent"+"('"+vars.id+"','"+vars.persfamID+"','"+vars.tree+"','"+vars.eventID+"');\" title=\""+delmsg+"\" class=\"smallicon admin-delete-icon\"></a>");
> 	if(vars.allow_cite)
> 		insertCell(row,index++,'action-btn',"<a href=\"#\" onclick=\"return showCitationsInside('N"+vars.id+"','','"+vars.persfamID+"');\" title=\""+citemsg+"\" id=\"citesiconN"+vars.id+"\" class=\"smallicon admin-cite" + onstr + "-icon\"></a>");
> 	if(notesflag)
> 		insertCell(row,index++,'action-btn',"<a href=\"#\" onclick=\"return showNotes('"+vars.id+"','"+vars.persfamID+"');\" title=\""+notemsg+"\" id=\"notesicon"+vars.id+"\" class=\"smallicon admin-note-off-icon\"></a>");
> 	if(citesflag)
> 		insertCell(row,index++,'action-btn',"<a href=\"#\" onclick=\"return showCitations('"+vars.id+"','"+vars.persfamID+"');\" title=\""+citemsg+"\" id=\"citesicon"+vars.id+"\" class=\"smallicon admin-cite-off-icon\"></a>");
> }
> 
145c117
< 				var eventtbl = document.getElementById('custeventstbl');
---
> 				var eventtbl = document.getElementById('events_table');
147,153c119,154
< 				newtr.id = "row_"+vars.id;
< 				var buttons = getActionButtons(vars,'Event',allow_notes,allow_cites);
< 				insertCell(newtr,0,"lightback nw",buttons);
< 				insertCell(newtr,1,"lightback",vars.display);
< 				insertCell(newtr,2,"lightback",vars.eventdate + "&nbsp;");
< 				insertCell(newtr,3,"lightback",vars.eventplace + "&nbsp;");
< 				insertCell(newtr,4,"lightback",vars.info + "&nbsp;");
---
> 				newtr.id = "row_"+vars.id+"_top";
> 				newtr.className = "row_"+vars.id;
> 				var rowspan = 0;
> 				if(vars.info)
> 					rowspan++;
> 				if(vars.eventdate || vars.eventplace)
> 					rowspan++;
> 				if(!rowspan) {
> 					rowspan = 1;
> 					vars.info = "&nbsp;";
> 				}
> 				c = insertCell(newtr,0,"pad5",vars.display+':',0,rowspan);
> 				c.style.verticalAlign = "top";
> 				var div;
> 
> 				var onclick = vars.allow_edit ? " onclick=\"return editEvent('" +vars.id + "');\"" : "";
> 				if(vars.eventdate || vars.eventplace) {
> 					div = '<div class="cust-event-field"' + onclick + '>' + vars.eventdate + '</div>';
> 					insertCell(newtr,1,"",div);
> 					div = '<div class="cust-event-field"' + onclick + '>' + vars.eventplace + '</div>';
> 					insertCell(newtr,2,"",div);
> 
> 					insertActionButtons(newtr,3,vars,allow_notes,allow_cites);
> 					if(vars.info) {
> 						var newtr_bot = eventtbl.insertRow(eventtbl.rows.length);
> 						newtr_bot.id = "row_"+vars.id+"_bot";
> 						newtr_bot.className = "row_"+vars.id;
> 						div = '<div class="cust-event-field"' + onclick + '>' + vars.info + '</div>';
> 						insertCell(newtr_bot,0,"",div,2);
> 					}
> 				}
> 				else {
> 					div = '<div class="cust-event-field"' + onclick + '>' + vars.info + '</div>';
> 					insertCell(newtr,1,"",div,2);
> 					insertActionButtons(newtr,2,vars,allow_notes,allow_cites);
> 				}
172,176c173,237
< 			var tds = jQuery('tr#row_'+eventID+' td');
< 			tds.eq(1).html(vars.display + "&nbsp;");
< 			tds.eq(2).html(vars.eventdate + "&nbsp;");
< 			tds.eq(3).html(vars.eventplace + "&nbsp;");
< 			tds.eq(4).html(vars.info + "&nbsp;");
---
> 			var tds_top = jQuery('tr#row_'+eventID+'_top td');
> 			var tds_bot = jQuery('tr#row_'+eventID+'_bot td');
> 			var first_cell = tds_top.eq(1);
> 			var tr_top = jQuery('tr#row_'+eventID+'_top');
> 
> 			if(vars.eventdate || vars.eventplace) {
> 				if(first_cell.attr('colspan') == '2') {
> 					first_cell.remove();
> 					var event_title = tds_top.eq(0);
> 					var event_date_td = $('<td/>');
> 					var event_date_div = $('<div/>').html(vars.eventdate).addClass('cust-event-field');
> 					var event_place_td = $('<td/>');
> 					var event_place_div = $('<div/>').html(vars.eventplace).addClass('cust-event-field');
> 
> 					event_date_div.attr('onclick', 'return editEvent("' +vars.id + '");')
> 					event_place_div.attr('onclick', 'return editEvent("' +vars.id + '");')
> 
> 					event_date_td.append(event_date_div);
> 					event_date_td.insertAfter(event_title);
> 					event_place_td.append(event_place_div);
> 					event_place_td.insertAfter(event_date_td);
> 					tds_top = jQuery('tr#row_'+eventID+'_top td');
> 				}
> 				else {
> 					first_cell.children(0).html(vars.eventdate);
> 					first_cell.next().children(0).html(vars.eventplace);
> 				}
> 
> 				if(vars.info) {
> 					if(tds_bot.length)
> 						tds_bot.eq(0).children(0).html(vars.info);
> 					else {
> 						var tr_bot = $('<tr/>').attr('id','row_'+eventID+'_bot');
> 						var event_info_td = jQuery('<td/>').attr('colspan','2');
> 						var event_info_div = jQuery('<div/>').html(vars.info).addClass('cust-event-field');
> 
> 						event_info_div.attr('onclick', 'return editEvent("' +vars.id + '");');
> 						
> 						event_info_td.append(event_info_div);
> 						event_info_td.appendTo(tr_bot);
> 						tr_bot.insertAfter(tr_top);
> 					}
> 					tds_top.eq(0).attr('rowspan','2');
> 					tds_top.eq(3).attr('rowspan','2');
> 				}
> 				else {
> 					if(tds_bot.length) {
> 						tds_bot.remove();
> 						tds_top.eq(0).attr('rowspan','1');
> 						tds_top.eq(3).attr('rowspan','1');
> 					}
> 				}
> 			}
> 			else {
> 				first_cell.children(0).html(vars.info);
> 				if(first_cell.attr('colspan') != '2') {
> 					first_cell.attr('colspan','2');
> 					first_cell.next().remove();
> 				}
> 				tds_top.eq(0).attr('rowspan','1');
> 				tds_top.eq(3).attr('rowspan','1');
> 				if(tds_bot.length)
> 					tds_bot.remove();
> 			}
> 
177a239
> 			var tds = jQuery('tr.row_'+eventID+' td');
187c249
< 	tnglitbox = new LITBox(cmstngpath + 'admin_editevent.php?eventID=' + eventID,{width:540,height:500,doneLoading:function(){$('#eventdate').focus();}});
---
> 	tnglitbox = new LITBox(cmstngpath + 'admin_editevent.php?eventID=' + eventID,{width:750,height:500,doneLoading:function(){$('#eventdate').focus();}});
193c255
< 	tnglitbox = new LITBox(cmstngpath + 'admin_newevent.php?prefix='+prefix+'&persfamID='+persfamID+'&tree='+tree,{width:540,height:500,doneLoading:function(){$('#eventtypeID').focus();}});
---
> 	tnglitbox = new LITBox(cmstngpath + 'admin_newevent.php?prefix='+prefix+'&persfamID='+persfamID+'&tree='+tree,{width:750,height:500,doneLoading:function(){$('#eventtypeID').focus();}});
200c262
< 		var tds = jQuery('tr#row_'+eventID+' td');
---
> 		var tds = jQuery('tr.row_'+eventID+' td');
210c272
< 				jQuery('#row_'+eventID).fadeOut(200);
---
> 				jQuery('.row_'+eventID).fadeOut(200);
218c280,282
< 	tnglitbox = new LITBox(cmstngpath + 'admin_notes.php?eventID=' + eventID + '&persfamID=' + persfamID + '&tree=' + tree,{width:645,height:540,doneLoading:initNoteSort});
---
> 	if(eventID == 'ALTBE')
> 		eventID = jQuery('#altbirthtype').val();
> 	tnglitbox = new LITBox(cmstngpath + 'admin_notes.php?eventID=' + eventID + '&persfamID=' + persfamID + '&tree=' + tree,{width:645,height:600,doneLoading:initNoteSort});
223c287,289
< 	tnglitbox = new LITBox(cmstngpath + 'admin_citations.php?eventID=' + eventID + '&persfamID=' + persfamID + '&tree=' + tree,{width:645,height:540,doneLoading:initCitationSort});
---
> 	if(eventID == 'ALTBE')
> 		eventID = jQuery('#altbirthtype').val();
> 	tnglitbox = new LITBox(cmstngpath + 'admin_citations.php?eventID=' + eventID + '&persfamID=' + persfamID + '&tree=' + tree,{width:645,height:600,doneLoading:initCitationSort});
227a294,295
> 	if(eventID == 'ALTBE')
> 		eventID = jQuery('#altbirthtype').val();
245a314,317
> 				else if(jQuery('#newnote').length)
> 					jQuery('#newnote').focus();
> 				else if(jQuery('#currnote').length)
> 					jQuery('#currnote').focus();
424c496,516
< 				var div = jQuery('<div id="citations_' + vars.id +'" class="sortrow"></div>');
---
> 				var div, newcitetbl, newtr, cell1, cell2, iconid;
> 				for(var c = 0; c < vars.length; c++) {
> 					if(vars[c].eventID == form.eventID.value) {
> 						div = jQuery('<div id="citations_' + vars[c].id +'" class="sortrow"></div>');
> 
> 						newcitetbl = document.createElement("table");
> 						newcitetbl.className = "normal";
> 						newcitetbl.cellPadding = 3;
> 						newcitetbl.cellSpacing = 1;
> 						newcitetbl.border = 0;
> 						newtr = newcitetbl.insertRow(0);
> 						newtr.id = "row_"+vars[c].id;
> 						insertCell(newtr,0,"dragarea",'<img src="img/admArrowUp.gif" alt=""><br/><img src="img/admArrowDown.gif" alt="">');
> 						cell1 = insertCell(newtr,1,"lightback",getActionButtons(vars[c],'Citation'));
> 						cell1.width = "70";
> 						cell2 = insertCell(newtr,2,"lightback",vars[c].display)
> 						cell2.width = "445";
> 						div.append(newcitetbl);
> 						jQuery('#cites').append(div);
> 					}
> 					initCitationSort();
426,446c518,524
< 				var newcitetbl = document.createElement("table");
< 				newcitetbl.className = "normal";
< 				newcitetbl.cellPadding = 3;
< 				newcitetbl.cellSpacing = 1;
< 				newcitetbl.border = 0;
< 				var newtr = newcitetbl.insertRow(0);
< 				newtr.id = "row_"+vars.id;
< 				insertCell(newtr,0,"dragarea",'<img src="img/admArrowUp.gif" alt=""><br/><img src="img/admArrowDown.gif" alt="">');
< 				var cell1 = insertCell(newtr,1,"lightback",getActionButtons(vars,'Citation'));
< 				cell1.width = "70";
< 				var cell2 = insertCell(newtr,2,"lightback",vars.display)
< 				cell2.width = "445";
< 				div.append(newcitetbl);
< 				jQuery('#cites').append(div);
< 				initCitationSort();
< 
< 				jQuery('#citationstbl').show();
< 				gotoSection('addcitation','citations');
< 				var iconid = form.eventID.value == 'SLGC' ? form.persfamID.value : '';
< 				jQuery('#citesicon'+form.eventID.value + iconid).removeClass('admin-cite-off-icon');
< 				jQuery('#citesicon'+form.eventID.value + iconid).addClass('admin-cite-on-icon');
---
> 					jQuery('#citationstbl').show();
> 					gotoSection('addcitation','citations');
> 
> 					iconid = vars[c].eventID == 'SLGC' ? 'SLGC' + form.persfamID.value.replace('::','--') : vars[c].eventID;
> 					jQuery('#citesicon' + iconid).removeClass('admin-cite-off-icon');
> 					jQuery('#citesicon' + iconid).addClass('admin-cite-on-icon');
> 				}
501,503c579,581
< 					var iconid = eventID == 'SLGC' ? personID : '';
< 					jQuery('#citesicon'+eventID + iconid).removeClass('admin-cite-on-icon');
< 					jQuery('#citesicon'+eventID + iconid).addClass('admin-cite-off-icon');
---
> 					var iconid = eventID == 'SLGC' ? 'SLGC' + personID.replace('::','--') : eventID;
> 					jQuery('#citesicon' + iconid).removeClass('admin-cite-on-icon');
> 					jQuery('#citesicon' + iconid).addClass('admin-cite-off-icon');
539,540c617,618
< function editAssociation(assocID) {
< 	var params = {assocID:assocID};
---
> function editAssociation(assocID, tree) {
> 	var params = {assocID:assocID, tree:tree};
572c650
< function deleteAssociation(assocID,personID,tree) {
---
> function deleteAssociation(assocID,personID,passocID,tree) {
578c656
< 		var params = {assocID:assocID,personID:personID,tree:tree};
---
> 		var params = {assocID:assocID,personID:personID,passocID:passocID,tree:tree};
618,620c696,698
< var branchtimer;
< function showBranchEdit(branchdiv) {
< 	jQuery('#' + branchdiv).slideToggle(200);
---
> var dtimer;
> function showEdit(div) {
> 	jQuery('#' + div).slideToggle(200);
624,625c702,703
< function updateBranchList(branchselect,branchdiv,branchlistdiv) {
< 	var branchlist = "";
---
> function updateList(select,div,listdiv) {
> 	var list = "";
628c706
< 	jQuery('#'+branchselect+' >option:selected').each(function(index, option) {
---
> 	jQuery('#'+select+' >option:selected').each(function(index, option) {
633c711
< 		if(branchlist) {
---
> 		if(list) {
635c713
< 				branchlist = "";
---
> 				list = "";
640c718
< 				branchlist += ", ";
---
> 				list += ", ";
642c720
< 		branchlist += option.text;
---
> 		list += option.text;
644,645c722,727
< 	jQuery('#' + branchlistdiv).html(branchlist);
< 	showBranchEdit(branchdiv);
---
> 	jQuery('#' + listdiv).html(list);
> 	showEdit(div);
> }
> 
> function quitEdit(div) {
> 	dtimer = setTimeout("showEdit('"+div+"')",3000);
648,649c730,731
< function quitBranchEdit(branchdiv) {
< 	branchtimer = setTimeout("showBranchEdit('"+branchdiv+"')",3000);
---
> function closeEdit(select,div,listdiv) {
> 	dtimer = setTimeout("updateList('"+select+"','"+div+"','"+listdiv+"')",500);
652,653c734,736
< function closeBranchEdit(branchselect,branchdiv,branchlistdiv) {
< 	branchtimer = setTimeout("updateBranchList('"+branchselect+"','"+branchdiv+"','"+branchlistdiv+"')",500);
---
> function changeAltBirthType() {
> 	jQuery('#altbirthlabel').html(jQuery("#altbirth option:selected").text());
> 	jQuery('#altbirthtype').val(jQuery("#altbirth option:selected").val())
679,682d761
< function filterPlace(fieldId,fieldName) {
< 
< }
< 
699c778
< 			startfield = "myflastname";
---
> 			startfield = "myffirstname";
723,725c802,814
< 	seclitbox = new LITBox(cmstngpath + newpage + '?tree=' + findtree + branchstr + mediastr,{width:645,height:540});
<     initFilter(null,seclitbox,field,titlediv);
< 	jQuery('#'+startfield).focus();
---
> 	seclitbox = new LITBox(cmstngpath + newpage + '?tree=' + findtree + branchstr + mediastr,{
> 		width:670,
> 		height:540,
> 		onremove:function(){
> 			if(jQuery('#mlbox').length){
> 				jQuery('#mlbox').remove();
> 			}
> 		},
> 		doneLoading:function(){
> 			jQuery('#'+startfield).focus();
> 		}
> 	});
>   initFilter(null,seclitbox,field,titlediv);
805a895,907
> var mrcaType = "I";
> function activateMrcaType(type) {
> 	if(type == "I") {
> 		jQuery('#person_label').show();
> 		jQuery('#family_label').hide();
> 	}
> 	else if(type == "F") {
> 		jQuery('#person_label').hide();
> 		jQuery('#family_label').show();
> 	}
> 	mrcaType = type;
> }
> 
865c967
< function retItem(id, place) {
---
> function retItem(id, linktype, place) {
896,897d997
< 		var area = '<area coords=\"'+x1+','+y1+','+x2+','+y2+'\" href=\"'+getperson_url+'personID=' + id + '&amp;tree='+maptree+'\" title=\"' + returntext.replace(/\"/g,"'") + '\" />';
< 		jQuery('#imagemap').val(jQuery('#imagemap').val() + area);
899c999
< 		current.remove();
---
> 		saveRectangle(maptree, linktype, id, '');
diff -r TNG/js/timeline.js TNG1403/js/timeline.js
5a6,9
>     Timeline.GregorianDateLabeller.prototype.labelPrecise = function(tdate) {
>         dateStr = "";
>         return dateStr;
>     }
diff -r TNG/js/tngmenuhover2.js TNG1403/js/tngmenuhover2.js
21c21
< 		}else{p.className=p.className.replace(a,''); c.t=setInterval(function(){sl(c,-1)},t)}
---
> 		}else{p.className=p.className.replace(' '+a,''); c.t=setInterval(function(){sl(c,-1)},t)}
diff -r TNG/js/tngpededit.js TNG1403/js/tngpededit.js
13c13
< 		tnglitbox = new LITBox(editperson_url + 'personID=' + personID + '&tree=' + tree + '&slot=' + slot,{width:820,height:750});
---
> 		tnglitbox = new LITBox(editperson_url + 'personID=' + personID + '&tree=' + tree + '&slot=' + slot,{width:950,height:750});
26,28c26,36
< 	nplitbox = new LITBox(cmstngpath + 'ajx_newperson.php?tree=' + tree + '&gender=' + gender + '&type=' + type + '&father=' + father + '&familyID=' + familyID,{width:790,height:550});
< 	generateIDajax('person','personID');
< 	jQuery('#firstname').focus();
---
> 	nplitbox = new LITBox(
> 		cmstngpath + 'ajx_newperson.php?tree=' + tree + '&gender=' + gender + '&type=' + type + '&father=' + father + '&familyID=' + familyID,
> 		{
> 			width:860,
> 			height:640,
> 			doneLoading:function(){
> 				generateIDajax('person','personID');
> 				jQuery('#firstname').focus();
> 			}
> 		}
> 	);
116c124
< 	tnglitbox = new LITBox(cmstngpath + 'ajx_editfamily.php?familyID=' + familyID + '&tree=' + tree + '&lastperson=' + lastperson + '&slot=' + slot,{width:790,height:540});
---
> 	tnglitbox = new LITBox(cmstngpath + 'ajx_editfamily.php?familyID=' + familyID + '&tree=' + tree + '&lastperson=' + lastperson + '&slot=' + slot,{width:950,height:600});
124,125c132,141
< 	tnglitbox = new LITBox(cmstngpath + 'ajx_newfamily.php?tree=' + tree + '&child=' + child + '&slot=' + slot,{width:740,height:460});
< 	generateIDajax('family','familyID');
---
> 	tnglitbox = new LITBox(
> 		cmstngpath + 'ajx_newfamily.php?tree=' + tree + '&child=' + child + '&slot=' + slot,
> 		{
> 			width:950,
> 			height:500,
> 			doneLoading:function(){
> 				generateIDajax('family','familyID');
> 			}
> 		}
> 	);
diff -r TNG/js/tngpedigree.js TNG1403/js/tngpedigree.js
34,35c34,53
< 	if(hDisplace > 0)
< 		ref.offset({left: box.offset().left - hDisplace});
---
> 	if(hDisplace > 0) {
> 		if(vDisplace > 0) {
> 			ref.offset({left: box.offset().left - ref.width() - pedborderwidth});
> 			if(box.position().top < vOffset)
> 				vOffset = box.position().top;
> 		}
> 		else
> 			ref.offset({left: box.offset().left - hDisplace});
> 	}
> 	else {
> 		if(vDisplace > 0) {
> 			hDisplace = box.position().left + box.width() + ref.width() - jQuery('#outer').width();
> 			if(hDisplace > 0)
> 				ref.offset({left: box.offset().left - ref.width() - pedborderwidth});
> 			else
> 				ref.offset({left: box.offset().left + box.width() + (2 * pedborderwidth)});
> 			if(box.position().top < vOffset)
> 				vOffset = box.position().top;
> 		}
> 	}
89c107
< 	loading.css('visibility','visible');
---
> 	loading.show();
155c173
< 	loading.css('visibility','hidden');
---
> 	loading.hide();
346c364,365
< 	if( linklist.indexOf(backperson) < 0 ) {
---
> 	var listarray = linklist.split(",");
> 	if(jQuery.inArray(backperson,listarray) < 0) {
357c376
< 		var pers = personstr.split(",")
---
> 		var pers = personstr.split(",");
440c459
< 	var famID = slotperson.famID;
---
> 	var famID = slotperson.famID != null ? slotperson.famID : false;
Only in TNG1403/js: tngzoom.js
diff -r TNG/js/users.js TNG1403/js/users.js
28c28
< 		if(document.form1.role[4].checked) {   //editor
---
> 		if(document.form1.role[3].checked) {   //editor
36c36
< 		if(document.form1.role[4].checked) {   //editor
---
> 		if(document.form1.role[3].checked) {   //editor
45c45
< 			document.form1.role[4].checked = "checked";
---
> 			document.form1.role[3].checked = "checked";
133a134
> 			form.form_allow_private_notes.checked = "checked";
diff -r TNG/languages/Afrikaans/admintext.php TNG1403/languages/Afrikaans/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Vul asseblief in";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Kies 'n lêer om te importeer.";
> 		$admtext['addreplacedata'] = "Voeg by of vervang jou genealogie (mag etlike minute duur, afhangende van die grootte van jou lêer)";
> 		$admtext['fromyourcomputer'] = "Vanaf jou rekenaar";
> 		$admtext['importdata'] = "Importeer Data";
> 		$admtext['replace'] = "Vervang (in geselekteerde stamboom)";
> 		$admtext['desttree'] = "Bestemming Stamboom";
> 		$admtext['selectdesttree'] = "Kies of vul 'n bestemmingsboom in.";
> 		$admtext['selectexisting'] = "Importeer inligting";
> 		$admtext['ucaselast'] = "Maak alle vanne hoofletters";
> 		$admtext['norecalc'] = "Moenie weer Lewende vlae bereken nie";
> 		$admtext['autooffset'] = "Begin IDs by eerste beskikbare nommer";
> 		$admtext['mustselecttree'] = "Jy moet 'n stamboom kies voor jy hierdie opsie kies.";
> 		$admtext['onwebserver'] = "Op webbediener (in GEDCOMvouer)";
> 		$admtext['imphints'] = "Wenke: Wenke: Alle huidige data beteken alle mense, families, bronne en notas (media-verbindings sal nie verlore raak nie solank as wat ID's deselfde bly). Kombineering word altyd net gebaseer op ID's. Nuwe rekords word altyd bygevoeg. Heg die invoer van alle rekords met nuwe ID's.";
> 		$admtext['destbranch'] = "Bestemmingstak (opsioneel)";
> 		$admtext['importlatlong'] = "Importeer data vir breedtegraad / lengtegraad indien beskikbaar";
> 		$admtext['opening'] = "Open";
> 		$admtext['reopen'] = "Heropen";
> 		$admtext['uploading'] = "Oplaai";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Invoer gestaak";
> 		$admtext['resume'] = "Begin weer";
> 		$admtext['neweronly'] = "Vervang slegs indien nuwer";
> 		$admtext['oldimport'] = "Ou invoer styl (geen progresiewe stafie)";
> 		$admtext['importgedcom'] = "Voer GEDCOM-lêer in (Kan gezip word)";
> 		$admtext['stopbackup'] = "Dit kan 'n goeie idee wees om u huidige data te rugsteun voordat u verder gaan.";
> 		$admtext['importmedia'] = "Importeer media indien dit bestaan";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Maak seker dat die voorvoegsels en agtervoegsels (Algemene instellings) korrek is vir hierdie lêer.";
> 		$admtext['chkimpsettings'] = "Gaan die Invoerinstellings na vir meer opsies.";
> 		$admtext['eventsonly'] = "Voer slegs gepasmaakte gebeurtenistipes en -kenmerke in (geen data word bygevoeg, vervang of bygevoeg nie)";
> 		$admtext['allevents'] = "Aanvaar data vir alle nuwe gebeurtenistipes en -kenmerke";
> 		$admtext['finishingimporting'] = "Afwerking...";
> 		$admtext['fileuploadfailed'] = "Kon die lêer nie oplaai nie. Kan beteken dat lêer te groot is. Probeer FTP om die lêer na jou GEDCOM-lêergids oor te laai, kies en voer dan van daar af in.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Verander Bestaande Gebeurtenissoort";
135,138d168
< 		$admtext['entertypedesc'] = "Vul 'n tipe/beskrywing in vir hierdie nuwe Gebeurtenissoort.";
< 		$admtext['enterdisplay'] = "Vul asseblief 'n vertoonstring in vir hierdie nuwe Gebeurtenis.";
< 		$admtext['existingeventtypeinfo'] = "Bestaande Gebeurtenissoort Inligting";
< 		$admtext['neweventtypeinfo'] = "Nuwe Gebeurtenissoort Inligting";
145,146d174
< 		$admtext['addnewevtype'] = "Voeg Nuwe Gebeurtenissoort By";
< 		$admtext['createnewevtype'] = "Skep 'n nuwe Gebeurtenissoort rekord";
149,150d176
< 		$admtext['existingevtypes'] = "Bestaande Gebeurtenissoorte";
< 		$admtext['edsevtypes'] = "Verander, verwyder of sorteer reeds bestaande Gebeurtenissoorte";
152d177
< 		$admtext['confdeleteevtype'] = "Is jy seker jy wil hierdie gebeurtenissoort verwyder?";
154d178
< 		$admtext['selectentertag'] = "Kies of vul asseblief die tag vir hierdie gebeurtenissoort.";
208d231
< 		$admtext['changestoallevtypes'] = "Veranderinge aan alle Gebeurtenissoorte";
214d236
< 		$admtext['BAPM'] = "Baptisme";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Is u seker dat u hierdie gebeurtenistipe wil uitvee? Alle gebeure van hierdie tipe sal ook uitgevee word.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Voeg by nuwe tipe";
> 		$admtext['createnewevtype'] = "Skep 'n nuwe kenmerk of 'n gebeurtenis tipe rekord";
> 		$admtext['modifyeventtype'] = "Wysig bestaande tipe";
> 		$admtext['entertypedesc'] = "Voeg 'n tipe/beskrywing vir hierdie nuwe kenmerk of gebeurtenistipe in.";
> 		$admtext['enterdisplay'] = "Voeg asseblief 'n tipe/beskrywing vir hierdie nuwe kenmerk of gebeurtenistipe in. Voeg asseblief 'n vertoonstring vir hierdie nuwe kenmerk of gebeurtenistipe in.";
> 		$admtext['existingeventtypeinfo'] = "Bestaande kenmerk of gebeurtenis tipe inligting";
> 		$admtext['neweventtypeinfo'] = "'n Nuwe kenmerk of gebeurtenis tipe inligting";
> 		$admtext['existingevtypes'] = "Bestaande kenmerk of gebeurtenistipes";
> 		$admtext['edsevtypes'] = "Wysig, skrap of sorteer voorheen ingevoerde kenmerke en gebeurtenistipes";
> 		$admtext['selectentertag'] = "Kies of voer asseblief die merker vir hierdie kenmerk of gebeurtenistipe in.";
> 		$admtext['changestoallevtypes'] = "Veranderings aan alle kenmerke of gebeurtenistipes";
268d303
< 		$admtext['nobirthinfo'] = "Geen geboorte-inligting";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Kies<br/>standard<br/>foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Stoor + nuwe ouers";
> 		$admtext['savenewspouse'] = "Stoor + nuwe eggenoot";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alteratiewe Geboorte";
354d391
< 		$admtext['enterphotodesc'] = "Vul asseblief 'n beskrywing in vir die grafikalêer.";
388d424
< 		$admtext['photoowner'] = "Eienaar/Bron";
417d452
< 		$admtext['imgmap'] = "Beeld Kaart";
490d524
< 		$admtext['mapinstr3'] = "Om 'n gesig of gebied van hierdie foto te koppel aan 'n spesifieke individu, selekteer die individu se stamboom, kies 'n vorm en afmetings vir die gebied, kliek dan op die middel van die gedeelte op die foto. 'n Opspring venster sal jou help om die individu te kies. Nadat die seleksie gemaak is, sal programkode vir die image map in die boks hierbo gevoeg word. Herhaal hierdie proses soos nodig vir addisionele gebiede.";
495d528
< 		$admtext['removelink'] = "Verwyder Koppeling";
502d534
< 		$admtext['eloptions'] = "Blaai deur, of Verwyder";
509d540
< 		$admtext['nolinks'] = "Nog geen koppelinge";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML-prentkaart (vir terugwaartse verenigbaarheid)";
> 		$admtext['photoowner'] = "Eienaar van die oorspronklike";
> 		$admtext['nothumb'] = "geen kleinkiekie nie";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Die item kon nie bygevoeg word nie, heel waarskynlik omdat die lêer te groot was en nie opgelaai of gebruik kon word om 'n kleinkiekie te maak nie.";
> 		$admtext['moved'] = "Geskuif";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Voer asseblief 'n titel of beskrywing by vir hierdie media.";
> 		$admtext['mapinstr3'] = "Om 'n streek te koppel aan hierdie foto van 'n persoon, familie of ander entiteit , kies eers die relevante boom en entiteittipe, skep dan 'n reghoek vir die gewenste streek. Dit word gedoen deur te klik in die boonste linkerhoek van die streek en dan na die onderste regterhoek te sleep. Alternatief kan jy in die boonste linkerhoek klik en dan weer in die onderste regterhoek. 'n Opspringblokkie (popup) sal jou dan help om die persoon of ander entiteit te kies. Kies en herhaal hierdie proses soos benodig vir bykomende streke. Kies en klik 'n bestaande streek, sleep om te skuif of klik op die 'X' om uit te vee.";
596d633
< 		$admtext['foremptystring'] = "Vir 'n leë string, los die veld leeg en kliek \"Voeg By >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Iinstruksies: Sleep of dubbelklik item aan die linkerkant in die lyste aan die regterkant. Sleep op en af om te herrangskik. Dubbelklik weer om te verwyder.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Vir 'n leë string, laat hierdie veld leeg en klik >>";
651,655d690
< 		$admtext['selectimportfile'] = "Kies 'n lêer om te importeer.";
< 		$admtext['importgedcom'] = "Importeer GEDCOM (standaard 5.5 formaat)";
< 		$admtext['addreplacedata'] = "Voeg by of vervang jou genealogie (mag etlike minute duur, afhangende van die grootte van jou lêer)";
< 		$admtext['fromyourcomputer'] = "Vanaf jou rekenaar";
< 		$admtext['importdata'] = "Importeer Data";
657,660d691
< 		$admtext['replace'] = "Vervang (in geselekteerde stamboom)";
< 		$admtext['desttree'] = "Bestemming Stamboom";
< 		$admtext['selectdesttree'] = "Kies of vul 'n bestemmingsboom in.";
< 		$admtext['selectexisting'] = "Importeer inligting";
668,673d698
< 		$admtext['ucaselast'] = "Maak alle vanne hoofletters";
< 		$admtext['norecalc'] = "Moenie weer Lewende vlae bereken nie";
< 		$admtext['autooffset'] = "Begin IDs by eerste beskikbare nommer";
< 
< 		$admtext['mustselecttree'] = "Jy moet 'n stamboom kies voor jy hierdie opsie kies.";
< 		$admtext['importmedia'] = "Importeer media indien dit bestaan";
675d699
< 		$admtext['neweronly'] = "Vervang slegs indien nuwer";
677,692d700
< 		$admtext['onwebserver'] = "Op webbediener (in GEDCOMvouer)";
< 		$admtext['eventsonly'] = "Importeer net Op Maat gemaakte Gebeurtenissoorte";
< 		$admtext['imphints'] = "Wenke: Wenke: Alle huidige data beteken alle mense, families, bronne en notas (media-verbindings sal nie verlore raak nie solank as wat ID's deselfde bly). Kombineering word altyd net gebaseer op ID's. Nuwe rekords word altyd bygevoeg. Heg die invoer van alle rekords met nuwe ID's.";
< 		$admtext['allevents'] = "Aanvaar data vir alle nuwe Op Maat gemaak Gebeurtenissoorte";
< 		$admtext['destbranch'] = "Bestemmingstak (opsioneel)";
< 		$admtext['inframe'] = "(in raam)";
< 		$admtext['getstart'] = "Om te Begin";
< 		$admtext['importlatlong'] = "Importeer data vir breedtegraad / lengtegraad indien beskikbaar";
< 		$admtext['opening'] = "Open";
< 		$admtext['reopen'] = "Heropen";
< 		$admtext['uploading'] = "Oplaai";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Invoer gestaak";
< 		$admtext['resume'] = "Begin weer";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Logadministrasie";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Ou invoer styl (geen progresiewe stafie)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgradeer";
> 		$admtext['need_upgrade'] = "Voltooi hierdie opgraderingsinstruksies";
> 		$admtext['upgrade_missing'] = "Dit lyk of die opgraderinglêer ontbreek, so jy is dalk reeds klaar.";
> 		$admtext['delete_upgrade'] = "Wanneer jy klaar is, klik hier om die opgradering uit te vee en terug te keer na die kieslys.";
723d733
< 		$admtext['author'] = "Outeur";
804,809c814,819
< 		$admtext['momside'] = "Etiket aan Ma se kant"; //8
< 		$admtext['dadside'] = "Etiket aan Pa se kant"; //8
< 		$admtext['momperson'] = "PersoonsID aan Ma se kant"; //8
< 		$admtext['momtree'] = "Stamboom-ID aan Ma se kant"; //8
< 		$admtext['dadperson'] = "PersoonsID aan Pa se kant"; //8
< 		$admtext['dadtree'] = "Stamboom-ID aan Pa se kant"; //8
---
> 		$admtext['momside'] = "Etiket aan Ma se kant"; //8, 20
> 		$admtext['dadside'] = "Etiket aan Pa se kant"; //8, 20
> 		$admtext['momperson'] = "PersoonsID aan Ma se kant"; //8, 20
> 		$admtext['momtree'] = "Stamboom-ID aan Ma se kant"; //8, 20
> 		$admtext['dadperson'] = "PersoonsID aan Pa se kant"; //8, 20
> 		$admtext['dadtree'] = "Stamboom-ID aan Pa se kant"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Aanhaalkop";
> 		$admtext['quotesubhead'] = "Aanhalingstekens";
> 		$admtext['sniptitle'] = "Featurette titel";
> 		$admtext['snipname'] = "Funksienaam";
> 		$admtext['snipinfoone'] = "Featurette eerste reël";
> 		$admtext['snipinfotwo'] = "Featurette tweede reël";
> 		$admtext['snipimage'] = "Feature-prent";
> 		$admtext['snipperson'] = "Feature-persoon-ID";
> 		$admtext['sniptree'] = "Featurette boom ID";
> 		$admtext['quote'] = "Aanhaling";
> 		$admtext['link'] = "Skakel";
> 		$admtext['featuretitle7'] = "Funksie 7-titel";
> 		$admtext['featuretitle8'] = "Funksie 8 titel";
> 		$admtext['featuretitle9'] = "Funksie 9-titel";
> 		$admtext['featurethumb9'] = "Funksie 9-kleinkiekie"; //15
> 		$admtext['featurelink9'] = "Funksie 9 skakel"; //15
> 		$admtext['featurepara9'] = "Funksie 9 paragraaf"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Opskrif na links";
> 		$admtext['rightimg'] = "Opskrif na regs";
> 		$admtext['photoption'] = "Foto-opsies is<br />&nbsp;&nbsp;( staties of ewekansig)";
> 		$admtext['randomphotowidth'] = "Willekeurige foto breedte";
> 		$admtext['randomphotoheight'] = "Willekeurige fotohoogte";
> 		$admtext['randomphotomediatypeID'] = "Willekeurige fotoversameling";
> 		$admtext['momheading'] = "Moederfamilie Opskirf";
> 		$admtext['mompara'] = "Moederfamilie paragraaf";
> 		$admtext['mompagelink'] = "Moederfamilie Bladsy skakel";
> 		$admtext['dadheading'] = "Vadersfamilie Opskrif";
> 		$admtext['dadpara'] = "Vadersfamilie paragraaf";
> 		$admtext['dadpagelink'] = "Vadersfamilie Bladsyskakel";
> 		$admtext['spmomheading'] = "Eggenoot moederfamilie opskrif";
> 		$admtext['spmompara'] = "Eggenoot moederfamilie paragraaf";
> 		$admtext['spmompagelink'] = "Eggenoot moederfamilie Bladsy skakel ";
> 		$admtext['spmomside'] = "Eggenoot Moederskant-etiket";
> 		$admtext['spdadside'] = "Eggenoot vaderlikekant-etiket";
> 		$admtext['spmomperson'] = "Eggenoot moederskant persoonID";
> 		$admtext['spmomtree'] = "Eggenoot moederskant boomID";
> 		$admtext['spdadheading'] = "Eggenoot Vadersfamilie Opskrif";
> 		$admtext['spdadpara'] = "Eggenoot Vadersfamilie paragraaf";
> 		$admtext['spdadpagelink'] = "Eggenoot Vadersfamilie Bladsyskakel";
> 		$admtext['spdadperson'] = "Eggenoot Vaderskant persoonID";
> 		$admtext['spdadtree'] = "Eggenoot vaderskant boomID";
> 		$admtext['storiesheading'] = "Ons familie storie";
> 		$admtext['nbrsurnames'] = "Aantal vanne<br />&nbsp;&nbsp; in Van wolk";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Funksie miniatuur";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vereis 5.3 of hoër.)";
---
> 		$admtext['phpreq'] = "(TNG vereis 7.0 of hoër.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Verander inkomende voorvoegsels om by TNG-instellings te pas";
> 		$admtext['sortevents'] = "Sorteer gebeure volgens";
> 		$admtext['sortbydate'] = "Gebeurtenisdatum";
> 		$admtext['sortbytype'] = "Gebeurtenistipe";
> 		$admtext['allowsuggest'] = "Laat voorstelle van besoekers toe";
> 		$admtext['livingchecked'] = "Lewende vlag vir nuwe mense en gesinne";
> 		$admtext['maxmarried'] = "Merk familie wat woon as hulle getroud is minder as<br/>soveel jare";
> 		$admtext['imagetags'] = "Reghoeke";
> 		$admtext['allowcsv'] = "Laat CSV aflaai vir verslae toe";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Rugsteun (backup) opsies";
> 		$admtext['dosql'] = "Voer uit as SQL";
> 		$admtext['dodrop'] = "Sluit DROP TABEL in INDIEN BESTAAN";
> 		$admtext['docreate'] = "CREATE TABLE ingesluit";
> 		$admtext['onrestore'] = "Herstel opsies";
> 		$admtext['dodel'] = "Vee eers vorige inhoud uit";
> 		$admtext['download'] = "Aflaai";
> 		$admtext['altbirthtypes'] = "Alternatiewe geboortegebeurtenisse";
> 		$admtext['dtformat'] = "Tabelle Formaat";
> 		$admtext['conchart'] = "Verbindingskaart";
> 		$admtext['maxropt'] = "Maksimum aantal verbindingsoektogte";
> 		$admtext['maxlopt'] = "Maksimum lengte van verbindingspaaie";
> 		$admtext['showtxtopt'] = "Vertoon tekstuele padverklaring";
> 		$admtext['compactboxopt'] = "Wys persoon bokse in kompakte vorm";
> 		$admtext['sortbyopt'] = "Sorteer paaie volgens";
> 		$admtext['anchoridopt'] = "Anker ID";
> 		$admtext['maxmopt'] = "Max huwelike in verband";
> 		$admtext['saveincfg'] = "Stoor in konfigurasiepad (sien Algemene instellings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kon nie geokode nie";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Moenie geokodeer nie";
1436d1549
< 		$admtext['backtosecondary'] = "Terug na Sekondêre Proses";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Terug na Na-invoer Utilities";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Sluit aantekeninge uit";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Rits en medialêers ingesluit";
> 		$admtext['downloadzip'] = "Laai ZIP af";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Wys gedeaktiveer gebruikers alleenlik";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Stuur ook na admins wanneer 'n enkele stamboom gekies is";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alle Mods";
> 		$admtext['installedmods'] = " Slegs geïnstalleerde mods";
> 		$admtext['partinstmods'] = " Geïnstalleerde + gedeeltelik geïnstalleerde mods";
> 		$admtext['showanalyzeractions'] = " Wys alle aksies in Mod Analyzer";
> 		$admtext['badchar'] = "Ongeldige karakter";
1886d2008
< 		$admtext['test_number'] = "Toets Nommer";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Toets Nommer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Koppel hierdie DNS-toets aan 'n persoon";
1965d2095
< $admtext['otherevents'] = "Ander Gebeurtenisse";
2050,2051d2179
< $admtext['savereturn'] = "Terug na hierdie bladsy";
< $admtext['saveback'] = "Terug na keuselys";
2058,2059d2185
< $admtext['secondary'] = "Sekondêre Prosesse";
< $admtext['commas'] = "Skei veelvuldige inskrywings met kommas";
2101c2227
< $admtext['nobranch'] = "Geen Takke";
---
> $admtext['nobranch'] = "Geen tak nie";
2129,2130d2254
< $admtext['secondarymaint'] = "Sekondêre Prosesse";
< $admtext['customeventtypes'] = "Op maat gemaakte Gebeurtenissoorte";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tiepe";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Vanne";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Beeld";
> $admtext['author'] = "Skrywer";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Om te Begin";
> $admtext['showlog'] = "Logadministrasie";
> $admtext['nobirthinfo'] = "Geen geboorte-inligting";
> //changed in 13.0
> $admtext['savereturn'] = "Stoor + Bly";
> $admtext['saveback'] = "Stoor + Uitgang";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alle items is suksesvol uitgevee.";
> $admtext['private'] = "Privaat";
> $admtext['imgtags'] = "Beeldetikette";
> 
> $admtext['removelink'] = "Verwyder Koppeling";
> $admtext['eloptions'] = "Blaai deur, of Verwyder";
> $admtext['pleaseenter'] = "Vul asseblief in";
> 
> $admtext['nolinks'] = "Nog geen koppelinge";
> $admtext['nogeocode'] = "Kon nie geokode nie";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Kies<br/>standard<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Gebeurtenis/ Kenmerktipes";
> $admtext['secondary'] = "Na-invoer Nutsprogramme";
> $admtext['otherevents'] = "Ander Gebeurtenisse / Eienskappe";
> //added in 14.0
> $admtext['newlinks'] = "Skakels geskep";
> $admtext['newcemlinks'] = "Begraafplaasskakels geskep";
> $admtext['utility'] = "Nuts";
> $admtext['linktype'] = "Tipes";
> $admtext['move'] = "Skuif";
> $admtext['copy'] = "Kopieer";
> $admtext['title2'] = "Titel; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Afrikaans/alltext.php TNG1403/languages/Afrikaans/alltext.php
27c27
< $dates['ABT'] = "±";
---
> $dates['ABT'] = "±";
88d87
< //moved here in 8.0.0
107c106
< $admtext['SLGC'] = "Verseël aan Ouer (LDS)";
---
> $admtext['SLGC'] = "Verseël aan Ouer (LDS)";
109c108
< $admtext['SLGS'] = "Verseël aan Eggenoot (LDS)";
---
> $admtext['SLGS'] = "Verseël aan Eggenoot (LDS)";
114,115d112
< 
< //moved here in 8.1.0
119,120c116
< $admtext['sealing'] = "verseëling";
< //added in 11.0.3
---
> $admtext['sealing'] = "verseëling";
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "'n Fout het met TNG sagteware plaasgevind. Dit kan deur of 'n opstel probleem veroorsaak word, of 'n onvoltooide opgradering of 'n program probleem. As jy die webblad eienaar is, kan jy TNG ondersteuning vir hulp kontak. Maak asb 'n kopie van die navraag hieronder en plak dit in jou boodskap in.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Toets Nommer/Name";
203,204d184
< 
< //moved here in 12.0.2
205a186,254
> $text['test_number'] = "Toets Nommer/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "*";
> $text['chrabbr'] = "&asymp;";
> $text['deathabbr'] = "†";  //from descend
> $text['burialabbr'] = "&Omega;";  //from descend
> $text['marrabbr'] = "x.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Eerste Bladsy";
> $text['lastpage'] = "Laaste Bladsy";
> 
> //changed in 13.0.0
> $text['problem'] = "'n Fout het voorgekom in die TNG-sagteware. Wat om te doen?:<p>As u so pas 'n opgradering geïnstalleer het, het u deel van die installasie-instruksies miskien oorgeslaan? Gaan terug na die opgradering-leesbladsy en lees die instruksies weer. Let veral op na die stap van die databasisstruktuur.</p><p>As u net vir die eerste keer TNG geïnstalleer het, moet u moontlik nog die databasistabelle skep. Keer terug na die leesmy.html bladsy om die stap te vind.</p><p>As u die webwerf-eienaar is, kan u TNG se ondersteuning kontak vir verdere hulp met hierdie probleem. Kopieer die navraag hieronder en plak dit in u boodskap.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Geen tak nie";
> 
> //added in 14.0
> $text['oneyear'] = "jaar";
> $text['pwdcodelink'] = "Klik op hierdie skakel en 'n tydelike paswoord sal aan jou gestuur word";
> $text['pwdcodesent'] = "'n Paswoord terugstelskakel is na jou e-posadres gestuur.";
> $text['moved'] = "Verskuif";
> $text['citation'] = "Aanhaling";
> $text['other'] = "Aander";
> $text['death'] = "Dood";
> $text['burial'] = "Begrawe";
> $text['cremation'] = "Veras";
> $text['marriage'] = "Huweluk";
> $text['divorce'] = "Egskyding";
> $text['bylength'] = "Stape";
> $text['bymarriages'] = "Huweluke";
> $text['none'] = "Geen";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Bron";
> $text['repository'] = "Bewaarplek";
> $text['place'] = "Plek";
> $admtext['BAPM'] = "Baptisme";
> 
> $text['glang'] = "af";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Afrikaans/text.php TNG1403/languages/Afrikaans/text.php
69d68
< 		$text['general'] = "Algemeen";
77a77
> 	case "connections":
93c93
< 		$text['sometimes'] = "(Soek oor verskillende aantal generasies, kan soms verskillende resultate oplewer.)";
---
> 		$text['sometimes'] = "(Soms, deur die nagaan van 'n aantal verskillende generasies word 'n ander resultaat gelewer.)";
144c144
< 		$text['dospouses2'] = "Toon Gades";
---
> 		$text['dospouses2'] = "Wys eggenote";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Soek vir verbindings";
> 		$text['findrel2'] = "Soek verhoudings en ander verbindings";
> 		$text['makeme2nd'] = "Gebruik my ID";
> 		$text['usebookmarks'] = "Gebruik bookmerke";
> 		$text['select2inds'] = "Kies asseblief twee individue.";
> 		$text['indinfofor'] = "Individuele inligting vir";
> 		$text['nobookmarks'] = "Daar is geen boekmerk om te gebruik nie";
> 		$text['bkmtitle'] = "Persone wat in boekmerke gevind word";
> 		$text['bkminfo'] = "Kies 'n persoon:";
> 		$text['sortpathsby'] = "Sorteer paaie volgens aantal";
> 		$text['sortbyshort'] = "Sorteer volgens";
> 		$text['bylengthshort'] = "Lengte";
> 		$text['badID1'] = ": slegte persoon1 ID - gaan asseblief terug en korregeer";
> 		$text['badID2'] = ": slegte persoon2 ID - gaan asseblief terug en korregeer";
> 		$text['notintree'] = ": die persoon met hierdie ID is nie in die huidige stamboom databasis nie.";
> 		$text['sameperson'] = "Die twee individue is dieselfde persoon.";;
> 		$text['nopaths'] = "Hierdie persone is nie verbind nie.";
> 		$text['nopaths1'] = "Nie meer verbindings korter as xxx nie";
> 		$text['nopaths2'] = "in xxx soekstappe";
> 		$text['longestpath'] = "(langste pad wat tot dusver nagegaan is, was xxx treë lank)";
> 		$text['relevantpaths'] = "Die aantal verskillende relevante paaie wat gevind is: xxx";
> 		$text['skipMarr'] = "(Addisioneel, as gevolg van te veel huwelike, vertoon al die roetes wat gevind was nie: xxx)";
> 		$text['mjaor'] = "of";
> 		$text['connectionsto'] = "verbindings met";
> 		$text['findanotherpers'] = "Vind ander persoon...";
> 		$text['sometimes'] = "(Soms, deur die nagaan van 'n aantal verskillende generasies word 'n ander resultaat gelewer.)";
> 		$text['anotherpath'] = "Soek na ander verbindings";
> 		$text['xpath'] = "Roete";
> 		$text['primary'] = "Oorspronklike persoon"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Laaste Persoon";
> 		$text['parent'] = "Ouer";
> 		$text['mhfather'] = "sy vader";
> 		$text['mhmother'] = "sy moeder";
> 		$text['mhhusband'] = "sy man";
> 		$text['mhwife'] = "sy vrou";
> 		$text['mhson'] = "sy seun";
> 		$text['mhdaughter'] = "sy dogter";
> 		$text['fhfather'] = "haar vader";
> 		$text['fhmother'] = "haar moeder";
> 		$text['fhhusband'] = "haar man";
> 		$text['fhwife'] = "haar vrou";
> 		$text['fhson'] = "haar seun";
> 		$text['fhdaughter'] = "haar dogter";
> 		$text['hfather'] = "vader";
> 		$text['hmother'] = "moeder";
> 		$text['hhusband'] = "man";
> 		$text['hwife'] = "vrou";
> 		$text['hson'] = "seun";
> 		$text['hdaughter'] = "dogter";
> 		$text['maxruns'] = "Maks aantal roetes wat nagegaan moet word";
> 		$text['maxrshort'] = "Maks roetes";
> 		$text['maxlength'] = "Verbindingsroetes nie langer as";
> 		$text['maxlshort'] = "Maks lengte";
> 		$text['xstep'] = "stap";
> 		$text['xsteps'] = "stape";
> 		$text['xmarriages'] = "xxx huwelike";
> 		$text['xmarriage'] = "1 huwelik";
> 		$text['showspouses'] = "Wys byde eggenote";
> 		$text['showTxt'] = "Wys beskrywing van tekstuele roetes";
> 		$text['showTxtshort'] = "Tekstuele beskrywing.";
> 		$text['compactBox'] = "Wys persoon kompartemente gekompakteer";
> 		$text['compactBoxshort'] = "Kompaktee kompartemente";
> 		$text['paths'] = "Roetes";
> 		$text['dospouses2'] = "Wys eggenote";
> 		$text['maxmopt'] = "Maksimum huwelike per verband";
> 		$text['maxm'] = "Maksimum huwelike";
> 		$text['arerelated'] = "Hierdie persone is familie - Hul verhoudinge word in Spoor (Pad) 1 gewys";
> 		$text['simplerel'] = "Soek eenvoudige verhouding op";
196d264
< 		$text['scrollnote'] = "LW: mag dalk nodig wees om na regs en na onder te beweeg vir volledige kaart.";
199d266
< 		$text['popupnote2'] = " = Nuwe stamboom";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabele";
> 		$text['dtchildren'] = "Kinders";
> 		$text['dtgrandchildren'] = "Kleinkinders";
> 		$text['dtggrandchildren'] = "Agter kleinkinders";
> 		$text['dtgggrandchildren'] = "Agter kleinkinders"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Geen afstammelinge nie";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totaal";
> 		$text['dtselect'] = "Selekteer";
> 		$text['dteachfulltable'] = "Elke volle tabelle sal hê";
> 		$text['dtrows'] = "rye";
> 		$text['dtdisplayingtable'] = "Vertoon tabel";
> 		$text['dtgototable'] = "Gaan na tabel:";
> 		$text['fcinstrdn'] = "Wys familie met eggenoot";
> 		$text['fcinstrup'] = "Wys familie met ouers";
> 		$text['fcinstrplus'] = "Kies ander gades";
> 		$text['fcinstrfam'] = "Kies ander ouers";
381,383c467
< 		$text['firstpage'] = "Eerste Bladsy";
< 		$text['lastpage'] = "Laaste Bladsy";
< 		$text['photoowner'] = "Eienaar/Bron";
---
> 		$text['photoowner'] = "Eienaar van die oorspronklike";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Wissel Tags";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Doen weer nuwe wagwoord";
> 		$text['resetsuccess'] = "Sukses: Wagwoord is reg gestel";
> 		$text['resetfail'] = "Mislukking: Wagwoord is nie reg gestel nie";
> 		$text['failreason0'] = " (onbekende databasis fout)";
> 		$text['failreason2'] = " (jy het nie toestemming om jou wagwoord te verander nie)";
> 		$text['failreason3'] = " (wagwoorde stem nie ooreen nie)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totale bronverwysings";
618d710
< 		$text['loginfirst'] = "Jy moet eers aanteken.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Bestaande gebruikers rekords is opgespoor. Om voort te gaan, moet u eers aanmeld of alle rekords van die gebruikertabel verwyder.";
629,630d722
< 		$text['zoomin'] = "Zoem In";
< 		$text['zoomout'] = "Zoem Uit";
656d747
< 		$text['dna_info_head'] = "DNA Toets Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "*";
< $text['chrabbr'] = "&asymp;";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "†";  //from descend
706d817
< $text['burialabbr'] = "&Omega;";  //from descend
712d822
< $text['place'] = "Plek";
715d824
< $text['marrabbr'] = "x.";
738d846
< $text['source'] = "Bron";
766d873
< $text['repository'] = "Bewaarplek";
770d876
< $text['findplaces'] = "Soek alle individue met gebeure by hierdie plek";
804d909
< $text['glang'] = "&amp;hl=af";
816d920
< $text['none'] = "Geen";
924d1027
< $text['otherevents'] = "Ander gebeuternisse";
952,953d1054
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Vinnige skakels";
> $text['yourname'] = "Jou naam";
> $text['youremail'] = "Jou e-posadres";
> $text['liketoadd'] = "Enige inligting wat u wil byvoeg";
> $text['webmastermsg'] = "Webmeesterboodskap";
> $text['gallery'] = "Kyk Gallery";
> $text['wasborn_male'] = "is gebore";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "is gebore"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "is gedoop";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "is gedoop";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "gesterf";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "gesterf";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "is begrawe"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "is begrawe"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "is veras";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "is veras";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "getroud";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "getroud";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "is geskei";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "is geskei";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = "in";			// used as a preposition to the location
> $text['onthisdate'] = "aan";		// when used with full date
> $text['inthisyear'] = "in";		// when used with year only or month / year dates
> $text['and'] = "en";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Toets Info";
> //added in 13.0
> $text['visitor'] = "Besoeker";
> 
> $text['popupnote2'] = " = Nuwe stamboom";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoem In";
> $text['zoomout'] = "Zoem Uit";
> $text['scrollnote'] = "Sleep of blaai om meer van die kaart te sien.";
> $text['general'] = "Algemeen";
> 
> //changed in 14.0
> $text['otherevents'] = "Ander gebeurtenisse en kenmerke";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Verbindings";
> $text['continue'] = "Vervolg";
> $text['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Afrikaans-UTF8/admintext.php TNG1403/languages/Afrikaans-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Vul asseblief in";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Kies 'n lêer om te importeer.";
> 		$admtext['addreplacedata'] = "Voeg by of vervang jou genealogie (mag etlike minute duur, afhangende van die grootte van jou lêer)";
> 		$admtext['fromyourcomputer'] = "Vanaf jou rekenaar";
> 		$admtext['importdata'] = "Importeer Data";
> 		$admtext['replace'] = "Vervang (in geselekteerde stamboom)";
> 		$admtext['desttree'] = "Bestemming Stamboom";
> 		$admtext['selectdesttree'] = "Kies of vul 'n bestemmingsboom in.";
> 		$admtext['selectexisting'] = "Importeer inligting";
> 		$admtext['ucaselast'] = "Maak alle vanne hoofletters";
> 		$admtext['norecalc'] = "Moenie weer Lewende vlae bereken nie";
> 		$admtext['autooffset'] = "Begin IDs by eerste beskikbare nommer";
> 		$admtext['mustselecttree'] = "Jy moet 'n stamboom kies voor jy hierdie opsie kies.";
> 		$admtext['onwebserver'] = "Op webbediener (in GEDCOMvouer)";
> 		$admtext['imphints'] = "Wenke: Wenke: Alle huidige data beteken alle mense, families, bronne en notas (media-verbindings sal nie verlore raak nie solank as wat ID's deselfde bly). Kombineering word altyd net gebaseer op ID's. Nuwe rekords word altyd bygevoeg. Heg die invoer van alle rekords met nuwe ID's.";
> 		$admtext['destbranch'] = "Bestemmingstak (opsioneel)";
> 		$admtext['importlatlong'] = "Importeer data vir breedtegraad / lengtegraad indien beskikbaar";
> 		$admtext['opening'] = "Open";
> 		$admtext['reopen'] = "Heropen";
> 		$admtext['uploading'] = "Oplaai";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Invoer gestaak";
> 		$admtext['resume'] = "Begin weer";
> 		$admtext['neweronly'] = "Vervang slegs indien nuwer";
> 		$admtext['oldimport'] = "Ou invoer styl (geen progresiewe stafie)";
> 		$admtext['importgedcom'] = "Voer GEDCOM-lêer in (Kan gezip word)";
> 		$admtext['stopbackup'] = "Dit kan 'n goeie idee wees om u huidige data te rugsteun voordat u verder gaan.";
> 		$admtext['importmedia'] = "Importeer media indien dit bestaan";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Maak seker dat die voorvoegsels en agtervoegsels (Algemene instellings) korrek is vir hierdie lêer.";
> 		$admtext['chkimpsettings'] = "Gaan die Invoerinstellings na vir meer opsies.";
> 		$admtext['eventsonly'] = "Voer slegs gepasmaakte gebeurtenistipes en -kenmerke in (geen data word bygevoeg, vervang of bygevoeg nie)";
> 		$admtext['allevents'] = "Aanvaar data vir alle nuwe gebeurtenistipes en -kenmerke";
> 		$admtext['finishingimporting'] = "Afwerking...";
> 		$admtext['fileuploadfailed'] = "Kon die lêer nie oplaai nie. Kan beteken dat lêer te groot is. Probeer FTP om die lêer na jou GEDCOM-lêergids oor te laai, kies en voer dan van daar af in.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Verander Bestaande Gebeurtenissoort";
135,138d168
< 		$admtext['entertypedesc'] = "Vul 'n tipe/beskrywing in vir hierdie nuwe Gebeurtenissoort.";
< 		$admtext['enterdisplay'] = "Vul asseblief 'n vertoonstring in vir hierdie nuwe Gebeurtenis.";
< 		$admtext['existingeventtypeinfo'] = "Bestaande Gebeurtenissoort Inligting";
< 		$admtext['neweventtypeinfo'] = "Nuwe Gebeurtenissoort Inligting";
145,146d174
< 		$admtext['addnewevtype'] = "Voeg Nuwe Gebeurtenissoort By";
< 		$admtext['createnewevtype'] = "Skep 'n nuwe Gebeurtenissoort rekord";
149,150d176
< 		$admtext['existingevtypes'] = "Bestaande Gebeurtenissoorte";
< 		$admtext['edsevtypes'] = "Verander, verwyder of sorteer reeds bestaande Gebeurtenissoorte";
152d177
< 		$admtext['confdeleteevtype'] = "Is jy seker jy wil hierdie gebeurtenissoort verwyder?";
154d178
< 		$admtext['selectentertag'] = "Kies of vul asseblief die tag vir hierdie gebeurtenissoort.";
208d231
< 		$admtext['changestoallevtypes'] = "Veranderinge aan alle Gebeurtenissoorte";
214d236
< 		$admtext['BAPM'] = "Baptisme";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Is u seker dat u hierdie gebeurtenistipe wil uitvee? Alle gebeure van hierdie tipe sal ook uitgevee word.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Voeg by nuwe tipe";
> 		$admtext['createnewevtype'] = "Skep 'n nuwe kenmerk of 'n gebeurtenis tipe rekord";
> 		$admtext['modifyeventtype'] = "Wysig bestaande tipe";
> 		$admtext['entertypedesc'] = "Voeg 'n tipe/beskrywing vir hierdie nuwe kenmerk of gebeurtenistipe in.";
> 		$admtext['enterdisplay'] = "Voeg asseblief 'n tipe/beskrywing vir hierdie nuwe kenmerk of gebeurtenistipe in. Voeg asseblief 'n vertoonstring vir hierdie nuwe kenmerk of gebeurtenistipe in.";
> 		$admtext['existingeventtypeinfo'] = "Bestaande kenmerk of gebeurtenis tipe inligting";
> 		$admtext['neweventtypeinfo'] = "'n Nuwe kenmerk of gebeurtenis tipe inligting";
> 		$admtext['existingevtypes'] = "Bestaande kenmerk of gebeurtenistipes";
> 		$admtext['edsevtypes'] = "Wysig, skrap of sorteer voorheen ingevoerde kenmerke en gebeurtenistipes";
> 		$admtext['selectentertag'] = "Kies of voer asseblief die merker vir hierdie kenmerk of gebeurtenistipe in.";
> 		$admtext['changestoallevtypes'] = "Veranderings aan alle kenmerke of gebeurtenistipes";
268d303
< 		$admtext['nobirthinfo'] = "Geen geboorte-inligting";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Kies<br/>standard<br/>foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Stoor + nuwe ouers";
> 		$admtext['savenewspouse'] = "Stoor + nuwe eggenoot";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alteratiewe Geboorte";
354d391
< 		$admtext['enterphotodesc'] = "Vul asseblief 'n beskrywing in vir die grafikalêer.";
388d424
< 		$admtext['photoowner'] = "Eienaar/Bron";
417d452
< 		$admtext['imgmap'] = "Beeld Kaart";
490d524
< 		$admtext['mapinstr3'] = "Om 'n gesig of gebied van hierdie foto te koppel aan 'n spesifieke individu, selekteer die individu se stamboom, kies 'n vorm en afmetings vir die gebied, kliek dan op die middel van die gedeelte op die foto. 'n Opspring venster sal jou help om die individu te kies. Nadat die seleksie gemaak is, sal programkode vir die image map in die boks hierbo gevoeg word. Herhaal hierdie proses soos nodig vir addisionele gebiede.";
495d528
< 		$admtext['removelink'] = "Verwyder Koppeling";
502d534
< 		$admtext['eloptions'] = "Blaai deur, of Verwyder";
509d540
< 		$admtext['nolinks'] = "Nog geen koppelinge";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML-prentkaart (vir terugwaartse verenigbaarheid)";
> 		$admtext['photoowner'] = "Eienaar van die oorspronklike";
> 		$admtext['nothumb'] = "geen kleinkiekie nie";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Die item kon nie bygevoeg word nie, heel waarskynlik omdat die lêer te groot was en nie opgelaai of gebruik kon word om 'n kleinkiekie te maak nie.";
> 		$admtext['moved'] = "Geskuif";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Voer asseblief 'n titel of beskrywing by vir hierdie media.";
> 		$admtext['mapinstr3'] = "Om 'n streek te koppel aan hierdie foto van 'n persoon, familie of ander entiteit , kies eers die relevante boom en entiteittipe, skep dan 'n reghoek vir die gewenste streek. Dit word gedoen deur te klik in die boonste linkerhoek van die streek en dan na die onderste regterhoek te sleep. Alternatief kan jy in die boonste linkerhoek klik en dan weer in die onderste regterhoek. 'n Opspringblokkie (popup) sal jou dan help om die persoon of ander entiteit te kies. Kies en herhaal hierdie proses soos benodig vir bykomende streke. Kies en klik 'n bestaande streek, sleep om te skuif of klik op die 'X' om uit te vee.";
596d633
< 		$admtext['foremptystring'] = "Vir 'n leë string, los die veld leeg en kliek \"Voeg By >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Iinstruksies: Sleep of dubbelklik item aan die linkerkant in die lyste aan die regterkant. Sleep op en af om te herrangskik. Dubbelklik weer om te verwyder.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Vir 'n leë string, laat hierdie veld leeg en klik >>";
651,655d690
< 		$admtext['selectimportfile'] = "Kies 'n lêer om te importeer.";
< 		$admtext['importgedcom'] = "Importeer GEDCOM (standaard 5.5 formaat)";
< 		$admtext['addreplacedata'] = "Voeg by of vervang jou genealogie (mag etlike minute duur, afhangende van die grootte van jou lêer)";
< 		$admtext['fromyourcomputer'] = "Vanaf jou rekenaar";
< 		$admtext['importdata'] = "Importeer Data";
657,660d691
< 		$admtext['replace'] = "Vervang (in geselekteerde stamboom)";
< 		$admtext['desttree'] = "Bestemming Stamboom";
< 		$admtext['selectdesttree'] = "Kies of vul 'n bestemmingsboom in.";
< 		$admtext['selectexisting'] = "Importeer inligting";
668,673d698
< 		$admtext['ucaselast'] = "Maak alle vanne hoofletters";
< 		$admtext['norecalc'] = "Moenie weer Lewende vlae bereken nie";
< 		$admtext['autooffset'] = "Begin IDs by eerste beskikbare nommer";
< 
< 		$admtext['mustselecttree'] = "Jy moet 'n stamboom kies voor jy hierdie opsie kies.";
< 		$admtext['importmedia'] = "Importeer media indien dit bestaan";
675d699
< 		$admtext['neweronly'] = "Vervang slegs indien nuwer";
677,692d700
< 		$admtext['onwebserver'] = "Op webbediener (in GEDCOMvouer)";
< 		$admtext['eventsonly'] = "Importeer net Op Maat gemaakte Gebeurtenissoorte";
< 		$admtext['imphints'] = "Wenke: Wenke: Alle huidige data beteken alle mense, families, bronne en notas (media-verbindings sal nie verlore raak nie solank as wat ID's deselfde bly). Kombineering word altyd net gebaseer op ID's. Nuwe rekords word altyd bygevoeg. Heg die invoer van alle rekords met nuwe ID's.";
< 		$admtext['allevents'] = "Aanvaar data vir alle nuwe Op Maat gemaak Gebeurtenissoorte";
< 		$admtext['destbranch'] = "Bestemmingstak (opsioneel)";
< 		$admtext['inframe'] = "(in raam)";
< 		$admtext['getstart'] = "Om te Begin";
< 		$admtext['importlatlong'] = "Importeer data vir breedtegraad / lengtegraad indien beskikbaar";
< 		$admtext['opening'] = "Open";
< 		$admtext['reopen'] = "Heropen";
< 		$admtext['uploading'] = "Oplaai";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Invoer gestaak";
< 		$admtext['resume'] = "Begin weer";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Logadministrasie";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Ou invoer styl (geen progresiewe stafie)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgradeer";
> 		$admtext['need_upgrade'] = "Voltooi hierdie opgraderingsinstruksies";
> 		$admtext['upgrade_missing'] = "Dit lyk of die opgraderinglêer ontbreek, so jy is dalk reeds klaar.";
> 		$admtext['delete_upgrade'] = "Wanneer jy klaar is, klik hier om die opgradering uit te vee en terug te keer na die kieslys.";
723d733
< 		$admtext['author'] = "Outeur";
804,809c814,819
< 		$admtext['momside'] = "Etiket aan Ma se kant"; //8
< 		$admtext['dadside'] = "Etiket aan Pa se kant"; //8
< 		$admtext['momperson'] = "PersoonsID aan Ma se kant"; //8
< 		$admtext['momtree'] = "Stamboom-ID aan Ma se kant"; //8
< 		$admtext['dadperson'] = "PersoonsID aan Pa se kant"; //8
< 		$admtext['dadtree'] = "Stamboom-ID aan Pa se kant"; //8
---
> 		$admtext['momside'] = "Etiket aan Ma se kant"; //8, 20
> 		$admtext['dadside'] = "Etiket aan Pa se kant"; //8, 20
> 		$admtext['momperson'] = "PersoonsID aan Ma se kant"; //8, 20
> 		$admtext['momtree'] = "Stamboom-ID aan Ma se kant"; //8, 20
> 		$admtext['dadperson'] = "PersoonsID aan Pa se kant"; //8, 20
> 		$admtext['dadtree'] = "Stamboom-ID aan Pa se kant"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Aanhaalkop";
> 		$admtext['quotesubhead'] = "Aanhalingstekens";
> 		$admtext['sniptitle'] = "Featurette titel";
> 		$admtext['snipname'] = "Funksienaam";
> 		$admtext['snipinfoone'] = "Featurette eerste reël";
> 		$admtext['snipinfotwo'] = "Featurette tweede reël";
> 		$admtext['snipimage'] = "Feature-prent";
> 		$admtext['snipperson'] = "Feature-persoon-ID";
> 		$admtext['sniptree'] = "Featurette boom ID";
> 		$admtext['quote'] = "Aanhaling";
> 		$admtext['link'] = "Skakel";
> 		$admtext['featuretitle7'] = "Funksie 7-titel";
> 		$admtext['featuretitle8'] = "Funksie 8 titel";
> 		$admtext['featuretitle9'] = "Funksie 9-titel";
> 		$admtext['featurethumb9'] = "Funksie 9-kleinkiekie"; //15
> 		$admtext['featurelink9'] = "Funksie 9 skakel"; //15
> 		$admtext['featurepara9'] = "Funksie 9 paragraaf"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Opskrif na links";
> 		$admtext['rightimg'] = "Opskrif na regs";
> 		$admtext['photoption'] = "Foto-opsies is<br />&nbsp;&nbsp;( staties of ewekansig)";
> 		$admtext['randomphotowidth'] = "Willekeurige foto breedte";
> 		$admtext['randomphotoheight'] = "Willekeurige fotohoogte";
> 		$admtext['randomphotomediatypeID'] = "Willekeurige fotoversameling";
> 		$admtext['momheading'] = "Moederfamilie Opskirf";
> 		$admtext['mompara'] = "Moederfamilie paragraaf";
> 		$admtext['mompagelink'] = "Moederfamilie Bladsy skakel";
> 		$admtext['dadheading'] = "Vadersfamilie Opskrif";
> 		$admtext['dadpara'] = "Vadersfamilie paragraaf";
> 		$admtext['dadpagelink'] = "Vadersfamilie Bladsyskakel";
> 		$admtext['spmomheading'] = "Eggenoot moederfamilie opskrif";
> 		$admtext['spmompara'] = "Eggenoot moederfamilie paragraaf";
> 		$admtext['spmompagelink'] = "Eggenoot moederfamilie Bladsy skakel ";
> 		$admtext['spmomside'] = "Eggenoot Moederskant-etiket";
> 		$admtext['spdadside'] = "Eggenoot vaderlikekant-etiket";
> 		$admtext['spmomperson'] = "Eggenoot moederskant persoonID";
> 		$admtext['spmomtree'] = "Eggenoot moederskant boomID";
> 		$admtext['spdadheading'] = "Eggenoot Vadersfamilie Opskrif";
> 		$admtext['spdadpara'] = "Eggenoot Vadersfamilie paragraaf";
> 		$admtext['spdadpagelink'] = "Eggenoot Vadersfamilie Bladsyskakel";
> 		$admtext['spdadperson'] = "Eggenoot Vaderskant persoonID";
> 		$admtext['spdadtree'] = "Eggenoot vaderskant boomID";
> 		$admtext['storiesheading'] = "Ons familie storie";
> 		$admtext['nbrsurnames'] = "Aantal vanne<br />&nbsp;&nbsp; in Van wolk";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Funksie miniatuur";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vereis 5.3 of hoër.)";
---
> 		$admtext['phpreq'] = "(TNG vereis 7.0 of hoër.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Verander inkomende voorvoegsels om by TNG-instellings te pas";
> 		$admtext['sortevents'] = "Sorteer gebeure volgens";
> 		$admtext['sortbydate'] = "Gebeurtenisdatum";
> 		$admtext['sortbytype'] = "Gebeurtenistipe";
> 		$admtext['allowsuggest'] = "Laat voorstelle van besoekers toe";
> 		$admtext['livingchecked'] = "Lewende vlag vir nuwe mense en gesinne";
> 		$admtext['maxmarried'] = "Merk familie wat woon as hulle getroud is minder as<br/>soveel jare";
> 		$admtext['imagetags'] = "Reghoeke";
> 		$admtext['allowcsv'] = "Laat CSV aflaai vir verslae toe";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Rugsteun (backup) opsies";
> 		$admtext['dosql'] = "Voer uit as SQL";
> 		$admtext['dodrop'] = "Sluit DROP TABEL in INDIEN BESTAAN";
> 		$admtext['docreate'] = "CREATE TABLE ingesluit";
> 		$admtext['onrestore'] = "Herstel opsies";
> 		$admtext['dodel'] = "Vee eers vorige inhoud uit";
> 		$admtext['download'] = "Aflaai";
> 		$admtext['altbirthtypes'] = "Alternatiewe geboortegebeurtenisse";
> 		$admtext['dtformat'] = "Tabelle Formaat";
> 		$admtext['conchart'] = "Verbindingskaart";
> 		$admtext['maxropt'] = "Maksimum aantal verbindingsoektogte";
> 		$admtext['maxlopt'] = "Maksimum lengte van verbindingspaaie";
> 		$admtext['showtxtopt'] = "Vertoon tekstuele padverklaring";
> 		$admtext['compactboxopt'] = "Wys persoon bokse in kompakte vorm";
> 		$admtext['sortbyopt'] = "Sorteer paaie volgens";
> 		$admtext['anchoridopt'] = "Anker ID";
> 		$admtext['maxmopt'] = "Max huwelike in verband";
> 		$admtext['saveincfg'] = "Stoor in konfigurasiepad (sien Algemene instellings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kon nie geokode nie";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Moenie geokodeer nie";
1436d1549
< 		$admtext['backtosecondary'] = "Terug na Sekondêre Proses";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Terug na Na-invoer Utilities";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Sluit aantekeninge uit";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Rits en medialêers ingesluit";
> 		$admtext['downloadzip'] = "Laai ZIP af";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Wys gedeaktiveer gebruikers alleenlik";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Stuur ook na admins wanneer 'n enkele stamboom gekies is";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alle Mods";
> 		$admtext['installedmods'] = " Slegs geïnstalleerde mods";
> 		$admtext['partinstmods'] = " Geïnstalleerde + gedeeltelik geïnstalleerde mods";
> 		$admtext['showanalyzeractions'] = " Wys alle aksies in Mod Analyzer";
> 		$admtext['badchar'] = "Ongeldige karakter";
1886d2008
< 		$admtext['test_number'] = "Toets Nommer";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Toets Nommer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Koppel hierdie DNS-toets aan 'n persoon";
1965d2095
< $admtext['otherevents'] = "Ander Gebeurtenisse";
2050,2051d2179
< $admtext['savereturn'] = "Terug na hierdie bladsy";
< $admtext['saveback'] = "Terug na keuselys";
2058,2059d2185
< $admtext['secondary'] = "Sekondêre Prosesse";
< $admtext['commas'] = "Skei veelvuldige inskrywings met kommas";
2101c2227
< $admtext['nobranch'] = "Geen Takke";
---
> $admtext['nobranch'] = "Geen tak nie";
2129,2130d2254
< $admtext['secondarymaint'] = "Sekondêre Prosesse";
< $admtext['customeventtypes'] = "Op maat gemaakte Gebeurtenissoorte";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tiepe";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Vanne";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Beeld";
> $admtext['author'] = "Skrywer";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Om te Begin";
> $admtext['showlog'] = "Logadministrasie";
> $admtext['nobirthinfo'] = "Geen geboorte-inligting";
> //changed in 13.0
> $admtext['savereturn'] = "Stoor + Bly";
> $admtext['saveback'] = "Stoor + Uitgang";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alle items is suksesvol uitgevee.";
> $admtext['private'] = "Privaat";
> $admtext['imgtags'] = "Beeldetikette";
> 
> $admtext['removelink'] = "Verwyder Koppeling";
> $admtext['eloptions'] = "Blaai deur, of Verwyder";
> $admtext['pleaseenter'] = "Vul asseblief in";
> 
> $admtext['nolinks'] = "Nog geen koppelinge";
> $admtext['nogeocode'] = "Kon nie geokode nie";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Kies<br/>standard<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Gebeurtenis/ Kenmerktipes";
> $admtext['secondary'] = "Na-invoer Nutsprogramme";
> $admtext['otherevents'] = "Ander Gebeurtenisse / Eienskappe";
> //added in 14.0
> $admtext['newlinks'] = "Skakels geskep";
> $admtext['newcemlinks'] = "Begraafplaasskakels geskep";
> $admtext['utility'] = "Nuts";
> $admtext['linktype'] = "Tipes";
> $admtext['move'] = "Skuif";
> $admtext['copy'] = "Kopieer";
> $admtext['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Afrikaans-UTF8/alltext.php TNG1403/languages/Afrikaans-UTF8/alltext.php
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "'n Fout het met TNG sagteware plaasgevind. Dit kan deur of 'n opstel probleem veroorsaak word, of 'n onvoltooide opgradering of 'n program probleem. As jy die webblad eienaar is, kan jy TNG ondersteuning vir hulp kontak. Maak asb 'n kopie van die navraag hieronder en plak dit in jou boodskap in.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Toets Nommer/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Toets Nommer/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "*";
> $text['chrabbr'] = "&asymp;";
> $text['deathabbr'] = "†";  //from descend
> $text['burialabbr'] = "&Omega;";  //from descend
> $text['marrabbr'] = "x.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Eerste Bladsy";
> $text['lastpage'] = "Laaste Bladsy";
> 
> //changed in 13.0.0
> $text['problem'] = "'n Fout het voorgekom in die TNG-sagteware. Wat om te doen?:<p>As u so pas 'n opgradering geïnstalleer het, het u deel van die installasie-instruksies miskien oorgeslaan? Gaan terug na die opgradering-leesbladsy en lees die instruksies weer. Let veral op na die stap van die databasisstruktuur.</p><p>As u net vir die eerste keer TNG geïnstalleer het, moet u moontlik nog die databasistabelle skep. Keer terug na die leesmy.html bladsy om die stap te vind.</p><p>As u die webwerf-eienaar is, kan u TNG se ondersteuning kontak vir verdere hulp met hierdie probleem. Kopieer die navraag hieronder en plak dit in u boodskap.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Geen tak nie";
> 
> //added in 14.0
> $text['oneyear'] = "jaar";
> $text['pwdcodelink'] = "Klik op hierdie skakel en 'n tydelike paswoord sal aan jou gestuur word";
> $text['pwdcodesent'] = "'n Paswoord terugstelskakel is na jou e-posadres gestuur.";
> $text['moved'] = "Verskuif";
> $text['citation'] = "Aanhaling";
> $text['other'] = "Aander";
> $text['death'] = "Dood";
> $text['burial'] = "Begrawe";
> $text['cremation'] = "Veras";
> $text['marriage'] = "Huweluk";
> $text['divorce'] = "Egskyding";
> $text['bylength'] = "Stape";
> $text['bymarriages'] = "Huweluke";
> $text['none'] = "Geen";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Bron";
> $text['repository'] = "Bewaarplek";
> $text['place'] = "Plek";
> $admtext['BAPM'] = "Baptisme";
> 
> $text['glang'] = "af";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Afrikaans-UTF8/cust_text.php TNG1403/languages/Afrikaans-UTF8/cust_text.php
5,6d4
< //Put your own custom messages here, like this:
< //$text[messagename] = "This is the message";
diff -r TNG/languages/Afrikaans-UTF8/text.php TNG1403/languages/Afrikaans-UTF8/text.php
69d68
< 		$text['general'] = "Algemeen";
77a77
> 	case "connections":
93c93
< 		$text['sometimes'] = "(Soek oor verskillende aantal generasies, kan soms verskillende resultate oplewer.)";
---
> 		$text['sometimes'] = "(Soms, deur die nagaan van 'n aantal verskillende generasies word 'n ander resultaat gelewer.)";
144c144
< 		$text['dospouses2'] = "Toon Gades";
---
> 		$text['dospouses2'] = "Wys eggenote";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Soek vir verbindings";
> 		$text['findrel2'] = "Soek verhoudings en ander verbindings";
> 		$text['makeme2nd'] = "Gebruik my ID";
> 		$text['usebookmarks'] = "Gebruik bookmerke";
> 		$text['select2inds'] = "Kies asseblief twee individue.";
> 		$text['indinfofor'] = "Individuele inligting vir";
> 		$text['nobookmarks'] = "Daar is geen boekmerk om te gebruik nie";
> 		$text['bkmtitle'] = "Persone wat in boekmerke gevind word";
> 		$text['bkminfo'] = "Kies 'n persoon:";
> 		$text['sortpathsby'] = "Sorteer paaie volgens aantal";
> 		$text['sortbyshort'] = "Sorteer volgens";
> 		$text['bylengthshort'] = "Lengte";
> 		$text['badID1'] = ": slegte persoon1 ID - gaan asseblief terug en korregeer";
> 		$text['badID2'] = ": slegte persoon2 ID - gaan asseblief terug en korregeer";
> 		$text['notintree'] = ": die persoon met hierdie ID is nie in die huidige stamboom databasis nie.";
> 		$text['sameperson'] = "Die twee individue is dieselfde persoon.";;
> 		$text['nopaths'] = "Hierdie persone is nie verbind nie.";
> 		$text['nopaths1'] = "Nie meer verbindings korter as xxx nie";
> 		$text['nopaths2'] = "in xxx soekstappe";
> 		$text['longestpath'] = "(langste pad wat tot dusver nagegaan is, was xxx treë lank)";
> 		$text['relevantpaths'] = "Die aantal verskillende relevante paaie wat gevind is: xxx";
> 		$text['skipMarr'] = "(Addisioneel, as gevolg van te veel huwelike, vertoon al die roetes wat gevind was nie: xxx)";
> 		$text['mjaor'] = "of";
> 		$text['connectionsto'] = "verbindings met";
> 		$text['findanotherpers'] = "Vind ander persoon...";
> 		$text['sometimes'] = "(Soms, deur die nagaan van 'n aantal verskillende generasies word 'n ander resultaat gelewer.)";
> 		$text['anotherpath'] = "Soek na ander verbindings";
> 		$text['xpath'] = "Roete";
> 		$text['primary'] = "Oorspronklike persoon"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Laaste Persoon";
> 		$text['parent'] = "Ouer";
> 		$text['mhfather'] = "sy vader";
> 		$text['mhmother'] = "sy moeder";
> 		$text['mhhusband'] = "sy man";
> 		$text['mhwife'] = "sy vrou";
> 		$text['mhson'] = "sy seun";
> 		$text['mhdaughter'] = "sy dogter";
> 		$text['fhfather'] = "haar vader";
> 		$text['fhmother'] = "haar moeder";
> 		$text['fhhusband'] = "haar man";
> 		$text['fhwife'] = "haar vrou";
> 		$text['fhson'] = "haar seun";
> 		$text['fhdaughter'] = "haar dogter";
> 		$text['hfather'] = "vader";
> 		$text['hmother'] = "moeder";
> 		$text['hhusband'] = "man";
> 		$text['hwife'] = "vrou";
> 		$text['hson'] = "seun";
> 		$text['hdaughter'] = "dogter";
> 		$text['maxruns'] = "Maks aantal roetes wat nagegaan moet word";
> 		$text['maxrshort'] = "Maks roetes";
> 		$text['maxlength'] = "Verbindingsroetes nie langer as";
> 		$text['maxlshort'] = "Maks lengte";
> 		$text['xstep'] = "stap";
> 		$text['xsteps'] = "stape";
> 		$text['xmarriages'] = "xxx huwelike";
> 		$text['xmarriage'] = "1 huwelik";
> 		$text['showspouses'] = "Wys byde eggenote";
> 		$text['showTxt'] = "Wys beskrywing van tekstuele roetes";
> 		$text['showTxtshort'] = "Tekstuele beskrywing.";
> 		$text['compactBox'] = "Wys persoon kompartemente gekompakteer";
> 		$text['compactBoxshort'] = "Kompaktee kompartemente";
> 		$text['paths'] = "Roetes";
> 		$text['dospouses2'] = "Wys eggenote";
> 		$text['maxmopt'] = "Maksimum huwelike per verband";
> 		$text['maxm'] = "Maksimum huwelike";
> 		$text['arerelated'] = "Hierdie persone is familie - Hul verhoudinge word in Spoor (Pad) 1 gewys";
> 		$text['simplerel'] = "Soek eenvoudige verhouding op";
196d264
< 		$text['scrollnote'] = "LW: mag dalk nodig wees om na regs en na onder te beweeg vir volledige kaart.";
199d266
< 		$text['popupnote2'] = " = Nuwe stamboom";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabele";
> 		$text['dtchildren'] = "Kinders";
> 		$text['dtgrandchildren'] = "Kleinkinders";
> 		$text['dtggrandchildren'] = "Agter kleinkinders";
> 		$text['dtgggrandchildren'] = "Agter kleinkinders"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Geen afstammelinge nie";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totaal";
> 		$text['dtselect'] = "Selekteer";
> 		$text['dteachfulltable'] = "Elke volle tabelle sal hê";
> 		$text['dtrows'] = "rye";
> 		$text['dtdisplayingtable'] = "Vertoon tabel";
> 		$text['dtgototable'] = "Gaan na tabel:";
> 		$text['fcinstrdn'] = "Wys familie met eggenoot";
> 		$text['fcinstrup'] = "Wys familie met ouers";
> 		$text['fcinstrplus'] = "Kies ander gades";
> 		$text['fcinstrfam'] = "Kies ander ouers";
381,383c467
< 		$text['firstpage'] = "Eerste Bladsy";
< 		$text['lastpage'] = "Laaste Bladsy";
< 		$text['photoowner'] = "Eienaar/Bron";
---
> 		$text['photoowner'] = "Eienaar van die oorspronklike";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Wissel Tags";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Doen weer nuwe wagwoord";
> 		$text['resetsuccess'] = "Sukses: Wagwoord is reg gestel";
> 		$text['resetfail'] = "Mislukking: Wagwoord is nie reg gestel nie";
> 		$text['failreason0'] = " (onbekende databasis fout)";
> 		$text['failreason2'] = " (jy het nie toestemming om jou wagwoord te verander nie)";
> 		$text['failreason3'] = " (wagwoorde stem nie ooreen nie)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totale bronverwysings";
618d710
< 		$text['loginfirst'] = "Jy moet eers aanteken.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Bestaande gebruikers rekords is opgespoor. Om voort te gaan, moet u eers aanmeld of alle rekords van die gebruikertabel verwyder.";
629,630d722
< 		$text['zoomin'] = "Zoem In";
< 		$text['zoomout'] = "Zoem Uit";
656d747
< 		$text['dna_info_head'] = "DNA Toets Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "*";
< $text['chrabbr'] = "&asymp;";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "†";  //from descend
706d817
< $text['burialabbr'] = "&Omega;";  //from descend
712d822
< $text['place'] = "Plek";
715d824
< $text['marrabbr'] = "x.";
738d846
< $text['source'] = "Bron";
766d873
< $text['repository'] = "Bewaarplek";
770d876
< $text['findplaces'] = "Soek alle individue met gebeure by hierdie plek";
804d909
< $text['glang'] = "&amp;hl=af";
816d920
< $text['none'] = "Geen";
924d1027
< $text['otherevents'] = "Ander gebeuternisse";
952,953d1054
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Vinnige skakels";
> $text['yourname'] = "Jou naam";
> $text['youremail'] = "Jou e-posadres";
> $text['liketoadd'] = "Enige inligting wat u wil byvoeg";
> $text['webmastermsg'] = "Webmeesterboodskap";
> $text['gallery'] = "Kyk Gallery";
> $text['wasborn_male'] = "is gebore";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "is gebore"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "is gedoop";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "is gedoop";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "gesterf";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "gesterf";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "is begrawe"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "is begrawe"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "is veras";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "is veras";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "getroud";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "getroud";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "is geskei";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "is geskei";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = "in";			// used as a preposition to the location
> $text['onthisdate'] = "aan";		// when used with full date
> $text['inthisyear'] = "in";		// when used with year only or month / year dates
> $text['and'] = "en";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Toets Info";
> //added in 13.0
> $text['visitor'] = "Besoeker";
> 
> $text['popupnote2'] = " = Nuwe stamboom";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoem In";
> $text['zoomout'] = "Zoem Uit";
> $text['scrollnote'] = "Sleep of blaai om meer van die kaart te sien.";
> $text['general'] = "Algemeen";
> 
> //changed in 14.0
> $text['otherevents'] = "Ander gebeurtenisse en kenmerke";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Verbindings";
> $text['continue'] = "Vervolg";
> $text['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Arabic-UTF8/admintext.php TNG1403/languages/Arabic-UTF8/admintext.php
5c5
< 		$admtext['branchlabel'] = "عنوان �رع";
---
> 		$admtext['branchlabel'] = "عنوان �رعي";
9,11c9,11
< 		$admtext['ancestors'] = "أسلا�";
< 		$admtext['descofanc'] = "أجيال سلالة من كل سل�";
< 		$admtext['descendants'] = "سلالة";
---
> 		$admtext['ancestors'] = "الأجداد";
> 		$admtext['descofanc'] = "أجيال متسلسة من كل جد";
> 		$admtext['descendants'] = "تسلسل";
17c17
< 		$admtext['addingbranch'] = "إضا�ة عنوان �رع";
---
> 		$admtext['addingbranch'] = "إضا�ة عنوان �رعي";
80d79
< 		$admtext['pleaseenter'] = "�ضلا أدخل  ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "�ضلا حدد مل�ا للاستيراد";
> 		$admtext['addreplacedata'] = "جاري استبدال الأنساب الخاصة بك أو الإضا�ة إليها (قد تستغرق العملية عدة دقائق حسب مقاس مل�ك)";
> 		$admtext['fromyourcomputer'] = "من حاسبك";
> 		$admtext['importdata'] = "استيراد بيانات";
> 		$admtext['replace'] = "استبدال (�ي الشجرة المحددة)";
> 		$admtext['desttree'] = "الشجرة المستهد�ة";
> 		$admtext['selectdesttree'] = "�ضلا حدد أو أدخل شجرة مستهد�ة";
> 		$admtext['selectexisting'] = "الاستيراد بداخل";
> 		$admtext['ucaselast'] = "حرو� كبيرة لأسماء العوائل (إنجليزي)";
> 		$admtext['norecalc'] = "لا تحدث حالة الحياة والو�اة";
> 		$admtext['autooffset'] = "ابدأ الترميزات عند أو رقم متاح";
> 		$admtext['mustselecttree'] = "عليك تحديد شجرة قبل انتقاء هذا الخيار";
> 		$admtext['onwebserver'] = "من موقع نسيجي (�ي مجلد مل�ات جيدكوم)";
> 		$admtext['imphints'] = "تلميح: المقصود من كل البيانات الحالية هو كل الأ�راد والعوائل والمصادر والملاحظات (علما بأن ارتباطات الوسائط لا يتم �قدانها مادام الترميزات تظل واحدة). التطابقات تستند دائما إلى أرقام الترميز �قط. تتم إضا�ة سجلات جديدة دوما. و(إلحاق) يستورد كا�ة السجلات ذوات ترميزات جديدة.";
> 		$admtext['destbranch'] = "ال�رع المستهد� (اختياري)";
> 		$admtext['importlatlong'] = "استيراد بيانات خطوط الطول والعرض لو تو�رت";
> 		$admtext['opening'] = "جاري ال�تح";
> 		$admtext['reopen'] = "جاري إعادة ال�تح";
> 		$admtext['uploading'] = "جاري الر�ع";
> 		$admtext['stop'] = "أوق�";
> 		$admtext['stopped'] = "توق� الاستيراد";
> 		$admtext['resume'] = "استهلال";
> 		$admtext['neweronly'] = "استبدل �قط لو كان أجد";
> 		$admtext['oldimport'] = "الاستيراد بالصيغة القديمة (بدون شريط تقدم)";
> 		$admtext['importgedcom'] = "استيراد مل� بصيغة GEDCOM (قد يكون مضغوطا)";
> 		$admtext['stopbackup'] = "ق�! قد يكون من الجيد إجراء نسخ احتياطي لبياناتك الحالية قبل المتابعة.";
> 		$admtext['importmedia'] = "استورد الوسائط لو وجدت";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = " تأكد من أن السوابق واللواحق (الإعدادات العامة) صحيحة لهذا المل�.";
> 		$admtext['chkimpsettings'] = "راجع إعدادات الاستيراد لمزيد من الخيارات.";
> 		$admtext['eventsonly'] = " الاكت�اء باستيراد الأحداث والخواص المكيّ�ة �قط (لا تتم إضا�ة بيانات، أو استبدالها أو إلحاقها)";
> 		$admtext['allevents'] = " قبول البيانات لكا�ة �ئات الأحداث والخواص";
> 		$admtext['finishingimporting'] = " إنهاء...";
> 		$admtext['fileuploadfailed'] = " �شل تحميل المل�. قد يكون لكبر حجم المل�. حاول مجددا باستخدام FTP لتحميل المل� إلى مجلدك الشخصي من نوع GEDCOM، ثم اختر واستورد من هناك.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "عدل نوع حدث قائم";
135,138d168
< 		$admtext['entertypedesc'] = "�ضلا أدخل نوع أو وص� لهذا الحدث الجديد";
< 		$admtext['enterdisplay'] = "�ضلا أدخل النص الذي سيتم عرضه لنوع الأحداث الجديد هذا.";
< 		$admtext['existingeventtypeinfo'] = "بيانات نوع حدث قائم";
< 		$admtext['neweventtypeinfo'] = "بيانات نوع حدث جديد";
145,146d174
< 		$admtext['addnewevtype'] = "إضا�ة تصني� جديد لأحداث";
< 		$admtext['createnewevtype'] = "أنشئ سجل لنوع حدث جديد";
149,150d176
< 		$admtext['existingevtypes'] = "أنواع أحداث قائمة";
< 		$admtext['edsevtypes'] = "حدث أو احذ� أو رتب أنواع أحداث مدخلة مسبقا";
152d177
< 		$admtext['confdeleteevtype'] = "هل أنت متأكد أنك تريد حذ� نوع الحدث هذا؟";
154d178
< 		$admtext['selectentertag'] = "�ضلا اختر أو أدخل التعليق الخاص بنوع الحدث هذا";
208d231
< 		$admtext['changestoallevtypes'] = "تغييرات �ي كا�ة أنواع الأحداث";
214d236
< 		$admtext['BAPM'] = "تعميد";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "هل أنت متأكد أنك تريد حذ� نوع الحدث هذا؟ سيتم حذ� جميع الأحداث من هذا النوع";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "أض� �ئة جديدة";
> 		$admtext['createnewevtype'] = "اصنع حدث جديد أو سجل ل�ئة خاصية";
> 		$admtext['modifyeventtype'] = "التعديل على �ئة قائمة";
> 		$admtext['entertypedesc'] = " �ضلا أدخل �ئة ووص� لهذه الخاصية أو الحدث الجديد.";
> 		$admtext['enterdisplay'] = " �ضلا أدخل النص المراد عرضه لهذه ال�ئة الجدية من الأحداث أو الخواص.";
> 		$admtext['existingeventtypeinfo'] = " معلومات �ئة خواص أو أحداث قائمة";
> 		$admtext['neweventtypeinfo'] = " معلومات �ئة خواص أو أحداث جديدة";
> 		$admtext['existingevtypes'] = " �ئة خواص أو أحداث قائمة";
> 		$admtext['edsevtypes'] = " تعديل أو حذ� أو تصني� �ئات خواص أو أحداث مدخلة مسبقا";
> 		$admtext['selectentertag'] = "�ضلا اختر أو أدخل التعليق (العروة) المناسبة ل�ئة الخاصية أو الحدث هذا.";
> 		$admtext['changestoallevtypes'] = " التعديلات على كا�ة �ئات الخواص أو الأحداث";
268d303
< 		$admtext['nobirthinfo'] = "غياب بيانات الولادة";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = " اختر<br/>الصورة<br/>الا�تراضية"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "ح�ظ + الآباء الجدد";
> 		$admtext['savenewspouse'] = "ح�ظ + الزوج الجديد";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "الولادة البديلة";
354d391
< 		$admtext['enterphotodesc'] = "�ضلا أدخل وص�ا للصورة";
388d424
< 		$admtext['photoowner'] = "المالك/المصدر";
417d452
< 		$admtext['imgmap'] = "خارطة صورة";
477c512
< 		$admtext['samepaths'] = "الصورة الرئيسة والصورة المصغرة قد لا يكونان لن�س المل�. �ضلا حدد صورة مصغرة بديلة أو دعه يصنع لك.";
---
> 		$admtext['samepaths'] = "الصورة الرئيسية والصورة المصغرة قد لا يكونان لن�س المل�. �ضلا حدد صورة مصغرة بديلة أو دعه يصنع لك.";
490d524
< 		$admtext['mapinstr3'] = " لربط منطقة من هذه الصورة ب�رد حدد أولا شجرة ال�رد، ثم أنشئ مستطيلا للمنطقة المطلوبة. يتم ذلك من خلال النقر �ي الزاوية اليسرى العلوية من المنطقة ومن ثم السحب إلى الزاوية اليمنى الس�لية. كما يمكنكم بدلا من ذلك النقر �ي الزاوية اليسرى العلوية ثم مرة أخرى �ي الزاوية اليمنى الس�لية. سو� تنبثق أمامك شاشة تساعدك على اختيار ال�رد. بعد التحديد، سيتم إضا�ة رمز لخريطة صورة �ي المربع أدناه. قم بتكرار هذه العملية حسب الحاجة �ي مناطق إضا�ية.";
495d528
< 		$admtext['removelink'] = "حذ� رابط";
502d534
< 		$admtext['eloptions'] = "تص�ح أو احذ�";
509d540
< 		$admtext['nolinks'] = "لا توجد روابط";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "خريطة صورة HTML (للتوا�ق مع الإصدارات السابقة)";
> 		$admtext['photoowner'] = "مالك الأصل";
> 		$admtext['nothumb'] = "لا صورة مصغرة";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = " تعذر إضا�ة العنصر ، على الأرجح لكبر حجم المل� مما أدى إلى تعذر تحميله أو استخدامه لإنشاء صورة مصغرة.";
> 		$admtext['moved'] = "تم التحريك";
> 		$admtext['url'] = "رابط أنترنت";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = " �ضلا أدخل عنوانا أو وص�ا لهذا المحتوى.";
> 		$admtext['mapinstr3'] = " لربط منطقة الصورة بشخص أو عائلة أو كائن آخر، اختر أولا الشجرة المناسبة و�ئة الكائن، ثم اصنع مستطيلا للمنطقة المرغوبة وذلك من خلال النقر على الزاوية اليسرى العلوية للمنطقة ثم السحب إلى الزاوية اليمنى الس�لية. كما يمكنك النقر على الزاوية اليسرى العلوية ثم النقر على الزاوية اليمنى الس�لية. سو� تظهر أمامك رسالة ترشدك �ي عملية اختيار الشخص أو الكائن الآخر. ن�ذ اختيارك، ثم كرر العملية حسب الحاجة لمناطق أخرى. انقر على منطقة لاختيارها، ثم اسحب للتحريك أو انقر على X للحذ�.";
596d633
< 		$admtext['foremptystring'] = " لجملة �ارغة، اترك هذا الحقل �ارغا ثم انقر \"إضا�ة >>\".";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = " تعليمات: اسحب أو انقر مرتين على العناصر على اليسار إلى القوائم على اليمين. اسحب إلى الأعلى أو إلى الأس�ل لإعادة الترتيب. انقر مرتين مجددا للحذ�.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "لنص �ارع، اترك هذا الحقل خاويا ثم انقر على >>";
651,655d690
< 		$admtext['selectimportfile'] = "�ضلا حدد مل�ا للاستيراد";
< 		$admtext['importgedcom'] = "استيراد مل� بصيغة جيدكوم (إصدار 5.5 النمطي)";
< 		$admtext['addreplacedata'] = "جاري استبدال الأنساب الخاصة بك أو الإضا�ة إليها (قد تستغرق العملية عدة دقائق حسب مقاس مل�ك)";
< 		$admtext['fromyourcomputer'] = "من حاسبك";
< 		$admtext['importdata'] = "استيراد بيانات";
657,660d691
< 		$admtext['replace'] = "استبدال (�ي الشجرة المحددة)";
< 		$admtext['desttree'] = "الشجرة المستهد�ة";
< 		$admtext['selectdesttree'] = "�ضلا حدد أو أدخل شجرة مستهد�ة";
< 		$admtext['selectexisting'] = "الاستيراد بداخل";
668,675c699
< 		$admtext['ucaselast'] = "حرو� كبيرة لأسماء العوائل (إنجليزي)";
< 		$admtext['norecalc'] = "لا تحدث حالة الحياة والو�اة";
< 		$admtext['autooffset'] = "ابدأ الترميزات عند أو رقم متاح";
< 
< 		$admtext['mustselecttree'] = "عليك تحديد شجرة قبل انتقاء هذا الخيار";
< 		$admtext['importmedia'] = "استورد الوسائط لو وجدت";
< 		$admtext['mainmenu'] = "القائمة الرئيسة";
< 		$admtext['neweronly'] = "استبدل �قط لو كان أجد";
---
> 		$admtext['mainmenu'] = "القائمة الرئيسية";
677,692d700
< 		$admtext['onwebserver'] = "من موقع نسيجي (�ي مجلد مل�ات جيدكوم)";
< 		$admtext['eventsonly'] = "اكت�ي باستيراد الأحداث المخصصة (بدون إضا�ة أو استبدال أو إلحاق بيانات)";
< 		$admtext['imphints'] = "تلميح: المقصود من كل البيانات الحالية هو كل الأ�راد والعوائل والمصادر والملاحظات (علما بأن ارتباطات الوسائط لا يتم �قدانها مادام الترميزات تظل واحدة). التطابقات تستند دائما إلى أرقام الترميز �قط. تتم إضا�ة سجلات جديدة دوما. و(إلحاق) يستورد كا�ة السجلات ذوات ترميزات جديدة.";
< 		$admtext['allevents'] = "قبول بيانات كا�ة أنواع الأحداث المخصصة الجديدة";
< 		$admtext['destbranch'] = "ال�رع المستهد� (اختياري)";
< 		$admtext['inframe'] = "(داخل إطار)";
< 		$admtext['getstart'] = "الاستهلال";
< 		$admtext['importlatlong'] = "استيراد بيانات خطوط الطول والعرض لو تو�رت";
< 		$admtext['opening'] = "جاري ال�تح";
< 		$admtext['reopen'] = "جاري إعادة ال�تح";
< 		$admtext['uploading'] = "جاري الر�ع";
< 		$admtext['stop'] = "أوق�";
< 		$admtext['stopped'] = "توق� الاستيراد";
< 		$admtext['resume'] = "استهلال";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "سجل مدير النظام";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "الاستيراد بالصيغة القديمة (بدون شريط تقدم)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "الترقية";
> 		$admtext['need_upgrade'] = "انهاء تعليمات الترقية هذه";
> 		$admtext['upgrade_missing'] = "يبدو أن مل� الترقية م�قود، لذلك قد تكون �رغت مسبقا.";
> 		$admtext['delete_upgrade'] = "عندما تنتهي، انقر هنا لحذ� الترقية والعودة إلى القائمة.";
723d733
< 		$admtext['author'] = "المؤل�";
780c790
< 		$admtext['mainimage'] = "الصورة الرئيسة (لص�حة البداية)"; //1, 2, 3, 4, 5, 7
---
> 		$admtext['mainimage'] = "الصورة الرئيسية (لص�حة البداية)"; //1, 2, 3, 4, 5, 7
782c792
< 		$admtext['headline'] = "عنوان رئيس"; //4, 7
---
> 		$admtext['headline'] = "عنوان رئيسي"; //4, 7
804,809c814,819
< 		$admtext['momside'] = "عنوان جانب الأم"; //8
< 		$admtext['dadside'] = "عنوان جانب الأب"; //8
< 		$admtext['momperson'] = "ترميز ال�رد لجانب الأم"; //8
< 		$admtext['momtree'] = "ترميز الشجرة لجانب الأم"; //8
< 		$admtext['dadperson'] = "ترميز ال�رد لجانب الأب"; //8
< 		$admtext['dadtree'] = "ترميز الشجرة لجانب الأب"; //8
---
> 		$admtext['momside'] = "عنوان جانب الأم"; //8, 20
> 		$admtext['dadside'] = "عنوان جانب الأب"; //8, 20
> 		$admtext['momperson'] = "ترميز ال�رد لجانب الأم"; //8, 20
> 		$admtext['momtree'] = "ترميز الشجرة لجانب الأم"; //8, 20
> 		$admtext['dadperson'] = "ترميز ال�رد لجانب الأب"; //8, 20
> 		$admtext['dadtree'] = "ترميز الشجرة لجانب الأب"; //8, 20
826,827c836,837
< 		$admtext['photocaption'] = "توصي� الصورة الرئيسة"; //4
< 		$admtext['maintitle'] = "العنوان الرئيس"; //5
---
> 		$admtext['photocaption'] = "توصي� الصورة الرئيسية"; //4
> 		$admtext['maintitle'] = "العنوان الرئيسي"; //5
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "اقتباس رأس";
> 		$admtext['quotesubhead'] = "ال�رعي";
> 		$admtext['sniptitle'] = "المواص�ات";
> 		$admtext['snipname'] = "اسم مميز";
> 		$admtext['snipinfoone'] = "السطر الأول المميز";
> 		$admtext['snipinfotwo'] = "السطر الثاني المميز";
> 		$admtext['snipimage'] = "صورة مميزة";
> 		$admtext['snipperson'] = "معر� شخص مميز";
> 		$admtext['sniptree'] = "معرّ� شجرة الميزات";
> 		$admtext['quote'] = "اقتباس";
> 		$admtext['link'] = "الارتباط التشعبي";
> 		$admtext['featuretitle7'] = "عنوان المزية 7";
> 		$admtext['featuretitle8'] = "عنوان المزية 8";
> 		$admtext['featuretitle9'] = "عنوان المزية 9";
> 		$admtext['featurethumb9'] = "صورة مصغرة للمزية 9"; //15
> 		$admtext['featurelink9'] = "رابط المزية 9"; //15
> 		$admtext['featurepara9'] = "�قرة المزية 9"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "رأس الصورة اليسرى";
> 		$admtext['rightimg'] = "رأس الصورة اليمنى";
> 		$admtext['photoption'] = "خيارات الصورة هي<br />&nbsp;&nbsp;(ثابت أو عشوائي)";
> 		$admtext['randomphotowidth'] = "عرض الصور العشوائي";
> 		$admtext['randomphotoheight'] = "ارت�اع الصورة العشوائي";
> 		$admtext['randomphotomediatypeID'] = "مجموعة صور عشوائية";
> 		$admtext['momheading'] = "عنوان عائلة الأم";
> 		$admtext['mompara'] = "�قرة الأسرة الأم";
> 		$admtext['mompagelink'] = "رابط ص�حة الأسرة من جهة الأم";
> 		$admtext['dadheading'] = "عنوان الأسرة الأبوية";
> 		$admtext['dadpara'] = "�قرة الأسرة الأبوية";
> 		$admtext['dadpagelink'] = "رابط ص�حة الأسرة من جهة الأب";
> 		$admtext['spmomheading'] = "عنوان اسرة الزوج / الزوجة  من جهة الأم";
> 		$admtext['spmompara'] = "�قرة عائلة الزوج / الزوجة من جهة الأم";
> 		$admtext['spmompagelink'] = "رابط ص�حة الأسرة للزوج / الزوجة من جهة الأم";
> 		$admtext['spmomside'] = "تسمية الزوج / الزوجة من جهة الأم";
> 		$admtext['spdadside'] = "تسمية الزوج / الزوجة من جهة الأب";
> 		$admtext['spmomperson'] = "هوية الزوج / الزوجة من جهة الأم";
> 		$admtext['spmomtree'] = "هوية شجرة الزوج / الزوجة من جهة الأم";
> 		$admtext['spdadheading'] = "عنوان اسرة الزوج / الزوجة  من جهة الأب";
> 		$admtext['spdadpara'] = "�قرة عائلة الزوج / الزوجة من جهة الأب";
> 		$admtext['spdadpagelink'] = "رابط ص�حة الأسرة للزوج / الزوجة من جهة الأب";
> 		$admtext['spdadperson'] = "هوية الزوج / الزوجة من جهة الأب";
> 		$admtext['spdadtree'] = "هوية شجرة الزوج / الزوجة من جهة الأب";
> 		$admtext['storiesheading'] = "قصص عائلتنا";
> 		$admtext['nbrsurnames'] = "عدد الألقاب<br />&nbsp;&nbsp; �ي سحابة الالقاب";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "صورة مصغرة للميزة";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
947c1040
< 		$admtext['homepage'] = "الص�حة الرئيسة";
---
> 		$admtext['homepage'] = "الص�حة الرئيسية";
1138c1231
< 		$admtext['showhome'] = "اظهار رابط الص�حة الرئيسة";
---
> 		$admtext['showhome'] = "اظهار رابط الص�حة الرئيسية";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1344c1429
< 		$admtext['mainbackground'] = "لون خل�ية الترويسة الرئيسة";
---
> 		$admtext['mainbackground'] = "لون خل�ية الترويسة الرئيسية";
1359,1360c1444,1445
< 		$admtext['cookieapproval'] = "إظهار رسائل الموا�قة لمل�ات تعري� الارتباط (الكوكيز)"; 
< 		$admtext['dataprotectmsg'] = "إظهار الرابط إلى سياسة حماية البيانات"; 
---
> 		$admtext['cookieapproval'] = "إظهار رسائل الموا�قة لمل�ات تعري� الارتباط (الكوكيز)";
> 		$admtext['dataprotectmsg'] = "إظهار الرابط إلى سياسة حماية البيانات";
1362c1447,1476
< 		$admtext['askconsent'] = "اطلب من المستخدم الموا�قة على تخزين المعلومات الشخصية"; 
---
> 		$admtext['askconsent'] = "اطلب من المستخدم الموا�قة على تخزين المعلومات الشخصية";
> 		//added in 13.0
> 		$admtext['coerce'] = "تغيير البادئات الواردة لتتناسب مع إعدادات TNG";
> 		$admtext['sortevents'] = "رتب الأحداث بواسطة";
> 		$admtext['sortbydate'] = "تاريخ الحدث";
> 		$admtext['sortbytype'] = "نوع الحدث";
> 		$admtext['allowsuggest'] = "السماح باقتراحات من الزوار";
> 		$admtext['livingchecked'] = "مجموعة الرموز للأحياء من الأشخاص والعائلات الجديدة";
> 		$admtext['maxmarried'] = "اجعل الأسرة على قيد الحياة إذا تزوجت أقل من<br/>هذا العدد من السنوات";
> 		$admtext['imagetags'] = "مستطيلات";
> 		$admtext['allowcsv'] = "السماح بتنزيل التقارير كمل� csv";
> 		//added in 14.0
> 		$admtext['onbackup'] = "خيارات النسخ الاحتياطي";
> 		$admtext['dosql'] = "التصدير بصيغة SQL";
> 		$admtext['dodrop'] = " إضا�ة: تجاهل الجدول لو كان موجودا";
> 		$admtext['docreate'] = "إضا�ة: استحداث جدول";
> 		$admtext['onrestore'] = "استعادة الخيارات";
> 		$admtext['dodel'] = "حذ� المحتوى السابق أولا";
> 		$admtext['download'] = "إنزال";
> 		$admtext['altbirthtypes'] = "أحداث ولادة بديلة";
> 		$admtext['dtformat'] = "تنسيق جداول";
> 		$admtext['conchart'] = "مخطط الروابط";
> 		$admtext['maxropt'] = " الحد الأقصى لعدد دورات البحث عن الارتباطات";
> 		$admtext['maxlopt'] = " أقصى طول لمسارات الارتباطات";
> 		$admtext['showtxtopt'] = " عرض بيان نصي للمسار";
> 		$admtext['compactboxopt'] = " إظهار صناديق الأشخاص بص�ة مضغوطة";
> 		$admtext['sortbyopt'] = "تصني� المسارات حسب";
> 		$admtext['anchoridopt'] = "ترميزة مرجع آلي";
> 		$admtext['maxmopt'] = "الحد الأقصى للزواجات �ي الرابط";
> 		$admtext['saveincfg'] = "الح�ظ �ي مسار الإعدادات (راجع الإعدادات العامة)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "�شل الترميز الجغرا�ي";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "لا ترميز جغرا�يًا";
1436d1549
< 		$admtext['backtosecondary'] = "العودة إلى العملية الثانوية";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = " العودة إلى أدوات ما بعد الاستيراد";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "استبعد الملاحظات";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = " اضغط شاملا مل�ات الوسائط";
> 		$admtext['downloadzip'] = "إنزال المل� المضغوط";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607c1723,1729
< 		$admtext['consentdate'] = "تمت الموا�قة على التاريخ";		
---
> 		$admtext['consentdate'] = "تمت الموا�قة على التاريخ";
> 		//added in 13.0
> 		$admtext['disabledonly'] = "اعرض المستخدمين المعطلين �قط";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = " ارسل أيضا إلى المدراء عند اختيار شجرة واحدة";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "كا�ة التعديلات";
> 		$admtext['installedmods'] = "التعديلات المثبتة مسبقا �قط";
> 		$admtext['partinstmods'] = "العديلات المثبتة مسبقا سواء جزئيا أو كاملا";
> 		$admtext['showanalyzeractions'] = " أظهر العمليات �ي محلل التعديلات";
> 		$admtext['badchar'] = "رمز غير مقبول";
1886d2008
< 		$admtext['test_number'] = "رقم الاختبار";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "رقم الاختبار";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "اربط اختبار الحامض النووي هذا بشخص";
1965d2095
< $admtext['otherevents'] = "أحداث أخرى";
2050,2051d2179
< $admtext['savereturn'] = "العودة إلى هذا الص�حة";
< $admtext['saveback'] = "العودة إلى القائمة";
2058,2059d2185
< $admtext['secondary'] = "عملية ثانوية";
< $admtext['commas'] = "ال�صل بين المدخلات المتعددة بال�واصل";
2101c2227
< $admtext['nobranch'] = "لا توجد �روع";
---
> $admtext['nobranch'] = "لا يوجد �رع";
2129,2130d2254
< $admtext['secondarymaint'] = "عملية ثانوية";
< $admtext['customeventtypes'] = "أنواع مخصصة من الأحداث";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "نوع";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "الألقاب";
> $admtext['subhead'] = "عنوان �رعي";
> $admtext['image'] = "صورة";
> $admtext['author'] = "المؤل�";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "الاستهلال";
> $admtext['showlog'] = "سجل مدير النظام";
> $admtext['nobirthinfo'] = "غياب بيانات الولادة";
> //changed in 13.0
> $admtext['savereturn'] = "ح�ظ + البقاء";
> $admtext['saveback'] = "ح�ظ + خروج";
> //added in 13.0
> $admtext['allitemsdeleted'] = "تم حذ� جميع العناصر بنجاح.";
> $admtext['private'] = "خاص";
> $admtext['imgtags'] = "علامات الصورة";
> 
> $admtext['removelink'] = "حذ� رابط";
> $admtext['eloptions'] = "تص�ح أو احذ�";
> $admtext['pleaseenter'] = "�ضلا أدخل  ";
> 
> $admtext['nolinks'] = "لا توجد روابط";
> $admtext['nogeocode'] = "�شل الترميز الجغرا�ي";
> 
> //moved here in 14.0
> $admtext['choosedef'] = " اختر<br/>الصورة<br/>الا�تراضية"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "حدث أو �ئات خواص";
> $admtext['secondary'] = "أدوات ما بعد الاستيراد";
> $admtext['otherevents'] = "أحداث أخرى أو خواص";
> //added in 14.0
> $admtext['newlinks'] = "تم إنشاء الروابط";
> $admtext['newcemlinks'] = "تم إنشاء روابط المقابر";
> $admtext['utility'] = "أداة";
> $admtext['linktype'] = "�ئة";
> $admtext['move'] = "نقل";
> $admtext['copy'] = "نسخ";
> $admtext['title2'] = "عنوان"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Arabic-UTF8/alltext.php TNG1403/languages/Arabic-UTF8/alltext.php
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "وقع خطأ �ي برنامج TNG. قد يعود السبب إلى الإعدادات، أو إلى ترقية غير مكتملة، أو خطأ برمجي. لو كنت مالك الموقع �قد تود التواصل مع الدعم ال�ني لبرنامج TNG. �ضلا انسخ نص الاستعلام الوارد أدناه وقم بإضا�ته إلى رسالتك.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "رقم واسم الاختبار";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "رقم واسم الاختبار";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "ميلاد";
> $text['chrabbr'] = "تعميد";
> $text['deathabbr'] = "و�اة";  //from descend
> $text['burialabbr'] = "د�ن";  //from descend
> $text['marrabbr'] = "زواج";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "الص�حة الأولى";
> $text['lastpage'] = "الص�حة الأخيرة";
> 
> //changed in 13.0.0
> $text['problem'] = "حصل خطأ �ي برنامج ماذا ت�عل: <p> اذا ثبتت ترقية، قد تكون تخطيت جزءا من تعليمات التثبيت. ارجع لمل� اقرأني وأعد القراءة. انتبه لخطوة تركيب قاعدة البيانات</p><p>If you just installed TNG for the first time, you might still need to create the database tables. Return to the readme.html page to find that step.</p><p>If you are the site owner, you may contact TNG support for further assistance with this problem. Please copy the query below and paste it into your message.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "لا يوجد �رع";
> 
> //added in 14.0
> $text['oneyear'] = "سنة";
> $text['pwdcodelink'] = " انقر على هذا الرابط ليتم ارسال كلمة سر مؤقتة إليك";
> $text['pwdcodesent'] = " تم إرسال رابط إعادة تهيئة كلمة السر إلى بريدك الإلكتروني.";
> $text['moved'] = "تم النقل";
> $text['citation'] = "اقتباس";
> $text['other'] = "آخر";
> $text['death'] = "و�اة";
> $text['burial'] = "د�ن";
> $text['cremation'] = "حرق الجثة";
> $text['marriage'] = "زواج";
> $text['divorce'] = "طلاق";
> $text['bylength'] = "خطوات";
> $text['bymarriages'] = "زواجات";
> $text['none'] = "بدون";
> 
> //moved here in 14.0
> $text['family'] = "عائلة";
> $text['source'] = "مصدر";
> $text['repository'] = "مستودع";
> $text['place'] = "مكان";
> $admtext['BAPM'] = "تعميد";
> 
> $text['glang'] = "ar";
208,209c257
< // loading English or English-UTF8 is required to display custom text for mods that do not provide all translations
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
211c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Arabic-UTF8/cust_text.php TNG1403/languages/Arabic-UTF8/cust_text.php
5,6d4
< //Put your own custom messages here, like this:
< //$text[messagename] = "This is the message";
diff -r TNG/languages/Arabic-UTF8/text.php TNG1403/languages/Arabic-UTF8/text.php
69d68
< 		$text['general'] = "عام";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "ال�ردان هما ن�س الشخص";
---
> 		$text['sameperson'] = " ال�ردان يمثلان ن�س الشخص.";
93c93
< 		$text['sometimes'] = "(احياني التحري خلال عدد مختل� من الأجيال ينتج نتيجة مختل�ة)";
---
> 		$text['sometimes'] = "(أحيانا البحث عبر عدد مختل� من الأجيال يتيح نتائج مختل�ة.)";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "البحث عن ارتباطات";
> 		$text['findrel2'] = "البحث عن علاقات أو ارتباطات أخرى";
> 		$text['makeme2nd'] = "استخدام ترميزي الشخصي";
> 		$text['usebookmarks'] = "استخدام الإشارات المرجعية";
> 		$text['select2inds'] = "�ضلا اختر �ردين";
> 		$text['indinfofor'] = "بيانات أ�راد لـ";
> 		$text['nobookmarks'] = "لا توجد إشارة مرجعية للاستخدام";
> 		$text['bkmtitle'] = "الأشخاص الذين ع�ثر عليهم �ي الإشارات المرجعية";
> 		$text['bkminfo'] = "اختر شخصا";
> 		$text['sortpathsby'] = "صن� المسارات بناء على عدد الـ";
> 		$text['sortbyshort'] = "صن� حسب";
> 		$text['bylengthshort'] = "طول";
> 		$text['badID1'] = ":ترميزة الشخص الأول غير سليمة - �ضل أعد المحاولة لتصحيحها";
> 		$text['badID2'] = ":ترميزة الشخص الثاني غير سليمة - �ضل أعد المحاولة لتصحيحها";
> 		$text['notintree'] = ":الشخص المالك لهذا الترميزة غير موجود �ي قاعدة معلومات هذه الشجرة.";
> 		$text['sameperson'] = " ال�ردان يمثلان ن�س الشخص.";;
> 		$text['nopaths'] = " لا يوجد ارتباط بين هؤلاء الأشخاص.";
> 		$text['nopaths1'] = " لا تتبقى ارتباطات أقصر من xxx";
> 		$text['nopaths2'] = " �ي xxx خطوات بحث";
> 		$text['longestpath'] = " (أقصى طول مسار تم �حصه إلى الآن هو xxx خطوة)";
> 		$text['relevantpaths'] = " عدد المسارات المتباينة ذات العلاقة المكتش�ة: xxx";
> 		$text['skipMarr'] = " (إضا�ة إلى ذلك، إن عدد المسارات المكتش�ة غير المعروضة بسبب كثرة الزواجات هو: xxx)";
> 		$text['mjaor'] = "أو";
> 		$text['connectionsto'] = "ارتباطات إلى ";
> 		$text['findanotherpers'] = "البحث عن ...";
> 		$text['sometimes'] = "(أحيانا البحث عبر عدد مختل� من الأجيال يتيح نتائج مختل�ة.)";
> 		$text['anotherpath'] = "البحث عن ارتباطات أخرى";
> 		$text['xpath'] = "مسار  ";
> 		$text['primary'] = "الشخص الابتدائي"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "الشخص النهائي";
> 		$text['parent'] = "ولي الأمر";
> 		$text['mhfather'] = "والده";
> 		$text['mhmother'] = "والدته";
> 		$text['mhhusband'] = "زوجه";
> 		$text['mhwife'] = "زوجته";
> 		$text['mhson'] = "ابنه";
> 		$text['mhdaughter'] = "ابنتها";
> 		$text['fhfather'] = "أباها";
> 		$text['fhmother'] = "أمها";
> 		$text['fhhusband'] = "والدها";
> 		$text['fhwife'] = "زوجتها";
> 		$text['fhson'] = "ابنها";
> 		$text['fhdaughter'] = "ابنتها";
> 		$text['hfather'] = "أباها";
> 		$text['hmother'] = "أمها";
> 		$text['hhusband'] = "أباها";
> 		$text['hwife'] = "زوجة";
> 		$text['hson'] = "ابن";
> 		$text['hdaughter'] = "ابنة";
> 		$text['maxruns'] = "الحد الأقصى لعدد المسارات التي يتم �حصها";
> 		$text['maxrshort'] = "الحد الأقصى للمسارات";
> 		$text['maxlength'] = "مسارات ارتباطات لا يتعدى طولها";
> 		$text['maxlshort'] = "أقصى طول";
> 		$text['xstep'] = "خطوة";
> 		$text['xsteps'] = "خطوات";
> 		$text['xmarriages'] = " عدد xxx زواجات";
> 		$text['xmarriage'] = "زواج واحد";
> 		$text['showspouses'] = "أظهر الزوجين";
> 		$text['showTxt'] = " أظهر نص وص� المسار";
> 		$text['showTxtshort'] = "النص الوص�ي";
> 		$text['compactBox'] = "أظهر صناديق الأشخاص مضغوطة";
> 		$text['compactBoxshort'] = "اضغط الصناديق";
> 		$text['paths'] = "المسارات";
> 		$text['dospouses2'] = "أظهر الأزواج";
> 		$text['maxmopt'] = "أقصى عدد من الزواجات لكل رابط"; 
> 		$text['maxm'] = "أقصى عدد من الزواجات";
> 		$text['arerelated'] = "هؤلاء الأشخاص تربطهم علاقة أسرية - وعلاقتهم مبينة �ي المسار 1";
> 		$text['simplerel'] = "بحث علاقات بسيط";
196d264
< 		$text['scrollnote'] = "ملاحظات: قد تحتاج إلى السرد إلى الأس�ل أو اليمين لرؤية الرسم البياني";
199d266
< 		$text['popupnote2'] = "جدول أنساب جديد";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "الجداول";
> 		$text['dtchildren'] = "الأط�ال";
> 		$text['dtgrandchildren'] = "الأح�اد";
> 		$text['dtggrandchildren'] = "أبناء الأح�اد";
> 		$text['dtgggrandchildren'] = "أبناء الأح�اد"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "بدون سلالة";
> 		$text['dtgen'] = "جيل";
> 		$text['dttotal'] = "اجمالي";
> 		$text['dtselect'] = "الختيار";
> 		$text['dteachfulltable'] = "كل جدول كامل سيحوي";
> 		$text['dtrows'] = "ص�و�";
> 		$text['dtdisplayingtable'] = "اظهار الجدول";
> 		$text['dtgototable'] = "اذهب إلى الجدول:";
> 		$text['fcinstrdn'] = "أظهر العائلة مع الزوج";
> 		$text['fcinstrup'] = "أظهر العائلة مع الوالدين";
> 		$text['fcinstrplus'] = "اختر أزواج آخرين";
> 		$text['fcinstrfam'] = "اختر والدين آخرين";
381,383c467
< 		$text['firstpage'] = "الص�حة الأولى";
< 		$text['lastpage'] = "الص�حة الأخيرة";
< 		$text['photoowner'] = "مالك أو مصدر";
---
> 		$text['photoowner'] = "مالك الأصل";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "بدل العلامات";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "كرر كلمة السر الجديدة";
> 		$text['resetsuccess'] = "نجاح: تمت إعادة تعيين كلمة السر";
> 		$text['resetfail'] = "�شل: لم تتم إعادة تعيين كلمة السر";
> 		$text['failreason0'] = " (خطأ غير محدد �ي قاعدة المعلومات)";
> 		$text['failreason2'] = " (لا تمتلك الصلاحية المناسبة لتغيير كلمة السر الخاصة بك) ";
> 		$text['failreason3'] = " ( لم تتطابق كلمتا السر) ";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = " اجمالي مصادر القتباسات";
618d710
< 		$text['loginfirst'] = "عليك تسجيل الدخول أولا.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "تم الكش� عن سجل المستخدم الحالي. سجل الدخول لكي للإتمام يجب تسجيل الدخول او إزالة كل السجلات  من جدول المستخدمين";
629,630d722
< 		$text['zoomin'] = "التكبير";
< 		$text['zoomout'] = "التصغير";
656d747
< 		$text['dna_info_head'] = "معلومات حامض نووي";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "ميلاد";
< $text['chrabbr'] = "تعميد";
675d788
< $text['family'] = "عائلة"; //from getperson
685d797
< $text['deathabbr'] = "و�اة";  //from descend
706d817
< $text['burialabbr'] = "د�ن";  //from descend
712d822
< $text['place'] = "مكان";
715d824
< $text['marrabbr'] = "زواج";
738d846
< $text['source'] = "مصدر";
766d873
< $text['repository'] = "مستودع";
770d876
< $text['findplaces'] = "البحث عن كا�ة الأ�راد ذوي أحداث �ي هذه المنطقة";
804d909
< $text['glang'] = "&amp;hl=en";
816d920
< $text['none'] = "بدون";
924d1027
< $text['otherevents'] = "أحداث أخرى";
952,953d1054
< $text['people_have'] = "أ�رادا قدر ربطوا اختبار حامض نووي بـ";
< $text['person_has'] = "�ردا قد ربط اختبار حامض نووي بـ";
956c1057
< $text['cookieuse'] = "ملاحظة: هذا الموقع يستخدم مل�ات تعري� الارتباط (الكوكيز)"; 
---
> $text['cookieuse'] = "ملاحظة: هذا الموقع يستخدم مل�ات تعري� الارتباط (الكوكيز)";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "روابط سريعة";
> $text['yourname'] = "اسمك";
> $text['youremail'] = "عنوان بريدك الإلكتروني";
> $text['liketoadd'] = "أي معلومات تريد إضا�تها";
> $text['webmastermsg'] = "رسالة مشر�ي المواقع";
> $text['gallery'] = "انظر معرض";
> $text['wasborn_male'] = "was born";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "was born"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "died";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "died";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "was buried"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "was buried"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "was cremated";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "was cremated";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "married";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "married";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "was divorced";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "was divorced";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " on ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "and ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "معلومات حامض نووي";
> //added in 13.0
> $text['visitor'] = "زائر";
> 
> $text['popupnote2'] = "جدول أنساب جديد";
> 
> //moved here in 14.0
> $text['zoomin'] = "التكبير";
> $text['zoomout'] = "التصغير";
> $text['scrollnote'] = "اسحب او مرر لترى اكثر من الخريطة";
> $text['general'] = "عام";
> 
> //changed in 14.0
> $text['otherevents'] = "أحداث وخواص أخرى";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "ارتباطات";
> $text['continue'] = "استمرار";
> $text['title2'] = "عنوان"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Chinese-UTF8/admintext.php TNG1403/languages/Chinese-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "请进入";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "选择导入的文件";
> 		$admtext['addreplacedata'] = "添加或替�家谱数�，�候几分钟，";
> 		$admtext['fromyourcomputer'] = "从你的电脑";
> 		$admtext['importdata'] = "导入数�";
> 		$admtext['replace'] = "替�";
> 		$admtext['desttree'] = "目标谱树";
> 		$admtext['selectdesttree'] = "请选择或输入目标谱树";
> 		$admtext['selectexisting'] = "导入";
> 		$admtext['ucaselast'] = "所有姓�";
> 		$admtext['norecalc'] = "�计算带活�标签";
> 		$admtext['autooffset'] = "有效的开始ID �";
> 		$admtext['mustselecttree'] = "选择此选项�必须选择树表";
> 		$admtext['onwebserver'] = "从网站的GEDCOM 文件夹";
> 		$admtext['imphints'] = "�示: 所有当�数��味�所有的人�家庭�资�和备注 (�� IDs ����), 媒体关�就�会丢失。匹�总是基于 ID。总是添加新记录。追加导入所有具有新 ID 的记录。";
> 		$admtext['destbranch'] = "目的地支谱 (�选)";
> 		$admtext['importlatlong'] = "如果存在, 导入纬度/�度数�";
> 		$admtext['opening'] = "开头";
> 		$admtext['reopen'] = "�新开始";
> 		$admtext['uploading'] = "上传";
> 		$admtext['stop'] = "�止";
> 		$admtext['stopped'] = "导入 �止";
> 		$admtext['resume'] = "简历";
> 		$admtext['neweronly'] = "如果是新的就替�";
> 		$admtext['oldimport'] = "旧样�导入 (没有进度�)";
> 		$admtext['importgedcom'] = "导入GEDCOM(V5.5)";
> 		$admtext['stopbackup'] = "Stop! It might be a good idea to back up your current data before proceeding.";
> 		$admtext['importmedia'] = "导入媒体";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "确�此文件的�缀和�缀（常规设置）正确。";
> 		$admtext['chkimpsettings'] = "检查导入设置以获得更多选项。";
> 		$admtext['eventsonly'] = "仅导入自定义事件类型和属性（�添加�替�或附加数�）";
> 		$admtext['allevents'] = "接�所有新事件类型和属性的数�";
> 		$admtext['finishingimporting'] = "完�...";
> 		$admtext['fileuploadfailed'] = "文件上传失败。�能�味�文件太大。�试使用 FTP 将文件上传到您的 GEDCOM 文件夹，然�从那里选择并导入。";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "编辑现有事件类型";
135,138d168
< 		$admtext['entertypedesc'] = "请输入这个新事件类型的类型/�述.";
< 		$admtext['enterdisplay'] = "请输入此新事件类型的显示字符串.";
< 		$admtext['existingeventtypeinfo'] = "现有事件类型信�";
< 		$admtext['neweventtypeinfo'] = "新事件类型信�";
145,146d174
< 		$admtext['addnewevtype'] = "添加新事件类型";
< 		$admtext['createnewevtype'] = "创建新的事件类型记录";
149,150d176
< 		$admtext['existingevtypes'] = "现有事件类型";
< 		$admtext['edsevtypes'] = "编辑，删除或排�以�输入的事件类型";
152d177
< 		$admtext['confdeleteevtype'] = "你确定删除这个事件类型？";
154d178
< 		$admtext['selectentertag'] = "请选择或输入事件标签";
208d231
< 		$admtext['changestoallevtypes'] = "更改所有事件类型";
214d236
< 		$admtext['BAPM'] = "洗礼";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "你确定删除这个事件类型？";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "添加新类型";
> 		$admtext['createnewevtype'] = "创建一个新的事件或属性类型记录";
> 		$admtext['modifyeventtype'] = "编辑现有类型";
> 		$admtext['entertypedesc'] = "请输入此新属性或事件类型的类型/�述。";
> 		$admtext['enterdisplay'] = "请输入此新属性或事件类型的显示字符串。";
> 		$admtext['existingeventtypeinfo'] = "现有属性或事件类型信�";
> 		$admtext['neweventtypeinfo'] = "新属性或事件类型信�";
> 		$admtext['existingevtypes'] = "现有属性或事件类型";
> 		$admtext['edsevtypes'] = "编辑�删除或排�之�输入的属性和事件类型";
> 		$admtext['selectentertag'] = "请选择或输入此属性或事件类型的标签。";
> 		$admtext['changestoallevtypes'] = "更改所有属性或事件类型";
232c268
< 		$admtext['marrdate'] = "婚期\";  //Marr Date"; //marriage date
---
> 		$admtext['marrdate'] = "婚期"; //marriage date
268d303
< 		$admtext['nobirthinfo'] = "没有出生信�";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "选择缺�照片\";  //Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Save + New Parents";
> 		$admtext['savenewspouse'] = "Save + New Spouse";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "切� 生日";
354d391
< 		$admtext['enterphotodesc'] = "请输入图�的�述";
388d424
< 		$admtext['photoowner'] = "资�/所有者";
417d452
< 		$admtext['imgmap'] = "图片地图";
462c497
< 		$admtext['fileext'] = "文件.ext\";  //File ext."; //file extension (abbreviation)
---
> 		$admtext['fileext'] = "文件.ext"; //file extension (abbreviation)
490d524
< 		$admtext['mapinstr3'] = "�将此照片的区域链接到个人, 首先选择个人的树, 然�为所需区域创建一个矩形。这是通过在区域的左上角�击, 然�拖动到�下角�完�的。或者, 您�以�击左上角, 然��在�下角。弹出框将帮助您选择个人。在进行选择�, 图�映射的代�将被添加到下�的框中。根�需�对其他区域��此过程";
495d528
< 		$admtext['removelink'] = "删除链接";
502d534
< 		$admtext['eloptions'] = "�览或删除";
509d540
< 		$admtext['nolinks'] = "�存在链接";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "图片地图";
> 		$admtext['photoowner'] = "资�/所有者";
> 		$admtext['nothumb'] = "No thumbnail";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "无法添加该项目，很�能是因为文件太大，无法上传或用于制作缩略图。";
> 		$admtext['moved'] = "已移动";
> 		$admtext['url'] = "网�";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "请输入此媒体的标题或�述。";
> 		$admtext['mapinstr3'] = "�将这张照片的一个区域链接到一个人�家庭或其他实体，首先选择相关的树和实体类型，然�为所需区域创建一个矩形。这�以通过�击区域的左上角，然�拖动到�下角。或者，您�以�击左上角，然��次�击�下角。然�弹出框将帮助您选择人员或其他实体。使您的选择，然�根�需�对其他区域��此过程。�击现有区域进行选择，然�拖动以移动或�击“X�删除。";
596d633
< 		$admtext['foremptystring'] = "为空字符串, �留此字段为空, 然��击添加>>";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "说明：将左边的项目拖拽或�击到�边的列表中。上下拖拽�新排�。�次�击删除。";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "对于空字符串，将此字段留空并�击 >>";
651,655d690
< 		$admtext['selectimportfile'] = "选择导入的文件";
< 		$admtext['importgedcom'] = "导入GEDCOM(V5.5)";
< 		$admtext['addreplacedata'] = "添加或替�家谱数�，�候几分钟，";
< 		$admtext['fromyourcomputer'] = "从你的电脑";
< 		$admtext['importdata'] = "导入数�";
657,660d691
< 		$admtext['replace'] = "替�";
< 		$admtext['desttree'] = "目标谱树";
< 		$admtext['selectdesttree'] = "请选择或输入目标谱树";
< 		$admtext['selectexisting'] = "导入";
668,673d698
< 		$admtext['ucaselast'] = "所有姓�";
< 		$admtext['norecalc'] = "�计算带活�标签";
< 		$admtext['autooffset'] = "有效的开始ID �";
< 
< 		$admtext['mustselecttree'] = "选择此选项�必须选择树表";
< 		$admtext['importmedia'] = "导入媒体";
675d699
< 		$admtext['neweronly'] = "如果是新的就替�";
677,692d700
< 		$admtext['onwebserver'] = "从网站的GEDCOM 文件夹";
< 		$admtext['eventsonly'] = "仅导入自选项目 (�添加�替�或追加数�)";
< 		$admtext['imphints'] = "�示: 所有当�数��味�所有的人�家庭�资�和备注 (�� IDs ����), 媒体关�就�会丢失。匹�总是基于 ID。总是添加新记录。追加导入所有具有新 ID 的记录。";
< 		$admtext['allevents'] = "接�所有新的自选项目的数�";
< 		$admtext['destbranch'] = "目的地支谱 (�选)";
< 		$admtext['inframe'] = "(预览)";
< 		$admtext['getstart'] = "入门";
< 		$admtext['importlatlong'] = "如果存在, 导入纬度/�度数�";
< 		$admtext['opening'] = "开头";
< 		$admtext['reopen'] = "�新开始";
< 		$admtext['uploading'] = "上传";
< 		$admtext['stop'] = "�止";
< 		$admtext['stopped'] = "导入 �止";
< 		$admtext['resume'] = "简历";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "管�日志";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "旧样�导入 (没有进度�)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "�级";
> 		$admtext['need_upgrade'] = "完�这些�级说明";
> 		$admtext['upgrade_missing'] = "�级文件似乎丢失了， 其实你�能已�完�了.";
> 		$admtext['delete_upgrade'] = "完��，�击此处删除�级并返回��。";
723d733
< 		$admtext['author'] = "作者";
780,782c790,792
< 		$admtext['mainimage'] = "主页\";  //Main image (home page)"; //1, 2, 3, 4, 5, 7
< 		$admtext['titleimage'] = "主题照片\";  //Title image (home page)"; //1, 2, 3
< 		$admtext['headline'] = "时间轴\";  //Headline"; //4, 7
---
> 		$admtext['mainimage'] = "主页"; //1, 2, 3, 4, 5, 7
> 		$admtext['titleimage'] = "主题照片"; //1, 2, 3
> 		$admtext['headline'] = "时间轴"; //4, 7
784,830c794,840
< 		$admtext['headimgplustitle'] = "眉头照片\";  //Header image (including title)"; //1
< 		$admtext['pedperson'] = "家谱个人ID\";  //Pedigree person ID"; //2
< 		$admtext['pedtree'] = "家谱树ID\";  //Pedigree tree ID"; //2
< 		$admtext['phhistperson'] = "照片和历�人物ID\";  //Photos &amp; Histories person ID"; //2
< 		$admtext['phhisttree'] = "照片和历�树ID\";  //Photos &amp; Histories tree ID"; //2
< 		$admtext['headimg'] = "眉头照片\";  //Header image"; //2, 3, 4, 5, 6, 8
< 		$admtext['headtitleimg'] = "眉头主题照片\";  //Header title image"; //2, 3
< 		$admtext['titleimg'] = "照片标题\";  //Title image (all pages)"; //4, 7
< 		$admtext['searchpara'] = "�索段�\";  //Search paragraph"; //6
< 		$admtext['fhpara'] = "家庭历�段�\";  //Family Histories paragraph"; //6
< 		$admtext['fhlinkshis'] = "家庭历�链接\";  //Family Histories links (His)"; //6
< 		$admtext['fhlinkshers'] = "家庭历�段�\";  //Family Histories links (Hers)"; //6
< 		$admtext['mwpara'] = "期寻踪段�\";  //Most Wanted paragraph"; //6
< 		$admtext['respara'] = "资�段�\";  //Resources paragraph"; //6
< 		$admtext['reslinks'] = "资�链接\";  //Resources links"; //6
< 		$admtext['headtitle1'] = "标题 第1部分\";  //Header title, part 1"; //8
< 		$admtext['headtitle2'] = "标题 第2部分\";  //Header title, part 2"; //8
< 		$admtext['headtitle3'] = "标题 第3部分\";  //Header title, part 3"; //8
< 		$admtext['headsubtitle'] = "页眉副标题\";  //Header subtitle"; //8
< 		$admtext['latestnews'] = "最新新闻\";  //Latest news"; //8
< 		$admtext['momside'] = "�亲方标签\";  //Mom's Side label"; //8
< 		$admtext['dadside'] = "父亲方标签\";  //Dad's Side label"; //8
< 		$admtext['momperson'] = "�方个人ID\";  //Mom's Side person ID"; //8
< 		$admtext['momtree'] = "�方树ID\";  //Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "父方个人ID\";  //Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "父方树ID\";  //Dad's Side tree ID"; //8
< 		$admtext['featurethumb1'] = "专题1 缩略图\";  //Feature 1 thumbnail"; //4
< 		$admtext['featurelink1'] = "专题1 链接\";  //Feature 1 link"; //4
< 		$admtext['featuretitle1'] = "专题1 标题\";  //Feature 1 title"; //4
< 		$admtext['featurepara1'] = "专题1 段�\";  //Feature 1 paragraph"; //4
< 		$admtext['featurethumb2'] = "专题2 缩略图\";  //Feature 2 thumbnail"; //4
< 		$admtext['featurelink2'] = "专题2 链接\";  //Feature 2 link"; //4
< 		$admtext['featuretitle2'] = "专题2 标题\";  //Feature 2 title"; //4
< 		$admtext['featurepara2'] = "专题2 段�\";  //Feature 2 paragraph"; //4
< 		$admtext['featurethumb3'] = "专题3 缩略图\";  //Feature 3 thumbnail"; //4
< 		$admtext['featurelink3'] = "专题3 链接\";  //Feature 3 link"; //4
< 		$admtext['featuretitle3'] = "专题3 标题\";  //Feature 3 title"; //4
< 		$admtext['featurepara3'] = "专题3 段�\";  //Feature 3 paragraph"; //4
< 		$admtext['featurethumb4'] = "专题4 缩略图\";  //Feature 4 thumbnail"; //4
< 		$admtext['featurelink4'] = "专题4 链接\";  //Feature 4 link"; //4
< 		$admtext['featuretitle4'] = "专题4 标题\";  //Feature 4 title"; //4
< 		$admtext['featurepara4'] = "专题4 段�\";  //Feature 4 paragraph"; //4
< 		$admtext['photocaption'] = "主�照片主题\";  //Main image caption"; //4
< 		$admtext['maintitle'] = "主标题\";  //Main title"; //5
< 		$admtext['hisside'] = "他方标签\";  //His Side label"; //5
< 		$admtext['herside'] = "她方标签\";  //Her Side label"; //5
< 		$admtext['newstext'] = "新闻文本\";  //News text"; //5
---
> 		$admtext['headimgplustitle'] = "眉头照片"; //1
> 		$admtext['pedperson'] = "家谱个人ID"; //2
> 		$admtext['pedtree'] = "家谱树ID"; //2
> 		$admtext['phhistperson'] = "照片和历�人物ID"; //2
> 		$admtext['phhisttree'] = "照片和历�树ID"; //2
> 		$admtext['headimg'] = "眉头照片"; //2, 3, 4, 5, 6, 8
> 		$admtext['headtitleimg'] = "眉头主题照片"; //2, 3
> 		$admtext['titleimg'] = "照片标题"; //4, 7
> 		$admtext['searchpara'] = "�索段�"; //6
> 		$admtext['fhpara'] = "家庭历�段�"; //6
> 		$admtext['fhlinkshis'] = "家庭历�链接"; //6
> 		$admtext['fhlinkshers'] = "家庭历�段�"; //6
> 		$admtext['mwpara'] = "期寻踪段�"; //6
> 		$admtext['respara'] = "资�段�"; //6
> 		$admtext['reslinks'] = "资�链接"; //6
> 		$admtext['headtitle1'] = "标题 第1部分"; //8
> 		$admtext['headtitle2'] = "标题 第2部分"; //8
> 		$admtext['headtitle3'] = "标题 第3部分"; //8
> 		$admtext['headsubtitle'] = "页眉副标题"; //8
> 		$admtext['latestnews'] = "最新新闻"; //8
> 		$admtext['momside'] = "�亲方标签"; //8, 20
> 		$admtext['dadside'] = "父亲方标签"; //8, 20
> 		$admtext['momperson'] = "�方个人ID"; //8, 20
> 		$admtext['momtree'] = "�方树ID"; //8, 20
> 		$admtext['dadperson'] = "父方个人ID"; //8, 20
> 		$admtext['dadtree'] = "父方树ID"; //8, 20
> 		$admtext['featurethumb1'] = "专题1 缩略图"; //4
> 		$admtext['featurelink1'] = "专题1 链接"; //4
> 		$admtext['featuretitle1'] = "专题1 标题"; //4
> 		$admtext['featurepara1'] = "专题1 段�"; //4
> 		$admtext['featurethumb2'] = "专题2 缩略图"; //4
> 		$admtext['featurelink2'] = "专题2 链接"; //4
> 		$admtext['featuretitle2'] = "专题2 标题"; //4
> 		$admtext['featurepara2'] = "专题2 段�"; //4
> 		$admtext['featurethumb3'] = "专题3 缩略图"; //4
> 		$admtext['featurelink3'] = "专题3 链接"; //4
> 		$admtext['featuretitle3'] = "专题3 标题"; //4
> 		$admtext['featurepara3'] = "专题3 段�"; //4
> 		$admtext['featurethumb4'] = "专题4 缩略图"; //4
> 		$admtext['featurelink4'] = "专题4 链接"; //4
> 		$admtext['featuretitle4'] = "专题4 标题"; //4
> 		$admtext['featurepara4'] = "专题4 段�"; //4
> 		$admtext['photocaption'] = "主�照片主题"; //4
> 		$admtext['maintitle'] = "主标题"; //5
> 		$admtext['hisside'] = "他方标签"; //5
> 		$admtext['herside'] = "她方标签"; //5
> 		$admtext['newstext'] = "新闻文本"; //5
835,838c845,848
< 		$admtext['createcopy'] = "�制创建\";  //Create copy in";  //as in, "create copy in Dutch"
< 		$admtext['featurelinks'] = "专题链接\";  //Feature links"; //9, 10
< 		$admtext['featurepara'] = "专题段�\";  //Features paragraph"; //9, 10
< 		$admtext['welcome'] = "欢迎时光轴\";  //Welcome headline"; //9, 10
---
> 		$admtext['createcopy'] = "�制创建";  //as in, "create copy in Dutch"
> 		$admtext['featurelinks'] = "专题链接"; //9, 10
> 		$admtext['featurepara'] = "专题段�"; //9, 10
> 		$admtext['welcome'] = "欢迎时光轴"; //9, 10
840,841c850,851
< 		$admtext['momsidenames'] = "�方�字\";  //Mom's Side names"; //8
< 		$admtext['dadsidenames'] = "父方�字\";  //Dad's Side names"; //8
---
> 		$admtext['momsidenames'] = "�方�字"; //8
> 		$admtext['dadsidenames'] = "父方�字"; //8
853,854c863,864
< 		$admtext['headimg2'] = "眉头照片2\";  //Header image 2"; //14
< 		$admtext['headimg3'] = "眉头照片3\";  //Header image 3"; //14
---
> 		$admtext['headimg2'] = "眉头照片2"; //14
> 		$admtext['headimg3'] = "眉头照片3"; //14
860,887c870,980
< 		$admtext['featurethumb5'] = "专题5 缩略图\";  //Feature 5 thumbnail"; //15
< 		$admtext['featurelink5'] = "专题5 链接\";  //Feature 5 link"; //15
< 		$admtext['featuretitle5'] = "专题5 标题\";  //Feature 5 title"; //15
< 		$admtext['featurepara5'] = "专题5 段�\";  //Feature 5 paragraph"; //15
< 		$admtext['featurethumb6'] = "专题6 缩略图\";  //Feature 6 thumbnail"; //15
< 		$admtext['featurelink6'] = "专题6 链接\";  //Feature 6 link"; //15
< 		$admtext['featuretitle6'] = "专题6 标题\";  //Feature 6 title"; //15
< 		$admtext['featurepara6'] = "专题6 段�\";  //Feature 6 paragraph"; //15
< 		$admtext['featurethumb7'] = "专题7 缩略图\";  //Feature 7 thumbnail"; //15
< 		$admtext['featurelink7'] = "专题7 链接\";  //Feature 7 link"; //15
< 		$admtext['featurepara7'] = "专题7 段�\";  //Feature 7 paragraph"; //15
< 		$admtext['featurethumb8'] = "专题8 缩略图\";  //Feature 8 thumbnail"; //15
< 		$admtext['featurelink8'] = "专题8 链接\";  //Feature 8 link"; //15
< 		$admtext['featurepara8'] = "专题8 段�\";  //Feature 8 paragraph"; //15
< 		$admtext['sidebarhead1'] = "侧边�1 ;  //Sidebar header 1"; //15
< 		$admtext['sidebarhead2'] = "侧边�2 ;  //Sidebar header 2"; //15
< 		$admtext['sidebarhead3'] = "侧边�3 ;  //Sidebar header 3"; //15
< 		$admtext['texttitle1'] = "文本1标题\";  // Text 1 title"; //15
< 		$admtext['textlink1'] = "文本1链接\";  // Text 1 link"; //15
< 		$admtext['textpara1'] = "文本1段�\";  // Text 1 paragraph"; //15
< 		$admtext['texttitle2'] = "文本2标题\";  // Text 2 title"; //15
< 		$admtext['textlink2'] = "文本2链接\";  // Text 2 link"; //15
< 		$admtext['textpara2'] = "文本2段�\";  // Text 2 paragraph"; //15
< 		$admtext['texttitle3'] = "文本3标题\";  // Text 3 title"; //15
< 		$admtext['textpara3'] = "文本3段�\";  // Text 3 paragraph"; //15
< 		$admtext['subhead1'] = "�标题1\";  //Subhead 1"; //15
< 		$admtext['subhead2'] = "�标题2\";  //Subhead 2"; //15
< 
---
> 		$admtext['featurethumb5'] = "专题5 缩略图"; //15
> 		$admtext['featurelink5'] = "专题5 链接"; //15
> 		$admtext['featuretitle5'] = "专题5 标题"; //15
> 		$admtext['featurepara5'] = "专题5 段�"; //15
> 		$admtext['featurethumb6'] = "专题6 缩略图"; //15
> 		$admtext['featurelink6'] = "专题6 链接"; //15
> 		$admtext['featuretitle6'] = "专题6 标题"; //15
> 		$admtext['featurepara6'] = "专题6 段�"; //15
> 		$admtext['featurethumb7'] = "专题7 缩略图"; //15
> 		$admtext['featurelink7'] = "专题7 链接"; //15
> 		$admtext['featurepara7'] = "专题7 段�"; //15
> 		$admtext['featurethumb8'] = "专题8 缩略图"; //15
> 		$admtext['featurelink8'] = "专题8 链接"; //15
> 		$admtext['featurepara8'] = "专题8 段�"; //15
> 		$admtext['sidebarhead1'] = "侧边�1"; //15
> 		$admtext['sidebarhead2'] = "侧边�2"; //15
> 		$admtext['sidebarhead3'] = "侧边�3"; //15
> 		$admtext['texttitle1'] = "文本1标题"; //15
> 		$admtext['textlink1'] = "文本1链接"; //15
> 		$admtext['textpara1'] = "文本1段�"; //15
> 		$admtext['texttitle2'] = "文本2标题"; //15
> 		$admtext['textlink2'] = "文本2链接"; //15
> 		$admtext['textpara2'] = "文本2段�"; //15
> 		$admtext['texttitle3'] = "文本3标题"; //15
> 		$admtext['textpara3'] = "文本3段�"; //15
> 		$admtext['subhead1'] = "�标题1"; //15
> 		$admtext['subhead2'] = "�标题2"; //15
> 		//added in 12.2
> 		$admtext['quotehead'] = "引用标题";
> 		$admtext['quotesubhead'] = "引用�标题";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "特��称";
> 		$admtext['snipinfoone'] = "Featurette第一行";
> 		$admtext['snipinfotwo'] = "Featurette第二行";
> 		$admtext['snipimage'] = "特�图�";
> 		$admtext['snipperson'] = "Featurette人ID";
> 		$admtext['sniptree'] = "Featuretteæ ‘ID";
> 		$admtext['quote'] = "引用";
> 		$admtext['link'] = "链接";
> 		$admtext['featuretitle7'] = "专题7 标题";
> 		$admtext['featuretitle8'] = "专题8 标题";
> 		$admtext['featuretitle9'] = "专题9 标题";
> 		$admtext['featurethumb9'] = "专题9 缩略图"; //15
> 		$admtext['featurelink9'] = "专题9 链接"; //15
> 		$admtext['featurepara9'] = "专题9 段�"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Header Left Image";
> 		$admtext['rightimg'] = "Header Right Image";
> 		$admtext['photoption'] = "Photo options are<br />&nbsp;&nbsp;(static or random)";
> 		$admtext['randomphotowidth'] = "Random Photo Width";
> 		$admtext['randomphotoheight'] = "Random Photo Height";
> 		$admtext['randomphotomediatypeID'] = "Random Photo Collection";
> 		$admtext['momheading'] = "Maternal Family Heading";
> 		$admtext['mompara'] = "Maternal Family Paragraph";
> 		$admtext['mompagelink'] = "Maternal Family Page Link";
> 		$admtext['dadheading'] = "Paternal Family Heading";
> 		$admtext['dadpara'] = "Paternal Family Paragraph";
> 		$admtext['dadpagelink'] = "Paternal Family Page Link";
> 		$admtext['spmomheading'] = "Spouse Maternal Family Heading";
> 		$admtext['spmompara'] = "Spouse Maternal Family Paragraph";
> 		$admtext['spmompagelink'] = "Spouse Maternal Family Page Link";
> 		$admtext['spmomside'] = "Spouse Maternal Side label";
> 		$admtext['spdadside'] = "Spouse Paternal Side label";
> 		$admtext['spmomperson'] = "Spouse Maternal Side personID";
> 		$admtext['spmomtree'] = "Spouse Maternal Side treeID";
> 		$admtext['spdadheading'] = "Spouse Paternal Family Heading";
> 		$admtext['spdadpara'] = "Spouse Paternal Family Paragrph";
> 		$admtext['spdadpagelink'] = "Spouse Paternal Family Page Link";
> 		$admtext['spdadperson'] = "Spouse Paternal Side personID";
> 		$admtext['spdadtree'] = "Spouse Paternal Side treeID";
> 		$admtext['storiesheading'] = "Our Family Stories";
> 		$admtext['nbrsurnames'] = "Number of Surnames<br />&nbsp;&nbsp; in Surname Cloud";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "专题 缩略图";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1333,1357c1418,1442
< 		$admtext['sitekey'] = "reCAPTCHA 验�ID";  //reCAPTCHA Site Key
< 		$admtext['secret'] = "reCAPTCHA密�";  //reCAPTCHA Secret
< 		$admtext['mediadel'] = "删除实际文件";  //Remove physical file on delete
< 		$admtext['onrequest'] = "请求中";  //On request
< 		$admtext['mediathumbs'] = "在行中显示图片";  //Show photos on one row
< 		$admtext['footermsg'] = "定制页脚信�";  //Custom footer message
< 		$admtext['templatestable'] = "模�设置";  //Template Settings
< 		$admtext['mediatrees'] = "在文件夹中分开媒体";  //Separate media in tree folders
< 		$admtext['mediaexpl'] = "xxx媒体文件已移动";  //xxx media files moved
< 		$admtext['dnatestscomparecolors'] = "DNA测试列标题颜色";  //Y-DNA Compare Tests Column Heading Colors
< 		$admtext['getcolorcodes'] = "选择颜色代�处";  //Get Color Codes Here
< 		$admtext['mainbackground'] = "主标题背景颜色";  //Main heading background color
< 		$admtext['modebackground'] = "模�值底色";  //Mode values background color
< 		$admtext['fastmutbackground'] = "快速�异底色";  //Fast mutating background color
< 		$admtext['background1_12'] = "标记1-12底色";  //Markers 1-12 background color
< 		$admtext['background13_25'] = "标记13-25底色";  //Markers 13-25 background color
< 		$admtext['background26_37'] = "标记26-37底色";  //Markers 26-37 background color
< 		$admtext['background38_67'] = "标记38-67底色";  //Markers 38-67 background color
< 		$admtext['background111'] = "标记68-111底色";  //Markers 68-111 background color
< 		$admtext['textcolor'] = "文本颜色";  //Text color
< 		$admtext['show_test_number'] = "显示DNA测试��";  //Show DNA Test Number Publicly
< 		$admtext['excludefromancsn'] = "从祖先的姓�排除";  //Exclude From Ancestral Surnames
< 		$admtext['upperancsunames'] = "大写祖先的姓�";  //Uppercase Ancestral Surnames
< 		$admtext['autofillancsunames'] = "自动填写祖先姓�";  //Autofill Ancestral Surnames
< 		$admtext['colorschemer'] = "在线颜色方案生�器";  //ColorSchemer - Online Color Scheme Generator
---
> 		$admtext['sitekey'] = "reCAPTCHA 验�ID";
> 		$admtext['secret'] = "reCAPTCHA密�";
> 		$admtext['mediadel'] = "删除实际文件";
> 		$admtext['onrequest'] = "请求中";
> 		$admtext['mediathumbs'] = "在行中显示图片";
> 		$admtext['footermsg'] = "定制页脚信�";
> 		$admtext['templatestable'] = "模�设置";
> 		$admtext['mediatrees'] = "在文件夹中分开媒体";
> 		$admtext['mediaexpl'] = "xxx媒体文件已移动";
> 		$admtext['dnatestscomparecolors'] = "DNA测试列标题颜色";
> 		$admtext['getcolorcodes'] = "选择颜色代�处";
> 		$admtext['mainbackground'] = "主标题背景颜色";
> 		$admtext['modebackground'] = "模�值底色";
> 		$admtext['fastmutbackground'] = "快速�异底色";
> 		$admtext['background1_12'] = "标记1-12底色";
> 		$admtext['background13_25'] = "标记13-25底色";
> 		$admtext['background26_37'] = "标记26-37底色";
> 		$admtext['background38_67'] = "标记38-67底色";
> 		$admtext['background111'] = "标记68-111底色";
> 		$admtext['textcolor'] = "文本颜色";
> 		$admtext['show_test_number'] = "显示DNA测试��";
> 		$admtext['excludefromancsn'] = "从祖先的姓�排除";
> 		$admtext['upperancsunames'] = "大写祖先的姓�";
> 		$admtext['autofillancsunames'] = "自动填写祖先姓�";
> 		$admtext['colorschemer'] = "在线颜色方案生�器";
1359,1361c1444,1446
< 		$admtext['cookieapproval'] = "显示cookie许�信�";  //Show cookie approval message
< 		$admtext['dataprotectmsg'] = "显示��链接";  //Show link to data protection policy
< 		$admtext['nointernet'] = "TNG离线中";  //I am using TNG offline
---
> 		$admtext['cookieapproval'] = "显示cookie许�信�";
> 		$admtext['dataprotectmsg'] = "显示��链接";
> 		$admtext['nointernet'] = "TNG离线中";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Change incoming prefixes to match TNG settings";
> 		$admtext['sortevents'] = "Sort events by";
> 		$admtext['sortbydate'] = "Event date";
> 		$admtext['sortbytype'] = "Event type";
> 		$admtext['allowsuggest'] = "Allow suggestions from visitors";
> 		$admtext['livingchecked'] = "Living flag set for new people and families";
> 		$admtext['maxmarried'] = "Mark family living if married less than<br/>this many years";
> 		$admtext['imagetags'] = "Rectangles";
> 		$admtext['allowcsv'] = "Allow CSV downloads for reports";
> 		//added in 14.0
> 		$admtext['onbackup'] = "备份选项";
> 		$admtext['dosql'] = "导出为 SQL";
> 		$admtext['dodrop'] = "如果存在则包括 DROP TABLE";
> 		$admtext['docreate'] = "包括创建表";
> 		$admtext['onrestore'] = "��选项";
> 		$admtext['dodel'] = "先删除之�的内容";
> 		$admtext['download'] = "下载";
> 		$admtext['altbirthtypes'] = "�类出生事件";
> 		$admtext['dtformat'] = "表格格�";
> 		$admtext['conchart'] = "连接图表";
> 		$admtext['maxropt'] = "最大连接�索�行次数";
> 		$admtext['maxlopt'] = "最大连接路径长度";
> 		$admtext['showtxtopt'] = "显示文本路径语�";
> 		$admtext['compactboxopt'] = "以紧凑形�显示人员框";
> 		$admtext['sortbyopt'] = "排�路径";
> 		$admtext['anchoridopt'] = "锚点 ID";
> 		$admtext['maxmopt'] = "最大婚姻数";
> 		$admtext['saveincfg'] = "存储在�置路径中（��常规设置）";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "无法地�编�";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Do not geocode";
1436d1549
< 		$admtext['backtosecondary'] = "回到二级处�";
1452,1456c1565,1571
< 		$admtext['refreshliving'] = "刷新生者";  //Refresh Living
< 		$admtext['chtodeceased'] = "�更为�者";  //changed to deceased
< 		$admtext['chtoliving'] = "�更为生者";  //changed to living
< 		$admtext['chtoprivate'] = "�更为��";  //changed to private
< 		$admtext['makeprivate'] = "�护��";  //Make Private
---
> 		$admtext['refreshliving'] = "刷新生者";
> 		$admtext['chtodeceased'] = "�更为�者";
> 		$admtext['chtoliving'] = "�更为生者";
> 		$admtext['chtoprivate'] = "�更为��";
> 		$admtext['makeprivate'] = "�护��";
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "返回导入�实用程�";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exclude notes";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "压缩并包�媒体文件";
> 		$admtext['downloadzip'] = "下载 ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1606,1607c1722,1729
< 		$admtext['consented'] = "��";  //Consent given
< 		$admtext['consentdate'] = "日期确认";  //Date Consented
---
> 		$admtext['consented'] = "��";
> 		$admtext['consentdate'] = "日期确认";
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Show disabled users only";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "选择一树型时也会��给管�员";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1845,1857c1962,1974
< 		$admtext['exists'] = "存在";  //exists
< 		$admtext['newdirsreq'] = "指定的新文件夹";  //new folders specified
< 		$admtext['cantrem'] = "�能删除";  //can't remove
< 		$admtext['showanalyzer'] = "显示分�TNG的文件标签";  //Show Analyze TNG Files tab
< 		$admtext['showdeveloper'] = "显示其他工具";  //Show Other Developer tools
< 		$admtext['showupdates'] = "显示更新标签";  //Show Recommended Updates tab
< 		$admtext['analyzefiles'] = "分�文件";  //Analyze TNG Files
< 		$admtext['parsetable'] = "视图表";  //View Parser Table
< 		$admtext['recommendedfixes'] = "建议更新";  //Recommended Updates
< 		$admtext['selectmod'] = "选择一个mod�置文件�查看解�器表结果";  //Select a mod config file to view the parser table results
< 		$admtext['parsertags'] = "解�器标签组";  //Parser Tags Array:
< 		$admtext['parsererror'] = "错误";  //Error: 
< 		$admtext['filesel'] = "选择TNG文件以查看哪些模�会影�它";  //Select TNG file to see which mods affect it;
---
> 		$admtext['exists'] = "存在";
> 		$admtext['newdirsreq'] = "指定的新文件夹";
> 		$admtext['cantrem'] = "�能删除";
> 		$admtext['showanalyzer'] = "显示分�TNG的文件标签";
> 		$admtext['showdeveloper'] = "显示其他工具";
> 		$admtext['showupdates'] = "显示更新标签";
> 		$admtext['analyzefiles'] = "分�文件";
> 		$admtext['parsetable'] = "视图表";
> 		$admtext['recommendedfixes'] = "建议更新";
> 		$admtext['selectmod'] = "选择一个mod�置文件�查看解�器表结果";
> 		$admtext['parsertags'] = "解�器标签组";
> 		$admtext['parsererror'] = "错误";
> 		$admtext['filesel'] = "选择TNG文件以查看哪些模�会影�它";
1859,1864c1976,1981
< 		$admtext['updcusttext'] = "更新自定义文件";  //Update cust_text.php files
< 		$admtext['confirmupdcusttext'] = "确定�更新"; 
< 		$admtext['compressnames'] = "在模�列表中删除空格";  //Remove spaces from file names in Mod List
< 		$admtext['verified'] = "已�实";  //verified
< 		$admtext['provisional'] = "（临时）必须�用";  //(provisional) must be available
< 		$admtext['backtoprevious'] = "返回上一页";  //Return to previous page
---
> 		$admtext['updcusttext'] = "更新自定义文件";
> 		$admtext['confirmupdcusttext'] = "确定�更新";
> 		$admtext['compressnames'] = "在模�列表中删除空格";
> 		$admtext['verified'] = "已�实";
> 		$admtext['provisional'] = "（临时）必须�用";
> 		$admtext['backtoprevious'] = "返回上一页";
1866c1983
< 		$admtext['newanchor'] = "在语言文件中�应该翻译新的注释行，以便模�开�者自定义文本��以用作�入的锚点"; 
---
> 		$admtext['newanchor'] = "在语言文件中�应该翻译新的注释行，以便模�开�者自定义文本��以用作�入的锚点";
1868,1870c1985,1987
< 		$admtext['privatemod'] = "�人模�";  //Private Mod
< 		$admtext['protected'] = "�护--手动删除文件";  //protected-remove file manually
< 		$admtext['restored'] = "��";  //restored
---
> 		$admtext['privatemod'] = "�人模�";
> 		$admtext['protected'] = "�护--手动删除文件";
> 		$admtext['restored'] = "��";
1873c1990
< 		$admtext['delrisk'] = "通过选择此选项，用户接�所有风险�能会删除�外的文件夹。我们认为这个风险�大"; 
---
> 		$admtext['delrisk'] = "通过选择此选项，用户接�所有风险�能会删除�外的文件夹。我们认为这个风险�大";
1875c1992
< 		$admtext['delinstinfo'] = "如果你安装了新版本和�版本�然显示安装，应该设置这个选项为Yes."; 
---
> 		$admtext['delinstinfo'] = "如果你安装了新版本和�版本�然显示安装，应该设置这个选项为Yes.";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "所有模�";
> 		$admtext['installedmods'] = "仅安装模�";
> 		$admtext['partinstmods'] = "已安装+部分安装模�";
> 		$admtext['showanalyzeractions'] = "分�模�钟显示动作";
> 		$admtext['badchar'] = "Invalid character";
1886d2008
< 		$admtext['test_number'] = "测试�";
1893c2015
< 		$admtext['dnalater'] = "注�：测试�以在下一个�幕上链接到其他人";
---
> 		$admtext['dnalater'] = "注�：�能会添加更多信�，下一�会测试链接到更多的个人 ";
1901,1918c2023,2049
< 		$admtext['markers'] = "标记数�";  //Number of Markers
< 		$admtext['test_values'] = "测试值";  //Test Values
< 		$admtext['separate'] = "用逗�分隔";  //Separate values with commas
< 		$admtext['person_name'] = "人员�在数�库";  //Person not in database
< 		$admtext['privsection'] = "��";  //Privacy
< 		$admtext['configsettings'] = "常规设置";  //General Settings
< 		$admtext['addtotestgroup'] = "添加测试组";  //Add Test To A Group
< 		$admtext['dna_group'] = "DNA组";  //DNA Group
< 		$admtext['groupid'] = "组ID";  //Group ID
< 		$admtext['addgroup'] = "添加组";  //Add Group
< 		$admtext['entergroupid'] = "请输入组ID";  //Please enter a group ID
< 		$admtext['entergroupdesc'] = "请输入组�述";  //Please enter a group description
< 		$admtext['confgroupdelete'] = "确定删除该组？";  //Are you sure you want to delete this group?
< 		$admtext['modifygroup'] = "编辑现有组";  //Edit Existing Group
< 		$admtext['mrcaiorf'] = "如果关�，请输入人员ID或家庭ID";  //If relevant, enter a person ID OR a family ID
< 		$admtext['test_results'] = "测试结果";  //Test Results
< 		$admtext['mdaID'] = "最远的祖先ID";  //Most distant ancestor ID
< 		$admtext['mrcaID'] = "最近的祖先ID";  //Most recent common ancestor ID
---
> 		$admtext['markers'] = "标记数�";
> 		$admtext['test_values'] = "测试值";
> 		$admtext['separate'] = "用逗�分隔";
> 		$admtext['person_name'] = "人员�在数�库";
> 		$admtext['privsection'] = "��";
> 		$admtext['configsettings'] = "常规设置";
> 		$admtext['addtotestgroup'] = "添加测试组";
> 		$admtext['dna_group'] = "DNA组";
> 		$admtext['groupid'] = "组ID";
> 		$admtext['addgroup'] = "添加组";
> 		$admtext['entergroupid'] = "请输入组ID";
> 		$admtext['entergroupdesc'] = "请输入组�述";
> 		$admtext['confgroupdelete'] = "确定删除该组？";
> 		$admtext['modifygroup'] = "编辑现有组";
> 		$admtext['mrcaiorf'] = "如果关�，请输入人员ID或家庭ID";
> 		$admtext['test_results'] = "测试结果";
> 		$admtext['mdaID'] = "最远的祖先ID";
> 		$admtext['mrcaID'] = "最近的祖先ID";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "测试�";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Link this DNA test to a person";
1965d2095
< $admtext['otherevents'] = "其他事件";
2050,2051d2179
< $admtext['savereturn'] = "返回此页";
< $admtext['saveback'] = "返回��";
2058,2059d2185
< $admtext['secondary'] = "二级过程";
< $admtext['commas'] = "用逗�分开多个项目";
2101c2227
< $admtext['nobranch'] = "无支谱";
---
> $admtext['nobranch'] = "No branch";
2129,2130d2254
< $admtext['secondarymaint'] = "二级�作";
< $admtext['customeventtypes'] = "自选项目";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2235,2236c2356
< $admtext['reviewsh'] = "刷新\"; //Review"; //short version
< //moved here in 9.0.0
---
> $admtext['reviewsh'] = "刷新"; //short version
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "类型";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2301,2302c2416,2417
< $admtext['templates'] = "模�";  //Templates
< $admtext['findciteid'] = "查找引�ID ";  //Find Citation ID
---
> $admtext['templates'] = "模�";
> $admtext['findciteid'] = "查找引�ID ";
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "姓�";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "图片";
> $admtext['author'] = "作者";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "入门";
> $admtext['showlog'] = "管�日志";
> $admtext['nobirthinfo'] = "没有出生信�";
> //changed in 13.0
> $admtext['savereturn'] = "返回此页";
> $admtext['saveback'] = "返回��";
> //added in 13.0
> $admtext['allitemsdeleted'] = "All items were successfully deleted.";
> $admtext['private'] = "Private";
> $admtext['imgtags'] = "Image Tags";
> 
> $admtext['removelink'] = "删除链接";
> $admtext['eloptions'] = "�览或删除";
> $admtext['pleaseenter'] = "请进入";
> 
> $admtext['nolinks'] = "�存在链接";
> $admtext['nogeocode'] = "无法地�编�";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "选择缺�照片"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "事件/属性类型";
> $admtext['secondary'] = "导入�实用程�";
> $admtext['otherevents'] = "其他事件/属性";
> //added in 14.0
> $admtext['newlinks'] = "已创建链接";
> $admtext['newcemlinks'] = "已创建公墓链接";
> $admtext['utility'] = "实用程�";
> $admtext['linktype'] = "类型";
> $admtext['move'] = "移动";
> $admtext['copy'] = "�制";
> $admtext['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Chinese-UTF8/alltext.php TNG1403/languages/Chinese-UTF8/alltext.php
85c85
< $text['none'] = "�存在";
---
> $text['none'] = "æ— ";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "一个错误�生在TNG软件。这�能是由于设置问题,一个�完整的�级或一个程�错误。如果你是网站所有者,你�能接触TNG支�帮助解决这个问题。请�制到下�的查询并粘贴到你的信�";
163d147
< //moved here in 12.0.0
173,209c157,259
< //added here in 12.0.0
< $text['testgroup'] = "测试组";  //Test Group
< $text['test_number'] = "测试编�/�称";  //Test Number/Name
< $text['test_info_display'] = "测试信�显示";  //Test Information To Display
< $text['confirmed'] = "确认";  //Confirmed
< $text['predicted'] = "测试";  //Predicted
< $admtext['ancestral_surnames'] = "祖先姓�";  //Ancestral surnames
< $admtext['admin_notes'] = "管�员笔记";  //Administrator notes
< $admtext['mda'] = "最远的祖先";  //Most distant ancestor
< $admtext['mrca'] = "最近的祖先";  //Most recent common ancestor
< $admtext['marker_values'] = "标记值";  //Marker values
< $admtext['ref_seq'] = "�考�列";  //Reference sequence
< $admtext['rsrs'] = "�建�考�列";  //RSRS (Reconstructed Sapiens Reference Sequence)
< $admtext['rcrs'] = "剑桥�考�列";  //rCRS (revised Cambridge Reference Sequence)
< $admtext['hvr_values'] = "HVR差异";  //HVR Differences
< $admtext['hvr1_values'] = "HVR1差异";  //HVR1 Differences
< $admtext['hvr2_values'] = "HVR2差异";  //HVR2 Differences
< $admtext['coding_reg'] = "编�区域差异";  //Coding region differences
< $text['keep_name_private'] = "�留�人�称";  //Keep Name Private
< $text['test_results'] = "测试结果";  //Test Results
< $admtext['dna_tests'] = "DNA测试DNA";  // Tests
< $admtext['vendor'] = "供应商";  //Vendor
< $admtext['markers'] = "STR标记数�";  //Number of STR Markers
< $admtext['haplo'] = "��组";  //Haplogroup
< $admtext['termsnp'] = "终端�核苷酸多�性SNP";  //Terminal SNP
< $admtext['signsnp'] = "有效的SNP";  //Significant SNPs
< $admtext['atdna_test'] = "常染色体";  //atDNA (Autosomal)
< $admtext['ydna_test'] = "Y染色体";  //Y-DNA
< $admtext['mtdna_test'] = "线粒体DNA";  //mtDNA (Mitochondrial)
< $admtext['xdna_test'] = "X染色体DNA";  //X-DNA
< 
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "�外��";  //Extra mutations
< 
< //$english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
< //@include($rootpath . $endrootpath . "languages/$english/cust_text.php");
< @include("cust_text.php");
---
> $text['testgroup'] = "测试组";
> $text['test_info_display'] = "测试信�显示";
> $text['confirmed'] = "确认";
> $text['predicted'] = "测试";
> $admtext['ancestral_surnames'] = "祖先姓�";
> $admtext['admin_notes'] = "管�员笔记";
> $admtext['mda'] = "最远的祖先";
> $admtext['mrca'] = "最近的祖先";
> $admtext['marker_values'] = "标记值";
> $admtext['ref_seq'] = "�考�列";
> $admtext['rsrs'] = "�建�考�列";
> $admtext['rcrs'] = "剑桥�考�列";
> $admtext['hvr_values'] = "HVR差异";
> $admtext['hvr1_values'] = "HVR1差异";
> $admtext['hvr2_values'] = "HVR2差异";
> $admtext['coding_reg'] = "编�区域差异";
> $text['keep_name_private'] = "�留�人�称";
> $text['test_results'] = "测试结果";
> $admtext['dna_tests'] = "DNA测试DNA";
> $admtext['vendor'] = "供应商";
> $admtext['markers'] = "STR标记数�";
> $admtext['haplo'] = "��组";
> $admtext['termsnp'] = "终端�核苷酸多�性SNP";
> $admtext['signsnp'] = "有效的SNP";
> $admtext['atdna_test'] = "常染色体";
> $admtext['ydna_test'] = "Y染色体";
> $admtext['mtdna_test'] = "线粒体DNA";
> $admtext['xdna_test'] = "X染色体DNA";
> $admtext['xtra_mut'] = "�外��";
> $text['test_number'] = "测试编�/�称";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "生.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "æ­».";  //from descend
> $text['burialabbr'] = "葬礼.";  //from descend
> $text['marrabbr'] = "结婚.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "首页";
> $text['lastpage'] = "尾页";
> 
> //changed in 13.0.0
> $text['problem'] = "一个错误�生在TNG软件。这�能是由于设置问题,一个�完整的�级或一个程�错误。如果你是网站所有者,你�能接触TNG支�帮助解决这个问题。请�制到下�的查询并粘贴到你的信�";
> //added in 13.0.0
> $admtext['nobranch'] = "No branch";
> 
> //added in 14.0
> $text['oneyear'] = "å¹´";
> $text['pwdcodelink'] = "点击此链接将临时密���给您";
> $text['pwdcodesent'] = "密��置链接已��到您的电�邮件地�。";
> $text['moved'] = "已移动";
> $text['citation'] = "引文";
> $text['other'] = "其他";
> $text['death'] = "死亡";
> $text['burial'] = "葬礼";
> $text['cremation'] = "�葬";
> $text['marriage'] = "婚姻";
> $text['divorce'] = "离婚";
> $text['bylength'] = "æ­¥";
> $text['bymarriages'] = "婚姻";
> $text['none'] = "æ— ";
> 
> //moved here in 14.0
> $text['family'] = "家庭";
> $text['source'] = "资�";
> $text['repository'] = "文献";
> $text['place'] = "地点";
> $admtext['BAPM'] = "洗礼";
> 
> $text['glang'] = "zh-CN";
> 
> // loading English or English-UTF8 is required to display custom text for mods that do not provide all translations
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
> @include($rootpath . $endrootpath . "languages/$english/cust_text.php");
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Chinese-UTF8/text.php TNG1403/languages/Chinese-UTF8/text.php
69d68
< 		$text['general'] = "通用";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "请选择两个人.";
---
> 		$text['select2inds'] = "请选择两个人。";
90c90
< 		$text['sameperson'] = "这两个人是�一个人.";
---
> 		$text['sameperson'] = "这两个人是�一个人。";
93c93
< 		$text['sometimes'] = "(有时检查��数�的代数会产生��的结果.)";
---
> 		$text['sometimes'] = "(有时检查��的代数会产生��的结果。)";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "�索连接";
> 		$text['findrel2'] = "查找关系和其他�系";
> 		$text['makeme2nd'] = "使用我的 ID";
> 		$text['usebookmarks'] = "使用书签";
> 		$text['select2inds'] = "请选择两个人。";
> 		$text['indinfofor'] = "个人信�";
> 		$text['nobookmarks'] = "没有书签�以使用";
> 		$text['bkmtitle'] = "在书签中找到的人";
> 		$text['bkminfo'] = "选择一个人:";
> 		$text['sortpathsby'] = "按数�排�路径";
> 		$text['sortbyshort'] = "排���";
> 		$text['bylengthshort'] = "长度";
> 		$text['badID1'] = ": 错误ID 1 -请返回并更正";
> 		$text['badID2'] = ": 错误ID 2 -请返回并更正";
> 		$text['notintree'] = ": 这个ID的人�在当�树数�库中。";
> 		$text['sameperson'] = "这两个人是�一个人。";;
> 		$text['nopaths'] = "这些人没有�系。";
> 		$text['nopaths1'] = "没有比 xxx 短的连接";
> 		$text['nopaths2'] = "在 xxx �索步骤中";
> 		$text['longestpath'] = "(到目�为止检查的最长路径是 xxx 步长)";
> 		$text['relevantpaths'] = "找到的��相关路径的数�：xxx";
> 		$text['skipMarr'] = "(�外，由于婚姻过多，找到但未显示的路径数为：xxx)";
> 		$text['mjaor'] = "或";
> 		$text['connectionsto'] = "连接到  ";
> 		$text['findanotherpers'] = "找�一个人...";
> 		$text['sometimes'] = "(有时检查��的代数会产生��的结果。)";
> 		$text['anotherpath'] = "�索其他连接";
> 		$text['xpath'] = "路径 ";
> 		$text['primary'] = "起始人"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "结�人";
> 		$text['parent'] = "父�";
> 		$text['mhfather'] = "他的父亲";
> 		$text['mhmother'] = "他的妈妈";
> 		$text['mhhusband'] = "他的丈夫";
> 		$text['mhwife'] = "他的妻�";
> 		$text['mhson'] = "ä»–çš„å„¿å­�";
> 		$text['mhdaughter'] = "她的女儿";
> 		$text['fhfather'] = "她的父亲";
> 		$text['fhmother'] = "她妈妈";
> 		$text['fhhusband'] = "她的丈夫";
> 		$text['fhwife'] = "她的妻�";
> 		$text['fhson'] = "她的儿�";
> 		$text['fhdaughter'] = "她的女儿";
> 		$text['hfather'] = "父亲";
> 		$text['hmother'] = "妈妈";
> 		$text['hhusband'] = "丈夫";
> 		$text['hwife'] = "妻�";
> 		$text['hson'] = "å„¿å­�";
> 		$text['hdaughter'] = "女儿";
> 		$text['maxruns'] = "�检查的最大路径数";
> 		$text['maxrshort'] = "最大路径";
> 		$text['maxlength'] = "连接路径�超过";
> 		$text['maxlshort'] = "最大长度";
> 		$text['xstep'] = "æ­¥";
> 		$text['xsteps'] = "步数";
> 		$text['xmarriages'] = "xxx 婚姻";
> 		$text['xmarriage'] = "1 婚姻";
> 		$text['showspouses'] = "显示���方";
> 		$text['showTxt'] = "显示文本路径�述";
> 		$text['showTxtshort'] = "文本�述.";
> 		$text['compactBox'] = "显示压缩的人物框";
> 		$text['compactBoxshort'] = "压缩框";
> 		$text['paths'] = "路径";
> 		$text['dospouses2'] = "显示��";
> 		$text['maxmopt'] = "Max marriages per connection";
> 		$text['maxm'] = "Max marriages";
> 		$text['arerelated'] = "These persons are relatives - their relationship is shown in the Path 1";
> 		$text['simplerel'] = "Simple relationship search";
196d264
< 		$text['scrollnote'] = "注�：您�能需��下或��滚动以查看图表.";
199d266
< 		$text['popupnote2'] = "新世系";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "表格";
> 		$text['dtchildren'] = "å„¿ç«¥";
> 		$text['dtgrandchildren'] = "孙�";
> 		$text['dtggrandchildren'] = "曾孙";
> 		$text['dtgggrandchildren'] = "曾孙"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "没有�代";
> 		$text['dtgen'] = "世";
> 		$text['dttotal'] = "总计";
> 		$text['dtselect'] = "选择";
> 		$text['dteachfulltable'] = "�个完整的表都会有";
> 		$text['dtrows'] = "行";
> 		$text['dtdisplayingtable'] = "显示表格";
> 		$text['dtgototable'] = "转到表：";
> 		$text['fcinstrdn'] = "显示有��的家庭";
> 		$text['fcinstrup'] = "显示有父�的家庭";
> 		$text['fcinstrplus'] = "选择其他��";
> 		$text['fcinstrfam'] = "选择其他父�";
381,382d466
< 		$text['firstpage'] = "首页";
< 		$text['lastpage'] = "尾页";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Toggle Tags";
466,470c552,556
< 		$text['firstnamelist'] = "�字列表";  //First Name List
< 		$text['firstnamesstarting'] = "显示以开头的�字";  //Show first names starting with
< 		$text['showallfirstnames'] = "显示所有�字";  //Show all first names
< 		$text['mainfirstnamepage'] = "主�字首页";  //Main first name page
< 		$text['allfirstnames'] = "所有�字";  //All First Names
---
> 		$text['firstnamelist'] = "�字列表";
> 		$text['firstnamesstarting'] = "显示以开头的�字";
> 		$text['showallfirstnames'] = "显示所有�字";
> 		$text['mainfirstnamepage'] = "主�字首页";
> 		$text['allfirstnames'] = "所有�字";
472,476c558,562
< 		$text['allfirstbegwith'] = "所有以�开头的�字";  //All first names beginning with
< 		$text['top30first'] = "xxx�字排�";  //Top xxx first names
< 		$text['allothers'] = "所有其他人";  //All others
< 		$text['amongall'] = "（在所有�字中）";  //(among all names)
< 		$text['justtop'] = "仅排��xxx";  //Just the top xxx
---
> 		$text['allfirstbegwith'] = "所有以�开头的�字";
> 		$text['top30first'] = "xxx�字排�";
> 		$text['allothers'] = "所有其他人";
> 		$text['amongall'] = "（在所有�字中）";
> 		$text['justtop'] = "仅排��xxx";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "�次输入新密�";
> 		$text['resetsuccess'] = "�功：密�已被�置";
> 		$text['resetfail'] = "失败：密�未�置";
> 		$text['failreason0'] = " (未知的数�库错误)";
> 		$text['failreason2'] = " （您无�更改密�）";
> 		$text['failreason3'] = " (密��匹�)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "�引用总数";
618d710
< 		$text['loginfirst'] = "您必须先登录.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "您必须先登录.";
629,630d722
< 		$text['zoomin'] = "放大";
< 		$text['zoomout'] = "缩�";
649,659c741,775
< 		$text['mode_values'] = "模�值";  //Mode Values
< 		$text['compareselected'] = "比较选定的";  //Compare Selected";
< 		$text['dnatestscompare'] = "比较Y-DNA测试";  //Compare Y-DNA Tests
< 		$text['keep_name_private'] = "�留�人�称";  //Keep Name Private
< 		$text['browsealltests'] = "�览所有测试";  //Browse All Tests
< 		$text['all_dna_tests'] = "所有DNA测试";  //All DNA tests
< 		$text['fastmutating'] = "快速＆nbsp;��";  //Fast&nbsp;Mutating
< 		$text['dna_info_head'] = "DNA测试信�";  //DNA Test Info
< 		$text['alltypes'] = "所有类型";  //All Types
< 		$text['allgroups'] = "所有群组";  //All Groups
< 		$text['Ydna_LITbox_info'] = "与此人相关的测试�是必然由这个人采�。<br />'��组'专� 如果结果为\"预测\"，则以红色显示数�，如果测试结果为绿色则显示数�是'确认"; 
---
> 		$text['mode_values'] = "模�值";
> 		$text['compareselected'] = "比较选定的\";  //Compare Selected";
> 		$text['dnatestscompare'] = "比较Y-DNA测试";
> 		$text['keep_name_private'] = "�留�人�称";
> 		$text['browsealltests'] = "�览所有测试";
> 		$text['all_dna_tests'] = "所有DNA测试";
> 		$text['fastmutating'] = "快速＆nbsp;��";
> 		$text['alltypes'] = "所有类型";
> 		$text['allgroups'] = "所有群组";
> 		$text['Ydna_LITbox_info'] = "与此人相关的测试�是必然由这个人采�。<br />'��组'专� 如果结果为\"预测\"，则以红色显示数�，如果测试结果为绿色则显示数�是'确认";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "生.";
< $text['chrabbr'] = "c.";
675d788
< $text['family'] = "家庭"; //from getperson
685d797
< $text['deathabbr'] = "æ­».";  //from descend
706d817
< $text['burialabbr'] = "葬礼.";  //from descend
712d822
< $text['place'] = "地点";
715d824
< $text['marrabbr'] = "结婚.";
738d846
< $text['source'] = "资�";
766d873
< $text['repository'] = "文献";
770d876
< $text['findplaces'] = "找到所有在这个�置的事件的人n";
804d909
< $text['glang'] = "&amp;hl=en";
816d920
< $text['none'] = "æ— ";
924d1027
< $text['otherevents'] = "其他事件";
952,953d1054
< $text['people_have'] = "人们已将DNA测试与\"相关�\"";
< $text['person_has'] = "人将DNA测试与";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "快速链接";
> $text['yourname'] = "你的�字";
> $text['youremail'] = "您的电�邮件地�";
> $text['liketoadd'] = "您�添加的任何信�";
> $text['webmastermsg'] = "网站管�员留言";
> $text['gallery'] = "查看图库";
> $text['wasborn_male'] = "出生";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "出生"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "被命�为";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "被命�为";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "死了";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "死了";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "被埋葬了"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "被埋葬了"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "被�化";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "被�化";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "已婚";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "已婚";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "离婚了";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "离婚了";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " on ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "和 ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA测试信�";
> //added in 13.0
> $text['visitor'] = "Visitor";
> 
> $text['popupnote2'] = "新世系";
> 
> //moved here in 14.0
> $text['zoomin'] = "放大";
> $text['zoomout'] = "缩�";
> $text['scrollnote'] = "注�：您�能需��下或��滚动以查看图表.";
> $text['general'] = "通用";
> 
> //changed in 14.0
> $text['otherevents'] = "其他事件和属性";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "连接";
> $text['continue'] = "继续";
> $text['title2'] = "标题"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Croatian/admintext.php TNG1403/languages/Croatian/admintext.php
5,6c5,6
< 		$admtext['branchlabel'] = "Labela grane";
< 		$admtext['existingbranch'] = "Postojeæa grana";
---
> 		$admtext['branchlabel'] = "Oznaka Grane";
> 		$admtext['existingbranch'] = "Postojeća grana";
10,24c10,24
< 		$admtext['descofanc'] = "Generacije djece od svakog pretka";
< 		$admtext['descendants'] = "Djeca";
< 		$admtext['includespouses'] = "Ukljuèi supruge od djece";
< 		$admtext['partial'] = "Djelomièan";
< 		$admtext['addlabels'] = "Dodaj labele";
< 		$admtext['clearlabels'] = "Oèisti labele";
< 		$admtext['clearingbranch'] = "Oèisti labele grana";
< 		$admtext['addingbranch'] = "Dodaj labele grana";
< 		$admtext['totalaffected'] = "Ukupno Affected";
< 		$admtext['labelmore'] = "Oznaèi više grana";
< 		$admtext['enterbranch'] = "Molim oznaèi postojeæu granu ili unesi novu.";
< 		$admtext['enterstartingind'] = "Molim unesi ID poèetne osobe.";
< 		$admtext['gensnumeric'] = "Vrijednost za pretke i djecu mora biti numerik.";
< 		$admtext['overwrite'] = "Prepiši";
< 		$admtext['branchid'] = "ID grane";
---
> 		$admtext['descofanc'] = "Potomak generacija za svakog pretka";
> 		$admtext['descendants'] = "Potomci";
> 		$admtext['includespouses'] = "Uklju�ite supružnike potomaka";
> 		$admtext['partial'] = "Djelimi�no";
> 		$admtext['addlabels'] = "Dodaj oznaku";
> 		$admtext['clearlabels'] = "Obriši oznaku";
> 		$admtext['clearingbranch'] = "Obriši Oznaku Grane";
> 		$admtext['addingbranch'] = "Dodaj Oznaku Grane";
> 		$admtext['totalaffected'] = "Ukupno Pogođeni";
> 		$admtext['labelmore'] = "Ozna�ite više Grana";
> 		$admtext['enterbranch'] = "Molim ozna�i postojeću granu ili unesi novu.";
> 		$admtext['enterstartingind'] = "Molim unesi ID po�etne osobe.";
> 		$admtext['gensnumeric'] = "Vrednosti za pretke i potomke moraju biti numeri�ke.";
> 		$admtext['overwrite'] = "Prepiši";
> 		$admtext['branchid'] = "ID Grane";
26,30c26,30
< 		$admtext['createbranch'] = "Kreiraj polje nove grane";
< 		$admtext['existingbranchinfo'] = "Postojeæa informacija o grani";
< 		$admtext['editexistingbranch'] = "Uredi informaciju prethodno unesene grane";
< 		$admtext['confbranchdelete'] = "Da li ste sigurni da želite obrisati ovu granu?";
< 		$admtext['enterbranchid'] = "Molim uniesite ID grane.";
---
> 		$admtext['createbranch'] = "Stvorite zapis za novu granu";
> 		$admtext['existingbranchinfo'] = "Postojećoj informacija o grani";
> 		$admtext['editexistingbranch'] = "Uredite podatke za prethodno unesenu granu";
> 		$admtext['confbranchdelete'] = "Da li ste sigurni da hoćete obrisati ovu granu?";
> 		$admtext['enterbranchid'] = "Molim unesite ID grane.";
33c33
< 		$admtext['modifybranch'] = "Modificiraj postojeæu granu";
---
> 		$admtext['modifybranch'] = "Modificiraj postojeće grane";
35,42c35,42
< 		$admtext['existlabels'] = "Postojeæe labele";
< 		$admtext['leave'] = "Leave";
< 		$admtext['append'] = "Append all records";
< 		$admtext['showpeople'] = "Prikaži ljude s ovim stablom/granom";
< 		$admtext['branchdiscl'] = "Ovaj broj reprezentira total broj linkova grana, ne nužno i broj ljudi ili obitelji trenutno vezani za ovu granu. Ako ste nedvno uvezli vaše podatke, vjerojatno trebate ponovno labelirati vaše grane.";
< 		$admtext['inclspouses'] = "Include spouses for all descendants";
< 		$admtext['delpeople'] = "Delete people and families with this branch label";
< 		$admtext['confbrdel'] = "Are you sure you want to delete all people and families with this branch label?";
---
> 		$admtext['existlabels'] = "Postojeće oznake";
> 		$admtext['leave'] = "Ostavi";
> 		$admtext['append'] = "Dodaj sve zapise";
> 		$admtext['showpeople'] = "Prikaži osobe u ovim drvetu/granom";
> 		$admtext['branchdiscl'] = "Ovaj broj predstavlja ukupan broj grana linkova, a ne nužno broj osoba ili porodica koji su trenutno vezani s ovom granom. Ako ste nedavno ponovo uveli podatke, možda ćete trebati ponovo povezati svoje grane.";
> 		$admtext['inclspouses'] = "Uklju�i supružnike za sve potomke";
> 		$admtext['delpeople'] = "Izbrišite ljude i obitelji s ovom oznakom grane";
> 		$admtext['confbrdel'] = "Da li ste sigurni da želite da izbrišete sve osobe i obitelji sa ovom oznakom grane?";
47c47
< 		$admtext['mapnotcopied'] = "Ne mogu kopirati map image file ";
---
> 		$admtext['mapnotcopied'] = "Datoteku slike nije moguće kopirati u";
49c49
< 		$admtext['modifycemetery'] = "Promijeni postojeæe groblje";
---
> 		$admtext['modifycemetery'] = "Promjene postojećeg groblja";
51,56c51,56
< 		$admtext['createnewcemetery'] = "Kreiraj rekord o novom groblju";
< 		$admtext['selectcemaction'] = "Selektiraj groblje i akciju";
< 		$admtext['location'] = "Location";
< 		$admtext['confdeletecem'] = "Da li ste sigurni da želite obrisati ovo groblje?";
< 		$admtext['editceminfo'] = "Uredi informaciju o prethodno unešenom groblju";
< 		$admtext['leaveblankallcems'] = "ostavi prazno za listu svih groblja";
---
> 		$admtext['createnewcemetery'] = "Stvori zapis za novo groblje";
> 		$admtext['selectcemaction'] = "Odaberi groblje i akciju";
> 		$admtext['location'] = "Mjesto";
> 		$admtext['confdeletecem'] = "Da li ste sigurni da hoćete da obrišete odabrano groblje?";
> 		$admtext['editceminfo'] = "Uredi informacija o prethodno upisanom groblju";
> 		$admtext['leaveblankallcems'] = "ostavi prazno da biste pokazali sva groblja";
58,63c58,63
< 		$admtext['mapfilename'] = "Map File Name";
< 		$admtext['countyparish'] = "Županija";
< 		$admtext['stateprovince'] = "Država/Provincija";
< 		$admtext['entercountry'] = "Molim unesite naziv države.";
< 		$admtext['entermapfile'] = "Molim unesite naziv datoteke vaše map datoteke na web serveru.";
< 		$admtext['existingceminfo'] = "Postojeæa informacija o groblju";
---
> 		$admtext['mapfilename'] = "Ime mape";
> 		$admtext['countyparish'] = "Županija";
> 		$admtext['stateprovince'] = "Država/Pokrajna";
> 		$admtext['entercountry'] = "Molim unesite naziv države.";
> 		$admtext['entermapfile'] = "Molim unesite naziv datoteke  za vaše mape datoteke na web serveru.";
> 		$admtext['existingceminfo'] = "Postojećem informacija o groblju";
65,68c65,68
< 		$admtext['maptoupload'] = "Map image za upload";
< 		$admtext['mapfilenamefolder'] = "Map File Name<br/>sa folderom nadgrobnog spomenika";
< 		$admtext['ifmapuploaded'] = "Ostavi ovo polje prazno ako je datoteka veæ upload-irana u vaš folder nadgrobnih spomenika.";
< 		$admtext['requiredmap'] = "Potrebno ako koristite mapu. To treba korespondirati s nazivom i lokacijom vaše datoteke <em>unutar foldera nadgrobnih spomenika</em> kada je datoteka upload-irana. Npr. ako je vaš folder nadgrobnih spomenika zove <em>headstones</em>,	i ako želite da se vaša datoteka zove <em>map.jpg</em> i ako odete u subfolder od nadgrobnih spomenika koji se zove <em>mymaps</em>, možete unijeti <em>mymaps/map.jpg</em> u ovom polju.";
---
> 		$admtext['maptoupload'] = "Slika karte za prijenos";
> 		$admtext['mapfilenamefolder'] = "Naziv datoteke mape<br/>unutar mape Spomenika";
> 		$admtext['ifmapuploaded'] = "Ostavite ovo polje prazno ako je datoteka već prenesena u mapu nadgrobnih spomenika.";
> 		$admtext['requiredmap'] = "Obavezno ako koristite kartu. Ovo bi trebalo odgovarati imenu i lokaciji vaše datoteke <em>unutar mape nadgrobnih spomenika </em>nakon prijenosa datoteke. Na primjer, ako se vaša mapa spomenika zove <em> spomenik </em>, a želite da se vaša datoteka zove <em> map.jpg </em> i upišete se u podmapu nadgrobnih spomenika pod nazivom <em> mymaps </ em>, u ovo polje biste unijeli <em> mymaps / map.jpg </em>.";
70,72c70,72
< 		$admtext['linkplace'] = "Associated Place";
< 		$admtext['fillplace'] = "Fill Place";
< 		$admtext['usecemcoords'] = "Copy the geocode information below to this place";
---
> 		$admtext['linkplace'] = "Pridruženo mjesto";
> 		$admtext['fillplace'] = "Mjesto za popunjavanje";
> 		$admtext['usecemcoords'] = "Kopirajte donje podatke o geokodu na ovo mjesto";
77c77
< 		$admtext['alreadyexists'] = "veæ postoji";
---
> 		$admtext['alreadyexists'] = "već postoji";
79,81c79,80
< 		$admtext['enternew'] = "Unesi novi";
< 		$admtext['pleaseenter'] = "Molim unesi ";
< 		$admtext['netscapereload'] = "Netscape korisnici: <br/>Moraš ponovno uèitati stranicu s grobljima da biste vidjeli vaš novi unos";
---
> 		$admtext['enternew'] = "Unesi novo";
> 		$admtext['netscapereload'] = "Netscape korisnici: <br/>Morate ponovo u�itati stranicu Groblja da biste videli novo";
86,90c85,89
< 		$admtext['deletingnote'] = "Brišem zabilješku...";
< 		$admtext['addingnote'] = "Dodajem zabilješku...";
< 		$admtext['addnewnote'] = "Dodaj novu zabilješku";
< 		$admtext['note'] = "Zabilješka";
< 		$admtext['modifynote'] = "Promijeni zabilješku";
---
> 		$admtext['deletingnote'] = "Brisanje zabilješke...";
> 		$admtext['addingnote'] = "Dodavanje zabelješke...";
> 		$admtext['addnewnote'] = "Dodaj novu zabilješku";
> 		$admtext['note'] = "Zabilješka";
> 		$admtext['modifynote'] = "Uredi zabilješku";
92c91
< 		$admtext['notechanges'] = "Changes to note";
---
> 		$admtext['notechanges'] = "Uredi tekst zabilješke";
97,101c96,100
< 		$admtext['addingevent'] = "Dodavanje dogaðaja...";
< 		$admtext['deletingevent'] = "Brisanje dogaðaja...";
< 		$admtext['updatingevent'] = "Ažuriraj dogaðaj...";
< 		$admtext['modifyevent'] = "Promijeni dogaðaj";
< 		$admtext['addnewevent'] = "Dodaj novi dogaðaj";
---
> 		$admtext['addingevent'] = "Dodavanje događaja...";
> 		$admtext['deletingevent'] = "Brisanje događaja...";
> 		$admtext['updatingevent'] = "Ažuriranje događaja...";
> 		$admtext['modifyevent'] = "Uredi događaja";
> 		$admtext['addnewevent'] = "Dodaj novi događaja";
105c104
< 		$admtext['agency'] = "Agency";
---
> 		$admtext['agency'] = "Agencija";
107c106
< 		$admtext['moreinfo'] = "Više informacija";
---
> 		$admtext['moreinfo'] = "Više informacije";
109c108
< 		$admtext['dupfor'] = "Duplicate for";
---
> 		$admtext['dupfor'] = "Duplikat za";
114,115c113,114
< 		$admtext['importinggedcom'] = "uvozim GEDCOM...<br/>(ovo može potrajati nekoliko minuta)";
< 		$admtext['ifimportfails'] = "Ako uvoz ne uspije izavršiti do kraja,";
---
> 		$admtext['importinggedcom'] = "uvozim GEDCOM...<br/>(ovo može potrajati nekoliko minuta)";
> 		$admtext['ifimportfails'] = "Ako uvoz ne uspije izavršiti do kraja,";
119,121c118,120
< 		$admtext['notresumed'] = "Uvoz podataka ne može biti nastavljen.";
< 		$admtext['finishedimporting'] = "Završio s uvozom GEDCOM";
< 		$admtext['treeexists'] = "Another tree already exists with the selected ID. Please select a different ID and try again.";
---
> 		$admtext['notresumed'] = "Uvoz podataka ne može biti nastavljen.";
> 		$admtext['finishedimporting'] = "Završio s uvozom GEDCOM";
> 		$admtext['treeexists'] = "Već jedno stablo postoji s odabranim ID-om. Odaberite drugi ID i pokušajte ponovo.";
123,128c122,162
< 		$admtext['moreoptions'] = "More Options";
< 		$admtext['removeged'] = "Delete GEDCOM file (optional)";
< 		$admtext['cannotupload'] = "Could not upload file:";
< 		$admtext['invfperms'] = "Your 'gedcom' folder may have inadequate permissions (try 755 or 777).";
< 		$admtext['maybedone'] = "It may have already finished.";
< 		$admtext['turnonsis'] = "Make sure 'Save Import State' is turned on in the Import Settings.";
---
> 		$admtext['moreoptions'] = "Više mogućnosti";
> 		$admtext['removeged'] = "Obriši GEDCOM datoteku (neobavezno)";
> 		$admtext['cannotupload'] = "Prijenos datoteke nije uspio:";
> 		$admtext['invfperms'] = "Vaša mapa 'gedcom' možda ima neadekvatna dopuštenja (pokušajte 755 ili 777).";
> 		$admtext['maybedone'] = "Možda je već završilo.";
> 		$admtext['turnonsis'] = "Provjerite je li 'Sa�uvaj Stanje Uvoza' uklju�eno u postavkama uvoza.";
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Odaberite datoteku za uvoz.";
> 		$admtext['addreplacedata'] = "Dodajte ili zamijenite svoj rodoslov (može potrajati nekoliko minuta, ovisno o veli�ini vaše datoteke)";
> 		$admtext['fromyourcomputer'] = "S vašeg ra�unala";
> 		$admtext['importdata'] = "Uvoz Podataka";
> 		$admtext['replace'] = "Zamijeni (u odabranom stablu)";
> 		$admtext['desttree'] = "Stablo odredišta";
> 		$admtext['selectdesttree'] = "Odaberite ili unesite odredišno stablo.";
> 		$admtext['selectexisting'] = "Uvezi u";
> 		$admtext['ucaselast'] = "Velika slova sva prezimena";
> 		$admtext['norecalc'] = "Ne prera�unavajte živu zastavu";
> 		$admtext['autooffset'] = "Po�nite ID na prvom dostupnom broju";
> 		$admtext['mustselecttree'] = "Morate odabrati stablo prije nego Å¡to odaberete ovu opciju.";
> 		$admtext['onwebserver'] = "S web mjesta (u mapi GEDCOM)";
> 		$admtext['imphints'] = "SAVJETI: Svi trenutni podaci zna�i svi ljudi, obitelji, izvore i bilješke (medijska udruženja se ne gube sve dok osobne iskaznice ostanu iste). Ma� se uvijek temelje samo na ID-ovima. Uvijek se dodaju novi zapisi. Dodajte uvoz svih zapisa s novim ID-a.";
> 		$admtext['destbranch'] = "Odredišna Grana (izborno)";
> 		$admtext['importlatlong'] = "Uvoz podataka zemljopisne širine/dužine ako postoje";
> 		$admtext['opening'] = "Otvaranje";
> 		$admtext['reopen'] = "Ponovno otvaranje";
> 		$admtext['uploading'] = "Prijenos";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Uvoz je zaustavljen";
> 		$admtext['resume'] = "Nastavi";
> 		$admtext['neweronly'] = "Zamijenite samo ako je noviji";
> 		$admtext['oldimport'] = "Uvoz starog stila (bez trake napretka))";
> 		$admtext['importgedcom'] = "Uvoz GEDCOM datoteke (može biti Zipirane datoteke)";
> 		$admtext['stopbackup'] = "STOP! Bilo bi dobro da napravite sigurnosnu kopiju svojih trenutnih podataka prije nego Å¡to nastavite.";
> 		$admtext['importmedia'] = "Uvoz medija ako su prisutni";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Provjerite jesu li prefiksi i sufiksi (Opće Postavke) ispravni za ovu datoteku.";
> 		$admtext['chkimpsettings'] = "Provjerite postavke uvoza za više opcija.";
> 		$admtext['eventsonly'] = "Uvezite samo prilagođene vrste događaja i atribute (nikakvi podaci se ne dodaju, zamjenjuju ili dodaju)";
> 		$admtext['allevents'] = "Prihvatite podatke za sve nove vrste događaja i atribute";
> 		$admtext['finishingimporting'] = "Dorada...";
> 		$admtext['fileuploadfailed'] = "Prijenos datoteke nije uspio. Može zna�iti da je datoteka prevelika. Pokušajte upotrijebiti FTP za prijenos datoteke u svoju GEDCOM mapu, zatim odaberite i uvezite je odatle.";
129a164
> 
132,133c167
< 		$admtext['changestoevtype'] = "Promjene u tipu dogaðaja";
< 		$admtext['modifyeventtype'] = "Promjeni postojeæi tip dogaðaja";
---
> 		$admtext['changestoevtype'] = "Promjene u tipu događaja";
135,139c169
< 		$admtext['entertypedesc'] = "Molim unesite tip/opis novog tipa dogaðaja.";
< 		$admtext['enterdisplay'] = "Molim unesite display string za novi tip dogaðaja.";
< 		$admtext['existingeventtypeinfo'] = "Informacija o postojeæem tipu dogaðaja";
< 		$admtext['neweventtypeinfo'] = "Informacija o novom tipu dogaðaja";
< 		$admtext['tag'] = "Tag";
---
> 		$admtext['tag'] = "Ozna�iti";
141c171
< 		$admtext['onimport'] = "On Import";
---
> 		$admtext['onimport'] = "Pri uvozu";
143,146c173,174
< 		$admtext['ignore'] = "Ignoriraj";
< 		$admtext['typerequired'] = "With custom tags (where tag = \"EVEN\"), this is the TYPE and is required. Optional for all other tags.";
< 		$admtext['addnewevtype'] = "Dodaj novi tip dogaðaja";
< 		$admtext['createnewevtype'] = "Kreiraj zapis o novom tipu eventa";
---
> 		$admtext['ignore'] = "Zanemariti";
> 		$admtext['typerequired'] = "S prilagođenim oznakama (gdje je oznaka = \"EVEN\"), ovo je TIP i potrebno je. Neobavezno za sve ostale oznake.";
149,154c177,178
< 		$admtext['existingevtypes'] = "Postpojeæi tip dogaðaja";
< 		$admtext['edsevtypes'] = "Uredi, obriši ili sortiraj unešene tipove dogaðaja";
< 		$admtext['indfam'] = "Oso/Obi";  //individual family
< 		$admtext['confdeleteevtype'] = "Da li ste sigurni da želite obrisati ovaj tip dogaðaja?";
< 		$admtext['selecttag'] = "Select Tag";
< 		$admtext['selectentertag'] = "Molim odaberite ili unesite tag ovog tipa dogaðaja.";
---
> 		$admtext['indfam'] = "Pojedina�na obitelj";  //individual family
> 		$admtext['selecttag'] = "Odaberite Oznaka";
156,157c180,181
< 		$admtext['ifbothdata'] = "will take precedence if both fields contain data";
< 		$admtext['EVEN'] = "Dogaðaj";
---
> 		$admtext['ifbothdata'] = "ima prednost ako oba polja sadrže podatke";
> 		$admtext['EVEN'] = "Događaj";
160,166c184,190
< 		$admtext['ALIA'] = "Takoðer znak kao";
< 		$admtext['BARM'] = "Barmitzvah";
< 		$admtext['BASM'] = "Basmitzvah";
< 		$admtext['CAST'] = "Caste";
< 		$admtext['CENS'] = "Census";
< 		$admtext['CHRA'] = "Adult Christening";
< 		$admtext['CONF'] = "Confirmation";
---
> 		$admtext['ALIA'] = "Također poznat kao";
> 		$admtext['BARM'] = "Bar micva";
> 		$admtext['BASM'] = "Bas micva";
> 		$admtext['CAST'] = "Kasta";
> 		$admtext['CENS'] = "Popis";
> 		$admtext['CHRA'] = "Krštenje odraslih";
> 		$admtext['CONF'] = "Konfirmacija";
168,169c192,193
< 		$admtext['DSCR'] = "Physical Description";
< 		$admtext['EDUC'] = "Edukacija";
---
> 		$admtext['DSCR'] = "Fizi�ki Opis";
> 		$admtext['EDUC'] = "Obrazovanje";
171c195
< 		$admtext['FCOM'] = "Prièest";
---
> 		$admtext['FCOM'] = "Pricest";
179c203
< 		$admtext['NMR'] = "Broj vjenèanja";
---
> 		$admtext['NMR'] = "Broj vjen�anja";
181,182c205,206
< 		$admtext['ORDI'] = "Ordinance";
< 		$admtext['ORDN'] = "Ordained";
---
> 		$admtext['ORDI'] = "Propis";
> 		$admtext['ORDN'] = "Zaređen";
184,185c208,209
< 		$admtext['PROB'] = "Probate";
< 		$admtext['PROP'] = "Vlasništvo";
---
> 		$admtext['PROB'] = "Potvrda testamenta";
> 		$admtext['PROP'] = "Vlasništvo";
187,188c211,212
< 		$admtext['RESI'] = "Prebivalište";
< 		$admtext['RESN'] = "Restriction Notice";
---
> 		$admtext['RESI'] = "Prebivalište";
> 		$admtext['RESN'] = "Obavijest o ograni�enju";
190,199c214,223
< 		$admtext['RFN'] = "Permanent Record Number";
< 		$admtext['SSN'] = "Social Security Number";
< 		$admtext['WILL'] = "Oporuka";
< 		$admtext['ANUL'] = "Annulled";
< 		$admtext['DIVF'] = "Razvod Filed";
< 		$admtext['ENGA'] = "Zaruèen";
< 		$admtext['MARB'] = "Marriage Banns";
< 		$admtext['MARC'] = "Vjenèani ugovor";
< 		$admtext['MARL'] = "Odobrenje za vjenèanje";
< 		$admtext['MARS'] = "Marriage Settlement";
---
> 		$admtext['RFN'] = "Broj trajnog zapisa";
> 		$admtext['SSN'] = "Broj socijalnog osiguranja";
> 		$admtext['WILL'] = "Testament";
> 		$admtext['ANUL'] = "Poništen";
> 		$admtext['DIVF'] = "Podnesen razvod";
> 		$admtext['ENGA'] = "Zaru�en/a";
> 		$admtext['MARB'] = "Vjen�anja Oziv";
> 		$admtext['MARC'] = "Ugovor Vjen�anja";
> 		$admtext['MARL'] = "Dozvola Vjen�anja";
> 		$admtext['MARS'] = "Nagodba Vjen�anja";
202,203c226,227
< 		$admtext['REFN'] = "Broj reference";
< 		$admtext['REPO'] = "Repository";
---
> 		$admtext['REFN'] = "Referentni broj";
> 		$admtext['REPO'] = "Spremište";
205,218c229,240
< 		$admtext['deleteselected'] = "Obriši oznaèeno";
< 		$admtext['ignoreselected'] = "Ignoriraj oznaèeno";
< 		$admtext['acceptselected'] = "Prihvati oznaèeno";
< 		$admtext['changestoallevtypes'] = "Promjene u svim tipovima dogaðaja";
< 		$admtext['forrepos'] = "For Repositories...";
< 		$admtext['noevtypes'] = "Tip dogaðaja ne postoji.";
< 		$admtext['DESI'] = "Descendant Interest";
< 		$admtext['allnone'] = "Unesi display poruku za svaki jezik,<br />ili ostavi sve prazno pa unesi jednu display poruku gore.";
< 		$admtext['assocwith'] = "Asocirano sa";
< 		$admtext['BAPM'] = "Krštenje";
< 		$admtext['umps'] = "Vaša GEDCOM datoteka može biti veæa od maksimalne velièine dozvoljene s ovom PHP instalacijom. Možete pitati vašeg provider-a da poveæa vrijednost 'upload_max_filesize' ili možete kopirati vašu datoteku u 'gedcom' folder-u na vašem site-u i uvesti od tamo.;";
< 		$admtext['othlangs'] = "Ostali jezici";
< 		$admtext['evdata'] = "Event Data";
< 		$admtext['ANCI'] = "Submitter";
---
> 		$admtext['deleteselected'] = "Izbriši odabrano";
> 		$admtext['ignoreselected'] = "Zanemari odabrano";
> 		$admtext['acceptselected'] = "Prihvati ozna�eno";
> 		$admtext['forrepos'] = "Za Spremišta...";
> 		$admtext['noevtypes'] = "Tip događaja ne postoji.";
> 		$admtext['DESI'] = "Potomak Zanimanje";
> 		$admtext['allnone'] = "Unesite prikaznu poruku za svaki jezik, <br /> ili ostavite sve prazno i ​​unesite jednu prikaznu poruku iznad.";
> 		$admtext['assocwith'] = "Povezano s";
> 		$admtext['umps'] = "Vaša GEDCOM datoteka može biti veća od maksimalne veli�ine koju dopušta PHP instalacija. Možete zatražiti od svog davatelja da poveća vrijednost 'upload_max_filesize' ili možete kopirati datoteku u mapu 'gedcom' na vašoj web lokaciji i umjesto nje uvesti nju.";
> 		$admtext['othlangs'] = "Drugi jezici";
> 		$admtext['evdata'] = "Podaci o događajima";
> 		$admtext['ANCI'] = "Predaka Zanimanje";
220,222c242,244
< 		$admtext['collapseev'] = "Collapse Event";
< 		$admtext['collapse'] = "Collapse";
< 		$admtext['collapseselected'] = "Collapse Selected";
---
> 		$admtext['collapseev'] = "Kolaps događaj";
> 		$admtext['collapse'] = "Kolaps";
> 		$admtext['collapseselected'] = "Kolaps odabrano";
224c246
< 		$admtext['expselected'] = "Expand Selected";
---
> 		$admtext['expselected'] = "Proširi odabrano";
226c248,262
< 		$admtext['ldsevent'] = "LDS Event";
---
> 		$admtext['ldsevent'] = "LDS događaj";
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Jeste li sigurni da želite izbrisati ovu vrstu događaja? Svi događaji ove vrste također će se izbrisati.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Dodaj Novu Vrstu";
> 		$admtext['createnewevtype'] = "Stvorite novi zapis tipa atributa ili događaja";
> 		$admtext['modifyeventtype'] = "Uredi Postojeću Vrstu";
> 		$admtext['entertypedesc'] = "Unesite vrstu/opis za ovaj novi atribut ili vrstu događaja.";
> 		$admtext['enterdisplay'] = "Unesite niz za prikaz za ovaj novi atribut ili vrstu događaja.";
> 		$admtext['existingeventtypeinfo'] = "Postojeći podaci o atributu ili vrsti događaja";
> 		$admtext['neweventtypeinfo'] = "Novi atribut ili informacija o vrsti događaja";
> 		$admtext['existingevtypes'] = "Postojeće vrste atributa ili događaja";
> 		$admtext['edsevtypes'] = "Uređivanje, brisanje ili sortiranje prethodno unesenih atributa i vrsta događaja";
> 		$admtext['selectentertag'] = "Odaberite ili unesite oznaku za ovaj atribut ili vrstu događaja.";
> 		$admtext['changestoallevtypes'] = "Promjene svih vrsta atributa ili događaja";
231,244c267,280
< 		$admtext['changestofamily'] = "Promjene u obitelji";
< 		$admtext['marrdate'] = "Datum ženidbe"; //marriage date
< 		$admtext['modifyfamily'] = "Promijeni postojeæu obitelj";
< 		$admtext['selectfamaction'] = "Oznaèi obitelj i akciju";
< 		$admtext['confdeletefam'] = "Da li ste sigurni da želite obrisati ovu obitelj?";
< 		$admtext['existingfamilyinfo'] = "Postojeæa informacija o obitelji";
< 		$admtext['newfamilyinfo'] = "Nova informacija o obitelji";
< 		$admtext['sealedsdate'] = "Sealed S Date (LDS)";     //S is for spouse
< 		$admtext['sealedsplace'] = "Sealed S Place (LDS)";     //S is for spouse
< 		$admtext['newchildren'] = "Novo dijete";
< 		$admtext['addnewfamily'] = "Dodaj novu obitelj";
< 		$admtext['createnewfamily'] = "Kreiraj zapis o novoj obitelji";
< 		$admtext['editexistingfaminfo'] = "Uredi informaciju o prethodno unešenoj obitleji";
< 		$admtext['spousesids'] = "IS supružnika";
---
> 		$admtext['changestofamily'] = "Promjene u Obitelji";
> 		$admtext['marrdate'] = "Datum vjen�anja"; //marriage date
> 		$admtext['modifyfamily'] = "Uredi Postojecu Obitelj";
> 		$admtext['selectfamaction'] = "Odaberite Obitelj i Radnja";
> 		$admtext['confdeletefam'] = "Jeste li sigurni da želite izbrisati ovu Obitelj?";
> 		$admtext['existingfamilyinfo'] = "Postojeće informacije za Obitelj";
> 		$admtext['newfamilyinfo'] = "Nove obiteljske informacije";
> 		$admtext['sealedsdate'] = "Zape�aćeni S Datum (LDS)";     //S is for spouse
> 		$admtext['sealedsplace'] = "Zape�aćeni S Mjesto (LDS)";     //S is for spouse
> 		$admtext['newchildren'] = "Nova dijeca";
> 		$admtext['addnewfamily'] = "Dodaj novu Obitelj";
> 		$admtext['createnewfamily'] = "Stvorite zapis za novu obitelj";
> 		$admtext['editexistingfaminfo'] = "Uredi informaciju o prethodno unešenoj obitleji";
> 		$admtext['spousesids'] = "Supružnika IDs";
246,261c282,297
< 		$admtext['familyidbefevent'] = "Morate unijeti ID obitelji prije dodavanja novog dogaðaja.";
< 		$admtext['prefixfamilyid'] = "Molim vas da stavite prefix \"F\" za \"Family\"";
< 		$admtext['validfamilyid'] = "Molim unestite valjan ID obitelji. Valjan ID ima brojèanu vrijednost s prefiksom 'F'.";
< 		$admtext['familyidbefnote'] = "Morate unijeti ID obitelji prije dodavanja nove zabilješke.";
< 		$admtext['familyidbefcite'] = "Morate unijeti ID obitelji prije korištenja citata sa ovom obitelji.";
< 		$admtext['genfamily'] = "General Family";
< 		$admtext['marriagetype'] = "Tip ženidbe";
< 		$admtext['reviewfamilies'] = "Prihvati ili odbaci privremene promjene u obiteljima";
< 		$admtext['fevslater'] = "Note: Dodatni dogaðaji kao i zabilješke specifiène za dogaðaj i citati mogu biti dodani nakon pohranjivanja podataka nove obitelji.";
< 		$admtext['husbid'] = "Muz ID";  //husband ID
< 		$admtext['wifeid'] = "Zena ID";
< 		$admtext['enternamepart'] = "enter part of first and/or last name";
< 		$admtext['pleasenamepart'] = "Please enter a portion of a first or last name.";
< 		$admtext['clickfind'] = "Click Find or Create =>";
< 		$admtext['chunlinked'] = "Child unlinked from family";
< 		$admtext['child'] = "Child";
---
> 		$admtext['familyidbefevent'] = "Prije dodavanja novih događaja morate unijeti Family ID.";
> 		$admtext['prefixfamilyid'] = "Stavite prefix \"F\" za \"Obitelj\"";
> 		$admtext['validfamilyid'] = "Unesite valjani ID Obitelji. Valjani ID je numeri�ki niz s prefiksom 'F'.";
> 		$admtext['familyidbefnote'] = "Prije dodavanja novih bilješki morate unijeti Obitelj ID";
> 		$admtext['familyidbefcite'] = "Morate unijeti identifikaciju obitelji prije nego što s ovom obitelji možete upotrebljavati navode.";
> 		$admtext['genfamily'] = "Općenito Obitelj";
> 		$admtext['marriagetype'] = "Tip Vjen�anja";
> 		$admtext['reviewfamilies'] = "Prihvatite ili odbacite okvirne promjene u obiteljima";
> 		$admtext['fevslater'] = "NAPOMENA: Djeca i dodatni događaji, kao i bilješke i citati koji se odnose na određene događaje, mogu se dodati na sljedećem zaslonu.";
> 		$admtext['husbid'] = "Otac ID";  //husband ID
> 		$admtext['wifeid'] = "Majka ID";
> 		$admtext['enternamepart'] = "Unesite dio imena oca i/ili majke";
> 		$admtext['pleasenamepart'] = "Molimo unesite dio imena oca ili majke.";
> 		$admtext['clickfind'] = "Kliknite Traži ili Stvori =>";
> 		$admtext['chunlinked'] = "Dijete nije povezano sa obitelji";
> 		$admtext['child'] = "Dijete";
268,272c304,307
< 		$admtext['nobirthinfo'] = "Nema informacija o roðenju";
< 		$admtext['modifyperson'] = "Promijeni postojeæu osobu";
< 		$admtext['selectpersaction'] = "Oznaèi osobu i akciju";
< 		$admtext['existingpersoninfo'] = "Postojeæa informacija o osobi";
< 		$admtext['firstgivennames'] = "Ime";
---
> 		$admtext['modifyperson'] = "Uređivanje postojeće osobe";
> 		$admtext['selectpersaction'] = "Odaberite Osobu i radnju";
> 		$admtext['existingpersoninfo'] = "Postojeće informacije za osobu";
> 		$admtext['firstgivennames'] = "Ime(na)";
275,279c310,314
< 		$admtext['male'] = "Muško";
< 		$admtext['female'] = "Žensko";
< 		$admtext['bapldate'] = "Datum krštenja (LDS)";
< 		$admtext['baplplace'] = "Mjesto krštenja (LDS)";
< 		$admtext['endldate'] = "Endowment Date (LDS)";
---
> 		$admtext['male'] = "Muško";
> 		$admtext['female'] = "Žensko";
> 		$admtext['bapldate'] = "Datum Krštenja (LDS)";
> 		$admtext['baplplace'] = "Mjesto Krštenja (LDS)";
> 		$admtext['endldate'] = "Datum Zadužbine (LDS)";
283c318
< 		$admtext['unlinkindividual'] = "Unlink current individual";
---
> 		$admtext['unlinkindividual'] = "Prekini vezu trenutnog pojedinca";
285,296c320,331
< 		$admtext['sealedpdate'] = "Sealed P Date (LDS)";     //P is for parents
< 		$admtext['sealedpplace'] = "Sealed P Place (LDS)";     //P is for parents
< 		$admtext['asspouse'] = "kao supružnik";
< 		$admtext['spouse'] = "Supruga";
< 		$admtext['ordernumber'] = "Order Number";
< 		$admtext['married'] = "Oženjen";
< 		$admtext['nonewfamily'] = "Ne idi na novu obitelj kod pohranjivanja";
< 		$admtext['addnewperson'] = "Dodaj novu osobu";
< 		$admtext['createperson'] = "Kreiraj zapis za novu osobu";
< 		$admtext['personidbefevent'] = "Morate unijeti ID osobe prije dodavanja novog dogaðaja.";
< 		$admtext['prefixpersonid'] = "Please prefix Person ID with \"I\" for \"Individual\"";
< 		$admtext['validpersonid'] = "Please enter a valid Person ID. A valid ID is a numeric string prefixed with 'I'.";
---
> 		$admtext['sealedpdate'] = "Zape�aćeni datum P (LDS)";     //P is for parents
> 		$admtext['sealedpplace'] = "Zape�aćeno mjesto P (LDS)";     //P is for parents
> 		$admtext['asspouse'] = "kao supružnik";
> 		$admtext['spouse'] = "Suprug/a";
> 		$admtext['ordernumber'] = "Narudžbe broj";
> 		$admtext['married'] = "Oženjen";
> 		$admtext['nonewfamily'] = "Ne idite novoj obitelji na Sa�uvaj";
> 		$admtext['addnewperson'] = "Dodaj Novu Osobu";
> 		$admtext['createperson'] = "Stvorite zapis za novog pojedinca";
> 		$admtext['personidbefevent'] = "Prije dodavanja novih događaja morate unijeti ID osobe.";
> 		$admtext['prefixpersonid'] = "Prefiks ID osobe s \"I\" za \"Osobu\"";
> 		$admtext['validpersonid'] = "Unesite važeći ID osobe. Valjani ID je numeri�ki niz s prefiksom 'I'.";
299,300c334,335
< 		$admtext['shortform'] = "Short Form";
< 		$admtext['editexistingpersoninfo'] = "Uredi informaciju za prethodno unesenu osobu";
---
> 		$admtext['shortform'] = "Kratki oblik";
> 		$admtext['editexistingpersoninfo'] = "Uredi informaciju za prethodno unešenu osobu";
303,316c338,351
< 		$admtext['endlplace'] = "Endowment Place (LDS)";
< 		$admtext['personidbefcite'] = "Morate unijeti ID osobe prije korištenja citata te osobe.";
< 		$admtext['relationship'] = "Relationship";
< 		$admtext['asspouse'] = "kao supružnik";
< 		$admtext['mergepeople'] = "Merge information for duplicate individual records.";
< 		$admtext['choosemerge'] = "Choose individuals to merge or find potential matches";
< 		$admtext['usesoundex'] = "Use Soundex";
< 		$admtext['sdxdisclaimer'] = "Using this option will cause the program to take longer when finding the next match or duplicate.";
< 		$admtext['combinenotes'] = "Combine notes &amp; citations";
< 		$admtext['confirmmerge'] = "Da li želite spojitiove dvije osobe?";
< 		$admtext['gotonewfamily'] = "Go to new family with current individual";
< 		$admtext['genperson'] = "General Individual";
< 		$admtext['reviewpeople'] = "Accept or decline tentative changes to individuals";
< 		$admtext['nokids'] = "Bez djece";
---
> 		$admtext['endlplace'] = "Zape�aćeni mjesto (LDS)";
> 		$admtext['personidbefcite'] = "Morate unijeti ID osobe prije nego što s ovom osobom možete upotrebljavati navode.";
> 		$admtext['relationship'] = "Povezanost";
> 		$admtext['asspouse'] = "kao supružnik";
> 		$admtext['mergepeople'] = "Podaci o spajanju dupliciranih pojedina�nih zapisa.";
> 		$admtext['choosemerge'] = "Odaberite pojedince koji će se spojiti ili pronaći potencijalne podudarnosti";
> 		$admtext['usesoundex'] = "Koristite Soundex";
> 		$admtext['sdxdisclaimer'] = "Upotreba ove opcije uzrokovat će dulje trajanje programa prilikom pronalaska sljedećeg podudaranja ili duplikata.";
> 		$admtext['combinenotes'] = "Kombinirajte bilješke &amp; citata";
> 		$admtext['confirmmerge'] = "Jeste li sigurni da želite spojiti ove dvije osobe?";
> 		$admtext['gotonewfamily'] = "Idite u novu obitelj sa trenutnim pojedincem";
> 		$admtext['genperson'] = "Općeniti pojedinac";
> 		$admtext['reviewpeople'] = "Prihvatite ili odbijte uvjetne promjene pojedincima";
> 		$admtext['nokids'] = "Bez dijece";
319,321c354,356
< 		$admtext['deletingassoc'] = "Obriši asocijaciju...";
< 		$admtext['addingassoc'] = "Dodajem asocijaciju...";
< 		$admtext['updatingassoc'] = "Ažuriranje asocijacije...";
---
> 		$admtext['deletingassoc'] = "Brisanje asocijaciju...";
> 		$admtext['addingassoc'] = "Dodavanje asocijacije...";
> 		$admtext['updatingassoc'] = "Ažuriranje asocijacije...";
323,333c358,366
< 		$admtext['modifyassoc'] = "Modificiraj postojeæu asocijaiju";
< 		$admtext['pevslater'] = "Note: Additional events, as well as event-specific notes and citations,<br />may be added after the new person has been saved.";
< 		$admtext['ashusband'] = "kao muž";
< 		$admtext['aswife'] = "kao žena";
< 		$admtext['pevslater2'] = "Note: Additional events, plus event-specific notes and citations, may be added later.";
< 		$admtext['nospouse'] = "No spouse";
< 		$admtext['revassoc'] = "Also add reverse association for same two people";
< 		$admtext['prefix'] = "Prefix";
< 		$admtext['chkdel'] = "Check empty box to delete item at left";
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
---
> 		$admtext['modifyassoc'] = "Uredi postojeću asocijaiju";
> 		$admtext['pevslater'] = "NAPOMENA: Na sljedećem zaslonu mogu se dodati dodatni događaji, dodaci i citati koji se odnose na određene događaje.";
> 		$admtext['ashusband'] = "kao otac";
> 		$admtext['aswife'] = "kao majka";
> 		$admtext['pevslater2'] = "NAPOMENA: Dodatni događaji, dodaci i citati koji se odnose na određene događaje, mogu se dodati kasnije.";
> 		$admtext['nospouse'] = "Nema supružnika";
> 		$admtext['revassoc'] = "Dodajte i obrnuto povezivanje za iste dvije osobe";
> 		$admtext['prefix'] = "Prefks";
> 		$admtext['chkdel'] = "Ozna�ite prazan okvir za brisanje predmeta na lijevoj strani";
335,338c368,376
< 		$admtext['confdate'] = "Confirmation Date (LDS)";
< 		$admtext['confplace'] = "Confirmation Place (LDS)";
< 		$admtext['initdate'] = "Initiatory Date (LDS)";
< 		$admtext['initplace'] = "Initiatory Place (LDS)";
---
> 		$admtext['confdate'] = "Datum potvrde (LDS)";
> 		$admtext['confplace'] = "Mjesto potvrde (LDS)";
> 		$admtext['initdate'] = "Datum inicijative (LDS)";
> 		$admtext['initplace'] = "Mjesto inicijative (LDS)";
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Sa�uvaj + Novi Roditelji";
> 		$admtext['savenewspouse'] = "Sa�uvaj + Novi Suprug";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alternativno rođenje";
344,345c382,383
< 		$admtext['thumbnailnotcopied'] = "Thumbnail datoteka ne može biti kopirana u";
< 		$admtext['photo'] = "Photo";
---
> 		$admtext['thumbnailnotcopied'] = "Datoteka s sli�icama nije uspjela kopirati u";
> 		$admtext['photo'] = "Slika";
347c385
< 		$admtext['modifyphoto'] = "Modificiraj postojeæu forografiju";
---
> 		$admtext['modifyphoto'] = "Uredi postojecu forografiju";
349,355c387,392
< 		$admtext['selectphotoaction'] = "Oznaèi fotografiju i akciju";
< 		$admtext['photoid'] = "Photo ID";
< 		$admtext['confdeletephoto'] = "Da li ste sigurni da želite obrisati ovu fotografiju i sve linkove asocirani s njom?";
< 		$admtext['enterphotopath'] = "Molim unesite stazu (folder i ime datoteke) od foto datoteke unutar photos foldera na vašem web serveru.";
< 		$admtext['enterthumbnailpath'] = "Molim unesite stazu (folder i ime datoteke) thumbnail-a unutar photos foldera na vašem web serveru.";
< 		$admtext['enterphotodesc'] = "Molim unesite opis  slike.";
< 		$admtext['existingphotoinfo'] = "Postojeæa foto Informacija";
---
> 		$admtext['selectphotoaction'] = "Odaberite fotografiju i radnju";
> 		$admtext['photoid'] = "Fotografije ID";
> 		$admtext['confdeletephoto'] = "Jeste li sigurni da želite izbrisati ovu fotografiju i sve veze povezane s njom?";
> 		$admtext['enterphotopath'] = "Unesite put (mapa i naziv datoteke) slikovne datoteke u mapu fotografija na vašem web poslužitelju.";
> 		$admtext['enterthumbnailpath'] = "Unesite put (mapa i naziv datoteke) datoteke sa sli�icama unutar mape fotografija na vašem web poslužitelju.";
> 		$admtext['existingphotoinfo'] = "Informacija postojeće fotografije";
357c394
< 		$admtext['thumbnailfile'] = "Thumbnail Image File";
---
> 		$admtext['thumbnailfile'] = "Datoteka slike s umanjenim sli�icama";
359c396
< 		$admtext['fileandpath'] = "File and Path Name";
---
> 		$admtext['fileandpath'] = "Naziv datoteke i putanje";
362,415c399,451
< 		$admtext['editexistingphotoinfo'] = "Uredi informaciju prethodno unešene fotografije";
< 		$admtext['leaveblankallphotos'] = "ostavi prazno za prikaz svih fotografija";
< 		$admtext['headstone'] = "Nadgrobni spomenik";
< 		$admtext['imagenotcopied'] = "The image file could not be copied to";
< 		$admtext['changestohs'] = "Promjene na nadgrobnom spomeniku";
< 		$admtext['modifyheadstone'] = "Promijeni postojeæi nadgrobni spomenik";
< 		$admtext['selecthsaction'] = "Oznaèi nadgrobni spomenik i akciju";
< 		$admtext['confdeletehs'] = "Da li ste sigurni da želite obrisati ovaj nadgrobni spomenik?";
< 		$admtext['photostatus'] = "Photo/Status";
< 		$admtext['selectcemetery'] = "Molim selektiraj groblje.";
< 		$admtext['enterhsimage'] = "Please enter a file name for your headstone image on the web server.";
< 		$admtext['existinghsinfo'] = "Existing Headstone Information";
< 		$admtext['newhsinfo'] = "New Headstone Information";
< 		$admtext['hsimagefile'] = "Headstone Image File";
< 		$admtext['located'] = "Located";
< 		$admtext['notyetlocated'] = "Not yet located";
< 		$admtext['unmarked'] = "Unmarked";
< 		$admtext['missing'] = "Missing";
< 		$admtext['leaveblankhs'] = "Leave this field blank if the file has already been uploaded to your headstones folder.";
< 		$admtext['requiredhs'] = "Required. This should correspond to the name and location of your file <em>within the headstones folder</em> once the file is uploaded. For example, if your headstones folder is called <em>photos/headstones</em>, and you want your file to be called <em>headstone.jpg</em> and go in a subfolder of photos/headstones called <em>newheadstones</em>, you would enter <em>newheadstones/headstone.jpg</em> in this field.";
< 		$admtext['addnewhs'] = "Add New Headstone";
< 		$admtext['createnewhs'] = "Create a record for a new headstone and link it to an individual";
< 		$admtext['editexistinghsinfo'] = "Edit information for a previously entered headstone";
< 		$admtext['leaveblankallhs'] = "leave blank to show all headstones";
< 		$admtext['cemnamelocation'] = "Cemetery Name or Location";
< 		$admtext['pedphoto'] = "Use this photo on pedigree charts and in name titles";
< 		$admtext['photoowner'] = "Owner/Source";
< 		$admtext['dimensions'] = "Dimensions";
< 		$admtext['selectphoto'] = "Select Image";
< 		$admtext['specifyimg'] = "Specify image";
< 		$admtext['autoimg'] = "Create from original";
< 		$admtext['enterthumbpath'] = "Please enter a destination name for your thumbnail image";
< 		$admtext['genthumbs'] = "Generate Thumbnails";
< 		$admtext['genthumbsdesc'] = "Automatically generate smaller versions of all photos without existing thumbnails.";
< 		$admtext['thumbsgenerated'] = "Thumbnails generated";
< 		$admtext['makedefault'] = "Make Default";
< 		$admtext['filewithinhs'] = "Path within headstones folder <br/>(subfolder and file name)";
< 		$admtext['recsupdated'] = "Records updated";
< 		$admtext['removedef'] = "Remove default photo";
< 		$admtext['numlinkhs'] = "Number of people to link to this headstone";
< 		$admtext['sortheadstones'] = "Sort Headstones";
< 		$admtext['sortheadstonesfor'] = "Sort Headstones for";
< 		$admtext['sortheadstonesind'] = "Sort Headstones for an Individual";
< 		$admtext['headstoneorder'] = "Indicate a desired order for the headstones linked to a specific individual";
< 		$admtext['enternumberforphoto'] = "Enter a numeric value for each item.";
< 		$admtext['updownforphoto'] = "Click the up and down arrows to move items up or down in the order.";
< 		$admtext['createnewphoto'] = "Create a record for a new photo and link it to individuals, families or sources";
< 		$admtext['numlinkphoto'] = "Number of people, families or sources to link to this photo";
< 		$admtext['photoorder'] = "Indicate a desired order for the photos linked to a specific individual, family or source";
< 		$admtext['assigndefs'] = "Assign Default Photos";
< 		$admtext['assigndefsdesc'] = "Make first photo for each individual, family and source be that entity's default photo.";
< 		$admtext['overwritedefs'] = "Overwrite existing defaults";
< 		$admtext['assign'] = "Assign Defaults";
< 		$admtext['defsassigned'] = "Default photos assigned";
---
> 		$admtext['editexistingphotoinfo'] = "Uredite podatke za prethodno unesenu fotografiju";
> 		$admtext['leaveblankallphotos'] = "ostavite prazno da biste prikazali sve fotografije";
> 		$admtext['headstone'] = "Nadgrobni Spomenik";
> 		$admtext['imagenotcopied'] = "Datoteku slike nije moguće kopirati u";
> 		$admtext['changestohs'] = "Promjene na spomeniku";
> 		$admtext['modifyheadstone'] = "Uredi postojećeg spomenika";
> 		$admtext['selecthsaction'] = "Odaberite spomenik i radnju";
> 		$admtext['confdeletehs'] = "Jeste li sigurni da želite izbrisati taj spomenik?";
> 		$admtext['photostatus'] = "Fotografija/Status";
> 		$admtext['selectcemetery'] = "Odaberite groblje.";
> 		$admtext['enterhsimage'] = "Unesite naziv datoteke za spomenike na web poslužitelju.";
> 		$admtext['existinghsinfo'] = "Postojeće informacije o spomeniku";
> 		$admtext['newhsinfo'] = "Nove informacije o spomeniku";
> 		$admtext['hsimagefile'] = "Datoteka slike spomenika";
> 		$admtext['located'] = "Smješten";
> 		$admtext['notyetlocated'] = "Još se ne nalazi";
> 		$admtext['unmarked'] = "Neobilježen";
> 		$admtext['missing'] = "Nedostaje";
> 		$admtext['leaveblankhs'] = "Ostavite ovo polje prazno ako je datoteka već prenesena u mapu spomenika.";
> 		$admtext['requiredhs'] = "POTREBNO: Ovo bi trebalo odgovarati imenu i lokaciji vaše datoteke <em>unutar mape spomenika</em> nakon prijenosa datoteke. Na primjer, ako se vaša datoteke mapa spomenika zove <em>fotografije/spomenici</em>, a želite da se vaša datoteka zove <em>spomenik.jpg </em> i upišete se u podmapu fotografija/spomenika nazvanu <em >novispomeniki</em>, u ovo polje biste unijeli <em> novispomeniki/spomenik.jpg </em>.";
> 		$admtext['addnewhs'] = "Dodaj novi spomenik";
> 		$admtext['createnewhs'] = "Stvori zapis za novi spomenik i poveži ga s pojedincem";
> 		$admtext['editexistinghsinfo'] = "Uredi podatke za prethodno upisani spomenik";
> 		$admtext['leaveblankallhs'] = "ostavite prazno da biste pokazali sve spomenike";
> 		$admtext['cemnamelocation'] = "Naziv groblja ili mjesto groblja";
> 		$admtext['pedphoto'] = "Upotrijebite ovu fotografiju na pedigree kartama i u nazivima";
> 		$admtext['dimensions'] = "Dimenzije";
> 		$admtext['selectphoto'] = "Odaberite Sliku";
> 		$admtext['specifyimg'] = "Navedite sliku";
> 		$admtext['autoimg'] = "Stvorite od originala";
> 		$admtext['enterthumbpath'] = "Unesite odredišno ime za svoju sli�icu";
> 		$admtext['genthumbs'] = "Stvaranje sli�ica";
> 		$admtext['genthumbsdesc'] = "Automatski generirajte manje verzije svih fotografija bez postojećih sli�ica.";
> 		$admtext['thumbsgenerated'] = "Generirane sli�ice";
> 		$admtext['makedefault'] = "Napraviti zadani";
> 		$admtext['filewithinhs'] = "Put unutar mape spomenika <br/> (podmapa i naziv datoteke)";
> 		$admtext['recsupdated'] = "Zapisi su ažurirani";
> 		$admtext['removedef'] = "Ukloni zadanu fotografiju";
> 		$admtext['numlinkhs'] = "Broj ljudi koji se vezuju za ovaj spomenik";
> 		$admtext['sortheadstones'] = "Poredaj spomenike";
> 		$admtext['sortheadstonesfor'] = "Poredaj spomenike za";
> 		$admtext['sortheadstonesind'] = "Poredaj spomenike za pojedinca";
> 		$admtext['headstoneorder'] = "Navedite željeni redoslijed za spomenike vezane za određenu osobu";
> 		$admtext['enternumberforphoto'] = "Unesi broj�anu vrijednost za svaku stavku.";
> 		$admtext['updownforphoto'] = "Kliknite strelice gore i dolje da biste stavke premjestili gore ili dolje u redoslijedu.";
> 		$admtext['createnewphoto'] = "Stvorite zapis za novu fotografiju i povežite je s pojedincima, obiteljima ili izvorima";
> 		$admtext['numlinkphoto'] = "Broj ljudi, obitelji ili izvora koji mogu povezati na ovu fotografiju";
> 		$admtext['photoorder'] = "Navedite željenu narudžbu za fotografije povezane s određenom osobom, obitelji ili izvorom";
> 		$admtext['assigndefs'] = "Dodijelite zadane fotografije";
> 		$admtext['assigndefsdesc'] = "Napravite prvu fotografiju za svakog pojedinca, obitelj i izvor kao zadanu fotografiju tog entiteta.";
> 		$admtext['overwritedefs'] = "Prepišite postojeće zadane postavke";
> 		$admtext['assign'] = "Dodijeli zadane";
> 		$admtext['defsassigned'] = "Dodijeljene zadane fotografije";
417,421c453,456
< 		$admtext['imgmap'] = "Image Map";
< 		$admtext['circle'] = "circle";
< 		$admtext['rect'] = "rectangle";
< 		$admtext['poly'] = "polygon";
< 		$admtext['shape'] = "Shape of region";
---
> 		$admtext['circle'] = "krug";
> 		$admtext['rect'] = "pravokutnik";
> 		$admtext['poly'] = "poligon";
> 		$admtext['shape'] = "Oblik regije";
423,427c458,462
< 		$admtext['width'] = "Width (pixels)";
< 		$admtext['height'] = "Height (pixels)";
< 		$admtext['imgdim'] = "Image dimensions";
< 		$admtext['pixw'] = "pixels wide";
< 		$admtext['pixh'] = "pixels high";
---
> 		$admtext['width'] = "Å irina (piksela)";
> 		$admtext['height'] = "Visina (piksela)";
> 		$admtext['imgdim'] = "Slike dimenzije";
> 		$admtext['pixw'] = "pixela Å¡iroko";
> 		$admtext['pixh'] = "pixela visoko";
431,553c466,580
< 		$admtext['changestoallphotos'] = "Changes to all selected photos";
< 		$admtext['changestoallhs'] = "Changes to all selected headstones";
< 		$admtext['datetaken'] = "Date Taken/Created";
< 		$admtext['placetaken'] = "Place Taken/Created";
< 		$admtext['abspath'] = "This media comes from an external source (you must supply your own thumbnail)";
< 		$admtext['imagefile'] = "Media File";
< 		$admtext['pathwithinphotos'] = "File name on site";
< 		$admtext['linktocem'] = "Link this media directly to the selected cemetery";
< 		$admtext['defphotonote'] = "Use the thumbnail to identify this person, family or source on pedigree and other charts, including family group sheets.";
< 		$admtext['photonotadded'] = "The item could not be added, most likely because another media record already exists for the collection and physical file specified.";
< 		$admtext['requiredphoto'] = "Required. This should correspond to the name and location of your file <em>within the collection folder</em> once the file is uploaded. For example, suppose you are uploading a photo and your photos folder is called <em>photos</em>. If you want your file to be called <em>myphoto.jpg</em> and go in a subfolder of photos called <em>newphotos</em>, you would enter <em>newphotos/myphoto.jpg</em> in this field.";
< 		$admtext['leaveblankphoto'] = "Leave this field blank if the file has already been uploaded.";
< 		$admtext['thumbconflicts'] = "Thumbnails not generated due to path, permissions, size or file name problems";
< 		$admtext['showmap'] = "Show cemetery map and media whenever this item is displayed";
< 		$admtext['bodytext'] = "<strong>OR</strong><br/>Body Text";
< 		$admtext['usenl'] = "Convert line breaks to HTML on display";
< 		$admtext['newwin'] = "Open in new window";
< 		$admtext['modifymedia'] = "Modify Existing Media";
< 		$admtext['addnewmedia'] = "Add New Media";
< 		$admtext['confdeletemedia'] = "Are you sure you want to delete this media?";
< 		$admtext['thumbnails'] = "Thumbnails";
< 		$admtext['modifyalbum'] = "Modify Existing Album";
< 		$admtext['addnewalbum'] = "Add New Album";
< 		$admtext['newalbuminfo'] = "New Album Information";
< 		$admtext['confdeletealbum'] = "Are you sure you want to delete this album?";
< 		$admtext['enteralbumname'] = "Please enter an album name.";
< 		$admtext['albumname'] = "Album Name";
< 		$admtext['keywords'] = "Keywords";
< 		$admtext['changestoalbum'] = "Changes to album";
< 		$admtext['addtoalbum'] = "Add to Album";
< 		$admtext['mediatype'] = "Collection";
< 		$admtext['fileext'] = "File ext."; //file extension (abbreviation)
< 		$admtext['anotherlink'] = "Add Another Link";
< 		$admtext['mediaurl'] = "Media URL";
< 		$admtext['put_in'] = "Store files in";
< 		$admtext['usemedia'] = "Multimedia Folder";
< 		$admtext['usecollect'] = "Collection Folder (e.g., \"photos\")";
< 		$admtext['notcopied'] = "The file could not be copied to";
< 		$admtext['existingmediainfo'] = "Existing Media Information";
< 		$admtext['convto'] = "Convert Selected to";
< 		$admtext['changestoallmedia'] = "Changes to all selected media";
< 		$admtext['changestoitem'] = "Changes to item";
< 		$admtext['eventlink'] = "Link to specific event";
< 		$admtext['sortmediaind'] = "Sort Media for an Individual, Family, Source, Repository or Place";
< 		$admtext['sortmedia'] = "Sort xxx for";
< 		$admtext['unlinked'] = "Unlinked only";
< 		$admtext['samepaths'] = "The principal image and the thumbnail image may not be the same file. Please select a different thumbnail image, or have one created for you.";
< 		$admtext['regenerate'] = "Regenerate existing thumbnails";
< 		$admtext['forcircles'] = "For circles";
< 		$admtext['forrects'] = "For rectangles";
< 		$admtext['circleinstr'] = "First click in the center of the circle, then click anywhere on the outside of the circle.";
< 		$admtext['rectinstr'] = "First click in the upper left corner of the rectangle, then click in the lower right corner.";
< 		$admtext['firstone'] = "first one";
< 		$admtext['controller'] = "Please allow about 16 vertical pixels for the media player controller.";
< 		$admtext['nostatus'] = "No status";
< 		$admtext['enterid'] = "Please enter an ID.";
< 		$admtext['existingalbuminfo'] = "Existing Album Information";
< 		$admtext['newmediainfo'] = "New Media Information";
< 		$admtext['mapinstr2'] = "Link regions of your image to different people or other pages (optional) by entering the HTML image map information below, or by following the instructions near the photo below.";
< 		$admtext['mapinstr3'] = "To link a region of this photo to a specific individual, select the individual's tree, pick a shape and dimensions for the region, then click the center of that region on the photo. A popup window will help you select the individual. After the selection is made, code for the image map will be added to the box above. Repeat this process as needed for additional regions.";
< 		$admtext['albumlinks'] = "Album Links";
< 		$admtext['duplinkmsg'] = "A link to the selected entity already exists in this album.";
< 		$admtext['invlinkmsg'] = "The entity ID you entered is invalid. No link was created.";
< 		$admtext['albmedia'] = "Album Media";
< 		$admtext['removelink'] = "Remove Link";
< 		$admtext['confremmedia'] = "Are you sure you want to remove this media from this album?";
< 		$admtext['selmedia'] = "Search for existing media to include in this album";
< 		$admtext['uploadfirst'] = "upload new media here first";
< 		$admtext['existmedia'] = "Existing Media";
< 		$admtext['emoptions'] = "Browse, Delete or Drag to Sort";
< 		$admtext['addlinks'] = "Add New Links";
< 		$admtext['eloptions'] = "Browse or Delete";
< 		$admtext['inclmsg'] = " included";
< 		$admtext['mediasubt'] = "Manage media included in this album (Add, Delete, Sort)";
< 		$admtext['infosubt'] = "Edit album name, description and keywords";
< 		$admtext['linkssubt'] = "Link this item to People, Families, Sources, Repositories or Places";
< 		$admtext['inclmedia'] = "Included Media";
< 		$admtext['nomedia'] = "No media included yet";
< 		$admtext['nolinks'] = "No links exist yet";
< 		$admtext['thumbsize'] = "(original is too large)";
< 		$admtext['thumbinv'] = "(invalid image or inadequate permissions)";
< 		$admtext['thumblost'] = "(original not found)";
< 		$admtext['uplsel'] = "Upload a new file from your computer, or select from files already on your site";
< 		$admtext['alblater'] = "Note: Media may be added to this album, and the album linked to individuals or families, on the next screen.";
< 		$admtext['medlater'] = "Note: More information may be added, and the item linked to individuals or families, on the next screen.";
< 		$admtext['minfosubt'] = "Edit media title, description and other basic details";
< 		$admtext['defphoto'] = "Default Photo";
< 		$admtext['alttd'] = "Alt Title/Desc";   //short abbreviation for "Alternate Title or Description"
< 		$admtext['editmedialink'] = "Edit Media Link";
< 		$admtext['plot'] = "Plot";
< 		$admtext['addnewcoll'] = "Add Collection";
< 		$admtext['collid'] = "Collection ID";
< 		$admtext['colldisplay'] = "Display Title";
< 		$admtext['collpath'] = "Folder Name";
< 		$admtext['collicon'] = "Icon File";
< 		$admtext['colllike'] = "Same setup as";
< 		$admtext['entercollid'] = "Please enter a collection ID.";
< 		$admtext['entercolldisplay'] = "Please enter a collection display name.";
< 		$admtext['entercollpath'] = "Please enter a collection folder name.";
< 		$admtext['entercollicon'] = "Please enter a collection icon file name.";
< 		$admtext['editcoll'] = "Edit Collection";
< 		$admtext['confmtdelete'] = "Are you sure you want to delete this media type?";
< 		$admtext['histlimit'] = "<strong>Size note:</strong> Most browsers limit the amount of data that can be sent in a web form to about 64Kb. If you have a large amount of text to type or paste in the Body Text field above, you might consider using historytemplate.php instead. See the Help for more information.";
< 		$admtext['repath'] = "Regenerate thumbnail path names where file does not exist";
< 		$admtext['sortalbumind'] = "Sort Albums for an Individual, Family, Source, Repository or Place";
< 		$admtext['cidexists'] = "The Collection ID you entered could not be added because it already exists.";
< 		$admtext['phalltrees'] = "Optional. Leave blank to allow photos to be visible in all trees.";
< 		//added in 8.0.0
< 		$admtext['fileexists'] = "This file already exists. Overwrite?";
< 		$admtext['collthumb'] = "Thumbnail File";
< 		$admtext['movetop'] = "Move to top";
< 		//added in 9.0.0
< 		$admtext['collexpas'] = "Export as";
< 		//added in 9.2.0
< 		$admtext['upload'] = "Upload";
< 		$admtext['linksel'] = "Link to selected";
< 		$admtext['mediaupl'] = "Upload Media";
< 		$admtext['addfiles'] = "Add files...";
< 		$admtext['startupl'] = "Start upload";
< 		$admtext['start'] = "Start";
< 		$admtext['cancelupl'] = "Cancel upload";
< 		//added in 11.0.0
< 		$admtext['localpath'] = "Local path(s)";
---
> 		$admtext['changestoallphotos'] = "Promjene svih odabranih fotografija";
> 		$admtext['changestoallhs'] = "Promjene svih odabranih spomenika";
> 		$admtext['datetaken'] = "Datum snimanja/kreiranja";
> 		$admtext['placetaken'] = "Mjesto snimanja/kreiranja";
> 		$admtext['abspath'] = "Ovaj medij dolazi iz vanjskog izvora (morate dostaviti svoju sli�icu)";
> 		$admtext['imagefile'] = "Medije Datoteka";
> 		$admtext['pathwithinphotos'] = "Naziv datoteke na web mjestu";
> 		$admtext['linktocem'] = "Povežite ovu mediju izravno na odabrano groblje";
> 		$admtext['defphotonote'] = "Upotrijebite sli�icu da biste identificirali ovu osobu, obitelj ili izvor na rodovnici i drugim kartama, uklju�ujući popise obiteljskih skupina.";
> 		$admtext['photonotadded'] = "Stavka se ne može dodati, najvjerojatnije jer već postoji drugi medijski zapis za navedenu zbirku i fizi�ku datoteku.";
> 		$admtext['requiredphoto'] = "POTREBNO. Ovo bi trebalo odgovarati imenu i lokaciji vaše datoteke <em>unutar mape za prikupljanje</em> nakon prijenosa datoteke. Na primjer, pretpostavimo da prenosite fotografiju, a mapa s fotografijama naziva se <em>slike</em>. Ako želite da se vaša datoteka zove <em>mojaslika.jpg </em> i upišete se u podmapu fotografija pod nazivom <em>noveslike</em>, unijeli biste <em>noveslike/mojaslika.jpg</em> u ovom polju.";
> 		$admtext['leaveblankphoto'] = "Ostavite ovo polje prazno ako je datoteka već prenesena.";
> 		$admtext['thumbconflicts'] = "sli�icu se ne generiraju zbog problema s putom, dozvolama, veli�inom ili nazivom datoteke";
> 		$admtext['showmap'] = "Prikaži kartu groblja i medije kad god se ovaj predmet prikaže";
> 		$admtext['bodytext'] = "<strong>ILI</strong><br/>Body Text";
> 		$admtext['usenl'] = "Pretvori prijelome redaka u HTML na zaslonu";
> 		$admtext['newwin'] = "Otvori u novom prozoru";
> 		$admtext['modifymedia'] = "Uredi postojećih medija";
> 		$admtext['addnewmedia'] = "Dodaj nove medije";
> 		$admtext['confdeletemedia'] = "Jeste li sigurni da želite izbrisati ovaj medij?";
> 		$admtext['thumbnails'] = "Sli�ice";
> 		$admtext['modifyalbum'] = "Uredi postojećeg albuma";
> 		$admtext['addnewalbum'] = "Dodaaj novi Album";
> 		$admtext['newalbuminfo'] = "Informacije o Novom Albumu";
> 		$admtext['confdeletealbum'] = "Jeste li sigurni da želite izbrisati ovaj album?";
> 		$admtext['enteralbumname'] = "Unesite naziv albuma.";
> 		$admtext['albumname'] = "Albuma Ime";
> 		$admtext['keywords'] = "Klju�ne rije�i";
> 		$admtext['changestoalbum'] = "Promjene u albumu";
> 		$admtext['addtoalbum'] = "Dodaj Albumu";
> 		$admtext['mediatype'] = "Kolekcija";
> 		$admtext['fileext'] = "Datote�ni nastavak"; //file extension (abbreviation)
> 		$admtext['anotherlink'] = "Dodajte još jednu vezu";
> 		$admtext['mediaurl'] = "Medije URL";
> 		$admtext['put_in'] = "Sa�uvaj datoteke u";
> 		$admtext['usemedia'] = "Multimedijska Mapa";
> 		$admtext['usecollect'] = "Kolekcija Mapa (npr., \"slike\")";
> 		$admtext['notcopied'] = "Datoteka se ne može kopirati u";
> 		$admtext['existingmediainfo'] = "Postojeće informacije o medijima";
> 		$admtext['convto'] = "Pretvori odabrano u";
> 		$admtext['changestoallmedia'] = "Promjene na svim odabranim medijima";
> 		$admtext['changestoitem'] = "Promjene stavke";
> 		$admtext['eventlink'] = "Link na određeni događaj";
> 		$admtext['sortmediaind'] = "Poredaj Medije za Pojedinca, Obitelj, Izvor, Spremište ili Mjesto";
> 		$admtext['sortmedia'] = "Proedaj xxx za";
> 		$admtext['unlinked'] = "Samo nepovezano";
> 		$admtext['samepaths'] = "Glavna slika i sli�ica možda nisu iste datoteke. Odaberite drugu sli�icu ili je stvorite za vas.";
> 		$admtext['regenerate'] = "Obnovite postojeće sli�ice";
> 		$admtext['forcircles'] = "Za krugove";
> 		$admtext['forrects'] = "Za pravokutnike";
> 		$admtext['circleinstr'] = "Prvo kliknite u sredini kruga, a zatim bilo gdje na vanjskoj strani kruga.";
> 		$admtext['rectinstr'] = "Prvo kliknite u gornji lijevi kut pravokutnika, a zatim kliknite u donji desni kut.";
> 		$admtext['firstone'] = "prvi";
> 		$admtext['controller'] = "Molimo dopustite oko 16 okomitih piksela za kontroler medija playera.";
> 		$admtext['nostatus'] = "Nema statusa";
> 		$admtext['enterid'] = "Unesite ID za odabranu vrstu veze.";
> 		$admtext['existingalbuminfo'] = "Albuma Informacije";
> 		$admtext['newmediainfo'] = "Nova Informacije Medije";
> 		$admtext['mapinstr2'] = "Povežite regije svoje slike s drugim ljudima ili drugim stranicama (izborno)";
> 		$admtext['albumlinks'] = "Linkovi Albuma";
> 		$admtext['duplinkmsg'] = "Veza u odabranom entitetu već postoji u ovom albumu.";
> 		$admtext['invlinkmsg'] = "ID entiteta koji ste unijeli nije važeći. Nije stvorena veza.";
> 		$admtext['albmedia'] = "Album Medije";
> 		$admtext['confremmedia'] = "Jeste li sigurni da želite ukloniti ovaj medij iz ovog albuma?";
> 		$admtext['selmedia'] = "Potražite postojeće medije koje biste uklju�ili u ovaj album";
> 		$admtext['uploadfirst'] = "ovdje prvo prenesite nove medije";
> 		$admtext['existmedia'] = "Postojeća medija";
> 		$admtext['emoptions'] = "Pregledajte, Izbrišite ili Prevucite za Sortiranje";
> 		$admtext['addlinks'] = "Dodah nove Linkove";
> 		$admtext['inclmsg'] = " uklju�en";
> 		$admtext['mediasubt'] = "Upravljanje medijima uklju�enim u ovaj album (Dodaj, Briši, Sortiraj)";
> 		$admtext['infosubt'] = "Uredite naziv albuma, opis i klju�ne rije�i";
> 		$admtext['linkssubt'] = "Povežite ovu stavku s ljudima, obiteljima, izvorima, spremištima ili mjestima";
> 		$admtext['inclmedia'] = "Uklju�ena Medija";
> 		$admtext['nomedia'] = "Još nije uklju�en nijedan medija";
> 		$admtext['thumbsize'] = "(original je prevelik)";
> 		$admtext['thumbinv'] = "(nevažeća slika ili neadekvatna dopuštenja)";
> 		$admtext['thumblost'] = "(original nije pronađen)";
> 		$admtext['uplsel'] = "Prenesite novu datoteku s ra�unala ili odaberite datoteke iz vaše web lokacije";
> 		$admtext['alblater'] = "NAPOMENA: Ovom albumu mogu se dodati mediji, a album na pojedina�ne obitelji ili obitelji na sljedećem zaslonu.";
> 		$admtext['medlater'] = "NAPOMENA: Na sljedećem se zaslonu mogu dodati dodatne informacije i stavke povezane s pojedincima ili obiteljima.";
> 		$admtext['minfosubt'] = "Uredi naslova, opisa i drugih osnovnih podataka";
> 		$admtext['defphoto'] = "Zadana fotografija";
> 		$admtext['alttd'] = "Skraćena kratica za Zamjenski naslov ili Opis";   //short abbreviation for "Alternate Title or Description"
> 		$admtext['editmedialink'] = "Uredi vezu Madije";
> 		$admtext['plot'] = "Zavjera";
> 		$admtext['addnewcoll'] = "Dodaj Kolekciju";
> 		$admtext['collid'] = "Kolekcije ID";
> 		$admtext['colldisplay'] = "Prikaz Naslova";
> 		$admtext['collpath'] = "Ime datoteke";
> 		$admtext['collicon'] = "Datoteka ikona";
> 		$admtext['colllike'] = "Ista postava kao";
> 		$admtext['entercollid'] = "Unesite ID kolekcije.";
> 		$admtext['entercolldisplay'] = "Unesite prikazno ime zbirke.";
> 		$admtext['entercollpath'] = "Unesite naziv mape zbirke.";
> 		$admtext['entercollicon'] = "Unesite naziv datoteke ikone zbirke.";
> 		$admtext['editcoll'] = "Uredi Kolekciju";
> 		$admtext['confmtdelete'] = "Jeste li sigurni da želite izbrisati ovu vrstu medija?";
> 		$admtext['histlimit'] = "<strong>NAPOMENA o VELIČINI:</strong> Većina preglednika ograni�ava koli�inu podataka koja se može poslati u web obliku na oko 64Kb. Ako u polje za tekst teksta unesete veliku koli�inu teksta, možete razmisliti o tome da upotrebite historytemplate.php. Dodatne informacije potražite u pomoći.";
> 		$admtext['repath'] = "Regenerirajte nazive staza sli�ica tamo gdje datoteka ne postoji";
> 		$admtext['sortalbumind'] = "Poredajte albume za Pojedinca, Obitelj, Izvor, Spremište ili Mjesto";
> 		$admtext['cidexists'] = "ID kolekcije koji ste unijeli nije bilo moguće dodati jer on već postoji.";
> 		$admtext['phalltrees'] = "Opcijski. Ostavite prazno kako bi fotografije mogle biti vidljive na svim stablima.";
> 		$admtext['fileexists'] = "Ova datoteka već postoji. Prepiši?";
> 		$admtext['collthumb'] = "Datoteka sli�ica";
> 		$admtext['movetop'] = "Pomica0e na vrh";
> 		$admtext['collexpas'] = "Izvoz kao";
> 		$admtext['upload'] = "Prenosit";
> 		$admtext['linksel'] = "Veza do odabranog";
> 		$admtext['mediaupl'] = "Prenosite Mediju";
> 		$admtext['addfiles'] = "Dodaj datoteke...";
> 		$admtext['startupl'] = "Po�etak prenosit";
> 		$admtext['start'] = "Po�etak";
> 		$admtext['cancelupl'] = "Odustani prenosit";
> 		$admtext['localpath'] = "Lokalni put(ovi)";
555c582,593
< 		$admtext['confdelmediafile'] = "Do you want to delete the physical file as well?";
---
> 		$admtext['confdelmediafile'] = "Želite li izbrisati i fizi�ku datoteku?";
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML slikovna karta (za nazadnu kompatibilnost)";
> 		$admtext['photoowner'] = "Vlasnik originala";
> 		$admtext['nothumb'] = "Nema sli�ica";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Stavku nije bilo moguće dodati, najvjerojatnije zato što je datoteka bila prevelika i nije se mogla prenijeti ili upotrijebiti za izradu minijature.";
> 		$admtext['moved'] = "Pomaknuto";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Unesite naslov ili opis za ovaj medij.";
> 		$admtext['mapinstr3'] = "Da biste povezali podru�je ove fotografije s osobom, obitelji ili drugim entitetom, prvo odaberite relevantno stablo i vrstu entiteta, a zatim izradite pravokutnik za željeno podru�je. To se radi klikom na gornji lijevi kut regije i zatim povla�enjem u donji desni kut. Alternativno, možete kliknuti u gornjem lijevom kutu, a zatim ponovno u donjem desnom kutu. Sko�ni okvir će vam tada pomoći da odaberete osobu ili drugi entitet. Odaberite, a zatim ponovite ovaj postupak prema potrebi za dodatne regije. Pritisnite postojeću regiju za odabir, zatim povucite za premještanje ili kliknite 'X' za brisanje.";
560,578c598,616
< 		$admtext['changestoreport'] = "Changes to report";
< 		$admtext['modifyreport'] = "Modify Existing Report";
< 		$admtext['existingreportinfo'] = "Existing Report Information";
< 		$admtext['existingreports'] = "Existing Reports";
< 		$admtext['newreportinfo'] = "New Report Information";
< 		$admtext['reportname'] = "Report Name";
< 		$admtext['rankpriority'] = "Rank/Priority";
< 		$admtext['choosedisplay'] = "Choose Fields to Display";
< 		$admtext['spouseid'] = "Spouse ID";
< 		$admtext['spousename'] = "Spouse Name";
< 		$admtext['lastmodified'] = "Zadnje modificirano";
< 		$admtext['ldsbapldate'] = "LDS Baptism Date";
< 		$admtext['ldsbaplplace'] = "LDS Baptism Place";
< 		$admtext['ldsendldate'] = "LDS Endowment Date";
< 		$admtext['ldsendlplace'] = "LDS Endowment Place";
< 		$admtext['ldssealsdate'] = "LDS Seal/Spouse Date";
< 		$admtext['ldssealsplace'] = "LDS Seal/Spouse Place";
< 		$admtext['ldssealpdate'] = "LDS Seal/Parents Date";
< 		$admtext['ldssealpplace'] = "LDS Seal/Parents Place";
---
> 		$admtext['changestoreport'] = "Promjene u izvješćima";
> 		$admtext['modifyreport'] = "Uredi postojećeg izvješća";
> 		$admtext['existingreportinfo'] = "Postojeće informacije o izvještaju";
> 		$admtext['existingreports'] = "Postojeće Izvještaju";
> 		$admtext['newreportinfo'] = "Nova informacije o izvještaju";
> 		$admtext['reportname'] = "Naziv Izvješća";
> 		$admtext['rankpriority'] = "Pozicija/Prioritet";
> 		$admtext['choosedisplay'] = "Odaberite polja za prikaz";
> 		$admtext['spouseid'] = "ID supružnika";
> 		$admtext['spousename'] = "Supružnika Ime";
> 		$admtext['lastmodified'] = "Datum zadnje izmjene";
> 		$admtext['ldsbapldate'] = "Datum Krštenja LDS";
> 		$admtext['ldsbaplplace'] = "Mjesto Krštenja LDS";
> 		$admtext['ldsendldate'] = "Datum Potpisivanja LDS";
> 		$admtext['ldsendlplace'] = "Mjesto Potpisivanja LDS";
> 		$admtext['ldssealsdate'] = "Datum Pe�ata/Supružnika LDS";
> 		$admtext['ldssealsplace'] = "Mjesto Pe�ata/Supružnika LDS";
> 		$admtext['ldssealpdate'] = "Datum Pe�at/Roditelja LDS";
> 		$admtext['ldssealpplace'] = "Mjesto Pe�at/Roditelja LDS";
580,637c618,673
< 		$admtext['choosecriteria'] = "Choose Criteria";
< 		$admtext['fullname'] = "Full Name";
< 		$admtext['lastfirst'] = "Last Name, First Name";
< 		$admtext['monthonlyfrom'] = "Month Only From";
< 		$admtext['yearonlyfrom'] = "Year Only From";
< 		$admtext['dayonlyfrom'] = "Day Only From";
< 		$admtext['operators'] = "Operators";
< 		$admtext['contains'] = "contains";
< 		$admtext['startswith'] = "starts with";
< 		$admtext['endswith'] = "ends with";
< 		$admtext['text_and'] = "AND";
< 		$admtext['currentmonth'] = "Current Month";
< 		$admtext['currentyear'] = "Current Year";
< 		$admtext['currentday'] = "Current Day";
< 		$admtext['constantstring'] = "Constant String";
< 		$admtext['constantvalue'] = "Constant Value";
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
< 		$admtext['choosesort'] = "Choose Sort Fields";
< 		$admtext['savereport'] = "Save Report";
< 		$admtext['addnewreport'] = "Add New Report";
< 		$admtext['createreport'] = "Create a new report";
< 		$admtext['noreports'] = "No reports exist";
< 		$admtext['rank'] = "Rank";
< 		$admtext['confreportdelete'] = "Are you sure you want to delete this report?";
< 		$admtext['enterreportname'] = "Please enter a Report Name.";
< 		$admtext['selectdisplayfield'] = "Please select at least one display field.";
< 		$admtext['today'] = "Today (true date)";
< 		$admtext['convtodays'] = "Convert to Days";
< 		$admtext['desc'] = "Descending (Prev)";
< 		$admtext['birthdatetr'] = "Birth Date (True)";
< 		$admtext['chrdatetr'] = "Christening Date (True)";
< 		$admtext['deathdatetr'] = "Death Date (True)";
< 		$admtext['burialdatetr'] = "Burial Date (True)";
< 		$admtext['marriagedatetr'] = "Marriage Date (True)";
< 		$admtext['ldsbapldatetr'] = "LDS Baptism Date (True)";
< 		$admtext['ldsendldatetr'] = "LDS Endowment Date (True)";
< 		$admtext['ldssealsdatetr'] = "LDS Seal/Spouse Date (True)";
< 		$admtext['ldssealpdatetr'] = "LDS Seal/Parents Date (True)";
< 		$admtext['currentmonthnum'] = "Current Month Number";
< 		$admtext['livingtrue'] = "Living = yes";
< 		$admtext['livingfalse'] = "Living = no";
< 		$admtext['altreport'] = "OR Leave Display, Criteria and Sort fields blank and enter direct SQL SELECT statement here";
< 		$admtext['rptdate'] = "Date";
< 		$admtext['rptdatetr'] = "Date (True)";
< 		$admtext['fact'] = "Fact";
< 		$admtext['testeditdelete'] = "Add, edit, test or delete reports";
< 		$admtext['wnmsg'] = "Message on \"What's New\" Page";
< 		$admtext['mwtype'] = "Type";
< 		$admtext['mysphoto'] = "Mystery Photos";
< 		$admtext['mysperson'] = "Elusive People";
< 		$admtext['selphoto'] = "Select Photo";
< 		$admtext['entertitle'] = "Please enter a title";
< 		$admtext['enterdesc'] = "Please enter a description";
< 		$admtext['confremmw'] = "Are you sure you want to remove this item?";
< 		$admtext['msgsaved'] = "Message saved";
< 		//added in 9.1.1
< 		$admtext['privatetrue'] = "Private = yes";
< 		$admtext['privatefalse'] = "Private = no";
---
> 		$admtext['choosecriteria'] = "Odaberite kriterije";
> 		$admtext['fullname'] = "Puno Ime";
> 		$admtext['lastfirst'] = "Prezime, Ime";
> 		$admtext['monthonlyfrom'] = "Mjesec samo od";
> 		$admtext['yearonlyfrom'] = "Godina samo od";
> 		$admtext['dayonlyfrom'] = "Dan samo od";
> 		$admtext['operators'] = "Operatori";
> 		$admtext['contains'] = "sadrži";
> 		$admtext['startswith'] = "po�inje sa";
> 		$admtext['endswith'] = "završava sa";
> 		$admtext['text_and'] = "I";
> 		$admtext['currentmonth'] = "Trenutni Mjesec";
> 		$admtext['currentyear'] = "Trenutna Godina";
> 		$admtext['currentday'] = "Trenitni Day";
> 		$admtext['constantstring'] = "Stalni Niz";
> 		$admtext['constantvalue'] = "Stalna Vrijednost";
> 		$admtext['choosesort'] = "Odaberite Poredaj polja";
> 		$admtext['savereport'] = "Sa�uvaj Izvješće";
> 		$admtext['addnewreport'] = "Dodaj novo Izvješće";
> 		$admtext['createreport'] = "Stvori novo Izvješće";
> 		$admtext['noreports'] = "Nema Izvješća";
> 		$admtext['rank'] = "Rang";
> 		$admtext['confreportdelete'] = "Jeste li sigurni da želite izbrisati ovo izvješće?";
> 		$admtext['enterreportname'] = "Unesite naziv izvješća.";
> 		$admtext['selectdisplayfield'] = "Odaberite barem jedno prikazno polje.";
> 		$admtext['today'] = "Danas (istinit datum)";
> 		$admtext['convtodays'] = "Pretvori u dane";
> 		$admtext['desc'] = "Silazno (prethodna)";
> 		$admtext['birthdatetr'] = "Datum Rođenja (istina)";
> 		$admtext['chrdatetr'] = "Datum Krštenja (istina)";
> 		$admtext['deathdatetr'] = "Datum Smrti (istina)";
> 		$admtext['burialdatetr'] = "Datum Pokopan (istina)";
> 		$admtext['marriagedatetr'] = "Datum Vjen�anja (istina)";
> 		$admtext['ldsbapldatetr'] = "Datum Krštenja LDS (istina)";
> 		$admtext['ldsendldatetr'] = "Datum Potpisivanja LDS (istina))";
> 		$admtext['ldssealsdatetr'] = "Datum Pe�ata/Supružnika LDS (istina)";
> 		$admtext['ldssealpdatetr'] = "Datum Pe�ata/Supružnika LDS (istina)";
> 		$admtext['currentmonthnum'] = "Broj Trenutnog Mjeseca";
> 		$admtext['livingtrue'] = "Living = da";
> 		$admtext['livingfalse'] = "Living = ne";
> 		$admtext['altreport'] = "ILI Ostavite polja prazna, Kriterije i Sortiranje prazna i ovdje unesite izravan SQL SELECT izraz";
> 		$admtext['rptdate'] = "Datum";
> 		$admtext['rptdatetr'] = "Datum (Istini)";
> 		$admtext['fact'] = "ÄŒinjenica";
> 		$admtext['testeditdelete'] = "Dodaj, Uredi, Test ili Obriši izvještaje";
> 		$admtext['wnmsg'] = "Poruka na stranici \"Novosti \"";
> 		$admtext['mwtype'] = "Tip";
> 		$admtext['mysphoto'] = "Tajanstvene fotografije";
> 		$admtext['mysperson'] = "Nedostižni ljudi";
> 		$admtext['selphoto'] = "Odaberite Sliku";
> 		$admtext['entertitle'] = "Unesite naslov";
> 		$admtext['enterdesc'] = "Unesite opis";
> 		$admtext['confremmw'] = "Jeste li sigurni da želite ukloniti ovaj predmet?";
> 		$admtext['msgsaved'] = "Poruka je sa�uvan";
> 		$admtext['privatetrue'] = "Private = da";
> 		$admtext['privatefalse'] = "Private = ne";
639,646c675,686
< 		$admtext['ldsconfdate'] = "LDS Confirmation Date";
< 		$admtext['ldsconfplace'] = "LDS Confirmation Place";
< 		$admtext['ldsconfdatetr'] = "LDS Confirmation Date (True)";
< 		$admtext['ldsinitdate'] = "LDS Initiatory Date";
< 		$admtext['ldsinitplace'] = "LDS Initiatory Place";
< 		$admtext['ldsinitdatetr'] = "LDS Initiatory Date (True)";
< 		$admtext['savecopy'] = "Save as copy";
< 		$admtext['activeonly'] = "Active only";
---
> 		$admtext['ldsconfdate'] = "Datum potvrde LDS";
> 		$admtext['ldsconfplace'] = "Mjesto potvrde LDS";
> 		$admtext['ldsconfdatetr'] = "Datum potvrde LDS (istina)";
> 		$admtext['ldsinitdate'] = "Datum inicijative LDS";
> 		$admtext['ldsinitplace'] = "Mjesto inicijative LDS";
> 		$admtext['ldsinitdatetr'] = "Datum inicijative LDS (istina)";
> 		$admtext['savecopy'] = "Sa�uvaj kao kopiju";
> 		$admtext['activeonly'] = "Samo aktivan";
> 		//added in 14.0
> 		$admtext['instr'] = "Upute: Povucite ili dvaput kliknite stavke lijevo na popise desno. Povucite gore i dolje za promjenu redoslijeda. Ponovno dvaput kliknite za uklanjanje.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Za prazan niz ostavite ovo polje praznim i kliknite >>";
651,692c691,700
< 		$admtext['selectimportfile'] = "Please select a file to import.";
< 		$admtext['importgedcom'] = "Import GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
< 		$admtext['fromyourcomputer'] = "From your computer";
< 		$admtext['importdata'] = "Import Data";
< 		$admtext['setupfirsttime'] = "Set up the software for the first time.";
< 		$admtext['replace'] = "Replace (in selected tree)";
< 		$admtext['desttree'] = "Destination Tree";
< 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
< 		$admtext['selectexisting'] = "Import into";
< 		$admtext['importgedcom2'] = "Import a GEDCOM file";
< 		$admtext['setupitems'] = "Create database tables, Set preferences";
< 		$admtext['custeventitems'] = "Manage custom tags and event types";
< 		$admtext['usersitems'] = "Manage users and permissions";
< 		$admtext['reportsitems'] = "Create custom lists and reports";
< 		$admtext['langitems'] = "Manage alternate languages";
< 		$admtext['backupitems'] = "Back up, restore and optimize database tables";
< 		$admtext['ucaselast'] = "Upper case all surnames";
< 		$admtext['norecalc'] = "Do not recalculate Living flag";
< 		$admtext['autooffset'] = "Start IDs at first available number";
< 
< 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
< 		$admtext['importmedia'] = "Import media if present";
< 		$admtext['mainmenu'] = "Main Menu";
< 		$admtext['neweronly'] = "Replace only if newer";
< 		$admtext['secondaryitems'] = "Create a GENDEX file, Track lines of descent";
< 		$admtext['onwebserver'] = "From web site (in GEDCOM folder)";
< 		$admtext['eventsonly'] = "Import Custom Event Types Only (no data is added, replaced or appended)";
< 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "click here to resume";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Change Log";
---
> 		$admtext['setupfirsttime'] = "Postavljanje prvog softvera.";
> 		$admtext['importgedcom2'] = "Uvezite GEDCOM datoteku";
> 		$admtext['setupitems'] = "Stvaranje tablica baze podataka, Postavljanje postavki";
> 		$admtext['custeventitems'] = "Upravljanje prilagođenim oznakama i vrstama događaja";
> 		$admtext['usersitems'] = "Upravljanje korisnicima i dozvolama";
> 		$admtext['reportsitems'] = "Stvori prilagođenih popisa i izvještaja";
> 		$admtext['langitems'] = "Upravljanje alternativnim jezicima";
> 		$admtext['backupitems'] = "Izradite sigurnosnu kopiju, obnovite i optimizirajte tablice baza podataka";
> 		$admtext['mainmenu'] = "Glavni izbornik";
> 		$admtext['secondaryitems'] = "Stvori GENDEX datoteku, Pratite linije silaska";
694,696c702
< 		$admtext['mmgritems'] = "Configure 3rd party add-ons";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
---
> 		$admtext['mmgritems'] = "Instalirajte i deinstalirajte TNG modove";
698c704
< 		$admtext['miscitems'] = "Notes, What's New, Most Wanted";
---
> 		$admtext['miscitems'] = "Novosti, Najviše Tražimo, Provjeru Podataka";
700,711c706,717
< 		$admtext['tasks'] = "Important tasks";
< 		$admtext['task_revusers'] = "Review new user registrations";
< 		$admtext['task_tree'] = "Create your first tree";
< 		$admtext['task_user'] = "Create a user account for yourself";
< 		$admtext['task_people'] = "add new people";
< 		$admtext['task_families'] = "Add new families";
< 		$admtext['task_revind'] = "Review proposed changes to individual events";
< 		$admtext['task_revfam'] = "Review proposed changes to family events";
< 		$admtext['task_backup'] = "Back up the data";
< 		$admtext['nobackups'] = "no backups exist";
< 		$admtext['lastbackup'] = "Last Backup";
< 		$admtext['dna_blurb'] = "Log DNA tests and link them to individuals";
---
> 		$admtext['tasks'] = "Važni Zadatki";
> 		$admtext['task_revusers'] = "Pregledajte nove korisni�ke registracije";
> 		$admtext['task_tree'] = "Stvorite svoje prvo stablo";
> 		$admtext['task_user'] = "Stvorite korisni�ki ra�un za sebe";
> 		$admtext['task_people'] = "dodaj nove ljude";
> 		$admtext['task_families'] = "Dodaj novu Obitelj";
> 		$admtext['task_revind'] = "Pregledajte predložene izmjene pojedinih događaja";
> 		$admtext['task_revfam'] = "Pregledajte predložene izmjene obiteljskih događaja";
> 		$admtext['task_backup'] = "Izradite sigurnosnu kopiju podataka";
> 		$admtext['nobackups'] = "nema sigurnosnih kopija";
> 		$admtext['lastbackup'] = "posljednja sigurnosna kopija pravljena prije više od xxx dana";
> 		$admtext['dna_blurb'] = "Prijavite DNA testove i povežite ih s pojedincima";
713c719,724
< 		$admtext['task_mapkey'] = "Get a map key from Google to enable maps display";
---
> 		$admtext['task_mapkey'] = "Nabavite klju� karte od Google da bi se omogućio prikaz karata";
> 		//added in 14.0
> 		$admtext['upgrade'] = "Nadogradnja";
> 		$admtext['need_upgrade'] = "Dovršite ove upute za nadogradnja";
> 		$admtext['upgrade_missing'] = "Čini se da datoteka za nadogradnju nedostaje, pa ste možda već gotovi.";
> 		$admtext['delete_upgrade'] = "Kada završite, kliknite ovdje za brisanje nadogradnje i povratak na izbornik.";
718,765c729,775
< 		$admtext['changestosource'] = "Changes to source";
< 		$admtext['modifysource'] = "Modify Existing Source";
< 		$admtext['selectsrcaction'] = "Select Source and Action";
< 		$admtext['shorttitle'] = "Short Title";
< 		$admtext['longtitle'] = "Long Title";
< 		$admtext['author'] = "Author";
< 		$admtext['callnumber'] = "Call Number";
< 		$admtext['publisher'] = "Publisher";
< 		$admtext['actualtext'] = "Actual Text";
< 		$admtext['confdeletesrc'] = "Are you sure you want to delete this source?";
< 		$admtext['selectshorttitle'] = "Please select or enter a short title for this event type.";
< 		$admtext['existingsourceinfo'] = "Existing Information for Source";
< 		$admtext['newsourceinfo'] = "New Source Information";
< 		$admtext['addnewsource'] = "Add New Source";
< 		$admtext['prefixsourceid'] = "Please prefix Source ID with \"S\" for \"Source\"";
< 		$admtext['entersourceid'] = "Please enter a Source ID.";
< 		$admtext['validsourceid'] = "Please enter a valid Source ID. A valid ID is a numeric string prefixed with 'S'.";
< 		$admtext['createsource'] = "Create a record for a new source";
< 		$admtext['editexistingsource'] = "Edit information for a previously entered source";
< 		$admtext['addnewcite'] = "Add New Citation";
< 		$admtext['reliability'] = "Reliability";
< 		$admtext['relyexplain'] = "Higher numbers indicate greater reliability.";
< 		$admtext['citedate'] = "Citation Date";
< 		$admtext['modifycite'] = "Modify Existing Citation";
< 		$admtext['addingcite'] = "Adding Citation...";
< 		$admtext['deletingcite'] = "Deleting Citation...";
< 		$admtext['updatingcite'] = "Updating Citation...";
< 		$admtext['sevslater'] = "Note: Additional events and notes may be added after the new source has been saved.";
< 		$admtext['pleasesourcepart'] = "Please enter part of the source title.";
< 		$admtext['addnewrepo'] = "Add New Repository";
< 		$admtext['modifyrepo'] = "Modify Existing Repository";
< 		$admtext['createrepo'] = "Create a record for a new repository";
< 		$admtext['editexistingrepo'] = "Edit information for a previously entered repository";
< 		$admtext['enterrepoid'] = "Please enter a Repository ID.";
< 		$admtext['enterreponame'] = "Please enter a Repository name.";
< 		$admtext['newrepoinfo'] = "New Repository Information";
< 		$admtext['prefixrepoid'] = "Please prefix Repository ID with \"REPO\" for \"Repository\"";
< 		$admtext['selectrepoaction'] = "Select Repository and Action";
< 		$admtext['confdeleterepo'] = "Are you sure you want to delete this repository?";
< 		$admtext['changestorepo'] = "Changes to repository";
< 		$admtext['existingrepoinfo'] = "Existing Information for Repository";
< 		$admtext['pleaserepopart'] = "Please enter part of the repository title.";
< 		$admtext['choosemergesources'] = "Choose sources to merge or find potential matches";
< 		$admtext['confirmmergesources'] = "Are you sure you want to merge these two sources?";
< 		$admtext['choosemergerepos'] = "Choose repositories to merge or find potential matches";
< 		$admtext['confirmmergerepos'] = "Are you sure you want to merge these two repositories?";
< 		$admtext['revslater'] = "Note: Additional events and notes may be added after the new repository has been saved.";
< 		$admtext['confdeleterepo'] = "Are you sure you want to delete this repository?";
---
> 		$admtext['changestosource'] = "Promjene izvora";
> 		$admtext['modifysource'] = "Uređivanje postojećeg izvora";
> 		$admtext['selectsrcaction'] = "Odaberite Izvor i radnja";
> 		$admtext['shorttitle'] = "Kratki naslov";
> 		$admtext['longtitle'] = "Dugi naslov";
> 		$admtext['callnumber'] = "Poziv Broj";
> 		$admtext['publisher'] = "Izdava�";
> 		$admtext['actualtext'] = "Stvarni tekst";
> 		$admtext['confdeletesrc'] = "Jeste li sigurni da želite izbrisati taj izvor?";
> 		$admtext['selectshorttitle'] = "Odaberite ili unesite kratak naslov za ovu vrstu događaja.";
> 		$admtext['existingsourceinfo'] = "Postojeće informacije za izvor";
> 		$admtext['newsourceinfo'] = "Nove informacije o izvoru";
> 		$admtext['addnewsource'] = "Dodaj Izvor";
> 		$admtext['prefixsourceid'] = "Prefiks izvora ID s \"S \" za \"Izvor \"";
> 		$admtext['entersourceid'] = "Unesite ID izvora.";
> 		$admtext['validsourceid'] = "Unesite valjani ID izvora. Valjani ID je numeri�ki niz s prefiksom 'S'.";
> 		$admtext['createsource'] = "Stvorite zapis za novi izvor";
> 		$admtext['editexistingsource'] = "Uredi podataka za prethodno upisani izvor";
> 		$admtext['addnewcite'] = "Dodaj Citat";
> 		$admtext['reliability'] = "Pouzdanost";
> 		$admtext['relyexplain'] = "Veći broj ukazuje na veću pouzdanost.";
> 		$admtext['citedate'] = "Datum Citata";
> 		$admtext['modifycite'] = "Uredi postojeći Citat";
> 		$admtext['addingcite'] = "Dodavanje Citata...";
> 		$admtext['deletingcite'] = "Brisanje Citata...";
> 		$admtext['updatingcite'] = "Ažuriranje Citata...";
> 		$admtext['sevslater'] = "NAPOMENA: Nakon sa�uvanja novog izvora mogu se dodati dodatni događaji i bilješke.";
> 		$admtext['pleasesourcepart'] = "Unesite dio naslova izvora.";
> 		$admtext['addnewrepo'] = "Dodaj Spremište";
> 		$admtext['modifyrepo'] = "Uredi postojeći Spremište";
> 		$admtext['createrepo'] = "Stvorite zapis za novo spremište";
> 		$admtext['editexistingrepo'] = "Uredi podataka za prethodno uneseno spremište";
> 		$admtext['enterrepoid'] = "Unesite ID spremišta.";
> 		$admtext['enterreponame'] = "Unesite naziv spremišta.";
> 		$admtext['newrepoinfo'] = "Nove informacije o spremištu";
> 		$admtext['prefixrepoid'] = "Prefiks ID spremišta s \"REPO \" za \"Spremište \"";
> 		$admtext['selectrepoaction'] = "Odaberite Spremište i akcija";
> 		$admtext['confdeleterepo'] = "Jeste li sigurni da želite izbrisati ovo spremište?";
> 		$admtext['changestorepo'] = "Promjene u spremištu";
> 		$admtext['existingrepoinfo'] = "Postojeće informacije o spremištu";
> 		$admtext['pleaserepopart'] = "Unesite dio naslova spremišta.";
> 		$admtext['choosemergesources'] = "Odaberite izvore za spajanje ili pronalazak ma�eva";
> 		$admtext['confirmmergesources'] = "Jeste li sigurni da želite spojiti ta dva izvora?";
> 		$admtext['choosemergerepos'] = "Odaberite spremišta koja će se spojiti ili pronaći ma�eva";
> 		$admtext['confirmmergerepos'] = "Jeste li sigurni da želite spojiti ta dva spremišta?";
> 		$admtext['revslater'] = "NAPOMENA: Nakon sa�uvanja novog spremišta, mogu se dodati dodatni događaji i bilješke.";
> 		$admtext['confdeleterepo'] = "Jeste li sigurni da želite izbrisati ovo spremište?";
770,775c780,785
< 		$admtext['checknewid'] = "Check New ID";
< 		$admtext['idnotvalid'] = "is not a valid ID. A valid ID is a numeric string prefixed with";
< 		$admtext['idinuse'] = "is in use. Please choose a different ID";
< 		$admtext['idok'] = "is OK to use";
< 		$admtext['isok'] = "is OK to use";
< 		$admtext['isinuse'] = "is already in use.";
---
> 		$admtext['checknewid'] = "Provjerite novi ID";
> 		$admtext['idnotvalid'] = "nije važeći ID. Valjani ID je numeri�ki niz s prefiksom";
> 		$admtext['idinuse'] = "je u upotrebi. Odaberite drugi ID";
> 		$admtext['idok'] = "je u redu za upotrebu";
> 		$admtext['isok'] = "je u redu za upotrebu";
> 		$admtext['isinuse'] = "već se koristi.";
779,830c789,840
< 		$admtext['templatenum'] = "Template Number";
< 		$admtext['mainimage'] = "Main image (home page)"; //1, 2, 3, 4, 5, 7
< 		$admtext['titleimage'] = "Title image (home page)"; //1, 2, 3
< 		$admtext['headline'] = "Headline"; //4, 7
< 		$admtext['mainpara'] = "Welcome paragraph";  //1, 4, 6, 7, 8
< 		$admtext['headimgplustitle'] = "Header image (including title)"; //1
< 		$admtext['pedperson'] = "Pedigree person ID"; //2
< 		$admtext['pedtree'] = "Pedigree tree ID"; //2
< 		$admtext['phhistperson'] = "Photos & Histories person ID"; //2
< 		$admtext['phhisttree'] = "Photos & Histories tree ID"; //2
< 		$admtext['headimg'] = "Header image"; //2, 3, 4, 5, 6, 8
< 		$admtext['headtitleimg'] = "Header title image"; //2, 3
< 		$admtext['titleimg'] = "Title image (all pages)"; //4, 7
< 		$admtext['searchpara'] = "Search paragraph"; //6
< 		$admtext['fhpara'] = "Family Histories paragraph"; //6
< 		$admtext['fhlinkshis'] = "Family Histories links (His)"; //6
< 		$admtext['fhlinkshers'] = "Family Histories links (Hers)"; //6
< 		$admtext['mwpara'] = "Most Wanted paragraph"; //6
< 		$admtext['respara'] = "Resources paragraph"; //6
< 		$admtext['reslinks'] = "Resources links"; //6
< 		$admtext['headtitle1'] = "Header title, part 1"; //8
< 		$admtext['headtitle2'] = "Header title, part 2"; //8
< 		$admtext['headtitle3'] = "Header title, part 3"; //8
< 		$admtext['headsubtitle'] = "Header subtitle"; //8
< 		$admtext['latestnews'] = "Latest news"; //8
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
< 		$admtext['featurethumb1'] = "Feature 1 thumbnail"; //4
< 		$admtext['featurelink1'] = "Feature 1 link"; //4
< 		$admtext['featuretitle1'] = "Feature 1 title"; //4
< 		$admtext['featurepara1'] = "Feature 1 paragraph"; //4
< 		$admtext['featurethumb2'] = "Feature 2 thumbnail"; //4
< 		$admtext['featurelink2'] = "Feature 2 link"; //4
< 		$admtext['featuretitle2'] = "Feature 2 title"; //4
< 		$admtext['featurepara2'] = "Feature 2 paragraph"; //4
< 		$admtext['featurethumb3'] = "Feature 3 thumbnail"; //4
< 		$admtext['featurelink3'] = "Feature 3 link"; //4
< 		$admtext['featuretitle3'] = "Feature 3 title"; //4
< 		$admtext['featurepara3'] = "Feature 3 paragraph"; //4
< 		$admtext['featurethumb4'] = "Feature 4 thumbnail"; //4
< 		$admtext['featurelink4'] = "Feature 4 link"; //4
< 		$admtext['featuretitle4'] = "Feature 4 title"; //4
< 		$admtext['featurepara4'] = "Feature 4 paragraph"; //4
< 		$admtext['photocaption'] = "Main image caption"; //4
< 		$admtext['maintitle'] = "Main title"; //5
< 		$admtext['hisside'] = "His Side label"; //5
< 		$admtext['herside'] = "Her Side label"; //5
< 		$admtext['newstext'] = "News text"; //5
---
> 		$admtext['templatenum'] = "Broj Predloška";
> 		$admtext['mainimage'] = "Glavna slika (po�etna stranica)"; //1, 2, 3, 4, 5, 7
> 		$admtext['titleimage'] = "Naslovna slika (po�etna stranica)"; //1, 2, 3
> 		$admtext['headline'] = "Naslov"; //4, 7
> 		$admtext['mainpara'] = "Odjeljak dobrodošlice";  //1, 4, 6, 7, 8
> 		$admtext['headimgplustitle'] = "Slika zaglavlja (uklju�ujući naslov)"; //1
> 		$admtext['pedperson'] = "Pedigreska osoba ID"; //2
> 		$admtext['pedtree'] = "Pedigresko stablo ID"; //2
> 		$admtext['phhistperson'] = "Fotografije i Povijesti osobe ID"; //2
> 		$admtext['phhisttree'] = "Fotografije i Povijesti stabla ID"; //2
> 		$admtext['headimg'] = "Slika zaglavlja"; //2, 3, 4, 5, 6, 8
> 		$admtext['headtitleimg'] = "Slika naslova zaglavlja"; //2, 3
> 		$admtext['titleimg'] = "Naslovna slika (sve stranice)"; //4, 7
> 		$admtext['searchpara'] = "Odlomak za pretraživanje"; //6
> 		$admtext['fhpara'] = "Stavak Obiteljske povijesti"; //6
> 		$admtext['fhlinkshis'] = "Poveznice obiteljske povijesti (Njegove)"; //6
> 		$admtext['fhlinkshers'] = "Poveznice obiteljske povijesti (Njezine)"; //6
> 		$admtext['mwpara'] = "Odlomak Najtraženiji"; //6
> 		$admtext['respara'] = "Odlok o resursima"; //6
> 		$admtext['reslinks'] = "Veze za resurse"; //6
> 		$admtext['headtitle1'] = "Naslov zaglavlja, 1. dio"; //8
> 		$admtext['headtitle2'] = "Naslov zaglavlja, 2. dio"; //8
> 		$admtext['headtitle3'] = "Naslov zaglavlja, 3. dio"; //8
> 		$admtext['headsubtitle'] = "Podnaslov zaglavlja"; //8
> 		$admtext['latestnews'] = "Najnovije vijesti"; //8
> 		$admtext['momside'] = "Natpis na Maminoj strani"; //8, 20
> 		$admtext['dadside'] = "Natpis na Tatinoj strani"; //8, 20
> 		$admtext['momperson'] = "Mamine Strane osobna ID"; //8, 20
> 		$admtext['momtree'] = "Mamine Strane stablo ID"; //8, 20
> 		$admtext['dadperson'] = "Tatine Strane osobna ID"; //8, 20
> 		$admtext['dadtree'] = "Tatine Strane stablo ID"; //8, 20
> 		$admtext['featurethumb1'] = "Zna�ajke 1 sli�ica"; //4
> 		$admtext['featurelink1'] = "Zna�ajke 1 linkovi"; //4
> 		$admtext['featuretitle1'] = "Zna�ajke 1 naslov"; //4
> 		$admtext['featurepara1'] = "Zna�ajke 1 pasus"; //4
> 		$admtext['featurethumb2'] = "Zna�ajke 2 sli�ica"; //4
> 		$admtext['featurelink2'] = "Zna�ajke 2 linkovi"; //4
> 		$admtext['featuretitle2'] = "Zna�ajke 2 naslov"; //4
> 		$admtext['featurepara2'] = "Zna�ajke 2 pasus"; //4
> 		$admtext['featurethumb3'] = "Zna�ajke 3 sli�ica"; //4
> 		$admtext['featurelink3'] = "Zna�ajke 3 linkovi"; //4
> 		$admtext['featuretitle3'] = "Zna�ajke 3 naslov"; //4
> 		$admtext['featurepara3'] = "Zna�ajke 3 pasus"; //4
> 		$admtext['featurethumb4'] = "Zna�ajke 4 sli�ica"; //4
> 		$admtext['featurelink4'] = "Zna�ajke 4 linkovi"; //4
> 		$admtext['featuretitle4'] = "Zna�ajke 4 naslov"; //4
> 		$admtext['featurepara4'] = "Zna�ajke 4 pasus"; //4
> 		$admtext['photocaption'] = "Opis slike"; //4
> 		$admtext['maintitle'] = "Glavni naslov"; //5
> 		$admtext['hisside'] = "Njegove Strave oznak"; //5
> 		$admtext['herside'] = "Njezine Strave oznak"; //5
> 		$admtext['newstext'] = "Tekst vijesti"; //5
832c842
< 		$admtext['templateswitching'] = "Enable Template Selection";
---
> 		$admtext['templateswitching'] = "Omogući odabir predloška";
834,838c844,848
< 		$admtext['template'] = "Template";
< 		$admtext['createcopy'] = "Create copy in";  //as in, "create copy in Dutch"
< 		$admtext['featurelinks'] = "Feature links"; //9, 10
< 		$admtext['featurepara'] = "Features paragraph"; //9, 10
< 		$admtext['welcome'] = "Welcome headline"; //9, 10
---
> 		$admtext['template'] = "Predloška";
> 		$admtext['createcopy'] = "Izradite kopiju u";  //as in, "create copy in Dutch"
> 		$admtext['featurelinks'] = "Zna�ajke linkovi"; //9, 10
> 		$admtext['featurepara'] = "Zna�ajke pasus"; //9, 10
> 		$admtext['welcome'] = "Pozdravite naslove"; //9, 10
840,841c850,851
< 		$admtext['momsidenames'] = "Mom's Side names"; //8
< 		$admtext['dadsidenames'] = "Dad's Side names"; //8
---
> 		$admtext['momsidenames'] = "Mamine Strane imena"; //8
> 		$admtext['dadsidenames'] = "Tatine Strane imena"; //8
843,858c853,868
< 		$admtext['featurespara'] = "Features paragraph";
< 		$admtext['menutitle'] = "Menu Title";
< 		$admtext['titlechoice'] = "Title option";
< 		$admtext['photol'] = "Left image";
< 		$admtext['phototitlel'] = "Left image title";
< 		$admtext['photocaptionl'] = "Left image caption";
< 		$admtext['photor'] = "Right image";
< 		$admtext['phototitler'] = "Right image title";
< 		$admtext['photocaptionr'] = "Right image caption";
< 		$admtext['topsurnames'] = "Top Surnames label";
< 		$admtext['headimg2'] = "Header image 2"; //14
< 		$admtext['headimg3'] = "Header image 3"; //14
< 		$admtext['showprev'] = "Show Previews";
< 		$admtext['hideprev'] = "Hide Previews";
< 		$admtext['ttitleimage'] = "Image";
< 		$admtext['ttitletext'] = "Text";
---
> 		$admtext['featurespara'] = "Zna�ajke pasus";
> 		$admtext['menutitle'] = "Naslov Izbornika";
> 		$admtext['titlechoice'] = "Opcija naslova";
> 		$admtext['photol'] = "Lijeva slika";
> 		$admtext['phototitlel'] = "Naslov Lijeve slike";
> 		$admtext['photocaptionl'] = "Opis lijeve slike";
> 		$admtext['photor'] = "Desna slika";
> 		$admtext['phototitler'] = "Naslov Desne slike";
> 		$admtext['photocaptionr'] = "Opis desne slike";
> 		$admtext['topsurnames'] = "Oznaka najboljih prezimena";
> 		$admtext['headimg2'] = "Slika zaglavlja 2"; //14
> 		$admtext['headimg3'] = "Slika zaglavlja 3"; //14
> 		$admtext['showprev'] = "Prikaži pregled";
> 		$admtext['hideprev'] = "Sakrij preglede";
> 		$admtext['ttitleimage'] = "Slika";
> 		$admtext['ttitletext'] = "Tekst";
860,866c870,876
< 		$admtext['featurethumb5'] = "Feature 5 thumbnail"; //15
< 		$admtext['featurelink5'] = "Feature 5 link"; //15
< 		$admtext['featuretitle5'] = "Feature 5 title"; //15
< 		$admtext['featurepara5'] = "Feature 5 paragraph"; //15
< 		$admtext['featurethumb6'] = "Feature 6 thumbnail"; //15
< 		$admtext['featurelink6'] = "Feature 6 link"; //15
< 		$admtext['featuretitle6'] = "Feature 6 title"; //15
---
> 		$admtext['featurethumb5'] = "Zna�ajke 5 sli�ica"; //15
> 		$admtext['featurelink5'] = "Zna�ajke 5 linkovi"; //15
> 		$admtext['featuretitle5'] = "Zna�ajke 5 naslov"; //15
> 		$admtext['featurepara5'] = "Zna�ajke 5 pasus"; //15
> 		$admtext['featurethumb6'] = "Zna�ajke 6 sli�ica"; //15
> 		$admtext['featurelink6'] = "Zna�ajke 6 linkovi"; //15
> 		$admtext['featuretitle6'] = "Zna�ajke 6 pasus"; //15
868,887c878,980
< 		$admtext['featurethumb7'] = "Feature 7 thumbnail"; //15
< 		$admtext['featurelink7'] = "Feature 7 link"; //15
< 		$admtext['featurepara7'] = "Feature 7 paragraph"; //15
< 		$admtext['featurethumb8'] = "Feature 8 thumbnail"; //15
< 		$admtext['featurelink8'] = "Feature 8 link"; //15
< 		$admtext['featurepara8'] = "Feature 8 paragraph"; //15
< 		$admtext['sidebarhead1'] = "Sidebar header 1"; //15
< 		$admtext['sidebarhead2'] = "Sidebar header 2"; //15
< 		$admtext['sidebarhead3'] = "Sidebar header 3"; //15
< 		$admtext['texttitle1'] = "Text 1 title"; //15
< 		$admtext['textlink1'] = "Text 1 link"; //15
< 		$admtext['textpara1'] = "Text 1 paragraph"; //15
< 		$admtext['texttitle2'] = "Text 2 title"; //15
< 		$admtext['textlink2'] = "Text 2 link"; //15
< 		$admtext['textpara2'] = "Text 2 paragraph"; //15
< 		$admtext['texttitle3'] = "Text 3 title"; //15
< 		$admtext['textpara3'] = "Text 3 paragraph"; //15
< 		$admtext['subhead1'] = "Subhead 1"; //15
< 		$admtext['subhead2'] = "Subhead 2"; //15
< 
---
> 		$admtext['featurethumb7'] = "Zna�ajke 7 sli�ica"; //15
> 		$admtext['featurelink7'] = "Zna�ajke 7 linkovi"; //15
> 		$admtext['featurepara7'] = "Zna�ajke 7 pasus"; //15
> 		$admtext['featurethumb8'] = "Zna�ajke 8 sli�ica"; //15
> 		$admtext['featurelink8'] = "Zna�ajke 8 linkovi"; //15
> 		$admtext['featurepara8'] = "Zna�ajke 8 pasus"; //15
> 		$admtext['sidebarhead1'] = "Zaglavlje bo�ne trake 1"; //15
> 		$admtext['sidebarhead2'] = "Zaglavlje bo�ne trake 2"; //15
> 		$admtext['sidebarhead3'] = "Zaglavlje bo�ne trake 3"; //15
> 		$admtext['texttitle1'] = "Tekst 1 naslov"; //15
> 		$admtext['textlink1'] = "Tekst 1 linkovi"; //15
> 		$admtext['textpara1'] = "Tekst 1 pasus"; //15
> 		$admtext['texttitle2'] = "Tekst 2 naslov"; //15
> 		$admtext['textlink2'] = "Tekst 2 linkovi"; //15
> 		$admtext['textpara2'] = "Tekst 2 pasus"; //15
> 		$admtext['texttitle3'] = "Tekst 3 naslov"; //15
> 		$admtext['textpara3'] = "Tekst 3 pasus"; //15
> 		$admtext['subhead1'] = "Podnaslov 1"; //15
> 		$admtext['subhead2'] = "Podnaslov 2"; //15
> 		//added in 12.2
> 		$admtext['quotehead'] = "Zaglavlje Navodi";
> 		$admtext['quotesubhead'] = "Podnaslov Navodi";
> 		$admtext['sniptitle'] = "Naslov isje�aka";
> 		$admtext['snipname'] = "Ime isje�aka";
> 		$admtext['snipinfoone'] = "Prva linija isje�aka";
> 		$admtext['snipinfotwo'] = "Druga linija isje�aka";
> 		$admtext['snipimage'] = "Slika isje�aka";
> 		$admtext['snipperson'] = "Isje�aka osobe ID";
> 		$admtext['sniptree'] = "Isje�aka stabla ID";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Veza";
> 		$admtext['featuretitle7'] = "Zna�ajke 7 naslov";
> 		$admtext['featuretitle8'] = "Zna�ajke 8 naslov";
> 		$admtext['featuretitle9'] = "Zna�ajke 9 naslov";
> 		$admtext['featurethumb9'] = "Zna�ajke 7 sli�ice"; //15
> 		$admtext['featurelink9'] = "Zna�ajke 9 linkovi"; //15
> 		$admtext['featurepara9'] = "Zna�ajka 9 pasus"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Lijeva slika zaglavlja";
> 		$admtext['rightimg'] = "Desna slika zaglavlja";
> 		$admtext['photoption'] = "Opcije fotografije su<br />&nbsp;&nbsp;(stati�ki ili slu�ajni)";
> 		$admtext['randomphotowidth'] = "Nasumi�na širina fotografije";
> 		$admtext['randomphotoheight'] = "Nasumi�na visina fotografije";
> 		$admtext['randomphotomediatypeID'] = "Kolekcija slu�ajnih fotografija";
> 		$admtext['momheading'] = "Maj�inske Obitelji Naslov";
> 		$admtext['mompara'] = "Maj�inske Obitelji Pasus";
> 		$admtext['mompagelink'] = "Maj�inske Obitelji Stranice povez";
> 		$admtext['dadheading'] = "O�inske Obitelji Naslov";
> 		$admtext['dadpara'] = "O�inske Obitelji Pasus";
> 		$admtext['dadpagelink'] = "O�inske Obitelji Stranice povez";
> 		$admtext['spmomheading'] = "Supružni Maj�inske Obitelji Naslov";
> 		$admtext['spmompara'] = "Supružni Maj�inske Obitelji Pasus";
> 		$admtext['spmompagelink'] = "Supružni Maj�inske Obitelji Stranice povez";
> 		$admtext['spmomside'] = "Supružni Maj�inske Strane oznak";
> 		$admtext['spdadside'] = "Supružni O�inske Strane oznak";
> 		$admtext['spmomperson'] = "Supružni Maj�inske Strane osobe ID";
> 		$admtext['spmomtree'] = "Supružni Maj�inske Strane stablo ID";
> 		$admtext['spdadheading'] = "Supružni O�inske Obitelji Naslov";
> 		$admtext['spdadpara'] = "Supružni O�inske Obitelji Pasus";
> 		$admtext['spdadpagelink'] = "Supružni O�inske Obitelji Stranice povez";
> 		$admtext['spdadperson'] = "Supružni O�inske Strane osobe ID";
> 		$admtext['spdadtree'] = "Supružni O�inske Strane stablo ID";
> 		$admtext['storiesheading'] = "Naše Obiteljske Pri�e";
> 		$admtext['nbrsurnames'] = "Broj Presomena<br />&nbsp;&nbsp; u Prezimenu Oblaka";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Zna�ajke sli�ica";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Naslov Slajda";
> 		$admtext['slideimg'] = "Slika Slajda";
> 		$admtext['slideheadline'] = "Naslov Slajda";
> 		$admtext['slidetext'] = "Tekst Slajda";
> 		$admtext['slidelink'] = "Poveznica Slajda";
> 		$admtext['slidelinktext'] = "Naziv Veze Slajda";
> 		$admtext['featurelink'] = "Poveznica na Zna�ajku";
> 		$admtext['featurelinktext'] = "Naziv Veze Zna�ajke";
> 		$admtext['featuretitle'] = "Naslov Zna�ajke";
> 		$admtext['featuresub'] = "Podnaslov Zna�ajke";
> 		$admtext['quoteimg'] = "Citat Slika";
> 		$admtext['quotelink'] = "Citat Veza";
> 		$admtext['quotelinktext'] = "Naziv Veze Citata";
> 		$admtext['sidebarpara'] = "Stavak bo�ne Trake";
> 		$admtext['sidebarlink'] = "Veza sa Bo�ne Trake";
> 		$admtext['sidebarlinktext'] = "Naziv Veze Bo�ne Trake";
> 		$admtext['sidebarimg'] = "Slika Bo�ne Trake";
> 		$admtext['sidebartitle'] = "Naslov Bo�ne Trake";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Naslov Naslovnice";
> 		$admtext['snipsubhead'] = "Opis Podnaslova";
> 		$admtext['snipimg'] = "Zna�ajna Slika";
> 		$admtext['sniplink'] = "Poveznica na Zna�ajku";
> 		$admtext['sniplinktext'] = "Naziv Veze na Zna�ajku";
> 		$admtext['linktext'] = "Tekst Veze";
> 		$admtext['footerheadline'] = "Naslov u Podnožju";
> 		$admtext['footerpara'] = "Tekst u Podnožju";
> 		$admtext['footerlink'] = "Veza u Podnožju";
> 		$admtext['footerlinktext'] = "Naziv Veze u Podnožju";
> 		$admtext['footerheadline'] = "Naslov u Podnožju";
> 		$admtext['footerpara'] = "Tekst u Podnožju";
> 		$admtext['footerlink'] = "Veza u Podnožju";
> 		$admtext['footerlinktext'] = "Naziv Veze u Podnožju";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
893,1006c986,1099
< 		$admtext['tablesuccess'] = "Tables created successfully.";
< 		$admtext['backtosetup'] = "Back to the Setup Menu";
< 		$admtext['configuration'] = "Configuration";
< 		$admtext['entersysvars'] = "Enter values for system variables.";
< 		$admtext['createdbtables'] = "Create the database tables to hold your information.";
< 		$admtext['tcwarning'] = "<strong>Warning!</strong> Select this option only when you are setting your site up for the first time. <strong>All existing data, including photos, histories, headstones and cemetery information, will be erased!</strong>";
< 		$admtext['conftabledelete'] = "This will delete ALL your existing data!! Are you sure you want to continue?";
< 		$admtext['performdatamaint'] = "Perform data maintenance and manage photos, histories and other components.";
< 		$admtext['createtables'] = "Create Tables";
< 		$admtext['configsettings'] = "General Settings";
< 		$admtext['logconfigsettings'] = "Log Settings";
< 		$admtext['importconfigsettings'] = "Import Settings";
< 		$admtext['diagnostics'] = "Diagnostics";
< 		$admtext['rundiags'] = "Run Diagnostics";
< 		$admtext['phpinf'] = "PHP Info Screen";
< 		$admtext['fromphp'] = "This information comes from your server and relates to your PHP installation, not TNG.";
< 		$admtext['phpver'] = "PHP version";
< 		$admtext['phpreq'] = "(TNG requires 5.3 or higher.)";
< 		$admtext['gdlib'] = "GD graphics library";
< 		$admtext['gdreq'] = "(Required for TNG's thumbnail creation tools.)";
< 		$admtext['availnogif'] = "Available, but does not support .gif images";
< 		$admtext['notinst'] = "Not installed";
< 		$admtext['safemode'] = "Safe Mode";
< 		$admtext['off'] = "Off";
< 		$admtext['on'] = "On";
< 		$admtext['fileuploads'] = "File Uploads";
< 		$admtext['fureq'] = "(Required for web-based GEDCOM upload, image upload and other form functionality.)";
< 		$admtext['perm'] = "Permitted";
< 		$admtext['notperm'] = "Not permitted, use FTP instead";
< 		$admtext['sqlver'] = "MySQL version";
< 		$admtext['sqlreq'] = "(TNG requires 5.5 or higher.)";
< 		$admtext['wsrvr'] = "Webserver";
< 		$admtext['fperms'] = "File/Folder Permissions";
< 		$admtext['fpreq'] = "(TNG requires some files and folders to have special access rights.)";
< 		$admtext['scruser'] = "Script running as user:";
< 		$admtext['phpuser'] = "PHP reports it as user:";
< 		$admtext['usrprob'] = "You may not have the necessary level of file access to run TNG without problems if you use both FTP and the TNG admin functions to manage files.";
< 		$admtext['rofile'] = "File is read-only:";
< 		$admtext['rofolder'] = "Folder is read-only:";
< 		$admtext['publog'] = "Public log";
< 		$admtext['admlog'] = "Admin log";
< 		$admtext['folderdne'] = "Folder does not exist:";
< 		$admtext['keyrw'] = "Key folders are all read/write";
< 		$admtext['cfgrw'] = "Configuration files are all read/write";
< 		$admtext['acceptable'] = "Acceptable.";
< 		$admtext['restricted'] = "Some functionality may be restricted. You may encounter errors during installation or while running TNG.";
< 		$admtext['needchngs'] = "TNG may not run without changes to your PHP or server configuration.";
< 		$admtext['yourbrowser'] = "Your browser:";
< 		$admtext['modifysettings'] = "Modify Configuration Settings";
< 		$admtext['dbhost'] = "Database Host";
< 		$admtext['dbname'] = "Database Name";
< 		$admtext['dbusername'] = "Database User Name";
< 		$admtext['dbpassword'] = "Database Password";
< 		$admtext['rootpath'] = "Root Path";
< 		$admtext['homepage'] = "Home Page";
< 		$admtext['emailaddress'] = "E-mail Address";
< 		$admtext['siteowner'] = "Site Owner";
< 		$admtext['maxdescgens'] = "Max Descendancy Generations";
< 		$admtext['disallow'] = "Disallow";
< 		$admtext['defaultallowed'] = "Default: Allowed";
< 		$admtext['maxsearchresults'] = "Max Search Results";
< 		$admtext['targetframe'] = "Target Frame";
< 		$admtext['table'] = "Table";
< 		$admtext['lastbackup'] = "Last Backup";
< 		$admtext['backup'] = "Back up";
< 		$admtext['restore'] = "Restore";
< 		$admtext['backupfilesize'] = "File Size";
< 		$admtext['succbackedup'] = "successfully backed up";
< 		$admtext['succrestored'] = "successfully restored";
< 		$admtext['change_cutoff'] = "'What's New' Days";
< 		$admtext['change_limit'] = "'What's New' Limit";
< 		$admtext['photosext'] = "Photos Extension";
< 		$admtext['defaulttree'] = "Default Tree";
< 		$admtext['requirelogin'] = "Require Login";
< 		$admtext['defaultdontrequire'] = "Default: Don't Require";
< 		$admtext['ldsdefault'] = "Show LDS Data";
< 		$admtext['ldson'] = "Always";
< 		$admtext['ldsoff'] = "Never";
< 		$admtext['ldspermit'] = "Depending on user rights";
< 		$admtext['allow'] = "Allow";
< 		$admtext['chooselang'] = "Dynamic Language Change";
< 		$admtext['optimize'] = "Optimize";
< 		$admtext['succoptimized'] = "successfully optimized";
< 		$admtext['customheader'] = "Custom Header";
< 		$admtext['customfooter'] = "Custom Footer";
< 		$admtext['custommeta'] = "Custom Meta";
< 		$admtext['lineending'] = "Line Ending";
< 		$admtext['backuppath'] = "Backup Folder";
< 		$admtext['photopath'] = "Photo Folder";
< 		$admtext['headstonepath'] = "Headstone Folder";
< 		$admtext['historypath'] = "History Folder";
< 		$admtext['backuprestoretables'] = "Back up, Restore &amp; Optimize Table Data";
< 		$admtext['shownames'] = "Show Names for Living";
< 		$admtext['initials'] = "Abbreviate first name";
< 		$admtext['regformat'] = "Register Format";
< 		$admtext['stdformat'] = "Standard Format";
< 		$admtext['thumbprefix'] = "Thumbnails Prefix";
< 		$admtext['thumbmaxh'] = "Thumbnail Max Height";
< 		$admtext['thumbmaxw'] = "Thumbnail Max Width";
< 		$admtext['thumbsuffix'] = "Thumbnails Suffix";
< 		$admtext['showextended'] = "Show Extended Photo Info";
< 		$admtext['shownotes'] = "Show Notes";
< 		$admtext['notestogether'] = "Underneath corresponding events where possible";
< 		$admtext['notestogether2'] = "Underneath events, except general notes";
< 		$admtext['notesapart'] = "In Notes section";
< 		$admtext['lnprefixes'] = "Surname Prefixes (i.e., van, de)";
< 		$admtext['lntogether'] = "Keep as part of regular surname";
< 		$admtext['lnapart'] = "Treat as separate entity";
< 		$admtext['detectpfx'] = "Prefix Detection on Import";
< 		$admtext['lnpfxnum'] = "Num. prefixes each  (max)";
< 		$admtext['specpfx'] = "OR These specific prefixes";
< 		$admtext['newmedialinks'] = "New links for Photos/Histories";
< 		$admtext['maxgedcom'] = "Max Generations, GEDCOM download";
< 		$admtext['placestable'] = "Places Table";
---
> 		$admtext['tablesuccess'] = "Tablice su uspješno izrađene.";
> 		$admtext['backtosetup'] = "Natrag na Izbornik za Postavljanje";
> 		$admtext['configuration'] = "Konfiguracija";
> 		$admtext['entersysvars'] = "Unesite vrijednosti za varijable sustava.";
> 		$admtext['createdbtables'] = "Napravite tablice baza podataka za smještaj vaših podataka.";
> 		$admtext['tcwarning'] = "<strong>UPOZORENJE!</strong> Odaberite ovu opciju samo kad prvi put postavljate web mjesto. <strong>Svi postojeći podaci, uklju�ujući fotografije, povijesti, nadgrobne spomenike i podatke o groblju, bit će izbrisani!</strong>";
> 		$admtext['conftabledelete'] = "Time ćete izbrisati SVE vaše postojeće podatke !! Jeste li sigurni da želite nastaviti?";
> 		$admtext['performdatamaint'] = "Izvršite održavanje podataka i upravljajte fotografijama, povijesti i ostalim komponentama.";
> 		$admtext['createtables'] = "Stvorite Tablice";
> 		$admtext['configsettings'] = "Opće Postavke";
> 		$admtext['logconfigsettings'] = "Zapisnik Postavka";
> 		$admtext['importconfigsettings'] = "Uvoz Postavka";
> 		$admtext['diagnostics'] = "Dijagnostika";
> 		$admtext['rundiags'] = "Pokrenite Dijagnostiku";
> 		$admtext['phpinf'] = "Informacije o PHP zaslonu";
> 		$admtext['fromphp'] = "Ove informacije dolaze s vašeg poslužitelja i odnose se na vašu PHP instalaciju, a ne na TNG.";
> 		$admtext['phpver'] = "PHP verzija";
> 		$admtext['phpreq'] = "(za TNG je potrebno 7.0 ili više.)";
> 		$admtext['gdlib'] = "GD grafi�ka knjižnica";
> 		$admtext['gdreq'] = "(Potrebni TNG alat za stvaranje sli�ica.)";
> 		$admtext['availnogif'] = "Dostupno, ali ne podržava .gif slike";
> 		$admtext['notinst'] = "Nije instalirano";
> 		$admtext['safemode'] = "Siguran Na�in";
> 		$admtext['off'] = "Isklju�en";
> 		$admtext['on'] = "Uklju�en";
> 		$admtext['fileuploads'] = "Prenositi datoteku";
> 		$admtext['fureq'] = "(Potrebno za internetski prijenos GEDCOM, prijenos slika i ostale funkcionalnosti obrasca.)";
> 		$admtext['perm'] = "Dopušteno";
> 		$admtext['notperm'] = "Nije Dopušteno, umjesto toga koristite FTP";
> 		$admtext['sqlver'] = "MySQL verzija";
> 		$admtext['sqlreq'] = "(za TNG je potrebno 5.5 ili više.)";
> 		$admtext['wsrvr'] = "Web-poslužitelj";
> 		$admtext['fperms'] = "Dozvole za datoteke/mape";
> 		$admtext['fpreq'] = "(TNG zahtijeva da neke datoteke i mape imaju posebna prava pristupa.)";
> 		$admtext['scruser'] = "Skripta koja radi kao korisnik:";
> 		$admtext['phpuser'] = "PHP ga prijavljuje kao korisnika:";
> 		$admtext['usrprob'] = "Možda nećete imati potrebnu razinu pristupa datotekama da biste pokrenuli TNG bez problema ako za upravljanje datotekama koristite i FTP i TNG administracijske funkcije.";
> 		$admtext['rofile'] = "Datoteka je samo za �itanje:";
> 		$admtext['rofolder'] = "Mapa je samo za �itanje:";
> 		$admtext['publog'] = "Javni zapisnik";
> 		$admtext['admlog'] = "Administratora zapisnik";
> 		$admtext['folderdne'] = "Mapa ne postoji:";
> 		$admtext['keyrw'] = "Glavne mape su sve markirane za �itaj/piši";
> 		$admtext['cfgrw'] = "Sve konfiguracijske datoteke �itaju/pišu";
> 		$admtext['acceptable'] = "Prihvatljiv.";
> 		$admtext['restricted'] = "Neke su funkcije možda ograni�ene. Možete naići na pogreške tijekom instalacije ili tijekom pokretanja TNG.";
> 		$admtext['needchngs'] = "TNG se ne može pokretati bez promjena na PHP ili konfiguraciji poslužitelja.";
> 		$admtext['yourbrowser'] = "Vaš preglednik:";
> 		$admtext['modifysettings'] = "Izmijenite Postavke Konfiguracije";
> 		$admtext['dbhost'] = "Baza Podataka Glavno Ra�unalo";
> 		$admtext['dbname'] = "Naziv Baza Podataka";
> 		$admtext['dbusername'] = "Korisni�ko ime baze podataka";
> 		$admtext['dbpassword'] = "Lozinka baze podataka";
> 		$admtext['rootpath'] = "Korijenski Put";
> 		$admtext['homepage'] = "Po�etna Stranica";
> 		$admtext['emailaddress'] = "Adresa e-pošte";
> 		$admtext['siteowner'] = "Vlasnik Stranice";
> 		$admtext['maxdescgens'] = "Maks. Generacije potomstva";
> 		$admtext['disallow'] = "Onemogući";
> 		$admtext['defaultallowed'] = "Zadano: Dozvoljeno";
> 		$admtext['maxsearchresults'] = "Maks. Rezultati Pretraživanja";
> 		$admtext['targetframe'] = "Ciljni Okvir";
> 		$admtext['table'] = "Tablice";
> 		$admtext['lastbackup'] = "Zadnja sigurnosna kopija";
> 		$admtext['backup'] = "Sigurnosna Kopija";
> 		$admtext['restore'] = "Vratiti";
> 		$admtext['backupfilesize'] = "Veli�ina datoteke";
> 		$admtext['succbackedup'] = "uspješno sigurnosno kopiranje";
> 		$admtext['succrestored'] = "uspješno vra�enje";
> 		$admtext['change_cutoff'] = "'Novosti' dana";
> 		$admtext['change_limit'] = "'Novosti' Ograni�enje";
> 		$admtext['photosext'] = "Fotografije proširenje";
> 		$admtext['defaulttree'] = "Zadano Stablo";
> 		$admtext['requirelogin'] = "Zahtijeva Prijavu";
> 		$admtext['defaultdontrequire'] = "Zadano: Ne zahtijeva";
> 		$admtext['ldsdefault'] = "Pokaži podatke LDS";
> 		$admtext['ldson'] = "Uvjek";
> 		$admtext['ldsoff'] = "Nikada";
> 		$admtext['ldspermit'] = "Ovisno o korisni�kim pravima";
> 		$admtext['allow'] = "Dopustiti";
> 		$admtext['chooselang'] = "Dinami�ka promjena jezika";
> 		$admtext['optimize'] = "Optimizacija";
> 		$admtext['succoptimized'] = "uspješno optimiziran";
> 		$admtext['customheader'] = "Prilagođeno zaglavlje";
> 		$admtext['customfooter'] = "Prilagođeno podnožje";
> 		$admtext['custommeta'] = "Prilagođena Meta";
> 		$admtext['lineending'] = "Završetak retka";
> 		$admtext['backuppath'] = "Rezervna mapa";
> 		$admtext['photopath'] = "Fotografije Mapa";
> 		$admtext['headstonepath'] = "Spomenika Mapa";
> 		$admtext['historypath'] = "Povijesti Mapa";
> 		$admtext['backuprestoretables'] = "Sigurnosne kopije, Vraćanje &amp; Optimizirajte podatke tablice";
> 		$admtext['shownames'] = "Prikaži imena od živih";
> 		$admtext['initials'] = "Skraćeni naziv";
> 		$admtext['regformat'] = "Format registra";
> 		$admtext['stdformat'] = "Standardni format";
> 		$admtext['thumbprefix'] = "Prefiks sli�ica";
> 		$admtext['thumbmaxh'] = "Sli�ica Maks. Visina";
> 		$admtext['thumbmaxw'] = "Sli�ica Maks. Širina";
> 		$admtext['thumbsuffix'] = "Sli�ica Sufiks";
> 		$admtext['showextended'] = "Pokaži proširene informacije o fotografiji";
> 		$admtext['shownotes'] = "Pokaži bilješke";
> 		$admtext['notestogether'] = "Ispod odgovarajućih događaja gdje je to moguće";
> 		$admtext['notestogether2'] = "Ispod događanja, osim općih napomena";
> 		$admtext['notesapart'] = "U odjeljku Napomene";
> 		$admtext['lnprefixes'] = "Prefiksi Prezimena (tj. van, de)";
> 		$admtext['lntogether'] = "Zadržite kao dio redovnog prezimena";
> 		$admtext['lnapart'] = "Tretirajte kao zasebnu cjelinu";
> 		$admtext['detectpfx'] = "Prefiks Detekcija na Uvozu";
> 		$admtext['lnpfxnum'] = "Broj. prefikse svaki (maks)";
> 		$admtext['specpfx'] = "ILI Ovi specifi�ni prefiksi";
> 		$admtext['newmedialinks'] = "Nove poveznice za fotografije/povijesti";
> 		$admtext['maxgedcom'] = "Maks. generacije, GEDCOM preuzimanje";
> 		$admtext['placestable'] = "Tablica mjesta";
1008,1075c1101,1168
< 		$admtext['tngdomain'] = "Genealogy URL";
< 		$admtext['charset'] = "Character set";
< 		$admtext['time_offset'] = "Server time offset (hours)";
< 		$admtext['backupall'] = "Back up Selected";
< 		$admtext['optimizeall'] = "Optimize Selected";
< 		$admtext['alltables'] = "Selected Tables";
< 		$admtext['brinstructions'] = "To back up, restore or optimize a table, click on the appropriate action icon for that table, or select multiple tables and apply that action to all selected by clicking the corresponding button at the bottom of the screen.";
< 		$admtext['tabstyle'] = "Tabs Style Sheet";
< 		$admtext['iconloc'] = "Menu Location";
< 		$admtext['topleft'] = "Top left, over heading";
< 		$admtext['topright'] = "Top right, next to heading";
< 		$admtext['indstart'] = "Individuals start with";
< 		$admtext['persinfo'] = "Personal information only";
< 		$admtext['allinfo'] = "All information";
< 		$admtext['thumbcols'] = "Columns in Thumbnail View";
< 		$admtext['stdesc'] = "Start Descendancy";
< 		$admtext['stexpand'] = "Expanded";
< 		$admtext['stcollapse'] = "Collapsed";
< 		$admtext['regnosp'] = "Register Generations";
< 		$admtext['chshow'] = "Always show everyone";
< 		$admtext['chifsp'] = "Remove individuals with no family";
< 		$admtext['restoreall'] = "Restore Selected";
< 		$admtext['surerestore'] = "Are you sure you want to restore the selected tables?";
< 		$admtext['surerestorets'] = "Are you sure you want to restore the table structure? All existing data will be lost!";
< 		$admtext['backupstruct'] = "Back up Table Structure";
< 		$admtext['tablestruct'] = "Table structure";
< 		$admtext['brinstructions2'] = "To back up or restore the table structure, click on the appropriate action icon below. WARNING: Restoring the table structure will delete all existing data!";
< 		$admtext['livedefault'] = "Show Living Data";
< 		$admtext['nodisplay'] = "Do not display";
< 		$admtext['menudisp'] = "Display menu";
< 		$admtext['asicons'] = "As icons";
< 		$admtext['asdrop'] = "As dropdown list";
< 		$admtext['gendex'] = "GENDEX Folder";
< 		$admtext['modifypedsettings'] = "Modify Pedigree Configuration Settings";
< 		$admtext['leftindent'] = "Left Indent";
< 		$admtext['boxnamesize'] = "Box Name Size";
< 		$admtext['namesizeshift'] = "Name Size Shift";
< 		$admtext['boxdatessize'] = "Box Dates Size";
< 		$admtext['datessizeshift'] = "Dates Size Shift";
< 		$admtext['boxcolor'] = "Box Color";
< 		$admtext['colorshift'] = "Color Shift (%)";
< 		$admtext['emptycolor'] = "Empty Color";
< 		$admtext['bordercolor'] = "Border Color";
< 		$admtext['shadowcolor'] = "Shadow Color";
< 		$admtext['boxwidth'] = "Box Width (w/o popups)";
< 		$admtext['boxheight'] = "Box Height (w/o popups)";
< 		$admtext['boxalign'] = "Box Alignment (w/o popups)";
< 		$admtext['boxheightshift'] = "Box Height Shift (w/o popups)";
< 		$admtext['boxHsep'] = "Box Horizontal Separation";
< 		$admtext['boxVsep'] = "Box Vertical Separation";
< 		$admtext['shadowoffset'] = "Shadow Offset";
< 		$admtext['linewidth'] = "Line Width";
< 		$admtext['borderwidth'] = "Border Width";
< 		$admtext['popupcolor'] = "Popup Color";
< 		$admtext['popupinfosize'] = "Popup Info Size";
< 		$admtext['popupinfosizeshift'] = "Popup Info Size Shift";
< 		$admtext['popuptimer'] = "Popup Timer (ms)";
< 		$admtext['pedevent'] = "Popup Event";
< 		$admtext['puboxwidth'] = "Box Width (w/popups)";
< 		$admtext['puboxheight'] = "Box Height (w/popups)";
< 		$admtext['puboxalign'] = "Box Alignment (w/popups)";
< 		$admtext['puboxheightshift'] = "Box Height Shift (w/popups)";
< 		$admtext['popupspouses'] = "Popup Spouses";
< 		$admtext['popupkids'] = "Popup Children";
< 		$admtext['popupchartlinks'] = "Popup Chart Links";
< 		$admtext['inclphotos'] = "Include Photos";
< 		$admtext['overflow'] = "Overflow";
< 		$admtext['pedcompact'] = "Compact";
---
> 		$admtext['tngdomain'] = "Genealoški URL";
> 		$admtext['charset'] = "Skup slova";
> 		$admtext['time_offset'] = "Poslužitelj vrijeme pomak vremena (sati))";
> 		$admtext['backupall'] = "Stvorite sigurnosnu kopiju odabranog";
> 		$admtext['optimizeall'] = "Optimizirajte odabrane";
> 		$admtext['alltables'] = "Odabrane tablice";
> 		$admtext['brinstructions'] = "Da biste napravili sigurnosnu kopiju, restaurirali ili optimizirali tablicu, kliknite odgovarajuću ikonu akcije za tu tablicu ili odaberite više tablica i primijenite tu radnju na sve odabrane odabirom odgovarajuće radnje na vrhu zaslona.";
> 		$admtext['tabstyle'] = "Kartica Stila List";
> 		$admtext['iconloc'] = "Lokacija izbornika";
> 		$admtext['topleft'] = "Gore lijevo, iznad naslova";
> 		$admtext['topright'] = "Gore desno, uz naslov";
> 		$admtext['indstart'] = "Pojedinci zapo�inju s";
> 		$admtext['persinfo'] = "Samo osobni podaci";
> 		$admtext['allinfo'] = "Sve informacije";
> 		$admtext['thumbcols'] = "Stupci u prikazu sli�ice";
> 		$admtext['stdesc'] = "Po�etak Potomaka";
> 		$admtext['stexpand'] = "Proširen";
> 		$admtext['stcollapse'] = "Zatvoren";
> 		$admtext['regnosp'] = "Registrirajte Generacije";
> 		$admtext['chshow'] = "Uvijek pokaži sve";
> 		$admtext['chifsp'] = "Uklonite pojedince koji nemaju obitelj";
> 		$admtext['restoreall'] = "Vrati Odabrano";
> 		$admtext['surerestore'] = "Jeste li sigurni da želite vratiti odabrane tablice?";
> 		$admtext['surerestorets'] = "Jeste li sigurni da želite vratiti strukturu tablice? Svi postojeći podaci bit će izgubljeni!";
> 		$admtext['backupstruct'] = "Sigurnosnu Kopiju Strukture Tablica";
> 		$admtext['tablestruct'] = "Tablica Struktura";
> 		$admtext['brinstructions2'] = "Za sigurnosnu kopiju ili vraćanje strukture tablice, kliknite odgovarajuću ikonu akcije u nastavku. UPOZORENJE: Vraćanjem strukture tablice izbrisati ćete sve postojeće podatke!";
> 		$admtext['livedefault'] = "Prikaži podatke o živim";
> 		$admtext['nodisplay'] = "Ne prikazuj";
> 		$admtext['menudisp'] = "Prikaži Izbornik";
> 		$admtext['asicons'] = "Kao ikone";
> 		$admtext['asdrop'] = "Kao padajući popis";
> 		$admtext['gendex'] = "GENDEX Mapa";
> 		$admtext['modifypedsettings'] = "Izmijenite postavke konfiguracije Pedigrea";
> 		$admtext['leftindent'] = "Lijeva Uvlaka";
> 		$admtext['boxnamesize'] = "Veli�ina Fonta";
> 		$admtext['namesizeshift'] = "Ime Veli�ina Smjena";
> 		$admtext['boxdatessize'] = "Veli�ina Datuma Kutije";
> 		$admtext['datessizeshift'] = "Datumi Veli�ina Smjena";
> 		$admtext['boxcolor'] = "Boja Kutije";
> 		$admtext['colorshift'] = "Boje Smjena (%)";
> 		$admtext['emptycolor'] = "Prazna Boja";
> 		$admtext['bordercolor'] = "Rub Boja";
> 		$admtext['shadowcolor'] = "Sjene Boja";
> 		$admtext['boxwidth'] = "Širina Kutije (bez sko�nih prozora)";
> 		$admtext['boxheight'] = "Visina Kutije (bez sko�nih prozora)";
> 		$admtext['boxalign'] = "Kutije Poravnanje (bez sko�nih prozora)";
> 		$admtext['boxheightshift'] = "Kutije Visina Smjena (bez sko�nih prozora)";
> 		$admtext['boxHsep'] = "Kutije Vodoravno Odvajanje";
> 		$admtext['boxVsep'] = "Kutija Okomita Odvajanja";
> 		$admtext['shadowoffset'] = "Pomak Sjene";
> 		$admtext['linewidth'] = "Å irina Linije";
> 		$admtext['borderwidth'] = "Å irina Obruba";
> 		$admtext['popupcolor'] = "Sko�nih Prozora Boja";
> 		$admtext['popupinfosize'] = "Veli�ina Info o Sko�nom Prozoru";
> 		$admtext['popupinfosizeshift'] = "Veli�ina info o Sko�nom Prozoru Smjena";
> 		$admtext['popuptimer'] = "Pokaziva� vremena (ms)";
> 		$admtext['pedevent'] = "Sko�nom Događaju";
> 		$admtext['puboxwidth'] = "Kutije Širina (s sko�nih prozora)";
> 		$admtext['puboxheight'] = "Kutije Visina (s sko�nih prozora)";
> 		$admtext['puboxalign'] = "Kutije Poravnanje (s sko�nih prozora)";
> 		$admtext['puboxheightshift'] = "Kutije Visina Smjena (s sko�nih prozora)";
> 		$admtext['popupspouses'] = "Sko�nom Prozoru s Supružnici";
> 		$admtext['popupkids'] = "Sko�nom Prozoru s Dijecom";
> 		$admtext['popupchartlinks'] = "Sko�nom Prozoru s Grafikona Linkovi";
> 		$admtext['inclphotos'] = "Uklju�i fotografije";
> 		$admtext['overflow'] = "Preljev";
> 		$admtext['pedcompact'] = "Kompakt";
1077,1084c1170,1177
< 		$admtext['pedtextonly'] = "Text Only";
< 		$admtext['relchart'] = "Relationship Chart";
< 		$admtext['maxupgen'] = "Max Relationship Generations";
< 		$admtext['left'] = "Left";
< 		$admtext['right'] = "Right";
< 		$admtext['center'] = "Center";
< 		$admtext['mouseover'] = "Mouse Over";
< 		$admtext['mousedown'] = "Mouse Down";
---
> 		$admtext['pedtextonly'] = "Tekst Samo";
> 		$admtext['relchart'] = "Grafikon Odnosa";
> 		$admtext['maxupgen'] = "Maks. Generacije Odnosa";
> 		$admtext['left'] = "Lijevo";
> 		$admtext['right'] = "Desno";
> 		$admtext['center'] = "Centar";
> 		$admtext['mouseover'] = "Miš Preko";
> 		$admtext['mousedown'] = "Miš Dolje";
1086,1091c1179,1184
< 		$admtext['pedbox'] = "Box";
< 		$admtext['hideempty'] = "Hide Empty Boxes";
< 		$admtext['logfilename'] = "Log File Name";
< 		$admtext['maxloglines'] = "Max Log Lines";
< 		$admtext['modifylogsettings'] = "Modify Log Configuration Settings";
< 		$admtext['badhosts'] = "Exclude Host Names";
---
> 		$admtext['pedbox'] = "Kutija";
> 		$admtext['hideempty'] = "Sakrijte Prazne Kutije";
> 		$admtext['logfilename'] = "Naziv Datoteke Dnevnika";
> 		$admtext['maxloglines'] = "Maks. Linije u Dnevniki";
> 		$admtext['modifylogsettings'] = "Izmijenite Postavke Konfiguracije Dnevnika";
> 		$admtext['badhosts'] = "Isklju�iti Glavno Ra�unalo Imena";
1093,1300c1186,1386
< 		$admtext['text_public'] = "(Public)";
< 		$admtext['saveimportstate'] = "Save Import State";
< 		$admtext['allowresume'] = "Save to allow resume if import fails";
< 		$admtext['modifyimportsettings'] = "Modify Import Configuration Settings";
< 		$admtext['embeddedmedia'] = "Embedded Media";
< 		$admtext['assignnames'] = "Allow TNG to assign names to embedded media";
< 		$admtext['localphotopath'] = "Local Photo Path(s)";
< 		$admtext['localdocpath'] = "Local History Path(s)";
< 		$admtext['nopathmatch'] = "If no local path match";
< 		$admtext['wholepath'] = "Import entire path";
< 		$admtext['justname'] = "Import file name only";
< 		$admtext['gedpath'] = "GEDCOM Folder (Import/Export)";
< 		$admtext['makefolder'] = "Make Folder";
< 		$admtext['blankchangedt'] = "If 'Change Date' is blank";
< 		$admtext['usetoday'] = "Use current date";
< 		$admtext['useblank'] = "Leave it as is";
< 		$admtext['nobirthdate'] = "If no birth date, assume";
< 		$admtext['persliving'] = "Person is living";
< 		$admtext['persdead'] = "Person is deceased";
< 		$admtext['nodeathdate'] = "If no death date, assume deceased<br />if older than";
< 		$admtext['pedconfigsettings'] = "Chart Settings";
< 		$admtext['usepopups'] = "Initial Display";
< 		$admtext['maxpedgens'] = "Max Generations";
< 		$admtext['dbsection'] = "Database";
< 		$admtext['tablesection'] = "Table Names";
< 		$admtext['foldersection'] = "Paths and Folders";
< 		$admtext['sitesection'] = "Site Design and Definition";
< 		$admtext['privsection'] = "Privacy";
< 		$admtext['namesection'] = "Names";
< 		$admtext['descsection'] = "Descendancy";
< 		$admtext['miscsection'] = "Miscellaneous";
< 		$admtext['mediatable'] = "Media Table";
< 		$admtext['pedanddesc'] = "Common Elements";
< 		$admtext['descchart'] = "Descendancy Chart";
< 		$admtext['pedchart'] = "Pedigree Chart";
< 		$admtext['initgens'] = "Initial Generations";
< 		$admtext['mediapath'] = "Multimedia Folder";
< 		$admtext['documentpath'] = "Document Folder";
< 		$admtext['localdocumentpath'] = "Local Document Path(s)";
< 		$admtext['localotherpath'] = "Local Path(s) for Other Media";
< 		$admtext['imgmaxh'] = "Image Max Height";
< 		$admtext['imgmaxw'] = "Image Max Width";
< 		$admtext['succdel'] = "successfully deleted";
< 		$admtext['delbkups'] = "Delete Selected Backups";
< 		$admtext['suredelbk'] = "Are you sure you want to delete the selected backups?";
< 		$admtext['showhome'] = "Show Home Link";
< 		$admtext['showsearch'] = "Show Search Link";
< 		$admtext['showlogin'] = "Show Login/Logout Link";
< 		$admtext['showprint'] = "Show Print Link";
< 		$admtext['showbmarks'] = "Show Add Bookmark Link";
< 		$admtext['server'] = "(server)";
< 		$admtext['client'] = "(client)";
< 		$admtext['sitename'] = "Site Name";
< 		$admtext['site_desc'] = "Site Description";
< 		$admtext['privnote'] = "Prefix for private notes";
< 		$admtext['custvars'] = "Note: You may create your own custom settings in \"customconfig.php\" (open in a text editor and follow the instructions).";
< 		$admtext['blockemail'] = "Block suggestions or new user registrations where";
< 		$admtext['addrcontains'] = "Address contains";
< 		$admtext['msgcontains'] = "Message contains";
< 		$admtext['reqloginset'] = "\"Require Login\" must be set to Yes to enable this option";
< 		$admtext['treerestrict'] = "Restrict access to assigned tree";
< 		$admtext['mapconfigsettings'] = "Map Settings";
< 		$admtext['modifymapsettings'] = "Modify Map Configuration Settings";
< 		$admtext['maptype'] = "Map Type";
< 		$admtext['maphybrid'] = "Hybrid";
< 		$admtext['mapsatellite'] = "Satellite";
< 		$admtext['mapdimsind'] = "Dimensions, Individual Page";
< 		$admtext['mapdimshst'] = "Dimensions, Headstones Pages";
< 		$admtext['mapdimsadm'] = "Dimensions, Admin Pages";
< 		$admtext['mapwidth'] = "Width (% or px)";
< 		$admtext['mapheight'] = "Height (px)";
< 		$admtext['mapstlat'] = "Starting Latitude";
< 		$admtext['mapstlong'] = "Starting Longitude";
< 		$admtext['startoff'] = "Hide Admin Maps to Start";
< 		$admtext['conslpins'] = "Consolidate Duplicate Pins";
< 		$admtext['ssenabled'] = "Enable Slide Show";
< 		$admtext['ssrepeat'] = "Slide Show Auto Repeat";
< 		$admtext['sysinfo'] = "Display information about your web site environment.";
< 		$admtext['albumlinkstable'] = "Album Links Table";
< 		$admtext['addresstable'] = "Addresses Table";
< 		$admtext['statestable'] = "States Table";
< 		$admtext['countriestable'] = "Countries Table";
< 		$admtext['notelinkstable'] = "Note Links Table";
< 		$admtext['medialinkstable'] = "Media Links Table";
< 		$admtext['saveimporttable'] = "Save Import Table";
< 		$admtext['brlinkstable'] = "Tabela linkova grana";
< 		$admtext['temptable'] = "Temp Events Table";
< 		$admtext['tleventstable'] = "Timeline Events Table";
< 		$admtext['album2entitiestable'] = "Album Links";
< 		$admtext['doctype'] = "Doctype Declaration";
< 		$admtext['cemrows'] = "Max lines per column (approx.)";
< 		$admtext['cemblanks'] = "Suppress \"Unknown\" categories";
< 		$admtext['success'] = "Success";
< 		$admtext['fexists'] = "Failed. Folder already exists.";
< 		$admtext['fmanual'] = "Failed. Please create using an FTP program or online file manager.";
< 		$admtext['maintmode'] = "Maintenance Mode";
< 		$admtext['maintexp'] = "All database access is temporarily unavailable for site maintenance. Please try again later. If regular functions do not resume within a few hours of first seeing this message, please contact the site administrator.";
< 		$admtext['defimpopt'] = "Default Replace Option";
< 		$admtext['seltable'] = "Please select at least one table.";
< 		$admtext['renumber'] = "Resequence IDs";
< 		$admtext['idtype'] = "ID Type";
< 		$admtext['mindigits'] = "Minimum Digits";
< 		$admtext['niprefix'] = "Not including ID prefix";
< 		$admtext['finreseq'] = "Finished resequencing";
< 		$admtext['recsreseq'] = "records resequenced";
< 		$admtext['needmaint'] = "You must be in Maintenance Mode to run this utility (go to Setup &gt;&gt; Configuration &gt;&gt; General Settings)";
< 		$admtext['reseqwarn'] = "<strong>WARNING:</strong> Resequencing your IDs could cause external links to your site to break or point to erroneous locations.";
< 		$admtext['subroot'] = "Subroot Path";
< 		$admtext['hidechr'] = "Hide Christening Labels";
< 		$admtext['datefmt'] = "Numeric Date Preference";
< 		$admtext['dayfirst'] = "Day/Month/Year";
< 		$admtext['monthfirst'] = "Month/Day/Year";
< 		$admtext['exusers'] = "Exclude Usernames";
< 		$admtext['allowreg'] = "Allow new user registrations";
< 		$admtext['localhspath'] = "Local Headstone Path(s)";
< 		$admtext['pardata'] = "Parental data on person page:";
< 		$admtext['pnoevents'] = "Don't show any events";
< 		$admtext['pstdonly'] = "Show only standard family events";
< 		$admtext['palldata'] = "Show all events and media";
< 		$admtext['servertime'] = "Server time is";
< 		$admtext['sitetime'] = "and site time is";
< 		$admtext['srexpl'] = "Optional. Use an absolute path name, like what you see in the Root Path, then move the following files to the Config Path <strong>immediately</strong> after saving and make them writeable (664 permissions): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
< 		$admtext['mapstzm'] = "Starting Zoom";
< 		$admtext['mapfoundzm'] = "Location Zoom";
< 		$admtext['rrnum'] = "Record Report Number";
< 		$admtext['progint'] = "Progress Interval (ms)";
< 		$admtext['timechart'] = "Timeline Chart";
< 		$admtext['tcheight'] = "Chart height";
< 		$admtext['distances'] = "All distances measured in pixels.";
< 		$admtext['mpixels'] = "Pixels between months";
< 		$admtext['ypixels'] = "Pixels between years";
< 		$admtext['ymult'] = "Years between year markers";
< 		$admtext['mpct'] = "Vertical percentage for months";
< 		$admtext['ypct'] = "Vertical percentage for years";
< 		$admtext['inclevs'] = "Events to include";
< 		$admtext['allevs'] = "All events";
< 		$admtext['rangeevs'] = "Only events that fall within the lifespans of the people on the chart";
< 		$admtext['tcwidth'] = "Starting chart width";
< 		$admtext['simile'] = "Enable Simile timeline";
< 		//added in 8.0.0
< 		$admtext['pstartoff'] = "Hide Public Maps to Start";
< 		$admtext['maxrels'] = "Max Relationships";
< 		$admtext['initrels'] = "Initial Relationships";
< 		$admtext['templateconfigsettings'] = "Template Settings";
< 		$admtext['modifytemplatesettings'] = "Modify Template Configuration Settings";
< 		$admtext['ucsurnames'] = "Uppercase All Surnames";
< 		$admtext['maxnoteprev'] = "Max characters in list notes";
< 		$admtext['mailreg'] = "Mail and Registration";
< 		$admtext['autoapp'] = "Auto approve new users";
< 		$admtext['inclpwd'] = "Include password in welcome email";
< 		$admtext['ackemail'] = "Send acknowledgement email";
< 		$admtext['fromadmin'] = "Send all mail from address above";
< 		$admtext['autotree'] = "Create new tree for user";
< 		$admtext['modspath'] = "Mods Folder";
< 		$admtext['extspath'] = "Extensions Folder";
< 		$admtext['encrtype'] = "Encryption type";
< 		$admtext['none'] = "No encryption";
< 		$admtext['imgviewer'] = "Enable image viewer";
< 		$admtext['docsonly'] = "Documents only";
< 		$admtext['imgvheight'] = "Image viewer height";
< 		$admtext['flex'] = "Always show full image";
< 		$admtext['setheight'] = "Fixed (640px)";
< 		//added in 9.0.0
< 		$admtext['places1tree'] = "Assign Place records to Trees";
< 		$admtext['convert'] = "Convert";
< 		$admtext['convexpl'] = "(This will assign all current places to the selected tree)";
< 		$admtext['mergeexpl'] = "(This will remove the tree assignment from all Place records)";
<         $admtext['nocutoff'] = "Leave blank or set to zero to remove this limit";
<         $admtext['usesmtp'] = "Use SMTP authentication";
<         $admtext['mailhost'] = "SMTP host name";
<         $admtext['mailuser'] = "Mail username";
<         $admtext['mailpass'] = "Mail password";
<         $admtext['mailport'] = "Port number";
< 		$admtext['showshare'] = "Show Share Link";
< 		$admtext['defpgsize'] = "Default PDF Page Size";
< 		$admtext['mapterrain'] = "Terrain";
< 		$admtext['maproadmap'] = "Road Map";
< 		$admtext['usedefthumbs'] = "Use default thumbnails";
<         $admtext['autogeo'] = "Geocode all new places";
<         $admtext['revmail'] = "Notify on reviewable submissions";
<         $admtext['assumepriv'] = "Assume private if not dead this many years";
<         $admtext['calstart'] = "First day of week";
< 		$admtext['edit_timeout'] = "Edit timeout (minutes)";
< 		$admtext['shownamespr'] = "Show Names for Private";
< 		$admtext['tables'] = "Tables";
< 		//changed in 10.0.0
< 		$admtext['regnotes'] = "Show Notes on Register";
< 		//added in 10.0.0
< 		$admtext['collation'] = "Collation";
< 		$admtext['collationexpl'] = "(leave blank to accept the default)";
< 		$admtext['scrollcite'] = "Scroll citations";
< 		$admtext['hidemedia'] = "Hide personal media";
< 		$admtext['searchchoice'] = "Search Link Destination";
< 		$admtext['quicksearch'] = "Quick Search";
< 		$admtext['advsearch'] = "Advanced Search";
< 		$admtext['pedvertical'] = "Vertical";
< 		$admtext['vboxwidth'] = "Box Width";
< 		$admtext['vboxheight'] = "Box Height";
< 		$admtext['vspacing'] = "Spacing";
< 		$admtext['vchart'] = "Vertical Chart";
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Re-use deleted IDs";
< 		$admtext['lastimport'] = "Show last import";
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Encryption";
<         //added in 11.0.0
< 		$admtext['dbport'] = "Database Port";
< 		$admtext['dbsocket'] = "Database Socket";
---
> 		$admtext['text_public'] = "(Javno)";
> 		$admtext['saveimportstate'] = "Sa�uvaj Stanje Uvoza";
> 		$admtext['allowresume'] = "Sa�uvaj da biste omogućili nastavak ako uvoz ne uspije";
> 		$admtext['modifyimportsettings'] = "Izmijenite postavke konfiguracije uvoza";
> 		$admtext['embeddedmedia'] = "Ugrađeni mediji";
> 		$admtext['assignnames'] = "Dopustite TNG da dodijeli imena ugrađenim medijima";
> 		$admtext['localphotopath'] = "Lokalni put(ovi) fotografije";
> 		$admtext['localdocpath'] = "Lokalni put(ovi) Povijesti";
> 		$admtext['nopathmatch'] = "Ako se ne podudara lokalni put";
> 		$admtext['wholepath'] = "Uvoz cijelog put";
> 		$admtext['justname'] = "Uvezi samo naziv datoteke";
> 		$admtext['gedpath'] = "GEDCOM Mapa (Uvoz/Izvoz)";
> 		$admtext['makefolder'] = "Napravite mapu";
> 		$admtext['blankchangedt'] = "Ako je 'Promijeni datum' prazan";
> 		$admtext['usetoday'] = "Koristite trenutni datum";
> 		$admtext['useblank'] = "Ostavite to kako jest";
> 		$admtext['nobirthdate'] = "Ako nema datuma rođenja, pretpostavite";
> 		$admtext['persliving'] = "Osoba živi";
> 		$admtext['persdead'] = "Osoba je preminula";
> 		$admtext['nodeathdate'] = "Ako nema datuma smrti, pretpostavite da je pokojnik<br />stariji od";
> 		$admtext['pedconfigsettings'] = "Postavke Grafikona";
> 		$admtext['usepopups'] = "Po�etni prikaz";
> 		$admtext['maxpedgens'] = "Maks. Generacija";
> 		$admtext['dbsection'] = "Baza podataka";
> 		$admtext['tablesection'] = "Tablice Imena";
> 		$admtext['foldersection'] = "Puti i Mape";
> 		$admtext['sitesection'] = "Dizajn i definicija web mjesta";
> 		$admtext['privsection'] = "Privatnost";
> 		$admtext['namesection'] = "Imena";
> 		$admtext['descsection'] = "Potomak";
> 		$admtext['miscsection'] = "Razni";
> 		$admtext['mediatable'] = "Medija Tabllica";
> 		$admtext['pedanddesc'] = "Zajedni�ki Elementi";
> 		$admtext['descchart'] = "Potomak Grafikon";
> 		$admtext['pedchart'] = "Pedigrea Grafikon";
> 		$admtext['initgens'] = "Po�etne Generacije";
> 		$admtext['mediapath'] = "Multimedijska Mapa";
> 		$admtext['documentpath'] = "Dokumenta Mapa";
> 		$admtext['localdocumentpath'] = "Lokalni Put(ovi) Dokumenta";
> 		$admtext['localotherpath'] = "Lokalni Put(ovi) Druge Medije";
> 		$admtext['imgmaxh'] = "Slika Maks. Visina";
> 		$admtext['imgmaxw'] = "Slike Maks. Å irina";
> 		$admtext['succdel'] = "uspješno izbrisano";
> 		$admtext['delbkups'] = "Izbrišite Odabrane Sigurnosne Kopije";
> 		$admtext['suredelbk'] = "Jeste li sigurni da želite izbrisati odabrane sigurnosne kopije?";
> 		$admtext['showhome'] = "Prikaži Po�etnu Linkovi";
> 		$admtext['showsearch'] = "Prikaži Petraživanja Linkovi";
> 		$admtext['showlogin'] = "Prikaži Prijaviti se/Odjaviti se Linkovi";
> 		$admtext['showprint'] = "Prikaži Ipisa Linkovi";
> 		$admtext['showbmarks'] = "Prikaži Dodaj Bookmark Linkovi";
> 		$admtext['server'] = "(poslužitelj)";
> 		$admtext['client'] = "(klijent)";
> 		$admtext['sitename'] = "Web Mjesta Ime";
> 		$admtext['site_desc'] = "Web Mjesta Opis";
> 		$admtext['privnote'] = "Prefiks za Privatne Bilješke";
> 		$admtext['custvars'] = "NAPOMENA: Možete stvoriti vlastite prilagođene postavke u \"customconfig.php \" (otvorite se u uređiva�u teksta i slijedite upute).";
> 		$admtext['blockemail'] = "Blokirajte prijedloge ili nove korisni�ke registracije gdje";
> 		$admtext['addrcontains'] = "Adresa sadrži";
> 		$admtext['msgcontains'] = "Poruka sadrži";
> 		$admtext['reqloginset'] = "\"Zahtijeva prijavu\" mora biti postavljeno na Da kako biste omogućili ovu opciju";
> 		$admtext['treerestrict'] = "Ograni�i pristup dodijeljenom stablu";
> 		$admtext['mapconfigsettings'] = "Postavke Karte";
> 		$admtext['modifymapsettings'] = "Izmijenite postavke konfiguracije karte";
> 		$admtext['maptype'] = "Vrsta Karte";
> 		$admtext['maphybrid'] = "Hibrid";
> 		$admtext['mapsatellite'] = "Satelit";
> 		$admtext['mapdimsind'] = "Dimenzije, Pojedina�na Stranica";
> 		$admtext['mapdimshst'] = "Dimenzije Spomenika Stranica";
> 		$admtext['mapdimsadm'] = "Dimenzije Administrator Stranica";
> 		$admtext['mapwidth'] = "Å irina (% or px)";
> 		$admtext['mapheight'] = "Visina (px)";
> 		$admtext['mapstlat'] = "Po�evši Latitude";
> 		$admtext['mapstlong'] = "Po�evši od Longitude";
> 		$admtext['startoff'] = "Sakrij Administrativne Karte za Po�etak";
> 		$admtext['conslpins'] = "Konsolidirajte Duplikate Igle";
> 		$admtext['ssenabled'] = "Omogući Prezentaciju";
> 		$admtext['ssrepeat'] = "Prezentacija Automatsko Ponavljanje";
> 		$admtext['sysinfo'] = "Informacije o okruženju vaše web stranice.";
> 		$admtext['albumlinkstable'] = "Album Medija";
> 		$admtext['addresstable'] = "Adresa";
> 		$admtext['statestable'] = "Države";
> 		$admtext['countriestable'] = "Države";
> 		$admtext['notelinkstable'] = "Napomene Linkovi";
> 		$admtext['medialinkstable'] = "Medije Linkovi";
> 		$admtext['saveimporttable'] = "Sa�uvaj Uvoz";
> 		$admtext['brlinkstable'] = "Grane Linkovi";
> 		$admtext['temptable'] = "Privremeni Događaji";
> 		$admtext['tleventstable'] = "Vremenski Raspored Događaja";
> 		$admtext['album2entitiestable'] = "Albuma Linkovi";
> 		$admtext['doctype'] = "Izjava o Dotiku";
> 		$admtext['cemrows'] = "Maks. Redova po Stupcu (cca.)";
> 		$admtext['cemblanks'] = "Potisnite \"Nepoznato \" kategorije";
> 		$admtext['success'] = "Uspjeh";
> 		$admtext['fexists'] = "Neuspjeh. Mapa već postoji.";
> 		$admtext['fmanual'] = "Neuspjeh. Izradite pomoću FTP programa ili mrežnog upravitelja datoteka.";
> 		$admtext['maintmode'] = "Održavanje";
> 		$admtext['maintexp'] = "Sav pristup bazi podataka privremeno je nedostupan za održavanje web mjesta. Molimo pokušajte ponovo kasnije. Ako se redovne funkcije ne nastave nakon nekoliko sati od prvog gledanja ove poruke, obratite se administratoru web mjesta.";
> 		$admtext['defimpopt'] = "Zadana Opcija Zamijeni";
> 		$admtext['seltable'] = "Odaberite barem jednu tablicu.";
> 		$admtext['renumber'] = "Resekcioniranje ID";
> 		$admtext['idtype'] = "ID Vrsta";
> 		$admtext['mindigits'] = "Min. Brojevi";
> 		$admtext['niprefix'] = "Ne Uklju�uje ID Prefiksa";
> 		$admtext['finreseq'] = "Gotovo Resekcioniranje";
> 		$admtext['recsreseq'] = "documenti su resekcionirani";
> 		$admtext['needmaint'] = "Za pokretanje ovog uslužnog programa morate biti u na�inu održavanja (idite na Postavljanje &gt;&gt; Konfiguracija &gt;&gt; Opće Postavke)";
> 		$admtext['reseqwarn'] = "<strong>UPOZORENJE:</strong> Ponovno postavljanje vaših ID-ova moglo bi prouzrokovati prekid vanjskih veza na vašu web lokaciju ili upućivati ​​na pogrešne lokacije.";
> 		$admtext['subroot'] = "Potprolazni put";
> 		$admtext['hidechr'] = "Sakrij Oznake za Krštenje";
> 		$admtext['datefmt'] = "Preferiranje Broja s Datumom";
> 		$admtext['dayfirst'] = "Dan/Mijesec/Godina";
> 		$admtext['monthfirst'] = "Mijesec/Dan/Godina";
> 		$admtext['exusers'] = "Izuzmite Korisni�ka Imena";
> 		$admtext['allowreg'] = "Dopusti nove registracije korisnika";
> 		$admtext['localhspath'] = "Lokalni Spomenika Put(ovi)";
> 		$admtext['pardata'] = "Roditeljski podaci na stranici osobe";
> 		$admtext['pnoevents'] = "Ne prikazujte nikakve događaje";
> 		$admtext['pstdonly'] = "Prikaži samo standardne obiteljske događaje";
> 		$admtext['palldata'] = "Prikažite sve događaje i medije";
> 		$admtext['servertime'] = "Vrijeme poslužitelja (server) je";
> 		$admtext['sitetime'] = "i vrijeme web mjesta je";
> 		$admtext['srexpl'] = "OPCIJSKI. Upotrijebite apsolutno ime staze, poput onoga što vidite u Korijenski Put, a zatim spremite sljedeće datoteke na Config Path <strong>odmah</strong> nakon spremanja i u�inite ih upisljivim (664 dozvole): config.php, customconfig.php , importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
> 		$admtext['mapstzm'] = "Pokretanje Zoom";
> 		$admtext['mapfoundzm'] = "Lokacija Zoom";
> 		$admtext['rrnum'] = "Sa�uvaj Broj Izvješća";
> 		$admtext['progint'] = "Interval Napretka (ms)";
> 		$admtext['timechart'] = "Vremenska karta";
> 		$admtext['tcheight'] = "Visina grafikona";
> 		$admtext['distances'] = "Sve udaljenosti mjereno u pikselima.";
> 		$admtext['mpixels'] = "Piksela između mjeseci";
> 		$admtext['ypixels'] = "Pikseli između godina";
> 		$admtext['ymult'] = "Godine između markera godina";
> 		$admtext['mpct'] = "Okomiti postotak po mjesecima";
> 		$admtext['ypct'] = "Okomiti postotak po godinama";
> 		$admtext['inclevs'] = "Događaji koje treba uklju�iti";
> 		$admtext['allevs'] = "Svi Događaji";
> 		$admtext['rangeevs'] = "Samo događaji koji spadaju u životni vijek ljudi na ljestvici";
> 		$admtext['tcwidth'] = "Po�etna širina grafikona";
> 		$admtext['simile'] = "Omogući Simile vremenske trake";
> 		$admtext['pstartoff'] = "Sakrijte javne karte za po�etak";
> 		$admtext['maxrels'] = "Maks. Odnosi";
> 		$admtext['initrels'] = "Po�etni Odnosi";
> 		$admtext['templateconfigsettings'] = "Postavke Predloška";
> 		$admtext['modifytemplatesettings'] = "Izmijenite postavke konfiguracije predloška";
> 		$admtext['ucsurnames'] = "Velika Slova Svih Prezimena";
> 		$admtext['maxnoteprev'] = "Maks. Slova u Bilješkama s Popisa";
> 		$admtext['mailreg'] = "Pošta i Registracija";
> 		$admtext['autoapp'] = "Automatski odobrava nove korisnike";
> 		$admtext['inclpwd'] = "Uklju�ite lozinku u e-poštu dobrodošlice";
> 		$admtext['ackemail'] = "Pošaljite potvrdu e-poštom";
> 		$admtext['fromadmin'] = "Pošaljite svu poštu s gornje adrese";
> 		$admtext['autotree'] = "Stvorite novo stablo za korisnika";
> 		$admtext['modspath'] = "Modovi Mapa";
> 		$admtext['extspath'] = "Proširenja Mapa";
> 		$admtext['encrtype'] = "Vrsta Å ifriranja";
> 		$admtext['none'] = "Ne Å ifriranje";
> 		$admtext['imgviewer'] = "Omogućite pregledniku slika";
> 		$admtext['docsonly'] = "Samo dokumenti";
> 		$admtext['imgvheight'] = "Visina preglednika slika";
> 		$admtext['flex'] = "Uvijek pokaži cijelu sliku";
> 		$admtext['setheight'] = "U�vršćen (640px)";
> 		$admtext['places1tree'] = "Dodijelite Zapise Mjesta Stabla";
> 		$admtext['convert'] = "Pretvoriti";
> 		$admtext['convexpl'] = "(Ovo će dodijeliti odabranom stablu sva trenutna mjesta)";
> 		$admtext['mergeexpl'] = "(Ovo će ukloniti stablo dodjela iz svih zapisa mjesta)";
>         $admtext['nocutoff'] = "Ostavite prazno ili postavljeno na nulu da biste uklonili ovo ograni�enje";
>         $admtext['usesmtp'] = "Upotrijebite SMTP provjeru autenti�nosti";
>         $admtext['mailhost'] = "Naziv SMTP hosta";
>         $admtext['mailuser'] = "Korisni�ko Ime za Poštu";
>         $admtext['mailpass'] = "Lozinka za Poštu";
>         $admtext['mailport'] = "Priklju�ak broj";
> 		$admtext['showshare'] = "Prikaži Dijeljenja Link";
> 		$admtext['defpgsize'] = "Zadana Veli�ina PDF Stranice";
> 		$admtext['mapterrain'] = "Teren";
> 		$admtext['maproadmap'] = "Autokarta";
> 		$admtext['usedefthumbs'] = "Upotrijebite zadane sli�ice";
>         $admtext['autogeo'] = "Geokodirajte sva nova mjesta";
>         $admtext['revmail'] = "Obavijestite o podnescima koji se mogu pregledati";
>         $admtext['assumepriv'] = "Pretpostavite da je privatno ako nije mrtvo to mnogo godina";
>         $admtext['calstart'] = "Prvi dan u tjednu";
> 		$admtext['edit_timeout'] = "Uredi pauza (minute)";
> 		$admtext['shownamespr'] = "Prikaži Imena za Privatno";
> 		$admtext['tables'] = "Tablice";
> 		$admtext['regnotes'] = "Prikaži Bilješke i Prilagođene Događaje u Registru";
> 		$admtext['collation'] = "Razvrstavanje";
> 		$admtext['collationexpl'] = "(ostavite prazno da biste prihvatili zadani)";
> 		$admtext['scrollcite'] = "Pomicanje Citate";
> 		$admtext['hidemedia'] = "Sakrij osobne medije";
> 		$admtext['searchchoice'] = "Pretraživanje Link Odredište";
> 		$admtext['quicksearch'] = "Brza pretraga";
> 		$admtext['advsearch'] = "Napredna pretraga";
> 		$admtext['pedvertical'] = "Vertikala";
> 		$admtext['vboxwidth'] = "Å irina Okvira";
> 		$admtext['vboxheight'] = "Visina Okvira";
> 		$admtext['vspacing'] = "Razmak";
> 		$admtext['vchart'] = "Vertikal Grafikon";
> 		$admtext['reuseids'] = "Ponovno koristite izbrisane ID-ove";
> 		$admtext['lastimport'] = "Prikaži zadnji uvoz";
>         $admtext['mailenc'] = "Å ifriranje";
> 		$admtext['dbport'] = "Baze Podataka Priklju�ak";
> 		$admtext['dbsocket'] = "Bazu Podataka Uti�nica";
1302,1324c1388,1410
< 		$admtext['prefsection'] = "Prefixes and Suffixes";
< 		$admtext['personprefix'] = "Person prefix";
< 		$admtext['personsuffix'] = "Person suffix";
< 		$admtext['familyprefix'] = "Family prefix";
< 		$admtext['familysuffix'] = "Family suffix";
< 		$admtext['sourceprefix'] = "Source prefix";
< 		$admtext['sourcesuffix'] = "Source suffix";
< 		$admtext['repoprefix'] = "Repository prefix";
< 		$admtext['reposuffix'] = "Repository suffix";
< 		$admtext['noteprefix'] = "Note prefix";
< 		$admtext['notesuffix'] = "Note suffix";
< 		$admtext['mobilesection'] = "Mobile";
< 		$admtext['mobilesite'] = "Mobile site name will be ";
< 		$admtext['menubar'] = "in mobile menu bar";
< 		$admtext['belowbar'] = "below mobile menu bar";
< 		$admtext['responsivetables'] = "Enable responsive tables";
< 		$admtext['tabletype'] = "Responsive table type";
< 		$admtext['enablemodeswitch'] = "Enable responsive tables mode switcher";
< 		$admtext['enableminimap'] = "Enable responsive tables mini map";
< 		$admtext['showtasks'] = "Show 'Important tasks' messages";
< 		$admtext['showtotals'] = "Show record totals on Admin menu";
< 		$admtext['backupdays'] = "Alert if no backup in this many days";
< 		$admtext['backupnote'] = "NOTE: If your database is very large, you might want to use an independent tool (like mysqldumper or phpMyAdmin) to back up and restore your tables. At least one of these should be available from your site control panel.";
---
> 		$admtext['prefsection'] = "Prefiksi i Sufiksi";
> 		$admtext['personprefix'] = "Prefiks Osobe";
> 		$admtext['personsuffix'] = "Sufiks Osobe";
> 		$admtext['familyprefix'] = "Prefiks Obitelji";
> 		$admtext['familysuffix'] = "Sufiks Obitelji";
> 		$admtext['sourceprefix'] = "Prefiks Izvora";
> 		$admtext['sourcesuffix'] = "Sufiks Izvora";
> 		$admtext['repoprefix'] = "Prefiks Spremište";
> 		$admtext['reposuffix'] = "Sufiks Spremište";
> 		$admtext['noteprefix'] = "Prefiks Bilješka";
> 		$admtext['notesuffix'] = "Sufiks Bilješka";
> 		$admtext['mobilesection'] = "Mobilno";
> 		$admtext['mobilesite'] = "Ime mobilne web stranice bit će ";
> 		$admtext['menubar'] = "u traci izbornika za mobilne uređaje";
> 		$admtext['belowbar'] = "ispod mobilne trake izbornika";
> 		$admtext['responsivetables'] = "Omogući osjetljivih tablica";
> 		$admtext['tabletype'] = "Vrsta osjetljivih tablica";
> 		$admtext['enablemodeswitch'] = "Omogućite osjetljivih tablica sklopka na�ina";
> 		$admtext['enableminimap'] = "Omogući osjetljivih tablica mini mapu";
> 		$admtext['showtasks'] = "Prikaži poruke 'Važni zadaci'";
> 		$admtext['showtotals'] = "Pokaži ukupne zapise na Admin. izborniku";
> 		$admtext['backupdays'] = "Obavijestite ako nema sigurnosne kopije u ovoliko dana";
> 		$admtext['backupnote'] = "NAPOMENA: Ako je vaša baza podataka vrlo velika, možda biste trebali koristiti neovisan alat (poput mysqldumper ili phpMyAdmin) za izradu sigurnosne kopije i vraćanje tablica. Barem jedan od njih trebao bi biti dostupan na vašoj upravlja�koj plo�i.";
1328,1331c1414,1416
< 		$admtext['hidedna'] = "Hide all DNA pages and data";
<         $admtext['assumeliving'] = "Assume living if not dead this many years";
< 		//changed in 11.0.2
< 		$admtext['mapkey'] = "Map Key";
---
> 		$admtext['hidedna'] = "Sakrij sve DNA stranice i podatke";
>         $admtext['assumeliving'] = "Pretpostavite da živite ako nije mrtav toliko godina";
> 		$admtext['mapkey'] = "Klju� Karte";
1333,1357c1418,1442
< 		$admtext['sitekey'] = "reCAPTCHA Site Key";
< 		$admtext['secret'] = "reCAPTCHA Secret";
< 		$admtext['mediadel'] = "Remove physical file on delete";
< 		$admtext['onrequest'] = "On request";
< 		$admtext['mediathumbs'] = "Show photos on one row";
< 		$admtext['footermsg'] = "Custom footer message";
< 		$admtext['templatestable'] = "Template Settings";
< 		$admtext['mediatrees'] = "Separate media in tree folders";
< 		$admtext['mediaexpl'] = "xxx media files moved";
< 		$admtext['dnatestscomparecolors'] = "Y-DNA Compare Tests Column Heading Colors";
< 		$admtext['getcolorcodes'] = "Get Color Codes Here";
< 		$admtext['mainbackground'] = "Main heading background color";
< 		$admtext['modebackground'] = "Mode values background color";
< 		$admtext['fastmutbackground'] = "Fast mutating background color";
< 		$admtext['background1_12'] = "Markers 1-12 background color";
< 		$admtext['background13_25'] = "Markers 13-25 background color";
< 		$admtext['background26_37'] = "Markers 26-37 background color";
< 		$admtext['background38_67'] = "Markers 38-67 background color";
< 		$admtext['background111'] = "Markers 68-111 background color";
< 		$admtext['textcolor'] = "Text color";
< 		$admtext['show_test_number'] = "Show DNA Test Number Publicly";
< 		$admtext['excludefromancsn'] = "Exclude From Ancestral Surnames";
< 		$admtext['upperancsunames'] = "Uppercase Ancestral Surnames";
< 		$admtext['autofillancsunames'] = "Autofill Ancestral Surnames";
< 		$admtext['colorschemer'] = "ColorSchemer - Online Color Scheme Generator";
---
> 		$admtext['sitekey'] = "reCAPTCHA Web Stranica Klju�";
> 		$admtext['secret'] = "reCAPTCHA Tajna";
> 		$admtext['mediadel'] = "Ukloni fizi�ku datoteku na brisanju";
> 		$admtext['onrequest'] = "Na zahtjev";
> 		$admtext['mediathumbs'] = "Pokažite fotografije u jednom redu";
> 		$admtext['footermsg'] = "Prilagođena podnožja poruka";
> 		$admtext['templatestable'] = "Postavke Predloška";
> 		$admtext['mediatrees'] = "Zasebni mediji u mapama stabala";
> 		$admtext['mediaexpl'] = "xxx medijske datoteke premještene";
> 		$admtext['dnatestscomparecolors'] = "Y-DNA Usporedba Testova Boje Naslova Stupaca";
> 		$admtext['getcolorcodes'] = "Ovdje nabavite kodove u boji";
> 		$admtext['mainbackground'] = "Boja Pozadine Glavnog Naslova";
> 		$admtext['modebackground'] = "Na�in Vrijednosti Pozadinske Boje";
> 		$admtext['fastmutbackground'] = "Brza Mutiranje Pozadinske Boje";
> 		$admtext['background1_12'] = "Marker 1-12 Pozadinske Boje";
> 		$admtext['background13_25'] = "Marker 13-25 Pozadinske Boje";
> 		$admtext['background26_37'] = "Marker 26-37 Pozadinske Boje";
> 		$admtext['background38_67'] = "Marker 38-67 Pozadinske Boje";
> 		$admtext['background111'] = "Marker 68-111 Pozadinske Boje";
> 		$admtext['textcolor'] = "Boja Teksta";
> 		$admtext['show_test_number'] = "Javno Pokazati Broj DNA Testa";
> 		$admtext['excludefromancsn'] = "Isklju�ite iz Rodbinskih Prezimena";
> 		$admtext['upperancsunames'] = "Velikim Slovima Prezime Rodbine";
> 		$admtext['autofillancsunames'] = "Automatska Ispuna Prezime Rodbine";
> 		$admtext['colorschemer'] = "ColorSchemer - Online Generator Shema Boja";
1359,1362c1444,1476
< 		$admtext['cookieapproval'] = "Show cookie approval message";
< 		$admtext['dataprotectmsg'] = "Show link to data protection policy";
< 		$admtext['nointernet'] = "I am using TNG offline";
< 		$admtext['askconsent'] = "Prompt for consent regarding personal info";
---
> 		$admtext['cookieapproval'] = "Prikaži poruku o odobrenju kola�ića";
> 		$admtext['dataprotectmsg'] = "Pokaži vezu do Zaštita Podataka";
> 		$admtext['nointernet'] = "Koristim TNG izvan mreže";
> 		$admtext['askconsent'] = "Zatražite suglasnost u vezi s osobnim podacima";
> 		//added in 13.0
> 		$admtext['coerce'] = "Promijenite dolazne prefikse kako bi odgovarali postavkama TNG";
> 		$admtext['sortevents'] = "Poredaj događaje prema";
> 		$admtext['sortbydate'] = "Datum događaja";
> 		$admtext['sortbytype'] = "Vrsta događaja";
> 		$admtext['allowsuggest'] = "Omogući prijedloge posjetitelja";
> 		$admtext['livingchecked'] = "Postavljena je živa zastava za nove ljude i obitelji";
> 		$admtext['maxmarried'] = "Ozna�ite obitelj koja živi ako je u braku manje od<br/ ove godine";
> 		$admtext['imagetags'] = "Pravokutnici";
> 		$admtext['allowcsv'] = "Dopustite CSV preuzimanja za izvješća";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Sigurnosne opcije";
> 		$admtext['dosql'] = "Izvezi kao SQL";
> 		$admtext['dodrop'] = "Uklju�i PUSTITI TABLICE AKO POSTOJE";
> 		$admtext['docreate'] = "Uklju�i STVORIT TABLICE";
> 		$admtext['onrestore'] = "Vratiti opcije";
> 		$admtext['dodel'] = "Prvo izbrišite prethodni sadržaj";
> 		$admtext['download'] = "Preuzimanje";
> 		$admtext['altbirthtypes'] = "Alternativni događaji rođenja";
> 		$admtext['dtformat'] = "Format tablica";
> 		$admtext['conchart'] = "Veze Grafikon";
> 		$admtext['maxropt'] = "Maksimalni broj pokretanja pretraživanja veze";
> 		$admtext['maxlopt'] = "Maksimalna duljina spojnih put";
> 		$admtext['showtxtopt'] = "Prikaz tekstualne izjave puta";
> 		$admtext['compactboxopt'] = "Prikaži kutije za osobe u kompaktnom obliku";
> 		$admtext['sortbyopt'] = "Poredaj put prema";
> 		$admtext['anchoridopt'] = "Usidreni ID";
> 		$admtext['maxmopt'] = "Maksimalni brakovi u vezi";
> 		$admtext['saveincfg'] = "Pohrani u konfiguracijskom putu (pogledajte Opće Postavke)";
1367,1369c1481,1483
< 		$admtext['enternamepart'] = "enter part of first and/or last name";
< 		$admtext['pleasenamepart'] = "Please enter a portion of a first or last name.";
< 		$admtext['enternamepart2'] = "enter ID or part of first and/or last name";
---
> 		$admtext['enternamepart'] = "upišite dio imena i/ili prezimena";
> 		$admtext['pleasenamepart'] = "Unesite dio imena ili prezimena.";
> 		$admtext['enternamepart2'] = "unesite ID ili dio imena i/ili prezimena";
1374,1404c1488,1517
< 		$admtext['pleaseplacepart'] = "Please enter part of a place name.";
< 		$admtext['addnewplace'] = "Add New Place";
< 		$admtext['createplace'] = "Create a record for a new place";
< 		$admtext['modifyplace'] = "Modify Existing Place";
< 		$admtext['editexistingplaceinfo'] = "Edit information for a previously entered place";
< 		$admtext['enterplace'] = "Please enter a place.";
< 		$admtext['newplaceinfo'] = "New Place Information";
< 		$admtext['existingplaceinfo'] = "Existing Information for Place";
< 		$admtext['changestoplace'] = "Changes to place";
< 		$admtext['selectplaceaction'] = "Select Place and Action";
< 		$admtext['mergeplaces'] = "Merge Places";
< 		$admtext['findmerge'] = "Find Merge Candidates";
< 		$admtext['selectplacemerge'] = "Select Places to Merge";
< 		$admtext['mcol1'] = "Merge<br/>these<br/>(delete)";
< 		$admtext['mcol2'] = "into<br/>this<br/>(keep)";
< 		$admtext['pmsucc'] = "Place merge successful";
< 		$admtext['nomerge'] = "Nothing to merge";
< 		$admtext['enterkeep'] = "Please select a merge target.";
< 		$admtext['backmerge'] = "Search again";
< 		$admtext['confdeleteplace'] = "Are you sure you want to delete this place?";
< 		$admtext['propagate'] = "Make changes to place name in existing events";
< 		//added in 8.0.0
< 		$admtext['confdelcemlink'] = "Are you sure you want to unlink this cemetery?";
< 		$admtext['nocoords'] = "Missing Latitude or Longitude";
< 		$admtext['istemple'] = "This place name is an LDS temple code";
< 		$admtext['findtemples'] = "Find only LDS temple codes";
< 		$admtext['choosecem'] = "Choose a Cemetery";
< 		$admtext['geocopy'] = "Copy geocode information below to this cemetery";
< 		$admtext['linkcem'] = "Link this place to a cemetery";
< 		$admtext['cemsavail'] = "List only includes cemeteries that are not already linked to a place";
< 		$admtext['nocemsavail'] = "No cemeteries exist, or each cemetery has already been linked to a place.";
---
> 		$admtext['pleaseplacepart'] = "Unesite dio naziva mjesta.";
> 		$admtext['addnewplace'] = "Dodaj Novo Mjesto";
> 		$admtext['createplace'] = "Stvorite zapis za novo mjesto";
> 		$admtext['modifyplace'] = "Izmijenite postojeće mjesto";
> 		$admtext['editexistingplaceinfo'] = "Uredi podatke za prethodno upisano mjesto";
> 		$admtext['enterplace'] = "Unesite mjesto.";
> 		$admtext['newplaceinfo'] = "Informacije o novom mjestu";
> 		$admtext['existingplaceinfo'] = "Postojeće informacije o mjestu";
> 		$admtext['changestoplace'] = "Promjene na mjestu";
> 		$admtext['selectplaceaction'] = "Odaberite Mjesto i Radnja";
> 		$admtext['mergeplaces'] = "Spajanje Mjesta";
> 		$admtext['findmerge'] = "Pronađi Spojene Kandidate";
> 		$admtext['selectplacemerge'] = "Odaberite Mjesta za Spajanje";
> 		$admtext['mcol1'] = "Spoji<br/>ove<br/>(brisanje)";
> 		$admtext['mcol2'] = "u<br/>ovom<br/>(zadržati)";
> 		$admtext['pmsucc'] = "Mjesto Spajanje Uspješno";
> 		$admtext['nomerge'] = "Ništa za Spajanje";
> 		$admtext['enterkeep'] = "Odaberite Cilj Spajanja.";
> 		$admtext['backmerge'] = "Ponovno Pretražite";
> 		$admtext['confdeleteplace'] = "Jeste li sigurni da želite izbrisati ovo mjesto?";
> 		$admtext['propagate'] = "Izmijenite naziv mjesta u postojećim događajima";
> 		$admtext['confdelcemlink'] = "Jeste li sigurni da želite prekinuti vezu s tim grobljem?";
> 		$admtext['nocoords'] = "Nedostaje zemljopisna širina ili dužina";
> 		$admtext['istemple'] = "Naziv mjesta je LDS kod hrama";
> 		$admtext['findtemples'] = "Pronađite samo LDS kodove hrama";
> 		$admtext['choosecem'] = "Odaberite Groblje";
> 		$admtext['geocopy'] = "Kopirajte dolje podatke o Geokod na ovo groblje";
> 		$admtext['linkcem'] = "Povežite ovo mjesto s grobljem";
> 		$admtext['cemsavail'] = "Popis uklju�uje samo groblja koja još nisu povezana s mjestom";
> 		$admtext['nocemsavail'] = "Nema groblja ili je svako groblje već povezano s mjestom.";
1406,1418c1519,1530
<         $admtext['geocode'] = "Geocode";
<         $admtext['ignoreall'] = "Ignore all";
<         $admtext['usefirst'] = "Use first match";
<         $admtext['multchoice'] = "If multiple results are found for a place:";
<         $admtext['geoexpl'] = "Geocode all Places without latitude and longitude coordinates";
<         $admtext['geocoding'] = "Geocoding...";
<         $admtext['backgeo'] = "Return to Geocode menu";
<         $admtext['limit'] = "Limit:";
<         $admtext['nolimit'] = "No limit";
< 		$admtext['blankplace'] = "Blank place name";
<         $admtext['nogeocode'] = "Could not be geocoded";
<         $admtext['toomany'] = "Ignored (too many results)";
< 		$admtext['treesgone'] = "Tree assignments removed from all place records";
---
>         $admtext['geocode'] = "Geokod";
>         $admtext['ignoreall'] = "Zanemarite sve";
>         $admtext['usefirst'] = "Upotrijebi prvi me�";
>         $admtext['multchoice'] = "Ako se za mjesto pronađe više rezultata:";
>         $admtext['geoexpl'] = "Geokod sva Mjesta bez koordinata zemljopisne širine i dužine";
>         $admtext['geocoding'] = "Geokodiranje...";
>         $admtext['backgeo'] = "Povratak na Izbornik Geokod";
>         $admtext['limit'] = "Ograni�iti:";
>         $admtext['nolimit'] = "Nema Ograni�iti";
> 		$admtext['blankplace'] = "Prazan Naziv Mjesta";
>         $admtext['toomany'] = "Zanemareno (previše rezultata)";
> 		$admtext['treesgone'] = "Zadaci stabala uklonjeni su iz svih evidencija mjesta";
1420,1421c1532,1533
< 		$admtext['nolevel'] = "Place Level not set";
< 		$admtext['placenotsaved'] = "Place not saved. Another place with that name already exists. Please merge instead.";
---
> 		$admtext['nolevel'] = "Razina mjesta nije postavljena";
> 		$admtext['placenotsaved'] = "Mjesto nije sa�uvano. Drugo mjesto s tim imenom već postoji. Spojite.";
1423c1535,1537
< 		$admtext['noevents'] = "No associated events";
---
> 		$admtext['noevents'] = "Nema pridruženih događaja";
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Nemojte geokodirati";
1428,1429c1542,1543
< 		$admtext['generatenewid'] = "Generate New ID";
< 		$admtext['generating'] = "Generating...Please wait";
---
> 		$admtext['generatenewid'] = "Stvori novi ID";
> 		$admtext['generating'] = "Generiranje ... Molimo pri�ekajte";
1434,1444c1548,1557
< 		$admtext['trackinglines'] = "Tracking Lines of Descent...";
< 		$admtext['finishedtracking'] = "Finished tracking lines of descent.";
< 		$admtext['backtosecondary'] = "Back to Secondary Processes";
< 		$admtext['sortchildren'] = "Sort Children";
< 		$admtext['sortingchildren'] = "Sorting Children";
< 		$admtext['sortspouses'] = "Sort Spouses";
< 		$admtext['sortingspouses'] = "Sorting Spouses";
< 		$admtext['relabelbranches'] = "Ponovo labeliraj grane";
< 		$admtext['relabeling'] = "Ponovno labeliranje grana";
< 		$admtext['creatinggendex'] = "Creating GENDEX file...";
< 		$admtext['finishedgendex'] = "Finished with GENDEX file creation.";
---
> 		$admtext['trackinglines'] = "Praćenje linija od Potomaka...";
> 		$admtext['finishedtracking'] = "Gotovo Praćenje linija od Potomaka.";
> 		$admtext['sortchildren'] = "Poredaj djecu";
> 		$admtext['sortingchildren'] = "Razvrstavanje djece";
> 		$admtext['sortspouses'] = "Poredati supružnike";
> 		$admtext['sortingspouses'] = "Razvrstavanje supružnika";
> 		$admtext['relabelbranches'] = "Ponovo ozna�iti grane";
> 		$admtext['relabeling'] = "Ozna�ivaju se grane";
> 		$admtext['creatinggendex'] = "Izrada GENDEX datoteke...";
> 		$admtext['finishedgendex'] = "Završeno sa GENDEX stvaranjem datoteka.";
1446c1559
< 		$admtext['postgdx'] = "Where to post your GENDEX file";
---
> 		$admtext['postgdx'] = "Gdje objaviti svoju GENDEX datoteku";
1448,1450c1561,1563
< 		$admtext['evalmedia'] = "Trim Media Menus";
< 		$admtext['evaluating'] = "Counting media";
< 		$admtext['finished'] = "Finished";
---
> 		$admtext['evalmedia'] = "Izrežite izbornike medija";
> 		$admtext['evaluating'] = "Brojanje medija";
> 		$admtext['finished'] = "Gotov";
1452,1456c1565,1571
< 		$admtext['refreshliving'] = "Refresh Living";
< 		$admtext['chtodeceased'] = "changed to deceased";
< 		$admtext['chtoliving'] = "changed to living";
< 		$admtext['chtoprivate'] = "changed to private";
< 		$admtext['makeprivate'] = "Make Private";
---
> 		$admtext['refreshliving'] = "Osvježi žive";
> 		$admtext['chtodeceased'] = "promijenjen u pokojnika";
> 		$admtext['chtoliving'] = "promijenio u život";
> 		$admtext['chtoprivate'] = "promijenjen u privatni";
> 		$admtext['makeprivate'] = "Napravite Privatno";
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Povratak na pomoćne programe nakon uvoza";
1461,1473c1576,1588
< 		$admtext['addnewlanguage'] = "Add New Language";
< 		$admtext['enterlangdisplay'] = "Please enter a language display name.";
< 		$admtext['enterlangfolder'] = "Please enter the name of the folder where files for this language will be stored.";
< 		$admtext['newlanguageinfo'] = "New Language Information";
< 		$admtext['langdisplay'] = "Name for this language<br/>as it will be displayed for visitors";
< 		$admtext['createlanguage'] = "Create a record for a new language";
< 		$admtext['nolanguages'] = "No language records exist";
< 		$admtext['conflangdelete'] = "Are you sure you want to delete this language?";
< 		$admtext['existinglanguages'] = "Existing Language Information";
< 		$admtext['modifylanguage'] = "Modify Existing Language";
< 		$admtext['changestolanguage'] = "Changes to language";
< 		$admtext['charset'] = "Character set";
< 		$admtext['editexistinglanguage'] = "Add, edit or delete languages";
---
> 		$admtext['addnewlanguage'] = "Dodaj Jezik";
> 		$admtext['enterlangdisplay'] = "Unesite prikazano ime jezika.";
> 		$admtext['enterlangfolder'] = "Unesite ime mape u koju će se pohraniti datoteke za ovaj jezik.";
> 		$admtext['newlanguageinfo'] = "Nove informacije o jeziku";
> 		$admtext['langdisplay'] = "Naziv za ovaj jezik<br/>jer će biti prikazan posjetiteljima";
> 		$admtext['createlanguage'] = "Stvorite zapis za novi jezik";
> 		$admtext['nolanguages'] = "Ne postoje jezi�ni zapisi";
> 		$admtext['conflangdelete'] = "Jeste li sigurni da želite izbrisati ovaj jezik?";
> 		$admtext['existinglanguages'] = "Postojeće jezi�ne informacije";
> 		$admtext['modifylanguage'] = "Izmjena postojećeg jezika";
> 		$admtext['changestolanguage'] = "Promjene jezika";
> 		$admtext['charset'] = "Skup slova";
> 		$admtext['editexistinglanguage'] = "Dodaj, Uredi ili Briši jezika";
1478,1509c1593,1622
< 		$admtext['createtree'] = "Create a record for a new tree";
< 		$admtext['notrees'] = "No tree records exist";
< 		$admtext['existingtrees'] = "Existing Tree Information";
< 		$admtext['editexistingtree'] = "Edit information for a previously entered tree";
< 		$admtext['treename'] = "Tree Name";
< 		$admtext['owner'] = "Owner";
< 		$admtext['conftreedelete'] = "Are you sure you want to delete this tree and all associated items?";
< 		$admtext['conftreeclear'] = "Are you sure you want to clear all data from this tree?";
< 		$admtext['changestotree'] = "Changes to tree";
< 		$admtext['newtreeinfo'] = "New Tree Information";
< 		$admtext['existingtreeinfo'] = "Existing Tree Information";
< 		$admtext['modifytree'] = "Modify Existing Tree";
< 		$admtext['succcleared'] = "was successfully cleared";
< 		$admtext['gedcomextraction'] = "Don't allow users to download GEDCOM files";
< 		$admtext['gedexport'] = "GEDCOM Export";
< 		$admtext['exporting'] = "Exporting GEDCOM...";
< 		$admtext['ifexportfails'] = "If the export fails to run to completion,";
< 		$admtext['finishedexporting'] = "Finished Exporting GEDCOM";
< 		$admtext['backtotrees'] = "Back to Trees";
< 		$admtext['downloadged'] = "Download GEDCOM";
< 		$admtext['lastimport'] = "Last Import";
< 		$admtext['treeexists'] = "Another tree already exists with the selected ID. Please select a different ID and try again.";
< 		$admtext['exportmedia'] = "Export media links";
< 		//added in 8.0.0
< 		$admtext['changetree'] = "Change Tree";
< 		$admtext['newtree'] = "New Tree";
< 		$admtext['currtree'] = "Current Tree";
< 		$admtext['chwarn'] = "WARNING: This operation will remove all family links, citations and other references to this entity within the current tree.";
< 		$admtext['keepprivate'] = "Keep owner information private";
< 		//changed in 9.0.0
< 		$admtext['exppaths'] = "Local paths for";
< 		$admtext['nopdf'] = "Don't allow users to create PDF files";
---
> 		$admtext['createtree'] = "Stvorite zapis za novo stablo";
> 		$admtext['notrees'] = "Ne postoje zapisi o stablu";
> 		$admtext['existingtrees'] = "Informacija o stablu";
> 		$admtext['editexistingtree'] = "Uredite podatke za prethodno uneseno stablo";
> 		$admtext['treename'] = "Ime Stable";
> 		$admtext['owner'] = "Vlasnik";
> 		$admtext['conftreedelete'] = "Jeste li sigurni da želite izbrisati ovo stablo i sve povezane stavke?";
> 		$admtext['conftreeclear'] = "Jeste li sigurni da želite izbrisati sve podatke s ovog stabla?";
> 		$admtext['changestotree'] = "Promjene na stablu";
> 		$admtext['newtreeinfo'] = "Informacije o novom stablu";
> 		$admtext['existingtreeinfo'] = "Informacija o stablu";
> 		$admtext['modifytree'] = "Izmijenite Postojeće Stabla";
> 		$admtext['succcleared'] = "uspješno je o�išćen";
> 		$admtext['gedcomextraction'] = "Ne dopustite korisnicima da preuzimaju GEDCOM datoteke";
> 		$admtext['gedexport'] = "GEDCOM Izvoz";
> 		$admtext['exporting'] = "Izvozimo GEDCOM...";
> 		$admtext['ifexportfails'] = "Ako se izvoz ne izvrši do kraja,";
> 		$admtext['finishedexporting'] = "Gotov izvoz GEDCOM";
> 		$admtext['backtotrees'] = "Povratak na Stabla";
> 		$admtext['downloadged'] = "Preuzmite GEDCOM";
> 		$admtext['lastimport'] = "Zadnji Uvoz";
> 		$admtext['treeexists'] = "oš jedno stablo postoji s odabranim ID-om. Odaberite drugi ID i pokušajte ponovo.";
> 		$admtext['exportmedia'] = "Izvoz medijskih veza";
> 		$admtext['changetree'] = "Promijenite Stabla";
> 		$admtext['newtree'] = "Novo Stable";
> 		$admtext['currtree'] = "Trenutno stablo";
> 		$admtext['chwarn'] = "UPOZORENJE: Ovom operacijom bit će uklonjene sve obiteljske veze, citati i druge reference na ovaj entitet unutar trenutnog stabla.";
> 		$admtext['keepprivate'] = "Informacije vlasnika ostanite privatne";
> 		$admtext['exppaths'] = "Lokalni putevi za";
> 		$admtext['nopdf'] = "Ne dopustite korisnicima da stvaraju PDF datoteke";
1511,1513c1624,1631
< 		$admtext['exprivate'] = "Exclude private";
< 		$admtext['exliving'] = "Exclude living";
< 		$admtext['importfilename'] = "Import File Name";
---
> 		$admtext['exprivate'] = "Izuzmi privatno";
> 		$admtext['exliving'] = "Izuzmi žive";
> 		$admtext['importfilename'] = "Uvezi Naziv Datoteke";
> 		//added in 13.0
> 		$admtext['exnotes'] = "Izuzmi bilješke";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "ZIP i uklju�uju medijske datoteke";
> 		$admtext['downloadzip'] = "Preuzmite ZIP";
1518,1533c1636,1651
< 		$admtext['addnewuser'] = "Dodaj novog korisnika";
< 		$admtext['createuser'] = "Kreiraj zapis za novog korisnika";
< 		$admtext['nousers'] = "Ne postoje zapisi za korisnika";
< 		$admtext['existingusers'] = "Postojeæa informacija korisnika";
< 		$admtext['editexistinguser'] = "Uredi informaciju za prethodno unesenog korisnika";
< 		$admtext['confuserdelete'] = "Da li ste sigurni da želite obrisati ovog korisnika?";
< 		$admtext['changestouser'] = "Changes to user";
< 		$admtext['enteruserpassword'] = "Please enter a password.";
< 		$admtext['enterusername'] = "Please enter a username.";
< 		$admtext['newuserinfo'] = "New User Information";
< 		$admtext['existinguserinfo'] = "Existing User Information";
< 		$admtext['modifyuser'] = "Modify Existing User";
< 		$admtext['allow_living'] = "Allow to view information for living individuals";
< 		$admtext['allow_lds'] = "Allow to view LDS information";
< 		$admtext['enteruserdesc'] = "Please enter a user description.";
< 		$admtext['enterpassword'] = "Please enter a password.";
---
> 		$admtext['addnewuser'] = "Dodaj Korisnika";
> 		$admtext['createuser'] = "Stvorite zapis za novog korisnika";
> 		$admtext['nousers'] = "Ne postoji zapis za korisnika";
> 		$admtext['existingusers'] = "Postojeća informacija o korisniku";
> 		$admtext['editexistinguser'] = "Uredi podataka za prethodno upisanog korisnika";
> 		$admtext['confuserdelete'] = "Jeste li sigurni da želite izbrisati ovog korisnika?";
> 		$admtext['changestouser'] = "Promjene korisnika";
> 		$admtext['enteruserpassword'] = "Unesite lozinku.";
> 		$admtext['enterusername'] = "Unesite korisni�ko ime.";
> 		$admtext['newuserinfo'] = "Nove informacije o korisniku";
> 		$admtext['existinguserinfo'] = "Postojeći podaci o korisniku";
> 		$admtext['modifyuser'] = "Izmjena postojećeg korisnika";
> 		$admtext['allow_living'] = "Dopustite za pregled podataka o živim pojedincima";
> 		$admtext['allow_lds'] = "Dopusti za pregled podataka o LDS";
> 		$admtext['enteruserdesc'] = "Unesite opis korisnika.";
> 		$admtext['enterpassword'] = "Unesite lozinku.";
1535,1541c1653,1659
< 		$admtext['firstuser'] = "The first user you create will be an Administrator (NO tree selected) and will have access to all system settings.";
< 		$admtext['userfailed'] = "ERROR: Your user could not be created because another user with the same username already exists.";
< 		$admtext['allow_ged'] = "Allow to download GEDCOMs";
< 		$admtext['assigned'] = "Assigned";
< 		$admtext['treemsg'] = "Opciono. Ne dodjeljivanje stabla korisniku æe rezultirati da korisnik ima prava u svim stablima i granama. Administrator site-a ne bi trebao sebi dodijeliti stablo.";
< 		$admtext['branchmsg'] = "Optional. Dodjeljivanje grane korisniku æe osigurati korištenje prava dodijeljena stranici unutar odabranog stabla.";
< 		$admtext['accesslimits'] = "Limitiran pristup:";
---
> 		$admtext['firstuser'] = "Prvi korisnik koji stvorite bit će Administrator (NE odabrano stablo) i imat će pristup svim postavkama sustava.";
> 		$admtext['userfailed'] = "POGREŠKA: Vašeg korisnika nije moguće stvoriti jer već postoji drugi korisnik s istim korisni�kim imenom.";
> 		$admtext['allow_ged'] = "Omogući za preuzimanje GEDCOM";
> 		$admtext['assigned'] = "Dodijeljeno";
> 		$admtext['treemsg'] = "OPCIJSKI: Ako dodijelite nijedno drvo korisniku, korisnik će imati prava za sva stabla i sve grane. Administrator web mjesta ne smije dodijeliti stablo.";
> 		$admtext['branchmsg'] = "OPCIJSKI: Dodjeljivanje grane korisniku ograni�it će prava dodijeljena na ovoj stranici dodijeljenoj grani unutar odabranog stabla.";
> 		$admtext['accesslimits'] = "Ograni�enja pristupa:";
1543c1661
< 		$admtext['realname'] = "Real Name";
---
> 		$admtext['realname'] = "Pravo Ime";
1545,1552c1663,1670
< 		$admtext['newusers'] = "New User Registrations";
< 		$admtext['editnewusers'] = "Process records for newly registered users. New users have no rights until registrations are processed.";
< 		$admtext['nonewusers'] = "No new users";
< 		$admtext['lastlogin'] = "Last Login";
< 		$admtext['tentative_edit'] = "Allow to submit edits for administrative review (People, Families and Sources only)";
< 		$admtext['notify'] = "Notify this user upon account activation";
< 		$admtext['no_edit'] = "No edit rights";
< 		$admtext['emailusers'] = "E-mail Users";
---
> 		$admtext['newusers'] = "Novi Korisni�ke Registracije";
> 		$admtext['editnewusers'] = "Obrađuje zapise za novo registrirane korisnike. Novi korisnici nemaju prava dok se prijave ne obrade.";
> 		$admtext['nonewusers'] = "Nema novih korisnika";
> 		$admtext['lastlogin'] = "Zadnja Prijava";
> 		$admtext['tentative_edit'] = "Omogući slanje izmjena na upravni pregled (samo Ljudi, Obitelji i Izvori)";
> 		$admtext['notify'] = "Obavijestite ovog korisnika nakon aktiviranja ra�una";
> 		$admtext['no_edit'] = "Nema prava na uređivanje";
> 		$admtext['emailusers'] = "e-poštu Korisnica";
1554,1584c1672,1701
< 		$admtext['emailmessage'] = "E-mail Message To Users";
< 		$admtext['subject'] = "E-mail Subject";
< 		$admtext['messagetext'] = "E-mail Text";
< 		$admtext['selectgroup'] = "Select group to receive e-mail (leave blank to send to all)";
< 		$admtext['treemailmsg'] = "Optional. Choosing a tree will restrict the message to users assigned to that tree.";
< 		$admtext['branchmailmsg'] = "Opciono. Odabirom grane, poruke korisniku iz te grane æe biti restriktirane.";
< 		$admtext['send'] = "Send E-mail";
< 		$admtext['sentmailmessage'] = "Sent E-mail Message";
< 		$admtext['succmail'] = "Your e-mail message has been sent.";
< 		$admtext['mailfailed'] = "Your e-mail message failed to send.";
< 		$admtext['entersubject'] = "Please enter a subject for your message.";
< 		$admtext['entermsgtext'] = "Please enter the text of your message.";
< 		$admtext['adminonly'] = "Show Admin users only";
< 		$admtext['dtregistered'] = "Date Registered";
< 		$admtext['dtactivated'] = "Date Activated";
< 		$admtext['no_email'] = "Do not send mass e-mail to this user";
< 		$admtext['allow_admin'] = "Dozvoli pristup svim sistemskim postavkama i administrativnim funkcijama i primjeni prava u svim stablima i ganama.";
< 		$admtext['limitedrights'] = "Limitirana prava slijedeæim:";
< 		$admtext['allow_edit'] = "Allow to edit existing records";
< 		$admtext['allow_add'] = "Allow to add new records";
< 		$admtext['allow_delete'] = "Allow to delete existing records";
< 		//added in 8.0.0
< 		$admtext['usrguest'] = "Guest";
< 		$admtext['usrguestd'] = "No add, edit or delete rights.";
< 		$admtext['noadmin'] = "No access to Admin area.";
< 		$admtext['usrsubm'] = "Submitter";
< 		$admtext['usrsubmd'] = "Submit changes subject to review.";
< 		$admtext['usrcontrib'] = "Contributor";
< 		$admtext['usrcontribd'] = "Add information, including media.";
< 		$admtext['usreditor'] = "Editor";
< 		$admtext['usreditord'] = "Add, edit and delete all information, including media.";
---
> 		$admtext['emailmessage'] = "Poruka e-pošte korisnicima";
> 		$admtext['subject'] = "E-pošte Tema";
> 		$admtext['messagetext'] = "E-pošte Tekst";
> 		$admtext['selectgroup'] = "Odaberite grupu za primanje e-pošte (ostavite prazno da biste je poslali svima)";
> 		$admtext['treemailmsg'] = "OPCIJSKI: Odabirom stabla poruka će se ograni�iti na korisnike koji su dodijeljeni tom stablu.";
> 		$admtext['branchmailmsg'] = "OPCIJSKI. Odabirom grane poruka će se ograni�iti na korisnike koji su dodijeljeni toj grani.";
> 		$admtext['send'] = "Pošalji e-poštu";
> 		$admtext['sentmailmessage'] = "Poslana poruka e-pošte";
> 		$admtext['succmail'] = "Vaša e-pošta poruka je poslana.";
> 		$admtext['mailfailed'] = "Vaša e-pošta poruka nije uspjela poslati.";
> 		$admtext['entersubject'] = "Unesite temu svoje poruke.";
> 		$admtext['entermsgtext'] = "Unesite tekst svoje poruke.";
> 		$admtext['adminonly'] = "Prikaži samo Admin. korisnika";
> 		$admtext['dtregistered'] = "Datum Registriranja";
> 		$admtext['dtactivated'] = "Datum Aktiviranja";
> 		$admtext['no_email'] = "Ne šaljite masovnu e-poštu ovom korisniku";
> 		$admtext['allow_admin'] = "Primijenite gore navedena prava na sva stabla i grane.";
> 		$admtext['limitedrights'] = "Ograni�ite gornja prava na sljedeće:";
> 		$admtext['allow_edit'] = "Dopusti uređivanje svih postojećih podataka";
> 		$admtext['allow_add'] = "Dopusti dodavanje novih podataka";
> 		$admtext['allow_delete'] = "Dopustite za brisanje svih postojećih podataka";
> 		$admtext['usrguest'] = "Gost";
> 		$admtext['usrguestd'] = "Nema prava za Dodat, Urdeit ili Obrisat.";
> 		$admtext['noadmin'] = "Nema pristupa podru�ju Administratora.";
> 		$admtext['usrsubm'] = "Podnosilac";
> 		$admtext['usrsubmd'] = "Pošaljite promjene koje su podložne pregledu.";
> 		$admtext['usrcontrib'] = "Prinosnik";
> 		$admtext['usrcontribd'] = "Dodaj informaciju, uklju�ujući medije.";
> 		$admtext['usreditor'] = "Urednik";
> 		$admtext['usreditord'] = "Dodaj, Uredi i Izbriši sve informacije, uklju�ujući medije.";
1586,1600c1703,1716
< 		$admtext['usradmind'] = "All rights.";
< 		$admtext['usrmcontrib'] = "Media Contributor";
< 		$admtext['usrmcontribd'] = "Add media only.";
< 		$admtext['usrmeditor'] = "Media Editor";
< 		$admtext['usrmeditord'] = "Add, edit and delete media only.";
< 		$admtext['allow_media_edit'] = "Allow to edit media only";
< 		$admtext['allow_media_add'] = "Allow to add media only";
< 		$admtext['allow_media_delete'] = "Allow to delete media only";
< 		$admtext['no_add'] = "No add rights";
< 		$admtext['no_delete'] = "No delete rights";
< 		$admtext['roles'] = "Roles";
< 		$admtext['usrcustom'] = "Custom";
<         //added in 9.0.0
< 		$admtext['allow_private'] = "Allow to view information for private individuals";
< 		$admtext['allow_pdf'] = "Allow to download PDFs";
---
> 		$admtext['usradmind'] = "Sva Prava";
> 		$admtext['usrmcontrib'] = "Medije Prinosnik";
> 		$admtext['usrmcontribd'] = "Dodaj medije samo.";
> 		$admtext['usrmeditor'] = "Medije Urednik";
> 		$admtext['usrmeditord'] = "Dodaj, Uredi i Izbriši  medije samo.";
> 		$admtext['allow_media_edit'] = "Dopusti samo prava da Uredi medija";
> 		$admtext['allow_media_add'] = "Dopusti samo prava da Dodaj medija";
> 		$admtext['allow_media_delete'] = "Dopusti samo prava da Izbriši medija";
> 		$admtext['no_add'] = "Nema Dodaj prava";
> 		$admtext['no_delete'] = "Nema Izbriši prava";
> 		$admtext['roles'] = "Uloga";
> 		$admtext['usrcustom'] = "Prilagođeni";
> 		$admtext['allow_private'] = "Dopustite za pregled podataka za privatne osobe";
> 		$admtext['allow_pdf'] = "Omogući za preuzimanje PDF-ova";
1602c1718
< 		$admtext['allow_profile'] = "Allow to edit user profile";
---
> 		$admtext['allow_profile'] = "Dopusti uređivanje korisni�kog profila";
1604c1720
< 		$admtext['mult_trees'] = "Apply rights to multiple trees";
---
> 		$admtext['mult_trees'] = "Primijenite prava na više stabala";
1606,1607c1722,1729
< 		$admtext['consented'] = "Consent given";
< 		$admtext['consentdate'] = "Date Consented";
---
> 		$admtext['consented'] = "Saglasnost dana";
> 		$admtext['consentdate'] = "Datum saglasnosti";
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Prikaži samo onemogućene korisnike";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Dopusti pregled privatnih bilješki";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Također pošalji administratorima kada je odabrano jedno stablo";
1611,1618c1733,1739
< 		$admtext['loginfailed'] = "Login failed.";
< 		$admtext['adminlogfile'] = "Admin Log File";
< 		$admtext['mostrecentactions'] = "Most Recent Actions";
< 		$admtext['rempass'] = "Ostani logiran na ovom raèunalu";
< 		$admtext['sessexp'] = "Your session has expired.";
< 		$admtext['logagain'] = "Click to log in again.";
< 		//added in 8.1.0
< 		$admtext['logininactive'] = "Your login is not yet active. Please try again later or contact the site administrator.";
---
> 		$admtext['loginfailed'] = "Prijava nije uspjela.";
> 		$admtext['adminlogfile'] = "Admin. Datoteka zapisa";
> 		$admtext['mostrecentactions'] = "Najnovije akcije";
> 		$admtext['rempass'] = "Ostanite prijavljeni na ovom ra�unalu";
> 		$admtext['sessexp'] = "Vaša sesija je istekla.";
> 		$admtext['logagain'] = "Kliknite da biste se ponovo prijavili.";
> 		$admtext['logininactive'] = "Vaša prijava još nije aktivna. Pokušajte ponovo kasnije ili se obratite administratoru web mjesta.";
1622,1641c1743,1761
< 		$admtext['createnewtlevent'] = "Create a new timeline event";
< 		$admtext['modifytlevent'] = "Modify Existing Timeline Event";
< 		$admtext['leaveblankalltlevents'] = "leave blank to show all timeline events";
< 		$admtext['evyear'] = "Event year";
< 		$admtext['evdetail'] = "Event detail";
< 		$admtext['selecttleventaction'] = "Select Timeline Event and Action";
< 		$admtext['changestotlevent'] = "Changes to timeline event";
< 		$admtext['location'] = "Location";
< 		$admtext['confdeletetlevent'] = "Are you sure you want to delete this timeline event?";
< 		$admtext['enterevyear'] = "Please enter the event year.";
< 		$admtext['enterevdetail'] = "Please enter the event detail.";
< 		$admtext['existingtleventinfo'] = "Existing Timeline Event";
< 		$admtext['newtleventinfo'] = "New Timeline Event";
< 		$admtext['edittleventinfo'] = "Add, edit or delete timeline events";
< 		$admtext['addnewtlevent'] = "Add New Event";
< 		$admtext['yrreq'] = "(only year is required)";
< 		$admtext['startdt'] = "Start Date";
< 		$admtext['enddt'] = "End Date";
< 		//added in 9.0.0
< 		$admtext['evtitle'] = "Event title";
---
> 		$admtext['createnewtlevent'] = "Napravi novi događaj vremenske trake";
> 		$admtext['modifytlevent'] = "Izmjena postojećeg događaja vremenske trake";
> 		$admtext['leaveblankalltlevents'] = "ostavite prazno za prikaz svih događaja na vremenskoj traci";
> 		$admtext['evyear'] = "Godina događaja";
> 		$admtext['evdetail'] = "Detalji događaja";
> 		$admtext['selecttleventaction'] = "Odaberite Vremenski događaja i radnje";
> 		$admtext['changestotlevent'] = "Promjene vremenskog događaja";
> 		$admtext['location'] = "Mjesto";
> 		$admtext['confdeletetlevent'] = "Jeste li sigurni da želite izbrisati ovaj vremenski događaja?";
> 		$admtext['enterevyear'] = "Unesite godinu događaja.";
> 		$admtext['enterevdetail'] = "Unesite detalja događaja.";
> 		$admtext['existingtleventinfo'] = "Postojeći događaj vremenske trake";
> 		$admtext['newtleventinfo'] = "Novi događaj vremenske trake";
> 		$admtext['edittleventinfo'] = "Dodaj, Uredi ili Izbriši događaja na vremenskoj traci";
> 		$admtext['addnewtlevent'] = "Dodaj Događaj";
> 		$admtext['yrreq'] = "(potrebna je samo godina)";
> 		$admtext['startdt'] = "Po�etni datum";
> 		$admtext['enddt'] = "Datum završetka";
> 		$admtext['evtitle'] = "Naslov Događaja";
1645,1649c1765,1769
< 		$admtext['selectevaction'] = "Oznaèi dogaðaj i akciju";
< 		$admtext['suggested'] = "Predloženo";
< 		$admtext['usernotes'] = "Zapis u vezi<br />predložene promjene<br />(neæe bit pohranjeno)";
< 		$admtext['postdate'] = "Poslano na";
< 		$admtext['savedel'] = "Pohrani i obriši";
---
> 		$admtext['selectevaction'] = "Odaberite Događaj i Akcija";
> 		$admtext['suggested'] = "Predloženo";
> 		$admtext['usernotes'] = "Napomene u vezi<br />predložene promjenu<br />(neće biti sa�uvan)";
> 		$admtext['postdate'] = "Objavljeno";
> 		$admtext['savedel'] = "Sa�uvaj i Izbriši";
1651,1653c1771,1773
< 		$admtext['igndel'] = "Ignoriraj i obriši";
< 		$admtext['tentdel'] = "was deleted";
< 		$admtext['tentadd'] = "was made permanent";
---
> 		$admtext['igndel'] = "Zanemari i Izbriši";
> 		$admtext['tentdel'] = "je izbrisan";
> 		$admtext['tentadd'] = "u�injen trajnim";
1656d1775
< 	//added in 8.0.0
1658,1673c1777,1792
< 		$admtext['noteblurb'] = "Directly locate, edit or delete any note in your database.";
< 		$admtext['whatsnewblurb'] = "Provide your visitors with a general site update or other timely information at the top of your What's New page.";
< 		$admtext['mwblurb'] = "Create a list of elusive people and unidentified photos, in hopes of getting more publicity for the items that are giving you the most trouble.";
< 		$admtext['dvblurb'] = "Find potential problems in your information.";
< 		$admtext['wr_gender'] = "Wrong gender";
< 		$admtext['unk_gender'] = "Unknown gender";
< 		$admtext['marr_young'] = "Married too young (less than 15 years old)";
< 		$admtext['marr_aft_death'] = "Married after death";
< 		$admtext['marr_bef_birth'] = "Married before birth";
< 		$admtext['died_bef_birth'] = "Died before birth";
< 		$admtext['parents_younger'] = "Born too early (parents less than 15 years old, or child born before marriage)";
< 		$admtext['children_late'] = "Born too late (mother more than 50 years old)";
< 		$admtext['not_living'] = "Person marked as living, death date present";
< 		$admtext['not_dead'] = "Person marked as deceased, possibly still living";
< 		$admtext['parmarr'] = "Parents' Marriage";
< 		$admtext['motherbirth'] = "Mother's Birth";
---
> 		$admtext['noteblurb'] = "Izravno pronađite, uredi ili izbriši bilo koju bilješku u vašoj bazi podataka.";
> 		$admtext['whatsnewblurb'] = "Omogućite svojim posjetiteljima općenito ažuriranje web mjesta ili druge pravovremene informacije pri vrhu stranice Što je novo.";
> 		$admtext['mwblurb'] = "Napravite popis neuhvatljivih ljudi i neidentificiranih fotografija u nadi da ćete dobiti veći publicitet za predmete koji vam stvaraju najviše problema.";
> 		$admtext['dvblurb'] = "Pronađite potencijalne probleme u svojim podacima.";
> 		$admtext['wr_gender'] = "Pogrešan spol";
> 		$admtext['unk_gender'] = "Nepoznat spol";
> 		$admtext['marr_young'] = "Oženjen premlada (mlađi od 15 godina)";
> 		$admtext['marr_aft_death'] = "Oženjen nakon smrti";
> 		$admtext['marr_bef_birth'] = "Oženjen prije rođenja";
> 		$admtext['died_bef_birth'] = "Umro prije rođenja";
> 		$admtext['parents_younger'] = "Rođen prerano (roditelji mlađi od 15 godina ili dijete rođeno prije braka)";
> 		$admtext['children_late'] = "Rođena prekasno (majka više od 50 godina)";
> 		$admtext['not_living'] = "Osoba ozna�ena kao živa, prisutan datum smrti";
> 		$admtext['not_dead'] = "Osoba ozna�ena kao preminula, možda još uvijek živi";
> 		$admtext['parmarr'] = "Brak roditelja";
> 		$admtext['motherbirth'] = "Maj�ino rođenje";
1677,1703c1796,1820
< 		$admtext['modlist'] = "Mod List";
< 		$admtext['removed'] = "removed";
< 		$admtext['installed'] = "Installed";
< 		$admtext['deleted'] = "deleted";
< 		$admtext['cantdel'] = "can't delete";
< 		$admtext['cfgname'] = "Config File Name";
< 		$admtext['version'] = "Version";
< 		$admtext['nomods'] = "No mod definition files (xxx) found in the mod folder";
< 		$admtext['location'] = "Location";
< 		$admtext['missing'] = "Missing";
< 		$admtext['badtarget'] = "Bad target";
< 		$admtext['cantwrite'] = "Unable to write to";
< 		$admtext['notwrite'] = "is not writable, check permissions";
< 		$admtext['checkwrite'] = "Check permissions, must be writeable.";
< 		$admtext['toterrors'] = "Total Errors";
< 		$admtext['missfile'] = "Missing file";
< 		$admtext['notunique'] = "not unique";
< 		$admtext['nodesc'] = "Parameter definition error, missing description";
< 		$admtext['defval'] = "Default value";
< 		$admtext['written'] = "File written";
< 		//changed in 9.0.0
< 		$admtext['locmissing'] = "Local copy of xxx for installation is missing";
< 		//added in 9.0.0
< 		$admtext['needmodupdate'] = "Mod updates are required";
< 		$admtext['cannotinstall'] = "Unable to install this mod";
< 		$admtext['emptytarget'] = "Target file is an empty file.";
< 		$admtext['cantdelmissing'] = "Cannot delete, file is missing";
---
> 		$admtext['modlist'] = "Popis Modova";
> 		$admtext['removed'] = "uklonjeno";
> 		$admtext['installed'] = "Instalirani";
> 		$admtext['deleted'] = "Izbrisano";
> 		$admtext['cantdel'] = "ne mogu izbrisati";
> 		$admtext['cfgname'] = "Konfigurirajte naziv datoteke";
> 		$admtext['version'] = "Verzija";
> 		$admtext['nomods'] = "Nema mod. datoteke definicije (xxx) pronađene u mod mapi";
> 		$admtext['location'] = "Mjesto";
> 		$admtext['missing'] = "Nedostaji";
> 		$admtext['badtarget'] = "Loša meta";
> 		$admtext['cantwrite'] = "Nije moguće pisati u";
> 		$admtext['notwrite'] = "ne može se pisati, provjeriti dopuštenja";
> 		$admtext['checkwrite'] = "Provjerite dozvole, moraju biti upisive.";
> 		$admtext['toterrors'] = "Ukupno pogrešaka";
> 		$admtext['missfile'] = "Nedostaji datoteka";
> 		$admtext['notunique'] = "nije jedinstven";
> 		$admtext['nodesc'] = "Pogreška definicije parametra, nedostaje opis";
> 		$admtext['defval'] = "Zadana vrijednost";
> 		$admtext['written'] = "Datoteka je napisana";
> 		$admtext['locmissing'] = "Lokalni primjerak od xxx za instalaciju nedostaje";
> 		$admtext['needmodupdate'] = "Mod ažuriranja su obavezna";
> 		$admtext['cannotinstall'] = "Nije moguće instalirati ovaj mod";
> 		$admtext['emptytarget'] = "Ciljna datoteka je prazna datoteka.";
> 		$admtext['cantdelmissing'] = "Brisanje nije moguće, datoteka nedostaje";
1705c1822
< 		$admtext['editperf'] = "The Edit parameters were changed as follows:";
---
> 		$admtext['editperf'] = "Parametri Uređivanje promijenjeni su na sljedeći na�in:";
1707,1733c1824,1850
< 		$admtext['options'] = "Options";
< 		$admtext['viewlog'] = "View Log";
< 		$admtext['target'] = "Changes";
< 		$admtext['newfile'] = "Creates";
< 		$admtext['copiesfile'] = "Copies";
< 		$admtext['copiesfile2'] = "Copies to";
< 		$admtext['logoptions'] = "Mod Manager Log";
< 		$admtext['mmlogfilename'] = "Log File Name";
< 		$admtext['sortlistby'] = "Sort Lists by";
< 		$admtext['modname'] = "Mod Name";
< 		$admtext['bypassconfirm'] = "Bypass the Confirmations";
< 		$admtext['modifyoptions'] = "Modify Mod Manager Options";
< 		$admtext['ready'] = "OK to Install";
< 		$admtext['noselected'] = "You have not selected any files!";
< 		$admtext['choose'] = "Select";
< 		$admtext['showlogfile'] = "Show Mod Manager Action Log";
< 		$admtext['recentactions'] = "Mod Manager Most Recent Actions";
< 		$admtext['clearlog'] = "Clear Log";
< 		$admtext['confirmclearlog'] = "Are you sure you want to clear the log?";
< 		$admtext['modsyntax'] = "Mod Syntax";
< 		$admtext['modguidelines'] = "Mod Standards";
< 		$admtext['filemod'] = "File xxx is modified by";
< 		$admtext['potconf'] = "Potential Conflicts";
< 		$admtext['modifications'] = "modifications";
< 		$admtext['othermmoptions'] = "Other";
< 		$admtext['file'] = "File";
< 		$admtext['tngmods'] = "Mods for TNG ";
---
> 		$admtext['options'] = "Opcije";
> 		$admtext['viewlog'] = "Pregled dnevnika";
> 		$admtext['target'] = "Promjene";
> 		$admtext['newfile'] = "Stvara";
> 		$admtext['copiesfile'] = "Kopije";
> 		$admtext['copiesfile2'] = "Kopije do";
> 		$admtext['logoptions'] = "Mod Menadžera zapisnik";
> 		$admtext['mmlogfilename'] = "Zapisnika datoteke ime";
> 		$admtext['sortlistby'] = "Poredaj popisa prema";
> 		$admtext['modname'] = "Mod Ime";
> 		$admtext['bypassconfirm'] = "Zaobiđite potvrde";
> 		$admtext['modifyoptions'] = "Izmijenite Mod Menadžera Opcije";
> 		$admtext['ready'] = "U redu za instalaciju";
> 		$admtext['noselected'] = "Niste odabrali nijednu datoteku!";
> 		$admtext['choose'] = "Odaberi";
> 		$admtext['showlogfile'] = "Prikaži Mod Menadžera dnevni zapisnik";
> 		$admtext['recentactions'] = "Mod Menadžera najnovije akcije";
> 		$admtext['clearlog'] = "O�isti zapisnik";
> 		$admtext['confirmclearlog'] = "Jeste li sigurni da želite poništiti zapisnik?";
> 		$admtext['modsyntax'] = "Mod Sintaks";
> 		$admtext['modguidelines'] = "Mod Standardi";
> 		$admtext['filemod'] = "Datoteka xxx izmijenio/la";
> 		$admtext['potconf'] = "Potencijalni sukobi";
> 		$admtext['modifications'] = "izmjene";
> 		$admtext['othermmoptions'] = "Drugo/i";
> 		$admtext['file'] = "Datoteka";
> 		$admtext['tngmods'] = "Mod za TNG ";
1735,1743c1852,1860
< 		$admtext['copied'] = "copied";
< 		$admtext['emptyfile'] = "file is empty";
< 		$admtext['filescopied'] = "files copied";
< 		$admtext['notinst'] = "not installed";
< 		$admtext['install'] = "install";
< 		$admtext['filedel'] = "File deleted";
< 		$admtext['created'] = "created";
< 		$admtext['choosefilter'] = "Choose the filter and click Go for the available controls";
< 		$admtext['mmmaxloglines'] = "Max number of transactions";
---
> 		$admtext['copied'] = "kopirana";
> 		$admtext['emptyfile'] = "datoteka je prazna";
> 		$admtext['filescopied'] = "datoteke su kopirane";
> 		$admtext['notinst'] = "nije instalirano";
> 		$admtext['install'] = "instalirati";
> 		$admtext['filedel'] = "Datoteka je izbrisana";
> 		$admtext['created'] = "stvorio";
> 		$admtext['choosefilter'] = "Odaberite filtar i kliknite Idi za dostupne kontrole";
> 		$admtext['mmmaxloglines'] = "Maksimalni broj transakcija";
1746,1778c1863,1895
< 		$admtext['uninstall'] = "Uninstall";    // was $admtext['remove'] = "Remove"
< 		$admtext['cleanup'] = "Clean Up";  // previously used as $admtext['clean']
< 		$admtext['edopts'] = "Edit Options";  // previously used as $admtext['edit'] without Option text
< 		$admtext['ok2inst'] = "OK to install";  // previously used $admtext['ready'] which is already translated
< 		$admtext['badversion'] = "file version/version mismatch";
< 		$admtext['bomfound'] = "BOM removed";
< 		$admtext['cantinst'] = "cannot install";
< 		$admtext['cantproc'] = "cannot remove mod";
< 		$admtext['cantupd'] = "unable to update parameter";
< 		$admtext['cleanupall'] = "Clean up";
< 		$admtext['copiesreq'] = "file copies specified";
< 		$admtext['delete'] = "Delete";
< 		$admtext['deleteall'] = "Delete";
< 		$admtext['errors'] = "errors";
< 		$admtext['excused'] = "files excused";
< 		$admtext['filesinst'] = "files installed";
< 		$admtext['filesrem'] = "files removed";
< 		$admtext['format'] = "format error";
< 		$admtext['installall'] = "Install";
< 		$admtext['installing'] = "Installing";
< 		$admtext['line'] = "Line";
< 		$admtext['modified'] = "modified";
< 		$admtext['modsinst'] = "code modifications installed";
< 		$admtext['modrem'] = "mod uninstalled";
< 		$admtext['modsrem'] = "code modifications removed";
< 		$admtext['modsreq'] = "code modifications specified";
< 		$admtext['newfilesreq'] = "new files specified";
< 		$admtext['nfcreated'] = "new file created";
< 		$admtext['noact'] = "action tag invalid";
< 		$admtext['nocfgfile'] = "mod file not found";
< 		$admtext['nocomps'] = "missing elements";
< 		$admtext['noend'] = "%end:% tag missing";
< 		$admtext['nolocation'] = "missing location tag";
---
> 		$admtext['uninstall'] = "deinstalirati";    // was $admtext['remove'] = "Remove"
> 		$admtext['cleanup'] = "Po�istiti";  // previously used as $admtext['clean']
> 		$admtext['edopts'] = "Opcije uređivanja";  // previously used as $admtext['edit'] without Option text
> 		$admtext['ok2inst'] = "U redu za instalaciju";  // previously used $admtext['ready'] which is already translated
> 		$admtext['badversion'] = "datoteke verzija/neusklađenost verzije";
> 		$admtext['bomfound'] = "BOM uklonit";
> 		$admtext['cantinst'] = "ne može se instalirati";
> 		$admtext['cantproc'] = "ne može ukloniti mod";
> 		$admtext['cantupd'] = "nije moguće ažurirati parametar";
> 		$admtext['cleanupall'] = "Po�istiti";
> 		$admtext['copiesreq'] = "određene kopije datoteka";
> 		$admtext['delete'] = "Izbrisati";
> 		$admtext['deleteall'] = "Izbrisati";
> 		$admtext['errors'] = "greške";
> 		$admtext['excused'] = "datoteke oproštene";
> 		$admtext['filesinst'] = "datoteke instalirane";
> 		$admtext['filesrem'] = "datoteke su uklonjene";
> 		$admtext['format'] = "pogreška formata";
> 		$admtext['installall'] = "Instalirati";
> 		$admtext['installing'] = "Instaliranje";
> 		$admtext['line'] = "Linija";
> 		$admtext['modified'] = "promijenjen";
> 		$admtext['modsinst'] = "koda modifikacija instalirana";
> 		$admtext['modrem'] = "mod deinstaliran";
> 		$admtext['modsrem'] = "koda modifikacija uklonjene";
> 		$admtext['modsreq'] = "koda modifikacija specificirana";
> 		$admtext['newfilesreq'] = "određene su nove datoteke";
> 		$admtext['nfcreated'] = "stvorena nova datoteka";
> 		$admtext['noact'] = "akcijska oznaka nije važeća";
> 		$admtext['nocfgfile'] = "mod datoteka nije pronađena";
> 		$admtext['nocomps'] = "elementi koji nedostaju";
> 		$admtext['noend'] = "%end:% oznaka nedostaji";
> 		$admtext['nolocation'] = "nedostaje oznaka lokacije";
1780,1817c1897,1934
< 		$admtext['opened'] = "opened";
< 		$admtext['optional'] = "optional";
< 		$admtext['partinst'] = "partially installed";
< 		$admtext['removeall'] = "Uninstall";    // was Remove Selected mods
< 		$admtext['removing'] = "Uninstalling";    // was Removing
< 		$admtext['reqtag'] = "required tag missing";
< 		$admtext['restparam'] = "Restoring default parameter";
< 		$admtext['return'] = "Return to Mod Manager";
< 		$admtext['tagnoterm'] = "tag not terminated";
< 		$admtext['tagunk'] = "tag is unknown";
< 		$admtext['tgtfile'] = "target file";
< 		$admtext['updated'] = "updated";
< 		$admtext['updparam'] = "Updating parameter";
< 		$admtext['unxend'] = "unexpected end of file";
< 		$admtext['warnings'] = "Warnings";
< 		$admtext['allowdeletepartial'] = "Allow Delete Selected of Partially Installed Mods";
< 		$admtext['allowdeleteinstalled'] = "Allow Delete of individually Installed Mods";
< 		$admtext['showwarnings'] = "Show Mod Warnings in Status";
< 		$admtext['logfullpath'] = "Log full path for file actions";
< 		$admtext['deleting'] = "Deleting ";
< 		$admtext['wiki'] = "Wiki";
< 		$admtext['aflist'] = "Files";
< 		$admtext['hasoptions'] = "Options";
< 		$admtext['restore'] = "Restore Default";
< 		$admtext['stayon'] = "Lock";
< 		$admtext['accessible'] = "accessible";
< 		$admtext['bypassed'] = "bypassed";
< 		$admtext['willbypass'] = "will ignore";  // was "will bypass"
< 		$admtext['cantdel'] = "can't delete";
< 		$admtext['optmissing'] = "file missing (optional)";
< 		$admtext['tgtmissing'] = "target file missing";
< 		$admtext['optlocked'] = "file locked (optional)";
< 		$admtext['tgtlocked'] = "file locked";
< 		$admtext['alreadyrem'] = "already removed";
< 		$admtext['noaccess'] = "no access";
< 		$admtext['badinstall'] = "failed to install";
< 		$admtext['removed'] = "removed";
< 		$admtext['deleted'] = "deleted";
---
> 		$admtext['opened'] = "otvori";
> 		$admtext['optional'] = "neobavezan";
> 		$admtext['partinst'] = "djelomi�no instaliran";
> 		$admtext['removeall'] = "Deinstalirati";    // was Remove Selected mods
> 		$admtext['removing'] = "Deinstalira se";    // was Removing
> 		$admtext['reqtag'] = "nedostaje potrebna oznaka";
> 		$admtext['restparam'] = "Vraćanje zadanog parametra";
> 		$admtext['return'] = "Vratite se Mod Menadžeru";
> 		$admtext['tagnoterm'] = "oznaka nije ukinuta";
> 		$admtext['tagunk'] = "ag je nepoznat";
> 		$admtext['tgtfile'] = "ciljna datoteka";
> 		$admtext['updated'] = "ažurirana";
> 		$admtext['updparam'] = "Parametar ažuriranja";
> 		$admtext['unxend'] = "neo�ekivani kraj datoteke";
> 		$admtext['warnings'] = "Upozorenja";
> 		$admtext['allowdeletepartial'] = "Dopusti brisanje odabranih djelomi�no instaliranih Modova";
> 		$admtext['allowdeleteinstalled'] = "Dopusti brisanje pojedina�no instaliranih Modova";
> 		$admtext['showwarnings'] = "Prikaži Mod upozorenja u statusu";
> 		$admtext['logfullpath'] = "Prijavite cijeli put za datoteka radnje";
> 		$admtext['deleting'] = "Brisanje ";
> 		$admtext['wiki'] = "Pomoć - Wiki";
> 		$admtext['aflist'] = "Datoteke";
> 		$admtext['hasoptions'] = "Opcije";
> 		$admtext['restore'] = "Vratiti tvorni�ke postavke";
> 		$admtext['stayon'] = "Zaklju�aj";
> 		$admtext['accessible'] = "dostupan";
> 		$admtext['bypassed'] = "zaobići";
> 		$admtext['willbypass'] = "zanemarit će";  // was "will bypass"
> 		$admtext['cantdel'] = "ne mogu izbrisati";
> 		$admtext['optmissing'] = "datoteka nedostaje (izborno)";
> 		$admtext['tgtmissing'] = "nedostaje ciljna datoteka";
> 		$admtext['optlocked'] = "datoteka zaklju�ana (izborno)";
> 		$admtext['tgtlocked'] = "datoteka zaklju�ana";
> 		$admtext['alreadyrem'] = "već uklonjena";
> 		$admtext['noaccess'] = "nema pristupa";
> 		$admtext['badinstall'] = "nije uspio instalirati";
> 		$admtext['removed'] = "uklonjeno";
> 		$admtext['deleted'] = "Izbrisano";
1820,1843c1937,1960
< 		$admtext['optnocopy'] = "optional file not copied";
< 		$admtext['notcopied'] = "not copied";
< 		$admtext['copied'] = "copied";
< 		$admtext['notcreated'] = "can't create new file";
< 		$admtext['optnotcreated'] = "can't create optional new file";
< 		$admtext['nocreated'] = "not created";
< 		$admtext['fixedheader'] = "Use Fixed Headers";
< 		$admtext['cantremok'] = "can't remove, optional, bypassed";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['edparams'] = "edit parameters";
< 		$admtext['compresslog'] = "Collapse Log Display";
< 		$admtext['formodname'] = "for mod name ";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['fileperms'] = "Please check file permissions";
< 		$admtext['noparam'] = "parameter missing";
< 		$admtext['editing'] = "editing";
< 		$admtext['redirect2log'] = "Redirect to Log For";
< 		$admtext['on_error'] = "Errors Only";
< 		$admtext['on_all'] = "All Transactions";
< 		$admtext['usestriping'] = "Use stripes";
< 		$admtext['stripeafter'] = "Stripe after number of rows";
< 		$admtext['adjusthdrs'] = "Adjust Fixed Headers";
< 		$admtext['displayoptions'] = "Display Settings";
< 		$admtext['no_frag'] = "code fragment not allowed here";
---
> 		$admtext['optnocopy'] = "izborna datoteka nije kopirana";
> 		$admtext['notcopied'] = "nije kopirana";
> 		$admtext['copied'] = "kopirana";
> 		$admtext['notcreated'] = "ne mogu stvoriti novu datoteku";
> 		$admtext['optnotcreated'] = "ne može stvoriti novu izbornu datoteku";
> 		$admtext['nocreated'] = "nije stvoren";
> 		$admtext['fixedheader'] = "Koristite Fiksna Zaglavlja";
> 		$admtext['cantremok'] = "ne može se ukloniti, izborno, zaobići";
> 		$admtext['nofolder'] = "nedostaje ciljna mapa";
> 		$admtext['edparams'] = "uredi parametre";
> 		$admtext['compresslog'] = "Sažmi prikaz dnevnika";
> 		$admtext['formodname'] = "za ime mod ";
> 		$admtext['nofolder'] = "nedostaje ciljna mapa";
> 		$admtext['fileperms'] = "Provjerite dopuštenja datoteka";
> 		$admtext['noparam'] = "nedostaje parametar";
> 		$admtext['editing'] = "uređivanje";
> 		$admtext['redirect2log'] = "Lreusmjeravanje do zapisnika za";
> 		$admtext['on_error'] = "Greške samo";
> 		$admtext['on_all'] = "Sve transakcije";
> 		$admtext['usestriping'] = "Koristite pruge";
> 		$admtext['stripeafter'] = "Pruga nakon broja redaka";
> 		$admtext['adjusthdrs'] = "Podesite Fiksna Zaglavlja";
> 		$admtext['displayoptions'] = "Postavke Zaslona";
> 		$admtext['no_frag'] = "fragment koda ovdje nije dopušten";
1845,1879c1962,2002
< 		$admtext['exists'] = "exists";
< 		$admtext['newdirsreq'] = "new folders specified";
< 		$admtext['cantrem'] = "can't remove";
< 		$admtext['showanalyzer'] = "Show Analyzer tab";
< 		$admtext['showdeveloper'] = "Show Other Developer tools";
< 		$admtext['showupdates'] = "Show Recommended Updates tab";
< 		$admtext['analyzefiles'] = "Analyze TNG Files";
< 		$admtext['parsetable'] = "View Parser Table";
< 		$admtext['recommendedfixes'] = "Recommended Updates";
< 		$admtext['selectmod'] = "Select a mod config file to view the parser table results";
< 		$admtext['parsertags'] = "Parser Tags Array:";
< 		$admtext['parsererror'] = "Error: ";
< 		$admtext['filesel'] = "Select Modified File to examine the changes";
< 		$admtext['custtextfixes'] = "The updated Mod Guidelines recommend that custom text be inserted before the comments at the beginning of the cust_text.php file so that mods do not impact user manual changes made after the comment lines.";
< 		$admtext['updcusttext'] = "Update cust_text.php files";
< 		$admtext['confirmupdcusttext'] = "Are you sure you want to update the cust_text.php files?";
< 		$admtext['compressnames'] = "Compress Mod Names in Mod List";
< 		$admtext['verified'] = "verified";
< 		$admtext['provisional'] = "(provisional) must be available";
< 		$admtext['backtoprevious'] = "Return to previous page";
< 		$admtext['reasontoupdate'] = "If you have not run the cust_text_update.php script as part of the TNG v12 upgrade, you need to update your cust_text.php files to <ul><li>add a new line to the files and </li><li>also update out-of-date line in your existing cust_text.php files</li></ul> which are not replaced during TNG upgrades.";
< 		$admtext['newanchor'] = "The new comment line should not be translated in the language files so that it can be used as an anchor to insert custom text before this new comment line by the mod developers.";
< 		$admtext['translateissue'] = "If you translate the new comment line, mod installs will fail.";
< 		$admtext['privatemod'] = "Private Mod";
< 		$admtext['protected'] = "protected-remove file manually";
< 		$admtext['restored'] = "restored";
< 		$admtext['confdelmod'] = "Do you really want to delete this mod from your system?";
< 		$admtext['allowdeletesupport'] = "Allow Delete support folder when mod is deleted";
< 		$admtext['delrisk'] = "By choosing this option, user accepts all risk that unintended folders could be deleted. We believe this risk is very small.";
< 		$admtext['delpartinfo'] = "You should only set this option to Yes, if you forgot to Uninstall previous versions of the mod before installing a new version.";
< 		$admtext['delinstinfo'] = "You should only set this option to Yes, if you installed a new version of the mod and the previous version still shows installed.";
< 		$admtext['updateopts'] = "Your mmconfig.php needs to be updated! Please click on the Options tab above and click on the Save button.";
< 		$admtext['confdelmod1'] = "Do you really want to delete this mod from your system? You can not undo this operation!";
< 		$admtext['noeffect'] = "Warning: Does not change anything in TNG!";
< 		$admtext['cfgnowrite'] = "Warning: Cfg file is write-protected. Parameters cannot be changed.";
---
> 		$admtext['exists'] = "postoji";
> 		$admtext['newdirsreq'] = "određene su nove mape";
> 		$admtext['cantrem'] = "ne može ukloniti";
> 		$admtext['showanalyzer'] = "Prikaži Analyzer karticu";
> 		$admtext['showdeveloper'] = "Pokažite druge alate za razvojne programere";
> 		$admtext['showupdates'] = "Prikaži karticu Preporu�ene nadogradnje";
> 		$admtext['analyzefiles'] = "Analizirajte TNG datoteke";
> 		$admtext['parsetable'] = "Pogledajte tablicu Raš�lanjivanja";
> 		$admtext['recommendedfixes'] = "Preporu�ene nadogradnje";
> 		$admtext['selectmod'] = "Odaberite mod konfiguracijsku datoteku za pregled rezultata tablice za raš�lanjivanje";
> 		$admtext['parsertags'] = "Analizator oznaka polje:";
> 		$admtext['parsererror'] = "Greška: ";
> 		$admtext['filesel'] = "Odaberite TNG datoteku da biste vidjeli koji modovi utje�u na nju";
> 		$admtext['custtextfixes'] = "Ažurirane Mod smjernice preporu�uju umetanje prilagođenog teksta prije komentara na po�etku datoteke cust_text.php tako da modovi ne utje�u na promjene u korisni�kom priru�niku izvršene nakon redaka komentara.";
> 		$admtext['updcusttext'] = "Ažurirajte datoteke cust_text.php";
> 		$admtext['confirmupdcusttext'] = "Jeste li sigurni da želite ažurirati datoteke cust_text.php?";
> 		$admtext['compressnames'] = "Uklonite razmake s imena datoteka na Mod popis";
> 		$admtext['verified'] = "potvrđen";
> 		$admtext['provisional'] = "(privremeni) moraju biti dostupni";
> 		$admtext['backtoprevious'] = "Povratak na prethodnu stranicu";
> 		$admtext['reasontoupdate'] = "Ako niste pokrenuli skriptu cust_text_update.php kao dio nadogradnje za TNG v12, morate ažurirati datoteke cust_text.php da <ul><li>dodate novi redak u datoteke i </li><li>također ažurirajte zastarelu liniju u postojećim datotekama cust_text.php</li></ul> koje se ne zamjenjuju tijekom TNG nadogradnje.";
> 		$admtext['newanchor'] = "Nova linija komentara ne bi trebala biti prevedena u jezi�ne datoteke tako da se može upotrijebiti kao sidro za umetanje prilagođenog teksta prije ovoga koment linije od modnih programera.";
> 		$admtext['translateissue'] = "Ako prevedete novu liniju komentara, instalacije moda neće uspjeti.";
> 		$admtext['privatemod'] = "Privatni Mod";
> 		$admtext['protected'] = "zaštićeno - uklonite datoteku ru�no";
> 		$admtext['restored'] = "obnovljena";
> 		$admtext['confdelmod'] = "Želite li stvarno izbrisati ovaj Mod i povezanu mapu iz svog sustava? Ne možete poništiti ovu operaciju!";
> 		$admtext['allowdeletesupport'] = "Dopusti Izbriši mapu podrške kada se mod izbriše";
> 		$admtext['delrisk'] = "Odabirom ove opcije, korisnik prihvaća sav rizik da se nenamjerne mape mogu izbrisati. Vjerujemo da je taj rizik vrlo mali.";
> 		$admtext['delpartinfo'] = "Ovu opciju trebali biste postaviti samo na Da, ako ste zaboravili deinstalirati prethodne verzije modova prije instaliranja nove verzije.";
> 		$admtext['delinstinfo'] = "Ovu opciju trebali biste postaviti samo na Da, ako ste instalirali novu verziju modova, a prethodna verzija i dalje prikazuje instaliranu.";
> 		$admtext['updateopts'] = "Potrebno je ažurirati mmconfig.php! Kliknite gornju karticu Opcije i kliknite gumb Sa�uvaj.";
> 		$admtext['confdelmod1'] = "Želite li stvarno izbrisati ovaj Mod iz svog sustava? Ne možete poništiti ovu operaciju!";
> 		$admtext['noeffect'] = "UPOZORENJE: Nemoj ništa mijenjat u TNG!";
> 		$admtext['cfgnowrite'] = "UPOZORENJE: Cfg datoteka zaštićena je od pisanja. Parametri se ne mogu mijenjati.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Svi modovi";
> 		$admtext['installedmods'] = "Samo instalirani modovi";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Prikaži radnje u Modova Analyzeru";
> 		$admtext['badchar'] = "Nevažeće slovo"; 
1884,1898c2007,2020
< 		$admtext['confdeletedna'] = "Are you sure you want to delete this test?";
< 		$admtext['test_type'] = "Test Type";
< 		$admtext['test_number'] = "Test Number";
< 		$admtext['test_date'] = "Test Date";
< 		$admtext['modifydna'] = "Edit Existing DNA Test";
< 		$admtext['changestoalldna'] = "Changes to all tests";
< 		$admtext['addnewdna'] = "Add New DNA Test";
< 		$admtext['testinfo'] = "Test Information";
< 		$admtext['urls'] = "Relevant Links";
< 		$admtext['dnalater'] = "Note: Test can be linked to other individuals on the next screen.";
< 		$admtext['selecttype'] = "Please select a test type.";
< 		$admtext['entertestnum'] = "Please enter the test number.";
< 		$admtext['test_taker'] = "Person who took this test";
< 		$admtext['test_links'] = "People Linked by this Test";
< 		$admtext['changestotest'] = "Changes to test";
---
> 		$admtext['confdeletedna'] = "Jeste li sigurni da želite izbrisati ovaj test?";
> 		$admtext['test_type'] = "Vrsta testa";
> 		$admtext['test_date'] = "Datum testa";
> 		$admtext['modifydna'] = "Uredi postojeći DNA test";
> 		$admtext['changestoalldna'] = "Promjene svih testova";
> 		$admtext['addnewdna'] = "Dodaj novi DNA test";
> 		$admtext['testinfo'] = "Test Informacija";
> 		$admtext['urls'] = "Relevantne linkove";
> 		$admtext['dnalater'] = "NAPOMENA: Na sljedećem zaslonu može se dodati više informacija i test vezan za više pojedinaca.";
> 		$admtext['selecttype'] = "Odaberite vrstu testa.";
> 		$admtext['entertestnum'] = "Unesi broj testa.";
> 		$admtext['test_taker'] = "Osoba koja je položila ovaj test";
> 		$admtext['test_links'] = "Ljudi povezani ovim testom";
> 		$admtext['changestotest'] = "Promjene za test";
1900,1918c2022,2049
< 		$admtext['dnalater'] = "Note: Test can be linked to other individuals on the next screen.";
< 		$admtext['markers'] = "Number of Markers";
< 		$admtext['test_values'] = "Test Values";
< 		$admtext['separate'] = "Separate values with commas";
< 		$admtext['person_name'] = "Person not in database";
< 		$admtext['privsection'] = "Privacy";
< 		$admtext['configsettings'] = "General Settings";
< 		$admtext['addtotestgroup'] = "Add Test To A Group";
< 		$admtext['dna_group'] = "DNA Group";
< 		$admtext['groupid'] = "Group ID";
< 		$admtext['addgroup'] = "Add Group";
< 		$admtext['entergroupid'] = "Please enter a group ID";
< 		$admtext['entergroupdesc'] = "Please enter a group description";
< 		$admtext['confgroupdelete'] = "Are you sure you want to delete this group?";
< 		$admtext['modifygroup'] = "Edit Existing Group";
< 		$admtext['mrcaiorf'] = "If relevant, enter a person ID OR a family ID";
< 		$admtext['test_results'] = "Test Results";
< 		$admtext['mdaID'] = "Most distant ancestor ID";
< 		$admtext['mrcaID'] = "Most recent common ancestor ID";
---
> 		$admtext['dnalater'] = "NAPOMENA: Na sljedećem zaslonu može se dodati više informacija i test vezan za više pojedinaca.";
> 		$admtext['markers'] = "Broj markera";
> 		$admtext['test_values'] = "Test vrijednosti";
> 		$admtext['separate'] = "Vrijednosti razdvojite zarezima";
> 		$admtext['person_name'] = "Osoba nije u bazi podataka";
> 		$admtext['privsection'] = "Privatnost";
> 		$admtext['configsettings'] = "Opće Postavke";
> 		$admtext['addtotestgroup'] = "Dodaj test grupi";
> 		$admtext['dna_group'] = "DNA grupa";
> 		$admtext['groupid'] = "Grupe ID";
> 		$admtext['addgroup'] = "Dodaj Grupu";
> 		$admtext['entergroupid'] = "Unesite ID grupe";
> 		$admtext['entergroupdesc'] = "Unesite opis grupe";
> 		$admtext['confgroupdelete'] = "Jeste li sigurni da želite izbrisati ovu grupu?";
> 		$admtext['modifygroup'] = "Uredi Postojeće Grupe";
> 		$admtext['mrcaiorf'] = "Ako je relevantno, unesi ID osobe ILI obiteljski ID";
> 		$admtext['test_results'] = "Rezultati ispitivanja";
> 		$admtext['mdaID'] = "ID najudaljenijeg pretka";
> 		$admtext['mrcaID'] = "Najnoviji zajedni�ki ID predaka";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Broj";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Držite test privatnim";
> 		$admtext['multivalues'] = "Koristite crtice između više vrijednosti";
> 		$admtext['changestogroup'] = "Promjene u DNA grupi";
> 		$admtext['modifydnagroup'] = "Uredi postojeću DNA grupu";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Povežite ovaj DNA test s osobom"; 
1923,1934c2054,2065
< $admtext['cannotexecutequery'] = "Ne mogu pokrenuti query";
< $admtext['addnew'] = "Add New";
< $admtext['individuals'] = "osobe";
< $admtext['succadded'] = "je uspješno dodano";
< $admtext['succaddedlinked'] = "je uspješno dodano i povezano sa";
< $admtext['succsaved'] = "je uspješno pohranjeno";
< $admtext['succdeleted'] = "je uspješno obrisano";
< $admtext['succdeletedpluslinks'] = "je uspješno obrisano, zajedno sa svim linkovima";
< $admtext['text_delete'] = "Obriši";
< $admtext['deleted'] = "Obrisano";
< $admtext['deleteselected'] = "Obriši oznaèeno";
< $admtext['noresults'] = "Rezultati nisu pronaðeni. Pokušajte ponovo.";
---
> $admtext['cannotexecutequery'] = "Upit nije moguće izvršiti";
> $admtext['addnew'] = "Dodaj Novi";
> $admtext['individuals'] = "osoba";
> $admtext['succadded'] = "je uspješno dodano";
> $admtext['succaddedlinked'] = "je uspješno dodano i povezano sa";
> $admtext['succsaved'] = "je uspješno sa�uvano";
> $admtext['succdeleted'] = "je uspješno izbrisano";
> $admtext['succdeletedpluslinks'] = "je uspješno izbrisano, zajedno sa svim linkovima";
> $admtext['text_delete'] = "Izbriši";
> $admtext['deleted'] = "Izbrisani";
> $admtext['deleteselected'] = "Izbriši odabrano";
> $admtext['noresults'] = "Nema rezultata. Molim te pokušaj ponovno.";
1938c2069
< $admtext['notes'] = "Zapis";
---
> $admtext['notes'] = "Bilješke";
1942,1948c2073,2079
< $admtext['searchfor'] = "Pretraži za";
< $admtext['lookin'] = "Pogledaj unutar (èekiraj sve na koje se to odnosi)";
< $admtext['cemeteryid'] = "ID groblja";
< $admtext['exactmatch'] = "Samo toèan match";
< $admtext['nothingtodelete'] = "Nema ništa za brisanje";
< $admtext['state'] = "state";
< $admtext['country'] = "država";
---
> $admtext['searchfor'] = "Traži za";
> $admtext['lookin'] = "Pogledaj (provjerite sve Å¡to vrijedi)";
> $admtext['cemeteryid'] = "ID Groblja";
> $admtext['exactmatch'] = "Samo ta�an me�";
> $admtext['nothingtodelete'] = "Ništa za brisanje";
> $admtext['state'] = "županija";
> $admtext['country'] = "država";
1950,1951c2081,2082
< $admtext['ifphotouploaded'] = "Ostavi ovo polje prazno ako su datoteke veæ bile uploadane u tvojem direktoriju slika.";
< $admtext['eventtype'] = "Tip dogaðaja";
---
> $admtext['ifphotouploaded'] = "Ostavite ovo polje prazno ako je datoteka već prenesena u mapu vaših fotografija.";
> $admtext['eventtype'] = "Vrsta događaja";
1953c2084
< $admtext['savechanges'] = "Pohrani promjene";
---
> $admtext['savechanges'] = "Sa�uvaj";
1955,1956c2086,2087
< $admtext['find'] = "Naði...";
< $admtext['create'] = "Kreiraj...";
---
> $admtext['find'] = "Nađi...";
> $admtext['create'] = "Stvori...";
1958,1960c2089,2091
< $admtext['birthabbr'] = "b.";
< $admtext['chrabbr'] = "c.";
< $admtext['remove'] = "Obriši";
---
> $admtext['birthabbr'] = "r.";
> $admtext['chrabbr'] = "kr.";
> $admtext['remove'] = "Izbriši";
1963,1965c2094,2095
< $admtext['enterpersonid'] = "Molim unesi ID osobe";
< $admtext['personid'] = "ID osobe";
< $admtext['otherevents'] = "Ostali dogaðaji";
---
> $admtext['enterpersonid'] = "Unesite ID Osobe";
> $admtext['personid'] = "ID Osobe";
1967,1969c2097,2099
< $admtext['children'] = "Djeca";
< $admtext['chrdate'] = "Datum Christening";
< $admtext['chrplace'] = "Mjesto Christening";
---
> $admtext['children'] = "Dijeca";
> $admtext['chrdate'] = "Datum krštenja";
> $admtext['chrplace'] = "Mjesto krštenja";
1972,1975c2102,2105
< $admtext['burialdate'] = "Datum ukopa";
< $admtext['burialplace'] = "Mjesto ukopa";
< $admtext['birthdate'] = "Datum roðenja";
< $admtext['birthplace'] = "Mjesto roðenja";
---
> $admtext['burialdate'] = "Datum sahrane";
> $admtext['burialplace'] = "Mjesto sahrane";
> $admtext['birthdate'] = "Datum rođenja";
> $admtext['birthplace'] = "Mjesto rođenja";
1978,1980c2108,2110
< $admtext['marriagedate'] = "Datum vjenjèanja";
< $admtext['marriageplace'] = "Mjesto vjenjèanja";
< $admtext['lastname'] = "prezime";
---
> $admtext['marriagedate'] = "Datum vjen�anja";
> $admtext['marriageplace'] = "Mjesto vjen�anja";
> $admtext['lastname'] = "Prezime";
1984,1995c2114,2125
< $admtext['cannotopen'] = "Ne mogu otvoriti datoteku";
< $admtext['check'] = "Check";
< $admtext['generate'] = "Generiraj";
< $admtext['update'] = "Update";
< $admtext['confdeleteevent'] = "Da li si siguran da želiš obrisati ovaj dogaðaj?";
< $admtext['existinglinks'] = "Postojeæi linkovi:<br/>(ozaèi za obrisati)";
< $admtext['lowersortfirst'] = "Lower numbers sort first. Decimal numbers may also be used.";
< $admtext['personsname'] = "Ime osobe";
< $admtext['tablecreation'] = "Tabla kreirana";
< $admtext['tracklines'] = "Track Lines";
< $admtext['administration'] = "Administration";
< $admtext['text_or'] = "OR";
---
> $admtext['cannotopen'] = "Datoteka se ne može otvoriti";
> $admtext['check'] = "ÄŒek";
> $admtext['generate'] = "Generirati";
> $admtext['update'] = "Ažuriranje";
> $admtext['confdeleteevent'] = "Jeste li sigurni da želite izbrisati ovaj događaj?";
> $admtext['existinglinks'] = "Postojeće linkovi:<br/> (ozna�ite za brisanje)";
> $admtext['lowersortfirst'] = "Niži brojevi prvo sortiraju. Također se mogu koristiti decimalni brojevi.";
> $admtext['personsname'] = "Ime Osobe";
> $admtext['tablecreation'] = "Izrada Tablice";
> $admtext['tracklines'] = "Praćenje linija";
> $admtext['administration'] = "Administrator";
> $admtext['text_or'] = "ILI";
1997,2000c2127,2130
< $admtext['families'] = "Families";
< $admtext['headstones'] = "Headstones";
< $admtext['histories'] = "Histories";
< $admtext['people'] = "People";
---
> $admtext['families'] = "Obiteji";
> $admtext['headstones'] = "Spomeniki";
> $admtext['histories'] = "Povijesti";
> $admtext['people'] = "Osobe";
2002,2006c2132,2136
< $admtext['reports'] = "Reports";
< $admtext['sources'] = "Sources";
< $admtext['suffix'] = "Suffix";
< $admtext['add'] = "Add";
< $admtext['confdeleteentity'] = "Da li ste sigurni da želite obrisati oznaèeno";
---
> $admtext['reports'] = "Izvještaji";
> $admtext['sources'] = "Izvori";
> $admtext['suffix'] = "Sufiks";
> $admtext['add'] = "Dodaj";
> $admtext['confdeleteentity'] = "Jeste li sigurni da želite izbrisati odabrano";
2009c2139
< $admtext['display'] = "Prikaži";
---
> $admtext['display'] = "Prikaži";
2011c2141
< $admtext['orderpound'] = "Order #";
---
> $admtext['orderpound'] = "Narudžba #";
2014,2019c2144,2149
< $admtext['selectaddtree'] = "Stablo (oznaèi ili dodaj novo)";
< $admtext['selecttree'] = "Molim oznaèi/dodaj stablo.";
< $admtext['treebefevent'] = "Morate oznaèiti ili unijeti ime stabla prije dodavanja novog dogaðaja.";
< $admtext['text_rename'] = "Preimenuj";
< $admtext['clear'] = "Oèisti";
< $admtext['linktothis'] = "Link do ove osobe";
---
> $admtext['selectaddtree'] = "Stablo (odaberi ili dodaj novo)";
> $admtext['selecttree'] = "Odaberi/Dodaj stablo.";
> $admtext['treebefevent'] = "Prije dodavanja novih događaja morate odabrati ili unijeti ime stabla.";
> $admtext['text_rename'] = "Preimenovati";
> $admtext['clear'] = "O�isti";
> $admtext['linktothis'] = "Poveznica s ovom osobom";
2021,2027c2151,2157
< $admtext['existingconfig'] = "Postojeæa konfiguracija";
< $admtext['lastmodified'] = "Zadnje modificirano";
< $admtext['addnotes'] = "Dodatne zabilješke";
< $admtext['confdeletenote'] = "Da li ste sigurni da želite obrisati ovu zabilješku?";
< $admtext['treebefnote'] = "Morate oznaèiti ili unijeti ime prije dodavanja novih zabilježaka.";
< $admtext['general'] = "General";
< $admtext['entersearchvalue'] = "Molim unesite vrijednost za pretraživanje.";
---
> $admtext['existingconfig'] = "Postojeća konfiguracija";
> $admtext['lastmodified'] = "Zadnja promjena";
> $admtext['addnotes'] = "Dodatne Napomene";
> $admtext['confdeletenote'] = "Jeste li sigurni da želite izbrisati ovu bilješku?";
> $admtext['treebefnote'] = "Prije dodavanja novih bilješki morate odabrati ili upisati naziv stabla.";
> $admtext['general'] = "Općenito";
> $admtext['entersearchvalue'] = "Unesite vrijednost pretraživanja.";
2031,2035c2161,2165
< $admtext['norights'] = "Niste autorizirani vidjeti ovu stranicu. Ako imate korisnièko ime i šifru molim logirajte se dolje.";
< $admtext['username'] = "Username";
< $admtext['password'] = "Password";
< $admtext['login'] = "Login";
< $admtext['logout'] = "Logout";
---
> $admtext['norights'] = "Niste ovlašteni za pregled ove stranice. Ako imate korisni�ko ime i lozinku, prijavite se u nastavku.";
> $admtext['username'] = "Korisni�ko ime";
> $admtext['password'] = "Lozinka";
> $admtext['login'] = "Prijaviti se";
> $admtext['logout'] = "Odjavite se";
2037c2167
< $admtext['cap_country'] = "Država";  //from cemeteries
---
> $admtext['cap_country'] = "Država";  //from cemeteries
2041,2043c2171,2173
< $admtext['folder'] = "Direktorij";   //from languages
< $admtext['confdeletepers'] = "Da li si siguran da želiš obrisati ovu osobu?";
< $admtext['save'] = "Pohrani";
---
> $admtext['folder'] = "Mapa";   //from languages
> $admtext['confdeletepers'] = "Jeste li sigurni da želite izbrisati ovu osobu? Pojedinac će biti u potpunosti izbrisan s vašeg stabla.";
> $admtext['save'] = "Sa�uvaj";
2045c2175
< $admtext['size'] = "Velièina";
---
> $admtext['size'] = "Veli�ina";
2047,2051c2177,2179
< $admtext['selectfile'] = "Oznaèi datototeku";
< $admtext['altdesc'] = "Alternativni opisi";
< $admtext['altnotes'] = "Alternativni zapisi";
< $admtext['savereturn'] = "Vrati se na ovu stranicu";
< $admtext['saveback'] = "Vrati se na menu";
---
> $admtext['selectfile'] = "Odaberite Datoteka";
> $admtext['altdesc'] = "Alternativni opis";
> $admtext['altnotes'] = "Alternativne napomene";
2053,2062c2181,2188
< $admtext['DIV'] = "Razveden";
< $admtext['search'] = "Naði";  //from findpersonform
< $admtext['searchresults'] = "Naði rezultate";  //from people
< $admtext['clicktoselect'] = "klikni za oznaèiti";
< $admtext['familyid'] = "ID obitelji";  //from families
< $admtext['secondary'] = "Secondary proces";
< $admtext['commas'] = "Odvoji višestruke unose sa zarezime";
< $admtext['onsave'] = "On save";
< $admtext['adminhome'] = "Admin Home";
< $admtext['labelbranches'] = "Oznaèi grane";
---
> $admtext['DIV'] = "Rastavljen";
> $admtext['search'] = "Nađi";  //from findpersonform
> $admtext['searchresults'] = "Rezultati pretraživanja";  //from people
> $admtext['clicktoselect'] = "klikni za odabir";
> $admtext['familyid'] = "ID Obitelji";  //from families
> $admtext['onsave'] = "Na Sa�uvanju";
> $admtext['adminhome'] = "Admin Stranice";
> $admtext['labelbranches'] = "Ozna�i grane";
2064,2076c2190,2202
< $admtext['findperson'] = "Naði osobu...";
< $admtext['findfamily'] = "Naði obitelj...";
< $admtext['repeatlastq'] = "Ponovi posljednje pretraživanje";
< $admtext['alwayson'] = "Uvijek na raspolaganju za gledanje";
< $admtext['all'] = "All";
< $admtext['lnprefix'] = "Prefiks prezimena";
< $admtext['nameorder'] = "Redosljed imena";
< $admtext['western'] = "Ime prvo";
< $admtext['lockid'] = "Zakljuèaj";
< $admtext['linktothese'] = "Poveži sa:";
< $admtext['alsolinkto'] = "Takoðer poveži s:";
< $admtext['linkspersfam'] = "Linkovi (Osoba, Obitelj ili ID izvora)";
< $admtext['findsource'] = "Naði izvor...";
---
> $admtext['findperson'] = "Nađi Osobu...";
> $admtext['findfamily'] = "Nađi Obitelj...";
> $admtext['repeatlastq'] = "Ponovite posljednju pretragu";
> $admtext['alwayson'] = "Uvijek vidljiv";
> $admtext['all'] = "Svi/a";
> $admtext['lnprefix'] = "Prefiks Prezimena";
> $admtext['nameorder'] = "Naredba o imenu";
> $admtext['western'] = "Prvo Ime";
> $admtext['lockid'] = "Zaklju�aj";
> $admtext['linktothese'] = "Poveži na:";
> $admtext['alsolinkto'] = "Također poveži na:";
> $admtext['linkspersfam'] = "Veze (Osoba, Obitelj ili Izvorni ID)";
> $admtext['findsource'] = "Nađi izvor...";
2078,2083c2204,2209
< $admtext['stateprov'] = "Država/Provincija";
< $admtext['zip'] = "Zip/Postal Code";
< $admtext['merge'] = "Merge";
< $admtext['otherinfo'] = "Ostale informacije";
< $admtext['available'] = "Na raspoplaganju";
< $admtext['backuprestore'] = "Utilities";
---
> $admtext['stateprov'] = "Provincija";
> $admtext['zip'] = "Poštanski broj";
> $admtext['merge'] = "Sjediniti";
> $admtext['otherinfo'] = "Ostala informacija";
> $admtext['available'] = "Dostupno";
> $admtext['backuprestore'] = "Usluge";
2086,2092c2212,2218
< $admtext['email'] = "E-mail";
< $admtext['event'] = "Dogaðaj";
< $admtext['eventdate'] = "Datum dogaðaja";
< $admtext['eventplace'] = "Mjesto dogaðaja";
< $admtext['detail'] = "Detaljan";
< $admtext['export'] = "Export";
< $admtext['tlevents'] = "Timeline dogaðaja";
---
> $admtext['email'] = "E-pošta";
> $admtext['event'] = "Događaj";
> $admtext['eventdate'] = "Datum događaja";
> $admtext['eventplace'] = "Mjesto događaja";
> $admtext['detail'] = "Detalj";
> $admtext['export'] = "Izvoz";
> $admtext['tlevents'] = "Vremenska događaja";
2094,2095c2220,2221
< $admtext['duplicate'] = "Promjene nisu pohranjene. Još jedan zapis s istim kljuèem veæ postoji.";
< $admtext['alttitle'] = "Alternativan naslov";
---
> $admtext['duplicate'] = "Promjene nisu spremljene. Još jedan zapis s istim tipkom već postoji.";
> $admtext['alttitle'] = "Alternativni Naslov";
2099c2225
< $admtext['countryaddr'] = "Država";
---
> $admtext['countryaddr'] = "Država";
2101,2103c2227,2229
< $admtext['nobranch'] = "Nema grana";
< $admtext['scrollbranch'] = "(Scroll za vidjeti sve izbore)";
< $admtext['matches'] = "Matches";
---
> $admtext['nobranch'] = "Nema grane";
> $admtext['scrollbranch'] = "(Pomicanje se da biste vidjeli sve izbore)";
> $admtext['matches'] = "Me�";
2106c2232
< $admtext['deathabbr'] = "d.";
---
> $admtext['deathabbr'] = "u.";
2108,2110c2234,2236
< $admtext['nochanges'] = "Promjene nisu napravljene.";
< $admtext['changestoallitems'] = "Promijeni sve iteme";  //were made successfully
< $admtext['find2'] = "Naði";
---
> $admtext['nochanges'] = "Nisu u�injene nikakve promjene.";
> $admtext['changestoallitems'] = "Promjene svih stavki";  //were made successfully
> $admtext['find2'] = "Nađi";
2113,2115c2239,2241
< $admtext['repository'] = "Repository";
< $admtext['more'] = "Još";
< $admtext['repositories'] = "Repositories";
---
> $admtext['repository'] = "Spremište";
> $admtext['more'] = "Još";
> $admtext['repositories'] = "Spremišta";
2118,2148c2244,2272
< $admtext['divdatetr'] = "Datum razvoda (True)";
< $admtext['creategendex'] = "Kreiraj GENDEX";
< $admtext['datamaint'] = "Import/Export";
< $admtext['imagefiletoupload'] = "File to upload";
< $admtext['indfamorsrc'] = "individual(s), families, sources, repositories or places.";
< $admtext['improperpermissions'] = "because the folder does not exist (check the Root Path) or does not have proper permissions (try chmod(777)).";
< $admtext['person'] = "Person";
< $admtext['setup'] = "Setup";
< $admtext['manage'] = "Manage";
< $admtext['reset'] = "Reset";
< $admtext['norecords'] = "No records exist.";
< $admtext['secondarymaint'] = "Secondary Processes";
< $admtext['customeventtypes'] = "Custom Event Types";
< $admtext['findmatches'] = "Find Matches";
< $admtext['matchthese'] = "Match the following fields:";
< $admtext['otheroptions'] = "Other Options:";
< $admtext['ignoreblanks'] = "Ignore Blanks";
< $admtext['nextmatch'] = "Next Match";
< $admtext['nextdup'] = "Next Duplicate";
< $admtext['comprefresh'] = "Compare/Refresh";
< $admtext['mswitch'] = "Switch";
< $admtext['nomatches'] = "No Matches";
< $admtext['combineextras'] = "Combine media";  //changed as well
< $admtext['fasterdisplay'] = "Note: This page is formatted differently to allow for faster display.";
< $admtext['publichome'] = "Public Home";
< $admtext['media'] = "Media";
< $admtext['albums'] = "Albums";
< $admtext['import'] = "Import";
< $admtext['item'] = "Item";
< $admtext['combinenotesonly'] = "Combine notes";
< $admtext['addmedia'] = "Add Media";
---
> $admtext['divdatetr'] = "Datum razvoda (Pravi)";
> $admtext['creategendex'] = "Stvori GENDEX";
> $admtext['datamaint'] = "Uvoz/Izvoz";
> $admtext['imagefiletoupload'] = "Datoteka za prijenos";
> $admtext['indfamorsrc'] = "pojedinac, obitelji, izvori, spremište ili mjesta.";
> $admtext['improperpermissions'] = "jer mapa ne postoji (provjerite Korijen Put) ili nema odgovarajuća dopuštenja (pokušajte chmod (777)).";
> $admtext['person'] = "Osoba";
> $admtext['setup'] = "Instalacija";
> $admtext['manage'] = "Upravljat";
> $admtext['reset'] = "Vrati";
> $admtext['norecords'] = "Ne postoje zapisi.";
> $admtext['findmatches'] = "Pronađi Me�";
> $admtext['matchthese'] = "Me� s sljedećim polja:";
> $admtext['otheroptions'] = "Druge opcije:";
> $admtext['ignoreblanks'] = "Zanemari praznine";
> $admtext['nextmatch'] = "Sljedeći me�";
> $admtext['nextdup'] = "Sljedeći Duplikat";
> $admtext['comprefresh'] = "Usporedite/Osvježi";
> $admtext['mswitch'] = "Prebaci";
> $admtext['nomatches'] = "Nema Me�ova";
> $admtext['combineextras'] = "Kombiniraj medije";  //changed as well
> $admtext['fasterdisplay'] = "NAPOMENA: Ova je stranica druga�ije oblikovana kako bi se omogućio brži prikaz.";
> $admtext['publichome'] = "Javne Stranice";
> $admtext['media'] = "Medija";
> $admtext['albums'] = "Albumi";
> $admtext['import'] = "Uvoz";
> $admtext['item'] = "Stavka";
> $admtext['combinenotesonly'] = "Kombiniraj bilješke";
> $admtext['addmedia'] = "Dodaj Medije";
2151,2153c2275,2277
< $admtext['gedimport'] = "GEDCOM Import";
< $admtext['improper2'] = "because the original file is too large or is not a valid image, or because the folder does not exist (check the Root Path) or does not have proper permissions (try chmod(777)).";
< $admtext['confdeleterecs'] = "Are you sure you want to delete the selected records?";
---
> $admtext['gedimport'] = "GEDCOM Uvoz";
> $admtext['improper2'] = "jer je izvorna datoteka prevelika ili nije valjana slika ili zato što mapa ne postoji (provjerite Root Path) ili nema odgovarajuća dopuštenja (pokušajte chmod (777)).";
> $admtext['confdeleterecs'] = "Jeste li sigurni da želite izbrisati odabrane zapise?";
2155,2226c2279,2348
< $admtext['googleplace'] = "Geocode Location";
< $admtext['notfound'] = " not found. Try another search. Check the Map Search Help for possible reasons the search failed, or try your search using the Full Google Map Search link";
< $admtext['showhidemap'] = "Show/hide clickable map";
< $admtext['getcoords'] = "(to determine latitude, longitude and zoom)";
< $admtext['searchstring'] = "Search for a Place";
< $admtext['zoom'] = "Zoom";
< $admtext['selectplacelevel'] = "Select Place Level";
< $admtext['difficultmap'] = "Full Google Map Search";
< $admtext['maphelp'] = "Map Search Help";
< $admtext['gobutton'] = "Search";
< $admtext['findpersonid'] = "Find Person ID";
< $admtext['findfamilyid'] = "Naði ID obitelji";
< $admtext['findsourceid'] = "Find Source ID";
< $admtext['entersourcepart'] = "Enter part of source title";
< $admtext['findrepoid'] = "Find Repository ID";
< $admtext['enterrepopart'] = "Enter part of repository title";
< $admtext['findplace'] = "Find Place";
< $admtext['enterplacepart'] = "enter part of a place name";
< $admtext['entereventinfo'] = "Molim unesite datum dogaðaja, mjesto dogaðaja ili detalje ovog dogaðaja.";
< $admtext['entereventtype'] = "Molim odaberite tip dogaðaja.";
< $admtext['enternote'] = "Molim unesite tekst zabilješke.";
< $admtext['selectsource'] = "Please select a Source.";
< $admtext['confdeletecite'] = "Are you sure you want to delete this citation?";
< $admtext['spouses'] = "Supruge";
< $admtext['entertreeid'] = "Please enter a tree ID.";
< $admtext['entertreename'] = "Please enter a tree name.";
< $admtext['citations'] = "Citations";
< $admtext['eventtypes'] = "Tip dogaðaja";
< $admtext['associations'] = "Asociacije";
< $admtext['makefolder'] = "Make Folder";
< $admtext['allcurrentdata'] = "All current data";
< $admtext['matchingonly'] = "Matching records only";
< $admtext['donotreplace'] = "Do not replace any data";
< $admtext['useroffset'] = "Start IDs at:";
< $admtext['phone'] = "Phone";
< $admtext['website'] = "Web Site";
< $admtext['thumb'] = "Thumb";  //as in thumbnail
< $admtext['displayorder'] = "Prikaži redosljed";
< $admtext['go'] = "Idi";
< $admtext['help'] = "Pomoæ";
< $admtext['husband'] = "Husband";
< $admtext['wife'] = "Wife";
< $admtext['husbname'] = "Ime supruga";
< $admtext['wifename'] = "Ime suruge";
< $admtext['drag'] = "Drag";
< $admtext['enterinamepart'] = "enter part of first and/or last name";
< $admtext['enterfnamepart'] = "Enter part of father's and/or mother's name";
< $admtext['hide'] = "Hide";
< $admtext['toggle'] = "toggle display";
< $admtext['wsel'] = "With selected:";
< $admtext['msg'] = "Message";
< $admtext['default'] = "Default";
< $admtext['events'] = "Events";
< $admtext['date'] = "Date";
< $admtext['savecont'] = "Save and continue...";
< $admtext['alphanum'] = "Please use only alphanumeric characters in your Tree ID.";
< $admtext['mediatypes'] = "Media Types";
< $admtext['appendall'] = "Append all records";
< $admtext['NPFX'] = "Prefix";
< $admtext['prefix'] = "Prefix";
< $admtext['mostwanted'] = "Most Wanted";
< $admtext['idexists'] = "ne može biti dodano jer ovaj ID veæ postoji. Koristi Back button za povratak na prethodnu stranicu i oznaèi razlièit ID.";
< $admtext['notdeleted'] = "File could not be deleted. Please check file permissions.";
< $admtext['confdeletefile'] = "Are you sure you want to delete this file?";
< //changed in 8.0.0
< $admtext['datenote'] = "<strong>Note:</strong> kada unosiš datume, modlim koristi standardni genealogical format DD MMM GGGG. Na primjer, 10 Apr 2004.";
< $admtext['oriental'] = "Prezime prvo";
< $admtext['langfolder'] = "Folder where language files<br/>will be stored";
< //moved here in 8.0.0
< $admtext['repoid'] = "Repository ID";
< $admtext['whatsnew'] = "What's New";
< $admtext['linkedto'] = "Linked to";
---
> $admtext['googleplace'] = "Geocode Mjesto";
> $admtext['notfound'] = " nije pronađeno. Pokušajte s drugom pretragom. Pogledajte Pomoć za pretraživanje na karti zbog mogućih razloga da pretraživanje nije uspjelo ili pokušajte s pretraživanjem pomoću veze cijela Google pretraživanja karata";
> $admtext['showhidemap'] = "Prikaži / sakrij kartu koju je moguće kliknuti";
> $admtext['getcoords'] = "(za određivanje zemljopisne širine, dužine i zumiranja)";
> $admtext['searchstring'] = "Potražite mjesto";
> $admtext['zoom'] = "Zum";
> $admtext['selectplacelevel'] = "Odaberite Razinu mjesta";
> $admtext['difficultmap'] = "Cijeli Google Map Pretraživanja";
> $admtext['maphelp'] = "Pomoć";
> $admtext['gobutton'] = "Traži";
> $admtext['findpersonid'] = "Nađi ID Osobe";
> $admtext['findfamilyid'] = "Nađi ID Obitelji";
> $admtext['findsourceid'] = "Nađi ID Izvora";
> $admtext['entersourcepart'] = "Unesi dio naslova izvora";
> $admtext['findrepoid'] = "Nađi Spremišta ID";
> $admtext['enterrepopart'] = "Unesi dio naslova spremišta";
> $admtext['findplace'] = "Nađi Mjesto";
> $admtext['enterplacepart'] = "unesi dio naziva mjesta";
> $admtext['entereventinfo'] = "Unesite datum događaja, mjesto događaja ili detalj za ovaj događaj.";
> $admtext['entereventtype'] = "Odaberite vrstu događaja";
> $admtext['enternote'] = "Unesite tekst bilješke.";
> $admtext['selectsource'] = "Odaberite izvor.";
> $admtext['confdeletecite'] = "Jeste li sigurni da želite izbrisati ovaj citat?";
> $admtext['spouses'] = "Supružnici/Partneri";
> $admtext['entertreeid'] = "Unesite ID stabla.";
> $admtext['entertreename'] = "Unesite naziv stabla.";
> $admtext['citations'] = "Citati";
> $admtext['eventtypes'] = "Vrste događaja";
> $admtext['associations'] = "Udruge";
> $admtext['makefolder'] = "Napravite Mapu";
> $admtext['allcurrentdata'] = "Svi trenutni podaci";
> $admtext['matchingonly'] = "Odgovara samo zapisima";
> $admtext['donotreplace'] = "Ne zamjenjujte nikakve podatke";
> $admtext['useroffset'] = "Po�nite ID-ove na:";
> $admtext['phone'] = "Telefon";
> $admtext['website'] = "Web Mjesto";
> $admtext['thumb'] = "Sli�ice";  //as in thumbnail
> $admtext['displayorder'] = "Redoslijed prikaza";
> $admtext['go'] = "Prikaži";
> $admtext['help'] = "Pomoć";
> $admtext['husband'] = "Otac";
> $admtext['wife'] = "Majka";
> $admtext['husbname'] = "O�evo ime";
> $admtext['wifename'] = "Maj�ino ime";
> $admtext['drag'] = "Vući";
> $admtext['enterinamepart'] = "upiši dio imena i/ili prezimena";
> $admtext['enterfnamepart'] = "Unesite dio imena oca i/ili majke";
> $admtext['hide'] = "Sakriti";
> $admtext['toggle'] = "preklopni prikaz";
> $admtext['wsel'] = "S odabranim:";
> $admtext['msg'] = "Poruka";
> $admtext['default'] = "Zadano";
> $admtext['events'] = "Događaji";
> $admtext['date'] = "Datum";
> $admtext['savecont'] = "Sa�uvaj i nastavi...";
> $admtext['alphanum'] = "U vašem ID-ju stabla koristite samo alfanumeri�ke znakove.";
> $admtext['mediatypes'] = "Vrste medija";
> $admtext['appendall'] = "Dodajte sve zapise";
> $admtext['NPFX'] = "Prefiks";
> $admtext['prefix'] = "Prefiks";
> $admtext['mostwanted'] = "Najtraženiji";
> $admtext['idexists'] = "nije moguće dodati jer taj ID već postoji.";
> $admtext['notdeleted'] = "Nije bilo moguće izbrisati datoteku. Provjerite dopuštenja datoteka.";
> $admtext['confdeletefile'] = "Jeste li sigurni da želite izbrisati ovu datoteku?";
> $admtext['datenote'] = "<strong>BILJEŠKA:</strong> Prilikom unosa datuma molimo koristite standardni genealoški format DD MMM GGGG. Na primjer, 10 Apr 2004.";
> $admtext['oriental'] = "Prezime prvo (bez zareza)";
> $admtext['langfolder'] = "Mapa jezika";
> $admtext['repoid'] = "Spremišta ID";
> $admtext['whatsnew'] = "Å to ima novog";
> $admtext['linkedto'] = "Povezan s";
2228,2234c2350,2355
< //added in 8.0.0
< $admtext['show'] = "Preview";
< $admtext['lnfirst'] = "Surname first (with commas)";
< $admtext['savefirst'] = "Save changes first?";
< $admtext['misc'] = "Miscellaneous";
< $admtext['modmgr'] = "Mod Manager";
< $admtext['cannotopendir'] = "Cannot open folder";
---
> $admtext['show'] = "Pokazati";
> $admtext['lnfirst'] = "Prezime prvo (s zarezima)";
> $admtext['savefirst'] = "Sa�uvaj promijene prvo?";
> $admtext['misc'] = "Razni";
> $admtext['modmgr'] = "Mod Menadžer";
> $admtext['cannotopendir'] = "Ne mogu otvoriti mapu";
2236,2265c2357,2384
< //moved here in 9.0.0
< $admtext['cancel'] = "Cancel";
< $admtext['enterpassoc'] = "Molim unesite ID od asocirane osobe.";
< $admtext['enterrela'] = "Molim unesite relationship.";
< $admtext['confdeleteassoc'] = "Da li ste sigurni da želite obrisati ovu asocijaciju?";
< $admtext['preview'] = "Preview";
< $admtext['livingonly'] = "Samo živuæi";
< $admtext['tentdata'] = "Temporary event record";
< $admtext['checking'] = "Checking...Please wait";
< //added in 9.0.0
< $admtext['clickresume'] = "click here to resume";
< $admtext['copylast'] = "Copy Last";
< $admtext['nicbold'] = "Click to Bold";
< $admtext['nicitalic'] = "Click to Italic";
< $admtext['nicunderline'] = "Click to Underline";
< $admtext['niclalign'] = "Left Align";
< $admtext['niccalign'] = "Center Align";
< $admtext['nicralign'] = "Right Align";
< $admtext['nicjalign'] = "Justify Align";
< $admtext['nicinsol'] = "Insert Ordered List";
< $admtext['nicinsul'] = "Insert Unordered List";
< $admtext['nicsub'] = "Click to Subscript";
< $admtext['nicsup'] = "Click to Superscript";
< $admtext['nicstrike'] = "Click to Strike Through";
< $admtext['nicremfmt'] = "Remove Formatting";
< $admtext['nicindent'] = "Indent Text";
< $admtext['nicremind'] = "Remove Indent";
< $admtext['nichr'] = "Horizontal Rule";
< $admtext['nicfontsz'] = "Font&nbsp;Size";
< $admtext['nicfontfam'] = "Font&nbsp;Family";
---
> $admtext['cancel'] = "Odustani";
> $admtext['enterpassoc'] = "Unesite ID pridružene osobe.";
> $admtext['enterrela'] = "Unesite vezu.";
> $admtext['confdeleteassoc'] = "Jeste li sigurni da želite izbrisati ovu vezu?";
> $admtext['preview'] = "Pregled";
> $admtext['livingonly'] = "Samo živi";
> $admtext['tentdata'] = "Privremeni zapis događaja za";
> $admtext['checking'] = "Provjera ... molim pri�ekajte";
> $admtext['clickresume'] = "kliknite ovdje za nastavak";
> $admtext['copylast'] = "Kopiraj zadnje";
> $admtext['nicbold'] = "Kliknite za podebljano";
> $admtext['nicitalic'] = "Kliknite za kurziv";
> $admtext['nicunderline'] = "Kliknite za podcrtavanje";
> $admtext['niclalign'] = "Lijevo poravnajte";
> $admtext['niccalign'] = "Centar poravnajte";
> $admtext['nicralign'] = "Desno poravnajte";
> $admtext['nicjalign'] = "Opravdati poravnajte";
> $admtext['nicinsol'] = "Umetni naru�eni popis";
> $admtext['nicinsul'] = "Umetni popis bez narudžbe";
> $admtext['nicsub'] = "Umetni za indeks";
> $admtext['nicsup'] = "Umetni za eksponent";
> $admtext['nicstrike'] = "Kliknite za Strike Through";
> $admtext['nicremfmt'] = "Ukloni oblikovanje";
> $admtext['nicindent'] = "Tekst uvla�enja";
> $admtext['nicremind'] = "Uklonite uvla�enje";
> $admtext['nichr'] = "Vodoravno pravilo";
> $admtext['nicfontsz'] = "Font&nbsp;Veli�ina";
> $admtext['nicfontfam'] = "Font&nbsp;Obitelj";
2267,2285c2386,2400
< $admtext['niclink'] = "Add Link";
< $admtext['nicremlink'] = "Remove Link";
< $admtext['nictxtcol'] = "Change Text Color";
< $admtext['nicbkgcol'] = "Change Background Color";
< $admtext['nicimage'] = "Add Image";
< $admtext['change'] = "Change";
< $admtext['editwarn'] = "Your lock on this record is about to expire. Save your changes now to prevent them from being overwritten by another user.";
< $admtext['editconflict'] = "Another user is already editing this record. Please try again later.";
< $admtext['retry'] = "Try again";
< $admtext['notsaved'] = "Changes were not saved. Another user has locked the record.";
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
< $admtext['disabled'] = "Disabled";
< $admtext['cremated'] = "Cremated";
< //added in 10.0.0
< $admtext['videos'] = "Videos";
< $admtext['recordings'] = "Recordings";
< $admtext['saveexit'] = "Save and Exit";
---
> $admtext['niclink'] = "Dodaj Vezu";
> $admtext['nicremlink'] = "Ukloni vezu";
> $admtext['nictxtcol'] = "Promjena boje teksta";
> $admtext['nicbkgcol'] = "Promjena boje pozadine";
> $admtext['nicimage'] = "Dodaj Sliku";
> $admtext['change'] = "Promjeni";
> $admtext['editwarn'] = "Zaklju�avanje ovog zapisa uskoro će isteći. Spremite svoje promjene sada da ih drugi korisnik ne bi mogao prebrisati.";
> $admtext['editconflict'] = "Drugi korisnik već uređuje ovaj zapis. Molimo pokušajte ponovo kasnije.";
> $admtext['retry'] = "Pokušajte ponovo";
> $admtext['notsaved'] = "Promjene nisu sa�uvane. Drugi je korisnik zaklju�ao zapis.";
> $admtext['disabled'] = "Onemogućeno";
> $admtext['cremated'] = "Kremiran";
> $admtext['videos'] = "Video";
> $admtext['recordings'] = "Snimanja";
> $admtext['saveexit'] = "Sa�uvaj i Izlazi";
2288,2292c2403,2407
< $admtext['role'] = "Role";
< $admtext['commas'] = "Odvoji višestruke unose sa zarezime";
< $admtext['confdellink'] = "Are you sure you want to delete this link?";
< $admtext['existlinks'] = "Existing Links";
< $admtext['report'] = "Report";
---
> $admtext['role'] = "Uloga";
> $admtext['commas'] = "Odvoji višestruke unose sa zarezime";
> $admtext['confdellink'] = "Jeste li sigurni da želite izbrisati ovu vezu?";
> $admtext['existlinks'] = "Postojeće Linkovi";
> $admtext['report'] = "Izvještaj";
2294,2299c2409,2414
< $admtext['sortby'] = "Sort by";
< $admtext['unlink'] = "Unlink";
< $admtext['privateonly'] = "Private only";
< $admtext['dna_links'] = "DNA Links";
< $admtext['dataval'] = "Data Validation";
< $admtext['norels'] = "Turn off relationship messages";
---
> $admtext['sortby'] = "Poredaj po";
> $admtext['unlink'] = "Poništiti vezu";
> $admtext['privateonly'] = "Samo privatno";
> $admtext['dna_links'] = "DNA veze";
> $admtext['dataval'] = "Provjera valjanosti podataka";
> $admtext['norels'] = "Isklju�ite poruke odnosa";
2301,2302c2416,2417
< $admtext['templates'] = "Templates";
< $admtext['findciteid'] = "Find Citation ID";
---
> $admtext['templates'] = "Predlošci";
> $admtext['findciteid'] = "Pronađi ID citiranja";
2304,2305c2419,2425
< $admtext['citation'] = "Citation";
< $admtext['text_and'] = "AND";
---
> $admtext['citation'] = "Citat";
> $admtext['text_and'] = "I";
> //added in 12.2
> $admtext['surnames'] = "Prezimena";
> $admtext['subhead'] = "Podnaslov";
> $admtext['image'] = "Slika";
> $admtext['author'] = "Autor";
2308c2428,2462
< $admtext['living'] = "Živuæi";
---
> $admtext['living'] = "Živući";
> 
> //moved here in 13.0.0
> $admtext['getstart'] = "Pomoć - Po�etak";
> $admtext['showlog'] = "Promjene zapisnik";
> $admtext['nobirthinfo'] = "Nema informacija o rođenju";
> //changed in 13.0
> $admtext['savereturn'] = "Sa�uvaj + Ostani";
> $admtext['saveback'] = "Sa�uvaj + Izlazi";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Sve su stavke uspješno izbrisane.";
> $admtext['private'] = "Privatno";
> $admtext['imgtags'] = "Oznake slika";
> 
> $admtext['removelink'] = "Ukloni vezu";
> $admtext['eloptions'] = "Pregledajte ili Izbrišite";
> $admtext['pleaseenter'] = "Molim unesi ";
> 
> $admtext['nolinks'] = "Još nema veza";
> $admtext['nogeocode'] = "Nije moguće gekodirati";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Odaberite <br/> zadani <br/> fotografiju"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Događaj / Atribut Vrste";
> $admtext['secondary'] = "Nakon-uvoza uslužnog programa";
> $admtext['otherevents'] = "Ostali događaji / Atribut";
> //added in 14.0
> $admtext['newlinks'] = "Veze stvorene";
> $admtext['newcemlinks'] = "Veze za groblje stvorene";
> $admtext['utility'] = "Uslužnog program";
> $admtext['linktype'] = "Vrsta";
> $admtext['move'] = "Makni";
> $admtext['copy'] = "Kopirati";
> $admtext['title2'] = "Naslov"; //for media, sources, etc (not people)
2310,2311c2464,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Croatian/alltext.php TNG1403/languages/Croatian/alltext.php
4,10c4,10
< $dates['JAN'] = "Jan";
< $dates['JANUARY'] = "Sijeèanj";
< $dates['FEB'] = "Feb";
< $dates['FEBRUARY'] = "Veljaèa";
< $dates['MAR'] = "Mar";
< $dates['MARCH'] = "Ožujak";
< $dates['APR'] = "Apr";
---
> $dates['JAN'] = "Sije�";
> $dates['JANUARY'] = "Sije�anj";
> $dates['FEB'] = "Velj";
> $dates['FEBRUARY'] = "Velja�a";
> $dates['MAR'] = "Ožuj";
> $dates['MARCH'] = "Ožujak";
> $dates['APR'] = "Trav";
12,13c12,13
< $dates['MAY'] = "May";
< $dates['JUN'] = "Jun";
---
> $dates['MAY'] = "Svibanj";
> $dates['JUN'] = "Lip";
15c15
< $dates['JUL'] = "Jul";
---
> $dates['JUL'] = "Srp";
17c17
< $dates['AUG'] = "Aug";
---
> $dates['AUG'] = "Kol";
19c19
< $dates['SEP'] = "Sep";
---
> $dates['SEP'] = "Ruj";
21c21
< $dates['OCT'] = "Oct";
---
> $dates['OCT'] = "List";
23c23
< $dates['NOV'] = "Nov";
---
> $dates['NOV'] = "Stud";
25c25
< $dates['DEC'] = "Dec";
---
> $dates['DEC'] = "Pros";
27,29c27,29
< $dates['ABT'] = "Abt";
< $dates['ABOUT'] = "About";
< $dates['BEF'] = "Pri";
---
> $dates['ABT'] = "Oko";
> $dates['ABOUT'] = "Oko";
> $dates['BEF'] = "Pr";
31,34c31,34
< $dates['AFT'] = "Nak";
< $dates['AFTER'] = "Nakon";
< $dates['BET'] = "Izmaðu";
< $dates['BETWEEN'] = "Izmeðu";
---
> $dates['AFT'] = "Pos";
> $dates['AFTER'] = "Poslje";
> $dates['BET'] = "Između";
> $dates['BETWEEN'] = "Između";
38c38
< $dates['Y'] = "Da, datum je nepoznat";
---
> $dates['Y'] = "Da, datum nedostaje";
43,44c43,44
< $text['cannotexecutequery'] = "Ne mogu pokrenuti query";
< $text['to'] = "za";
---
> $text['cannotexecutequery'] = "Ne može da se izvrši SQL upit";
> $text['to'] = "do";
46,47c46,47
< $text['text_next'] = "Naredni";
< $text['text_prev'] = "Prethodni";
---
> $text['text_next'] = "Sljedeće";
> $text['text_prev'] = "Prijašnj";
49,59c49,59
< $text['clickhide'] = "Klikni za sakriti";
< $text['forgot1'] = "<strong>Zaboravio si svoje korisnièko ime ili zaporku?</strong><br />Unesi svoju e-mail adresu dolje pa æe vam korisnièko ime biti poslato.";
< $text['forgot2'] = "Unesi svoju e-mail adresu gore i svoje korisnièko ime dolje da bi se vaša zaporka resetirala (privremena zaporka ce vam biti poslata).";
< $text['newpass'] = "Vaša privremena zaporka";
< $text['usersent'] = "Vaše korisnièko ime je poslato na vašu e-mail adresu.";
< $text['pwdsent'] = "Vaša nova privremena zaporka je poslana na vašu e-mail adresu.";
< $text['loginnotsent2'] = "E-mail adresa koju ste unijeli nije naðena. Informacija nije poslata.";
< $text['loginnotsent3'] = "E-mail adresa i korisnièko ime koje ste unijeli ne odgovara niti jednom korisnièkom raèunu u našoj evidenciji. Informacija nije poslana.";
< $text['logininfo'] = "Vaša login informacija";
< $text['collapseall'] = "Zatvori sve";
< $text['expandall'] = "Ekspandiraj sve";
---
> $text['clickhide'] = "Klikni da sakriješ";
> $text['forgot1'] = "<strong>Zaboravili ste svoje korisni�ko ime ili lozinku? </strong><br /> Unesite svoju e-poštu adresu u nastavku kako bismo vam poslali svoje korisni�ko ime.";
> $text['forgot2'] = "Upišite svoj e-poštu adresu iznad i vaše korisni�ko ime ispod za poništavanje zaporke (privremena lozinka bit će vam poslana).";
> $text['newpass'] = "Vaša nova privremena lozinka";
> $text['usersent'] = "Vaše je korisni�ko ime poslano na vašu e-poštu adresu.";
> $text['pwdsent'] = "Vaša nova privremena lozinka poslana je na vašu e-poštu adresu.";
> $text['loginnotsent2'] = "Adresa e-pošte koju ste naveli ne odgovara nijednom korisni�kom ra�unu koji je trenutno zabilježen. Nisu poslane informacije.";
> $text['loginnotsent3'] = "Adresa e-pošte i korisni�ko ime koje ste naveli ne odgovaraju nijednom korisni�kom ra�unu koji je trenutno zabilježen. Nisu poslane informacije.";
> $text['logininfo'] = "Vaši podaci za prijavu";
> $text['collapseall'] = "Sažmi sve";
> $text['expandall'] = "Proširi sve";
64,67c64,67
< $text['headstones'] = "Nadgrobni spomenici";
< $text['histories'] = "Povijest";
< $text['recordings'] = "Zapisi";
< $text['videos'] = "Video";
---
> $text['headstones'] = "Spomenici";
> $text['histories'] = "Povijesti";
> $text['recordings'] = "Audio snimci";
> $text['videos'] = "Video snimci";
71,86c71,86
< $admtext['level1'] = "Addresa";
< $admtext['level2'] = "Locatija";
< $admtext['level3'] = "Mjesto/Grad";
< $admtext['level4'] = "Županija";
< $admtext['level5'] = "Republika/Provincija";
< $admtext['level6'] = "Država";
< $admtext['level0'] = "Ne Dodijeljeno";
< 
< $text['male'] = "Muškarac";
< $text['female'] = "Žena";
< $text['closewindow'] = "Zatvori ovaj prozor";
< $text['loading'] = "Uèitavam...";
< 
< $text['cancel'] = "Otkažite";
< $text['none'] = "Nema";
< $text['mainton'] = "Modus Za Održavanje je UPALJEN";
---
> $admtext['level1'] = "Adresa";
> $admtext['level2'] = "Lokacija";
> $admtext['level3'] = "Grad";
> $admtext['level4'] = "Županija";
> $admtext['level5'] = "Provincija";
> $admtext['level6'] = "Država";
> $admtext['level0'] = "Nije dodijeljeno";
> 
> $text['male'] = "Muškarac";
> $text['female'] = "Ženska";
> $text['closewindow'] = "Zatvori prozor";
> $text['loading'] = "U�itavanje...";
> 
> $text['cancel'] = "Odustani";
> $text['none'] = "Nijedan";
> $text['mainton'] = "Modus za održavanje je uklju�en";
88,89c88
< //moved here in 8.0.0
< $text['living'] = "Živuæa";
---
> $text['living'] = "Živi";
91,94c90,93
< $admtext['confunlink'] = "Dali ste sigurni da želite raskinuti vezu ove osobe kao suprugu u ovoj familiji?";
< $admtext['confunlinkc'] = "Dali ste sigurni da želite raskinuti vezu ove osobe kao dijete u ovoj familiji? ";
< $admtext['confremchild'] = "Dali ste sigurni da želite izvaditi ovo dijete iz ove familije?  Osoba neæe se izbrisati iz base podataka.";
< $admtext['enterfamilyid'] = "Molim unesite ID obitelji.";
---
> $admtext['confunlink'] = "Jeste li sigurni da želite razdvojiti vezu ove osobe kao supružnika u ovoj obitelji?";
> $admtext['confunlinkc'] = "Jeste li sigurni da želite razdvojiti vezu ove osobe kao dijete u ovoj obitelji?";
> $admtext['confremchild'] = "Jeste li sigurni da želite ukloniti ovo dijete iz ove obitelji? Pojedinac neće biti izbrisan iz baze podataka.";
> $admtext['enterfamilyid'] = "Upišite ID porodice.";
97c96
< $admtext['BIRT'] = "Roðenje";
---
> $admtext['BIRT'] = "Rođenje";
99,102c98,101
< $admtext['CHR'] = "Krštenje";
< $admtext['BURI'] = "Ukop";
< $admtext['BAPL'] = "Krštenje (LDS)";
< $admtext['ENDL'] = "Endowment (LDS)";
---
> $admtext['CHR'] = "Krštenje";
> $admtext['BURI'] = "Pokop";
> $admtext['BAPL'] = "Krštenje (LDS)";
> $admtext['ENDL'] = "Zadužbina (LDS)";
104c103
< $admtext['TITL'] = "Titula";
---
> $admtext['TITL'] = "Naslov";
107,130c106,123
< $admtext['SLGC'] = "Zapeèaæeno na Roditelje (LDS)";
< $admtext['MARR'] = "Oženjen/Udata";
< $admtext['SLGS'] = "Zapeèaæeno na Suprugu (LDS)";
< $admtext['hello'] = "Dobar Dan";
< $admtext['activated'] = "Vaš genealoški raèun je aktiviran.";
< $admtext['infois'] = "Vaša prijavna informacija je";
< $admtext['subjectline'] = "Vaš genealoški raèun je aktiviran.";
< 
< //moved here in 8.1.0
< $admtext['adopted'] = "usvojen";
< $admtext['birth'] = "roðenje";
< $admtext['foster'] = "usvojitelji";
< $admtext['sealing'] = "sealing";
< //added in 11.0.3
< $admtext['putative'] = "pretpostavljeni";
< 
< //added in 9.0.0
< $text['editprofile'] = "Edit Profile";
< 
< //moved here in 9.0.0
< $text['letter'] = "Letter"; //as in page size
< $text['legal'] = "Legal"; //as in page size
< $text['sunday'] = "Nedelja";  //first day of week on calendar
< $text['monday'] = "Ponedjeljak";
---
> $admtext['SLGC'] = "Pe�atiran po Roditelju (LDS)";
> $admtext['MARR'] = "Vjen�ani";
> $admtext['SLGS'] = "Pe�atiran po Supružniku (LDS)";
> $admtext['hello'] = "Pozdrav";
> $admtext['activated'] = "Vaš genealoški korisni�ki ra�un je aktiviran";
> $admtext['infois'] = "Vaše informacije za prijavljivanje su";
> $admtext['subjectline'] = "Vaš genealoški korisni�ki ra�un je aktiviran.";
> $admtext['adopted'] = "Usvojen";
> $admtext['birth'] = "Rođen";
> $admtext['foster'] = "Usvojitelj";
> $admtext['sealing'] = "Pe�aćenje";
> $admtext['putative'] = "Navodni";
> 
> $text['editprofile'] = "Uredi Profil";
> $text['letter'] = "Formati papira za Pismo"; //as in page size
> $text['legal'] = "Formati papira Legalan"; //as in page size
> $text['sunday'] = "Nedjelja";  //first day of week on calendar
> $text['monday'] = "Ponedeljak";
133,137c126,130
< $text['thursday'] = "Èetvrtak";
< $text['friday'] = "Friday";
< $text['saturday'] = "Saturday";
< $text['contains'] = "sadrži";
< $text['startswith'] = "poèinje sa";
---
> $text['thursday'] = "ÄŒetvrtak";
> $text['friday'] = "Petak";
> $text['saturday'] = "Subota";
> $text['contains'] = "sadrži";
> $text['startswith'] = "poćinje sa";
139d131
< //moved here in 9.0.4
141,144c133,134
< 
< //moved here in 10.0.0
< $text['startingind'] = "Poèetna osoba";
< $text['enteremail'] = "Molim unesite valjanu e-mail adresu.";
---
> $text['startingind'] = "Pokretan osoba";
> $text['enteremail'] = "Unesite valjanu adresu e-pošte";
146c136
< $text['go'] = "Idi";
---
> $text['go'] = "Prikaži";
148,198c138,180
< 
< //added in 10.0.0
< $admtext['CONL'] = "Confirmation";
< $admtext['INIT'] = "Initiatory (LDS)";
< $admtext['step'] = "Stepchild";
< $text['switchm'] = "Switch to mobile site";
< $text['switchs'] = "Switch to standard site";
< 
< //added in 11.0.0
< $text['dna_tests'] = "DNA Tests";
< $admtext['preflang'] = "Preferred language";
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
< $text['query'] = "Query";
< $text['fanchart'] = "Fan Chart";
< 
< //moved here in 12.0.0
< $admtext['menu'] = "Menu";
< $admtext['dna_groups'] = "DNA Groups";
< $admtext['allbranches'] = "All Branches";
< $admtext['active'] = "Active";
< $admtext['select'] = "Select";
< $admtext['selectall'] = "Select All";
< $admtext['clearall'] = "Clear All";
< $admtext['medialinks'] = "Media Links";
< 
< //added here in 12.0.0
< $text['testgroup'] = "Test Group";
< $text['test_number'] = "Test Number/Name";
< $text['test_info_display'] = "Test Information To Display";
< $text['confirmed'] = "Confirmed";
< $text['predicted'] = "Predicted";
< $admtext['ancestral_surnames'] = "Ancestral surnames";
< $admtext['admin_notes'] = "Administrator notes";
< $admtext['mda'] = "Most distant ancestor";
< $admtext['mrca'] = "Most recent common ancestor";
< $admtext['marker_values'] = "Marker values";
< $admtext['ref_seq'] = "Reference sequence";
< $admtext['rsrs'] = "RSRS (Reconstructed Sapiens Reference Sequence)";
< $admtext['rcrs'] = "rCRS (revised Cambridge Reference Sequence)";
< $admtext['hvr_values'] = "HVR Differences";
< $admtext['hvr1_values'] = "HVR1 Differences";
< $admtext['hvr2_values'] = "HVR2 Differences";
< $admtext['coding_reg'] = "Coding region differences";
< $text['keep_name_private'] = "Keep Name Private";
< $text['test_results'] = "Test Results";
< $admtext['dna_tests'] = "DNA Tests";
< $admtext['vendor'] = "Vendor";
< $admtext['markers'] = "Number of STR markers tested";
< $admtext['haplo'] = "Haplogroup";
< $admtext['termsnp'] = "Terminal SNP";
< $admtext['signsnp'] = "Significant SNPs";
---
> $admtext['CONL'] = "Potvrda (LDS)";
> $admtext['INIT'] = "Inicijativa (LDS)";
> $admtext['step'] = "Pastor�e";
> $text['switchm'] = "Prebacite se na mobilno web mjesto";
> $text['switchs'] = "Prebacite se na standardno web mjesto";
> $text['dna_tests'] = "DNA Testovi";
> $admtext['preflang'] = "Preferirani jezik";
> $text['query'] = "Pitanje";
> $text['fanchart'] = "Fan Grafikon";
> 
> $admtext['menu'] = "Izbornik";
> $admtext['dna_groups'] = "DNA Grupe";
> $admtext['allbranches'] = "Sve Grane";
> $admtext['active'] = "Aktivan";
> $admtext['select'] = "Izaberite";
> $admtext['selectall'] = "Izaberi Sve";
> $admtext['clearall'] = "O�isti sve";
> $admtext['medialinks'] = "Medija linkovi";
> 
> $text['testgroup'] = "Test Grupa";
> $text['test_info_display'] = "Informacije o ispitivanju za prikaz";
> $text['confirmed'] = "Potvrđeno";
> $text['predicted'] = "Predviđeno";
> $admtext['ancestral_surnames'] = "Rodna prezimena";
> $admtext['admin_notes'] = "Bilješke administratora";
> $admtext['mda'] = "Najudaljeniji predak";
> $admtext['mrca'] = "Najnoviji uobi�ajeni predak";
> $admtext['marker_values'] = "Vrednosti markera";
> $admtext['ref_seq'] = "Referentni niz";
> $admtext['rsrs'] = "RSRS (Rekonstruirana Sapiens Referentna Sekvenca)";
> $admtext['rcrs'] = "rCRS (revidirana Cambridge Referenca Sekvenca)";
> $admtext['hvr_values'] = "HVR Razlike";
> $admtext['hvr1_values'] = "HVR1 Razlike";
> $admtext['hvr2_values'] = "HVR2 Razlike";
> $admtext['coding_reg'] = "Razlike u podru�ju kodiranja";
> $text['keep_name_private'] = "Zadrži Ime Privatno";
> $text['test_results'] = "Testa Rezultat";
> $admtext['dna_tests'] = "DNA Testovi";
> $admtext['vendor'] = "Prodava�";
> $admtext['markers'] = "Broj od STR Markera";
> $admtext['haplo'] = "Haplogrupa";
> $admtext['termsnp'] = "SNP Terminal";
> $admtext['signsnp'] = "Zna�ajan SNPs";
201c183
< $admtext['mtdna_test'] = "mtDNA (Mitochondrial)";
---
> $admtext['mtdna_test'] = "mtDNA (Mitohondrial)";
202a185,252
> $admtext['xtra_mut'] = "Ekstra mutacije";
> $text['test_number'] = "Broj/Ime";
> $admtext['match_date'] = "Datum podudaranja";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroupa";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroupa";
> $admtext['relationship_section'] = "Povezanost Sekcija";
> $admtext['relationship_range'] = "Povezanost Daljina";
> $admtext['suggested_relationship'] = "Predloženo";
> $admtext['actual_relationship'] = "Stvarni Povezanost";
> $admtext['related_side'] = "Povezane Grane";
> $admtext['shared_dna'] = "Dijeljen DNA";
> $admtext['shared centimorgans'] = "Ukupno dijeljenih cMs";
> $admtext['shared_segments'] = "Dijeljeni Segmenti";
> $admtext['largest_segment'] = "Najveći Segment";
> $admtext['chromosome'] = "Kromosom br.";
> $admtext['segment_start'] = "Po�etak Segmenta";
> $admtext['segment_end'] = "Kraj Segmenta";
> $admtext['centiMorgans'] = "centi-Morgans (genetska udaljenost)";
> $admtext['matchingSNPs'] = "Odgovarajući SNPs";
> $admtext['xmatch'] = "X-Me�";
> $text['keep_test_private'] = "Privatni test";
> $text['shared_dna'] = "Dijeljeni DNA segment";
> $text['for_match'] = "za ovo poklapanje";
> $admtext['keeptest'] = "Test Privatnosti";
> $admtext['keepname'] = "Imena Privatnosti";
> $admtext['allgroups'] = "Sve Grupe";
> $admtext['alltypes'] = "Svi Tipovi";
> $admtext['generation_num'] = "Generacije za rodno prezime";
> 
> $text['birthabbr'] = "r.";
> $text['chrabbr'] = "k.";
> $text['deathabbr'] = "u.";  //from descend
> $text['burialabbr'] = "p.";  //from descend
> $text['marrabbr'] = "v.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Pronađite sve pojedince s događajima na ovoj lokaciji";
> $text['firstpage'] = "Prva stranica";
> $text['lastpage'] = "Zadnja stranica";
> 
> //changed in 13.0.0
> $text['problem'] = "Došlo je do pogreške u TNG softveru. Što u�initi: <p>Ako ste upravo instalirali nadogradnju, možda ste presko�ili dio upute za instalaciju. Vratite se na stranicu za �itanje nadogradnje i pro�itajte upute. Obratite posebnu pozornost na korak strukture baze podataka.</p> <p> Ako ste prvi put instalirali TNG, možda će vam trebati da napravite tablice baza podataka. Vratite se na stranicu readme.html kako biste pronašli taj korak.</p><p>Ako ste vlasnik web mjesta, možete se obratiti službi za podršku tvrtke TNG radi daljnje pomoći u vezi s tim problemom. Kopirajte upit u nastavku i zalijepite ga u svoju poruku.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Nema grane";
> 
> //added in 14.0
> $text['oneyear'] = "godina";
> $text['pwdcodelink'] = "Kliknite ovu poveznicu da vam se pošalje privremena lozinka";
> $text['pwdcodesent'] = "Veza za ponovno postavljanje lozinke poslana je na vašu e-poštu adresu.";
> $text['moved'] = "Pomaknuto";
> $text['citation'] = "Citat";
> $text['other'] = "Ostalo";
> $text['death'] = "Smrt";
> $text['burial'] = "Pokop";
> $text['cremation'] = "Kremiranje";
> $text['marriage'] = "Brak";
> $text['divorce'] = "Razvod";
> $text['bylength'] = "Razvoj";
> $text['bymarriages'] = "Brakovi";
> $text['none'] = "Nijedan";
> 
> //moved here in 14.0
> $text['family'] = "Obitelj";
> $text['source'] = "Izvor";
> $text['repository'] = "Sigurno Spremište";
> $text['place'] = "Mjesto";
> $admtext['BAPM'] = "Krštenje";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Extra mutations";
---
> $text['glang'] = "h4";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Croatian: data_protection_policy.php
diff -r TNG/languages/Croatian/text.php TNG1403/languages/Croatian/text.php
5c5
< 		$text['browseallsources'] = "Pretraži sve izvore";
---
> 		$text['browseallsources'] = "Pregledajte sve izvore";
9c9
< 		$text['publisher'] = "Izdavaè";
---
> 		$text['publisher'] = "Izdava�";
11,14c11,14
< 		$text['sourceid'] = "Source ID";
< 		$text['moresrc'] = "Još izvora";
< 		$text['repoid'] = "Repository ID";
< 		$text['browseallrepos'] = "Pretraži sve Repositories";
---
> 		$text['sourceid'] = "Izvor ID";
> 		$text['moresrc'] = "Drugi izvori";
> 		$text['repoid'] = "ID spremišta";
> 		$text['browseallrepos'] = "Pregledajte sve spremišta";
20,23c20,23
< 		$text['changelanguage'] = "Promijeni jezik";
< 		$text['languagesaved'] = "Jezik pohranjen";
< 		$text['sitemaint'] = "Site maintenance in progress";
< 		$text['standby'] = "The site is temporarily unavailable while we update our database. Please try again in a few minutes. If the site remains down for an extended period of time, please <a href=\"suggest.php\">contact the site owner</a>.";
---
> 		$text['changelanguage'] = "Promjeni jezika";
> 		$text['languagesaved'] = "Jezik sa�uvan";
> 		$text['sitemaint'] = "U tijeku je održavanje web mjesta";
> 		$text['standby'] = "Stranica je privremeno nedostupna dok ažuriramo našu bazu podataka. Molim pokušajte ponovo za par minuta. Ako web lokacija ostaje duže vreme, <a href=\"suggest.php\">kontaktirajte vlasnika s web mjesta</a>.";
28,29c28,29
< 		$text['gedstart'] = "GEDCOM poèinje od";
< 		$text['producegedfrom'] = "Proizvedi GEDCOM datoteku od";
---
> 		$text['gedstart'] = "GEDCOM po�inje od";
> 		$text['producegedfrom'] = "Izradite GEDCOM datoteku iz";
31,41c31,41
< 		$text['includelds'] = "Ukljuèi LDS informaciju";
< 		$text['buildged'] = "Build GEDCOM";
< 		$text['gedstartfrom'] = "GEDCOM poèetna forma";
< 		$text['nomaxgen'] = "Morate naznaèiti maksimalni broj generacija. Molim koristite tipku Natrag za povratak na prethodnu stranicu i ispravite pogrešku";
< 		$text['gedcreatedfrom'] = "GEDCOM kreirana forma";
< 		$text['gedcreatedfor'] = "kreirano za";
< 		$text['creategedfor'] = "Kreiraj GEDCOM";
< 		$text['email'] = "E-mail adresa";
< 		$text['suggestchange'] = "Predloži promjenu";
< 		$text['yourname'] = "Vaše ime";
< 		$text['comments'] = "Komentar";
---
> 		$text['includelds'] = "Uklju�ite podatke o LDS-u";
> 		$text['buildged'] = "Napravi GEDCOM";
> 		$text['gedstartfrom'] = "GEDCOM po�ima od";
> 		$text['nomaxgen'] = "Morate da odredite maksimalni broj generacija. Upotrijebite gumb Natrag za povratak na prethodnu stranicu i ispravljanje pogreške";
> 		$text['gedcreatedfrom'] = "GEDCOM napravljen od";
> 		$text['gedcreatedfor'] = "napravljen za";
> 		$text['creategedfor'] = "Stvori GEDCOM";
> 		$text['email'] = "Vaša e-pošte adresa";
> 		$text['suggestchange'] = "Predložite promjenu";
> 		$text['yourname'] = "Vaše ime i prezime";
> 		$text['comments'] = "Opis <br /> predloženih promjena";
43,50c43,50
< 		$text['submitsugg'] = "Pošalji prijedlog";
< 		$text['proposed'] = "Predložena promjena";
< 		$text['mailsent'] = "Hvala. Vaša je poruka isporuèena.";
< 		$text['mailnotsent'] = "Žao nam je, ali vaša poruka ne može biti isporuèena. Molim kontaktirajte me direktno na mbralic@gmail.com.";
< 		$text['mailme'] = "Pošalji kopiju od ove adrese";
< 		$text['entername'] = "Molim unesite vaše ime";
< 		$text['entercomments'] = "Molim unesite vaš komentar";
< 		$text['sendmsg'] = "Pošalji poruku";
---
> 		$text['submitsugg'] = "Pošaljite prijedlog";
> 		$text['proposed'] = "Predložena promjena";
> 		$text['mailsent'] = "Hvala vam. Vaša poruka je poslana.";
> 		$text['mailnotsent'] = "Žao nam je, ali vašu poruku nismo mogli dostaviti. Molimo kontaktirajte xxx izravno na yyy.";
> 		$text['mailme'] = "Pošalji kopiju na ovu adresu";
> 		$text['entername'] = "Molin unesite svoje ime";
> 		$text['entercomments'] = "Unesite svoje komentare";
> 		$text['sendmsg'] = "Pošalji Poruku";
52c52
< 		$text['subject'] = "Subject";
---
> 		$text['subject'] = "Predmet";
57,60c57,60
< 		$text['photoshistoriesfor'] = "Fotografije i povijest ";
< 		$text['indinfofor'] = "Osobna informacija za";
< 		$text['pp'] = "pp."; //page abbreviation
< 		$text['age'] = "starost";
---
> 		$text['photoshistoriesfor'] = "Fotografije i historija za";
> 		$text['indinfofor'] = "Informacije osobe za";
> 		$text['pp'] = "str."; //page abbreviation
> 		$text['age'] = "Starost:";
63c63
< 		$text['suggested'] = "Predloženo";
---
> 		$text['suggested'] = "Predloženo";
65,70c65,69
< 		$text['thanks'] = "Hvala";
< 		$text['received'] = "Vaša sugestija je prosljeðena administratoru web site-a na uvid.";
< 		$text['indreport'] = "Individual Report";
< 		$text['indreportfor'] = "Individual Report for";
< 		$text['general'] = "General";
< 		$text['bkmkvis'] = "<strong>Note:</strong> These bookmarks are only visible on this computer and in this browser.";
---
> 		$text['thanks'] = "Hvala vam";
> 		$text['received'] = "Vaša sugestija je prosleđena administratoru na pregled.";
> 		$text['indreport'] = "Izvješće o osobi";
> 		$text['indreportfor'] = "Osobe izvješće za";
> 		$text['bkmkvis'] = "<strong>NAPOMENA:</strong> Te su oznake vidljive samo na ovom ra�unalu i u ovom pregledniku.";
72,73c71,72
< 		$text['reviewmsg'] = "You have a suggested change that needs your review. This submission concerns:";
<         $text['revsubject'] = "Suggested change needs your review";
---
> 		$text['reviewmsg'] = "Imate preporu�enu promjenu koja vam treba recenziju. Ovaj se podnesak odnosi na:";
>         $text['revsubject'] = "Predložena promjena treba vaš pregled";
78,79c77,79
< 		$text['relcalc'] = "Kalkulator rodbinskih veza";
< 		$text['findrel'] = "Naði rodbinsku vezu";
---
> 	case "connections":
> 		$text['relcalc'] = "Kalkulator odnosa";
> 		$text['findrel'] = "Pronađite vezu";
82,94c82,94
< 		$text['calculate'] = "Izraèunaj";
< 		$text['select2inds'] = "Molim izaberite dvije osobe.";
< 		$text['findpersonid'] = "Naði ID osobe";
< 		$text['enternamepart'] = "unesi dio imena i/ili prezimena";
< 		$text['pleasenamepart'] = "Molim unesite dio imena ili prezimena.";
< 		$text['clicktoselect'] = "klikni za izbor";
< 		$text['nobirthinfo'] = "Fali informacija o roðenju";
< 		$text['relateto'] = "Rodbinska veza";
< 		$text['sameperson'] = "Dvije osobe su jedna te ista osoba.";
< 		$text['notrelated'] = "Dvije osobe nisu u vezi sa xxx generacija."; //xxx will be replaced with number of generations
< 		$text['findrelinstr'] = "Za prikazati obiteljsku vezu izmeðu dvije osobe, koristi 'Find' tipku dolje da bi locirali osobe (ili nastavi prikazivati osobe), zatim klikni na 'Kalkuliraj'.";
< 		$text['sometimes'] = "(Ponekad provjera medu razlièitim brojevima generacija daje razlièite rezultate.)";
< 		$text['findanother'] = "Naði drugu rodbinsku vezu";
---
> 		$text['calculate'] = "Izra�unaj";
> 		$text['select2inds'] = "Odaberite dvije osobe.";
> 		$text['findpersonid'] = "Pronađi osobe ID";
> 		$text['enternamepart'] = "Upišite dio imena i / ili prezimena";
> 		$text['pleasenamepart'] = "Upišite dio imena ili prezimena.";
> 		$text['clicktoselect'] = "kliknite za odabir";
> 		$text['nobirthinfo'] = "Nema informacija rođenja";
> 		$text['relateto'] = "Odnos prema";
> 		$text['sameperson'] = "Dvije osobe su ista osoba.";
> 		$text['notrelated'] = "Dvije jedinke nisu u srodstvu unutar xxx generacija."; //xxx will be replaced with number of generations
> 		$text['findrelinstr'] = "Za prikaz odnosa između dvije osobe, pomoću gumba 'Traži' dolje pronađite pojedince (ili zadržite ljude prikazanim), a zatim kliknite 'Izra�unaj'.";
> 		$text['sometimes'] = "(Ponekad provjera razli�itog broja generacija daje druga�iji rezultat.)";
> 		$text['findanother'] = "Pronađite drugu vezu";
97,107c97,107
< 		$text['sibling'] = "potomak od";
< 		$text['uncle'] = "xxx je ujak od";
< 		$text['aunt'] = "xxx je tetka od";
< 		$text['uncleaunt'] = "xxx je ujak/tetka od";
< 		$text['nephew'] = "xxx je neæak od";
< 		$text['niece'] = "xxx je neæakinja od";
< 		$text['nephnc'] = "xxx je neæak/neæakinja od";
< 		$text['removed'] = "times obrisan";
< 		$text['rhusband'] = "suprug od ";
< 		$text['rwife'] = "supruga od ";
< 		$text['rspouse'] = "supruga od ";
---
> 		$text['sibling'] = "brat i sestra od";
> 		$text['uncle'] = "xxx stric od";
> 		$text['aunt'] = "xxx tetka od";
> 		$text['uncleaunt'] = "xxx stric/tetka od";
> 		$text['nephew'] = "xxx nećak od";
> 		$text['niece'] = "xxx nećakinja od";
> 		$text['nephnc'] = "xxx nećak/nećakinja od";
> 		$text['removed'] = "puta uklonjen";
> 		$text['rhusband'] = "muž od";
> 		$text['rwife'] = "suproga od";
> 		$text['rspouse'] = "supružnika od";
109,110c109,110
< 		$text['daughter'] = "kcerka od";
< 		$text['rchild'] = "dijete od";
---
> 		$text['daughter'] = "kći od";
> 		$text['rchild'] = "djete od";
112,113c112,113
< 		$text['dil'] = "nevjesta od";
< 		$text['sdil'] = "zet ili nevjesta od";
---
> 		$text['dil'] = "snaha od";
> 		$text['sdil'] = "zet ili snaha od";
117,118c117,118
< 		$text['great'] = "veæi";
< 		$text['spouses'] = "su supruge";
---
> 		$text['great'] = "veliki";
> 		$text['spouses'] = "su supružnici";
120,124c120,124
< 		$text['changeto'] = "Promijeni u (unesi ID):";
< 		$text['notvalid'] = "nije valjan broj osobnog ID-a ili ne postoji u ovoj bazi podataka. Molim pokušajte ponovo.";
< 		$text['halfbrother'] = "the half brother of";
< 		$text['halfsister'] = "the half sister of";
< 		$text['halfsibling'] = "the half sibling of";
---
> 		$text['changeto'] = "Promijenite na (unesite ID):";
> 		$text['notvalid'] = "nije važeći ID broj osobe ili ne postoji u ovoj bazi podataka. Molim pokušaj ponovno.";
> 		$text['halfbrother'] = "polubrat od";
> 		$text['halfsister'] = "polusestra od";
> 		$text['halfsibling'] = "polubrat/sestra od";
126,132c126,132
< 		$text['gencheck'] = "Max generacija<br />za provjeru";
< 		$text['mcousin'] = "xxx je bratiæ yyy od";  //male cousin; xxx = cousin number, yyy = times removed
< 		$text['fcousin'] = "xxx je sestrièna yyy od";  //female cousin
< 		$text['cousin'] = "xxx je roðak yyy od";
< 		$text['mhalfcousin'] = "xxx pola bratiæ yyy od";  //male cousin
< 		$text['fhalfcousin'] = "xxx pola sestrièna yyy od";  //female cousin
< 		$text['halfcousin'] = "xxx pola roðak yyy od";
---
> 		$text['gencheck'] = "Maksimalni broj generacija za provjeru";
> 		$text['mcousin'] = "xxx rođak od yyy";  //male cousin; xxx = cousin number, yyy = times removed
> 		$text['fcousin'] = "xxx rođakinja od yyy";  //female cousin
> 		$text['cousin'] = "xxx rođak od yyy";
> 		$text['mhalfcousin'] = "xxx pol rođak od yyy";  //male cousin
> 		$text['fhalfcousin'] = "xxx pol rođakinja od yyy";  //female cousin
> 		$text['halfcousin'] = "xxx pol rođak od yyy";
134c134
< 		$text['oneremoved'] = "jedna generacija odmaknut";
---
> 		$text['oneremoved'] = "jednom uklonjen";
141,144c141,144
< 		$text['maxrels'] = "Maximalni broj veza pokazati";
< 		$text['dospouses'] = "Pokaži veze koje se tiæu supruge";
< 		$text['rels'] = "Veze";
< 		$text['dospouses2'] = "Pokaži Supruge";
---
> 		$text['maxrels'] = "Maksimalni odnosi koji se pokazuju";
> 		$text['dospouses'] = "Pokažite odnose koji uklju�uju supružnika";
> 		$text['rels'] = "Odnosi";
> 		$text['dospouses2'] = "Prikaži supružnike";
148,153c148,153
< 		$text['stepson'] = "posinak od";
< 		$text['stepdau'] = "poæerka od";
< 		$text['stepchild'] = "pastorèe od";
< 		$text['stepgson'] = "the xxx step-grandson of";
< 		$text['stepgdau'] = "the xxx step-granddaughter of";
< 		$text['stepgchild'] = "the xxx step-grandchild of";
---
> 		$text['stepson'] = "pastor od";
> 		$text['stepdau'] = "pastorka od";
> 		$text['stepchild'] = "pastor�e od";
> 		$text['stepgson'] = "xxx o�uh od";
> 		$text['stepgdau'] = "xxx o�uha od";
> 		$text['stepgchild'] = "xxx o�uh/o�uha od";
155c155
< 		$text['ggreat'] = "veæi";
---
> 		$text['ggreat'] = "veliki";
157,171c157,240
< 		$text['ggfath'] = "the xxx great grandfather of";
< 		$text['ggmoth'] = "the xxx great grandmother of";
< 		$text['ggpar'] = "the xxx great grandparent of";
< 		$text['ggson'] = "the xxx great grandson of";
< 		$text['ggdau'] = "the xxx great granddaughter of";
< 		$text['ggsondau'] = "the xxx great grandchild of";
< 		$text['gstepgson'] = "the xxx great step-grandson of";
< 		$text['gstepgdau'] = "the xxx great step-granddaughter of";
< 		$text['gstepgchild'] = "the xxx great step-grandchild of";
< 		$text['guncle'] = "the xxx great uncle of";
< 		$text['gaunt'] = "the xxx great aunt of";
< 		$text['guncleaunt'] = "the xxx great uncle/aunt of";
< 		$text['gnephew'] = "the xxx great nephew of";
< 		$text['gniece'] = "the xxx great niece of";
< 		$text['gnephnc'] = "the xxx great nephew/niece of";
---
> 		$text['ggfath'] = "xxx pradjed od";
> 		$text['ggmoth'] = "xxx prababa od";
> 		$text['ggpar'] = "xxx pradjed/prababa od";
> 		$text['ggson'] = "xxx pra unuk od";
> 		$text['ggdau'] = "xxx pra unuka od";
> 		$text['ggsondau'] = "xxx pra unuk/unuka od";
> 		$text['gstepgson'] = "xxx pra o�uh od";
> 		$text['gstepgdau'] = "xxx pra o�uha od";
> 		$text['gstepgchild'] = "xxx pra o�uh/o�uha od";
> 		$text['guncle'] = "xxx pra ujak od";
> 		$text['gaunt'] = "xxx pra tetka od";
> 		$text['guncleaunt'] = "xxx pra ujak/tetka od";
> 		$text['gnephew'] = "xxx pra nećak od";
> 		$text['gniece'] = "xxx pra nećakinja od";
> 		$text['gnephnc'] = "xxx pra nećak/nećakinja od";
> 		//added in 14.0
> 		$text['pathscalc'] = "Potražite veze";
> 		$text['findrel2'] = "Pronađite odnose i druge veze";
> 		$text['makeme2nd'] = "Koristi moj ID";
> 		$text['usebookmarks'] = "Koristi oznake";
> 		$text['select2inds'] = "Odaberite dvije osobe.";
> 		$text['indinfofor'] = "Individualne informacije za";
> 		$text['nobookmarks'] = "Nema oznake za korištenje";
> 		$text['bkmtitle'] = "Osobe pronađene u oznakama";
> 		$text['bkminfo'] = "Odaberite osobu:";
> 		$text['sortpathsby'] = "Razvrstaj put po broju";
> 		$text['sortbyshort'] = "Poredaj po";
> 		$text['bylengthshort'] = "Duljina";
> 		$text['badID1'] = ": loše osobe1 ID - vratite se i ispravite";
> 		$text['badID2'] = ": loše osobe2 ID - vratite se i ispravite";
> 		$text['notintree'] = ": osoba s ovim ID-om nije u trenutnoj bazi podataka stabla.";
> 		$text['sameperson'] = "Dvije osobe su ista osoba.";;
> 		$text['nopaths'] = "Ove osobe nisu povezane.";
> 		$text['nopaths1'] = "Nema više veza kraćih od xxx";
> 		$text['nopaths2'] = "u xxx pretraživanja korak";
> 		$text['longestpath'] = "(najduži do sada provjereni put bio je xxx koraka dugo)";
> 		$text['relevantpaths'] = "Broj pronađenih razli�itih relevantnih putova: xxx";
> 		$text['skipMarr'] = "(osim toga, broj putova koji su pronađeni ali nisu prikazani zbog previše brakova bio je: xxx)";
> 		$text['mjaor'] = "ili";
> 		$text['connectionsto'] = "Veze s ";
> 		$text['findanotherpers'] = "Nađi drugu osobu...";
> 		$text['sometimes'] = "(Ponekad provjera razli�itog broja generacija daje druga�iji rezultat.)";
> 		$text['anotherpath'] = "Potražite druge veze";
> 		$text['xpath'] = "Put ";
> 		$text['primary'] = "Po�etna Osoba"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Krajnja Osoba";
> 		$text['parent'] = "Roditelj";
> 		$text['mhfather'] = "njegov otac";
> 		$text['mhmother'] = "njegova majka";
> 		$text['mhhusband'] = "njegov suprug";
> 		$text['mhwife'] = "njegova supruga";
> 		$text['mhson'] = "njegov sin";
> 		$text['mhdaughter'] = "njegova kćer";
> 		$text['fhfather'] = "njezin otac";
> 		$text['fhmother'] = "njezina majka";
> 		$text['fhhusband'] = "njezin suprug";
> 		$text['fhwife'] = "njezina supruga";
> 		$text['fhson'] = "njezin sin";
> 		$text['fhdaughter'] = "njezina kći";
> 		$text['hfather'] = "otac";
> 		$text['hmother'] = "majka";
> 		$text['hhusband'] = "suprug";
> 		$text['hwife'] = "supruga";
> 		$text['hson'] = "sin";
> 		$text['hdaughter'] = "kći";
> 		$text['maxruns'] = "Maksimalni broj puta koje treba provjeriti";
> 		$text['maxrshort'] = "Maksimalni putova";
> 		$text['maxlength'] = "Putovi veze ne dulji od";
> 		$text['maxlshort'] = "Maksimalna dužina";
> 		$text['xstep'] = "korak";
> 		$text['xsteps'] = "korakova";
> 		$text['xmarriages'] = "xxx brakova";
> 		$text['xmarriage'] = "1 brak";
> 		$text['showspouses'] = "Pokažite oba supružnika";
> 		$text['showTxt'] = "Prikaži tekstualni opis puta";
> 		$text['showTxtshort'] = "Tekstualni opis.";
> 		$text['compactBox'] = "Prikaži zbijene okvire osoba";
> 		$text['compactBoxshort'] = "Kompaktne kutije";
> 		$text['paths'] = "Put";
> 		$text['dospouses2'] = "Prikaži supružnike";
> 		$text['maxmopt'] = "Maksimalan broj brakova po vezi"; 
> 		$text['maxm'] = "Maksimalni brakovi"; 
> 		$text['arerelated'] = "Ove osobe su rođaci - njihov odnos prikazan je u Putu 1";
> 		$text['simplerel'] = "Jednostavna pretraga odnosa"; 
175,183c244,252
< 		$text['familygroupfor'] = "Obiteljska grupna lista za";
< 		$text['ldsords'] = "LDS Propisi";
< 		$text['baptizedlds'] = "Kršten (LDS)";
< 		$text['endowedlds'] = "Endowed (LDS)";
< 		$text['sealedplds'] = "Sealed P (LDS)";
< 		$text['sealedslds'] = "Sealed S (LDS)";
< 		$text['otherspouse'] = "Ostale supruge/supruzi";
< 		$text['husband'] = "Suprug";
< 		$text['wife'] = "Supruga";
---
> 		$text['familygroupfor'] = "Obiteljski list za";
> 		$text['ldsords'] = "Pravilnici o LDS";
> 		$text['baptizedlds'] = "Kršten (LDS)";
> 		$text['endowedlds'] = "Obdaren (LDS)";
> 		$text['sealedplds'] = "Zape�aćeno za roditeljima (LDS)";
> 		$text['sealedslds'] = "Zape�aćen za supružnika (LDS)";
> 		$text['otherspouse'] = "Drugi supružnik";
> 		$text['husband'] = "Otac";
> 		$text['wife'] = "Majka";
188,196c257,264
< 		$text['capbirthabbr'] = "B";
< 		$text['capaltbirthabbr'] = "A";
< 		$text['capdeathabbr'] = "D";
< 		$text['capburialabbr'] = "B";
< 		$text['capplaceabbr'] = "P";
< 		$text['capmarrabbr'] = "M";
< 		$text['capspouseabbr'] = "SP";
< 		$text['redraw'] = "Iscrtati sa";
< 		$text['scrollnote'] = "Bilješke: Možete skrolovati dolje ili desno za vidjeti tablu.";
---
> 		$text['capbirthabbr'] = "R.";
> 		$text['capaltbirthabbr'] = "R.";
> 		$text['capdeathabbr'] = "U.";
> 		$text['capburialabbr'] = "P.";
> 		$text['capplaceabbr'] = "M.";
> 		$text['capmarrabbr'] = "V.";
> 		$text['capspouseabbr'] = "P.";
> 		$text['redraw'] = "Ponovo crtaj sa";
198,200c266,267
< 		$text['popupnote1'] = " = Dodatna informacija";
< 		$text['popupnote2'] = " = Novo porijeklo";
< 		$text['pedcompact'] = "Kompakt";
---
> 		$text['popupnote1'] = "= Dodatne informacije";
> 		$text['pedcompact'] = "Kompaktni";
203,205c270,272
< 		$text['descendfor'] = "Nasljednici za";
< 		$text['maxof'] = "Maksimum od";
< 		$text['gensatonce'] = "generacija prikazanih odjednom.";
---
> 		$text['descendfor'] = "Potomci za";
> 		$text['maxof'] = "Maksimalno od";
> 		$text['gensatonce'] = "generacije prikazane u jednom trenutku.";
207,209c274,276
< 		$text['daughterof'] = "kæi od";
< 		$text['childof'] = "dijete od";
< 		$text['stdformat'] = "Standardni Format";
---
> 		$text['daughterof'] = "kći od";
> 		$text['childof'] = "djete od";
> 		$text['stdformat'] = "Standardni format";
211c278
< 		$text['addnewfam'] = "Dodaj novu obitelj";
---
> 		$text['addnewfam'] = "Dodajte novu obitelj";
213c280
< 		$text['side'] = "Strana";
---
> 		$text['side'] = "Krilo";
215,241c282,308
< 		$text['paternal'] = "Oèev";
< 		$text['maternal'] = "Materinji";
< 		$text['gen1'] = "Vlastiti";
< 		$text['gen2'] = "Roditelji";
< 		$text['gen3'] = "Djedovi";
< 		$text['gen4'] = "Pradjedovi";
< 		$text['gen5'] = "Pra Pra djedovi";
< 		$text['gen6'] = "3. Pra djedovi";
< 		$text['gen7'] = "4. Pra djedovi";
< 		$text['gen8'] = "5. Pra djedovi";
< 		$text['gen9'] = "6. Pra djedovi";
< 		$text['gen10'] = "7. Pra djedovi";
< 		$text['gen11'] = "8. Pra djedovi";
< 		$text['gen12'] = "9. Pra djedovi";
< 		$text['graphdesc'] = "Tabla potomaka do ovog trenutka";
< 		$text['pedbox'] = "Box";
< 		$text['regformat'] = "Register";
< 		$text['extrasexpl'] = "= Najmanje jedna fotografija, povijest ili neki drugi media item postoji o ovoj osobi.";
< 		$text['popupnote3'] = " = Novi dijagram";
< 		$text['mediaavail'] = "Medija na raspolaganju";
< 		$text['pedigreefor'] = "Porijeklo za";
< 		$text['pedigreech'] = "Pedigre Dijagram";
< 		$text['datesloc'] = "Datumi i Mjesta";
< 		$text['borchr'] = "Roðenje/Alt - Smrt/Pogreb (dva)";
< 		$text['nobd'] = "Nema Datume Roðenja ili Smrti";
< 		$text['bcdb'] = " Roðenje/Alt/Smrt/Pogreb (èetri)";
< 		$text['numsys'] = "Sistem Numeriranje";
---
> 		$text['paternal'] = "O�ev";
> 		$text['maternal'] = "Maj�in";
> 		$text['gen1'] = "Sam";
> 		$text['gen2'] = "Roditelj";
> 		$text['gen3'] = "Djed i baka";
> 		$text['gen4'] = "Pradjed i baka";
> 		$text['gen5'] = "Å ukun djed i baka";
> 		$text['gen6'] = "3x Pra djed i baka";
> 		$text['gen7'] = "4x Pra djed i baka";
> 		$text['gen8'] = "5x Pra djed i baka";
> 		$text['gen9'] = "6x Pra djed i baka";
> 		$text['gen10'] = "7x Pra djed i baka";
> 		$text['gen11'] = "8x Pra djed i baka";
> 		$text['gen12'] = "9x Pra djed i baka";
> 		$text['graphdesc'] = "Tabela silaznosti do ove to�ke";
> 		$text['pedbox'] = "Kutija";
> 		$text['regformat'] = "Registar";
> 		$text['extrasexpl'] = "= Za ovu osobu postoji barem jedna fotografija, povijest ili drugi medijski predmet.";
> 		$text['popupnote3'] = " = Novi grafikon";
> 		$text['mediaavail'] = "Dostupni su mediji";
> 		$text['pedigreefor'] = "Pedigre karta za";
> 		$text['pedigreech'] = "Pedigre karta";
> 		$text['datesloc'] = "Datumi i Lokacije";
> 		$text['borchr'] = "Rođenje/Rođ - Umro/Pokop";
> 		$text['nobd'] = "Nema datuma Rođenja ili Pokop";
> 		$text['bcdb'] = "Svi podaci o Rođenju/Alt/Umro/Pokop";
> 		$text['numsys'] = "Sustav Numeriranja";
246c313
< 		$text['dispopts'] = "Opcije Prikaza";
---
> 		$text['dispopts'] = "Postavke zaslona";
248,251c315,318
< 		$text['no_ancestors'] = "No ancestors found";
< 		$text['ancestor_chart'] = "Vertical ancestor chart";
< 		$text['opennewwindow'] = "Open in a new window";
< 		$text['pedvertical'] = "Vertical";
---
> 		$text['no_ancestors'] = "Nema pronađenih predaka";
> 		$text['ancestor_chart'] = "Vertikalni grafikon predaka";
> 		$text['opennewwindow'] = "Otvori u novom prozoru";
> 		$text['pedvertical'] = "Vertikalno";
253,261c320,328
< 		$text['familywith'] = "Family with";
< 		$text['fcmlogin'] = "Please log in to see details";
< 		$text['isthe'] = "is the";
< 		$text['otherspouses'] = "other spouses";
< 		$text['parentfamily'] = "The parent family ";
< 		$text['showfamily'] = "Show family";
< 		$text['shown'] = "shown";
< 		$text['showparentfamily'] = "show parent family";
< 		$text['showperson'] = "show person";
---
> 		$text['familywith'] = "Porodica sa";
> 		$text['fcmlogin'] = "Prijavite se da biste videli detalje";
> 		$text['isthe'] = "je";
> 		$text['otherspouses'] = "drugi supružnici";
> 		$text['parentfamily'] = "Roditeljska porodica ";
> 		$text['showfamily'] = "Prikaz porodice";
> 		$text['shown'] = "pokazano";
> 		$text['showparentfamily'] = "prikaz roditeljske porodice";
> 		$text['showperson'] = "prikazi osobe";
263c330,349
< 		$text['otherfamilies'] = "Other families";
---
> 		$text['otherfamilies'] = "Druge porodice";
> 		//added in 14.0
> 		$text['dtformat'] = "Tablice";
> 		$text['dtchildren'] = "Djeca";
> 		$text['dtgrandchildren'] = "Unuci";
> 		$text['dtggrandchildren'] = "Pra pra unuci";
> 		$text['dtgggrandchildren'] = "Pra praunuci"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "1"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nema potomaka";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Ukupno";
> 		$text['dtselect'] = "Odaberi";
> 		$text['dteachfulltable'] = "Svaka puna tablica imat će";
> 		$text['dtrows'] = "redaka";
> 		$text['dtdisplayingtable'] = "Prikaz tablice";
> 		$text['dtgototable'] = "Idi do tablice:";
> 		$text['fcinstrdn'] = "Pokažite obitelj sa supružnikom";
> 		$text['fcinstrup'] = "Pokažite obitelj s roditeljima";
> 		$text['fcinstrplus'] = "Odaberite druge supružnike";
> 		$text['fcinstrfam'] = "Odaberite druge roditelje";
270,280c356,366
< 		$text['noreports'] = "Izvješce ne postoji.";
< 		$text['reportname'] = "Naziv izvješæa";
< 		$text['allreports'] = "Sva izvješæa";
< 		$text['report'] = "Izvješæe";
< 		$text['error'] = "Greška";
< 		$text['reportsyntax'] = "Sintaksa upita se pokreæe zajedno s ovim izvješæem";
< 		$text['wasincorrect'] = "je pogrešno, i kao rezultat izvješæe se ne može pokrenuti. Molim da kontaktirate administratora sustava";
< 		$text['errormessage'] = "Poruka Greške";
< 		$text['equals'] = "jednako";
< 		$text['endswith'] = "završava sa";
< 		$text['soundexof'] = "Soundex od";
---
> 		$text['noreports'] = "Nema izvještaja.";
> 		$text['reportname'] = "Ime izveštaja";
> 		$text['allreports'] = "Svi izveštaji";
> 		$text['report'] = "Izveštaj";
> 		$text['error'] = "Greška";
> 		$text['reportsyntax'] = "Sintaksa upita pokreće se s ovim izvješćem";
> 		$text['wasincorrect'] = "nije bio to�an i zbog toga se izvješće nije moglo pokrenuti. Molimo kontaktirajte administratora sustava na";
> 		$text['errormessage'] = "Poruka o pogrešci";
> 		$text['equals'] = "biti jednak";
> 		$text['endswith'] = "završava se sa";
> 		$text['soundexof'] = "zvući kao";
283,286c369,372
< 		$text['lessthan'] = "manje nego";
< 		$text['greaterthan'] = "veæe od";
< 		$text['lessthanequal'] = "manje ili jednako od";
< 		$text['greaterthanequal'] = "veæe ili jednako za";
---
> 		$text['lessthan'] = "manje od";
> 		$text['greaterthan'] = "više od";
> 		$text['lessthanequal'] = "manje ili jednako";
> 		$text['greaterthanequal'] = "veće ili jednako";
288,289c374,375
< 		$text['tryagain'] = "Molim pokušajte ponovo";
< 		$text['joinwith'] = "Spoji sa";
---
> 		$text['tryagain'] = "Pokušajte ponovo";
> 		$text['joinwith'] = "Pridružite se";
292,294c378,380
< 		$text['showspouse'] = "Prikazana suprugu pokazat æe se kao duplikat ako osoba ima više od jedne supruge)";
< 		$text['submitquery'] = "Pošalji upit";
< 		$text['birthplace'] = "Mjesto roðenja";
---
> 		$text['showspouse'] = "Prikaži supružnika (pokazat će duplikate ako pojedinac ima više supružnika)";
> 		$text['submitquery'] = "Pošaljite upit";
> 		$text['birthplace'] = "Mjesto rođenja";
296c382
< 		$text['birthdatetr'] = "Godina roðenja";
---
> 		$text['birthdatetr'] = "Godina rođenja";
299,302c385,388
< 		$text['resetall'] = "Resetiraj sve vrijednosti";
< 		$text['showdeath'] = "Prikaži smrt/informaciju o pogrebu";
< 		$text['altbirthplace'] = "Mjesto Krštenja";
< 		$text['altbirthdatetr'] = "Godina Krštenja";
---
> 		$text['resetall'] = "Poništite sve vrijednosti";
> 		$text['showdeath'] = "Pokažite podatke o smrti/pokopa";
> 		$text['altbirthplace'] = "Mjesto krštenja";
> 		$text['altbirthdatetr'] = "Godina krštenja";
305c391
< 		$text['event'] = "Dogaðaj(i)";
---
> 		$text['event'] = "Događaj";
308,316c394,402
< 		$text['keyword'] = "Kljuèna rijeè (npr, \"Popr\")";
< 		$text['explain'] = "Unesi komponente datuma da bi vidio dogaðaje koji se slažu. Ostavi prazno polje da bi vidjio sve dogaðaje koji se slažu.";
< 		$text['enterdate'] = "Molim unesi ili odaberi najmanje jedan podatak: Dan, Mjesec, Godina, kljuèna rijeè";
< 		$text['fullname'] = "Puno ime";
< 		$text['birthdate'] = "Datum roðenja";
< 		$text['altbirthdate'] = "Datum krštenja";
< 		$text['marrdate'] = "Datum vjenèanja";
< 		$text['spouseid'] = "Suprugin ID";
< 		$text['spousename'] = "Suprugino ime";
---
> 		$text['keyword'] = "Klju�na rije� (tj. \"Abt\") ";
> 		$text['explain'] = "Unesite komponente datuma da biste vidjeli podudaranje događaja. Ostavite polje prazno da biste vidjeli utakmice za sve.";
> 		$text['enterdate'] = "Unesite ili odaberite barem jedno od sljedećeg: Dan, Mjesec, Godina, Klju�na rije�";
> 		$text['fullname'] = "Puno ime i prezime";
> 		$text['birthdate'] = "Datum rođenja";
> 		$text['altbirthdate'] = "Datum krštenja";
> 		$text['marrdate'] = "Datum vjen�anja";
> 		$text['spouseid'] = "ID supružnika";
> 		$text['spousename'] = "Ime Supružnika";
319,331c405,417
< 		$text['changedate'] = "Datum zadnje modifikacije";
< 		$text['gedcom'] = "Stablo";
< 		$text['baptdate'] = "Datum krštenja (LDS)";
< 		$text['baptplace'] = "Mjeto krštenja (LDS)";
< 		$text['endldate'] = "Endowment Date (LDS)";
< 		$text['endlplace'] = "Endowment Place (LDS)";
< 		$text['ssealdate'] = "Seal Date S (LDS)";   //Sealed to spouse
< 		$text['ssealplace'] = "Seal Place S (LDS)";
< 		$text['psealdate'] = "Seal Date P (LDS)";   //Sealed to parents
< 		$text['psealplace'] = "Seal Place P (LDS)";
< 		$text['marrplace'] = "Mjesto vjenèanja";
< 		$text['spousesurname'] = "Prezime supruge";
< 		$text['spousemore'] = "Ako unesete vrijednost supruginog prezimena, morate unijeti vrijednost u najmanje još jedno polje.";
---
> 		$text['changedate'] = "Datum zadnje izmjene";
> 		$text['gedcom'] = "Porodi�no stablo";
> 		$text['baptdate'] = "Datum krštenja (LDS)";
> 		$text['baptplace'] = "Mjesto krštenja (LDS)";
> 		$text['endldate'] = "Datum Zadužbine (LDS)";
> 		$text['endlplace'] = "Mjesto Zadužbine (LDS)";
> 		$text['ssealdate'] = "Datum pe�ata S (LDS)";   //Sealed to spouse
> 		$text['ssealplace'] = "Mjesto pe�ata S (LDS)";
> 		$text['psealdate'] = "Datum pe�ata P (LDS)";   //Sealed to parents
> 		$text['psealplace'] = "Mjesto pe�ata P (LDS)";
> 		$text['marrplace'] = "Mjesto za vjen�anje";
> 		$text['spousesurname'] = "Prezime supružnika";
> 		$text['spousemore'] = "Ako unesete vrijednost za Prezime supružnika, morate odabrati spol.";
337c423
< 		$text['otherevents'] = "Ostali dogaðaji";
---
> 		$text['otherevents'] = "Ostali kriteriji za pretraživanje";
339,343c425,429
< 		$text['mysphoto'] = "Misteriozne Fotografije";
< 		$text['mysperson'] = "Nedostižani Ljudi";
< 		$text['joinor'] = "Opcija 'Sastavi sa ILI' se nemože upotrebiti sa Prezime Supruge";
< 		$text['tellus'] = "Recite nam što znate";
< 		$text['moreinfo'] = "Više Informacije:";
---
> 		$text['mysphoto'] = "Tajanstvene fotografije";
> 		$text['mysperson'] = "Nedostižni ljudi";
> 		$text['joinor'] = "Opcija 'Join with OR' ne može se koristiti s prezimenom supružnika";
> 		$text['tellus'] = "Recite nam Å¡ta znate";
> 		$text['moreinfo'] = "Više informacija:";
345,351c431,437
< 		$text['marrdatetr'] = "Godina Vjeèanja";
< 		$text['divdatetr'] = "Godina Razvoda";
< 		$text['mothername'] = "Ime Majke";
< 		$text['fathername'] = "Ime Otca";
< 		$text['filter'] = "Filtar";
< 		$text['notliving'] = "Ne Živuæi";
< 		$text['nodayevents'] = "Dogaðaji za ovaj mjesec koje nisu vezane uz odreðeni dan:";
---
> 		$text['marrdatetr'] = "Godina vjen�anja";
> 		$text['divdatetr'] = "Godina Razvode";
> 		$text['mothername'] = "Maj�ino Ime";
> 		$text['fathername'] = "O�evo Ime";
> 		$text['filter'] = "Filter";
> 		$text['notliving'] = "Ne živi";
> 		$text['nodayevents'] = "Događaji za ovaj mjesec koji nisu povezani s određenim danom:";
353c439
< 		$text['csv'] = "Comma-delimited CSV file";
---
> 		$text['csv'] = "CSV datoteka ograni�ena zarezom";
355,358c441,444
< 		$text['confdate'] = "Confirmation Date (LDS)";
< 		$text['confplace'] = "Confirmation Place (LDS)";
< 		$text['initdate'] = "Initiatory Date (LDS)";
< 		$text['initplace'] = "Initiatory Place (LDS)";
---
> 		$text['confdate'] = "Datum potvrde (LDS)";
> 		$text['confplace'] = "Mjesto povrde (LDS)";
> 		$text['initdate'] = "Datum inicijative (LDS)";
> 		$text['initplace'] = "Mjesto inicijative (LDS)";
360,362c446,448
< 		$text['marrtype'] = "Marriage Type";
< 		$text['searchfor'] = "Search for";
< 		$text['searchnote'] = "Note: This page uses Google to perform its search. The number of matches returned will be directly affected by the extent to which Google has been able to index the site.";
---
> 		$text['marrtype'] = "Vrsta Braka";
> 		$text['searchfor'] = "Tragati za";
> 		$text['searchnote'] = "NAPOMENA: Ova stranica koristi Google za pretraživanje. Na broj vraćenih utakmica izravno će utjecati mjerilo u kojem je Google mogao indeksirati web mjesto.";
367,370c453,456
< 		$text['logfilefor'] = "Datoteka logova za";
< 		$text['mostrecentactions'] = "Posljednje aktivnosti";
< 		$text['autorefresh'] = "Automatsko osvježavanje (30 sekundi)";
< 		$text['refreshoff'] = "Iskljuèi automatsko osvježivanje";
---
> 		$text['logfilefor'] = "Datoteka zapisnika";
> 		$text['mostrecentactions'] = "Najnovije akcije";
> 		$text['autorefresh'] = "Automatsko osvježavanje (30 sekundi)";
> 		$text['refreshoff'] = "Isklju�ite automatsko osvježavanje";
375,376c461,462
< 		$text['cemeteriesheadstones'] = "Groblja i nadgrobni spomenici";
< 		$text['showallhsr'] = "Prikaži sve podatke o nadgrobnim spomenicima";
---
> 		$text['cemeteriesheadstones'] = "Groblja i nadgrobni Spomenici";
> 		$text['showallhsr'] = "Pokaži sve zapise o Spomenicima";
378,379c464,465
< 		$text['showmap'] = "Prikaži mapu";
< 		$text['headstonefor'] = "Nadgrobni spomenik za";
---
> 		$text['showmap'] = "Pokaži mapu";
> 		$text['headstonefor'] = "Spomenik za";
381,382d466
< 		$text['firstpage'] = "Prva stranica";
< 		$text['lastpage'] = "Zadnja stranica";
386,388c470,472
< 		$text['iptc020'] = "Dopunske kategorije";
< 		$text['iptc040'] = "Specijalne instrukcije";
< 		$text['iptc055'] = "Datum kreiranja";
---
> 		$text['iptc020'] = "Kategorije potpore";
> 		$text['iptc040'] = "Posebne upute";
> 		$text['iptc055'] = "Datum stvaranja";
390c474
< 		$text['iptc085'] = "Autorova pozicija";
---
> 		$text['iptc085'] = "Pozicija Autora";
392,393c476,477
< 		$text['iptc095'] = "State";
< 		$text['iptc101'] = "Država";
---
> 		$text['iptc095'] = "Provincija";
> 		$text['iptc101'] = "Država";
402,404c486,488
< 		$text['regphotos'] = "Deskriptivan pogled";
< 		$text['gallery'] = "Slièice Samo";
< 		$text['cemphotos'] = "Fotografije groblja";
---
> 		$text['regphotos'] = "Opisni prikaz";
> 		$text['gallery'] = "Samo sli�ice";
> 		$text['cemphotos'] = "Fotografije Groblja";
407c491
< 		$text['filesize'] = "Velièina datoteke";
---
> 		$text['filesize'] = "Veli�ina datoteke";
409,412c493,496
< 		$text['showall'] = "Prikaži sve";
< 		$text['editmedia'] = "Uredi Media";
< 		$text['viewitem'] = "Pogledaj ovaj item";
< 		$text['editcem'] = "Uredi groblja";
---
> 		$text['showall'] = "Pokaži Sve";
> 		$text['editmedia'] = "Uredi Mediju";
> 		$text['viewitem'] = "Pogledaj ovaj stavku";
> 		$text['editcem'] = "Uredi Groblje";
414,417c498,501
< 		$text['allalbums'] = "Svi albumi";
< 		$text['slidestop'] = "Pauza Pokaz Prezentacije";
< 		$text['slideresume'] = "Nastavi Pokaz Prezentacije";
< 		$text['slidesecs'] = "Sekundi za svaki slajd:";
---
> 		$text['allalbums'] = "Svi Albumi";
> 		$text['slidestop'] = "Pauza pokazati presentacije";
> 		$text['slideresume'] = "Nastavi pokazati presentacija";
> 		$text['slidesecs'] = "Sekunde za svaki slajd:";
420,424c504,508
< 		$text['nocountry'] = "Nepoznata Zemlja";
< 		$text['nostate'] = "Nepoznata Država";
< 		$text['nocounty'] = "Nepoznata Županija";
< 		$text['nocity'] = "Nepoznati Grad";
< 		$text['nocemname'] = "Nepoznato ime groblja";
---
> 		$text['nocountry'] = "Nepoznata država";
> 		$text['nostate'] = "Nepoznata provincija";
> 		$text['nocounty'] = "Nepoznata županja";
> 		$text['nocity'] = "Nepoznat grad";
> 		$text['nocemname'] = "Nepoznat naziv groblja";
426c510
< 		$text['mediamaptext'] = "<strong>Poruka:</strong> Maknite vaš pokazivaè miša preko slike za pokazati imena. Kliknite za viditi stranicu za svako ime.";
---
> 		$text['mediamaptext'] = "<strong>NAPOMENA:</strong> Pomi�ite pokaziva� miša preko slike da biste prikazali imena. Kliknite da biste vidjeli stranicu za svako ime.";
429c513
< 		$text['moreinfo'] = "Više Informacije:";
---
> 		$text['moreinfo'] = "Kliknite za više informacija o ovoj slici";
431,435c515,521
<         $text['iptc025'] = "Keywords";
<         $text['iptc092'] = "Sub-location";
< 		$text['iptc015'] = "Category";
< 		$text['iptc065'] = "Originating Program";
< 		$text['iptc070'] = "Program Version";
---
>         $text['iptc025'] = "Klju�ne rje�i";
>         $text['iptc092'] = "Pod-lokacija";
> 		$text['iptc015'] = "Kategorija";
> 		$text['iptc065'] = "Izvorni Program";
> 		$text['iptc070'] = "Verzija Programa";
> 		//added in 13.0
> 		$text['toggletags'] = "Prebaci oznake";
441,446c527,532
< 		$text['surnamesstarting'] = "Prikaži prezimena koja poèinju sa";
< 		$text['showtop'] = "Prikaži prvih";
< 		$text['showallsurnames'] = "Prikaži sva prezimena";
< 		$text['sortedalpha'] = "sortiraj abecedno";
< 		$text['byoccurrence'] = "sortiranih po pojavljivanju";
< 		$text['firstchars'] = "Prvi znakovi";
---
> 		$text['surnamesstarting'] = "Pokaži prezimena koja po�inju sa";
> 		$text['showtop'] = "Prikaži vrh";
> 		$text['showallsurnames'] = "Prikaz sva prezimena";
> 		$text['sortedalpha'] = "razvrstano po abecedi";
> 		$text['byoccurrence'] = "poredani pojavom";
> 		$text['firstchars'] = "Po�etna slova";
448,455c534,541
< 		$text['allsurnames'] = "Sva prezimena";
< 		$text['showmatchingsurnames'] = "Kliknite na prezime za vidjeti polja koja se slažu.";
< 		$text['backtotop'] = "Nazad na vrh";
< 		$text['beginswith'] = "Poèinje sa";
< 		$text['allbeginningwith'] = "Sva prezimena poèinju sa";
< 		$text['numoccurrences'] = "broj pojavljivanja u zagradama";
< 		$text['placesstarting'] = "Prikaži najveæi lokalitet koji poèinje s";
< 		$text['showmatchingplaces'] = "Klikni na mjesto ako želiš prikazati manji lokalitet. Klikni na ikonu pretrage ako želiš prikazati osobe koje se slažu.";
---
> 		$text['allsurnames'] = "Sva Prezimena";
> 		$text['showmatchingsurnames'] = "Kliknite na prezime za prikaz odgovarajućih zapisa.";
> 		$text['backtotop'] = "Povratak na vrh";
> 		$text['beginswith'] = "Koja po�inju sa";
> 		$text['allbeginningwith'] = "Sva prezimena koja po�inju sa";
> 		$text['numoccurrences'] = "broj ukupnih lokaliteta u zagradama";
> 		$text['placesstarting'] = "Pokažite najveće lokalitete po�evši od";
> 		$text['showmatchingplaces'] = "Kliknite mjesto za prikaz manjih lokaliteta. Kliknite ikonu za pretraživanje da biste prikazali odgovarajuće pojedince.";
457c543
< 		$text['showallplaces'] = "Prikaži sve najveæe lokalitete";
---
> 		$text['showallplaces'] = "Prikaži sve najveće lokalitete";
460,461c546,547
< 		$text['allplaces'] = "Svi najveæi lokaliteti";
< 		$text['placescont'] = "Prikaži sva mjesta koja sadrže";
---
> 		$text['allplaces'] = "Sva veća Mjesta";
> 		$text['placescont'] = "Prikaži sva mjesta koja sadrže";
463,464c549,550
< 		$text['top30'] = "Najbrojnija xxx prezimena";
< 		$text['top30places'] = "Najbrojnija xxx veèa mjesta";
---
> 		$text['top30'] = "Prvih xxx prezimena";
> 		$text['top30places'] = "Prvih xxx najveći lokaliteti";
466,476c552,562
< 		$text['firstnamelist'] = "First Name List";
< 		$text['firstnamesstarting'] = "Show first names starting with";
< 		$text['showallfirstnames'] = "Show all first names";
< 		$text['mainfirstnamepage'] = "Main first name page";
< 		$text['allfirstnames'] = "All First Names";
< 		$text['showmatchingfirstnames'] = "Click on a first name to show matching records.";
< 		$text['allfirstbegwith'] = "All first names beginning with";
< 		$text['top30first'] = "Top xxx first names";
< 		$text['allothers'] = "All others";
< 		$text['amongall'] = "(among all names)";
< 		$text['justtop'] = "Just the top xxx";
---
> 		$text['firstnamelist'] = "Popis imena";
> 		$text['firstnamesstarting'] = "Pokažite imena koja po�inju sa";
> 		$text['showallfirstnames'] = "Prikaži sva imena";
> 		$text['mainfirstnamepage'] = "Glavna stranica prvog imena";
> 		$text['allfirstnames'] = "Sva Imena";
> 		$text['showmatchingfirstnames'] = "Kliknite na ime da biste prikazali odgovarajuće zapise.";
> 		$text['allfirstbegwith'] = "Sva imena koja po�inju sa";
> 		$text['top30first'] = "Prvih xxx Imena";
> 		$text['allothers'] = "Svi drugi";
> 		$text['amongall'] = "(među svim imenima)";
> 		$text['justtop'] = "Samo prvih xxx";
481c567
< 		$text['pastxdays'] = "(prethodnih xx dana)";
---
> 		$text['pastxdays'] = "(u poslednjih xx dana)";
483c569
< 		$text['photo'] = "Fotografija";
---
> 		$text['photo'] = "Fotografije";
485,487c571,573
< 		$text['husbid'] = "Suprugov ID";
< 		$text['husbname'] = "Suprugovo ime";
< 		$text['wifeid'] = "Suprugin ID";
---
> 		$text['husbid'] = "ID Oca";
> 		$text['husbname'] = "Ime Oca";
> 		$text['wifeid'] = "ID Majke";
489c575
< 		$text['wifename'] = "Mother's Name";
---
> 		$text['wifename'] = "Majkino Ime";
494c580
< 		$text['text_delete'] = "Obriši";
---
> 		$text['text_delete'] = "Obriši";
496,500c582,586
< 		$text['nobirth'] = "Ova osoba nema valjani datum roðenja i ne može biti dodana";
< 		$text['event'] = "Dogaðaj(i)";
< 		$text['chartwidth'] = "Širina table";
< 		$text['timelineinstr'] = "Dodaj ljude";
< 		$text['togglelines'] = "Dozvoli crte";
---
> 		$text['nobirth'] = "Sljedeći pojedinac nema važeći datum rođenja i ne može ga se dodati.";
> 		$text['event'] = "Događaj(i)";
> 		$text['chartwidth'] = "Å irina grafikona";
> 		$text['timelineinstr'] = "Dodaj osobe";
> 		$text['togglelines'] = "Prebaci linije";
502c588
< 		$text['noliving'] = "Slijedeæa osoba je oznaèena kao živuæa i ne može biti dodana zbog toga što nisi logiran s odgovarajuæim ovlastima";
---
> 		$text['noliving'] = "Sljedeći pojedinac ozna�en je kao živi ili privatni i nije ga moguće dodati jer niste prijavljeni s odgovarajućim dozvolama";
509,510c595,596
< 		$text['browsealltrees'] = "Pregledaj sva stabla";
< 		$text['treename'] = "Naziv stabla";
---
> 		$text['browsealltrees'] = "Pretražavanje svih porodi�nih stabala";
> 		$text['treename'] = "Naziv stablo";
512,517c598,603
< 		$text['address'] = "Adrese";
< 		$text['city'] = "Grad";
< 		$text['state'] = "Država/Pokrajina";
< 		$text['zip'] = "Poštanski broj";
< 		$text['country'] = "Zemlja";
< 		$text['email'] = "E-mail adresa";
---
> 		$text['address'] = "Adresa";
> 		$text['city'] = "Mjesto";
> 		$text['state'] = "Provincija";
> 		$text['zip'] = "Poštanski broj";
> 		$text['country'] = "Država";
> 		$text['email'] = "Vaša e-pošta";
519c605
< 		$text['username'] = "Korisnièko Ime";
---
> 		$text['username'] = "Korisni�ko ime";
521c607
< 		$text['loginfailed'] = "Login nije uspio.";
---
> 		$text['loginfailed'] = "Prijava nije uspjela.";
523,524c609,610
< 		$text['regnewacct'] = "Registriraj se za novi korisnièki account";
< 		$text['realname'] = "Vaše stvarno ime";
---
> 		$text['regnewacct'] = "<strong>Registrirajte se za novi korisni�ki ra�un</strong>";
> 		$text['realname'] = "Vaše ime i prezime";
526,552c612,637
< 		$text['email'] = "E-mail adresa";
< 		$text['address'] = "Adrese";
< 		$text['acctcomments'] = "Komentar";
< 		$text['submit'] = "Uloži";
< 		$text['leaveblank'] = "(ostavi prazno ako zahtijevate novo stablo)";
< 		$text['required'] = "Potrebna polja";
< 		$text['enterpassword'] = "Molimo unesite zaporku.";
< 		$text['enterusername'] = "Molimo unesite korisnièko ime.";
< 		$text['failure'] = "Žao nam je, ali vaše korisnièko ime kojeg ste unijeli je veæ korišteno. Molimo koristite Back button na vašem browser-u za povratak na prethodnu stanicu te odaberi drugaèije korisnièko ime.";
< 		$text['success'] = "Hvala. Primili smo vašu registraciju. Kontaktirat æemo vas kada aktiviramo vaš account ili ako su potrebne dodatne informacije.";
< 		$text['emailsubject'] = "Novi zahtjev za registracijom od strane TNG korisnika";
< 		$text['website'] = "Web Stranica";
< 		$text['nologin'] = "Nemaš login?";
< 		$text['loginsent'] = "Login informacija poslata";
< 		$text['loginnotsent'] = "Login informacija nije poslata";
< 		$text['enterrealname'] = "Molimo unesite vaše realno ime.";
< 		$text['rempass'] = "Ostani logiran na ovom raèunalu";
< 		$text['morestats'] = "Još statistike";
< 		$text['accmail'] = "<strong>NOTE:</strong> Molimo vas da ne blokirate mail s ove domene ako želite primati email-ove od sistem administratora u vezi vašeg account-a.";
< 		$text['newpassword'] = "Nova zaporka";
< 		$text['resetpass'] = "Resetiraj svoju zaporku";
< 		$text['nousers'] = "Ova forma ne može biti korištena sve dok postoji najmanje jedan korisnik. Ako ste vlasnik site-a, molim vas da kreirate vaš Administrator account iz Admin/Users.";
< 		$text['noregs'] = "Žao nam je, ali mi ne prihvaæamo nove korisnièke registracije u ovom trenutku.  Molimo <a href=\"suggest.php\"> kontaktirajte nas </ a> direktno ako imate komentare ili pitanja u vezi s bilo što na ovom mjestu. ";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Primili ste novi zahtjev za otvaranje TNG korisnièkog account-a. Molimo da se logirate na vaš TNG Admin account i dodijelite odgovarajuæe ovlasti novom account-u. Ako odobrite ovu registraciju, molim da obavjestite aplikanta na naèin da odgovorite na ovu poruku.";
< 		$text['accactive'] = "Korisnièki raèun je aktiviran, ali korisnik neæe imati posebna prava dok ih ne dodijeliti.";
< 		$text['accinactive'] = "Idite na Admin/Korisnici/Pregled za pristup postavke raèuna. Raèun æe ostati neaktivan sve dok se ne uredi i spremi zapis barem jedanput.";
---
> 		$text['email'] = "Vaša e-pošta";
> 		$text['address'] = "Adresa";
> 		$text['acctcomments'] = "Bilješke ili komentari";
> 		$text['submit'] = "Pošalji";
> 		$text['leaveblank'] = "(ostavite prazno ako tražite novo stablo)";
> 		$text['required'] = "Obavezna polja";
> 		$text['enterpassword'] = "Molimo unesite lozinku.";
> 		$text['enterusername'] = "Unesite korisni�ko ime.";
> 		$text['failure'] = "Žao nam je, ali korisni�ko ime koje ste unijeli već se koristi. Upotrijebite gumb Natrag u pregledniku da biste se vratili na prethodnu stranicu i odabrali drugo korisni�ko ime.";
> 		$text['success'] = "Hvala vam. Primili smo vašu registraciju. Kontaktirat ćemo vas kada je vaš ra�un aktivan ili ako su potrebne dodatne informacije.";
> 		$text['emailsubject'] = "Novi zahtjev za registraciju korisnika TNG-a";
> 		$text['website'] = "Web mjesto";
> 		$text['nologin'] = "Nemate prijavu?";
> 		$text['loginsent'] = "Podaci o prijavi su poslani";
> 		$text['loginnotsent'] = "Podaci o prijavi nisu poslani";
> 		$text['enterrealname'] = "Unesite svoje pravo ime.";
> 		$text['rempass'] = "Ostanite prijavljeni na ovom ra�unalu";
> 		$text['morestats'] = "Više statistike";
> 		$text['accmail'] = "<strong>NAPOMENA:</strong> Kako biste primali poštu od administratora web lokacije u vezi s vašim ra�unom, provjerite ne blokirate poštu s ove domene.";
> 		$text['newpassword'] = "Nova Lozinka";
> 		$text['resetpass'] = "Vraćanje izvorne lozinke";
> 		$text['nousers'] = "Ovaj se obrazac ne može upotrijebiti dok ne postoji barem jedan korisni�ki zapis. Ako ste vlasnik web mjesta, idite na Administrator / Korisnici da biste stvorili administratorski ra�un.";
> 		$text['noregs'] = "Žao nam je, ali trenutno ne prihvaćamo nove registracije korisnika. Molimo <a href=\"suggest.php\"> kontaktirajte nas</a> izravno ako imate komentare ili pitanja u vezi bilo �ega na ovoj web stranici.";
> 		$text['emailmsg'] = "Primili ste novi zahtjev za TNG korisni�ki ra�un. Prijavite se na svoje podru�je TNG Administrator i dodijelite odgovarajuća dopuštenja ovom novom ra�unu.";
> 		$text['accactive'] = "Ra�un je aktiviran, ali korisnik neće imati posebna prava dok ih ne dodijelite.";
> 		$text['accinactive'] = "Idite na Administrator / Korisnici / Pregled da biste pristupili postavkama ra�una. Ra�un će ostati neaktivan sve dok ga barem jednom ne uredite i spremite.";
554,558c639,642
< 		$text['enterpassword2'] = "Molim unesite vašu lozinku ponovo.";
< 		$text['pwdsmatch'] = "Vaše lozinke ne podudaraju.  Molim unesite istu lozinku u svako polje.";
< 		//added in 8.0.0
< 		$text['acksubject'] = "Hvala vam za registraciju"; //for a new user account
< 		$text['ackmessage'] = "Vaš zahtjev za korisnièki raèun zaprimljena. Vaš raèun æe biti neaktivan dok ga ne pregleda administrator web stranice. Biti æete obaviješteni putem email kada je Vaša prijava spreman za upotrebu.";
---
> 		$text['enterpassword2'] = "Molimo unesite lozinku ponovo.";
> 		$text['pwdsmatch'] = "Vaše lozinke se ne podudaraju. Unesite istu lozinku u svako polje.";
> 		$text['acksubject'] = "Hvala vam na registraciji"; //for a new user account
> 		$text['ackmessage'] = "Vaš zahtjev za korisni�ki ra�un je primljen. Vaš ra�un bit će neaktivan dok ga administrator web mjesta ne pregleda. Obavijestit ćete vas e-poštom kada je vaša prijava spremna za upotrebu.";
560c644,651
< 		$text['switch'] = "Switch";
---
> 		$text['switch'] = "Prekida�";
> 		//added in 14.0
> 		$text['newpassword2'] = "Opet nova lozinka";
> 		$text['resetsuccess'] = "USPJEH: Lozinka je poništena";
> 		$text['resetfail'] = "GREŠKA: Lozinka nije poništena";
> 		$text['failreason0'] = " (nepoznata greška baze podataka)";
> 		$text['failreason2'] = " (nemate dopuštenje promijeniti lozinku)";
> 		$text['failreason3'] = " (lozinke nisu odgovarale)";
565c656
< 		$text['browseallbranches'] = "Browse All Branches";
---
> 		$text['browseallbranches'] = "Pregledaj sve Grane stabla";
570c661
< 		$text['quantity'] = "Kolièina";
---
> 		$text['quantity'] = "Koli�ina";
572,575c663,666
< 		$text['totmales'] = "Ukupno muškaraca";
< 		$text['totfemales'] = "Ukupno žena";
< 		$text['totunknown'] = "Ukupno nepoznatih spolova";
< 		$text['totliving'] = "Ukuno živuæih";
---
> 		$text['totmales'] = "Ukupno muški";
> 		$text['totfemales'] = "Ukupno ženski";
> 		$text['totunknown'] = "Ukupno nepoznati spol";
> 		$text['totliving'] = "Ukupno živih";
582,584c673,675
< 		$text['avglifespan'] = "Prosjeèni životni vijek";
< 		$text['earliestbirth'] = "Najranije roðenje";
< 		$text['longestlived'] = "Najduže živio";
---
> 		$text['avglifespan'] = "Prosje�ni životni vijek";
> 		$text['earliestbirth'] = "Najranije rođenje";
> 		$text['longestlived'] = "Najduže živio";
586,588c677,679
< 		$text['age'] = "starost";
< 		$text['agedisclaimer'] = "Izraèun baziran na starosti je zasnovan na osobama sa upisanim datumima roðenja <EM>i</EM> smrti. Zbog nekompletiranih podataka u poljima za datum (npr., datum smrti je prikazan samo kao \"1945\" ili \"BEF 1860\"), ove kalkulacije ne mogu biti 100% toène.";
< 		$text['treedetail'] = "Više informacija o ovom stablu";
---
> 		$text['age'] = "Doba života";
> 		$text['agedisclaimer'] = "Izra�uni vezani za dob temelje se na pojedincima s evidentiranim datumima rođenja <em> i </em> datumima smrti. Zbog postojanja nepotpunih datumskih polja (npr., datum smrti naveden samo kao \"1945 \" ili \"BEF 1860 \"), ovi izra�uni ne mogu biti 100% to�ni.";
> 		$text['treedetail'] = "Više informacija o ovom stablu";
591c682,684
< 		$text['totdeceased'] = "Total Deceased";
---
> 		$text['totdeceased'] = "Ukupno umrlih";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Ukupni citati izvora";
595c688
< 		$text['browseallnotes'] = "Pretraži sve zabilješke";
---
> 		$text['browseallnotes'] = "Pregledajte sve bilješke";
599c692
< 		$text['menuhelp'] = "Kljuæ Menija";
---
> 		$text['menuhelp'] = "Tipka izbornika";
603,605c696,698
< 		$text['perms'] = "Dozvole su svi bili postavili.";
< 		$text['noperms'] = "Dozvole nisu mogle biti postavljena za ove datoteke:";
< 		$text['manual'] = "Molim da ih ruèno postavite.";
---
> 		$text['perms'] = "Dozvola su sva postavljena.";
> 		$text['noperms'] = "Za te datoteke nije moguće postaviti dopuštenja:";
> 		$text['manual'] = "Postavite ih ru�no.";
607,619c700,711
< 		$text['created'] = "je stoverena";
< 		$text['nocreate'] = "nije mogla se stvoriti.  Molimo kreirajte ga ruèno.";
< 		$text['infosaved'] = "Informacije spremljene, veza provjerena!";
< 		$text['tablescr'] = "Tablice su stvoreni!";
< 		$text['notables'] = "Sljedeæe tablice nisu se mogle stvoriti:";
< 		$text['nocomm'] = "TNG ne komunicira s Vašom bazom podataka.  Nijedne tablice su stvorene.";
< 		$text['newdb'] = "Informacije spremljene, veza provjerena, nova baza podataka stvorena:";
< 		$text['noattach'] = "Informacije spremljene, veza provjerena i nova baza podataka stvorena, ali TNG ne može priložiti za njega.";
< 		$text['nodb'] = "Informacije spremljene.  Veza provjerena, a baza podataka ne postoji i nije mogla se tu stvoriti.  Molimo provjerite je li naziv baze podataka toèna, ili pomoæu upravljaèke ploèe da ga stvorite.";
< 		$text['noconn'] = "Informacije spremljene ali veza nije uspjela.  Jedna ili više od sljedeæih je kriv:";
< 		$text['exists'] = "postoji";
< 		$text['loginfirst'] = "Morate se prvo logovati.";
< 		$text['noop'] = "Nije uèinjen operativni zahvat.";
---
> 		$text['created'] = "stvoreno je";
> 		$text['nocreate'] = "nije se moglo stvoriti. Stvorite ga ru�no.";
> 		$text['infosaved'] = "Podaci su sa�uvani, veza je provjerena!";
> 		$text['tablescr'] = "Tabele su stvorene!";
> 		$text['notables'] = "Sljedeće tablice nije bilo moguće stvoriti:";
> 		$text['nocomm'] = "TNG ne komunicira s vašom bazom podataka. Nisu stvorene tablice.";
> 		$text['newdb'] = "Podaci su sa�uvani, veza ovjerena, stvorena nova baza podataka:";
> 		$text['noattach'] = "Podaci su sa�uvani. Uspostavljena je veza i stvorena baza podataka, ali TNG se na nju ne može priklju�iti.";
> 		$text['nodb'] = "Podaci su sa�uvani. Veza je uspostavljena, ali baza podataka ne postoji i ne može se ovdje stvoriti. Provjerite je li naziv baze podataka to�an i ima li korisnik baze podataka pravilan pristup, ili je za to stvorite na upravlja�koj plo�i.";
> 		$text['noconn'] = "Podaci su sa�uvani, ali veza nije uspjela. Jedno ili više sljedećeg nisu to�ni:";
> 		$text['exists'] = "već postoji.";
> 		$text['noop'] = "Nije izvršena nijedna operacija.";
621,625c713,719
< 		$text['nouser'] = "Korisnik nije stvoren. Korisnièko ime veæ postoji.";
< 		$text['notree'] = "Stablo nije stvoren. Stablo ID možda veæ postoji.";
< 		$text['infosaved2'] = "Informacije spremljene";
< 		$text['renamedto'] = "preimenovana u";
< 		$text['norename'] = "nije moglo se preimenovati";
---
> 		$text['nouser'] = "Korisnik nije stvoren. Korisni�ko ime možda već postoji.";
> 		$text['notree'] = "Stablo nije stvoreno. ID stabla već može postojati.";
> 		$text['infosaved2'] = "Podaci su sa�uvani";
> 		$text['renamedto'] = "preimenovan u";
> 		$text['norename'] = "nije moguće preimenovati";
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Otkriveni su postojeći korisni�ki zapisi. Da biste nastavili prvo se morate prijaviti ili ukloniti sve zapise iz korisni�ke tablice.";
629,632c723,724
< 		$text['zoomin'] = "Približi";
< 		$text['zoomout'] = "Udalji";
< 		$text['magmode'] = "Moda Uveèavati";
< 		$text['panmode'] = "Moda Pomicanje";
---
> 		$text['magmode'] = "Uvećavanje";
> 		$text['panmode'] = "Panoramski Prikaz";
634,641c726,733
< 		$text['fitwidth'] = "Pristaj Širini";
< 		$text['fitheight'] = "Pristaj Visini";
< 		$text['newwin'] = "Novi prozor";
< 		$text['opennw'] = "Otvori sliku u novi prozor";
< 		$text['magnifyreg'] = "Kliknite poveæati jedno podruèje slike";
< 		$text['imgctrls'] = "Omoguæi Kontrole Slike";
< 		$text['vwrctrls'] = "Omoguæi Kontrole Razglednika Slike";
< 		$text['vwrclose'] = "Zatvori Razglednik Slika";
---
> 		$text['fitwidth'] = "Podesite Å¡irinu";
> 		$text['fitheight'] = "Podesite visina";
> 		$text['newwin'] = "Novi Prozor";
> 		$text['opennw'] = "Otvori sliku u novom prozoru";
> 		$text['magnifyreg'] = "Kliknite za povećanje regije na slici";
> 		$text['imgctrls'] = "Omogući kontrolu slike";
> 		$text['vwrctrls'] = "Omogućiti kontrolu pregleda�a slika";
> 		$text['vwrclose'] = "Zatvori preglednik slika";
645,647c737,739
< 		$text['test_date'] = "Test date";
< 		$text['links'] = "Relevant links";
< 		$text['testid'] = "Test ID";
---
> 		$text['test_date'] = "Datum testa";
> 		$text['links'] = "Relevantne poveznice";
> 		$text['testid'] = "ID Testa";
649,659c741,775
< 		$text['mode_values'] = "Mode Values";
< 		$text['compareselected'] = "Compare Selected";
< 		$text['dnatestscompare'] = "Compare Y-DNA Tests";
< 		$text['keep_name_private'] = "Keep Name Private";
< 		$text['browsealltests'] = "Browse All Tests";
< 		$text['all_dna_tests'] = "All DNA tests";
< 		$text['fastmutating'] = "Fast&nbsp;Mutating";
< 		$text['dna_info_head'] = "DNA Test Info";
< 		$text['alltypes'] = "All Types";
< 		$text['allgroups'] = "All Groups";
< 		$text['Ydna_LITbox_info'] = "Test(s) linked to this person were not necessarily taken by this person.<br />The 'Haplogroup' column displays data in red if the result is 'Predicted' or green if the test is 'Confirmed'";
---
> 		$text['mode_values'] = "Vrednost na�ina";
> 		$text['compareselected'] = "Usporedite odabrano";
> 		$text['dnatestscompare'] = "Usporedite Y-DNA testove";
> 		$text['keep_name_private'] = "Neka ime ostane Privatno";
> 		$text['browsealltests'] = "Pregledajte sve testove";
> 		$text['all_dna_tests'] = "Svi DNA testovi";
> 		$text['fastmutating'] = "Brzo&nbsp;Mutira";
> 		$text['alltypes'] = "Svi Tipovi";
> 		$text['allgroups'] = "Sve Grupe";
> 		$text['Ydna_LITbox_info'] = "Test (e) povezane s ovom osobom nije nužno uzela ta osoba. <br /> Stupac 'Haplogroup' prikazuje podatke crvenom bojom ako je rezultat 'Predviđen' ili zelenom bojom ako je test 'Potvrđen'";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Usporedite odabrane testove mtDNA";
> 		$text['dnatestscompare_atdna'] = "Usporedite odabrane testove atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "sekvenca";
> 		$text['extra_mutations'] = "Dodatne mutacije";
> 		$text['mrca'] = "MRC Predak";
> 		$text['ydna_test'] = "Y-DNA Testovi";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Testovi";
> 		$text['atdna_test'] = "atDNA (autosomal) Testovi";
> 		$text['segment_start'] = "Po�etak";
> 		$text['segment_end'] = "Kraj";
> 		$text['suggested_relationship'] = "Predložen";
> 		$text['actual_relationship'] = "Stvaran";
> 		$text['12markers'] = "Markeri 1-12";
> 		$text['25markers'] = "Markeri 13-25";
> 		$text['37markers'] = "Markeri 26-37";
> 		$text['67markers'] = "Markeri 38-67";
> 		$text['111markers'] = "Markeri 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Za usporedbu moraju se odabrati najmanje dva testa.";
664c780
< $text['matches'] = "Podudarnosti";
---
> $text['matches'] = "Me�";
666c782
< $text['notes'] = "Zabilješke";
---
> $text['notes'] = "Bilješke";
668,675c784,788
< $text['newsearch'] = "Novo pretraživanje";
< $text['pedigree'] = "Porijeklo";
< $text['birthabbr'] = "r.";
< $text['chrabbr'] = "k.";
< $text['seephoto'] = "Vidi fotografiju";
< $text['andlocation'] = "&amp; lokacija";
< $text['accessedby'] = "pristupao";
< $text['family'] = "Obitelj"; //from getperson
---
> $text['newsearch'] = "Nova Pretraga";
> $text['pedigree'] = "Pedigre";
> $text['seephoto'] = "Pogledajte fotografiju";
> $text['andlocation'] = "&amp; mjesto";
> $text['accessedby'] = "kojima pristupa";
680,682c793,795
< $text['thumb'] = "Slièica";  //as in Thumbnail
< $text['people'] = "Ljudi";
< $text['title'] = "Naslov";  //from getperson
---
> $text['thumb'] = "Sli�ica";  //as in Thumbnail
> $text['people'] = "Narod";
> $text['title'] = "Titula";  //from getperson
685,687c798,799
< $text['deathabbr'] = "s.";  //from descend
< $text['lastmodified'] = "Zadnji koji je modificiran";  //from getperson
< $text['married'] = "Oženjen";  //from getperson
---
> $text['lastmodified'] = "Zadnja promjena";  //from getperson
> $text['married'] = "Vjen�anje";  //from getperson
690,692c802,804
< $text['lastfirst'] = "Prezime, Ime(na)";  //from search
< $text['bornchr'] = "Roden/Kršten";  //from search
< $text['individuals'] = "Osoba";  //from whats new
---
> $text['lastfirst'] = "Prezime, Ime";  //from search
> $text['bornchr'] = "Rođen/Kršten";  //from search
> $text['individuals'] = "Pojedinci";  //from whats new
694c806
< $text['personid'] = "ID osobe";
---
> $text['personid'] = "ID Osobe";
699,702c811,814
< $text['christened'] = "Kršten";
< $text['died'] = "Umro";
< $text['buried'] = "Ukopan";
< $text['spouse'] = "Supruga";  //from search
---
> $text['christened'] = "Kršten";
> $text['died'] = "Smrt";
> $text['buried'] = "Pokopan";
> $text['spouse'] = "Suprog";  //from search
706,707c818
< $text['burialabbr'] = "ukop.";  //from descend
< $text['descendchart'] = "Potomci";
---
> $text['descendchart'] = "Potomak";
709c820
< $text['indinfo'] = "Osoba";
---
> $text['indinfo'] = "Pojedinac";
712,716c823,825
< $text['place'] = "Mjesto";
< $text['login'] = "Login";
< $text['logout'] = "Logout";
< $text['marrabbr'] = "v.";
< $text['groupsheet'] = "Grupni List";
---
> $text['login'] = "Prijava";
> $text['logout'] = "Odjava";
> $text['groupsheet'] = "Grupni list";
719c828
< $text['filename'] = "Ime datoteke";
---
> $text['filename'] = "Ime Datoteke";
721c830
< $text['search'] = "Traži";
---
> $text['search'] = "Traži";
725,730c834,839
< $text['searchresults'] = "Pretraži rezultate";
< $text['diedburied'] = "Umro/Ukopan";
< $text['homepage'] = "Poèetna Stranica";
< $text['find'] = "Naði...";
< $text['relationship'] = "Veza";		//in German, Verwandtschaft
< $text['relationship2'] = "Veza"; //different in some languages, at least in German (Beziehung)
---
> $text['searchresults'] = "Rezultati pretraživanja";
> $text['diedburied'] = "Umrp/Pokopan";
> $text['homepage'] = "Po�etna Strana";
> $text['find'] = "Traži...";
> $text['relationship'] = "Srodstvo";		//in German, Verwandtschaft
> $text['relationship2'] = "Srodstvo"; //different in some languages, at least in German (Beziehung)
732,734c841,843
< $text['yesabbr'] = "D";               //abbreviation for 'yes'
< $text['divorced'] = "Razveden";
< $text['indlinked'] = "Vezan za";
---
> $text['yesabbr'] = "Da";               //abbreviation for 'yes'
> $text['divorced'] = "Rastavljen";
> $text['indlinked'] = "Povezan sa";
736,748c845,856
< $text['moreind'] = "Više osoba";
< $text['morefam'] = "Više obitelji";
< $text['source'] = "Izvor";
< $text['surnamelist'] = "Lista prezimena";
< $text['generations'] = "Generacije";
< $text['refresh'] = "Osvježi";
< $text['whatsnew'] = "Što je novo dodano";
< $text['reports'] = "Izvješæa";
< $text['placelist'] = "Lista mjesta";
< $text['baptizedlds'] = "Kršten (LDS)";
< $text['endowedlds'] = "Endowed (LDS)";
< $text['sealedplds'] = "Sealed P (LDS)";
< $text['sealedslds'] = "Sealed S (LDS)";
---
> $text['moreind'] = "Više osoba";
> $text['morefam'] = "Više obitelji";
> $text['surnamelist'] = "Popis prezimena";
> $text['generations'] = "Generacija";
> $text['refresh'] = "Osvježiti";
> $text['whatsnew'] = "Novosti";
> $text['reports'] = "Izveštaji";
> $text['placelist'] = "Popis mjesta";
> $text['baptizedlds'] = "Kršten (LDS)";
> $text['endowedlds'] = "Obdaren (LDS)";
> $text['sealedplds'] = "Zape�aćen P (LDS)";
> $text['sealedslds'] = "Zape�aćen S (LDS)";
750c858
< $text['descendants'] = "Djeca";
---
> $text['descendants'] = "Potomci";
752c860
< $text['lastimportdate'] = "Datum zadnjeg GEDCOM uvoza";
---
> $text['lastimportdate'] = "Datum zadnjeg uvoza GEDCOM-a";
754,757c862,865
< $text['savechanges'] = "Pohrani promjene";
< $text['familyid'] = "ID obitelji";
< $text['headstone'] = "Nadgrobni spomenik";
< $text['historiesdocs'] = "Povijesti";
---
> $text['savechanges'] = "Sa�uvaj";
> $text['familyid'] = "Porodi�ni ID";
> $text['headstone'] = "Spomenik";
> $text['historiesdocs'] = "Historije";
760c868
< $text['anniversaries'] = "Datumi & Obljetnice";
---
> $text['anniversaries'] = "Datumi i godišnjice";
762c870
< $text['help'] = "Pomoæ";
---
> $text['help'] = "Pomoć";
765,773c873,879
< $text['all'] = "Svi";
< $text['repository'] = "Repozitorij";
< $text['address'] = "Adrese";
< $text['suggest'] = "Sugestija";
< $text['editevent'] = "Predloži promjenu za ovaj dogadaj";
< $text['findplaces'] = "Pronaði sve osobe koji imaju dogaðaje na ovoj lokaciji";
< $text['morelinks'] = "Više linkova";
< $text['faminfo'] = "Obiteljska informacija";
< $text['persinfo'] = "Osobna informacija";
---
> $text['all'] = "Sve";
> $text['address'] = "Adresa";
> $text['suggest'] = "Predložiti";
> $text['editevent'] = "Predložite promjenu za ovaj događaj";
> $text['morelinks'] = "Više veza";
> $text['faminfo'] = "Obiteljske informacije";
> $text['persinfo'] = "Osobne informacije";
775,778c881,884
< $text['fact'] = "Èinjenice";
< $text['goto'] = "Selektiraj stranicu";
< $text['tngprint'] = "Print";
< $text['databasestatistics'] = "Statistike"; //needed to be shorter to fit on menu
---
> $text['fact'] = "ÄŒinjenica";
> $text['goto'] = "Odaberite stranicu";
> $text['tngprint'] = "Å tampaj";
> $text['databasestatistics'] = "Statistika"; //needed to be shorter to fit on menu
780,782c886,888
< $text['repoinfo'] = "Informcija Repozitorije";
< $text['tng_reset'] = "Vrati u poèetno stanje";
< $text['noresults'] = "Rezultati nisu naðeni";
---
> $text['repoinfo'] = "Informacije o spremištu";
> $text['tng_reset'] = "Ponovo postaviti";
> $text['noresults'] = "Nema rezultata";
784c890
< $text['repositories'] = "Repozitorije";
---
> $text['repositories'] = "Sigurno Spremište";
789,799c895,905
< $text['link'] = "Linkovi";
< $text['media'] = "Mediji";
< $text['gender'] = "Spol";
< $text['latitude'] = "Geografska Širina";
< $text['longitude'] = "Geografska Dužina";
< $text['bookmarks'] = "Oznaka";
< $text['bookmark'] = "Dodaj Oznaku";
< $text['mngbookmarks'] = "Idi na Oznake";
< $text['bookmarked'] = "Oznak dodan";
< $text['remove'] = "Obriši";
< $text['find_menu'] = "Naði";
---
> $text['link'] = "Veza";
> $text['media'] = "Medija";
> $text['gender'] = "Pol";
> $text['latitude'] = "Zemljopisna Å¡irina";
> $text['longitude'] = "Zemljopisna dužina";
> $text['bookmarks'] = "Bookmarks";
> $text['bookmark'] = "Dodaj Bookmark";
> $text['mngbookmarks'] = "Idi do Bookmarka";
> $text['bookmarked'] = "Bookmark dodan";
> $text['remove'] = "Ukloni";
> $text['find_menu'] = "Traži";
801,813c907,918
< $text['cemetery'] = "Groblja";
< $text['gmapevent'] = "Karta dogaðaja";
< $text['gevents'] = "Dogaðaj";
< $text['glang'] = "&amp;hl=hr";
< $text['googleearthlink'] = "Link na Google Earth";
< $text['googlemaplink'] = "Link na Google Maps";
< $text['gmaplegend'] = "Legenda Igle";
< $text['unmarked'] = "Nije oznaèeno";
< $text['located'] = "Locirano";
< $text['albclicksee'] = "Kliknite da vidite sve stavke iz ovog albuma";
< $text['notyetlocated'] = "Ne još naðeno";
< $text['cremated'] = "Spaljen";
< $text['missing'] = "Fali";
---
> $text['cemetery'] = "Groblje";
> $text['gmapevent'] = "Mapa Događaja";
> $text['gevents'] = "Događaj";
> $text['googleearthlink'] = "Veza za Google Earth";
> $text['googlemaplink'] = "Veza za Google Maps";
> $text['gmaplegend'] = "Oznake Legende";
> $text['unmarked'] = "Ne obilježen";
> $text['located'] = "Smješten";
> $text['albclicksee'] = "Kliknite da biste vidjeli sve stavke u ovom albumu";
> $text['notyetlocated'] = "Još se ne nalazi";
> $text['cremated'] = "Kremiran";
> $text['missing'] = "Nedostaje";
815,816c920
< $text['blank'] = "Prazan Dijagram";
< $text['none'] = "Ništa";
---
> $text['blank'] = "Prazan Grafikon";
820,829c924,933
< $text['pgsetup'] = "Postavke Stranice";
< $text['pgsize'] = "Velièina Stranice";
< $text['orient'] = "Orientacija"; //for a page
< $text['portrait'] = "Uspravno";
< $text['landscape'] = "Vodoravno";
< $text['tmargin'] = "Gornja Margina";
< $text['bmargin'] = "Donja Margina";
< $text['lmargin'] = "Lijeva Margin";
< $text['rmargin'] = "Desna Margin";
< $text['createch'] = "Kreiraj Dijagram";
---
> $text['pgsetup'] = "Podešavanje stranice";
> $text['pgsize'] = "Veli�ina stranice";
> $text['orient'] = "Orijentacija"; //for a page
> $text['portrait'] = "Portret";
> $text['landscape'] = "Pejzažna";
> $text['tmargin'] = "Gornja marža";
> $text['bmargin'] = "Goljnja marža";
> $text['lmargin'] = "Ljeva marža";
> $text['rmargin'] = "Desna marža";
> $text['createch'] = "Stvorite Grafikon";
831,833c935,937
< $text['mostwanted'] = "Naj Željeni";
< $text['latupdates'] = "Najnovije Dopune";
< $text['featphoto'] = "Prikazana Fotografija";
---
> $text['mostwanted'] = "Najtraženiji";
> $text['latupdates'] = "Najnovija ažuriranja";
> $text['featphoto'] = "Izdvojena fotografija";
835,838c939,942
< $text['ourhist'] = "Naša Obiteljska Povijest";
< $text['ourhistanc'] = "Naša Obiteljska Povijest i Porijeklo";
< $text['ourpages'] = "Stranice Genealogije Naše Obitelj";
< $text['pwrdby'] = "Ova stranica omoguæena sa";
---
> $text['ourhist'] = "Naš Obitelji Povijest";
> $text['ourhistanc'] = "Naša obiteljska povijest i rodovina";
> $text['ourpages'] = "Naše obiteljske rodoslovne stranice";
> $text['pwrdby'] = "Ovu web lokaciju pokreće";
840,841c944,945
< $text['searchtngnet'] = "Traži TNG Mrežu (GENDEX)";
< $text['viewphotos'] = "Vidi sve fotografije";
---
> $text['searchtngnet'] = "Traži TNG Mrežu (GENDEX)";
> $text['viewphotos'] = "Pogledaj sve fotografije";
843,846c947,950
< $text['whichbranch'] = "Od koje grane ste vi?";
< $text['featarts'] = "Izabrani èlanci";
< $text['maintby'] = "Izdržava";
< $text['createdon'] = "Kreirano na";
---
> $text['whichbranch'] = "Kojoj grani pripadaš?";
> $text['featarts'] = "Članci o zna�ajkama";
> $text['maintby'] = "Održava";
> $text['createdon'] = "Napravljeno na";
849,852c953,956
< $text['inclsrcs'] = "Ukljuèi Izvore";
< $text['cont'] = "(dalje)"; //abbreviation for continued
< $text['mnuheader'] = "Poèetna Stranica";
< $text['mnusearchfornames'] = "Traži Imena";
---
> $text['inclsrcs'] = "Uklju�uju Izvore";
> $text['cont'] = "(nastav.)"; //abbreviation for continued
> $text['mnuheader'] = "Po�etna Strana";
> $text['mnusearchfornames'] = "Potraži";
855,861c959,965
< $text['mnusearch'] = "Traži";
< $text['mnureset'] = "Poèni ispoèetka";
< $text['mnulogon'] = "Login";
< $text['mnulogout'] = "Logout";
< $text['mnufeatures'] = "Ostale opcije";
< $text['mnuregister'] = "Registriraj se za korisnicki raèun";
< $text['mnuadvancedsearch'] = "Napredno pretraživanje";
---
> $text['mnusearch'] = "Traži";
> $text['mnureset'] = "Po�eti ispo�etka";
> $text['mnulogon'] = "Prijaviti se";
> $text['mnulogout'] = "Odjavite se";
> $text['mnufeatures'] = "Druge zna�ajke";
> $text['mnuregister'] = "Registrirajte se za korisni�ki ra�un";
> $text['mnuadvancedsearch'] = "Napredna pretraga";
865,866c969,970
< $text['mnuhistories'] = "Povijest";
< $text['mnumyancestors'] = "Fotografije &amp; Povijest predaka od [Person]";
---
> $text['mnuhistories'] = "Povijesti";
> $text['mnumyancestors'] = "Fotografije &amp; Povijesti za Pretke od [Person]";
868,869c972,973
< $text['mnutombstones'] = "Nadgobni spomenici";
< $text['mnureports'] = "Izvješca";
---
> $text['mnutombstones'] = "Nadgrobni Spomenici";
> $text['mnureports'] = "Izveštaji";
871,872c975,976
< $text['mnuwhatsnew'] = "Što je novog";
< $text['mnushowlog'] = "Zapis pristupa";
---
> $text['mnuwhatsnew'] = "Novosti";
> $text['mnushowlog'] = "Dnevnik pristupa";
875c979
< $text['welcome'] = "Dobrodošli";
---
> $text['welcome'] = "Dobrodošli";
878,879c982,983
< $text['born'] = "Roðen";
< $text['searchnames'] = "Traži imena";
---
> $text['born'] = "Rođen";
> $text['searchnames'] = "Pretražite osobe";
881,884c985,988
< $text['editperson'] = "Uredi Osobu";
< $text['loadmap'] = "Uèitaj kartu";
< $text['birth'] = "Roðenje";
< $text['wasborn'] = "je roðen/roðena";
---
> $text['editperson'] = "Uredi osobu";
> $text['loadmap'] = "U�itajte kartu";
> $text['birth'] = "Rođen";
> $text['wasborn'] = "rođen je";
886c990
< $text['searching'] = "Pretraživanje";
---
> $text['searching'] = "Pretraživanje";
888c992
< $text['location'] = "Lokacija";
---
> $text['location'] = "Mjesto";
890,893c994,997
< $text['collapse'] = "Skupi";
< $text['expand'] = "Ekspandiraj";
< $text['plot'] = "Iscrtaj";
< $text['searchfams'] = "Traži Obitelji";
---
> $text['collapse'] = "Kolaps";
> $text['expand'] = "Proširi";
> $text['plot'] = "Crtaj";
> $text['searchfams'] = "Potraži Obitelji";
895c999
< $text['wasmarried'] = "Oženjen";
---
> $text['wasmarried'] = "Vjen�an";
898,906c1002,1010
< $text['share'] = "Share";
< $text['hide'] = "Hide";
< $text['disabled'] = "Your user account has been disabled. Please contact the site administrator for more information.";
< $text['contactus_long'] = "If you have any questions or comments about the information on this site, please <span class=\"emphasis\"><a href=\"suggest.php\">contact us</a></span>. We look forward to hearing from you.";
< $text['features'] = "Features";
< $text['resources'] = "Resources";
< $text['latestnews'] = "Latest News";
< $text['trees'] = "Trees";
< $text['wasburied'] = "was buried";
---
> $text['share'] = "Djeli";
> $text['hide'] = "Sakri";
> $text['disabled'] = "Vaš korisni�ki nalog je isklju�en. Kontaktirajte administratora sajta za više informacija.";
> $text['contactus_long'] = "Ako imate bilo kakvih pitanja ili komentara o podacima na ovoj stranici, molimo <span class = \"emphasis\"> <a href=\"suggest.php\"> kontaktirajte nas</a> </span>. Radujemo se što ćete se javiti nam.";
> $text['features'] = "Zna�ajke";
> $text['resources'] = "Resursi";
> $text['latestnews'] = "Najnovije Vjesti";
> $text['trees'] = "Porodi�na stabla";
> $text['wasburied'] = "pokopan je";
908,911c1012,1015
< $text['emailagain'] = "Email ponovo";
< $text['enteremail2'] = "Molim unesite Vašu email adresu ponovo.";
< $text['emailsmatch'] = "Vaše email adrese ne podudaraju.  Molim unesite istu email adresu u svako polje.";
< $text['getdirections'] = "Kliknite za dobiti upute";
---
> $text['emailagain'] = "e-poštu ponovi";
> $text['enteremail2'] = "Ponovno unesite svoju adresu e-pošte.";
> $text['emailsmatch'] = "Vaše se adrese e-pošte ne podudaraju. Unesite istu adresu e-pošte u svako polje.";
> $text['getdirections'] = "Kliknite za upute";
914,918c1018,1022
< $text['directionsto'] = " na ";
< $text['slidestart'] = "Pokreni Pokaz Prezentacije";
< $text['livingnote'] = "Najmanje jedna živuæa osoba je vezana za ovaj zapis - Detalji zadržani.";
< $text['livingphoto'] = "Najmanje jedna živuæa osoba je vezana za ovaj item - detalji pridržani.";
< $text['waschristened'] = "Kršten";
---
> $text['directionsto'] = " do ";
> $text['slidestart'] = "Prezentacija slike";
> $text['livingnote'] = "Barem jedan živi ili privatni pojedinac povezan je s ovom bilješkom - Zadržani su detalji.";
> $text['livingphoto'] = "Najmanje jedan živi ili privatni pojedinac povezan je s ovom stavkom - Zadržani su detalji.";
> $text['waschristened'] = "je Kršten";
920,927c1024,1030
< $text['branches'] = "Branches";
< $text['detail'] = "Detail";
< $text['moredetail'] = "More detail";
< $text['lessdetail'] = "Less detail";
< $text['otherevents'] = "Ostali dogaðaji";
< $text['conflds'] = "Confirmed (LDS)";
< $text['initlds'] = "Initiatory (LDS)";
< $text['wascremated'] = "was cremated";
---
> $text['branches'] = "Grane";
> $text['detail'] = "Detalj";
> $text['moredetail'] = "Više detalja";
> $text['lessdetail'] = "Manje detalja";
> $text['conflds'] = "Potvrđen (LDS)";
> $text['initlds'] = "Uvodni (LDS)";
> $text['wascremated'] = "je kremiran";
931,940c1034,1043
< $text['searchsite'] = "Search this site";
< $text['searchsitemenu'] = "Search Site";
< $text['kmlfile'] = "Download a .kml file to show this location in Google Earth";
< $text['download'] = "Click to download";
< $text['more'] = "Više";
< $text['heatmap'] = "Heat Map";
< $text['refreshmap'] = "Refresh Map";
< $text['remnums'] = "Clear Numbers and Pins";
< $text['photoshistories'] = "Photos &amp; Histories";
< $text['familychart'] = "Family Chart";
---
> $text['searchsite'] = "Pretražite ove web stranice";
> $text['searchsitemenu'] = "Pretraga sajta";
> $text['kmlfile'] = "Preuzmite .kml datoteku da biste prikazali ovu lokaciju u Google Earth";
> $text['download'] = "Kliknite za preuzimanje";
> $text['more'] = "Više";
> $text['heatmap'] = "Topline Mapa";
> $text['refreshmap'] = "Osviježite Mapu";
> $text['remnums'] = "Obrisati Brojeve i oznake";
> $text['photoshistories'] = "Fotografije &amp; Povijesti";
> $text['familychart'] = "Grafikon Obitelji";
942c1045
< $text['firstnames'] = "First Names";
---
> $text['firstnames'] = "Imena";
945,948c1048,1051
< $text['test_type'] = "Test type";
< $text['test_info'] = "Test Information";
< $text['takenby'] = "Taken by";
< $text['haplogroup'] = "Haplogroup";
---
> $text['test_type'] = "Tip Testa";
> $text['test_info'] = "Informacije o testu";
> $text['takenby'] = "Test uzet od";
> $text['haplogroup'] = "Haplogrupa";
951,954c1054,1055
< $text['relevant_links'] = "Relevant links";
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
< $text['nofirstname'] = "[no first name]";
---
> $text['relevant_links'] = "Relevantne poveznice";
> $text['nofirstname'] = "[bez imena]";
956,965c1057,1117
< $text['cookieuse'] = "Note: This site uses cookies.";
< $text['dataprotect'] = "Data Protection Policy";
< $text['viewpolicy'] = "View policy";
< $text['understand'] = "I understand";
< $text['consent'] = "I give my consent for this site to store the personal information collected here. I understand that I may ask the site owner to remove this information at any time.";
< $text['consentreq'] = "Please give your consent for this site to store personal information.";
< 
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> $text['cookieuse'] = "NAPOMENA: Ova web stranica koristi kola�iće.";
> $text['dataprotect'] = "Zaštite Podataka";
> $text['viewpolicy'] = "Pogledajte dokumenat";
> $text['understand'] = "Razumijem";
> $text['consent'] = "Dajem pristanak na ovom web mjestu za pohranjivanje ovdje prikupljenih osobnih podataka. Razumijem da mogu tražiti od vlasnika web lokacije da ukloni ove podatke u bilo kojem trenutku.";
> $text['consentreq'] = "Molimo dajte svoj pristanak za ovu web stranicu za pohranu osobnih podataka.";
> 
> //added in 12.1.0
> $text['testsarelinked'] = "DNA testovi su povezani sa";
> $text['testislinked'] = "DNA test je povezan sa";
> 
> //added in 12.2
> $text['quicklinks'] = "Brze veze";
> $text['yourname'] = "Tvoje ime";
> $text['youremail'] = "Tvoja e-pošta adresa";
> $text['liketoadd'] = "Sve podatke koje želite dodati";
> $text['webmastermsg'] = "Poruka za Webmastere";
> $text['gallery'] = "Pogledaj Galeriju";
> $text['wasborn_male'] = "je rođen";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "je rođena"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "je kršten";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "je krštena";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "je umro";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "je umrla";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "je pokopan"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "je pokopana"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "je kremiran";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "je kremirana";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "oženjen";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "udata";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "je razveden";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "je razvedena";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " na ";			// used as a preposition to the location
> $text['onthisdate'] = " na ";		// when used with full date
> $text['inthisyear'] = " u godini ";		// when used with year only or month / year dates
> $text['and'] = "i ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Informacija";
> //added in 13.0
> $text['visitor'] = "Gost";
> 
> $text['popupnote2'] = "= Novi redovnik";
> 
> //moved here in 14.0
> $text['zoomin'] = "Povećaj";
> $text['zoomout'] = "Smanji";
> $text['scrollnote'] = "Povucite ili pomi�ite se da biste vidjeli više grafikona.";
> $text['general'] = "Općenito";
> 
> //changed in 14.0
> $text['otherevents'] = "Ostali događaji i atributi";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Veze";
> $text['continue'] = "Nastavi";
> $text['title2'] = "Naslov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Croatian-UTF8/admintext.php TNG1403/languages/Croatian-UTF8/admintext.php
5,6c5,6
< 		$admtext['branchlabel'] = "Labela grane";
< 		$admtext['existingbranch'] = "Postojeca grana";
---
> 		$admtext['branchlabel'] = "Oznaka Grane";
> 		$admtext['existingbranch'] = "Postojeća grana";
10,22c10,22
< 		$admtext['descofanc'] = "Generacije djece od svakog pretka";
< 		$admtext['descendants'] = "Djeca";
< 		$admtext['includespouses'] = "Ukljuci supruge od djece";
< 		$admtext['partial'] = "Djelomican";
< 		$admtext['addlabels'] = "Dodaj labele";
< 		$admtext['clearlabels'] = "Ocisti labele";
< 		$admtext['clearingbranch'] = "Ocisti labele grana";
< 		$admtext['addingbranch'] = "Dodaj labele grana";
< 		$admtext['totalaffected'] = "Ukupno Affected";
< 		$admtext['labelmore'] = "Oznaci više grana";
< 		$admtext['enterbranch'] = "Molim oznaci postojecu granu ili unesi novu.";
< 		$admtext['enterstartingind'] = "Molim unesi ID pocetne osobe.";
< 		$admtext['gensnumeric'] = "Vrijednost za pretke i djecu mora biti numerik.";
---
> 		$admtext['descofanc'] = "Potomak generacija za svakog pretka";
> 		$admtext['descendants'] = "Potomci";
> 		$admtext['includespouses'] = "Uklju�ite supružnike potomaka";
> 		$admtext['partial'] = "Djelimi�no";
> 		$admtext['addlabels'] = "Dodaj oznaku";
> 		$admtext['clearlabels'] = "Obriši oznaku";
> 		$admtext['clearingbranch'] = "Obriši Oznaku Grane";
> 		$admtext['addingbranch'] = "Dodaj Oznaku Grane";
> 		$admtext['totalaffected'] = "Ukupno Pogođeni";
> 		$admtext['labelmore'] = "Ozna�ite više Grana";
> 		$admtext['enterbranch'] = "Molim ozna�i postojeću granu ili unesi novu.";
> 		$admtext['enterstartingind'] = "Molim unesi ID po�etne osobe.";
> 		$admtext['gensnumeric'] = "Vrednosti za pretke i potomke moraju biti numeri�ke.";
24c24
< 		$admtext['branchid'] = "ID grane";
---
> 		$admtext['branchid'] = "ID Grane";
26,30c26,30
< 		$admtext['createbranch'] = "Kreiraj polje nove grane";
< 		$admtext['existingbranchinfo'] = "Postojeca informacija o grani";
< 		$admtext['editexistingbranch'] = "Uredi informaciju prethodno unesene grane";
< 		$admtext['confbranchdelete'] = "Da li ste sigurni da želite obrisati ovu granu?";
< 		$admtext['enterbranchid'] = "Molim uniesite ID grane.";
---
> 		$admtext['createbranch'] = "Stvorite zapis za novu granu";
> 		$admtext['existingbranchinfo'] = "Postojećoj informacija o grani";
> 		$admtext['editexistingbranch'] = "Uredite podatke za prethodno unesenu granu";
> 		$admtext['confbranchdelete'] = "Da li ste sigurni da hoćete obrisati ovu granu?";
> 		$admtext['enterbranchid'] = "Molim unesite ID grane.";
33c33
< 		$admtext['modifybranch'] = "Modificiraj postojecu granu";
---
> 		$admtext['modifybranch'] = "Modificiraj postojeće grane";
35,42c35,42
< 		$admtext['existlabels'] = "Postojece labele";
< 		$admtext['leave'] = "Leave";
< 		$admtext['append'] = "Append all records";
< 		$admtext['showpeople'] = "Prikaži ljude s ovim stablom/granom";
< 		$admtext['branchdiscl'] = "Ovaj broj reprezentira total broj linkova grana, ne nužno i broj ljudi ili obitelji trenutno vezani za ovu granu. Ako ste nedvno uvezli vaše podatke, vjerojatno trebate ponovno labelirati vaše grane.";
< 		$admtext['inclspouses'] = "Include spouses for all descendants";
< 		$admtext['delpeople'] = "Delete people and families with this branch label";
< 		$admtext['confbrdel'] = "Are you sure you want to delete all people and families with this branch label?";
---
> 		$admtext['existlabels'] = "Postojeće oznake";
> 		$admtext['leave'] = "Ostavi";
> 		$admtext['append'] = "Dodaj sve zapise";
> 		$admtext['showpeople'] = "Prikaži osobe u ovim drvetu/granom";
> 		$admtext['branchdiscl'] = "Ovaj broj predstavlja ukupan broj grana linkova, a ne nužno broj osoba ili porodica koji su trenutno vezani s ovom granom. Ako ste nedavno ponovo uveli podatke, možda ćete trebati ponovo povezati svoje grane.";
> 		$admtext['inclspouses'] = "Uklju�i supružnike za sve potomke";
> 		$admtext['delpeople'] = "Izbrišite ljude i obitelji s ovom oznakom grane";
> 		$admtext['confbrdel'] = "Da li ste sigurni da želite da izbrišete sve osobe i obitelji sa ovom oznakom grane?";
47c47
< 		$admtext['mapnotcopied'] = "Ne mogu kopirati map image file ";
---
> 		$admtext['mapnotcopied'] = "Datoteku slike nije moguće kopirati u";
49c49
< 		$admtext['modifycemetery'] = "Promijeni postojece groblje";
---
> 		$admtext['modifycemetery'] = "Promjene postojećeg groblja";
51,56c51,56
< 		$admtext['createnewcemetery'] = "Kreiraj rekord o novom groblju";
< 		$admtext['selectcemaction'] = "Selektiraj groblje i akciju";
< 		$admtext['location'] = "Location";
< 		$admtext['confdeletecem'] = "Da li ste sigurni da želite obrisati ovo groblje?";
< 		$admtext['editceminfo'] = "Uredi informaciju o prethodno unešenom groblju";
< 		$admtext['leaveblankallcems'] = "ostavi prazno za listu svih groblja";
---
> 		$admtext['createnewcemetery'] = "Stvori zapis za novo groblje";
> 		$admtext['selectcemaction'] = "Odaberi groblje i akciju";
> 		$admtext['location'] = "Mjesto";
> 		$admtext['confdeletecem'] = "Da li ste sigurni da hoćete da obrišete odabrano groblje?";
> 		$admtext['editceminfo'] = "Uredi informacija o prethodno upisanom groblju";
> 		$admtext['leaveblankallcems'] = "ostavi prazno da biste pokazali sva groblja";
58c58
< 		$admtext['mapfilename'] = "Map File Name";
---
> 		$admtext['mapfilename'] = "Ime mape";
60c60
< 		$admtext['stateprovince'] = "Država/Provincija";
---
> 		$admtext['stateprovince'] = "Država/Pokrajna";
62,63c62,63
< 		$admtext['entermapfile'] = "Molim unesite naziv datoteke vaše map datoteke na web serveru.";
< 		$admtext['existingceminfo'] = "Postojeca informacija o groblju";
---
> 		$admtext['entermapfile'] = "Molim unesite naziv datoteke  za vaše mape datoteke na web serveru.";
> 		$admtext['existingceminfo'] = "Postojećem informacija o groblju";
65,68c65,68
< 		$admtext['maptoupload'] = "Map image za upload";
< 		$admtext['mapfilenamefolder'] = "Map File Name<br/>sa folderom nadgrobnog spomenika";
< 		$admtext['ifmapuploaded'] = "Ostavi ovo polje prazno ako je datoteka vec upload-irana u vaš folder nadgrobnih spomenika.";
< 		$admtext['requiredmap'] = "Potrebno ako koristite mapu. To treba korespondirati s nazivom i lokacijom vaše datoteke <em>unutar foldera nadgrobnih spomenika</em> kada je datoteka upload-irana. Npr. ako je vaš folder nadgrobnih spomenika zove <em>headstones</em>,	i ako želite da se vaša datoteka zove <em>map.jpg</em> i ako odete u subfolder od nadgrobnih spomenika koji se zove <em>mymaps</em>, možete unijeti <em>mymaps/map.jpg</em> u ovom polju.";
---
> 		$admtext['maptoupload'] = "Slika karte za prijenos";
> 		$admtext['mapfilenamefolder'] = "Naziv datoteke mape<br/>unutar mape Spomenika";
> 		$admtext['ifmapuploaded'] = "Ostavite ovo polje prazno ako je datoteka već prenesena u mapu nadgrobnih spomenika.";
> 		$admtext['requiredmap'] = "Obavezno ako koristite kartu. Ovo bi trebalo odgovarati imenu i lokaciji vaše datoteke <em>unutar mape nadgrobnih spomenika </em>nakon prijenosa datoteke. Na primjer, ako se vaša mapa spomenika zove <em> spomenik </em>, a želite da se vaša datoteka zove <em> map.jpg </em> i upišete se u podmapu nadgrobnih spomenika pod nazivom <em> mymaps </ em>, u ovo polje biste unijeli <em> mymaps / map.jpg </em>.";
70,72c70,72
< 		$admtext['linkplace'] = "Associated Place";
< 		$admtext['fillplace'] = "Fill Place";
< 		$admtext['usecemcoords'] = "Copy the geocode information below to this place";
---
> 		$admtext['linkplace'] = "Pridruženo mjesto";
> 		$admtext['fillplace'] = "Mjesto za popunjavanje";
> 		$admtext['usecemcoords'] = "Kopirajte donje podatke o geokodu na ovo mjesto";
77c77
< 		$admtext['alreadyexists'] = "vec postoji";
---
> 		$admtext['alreadyexists'] = "već postoji";
79,81c79,80
< 		$admtext['enternew'] = "Unesi novi";
< 		$admtext['pleaseenter'] = "Molim unesi ";
< 		$admtext['netscapereload'] = "Netscape korisnici: <br/>Moraš ponovno ucitati stranicu s grobljima da biste vidjeli vaš novi unos";
---
> 		$admtext['enternew'] = "Unesi novo";
> 		$admtext['netscapereload'] = "Netscape korisnici: <br/>Morate ponovo u�itati stranicu Groblja da biste videli novo";
86,87c85,86
< 		$admtext['deletingnote'] = "Brišem zabilješku...";
< 		$admtext['addingnote'] = "Dodajem zabilješku...";
---
> 		$admtext['deletingnote'] = "Brisanje zabilješke...";
> 		$admtext['addingnote'] = "Dodavanje zabelješke...";
90c89
< 		$admtext['modifynote'] = "Promijeni zabilješku";
---
> 		$admtext['modifynote'] = "Uredi zabilješku";
92c91
< 		$admtext['notechanges'] = "Changes to note";
---
> 		$admtext['notechanges'] = "Uredi tekst zabilješke";
97,101c96,100
< 		$admtext['addingevent'] = "Dodavanje dogadaja...";
< 		$admtext['deletingevent'] = "Brisanje dogadaja...";
< 		$admtext['updatingevent'] = "Ažuriraj dogadaj...";
< 		$admtext['modifyevent'] = "Promijeni dogadaj";
< 		$admtext['addnewevent'] = "Dodaj novi dogadaj";
---
> 		$admtext['addingevent'] = "Dodavanje događaja...";
> 		$admtext['deletingevent'] = "Brisanje događaja...";
> 		$admtext['updatingevent'] = "Ažuriranje događaja...";
> 		$admtext['modifyevent'] = "Uredi događaja";
> 		$admtext['addnewevent'] = "Dodaj novi događaja";
105c104
< 		$admtext['agency'] = "Agency";
---
> 		$admtext['agency'] = "Agencija";
107c106
< 		$admtext['moreinfo'] = "Više informacija";
---
> 		$admtext['moreinfo'] = "Više informacije";
109c108
< 		$admtext['dupfor'] = "Duplicate for";
---
> 		$admtext['dupfor'] = "Duplikat za";
121c120
< 		$admtext['treeexists'] = "Another tree already exists with the selected ID. Please select a different ID and try again.";
---
> 		$admtext['treeexists'] = "Već jedno stablo postoji s odabranim ID-om. Odaberite drugi ID i pokušajte ponovo.";
123,128c122,162
< 		$admtext['moreoptions'] = "More Options";
< 		$admtext['removeged'] = "Delete GEDCOM file (optional)";
< 		$admtext['cannotupload'] = "Could not upload file:";
< 		$admtext['invfperms'] = "Your 'gedcom' folder may have inadequate permissions (try 755 or 777).";
< 		$admtext['maybedone'] = "It may have already finished.";
< 		$admtext['turnonsis'] = "Make sure 'Save Import State' is turned on in the Import Settings.";
---
> 		$admtext['moreoptions'] = "Više mogućnosti";
> 		$admtext['removeged'] = "Obriši GEDCOM datoteku (neobavezno)";
> 		$admtext['cannotupload'] = "Prijenos datoteke nije uspio:";
> 		$admtext['invfperms'] = "Vaša mapa 'gedcom' možda ima neadekvatna dopuštenja (pokušajte 755 ili 777).";
> 		$admtext['maybedone'] = "Možda je već završilo.";
> 		$admtext['turnonsis'] = "Provjerite je li 'Sa�uvaj Stanje Uvoza' uklju�eno u postavkama uvoza.";
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Odaberite datoteku za uvoz.";
> 		$admtext['addreplacedata'] = "Dodajte ili zamijenite svoj rodoslov (može potrajati nekoliko minuta, ovisno o veli�ini vaše datoteke)";
> 		$admtext['fromyourcomputer'] = "S vašeg ra�unala";
> 		$admtext['importdata'] = "Uvoz Podataka";
> 		$admtext['replace'] = "Zamijeni (u odabranom stablu)";
> 		$admtext['desttree'] = "Stablo odredišta";
> 		$admtext['selectdesttree'] = "Odaberite ili unesite odredišno stablo.";
> 		$admtext['selectexisting'] = "Uvezi u";
> 		$admtext['ucaselast'] = "Velika slova sva prezimena";
> 		$admtext['norecalc'] = "Ne prera�unavajte živu zastavu";
> 		$admtext['autooffset'] = "Po�nite ID na prvom dostupnom broju";
> 		$admtext['mustselecttree'] = "Morate odabrati stablo prije nego Å¡to odaberete ovu opciju.";
> 		$admtext['onwebserver'] = "S web mjesta (u mapi GEDCOM)";
> 		$admtext['imphints'] = "SAVJETI: Svi trenutni podaci zna�i svi ljudi, obitelji, izvore i bilješke (medijska udruženja se ne gube sve dok osobne iskaznice ostanu iste). Ma� se uvijek temelje samo na ID-ovima. Uvijek se dodaju novi zapisi. Dodajte uvoz svih zapisa s novim ID-a.";
> 		$admtext['destbranch'] = "Odredišna Grana (izborno)";
> 		$admtext['importlatlong'] = "Uvoz podataka zemljopisne širine/dužine ako postoje";
> 		$admtext['opening'] = "Otvaranje";
> 		$admtext['reopen'] = "Ponovno otvaranje";
> 		$admtext['uploading'] = "Prijenos";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Uvoz je zaustavljen";
> 		$admtext['resume'] = "Nastavi";
> 		$admtext['neweronly'] = "Zamijenite samo ako je noviji";
> 		$admtext['oldimport'] = "Uvoz starog stila (bez trake napretka))";
> 		$admtext['importgedcom'] = "Uvoz GEDCOM datoteke (može biti Zipirane datoteke)";
> 		$admtext['stopbackup'] = "STOP! Bilo bi dobro da napravite sigurnosnu kopiju svojih trenutnih podataka prije nego Å¡to nastavite.";
> 		$admtext['importmedia'] = "Uvoz medija ako su prisutni";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Provjerite jesu li prefiksi i sufiksi (Opće Postavke) ispravni za ovu datoteku.";
> 		$admtext['chkimpsettings'] = "Provjerite postavke uvoza za više opcija.";
> 		$admtext['eventsonly'] = "Uvezite samo prilagođene vrste događaja i atribute (nikakvi podaci se ne dodaju, zamjenjuju ili dodaju)";
> 		$admtext['allevents'] = "Prihvatite podatke za sve nove vrste događaja i atribute";
> 		$admtext['finishingimporting'] = "Dorada...";
> 		$admtext['fileuploadfailed'] = "Prijenos datoteke nije uspio. Može zna�iti da je datoteka prevelika. Pokušajte upotrijebiti FTP za prijenos datoteke u svoju GEDCOM mapu, zatim odaberite i uvezite je odatle.";
129a164
> 
132,133c167
< 		$admtext['changestoevtype'] = "Promjene u tipu dogadaja";
< 		$admtext['modifyeventtype'] = "Promjeni postojeci tip dogadaja";
---
> 		$admtext['changestoevtype'] = "Promjene u tipu događaja";
135,139c169
< 		$admtext['entertypedesc'] = "Molim unesite tip/opis novog tipa dogadaja.";
< 		$admtext['enterdisplay'] = "Molim unesite display string za novi tip dogadaja.";
< 		$admtext['existingeventtypeinfo'] = "Informacija o postojecem tipu dogadaja";
< 		$admtext['neweventtypeinfo'] = "Informacija o novom tipu dogadaja";
< 		$admtext['tag'] = "Tag";
---
> 		$admtext['tag'] = "Ozna�iti";
141c171
< 		$admtext['onimport'] = "On Import";
---
> 		$admtext['onimport'] = "Pri uvozu";
143,146c173,174
< 		$admtext['ignore'] = "Ignoriraj";
< 		$admtext['typerequired'] = "With custom tags (where tag = \"EVEN\"), this is the TYPE and is required. Optional for all other tags.";
< 		$admtext['addnewevtype'] = "Dodaj novi tip dogadaja";
< 		$admtext['createnewevtype'] = "Kreiraj zapis o novom tipu eventa";
---
> 		$admtext['ignore'] = "Zanemariti";
> 		$admtext['typerequired'] = "S prilagođenim oznakama (gdje je oznaka = \"EVEN\"), ovo je TIP i potrebno je. Neobavezno za sve ostale oznake.";
149,154c177,178
< 		$admtext['existingevtypes'] = "Postpojeci tip dogadaja";
< 		$admtext['edsevtypes'] = "Uredi, obriši ili sortiraj unešene tipove dogadaja";
< 		$admtext['indfam'] = "Oso/Obi";  //individual family
< 		$admtext['confdeleteevtype'] = "Da li ste sigurni da želite obrisati ovaj tip dogadaja?";
< 		$admtext['selecttag'] = "Select Tag";
< 		$admtext['selectentertag'] = "Molim odaberite ili unesite tag ovog tipa dogadaja.";
---
> 		$admtext['indfam'] = "Pojedina�na obitelj";  //individual family
> 		$admtext['selecttag'] = "Odaberite Oznaka";
156,157c180,181
< 		$admtext['ifbothdata'] = "will take precedence if both fields contain data";
< 		$admtext['EVEN'] = "Dogadaj";
---
> 		$admtext['ifbothdata'] = "ima prednost ako oba polja sadrže podatke";
> 		$admtext['EVEN'] = "Događaj";
160,166c184,190
< 		$admtext['ALIA'] = "Takoder znak kao";
< 		$admtext['BARM'] = "Barmitzvah";
< 		$admtext['BASM'] = "Basmitzvah";
< 		$admtext['CAST'] = "Caste";
< 		$admtext['CENS'] = "Census";
< 		$admtext['CHRA'] = "Adult Christening";
< 		$admtext['CONF'] = "Confirmation";
---
> 		$admtext['ALIA'] = "Također poznat kao";
> 		$admtext['BARM'] = "Bar micva";
> 		$admtext['BASM'] = "Bas micva";
> 		$admtext['CAST'] = "Kasta";
> 		$admtext['CENS'] = "Popis";
> 		$admtext['CHRA'] = "Krštenje odraslih";
> 		$admtext['CONF'] = "Konfirmacija";
168,169c192,193
< 		$admtext['DSCR'] = "Physical Description";
< 		$admtext['EDUC'] = "Edukacija";
---
> 		$admtext['DSCR'] = "Fizi�ki Opis";
> 		$admtext['EDUC'] = "Obrazovanje";
179c203
< 		$admtext['NMR'] = "Broj vjencanja";
---
> 		$admtext['NMR'] = "Broj vjen�anja";
181,182c205,206
< 		$admtext['ORDI'] = "Ordinance";
< 		$admtext['ORDN'] = "Ordained";
---
> 		$admtext['ORDI'] = "Propis";
> 		$admtext['ORDN'] = "Zaređen";
184c208
< 		$admtext['PROB'] = "Probate";
---
> 		$admtext['PROB'] = "Potvrda testamenta";
188c212
< 		$admtext['RESN'] = "Restriction Notice";
---
> 		$admtext['RESN'] = "Obavijest o ograni�enju";
190,199c214,223
< 		$admtext['RFN'] = "Permanent Record Number";
< 		$admtext['SSN'] = "Social Security Number";
< 		$admtext['WILL'] = "Oporuka";
< 		$admtext['ANUL'] = "Annulled";
< 		$admtext['DIVF'] = "Razvod Filed";
< 		$admtext['ENGA'] = "Zarucen";
< 		$admtext['MARB'] = "Marriage Banns";
< 		$admtext['MARC'] = "Vjencani ugovor";
< 		$admtext['MARL'] = "Odobrenje za vjencanje";
< 		$admtext['MARS'] = "Marriage Settlement";
---
> 		$admtext['RFN'] = "Broj trajnog zapisa";
> 		$admtext['SSN'] = "Broj socijalnog osiguranja";
> 		$admtext['WILL'] = "Testament";
> 		$admtext['ANUL'] = "Poništen";
> 		$admtext['DIVF'] = "Podnesen razvod";
> 		$admtext['ENGA'] = "Zaru�en/a";
> 		$admtext['MARB'] = "Vjen�anja Oziv";
> 		$admtext['MARC'] = "Ugovor Vjen�anja";
> 		$admtext['MARL'] = "Dozvola Vjen�anja";
> 		$admtext['MARS'] = "Nagodba Vjen�anja";
202,203c226,227
< 		$admtext['REFN'] = "Broj reference";
< 		$admtext['REPO'] = "Repository";
---
> 		$admtext['REFN'] = "Referentni broj";
> 		$admtext['REPO'] = "Spremište";
205,218c229,240
< 		$admtext['deleteselected'] = "Obriši oznaceno";
< 		$admtext['ignoreselected'] = "Ignoriraj oznaceno";
< 		$admtext['acceptselected'] = "Prihvati oznaceno";
< 		$admtext['changestoallevtypes'] = "Promjene u svim tipovima dogadaja";
< 		$admtext['forrepos'] = "For Repositories...";
< 		$admtext['noevtypes'] = "Tip dogadaja ne postoji.";
< 		$admtext['DESI'] = "Descendant Interest";
< 		$admtext['allnone'] = "Unesi display poruku za svaki jezik,<br />ili ostavi sve prazno pa unesi jednu display poruku gore.";
< 		$admtext['assocwith'] = "Asocirano sa";
< 		$admtext['BAPM'] = "Krštenje";
< 		$admtext['umps'] = "Vaša GEDCOM datoteka može biti veca od maksimalne velicine dozvoljene s ovom PHP instalacijom. Možete pitati vašeg provider-a da poveca vrijednost 'upload_max_filesize' ili možete kopirati vašu datoteku u 'gedcom' folder-u na vašem site-u i uvesti od tamo.;";
< 		$admtext['othlangs'] = "Ostali jezici";
< 		$admtext['evdata'] = "Event Data";
< 		$admtext['ANCI'] = "Submitter";
---
> 		$admtext['deleteselected'] = "Izbriši odabrano";
> 		$admtext['ignoreselected'] = "Zanemari odabrano";
> 		$admtext['acceptselected'] = "Prihvati ozna�eno";
> 		$admtext['forrepos'] = "Za Spremišta...";
> 		$admtext['noevtypes'] = "Tip događaja ne postoji.";
> 		$admtext['DESI'] = "Potomak Zanimanje";
> 		$admtext['allnone'] = "Unesite prikaznu poruku za svaki jezik, <br /> ili ostavite sve prazno i ​​unesite jednu prikaznu poruku iznad.";
> 		$admtext['assocwith'] = "Povezano s";
> 		$admtext['umps'] = "Vaša GEDCOM datoteka može biti veća od maksimalne veli�ine koju dopušta PHP instalacija. Možete zatražiti od svog davatelja da poveća vrijednost 'upload_max_filesize' ili možete kopirati datoteku u mapu 'gedcom' na vašoj web lokaciji i umjesto nje uvesti nju.";
> 		$admtext['othlangs'] = "Drugi jezici";
> 		$admtext['evdata'] = "Podaci o događajima";
> 		$admtext['ANCI'] = "Predaka Zanimanje";
220,222c242,244
< 		$admtext['collapseev'] = "Collapse Event";
< 		$admtext['collapse'] = "Collapse";
< 		$admtext['collapseselected'] = "Collapse Selected";
---
> 		$admtext['collapseev'] = "Kolaps događaj";
> 		$admtext['collapse'] = "Kolaps";
> 		$admtext['collapseselected'] = "Kolaps odabrano";
224c246
< 		$admtext['expselected'] = "Expand Selected";
---
> 		$admtext['expselected'] = "Proširi odabrano";
226c248,262
< 		$admtext['ldsevent'] = "LDS Event";
---
> 		$admtext['ldsevent'] = "LDS događaj";
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Jeste li sigurni da želite izbrisati ovu vrstu događaja? Svi događaji ove vrste također će se izbrisati.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Dodaj Novu Vrstu";
> 		$admtext['createnewevtype'] = "Stvorite novi zapis tipa atributa ili događaja";
> 		$admtext['modifyeventtype'] = "Uredi Postojeću Vrstu";
> 		$admtext['entertypedesc'] = "Unesite vrstu/opis za ovaj novi atribut ili vrstu događaja.";
> 		$admtext['enterdisplay'] = "Unesite niz za prikaz za ovaj novi atribut ili vrstu događaja.";
> 		$admtext['existingeventtypeinfo'] = "Postojeći podaci o atributu ili vrsti događaja";
> 		$admtext['neweventtypeinfo'] = "Novi atribut ili informacija o vrsti događaja";
> 		$admtext['existingevtypes'] = "Postojeće vrste atributa ili događaja";
> 		$admtext['edsevtypes'] = "Uređivanje, brisanje ili sortiranje prethodno unesenih atributa i vrsta događaja";
> 		$admtext['selectentertag'] = "Odaberite ili unesite oznaku za ovaj atribut ili vrstu događaja.";
> 		$admtext['changestoallevtypes'] = "Promjene svih vrsta atributa ili događaja";
231,242c267,278
< 		$admtext['changestofamily'] = "Promjene u obitelji";
< 		$admtext['marrdate'] = "Datum ženidbe"; //marriage date
< 		$admtext['modifyfamily'] = "Promijeni postojecu obitelj";
< 		$admtext['selectfamaction'] = "Oznaci obitelj i akciju";
< 		$admtext['confdeletefam'] = "Da li ste sigurni da želite obrisati ovu obitelj?";
< 		$admtext['existingfamilyinfo'] = "Postojeca informacija o obitelji";
< 		$admtext['newfamilyinfo'] = "Nova informacija o obitelji";
< 		$admtext['sealedsdate'] = "Sealed S Date (LDS)";     //S is for spouse
< 		$admtext['sealedsplace'] = "Sealed S Place (LDS)";     //S is for spouse
< 		$admtext['newchildren'] = "Novo dijete";
< 		$admtext['addnewfamily'] = "Dodaj novu obitelj";
< 		$admtext['createnewfamily'] = "Kreiraj zapis o novoj obitelji";
---
> 		$admtext['changestofamily'] = "Promjene u Obitelji";
> 		$admtext['marrdate'] = "Datum vjen�anja"; //marriage date
> 		$admtext['modifyfamily'] = "Uredi Postojecu Obitelj";
> 		$admtext['selectfamaction'] = "Odaberite Obitelj i Radnja";
> 		$admtext['confdeletefam'] = "Jeste li sigurni da želite izbrisati ovu Obitelj?";
> 		$admtext['existingfamilyinfo'] = "Postojeće informacije za Obitelj";
> 		$admtext['newfamilyinfo'] = "Nove obiteljske informacije";
> 		$admtext['sealedsdate'] = "Zape�aćeni S Datum (LDS)";     //S is for spouse
> 		$admtext['sealedsplace'] = "Zape�aćeni S Mjesto (LDS)";     //S is for spouse
> 		$admtext['newchildren'] = "Nova dijeca";
> 		$admtext['addnewfamily'] = "Dodaj novu Obitelj";
> 		$admtext['createnewfamily'] = "Stvorite zapis za novu obitelj";
244c280
< 		$admtext['spousesids'] = "IS supružnika";
---
> 		$admtext['spousesids'] = "Supružnika IDs";
246,261c282,297
< 		$admtext['familyidbefevent'] = "Morate unijeti ID obitelji prije dodavanja novog dogadaja.";
< 		$admtext['prefixfamilyid'] = "Molim vas da stavite prefix \"F\" za \"Family\"";
< 		$admtext['validfamilyid'] = "Molim unestite valjan ID obitelji. Valjan ID ima brojcanu vrijednost s prefiksom 'F'.";
< 		$admtext['familyidbefnote'] = "Morate unijeti ID obitelji prije dodavanja nove zabilješke.";
< 		$admtext['familyidbefcite'] = "Morate unijeti ID obitelji prije korištenja citata sa ovom obitelji.";
< 		$admtext['genfamily'] = "General Family";
< 		$admtext['marriagetype'] = "Tip ženidbe";
< 		$admtext['reviewfamilies'] = "Prihvati ili odbaci privremene promjene u obiteljima";
< 		$admtext['fevslater'] = "Note: Dodatni dogadaji kao i zabilješke specificne za dogadaj i citati mogu biti dodani nakon pohranjivanja podataka nove obitelji.";
< 		$admtext['husbid'] = "Muz ID";  //husband ID
< 		$admtext['wifeid'] = "Zena ID";
< 		$admtext['enternamepart'] = "enter part of first and/or last name";
< 		$admtext['pleasenamepart'] = "Please enter a portion of a first or last name.";
< 		$admtext['clickfind'] = "Click Find or Create =>";
< 		$admtext['chunlinked'] = "Child unlinked from family";
< 		$admtext['child'] = "Child";
---
> 		$admtext['familyidbefevent'] = "Prije dodavanja novih događaja morate unijeti Family ID.";
> 		$admtext['prefixfamilyid'] = "Stavite prefix \"F\" za \"Obitelj\"";
> 		$admtext['validfamilyid'] = "Unesite valjani ID Obitelji. Valjani ID je numeri�ki niz s prefiksom 'F'.";
> 		$admtext['familyidbefnote'] = "Prije dodavanja novih bilješki morate unijeti Obitelj ID";
> 		$admtext['familyidbefcite'] = "Morate unijeti identifikaciju obitelji prije nego što s ovom obitelji možete upotrebljavati navode.";
> 		$admtext['genfamily'] = "Općenito Obitelj";
> 		$admtext['marriagetype'] = "Tip Vjen�anja";
> 		$admtext['reviewfamilies'] = "Prihvatite ili odbacite okvirne promjene u obiteljima";
> 		$admtext['fevslater'] = "NAPOMENA: Djeca i dodatni događaji, kao i bilješke i citati koji se odnose na određene događaje, mogu se dodati na sljedećem zaslonu.";
> 		$admtext['husbid'] = "Otac ID";  //husband ID
> 		$admtext['wifeid'] = "Majka ID";
> 		$admtext['enternamepart'] = "Unesite dio imena oca i/ili majke";
> 		$admtext['pleasenamepart'] = "Molimo unesite dio imena oca ili majke.";
> 		$admtext['clickfind'] = "Kliknite Traži ili Stvori =>";
> 		$admtext['chunlinked'] = "Dijete nije povezano sa obitelji";
> 		$admtext['child'] = "Dijete";
268,272c304,307
< 		$admtext['nobirthinfo'] = "Nema informacija o rodenju";
< 		$admtext['modifyperson'] = "Promijeni postojecu osobu";
< 		$admtext['selectpersaction'] = "Oznaci osobu i akciju";
< 		$admtext['existingpersoninfo'] = "Postojeca informacija o osobi";
< 		$admtext['firstgivennames'] = "Ime";
---
> 		$admtext['modifyperson'] = "Uređivanje postojeće osobe";
> 		$admtext['selectpersaction'] = "Odaberite Osobu i radnju";
> 		$admtext['existingpersoninfo'] = "Postojeće informacije za osobu";
> 		$admtext['firstgivennames'] = "Ime(na)";
277,279c312,314
< 		$admtext['bapldate'] = "Datum krštenja (LDS)";
< 		$admtext['baplplace'] = "Mjesto krštenja (LDS)";
< 		$admtext['endldate'] = "Endowment Date (LDS)";
---
> 		$admtext['bapldate'] = "Datum Krštenja (LDS)";
> 		$admtext['baplplace'] = "Mjesto Krštenja (LDS)";
> 		$admtext['endldate'] = "Datum Zadužbine (LDS)";
283c318
< 		$admtext['unlinkindividual'] = "Unlink current individual";
---
> 		$admtext['unlinkindividual'] = "Prekini vezu trenutnog pojedinca";
285,286c320,321
< 		$admtext['sealedpdate'] = "Sealed P Date (LDS)";     //P is for parents
< 		$admtext['sealedpplace'] = "Sealed P Place (LDS)";     //P is for parents
---
> 		$admtext['sealedpdate'] = "Zape�aćeni datum P (LDS)";     //P is for parents
> 		$admtext['sealedpplace'] = "Zape�aćeno mjesto P (LDS)";     //P is for parents
288,289c323,324
< 		$admtext['spouse'] = "Supruga";
< 		$admtext['ordernumber'] = "Order Number";
---
> 		$admtext['spouse'] = "Suprug/a";
> 		$admtext['ordernumber'] = "Narudžbe broj";
291,296c326,331
< 		$admtext['nonewfamily'] = "Ne idi na novu obitelj kod pohranjivanja";
< 		$admtext['addnewperson'] = "Dodaj novu osobu";
< 		$admtext['createperson'] = "Kreiraj zapis za novu osobu";
< 		$admtext['personidbefevent'] = "Morate unijeti ID osobe prije dodavanja novog dogadaja.";
< 		$admtext['prefixpersonid'] = "Please prefix Person ID with \"I\" for \"Individual\"";
< 		$admtext['validpersonid'] = "Please enter a valid Person ID. A valid ID is a numeric string prefixed with 'I'.";
---
> 		$admtext['nonewfamily'] = "Ne idite novoj obitelji na Sa�uvaj";
> 		$admtext['addnewperson'] = "Dodaj Novu Osobu";
> 		$admtext['createperson'] = "Stvorite zapis za novog pojedinca";
> 		$admtext['personidbefevent'] = "Prije dodavanja novih događaja morate unijeti ID osobe.";
> 		$admtext['prefixpersonid'] = "Prefiks ID osobe s \"I\" za \"Osobu\"";
> 		$admtext['validpersonid'] = "Unesite važeći ID osobe. Valjani ID je numeri�ki niz s prefiksom 'I'.";
299,300c334,335
< 		$admtext['shortform'] = "Short Form";
< 		$admtext['editexistingpersoninfo'] = "Uredi informaciju za prethodno unesenu osobu";
---
> 		$admtext['shortform'] = "Kratki oblik";
> 		$admtext['editexistingpersoninfo'] = "Uredi informaciju za prethodno unešenu osobu";
303,305c338,340
< 		$admtext['endlplace'] = "Endowment Place (LDS)";
< 		$admtext['personidbefcite'] = "Morate unijeti ID osobe prije korištenja citata te osobe.";
< 		$admtext['relationship'] = "Relationship";
---
> 		$admtext['endlplace'] = "Zape�aćeni mjesto (LDS)";
> 		$admtext['personidbefcite'] = "Morate unijeti ID osobe prije nego što s ovom osobom možete upotrebljavati navode.";
> 		$admtext['relationship'] = "Povezanost";
307,316c342,351
< 		$admtext['mergepeople'] = "Merge information for duplicate individual records.";
< 		$admtext['choosemerge'] = "Choose individuals to merge or find potential matches";
< 		$admtext['usesoundex'] = "Use Soundex";
< 		$admtext['sdxdisclaimer'] = "Using this option will cause the program to take longer when finding the next match or duplicate.";
< 		$admtext['combinenotes'] = "Combine notes &amp; citations";
< 		$admtext['confirmmerge'] = "Da li želite spojitiove dvije osobe?";
< 		$admtext['gotonewfamily'] = "Go to new family with current individual";
< 		$admtext['genperson'] = "General Individual";
< 		$admtext['reviewpeople'] = "Accept or decline tentative changes to individuals";
< 		$admtext['nokids'] = "Bez djece";
---
> 		$admtext['mergepeople'] = "Podaci o spajanju dupliciranih pojedina�nih zapisa.";
> 		$admtext['choosemerge'] = "Odaberite pojedince koji će se spojiti ili pronaći potencijalne podudarnosti";
> 		$admtext['usesoundex'] = "Koristite Soundex";
> 		$admtext['sdxdisclaimer'] = "Upotreba ove opcije uzrokovat će dulje trajanje programa prilikom pronalaska sljedećeg podudaranja ili duplikata.";
> 		$admtext['combinenotes'] = "Kombinirajte bilješke &amp; citata";
> 		$admtext['confirmmerge'] = "Jeste li sigurni da želite spojiti ove dvije osobe?";
> 		$admtext['gotonewfamily'] = "Idite u novu obitelj sa trenutnim pojedincem";
> 		$admtext['genperson'] = "Općeniti pojedinac";
> 		$admtext['reviewpeople'] = "Prihvatite ili odbijte uvjetne promjene pojedincima";
> 		$admtext['nokids'] = "Bez dijece";
319,320c354,355
< 		$admtext['deletingassoc'] = "Obriši asocijaciju...";
< 		$admtext['addingassoc'] = "Dodajem asocijaciju...";
---
> 		$admtext['deletingassoc'] = "Brisanje asocijaciju...";
> 		$admtext['addingassoc'] = "Dodavanje asocijacije...";
323,333c358,366
< 		$admtext['modifyassoc'] = "Modificiraj postojecu asocijaiju";
< 		$admtext['pevslater'] = "Note: Additional events, as well as event-specific notes and citations,<br />may be added after the new person has been saved.";
< 		$admtext['ashusband'] = "kao muž";
< 		$admtext['aswife'] = "kao žena";
< 		$admtext['pevslater2'] = "Note: Additional events, plus event-specific notes and citations, may be added later.";
< 		$admtext['nospouse'] = "No spouse";
< 		$admtext['revassoc'] = "Also add reverse association for same two people";
< 		$admtext['prefix'] = "Prefix";
< 		$admtext['chkdel'] = "Check empty box to delete item at left";
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
---
> 		$admtext['modifyassoc'] = "Uredi postojeću asocijaiju";
> 		$admtext['pevslater'] = "NAPOMENA: Na sljedećem zaslonu mogu se dodati dodatni događaji, dodaci i citati koji se odnose na određene događaje.";
> 		$admtext['ashusband'] = "kao otac";
> 		$admtext['aswife'] = "kao majka";
> 		$admtext['pevslater2'] = "NAPOMENA: Dodatni događaji, dodaci i citati koji se odnose na određene događaje, mogu se dodati kasnije.";
> 		$admtext['nospouse'] = "Nema supružnika";
> 		$admtext['revassoc'] = "Dodajte i obrnuto povezivanje za iste dvije osobe";
> 		$admtext['prefix'] = "Prefks";
> 		$admtext['chkdel'] = "Ozna�ite prazan okvir za brisanje predmeta na lijevoj strani";
335,338c368,376
< 		$admtext['confdate'] = "Confirmation Date (LDS)";
< 		$admtext['confplace'] = "Confirmation Place (LDS)";
< 		$admtext['initdate'] = "Initiatory Date (LDS)";
< 		$admtext['initplace'] = "Initiatory Place (LDS)";
---
> 		$admtext['confdate'] = "Datum potvrde (LDS)";
> 		$admtext['confplace'] = "Mjesto potvrde (LDS)";
> 		$admtext['initdate'] = "Datum inicijative (LDS)";
> 		$admtext['initplace'] = "Mjesto inicijative (LDS)";
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Sa�uvaj + Novi Roditelji";
> 		$admtext['savenewspouse'] = "Sa�uvaj + Novi Suprug";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alternativno rođenje";
344,345c382,383
< 		$admtext['thumbnailnotcopied'] = "Thumbnail datoteka ne može biti kopirana u";
< 		$admtext['photo'] = "Photo";
---
> 		$admtext['thumbnailnotcopied'] = "Datoteka s sli�icama nije uspjela kopirati u";
> 		$admtext['photo'] = "Slika";
347c385
< 		$admtext['modifyphoto'] = "Modificiraj postojecu forografiju";
---
> 		$admtext['modifyphoto'] = "Uredi postojecu forografiju";
349,355c387,392
< 		$admtext['selectphotoaction'] = "Oznaci fotografiju i akciju";
< 		$admtext['photoid'] = "Photo ID";
< 		$admtext['confdeletephoto'] = "Da li ste sigurni da želite obrisati ovu fotografiju i sve linkove asocirani s njom?";
< 		$admtext['enterphotopath'] = "Molim unesite stazu (folder i ime datoteke) od foto datoteke unutar photos foldera na vašem web serveru.";
< 		$admtext['enterthumbnailpath'] = "Molim unesite stazu (folder i ime datoteke) thumbnail-a unutar photos foldera na vašem web serveru.";
< 		$admtext['enterphotodesc'] = "Molim unesite opis  slike.";
< 		$admtext['existingphotoinfo'] = "Postojeca foto Informacija";
---
> 		$admtext['selectphotoaction'] = "Odaberite fotografiju i radnju";
> 		$admtext['photoid'] = "Fotografije ID";
> 		$admtext['confdeletephoto'] = "Jeste li sigurni da želite izbrisati ovu fotografiju i sve veze povezane s njom?";
> 		$admtext['enterphotopath'] = "Unesite put (mapa i naziv datoteke) slikovne datoteke u mapu fotografija na vašem web poslužitelju.";
> 		$admtext['enterthumbnailpath'] = "Unesite put (mapa i naziv datoteke) datoteke sa sli�icama unutar mape fotografija na vašem web poslužitelju.";
> 		$admtext['existingphotoinfo'] = "Informacija postojeće fotografije";
357c394
< 		$admtext['thumbnailfile'] = "Thumbnail Image File";
---
> 		$admtext['thumbnailfile'] = "Datoteka slike s umanjenim sli�icama";
359c396
< 		$admtext['fileandpath'] = "File and Path Name";
---
> 		$admtext['fileandpath'] = "Naziv datoteke i putanje";
362,415c399,451
< 		$admtext['editexistingphotoinfo'] = "Uredi informaciju prethodno unešene fotografije";
< 		$admtext['leaveblankallphotos'] = "ostavi prazno za prikaz svih fotografija";
< 		$admtext['headstone'] = "Nadgrobni spomenik";
< 		$admtext['imagenotcopied'] = "The image file could not be copied to";
< 		$admtext['changestohs'] = "Promjene na nadgrobnom spomeniku";
< 		$admtext['modifyheadstone'] = "Promijeni postojeci nadgrobni spomenik";
< 		$admtext['selecthsaction'] = "Oznaci nadgrobni spomenik i akciju";
< 		$admtext['confdeletehs'] = "Da li ste sigurni da želite obrisati ovaj nadgrobni spomenik?";
< 		$admtext['photostatus'] = "Photo/Status";
< 		$admtext['selectcemetery'] = "Molim selektiraj groblje.";
< 		$admtext['enterhsimage'] = "Please enter a file name for your headstone image on the web server.";
< 		$admtext['existinghsinfo'] = "Existing Headstone Information";
< 		$admtext['newhsinfo'] = "New Headstone Information";
< 		$admtext['hsimagefile'] = "Headstone Image File";
< 		$admtext['located'] = "Located";
< 		$admtext['notyetlocated'] = "Not yet located";
< 		$admtext['unmarked'] = "Unmarked";
< 		$admtext['missing'] = "Missing";
< 		$admtext['leaveblankhs'] = "Leave this field blank if the file has already been uploaded to your headstones folder.";
< 		$admtext['requiredhs'] = "Required. This should correspond to the name and location of your file <em>within the headstones folder</em> once the file is uploaded. For example, if your headstones folder is called <em>photos/headstones</em>, and you want your file to be called <em>headstone.jpg</em> and go in a subfolder of photos/headstones called <em>newheadstones</em>, you would enter <em>newheadstones/headstone.jpg</em> in this field.";
< 		$admtext['addnewhs'] = "Add New Headstone";
< 		$admtext['createnewhs'] = "Create a record for a new headstone and link it to an individual";
< 		$admtext['editexistinghsinfo'] = "Edit information for a previously entered headstone";
< 		$admtext['leaveblankallhs'] = "leave blank to show all headstones";
< 		$admtext['cemnamelocation'] = "Cemetery Name or Location";
< 		$admtext['pedphoto'] = "Use this photo on pedigree charts and in name titles";
< 		$admtext['photoowner'] = "Owner/Source";
< 		$admtext['dimensions'] = "Dimensions";
< 		$admtext['selectphoto'] = "Select Image";
< 		$admtext['specifyimg'] = "Specify image";
< 		$admtext['autoimg'] = "Create from original";
< 		$admtext['enterthumbpath'] = "Please enter a destination name for your thumbnail image";
< 		$admtext['genthumbs'] = "Generate Thumbnails";
< 		$admtext['genthumbsdesc'] = "Automatically generate smaller versions of all photos without existing thumbnails.";
< 		$admtext['thumbsgenerated'] = "Thumbnails generated";
< 		$admtext['makedefault'] = "Make Default";
< 		$admtext['filewithinhs'] = "Path within headstones folder <br/>(subfolder and file name)";
< 		$admtext['recsupdated'] = "Records updated";
< 		$admtext['removedef'] = "Remove default photo";
< 		$admtext['numlinkhs'] = "Number of people to link to this headstone";
< 		$admtext['sortheadstones'] = "Sort Headstones";
< 		$admtext['sortheadstonesfor'] = "Sort Headstones for";
< 		$admtext['sortheadstonesind'] = "Sort Headstones for an Individual";
< 		$admtext['headstoneorder'] = "Indicate a desired order for the headstones linked to a specific individual";
< 		$admtext['enternumberforphoto'] = "Enter a numeric value for each item.";
< 		$admtext['updownforphoto'] = "Click the up and down arrows to move items up or down in the order.";
< 		$admtext['createnewphoto'] = "Create a record for a new photo and link it to individuals, families or sources";
< 		$admtext['numlinkphoto'] = "Number of people, families or sources to link to this photo";
< 		$admtext['photoorder'] = "Indicate a desired order for the photos linked to a specific individual, family or source";
< 		$admtext['assigndefs'] = "Assign Default Photos";
< 		$admtext['assigndefsdesc'] = "Make first photo for each individual, family and source be that entity's default photo.";
< 		$admtext['overwritedefs'] = "Overwrite existing defaults";
< 		$admtext['assign'] = "Assign Defaults";
< 		$admtext['defsassigned'] = "Default photos assigned";
---
> 		$admtext['editexistingphotoinfo'] = "Uredite podatke za prethodno unesenu fotografiju";
> 		$admtext['leaveblankallphotos'] = "ostavite prazno da biste prikazali sve fotografije";
> 		$admtext['headstone'] = "Nadgrobni Spomenik";
> 		$admtext['imagenotcopied'] = "Datoteku slike nije moguće kopirati u";
> 		$admtext['changestohs'] = "Promjene na spomeniku";
> 		$admtext['modifyheadstone'] = "Uredi postojećeg spomenika";
> 		$admtext['selecthsaction'] = "Odaberite spomenik i radnju";
> 		$admtext['confdeletehs'] = "Jeste li sigurni da želite izbrisati taj spomenik?";
> 		$admtext['photostatus'] = "Fotografija/Status";
> 		$admtext['selectcemetery'] = "Odaberite groblje.";
> 		$admtext['enterhsimage'] = "Unesite naziv datoteke za spomenike na web poslužitelju.";
> 		$admtext['existinghsinfo'] = "Postojeće informacije o spomeniku";
> 		$admtext['newhsinfo'] = "Nove informacije o spomeniku";
> 		$admtext['hsimagefile'] = "Datoteka slike spomenika";
> 		$admtext['located'] = "Smješten";
> 		$admtext['notyetlocated'] = "Još se ne nalazi";
> 		$admtext['unmarked'] = "Neobilježen";
> 		$admtext['missing'] = "Nedostaje";
> 		$admtext['leaveblankhs'] = "Ostavite ovo polje prazno ako je datoteka već prenesena u mapu spomenika.";
> 		$admtext['requiredhs'] = "POTREBNO: Ovo bi trebalo odgovarati imenu i lokaciji vaše datoteke <em>unutar mape spomenika</em> nakon prijenosa datoteke. Na primjer, ako se vaša datoteke mapa spomenika zove <em>fotografije/spomenici</em>, a želite da se vaša datoteka zove <em>spomenik.jpg </em> i upišete se u podmapu fotografija/spomenika nazvanu <em >novispomeniki</em>, u ovo polje biste unijeli <em> novispomeniki/spomenik.jpg </em>.";
> 		$admtext['addnewhs'] = "Dodaj novi spomenik";
> 		$admtext['createnewhs'] = "Stvori zapis za novi spomenik i poveži ga s pojedincem";
> 		$admtext['editexistinghsinfo'] = "Uredi podatke za prethodno upisani spomenik";
> 		$admtext['leaveblankallhs'] = "ostavite prazno da biste pokazali sve spomenike";
> 		$admtext['cemnamelocation'] = "Naziv groblja ili mjesto groblja";
> 		$admtext['pedphoto'] = "Upotrijebite ovu fotografiju na pedigree kartama i u nazivima";
> 		$admtext['dimensions'] = "Dimenzije";
> 		$admtext['selectphoto'] = "Odaberite Sliku";
> 		$admtext['specifyimg'] = "Navedite sliku";
> 		$admtext['autoimg'] = "Stvorite od originala";
> 		$admtext['enterthumbpath'] = "Unesite odredišno ime za svoju sli�icu";
> 		$admtext['genthumbs'] = "Stvaranje sli�ica";
> 		$admtext['genthumbsdesc'] = "Automatski generirajte manje verzije svih fotografija bez postojećih sli�ica.";
> 		$admtext['thumbsgenerated'] = "Generirane sli�ice";
> 		$admtext['makedefault'] = "Napraviti zadani";
> 		$admtext['filewithinhs'] = "Put unutar mape spomenika <br/> (podmapa i naziv datoteke)";
> 		$admtext['recsupdated'] = "Zapisi su ažurirani";
> 		$admtext['removedef'] = "Ukloni zadanu fotografiju";
> 		$admtext['numlinkhs'] = "Broj ljudi koji se vezuju za ovaj spomenik";
> 		$admtext['sortheadstones'] = "Poredaj spomenike";
> 		$admtext['sortheadstonesfor'] = "Poredaj spomenike za";
> 		$admtext['sortheadstonesind'] = "Poredaj spomenike za pojedinca";
> 		$admtext['headstoneorder'] = "Navedite željeni redoslijed za spomenike vezane za određenu osobu";
> 		$admtext['enternumberforphoto'] = "Unesi broj�anu vrijednost za svaku stavku.";
> 		$admtext['updownforphoto'] = "Kliknite strelice gore i dolje da biste stavke premjestili gore ili dolje u redoslijedu.";
> 		$admtext['createnewphoto'] = "Stvorite zapis za novu fotografiju i povežite je s pojedincima, obiteljima ili izvorima";
> 		$admtext['numlinkphoto'] = "Broj ljudi, obitelji ili izvora koji mogu povezati na ovu fotografiju";
> 		$admtext['photoorder'] = "Navedite željenu narudžbu za fotografije povezane s određenom osobom, obitelji ili izvorom";
> 		$admtext['assigndefs'] = "Dodijelite zadane fotografije";
> 		$admtext['assigndefsdesc'] = "Napravite prvu fotografiju za svakog pojedinca, obitelj i izvor kao zadanu fotografiju tog entiteta.";
> 		$admtext['overwritedefs'] = "Prepišite postojeće zadane postavke";
> 		$admtext['assign'] = "Dodijeli zadane";
> 		$admtext['defsassigned'] = "Dodijeljene zadane fotografije";
417,421c453,456
< 		$admtext['imgmap'] = "Image Map";
< 		$admtext['circle'] = "circle";
< 		$admtext['rect'] = "rectangle";
< 		$admtext['poly'] = "polygon";
< 		$admtext['shape'] = "Shape of region";
---
> 		$admtext['circle'] = "krug";
> 		$admtext['rect'] = "pravokutnik";
> 		$admtext['poly'] = "poligon";
> 		$admtext['shape'] = "Oblik regije";
423,427c458,462
< 		$admtext['width'] = "Width (pixels)";
< 		$admtext['height'] = "Height (pixels)";
< 		$admtext['imgdim'] = "Image dimensions";
< 		$admtext['pixw'] = "pixels wide";
< 		$admtext['pixh'] = "pixels high";
---
> 		$admtext['width'] = "Å irina (piksela)";
> 		$admtext['height'] = "Visina (piksela)";
> 		$admtext['imgdim'] = "Slike dimenzije";
> 		$admtext['pixw'] = "pixela Å¡iroko";
> 		$admtext['pixh'] = "pixela visoko";
431,553c466,580
< 		$admtext['changestoallphotos'] = "Changes to all selected photos";
< 		$admtext['changestoallhs'] = "Changes to all selected headstones";
< 		$admtext['datetaken'] = "Date Taken/Created";
< 		$admtext['placetaken'] = "Place Taken/Created";
< 		$admtext['abspath'] = "This media comes from an external source (you must supply your own thumbnail)";
< 		$admtext['imagefile'] = "Media File";
< 		$admtext['pathwithinphotos'] = "File name on site";
< 		$admtext['linktocem'] = "Link this media directly to the selected cemetery";
< 		$admtext['defphotonote'] = "Use the thumbnail to identify this person, family or source on pedigree and other charts, including family group sheets.";
< 		$admtext['photonotadded'] = "The item could not be added, most likely because another media record already exists for the collection and physical file specified.";
< 		$admtext['requiredphoto'] = "Required. This should correspond to the name and location of your file <em>within the collection folder</em> once the file is uploaded. For example, suppose you are uploading a photo and your photos folder is called <em>photos</em>. If you want your file to be called <em>myphoto.jpg</em> and go in a subfolder of photos called <em>newphotos</em>, you would enter <em>newphotos/myphoto.jpg</em> in this field.";
< 		$admtext['leaveblankphoto'] = "Leave this field blank if the file has already been uploaded.";
< 		$admtext['thumbconflicts'] = "Thumbnails not generated due to path, permissions, size or file name problems";
< 		$admtext['showmap'] = "Show cemetery map and media whenever this item is displayed";
< 		$admtext['bodytext'] = "<strong>OR</strong><br/>Body Text";
< 		$admtext['usenl'] = "Convert line breaks to HTML on display";
< 		$admtext['newwin'] = "Open in new window";
< 		$admtext['modifymedia'] = "Modify Existing Media";
< 		$admtext['addnewmedia'] = "Add New Media";
< 		$admtext['confdeletemedia'] = "Are you sure you want to delete this media?";
< 		$admtext['thumbnails'] = "Thumbnails";
< 		$admtext['modifyalbum'] = "Modify Existing Album";
< 		$admtext['addnewalbum'] = "Add New Album";
< 		$admtext['newalbuminfo'] = "New Album Information";
< 		$admtext['confdeletealbum'] = "Are you sure you want to delete this album?";
< 		$admtext['enteralbumname'] = "Please enter an album name.";
< 		$admtext['albumname'] = "Album Name";
< 		$admtext['keywords'] = "Keywords";
< 		$admtext['changestoalbum'] = "Changes to album";
< 		$admtext['addtoalbum'] = "Add to Album";
< 		$admtext['mediatype'] = "Collection";
< 		$admtext['fileext'] = "File ext."; //file extension (abbreviation)
< 		$admtext['anotherlink'] = "Add Another Link";
< 		$admtext['mediaurl'] = "Media URL";
< 		$admtext['put_in'] = "Store files in";
< 		$admtext['usemedia'] = "Multimedia Folder";
< 		$admtext['usecollect'] = "Collection Folder (e.g., \"photos\")";
< 		$admtext['notcopied'] = "The file could not be copied to";
< 		$admtext['existingmediainfo'] = "Existing Media Information";
< 		$admtext['convto'] = "Convert Selected to";
< 		$admtext['changestoallmedia'] = "Changes to all selected media";
< 		$admtext['changestoitem'] = "Changes to item";
< 		$admtext['eventlink'] = "Link to specific event";
< 		$admtext['sortmediaind'] = "Sort Media for an Individual, Family, Source, Repository or Place";
< 		$admtext['sortmedia'] = "Sort xxx for";
< 		$admtext['unlinked'] = "Unlinked only";
< 		$admtext['samepaths'] = "The principal image and the thumbnail image may not be the same file. Please select a different thumbnail image, or have one created for you.";
< 		$admtext['regenerate'] = "Regenerate existing thumbnails";
< 		$admtext['forcircles'] = "For circles";
< 		$admtext['forrects'] = "For rectangles";
< 		$admtext['circleinstr'] = "First click in the center of the circle, then click anywhere on the outside of the circle.";
< 		$admtext['rectinstr'] = "First click in the upper left corner of the rectangle, then click in the lower right corner.";
< 		$admtext['firstone'] = "first one";
< 		$admtext['controller'] = "Please allow about 16 vertical pixels for the media player controller.";
< 		$admtext['nostatus'] = "No status";
< 		$admtext['enterid'] = "Please enter an ID.";
< 		$admtext['existingalbuminfo'] = "Existing Album Information";
< 		$admtext['newmediainfo'] = "New Media Information";
< 		$admtext['mapinstr2'] = "Link regions of your image to different people or other pages (optional) by entering the HTML image map information below, or by following the instructions near the photo below.";
< 		$admtext['mapinstr3'] = "To link a region of this photo to a specific individual, select the individual's tree, pick a shape and dimensions for the region, then click the center of that region on the photo. A popup window will help you select the individual. After the selection is made, code for the image map will be added to the box above. Repeat this process as needed for additional regions.";
< 		$admtext['albumlinks'] = "Album Links";
< 		$admtext['duplinkmsg'] = "A link to the selected entity already exists in this album.";
< 		$admtext['invlinkmsg'] = "The entity ID you entered is invalid. No link was created.";
< 		$admtext['albmedia'] = "Album Media";
< 		$admtext['removelink'] = "Remove Link";
< 		$admtext['confremmedia'] = "Are you sure you want to remove this media from this album?";
< 		$admtext['selmedia'] = "Search for existing media to include in this album";
< 		$admtext['uploadfirst'] = "upload new media here first";
< 		$admtext['existmedia'] = "Existing Media";
< 		$admtext['emoptions'] = "Browse, Delete or Drag to Sort";
< 		$admtext['addlinks'] = "Add New Links";
< 		$admtext['eloptions'] = "Browse or Delete";
< 		$admtext['inclmsg'] = " included";
< 		$admtext['mediasubt'] = "Manage media included in this album (Add, Delete, Sort)";
< 		$admtext['infosubt'] = "Edit album name, description and keywords";
< 		$admtext['linkssubt'] = "Link this item to People, Families, Sources, Repositories or Places";
< 		$admtext['inclmedia'] = "Included Media";
< 		$admtext['nomedia'] = "No media included yet";
< 		$admtext['nolinks'] = "No links exist yet";
< 		$admtext['thumbsize'] = "(original is too large)";
< 		$admtext['thumbinv'] = "(invalid image or inadequate permissions)";
< 		$admtext['thumblost'] = "(original not found)";
< 		$admtext['uplsel'] = "Upload a new file from your computer, or select from files already on your site";
< 		$admtext['alblater'] = "Note: Media may be added to this album, and the album linked to individuals or families, on the next screen.";
< 		$admtext['medlater'] = "Note: More information may be added, and the item linked to individuals or families, on the next screen.";
< 		$admtext['minfosubt'] = "Edit media title, description and other basic details";
< 		$admtext['defphoto'] = "Default Photo";
< 		$admtext['alttd'] = "Alt Title/Desc";   //short abbreviation for "Alternate Title or Description"
< 		$admtext['editmedialink'] = "Edit Media Link";
< 		$admtext['plot'] = "Plot";
< 		$admtext['addnewcoll'] = "Add Collection";
< 		$admtext['collid'] = "Collection ID";
< 		$admtext['colldisplay'] = "Display Title";
< 		$admtext['collpath'] = "Folder Name";
< 		$admtext['collicon'] = "Icon File";
< 		$admtext['colllike'] = "Same setup as";
< 		$admtext['entercollid'] = "Please enter a collection ID.";
< 		$admtext['entercolldisplay'] = "Please enter a collection display name.";
< 		$admtext['entercollpath'] = "Please enter a collection folder name.";
< 		$admtext['entercollicon'] = "Please enter a collection icon file name.";
< 		$admtext['editcoll'] = "Edit Collection";
< 		$admtext['confmtdelete'] = "Are you sure you want to delete this media type?";
< 		$admtext['histlimit'] = "<strong>Size note:</strong> Most browsers limit the amount of data that can be sent in a web form to about 64Kb. If you have a large amount of text to type or paste in the Body Text field above, you might consider using historytemplate.php instead. See the Help for more information.";
< 		$admtext['repath'] = "Regenerate thumbnail path names where file does not exist";
< 		$admtext['sortalbumind'] = "Sort Albums for an Individual, Family, Source, Repository or Place";
< 		$admtext['cidexists'] = "The Collection ID you entered could not be added because it already exists.";
< 		$admtext['phalltrees'] = "Optional. Leave blank to allow photos to be visible in all trees.";
< 		//added in 8.0.0
< 		$admtext['fileexists'] = "This file already exists. Overwrite?";
< 		$admtext['collthumb'] = "Thumbnail File";
< 		$admtext['movetop'] = "Move to top";
< 		//added in 9.0.0
< 		$admtext['collexpas'] = "Export as";
< 		//added in 9.2.0
< 		$admtext['upload'] = "Upload";
< 		$admtext['linksel'] = "Link to selected";
< 		$admtext['mediaupl'] = "Upload Media";
< 		$admtext['addfiles'] = "Add files...";
< 		$admtext['startupl'] = "Start upload";
< 		$admtext['start'] = "Start";
< 		$admtext['cancelupl'] = "Cancel upload";
< 		//added in 11.0.0
< 		$admtext['localpath'] = "Local path(s)";
---
> 		$admtext['changestoallphotos'] = "Promjene svih odabranih fotografija";
> 		$admtext['changestoallhs'] = "Promjene svih odabranih spomenika";
> 		$admtext['datetaken'] = "Datum snimanja/kreiranja";
> 		$admtext['placetaken'] = "Mjesto snimanja/kreiranja";
> 		$admtext['abspath'] = "Ovaj medij dolazi iz vanjskog izvora (morate dostaviti svoju sli�icu)";
> 		$admtext['imagefile'] = "Medije Datoteka";
> 		$admtext['pathwithinphotos'] = "Naziv datoteke na web mjestu";
> 		$admtext['linktocem'] = "Povežite ovu mediju izravno na odabrano groblje";
> 		$admtext['defphotonote'] = "Upotrijebite sli�icu da biste identificirali ovu osobu, obitelj ili izvor na rodovnici i drugim kartama, uklju�ujući popise obiteljskih skupina.";
> 		$admtext['photonotadded'] = "Stavka se ne može dodati, najvjerojatnije jer već postoji drugi medijski zapis za navedenu zbirku i fizi�ku datoteku.";
> 		$admtext['requiredphoto'] = "POTREBNO. Ovo bi trebalo odgovarati imenu i lokaciji vaše datoteke <em>unutar mape za prikupljanje</em> nakon prijenosa datoteke. Na primjer, pretpostavimo da prenosite fotografiju, a mapa s fotografijama naziva se <em>slike</em>. Ako želite da se vaša datoteka zove <em>mojaslika.jpg </em> i upišete se u podmapu fotografija pod nazivom <em>noveslike</em>, unijeli biste <em>noveslike/mojaslika.jpg</em> u ovom polju.";
> 		$admtext['leaveblankphoto'] = "Ostavite ovo polje prazno ako je datoteka već prenesena.";
> 		$admtext['thumbconflicts'] = "sli�icu se ne generiraju zbog problema s putom, dozvolama, veli�inom ili nazivom datoteke";
> 		$admtext['showmap'] = "Prikaži kartu groblja i medije kad god se ovaj predmet prikaže";
> 		$admtext['bodytext'] = "<strong>ILI</strong><br/>Body Text";
> 		$admtext['usenl'] = "Pretvori prijelome redaka u HTML na zaslonu";
> 		$admtext['newwin'] = "Otvori u novom prozoru";
> 		$admtext['modifymedia'] = "Uredi postojećih medija";
> 		$admtext['addnewmedia'] = "Dodaj nove medije";
> 		$admtext['confdeletemedia'] = "Jeste li sigurni da želite izbrisati ovaj medij?";
> 		$admtext['thumbnails'] = "Sli�ice";
> 		$admtext['modifyalbum'] = "Uredi postojećeg albuma";
> 		$admtext['addnewalbum'] = "Dodaaj novi Album";
> 		$admtext['newalbuminfo'] = "Informacije o Novom Albumu";
> 		$admtext['confdeletealbum'] = "Jeste li sigurni da želite izbrisati ovaj album?";
> 		$admtext['enteralbumname'] = "Unesite naziv albuma.";
> 		$admtext['albumname'] = "Albuma Ime";
> 		$admtext['keywords'] = "Klju�ne rije�i";
> 		$admtext['changestoalbum'] = "Promjene u albumu";
> 		$admtext['addtoalbum'] = "Dodaj Albumu";
> 		$admtext['mediatype'] = "Kolekcija";
> 		$admtext['fileext'] = "Datote�ni nastavak"; //file extension (abbreviation)
> 		$admtext['anotherlink'] = "Dodajte još jednu vezu";
> 		$admtext['mediaurl'] = "Medije URL";
> 		$admtext['put_in'] = "Sa�uvaj datoteke u";
> 		$admtext['usemedia'] = "Multimedijska Mapa";
> 		$admtext['usecollect'] = "Kolekcija Mapa (npr., \"slike\")";
> 		$admtext['notcopied'] = "Datoteka se ne može kopirati u";
> 		$admtext['existingmediainfo'] = "Postojeće informacije o medijima";
> 		$admtext['convto'] = "Pretvori odabrano u";
> 		$admtext['changestoallmedia'] = "Promjene na svim odabranim medijima";
> 		$admtext['changestoitem'] = "Promjene stavke";
> 		$admtext['eventlink'] = "Link na određeni događaj";
> 		$admtext['sortmediaind'] = "Poredaj Medije za Pojedinca, Obitelj, Izvor, Spremište ili Mjesto";
> 		$admtext['sortmedia'] = "Proedaj xxx za";
> 		$admtext['unlinked'] = "Samo nepovezano";
> 		$admtext['samepaths'] = "Glavna slika i sli�ica možda nisu iste datoteke. Odaberite drugu sli�icu ili je stvorite za vas.";
> 		$admtext['regenerate'] = "Obnovite postojeće sli�ice";
> 		$admtext['forcircles'] = "Za krugove";
> 		$admtext['forrects'] = "Za pravokutnike";
> 		$admtext['circleinstr'] = "Prvo kliknite u sredini kruga, a zatim bilo gdje na vanjskoj strani kruga.";
> 		$admtext['rectinstr'] = "Prvo kliknite u gornji lijevi kut pravokutnika, a zatim kliknite u donji desni kut.";
> 		$admtext['firstone'] = "prvi";
> 		$admtext['controller'] = "Molimo dopustite oko 16 okomitih piksela za kontroler medija playera.";
> 		$admtext['nostatus'] = "Nema statusa";
> 		$admtext['enterid'] = "Unesite ID za odabranu vrstu veze.";
> 		$admtext['existingalbuminfo'] = "Albuma Informacije";
> 		$admtext['newmediainfo'] = "Nova Informacije Medije";
> 		$admtext['mapinstr2'] = "Povežite regije svoje slike s drugim ljudima ili drugim stranicama (izborno)";
> 		$admtext['albumlinks'] = "Linkovi Albuma";
> 		$admtext['duplinkmsg'] = "Veza u odabranom entitetu već postoji u ovom albumu.";
> 		$admtext['invlinkmsg'] = "ID entiteta koji ste unijeli nije važeći. Nije stvorena veza.";
> 		$admtext['albmedia'] = "Album Medije";
> 		$admtext['confremmedia'] = "Jeste li sigurni da želite ukloniti ovaj medij iz ovog albuma?";
> 		$admtext['selmedia'] = "Potražite postojeće medije koje biste uklju�ili u ovaj album";
> 		$admtext['uploadfirst'] = "ovdje prvo prenesite nove medije";
> 		$admtext['existmedia'] = "Postojeća medija";
> 		$admtext['emoptions'] = "Pregledajte, Izbrišite ili Prevucite za Sortiranje";
> 		$admtext['addlinks'] = "Dodah nove Linkove";
> 		$admtext['inclmsg'] = " uklju�en";
> 		$admtext['mediasubt'] = "Upravljanje medijima uklju�enim u ovaj album (Dodaj, Briši, Sortiraj)";
> 		$admtext['infosubt'] = "Uredite naziv albuma, opis i klju�ne rije�i";
> 		$admtext['linkssubt'] = "Povežite ovu stavku s ljudima, obiteljima, izvorima, spremištima ili mjestima";
> 		$admtext['inclmedia'] = "Uklju�ena Medija";
> 		$admtext['nomedia'] = "Još nije uklju�en nijedan medija";
> 		$admtext['thumbsize'] = "(original je prevelik)";
> 		$admtext['thumbinv'] = "(nevažeća slika ili neadekvatna dopuštenja)";
> 		$admtext['thumblost'] = "(original nije pronađen)";
> 		$admtext['uplsel'] = "Prenesite novu datoteku s ra�unala ili odaberite datoteke iz vaše web lokacije";
> 		$admtext['alblater'] = "NAPOMENA: Ovom albumu mogu se dodati mediji, a album na pojedina�ne obitelji ili obitelji na sljedećem zaslonu.";
> 		$admtext['medlater'] = "NAPOMENA: Na sljedećem se zaslonu mogu dodati dodatne informacije i stavke povezane s pojedincima ili obiteljima.";
> 		$admtext['minfosubt'] = "Uredi naslova, opisa i drugih osnovnih podataka";
> 		$admtext['defphoto'] = "Zadana fotografija";
> 		$admtext['alttd'] = "Skraćena kratica za Zamjenski naslov ili Opis";   //short abbreviation for "Alternate Title or Description"
> 		$admtext['editmedialink'] = "Uredi vezu Madije";
> 		$admtext['plot'] = "Zavjera";
> 		$admtext['addnewcoll'] = "Dodaj Kolekciju";
> 		$admtext['collid'] = "Kolekcije ID";
> 		$admtext['colldisplay'] = "Prikaz Naslova";
> 		$admtext['collpath'] = "Ime datoteke";
> 		$admtext['collicon'] = "Datoteka ikona";
> 		$admtext['colllike'] = "Ista postava kao";
> 		$admtext['entercollid'] = "Unesite ID kolekcije.";
> 		$admtext['entercolldisplay'] = "Unesite prikazno ime zbirke.";
> 		$admtext['entercollpath'] = "Unesite naziv mape zbirke.";
> 		$admtext['entercollicon'] = "Unesite naziv datoteke ikone zbirke.";
> 		$admtext['editcoll'] = "Uredi Kolekciju";
> 		$admtext['confmtdelete'] = "Jeste li sigurni da želite izbrisati ovu vrstu medija?";
> 		$admtext['histlimit'] = "<strong>NAPOMENA o VELIČINI:</strong> Većina preglednika ograni�ava koli�inu podataka koja se može poslati u web obliku na oko 64Kb. Ako u polje za tekst teksta unesete veliku koli�inu teksta, možete razmisliti o tome da upotrebite historytemplate.php. Dodatne informacije potražite u pomoći.";
> 		$admtext['repath'] = "Regenerirajte nazive staza sli�ica tamo gdje datoteka ne postoji";
> 		$admtext['sortalbumind'] = "Poredajte albume za Pojedinca, Obitelj, Izvor, Spremište ili Mjesto";
> 		$admtext['cidexists'] = "ID kolekcije koji ste unijeli nije bilo moguće dodati jer on već postoji.";
> 		$admtext['phalltrees'] = "Opcijski. Ostavite prazno kako bi fotografije mogle biti vidljive na svim stablima.";
> 		$admtext['fileexists'] = "Ova datoteka već postoji. Prepiši?";
> 		$admtext['collthumb'] = "Datoteka sli�ica";
> 		$admtext['movetop'] = "Pomica0e na vrh";
> 		$admtext['collexpas'] = "Izvoz kao";
> 		$admtext['upload'] = "Prenosit";
> 		$admtext['linksel'] = "Veza do odabranog";
> 		$admtext['mediaupl'] = "Prenosite Mediju";
> 		$admtext['addfiles'] = "Dodaj datoteke...";
> 		$admtext['startupl'] = "Po�etak prenosit";
> 		$admtext['start'] = "Po�etak";
> 		$admtext['cancelupl'] = "Odustani prenosit";
> 		$admtext['localpath'] = "Lokalni put(ovi)";
555c582,593
< 		$admtext['confdelmediafile'] = "Do you want to delete the physical file as well?";
---
> 		$admtext['confdelmediafile'] = "Želite li izbrisati i fizi�ku datoteku?";
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML slikovna karta (za nazadnu kompatibilnost)";
> 		$admtext['photoowner'] = "Vlasnik originala";
> 		$admtext['nothumb'] = "Nema sli�ica";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Stavku nije bilo moguće dodati, najvjerojatnije zato što je datoteka bila prevelika i nije se mogla prenijeti ili upotrijebiti za izradu minijature.";
> 		$admtext['moved'] = "Pomaknuto";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Unesite naslov ili opis za ovaj medij.";
> 		$admtext['mapinstr3'] = "Da biste povezali podru�je ove fotografije s osobom, obitelji ili drugim entitetom, prvo odaberite relevantno stablo i vrstu entiteta, a zatim izradite pravokutnik za željeno podru�je. To se radi klikom na gornji lijevi kut regije i zatim povla�enjem u donji desni kut. Alternativno, možete kliknuti u gornjem lijevom kutu, a zatim ponovno u donjem desnom kutu. Sko�ni okvir će vam tada pomoći da odaberete osobu ili drugi entitet. Odaberite, a zatim ponovite ovaj postupak prema potrebi za dodatne regije. Pritisnite postojeću regiju za odabir, zatim povucite za premještanje ili kliknite 'X' za brisanje.";
560,578c598,616
< 		$admtext['changestoreport'] = "Changes to report";
< 		$admtext['modifyreport'] = "Modify Existing Report";
< 		$admtext['existingreportinfo'] = "Existing Report Information";
< 		$admtext['existingreports'] = "Existing Reports";
< 		$admtext['newreportinfo'] = "New Report Information";
< 		$admtext['reportname'] = "Report Name";
< 		$admtext['rankpriority'] = "Rank/Priority";
< 		$admtext['choosedisplay'] = "Choose Fields to Display";
< 		$admtext['spouseid'] = "Spouse ID";
< 		$admtext['spousename'] = "Spouse Name";
< 		$admtext['lastmodified'] = "Zadnje modificirano";
< 		$admtext['ldsbapldate'] = "LDS Baptism Date";
< 		$admtext['ldsbaplplace'] = "LDS Baptism Place";
< 		$admtext['ldsendldate'] = "LDS Endowment Date";
< 		$admtext['ldsendlplace'] = "LDS Endowment Place";
< 		$admtext['ldssealsdate'] = "LDS Seal/Spouse Date";
< 		$admtext['ldssealsplace'] = "LDS Seal/Spouse Place";
< 		$admtext['ldssealpdate'] = "LDS Seal/Parents Date";
< 		$admtext['ldssealpplace'] = "LDS Seal/Parents Place";
---
> 		$admtext['changestoreport'] = "Promjene u izvješćima";
> 		$admtext['modifyreport'] = "Uredi postojećeg izvješća";
> 		$admtext['existingreportinfo'] = "Postojeće informacije o izvještaju";
> 		$admtext['existingreports'] = "Postojeće Izvještaju";
> 		$admtext['newreportinfo'] = "Nova informacije o izvještaju";
> 		$admtext['reportname'] = "Naziv Izvješća";
> 		$admtext['rankpriority'] = "Pozicija/Prioritet";
> 		$admtext['choosedisplay'] = "Odaberite polja za prikaz";
> 		$admtext['spouseid'] = "ID supružnika";
> 		$admtext['spousename'] = "Supružnika Ime";
> 		$admtext['lastmodified'] = "Datum zadnje izmjene";
> 		$admtext['ldsbapldate'] = "Datum Krštenja LDS";
> 		$admtext['ldsbaplplace'] = "Mjesto Krštenja LDS";
> 		$admtext['ldsendldate'] = "Datum Potpisivanja LDS";
> 		$admtext['ldsendlplace'] = "Mjesto Potpisivanja LDS";
> 		$admtext['ldssealsdate'] = "Datum Pe�ata/Supružnika LDS";
> 		$admtext['ldssealsplace'] = "Mjesto Pe�ata/Supružnika LDS";
> 		$admtext['ldssealpdate'] = "Datum Pe�at/Roditelja LDS";
> 		$admtext['ldssealpplace'] = "Mjesto Pe�at/Roditelja LDS";
580,637c618,673
< 		$admtext['choosecriteria'] = "Choose Criteria";
< 		$admtext['fullname'] = "Full Name";
< 		$admtext['lastfirst'] = "Last Name, First Name";
< 		$admtext['monthonlyfrom'] = "Month Only From";
< 		$admtext['yearonlyfrom'] = "Year Only From";
< 		$admtext['dayonlyfrom'] = "Day Only From";
< 		$admtext['operators'] = "Operators";
< 		$admtext['contains'] = "contains";
< 		$admtext['startswith'] = "starts with";
< 		$admtext['endswith'] = "ends with";
< 		$admtext['text_and'] = "AND";
< 		$admtext['currentmonth'] = "Current Month";
< 		$admtext['currentyear'] = "Current Year";
< 		$admtext['currentday'] = "Current Day";
< 		$admtext['constantstring'] = "Constant String";
< 		$admtext['constantvalue'] = "Constant Value";
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
< 		$admtext['choosesort'] = "Choose Sort Fields";
< 		$admtext['savereport'] = "Save Report";
< 		$admtext['addnewreport'] = "Add New Report";
< 		$admtext['createreport'] = "Create a new report";
< 		$admtext['noreports'] = "No reports exist";
< 		$admtext['rank'] = "Rank";
< 		$admtext['confreportdelete'] = "Are you sure you want to delete this report?";
< 		$admtext['enterreportname'] = "Please enter a Report Name.";
< 		$admtext['selectdisplayfield'] = "Please select at least one display field.";
< 		$admtext['today'] = "Today (true date)";
< 		$admtext['convtodays'] = "Convert to Days";
< 		$admtext['desc'] = "Descending (Prev)";
< 		$admtext['birthdatetr'] = "Birth Date (True)";
< 		$admtext['chrdatetr'] = "Christening Date (True)";
< 		$admtext['deathdatetr'] = "Death Date (True)";
< 		$admtext['burialdatetr'] = "Burial Date (True)";
< 		$admtext['marriagedatetr'] = "Marriage Date (True)";
< 		$admtext['ldsbapldatetr'] = "LDS Baptism Date (True)";
< 		$admtext['ldsendldatetr'] = "LDS Endowment Date (True)";
< 		$admtext['ldssealsdatetr'] = "LDS Seal/Spouse Date (True)";
< 		$admtext['ldssealpdatetr'] = "LDS Seal/Parents Date (True)";
< 		$admtext['currentmonthnum'] = "Current Month Number";
< 		$admtext['livingtrue'] = "Living = yes";
< 		$admtext['livingfalse'] = "Living = no";
< 		$admtext['altreport'] = "OR Leave Display, Criteria and Sort fields blank and enter direct SQL SELECT statement here";
< 		$admtext['rptdate'] = "Date";
< 		$admtext['rptdatetr'] = "Date (True)";
< 		$admtext['fact'] = "Fact";
< 		$admtext['testeditdelete'] = "Add, edit, test or delete reports";
< 		$admtext['wnmsg'] = "Message on \"What's New\" Page";
< 		$admtext['mwtype'] = "Type";
< 		$admtext['mysphoto'] = "Mystery Photos";
< 		$admtext['mysperson'] = "Elusive People";
< 		$admtext['selphoto'] = "Select Photo";
< 		$admtext['entertitle'] = "Please enter a title";
< 		$admtext['enterdesc'] = "Please enter a description";
< 		$admtext['confremmw'] = "Are you sure you want to remove this item?";
< 		$admtext['msgsaved'] = "Message saved";
< 		//added in 9.1.1
< 		$admtext['privatetrue'] = "Private = yes";
< 		$admtext['privatefalse'] = "Private = no";
---
> 		$admtext['choosecriteria'] = "Odaberite kriterije";
> 		$admtext['fullname'] = "Puno Ime";
> 		$admtext['lastfirst'] = "Prezime, Ime";
> 		$admtext['monthonlyfrom'] = "Mjesec samo od";
> 		$admtext['yearonlyfrom'] = "Godina samo od";
> 		$admtext['dayonlyfrom'] = "Dan samo od";
> 		$admtext['operators'] = "Operatori";
> 		$admtext['contains'] = "sadrži";
> 		$admtext['startswith'] = "po�inje sa";
> 		$admtext['endswith'] = "završava sa";
> 		$admtext['text_and'] = "I";
> 		$admtext['currentmonth'] = "Trenutni Mjesec";
> 		$admtext['currentyear'] = "Trenutna Godina";
> 		$admtext['currentday'] = "Trenitni Day";
> 		$admtext['constantstring'] = "Stalni Niz";
> 		$admtext['constantvalue'] = "Stalna Vrijednost";
> 		$admtext['choosesort'] = "Odaberite Poredaj polja";
> 		$admtext['savereport'] = "Sa�uvaj Izvješće";
> 		$admtext['addnewreport'] = "Dodaj novo Izvješće";
> 		$admtext['createreport'] = "Stvori novo Izvješće";
> 		$admtext['noreports'] = "Nema Izvješća";
> 		$admtext['rank'] = "Rang";
> 		$admtext['confreportdelete'] = "Jeste li sigurni da želite izbrisati ovo izvješće?";
> 		$admtext['enterreportname'] = "Unesite naziv izvješća.";
> 		$admtext['selectdisplayfield'] = "Odaberite barem jedno prikazno polje.";
> 		$admtext['today'] = "Danas (istinit datum)";
> 		$admtext['convtodays'] = "Pretvori u dane";
> 		$admtext['desc'] = "Silazno (prethodna)";
> 		$admtext['birthdatetr'] = "Datum Rođenja (istina)";
> 		$admtext['chrdatetr'] = "Datum Krštenja (istina)";
> 		$admtext['deathdatetr'] = "Datum Smrti (istina)";
> 		$admtext['burialdatetr'] = "Datum Pokopan (istina)";
> 		$admtext['marriagedatetr'] = "Datum Vjen�anja (istina)";
> 		$admtext['ldsbapldatetr'] = "Datum Krštenja LDS (istina)";
> 		$admtext['ldsendldatetr'] = "Datum Potpisivanja LDS (istina))";
> 		$admtext['ldssealsdatetr'] = "Datum Pe�ata/Supružnika LDS (istina)";
> 		$admtext['ldssealpdatetr'] = "Datum Pe�ata/Supružnika LDS (istina)";
> 		$admtext['currentmonthnum'] = "Broj Trenutnog Mjeseca";
> 		$admtext['livingtrue'] = "Living = da";
> 		$admtext['livingfalse'] = "Living = ne";
> 		$admtext['altreport'] = "ILI Ostavite polja prazna, Kriterije i Sortiranje prazna i ovdje unesite izravan SQL SELECT izraz";
> 		$admtext['rptdate'] = "Datum";
> 		$admtext['rptdatetr'] = "Datum (Istini)";
> 		$admtext['fact'] = "ÄŒinjenica";
> 		$admtext['testeditdelete'] = "Dodaj, Uredi, Test ili Obriši izvještaje";
> 		$admtext['wnmsg'] = "Poruka na stranici \"Novosti \"";
> 		$admtext['mwtype'] = "Tip";
> 		$admtext['mysphoto'] = "Tajanstvene fotografije";
> 		$admtext['mysperson'] = "Nedostižni ljudi";
> 		$admtext['selphoto'] = "Odaberite Sliku";
> 		$admtext['entertitle'] = "Unesite naslov";
> 		$admtext['enterdesc'] = "Unesite opis";
> 		$admtext['confremmw'] = "Jeste li sigurni da želite ukloniti ovaj predmet?";
> 		$admtext['msgsaved'] = "Poruka je sa�uvan";
> 		$admtext['privatetrue'] = "Private = da";
> 		$admtext['privatefalse'] = "Private = ne";
639,646c675,686
< 		$admtext['ldsconfdate'] = "LDS Confirmation Date";
< 		$admtext['ldsconfplace'] = "LDS Confirmation Place";
< 		$admtext['ldsconfdatetr'] = "LDS Confirmation Date (True)";
< 		$admtext['ldsinitdate'] = "LDS Initiatory Date";
< 		$admtext['ldsinitplace'] = "LDS Initiatory Place";
< 		$admtext['ldsinitdatetr'] = "LDS Initiatory Date (True)";
< 		$admtext['savecopy'] = "Save as copy";
< 		$admtext['activeonly'] = "Active only";
---
> 		$admtext['ldsconfdate'] = "Datum potvrde LDS";
> 		$admtext['ldsconfplace'] = "Mjesto potvrde LDS";
> 		$admtext['ldsconfdatetr'] = "Datum potvrde LDS (istina)";
> 		$admtext['ldsinitdate'] = "Datum inicijative LDS";
> 		$admtext['ldsinitplace'] = "Mjesto inicijative LDS";
> 		$admtext['ldsinitdatetr'] = "Datum inicijative LDS (istina)";
> 		$admtext['savecopy'] = "Sa�uvaj kao kopiju";
> 		$admtext['activeonly'] = "Samo aktivan";
> 		//added in 14.0
> 		$admtext['instr'] = "Upute: Povucite ili dvaput kliknite stavke lijevo na popise desno. Povucite gore i dolje za promjenu redoslijeda. Ponovno dvaput kliknite za uklanjanje.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Za prazan niz ostavite ovo polje praznim i kliknite >>";
651,692c691,700
< 		$admtext['selectimportfile'] = "Please select a file to import.";
< 		$admtext['importgedcom'] = "Import GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
< 		$admtext['fromyourcomputer'] = "From your computer";
< 		$admtext['importdata'] = "Import Data";
< 		$admtext['setupfirsttime'] = "Set up the software for the first time.";
< 		$admtext['replace'] = "Replace (in selected tree)";
< 		$admtext['desttree'] = "Destination Tree";
< 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
< 		$admtext['selectexisting'] = "Import into";
< 		$admtext['importgedcom2'] = "Import a GEDCOM file";
< 		$admtext['setupitems'] = "Create database tables, Set preferences";
< 		$admtext['custeventitems'] = "Manage custom tags and event types";
< 		$admtext['usersitems'] = "Manage users and permissions";
< 		$admtext['reportsitems'] = "Create custom lists and reports";
< 		$admtext['langitems'] = "Manage alternate languages";
< 		$admtext['backupitems'] = "Back up, restore and optimize database tables";
< 		$admtext['ucaselast'] = "Upper case all surnames";
< 		$admtext['norecalc'] = "Do not recalculate Living flag";
< 		$admtext['autooffset'] = "Start IDs at first available number";
< 
< 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
< 		$admtext['importmedia'] = "Import media if present";
< 		$admtext['mainmenu'] = "Main Menu";
< 		$admtext['neweronly'] = "Replace only if newer";
< 		$admtext['secondaryitems'] = "Create a GENDEX file, Track lines of descent";
< 		$admtext['onwebserver'] = "From web site (in GEDCOM folder)";
< 		$admtext['eventsonly'] = "Import Custom Event Types Only (no data is added, replaced or appended)";
< 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "click here to resume";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Change Log";
---
> 		$admtext['setupfirsttime'] = "Postavljanje prvog softvera.";
> 		$admtext['importgedcom2'] = "Uvezite GEDCOM datoteku";
> 		$admtext['setupitems'] = "Stvaranje tablica baze podataka, Postavljanje postavki";
> 		$admtext['custeventitems'] = "Upravljanje prilagođenim oznakama i vrstama događaja";
> 		$admtext['usersitems'] = "Upravljanje korisnicima i dozvolama";
> 		$admtext['reportsitems'] = "Stvori prilagođenih popisa i izvještaja";
> 		$admtext['langitems'] = "Upravljanje alternativnim jezicima";
> 		$admtext['backupitems'] = "Izradite sigurnosnu kopiju, obnovite i optimizirajte tablice baza podataka";
> 		$admtext['mainmenu'] = "Glavni izbornik";
> 		$admtext['secondaryitems'] = "Stvori GENDEX datoteku, Pratite linije silaska";
694,696c702
< 		$admtext['mmgritems'] = "Configure 3rd party add-ons";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
---
> 		$admtext['mmgritems'] = "Instalirajte i deinstalirajte TNG modove";
698c704
< 		$admtext['miscitems'] = "Notes, What's New, Most Wanted";
---
> 		$admtext['miscitems'] = "Novosti, Najviše Tražimo, Provjeru Podataka";
700,711c706,717
< 		$admtext['tasks'] = "Important tasks";
< 		$admtext['task_revusers'] = "Review new user registrations";
< 		$admtext['task_tree'] = "Create your first tree";
< 		$admtext['task_user'] = "Create a user account for yourself";
< 		$admtext['task_people'] = "add new people";
< 		$admtext['task_families'] = "Add new families";
< 		$admtext['task_revind'] = "Review proposed changes to individual events";
< 		$admtext['task_revfam'] = "Review proposed changes to family events";
< 		$admtext['task_backup'] = "Back up the data";
< 		$admtext['nobackups'] = "no backups exist";
< 		$admtext['lastbackup'] = "Last Backup";
< 		$admtext['dna_blurb'] = "Log DNA tests and link them to individuals";
---
> 		$admtext['tasks'] = "Važni Zadatki";
> 		$admtext['task_revusers'] = "Pregledajte nove korisni�ke registracije";
> 		$admtext['task_tree'] = "Stvorite svoje prvo stablo";
> 		$admtext['task_user'] = "Stvorite korisni�ki ra�un za sebe";
> 		$admtext['task_people'] = "dodaj nove ljude";
> 		$admtext['task_families'] = "Dodaj novu Obitelj";
> 		$admtext['task_revind'] = "Pregledajte predložene izmjene pojedinih događaja";
> 		$admtext['task_revfam'] = "Pregledajte predložene izmjene obiteljskih događaja";
> 		$admtext['task_backup'] = "Izradite sigurnosnu kopiju podataka";
> 		$admtext['nobackups'] = "nema sigurnosnih kopija";
> 		$admtext['lastbackup'] = "posljednja sigurnosna kopija pravljena prije više od xxx dana";
> 		$admtext['dna_blurb'] = "Prijavite DNA testove i povežite ih s pojedincima";
713c719,724
< 		$admtext['task_mapkey'] = "Get a map key from Google to enable maps display";
---
> 		$admtext['task_mapkey'] = "Nabavite klju� karte od Google da bi se omogućio prikaz karata";
> 		//added in 14.0
> 		$admtext['upgrade'] = "Nadogradnja";
> 		$admtext['need_upgrade'] = "Dovršite ove upute za nadogradnja";
> 		$admtext['upgrade_missing'] = "Čini se da datoteka za nadogradnju nedostaje, pa ste možda već gotovi.";
> 		$admtext['delete_upgrade'] = "Kada završite, kliknite ovdje za brisanje nadogradnje i povratak na izbornik.";
718,765c729,775
< 		$admtext['changestosource'] = "Changes to source";
< 		$admtext['modifysource'] = "Modify Existing Source";
< 		$admtext['selectsrcaction'] = "Select Source and Action";
< 		$admtext['shorttitle'] = "Short Title";
< 		$admtext['longtitle'] = "Long Title";
< 		$admtext['author'] = "Author";
< 		$admtext['callnumber'] = "Call Number";
< 		$admtext['publisher'] = "Publisher";
< 		$admtext['actualtext'] = "Actual Text";
< 		$admtext['confdeletesrc'] = "Are you sure you want to delete this source?";
< 		$admtext['selectshorttitle'] = "Please select or enter a short title for this event type.";
< 		$admtext['existingsourceinfo'] = "Existing Information for Source";
< 		$admtext['newsourceinfo'] = "New Source Information";
< 		$admtext['addnewsource'] = "Add New Source";
< 		$admtext['prefixsourceid'] = "Please prefix Source ID with \"S\" for \"Source\"";
< 		$admtext['entersourceid'] = "Please enter a Source ID.";
< 		$admtext['validsourceid'] = "Please enter a valid Source ID. A valid ID is a numeric string prefixed with 'S'.";
< 		$admtext['createsource'] = "Create a record for a new source";
< 		$admtext['editexistingsource'] = "Edit information for a previously entered source";
< 		$admtext['addnewcite'] = "Add New Citation";
< 		$admtext['reliability'] = "Reliability";
< 		$admtext['relyexplain'] = "Higher numbers indicate greater reliability.";
< 		$admtext['citedate'] = "Citation Date";
< 		$admtext['modifycite'] = "Modify Existing Citation";
< 		$admtext['addingcite'] = "Adding Citation...";
< 		$admtext['deletingcite'] = "Deleting Citation...";
< 		$admtext['updatingcite'] = "Updating Citation...";
< 		$admtext['sevslater'] = "Note: Additional events and notes may be added after the new source has been saved.";
< 		$admtext['pleasesourcepart'] = "Please enter part of the source title.";
< 		$admtext['addnewrepo'] = "Add New Repository";
< 		$admtext['modifyrepo'] = "Modify Existing Repository";
< 		$admtext['createrepo'] = "Create a record for a new repository";
< 		$admtext['editexistingrepo'] = "Edit information for a previously entered repository";
< 		$admtext['enterrepoid'] = "Please enter a Repository ID.";
< 		$admtext['enterreponame'] = "Please enter a Repository name.";
< 		$admtext['newrepoinfo'] = "New Repository Information";
< 		$admtext['prefixrepoid'] = "Please prefix Repository ID with \"REPO\" for \"Repository\"";
< 		$admtext['selectrepoaction'] = "Select Repository and Action";
< 		$admtext['confdeleterepo'] = "Are you sure you want to delete this repository?";
< 		$admtext['changestorepo'] = "Changes to repository";
< 		$admtext['existingrepoinfo'] = "Existing Information for Repository";
< 		$admtext['pleaserepopart'] = "Please enter part of the repository title.";
< 		$admtext['choosemergesources'] = "Choose sources to merge or find potential matches";
< 		$admtext['confirmmergesources'] = "Are you sure you want to merge these two sources?";
< 		$admtext['choosemergerepos'] = "Choose repositories to merge or find potential matches";
< 		$admtext['confirmmergerepos'] = "Are you sure you want to merge these two repositories?";
< 		$admtext['revslater'] = "Note: Additional events and notes may be added after the new repository has been saved.";
< 		$admtext['confdeleterepo'] = "Are you sure you want to delete this repository?";
---
> 		$admtext['changestosource'] = "Promjene izvora";
> 		$admtext['modifysource'] = "Uređivanje postojećeg izvora";
> 		$admtext['selectsrcaction'] = "Odaberite Izvor i radnja";
> 		$admtext['shorttitle'] = "Kratki naslov";
> 		$admtext['longtitle'] = "Dugi naslov";
> 		$admtext['callnumber'] = "Poziv Broj";
> 		$admtext['publisher'] = "Izdava�";
> 		$admtext['actualtext'] = "Stvarni tekst";
> 		$admtext['confdeletesrc'] = "Jeste li sigurni da želite izbrisati taj izvor?";
> 		$admtext['selectshorttitle'] = "Odaberite ili unesite kratak naslov za ovu vrstu događaja.";
> 		$admtext['existingsourceinfo'] = "Postojeće informacije za izvor";
> 		$admtext['newsourceinfo'] = "Nove informacije o izvoru";
> 		$admtext['addnewsource'] = "Dodaj Izvor";
> 		$admtext['prefixsourceid'] = "Prefiks izvora ID s \"S \" za \"Izvor \"";
> 		$admtext['entersourceid'] = "Unesite ID izvora.";
> 		$admtext['validsourceid'] = "Unesite valjani ID izvora. Valjani ID je numeri�ki niz s prefiksom 'S'.";
> 		$admtext['createsource'] = "Stvorite zapis za novi izvor";
> 		$admtext['editexistingsource'] = "Uredi podataka za prethodno upisani izvor";
> 		$admtext['addnewcite'] = "Dodaj Citat";
> 		$admtext['reliability'] = "Pouzdanost";
> 		$admtext['relyexplain'] = "Veći broj ukazuje na veću pouzdanost.";
> 		$admtext['citedate'] = "Datum Citata";
> 		$admtext['modifycite'] = "Uredi postojeći Citat";
> 		$admtext['addingcite'] = "Dodavanje Citata...";
> 		$admtext['deletingcite'] = "Brisanje Citata...";
> 		$admtext['updatingcite'] = "Ažuriranje Citata...";
> 		$admtext['sevslater'] = "NAPOMENA: Nakon sa�uvanja novog izvora mogu se dodati dodatni događaji i bilješke.";
> 		$admtext['pleasesourcepart'] = "Unesite dio naslova izvora.";
> 		$admtext['addnewrepo'] = "Dodaj Spremište";
> 		$admtext['modifyrepo'] = "Uredi postojeći Spremište";
> 		$admtext['createrepo'] = "Stvorite zapis za novo spremište";
> 		$admtext['editexistingrepo'] = "Uredi podataka za prethodno uneseno spremište";
> 		$admtext['enterrepoid'] = "Unesite ID spremišta.";
> 		$admtext['enterreponame'] = "Unesite naziv spremišta.";
> 		$admtext['newrepoinfo'] = "Nove informacije o spremištu";
> 		$admtext['prefixrepoid'] = "Prefiks ID spremišta s \"REPO \" za \"Spremište \"";
> 		$admtext['selectrepoaction'] = "Odaberite Spremište i akcija";
> 		$admtext['confdeleterepo'] = "Jeste li sigurni da želite izbrisati ovo spremište?";
> 		$admtext['changestorepo'] = "Promjene u spremištu";
> 		$admtext['existingrepoinfo'] = "Postojeće informacije o spremištu";
> 		$admtext['pleaserepopart'] = "Unesite dio naslova spremišta.";
> 		$admtext['choosemergesources'] = "Odaberite izvore za spajanje ili pronalazak ma�eva";
> 		$admtext['confirmmergesources'] = "Jeste li sigurni da želite spojiti ta dva izvora?";
> 		$admtext['choosemergerepos'] = "Odaberite spremišta koja će se spojiti ili pronaći ma�eva";
> 		$admtext['confirmmergerepos'] = "Jeste li sigurni da želite spojiti ta dva spremišta?";
> 		$admtext['revslater'] = "NAPOMENA: Nakon sa�uvanja novog spremišta, mogu se dodati dodatni događaji i bilješke.";
> 		$admtext['confdeleterepo'] = "Jeste li sigurni da želite izbrisati ovo spremište?";
770,775c780,785
< 		$admtext['checknewid'] = "Check New ID";
< 		$admtext['idnotvalid'] = "is not a valid ID. A valid ID is a numeric string prefixed with";
< 		$admtext['idinuse'] = "is in use. Please choose a different ID";
< 		$admtext['idok'] = "is OK to use";
< 		$admtext['isok'] = "is OK to use";
< 		$admtext['isinuse'] = "is already in use.";
---
> 		$admtext['checknewid'] = "Provjerite novi ID";
> 		$admtext['idnotvalid'] = "nije važeći ID. Valjani ID je numeri�ki niz s prefiksom";
> 		$admtext['idinuse'] = "je u upotrebi. Odaberite drugi ID";
> 		$admtext['idok'] = "je u redu za upotrebu";
> 		$admtext['isok'] = "je u redu za upotrebu";
> 		$admtext['isinuse'] = "već se koristi.";
779,830c789,840
< 		$admtext['templatenum'] = "Template Number";
< 		$admtext['mainimage'] = "Main image (home page)"; //1, 2, 3, 4, 5, 7
< 		$admtext['titleimage'] = "Title image (home page)"; //1, 2, 3
< 		$admtext['headline'] = "Headline"; //4, 7
< 		$admtext['mainpara'] = "Welcome paragraph";  //1, 4, 6, 7, 8
< 		$admtext['headimgplustitle'] = "Header image (including title)"; //1
< 		$admtext['pedperson'] = "Pedigree person ID"; //2
< 		$admtext['pedtree'] = "Pedigree tree ID"; //2
< 		$admtext['phhistperson'] = "Photos & Histories person ID"; //2
< 		$admtext['phhisttree'] = "Photos & Histories tree ID"; //2
< 		$admtext['headimg'] = "Header image"; //2, 3, 4, 5, 6, 8
< 		$admtext['headtitleimg'] = "Header title image"; //2, 3
< 		$admtext['titleimg'] = "Title image (all pages)"; //4, 7
< 		$admtext['searchpara'] = "Search paragraph"; //6
< 		$admtext['fhpara'] = "Family Histories paragraph"; //6
< 		$admtext['fhlinkshis'] = "Family Histories links (His)"; //6
< 		$admtext['fhlinkshers'] = "Family Histories links (Hers)"; //6
< 		$admtext['mwpara'] = "Most Wanted paragraph"; //6
< 		$admtext['respara'] = "Resources paragraph"; //6
< 		$admtext['reslinks'] = "Resources links"; //6
< 		$admtext['headtitle1'] = "Header title, part 1"; //8
< 		$admtext['headtitle2'] = "Header title, part 2"; //8
< 		$admtext['headtitle3'] = "Header title, part 3"; //8
< 		$admtext['headsubtitle'] = "Header subtitle"; //8
< 		$admtext['latestnews'] = "Latest news"; //8
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
< 		$admtext['featurethumb1'] = "Feature 1 thumbnail"; //4
< 		$admtext['featurelink1'] = "Feature 1 link"; //4
< 		$admtext['featuretitle1'] = "Feature 1 title"; //4
< 		$admtext['featurepara1'] = "Feature 1 paragraph"; //4
< 		$admtext['featurethumb2'] = "Feature 2 thumbnail"; //4
< 		$admtext['featurelink2'] = "Feature 2 link"; //4
< 		$admtext['featuretitle2'] = "Feature 2 title"; //4
< 		$admtext['featurepara2'] = "Feature 2 paragraph"; //4
< 		$admtext['featurethumb3'] = "Feature 3 thumbnail"; //4
< 		$admtext['featurelink3'] = "Feature 3 link"; //4
< 		$admtext['featuretitle3'] = "Feature 3 title"; //4
< 		$admtext['featurepara3'] = "Feature 3 paragraph"; //4
< 		$admtext['featurethumb4'] = "Feature 4 thumbnail"; //4
< 		$admtext['featurelink4'] = "Feature 4 link"; //4
< 		$admtext['featuretitle4'] = "Feature 4 title"; //4
< 		$admtext['featurepara4'] = "Feature 4 paragraph"; //4
< 		$admtext['photocaption'] = "Main image caption"; //4
< 		$admtext['maintitle'] = "Main title"; //5
< 		$admtext['hisside'] = "His Side label"; //5
< 		$admtext['herside'] = "Her Side label"; //5
< 		$admtext['newstext'] = "News text"; //5
---
> 		$admtext['templatenum'] = "Broj Predloška";
> 		$admtext['mainimage'] = "Glavna slika (po�etna stranica)"; //1, 2, 3, 4, 5, 7
> 		$admtext['titleimage'] = "Naslovna slika (po�etna stranica)"; //1, 2, 3
> 		$admtext['headline'] = "Naslov"; //4, 7
> 		$admtext['mainpara'] = "Odjeljak dobrodošlice";  //1, 4, 6, 7, 8
> 		$admtext['headimgplustitle'] = "Slika zaglavlja (uklju�ujući naslov)"; //1
> 		$admtext['pedperson'] = "Pedigreska osoba ID"; //2
> 		$admtext['pedtree'] = "Pedigresko stablo ID"; //2
> 		$admtext['phhistperson'] = "Fotografije i Povijesti osobe ID"; //2
> 		$admtext['phhisttree'] = "Fotografije i Povijesti stabla ID"; //2
> 		$admtext['headimg'] = "Slika zaglavlja"; //2, 3, 4, 5, 6, 8
> 		$admtext['headtitleimg'] = "Slika naslova zaglavlja"; //2, 3
> 		$admtext['titleimg'] = "Naslovna slika (sve stranice)"; //4, 7
> 		$admtext['searchpara'] = "Odlomak za pretraživanje"; //6
> 		$admtext['fhpara'] = "Stavak Obiteljske povijesti"; //6
> 		$admtext['fhlinkshis'] = "Poveznice obiteljske povijesti (Njegove)"; //6
> 		$admtext['fhlinkshers'] = "Poveznice obiteljske povijesti (Njezine)"; //6
> 		$admtext['mwpara'] = "Odlomak Najtraženiji"; //6
> 		$admtext['respara'] = "Odlok o resursima"; //6
> 		$admtext['reslinks'] = "Veze za resurse"; //6
> 		$admtext['headtitle1'] = "Naslov zaglavlja, 1. dio"; //8
> 		$admtext['headtitle2'] = "Naslov zaglavlja, 2. dio"; //8
> 		$admtext['headtitle3'] = "Naslov zaglavlja, 3. dio"; //8
> 		$admtext['headsubtitle'] = "Podnaslov zaglavlja"; //8
> 		$admtext['latestnews'] = "Najnovije vijesti"; //8
> 		$admtext['momside'] = "Natpis na Maminoj strani"; //8, 20
> 		$admtext['dadside'] = "Natpis na Tatinoj strani"; //8, 20
> 		$admtext['momperson'] = "Mamine Strane osobna ID"; //8, 20
> 		$admtext['momtree'] = "Mamine Strane stablo ID"; //8, 20
> 		$admtext['dadperson'] = "Tatine Strane osobna ID"; //8, 20
> 		$admtext['dadtree'] = "Tatine Strane stablo ID"; //8, 20
> 		$admtext['featurethumb1'] = "Zna�ajke 1 sli�ica"; //4
> 		$admtext['featurelink1'] = "Zna�ajke 1 linkovi"; //4
> 		$admtext['featuretitle1'] = "Zna�ajke 1 naslov"; //4
> 		$admtext['featurepara1'] = "Zna�ajke 1 pasus"; //4
> 		$admtext['featurethumb2'] = "Zna�ajke 2 sli�ica"; //4
> 		$admtext['featurelink2'] = "Zna�ajke 2 linkovi"; //4
> 		$admtext['featuretitle2'] = "Zna�ajke 2 naslov"; //4
> 		$admtext['featurepara2'] = "Zna�ajke 2 pasus"; //4
> 		$admtext['featurethumb3'] = "Zna�ajke 3 sli�ica"; //4
> 		$admtext['featurelink3'] = "Zna�ajke 3 linkovi"; //4
> 		$admtext['featuretitle3'] = "Zna�ajke 3 naslov"; //4
> 		$admtext['featurepara3'] = "Zna�ajke 3 pasus"; //4
> 		$admtext['featurethumb4'] = "Zna�ajke 4 sli�ica"; //4
> 		$admtext['featurelink4'] = "Zna�ajke 4 linkovi"; //4
> 		$admtext['featuretitle4'] = "Zna�ajke 4 naslov"; //4
> 		$admtext['featurepara4'] = "Zna�ajke 4 pasus"; //4
> 		$admtext['photocaption'] = "Opis slike"; //4
> 		$admtext['maintitle'] = "Glavni naslov"; //5
> 		$admtext['hisside'] = "Njegove Strave oznak"; //5
> 		$admtext['herside'] = "Njezine Strave oznak"; //5
> 		$admtext['newstext'] = "Tekst vijesti"; //5
832c842
< 		$admtext['templateswitching'] = "Enable Template Selection";
---
> 		$admtext['templateswitching'] = "Omogući odabir predloška";
834,838c844,848
< 		$admtext['template'] = "Template";
< 		$admtext['createcopy'] = "Create copy in";  //as in, "create copy in Dutch"
< 		$admtext['featurelinks'] = "Feature links"; //9, 10
< 		$admtext['featurepara'] = "Features paragraph"; //9, 10
< 		$admtext['welcome'] = "Welcome headline"; //9, 10
---
> 		$admtext['template'] = "Predloška";
> 		$admtext['createcopy'] = "Izradite kopiju u";  //as in, "create copy in Dutch"
> 		$admtext['featurelinks'] = "Zna�ajke linkovi"; //9, 10
> 		$admtext['featurepara'] = "Zna�ajke pasus"; //9, 10
> 		$admtext['welcome'] = "Pozdravite naslove"; //9, 10
840,841c850,851
< 		$admtext['momsidenames'] = "Mom's Side names"; //8
< 		$admtext['dadsidenames'] = "Dad's Side names"; //8
---
> 		$admtext['momsidenames'] = "Mamine Strane imena"; //8
> 		$admtext['dadsidenames'] = "Tatine Strane imena"; //8
843,858c853,868
< 		$admtext['featurespara'] = "Features paragraph";
< 		$admtext['menutitle'] = "Menu Title";
< 		$admtext['titlechoice'] = "Title option";
< 		$admtext['photol'] = "Left image";
< 		$admtext['phototitlel'] = "Left image title";
< 		$admtext['photocaptionl'] = "Left image caption";
< 		$admtext['photor'] = "Right image";
< 		$admtext['phototitler'] = "Right image title";
< 		$admtext['photocaptionr'] = "Right image caption";
< 		$admtext['topsurnames'] = "Top Surnames label";
< 		$admtext['headimg2'] = "Header image 2"; //14
< 		$admtext['headimg3'] = "Header image 3"; //14
< 		$admtext['showprev'] = "Show Previews";
< 		$admtext['hideprev'] = "Hide Previews";
< 		$admtext['ttitleimage'] = "Image";
< 		$admtext['ttitletext'] = "Text";
---
> 		$admtext['featurespara'] = "Zna�ajke pasus";
> 		$admtext['menutitle'] = "Naslov Izbornika";
> 		$admtext['titlechoice'] = "Opcija naslova";
> 		$admtext['photol'] = "Lijeva slika";
> 		$admtext['phototitlel'] = "Naslov Lijeve slike";
> 		$admtext['photocaptionl'] = "Opis lijeve slike";
> 		$admtext['photor'] = "Desna slika";
> 		$admtext['phototitler'] = "Naslov Desne slike";
> 		$admtext['photocaptionr'] = "Opis desne slike";
> 		$admtext['topsurnames'] = "Oznaka najboljih prezimena";
> 		$admtext['headimg2'] = "Slika zaglavlja 2"; //14
> 		$admtext['headimg3'] = "Slika zaglavlja 3"; //14
> 		$admtext['showprev'] = "Prikaži pregled";
> 		$admtext['hideprev'] = "Sakrij preglede";
> 		$admtext['ttitleimage'] = "Slika";
> 		$admtext['ttitletext'] = "Tekst";
860,866c870,876
< 		$admtext['featurethumb5'] = "Feature 5 thumbnail"; //15
< 		$admtext['featurelink5'] = "Feature 5 link"; //15
< 		$admtext['featuretitle5'] = "Feature 5 title"; //15
< 		$admtext['featurepara5'] = "Feature 5 paragraph"; //15
< 		$admtext['featurethumb6'] = "Feature 6 thumbnail"; //15
< 		$admtext['featurelink6'] = "Feature 6 link"; //15
< 		$admtext['featuretitle6'] = "Feature 6 title"; //15
---
> 		$admtext['featurethumb5'] = "Zna�ajke 5 sli�ica"; //15
> 		$admtext['featurelink5'] = "Zna�ajke 5 linkovi"; //15
> 		$admtext['featuretitle5'] = "Zna�ajke 5 naslov"; //15
> 		$admtext['featurepara5'] = "Zna�ajke 5 pasus"; //15
> 		$admtext['featurethumb6'] = "Zna�ajke 6 sli�ica"; //15
> 		$admtext['featurelink6'] = "Zna�ajke 6 linkovi"; //15
> 		$admtext['featuretitle6'] = "Zna�ajke 6 pasus"; //15
868,887c878,980
< 		$admtext['featurethumb7'] = "Feature 7 thumbnail"; //15
< 		$admtext['featurelink7'] = "Feature 7 link"; //15
< 		$admtext['featurepara7'] = "Feature 7 paragraph"; //15
< 		$admtext['featurethumb8'] = "Feature 8 thumbnail"; //15
< 		$admtext['featurelink8'] = "Feature 8 link"; //15
< 		$admtext['featurepara8'] = "Feature 8 paragraph"; //15
< 		$admtext['sidebarhead1'] = "Sidebar header 1"; //15
< 		$admtext['sidebarhead2'] = "Sidebar header 2"; //15
< 		$admtext['sidebarhead3'] = "Sidebar header 3"; //15
< 		$admtext['texttitle1'] = "Text 1 title"; //15
< 		$admtext['textlink1'] = "Text 1 link"; //15
< 		$admtext['textpara1'] = "Text 1 paragraph"; //15
< 		$admtext['texttitle2'] = "Text 2 title"; //15
< 		$admtext['textlink2'] = "Text 2 link"; //15
< 		$admtext['textpara2'] = "Text 2 paragraph"; //15
< 		$admtext['texttitle3'] = "Text 3 title"; //15
< 		$admtext['textpara3'] = "Text 3 paragraph"; //15
< 		$admtext['subhead1'] = "Subhead 1"; //15
< 		$admtext['subhead2'] = "Subhead 2"; //15
< 
---
> 		$admtext['featurethumb7'] = "Zna�ajke 7 sli�ica"; //15
> 		$admtext['featurelink7'] = "Zna�ajke 7 linkovi"; //15
> 		$admtext['featurepara7'] = "Zna�ajke 7 pasus"; //15
> 		$admtext['featurethumb8'] = "Zna�ajke 8 sli�ica"; //15
> 		$admtext['featurelink8'] = "Zna�ajke 8 linkovi"; //15
> 		$admtext['featurepara8'] = "Zna�ajke 8 pasus"; //15
> 		$admtext['sidebarhead1'] = "Zaglavlje bo�ne trake 1"; //15
> 		$admtext['sidebarhead2'] = "Zaglavlje bo�ne trake 2"; //15
> 		$admtext['sidebarhead3'] = "Zaglavlje bo�ne trake 3"; //15
> 		$admtext['texttitle1'] = "Tekst 1 naslov"; //15
> 		$admtext['textlink1'] = "Tekst 1 linkovi"; //15
> 		$admtext['textpara1'] = "Tekst 1 pasus"; //15
> 		$admtext['texttitle2'] = "Tekst 2 naslov"; //15
> 		$admtext['textlink2'] = "Tekst 2 linkovi"; //15
> 		$admtext['textpara2'] = "Tekst 2 pasus"; //15
> 		$admtext['texttitle3'] = "Tekst 3 naslov"; //15
> 		$admtext['textpara3'] = "Tekst 3 pasus"; //15
> 		$admtext['subhead1'] = "Podnaslov 1"; //15
> 		$admtext['subhead2'] = "Podnaslov 2"; //15
> 		//added in 12.2
> 		$admtext['quotehead'] = "Zaglavlje Navodi";
> 		$admtext['quotesubhead'] = "Podnaslov Navodi";
> 		$admtext['sniptitle'] = "Naslov isje�aka";
> 		$admtext['snipname'] = "Ime isje�aka";
> 		$admtext['snipinfoone'] = "Prva linija isje�aka";
> 		$admtext['snipinfotwo'] = "Druga linija isje�aka";
> 		$admtext['snipimage'] = "Slika isje�aka";
> 		$admtext['snipperson'] = "Isje�aka osobe ID";
> 		$admtext['sniptree'] = "Isje�aka stabla ID";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Veza";
> 		$admtext['featuretitle7'] = "Zna�ajke 7 naslov";
> 		$admtext['featuretitle8'] = "Zna�ajke 8 naslov";
> 		$admtext['featuretitle9'] = "Zna�ajke 9 naslov";
> 		$admtext['featurethumb9'] = "Zna�ajke 7 sli�ice"; //15
> 		$admtext['featurelink9'] = "Zna�ajke 9 linkovi"; //15
> 		$admtext['featurepara9'] = "Zna�ajka 9 pasus"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Lijeva slika zaglavlja";
> 		$admtext['rightimg'] = "Desna slika zaglavlja";
> 		$admtext['photoption'] = "Opcije fotografije su<br />&nbsp;&nbsp;(stati�ki ili slu�ajni)";
> 		$admtext['randomphotowidth'] = "Nasumi�na širina fotografije";
> 		$admtext['randomphotoheight'] = "Nasumi�na visina fotografije";
> 		$admtext['randomphotomediatypeID'] = "Kolekcija slu�ajnih fotografija";
> 		$admtext['momheading'] = "Maj�inske Obitelji Naslov";
> 		$admtext['mompara'] = "Maj�inske Obitelji Pasus";
> 		$admtext['mompagelink'] = "Maj�inske Obitelji Stranice povez";
> 		$admtext['dadheading'] = "O�inske Obitelji Naslov";
> 		$admtext['dadpara'] = "O�inske Obitelji Pasus";
> 		$admtext['dadpagelink'] = "O�inske Obitelji Stranice povez";
> 		$admtext['spmomheading'] = "Supružni Maj�inske Obitelji Naslov";
> 		$admtext['spmompara'] = "Supružni Maj�inske Obitelji Pasus";
> 		$admtext['spmompagelink'] = "Supružni Maj�inske Obitelji Stranice povez";
> 		$admtext['spmomside'] = "Supružni Maj�inske Strane oznak";
> 		$admtext['spdadside'] = "Supružni O�inske Strane oznak";
> 		$admtext['spmomperson'] = "Supružni Maj�inske Strane osobe ID";
> 		$admtext['spmomtree'] = "Supružni Maj�inske Strane stablo ID";
> 		$admtext['spdadheading'] = "Supružni O�inske Obitelji Naslov";
> 		$admtext['spdadpara'] = "Supružni O�inske Obitelji Pasus";
> 		$admtext['spdadpagelink'] = "Supružni O�inske Obitelji Stranice povez";
> 		$admtext['spdadperson'] = "Supružni O�inske Strane osobe ID";
> 		$admtext['spdadtree'] = "Supružni O�inske Strane stablo ID";
> 		$admtext['storiesheading'] = "Naše Obiteljske Pri�e";
> 		$admtext['nbrsurnames'] = "Broj Presomena<br />&nbsp;&nbsp; u Prezimenu Oblaka";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Zna�ajke sli�ica";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Naslov Slajda";
> 		$admtext['slideimg'] = "Slika Slajda";
> 		$admtext['slideheadline'] = "Naslov Slajda";
> 		$admtext['slidetext'] = "Tekst Slajda";
> 		$admtext['slidelink'] = "Poveznica Slajda";
> 		$admtext['slidelinktext'] = "Naziv Veze Slajda";
> 		$admtext['featurelink'] = "Poveznica na Zna�ajku";
> 		$admtext['featurelinktext'] = "Naziv Veze Zna�ajke";
> 		$admtext['featuretitle'] = "Naslov Zna�ajke";
> 		$admtext['featuresub'] = "Podnaslov Zna�ajke";
> 		$admtext['quoteimg'] = "Citat Slika";
> 		$admtext['quotelink'] = "Citat Veza";
> 		$admtext['quotelinktext'] = "Naziv Veze Citata";
> 		$admtext['sidebarpara'] = "Stavak bo�ne Trake";
> 		$admtext['sidebarlink'] = "Veza sa Bo�ne Trake";
> 		$admtext['sidebarlinktext'] = "Naziv Veze Bo�ne Trake";
> 		$admtext['sidebarimg'] = "Slika Bo�ne Trake";
> 		$admtext['sidebartitle'] = "Naslov Bo�ne Trake";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Naslov Naslovnice";
> 		$admtext['snipsubhead'] = "Opis Podnaslova";
> 		$admtext['snipimg'] = "Zna�ajna Slika";
> 		$admtext['sniplink'] = "Poveznica na Zna�ajku";
> 		$admtext['sniplinktext'] = "Naziv Veze na Zna�ajku";
> 		$admtext['linktext'] = "Tekst Veze";
> 		$admtext['footerheadline'] = "Naslov u Podnožju";
> 		$admtext['footerpara'] = "Tekst u Podnožju";
> 		$admtext['footerlink'] = "Veza u Podnožju";
> 		$admtext['footerlinktext'] = "Naziv Veze u Podnožju";
> 		$admtext['footerheadline'] = "Naslov u Podnožju";
> 		$admtext['footerpara'] = "Tekst u Podnožju";
> 		$admtext['footerlink'] = "Veza u Podnožju";
> 		$admtext['footerlinktext'] = "Naziv Veze u Podnožju";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
893,1006c986,1099
< 		$admtext['tablesuccess'] = "Tables created successfully.";
< 		$admtext['backtosetup'] = "Back to the Setup Menu";
< 		$admtext['configuration'] = "Configuration";
< 		$admtext['entersysvars'] = "Enter values for system variables.";
< 		$admtext['createdbtables'] = "Create the database tables to hold your information.";
< 		$admtext['tcwarning'] = "<strong>Warning!</strong> Select this option only when you are setting your site up for the first time. <strong>All existing data, including photos, histories, headstones and cemetery information, will be erased!</strong>";
< 		$admtext['conftabledelete'] = "This will delete ALL your existing data!! Are you sure you want to continue?";
< 		$admtext['performdatamaint'] = "Perform data maintenance and manage photos, histories and other components.";
< 		$admtext['createtables'] = "Create Tables";
< 		$admtext['configsettings'] = "General Settings";
< 		$admtext['logconfigsettings'] = "Log Settings";
< 		$admtext['importconfigsettings'] = "Import Settings";
< 		$admtext['diagnostics'] = "Diagnostics";
< 		$admtext['rundiags'] = "Run Diagnostics";
< 		$admtext['phpinf'] = "PHP Info Screen";
< 		$admtext['fromphp'] = "This information comes from your server and relates to your PHP installation, not TNG.";
< 		$admtext['phpver'] = "PHP version";
< 		$admtext['phpreq'] = "(TNG requires 5.3 or higher.)";
< 		$admtext['gdlib'] = "GD graphics library";
< 		$admtext['gdreq'] = "(Required for TNG's thumbnail creation tools.)";
< 		$admtext['availnogif'] = "Available, but does not support .gif images";
< 		$admtext['notinst'] = "Not installed";
< 		$admtext['safemode'] = "Safe Mode";
< 		$admtext['off'] = "Off";
< 		$admtext['on'] = "On";
< 		$admtext['fileuploads'] = "File Uploads";
< 		$admtext['fureq'] = "(Required for web-based GEDCOM upload, image upload and other form functionality.)";
< 		$admtext['perm'] = "Permitted";
< 		$admtext['notperm'] = "Not permitted, use FTP instead";
< 		$admtext['sqlver'] = "MySQL version";
< 		$admtext['sqlreq'] = "(TNG requires 5.5 or higher.)";
< 		$admtext['wsrvr'] = "Webserver";
< 		$admtext['fperms'] = "File/Folder Permissions";
< 		$admtext['fpreq'] = "(TNG requires some files and folders to have special access rights.)";
< 		$admtext['scruser'] = "Script running as user:";
< 		$admtext['phpuser'] = "PHP reports it as user:";
< 		$admtext['usrprob'] = "You may not have the necessary level of file access to run TNG without problems if you use both FTP and the TNG admin functions to manage files.";
< 		$admtext['rofile'] = "File is read-only:";
< 		$admtext['rofolder'] = "Folder is read-only:";
< 		$admtext['publog'] = "Public log";
< 		$admtext['admlog'] = "Admin log";
< 		$admtext['folderdne'] = "Folder does not exist:";
< 		$admtext['keyrw'] = "Key folders are all read/write";
< 		$admtext['cfgrw'] = "Configuration files are all read/write";
< 		$admtext['acceptable'] = "Acceptable.";
< 		$admtext['restricted'] = "Some functionality may be restricted. You may encounter errors during installation or while running TNG.";
< 		$admtext['needchngs'] = "TNG may not run without changes to your PHP or server configuration.";
< 		$admtext['yourbrowser'] = "Your browser:";
< 		$admtext['modifysettings'] = "Modify Configuration Settings";
< 		$admtext['dbhost'] = "Database Host";
< 		$admtext['dbname'] = "Database Name";
< 		$admtext['dbusername'] = "Database User Name";
< 		$admtext['dbpassword'] = "Database Password";
< 		$admtext['rootpath'] = "Root Path";
< 		$admtext['homepage'] = "Home Page";
< 		$admtext['emailaddress'] = "E-mail Address";
< 		$admtext['siteowner'] = "Site Owner";
< 		$admtext['maxdescgens'] = "Max Descendancy Generations";
< 		$admtext['disallow'] = "Disallow";
< 		$admtext['defaultallowed'] = "Default: Allowed";
< 		$admtext['maxsearchresults'] = "Max Search Results";
< 		$admtext['targetframe'] = "Target Frame";
< 		$admtext['table'] = "Table";
< 		$admtext['lastbackup'] = "Last Backup";
< 		$admtext['backup'] = "Back up";
< 		$admtext['restore'] = "Restore";
< 		$admtext['backupfilesize'] = "File Size";
< 		$admtext['succbackedup'] = "successfully backed up";
< 		$admtext['succrestored'] = "successfully restored";
< 		$admtext['change_cutoff'] = "'What's New' Days";
< 		$admtext['change_limit'] = "'What's New' Limit";
< 		$admtext['photosext'] = "Photos Extension";
< 		$admtext['defaulttree'] = "Default Tree";
< 		$admtext['requirelogin'] = "Require Login";
< 		$admtext['defaultdontrequire'] = "Default: Don't Require";
< 		$admtext['ldsdefault'] = "Show LDS Data";
< 		$admtext['ldson'] = "Always";
< 		$admtext['ldsoff'] = "Never";
< 		$admtext['ldspermit'] = "Depending on user rights";
< 		$admtext['allow'] = "Allow";
< 		$admtext['chooselang'] = "Dynamic Language Change";
< 		$admtext['optimize'] = "Optimize";
< 		$admtext['succoptimized'] = "successfully optimized";
< 		$admtext['customheader'] = "Custom Header";
< 		$admtext['customfooter'] = "Custom Footer";
< 		$admtext['custommeta'] = "Custom Meta";
< 		$admtext['lineending'] = "Line Ending";
< 		$admtext['backuppath'] = "Backup Folder";
< 		$admtext['photopath'] = "Photo Folder";
< 		$admtext['headstonepath'] = "Headstone Folder";
< 		$admtext['historypath'] = "History Folder";
< 		$admtext['backuprestoretables'] = "Back up, Restore &amp; Optimize Table Data";
< 		$admtext['shownames'] = "Show Names for Living";
< 		$admtext['initials'] = "Abbreviate first name";
< 		$admtext['regformat'] = "Register Format";
< 		$admtext['stdformat'] = "Standard Format";
< 		$admtext['thumbprefix'] = "Thumbnails Prefix";
< 		$admtext['thumbmaxh'] = "Thumbnail Max Height";
< 		$admtext['thumbmaxw'] = "Thumbnail Max Width";
< 		$admtext['thumbsuffix'] = "Thumbnails Suffix";
< 		$admtext['showextended'] = "Show Extended Photo Info";
< 		$admtext['shownotes'] = "Show Notes";
< 		$admtext['notestogether'] = "Underneath corresponding events where possible";
< 		$admtext['notestogether2'] = "Underneath events, except general notes";
< 		$admtext['notesapart'] = "In Notes section";
< 		$admtext['lnprefixes'] = "Surname Prefixes (i.e., van, de)";
< 		$admtext['lntogether'] = "Keep as part of regular surname";
< 		$admtext['lnapart'] = "Treat as separate entity";
< 		$admtext['detectpfx'] = "Prefix Detection on Import";
< 		$admtext['lnpfxnum'] = "Num. prefixes each  (max)";
< 		$admtext['specpfx'] = "OR These specific prefixes";
< 		$admtext['newmedialinks'] = "New links for Photos/Histories";
< 		$admtext['maxgedcom'] = "Max Generations, GEDCOM download";
< 		$admtext['placestable'] = "Places Table";
---
> 		$admtext['tablesuccess'] = "Tablice su uspješno izrađene.";
> 		$admtext['backtosetup'] = "Natrag na Izbornik za Postavljanje";
> 		$admtext['configuration'] = "Konfiguracija";
> 		$admtext['entersysvars'] = "Unesite vrijednosti za varijable sustava.";
> 		$admtext['createdbtables'] = "Napravite tablice baza podataka za smještaj vaših podataka.";
> 		$admtext['tcwarning'] = "<strong>UPOZORENJE!</strong> Odaberite ovu opciju samo kad prvi put postavljate web mjesto. <strong>Svi postojeći podaci, uklju�ujući fotografije, povijesti, nadgrobne spomenike i podatke o groblju, bit će izbrisani!</strong>";
> 		$admtext['conftabledelete'] = "Time ćete izbrisati SVE vaše postojeće podatke !! Jeste li sigurni da želite nastaviti?";
> 		$admtext['performdatamaint'] = "Izvršite održavanje podataka i upravljajte fotografijama, povijesti i ostalim komponentama.";
> 		$admtext['createtables'] = "Stvorite Tablice";
> 		$admtext['configsettings'] = "Opće Postavke";
> 		$admtext['logconfigsettings'] = "Zapisnik Postavka";
> 		$admtext['importconfigsettings'] = "Uvoz Postavka";
> 		$admtext['diagnostics'] = "Dijagnostika";
> 		$admtext['rundiags'] = "Pokrenite Dijagnostiku";
> 		$admtext['phpinf'] = "Informacije o PHP zaslonu";
> 		$admtext['fromphp'] = "Ove informacije dolaze s vašeg poslužitelja i odnose se na vašu PHP instalaciju, a ne na TNG.";
> 		$admtext['phpver'] = "PHP verzija";
> 		$admtext['phpreq'] = "(za TNG je potrebno 7.0 ili više.)";
> 		$admtext['gdlib'] = "GD grafi�ka knjižnica";
> 		$admtext['gdreq'] = "(Potrebni TNG alat za stvaranje sli�ica.)";
> 		$admtext['availnogif'] = "Dostupno, ali ne podržava .gif slike";
> 		$admtext['notinst'] = "Nije instalirano";
> 		$admtext['safemode'] = "Siguran Na�in";
> 		$admtext['off'] = "Isklju�en";
> 		$admtext['on'] = "Uklju�en";
> 		$admtext['fileuploads'] = "Prenositi datoteku";
> 		$admtext['fureq'] = "(Potrebno za internetski prijenos GEDCOM, prijenos slika i ostale funkcionalnosti obrasca.)";
> 		$admtext['perm'] = "Dopušteno";
> 		$admtext['notperm'] = "Nije Dopušteno, umjesto toga koristite FTP";
> 		$admtext['sqlver'] = "MySQL verzija";
> 		$admtext['sqlreq'] = "(za TNG je potrebno 5.5 ili više.)";
> 		$admtext['wsrvr'] = "Web-poslužitelj";
> 		$admtext['fperms'] = "Dozvole za datoteke/mape";
> 		$admtext['fpreq'] = "(TNG zahtijeva da neke datoteke i mape imaju posebna prava pristupa.)";
> 		$admtext['scruser'] = "Skripta koja radi kao korisnik:";
> 		$admtext['phpuser'] = "PHP ga prijavljuje kao korisnika:";
> 		$admtext['usrprob'] = "Možda nećete imati potrebnu razinu pristupa datotekama da biste pokrenuli TNG bez problema ako za upravljanje datotekama koristite i FTP i TNG administracijske funkcije.";
> 		$admtext['rofile'] = "Datoteka je samo za �itanje:";
> 		$admtext['rofolder'] = "Mapa je samo za �itanje:";
> 		$admtext['publog'] = "Javni zapisnik";
> 		$admtext['admlog'] = "Administratora zapisnik";
> 		$admtext['folderdne'] = "Mapa ne postoji:";
> 		$admtext['keyrw'] = "Glavne mape su sve markirane za �itaj/piši";
> 		$admtext['cfgrw'] = "Sve konfiguracijske datoteke �itaju/pišu";
> 		$admtext['acceptable'] = "Prihvatljiv.";
> 		$admtext['restricted'] = "Neke su funkcije možda ograni�ene. Možete naići na pogreške tijekom instalacije ili tijekom pokretanja TNG.";
> 		$admtext['needchngs'] = "TNG se ne može pokretati bez promjena na PHP ili konfiguraciji poslužitelja.";
> 		$admtext['yourbrowser'] = "Vaš preglednik:";
> 		$admtext['modifysettings'] = "Izmijenite Postavke Konfiguracije";
> 		$admtext['dbhost'] = "Baza Podataka Glavno Ra�unalo";
> 		$admtext['dbname'] = "Naziv Baza Podataka";
> 		$admtext['dbusername'] = "Korisni�ko ime baze podataka";
> 		$admtext['dbpassword'] = "Lozinka baze podataka";
> 		$admtext['rootpath'] = "Korijenski Put";
> 		$admtext['homepage'] = "Po�etna Stranica";
> 		$admtext['emailaddress'] = "Adresa e-pošte";
> 		$admtext['siteowner'] = "Vlasnik Stranice";
> 		$admtext['maxdescgens'] = "Maks. Generacije potomstva";
> 		$admtext['disallow'] = "Onemogući";
> 		$admtext['defaultallowed'] = "Zadano: Dozvoljeno";
> 		$admtext['maxsearchresults'] = "Maks. Rezultati Pretraživanja";
> 		$admtext['targetframe'] = "Ciljni Okvir";
> 		$admtext['table'] = "Tablice";
> 		$admtext['lastbackup'] = "Zadnja sigurnosna kopija";
> 		$admtext['backup'] = "Sigurnosna Kopija";
> 		$admtext['restore'] = "Vratiti";
> 		$admtext['backupfilesize'] = "Veli�ina datoteke";
> 		$admtext['succbackedup'] = "uspješno sigurnosno kopiranje";
> 		$admtext['succrestored'] = "uspješno vra�enje";
> 		$admtext['change_cutoff'] = "'Novosti' dana";
> 		$admtext['change_limit'] = "'Novosti' Ograni�enje";
> 		$admtext['photosext'] = "Fotografije proširenje";
> 		$admtext['defaulttree'] = "Zadano Stablo";
> 		$admtext['requirelogin'] = "Zahtijeva Prijavu";
> 		$admtext['defaultdontrequire'] = "Zadano: Ne zahtijeva";
> 		$admtext['ldsdefault'] = "Pokaži podatke LDS";
> 		$admtext['ldson'] = "Uvjek";
> 		$admtext['ldsoff'] = "Nikada";
> 		$admtext['ldspermit'] = "Ovisno o korisni�kim pravima";
> 		$admtext['allow'] = "Dopustiti";
> 		$admtext['chooselang'] = "Dinami�ka promjena jezika";
> 		$admtext['optimize'] = "Optimizacija";
> 		$admtext['succoptimized'] = "uspješno optimiziran";
> 		$admtext['customheader'] = "Prilagođeno zaglavlje";
> 		$admtext['customfooter'] = "Prilagođeno podnožje";
> 		$admtext['custommeta'] = "Prilagođena Meta";
> 		$admtext['lineending'] = "Završetak retka";
> 		$admtext['backuppath'] = "Rezervna mapa";
> 		$admtext['photopath'] = "Fotografije Mapa";
> 		$admtext['headstonepath'] = "Spomenika Mapa";
> 		$admtext['historypath'] = "Povijesti Mapa";
> 		$admtext['backuprestoretables'] = "Sigurnosne kopije, Vraćanje &amp; Optimizirajte podatke tablice";
> 		$admtext['shownames'] = "Prikaži imena od živih";
> 		$admtext['initials'] = "Skraćeni naziv";
> 		$admtext['regformat'] = "Format registra";
> 		$admtext['stdformat'] = "Standardni format";
> 		$admtext['thumbprefix'] = "Prefiks sli�ica";
> 		$admtext['thumbmaxh'] = "Sli�ica Maks. Visina";
> 		$admtext['thumbmaxw'] = "Sli�ica Maks. Širina";
> 		$admtext['thumbsuffix'] = "Sli�ica Sufiks";
> 		$admtext['showextended'] = "Pokaži proširene informacije o fotografiji";
> 		$admtext['shownotes'] = "Pokaži bilješke";
> 		$admtext['notestogether'] = "Ispod odgovarajućih događaja gdje je to moguće";
> 		$admtext['notestogether2'] = "Ispod događanja, osim općih napomena";
> 		$admtext['notesapart'] = "U odjeljku Napomene";
> 		$admtext['lnprefixes'] = "Prefiksi Prezimena (tj. van, de)";
> 		$admtext['lntogether'] = "Zadržite kao dio redovnog prezimena";
> 		$admtext['lnapart'] = "Tretirajte kao zasebnu cjelinu";
> 		$admtext['detectpfx'] = "Prefiks Detekcija na Uvozu";
> 		$admtext['lnpfxnum'] = "Broj. prefikse svaki (maks)";
> 		$admtext['specpfx'] = "ILI Ovi specifi�ni prefiksi";
> 		$admtext['newmedialinks'] = "Nove poveznice za fotografije/povijesti";
> 		$admtext['maxgedcom'] = "Maks. generacije, GEDCOM preuzimanje";
> 		$admtext['placestable'] = "Tablica mjesta";
1008,1075c1101,1168
< 		$admtext['tngdomain'] = "Genealogy URL";
< 		$admtext['charset'] = "Character set";
< 		$admtext['time_offset'] = "Server time offset (hours)";
< 		$admtext['backupall'] = "Back up Selected";
< 		$admtext['optimizeall'] = "Optimize Selected";
< 		$admtext['alltables'] = "Selected Tables";
< 		$admtext['brinstructions'] = "To back up, restore or optimize a table, click on the appropriate action icon for that table, or select multiple tables and apply that action to all selected by clicking the corresponding button at the bottom of the screen.";
< 		$admtext['tabstyle'] = "Tabs Style Sheet";
< 		$admtext['iconloc'] = "Menu Location";
< 		$admtext['topleft'] = "Top left, over heading";
< 		$admtext['topright'] = "Top right, next to heading";
< 		$admtext['indstart'] = "Individuals start with";
< 		$admtext['persinfo'] = "Personal information only";
< 		$admtext['allinfo'] = "All information";
< 		$admtext['thumbcols'] = "Columns in Thumbnail View";
< 		$admtext['stdesc'] = "Start Descendancy";
< 		$admtext['stexpand'] = "Expanded";
< 		$admtext['stcollapse'] = "Collapsed";
< 		$admtext['regnosp'] = "Register Generations";
< 		$admtext['chshow'] = "Always show everyone";
< 		$admtext['chifsp'] = "Remove individuals with no family";
< 		$admtext['restoreall'] = "Restore Selected";
< 		$admtext['surerestore'] = "Are you sure you want to restore the selected tables?";
< 		$admtext['surerestorets'] = "Are you sure you want to restore the table structure? All existing data will be lost!";
< 		$admtext['backupstruct'] = "Back up Table Structure";
< 		$admtext['tablestruct'] = "Table structure";
< 		$admtext['brinstructions2'] = "To back up or restore the table structure, click on the appropriate action icon below. WARNING: Restoring the table structure will delete all existing data!";
< 		$admtext['livedefault'] = "Show Living Data";
< 		$admtext['nodisplay'] = "Do not display";
< 		$admtext['menudisp'] = "Display menu";
< 		$admtext['asicons'] = "As icons";
< 		$admtext['asdrop'] = "As dropdown list";
< 		$admtext['gendex'] = "GENDEX Folder";
< 		$admtext['modifypedsettings'] = "Modify Pedigree Configuration Settings";
< 		$admtext['leftindent'] = "Left Indent";
< 		$admtext['boxnamesize'] = "Box Name Size";
< 		$admtext['namesizeshift'] = "Name Size Shift";
< 		$admtext['boxdatessize'] = "Box Dates Size";
< 		$admtext['datessizeshift'] = "Dates Size Shift";
< 		$admtext['boxcolor'] = "Box Color";
< 		$admtext['colorshift'] = "Color Shift (%)";
< 		$admtext['emptycolor'] = "Empty Color";
< 		$admtext['bordercolor'] = "Border Color";
< 		$admtext['shadowcolor'] = "Shadow Color";
< 		$admtext['boxwidth'] = "Box Width (w/o popups)";
< 		$admtext['boxheight'] = "Box Height (w/o popups)";
< 		$admtext['boxalign'] = "Box Alignment (w/o popups)";
< 		$admtext['boxheightshift'] = "Box Height Shift (w/o popups)";
< 		$admtext['boxHsep'] = "Box Horizontal Separation";
< 		$admtext['boxVsep'] = "Box Vertical Separation";
< 		$admtext['shadowoffset'] = "Shadow Offset";
< 		$admtext['linewidth'] = "Line Width";
< 		$admtext['borderwidth'] = "Border Width";
< 		$admtext['popupcolor'] = "Popup Color";
< 		$admtext['popupinfosize'] = "Popup Info Size";
< 		$admtext['popupinfosizeshift'] = "Popup Info Size Shift";
< 		$admtext['popuptimer'] = "Popup Timer (ms)";
< 		$admtext['pedevent'] = "Popup Event";
< 		$admtext['puboxwidth'] = "Box Width (w/popups)";
< 		$admtext['puboxheight'] = "Box Height (w/popups)";
< 		$admtext['puboxalign'] = "Box Alignment (w/popups)";
< 		$admtext['puboxheightshift'] = "Box Height Shift (w/popups)";
< 		$admtext['popupspouses'] = "Popup Spouses";
< 		$admtext['popupkids'] = "Popup Children";
< 		$admtext['popupchartlinks'] = "Popup Chart Links";
< 		$admtext['inclphotos'] = "Include Photos";
< 		$admtext['overflow'] = "Overflow";
< 		$admtext['pedcompact'] = "Compact";
---
> 		$admtext['tngdomain'] = "Genealoški URL";
> 		$admtext['charset'] = "Skup slova";
> 		$admtext['time_offset'] = "Poslužitelj vrijeme pomak vremena (sati))";
> 		$admtext['backupall'] = "Stvorite sigurnosnu kopiju odabranog";
> 		$admtext['optimizeall'] = "Optimizirajte odabrane";
> 		$admtext['alltables'] = "Odabrane tablice";
> 		$admtext['brinstructions'] = "Da biste napravili sigurnosnu kopiju, restaurirali ili optimizirali tablicu, kliknite odgovarajuću ikonu akcije za tu tablicu ili odaberite više tablica i primijenite tu radnju na sve odabrane odabirom odgovarajuće radnje na vrhu zaslona.";
> 		$admtext['tabstyle'] = "Kartica Stila List";
> 		$admtext['iconloc'] = "Lokacija izbornika";
> 		$admtext['topleft'] = "Gore lijevo, iznad naslova";
> 		$admtext['topright'] = "Gore desno, uz naslov";
> 		$admtext['indstart'] = "Pojedinci zapo�inju s";
> 		$admtext['persinfo'] = "Samo osobni podaci";
> 		$admtext['allinfo'] = "Sve informacije";
> 		$admtext['thumbcols'] = "Stupci u prikazu sli�ice";
> 		$admtext['stdesc'] = "Po�etak Potomaka";
> 		$admtext['stexpand'] = "Proširen";
> 		$admtext['stcollapse'] = "Zatvoren";
> 		$admtext['regnosp'] = "Registrirajte Generacije";
> 		$admtext['chshow'] = "Uvijek pokaži sve";
> 		$admtext['chifsp'] = "Uklonite pojedince koji nemaju obitelj";
> 		$admtext['restoreall'] = "Vrati Odabrano";
> 		$admtext['surerestore'] = "Jeste li sigurni da želite vratiti odabrane tablice?";
> 		$admtext['surerestorets'] = "Jeste li sigurni da želite vratiti strukturu tablice? Svi postojeći podaci bit će izgubljeni!";
> 		$admtext['backupstruct'] = "Sigurnosnu Kopiju Strukture Tablica";
> 		$admtext['tablestruct'] = "Tablica Struktura";
> 		$admtext['brinstructions2'] = "Za sigurnosnu kopiju ili vraćanje strukture tablice, kliknite odgovarajuću ikonu akcije u nastavku. UPOZORENJE: Vraćanjem strukture tablice izbrisati ćete sve postojeće podatke!";
> 		$admtext['livedefault'] = "Prikaži podatke o živim";
> 		$admtext['nodisplay'] = "Ne prikazuj";
> 		$admtext['menudisp'] = "Prikaži Izbornik";
> 		$admtext['asicons'] = "Kao ikone";
> 		$admtext['asdrop'] = "Kao padajući popis";
> 		$admtext['gendex'] = "GENDEX Mapa";
> 		$admtext['modifypedsettings'] = "Izmijenite postavke konfiguracije Pedigrea";
> 		$admtext['leftindent'] = "Lijeva Uvlaka";
> 		$admtext['boxnamesize'] = "Veli�ina Fonta";
> 		$admtext['namesizeshift'] = "Ime Veli�ina Smjena";
> 		$admtext['boxdatessize'] = "Veli�ina Datuma Kutije";
> 		$admtext['datessizeshift'] = "Datumi Veli�ina Smjena";
> 		$admtext['boxcolor'] = "Boja Kutije";
> 		$admtext['colorshift'] = "Boje Smjena (%)";
> 		$admtext['emptycolor'] = "Prazna Boja";
> 		$admtext['bordercolor'] = "Rub Boja";
> 		$admtext['shadowcolor'] = "Sjene Boja";
> 		$admtext['boxwidth'] = "Širina Kutije (bez sko�nih prozora)";
> 		$admtext['boxheight'] = "Visina Kutije (bez sko�nih prozora)";
> 		$admtext['boxalign'] = "Kutije Poravnanje (bez sko�nih prozora)";
> 		$admtext['boxheightshift'] = "Kutije Visina Smjena (bez sko�nih prozora)";
> 		$admtext['boxHsep'] = "Kutije Vodoravno Odvajanje";
> 		$admtext['boxVsep'] = "Kutija Okomita Odvajanja";
> 		$admtext['shadowoffset'] = "Pomak Sjene";
> 		$admtext['linewidth'] = "Å irina Linije";
> 		$admtext['borderwidth'] = "Å irina Obruba";
> 		$admtext['popupcolor'] = "Sko�nih Prozora Boja";
> 		$admtext['popupinfosize'] = "Veli�ina Info o Sko�nom Prozoru";
> 		$admtext['popupinfosizeshift'] = "Veli�ina info o Sko�nom Prozoru Smjena";
> 		$admtext['popuptimer'] = "Pokaziva� vremena (ms)";
> 		$admtext['pedevent'] = "Sko�nom Događaju";
> 		$admtext['puboxwidth'] = "Kutije Širina (s sko�nih prozora)";
> 		$admtext['puboxheight'] = "Kutije Visina (s sko�nih prozora)";
> 		$admtext['puboxalign'] = "Kutije Poravnanje (s sko�nih prozora)";
> 		$admtext['puboxheightshift'] = "Kutije Visina Smjena (s sko�nih prozora)";
> 		$admtext['popupspouses'] = "Sko�nom Prozoru s Supružnici";
> 		$admtext['popupkids'] = "Sko�nom Prozoru s Dijecom";
> 		$admtext['popupchartlinks'] = "Sko�nom Prozoru s Grafikona Linkovi";
> 		$admtext['inclphotos'] = "Uklju�i fotografije";
> 		$admtext['overflow'] = "Preljev";
> 		$admtext['pedcompact'] = "Kompakt";
1077,1084c1170,1177
< 		$admtext['pedtextonly'] = "Text Only";
< 		$admtext['relchart'] = "Relationship Chart";
< 		$admtext['maxupgen'] = "Max Relationship Generations";
< 		$admtext['left'] = "Left";
< 		$admtext['right'] = "Right";
< 		$admtext['center'] = "Center";
< 		$admtext['mouseover'] = "Mouse Over";
< 		$admtext['mousedown'] = "Mouse Down";
---
> 		$admtext['pedtextonly'] = "Tekst Samo";
> 		$admtext['relchart'] = "Grafikon Odnosa";
> 		$admtext['maxupgen'] = "Maks. Generacije Odnosa";
> 		$admtext['left'] = "Lijevo";
> 		$admtext['right'] = "Desno";
> 		$admtext['center'] = "Centar";
> 		$admtext['mouseover'] = "Miš Preko";
> 		$admtext['mousedown'] = "Miš Dolje";
1086,1091c1179,1184
< 		$admtext['pedbox'] = "Box";
< 		$admtext['hideempty'] = "Hide Empty Boxes";
< 		$admtext['logfilename'] = "Log File Name";
< 		$admtext['maxloglines'] = "Max Log Lines";
< 		$admtext['modifylogsettings'] = "Modify Log Configuration Settings";
< 		$admtext['badhosts'] = "Exclude Host Names";
---
> 		$admtext['pedbox'] = "Kutija";
> 		$admtext['hideempty'] = "Sakrijte Prazne Kutije";
> 		$admtext['logfilename'] = "Naziv Datoteke Dnevnika";
> 		$admtext['maxloglines'] = "Maks. Linije u Dnevniki";
> 		$admtext['modifylogsettings'] = "Izmijenite Postavke Konfiguracije Dnevnika";
> 		$admtext['badhosts'] = "Isklju�iti Glavno Ra�unalo Imena";
1093,1300c1186,1386
< 		$admtext['text_public'] = "(Public)";
< 		$admtext['saveimportstate'] = "Save Import State";
< 		$admtext['allowresume'] = "Save to allow resume if import fails";
< 		$admtext['modifyimportsettings'] = "Modify Import Configuration Settings";
< 		$admtext['embeddedmedia'] = "Embedded Media";
< 		$admtext['assignnames'] = "Allow TNG to assign names to embedded media";
< 		$admtext['localphotopath'] = "Local Photo Path(s)";
< 		$admtext['localdocpath'] = "Local History Path(s)";
< 		$admtext['nopathmatch'] = "If no local path match";
< 		$admtext['wholepath'] = "Import entire path";
< 		$admtext['justname'] = "Import file name only";
< 		$admtext['gedpath'] = "GEDCOM Folder (Import/Export)";
< 		$admtext['makefolder'] = "Make Folder";
< 		$admtext['blankchangedt'] = "If 'Change Date' is blank";
< 		$admtext['usetoday'] = "Use current date";
< 		$admtext['useblank'] = "Leave it as is";
< 		$admtext['nobirthdate'] = "If no birth date, assume";
< 		$admtext['persliving'] = "Person is living";
< 		$admtext['persdead'] = "Person is deceased";
< 		$admtext['nodeathdate'] = "If no death date, assume deceased<br />if older than";
< 		$admtext['pedconfigsettings'] = "Chart Settings";
< 		$admtext['usepopups'] = "Initial Display";
< 		$admtext['maxpedgens'] = "Max Generations";
< 		$admtext['dbsection'] = "Database";
< 		$admtext['tablesection'] = "Table Names";
< 		$admtext['foldersection'] = "Paths and Folders";
< 		$admtext['sitesection'] = "Site Design and Definition";
< 		$admtext['privsection'] = "Privacy";
< 		$admtext['namesection'] = "Names";
< 		$admtext['descsection'] = "Descendancy";
< 		$admtext['miscsection'] = "Miscellaneous";
< 		$admtext['mediatable'] = "Media Table";
< 		$admtext['pedanddesc'] = "Common Elements";
< 		$admtext['descchart'] = "Descendancy Chart";
< 		$admtext['pedchart'] = "Pedigree Chart";
< 		$admtext['initgens'] = "Initial Generations";
< 		$admtext['mediapath'] = "Multimedia Folder";
< 		$admtext['documentpath'] = "Document Folder";
< 		$admtext['localdocumentpath'] = "Local Document Path(s)";
< 		$admtext['localotherpath'] = "Local Path(s) for Other Media";
< 		$admtext['imgmaxh'] = "Image Max Height";
< 		$admtext['imgmaxw'] = "Image Max Width";
< 		$admtext['succdel'] = "successfully deleted";
< 		$admtext['delbkups'] = "Delete Selected Backups";
< 		$admtext['suredelbk'] = "Are you sure you want to delete the selected backups?";
< 		$admtext['showhome'] = "Show Home Link";
< 		$admtext['showsearch'] = "Show Search Link";
< 		$admtext['showlogin'] = "Show Login/Logout Link";
< 		$admtext['showprint'] = "Show Print Link";
< 		$admtext['showbmarks'] = "Show Add Bookmark Link";
< 		$admtext['server'] = "(server)";
< 		$admtext['client'] = "(client)";
< 		$admtext['sitename'] = "Site Name";
< 		$admtext['site_desc'] = "Site Description";
< 		$admtext['privnote'] = "Prefix for private notes";
< 		$admtext['custvars'] = "Note: You may create your own custom settings in \"customconfig.php\" (open in a text editor and follow the instructions).";
< 		$admtext['blockemail'] = "Block suggestions or new user registrations where";
< 		$admtext['addrcontains'] = "Address contains";
< 		$admtext['msgcontains'] = "Message contains";
< 		$admtext['reqloginset'] = "\"Require Login\" must be set to Yes to enable this option";
< 		$admtext['treerestrict'] = "Restrict access to assigned tree";
< 		$admtext['mapconfigsettings'] = "Map Settings";
< 		$admtext['modifymapsettings'] = "Modify Map Configuration Settings";
< 		$admtext['maptype'] = "Map Type";
< 		$admtext['maphybrid'] = "Hybrid";
< 		$admtext['mapsatellite'] = "Satellite";
< 		$admtext['mapdimsind'] = "Dimensions, Individual Page";
< 		$admtext['mapdimshst'] = "Dimensions, Headstones Pages";
< 		$admtext['mapdimsadm'] = "Dimensions, Admin Pages";
< 		$admtext['mapwidth'] = "Width (% or px)";
< 		$admtext['mapheight'] = "Height (px)";
< 		$admtext['mapstlat'] = "Starting Latitude";
< 		$admtext['mapstlong'] = "Starting Longitude";
< 		$admtext['startoff'] = "Hide Admin Maps to Start";
< 		$admtext['conslpins'] = "Consolidate Duplicate Pins";
< 		$admtext['ssenabled'] = "Enable Slide Show";
< 		$admtext['ssrepeat'] = "Slide Show Auto Repeat";
< 		$admtext['sysinfo'] = "Display information about your web site environment.";
< 		$admtext['albumlinkstable'] = "Album Links Table";
< 		$admtext['addresstable'] = "Addresses Table";
< 		$admtext['statestable'] = "States Table";
< 		$admtext['countriestable'] = "Countries Table";
< 		$admtext['notelinkstable'] = "Note Links Table";
< 		$admtext['medialinkstable'] = "Media Links Table";
< 		$admtext['saveimporttable'] = "Save Import Table";
< 		$admtext['brlinkstable'] = "Tabela linkova grana";
< 		$admtext['temptable'] = "Temp Events Table";
< 		$admtext['tleventstable'] = "Timeline Events Table";
< 		$admtext['album2entitiestable'] = "Album Links";
< 		$admtext['doctype'] = "Doctype Declaration";
< 		$admtext['cemrows'] = "Max lines per column (approx.)";
< 		$admtext['cemblanks'] = "Suppress \"Unknown\" categories";
< 		$admtext['success'] = "Success";
< 		$admtext['fexists'] = "Failed. Folder already exists.";
< 		$admtext['fmanual'] = "Failed. Please create using an FTP program or online file manager.";
< 		$admtext['maintmode'] = "Maintenance Mode";
< 		$admtext['maintexp'] = "All database access is temporarily unavailable for site maintenance. Please try again later. If regular functions do not resume within a few hours of first seeing this message, please contact the site administrator.";
< 		$admtext['defimpopt'] = "Default Replace Option";
< 		$admtext['seltable'] = "Please select at least one table.";
< 		$admtext['renumber'] = "Resequence IDs";
< 		$admtext['idtype'] = "ID Type";
< 		$admtext['mindigits'] = "Minimum Digits";
< 		$admtext['niprefix'] = "Not including ID prefix";
< 		$admtext['finreseq'] = "Finished resequencing";
< 		$admtext['recsreseq'] = "records resequenced";
< 		$admtext['needmaint'] = "You must be in Maintenance Mode to run this utility (go to Setup &gt;&gt; Configuration &gt;&gt; General Settings)";
< 		$admtext['reseqwarn'] = "<strong>WARNING:</strong> Resequencing your IDs could cause external links to your site to break or point to erroneous locations.";
< 		$admtext['subroot'] = "Subroot Path";
< 		$admtext['hidechr'] = "Hide Christening Labels";
< 		$admtext['datefmt'] = "Numeric Date Preference";
< 		$admtext['dayfirst'] = "Day/Month/Year";
< 		$admtext['monthfirst'] = "Month/Day/Year";
< 		$admtext['exusers'] = "Exclude Usernames";
< 		$admtext['allowreg'] = "Allow new user registrations";
< 		$admtext['localhspath'] = "Local Headstone Path(s)";
< 		$admtext['pardata'] = "Parental data on person page:";
< 		$admtext['pnoevents'] = "Don't show any events";
< 		$admtext['pstdonly'] = "Show only standard family events";
< 		$admtext['palldata'] = "Show all events and media";
< 		$admtext['servertime'] = "Server time is";
< 		$admtext['sitetime'] = "and site time is";
< 		$admtext['srexpl'] = "Optional. Use an absolute path name, like what you see in the Root Path, then move the following files to the Config Path <strong>immediately</strong> after saving and make them writeable (664 permissions): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
< 		$admtext['mapstzm'] = "Starting Zoom";
< 		$admtext['mapfoundzm'] = "Location Zoom";
< 		$admtext['rrnum'] = "Record Report Number";
< 		$admtext['progint'] = "Progress Interval (ms)";
< 		$admtext['timechart'] = "Timeline Chart";
< 		$admtext['tcheight'] = "Chart height";
< 		$admtext['distances'] = "All distances measured in pixels.";
< 		$admtext['mpixels'] = "Pixels between months";
< 		$admtext['ypixels'] = "Pixels between years";
< 		$admtext['ymult'] = "Years between year markers";
< 		$admtext['mpct'] = "Vertical percentage for months";
< 		$admtext['ypct'] = "Vertical percentage for years";
< 		$admtext['inclevs'] = "Events to include";
< 		$admtext['allevs'] = "All events";
< 		$admtext['rangeevs'] = "Only events that fall within the lifespans of the people on the chart";
< 		$admtext['tcwidth'] = "Starting chart width";
< 		$admtext['simile'] = "Enable Simile timeline";
< 		//added in 8.0.0
< 		$admtext['pstartoff'] = "Hide Public Maps to Start";
< 		$admtext['maxrels'] = "Max Relationships";
< 		$admtext['initrels'] = "Initial Relationships";
< 		$admtext['templateconfigsettings'] = "Template Settings";
< 		$admtext['modifytemplatesettings'] = "Modify Template Configuration Settings";
< 		$admtext['ucsurnames'] = "Uppercase All Surnames";
< 		$admtext['maxnoteprev'] = "Max characters in list notes";
< 		$admtext['mailreg'] = "Mail and Registration";
< 		$admtext['autoapp'] = "Auto approve new users";
< 		$admtext['inclpwd'] = "Include password in welcome email";
< 		$admtext['ackemail'] = "Send acknowledgement email";
< 		$admtext['fromadmin'] = "Send all mail from address above";
< 		$admtext['autotree'] = "Create new tree for user";
< 		$admtext['modspath'] = "Mods Folder";
< 		$admtext['extspath'] = "Extensions Folder";
< 		$admtext['encrtype'] = "Encryption type";
< 		$admtext['none'] = "No encryption";
< 		$admtext['imgviewer'] = "Enable image viewer";
< 		$admtext['docsonly'] = "Documents only";
< 		$admtext['imgvheight'] = "Image viewer height";
< 		$admtext['flex'] = "Always show full image";
< 		$admtext['setheight'] = "Fixed (640px)";
< 		//added in 9.0.0
< 		$admtext['places1tree'] = "Assign Place records to Trees";
< 		$admtext['convert'] = "Convert";
< 		$admtext['convexpl'] = "(This will assign all current places to the selected tree)";
< 		$admtext['mergeexpl'] = "(This will remove the tree assignment from all Place records)";
<         $admtext['nocutoff'] = "Leave blank or set to zero to remove this limit";
<         $admtext['usesmtp'] = "Use SMTP authentication";
<         $admtext['mailhost'] = "SMTP host name";
<         $admtext['mailuser'] = "Mail username";
<         $admtext['mailpass'] = "Mail password";
<         $admtext['mailport'] = "Port number";
< 		$admtext['showshare'] = "Show Share Link";
< 		$admtext['defpgsize'] = "Default PDF Page Size";
< 		$admtext['mapterrain'] = "Terrain";
< 		$admtext['maproadmap'] = "Road Map";
< 		$admtext['usedefthumbs'] = "Use default thumbnails";
<         $admtext['autogeo'] = "Geocode all new places";
<         $admtext['revmail'] = "Notify on reviewable submissions";
<         $admtext['assumepriv'] = "Assume private if not dead this many years";
<         $admtext['calstart'] = "First day of week";
< 		$admtext['edit_timeout'] = "Edit timeout (minutes)";
< 		$admtext['shownamespr'] = "Show Names for Private";
< 		$admtext['tables'] = "Tables";
< 		//changed in 10.0.0
< 		$admtext['regnotes'] = "Show Notes on Register";
< 		//added in 10.0.0
< 		$admtext['collation'] = "Collation";
< 		$admtext['collationexpl'] = "(leave blank to accept the default)";
< 		$admtext['scrollcite'] = "Scroll citations";
< 		$admtext['hidemedia'] = "Hide personal media";
< 		$admtext['searchchoice'] = "Search Link Destination";
< 		$admtext['quicksearch'] = "Quick Search";
< 		$admtext['advsearch'] = "Advanced Search";
< 		$admtext['pedvertical'] = "Vertical";
< 		$admtext['vboxwidth'] = "Box Width";
< 		$admtext['vboxheight'] = "Box Height";
< 		$admtext['vspacing'] = "Spacing";
< 		$admtext['vchart'] = "Vertical Chart";
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Re-use deleted IDs";
< 		$admtext['lastimport'] = "Show last import";
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Encryption";
<         //added in 11.0.0
< 		$admtext['dbport'] = "Database Port";
< 		$admtext['dbsocket'] = "Database Socket";
---
> 		$admtext['text_public'] = "(Javno)";
> 		$admtext['saveimportstate'] = "Sa�uvaj Stanje Uvoza";
> 		$admtext['allowresume'] = "Sa�uvaj da biste omogućili nastavak ako uvoz ne uspije";
> 		$admtext['modifyimportsettings'] = "Izmijenite postavke konfiguracije uvoza";
> 		$admtext['embeddedmedia'] = "Ugrađeni mediji";
> 		$admtext['assignnames'] = "Dopustite TNG da dodijeli imena ugrađenim medijima";
> 		$admtext['localphotopath'] = "Lokalni put(ovi) fotografije";
> 		$admtext['localdocpath'] = "Lokalni put(ovi) Povijesti";
> 		$admtext['nopathmatch'] = "Ako se ne podudara lokalni put";
> 		$admtext['wholepath'] = "Uvoz cijelog put";
> 		$admtext['justname'] = "Uvezi samo naziv datoteke";
> 		$admtext['gedpath'] = "GEDCOM Mapa (Uvoz/Izvoz)";
> 		$admtext['makefolder'] = "Napravite mapu";
> 		$admtext['blankchangedt'] = "Ako je 'Promijeni datum' prazan";
> 		$admtext['usetoday'] = "Koristite trenutni datum";
> 		$admtext['useblank'] = "Ostavite to kako jest";
> 		$admtext['nobirthdate'] = "Ako nema datuma rođenja, pretpostavite";
> 		$admtext['persliving'] = "Osoba živi";
> 		$admtext['persdead'] = "Osoba je preminula";
> 		$admtext['nodeathdate'] = "Ako nema datuma smrti, pretpostavite da je pokojnik<br />stariji od";
> 		$admtext['pedconfigsettings'] = "Postavke Grafikona";
> 		$admtext['usepopups'] = "Po�etni prikaz";
> 		$admtext['maxpedgens'] = "Maks. Generacija";
> 		$admtext['dbsection'] = "Baza podataka";
> 		$admtext['tablesection'] = "Tablice Imena";
> 		$admtext['foldersection'] = "Puti i Mape";
> 		$admtext['sitesection'] = "Dizajn i definicija web mjesta";
> 		$admtext['privsection'] = "Privatnost";
> 		$admtext['namesection'] = "Imena";
> 		$admtext['descsection'] = "Potomak";
> 		$admtext['miscsection'] = "Razni";
> 		$admtext['mediatable'] = "Medija Tabllica";
> 		$admtext['pedanddesc'] = "Zajedni�ki Elementi";
> 		$admtext['descchart'] = "Potomak Grafikon";
> 		$admtext['pedchart'] = "Pedigrea Grafikon";
> 		$admtext['initgens'] = "Po�etne Generacije";
> 		$admtext['mediapath'] = "Multimedijska Mapa";
> 		$admtext['documentpath'] = "Dokumenta Mapa";
> 		$admtext['localdocumentpath'] = "Lokalni Put(ovi) Dokumenta";
> 		$admtext['localotherpath'] = "Lokalni Put(ovi) Druge Medije";
> 		$admtext['imgmaxh'] = "Slika Maks. Visina";
> 		$admtext['imgmaxw'] = "Slike Maks. Å irina";
> 		$admtext['succdel'] = "uspješno izbrisano";
> 		$admtext['delbkups'] = "Izbrišite Odabrane Sigurnosne Kopije";
> 		$admtext['suredelbk'] = "Jeste li sigurni da želite izbrisati odabrane sigurnosne kopije?";
> 		$admtext['showhome'] = "Prikaži Po�etnu Linkovi";
> 		$admtext['showsearch'] = "Prikaži Petraživanja Linkovi";
> 		$admtext['showlogin'] = "Prikaži Prijaviti se/Odjaviti se Linkovi";
> 		$admtext['showprint'] = "Prikaži Ipisa Linkovi";
> 		$admtext['showbmarks'] = "Prikaži Dodaj Bookmark Linkovi";
> 		$admtext['server'] = "(poslužitelj)";
> 		$admtext['client'] = "(klijent)";
> 		$admtext['sitename'] = "Web Mjesta Ime";
> 		$admtext['site_desc'] = "Web Mjesta Opis";
> 		$admtext['privnote'] = "Prefiks za Privatne Bilješke";
> 		$admtext['custvars'] = "NAPOMENA: Možete stvoriti vlastite prilagođene postavke u \"customconfig.php \" (otvorite se u uređiva�u teksta i slijedite upute).";
> 		$admtext['blockemail'] = "Blokirajte prijedloge ili nove korisni�ke registracije gdje";
> 		$admtext['addrcontains'] = "Adresa sadrži";
> 		$admtext['msgcontains'] = "Poruka sadrži";
> 		$admtext['reqloginset'] = "\"Zahtijeva prijavu\" mora biti postavljeno na Da kako biste omogućili ovu opciju";
> 		$admtext['treerestrict'] = "Ograni�i pristup dodijeljenom stablu";
> 		$admtext['mapconfigsettings'] = "Postavke Karte";
> 		$admtext['modifymapsettings'] = "Izmijenite postavke konfiguracije karte";
> 		$admtext['maptype'] = "Vrsta Karte";
> 		$admtext['maphybrid'] = "Hibrid";
> 		$admtext['mapsatellite'] = "Satelit";
> 		$admtext['mapdimsind'] = "Dimenzije, Pojedina�na Stranica";
> 		$admtext['mapdimshst'] = "Dimenzije Spomenika Stranica";
> 		$admtext['mapdimsadm'] = "Dimenzije Administrator Stranica";
> 		$admtext['mapwidth'] = "Å irina (% or px)";
> 		$admtext['mapheight'] = "Visina (px)";
> 		$admtext['mapstlat'] = "Po�evši Latitude";
> 		$admtext['mapstlong'] = "Po�evši od Longitude";
> 		$admtext['startoff'] = "Sakrij Administrativne Karte za Po�etak";
> 		$admtext['conslpins'] = "Konsolidirajte Duplikate Igle";
> 		$admtext['ssenabled'] = "Omogući Prezentaciju";
> 		$admtext['ssrepeat'] = "Prezentacija Automatsko Ponavljanje";
> 		$admtext['sysinfo'] = "Informacije o okruženju vaše web stranice.";
> 		$admtext['albumlinkstable'] = "Album Medija";
> 		$admtext['addresstable'] = "Adresa";
> 		$admtext['statestable'] = "Države";
> 		$admtext['countriestable'] = "Države";
> 		$admtext['notelinkstable'] = "Napomene Linkovi";
> 		$admtext['medialinkstable'] = "Medije Linkovi";
> 		$admtext['saveimporttable'] = "Sa�uvaj Uvoz";
> 		$admtext['brlinkstable'] = "Grane Linkovi";
> 		$admtext['temptable'] = "Privremeni Događaji";
> 		$admtext['tleventstable'] = "Vremenski Raspored Događaja";
> 		$admtext['album2entitiestable'] = "Albuma Linkovi";
> 		$admtext['doctype'] = "Izjava o Dotiku";
> 		$admtext['cemrows'] = "Maks. Redova po Stupcu (cca.)";
> 		$admtext['cemblanks'] = "Potisnite \"Nepoznato \" kategorije";
> 		$admtext['success'] = "Uspjeh";
> 		$admtext['fexists'] = "Neuspjeh. Mapa već postoji.";
> 		$admtext['fmanual'] = "Neuspjeh. Izradite pomoću FTP programa ili mrežnog upravitelja datoteka.";
> 		$admtext['maintmode'] = "Održavanje";
> 		$admtext['maintexp'] = "Sav pristup bazi podataka privremeno je nedostupan za održavanje web mjesta. Molimo pokušajte ponovo kasnije. Ako se redovne funkcije ne nastave nakon nekoliko sati od prvog gledanja ove poruke, obratite se administratoru web mjesta.";
> 		$admtext['defimpopt'] = "Zadana Opcija Zamijeni";
> 		$admtext['seltable'] = "Odaberite barem jednu tablicu.";
> 		$admtext['renumber'] = "Resekcioniranje ID";
> 		$admtext['idtype'] = "ID Vrsta";
> 		$admtext['mindigits'] = "Min. Brojevi";
> 		$admtext['niprefix'] = "Ne Uklju�uje ID Prefiksa";
> 		$admtext['finreseq'] = "Gotovo Resekcioniranje";
> 		$admtext['recsreseq'] = "documenti su resekcionirani";
> 		$admtext['needmaint'] = "Za pokretanje ovog uslužnog programa morate biti u na�inu održavanja (idite na Postavljanje &gt;&gt; Konfiguracija &gt;&gt; Opće Postavke)";
> 		$admtext['reseqwarn'] = "<strong>UPOZORENJE:</strong> Ponovno postavljanje vaših ID-ova moglo bi prouzrokovati prekid vanjskih veza na vašu web lokaciju ili upućivati ​​na pogrešne lokacije.";
> 		$admtext['subroot'] = "Potprolazni put";
> 		$admtext['hidechr'] = "Sakrij Oznake za Krštenje";
> 		$admtext['datefmt'] = "Preferiranje Broja s Datumom";
> 		$admtext['dayfirst'] = "Dan/Mijesec/Godina";
> 		$admtext['monthfirst'] = "Mijesec/Dan/Godina";
> 		$admtext['exusers'] = "Izuzmite Korisni�ka Imena";
> 		$admtext['allowreg'] = "Dopusti nove registracije korisnika";
> 		$admtext['localhspath'] = "Lokalni Spomenika Put(ovi)";
> 		$admtext['pardata'] = "Roditeljski podaci na stranici osobe";
> 		$admtext['pnoevents'] = "Ne prikazujte nikakve događaje";
> 		$admtext['pstdonly'] = "Prikaži samo standardne obiteljske događaje";
> 		$admtext['palldata'] = "Prikažite sve događaje i medije";
> 		$admtext['servertime'] = "Vrijeme poslužitelja (server) je";
> 		$admtext['sitetime'] = "i vrijeme web mjesta je";
> 		$admtext['srexpl'] = "OPCIJSKI. Upotrijebite apsolutno ime staze, poput onoga što vidite u Korijenski Put, a zatim spremite sljedeće datoteke na Config Path <strong>odmah</strong> nakon spremanja i u�inite ih upisljivim (664 dozvole): config.php, customconfig.php , importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
> 		$admtext['mapstzm'] = "Pokretanje Zoom";
> 		$admtext['mapfoundzm'] = "Lokacija Zoom";
> 		$admtext['rrnum'] = "Sa�uvaj Broj Izvješća";
> 		$admtext['progint'] = "Interval Napretka (ms)";
> 		$admtext['timechart'] = "Vremenska karta";
> 		$admtext['tcheight'] = "Visina grafikona";
> 		$admtext['distances'] = "Sve udaljenosti mjereno u pikselima.";
> 		$admtext['mpixels'] = "Piksela između mjeseci";
> 		$admtext['ypixels'] = "Pikseli između godina";
> 		$admtext['ymult'] = "Godine između markera godina";
> 		$admtext['mpct'] = "Okomiti postotak po mjesecima";
> 		$admtext['ypct'] = "Okomiti postotak po godinama";
> 		$admtext['inclevs'] = "Događaji koje treba uklju�iti";
> 		$admtext['allevs'] = "Svi Događaji";
> 		$admtext['rangeevs'] = "Samo događaji koji spadaju u životni vijek ljudi na ljestvici";
> 		$admtext['tcwidth'] = "Po�etna širina grafikona";
> 		$admtext['simile'] = "Omogući Simile vremenske trake";
> 		$admtext['pstartoff'] = "Sakrijte javne karte za po�etak";
> 		$admtext['maxrels'] = "Maks. Odnosi";
> 		$admtext['initrels'] = "Po�etni Odnosi";
> 		$admtext['templateconfigsettings'] = "Postavke Predloška";
> 		$admtext['modifytemplatesettings'] = "Izmijenite postavke konfiguracije predloška";
> 		$admtext['ucsurnames'] = "Velika Slova Svih Prezimena";
> 		$admtext['maxnoteprev'] = "Maks. Slova u Bilješkama s Popisa";
> 		$admtext['mailreg'] = "Pošta i Registracija";
> 		$admtext['autoapp'] = "Automatski odobrava nove korisnike";
> 		$admtext['inclpwd'] = "Uklju�ite lozinku u e-poštu dobrodošlice";
> 		$admtext['ackemail'] = "Pošaljite potvrdu e-poštom";
> 		$admtext['fromadmin'] = "Pošaljite svu poštu s gornje adrese";
> 		$admtext['autotree'] = "Stvorite novo stablo za korisnika";
> 		$admtext['modspath'] = "Modovi Mapa";
> 		$admtext['extspath'] = "Proširenja Mapa";
> 		$admtext['encrtype'] = "Vrsta Å ifriranja";
> 		$admtext['none'] = "Ne Å ifriranje";
> 		$admtext['imgviewer'] = "Omogućite pregledniku slika";
> 		$admtext['docsonly'] = "Samo dokumenti";
> 		$admtext['imgvheight'] = "Visina preglednika slika";
> 		$admtext['flex'] = "Uvijek pokaži cijelu sliku";
> 		$admtext['setheight'] = "U�vršćen (640px)";
> 		$admtext['places1tree'] = "Dodijelite Zapise Mjesta Stabla";
> 		$admtext['convert'] = "Pretvoriti";
> 		$admtext['convexpl'] = "(Ovo će dodijeliti odabranom stablu sva trenutna mjesta)";
> 		$admtext['mergeexpl'] = "(Ovo će ukloniti stablo dodjela iz svih zapisa mjesta)";
>         $admtext['nocutoff'] = "Ostavite prazno ili postavljeno na nulu da biste uklonili ovo ograni�enje";
>         $admtext['usesmtp'] = "Upotrijebite SMTP provjeru autenti�nosti";
>         $admtext['mailhost'] = "Naziv SMTP hosta";
>         $admtext['mailuser'] = "Korisni�ko Ime za Poštu";
>         $admtext['mailpass'] = "Lozinka za Poštu";
>         $admtext['mailport'] = "Priklju�ak broj";
> 		$admtext['showshare'] = "Prikaži Dijeljenja Link";
> 		$admtext['defpgsize'] = "Zadana Veli�ina PDF Stranice";
> 		$admtext['mapterrain'] = "Teren";
> 		$admtext['maproadmap'] = "Autokarta";
> 		$admtext['usedefthumbs'] = "Upotrijebite zadane sli�ice";
>         $admtext['autogeo'] = "Geokodirajte sva nova mjesta";
>         $admtext['revmail'] = "Obavijestite o podnescima koji se mogu pregledati";
>         $admtext['assumepriv'] = "Pretpostavite da je privatno ako nije mrtvo to mnogo godina";
>         $admtext['calstart'] = "Prvi dan u tjednu";
> 		$admtext['edit_timeout'] = "Uredi pauza (minute)";
> 		$admtext['shownamespr'] = "Prikaži Imena za Privatno";
> 		$admtext['tables'] = "Tablice";
> 		$admtext['regnotes'] = "Prikaži Bilješke i Prilagođene Događaje u Registru";
> 		$admtext['collation'] = "Razvrstavanje";
> 		$admtext['collationexpl'] = "(ostavite prazno da biste prihvatili zadani)";
> 		$admtext['scrollcite'] = "Pomicanje Citate";
> 		$admtext['hidemedia'] = "Sakrij osobne medije";
> 		$admtext['searchchoice'] = "Pretraživanje Link Odredište";
> 		$admtext['quicksearch'] = "Brza pretraga";
> 		$admtext['advsearch'] = "Napredna pretraga";
> 		$admtext['pedvertical'] = "Vertikala";
> 		$admtext['vboxwidth'] = "Å irina Okvira";
> 		$admtext['vboxheight'] = "Visina Okvira";
> 		$admtext['vspacing'] = "Razmak";
> 		$admtext['vchart'] = "Vertikal Grafikon";
> 		$admtext['reuseids'] = "Ponovno koristite izbrisane ID-ove";
> 		$admtext['lastimport'] = "Prikaži zadnji uvoz";
>         $admtext['mailenc'] = "Å ifriranje";
> 		$admtext['dbport'] = "Baze Podataka Priklju�ak";
> 		$admtext['dbsocket'] = "Bazu Podataka Uti�nica";
1302,1324c1388,1410
< 		$admtext['prefsection'] = "Prefixes and Suffixes";
< 		$admtext['personprefix'] = "Person prefix";
< 		$admtext['personsuffix'] = "Person suffix";
< 		$admtext['familyprefix'] = "Family prefix";
< 		$admtext['familysuffix'] = "Family suffix";
< 		$admtext['sourceprefix'] = "Source prefix";
< 		$admtext['sourcesuffix'] = "Source suffix";
< 		$admtext['repoprefix'] = "Repository prefix";
< 		$admtext['reposuffix'] = "Repository suffix";
< 		$admtext['noteprefix'] = "Note prefix";
< 		$admtext['notesuffix'] = "Note suffix";
< 		$admtext['mobilesection'] = "Mobile";
< 		$admtext['mobilesite'] = "Mobile site name will be ";
< 		$admtext['menubar'] = "in mobile menu bar";
< 		$admtext['belowbar'] = "below mobile menu bar";
< 		$admtext['responsivetables'] = "Enable responsive tables";
< 		$admtext['tabletype'] = "Responsive table type";
< 		$admtext['enablemodeswitch'] = "Enable responsive tables mode switcher";
< 		$admtext['enableminimap'] = "Enable responsive tables mini map";
< 		$admtext['showtasks'] = "Show 'Important tasks' messages";
< 		$admtext['showtotals'] = "Show record totals on Admin menu";
< 		$admtext['backupdays'] = "Alert if no backup in this many days";
< 		$admtext['backupnote'] = "NOTE: If your database is very large, you might want to use an independent tool (like mysqldumper or phpMyAdmin) to back up and restore your tables. At least one of these should be available from your site control panel.";
---
> 		$admtext['prefsection'] = "Prefiksi i Sufiksi";
> 		$admtext['personprefix'] = "Prefiks Osobe";
> 		$admtext['personsuffix'] = "Sufiks Osobe";
> 		$admtext['familyprefix'] = "Prefiks Obitelji";
> 		$admtext['familysuffix'] = "Sufiks Obitelji";
> 		$admtext['sourceprefix'] = "Prefiks Izvora";
> 		$admtext['sourcesuffix'] = "Sufiks Izvora";
> 		$admtext['repoprefix'] = "Prefiks Spremište";
> 		$admtext['reposuffix'] = "Sufiks Spremište";
> 		$admtext['noteprefix'] = "Prefiks Bilješka";
> 		$admtext['notesuffix'] = "Sufiks Bilješka";
> 		$admtext['mobilesection'] = "Mobilno";
> 		$admtext['mobilesite'] = "Ime mobilne web stranice bit će ";
> 		$admtext['menubar'] = "u traci izbornika za mobilne uređaje";
> 		$admtext['belowbar'] = "ispod mobilne trake izbornika";
> 		$admtext['responsivetables'] = "Omogući osjetljivih tablica";
> 		$admtext['tabletype'] = "Vrsta osjetljivih tablica";
> 		$admtext['enablemodeswitch'] = "Omogućite osjetljivih tablica sklopka na�ina";
> 		$admtext['enableminimap'] = "Omogući osjetljivih tablica mini mapu";
> 		$admtext['showtasks'] = "Prikaži poruke 'Važni zadaci'";
> 		$admtext['showtotals'] = "Pokaži ukupne zapise na Admin. izborniku";
> 		$admtext['backupdays'] = "Obavijestite ako nema sigurnosne kopije u ovoliko dana";
> 		$admtext['backupnote'] = "NAPOMENA: Ako je vaša baza podataka vrlo velika, možda biste trebali koristiti neovisan alat (poput mysqldumper ili phpMyAdmin) za izradu sigurnosne kopije i vraćanje tablica. Barem jedan od njih trebao bi biti dostupan na vašoj upravlja�koj plo�i.";
1328,1331c1414,1416
< 		$admtext['hidedna'] = "Hide all DNA pages and data";
<         $admtext['assumeliving'] = "Assume living if not dead this many years";
< 		//changed in 11.0.2
< 		$admtext['mapkey'] = "Map Key";
---
> 		$admtext['hidedna'] = "Sakrij sve DNA stranice i podatke";
>         $admtext['assumeliving'] = "Pretpostavite da živite ako nije mrtav toliko godina";
> 		$admtext['mapkey'] = "Klju� Karte";
1333,1357c1418,1442
< 		$admtext['sitekey'] = "reCAPTCHA Site Key";
< 		$admtext['secret'] = "reCAPTCHA Secret";
< 		$admtext['mediadel'] = "Remove physical file on delete";
< 		$admtext['onrequest'] = "On request";
< 		$admtext['mediathumbs'] = "Show photos on one row";
< 		$admtext['footermsg'] = "Custom footer message";
< 		$admtext['templatestable'] = "Template Settings";
< 		$admtext['mediatrees'] = "Separate media in tree folders";
< 		$admtext['mediaexpl'] = "xxx media files moved";
< 		$admtext['dnatestscomparecolors'] = "Y-DNA Compare Tests Column Heading Colors";
< 		$admtext['getcolorcodes'] = "Get Color Codes Here";
< 		$admtext['mainbackground'] = "Main heading background color";
< 		$admtext['modebackground'] = "Mode values background color";
< 		$admtext['fastmutbackground'] = "Fast mutating background color";
< 		$admtext['background1_12'] = "Markers 1-12 background color";
< 		$admtext['background13_25'] = "Markers 13-25 background color";
< 		$admtext['background26_37'] = "Markers 26-37 background color";
< 		$admtext['background38_67'] = "Markers 38-67 background color";
< 		$admtext['background111'] = "Markers 68-111 background color";
< 		$admtext['textcolor'] = "Text color";
< 		$admtext['show_test_number'] = "Show DNA Test Number Publicly";
< 		$admtext['excludefromancsn'] = "Exclude From Ancestral Surnames";
< 		$admtext['upperancsunames'] = "Uppercase Ancestral Surnames";
< 		$admtext['autofillancsunames'] = "Autofill Ancestral Surnames";
< 		$admtext['colorschemer'] = "ColorSchemer - Online Color Scheme Generator";
---
> 		$admtext['sitekey'] = "reCAPTCHA Web Stranica Klju�";
> 		$admtext['secret'] = "reCAPTCHA Tajna";
> 		$admtext['mediadel'] = "Ukloni fizi�ku datoteku na brisanju";
> 		$admtext['onrequest'] = "Na zahtjev";
> 		$admtext['mediathumbs'] = "Pokažite fotografije u jednom redu";
> 		$admtext['footermsg'] = "Prilagođena podnožja poruka";
> 		$admtext['templatestable'] = "Postavke Predloška";
> 		$admtext['mediatrees'] = "Zasebni mediji u mapama stabala";
> 		$admtext['mediaexpl'] = "xxx medijske datoteke premještene";
> 		$admtext['dnatestscomparecolors'] = "Y-DNA Usporedba Testova Boje Naslova Stupaca";
> 		$admtext['getcolorcodes'] = "Ovdje nabavite kodove u boji";
> 		$admtext['mainbackground'] = "Boja Pozadine Glavnog Naslova";
> 		$admtext['modebackground'] = "Na�in Vrijednosti Pozadinske Boje";
> 		$admtext['fastmutbackground'] = "Brza Mutiranje Pozadinske Boje";
> 		$admtext['background1_12'] = "Marker 1-12 Pozadinske Boje";
> 		$admtext['background13_25'] = "Marker 13-25 Pozadinske Boje";
> 		$admtext['background26_37'] = "Marker 26-37 Pozadinske Boje";
> 		$admtext['background38_67'] = "Marker 38-67 Pozadinske Boje";
> 		$admtext['background111'] = "Marker 68-111 Pozadinske Boje";
> 		$admtext['textcolor'] = "Boja Teksta";
> 		$admtext['show_test_number'] = "Javno Pokazati Broj DNA Testa";
> 		$admtext['excludefromancsn'] = "Isklju�ite iz Rodbinskih Prezimena";
> 		$admtext['upperancsunames'] = "Velikim Slovima Prezime Rodbine";
> 		$admtext['autofillancsunames'] = "Automatska Ispuna Prezime Rodbine";
> 		$admtext['colorschemer'] = "ColorSchemer - Online Generator Shema Boja";
1359,1362c1444,1476
< 		$admtext['cookieapproval'] = "Show cookie approval message";
< 		$admtext['dataprotectmsg'] = "Show link to data protection policy";
< 		$admtext['nointernet'] = "I am using TNG offline";
< 		$admtext['askconsent'] = "Prompt for consent regarding personal info";
---
> 		$admtext['cookieapproval'] = "Prikaži poruku o odobrenju kola�ića";
> 		$admtext['dataprotectmsg'] = "Pokaži vezu do Zaštita Podataka";
> 		$admtext['nointernet'] = "Koristim TNG izvan mreže";
> 		$admtext['askconsent'] = "Zatražite suglasnost u vezi s osobnim podacima";
> 		//added in 13.0
> 		$admtext['coerce'] = "Promijenite dolazne prefikse kako bi odgovarali postavkama TNG";
> 		$admtext['sortevents'] = "Poredaj događaje prema";
> 		$admtext['sortbydate'] = "Datum događaja";
> 		$admtext['sortbytype'] = "Vrsta događaja";
> 		$admtext['allowsuggest'] = "Omogući prijedloge posjetitelja";
> 		$admtext['livingchecked'] = "Postavljena je živa zastava za nove ljude i obitelji";
> 		$admtext['maxmarried'] = "Ozna�ite obitelj koja živi ako je u braku manje od<br/ ove godine";
> 		$admtext['imagetags'] = "Pravokutnici";
> 		$admtext['allowcsv'] = "Dopustite CSV preuzimanja za izvješća";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Sigurnosne opcije";
> 		$admtext['dosql'] = "Izvezi kao SQL";
> 		$admtext['dodrop'] = "Uklju�i PUSTITI TABLICE AKO POSTOJE";
> 		$admtext['docreate'] = "Uklju�i STVORIT TABLICE";
> 		$admtext['onrestore'] = "Vratiti opcije";
> 		$admtext['dodel'] = "Prvo izbrišite prethodni sadržaj";
> 		$admtext['download'] = "Preuzimanje";
> 		$admtext['altbirthtypes'] = "Alternativni događaji rođenja";
> 		$admtext['dtformat'] = "Format tablica";
> 		$admtext['conchart'] = "Veze Grafikon";
> 		$admtext['maxropt'] = "Maksimalni broj pokretanja pretraživanja veze";
> 		$admtext['maxlopt'] = "Maksimalna duljina spojnih put";
> 		$admtext['showtxtopt'] = "Prikaz tekstualne izjave puta";
> 		$admtext['compactboxopt'] = "Prikaži kutije za osobe u kompaktnom obliku";
> 		$admtext['sortbyopt'] = "Poredaj put prema";
> 		$admtext['anchoridopt'] = "Usidreni ID";
> 		$admtext['maxmopt'] = "Maksimalni brakovi u vezi";
> 		$admtext['saveincfg'] = "Pohrani u konfiguracijskom putu (pogledajte Opće Postavke)";
1367,1369c1481,1483
< 		$admtext['enternamepart'] = "enter part of first and/or last name";
< 		$admtext['pleasenamepart'] = "Please enter a portion of a first or last name.";
< 		$admtext['enternamepart2'] = "enter ID or part of first and/or last name";
---
> 		$admtext['enternamepart'] = "upišite dio imena i/ili prezimena";
> 		$admtext['pleasenamepart'] = "Unesite dio imena ili prezimena.";
> 		$admtext['enternamepart2'] = "unesite ID ili dio imena i/ili prezimena";
1374,1404c1488,1517
< 		$admtext['pleaseplacepart'] = "Please enter part of a place name.";
< 		$admtext['addnewplace'] = "Add New Place";
< 		$admtext['createplace'] = "Create a record for a new place";
< 		$admtext['modifyplace'] = "Modify Existing Place";
< 		$admtext['editexistingplaceinfo'] = "Edit information for a previously entered place";
< 		$admtext['enterplace'] = "Please enter a place.";
< 		$admtext['newplaceinfo'] = "New Place Information";
< 		$admtext['existingplaceinfo'] = "Existing Information for Place";
< 		$admtext['changestoplace'] = "Changes to place";
< 		$admtext['selectplaceaction'] = "Select Place and Action";
< 		$admtext['mergeplaces'] = "Merge Places";
< 		$admtext['findmerge'] = "Find Merge Candidates";
< 		$admtext['selectplacemerge'] = "Select Places to Merge";
< 		$admtext['mcol1'] = "Merge<br/>these<br/>(delete)";
< 		$admtext['mcol2'] = "into<br/>this<br/>(keep)";
< 		$admtext['pmsucc'] = "Place merge successful";
< 		$admtext['nomerge'] = "Nothing to merge";
< 		$admtext['enterkeep'] = "Please select a merge target.";
< 		$admtext['backmerge'] = "Search again";
< 		$admtext['confdeleteplace'] = "Are you sure you want to delete this place?";
< 		$admtext['propagate'] = "Make changes to place name in existing events";
< 		//added in 8.0.0
< 		$admtext['confdelcemlink'] = "Are you sure you want to unlink this cemetery?";
< 		$admtext['nocoords'] = "Missing Latitude or Longitude";
< 		$admtext['istemple'] = "This place name is an LDS temple code";
< 		$admtext['findtemples'] = "Find only LDS temple codes";
< 		$admtext['choosecem'] = "Choose a Cemetery";
< 		$admtext['geocopy'] = "Copy geocode information below to this cemetery";
< 		$admtext['linkcem'] = "Link this place to a cemetery";
< 		$admtext['cemsavail'] = "List only includes cemeteries that are not already linked to a place";
< 		$admtext['nocemsavail'] = "No cemeteries exist, or each cemetery has already been linked to a place.";
---
> 		$admtext['pleaseplacepart'] = "Unesite dio naziva mjesta.";
> 		$admtext['addnewplace'] = "Dodaj Novo Mjesto";
> 		$admtext['createplace'] = "Stvorite zapis za novo mjesto";
> 		$admtext['modifyplace'] = "Izmijenite postojeće mjesto";
> 		$admtext['editexistingplaceinfo'] = "Uredi podatke za prethodno upisano mjesto";
> 		$admtext['enterplace'] = "Unesite mjesto.";
> 		$admtext['newplaceinfo'] = "Informacije o novom mjestu";
> 		$admtext['existingplaceinfo'] = "Postojeće informacije o mjestu";
> 		$admtext['changestoplace'] = "Promjene na mjestu";
> 		$admtext['selectplaceaction'] = "Odaberite Mjesto i Radnja";
> 		$admtext['mergeplaces'] = "Spajanje Mjesta";
> 		$admtext['findmerge'] = "Pronađi Spojene Kandidate";
> 		$admtext['selectplacemerge'] = "Odaberite Mjesta za Spajanje";
> 		$admtext['mcol1'] = "Spoji<br/>ove<br/>(brisanje)";
> 		$admtext['mcol2'] = "u<br/>ovom<br/>(zadržati)";
> 		$admtext['pmsucc'] = "Mjesto Spajanje Uspješno";
> 		$admtext['nomerge'] = "Ništa za Spajanje";
> 		$admtext['enterkeep'] = "Odaberite Cilj Spajanja.";
> 		$admtext['backmerge'] = "Ponovno Pretražite";
> 		$admtext['confdeleteplace'] = "Jeste li sigurni da želite izbrisati ovo mjesto?";
> 		$admtext['propagate'] = "Izmijenite naziv mjesta u postojećim događajima";
> 		$admtext['confdelcemlink'] = "Jeste li sigurni da želite prekinuti vezu s tim grobljem?";
> 		$admtext['nocoords'] = "Nedostaje zemljopisna širina ili dužina";
> 		$admtext['istemple'] = "Naziv mjesta je LDS kod hrama";
> 		$admtext['findtemples'] = "Pronađite samo LDS kodove hrama";
> 		$admtext['choosecem'] = "Odaberite Groblje";
> 		$admtext['geocopy'] = "Kopirajte dolje podatke o Geokod na ovo groblje";
> 		$admtext['linkcem'] = "Povežite ovo mjesto s grobljem";
> 		$admtext['cemsavail'] = "Popis uklju�uje samo groblja koja još nisu povezana s mjestom";
> 		$admtext['nocemsavail'] = "Nema groblja ili je svako groblje već povezano s mjestom.";
1406,1418c1519,1530
<         $admtext['geocode'] = "Geocode";
<         $admtext['ignoreall'] = "Ignore all";
<         $admtext['usefirst'] = "Use first match";
<         $admtext['multchoice'] = "If multiple results are found for a place:";
<         $admtext['geoexpl'] = "Geocode all Places without latitude and longitude coordinates";
<         $admtext['geocoding'] = "Geocoding...";
<         $admtext['backgeo'] = "Return to Geocode menu";
<         $admtext['limit'] = "Limit:";
<         $admtext['nolimit'] = "No limit";
< 		$admtext['blankplace'] = "Blank place name";
<         $admtext['nogeocode'] = "Could not be geocoded";
<         $admtext['toomany'] = "Ignored (too many results)";
< 		$admtext['treesgone'] = "Tree assignments removed from all place records";
---
>         $admtext['geocode'] = "Geokod";
>         $admtext['ignoreall'] = "Zanemarite sve";
>         $admtext['usefirst'] = "Upotrijebi prvi me�";
>         $admtext['multchoice'] = "Ako se za mjesto pronađe više rezultata:";
>         $admtext['geoexpl'] = "Geokod sva Mjesta bez koordinata zemljopisne širine i dužine";
>         $admtext['geocoding'] = "Geokodiranje...";
>         $admtext['backgeo'] = "Povratak na Izbornik Geokod";
>         $admtext['limit'] = "Ograni�iti:";
>         $admtext['nolimit'] = "Nema Ograni�iti";
> 		$admtext['blankplace'] = "Prazan Naziv Mjesta";
>         $admtext['toomany'] = "Zanemareno (previše rezultata)";
> 		$admtext['treesgone'] = "Zadaci stabala uklonjeni su iz svih evidencija mjesta";
1420,1421c1532,1533
< 		$admtext['nolevel'] = "Place Level not set";
< 		$admtext['placenotsaved'] = "Place not saved. Another place with that name already exists. Please merge instead.";
---
> 		$admtext['nolevel'] = "Razina mjesta nije postavljena";
> 		$admtext['placenotsaved'] = "Mjesto nije sa�uvano. Drugo mjesto s tim imenom već postoji. Spojite.";
1423c1535,1537
< 		$admtext['noevents'] = "No associated events";
---
> 		$admtext['noevents'] = "Nema pridruženih događaja";
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Nemojte geokodirati";
1428,1429c1542,1543
< 		$admtext['generatenewid'] = "Generate New ID";
< 		$admtext['generating'] = "Generating...Please wait";
---
> 		$admtext['generatenewid'] = "Stvori novi ID";
> 		$admtext['generating'] = "Generiranje ... Molimo pri�ekajte";
1434,1444c1548,1557
< 		$admtext['trackinglines'] = "Tracking Lines of Descent...";
< 		$admtext['finishedtracking'] = "Finished tracking lines of descent.";
< 		$admtext['backtosecondary'] = "Back to Secondary Processes";
< 		$admtext['sortchildren'] = "Sort Children";
< 		$admtext['sortingchildren'] = "Sorting Children";
< 		$admtext['sortspouses'] = "Sort Spouses";
< 		$admtext['sortingspouses'] = "Sorting Spouses";
< 		$admtext['relabelbranches'] = "Ponovo labeliraj grane";
< 		$admtext['relabeling'] = "Ponovno labeliranje grana";
< 		$admtext['creatinggendex'] = "Creating GENDEX file...";
< 		$admtext['finishedgendex'] = "Finished with GENDEX file creation.";
---
> 		$admtext['trackinglines'] = "Praćenje linija od Potomaka...";
> 		$admtext['finishedtracking'] = "Gotovo Praćenje linija od Potomaka.";
> 		$admtext['sortchildren'] = "Poredaj djecu";
> 		$admtext['sortingchildren'] = "Razvrstavanje djece";
> 		$admtext['sortspouses'] = "Poredati supružnike";
> 		$admtext['sortingspouses'] = "Razvrstavanje supružnika";
> 		$admtext['relabelbranches'] = "Ponovo ozna�iti grane";
> 		$admtext['relabeling'] = "Ozna�ivaju se grane";
> 		$admtext['creatinggendex'] = "Izrada GENDEX datoteke...";
> 		$admtext['finishedgendex'] = "Završeno sa GENDEX stvaranjem datoteka.";
1446c1559
< 		$admtext['postgdx'] = "Where to post your GENDEX file";
---
> 		$admtext['postgdx'] = "Gdje objaviti svoju GENDEX datoteku";
1448,1450c1561,1563
< 		$admtext['evalmedia'] = "Trim Media Menus";
< 		$admtext['evaluating'] = "Counting media";
< 		$admtext['finished'] = "Finished";
---
> 		$admtext['evalmedia'] = "Izrežite izbornike medija";
> 		$admtext['evaluating'] = "Brojanje medija";
> 		$admtext['finished'] = "Gotov";
1452,1456c1565,1571
< 		$admtext['refreshliving'] = "Refresh Living";
< 		$admtext['chtodeceased'] = "changed to deceased";
< 		$admtext['chtoliving'] = "changed to living";
< 		$admtext['chtoprivate'] = "changed to private";
< 		$admtext['makeprivate'] = "Make Private";
---
> 		$admtext['refreshliving'] = "Osvježi žive";
> 		$admtext['chtodeceased'] = "promijenjen u pokojnika";
> 		$admtext['chtoliving'] = "promijenio u život";
> 		$admtext['chtoprivate'] = "promijenjen u privatni";
> 		$admtext['makeprivate'] = "Napravite Privatno";
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Povratak na pomoćne programe nakon uvoza";
1461,1473c1576,1588
< 		$admtext['addnewlanguage'] = "Add New Language";
< 		$admtext['enterlangdisplay'] = "Please enter a language display name.";
< 		$admtext['enterlangfolder'] = "Please enter the name of the folder where files for this language will be stored.";
< 		$admtext['newlanguageinfo'] = "New Language Information";
< 		$admtext['langdisplay'] = "Name for this language<br/>as it will be displayed for visitors";
< 		$admtext['createlanguage'] = "Create a record for a new language";
< 		$admtext['nolanguages'] = "No language records exist";
< 		$admtext['conflangdelete'] = "Are you sure you want to delete this language?";
< 		$admtext['existinglanguages'] = "Existing Language Information";
< 		$admtext['modifylanguage'] = "Modify Existing Language";
< 		$admtext['changestolanguage'] = "Changes to language";
< 		$admtext['charset'] = "Character set";
< 		$admtext['editexistinglanguage'] = "Add, edit or delete languages";
---
> 		$admtext['addnewlanguage'] = "Dodaj Jezik";
> 		$admtext['enterlangdisplay'] = "Unesite prikazano ime jezika.";
> 		$admtext['enterlangfolder'] = "Unesite ime mape u koju će se pohraniti datoteke za ovaj jezik.";
> 		$admtext['newlanguageinfo'] = "Nove informacije o jeziku";
> 		$admtext['langdisplay'] = "Naziv za ovaj jezik<br/>jer će biti prikazan posjetiteljima";
> 		$admtext['createlanguage'] = "Stvorite zapis za novi jezik";
> 		$admtext['nolanguages'] = "Ne postoje jezi�ni zapisi";
> 		$admtext['conflangdelete'] = "Jeste li sigurni da želite izbrisati ovaj jezik?";
> 		$admtext['existinglanguages'] = "Postojeće jezi�ne informacije";
> 		$admtext['modifylanguage'] = "Izmjena postojećeg jezika";
> 		$admtext['changestolanguage'] = "Promjene jezika";
> 		$admtext['charset'] = "Skup slova";
> 		$admtext['editexistinglanguage'] = "Dodaj, Uredi ili Briši jezika";
1478,1509c1593,1622
< 		$admtext['createtree'] = "Create a record for a new tree";
< 		$admtext['notrees'] = "No tree records exist";
< 		$admtext['existingtrees'] = "Existing Tree Information";
< 		$admtext['editexistingtree'] = "Edit information for a previously entered tree";
< 		$admtext['treename'] = "Tree Name";
< 		$admtext['owner'] = "Owner";
< 		$admtext['conftreedelete'] = "Are you sure you want to delete this tree and all associated items?";
< 		$admtext['conftreeclear'] = "Are you sure you want to clear all data from this tree?";
< 		$admtext['changestotree'] = "Changes to tree";
< 		$admtext['newtreeinfo'] = "New Tree Information";
< 		$admtext['existingtreeinfo'] = "Existing Tree Information";
< 		$admtext['modifytree'] = "Modify Existing Tree";
< 		$admtext['succcleared'] = "was successfully cleared";
< 		$admtext['gedcomextraction'] = "Don't allow users to download GEDCOM files";
< 		$admtext['gedexport'] = "GEDCOM Export";
< 		$admtext['exporting'] = "Exporting GEDCOM...";
< 		$admtext['ifexportfails'] = "If the export fails to run to completion,";
< 		$admtext['finishedexporting'] = "Finished Exporting GEDCOM";
< 		$admtext['backtotrees'] = "Back to Trees";
< 		$admtext['downloadged'] = "Download GEDCOM";
< 		$admtext['lastimport'] = "Last Import";
< 		$admtext['treeexists'] = "Another tree already exists with the selected ID. Please select a different ID and try again.";
< 		$admtext['exportmedia'] = "Export media links";
< 		//added in 8.0.0
< 		$admtext['changetree'] = "Change Tree";
< 		$admtext['newtree'] = "New Tree";
< 		$admtext['currtree'] = "Current Tree";
< 		$admtext['chwarn'] = "WARNING: This operation will remove all family links, citations and other references to this entity within the current tree.";
< 		$admtext['keepprivate'] = "Keep owner information private";
< 		//changed in 9.0.0
< 		$admtext['exppaths'] = "Local paths for";
< 		$admtext['nopdf'] = "Don't allow users to create PDF files";
---
> 		$admtext['createtree'] = "Stvorite zapis za novo stablo";
> 		$admtext['notrees'] = "Ne postoje zapisi o stablu";
> 		$admtext['existingtrees'] = "Informacija o stablu";
> 		$admtext['editexistingtree'] = "Uredite podatke za prethodno uneseno stablo";
> 		$admtext['treename'] = "Ime Stable";
> 		$admtext['owner'] = "Vlasnik";
> 		$admtext['conftreedelete'] = "Jeste li sigurni da želite izbrisati ovo stablo i sve povezane stavke?";
> 		$admtext['conftreeclear'] = "Jeste li sigurni da želite izbrisati sve podatke s ovog stabla?";
> 		$admtext['changestotree'] = "Promjene na stablu";
> 		$admtext['newtreeinfo'] = "Informacije o novom stablu";
> 		$admtext['existingtreeinfo'] = "Informacija o stablu";
> 		$admtext['modifytree'] = "Izmijenite Postojeće Stabla";
> 		$admtext['succcleared'] = "uspješno je o�išćen";
> 		$admtext['gedcomextraction'] = "Ne dopustite korisnicima da preuzimaju GEDCOM datoteke";
> 		$admtext['gedexport'] = "GEDCOM Izvoz";
> 		$admtext['exporting'] = "Izvozimo GEDCOM...";
> 		$admtext['ifexportfails'] = "Ako se izvoz ne izvrši do kraja,";
> 		$admtext['finishedexporting'] = "Gotov izvoz GEDCOM";
> 		$admtext['backtotrees'] = "Povratak na Stabla";
> 		$admtext['downloadged'] = "Preuzmite GEDCOM";
> 		$admtext['lastimport'] = "Zadnji Uvoz";
> 		$admtext['treeexists'] = "oš jedno stablo postoji s odabranim ID-om. Odaberite drugi ID i pokušajte ponovo.";
> 		$admtext['exportmedia'] = "Izvoz medijskih veza";
> 		$admtext['changetree'] = "Promijenite Stabla";
> 		$admtext['newtree'] = "Novo Stable";
> 		$admtext['currtree'] = "Trenutno stablo";
> 		$admtext['chwarn'] = "UPOZORENJE: Ovom operacijom bit će uklonjene sve obiteljske veze, citati i druge reference na ovaj entitet unutar trenutnog stabla.";
> 		$admtext['keepprivate'] = "Informacije vlasnika ostanite privatne";
> 		$admtext['exppaths'] = "Lokalni putevi za";
> 		$admtext['nopdf'] = "Ne dopustite korisnicima da stvaraju PDF datoteke";
1511,1513c1624,1631
< 		$admtext['exprivate'] = "Exclude private";
< 		$admtext['exliving'] = "Exclude living";
< 		$admtext['importfilename'] = "Import File Name";
---
> 		$admtext['exprivate'] = "Izuzmi privatno";
> 		$admtext['exliving'] = "Izuzmi žive";
> 		$admtext['importfilename'] = "Uvezi Naziv Datoteke";
> 		//added in 13.0
> 		$admtext['exnotes'] = "Izuzmi bilješke";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "ZIP i uklju�uju medijske datoteke";
> 		$admtext['downloadzip'] = "Preuzmite ZIP";
1518,1533c1636,1651
< 		$admtext['addnewuser'] = "Dodaj novog korisnika";
< 		$admtext['createuser'] = "Kreiraj zapis za novog korisnika";
< 		$admtext['nousers'] = "Ne postoje zapisi za korisnika";
< 		$admtext['existingusers'] = "Postojeca informacija korisnika";
< 		$admtext['editexistinguser'] = "Uredi informaciju za prethodno unesenog korisnika";
< 		$admtext['confuserdelete'] = "Da li ste sigurni da želite obrisati ovog korisnika?";
< 		$admtext['changestouser'] = "Changes to user";
< 		$admtext['enteruserpassword'] = "Please enter a password.";
< 		$admtext['enterusername'] = "Please enter a username.";
< 		$admtext['newuserinfo'] = "New User Information";
< 		$admtext['existinguserinfo'] = "Existing User Information";
< 		$admtext['modifyuser'] = "Modify Existing User";
< 		$admtext['allow_living'] = "Allow to view information for living individuals";
< 		$admtext['allow_lds'] = "Allow to view LDS information";
< 		$admtext['enteruserdesc'] = "Please enter a user description.";
< 		$admtext['enterpassword'] = "Please enter a password.";
---
> 		$admtext['addnewuser'] = "Dodaj Korisnika";
> 		$admtext['createuser'] = "Stvorite zapis za novog korisnika";
> 		$admtext['nousers'] = "Ne postoji zapis za korisnika";
> 		$admtext['existingusers'] = "Postojeća informacija o korisniku";
> 		$admtext['editexistinguser'] = "Uredi podataka za prethodno upisanog korisnika";
> 		$admtext['confuserdelete'] = "Jeste li sigurni da želite izbrisati ovog korisnika?";
> 		$admtext['changestouser'] = "Promjene korisnika";
> 		$admtext['enteruserpassword'] = "Unesite lozinku.";
> 		$admtext['enterusername'] = "Unesite korisni�ko ime.";
> 		$admtext['newuserinfo'] = "Nove informacije o korisniku";
> 		$admtext['existinguserinfo'] = "Postojeći podaci o korisniku";
> 		$admtext['modifyuser'] = "Izmjena postojećeg korisnika";
> 		$admtext['allow_living'] = "Dopustite za pregled podataka o živim pojedincima";
> 		$admtext['allow_lds'] = "Dopusti za pregled podataka o LDS";
> 		$admtext['enteruserdesc'] = "Unesite opis korisnika.";
> 		$admtext['enterpassword'] = "Unesite lozinku.";
1535,1541c1653,1659
< 		$admtext['firstuser'] = "The first user you create will be an Administrator (NO tree selected) and will have access to all system settings.";
< 		$admtext['userfailed'] = "ERROR: Your user could not be created because another user with the same username already exists.";
< 		$admtext['allow_ged'] = "Allow to download GEDCOMs";
< 		$admtext['assigned'] = "Assigned";
< 		$admtext['treemsg'] = "Opciono. Ne dodjeljivanje stabla korisniku ce rezultirati da korisnik ima prava u svim stablima i granama. Administrator site-a ne bi trebao sebi dodijeliti stablo.";
< 		$admtext['branchmsg'] = "Optional. Dodjeljivanje grane korisniku ce osigurati korištenje prava dodijeljena stranici unutar odabranog stabla.";
< 		$admtext['accesslimits'] = "Limitiran pristup:";
---
> 		$admtext['firstuser'] = "Prvi korisnik koji stvorite bit će Administrator (NE odabrano stablo) i imat će pristup svim postavkama sustava.";
> 		$admtext['userfailed'] = "POGREŠKA: Vašeg korisnika nije moguće stvoriti jer već postoji drugi korisnik s istim korisni�kim imenom.";
> 		$admtext['allow_ged'] = "Omogući za preuzimanje GEDCOM";
> 		$admtext['assigned'] = "Dodijeljeno";
> 		$admtext['treemsg'] = "OPCIJSKI: Ako dodijelite nijedno drvo korisniku, korisnik će imati prava za sva stabla i sve grane. Administrator web mjesta ne smije dodijeliti stablo.";
> 		$admtext['branchmsg'] = "OPCIJSKI: Dodjeljivanje grane korisniku ograni�it će prava dodijeljena na ovoj stranici dodijeljenoj grani unutar odabranog stabla.";
> 		$admtext['accesslimits'] = "Ograni�enja pristupa:";
1543c1661
< 		$admtext['realname'] = "Real Name";
---
> 		$admtext['realname'] = "Pravo Ime";
1545,1552c1663,1670
< 		$admtext['newusers'] = "New User Registrations";
< 		$admtext['editnewusers'] = "Process records for newly registered users. New users have no rights until registrations are processed.";
< 		$admtext['nonewusers'] = "No new users";
< 		$admtext['lastlogin'] = "Last Login";
< 		$admtext['tentative_edit'] = "Allow to submit edits for administrative review (People, Families and Sources only)";
< 		$admtext['notify'] = "Notify this user upon account activation";
< 		$admtext['no_edit'] = "No edit rights";
< 		$admtext['emailusers'] = "E-mail Users";
---
> 		$admtext['newusers'] = "Novi Korisni�ke Registracije";
> 		$admtext['editnewusers'] = "Obrađuje zapise za novo registrirane korisnike. Novi korisnici nemaju prava dok se prijave ne obrade.";
> 		$admtext['nonewusers'] = "Nema novih korisnika";
> 		$admtext['lastlogin'] = "Zadnja Prijava";
> 		$admtext['tentative_edit'] = "Omogući slanje izmjena na upravni pregled (samo Ljudi, Obitelji i Izvori)";
> 		$admtext['notify'] = "Obavijestite ovog korisnika nakon aktiviranja ra�una";
> 		$admtext['no_edit'] = "Nema prava na uređivanje";
> 		$admtext['emailusers'] = "e-poštu Korisnica";
1554,1584c1672,1701
< 		$admtext['emailmessage'] = "E-mail Message To Users";
< 		$admtext['subject'] = "E-mail Subject";
< 		$admtext['messagetext'] = "E-mail Text";
< 		$admtext['selectgroup'] = "Select group to receive e-mail (leave blank to send to all)";
< 		$admtext['treemailmsg'] = "Optional. Choosing a tree will restrict the message to users assigned to that tree.";
< 		$admtext['branchmailmsg'] = "Opciono. Odabirom grane, poruke korisniku iz te grane ce biti restriktirane.";
< 		$admtext['send'] = "Send E-mail";
< 		$admtext['sentmailmessage'] = "Sent E-mail Message";
< 		$admtext['succmail'] = "Your e-mail message has been sent.";
< 		$admtext['mailfailed'] = "Your e-mail message failed to send.";
< 		$admtext['entersubject'] = "Please enter a subject for your message.";
< 		$admtext['entermsgtext'] = "Please enter the text of your message.";
< 		$admtext['adminonly'] = "Show Admin users only";
< 		$admtext['dtregistered'] = "Date Registered";
< 		$admtext['dtactivated'] = "Date Activated";
< 		$admtext['no_email'] = "Do not send mass e-mail to this user";
< 		$admtext['allow_admin'] = "Dozvoli pristup svim sistemskim postavkama i administrativnim funkcijama i primjeni prava u svim stablima i ganama.";
< 		$admtext['limitedrights'] = "Limitirana prava slijedecim:";
< 		$admtext['allow_edit'] = "Allow to edit existing records";
< 		$admtext['allow_add'] = "Allow to add new records";
< 		$admtext['allow_delete'] = "Allow to delete existing records";
< 		//added in 8.0.0
< 		$admtext['usrguest'] = "Guest";
< 		$admtext['usrguestd'] = "No add, edit or delete rights.";
< 		$admtext['noadmin'] = "No access to Admin area.";
< 		$admtext['usrsubm'] = "Submitter";
< 		$admtext['usrsubmd'] = "Submit changes subject to review.";
< 		$admtext['usrcontrib'] = "Contributor";
< 		$admtext['usrcontribd'] = "Add information, including media.";
< 		$admtext['usreditor'] = "Editor";
< 		$admtext['usreditord'] = "Add, edit and delete all information, including media.";
---
> 		$admtext['emailmessage'] = "Poruka e-pošte korisnicima";
> 		$admtext['subject'] = "E-pošte Tema";
> 		$admtext['messagetext'] = "E-pošte Tekst";
> 		$admtext['selectgroup'] = "Odaberite grupu za primanje e-pošte (ostavite prazno da biste je poslali svima)";
> 		$admtext['treemailmsg'] = "OPCIJSKI: Odabirom stabla poruka će se ograni�iti na korisnike koji su dodijeljeni tom stablu.";
> 		$admtext['branchmailmsg'] = "OPCIJSKI. Odabirom grane poruka će se ograni�iti na korisnike koji su dodijeljeni toj grani.";
> 		$admtext['send'] = "Pošalji e-poštu";
> 		$admtext['sentmailmessage'] = "Poslana poruka e-pošte";
> 		$admtext['succmail'] = "Vaša e-pošta poruka je poslana.";
> 		$admtext['mailfailed'] = "Vaša e-pošta poruka nije uspjela poslati.";
> 		$admtext['entersubject'] = "Unesite temu svoje poruke.";
> 		$admtext['entermsgtext'] = "Unesite tekst svoje poruke.";
> 		$admtext['adminonly'] = "Prikaži samo Admin. korisnika";
> 		$admtext['dtregistered'] = "Datum Registriranja";
> 		$admtext['dtactivated'] = "Datum Aktiviranja";
> 		$admtext['no_email'] = "Ne šaljite masovnu e-poštu ovom korisniku";
> 		$admtext['allow_admin'] = "Primijenite gore navedena prava na sva stabla i grane.";
> 		$admtext['limitedrights'] = "Ograni�ite gornja prava na sljedeće:";
> 		$admtext['allow_edit'] = "Dopusti uređivanje svih postojećih podataka";
> 		$admtext['allow_add'] = "Dopusti dodavanje novih podataka";
> 		$admtext['allow_delete'] = "Dopustite za brisanje svih postojećih podataka";
> 		$admtext['usrguest'] = "Gost";
> 		$admtext['usrguestd'] = "Nema prava za Dodat, Urdeit ili Obrisat.";
> 		$admtext['noadmin'] = "Nema pristupa podru�ju Administratora.";
> 		$admtext['usrsubm'] = "Podnosilac";
> 		$admtext['usrsubmd'] = "Pošaljite promjene koje su podložne pregledu.";
> 		$admtext['usrcontrib'] = "Prinosnik";
> 		$admtext['usrcontribd'] = "Dodaj informaciju, uklju�ujući medije.";
> 		$admtext['usreditor'] = "Urednik";
> 		$admtext['usreditord'] = "Dodaj, Uredi i Izbriši sve informacije, uklju�ujući medije.";
1586,1600c1703,1716
< 		$admtext['usradmind'] = "All rights.";
< 		$admtext['usrmcontrib'] = "Media Contributor";
< 		$admtext['usrmcontribd'] = "Add media only.";
< 		$admtext['usrmeditor'] = "Media Editor";
< 		$admtext['usrmeditord'] = "Add, edit and delete media only.";
< 		$admtext['allow_media_edit'] = "Allow to edit media only";
< 		$admtext['allow_media_add'] = "Allow to add media only";
< 		$admtext['allow_media_delete'] = "Allow to delete media only";
< 		$admtext['no_add'] = "No add rights";
< 		$admtext['no_delete'] = "No delete rights";
< 		$admtext['roles'] = "Roles";
< 		$admtext['usrcustom'] = "Custom";
<         //added in 9.0.0
< 		$admtext['allow_private'] = "Allow to view information for private individuals";
< 		$admtext['allow_pdf'] = "Allow to download PDFs";
---
> 		$admtext['usradmind'] = "Sva Prava";
> 		$admtext['usrmcontrib'] = "Medije Prinosnik";
> 		$admtext['usrmcontribd'] = "Dodaj medije samo.";
> 		$admtext['usrmeditor'] = "Medije Urednik";
> 		$admtext['usrmeditord'] = "Dodaj, Uredi i Izbriši  medije samo.";
> 		$admtext['allow_media_edit'] = "Dopusti samo prava da Uredi medija";
> 		$admtext['allow_media_add'] = "Dopusti samo prava da Dodaj medija";
> 		$admtext['allow_media_delete'] = "Dopusti samo prava da Izbriši medija";
> 		$admtext['no_add'] = "Nema Dodaj prava";
> 		$admtext['no_delete'] = "Nema Izbriši prava";
> 		$admtext['roles'] = "Uloga";
> 		$admtext['usrcustom'] = "Prilagođeni";
> 		$admtext['allow_private'] = "Dopustite za pregled podataka za privatne osobe";
> 		$admtext['allow_pdf'] = "Omogući za preuzimanje PDF-ova";
1602c1718
< 		$admtext['allow_profile'] = "Allow to edit user profile";
---
> 		$admtext['allow_profile'] = "Dopusti uređivanje korisni�kog profila";
1604c1720
< 		$admtext['mult_trees'] = "Apply rights to multiple trees";
---
> 		$admtext['mult_trees'] = "Primijenite prava na više stabala";
1606,1607c1722,1729
< 		$admtext['consented'] = "Consent given";
< 		$admtext['consentdate'] = "Date Consented";
---
> 		$admtext['consented'] = "Saglasnost dana";
> 		$admtext['consentdate'] = "Datum saglasnosti";
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Prikaži samo onemogućene korisnike";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Dopusti pregled privatnih bilješki";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Također pošalji administratorima kada je odabrano jedno stablo";
1611,1618c1733,1739
< 		$admtext['loginfailed'] = "Login failed.";
< 		$admtext['adminlogfile'] = "Admin Log File";
< 		$admtext['mostrecentactions'] = "Most Recent Actions";
< 		$admtext['rempass'] = "Ostani logiran na ovom racunalu";
< 		$admtext['sessexp'] = "Your session has expired.";
< 		$admtext['logagain'] = "Click to log in again.";
< 		//added in 8.1.0
< 		$admtext['logininactive'] = "Your login is not yet active. Please try again later or contact the site administrator.";
---
> 		$admtext['loginfailed'] = "Prijava nije uspjela.";
> 		$admtext['adminlogfile'] = "Admin. Datoteka zapisa";
> 		$admtext['mostrecentactions'] = "Najnovije akcije";
> 		$admtext['rempass'] = "Ostanite prijavljeni na ovom ra�unalu";
> 		$admtext['sessexp'] = "Vaša sesija je istekla.";
> 		$admtext['logagain'] = "Kliknite da biste se ponovo prijavili.";
> 		$admtext['logininactive'] = "Vaša prijava još nije aktivna. Pokušajte ponovo kasnije ili se obratite administratoru web mjesta.";
1622,1641c1743,1761
< 		$admtext['createnewtlevent'] = "Create a new timeline event";
< 		$admtext['modifytlevent'] = "Modify Existing Timeline Event";
< 		$admtext['leaveblankalltlevents'] = "leave blank to show all timeline events";
< 		$admtext['evyear'] = "Event year";
< 		$admtext['evdetail'] = "Event detail";
< 		$admtext['selecttleventaction'] = "Select Timeline Event and Action";
< 		$admtext['changestotlevent'] = "Changes to timeline event";
< 		$admtext['location'] = "Location";
< 		$admtext['confdeletetlevent'] = "Are you sure you want to delete this timeline event?";
< 		$admtext['enterevyear'] = "Please enter the event year.";
< 		$admtext['enterevdetail'] = "Please enter the event detail.";
< 		$admtext['existingtleventinfo'] = "Existing Timeline Event";
< 		$admtext['newtleventinfo'] = "New Timeline Event";
< 		$admtext['edittleventinfo'] = "Add, edit or delete timeline events";
< 		$admtext['addnewtlevent'] = "Add New Event";
< 		$admtext['yrreq'] = "(only year is required)";
< 		$admtext['startdt'] = "Start Date";
< 		$admtext['enddt'] = "End Date";
< 		//added in 9.0.0
< 		$admtext['evtitle'] = "Event title";
---
> 		$admtext['createnewtlevent'] = "Napravi novi događaj vremenske trake";
> 		$admtext['modifytlevent'] = "Izmjena postojećeg događaja vremenske trake";
> 		$admtext['leaveblankalltlevents'] = "ostavite prazno za prikaz svih događaja na vremenskoj traci";
> 		$admtext['evyear'] = "Godina događaja";
> 		$admtext['evdetail'] = "Detalji događaja";
> 		$admtext['selecttleventaction'] = "Odaberite Vremenski događaja i radnje";
> 		$admtext['changestotlevent'] = "Promjene vremenskog događaja";
> 		$admtext['location'] = "Mjesto";
> 		$admtext['confdeletetlevent'] = "Jeste li sigurni da želite izbrisati ovaj vremenski događaja?";
> 		$admtext['enterevyear'] = "Unesite godinu događaja.";
> 		$admtext['enterevdetail'] = "Unesite detalja događaja.";
> 		$admtext['existingtleventinfo'] = "Postojeći događaj vremenske trake";
> 		$admtext['newtleventinfo'] = "Novi događaj vremenske trake";
> 		$admtext['edittleventinfo'] = "Dodaj, Uredi ili Izbriši događaja na vremenskoj traci";
> 		$admtext['addnewtlevent'] = "Dodaj Događaj";
> 		$admtext['yrreq'] = "(potrebna je samo godina)";
> 		$admtext['startdt'] = "Po�etni datum";
> 		$admtext['enddt'] = "Datum završetka";
> 		$admtext['evtitle'] = "Naslov Događaja";
1645c1765
< 		$admtext['selectevaction'] = "Oznaci dogadaj i akciju";
---
> 		$admtext['selectevaction'] = "Odaberite Događaj i Akcija";
1647,1649c1767,1769
< 		$admtext['usernotes'] = "Zapis u vezi<br />predložene promjene<br />(nece bit pohranjeno)";
< 		$admtext['postdate'] = "Poslano na";
< 		$admtext['savedel'] = "Pohrani i obriši";
---
> 		$admtext['usernotes'] = "Napomene u vezi<br />predložene promjenu<br />(neće biti sa�uvan)";
> 		$admtext['postdate'] = "Objavljeno";
> 		$admtext['savedel'] = "Sa�uvaj i Izbriši";
1651,1653c1771,1773
< 		$admtext['igndel'] = "Ignoriraj i obriši";
< 		$admtext['tentdel'] = "was deleted";
< 		$admtext['tentadd'] = "was made permanent";
---
> 		$admtext['igndel'] = "Zanemari i Izbriši";
> 		$admtext['tentdel'] = "je izbrisan";
> 		$admtext['tentadd'] = "u�injen trajnim";
1656d1775
< 	//added in 8.0.0
1658,1673c1777,1792
< 		$admtext['noteblurb'] = "Directly locate, edit or delete any note in your database.";
< 		$admtext['whatsnewblurb'] = "Provide your visitors with a general site update or other timely information at the top of your What's New page.";
< 		$admtext['mwblurb'] = "Create a list of elusive people and unidentified photos, in hopes of getting more publicity for the items that are giving you the most trouble.";
< 		$admtext['dvblurb'] = "Find potential problems in your information.";
< 		$admtext['wr_gender'] = "Wrong gender";
< 		$admtext['unk_gender'] = "Unknown gender";
< 		$admtext['marr_young'] = "Married too young (less than 15 years old)";
< 		$admtext['marr_aft_death'] = "Married after death";
< 		$admtext['marr_bef_birth'] = "Married before birth";
< 		$admtext['died_bef_birth'] = "Died before birth";
< 		$admtext['parents_younger'] = "Born too early (parents less than 15 years old, or child born before marriage)";
< 		$admtext['children_late'] = "Born too late (mother more than 50 years old)";
< 		$admtext['not_living'] = "Person marked as living, death date present";
< 		$admtext['not_dead'] = "Person marked as deceased, possibly still living";
< 		$admtext['parmarr'] = "Parents' Marriage";
< 		$admtext['motherbirth'] = "Mother's Birth";
---
> 		$admtext['noteblurb'] = "Izravno pronađite, uredi ili izbriši bilo koju bilješku u vašoj bazi podataka.";
> 		$admtext['whatsnewblurb'] = "Omogućite svojim posjetiteljima općenito ažuriranje web mjesta ili druge pravovremene informacije pri vrhu stranice Što je novo.";
> 		$admtext['mwblurb'] = "Napravite popis neuhvatljivih ljudi i neidentificiranih fotografija u nadi da ćete dobiti veći publicitet za predmete koji vam stvaraju najviše problema.";
> 		$admtext['dvblurb'] = "Pronađite potencijalne probleme u svojim podacima.";
> 		$admtext['wr_gender'] = "Pogrešan spol";
> 		$admtext['unk_gender'] = "Nepoznat spol";
> 		$admtext['marr_young'] = "Oženjen premlada (mlađi od 15 godina)";
> 		$admtext['marr_aft_death'] = "Oženjen nakon smrti";
> 		$admtext['marr_bef_birth'] = "Oženjen prije rođenja";
> 		$admtext['died_bef_birth'] = "Umro prije rođenja";
> 		$admtext['parents_younger'] = "Rođen prerano (roditelji mlađi od 15 godina ili dijete rođeno prije braka)";
> 		$admtext['children_late'] = "Rođena prekasno (majka više od 50 godina)";
> 		$admtext['not_living'] = "Osoba ozna�ena kao živa, prisutan datum smrti";
> 		$admtext['not_dead'] = "Osoba ozna�ena kao preminula, možda još uvijek živi";
> 		$admtext['parmarr'] = "Brak roditelja";
> 		$admtext['motherbirth'] = "Maj�ino rođenje";
1677,1703c1796,1820
< 		$admtext['modlist'] = "Mod List";
< 		$admtext['removed'] = "removed";
< 		$admtext['installed'] = "Installed";
< 		$admtext['deleted'] = "deleted";
< 		$admtext['cantdel'] = "can't delete";
< 		$admtext['cfgname'] = "Config File Name";
< 		$admtext['version'] = "Version";
< 		$admtext['nomods'] = "No mod definition files (xxx) found in the mod folder";
< 		$admtext['location'] = "Location";
< 		$admtext['missing'] = "Missing";
< 		$admtext['badtarget'] = "Bad target";
< 		$admtext['cantwrite'] = "Unable to write to";
< 		$admtext['notwrite'] = "is not writable, check permissions";
< 		$admtext['checkwrite'] = "Check permissions, must be writeable.";
< 		$admtext['toterrors'] = "Total Errors";
< 		$admtext['missfile'] = "Missing file";
< 		$admtext['notunique'] = "not unique";
< 		$admtext['nodesc'] = "Parameter definition error, missing description";
< 		$admtext['defval'] = "Default value";
< 		$admtext['written'] = "File written";
< 		//changed in 9.0.0
< 		$admtext['locmissing'] = "Local copy of xxx for installation is missing";
< 		//added in 9.0.0
< 		$admtext['needmodupdate'] = "Mod updates are required";
< 		$admtext['cannotinstall'] = "Unable to install this mod";
< 		$admtext['emptytarget'] = "Target file is an empty file.";
< 		$admtext['cantdelmissing'] = "Cannot delete, file is missing";
---
> 		$admtext['modlist'] = "Popis Modova";
> 		$admtext['removed'] = "uklonjeno";
> 		$admtext['installed'] = "Instalirani";
> 		$admtext['deleted'] = "Izbrisano";
> 		$admtext['cantdel'] = "ne mogu izbrisati";
> 		$admtext['cfgname'] = "Konfigurirajte naziv datoteke";
> 		$admtext['version'] = "Verzija";
> 		$admtext['nomods'] = "Nema mod. datoteke definicije (xxx) pronađene u mod mapi";
> 		$admtext['location'] = "Mjesto";
> 		$admtext['missing'] = "Nedostaji";
> 		$admtext['badtarget'] = "Loša meta";
> 		$admtext['cantwrite'] = "Nije moguće pisati u";
> 		$admtext['notwrite'] = "ne može se pisati, provjeriti dopuštenja";
> 		$admtext['checkwrite'] = "Provjerite dozvole, moraju biti upisive.";
> 		$admtext['toterrors'] = "Ukupno pogrešaka";
> 		$admtext['missfile'] = "Nedostaji datoteka";
> 		$admtext['notunique'] = "nije jedinstven";
> 		$admtext['nodesc'] = "Pogreška definicije parametra, nedostaje opis";
> 		$admtext['defval'] = "Zadana vrijednost";
> 		$admtext['written'] = "Datoteka je napisana";
> 		$admtext['locmissing'] = "Lokalni primjerak od xxx za instalaciju nedostaje";
> 		$admtext['needmodupdate'] = "Mod ažuriranja su obavezna";
> 		$admtext['cannotinstall'] = "Nije moguće instalirati ovaj mod";
> 		$admtext['emptytarget'] = "Ciljna datoteka je prazna datoteka.";
> 		$admtext['cantdelmissing'] = "Brisanje nije moguće, datoteka nedostaje";
1705c1822
< 		$admtext['editperf'] = "The Edit parameters were changed as follows:";
---
> 		$admtext['editperf'] = "Parametri Uređivanje promijenjeni su na sljedeći na�in:";
1707,1733c1824,1850
< 		$admtext['options'] = "Options";
< 		$admtext['viewlog'] = "View Log";
< 		$admtext['target'] = "Changes";
< 		$admtext['newfile'] = "Creates";
< 		$admtext['copiesfile'] = "Copies";
< 		$admtext['copiesfile2'] = "Copies to";
< 		$admtext['logoptions'] = "Mod Manager Log";
< 		$admtext['mmlogfilename'] = "Log File Name";
< 		$admtext['sortlistby'] = "Sort Lists by";
< 		$admtext['modname'] = "Mod Name";
< 		$admtext['bypassconfirm'] = "Bypass the Confirmations";
< 		$admtext['modifyoptions'] = "Modify Mod Manager Options";
< 		$admtext['ready'] = "OK to Install";
< 		$admtext['noselected'] = "You have not selected any files!";
< 		$admtext['choose'] = "Select";
< 		$admtext['showlogfile'] = "Show Mod Manager Action Log";
< 		$admtext['recentactions'] = "Mod Manager Most Recent Actions";
< 		$admtext['clearlog'] = "Clear Log";
< 		$admtext['confirmclearlog'] = "Are you sure you want to clear the log?";
< 		$admtext['modsyntax'] = "Mod Syntax";
< 		$admtext['modguidelines'] = "Mod Standards";
< 		$admtext['filemod'] = "File xxx is modified by";
< 		$admtext['potconf'] = "Potential Conflicts";
< 		$admtext['modifications'] = "modifications";
< 		$admtext['othermmoptions'] = "Other";
< 		$admtext['file'] = "File";
< 		$admtext['tngmods'] = "Mods for TNG ";
---
> 		$admtext['options'] = "Opcije";
> 		$admtext['viewlog'] = "Pregled dnevnika";
> 		$admtext['target'] = "Promjene";
> 		$admtext['newfile'] = "Stvara";
> 		$admtext['copiesfile'] = "Kopije";
> 		$admtext['copiesfile2'] = "Kopije do";
> 		$admtext['logoptions'] = "Mod Menadžera zapisnik";
> 		$admtext['mmlogfilename'] = "Zapisnika datoteke ime";
> 		$admtext['sortlistby'] = "Poredaj popisa prema";
> 		$admtext['modname'] = "Mod Ime";
> 		$admtext['bypassconfirm'] = "Zaobiđite potvrde";
> 		$admtext['modifyoptions'] = "Izmijenite Mod Menadžera Opcije";
> 		$admtext['ready'] = "U redu za instalaciju";
> 		$admtext['noselected'] = "Niste odabrali nijednu datoteku!";
> 		$admtext['choose'] = "Odaberi";
> 		$admtext['showlogfile'] = "Prikaži Mod Menadžera dnevni zapisnik";
> 		$admtext['recentactions'] = "Mod Menadžera najnovije akcije";
> 		$admtext['clearlog'] = "O�isti zapisnik";
> 		$admtext['confirmclearlog'] = "Jeste li sigurni da želite poništiti zapisnik?";
> 		$admtext['modsyntax'] = "Mod Sintaks";
> 		$admtext['modguidelines'] = "Mod Standardi";
> 		$admtext['filemod'] = "Datoteka xxx izmijenio/la";
> 		$admtext['potconf'] = "Potencijalni sukobi";
> 		$admtext['modifications'] = "izmjene";
> 		$admtext['othermmoptions'] = "Drugo/i";
> 		$admtext['file'] = "Datoteka";
> 		$admtext['tngmods'] = "Mod za TNG ";
1735,1743c1852,1860
< 		$admtext['copied'] = "copied";
< 		$admtext['emptyfile'] = "file is empty";
< 		$admtext['filescopied'] = "files copied";
< 		$admtext['notinst'] = "not installed";
< 		$admtext['install'] = "install";
< 		$admtext['filedel'] = "File deleted";
< 		$admtext['created'] = "created";
< 		$admtext['choosefilter'] = "Choose the filter and click Go for the available controls";
< 		$admtext['mmmaxloglines'] = "Max number of transactions";
---
> 		$admtext['copied'] = "kopirana";
> 		$admtext['emptyfile'] = "datoteka je prazna";
> 		$admtext['filescopied'] = "datoteke su kopirane";
> 		$admtext['notinst'] = "nije instalirano";
> 		$admtext['install'] = "instalirati";
> 		$admtext['filedel'] = "Datoteka je izbrisana";
> 		$admtext['created'] = "stvorio";
> 		$admtext['choosefilter'] = "Odaberite filtar i kliknite Idi za dostupne kontrole";
> 		$admtext['mmmaxloglines'] = "Maksimalni broj transakcija";
1746,1778c1863,1895
< 		$admtext['uninstall'] = "Uninstall";    // was $admtext['remove'] = "Remove"
< 		$admtext['cleanup'] = "Clean Up";  // previously used as $admtext['clean']
< 		$admtext['edopts'] = "Edit Options";  // previously used as $admtext['edit'] without Option text
< 		$admtext['ok2inst'] = "OK to install";  // previously used $admtext['ready'] which is already translated
< 		$admtext['badversion'] = "file version/version mismatch";
< 		$admtext['bomfound'] = "BOM removed";
< 		$admtext['cantinst'] = "cannot install";
< 		$admtext['cantproc'] = "cannot remove mod";
< 		$admtext['cantupd'] = "unable to update parameter";
< 		$admtext['cleanupall'] = "Clean up";
< 		$admtext['copiesreq'] = "file copies specified";
< 		$admtext['delete'] = "Delete";
< 		$admtext['deleteall'] = "Delete";
< 		$admtext['errors'] = "errors";
< 		$admtext['excused'] = "files excused";
< 		$admtext['filesinst'] = "files installed";
< 		$admtext['filesrem'] = "files removed";
< 		$admtext['format'] = "format error";
< 		$admtext['installall'] = "Install";
< 		$admtext['installing'] = "Installing";
< 		$admtext['line'] = "Line";
< 		$admtext['modified'] = "modified";
< 		$admtext['modsinst'] = "code modifications installed";
< 		$admtext['modrem'] = "mod uninstalled";
< 		$admtext['modsrem'] = "code modifications removed";
< 		$admtext['modsreq'] = "code modifications specified";
< 		$admtext['newfilesreq'] = "new files specified";
< 		$admtext['nfcreated'] = "new file created";
< 		$admtext['noact'] = "action tag invalid";
< 		$admtext['nocfgfile'] = "mod file not found";
< 		$admtext['nocomps'] = "missing elements";
< 		$admtext['noend'] = "%end:% tag missing";
< 		$admtext['nolocation'] = "missing location tag";
---
> 		$admtext['uninstall'] = "deinstalirati";    // was $admtext['remove'] = "Remove"
> 		$admtext['cleanup'] = "Po�istiti";  // previously used as $admtext['clean']
> 		$admtext['edopts'] = "Opcije uređivanja";  // previously used as $admtext['edit'] without Option text
> 		$admtext['ok2inst'] = "U redu za instalaciju";  // previously used $admtext['ready'] which is already translated
> 		$admtext['badversion'] = "datoteke verzija/neusklađenost verzije";
> 		$admtext['bomfound'] = "BOM uklonit";
> 		$admtext['cantinst'] = "ne može se instalirati";
> 		$admtext['cantproc'] = "ne može ukloniti mod";
> 		$admtext['cantupd'] = "nije moguće ažurirati parametar";
> 		$admtext['cleanupall'] = "Po�istiti";
> 		$admtext['copiesreq'] = "određene kopije datoteka";
> 		$admtext['delete'] = "Izbrisati";
> 		$admtext['deleteall'] = "Izbrisati";
> 		$admtext['errors'] = "greške";
> 		$admtext['excused'] = "datoteke oproštene";
> 		$admtext['filesinst'] = "datoteke instalirane";
> 		$admtext['filesrem'] = "datoteke su uklonjene";
> 		$admtext['format'] = "pogreška formata";
> 		$admtext['installall'] = "Instalirati";
> 		$admtext['installing'] = "Instaliranje";
> 		$admtext['line'] = "Linija";
> 		$admtext['modified'] = "promijenjen";
> 		$admtext['modsinst'] = "koda modifikacija instalirana";
> 		$admtext['modrem'] = "mod deinstaliran";
> 		$admtext['modsrem'] = "koda modifikacija uklonjene";
> 		$admtext['modsreq'] = "koda modifikacija specificirana";
> 		$admtext['newfilesreq'] = "određene su nove datoteke";
> 		$admtext['nfcreated'] = "stvorena nova datoteka";
> 		$admtext['noact'] = "akcijska oznaka nije važeća";
> 		$admtext['nocfgfile'] = "mod datoteka nije pronađena";
> 		$admtext['nocomps'] = "elementi koji nedostaju";
> 		$admtext['noend'] = "%end:% oznaka nedostaji";
> 		$admtext['nolocation'] = "nedostaje oznaka lokacije";
1780,1817c1897,1934
< 		$admtext['opened'] = "opened";
< 		$admtext['optional'] = "optional";
< 		$admtext['partinst'] = "partially installed";
< 		$admtext['removeall'] = "Uninstall";    // was Remove Selected mods
< 		$admtext['removing'] = "Uninstalling";    // was Removing
< 		$admtext['reqtag'] = "required tag missing";
< 		$admtext['restparam'] = "Restoring default parameter";
< 		$admtext['return'] = "Return to Mod Manager";
< 		$admtext['tagnoterm'] = "tag not terminated";
< 		$admtext['tagunk'] = "tag is unknown";
< 		$admtext['tgtfile'] = "target file";
< 		$admtext['updated'] = "updated";
< 		$admtext['updparam'] = "Updating parameter";
< 		$admtext['unxend'] = "unexpected end of file";
< 		$admtext['warnings'] = "Warnings";
< 		$admtext['allowdeletepartial'] = "Allow Delete Selected of Partially Installed Mods";
< 		$admtext['allowdeleteinstalled'] = "Allow Delete of individually Installed Mods";
< 		$admtext['showwarnings'] = "Show Mod Warnings in Status";
< 		$admtext['logfullpath'] = "Log full path for file actions";
< 		$admtext['deleting'] = "Deleting ";
< 		$admtext['wiki'] = "Wiki";
< 		$admtext['aflist'] = "Files";
< 		$admtext['hasoptions'] = "Options";
< 		$admtext['restore'] = "Restore Default";
< 		$admtext['stayon'] = "Lock";
< 		$admtext['accessible'] = "accessible";
< 		$admtext['bypassed'] = "bypassed";
< 		$admtext['willbypass'] = "will ignore";  // was "will bypass"
< 		$admtext['cantdel'] = "can't delete";
< 		$admtext['optmissing'] = "file missing (optional)";
< 		$admtext['tgtmissing'] = "target file missing";
< 		$admtext['optlocked'] = "file locked (optional)";
< 		$admtext['tgtlocked'] = "file locked";
< 		$admtext['alreadyrem'] = "already removed";
< 		$admtext['noaccess'] = "no access";
< 		$admtext['badinstall'] = "failed to install";
< 		$admtext['removed'] = "removed";
< 		$admtext['deleted'] = "deleted";
---
> 		$admtext['opened'] = "otvori";
> 		$admtext['optional'] = "neobavezan";
> 		$admtext['partinst'] = "djelomi�no instaliran";
> 		$admtext['removeall'] = "Deinstalirati";    // was Remove Selected mods
> 		$admtext['removing'] = "Deinstalira se";    // was Removing
> 		$admtext['reqtag'] = "nedostaje potrebna oznaka";
> 		$admtext['restparam'] = "Vraćanje zadanog parametra";
> 		$admtext['return'] = "Vratite se Mod Menadžeru";
> 		$admtext['tagnoterm'] = "oznaka nije ukinuta";
> 		$admtext['tagunk'] = "ag je nepoznat";
> 		$admtext['tgtfile'] = "ciljna datoteka";
> 		$admtext['updated'] = "ažurirana";
> 		$admtext['updparam'] = "Parametar ažuriranja";
> 		$admtext['unxend'] = "neo�ekivani kraj datoteke";
> 		$admtext['warnings'] = "Upozorenja";
> 		$admtext['allowdeletepartial'] = "Dopusti brisanje odabranih djelomi�no instaliranih Modova";
> 		$admtext['allowdeleteinstalled'] = "Dopusti brisanje pojedina�no instaliranih Modova";
> 		$admtext['showwarnings'] = "Prikaži Mod upozorenja u statusu";
> 		$admtext['logfullpath'] = "Prijavite cijeli put za datoteka radnje";
> 		$admtext['deleting'] = "Brisanje ";
> 		$admtext['wiki'] = "Pomoć - Wiki";
> 		$admtext['aflist'] = "Datoteke";
> 		$admtext['hasoptions'] = "Opcije";
> 		$admtext['restore'] = "Vratiti tvorni�ke postavke";
> 		$admtext['stayon'] = "Zaklju�aj";
> 		$admtext['accessible'] = "dostupan";
> 		$admtext['bypassed'] = "zaobići";
> 		$admtext['willbypass'] = "zanemarit će";  // was "will bypass"
> 		$admtext['cantdel'] = "ne mogu izbrisati";
> 		$admtext['optmissing'] = "datoteka nedostaje (izborno)";
> 		$admtext['tgtmissing'] = "nedostaje ciljna datoteka";
> 		$admtext['optlocked'] = "datoteka zaklju�ana (izborno)";
> 		$admtext['tgtlocked'] = "datoteka zaklju�ana";
> 		$admtext['alreadyrem'] = "već uklonjena";
> 		$admtext['noaccess'] = "nema pristupa";
> 		$admtext['badinstall'] = "nije uspio instalirati";
> 		$admtext['removed'] = "uklonjeno";
> 		$admtext['deleted'] = "Izbrisano";
1820,1843c1937,1960
< 		$admtext['optnocopy'] = "optional file not copied";
< 		$admtext['notcopied'] = "not copied";
< 		$admtext['copied'] = "copied";
< 		$admtext['notcreated'] = "can't create new file";
< 		$admtext['optnotcreated'] = "can't create optional new file";
< 		$admtext['nocreated'] = "not created";
< 		$admtext['fixedheader'] = "Use Fixed Headers";
< 		$admtext['cantremok'] = "can't remove, optional, bypassed";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['edparams'] = "edit parameters";
< 		$admtext['compresslog'] = "Collapse Log Display";
< 		$admtext['formodname'] = "for mod name ";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['fileperms'] = "Please check file permissions";
< 		$admtext['noparam'] = "parameter missing";
< 		$admtext['editing'] = "editing";
< 		$admtext['redirect2log'] = "Redirect to Log For";
< 		$admtext['on_error'] = "Errors Only";
< 		$admtext['on_all'] = "All Transactions";
< 		$admtext['usestriping'] = "Use stripes";
< 		$admtext['stripeafter'] = "Stripe after number of rows";
< 		$admtext['adjusthdrs'] = "Adjust Fixed Headers";
< 		$admtext['displayoptions'] = "Display Settings";
< 		$admtext['no_frag'] = "code fragment not allowed here";
---
> 		$admtext['optnocopy'] = "izborna datoteka nije kopirana";
> 		$admtext['notcopied'] = "nije kopirana";
> 		$admtext['copied'] = "kopirana";
> 		$admtext['notcreated'] = "ne mogu stvoriti novu datoteku";
> 		$admtext['optnotcreated'] = "ne može stvoriti novu izbornu datoteku";
> 		$admtext['nocreated'] = "nije stvoren";
> 		$admtext['fixedheader'] = "Koristite Fiksna Zaglavlja";
> 		$admtext['cantremok'] = "ne može se ukloniti, izborno, zaobići";
> 		$admtext['nofolder'] = "nedostaje ciljna mapa";
> 		$admtext['edparams'] = "uredi parametre";
> 		$admtext['compresslog'] = "Sažmi prikaz dnevnika";
> 		$admtext['formodname'] = "za ime mod ";
> 		$admtext['nofolder'] = "nedostaje ciljna mapa";
> 		$admtext['fileperms'] = "Provjerite dopuštenja datoteka";
> 		$admtext['noparam'] = "nedostaje parametar";
> 		$admtext['editing'] = "uređivanje";
> 		$admtext['redirect2log'] = "Lreusmjeravanje do zapisnika za";
> 		$admtext['on_error'] = "Greške samo";
> 		$admtext['on_all'] = "Sve transakcije";
> 		$admtext['usestriping'] = "Koristite pruge";
> 		$admtext['stripeafter'] = "Pruga nakon broja redaka";
> 		$admtext['adjusthdrs'] = "Podesite Fiksna Zaglavlja";
> 		$admtext['displayoptions'] = "Postavke Zaslona";
> 		$admtext['no_frag'] = "fragment koda ovdje nije dopušten";
1845,1879c1962,2002
< 		$admtext['exists'] = "exists";
< 		$admtext['newdirsreq'] = "new folders specified";
< 		$admtext['cantrem'] = "can't remove";
< 		$admtext['showanalyzer'] = "Show Analyzer tab";
< 		$admtext['showdeveloper'] = "Show Other Developer tools";
< 		$admtext['showupdates'] = "Show Recommended Updates tab";
< 		$admtext['analyzefiles'] = "Analyze TNG Files";
< 		$admtext['parsetable'] = "View Parser Table";
< 		$admtext['recommendedfixes'] = "Recommended Updates";
< 		$admtext['selectmod'] = "Select a mod config file to view the parser table results";
< 		$admtext['parsertags'] = "Parser Tags Array:";
< 		$admtext['parsererror'] = "Error: ";
< 		$admtext['filesel'] = "Select Modified File to examine the changes";
< 		$admtext['custtextfixes'] = "The updated Mod Guidelines recommend that custom text be inserted before the comments at the beginning of the cust_text.php file so that mods do not impact user manual changes made after the comment lines.";
< 		$admtext['updcusttext'] = "Update cust_text.php files";
< 		$admtext['confirmupdcusttext'] = "Are you sure you want to update the cust_text.php files?";
< 		$admtext['compressnames'] = "Compress Mod Names in Mod List";
< 		$admtext['verified'] = "verified";
< 		$admtext['provisional'] = "(provisional) must be available";
< 		$admtext['backtoprevious'] = "Return to previous page";
< 		$admtext['reasontoupdate'] = "If you have not run the cust_text_update.php script as part of the TNG v12 upgrade, you need to update your cust_text.php files to <ul><li>add a new line to the files and </li><li>also update out-of-date line in your existing cust_text.php files</li></ul> which are not replaced during TNG upgrades.";
< 		$admtext['newanchor'] = "The new comment line should not be translated in the language files so that it can be used as an anchor to insert custom text before this new comment line by the mod developers.";
< 		$admtext['translateissue'] = "If you translate the new comment line, mod installs will fail.";
< 		$admtext['privatemod'] = "Private Mod";
< 		$admtext['protected'] = "protected-remove file manually";
< 		$admtext['restored'] = "restored";
< 		$admtext['confdelmod'] = "Do you really want to delete this mod from your system?";
< 		$admtext['allowdeletesupport'] = "Allow Delete support folder when mod is deleted";
< 		$admtext['delrisk'] = "By choosing this option, user accepts all risk that unintended folders could be deleted. We believe this risk is very small.";
< 		$admtext['delpartinfo'] = "You should only set this option to Yes, if you forgot to Uninstall previous versions of the mod before installing a new version.";
< 		$admtext['delinstinfo'] = "You should only set this option to Yes, if you installed a new version of the mod and the previous version still shows installed.";
< 		$admtext['updateopts'] = "Your mmconfig.php needs to be updated! Please click on the Options tab above and click on the Save button.";
< 		$admtext['confdelmod1'] = "Do you really want to delete this mod from your system? You can not undo this operation!";
< 		$admtext['noeffect'] = "Warning: Does not change anything in TNG!";
< 		$admtext['cfgnowrite'] = "Warning: Cfg file is write-protected. Parameters cannot be changed.";
---
> 		$admtext['exists'] = "postoji";
> 		$admtext['newdirsreq'] = "određene su nove mape";
> 		$admtext['cantrem'] = "ne može ukloniti";
> 		$admtext['showanalyzer'] = "Prikaži Analyzer karticu";
> 		$admtext['showdeveloper'] = "Pokažite druge alate za razvojne programere";
> 		$admtext['showupdates'] = "Prikaži karticu Preporu�ene nadogradnje";
> 		$admtext['analyzefiles'] = "Analizirajte TNG datoteke";
> 		$admtext['parsetable'] = "Pogledajte tablicu Raš�lanjivanja";
> 		$admtext['recommendedfixes'] = "Preporu�ene nadogradnje";
> 		$admtext['selectmod'] = "Odaberite mod konfiguracijsku datoteku za pregled rezultata tablice za raš�lanjivanje";
> 		$admtext['parsertags'] = "Analizator oznaka polje:";
> 		$admtext['parsererror'] = "Greška: ";
> 		$admtext['filesel'] = "Odaberite TNG datoteku da biste vidjeli koji modovi utje�u na nju";
> 		$admtext['custtextfixes'] = "Ažurirane Mod smjernice preporu�uju umetanje prilagođenog teksta prije komentara na po�etku datoteke cust_text.php tako da modovi ne utje�u na promjene u korisni�kom priru�niku izvršene nakon redaka komentara.";
> 		$admtext['updcusttext'] = "Ažurirajte datoteke cust_text.php";
> 		$admtext['confirmupdcusttext'] = "Jeste li sigurni da želite ažurirati datoteke cust_text.php?";
> 		$admtext['compressnames'] = "Uklonite razmake s imena datoteka na Mod popis";
> 		$admtext['verified'] = "potvrđen";
> 		$admtext['provisional'] = "(privremeni) moraju biti dostupni";
> 		$admtext['backtoprevious'] = "Povratak na prethodnu stranicu";
> 		$admtext['reasontoupdate'] = "Ako niste pokrenuli skriptu cust_text_update.php kao dio nadogradnje za TNG v12, morate ažurirati datoteke cust_text.php da <ul><li>dodate novi redak u datoteke i </li><li>također ažurirajte zastarelu liniju u postojećim datotekama cust_text.php</li></ul> koje se ne zamjenjuju tijekom TNG nadogradnje.";
> 		$admtext['newanchor'] = "Nova linija komentara ne bi trebala biti prevedena u jezi�ne datoteke tako da se može upotrijebiti kao sidro za umetanje prilagođenog teksta prije ovoga koment linije od modnih programera.";
> 		$admtext['translateissue'] = "Ako prevedete novu liniju komentara, instalacije moda neće uspjeti.";
> 		$admtext['privatemod'] = "Privatni Mod";
> 		$admtext['protected'] = "zaštićeno - uklonite datoteku ru�no";
> 		$admtext['restored'] = "obnovljena";
> 		$admtext['confdelmod'] = "Želite li stvarno izbrisati ovaj Mod i povezanu mapu iz svog sustava? Ne možete poništiti ovu operaciju!";
> 		$admtext['allowdeletesupport'] = "Dopusti Izbriši mapu podrške kada se mod izbriše";
> 		$admtext['delrisk'] = "Odabirom ove opcije, korisnik prihvaća sav rizik da se nenamjerne mape mogu izbrisati. Vjerujemo da je taj rizik vrlo mali.";
> 		$admtext['delpartinfo'] = "Ovu opciju trebali biste postaviti samo na Da, ako ste zaboravili deinstalirati prethodne verzije modova prije instaliranja nove verzije.";
> 		$admtext['delinstinfo'] = "Ovu opciju trebali biste postaviti samo na Da, ako ste instalirali novu verziju modova, a prethodna verzija i dalje prikazuje instaliranu.";
> 		$admtext['updateopts'] = "Potrebno je ažurirati mmconfig.php! Kliknite gornju karticu Opcije i kliknite gumb Sa�uvaj.";
> 		$admtext['confdelmod1'] = "Želite li stvarno izbrisati ovaj Mod iz svog sustava? Ne možete poništiti ovu operaciju!";
> 		$admtext['noeffect'] = "UPOZORENJE: Nemoj ništa mijenjat u TNG!";
> 		$admtext['cfgnowrite'] = "UPOZORENJE: Cfg datoteka zaštićena je od pisanja. Parametri se ne mogu mijenjati.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Svi modovi";
> 		$admtext['installedmods'] = "Samo instalirani modovi";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Prikaži radnje u Modova Analyzeru";
> 		$admtext['badchar'] = "Nevažeće slovo"; 
1884,1898c2007,2020
< 		$admtext['confdeletedna'] = "Are you sure you want to delete this test?";
< 		$admtext['test_type'] = "Test Type";
< 		$admtext['test_number'] = "Test Number";
< 		$admtext['test_date'] = "Test Date";
< 		$admtext['modifydna'] = "Edit Existing DNA Test";
< 		$admtext['changestoalldna'] = "Changes to all tests";
< 		$admtext['addnewdna'] = "Add New DNA Test";
< 		$admtext['testinfo'] = "Test Information";
< 		$admtext['urls'] = "Relevant Links";
< 		$admtext['dnalater'] = "Note: Test can be linked to other individuals on the next screen.";
< 		$admtext['selecttype'] = "Please select a test type.";
< 		$admtext['entertestnum'] = "Please enter the test number.";
< 		$admtext['test_taker'] = "Person who took this test";
< 		$admtext['test_links'] = "People Linked by this Test";
< 		$admtext['changestotest'] = "Changes to test";
---
> 		$admtext['confdeletedna'] = "Jeste li sigurni da želite izbrisati ovaj test?";
> 		$admtext['test_type'] = "Vrsta testa";
> 		$admtext['test_date'] = "Datum testa";
> 		$admtext['modifydna'] = "Uredi postojeći DNA test";
> 		$admtext['changestoalldna'] = "Promjene svih testova";
> 		$admtext['addnewdna'] = "Dodaj novi DNA test";
> 		$admtext['testinfo'] = "Test Informacija";
> 		$admtext['urls'] = "Relevantne linkove";
> 		$admtext['dnalater'] = "NAPOMENA: Na sljedećem zaslonu može se dodati više informacija i test vezan za više pojedinaca.";
> 		$admtext['selecttype'] = "Odaberite vrstu testa.";
> 		$admtext['entertestnum'] = "Unesi broj testa.";
> 		$admtext['test_taker'] = "Osoba koja je položila ovaj test";
> 		$admtext['test_links'] = "Ljudi povezani ovim testom";
> 		$admtext['changestotest'] = "Promjene za test";
1900,1918c2022,2049
< 		$admtext['dnalater'] = "Note: Test can be linked to other individuals on the next screen.";
< 		$admtext['markers'] = "Number of Markers";
< 		$admtext['test_values'] = "Test Values";
< 		$admtext['separate'] = "Separate values with commas";
< 		$admtext['person_name'] = "Person not in database";
< 		$admtext['privsection'] = "Privacy";
< 		$admtext['configsettings'] = "General Settings";
< 		$admtext['addtotestgroup'] = "Add Test To A Group";
< 		$admtext['dna_group'] = "DNA Group";
< 		$admtext['groupid'] = "Group ID";
< 		$admtext['addgroup'] = "Add Group";
< 		$admtext['entergroupid'] = "Please enter a group ID";
< 		$admtext['entergroupdesc'] = "Please enter a group description";
< 		$admtext['confgroupdelete'] = "Are you sure you want to delete this group?";
< 		$admtext['modifygroup'] = "Edit Existing Group";
< 		$admtext['mrcaiorf'] = "If relevant, enter a person ID OR a family ID";
< 		$admtext['test_results'] = "Test Results";
< 		$admtext['mdaID'] = "Most distant ancestor ID";
< 		$admtext['mrcaID'] = "Most recent common ancestor ID";
---
> 		$admtext['dnalater'] = "NAPOMENA: Na sljedećem zaslonu može se dodati više informacija i test vezan za više pojedinaca.";
> 		$admtext['markers'] = "Broj markera";
> 		$admtext['test_values'] = "Test vrijednosti";
> 		$admtext['separate'] = "Vrijednosti razdvojite zarezima";
> 		$admtext['person_name'] = "Osoba nije u bazi podataka";
> 		$admtext['privsection'] = "Privatnost";
> 		$admtext['configsettings'] = "Opće Postavke";
> 		$admtext['addtotestgroup'] = "Dodaj test grupi";
> 		$admtext['dna_group'] = "DNA grupa";
> 		$admtext['groupid'] = "Grupe ID";
> 		$admtext['addgroup'] = "Dodaj Grupu";
> 		$admtext['entergroupid'] = "Unesite ID grupe";
> 		$admtext['entergroupdesc'] = "Unesite opis grupe";
> 		$admtext['confgroupdelete'] = "Jeste li sigurni da želite izbrisati ovu grupu?";
> 		$admtext['modifygroup'] = "Uredi Postojeće Grupe";
> 		$admtext['mrcaiorf'] = "Ako je relevantno, unesi ID osobe ILI obiteljski ID";
> 		$admtext['test_results'] = "Rezultati ispitivanja";
> 		$admtext['mdaID'] = "ID najudaljenijeg pretka";
> 		$admtext['mrcaID'] = "Najnoviji zajedni�ki ID predaka";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Broj";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Držite test privatnim";
> 		$admtext['multivalues'] = "Koristite crtice između više vrijednosti";
> 		$admtext['changestogroup'] = "Promjene u DNA grupi";
> 		$admtext['modifydnagroup'] = "Uredi postojeću DNA grupu";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Povežite ovaj DNA test s osobom"; 
1923,1925c2054,2056
< $admtext['cannotexecutequery'] = "Ne mogu pokrenuti query";
< $admtext['addnew'] = "Add New";
< $admtext['individuals'] = "osobe";
---
> $admtext['cannotexecutequery'] = "Upit nije moguće izvršiti";
> $admtext['addnew'] = "Dodaj Novi";
> $admtext['individuals'] = "osoba";
1928,1934c2059,2065
< $admtext['succsaved'] = "je uspješno pohranjeno";
< $admtext['succdeleted'] = "je uspješno obrisano";
< $admtext['succdeletedpluslinks'] = "je uspješno obrisano, zajedno sa svim linkovima";
< $admtext['text_delete'] = "Obriši";
< $admtext['deleted'] = "Obrisano";
< $admtext['deleteselected'] = "Obriši oznaceno";
< $admtext['noresults'] = "Rezultati nisu pronadeni. Pokušajte ponovo.";
---
> $admtext['succsaved'] = "je uspješno sa�uvano";
> $admtext['succdeleted'] = "je uspješno izbrisano";
> $admtext['succdeletedpluslinks'] = "je uspješno izbrisano, zajedno sa svim linkovima";
> $admtext['text_delete'] = "Izbriši";
> $admtext['deleted'] = "Izbrisani";
> $admtext['deleteselected'] = "Izbriši odabrano";
> $admtext['noresults'] = "Nema rezultata. Molim te pokušaj ponovno.";
1938c2069
< $admtext['notes'] = "Zapis";
---
> $admtext['notes'] = "Bilješke";
1942,1947c2073,2078
< $admtext['searchfor'] = "Pretraži za";
< $admtext['lookin'] = "Pogledaj unutar (cekiraj sve na koje se to odnosi)";
< $admtext['cemeteryid'] = "ID groblja";
< $admtext['exactmatch'] = "Samo tocan match";
< $admtext['nothingtodelete'] = "Nema ništa za brisanje";
< $admtext['state'] = "state";
---
> $admtext['searchfor'] = "Traži za";
> $admtext['lookin'] = "Pogledaj (provjerite sve Å¡to vrijedi)";
> $admtext['cemeteryid'] = "ID Groblja";
> $admtext['exactmatch'] = "Samo ta�an me�";
> $admtext['nothingtodelete'] = "Ništa za brisanje";
> $admtext['state'] = "županija";
1950,1951c2081,2082
< $admtext['ifphotouploaded'] = "Ostavi ovo polje prazno ako su datoteke vec bile uploadane u tvojem direktoriju slika.";
< $admtext['eventtype'] = "Tip dogadaja";
---
> $admtext['ifphotouploaded'] = "Ostavite ovo polje prazno ako je datoteka već prenesena u mapu vaših fotografija.";
> $admtext['eventtype'] = "Vrsta događaja";
1953c2084
< $admtext['savechanges'] = "Pohrani promjene";
---
> $admtext['savechanges'] = "Sa�uvaj";
1955,1956c2086,2087
< $admtext['find'] = "Nadi...";
< $admtext['create'] = "Kreiraj...";
---
> $admtext['find'] = "Nađi...";
> $admtext['create'] = "Stvori...";
1958,1960c2089,2091
< $admtext['birthabbr'] = "b.";
< $admtext['chrabbr'] = "c.";
< $admtext['remove'] = "Obriši";
---
> $admtext['birthabbr'] = "r.";
> $admtext['chrabbr'] = "kr.";
> $admtext['remove'] = "Izbriši";
1963,1965c2094,2095
< $admtext['enterpersonid'] = "Molim unesi ID osobe";
< $admtext['personid'] = "ID osobe";
< $admtext['otherevents'] = "Ostali dogadaji";
---
> $admtext['enterpersonid'] = "Unesite ID Osobe";
> $admtext['personid'] = "ID Osobe";
1967,1969c2097,2099
< $admtext['children'] = "Djeca";
< $admtext['chrdate'] = "Datum Christening";
< $admtext['chrplace'] = "Mjesto Christening";
---
> $admtext['children'] = "Dijeca";
> $admtext['chrdate'] = "Datum krštenja";
> $admtext['chrplace'] = "Mjesto krštenja";
1972,1975c2102,2105
< $admtext['burialdate'] = "Datum ukopa";
< $admtext['burialplace'] = "Mjesto ukopa";
< $admtext['birthdate'] = "Datum rodenja";
< $admtext['birthplace'] = "Mjesto rodenja";
---
> $admtext['burialdate'] = "Datum sahrane";
> $admtext['burialplace'] = "Mjesto sahrane";
> $admtext['birthdate'] = "Datum rođenja";
> $admtext['birthplace'] = "Mjesto rođenja";
1978,1980c2108,2110
< $admtext['marriagedate'] = "Datum vjenjcanja";
< $admtext['marriageplace'] = "Mjesto vjenjcanja";
< $admtext['lastname'] = "prezime";
---
> $admtext['marriagedate'] = "Datum vjen�anja";
> $admtext['marriageplace'] = "Mjesto vjen�anja";
> $admtext['lastname'] = "Prezime";
1984,1995c2114,2125
< $admtext['cannotopen'] = "Ne mogu otvoriti datoteku";
< $admtext['check'] = "Check";
< $admtext['generate'] = "Generiraj";
< $admtext['update'] = "Update";
< $admtext['confdeleteevent'] = "Da li si siguran da želiš obrisati ovaj dogadaj?";
< $admtext['existinglinks'] = "Postojeci linkovi:<br/>(ozaci za obrisati)";
< $admtext['lowersortfirst'] = "Lower numbers sort first. Decimal numbers may also be used.";
< $admtext['personsname'] = "Ime osobe";
< $admtext['tablecreation'] = "Tabla kreirana";
< $admtext['tracklines'] = "Track Lines";
< $admtext['administration'] = "Administration";
< $admtext['text_or'] = "OR";
---
> $admtext['cannotopen'] = "Datoteka se ne može otvoriti";
> $admtext['check'] = "ÄŒek";
> $admtext['generate'] = "Generirati";
> $admtext['update'] = "Ažuriranje";
> $admtext['confdeleteevent'] = "Jeste li sigurni da želite izbrisati ovaj događaj?";
> $admtext['existinglinks'] = "Postojeće linkovi:<br/> (ozna�ite za brisanje)";
> $admtext['lowersortfirst'] = "Niži brojevi prvo sortiraju. Također se mogu koristiti decimalni brojevi.";
> $admtext['personsname'] = "Ime Osobe";
> $admtext['tablecreation'] = "Izrada Tablice";
> $admtext['tracklines'] = "Praćenje linija";
> $admtext['administration'] = "Administrator";
> $admtext['text_or'] = "ILI";
1997,2000c2127,2130
< $admtext['families'] = "Families";
< $admtext['headstones'] = "Headstones";
< $admtext['histories'] = "Histories";
< $admtext['people'] = "People";
---
> $admtext['families'] = "Obiteji";
> $admtext['headstones'] = "Spomeniki";
> $admtext['histories'] = "Povijesti";
> $admtext['people'] = "Osobe";
2002,2006c2132,2136
< $admtext['reports'] = "Reports";
< $admtext['sources'] = "Sources";
< $admtext['suffix'] = "Suffix";
< $admtext['add'] = "Add";
< $admtext['confdeleteentity'] = "Da li ste sigurni da želite obrisati oznaceno";
---
> $admtext['reports'] = "Izvještaji";
> $admtext['sources'] = "Izvori";
> $admtext['suffix'] = "Sufiks";
> $admtext['add'] = "Dodaj";
> $admtext['confdeleteentity'] = "Jeste li sigurni da želite izbrisati odabrano";
2011c2141
< $admtext['orderpound'] = "Order #";
---
> $admtext['orderpound'] = "Narudžba #";
2014,2019c2144,2149
< $admtext['selectaddtree'] = "Stablo (oznaci ili dodaj novo)";
< $admtext['selecttree'] = "Molim oznaci/dodaj stablo.";
< $admtext['treebefevent'] = "Morate oznaciti ili unijeti ime stabla prije dodavanja novog dogadaja.";
< $admtext['text_rename'] = "Preimenuj";
< $admtext['clear'] = "Ocisti";
< $admtext['linktothis'] = "Link do ove osobe";
---
> $admtext['selectaddtree'] = "Stablo (odaberi ili dodaj novo)";
> $admtext['selecttree'] = "Odaberi/Dodaj stablo.";
> $admtext['treebefevent'] = "Prije dodavanja novih događaja morate odabrati ili unijeti ime stabla.";
> $admtext['text_rename'] = "Preimenovati";
> $admtext['clear'] = "O�isti";
> $admtext['linktothis'] = "Poveznica s ovom osobom";
2021,2027c2151,2157
< $admtext['existingconfig'] = "Postojeca konfiguracija";
< $admtext['lastmodified'] = "Zadnje modificirano";
< $admtext['addnotes'] = "Dodatne zabilješke";
< $admtext['confdeletenote'] = "Da li ste sigurni da želite obrisati ovu zabilješku?";
< $admtext['treebefnote'] = "Morate oznaciti ili unijeti ime prije dodavanja novih zabilježaka.";
< $admtext['general'] = "General";
< $admtext['entersearchvalue'] = "Molim unesite vrijednost za pretraživanje.";
---
> $admtext['existingconfig'] = "Postojeća konfiguracija";
> $admtext['lastmodified'] = "Zadnja promjena";
> $admtext['addnotes'] = "Dodatne Napomene";
> $admtext['confdeletenote'] = "Jeste li sigurni da želite izbrisati ovu bilješku?";
> $admtext['treebefnote'] = "Prije dodavanja novih bilješki morate odabrati ili upisati naziv stabla.";
> $admtext['general'] = "Općenito";
> $admtext['entersearchvalue'] = "Unesite vrijednost pretraživanja.";
2031,2035c2161,2165
< $admtext['norights'] = "Niste autorizirani vidjeti ovu stranicu. Ako imate korisnicko ime i Å¡ifru molim logirajte se dolje.";
< $admtext['username'] = "Username";
< $admtext['password'] = "Password";
< $admtext['login'] = "Login";
< $admtext['logout'] = "Logout";
---
> $admtext['norights'] = "Niste ovlašteni za pregled ove stranice. Ako imate korisni�ko ime i lozinku, prijavite se u nastavku.";
> $admtext['username'] = "Korisni�ko ime";
> $admtext['password'] = "Lozinka";
> $admtext['login'] = "Prijaviti se";
> $admtext['logout'] = "Odjavite se";
2041,2043c2171,2173
< $admtext['folder'] = "Direktorij";   //from languages
< $admtext['confdeletepers'] = "Da li si siguran da želiš obrisati ovu osobu?";
< $admtext['save'] = "Pohrani";
---
> $admtext['folder'] = "Mapa";   //from languages
> $admtext['confdeletepers'] = "Jeste li sigurni da želite izbrisati ovu osobu? Pojedinac će biti u potpunosti izbrisan s vašeg stabla.";
> $admtext['save'] = "Sa�uvaj";
2045c2175
< $admtext['size'] = "Velicina";
---
> $admtext['size'] = "Veli�ina";
2047,2051c2177,2179
< $admtext['selectfile'] = "Oznaci datototeku";
< $admtext['altdesc'] = "Alternativni opisi";
< $admtext['altnotes'] = "Alternativni zapisi";
< $admtext['savereturn'] = "Vrati se na ovu stranicu";
< $admtext['saveback'] = "Vrati se na menu";
---
> $admtext['selectfile'] = "Odaberite Datoteka";
> $admtext['altdesc'] = "Alternativni opis";
> $admtext['altnotes'] = "Alternativne napomene";
2053,2062c2181,2188
< $admtext['DIV'] = "Razveden";
< $admtext['search'] = "Nadi";  //from findpersonform
< $admtext['searchresults'] = "Nadi rezultate";  //from people
< $admtext['clicktoselect'] = "klikni za oznaciti";
< $admtext['familyid'] = "ID obitelji";  //from families
< $admtext['secondary'] = "Secondary proces";
< $admtext['commas'] = "Odvoji višestruke unose sa zarezime";
< $admtext['onsave'] = "On save";
< $admtext['adminhome'] = "Admin Home";
< $admtext['labelbranches'] = "Oznaci grane";
---
> $admtext['DIV'] = "Rastavljen";
> $admtext['search'] = "Nađi";  //from findpersonform
> $admtext['searchresults'] = "Rezultati pretraživanja";  //from people
> $admtext['clicktoselect'] = "klikni za odabir";
> $admtext['familyid'] = "ID Obitelji";  //from families
> $admtext['onsave'] = "Na Sa�uvanju";
> $admtext['adminhome'] = "Admin Stranice";
> $admtext['labelbranches'] = "Ozna�i grane";
2064,2076c2190,2202
< $admtext['findperson'] = "Nadi osobu...";
< $admtext['findfamily'] = "Nadi obitelj...";
< $admtext['repeatlastq'] = "Ponovi posljednje pretraživanje";
< $admtext['alwayson'] = "Uvijek na raspolaganju za gledanje";
< $admtext['all'] = "All";
< $admtext['lnprefix'] = "Prefiks prezimena";
< $admtext['nameorder'] = "Redosljed imena";
< $admtext['western'] = "Ime prvo";
< $admtext['lockid'] = "Zakljucaj";
< $admtext['linktothese'] = "Poveži sa:";
< $admtext['alsolinkto'] = "Takoder poveži s:";
< $admtext['linkspersfam'] = "Linkovi (Osoba, Obitelj ili ID izvora)";
< $admtext['findsource'] = "Nadi izvor...";
---
> $admtext['findperson'] = "Nađi Osobu...";
> $admtext['findfamily'] = "Nađi Obitelj...";
> $admtext['repeatlastq'] = "Ponovite posljednju pretragu";
> $admtext['alwayson'] = "Uvijek vidljiv";
> $admtext['all'] = "Svi/a";
> $admtext['lnprefix'] = "Prefiks Prezimena";
> $admtext['nameorder'] = "Naredba o imenu";
> $admtext['western'] = "Prvo Ime";
> $admtext['lockid'] = "Zaklju�aj";
> $admtext['linktothese'] = "Poveži na:";
> $admtext['alsolinkto'] = "Također poveži na:";
> $admtext['linkspersfam'] = "Veze (Osoba, Obitelj ili Izvorni ID)";
> $admtext['findsource'] = "Nađi izvor...";
2078,2083c2204,2209
< $admtext['stateprov'] = "Država/Provincija";
< $admtext['zip'] = "Zip/Postal Code";
< $admtext['merge'] = "Merge";
< $admtext['otherinfo'] = "Ostale informacije";
< $admtext['available'] = "Na raspoplaganju";
< $admtext['backuprestore'] = "Utilities";
---
> $admtext['stateprov'] = "Provincija";
> $admtext['zip'] = "Poštanski broj";
> $admtext['merge'] = "Sjediniti";
> $admtext['otherinfo'] = "Ostala informacija";
> $admtext['available'] = "Dostupno";
> $admtext['backuprestore'] = "Usluge";
2086,2092c2212,2218
< $admtext['email'] = "E-mail";
< $admtext['event'] = "Dogadaj";
< $admtext['eventdate'] = "Datum dogadaja";
< $admtext['eventplace'] = "Mjesto dogadaja";
< $admtext['detail'] = "Detaljan";
< $admtext['export'] = "Export";
< $admtext['tlevents'] = "Timeline dogadaja";
---
> $admtext['email'] = "E-pošta";
> $admtext['event'] = "Događaj";
> $admtext['eventdate'] = "Datum događaja";
> $admtext['eventplace'] = "Mjesto događaja";
> $admtext['detail'] = "Detalj";
> $admtext['export'] = "Izvoz";
> $admtext['tlevents'] = "Vremenska događaja";
2094,2095c2220,2221
< $admtext['duplicate'] = "Promjene nisu pohranjene. Još jedan zapis s istim kljucem vec postoji.";
< $admtext['alttitle'] = "Alternativan naslov";
---
> $admtext['duplicate'] = "Promjene nisu spremljene. Još jedan zapis s istim tipkom već postoji.";
> $admtext['alttitle'] = "Alternativni Naslov";
2101,2103c2227,2229
< $admtext['nobranch'] = "Nema grana";
< $admtext['scrollbranch'] = "(Scroll za vidjeti sve izbore)";
< $admtext['matches'] = "Matches";
---
> $admtext['nobranch'] = "Nema grane";
> $admtext['scrollbranch'] = "(Pomicanje se da biste vidjeli sve izbore)";
> $admtext['matches'] = "Me�";
2106c2232
< $admtext['deathabbr'] = "d.";
---
> $admtext['deathabbr'] = "u.";
2108,2110c2234,2236
< $admtext['nochanges'] = "Promjene nisu napravljene.";
< $admtext['changestoallitems'] = "Promijeni sve iteme";  //were made successfully
< $admtext['find2'] = "Nadi";
---
> $admtext['nochanges'] = "Nisu u�injene nikakve promjene.";
> $admtext['changestoallitems'] = "Promjene svih stavki";  //were made successfully
> $admtext['find2'] = "Nađi";
2113c2239
< $admtext['repository'] = "Repository";
---
> $admtext['repository'] = "Spremište";
2115c2241
< $admtext['repositories'] = "Repositories";
---
> $admtext['repositories'] = "Spremišta";
2118,2148c2244,2272
< $admtext['divdatetr'] = "Datum razvoda (True)";
< $admtext['creategendex'] = "Kreiraj GENDEX";
< $admtext['datamaint'] = "Import/Export";
< $admtext['imagefiletoupload'] = "File to upload";
< $admtext['indfamorsrc'] = "individual(s), families, sources, repositories or places.";
< $admtext['improperpermissions'] = "because the folder does not exist (check the Root Path) or does not have proper permissions (try chmod(777)).";
< $admtext['person'] = "Person";
< $admtext['setup'] = "Setup";
< $admtext['manage'] = "Manage";
< $admtext['reset'] = "Reset";
< $admtext['norecords'] = "No records exist.";
< $admtext['secondarymaint'] = "Secondary Processes";
< $admtext['customeventtypes'] = "Custom Event Types";
< $admtext['findmatches'] = "Find Matches";
< $admtext['matchthese'] = "Match the following fields:";
< $admtext['otheroptions'] = "Other Options:";
< $admtext['ignoreblanks'] = "Ignore Blanks";
< $admtext['nextmatch'] = "Next Match";
< $admtext['nextdup'] = "Next Duplicate";
< $admtext['comprefresh'] = "Compare/Refresh";
< $admtext['mswitch'] = "Switch";
< $admtext['nomatches'] = "No Matches";
< $admtext['combineextras'] = "Combine media";  //changed as well
< $admtext['fasterdisplay'] = "Note: This page is formatted differently to allow for faster display.";
< $admtext['publichome'] = "Public Home";
< $admtext['media'] = "Media";
< $admtext['albums'] = "Albums";
< $admtext['import'] = "Import";
< $admtext['item'] = "Item";
< $admtext['combinenotesonly'] = "Combine notes";
< $admtext['addmedia'] = "Add Media";
---
> $admtext['divdatetr'] = "Datum razvoda (Pravi)";
> $admtext['creategendex'] = "Stvori GENDEX";
> $admtext['datamaint'] = "Uvoz/Izvoz";
> $admtext['imagefiletoupload'] = "Datoteka za prijenos";
> $admtext['indfamorsrc'] = "pojedinac, obitelji, izvori, spremište ili mjesta.";
> $admtext['improperpermissions'] = "jer mapa ne postoji (provjerite Korijen Put) ili nema odgovarajuća dopuštenja (pokušajte chmod (777)).";
> $admtext['person'] = "Osoba";
> $admtext['setup'] = "Instalacija";
> $admtext['manage'] = "Upravljat";
> $admtext['reset'] = "Vrati";
> $admtext['norecords'] = "Ne postoje zapisi.";
> $admtext['findmatches'] = "Pronađi Me�";
> $admtext['matchthese'] = "Me� s sljedećim polja:";
> $admtext['otheroptions'] = "Druge opcije:";
> $admtext['ignoreblanks'] = "Zanemari praznine";
> $admtext['nextmatch'] = "Sljedeći me�";
> $admtext['nextdup'] = "Sljedeći Duplikat";
> $admtext['comprefresh'] = "Usporedite/Osvježi";
> $admtext['mswitch'] = "Prebaci";
> $admtext['nomatches'] = "Nema Me�ova";
> $admtext['combineextras'] = "Kombiniraj medije";  //changed as well
> $admtext['fasterdisplay'] = "NAPOMENA: Ova je stranica druga�ije oblikovana kako bi se omogućio brži prikaz.";
> $admtext['publichome'] = "Javne Stranice";
> $admtext['media'] = "Medija";
> $admtext['albums'] = "Albumi";
> $admtext['import'] = "Uvoz";
> $admtext['item'] = "Stavka";
> $admtext['combinenotesonly'] = "Kombiniraj bilješke";
> $admtext['addmedia'] = "Dodaj Medije";
2151,2153c2275,2277
< $admtext['gedimport'] = "GEDCOM Import";
< $admtext['improper2'] = "because the original file is too large or is not a valid image, or because the folder does not exist (check the Root Path) or does not have proper permissions (try chmod(777)).";
< $admtext['confdeleterecs'] = "Are you sure you want to delete the selected records?";
---
> $admtext['gedimport'] = "GEDCOM Uvoz";
> $admtext['improper2'] = "jer je izvorna datoteka prevelika ili nije valjana slika ili zato što mapa ne postoji (provjerite Root Path) ili nema odgovarajuća dopuštenja (pokušajte chmod (777)).";
> $admtext['confdeleterecs'] = "Jeste li sigurni da želite izbrisati odabrane zapise?";
2155,2226c2279,2348
< $admtext['googleplace'] = "Geocode Location";
< $admtext['notfound'] = " not found. Try another search. Check the Map Search Help for possible reasons the search failed, or try your search using the Full Google Map Search link";
< $admtext['showhidemap'] = "Show/hide clickable map";
< $admtext['getcoords'] = "(to determine latitude, longitude and zoom)";
< $admtext['searchstring'] = "Search for a Place";
< $admtext['zoom'] = "Zoom";
< $admtext['selectplacelevel'] = "Select Place Level";
< $admtext['difficultmap'] = "Full Google Map Search";
< $admtext['maphelp'] = "Map Search Help";
< $admtext['gobutton'] = "Search";
< $admtext['findpersonid'] = "Find Person ID";
< $admtext['findfamilyid'] = "Nadi ID obitelji";
< $admtext['findsourceid'] = "Find Source ID";
< $admtext['entersourcepart'] = "Enter part of source title";
< $admtext['findrepoid'] = "Find Repository ID";
< $admtext['enterrepopart'] = "Enter part of repository title";
< $admtext['findplace'] = "Find Place";
< $admtext['enterplacepart'] = "enter part of a place name";
< $admtext['entereventinfo'] = "Molim unesite datum dogadaja, mjesto dogadaja ili detalje ovog dogadaja.";
< $admtext['entereventtype'] = "Molim odaberite tip dogadaja.";
< $admtext['enternote'] = "Molim unesite tekst zabilješke.";
< $admtext['selectsource'] = "Please select a Source.";
< $admtext['confdeletecite'] = "Are you sure you want to delete this citation?";
< $admtext['spouses'] = "Supruge";
< $admtext['entertreeid'] = "Please enter a tree ID.";
< $admtext['entertreename'] = "Please enter a tree name.";
< $admtext['citations'] = "Citations";
< $admtext['eventtypes'] = "Tip dogadaja";
< $admtext['associations'] = "Asociacije";
< $admtext['makefolder'] = "Make Folder";
< $admtext['allcurrentdata'] = "All current data";
< $admtext['matchingonly'] = "Matching records only";
< $admtext['donotreplace'] = "Do not replace any data";
< $admtext['useroffset'] = "Start IDs at:";
< $admtext['phone'] = "Phone";
< $admtext['website'] = "Web Site";
< $admtext['thumb'] = "Thumb";  //as in thumbnail
< $admtext['displayorder'] = "Prikaži redosljed";
< $admtext['go'] = "Idi";
< $admtext['help'] = "Pomoc";
< $admtext['husband'] = "Husband";
< $admtext['wife'] = "Wife";
< $admtext['husbname'] = "Ime supruga";
< $admtext['wifename'] = "Ime suruge";
< $admtext['drag'] = "Drag";
< $admtext['enterinamepart'] = "enter part of first and/or last name";
< $admtext['enterfnamepart'] = "Enter part of father's and/or mother's name";
< $admtext['hide'] = "Hide";
< $admtext['toggle'] = "toggle display";
< $admtext['wsel'] = "With selected:";
< $admtext['msg'] = "Message";
< $admtext['default'] = "Default";
< $admtext['events'] = "Events";
< $admtext['date'] = "Date";
< $admtext['savecont'] = "Save and continue...";
< $admtext['alphanum'] = "Please use only alphanumeric characters in your Tree ID.";
< $admtext['mediatypes'] = "Media Types";
< $admtext['appendall'] = "Append all records";
< $admtext['NPFX'] = "Prefix";
< $admtext['prefix'] = "Prefix";
< $admtext['mostwanted'] = "Most Wanted";
< $admtext['idexists'] = "ne može biti dodano jer ovaj ID vec postoji. Koristi Back button za povratak na prethodnu stranicu i oznaci razlicit ID.";
< $admtext['notdeleted'] = "File could not be deleted. Please check file permissions.";
< $admtext['confdeletefile'] = "Are you sure you want to delete this file?";
< //changed in 8.0.0
< $admtext['datenote'] = "<strong>Note:</strong> kada unosiš datume, modlim koristi standardni genealogical format DD MMM GGGG. Na primjer, 10 Apr 2004.";
< $admtext['oriental'] = "Prezime prvo";
< $admtext['langfolder'] = "Folder where language files<br/>will be stored";
< //moved here in 8.0.0
< $admtext['repoid'] = "Repository ID";
< $admtext['whatsnew'] = "What's New";
< $admtext['linkedto'] = "Linked to";
---
> $admtext['googleplace'] = "Geocode Mjesto";
> $admtext['notfound'] = " nije pronađeno. Pokušajte s drugom pretragom. Pogledajte Pomoć za pretraživanje na karti zbog mogućih razloga da pretraživanje nije uspjelo ili pokušajte s pretraživanjem pomoću veze cijela Google pretraživanja karata";
> $admtext['showhidemap'] = "Prikaži / sakrij kartu koju je moguće kliknuti";
> $admtext['getcoords'] = "(za određivanje zemljopisne širine, dužine i zumiranja)";
> $admtext['searchstring'] = "Potražite mjesto";
> $admtext['zoom'] = "Zum";
> $admtext['selectplacelevel'] = "Odaberite Razinu mjesta";
> $admtext['difficultmap'] = "Cijeli Google Map Pretraživanja";
> $admtext['maphelp'] = "Pomoć";
> $admtext['gobutton'] = "Traži";
> $admtext['findpersonid'] = "Nađi ID Osobe";
> $admtext['findfamilyid'] = "Nađi ID Obitelji";
> $admtext['findsourceid'] = "Nađi ID Izvora";
> $admtext['entersourcepart'] = "Unesi dio naslova izvora";
> $admtext['findrepoid'] = "Nađi Spremišta ID";
> $admtext['enterrepopart'] = "Unesi dio naslova spremišta";
> $admtext['findplace'] = "Nađi Mjesto";
> $admtext['enterplacepart'] = "unesi dio naziva mjesta";
> $admtext['entereventinfo'] = "Unesite datum događaja, mjesto događaja ili detalj za ovaj događaj.";
> $admtext['entereventtype'] = "Odaberite vrstu događaja";
> $admtext['enternote'] = "Unesite tekst bilješke.";
> $admtext['selectsource'] = "Odaberite izvor.";
> $admtext['confdeletecite'] = "Jeste li sigurni da želite izbrisati ovaj citat?";
> $admtext['spouses'] = "Supružnici/Partneri";
> $admtext['entertreeid'] = "Unesite ID stabla.";
> $admtext['entertreename'] = "Unesite naziv stabla.";
> $admtext['citations'] = "Citati";
> $admtext['eventtypes'] = "Vrste događaja";
> $admtext['associations'] = "Udruge";
> $admtext['makefolder'] = "Napravite Mapu";
> $admtext['allcurrentdata'] = "Svi trenutni podaci";
> $admtext['matchingonly'] = "Odgovara samo zapisima";
> $admtext['donotreplace'] = "Ne zamjenjujte nikakve podatke";
> $admtext['useroffset'] = "Po�nite ID-ove na:";
> $admtext['phone'] = "Telefon";
> $admtext['website'] = "Web Mjesto";
> $admtext['thumb'] = "Sli�ice";  //as in thumbnail
> $admtext['displayorder'] = "Redoslijed prikaza";
> $admtext['go'] = "Prikaži";
> $admtext['help'] = "Pomoć";
> $admtext['husband'] = "Otac";
> $admtext['wife'] = "Majka";
> $admtext['husbname'] = "O�evo ime";
> $admtext['wifename'] = "Maj�ino ime";
> $admtext['drag'] = "Vući";
> $admtext['enterinamepart'] = "upiši dio imena i/ili prezimena";
> $admtext['enterfnamepart'] = "Unesite dio imena oca i/ili majke";
> $admtext['hide'] = "Sakriti";
> $admtext['toggle'] = "preklopni prikaz";
> $admtext['wsel'] = "S odabranim:";
> $admtext['msg'] = "Poruka";
> $admtext['default'] = "Zadano";
> $admtext['events'] = "Događaji";
> $admtext['date'] = "Datum";
> $admtext['savecont'] = "Sa�uvaj i nastavi...";
> $admtext['alphanum'] = "U vašem ID-ju stabla koristite samo alfanumeri�ke znakove.";
> $admtext['mediatypes'] = "Vrste medija";
> $admtext['appendall'] = "Dodajte sve zapise";
> $admtext['NPFX'] = "Prefiks";
> $admtext['prefix'] = "Prefiks";
> $admtext['mostwanted'] = "Najtraženiji";
> $admtext['idexists'] = "nije moguće dodati jer taj ID već postoji.";
> $admtext['notdeleted'] = "Nije bilo moguće izbrisati datoteku. Provjerite dopuštenja datoteka.";
> $admtext['confdeletefile'] = "Jeste li sigurni da želite izbrisati ovu datoteku?";
> $admtext['datenote'] = "<strong>BILJEŠKA:</strong> Prilikom unosa datuma molimo koristite standardni genealoški format DD MMM GGGG. Na primjer, 10 Apr 2004.";
> $admtext['oriental'] = "Prezime prvo (bez zareza)";
> $admtext['langfolder'] = "Mapa jezika";
> $admtext['repoid'] = "Spremišta ID";
> $admtext['whatsnew'] = "Å to ima novog";
> $admtext['linkedto'] = "Povezan s";
2228,2234c2350,2355
< //added in 8.0.0
< $admtext['show'] = "Preview";
< $admtext['lnfirst'] = "Surname first (with commas)";
< $admtext['savefirst'] = "Save changes first?";
< $admtext['misc'] = "Miscellaneous";
< $admtext['modmgr'] = "Mod Manager";
< $admtext['cannotopendir'] = "Cannot open folder";
---
> $admtext['show'] = "Pokazati";
> $admtext['lnfirst'] = "Prezime prvo (s zarezima)";
> $admtext['savefirst'] = "Sa�uvaj promijene prvo?";
> $admtext['misc'] = "Razni";
> $admtext['modmgr'] = "Mod Menadžer";
> $admtext['cannotopendir'] = "Ne mogu otvoriti mapu";
2236,2265c2357,2384
< //moved here in 9.0.0
< $admtext['cancel'] = "Cancel";
< $admtext['enterpassoc'] = "Molim unesite ID od asocirane osobe.";
< $admtext['enterrela'] = "Molim unesite relationship.";
< $admtext['confdeleteassoc'] = "Da li ste sigurni da želite obrisati ovu asocijaciju?";
< $admtext['preview'] = "Preview";
< $admtext['livingonly'] = "Samo živuci";
< $admtext['tentdata'] = "Temporary event record";
< $admtext['checking'] = "Checking...Please wait";
< //added in 9.0.0
< $admtext['clickresume'] = "click here to resume";
< $admtext['copylast'] = "Copy Last";
< $admtext['nicbold'] = "Click to Bold";
< $admtext['nicitalic'] = "Click to Italic";
< $admtext['nicunderline'] = "Click to Underline";
< $admtext['niclalign'] = "Left Align";
< $admtext['niccalign'] = "Center Align";
< $admtext['nicralign'] = "Right Align";
< $admtext['nicjalign'] = "Justify Align";
< $admtext['nicinsol'] = "Insert Ordered List";
< $admtext['nicinsul'] = "Insert Unordered List";
< $admtext['nicsub'] = "Click to Subscript";
< $admtext['nicsup'] = "Click to Superscript";
< $admtext['nicstrike'] = "Click to Strike Through";
< $admtext['nicremfmt'] = "Remove Formatting";
< $admtext['nicindent'] = "Indent Text";
< $admtext['nicremind'] = "Remove Indent";
< $admtext['nichr'] = "Horizontal Rule";
< $admtext['nicfontsz'] = "Font&nbsp;Size";
< $admtext['nicfontfam'] = "Font&nbsp;Family";
---
> $admtext['cancel'] = "Odustani";
> $admtext['enterpassoc'] = "Unesite ID pridružene osobe.";
> $admtext['enterrela'] = "Unesite vezu.";
> $admtext['confdeleteassoc'] = "Jeste li sigurni da želite izbrisati ovu vezu?";
> $admtext['preview'] = "Pregled";
> $admtext['livingonly'] = "Samo živi";
> $admtext['tentdata'] = "Privremeni zapis događaja za";
> $admtext['checking'] = "Provjera ... molim pri�ekajte";
> $admtext['clickresume'] = "kliknite ovdje za nastavak";
> $admtext['copylast'] = "Kopiraj zadnje";
> $admtext['nicbold'] = "Kliknite za podebljano";
> $admtext['nicitalic'] = "Kliknite za kurziv";
> $admtext['nicunderline'] = "Kliknite za podcrtavanje";
> $admtext['niclalign'] = "Lijevo poravnajte";
> $admtext['niccalign'] = "Centar poravnajte";
> $admtext['nicralign'] = "Desno poravnajte";
> $admtext['nicjalign'] = "Opravdati poravnajte";
> $admtext['nicinsol'] = "Umetni naru�eni popis";
> $admtext['nicinsul'] = "Umetni popis bez narudžbe";
> $admtext['nicsub'] = "Umetni za indeks";
> $admtext['nicsup'] = "Umetni za eksponent";
> $admtext['nicstrike'] = "Kliknite za Strike Through";
> $admtext['nicremfmt'] = "Ukloni oblikovanje";
> $admtext['nicindent'] = "Tekst uvla�enja";
> $admtext['nicremind'] = "Uklonite uvla�enje";
> $admtext['nichr'] = "Vodoravno pravilo";
> $admtext['nicfontsz'] = "Font&nbsp;Veli�ina";
> $admtext['nicfontfam'] = "Font&nbsp;Obitelj";
2267,2285c2386,2400
< $admtext['niclink'] = "Add Link";
< $admtext['nicremlink'] = "Remove Link";
< $admtext['nictxtcol'] = "Change Text Color";
< $admtext['nicbkgcol'] = "Change Background Color";
< $admtext['nicimage'] = "Add Image";
< $admtext['change'] = "Change";
< $admtext['editwarn'] = "Your lock on this record is about to expire. Save your changes now to prevent them from being overwritten by another user.";
< $admtext['editconflict'] = "Another user is already editing this record. Please try again later.";
< $admtext['retry'] = "Try again";
< $admtext['notsaved'] = "Changes were not saved. Another user has locked the record.";
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
< $admtext['disabled'] = "Disabled";
< $admtext['cremated'] = "Cremated";
< //added in 10.0.0
< $admtext['videos'] = "Videos";
< $admtext['recordings'] = "Recordings";
< $admtext['saveexit'] = "Save and Exit";
---
> $admtext['niclink'] = "Dodaj Vezu";
> $admtext['nicremlink'] = "Ukloni vezu";
> $admtext['nictxtcol'] = "Promjena boje teksta";
> $admtext['nicbkgcol'] = "Promjena boje pozadine";
> $admtext['nicimage'] = "Dodaj Sliku";
> $admtext['change'] = "Promjeni";
> $admtext['editwarn'] = "Zaklju�avanje ovog zapisa uskoro će isteći. Spremite svoje promjene sada da ih drugi korisnik ne bi mogao prebrisati.";
> $admtext['editconflict'] = "Drugi korisnik već uređuje ovaj zapis. Molimo pokušajte ponovo kasnije.";
> $admtext['retry'] = "Pokušajte ponovo";
> $admtext['notsaved'] = "Promjene nisu sa�uvane. Drugi je korisnik zaklju�ao zapis.";
> $admtext['disabled'] = "Onemogućeno";
> $admtext['cremated'] = "Kremiran";
> $admtext['videos'] = "Video";
> $admtext['recordings'] = "Snimanja";
> $admtext['saveexit'] = "Sa�uvaj i Izlazi";
2288c2403
< $admtext['role'] = "Role";
---
> $admtext['role'] = "Uloga";
2290,2292c2405,2407
< $admtext['confdellink'] = "Are you sure you want to delete this link?";
< $admtext['existlinks'] = "Existing Links";
< $admtext['report'] = "Report";
---
> $admtext['confdellink'] = "Jeste li sigurni da želite izbrisati ovu vezu?";
> $admtext['existlinks'] = "Postojeće Linkovi";
> $admtext['report'] = "Izvještaj";
2294,2299c2409,2414
< $admtext['sortby'] = "Sort by";
< $admtext['unlink'] = "Unlink";
< $admtext['privateonly'] = "Private only";
< $admtext['dna_links'] = "DNA Links";
< $admtext['dataval'] = "Data Validation";
< $admtext['norels'] = "Turn off relationship messages";
---
> $admtext['sortby'] = "Poredaj po";
> $admtext['unlink'] = "Poništiti vezu";
> $admtext['privateonly'] = "Samo privatno";
> $admtext['dna_links'] = "DNA veze";
> $admtext['dataval'] = "Provjera valjanosti podataka";
> $admtext['norels'] = "Isklju�ite poruke odnosa";
2301,2302c2416,2417
< $admtext['templates'] = "Templates";
< $admtext['findciteid'] = "Find Citation ID";
---
> $admtext['templates'] = "Predlošci";
> $admtext['findciteid'] = "Pronađi ID citiranja";
2304,2305c2419,2425
< $admtext['citation'] = "Citation";
< $admtext['text_and'] = "AND";
---
> $admtext['citation'] = "Citat";
> $admtext['text_and'] = "I";
> //added in 12.2
> $admtext['surnames'] = "Prezimena";
> $admtext['subhead'] = "Podnaslov";
> $admtext['image'] = "Slika";
> $admtext['author'] = "Autor";
2308c2428,2462
< $admtext['living'] = "Živuci";
---
> $admtext['living'] = "Živući";
> 
> //moved here in 13.0.0
> $admtext['getstart'] = "Pomoć - Po�etak";
> $admtext['showlog'] = "Promjene zapisnik";
> $admtext['nobirthinfo'] = "Nema informacija o rođenju";
> //changed in 13.0
> $admtext['savereturn'] = "Sa�uvaj + Ostani";
> $admtext['saveback'] = "Sa�uvaj + Izlazi";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Sve su stavke uspješno izbrisane.";
> $admtext['private'] = "Privatno";
> $admtext['imgtags'] = "Oznake slika";
> 
> $admtext['removelink'] = "Ukloni vezu";
> $admtext['eloptions'] = "Pregledajte ili Izbrišite";
> $admtext['pleaseenter'] = "Molim unesi ";
> 
> $admtext['nolinks'] = "Još nema veza";
> $admtext['nogeocode'] = "Nije moguće gekodirati";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Odaberite <br/> zadani <br/> fotografiju"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Događaj / Atribut Vrste";
> $admtext['secondary'] = "Nakon-uvoza uslužnog programa";
> $admtext['otherevents'] = "Ostali događaji / Atribut";
> //added in 14.0
> $admtext['newlinks'] = "Veze stvorene";
> $admtext['newcemlinks'] = "Veze za groblje stvorene";
> $admtext['utility'] = "Uslužnog program";
> $admtext['linktype'] = "Vrsta";
> $admtext['move'] = "Makni";
> $admtext['copy'] = "Kopirati";
> $admtext['title2'] = "Naslov"; //for media, sources, etc (not people)
2310,2311c2464,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Croatian-UTF8/alltext.php TNG1403/languages/Croatian-UTF8/alltext.php
4,8c4,8
< $dates['JAN'] = "Jan";
< $dates['JANUARY'] = "Sijecanj";
< $dates['FEB'] = "Feb";
< $dates['FEBRUARY'] = "Veljaca";
< $dates['MAR'] = "Mar";
---
> $dates['JAN'] = "Sije�";
> $dates['JANUARY'] = "Sije�anj";
> $dates['FEB'] = "Velj";
> $dates['FEBRUARY'] = "Velja�a";
> $dates['MAR'] = "Ožuj";
10c10
< $dates['APR'] = "Apr";
---
> $dates['APR'] = "Trav";
12,13c12,13
< $dates['MAY'] = "May";
< $dates['JUN'] = "Jun";
---
> $dates['MAY'] = "Svibanj";
> $dates['JUN'] = "Lip";
15c15
< $dates['JUL'] = "Jul";
---
> $dates['JUL'] = "Srp";
17c17
< $dates['AUG'] = "Aug";
---
> $dates['AUG'] = "Kol";
19c19
< $dates['SEP'] = "Sep";
---
> $dates['SEP'] = "Ruj";
21c21
< $dates['OCT'] = "Oct";
---
> $dates['OCT'] = "List";
23c23
< $dates['NOV'] = "Nov";
---
> $dates['NOV'] = "Stud";
25c25
< $dates['DEC'] = "Dec";
---
> $dates['DEC'] = "Pros";
27,29c27,29
< $dates['ABT'] = "Abt";
< $dates['ABOUT'] = "About";
< $dates['BEF'] = "Pri";
---
> $dates['ABT'] = "Oko";
> $dates['ABOUT'] = "Oko";
> $dates['BEF'] = "Pr";
31,34c31,34
< $dates['AFT'] = "Nak";
< $dates['AFTER'] = "Nakon";
< $dates['BET'] = "Izmadu";
< $dates['BETWEEN'] = "Izmedu";
---
> $dates['AFT'] = "Pos";
> $dates['AFTER'] = "Poslje";
> $dates['BET'] = "Između";
> $dates['BETWEEN'] = "Između";
38c38
< $dates['Y'] = "Da, datum je nepoznat";
---
> $dates['Y'] = "Da, datum nedostaje";
43,44c43,44
< $text['cannotexecutequery'] = "Ne mogu pokrenuti query";
< $text['to'] = "za";
---
> $text['cannotexecutequery'] = "Ne može da se izvrši SQL upit";
> $text['to'] = "do";
46,47c46,47
< $text['text_next'] = "Naredni";
< $text['text_prev'] = "Prethodni";
---
> $text['text_next'] = "Sljedeće";
> $text['text_prev'] = "Prijašnj";
49,59c49,59
< $text['clickhide'] = "Klikni za sakriti";
< $text['forgot1'] = "<strong>Zaboravio si svoje korisnicko ime ili zaporku?</strong><br />Unesi svoju e-mail adresu dolje pa ce vam korisnicko ime biti poslato.";
< $text['forgot2'] = "Unesi svoju e-mail adresu gore i svoje korisnicko ime dolje da bi se vaša zaporka resetirala (privremena zaporka ce vam biti poslata).";
< $text['newpass'] = "Vaša privremena zaporka";
< $text['usersent'] = "Vaše korisnicko ime je poslato na vašu e-mail adresu.";
< $text['pwdsent'] = "Vaša nova privremena zaporka je poslana na vašu e-mail adresu.";
< $text['loginnotsent2'] = "E-mail adresa koju ste unijeli nije nadena. Informacija nije poslata.";
< $text['loginnotsent3'] = "E-mail adresa i korisnicko ime koje ste unijeli ne odgovara niti jednom korisnickom racunu u našoj evidenciji. Informacija nije poslana.";
< $text['logininfo'] = "Vaša login informacija";
< $text['collapseall'] = "Zatvori sve";
< $text['expandall'] = "Ekspandiraj sve";
---
> $text['clickhide'] = "Klikni da sakriješ";
> $text['forgot1'] = "<strong>Zaboravili ste svoje korisni�ko ime ili lozinku? </strong><br /> Unesite svoju e-poštu adresu u nastavku kako bismo vam poslali svoje korisni�ko ime.";
> $text['forgot2'] = "Upišite svoj e-poštu adresu iznad i vaše korisni�ko ime ispod za poništavanje zaporke (privremena lozinka bit će vam poslana).";
> $text['newpass'] = "Vaša nova privremena lozinka";
> $text['usersent'] = "Vaše je korisni�ko ime poslano na vašu e-poštu adresu.";
> $text['pwdsent'] = "Vaša nova privremena lozinka poslana je na vašu e-poštu adresu.";
> $text['loginnotsent2'] = "Adresa e-pošte koju ste naveli ne odgovara nijednom korisni�kom ra�unu koji je trenutno zabilježen. Nisu poslane informacije.";
> $text['loginnotsent3'] = "Adresa e-pošte i korisni�ko ime koje ste naveli ne odgovaraju nijednom korisni�kom ra�unu koji je trenutno zabilježen. Nisu poslane informacije.";
> $text['logininfo'] = "Vaši podaci za prijavu";
> $text['collapseall'] = "Sažmi sve";
> $text['expandall'] = "Proširi sve";
64,67c64,67
< $text['headstones'] = "Nadgrobni spomenici";
< $text['histories'] = "Povijest";
< $text['recordings'] = "Zapisi";
< $text['videos'] = "Video";
---
> $text['headstones'] = "Spomenici";
> $text['histories'] = "Povijesti";
> $text['recordings'] = "Audio snimci";
> $text['videos'] = "Video snimci";
71,73c71,73
< $admtext['level1'] = "Addresa";
< $admtext['level2'] = "Locatija";
< $admtext['level3'] = "Mjesto/Grad";
---
> $admtext['level1'] = "Adresa";
> $admtext['level2'] = "Lokacija";
> $admtext['level3'] = "Grad";
75c75
< $admtext['level5'] = "Republika/Provincija";
---
> $admtext['level5'] = "Provincija";
77c77
< $admtext['level0'] = "Ne Dodijeljeno";
---
> $admtext['level0'] = "Nije dodijeljeno";
80,86c80,86
< $text['female'] = "Žena";
< $text['closewindow'] = "Zatvori ovaj prozor";
< $text['loading'] = "Ucitavam...";
< 
< $text['cancel'] = "Otkažite";
< $text['none'] = "Nema";
< $text['mainton'] = "Modus Za Održavanje je UPALJEN";
---
> $text['female'] = "Ženska";
> $text['closewindow'] = "Zatvori prozor";
> $text['loading'] = "U�itavanje...";
> 
> $text['cancel'] = "Odustani";
> $text['none'] = "Nijedan";
> $text['mainton'] = "Modus za održavanje je uklju�en";
88,89c88
< //moved here in 8.0.0
< $text['living'] = "Živuca";
---
> $text['living'] = "Živi";
91,94c90,93
< $admtext['confunlink'] = "Dali ste sigurni da želite raskinuti vezu ove osobe kao suprugu u ovoj familiji?";
< $admtext['confunlinkc'] = "Dali ste sigurni da želite raskinuti vezu ove osobe kao dijete u ovoj familiji? ";
< $admtext['confremchild'] = "Dali ste sigurni da želite izvaditi ovo dijete iz ove familije?  Osoba nece se izbrisati iz base podataka.";
< $admtext['enterfamilyid'] = "Molim unesite ID obitelji.";
---
> $admtext['confunlink'] = "Jeste li sigurni da želite razdvojiti vezu ove osobe kao supružnika u ovoj obitelji?";
> $admtext['confunlinkc'] = "Jeste li sigurni da želite razdvojiti vezu ove osobe kao dijete u ovoj obitelji?";
> $admtext['confremchild'] = "Jeste li sigurni da želite ukloniti ovo dijete iz ove obitelji? Pojedinac neće biti izbrisan iz baze podataka.";
> $admtext['enterfamilyid'] = "Upišite ID porodice.";
97c96
< $admtext['BIRT'] = "Rodenje";
---
> $admtext['BIRT'] = "Rođenje";
100c99
< $admtext['BURI'] = "Ukop";
---
> $admtext['BURI'] = "Pokop";
102c101
< $admtext['ENDL'] = "Endowment (LDS)";
---
> $admtext['ENDL'] = "Zadužbina (LDS)";
104c103
< $admtext['TITL'] = "Titula";
---
> $admtext['TITL'] = "Naslov";
107,130c106,123
< $admtext['SLGC'] = "Zapecaceno na Roditelje (LDS)";
< $admtext['MARR'] = "Oženjen/Udata";
< $admtext['SLGS'] = "Zapecaceno na Suprugu (LDS)";
< $admtext['hello'] = "Dobar Dan";
< $admtext['activated'] = "Vaš genealoški racun je aktiviran.";
< $admtext['infois'] = "Vaša prijavna informacija je";
< $admtext['subjectline'] = "Vaš genealoški racun je aktiviran.";
< 
< //moved here in 8.1.0
< $admtext['adopted'] = "usvojen";
< $admtext['birth'] = "rodenje";
< $admtext['foster'] = "usvojitelji";
< $admtext['sealing'] = "sealing";
< //added in 11.0.3
< $admtext['putative'] = "pretpostavljeni";
< 
< //added in 9.0.0
< $text['editprofile'] = "Edit Profile";
< 
< //moved here in 9.0.0
< $text['letter'] = "Letter"; //as in page size
< $text['legal'] = "Legal"; //as in page size
< $text['sunday'] = "Nedelja";  //first day of week on calendar
< $text['monday'] = "Ponedjeljak";
---
> $admtext['SLGC'] = "Pe�atiran po Roditelju (LDS)";
> $admtext['MARR'] = "Vjen�ani";
> $admtext['SLGS'] = "Pe�atiran po Supružniku (LDS)";
> $admtext['hello'] = "Pozdrav";
> $admtext['activated'] = "Vaš genealoški korisni�ki ra�un je aktiviran";
> $admtext['infois'] = "Vaše informacije za prijavljivanje su";
> $admtext['subjectline'] = "Vaš genealoški korisni�ki ra�un je aktiviran.";
> $admtext['adopted'] = "Usvojen";
> $admtext['birth'] = "Rođen";
> $admtext['foster'] = "Usvojitelj";
> $admtext['sealing'] = "Pe�aćenje";
> $admtext['putative'] = "Navodni";
> 
> $text['editprofile'] = "Uredi Profil";
> $text['letter'] = "Formati papira za Pismo"; //as in page size
> $text['legal'] = "Formati papira Legalan"; //as in page size
> $text['sunday'] = "Nedjelja";  //first day of week on calendar
> $text['monday'] = "Ponedeljak";
133,135c126,128
< $text['thursday'] = "Cetvrtak";
< $text['friday'] = "Friday";
< $text['saturday'] = "Saturday";
---
> $text['thursday'] = "ÄŒetvrtak";
> $text['friday'] = "Petak";
> $text['saturday'] = "Subota";
137c130
< $text['startswith'] = "pocinje sa";
---
> $text['startswith'] = "poćinje sa";
139d131
< //moved here in 9.0.4
141,144c133,134
< 
< //moved here in 10.0.0
< $text['startingind'] = "Pocetna osoba";
< $text['enteremail'] = "Molim unesite valjanu e-mail adresu.";
---
> $text['startingind'] = "Pokretan osoba";
> $text['enteremail'] = "Unesite valjanu adresu e-pošte";
146c136
< $text['go'] = "Idi";
---
> $text['go'] = "Prikaži";
148,198c138,180
< 
< //added in 10.0.0
< $admtext['CONL'] = "Confirmation";
< $admtext['INIT'] = "Initiatory (LDS)";
< $admtext['step'] = "Stepchild";
< $text['switchm'] = "Switch to mobile site";
< $text['switchs'] = "Switch to standard site";
< 
< //added in 11.0.0
< $text['dna_tests'] = "DNA Tests";
< $admtext['preflang'] = "Preferred language";
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
< $text['query'] = "Query";
< $text['fanchart'] = "Fan Chart";
< 
< //moved here in 12.0.0
< $admtext['menu'] = "Menu";
< $admtext['dna_groups'] = "DNA Groups";
< $admtext['allbranches'] = "All Branches";
< $admtext['active'] = "Active";
< $admtext['select'] = "Select";
< $admtext['selectall'] = "Select All";
< $admtext['clearall'] = "Clear All";
< $admtext['medialinks'] = "Media Links";
< 
< //added here in 12.0.0
< $text['testgroup'] = "Test Group";
< $text['test_number'] = "Test Number/Name";
< $text['test_info_display'] = "Test Information To Display";
< $text['confirmed'] = "Confirmed";
< $text['predicted'] = "Predicted";
< $admtext['ancestral_surnames'] = "Ancestral surnames";
< $admtext['admin_notes'] = "Administrator notes";
< $admtext['mda'] = "Most distant ancestor";
< $admtext['mrca'] = "Most recent common ancestor";
< $admtext['marker_values'] = "Marker values";
< $admtext['ref_seq'] = "Reference sequence";
< $admtext['rsrs'] = "RSRS (Reconstructed Sapiens Reference Sequence)";
< $admtext['rcrs'] = "rCRS (revised Cambridge Reference Sequence)";
< $admtext['hvr_values'] = "HVR Differences";
< $admtext['hvr1_values'] = "HVR1 Differences";
< $admtext['hvr2_values'] = "HVR2 Differences";
< $admtext['coding_reg'] = "Coding region differences";
< $text['keep_name_private'] = "Keep Name Private";
< $text['test_results'] = "Test Results";
< $admtext['dna_tests'] = "DNA Tests";
< $admtext['vendor'] = "Vendor";
< $admtext['markers'] = "Number of STR markers tested";
< $admtext['haplo'] = "Haplogroup";
< $admtext['termsnp'] = "Terminal SNP";
< $admtext['signsnp'] = "Significant SNPs";
---
> $admtext['CONL'] = "Potvrda (LDS)";
> $admtext['INIT'] = "Inicijativa (LDS)";
> $admtext['step'] = "Pastor�e";
> $text['switchm'] = "Prebacite se na mobilno web mjesto";
> $text['switchs'] = "Prebacite se na standardno web mjesto";
> $text['dna_tests'] = "DNA Testovi";
> $admtext['preflang'] = "Preferirani jezik";
> $text['query'] = "Pitanje";
> $text['fanchart'] = "Fan Grafikon";
> 
> $admtext['menu'] = "Izbornik";
> $admtext['dna_groups'] = "DNA Grupe";
> $admtext['allbranches'] = "Sve Grane";
> $admtext['active'] = "Aktivan";
> $admtext['select'] = "Izaberite";
> $admtext['selectall'] = "Izaberi Sve";
> $admtext['clearall'] = "O�isti sve";
> $admtext['medialinks'] = "Medija linkovi";
> 
> $text['testgroup'] = "Test Grupa";
> $text['test_info_display'] = "Informacije o ispitivanju za prikaz";
> $text['confirmed'] = "Potvrđeno";
> $text['predicted'] = "Predviđeno";
> $admtext['ancestral_surnames'] = "Rodna prezimena";
> $admtext['admin_notes'] = "Bilješke administratora";
> $admtext['mda'] = "Najudaljeniji predak";
> $admtext['mrca'] = "Najnoviji uobi�ajeni predak";
> $admtext['marker_values'] = "Vrednosti markera";
> $admtext['ref_seq'] = "Referentni niz";
> $admtext['rsrs'] = "RSRS (Rekonstruirana Sapiens Referentna Sekvenca)";
> $admtext['rcrs'] = "rCRS (revidirana Cambridge Referenca Sekvenca)";
> $admtext['hvr_values'] = "HVR Razlike";
> $admtext['hvr1_values'] = "HVR1 Razlike";
> $admtext['hvr2_values'] = "HVR2 Razlike";
> $admtext['coding_reg'] = "Razlike u podru�ju kodiranja";
> $text['keep_name_private'] = "Zadrži Ime Privatno";
> $text['test_results'] = "Testa Rezultat";
> $admtext['dna_tests'] = "DNA Testovi";
> $admtext['vendor'] = "Prodava�";
> $admtext['markers'] = "Broj od STR Markera";
> $admtext['haplo'] = "Haplogrupa";
> $admtext['termsnp'] = "SNP Terminal";
> $admtext['signsnp'] = "Zna�ajan SNPs";
201c183
< $admtext['mtdna_test'] = "mtDNA (Mitochondrial)";
---
> $admtext['mtdna_test'] = "mtDNA (Mitohondrial)";
202a185,252
> $admtext['xtra_mut'] = "Ekstra mutacije";
> $text['test_number'] = "Broj/Ime";
> $admtext['match_date'] = "Datum podudaranja";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroupa";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroupa";
> $admtext['relationship_section'] = "Povezanost Sekcija";
> $admtext['relationship_range'] = "Povezanost Daljina";
> $admtext['suggested_relationship'] = "Predloženo";
> $admtext['actual_relationship'] = "Stvarni Povezanost";
> $admtext['related_side'] = "Povezane Grane";
> $admtext['shared_dna'] = "Dijeljen DNA";
> $admtext['shared centimorgans'] = "Ukupno dijeljenih cMs";
> $admtext['shared_segments'] = "Dijeljeni Segmenti";
> $admtext['largest_segment'] = "Najveći Segment";
> $admtext['chromosome'] = "Kromosom br.";
> $admtext['segment_start'] = "Po�etak Segmenta";
> $admtext['segment_end'] = "Kraj Segmenta";
> $admtext['centiMorgans'] = "centi-Morgans (genetska udaljenost)";
> $admtext['matchingSNPs'] = "Odgovarajući SNPs";
> $admtext['xmatch'] = "X-Me�";
> $text['keep_test_private'] = "Privatni test";
> $text['shared_dna'] = "Dijeljeni DNA segment";
> $text['for_match'] = "za ovo poklapanje";
> $admtext['keeptest'] = "Test Privatnosti";
> $admtext['keepname'] = "Imena Privatnosti";
> $admtext['allgroups'] = "Sve Grupe";
> $admtext['alltypes'] = "Svi Tipovi";
> $admtext['generation_num'] = "Generacije za rodno prezime";
> 
> $text['birthabbr'] = "r.";
> $text['chrabbr'] = "k.";
> $text['deathabbr'] = "u.";  //from descend
> $text['burialabbr'] = "p.";  //from descend
> $text['marrabbr'] = "v.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Pronađite sve pojedince s događajima na ovoj lokaciji";
> $text['firstpage'] = "Prva stranica";
> $text['lastpage'] = "Zadnja stranica";
> 
> //changed in 13.0.0
> $text['problem'] = "Došlo je do pogreške u TNG softveru. Što u�initi: <p>Ako ste upravo instalirali nadogradnju, možda ste presko�ili dio upute za instalaciju. Vratite se na stranicu za �itanje nadogradnje i pro�itajte upute. Obratite posebnu pozornost na korak strukture baze podataka.</p> <p> Ako ste prvi put instalirali TNG, možda će vam trebati da napravite tablice baza podataka. Vratite se na stranicu readme.html kako biste pronašli taj korak.</p><p>Ako ste vlasnik web mjesta, možete se obratiti službi za podršku tvrtke TNG radi daljnje pomoći u vezi s tim problemom. Kopirajte upit u nastavku i zalijepite ga u svoju poruku.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Nema grane";
> 
> //added in 14.0
> $text['oneyear'] = "godina";
> $text['pwdcodelink'] = "Kliknite ovu poveznicu da vam se pošalje privremena lozinka";
> $text['pwdcodesent'] = "Veza za ponovno postavljanje lozinke poslana je na vašu e-poštu adresu.";
> $text['moved'] = "Pomaknuto";
> $text['citation'] = "Citat";
> $text['other'] = "Ostalo";
> $text['death'] = "Smrt";
> $text['burial'] = "Pokop";
> $text['cremation'] = "Kremiranje";
> $text['marriage'] = "Brak";
> $text['divorce'] = "Razvod";
> $text['bylength'] = "Razvoj";
> $text['bymarriages'] = "Brakovi";
> $text['none'] = "Nijedan";
> 
> //moved here in 14.0
> $text['family'] = "Obitelj";
> $text['source'] = "Izvor";
> $text['repository'] = "Sigurno Spremište";
> $text['place'] = "Mjesto";
> $admtext['BAPM'] = "Krštenje";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Extra mutations";
---
> $text['glang'] = "hr";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Croatian-UTF8: data_protection_policy.php
diff -r TNG/languages/Croatian-UTF8/text.php TNG1403/languages/Croatian-UTF8/text.php
5c5
< 		$text['browseallsources'] = "Pretraži sve izvore";
---
> 		$text['browseallsources'] = "Pregledajte sve izvore";
9c9
< 		$text['publisher'] = "Izdavac";
---
> 		$text['publisher'] = "Izdava�";
11,14c11,14
< 		$text['sourceid'] = "Source ID";
< 		$text['moresrc'] = "Još izvora";
< 		$text['repoid'] = "Repository ID";
< 		$text['browseallrepos'] = "Pretraži sve Repositories";
---
> 		$text['sourceid'] = "Izvor ID";
> 		$text['moresrc'] = "Drugi izvori";
> 		$text['repoid'] = "ID spremišta";
> 		$text['browseallrepos'] = "Pregledajte sve spremišta";
20,23c20,23
< 		$text['changelanguage'] = "Promijeni jezik";
< 		$text['languagesaved'] = "Jezik pohranjen";
< 		$text['sitemaint'] = "Site maintenance in progress";
< 		$text['standby'] = "The site is temporarily unavailable while we update our database. Please try again in a few minutes. If the site remains down for an extended period of time, please <a href=\"suggest.php\">contact the site owner</a>.";
---
> 		$text['changelanguage'] = "Promjeni jezika";
> 		$text['languagesaved'] = "Jezik sa�uvan";
> 		$text['sitemaint'] = "U tijeku je održavanje web mjesta";
> 		$text['standby'] = "Stranica je privremeno nedostupna dok ažuriramo našu bazu podataka. Molim pokušajte ponovo za par minuta. Ako web lokacija ostaje duže vreme, <a href=\"suggest.php\">kontaktirajte vlasnika s web mjesta</a>.";
28,29c28,29
< 		$text['gedstart'] = "GEDCOM pocinje od";
< 		$text['producegedfrom'] = "Proizvedi GEDCOM datoteku od";
---
> 		$text['gedstart'] = "GEDCOM po�inje od";
> 		$text['producegedfrom'] = "Izradite GEDCOM datoteku iz";
31,41c31,41
< 		$text['includelds'] = "Ukljuci LDS informaciju";
< 		$text['buildged'] = "Build GEDCOM";
< 		$text['gedstartfrom'] = "GEDCOM pocetna forma";
< 		$text['nomaxgen'] = "Morate naznaciti maksimalni broj generacija. Molim koristite tipku Natrag za povratak na prethodnu stranicu i ispravite pogrešku";
< 		$text['gedcreatedfrom'] = "GEDCOM kreirana forma";
< 		$text['gedcreatedfor'] = "kreirano za";
< 		$text['creategedfor'] = "Kreiraj GEDCOM";
< 		$text['email'] = "E-mail adresa";
< 		$text['suggestchange'] = "Predloži promjenu";
< 		$text['yourname'] = "Vaše ime";
< 		$text['comments'] = "Komentar";
---
> 		$text['includelds'] = "Uklju�ite podatke o LDS-u";
> 		$text['buildged'] = "Napravi GEDCOM";
> 		$text['gedstartfrom'] = "GEDCOM po�ima od";
> 		$text['nomaxgen'] = "Morate da odredite maksimalni broj generacija. Upotrijebite gumb Natrag za povratak na prethodnu stranicu i ispravljanje pogreške";
> 		$text['gedcreatedfrom'] = "GEDCOM napravljen od";
> 		$text['gedcreatedfor'] = "napravljen za";
> 		$text['creategedfor'] = "Stvori GEDCOM";
> 		$text['email'] = "Vaša e-pošte adresa";
> 		$text['suggestchange'] = "Predložite promjenu";
> 		$text['yourname'] = "Vaše ime i prezime";
> 		$text['comments'] = "Opis <br /> predloženih promjena";
43c43
< 		$text['submitsugg'] = "Pošalji prijedlog";
---
> 		$text['submitsugg'] = "Pošaljite prijedlog";
45,50c45,50
< 		$text['mailsent'] = "Hvala. Vaša je poruka isporucena.";
< 		$text['mailnotsent'] = "Žao nam je, ali vaša poruka ne može biti isporucena. Molim kontaktirajte me direktno na mbralic@gmail.com.";
< 		$text['mailme'] = "Pošalji kopiju od ove adrese";
< 		$text['entername'] = "Molim unesite vaše ime";
< 		$text['entercomments'] = "Molim unesite vaš komentar";
< 		$text['sendmsg'] = "Pošalji poruku";
---
> 		$text['mailsent'] = "Hvala vam. Vaša poruka je poslana.";
> 		$text['mailnotsent'] = "Žao nam je, ali vašu poruku nismo mogli dostaviti. Molimo kontaktirajte xxx izravno na yyy.";
> 		$text['mailme'] = "Pošalji kopiju na ovu adresu";
> 		$text['entername'] = "Molin unesite svoje ime";
> 		$text['entercomments'] = "Unesite svoje komentare";
> 		$text['sendmsg'] = "Pošalji Poruku";
52c52
< 		$text['subject'] = "Subject";
---
> 		$text['subject'] = "Predmet";
57,60c57,60
< 		$text['photoshistoriesfor'] = "Fotografije i povijest ";
< 		$text['indinfofor'] = "Osobna informacija za";
< 		$text['pp'] = "pp."; //page abbreviation
< 		$text['age'] = "starost";
---
> 		$text['photoshistoriesfor'] = "Fotografije i historija za";
> 		$text['indinfofor'] = "Informacije osobe za";
> 		$text['pp'] = "str."; //page abbreviation
> 		$text['age'] = "Starost:";
65,70c65,69
< 		$text['thanks'] = "Hvala";
< 		$text['received'] = "Vaša sugestija je prosljedena administratoru web site-a na uvid.";
< 		$text['indreport'] = "Individual Report";
< 		$text['indreportfor'] = "Individual Report for";
< 		$text['general'] = "General";
< 		$text['bkmkvis'] = "<strong>Note:</strong> These bookmarks are only visible on this computer and in this browser.";
---
> 		$text['thanks'] = "Hvala vam";
> 		$text['received'] = "Vaša sugestija je prosleđena administratoru na pregled.";
> 		$text['indreport'] = "Izvješće o osobi";
> 		$text['indreportfor'] = "Osobe izvješće za";
> 		$text['bkmkvis'] = "<strong>NAPOMENA:</strong> Te su oznake vidljive samo na ovom ra�unalu i u ovom pregledniku.";
72,73c71,72
< 		$text['reviewmsg'] = "You have a suggested change that needs your review. This submission concerns:";
<         $text['revsubject'] = "Suggested change needs your review";
---
> 		$text['reviewmsg'] = "Imate preporu�enu promjenu koja vam treba recenziju. Ovaj se podnesak odnosi na:";
>         $text['revsubject'] = "Predložena promjena treba vaš pregled";
78,79c77,79
< 		$text['relcalc'] = "Kalkulator rodbinskih veza";
< 		$text['findrel'] = "Nadi rodbinsku vezu";
---
> 	case "connections":
> 		$text['relcalc'] = "Kalkulator odnosa";
> 		$text['findrel'] = "Pronađite vezu";
82,94c82,94
< 		$text['calculate'] = "Izracunaj";
< 		$text['select2inds'] = "Molim izaberite dvije osobe.";
< 		$text['findpersonid'] = "Nadi ID osobe";
< 		$text['enternamepart'] = "unesi dio imena i/ili prezimena";
< 		$text['pleasenamepart'] = "Molim unesite dio imena ili prezimena.";
< 		$text['clicktoselect'] = "klikni za izbor";
< 		$text['nobirthinfo'] = "Fali informacija o rodenju";
< 		$text['relateto'] = "Rodbinska veza";
< 		$text['sameperson'] = "Dvije osobe su jedna te ista osoba.";
< 		$text['notrelated'] = "Dvije osobe nisu u vezi sa xxx generacija."; //xxx will be replaced with number of generations
< 		$text['findrelinstr'] = "Za prikazati obiteljsku vezu izmedu dvije osobe, koristi 'Find' tipku dolje da bi locirali osobe (ili nastavi prikazivati osobe), zatim klikni na 'Kalkuliraj'.";
< 		$text['sometimes'] = "(Ponekad provjera medu razlicitim brojevima generacija daje razlicite rezultate.)";
< 		$text['findanother'] = "Nadi drugu rodbinsku vezu";
---
> 		$text['calculate'] = "Izra�unaj";
> 		$text['select2inds'] = "Odaberite dvije osobe.";
> 		$text['findpersonid'] = "Pronađi osobe ID";
> 		$text['enternamepart'] = "Upišite dio imena i / ili prezimena";
> 		$text['pleasenamepart'] = "Upišite dio imena ili prezimena.";
> 		$text['clicktoselect'] = "kliknite za odabir";
> 		$text['nobirthinfo'] = "Nema informacija rođenja";
> 		$text['relateto'] = "Odnos prema";
> 		$text['sameperson'] = "Dvije osobe su ista osoba.";
> 		$text['notrelated'] = "Dvije jedinke nisu u srodstvu unutar xxx generacija."; //xxx will be replaced with number of generations
> 		$text['findrelinstr'] = "Za prikaz odnosa između dvije osobe, pomoću gumba 'Traži' dolje pronađite pojedince (ili zadržite ljude prikazanim), a zatim kliknite 'Izra�unaj'.";
> 		$text['sometimes'] = "(Ponekad provjera razli�itog broja generacija daje druga�iji rezultat.)";
> 		$text['findanother'] = "Pronađite drugu vezu";
97,107c97,107
< 		$text['sibling'] = "potomak od";
< 		$text['uncle'] = "xxx je ujak od";
< 		$text['aunt'] = "xxx je tetka od";
< 		$text['uncleaunt'] = "xxx je ujak/tetka od";
< 		$text['nephew'] = "xxx je necak od";
< 		$text['niece'] = "xxx je necakinja od";
< 		$text['nephnc'] = "xxx je necak/necakinja od";
< 		$text['removed'] = "times obrisan";
< 		$text['rhusband'] = "suprug od ";
< 		$text['rwife'] = "supruga od ";
< 		$text['rspouse'] = "supruga od ";
---
> 		$text['sibling'] = "brat i sestra od";
> 		$text['uncle'] = "xxx stric od";
> 		$text['aunt'] = "xxx tetka od";
> 		$text['uncleaunt'] = "xxx stric/tetka od";
> 		$text['nephew'] = "xxx nećak od";
> 		$text['niece'] = "xxx nećakinja od";
> 		$text['nephnc'] = "xxx nećak/nećakinja od";
> 		$text['removed'] = "puta uklonjen";
> 		$text['rhusband'] = "muž od";
> 		$text['rwife'] = "suproga od";
> 		$text['rspouse'] = "supružnika od";
109,110c109,110
< 		$text['daughter'] = "kcerka od";
< 		$text['rchild'] = "dijete od";
---
> 		$text['daughter'] = "kći od";
> 		$text['rchild'] = "djete od";
112,113c112,113
< 		$text['dil'] = "nevjesta od";
< 		$text['sdil'] = "zet ili nevjesta od";
---
> 		$text['dil'] = "snaha od";
> 		$text['sdil'] = "zet ili snaha od";
117,118c117,118
< 		$text['great'] = "veci";
< 		$text['spouses'] = "su supruge";
---
> 		$text['great'] = "veliki";
> 		$text['spouses'] = "su supružnici";
120,124c120,124
< 		$text['changeto'] = "Promijeni u (unesi ID):";
< 		$text['notvalid'] = "nije valjan broj osobnog ID-a ili ne postoji u ovoj bazi podataka. Molim pokušajte ponovo.";
< 		$text['halfbrother'] = "the half brother of";
< 		$text['halfsister'] = "the half sister of";
< 		$text['halfsibling'] = "the half sibling of";
---
> 		$text['changeto'] = "Promijenite na (unesite ID):";
> 		$text['notvalid'] = "nije važeći ID broj osobe ili ne postoji u ovoj bazi podataka. Molim pokušaj ponovno.";
> 		$text['halfbrother'] = "polubrat od";
> 		$text['halfsister'] = "polusestra od";
> 		$text['halfsibling'] = "polubrat/sestra od";
126,132c126,132
< 		$text['gencheck'] = "Max generacija<br />za provjeru";
< 		$text['mcousin'] = "xxx je bratic yyy od";  //male cousin; xxx = cousin number, yyy = times removed
< 		$text['fcousin'] = "xxx je sestricna yyy od";  //female cousin
< 		$text['cousin'] = "xxx je rodak yyy od";
< 		$text['mhalfcousin'] = "xxx pola bratic yyy od";  //male cousin
< 		$text['fhalfcousin'] = "xxx pola sestricna yyy od";  //female cousin
< 		$text['halfcousin'] = "xxx pola rodak yyy od";
---
> 		$text['gencheck'] = "Maksimalni broj generacija za provjeru";
> 		$text['mcousin'] = "xxx rođak od yyy";  //male cousin; xxx = cousin number, yyy = times removed
> 		$text['fcousin'] = "xxx rođakinja od yyy";  //female cousin
> 		$text['cousin'] = "xxx rođak od yyy";
> 		$text['mhalfcousin'] = "xxx pol rođak od yyy";  //male cousin
> 		$text['fhalfcousin'] = "xxx pol rođakinja od yyy";  //female cousin
> 		$text['halfcousin'] = "xxx pol rođak od yyy";
134c134
< 		$text['oneremoved'] = "jedna generacija odmaknut";
---
> 		$text['oneremoved'] = "jednom uklonjen";
141,144c141,144
< 		$text['maxrels'] = "Maximalni broj veza pokazati";
< 		$text['dospouses'] = "Pokaži veze koje se ticu supruge";
< 		$text['rels'] = "Veze";
< 		$text['dospouses2'] = "Pokaži Supruge";
---
> 		$text['maxrels'] = "Maksimalni odnosi koji se pokazuju";
> 		$text['dospouses'] = "Pokažite odnose koji uklju�uju supružnika";
> 		$text['rels'] = "Odnosi";
> 		$text['dospouses2'] = "Prikaži supružnike";
148,153c148,153
< 		$text['stepson'] = "posinak od";
< 		$text['stepdau'] = "pocerka od";
< 		$text['stepchild'] = "pastorce od";
< 		$text['stepgson'] = "the xxx step-grandson of";
< 		$text['stepgdau'] = "the xxx step-granddaughter of";
< 		$text['stepgchild'] = "the xxx step-grandchild of";
---
> 		$text['stepson'] = "pastor od";
> 		$text['stepdau'] = "pastorka od";
> 		$text['stepchild'] = "pastor�e od";
> 		$text['stepgson'] = "xxx o�uh od";
> 		$text['stepgdau'] = "xxx o�uha od";
> 		$text['stepgchild'] = "xxx o�uh/o�uha od";
155c155
< 		$text['ggreat'] = "veci";
---
> 		$text['ggreat'] = "veliki";
157,171c157,240
< 		$text['ggfath'] = "the xxx great grandfather of";
< 		$text['ggmoth'] = "the xxx great grandmother of";
< 		$text['ggpar'] = "the xxx great grandparent of";
< 		$text['ggson'] = "the xxx great grandson of";
< 		$text['ggdau'] = "the xxx great granddaughter of";
< 		$text['ggsondau'] = "the xxx great grandchild of";
< 		$text['gstepgson'] = "the xxx great step-grandson of";
< 		$text['gstepgdau'] = "the xxx great step-granddaughter of";
< 		$text['gstepgchild'] = "the xxx great step-grandchild of";
< 		$text['guncle'] = "the xxx great uncle of";
< 		$text['gaunt'] = "the xxx great aunt of";
< 		$text['guncleaunt'] = "the xxx great uncle/aunt of";
< 		$text['gnephew'] = "the xxx great nephew of";
< 		$text['gniece'] = "the xxx great niece of";
< 		$text['gnephnc'] = "the xxx great nephew/niece of";
---
> 		$text['ggfath'] = "xxx pradjed od";
> 		$text['ggmoth'] = "xxx prababa od";
> 		$text['ggpar'] = "xxx pradjed/prababa od";
> 		$text['ggson'] = "xxx pra unuk od";
> 		$text['ggdau'] = "xxx pra unuka od";
> 		$text['ggsondau'] = "xxx pra unuk/unuka od";
> 		$text['gstepgson'] = "xxx pra o�uh od";
> 		$text['gstepgdau'] = "xxx pra o�uha od";
> 		$text['gstepgchild'] = "xxx pra o�uh/o�uha od";
> 		$text['guncle'] = "xxx pra ujak od";
> 		$text['gaunt'] = "xxx pra tetka od";
> 		$text['guncleaunt'] = "xxx pra ujak/tetka od";
> 		$text['gnephew'] = "xxx pra nećak od";
> 		$text['gniece'] = "xxx pra nećakinja od";
> 		$text['gnephnc'] = "xxx pra nećak/nećakinja od";
> 		//added in 14.0
> 		$text['pathscalc'] = "Potražite veze";
> 		$text['findrel2'] = "Pronađite odnose i druge veze";
> 		$text['makeme2nd'] = "Koristi moj ID";
> 		$text['usebookmarks'] = "Koristi oznake";
> 		$text['select2inds'] = "Odaberite dvije osobe.";
> 		$text['indinfofor'] = "Individualne informacije za";
> 		$text['nobookmarks'] = "Nema oznake za korištenje";
> 		$text['bkmtitle'] = "Osobe pronađene u oznakama";
> 		$text['bkminfo'] = "Odaberite osobu:";
> 		$text['sortpathsby'] = "Razvrstaj put po broju";
> 		$text['sortbyshort'] = "Poredaj po";
> 		$text['bylengthshort'] = "Duljina";
> 		$text['badID1'] = ": loše osobe1 ID - vratite se i ispravite";
> 		$text['badID2'] = ": loše osobe2 ID - vratite se i ispravite";
> 		$text['notintree'] = ": osoba s ovim ID-om nije u trenutnoj bazi podataka stabla.";
> 		$text['sameperson'] = "Dvije osobe su ista osoba.";;
> 		$text['nopaths'] = "Ove osobe nisu povezane.";
> 		$text['nopaths1'] = "Nema više veza kraćih od xxx";
> 		$text['nopaths2'] = "u xxx pretraživanja korak";
> 		$text['longestpath'] = "(najduži do sada provjereni put bio je xxx koraka dugo)";
> 		$text['relevantpaths'] = "Broj pronađenih razli�itih relevantnih putova: xxx";
> 		$text['skipMarr'] = "(osim toga, broj putova koji su pronađeni ali nisu prikazani zbog previše brakova bio je: xxx)";
> 		$text['mjaor'] = "ili";
> 		$text['connectionsto'] = "Veze s ";
> 		$text['findanotherpers'] = "Nađi drugu osobu...";
> 		$text['sometimes'] = "(Ponekad provjera razli�itog broja generacija daje druga�iji rezultat.)";
> 		$text['anotherpath'] = "Potražite druge veze";
> 		$text['xpath'] = "Put ";
> 		$text['primary'] = "Po�etna Osoba"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Krajnja Osoba";
> 		$text['parent'] = "Roditelj";
> 		$text['mhfather'] = "njegov otac";
> 		$text['mhmother'] = "njegova majka";
> 		$text['mhhusband'] = "njegov suprug";
> 		$text['mhwife'] = "njegova supruga";
> 		$text['mhson'] = "njegov sin";
> 		$text['mhdaughter'] = "njegova kćer";
> 		$text['fhfather'] = "njezin otac";
> 		$text['fhmother'] = "njezina majka";
> 		$text['fhhusband'] = "njezin suprug";
> 		$text['fhwife'] = "njezina supruga";
> 		$text['fhson'] = "njezin sin";
> 		$text['fhdaughter'] = "njezina kći";
> 		$text['hfather'] = "otac";
> 		$text['hmother'] = "majka";
> 		$text['hhusband'] = "suprug";
> 		$text['hwife'] = "supruga";
> 		$text['hson'] = "sin";
> 		$text['hdaughter'] = "kći";
> 		$text['maxruns'] = "Maksimalni broj puta koje treba provjeriti";
> 		$text['maxrshort'] = "Maksimalni putova";
> 		$text['maxlength'] = "Putovi veze ne dulji od";
> 		$text['maxlshort'] = "Maksimalna dužina";
> 		$text['xstep'] = "korak";
> 		$text['xsteps'] = "korakova";
> 		$text['xmarriages'] = "xxx brakova";
> 		$text['xmarriage'] = "1 brak";
> 		$text['showspouses'] = "Pokažite oba supružnika";
> 		$text['showTxt'] = "Prikaži tekstualni opis puta";
> 		$text['showTxtshort'] = "Tekstualni opis.";
> 		$text['compactBox'] = "Prikaži zbijene okvire osoba";
> 		$text['compactBoxshort'] = "Kompaktne kutije";
> 		$text['paths'] = "Put";
> 		$text['dospouses2'] = "Prikaži supružnike";
> 		$text['maxmopt'] = "Maksimalan broj brakova po vezi"; 
> 		$text['maxm'] = "Maksimalni brakovi"; 
> 		$text['arerelated'] = "Ove osobe su rođaci - njihov odnos prikazan je u Putu 1";
> 		$text['simplerel'] = "Jednostavna pretraga odnosa"; 
175,176c244,245
< 		$text['familygroupfor'] = "Obiteljska grupna lista za";
< 		$text['ldsords'] = "LDS Propisi";
---
> 		$text['familygroupfor'] = "Obiteljski list za";
> 		$text['ldsords'] = "Pravilnici o LDS";
178,183c247,252
< 		$text['endowedlds'] = "Endowed (LDS)";
< 		$text['sealedplds'] = "Sealed P (LDS)";
< 		$text['sealedslds'] = "Sealed S (LDS)";
< 		$text['otherspouse'] = "Ostale supruge/supruzi";
< 		$text['husband'] = "Suprug";
< 		$text['wife'] = "Supruga";
---
> 		$text['endowedlds'] = "Obdaren (LDS)";
> 		$text['sealedplds'] = "Zape�aćeno za roditeljima (LDS)";
> 		$text['sealedslds'] = "Zape�aćen za supružnika (LDS)";
> 		$text['otherspouse'] = "Drugi supružnik";
> 		$text['husband'] = "Otac";
> 		$text['wife'] = "Majka";
188,196c257,264
< 		$text['capbirthabbr'] = "B";
< 		$text['capaltbirthabbr'] = "A";
< 		$text['capdeathabbr'] = "D";
< 		$text['capburialabbr'] = "B";
< 		$text['capplaceabbr'] = "P";
< 		$text['capmarrabbr'] = "M";
< 		$text['capspouseabbr'] = "SP";
< 		$text['redraw'] = "Iscrtati sa";
< 		$text['scrollnote'] = "Bilješke: Možete skrolovati dolje ili desno za vidjeti tablu.";
---
> 		$text['capbirthabbr'] = "R.";
> 		$text['capaltbirthabbr'] = "R.";
> 		$text['capdeathabbr'] = "U.";
> 		$text['capburialabbr'] = "P.";
> 		$text['capplaceabbr'] = "M.";
> 		$text['capmarrabbr'] = "V.";
> 		$text['capspouseabbr'] = "P.";
> 		$text['redraw'] = "Ponovo crtaj sa";
198,200c266,267
< 		$text['popupnote1'] = " = Dodatna informacija";
< 		$text['popupnote2'] = " = Novo porijeklo";
< 		$text['pedcompact'] = "Kompakt";
---
> 		$text['popupnote1'] = "= Dodatne informacije";
> 		$text['pedcompact'] = "Kompaktni";
203,205c270,272
< 		$text['descendfor'] = "Nasljednici za";
< 		$text['maxof'] = "Maksimum od";
< 		$text['gensatonce'] = "generacija prikazanih odjednom.";
---
> 		$text['descendfor'] = "Potomci za";
> 		$text['maxof'] = "Maksimalno od";
> 		$text['gensatonce'] = "generacije prikazane u jednom trenutku.";
207,209c274,276
< 		$text['daughterof'] = "kci od";
< 		$text['childof'] = "dijete od";
< 		$text['stdformat'] = "Standardni Format";
---
> 		$text['daughterof'] = "kći od";
> 		$text['childof'] = "djete od";
> 		$text['stdformat'] = "Standardni format";
211c278
< 		$text['addnewfam'] = "Dodaj novu obitelj";
---
> 		$text['addnewfam'] = "Dodajte novu obitelj";
213c280
< 		$text['side'] = "Strana";
---
> 		$text['side'] = "Krilo";
215,241c282,308
< 		$text['paternal'] = "Ocev";
< 		$text['maternal'] = "Materinji";
< 		$text['gen1'] = "Vlastiti";
< 		$text['gen2'] = "Roditelji";
< 		$text['gen3'] = "Djedovi";
< 		$text['gen4'] = "Pradjedovi";
< 		$text['gen5'] = "Pra Pra djedovi";
< 		$text['gen6'] = "3. Pra djedovi";
< 		$text['gen7'] = "4. Pra djedovi";
< 		$text['gen8'] = "5. Pra djedovi";
< 		$text['gen9'] = "6. Pra djedovi";
< 		$text['gen10'] = "7. Pra djedovi";
< 		$text['gen11'] = "8. Pra djedovi";
< 		$text['gen12'] = "9. Pra djedovi";
< 		$text['graphdesc'] = "Tabla potomaka do ovog trenutka";
< 		$text['pedbox'] = "Box";
< 		$text['regformat'] = "Register";
< 		$text['extrasexpl'] = "= Najmanje jedna fotografija, povijest ili neki drugi media item postoji o ovoj osobi.";
< 		$text['popupnote3'] = " = Novi dijagram";
< 		$text['mediaavail'] = "Medija na raspolaganju";
< 		$text['pedigreefor'] = "Porijeklo za";
< 		$text['pedigreech'] = "Pedigre Dijagram";
< 		$text['datesloc'] = "Datumi i Mjesta";
< 		$text['borchr'] = "Rodenje/Alt - Smrt/Pogreb (dva)";
< 		$text['nobd'] = "Nema Datume Rodenja ili Smrti";
< 		$text['bcdb'] = " Rodenje/Alt/Smrt/Pogreb (cetri)";
< 		$text['numsys'] = "Sistem Numeriranje";
---
> 		$text['paternal'] = "O�ev";
> 		$text['maternal'] = "Maj�in";
> 		$text['gen1'] = "Sam";
> 		$text['gen2'] = "Roditelj";
> 		$text['gen3'] = "Djed i baka";
> 		$text['gen4'] = "Pradjed i baka";
> 		$text['gen5'] = "Å ukun djed i baka";
> 		$text['gen6'] = "3x Pra djed i baka";
> 		$text['gen7'] = "4x Pra djed i baka";
> 		$text['gen8'] = "5x Pra djed i baka";
> 		$text['gen9'] = "6x Pra djed i baka";
> 		$text['gen10'] = "7x Pra djed i baka";
> 		$text['gen11'] = "8x Pra djed i baka";
> 		$text['gen12'] = "9x Pra djed i baka";
> 		$text['graphdesc'] = "Tabela silaznosti do ove to�ke";
> 		$text['pedbox'] = "Kutija";
> 		$text['regformat'] = "Registar";
> 		$text['extrasexpl'] = "= Za ovu osobu postoji barem jedna fotografija, povijest ili drugi medijski predmet.";
> 		$text['popupnote3'] = " = Novi grafikon";
> 		$text['mediaavail'] = "Dostupni su mediji";
> 		$text['pedigreefor'] = "Pedigre karta za";
> 		$text['pedigreech'] = "Pedigre karta";
> 		$text['datesloc'] = "Datumi i Lokacije";
> 		$text['borchr'] = "Rođenje/Rođ - Umro/Pokop";
> 		$text['nobd'] = "Nema datuma Rođenja ili Pokop";
> 		$text['bcdb'] = "Svi podaci o Rođenju/Alt/Umro/Pokop";
> 		$text['numsys'] = "Sustav Numeriranja";
246c313
< 		$text['dispopts'] = "Opcije Prikaza";
---
> 		$text['dispopts'] = "Postavke zaslona";
248,251c315,318
< 		$text['no_ancestors'] = "No ancestors found";
< 		$text['ancestor_chart'] = "Vertical ancestor chart";
< 		$text['opennewwindow'] = "Open in a new window";
< 		$text['pedvertical'] = "Vertical";
---
> 		$text['no_ancestors'] = "Nema pronađenih predaka";
> 		$text['ancestor_chart'] = "Vertikalni grafikon predaka";
> 		$text['opennewwindow'] = "Otvori u novom prozoru";
> 		$text['pedvertical'] = "Vertikalno";
253,261c320,328
< 		$text['familywith'] = "Family with";
< 		$text['fcmlogin'] = "Please log in to see details";
< 		$text['isthe'] = "is the";
< 		$text['otherspouses'] = "other spouses";
< 		$text['parentfamily'] = "The parent family ";
< 		$text['showfamily'] = "Show family";
< 		$text['shown'] = "shown";
< 		$text['showparentfamily'] = "show parent family";
< 		$text['showperson'] = "show person";
---
> 		$text['familywith'] = "Porodica sa";
> 		$text['fcmlogin'] = "Prijavite se da biste videli detalje";
> 		$text['isthe'] = "je";
> 		$text['otherspouses'] = "drugi supružnici";
> 		$text['parentfamily'] = "Roditeljska porodica ";
> 		$text['showfamily'] = "Prikaz porodice";
> 		$text['shown'] = "pokazano";
> 		$text['showparentfamily'] = "prikaz roditeljske porodice";
> 		$text['showperson'] = "prikazi osobe";
263c330,349
< 		$text['otherfamilies'] = "Other families";
---
> 		$text['otherfamilies'] = "Druge porodice";
> 		//added in 14.0
> 		$text['dtformat'] = "Tablice";
> 		$text['dtchildren'] = "Djeca";
> 		$text['dtgrandchildren'] = "Unuci";
> 		$text['dtggrandchildren'] = "Pra pra unuci";
> 		$text['dtgggrandchildren'] = "Pra praunuci"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "1"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nema potomaka";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Ukupno";
> 		$text['dtselect'] = "Odaberi";
> 		$text['dteachfulltable'] = "Svaka puna tablica imat će";
> 		$text['dtrows'] = "redaka";
> 		$text['dtdisplayingtable'] = "Prikaz tablice";
> 		$text['dtgototable'] = "Idi do tablice:";
> 		$text['fcinstrdn'] = "Pokažite obitelj sa supružnikom";
> 		$text['fcinstrup'] = "Pokažite obitelj s roditeljima";
> 		$text['fcinstrplus'] = "Odaberite druge supružnike";
> 		$text['fcinstrfam'] = "Odaberite druge roditelje";
270,273c356,359
< 		$text['noreports'] = "Izvješce ne postoji.";
< 		$text['reportname'] = "Naziv izvješca";
< 		$text['allreports'] = "Sva izvješca";
< 		$text['report'] = "Izvješce";
---
> 		$text['noreports'] = "Nema izvještaja.";
> 		$text['reportname'] = "Ime izveštaja";
> 		$text['allreports'] = "Svi izveštaji";
> 		$text['report'] = "Izveštaj";
275,280c361,366
< 		$text['reportsyntax'] = "Sintaksa upita se pokrece zajedno s ovim izvješcem";
< 		$text['wasincorrect'] = "je pogrešno, i kao rezultat izvješce se ne može pokrenuti. Molim da kontaktirate administratora sustava";
< 		$text['errormessage'] = "Poruka Greške";
< 		$text['equals'] = "jednako";
< 		$text['endswith'] = "završava sa";
< 		$text['soundexof'] = "Soundex od";
---
> 		$text['reportsyntax'] = "Sintaksa upita pokreće se s ovim izvješćem";
> 		$text['wasincorrect'] = "nije bio to�an i zbog toga se izvješće nije moglo pokrenuti. Molimo kontaktirajte administratora sustava na";
> 		$text['errormessage'] = "Poruka o pogrešci";
> 		$text['equals'] = "biti jednak";
> 		$text['endswith'] = "završava se sa";
> 		$text['soundexof'] = "zvući kao";
283,286c369,372
< 		$text['lessthan'] = "manje nego";
< 		$text['greaterthan'] = "vece od";
< 		$text['lessthanequal'] = "manje ili jednako od";
< 		$text['greaterthanequal'] = "vece ili jednako za";
---
> 		$text['lessthan'] = "manje od";
> 		$text['greaterthan'] = "više od";
> 		$text['lessthanequal'] = "manje ili jednako";
> 		$text['greaterthanequal'] = "veće ili jednako";
288,289c374,375
< 		$text['tryagain'] = "Molim pokušajte ponovo";
< 		$text['joinwith'] = "Spoji sa";
---
> 		$text['tryagain'] = "Pokušajte ponovo";
> 		$text['joinwith'] = "Pridružite se";
292,294c378,380
< 		$text['showspouse'] = "Prikazana suprugu pokazat ce se kao duplikat ako osoba ima više od jedne supruge)";
< 		$text['submitquery'] = "Pošalji upit";
< 		$text['birthplace'] = "Mjesto rodenja";
---
> 		$text['showspouse'] = "Prikaži supružnika (pokazat će duplikate ako pojedinac ima više supružnika)";
> 		$text['submitquery'] = "Pošaljite upit";
> 		$text['birthplace'] = "Mjesto rođenja";
296c382
< 		$text['birthdatetr'] = "Godina rodenja";
---
> 		$text['birthdatetr'] = "Godina rođenja";
299,302c385,388
< 		$text['resetall'] = "Resetiraj sve vrijednosti";
< 		$text['showdeath'] = "Prikaži smrt/informaciju o pogrebu";
< 		$text['altbirthplace'] = "Mjesto Krštenja";
< 		$text['altbirthdatetr'] = "Godina Krštenja";
---
> 		$text['resetall'] = "Poništite sve vrijednosti";
> 		$text['showdeath'] = "Pokažite podatke o smrti/pokopa";
> 		$text['altbirthplace'] = "Mjesto krštenja";
> 		$text['altbirthdatetr'] = "Godina krštenja";
305c391
< 		$text['event'] = "Dogadaj(i)";
---
> 		$text['event'] = "Događaj";
308,312c394,398
< 		$text['keyword'] = "Kljucna rijec (npr, \"Popr\")";
< 		$text['explain'] = "Unesi komponente datuma da bi vidio dogadaje koji se slažu. Ostavi prazno polje da bi vidjio sve dogadaje koji se slažu.";
< 		$text['enterdate'] = "Molim unesi ili odaberi najmanje jedan podatak: Dan, Mjesec, Godina, kljucna rijec";
< 		$text['fullname'] = "Puno ime";
< 		$text['birthdate'] = "Datum rodenja";
---
> 		$text['keyword'] = "Klju�na rije� (tj. \"Abt\") ";
> 		$text['explain'] = "Unesite komponente datuma da biste vidjeli podudaranje događaja. Ostavite polje prazno da biste vidjeli utakmice za sve.";
> 		$text['enterdate'] = "Unesite ili odaberite barem jedno od sljedećeg: Dan, Mjesec, Godina, Klju�na rije�";
> 		$text['fullname'] = "Puno ime i prezime";
> 		$text['birthdate'] = "Datum rođenja";
314,316c400,402
< 		$text['marrdate'] = "Datum vjencanja";
< 		$text['spouseid'] = "Suprugin ID";
< 		$text['spousename'] = "Suprugino ime";
---
> 		$text['marrdate'] = "Datum vjen�anja";
> 		$text['spouseid'] = "ID supružnika";
> 		$text['spousename'] = "Ime Supružnika";
319,320c405,406
< 		$text['changedate'] = "Datum zadnje modifikacije";
< 		$text['gedcom'] = "Stablo";
---
> 		$text['changedate'] = "Datum zadnje izmjene";
> 		$text['gedcom'] = "Porodi�no stablo";
322,331c408,417
< 		$text['baptplace'] = "Mjeto krštenja (LDS)";
< 		$text['endldate'] = "Endowment Date (LDS)";
< 		$text['endlplace'] = "Endowment Place (LDS)";
< 		$text['ssealdate'] = "Seal Date S (LDS)";   //Sealed to spouse
< 		$text['ssealplace'] = "Seal Place S (LDS)";
< 		$text['psealdate'] = "Seal Date P (LDS)";   //Sealed to parents
< 		$text['psealplace'] = "Seal Place P (LDS)";
< 		$text['marrplace'] = "Mjesto vjencanja";
< 		$text['spousesurname'] = "Prezime supruge";
< 		$text['spousemore'] = "Ako unesete vrijednost supruginog prezimena, morate unijeti vrijednost u najmanje još jedno polje.";
---
> 		$text['baptplace'] = "Mjesto krštenja (LDS)";
> 		$text['endldate'] = "Datum Zadužbine (LDS)";
> 		$text['endlplace'] = "Mjesto Zadužbine (LDS)";
> 		$text['ssealdate'] = "Datum pe�ata S (LDS)";   //Sealed to spouse
> 		$text['ssealplace'] = "Mjesto pe�ata S (LDS)";
> 		$text['psealdate'] = "Datum pe�ata P (LDS)";   //Sealed to parents
> 		$text['psealplace'] = "Mjesto pe�ata P (LDS)";
> 		$text['marrplace'] = "Mjesto za vjen�anje";
> 		$text['spousesurname'] = "Prezime supružnika";
> 		$text['spousemore'] = "Ako unesete vrijednost za Prezime supružnika, morate odabrati spol.";
337c423
< 		$text['otherevents'] = "Ostali dogadaji";
---
> 		$text['otherevents'] = "Ostali kriteriji za pretraživanje";
339,343c425,429
< 		$text['mysphoto'] = "Misteriozne Fotografije";
< 		$text['mysperson'] = "Nedostižani Ljudi";
< 		$text['joinor'] = "Opcija 'Sastavi sa ILI' se nemože upotrebiti sa Prezime Supruge";
< 		$text['tellus'] = "Recite nam Å¡to znate";
< 		$text['moreinfo'] = "Više Informacije:";
---
> 		$text['mysphoto'] = "Tajanstvene fotografije";
> 		$text['mysperson'] = "Nedostižni ljudi";
> 		$text['joinor'] = "Opcija 'Join with OR' ne može se koristiti s prezimenom supružnika";
> 		$text['tellus'] = "Recite nam Å¡ta znate";
> 		$text['moreinfo'] = "Više informacija:";
345,351c431,437
< 		$text['marrdatetr'] = "Godina Vjecanja";
< 		$text['divdatetr'] = "Godina Razvoda";
< 		$text['mothername'] = "Ime Majke";
< 		$text['fathername'] = "Ime Otca";
< 		$text['filter'] = "Filtar";
< 		$text['notliving'] = "Ne Živuci";
< 		$text['nodayevents'] = "Dogadaji za ovaj mjesec koje nisu vezane uz odredeni dan:";
---
> 		$text['marrdatetr'] = "Godina vjen�anja";
> 		$text['divdatetr'] = "Godina Razvode";
> 		$text['mothername'] = "Maj�ino Ime";
> 		$text['fathername'] = "O�evo Ime";
> 		$text['filter'] = "Filter";
> 		$text['notliving'] = "Ne živi";
> 		$text['nodayevents'] = "Događaji za ovaj mjesec koji nisu povezani s određenim danom:";
353c439
< 		$text['csv'] = "Comma-delimited CSV file";
---
> 		$text['csv'] = "CSV datoteka ograni�ena zarezom";
355,358c441,444
< 		$text['confdate'] = "Confirmation Date (LDS)";
< 		$text['confplace'] = "Confirmation Place (LDS)";
< 		$text['initdate'] = "Initiatory Date (LDS)";
< 		$text['initplace'] = "Initiatory Place (LDS)";
---
> 		$text['confdate'] = "Datum potvrde (LDS)";
> 		$text['confplace'] = "Mjesto povrde (LDS)";
> 		$text['initdate'] = "Datum inicijative (LDS)";
> 		$text['initplace'] = "Mjesto inicijative (LDS)";
360,362c446,448
< 		$text['marrtype'] = "Marriage Type";
< 		$text['searchfor'] = "Search for";
< 		$text['searchnote'] = "Note: This page uses Google to perform its search. The number of matches returned will be directly affected by the extent to which Google has been able to index the site.";
---
> 		$text['marrtype'] = "Vrsta Braka";
> 		$text['searchfor'] = "Tragati za";
> 		$text['searchnote'] = "NAPOMENA: Ova stranica koristi Google za pretraživanje. Na broj vraćenih utakmica izravno će utjecati mjerilo u kojem je Google mogao indeksirati web mjesto.";
367,368c453,454
< 		$text['logfilefor'] = "Datoteka logova za";
< 		$text['mostrecentactions'] = "Posljednje aktivnosti";
---
> 		$text['logfilefor'] = "Datoteka zapisnika";
> 		$text['mostrecentactions'] = "Najnovije akcije";
370c456
< 		$text['refreshoff'] = "Iskljuci automatsko osvježivanje";
---
> 		$text['refreshoff'] = "Isklju�ite automatsko osvježavanje";
375,376c461,462
< 		$text['cemeteriesheadstones'] = "Groblja i nadgrobni spomenici";
< 		$text['showallhsr'] = "Prikaži sve podatke o nadgrobnim spomenicima";
---
> 		$text['cemeteriesheadstones'] = "Groblja i nadgrobni Spomenici";
> 		$text['showallhsr'] = "Pokaži sve zapise o Spomenicima";
378,379c464,465
< 		$text['showmap'] = "Prikaži mapu";
< 		$text['headstonefor'] = "Nadgrobni spomenik za";
---
> 		$text['showmap'] = "Pokaži mapu";
> 		$text['headstonefor'] = "Spomenik za";
381,382d466
< 		$text['firstpage'] = "Prva stranica";
< 		$text['lastpage'] = "Zadnja stranica";
386,388c470,472
< 		$text['iptc020'] = "Dopunske kategorije";
< 		$text['iptc040'] = "Specijalne instrukcije";
< 		$text['iptc055'] = "Datum kreiranja";
---
> 		$text['iptc020'] = "Kategorije potpore";
> 		$text['iptc040'] = "Posebne upute";
> 		$text['iptc055'] = "Datum stvaranja";
390c474
< 		$text['iptc085'] = "Autorova pozicija";
---
> 		$text['iptc085'] = "Pozicija Autora";
392c476
< 		$text['iptc095'] = "State";
---
> 		$text['iptc095'] = "Provincija";
402,404c486,488
< 		$text['regphotos'] = "Deskriptivan pogled";
< 		$text['gallery'] = "Slicice Samo";
< 		$text['cemphotos'] = "Fotografije groblja";
---
> 		$text['regphotos'] = "Opisni prikaz";
> 		$text['gallery'] = "Samo sli�ice";
> 		$text['cemphotos'] = "Fotografije Groblja";
407c491
< 		$text['filesize'] = "Velicina datoteke";
---
> 		$text['filesize'] = "Veli�ina datoteke";
409,412c493,496
< 		$text['showall'] = "Prikaži sve";
< 		$text['editmedia'] = "Uredi Media";
< 		$text['viewitem'] = "Pogledaj ovaj item";
< 		$text['editcem'] = "Uredi groblja";
---
> 		$text['showall'] = "Pokaži Sve";
> 		$text['editmedia'] = "Uredi Mediju";
> 		$text['viewitem'] = "Pogledaj ovaj stavku";
> 		$text['editcem'] = "Uredi Groblje";
414,417c498,501
< 		$text['allalbums'] = "Svi albumi";
< 		$text['slidestop'] = "Pauza Pokaz Prezentacije";
< 		$text['slideresume'] = "Nastavi Pokaz Prezentacije";
< 		$text['slidesecs'] = "Sekundi za svaki slajd:";
---
> 		$text['allalbums'] = "Svi Albumi";
> 		$text['slidestop'] = "Pauza pokazati presentacije";
> 		$text['slideresume'] = "Nastavi pokazati presentacija";
> 		$text['slidesecs'] = "Sekunde za svaki slajd:";
420,424c504,508
< 		$text['nocountry'] = "Nepoznata Zemlja";
< 		$text['nostate'] = "Nepoznata Država";
< 		$text['nocounty'] = "Nepoznata Županija";
< 		$text['nocity'] = "Nepoznati Grad";
< 		$text['nocemname'] = "Nepoznato ime groblja";
---
> 		$text['nocountry'] = "Nepoznata država";
> 		$text['nostate'] = "Nepoznata provincija";
> 		$text['nocounty'] = "Nepoznata županja";
> 		$text['nocity'] = "Nepoznat grad";
> 		$text['nocemname'] = "Nepoznat naziv groblja";
426c510
< 		$text['mediamaptext'] = "<strong>Poruka:</strong> Maknite vaš pokazivac miša preko slike za pokazati imena. Kliknite za viditi stranicu za svako ime.";
---
> 		$text['mediamaptext'] = "<strong>NAPOMENA:</strong> Pomi�ite pokaziva� miša preko slike da biste prikazali imena. Kliknite da biste vidjeli stranicu za svako ime.";
429c513
< 		$text['moreinfo'] = "Više Informacije:";
---
> 		$text['moreinfo'] = "Kliknite za više informacija o ovoj slici";
431,435c515,521
<         $text['iptc025'] = "Keywords";
<         $text['iptc092'] = "Sub-location";
< 		$text['iptc015'] = "Category";
< 		$text['iptc065'] = "Originating Program";
< 		$text['iptc070'] = "Program Version";
---
>         $text['iptc025'] = "Klju�ne rje�i";
>         $text['iptc092'] = "Pod-lokacija";
> 		$text['iptc015'] = "Kategorija";
> 		$text['iptc065'] = "Izvorni Program";
> 		$text['iptc070'] = "Verzija Programa";
> 		//added in 13.0
> 		$text['toggletags'] = "Prebaci oznake";
441,446c527,532
< 		$text['surnamesstarting'] = "Prikaži prezimena koja pocinju sa";
< 		$text['showtop'] = "Prikaži prvih";
< 		$text['showallsurnames'] = "Prikaži sva prezimena";
< 		$text['sortedalpha'] = "sortiraj abecedno";
< 		$text['byoccurrence'] = "sortiranih po pojavljivanju";
< 		$text['firstchars'] = "Prvi znakovi";
---
> 		$text['surnamesstarting'] = "Pokaži prezimena koja po�inju sa";
> 		$text['showtop'] = "Prikaži vrh";
> 		$text['showallsurnames'] = "Prikaz sva prezimena";
> 		$text['sortedalpha'] = "razvrstano po abecedi";
> 		$text['byoccurrence'] = "poredani pojavom";
> 		$text['firstchars'] = "Po�etna slova";
448,455c534,541
< 		$text['allsurnames'] = "Sva prezimena";
< 		$text['showmatchingsurnames'] = "Kliknite na prezime za vidjeti polja koja se slažu.";
< 		$text['backtotop'] = "Nazad na vrh";
< 		$text['beginswith'] = "Pocinje sa";
< 		$text['allbeginningwith'] = "Sva prezimena pocinju sa";
< 		$text['numoccurrences'] = "broj pojavljivanja u zagradama";
< 		$text['placesstarting'] = "Prikaži najveci lokalitet koji pocinje s";
< 		$text['showmatchingplaces'] = "Klikni na mjesto ako želiš prikazati manji lokalitet. Klikni na ikonu pretrage ako želiš prikazati osobe koje se slažu.";
---
> 		$text['allsurnames'] = "Sva Prezimena";
> 		$text['showmatchingsurnames'] = "Kliknite na prezime za prikaz odgovarajućih zapisa.";
> 		$text['backtotop'] = "Povratak na vrh";
> 		$text['beginswith'] = "Koja po�inju sa";
> 		$text['allbeginningwith'] = "Sva prezimena koja po�inju sa";
> 		$text['numoccurrences'] = "broj ukupnih lokaliteta u zagradama";
> 		$text['placesstarting'] = "Pokažite najveće lokalitete po�evši od";
> 		$text['showmatchingplaces'] = "Kliknite mjesto za prikaz manjih lokaliteta. Kliknite ikonu za pretraživanje da biste prikazali odgovarajuće pojedince.";
457c543
< 		$text['showallplaces'] = "Prikaži sve najvece lokalitete";
---
> 		$text['showallplaces'] = "Prikaži sve najveće lokalitete";
460c546
< 		$text['allplaces'] = "Svi najveci lokaliteti";
---
> 		$text['allplaces'] = "Sva veća Mjesta";
463,464c549,550
< 		$text['top30'] = "Najbrojnija xxx prezimena";
< 		$text['top30places'] = "Najbrojnija xxx veca mjesta";
---
> 		$text['top30'] = "Prvih xxx prezimena";
> 		$text['top30places'] = "Prvih xxx najveći lokaliteti";
466,476c552,562
< 		$text['firstnamelist'] = "First Name List";
< 		$text['firstnamesstarting'] = "Show first names starting with";
< 		$text['showallfirstnames'] = "Show all first names";
< 		$text['mainfirstnamepage'] = "Main first name page";
< 		$text['allfirstnames'] = "All First Names";
< 		$text['showmatchingfirstnames'] = "Click on a first name to show matching records.";
< 		$text['allfirstbegwith'] = "All first names beginning with";
< 		$text['top30first'] = "Top xxx first names";
< 		$text['allothers'] = "All others";
< 		$text['amongall'] = "(among all names)";
< 		$text['justtop'] = "Just the top xxx";
---
> 		$text['firstnamelist'] = "Popis imena";
> 		$text['firstnamesstarting'] = "Pokažite imena koja po�inju sa";
> 		$text['showallfirstnames'] = "Prikaži sva imena";
> 		$text['mainfirstnamepage'] = "Glavna stranica prvog imena";
> 		$text['allfirstnames'] = "Sva Imena";
> 		$text['showmatchingfirstnames'] = "Kliknite na ime da biste prikazali odgovarajuće zapise.";
> 		$text['allfirstbegwith'] = "Sva imena koja po�inju sa";
> 		$text['top30first'] = "Prvih xxx Imena";
> 		$text['allothers'] = "Svi drugi";
> 		$text['amongall'] = "(među svim imenima)";
> 		$text['justtop'] = "Samo prvih xxx";
481c567
< 		$text['pastxdays'] = "(prethodnih xx dana)";
---
> 		$text['pastxdays'] = "(u poslednjih xx dana)";
483c569
< 		$text['photo'] = "Fotografija";
---
> 		$text['photo'] = "Fotografije";
485,487c571,573
< 		$text['husbid'] = "Suprugov ID";
< 		$text['husbname'] = "Suprugovo ime";
< 		$text['wifeid'] = "Suprugin ID";
---
> 		$text['husbid'] = "ID Oca";
> 		$text['husbname'] = "Ime Oca";
> 		$text['wifeid'] = "ID Majke";
489c575
< 		$text['wifename'] = "Mother's Name";
---
> 		$text['wifename'] = "Majkino Ime";
496,500c582,586
< 		$text['nobirth'] = "Ova osoba nema valjani datum rodenja i ne može biti dodana";
< 		$text['event'] = "Dogadaj(i)";
< 		$text['chartwidth'] = "Å irina table";
< 		$text['timelineinstr'] = "Dodaj ljude";
< 		$text['togglelines'] = "Dozvoli crte";
---
> 		$text['nobirth'] = "Sljedeći pojedinac nema važeći datum rođenja i ne može ga se dodati.";
> 		$text['event'] = "Događaj(i)";
> 		$text['chartwidth'] = "Å irina grafikona";
> 		$text['timelineinstr'] = "Dodaj osobe";
> 		$text['togglelines'] = "Prebaci linije";
502c588
< 		$text['noliving'] = "Slijedeca osoba je oznacena kao živuca i ne može biti dodana zbog toga što nisi logiran s odgovarajucim ovlastima";
---
> 		$text['noliving'] = "Sljedeći pojedinac ozna�en je kao živi ili privatni i nije ga moguće dodati jer niste prijavljeni s odgovarajućim dozvolama";
509,510c595,596
< 		$text['browsealltrees'] = "Pregledaj sva stabla";
< 		$text['treename'] = "Naziv stabla";
---
> 		$text['browsealltrees'] = "Pretražavanje svih porodi�nih stabala";
> 		$text['treename'] = "Naziv stablo";
512,514c598,600
< 		$text['address'] = "Adrese";
< 		$text['city'] = "Grad";
< 		$text['state'] = "Država/Pokrajina";
---
> 		$text['address'] = "Adresa";
> 		$text['city'] = "Mjesto";
> 		$text['state'] = "Provincija";
516,517c602,603
< 		$text['country'] = "Zemlja";
< 		$text['email'] = "E-mail adresa";
---
> 		$text['country'] = "Država";
> 		$text['email'] = "Vaša e-pošta";
519c605
< 		$text['username'] = "Korisnicko Ime";
---
> 		$text['username'] = "Korisni�ko ime";
521c607
< 		$text['loginfailed'] = "Login nije uspio.";
---
> 		$text['loginfailed'] = "Prijava nije uspjela.";
523,524c609,610
< 		$text['regnewacct'] = "Registriraj se za novi korisnicki account";
< 		$text['realname'] = "Vaše stvarno ime";
---
> 		$text['regnewacct'] = "<strong>Registrirajte se za novi korisni�ki ra�un</strong>";
> 		$text['realname'] = "Vaše ime i prezime";
526,552c612,637
< 		$text['email'] = "E-mail adresa";
< 		$text['address'] = "Adrese";
< 		$text['acctcomments'] = "Komentar";
< 		$text['submit'] = "Uloži";
< 		$text['leaveblank'] = "(ostavi prazno ako zahtijevate novo stablo)";
< 		$text['required'] = "Potrebna polja";
< 		$text['enterpassword'] = "Molimo unesite zaporku.";
< 		$text['enterusername'] = "Molimo unesite korisnicko ime.";
< 		$text['failure'] = "Žao nam je, ali vaše korisnicko ime kojeg ste unijeli je vec korišteno. Molimo koristite Back button na vašem browser-u za povratak na prethodnu stanicu te odaberi drugacije korisnicko ime.";
< 		$text['success'] = "Hvala. Primili smo vašu registraciju. Kontaktirat cemo vas kada aktiviramo vaš account ili ako su potrebne dodatne informacije.";
< 		$text['emailsubject'] = "Novi zahtjev za registracijom od strane TNG korisnika";
< 		$text['website'] = "Web Stranica";
< 		$text['nologin'] = "Nemaš login?";
< 		$text['loginsent'] = "Login informacija poslata";
< 		$text['loginnotsent'] = "Login informacija nije poslata";
< 		$text['enterrealname'] = "Molimo unesite vaše realno ime.";
< 		$text['rempass'] = "Ostani logiran na ovom racunalu";
< 		$text['morestats'] = "Još statistike";
< 		$text['accmail'] = "<strong>NOTE:</strong> Molimo vas da ne blokirate mail s ove domene ako želite primati email-ove od sistem administratora u vezi vašeg account-a.";
< 		$text['newpassword'] = "Nova zaporka";
< 		$text['resetpass'] = "Resetiraj svoju zaporku";
< 		$text['nousers'] = "Ova forma ne može biti korištena sve dok postoji najmanje jedan korisnik. Ako ste vlasnik site-a, molim vas da kreirate vaš Administrator account iz Admin/Users.";
< 		$text['noregs'] = "Žao nam je, ali mi ne prihvacamo nove korisnicke registracije u ovom trenutku.  Molimo <a href=\"suggest.php\"> kontaktirajte nas </ a> direktno ako imate komentare ili pitanja u vezi s bilo što na ovom mjestu. ";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Primili ste novi zahtjev za otvaranje TNG korisnickog account-a. Molimo da se logirate na vaš TNG Admin account i dodijelite odgovarajuce ovlasti novom account-u. Ako odobrite ovu registraciju, molim da obavjestite aplikanta na nacin da odgovorite na ovu poruku.";
< 		$text['accactive'] = "Korisnicki racun je aktiviran, ali korisnik nece imati posebna prava dok ih ne dodijeliti.";
< 		$text['accinactive'] = "Idite na Admin/Korisnici/Pregled za pristup postavke racuna. Racun ce ostati neaktivan sve dok se ne uredi i spremi zapis barem jedanput.";
---
> 		$text['email'] = "Vaša e-pošta";
> 		$text['address'] = "Adresa";
> 		$text['acctcomments'] = "Bilješke ili komentari";
> 		$text['submit'] = "Pošalji";
> 		$text['leaveblank'] = "(ostavite prazno ako tražite novo stablo)";
> 		$text['required'] = "Obavezna polja";
> 		$text['enterpassword'] = "Molimo unesite lozinku.";
> 		$text['enterusername'] = "Unesite korisni�ko ime.";
> 		$text['failure'] = "Žao nam je, ali korisni�ko ime koje ste unijeli već se koristi. Upotrijebite gumb Natrag u pregledniku da biste se vratili na prethodnu stranicu i odabrali drugo korisni�ko ime.";
> 		$text['success'] = "Hvala vam. Primili smo vašu registraciju. Kontaktirat ćemo vas kada je vaš ra�un aktivan ili ako su potrebne dodatne informacije.";
> 		$text['emailsubject'] = "Novi zahtjev za registraciju korisnika TNG-a";
> 		$text['website'] = "Web mjesto";
> 		$text['nologin'] = "Nemate prijavu?";
> 		$text['loginsent'] = "Podaci o prijavi su poslani";
> 		$text['loginnotsent'] = "Podaci o prijavi nisu poslani";
> 		$text['enterrealname'] = "Unesite svoje pravo ime.";
> 		$text['rempass'] = "Ostanite prijavljeni na ovom ra�unalu";
> 		$text['morestats'] = "Više statistike";
> 		$text['accmail'] = "<strong>NAPOMENA:</strong> Kako biste primali poštu od administratora web lokacije u vezi s vašim ra�unom, provjerite ne blokirate poštu s ove domene.";
> 		$text['newpassword'] = "Nova Lozinka";
> 		$text['resetpass'] = "Vraćanje izvorne lozinke";
> 		$text['nousers'] = "Ovaj se obrazac ne može upotrijebiti dok ne postoji barem jedan korisni�ki zapis. Ako ste vlasnik web mjesta, idite na Administrator / Korisnici da biste stvorili administratorski ra�un.";
> 		$text['noregs'] = "Žao nam je, ali trenutno ne prihvaćamo nove registracije korisnika. Molimo <a href=\"suggest.php\"> kontaktirajte nas</a> izravno ako imate komentare ili pitanja u vezi bilo �ega na ovoj web stranici.";
> 		$text['emailmsg'] = "Primili ste novi zahtjev za TNG korisni�ki ra�un. Prijavite se na svoje podru�je TNG Administrator i dodijelite odgovarajuća dopuštenja ovom novom ra�unu.";
> 		$text['accactive'] = "Ra�un je aktiviran, ali korisnik neće imati posebna prava dok ih ne dodijelite.";
> 		$text['accinactive'] = "Idite na Administrator / Korisnici / Pregled da biste pristupili postavkama ra�una. Ra�un će ostati neaktivan sve dok ga barem jednom ne uredite i spremite.";
554,558c639,642
< 		$text['enterpassword2'] = "Molim unesite vašu lozinku ponovo.";
< 		$text['pwdsmatch'] = "Vaše lozinke ne podudaraju.  Molim unesite istu lozinku u svako polje.";
< 		//added in 8.0.0
< 		$text['acksubject'] = "Hvala vam za registraciju"; //for a new user account
< 		$text['ackmessage'] = "Vaš zahtjev za korisnicki racun zaprimljena. Vaš racun ce biti neaktivan dok ga ne pregleda administrator web stranice. Biti cete obaviješteni putem email kada je Vaša prijava spreman za upotrebu.";
---
> 		$text['enterpassword2'] = "Molimo unesite lozinku ponovo.";
> 		$text['pwdsmatch'] = "Vaše lozinke se ne podudaraju. Unesite istu lozinku u svako polje.";
> 		$text['acksubject'] = "Hvala vam na registraciji"; //for a new user account
> 		$text['ackmessage'] = "Vaš zahtjev za korisni�ki ra�un je primljen. Vaš ra�un bit će neaktivan dok ga administrator web mjesta ne pregleda. Obavijestit ćete vas e-poštom kada je vaša prijava spremna za upotrebu.";
560c644,651
< 		$text['switch'] = "Switch";
---
> 		$text['switch'] = "Prekida�";
> 		//added in 14.0
> 		$text['newpassword2'] = "Opet nova lozinka";
> 		$text['resetsuccess'] = "USPJEH: Lozinka je poništena";
> 		$text['resetfail'] = "GREŠKA: Lozinka nije poništena";
> 		$text['failreason0'] = " (nepoznata greška baze podataka)";
> 		$text['failreason2'] = " (nemate dopuštenje promijeniti lozinku)";
> 		$text['failreason3'] = " (lozinke nisu odgovarale)";
565c656
< 		$text['browseallbranches'] = "Browse All Branches";
---
> 		$text['browseallbranches'] = "Pregledaj sve Grane stabla";
570c661
< 		$text['quantity'] = "Kolicina";
---
> 		$text['quantity'] = "Koli�ina";
572,575c663,666
< 		$text['totmales'] = "Ukupno muškaraca";
< 		$text['totfemales'] = "Ukupno žena";
< 		$text['totunknown'] = "Ukupno nepoznatih spolova";
< 		$text['totliving'] = "Ukuno živucih";
---
> 		$text['totmales'] = "Ukupno muški";
> 		$text['totfemales'] = "Ukupno ženski";
> 		$text['totunknown'] = "Ukupno nepoznati spol";
> 		$text['totliving'] = "Ukupno živih";
582,583c673,674
< 		$text['avglifespan'] = "Prosjecni životni vijek";
< 		$text['earliestbirth'] = "Najranije rodenje";
---
> 		$text['avglifespan'] = "Prosje�ni životni vijek";
> 		$text['earliestbirth'] = "Najranije rođenje";
586,587c677,678
< 		$text['age'] = "starost";
< 		$text['agedisclaimer'] = "Izracun baziran na starosti je zasnovan na osobama sa upisanim datumima rodenja <EM>i</EM> smrti. Zbog nekompletiranih podataka u poljima za datum (npr., datum smrti je prikazan samo kao \"1945\" ili \"BEF 1860\"), ove kalkulacije ne mogu biti 100% tocne.";
---
> 		$text['age'] = "Doba života";
> 		$text['agedisclaimer'] = "Izra�uni vezani za dob temelje se na pojedincima s evidentiranim datumima rođenja <em> i </em> datumima smrti. Zbog postojanja nepotpunih datumskih polja (npr., datum smrti naveden samo kao \"1945 \" ili \"BEF 1860 \"), ovi izra�uni ne mogu biti 100% to�ni.";
591c682,684
< 		$text['totdeceased'] = "Total Deceased";
---
> 		$text['totdeceased'] = "Ukupno umrlih";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Ukupni citati izvora";
595c688
< 		$text['browseallnotes'] = "Pretraži sve zabilješke";
---
> 		$text['browseallnotes'] = "Pregledajte sve bilješke";
599c692
< 		$text['menuhelp'] = "Kljuc Menija";
---
> 		$text['menuhelp'] = "Tipka izbornika";
603,605c696,698
< 		$text['perms'] = "Dozvole su svi bili postavili.";
< 		$text['noperms'] = "Dozvole nisu mogle biti postavljena za ove datoteke:";
< 		$text['manual'] = "Molim da ih rucno postavite.";
---
> 		$text['perms'] = "Dozvola su sva postavljena.";
> 		$text['noperms'] = "Za te datoteke nije moguće postaviti dopuštenja:";
> 		$text['manual'] = "Postavite ih ru�no.";
607,619c700,711
< 		$text['created'] = "je stoverena";
< 		$text['nocreate'] = "nije mogla se stvoriti.  Molimo kreirajte ga rucno.";
< 		$text['infosaved'] = "Informacije spremljene, veza provjerena!";
< 		$text['tablescr'] = "Tablice su stvoreni!";
< 		$text['notables'] = "Sljedece tablice nisu se mogle stvoriti:";
< 		$text['nocomm'] = "TNG ne komunicira s Vašom bazom podataka.  Nijedne tablice su stvorene.";
< 		$text['newdb'] = "Informacije spremljene, veza provjerena, nova baza podataka stvorena:";
< 		$text['noattach'] = "Informacije spremljene, veza provjerena i nova baza podataka stvorena, ali TNG ne može priložiti za njega.";
< 		$text['nodb'] = "Informacije spremljene.  Veza provjerena, a baza podataka ne postoji i nije mogla se tu stvoriti.  Molimo provjerite je li naziv baze podataka tocna, ili pomocu upravljacke ploce da ga stvorite.";
< 		$text['noconn'] = "Informacije spremljene ali veza nije uspjela.  Jedna ili više od sljedecih je kriv:";
< 		$text['exists'] = "postoji";
< 		$text['loginfirst'] = "Morate se prvo logovati.";
< 		$text['noop'] = "Nije ucinjen operativni zahvat.";
---
> 		$text['created'] = "stvoreno je";
> 		$text['nocreate'] = "nije se moglo stvoriti. Stvorite ga ru�no.";
> 		$text['infosaved'] = "Podaci su sa�uvani, veza je provjerena!";
> 		$text['tablescr'] = "Tabele su stvorene!";
> 		$text['notables'] = "Sljedeće tablice nije bilo moguće stvoriti:";
> 		$text['nocomm'] = "TNG ne komunicira s vašom bazom podataka. Nisu stvorene tablice.";
> 		$text['newdb'] = "Podaci su sa�uvani, veza ovjerena, stvorena nova baza podataka:";
> 		$text['noattach'] = "Podaci su sa�uvani. Uspostavljena je veza i stvorena baza podataka, ali TNG se na nju ne može priklju�iti.";
> 		$text['nodb'] = "Podaci su sa�uvani. Veza je uspostavljena, ali baza podataka ne postoji i ne može se ovdje stvoriti. Provjerite je li naziv baze podataka to�an i ima li korisnik baze podataka pravilan pristup, ili je za to stvorite na upravlja�koj plo�i.";
> 		$text['noconn'] = "Podaci su sa�uvani, ali veza nije uspjela. Jedno ili više sljedećeg nisu to�ni:";
> 		$text['exists'] = "već postoji.";
> 		$text['noop'] = "Nije izvršena nijedna operacija.";
621,625c713,719
< 		$text['nouser'] = "Korisnik nije stvoren. Korisnicko ime vec postoji.";
< 		$text['notree'] = "Stablo nije stvoren. Stablo ID možda vec postoji.";
< 		$text['infosaved2'] = "Informacije spremljene";
< 		$text['renamedto'] = "preimenovana u";
< 		$text['norename'] = "nije moglo se preimenovati";
---
> 		$text['nouser'] = "Korisnik nije stvoren. Korisni�ko ime možda već postoji.";
> 		$text['notree'] = "Stablo nije stvoreno. ID stabla već može postojati.";
> 		$text['infosaved2'] = "Podaci su sa�uvani";
> 		$text['renamedto'] = "preimenovan u";
> 		$text['norename'] = "nije moguće preimenovati";
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Otkriveni su postojeći korisni�ki zapisi. Da biste nastavili prvo se morate prijaviti ili ukloniti sve zapise iz korisni�ke tablice.";
629,632c723,724
< 		$text['zoomin'] = "Približi";
< 		$text['zoomout'] = "Udalji";
< 		$text['magmode'] = "Moda Uvecavati";
< 		$text['panmode'] = "Moda Pomicanje";
---
> 		$text['magmode'] = "Uvećavanje";
> 		$text['panmode'] = "Panoramski Prikaz";
634,641c726,733
< 		$text['fitwidth'] = "Pristaj Å irini";
< 		$text['fitheight'] = "Pristaj Visini";
< 		$text['newwin'] = "Novi prozor";
< 		$text['opennw'] = "Otvori sliku u novi prozor";
< 		$text['magnifyreg'] = "Kliknite povecati jedno podrucje slike";
< 		$text['imgctrls'] = "Omoguci Kontrole Slike";
< 		$text['vwrctrls'] = "Omoguci Kontrole Razglednika Slike";
< 		$text['vwrclose'] = "Zatvori Razglednik Slika";
---
> 		$text['fitwidth'] = "Podesite Å¡irinu";
> 		$text['fitheight'] = "Podesite visina";
> 		$text['newwin'] = "Novi Prozor";
> 		$text['opennw'] = "Otvori sliku u novom prozoru";
> 		$text['magnifyreg'] = "Kliknite za povećanje regije na slici";
> 		$text['imgctrls'] = "Omogući kontrolu slike";
> 		$text['vwrctrls'] = "Omogućiti kontrolu pregleda�a slika";
> 		$text['vwrclose'] = "Zatvori preglednik slika";
645,647c737,739
< 		$text['test_date'] = "Test date";
< 		$text['links'] = "Relevant links";
< 		$text['testid'] = "Test ID";
---
> 		$text['test_date'] = "Datum testa";
> 		$text['links'] = "Relevantne poveznice";
> 		$text['testid'] = "ID Testa";
649,659c741,775
< 		$text['mode_values'] = "Mode Values";
< 		$text['compareselected'] = "Compare Selected";
< 		$text['dnatestscompare'] = "Compare Y-DNA Tests";
< 		$text['keep_name_private'] = "Keep Name Private";
< 		$text['browsealltests'] = "Browse All Tests";
< 		$text['all_dna_tests'] = "All DNA tests";
< 		$text['fastmutating'] = "Fast&nbsp;Mutating";
< 		$text['dna_info_head'] = "DNA Test Info";
< 		$text['alltypes'] = "All Types";
< 		$text['allgroups'] = "All Groups";
< 		$text['Ydna_LITbox_info'] = "Test(s) linked to this person were not necessarily taken by this person.<br />The 'Haplogroup' column displays data in red if the result is 'Predicted' or green if the test is 'Confirmed'";
---
> 		$text['mode_values'] = "Vrednost na�ina";
> 		$text['compareselected'] = "Usporedite odabrano";
> 		$text['dnatestscompare'] = "Usporedite Y-DNA testove";
> 		$text['keep_name_private'] = "Neka ime ostane Privatno";
> 		$text['browsealltests'] = "Pregledajte sve testove";
> 		$text['all_dna_tests'] = "Svi DNA testovi";
> 		$text['fastmutating'] = "Brzo&nbsp;Mutira";
> 		$text['alltypes'] = "Svi Tipovi";
> 		$text['allgroups'] = "Sve Grupe";
> 		$text['Ydna_LITbox_info'] = "Test (e) povezane s ovom osobom nije nužno uzela ta osoba. <br /> Stupac 'Haplogroup' prikazuje podatke crvenom bojom ako je rezultat 'Predviđen' ili zelenom bojom ako je test 'Potvrđen'";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Usporedite odabrane testove mtDNA";
> 		$text['dnatestscompare_atdna'] = "Usporedite odabrane testove atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "sekvenca";
> 		$text['extra_mutations'] = "Dodatne mutacije";
> 		$text['mrca'] = "MRC Predak";
> 		$text['ydna_test'] = "Y-DNA Testovi";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Testovi";
> 		$text['atdna_test'] = "atDNA (autosomal) Testovi";
> 		$text['segment_start'] = "Po�etak";
> 		$text['segment_end'] = "Kraj";
> 		$text['suggested_relationship'] = "Predložen";
> 		$text['actual_relationship'] = "Stvaran";
> 		$text['12markers'] = "Markeri 1-12";
> 		$text['25markers'] = "Markeri 13-25";
> 		$text['37markers'] = "Markeri 26-37";
> 		$text['67markers'] = "Markeri 38-67";
> 		$text['111markers'] = "Markeri 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Za usporedbu moraju se odabrati najmanje dva testa";
664c780
< $text['matches'] = "Podudarnosti";
---
> $text['matches'] = "Me�";
666c782
< $text['notes'] = "Zabilješke";
---
> $text['notes'] = "Bilješke";
668,675c784,788
< $text['newsearch'] = "Novo pretraživanje";
< $text['pedigree'] = "Porijeklo";
< $text['birthabbr'] = "r.";
< $text['chrabbr'] = "k.";
< $text['seephoto'] = "Vidi fotografiju";
< $text['andlocation'] = "&amp; lokacija";
< $text['accessedby'] = "pristupao";
< $text['family'] = "Obitelj"; //from getperson
---
> $text['newsearch'] = "Nova Pretraga";
> $text['pedigree'] = "Pedigre";
> $text['seephoto'] = "Pogledajte fotografiju";
> $text['andlocation'] = "&amp; mjesto";
> $text['accessedby'] = "kojima pristupa";
680,682c793,795
< $text['thumb'] = "Slicica";  //as in Thumbnail
< $text['people'] = "Ljudi";
< $text['title'] = "Naslov";  //from getperson
---
> $text['thumb'] = "Sli�ica";  //as in Thumbnail
> $text['people'] = "Narod";
> $text['title'] = "Titula";  //from getperson
685,687c798,799
< $text['deathabbr'] = "s.";  //from descend
< $text['lastmodified'] = "Zadnji koji je modificiran";  //from getperson
< $text['married'] = "Oženjen";  //from getperson
---
> $text['lastmodified'] = "Zadnja promjena";  //from getperson
> $text['married'] = "Vjen�anje";  //from getperson
690,692c802,804
< $text['lastfirst'] = "Prezime, Ime(na)";  //from search
< $text['bornchr'] = "Roden/Kršten";  //from search
< $text['individuals'] = "Osoba";  //from whats new
---
> $text['lastfirst'] = "Prezime, Ime";  //from search
> $text['bornchr'] = "Rođen/Kršten";  //from search
> $text['individuals'] = "Pojedinci";  //from whats new
694c806
< $text['personid'] = "ID osobe";
---
> $text['personid'] = "ID Osobe";
700,702c812,814
< $text['died'] = "Umro";
< $text['buried'] = "Ukopan";
< $text['spouse'] = "Supruga";  //from search
---
> $text['died'] = "Smrt";
> $text['buried'] = "Pokopan";
> $text['spouse'] = "Suprog";  //from search
706,707c818
< $text['burialabbr'] = "ukop.";  //from descend
< $text['descendchart'] = "Potomci";
---
> $text['descendchart'] = "Potomak";
709c820
< $text['indinfo'] = "Osoba";
---
> $text['indinfo'] = "Pojedinac";
712,716c823,825
< $text['place'] = "Mjesto";
< $text['login'] = "Login";
< $text['logout'] = "Logout";
< $text['marrabbr'] = "v.";
< $text['groupsheet'] = "Grupni List";
---
> $text['login'] = "Prijava";
> $text['logout'] = "Odjava";
> $text['groupsheet'] = "Grupni list";
719c828
< $text['filename'] = "Ime datoteke";
---
> $text['filename'] = "Ime Datoteke";
725,730c834,839
< $text['searchresults'] = "Pretraži rezultate";
< $text['diedburied'] = "Umro/Ukopan";
< $text['homepage'] = "Pocetna Stranica";
< $text['find'] = "Nadi...";
< $text['relationship'] = "Veza";		//in German, Verwandtschaft
< $text['relationship2'] = "Veza"; //different in some languages, at least in German (Beziehung)
---
> $text['searchresults'] = "Rezultati pretraživanja";
> $text['diedburied'] = "Umrp/Pokopan";
> $text['homepage'] = "Po�etna Strana";
> $text['find'] = "Traži...";
> $text['relationship'] = "Srodstvo";		//in German, Verwandtschaft
> $text['relationship2'] = "Srodstvo"; //different in some languages, at least in German (Beziehung)
732,734c841,843
< $text['yesabbr'] = "D";               //abbreviation for 'yes'
< $text['divorced'] = "Razveden";
< $text['indlinked'] = "Vezan za";
---
> $text['yesabbr'] = "Da";               //abbreviation for 'yes'
> $text['divorced'] = "Rastavljen";
> $text['indlinked'] = "Povezan sa";
738,744c847,852
< $text['source'] = "Izvor";
< $text['surnamelist'] = "Lista prezimena";
< $text['generations'] = "Generacije";
< $text['refresh'] = "Osvježi";
< $text['whatsnew'] = "Å to je novo dodano";
< $text['reports'] = "Izvješca";
< $text['placelist'] = "Lista mjesta";
---
> $text['surnamelist'] = "Popis prezimena";
> $text['generations'] = "Generacija";
> $text['refresh'] = "Osvježiti";
> $text['whatsnew'] = "Novosti";
> $text['reports'] = "Izveštaji";
> $text['placelist'] = "Popis mjesta";
746,748c854,856
< $text['endowedlds'] = "Endowed (LDS)";
< $text['sealedplds'] = "Sealed P (LDS)";
< $text['sealedslds'] = "Sealed S (LDS)";
---
> $text['endowedlds'] = "Obdaren (LDS)";
> $text['sealedplds'] = "Zape�aćen P (LDS)";
> $text['sealedslds'] = "Zape�aćen S (LDS)";
750c858
< $text['descendants'] = "Djeca";
---
> $text['descendants'] = "Potomci";
752c860
< $text['lastimportdate'] = "Datum zadnjeg GEDCOM uvoza";
---
> $text['lastimportdate'] = "Datum zadnjeg uvoza GEDCOM-a";
754,757c862,865
< $text['savechanges'] = "Pohrani promjene";
< $text['familyid'] = "ID obitelji";
< $text['headstone'] = "Nadgrobni spomenik";
< $text['historiesdocs'] = "Povijesti";
---
> $text['savechanges'] = "Sa�uvaj";
> $text['familyid'] = "Porodi�ni ID";
> $text['headstone'] = "Spomenik";
> $text['historiesdocs'] = "Historije";
760c868
< $text['anniversaries'] = "Datumi & Obljetnice";
---
> $text['anniversaries'] = "Datumi i godišnjice";
762c870
< $text['help'] = "Pomoc";
---
> $text['help'] = "Pomoć";
765,773c873,879
< $text['all'] = "Svi";
< $text['repository'] = "Repozitorij";
< $text['address'] = "Adrese";
< $text['suggest'] = "Sugestija";
< $text['editevent'] = "Predloži promjenu za ovaj dogadaj";
< $text['findplaces'] = "Pronadi sve osobe koji imaju dogadaje na ovoj lokaciji";
< $text['morelinks'] = "Više linkova";
< $text['faminfo'] = "Obiteljska informacija";
< $text['persinfo'] = "Osobna informacija";
---
> $text['all'] = "Sve";
> $text['address'] = "Adresa";
> $text['suggest'] = "Predložiti";
> $text['editevent'] = "Predložite promjenu za ovaj događaj";
> $text['morelinks'] = "Više veza";
> $text['faminfo'] = "Obiteljske informacije";
> $text['persinfo'] = "Osobne informacije";
775,778c881,884
< $text['fact'] = "Cinjenice";
< $text['goto'] = "Selektiraj stranicu";
< $text['tngprint'] = "Print";
< $text['databasestatistics'] = "Statistike"; //needed to be shorter to fit on menu
---
> $text['fact'] = "ÄŒinjenica";
> $text['goto'] = "Odaberite stranicu";
> $text['tngprint'] = "Å tampaj";
> $text['databasestatistics'] = "Statistika"; //needed to be shorter to fit on menu
780,782c886,888
< $text['repoinfo'] = "Informcija Repozitorije";
< $text['tng_reset'] = "Vrati u pocetno stanje";
< $text['noresults'] = "Rezultati nisu nadeni";
---
> $text['repoinfo'] = "Informacije o spremištu";
> $text['tng_reset'] = "Ponovo postaviti";
> $text['noresults'] = "Nema rezultata";
784c890
< $text['repositories'] = "Repozitorije";
---
> $text['repositories'] = "Sigurno Spremište";
789,799c895,905
< $text['link'] = "Linkovi";
< $text['media'] = "Mediji";
< $text['gender'] = "Spol";
< $text['latitude'] = "Geografska Å irina";
< $text['longitude'] = "Geografska Dužina";
< $text['bookmarks'] = "Oznaka";
< $text['bookmark'] = "Dodaj Oznaku";
< $text['mngbookmarks'] = "Idi na Oznake";
< $text['bookmarked'] = "Oznak dodan";
< $text['remove'] = "Obriši";
< $text['find_menu'] = "Nadi";
---
> $text['link'] = "Veza";
> $text['media'] = "Medija";
> $text['gender'] = "Pol";
> $text['latitude'] = "Zemljopisna Å¡irina";
> $text['longitude'] = "Zemljopisna dužina";
> $text['bookmarks'] = "Bookmarks";
> $text['bookmark'] = "Dodaj Bookmark";
> $text['mngbookmarks'] = "Idi do Bookmarka";
> $text['bookmarked'] = "Bookmark dodan";
> $text['remove'] = "Ukloni";
> $text['find_menu'] = "Traži";
801,813c907,918
< $text['cemetery'] = "Groblja";
< $text['gmapevent'] = "Karta dogadaja";
< $text['gevents'] = "Dogadaj";
< $text['glang'] = "&amp;hl=hr";
< $text['googleearthlink'] = "Link na Google Earth";
< $text['googlemaplink'] = "Link na Google Maps";
< $text['gmaplegend'] = "Legenda Igle";
< $text['unmarked'] = "Nije oznaceno";
< $text['located'] = "Locirano";
< $text['albclicksee'] = "Kliknite da vidite sve stavke iz ovog albuma";
< $text['notyetlocated'] = "Ne još nadeno";
< $text['cremated'] = "Spaljen";
< $text['missing'] = "Fali";
---
> $text['cemetery'] = "Groblje";
> $text['gmapevent'] = "Mapa Događaja";
> $text['gevents'] = "Događaj";
> $text['googleearthlink'] = "Veza za Google Earth";
> $text['googlemaplink'] = "Veza za Google Maps";
> $text['gmaplegend'] = "Oznake Legende";
> $text['unmarked'] = "Ne obilježen";
> $text['located'] = "Smješten";
> $text['albclicksee'] = "Kliknite da biste vidjeli sve stavke u ovom albumu";
> $text['notyetlocated'] = "Još se ne nalazi";
> $text['cremated'] = "Kremiran";
> $text['missing'] = "Nedostaje";
815,816c920
< $text['blank'] = "Prazan Dijagram";
< $text['none'] = "Ništa";
---
> $text['blank'] = "Prazan Grafikon";
820,829c924,933
< $text['pgsetup'] = "Postavke Stranice";
< $text['pgsize'] = "Velicina Stranice";
< $text['orient'] = "Orientacija"; //for a page
< $text['portrait'] = "Uspravno";
< $text['landscape'] = "Vodoravno";
< $text['tmargin'] = "Gornja Margina";
< $text['bmargin'] = "Donja Margina";
< $text['lmargin'] = "Lijeva Margin";
< $text['rmargin'] = "Desna Margin";
< $text['createch'] = "Kreiraj Dijagram";
---
> $text['pgsetup'] = "Podešavanje stranice";
> $text['pgsize'] = "Veli�ina stranice";
> $text['orient'] = "Orijentacija"; //for a page
> $text['portrait'] = "Portret";
> $text['landscape'] = "Pejzažna";
> $text['tmargin'] = "Gornja marža";
> $text['bmargin'] = "Goljnja marža";
> $text['lmargin'] = "Ljeva marža";
> $text['rmargin'] = "Desna marža";
> $text['createch'] = "Stvorite Grafikon";
831,833c935,937
< $text['mostwanted'] = "Naj Željeni";
< $text['latupdates'] = "Najnovije Dopune";
< $text['featphoto'] = "Prikazana Fotografija";
---
> $text['mostwanted'] = "Najtraženiji";
> $text['latupdates'] = "Najnovija ažuriranja";
> $text['featphoto'] = "Izdvojena fotografija";
835,838c939,942
< $text['ourhist'] = "Naša Obiteljska Povijest";
< $text['ourhistanc'] = "Naša Obiteljska Povijest i Porijeklo";
< $text['ourpages'] = "Stranice Genealogije Naše Obitelj";
< $text['pwrdby'] = "Ova stranica omogucena sa";
---
> $text['ourhist'] = "Naš Obitelji Povijest";
> $text['ourhistanc'] = "Naša obiteljska povijest i rodovina";
> $text['ourpages'] = "Naše obiteljske rodoslovne stranice";
> $text['pwrdby'] = "Ovu web lokaciju pokreće";
841c945
< $text['viewphotos'] = "Vidi sve fotografije";
---
> $text['viewphotos'] = "Pogledaj sve fotografije";
843,846c947,950
< $text['whichbranch'] = "Od koje grane ste vi?";
< $text['featarts'] = "Izabrani clanci";
< $text['maintby'] = "Izdržava";
< $text['createdon'] = "Kreirano na";
---
> $text['whichbranch'] = "Kojoj grani pripadaš?";
> $text['featarts'] = "Članci o zna�ajkama";
> $text['maintby'] = "Održava";
> $text['createdon'] = "Napravljeno na";
849,852c953,956
< $text['inclsrcs'] = "Ukljuci Izvore";
< $text['cont'] = "(dalje)"; //abbreviation for continued
< $text['mnuheader'] = "Pocetna Stranica";
< $text['mnusearchfornames'] = "Traži Imena";
---
> $text['inclsrcs'] = "Uklju�uju Izvore";
> $text['cont'] = "(nastav.)"; //abbreviation for continued
> $text['mnuheader'] = "Po�etna Strana";
> $text['mnusearchfornames'] = "Potraži";
856,861c960,965
< $text['mnureset'] = "Pocni ispocetka";
< $text['mnulogon'] = "Login";
< $text['mnulogout'] = "Logout";
< $text['mnufeatures'] = "Ostale opcije";
< $text['mnuregister'] = "Registriraj se za korisnicki racun";
< $text['mnuadvancedsearch'] = "Napredno pretraživanje";
---
> $text['mnureset'] = "Po�eti ispo�etka";
> $text['mnulogon'] = "Prijaviti se";
> $text['mnulogout'] = "Odjavite se";
> $text['mnufeatures'] = "Druge zna�ajke";
> $text['mnuregister'] = "Registrirajte se za korisni�ki ra�un";
> $text['mnuadvancedsearch'] = "Napredna pretraga";
865,866c969,970
< $text['mnuhistories'] = "Povijest";
< $text['mnumyancestors'] = "Fotografije &amp; Povijest predaka od [Person]";
---
> $text['mnuhistories'] = "Povijesti";
> $text['mnumyancestors'] = "Fotografije &amp; Povijesti za Pretke od [Person]";
868,869c972,973
< $text['mnutombstones'] = "Nadgobni spomenici";
< $text['mnureports'] = "Izvješca";
---
> $text['mnutombstones'] = "Nadgrobni Spomenici";
> $text['mnureports'] = "Izveštaji";
871,872c975,976
< $text['mnuwhatsnew'] = "Å to je novog";
< $text['mnushowlog'] = "Zapis pristupa";
---
> $text['mnuwhatsnew'] = "Novosti";
> $text['mnushowlog'] = "Dnevnik pristupa";
878,879c982,983
< $text['born'] = "Roden";
< $text['searchnames'] = "Traži imena";
---
> $text['born'] = "Rođen";
> $text['searchnames'] = "Pretražite osobe";
881,884c985,988
< $text['editperson'] = "Uredi Osobu";
< $text['loadmap'] = "Ucitaj kartu";
< $text['birth'] = "Rodenje";
< $text['wasborn'] = "je roden/rodena";
---
> $text['editperson'] = "Uredi osobu";
> $text['loadmap'] = "U�itajte kartu";
> $text['birth'] = "Rođen";
> $text['wasborn'] = "rođen je";
888c992
< $text['location'] = "Lokacija";
---
> $text['location'] = "Mjesto";
890,893c994,997
< $text['collapse'] = "Skupi";
< $text['expand'] = "Ekspandiraj";
< $text['plot'] = "Iscrtaj";
< $text['searchfams'] = "Traži Obitelji";
---
> $text['collapse'] = "Kolaps";
> $text['expand'] = "Proširi";
> $text['plot'] = "Crtaj";
> $text['searchfams'] = "Potraži Obitelji";
895c999
< $text['wasmarried'] = "Oženjen";
---
> $text['wasmarried'] = "Vjen�an";
898,906c1002,1010
< $text['share'] = "Share";
< $text['hide'] = "Hide";
< $text['disabled'] = "Your user account has been disabled. Please contact the site administrator for more information.";
< $text['contactus_long'] = "If you have any questions or comments about the information on this site, please <span class=\"emphasis\"><a href=\"suggest.php\">contact us</a></span>. We look forward to hearing from you.";
< $text['features'] = "Features";
< $text['resources'] = "Resources";
< $text['latestnews'] = "Latest News";
< $text['trees'] = "Trees";
< $text['wasburied'] = "was buried";
---
> $text['share'] = "Djeli";
> $text['hide'] = "Sakri";
> $text['disabled'] = "Vaš korisni�ki nalog je isklju�en. Kontaktirajte administratora sajta za više informacija.";
> $text['contactus_long'] = "Ako imate bilo kakvih pitanja ili komentara o podacima na ovoj stranici, molimo <span class = \"emphasis\"> <a href=\"suggest.php\"> kontaktirajte nas</a> </span>. Radujemo se što ćete se javiti nam.";
> $text['features'] = "Zna�ajke";
> $text['resources'] = "Resursi";
> $text['latestnews'] = "Najnovije Vjesti";
> $text['trees'] = "Porodi�na stabla";
> $text['wasburied'] = "pokopan je";
908,911c1012,1015
< $text['emailagain'] = "Email ponovo";
< $text['enteremail2'] = "Molim unesite Vašu email adresu ponovo.";
< $text['emailsmatch'] = "Vaše email adrese ne podudaraju.  Molim unesite istu email adresu u svako polje.";
< $text['getdirections'] = "Kliknite za dobiti upute";
---
> $text['emailagain'] = "e-poštu ponovi";
> $text['enteremail2'] = "Ponovno unesite svoju adresu e-pošte.";
> $text['emailsmatch'] = "Vaše se adrese e-pošte ne podudaraju. Unesite istu adresu e-pošte u svako polje.";
> $text['getdirections'] = "Kliknite za upute";
914,918c1018,1022
< $text['directionsto'] = " na ";
< $text['slidestart'] = "Pokreni Pokaz Prezentacije";
< $text['livingnote'] = "Najmanje jedna živuca osoba je vezana za ovaj zapis - Detalji zadržani.";
< $text['livingphoto'] = "Najmanje jedna živuca osoba je vezana za ovaj item - detalji pridržani.";
< $text['waschristened'] = "Kršten";
---
> $text['directionsto'] = " do ";
> $text['slidestart'] = "Prezentacija slike";
> $text['livingnote'] = "Barem jedan živi ili privatni pojedinac povezan je s ovom bilješkom - Zadržani su detalji.";
> $text['livingphoto'] = "Najmanje jedan živi ili privatni pojedinac povezan je s ovom stavkom - Zadržani su detalji.";
> $text['waschristened'] = "je Kršten";
920,927c1024,1030
< $text['branches'] = "Branches";
< $text['detail'] = "Detail";
< $text['moredetail'] = "More detail";
< $text['lessdetail'] = "Less detail";
< $text['otherevents'] = "Ostali dogadaji";
< $text['conflds'] = "Confirmed (LDS)";
< $text['initlds'] = "Initiatory (LDS)";
< $text['wascremated'] = "was cremated";
---
> $text['branches'] = "Grane";
> $text['detail'] = "Detalj";
> $text['moredetail'] = "Više detalja";
> $text['lessdetail'] = "Manje detalja";
> $text['conflds'] = "Potvrđen (LDS)";
> $text['initlds'] = "Uvodni (LDS)";
> $text['wascremated'] = "je kremiran";
931,934c1034,1037
< $text['searchsite'] = "Search this site";
< $text['searchsitemenu'] = "Search Site";
< $text['kmlfile'] = "Download a .kml file to show this location in Google Earth";
< $text['download'] = "Click to download";
---
> $text['searchsite'] = "Pretražite ove web stranice";
> $text['searchsitemenu'] = "Pretraga sajta";
> $text['kmlfile'] = "Preuzmite .kml datoteku da biste prikazali ovu lokaciju u Google Earth";
> $text['download'] = "Kliknite za preuzimanje";
936,940c1039,1043
< $text['heatmap'] = "Heat Map";
< $text['refreshmap'] = "Refresh Map";
< $text['remnums'] = "Clear Numbers and Pins";
< $text['photoshistories'] = "Photos &amp; Histories";
< $text['familychart'] = "Family Chart";
---
> $text['heatmap'] = "Topline Mapa";
> $text['refreshmap'] = "Osviježite Mapu";
> $text['remnums'] = "Obrisati Brojeve i oznake";
> $text['photoshistories'] = "Fotografije &amp; Povijesti";
> $text['familychart'] = "Grafikon Obitelji";
942c1045
< $text['firstnames'] = "First Names";
---
> $text['firstnames'] = "Imena";
945,948c1048,1051
< $text['test_type'] = "Test type";
< $text['test_info'] = "Test Information";
< $text['takenby'] = "Taken by";
< $text['haplogroup'] = "Haplogroup";
---
> $text['test_type'] = "Tip Testa";
> $text['test_info'] = "Informacije o testu";
> $text['takenby'] = "Test uzet od";
> $text['haplogroup'] = "Haplogrupa";
951,954c1054,1055
< $text['relevant_links'] = "Relevant links";
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
< $text['nofirstname'] = "[no first name]";
---
> $text['relevant_links'] = "Relevantne poveznice";
> $text['nofirstname'] = "[bez imena]";
956,965c1057,1117
< $text['cookieuse'] = "Note: This site uses cookies.";
< $text['dataprotect'] = "Data Protection Policy";
< $text['viewpolicy'] = "View policy";
< $text['understand'] = "I understand";
< $text['consent'] = "I give my consent for this site to store the personal information collected here. I understand that I may ask the site owner to remove this information at any time.";
< $text['consentreq'] = "Please give your consent for this site to store personal information.";
< 
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> $text['cookieuse'] = "NAPOMENA: Ova web stranica koristi kola�iće.";
> $text['dataprotect'] = "Zaštite Podataka";
> $text['viewpolicy'] = "Pogledajte dokumenat";
> $text['understand'] = "Razumijem";
> $text['consent'] = "Dajem pristanak na ovom web mjestu za pohranjivanje ovdje prikupljenih osobnih podataka. Razumijem da mogu tražiti od vlasnika web lokacije da ukloni ove podatke u bilo kojem trenutku.";
> $text['consentreq'] = "Molimo dajte svoj pristanak za ovu web stranicu za pohranu osobnih podataka.";
> 
> //added in 12.1.0
> $text['testsarelinked'] = "DNA testovi su povezani sa";
> $text['testislinked'] = "DNA test je povezan sa";
> 
> //added in 12.2
> $text['quicklinks'] = "Brze veze";
> $text['yourname'] = "Tvoje ime";
> $text['youremail'] = "Tvoja e-pošta adresa";
> $text['liketoadd'] = "Sve podatke koje želite dodati";
> $text['webmastermsg'] = "Poruka za Webmastere";
> $text['gallery'] = "Pogledaj Galeriju";
> $text['wasborn_male'] = "je rođen";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "je rođena"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "je kršten";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "je krštena";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "je umro";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "je umrla";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "je pokopan"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "je pokopana"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "je kremiran";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "je kremirana";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "oženjen";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "udata";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "je razveden";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "je razvedena";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " na ";			// used as a preposition to the location
> $text['onthisdate'] = " na ";		// when used with full date
> $text['inthisyear'] = " u godini ";		// when used with year only or month / year dates
> $text['and'] = "i ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Informacija";
> //added in 13.0
> $text['visitor'] = "Gost";
> 
> $text['popupnote2'] = "= Novi redovnik";
> 
> //moved here in 14.0
> $text['zoomin'] = "Povećaj";
> $text['zoomout'] = "Smanji";
> $text['scrollnote'] = "Povucite ili pomi�ite se da biste vidjeli više grafikona.";
> $text['general'] = "Općenito";
> 
> //changed in 14.0
> $text['otherevents'] = "Ostali događaji i atributi";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Veze";
> $text['continue'] = "Nastavi";
> $text['title2'] = "Naslov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Czech/admintext.php TNG1403/languages/Czech/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Zadejte prosím ";
126c125
< 		$admtext['invfperms'] = "Vá¹ adresáø 'gedcom' má zøejmì ¹patná oprávnìní (zkuste 755 or 777).";
---
> 		$admtext['invfperms'] = "Va¹e slo¾ka 'gedcom' má zøejmì ¹patná oprávnìní (zkuste 755 or 777).";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Vyberte soubor k importu dat.";
> 		$admtext['addreplacedata'] = "Pøidání nebo nahrazení genealogických dat mù¾e trvat nìkolik minut v závislosti na velikosti souboru";
> 		$admtext['fromyourcomputer'] = "z va¹eho poèítaèe";
> 		$admtext['importdata'] = "Importovat data";
> 		$admtext['replace'] = "Nahradit (ve vybraném stromì)";
> 		$admtext['desttree'] = "Cílový strom";
> 		$admtext['selectdesttree'] = "Vyberte nebo zadejte cílový strom.";
> 		$admtext['selectexisting'] = "Importovat do";
> 		$admtext['ucaselast'] = "Pøevést v¹echna pøíjmení na velká písmena";
> 		$admtext['norecalc'] = "Nepøepoèítat oznaèení ®ijící";
> 		$admtext['autooffset'] = "Zaèít èíslovat ID èísla od prvního volného èísla";
> 		$admtext['mustselecttree'] = "Musíte zvolit strom pøed tím ne¾ lze vybrat tuto mo¾nost.";
> 		$admtext['onwebserver'] = "z webových stránek (ve slo¾ce GEDCOM)";
> 		$admtext['imphints'] = "Nápovìda: V¹echna aktuální data znamená v¹echny osoby, rodiny, úlo¾i¹tì a poznámky (spojení s médii se nezmìní, pokud zùstanou ID èísla stejná). Porovnání odpovídajících záznamù je v¾dy zalo¾eno pouze na èíslech ID. Nové záznamy jsou v¾dy pøidány. Pøidání importuje v¹echny záznamy s novými ID èísly.";
> 		$admtext['destbranch'] = "Cílová vìtev (nepovinná)";
> 		$admtext['importlatlong'] = "Importovat data o zemìpisné délce / ¹íøce, pokud existují";
> 		$admtext['opening'] = "Otevírám";
> 		$admtext['reopen'] = "Znovuotevírám";
> 		$admtext['uploading'] = "Nahrávám";
> 		$admtext['stop'] = "Zastavit";
> 		$admtext['stopped'] = "Import zastaven";
> 		$admtext['resume'] = "Pokraèovat";
> 		$admtext['neweronly'] = "Nahradit pouze, pokud jsou údaje novìj¹í";
> 		$admtext['oldimport'] = "Starý styl importu (bez zobrazení prùbìhu)";
> 		$admtext['importgedcom'] = "Import souboru GEDCOM (mù¾e být zazipován)";
> 		$admtext['stopbackup'] = "Stop! Dobrým nápadem mù¾e být zálohování va¹ich dat døív ne¾ budete pokraèovat.";
> 		$admtext['importmedia'] = "Importovat odkazy na média";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Ujistìte se, ¾e pøedpony a pøípony (Základní nastavení) jsou pro tento soubor správné.";
> 		$admtext['chkimpsettings'] = "Dal¹í mo¾nosti naleznete v Nastavení importu dat.";
> 		$admtext['eventsonly'] = "Importovat pouze typy vlastních událostí a atributù (nebudou vlo¾eny, nahrazeny nebo pøidány ¾ádné údaje)";
> 		$admtext['allevents'] = "Pøijmout data pro v¹echny typy vlastních událostí a atributù";
> 		$admtext['finishingimporting'] = "Dokonèeno...";
> 		$admtext['fileuploadfailed'] = "Nahrání souboru se nezdaøilo. Soubor je mo¾ná pøíli¹ velký. Zkuste k nahrání souboru do va¹í slo¾ky GEDCOM pou¾ít FTP, poté soubor vyberte a importujte odtud.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Zmìnit existující typ události";
135,138d168
< 		$admtext['entertypedesc'] = "Zadejte type/popis pro tento nový typ události.";
< 		$admtext['enterdisplay'] = "Zadejte název pro tento nový typ události.";
< 		$admtext['existingeventtypeinfo'] = "Informace o existujících typech událostí";
< 		$admtext['neweventtypeinfo'] = "Informace o nových typech událostí";
145,146d174
< 		$admtext['addnewevtype'] = "Pøidat nový typ události";
< 		$admtext['createnewevtype'] = "Vytvoøit záznam nového typu události";
149,150d176
< 		$admtext['existingevtypes'] = "Existující typy událostí";
< 		$admtext['edsevtypes'] = "Upravit, vymazat nebo seøadit existující typy událostí";
152d177
< 		$admtext['confdeleteevtype'] = "Opravdu chcete vymazat tento typ události?";
154d178
< 		$admtext['selectentertag'] = "Vyberte, prosím, nebo zadejte tag pro tento typ události.";
208d231
< 		$admtext['changestoallevtypes'] = "Zmìny ke v¹em typùm událostí";
214d236
< 		$admtext['BAPM'] = "Køest";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Opravdu chcete vymazat tento typ události? V¹echny události tohoto typu budou také smazány.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Pøidat nový typ";
> 		$admtext['createnewevtype'] = "Vytvoøit záznam typu nové události nebo atributu";
> 		$admtext['modifyeventtype'] = "Zmìnit existující typ";
> 		$admtext['entertypedesc'] = "Zadejte typ/popis pro tento typ nové události nebo atributu.";
> 		$admtext['enterdisplay'] = "Zadejte zobrazovaný øetìzec pro tento typ nové události nebo atributu.";
> 		$admtext['existingeventtypeinfo'] = "Informace o typech existujících událostí nebo atributù";
> 		$admtext['neweventtypeinfo'] = "Informace o typech nových událostí nebo atributù";
> 		$admtext['existingevtypes'] = "Typy existujících událostí nebo atributù";
> 		$admtext['edsevtypes'] = "Upravit, vymazat nebo seøadit typy existujících událostí nebo atributù";
> 		$admtext['selectentertag'] = "Vyberte, prosím, nebo zadejte tag pro tento typ události nebo atributu.";
> 		$admtext['changestoallevtypes'] = "Zmìny ke v¹em typùm událostí nebo atributù";
268d303
< 		$admtext['nobirthinfo'] = "Chybí informace o narození";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Vybrat základní obrázek"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Ulo¾it + Noví rodièe";
> 		$admtext['savenewspouse'] = "Ulo¾it + Nový partner";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alternativní narození";
354d391
< 		$admtext['enterphotodesc'] = "Zadejte prosím popis obrázku.";
388d424
< 		$admtext['photoowner'] = "Majitel/pramen";
417d452
< 		$admtext['imgmap'] = "Klikací mapa obrázku";
482c517
< 		$admtext['rectinstr'] = "Nejprve kliknìte na levý horní roh obdélníku, poté kliknìte na pravý dolní roh.";
---
> 		$admtext['rectinstr'] = "Kliknìte na levý horní roh obdélníku a potáhnìte do pravého dolního rohu.";
490d524
< 		$admtext['mapinstr3'] = "Chcete-li propojit urèitou oblast této fotografie s nìjakou osobou, vyberte nejprve strom, do kterého tato osoba patøí, a pak vytvoøte obdélník po¾adované oblasti. To provedete kliknutím do levého horního rohu oblasti a poté pøeta¾ením do pravého dolního rohu. Pøípadnì mù¾ete kliknout do levého horního rohu a poté znovu do pravého dolního rohu. Poté se objeví okno, pomocí kterého mù¾ete vybrat danou osobu. Po provedení výbìru bude kód klikací mapy pøidán do ní¾e uvedeného pole. Tento postup opakujte podle potøeby pro dal¹í oblasti obrázku.";
495d528
< 		$admtext['removelink'] = "Odstranit odkaz";
502d534
< 		$admtext['eloptions'] = "Projít nebo vymazat";
509d540
< 		$admtext['nolinks'] = "®ádné odkazy je¹tì neexistují";
523c554
< 		$admtext['colldisplay'] = "Display Title";
---
> 		$admtext['colldisplay'] = "Zobrazený nadpis";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML klikací mapa (pro zpìtnou kompatibilitu)";
> 		$admtext['photoowner'] = "Vlastník originálu";
> 		$admtext['nothumb'] = "Chybí náhled";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Polo¾ku nebylo mo¾né pøidat zøejmì proto, ¾e soubor byl pøíli¹ velký a nebylo mo¾né jej nahrát nebo pou¾ít k vytvoøení náhledu.";
> 		$admtext['moved'] = "Pøesunuto";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Zadejte prosím titul nebo popis tohoto obrázku.";
> 		$admtext['mapinstr3'] = "Chcete-li propojit urèitou oblast této fotografie s nìjakou osobou, rodinou nebo jinou entitou, nejprve vyberte pøíslu¹ný strom a typ entity a poté vytvoøte obdélník pro po¾adovanou oblast. To provedete kliknutím do levého horního rohu oblasti a následným pøeta¾ením do pravého dolního rohu. Pøípadnì mù¾ete kliknout do levého horního rohu a poté znovu do pravého dolního rohu. Vyskakovací okno vám pak pomù¾e vybrat osobu nebo jinou entitu. Proveïte výbìr a podle potøeby opakujte tento postup pro dal¹í oblasti. Kliknutím na existující oblast vyberte a poté pøeta¾ením pøesuòte nebo kliknutím na „X“ odstraòte.";
596d633
< 		$admtext['foremptystring'] = "Chcete-li zadat prázdný øetìzec, nechte toto pole prázdné a kliknìte na \"Pøidat >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Pokyny: Polo¾ky vlevo pøesunete do seznamù vpravo pøetáhnutím nebo dvojklikem na nì. Pøeta¾ením nahoru a dolù zmìníte poøadí. Opìtovným dvojklikem odstraníte.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "V pøípadì prázdného øetìzce ponechte toto pole prázdné a kliknìte na >>";
651,655d690
< 		$admtext['selectimportfile'] = "Vyberte soubor k importu dat.";
< 		$admtext['importgedcom'] = "Zvolte zdrojový soubor pro import (standardní GEDCOM 5.5 formát)";
< 		$admtext['addreplacedata'] = "Pøidání nebo nahrazení genealogických dat mù¾e trvat nìkolik minut v závislosti na velikosti souboru";
< 		$admtext['fromyourcomputer'] = "na va¹em poèítaèi";
< 		$admtext['importdata'] = "Importovat data";
657,660d691
< 		$admtext['replace'] = "Nahradit (ve vybraném stromì)";
< 		$admtext['desttree'] = "Cílový strom";
< 		$admtext['selectdesttree'] = "Vyberte nebo zadejte cílový strom.";
< 		$admtext['selectexisting'] = "Importovat do";
668,673d698
< 		$admtext['ucaselast'] = "Pøevést v¹echna pøíjmení na velká písmena";
< 		$admtext['norecalc'] = "Nepøepoèítat oznaèení ®ijící";
< 		$admtext['autooffset'] = "Zaèít èíslovat ID èísla od prvního volného èísla";
< 
< 		$admtext['mustselecttree'] = "Musíte zvolit strom pøed tím ne¾ lze vybrat tuto mo¾nost.";
< 		$admtext['importmedia'] = "Importovat média, pokud existují";
675d699
< 		$admtext['neweronly'] = "Nahradit pouze, pokud jsou údaje novìj¹í";
677,692d700
< 		$admtext['onwebserver'] = "na serveru (z adresáøe GEDCOM)";
< 		$admtext['eventsonly'] = "Importovat pouze vlastní typy událostí (nebudou vlo¾eny, nahrazeny nebo pøidány ¾ádné údaje)";
< 		$admtext['imphints'] = "Nápovìda: V¹echna aktuální data znamená v¹echny osoby, rodiny, úlo¾i¹tì a poznámky (spojení s médii se nezmìní, pokud zùstanou ID èísla stejná). Porovnání odpovídajících záznamù je v¾dy zalo¾eno pouze na èíslech ID. Nové záznamy jsou v¾dy pøidány. Pøidání importuje v¹echny záznamy s novými ID èísly.";
< 		$admtext['allevents'] = "Pøijmout data pro v¹echny vlastní typy událostí";
< 		$admtext['destbranch'] = "Cílová vìtev (nepovinná)";
< 		$admtext['inframe'] = "(v rámu)";
< 		$admtext['getstart'] = "Jak zaèít";
< 		$admtext['importlatlong'] = "Importovat data o zemìpisné délce / ¹íøce, pokud existují";
< 		$admtext['opening'] = "Otevírám";
< 		$admtext['reopen'] = "Znovuotevírám";
< 		$admtext['uploading'] = "Nahrávám";
< 		$admtext['stop'] = "Zastavit";
< 		$admtext['stopped'] = "Import zastaven";
< 		$admtext['resume'] = "Pokraèovat";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Záznam pøístupù";
694,696c702
< 		$admtext['mmgritems'] = "Instalace a odstranìní TNG módù (doplòkù tøetích stran)";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Starý styl importu (bez zobrazení prùbìhu)";
---
> 		$admtext['mmgritems'] = "Instalace a odinstalace TNG módù";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Aktualizace";
> 		$admtext['need_upgrade'] = "Aktualizaci dokonèete pomocí tìchto instrukcí";
> 		$admtext['upgrade_missing'] = "Zdá se, ¾e chybí aktualizaèní soubor, tak¾e mo¾ná ji¾ máte hotovo.";
> 		$admtext['delete_upgrade'] = "A¾ budete hotovi, kliknìte sem pro odstranìní aktualizaèního souboru a návrat do hlavní nabídky.";
723d733
< 		$admtext['author'] = "Autor";
804,809c814,819
< 		$admtext['momside'] = "Popisek matèiny strany"; //8
< 		$admtext['dadside'] = "Popisek otcovy strany"; //8
< 		$admtext['momperson'] = "ID èíslo osoby z matèiny strany"; //8
< 		$admtext['momtree'] = "ID èíslo stromu matèiny strany"; //8
< 		$admtext['dadperson'] = "ID èíslo osoby z otcovy strany"; //8
< 		$admtext['dadtree'] = "ID èíslo stromu otcovy strany"; //8
---
> 		$admtext['momside'] = "Popisek mateøské strany"; //8, 20
> 		$admtext['dadside'] = "Popisek otcovské strany"; //8, 20
> 		$admtext['momperson'] = "ID èíslo osoby z mateøské strany"; //8, 20
> 		$admtext['momtree'] = "ID èíslo stromu mateøské strany"; //8, 20
> 		$admtext['dadperson'] = "ID èíslo osoby z otcovské strany"; //8, 20
> 		$admtext['dadtree'] = "ID èíslo stromu otcovské strany"; //8, 20
836,837c846,847
< 		$admtext['featurelinks'] = "Odkazy na zajímavosti"; //9, 10
< 		$admtext['featurepara'] = "Odstavec zajímavostí"; //9, 10
---
> 		$admtext['featurelinks'] = "Odkazy na zajímavost"; //9, 10
> 		$admtext['featurepara'] = "Odstavec zajímavosti"; //9, 10
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Citáty v záhlaví";
> 		$admtext['quotesubhead'] = "Citáty v podtitulu";
> 		$admtext['sniptitle'] = "Nadpis krátkého filmu";
> 		$admtext['snipname'] = "Název krátkého filmu";
> 		$admtext['snipinfoone'] = "První øádek krátkého filmu";
> 		$admtext['snipinfotwo'] = "Druhý øádek krátkého filmu";
> 		$admtext['snipimage'] = "Obrázek krátkého filmu";
> 		$admtext['snipperson'] = "ID osoby krátkého filmu";
> 		$admtext['sniptree'] = "ID stromu krátkého filmu";
> 		$admtext['quote'] = "Citace";
> 		$admtext['link'] = "Odkaz";
> 		$admtext['featuretitle7'] = "Zajímavost 7 nadpis";
> 		$admtext['featuretitle8'] = "Zajímavost 8 nadpis";
> 		$admtext['featuretitle9'] = "Zajímavost 9 nadpis";
> 		$admtext['featurethumb9'] = "Zajímavost 9 náhled"; //15
> 		$admtext['featurelink9'] = "Zajímavost 9 odkaz"; //15
> 		$admtext['featurepara9'] = "Zajímavost 9 odstavec"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Levý obrázek záhlaví";
> 		$admtext['rightimg'] = "Pravý obrázek záhlaví";
> 		$admtext['photoption'] = "Mo¾nosti fotografie jsou<br />&nbsp;&nbsp;(static (statická) nebo random (náhodná))";
> 		$admtext['randomphotowidth'] = "©íøka náhodné fotografie";
> 		$admtext['randomphotoheight'] = "Vý¹ka náhodné fotografie";
> 		$admtext['randomphotomediatypeID'] = "Kolekce náhodných fotografií";
> 		$admtext['momheading'] = "Nadpis mateøské rodiny";
> 		$admtext['mompara'] = "Odstavec mateøské rodiny";
> 		$admtext['mompagelink'] = "Odkaz mateøské rodiny";
> 		$admtext['dadheading'] = "Nadpis otcovské rodiny";
> 		$admtext['dadpara'] = "Odstavec otcovské rodiny";
> 		$admtext['dadpagelink'] = "Odkaz otcovské rodiny";
> 		$admtext['spmomheading'] = "Nadpis mateøské rodiny partnera";
> 		$admtext['spmompara'] = "Odstavec mateøské rodiny partnera";
> 		$admtext['spmompagelink'] = "Odkaz mateøské rodiny partnera";
> 		$admtext['spmomside'] = "Popisek mateøské strany partnera";
> 		$admtext['spdadside'] = "Popisek otcovské strany partnera";
> 		$admtext['spmomperson'] = "Èíslo osoby mateøské strany partnera";
> 		$admtext['spmomtree'] = "Èíslo stromu mateøské strany partnera";
> 		$admtext['spdadheading'] = "Nadpis otcovské rodiny partnera";
> 		$admtext['spdadpara'] = "Odstavec otcovské rodiny partnera";
> 		$admtext['spdadpagelink'] = "Odkaz otcovské rodiny partnera";
> 		$admtext['spdadperson'] = "Èíslo osoby otcovské strany partnera";
> 		$admtext['spdadtree'] = "Èíslo stromu otcovské strany partnera";
> 		$admtext['storiesheading'] = "Pøíbìhy na¹í rodiny";
> 		$admtext['nbrsurnames'] = "Poèet pøíjmení<br />&nbsp;&nbsp; v mraku jmen (Surname Cloud)";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Zajímavost náhled";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Nadpis snímku";
> 		$admtext['slideimg'] = "Obrázek snímku";
> 		$admtext['slideheadline'] = "Titulek snímku";
> 		$admtext['slidetext'] = "Text snímku";
> 		$admtext['slidelink'] = "Odkaz snímku";
> 		$admtext['slidelinktext'] = "Název odkazu snímku";
> 		$admtext['featurelink'] = "Odkaz zajímavosti";
> 		$admtext['featurelinktext'] = "Název odkazu zajímavosti";
> 		$admtext['featuretitle'] = "Nadpis zajímavosti";
> 		$admtext['featuresub'] = "Podtitul zajímavosti";
> 		$admtext['quoteimg'] = "Obrázek citace";
> 		$admtext['quotelink'] = "Odkaz citace";
> 		$admtext['quotelinktext'] = "Název odkazu citace";
> 		$admtext['sidebarpara'] = "Odstavec postranní li¹ty";
> 		$admtext['sidebarlink'] = "Odkaz postranní li¹ty";
> 		$admtext['sidebarlinktext'] = "Název odkazu postranní li¹ty";
> 		$admtext['sidebarimg'] = "Obrázek postranní li¹ty";
> 		$admtext['sidebartitle'] = "Nadpis postranní li¹ty";
> 		$admtext['sidebarsub'] = "Podtitul postranní li¹ty";
> 		$admtext['snipheadline'] = "Titulek krátkého filmu";
> 		$admtext['snipsubhead'] = "Podtitul krátkého filmu";
> 		$admtext['snipimg'] = "Obrázek krátkého filmu";
> 		$admtext['sniplink'] = "Odkaz krátkého filmu";
> 		$admtext['sniplinktext'] = "Název odkazu krátkého filmu";
> 		$admtext['linktext'] = "Text odkazu";
> 		$admtext['footerheadline'] = "Titulek záhlaví";
> 		$admtext['footerpara'] = "Text záhlaví";
> 		$admtext['footerlink'] = "Odkaz záhlaví";
> 		$admtext['footerlinktext'] = "Název odkazu záhlaví";
> 		$admtext['footerheadline'] = "Titulek záhlaví";
> 		$admtext['footerpara'] = "Text záhlaví";
> 		$admtext['footerlink'] = "Odkaz záhlaví";
> 		$admtext['footerlinktext'] = "Název odkazu záhlaví";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vy¾aduje verzi 5.3 nebo vy¹¹í.)";
---
> 		$admtext['phpreq'] = "(TNG vy¾aduje verzi 7.0 nebo vy¹¹í.)";
946c1039
< 		$admtext['rootpath'] = "Koøenová slo¾ka";
---
> 		$admtext['rootpath'] = "Koøenová cesta";
1092,1093c1185,1186
< 		$admtext['admin'] = "Admin";
< 		$admtext['text_public'] = "(Veøejný)";
---
> 		$admtext['admin'] = "(Administrace)";
> 		$admtext['text_public'] = "(Veøejná oblast)";
1200c1293
< 		$admtext['subroot'] = "Konfiguraèní slo¾ka";
---
> 		$admtext['subroot'] = "Konfiguraèní cesta";
1214c1307
< 		$admtext['srexpl'] = "Nepovinné. Pou¾ijte absolutní název cesty podobnì, jako jej vidíte v koøenové slo¾ce. Pak pøesuòte následující soubory do konfiguraèního umístìní <strong>ihned</strong> po ulo¾ení a udìlejte je zapisovatelné (povolení 664): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
---
> 		$admtext['srexpl'] = "Nepovinné. Pou¾ijte absolutní název cesty podobnì, jako jej vidíte v koøenové cestì. Pak pøesuòte následující soubory do konfiguraèní cesty <strong>ihned</strong> po ulo¾ení a udìlejte je zapisovatelné (povolení 664): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1324c1410
< 		$admtext['backupnote'] = "Pozn.: Je-li va¹e databáze velmi velká, mù¾ete pro zálohu a obnovu databáze pou¾ít nìjaký nezávislý nástroj (napø. mysqldumper or phpMyAdmin). Alespoò jeden z nich byste mìli mít k dispozici na ovládacím panelu va¹ich stránek.";
---
> 		$admtext['backupnote'] = "Pozn.: Je-li va¹e databáze velmi velká, mù¾ete pro zálohu a obnovu databáze pou¾ít nìjaký nezávislý nástroj (napø. mysqldumper nebo phpMyAdmin). Alespoò jeden z nich byste mìli mít k dispozici na ovládacím panelu va¹ich stránek.";
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Zmìnit pøíchozí pøedpony tak, aby odpovídaly nastavení TNG";
> 		$admtext['sortevents'] = "Seøadit události podle";
> 		$admtext['sortbydate'] = "Data události";
> 		$admtext['sortbytype'] = "Typu události";
> 		$admtext['allowsuggest'] = "Povolit návrhy od náv¹tìvníkù";
> 		$admtext['livingchecked'] = "Nastavit oznaèení ®ijící pro nové osoby a rodiny";
> 		$admtext['maxmarried'] = "Rodina je ¾ijící, pokud je pár sezdán ménì ne¾<br/>tento poèet let";
> 		$admtext['imagetags'] = "Obdélníky";
> 		$admtext['allowcsv'] = "Povolit stahování csv u reportù";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Mo¾nosti zálohování";
> 		$admtext['dosql'] = "Exportovat jako SQL";
> 		$admtext['dodrop'] = "Vlo¾it DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Vlo¾it CREATE TABLE";
> 		$admtext['onrestore'] = "Mo¾nosti obnovení";
> 		$admtext['dodel'] = "Nejprve vymazat pøedchozí obsah";
> 		$admtext['download'] = "Sta¾ení";
> 		$admtext['altbirthtypes'] = "Alternativní události narození";
> 		$admtext['dtformat'] = "Formát tabulek";
> 		$admtext['conchart'] = "Schéma spojení";
> 		$admtext['maxropt'] = "Maximální poèet spu¹tìní vyhledávání spojení";
> 		$admtext['maxlopt'] = "Maximální délka cest spojení";
> 		$admtext['showtxtopt'] = "Zobrazit textový pøíkaz cesty";
> 		$admtext['compactboxopt'] = "Zobrazit rámeèky osob v kompaktní podobì";
> 		$admtext['sortbyopt'] = "Seøadit cesty podle";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Maximální poèet man¾elství ve spojení";
> 		$admtext['saveincfg'] = "Ulo¾it v konfiguraèní cestì (viz Základní nastavení)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Geokódování nelze provést";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Negeokódovat";
1436d1549
< 		$admtext['backtosecondary'] = "Zpìt na druhotné procesy";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Zpìt na Nástroje po importu";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Vylouèit poznámky";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zazipovat a vlo¾it mediální soubory";
> 		$admtext['downloadzip'] = "Sta¾ení ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Zobrazit pouze u¾ivatele se zakázaným pøístupem";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Povolit zobrazení neveøejných poznámek";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Poslat také administrátorùm, je-li vybrán jeden strom";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "V¹echny modifikace";
> 		$admtext['installedmods'] = "Pouze nainstalované mody";
> 		$admtext['partinstmods'] = "Nainstalované + èásteènì nainstalované mody";
> 		$admtext['showanalyzeractions'] = "Zobrazit akce v Analyzeru módù";
> 		$admtext['badchar'] = "Neplatný znak";
1886d2008
< 		$admtext['test_number'] = "Èíslo testu";
1903c2025
< 		$admtext['separate'] = "hodnoty oddìlit èárkou";
---
> 		$admtext['separate'] = "Hodnoty oddìlte èárkou";
1917,1918c2039,2049
< 		$admtext['mdaID'] = "Èíslo nejvzdálenìj¹ího pøedka";
< 		$admtext['mrcaID'] = "Èíslo nejvzdálenìj¹ího spoleèného pøedka";
---
> 		$admtext['mdaID'] = "Nejvzdálenìj¹í pøedek";
> 		$admtext['mrcaID'] = "Nejbli¾¹í spoleèný pøedek";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Èíslo testu";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Ponechat test neveøejný";
> 		$admtext['multivalues'] = "U rozsahu hodnot pou¾ijte pomlèku";
> 		$admtext['changestogroup'] = "Zmìny ve skupinì DNA";
> 		$admtext['modifydnagroup'] = "Upravit existující skupinu DNA";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Spojit tento test DNA s osobou";
1965d2095
< $admtext['otherevents'] = "Dal¹í události";
2050,2051d2179
< $admtext['savereturn'] = "Vrátit na tuto stránku";
< $admtext['saveback'] = "Vrátit na menu";
2058,2059d2185
< $admtext['secondary'] = "Druhotné procesy";
< $admtext['commas'] = "Oddìlit jednotlivé polo¾ky èárkou";
2129,2130d2254
< $admtext['secondarymaint'] = "Druhotné procesy";
< $admtext['customeventtypes'] = "Vlastní typy událostí";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Typ";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Pøíjmení";
> $admtext['subhead'] = "Podtitul";
> $admtext['image'] = "Obrázek";
> $admtext['author'] = "Autor";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Jak zaèít";
> $admtext['showlog'] = "Záznam pøístupù";
> $admtext['nobirthinfo'] = "Chybí informace o narození";
> //changed in 13.0
> $admtext['savereturn'] = "Ulo¾it + Zùstat";
> $admtext['saveback'] = "Ulo¾it + Konec";
> //added in 13.0
> $admtext['allitemsdeleted'] = "V¹echny polo¾ky byly úspì¹nì smazány.";
> $admtext['private'] = "Neveøejné";
> $admtext['imgtags'] = "Klikací mapa";
> 
> $admtext['removelink'] = "Odstranit odkaz";
> $admtext['eloptions'] = "Projít nebo vymazat";
> $admtext['pleaseenter'] = "Zadejte prosím ";
> 
> $admtext['nolinks'] = "®ádné odkazy je¹tì neexistují";
> $admtext['nogeocode'] = "Geokódování nelze provést";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Vybrat základní obrázek"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Typy událostí / atributù";
> $admtext['secondary'] = "Nástroje po importu";
> $admtext['otherevents'] = "Dal¹í události / atributy";
> //added in 14.0
> $admtext['newlinks'] = "Odkazy vytvoøeny";
> $admtext['newcemlinks'] = "Odkazy na høbitov vytvoøeny";
> $admtext['utility'] = "Nástroj";
> $admtext['linktype'] = "Typ";
> $admtext['move'] = "Pøesunout";
> $admtext['copy'] = "Kopírovat";
> $admtext['title2'] = "Titul"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Czech/albums_help.php TNG1403/languages/Czech/albums_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/alltext.php TNG1403/languages/Czech/alltext.php
6,9c6,9
< $dates['FEB'] = "Únor";
< $dates['FEBRUARY'] = "Únor";
< $dates['MAR'] = "Bøezen";
< $dates['MARCH'] = "Bøezen";
---
> $dates['FEB'] = "Únor";
> $dates['FEBRUARY'] = "Únor";
> $dates['MAR'] = "Bøezen";
> $dates['MARCH'] = "Bøezen";
12,16c12,16
< $dates['MAY'] = "Kvìten";
< $dates['JUN'] = "Èerven";
< $dates['JUNE'] = "Èerven";
< $dates['JUL'] = "Èervenec";
< $dates['JULY'] = "Èervenec";
---
> $dates['MAY'] = "Kvìten";
> $dates['JUN'] = "Èerven";
> $dates['JUNE'] = "Èerven";
> $dates['JUL'] = "Èervenec";
> $dates['JULY'] = "Èervenec";
19,22c19,22
< $dates['SEP'] = "Záøí";
< $dates['SEPTEMBER'] = "Záøí";
< $dates['OCT'] = "Øíjen";
< $dates['OCTOBER'] = "Øíjen";
---
> $dates['SEP'] = "Záøí";
> $dates['SEPTEMBER'] = "Záøí";
> $dates['OCT'] = "Øíjen";
> $dates['OCTOBER'] = "Øíjen";
28,30c28,30
< $dates['ABOUT'] = "Pøibli¾nì";
< $dates['BEF'] = "pøed";
< $dates['BEFORE'] = "pøed";
---
> $dates['ABOUT'] = "Pøibli¾nì";
> $dates['BEF'] = "pøed";
> $dates['BEFORE'] = "pøed";
38c38
< $dates['Y'] = "Ano, datum neznámé";
---
> $dates['Y'] = "Ano, datum neznámé";
43,44c43,44
< $text['cannotexecutequery'] = "Dotaz nelze provést";
< $text['to'] = "a¾";
---
> $text['cannotexecutequery'] = "Dotaz nelze provést";
> $text['to'] = "a¾";
46,59c46,59
< $text['text_next'] = "Dal¹í";
< $text['text_prev'] = "Pøedchozí";
< $text['clickdisplay'] = "Kliknìte pro zobrazení";
< $text['clickhide'] = "Kliknìte pro skrytí";
< $text['forgot1'] = "<strong>Zapomnìli jste va¹e u¾ivatelské jméno nebo heslo?</strong><br />Zapi¹te dolù svoji emailovou adresu, abychom vám mohli zaslat va¹e u¾ivatelské jméno.";
< $text['forgot2'] = "Zapi¹te vá¹ email nahoru a va¹e u¾ivatelské jméno dolù, aby mohlo být znovu nastaveno heslo (doèasné heslo vám bude zasláno).";
< $text['newpass'] = "Va¹e nové doèasné heslo";
< $text['usersent'] = "Va¹e u¾ivatelské jméno vám bylo zasláno na va¹i emailovou adresu.";
< $text['pwdsent'] = "Va¹e doèasné heslo vám bylo zasláno na va¹i emailovou adresu.";
< $text['loginnotsent2'] = "Emailová adresa, kterou jste zapsali, neodpovídá ¾ádnému u¾ivatelskému úètu. ®ádné údaje vám nebyly zaslány.";
< $text['loginnotsent3'] = "Emailová adresa a u¾ivatelské jméno, které jste zapsali, neodpovídá ¾ádnému u¾ivatelskému úètu. ®ádné údaje vám nebyly zaslány.";
< $text['logininfo'] = "Va¹e pøihla¹ovací údaje";
< $text['collapseall'] = "Sbalit v¹e";
< $text['expandall'] = "Rozbalit v¹e";
---
> $text['text_next'] = "Dal¹í";
> $text['text_prev'] = "Pøedchozí";
> $text['clickdisplay'] = "Kliknìte pro zobrazení";
> $text['clickhide'] = "Kliknìte pro skrytí";
> $text['forgot1'] = "<strong>Zapomnìli jste va¹e u¾ivatelské jméno nebo heslo?</strong><br />Zapi¹te dolù svoji emailovou adresu, abychom vám mohli zaslat va¹e u¾ivatelské jméno.";
> $text['forgot2'] = "Zapi¹te vá¹ email nahoru a va¹e u¾ivatelské jméno dolù, aby mohlo být znovu nastaveno heslo (doèasné heslo vám bude zasláno).";
> $text['newpass'] = "Va¹e nové doèasné heslo";
> $text['usersent'] = "Va¹e u¾ivatelské jméno vám bylo zasláno na va¹i emailovou adresu.";
> $text['pwdsent'] = "Va¹e doèasné heslo vám bylo zasláno na va¹i emailovou adresu.";
> $text['loginnotsent2'] = "Emailová adresa, kterou jste zapsali, neodpovídá ¾ádnému u¾ivatelskému úètu. ®ádné údaje vám nebyly zaslány.";
> $text['loginnotsent3'] = "Emailová adresa a u¾ivatelské jméno, které jste zapsali, neodpovídá ¾ádnému u¾ivatelskému úètu. ®ádné údaje vám nebyly zaslány.";
> $text['logininfo'] = "Va¹e pøihla¹ovací údaje";
> $text['collapseall'] = "Sbalit v¹e";
> $text['expandall'] = "Rozbalit v¹e";
64,66c64,66
< $text['headstones'] = "Náhrobky";
< $text['histories'] = "Vyprávìní";
< $text['recordings'] = "Zvukové záznamy";
---
> $text['headstones'] = "Náhrobky";
> $text['histories'] = "Vyprávìní";
> $text['recordings'] = "Zvukové záznamy";
70c70
< $admtext['placelevel'] = "Úroveò sídla";
---
> $admtext['placelevel'] = "Úroveò sídla";
72,73c72,73
< $admtext['level2'] = "Místo";
< $admtext['level3'] = "Mìsto";
---
> $admtext['level2'] = "Místo";
> $admtext['level3'] = "Mìsto";
76c76
< $admtext['level6'] = "Zemì";
---
> $admtext['level6'] = "Zemì";
79,82c79,82
< $text['male'] = "Mu¾";
< $text['female'] = "®ena";
< $text['closewindow'] = "Zavøít okno";
< $text['loading'] = "Nahrávám...";
---
> $text['male'] = "Mu¾";
> $text['female'] = "®ena";
> $text['closewindow'] = "Zavøít okno";
> $text['loading'] = "Nahrávám...";
85,86c85,86
< $text['none'] = "®ádný";
< $text['mainton'] = "Re¾im údr¾by je zapnut";
---
> $text['none'] = "®ádný";
> $text['mainton'] = "Re¾im údr¾by je zapnut";
88,93c88,92
< //moved here in 8.0.0
< $text['living'] = "®ijící";
< $admtext['text_private'] = "Neveøejné";
< $admtext['confunlink'] = "Jste si jisti, ¾e chcete odpojit tuto osobu jako partnera z této rodiny?";
< $admtext['confunlinkc'] = "Jste si jisti, ¾e chcete odpojit tuto osobu jako dítì z této rodiny?";
< $admtext['confremchild'] = "Jste si jisti, ¾e chcete odstranit toto dítì z této rodiny? Tato osoba nebude smazána z databáze.";
---
> $text['living'] = "®ijící";
> $admtext['text_private'] = "Neveøejné";
> $admtext['confunlink'] = "Jste si jisti, ¾e chcete odpojit tuto osobu jako partnera z této rodiny?";
> $admtext['confunlinkc'] = "Jste si jisti, ¾e chcete odpojit tuto osobu jako dítì z této rodiny?";
> $admtext['confremchild'] = "Jste si jisti, ¾e chcete odstranit toto dítì z této rodiny? Tato osoba nebude smazána z databáze.";
97,103c96,102
< $admtext['BIRT'] = "Narození";
< $admtext['DEAT'] = "Úmrtí";
< $admtext['CHR'] = "Køest";
< $admtext['BURI'] = "Pohøeb";
< $admtext['BAPL'] = "Køest (CJKSpd)";
< $admtext['ENDL'] = "Obdarování (CJKSpd)";
< $admtext['NICK'] = "Pøezdívka";
---
> $admtext['BIRT'] = "Narození";
> $admtext['DEAT'] = "Úmrtí";
> $admtext['CHR'] = "Køest";
> $admtext['BURI'] = "Pohøeb";
> $admtext['BAPL'] = "Køest (CJKSpd)";
> $admtext['ENDL'] = "Obdarování (CJKSpd)";
> $admtext['NICK'] = "Pøezdívka";
106,116c105,113
< $admtext['NAME'] = "Jméno";
< $admtext['SLGC'] = "Peèetìní s rodièi (CJKSpd)";
< $admtext['MARR'] = "Sòatek";
< $admtext['SLGS'] = "Peèetìní s partnerem (CJKSpd)";
< $admtext['hello'] = "Dobrý den";
< $admtext['activated'] = "Vá¹ u¾ivatelský úèet byl aktivován.";
< $admtext['infois'] = "Údaje pro pøihlá¹ení jsou";
< $admtext['subjectline'] = "Vá¹ u¾ivatelský úèet byl aktivován.";
< 
< //moved here in 8.1.0
< $admtext['adopted'] = "adoptován";
---
> $admtext['NAME'] = "Jméno";
> $admtext['SLGC'] = "Peèetìní s rodièi (CJKSpd)";
> $admtext['MARR'] = "Sòatek";
> $admtext['SLGS'] = "Peèetìní s partnerem (CJKSpd)";
> $admtext['hello'] = "Dobrý den";
> $admtext['activated'] = "Vá¹ u¾ivatelský úèet byl aktivován.";
> $admtext['infois'] = "Údaje pro pøihlá¹ení jsou";
> $admtext['subjectline'] = "Vá¹ u¾ivatelský úèet byl aktivován.";
> $admtext['adopted'] = "adoptován";
118,121c115,117
< $admtext['foster'] = "vzat do opatrování";
< $admtext['sealing'] = "peèetìn";
< //added in 11.0.3
< $admtext['putative'] = "domnìlý";
---
> $admtext['foster'] = "vzat do opatrování";
> $admtext['sealing'] = "peèetìn";
> $admtext['putative'] = "domnìlý";
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
129,134c122,127
< $text['sunday'] = "Nedìle";  //first day of week on calendar
< $text['monday'] = "Pondìlí";
< $text['tuesday'] = "Úterý";
< $text['wednesday'] = "Støeda";
< $text['thursday'] = "Ètvrtek";
< $text['friday'] = "Pátek";
---
> $text['sunday'] = "Nedìle";  //first day of week on calendar
> $text['monday'] = "Pondìlí";
> $text['tuesday'] = "Úterý";
> $text['wednesday'] = "Støeda";
> $text['thursday'] = "Ètvrtek";
> $text['friday'] = "Pátek";
137c130
< $text['startswith'] = "zaèíná na";
---
> $text['startswith'] = "zaèíná na";
139d131
< //moved here in 9.0.4
141,145c133,135
< 
< //moved here in 10.0.0
< $text['startingind'] = "Výchozí osoba";
< $text['enteremail'] = "Zadejte, prosím, platnou emailovou adresu.";
< $text['page'] = "Stránka";
---
> $text['startingind'] = "Výchozí osoba";
> $text['enteremail'] = "Zadejte, prosím, platnou emailovou adresu.";
> $text['page'] = "Stránka";
148,156c138,142
< 
< //added in 10.0.0
< $admtext['CONL'] = "Biømování (CJKSpd)";
< $admtext['INIT'] = "Zasvìcení (CJKSpd)";
< $admtext['step'] = "Nevlastní dítì";
< $text['switchm'] = "Pøepnout na mobilní verzi";
< $text['switchs'] = "Pøepnout na standardní verzi";
< 
< //added in 11.0.0
---
> $admtext['CONL'] = "Biømování (CJKSpd)";
> $admtext['INIT'] = "Zasvìcení (CJKSpd)";
> $admtext['step'] = "Nevlastní dítì";
> $text['switchm'] = "Pøepnout na mobilní verzi";
> $text['switchs'] = "Pøepnout na standardní verzi";
158,159c144
< $admtext['preflang'] = "Preferovaný jazyk";
< $text['problem'] = "V programu TNG se objevila chyba. Pøíèinou mù¾e být chyba v nastavení, nedokonèená aktualizace nebo programová chyba. Pokud jste majitelem stránek, mù¾ete kontaktovat podporu TNG s ¾ádostí o pomoc pøi øe¹ení tohoto problému. Zkopírujte, prosím, dotaz uvedený ní¾e a vlo¾te jej do va¹í zprávy.";
---
> $admtext['preflang'] = "Preferovaný jazyk";
161c146
< $text['fanchart'] = "Vìjíøový graf";
---
> $text['fanchart'] = "Vìjíøový graf";
163d147
< //moved here in 12.0.0
166c150
< $admtext['allbranches'] = "V¹echny vìtve";
---
> $admtext['allbranches'] = "V¹echny vìtve";
169,175c153,157
< $admtext['selectall'] = "Vybrat v¹e";
< $admtext['clearall'] = "Vyèistit v¹e";
< $admtext['medialinks'] = "Odkazy na médium";
< 
< //added here in 12.0.0
< $text['testgroup'] = "Testovací skupina";
< $text['test_number'] = "Èíslo/název testu";
---
> $admtext['selectall'] = "Vybrat v¹e";
> $admtext['clearall'] = "Vyèistit v¹e";
> $admtext['medialinks'] = "Odkazy na médium";
> 
> $text['testgroup'] = "Testovací skupina";
178,184c160,166
< $text['predicted'] = "Pøedpovìzeno";
< $admtext['ancestral_surnames'] = "Rodová pøíjmení";
< $admtext['admin_notes'] = "Poznámky administrátora";
< $admtext['mda'] = "Nejvzdálenìj¹í pøedek";
< $admtext['mrca'] = "Nejbli¾¹í spoleèný pøedek";
< $admtext['marker_values'] = "Hodnoty markerù";
< $admtext['ref_seq'] = "Referenèní sekvence";
---
> $text['predicted'] = "Pøedpovìzeno";
> $admtext['ancestral_surnames'] = "Rodová pøíjmení";
> $admtext['admin_notes'] = "Poznámky administrátora";
> $admtext['mda'] = "Nejvzdálenìj¹í pøedek";
> $admtext['mrca'] = "Nejbli¾¹í spoleèný pøedek";
> $admtext['marker_values'] = "Hodnoty markerù";
> $admtext['ref_seq'] = "Referenèní sekvence";
186,192c168,174
< $admtext['rcrs'] = "rCRS (revidovaná Cambrid¾ská referenèní sekvence)";
< $admtext['hvr_values'] = "Rozdíly HVR";
< $admtext['hvr1_values'] = "Rozdíly HVR1";
< $admtext['hvr2_values'] = "Rozdíly HVR2";
< $admtext['coding_reg'] = "Rozdíly kódující oblasti";
< $text['keep_name_private'] = "Dr¾et jméno jako neveøejné";
< $text['test_results'] = "Výsledky testu";
---
> $admtext['rcrs'] = "rCRS (revised Cambridge Reference Sequence)";
> $admtext['hvr_values'] = "Rozdíly HVR";
> $admtext['hvr1_values'] = "Rozdíly HVR1";
> $admtext['hvr2_values'] = "Rozdíly HVR2";
> $admtext['coding_reg'] = "Rozdíly kódující oblasti";
> $text['keep_name_private'] = "Ponechat jméno neveøejné";
> $text['test_results'] = "Výsledky testu";
195c177
< $admtext['markers'] = "Poèet STR markerù";
---
> $admtext['markers'] = "Poèet STR markerù";
197,199c179,181
< $admtext['termsnp'] = "Terminální SNP";
< $admtext['signsnp'] = "Signifikantní SNP";
< $admtext['atdna_test'] = "atDNA (autozomální)";
---
> $admtext['termsnp'] = "Terminální SNP";
> $admtext['signsnp'] = "Signifikantní SNP";
> $admtext['atdna_test'] = "atDNA (autozomální)";
201c183
< $admtext['mtdna_test'] = "mtDNA (mitochondriální)";
---
> $admtext['mtdna_test'] = "mtDNA (mitochondriální)";
202a185,252
> $admtext['xtra_mut'] = "Zvlá¹tní mutace";
> $text['test_number'] = "Èíslo/název";
> $admtext['match_date'] = "Datum shody";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Haploskupina Y-DNA";
> $admtext['mtdna_haplogroup'] = "Haploskupina mtDNA";
> $admtext['relationship_section'] = "Sekce pøíbuzenských vztahù";
> $admtext['relationship_range'] = "Rozsah pøíbuzenských vztahù";
> $admtext['suggested_relationship'] = "Navrhované";
> $admtext['actual_relationship'] = "Aktuální pøíbuzenské vztahy";
> $admtext['related_side'] = "Související vìtev";
> $admtext['shared_dna'] = "Sdílená DNA";
> $admtext['shared centimorgans'] = "Celkovì sdílené cM";
> $admtext['shared_segments'] = "Sdílené segmenty";
> $admtext['largest_segment'] = "Nejvìt¹í segment";
> $admtext['chromosome'] = "Chromozóm è.";
> $admtext['segment_start'] = "Zaèátek segmentu";
> $admtext['segment_end'] = "Konec segmentu";
> $admtext['centiMorgans'] = "centiMorgany";
> $admtext['matchingSNPs'] = "Poèet shodných SNP";
> $admtext['xmatch'] = "X-shoda";
> $text['keep_test_private'] = "Neveøejný test";
> $text['shared_dna'] = "Sdílený segment DNA";
> $text['for_match'] = "pro tuto shodu";
> $admtext['keeptest'] = "Ochrana testu";
> $admtext['keepname'] = "Ochrana jména";
> $admtext['allgroups'] = "V¹echny skupiny";
> $admtext['alltypes'] = "V¹echny typy";
> $admtext['generation_num'] = "Generace pro rodová pøíjmení";
> 
> $text['birthabbr'] = "nar.";
> $text['chrabbr'] = "kø.";
> $text['deathabbr'] = "zemø.";  //from descend
> $text['burialabbr'] = "pohø.";  //from descend
> $text['marrabbr'] = "sò.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Najít v¹echny osoby s událostmi v tomto místì";
> $text['firstpage'] = "První stránka";
> $text['lastpage'] = "Poslední stránka";
> 
> //changed in 13.0.0
> $text['problem'] = "V softwaru TNG do¹lo k chybì. Co dìlat:<p>Pokud jste právì nainstalovali upgrade, mo¾ná jste pøeskoèili èást instalaèních pokynù. Vra»te se na stránku readme a znovu si pøeètìte pokyny. Vìnujte zvlá¹tní pozornost kroku týkajícím se struktury databáze.</p><p>Pokud jste nainstalovali TNG poprvé, bude zøejmì nutné vytvoøit databázové tabulky. Vra»te se na stránku readme.html a vyhledejte tento krok.</p><p>Pokud jste vlastníkem webu, mù¾ete kontaktovat podporu TNG pro dal¹í pomoc s tímto problémem. Zkopírujte prosím dotaz ní¾e a vlo¾te jej do své zprávy.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "®ádná vìtev";
> 
> //added in 14.0
> $text['oneyear'] = "rok";
> $text['pwdcodelink'] = "Po kliknutí na tento odkaz vám bude zasláno doèasné heslo";
> $text['pwdcodesent'] = "Na va¹i emailovou adresu byl odeslán odkaz pro obnovení hesla.";
> $text['moved'] = "Pøesunuto";
> $text['citation'] = "Citace";
> $text['other'] = "Jiné";
> $text['death'] = "Úmrtí";
> $text['burial'] = "Pohøeb";
> $text['cremation'] = "Kremace";
> $text['marriage'] = "Sòatek";
> $text['divorce'] = "Rozvod";
> $text['bylength'] = "Kroky";
> $text['bymarriages'] = "Man¾elství";
> $text['none'] = "®ádný";
> 
> //moved here in 14.0
> $text['family'] = "Rodina";
> $text['source'] = "Pramen";
> $text['repository'] = "Úlo¾i¹tì";
> $text['place'] = "Místo";
> $admtext['BAPM'] = "Køest";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Zvlá¹tní mutace";
---
> $text['glang'] = "cs";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Czech/assoc_help.php TNG1403/languages/Czech/assoc_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30a27,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>   
diff -r TNG/languages/Czech/backuprestore_help.php TNG1403/languages/Czech/backuprestore_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
33c34,35
< 		<p>Tyto funkce pou¾ívejte pro zabezpeèení va¹ich dat a pro udr¾ení rychlej¹ího bìhu va¹ich stránek.</p>
---
> 		<p>Pomocí tìchto funkcí zabezpeèíte svá data a svoje stránky udr¾íte rychlé. Pamatujte, ¾e pokud zálohy ukládáte do soukromé slo¾ky,
>       mo¾nost Stáhnout zde nebude k dispozici. V takovém pøípadì budete muset ke sta¾ení va¹ich zálo¾ních souborù pou¾ít FTP program nebo online správce souborù.</p>
39a42,56
>      
> 		<p class="optionhead">Mo¾nosti zálohování
> 			<ul>
> 				<li><b>Exportovat jako SQL:</b> Zálo¾ní soubor dat se vytvoøí ve formátu SQL. Výhodou je, ¾e zálohu lze pak obnovit do jiné databáze MySQL bez pøítomnosti TNG.</li>
> 				<li><b>Vlo¾it CREATE TABLE:</b> Pokud zálo¾ní soubor obsahuje pøíkaz "CREATE TABLE", operace obnovy se pokusí o vytvoøení tabulky pøed obnovením dat.</li>
> 				<li><b>Vlo¾it DROP TABLE IF EXISTS:</b> Lze pou¾ít pouze v pøípadì, ¾e je vlo¾en také pøíkaz CREATE TABLE. Jsou-li oba pøíkazy pøítomny, operace obnovy, která najde 
>         existující tabulku se stejným názvem ji nejprve odstraní a poté znovu vytvoøí.</li>
> 			</ul>
> 		</p>
> 		<p class="optionhead">Mo¾nosti obnovení
> 			<ul>
> 				<li><b>Nejprve vymazat pøedchozí obsah:</b> I kdy¾ nebylo vybráno vlo¾ení pøíkazu DROP TABLE, tato volba zajistí, ¾e stávající obsah obnovované tabulky bude pøed 
>         pokraèováním obnovy odstranìn. Pokud stávající data nejsou pøed obnovením odstranìna, mù¾e dojít k duplicitním záznamùm.</li>
> 			</ul>
> 		</p>     
84c101,102
< 		<p>Chcete-li zálohovat strukturu va¹ich TNG tabulek, kliknìte v této sekci na ikonu Zálohovat. Pokud byla operace úspì¹ná, stránka bude znovu zobrazena s èervenou zprávou nahoøe.
---
> 		<p>Chcete-li zálohovat strukturu va¹ich TNG tabulek, kliknìte v této sekci na ikonu Zálohovat. Od TNG 14 bude tato záloha v¾dy vytvoøena jako soubor .SQL. 
>     Pokud byla operace úspì¹ná, stránka se znovu zobrazí s èervenou zprávou v horní èásti s podrobnostmi o provedené akci.
diff -r TNG/languages/Czech/branches_help.php TNG1403/languages/Czech/branches_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
19c15
< 			<a href="eventtypes_help.php" class="lightlink">Nápovìda: Vlastní typy událostí &raquo;</a>
---
> 			<a href="eventtypes_help.php" class="lightlink">Nápovìda: Typy událostí / atributù&raquo;</a>
33,34c29,35
< 
< 		<a name="what"><p class="subheadbold">Co je to vìtev?</p></a>>
---
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>     
> 		<a name="what"><p class="subheadbold">Co je to vìtev?</p></a>
114,115c115,117
< 		<p>Zvolte, zda chcete pøidat nové znaèky nebo vymazat existující. Pokud chcete vymazat existující znaèky, musíte také zvolit, zda má tato akce vymazat znaèky vìtve u v¹ech èlenù 
<     va¹eho stromu nebo vymazat pouze znaèky, které odpovídají vybraným kritériím.</p>
---
> 		<p>Zvolte, zda chcete pøidat nové znaèky, vyèistit stávající znaèky nebo vymazat osoby s vybraným oznaèením vìtve. Pokud chcete vyèistit znaèky nebo vymazat osoby, 
>     pak také zvolte, zda se tato akce bude týkat celého stromu ("V¹e") nebo jen záznamù, které odpovídají vybraným kritériím ("Èásteèné").
>     DÙLE®ITÉ: Pokud zvolíte "Vymazat", budou vymazány také osoby, nejen znaèky vìtví! Neexistuje ¾ádná mo¾nost akci "Vrátit zpìt", tak¾e byste mìli pøed zahájením vytvoøit zálohu tabulek.</p>
diff -r TNG/languages/Czech/cemeteries_help.php TNG1403/languages/Czech/cemeteries_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/citations_help.php TNG1403/languages/Czech/citations_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
29a26,30
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
81a83,86
> 		<span class="optionhead">Události</span>
> 		<p>Událost (události), ke které bude tato citace pøipojena. Chcete-li vybrat více událostí, pou¾ijte Shift+ nebo Ctrl/cmd+ kliknutí. Pokud je vybráno více událostí, 
>     bude pro ka¾dou událost vytvoøena kopie nové citace. Pokud není vybrána ¾ádná událost, bude citace pøipojena k osobì obecnì.</p>
> 
diff -r TNG/languages/Czech/collections_help.php TNG1403/languages/Czech/collections_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
29a26,30
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
80,81c81,83
<     umístìny na va¹em domácím poèítaèi. Jinými slovy, v pøípadì, ¾e soubory v poèítaèi se nachází ve slo¾ce "C:\Genealogie\Soubory", to je to, co byste sem mìli zadat. 
<     TNG pak oddìlí tuto èást z ka¾dého pøíchozího názvu cesty a ponechá pouze název souboru nebo název dal¹í podslo¾ky.
---
>     umístìny na va¹em domácím poèítaèi. Jinými slovy, v pøípadì, ¾e soubory v poèítaèi se nachází ve slo¾ce "C:\Genealogie\Soubory", to je to, co byste sem mìli zadat.</p>
>      
>     <p>TNG pak oddìlí tuto èást z ka¾dého pøíchozího názvu cesty a ponechá pouze název souboru nebo název dal¹í podslo¾ky.
87a90,91
>     <p>TNG také pou¾ije lokální umístìní k naplnìní lokálního umístìní pøi exportu, vyberete-li Exportovat odkazy na média.</p>
>    
diff -r TNG/languages/Czech/config_help.php TNG1403/languages/Czech/config_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
32a29
> 			<a href="#pref" class="lightlink">Pøedpony</a> &nbsp; | &nbsp;      
34d30
< 			<a href="#pref" class="lightlink">Prefixes</a> &nbsp; | &nbsp;      
41c37,42
< 
---
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>     
44,45c45,46
< 		<span class="optionhead">Hostitel databáze, název, u¾ivatelské jméno, heslo</span>
< 		<p>Tyto údaje pou¾ije TNG a PHP k pøipojení k va¹í databázi. Tyto pole musí být vyplnìny døív, ne¾ bude va¹e databáze 
---
> 		<span class="optionhead">Hostitel databáze, název, u¾ivatelské jméno, heslo, port a socket</span>
> 		<p>Tyto údaje pou¾ije TNG a PHP k pøipojení k va¹í databázi. Kromì portu a socketu (málo pou¾ívané), musí být tato pole vyplnìna døív, ne¾ bude va¹e databáze 
49c50
< 		webového hostingu. Název hostitel mù¾e také obsahovat èíslo portu nebo cestu do soketu (socket path), napø. "localhost:3306" nebo "localhost:/path/to/socket". 
---
> 		webového hostingu. Název hostitel mù¾e také obsahovat èíslo portu nebo cestu do socketu (socket path), napø. "localhost:3306" nebo "localhost:/path/to/socket".
99c100
< 		<span class="optionhead">Slo¾ky Fotografie / Dokumenty / Vyprávìní / Náhrobky / Multimédia / GENDEX / Zálohy / Módy / Extensions</span>
---
> 		<span class="optionhead">Slo¾ky Fotografie / Dokumenty / Vyprávìní / Náhrobky / Multimédia / Módy / Extensions / GENDEX / Záloha</span>
102c103,104
< 		zvukové záznamy). Tyto slo¾ky mohou být vytvoøeny z této obrazovky kliknutím na tlaèítka "Vytvoøit slo¾ku".</p>
---
> 		zvukové záznamy). Názvy tìchto slo¾ek lze zmìnit zadáním nových názvù a kliknutím na odpovídající tlaèítka "Pøejmenovat". A¾ budete s touto stránkou hotovi, nezapomeòte kliknout na "Ulo¾it".</p>
> 		<p>Pozn.: Políèko pod názvem slo¾ky zálohy za¹krtnìte, chcete-li, aby byla slo¾ka záloh ulo¾ena v umístìní konfiguraèní cesty (viz vý¹e). Skuteènou slo¾ku musíte pøesunout do konfiguraèního umístìní sami mimo TNG.</p>    
114c116
< 		soubory TNG. Musí to být relativní odkaz ("index.php" nebo "../otherhomepage.html"), nikoli absolutní odkaz ("http://yoursite.com").</p>
---
> 		soubory TNG. Musí to být relativní odkaz ("index.php" nebo "../otherhomepage.html"), nikoli absolutní odkaz ("https://yoursite.com").</p>
117c119
< 		<p>Webová adresa va¹í genealogické slo¾ky (napø. "http://mysite.com/genealogy").</p>
---
> 		<p>Webová adresa va¹í genealogické slo¾ky (napø. "https://mysite.com/genealogy").</p>
140a143,145
>     
> 		<span class="optionhead">Volitelná zpráva zápatí</span>
> 		<p>Zpráva nebo fragment kódu HTML, který se zobrazí ve spodní èásti ka¾dé stránky.</p>    
143,145c148,150
< 		<p>Soubor, který urèuje styl zálo¾ek zobrazených na vìt¹inì veøejných stránek. Výchozí styl (tngtabs1.css) pou¾ívá "¹ikmé" zálo¾ky, ale
< 		TNG dodává také alternativní styl s "hranatými" zálo¾kami (tngtabs2.css). Chcete-li zobrazit zálo¾ky v tomto stylu, zapi¹te do tohoto pole "tngtabs2.css"
< 		a kliknìte na "Ulo¾it" ve spodní èásti stránek, a poté zkuste vyhledat nìjakou osobu ve veøejném prostøedí. Výchozí styl (tngtabs1.css) vyu¾ívá dva obrázky, "tngtab.png" (neaktivní
---
> 		<p>Soubor, který urèuje styl zálo¾ek zobrazených na vìt¹inì veøejných stránek. Výchozí styl (tngtabs2.css) pou¾ívá jemnì zaoblené zálo¾ky, ale
> 		TNG dodává také alternativní styl se ¹ikmými zálo¾kami (tngtabs1.css). Chcete-li zobrazit zálo¾ky v tomto stylu, zapi¹te do tohoto pole "tngtabs1.css"
> 		a kliknìte na "Ulo¾it" ve spodní èásti stránek, a poté zkuste vyhledat nìjakou osobu ve veøejném prostøedí. Styl (tngtabs1.css) vyu¾ívá dva obrázky, "tngtab.png" (neaktivní
148c153
< 		tngtab.png nebo tngtabactive.png. <a href="http://lythgoes.net/genealogy/switchcolor.php">http://lythgoes.net/genealogy/switchcolor.php</a></p>
---
> 		tngtab.png nebo tngtabactive.png. <a href="https://lythgoes.net/genealogy/switchcolor.php">https://lythgoes.net/genealogy/switchcolor.php</a></p>
165,168c170,173
<     
<     <span class="optionhead">Skrýt v¹echny stránky a údaje k DNA</span>
< 		<p>Pokud nebudete pou¾ívat programové funkce, které souvisí s DNA, a chtìli byste je odstranit ze v¹ech stránek veøejné èásti TNG, nastavte tuto volbu na Ano. Testy DNA ji¾ nebudou pøístupné 
<     z veøejných menu ani nebudou zobrazeny na stránkách jednotlivých osob.</p>
---
> 
> 		<span class="optionhead">Alternativní události narození</span>
> 		<p>Výchozí alternativní události narození jsou køest (CHR) a køest (BAPM), ale mù¾ete to zmìnit zde pøidáním nebo nahrazením vlastních tagù GEDCOM. 
>     U¾ivatelé, kteøí provádìjí zmìny v datech, pak budou moci vybrat pøíslu¹nou událost z tohoto seznamu.</p>
211,214d215
< 		<span class="optionhead">Sloupcù v zobrazení náhledù</span>
< 		<p>Pøi prohlí¾ení v¹ech souborù v zobrazení náhledù budou tyto náhledy zobrazeny v jednom øádku. Pokud jich existuje víc,
< 		budou dal¹í øádky zobrazeny a¾ do poètu øádku odpovídajícímu "Maximálnímu poètu výsledkù hledání".</p>
< 
254,256c255,259
< 		<p>"Favicon" je malá ikona zobrazená v adresním øádku prohlí¾eèe nalevo od adresy URL stránky. TNG neobsahuje nástroj, který vám pomù¾e takovou ikonu vytvoøit, ale pokud
<       nìjakou máte k dispozici a chcete ji pou¾ít, nahrajte ji do hlavní slo¾ky TNG a název souboru zadejte zde.</p>
<    
---
> 		<p>"Favicon" je malá ikona zobrazená v adresním øádku prohlí¾eèe, hned nalevo od adresy URL webu. TNG obsahuje výchozí ikony pro veøejnou 
>     i administrátorskou èást programu. TNG neobsahuje nástroj, který by vám pomohl vytvoøit tyto ikony, ale pokud 
>     nìjakou ikony máte (nebo samostatné pro veøejné i pro správce), nahrajte je do slo¾ek img/public a/nebo img/admin a zadejte název souboru zde 
>     v nastavení. V¹imnìte si, ¾e pokud máte samostatné ikony pro veøejnost a správce, budete jim muset dát stejný název.</p>
>       
274a278,280
>     
>  		<span class="optionhead">Vypnout výrazy pøíbuzenských vztahù</span>
> 		<p>Toto nastavení skryje písemné vysvìtlení pøíbuzenského vztahu v dolní èásti tabulky pøíbuzenských vztahù. To mù¾e být u¾iteèné, pokud formulace vysvìtlení nedává v pøíslu¹ném jazyce v¾dy smysl.</p>
314,317c320,341
<     <span class="optionhead">Kolik let po smrti nechat osobu jako neveøejnou</span>
< 		<p>Pou¾ívá se ve spojení s nástrojem "Vytvoøit neveøejné" v sekci Administrace/Import-Export/Druhotné procesy. Tento nástroj oznaèí jako "neveøejné" v¹echny osoby, 
<     které zemøely v období krat¹ím ne¾ je zde zadaný poèet let. Rodiny, ve kterých jsou tyto osoby jako man¾elé, jsou také oznaèeny jako "neveøejné".</p>
< 
---
> 		<span class="optionhead">Zobrazit zprávu o povolení cookies</span>
> 		<p>Náv¹tìvníkùm stránek se zobrazí v pravém dolním rohu obrazovky malé vyskakovací okno a upozorní je, ¾e web pou¾ívá cookies.
>     Jakmile náv¹tìvník klikne na tlaèítko "Rozumím", zpráva zmizí a soubor cookie bude nastaven na zapamatování akce. 
>     Dokud tento soubor cookie pøetrvává, náv¹tìvníkovi se pøi následných náv¹tìvách vyskakovací okno ji¾ znovu nezobrazí.</p>
> 
> 		<span class="optionhead">Zobrazit odkaz na zásady ochrany dat</span>
> 		<p>Náv¹tìvníkùm stránek se zobrazí v zápatí v dolní èásti ka¾dé stránky odkaz na zásady ochrany dat na webu.
>     Odkaz se také zobrazí ve vyskakovacím oknì týkajícím se souborù cookie (viz vý¹e) a na stránkách, kde je náv¹tìvník po¾ádán, aby dal souhlas s ulo¾ením osobních
>     údajù (registrace nového úètu, navrhnout/kontaktujte nás). Kopie tìchto zásad lze nalézt ve vìt¹inì jazykových slo¾ek.
>     Tento dokument se nazývá data_protection_policy.php. Pokud náv¹tìvník pou¾ívá jazyk, který neobsahuje pøeklad tìchto zásad, bude mu zobrazena anglická verze.</p>
> 
> 		<span class="optionhead">®ádost o souhlas ohlednì osobních údajù</span>
> 		<p>Pøed odesláním pøipomínek, návrhù nebo registrace nového u¾ivatele budou náv¹tìvníci stránek vyzváni, aby za¹krtli políèko, ve kterém uvedou
>     souhlas s ulo¾ením údajù ve formuláøi, který vyplnili. Není-li políèko za¹krtnuto, tlaèítko pro odeslání bude neaktivní. Pokud
>     pøesto dojde ke kliknutí na toto tlaèítko, vyskakovací okno upozorní náv¹tìvníka, ¾e musí pøed odesláním formuláøe za¹krtnouo políèko souhlasu.</p>
> 
> 		<span class="optionhead">Nastavit oznaèení ®ijící pro nové osoby a rodiny</span>
> 		<p>Je-li tato mo¾nost zapnutá, v¹echny nové osoby a rodiny budou oznaèeny jako ®ijící. U ka¾dé osoby nebo rodiny mù¾ete toto oznaèení zru¹it.</p>
> 
> 		<span class="optionhead">Povolit stahování csv u reportù</span>
> 		<p>Kdy¾ u¾ivatelé spou¹tìjí va¹e reporty, umo¾níte jim stáhnout soubor s výsledky oddìlený èárkami (csv soubor). Takové soubory èasto usnadòují import informací do tabulky.</p>
>       
425a450,461
> 		<a name="pref"><p class="subheadbold">Pøedpony a pøípony</p></a>
> 
>     <p>Tato písmena ve spojení s èíslicí tvoøí identifikaèní èísla (ID èísla) osob, rodin, pramenù, úlo¾i¹» a poznámek ve va¹í databázi. Vìt¹ina genealogických
>     programù pou¾ívá stejnou sadu standardních pøedpon (a ¾ádné pøípony). Pokud vá¹ desktopový program pou¾ívá pøípony nebo jiné pøedpony, mù¾ete je zadat zde.
>     Nejsou-li zadány správné pøedpony nebo pøípony, nìkteré funkce TNG nebudou pracovat správnì.</p>
> 
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Top</a></p>
429,431d464
< 
< 		<span class="optionhead">Název mobilních stránek</span>
< 		<p>je-li tato volba nastavena na <strong>v li¹tì mobilního menu</strong>, název stránek bude zobrazen v li¹tì mobilního menu.<br />Výchozí nastavení je zobrazení názvu stránek <strong>pod li¹tou mobilního menu</strong>.</p>
459,463c492
< 		<a name="pref"><p class="subheadbold">Pøedpony a pøípony</p></a>
< 
<     <p>Tato písmena ve spojení s èíslicí tvoøí identifikaèní èísla (ID èísla) osob, rodin, pramenù, úlo¾i¹» a poznámek ve va¹í databázi. Vìt¹ina genealogických
<     programù pou¾ívá stejnou sadu standardních pøedpon (a ¾ádné pøípony). Pokud vá¹ desktopový program pou¾ívá pøípony nebo jiné pøedpony, mù¾ete je zadat zde.
<     Nejsou-li zadány správné pøedpony nebo pøípony, nìkteré funkce TNG nebudou pracovat správnì.</p>
---
> 		<a name="misc"><p class="subheadbold">Testy DNA</p></a>
464a494,508
> 		<span class="optionhead">Skrýt v¹echny stránky a údaje k DNA</span>
> 		<p>Pokud nebudete pou¾ívat ¾ádnou z funkcí souvisejících s DNA a chtìli byste ji odstranit ze v¹ech veøejných stránek, nastavte tuto mo¾nost na Ano. Testy DNA ji¾ nebudou pøístupné z veøejných nabídek, 
>     ani se nebudou zobrazovat na individuální stránce ¾ádné osoby.</p>
> 		<span class="optionhead">Maximální poèet výsledkù hledání</span>
>     <p>Maximální poèet výsledkù hledání v sekci Testy DNA øídí poèet výsledkù DNA, které lze zobrazit nezávisle na výsledcích vyhledávání TNG pro dotazy z testù procházení DNA.</p><p><strong>Pozn.:</strong> Pokud nemù¾ete vybrat test DNA, který chcete porovnat, proto¾e je na jiné stránce, zvy¹te tento limit, aby se v¹echny testy DNA, které chcete porovnat, zobrazily na stejné stránce.</p>
> 		<span class="optionhead">Zobrazit poèet testù DNA veøejnì</span>
> 		<p>Tato volba umo¾òuje skrýt nebo zobrazit poèet testù DNA na veøejných stránkách testù DNA.</p>
> 		<span class="optionhead">Rodová pøíjmení vyplnit automaticky</span>
> 		<p>Tato volba automaticky pøidá rodová pøíjmení do va¹ich otcovských a mateøských pøímých linií po ulo¾ení testu DNA. Mo¾ná budete chtít omezit poèet generací, kterých se to má týkat.</p>
>  		<span class="optionhead">Rodová pøíjmení velkými písmeny </span>
> 		<p>Tato volba pou¾ívá v¹echna velká písmena pro rodová pøíjmení, pokud je nastaveno automatické vyplòování pøíjmení pøedkù na Ano. Výchozí nastavení je Ne a pøíjmení jsou tedy zobrazena tak, jak jsou zapsána.</p>
> 		<span class="optionhead">Generace pro rodová pøíjmení</span> 
> 		<p>Urèuje, kolik generací zpìt se má vyhledat pøi pou¾ití mo¾nosti automatického vyplòování rodových pøíjmení.</p>
> 		<span class="optionhead">Vylouèit z rodových pøíjmení</span>
> 		<p>Urèuje, která pøíjmení nezahrnout pøi pou¾ití mo¾nosti automatického vyplòování rodových pøíjmení.</p>
562a607,609
>     
>     <span class="optionhead">Pou¾ívám TNG offline</span>
> 		<p>Je-li vybráno "Ano", TNG pou¾ije lokální verze namísto on-line verzí knihoven tøetích stran (napø. JQuery) a nebude se pokou¹et o pøístup ke Google mapám.</p>
diff -r TNG/languages/Czech/data_help.php TNG1403/languages/Czech/data_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
19c15
< 			<a href="second_help.php" class="lightlink">Nápovìda: Druhotné procesy &raquo;</a>
---
> 			<a href="second_help.php" class="lightlink">Nápovìda: Nástroje po importu &raquo;</a>
28,29c24,30
< <tr class="databack">
< 	<td class="tngshadow">
---
> <tr>
> 	<td class="tngshadow databack">
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
34c35
< 		<p><span class="optionhead">Pøed importem:</span> Z va¹eho genealogického programu vytvoøte standardní soubor GEDCOM 5.5 (4.0 je také akceptovatelný). Neveøejné informace u ¾ijících osob
---
> 		<p><span class="optionhead">Pøed importem:</span> Z va¹eho genealogického programu vytvoøte standardní soubor GEDCOM (preferovaný je 5.5 nebo 7.0., ale 4.0 je také akceptovatelný). Neveøejné informace u ¾ijících osob
39c40
< 		<p><span class="optionhead">[Import souboru GEDCOM] Z va¹eho poèítaèe</span>
---
> 		<p><span class="optionhead">Import souboru GEDCOM z va¹eho poèítaèe</span>
41,43c42,43
< 		<strong>POZN.</strong>: Pokud je vá¹ soubor GEDCOM pøíli¹ velký (> 2MB), budete muset pøed nahráním va¹eho souboru tímto zpùsobem kontaktovat poskytovatele svého hostingu, proto¾e server mù¾e mít omezení maximální
< 		velikosti pro nahrávání souborù prostøednictvím webového formuláøe. Pokud bìhem importu obdr¾íte chybové hlá¹ení, jedná se o tento pøípad. Zkuste místo toho pou¾ít k nakopírování svého souboru do slo¾ky GEDCOM program FTP,
<     a pak jej naimportujte odtud (viz ní¾e).</p>
---
> 		<strong>POZN.</strong>: Pokud je vá¹ soubor GEDCOM velký (> 2MB), mù¾ete jej nejprve zkusit "zazipovat" (TNG soubor po nahrání automaticky rozbalí). Je-li výsledný soubor stále velký, budete muset pøed nahráním va¹eho souboru tímto zpùsobem kontaktovat poskytovatele svého hostingu, proto¾e server mù¾e mít omezení maximální
> 		velikosti pro nahrávání souborù prostøednictvím webového formuláøe. Pokud bìhem importu obdr¾íte chybové hlá¹ení, jedná se o tento pøípad. Zkuste místo toho pou¾ít k nakopírování svého souboru do slo¾ky GEDCOM program FTP, a pak jej naimportujte odtud (viz ní¾e).</p>
45,46c45,46
< 		<span class="optionhead">OR [Import souboru GEDCOM] Z webových stránek (ve slo¾ce GEDCOM)</span>
< 		<p>Pokud jste pro pøenos souboru do slo¾ky GEDCOM na va¹ich stránkách pou¾ili FTP nebo nìjaký online souborový mana¾er, zapi¹te sem pøesný název va¹eho souboru, který chcete nahrát nebo kliknìte na
---
> 		<span class="optionhead">NEBO Import souboru GEDCOM z webových stránek (ve slo¾ce GEDCOM)</span>
> 		<p>Pokud jste pro pøenos souboru GEDCOM nebo ZIP do slo¾ky GEDCOM na va¹ich stránkách pou¾ili FTP nebo nìjaký online souborový mana¾er, zapi¹te sem pøesný název va¹eho souboru, který chcete nahrát nebo kliknìte na
50,54c50
< 		<span class="optionhead">Pøijmout data pro v¹echny vlastní typy událostí</span>
< 		<p>Vá¹ soubor GEDCOM mù¾e obsahovat události, které bude TNG pova¾ovat za "vlastní" události. Normálnì jsou vlastní typy událostí, které soubor GEDCOM obsahuje, vlo¾eny do databáze, ale
< 		ale je nastaveno, aby data byla ignorována. Stav vlastních typù událostí mù¾ete zmìnit na "pøijmout", aby události tohoto typu byly naimportovány (jinými slovy,
< 		abyste nemuseli vá¹ soubor importovat dvakrát). Pokud tuto volbu za¹krtnete, TNG automaticky nastaví v¹echny nové vlastní typy událostí na "pøijmout" a v¹echny va¹e události
< 		budou importovány napoprvé.</p>
---
> 		<p>Pozn.: Pokud nahrajete/importujete soubor ZIP a vlo¾íte do souboru aktuální média, TNG rozbalí média do pøíslu¹ných slo¾ek médií (napø. "photos" nebo podslo¾ka "photos"). Dal¹í mo¾nosti týkající se vlo¾ených médií naleznete v èásti Administrace/Nastavení/Nastavení importu dat.</p>
56,58c52,60
< 		<span class="optionhead">Importovat pouze vlastní typy událostí (nebudou vlo¾eny, nahrazeny nebo pøidány ¾ádné údaje)</span>
< 		<p>Za¹krtnutí této volby zpùsobí, ¾e budou naimportovány pouze vlastní typy událostí (viz Admin/Vlastní typy událostí). V¹echny dal¹í údaje budou ignorovány. To je ideální mo¾nost
< 		jak sestavit va¹e výchozího nastavení, proto¾e vám umo¾ní vidìt, které vlastní události vás soubor GEDCOM obsahuje. Mù¾ete poté zvolit, které události
---
> 		<span class="optionhead">Pøijmout data pro v¹echny typy vlastních událostí</span>
> 		<p>Vá¹ soubor GEDCOM mù¾e obsahovat události, které bude TNG pova¾ovat za nestandardní události. Normálnì jsou typy nových událostí a atributù, které soubor GEDCOM obsahuje, vlo¾eny do databáze, ale
> 		ale je nastaveno, aby tato data byla ignorována. Aby bylo mo¾né importovat události nebo atributy tohoto typu, musíte zmìnit stav takového typu na "Pøijmout" (jinými slovy,
> 		abyste nemuseli vá¹ soubor importovat dvakrát). Pokud tuto volbu za¹krtnete, TNG automaticky nastaví v¹echny typy nových událostí a atributù na "Pøijmout" a v¹echny va¹e události
> 		budou importovány napoprvé.</p>
>     
> 		<span class="optionhead">Importovat pouze typy vlastních událostí a atributù (nebudou vlo¾eny, nahrazeny nebo pøidány ¾ádné údaje)</span>
> 		<p>Za¹krtnutí této volby zpùsobí, ¾e budou naimportovány pouze typy vlastních událostí a atributù (viz Administrace/Typy událostí / atributù). V¹echny dal¹í údaje budou ignorovány. To je ideální mo¾nost
> 		jak sestavit va¹e výchozí nastavení, proto¾e vám umo¾ní vidìt, které vlastní události vás soubor GEDCOM obsahuje. Poté mù¾ete zvolit, které události
124,125c126,127
< <tr class="databack">
< 	<td class="tngshadow">
---
> <tr>
> 	<td class="tngshadow databack">
141a144,147
> 		<span class="optionhead">Zazipovat a vlo¾it mediální soubory</span>
> 		<p>Pokud za¹krtnete mo¾nost Exportovat odkazy na média, dostáváte také mo¾nost za¹krtnout mo¾nost zazipovat hotový soubor a zahrnout fyzické mediální 
>     soubory uvedené v souboru GEDCOM. Vezmìte na vìdomí, ¾e to mù¾e zpùsobit, ¾e vá¹ soubor bude extrémnì velký.</p>
> 
153a160,164
>     
> 		<span class="optionhead">Souhrn</span>
> 		<p>Po dokonèení exportu byste mìli vidìt souhrn toho, kolik osob, rodin, pramenù, poznámek, úlo¾i¹», médií a míst bylo exportováno. Je tøeba 
>     poznamenat, ¾e do celkového poètu míst budou zapoèítána pouze místa, která mají informace o zemìpisné ¹íøce/délce nebo poznámky.</p>
>         
diff -r TNG/languages/Czech/data_protection_policy.php TNG1403/languages/Czech/data_protection_policy.php
44c44
< o svých osobních údajích nás mù¾ete <a href="suggest.php">kdykoli kontaktovat</a>.</p>
\ No newline at end of file
---
> o svých osobních údajích nás mù¾ete <a href="suggest.php">kdykoli kontaktovat</a>.</p>  
\ No newline at end of file
diff -r TNG/languages/Czech/dna_help.php TNG1403/languages/Czech/dna_help.php
21a22,25
> 			<a href="#ydna" class="lightlink">Pole Y-DNA</a> &nbsp; | &nbsp;
> 			<a href="#mtdna" class="lightlink">Pole mtDNA</a> &nbsp; | &nbsp;
> 			<a href="#atdna" class="lightlink">Pole atDNA</a> &nbsp; | &nbsp;
> 			<a href="#common" class="lightlink">Spoleèná pole</a> &nbsp; | &nbsp;      
27a32,36
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
47a57
> 		<p>Pole mohou zùstat prázdné a nebudou ve vìt¹inì pøípadù zobrazeny.</p>
52,53c62,63
< 		<span class="optionhead">Èíslo testu</span>
< 		<p>Zapi¹te ID èíslo spojené s tímto testem. Pokud nemù¾ete èíslo najít nebo vám jej dodavatel nedal, nebojte se vytvoøit èíslo nové.</p>
---
> 		<span class="optionhead">Èíslo testu/název</span>
> 		<p>Zapi¹te ID èíslo spojené s tímto testem. Pokud nemù¾ete èíslo najít nebo vám jej dodavatel nedal, nebojte se vytvoøit èíslo nové. <br /><strong>V¹imnìte si, </strong>¾e pokud nezadáte hodnotu do pole Èíslo testu/název, nebudete mít k dispozici rychlý odkaz pro úpravu dat DNA z obrazovky prohlí¾ení DNA, jako je browse_dna_tests.php.</p>
57a68,79
> 		<span class="optionhead">Datum testu</span>
> 		<p>Toto je datum, kdy byl test DNA proveden.</p>
> 
> 		<span class="optionhead">Datum shody</span>
> 		<p>Toto je datum, kdy byla zji¹tìna shoda va¹eho testu s osobou, které byl test DNA proveden.</p>
> 
> 		<span class="optionhead">GEDmatch ID</span>
> 		<p>Èíslo ID tohoto testu na webu GEDmatch. Platí pouze pro testy atDNA.</p>
> 
> 		<span class="optionhead">Ponechat test neveøejný</span>
> 		<p>Pokud zadáte do pole Ponechat test neveøejný Ano, zobrazení testu bude omezeno pouze na pøihlá¹ené u¾ivatele, kteøí mají pøístupová práva nastavená na <strong>Povolit neveøejné</strong>. To umo¾ní omezit pøístup k testùm DNA, které jste oznaèili jako Ponechat test neveøejný. Test bude viditelný pro administrátora TNG.</p>
> 
61,62c83,84
< 		<span class="optionhead">Dr¾et jméno jako neveøejné</span>
< 		<p>Pokud je za¹krtnuto toto políèko, jméno uvedené jako "testovaná osoba" se bude zobrazovat jako osoba "Neveøejná".</p>
---
> 		<span class="optionhead">Ponechat jméno neveøejné</span>
> 		<p>Pokud je za¹krtnuto toto políèko, jméno uvedené jako "testovaná osoba" se bude zobrazovat jako "Neveøejné". Jméno bude viditelné pro administrátora TNG.</p>
67,68c89,90
< 		<span class="optionhead">DNA Group</span>
< 		<p>Skupiny DNA se pou¾ívají ke spojení rùzných testù DNA dohromady.  Mù¾ete napøíklad vytvoøit skupinu pro va¹i otcovskou linii a dal¹í skupinu pro va¹i mateøskou linii.  Dal¹í pøíbuzní, kteøí si nechali provést test Y-DNA nebo mtDNA, mohou být spojeni se skupinami, které jste definovali.  Skupiny DNA jsou jen zpùsob, jak spojit více testù dohromady.  Propojení testù se skupinou je nepovinné.  Skupina DNA mù¾e být u¾iteèná ve studiích týkajících se unikátního pøíjmení, kde by stejné pøíjmení mohlo být v rùzných skupinách DNA.</p>
---
> 		<span class="optionhead">Skupiny DNA</span>
>     <p>Skupiny DNA se pou¾ívají k výbìru nebo filtrování testù DNA nebo typù testù v seznamu. Mù¾ete napøíklad vytvoøit skupinu pro va¹i otcovskou linii a dal¹í skupinu pro mateøskou linii. Skupiny DNA jsou jen zpùsob, jak filtrovat seznam testù. Propojení testù se skupinou je nepovinné. Pov¹imnìte si, ¾e skupiny DNA jsou nyní spojeny s typem testu a pro dva rùzné typy testù nemù¾ete pou¾ít stejný název skupiny DNA.</p>
70,72c92,96
< 		<span class="optionhead">Poèet markerù</span>
<       <p>Genetický marker je gen nebo sekvence DNA se známým umístìním na chromozomu, který mù¾e být pou¾it k identifikaci jednotlivce. Testy DNA se mohou li¹it podle poètu markerù, které se testují.
<       <br />Typické testy Y-DNA mohou být provedeny na 20, 37, 44, 67, 91, 101 nebo 111 markerù.</p>
---
> 		<span class="optionhead">Haploskupina</span>
> 		<p>Haploskupina je genetická populace lidí, kteøí sdílejí spoleèného pøedka v otcovské nebo mateøské linii. Haploskupiny jsou oznaèeny písmeny abecedy (A-T) a jejich upøesnìní (SNP) obsahuje dal¹í kombinace èíslic a písmen. K dispozici jsou dvì samostatná vstupní pole, proto¾e nìkteré testovací spoleènosti poskytují u testù atDNA obì odhadované haploskupiny nebo si testovaná osoba mù¾e nechat zhotovit test mtDNA i Y-DNA.</p>
> 		<p>Pole <strong>Haploskupina mtDNA</strong> je urèeno pro matrilineální haploskupinu, která je bì¾nì výsledkem testu mtDNA.</p>
> 		<p>Pole <strong>Haploskupina Y-DNA</strong> je urèeno pro patrilineální haploskupinu, která je bì¾nì výsledkem testu Y-DNA.</p>
> 		<p>Nìkteré testovací spoleènosti poskytují ve svých testech atDNA haploskupiny mtDNA a Y-DNA. Family Tree DNA toto poskytuje, pokud byly provedeny odpovídající testy mtDNA a Y-DNA. Ostatní testovací spoleènosti pøedpovídají, jaké haploskupiny mohou být.</p>
73a98,111
>     <p>Za¹krtávací políèko Potvrzeno slou¾í k oznaèení, ¾e test poskytl potvrzenou haploskupinu na rozdíl od pøedpokládané. Proto¾e haploskupina se skládá z podobných haplotypù, je mo¾né pøedpovìdìt haploskupinu z haplotypu. Pro potvrzení pøedpovìdi haploskupiny je vy¾adován test SNP. Ne v¹echny testovací spoleènosti nabízejí test SNP, proto jejich pøedpovìdi haploskupiny zákazníka jsou nìkdy nepøesné.</p>
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Nahoru</a></p>
> 		<a name="ydna"><p class="subheadbold">Pole výsledkù testù Y-DNA</p></a>
> 			
>     <p>Otcovskou linii daného mu¾e lze stopovat prostøednictvím DNA obsa¾ené v jeho chromozómu Y (Y-DNA). Test Y-DNA spoèívá v analýze segmentù DNA chromozómu Y (pøítomném pouze u mu¾ù), zvaných krátká tandemová repetice (STR z anglického Short Tandem Repeat). Testované segmenty jsou oznaèovány jako markery a nacházejí se v nekódující èásti DNA. STR vyjadøují zmìnu poètu opakování daného segmentu DNA.</p>
>     
> 		<p><strong>Poèet markerù</strong></p>
> 		<p>Genetický marker je gen nebo sekvence DNA se známým umístìním na chromozomu, který mù¾e být pou¾it k identifikaci jednotlivce. Testy DNA se mohou li¹it podle poètu markerù, které se testují.<br />Typické testy Y-DNA mohou být provedeny na 12, 25, 37, 44, 67, 91, 101 nebo 111 markerù.<br />Vzhledem k tomu, ¾e Family Tree DNA je v souèasné dobì jediným dodavatelem nabízejícím testy Y-DNA, je ve porovnávacím reportu Y-DNA pou¾ito 12, 25, 37, 67 a 111 markerù.</p>
>     
75c113,114
< 		  <p>Zadejte hodnoty va¹eho Y-DNA markeru oddìlené èárkou.<br />Napøíklad: "13,24,14,10,11-14,12,12,12,13,14,30,17,9-10,11,11,24,15,19,30,15-15-16-17".</p>
---
> 		<p>Zadejte hodnoty va¹eho Y-DNA markeru oddìlené èárkou. Napøíklad: "13,24,14,10,11-14,12,12,12,13,14,30,17,9-10,11,11,24,15,19,30,15-15-16-17" (bez uvozovek).<br />nebo s mezerami za èárkou pro lep¹í èitelnost, "13, 24, 14, 10, 11-14, 12, 12, 12, 13, 14, 30, 17, 9-10, 11, 11, 24, 15, 19, 30,1 5-15-16-17" (bez uvozovek).</p>    
>     <p>V¹imnìte si, ¾e Y-DNA markery, které mají rozsah hodnot, musí být zadány pomocí pomlèky mezi hodnotami, proto¾e rozsah hodnot mù¾e být promìnný</p>
77,84c116,124
< 		<span class="optionhead">Haploskupina</span>
<       <p>Haploskupina je genetická populace lidí, kteøí sdílejí spoleèného pøedka v otcovské nebo mateøské linii. 
<       Haploskupiny jsou oznaèeny písmeny abecedy (A-T) a jejich upøesnìní (SNP) dále obsahuje èíslice a malá písmena abecedy.</p>
<       <p>K SNP (jednonukleotidový polymorfismus) dojde, kdy¾ se v prùbìhu procesu tvorby bunìk zmìní jedno místo v sekvenci genomu a tato mutace v potomstvu pøetrvá.</p>
<       <p>Nìkteré SNP znaky jsou oznaèovány také jako tzv. UEP (Unique Event Polymorphism) tzn. ¾e tyto zmìny/variace jsou v daném øetìzci DNA unikátní tj. dojde k nim pouze 
<       jednou a víckrát ji¾ ne. Díky tomu lze ka¾dou linii a» ji¾ otcovskou èi mateøskou pøiøadit k urèité haploskupinì.</p> 
< 
< 		<p>Za¹krtávací políèko pro potvrzení se pou¾ívá k oznaèení, ¾e test poskytuje potvrzenou haploskupinu na rozdíl od pøedpokládané. Proto¾e se haploskupina skládá z podobných haplotypù, je mo¾né haplotyp pøedpovìdìt z haplotypu. Pro potvrzení pøedpovìdi haploskupiny je nutný test SNP. Ne v¹echny testovací spoleènosti nabízejí testování SNP, a proto jsou pøedpovìdi haploskupin jejich zákazníkù nìkdy nepøesné.</p>
---
> 		<strong>SNP</strong>
> 		<p>SNP (jednonukleotidový polymorfismus) se vyskytne, kdy¾ se v prùbìhu procesu tvorby bunìk zmìní jedno místo v sekvenci genomu a tato mutace v potomstvu pøetrvá. Osoba má mnoho zdìdìných SNP, které spoleènì tvoøí pro daného jedince unikátní (UEP) vzor DNA.</p>
>        <p>V genetické genealogii je unikátní polymorfismus (UEP) genetickým markerem, který odpovídá mutaci, která se pravdìpodobnì vyskytuje tak zøídka, ¾e se pøedpokládá, ¾e je naprosto pravdìpodobné, ¾e v¹ichni jedinci, kteøí sdílejí tento marker po celém svìtì, ji dìdí od shodného spoleèného pøedka a shodné události jednotlivé mutace.</p>
> 
> 		<p><strong>Signifikantní SNPs</strong></p>
> 		<p>Tyto SNP mohou klinicky souviset, souviset s americkými indiány, apod.</p>
> 
> 		<p><strong>Terminální SNP</strong></p>
>     <p>Terminální SNP je definovaný SNP poslední (koncové) vìtve haploskupiny rozpoznané aktuálním výzkumem. Mìl by být jedineèný a konstantní v èase. Nìkdy se "terminální SNP" pou¾ívá k oznaèení SNP, pro které byl èlovìk naposledy testován.</p>
86,87c126,129
< 		<span class="optionhead">Rozdíly HVR1/HVR2/kódování oblastí, zvlá¹tní mutace</span>
< 		<p>Zadejte výsledky svého testu mtDNA oddìlené èárkou.<br />Napøíklad: "A16129G,T16187C,C16189T,T16223C,G16230A,T16278C,C16311T,C16519T".<br />V souèasné dobì neexistuje program, který porovnává hodnoty HVR1, HVR2 a kódování oblastí, jako je porovnání Y-DNA markerù</p>
---
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
89,90c131,154
< 		<span class="optionhead">Signifikantní SNP</span>
<     <p>Tyto znaky SNP mohou být zpøíznìny klinicky, zpøíznìny s americkými indiány, apod.</p>
---
> 		<p style="float:right"><a href="#top">Nahoru</a></p>
> 		<a name="mtdna"><p class="subheadbold">Pole výsledkù testù mtDNA</p></a>
> 		
> 		<p>Mateøskou linii pøedkù lze stopovat pomocí <span class="optionhead">mitochondriální DNA (mtDNA)</span>. Dle souèasných konvencí je mtDNA rozdìlena do tøí oblastí. Tìmi jsou kódující oblast a dvì hypervariabilní oblasti (HVR1 a HVR2)
>     
>     <ul>
> 		<li><strong>HVR1</strong>, ve které jsou nukleotidy èíslovány v rozsahu od 16001 do 16569. </li>
> 		<li><strong>HVR2</strong>, ve které jsou nukleotidy èíslovány v rozsahu od 00001 do 00574. </li>
> 		<li><strong>Kódující oblast (CR)</strong> je èást va¹í mtDNA, ve které jsou nukleotidy èíslovány v rozsahu od 00575 do 16000.</li></ul></p>
> 		<p>Více informací o mtDNA lze najít napø. na stránkách <a href="https://www.familytreedna.com/learn/mtdna-testing/parts-mitochondrial-dna-mtdna-hvr1-hvr2-coding-region/" target="_blank">The Family Tree DNA Learning Center</a></p>
> 
> 		<p><strong>Referenèní sekvence</strong></p>
>     <p> V polích výsledkù testu mtDNA mù¾ete vybrat jednu ze dvou referenèních sekvencí. Family Tree DNA poskytuje obì sekvence, tak¾e je tøeba zvolit, jakou verzi výsledkù zadáte do vstupních polí.
> 		<ul><li><strong>RSRS</strong> - Reconstructed Sapiens Reference Sequence je referenèní sekvence mitochondriální DNA (mtDNA), který vyu¾ívá jak globální vzorkování moderních lidských vzorkù, tak vzorkù starých hominidù. Byla pøedstavena poèátkem roku 2012 jako náhrada za rCRS (revised Cambridge Reference Sequence).  RSRS zachovává stejný systém èíslování jako CRS, ale zastupuje dìdièný genom mitochondriální Evy, ze kterého pocházejí v¹echny souèasnì známé lidské mitochondrie.</li>
> 		
> 		<li><strong>rCRS</strong> - Revised Cambridge Reference Sequence pro lidskou mitochondriální DNA byla pøedstavena v roce 1981 a vedla k zahájení projektu lidského genomu.</li></ul> </p>
> 			
> 		<p><span class="optionhead">Rozdíly HVR1/HVR2/Kódující oblast, Zvlá¹tní mutace</span></p>
> 		<p>Zadejte výsledky svého testu mtDNA oddìlené èárkou.<br />Napøíklad: "A16129G,T16187C,C16189T,T16223C,G16230A,T16278C,C16311T,C16519T".<br />Výsledek mù¾ete také zadat s mezerami za èárkou pro lep¹í èitelnost, napøíklad "A16129G, T16187C, C16189T, T16223C, G16230A, T16278C, C16311T, C16519T" (bez uvozovek)</p>
>     
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
92,93c156,198
< 		<span class="optionhead">Terminální SNP</span>
<     <p>Terminální SNP je definovaný SNP poslední (koncové) vìtve haploskupiny rozpoznané aktuálním výzkumem. Mìl by být jedineèný (UEP) a konstantní v èase.</p>
---
> 		<p style="float:right"><a href="#top">Nahoru</a></p>
> 		<a name="atdna"><p class="subheadbold">Pole výsledkù testù atDNA</p></a>
> 
> 		<p><span class="optionhead">Autozomální DNA (atDNA) </span> testuje va¹e autozomální chromozómy, co¾ je dal¹ích 22 párù za pohlavními chromozomy X a Y. Testy autozomální DNA mohou pomoci identifikovat pøíbuzné, kteøí sdílejí nedávné pøedky. Èím více segmentù sdílíte a èím vìt¹í je délka tìchto segmentù, tím více jste spøíznìni.</p>
> 		
> 		<p><strong>Sdílená DNA</strong><br />
>     Sdílené segmenty DNA, oznaèované také jako "odpovídající segmenty", jsou èásti DNA, které jsou shodné mezi dvìma jednotlivci. Tyto segmenty byly pravdìpodobnì zdìdìny od spoleèného pøedka. Pøi rozhodování o tom, která shody DNA budete sledovat, postupujte podle tìch s více ne¾ jedním velkým segmentem; to jsou va¹e blízcí pøíbuzní, ti, jejich¾ stromy se snadnìji spojí s va¹imi.</p>
> 		
> 		<p><strong>Celkovì sdílené cM</strong><br />
> 		Toto je souèet autosomální DNA, dané v centimorgans (cM), který vy a va¹e genetická shoda sdílíte.<br />Viz <a href="https://dnapainter.com/tools/sharedcmv4" traget="_blank">The Shared cM Project Tool</a>, kde je více informací o pravdìpodobnosti zpøíznìnosti na základì poètu celkového poètu sdílených cM.</p> 
>     
> 		<p><strong>Sdílené segmenty</strong><br />
>     Poèet sdílených segmentù v této sdílené shodì DNA. Èím více segmentù sdílíte a èím vìt¹í je délka tìchto segmentù, tím více jste zpøíznìni.</p>
> 		
> 		<p><strong>Nejvìt¹í segment</strong><br />
>     Segmenty, které spoleènì sdílejí velké mno¾ství centiMorganù, jsou s vìt¹í pravdìpodobností významné a oznaèují v genealogickém èasovém rámci spoleèného pøedka. Toto je nejvìt¹í sdílený segment v této shodì DNA.</p>
> 		
> 		<p><strong>Chromozóm è.</strong><br />
> 		Toto je èíslo chromozómu nejvìt¹ího shodného segmentu.</p>
> 		
> 		<p><strong>Zaèátek segmentu</strong><br />
>     Toto je poèáteèní místo nejvìt¹ího shodného sdíleného segmentu DNA</p>	
> 		
> 		<p><strong>Konec segmentu</strong><br />
>     Toto je koneèné místo nejvìt¹ího shodného sdíleného segmentu DNA</p>
> 		
> 		<p><strong>centiMorgany</strong><br />
>     V genetické genealogii je centiMorgan (cM) nebo mapová jednotka (m.u.) jednotkou frekvence rekombinace, která se pou¾ívá k mìøení genetické vzdálenosti. Toto je poèet cM v nejvìt¹ím shodném segmentu.</p>
> 		
> 		<p><strong>Poèet shodných SNP</strong><br />
> 		To je poèet SNP pro nejvìt¹í shodný segment.</p>
> 		
> 		<p><strong>X-shoda</strong><br />
> 		Toto pole udává, zda se autosomální DNA shoduje také na chromozómu X.</p>
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Nahoru</a></p>
> 		<a name="common"><p class="subheadbold">Spoleèná pole výsledkù testù</p></a>
> 		
> 		<p>Následující pole jsou spoleèná pro v¹echny typy testù</p>
101,103c206,208
< 		<span class="optionhead">Ancestral surnames</span>
< 		<p>Toto pole se vztahuje na v¹echny typy testù a bude automaticky vyplnìno rodovými pøíjmeními osoby, u které byly provedeny testy Y-DNA a mtDNA, oddìlenými èárkami<br />Doplnìné pøíjmení závisí na typu testu a mù¾ete je jakýmkoli zpùsobem upravit. <br />V Administrace >> Nastavení >> Konfigurace >> Základní nastavení >> Testy DNA je mo¾nost vylouèení pøíjmení jako je neznámé nebo NEZNÁMÉ, a mo¾nost zobrazit pøíjmení velkými písmeny.</p>
<     
---
> 		<span class="optionhead">Rodová pøíjmení</span>
> 		<p>Toto pole se vztahuje na v¹echny typy testù a bude automaticky vyplnìno rodovými pøíjmeními osoby, u které byly provedeny testy Y-DNA a mtDNA, oddìlenými èárkami<br />Doplnìná pøíjmení závisí na typu testu a mù¾ete je jakýmkoli zpùsobem upravit. <br />V Administrace >> Nastavení >> Konfigurace >> Základní nastavení >> Testy DNA je mo¾nost vylouèení pøíjmení jako je neznámé nebo NEZNÁMÉ, a mo¾nost zobrazit pøíjmení velkými písmeny.<br />Nyní je také mo¾nost zvolit, z kolika generací va¹eho rodokmenu se u testù atDNA vrátí rodové pøíjmení.</p>
> 
105c210
< 		<p>Zapi¹te nìjaké poznámky spojené s tímto testem nebo jakékoli jiné informace.</p>
---
> 		<p>Zapi¹te poznámky spojené s tímto testem nebo jakékoli jiné informace.</p>
122c227
<     <p>Dal¹í informace (v angliètinì) najdete na tìchto stránkách TNG Wiki:</p>
---
> 		<p>Dal¹í informace (v angliètinì) najdete na tìchto stránkách TNG Wiki:</p>
124,125c229,232
< 			<li><a href="https://tng.lythgoes.net/wiki/DNA_Tests" target="_blank">DNA Tests<a></li>
< 			<li><a href="https://tng.lythgoes.net/wiki/TNG_and_DNA_Tests" target="_blank">TNG and DNA Tests<a></li>
---
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/DNA_Tests" target="_blank">DNA Tests<a></li>
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/TNG_and_DNA_Tests" target="_blank">TNG and DNA Tests<a></li>
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/DNA_Tests_Enhancements?" target="_blank">DNA Tests Enhancements?<a></li>
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/Compare_DNA_Test_Results?" target="_blank">Compare DNA Test Results?<a></li>
127d233
< 
diff -r TNG/languages/Czech/events_help.php TNG1403/languages/Czech/events_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/eventtypes_help.php TNG1403/languages/Czech/eventtypes_help.php
3c3
< echo help_header("Nápovìda: Vlastní typy událostí");
---
> echo help_header("Nápovìda: Typy událostí / atributù");
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
21c17
< 		<span class="largeheader">Nápovìda: Vlastní typy událostí</span>
---
> 		<span class="largeheader">Nápovìda: Typy událostí / atributù</span>
31a28,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
34c35
<     <p>Nalezení existujících vlastních typù událostí vyhledáním celého nebo èásti <strong>Tagu, Typu/popisu (pro události EVEN)</strong> nebo <strong>Zobrazit</strong>.
---
>     <p>Nalezení existujících typù událostí a atributù vyhledáním celého nebo èásti <strong>Tagu, Typu/popisu (pro události EVEN)</strong> nebo <strong>Zobrazit</strong>.
36c37
< 		Výsledkem hledání bez zadaných voleb a hodnot ve vyhledávacích polích bude seznam v¹ech vlastních typù událostí ve va¹í databázi. Mo¾nosti výbìru jsou následující:</p>
---
> 		Výsledkem hledání bez zadaných voleb a hodnot ve vyhledávacích polích bude seznam v¹ech typù událostí a atributù ve va¹í databázi. Mo¾nosti výbìru jsou následující:</p>
39c40
< 		Pro omezení výbìru zvolte z tohoto rozbalovacího seznamu vlastní typy událostí spojené s osobami, rodinami, prameny nebo úlo¾i¹ti pramenù.</p>
---
> 		Pro omezení výbìru zvolte z tohoto rozbalovacího seznamu typy událostí a atributù spojené s osobami, rodinami, prameny nebo úlo¾i¹ti pramenù.</p>
42c43
< 		Výbìrem jedné z tìchto voleb omezíte výbìr vlastních typù událostí na ty, které jsou <strong>pøijaty</strong>, nebo na ty,
---
> 		Výbìrem jedné z tìchto voleb omezíte výbìr typù událostí a atributù na ty, které jsou <strong>pøijaty</strong>, nebo na ty,
61c62
< 		<a name="add"><p class="subheadbold">Pøidat nebo upravit vlastní typy událostí</p></a>
---
> 		<a name="add"><p class="subheadbold">Pøidat nebo upravit typy událostí / atributù</p></a>
63,67c64,67
< 		<p>Nejobvyklej¹í neboli "Standardní" typy událostí, jako jsou Narození, Úmrtí, Sòatek nìkolik dal¹ích, jsou spravovány pøímo na stránkách osoby, rodiny, pramenu nebo úlo¾i¹ti pramenù.
< 		V¹echny ostatní typy událostí jsou spojeny s "vlastními" typy událostí
< 		a jsou spravovány v sekcích <strong>Dal¹í události</strong> na stránkách osoby, rodiny, pramenu nebo úlo¾i¹tì pramenù. Pøed zápisem nìkteré z tìchto "dal¹ích"
< 		událostí musíte mít záznam s ní spojeného vlastního typu události. TNG automaticky nastaví vlastní typy událostí pro v¹echny nestandardní události, které obsahuje
< 		vá¹ soubor GEDCOM, ale nastavit vlastní typy událostí mù¾ete také ruènì.</p>
---
> 		<p>Nejobvyklej¹í události neboli typy "základních" událostí, jako jsou Narození, Úmrtí, Sòatek a nìkolik dal¹ích, jsou spravovány pøímo na stránkách osoby, rodiny, pramenu nebo úlo¾i¹ti pramenù.
> 		V¹echny ostatní události a atributy jsou spravovány v sekcích <strong>Dal¹í události / atributy</strong> na stránkách osoby, rodiny, prameny nebo úlo¾i¹tì pramenù. Pøed zápisem nìkteré z tìchto "dal¹ích"
> 		událostí musíte mít záznam s ní spojeného typu události / atributu. TNG automaticky nastaví typy událostí / atributù pro v¹echny nestandardní události, které obsahuje
> 		vá¹ soubor GEDCOM, ale nastavit tyto typy mù¾ete také ruènì.</p>
69c69
<     <p>Chcete-li pøidat nový vlastní typ události, kliknìte na zálo¾ku <strong>Pøidat nový</strong> a pak vyplòte formuláø. Chcete-li upravit existující vlastní typ události, pou¾ijte
---
>     <p>Chcete-li pøidat nový typ události / atributu, kliknìte na zálo¾ku <strong>Pøidat nový</strong> a pak vyplòte formuláø. Chcete-li upravit existující typ, pou¾ijte
71c71
< 		Význam polí pøi pøidání nebo úpravì vlastního typ události je následující:</p>
---
> 		Pøi pøidávání nebo úpravì typu mìjte na pamìti následující:</p>
74,75c74,75
< 		<p>Z tohoto rozbalovacího seznamu vyberte volbu, zda je tento typ události spojen s osobou, rodinou, pramenem nebo úlo¾i¹tìm pramenù.
< 		Jednotlivý vlastní typ události mù¾e být spojen pouze z jednou z tìchto mo¾ností. Volba tohoto pole
---
> 		<p>Z tohoto rozbalovacího seznamu vyberte volbu, zda je tento typ události / atributu spojen s osobou, rodinou, pramenem nebo úlo¾i¹tìm pramenù.
> 		Jednotlivý typ události / atributu mù¾e být spojen pouze z jednou z tìchto mo¾ností. Volba tohoto pole
99c99
< 		<p>Chcete-li pøijmout importované údaje, která odpovídají tomuto vlastnímu typu události, vyberte <em>Pøijmout</em>. Chcete-li data, která odpovídají tomuto vlastnímu typu události, nepøijmout
---
> 		<p>Chcete-li pøijmout importované údaje, která odpovídají tomuto typu události / atributu, vyberte <em>Pøijmout</em>. Chcete-li data, která odpovídají tomuto typu vlastní události, nepøijmout
101c101
< 		nebude tento vlastní typ události zobrazován.</p>
---
> 		nebude tento typ vlastní události zobrazován.</p>
110c110
< 	  <p><span class="optionhead">Povinná pole:</span>Pro va¹i událost musíte vybrat nebo zadat GEDCOM tag. Pokud zvolíte tag "EVEN" (obecná vlastní událost),
---
> 	  <p><span class="optionhead">Povinná pole:</span>Pro va¹i událost musíte vybrat nebo zadat GEDCOM tag. Pokud zvolíte tag "EVEN" (obecná událost),
120c120
< 		<p>Chcete-li najednou oznaèit vlastní typy událostí jako <strong>Pøijmout</strong> nebo <strong>Odmítnout</strong>, za¹krtnìte políèko Vybrat vedle ka¾dého vlastního typu události,
---
> 		<p>Chcete-li najednou oznaèit více typù jako <strong>Pøijmout</strong> nebo <strong>Odmítnout</strong>, za¹krtnìte políèko Vybrat vedle ka¾dého typu události / atributu,
129,131c129,131
< 		<a name="delete"><p class="subheadbold">Vymazat vlastní typy událostí</p></a>
<     <p>Chcete-li odstranit vlastní typ události, pou¾ijte zálo¾ku <a href="#search">Hledat</a> k nalezení polo¾ky, a poté kliknìte na ikonku Vymazat vedle tohoto záznamu. Tento øádek zmìní
< 		barvu a poté po odstranìní vlastního typu události zmizí. Chcete-li najednou odstranit více záznamù, za¹krtnìte tlaèítko ve sloupci Vybrat vedle ka¾dého záznamu, který má být
---
> 		<a name="delete"><p class="subheadbold">Vymazat typy událostí / atributù</p></a>
>     <p>Chcete-li odstranit typ události / atributu, pou¾ijte zálo¾ku <a href="#search">Hledat</a> k nalezení polo¾ky, a poté kliknìte na ikonku Vymazat vedle tohoto záznamu. Tento øádek zmìní
> 		barvu a poté po odstranìní typu události / atributu zmizí. Chcete-li najednou odstranit více záznamù, za¹krtnìte tlaèítko ve sloupci Vybrat vedle ka¾dého záznamu, který má být
diff -r TNG/languages/Czech/families_help.php TNG1403/languages/Czech/families_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
33a35
>   		<a name="search"><p class="subheadbold">Hledat</p></a>
35,37c37,39
<     Pro dal±í zúµení va±eho hledání vyberte strom nebo za±krtnìte "Pouze pøesná shoda". Volbou "Jména otce" budou va±e výbìrová kritéria porovnána se jmény v±ech otcù.
< 		Volbou "Jména matky" budou va±e výbìrová kritéria porovnána se jmény v±ech matek. Volbou "Beze jména" budete hledat pouze mezi ID èísly rodiny.
<     Výsledkem hledání bez zadaných voleb a hodnot ve vyhledávacích polích bude seznam v±ech osob ve va±í databázi.</p>
---
>     Pro dal¹í zú¾ení va¹eho hledání vyberte strom nebo za¹krtnìte "Pouze pøesná shoda". Volbou "Jména otce" budou va¹e výbìrová kritéria porovnána se jmény v¹ech otcù.
> 		Volbou "Jména matky" budou va¹e výbìrová kritéria porovnána se jmény v¹ech matek. Volbou "Beze jména" budete hledat pouze mezi ID èísly rodiny.
>     Výsledkem hledání bez zadaných voleb a hodnot ve vyhledávacích polích bude seznam v¹ech osob ve va¹í databázi.</p>
39c41
< 		<p>Vyhledávací kritéria, která zadáte na této stránce, budou uchována, dokud nekliknete na tlaèítko <strong>Obnovit</strong>, které znovu obnoví v±echny výchozí hodnoty.</p>
---
> 		<p>Vyhledávací kritéria, která zadáte na této stránce, budou uchována, dokud nekliknete na tlaèítko <strong>Obnovit</strong>, které znovu obnoví v¹echny výchozí hodnoty.</p>
42,44c44,46
< 		<p>Tlaèítko Akce vedle kaµdého výsledku hledání vám umoµní upravit, vymazat nebo otestovat výsledek. Chcete-li najednou vymazat více záznamù, za±krtnìte políèko ve sloupci
< 		<strong>Vybrat</strong> u kaµdého záznamu, která má být vymazán, a poté kliknìte na tlaèítko "Vymazat oznaèené" na zaèátku seznamu. Pro za±krtnutí nebo vyèi±tìní v±ech výbìrových políèek najednou
<     mùµete pouµít tlaèítka <strong>Vybrat v±e</strong> nebo <strong>Vyèistit v±e</strong>	.</p>
---
> 		<p>Tlaèítko Akce vedle ka¾dého výsledku hledání vám umo¾ní upravit, vymazat nebo otestovat výsledek. Chcete-li najednou vymazat více záznamù, za¹krtnìte políèko ve sloupci
> 		<strong>Vybrat</strong> u ka¾dého záznamu, která má být vymazán, a poté kliknìte na tlaèítko "Vymazat oznaèené" na zaèátku seznamu. Pro za¹krtnutí nebo vyèi¹tìní v¹ech výbìrových políèek najednou
>     mù¾ete pou¾ít tlaèítka <strong>Vybrat v¹e</strong> nebo <strong>Vyèistit v¹e</strong>.</p>
53,54c55,56
< 		<p>Výrazem <strong>Rodina</strong> se v tomto programu rozumí kaµdé spojení mezi "otcem" a "matkou" (dìti zde mohou nebo nemusí být obsaµeny). Pokud byla osoba víckrát sezdána
< 		nebo má dìti s více partnery, mìli byste pro kaµdý pár manµelù nebo partnerù vytvoøit novou rodinu.</p>
---
> 		<p>Výrazem <strong>Rodina</strong> se v tomto programu rozumí ka¾dé spojení mezi "otcem" a "matkou" (dìti zde mohou nebo nemusí být obsa¾eny). Pokud byla osoba víckrát sezdána
> 		nebo má dìti s více partnery, mìli byste pro ka¾dý pár man¾elù nebo partnerù vytvoøit novou rodinu.</p>
56,57c58,59
< 		<p>Chcete-li pøidat novou rodinu, kliknìte na záloµku <strong>Pøidat nové</strong> a poté vyplòte formuláø. Nìkteré informace (poznámky, citace a 
< 		dal±í události) mùµete pøidat po uloµení a zamknutí záznamu. Význam jednotlivých polí je následující:</p>
---
> 		<p>Chcete-li pøidat novou rodinu, kliknìte na zálo¾ku <strong>Pøidat nové</strong> a poté vyplòte formuláø. Nìkteré informace (poznámky, citace a 
> 		dal¹í události) mù¾ete pøidat po ulo¾ení a zamknutí záznamu. Význam jednotlivých polí je následující:</p>
60c62
< 		<p>Pokud máte pouze jeden strom, vybrán bude vµdy tento strom. Jinak, prosím, pro novou rodinu vyberte poµadovaný strom.</p>
---
> 		<p>Pokud máte pouze jeden strom, vybrán bude v¾dy tento strom. Jinak, prosím, pro novou rodinu vyberte po¾adovaný strom.</p>
63,66c65,68
< 		<p>Pøipojení rodiny ke "vìtvi" omezí pøístup k informacím o rodinì pro uµivatele, kteøí jsou spojeni k téµe vìtvi. Je-li definována alespoò jedna vìtev
< 		a vá± uµivatelský úèet není spojen se µádnou konkrétní vìtví, mùµete novou rodinu pøipojit k více existujícím vìtvím. Chcete-li vìtev vybrat,
< 		kliknutím na odkaz "Upravit" se otevøe box se v±emi vìtvemi ve vybraném stromì. Pro výbìr více vìtví pouµijte klávesu Control (Windows) nebo Command (Mac).
< 		Po dokonèení va±eho výbìru pøesuòte kursor my±i mimo okno úprav a toto okno zmizí.</p>
---
> 		<p>Pøipojení rodiny ke "vìtvi" omezí pøístup k informacím o rodinì pro u¾ivatele, kteøí jsou spojeni k té¾e vìtvi. Je-li definována alespoò jedna vìtev
> 		a vá¹ u¾ivatelský úèet není spojen se ¾ádnou konkrétní vìtví, mù¾ete novou rodinu pøipojit k více existujícím vìtvím. Chcete-li vìtev vybrat,
> 		kliknutím na odkaz "Upravit" se otevøe box se v¹emi vìtvemi ve vybraném stromì. Pro výbìr více vìtví pou¾ijte klávesu Control (Windows) nebo Command (Mac).
> 		Po dokonèení va¹eho výbìru pøesuòte kursor my¹i mimo okno úprav a toto okno zmizí.</p>
70,78c72,80
< 		Pøi prvním zobrazení stránky a kdykoli je vybrán jiný strom, bude doplnìno volné a jednoznaèné èíslo, ale pokud chcete, mùµete vloµit své vlastní ID èíslo.
< 		Chcete-li zkontrolovat, zda je va±e ID èíslo jednoznaèné, kliknìte na tlaèítko <strong>Zkontrolovat</strong>. Objeví se zpráva, která vám sdìlí, zda je jiµ ID èíslo pouµito nebo ne.
< 		Chcete-li vygenerovat dal±í jednoznaèné èíslo, kliknìte na <strong>Vygenerovat</strong>. Bude zji±tìno nejvy±±í èíslo ve va±í databázi a pøidána 1.
< 		Chcete-li zajistit, µe zobrazení ID èíslo není nárokováno jiným uµivatelem, zatímco vy zapisujete data, kliknìte na tlaèítko <strong>Zamknout</strong>.</p>
< 
< 		<p><strong>POZN.</strong>: Pouµíváte-li tento program spolu s genealogickým programem pracujícím na platformách PC nebo Mac, který u nových rodin vytváøí také ID èísla,
< 		DÙRAZNÌ DOPORUÈUJEME v±echny tato èísla vµdy mezi tìmito programy synchronizovat. Výsledkem zanedbání této èinnosti mohou být kolize a nepouµitelnost
< 		odkazù na va±e média. Pokud vá± primární program vytváøí ID èísla, která neodpovídají tradièním standardùm (napø. 
< 		<strong>F</strong> je na konci a ne na zaèátku), mùµete konvence, které TNG pouµívá, zmìnit v Základním nastavení.</p>
---
> 		Pøi prvním zobrazení stránky a kdykoli je vybrán jiný strom, bude doplnìno volné a jednoznaèné èíslo, ale pokud chcete, mù¾ete vlo¾it své vlastní ID èíslo.
> 		Chcete-li zkontrolovat, zda je va¹e ID èíslo jednoznaèné, kliknìte na tlaèítko <strong>Zkontrolovat</strong>. Objeví se zpráva, která vám sdìlí, zda je ji¾ ID èíslo pou¾ito nebo ne.
> 		Chcete-li vygenerovat dal¹í jednoznaèné èíslo, kliknìte na <strong>Vygenerovat</strong>. Bude zji¹tìno nejvy¹¹í èíslo ve va¹í databázi a pøidána 1.
> 		Chcete-li zajistit, ¾e zobrazení ID èíslo není nárokováno jiným u¾ivatelem, zatímco vy zapisujete data, kliknìte na tlaèítko <strong>Zamknout</strong>.</p>
> 
> 		<p><strong>POZN.</strong>: Pou¾íváte-li tento program spolu s genealogickým programem pracujícím na platformách PC nebo Mac, který u nových rodin vytváøí také ID èísla,
> 		DÙRAZNÌ DOPORUÈUJEME v¹echna tato èísla v¾dy mezi tìmito programy synchronizovat. Výsledkem zanedbání této èinnosti mohou být kolize a nepouµitelnost
> 		odkazù na va¹e média. Pokud vá¹ primární program vytváøí ID èísla, která neodpovídají tradièním standardùm (napø. 
> 		<strong>F</strong> je na konci a ne na zaèátku), mù¾ete konvence, které TNG pou¾ívá, zmìnit v Základním nastavení.</p>
82c84
< 		vytvoøte nové osoby. Pokud jste zvolili Vytvoøit, budete moci vloµit údaje o nových osobách bez toho, abyste museli opustit aktuální stránku.
---
> 		vytvoøte nové osoby. Pokud jste zvolili Vytvoøit, budete moci vlo¾it údaje o nových osobách bez toho, abyste museli opustit aktuální stránku.
87,89c89,91
< 		<span class="optionhead">�ijící</span>
< 		<p>Pokud jeden z partnerù µije nebo si pøejete omezit pøístup k údajùm této rodiny pouze na uµivatele, kteøí jsou pøihlá±eni a mají práva zobrazovat data µijících osob,
< 		za±krtnìte toto políèko.</p>
---
> 		<span class="optionhead">®ijící</span>
> 		<p>Pokud jeden z partnerù ¾ije nebo si pøejete omezit pøístup k údajùm této rodiny pouze na u¾ivatele, kteøí jsou pøihlá¹eni a mají práva zobrazovat data ¾ijících osob,
> 		za¹krtnìte toto políèko.</p>
92,93c94,95
< 		<p>Bez ohledu na to, zda je tato rodina oznaèena jako �ijící, mùµete pøístupová práva k údajùm této osoby omezit za±krtnutím této volby.
< 		Informace spojené s "neveøejnou" rodinou budou moci vidìt pouze uµivatelé s právy zobrazovat neveøejná data.</p>
---
> 		<p>Bez ohledu na to, zda je tato rodina oznaèena jako ¾ijící, mùµete pøístupová práva k údajùm této osoby omezit za±krtnutím této volby.
> 		Informace spojené s "neveøejnou" rodinou budou moci vidìt pouze u¾ivatelé s právy zobrazovat neveøejná data.</p>
96,99c98,101
< 		<p>Zapi±te data a místa k zobrazeným standardním událostem (pokud je znáte). Dal±í události lze pøidat po uloµení a zamknutí záznamu. Data vµdy zapisujte
< 		ve standardním genealogickém formátu DD MMM RRRR (napø. <em>18 Úno 2008</em>). Informaci o místì øaïte za sebou od místního po obecnou a oddìlujte kaµdý údaj èárkou
< 		(napø. <em>Bludov, Œumperk, Olomoucký kraj, Èeská republika</em>), nebo kliknutím na ikonu "Najít" vyberte existující místo (lupa).
< 		Chcete-li omezit poèet nalezených výsledkù, pøed kliknutím na ikonu Najít zapi±te èást místa. V±echny výsledky budou obsahovat to, co jste zapsali jako název místa.</p>
---
> 		<p>Zapi¹te data a místa k zobrazeným standardním událostem (pokud je znáte). Dal¹í události lze pøidat po uloµení a zamknutí záznamu. Data v¾dy zapisujte
> 		ve standardním genealogickém formátu DD MMM RRRR (napø. <em>18 Úno 2008</em>). Informaci o místì øaïte za sebou od místního po obecnou a oddìlujte ka¾dý údaj èárkou
> 		(napø. <em>Bludov, ©umperk, Olomoucký kraj, Èeská republika</em>), nebo kliknutím na ikonu "Najít" vyberte existující místo (lupa).
> 		Chcete-li omezit poèet nalezených výsledkù, pøed kliknutím na ikonu Najít zapi¹te èást místa. V¹echny výsledky budou obsahovat to, co jste zapsali jako název místa.</p>
102,103c104,105
< 		Tato událost jsou spojena s obøadem provádìným Církví Jeµí±e Krista Svatých posledních dní (mormonská církev, která vytvoøila standard GEDCOM).
< 		<strong>Pozn.:</strong> Nechcete-li vidìt pole spojené s CJKSpd, jdìte na Nastavení/Základní nastavení a zde tuto moµnost vypnìte (je tøeba se pak odhlásit a znovu pøihlásit).</p>
---
> 		Tato událost je spojena s obøadem provádìným Církví Je¾íse Krista Svatých posledních dní (mormonská církev, která vytvoøila standard GEDCOM).
> 		<strong>Pozn.:</strong> Nechcete-li vidìt pole spojené s CJKSpd, jdìte na Nastavení/Základní nastavení a zde tuto mo¾nost vypnìte (je tøeba se pak odhlásit a znovu pøihlásit).</p>
114c116
<     <p>Chcete-li upravit existující rodinu, pouµijte záloµku <a href="#search">Hledat</a> pro nalezení rodiny, a poté kliknìte na ikonu Upravit vedle této osoby.</p>
---
>     <p>Chcete-li upravit existující rodinu, pou¾ijte záloµku <a href="#search">Hledat</a> pro nalezení rodiny, a poté kliknìte na ikonu Upravit vedle této osoby.</p>
118,119c120,121
< 		nebo vedle kaµdé události. Ke kaµdé události mùµete také pøidat "více" informací kliknutím na ikonu "Plus". Pokud v nìjaké této kategorii existují údaje,
< 		na odpovídající ikonì bude v horním pravém rohu zelená teèka. Chcete-li znát více informací o kaµdé kategorii, jdìte na odkazy nápovìdy,
---
> 		nebo vedle ka¾dé události. Ke ka¾dé události mù¾ete také pøidat "více" informací kliknutím na ikonu "Plus". Pokud v nìjaké této kategorii existují údaje,
> 		na odpovídající ikonì bude v horním pravém rohu zelená teèka. Chcete-li znát více informací o ka¾dé kategorii, jdìte na odkazy nápovìdy,
123c125
< 		<p>Chcete-li pøidat dal±í události, kliknìte na tlaèítko "Pøidat nové" vedle <strong>Jiné události</strong>. Viz odkaz <a href="events_help.php">Nápovìda</a> pro více
---
> 		<p>Chcete-li pøidat dal¹í události, kliknìte na tlaèítko "Pøidat nové" vedle <strong>Jiné události</strong>. Viz odkaz <a href="events_help.php">Nápovìda</a> pro více
125c127
< 		pro kaµdou událost vám umoµní událost upravit nebo odstranit, nebo pøidat poznámky nebo citace. Poøadí, ve kterém se události zobrazí, závisí na datu (je-li zapsáno)
---
> 		pro ka¾dou událost vám umo¾ní událost upravit nebo odstranit, nebo pøidat poznámky nebo citace. Poøadí, ve kterém se události zobrazí, závisí na datu (je-li zapsáno)
129c131
< 		standardní události) se uloµí kliknutím na tlaèítko Uloµit na konci stránky nebo kliknutím na ikonu Uloµit na stránce nahoøe. Strom a
---
> 		standardní události) se ulo¾í kliknutím na tlaèítko Ulo¾it na konci stránky nebo kliknutím na ikonu Ulo¾it na stránce nahoøe. Strom a
134c136
< 		vytvoøte nové dítì. Pokud jste zvolili Vytvoøit, budete moci vloµit údaje o nové osobì bez toho, abyste museli opustit aktuální stránku.
---
> 		vytvoøte nové dítì. Pokud jste zvolili Vytvoøit, budete moci vlo¾it údaje o nové osobì bez toho, abyste museli opustit aktuální stránku.
136,137c138,139
< 		upravovat pøímo, ale pro odstranìní dítìte ze seznamu mùµete pouµít odkaz "Odstranit" (viditelný, kdyµ pøesunete kurzor my±i nad kaµdé dítì). Pouµít
< 		mùµete také odkaz "Vymazat" pro úplné vymazání dítìte z databáze. Mùµete pouµít tlaèítko "Vymazat" pro vymazání dítìte z databáze
---
> 		upravovat pøímo, ale pro odstranìní dítìte ze seznamu mù¾ete pou¾ít odkaz "Odstranit" (viditelný, kdy¾ pøesunete kurzor my¹i nad ka¾dé dítì). Pou¾ít
> 		mù¾ete také odkaz "Vymazat" pro úplné vymazání dítìte z databáze. Mù¾ete pou¾ít tlaèítko "Vymazat" pro vymazání dítìte z databáze
142,143c144,145
< 		mùµete jejich poøadí zmìnit "pøetaµením" blokù nahoru nebo dolù. Chcete-li blok pøetáhnout, kliknìte my±í na tlaèítko "Táhnout", toto tlaèítko podrµte, a va±i my± pøesuòte na stránce nahoru
< 		nebo dolù. Po pøesunu bloku do poµadované pozice tlaèítko pusŸte. Zmìny poøadí budou automaticky uloµeny.</p>
---
> 		mù¾ete jejich poøadí zmìnit "pøeta¾ením" blokù nahoru nebo dolù. Chcete-li blok pøetáhnout, kliknìte my¹í na tlaèítko "Táhnout", toto tlaèítko podr¾te, a va¹i my¹ pøesuòte na stránce nahoru
> 		nebo dolù. Po pøesunu bloku do po¾adované pozice tlaèítko pus»te. Zmìny poøadí budou automaticky ulo¾eny.</p>
153,154c155,156
<     <p>Chcete-li odstranit rodinu, pouµijte záloµku <a href="#search">Hledat</a> pro nalezení rodiny, a poté kliknìte na ikonu Odstranit vedle této rodiny. Tento øádek zmìní
< 		barvu a poté po odstranìní rodiny zmizí (partneøi a dìti nebudou odstranìni, ale vztah bude rozpojen). Chcete-li najednou odstranit více rodin, za±krtnìte políèko ve sloupci Vybrat vedle kaµdé rodiny, kterou
---
>     <p>Chcete-li odstranit rodinu, pou¾ijte zálo¾ku <a href="#search">Hledat</a> pro nalezení rodiny, a poté kliknìte na ikonu Odstranit vedle této rodiny. Tento øádek zmìní
> 		barvu a poté po odstranìní rodiny zmizí (partneøi a dìti nebudou odstranìni, ale vztah bude rozpojen). Chcete-li najednou odstranit více rodin, za¹krtnìte políèko ve sloupci Vybrat vedle ka¾dé rodiny, kterou
164,165c166,167
<     Chcete-li si pøedbìµnì prohlédnout zmìny provedené ostatními uµivateli, kliknìte na záloµku "Pøezkoumat". Mùµete se pak rozhodnout, zda tyto navrhované zmìny uloµíte nebo odstraníte.
<     Zmìny mùµete prohlédnout podle stromu nebo podle uµivatele nebo podle obojího. Po uloµení navrhovaných zmìn není zaslán µádný mail, ale pokud nové zmìny existují, na záloµce Pøezkoumat se objeví hvìzdièka (*).</p>
---
>     Chcete-li si pøedbì¾nì prohlédnout zmìny provedené ostatními u¾ivateli, kliknìte na zálo¾ku "Pøezkoumat". Mù¾ete se pak rozhodnout, zda tyto navrhované zmìny ulo¾íte nebo odstraníte.
>     Zmìny mù¾ete prohlédnout podle stromu nebo podle u¾ivatele nebo podle obojího. Po ulo¾ení navrhovaných zmìn není zaslán ¾ádný mail, ale pokud nové zmìny existují, na zálo¾ce Pøezkoumat se objeví hvìzdièka (*).</p>
168,169c170,171
< 		<p>V tabulce, která popisuje události, které si pøejete pøezkoumat nebo odstranit, vyberte øádek. Seznam výsledkù mùµete zúµit výbìrem uµivatele (osoba
< 		odpovìdná za navrhované zmìny) a/nebo strom. Po zobrazení výsledkù kliknìte na jednu z moµných akcí nalevo od tohoto øádku. Chcete-li zmìny pøezkoumat a
---
> 		<p>V tabulce, která popisuje události, které si pøejete pøezkoumat nebo odstranit, vyberte øádek. Seznam výsledkù mù¾ete zú¾it výbìrem u¾ivatele (osoba
> 		odpovìdná za navrhované zmìny) a/nebo strom. Po zobrazení výsledkù kliknìte na jednu z mo¾ných akcí nalevo od tohoto øádku. Chcete-li zmìny pøezkoumat a
173,175c175,177
< 		<p>Na obrazovce Pøezkoumat mùµete provést dal±í potøebné zmìny, vèetnì poznámek a pramenù, a poté kliknìte na "Uloµit a vymazat" pro
< 		uloµení do databáze a odstranìní doèasného záznamu. Kliknutím na "Odmítnout a vymazat" mùµete rovnìµ odstranit doèasný záznam, aniµ byste jej uloµili,
< 		nebo mùµete své rozhodnutí odloµit na pozdìj±í dobu kliknutím na "Odloµit".</p>
---
> 		<p>Na obrazovce Pøezkoumat mù¾ete provést dal¹í potøebné zmìny, vèetnì poznámek a pramenù, a poté kliknìte na "Ulo¾it a vymazat" pro
> 		ulo¾ení do databáze a odstranìní doèasného záznamu. Kliknutím na "Odmítnout a vymazat" mù¾ete rovnìµ odstranit doèasný záznam, ani¾ byste jej ulo¾ili,
> 		nebo mù¾ete své rozhodnutí odlo¾it na pozdìj¹í dobu kliknutím na "Odlo¾it".</p>
diff -r TNG/languages/Czech/importconfig_help.php TNG1403/languages/Czech/importconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
25a22,27
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>   
28,33c30,31
< 
< 		<span class="optionhead">Ulo¾it stav importu</span>
< 		<p>Pokud import nebo export z nìjakého dùvodu sel¾e a nebude dokonèen, vyberte tuto mo¾nost a spus»te import/export znovu. Pokud proces 
<     opìt nedobìhne do konce, kliknìte na odkaz pokraèovat a import/export bude pokraèovat z místa, kde byl pøeru¹en.
<     V pøípadì importu pracuje tato volba pouze, je-li vá¹ soubor GEDCOM ve va¹í slo¾ce GEDCOM (nepracuje se soubory, které jsou nahrávány a importovány
<     pøímo z obrazovky Import dat).</p>
---
>     
> 		<p>Pozn.: Pro vìt¹í zabezpeèení va¹ich souborù GEDCOM za¹krtnìte políèko oznaèené "Ulo¾it v konfiguraèní cestì", aby TNG ponechalo soubory GEDCOM v tomto umístìní. Slo¾ku GEDCOM musíte pøesunout na toto místo sami pøed ulo¾ením této hodnoty nebo bezprostøednì poté.</p>    
68a67,70
> 		<span class="optionhead">Rodina je ¾ijící, pokud je pár sezdán ménì ne¾ tento poèet let</span>
> 		<p>TNG nastaví u rodiny bìhem importu oznaèení ®ijící, pokud ke sòatku do¹lo pøed ménì ne¾ tolika lety. 
>     Toto pole nechte prázdné nebo jej nastavte na hodnotu 0, nechcete-li oznaèení ®ijící nastavovat tímto zpùsobem.</p>
>     
119a122,125
> 		<span class="optionhead">Zmìnit pøíchozí pøedpony tak, aby odpovídaly nastavení TNG</span>
> 		<p>Pokud obdr¾íte soubor GEDCOM z jiného zdroje, je mo¾né, ¾e soubor mù¾e obsahovat ID s rùznými pøedponami nebo pøíponami ID. 
>     Chcete-li, aby TNG standardizovala pøíchozí ID tak, aby pøedpony odpovídaly va¹emu nastavení, zapnìte tuto mo¾nost.</p>
> 
diff -r TNG/languages/Czech/index_help.php TNG1403/languages/Czech/index_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
30a27,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>   
41c43
< 				<li><p><strong>Podívejte se na následné procesy</strong> (po Importu/Exportu) a proveïte ty, o kterých si myslíte, ¾e jsou nutné (více informací
---
> 				<li><p><strong>Podívejte se na Nástroje po importu</strong> (pod Import/Export) a proveïte ty, o kterých si myslíte, ¾e jsou nutné (více informací
86,88c88,90
< 			<li><p>Odkazy PHP: <a href="http://www.php.net" target="_blank">http://www.php.net</a>.</p></li>
< 			<li><p>Odkazy MySQL: <a href="http://www.mysql.com" target="_blank">http://www.mysql.com</a>.</p></li>
< 			<li><p>Odkazy HTML: <a href="http://www.htmlhelp.com" target="_blank">http://www.htmlhelp.com</a>.</p></li>
---
> 			<li><p>Odkazy PHP: <a href="https://php.net" target="_blank">https://php.net</a>.</p></li>
> 			<li><p>Odkazy MySQL: <a href="https://mysql.com" target="_blank">https://mysql.com</a>.</p></li>
> 			<li><p>Odkazy HTML: <a href="https://htmlhelp.com" target="_blank">https://htmlhelp.com</a>.</p></li>
diff -r TNG/languages/Czech/languages_help.php TNG1403/languages/Czech/languages_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/logconfig_help.php TNG1403/languages/Czech/logconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
26,31c22,42
< 		<span class="optionhead">Název souboru protokolu</span>
< 		<p>Název souboru protokolu je soubor, kam jsou zaznamenávány akce náv¹tìvníkù. Pùvodní název "genlog.txt" byste nemìli mìnit.</p>
< 
< 		<span class="optionhead">Maximální poèet øádkù v protokolu</span>
< 		<p>Maximální poèet øádkù v protokolu urèuje, kolik akcí by mìl protokol aktuálnì uchovávat.
< 		Je-li toto èíslo pøíli¹ velké, mù¾e se objevit ke sní¾ení výkonu.</p>
---
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>     
> 		<span class="optionhead">Název souboru protokolu (Veøejná oblast)</span>
> 		<p>Soubor protokolu je soubor, kam jsou zaznamenávány akce náv¹tìvníkù. Pùvodní název "genlog.txt" byste nemìli mìnit.</p>
> 
> 		<span class="optionhead">Název souboru protokolu (Administrace)</span>
> 		<p>Soubor protokolu je soubor, kam jsou zaznamenávány akce v administrativní oblasti. Pùvodní název "adminlog.txt" byste nemìli mìnit.</p>
> 
> 		<p>Pozn.: Pro vìt¹í zabezpeèení va¹ich souborù protokolu za¹krtnìte políèko oznaèené "Ulo¾it v konfiguraèní cestì", aby TNG ulo¾il soubory protokolu v tomto umístìní. Soubory protokolu musíte do tohoto umístìní pøesunout sami pøed ulo¾ením této hodnoty nebo bezprostøednì poté.</p>
> 
> 		<span class="optionhead">Maximální poèet øádkù v protokolu (Veøejná oblast)</span>
> 		<p>Maximální poèet øádkù v protokolu udává, kolik akcí týkajících se veøejné oblasti by mìl protokol aktuálnì uchovávat.
> 		Pokud je toto èíslo pøíli¹ vysoké, mù¾e dojít ke sní¾ení výkonu.</p>
>     
>     <span class="optionhead">Maximální poèet øádkù v protokolu (Administrace)</span>
> 		<p>Maximální poèet øádkù v protokolu udává, kolik akcí týkajících administrace by mìl protokol aktuálnì uchovávat.
> 		Pokud je toto èíslo pøíli¹ vysoké, mù¾e dojít ke sní¾ení výkonu.</p>
42,47d52
< 		<span class="optionhead">Název souboru protokolu (Admin)</span>
< 		<p>Název souboru protokolu, kam jsou zaznamenávány akce z administrátorské oblasti. Pùvodní název "adminlog.txt" byste nemìli mìnit.</p>
< 
< 		<span class="optionhead">Maximální poèet øádkù v protokolu (Admin)</span>
< 		<p>Maximální poèet øádkù v protokolu urèuje, kolik akcí by mìl protokol administrátora aktuálnì uchovávat. Je-li toto èíslo pøíli¹ velké, mù¾e se objevit ke sní¾ení výkonu.</p>
< 
diff -r TNG/languages/Czech/mapconfig_help.php TNG1403/languages/Czech/mapconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
25c21,26
< 	<td class="tngshadow"><span class="normal">
---
> 	<td class="tngshadow">
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
28,30c29,45
< 		<p>Pro pou¾ití map z Google Maps na va¹ich internetových stránkách musíte od èervna 2016 získat od Google tzv. <strong>klíè</strong> k mapì. Tento klíè mù¾ete obdr¾et zde:<br>
< 		<a href="https://developers.google.com/maps/documentation/javascript/get-api-key#key" target="_blank">https://developers.google.com/maps/documentation/javascript/get-api-key#key</a>.<br>
< 		Po získání va¹eho klíèe jej nakopírujte do pole <strong>Klíè k mapì</strong> na stránce Administrace > Nastavení > Nastavení map. Pokud se pozdìji rozhodnete, ¾e mapy z Google Maps ji¾ pou¾ívat nechcete,
---
> 		<p>Chcete-li na svém webu pou¾ívat Mapy Google, musíte od spoleènosti Google získat <strong>klíè</strong>. Chcete-li získat klíè k mapì, musíte také
>       mít u¾ivatelské ID Google. Pokud jste ji¾ zaregistrováni do slu¾by Google Mail, mù¾ete pou¾ít toto u¾ivatelské ID, jinak si budete muset vytvoøit nový
>       úèet Google. Na svém úètu Google musíte také povolit fakturaci. Jakmile budete mít úèet s povolenou fakturací, mù¾ete získat klíè zde:
> 			<a href="https://console.cloud.google.com/" target="_blank">https://console.cloud.google.com/</a>.</p>
> 		<p>Jakmile tam budete, nejprve vyberte svùj projekt. Z knihovny API (èást Mapy) vyberte a povolte následující tøi klíèe:
>       Maps JavaScript API, Geocoding API a Places API. Maps JavaScript API je potøeba k zobrazení mapy Google náv¹tìvníkùm va¹eho webu,
>       se znaèkou na rùzných místech (místo narození, úmrtí, svatby atd.). Geocoding API se pou¾ívá v administrátorské sekci va¹eho
>       webové stránky pro pøiøazení míst k souøadnicím.
> 		</p>
> 		<p>Více informací získáte na <a href="https://tng.lythgoes.net/wiki/index.php/Google_Maps_-_Getting_Started">https://tng.lythgoes.net/wiki/index.php/Google_Maps_-_Getting_Started</a>.
> 
> 		<ul>
> 		<li>Vytvoøte API klíè pod polo¾kou "APIs &amp; Services (Credentials)" a pøidejte adresu svého webu jako "HTTP referrer".</li>
> 		<li>V nabídce "Mapy Google" povolte "Maps Javascript API".</li>
> 		</ul>    
>     
> 		<p>Po získání va¹eho klíèe jej nakopírujte do pole <strong>Klíè k mapì</strong> na stránce Administrace > Nastavení > Nastavení map. Pokud se pozdìji rozhodnete, ¾e mapy z Google Maps ji¾ pou¾ívat nechcete,
86d100
< 		</span>
diff -r TNG/languages/Czech/media_help.php TNG1403/languages/Czech/media_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
37a34,38
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
89c90
< 		úplnou webovou adresu (napø. <em>http://www.tentoweb.com/image.jpg</em>), a
---
> 		úplnou webovou adresu (napø. <em>https://www.tentoweb.com/image.jpg</em>), a
169,170c170,171
< 		<p><strong>(pouze Náhrobky)</strong> Høbitov, na kterém se náhrobek nachází. Nejprve musíte høbitov pøidat do tabulky høbitovù
< 		(Admin/Høbitovy), pak bude vidìt v tomto poli.</p>
---
> 		<p>Chcete-li tuto mediální polo¾ku pøidru¾it ke høbitovu, vyberte høbitov z rozbalovacího seznamu. Obvykle se to pou¾ívá u náhrobkù k oznaèení, kde se náhrobek nachází. Nejprve musíte pøidat høbitov 
>     (v èásti Administrace/Høbitovy), pak bude viditelný v tomto poli.</p>
182a184,186
>     
> 		<span class="optionhead">Neveøejné</span>
> 		<p>Za¹krtnutím bude tato polo¾ka skryta, pokud u¾ivatel nemá pøístup k neveøejným údajùm.</p>    
243,245c247,249
< 		<span class="optionhead">Mapa obrázku</span>
< 		<p>Tato sekce je ve výchozím stavu sbalena. Pro její rozbalení klinìte na výraz "Mapa obrázku" nebo na ¹ipku vedle nìj. V této sekci mù¾ete spojit
< 		rùzné èásti obrázku s osobami ve va¹í databázi, nebo zobrazit krátké zprávy pøi pøemístìní kursoru my¹í nad tyto èásti.</p>
---
> 		<span class="optionhead">Klikací mapa</span>
> 		<p>Tato sekce je ve výchozím stavu sbalena. Pro její rozbalení klinìte na výraz "Klikací mapa" nebo na ¹ipku vedle nìj. V této sekci mù¾ete spojit
> 		rùzné èásti obrázku s osobami, rodinami, prameny, úlo¾i¹ti nebo místy ve va¹í databázi nebo s externími adresami URL.</p>
249,254c253,260
< 		<p>U ka¾dé oblasti, kterou chcete spojit s osobou, nejdøíve zvolte strom dané osoby, poté urèete na obrázku oblast nakreslením obdélníku ukazatelem va¹í my¹í.
< 		Nejprve kliknìte do levého horního rohu obdélníku, poté my¹ podr¾te a pøesunutím dolù do prava nakreslete obdélník. Dostanete-li se do pravého dolního roku obdélníku, uvolnìte my¹. 
< 		Takto vyberete souøadnice va¹eho obrázku. Po výbìru souøadnic se objeví okno, ve kterém mù¾ete najít nebo zapsat ID èíslo osoby. Pro nalezení záznamu zapi¹te
< 		celé jméno osoby nebo jen jeho èást anebo ID èíslo, a poté ze zobrazených kandidátù vyberte správnou osobu. Okno
< 		se zavøe a do pole Mapa obrázku pod obrázkem bude vlo¾en kód této oblasti. V pøípadì potøeby mù¾ete kód upravit nebo
< 		jej zapsat pøímo.</p>
---
> 		<p>U ka¾dé oblasti, kterou chcete propojit, nejprve vyberte strom a typ entity (osoba, rodina, atd.), NEBO zadejte název a externí adresu URL jiné webové stránky. 
>     Poté definujte oblast nakreslením obdélníku na obrázek pomocí 
>     ukazatele my¹i. Zaènìte kliknutím na levý horní roh obdélníku, poté podr¾te my¹ a pohybujte ji dolù a doprava, abyste obdélník nakreslili. Kdy¾ 
>     se dostanete do pravého dolního rohu obdélníku, uvolnìte my¹. Tím 
>     vyberete souøadnice obrázku. Po výbìru souøadnic se zobrazí vyskakovací okno, které vám umo¾ní najít nebo zadat ID entity. Zadejte 
>     celé jméno nebo èást jména nebo ID pro nalezení mo¾ných shod a poté vyberte správnou polo¾ku ze zobrazených kandidátù. 
>     Pole se zavøe a nad obrázek bude pøidáno pole pro tuto oblast. Chcete-li vybrat existující region, kliknìte na políèko. Poté mù¾ete pole pøesunout pøeta¾ením, nebo kliknutím na "X" 
>     v pravém horním rohu jej odstranit.</p>
256c262
< 		<p>Tento postup mù¾ete opakovat pro dal¹í oblasti. Ka¾dý nový kód bude vlo¾en na konec obsahu pole Mapa obrázku.</p>
---
> 		<p>Tento postup mù¾ete opakovat pro dal¹í oblasti. Ka¾dý nový kód bude vlo¾en na konec obsahu pole Klikací mapa.</p>
diff -r TNG/languages/Czech/misc_help.php TNG1403/languages/Czech/misc_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31a28,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/modhandler_help.php TNG1403/languages/Czech/modhandler_help.php
3c3
< echo help_header("Nápovìda: Mana¾er módù");
---
> echo help_header("Help: Nápovìda módù");
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
11,200c7,46
<   <a name="top"></a>
<   <table width="100%" border="0" cellpadding="10" cellspacing="2" class="tblback normal">
<     <tr class="fieldnameback">	
<       <td class="tngshadow">		
<         <p style="float:right; text-align:right" class="smaller menu">			
<           <a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp; 			
<           <a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />			
<           <a href="backuprestore_help.php" class="lightlink">&laquo; Nápovìda: Obslu¾né programy</a> &nbsp; | &nbsp; 			
<           <a href="index_help.php" class="lightlink">Nápovìda: Zaèínáme &raquo;</a>		
<         </p>		
<         <span class="largeheader">Nápovìda: Mana¾er módù
<         </span>		
<         <p class="smaller menu">			
<           <a href="#overview" class="lightlink">Pøehled</a> &nbsp; | &nbsp; 			
<           <a href="#operation" class="lightlink">Operace</a> &nbsp; | &nbsp; 			
<           <a href="#status" class="lightlink">Stav</a> &nbsp; | &nbsp;
<           <a href="#syntax" class="lightlink">Syntaxe módù</a> &nbsp; | &nbsp;           			
<           <a href="#files" class="lightlink">Konfiguraèní soubory</a> &nbsp; | &nbsp;
<           <a href="#batch" class="lightlink">Dávkové operace</a> &nbsp; | &nbsp;
<           <a href="#options" class="lightlink">Mo¾nosti</a> &nbsp; | &nbsp;
<           <a href="#analyze" class="lightlink">Analýza souborù TNG</a> &nbsp; | &nbsp;
<           <a href="#parser" class="lightlink">Tabulka parseru</a> &nbsp; | &nbsp;
<           <a href="#custtext" class="lightlink">Doporuèené aktualizace</a>          
<           		
<         </p>	</td>
<     </tr>
<     <tr class="databack">	
<       <td class="tngshadow">		
<         <a name="overview"><p class="subheadbold">Pøehled</p></a>		
<         <p>Mana¾er módù TNG verze 12 je zalo¾en na Mana¾eru módù, který byl pùvodnì vyvinut Brianem McFadyenem, následnì zaktualizován Seanem Schwoerem pro práci s Joomla TNG Component 
<         a ve verzi 10.0.3 a 10.1 zaktualizován o integrovanìj¹í zpùsob instalace, odstranìní a øízení zmìn softwarového balíku TNG.</p>
<         <p>Nový Mana¾er módù nabízí jednoduchý øádkový souhrn stavù módù, který mù¾e být roz¹íøen na zobrazení kompletního popisu a chyb.
<         Seznam souborù, které daný mód ovlivòuje, lze zobrazit pøejetím kursorem my¹i nad znaménkem + ve sloupci Soubory.
<         K rozbalení v¹ech záznamù a zobrazení stavu mù¾ete podobnì jako ve starém Mana¾eru módù pou¾ít také tlaèítko <strong>Rozbalit v¹e</strong> v horním menu. 
<         Volba Rozbalit v¹e je u¾iteèná pøi filtrování seznamu na stavy <strong>Èásteènì nainstalováno</strong> nebo <strong>Nelze nainstalovat</strong>, tak¾e mù¾ete vidìt chyby, které se 
<         zde objevují.</p> 
<         <p>Mana¾er módù je pro snaz¹í pøístup pøidán na stránku Administrace TNG. Mana¾er módù vytváøí v TNG tyto slo¾ky:
<           <ul>			
<             <li><strong>mods</strong> obsahuje konfiguraèní soubory módù a pøidru¾ené podpùrné soubory módù. Slo¾ka mods mù¾e být pøejmenována. Mana¾er módù pou¾ívá pro práci s názvem slo¾ky promìnnou $modspath.</li>			
<             <li><strong>extensions</strong> obsahuje nìkterá roz¹íøení módù, které jsou instalovány jinými konfiguraèními soubory mana¾eru módù. Slo¾ka extensions mù¾e být pøejmenována. Mana¾er módù pou¾ívá pro práci s názvem slo¾ky promìnnou $modspath.</li>
<             <li><strong>classes</strong> obsahuje tøídy Objektovì orientovaného programování (Object Orient Progamming classes), které byly rozdìleny a vylep¹eny z pøedchozího souboru managemods.class.php, který vytvoøil Sean Schwoere z pùvodní kódu Mana¾eru módù od Briana McFadyena.</li>		
<           </ul></p>
<      
<         <p>Zálo¾ka <strong>Seznam módù</strong> nyní spojuje pøedchozí Seznam módù a Dávkové instalace, které do TNG 10.0.3 pøidal Rick Bisbee, a umo¾òuje vykonat stejnou akci pro více módù. Popis a roz¹íøený stav lze zobrazit pomocí kliknutí na ¹ipku vpravo ve sloupci Stav nebo kdekoli na øádku. Pøejetím kurzorem my¹i nad øádkem se zvýrazní øádek a usnadní se tak výbìru stavu pro roz¹íøené zobrazení. Pøejetím kurzoru my¹i pøes znaménko + ve sloupci Soubory se zobrazí seznam souborù, které daný mód mìní, vytváøí nebo kopíruje.</p>
<         <p>Pokud je povolena mo¾nost Zobrazit dal¹í nástroje pro vývojáøe, TNG v12 pøidává následující zmìny: 
<         <ul><li>kliknutím na název souboru se otevøe tabulka parseru pro tento mód</li>
<         <li>kliknutím na název souboru cfg se zobrazí soubor cfg na jiné zálo¾ce</li>
<         <li>tlaèítko <strong>Podrobnosti</strong> v buòce Stav funguje jako pøepínaè pro rozbalení nebo sbalení zobrazení smìrnic souboru ve stavu Instalovat nebo Lze instalovat.</li></ul></p>
< 
<         <p>Zálo¾ku <strong>Zobrazit protokol</strong> pøidal do TNG 10.0.3 Ken Roy a zobrazuje protokol Mana¾eru módù, který je nyní oddìlen od protokolu Administrace. Protokol mana¾eru módù je pøeformátovaný protokol z Mana¾eru módù vytvoøeného Rickem Bisbee a Robinem Richmondem v TNG 10.0.3 a srozumitelnost vykonaných akcí zaznamenaných v protokolu je nyní lep¹í. Zprávy a hlá¹ení byly znaènì zjednodu¹eny.</p>
<         <p>Zálo¾ka <strong>Mo¾nosti</strong> je modifikací zálo¾ky pøidané Kenem Royem do TNG 10.0.3 a umo¾òuje mìnit nìkteré chování mana¾eru módù.</p>
<         <p>Zálo¾ka <strong>Analýza souboru TNG</strong> je volitelná zálo¾ka, její¾ zobrazení lze povolit na obrazovce Mo¾nosti, a umo¾òuje vybrat soubor TNG a zobrazit, které módy jej mìní.</p>        
<         <p>Zálo¾ka <strong>Tabulka parseru</strong> je volitelná zálo¾ka, její¾ zobrazení lze povolit na obrazovce Mo¾nosti povolením <strong>Dal¹í nástroje pro vývojáøe</strong>, a umo¾ní zobrazit, jak je daný mód analyzován Mana¾erem módù.</p> 
<         <p>Zálo¾ka <strong>Doporuèené aktualizace</strong> je volitelná zálo¾ka, její¾ zobrazení lze povolit na obrazovce Mo¾nosti, která vám umo¾ní aktualizovat soubory cust_text.php, pokud jste tak neuèinili v rámci aktualizace TNG.</p> 
< 
<         <p>Dal¹í informace mù¾ete najít v èlánku 
<           <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager" target="_blank">Mana¾er módù (v angliètinì)</a> a v kategorii      èlánkù 
<           <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:TNG_Mod_Manager" target="_blank">TNG Mod Manager (v angliètinì)</a> na TNG Wiki.</p>
<         <p>You can view the <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Enhancements" target="_blank">Mod Manager</a> article in TNG Wiki to see what enhancements were made in TNG v12.</p>
<       
<         </td>
<     </tr>
<     <tr class="databack">	
<       <td class="tngshadow">		
<         <p style="float:right"><a href="#top">Nahoru</a></p>		
<         <a name="operation"><p class="subheadbold">Operace</p></a>		
<         <p>Mana¾er módù prozkoumá slo¾ku módù a pøeète ka¾dý soubor <strong>cfg</strong>, který najde. Soubory <strong>cfg</strong> jsou direktivní soubory, které popisují mód, soubory a umístìní, které má být modifikováno, a kód, který je pøi modifikaci pou¾it. 		
<           <p>Mana¾er módù zkontroluje následující: 			
<             <ul>				
<               <li>zajistí, ¾e je u¾ivatel pøihlá¹en 				
<               <li>provìøí umístìní a zmìnu ka¾dého kódu 					
<               <ul>						
<                 <li>zajistí, ¾e lze umístìní nalézt</li>						
<                 <li>zajistí, ¾e cílové místo je jedineèné</li>						
<                 <li>urèí, zda cílové umístìní ji¾ bylo nainstalováno</li>					
<               </ul>
<               <li>vytvoøí zadanou slo¾ku nebo adresáø</li>
<               <li>identifikuje nové soubory, které mají být vytvoøeny. Pokud je soubor oznaèen jako chránìný, nebude odstranìn Odinstalací ani Vyèi¹tìním.</li>
<               <li>identifikuje soubory, které mají být zkopírovány do koøenové slo¾ky TNG nebo do urèené slo¾ky. Pokud je soubor oznaèen jako chránìný, nebude odstranìn Odinstalací ani Vyèi¹tìním.</li>
<             </ul></p>
<               	
<           </td>
<     </tr>
<     
<     <tr class="databack">	
<       <td class="tngshadow">		
<         <p style="float:right"><a href="#top">Nahoru</a></p>		
<         <a name="status"><p class="subheadbold">Stav</p></a>			
<         <p>Mana¾er módù vrací následující stavy: 			
<           <ul>			
<             <li><strong>Lze instalovat</strong>, pokud mód je¹tì nebyl nainstalován a cílové umístìní je identifikováno, pak je uvedena mo¾nost <strong>Instalovat</strong>
<             </li>			
<             <li><strong>Instalováno</strong>, pokud ji¾ mód byl nainstalován, je uvedena mo¾nost <strong>Odinstalovat</strong> mód a mo¾nost <strong>Upravit</strong> parametry, pokud nìjaké existují. Módy s editaèními parametry jsou identifikovány podle [Mo¾nosti] za stavem Instalováno.
<             </li>			
<             <li><strong>Èásteènì instalováno</strong>, pokud mód byl èásteènì nainstalován, je k dispozici tlaèítko <strong>Vyèistit</strong>. Operace Vyèi¹tìní se pokusí odstranit vlo¾ený kód, obnovit a nahradit kód, a odstranit jakékoli vytvoøené nebo zkopírované soubory.
<             </li>			
<             <li><strong>Nelze nainstalovat</strong>, pokud mód <strong>nelze</strong> instalovat. Roz¹íøení (zobrazení kompletní informace) stavu poskytne více informací o tom, proè mód nelze nainstalovat.
<             </li>			
<           </ul>		
<           <p>Pøíklady obrazovek stavu mana¾eru módù a jak interpretovat rùzné stavy najdete na 
<             <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Interpreting_Status" target="_blank">Mana¾er módù - interpretace stavù (v angliètinì)</a>
<           </p>	</td>
<     </tr>
<     
<     <tr class="databack">
<       <td class="tngshadow">
<         <p style="float:right"><a href="#top">Nahoru</a></p>
<         <a name="syntax"><p class="subheadbold">Syntaxe módù</p></a>
<         <p>Syntaxe mana¾era módù v zásadì zahrnuje:
<         <p><strong>Sekci záhlaví</strong>, která obsahuje</p>
<           <ul><li>Název (name) - název módu, èlánek na TNG Wiki a název souboru</li>
<           <li>Verze (version) - verze módu, kde první 3 èíslice pøedstavují nejni¾¹í verzi TNG, ve které mód funguje</li>
<           <li>Popis (description) - obsahuje struèný popis módu, jméno vývojáøe a URL èlánku o daném módu na TNG Wiki.</li>
<           </ul>
< 				</p>
<         <p><strong>Cílovou sekci (target)</strong>, kde je specifikován soubor, který je opravným módem zmìnìn, a následnì obsahuje pøíkazy. K cílové sekce lze pøidat poznámku.</p>
<           <ul><li>Umístìní (location) - urèuje umístìní kódu, který je v souboru mìnìn. K umístìní lze pøidat poznámku.</li>
<           <li>Klíèové slovo akce - urèuje, zda pøepsat (Replace) nebo vlo¾it (Insert) kód pøed (Before) nebo za (After) toto umístìní</li>
<           </ul>
<         </p>
<         <p><strong>Pøíkaz Nový soubor (New File)</strong>, který po instalaci módu vytvoøí nový soubor</p>
<         <p><strong>Pøíkaz Kopírovat soubor (Copy File)</strong>, který nakopíruje urèitý soubor do øídící slo¾ky TNG (%copyfile) nebo do podslo¾ky (%copyfile2)</p>
<         <p>Detailní informace týkající se syntaxe módù najdete v èlánku <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax" target="_blank">Mod Manager Syntax (v angliètinì)</a></p>
<       </td>
<     </tr>
<     
<     <tr class="databack">	
<       <td class="tngshadow">
<         <p style="float:right"><a href="#top">Nahoru</a></p>		
<         <a name="files"><p class="subheadbold">Konfiguraèní soubory</p></a>
<         		
<         <span class="optionhead">Instalování módù</span>		
<         <p>Informace o <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Installing_Config_Files" target="_blank">instalaci konfiguraèních souborù (v angliètinì)</a> k instalaci módù najdete na TNG Wiki.</p>		 		
<         
<         <span class="optionhead">Interpretace stavu</span>		
<         <p>Informace o <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Interpreting_Status" target="_blank">interpretaci stavu (v angliètinì)</a> najdete na TNG Wiki.</p>
<         		 		
<         <span class="optionhead">Syntaxe konfiguraèních souborù</span>		
<         <p>Informace o <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax" target="_blank">syntaxi mana¾eru módù (v angliètinì)</a> najdete na TNG Wiki.</p>		 		
<         
<         <span class="optionhead">Vytvoøení konfiguraèního souboru</span>		
<         <p>Informace pro vývojáøe o <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Creating_Config_Files" target="_blank">vytvoøení konfiguraèních souborù (v angliètinì)</a> najdete na TNG Wiki.</p>
<       </td>
<     </tr>
<     
<     <tr class="databack">
<       <td class="tngshadow">
<         <p style="float:right"><a href="#top">Nahoru</a></p>
<         <a name="batch"><p class="subheadbold">Dávkové operace</p></a>
< 
<         <p>Funkce Dávkové operace, v TNG 10.0.3 pøedstavená jako Dávkové instalace, je nyní souèástí Seznamu módù a umo¾ní provést specifické akce týkající se více módù pomocí výbìru filtru. 
<         Z filtru seznamu stavù musíte vybrat po¾adovaný stav a kliknutím na <strong>Provést</strong> zobrazíte dostupná ovládací tlaèítka pro vybraný stav.  
<         
<         Akce <strong>Vymazat</strong> je k dispozici pouze pro stav Èásteènì nainstalováno, pokud povolíte pøíslu¹nou pøedvolbu. Doporuèujeme ji nastavit na Ne, kromì pøípadù, kdy je potøeba vymazat více módù ve stavu 
<         Èásteènì nainstalováno, jako napø. pøedchozí verze tého¾ módu. Stejnì tak je zde mo¾nost Vymazat instalované módy, která umo¾ní vymazání nainstalovaných módù, ani¾ byste je nejprve odinstalovali. Tato mo¾nost byla pøidána, 
<         aby bylo mo¾né vymazat pøedchozí verze tého¾ módu, pokud jste je zapomnìli vymazat pøed instalací nové verze. Zde opìt doporuèujeme ponechat mo¾nost jako Ne a povolit ji jen v pøípadì potøeby.
<         Tlaèítko <strong>Vymazat</strong> se zobrazí pouze v seznamu Vybrat, pokud jsou povoleny oba mo¾nosti vymazání.
<         </p>
< 
<         <p><strong><font color="red">Upozornìní: Dávkové operace pou¾ívejte pouze tehdy, pokud máte zálohu va¹ich webových stránek a mù¾ete je snadno obnovit v pøípadì, ¾e vlivem dávkových operací dojde k po¹kození va¹ich stránek, co¾ se mù¾e snadno stát, pokud nevyma¾ete pøedchozí verze módù.</font>
<         Je doporuèeno Pøed provedením aktualizace TNG doporuèujeme odinstalovat v¹echny nainstalované módy a poté vyèistit v¹echny èásteènì nainstalované módy.</strong></p>
< 
<         <p>Mo¾nosti výbìrového filtru jsou tyto:
<           <ul>
<             <li><strong>V¹e</strong> - zobrazí se úplný seznam v¹ech souborù .cfg ze slo¾ky mods.  Pokud zvolíte urèitý stav, objeví se dostupná tlaèítka jednotlivých akcí</li>
<             <li><strong>Lze nainstalovat</strong> - zobrazí se seznam v¹ech módù, které mohou být</li>
<           	  <ul>
<                 <li>Nainstalovány - na základì va¹eho výbìru a kliknutím na tlaèítko <strong>Instalovat</strong></li>
<                 <li>Vymazány ze slo¾ky mods - na základì va¹eho výbìru a kliknutím na tlaèítko <strong>Vymazat</strong></li>
< 					    </ul>
<                 <li><strong>Instalováno</strong> - zobrazí se seznam v¹ech módù, které jsou aktuálnì nainstalovány, a mohou být</li>
< 					    <ul>
<                 <li>Odstranìny - na základì va¹eho výbìru a kliknutím na tlaèítko <strong>Odstranit</strong></li>
< 					    </ul>
<                 <li><strong>Èásteènì instalováno</strong> - zobrazí se seznam v¹ech módù, které jsou èásteènì instalovány a musí být</li>
< 					    <ul>
<                 <li>Vyèi¹tìny - na základì va¹eho výbìru a kliknutím na tlaèítko <strong>Vyèistit vybrané</strong></li>
< 					    </ul>
<                 <li><strong>Nelze nainstalovat</strong> - zobrazí se seznam v¹ech módù, které nelze nainstalovat z dùvodu chybného cílového souboru nebo chybìjících souborù, a mohou být</li>
< 					    <ul>
<                 <li>Vymazány ze slo¾ky mods - na základì va¹eho výbìru a kliknutím na tlaèítko <strong>Vymazat vybrané</strong></li>
< 					    </ul>
<                 <li><strong>Vybrat</strong> - pøidáno v TNG v12 - zobrazí se seznam v¹ech modù, které mohou být vybrány bez ohledu na stav a poté pouze vrací tyto módy do seznamu</li>
< 					    <ul>
<                 <li>Tlaèítko <strong>Vymazat</strong> bude dostupné pouze na seznamu Vybrat, pokud máte aktivní volbu Povolit Vymazat vybrané u èásteènì nainstalovaných módù. Tato funkce byla pøidána hlavnì pro vývojáøe módù k vyèi¹tìní jejich testovacích prostøedí.</li>
< 					    </ul>
<           </ul>
<         </p>
<       </td>
<     </tr>
---
> <a name="top"></a>
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="tblback normal">
> <tr class="fieldnameback">
> 	<td class="tngshadow">
> 		<p style="float:right; text-align:right" class="smaller menu">
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
> 			<a href="backuprestore_help.php" class="lightlink">&laquo; Nápovìda: Obslu¾né programy</a> &nbsp; | &nbsp;
> 			<a href="index_help.php" class="lightlink">Nápovìda: Zaèínáme &raquo;</a>
> 		</p>
> 		<span class="largeheader">Nápovìda: Mana¾er módù</span>
> 		<p class="smaller menu">
> 			<a href="#overview" class="lightlink">Pøehled</a> &nbsp; | &nbsp;
> 			<a href="#modlist" class="lightlink">Seznam módù</a> &nbsp; | &nbsp;
> 			<a href="#editor" class="lightlink">Editor módù</a> &nbsp; | &nbsp;
> 			<a href="#viewlog" class="lightlink">Zobrazit protokol</a> &nbsp; | &nbsp;
> 			<a href="#options" class="lightlink">Mo¾nosti</a> &nbsp; | &nbsp;
> 			<a href="#analyzer" class="lightlink">Analýza souborù TNG</a> &nbsp; | &nbsp;
> 			<a href="#parser" class="lightlink">Tabulka parseru</a> &nbsp; | &nbsp;
>       <a href="#recommended" class="lightlink">Doporuèené aktualizace</a> &nbsp; | &nbsp;
> 			<a href="#credits" class="lightlink">Podìkování</a>
> 		</p>
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
> 
> 		<a name="overview"><p class="subheadbold">Pøehled</p></a>
> 
>     <p>Pokud jste v TNG noví, Mana¾er módù je nástroj pro administrátory, který jim umo¾òuje instalovat, spravovat a odstraòovat úpravy softwarového balíèku TNG, a to buï sta¾ením a instalací "módù" vytvoøených ostatními z TNGWiki, nebo vytvoøením vlastních módù (a mo¾ná také jejich sdílením).</p>    
> 
>     <p><b>Mód</b> je textový soubor s pøíponou .cfg napsaný pomocí editoru kódu. Obsahuje "pøíkazy", které øíkají Mana¾eru módù (MM), jak jeho instalací upravit kód v cílových souborech. Mù¾e také kopírovat soubory z doprovodné podpùrné slo¾ky nebo dokonce vytváøet nové soubory. -- podrobnosti najdete na stránce<i><a href="https://tng.lythgoes.net/wiki/index.php/Mod_Manager" target="_blank"> TNGWiki Mod Manager (v angliètinì)</a></i>.</p>
> 
> 	</td>
> </tr>
203a50,51
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="modlist"><p class="subheadbold">Seznam módù</p></a>
205,206c53,125
< 		<p style="float:right"><a href="#top">Nahoru</a></p>
< 		<a name="options"><p class="subheadbold">Mo¾nosti</p></a>
---
>     <p>Na stránce Administrace TNG zobrazí Mana¾er módù (MM) seznam v¹ech modù ve slo¾ce "mods". Tuto slo¾ku mù¾ete pøejmenovat v Nastavení >> Základní nastavení >> Umístìní a slo¾ky.</p>    
> 
>     <p>Pokud jste je¹tì ¾ádné módy do slo¾ky "mods" na va¹em webu nenaèetli, bude výpis MM prázdný. Ze stránek TNGWiki si mù¾ete stáhnout stovky modù. Pøicházejí ve formì souborù zip, které budete muset rozbalit a nahrát do slo¾ky "mods" na va¹em webu pomocí programu FTP, jako je FileZilla nebo WinSCP, který mù¾ete získat zdarma z internetu</p>
> 
>     <p>Pøed zobrazením modù Mana¾er módù zkontroluje ka¾dý z nich, zda je ji¾ nainstalován nebo zda jej lze nainstalovat, a hledá chyby, které by bránily jeho <i>instalaci</i> nebo <i>odstranìní</i>. Výsledek se zobrazí ve výpisu módu ve sloupci <i>Stav</i>. Podrobnosti zobrazíte kliknutím na ikonu ¹ipky nebo stavový text a poté na tlaèítko <i>Podrobnosti</i>.</p>
> 
>     <p>V¹echny uvedené mody mají barevnì oznaèený stav instalace:
>       <ul>
>         <li>
>           <b>Lze instalovat</b> (bílý) -- MM potvrdil, ¾e v¹echny pøíkazy v konfiguraèním souboru módu lze nainstalovat bez chyby.
>         </li>
>         <li>
>           <b>Instalováno </b> (zelený) -- v¹echny komponenty z konfiguraèního souboru módu jsou nainstalovány.
>         </li>
>         <li>
>           <b>Èásteènì instalováno</b> (oran¾ový) -- nìkteré komponenty módu jsou nainstalovány a nìkteré ne. To se mù¾e stát, pokud obnovíte soubor TNG, který byl souèástí instalace Modu.
>         </li>
>         <li>
>           <b>Nelze nainstalovat</b> (èervený) -- nìkteré konfiguraèní soubory módu nelze nainstalovat, napøíklad proto, ¾e cílový soubor chybí.
>         </li>
>       </ul>
>     </p>
> 
>     <h3>Panel filtrù</h3>
> 
>     <p>V horní èásti seznamu modù je panel filtrù, který omezuje zobrazení na módy s vybraným stavem nebo na <b>V¹echny</b> módy nebo pouze ty, které <b>Vyberete</b>. Výbìr libovolného filtru kromì <b>V¹ech</b> zobrazí seznam se za¹krtávacím políèkem pro ka¾dý zobrazený mód. Za¹krtnutí jednoho nebo více polí umo¾òuje dal¹í zpracování vybraných módù.</p>
> 
>     <p>Pokud napøíklad vyfiltrujete mody, které jsou ve stavu <i>Lze instalovat</i> a poté stisknete <i>Provést</i>, vá¹ seznam bude obsahovat pouze ty módy, které jsou pøipraveny k instalaci. Pomocí za¹krtávacích políèek ve filtrovaném seznamu mù¾ete vybrat jedno, nìkolik nebo v¹echny z nich, poté stisknout tlaèítko Instalovat a módy se nainstalují hromadnì. V¹imnìte si tlaèítek <i>Vybrat v¹e</i> a <i>Vyèistit v¹e</i>, která vám pomohou se za¹krtávacími políèky.</p>
> 
> 
> <p><strong><font color="#990000">Upozornìní: Dávkové operace byste mìli provádìt pouze v pøípadì, ¾e máte dobrou zálohu svých webových stránek a mù¾ete ji rychle obnovit, pokud dávkové operace zpùsobí nefunkènost va¹eho webu. To se mù¾e snadno stát, kdy¾ neodstraníte pøedchozí verze modù.</font></strong></p>
> 
>   <p><strong>Poznámka: Pøed upgradem TNG doporuèujeme dávkovì odinstalovat v¹echny nainstalované módy a poté dávkovì vyèistit v¹echny zbývající èásteènì nainstalované módy.</strong></p>
> 
>    <p>Filtr <b>Vybrat</b> zobrazí v¹echny módy a pøidá za¹krtávací políèka. Vyberte jeden nebo více z nich a stisknìte tlaèítko <i>Vybrat</i>. Mana¾er módù zobrazí pouze vybrané módy. To mù¾e být u¾iteèné pro izolaci a testování jednoho módu bez zobrazení nebo zpracování ostatních.</p>
> 
>   <p>Pokud za¹krtnete políèko <b>Zamknout</b> u jakéhokoli filtrovaného záznamu, zùstane filtrovaný i po obnovení stránky. Zápis zùstane uzamèen, dokud jej nezru¹íte nebo nepou¾ijete jiný filtr.</p>
> 
>     <h3>Sloupce seznamu módù</h3>
> 
>     <p>První tøi sloupce jsou samozøejmé. V závislosti na nastavení zobrazení Mana¾era modù na <i>kartì Mo¾nosti</i> mù¾ete kliknout na Název módu a mód se zobrazí v tabulce parseru. Kliknutím na Název konfiguraèního souboru zobrazíte na nové kartì obsah konfiguraèního souboru módu.</p>
> 
>     <p>Pokud sloupec <b>Wiki</b> obsahuje ikonu wiki (W), mù¾ete na ni kliknout a pøejít na èlánek TNGWiki, který obsahuje popis a dal¹í informace o módu a také odkaz ke sta¾ení módu.</p>
> 
>     <p>Pátý sloupec je sloupec <b>Stav</b>. Zobrazuje barevnì odli¹ený stav instalace módu, jak je vysvìtleno vý¹e. Kliknutím na text stavu se otevøe panel s popisem a pøíslu¹nými ovládacími prvky pro správu módu. Pokud je k dispozici tlaèítko <i>Podrobnosti</i>, mù¾ete vidìt podrobný seznam v¹ech akcí, které byly nebo mají být provedeny pro správu módu. Budou zobrazeny v¹echny chyby.</p>
> 
>     <p>Pro pokroèilé u¾ivatele jsou chybové zprávy èasto doprovázeny èíslem E. To odkazuje na èíslo øádku v souboru MM, kde do¹lo k chybì. E-èísla v seznamu modù jsou v¹echna generována souborem classes/modlister.class.php. V blízkosti tohoto èísla øádku se èasto objeví komentáø vysvìtlující povahu chyby a návrh mo¾ných oprav.</p>
> 
>     <p>Pokud se nevyskytnou ¾ádné chyby, jednodu¹e stisknìte pøíslu¹ný ovládací prvek pro instalaci nebo odinstalování (odstranìní) módu.</p>
>     <p>Nìkteré módy jsou èásteènì nainstalovány. Kdy¾ uvidíte tento stav, stisknìte tlaèítko <i>Vyèistit</i> a MM odstraní v¹echny nainstalované souèásti. Obvykle vám zùstane èistý mód, který lze znovu plnì nainstalovat.</p>
> 
>   <p>Pokud mód zùstává èásteènì nainstalován i po nìkolika pokusech o jeho vyèi¹tìní, mìli byste upozornit vývojáøe módu. Chcete-li upozornit vývojáøe, kliknìte na ikonu Wiki (W) a pøejdìte na stránku TNGWiki a poté kliknìte na odkaz <i>Mod Support</i>. Pokud neexistuje odkaz na podporu, <a href="#morehelp" >kliknutím sem</a> získáte dal¹í pomoc.</p>
> 
> 
>     <p>Poslední sloupec, <i>Soubory</i>, obsahuje ikonu pro dal¹í informace. Umístìte na nìj kurzor a vyskakovací okno vám sdìlí v¹echny soubory, které jsou nebo budou upraveny tímto modem.</p>
> 
>     <a name="morehelp"><h3>Hledání dal¹í pomoci</h3></a>
> 
>     <p>Pokud potøebujete dal¹í pomoc, a» u¾ se Mana¾erem módù, nebo s konkrétním módem, mù¾ete provést jednu z následujících akcí:
>     <ul>
>       <li>Potøebujete-li pomoc s chybami nebo problémy v <b>Mana¾eru módù</b>
>       <ul>
>         <li>kontaktujte Rick Bisbee <a href="https://bisbeefamily.com/suggest.php?page=Mod Manager Issues" target="_blank">zde</a></li>
>         <li>kontaktujte Ken Roy: <a href="mailto:ken@royandboucher.com?subject=Mod&nbsp;Manager&nbsp;Help">zde</a></li>
>       </ul>
>       <li>Potøebujete-li pomoc s nìjakým módem</li>
>         <ul>
>           <li>kontaktujte vývojáøe modu ze stránky TNGWiki spojené s modem</li>
>           <li>pøejdìte na <a href="https://tng.community/index.php?/forums/" target="_blank"> TNG Fórum</a> a vyhledejte název módu. Pokud nenajdete nic u¾iteèného, mù¾ete si vytvoøit úèet a zanechat ¾ádost o pomoc na ostatní u¾ivatele.</li>
>           <li>pou¾ijte <b>Seznam e-mailových diskuzí</b> a polo¾te otázku. <a href="https://tng.lythgoes.net/wiki/index.php/TNG_Discussion_Forums" target="_blank">Zaènìte kliknutím sem</a>.</li>
>         </ul>
>     </ul>
>     </p>
208,235d126
< 		<p>Mo¾nosti vám umo¾ní specifikovat chování mana¾eru módù.
<     
<     <p><strong>Mo¾nosti protokolu Mana¾eru módù</strong> 
< 			<ul>
< 				<li><strong>Název protokolu</strong> - umo¾ní vám urèit název souboru, který bude pou¾it pro protokol mana¾eru módù.  Výchozí volbou je <strong>modmgrlog.txt</strong>.</li>
< 				<li><strong>Maximální poèet transakcí</strong> - umo¾ní vám urèit, kolik transakcí bude zachováváno v protokolu. Výchozí volbou je <strong>200</strong> transakcí.</li>
< 				<li><strong>Sbalit zobrazení protokolu</strong> - umo¾ní vám urèit, zda chcete pøi úvodním zobrazení vidìt protokol v zú¾eném nebo roz¹íøeném stavu.  Výchozí volbou je <strong>Ano</strong>.</li>
< 				<li><strong>Pøesmìrovat na protokol</strong> - umo¾ní vám urèit, zda chcete být ze Seznamu módù pøesmìrováni na zálo¾ku Zobrazit protokol v pøípadì <strong>Pouze chyb</strong> nebo <strong>V¹ech transakcí</strong>.  Výchozí volbou je pøesmìrování v pøípadì <strong>Pouze chyb</strong>, která zobrazí protokol pouze v pøípadì, ¾e se vyskytne v prùbìhu instalace, odinstalace, vyèi¹tìní nebo vymazání chyba.</li>
< 				<li><strong>Do protokolu zapsat celou cestu souborù</strong> - umo¾ní vám zapsat Ne, pokud chcete u souborù v protokolu zobrazit pouze relativní cestu. Výchozí volbou je <strong>Ano</strong> pro zobrazení úplné absolutní cesty.</li>
< 			</ul></p>
< 		<p><strong>Mo¾nosti nastavení zobrazení</strong> 
< 			<ul>
< 				<li><strong>Øadit seznamy podle</strong> - umo¾ní vám zvolit, podle kterého sloupce bude øazen Seznam módù.  Mo¾nosti jsou Název módu a Název konfiguraèního souboru.  Výchozí volbou je <strong>Název módu</strong>.</li>
< 				<li><strong>Pou¾ít pevné záhlaví</strong> - umo¾ní vám zmìnit volbu, aby nebylo zobrazeno pevné záhlaví. Tato volba není zøetelná, pokud máte velký monitor a málo módù. Výchozí volbou je <strong>Ano</strong> pro zobrazení pevného záhlaví.  Bez ohledu na nastavení této volby se pevné záhlaví nezobrazí v pøípadì chytrých telefonù (mobilní re¾im).</li>
< 				<li><strong>Upravit pevné záhlaví</strong> - umo¾ní vám povolit úpravu pevného záhlaví jQuery v pøípadì, ¾e pevné záhlaví není správnì zobrazeno. Tato volba je potøeba pouze na urèitých monitorech. Výchozí volbou je <strong>Ne</strong> a nepou¾ívat javascript jQuery pro úpravu pevného záhlaví.</li>
< 				<li><strong>Pou¾ít pruhy</strong> - umo¾ní vám zmìnit volbu a nepou¾ít pruhy pøi zobrazení Seznamu módù. Výchozí volbou je <strong>Ano</strong>, která pou¾ije tøídu databackalt k zobrazení barevných pruhù støídavì po poètu N øádkù.</li>
< 				<li><strong>Pruh po tomto poètu øádkù</strong> - umo¾ní nastavit poèet øádkù, po kterém se budou støídat barevné pruhy. Výchozí volbou jsou <strong>3</strong> øádky jedné barvy a pak 3 øádky jiné barvy.</li>
< 				<li><strong>Odstranit mezery z názvù souborù v seznamu módù</strong> - umo¾ní odstranit mezery z názvù módù pøed jejich zobrazením v Seznamu názvù módù. Výchozí volbou je <strong>Ne</strong>, kdy jsou mezery v názvech módù zobrazeny a tyto názvy pak odpovídají názvùm èlánkù na TNG Wiki.</li>
< 				<li><strong>Zobrazit zálo¾ku Analýza souborù TNG</strong> - umo¾ní urèit, zda chcete zobrazit zálo¾ku Analýza soouborù TNG.  Výchozí volbou je <strong>Ne</strong>, která potlaèí zobrazení zálo¾ky Analýza soouborù TNG.</li>
<         <li><strong>Zobrazit dal¹í nástroje pro vývojáøe</strong> - umo¾ní urèit, zda chcete zobrazit zálo¾ku Tabulka parseru.  Výchozí volbou je <strong>Ne</strong>, která potlaèí zobrazení zálo¾ky Tabulka parseru.  Tato volba také øídí, zda se na kliknutí na název módu zobrazí tabulka parseru pro daný mod a zda se kliknutím na název konfiguraèního souboru zobrazí na nové zálo¾ce konfiguraèní soubor.</li>
< 				<li><strong>Zobrazit zálo¾ku Doporuèené aktualizace</strong> - umo¾ní urèit, zda chcete zobrazit zálo¾ku Doporuèené aktualizace.  Výchozí volbou je <strong>Ne</strong>, která potlaèí zobrazení zálo¾ky Doporuèené aktualizace.  Tato zálo¾ka nemusí být zobrazena, pokud jste provedli aktualizaci souboru cust_text.php v rámci aktualizace na TNG v12.</li>
< 			</ul></p>
< 		<p><strong>Jiné mo¾nosti</strong> 
< 			<ul>
< 				<li><strong>Povolit Vymazat vybrané pro èásteènì nainstalované módy</strong> - povolí zobrazení tlaèítka <strong>Vymazat</strong> v seznamu vybraných Èásteènì nainstalovaných módù, pomocí kterého lze vymazat více módù najednou, jako napø. vymazání pøedchozích verzí modù, které nebyly vymazány pøed instalací novìj¹í verzí. Výchozí volbou je <strong>Ne</strong>. Tuto volbu doporuèujeme povolit pouze v pøípadì, ¾e potøebujete vymazat více modù, ani¾ byste museli odinstalovat aktuální verze, abyste odstranili pøedchozí verze módu, kdy¾ jste zapomnìli odinstalovat a vymazat pøedchozí verze modu pøed instalací nové verze. Normálnì tuto volbu nechte nastavenou na Ne a volbu Ne obnovte po odstranìní pøedchozích verzí módu, které se zobrazují jako èásteènì nainstalované.</li>
< 				<li><strong>Povolit Vymazat pro samostatnì nainstalované módy</strong> - umo¾ní zapnutí volby zobrazení tlaèítka <strong>Vymazat</strong> vedle tlaèítka Odinstalovat u samostatnì instalovaných módù, napø. pro vymazání pøedchozí verze módu, která nebyla vymazána pøed instalací novìj¹í verze. Výchozí volbou je <strong>Ne</strong>.  Doporuèujeme, abyste tuto volbu povolili pouze v pøípadì, kdy je potøeba vymazat pøedchozí verzi módu, bez nutnosti odinstalování aktuální verze za úèelem vymazání pøedchozí verze, a za normálních okolností ponechte tuto volbu nastavenou na <strong>Ne</strong> a volbu Ne obnovte po odstranìní pøedchozích verzí módu, které se zobrazují jako nainstalované.</li>
< 				<li><strong>Povolit smazání podpùrné slo¾ky po vymazání modu</strong> - umo¾ní zapnutí volby smazání slo¾ky (slo¾ek) pøidru¾ených k módu pøi mazání módu. Výchozí volbou je <strong>Ne</strong>. Doporuèujeme tuto mo¾nost povolit jen tehdy, pokud chápete nebezpeèí vymazání nezamý¹lených slo¾ek. Vìøíme, ¾e toto riziko je velmi malé.</li>
< 			</ul></p>
240a132,135
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="editor"><p class="subheadbold">Editor módù</p></a>
> 
>     <p>Editor modù (parametrù) je pøístupný ze stránky se seznamy modù. Pokud má nainstalovaný mód upravitelné parametry, uvidíte to ve sloupci Stav v seznamu modù jako -- <i>Instalováno [Mo¾nosti]</i>. Chcete-li upravit parametry módu, otevøete panel Stav a kliknìte na tlaèítko "Upravit mo¾nosti". Editovatelné parametry jsou u¾ivatelské mo¾nosti módu, napøíklad nastavení barvy pro nìco.</p>
242,243c137
< 		<p style="float:right"><a href="#top">Nahoru</a></p>
< 		<a name="analyze"><p class="subheadbold">Analýza souborù TNG</p></a>
---
>     <p>Chování cílového souboru lze øídit hodnotou parametrù. U¾ivatel módu mù¾e být napøíklad po¾ádán, aby zadal poèet dní, po které si pøeje uchovávat urèité soubory protokolu.</p>
245c139
< 		<p>Tento nástroj na zálo¾ce <strong>Analýza souborù TNG</strong>, který vytvoøil Rick Bisbee, existoval døíve jako opravný mód. Analýza souborù TNG umo¾òuje vývojáøùm zkoumat pùsobení módù navzájem. Situace, kdy dva módy mìní stejný úsek programového kódu, má témìø v¾dy za následek chybu v mana¾eru módù. Chcete-li, aby byla zálo¾ka Analýza souborù TNG zobrazena, musíte ji povolit nastavením volby <strong>Analýza souborù TNG</strong> na Ano.</p>
---
>     <p>Poèet parametrù, které mù¾e mód pou¾ít, není omezen. Ka¾dý parametr má výchozí hodnotu zobrazenou na panelu popisu editoru módu vlevo. Panel vpravo obsahuje oblast pro zmìnu hodnoty parametru. Jsou zde také dvì tlaèítka, jedno pro aktualizaci cílového souboru s hodnotou ve vstupním poli a druhé pro resetování parametru na výchozí hodnotu.</p>
247,250c141
< 		<p>Analyzér pracuje tak, ¾e prozkoumá v¹echny módy ve slo¾ce mods a vytvoøí soupis cílových souborù a úsekù programového kódu, který ka¾dý mód mìní. V levém sloupci uvede názvy dotèených souborù. Po kliknutí na název cílového souboru se na pravé stranì zobrazí seznam módù, které tento cílový soubor mìní. U ka¾dého módu je napravo zobrazen odkaz pro otevøení sekce stránky zobrazující aktuální zmìny, které obsahuje konfiguraèní soubor mana¾eru módù. U¾ivatel mù¾e porovnat zmìny cílového souboru a vidìt, kde mohou být skryty potenciální konflikty.</p>
<     
<     <p>To je u¾iteèné nejen pro nalezení konfliktù mezi dvìma módy, ale také pro poznání, které módy je tøeba vyèistit a znovu nainstalovat po pøepsání daného cílového souboru. </p>
< 		<p>Vývojáøi módù naleznou dal¹í informace na TNG Wiki v èlánku <a href="https://tng.lythgoes.net/wiki/index.php?title=Using_the_Mod_Analyzer" target="_blank">Using the Mod Analyzer (v angliètinì)</a>.</p>
---
>     <p><b>A» u¾ zadáváte øetìzce nebo celá èísla, není nutné je uzavírat do uvozovek</b>. Editor módù to zjistí pøi aktualizaci hodnot.</p>
255c146,149
<     <td class="tngshadow">
---
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="viewlog"><p class="subheadbold">Zobrazit protokol</p></a>
>     <p>V závislosti na u¾ivatelských preferencích na kartì Mo¾nosti se pøi chybách generovaných bìhem instalace nebo odstranìní módu automaticky otevøe protokol chyb, tak¾e administrátor mù¾e vidìt, co se pokazilo. Jinak mù¾ete otevøít protokol a zobrazit podrobnosti o svých operacích.</p>
257,260c151,152
<         <p style="float:right"><a href="#top">Top</a></p>
<         <a name="parser"><p class="subheadbold">Tabulka parseru</p></a>
<         <p>Tento nástroj je urèen hlavnì pro vývojáøe. Tabulka parseru ukazuje, jak Mana¾er módù zanalyzoval konfiguraèní soubor módu (.cfg) zapracováním jeho komponent do tabulky, která pak prochází do dal¹ích skriptù Mana¾eru módù pro dal¹í zpracování. Pokud se vyskytne problém s módem, první místo, které je tøeba zkontrolovat, je tabulka parseru, aby se zjistilo, zda jsou správnì zachyceny v¹echny pøíkazy a argumenty módu.</p>
<       <p>Tuto zálo¾ku mù¾ete pou¾ít k výbìru módu ze seznamu, jeho¾ tabulku chcete zobrazit, nebo, pokud jste povolili mo¾nost Zobrazit dal¹í nástroje pro vývojáøe, mù¾ete kliknout na název módu v Seznamu módù a zobrazit tabulku parseru pro tento mód.</p>
---
>     <p>Øádek protokolu zobrazuje datum a èas, pokus o operaci, název a verzi módu, výsledek a funkcionáøe (správce webu), který operaci provedl.
>     </p>
262c154,155
<       <p>Zobrazení této zálo¾ky je volitelné. Chcete-li jej pou¾ít, vyberte mo¾nost 'Nastavení zobrazení/Zobrazit dal¹í nástroje pro vývojáøe' na zálo¾ce Mo¾nosti. Pokud je volba zálo¾ky vypnuta, odkaz na stránce se seznamem nebude také povolen.</p>
---
>     <p>Chcete-li zobrazit podrobnosti, kliknìte na øádek protokolu. Otevøe se panel. Ka¾dý pøíkaz (zaèínající znakem %) zobrazuje èíslo øádku v konfiguraèním souboru módu, kde byl pøíkaz proveden, a výsledek.
>     </p>
264c157,199
<     </td>
---
>     <p>Jak bylo uvedeno døíve, chyby jsou doprovázeny èíslem E odkazujícím na èíslo øádku v souboru TNG Mana¾eru módù, kde k chybì do¹lo. Pokud k tomu do¹lo bìhem pokusu o instalaci, E-èíslo bude odkazovat na soubor classes/modinstaller.class.php. Kdy¾ tento soubor otevøete s èíslem øádku, èasto uvidíte poblí¾ komentáø vysvìtlující chybu a navrhující øe¹ení.</p>
> 
>     <p>Nápovìdu k pøíkazùm a jejich pou¾ití naleznete na TNGWiki. Mù¾ete také kliknout na odkaz <b>Syntaxe módù</b> pøímo pod zálo¾kami Mana¾era módù na vìt¹inì obrazovek MM.</p>
> 
> </td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="options"><p class="subheadbold">Mo¾nosti</p></a>
>     <p>Karta <strong>Mo¾nosti</strong> otevøe obrazovku u¾ivatelských preferencí rozdìlenou do tøí èástí.</p>
> </p>V sekci <b>Protokol Mana¾eru módù</b> mù¾ete zadat preference týkající se souboru protokolu. Pod <i>Název souboru protokolu</i> mù¾ete ve skuteènosti zadat cestu k serveru, abyste umístili svùj protokol mimo oblast webových stránek, která je pøístupná z prohlí¾eèe. Výchozí nastavení je umístit jej do koøenového adresáøe TNG.</p>
>     <p><b>Nastavení zobrazení</b> je místo, kde mù¾ete zobrazit nebo skrýt karty na stránce Mana¾eru módù.</p>
>     <p><b>Jiné</b> vám umo¾òuje rozhodnout, jak nakonfigurovat schopnost Mana¾eru módù mazat mody a jejich podpùrné slo¾ky.</p>
>     <p>
> 			<ul>
>  				<li><strong>Povolit Vymazat vybrané pro èásteènì nainstalované módy</strong> - povolí zobrazení tlaèítka <strong>Vymazat</strong> v seznamu vybraných Èásteènì nainstalovaných módù, pomocí kterého lze vymazat více módù najednou, jako napø. vymazání pøedchozích verzí modù, které nebyly vymazány pøed instalací novìj¹í verzí. Výchozí volbou je <strong>Ne</strong>. Tuto volbu doporuèujeme povolit pouze v pøípadì, ¾e potøebujete vymazat více modù, ani¾ byste museli odinstalovat aktuální verze, abyste odstranili pøedchozí verze módu, kdy¾ jste zapomnìli odinstalovat a vymazat pøedchozí verze modu pøed instalací nové verze. Normálnì tuto volbu nechte nastavenou na Ne a volbu Ne obnovte po odstranìní pøedchozích verzí módu, které se zobrazují jako èásteènì nainstalované.</li>
> 				<li><strong>Povolit Vymazat pro samostatnì nainstalované módy</strong> - umo¾ní zapnutí volby zobrazení tlaèítka <strong>Vymazat</strong> vedle tlaèítka Odinstalovat u samostatnì instalovaných módù, napø. pro vymazání pøedchozí verze módu, která nebyla vymazána pøed instalací novìj¹í verze. Výchozí volbou je <strong>Ne</strong>.  Doporuèujeme, abyste tuto volbu povolili pouze v pøípadì, kdy je potøeba vymazat pøedchozí verzi módu, bez nutnosti odinstalování aktuální verze za úèelem vymazání pøedchozí verze, a za normálních okolností ponechte tuto volbu nastavenou na <strong>Ne</strong> a volbu Ne obnovte po odstranìní pøedchozích verzí módu, které se zobrazují jako nainstalované.</li>
> 				<li><strong>Povolit smazání podpùrné slo¾ky po vymazání modu</strong> - umo¾ní zapnutí volby smazání slo¾ky (slo¾ek) pøidru¾ených k módu pøi mazání módu. Výchozí volbou je <strong>Ne</strong>. Doporuèujeme tuto mo¾nost povolit jen tehdy, pokud chápete nebezpeèí vymazání nezamý¹lených slo¾ek. Vìøíme, ¾e toto riziko je velmi malé.</li>
> 		</ul>
>   </p>
>     <p>Nastavte pøedvolby, jak potøebujete, a stisknìte tlaèítko <i>Ulo¾it</i>.</p>
> </td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="analyzer"><p class="subheadbold">Analýza souborù TNG</p></a>
>     <p>Karta <strong>Analýza souborù TNG</strong> je volitelná karta, kterou lze povolit na obrazovce Mo¾nosti.</p>
> 
> <p>Toto je pokroèilý nástroj, který vám umo¾òuje vybrat soubor TNG a zobrazit, které módy mìní nebo zmìní tento konkrétní soubor TNG. Pokud se soubor neobjeví v seznamu vlevo, znamená to, ¾e na nìj necílí ¾ádné mody.</p>
> 
> <p>Kdy¾ vyberete soubor v levém sloupci, zobrazí se v pravém sloupci s názvy a stavem modù, které jej ovlivní. Odtud mù¾ete kliknout na odkaz "Zobrazit úpravu" a zobrazit skuteènou zmìnu, kterou provede v cílovém souboru. <i>Není v rozsahu tohoto souboru nápovìdy probírat pøíkazy konfigurace módù a jak fungují</i>. Informace naleznete na TNGWiki.</p>
> 
> <p>Pokud jste zvolili na kartì Mo¾nosti, Nastavení zobrazení, "Zobrazit akce v analyzátoru modù", uvidíte také odkazy, které vám umo¾ní nainstalovat, odinstalovat nebo smazat mód pøímo z této obrazovky, v závislosti na aktuálním stavu. </p>
> <p>V horní èásti seznamu uvidíte panel filtrù s výbìry pro <i>V¹echny mody</i>, <i>Pouze nainstalované mody</i> nebo <i>Instalované+èásteènì nainstalované mody</i>. Výbìrem <i>Pouze nainstalované mody</i> a kliknutím na <i>Odeslat dotaz</i> omezíte soubory v levém sloupci na ty, které jsou ovlivnìny pouze aktuálnì nainstalovanými mody.</p>
> 
>     <p>Tento nástroj je u¾iteèný nejen pro nalezení konfliktù mezi dvìma módy, ale také pro zji¹tìní, které módy je tøeba po nahrazení daného cílového souboru vyèistit a znovu nainstalovat. </p>
> 
>     <p>The TNG Wiki provides additional information for the mod developers on <a href="https://tng.lythgoes.net/wiki/index.php?title=Using_the_Mod_Analyzer" target="_blank">Using the Mod Analyzer</a>.</p>
>     <p>Dal¹í informace o <a href="https://tng.lythgoes.net/wiki/index.php?title=Using_the_Mod_Analyzer" target="_blank">Pou¾ití analyzátoru módù< /a> poskytuje vývojáøùm módù TNG Wiki.</p>
> 
> </td>
268c203,206
<     <td class="tngshadow">
---
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="parser"><p class="subheadbold">Tabulka parseru</p></a>
>     <p>Tento nástroj je urèen hlavnì pro ladìní modù. Tabulka parseru ukazuje, jak Mana¾er módù zanalyzoval pøíkazy konfiguraèního souboru módu (.cfg). Je to zobrazeno ve formì tabulky, pøièem¾ ka¾dý øádek pøedstavuje pøíkaz módu. Data uvedená v tabulce jsou pøedána dal¹ím skriptùm mana¾eru módù k dal¹ímu zpracování - instalaci, odstranìní atd. Pokud se vyskytne problém s módem, je dobré zaèít s tabulkou parseru, abyste zjistili, zda jsou v¹echny pøíkazy a argumenty módu správnì zachyceny.</p>
270,273c208,212
<         <p style="float:right"><a href="#top">Top</a></p>
<         <a name="custtext"><p class="subheadbold">Doporuèené aktualizace</p></a>
<         <p>Zálo¾ka Doporuèené aktualizace je volitelná zálo¾ka, která mù¾e být povolena na obrazovce Mo¾nosti, a umo¾ní vám aktualizovat soubory cust_text.php, pokud jste tak neuèinili jako souèást aktualizace TNG.</p>
< 		<p>Pou¾ití zálo¾ky se pøedpokládá v pøípadì, ¾e mód nemù¾e být nainstalován, proto¾e hledá nový komentáøový øetìzec v horní èásti souborù cust_text.php poèínaje TNG v12.  Tato volba bude vypnuta po kliknutí na tlaèítko Aktualizovat a zmìnì stávajících souborù cust_text.php.  Kód kontroluje, zda byly tyto soubory ji¾ døíve aktualizovány.</p>
---
>       <p>Tuto kartu mù¾ete pou¾ít k výbìru módu ze seznamu, jeho¾ tabulku chcete zobrazit, nebo mù¾ete kliknout na název modu v seznamu módù a zobrazit tabulku parseru pro tento mód, <i>pokud jste povolili mo¾nost Zobrazit dal¹í nástroje pro vývojáøe</i>.</p>
> 
>       <p>Zobrazení této karty je volitelné. Chcete-li jej pou¾ít, vyberte na kartì Mo¾nosti "Zobrazit dal¹í nástroje pro vývojáøe". Pokud je mo¾nost karty vypnutá, bude také deaktivován odkaz na stránce seznamu.</p>
> 
>       <p><i>Není v rozsahu tohoto souboru nápovìdy probírat pøíkazy konfigurace módù a jak fungují</i>. Informace naleznete na TNGWiki.</p>
277,280c216,345
<     
<   </table>
< </body>
< </html>
---
> 
> <tr class="databack">
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="recommended"><p class="subheadbold">Doporuèené aktualizace</p></a>
>     <p>Zálo¾ka <strong>Doporuèené aktualizace</strong> je volitelná a lze ji povolit na obrazovce Mo¾nosti. Umo¾òuje aktualizovat soubory cust_text.php, pokud jste tak neuèinili v rámci readme aktualizace TNG. </p>
> 
> 
> 
> <p>Dal¹í informace (v angliètinì) naleznete v èlánku <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager" target="_blank">Mod Manager</a> a v kategorie èlánkù <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:TNG_Mod_Manager" target="_blank">TNG Mod Manager</a> na TNG Wiki.</p>
> <p>V TNG Wiki si mù¾ete prohlédnout èlánek <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Enhancements" target="_blank">Mod Manager</a> jaká vylep¹ení byla provedena v TNG v12.</p>
> 
> 	</td>
> </tr>
> 
> <tr class="databack">
>   <td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="credits"><p class="subheadbold">Podìkování</p></a>
> 
>       <table style='table-layout:fixed;width:100%'>
>         <tr>
>           <td style='width:20%;vertical-align:top;'>
>             Brian McFadyen
>           </td>
>           <td style='width:80%'>
>             <ul><li>autor</li></ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Sean Schwoere
>           </td>
>           <td>
>             <ul>
>                 <li>integrace pro Joomla</li>
>                 <li>lep¹í integrace pro instalaci, odebírání a správu módù</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Ken Roy
>           </td>
>           <td>
>             <ul>
>                 <li>vedoucí vývojového týmu, verze 12 - 14</li>
>                 <li>vytvoøil kartu Zobrazit protokol</li>
>                 <li>vytvoøil kartu Mo¾nosti</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Rick Bisbee
>           </td>
>           <td>
>             <ul>
>                 <li>vedoucí programátor, verze 12 - 14</li>
>                 <li>pøidal dávkové zpracování</li>
>                 <li>pøidal kartu Zobrazit tabulku parseru</li>
>                 <li>pøidal kartu Analyzovat soubory TNG</li>
>                 <li>refaktoroval kód TNG pro údr¾bu, v14</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Jeff Robson
>           </td>
>           <td>
>             <ul>
>                 <li>beta testovací tým, verze 12</li>
>                 <li>pøidal kartu Ovlivnìné soubory</li>
>                 <li>hlavní pøíspìvky ke stylu</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Robin Richmond
>           </td>
>           <td>
>             <ul>
>                 <li>beta testovací tým, verze 12</li>
>                 <li>poskytl kód pro pøeru¹ení dlouhých øádkù textu bez mezer, který se pou¾ívá pøedev¹ím ve sloupci Stav MM</li>
>                 <li>hlavní pøíspìvky k zobrazení protokolu MM</li>
>             </ul>
>           </td>
>         </tr>
> 
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Michel Kirsh
>           </td>
>           <td>
>             <ul>
>                 <li>beta testovací tým, verze 14</li>
>                 <li>hlavní aktualizace Analýzy souborù TNG</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>               beta testovací tým TNG v14
>           </td>
>           <td>
> 
>             <ul>
>                 <li>Mogens C. Fenger</li>
>                 <li>William Herndon</li>
>                 <li>Michel Kirsch</li>
>                 <li>Ron Krzmarzick</li>
>                 <li>Roger Moffat</li>
>                 <li>Jan-Thore Solem</li>
>             </ul>
>           </td>
>         </tr>
>       </table>
>   </td>
> </tr>
> </table>
> </body>
\ No newline at end of file
diff -r TNG/languages/Czech/modmanager_help.php TNG1403/languages/Czech/modmanager_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
34c30,36
<       <td class="tngshadow">		
---
>       <td class="tngshadow">
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>       		
diff -r TNG/languages/Czech/more_help.php TNG1403/languages/Czech/more_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
28a25,29
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/mostwanted_help.php TNG1403/languages/Czech/mostwanted_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31a28,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/notes2_help.php TNG1403/languages/Czech/notes2_help.php
12,13c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
24a25,29
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/notes_help.php TNG1403/languages/Czech/notes_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
29a26,30
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/pedconfig_help.php TNG1403/languages/Czech/pedconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
33a30,35
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>       
126c128
< 		<span class="optionhead">Zobrazit poznámky v Registru</span>
---
> 		<span class="optionhead">Zobrazit poznámky a vlastní události v Registru</span>
140,154c142,166
< 		<a name="rel"><p class="subheadbold">Schéma pøíbuzenských vztahù</p></a>
< 		<span class="optionhead">Výchozí poèet vztahù</span>
< 		<p>Tato hodnota udává poèet pøíbuzenských vztahù, které bude TNG hledat pøi prvním spu¹tìní schématu pøíbuzenských vztahù. Po nalezení tohoto
< 		poètu vztahù se proces zastaví. Pokud vá¹ strom neobsahuje komplikované pøíbuzenské vztahy, mù¾ete tuto hodnotu nastavit
< 		na 1, abyste u¹etøili èas prùbìhu.</p>
< 
< 		<span class="optionhead">Maximální poèet vztahù</span>
< 		<p>Pokud si u¾ivatel myslí, ¾e existuje více pøíbuzenských vztahù, mù¾e toto èíslo zvý¹it a TNG se je pokusí nalézt.
< 		Toto èíslo uvádí maximum vztahù, které povolíte programu hledat. Nenastavujte je na vy¹¹í èíslo,
< 		ne¾ je úroveò slo¾itosti va¹eho stromu. Èím je èíslo ni¾¹í, tím více èasu u¹etøíte lidem pøi zobrazení tohoto schématu.
< 		Pokud napø. mezi dvìma lidmi existuje pouze jeden pøíbuzenský vztah, ale vy jich budete hledat 5,
< 		TNG bude po nalezení prvního vztahu dále hledat marnì.</p>
< 
< 		<span class="optionhead">Maximální poèet generací</span>
< 		<p>Maximální poèet generací, které povolíte náv¹tìvníkovi na stránce pøíbuzenských vztahù najednou prohledat. Mù¾e to být na této stránce také výchozí poèet.</p>
---
> 		<a name="rel"><p class="subheadbold">Schéma spojení</p></a>
> 		<span class="optionhead">Maximální poèet spu¹tìní vyhledávání spojení</span>
> 		<p>Maximální poèet spojení, které lze nalézt pøi vyhledávání. Nastavte mezi 1 a 9999. V¹imnìte si, ¾e pouze nìkterá vzácná spu¹tìní vedou k zobrazení cesty. 
>       Je-li nastaveno na 1, prohledává se pouze nejkrat¹í cesta. Výchozí hodnota je 99.</p>
> 
> 		<span class="optionhead">Maximální délka cest spojení</span>
> 		<p>Maximální poèet krokù v ka¾dém spojení. Výchozí hodnota je 30.</p>
> 
> 		<span class="optionhead">Zobrazit textový pøíkaz cesty</span>
> 		<p>Zvolte, zda se má ve výchozím nastavení nad grafickou prezentací zobrazovat textový popis ka¾dé cesty.</p>
> 
> 		<span class="optionhead">Zobrazit rámeèky osob v kompaktní podobì</span>
> 		<p>Zvolte, zda se má pole ka¾dé osoby zobrazit v minimalizované podobì, bez náhledových fotografií a nìkterých zkrácených prvkù celého jména. 
>       Jinými slovy, pokud toto nastavíte na <i>Ne</i>, zobrazí se miniatury a celá jména. Pokud to nastavíte na <i>Ano</i>, diagram bude kompaktnìj¹í.</p>
> 
> 		<span class="optionhead">Seøadit cesty podle</span>
> 		<p>Vyberte, zda budou nalezené cesty seøazeny podle délky, poètu sòatkù nebo vùbec. Výchozí hodnota je délka.</p>
> 
> 		<span class="optionhead">Anchor ID</span>
> 		<p>ID "Osoby 2", které bude pou¾ito k hledání spojení, dokud u¾ivatel nevybere Osoba 2. POZNÁMKA: Mìlo by to být platné ID ve stejném stromu jako Osoba 1. 
>     Pokud je tento parametr prázdný a pøihlá¹ený u¾ivatel je èlenem tohoto stromu, bude ID u¾ivatele navr¾eno jako Osoba 2.</p>
> 
> 		<span class="optionhead">Maximální poèet man¾elství ve spojení</span>
> 		<p>Maximální poèet man¾elství povolený v jakékoli cestì pøipojení. Pokud je tato hodnota pøekroèena, je pøipojení ignorováno, aby se zabránilo 
>     zobrazení pøíli¹ ¹irokých diagramù.</p>
diff -r TNG/languages/Czech/people_help.php TNG1403/languages/Czech/people_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
34a31,35
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
86c87
<         <span class="optionhead">Pohlaví / Pøezdívka / Titul / Pøedpona / Pøípona / Poøadí jména a pøíjmení</span>		
---
>         <span class="optionhead">Pøezdívka / Titul / Pøedpona / Pøípona / Poøadí jména a pøíjmení</span>		
91c92,95
<         		
---
> 
>         <span class="optionhead">Pohlaví</span>
>         <p>Vyberte Neznámý, Mu¾, ®ena nebo Jiné. Je-li zvoleno Jiné, objeví se vpravo nové pole, do kterého mù¾ete zadat preferovaný popis pohlaví.</p>
>          		
104a109,110
> 
>         <p>Poznámka k událostem alternativního narození: Výchozí alternativní typ události narození je "Køtiny". Pole Køest mù¾e být zcela vypnuto v Nastavení/Základní nastavení/Vzhled a definice stránek, ale mù¾ete zde také zadat tagy GEDCOM pro jiné alternativní události narození. Pokud napøíklad zadáte "CHR,BAPM" jako alternativní typ události narození, u¾ivatel se mù¾e rozhodnout, ¾e jako alternativní událost narození pro jednotlivce urèí buï Køest nebo Køest. Poøadí také uvádí, který typ události je preferován jako výchozí.
108c114
<         <strong>Pozn.:</strong> Nechcete-li vidìt pole spojené s CJKSpd, jdìte na Nastavení/Základní nastavení a zde tuto mo¾nost vypnìte (je tøeba se pak odhlásit a znovu pøihlásit).</p>	
---
>         <strong>Pozn.:</strong> Nechcete-li vidìt pole spojené s CJKSpd, jdìte na Nastavení/Základní nastavení/Ochrana údajù a zde tuto mo¾nost vypnìte (je tøeba se pak odhlásit a znovu pøihlásit).</p>	
125,127c131,133
<         <span class="optionhead">Jiné události</span>		
<         <p>Chcete-li pøidat dal¹í události, kliknìte na tlaèítko "Pøidat nové" vedle <strong>Jiné události</strong>. Viz odkaz <a href="events_help.php">Nápovìda</a> pro více 		
<         informací o pøidání nových událostí. Po pøidání události se pod tlaèítkem "Pøidat nové" zobrazí v tabulce krátké shrnutí. Tlaèítka akcí 		
---
>         <span class="optionhead">Jiné události / atributy</span>		
>         <p>Chcete-li pøidat dal¹í události, kliknìte na tlaèítko "Pøidat nové" vedle <strong>Jiné události / atributy</strong>. Viz odkaz <a href="events_help.php">Nápovìda</a> pro více 		
>         informací o pøidání nových událostí / atributù. Po pøidání události / atributu se pod tlaèítkem "Pøidat nové" zobrazí v tabulce krátké shrnutí. Tlaèítka akcí 		
diff -r TNG/languages/Czech/places_googlemap_help.php TNG1403/languages/Czech/places_googlemap_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31a28,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>       
44c46
< 		Pro vyhledání souøadnic mù¾ete také vyu¾ít aplikaci Streetmap (<a href="http://www.streetmap.co.uk" target="_blank">http://www.streetmap.co.uk</a>).</p>
---
> 		Pro vyhledání souøadnic mù¾ete také vyu¾ít aplikaci Streetmap (<a href="https://www.streetmap.co.uk" target="_blank">https://www.streetmap.co.uk</a>).</p>
67c69
< 		Pro tyto státy musíte pou¾ít odkaz <a href="http://maps.google.com/" target="_blank">Plné vyhledávání v Google Maps</a>.</p>
---
> 		Pro tyto státy musíte pou¾ít odkaz <a href="https://maps.google.com/" target="_blank">Plné vyhledávání v Google Maps</a>.</p>
118c120
< 		<p>Dal¹í nápovìdu najdete na <a href="http://www.google.com/apis/maps/documentation/" target="_blank">Google Maps API</a>.</p>
---
> 		<p>Dal¹í nápovìdu najdete na <a href="https://www.google.com/apis/maps/documentation/" target="_blank">Google Maps API</a>.</p>
diff -r TNG/languages/Czech/places_help.php TNG1403/languages/Czech/places_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
164a166,168
>     
>     <span class="optionhead">Obnovit</span>
> 		<p>Za¹krtnutím tohoto políèka zaènete znovu od zaèátku seznamu míst. Jinak bude geokódování pokraèovat od místa, kde skonèila poslední dávka.</p>
diff -r TNG/languages/Czech/reports_help.php TNG1403/languages/Czech/reports_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
18c14
< 			<a href="eventtypes_help.php" class="lightlink">&laquo; Nápovìda: Vlastní typy událostí</a> &nbsp; | &nbsp;
---
> 			<a href="eventtypes_help.php" class="lightlink">&laquo; Nápovìda: Typy událostí / atributù</a> &nbsp; | &nbsp;
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
73,74c74,75
< 		<p>Zkopírováním z levé èásti do pravé oznaète, která pole chcete ve svém reportu zobrazit. Provést to mù¾ete
< 		výbìrem pole a kliknutím na tlaèítko <em>Pøidat >></em> nebo jednodu¹e dvojklikem na název pole (pouze IE). </p>
---
> 		<p>Zkopírováním z levé èásti do pravé urèíte, která pole chcete ve svém reportu zobrazit. Provést to mù¾ete
> 		pøeta¾ením pole z levé èásti doprava nebo jednodu¹e dvojitým kliknutím na název pole.</p>
76,77c77
< 		<p>Ze seznamu polí pro zobrazení mù¾ete pole odstranit jeho výbìrem
< 		v pravé èásti a kliknutím na tlaèítko <em><< Odstranit</em> nebo jednodu¹e dvojklikem na název pole (pouze IE). </p>
---
> 		<p>Pole mù¾ete odstranit ze seznamu zobrazení vpravo dvojitým kliknutím na název pole.</p>
79,80c79,80
< 		<p>Pole v seznamu zobrazení nahoøe jsou zobrazena v reportu nalevo. Zmìnit poøadí zobrazovaných polí
< 		mù¾ete výbìrem pole v pravé èásti a kliknutím na tlaèítka <em>Posunout nahoru</em> a <em>Posunout dolù</em> mù¾ete pole posunout nahoru nebo dolù.</p>
---
> 		<p>Pole, která jsou v seznamu zobrazení nahoøe, budou v reportu zobrazena nalevo. Zmìnit poøadí zobrazovaných polí
> 		mù¾ete kliknutím a podr¾ením pole v pravé èásti a pøetáhnutím v seznamu nahoru nebo dolù.</p>
86c86
< 
---
>     
88a89,90
>     
> 		<p>Jakýkoli pøíkaz zaènìte výbìrem názvu pole z levé horního èásti a jeho pøeta¾ením do pravé èásti. Mù¾ete také dvakrát kliknout na název pole.</p>    
109c111
< 		zkopírujte do pravé èásti jeho výbìrem a kliknutím na sousední tlaèítko <em>Pøidat >></em> nebo jednodu¹e dvojklikem na název operátora (pouze IE).</p>
---
> 		zkopírujte do pravé èásti pøeta¾ením nebo dvojklikem na název operátora.</p>
112c114
< 		<em>aktuální den</em>. Chcete-li vybrat hodnotu konstantního øetìzce, zadejte do pole <em>Konstantní øetìzec</em> hodnotu øetìzce bez uvozovek a kliknìte na sousední tlaèítko <em>Pøidat >></em>.
---
> 		<em>aktuální den</em>. Chcete-li vybrat hodnotu konstantního øetìzce, zadejte do pole <em>Konstantní øetìzec</em> hodnotu øetìzce bez uvozovek a kliknìte na sousední tlaèítko <em>>></em>.
114c116
< 		tlaèítko <em>Pøidat >></em>.</p>
---
> 		tlaèítko <em>>></em>.</p>
116c118
< 		<p>Odstranit jakoukoli polo¾ku z pravé èásti mù¾ete jejím výbìrem a kliknutím na tlaèítko <em><< Odstranit</em> nebo jednodu¹e dvojklikem na polo¾ku (pouze IE).
---
> 		<p>Odstranit jakoukoli polo¾ku z pravé èásti mù¾ete dvojklikem na polo¾ku.
123c125
< 		Pole, podle kterých má být tøídìno, vyberte zkopírováním z levé èásti do pravé. Provést to mù¾ete	výbìrem pole a kliknutím na tlaèítko <em>Pøidat >></em> nebo jednodu¹e dvojklikem na název pole (pouze IE).
---
> 		Pole, podle kterých má být tøídìno, pøeta¾ením z levého pole doprava nebo kliknutím na název pole.</p>
140,141c142,143
<     <span class="optionhead">Ulo¾it report vs. Ulo¾it a ukonèit</span>
< 		<p>Chcete-li report ulo¾it, kliknite na "Ulo¾it report" a zùstanete na stejné stránce a mù¾ete pokraèovat v editaci. Kliknutím na "Ulo¾it a ukonèit" report ulo¾íte a vrátíte se na menu Reporty.</p>
---
>     <span class="optionhead">Ulo¾it + Konec vs. Ulo¾it + Zùstat</span>
> 		<p>Chcete-li report ulo¾it, kliknite na "Ulo¾it + Konec" a zùstanete na stejné stránce a mù¾ete pokraèovat v editaci. Kliknutím na "Ulo¾it + Zùstat" report ulo¾íte a vrátíte se na menu Reporty.</p>
143c145
< 		<p>Nìkolik vzorových reportù mù¾ete vidìt na <a href="http://lythgoes.net/genealogy/demo.php" target="_blank">http://lythgoes.net/genealogy/demo.php</a>. Zvolte zde Administrative Demo a vyhledejte sekci Reporty.</p>
---
> 		<p>Nìkolik vzorových reportù mù¾ete vidìt na <a href="https://lythgoes.net/genealogy/demo.php" target="_blank">https://lythgoes.net/genealogy/demo.php</a>. Zvolte zde Administrative Demo a vyhledejte sekci Reporty.</p>
diff -r TNG/languages/Czech/repositories_help.php TNG1403/languages/Czech/repositories_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/second_help.php TNG1403/languages/Czech/second_help.php
3c3
< echo help_header("Nápovìda: Druhotné procesy");
---
> echo help_header("Nápovìda: Nástroje po importu");
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
21c17
< 		<span class="largeheader">Nápovìda: Druhotné procesy</span>
---
> 		<span class="largeheader">Nápovìda: Nástroje po importu</span>
28a25,29
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
30,31c31,32
< 		<a name="what"><p class="subheadbold">Co jsou to druhotné procesy?</p></a>
< 		<p>Druhotné procesy jsou operace, které lze provést na va¹ich datech bezprostøednì po ukonèení importu. Chcete-li nìjakou operaci provést,
---
> 		<a name="what"><p class="subheadbold">Co jsou to Nástroje po importu?</p></a>
> 		<p>Nástroje po importu jsou operace, které lze provést na va¹ich datech bezprostøednì po ukonèení importu. Chcete-li nìjakou operaci provést,
55,56c56,57
< 		<a href="http://www.gendexnetwork.org">GenDex Network</a> nebo <a href="http://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.</p>
< 
---
> 		<!--<a href="https://www.gendexnetwork.org">GenDex Network</a> or --><a href="https://www.familytreeseeker.com">FamilyTreeSeeker.com</a></p>
>     
58c59
< 		<p>Máte-li indexovaný soubor GENDEX, nav¹tivte <a href="http://www.gendexnetwork.org">GenDex Network</a> nebo <a href="http://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.
---
> 		<p>Máte-li indexovaný soubor GENDEX, nav¹tivte <!--<a href="https://www.gendexnetwork.org">GenDex Network</a> or --><a href="https://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.
74,75c75,76
< 		<p>Vyhledány budou v¹echny osoby, které zemøely v nedávné minulosti, a budou oznaèeny jako "Neveøejné". Pøesný poèet let vychází z volby "Kolik let po smrti nechat osobu jako neveøejnou"
<     na stránce Základní nastavení (v èásti Ochrana údajù). Tam, kde je taková osoba partnerem, dojde také k oznaèení rodiny jako neveøejné. Na rozdíl od nástroje Obnovit ®ijicí zde 
---
> 		<p>Vyhledány budou v¹echny osoby, které zemøely v nedávné minulosti, a budou oznaèeny jako "Neveøejné". Pøesný poèet let vychází z volby "Osoba je neveøejná, pokud zemøela pøed ménì ne¾ tolika lety"
>     na stránce Nastavení importu. Tam, kde je taková osoba partnerem, dojde také k oznaèení rodiny jako neveøejné. Na rozdíl od nástroje Obnovit ¾ijicí zde 
diff -r TNG/languages/Czech/setup_help.php TNG1403/languages/Czech/setup_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,18c12,14
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
< 			<a href="second_help.php" class="lightlink">&laquo; Nápovìda: Druhotné procesy</a> &nbsp; | &nbsp;
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
> 			<a href="second_help.php" class="lightlink">&laquo; Nápovìda: Nástroje po importu</a> &nbsp; | &nbsp;
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/sources_help.php TNG1403/languages/Czech/sources_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/templateconfig_help.php TNG1403/languages/Czech/templateconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
25a22,27
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>   
28c30
< 			<a href="http://lythgoes.net/genealogy/templates.php">http://lythgoes.net/genealogy/templates.php</a>). Po ulo¾ení zmìn bude nová ¹ablony úèinkovat.</p>
---
> 			<a href="https://tngsitebuilding.com/templates.php">https://tngsitebuilding.com/templates.php</a>). Po ulo¾ení zmìn bude nová ¹ablony úèinkovat.</p>
53c55
< 			sekcích pomocí seznamu názvù odkazù a jejich URL na jednom øádku oddìlených èárkou. Napø. <em>TNG, http://www.tngsitebuilding.com</em>.</p>
---
> 			sekcích pomocí seznamu názvù odkazù a jejich URL na jednom øádku oddìlených èárkou. Napø. <em>TNG, https://tngsitebuilding.com</em>.</p>
diff -r TNG/languages/Czech/text.php TNG1403/languages/Czech/text.php
5,7c5,7
< 		$text['browseallsources'] = "Prohlédnout v¹echny prameny";
< 		$text['shorttitle'] = "Krátký název";
< 		$text['callnum'] = "Archivní èíslo";
---
> 		$text['browseallsources'] = "Prohlédnout v¹echny prameny";
> 		$text['shorttitle'] = "Krátký název";
> 		$text['callnum'] = "Archivní èíslo";
10,14c10,14
< 		$text['other'] = "Dal¹í informace";
< 		$text['sourceid'] = "ID èíslo pramenu";
< 		$text['moresrc'] = "Dal¹í prameny";
< 		$text['repoid'] = "ID èíslo úlo¾i¹tì";
< 		$text['browseallrepos'] = "Prohlédnout v¹echny úlo¾i¹tì";
---
> 		$text['other'] = "Dal¹í informace";
> 		$text['sourceid'] = "ID èíslo pramenu";
> 		$text['moresrc'] = "Dal¹í prameny";
> 		$text['repoid'] = "ID èíslo úlo¾i¹tì";
> 		$text['browseallrepos'] = "Prohlédnout v¹echny úlo¾i¹tì";
19,23c19,23
< 		$text['newlanguage'] = "Nový jazyk";
< 		$text['changelanguage'] = "Zmìna jazyka";
< 		$text['languagesaved'] = "Jazyk ulo¾en";
< 		$text['sitemaint'] = "Právì probíhá údr¾ba webových stránek";
< 		$text['standby'] = "Webové stránky jsou doèasnì nedostupné, proto¾e probíhá aktualizace databáze. Zkuste to, prosím, znovu za pár minut. Pokud budou stránky nedostupné del¹í dobu, kontaktujte majitele tìchto stránek.";
---
> 		$text['newlanguage'] = "Nový jazyk";
> 		$text['changelanguage'] = "Zmìna jazyka";
> 		$text['languagesaved'] = "Jazyk ulo¾en";
> 		$text['sitemaint'] = "Právì probíhá údr¾ba webových stránek";
> 		$text['standby'] = "Webové stránky jsou doèasnì nedostupné, proto¾e probíhá aktualizace databáze. Zkuste to, prosím, znovu za pár minut. Pokud budou stránky nedostupné del¹í dobu, kontaktujte majitele tìchto stránek.";
28,37c28,37
< 		$text['gedstart'] = "GEDCOM zaèínající od";
< 		$text['producegedfrom'] = "Vytvoøit GEDCOM soubor pro";
< 		$text['numgens'] = "Poèet generací";
< 		$text['includelds'] = "Vèetnì údajù CJKSpd";
< 		$text['buildged'] = "Vytvoø GEDCOM";
< 		$text['gedstartfrom'] = "GEDCOM zaèínající od";
< 		$text['nomaxgen'] = "Musíte zadat maximální poèet generací. Pou¾ijte tlaèítko Zpìt k návratu na pøedchozí stránku a chybu opravte.";
< 		$text['gedcreatedfrom'] = "GEDCOM vytvoøen od";
< 		$text['gedcreatedfor'] = "vytvoøen pro";
< 		$text['creategedfor'] = "Vytvoøit GEDCOM";
---
> 		$text['gedstart'] = "GEDCOM zaèínající od";
> 		$text['producegedfrom'] = "Vytvoøit GEDCOM soubor pro";
> 		$text['numgens'] = "Poèet generací";
> 		$text['includelds'] = "Vèetnì údajù CJKSpd";
> 		$text['buildged'] = "Vytvoø GEDCOM";
> 		$text['gedstartfrom'] = "GEDCOM zaèínající od";
> 		$text['nomaxgen'] = "Musíte zadat maximální poèet generací. Pou¾ijte tlaèítko Zpìt k návratu na pøedchozí stránku a chybu opravte.";
> 		$text['gedcreatedfrom'] = "GEDCOM vytvoøen od";
> 		$text['gedcreatedfor'] = "vytvoøen pro";
> 		$text['creategedfor'] = "Vytvoøit GEDCOM";
39,46c39,46
< 		$text['suggestchange'] = "Navrhnout zmìnu";
< 		$text['yourname'] = "Va¹e jméno";
< 		$text['comments'] = "Poznámky";
< 		$text['comments2'] = "Komentáø";
< 		$text['submitsugg'] = "Poslat návrh";
< 		$text['proposed'] = "Navrhovaná zmìna";
< 		$text['mailsent'] = "Dìkujeme. Va¹e zpráva byla odeslána.";
< 		$text['mailnotsent'] = "Bohu¾el, va¹e zpráva nemohla být doruèena. Kontaktujte prosím xxx pøímo na yyy.";
---
> 		$text['suggestchange'] = "Navrhnout zmìnu";
> 		$text['yourname'] = "Va¹e jméno";
> 		$text['comments'] = "Poznámky";
> 		$text['comments2'] = "Komentáø";
> 		$text['submitsugg'] = "Poslat návrh";
> 		$text['proposed'] = "Navrhovaná zmìna";
> 		$text['mailsent'] = "Dìkujeme. Va¹e zpráva byla odeslána.";
> 		$text['mailnotsent'] = "Bohu¾el, va¹e zpráva nemohla být doruèena. Kontaktujte prosím xxx pøímo na yyy.";
48,50c48,50
< 		$text['entername'] = "Zadejte, prosím, va¹e jméno";
< 		$text['entercomments'] = "Zadejte, prosím, va¹e pøipomínky";
< 		$text['sendmsg'] = "Poslat zprávu";
---
> 		$text['entername'] = "Zadejte, prosím, va¹e jméno";
> 		$text['entercomments'] = "Zadejte, prosím, va¹e pøipomínky";
> 		$text['sendmsg'] = "Poslat zprávu";
52c52
< 		$text['subject'] = "Pøedmìt";
---
> 		$text['subject'] = "Pøedmìt";
57,58c57,58
< 		$text['photoshistoriesfor'] = "Fotografie a vyprávìní pro";
< 		$text['indinfofor'] = "Osobní informace o";
---
> 		$text['photoshistoriesfor'] = "Fotografie a vyprávìní pro";
> 		$text['indinfofor'] = "Osobní informace o";
60c60
< 		$text['age'] = "Vìk";
---
> 		$text['age'] = "Vìk";
62,66c62,66
< 		$text['cause'] = "Pøíèina";
< 		$text['suggested'] = "Navr¾ené";
< 		$text['closewindow'] = "Zavøít okno";
< 		$text['thanks'] = "Dìkujeme";
< 		$text['received'] = "Vá¹ návrh byl zaslán administrátorovi tìchto stránek k posouzení.";
---
> 		$text['cause'] = "Pøíèina";
> 		$text['suggested'] = "Navr¾ené";
> 		$text['closewindow'] = "Zavøít okno";
> 		$text['thanks'] = "Dìkujeme";
> 		$text['received'] = "Vá¹ návrh byl zaslán administrátorovi tìchto stránek k posouzení.";
69,70c69
< 		$text['general'] = "Obecnì";
< 		$text['bkmkvis'] = "Pozn.: Tyto zálo¾ky jsou viditelné pouze na tomto poèítaèi a v tomto prohlí¾eèi.";
---
> 		$text['bkmkvis'] = "Pozn.: Tyto zálo¾ky jsou viditelné pouze na tomto poèítaèi a v tomto prohlí¾eèi.";
72,73c71,72
< 		$text['reviewmsg'] = "Máte doporuèenou zmìnu, která vy¾aduje va¹e posouzení. Tato zmìna se týká:";
<         $text['revsubject'] = "Doporuèená zmìna vy¾aduje va¹e posouzení";
---
> 		$text['reviewmsg'] = "Máte doporuèenou zmìnu, která vy¾aduje va¹e posouzení. Tato zmìna se týká:";
>         $text['revsubject'] = "Doporuèená zmìna vy¾aduje va¹e posouzení";
78,79c77,79
< 		$text['relcalc'] = "Urèení pøíbuzenského vztahu";
< 		$text['findrel'] = "Urèení pøíbuzenského vztahu";
---
> 	case "connections":
> 		$text['relcalc'] = "Urèení pøíbuzenského vztahu";
> 		$text['findrel'] = "Urèení pøíbuzenského vztahu";
83,94c83,94
< 		$text['select2inds'] = "Zvolte dvì osoby.";
< 		$text['findpersonid'] = "Najít ID èíslo osoby";
< 		$text['enternamepart'] = "zadejte èást jména nebo pøíjmení";
< 		$text['pleasenamepart'] = "Zadejte, prosím, èást jména nebo pøíjmení.";
< 		$text['clicktoselect'] = "kliknutím vyberte osobu";
< 		$text['nobirthinfo'] = "Chybí informace o narození";
< 		$text['relateto'] = "Pøíbuzenský vztah k: ";
< 		$text['sameperson'] = "Tyto dvì osoby jsou toto¾né";
< 		$text['notrelated'] = "Tyto dvì osoby nemají ¾ádný pøíbuzenský vztah v posledních xxx generacích"; //xxx will be replaced with number of generations
< 		$text['findrelinstr'] = "Pro zobrazení pøíbuzenského vztahu mezi dvìma osobami nejprve kliknìte na 'Najít', abyste na¹li pøíslu¹né osoby (nebo zanechte osoby, které jsou zobrazené), poté kliknìte na 'Kalkulovat'.<br>(èeské výrazy v nìkterých slo¾itìj¹ích pøípadech díky jiné struktuøe názvosloví pøíbuzenských vztahù v anglickém jazyce a z toho pramenícího obtí¾ného pøekladu nemusí být správné).";
< 		$text['sometimes'] = "(Pou¾ití jiného poètu generací mù¾e mít nìkdy jiný výsledek.)";
< 		$text['findanother'] = "Zjistit jiný pøíbuzenský vztah";
---
> 		$text['select2inds'] = "Zvolte dvì osoby.";
> 		$text['findpersonid'] = "Najít ID èíslo osoby";
> 		$text['enternamepart'] = "zadejte èást jména nebo pøíjmení";
> 		$text['pleasenamepart'] = "Zadejte, prosím, èást jména nebo pøíjmení.";
> 		$text['clicktoselect'] = "kliknutím vyberte osobu";
> 		$text['nobirthinfo'] = "Chybí informace o narození";
> 		$text['relateto'] = "Pøíbuzenský vztah k: ";
> 		$text['sameperson'] = "Tyto dvì osoby jsou toto¾né";
> 		$text['notrelated'] = "Tyto dvì osoby nemají ¾ádný pøíbuzenský vztah v posledních xxx generacích"; //xxx will be replaced with number of generations
> 		$text['findrelinstr'] = "Pro zobrazení pøíbuzenského vztahu mezi dvìma osobami nejprve kliknìte na 'Najít', abyste na¹li pøíslu¹né osoby (nebo zanechte osoby, které jsou zobrazené), poté kliknìte na 'Kalkulovat'.<br>(èeské výrazy v nìkterých slo¾itìj¹ích pøípadech díky jiné struktuøe názvosloví pøíbuzenských vztahù v anglickém jazyce a z toho pramenícího obtí¾ného pøekladu nemusí být správné).";
> 		$text['sometimes'] = "(Pou¾ití jiného poètu generací mù¾e mít nìkdy jiný výsledek.)";
> 		$text['findanother'] = "Zjistit jiný pøíbuzenský vztah";
98c98
< 		$text['uncle'] = " xxx strýc od";
---
> 		$text['uncle'] = " xxx strýc od";
100c100
< 		$text['uncleaunt'] = " xxx strýc/teta od";
---
> 		$text['uncleaunt'] = " xxx strýc/teta od";
102,103c102,103
< 		$text['niece'] = " xxx neteø od";
< 		$text['nephnc'] = "xxx synovec/neteø od";
---
> 		$text['niece'] = " xxx neteø od";
> 		$text['nephnc'] = "xxx synovec/neteø od";
105,106c105,106
< 		$text['rhusband'] = "man¾el od";
< 		$text['rwife'] = "man¾elka od";
---
> 		$text['rhusband'] = "man¾el od";
> 		$text['rwife'] = "man¾elka od";
110,111c110,111
< 		$text['rchild'] = "dítì od";
< 		$text['sil'] = "ze» od";
---
> 		$text['rchild'] = "dítì od";
> 		$text['sil'] = "ze» od";
113c113
< 		$text['sdil'] = "ze» nebo snacha od";
---
> 		$text['sdil'] = "ze» nebo snacha od";
115,116c115,116
< 		$text['gdau'] = " xxx vnuèka od";
< 		$text['gsondau'] = "xxx vnuk/vnuèka od";
---
> 		$text['gdau'] = " xxx vnuèka od";
> 		$text['gsondau'] = "xxx vnuk/vnuèka od";
118c118
< 		$text['spouses'] = "jsou man¾elé";
---
> 		$text['spouses'] = "jsou man¾elé";
120,124c120,124
< 		$text['changeto'] = "Zmìnit na:";
< 		$text['notvalid'] = "není platné ID èíslo osoby nebo neexistuje v této databázi. Zkuste to prosím znovu.";
< 		$text['halfbrother'] = "nevlastní bratr od";
< 		$text['halfsister'] = "nevlastní sestra od";
< 		$text['halfsibling'] = "nevlastní sourozenec od";
---
> 		$text['changeto'] = "Zmìnit na:";
> 		$text['notvalid'] = "není platné ID èíslo osoby nebo neexistuje v této databázi. Zkuste to prosím znovu.";
> 		$text['halfbrother'] = "nevlastní bratr od";
> 		$text['halfsister'] = "nevlastní sestra od";
> 		$text['halfsibling'] = "nevlastní sourozenec od";
126c126
< 		$text['gencheck'] = "Maximální poèet kontrolovaných generací";
---
> 		$text['gencheck'] = "Maximální poèet kontrolovaných generací";
128c128
< 		$text['fcousin'] = "xxx sestøenice yyy od";  //female cousin
---
> 		$text['fcousin'] = "xxx sestøenice yyy od";  //female cousin
130,132c130,132
< 		$text['mhalfcousin'] = "polovièní xxx bratranec yyy od";  //male cousin
< 		$text['fhalfcousin'] = "polovièní xxx sestøenice yyy od";  //female cousin
< 		$text['halfcousin'] = "polovièní xxx bratranec/sestøenice yyy od";
---
> 		$text['mhalfcousin'] = "polovièní xxx bratranec yyy od";  //male cousin
> 		$text['fhalfcousin'] = "polovièní xxx sestøenice yyy od";  //female cousin
> 		$text['halfcousin'] = "polovièní xxx bratranec/sestøenice yyy od";
135,137c135,137
< 		$text['gfath'] = "xxx dìdeèek od";
< 		$text['gmoth'] = "xxx babièka od";
< 		$text['gpar'] = "xxx prarodièe od";
---
> 		$text['gfath'] = "xxx dìdeèek od";
> 		$text['gmoth'] = "xxx babièka od";
> 		$text['gpar'] = "xxx prarodièe od";
140,143c140,143
< 		$text['parof'] = "rodièe od";
< 		$text['maxrels'] = "Maximální poèet vztahù k zobrazení";
< 		$text['dospouses'] = "Zobrazit vztahy vèetnì man¾elù";
< 		$text['rels'] = "Pøíbuzenské vztahy";
---
> 		$text['parof'] = "rodièe od";
> 		$text['maxrels'] = "Maximální poèet vztahù k zobrazení";
> 		$text['dospouses'] = "Zobrazit vztahy vèetnì man¾elù";
> 		$text['rels'] = "Pøíbuzenské vztahy";
145,153c145,153
< 		$text['fil'] = "tchán od";
< 		$text['mil'] = "tchynì od";
< 		$text['fmil'] = "tchán nebo tchynì od";
< 		$text['stepson'] = "nevlastní syn od";
< 		$text['stepdau'] = "nevlastní dcera od";
< 		$text['stepchild'] = "nevlastní dítì od";
< 		$text['stepgson'] = "xxx nevlastní vnuk od";
< 		$text['stepgdau'] = "xxx nevlastní vnuèka od";
< 		$text['stepgchild'] = "xxx nevlastní vnouèe od";
---
> 		$text['fil'] = "tchán od";
> 		$text['mil'] = "tchynì od";
> 		$text['fmil'] = "tchán nebo tchynì od";
> 		$text['stepson'] = "nevlastní syn od";
> 		$text['stepdau'] = "nevlastní dcera od";
> 		$text['stepchild'] = "nevlastní dítì od";
> 		$text['stepgson'] = "xxx nevlastní vnuk od";
> 		$text['stepgdau'] = "xxx nevlastní vnuèka od";
> 		$text['stepgchild'] = "xxx nevlastní vnouèe od";
157,159c157,159
< 		$text['ggfath'] = " xxx pradìdeèek od";
< 		$text['ggmoth'] = " xxx prababièka od";
< 		$text['ggpar'] = " xxx prarodiè od";
---
> 		$text['ggfath'] = " xxx pradìdeèek od";
> 		$text['ggmoth'] = " xxx prababièka od";
> 		$text['ggpar'] = " xxx prarodiè od";
161,166c161,166
< 		$text['ggdau'] = " xxx pravnuèka od";
< 		$text['ggsondau'] = " xxx pradítì od";
< 		$text['gstepgson'] = "nevlastní xxx pravnuk od";
< 		$text['gstepgdau'] = "nevlastní xxx pravnuèka od";
< 		$text['gstepgchild'] = "nevlastní xxx prapradítì od";
< 		$text['guncle'] = " xxx prastrýc od";
---
> 		$text['ggdau'] = " xxx pravnuèka od";
> 		$text['ggsondau'] = " xxx pradítì od";
> 		$text['gstepgson'] = "nevlastní xxx pravnuk od";
> 		$text['gstepgdau'] = "nevlastní xxx pravnuèka od";
> 		$text['gstepgchild'] = "nevlastní xxx prapradítì od";
> 		$text['guncle'] = " xxx prastrýc od";
168c168
< 		$text['guncleaunt'] = " xxx prastrýc/prateta od";
---
> 		$text['guncleaunt'] = " xxx prastrýc/prateta od";
170,171c170,240
< 		$text['gniece'] = " xxx praneteø od";
< 		$text['gnephnc'] = " xxx prasynovec/praneteø od";
---
> 		$text['gniece'] = " xxx praneteø od";
> 		$text['gnephnc'] = " xxx prasynovec/praneteø od";
> 		//added in 14.0
> 		$text['pathscalc'] = "Hledat spojení";
> 		$text['findrel2'] = "Urèení pøíbuzenského vztahu";
> 		$text['makeme2nd'] = "Pou¾ít moje ID";
> 		$text['usebookmarks'] = "Pou¾ít zálo¾ky";
> 		$text['select2inds'] = "Zvolte dvì osoby.";
> 		$text['indinfofor'] = "Osobní informace o";
> 		$text['nobookmarks'] = "Nelze pou¾ít ¾ádnou zálo¾ku";
> 		$text['bkmtitle'] = "Osoby nalezené v zálo¾kách";
> 		$text['bkminfo'] = "Vybrat osobu:";
> 		$text['sortpathsby'] = "Seøadit cesty podle poètu";
> 		$text['sortbyshort'] = "Seøadit podle";
> 		$text['bylengthshort'] = "Délka";
> 		$text['badID1'] = ": ¹patné ID osoby1 – vra»te se prosím zpìt a opravte";
> 		$text['badID2'] = ": ¹patné ID osoby2 – vra»te se prosím zpìt a opravte";
> 		$text['notintree'] = ": osoba s tímto ID není v aktuální stromové databázi.";
> 		$text['sameperson'] = "Tyto dvì osoby jsou toto¾né";;
> 		$text['nopaths'] = "Tyto osoby nejsou spojeny.";
> 		$text['nopaths1'] = "®ádná dal¹í pøipojení krat¹í ne¾ xxx";
> 		$text['nopaths2'] = "v xxx krocích vyhledávání";
> 		$text['longestpath'] = "(nejdel¹í dosud kontrolovaná cesta byla dlouhá xxx krokù)";
> 		$text['relevantpaths'] = "Poèet nalezených rùzných relevantních cest: xxx";
> 		$text['skipMarr'] = "(navíc poèet cest nalezených, ale nezobrazených kvùli pøíli¹ velkému poètu sòatkù byl: xxx)";
> 		$text['mjaor'] = "nebo";
> 		$text['connectionsto'] = "Spojení k osobì ";
> 		$text['findanotherpers'] = "Najít jinou osobu...";
> 		$text['sometimes'] = "(Pou¾ití jiného poètu generací mù¾e mít nìkdy jiný výsledek.)";
> 		$text['anotherpath'] = "Hledat dal¹í spojení";
> 		$text['xpath'] = "Cesta ";
> 		$text['primary'] = "Výchozí osoba"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Cílová osoba";
> 		$text['parent'] = "Rodiè";
> 		$text['mhfather'] = "jeho otec";
> 		$text['mhmother'] = "jeho matka";
> 		$text['mhhusband'] = "jeho man¾el";
> 		$text['mhwife'] = "jeho man¾elka";
> 		$text['mhson'] = "jeho syn";
> 		$text['mhdaughter'] = "jeho dcera";
> 		$text['fhfather'] = "její otec";
> 		$text['fhmother'] = "její matka";
> 		$text['fhhusband'] = "její man¾el";
> 		$text['fhwife'] = "její man¾elka";
> 		$text['fhson'] = "její syn";
> 		$text['fhdaughter'] = "její dcera";
> 		$text['hfather'] = "otec";
> 		$text['hmother'] = "matka";
> 		$text['hhusband'] = "man¾el";
> 		$text['hwife'] = "man¾elka";
> 		$text['hson'] = "syn";
> 		$text['hdaughter'] = "dcera";
> 		$text['maxruns'] = "Maximální poèet cest, který má být zkontrolován";
> 		$text['maxrshort'] = "Max cesty";
> 		$text['maxlength'] = "Spojovací cesty ne del¹í ne¾";
> 		$text['maxlshort'] = "Max délka";
> 		$text['xstep'] = "krok";
> 		$text['xsteps'] = "kroky";
> 		$text['xmarriages'] = "xxx man¾elství";
> 		$text['xmarriage'] = "1 man¾elství";
> 		$text['showspouses'] = "Zobrazit oba partnery";
> 		$text['showTxt'] = "Zobrazit textový popis cesty";
> 		$text['showTxtshort'] = "Textový popis";
> 		$text['compactBox'] = "Zobrazit rámeèky osob v kompaktní podobì";
> 		$text['compactBoxshort'] = "Kompaktní rámeèky";
> 		$text['paths'] = "Cesty";
> 		$text['dospouses2'] = "Zobrazit partnery";
> 		$text['maxmopt'] = "Maximální poèet man¾elství na spojení";
> 		$text['maxm'] = "Maximální poèet man¾elství";
> 		$text['arerelated'] = "Tyto osoby jsou pøíbuzní – jejich vztah je znázornìn na cestì 1";
> 		$text['simplerel'] = "Hledat jednoduchý vztah";
176,183c245,251
< 		$text['ldsords'] = "Obøady CJKSpd";
< 		$text['baptizedlds'] = "Køest (CJKSpd)";
< 		$text['endowedlds'] = "Obdarován (CJKSpd)";
< 		$text['sealedplds'] = "Peèetìn R (CJKSpd)";
< 		$text['sealedslds'] = "Peèetìn P (CJKSpd)";
< 		$text['otherspouse'] = "Dal¹í partner";
< 		$text['husband'] = "Man¾el";
< 		$text['wife'] = "Man¾elka";
---
> 		$text['ldsords'] = "Obøady CJKSpd";
> 		$text['endowedlds'] = "Obdarován (CJKSpd)";
> 		$text['sealedplds'] = "Peèetìn R (CJKSpd)";
> 		$text['sealedslds'] = "Peèetìn P (CJKSpd)";
> 		$text['otherspouse'] = "Dal¹í partner";
> 		$text['husband'] = "Man¾el";
> 		$text['wife'] = "Man¾elka";
190,191c258,259
< 		$text['capdeathabbr'] = "Zemø.";
< 		$text['capburialabbr'] = "Pohø.";
---
> 		$text['capdeathabbr'] = "Zemø.";
> 		$text['capburialabbr'] = "Pohø.";
193c261
< 		$text['capmarrabbr'] = "Sò.";
---
> 		$text['capmarrabbr'] = "Sò.";
196,201c264,267
< 		$text['scrollnote'] = "Pozn.: pro zobrazení diagramu mù¾ete pou¾ít posuvník dolù nebo doprava.";
< 		$text['unknownlit'] = "Neznámý";
< 		$text['popupnote1'] = " = Dal¹í informace";
< 		$text['popupnote2'] = " = Nové schéma pøedkù";
< 		$text['pedcompact'] = "Kompaktnì";
< 		$text['pedstandard'] = "Standardnì";
---
> 		$text['unknownlit'] = "Neznámý";
> 		$text['popupnote1'] = " = Dal¹í informace";
> 		$text['pedcompact'] = "Kompaktnì";
> 		$text['pedstandard'] = "Standardnì";
203,205c269,271
< 		$text['descendfor'] = "Schéma potomkù osoby";
< 		$text['maxof'] = "Nejvíce";
< 		$text['gensatonce'] = "generací zobrazených najednou.";
---
> 		$text['descendfor'] = "Schéma potomkù osoby";
> 		$text['maxof'] = "Nejvíce";
> 		$text['gensatonce'] = "generací zobrazených najednou.";
208,209c274,275
< 		$text['childof'] = "dítì od";
< 		$text['stdformat'] = "Standardní formát";
---
> 		$text['childof'] = "dítì od";
> 		$text['stdformat'] = "Standardní formát";
211c277
< 		$text['addnewfam'] = "Pøidat novou rodinu";
---
> 		$text['addnewfam'] = "Pøidat novou rodinu";
216,230c282,296
< 		$text['maternal'] = "Matèina";
< 		$text['gen1'] = "Vlastní";
< 		$text['gen2'] = "Rodièe";
< 		$text['gen3'] = "Prarodièe";
< 		$text['gen4'] = "Praprarodièe";
< 		$text['gen5'] = "3xprarodièe";
< 		$text['gen6'] = "4xprarodièe";
< 		$text['gen7'] = "5xprarodièe";
< 		$text['gen8'] = "6xprarodièe";
< 		$text['gen9'] = "7xprarodièe";
< 		$text['gen10'] = "8xprarodièe";
< 		$text['gen11'] = "9xprarodièe";
< 		$text['gen12'] = "10xprarodièe";
< 		$text['graphdesc'] = "Schéma potomkù a¾ do tohoto místa";
< 		$text['pedbox'] = "Rámeèek";
---
> 		$text['maternal'] = "Matèina";
> 		$text['gen1'] = "Vlastní";
> 		$text['gen2'] = "Rodièe";
> 		$text['gen3'] = "Prarodièe";
> 		$text['gen4'] = "Praprarodièe";
> 		$text['gen5'] = "3xprarodièe";
> 		$text['gen6'] = "4xprarodièe";
> 		$text['gen7'] = "5xprarodièe";
> 		$text['gen8'] = "6xprarodièe";
> 		$text['gen9'] = "7xprarodièe";
> 		$text['gen10'] = "8xprarodièe";
> 		$text['gen11'] = "9xprarodièe";
> 		$text['gen12'] = "10xprarodièe";
> 		$text['graphdesc'] = "Schéma potomkù a¾ do tohoto místa";
> 		$text['pedbox'] = "Rámeèek";
232,246c298,312
< 		$text['extrasexpl'] = "U této osoby existuje fotografie, vyprávìní nebo jiná mediální polo¾ka.";
< 		$text['popupnote3'] = " = Nové schéma";
< 		$text['mediaavail'] = "Média k dispozici";
< 		$text['pedigreefor'] = "Schéma pøedkù osoby";
< 		$text['pedigreech'] = "Schéma pøedkù";
< 		$text['datesloc'] = "Datumy a místa";
< 		$text['borchr'] = "Naroz/Køest - Úmrtí/Pohø (dva)";
< 		$text['nobd'] = "Bez dat narození nebo úmrtí";
< 		$text['bcdb'] = "Naroz/Køest/Úmrtí/Pohø (ètyøi)";
< 		$text['numsys'] = "Systém èíslování";
< 		$text['gennums'] = "Èísla generací";
< 		$text['henrynums'] = "Èíslování dle Henryho";
< 		$text['abovnums'] = "Èíslování dle d'Aboville";
< 		$text['devnums'] = "Èíslování dle de Villiers";
< 		$text['dispopts'] = "Mo¾nosti zobrazení";
---
> 		$text['extrasexpl'] = "U této osoby existuje fotografie, vyprávìní nebo jiná mediální polo¾ka.";
> 		$text['popupnote3'] = " = Nové schéma";
> 		$text['mediaavail'] = "Média k dispozici";
> 		$text['pedigreefor'] = "Schéma pøedkù osoby";
> 		$text['pedigreech'] = "Schéma pøedkù";
> 		$text['datesloc'] = "Datumy a místa";
> 		$text['borchr'] = "Naroz/Køest - Úmrtí/Pohø (dva)";
> 		$text['nobd'] = "Bez dat narození nebo úmrtí";
> 		$text['bcdb'] = "Naroz/Køest/Úmrtí/Pohø (ètyøi)";
> 		$text['numsys'] = "Systém èíslování";
> 		$text['gennums'] = "Èísla generací";
> 		$text['henrynums'] = "Èíslování dle Henryho";
> 		$text['abovnums'] = "Èíslování dle d'Aboville";
> 		$text['devnums'] = "Èíslování dle de Villiers";
> 		$text['dispopts'] = "Mo¾nosti zobrazení";
248,250c314,316
< 		$text['no_ancestors'] = "Nebyli nalezeni ¾ádní pøedkové";
< 		$text['ancestor_chart'] = "Svislé schéma pøedkù";
< 		$text['opennewwindow'] = "Otevøít v novém oknì";
---
> 		$text['no_ancestors'] = "Nebyli nalezeni ¾ádní pøedkové";
> 		$text['ancestor_chart'] = "Svislé schéma pøedkù";
> 		$text['opennewwindow'] = "Otevøít v novém oknì";
254c320
< 		$text['fcmlogin'] = "Pro zobrazení podrobností se musíte pøihlásit";
---
> 		$text['fcmlogin'] = "Pro zobrazení podrobností se musíte pøihlásit";
256,257c322,323
< 		$text['otherspouses'] = "dal¹í partneøi/partnerky";
< 		$text['parentfamily'] = "Rodina rodièù ";
---
> 		$text['otherspouses'] = "dal¹í partneøi/partnerky";
> 		$text['parentfamily'] = "Rodina rodièù ";
260c326
< 		$text['showparentfamily'] = "zobrazit rodinu rodièù";
---
> 		$text['showparentfamily'] = "zobrazit rodinu rodièù";
263c329,348
< 		$text['otherfamilies'] = "Dal¹í rodiny";
---
> 		$text['otherfamilies'] = "Dal¹í rodiny";
> 		//added in 14.0
> 		$text['dtformat'] = "Tabulky";
> 		$text['dtchildren'] = "Dìti";
> 		$text['dtgrandchildren'] = "Vnouèata";
> 		$text['dtggrandchildren'] = "Pravnouèata";
> 		$text['dtgggrandchildren'] = "Pravnouèata"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nejsou potomci";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Celkem";
> 		$text['dtselect'] = "Vybrat";
> 		$text['dteachfulltable'] = "Ka¾dá plná tabulky bude mít";
> 		$text['dtrows'] = "øádkù";
> 		$text['dtdisplayingtable'] = "Zobrazení tabulky";
> 		$text['dtgototable'] = "Pøejít na tabulku:";
> 		$text['fcinstrdn'] = "Zobrazit rodinu s partnerem";
> 		$text['fcinstrup'] = "Zobrazit rodinu s rodièi";
> 		$text['fcinstrplus'] = "Vybrat dal¹í partnery";
> 		$text['fcinstrfam'] = "Vybrat dal¹í rodièe";
270,272c355,357
< 		$text['noreports'] = "®ádný report neexistuje.";
< 		$text['reportname'] = "Název reportu";
< 		$text['allreports'] = "V¹echny reporty";
---
> 		$text['noreports'] = "®ádný report neexistuje.";
> 		$text['reportname'] = "Název reportu";
> 		$text['allreports'] = "V¹echny reporty";
276,277c361,362
< 		$text['wasincorrect'] = "byla chybná a report nemohl být vytvoøen. Kontaktujte prosím administrátora systému na";
< 		$text['errormessage'] = "Chybové hlá¹ení";
---
> 		$text['wasincorrect'] = "byla chybná a report nemohl být vytvoøen. Kontaktujte prosím administrátora systému na";
> 		$text['errormessage'] = "Chybové hlá¹ení";
279c364
< 		$text['endswith'] = "konèí na";
---
> 		$text['endswith'] = "konèí na";
282,286c367,371
< 		$text['plusminus10'] = "+/- 10 rokù od";
< 		$text['lessthan'] = "ménì ne¾";
< 		$text['greaterthan'] = "více ne¾";
< 		$text['lessthanequal'] = "ménì nebo rovno";
< 		$text['greaterthanequal'] = "více nebo rovno";
---
> 		$text['plusminus10'] = "+/- 10 rokù od";
> 		$text['lessthan'] = "ménì ne¾";
> 		$text['greaterthan'] = "více ne¾";
> 		$text['lessthanequal'] = "ménì nebo rovno";
> 		$text['greaterthanequal'] = "více nebo rovno";
289c374
< 		$text['joinwith'] = "Logika hledání";
---
> 		$text['joinwith'] = "Logika hledání";
292,297c377,382
< 		$text['showspouse'] = "Zobrazit partnera (pokud mìla dotyèná osoba více partnerù, bude zobrazena vícekrát)";
< 		$text['submitquery'] = "Provést dotaz";
< 		$text['birthplace'] = "Místo narození";
< 		$text['deathplace'] = "Místo úmrtí";
< 		$text['birthdatetr'] = "Rok narození";
< 		$text['deathdatetr'] = "Rok úmrtí";
---
> 		$text['showspouse'] = "Zobrazit partnera (pokud mìla dotyèná osoba více partnerù, bude zobrazena vícekrát)";
> 		$text['submitquery'] = "Provést dotaz";
> 		$text['birthplace'] = "Místo narození";
> 		$text['deathplace'] = "Místo úmrtí";
> 		$text['birthdatetr'] = "Rok narození";
> 		$text['deathdatetr'] = "Rok úmrtí";
299,305c384,390
< 		$text['resetall'] = "Obnovit v¹echny hodnoty na výchozí";
< 		$text['showdeath'] = "Zobrazit informace o úmrtí/pohøbu";
< 		$text['altbirthplace'] = "Místo køtu";
< 		$text['altbirthdatetr'] = "Rok køtu";
< 		$text['burialplace'] = "Místo pohøbu";
< 		$text['burialdatetr'] = "Rok pohøbu";
< 		$text['event'] = "Událost(i)";
---
> 		$text['resetall'] = "Obnovit v¹echny hodnoty na výchozí";
> 		$text['showdeath'] = "Zobrazit informace o úmrtí/pohøbu";
> 		$text['altbirthplace'] = "Místo køtu";
> 		$text['altbirthdatetr'] = "Rok køtu";
> 		$text['burialplace'] = "Místo pohøbu";
> 		$text['burialdatetr'] = "Rok pohøbu";
> 		$text['event'] = "Událost(i)";
307,319c392,404
< 		$text['month'] = "Mìsíc";
< 		$text['keyword'] = "Klíèové slovo (napø. \"Abt\")";
< 		$text['explain'] = "Pro zobrazení odpovídajících událostí zadejte datum. Pro zobrazení v¹ech událostí zanechte pole prázdné.";
< 		$text['enterdate'] = "Zadejte nebo zvolte alespoò jedno z následujících: Den, Mìsíc, Rok, Klíèové slovo";
< 		$text['fullname'] = "Celé jméno";
< 		$text['birthdate'] = "Datum narození";
< 		$text['altbirthdate'] = "Datum køtu";
< 		$text['marrdate'] = "Datum sòatku";
< 		$text['spouseid'] = "ID èíslo partnera";
< 		$text['spousename'] = "Jméno partnera";
< 		$text['deathdate'] = "Datum úmrtí";
< 		$text['burialdate'] = "Datum pohøbu";
< 		$text['changedate'] = "Datum poslední zmìny";
---
> 		$text['month'] = "Mìsíc";
> 		$text['keyword'] = "Klíèové slovo (napø. \"Abt\")";
> 		$text['explain'] = "Pro zobrazení odpovídajících událostí zadejte datum. Pro zobrazení v¹ech událostí zanechte pole prázdné.";
> 		$text['enterdate'] = "Zadejte nebo zvolte alespoò jedno z následujících: Den, Mìsíc, Rok, Klíèové slovo";
> 		$text['fullname'] = "Celé jméno";
> 		$text['birthdate'] = "Datum narození";
> 		$text['altbirthdate'] = "Datum køtu";
> 		$text['marrdate'] = "Datum sòatku";
> 		$text['spouseid'] = "ID èíslo partnera";
> 		$text['spousename'] = "Jméno partnera";
> 		$text['deathdate'] = "Datum úmrtí";
> 		$text['burialdate'] = "Datum pohøbu";
> 		$text['changedate'] = "Datum poslední zmìny";
321,331c406,416
< 		$text['baptdate'] = "CJKSpd datum køtu";
< 		$text['baptplace'] = "CJKSpd místo køtu";
< 		$text['endldate'] = "CJKSpd datum zaslíbení";
< 		$text['endlplace'] = "CJKSpd místo zaslíbení";
< 		$text['ssealdate'] = "CJKSpd datum peèetìní s partnerem";   //Sealed to spouse
< 		$text['ssealplace'] = "CJKSpd místo peèetìní s partnerem";
< 		$text['psealdate'] = "CJKSpd datum peèetìní s rodièi";   //Sealed to parents
< 		$text['psealplace'] = "CJKSpd místo peèetìní s rodièi";
< 		$text['marrplace'] = "Místo sòatku";
< 		$text['spousesurname'] = "Pøíjmení partnera";
< 		$text['spousemore'] = "Zapí¹ete-li pøíjmení partnera, musíte vybrat Pohlaví.";
---
> 		$text['baptdate'] = "CJKSpd datum køtu";
> 		$text['baptplace'] = "CJKSpd místo køtu";
> 		$text['endldate'] = "CJKSpd datum zaslíbení";
> 		$text['endlplace'] = "CJKSpd místo zaslíbení";
> 		$text['ssealdate'] = "CJKSpd datum peèetìní s partnerem";   //Sealed to spouse
> 		$text['ssealplace'] = "CJKSpd místo peèetìní s partnerem";
> 		$text['psealdate'] = "CJKSpd datum peèetìní s rodièi";   //Sealed to parents
> 		$text['psealplace'] = "CJKSpd místo peèetìní s rodièi";
> 		$text['marrplace'] = "Místo sòatku";
> 		$text['spousesurname'] = "Pøíjmení partnera";
> 		$text['spousemore'] = "Zapí¹ete-li pøíjmení partnera, musíte vybrat Pohlaví.";
336,343c421,428
< 		$text['divplace'] = "Místo rozvodu";
< 		$text['otherevents'] = "Jiné události";
< 		$text['numresults'] = "Poèet výsledkù na stránce";
< 		$text['mysphoto'] = "Tajemné fotografie";
< 		$text['mysperson'] = "Hledané osoby";
< 		$text['joinor'] = "'Join with OR' mo¾nost nelze pou¾ít s pøíjmením partnera";
< 		$text['tellus'] = "Máte-li nìjaké informace, napi¹te nám";
< 		$text['moreinfo'] = "Více informací";
---
> 		$text['divplace'] = "Místo rozvodu";
> 		$text['otherevents'] = "Jiné události";
> 		$text['numresults'] = "Poèet výsledkù na stránce";
> 		$text['mysphoto'] = "Tajemné fotografie";
> 		$text['mysperson'] = "Hledané osoby";
> 		$text['joinor'] = "'Join with OR' mo¾nost nelze pou¾ít s pøíjmením partnera";
> 		$text['tellus'] = "Máte-li nìjaké informace, napi¹te nám";
> 		$text['moreinfo'] = "Více informací";
345c430
< 		$text['marrdatetr'] = "Rok sòatku";
---
> 		$text['marrdatetr'] = "Rok sòatku";
347,348c432,433
< 		$text['mothername'] = "Jméno matky";
< 		$text['fathername'] = "Jméno otce";
---
> 		$text['mothername'] = "Jméno matky";
> 		$text['fathername'] = "Jméno otce";
350,351c435,436
< 		$text['notliving'] = "Zesnulí";
< 		$text['nodayevents'] = "Události v tomto mìsíci, které nejsou spojeny s urèitým dnem:";
---
> 		$text['notliving'] = "Zesnulí";
> 		$text['nodayevents'] = "Události v tomto mìsíci, které nejsou spojeny s urèitým dnem:";
353c438
< 		$text['csv'] = "Soubor CSV oddìlený èárkami";
---
> 		$text['csv'] = "Soubor CSV oddìlený èárkami";
355,358c440,443
< 		$text['confdate'] = "Datum biømování (CJKSpd)";
< 		$text['confplace'] = "Místo biømování (CJKSpd)";
< 		$text['initdate'] = "Datum zasvìcení (CJKSpd)";
< 		$text['initplace'] = "Místo zasvìcení (CJKSpd)";
---
> 		$text['confdate'] = "Datum biømování (CJKSpd)";
> 		$text['confplace'] = "Místo biømování (CJKSpd)";
> 		$text['initdate'] = "Datum zasvìcení (CJKSpd)";
> 		$text['initplace'] = "Místo zasvìcení (CJKSpd)";
360c445
< 		$text['marrtype'] = "Typ sòatku";
---
> 		$text['marrtype'] = "Typ sòatku";
362c447
< 		$text['searchnote'] = "Pozn.: Tato stránka pro vyhledání pou¾ívá Google. Poèet nalezených záznamù je pøímo ovlivnìn mírou, jakou má Google tyto stránky indexované.";
---
> 		$text['searchnote'] = "Pozn.: Tato stránka pro vyhledání pou¾ívá Google. Poèet nalezených záznamù je pøímo ovlivnìn mírou, jakou má Google tyto stránky indexované.";
367,370c452,455
< 		$text['logfilefor'] = "Soubor záznamù pro";
< 		$text['mostrecentactions'] = "Nedávná aktivita";
< 		$text['autorefresh'] = "Automatické zobrazení (po 30 vteøinách)";
< 		$text['refreshoff'] = "Vypnout automatické zobrazení";
---
> 		$text['logfilefor'] = "Soubor záznamù pro";
> 		$text['mostrecentactions'] = "Nedávná aktivita";
> 		$text['autorefresh'] = "Automatické zobrazení (po 30 vteøinách)";
> 		$text['refreshoff'] = "Vypnout automatické zobrazení";
375,376c460,461
< 		$text['cemeteriesheadstones'] = "Høbitovy a náhrobky";
< 		$text['showallhsr'] = "Zobrazit v¹echny záznamy náhrobkù";
---
> 		$text['cemeteriesheadstones'] = "Høbitovy a náhrobky";
> 		$text['showallhsr'] = "Zobrazit v¹echny záznamy náhrobkù";
378,379c463,464
< 		$text['showmap'] = "Ukázat mapu";
< 		$text['headstonefor'] = "Náhrobek pro";
---
> 		$text['showmap'] = "Ukázat mapu";
> 		$text['headstonefor'] = "Náhrobek pro";
381,388c466,471
< 		$text['firstpage'] = "První stránka";
< 		$text['lastpage'] = "Poslední stránka";
< 		$text['photoowner'] = "Majitel/Pramen";
< 		$text['nocemetery'] = "Høbitov není uveden";
< 		$text['iptc005'] = "Název";
< 		$text['iptc020'] = "Podporované kategorie";
< 		$text['iptc040'] = "Zvlá¹tní instrukce";
< 		$text['iptc055'] = "Datum vytvoøení";
---
> 		$text['photoowner'] = "Vlastník originálu";
> 		$text['nocemetery'] = "Høbitov není uveden";
> 		$text['iptc005'] = "Název";
> 		$text['iptc020'] = "Podporované kategorie";
> 		$text['iptc040'] = "Zvlá¹tní instrukce";
> 		$text['iptc055'] = "Datum vytvoøení";
391c474
< 		$text['iptc090'] = "Mìsto";
---
> 		$text['iptc090'] = "Mìsto";
393c476
< 		$text['iptc101'] = "Zemì";
---
> 		$text['iptc101'] = "Zemì";
398c481
< 		$text['iptc116'] = "Ve¹kerá práva vyhrazena";
---
> 		$text['iptc116'] = "Ve¹kerá práva vyhrazena";
400c483
< 		$text['iptc122'] = "Popis vytvoøil";
---
> 		$text['iptc122'] = "Popis vytvoøil";
402,404c485,487
< 		$text['regphotos'] = "Zobrazení s popisem";
< 		$text['gallery'] = "Pouze náhledy";
< 		$text['cemphotos'] = "Obrázky høbitovù";
---
> 		$text['regphotos'] = "Zobrazení s popisem";
> 		$text['gallery'] = "Pouze náhledy";
> 		$text['cemphotos'] = "Obrázky høbitovù";
408,414c491,497
< 		$text['seeloc'] = "Prohlédnete místo";
< 		$text['showall'] = "Zobrazit v¹e";
< 		$text['editmedia'] = "Upravit médium";
< 		$text['viewitem'] = "Prohlédnout tuto polo¾ku";
< 		$text['editcem'] = "Upravit høbitov";
< 		$text['numitems'] = "Poèet polo¾ek";
< 		$text['allalbums'] = "V¹echna alba";
---
> 		$text['seeloc'] = "Prohlédnete místo";
> 		$text['showall'] = "Zobrazit v¹e";
> 		$text['editmedia'] = "Upravit médium";
> 		$text['viewitem'] = "Prohlédnout tuto polo¾ku";
> 		$text['editcem'] = "Upravit høbitov";
> 		$text['numitems'] = "Poèet polo¾ek";
> 		$text['allalbums'] = "V¹echna alba";
416,424c499,507
< 		$text['slideresume'] = "Pokraèovat v prezentaci";
< 		$text['slidesecs'] = "Poèet vteøin pro ka¾dý snímek:";
< 		$text['minussecs'] = "ubrat 0.5 vteøiny";
< 		$text['plussecs'] = "pøidat 0.5 vteøiny";
< 		$text['nocountry'] = "Neznámá zemì";
< 		$text['nostate'] = "Neznámý kraj";
< 		$text['nocounty'] = "Neznámý okres";
< 		$text['nocity'] = "Neznámé mìsto";
< 		$text['nocemname'] = "Neznámý høbitov";
---
> 		$text['slideresume'] = "Pokraèovat v prezentaci";
> 		$text['slidesecs'] = "Poèet vteøin pro ka¾dý snímek:";
> 		$text['minussecs'] = "ubrat 0.5 vteøiny";
> 		$text['plussecs'] = "pøidat 0.5 vteøiny";
> 		$text['nocountry'] = "Neznámá zemì";
> 		$text['nostate'] = "Neznámý kraj";
> 		$text['nocounty'] = "Neznámý okres";
> 		$text['nocity'] = "Neznámé mìsto";
> 		$text['nocemname'] = "Neznámý høbitov";
426c509
< 		$text['mediamaptext'] = "<strong>Pozn.:</strong> Posouváním ukazatele my¹i pøes obrázek zobrazíte popisky rùzných èástí obrázku. Zmìní-li se ukazatel my¹i na tvar vztyèeného ukazováku, mù¾ete kliknutím zobrazit stránku s podrobnostmi.";
---
> 		$text['mediamaptext'] = "<strong>Pozn.:</strong> Posouváním ukazatele my¹i pøes obrázek zobrazíte popisky rùzných èástí obrázku. Zmìní-li se ukazatel my¹i na tvar vztyèeného ukazováku, mù¾ete kliknutím zobrazit stránku s podrobnostmi.";
428,429c511,512
< 		$text['allburials'] = "V¹echny pohøby";
< 		$text['moreinfo'] = "Kliknìte pro více informací o obrázku";
---
> 		$text['allburials'] = "V¹echny pohøby";
> 		$text['moreinfo'] = "Kliknìte pro více informací o obrázku";
431c514
<         $text['iptc025'] = "Klíèová slova";
---
>         $text['iptc025'] = "Klíèová slova";
434c517
< 		$text['iptc065'] = "Pùvodní program";
---
> 		$text['iptc065'] = "Pùvodní program";
435a519,520
> 		//added in 13.0
> 		$text['toggletags'] = "Pøepnout znaèky";
441,455c526,540
< 		$text['surnamesstarting'] = "Zobrazit pøíjmení zaèínající na";
< 		$text['showtop'] = "Zobrazit prvních";
< 		$text['showallsurnames'] = "Zobrazit v¹echna pøíjmení";
< 		$text['sortedalpha'] = "seøazena podle abecedy";
< 		$text['byoccurrence'] = "seøazených podle èetnosti";
< 		$text['firstchars'] = "Zaèáteèní písmena";
< 		$text['mainsurnamepage'] = "Hlavní stránka pøíjmení";
< 		$text['allsurnames'] = "V¹echna pøíjmení";
< 		$text['showmatchingsurnames'] = "Kliknutím na pøíjmení zobrazíte odpovídající záznamy.";
< 		$text['backtotop'] = "Zpìt na zaèátek";
< 		$text['beginswith'] = "Zaèíná na";
< 		$text['allbeginningwith'] = "V¹echna pøíjmení zaèínající na";
< 		$text['numoccurrences'] = "celkový poèet míst v závorce";
< 		$text['placesstarting'] = "Zobrazit nejvýznamnìj¹í lokality, které zaèínají na";
< 		$text['showmatchingplaces'] = "Kliknutím na místo zobrazíte podrobnìj¹í lokality. Kliknutím na ikonu Hledat zobrazíte odpovídající osoby.";
---
> 		$text['surnamesstarting'] = "Zobrazit pøíjmení zaèínající na";
> 		$text['showtop'] = "Zobrazit prvních";
> 		$text['showallsurnames'] = "Zobrazit v¹echna pøíjmení";
> 		$text['sortedalpha'] = "seøazena podle abecedy";
> 		$text['byoccurrence'] = "seøazených podle èetnosti";
> 		$text['firstchars'] = "Zaèáteèní písmena";
> 		$text['mainsurnamepage'] = "Hlavní stránka pøíjmení";
> 		$text['allsurnames'] = "V¹echna pøíjmení";
> 		$text['showmatchingsurnames'] = "Kliknutím na pøíjmení zobrazíte odpovídající záznamy.";
> 		$text['backtotop'] = "Zpìt na zaèátek";
> 		$text['beginswith'] = "Zaèíná na";
> 		$text['allbeginningwith'] = "V¹echna pøíjmení zaèínající na";
> 		$text['numoccurrences'] = "celkový poèet míst v závorce";
> 		$text['placesstarting'] = "Zobrazit nejvýznamnìj¹í lokality, které zaèínají na";
> 		$text['showmatchingplaces'] = "Kliknutím na místo zobrazíte podrobnìj¹í lokality. Kliknutím na ikonu Hledat zobrazíte odpovídající osoby.";
457,461c542,546
< 		$text['showallplaces'] = "Zobrazit v¹echny nejvýznamnìj¹í lokality";
< 		$text['totalplaces'] = "celkem míst";
< 		$text['mainplacepage'] = "Hlavní stránka míst";
< 		$text['allplaces'] = "V¹echny nejvýznamnìj¹í lokality";
< 		$text['placescont'] = "Zobrazit v¹echna místa obsahující";
---
> 		$text['showallplaces'] = "Zobrazit v¹echny nejvýznamnìj¹í lokality";
> 		$text['totalplaces'] = "celkem míst";
> 		$text['mainplacepage'] = "Hlavní stránka míst";
> 		$text['allplaces'] = "V¹echny nejvýznamnìj¹í lokality";
> 		$text['placescont'] = "Zobrazit v¹echna místa obsahující";
463,464c548,549
< 		$text['top30'] = "Top xxx nejèastìji se vyskytujících pøíjmení";
< 		$text['top30places'] = "Top xxx nejvýznamnìj¹ích lokalit";
---
> 		$text['top30'] = "Top xxx nejèastìji se vyskytujících pøíjmení";
> 		$text['top30places'] = "Top xxx nejvýznamnìj¹ích lokalit";
466,475c551,560
< 		$text['firstnamelist'] = "Seznam køestních jmen";
< 		$text['firstnamesstarting'] = "Zobrazit køestní jména zaèínající na";
< 		$text['showallfirstnames'] = "Zobrazit v¹echna køestní jména";
< 		$text['mainfirstnamepage'] = "Hlavní stránka køestních jmen";
< 		$text['allfirstnames'] = "V¹echna køestní jména";
< 		$text['showmatchingfirstnames'] = "Kliknutím na køestní jméno zobrazíte odpovídající záznamy.";
< 		$text['allfirstbegwith'] = "V¹echna køestní jména zaèínající na";
< 		$text['top30first'] = "Top xxx nejèastìji se vyskytujících køestních jmen";
< 		$text['allothers'] = "V¹echna ostatní";
< 		$text['amongall'] = "(mezi v¹emi jmény)";
---
> 		$text['firstnamelist'] = "Seznam køestních jmen";
> 		$text['firstnamesstarting'] = "Zobrazit køestní jména zaèínající na";
> 		$text['showallfirstnames'] = "Zobrazit v¹echna køestní jména";
> 		$text['mainfirstnamepage'] = "Hlavní stránka køestních jmen";
> 		$text['allfirstnames'] = "V¹echna køestní jména";
> 		$text['showmatchingfirstnames'] = "Kliknutím na køestní jméno zobrazíte odpovídající záznamy.";
> 		$text['allfirstbegwith'] = "V¹echna køestní jména zaèínající na";
> 		$text['top30first'] = "Top xxx nejèastìji se vyskytujících køestních jmen";
> 		$text['allothers'] = "V¹echna ostatní";
> 		$text['amongall'] = "(mezi v¹emi jmény)";
481c566
< 		$text['pastxdays'] = "(v posledních xx dnech)";
---
> 		$text['pastxdays'] = "(v posledních xx dnech)";
484,487c569,572
< 		$text['history'] = "Vyprávìní/dokument";
< 		$text['husbid'] = "ID èíslo otce";
< 		$text['husbname'] = "Jméno otce";
< 		$text['wifeid'] = "ID èíslo matky";
---
> 		$text['history'] = "Vyprávìní/dokument";
> 		$text['husbid'] = "ID èíslo otce";
> 		$text['husbname'] = "Jméno otce";
> 		$text['wifeid'] = "ID èíslo matky";
489c574
< 		$text['wifename'] = "Jméno matky";
---
> 		$text['wifename'] = "Jméno matky";
495,500c580,585
< 		$text['addperson'] = "Pøidat osobu";
< 		$text['nobirth'] = "Následující osoba nemá platné datum narození a nelze ji pøidat";
< 		$text['event'] = "Událost(i)";
< 		$text['chartwidth'] = "©íøka schématu";
< 		$text['timelineinstr'] = "Pøidat osoby";
< 		$text['togglelines'] = "Pøepnout zobrazení linek";
---
> 		$text['addperson'] = "Pøidat osobu";
> 		$text['nobirth'] = "Následující osoba nemá platné datum narození a nelze ji pøidat";
> 		$text['event'] = "Událost(i)";
> 		$text['chartwidth'] = "©íøka schématu";
> 		$text['timelineinstr'] = "Pøidat osoby";
> 		$text['togglelines'] = "Pøepnout zobrazení linek";
502c587
< 		$text['noliving'] = "Následující osoba je oznaèena jako ¾ijící nebo neveøejná a nelze ji pøidat, proto¾e nemáte patøièná pøístupová práva";
---
> 		$text['noliving'] = "Následující osoba je oznaèena jako ¾ijící nebo neveøejná a nelze ji pøidat, proto¾e nemáte patøièná pøístupová práva";
509,510c594,595
< 		$text['browsealltrees'] = "Prohlédnout v¹echny stromy";
< 		$text['treename'] = "Název stromu";
---
> 		$text['browsealltrees'] = "Prohlédnout v¹echny stromy";
> 		$text['treename'] = "Název stromu";
513c598
< 		$text['city'] = "Mìsto";
---
> 		$text['city'] = "Mìsto";
515,516c600,601
< 		$text['zip'] = "PSÈ";
< 		$text['country'] = "Zemì";
---
> 		$text['zip'] = "PSÈ";
> 		$text['country'] = "Zemì";
519c604
< 		$text['username'] = "U¾ivatelské jméno";
---
> 		$text['username'] = "U¾ivatelské jméno";
521c606
< 		$text['loginfailed'] = "Chyba pøihlá¹ení.";
---
> 		$text['loginfailed'] = "Chyba pøihlá¹ení.";
523,524c608,609
< 		$text['regnewacct'] = "Registrace nového úètu";
< 		$text['realname'] = "Va¹e jméno a pøíjmení";
---
> 		$text['regnewacct'] = "Registrace nového úètu";
> 		$text['realname'] = "Va¹e jméno a pøíjmení";
528c613
< 		$text['acctcomments'] = "Poznámky";
---
> 		$text['acctcomments'] = "Poznámky";
530,531c615,616
< 		$text['leaveblank'] = "(zanechte toto pole prázdné, pokud ¾ádáte o nový strom)";
< 		$text['required'] = "Tyto údaje je nutné vyplnit";
---
> 		$text['leaveblank'] = "(zanechte toto pole prázdné, pokud ¾ádáte o nový strom)";
> 		$text['required'] = "Tyto údaje je nutné vyplnit";
533,545c618,630
< 		$text['enterusername'] = "Zadejte u¾ivatelské jméno.";
< 		$text['failure'] = "Zadané u¾ivatelské jméno je ji¾ vyhrazené. Stisknutím tlaèítka zpìt se vra»te na pøedchozí stránku a zvolte si jiné u¾ivatelské jméno";
< 		$text['success'] = "Va¹e registrace probìhla úspì¹nì. Administrátor systému vás bude informovat, kdy bude vá¹ úèet aktivován, nebo pokud budou potøeba dal¹í informace.";
< 		$text['emailsubject'] = "®ádost o novou registraci";
< 		$text['website'] = "Internetové stránky";
< 		$text['nologin'] = "Nemáte pøihla¹ovací údaje?";
< 		$text['loginsent'] = "Údaje byly odeslány";
< 		$text['loginnotsent'] = "Pøihla¹ovací údaje nebyly odeslány";
< 		$text['enterrealname'] = "Zadejte, prosím, své skuteèné jméno.";
< 		$text['rempass'] = "Zùstat pøihlá¹en na tomto poèítaèi";
< 		$text['morestats'] = "Dal¹í statistika";
< 		$text['accmail'] = "POZN.: Abyste mohli obdr¾et email od administrátora ohledne va¹eho úètu, zkontrolujte, prosím, ¾e vá¹ emailový program neblokuje emailové adresy z této domény.";
< 		$text['newpassword'] = "Nové heslo";
---
> 		$text['enterusername'] = "Zadejte u¾ivatelské jméno.";
> 		$text['failure'] = "Zadané u¾ivatelské jméno je ji¾ vyhrazené. Stisknutím tlaèítka zpìt se vra»te na pøedchozí stránku a zvolte si jiné u¾ivatelské jméno";
> 		$text['success'] = "Va¹e registrace probìhla úspì¹nì. Administrátor systému vás bude informovat, kdy bude vá¹ úèet aktivován, nebo pokud budou potøeba dal¹í informace.";
> 		$text['emailsubject'] = "®ádost o novou registraci";
> 		$text['website'] = "Internetové stránky";
> 		$text['nologin'] = "Nemáte pøihla¹ovací údaje?";
> 		$text['loginsent'] = "Údaje byly odeslány";
> 		$text['loginnotsent'] = "Pøihla¹ovací údaje nebyly odeslány";
> 		$text['enterrealname'] = "Zadejte, prosím, své skuteèné jméno.";
> 		$text['rempass'] = "Zùstat pøihlá¹en na tomto poèítaèi";
> 		$text['morestats'] = "Dal¹í statistika";
> 		$text['accmail'] = "POZN.: Abyste mohli obdr¾et email od administrátora ohledne va¹eho úètu, zkontrolujte, prosím, ¾e vá¹ emailový program neblokuje emailové adresy z této domény.";
> 		$text['newpassword'] = "Nové heslo";
547,552c632,636
< 		$text['nousers'] = "Tento formuláø nelze pou¾ít, dokud nebude vytvoøen alespoò jeden záznam. Pokud jste majitelem tìchto stránek, jdìte do nabídky Admin/U¾ivatelé a vytvoøte si úèet administrátora.";
< 		$text['noregs'] = "Je nám líto, ale v souèasné dobì nepøijímáme nové registrace. Kontaktujte nás, prosím, pøímo, pokud máte nìjaké dotazy èi pøipomínky ohlednì tìchto webových stránek.";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Byla vám zaslána nová ¾ádost o u¾ivatelský úèet TNG. Pøihlaste se, prosím, do administrátorského prostøedí a dejte novému úètu patøièná pøístupová práva.";
< 		$text['accactive'] = "Úcet byl aktivován, ale u¾ivatel nebude mít ¾ádná zvlá¹tní práva, dokud mu je nepøidìlíte.";
< 		$text['accinactive'] = "Nastavení úètu mù¾ete provést v Admin/U¾ivatelé/Pøezkoumat. Úèet zùstane neaktivní, dokud alespoò jednou záznam neupravíte a neulo¾íte.";
---
> 		$text['nousers'] = "Tento formuláø nelze pou¾ít, dokud nebude vytvoøen alespoò jeden záznam. Pokud jste majitelem tìchto stránek, jdìte do nabídky Admin/U¾ivatelé a vytvoøte si úèet administrátora.";
> 		$text['noregs'] = "Je nám líto, ale v souèasné dobì nepøijímáme nové registrace. Kontaktujte nás, prosím, pøímo, pokud máte nìjaké dotazy èi pøipomínky ohlednì tìchto webových stránek.";
> 		$text['emailmsg'] = "Byla vám zaslána nová ¾ádost o u¾ivatelský úèet TNG. Pøihlaste se, prosím, do administrátorského prostøedí a dejte novému úètu patøièná pøístupová práva.";
> 		$text['accactive'] = "Úcet byl aktivován, ale u¾ivatel nebude mít ¾ádná zvlá¹tní práva, dokud mu je nepøidìlíte.";
> 		$text['accinactive'] = "Nastavení úètu mù¾ete provést v Admin/U¾ivatelé/Pøezkoumat. Úèet zùstane neaktivní, dokud alespoò jednou záznam neupravíte a neulo¾íte.";
554,556c638,639
< 		$text['enterpassword2'] = "Prosím, vlo¾te znovu heslo.";
< 		$text['pwdsmatch'] = "Heslo neodpovídá. Prosím, zadejte stejné heslo do ka¾dého pole.";
< 		//added in 8.0.0
---
> 		$text['enterpassword2'] = "Prosím, vlo¾te znovu heslo.";
> 		$text['pwdsmatch'] = "Heslo neodpovídá. Prosím, zadejte stejné heslo do ka¾dého pole.";
558c641
< 		$text['ackmessage'] = "Va¹e ¾ádost o u¾ivatelský úèet byla pøijata. Vá¹ úèet nebude aktivní, dokud nebude schválen administrátorem. O schválení budete informováni emailovou zprávou.";
---
> 		$text['ackmessage'] = "Va¹e ¾ádost o u¾ivatelský úèet byla pøijata. Vá¹ úèet nebude aktivní, dokud nebude schválen administrátorem. O schválení budete informováni emailovou zprávou.";
560a644,650
> 		//added in 14.0
> 		$text['newpassword2'] = "Nové heslo znovu";
> 		$text['resetsuccess'] = "Úspìch: Heslo bylo obnoveno";
> 		$text['resetfail'] = "Selhání: Heslo nebylo obnoveno";
> 		$text['failreason0'] = " (neznámá chyba databáze)";
> 		$text['failreason2'] = " (nemáte oprávnìní ke zmìnì hesla)";
> 		$text['failreason3'] = " (hesla se neshodují)";
565c655
< 		$text['browseallbranches'] = "Prohlédnout v¹echny vìtve";
---
> 		$text['browseallbranches'] = "Prohlédnout v¹echny vìtve";
570c660
< 		$text['quantity'] = "Mno¾ství";
---
> 		$text['quantity'] = "Mno¾ství";
572,575c662,665
< 		$text['totmales'] = "Celkem mu¾ù";
< 		$text['totfemales'] = "Celkem ¾en";
< 		$text['totunknown'] = "Celkem neurèeného pohlaví";
< 		$text['totliving'] = "Celkem ¾ijících";
---
> 		$text['totmales'] = "Celkem mu¾ù";
> 		$text['totfemales'] = "Celkem ¾en";
> 		$text['totunknown'] = "Celkem neurèeného pohlaví";
> 		$text['totliving'] = "Celkem ¾ijících";
577c667
< 		$text['totuniquesn'] = "Celkem jedineèných pøíjmení";
---
> 		$text['totuniquesn'] = "Celkem jedineèných pøíjmení";
581,588c671,678
< 		$text['totsources'] = "Celkem pramenù";
< 		$text['avglifespan'] = "Prùmìrná délka ¾ivota";
< 		$text['earliestbirth'] = "Nejdøíve narozený";
< 		$text['longestlived'] = "Osoby, které se do¾ily nejvy¹¹ího vìku";
< 		$text['days'] = "dní";
< 		$text['age'] = "Vìk";
< 		$text['agedisclaimer'] = "Výpoèty spojené s vìkem se zakládají na údajích osob s udaným datem narození <EM>a</EM> úmrtí.  Proto¾e jsou nìkterá data neúplná (napø. úmrtí je zaznamenáno pouze jako rok \"1945\" nebo \"pøed 1860\"), tyto výpoèty nemusí být 100% pøesné.";
< 		$text['treedetail'] = "Dal¹í informace o tomto stromu";
---
> 		$text['totsources'] = "Celkem pramenù";
> 		$text['avglifespan'] = "Prùmìrná délka ¾ivota";
> 		$text['earliestbirth'] = "Nejdøíve narozený";
> 		$text['longestlived'] = "Osoby, které se do¾ily nejvy¹¹ího vìku";
> 		$text['days'] = "dní";
> 		$text['age'] = "Vìk";
> 		$text['agedisclaimer'] = "Výpoèty spojené s vìkem se zakládají na údajích osob s udaným datem narození <EM>a</EM> úmrtí.  Proto¾e jsou nìkterá data neúplná (napø. úmrtí je zaznamenáno pouze jako rok \"1945\" nebo \"pøed 1860\"), tyto výpoèty nemusí být 100% pøesné.";
> 		$text['treedetail'] = "Dal¹í informace o tomto stromu";
591c681,683
< 		$text['totdeceased'] = "Celkem zesnulých";
---
> 		$text['totdeceased'] = "Celkem zesnulých";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Celkem citací pramenù";
595c687
< 		$text['browseallnotes'] = "Prohlédnout v¹echny poznámky";
---
> 		$text['browseallnotes'] = "Prohlédnout v¹echny poznámky";
599c691
< 		$text['menuhelp'] = "Nápovìda nabídky";
---
> 		$text['menuhelp'] = "Nápovìda nabídky";
603,616c695,708
< 		$text['perms'] = "V¹echna povolení byla nastavena.";
< 		$text['noperms'] = "Povolení nemohla být nastavena pro tyto soubory:";
< 		$text['manual'] = "Nastavte je prosím manuálnì.";
< 		$text['folder'] = "Slo¾ka";
< 		$text['created'] = "byla vytvoøena";
< 		$text['nocreate'] = "nemohla být vytvoøena. Zalo¾te ji, prosím, manuálnì.";
< 		$text['infosaved'] = "Informace ulo¾eny, spojení potvrzeno!";
< 		$text['tablescr'] = "Tabulky byly vytvoøeny!";
< 		$text['notables'] = "Následující tabulky nemohly být vytvoøeny:";
< 		$text['nocomm'] = "TNG nemù¾e navázat komunikaci s va¹í databází. ®ádné tabulky nebyly vytvoøeny.";
< 		$text['newdb'] = "Informace ulo¾eny, spojení potvrzeno, nová databáze byla vytvoøena:";
< 		$text['noattach'] = "Informace ulo¾eny. Spojení navázáno a databáze vytvoøena, ale TNG se k ní nemù¾e pøipojit.";
< 		$text['nodb'] = "Informace ulo¾eny. Spojení navázáno, ale databáze neexistuje a nemohla být vytvoøena. Ovìøte si, ¾e název databáze je správný anebo pou¾ijte ovládací panel a vytvoøte ji.";
< 		$text['noconn'] = "Informace ulo¾ena, ale spojení nebylo navázáno.  Nìkteré z následujích vìcí jsou chybné:";
---
> 		$text['perms'] = "V¹echna povolení byla nastavena.";
> 		$text['noperms'] = "Povolení nemohla být nastavena pro tyto soubory:";
> 		$text['manual'] = "Nastavte je prosím manuálnì.";
> 		$text['folder'] = "Slo¾ka";
> 		$text['created'] = "byla vytvoøena";
> 		$text['nocreate'] = "nemohla být vytvoøena. Zalo¾te ji, prosím, manuálnì.";
> 		$text['infosaved'] = "Informace ulo¾eny, spojení potvrzeno!";
> 		$text['tablescr'] = "Tabulky byly vytvoøeny!";
> 		$text['notables'] = "Následující tabulky nemohly být vytvoøeny:";
> 		$text['nocomm'] = "TNG nemù¾e navázat komunikaci s va¹í databází. ®ádné tabulky nebyly vytvoøeny.";
> 		$text['newdb'] = "Informace ulo¾eny, spojení potvrzeno, nová databáze byla vytvoøena:";
> 		$text['noattach'] = "Informace ulo¾eny. Spojení navázáno a databáze vytvoøena, ale TNG se k ní nemù¾e pøipojit.";
> 		$text['nodb'] = "Informace ulo¾eny. Spojení navázáno, ale databáze neexistuje a nemohla být vytvoøena. Ovìøte si, ¾e název databáze je správný anebo pou¾ijte ovládací panel a vytvoøte ji.";
> 		$text['noconn'] = "Informace ulo¾ena, ale spojení nebylo navázáno.  Nìkteré z následujích vìcí jsou chybné:";
618,619c710
< 		$text['loginfirst'] = "Nejdøíve se musíte pøihlásit.";
< 		$text['noop'] = "®ádná operace nebyla provedena.";
---
> 		$text['noop'] = "®ádná operace nebyla provedena.";
621,625c712,718
< 		$text['nouser'] = "Úèet nebyl vytvoøen. U¾ivatelské jméno ji¾ zøejmì existuje.";
< 		$text['notree'] = "Strom nebyl vytvoøen. ID èíslo stromu zøejmì ji¾ existuje.";
< 		$text['infosaved2'] = "Informace ulo¾ena";
< 		$text['renamedto'] = "pøejmenován na";
< 		$text['norename'] = "nemohl být pøejmenován";
---
> 		$text['nouser'] = "Úèet nebyl vytvoøen. U¾ivatelské jméno ji¾ zøejmì existuje.";
> 		$text['notree'] = "Strom nebyl vytvoøen. ID èíslo stromu zøejmì ji¾ existuje.";
> 		$text['infosaved2'] = "Informace ulo¾ena";
> 		$text['renamedto'] = "pøejmenován na";
> 		$text['norename'] = "nemohl být pøejmenován";
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Byly zji¹tìny existující záznamy u¾ivatelù. Chcete-li pokraèovat, musíte se nejprve pøihlásit nebo odebrat v¹echny záznamy z tabulky u¾ivatelù.";
629,641c722,732
< 		$text['zoomin'] = "Zvìt¹it";
< 		$text['zoomout'] = "Zmen¹it";
< 		$text['magmode'] = "Re¾im zvìt¹ování";
< 		$text['panmode'] = "Re¾im sledování";
< 		$text['pan'] = "Je-li obrázek vìt¹í ne¾ okno prohlí¾eèe, obrázkem v oknì posunete kliknutím my¹í dovnitø obrázku a jejím dr¾ením a ta¾ením";
< 		$text['fitwidth'] = "Na celou ¹íøku";
< 		$text['fitheight'] = "Na celou vý¹ku";
< 		$text['newwin'] = "Nové okno";
< 		$text['opennw'] = "Otevøít obrázek v novém oknì";
< 		$text['magnifyreg'] = "Kliknutím my¹i dovnitø obrázku zvìt¹íte tuto èást obrázku";
< 		$text['imgctrls'] = "Zapnout ovládání obrázku";
< 		$text['vwrctrls'] = "Zapnout ovládání prohlí¾eèe obrázku";
< 		$text['vwrclose'] = "Zavøít prohlí¾eè obrázku";
---
> 		$text['magmode'] = "Re¾im zvìt¹ování";
> 		$text['panmode'] = "Re¾im sledování";
> 		$text['pan'] = "Je-li obrázek vìt¹í ne¾ okno prohlí¾eèe, obrázkem v oknì posunete kliknutím my¹í dovnitø obrázku a jejím dr¾ením a ta¾ením";
> 		$text['fitwidth'] = "Na celou ¹íøku";
> 		$text['fitheight'] = "Na celou vý¹ku";
> 		$text['newwin'] = "Nové okno";
> 		$text['opennw'] = "Otevøít obrázek v novém oknì";
> 		$text['magnifyreg'] = "Kliknutím my¹i dovnitø obrázku zvìt¹íte tuto èást obrázku";
> 		$text['imgctrls'] = "Zapnout ovládání obrázku";
> 		$text['vwrctrls'] = "Zapnout ovládání prohlí¾eèe obrázku";
> 		$text['vwrclose'] = "Zavøít prohlí¾eè obrázku";
646c737
< 		$text['links'] = "Odpovídající odkazy";
---
> 		$text['links'] = "Odpovídající odkazy";
649,650c740,741
< 		$text['mode_values'] = "Hodnoty módu";
< 		$text['compareselected'] = "Porovnat vybrané";
---
> 		$text['mode_values'] = "Hodnoty módu";
> 		$text['compareselected'] = "Porovnat vybrané";
652,659c743,774
< 		$text['keep_name_private'] = "Zachovat jméno neveøejné";
< 		$text['browsealltests'] = "Procházet v¹echny testy";
< 		$text['all_dna_tests'] = "V¹echny testy DNA";
< 		$text['fastmutating'] = "Rychlé mutace";
< 		$text['dna_info_head'] = "Info o testu DNA";
< 		$text['alltypes'] = "V¹echny typy";
< 		$text['allgroups'] = "V¹echny skupiny";
< 		$text['Ydna_LITbox_info'] = "Test(y) pøipojené k této osobì nemusí nutnì od této osoby pocházet.<br />Ve sloupci 'Haploskupina' se zobrazí data èervenì, pokud je výsledek 'Pøedpovìzen', nebo zelenì, pokud je test 'Potvrzen'";
---
> 		$text['keep_name_private'] = "Zachovat jméno neveøejné";
> 		$text['browsealltests'] = "Procházet v¹echny testy";
> 		$text['all_dna_tests'] = "V¹echny testy DNA";
> 		$text['fastmutating'] = "Rychlé mutace";
> 		$text['alltypes'] = "V¹echny typy";
> 		$text['allgroups'] = "V¹echny skupiny";
> 		$text['Ydna_LITbox_info'] = "Test(y) pøipojené k této osobì nemusí nutnì od této osoby pocházet.<br />Ve sloupci 'Haploskupina' se zobrazí data èervenì, pokud je výsledek 'Pøedpovìzen', nebo zelenì, pokud je test 'Potvrzen'";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Porovnat vybrané testy mtDNA";
> 		$text['dnatestscompare_atdna'] = "Porovnat vybrané testy atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNP";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Zvlá¹tní mutace";
> 		$text['mrca'] = "Nejbli¾¹í spoleèný pøedek";
> 		$text['ydna_test'] = "Testy Y-DNA";
> 		$text['mtdna_test'] = "Testy mtDNA (mitochondriální)";
> 		$text['atdna_test'] = "Testy atDNA (autozomální)";
> 		$text['segment_start'] = "Zaèátek";
> 		$text['segment_end'] = "Konec";
> 		$text['suggested_relationship'] = "Navrhnuté";
> 		$text['actual_relationship'] = "Aktuální";
> 		$text['12markers'] = "Markery 1-12";
> 		$text['25markers'] = "Markery 13-25";
> 		$text['37markers'] = "Markery 26-37";
> 		$text['67markers'] = "Markery 38-67";
> 		$text['111markers'] = "Markery 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Ke srovnání je tøeba vybrat alespoò dva testy.";
664c779
< $text['matches'] = "Záznamy";
---
> $text['matches'] = "Záznamy";
666c781
< $text['notes'] = "Poznámky";
---
> $text['notes'] = "Poznámky";
668,676c783,788
< $text['newsearch'] = "Nové hledání";
< $text['pedigree'] = "Schéma pøedkù";
< $text['birthabbr'] = "nar.";
< $text['chrabbr'] = "kø.";
< $text['seephoto'] = "Prohlédnout fotografii";
< $text['andlocation'] = "& místo";
< $text['accessedby'] = "záznam prohlí¾el";
< $text['family'] = "Rodina"; //from getperson
< $text['children'] = "Dìti";  //from getperson
---
> $text['newsearch'] = "Nové hledání";
> $text['pedigree'] = "Schéma pøedkù";
> $text['seephoto'] = "Prohlédnout fotografii";
> $text['andlocation'] = "& místo";
> $text['accessedby'] = "záznam prohlí¾el";
> $text['children'] = "Dìti";  //from getperson
678,681c790,793
< $text['alltrees'] = "V¹echny stromy";
< $text['nosurname'] = "[bez pøíjmení]";
< $text['thumb'] = "Náhled";  //as in Thumbnail
< $text['people'] = "Lidé";
---
> $text['alltrees'] = "V¹echny stromy";
> $text['nosurname'] = "[bez pøíjmení]";
> $text['thumb'] = "Náhled";  //as in Thumbnail
> $text['people'] = "Lidé";
683,687c795,798
< $text['suffix'] = "Pøípona";  //from getperson
< $text['nickname'] = "Pøezdívka";  //from getperson
< $text['deathabbr'] = "zemø.";  //from descend
< $text['lastmodified'] = "Poslední zmìna";  //from getperson
< $text['married'] = "Sòatek";  //from getperson
---
> $text['suffix'] = "Pøípona";  //from getperson
> $text['nickname'] = "Pøezdívka";  //from getperson
> $text['lastmodified'] = "Poslední zmìna";  //from getperson
> $text['married'] = "Sòatek";  //from getperson
689,691c800,802
< $text['name'] = "Jméno"; //from showmap
< $text['lastfirst'] = "Pøíjmení, jméno";  //from search
< $text['bornchr'] = "Narození/Køest";  //from search
---
> $text['name'] = "Jméno"; //from showmap
> $text['lastfirst'] = "Pøíjmení, jméno";  //from search
> $text['bornchr'] = "Narození/Køest";  //from search
694c805
< $text['personid'] = "ID èíslo osoby";
---
> $text['personid'] = "ID èíslo osoby";
696c807
< $text['unknown'] = "Neznámé";
---
> $text['unknown'] = "Neznámé";
699,701c810,812
< $text['christened'] = "Køest";
< $text['died'] = "Úmrtí";
< $text['buried'] = "Pohøeb";
---
> $text['christened'] = "Køest";
> $text['died'] = "Úmrtí";
> $text['buried'] = "Pohøeb";
703c814
< $text['parents'] = "Rodièe";  //from pedigree
---
> $text['parents'] = "Rodièe";  //from pedigree
706,707c817
< $text['burialabbr'] = "pohø.";  //from descend
< $text['descendchart'] = "Schéma potomkù";
---
> $text['descendchart'] = "Schéma potomkù";
712,716c822,824
< $text['place'] = "Místo";
< $text['login'] = "Pøihlá¹ení";
< $text['logout'] = "Odhlá¹ení";
< $text['marrabbr'] = "sò.";
< $text['groupsheet'] = "Schéma rodiny";
---
> $text['login'] = "Pøihlá¹ení";
> $text['logout'] = "Odhlá¹ení";
> $text['groupsheet'] = "Schéma rodiny";
719,720c827,828
< $text['filename'] = "Název souboru";
< $text['id'] = "ID èíslo";
---
> $text['filename'] = "Název souboru";
> $text['id'] = "ID èíslo";
722,729c830,837
< $text['user'] = "U¾ivatel";
< $text['firstname'] = "Jméno";
< $text['lastname'] = "Pøíjmení";
< $text['searchresults'] = "Výsledky hledání";
< $text['diedburied'] = "Úmrtí/Pohøeb";
< $text['homepage'] = "Domovská stránka";
< $text['find'] = "Najít (osobu)";
< $text['relationship'] = "Pøíbuzenský vztah";		//in German, Verwandtschaft
---
> $text['user'] = "U¾ivatel";
> $text['firstname'] = "Jméno";
> $text['lastname'] = "Pøíjmení";
> $text['searchresults'] = "Výsledky hledání";
> $text['diedburied'] = "Úmrtí/Pohøeb";
> $text['homepage'] = "Domovská stránka";
> $text['find'] = "Najít (osobu)";
> $text['relationship'] = "Pøíbuzenský vztah";		//in German, Verwandtschaft
731c839
< $text['timeline'] = "Èasová linie";
---
> $text['timeline'] = "Èasová linie";
735,740c843,847
< $text['branch'] = "Vìtev";
< $text['moreind'] = "Dal¹í osoby";
< $text['morefam'] = "Dal¹í rodiny";
< $text['source'] = "Pramen";
< $text['surnamelist'] = "Seznam pøíjmení";
< $text['generations'] = "Poèet generací";
---
> $text['branch'] = "Vìtev";
> $text['moreind'] = "Dal¹í osoby";
> $text['morefam'] = "Dal¹í rodiny";
> $text['surnamelist'] = "Seznam pøíjmení";
> $text['generations'] = "Generací";
742c849
< $text['whatsnew'] = "Co je nového";
---
> $text['whatsnew'] = "Co je nového";
744,749c851,856
< $text['placelist'] = "Seznam míst";
< $text['baptizedlds'] = "Køest (CJKSpd)";
< $text['endowedlds'] = "Obdarován (CJKSpd)";
< $text['sealedplds'] = "Peèetìn R (CJKSpd)";
< $text['sealedslds'] = "Peèetìn P (CJKSpd)";
< $text['ancestors'] = "Pøedkové";
---
> $text['placelist'] = "Seznam míst";
> $text['baptizedlds'] = "Køest (CJKSpd)";
> $text['endowedlds'] = "Obdarován (CJKSpd)";
> $text['sealedplds'] = "Peèetìn R (CJKSpd)";
> $text['sealedslds'] = "Peèetìn P (CJKSpd)";
> $text['ancestors'] = "Pøedkové";
752c859
< $text['lastimportdate'] = "Datum posledního importu souboru GEDCOM";
---
> $text['lastimportdate'] = "Datum posledního importu souboru GEDCOM";
754,760c861,867
< $text['savechanges'] = "Ulo¾it zmìny";
< $text['familyid'] = "ID èíslo rodiny";
< $text['headstone'] = "Náhrobky";
< $text['historiesdocs'] = "Vyprávìní";
< $text['anonymous'] = "anonymní";
< $text['places'] = "Místa";
< $text['anniversaries'] = "Data a výroèí";
---
> $text['savechanges'] = "Ulo¾it zmìny";
> $text['familyid'] = "ID èíslo rodiny";
> $text['headstone'] = "Náhrobky";
> $text['historiesdocs'] = "Vyprávìní";
> $text['anonymous'] = "anonymní";
> $text['places'] = "Místa";
> $text['anniversaries'] = "Data a výroèí";
762c869
< $text['help'] = "Nápovìda";
---
> $text['help'] = "Nápovìda";
765,766c872
< $text['all'] = "V¹e";
< $text['repository'] = "Úlo¾i¹tì";
---
> $text['all'] = "V¹e";
769,773c875,878
< $text['editevent'] = "Navrhnout zmìnu pro tuto událost";
< $text['findplaces'] = "Najít v¹echny osoby s událostmi v tomto místì";
< $text['morelinks'] = "Více odkazù";
< $text['faminfo'] = "Informace o rodinì";
< $text['persinfo'] = "Osobní informace";
---
> $text['editevent'] = "Navrhnout zmìnu pro tuto událost";
> $text['morelinks'] = "Více odkazù";
> $text['faminfo'] = "Informace o rodinì";
> $text['persinfo'] = "Osobní informace";
775,776c880,881
< $text['fact'] = "Fakt";
< $text['goto'] = "Zvolte stránku";
---
> $text['fact'] = "Událost";
> $text['goto'] = "Zvolte stránku";
778,780c883,885
< $text['databasestatistics'] = "Statistika databáze"; //needed to be shorter to fit on menu
< $text['child'] = "Dítì";  //from familygroup
< $text['repoinfo'] = "Údaje o úlo¾i¹ti";
---
> $text['databasestatistics'] = "Statistika databáze"; //needed to be shorter to fit on menu
> $text['child'] = "Dítì";  //from familygroup
> $text['repoinfo'] = "Údaje o úlo¾i¹ti";
782,784c887,889
< $text['noresults'] = "®ádné výsledky nebyly nalezeny";
< $text['allmedia'] = "V¹echna média";
< $text['repositories'] = "Úlo¾i¹tì pramenù";
---
> $text['noresults'] = "®ádné výsledky nebyly nalezeny";
> $text['allmedia'] = "V¹echna média";
> $text['repositories'] = "Úlo¾i¹tì pramenù";
786,787c891,892
< $text['cemeteries'] = "Høbitovy";
< $text['surnames'] = "Pøíjmení";
---
> $text['cemeteries'] = "Høbitovy";
> $text['surnames'] = "Pøíjmení";
790,797c895,902
< $text['media'] = "Média";
< $text['gender'] = "Pohlaví";
< $text['latitude'] = "©íøka";
< $text['longitude'] = "Délka";
< $text['bookmarks'] = "Zálo¾ky";
< $text['bookmark'] = "Pøidat zálo¾ku";
< $text['mngbookmarks'] = "Zobrazit zálo¾ky";
< $text['bookmarked'] = "Zálo¾ka pøidána";
---
> $text['media'] = "Média";
> $text['gender'] = "Pohlaví";
> $text['latitude'] = "©íøka";
> $text['longitude'] = "Délka";
> $text['bookmarks'] = "Zálo¾ky";
> $text['bookmark'] = "Pøidat zálo¾ku";
> $text['mngbookmarks'] = "Zobrazit zálo¾ky";
> $text['bookmarked'] = "Zálo¾ka pøidána";
799c904
< $text['find_menu'] = "Najít";
---
> $text['find_menu'] = "Najít";
801,804c906,908
< $text['cemetery'] = "Høbitov";
< $text['gmapevent'] = "Mapa událostí";
< $text['gevents'] = "Událost";
< $text['glang'] = "&amp;hl=cs";
---
> $text['cemetery'] = "Høbitov";
> $text['gmapevent'] = "Mapa událostí";
> $text['gevents'] = "Událost";
808,810c912,914
< $text['unmarked'] = "Neoznaèené";
< $text['located'] = "Nacházející se";
< $text['albclicksee'] = "Kliknutím zobrazit v¹echny polo¾ky v tomto albu";
---
> $text['unmarked'] = "Neoznaèené";
> $text['located'] = "Nacházející se";
> $text['albclicksee'] = "Kliknutím zobrazit v¹echny polo¾ky v tomto albu";
812,816c916,919
< $text['cremated'] = "Zpopelnìn";
< $text['missing'] = "Chybìjící";
< $text['pdfgen'] = "Generátor PDF";
< $text['blank'] = "Prázdné schéma";
< $text['none'] = "®ádný";
---
> $text['cremated'] = "Zpopelnìn";
> $text['missing'] = "Chybìjící";
> $text['pdfgen'] = "Generátor PDF";
> $text['blank'] = "Prázdné schéma";
818c921
< $text['header'] = "Hlavièka";
---
> $text['header'] = "Hlavièka";
820,821c923,924
< $text['pgsetup'] = "Nastavení stránky";
< $text['pgsize'] = "Velikost stránky";
---
> $text['pgsetup'] = "Nastavení stránky";
> $text['pgsize'] = "Velikost stránky";
823,833c926,936
< $text['portrait'] = "Na vý¹ku";
< $text['landscape'] = "Na ¹íøku";
< $text['tmargin'] = "Horní okraj";
< $text['bmargin'] = "Spodní okraj";
< $text['lmargin'] = "Levý okraj";
< $text['rmargin'] = "Pravý okraj";
< $text['createch'] = "Vytvoøit schéma";
< $text['prefix'] = "Pøedpona";
< $text['mostwanted'] = "Hledá se";
< $text['latupdates'] = "Poslední aktuality";
< $text['featphoto'] = "Hlavní fotografie";
---
> $text['portrait'] = "Na vý¹ku";
> $text['landscape'] = "Na ¹íøku";
> $text['tmargin'] = "Horní okraj";
> $text['bmargin'] = "Spodní okraj";
> $text['lmargin'] = "Levý okraj";
> $text['rmargin'] = "Pravý okraj";
> $text['createch'] = "Vytvoøit schéma";
> $text['prefix'] = "Pøedpona";
> $text['mostwanted'] = "Hledá se";
> $text['latupdates'] = "Poslední aktuality";
> $text['featphoto'] = "Hlavní fotografie";
835,839c938,942
< $text['ourhist'] = "Na¹e rodinná historie";
< $text['ourhistanc'] = "Historie a pøedkové na¹í rodiny";
< $text['ourpages'] = "Genealogické stránky na¹í rodiny";
< $text['pwrdby'] = "Tyto stránky bì¾í na";
< $text['writby'] = "vytvoøil";
---
> $text['ourhist'] = "Na¹e rodinná historie";
> $text['ourhistanc'] = "Historie a pøedkové na¹í rodiny";
> $text['ourpages'] = "Genealogické stránky na¹í rodiny";
> $text['pwrdby'] = "Tyto stránky bì¾í na";
> $text['writby'] = "vytvoøil";
841,847c944,950
< $text['viewphotos'] = "Prohlédnout v¹echny fotografie";
< $text['anon'] = "Souèasnì jste anonymní";
< $text['whichbranch'] = "Ze které vìtve jste?";
< $text['featarts'] = "Nejzajímavìj¹í èlánky";
< $text['maintby'] = "Systém spravuje";
< $text['createdon'] = "Vytvoøeno";
< $text['reliability'] = "Vìrohodnost";
---
> $text['viewphotos'] = "Prohlédnout v¹echny fotografie";
> $text['anon'] = "Souèasnì jste anonymní";
> $text['whichbranch'] = "Ze které vìtve jste?";
> $text['featarts'] = "Nejzajímavìj¹í èlánky";
> $text['maintby'] = "Systém spravuje";
> $text['createdon'] = "Vytvoøeno";
> $text['reliability'] = "Vìrohodnost";
850,851c953,954
< $text['cont'] = "(pokraè.)"; //abbreviation for continued
< $text['mnuheader'] = "Domovská stránka";
---
> $text['cont'] = "(pokraè.)"; //abbreviation for continued
> $text['mnuheader'] = "Domovská stránka";
853,854c956,957
< $text['mnulastname'] = "Pøíjmení";
< $text['mnufirstname'] = "Jméno";
---
> $text['mnulastname'] = "Pøíjmení";
> $text['mnufirstname'] = "Jméno";
856,862c959,965
< $text['mnureset'] = "Zaèít znovu";
< $text['mnulogon'] = "Pøihlá¹ení";
< $text['mnulogout'] = "Odhlá¹ení";
< $text['mnufeatures'] = "Dal¹í mo¾nosti";
< $text['mnuregister'] = "Registrace nového úètu";
< $text['mnuadvancedsearch'] = "Roz¹íøené hledání";
< $text['mnulastnames'] = "Pøíjmení";
---
> $text['mnureset'] = "Zaèít znovu";
> $text['mnulogon'] = "Pøihlá¹ení";
> $text['mnulogout'] = "Odhlá¹ení";
> $text['mnufeatures'] = "Dal¹í mo¾nosti";
> $text['mnuregister'] = "Registrace nového úètu";
> $text['mnuadvancedsearch'] = "Roz¹íøené hledání";
> $text['mnulastnames'] = "Pøíjmení";
865,868c968,971
< $text['mnuhistories'] = "Vyprávìní";
< $text['mnumyancestors'] = "Fotografie &amp; vyprávìní pro pøedky od [Person]";
< $text['mnucemeteries'] = "Høbitovy";
< $text['mnutombstones'] = "Náhrobky";
---
> $text['mnuhistories'] = "Vyprávìní";
> $text['mnumyancestors'] = "Fotografie &amp; vyprávìní pro pøedky od [Person]";
> $text['mnucemeteries'] = "Høbitovy";
> $text['mnutombstones'] = "Náhrobky";
871,873c974,976
< $text['mnuwhatsnew'] = "Co je nového";
< $text['mnushowlog'] = "Záznam pøístupù";
< $text['mnulanguage'] = "Zmìna jazyka";
---
> $text['mnuwhatsnew'] = "Co je nového";
> $text['mnushowlog'] = "Záznam pøístupù";
> $text['mnulanguage'] = "Zmìna jazyka";
875,876c978,979
< $text['welcome'] = "Vítejte";
< $text['contactus'] = "Napi¹te nám";
---
> $text['welcome'] = "Vítejte";
> $text['contactus'] = "Napi¹te nám";
878c981
< $text['born'] = "Narození";
---
> $text['born'] = "Narození";
882,883c985,986
< $text['loadmap'] = "Nahrát mapu";
< $text['birth'] = "Narození";
---
> $text['loadmap'] = "Nahrát mapu";
> $text['birth'] = "Narození";
885,886c988,989
< $text['startnum'] = "První èíslo";
< $text['searching'] = "Vyhledávám";
---
> $text['startnum'] = "První èíslo";
> $text['searching'] = "Vyhledávám";
888,889c991,992
< $text['location'] = "Místo";
< $text['association'] = "Spojení";
---
> $text['location'] = "Místo";
> $text['association'] = "Spojení";
895,896c998,999
< $text['wasmarried'] = "byl(a) sezdán(a) s";
< $text['anddied'] = "zemøel(a)";
---
> $text['wasmarried'] = "byl(a) sezdán(a) s";
> $text['anddied'] = "zemøel(a)";
898,902c1001,1005
< $text['share'] = "Sdílet";
< $text['hide'] = "Skrýt";
< $text['disabled'] = "Vá¹ u¾ivatelský úèet byl zablokován.  Kontaktujte, prosím, administrátora.";
< $text['contactus_long'] = "Pokud máte nìjaké dotazy nebo pøipomínky ohlednì informací na tìchto stránkách, nebo byste mìli zájem spolupracovat na dal¹ím výzkumu, pøípadnì poskytnout dal¹í informace, neváhejte a <span class=\"emphasis\"><a href=\"suggest.php\">kontaktujte mì</a></span>.";
< $text['features'] = "Zajímavosti";
---
> $text['share'] = "Sdílet";
> $text['hide'] = "Skrýt";
> $text['disabled'] = "Vá¹ u¾ivatelský úèet byl zablokován.  Kontaktujte, prosím, administrátora.";
> $text['contactus_long'] = "Pokud máte nìjaké dotazy nebo pøipomínky ohlednì informací na tìchto stránkách, nebo byste mìli zájem spolupracovat na dal¹ím výzkumu, pøípadnì poskytnout dal¹í informace, neváhejte a <span class=\"emphasis\"><a href=\"suggest.php\">kontaktujte mì</a></span>.";
> $text['features'] = "Zajímavosti";
904c1007
< $text['latestnews'] = "Poslední novinky";
---
> $text['latestnews'] = "Poslední novinky";
906c1009
< $text['wasburied'] = "byl(a) pohøben(a)";
---
> $text['wasburied'] = "byl(a) pohøben(a)";
909,912c1012,1015
< $text['enteremail2'] = "Zadejte, prosím, znovu va¹i emailovou adresu.";
< $text['emailsmatch'] = "Zadané emailové adresy nesouhlasí. Zadejte stejnou emailovou adresu do obou polí.";
< $text['getdirections'] = "Kliknìte pro podrobnosti";
< $text['calendar'] = "Kalendáø";
---
> $text['enteremail2'] = "Zadejte, prosím, znovu va¹i emailovou adresu.";
> $text['emailsmatch'] = "Zadané emailové adresy nesouhlasí. Zadejte stejnou emailovou adresu do obou polí.";
> $text['getdirections'] = "Kliknìte pro podrobnosti";
> $text['calendar'] = "Kalendáø";
915,918c1018,1021
< $text['slidestart'] = "Zahájit prezentaci";
< $text['livingnote'] = "S touto poznámkou je spojena alespoò jedna ¾ijící osoba - podrobnosti nejsou zveøejnìny.";
< $text['livingphoto'] = "S touto polo¾kou je spojena alespoò jedna ¾ijící osoba nebo osoba oznaèená jako neveøejná - podrobnosti nejsou zveøejnìny.";
< $text['waschristened'] = "byl(a) pokøtìn(a)";
---
> $text['slidestart'] = "Zahájit prezentaci";
> $text['livingnote'] = "S touto poznámkou je spojena alespoò jedna ¾ijící osoba - podrobnosti nejsou zveøejnìny.";
> $text['livingphoto'] = "S touto polo¾kou je spojena alespoò jedna ¾ijící osoba nebo osoba oznaèená jako neveøejná - podrobnosti nejsou zveøejnìny.";
> $text['waschristened'] = "byl(a) pokøtìn(a)";
920c1023
< $text['branches'] = "Vìtve";
---
> $text['branches'] = "Vìtve";
922,927c1025,1029
< $text['moredetail'] = "Více detailù";
< $text['lessdetail'] = "Ménì detailù";
< $text['otherevents'] = "Jiné události";
< $text['conflds'] = "Biømován (CJKSpd)";
< $text['initlds'] = "Zasvìcen (CJKSpd)";
< $text['wascremated'] = "byl(a) zpopelnìn(a)";
---
> $text['moredetail'] = "Více detailù";
> $text['lessdetail'] = "Ménì detailù";
> $text['conflds'] = "Biømován (CJKSpd)";
> $text['initlds'] = "Zasvìcen (CJKSpd)";
> $text['wascremated'] = "byl(a) zpopelnìn(a)";
931,935c1033,1037
< $text['searchsite'] = "Hledat na této stránce";
< $text['searchsitemenu'] = "Hledat na stránce";
< $text['kmlfile'] = "Nahrát soubor .kml pro zobrazení tohoto místa v Google Earth";
< $text['download'] = "Kliknutím nahrát";
< $text['more'] = "Více";
---
> $text['searchsite'] = "Hledat na této stránce";
> $text['searchsitemenu'] = "Hledat na stránce";
> $text['kmlfile'] = "Nahrát soubor .kml pro zobrazení tohoto místa v Google Earth";
> $text['download'] = "Kliknutím nahrát";
> $text['more'] = "Více";
938,939c1040,1041
< $text['remnums'] = "Vymazat èísla a ¹pendlíky";
< $text['photoshistories'] = "Fotografie &amp; Vyprávìní";
---
> $text['remnums'] = "Vymazat èísla a ¹pendlíky";
> $text['photoshistories'] = "Fotografie &amp; Vyprávìní";
942c1044
< $text['firstnames'] = "Køestní jména";
---
> $text['firstnames'] = "Køestní jména";
947c1049
< $text['takenby'] = "Testovaná osoba";
---
> $text['takenby'] = "Testovaná osoba";
951,954c1053,1054
< $text['relevant_links'] = "Relevantní odkazy";
< $text['people_have'] = "osoby propojily test DNA k";
< $text['person_has'] = "osoba propojila test DNA k";
< $text['nofirstname'] = "[¾ádné køestní jméno]";
---
> $text['relevant_links'] = "Relevantní odkazy";
> $text['nofirstname'] = "[¾ádné køestní jméno]";
956,965c1056,1116
< $text['cookieuse'] = "Poznámka: Tyto internetové stránky pou¾ívají cookies.";
< $text['dataprotect'] = "Ochrana osobních údajù";
< $text['viewpolicy'] = "Zobrazit zásady";
< $text['understand'] = "Rozumím";
< $text['consent'] = "Souhlasím s ulo¾ením a zpracováním osobních údajù. Vlastníka tìchto internetových stránek mohu kdykoli po¾ádat, aby tyto informace odstranil.";
< $text['consentreq'] = "Uveïte svùj souhlas k ulo¾ením osobních údajù na tomto webu.";
< 
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> $text['cookieuse'] = "Poznámka: Tyto internetové stránky pou¾ívají cookies.";
> $text['dataprotect'] = "Ochrana osobních údajù";
> $text['viewpolicy'] = "Zobrazit zásady";
> $text['understand'] = "Rozumím";
> $text['consent'] = "Souhlasím s ulo¾ením a zpracováním osobních údajù. Vlastníka tìchto internetových stránek mohu kdykoli po¾ádat, aby tyto informace odstranil.";
> $text['consentreq'] = "Uveïte svùj souhlas k ukládání osobních údajù na tomto webu.";
> 
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Rychlé odkazy";
> $text['yourname'] = "Va¹e jméno";
> $text['youremail'] = "Va¹e emailová adresa";
> $text['liketoadd'] = "Jakékoli informace, které chcete pøidat";
> $text['webmastermsg'] = "Zpráva webmastera";
> $text['gallery'] = "Zobrazit galerii";
> $text['wasborn_male'] = "se narodil";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "se narodila"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "byl pokøtìn";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "byla pokøtìna";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "zemøel";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "zemøela";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "byl pohøbena"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "byla pohøbena"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "byl zpopelnìn";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "byla zpopelnìna";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "byl sezdán s";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "byla sezdána s";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "byl rozveden";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "byla rozveda";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " v ";			// used as a preposition to the location
> $text['onthisdate'] = " dne ";		// when used with full date
> $text['inthisyear'] = " v ";		// when used with year only or month / year dates
> $text['and'] = "a ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Info o testu DNA";
> //added in 13.0
> $text['visitor'] = "Náv¹tìvník";
> 
> $text['popupnote2'] = " = Nové schéma pøedkù";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zvìt¹it";
> $text['zoomout'] = "Zmen¹it";
> $text['scrollnote'] = "Pøeta¾ením nebo posunutím zobrazíte z grafu více.";
> $text['general'] = "Obecnì";
> 
> //changed in 14.0
> $text['otherevents'] = "Jiné události";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Spojení";
> $text['continue'] = "Pokraèovat";
> $text['title2'] = "Titul"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Czech/tlevents_help.php TNG1403/languages/Czech/tlevents_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/trees_help.php TNG1403/languages/Czech/trees_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31a28,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech/users_help.php TNG1403/languages/Czech/users_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
34a31,35
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
177a179,181
>     
>     <span class="optionhead">Povolit zobrazení neveøejných poznámek</span>
> 		<p>U¾ivatel mù¾e ve veøejné oblasti prohlí¾et poznámky oznaèené jako neveøejné.</p>
diff -r TNG/languages/Czech-UTF8/admintext.php TNG1403/languages/Czech-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Zadejte prosím ";
126c125
< 		$admtext['invfperms'] = "Váš adresář 'gedcom' má zřejmě špatná oprávnění (zkuste 755 or 777).";
---
> 		$admtext['invfperms'] = "Vaše složka 'gedcom' má zřejmě špatná oprávnění (zkuste 755 or 777).";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Vyberte soubor k importu dat.";
> 		$admtext['addreplacedata'] = "Přidání nebo nahrazení genealogických dat může trvat několik minut v závislosti na velikosti souboru";
> 		$admtext['fromyourcomputer'] = "z vašeho po�íta�e";
> 		$admtext['importdata'] = "Importovat data";
> 		$admtext['replace'] = "Nahradit (ve vybraném stromě)";
> 		$admtext['desttree'] = "Cílový strom";
> 		$admtext['selectdesttree'] = "Vyberte nebo zadejte cílový strom.";
> 		$admtext['selectexisting'] = "Importovat do";
> 		$admtext['ucaselast'] = "Převést všechna příjmení na velká písmena";
> 		$admtext['norecalc'] = "Nepřepo�ítat ozna�ení Žijící";
> 		$admtext['autooffset'] = "Za�ít �íslovat ID �ísla od prvního volného �ísla";
> 		$admtext['mustselecttree'] = "Musíte zvolit strom před tím než lze vybrat tuto možnost.";
> 		$admtext['onwebserver'] = "z webových stránek (ve složce GEDCOM)";
> 		$admtext['imphints'] = "Nápověda: Všechna aktuální data znamená všechny osoby, rodiny, úložiště a poznámky (spojení s médii se nezmění, pokud zůstanou ID �ísla stejná). Porovnání odpovídajících záznamů je vždy založeno pouze na �íslech ID. Nové záznamy jsou vždy přidány. Přidání importuje všechny záznamy s novými ID �ísly.";
> 		$admtext['destbranch'] = "Cílová větev (nepovinná)";
> 		$admtext['importlatlong'] = "Importovat data o zeměpisné délce / šířce, pokud existují";
> 		$admtext['opening'] = "Otevírám";
> 		$admtext['reopen'] = "Znovuotevírám";
> 		$admtext['uploading'] = "Nahrávám";
> 		$admtext['stop'] = "Zastavit";
> 		$admtext['stopped'] = "Import zastaven";
> 		$admtext['resume'] = "Pokra�ovat";
> 		$admtext['neweronly'] = "Nahradit pouze, pokud jsou údaje novější";
> 		$admtext['oldimport'] = "Starý styl importu (bez zobrazení průběhu)";
> 		$admtext['importgedcom'] = "Import souboru GEDCOM (může být zazipován)";
> 		$admtext['stopbackup'] = "Stop! Dobrým nápadem může být zálohování vašich dat dřív než budete pokra�ovat.";
> 		$admtext['importmedia'] = "Importovat odkazy na média";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Ujistěte se, že předpony a přípony (Základní nastavení) jsou pro tento soubor správné.";
> 		$admtext['chkimpsettings'] = "Další možnosti naleznete v Nastavení importu dat.";
> 		$admtext['eventsonly'] = "Importovat pouze typy vlastních událostí a atributů (nebudou vloženy, nahrazeny nebo přidány žádné údaje)";
> 		$admtext['allevents'] = "Přijmout data pro všechny typy vlastních událostí a atributů";
> 		$admtext['finishingimporting'] = "Dokon�eno...";
> 		$admtext['fileuploadfailed'] = "Nahrání souboru se nezdařilo. Soubor je možná příliš velký. Zkuste k nahrání souboru do vaší složky GEDCOM použít FTP, poté soubor vyberte a importujte odtud.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Změnit existující typ události";
135,138d168
< 		$admtext['entertypedesc'] = "Zadejte type/popis pro tento nový typ události.";
< 		$admtext['enterdisplay'] = "Zadejte název pro tento nový typ události.";
< 		$admtext['existingeventtypeinfo'] = "Informace o existujících typech událostí";
< 		$admtext['neweventtypeinfo'] = "Informace o nových typech událostí";
145,146d174
< 		$admtext['addnewevtype'] = "Přidat nový typ události";
< 		$admtext['createnewevtype'] = "Vytvořit záznam nového typu události";
149,150d176
< 		$admtext['existingevtypes'] = "Existující typy událostí";
< 		$admtext['edsevtypes'] = "Upravit, vymazat nebo seřadit existující typy událostí";
152d177
< 		$admtext['confdeleteevtype'] = "Opravdu chcete vymazat tento typ události?";
154d178
< 		$admtext['selectentertag'] = "Vyberte, prosím, nebo zadejte tag pro tento typ události.";
208d231
< 		$admtext['changestoallevtypes'] = "Změny ke všem typům událostí";
214d236
< 		$admtext['BAPM'] = "Křest";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Opravdu chcete vymazat tento typ události? Všechny události tohoto typu budou také smazány.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Přidat nový typ";
> 		$admtext['createnewevtype'] = "Vytvořit záznam typu nové události nebo atributu";
> 		$admtext['modifyeventtype'] = "Změnit existující typ";
> 		$admtext['entertypedesc'] = "Zadejte typ/popis pro tento typ nové události nebo atributu.";
> 		$admtext['enterdisplay'] = "Zadejte zobrazovaný řetězec pro tento typ nové události nebo atributu.";
> 		$admtext['existingeventtypeinfo'] = "Informace o typech existujících událostí nebo atributů";
> 		$admtext['neweventtypeinfo'] = "Informace o typech nových událostí nebo atributů";
> 		$admtext['existingevtypes'] = "Typy existujících událostí nebo atributů";
> 		$admtext['edsevtypes'] = "Upravit, vymazat nebo seřadit typy existujících událostí nebo atributů";
> 		$admtext['selectentertag'] = "Vyberte, prosím, nebo zadejte tag pro tento typ události nebo atributu.";
> 		$admtext['changestoallevtypes'] = "Změny ke všem typům událostí nebo atributů";
268d303
< 		$admtext['nobirthinfo'] = "Chybí informace o narození";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Vybrat základní obrázek"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Uložit + Noví rodi�e";
> 		$admtext['savenewspouse'] = "Uložit + Nový partner";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alternativní narození";
354d391
< 		$admtext['enterphotodesc'] = "Zadejte prosím popis obrázku.";
388d424
< 		$admtext['photoowner'] = "Majitel/pramen";
417d452
< 		$admtext['imgmap'] = "Klikací mapa obrázku";
482c517
< 		$admtext['rectinstr'] = "Nejprve klikněte na levý horní roh obdélníku, poté klikněte na pravý dolní roh.";
---
> 		$admtext['rectinstr'] = "Klikněte na levý horní roh obdélníku a potáhněte do pravého dolního rohu.";
490d524
< 		$admtext['mapinstr3'] = "Chcete-li propojit ur�itou oblast této fotografie s nějakou osobou, vyberte nejprve strom, do kterého tato osoba patří, a pak vytvořte obdélník požadované oblasti. To provedete kliknutím do levého horního rohu oblasti a poté přetažením do pravého dolního rohu. Případně můžete kliknout do levého horního rohu a poté znovu do pravého dolního rohu. Poté se objeví okno, pomocí kterého můžete vybrat danou osobu. Po provedení výběru bude kód klikací mapy přidán do níže uvedeného pole. Tento postup opakujte podle potřeby pro další oblasti obrázku.";
495d528
< 		$admtext['removelink'] = "Odstranit odkaz";
502d534
< 		$admtext['eloptions'] = "Projít nebo vymazat";
509d540
< 		$admtext['nolinks'] = "Žádné odkazy ještě neexistují";
523c554
< 		$admtext['colldisplay'] = "Display Title";
---
> 		$admtext['colldisplay'] = "Zobrazený nadpis";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML klikací mapa (pro zpětnou kompatibilitu)";
> 		$admtext['photoowner'] = "Vlastník originálu";
> 		$admtext['nothumb'] = "Chybí náhled";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Položku nebylo možné přidat zřejmě proto, že soubor byl příliš velký a nebylo možné jej nahrát nebo použít k vytvoření náhledu.";
> 		$admtext['moved'] = "Přesunuto";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Zadejte prosím titul nebo popis tohoto obrázku.";
> 		$admtext['mapinstr3'] = "Chcete-li propojit ur�itou oblast této fotografie s nějakou osobou, rodinou nebo jinou entitou, nejprve vyberte příslušný strom a typ entity a poté vytvořte obdélník pro požadovanou oblast. To provedete kliknutím do levého horního rohu oblasti a následným přetažením do pravého dolního rohu. Případně můžete kliknout do levého horního rohu a poté znovu do pravého dolního rohu. Vyskakovací okno vám pak pomůže vybrat osobu nebo jinou entitu. Prove�te výběr a podle potřeby opakujte tento postup pro další oblasti. Kliknutím na existující oblast vyberte a poté přetažením přesuňte nebo kliknutím na „X“ odstraňte.";
596d633
< 		$admtext['foremptystring'] = "Chcete-li zadat prázdný řetězec, nechte toto pole prázdné a klikněte na \"Přidat >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Pokyny: Položky vlevo přesunete do seznamů vpravo přetáhnutím nebo dvojklikem na ně. Přetažením nahoru a dolů změníte pořadí. Opětovným dvojklikem odstraníte.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "V případě prázdného řetězce ponechte toto pole prázdné a klikněte na >>";
651,655d690
< 		$admtext['selectimportfile'] = "Vyberte soubor k importu dat.";
< 		$admtext['importgedcom'] = "Zvolte zdrojový soubor pro import (standardní GEDCOM 5.5 formát)";
< 		$admtext['addreplacedata'] = "Přidání nebo nahrazení genealogických dat může trvat několik minut v závislosti na velikosti souboru";
< 		$admtext['fromyourcomputer'] = "na vašem po�íta�i";
< 		$admtext['importdata'] = "Importovat data";
657,660d691
< 		$admtext['replace'] = "Nahradit (ve vybraném stromě)";
< 		$admtext['desttree'] = "Cílový strom";
< 		$admtext['selectdesttree'] = "Vyberte nebo zadejte cílový strom.";
< 		$admtext['selectexisting'] = "Importovat do";
668,673d698
< 		$admtext['ucaselast'] = "Převést všechna příjmení na velká písmena";
< 		$admtext['norecalc'] = "Nepřepo�ítat ozna�ení Žijící";
< 		$admtext['autooffset'] = "Za�ít �íslovat ID �ísla od prvního volného �ísla";
< 
< 		$admtext['mustselecttree'] = "Musíte zvolit strom před tím než lze vybrat tuto možnost.";
< 		$admtext['importmedia'] = "Importovat média, pokud existují";
675d699
< 		$admtext['neweronly'] = "Nahradit pouze, pokud jsou údaje novější";
677,692d700
< 		$admtext['onwebserver'] = "na serveru (z adresáře GEDCOM)";
< 		$admtext['eventsonly'] = "Importovat pouze vlastní typy událostí (nebudou vloženy, nahrazeny nebo přidány žádné údaje)";
< 		$admtext['imphints'] = "Nápověda: Všechna aktuální data znamená všechny osoby, rodiny, úložiště a poznámky (spojení s médii se nezmění, pokud zůstanou ID �ísla stejná). Porovnání odpovídajících záznamů je vždy založeno pouze na �íslech ID. Nové záznamy jsou vždy přidány. Přidání importuje všechny záznamy s novými ID �ísly.";
< 		$admtext['allevents'] = "Přijmout data pro všechny vlastní typy událostí";
< 		$admtext['destbranch'] = "Cílová větev (nepovinná)";
< 		$admtext['inframe'] = "(v rámu)";
< 		$admtext['getstart'] = "Jak za�ít";
< 		$admtext['importlatlong'] = "Importovat data o zeměpisné délce / šířce, pokud existují";
< 		$admtext['opening'] = "Otevírám";
< 		$admtext['reopen'] = "Znovuotevírám";
< 		$admtext['uploading'] = "Nahrávám";
< 		$admtext['stop'] = "Zastavit";
< 		$admtext['stopped'] = "Import zastaven";
< 		$admtext['resume'] = "Pokra�ovat";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Záznam přístupů";
694,696c702
< 		$admtext['mmgritems'] = "Instalace a odstranění TNG módů (doplňků třetích stran)";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Starý styl importu (bez zobrazení průběhu)";
---
> 		$admtext['mmgritems'] = "Instalace a odinstalace TNG módů";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Aktualizace";
> 		$admtext['need_upgrade'] = "Aktualizaci dokon�ete pomocí těchto instrukcí";
> 		$admtext['upgrade_missing'] = "Zdá se, že chybí aktualiza�ní soubor, takže možná již máte hotovo.";
> 		$admtext['delete_upgrade'] = "Až budete hotovi, klikněte sem pro odstranění aktualiza�ního souboru a návrat do hlavní nabídky.";
723d733
< 		$admtext['author'] = "Autor";
804,809c814,819
< 		$admtext['momside'] = "Popisek mat�iny strany"; //8
< 		$admtext['dadside'] = "Popisek otcovy strany"; //8
< 		$admtext['momperson'] = "ID �íslo osoby z mat�iny strany"; //8
< 		$admtext['momtree'] = "ID �íslo stromu mat�iny strany"; //8
< 		$admtext['dadperson'] = "ID �íslo osoby z otcovy strany"; //8
< 		$admtext['dadtree'] = "ID �íslo stromu otcovy strany"; //8
---
> 		$admtext['momside'] = "Popisek mateřské strany"; //8, 20
> 		$admtext['dadside'] = "Popisek otcovské strany"; //8, 20
> 		$admtext['momperson'] = "ID �íslo osoby z mateřské strany"; //8, 20
> 		$admtext['momtree'] = "ID �íslo stromu mateřské strany"; //8, 20
> 		$admtext['dadperson'] = "ID �íslo osoby z otcovské strany"; //8, 20
> 		$admtext['dadtree'] = "ID �íslo stromu otcovské strany"; //8, 20
836,837c846,847
< 		$admtext['featurelinks'] = "Odkazy na zajímavosti"; //9, 10
< 		$admtext['featurepara'] = "Odstavec zajímavostí"; //9, 10
---
> 		$admtext['featurelinks'] = "Odkazy na zajímavost"; //9, 10
> 		$admtext['featurepara'] = "Odstavec zajímavosti"; //9, 10
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Citáty v záhlaví";
> 		$admtext['quotesubhead'] = "Citáty v podtitulu";
> 		$admtext['sniptitle'] = "Nadpis krátkého filmu";
> 		$admtext['snipname'] = "Název krátkého filmu";
> 		$admtext['snipinfoone'] = "První řádek krátkého filmu";
> 		$admtext['snipinfotwo'] = "Druhý řádek krátkého filmu";
> 		$admtext['snipimage'] = "Obrázek krátkého filmu";
> 		$admtext['snipperson'] = "ID osoby krátkého filmu";
> 		$admtext['sniptree'] = "ID stromu krátkého filmu";
> 		$admtext['quote'] = "Citace";
> 		$admtext['link'] = "Odkaz";
> 		$admtext['featuretitle7'] = "Zajímavost 7 nadpis";
> 		$admtext['featuretitle8'] = "Zajímavost 8 nadpis";
> 		$admtext['featuretitle9'] = "Zajímavost 9 nadpis";
> 		$admtext['featurethumb9'] = "Zajímavost 9 náhled"; //15
> 		$admtext['featurelink9'] = "Zajímavost 9 odkaz"; //15
> 		$admtext['featurepara9'] = "Zajímavost 9 odstavec"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Levý obrázek záhlaví";
> 		$admtext['rightimg'] = "Pravý obrázek záhlaví";
> 		$admtext['photoption'] = "Možnosti fotografie jsou<br />&nbsp;&nbsp;(static (statická) nebo random (náhodná))";
> 		$admtext['randomphotowidth'] = "Šířka náhodné fotografie";
> 		$admtext['randomphotoheight'] = "Výška náhodné fotografie";
> 		$admtext['randomphotomediatypeID'] = "Kolekce náhodných fotografií";
> 		$admtext['momheading'] = "Nadpis mateřské rodiny";
> 		$admtext['mompara'] = "Odstavec mateřské rodiny";
> 		$admtext['mompagelink'] = "Odkaz mateřské rodiny";
> 		$admtext['dadheading'] = "Nadpis otcovské rodiny";
> 		$admtext['dadpara'] = "Odstavec otcovské rodiny";
> 		$admtext['dadpagelink'] = "Odkaz otcovské rodiny";
> 		$admtext['spmomheading'] = "Nadpis mateřské rodiny partnera";
> 		$admtext['spmompara'] = "Odstavec mateřské rodiny partnera";
> 		$admtext['spmompagelink'] = "Odkaz mateřské rodiny partnera";
> 		$admtext['spmomside'] = "Popisek mateřské strany partnera";
> 		$admtext['spdadside'] = "Popisek otcovské strany partnera";
> 		$admtext['spmomperson'] = "Číslo osoby mateřské strany partnera";
> 		$admtext['spmomtree'] = "Číslo stromu mateřské strany partnera";
> 		$admtext['spdadheading'] = "Nadpis otcovské rodiny partnera";
> 		$admtext['spdadpara'] = "Odstavec otcovské rodiny partnera";
> 		$admtext['spdadpagelink'] = "Odkaz otcovské rodiny partnera";
> 		$admtext['spdadperson'] = "Číslo osoby otcovské strany partnera";
> 		$admtext['spdadtree'] = "Číslo stromu otcovské strany partnera";
> 		$admtext['storiesheading'] = "Příběhy naší rodiny";
> 		$admtext['nbrsurnames'] = "Po�et příjmení<br />&nbsp;&nbsp; v mraku jmen (Surname Cloud)";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Zajímavost náhled";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Nadpis snímku";
> 		$admtext['slideimg'] = "Obrázek snímku";
> 		$admtext['slideheadline'] = "Titulek snímku";
> 		$admtext['slidetext'] = "Text snímku";
> 		$admtext['slidelink'] = "Odkaz snímku";
> 		$admtext['slidelinktext'] = "Název odkazu snímku";
> 		$admtext['featurelink'] = "Odkaz zajímavosti";
> 		$admtext['featurelinktext'] = "Název odkazu zajímavosti";
> 		$admtext['featuretitle'] = "Nadpis zajímavosti";
> 		$admtext['featuresub'] = "Podtitul zajímavosti";
> 		$admtext['quoteimg'] = "Obrázek citace";
> 		$admtext['quotelink'] = "Odkaz citace";
> 		$admtext['quotelinktext'] = "Název odkazu citace";
> 		$admtext['sidebarpara'] = "Odstavec postranní lišty";
> 		$admtext['sidebarlink'] = "Odkaz postranní lišty";
> 		$admtext['sidebarlinktext'] = "Název odkazu postranní lišty";
> 		$admtext['sidebarimg'] = "Obrázek postranní lišty";
> 		$admtext['sidebartitle'] = "Nadpis postranní lišty";
> 		$admtext['sidebarsub'] = "Podtitul postranní lišty";
> 		$admtext['snipheadline'] = "Titulek krátkého filmu";
> 		$admtext['snipsubhead'] = "Podtitul krátkého filmu";
> 		$admtext['snipimg'] = "Obrázek krátkého filmu";
> 		$admtext['sniplink'] = "Odkaz krátkého filmu";
> 		$admtext['sniplinktext'] = "Název odkazu krátkého filmu";
> 		$admtext['linktext'] = "Text odkazu";
> 		$admtext['footerheadline'] = "Titulek záhlaví";
> 		$admtext['footerpara'] = "Text záhlaví";
> 		$admtext['footerlink'] = "Odkaz záhlaví";
> 		$admtext['footerlinktext'] = "Název odkazu záhlaví";
> 		$admtext['footerheadline'] = "Titulek záhlaví";
> 		$admtext['footerpara'] = "Text záhlaví";
> 		$admtext['footerlink'] = "Odkaz záhlaví";
> 		$admtext['footerlinktext'] = "Název odkazu záhlaví";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vyžaduje verzi 5.3 nebo vyšší.)";
---
> 		$admtext['phpreq'] = "(TNG vyžaduje verzi 7.0 nebo vyšší.)";
946c1039
< 		$admtext['rootpath'] = "Kořenová složka";
---
> 		$admtext['rootpath'] = "Kořenová cesta";
1092,1093c1185,1186
< 		$admtext['admin'] = "Admin";
< 		$admtext['text_public'] = "(Veřejný)";
---
> 		$admtext['admin'] = "(Administrace)";
> 		$admtext['text_public'] = "(Veřejná oblast)";
1200c1293
< 		$admtext['subroot'] = "Konfigura�ní složka";
---
> 		$admtext['subroot'] = "Konfigura�ní cesta";
1214c1307
< 		$admtext['srexpl'] = "Nepovinné. Použijte absolutní název cesty podobně, jako jej vidíte v kořenové složce. Pak přesuňte následující soubory do konfigura�ního umístění <strong>ihned</strong> po uložení a udělejte je zapisovatelné (povolení 664): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
---
> 		$admtext['srexpl'] = "Nepovinné. Použijte absolutní název cesty podobně, jako jej vidíte v kořenové cestě. Pak přesuňte následující soubory do konfigura�ní cesty <strong>ihned</strong> po uložení a udělejte je zapisovatelné (povolení 664): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1324c1410
< 		$admtext['backupnote'] = "Pozn.: Je-li vaše databáze velmi velká, můžete pro zálohu a obnovu databáze použít nějaký nezávislý nástroj (např. mysqldumper or phpMyAdmin). Alespoň jeden z nich byste měli mít k dispozici na ovládacím panelu vašich stránek.";
---
> 		$admtext['backupnote'] = "Pozn.: Je-li vaše databáze velmi velká, můžete pro zálohu a obnovu databáze použít nějaký nezávislý nástroj (např. mysqldumper nebo phpMyAdmin). Alespoň jeden z nich byste měli mít k dispozici na ovládacím panelu vašich stránek.";
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Změnit příchozí předpony tak, aby odpovídaly nastavení TNG";
> 		$admtext['sortevents'] = "Seřadit události podle";
> 		$admtext['sortbydate'] = "Data události";
> 		$admtext['sortbytype'] = "Typu události";
> 		$admtext['allowsuggest'] = "Povolit návrhy od návštěvníků";
> 		$admtext['livingchecked'] = "Nastavit ozna�ení Žijící pro nové osoby a rodiny";
> 		$admtext['maxmarried'] = "Rodina je žijící, pokud je pár sezdán méně než<br/>tento po�et let";
> 		$admtext['imagetags'] = "Obdélníky";
> 		$admtext['allowcsv'] = "Povolit stahování csv u reportů";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Možnosti zálohování";
> 		$admtext['dosql'] = "Exportovat jako SQL";
> 		$admtext['dodrop'] = "Vložit DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Vložit CREATE TABLE";
> 		$admtext['onrestore'] = "Možnosti obnovení";
> 		$admtext['dodel'] = "Nejprve vymazat předchozí obsah";
> 		$admtext['download'] = "Stažení";
> 		$admtext['altbirthtypes'] = "Alternativní události narození";
> 		$admtext['dtformat'] = "Formát tabulek";
> 		$admtext['conchart'] = "Schéma spojení";
> 		$admtext['maxropt'] = "Maximální po�et spuštění vyhledávání spojení";
> 		$admtext['maxlopt'] = "Maximální délka cest spojení";
> 		$admtext['showtxtopt'] = "Zobrazit textový příkaz cesty";
> 		$admtext['compactboxopt'] = "Zobrazit ráme�ky osob v kompaktní podobě";
> 		$admtext['sortbyopt'] = "Seřadit cesty podle";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Maximální po�et manželství ve spojení";
> 		$admtext['saveincfg'] = "Uložit v konfigura�ní cestě (viz Základní nastavení)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Geokódování nelze provést";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Negeokódovat";
1436d1549
< 		$admtext['backtosecondary'] = "Zpět na druhotné procesy";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Zpět na Nástroje po importu";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Vylou�it poznámky";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zazipovat a vložit mediální soubory";
> 		$admtext['downloadzip'] = "Stažení ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Zobrazit pouze uživatele se zakázaným přístupem";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Povolit zobrazení neveřejných poznámek";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Poslat také administrátorům, je-li vybrán jeden strom";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "VÅ¡echny modifikace";
> 		$admtext['installedmods'] = "Pouze nainstalované mody";
> 		$admtext['partinstmods'] = "Nainstalované + �áste�ně nainstalované mody";
> 		$admtext['showanalyzeractions'] = "Zobrazit akce v Analyzeru módů";
> 		$admtext['badchar'] = "Neplatný znak";
1886d2008
< 		$admtext['test_number'] = "Číslo testu";
1903c2025
< 		$admtext['separate'] = "hodnoty oddělit �árkou";
---
> 		$admtext['separate'] = "Hodnoty oddělte �árkou";
1917,1918c2039,2049
< 		$admtext['mdaID'] = "Číslo nejvzdálenějšího předka";
< 		$admtext['mrcaID'] = "Číslo nejvzdálenějšího spole�ného předka";
---
> 		$admtext['mdaID'] = "Nejvzdálenější předek";
> 		$admtext['mrcaID'] = "Nejbližší spole�ný předek";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Číslo testu";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Ponechat test neveřejný";
> 		$admtext['multivalues'] = "U rozsahu hodnot použijte poml�ku";
> 		$admtext['changestogroup'] = "Změny ve skupině DNA";
> 		$admtext['modifydnagroup'] = "Upravit existující skupinu DNA";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Spojit tento test DNA s osobou";
1965d2095
< $admtext['otherevents'] = "Další události";
2050,2051d2179
< $admtext['savereturn'] = "Vrátit na tuto stránku";
< $admtext['saveback'] = "Vrátit na menu";
2058,2059d2185
< $admtext['secondary'] = "Druhotné procesy";
< $admtext['commas'] = "Oddělit jednotlivé položky �árkou";
2129,2130d2254
< $admtext['secondarymaint'] = "Druhotné procesy";
< $admtext['customeventtypes'] = "Vlastní typy událostí";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Typ";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Příjmení";
> $admtext['subhead'] = "Podtitul";
> $admtext['image'] = "Obrázek";
> $admtext['author'] = "Autor";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Jak za�ít";
> $admtext['showlog'] = "Záznam přístupů";
> $admtext['nobirthinfo'] = "Chybí informace o narození";
> //changed in 13.0
> $admtext['savereturn'] = "Uložit + Zůstat";
> $admtext['saveback'] = "Uložit + Konec";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Všechny položky byly úspěšně smazány.";
> $admtext['private'] = "Neveřejné";
> $admtext['imgtags'] = "Klikací mapa";
> 
> $admtext['removelink'] = "Odstranit odkaz";
> $admtext['eloptions'] = "Projít nebo vymazat";
> $admtext['pleaseenter'] = "Zadejte prosím ";
> 
> $admtext['nolinks'] = "Žádné odkazy ještě neexistují";
> $admtext['nogeocode'] = "Geokódování nelze provést";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Vybrat základní obrázek"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Typy událostí / atributů";
> $admtext['secondary'] = "Nástroje po importu";
> $admtext['otherevents'] = "Další události / atributy";
> //added in 14.0
> $admtext['newlinks'] = "Odkazy vytvořeny";
> $admtext['newcemlinks'] = "Odkazy na hřbitov vytvořeny";
> $admtext['utility'] = "Nástroj";
> $admtext['linktype'] = "Typ";
> $admtext['move'] = "Přesunout";
> $admtext['copy'] = "Kopírovat";
> $admtext['title2'] = "Titul"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Czech-UTF8/albums_help.php TNG1403/languages/Czech-UTF8/albums_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/alltext.php TNG1403/languages/Czech-UTF8/alltext.php
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "V programu TNG se objevila chyba. Pří�inou může být chyba v nastavení, nedokon�ená aktualizace nebo programová chyba. Pokud jste majitelem stránek, můžete kontaktovat podporu TNG s žádostí o pomoc při řešení tohoto problému. Zkopírujte, prosím, dotaz uvedený níže a vložte jej do vaší zprávy.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Číslo/název testu";
186c168
< $admtext['rcrs'] = "rCRS (revidovaná Cambridžská referen�ní sekvence)";
---
> $admtext['rcrs'] = "rCRS (revised Cambridge Reference Sequence)";
191c173
< $text['keep_name_private'] = "Držet jméno jako neveřejné";
---
> $text['keep_name_private'] = "Ponechat jméno neveřejné";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Číslo/název";
> $admtext['match_date'] = "Datum shody";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Haploskupina Y-DNA";
> $admtext['mtdna_haplogroup'] = "Haploskupina mtDNA";
> $admtext['relationship_section'] = "Sekce příbuzenských vztahů";
> $admtext['relationship_range'] = "Rozsah příbuzenských vztahů";
> $admtext['suggested_relationship'] = "Navrhované";
> $admtext['actual_relationship'] = "Aktuální příbuzenské vztahy";
> $admtext['related_side'] = "Související větev";
> $admtext['shared_dna'] = "Sdílená DNA";
> $admtext['shared centimorgans'] = "Celkově sdílené cM";
> $admtext['shared_segments'] = "Sdílené segmenty";
> $admtext['largest_segment'] = "Největší segment";
> $admtext['chromosome'] = "Chromozóm �.";
> $admtext['segment_start'] = "Za�átek segmentu";
> $admtext['segment_end'] = "Konec segmentu";
> $admtext['centiMorgans'] = "centiMorgany";
> $admtext['matchingSNPs'] = "Po�et shodných SNP";
> $admtext['xmatch'] = "X-shoda";
> $text['keep_test_private'] = "Neveřejný test";
> $text['shared_dna'] = "Sdílený segment DNA";
> $text['for_match'] = "pro tuto shodu";
> $admtext['keeptest'] = "Ochrana testu";
> $admtext['keepname'] = "Ochrana jména";
> $admtext['allgroups'] = "VÅ¡echny skupiny";
> $admtext['alltypes'] = "VÅ¡echny typy";
> $admtext['generation_num'] = "Generace pro rodová příjmení";
> 
> $text['birthabbr'] = "nar.";
> $text['chrabbr'] = "kÅ™.";
> $text['deathabbr'] = "zemÅ™.";  //from descend
> $text['burialabbr'] = "pohÅ™.";  //from descend
> $text['marrabbr'] = "sň.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Najít všechny osoby s událostmi v tomto místě";
> $text['firstpage'] = "První stránka";
> $text['lastpage'] = "Poslední stránka";
> 
> //changed in 13.0.0
> $text['problem'] = "V softwaru TNG došlo k chybě. Co dělat:<p>Pokud jste právě nainstalovali upgrade, možná jste přesko�ili �ást instala�ních pokynů. Vraťte se na stránku readme a znovu si pře�těte pokyny. Věnujte zvláštní pozornost kroku týkajícím se struktury databáze.</p><p>Pokud jste nainstalovali TNG poprvé, bude zřejmě nutné vytvořit databázové tabulky. Vraťte se na stránku readme.html a vyhledejte tento krok.</p><p>Pokud jste vlastníkem webu, můžete kontaktovat podporu TNG pro další pomoc s tímto problémem. Zkopírujte prosím dotaz níže a vložte jej do své zprávy.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Žádná větev";
> 
> //added in 14.0
> $text['oneyear'] = "rok";
> $text['pwdcodelink'] = "Po kliknutí na tento odkaz vám bude zasláno do�asné heslo";
> $text['pwdcodesent'] = "Na vaši emailovou adresu byl odeslán odkaz pro obnovení hesla.";
> $text['moved'] = "Přesunuto";
> $text['citation'] = "Citace";
> $text['other'] = "Jiné";
> $text['death'] = "Úmrtí";
> $text['burial'] = "Pohřeb";
> $text['cremation'] = "Kremace";
> $text['marriage'] = "Sňatek";
> $text['divorce'] = "Rozvod";
> $text['bylength'] = "Kroky";
> $text['bymarriages'] = "Manželství";
> $text['none'] = "Žádný";
> 
> //moved here in 14.0
> $text['family'] = "Rodina";
> $text['source'] = "Pramen";
> $text['repository'] = "Úložiště";
> $text['place'] = "Místo";
> $admtext['BAPM'] = "Křest";
> 
> $text['glang'] = "cs";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Czech-UTF8/assoc_help.php TNG1403/languages/Czech-UTF8/assoc_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30a27,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>   
diff -r TNG/languages/Czech-UTF8/backuprestore_help.php TNG1403/languages/Czech-UTF8/backuprestore_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
33c34,35
< 		<p>Tyto funkce používejte pro zabezpe�ení vašich dat a pro udržení rychlejšího běhu vašich stránek.</p>
---
> 		<p>Pomocí těchto funkcí zabezpe�íte svá data a svoje stránky udržíte rychlé. Pamatujte, že pokud zálohy ukládáte do soukromé složky,
>       možnost Stáhnout zde nebude k dispozici. V takovém případě budete muset ke stažení vašich záložních souborů použít FTP program nebo online správce souborů.</p>
39a42,56
>      
> 		<p class="optionhead">Možnosti zálohování
> 			<ul>
> 				<li><b>Exportovat jako SQL:</b> Záložní soubor dat se vytvoří ve formátu SQL. Výhodou je, že zálohu lze pak obnovit do jiné databáze MySQL bez přítomnosti TNG.</li>
> 				<li><b>Vložit CREATE TABLE:</b> Pokud záložní soubor obsahuje příkaz "CREATE TABLE", operace obnovy se pokusí o vytvoření tabulky před obnovením dat.</li>
> 				<li><b>Vložit DROP TABLE IF EXISTS:</b> Lze použít pouze v případě, že je vložen také příkaz CREATE TABLE. Jsou-li oba příkazy přítomny, operace obnovy, která najde 
>         existující tabulku se stejným názvem ji nejprve odstraní a poté znovu vytvoří.</li>
> 			</ul>
> 		</p>
> 		<p class="optionhead">Možnosti obnovení
> 			<ul>
> 				<li><b>Nejprve vymazat předchozí obsah:</b> I když nebylo vybráno vložení příkazu DROP TABLE, tato volba zajistí, že stávající obsah obnovované tabulky bude před 
>         pokra�ováním obnovy odstraněn. Pokud stávající data nejsou před obnovením odstraněna, může dojít k duplicitním záznamům.</li>
> 			</ul>
> 		</p>     
84c101,102
< 		<p>Chcete-li zálohovat strukturu vašich TNG tabulek, klikněte v této sekci na ikonu Zálohovat. Pokud byla operace úspěšná, stránka bude znovu zobrazena s �ervenou zprávou nahoře.
---
> 		<p>Chcete-li zálohovat strukturu vašich TNG tabulek, klikněte v této sekci na ikonu Zálohovat. Od TNG 14 bude tato záloha vždy vytvořena jako soubor .SQL. 
>     Pokud byla operace úspěšná, stránka se znovu zobrazí s �ervenou zprávou v horní �ásti s podrobnostmi o provedené akci.
diff -r TNG/languages/Czech-UTF8/branches_help.php TNG1403/languages/Czech-UTF8/branches_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
19c15
< 			<a href="eventtypes_help.php" class="lightlink">Nápověda: Vlastní typy událostí &raquo;</a>
---
> 			<a href="eventtypes_help.php" class="lightlink">Nápověda: Typy událostí / atributů&raquo;</a>
33,34c29,35
< 
< 		<a name="what"><p class="subheadbold">Co je to větev?</p></a>>
---
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>     
> 		<a name="what"><p class="subheadbold">Co je to větev?</p></a>
114,115c115,117
< 		<p>Zvolte, zda chcete přidat nové zna�ky nebo vymazat existující. Pokud chcete vymazat existující zna�ky, musíte také zvolit, zda má tato akce vymazat zna�ky větve u všech �lenů 
<     vašeho stromu nebo vymazat pouze zna�ky, které odpovídají vybraným kritériím.</p>
---
> 		<p>Zvolte, zda chcete přidat nové zna�ky, vy�istit stávající zna�ky nebo vymazat osoby s vybraným ozna�ením větve. Pokud chcete vy�istit zna�ky nebo vymazat osoby, 
>     pak také zvolte, zda se tato akce bude týkat celého stromu ("Vše") nebo jen záznamů, které odpovídají vybraným kritériím ("Částe�né").
>     DŮLEŽITÉ: Pokud zvolíte "Vymazat", budou vymazány také osoby, nejen zna�ky větví! Neexistuje žádná možnost akci "Vrátit zpět", takže byste měli před zahájením vytvořit zálohu tabulek.</p>
diff -r TNG/languages/Czech-UTF8/cemeteries_help.php TNG1403/languages/Czech-UTF8/cemeteries_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/citations_help.php TNG1403/languages/Czech-UTF8/citations_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
29a26,30
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
81a83,86
> 		<span class="optionhead">Události</span>
> 		<p>Událost (události), ke které bude tato citace připojena. Chcete-li vybrat více událostí, použijte Shift+ nebo Ctrl/cmd+ kliknutí. Pokud je vybráno více událostí, 
>     bude pro každou událost vytvořena kopie nové citace. Pokud není vybrána žádná událost, bude citace připojena k osobě obecně.</p>
> 
diff -r TNG/languages/Czech-UTF8/collections_help.php TNG1403/languages/Czech-UTF8/collections_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
29a26,30
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
80,81c81,83
<     umístěny na vašem domácím po�íta�i. Jinými slovy, v případě, že soubory v po�íta�i se nachází ve složce "C:\Genealogie\Soubory", to je to, co byste sem měli zadat. 
<     TNG pak oddělí tuto �ást z každého příchozího názvu cesty a ponechá pouze název souboru nebo název další podsložky.
---
>     umístěny na vašem domácím po�íta�i. Jinými slovy, v případě, že soubory v po�íta�i se nachází ve složce "C:\Genealogie\Soubory", to je to, co byste sem měli zadat.</p>
>      
>     <p>TNG pak oddělí tuto �ást z každého příchozího názvu cesty a ponechá pouze název souboru nebo název další podsložky.
87a90,91
>     <p>TNG také použije lokální umístění k naplnění lokálního umístění při exportu, vyberete-li Exportovat odkazy na média.</p>
>    
diff -r TNG/languages/Czech-UTF8/config_help.php TNG1403/languages/Czech-UTF8/config_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
32a29
> 			<a href="#pref" class="lightlink">Předpony</a> &nbsp; | &nbsp;      
34d30
< 			<a href="#pref" class="lightlink">Prefixes</a> &nbsp; | &nbsp;      
41c37,42
< 
---
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>     
44,45c45,46
< 		<span class="optionhead">Hostitel databáze, název, uživatelské jméno, heslo</span>
< 		<p>Tyto údaje použije TNG a PHP k připojení k vaší databázi. Tyto pole musí být vyplněny dřív, než bude vaše databáze 
---
> 		<span class="optionhead">Hostitel databáze, název, uživatelské jméno, heslo, port a socket</span>
> 		<p>Tyto údaje použije TNG a PHP k připojení k vaší databázi. Kromě portu a socketu (málo používané), musí být tato pole vyplněna dřív, než bude vaše databáze 
49c50
< 		webového hostingu. Název hostitel může také obsahovat �íslo portu nebo cestu do soketu (socket path), např. "localhost:3306" nebo "localhost:/path/to/socket". 
---
> 		webového hostingu. Název hostitel může také obsahovat �íslo portu nebo cestu do socketu (socket path), např. "localhost:3306" nebo "localhost:/path/to/socket".
99c100
< 		<span class="optionhead">Složky Fotografie / Dokumenty / Vyprávění / Náhrobky / Multimédia / GENDEX / Zálohy / Módy / Extensions</span>
---
> 		<span class="optionhead">Složky Fotografie / Dokumenty / Vyprávění / Náhrobky / Multimédia / Módy / Extensions / GENDEX / Záloha</span>
102c103,104
< 		zvukové záznamy). Tyto složky mohou být vytvořeny z této obrazovky kliknutím na tla�ítka "Vytvořit složku".</p>
---
> 		zvukové záznamy). Názvy těchto složek lze změnit zadáním nových názvů a kliknutím na odpovídající tla�ítka „Přejmenovat“. Až budete s touto stránkou hotovi, nezapomeňte kliknout na „Uložit“.</p>
> 		<p>Pozn.: Polí�ko pod názvem složky zálohy zaškrtněte, chcete-li, aby byla složka záloh uložena v umístění konfigura�ní cesty (viz výše). Skute�nou složku musíte přesunout do konfigura�ního umístění sami mimo TNG.</p>    
114c116
< 		soubory TNG. Musí to být relativní odkaz ("index.php" nebo "../otherhomepage.html"), nikoli absolutní odkaz ("http://yoursite.com").</p>
---
> 		soubory TNG. Musí to být relativní odkaz ("index.php" nebo "../otherhomepage.html"), nikoli absolutní odkaz ("https://yoursite.com").</p>
117c119
< 		<p>Webová adresa vaší genealogické složky (např. "http://mysite.com/genealogy").</p>
---
> 		<p>Webová adresa vaší genealogické složky (např. "https://mysite.com/genealogy").</p>
140a143,145
>     
> 		<span class="optionhead">Volitelná zpráva zápatí</span>
> 		<p>Zpráva nebo fragment kódu HTML, který se zobrazí ve spodní �ásti každé stránky.</p>    
143,145c148,150
< 		<p>Soubor, který ur�uje styl záložek zobrazených na většině veřejných stránek. Výchozí styl (tngtabs1.css) používá "šikmé" záložky, ale
< 		TNG dodává také alternativní styl s "hranatými" záložkami (tngtabs2.css). Chcete-li zobrazit záložky v tomto stylu, zapište do tohoto pole "tngtabs2.css"
< 		a klikněte na "Uložit" ve spodní �ásti stránek, a poté zkuste vyhledat nějakou osobu ve veřejném prostředí. Výchozí styl (tngtabs1.css) využívá dva obrázky, "tngtab.png" (neaktivní
---
> 		<p>Soubor, který ur�uje styl záložek zobrazených na většině veřejných stránek. Výchozí styl (tngtabs2.css) používá jemně zaoblené záložky, ale
> 		TNG dodává také alternativní styl se šikmými záložkami (tngtabs1.css). Chcete-li zobrazit záložky v tomto stylu, zapište do tohoto pole "tngtabs1.css"
> 		a klikněte na "Uložit" ve spodní �ásti stránek, a poté zkuste vyhledat nějakou osobu ve veřejném prostředí. Styl (tngtabs1.css) využívá dva obrázky, "tngtab.png" (neaktivní
148c153
< 		tngtab.png nebo tngtabactive.png. <a href="http://lythgoes.net/genealogy/switchcolor.php">http://lythgoes.net/genealogy/switchcolor.php</a></p>
---
> 		tngtab.png nebo tngtabactive.png. <a href="https://lythgoes.net/genealogy/switchcolor.php">https://lythgoes.net/genealogy/switchcolor.php</a></p>
165,168c170,173
<     
<     <span class="optionhead">Skrýt všechny stránky a údaje k DNA</span>
< 		<p>Pokud nebudete používat programové funkce, které souvisí s DNA, a chtěli byste je odstranit ze všech stránek veřejné �ásti TNG, nastavte tuto volbu na Ano. Testy DNA již nebudou přístupné 
<     z veřejných menu ani nebudou zobrazeny na stránkách jednotlivých osob.</p>
---
> 
> 		<span class="optionhead">Alternativní události narození</span>
> 		<p>Výchozí alternativní události narození jsou křest (CHR) a křest (BAPM), ale můžete to změnit zde přidáním nebo nahrazením vlastních tagů GEDCOM. 
>     Uživatelé, kteří provádějí změny v datech, pak budou moci vybrat příslušnou událost z tohoto seznamu.</p>
211,214d215
< 		<span class="optionhead">Sloupců v zobrazení náhledů</span>
< 		<p>Při prohlížení všech souborů v zobrazení náhledů budou tyto náhledy zobrazeny v jednom řádku. Pokud jich existuje víc,
< 		budou další řádky zobrazeny až do po�tu řádku odpovídajícímu "Maximálnímu po�tu výsledků hledání".</p>
< 
254,256c255,259
< 		<p>"Favicon" je malá ikona zobrazená v adresním řádku prohlíže�e nalevo od adresy URL stránky. TNG neobsahuje nástroj, který vám pomůže takovou ikonu vytvořit, ale pokud
<       nějakou máte k dispozici a chcete ji použít, nahrajte ji do hlavní složky TNG a název souboru zadejte zde.</p>
<    
---
> 		<p>„Favicon“ je malá ikona zobrazená v adresním řádku prohlíže�e, hned nalevo od adresy URL webu. TNG obsahuje výchozí ikony pro veřejnou 
>     i administrátorskou �ást programu. TNG neobsahuje nástroj, který by vám pomohl vytvořit tyto ikony, ale pokud 
>     nějakou ikony máte (nebo samostatné pro veřejné i pro správce), nahrajte je do složek img/public a/nebo img/admin a zadejte název souboru zde 
>     v nastavení. Všimněte si, že pokud máte samostatné ikony pro veřejnost a správce, budete jim muset dát stejný název.</p>
>       
274a278,280
>     
>  		<span class="optionhead">Vypnout výrazy příbuzenských vztahů</span>
> 		<p>Toto nastavení skryje písemné vysvětlení příbuzenského vztahu v dolní �ásti tabulky příbuzenských vztahů. To může být užite�né, pokud formulace vysvětlení nedává v příslušném jazyce vždy smysl.</p>
314,317c320,341
<     <span class="optionhead">Kolik let po smrti nechat osobu jako neveřejnou</span>
< 		<p>Používá se ve spojení s nástrojem "Vytvořit neveřejné" v sekci Administrace/Import-Export/Druhotné procesy. Tento nástroj ozna�í jako "neveřejné" všechny osoby, 
<     které zemřely v období kratším než je zde zadaný po�et let. Rodiny, ve kterých jsou tyto osoby jako manželé, jsou také ozna�eny jako "neveřejné".</p>
< 
---
> 		<span class="optionhead">Zobrazit zprávu o povolení cookies</span>
> 		<p>Návštěvníkům stránek se zobrazí v pravém dolním rohu obrazovky malé vyskakovací okno a upozorní je, že web používá cookies.
>     Jakmile návštěvník klikne na tla�ítko "Rozumím", zpráva zmizí a soubor cookie bude nastaven na zapamatování akce. 
>     Dokud tento soubor cookie přetrvává, návštěvníkovi se při následných návštěvách vyskakovací okno již znovu nezobrazí.</p>
> 
> 		<span class="optionhead">Zobrazit odkaz na zásady ochrany dat</span>
> 		<p>Návštěvníkům stránek se zobrazí v zápatí v dolní �ásti každé stránky odkaz na zásady ochrany dat na webu.
>     Odkaz se také zobrazí ve vyskakovacím okně týkajícím se souborů cookie (viz výše) a na stránkách, kde je návštěvník požádán, aby dal souhlas s uložením osobních
>     údajů (registrace nového ú�tu, navrhnout/kontaktujte nás). Kopie těchto zásad lze nalézt ve většině jazykových složek.
>     Tento dokument se nazývá data_protection_policy.php. Pokud návštěvník používá jazyk, který neobsahuje překlad těchto zásad, bude mu zobrazena anglická verze.</p>
> 
> 		<span class="optionhead">Žádost o souhlas ohledně osobních údajů</span>
> 		<p>Před odesláním připomínek, návrhů nebo registrace nového uživatele budou návštěvníci stránek vyzváni, aby zaškrtli polí�ko, ve kterém uvedou
>     souhlas s uložením údajů ve formuláři, který vyplnili. Není-li polí�ko zaškrtnuto, tla�ítko pro odeslání bude neaktivní. Pokud
>     přesto dojde ke kliknutí na toto tla�ítko, vyskakovací okno upozorní návštěvníka, že musí před odesláním formuláře zaškrtnouo polí�ko souhlasu.</p>
> 
> 		<span class="optionhead">Nastavit ozna�ení Žijící pro nové osoby a rodiny</span>
> 		<p>Je-li tato možnost zapnutá, všechny nové osoby a rodiny budou ozna�eny jako Žijící. U každé osoby nebo rodiny můžete toto ozna�ení zrušit.</p>
> 
> 		<span class="optionhead">Povolit stahování csv u reportů</span>
> 		<p>Když uživatelé spouštějí vaše reporty, umožníte jim stáhnout soubor s výsledky oddělený �árkami (csv soubor). Takové soubory �asto usnadňují import informací do tabulky.</p>
>       
425a450,461
> 		<a name="pref"><p class="subheadbold">Předpony a přípony</p></a>
> 
>     <p>Tato písmena ve spojení s �íslicí tvoří identifika�ní �ísla (ID �ísla) osob, rodin, pramenů, úložišť a poznámek ve vaší databázi. Většina genealogických
>     programů používá stejnou sadu standardních předpon (a žádné přípony). Pokud váš desktopový program používá přípony nebo jiné předpony, můžete je zadat zde.
>     Nejsou-li zadány správné předpony nebo přípony, některé funkce TNG nebudou pracovat správně.</p>
> 
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Top</a></p>
429,431d464
< 
< 		<span class="optionhead">Název mobilních stránek</span>
< 		<p>je-li tato volba nastavena na <strong>v liště mobilního menu</strong>, název stránek bude zobrazen v liště mobilního menu.<br />Výchozí nastavení je zobrazení názvu stránek <strong>pod lištou mobilního menu</strong>.</p>
459,463c492
< 		<a name="pref"><p class="subheadbold">Předpony a přípony</p></a>
< 
<     <p>Tato písmena ve spojení s �íslicí tvoří identifika�ní �ísla (ID �ísla) osob, rodin, pramenů, úložišť a poznámek ve vaší databázi. Většina genealogických
<     programů používá stejnou sadu standardních předpon (a žádné přípony). Pokud váš desktopový program používá přípony nebo jiné předpony, můžete je zadat zde.
<     Nejsou-li zadány správné předpony nebo přípony, některé funkce TNG nebudou pracovat správně.</p>
---
> 		<a name="misc"><p class="subheadbold">Testy DNA</p></a>
464a494,508
> 		<span class="optionhead">Skrýt všechny stránky a údaje k DNA</span>
> 		<p>Pokud nebudete používat žádnou z funkcí souvisejících s DNA a chtěli byste ji odstranit ze všech veřejných stránek, nastavte tuto možnost na Ano. Testy DNA již nebudou přístupné z veřejných nabídek, 
>     ani se nebudou zobrazovat na individuální stránce žádné osoby.</p>
> 		<span class="optionhead">Maximální po�et výsledků hledání</span>
>     <p>Maximální po�et výsledků hledání v sekci Testy DNA řídí po�et výsledků DNA, které lze zobrazit nezávisle na výsledcích vyhledávání TNG pro dotazy z testů procházení DNA.</p><p><strong>Pozn.:</strong> Pokud nemůžete vybrat test DNA, který chcete porovnat, protože je na jiné stránce, zvyšte tento limit, aby se všechny testy DNA, které chcete porovnat, zobrazily na stejné stránce.</p>
> 		<span class="optionhead">Zobrazit po�et testů DNA veřejně</span>
> 		<p>Tato volba umožňuje skrýt nebo zobrazit po�et testů DNA na veřejných stránkách testů DNA.</p>
> 		<span class="optionhead">Rodová příjmení vyplnit automaticky</span>
> 		<p>Tato volba automaticky přidá rodová příjmení do vašich otcovských a mateřských přímých linií po uložení testu DNA. Možná budete chtít omezit po�et generací, kterých se to má týkat.</p>
>  		<span class="optionhead">Rodová příjmení velkými písmeny </span>
> 		<p>Tato volba používá všechna velká písmena pro rodová příjmení, pokud je nastaveno automatické vyplňování příjmení předků na Ano. Výchozí nastavení je Ne a příjmení jsou tedy zobrazena tak, jak jsou zapsána.</p>
> 		<span class="optionhead">Generace pro rodová příjmení</span> 
> 		<p>Ur�uje, kolik generací zpět se má vyhledat při použití možnosti automatického vyplňování rodových příjmení.</p>
> 		<span class="optionhead">Vylou�it z rodových příjmení</span>
> 		<p>Ur�uje, která příjmení nezahrnout při použití možnosti automatického vyplňování rodových příjmení.</p>
562a607,609
>     
>     <span class="optionhead">Používám TNG offline</span>
> 		<p>Je-li vybráno "Ano", TNG použije lokální verze namísto on-line verzí knihoven třetích stran (např. JQuery) a nebude se pokoušet o přístup ke Google mapám.</p>
diff -r TNG/languages/Czech-UTF8/data_help.php TNG1403/languages/Czech-UTF8/data_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
19c15
< 			<a href="second_help.php" class="lightlink">Nápověda: Druhotné procesy &raquo;</a>
---
> 			<a href="second_help.php" class="lightlink">Nápověda: Nástroje po importu &raquo;</a>
28,29c24,30
< <tr class="databack">
< 	<td class="tngshadow">
---
> <tr>
> 	<td class="tngshadow databack">
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
34c35
< 		<p><span class="optionhead">Před importem:</span> Z vašeho genealogického programu vytvořte standardní soubor GEDCOM 5.5 (4.0 je také akceptovatelný). Neveřejné informace u žijících osob
---
> 		<p><span class="optionhead">Před importem:</span> Z vašeho genealogického programu vytvořte standardní soubor GEDCOM (preferovaný je 5.5 nebo 7.0., ale 4.0 je také akceptovatelný). Neveřejné informace u žijících osob
39c40
< 		<p><span class="optionhead">[Import souboru GEDCOM] Z vašeho po�íta�e</span>
---
> 		<p><span class="optionhead">Import souboru GEDCOM z vašeho po�íta�e</span>
41,43c42,43
< 		<strong>POZN.</strong>: Pokud je váš soubor GEDCOM příliš velký (> 2MB), budete muset před nahráním vašeho souboru tímto způsobem kontaktovat poskytovatele svého hostingu, protože server může mít omezení maximální
< 		velikosti pro nahrávání souborů prostřednictvím webového formuláře. Pokud během importu obdržíte chybové hlášení, jedná se o tento případ. Zkuste místo toho použít k nakopírování svého souboru do složky GEDCOM program FTP,
<     a pak jej naimportujte odtud (viz níže).</p>
---
> 		<strong>POZN.</strong>: Pokud je váš soubor GEDCOM velký (> 2MB), můžete jej nejprve zkusit „zazipovat“ (TNG soubor po nahrání automaticky rozbalí). Je-li výsledný soubor stále velký, budete muset před nahráním vašeho souboru tímto způsobem kontaktovat poskytovatele svého hostingu, protože server může mít omezení maximální
> 		velikosti pro nahrávání souborů prostřednictvím webového formuláře. Pokud během importu obdržíte chybové hlášení, jedná se o tento případ. Zkuste místo toho použít k nakopírování svého souboru do složky GEDCOM program FTP, a pak jej naimportujte odtud (viz níže).</p>
45,46c45,46
< 		<span class="optionhead">OR [Import souboru GEDCOM] Z webových stránek (ve složce GEDCOM)</span>
< 		<p>Pokud jste pro přenos souboru do složky GEDCOM na vašich stránkách použili FTP nebo nějaký online souborový manažer, zapište sem přesný název vašeho souboru, který chcete nahrát nebo klikněte na
---
> 		<span class="optionhead">NEBO Import souboru GEDCOM z webových stránek (ve složce GEDCOM)</span>
> 		<p>Pokud jste pro přenos souboru GEDCOM nebo ZIP do složky GEDCOM na vašich stránkách použili FTP nebo nějaký online souborový manažer, zapište sem přesný název vašeho souboru, který chcete nahrát nebo klikněte na
50,54c50
< 		<span class="optionhead">Přijmout data pro všechny vlastní typy událostí</span>
< 		<p>Váš soubor GEDCOM může obsahovat události, které bude TNG považovat za "vlastní" události. Normálně jsou vlastní typy událostí, které soubor GEDCOM obsahuje, vloženy do databáze, ale
< 		ale je nastaveno, aby data byla ignorována. Stav vlastních typů událostí můžete změnit na "přijmout", aby události tohoto typu byly naimportovány (jinými slovy,
< 		abyste nemuseli váš soubor importovat dvakrát). Pokud tuto volbu zaškrtnete, TNG automaticky nastaví všechny nové vlastní typy událostí na "přijmout" a všechny vaše události
< 		budou importovány napoprvé.</p>
---
> 		<p>Pozn.: Pokud nahrajete/importujete soubor ZIP a vložíte do souboru aktuální média, TNG rozbalí média do příslušných složek médií (např. "photos" nebo podsložka "photos"). Další možnosti týkající se vložených médií naleznete v �ásti Administrace/Nastavení/Nastavení importu dat.</p>
56,58c52,60
< 		<span class="optionhead">Importovat pouze vlastní typy událostí (nebudou vloženy, nahrazeny nebo přidány žádné údaje)</span>
< 		<p>Zaškrtnutí této volby způsobí, že budou naimportovány pouze vlastní typy událostí (viz Admin/Vlastní typy událostí). Všechny další údaje budou ignorovány. To je ideální možnost
< 		jak sestavit vaše výchozího nastavení, protože vám umožní vidět, které vlastní události vás soubor GEDCOM obsahuje. Můžete poté zvolit, které události
---
> 		<span class="optionhead">Přijmout data pro všechny typy vlastních událostí</span>
> 		<p>Váš soubor GEDCOM může obsahovat události, které bude TNG považovat za nestandardní události. Normálně jsou typy nových událostí a atributů, které soubor GEDCOM obsahuje, vloženy do databáze, ale
> 		ale je nastaveno, aby tato data byla ignorována. Aby bylo možné importovat události nebo atributy tohoto typu, musíte změnit stav takového typu na „Přijmout“ (jinými slovy,
> 		abyste nemuseli váš soubor importovat dvakrát). Pokud tuto volbu zaškrtnete, TNG automaticky nastaví všechny typy nových událostí a atributů na "Přijmout" a všechny vaše události
> 		budou importovány napoprvé.</p>
>     
> 		<span class="optionhead">Importovat pouze typy vlastních událostí a atributů (nebudou vloženy, nahrazeny nebo přidány žádné údaje)</span>
> 		<p>Zaškrtnutí této volby způsobí, že budou naimportovány pouze typy vlastních událostí a atributů (viz Administrace/Typy událostí / atributů). Všechny další údaje budou ignorovány. To je ideální možnost
> 		jak sestavit vaše výchozí nastavení, protože vám umožní vidět, které vlastní události vás soubor GEDCOM obsahuje. Poté můžete zvolit, které události
124,125c126,127
< <tr class="databack">
< 	<td class="tngshadow">
---
> <tr>
> 	<td class="tngshadow databack">
141a144,147
> 		<span class="optionhead">Zazipovat a vložit mediální soubory</span>
> 		<p>Pokud zaškrtnete možnost Exportovat odkazy na média, dostáváte také možnost zaškrtnout možnost zazipovat hotový soubor a zahrnout fyzické mediální 
>     soubory uvedené v souboru GEDCOM. Vezměte na vědomí, že to může způsobit, že váš soubor bude extrémně velký.</p>
> 
153a160,164
>     
> 		<span class="optionhead">Souhrn</span>
> 		<p>Po dokon�ení exportu byste měli vidět souhrn toho, kolik osob, rodin, pramenů, poznámek, úložišť, médií a míst bylo exportováno. Je třeba 
>     poznamenat, že do celkového po�tu míst budou zapo�ítána pouze místa, která mají informace o zeměpisné šířce/délce nebo poznámky.</p>
>         
diff -r TNG/languages/Czech-UTF8/dna_help.php TNG1403/languages/Czech-UTF8/dna_help.php
21a22,25
> 			<a href="#ydna" class="lightlink">Pole Y-DNA</a> &nbsp; | &nbsp;
> 			<a href="#mtdna" class="lightlink">Pole mtDNA</a> &nbsp; | &nbsp;
> 			<a href="#atdna" class="lightlink">Pole atDNA</a> &nbsp; | &nbsp;
> 			<a href="#common" class="lightlink">Spole�ná pole</a> &nbsp; | &nbsp;      
27a32,36
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
47a57
> 		<p>Pole mohou zůstat prázdné a nebudou ve většině případů zobrazeny.</p>
52,53c62,63
< 		<span class="optionhead">Číslo testu</span>
< 		<p>Zapište ID �íslo spojené s tímto testem. Pokud nemůžete �íslo najít nebo vám jej dodavatel nedal, nebojte se vytvořit �íslo nové.</p>
---
> 		<span class="optionhead">Číslo testu/název</span>
> 		<p>Zapište ID �íslo spojené s tímto testem. Pokud nemůžete �íslo najít nebo vám jej dodavatel nedal, nebojte se vytvořit �íslo nové. <br /><strong>Všimněte si, </strong>že pokud nezadáte hodnotu do pole Číslo testu/název, nebudete mít k dispozici rychlý odkaz pro úpravu dat DNA z obrazovky prohlížení DNA, jako je browse_dna_tests.php.</p>
57a68,79
> 		<span class="optionhead">Datum testu</span>
> 		<p>Toto je datum, kdy byl test DNA proveden.</p>
> 
> 		<span class="optionhead">Datum shody</span>
> 		<p>Toto je datum, kdy byla zjištěna shoda vašeho testu s osobou, které byl test DNA proveden.</p>
> 
> 		<span class="optionhead">GEDmatch ID</span>
> 		<p>Číslo ID tohoto testu na webu GEDmatch. Platí pouze pro testy atDNA.</p>
> 
> 		<span class="optionhead">Ponechat test neveřejný</span>
> 		<p>Pokud zadáte do pole Ponechat test neveřejný Ano, zobrazení testu bude omezeno pouze na přihlášené uživatele, kteří mají přístupová práva nastavená na <strong>Povolit neveřejné</strong>. To umožní omezit přístup k testům DNA, které jste ozna�ili jako Ponechat test neveřejný. Test bude viditelný pro administrátora TNG.</p>
> 
61,62c83,84
< 		<span class="optionhead">Držet jméno jako neveřejné</span>
< 		<p>Pokud je zaškrtnuto toto polí�ko, jméno uvedené jako "testovaná osoba" se bude zobrazovat jako osoba "Neveřejná".</p>
---
> 		<span class="optionhead">Ponechat jméno neveřejné</span>
> 		<p>Pokud je zaškrtnuto toto polí�ko, jméno uvedené jako "testovaná osoba" se bude zobrazovat jako "Neveřejné". Jméno bude viditelné pro administrátora TNG.</p>
67,68c89,90
< 		<span class="optionhead">DNA Group</span>
< 		<p>Skupiny DNA se používají ke spojení různých testů DNA dohromady.  Můžete například vytvořit skupinu pro vaši otcovskou linii a další skupinu pro vaši mateřskou linii.  Další příbuzní, kteří si nechali provést test Y-DNA nebo mtDNA, mohou být spojeni se skupinami, které jste definovali.  Skupiny DNA jsou jen způsob, jak spojit více testů dohromady.  Propojení testů se skupinou je nepovinné.  Skupina DNA může být užite�ná ve studiích týkajících se unikátního příjmení, kde by stejné příjmení mohlo být v různých skupinách DNA.</p>
---
> 		<span class="optionhead">Skupiny DNA</span>
>     <p>Skupiny DNA se používají k výběru nebo filtrování testů DNA nebo typů testů v seznamu. Můžete například vytvořit skupinu pro vaši otcovskou linii a další skupinu pro mateřskou linii. Skupiny DNA jsou jen způsob, jak filtrovat seznam testů. Propojení testů se skupinou je nepovinné. Povšimněte si, že skupiny DNA jsou nyní spojeny s typem testu a pro dva různé typy testů nemůžete použít stejný název skupiny DNA.</p>
70,72c92,96
< 		<span class="optionhead">Po�et markerů</span>
<       <p>Genetický marker je gen nebo sekvence DNA se známým umístěním na chromozomu, který může být použit k identifikaci jednotlivce. Testy DNA se mohou lišit podle po�tu markerů, které se testují.
<       <br />Typické testy Y-DNA mohou být provedeny na 20, 37, 44, 67, 91, 101 nebo 111 markerů.</p>
---
> 		<span class="optionhead">Haploskupina</span>
> 		<p>Haploskupina je genetická populace lidí, kteří sdílejí spole�ného předka v otcovské nebo mateřské linii. Haploskupiny jsou ozna�eny písmeny abecedy (A-T) a jejich upřesnění (SNP) obsahuje další kombinace �íslic a písmen. K dispozici jsou dvě samostatná vstupní pole, protože některé testovací spole�nosti poskytují u testů atDNA obě odhadované haploskupiny nebo si testovaná osoba může nechat zhotovit test mtDNA i Y-DNA.</p>
> 		<p>Pole <strong>Haploskupina mtDNA</strong> je ur�eno pro matrilineální haploskupinu, která je běžně výsledkem testu mtDNA.</p>
> 		<p>Pole <strong>Haploskupina Y-DNA</strong> je ur�eno pro patrilineální haploskupinu, která je běžně výsledkem testu Y-DNA.</p>
> 		<p>Některé testovací spole�nosti poskytují ve svých testech atDNA haploskupiny mtDNA a Y-DNA. Family Tree DNA toto poskytuje, pokud byly provedeny odpovídající testy mtDNA a Y-DNA. Ostatní testovací spole�nosti předpovídají, jaké haploskupiny mohou být.</p>
73a98,111
>     <p>Zaškrtávací polí�ko Potvrzeno slouží k ozna�ení, že test poskytl potvrzenou haploskupinu na rozdíl od předpokládané. Protože haploskupina se skládá z podobných haplotypů, je možné předpovědět haploskupinu z haplotypu. Pro potvrzení předpovědi haploskupiny je vyžadován test SNP. Ne všechny testovací spole�nosti nabízejí test SNP, proto jejich předpovědi haploskupiny zákazníka jsou někdy nepřesné.</p>
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Nahoru</a></p>
> 		<a name="ydna"><p class="subheadbold">Pole výsledků testů Y-DNA</p></a>
> 			
>     <p>Otcovskou linii daného muže lze stopovat prostřednictvím DNA obsažené v jeho chromozómu Y (Y-DNA). Test Y-DNA spo�ívá v analýze segmentů DNA chromozómu Y (přítomném pouze u mužů), zvaných krátká tandemová repetice (STR z anglického Short Tandem Repeat). Testované segmenty jsou ozna�ovány jako markery a nacházejí se v nekódující �ásti DNA. STR vyjadřují změnu po�tu opakování daného segmentu DNA.</p>
>     
> 		<p><strong>Po�et markerů</strong></p>
> 		<p>Genetický marker je gen nebo sekvence DNA se známým umístěním na chromozomu, který může být použit k identifikaci jednotlivce. Testy DNA se mohou lišit podle po�tu markerů, které se testují.<br />Typické testy Y-DNA mohou být provedeny na 12, 25, 37, 44, 67, 91, 101 nebo 111 markerů.<br />Vzhledem k tomu, že Family Tree DNA je v sou�asné době jediným dodavatelem nabízejícím testy Y-DNA, je ve porovnávacím reportu Y-DNA použito 12, 25, 37, 67 a 111 markerů.</p>
>     
75c113,114
< 		  <p>Zadejte hodnoty vašeho Y-DNA markeru oddělené �árkou.<br />Například: "13,24,14,10,11-14,12,12,12,13,14,30,17,9-10,11,11,24,15,19,30,15-15-16-17".</p>
---
> 		<p>Zadejte hodnoty vašeho Y-DNA markeru oddělené �árkou. Například: "13,24,14,10,11-14,12,12,12,13,14,30,17,9-10,11,11,24,15,19,30,15-15-16-17" (bez uvozovek).<br />nebo s mezerami za �árkou pro lepší �itelnost, "13, 24, 14, 10, 11-14, 12, 12, 12, 13, 14, 30, 17, 9-10, 11, 11, 24, 15, 19, 30,1 5-15-16-17" (bez uvozovek).</p>    
>     <p>Všimněte si, že Y-DNA markery, které mají rozsah hodnot, musí být zadány pomocí poml�ky mezi hodnotami, protože rozsah hodnot může být proměnný</p>
77,84c116,124
< 		<span class="optionhead">Haploskupina</span>
<       <p>Haploskupina je genetická populace lidí, kteří sdílejí spole�ného předka v otcovské nebo mateřské linii. 
<       Haploskupiny jsou ozna�eny písmeny abecedy (A-T) a jejich upřesnění (SNP) dále obsahuje �íslice a malá písmena abecedy.</p>
<       <p>K SNP (jednonukleotidový polymorfismus) dojde, když se v průběhu procesu tvorby buněk změní jedno místo v sekvenci genomu a tato mutace v potomstvu přetrvá.</p>
<       <p>Některé SNP znaky jsou ozna�ovány také jako tzv. UEP (Unique Event Polymorphism) tzn. že tyto změny/variace jsou v daném řetězci DNA unikátní tj. dojde k nim pouze 
<       jednou a víckrát již ne. Díky tomu lze každou linii ať již otcovskou �i mateřskou přiřadit k ur�ité haploskupině.</p> 
< 
< 		<p>Zaškrtávací polí�ko pro potvrzení se používá k ozna�ení, že test poskytuje potvrzenou haploskupinu na rozdíl od předpokládané. Protože se haploskupina skládá z podobných haplotypů, je možné haplotyp předpovědět z haplotypu. Pro potvrzení předpovědi haploskupiny je nutný test SNP. Ne všechny testovací spole�nosti nabízejí testování SNP, a proto jsou předpovědi haploskupin jejich zákazníků někdy nepřesné.</p>
---
> 		<strong>SNP</strong>
> 		<p>SNP (jednonukleotidový polymorfismus) se vyskytne, když se v průběhu procesu tvorby buněk změní jedno místo v sekvenci genomu a tato mutace v potomstvu přetrvá. Osoba má mnoho zděděných SNP, které spole�ně tvoří pro daného jedince unikátní (UEP) vzor DNA.</p>
>        <p>V genetické genealogii je unikátní polymorfismus (UEP) genetickým markerem, který odpovídá mutaci, která se pravděpodobně vyskytuje tak zřídka, že se předpokládá, že je naprosto pravděpodobné, že všichni jedinci, kteří sdílejí tento marker po celém světě, ji dědí od shodného spole�ného předka a shodné události jednotlivé mutace.</p>
> 
> 		<p><strong>Signifikantní SNPs</strong></p>
> 		<p>Tyto SNP mohou klinicky souviset, souviset s americkými indiány, apod.</p>
> 
> 		<p><strong>Terminální SNP</strong></p>
>     <p>Terminální SNP je definovaný SNP poslední (koncové) větve haploskupiny rozpoznané aktuálním výzkumem. Měl by být jedine�ný a konstantní v �ase. Někdy se "terminální SNP" používá k ozna�ení SNP, pro které byl �lověk naposledy testován.</p>
86,87c126,129
< 		<span class="optionhead">Rozdíly HVR1/HVR2/kódování oblastí, zvláštní mutace</span>
< 		<p>Zadejte výsledky svého testu mtDNA oddělené �árkou.<br />Například: "A16129G,T16187C,C16189T,T16223C,G16230A,T16278C,C16311T,C16519T".<br />V sou�asné době neexistuje program, který porovnává hodnoty HVR1, HVR2 a kódování oblastí, jako je porovnání Y-DNA markerů</p>
---
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
89,90c131,154
< 		<span class="optionhead">Signifikantní SNP</span>
<     <p>Tyto znaky SNP mohou být zpřízněny klinicky, zpřízněny s americkými indiány, apod.</p>
---
> 		<p style="float:right"><a href="#top">Nahoru</a></p>
> 		<a name="mtdna"><p class="subheadbold">Pole výsledků testů mtDNA</p></a>
> 		
> 		<p>Mateřskou linii předků lze stopovat pomocí <span class="optionhead">mitochondriální DNA (mtDNA)</span>. Dle sou�asných konvencí je mtDNA rozdělena do tří oblastí. Těmi jsou kódující oblast a dvě hypervariabilní oblasti (HVR1 a HVR2)
>     
>     <ul>
> 		<li><strong>HVR1</strong>, ve které jsou nukleotidy �íslovány v rozsahu od 16001 do 16569. </li>
> 		<li><strong>HVR2</strong>, ve které jsou nukleotidy �íslovány v rozsahu od 00001 do 00574. </li>
> 		<li><strong>Kódující oblast (CR)</strong> je �ást vaší mtDNA, ve které jsou nukleotidy �íslovány v rozsahu od 00575 do 16000.</li></ul></p>
> 		<p>Více informací o mtDNA lze najít např. na stránkách <a href="https://www.familytreedna.com/learn/mtdna-testing/parts-mitochondrial-dna-mtdna-hvr1-hvr2-coding-region/" target="_blank">The Family Tree DNA Learning Center</a></p>
> 
> 		<p><strong>Referen�ní sekvence</strong></p>
>     <p> V polích výsledků testu mtDNA můžete vybrat jednu ze dvou referen�ních sekvencí. Family Tree DNA poskytuje obě sekvence, takže je třeba zvolit, jakou verzi výsledků zadáte do vstupních polí.
> 		<ul><li><strong>RSRS</strong> - Reconstructed Sapiens Reference Sequence je referen�ní sekvence mitochondriální DNA (mtDNA), který využívá jak globální vzorkování moderních lidských vzorků, tak vzorků starých hominidů. Byla představena po�átkem roku 2012 jako náhrada za rCRS (revised Cambridge Reference Sequence).  RSRS zachovává stejný systém �íslování jako CRS, ale zastupuje dědi�ný genom mitochondriální Evy, ze kterého pocházejí všechny sou�asně známé lidské mitochondrie.</li>
> 		
> 		<li><strong>rCRS</strong> - Revised Cambridge Reference Sequence pro lidskou mitochondriální DNA byla představena v roce 1981 a vedla k zahájení projektu lidského genomu.</li></ul> </p>
> 			
> 		<p><span class="optionhead">Rozdíly HVR1/HVR2/Kódující oblast, Zvláštní mutace</span></p>
> 		<p>Zadejte výsledky svého testu mtDNA oddělené �árkou.<br />Například: "A16129G,T16187C,C16189T,T16223C,G16230A,T16278C,C16311T,C16519T".<br />Výsledek můžete také zadat s mezerami za �árkou pro lepší �itelnost, například "A16129G, T16187C, C16189T, T16223C, G16230A, T16278C, C16311T, C16519T" (bez uvozovek)</p>
>     
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
92,93c156,198
< 		<span class="optionhead">Terminální SNP</span>
<     <p>Terminální SNP je definovaný SNP poslední (koncové) větve haploskupiny rozpoznané aktuálním výzkumem. Měl by být jedine�ný (UEP) a konstantní v �ase.</p>
---
> 		<p style="float:right"><a href="#top">Nahoru</a></p>
> 		<a name="atdna"><p class="subheadbold">Pole výsledků testů atDNA</p></a>
> 
> 		<p><span class="optionhead">Autozomální DNA (atDNA) </span> testuje vaše autozomální chromozómy, což je dalších 22 párů za pohlavními chromozomy X a Y. Testy autozomální DNA mohou pomoci identifikovat příbuzné, kteří sdílejí nedávné předky. Čím více segmentů sdílíte a �ím větší je délka těchto segmentů, tím více jste spřízněni.</p>
> 		
> 		<p><strong>Sdílená DNA</strong><br />
>     Sdílené segmenty DNA, ozna�ované také jako "odpovídající segmenty", jsou �ásti DNA, které jsou shodné mezi dvěma jednotlivci. Tyto segmenty byly pravděpodobně zděděny od spole�ného předka. Při rozhodování o tom, která shody DNA budete sledovat, postupujte podle těch s více než jedním velkým segmentem; to jsou vaše blízcí příbuzní, ti, jejichž stromy se snadněji spojí s vašimi.</p>
> 		
> 		<p><strong>Celkově sdílené cM</strong><br />
> 		Toto je sou�et autosomální DNA, dané v centimorgans (cM), který vy a vaše genetická shoda sdílíte.<br />Viz <a href="https://dnapainter.com/tools/sharedcmv4" traget="_blank">The Shared cM Project Tool</a>, kde je více informací o pravděpodobnosti zpřízněnosti na základě po�tu celkového po�tu sdílených cM.</p> 
>     
> 		<p><strong>Sdílené segmenty</strong><br />
>     Po�et sdílených segmentů v této sdílené shodě DNA. Čím více segmentů sdílíte a �ím větší je délka těchto segmentů, tím více jste zpřízněni.</p>
> 		
> 		<p><strong>Největší segment</strong><br />
>     Segmenty, které spole�ně sdílejí velké množství centiMorganů, jsou s větší pravděpodobností významné a ozna�ují v genealogickém �asovém rámci spole�ného předka. Toto je největší sdílený segment v této shodě DNA.</p>
> 		
> 		<p><strong>Chromozóm �.</strong><br />
> 		Toto je �íslo chromozómu největšího shodného segmentu.</p>
> 		
> 		<p><strong>Za�átek segmentu</strong><br />
>     Toto je po�áte�ní místo největšího shodného sdíleného segmentu DNA</p>	
> 		
> 		<p><strong>Konec segmentu</strong><br />
>     Toto je kone�né místo největšího shodného sdíleného segmentu DNA</p>
> 		
> 		<p><strong>centiMorgany</strong><br />
>     V genetické genealogii je centiMorgan (cM) nebo mapová jednotka (m.u.) jednotkou frekvence rekombinace, která se používá k měření genetické vzdálenosti. Toto je po�et cM v největším shodném segmentu.</p>
> 		
> 		<p><strong>Po�et shodných SNP</strong><br />
> 		To je po�et SNP pro největší shodný segment.</p>
> 		
> 		<p><strong>X-shoda</strong><br />
> 		Toto pole udává, zda se autosomální DNA shoduje také na chromozómu X.</p>
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Nahoru</a></p>
> 		<a name="common"><p class="subheadbold">Spole�ná pole výsledků testů</p></a>
> 		
> 		<p>Následující pole jsou spole�ná pro všechny typy testů</p>
101,103c206,208
< 		<span class="optionhead">Ancestral surnames</span>
< 		<p>Toto pole se vztahuje na všechny typy testů a bude automaticky vyplněno rodovými příjmeními osoby, u které byly provedeny testy Y-DNA a mtDNA, oddělenými �árkami<br />Doplněné příjmení závisí na typu testu a můžete je jakýmkoli způsobem upravit. <br />V Administrace >> Nastavení >> Konfigurace >> Základní nastavení >> Testy DNA je možnost vylou�ení příjmení jako je neznámé nebo NEZN�MÉ, a možnost zobrazit příjmení velkými písmeny.</p>
<     
---
> 		<span class="optionhead">Rodová příjmení</span>
> 		<p>Toto pole se vztahuje na všechny typy testů a bude automaticky vyplněno rodovými příjmeními osoby, u které byly provedeny testy Y-DNA a mtDNA, oddělenými �árkami<br />Doplněná příjmení závisí na typu testu a můžete je jakýmkoli způsobem upravit. <br />V Administrace >> Nastavení >> Konfigurace >> Základní nastavení >> Testy DNA je možnost vylou�ení příjmení jako je neznámé nebo NEZN�MÉ, a možnost zobrazit příjmení velkými písmeny.<br />Nyní je také možnost zvolit, z kolika generací vašeho rodokmenu se u testů atDNA vrátí rodové příjmení.</p>
> 
105c210
< 		<p>Zapište nějaké poznámky spojené s tímto testem nebo jakékoli jiné informace.</p>
---
> 		<p>Zapište poznámky spojené s tímto testem nebo jakékoli jiné informace.</p>
122c227
<     <p>Další informace (v angli�tině) najdete na těchto stránkách TNG Wiki:</p>
---
> 		<p>Další informace (v angli�tině) najdete na těchto stránkách TNG Wiki:</p>
124,125c229,232
< 			<li><a href="https://tng.lythgoes.net/wiki/DNA_Tests" target="_blank">DNA Tests<a></li>
< 			<li><a href="https://tng.lythgoes.net/wiki/TNG_and_DNA_Tests" target="_blank">TNG and DNA Tests<a></li>
---
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/DNA_Tests" target="_blank">DNA Tests<a></li>
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/TNG_and_DNA_Tests" target="_blank">TNG and DNA Tests<a></li>
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/DNA_Tests_Enhancements‎" target="_blank">DNA Tests Enhancements‎<a></li>
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/Compare_DNA_Test_Results‎" target="_blank">Compare DNA Test Results‎<a></li>
127d233
< 
diff -r TNG/languages/Czech-UTF8/events_help.php TNG1403/languages/Czech-UTF8/events_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/eventtypes_help.php TNG1403/languages/Czech-UTF8/eventtypes_help.php
3c3
< echo help_header("Nápověda: Vlastní typy událostí");
---
> echo help_header("Nápověda: Typy událostí / atributů");
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
21c17
< 		<span class="largeheader">Nápověda: Vlastní typy událostí</span>
---
> 		<span class="largeheader">Nápověda: Typy událostí / atributů</span>
31a28,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
34c35
<     <p>Nalezení existujících vlastních typů událostí vyhledáním celého nebo �ásti <strong>Tagu, Typu/popisu (pro události EVEN)</strong> nebo <strong>Zobrazit</strong>.
---
>     <p>Nalezení existujících typů událostí a atributů vyhledáním celého nebo �ásti <strong>Tagu, Typu/popisu (pro události EVEN)</strong> nebo <strong>Zobrazit</strong>.
36c37
< 		Výsledkem hledání bez zadaných voleb a hodnot ve vyhledávacích polích bude seznam všech vlastních typů událostí ve vaší databázi. Možnosti výběru jsou následující:</p>
---
> 		Výsledkem hledání bez zadaných voleb a hodnot ve vyhledávacích polích bude seznam všech typů událostí a atributů ve vaší databázi. Možnosti výběru jsou následující:</p>
39c40
< 		Pro omezení výběru zvolte z tohoto rozbalovacího seznamu vlastní typy událostí spojené s osobami, rodinami, prameny nebo úložišti pramenů.</p>
---
> 		Pro omezení výběru zvolte z tohoto rozbalovacího seznamu typy událostí a atributů spojené s osobami, rodinami, prameny nebo úložišti pramenů.</p>
42c43
< 		Výběrem jedné z těchto voleb omezíte výběr vlastních typů událostí na ty, které jsou <strong>přijaty</strong>, nebo na ty,
---
> 		Výběrem jedné z těchto voleb omezíte výběr typů událostí a atributů na ty, které jsou <strong>přijaty</strong>, nebo na ty,
61c62
< 		<a name="add"><p class="subheadbold">Přidat nebo upravit vlastní typy událostí</p></a>
---
> 		<a name="add"><p class="subheadbold">Přidat nebo upravit typy událostí / atributů</p></a>
63,67c64,67
< 		<p>Nejobvyklejší neboli "Standardní" typy událostí, jako jsou Narození, Úmrtí, Sňatek několik dalších, jsou spravovány přímo na stránkách osoby, rodiny, pramenu nebo úložišti pramenů.
< 		Všechny ostatní typy událostí jsou spojeny s "vlastními" typy událostí
< 		a jsou spravovány v sekcích <strong>Další události</strong> na stránkách osoby, rodiny, pramenu nebo úložiště pramenů. Před zápisem některé z těchto "dalších"
< 		událostí musíte mít záznam s ní spojeného vlastního typu události. TNG automaticky nastaví vlastní typy událostí pro všechny nestandardní události, které obsahuje
< 		váš soubor GEDCOM, ale nastavit vlastní typy událostí můžete také ru�ně.</p>
---
> 		<p>Nejobvyklejší události neboli typy "základních" událostí, jako jsou Narození, Úmrtí, Sňatek a několik dalších, jsou spravovány přímo na stránkách osoby, rodiny, pramenu nebo úložišti pramenů.
> 		Všechny ostatní události a atributy jsou spravovány v sekcích <strong>Další události / atributy</strong> na stránkách osoby, rodiny, prameny nebo úložiště pramenů. Před zápisem některé z těchto "dalších"
> 		událostí musíte mít záznam s ní spojeného typu události / atributu. TNG automaticky nastaví typy událostí / atributů pro všechny nestandardní události, které obsahuje
> 		váš soubor GEDCOM, ale nastavit tyto typy můžete také ru�ně.</p>
69c69
<     <p>Chcete-li přidat nový vlastní typ události, klikněte na záložku <strong>Přidat nový</strong> a pak vyplňte formulář. Chcete-li upravit existující vlastní typ události, použijte
---
>     <p>Chcete-li přidat nový typ události / atributu, klikněte na záložku <strong>Přidat nový</strong> a pak vyplňte formulář. Chcete-li upravit existující typ, použijte
71c71
< 		Význam polí při přidání nebo úpravě vlastního typ události je následující:</p>
---
> 		Při přidávání nebo úpravě typu mějte na paměti následující:</p>
74,75c74,75
< 		<p>Z tohoto rozbalovacího seznamu vyberte volbu, zda je tento typ události spojen s osobou, rodinou, pramenem nebo úložištěm pramenů.
< 		Jednotlivý vlastní typ události může být spojen pouze z jednou z těchto možností. Volba tohoto pole
---
> 		<p>Z tohoto rozbalovacího seznamu vyberte volbu, zda je tento typ události / atributu spojen s osobou, rodinou, pramenem nebo úložištěm pramenů.
> 		Jednotlivý typ události / atributu může být spojen pouze z jednou z těchto možností. Volba tohoto pole
99c99
< 		<p>Chcete-li přijmout importované údaje, která odpovídají tomuto vlastnímu typu události, vyberte <em>Přijmout</em>. Chcete-li data, která odpovídají tomuto vlastnímu typu události, nepřijmout
---
> 		<p>Chcete-li přijmout importované údaje, která odpovídají tomuto typu události / atributu, vyberte <em>Přijmout</em>. Chcete-li data, která odpovídají tomuto typu vlastní události, nepřijmout
101c101
< 		nebude tento vlastní typ události zobrazován.</p>
---
> 		nebude tento typ vlastní události zobrazován.</p>
110c110
< 	  <p><span class="optionhead">Povinná pole:</span>Pro vaši událost musíte vybrat nebo zadat GEDCOM tag. Pokud zvolíte tag "EVEN" (obecná vlastní událost),
---
> 	  <p><span class="optionhead">Povinná pole:</span>Pro vaši událost musíte vybrat nebo zadat GEDCOM tag. Pokud zvolíte tag "EVEN" (obecná událost),
120c120
< 		<p>Chcete-li najednou ozna�it vlastní typy událostí jako <strong>Přijmout</strong> nebo <strong>Odmítnout</strong>, zaškrtněte polí�ko Vybrat vedle každého vlastního typu události,
---
> 		<p>Chcete-li najednou ozna�it více typů jako <strong>Přijmout</strong> nebo <strong>Odmítnout</strong>, zaškrtněte polí�ko Vybrat vedle každého typu události / atributu,
129,131c129,131
< 		<a name="delete"><p class="subheadbold">Vymazat vlastní typy událostí</p></a>
<     <p>Chcete-li odstranit vlastní typ události, použijte záložku <a href="#search">Hledat</a> k nalezení položky, a poté klikněte na ikonku Vymazat vedle tohoto záznamu. Tento řádek změní
< 		barvu a poté po odstranění vlastního typu události zmizí. Chcete-li najednou odstranit více záznamů, zaškrtněte tla�ítko ve sloupci Vybrat vedle každého záznamu, který má být
---
> 		<a name="delete"><p class="subheadbold">Vymazat typy událostí / atributů</p></a>
>     <p>Chcete-li odstranit typ události / atributu, použijte záložku <a href="#search">Hledat</a> k nalezení položky, a poté klikněte na ikonku Vymazat vedle tohoto záznamu. Tento řádek změní
> 		barvu a poté po odstranění typu události / atributu zmizí. Chcete-li najednou odstranit více záznamů, zaškrtněte tla�ítko ve sloupci Vybrat vedle každého záznamu, který má být
diff -r TNG/languages/Czech-UTF8/families_help.php TNG1403/languages/Czech-UTF8/families_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
33a35
>   		<a name="search"><p class="subheadbold">Hledat</p></a>
35,37c37,39
<     Pro daląí zúľení vaąeho hledání vyberte strom nebo zaąkrtněte "Pouze přesná shoda". Volbou "Jména otce" budou vaąe výběrová kritéria porovnána se jmény vąech otců.
< 		Volbou "Jména matky" budou vaąe výběrová kritéria porovnána se jmény vąech matek. Volbou "Beze jména" budete hledat pouze mezi ID �ísly rodiny.
<     Výsledkem hledání bez zadaných voleb a hodnot ve vyhledávacích polích bude seznam vąech osob ve vaąí databázi.</p>
---
>     Pro další zúžení vašeho hledání vyberte strom nebo zaškrtněte "Pouze přesná shoda". Volbou "Jména otce" budou vaše výběrová kritéria porovnána se jmény všech otců.
> 		Volbou "Jména matky" budou vaše výběrová kritéria porovnána se jmény všech matek. Volbou "Beze jména" budete hledat pouze mezi ID �ísly rodiny.
>     Výsledkem hledání bez zadaných voleb a hodnot ve vyhledávacích polích bude seznam všech osob ve vaší databázi.</p>
39c41
< 		<p>Vyhledávací kritéria, která zadáte na této stránce, budou uchována, dokud nekliknete na tla�ítko <strong>Obnovit</strong>, které znovu obnoví vąechny výchozí hodnoty.</p>
---
> 		<p>Vyhledávací kritéria, která zadáte na této stránce, budou uchována, dokud nekliknete na tla�ítko <strong>Obnovit</strong>, které znovu obnoví všechny výchozí hodnoty.</p>
42,44c44,46
< 		<p>Tla�ítko Akce vedle kaľdého výsledku hledání vám umoľní upravit, vymazat nebo otestovat výsledek. Chcete-li najednou vymazat více záznamů, zaąkrtněte polí�ko ve sloupci
< 		<strong>Vybrat</strong> u kaľdého záznamu, která má být vymazán, a poté klikněte na tla�ítko "Vymazat ozna�ené" na za�átku seznamu. Pro zaąkrtnutí nebo vy�iątění vąech výběrových polí�ek najednou
<     můľete pouľít tla�ítka <strong>Vybrat vąe</strong> nebo <strong>Vy�istit vąe</strong>	.</p>
---
> 		<p>Tla�ítko Akce vedle každého výsledku hledání vám umožní upravit, vymazat nebo otestovat výsledek. Chcete-li najednou vymazat více záznamů, zaškrtněte polí�ko ve sloupci
> 		<strong>Vybrat</strong> u každého záznamu, která má být vymazán, a poté klikněte na tla�ítko "Vymazat ozna�ené" na za�átku seznamu. Pro zaškrtnutí nebo vy�ištění všech výběrových polí�ek najednou
>     můžete použít tla�ítka <strong>Vybrat vše</strong> nebo <strong>Vy�istit vše</strong>.</p>
53,54c55,56
< 		<p>Výrazem <strong>Rodina</strong> se v tomto programu rozumí kaľdé spojení mezi "otcem" a "matkou" (děti zde mohou nebo nemusí být obsaľeny). Pokud byla osoba víckrát sezdána
< 		nebo má děti s více partnery, měli byste pro kaľdý pár manľelů nebo partnerů vytvořit novou rodinu.</p>
---
> 		<p>Výrazem <strong>Rodina</strong> se v tomto programu rozumí každé spojení mezi "otcem" a "matkou" (děti zde mohou nebo nemusí být obsaženy). Pokud byla osoba víckrát sezdána
> 		nebo má děti s více partnery, měli byste pro každý pár manželů nebo partnerů vytvořit novou rodinu.</p>
56,57c58,59
< 		<p>Chcete-li přidat novou rodinu, klikněte na záloľku <strong>Přidat nové</strong> a poté vyplňte formulář. Některé informace (poznámky, citace a 
< 		daląí události) můľete přidat po uloľení a zamknutí záznamu. Význam jednotlivých polí je následující:</p>
---
> 		<p>Chcete-li přidat novou rodinu, klikněte na záložku <strong>Přidat nové</strong> a poté vyplňte formulář. Některé informace (poznámky, citace a 
> 		další události) můžete přidat po uložení a zamknutí záznamu. Význam jednotlivých polí je následující:</p>
60c62
< 		<p>Pokud máte pouze jeden strom, vybrán bude vľdy tento strom. Jinak, prosím, pro novou rodinu vyberte poľadovaný strom.</p>
---
> 		<p>Pokud máte pouze jeden strom, vybrán bude vždy tento strom. Jinak, prosím, pro novou rodinu vyberte požadovaný strom.</p>
63,66c65,68
< 		<p>Připojení rodiny ke "větvi" omezí přístup k informacím o rodině pro uľivatele, kteří jsou spojeni k téľe větvi. Je-li definována alespoň jedna větev
< 		a váą uľivatelský ú�et není spojen se ľádnou konkrétní větví, můľete novou rodinu připojit k více existujícím větvím. Chcete-li větev vybrat,
< 		kliknutím na odkaz "Upravit" se otevře box se vąemi větvemi ve vybraném stromě. Pro výběr více větví pouľijte klávesu Control (Windows) nebo Command (Mac).
< 		Po dokon�ení vaąeho výběru přesuňte kursor myąi mimo okno úprav a toto okno zmizí.</p>
---
> 		<p>Připojení rodiny ke "větvi" omezí přístup k informacím o rodině pro uživatele, kteří jsou spojeni k téže větvi. Je-li definována alespoň jedna větev
> 		a váš uživatelský ú�et není spojen se žádnou konkrétní větví, můžete novou rodinu připojit k více existujícím větvím. Chcete-li větev vybrat,
> 		kliknutím na odkaz "Upravit" se otevře box se všemi větvemi ve vybraném stromě. Pro výběr více větví použijte klávesu Control (Windows) nebo Command (Mac).
> 		Po dokon�ení vašeho výběru přesuňte kursor myši mimo okno úprav a toto okno zmizí.</p>
70,78c72,80
< 		Při prvním zobrazení stránky a kdykoli je vybrán jiný strom, bude doplněno volné a jednozna�né �íslo, ale pokud chcete, můľete vloľit své vlastní ID �íslo.
< 		Chcete-li zkontrolovat, zda je vaąe ID �íslo jednozna�né, klikněte na tla�ítko <strong>Zkontrolovat</strong>. Objeví se zpráva, která vám sdělí, zda je jiľ ID �íslo pouľito nebo ne.
< 		Chcete-li vygenerovat daląí jednozna�né �íslo, klikněte na <strong>Vygenerovat</strong>. Bude zjiątěno nejvyąąí �íslo ve vaąí databázi a přidána 1.
< 		Chcete-li zajistit, ľe zobrazení ID �íslo není nárokováno jiným uľivatelem, zatímco vy zapisujete data, klikněte na tla�ítko <strong>Zamknout</strong>.</p>
< 
< 		<p><strong>POZN.</strong>: Pouľíváte-li tento program spolu s genealogickým programem pracujícím na platformách PC nebo Mac, který u nových rodin vytváří také ID �ísla,
< 		DŮRAZNĚ DOPORUČUJEME vąechny tato �ísla vľdy mezi těmito programy synchronizovat. Výsledkem zanedbání této �innosti mohou být kolize a nepouľitelnost
< 		odkazů na vaąe média. Pokud váą primární program vytváří ID �ísla, která neodpovídají tradi�ním standardům (např. 
< 		<strong>F</strong> je na konci a ne na za�átku), můľete konvence, které TNG pouľívá, změnit v Základním nastavení.</p>
---
> 		Při prvním zobrazení stránky a kdykoli je vybrán jiný strom, bude doplněno volné a jednozna�né �íslo, ale pokud chcete, můžete vložit své vlastní ID �íslo.
> 		Chcete-li zkontrolovat, zda je vaše ID �íslo jednozna�né, klikněte na tla�ítko <strong>Zkontrolovat</strong>. Objeví se zpráva, která vám sdělí, zda je již ID �íslo použito nebo ne.
> 		Chcete-li vygenerovat další jednozna�né �íslo, klikněte na <strong>Vygenerovat</strong>. Bude zjištěno nejvyšší �íslo ve vaší databázi a přidána 1.
> 		Chcete-li zajistit, že zobrazení ID �íslo není nárokováno jiným uživatelem, zatímco vy zapisujete data, klikněte na tla�ítko <strong>Zamknout</strong>.</p>
> 
> 		<p><strong>POZN.</strong>: Používáte-li tento program spolu s genealogickým programem pracujícím na platformách PC nebo Mac, který u nových rodin vytváří také ID �ísla,
> 		DŮRAZNĚ DOPORUČUJEME všechna tato �ísla vždy mezi těmito programy synchronizovat. Výsledkem zanedbání této �innosti mohou být kolize a nepouľitelnost
> 		odkazů na vaše média. Pokud váš primární program vytváří ID �ísla, která neodpovídají tradi�ním standardům (např. 
> 		<strong>F</strong> je na konci a ne na za�átku), můžete konvence, které TNG používá, změnit v Základním nastavení.</p>
82c84
< 		vytvořte nové osoby. Pokud jste zvolili Vytvořit, budete moci vloľit údaje o nových osobách bez toho, abyste museli opustit aktuální stránku.
---
> 		vytvořte nové osoby. Pokud jste zvolili Vytvořit, budete moci vložit údaje o nových osobách bez toho, abyste museli opustit aktuální stránku.
87,89c89,91
< 		<span class="optionhead">®ijící</span>
< 		<p>Pokud jeden z partnerů ľije nebo si přejete omezit přístup k údajům této rodiny pouze na uľivatele, kteří jsou přihláąeni a mají práva zobrazovat data ľijících osob,
< 		zaąkrtněte toto polí�ko.</p>
---
> 		<span class="optionhead">Žijící</span>
> 		<p>Pokud jeden z partnerů žije nebo si přejete omezit přístup k údajům této rodiny pouze na uživatele, kteří jsou přihlášeni a mají práva zobrazovat data žijících osob,
> 		zaškrtněte toto polí�ko.</p>
92,93c94,95
< 		<p>Bez ohledu na to, zda je tato rodina ozna�ena jako ®ijící, můľete přístupová práva k údajům této osoby omezit zaąkrtnutím této volby.
< 		Informace spojené s "neveřejnou" rodinou budou moci vidět pouze uľivatelé s právy zobrazovat neveřejná data.</p>
---
> 		<p>Bez ohledu na to, zda je tato rodina ozna�ena jako žijící, můľete přístupová práva k údajům této osoby omezit zaąkrtnutím této volby.
> 		Informace spojené s "neveřejnou" rodinou budou moci vidět pouze uživatelé s právy zobrazovat neveřejná data.</p>
96,99c98,101
< 		<p>Zapiąte data a místa k zobrazeným standardním událostem (pokud je znáte). Daląí události lze přidat po uloľení a zamknutí záznamu. Data vľdy zapisujte
< 		ve standardním genealogickém formátu DD MMM RRRR (např. <em>18 Úno 2008</em>). Informaci o místě řa�te za sebou od místního po obecnou a oddělujte kaľdý údaj �árkou
< 		(např. <em>Bludov, ©umperk, Olomoucký kraj, Česká republika</em>), nebo kliknutím na ikonu "Najít" vyberte existující místo (lupa).
< 		Chcete-li omezit po�et nalezených výsledků, před kliknutím na ikonu Najít zapiąte �ást místa. Vąechny výsledky budou obsahovat to, co jste zapsali jako název místa.</p>
---
> 		<p>Zapište data a místa k zobrazeným standardním událostem (pokud je znáte). Další události lze přidat po uloľení a zamknutí záznamu. Data vždy zapisujte
> 		ve standardním genealogickém formátu DD MMM RRRR (např. <em>18 Úno 2008</em>). Informaci o místě řa�te za sebou od místního po obecnou a oddělujte každý údaj �árkou
> 		(např. <em>Bludov, Šumperk, Olomoucký kraj, Česká republika</em>), nebo kliknutím na ikonu "Najít" vyberte existující místo (lupa).
> 		Chcete-li omezit po�et nalezených výsledků, před kliknutím na ikonu Najít zapište �ást místa. Všechny výsledky budou obsahovat to, co jste zapsali jako název místa.</p>
102,103c104,105
< 		Tato událost jsou spojena s obřadem prováděným Církví Jeľíąe Krista Svatých posledních dní (mormonská církev, která vytvořila standard GEDCOM).
< 		<strong>Pozn.:</strong> Nechcete-li vidět pole spojené s CJKSpd, jděte na Nastavení/Základní nastavení a zde tuto moľnost vypněte (je třeba se pak odhlásit a znovu přihlásit).</p>
---
> 		Tato událost je spojena s obřadem prováděným Církví Ježíse Krista Svatých posledních dní (mormonská církev, která vytvořila standard GEDCOM).
> 		<strong>Pozn.:</strong> Nechcete-li vidět pole spojené s CJKSpd, jděte na Nastavení/Základní nastavení a zde tuto možnost vypněte (je třeba se pak odhlásit a znovu přihlásit).</p>
114c116
<     <p>Chcete-li upravit existující rodinu, pouľijte záloľku <a href="#search">Hledat</a> pro nalezení rodiny, a poté klikněte na ikonu Upravit vedle této osoby.</p>
---
>     <p>Chcete-li upravit existující rodinu, použijte záloľku <a href="#search">Hledat</a> pro nalezení rodiny, a poté klikněte na ikonu Upravit vedle této osoby.</p>
118,119c120,121
< 		nebo vedle kaľdé události. Ke kaľdé události můľete také přidat "více" informací kliknutím na ikonu "Plus". Pokud v nějaké této kategorii existují údaje,
< 		na odpovídající ikoně bude v horním pravém rohu zelená te�ka. Chcete-li znát více informací o kaľdé kategorii, jděte na odkazy nápovědy,
---
> 		nebo vedle každé události. Ke každé události můžete také přidat "více" informací kliknutím na ikonu "Plus". Pokud v nějaké této kategorii existují údaje,
> 		na odpovídající ikoně bude v horním pravém rohu zelená te�ka. Chcete-li znát více informací o každé kategorii, jděte na odkazy nápovědy,
123c125
< 		<p>Chcete-li přidat daląí události, klikněte na tla�ítko "Přidat nové" vedle <strong>Jiné události</strong>. Viz odkaz <a href="events_help.php">Nápověda</a> pro více
---
> 		<p>Chcete-li přidat další události, klikněte na tla�ítko "Přidat nové" vedle <strong>Jiné události</strong>. Viz odkaz <a href="events_help.php">Nápověda</a> pro více
125c127
< 		pro kaľdou událost vám umoľní událost upravit nebo odstranit, nebo přidat poznámky nebo citace. Pořadí, ve kterém se události zobrazí, závisí na datu (je-li zapsáno)
---
> 		pro každou událost vám umožní událost upravit nebo odstranit, nebo přidat poznámky nebo citace. Pořadí, ve kterém se události zobrazí, závisí na datu (je-li zapsáno)
129c131
< 		standardní události) se uloľí kliknutím na tla�ítko Uloľit na konci stránky nebo kliknutím na ikonu Uloľit na stránce nahoře. Strom a
---
> 		standardní události) se uloží kliknutím na tla�ítko Uložit na konci stránky nebo kliknutím na ikonu Uložit na stránce nahoře. Strom a
134c136
< 		vytvořte nové dítě. Pokud jste zvolili Vytvořit, budete moci vloľit údaje o nové osobě bez toho, abyste museli opustit aktuální stránku.
---
> 		vytvořte nové dítě. Pokud jste zvolili Vytvořit, budete moci vložit údaje o nové osobě bez toho, abyste museli opustit aktuální stránku.
136,137c138,139
< 		upravovat přímo, ale pro odstranění dítěte ze seznamu můľete pouľít odkaz "Odstranit" (viditelný, kdyľ přesunete kurzor myąi nad kaľdé dítě). Pouľít
< 		můľete také odkaz "Vymazat" pro úplné vymazání dítěte z databáze. Můľete pouľít tla�ítko "Vymazat" pro vymazání dítěte z databáze
---
> 		upravovat přímo, ale pro odstranění dítěte ze seznamu můžete použít odkaz "Odstranit" (viditelný, když přesunete kurzor myši nad každé dítě). Použít
> 		můžete také odkaz "Vymazat" pro úplné vymazání dítěte z databáze. Můžete použít tla�ítko "Vymazat" pro vymazání dítěte z databáze
142,143c144,145
< 		můľete jejich pořadí změnit "přetaľením" bloků nahoru nebo dolů. Chcete-li blok přetáhnout, klikněte myąí na tla�ítko "Táhnout", toto tla�ítko podrľte, a vaąi myą přesuňte na stránce nahoru
< 		nebo dolů. Po přesunu bloku do poľadované pozice tla�ítko pus»te. Změny pořadí budou automaticky uloľeny.</p>
---
> 		můžete jejich pořadí změnit "přetažením" bloků nahoru nebo dolů. Chcete-li blok přetáhnout, klikněte myší na tla�ítko "Táhnout", toto tla�ítko podržte, a vaši myš přesuňte na stránce nahoru
> 		nebo dolů. Po přesunu bloku do požadované pozice tla�ítko pusťte. Změny pořadí budou automaticky uloženy.</p>
153,154c155,156
<     <p>Chcete-li odstranit rodinu, pouľijte záloľku <a href="#search">Hledat</a> pro nalezení rodiny, a poté klikněte na ikonu Odstranit vedle této rodiny. Tento řádek změní
< 		barvu a poté po odstranění rodiny zmizí (partneři a děti nebudou odstraněni, ale vztah bude rozpojen). Chcete-li najednou odstranit více rodin, zaąkrtněte polí�ko ve sloupci Vybrat vedle kaľdé rodiny, kterou
---
>     <p>Chcete-li odstranit rodinu, použijte záložku <a href="#search">Hledat</a> pro nalezení rodiny, a poté klikněte na ikonu Odstranit vedle této rodiny. Tento řádek změní
> 		barvu a poté po odstranění rodiny zmizí (partneři a děti nebudou odstraněni, ale vztah bude rozpojen). Chcete-li najednou odstranit více rodin, zaškrtněte polí�ko ve sloupci Vybrat vedle každé rodiny, kterou
164,165c166,167
<     Chcete-li si předběľně prohlédnout změny provedené ostatními uľivateli, klikněte na záloľku "Přezkoumat". Můľete se pak rozhodnout, zda tyto navrhované změny uloľíte nebo odstraníte.
<     Změny můľete prohlédnout podle stromu nebo podle uľivatele nebo podle obojího. Po uloľení navrhovaných změn není zaslán ľádný mail, ale pokud nové změny existují, na záloľce Přezkoumat se objeví hvězdi�ka (*).</p>
---
>     Chcete-li si předběžně prohlédnout změny provedené ostatními uživateli, klikněte na záložku "Přezkoumat". Můžete se pak rozhodnout, zda tyto navrhované změny uložíte nebo odstraníte.
>     Změny můžete prohlédnout podle stromu nebo podle uživatele nebo podle obojího. Po uložení navrhovaných změn není zaslán žádný mail, ale pokud nové změny existují, na záložce Přezkoumat se objeví hvězdi�ka (*).</p>
168,169c170,171
< 		<p>V tabulce, která popisuje události, které si přejete přezkoumat nebo odstranit, vyberte řádek. Seznam výsledků můľete zúľit výběrem uľivatele (osoba
< 		odpovědná za navrhované změny) a/nebo strom. Po zobrazení výsledků klikněte na jednu z moľných akcí nalevo od tohoto řádku. Chcete-li změny přezkoumat a
---
> 		<p>V tabulce, která popisuje události, které si přejete přezkoumat nebo odstranit, vyberte řádek. Seznam výsledků můžete zúžit výběrem uživatele (osoba
> 		odpovědná za navrhované změny) a/nebo strom. Po zobrazení výsledků klikněte na jednu z možných akcí nalevo od tohoto řádku. Chcete-li změny přezkoumat a
173,175c175,177
< 		<p>Na obrazovce Přezkoumat můľete provést daląí potřebné změny, v�etně poznámek a pramenů, a poté klikněte na "Uloľit a vymazat" pro
< 		uloľení do databáze a odstranění do�asného záznamu. Kliknutím na "Odmítnout a vymazat" můľete rovněľ odstranit do�asný záznam, aniľ byste jej uloľili,
< 		nebo můľete své rozhodnutí odloľit na pozdějąí dobu kliknutím na "Odloľit".</p>
---
> 		<p>Na obrazovce Přezkoumat můžete provést další potřebné změny, v�etně poznámek a pramenů, a poté klikněte na "Uložit a vymazat" pro
> 		uložení do databáze a odstranění do�asného záznamu. Kliknutím na "Odmítnout a vymazat" můžete rovněľ odstranit do�asný záznam, aniž byste jej uložili,
> 		nebo můžete své rozhodnutí odložit na pozdější dobu kliknutím na "Odložit".</p>
diff -r TNG/languages/Czech-UTF8/importconfig_help.php TNG1403/languages/Czech-UTF8/importconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
25a22,27
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>   
28,33c30,31
< 
< 		<span class="optionhead">Uložit stav importu</span>
< 		<p>Pokud import nebo export z nějakého důvodu selže a nebude dokon�en, vyberte tuto možnost a spusťte import/export znovu. Pokud proces 
<     opět nedoběhne do konce, klikněte na odkaz pokra�ovat a import/export bude pokra�ovat z místa, kde byl přerušen.
<     V případě importu pracuje tato volba pouze, je-li váš soubor GEDCOM ve vaší složce GEDCOM (nepracuje se soubory, které jsou nahrávány a importovány
<     přímo z obrazovky Import dat).</p>
---
>     
> 		<p>Pozn.: Pro větší zabezpe�ení vašich souborů GEDCOM zaškrtněte polí�ko ozna�ené "Uložit v konfigura�ní cestě", aby TNG ponechalo soubory GEDCOM v tomto umístění. Složku GEDCOM musíte přesunout na toto místo sami před uložením této hodnoty nebo bezprostředně poté.</p>    
68a67,70
> 		<span class="optionhead">Rodina je žijící, pokud je pár sezdán méně než tento po�et let</span>
> 		<p>TNG nastaví u rodiny během importu ozna�ení Žijící, pokud ke sňatku došlo před méně než tolika lety. 
>     Toto pole nechte prázdné nebo jej nastavte na hodnotu 0, nechcete-li ozna�ení Žijící nastavovat tímto způsobem.</p>
>     
119a122,125
> 		<span class="optionhead">Změnit příchozí předpony tak, aby odpovídaly nastavení TNG</span>
> 		<p>Pokud obdržíte soubor GEDCOM z jiného zdroje, je možné, že soubor může obsahovat ID s různými předponami nebo příponami ID. 
>     Chcete-li, aby TNG standardizovala příchozí ID tak, aby předpony odpovídaly vašemu nastavení, zapněte tuto možnost.</p>
> 
diff -r TNG/languages/Czech-UTF8/index_help.php TNG1403/languages/Czech-UTF8/index_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
30a27,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>   
41c43
< 				<li><p><strong>Podívejte se na následné procesy</strong> (po Importu/Exportu) a prove�te ty, o kterých si myslíte, že jsou nutné (více informací
---
> 				<li><p><strong>Podívejte se na Nástroje po importu</strong> (pod Import/Export) a prove�te ty, o kterých si myslíte, že jsou nutné (více informací
86,88c88,90
< 			<li><p>Odkazy PHP: <a href="http://www.php.net" target="_blank">http://www.php.net</a>.</p></li>
< 			<li><p>Odkazy MySQL: <a href="http://www.mysql.com" target="_blank">http://www.mysql.com</a>.</p></li>
< 			<li><p>Odkazy HTML: <a href="http://www.htmlhelp.com" target="_blank">http://www.htmlhelp.com</a>.</p></li>
---
> 			<li><p>Odkazy PHP: <a href="https://php.net" target="_blank">https://php.net</a>.</p></li>
> 			<li><p>Odkazy MySQL: <a href="https://mysql.com" target="_blank">https://mysql.com</a>.</p></li>
> 			<li><p>Odkazy HTML: <a href="https://htmlhelp.com" target="_blank">https://htmlhelp.com</a>.</p></li>
diff -r TNG/languages/Czech-UTF8/languages_help.php TNG1403/languages/Czech-UTF8/languages_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/logconfig_help.php TNG1403/languages/Czech-UTF8/logconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
26,31c22,42
< 		<span class="optionhead">Název souboru protokolu</span>
< 		<p>Název souboru protokolu je soubor, kam jsou zaznamenávány akce návštěvníků. Původní název "genlog.txt" byste neměli měnit.</p>
< 
< 		<span class="optionhead">Maximální po�et řádků v protokolu</span>
< 		<p>Maximální po�et řádků v protokolu ur�uje, kolik akcí by měl protokol aktuálně uchovávat.
< 		Je-li toto �íslo příliš velké, může se objevit ke snížení výkonu.</p>
---
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>     
> 		<span class="optionhead">Název souboru protokolu (Veřejná oblast)</span>
> 		<p>Soubor protokolu je soubor, kam jsou zaznamenávány akce návštěvníků. Původní název "genlog.txt" byste neměli měnit.</p>
> 
> 		<span class="optionhead">Název souboru protokolu (Administrace)</span>
> 		<p>Soubor protokolu je soubor, kam jsou zaznamenávány akce v administrativní oblasti. Původní název "adminlog.txt" byste neměli měnit.</p>
> 
> 		<p>Pozn.: Pro větší zabezpe�ení vašich souborů protokolu zaškrtněte polí�ko ozna�ené „Uložit v konfigura�ní cestě“, aby TNG uložil soubory protokolu v tomto umístění. Soubory protokolu musíte do tohoto umístění přesunout sami před uložením této hodnoty nebo bezprostředně poté.</p>
> 
> 		<span class="optionhead">Maximální po�et řádků v protokolu (Veřejná oblast)</span>
> 		<p>Maximální po�et řádků v protokolu udává, kolik akcí týkajících se veřejné oblasti by měl protokol aktuálně uchovávat.
> 		Pokud je toto �íslo příliš vysoké, může dojít ke snížení výkonu.</p>
>     
>     <span class="optionhead">Maximální po�et řádků v protokolu (Administrace)</span>
> 		<p>Maximální po�et řádků v protokolu udává, kolik akcí týkajících administrace by měl protokol aktuálně uchovávat.
> 		Pokud je toto �íslo příliš vysoké, může dojít ke snížení výkonu.</p>
42,47d52
< 		<span class="optionhead">Název souboru protokolu (Admin)</span>
< 		<p>Název souboru protokolu, kam jsou zaznamenávány akce z administrátorské oblasti. Původní název "adminlog.txt" byste neměli měnit.</p>
< 
< 		<span class="optionhead">Maximální po�et řádků v protokolu (Admin)</span>
< 		<p>Maximální po�et řádků v protokolu ur�uje, kolik akcí by měl protokol administrátora aktuálně uchovávat. Je-li toto �íslo příliš velké, může se objevit ke snížení výkonu.</p>
< 
diff -r TNG/languages/Czech-UTF8/mapconfig_help.php TNG1403/languages/Czech-UTF8/mapconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
25c21,26
< 	<td class="tngshadow"><span class="normal">
---
> 	<td class="tngshadow">
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
28,30c29,45
< 		<p>Pro použití map z Google Maps na vašich internetových stránkách musíte od �ervna 2016 získat od Google tzv. <strong>klí�</strong> k mapě. Tento klí� můžete obdržet zde:<br>
< 		<a href="https://developers.google.com/maps/documentation/javascript/get-api-key#key" target="_blank">https://developers.google.com/maps/documentation/javascript/get-api-key#key</a>.<br>
< 		Po získání vašeho klí�e jej nakopírujte do pole <strong>Klí� k mapě</strong> na stránce Administrace > Nastavení > Nastavení map. Pokud se později rozhodnete, že mapy z Google Maps již používat nechcete,
---
> 		<p>Chcete-li na svém webu používat Mapy Google, musíte od spole�nosti Google získat <strong>klí�</strong>. Chcete-li získat klí� k mapě, musíte také
>       mít uživatelské ID Google. Pokud jste již zaregistrováni do služby Google Mail, můžete použít toto uživatelské ID, jinak si budete muset vytvořit nový
>       ú�et Google. Na svém ú�tu Google musíte také povolit fakturaci. Jakmile budete mít ú�et s povolenou fakturací, můžete získat klí� zde:
> 			<a href="https://console.cloud.google.com/" target="_blank">https://console.cloud.google.com/</a>.</p>
> 		<p>Jakmile tam budete, nejprve vyberte svůj projekt. Z knihovny API (�ást Mapy) vyberte a povolte následující tři klí�e:
>       Maps JavaScript API, Geocoding API a Places API. Maps JavaScript API je potřeba k zobrazení mapy Google návštěvníkům vašeho webu,
>       se zna�kou na různých místech (místo narození, úmrtí, svatby atd.). Geocoding API se používá v administrátorské sekci vašeho
>       webové stránky pro přiřazení míst k souřadnicím.
> 		</p>
> 		<p>Více informací získáte na <a href="https://tng.lythgoes.net/wiki/index.php/Google_Maps_-_Getting_Started">https://tng.lythgoes.net/wiki/index.php/Google_Maps_-_Getting_Started</a>.
> 
> 		<ul>
> 		<li>Vytvořte API klí� pod položkou "APIs &amp; Services (Credentials)" a přidejte adresu svého webu jako "HTTP referrer".</li>
> 		<li>V nabídce "Mapy Google" povolte "Maps Javascript API".</li>
> 		</ul>    
>     
> 		<p>Po získání vašeho klí�e jej nakopírujte do pole <strong>Klí� k mapě</strong> na stránce Administrace > Nastavení > Nastavení map. Pokud se později rozhodnete, že mapy z Google Maps již používat nechcete,
86d100
< 		</span>
diff -r TNG/languages/Czech-UTF8/media_help.php TNG1403/languages/Czech-UTF8/media_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
37a34,38
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
81c82
< 		<p>Chcete-li přidat nové médium, klikněte na záložku <strong>Přidat nové</strong> a poté vyplňte formulář. Další informace jako obrázek mapy, informace o místě a 
---
> 		<p>Chcete-li přidat nové médium, klikněte na záložku <strong>Přidat nové</strong> a poté vyplňte formulář. Další informace jako obrázek mapy, informace o místě a
89c90
< 		úplnou webovou adresu (např. <em>http://www.tentoweb.com/image.jpg</em>), a
---
> 		úplnou webovou adresu (např. <em>https://www.tentoweb.com/image.jpg</em>), a
127c128
< 		původní obrázek jako náhled. Pokud náhled již nemáte, TNG jej pro vás může vytvořit, ale pouze, pokud je vaše mediální položka ve formátu JPG, GIF nebo PNG (v některém případě i PDF). 
---
> 		původní obrázek jako náhled. Pokud náhled již nemáte, TNG jej pro vás může vytvořit, ale pouze, pokud je vaše mediální položka ve formátu JPG, GIF nebo PNG (v některém případě i PDF).
138,139c139,140
< 		(tip: náhledy můžete uložit v podsložce, pokud chcete, aby byly uchovávány odděleně, nebo mají stejné názvy jako větší obrázky). Pokud neznáte přesný název souboru, 
<     můžete kliknout na tla�ítko "Vybrat" a vyhledejte soubor. Pokud nahráváte váš soubor náhledu nyní pomocí předchozího pole, použijte toto pole pro zápis umístění a 
---
> 		(tip: náhledy můžete uložit v podsložce, pokud chcete, aby byly uchovávány odděleně, nebo mají stejné názvy jako větší obrázky). Pokud neznáte přesný název souboru,
>     můžete kliknout na tla�ítko "Vybrat" a vyhledejte soubor. Pokud nahráváte váš soubor náhledu nyní pomocí předchozího pole, použijte toto pole pro zápis umístění a
169,170c170,171
< 		<p><strong>(pouze Náhrobky)</strong> Hřbitov, na kterém se náhrobek nachází. Nejprve musíte hřbitov přidat do tabulky hřbitovů
< 		(Admin/Hřbitovy), pak bude vidět v tomto poli.</p>
---
> 		<p>Chcete-li tuto mediální položku přidružit ke hřbitovu, vyberte hřbitov z rozbalovacího seznamu. Obvykle se to používá u náhrobků k ozna�ení, kde se náhrobek nachází. Nejprve musíte přidat hřbitov
>     (v �ásti Administrace/Hřbitovy), pak bude viditelný v tomto poli.</p>
183a185,187
> 		<span class="optionhead">Neveřejné</span>
> 		<p>Zaškrtnutím bude tato položka skryta, pokud uživatel nemá přístup k neveřejným údajům.</p>
> 
243,245c247,249
< 		<span class="optionhead">Mapa obrázku</span>
< 		<p>Tato sekce je ve výchozím stavu sbalena. Pro její rozbalení kliněte na výraz "Mapa obrázku" nebo na šipku vedle něj. V této sekci můžete spojit
< 		různé �ásti obrázku s osobami ve vaší databázi, nebo zobrazit krátké zprávy při přemístění kursoru myší nad tyto �ásti.</p>
---
> 		<span class="optionhead">Klikací mapa</span>
> 		<p>Tato sekce je ve výchozím stavu sbalena. Pro její rozbalení kliněte na výraz "Klikací mapa" nebo na šipku vedle něj. V této sekci můžete spojit
> 		různé �ásti obrázku s osobami, rodinami, prameny, úložišti nebo místy ve vaší databázi nebo s externími adresami URL.</p>
249,254c253,260
< 		<p>U každé oblasti, kterou chcete spojit s osobou, nejdříve zvolte strom dané osoby, poté ur�ete na obrázku oblast nakreslením obdélníku ukazatelem vaší myší.
< 		Nejprve klikněte do levého horního rohu obdélníku, poté myš podržte a přesunutím dolů do prava nakreslete obdélník. Dostanete-li se do pravého dolního roku obdélníku, uvolněte myš. 
< 		Takto vyberete souřadnice vašeho obrázku. Po výběru souřadnic se objeví okno, ve kterém můžete najít nebo zapsat ID �íslo osoby. Pro nalezení záznamu zapište
< 		celé jméno osoby nebo jen jeho �ást anebo ID �íslo, a poté ze zobrazených kandidátů vyberte správnou osobu. Okno
< 		se zavře a do pole Mapa obrázku pod obrázkem bude vložen kód této oblasti. V případě potřeby můžete kód upravit nebo
< 		jej zapsat přímo.</p>
---
> 		<p>U každé oblasti, kterou chcete propojit, nejprve vyberte strom a typ entity (osoba, rodina, atd.), NEBO zadejte název a externí adresu URL jiné webové stránky.
>     Poté definujte oblast nakreslením obdélníku na obrázek pomocí
>     ukazatele myši. Za�něte kliknutím na levý horní roh obdélníku, poté podržte myš a pohybujte ji dolů a doprava, abyste obdélník nakreslili. Když
>     se dostanete do pravého dolního rohu obdélníku, uvolněte myš. Tím
>     vyberete souřadnice obrázku. Po výběru souřadnic se zobrazí vyskakovací okno, které vám umožní najít nebo zadat ID entity. Zadejte
>     celé jméno nebo �ást jména nebo ID pro nalezení možných shod a poté vyberte správnou položku ze zobrazených kandidátů.
>     Pole se zavře a nad obrázek bude přidáno pole pro tuto oblast. Chcete-li vybrat existující region, klikněte na polí�ko. Poté můžete pole přesunout přetažením, nebo kliknutím na „X“
>     v pravém horním rohu jej odstranit.</p>
256c262
< 		<p>Tento postup můžete opakovat pro další oblasti. Každý nový kód bude vložen na konec obsahu pole Mapa obrázku.</p>
---
> 		<p>Tento postup můžete opakovat pro další oblasti. Každý nový kód bude vložen na konec obsahu pole Klikací mapa.</p>
268c274
< 		
---
> 
321c327
< 		
---
> 
373c379
<     
---
> 
389c395
< 			"Vybrat" pro výběr podsložky, která již existuje. Nechcete-li soubory uložit do podsložky, nechte pole Složka prázdné.  
---
> 			"Vybrat" pro výběr podsložky, která již existuje. Nechcete-li soubory uložit do podsložky, nechte pole Složka prázdné.
diff -r TNG/languages/Czech-UTF8/misc_help.php TNG1403/languages/Czech-UTF8/misc_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31a28,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/modhandler_help.php TNG1403/languages/Czech-UTF8/modhandler_help.php
3c3
< echo help_header("Nápověda: Manažer módů");
---
> echo help_header("Help: Nápověda módů");
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
11,200c7,46
<   <a name="top"></a>
<   <table width="100%" border="0" cellpadding="10" cellspacing="2" class="tblback normal">
<     <tr class="fieldnameback">	
<       <td class="tngshadow">		
<         <p style="float:right; text-align:right" class="smaller menu">			
<           <a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp; 			
<           <a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />			
<           <a href="backuprestore_help.php" class="lightlink">&laquo; Nápověda: Obslužné programy</a> &nbsp; | &nbsp; 			
<           <a href="index_help.php" class="lightlink">Nápověda: Za�ínáme &raquo;</a>		
<         </p>		
<         <span class="largeheader">Nápověda: Manažer módů
<         </span>		
<         <p class="smaller menu">			
<           <a href="#overview" class="lightlink">Přehled</a> &nbsp; | &nbsp; 			
<           <a href="#operation" class="lightlink">Operace</a> &nbsp; | &nbsp; 			
<           <a href="#status" class="lightlink">Stav</a> &nbsp; | &nbsp;
<           <a href="#syntax" class="lightlink">Syntaxe módů</a> &nbsp; | &nbsp;           			
<           <a href="#files" class="lightlink">Konfigura�ní soubory</a> &nbsp; | &nbsp;
<           <a href="#batch" class="lightlink">Dávkové operace</a> &nbsp; | &nbsp;
<           <a href="#options" class="lightlink">Možnosti</a> &nbsp; | &nbsp;
<           <a href="#analyze" class="lightlink">Analýza souborů TNG</a> &nbsp; | &nbsp;
<           <a href="#parser" class="lightlink">Tabulka parseru</a> &nbsp; | &nbsp;
<           <a href="#custtext" class="lightlink">Doporu�ené aktualizace</a>          
<           		
<         </p>	</td>
<     </tr>
<     <tr class="databack">	
<       <td class="tngshadow">		
<         <a name="overview"><p class="subheadbold">Přehled</p></a>		
<         <p>Manažer módů TNG verze 12 je založen na Manažeru módů, který byl původně vyvinut Brianem McFadyenem, následně zaktualizován Seanem Schwoerem pro práci s Joomla TNG Component 
<         a ve verzi 10.0.3 a 10.1 zaktualizován o integrovanější způsob instalace, odstranění a řízení změn softwarového balíku TNG.</p>
<         <p>Nový Manažer módů nabízí jednoduchý řádkový souhrn stavů módů, který může být rozšířen na zobrazení kompletního popisu a chyb.
<         Seznam souborů, které daný mód ovlivňuje, lze zobrazit přejetím kursorem myši nad znaménkem + ve sloupci Soubory.
<         K rozbalení všech záznamů a zobrazení stavu můžete podobně jako ve starém Manažeru módů použít také tla�ítko <strong>Rozbalit vše</strong> v horním menu. 
<         Volba Rozbalit vše je užite�ná při filtrování seznamu na stavy <strong>Částe�ně nainstalováno</strong> nebo <strong>Nelze nainstalovat</strong>, takže můžete vidět chyby, které se 
<         zde objevují.</p> 
<         <p>Manažer módů je pro snazší přístup přidán na stránku Administrace TNG. Manažer módů vytváří v TNG tyto složky:
<           <ul>			
<             <li><strong>mods</strong> obsahuje konfigura�ní soubory módů a přidružené podpůrné soubory módů. Složka mods může být přejmenována. Manažer módů používá pro práci s názvem složky proměnnou $modspath.</li>			
<             <li><strong>extensions</strong> obsahuje některá rozšíření módů, které jsou instalovány jinými konfigura�ními soubory manažeru módů. Složka extensions může být přejmenována. Manažer módů používá pro práci s názvem složky proměnnou $modspath.</li>
<             <li><strong>classes</strong> obsahuje třídy Objektově orientovaného programování (Object Orient Progamming classes), které byly rozděleny a vylepšeny z předchozího souboru managemods.class.php, který vytvořil Sean Schwoere z původní kódu Manažeru módů od Briana McFadyena.</li>		
<           </ul></p>
<      
<         <p>Záložka <strong>Seznam módů</strong> nyní spojuje předchozí Seznam módů a Dávkové instalace, které do TNG 10.0.3 přidal Rick Bisbee, a umožňuje vykonat stejnou akci pro více módů. Popis a rozšířený stav lze zobrazit pomocí kliknutí na šipku vpravo ve sloupci Stav nebo kdekoli na řádku. Přejetím kurzorem myši nad řádkem se zvýrazní řádek a usnadní se tak výběru stavu pro rozšířené zobrazení. Přejetím kurzoru myši přes znaménko + ve sloupci Soubory se zobrazí seznam souborů, které daný mód mění, vytváří nebo kopíruje.</p>
<         <p>Pokud je povolena možnost Zobrazit další nástroje pro vývojáře, TNG v12 přidává následující změny: 
<         <ul><li>kliknutím na název souboru se otevře tabulka parseru pro tento mód</li>
<         <li>kliknutím na název souboru cfg se zobrazí soubor cfg na jiné záložce</li>
<         <li>tla�ítko <strong>Podrobnosti</strong> v buňce Stav funguje jako přepína� pro rozbalení nebo sbalení zobrazení směrnic souboru ve stavu Instalovat nebo Lze instalovat.</li></ul></p>
< 
<         <p>Záložku <strong>Zobrazit protokol</strong> přidal do TNG 10.0.3 Ken Roy a zobrazuje protokol Manažeru módů, který je nyní oddělen od protokolu Administrace. Protokol manažeru módů je přeformátovaný protokol z Manažeru módů vytvořeného Rickem Bisbee a Robinem Richmondem v TNG 10.0.3 a srozumitelnost vykonaných akcí zaznamenaných v protokolu je nyní lepší. Zprávy a hlášení byly zna�ně zjednodušeny.</p>
<         <p>Záložka <strong>Možnosti</strong> je modifikací záložky přidané Kenem Royem do TNG 10.0.3 a umožňuje měnit některé chování manažeru módů.</p>
<         <p>Záložka <strong>Analýza souboru TNG</strong> je volitelná záložka, jejíž zobrazení lze povolit na obrazovce Možnosti, a umožňuje vybrat soubor TNG a zobrazit, které módy jej mění.</p>        
<         <p>Záložka <strong>Tabulka parseru</strong> je volitelná záložka, jejíž zobrazení lze povolit na obrazovce Možnosti povolením <strong>Další nástroje pro vývojáře</strong>, a umožní zobrazit, jak je daný mód analyzován Manažerem módů.</p> 
<         <p>Záložka <strong>Doporu�ené aktualizace</strong> je volitelná záložka, jejíž zobrazení lze povolit na obrazovce Možnosti, která vám umožní aktualizovat soubory cust_text.php, pokud jste tak neu�inili v rámci aktualizace TNG.</p> 
< 
<         <p>Další informace můžete najít v �lánku 
<           <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager" target="_blank">Manažer módů (v angli�tině)</a> a v kategorii      �lánků 
<           <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:TNG_Mod_Manager" target="_blank">TNG Mod Manager (v angli�tině)</a> na TNG Wiki.</p>
<         <p>You can view the <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Enhancements" target="_blank">Mod Manager</a> article in TNG Wiki to see what enhancements were made in TNG v12.</p>
<       
<         </td>
<     </tr>
<     <tr class="databack">	
<       <td class="tngshadow">		
<         <p style="float:right"><a href="#top">Nahoru</a></p>		
<         <a name="operation"><p class="subheadbold">Operace</p></a>		
<         <p>Manažer módů prozkoumá složku módů a pře�te každý soubor <strong>cfg</strong>, který najde. Soubory <strong>cfg</strong> jsou direktivní soubory, které popisují mód, soubory a umístění, které má být modifikováno, a kód, který je při modifikaci použit. 		
<           <p>Manažer módů zkontroluje následující: 			
<             <ul>				
<               <li>zajistí, že je uživatel přihlášen 				
<               <li>prověří umístění a změnu každého kódu 					
<               <ul>						
<                 <li>zajistí, že lze umístění nalézt</li>						
<                 <li>zajistí, že cílové místo je jedine�né</li>						
<                 <li>ur�í, zda cílové umístění již bylo nainstalováno</li>					
<               </ul>
<               <li>vytvoří zadanou složku nebo adresář</li>
<               <li>identifikuje nové soubory, které mají být vytvořeny. Pokud je soubor ozna�en jako chráněný, nebude odstraněn Odinstalací ani Vy�ištěním.</li>
<               <li>identifikuje soubory, které mají být zkopírovány do kořenové složky TNG nebo do ur�ené složky. Pokud je soubor ozna�en jako chráněný, nebude odstraněn Odinstalací ani Vy�ištěním.</li>
<             </ul></p>
<               	
<           </td>
<     </tr>
<     
<     <tr class="databack">	
<       <td class="tngshadow">		
<         <p style="float:right"><a href="#top">Nahoru</a></p>		
<         <a name="status"><p class="subheadbold">Stav</p></a>			
<         <p>Manažer módů vrací následující stavy: 			
<           <ul>			
<             <li><strong>Lze instalovat</strong>, pokud mód ještě nebyl nainstalován a cílové umístění je identifikováno, pak je uvedena možnost <strong>Instalovat</strong>
<             </li>			
<             <li><strong>Instalováno</strong>, pokud již mód byl nainstalován, je uvedena možnost <strong>Odinstalovat</strong> mód a možnost <strong>Upravit</strong> parametry, pokud nějaké existují. Módy s edita�ními parametry jsou identifikovány podle [Možnosti] za stavem Instalováno.
<             </li>			
<             <li><strong>Částe�ně instalováno</strong>, pokud mód byl �áste�ně nainstalován, je k dispozici tla�ítko <strong>Vy�istit</strong>. Operace Vy�ištění se pokusí odstranit vložený kód, obnovit a nahradit kód, a odstranit jakékoli vytvořené nebo zkopírované soubory.
<             </li>			
<             <li><strong>Nelze nainstalovat</strong>, pokud mód <strong>nelze</strong> instalovat. Rozšíření (zobrazení kompletní informace) stavu poskytne více informací o tom, pro� mód nelze nainstalovat.
<             </li>			
<           </ul>		
<           <p>Příklady obrazovek stavu manažeru módů a jak interpretovat různé stavy najdete na 
<             <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Interpreting_Status" target="_blank">Manažer módů - interpretace stavů (v angli�tině)</a>
<           </p>	</td>
<     </tr>
<     
<     <tr class="databack">
<       <td class="tngshadow">
<         <p style="float:right"><a href="#top">Nahoru</a></p>
<         <a name="syntax"><p class="subheadbold">Syntaxe módů</p></a>
<         <p>Syntaxe manažera módů v zásadě zahrnuje:
<         <p><strong>Sekci záhlaví</strong>, která obsahuje</p>
<           <ul><li>Název (name) - název módu, �lánek na TNG Wiki a název souboru</li>
<           <li>Verze (version) - verze módu, kde první 3 �íslice představují nejnižší verzi TNG, ve které mód funguje</li>
<           <li>Popis (description) - obsahuje stru�ný popis módu, jméno vývojáře a URL �lánku o daném módu na TNG Wiki.</li>
<           </ul>
< 				</p>
<         <p><strong>Cílovou sekci (target)</strong>, kde je specifikován soubor, který je opravným módem změněn, a následně obsahuje příkazy. K cílové sekce lze přidat poznámku.</p>
<           <ul><li>Umístění (location) - ur�uje umístění kódu, který je v souboru měněn. K umístění lze přidat poznámku.</li>
<           <li>Klí�ové slovo akce - ur�uje, zda přepsat (Replace) nebo vložit (Insert) kód před (Before) nebo za (After) toto umístění</li>
<           </ul>
<         </p>
<         <p><strong>Příkaz Nový soubor (New File)</strong>, který po instalaci módu vytvoří nový soubor</p>
<         <p><strong>Příkaz Kopírovat soubor (Copy File)</strong>, který nakopíruje ur�itý soubor do řídící složky TNG (%copyfile) nebo do podsložky (%copyfile2)</p>
<         <p>Detailní informace týkající se syntaxe módů najdete v �lánku <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax" target="_blank">Mod Manager Syntax (v angli�tině)</a></p>
<       </td>
<     </tr>
<     
<     <tr class="databack">	
<       <td class="tngshadow">
<         <p style="float:right"><a href="#top">Nahoru</a></p>		
<         <a name="files"><p class="subheadbold">Konfigura�ní soubory</p></a>
<         		
<         <span class="optionhead">Instalování módů</span>		
<         <p>Informace o <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Installing_Config_Files" target="_blank">instalaci konfigura�ních souborů (v angli�tině)</a> k instalaci módů najdete na TNG Wiki.</p>		 		
<         
<         <span class="optionhead">Interpretace stavu</span>		
<         <p>Informace o <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Interpreting_Status" target="_blank">interpretaci stavu (v angli�tině)</a> najdete na TNG Wiki.</p>
<         		 		
<         <span class="optionhead">Syntaxe konfigura�ních souborů</span>		
<         <p>Informace o <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax" target="_blank">syntaxi manažeru módů (v angli�tině)</a> najdete na TNG Wiki.</p>		 		
<         
<         <span class="optionhead">Vytvoření konfigura�ního souboru</span>		
<         <p>Informace pro vývojáře o <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Creating_Config_Files" target="_blank">vytvoření konfigura�ních souborů (v angli�tině)</a> najdete na TNG Wiki.</p>
<       </td>
<     </tr>
<     
<     <tr class="databack">
<       <td class="tngshadow">
<         <p style="float:right"><a href="#top">Nahoru</a></p>
<         <a name="batch"><p class="subheadbold">Dávkové operace</p></a>
< 
<         <p>Funkce Dávkové operace, v TNG 10.0.3 představená jako Dávkové instalace, je nyní sou�ástí Seznamu módů a umožní provést specifické akce týkající se více módů pomocí výběru filtru. 
<         Z filtru seznamu stavů musíte vybrat požadovaný stav a kliknutím na <strong>Provést</strong> zobrazíte dostupná ovládací tla�ítka pro vybraný stav.  
<         
<         Akce <strong>Vymazat</strong> je k dispozici pouze pro stav Částe�ně nainstalováno, pokud povolíte příslušnou předvolbu. Doporu�ujeme ji nastavit na Ne, kromě případů, kdy je potřeba vymazat více módů ve stavu 
<         Částe�ně nainstalováno, jako např. předchozí verze téhož módu. Stejně tak je zde možnost Vymazat instalované módy, která umožní vymazání nainstalovaných módů, aniž byste je nejprve odinstalovali. Tato možnost byla přidána, 
<         aby bylo možné vymazat předchozí verze téhož módu, pokud jste je zapomněli vymazat před instalací nové verze. Zde opět doporu�ujeme ponechat možnost jako Ne a povolit ji jen v případě potřeby.
<         Tla�ítko <strong>Vymazat</strong> se zobrazí pouze v seznamu Vybrat, pokud jsou povoleny oba možnosti vymazání.
<         </p>
< 
<         <p><strong><font color="red">Upozornění: Dávkové operace používejte pouze tehdy, pokud máte zálohu vašich webových stránek a můžete je snadno obnovit v případě, že vlivem dávkových operací dojde k poškození vašich stránek, což se může snadno stát, pokud nevymažete předchozí verze módů.</font>
<         Je doporu�eno Před provedením aktualizace TNG doporu�ujeme odinstalovat všechny nainstalované módy a poté vy�istit všechny �áste�ně nainstalované módy.</strong></p>
< 
<         <p>Možnosti výběrového filtru jsou tyto:
<           <ul>
<             <li><strong>Vše</strong> - zobrazí se úplný seznam všech souborů .cfg ze složky mods.  Pokud zvolíte ur�itý stav, objeví se dostupná tla�ítka jednotlivých akcí</li>
<             <li><strong>Lze nainstalovat</strong> - zobrazí se seznam všech módů, které mohou být</li>
<           	  <ul>
<                 <li>Nainstalovány - na základě vašeho výběru a kliknutím na tla�ítko <strong>Instalovat</strong></li>
<                 <li>Vymazány ze složky mods - na základě vašeho výběru a kliknutím na tla�ítko <strong>Vymazat</strong></li>
< 					    </ul>
<                 <li><strong>Instalováno</strong> - zobrazí se seznam všech módů, které jsou aktuálně nainstalovány, a mohou být</li>
< 					    <ul>
<                 <li>Odstraněny - na základě vašeho výběru a kliknutím na tla�ítko <strong>Odstranit</strong></li>
< 					    </ul>
<                 <li><strong>Částe�ně instalováno</strong> - zobrazí se seznam všech módů, které jsou �áste�ně instalovány a musí být</li>
< 					    <ul>
<                 <li>Vy�ištěny - na základě vašeho výběru a kliknutím na tla�ítko <strong>Vy�istit vybrané</strong></li>
< 					    </ul>
<                 <li><strong>Nelze nainstalovat</strong> - zobrazí se seznam všech módů, které nelze nainstalovat z důvodu chybného cílového souboru nebo chybějících souborů, a mohou být</li>
< 					    <ul>
<                 <li>Vymazány ze složky mods - na základě vašeho výběru a kliknutím na tla�ítko <strong>Vymazat vybrané</strong></li>
< 					    </ul>
<                 <li><strong>Vybrat</strong> - přidáno v TNG v12 - zobrazí se seznam všech modů, které mohou být vybrány bez ohledu na stav a poté pouze vrací tyto módy do seznamu</li>
< 					    <ul>
<                 <li>Tla�ítko <strong>Vymazat</strong> bude dostupné pouze na seznamu Vybrat, pokud máte aktivní volbu Povolit Vymazat vybrané u �áste�ně nainstalovaných módů. Tato funkce byla přidána hlavně pro vývojáře módů k vy�ištění jejich testovacích prostředí.</li>
< 					    </ul>
<           </ul>
<         </p>
<       </td>
<     </tr>
---
> <a name="top"></a>
> <table width="100%" border="0" cellpadding="10" cellspacing="2" class="tblback normal">
> <tr class="fieldnameback">
> 	<td class="tngshadow">
> 		<p style="float:right; text-align:right" class="smaller menu">
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
> 			<a href="backuprestore_help.php" class="lightlink">&laquo; Nápověda: Obslužné programy</a> &nbsp; | &nbsp;
> 			<a href="index_help.php" class="lightlink">Nápověda: Za�ínáme &raquo;</a>
> 		</p>
> 		<span class="largeheader">Nápověda: Manažer módů</span>
> 		<p class="smaller menu">
> 			<a href="#overview" class="lightlink">Přehled</a> &nbsp; | &nbsp;
> 			<a href="#modlist" class="lightlink">Seznam módů</a> &nbsp; | &nbsp;
> 			<a href="#editor" class="lightlink">Editor módů</a> &nbsp; | &nbsp;
> 			<a href="#viewlog" class="lightlink">Zobrazit protokol</a> &nbsp; | &nbsp;
> 			<a href="#options" class="lightlink">Možnosti</a> &nbsp; | &nbsp;
> 			<a href="#analyzer" class="lightlink">Analýza souborů TNG</a> &nbsp; | &nbsp;
> 			<a href="#parser" class="lightlink">Tabulka parseru</a> &nbsp; | &nbsp;
>       <a href="#recommended" class="lightlink">Doporu�ené aktualizace</a> &nbsp; | &nbsp;
> 			<a href="#credits" class="lightlink">Poděkování</a>
> 		</p>
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
> 
> 		<a name="overview"><p class="subheadbold">Přehled</p></a>
> 
>     <p>Pokud jste v TNG noví, Manažer módů je nástroj pro administrátory, který jim umožňuje instalovat, spravovat a odstraňovat úpravy softwarového balí�ku TNG, a to bu� stažením a instalací „módů“ vytvořených ostatními z TNGWiki, nebo vytvořením vlastních módů (a možná také jejich sdílením).</p>    
> 
>     <p><b>Mód</b> je textový soubor s příponou .cfg napsaný pomocí editoru kódu. Obsahuje "příkazy", které říkají Manažeru módů (MM), jak jeho instalací upravit kód v cílových souborech. Může také kopírovat soubory z doprovodné podpůrné složky nebo dokonce vytvářet nové soubory. -- podrobnosti najdete na stránce<i><a href="https://tng.lythgoes.net/wiki/index.php/Mod_Manager" target="_blank"> TNGWiki Mod Manager (v angli�tině)</a></i>.</p>
> 
> 	</td>
> </tr>
203a50,51
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="modlist"><p class="subheadbold">Seznam módů</p></a>
205,206c53,125
< 		<p style="float:right"><a href="#top">Nahoru</a></p>
< 		<a name="options"><p class="subheadbold">Možnosti</p></a>
---
>     <p>Na stránce Administrace TNG zobrazí Manažer módů (MM) seznam všech modů ve složce „mods“. Tuto složku můžete přejmenovat v Nastavení >> Základní nastavení >> Umístění a složky.</p>    
> 
>     <p>Pokud jste ještě žádné módy do složky "mods" na vašem webu nena�etli, bude výpis MM prázdný. Ze stránek TNGWiki si můžete stáhnout stovky modů. Přicházejí ve formě souborů zip, které budete muset rozbalit a nahrát do složky „mods“ na vašem webu pomocí programu FTP, jako je FileZilla nebo WinSCP, který můžete získat zdarma z internetu</p>
> 
>     <p>Před zobrazením modů Manažer módů zkontroluje každý z nich, zda je již nainstalován nebo zda jej lze nainstalovat, a hledá chyby, které by bránily jeho <i>instalaci</i> nebo <i>odstranění</i>. Výsledek se zobrazí ve výpisu módu ve sloupci <i>Stav</i>. Podrobnosti zobrazíte kliknutím na ikonu šipky nebo stavový text a poté na tla�ítko <i>Podrobnosti</i>.</p>
> 
>     <p>Všechny uvedené mody mají barevně ozna�ený stav instalace:
>       <ul>
>         <li>
>           <b>Lze instalovat</b> (bílý) -- MM potvrdil, že všechny příkazy v konfigura�ním souboru módu lze nainstalovat bez chyby.
>         </li>
>         <li>
>           <b>Instalováno </b> (zelený) -- všechny komponenty z konfigura�ního souboru módu jsou nainstalovány.
>         </li>
>         <li>
>           <b>Částe�ně instalováno</b> (oranžový) -- některé komponenty módu jsou nainstalovány a některé ne. To se může stát, pokud obnovíte soubor TNG, který byl sou�ástí instalace Modu.
>         </li>
>         <li>
>           <b>Nelze nainstalovat</b> (�ervený) -- některé konfigura�ní soubory módu nelze nainstalovat, například proto, že cílový soubor chybí.
>         </li>
>       </ul>
>     </p>
> 
>     <h3>Panel filtrů</h3>
> 
>     <p>V horní �ásti seznamu modů je panel filtrů, který omezuje zobrazení na módy s vybraným stavem nebo na <b>Všechny</b> módy nebo pouze ty, které <b>Vyberete</b>. Výběr libovolného filtru kromě <b>Všech</b> zobrazí seznam se zaškrtávacím polí�kem pro každý zobrazený mód. Zaškrtnutí jednoho nebo více polí umožňuje další zpracování vybraných módů.</p>
> 
>     <p>Pokud například vyfiltrujete mody, které jsou ve stavu <i>Lze instalovat</i> a poté stisknete <i>Provést</i>, váš seznam bude obsahovat pouze ty módy, které jsou připraveny k instalaci. Pomocí zaškrtávacích polí�ek ve filtrovaném seznamu můžete vybrat jedno, několik nebo všechny z nich, poté stisknout tla�ítko Instalovat a módy se nainstalují hromadně. Všimněte si tla�ítek <i>Vybrat vše</i> a <i>Vy�istit vše</i>, která vám pomohou se zaškrtávacími polí�ky.</p>
> 
> 
> <p><strong><font color="#990000">Upozornění: Dávkové operace byste měli provádět pouze v případě, že máte dobrou zálohu svých webových stránek a můžete ji rychle obnovit, pokud dávkové operace způsobí nefunk�nost vašeho webu. To se může snadno stát, když neodstraníte předchozí verze modů.</font></strong></p>
> 
>   <p><strong>Poznámka: Před upgradem TNG doporu�ujeme dávkově odinstalovat všechny nainstalované módy a poté dávkově vy�istit všechny zbývající �áste�ně nainstalované módy.</strong></p>
> 
>    <p>Filtr <b>Vybrat</b> zobrazí všechny módy a přidá zaškrtávací polí�ka. Vyberte jeden nebo více z nich a stiskněte tla�ítko <i>Vybrat</i>. Manažer módů zobrazí pouze vybrané módy. To může být užite�né pro izolaci a testování jednoho módu bez zobrazení nebo zpracování ostatních.</p>
> 
>   <p>Pokud zaškrtnete polí�ko <b>Zamknout</b> u jakéhokoli filtrovaného záznamu, zůstane filtrovaný i po obnovení stránky. Zápis zůstane uzam�en, dokud jej nezrušíte nebo nepoužijete jiný filtr.</p>
> 
>     <h3>Sloupce seznamu módů</h3>
> 
>     <p>První tři sloupce jsou samozřejmé. V závislosti na nastavení zobrazení Manažera modů na <i>kartě Možnosti</i> můžete kliknout na Název módu a mód se zobrazí v tabulce parseru. Kliknutím na Název konfigura�ního souboru zobrazíte na nové kartě obsah konfigura�ního souboru módu.</p>
> 
>     <p>Pokud sloupec <b>Wiki</b> obsahuje ikonu wiki (W), můžete na ni kliknout a přejít na �lánek TNGWiki, který obsahuje popis a další informace o módu a také odkaz ke stažení módu.</p>
> 
>     <p>Pátý sloupec je sloupec <b>Stav</b>. Zobrazuje barevně odlišený stav instalace módu, jak je vysvětleno výše. Kliknutím na text stavu se otevře panel s popisem a příslušnými ovládacími prvky pro správu módu. Pokud je k dispozici tla�ítko <i>Podrobnosti</i>, můžete vidět podrobný seznam všech akcí, které byly nebo mají být provedeny pro správu módu. Budou zobrazeny všechny chyby.</p>
> 
>     <p>Pro pokro�ilé uživatele jsou chybové zprávy �asto doprovázeny �íslem E. To odkazuje na �íslo řádku v souboru MM, kde došlo k chybě. E-�ísla v seznamu modů jsou všechna generována souborem classes/modlister.class.php. V blízkosti tohoto �ísla řádku se �asto objeví komentář vysvětlující povahu chyby a návrh možných oprav.</p>
> 
>     <p>Pokud se nevyskytnou žádné chyby, jednoduše stiskněte příslušný ovládací prvek pro instalaci nebo odinstalování (odstranění) módu.</p>
>     <p>Některé módy jsou �áste�ně nainstalovány. Když uvidíte tento stav, stiskněte tla�ítko <i>Vy�istit</i> a MM odstraní všechny nainstalované sou�ásti. Obvykle vám zůstane �istý mód, který lze znovu plně nainstalovat.</p>
> 
>   <p>Pokud mód zůstává �áste�ně nainstalován i po několika pokusech o jeho vy�ištění, měli byste upozornit vývojáře módu. Chcete-li upozornit vývojáře, klikněte na ikonu Wiki (W) a přejděte na stránku TNGWiki a poté klikněte na odkaz <i>Mod Support</i>. Pokud neexistuje odkaz na podporu, <a href="#morehelp" >kliknutím sem</a> získáte další pomoc.</p>
> 
> 
>     <p>Poslední sloupec, <i>Soubory</i>, obsahuje ikonu pro další informace. Umístěte na něj kurzor a vyskakovací okno vám sdělí všechny soubory, které jsou nebo budou upraveny tímto modem.</p>
> 
>     <a name="morehelp"><h3>Hledání další pomoci</h3></a>
> 
>     <p>Pokud potřebujete další pomoc, ať už se Manažerem módů, nebo s konkrétním módem, můžete provést jednu z následujících akcí:
>     <ul>
>       <li>Potřebujete-li pomoc s chybami nebo problémy v <b>Manažeru módů</b>
>       <ul>
>         <li>kontaktujte Rick Bisbee <a href="https://bisbeefamily.com/suggest.php?page=Mod Manager Issues" target="_blank">zde</a></li>
>         <li>kontaktujte Ken Roy: <a href="mailto:ken@royandboucher.com?subject=Mod&nbsp;Manager&nbsp;Help">zde</a></li>
>       </ul>
>       <li>Potřebujete-li pomoc s nějakým módem</li>
>         <ul>
>           <li>kontaktujte vývojáře modu ze stránky TNGWiki spojené s modem</li>
>           <li>přejděte na <a href="https://tng.community/index.php?/forums/" target="_blank"> TNG Fórum</a> a vyhledejte název módu. Pokud nenajdete nic užite�ného, můžete si vytvořit ú�et a zanechat žádost o pomoc na ostatní uživatele.</li>
>           <li>použijte <b>Seznam e-mailových diskuzí</b> a položte otázku. <a href="https://tng.lythgoes.net/wiki/index.php/TNG_Discussion_Forums" target="_blank">Za�něte kliknutím sem</a>.</li>
>         </ul>
>     </ul>
>     </p>
208,235d126
< 		<p>Možnosti vám umožní specifikovat chování manažeru módů.
<     
<     <p><strong>Možnosti protokolu Manažeru módů</strong> 
< 			<ul>
< 				<li><strong>Název protokolu</strong> - umožní vám ur�it název souboru, který bude použit pro protokol manažeru módů.  Výchozí volbou je <strong>modmgrlog.txt</strong>.</li>
< 				<li><strong>Maximální po�et transakcí</strong> - umožní vám ur�it, kolik transakcí bude zachováváno v protokolu. Výchozí volbou je <strong>200</strong> transakcí.</li>
< 				<li><strong>Sbalit zobrazení protokolu</strong> - umožní vám ur�it, zda chcete při úvodním zobrazení vidět protokol v zúženém nebo rozšířeném stavu.  Výchozí volbou je <strong>Ano</strong>.</li>
< 				<li><strong>Přesměrovat na protokol</strong> - umožní vám ur�it, zda chcete být ze Seznamu módů přesměrováni na záložku Zobrazit protokol v případě <strong>Pouze chyb</strong> nebo <strong>Všech transakcí</strong>.  Výchozí volbou je přesměrování v případě <strong>Pouze chyb</strong>, která zobrazí protokol pouze v případě, že se vyskytne v průběhu instalace, odinstalace, vy�ištění nebo vymazání chyba.</li>
< 				<li><strong>Do protokolu zapsat celou cestu souborů</strong> - umožní vám zapsat Ne, pokud chcete u souborů v protokolu zobrazit pouze relativní cestu. Výchozí volbou je <strong>Ano</strong> pro zobrazení úplné absolutní cesty.</li>
< 			</ul></p>
< 		<p><strong>Možnosti nastavení zobrazení</strong> 
< 			<ul>
< 				<li><strong>Řadit seznamy podle</strong> - umožní vám zvolit, podle kterého sloupce bude řazen Seznam módů.  Možnosti jsou Název módu a Název konfigura�ního souboru.  Výchozí volbou je <strong>Název módu</strong>.</li>
< 				<li><strong>Použít pevné záhlaví</strong> - umožní vám změnit volbu, aby nebylo zobrazeno pevné záhlaví. Tato volba není zřetelná, pokud máte velký monitor a málo módů. Výchozí volbou je <strong>Ano</strong> pro zobrazení pevného záhlaví.  Bez ohledu na nastavení této volby se pevné záhlaví nezobrazí v případě chytrých telefonů (mobilní režim).</li>
< 				<li><strong>Upravit pevné záhlaví</strong> - umožní vám povolit úpravu pevného záhlaví jQuery v případě, že pevné záhlaví není správně zobrazeno. Tato volba je potřeba pouze na ur�itých monitorech. Výchozí volbou je <strong>Ne</strong> a nepoužívat javascript jQuery pro úpravu pevného záhlaví.</li>
< 				<li><strong>Použít pruhy</strong> - umožní vám změnit volbu a nepoužít pruhy při zobrazení Seznamu módů. Výchozí volbou je <strong>Ano</strong>, která použije třídu databackalt k zobrazení barevných pruhů střídavě po po�tu N řádků.</li>
< 				<li><strong>Pruh po tomto po�tu řádků</strong> - umožní nastavit po�et řádků, po kterém se budou střídat barevné pruhy. Výchozí volbou jsou <strong>3</strong> řádky jedné barvy a pak 3 řádky jiné barvy.</li>
< 				<li><strong>Odstranit mezery z názvů souborů v seznamu módů</strong> - umožní odstranit mezery z názvů módů před jejich zobrazením v Seznamu názvů módů. Výchozí volbou je <strong>Ne</strong>, kdy jsou mezery v názvech módů zobrazeny a tyto názvy pak odpovídají názvům �lánků na TNG Wiki.</li>
< 				<li><strong>Zobrazit záložku Analýza souborů TNG</strong> - umožní ur�it, zda chcete zobrazit záložku Analýza soouborů TNG.  Výchozí volbou je <strong>Ne</strong>, která potla�í zobrazení záložky Analýza soouborů TNG.</li>
<         <li><strong>Zobrazit další nástroje pro vývojáře</strong> - umožní ur�it, zda chcete zobrazit záložku Tabulka parseru.  Výchozí volbou je <strong>Ne</strong>, která potla�í zobrazení záložky Tabulka parseru.  Tato volba také řídí, zda se na kliknutí na název módu zobrazí tabulka parseru pro daný mod a zda se kliknutím na název konfigura�ního souboru zobrazí na nové záložce konfigura�ní soubor.</li>
< 				<li><strong>Zobrazit záložku Doporu�ené aktualizace</strong> - umožní ur�it, zda chcete zobrazit záložku Doporu�ené aktualizace.  Výchozí volbou je <strong>Ne</strong>, která potla�í zobrazení záložky Doporu�ené aktualizace.  Tato záložka nemusí být zobrazena, pokud jste provedli aktualizaci souboru cust_text.php v rámci aktualizace na TNG v12.</li>
< 			</ul></p>
< 		<p><strong>Jiné možnosti</strong> 
< 			<ul>
< 				<li><strong>Povolit Vymazat vybrané pro �áste�ně nainstalované módy</strong> - povolí zobrazení tla�ítka <strong>Vymazat</strong> v seznamu vybraných Částe�ně nainstalovaných módů, pomocí kterého lze vymazat více módů najednou, jako např. vymazání předchozích verzí modů, které nebyly vymazány před instalací novější verzí. Výchozí volbou je <strong>Ne</strong>. Tuto volbu doporu�ujeme povolit pouze v případě, že potřebujete vymazat více modů, aniž byste museli odinstalovat aktuální verze, abyste odstranili předchozí verze módu, když jste zapomněli odinstalovat a vymazat předchozí verze modu před instalací nové verze. Normálně tuto volbu nechte nastavenou na Ne a volbu Ne obnovte po odstranění předchozích verzí módu, které se zobrazují jako �áste�ně nainstalované.</li>
< 				<li><strong>Povolit Vymazat pro samostatně nainstalované módy</strong> - umožní zapnutí volby zobrazení tla�ítka <strong>Vymazat</strong> vedle tla�ítka Odinstalovat u samostatně instalovaných módů, např. pro vymazání předchozí verze módu, která nebyla vymazána před instalací novější verze. Výchozí volbou je <strong>Ne</strong>.  Doporu�ujeme, abyste tuto volbu povolili pouze v případě, kdy je potřeba vymazat předchozí verzi módu, bez nutnosti odinstalování aktuální verze za ú�elem vymazání předchozí verze, a za normálních okolností ponechte tuto volbu nastavenou na <strong>Ne</strong> a volbu Ne obnovte po odstranění předchozích verzí módu, které se zobrazují jako nainstalované.</li>
< 				<li><strong>Povolit smazání podpůrné složky po vymazání modu</strong> - umožní zapnutí volby smazání složky (složek) přidružených k módu při mazání módu. Výchozí volbou je <strong>Ne</strong>. Doporu�ujeme tuto možnost povolit jen tehdy, pokud chápete nebezpe�í vymazání nezamýšlených složek. Věříme, že toto riziko je velmi malé.</li>
< 			</ul></p>
240a132,135
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="editor"><p class="subheadbold">Editor módů</p></a>
> 
>     <p>Editor modů (parametrů) je přístupný ze stránky se seznamy modů. Pokud má nainstalovaný mód upravitelné parametry, uvidíte to ve sloupci Stav v seznamu modů jako -- <i>Instalováno [Možnosti]</i>. Chcete-li upravit parametry módu, otevřete panel Stav a klikněte na tla�ítko "Upravit možnosti". Editovatelné parametry jsou uživatelské možnosti módu, například nastavení barvy pro něco.</p>
242,243c137
< 		<p style="float:right"><a href="#top">Nahoru</a></p>
< 		<a name="analyze"><p class="subheadbold">Analýza souborů TNG</p></a>
---
>     <p>Chování cílového souboru lze řídit hodnotou parametrů. Uživatel módu může být například požádán, aby zadal po�et dní, po které si přeje uchovávat ur�ité soubory protokolu.</p>
245c139
< 		<p>Tento nástroj na záložce <strong>Analýza souborů TNG</strong>, který vytvořil Rick Bisbee, existoval dříve jako opravný mód. Analýza souborů TNG umožňuje vývojářům zkoumat působení módů navzájem. Situace, kdy dva módy mění stejný úsek programového kódu, má téměř vždy za následek chybu v manažeru módů. Chcete-li, aby byla záložka Analýza souborů TNG zobrazena, musíte ji povolit nastavením volby <strong>Analýza souborů TNG</strong> na Ano.</p>
---
>     <p>Po�et parametrů, které může mód použít, není omezen. Každý parametr má výchozí hodnotu zobrazenou na panelu popisu editoru módu vlevo. Panel vpravo obsahuje oblast pro změnu hodnoty parametru. Jsou zde také dvě tla�ítka, jedno pro aktualizaci cílového souboru s hodnotou ve vstupním poli a druhé pro resetování parametru na výchozí hodnotu.</p>
247,250c141
< 		<p>Analyzér pracuje tak, že prozkoumá všechny módy ve složce mods a vytvoří soupis cílových souborů a úseků programového kódu, který každý mód mění. V levém sloupci uvede názvy dot�ených souborů. Po kliknutí na název cílového souboru se na pravé straně zobrazí seznam módů, které tento cílový soubor mění. U každého módu je napravo zobrazen odkaz pro otevření sekce stránky zobrazující aktuální změny, které obsahuje konfigura�ní soubor manažeru módů. Uživatel může porovnat změny cílového souboru a vidět, kde mohou být skryty potenciální konflikty.</p>
<     
<     <p>To je užite�né nejen pro nalezení konfliktů mezi dvěma módy, ale také pro poznání, které módy je třeba vy�istit a znovu nainstalovat po přepsání daného cílového souboru. </p>
< 		<p>Vývojáři módů naleznou další informace na TNG Wiki v �lánku <a href="https://tng.lythgoes.net/wiki/index.php?title=Using_the_Mod_Analyzer" target="_blank">Using the Mod Analyzer (v angli�tině)</a>.</p>
---
>     <p><b>Ať už zadáváte řetězce nebo celá �ísla, není nutné je uzavírat do uvozovek</b>. Editor módů to zjistí při aktualizaci hodnot.</p>
255c146,149
<     <td class="tngshadow">
---
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="viewlog"><p class="subheadbold">Zobrazit protokol</p></a>
>     <p>V závislosti na uživatelských preferencích na kartě Možnosti se při chybách generovaných během instalace nebo odstranění módu automaticky otevře protokol chyb, takže administrátor může vidět, co se pokazilo. Jinak můžete otevřít protokol a zobrazit podrobnosti o svých operacích.</p>
257,260c151,152
<         <p style="float:right"><a href="#top">Top</a></p>
<         <a name="parser"><p class="subheadbold">Tabulka parseru</p></a>
<         <p>Tento nástroj je ur�en hlavně pro vývojáře. Tabulka parseru ukazuje, jak Manažer módů zanalyzoval konfigura�ní soubor módu (.cfg) zapracováním jeho komponent do tabulky, která pak prochází do dalších skriptů Manažeru módů pro další zpracování. Pokud se vyskytne problém s módem, první místo, které je třeba zkontrolovat, je tabulka parseru, aby se zjistilo, zda jsou správně zachyceny všechny příkazy a argumenty módu.</p>
<       <p>Tuto záložku můžete použít k výběru módu ze seznamu, jehož tabulku chcete zobrazit, nebo, pokud jste povolili možnost Zobrazit další nástroje pro vývojáře, můžete kliknout na název módu v Seznamu módů a zobrazit tabulku parseru pro tento mód.</p>
---
>     <p>Řádek protokolu zobrazuje datum a �as, pokus o operaci, název a verzi módu, výsledek a funkcionáře (správce webu), který operaci provedl.
>     </p>
262c154,155
<       <p>Zobrazení této záložky je volitelné. Chcete-li jej použít, vyberte možnost 'Nastavení zobrazení/Zobrazit další nástroje pro vývojáře' na záložce Možnosti. Pokud je volba záložky vypnuta, odkaz na stránce se seznamem nebude také povolen.</p>
---
>     <p>Chcete-li zobrazit podrobnosti, klikněte na řádek protokolu. Otevře se panel. Každý příkaz (za�ínající znakem %) zobrazuje �íslo řádku v konfigura�ním souboru módu, kde byl příkaz proveden, a výsledek.
>     </p>
264c157,199
<     </td>
---
>     <p>Jak bylo uvedeno dříve, chyby jsou doprovázeny �íslem E odkazujícím na �íslo řádku v souboru TNG Manažeru módů, kde k chybě došlo. Pokud k tomu došlo během pokusu o instalaci, E-�íslo bude odkazovat na soubor classes/modinstaller.class.php. Když tento soubor otevřete s �íslem řádku, �asto uvidíte poblíž komentář vysvětlující chybu a navrhující řešení.</p>
> 
>     <p>Nápovědu k příkazům a jejich použití naleznete na TNGWiki. Můžete také kliknout na odkaz <b>Syntaxe módů</b> přímo pod záložkami Manažera módů na většině obrazovek MM.</p>
> 
> </td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="options"><p class="subheadbold">Možnosti</p></a>
>     <p>Karta <strong>Možnosti</strong> otevře obrazovku uživatelských preferencí rozdělenou do tří �ástí.</p>
> </p>V sekci <b>Protokol Manažeru módů</b> můžete zadat preference týkající se souboru protokolu. Pod <i>Název souboru protokolu</i> můžete ve skute�nosti zadat cestu k serveru, abyste umístili svůj protokol mimo oblast webových stránek, která je přístupná z prohlíže�e. Výchozí nastavení je umístit jej do kořenového adresáře TNG.</p>
>     <p><b>Nastavení zobrazení</b> je místo, kde můžete zobrazit nebo skrýt karty na stránce Manažeru módů.</p>
>     <p><b>Jiné</b> vám umožňuje rozhodnout, jak nakonfigurovat schopnost Manažeru módů mazat mody a jejich podpůrné složky.</p>
>     <p>
> 			<ul>
>  				<li><strong>Povolit Vymazat vybrané pro �áste�ně nainstalované módy</strong> - povolí zobrazení tla�ítka <strong>Vymazat</strong> v seznamu vybraných Částe�ně nainstalovaných módů, pomocí kterého lze vymazat více módů najednou, jako např. vymazání předchozích verzí modů, které nebyly vymazány před instalací novější verzí. Výchozí volbou je <strong>Ne</strong>. Tuto volbu doporu�ujeme povolit pouze v případě, že potřebujete vymazat více modů, aniž byste museli odinstalovat aktuální verze, abyste odstranili předchozí verze módu, když jste zapomněli odinstalovat a vymazat předchozí verze modu před instalací nové verze. Normálně tuto volbu nechte nastavenou na Ne a volbu Ne obnovte po odstranění předchozích verzí módu, které se zobrazují jako �áste�ně nainstalované.</li>
> 				<li><strong>Povolit Vymazat pro samostatně nainstalované módy</strong> - umožní zapnutí volby zobrazení tla�ítka <strong>Vymazat</strong> vedle tla�ítka Odinstalovat u samostatně instalovaných módů, např. pro vymazání předchozí verze módu, která nebyla vymazána před instalací novější verze. Výchozí volbou je <strong>Ne</strong>.  Doporu�ujeme, abyste tuto volbu povolili pouze v případě, kdy je potřeba vymazat předchozí verzi módu, bez nutnosti odinstalování aktuální verze za ú�elem vymazání předchozí verze, a za normálních okolností ponechte tuto volbu nastavenou na <strong>Ne</strong> a volbu Ne obnovte po odstranění předchozích verzí módu, které se zobrazují jako nainstalované.</li>
> 				<li><strong>Povolit smazání podpůrné složky po vymazání modu</strong> - umožní zapnutí volby smazání složky (složek) přidružených k módu při mazání módu. Výchozí volbou je <strong>Ne</strong>. Doporu�ujeme tuto možnost povolit jen tehdy, pokud chápete nebezpe�í vymazání nezamýšlených složek. Věříme, že toto riziko je velmi malé.</li>
> 		</ul>
>   </p>
>     <p>Nastavte předvolby, jak potřebujete, a stiskněte tla�ítko <i>Uložit</i>.</p>
> </td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="analyzer"><p class="subheadbold">Analýza souborů TNG</p></a>
>     <p>Karta <strong>Analýza souborů TNG</strong> je volitelná karta, kterou lze povolit na obrazovce Možnosti.</p>
> 
> <p>Toto je pokro�ilý nástroj, který vám umožňuje vybrat soubor TNG a zobrazit, které módy mění nebo změní tento konkrétní soubor TNG. Pokud se soubor neobjeví v seznamu vlevo, znamená to, že na něj necílí žádné mody.</p>
> 
> <p>Když vyberete soubor v levém sloupci, zobrazí se v pravém sloupci s názvy a stavem modů, které jej ovlivní. Odtud můžete kliknout na odkaz "Zobrazit úpravu" a zobrazit skute�nou změnu, kterou provede v cílovém souboru. <i>Není v rozsahu tohoto souboru nápovědy probírat příkazy konfigurace módů a jak fungují</i>. Informace naleznete na TNGWiki.</p>
> 
> <p>Pokud jste zvolili na kartě Možnosti, Nastavení zobrazení, „Zobrazit akce v analyzátoru modů“, uvidíte také odkazy, které vám umožní nainstalovat, odinstalovat nebo smazat mód přímo z této obrazovky, v závislosti na aktuálním stavu. </p>
> <p>V horní �ásti seznamu uvidíte panel filtrů s výběry pro <i>Všechny mody</i>, <i>Pouze nainstalované mody</i> nebo <i>Instalované+�áste�ně nainstalované mody</i>. Výběrem <i>Pouze nainstalované mody</i> a kliknutím na <i>Odeslat dotaz</i> omezíte soubory v levém sloupci na ty, které jsou ovlivněny pouze aktuálně nainstalovanými mody.</p>
> 
>     <p>Tento nástroj je užite�ný nejen pro nalezení konfliktů mezi dvěma módy, ale také pro zjištění, které módy je třeba po nahrazení daného cílového souboru vy�istit a znovu nainstalovat. </p>
> 
>     <p>The TNG Wiki provides additional information for the mod developers on <a href="https://tng.lythgoes.net/wiki/index.php?title=Using_the_Mod_Analyzer" target="_blank">Using the Mod Analyzer</a>.</p>
>     <p>Další informace o <a href="https://tng.lythgoes.net/wiki/index.php?title=Using_the_Mod_Analyzer" target="_blank">Použití analyzátoru módů< /a> poskytuje vývojářům módů TNG Wiki.</p>
> 
> </td>
268c203,206
<     <td class="tngshadow">
---
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="parser"><p class="subheadbold">Tabulka parseru</p></a>
>     <p>Tento nástroj je ur�en hlavně pro ladění modů. Tabulka parseru ukazuje, jak Manažer módů zanalyzoval příkazy konfigura�ního souboru módu (.cfg). Je to zobrazeno ve formě tabulky, při�emž každý řádek představuje příkaz módu. Data uvedená v tabulce jsou předána dalším skriptům manažeru módů k dalšímu zpracování – instalaci, odstranění atd. Pokud se vyskytne problém s módem, je dobré za�ít s tabulkou parseru, abyste zjistili, zda jsou všechny příkazy a argumenty módu správně zachyceny.</p>
270,273c208,212
<         <p style="float:right"><a href="#top">Top</a></p>
<         <a name="custtext"><p class="subheadbold">Doporu�ené aktualizace</p></a>
<         <p>Záložka Doporu�ené aktualizace je volitelná záložka, která může být povolena na obrazovce Možnosti, a umožní vám aktualizovat soubory cust_text.php, pokud jste tak neu�inili jako sou�ást aktualizace TNG.</p>
< 		<p>Použití záložky se předpokládá v případě, že mód nemůže být nainstalován, protože hledá nový komentářový řetězec v horní �ásti souborů cust_text.php po�ínaje TNG v12.  Tato volba bude vypnuta po kliknutí na tla�ítko Aktualizovat a změně stávajících souborů cust_text.php.  Kód kontroluje, zda byly tyto soubory již dříve aktualizovány.</p>
---
>       <p>Tuto kartu můžete použít k výběru módu ze seznamu, jehož tabulku chcete zobrazit, nebo můžete kliknout na název modu v seznamu módů a zobrazit tabulku parseru pro tento mód, <i>pokud jste povolili možnost Zobrazit další nástroje pro vývojáře</i>.</p>
> 
>       <p>Zobrazení této karty je volitelné. Chcete-li jej použít, vyberte na kartě Možnosti „Zobrazit další nástroje pro vývojáře“. Pokud je možnost karty vypnutá, bude také deaktivován odkaz na stránce seznamu.</p>
> 
>       <p><i>Není v rozsahu tohoto souboru nápovědy probírat příkazy konfigurace módů a jak fungují</i>. Informace naleznete na TNGWiki.</p>
277,280c216,345
<     
<   </table>
< </body>
< </html>
---
> 
> <tr class="databack">
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="recommended"><p class="subheadbold">Doporu�ené aktualizace</p></a>
>     <p>Záložka <strong>Doporu�ené aktualizace</strong> je volitelná a lze ji povolit na obrazovce Možnosti. Umožňuje aktualizovat soubory cust_text.php, pokud jste tak neu�inili v rámci readme aktualizace TNG. </p>
> 
> 
> 
> <p>Další informace (v angli�tině) naleznete v �lánku <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager" target="_blank">Mod Manager</a> a v kategorie �lánků <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:TNG_Mod_Manager" target="_blank">TNG Mod Manager</a> na TNG Wiki.</p>
> <p>V TNG Wiki si můžete prohlédnout �lánek <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Enhancements" target="_blank">Mod Manager</a> jaká vylepšení byla provedena v TNG v12.</p>
> 
> 	</td>
> </tr>
> 
> <tr class="databack">
>   <td class="tngshadow">
>     <p style="float:right"><a href="#top">Nahoru</a></p>
>     <a name="credits"><p class="subheadbold">Poděkování</p></a>
> 
>       <table style='table-layout:fixed;width:100%'>
>         <tr>
>           <td style='width:20%;vertical-align:top;'>
>             Brian McFadyen
>           </td>
>           <td style='width:80%'>
>             <ul><li>autor</li></ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Sean Schwoere
>           </td>
>           <td>
>             <ul>
>                 <li>integrace pro Joomla</li>
>                 <li>lepší integrace pro instalaci, odebírání a správu módů</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Ken Roy
>           </td>
>           <td>
>             <ul>
>                 <li>vedoucí vývojového týmu, verze 12 - 14</li>
>                 <li>vytvořil kartu Zobrazit protokol</li>
>                 <li>vytvořil kartu Možnosti</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Rick Bisbee
>           </td>
>           <td>
>             <ul>
>                 <li>vedoucí programátor, verze 12 - 14</li>
>                 <li>přidal dávkové zpracování</li>
>                 <li>přidal kartu Zobrazit tabulku parseru</li>
>                 <li>přidal kartu Analyzovat soubory TNG</li>
>                 <li>refaktoroval kód TNG pro údržbu, v14</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Jeff Robson
>           </td>
>           <td>
>             <ul>
>                 <li>beta testovací tým, verze 12</li>
>                 <li>přidal kartu Ovlivněné soubory</li>
>                 <li>hlavní příspěvky ke stylu</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Robin Richmond
>           </td>
>           <td>
>             <ul>
>                 <li>beta testovací tým, verze 12</li>
>                 <li>poskytl kód pro přerušení dlouhých řádků textu bez mezer, který se používá především ve sloupci Stav MM</li>
>                 <li>hlavní příspěvky k zobrazení protokolu MM</li>
>             </ul>
>           </td>
>         </tr>
> 
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Michel Kirsh
>           </td>
>           <td>
>             <ul>
>                 <li>beta testovací tým, verze 14</li>
>                 <li>hlavní aktualizace Analýzy souborů TNG</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>               beta testovací tým TNG v14
>           </td>
>           <td>
> 
>             <ul>
>                 <li>Mogens C. Fenger</li>
>                 <li>William Herndon</li>
>                 <li>Michel Kirsch</li>
>                 <li>Ron Krzmarzick</li>
>                 <li>Roger Moffat</li>
>                 <li>Jan-Thore Solem</li>
>             </ul>
>           </td>
>         </tr>
>       </table>
>   </td>
> </tr>
> </table>
> </body>
\ No newline at end of file
diff -r TNG/languages/Czech-UTF8/modmanager_help.php TNG1403/languages/Czech-UTF8/modmanager_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
34c30,36
<       <td class="tngshadow">		
---
>       <td class="tngshadow">
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>       		
diff -r TNG/languages/Czech-UTF8/more_help.php TNG1403/languages/Czech-UTF8/more_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
28a25,29
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/mostwanted_help.php TNG1403/languages/Czech-UTF8/mostwanted_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31a28,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/notes2_help.php TNG1403/languages/Czech-UTF8/notes2_help.php
12,13c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
24a25,29
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/notes_help.php TNG1403/languages/Czech-UTF8/notes_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
29a26,30
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/pedconfig_help.php TNG1403/languages/Czech-UTF8/pedconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
33a30,35
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>       
126c128
< 		<span class="optionhead">Zobrazit poznámky v Registru</span>
---
> 		<span class="optionhead">Zobrazit poznámky a vlastní události v Registru</span>
140,154c142,166
< 		<a name="rel"><p class="subheadbold">Schéma příbuzenských vztahů</p></a>
< 		<span class="optionhead">Výchozí po�et vztahů</span>
< 		<p>Tato hodnota udává po�et příbuzenských vztahů, které bude TNG hledat při prvním spuštění schématu příbuzenských vztahů. Po nalezení tohoto
< 		po�tu vztahů se proces zastaví. Pokud váš strom neobsahuje komplikované příbuzenské vztahy, můžete tuto hodnotu nastavit
< 		na 1, abyste ušetřili �as průběhu.</p>
< 
< 		<span class="optionhead">Maximální po�et vztahů</span>
< 		<p>Pokud si uživatel myslí, že existuje více příbuzenských vztahů, může toto �íslo zvýšit a TNG se je pokusí nalézt.
< 		Toto �íslo uvádí maximum vztahů, které povolíte programu hledat. Nenastavujte je na vyšší �íslo,
< 		než je úroveň složitosti vašeho stromu. Čím je �íslo nižší, tím více �asu ušetříte lidem při zobrazení tohoto schématu.
< 		Pokud např. mezi dvěma lidmi existuje pouze jeden příbuzenský vztah, ale vy jich budete hledat 5,
< 		TNG bude po nalezení prvního vztahu dále hledat marně.</p>
< 
< 		<span class="optionhead">Maximální po�et generací</span>
< 		<p>Maximální po�et generací, které povolíte návštěvníkovi na stránce příbuzenských vztahů najednou prohledat. Může to být na této stránce také výchozí po�et.</p>
---
> 		<a name="rel"><p class="subheadbold">Schéma spojení</p></a>
> 		<span class="optionhead">Maximální po�et spuštění vyhledávání spojení</span>
> 		<p>Maximální po�et spojení, které lze nalézt při vyhledávání. Nastavte mezi 1 a 9999. Všimněte si, že pouze některá vzácná spuštění vedou k zobrazení cesty. 
>       Je-li nastaveno na 1, prohledává se pouze nejkratší cesta. Výchozí hodnota je 99.</p>
> 
> 		<span class="optionhead">Maximální délka cest spojení</span>
> 		<p>Maximální po�et kroků v každém spojení. Výchozí hodnota je 30.</p>
> 
> 		<span class="optionhead">Zobrazit textový příkaz cesty</span>
> 		<p>Zvolte, zda se má ve výchozím nastavení nad grafickou prezentací zobrazovat textový popis každé cesty.</p>
> 
> 		<span class="optionhead">Zobrazit ráme�ky osob v kompaktní podobě</span>
> 		<p>Zvolte, zda se má pole každé osoby zobrazit v minimalizované podobě, bez náhledových fotografií a některých zkrácených prvků celého jména. 
>       Jinými slovy, pokud toto nastavíte na <i>Ne</i>, zobrazí se miniatury a celá jména. Pokud to nastavíte na <i>Ano</i>, diagram bude kompaktnější.</p>
> 
> 		<span class="optionhead">Seřadit cesty podle</span>
> 		<p>Vyberte, zda budou nalezené cesty seřazeny podle délky, po�tu sňatků nebo vůbec. Výchozí hodnota je délka.</p>
> 
> 		<span class="optionhead">Anchor ID</span>
> 		<p>ID "Osoby 2", které bude použito k hledání spojení, dokud uživatel nevybere Osoba 2. POZN�MKA: Mělo by to být platné ID ve stejném stromu jako Osoba 1. 
>     Pokud je tento parametr prázdný a přihlášený uživatel je �lenem tohoto stromu, bude ID uživatele navrženo jako Osoba 2.</p>
> 
> 		<span class="optionhead">Maximální po�et manželství ve spojení</span>
> 		<p>Maximální po�et manželství povolený v jakékoli cestě připojení. Pokud je tato hodnota překro�ena, je připojení ignorováno, aby se zabránilo 
>     zobrazení příliš širokých diagramů.</p>
diff -r TNG/languages/Czech-UTF8/people_help.php TNG1403/languages/Czech-UTF8/people_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
34a31,35
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
86c87
<         <span class="optionhead">Pohlaví / Přezdívka / Titul / Předpona / Přípona / Pořadí jména a příjmení</span>		
---
>         <span class="optionhead">Přezdívka / Titul / Předpona / Přípona / Pořadí jména a příjmení</span>		
91c92,95
<         		
---
> 
>         <span class="optionhead">Pohlaví</span>
>         <p>Vyberte Neznámý, Muž, Žena nebo Jiné. Je-li zvoleno Jiné, objeví se vpravo nové pole, do kterého můžete zadat preferovaný popis pohlaví.</p>
>          		
104a109,110
> 
>         <p>Poznámka k událostem alternativního narození: Výchozí alternativní typ události narození je „Křtiny“. Pole Křest může být zcela vypnuto v Nastavení/Základní nastavení/Vzhled a definice stránek, ale můžete zde také zadat tagy GEDCOM pro jiné alternativní události narození. Pokud například zadáte „CHR,BAPM“ jako alternativní typ události narození, uživatel se může rozhodnout, že jako alternativní událost narození pro jednotlivce ur�í bu� Křest nebo Křest. Pořadí také uvádí, který typ události je preferován jako výchozí.
108c114
<         <strong>Pozn.:</strong> Nechcete-li vidět pole spojené s CJKSpd, jděte na Nastavení/Základní nastavení a zde tuto možnost vypněte (je třeba se pak odhlásit a znovu přihlásit).</p>	
---
>         <strong>Pozn.:</strong> Nechcete-li vidět pole spojené s CJKSpd, jděte na Nastavení/Základní nastavení/Ochrana údajů a zde tuto možnost vypněte (je třeba se pak odhlásit a znovu přihlásit).</p>	
125,127c131,133
<         <span class="optionhead">Jiné události</span>		
<         <p>Chcete-li přidat další události, klikněte na tla�ítko "Přidat nové" vedle <strong>Jiné události</strong>. Viz odkaz <a href="events_help.php">Nápověda</a> pro více 		
<         informací o přidání nových událostí. Po přidání události se pod tla�ítkem "Přidat nové" zobrazí v tabulce krátké shrnutí. Tla�ítka akcí 		
---
>         <span class="optionhead">Jiné události / atributy</span>		
>         <p>Chcete-li přidat další události, klikněte na tla�ítko "Přidat nové" vedle <strong>Jiné události / atributy</strong>. Viz odkaz <a href="events_help.php">Nápověda</a> pro více 		
>         informací o přidání nových událostí / atributů. Po přidání události / atributu se pod tla�ítkem "Přidat nové" zobrazí v tabulce krátké shrnutí. Tla�ítka akcí 		
diff -r TNG/languages/Czech-UTF8/places_googlemap_help.php TNG1403/languages/Czech-UTF8/places_googlemap_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31a28,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>       
44c46
< 		Pro vyhledání souřadnic můžete také využít aplikaci Streetmap (<a href="http://www.streetmap.co.uk" target="_blank">http://www.streetmap.co.uk</a>).</p>
---
> 		Pro vyhledání souřadnic můžete také využít aplikaci Streetmap (<a href="https://www.streetmap.co.uk" target="_blank">https://www.streetmap.co.uk</a>).</p>
67c69
< 		Pro tyto státy musíte použít odkaz <a href="http://maps.google.com/" target="_blank">Plné vyhledávání v Google Maps</a>.</p>
---
> 		Pro tyto státy musíte použít odkaz <a href="https://maps.google.com/" target="_blank">Plné vyhledávání v Google Maps</a>.</p>
118c120
< 		<p>Další nápovědu najdete na <a href="http://www.google.com/apis/maps/documentation/" target="_blank">Google Maps API</a>.</p>
---
> 		<p>Další nápovědu najdete na <a href="https://www.google.com/apis/maps/documentation/" target="_blank">Google Maps API</a>.</p>
diff -r TNG/languages/Czech-UTF8/places_help.php TNG1403/languages/Czech-UTF8/places_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
164a166,168
>     
>     <span class="optionhead">Obnovit</span>
> 		<p>Zaškrtnutím tohoto polí�ka za�nete znovu od za�átku seznamu míst. Jinak bude geokódování pokra�ovat od místa, kde skon�ila poslední dávka.</p>
diff -r TNG/languages/Czech-UTF8/reports_help.php TNG1403/languages/Czech-UTF8/reports_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
18c14
< 			<a href="eventtypes_help.php" class="lightlink">&laquo; Nápověda: Vlastní typy událostí</a> &nbsp; | &nbsp;
---
> 			<a href="eventtypes_help.php" class="lightlink">&laquo; Nápověda: Typy událostí / atributů</a> &nbsp; | &nbsp;
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
73,74c74,75
< 		<p>Zkopírováním z levé �ásti do pravé ozna�te, která pole chcete ve svém reportu zobrazit. Provést to můžete
< 		výběrem pole a kliknutím na tla�ítko <em>Přidat >></em> nebo jednoduše dvojklikem na název pole (pouze IE). </p>
---
> 		<p>Zkopírováním z levé �ásti do pravé ur�íte, která pole chcete ve svém reportu zobrazit. Provést to můžete
> 		přetažením pole z levé �ásti doprava nebo jednoduše dvojitým kliknutím na název pole.</p>
76,77c77
< 		<p>Ze seznamu polí pro zobrazení můžete pole odstranit jeho výběrem
< 		v pravé �ásti a kliknutím na tla�ítko <em><< Odstranit</em> nebo jednoduše dvojklikem na název pole (pouze IE). </p>
---
> 		<p>Pole můžete odstranit ze seznamu zobrazení vpravo dvojitým kliknutím na název pole.</p>
79,80c79,80
< 		<p>Pole v seznamu zobrazení nahoře jsou zobrazena v reportu nalevo. Změnit pořadí zobrazovaných polí
< 		můžete výběrem pole v pravé �ásti a kliknutím na tla�ítka <em>Posunout nahoru</em> a <em>Posunout dolů</em> můžete pole posunout nahoru nebo dolů.</p>
---
> 		<p>Pole, která jsou v seznamu zobrazení nahoře, budou v reportu zobrazena nalevo. Změnit pořadí zobrazovaných polí
> 		můžete kliknutím a podržením pole v pravé �ásti a přetáhnutím v seznamu nahoru nebo dolů.</p>
86c86
< 
---
>     
88a89,90
>     
> 		<p>Jakýkoli příkaz za�něte výběrem názvu pole z levé horního �ásti a jeho přetažením do pravé �ásti. Můžete také dvakrát kliknout na název pole.</p>    
109c111
< 		zkopírujte do pravé �ásti jeho výběrem a kliknutím na sousední tla�ítko <em>Přidat >></em> nebo jednoduše dvojklikem na název operátora (pouze IE).</p>
---
> 		zkopírujte do pravé �ásti přetažením nebo dvojklikem na název operátora.</p>
112c114
< 		<em>aktuální den</em>. Chcete-li vybrat hodnotu konstantního řetězce, zadejte do pole <em>Konstantní řetězec</em> hodnotu řetězce bez uvozovek a klikněte na sousední tla�ítko <em>Přidat >></em>.
---
> 		<em>aktuální den</em>. Chcete-li vybrat hodnotu konstantního řetězce, zadejte do pole <em>Konstantní řetězec</em> hodnotu řetězce bez uvozovek a klikněte na sousední tla�ítko <em>>></em>.
114c116
< 		tla�ítko <em>Přidat >></em>.</p>
---
> 		tla�ítko <em>>></em>.</p>
116c118
< 		<p>Odstranit jakoukoli položku z pravé �ásti můžete jejím výběrem a kliknutím na tla�ítko <em><< Odstranit</em> nebo jednoduše dvojklikem na položku (pouze IE).
---
> 		<p>Odstranit jakoukoli položku z pravé �ásti můžete dvojklikem na položku.
123c125
< 		Pole, podle kterých má být tříděno, vyberte zkopírováním z levé �ásti do pravé. Provést to můžete	výběrem pole a kliknutím na tla�ítko <em>Přidat >></em> nebo jednoduše dvojklikem na název pole (pouze IE).
---
> 		Pole, podle kterých má být tříděno, přetažením z levého pole doprava nebo kliknutím na název pole.</p>
140,141c142,143
<     <span class="optionhead">Uložit report vs. Uložit a ukon�it</span>
< 		<p>Chcete-li report uložit, kliknìte na "Uložit report" a zůstanete na stejné stránce a můžete pokra�ovat v editaci. Kliknutím na "Uložit a ukon�it" report uložíte a vrátíte se na menu Reporty.</p>
---
>     <span class="optionhead">Uložit + Konec vs. Uložit + Zůstat</span>
> 		<p>Chcete-li report uložit, kliknìte na "Uložit + Konec" a zůstanete na stejné stránce a můžete pokra�ovat v editaci. Kliknutím na "Uložit + Zůstat" report uložíte a vrátíte se na menu Reporty.</p>
143c145
< 		<p>Několik vzorových reportů můžete vidět na <a href="http://lythgoes.net/genealogy/demo.php" target="_blank">http://lythgoes.net/genealogy/demo.php</a>. Zvolte zde Administrative Demo a vyhledejte sekci Reporty.</p>
---
> 		<p>Několik vzorových reportů můžete vidět na <a href="https://lythgoes.net/genealogy/demo.php" target="_blank">https://lythgoes.net/genealogy/demo.php</a>. Zvolte zde Administrative Demo a vyhledejte sekci Reporty.</p>
diff -r TNG/languages/Czech-UTF8/repositories_help.php TNG1403/languages/Czech-UTF8/repositories_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/second_help.php TNG1403/languages/Czech-UTF8/second_help.php
3c3
< echo help_header("Nápověda: Druhotné procesy");
---
> echo help_header("Nápověda: Nástroje po importu");
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
21c17
< 		<span class="largeheader">Nápověda: Druhotné procesy</span>
---
> 		<span class="largeheader">Nápověda: Nástroje po importu</span>
28a25,29
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
30,31c31,32
< 		<a name="what"><p class="subheadbold">Co jsou to druhotné procesy?</p></a>
< 		<p>Druhotné procesy jsou operace, které lze provést na vašich datech bezprostředně po ukon�ení importu. Chcete-li nějakou operaci provést,
---
> 		<a name="what"><p class="subheadbold">Co jsou to Nástroje po importu?</p></a>
> 		<p>Nástroje po importu jsou operace, které lze provést na vašich datech bezprostředně po ukon�ení importu. Chcete-li nějakou operaci provést,
55,56c56,57
< 		<a href="http://www.gendexnetwork.org">GenDex Network</a> nebo <a href="http://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.</p>
< 
---
> 		<!--<a href="https://www.gendexnetwork.org">GenDex Network</a> or --><a href="https://www.familytreeseeker.com">FamilyTreeSeeker.com</a></p>
>     
58c59
< 		<p>Máte-li indexovaný soubor GENDEX, navštivte <a href="http://www.gendexnetwork.org">GenDex Network</a> nebo <a href="http://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.
---
> 		<p>Máte-li indexovaný soubor GENDEX, navštivte <!--<a href="https://www.gendexnetwork.org">GenDex Network</a> or --><a href="https://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.
74,75c75,76
< 		<p>Vyhledány budou všechny osoby, které zemřely v nedávné minulosti, a budou ozna�eny jako "Neveřejné". Přesný po�et let vychází z volby "Kolik let po smrti nechat osobu jako neveřejnou"
<     na stránce Základní nastavení (v �ásti Ochrana údajů). Tam, kde je taková osoba partnerem, dojde také k ozna�ení rodiny jako neveřejné. Na rozdíl od nástroje Obnovit Žijicí zde 
---
> 		<p>Vyhledány budou všechny osoby, které zemřely v nedávné minulosti, a budou ozna�eny jako "Neveřejné". Přesný po�et let vychází z volby "Osoba je neveřejná, pokud zemřela před méně než tolika lety"
>     na stránce Nastavení importu. Tam, kde je taková osoba partnerem, dojde také k ozna�ení rodiny jako neveřejné. Na rozdíl od nástroje Obnovit žijicí zde 
diff -r TNG/languages/Czech-UTF8/setup_help.php TNG1403/languages/Czech-UTF8/setup_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,18c12,14
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
< 			<a href="second_help.php" class="lightlink">&laquo; Nápověda: Druhotné procesy</a> &nbsp; | &nbsp;
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
> 			<a href="second_help.php" class="lightlink">&laquo; Nápověda: Nástroje po importu</a> &nbsp; | &nbsp;
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/sources_help.php TNG1403/languages/Czech-UTF8/sources_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32a29,33
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/templateconfig_help.php TNG1403/languages/Czech-UTF8/templateconfig_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
25a22,27
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
>   
28c30
< 			<a href="http://lythgoes.net/genealogy/templates.php">http://lythgoes.net/genealogy/templates.php</a>). Po uložení změn bude nová šablony ú�inkovat.</p>
---
> 			<a href="https://tngsitebuilding.com/templates.php">https://tngsitebuilding.com/templates.php</a>). Po uložení změn bude nová šablony ú�inkovat.</p>
53c55
< 			sekcích pomocí seznamu názvů odkazů a jejich URL na jednom řádku oddělených �árkou. Např. <em>TNG, http://www.tngsitebuilding.com</em>.</p>
---
> 			sekcích pomocí seznamu názvů odkazů a jejich URL na jednom řádku oddělených �árkou. Např. <em>TNG, https://tngsitebuilding.com</em>.</p>
diff -r TNG/languages/Czech-UTF8/text.php TNG1403/languages/Czech-UTF8/text.php
69d68
< 		$text['general'] = "ObecnÄ›";
77a77
> 	case "connections":
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Hledat spojení";
> 		$text['findrel2'] = "Ur�ení příbuzenského vztahu";
> 		$text['makeme2nd'] = "Použít moje ID";
> 		$text['usebookmarks'] = "Použít záložky";
> 		$text['select2inds'] = "Zvolte dvÄ› osoby.";
> 		$text['indinfofor'] = "Osobní informace o";
> 		$text['nobookmarks'] = "Nelze použít žádnou záložku";
> 		$text['bkmtitle'] = "Osoby nalezené v záložkách";
> 		$text['bkminfo'] = "Vybrat osobu:";
> 		$text['sortpathsby'] = "Seřadit cesty podle po�tu";
> 		$text['sortbyshort'] = "Seřadit podle";
> 		$text['bylengthshort'] = "Délka";
> 		$text['badID1'] = ": špatné ID osoby1 – vraťte se prosím zpět a opravte";
> 		$text['badID2'] = ": špatné ID osoby2 – vraťte se prosím zpět a opravte";
> 		$text['notintree'] = ": osoba s tímto ID není v aktuální stromové databázi.";
> 		$text['sameperson'] = "Tyto dvě osoby jsou totožné";;
> 		$text['nopaths'] = "Tyto osoby nejsou spojeny.";
> 		$text['nopaths1'] = "Žádná další připojení kratší než xxx";
> 		$text['nopaths2'] = "v xxx krocích vyhledávání";
> 		$text['longestpath'] = "(nejdelší dosud kontrolovaná cesta byla dlouhá xxx kroků)";
> 		$text['relevantpaths'] = "Po�et nalezených různých relevantních cest: xxx";
> 		$text['skipMarr'] = "(navíc po�et cest nalezených, ale nezobrazených kvůli příliš velkému po�tu sňatků byl: xxx)";
> 		$text['mjaor'] = "nebo";
> 		$text['connectionsto'] = "Spojení k osobě ";
> 		$text['findanotherpers'] = "Najít jinou osobu...";
> 		$text['sometimes'] = "(Použití jiného po�tu generací může mít někdy jiný výsledek.)";
> 		$text['anotherpath'] = "Hledat další spojení";
> 		$text['xpath'] = "Cesta ";
> 		$text['primary'] = "Výchozí osoba"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Cílová osoba";
> 		$text['parent'] = "Rodi�";
> 		$text['mhfather'] = "jeho otec";
> 		$text['mhmother'] = "jeho matka";
> 		$text['mhhusband'] = "jeho manžel";
> 		$text['mhwife'] = "jeho manželka";
> 		$text['mhson'] = "jeho syn";
> 		$text['mhdaughter'] = "jeho dcera";
> 		$text['fhfather'] = "její otec";
> 		$text['fhmother'] = "její matka";
> 		$text['fhhusband'] = "její manžel";
> 		$text['fhwife'] = "její manželka";
> 		$text['fhson'] = "její syn";
> 		$text['fhdaughter'] = "její dcera";
> 		$text['hfather'] = "otec";
> 		$text['hmother'] = "matka";
> 		$text['hhusband'] = "manžel";
> 		$text['hwife'] = "manželka";
> 		$text['hson'] = "syn";
> 		$text['hdaughter'] = "dcera";
> 		$text['maxruns'] = "Maximální po�et cest, který má být zkontrolován";
> 		$text['maxrshort'] = "Max cesty";
> 		$text['maxlength'] = "Spojovací cesty ne delší než";
> 		$text['maxlshort'] = "Max délka";
> 		$text['xstep'] = "krok";
> 		$text['xsteps'] = "kroky";
> 		$text['xmarriages'] = "xxx manželství";
> 		$text['xmarriage'] = "1 manželství";
> 		$text['showspouses'] = "Zobrazit oba partnery";
> 		$text['showTxt'] = "Zobrazit textový popis cesty";
> 		$text['showTxtshort'] = "Textový popis";
> 		$text['compactBox'] = "Zobrazit ráme�ky osob v kompaktní podobě";
> 		$text['compactBoxshort'] = "Kompaktní ráme�ky";
> 		$text['paths'] = "Cesty";
> 		$text['dospouses2'] = "Zobrazit partnery";
> 		$text['maxmopt'] = "Maximální po�et manželství na spojení";
> 		$text['maxm'] = "Maximální po�et manželství";
> 		$text['arerelated'] = "Tyto osoby jsou příbuzní – jejich vztah je znázorněn na cestě 1";
> 		$text['simplerel'] = "Hledat jednoduchý vztah";
177d245
< 		$text['baptizedlds'] = "Křest (CJKSpd)";
196d263
< 		$text['scrollnote'] = "Pozn.: pro zobrazení diagramu můžete použít posuvník dolů nebo doprava.";
199d265
< 		$text['popupnote2'] = " = Nové schéma předků";
263a330,348
> 		//added in 14.0
> 		$text['dtformat'] = "Tabulky";
> 		$text['dtchildren'] = "Děti";
> 		$text['dtgrandchildren'] = "Vnou�ata";
> 		$text['dtggrandchildren'] = "Pravnou�ata";
> 		$text['dtgggrandchildren'] = "Pravnou�ata"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nejsou potomci";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Celkem";
> 		$text['dtselect'] = "Vybrat";
> 		$text['dteachfulltable'] = "Každá plná tabulky bude mít";
> 		$text['dtrows'] = "řádků";
> 		$text['dtdisplayingtable'] = "Zobrazení tabulky";
> 		$text['dtgototable'] = "Přejít na tabulku:";
> 		$text['fcinstrdn'] = "Zobrazit rodinu s partnerem";
> 		$text['fcinstrup'] = "Zobrazit rodinu s rodi�i";
> 		$text['fcinstrplus'] = "Vybrat další partnery";
> 		$text['fcinstrfam'] = "Vybrat další rodi�e";
381,383c466
< 		$text['firstpage'] = "První stránka";
< 		$text['lastpage'] = "Poslední stránka";
< 		$text['photoowner'] = "Majitel/Pramen";
---
> 		$text['photoowner'] = "Vlastník originálu";
435a519,520
> 		//added in 13.0
> 		$text['toggletags'] = "Přepnout zna�ky";
549d633
< 		//changed in 8.0.0
556d639
< 		//added in 8.0.0
560a644,650
> 		//added in 14.0
> 		$text['newpassword2'] = "Nové heslo znovu";
> 		$text['resetsuccess'] = "Úspěch: Heslo bylo obnoveno";
> 		$text['resetfail'] = "Selhání: Heslo nebylo obnoveno";
> 		$text['failreason0'] = " (neznámá chyba databáze)";
> 		$text['failreason2'] = " (nemáte oprávnění ke změně hesla)";
> 		$text['failreason3'] = " (hesla se neshodují)";
591a682,683
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Celkem citací pramenů";
618d709
< 		$text['loginfirst'] = "Nejdříve se musíte přihlásit.";
625a717,718
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Byly zjištěny existující záznamy uživatelů. Chcete-li pokra�ovat, musíte se nejprve přihlásit nebo odebrat všechny záznamy z tabulky uživatelů.";
629,630d721
< 		$text['zoomin'] = "Zvětšit";
< 		$text['zoomout'] = "Zmenšit";
656d746
< 		$text['dna_info_head'] = "Info o testu DNA";
659a750,774
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Porovnat vybrané testy mtDNA";
> 		$text['dnatestscompare_atdna'] = "Porovnat vybrané testy atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNP";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Zvláštní mutace";
> 		$text['mrca'] = "Nejbližší spole�ný předek";
> 		$text['ydna_test'] = "Testy Y-DNA";
> 		$text['mtdna_test'] = "Testy mtDNA (mitochondriální)";
> 		$text['atdna_test'] = "Testy atDNA (autozomální)";
> 		$text['segment_start'] = "Za�átek";
> 		$text['segment_end'] = "Konec";
> 		$text['suggested_relationship'] = "Navrhnuté";
> 		$text['actual_relationship'] = "Aktuální";
> 		$text['12markers'] = "Markery 1-12";
> 		$text['25markers'] = "Markery 13-25";
> 		$text['37markers'] = "Markery 26-37";
> 		$text['67markers'] = "Markery 38-67";
> 		$text['111markers'] = "Markery 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Ke srovnání je třeba vybrat alespoň dva testy.";
670,671d784
< $text['birthabbr'] = "nar.";
< $text['chrabbr'] = "kÅ™.";
675d787
< $text['family'] = "Rodina"; //from getperson
685d796
< $text['deathabbr'] = "zemÅ™.";  //from descend
706d816
< $text['burialabbr'] = "pohÅ™.";  //from descend
712d821
< $text['place'] = "Místo";
715d823
< $text['marrabbr'] = "sň.";
738d845
< $text['source'] = "Pramen";
740c847
< $text['generations'] = "Po�et generací";
---
> $text['generations'] = "Generací";
766d872
< $text['repository'] = "Úložiště";
770d875
< $text['findplaces'] = "Najít všechny osoby s událostmi v tomto místě";
775c880
< $text['fact'] = "Fakt";
---
> $text['fact'] = "Událost";
804d908
< $text['glang'] = "&amp;hl=cs";
816d919
< $text['none'] = "Žádný";
924d1026
< $text['otherevents'] = "Jiné události";
952,953d1053
< $text['people_have'] = "osoby propojily test DNA k";
< $text['person_has'] = "osoba propojila test DNA k";
963,965c1063,1116
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Rychlé odkazy";
> $text['yourname'] = "Vaše jméno";
> $text['youremail'] = "Vaše emailová adresa";
> $text['liketoadd'] = "Jakékoli informace, které chcete přidat";
> $text['webmastermsg'] = "Zpráva webmastera";
> $text['gallery'] = "Zobrazit galerii";
> $text['wasborn_male'] = "se narodil";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "se narodila"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "byl pokřtěn";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "byla pokřtěna";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "zemřel";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "zemřela";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "byl pohřbena"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "byla pohřbena"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "byl zpopelněn";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "byla zpopelněna";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "byl sezdán s";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "byla sezdána s";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "byl rozveden";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "byla rozveda";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " v ";			// used as a preposition to the location
> $text['onthisdate'] = " dne ";		// when used with full date
> $text['inthisyear'] = " v ";		// when used with year only or month / year dates
> $text['and'] = "a ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Info o testu DNA";
> //added in 13.0
> $text['visitor'] = "Návštěvník";
> 
> $text['popupnote2'] = " = Nové schéma předků";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zvětšit";
> $text['zoomout'] = "Zmenšit";
> $text['scrollnote'] = "Přetažením nebo posunutím zobrazíte z grafu více.";
> $text['general'] = "ObecnÄ›";
> 
> //changed in 14.0
> $text['otherevents'] = "Jiné události";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Spojení";
> $text['continue'] = "Pokra�ovat";
> $text['title2'] = "Titul"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Czech-UTF8/tlevents_help.php TNG1403/languages/Czech-UTF8/tlevents_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30a27,31
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/trees_help.php TNG1403/languages/Czech-UTF8/trees_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
16,17c12,13
< 			<a href="http://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31a28,32
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
diff -r TNG/languages/Czech-UTF8/users_help.php TNG1403/languages/Czech-UTF8/users_help.php
6,9d5
< <head>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< </head>
< 
34a31,35
> 		<div id="google_translate_element" style="float:right"></div><script type="text/javascript">
> 		function googleTranslateElementInit() {
> 		  new google.translate.TranslateElement({pageLanguage: 'en'}, 'google_translate_element');
> 		}
> 		</script><script type="text/javascript" src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
177a179,181
>     
>     <span class="optionhead">Povolit zobrazení neveřejných poznámek</span>
> 		<p>Uživatel může ve veřejné oblasti prohlížet poznámky ozna�ené jako neveřejné.</p>
diff -r TNG/languages/Danish/admintext.php TNG1403/languages/Danish/admintext.php
5,6c5,6
< 		$admtext['branchlabel'] = "Gren navn";
< 		$admtext['existingbranch'] = "Nuværende gren";
---
> 		$admtext['branchlabel'] = "Grennavn";
> 		$admtext['existingbranch'] = "Eksisterende gren";
21c21
< 		$admtext['enterstartingind'] = "Indtast ID for den person, du vil begynde med";
---
> 		$admtext['enterstartingind'] = "Indtast ID for den person, der skal begyndes med";
29c29
< 		$admtext['confbranchdelete'] = "Er du sikker på, at du vil slette denne gren?";
---
> 		$admtext['confbranchdelete'] = "Er det sikkert, at denne gren skal slettes?";
39c39
< 		$admtext['branchdiscl'] = "Dette antal repræsenterer det totale antal grene, ikke nødvendigvis det antal personer eller familier, der pt. er knyttet til denne gren. Hvis du for nylig har genimporteret dine data, kan det være nødvendigt at gennemgå de enkelte grene igen.";
---
> 		$admtext['branchdiscl'] = "Dette antal repræsenterer det totale antal grene, ikke nødvendigvis det antal personer eller familier, der pt. er knyttet til denne gren. Hvis man for nylig har genimporteret data, kan det være nødvendigt at gennemgå de enkelte grene igen.";
42c42
< 		$admtext['confbrdel'] = "Er du sikker på, at du vil slette alle personer og familier i denne gren?";
---
> 		$admtext['confbrdel'] = "Er det sikkert, at alle personer og familier skal slettes i denne gren?";
47c47
< 		$admtext['mapnotcopied'] = "Kort billedfilen kunne ikke kopieres til";
---
> 		$admtext['mapnotcopied'] = "Kortbilledfilen kunne ikke kopieres til";
49c49
< 		$admtext['modifycemetery'] = "Ændring til nuværende kirkegård";
---
> 		$admtext['modifycemetery'] = "Ændring til eksisterende kirkegård";
54c54
< 		$admtext['confdeletecem'] = "Er du sikker på, at du vil slette denne kirkegård?";
---
> 		$admtext['confdeletecem'] = "Er det sikkert, at denne kirkegård skal slettes?";
58c58
< 		$admtext['mapfilename'] = "Navn på kort filen";
---
> 		$admtext['mapfilename'] = "Navn på kortfilen";
62,63c62,63
< 		$admtext['entermapfile'] = "Indtast et filnavn for din kortfil på Web-serveren.";
< 		$admtext['existingceminfo'] = "Oplysninger om nuværende kirkegård";
---
> 		$admtext['entermapfile'] = "Indtast et filnavn for kortfilen på Web-serveren.";
> 		$admtext['existingceminfo'] = "Oplysninger om eksisterende kirkegård";
67,68c67,68
< 		$admtext['ifmapuploaded'] = "Lad dette felt være tomt, hvis filen allerede er blevet uploaded til din gravstensmappe.";
< 		$admtext['requiredmap'] = "Nødvendigt, hvis du bruger et kort. Dette skal svare til navn og placering af din fil <em>i gravstensmappen,</em> når din fil er uploaded. For eksempel, hvis din gravstensmappe hedder <em>gravsten</em>,	og du vil kalde din fil <em>kort.jpg</em> og lægge den i en gravstensundermappe, der hedder <em>minekort</em>, skal du indtaste <em>minekort/kort.jpg</em> i dette felt.";
---
> 		$admtext['ifmapuploaded'] = "Lad dette felt være tomt, hvis filen allerede er blevet uploaded til gravstensmappen.";
> 		$admtext['requiredmap'] = "Nødvendigt, hvis man bruger et kort. Dette skal svare til navn og placering af filen <em>i gravstensmappen,</em> når filen er uploaded. For eksempel, hvis gravstensmappen hedder <em>gravsten</em>,	og man vil kalde filen <em>kort.jpg</em> og lægge den i en gravstensundermappe, der hedder <em>minekort</em>, skal der indtastes <em>minekort/kort.jpg</em> i dette felt.";
71c71
< 		$admtext['fillplace'] = "Udfyld Sted";
---
> 		$admtext['fillplace'] = "Udfyld sted";
80,81c80
< 		$admtext['pleaseenter'] = "Skriv venligst en ";
< 		$admtext['netscapereload'] = "Netscape brugere: <br>Du skal geninstallere kirkegårdssiden for at se din nye";
---
> 		$admtext['netscapereload'] = "Netscape brugere: <br>Siden med Kirkegårde skal genopfriskes for at se den nye";
126c125
< 		$admtext['invfperms'] = "Din 'gedcom' mappe har måske utilstrækkelige rettigheder (prøv 755 eller 777).";
---
> 		$admtext['invfperms'] = "gedcom mappen har måske utilstrækkelige rettigheder (prøv 755 eller 777).";
128c127,162
< 		$admtext['turnonsis'] = "Vær sikker på, at 'Gem Importstatus' er valgt i Importindstillinger.";
---
> 		$admtext['turnonsis'] = "Vær sikker på, at 'Gem importstatus' er valgt i Importindstillinger.";
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Vælg den fil, der skal importeres.";
> 		$admtext['addreplacedata'] = "Tilføj til eller erstat dit slægtstræ (dette kan tage flere minutter afhængig af filstørrelsen)";
> 		$admtext['fromyourcomputer'] = "Fra computeren";
> 		$admtext['importdata'] = "Importer data";
> 		$admtext['replace'] = "Erstat (i det valgte træ)";
> 		$admtext['desttree'] = "Destinationstræ";
> 		$admtext['selectdesttree'] = "Vælg eller indtast et destinationstræ.";
> 		$admtext['selectexisting'] = "Importer ind i";
> 		$admtext['ucaselast'] = "Skriv alle efternavne med versaler";
> 		$admtext['norecalc'] = "Udfør ikke genberegninger for 'nulevende'-markeringer";
> 		$admtext['autooffset'] = "Begynd ID'er ved første ledige nummer";
> 		$admtext['mustselecttree'] = "Man skal vælge et træ, før man vælger denne mulighed.";
> 		$admtext['onwebserver'] = "Fra webserver (i GEDCOM-mappen)";
> 		$admtext['imphints'] = "OBS: Med “Alle aktuelle data” menes alle personer, familier, kilder og notater (medietilknytninger går ikke tabt, så længe ID'erne er de samme). Matchende poster baseres altid kun på ID'er. Nye poster tilføjes altid. Med “Tilføj alle poster” menes alle poster med nye ID'er.";
> 		$admtext['destbranch'] = "Destination for gren (valgfri)";
> 		$admtext['importlatlong'] = "Importér bredde- og længdegrad hvis de findes";
> 		$admtext['opening'] = "Åbner";
> 		$admtext['reopen'] = "Genåbner";
> 		$admtext['uploading'] = "Uploader";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import stoppet";
> 		$admtext['resume'] = "Fortsæt";
> 		$admtext['neweronly'] = "Erstat kun hvis nyere";
> 		$admtext['oldimport'] = "Gammeldags import (uden forløbsbjælke)";
> 		$admtext['importgedcom'] = "Importér GEDCOM-fil (kan være zippet)";
> 		$admtext['stopbackup'] = "Stop! Man bør sikkerhedskopiere databasen, før man fortsætter.";
> 		$admtext['importmedia'] = "Importér links til nuværende billeder m.m.";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Sørg for at præfikser og suffikser (fra Generelle Indstillinger) er korrekte i denne fil.";
> 		$admtext['chkimpsettings'] = "Tjek Import indstillinger for flere muligheder.";
> 		$admtext['eventsonly'] = "Importér begivenhedstyper og egenskaber (ingen data bliver erstattet eller tilføjet)";
> 		$admtext['allevents'] = "Godkend data for alle nye begivenheds typer og egenskaber";
> 		$admtext['finishingimporting'] = "Afslutter...";
> 		$admtext['fileuploadfailed'] = "Upload af filen mislykkedes. Dette kunne skyldes, at filen er for stor. Brug FTP til at uploade filen til GEDCOM mappen, og derefter vælg filen og importér den.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Ændre nuværende begivenhedstype";
135,138d168
< 		$admtext['entertypedesc'] = "Indtast en type/beskrivelse for denne nye begivenhedstype.";
< 		$admtext['enterdisplay'] = "Indtast tekst, der skal vises for denne nye begivenhedstype.";
< 		$admtext['existingeventtypeinfo'] = "Nuværende begivenhedstype oplysninger";
< 		$admtext['neweventtypeinfo'] = "Ny begivenhedstype oplysninger";
145,146d174
< 		$admtext['addnewevtype'] = "Tilføj ny begivenhedstype";
< 		$admtext['createnewevtype'] = "Opret en ny begivenhedstype";
149,150d176
< 		$admtext['existingevtypes'] = "Nuværende begivenhedstyper";
< 		$admtext['edsevtypes'] = "Redigér, slet eller sorter tidligere tilføjede begivenhedstyper";
152,154c178
< 		$admtext['confdeleteevtype'] = "Er du sikker på, at du vil slette denne begivenhedstype?";
< 		$admtext['selecttag'] = "Vælg Gedcom kode";
< 		$admtext['selectentertag'] = "Vælg venligst Gedcom koden for denne begivenhedstype.";
---
> 		$admtext['selecttag'] = "Vælg gedcom-kode";
167c191
< 		$admtext['CREM'] = "Kremeret";
---
> 		$admtext['CREM'] = "Kremering";
208d231
< 		$admtext['changestoallevtypes'] = "Ændringer for alle begivenhedstyper";
214,215c237
< 		$admtext['BAPM'] = "Dåb";
< 		$admtext['umps'] = "Din GEDCOM-fil er muligvis større end den maksimalt tilladte størrelse iht. din PHP installation. Du kan bede din leverandør om at øge den tilladte størrelse, eller du kan kopiere din fil til 'gedcom' -mappen på din hjemmeside og importere filen derfra i stedet for.;";
---
> 		$admtext['umps'] = "GEDCOM-filen er muligvis større end den maksimalt tilladte størrelse iht. PHP-installationen. Man kan bede udbyderen om at øge den tilladte størrelse, eller man kan kopiere filen til 'gedcom'-mappen på serveren og importere filen derfra i stedet for.;";
220,222c242,244
< 		$admtext['collapseev'] = "Kollaps  Begivenhed";
< 		$admtext['collapse'] = "Kollaps";
< 		$admtext['collapseselected'] = "Kollaps Valgt";
---
> 		$admtext['collapseev'] = "Fold begivenheder sammen";
> 		$admtext['collapse'] = "Fold sammen";
> 		$admtext['collapseselected'] = "Fold sammen valgt";
224c246
< 		$admtext['expselected'] = "Udvid Valgte";
---
> 		$admtext['expselected'] = "Udvid valgte";
226c248,262
< 		$admtext['ldsevent'] = "LDS Begivenhed";
---
> 		$admtext['ldsevent'] = "SDH Begivenhed";
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Er det sikkert, at denne begivenhedstype skal slettes?";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Tilføj ny Type";
> 		$admtext['createnewevtype'] = "Opret en ny egenskab eller begivenhedstype";
> 		$admtext['modifyeventtype'] = "Redigér Nuværende Type";
> 		$admtext['entertypedesc'] = "Indtast en type eller beskrivelse for denne nye egenskab eller begivenhedstype.";
> 		$admtext['enterdisplay'] = "Indtast en visningsstreng for denne nye egenskab eller begivenhedstype.";
> 		$admtext['existingeventtypeinfo'] = "Oplysninger om nuværende egenskab eller begivenhedstype";
> 		$admtext['neweventtypeinfo'] = "Oplysninger om ny egenskab eller begivenhedstype";
> 		$admtext['existingevtypes'] = "Nuværende Egenskabs- eller Begivenhedstyper";
> 		$admtext['edsevtypes'] = "Redigér, slet eller sortér tidligere indtastede egenskaber og begivenhedstyper";
> 		$admtext['selectentertag'] = "Vælg eller indtast tagget for denne egenskab eller begivenhedstype.";
> 		$admtext['changestoallevtypes'] = "Ændringer af alle egenskabs- eller begivenhedstyper";
233c269
< 		$admtext['modifyfamily'] = "Redigér nuværende familie";
---
> 		$admtext['modifyfamily'] = "Redigér eksisterende familie";
235,239c271,275
< 		$admtext['confdeletefam'] = "Er du sikker på, at du vil slette denne familie?";
< 		$admtext['existingfamilyinfo'] = "Nuværende oplysninger for familie";
< 		$admtext['newfamilyinfo'] = "Ny familie oplysninger";
< 		$admtext['sealedsdate'] = "Beseglet dato (LDS)";     //S is for spouse
< 		$admtext['sealedsplace'] = "Beseglet sted (LDS)";     //S is for spouse
---
> 		$admtext['confdeletefam'] = "Er det sikkert, at denne familie skal slettes?";
> 		$admtext['existingfamilyinfo'] = "Oplysninger om eksisterende familie";
> 		$admtext['newfamilyinfo'] = "Oplysninger om ny familie";
> 		$admtext['sealedsdate'] = "Beseglet dato (SDH)";     //S is for spouse
> 		$admtext['sealedsplace'] = "Beseglet sted (SDH)";     //S is for spouse
242c278
< 		$admtext['createnewfamily'] = "Opret en ny familie";
---
> 		$admtext['createnewfamily'] = "Opret ny familie";
268,269c304
< 		$admtext['nobirthinfo'] = "Ingen fødselsinfo";
< 		$admtext['modifyperson'] = "Redigér nuværende person";
---
> 		$admtext['modifyperson'] = "Redigér eksisterende person";
271c306
< 		$admtext['existingpersoninfo'] = "Nuværende oplysninger for person";
---
> 		$admtext['existingpersoninfo'] = "Oplysninger om eksisterende person";
277,279c312,314
< 		$admtext['bapldate'] = "Dåbsdato (LDS)";
< 		$admtext['baplplace'] = "Dåbssted (LDS)";
< 		$admtext['endldate'] = "Begavelsesdato (LDS)";
---
> 		$admtext['bapldate'] = "Dåbsdato (SDH)";
> 		$admtext['baplplace'] = "Dåbssted (SDH)";
> 		$admtext['endldate'] = "Begavelsesdato (SDH)";
285,286c320,321
< 		$admtext['sealedpdate'] = "Beseglet dato (LDS)";     //P is for parents
< 		$admtext['sealedpplace'] = "Beseglet sted (LDS)";     //P is for parents
---
> 		$admtext['sealedpdate'] = "Beseglet dato (SDH)";     //P is for parents
> 		$admtext['sealedpplace'] = "Beseglet sted (SDH)";     //P is for parents
291c326
< 		$admtext['nonewfamily'] = "Vil du gå til ny familie ved gem";
---
> 		$admtext['nonewfamily'] = "Gå ikke til ny familie efter gem";
294c329
< 		$admtext['personidbefevent'] = "Du skal indtaste et person-ID, før du kan tilføje en ny begivenhed.";
---
> 		$admtext['personidbefevent'] = "Man skal indtaste et person-ID, før man kan tilføje en ny begivenhed.";
297c332
< 		$admtext['newpersoninfo'] = "Ny person oplysninger";
---
> 		$admtext['newpersoninfo'] = "Oplysninger om ny person";
302,304c337,339
< 		$admtext['personidbefnote'] = "Du skal indtaste et person-ID, før du kan tilføje nye notater.";
< 		$admtext['endlplace'] = "Begavelsessted (LDS)";
< 		$admtext['personidbefcite'] = "Du skal indtaste et person-ID, før du kan bruge henvisninger med denne person.";
---
> 		$admtext['personidbefnote'] = "Man skal indtaste et person-ID, før man kan tilføje nye notater.";
> 		$admtext['endlplace'] = "Begavelsessted (SDH)";
> 		$admtext['personidbefcite'] = "Man skal indtaste et person-ID, før man kan bruge henvisninger med denne person.";
310c345
< 		$admtext['sdxdisclaimer'] = "Hvis du bruger denne mulighed, vil det tage programmet længere tid at finde næste match eller dublet.";
---
> 		$admtext['sdxdisclaimer'] = "Hvis man bruger denne mulighed, vil det tage programmet længere tid at finde næste match eller dublet.";
312c347
< 		$admtext['confirmmerge'] = "Er du sikker på, at du vil flette disse to personer?";
---
> 		$admtext['confirmmerge'] = "Er det sikkert, at disse to personer skal flettes?";
323c358
< 		$admtext['modifyassoc'] = "Tilpas nuværende tilknytning";
---
> 		$admtext['modifyassoc'] = "Tilpas eksisterende tilknytning";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Vælg<br/>standard<br/>foto"; //has to fit in a small box
335,338c368,376
< 		$admtext['confdate'] = "Konfirmations Dato (LDS)";
< 		$admtext['confplace'] = "Konfirmations Sted (LDS)";
< 		$admtext['initdate'] = "Forberedende Dato (LDS)";
< 		$admtext['initplace'] = "Forberedende Sted (LDS)";
---
> 		$admtext['confdate'] = "Bekræftelsesdato (SDH)";
> 		$admtext['confplace'] = "Bekræftelsessted (SDH)";
> 		$admtext['initdate'] = "Forberedende dato (SDH)";
> 		$admtext['initplace'] = "Forberedende sted (SDH)";
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Gem + Nye Forældre";
> 		$admtext['savenewspouse'] = "Gem + Ny Partner";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Dåb";
344c382
< 		$admtext['thumbnailnotcopied'] = "Thumbnail-filen kunne ikke kopieres til";
---
> 		$admtext['thumbnailnotcopied'] = "Miniature-filen kunne ikke kopieres til";
347c385
< 		$admtext['modifyphoto'] = "Redigér nuværende billede";
---
> 		$admtext['modifyphoto'] = "Redigér eksisterende billede";
351,354c389,391
< 		$admtext['confdeletephoto'] = "Er du sikker på, at du vil slette dette billede og alle links forbundet med det?";
< 		$admtext['enterphotopath'] = "Indtast venligst stien (mappe og filnavn) for billedfilen i billedmappen på din webserver.";
< 		$admtext['enterthumbnailpath'] = "Indtast venligst stien (mappe og filnavn) for thumbnailfilen i billedmappen på din webserver.";
< 		$admtext['enterphotodesc'] = "Indtast venligst en beskrivelse af billedet.";
---
> 		$admtext['confdeletephoto'] = "Er det sikkert, at dette billede og alle dets links skal slettes?";
> 		$admtext['enterphotopath'] = "Indtast stien (mappe og filnavn) for billedfilen i billedmappen på serveren.";
> 		$admtext['enterthumbnailpath'] = "Indtast venligst stien (mappe og filnavn) for miniature-filen i billedmappen på serveren.";
357c394
< 		$admtext['thumbnailfile'] = "Thumbnail-fil";
---
> 		$admtext['thumbnailfile'] = "Miniature-fil";
360,361c397,398
< 		$admtext['sortphotos'] = "Sorter billeder";
< 		$admtext['sortphotosfor'] = "Sorter billeder for";
---
> 		$admtext['sortphotos'] = "Sortér billeder";
> 		$admtext['sortphotosfor'] = "Sortér billeder for";
369c406
< 		$admtext['confdeletehs'] = "Er du sikker på, at du vil slette denne gravsten?";
---
> 		$admtext['confdeletehs'] = "Er det sikkert, at denne gravsten skal slettes?";
371,374c408,411
< 		$admtext['selectcemetery'] = "Vælg venligst en kirkegård";
< 		$admtext['enterhsimage'] = "Indtast venligst et filnavn for dit gravstensbillede på webserveren.";
< 		$admtext['existinghsinfo'] = "Oplysninger om nuværende gravsten";
< 		$admtext['newhsinfo'] = "Ny gravstens oplysninger";
---
> 		$admtext['selectcemetery'] = "Vælg en kirkegård";
> 		$admtext['enterhsimage'] = "Indtast et filnavn for gravstensbilledet på webserveren.";
> 		$admtext['existinghsinfo'] = "Oplysninger om eksisterende gravsten";
> 		$admtext['newhsinfo'] = "Oplysninger om ny gravsten";
380,381c417,418
< 		$admtext['leaveblankhs'] = "Lad dette felt være tomt, hvis filen allerede er uploaded til din gravstensmappe.";
< 		$admtext['requiredhs'] = "Nødvendigt. Dette skal svare til navn og placeringen for din fil <em>i gravstensmappen</em> når filen er uploadet. For eksempel, hvis din gravstensmappe hedder, <em>fotografier/gravsten</em>, og du vil kalde din fil <em>gravsten.jpg</em> og lægge den i en undermappe til fotografier/gravsten, der hedder <em>nyegravsten</em>, skal du indtaste <em>nyegravsten/gravsten.jpg</em> i dette felt.";
---
> 		$admtext['leaveblankhs'] = "Lad dette felt være tomt, hvis filen allerede er uploaded til gravstensmappen.";
> 		$admtext['requiredhs'] = "Nødvendigt. Dette skal svare til navn og placering af filen <em>i gravstensmappen</em> når filen er overført. For eksempel, hvis gravstensmappen hedder, <em>fotografier/gravsten</em>, og filen hedder <em>gravsten.jpg</em> og den skal lægges i en undermappen til fotografier/gravsten, der hedder <em>nyegravsten</em>, skal man indtaste <em>nyegravsten/gravsten.jpg</em> i dette felt.";
388d424
< 		$admtext['photoowner'] = "Ejer";
394c430
< 		$admtext['genthumbs'] = "Opret Thumbnails";
---
> 		$admtext['genthumbs'] = "Opret Miniaturer";
396c432
< 		$admtext['thumbsgenerated'] = "Thumbnails oprettet";
---
> 		$admtext['thumbsgenerated'] = "Miniaturer er blevet oprettet";
399c435
< 		$admtext['recsupdated'] = "Posterne er opdateret";
---
> 		$admtext['recsupdated'] = "Posterne er blevet opdaterede";
402,404c438,440
< 		$admtext['sortheadstones'] = "Sorter gravsten";
< 		$admtext['sortheadstonesfor'] = "Sorter gravsten for";
< 		$admtext['sortheadstonesind'] = "Sorter gravsten for en person";
---
> 		$admtext['sortheadstones'] = "Sortér gravsten";
> 		$admtext['sortheadstonesfor'] = "Sortér gravsten for";
> 		$admtext['sortheadstonesind'] = "Sortér gravsten for en person";
417d452
< 		$admtext['imgmap'] = "Billedkort";
435c470
< 		$admtext['abspath'] = "Dette billede kommer fra en ekstern kilde (du skal selv skaffe en thumbnail)";
---
> 		$admtext['abspath'] = "Dette billede kommer fra en ekstern kilde (man skal selv skaffe en miniature)";
439c474
< 		$admtext['defphotonote'] = "Brug thumbnailen for dette billede til at identificere denne person, familie eller kilde på anetavle og andre kort, inklusive familiegruppekort.";
---
> 		$admtext['defphotonote'] = "Brug miniaturen for dette billede til at identificere denne person, familie eller kilde på anetavle og andre kort, inklusive familiegruppekort.";
441,443c476,478
< 		$admtext['requiredphoto'] = "Nødvendigt. Dette skal svare til navn og placering for din fil <em>i billedmappen,</em> når filen er uploadet. For eksempel, hvis billedmappen hedder <em>fotografier</em>, og du vil kalde din fil <em>mitbillede.jpg</em> og lægge den i en undermappe, der hedder <em>nyefotografier</em>, skal du indtaste <em>nyefotografier/mitbillede.jpg</em> i dette felt.";
< 		$admtext['leaveblankphoto'] = "Lad dette felt være tomt, hvis filen allerede er uploaded til din billedmappe.";
< 		$admtext['thumbconflicts'] = "Thumbnails ikke oprettet på grund af sti-, tilladelses- eller filnavnproblemer";
---
> 		$admtext['requiredphoto'] = "Nødvendigt. Dette skal svare til navn og placering af filen <em>i billedmappen,</em> når filen er uploadet. For eksempel, hvis billedmappen hedder <em>fotografier</em>, og filen skal hedde <em>mitbillede.jpg</em> og lægges i en undermappe, der hedder <em>nyefotografier</em>, skal man indtaste <em>nyefotografier/mitbillede.jpg</em> i dette felt.";
> 		$admtext['leaveblankphoto'] = "Lad dette felt være tomt, hvis filen allerede er uploaded til billedmappen.";
> 		$admtext['thumbconflicts'] = "Miniatuer er ikke blevet oprettet på grund af sti-, tilladelses- eller filnavnproblemer";
450,452c485,487
< 		$admtext['confdeletemedia'] = "Er du sikker på, at du vil slette dette billede?";
< 		$admtext['thumbnails'] = "Miniaturebilleder";
< 		$admtext['modifyalbum'] = "Tilpas nuværende album";
---
> 		$admtext['confdeletemedia'] = "Er det sikkert, at dette billede skal slettes?";
> 		$admtext['thumbnails'] = "Miniaturer";
> 		$admtext['modifyalbum'] = "Tilpas eksisterende album";
455c490
< 		$admtext['confdeletealbum'] = "Er du sikker på, at du vil slette dette album?";
---
> 		$admtext['confdeletealbum'] = "Er det sikkert, at dette album skal slettes?";
474,475c509,510
< 		$admtext['sortmediaind'] = "Sorter billeder for person, familie, kilde, arkiv eller sted";
< 		$admtext['sortmedia'] = "Sorter xxx for";
---
> 		$admtext['sortmediaind'] = "Sortér billeder for person, familie, kilde, arkiv eller sted";
> 		$admtext['sortmedia'] = "Sortér xxx for";
477,478c512,513
< 		$admtext['samepaths'] = "Det foretrukne billede og thumbnail'en er muligvis ikke samme fil. Vælg et andet thumbnail, eller få lavet et.";
< 		$admtext['regenerate'] = "Genskab nuværende thumbnails";
---
> 		$admtext['samepaths'] = "Det foretrukne billede og miniaturen er muligvis ikke samme fil. Vælg en anden miniature, eller opret en.";
> 		$admtext['regenerate'] = "Gendan nuværende miniaturer";
484c519
< 		$admtext['controller'] = "Tillad ca. 16 vertikale pixels for medieafspiller kontrollen.";
---
> 		$admtext['controller'] = "Tillad ca. 16 vertikale pixels for medieafspillerkontrollen.";
489,491c524,525
< 		$admtext['mapinstr2'] = "Tilknyt et udsnit af dit billede til forskellige personer eller andre sider (valgfrit) ved at udfylde HTML billedkortet nedenfor, eller ved at følge instruktionen ved billedet herunder.";
< 		$admtext['mapinstr3'] = "For at knytte et udsnit af dette billede til en person, skal man først vælge den enkeltes træ og derefter oprette et rektangel for det ønskede udsnit. Dette gøres ved at klikke i øverste venstre hjørne af udsnittet og derefter trække til det nederste højre hjørne. Eller man kan klikke i øverste venstre hjørne og derefter i det nederste højre hjørne. En pop op boks vil så hjælpe til med at vælge personen. Når valget er foretaget, vil koordinaterne for udsnittet blive tilføjet i boksen nedenfor. Gentag denne metode for yderligere udsnit.";
< 		$admtext['albumlinks'] = "Album links";
---
> 		$admtext['mapinstr2'] = "Tilknyt et udsnit af dit billede til forskellige personer eller andre sider (valgfrit) ved at udfylde HTML-billedkortet nedenfor, eller ved at følge instruktionen ved billedet herunder.";
> 		$admtext['albumlinks'] = "Albumlinks";
493c527
< 		$admtext['invlinkmsg'] = "Du har indtastet en ugyldig ID. Der blev ikke lavet et link.";
---
> 		$admtext['invlinkmsg'] = "Der er indtastet et ugyldigt ID. Der blev ikke oprettet noget link.";
495,496c529
< 		$admtext['removelink'] = "Slet dette link";
< 		$admtext['confremmedia'] = "er du sikker på, at du vil slette dette billede fra albummet?";
---
> 		$admtext['confremmedia'] = "er det sikkert, at dette billede skal slettes fra albummet?";
499c532
< 		$admtext['existmedia'] = "Nuværende billeder";
---
> 		$admtext['existmedia'] = "Eksisterende billeder";
502d534
< 		$admtext['eloptions'] = "Gennemse eller slet";
509d540
< 		$admtext['nolinks'] = "Der er endnu ingen links";
513c544
< 		$admtext['uplsel'] = "Upload en ny fil fra din pc eller vælg en fil, der allerede er på din hjemmeside";
---
> 		$admtext['uplsel'] = "Upload en ny fil fra computeren eller vælg en fil, der allerede er på websiden";
515c546
< 		$admtext['medlater'] = "Bemærk: På næste side kan der tilføjes yderligere oplysninger, og emnet kan linkes til personer eller familier.";
---
> 		$admtext['medlater'] = "Bemærk: På næste side kan der tilføjes yderligere oplysninger, og mediet kan linkes til personer eller familier.";
523c554
< 		$admtext['colldisplay'] = "Display Title";
---
> 		$admtext['colldisplay'] = "Vis titel";
532,535c563,566
< 		$admtext['confmtdelete'] = "Er du sikker på, at du vil slette denne billedtype?";
< 		$admtext['histlimit'] = "<strong>Bemærk!</strong> De fleste browsere begrænser datamængden, der kan sendes i et webskema til omkring 64 kb. Hvis du har meget tekst, der skal indtastes i eller kopieres til tekstfeltet ovenfor, kan du i stedet overveje at bruge historytemplate.php. Slå op i Hjælp for yderligere oplysninger.";
< 		$admtext['repath'] = "Genskab thumbnail sti navne, hvor fil ikke findes";
< 		$admtext['sortalbumind'] = "Sorter albummer for en person, familie, kilde, arkiv eller sted.";
---
> 		$admtext['confmtdelete'] = "Er det sikkert, at denne billedtype skal slettes?";
> 		$admtext['histlimit'] = "<strong>Bemærk!</strong> De fleste browsere begrænser datamængden, der kan sendes i et webskema til omkring 64 kb. Hvis der er meget tekst, der skal indtastes i eller kopieres til tekstfeltet ovenfor, kan man i stedet overveje at bruge historytemplate.php. Slå op i Hjælp for yderligere oplysninger.";
> 		$admtext['repath'] = "Genskab miniature stinavne, hvor fil ikke findes";
> 		$admtext['sortalbumind'] = "Sortér albummer for en person, familie, kilde, arkiv eller sted.";
538d568
< 		//added in 8.0.0
540c570
< 		$admtext['collthumb'] = "Thumbnail fil";
---
> 		$admtext['collthumb'] = "Miniature-fil";
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
547c575
< 		$admtext['mediaupl'] = "Upload Medie";
---
> 		$admtext['mediaupl'] = "Upload medie";
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Billed Kort (for bagud kompatibilitet)";
> 		$admtext['photoowner'] = "Ejer af Originalen";
> 		$admtext['nothumb'] = "Ingen miniature";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Elementet kunne ikke tilføjes, sandsynligvis fordi filen var for stor og ikke kunne uploades eller filen bruges til at oprette et miniaturebillede.";
> 		$admtext['moved'] = "Flyttet";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Indtast en titel eller beskrivelse for dette medie.";
> 		$admtext['mapinstr3'] = "For at knytte et område af dette billede til en person eller en familie eller anden enhed, skal man først vælge et træ og enhedstype, og derefter opretter man et rektangel for det ønskede område. Dette gøres ved at klikke i øverste venstre hjørne af området og derefter trække til nederste højre hjørne. Eller man kan klikke i øverste venstre hjørne og derefter klikker man i nederste højre hjørne. Et pop-op-vindue hjælper derefter med at vælge personen eller en anden enhed. Foretag et valg, og gentag derefter dette forløb efter behov for andre områder i billedet. Klik på et eksisterende område for at vælge det, og træk derefter for at flytte det eller klik på 'X' for at slette det.";
561,562c599,600
< 		$admtext['modifyreport'] = "Redigér nuværende rapport";
< 		$admtext['existingreportinfo'] = "Nuværende oplysninger om rapport";
---
> 		$admtext['modifyreport'] = "Redigér eksisterende rapport";
> 		$admtext['existingreportinfo'] = "Oplysninger om eksisterende rapport";
564c602
< 		$admtext['newreportinfo'] = "Ny rapport oplysninger";
---
> 		$admtext['newreportinfo'] = "Oplysninger om ny rapport";
571,578c609,616
< 		$admtext['ldsbapldate'] = "LDS dåbsdato";
< 		$admtext['ldsbaplplace'] = "LDS dåbssted";
< 		$admtext['ldsendldate'] = "LDS begavelsesdato";
< 		$admtext['ldsendlplace'] = "LDS begavelsessted";
< 		$admtext['ldssealsdate'] = "LDS beseglingdato/ægtefælle";
< 		$admtext['ldssealsplace'] = "LDS beseglingssted/ægtefælle";
< 		$admtext['ldssealpdate'] = "LDS beseglingsdato/forældre";
< 		$admtext['ldssealpplace'] = "LDS beseglingssted/forældre";
---
> 		$admtext['ldsbapldate'] = "SDH dåbsdato";
> 		$admtext['ldsbaplplace'] = "SDH dåbssted";
> 		$admtext['ldsendldate'] = "SDH begavelsesdato";
> 		$admtext['ldsendlplace'] = "SDH begavelsessted";
> 		$admtext['ldssealsdate'] = "SDH beseglingdato/ægtefælle";
> 		$admtext['ldssealsplace'] = "SDH beseglingssted/ægtefælle";
> 		$admtext['ldssealpdate'] = "SDH beseglingsdato/forældre";
> 		$admtext['ldssealpplace'] = "SDH beseglingssted/forældre";
596,597c634
< 		$admtext['foremptystring'] = "For en tom streng, lad dette felt være tomt, og klik \"Tilføj >>.\"";
< 		$admtext['choosesort'] = "Vælg sorter felter";
---
> 		$admtext['choosesort'] = "Vælg 'Sortér felter'";
603c640
< 		$admtext['confreportdelete'] = "Er du sikker på, at du vil slette denne rapport?";
---
> 		$admtext['confreportdelete'] = "Er det sikkert at denne rapport skal slettes?";
614,617c651,654
< 		$admtext['ldsbapldatetr'] = "LDS dåbsdato (Sand)";
< 		$admtext['ldsendldatetr'] = "LDS begavelsesdato (Sand)";
< 		$admtext['ldssealsdatetr'] = "LDS beseglingsdato/ægtefælle (Sand)";
< 		$admtext['ldssealpdatetr'] = "LDS beseglingsdato/forældre (Sand)";
---
> 		$admtext['ldsbapldatetr'] = "SDH dåbsdato (Sand)";
> 		$admtext['ldsendldatetr'] = "SDH begavelsesdato (Sand)";
> 		$admtext['ldssealsdatetr'] = "SDH beseglingsdato/ægtefælle (Sand)";
> 		$admtext['ldssealpdatetr'] = "SDH beseglingsdato/forældre (Sand)";
633c670
< 		$admtext['confremmw'] = "Er du sikker på, at du vil fjerne dette emne?";
---
> 		$admtext['confremmw'] = "Er det sikkert, at dette emne skal fjernes?";
635d671
< 		//added in 9.1.1
639,644c675,680
< 		$admtext['ldsconfdate'] = "LDS Bekræftelses Dato";
< 		$admtext['ldsconfplace'] = "LDS Bekræftelses Sted";
< 		$admtext['ldsconfdatetr'] = "LDS Bekræftelses Dato (Sand)";
< 		$admtext['ldsinitdate'] = "LDS Forberedende Dato";
< 		$admtext['ldsinitplace'] = "LDS Forberedende Sted";
< 		$admtext['ldsinitdatetr'] = "LDS Forberedende Dato (Sand)";
---
> 		$admtext['ldsconfdate'] = "SDH Bekræftelsesdato";
> 		$admtext['ldsconfplace'] = "SDH Bekræftelsessted";
> 		$admtext['ldsconfdatetr'] = "SDH Bekræftelsessato (Sand)";
> 		$admtext['ldsinitdate'] = "SDH Forberedende dato";
> 		$admtext['ldsinitplace'] = "SDH Forberedende sted";
> 		$admtext['ldsinitdatetr'] = "SDH Forberedende dato (Sand)";
646c682,686
< 		$admtext['activeonly'] = "Kun Aktive";
---
> 		$admtext['activeonly'] = "Kun aktive";
> 		//added in 14.0
> 		$admtext['instr'] = "Instruktioner: Træk eller dobbeltklik på elementer til venstre for at tilføje dem til listen til højre. Træk elementerne op eller ned for at omarrangere dem. Dobbeltklik for at fjerne elementerne.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For en tom streng, lad dette felt stå tomt og klik >>";
651,655d690
< 		$admtext['selectimportfile'] = "Vælg den fil, du vil importere.";
< 		$admtext['importgedcom'] = "Importer GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Tilføj til eller erstat dit slægtstræ (dette kan tage flere minutter afhængig af filstørrelsen)";
< 		$admtext['fromyourcomputer'] = "Fra din computer";
< 		$admtext['importdata'] = "Importer data";
657,660d691
< 		$admtext['replace'] = "Erstat (i det valgte træ)";
< 		$admtext['desttree'] = "Destinationstræ";
< 		$admtext['selectdesttree'] = "Vælg eller indtast et destinationstræ.";
< 		$admtext['selectexisting'] = "Importer ind i";
668,673d698
< 		$admtext['ucaselast'] = "Skriv alle efternavne med stort";
< 		$admtext['norecalc'] = "Udfør ikke genberegninger for 'nulevende'-markeringer";
< 		$admtext['autooffset'] = "Begynd ID'er ved første ledige nummer";
< 
< 		$admtext['mustselecttree'] = "Du skal vælge et træ, før du vælger denne option.";
< 		$admtext['importmedia'] = "Importér nuværende billeder m.m.";
675,692c700
< 		$admtext['neweronly'] = "Erstat kun hvis nyere";
< 		$admtext['secondaryitems'] = "Opret en GENDEX fil, spor efterkommerlinjer";
< 		$admtext['onwebserver'] = "Fra webserver (i GEDCOM-mappen)";
< 		$admtext['eventsonly'] = "Importer kun standard begivenhedstyper";
< 		$admtext['imphints'] = "OBS: Med “Alle aktuelle data” menes alle personer, familier, kilder og notater (medie tilknytninger går ikke tabt, så længe ID'erne er de samme). Matchende poster baseres altid kun på ID'er. Nye poster tilføjes altid. Med “Tilføj alle poster” menes alle poster med nye ID'er.";
< 		$admtext['allevents'] = "Acceptér data for alle nye almindelige begivenhedstyper";
< 		$admtext['destbranch'] = "Destination for gren (valgfri)";
< 		$admtext['inframe'] = "(i ramme)";
< 		$admtext['getstart'] = "Kom i gang";
< 		$admtext['importlatlong'] = "Importér bredde- og længdegrad hvis de findes";
< 		$admtext['opening'] = "Åbner";
< 		$admtext['reopen'] = "Genåbner";
< 		$admtext['uploading'] = "Uploader";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stoppet";
< 		$admtext['resume'] = "Fortsæt";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Admin Log";
---
> 		$admtext['secondaryitems'] = "Opret en GENDEX-fil, spor efterkommerlinjer";
694,696c702
< 		$admtext['mmgritems'] = "Konfigurer 3-parts tilføjelser";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Gammeldags import (uden forløbsbjælke)";
---
> 		$admtext['mmgritems'] = "Konfigurer 3.-parts tilføjelser";
698c704
< 		$admtext['miscitems'] = "Nyheder, Mest eftersøgte, Data Validering";
---
> 		$admtext['miscitems'] = "Nyheder, Mest eftersøgte, Datavalidering";
700,701c706,707
< 		$admtext['tasks'] = "Vigtige Opgaver";
< 		$admtext['task_revusers'] = "Gennemse nye bruger registreringer";
---
> 		$admtext['tasks'] = "Vigtige opgaver";
> 		$admtext['task_revusers'] = "Gennemse nye brugerregistreringer";
706,710c712,716
< 		$admtext['task_revind'] = "Gennemse foreslåede ændringer til person begivenheder";
< 		$admtext['task_revfam'] = "Gennemse foreslåede ændringer til familie begivenheder";
< 		$admtext['task_backup'] = "Backup data";
< 		$admtext['nobackups'] = "Der findes ingen backups";
< 		$admtext['lastbackup'] = "sidste backup mere end xxx dage siden";
---
> 		$admtext['task_revind'] = "Gennemse foreslåede ændringer til personbegivenheder";
> 		$admtext['task_revfam'] = "Gennemse foreslåede ændringer til familiebegivenheder";
> 		$admtext['task_backup'] = "Lav sikkerhedskopi";
> 		$admtext['nobackups'] = "Der findes ingen sikkerhedskopier";
> 		$admtext['lastbackup'] = "sidste sikkerhedskopi mere end xxx dage gammel";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Opgradering";
> 		$admtext['need_upgrade'] = "Afslut disse opgraderings instruktioner";
> 		$admtext['upgrade_missing'] = "Opgraderings filen ser ud til at mangle, så muligvis er opgraderingen allerede færdig.";
> 		$admtext['delete_upgrade'] = "Når man er færdig, skal man klikke her for at slette opgraderingsfilen og vende tilbage til menuen.";
723d733
< 		$admtext['author'] = "Forfatter";
727c737
< 		$admtext['confdeletesrc'] = "Er du sikker på, at du vil slette denne kilde?";
---
> 		$admtext['confdeletesrc'] = "Er det sikkert, at denne kilde skal slettes?";
729,730c739,740
< 		$admtext['existingsourceinfo'] = "Nuværende oplysninger for kilde";
< 		$admtext['newsourceinfo'] = "Ny kilde oplysninger";
---
> 		$admtext['existingsourceinfo'] = "Oplysninger om eksisterende kilde";
> 		$admtext['newsourceinfo'] = "Oplysninger om ny kilde";
732c742
< 		$admtext['prefixsourceid'] = "Begynd kilde-ID med \"S\" for \"Source\"";
---
> 		$admtext['prefixsourceid'] = "Begynd kilde-ID med \"K\" for \"Kilde\"";
734c744
< 		$admtext['validsourceid'] = "Indtast et gyldigt kilde-ID. Et gyldigt ID er en numerisk streng, der starter med 'S'.";
---
> 		$admtext['validsourceid'] = "Indtast et gyldigt kilde-ID. Et gyldigt ID er en numerisk streng, der starter med 'K'.";
736c746
< 		$admtext['editexistingsource'] = "Redigér oplysninger for en tidligere tilføjet kilde";
---
> 		$admtext['editexistingsource'] = "Redigér oplysninger om en tidligere tilføjet kilde";
738,739c748,749
< 		$admtext['reliability'] = "Pålidelighed";
< 		$admtext['relyexplain'] = "Jo højere nummer, jo større pålidelighed.";
---
> 		$admtext['reliability'] = "Kildetroværdighed";
> 		$admtext['relyexplain'] = "Jo højere tal, jo større troværdighed.";
748c758
< 		$admtext['modifyrepo'] = "Redigér nuværende arkiv";
---
> 		$admtext['modifyrepo'] = "Redigér eksisterende arkiv";
750c760
< 		$admtext['editexistingrepo'] = "Redigér oplysninger for et tidligere oprettet arkiv";
---
> 		$admtext['editexistingrepo'] = "Redigér oplysninger om et tidligere oprettet arkiv";
753,754c763,764
< 		$admtext['newrepoinfo'] = "Nyt arkiv oplysninger";
< 		$admtext['prefixrepoid'] = "Indled arkiv-ID med \"REPO\" for \"Repository\"";
---
> 		$admtext['newrepoinfo'] = "Oplysninger om nyt arkiv";
> 		$admtext['prefixrepoid'] = "Indled arkiv-ID med \"ARKIV\" for \"Arkiv\"";
756c766
< 		$admtext['confdeleterepo'] = "Er du sikker på, at du vil slette dette arkiv?";
---
> 		$admtext['confdeleterepo'] = "Er det sikkert at dette arkiv skal slettes?";
758c768
< 		$admtext['existingrepoinfo'] = "Nuværende oplysninger for arkiv";
---
> 		$admtext['existingrepoinfo'] = "Oplysninger om eksisterende arkiv";
761c771
< 		$admtext['confirmmergesources'] = "Er du sikker på, at du vil flette disse to kilder?";
---
> 		$admtext['confirmmergesources'] = "Er det sikkert, at disse to kilder skal flettes?";
763c773
< 		$admtext['confirmmergerepos'] = "Er du sikker på, at du vil flette disse to arkiver?";
---
> 		$admtext['confirmmergerepos'] = "Er det sikkert, at disse to arkiver skal flettes?";
765c775
< 		$admtext['confdeleterepo'] = "Er du sikker på, at du vil slette dette arkiv?";
---
> 		$admtext['confdeleterepo'] = "Er det sikkert at dette arkiv skal slettes?";
783,784c793,794
< 		$admtext['mainpara'] = "Velkommen paragraf";  //1, 4, 6, 7, 8
< 		$admtext['headimgplustitle'] = "Billede i sidehoved (inkl. titel)"; //1
---
> 		$admtext['mainpara'] = "Velkomsttekst";  //1, 4, 6, 7, 8
> 		$admtext['headimgplustitle'] = "Billede på sidehoved (inkl. titel)"; //1
787,788c797,798
< 		$admtext['phhistperson'] = "Billeder & Historier for person-ID"; //2
< 		$admtext['phhisttree'] = "Billeder & Historier tavle-ID"; //2
---
> 		$admtext['phhistperson'] = "Billeder & Fortællinger for person-ID"; //2
> 		$admtext['phhisttree'] = "Billeder & Fortællinger tavle-ID"; //2
792,798c802,808
< 		$admtext['searchpara'] = "Search tekst"; //6
< 		$admtext['fhpara'] = "Family Histories tekst"; //6
< 		$admtext['fhlinkshis'] = "Family Histories links (Hans)"; //6
< 		$admtext['fhlinkshers'] = "Family Histories links (Hendes)"; //6
< 		$admtext['mwpara'] = "Most Wanted tekst"; //6
< 		$admtext['respara'] = "Resources tekst"; //6
< 		$admtext['reslinks'] = "Links til Ressourcer"; //6
---
> 		$admtext['searchpara'] = "Søgetekst"; //6
> 		$admtext['fhpara'] = "Familiefortællinger tekst"; //6
> 		$admtext['fhlinkshis'] = "Familiefortællinger links (Hans)"; //6
> 		$admtext['fhlinkshers'] = "Familiefortællinger links (Hendes)"; //6
> 		$admtext['mwpara'] = "Mest søgte tekst"; //6
> 		$admtext['respara'] = "Ressourcer tekst"; //6
> 		$admtext['reslinks'] = "Links til ressourcer"; //6
804,825c814,835
< 		$admtext['momside'] = "Mors side"; //8
< 		$admtext['dadside'] = "Fars side"; //8
< 		$admtext['momperson'] = "Mors side person-ID"; //8
< 		$admtext['momtree'] = "Mors side træ-ID"; //8
< 		$admtext['dadperson'] = "Fars side person-ID"; //8
< 		$admtext['dadtree'] = "Fars side træ-ID"; //8
< 		$admtext['featurethumb1'] = "Feature 1 miniaturebillede"; //4
< 		$admtext['featurelink1'] = "Feature 1 link"; //4
< 		$admtext['featuretitle1'] = "Feature 1 titel"; //4
< 		$admtext['featurepara1'] = "Feature 1 afsnit"; //4
< 		$admtext['featurethumb2'] = "Feature 2 miniaturebillede"; //4
< 		$admtext['featurelink2'] = "Feature 2 link"; //4
< 		$admtext['featuretitle2'] = "Feature 2 titel"; //4
< 		$admtext['featurepara2'] = "Feature 2 afsnit"; //4
< 		$admtext['featurethumb3'] = "Feature 3 miniaturebillede"; //4
< 		$admtext['featurelink3'] = "Feature 3 link"; //4
< 		$admtext['featuretitle3'] = "Feature 3 titel"; //4
< 		$admtext['featurepara3'] = "Feature 3 afsnit"; //4
< 		$admtext['featurethumb4'] = "Feature 4 miniaturebillede"; //4
< 		$admtext['featurelink4'] = "Feature 4 link"; //4
< 		$admtext['featuretitle4'] = "Feature 4 titel"; //4
< 		$admtext['featurepara4'] = "Feature 4 afsnit"; //4
---
> 		$admtext['momside'] = "Mors side"; //8, 20
> 		$admtext['dadside'] = "Fars side"; //8, 20
> 		$admtext['momperson'] = "Mors side person-ID"; //8, 20
> 		$admtext['momtree'] = "Mors side træ-ID"; //8, 20
> 		$admtext['dadperson'] = "Fars side person-ID"; //8, 20
> 		$admtext['dadtree'] = "Fars side træ-ID"; //8, 20
> 		$admtext['featurethumb1'] = "Artikel 1 miniature-billede"; //4
> 		$admtext['featurelink1'] = "Artikel 1 link"; //4
> 		$admtext['featuretitle1'] = "Artikel 1 titel"; //4
> 		$admtext['featurepara1'] = "Artikel 1 afsnit"; //4
> 		$admtext['featurethumb2'] = "Artikel 2 miniature-billede"; //4
> 		$admtext['featurelink2'] = "Artikel 2 link"; //4
> 		$admtext['featuretitle2'] = "Artikel 2 titel"; //4
> 		$admtext['featurepara2'] = "Artikel 2 afsnit"; //4
> 		$admtext['featurethumb3'] = "Artikel 3 miniature-billede"; //4
> 		$admtext['featurelink3'] = "Artikel 3 link"; //4
> 		$admtext['featuretitle3'] = "Artikel 3 titel"; //4
> 		$admtext['featurepara3'] = "Artikel 3 afsnit"; //4
> 		$admtext['featurethumb4'] = "Artikel 4 miniature-billede"; //4
> 		$admtext['featurelink4'] = "Artikel 4 link"; //4
> 		$admtext['featuretitle4'] = "Artikel 4 titel"; //4
> 		$admtext['featurepara4'] = "Artikel 4 afsnit"; //4
832c842
< 		$admtext['templateswitching'] = "Aktivér Valg af Skabelon";
---
> 		$admtext['templateswitching'] = "Aktivér Valg af skabelon";
837,838c847,848
< 		$admtext['featurepara'] = "Artikel paragraf"; //9, 10
< 		$admtext['welcome'] = "Velkommen overskrift"; //9, 10
---
> 		$admtext['featurepara'] = "Artikelafsnit"; //9, 10
> 		$admtext['welcome'] = "Velkomst overskrift"; //9, 10
840,841c850,851
< 		$admtext['momsidenames'] = "Mom's Side names"; //8
< 		$admtext['dadsidenames'] = "Dad's Side names"; //8
---
> 		$admtext['momsidenames'] = "Mors side navne"; //8
> 		$admtext['dadsidenames'] = "Fars side navne"; //8
843,845c853,855
< 		$admtext['featurespara'] = "Artikel paragraf";
< 		$admtext['menutitle'] = "Menu Titel";
< 		$admtext['titlechoice'] = "Titel valg";
---
> 		$admtext['featurespara'] = "Artikelafsnit";
> 		$admtext['menutitle'] = "Menutitel";
> 		$admtext['titlechoice'] = "Titelvalg";
847c857
< 		$admtext['phototitlel'] = "Venstre billede titel";
---
> 		$admtext['phototitlel'] = "Venstre billedtitel";
850c860
< 		$admtext['phototitler'] = "Højre billede titel";
---
> 		$admtext['phototitler'] = "Højre billedtitel";
853,858c863,868
< 		$admtext['headimg2'] = "Header billede 2"; //14
< 		$admtext['headimg3'] = "Header billede 3"; //14
< 		$admtext['showprev'] = "Vis Gennemsyn";
< 		$admtext['hideprev'] = "Skjul Gennemsyn";
< 		$admtext['ttitleimage'] = "Image";
< 		$admtext['ttitletext'] = "Text";
---
> 		$admtext['headimg2'] = "Sidehovedbillede 2"; //14
> 		$admtext['headimg3'] = "Sidehovedbillede 3"; //14
> 		$admtext['showprev'] = "Forhåndsvisning";
> 		$admtext['hideprev'] = "Skjul forhåndsvisning";
> 		$admtext['ttitleimage'] = "Billede";
> 		$admtext['ttitletext'] = "Tekst";
860,876c870,886
< 		$admtext['featurethumb5'] = "Feature 5 miniaturebillede"; //15
< 		$admtext['featurelink5'] = "Feature 5 link"; //15
< 		$admtext['featuretitle5'] = "Feature 5 titel"; //15
< 		$admtext['featurepara5'] = "Feature 5 paragraf"; //15
< 		$admtext['featurethumb6'] = "Feature 6 miniaturebillede"; //15
< 		$admtext['featurelink6'] = "Feature 6 link"; //15
< 		$admtext['featuretitle6'] = "Feature 6 titel"; //15
< 		$admtext['featurepara6'] = "Feature 6 paragraf"; //15
< 		$admtext['featurethumb7'] = "Feature 7 miniaturebillede"; //15
< 		$admtext['featurelink7'] = "Feature 7 link"; //15
< 		$admtext['featurepara7'] = "Feature 7 paragraf"; //15
< 		$admtext['featurethumb8'] = "Feature 8 miniaturebillede"; //15
< 		$admtext['featurelink8'] = "Feature 8 link"; //15
< 		$admtext['featurepara8'] = "Feature 8 paragraf"; //15
< 		$admtext['sidebarhead1'] = "Sidebjælke header 1"; //15
< 		$admtext['sidebarhead2'] = "Sidebjælke header 2"; //15
< 		$admtext['sidebarhead3'] = "Sidebjælke header 3"; //15
---
> 		$admtext['featurethumb5'] = "Artikel 5 miniature-billede"; //15
> 		$admtext['featurelink5'] = "Artikel 5 link"; //15
> 		$admtext['featuretitle5'] = "Artikel 5 titel"; //15
> 		$admtext['featurepara5'] = "Artikel 5 afsnit"; //15
> 		$admtext['featurethumb6'] = "Artikel 6 miniature-billede"; //15
> 		$admtext['featurelink6'] = "Artikel 6 link"; //15
> 		$admtext['featuretitle6'] = "Artikel 6 titel"; //15
> 		$admtext['featurepara6'] = "Artikel 6 afsnit"; //15
> 		$admtext['featurethumb7'] = "Artikel 7 miniature-billede"; //15
> 		$admtext['featurelink7'] = "Artikel 7 link"; //15
> 		$admtext['featurepara7'] = "Artikel 7 afsnit"; //15
> 		$admtext['featurethumb8'] = "Artikel 8 miniature-billede"; //15
> 		$admtext['featurelink8'] = "Artikel 8 link"; //15
> 		$admtext['featurepara8'] = "Artikel 8 afsnit"; //15
> 		$admtext['sidebarhead1'] = "Sidebjælke sidehoved 1"; //15
> 		$admtext['sidebarhead2'] = "Sidebjælke sidehoved 2"; //15
> 		$admtext['sidebarhead3'] = "Sidebjælke sidehoved 3"; //15
879c889
< 		$admtext['textpara1'] = "Tekst 1 paragraf"; //15
---
> 		$admtext['textpara1'] = "Tekst 1 afsnit"; //15
882c892
< 		$admtext['textpara2'] = "Tekst 2 paragraf"; //15
---
> 		$admtext['textpara2'] = "Tekst 2 afsnit"; //15
884,887c894,980
< 		$admtext['textpara3'] = "Tekst 3 paragraf"; //15
< 		$admtext['subhead1'] = "Subheader 1"; //15
< 		$admtext['subhead2'] = "Subheader 2"; //15
< 
---
> 		$admtext['textpara3'] = "Tekst 3 afsnit"; //15
> 		$admtext['subhead1'] = "Underoverskrift 1"; //15
> 		$admtext['subhead2'] = "Underoverskrift 2"; //15
> 		//added in 12.2
> 		$admtext['quotehead'] = "Citater header";
> 		$admtext['quotesubhead'] = "Citater subheader";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Funktionsnavn";
> 		$admtext['snipinfoone'] = "Featurette første linje";
> 		$admtext['snipinfotwo'] = "Featurette anden linje";
> 		$admtext['snipimage'] = "Featurette billede";
> 		$admtext['snipperson'] = "Featurette person-ID";
> 		$admtext['sniptree'] = "Featurette træ-ID";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7-titel";
> 		$admtext['featuretitle8'] = "Feature 8-titel";
> 		$admtext['featuretitle9'] = "Feature 9-titel";
> 		$admtext['featurethumb9'] = "Feature 9 miniature"; //15
> 		$admtext['featurelink9'] = "Feature 9-link"; //15
> 		$admtext['featurepara9'] = "Funktion 9 afsnit"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Header Venstre Billede";
> 		$admtext['rightimg'] = "Header Højre Billede";
> 		$admtext['photoption'] = "Foto mulighederne er<br />&nbsp;&nbsp;(statisk eller tilfældig)";
> 		$admtext['randomphotowidth'] = "Tilfældig Foto Bredde";
> 		$admtext['randomphotoheight'] = "Tilfældig Foto Højjde";
> 		$admtext['randomphotomediatypeID'] = "Tilfældig Foto Samling";
> 		$admtext['momheading'] = "Mors Familie Overskrift";
> 		$admtext['mompara'] = "Mors Familie ";
> 		$admtext['mompagelink'] = "Mors Familie Side Link";
> 		$admtext['dadheading'] = "Fars Familie Overskrift";
> 		$admtext['dadpara'] = "Fars Familie Paragraf";
> 		$admtext['dadpagelink'] = "Fars Familie Side Link";
> 		$admtext['spmomheading'] = "Partners Mors Familie Overskrift";
> 		$admtext['spmompara'] = "Partners Mors Familie Paragraf";
> 		$admtext['spmompagelink'] = "Partners Mors Familie Side Link";
> 		$admtext['spmomside'] = "Partners Mors Side label";
> 		$admtext['spdadside'] = "Partners Fars Side label";
> 		$admtext['spmomperson'] = "Partners Mors Side person-ID";
> 		$admtext['spmomtree'] = "Partners Mors Side træ-ID";
> 		$admtext['spdadheading'] = "Partners Fars Familie Overskrift";
> 		$admtext['spdadpara'] = "Partners Fars Familie Paragraf";
> 		$admtext['spdadpagelink'] = "Partners Fars Familie Side Link";
> 		$admtext['spdadperson'] = "Partners Fars Side person-ID";
> 		$admtext['spdadtree'] = "Partners Fars Side træ-ID";
> 		$admtext['storiesheading'] = "Vores Families Fortællinger";
> 		$admtext['nbrsurnames'] = "Antal af Efternavne<br />&nbsp;&nbsp; i Efternavns Skyen";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature miniature";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
897,900c990,993
< 		$admtext['createdbtables'] = "Opret database tabellerne, der skal indeholde oplysninger.";
< 		$admtext['tcwarning'] = "<strong>Advarsel!</strong> Vælg kun denne mulighed, når du sætter din hjemmeside op for første gang. <strong>Alle nuværende data, inklusive billeder, historier, gravsten og kirkegårds oplysninger, vil blive slettet!</strong>";
< 		$admtext['conftabledelete'] = "Dette vil slette ALLE dine nuværende data!! Er du sikker på, at du vil fortsætte?";
< 		$admtext['performdatamaint'] = "Udfør datavedligeholdelse og sorter billeder, historier og andre komponenter.";
---
> 		$admtext['createdbtables'] = "Opret de databasetabeller, der skal indeholde oplysninger.";
> 		$admtext['tcwarning'] = "<strong>Advarsel!</strong> Vælg kun denne mulighed, når TNG installeres for første gang. <strong>Alle nuværende data vil blive slettet! Dette indbefatter historier og oplysninger om billeder, gravsten og kirkegårde.</strong>";
> 		$admtext['conftabledelete'] = "Dette vil slette ALLE nuværende data!! Er det i orden at fortsætte?";
> 		$admtext['performdatamaint'] = "Udfør datavedligeholdelse og sortér billeder, fortællinger og andet indhold.";
908c1001
< 		$admtext['fromphp'] = "Denne oplysning kommer fra din server og hører til PHP installationen, ikke TNG.";
---
> 		$admtext['fromphp'] = "Denne oplysning kommer fra serveren og hører til PHP installationen, ikke TNG.";
910c1003
< 		$admtext['phpreq'] = "(TNG kræver 5.3 eller højere.)";
---
> 		$admtext['phpreq'] = "(TNG kræver 7.0 eller højere.)";
912c1005
< 		$admtext['gdreq'] = "(Krævet til TNG's thumbnail dannelsesværktøj.)";
---
> 		$admtext['gdreq'] = "(Værktøj nødvendigt til at danne TNG miniaturer.)";
921c1014
< 		$admtext['notperm'] = "Ikke tilladt, brug FTP istedet";
---
> 		$admtext['notperm'] = "Ikke tilladt, brug FTP i stedet";
929c1022
< 		$admtext['usrprob'] = "Du har måske ikke det nødvendige filadgangsniveau til at køre TNG uden problemer, hvis du bruger både FTP og TNG admin-funktionerne til filbehandling.";
---
> 		$admtext['usrprob'] = "You may not have the necessary level of file access to run TNG without problems if you use both FTP and the TNG admin functions to manage files.";
933c1026
< 		$admtext['admlog'] = "Admin log";
---
> 		$admtext['admlog'] = "Adminlog";
938,940c1031,1033
< 		$admtext['restricted'] = "Nogle funktioner kan være begrænsede. Du kan opleve fejl under installationen, eller mens du kører TNG.";
< 		$admtext['needchngs'] = "TNG vil måske ikke virke uden ændringer i din PHP- eller serverkonfiguration.";
< 		$admtext['yourbrowser'] = "Din browser:";
---
> 		$admtext['restricted'] = "Nogle funktioner kan være begrænsede. Der kan opstå fejl under installationen, eller mens TNG kører.";
> 		$admtext['needchngs'] = "TNG vil måske ikke virke uden ændringer i PHP- eller serverkonfiguration.";
> 		$admtext['yourbrowser'] = "Browseren:";
949c1042
< 		$admtext['siteowner'] = "Hjemmesideejer";
---
> 		$admtext['siteowner'] = "Ejer af webstedet";
951c1044
< 		$admtext['disallow'] = "Forbyd";
---
> 		$admtext['disallow'] = "Tillad ikke";
956c1049
< 		$admtext['lastbackup'] = "Seneste backup";
---
> 		$admtext['lastbackup'] = "Seneste sikkerhedskopi";
968c1061
< 		$admtext['ldsdefault'] = "Vis LDS data";
---
> 		$admtext['ldsdefault'] = "Vis SDH-data";
973c1066
< 		$admtext['chooselang'] = "Dynamisk sprogskift";
---
> 		$admtext['chooselang'] = "Dynamisk sprogskifte";
983c1076
< 		$admtext['historypath'] = "Historiemappe";
---
> 		$admtext['historypath'] = "Fortællingsmappe";
989,993c1082,1086
< 		$admtext['thumbprefix'] = "Thumbnail præfiks";
< 		$admtext['thumbmaxh'] = "Thumbnail maks. højde";
< 		$admtext['thumbmaxw'] = "Thumbnail maks. bredde";
< 		$admtext['thumbsuffix'] = "Thumbnail suffiks";
< 		$admtext['showextended'] = "Vis udvidet billede oplysninger";
---
> 		$admtext['thumbprefix'] = "Miniature præfiks";
> 		$admtext['thumbmaxh'] = "Miniature maks. højde";
> 		$admtext['thumbmaxw'] = "Miniature maks. bredde";
> 		$admtext['thumbsuffix'] = "Miniature suffiks";
> 		$admtext['showextended'] = "Vis udvidede billedoplysninger";
1004,1005c1097,1098
< 		$admtext['newmedialinks'] = "Nyt link for billeder/historier";
< 		$admtext['maxgedcom'] = "Maks. generationer, GEDCOM download";
---
> 		$admtext['newmedialinks'] = "Nyt link for billeder/fortællinger";
> 		$admtext['maxgedcom'] = "Maks. generationer, GEDCOM-download";
1030,1031c1123,1124
< 		$admtext['surerestore'] = "Er du sikker på, at du vil gendanne de valgte tabeller?";
< 		$admtext['surerestorets'] = "Er du sikker på, at du vil gendanne tabelstrukturen? Alle nuværende data vil gå tabt!";
---
> 		$admtext['surerestore'] = "Er det sikkert, at de valgte tabeller skal gendannes?";
> 		$admtext['surerestorets'] = "Er det sikkert, at tabelstrukturen skal gendannes? Alle nuværende data vil gå tabt!";
1040c1133
< 		$admtext['gendex'] = "GENDEX mappe";
---
> 		$admtext['gendex'] = "GENDEX-mappe";
1043c1136
< 		$admtext['boxnamesize'] = "Boksnavn, størrelse";
---
> 		$admtext['boxnamesize'] = "Feltnavn, størrelse";
1045c1138
< 		$admtext['boxdatessize'] = "Boksdato, størrelse";
---
> 		$admtext['boxdatessize'] = "Feltdato, størrelse";
1047c1140
< 		$admtext['boxcolor'] = "Boksfarve";
---
> 		$admtext['boxcolor'] = "Feltfarve";
1052,1057c1145,1150
< 		$admtext['boxwidth'] = "Boksbredde (uden popups)";
< 		$admtext['boxheight'] = "Bokshøjde (uden popups)";
< 		$admtext['boxalign'] = "Boksjustering (uden popups)";
< 		$admtext['boxheightshift'] = "Skift bokshøjde (uden popups)";
< 		$admtext['boxHsep'] = "Boks, vandret adskillelse";
< 		$admtext['boxVsep'] = "Boks, lodret adskillelse";
---
> 		$admtext['boxwidth'] = "Feltbredde (uden popups)";
> 		$admtext['boxheight'] = "Felthøjde (uden popups)";
> 		$admtext['boxalign'] = "Feltjustering (uden popups)";
> 		$admtext['boxheightshift'] = "Skift felthøjde (uden popups)";
> 		$admtext['boxHsep'] = "Felt, vandret adskillelse";
> 		$admtext['boxVsep'] = "Felt, lodret adskillelse";
1066,1069c1159,1162
< 		$admtext['puboxwidth'] = "Boksbredde (m/popups)";
< 		$admtext['puboxheight'] = "Bokshøjde (m/popups)";
< 		$admtext['puboxalign'] = "Boksjustering (m/popups)";
< 		$admtext['puboxheightshift'] = "Skift bokshøjde (m/popups)";
---
> 		$admtext['puboxwidth'] = "Feltbredde (m/popups)";
> 		$admtext['puboxheight'] = "Felthøjde (m/popups)";
> 		$admtext['puboxalign'] = "Feltjustering (m/popups)";
> 		$admtext['puboxheightshift'] = "Skift felthøjde (m/popups)";
1078,1079c1171,1172
< 		$admtext['relchart'] = "Slægtskabstavle";
< 		$admtext['maxupgen'] = "Maks. antal slægtskabsgenerationer";
---
>         $admtext['relchart'] = " Slægtskabsdiagram";
>         $admtext['maxupgen'] = "Maks. antal Generationer af Slægtskaber";
1086,1088c1179,1181
< 		$admtext['pedbox'] = "Boks";
< 		$admtext['hideempty'] = "Skjul tomme bokse";
< 		$admtext['logfilename'] = "Logfil navn";
---
> 		$admtext['pedbox'] = "Felt";
> 		$admtext['hideempty'] = "Skjul tomme felter";
> 		$admtext['logfilename'] = "Logfilnavn";
1100c1193
< 		$admtext['localdocpath'] = "Lokal(e) historiesti(er)";
---
> 		$admtext['localdocpath'] = "Lokal(e) fortællingssti(er)";
1119c1212
< 		$admtext['sitesection'] = "Hjemmeside design og definitioner";
---
> 		$admtext['sitesection'] = "Webstedets design og definitioner";
1137c1230
< 		$admtext['suredelbk'] = "Er du sikker på, at du vil slette de valgte backup-filer?";
---
> 		$admtext['suredelbk'] = "Er det sikkert, at de valgte backup-filer skal slettes?";
1145,1146c1238,1239
< 		$admtext['sitename'] = "Hjemmesidens navn";
< 		$admtext['site_desc'] = "Beskrivelse af hjemmesiden";
---
> 		$admtext['sitename'] = "Webstedets Navn";
> 		$admtext['site_desc'] = "Beskrivelse af Webstedet";
1148c1241
< 		$admtext['custvars'] = "OBS: Du kan lave din egen opsætning i \"customconfig.php\" (åbn i teksteditor og følg instruktionerne).";
---
> 		$admtext['custvars'] = "OBS: Man kan oprette sin egen opsætning i \"customconfig.php\" (åbn i teksteditor og følg instruktionerne).";
1159,1161c1252,1254
< 		$admtext['mapdimsind'] = "Dimensioner, Person-sider";
< 		$admtext['mapdimshst'] = "Dimensioner, Gravsten-sider";
< 		$admtext['mapdimsadm'] = "Dimensioner, Admin-sider";
---
> 		$admtext['mapdimsind'] = "Dimensioner, Personsider";
> 		$admtext['mapdimshst'] = "Dimensioner, Gravstenssider";
> 		$admtext['mapdimsadm'] = "Dimensioner, Adminsider";
1179,1180c1272,1273
< 		$admtext['temptable'] = "Midlertidig begivenheds tabel";
< 		$admtext['tleventstable'] = "Tidslinje begivenheds tabel";
---
> 		$admtext['temptable'] = "Midlertidig begivenhedstabel";
> 		$admtext['tleventstable'] = "Tidslinje begivenhedstabel";
1183c1276
< 		$admtext['cemrows'] = "Maks. antal linier pr. kolonne (ca.)";
---
> 		$admtext['cemrows'] = "Maks. antal linjer pr. kolonne (ca.)";
1189,1190c1282,1283
< 		$admtext['maintexp'] = "Adgang til databasen er midlertidig forhindret pga. opdaterings. Vær venlig at prøve igen senere. Hvis problemet ikke er løst inden for nogle timer, kontakt da venligst hjemmesidens administrator.";
< 		$admtext['defimpopt'] = "Standard erstatningsmulighed";
---
> 		$admtext['maintexp'] = "Adgang til databasen er midlertidig forhindret pga. opdatering. Vær venlig at prøve igen senere. Hvis problemet ikke er løst inden for nogle timer, kontakt da venligst webstedets administrator.";
> 		$admtext['defimpopt'] = "Standarderstatningsmulighed";
1192c1285
< 		$admtext['renumber'] = "Omnummerer ID'er";
---
> 		$admtext['renumber'] = "Omnummerér ID'er";
1198,1199c1291,1292
< 		$admtext['needmaint'] = "Du skal være i opdaterings-mode for at bruge denne funktion. (gå til Opsætning &gt;&gt; Konfiguration &gt;&gt; Generel)";
< 		$admtext['reseqwarn'] = "<strong>ADVARSEL:</strong> Omnummerering af dine ID'er kan medføre, at eksterne links til din hjemmeside slettes eller henviser til forkerte adresser.";
---
> 		$admtext['needmaint'] = "Database opdatering skal være slået til for at bruge denne funktion. (gå til Opsætning &gt;&gt; Konfiguration &gt;&gt; Generel)";
> 		$admtext['reseqwarn'] = "<strong>ADVARSEL:</strong> Omnummerering af ID'er kan medføre, at eksterne links til websiden side slettes eller henviser til forkerte adresser.";
1210c1303
< 		$admtext['pstdonly'] = "Vis kun standard familiebegivenheder";
---
> 		$admtext['pstdonly'] = "Vis kun standardfamiliebegivenheder";
1213,1214c1306,1307
< 		$admtext['sitetime'] = "og hjemmesidetid er";
< 		$admtext['srexpl'] = "Valgfri. Brug et absolut sti-navn, som den du ser i rodstien, flyt derefter de følgende filer til Konfig. sti <strong>straks</strong> efter at have gemt og gør dem skrivbare (664 permissions): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
---
> 		$admtext['sitetime'] = "og webstedets tid er";
> 		$admtext['srexpl'] = "Valgfrit. Brug et absolut stinavn, ligesom den i rodstien, flyt derefter de følgende filer til config stien <strong>straks</strong> efter at have gemt dem og gjort dem skrivbare (664 permissions): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
1229,1230c1322,1323
< 		$admtext['rangeevs'] = "Kun begivenheder indenfor levetiden for personer på tavlen";
< 		$admtext['tcwidth'] = "Oprindelig bredde af tavlen";
---
> 		$admtext['rangeevs'] = "Kun begivenheder indenfor aktuel persons levetid";
> 		$admtext['tcwidth'] = "Oprindelig tavlebredde";
1232d1324
< 		//added in 8.0.0
1235c1327
< 		$admtext['initrels'] = "Begynd med antal slægtskaber";
---
> 		$admtext['initrels'] = "Standard antal Slægtskaber";
1241c1333
< 		$admtext['autoapp'] = "Autogodkend nye brugere";
---
> 		$admtext['autoapp'] = "Godkend automatisk nye brugere";
1255d1346
< 		//added in 9.0.0
1259c1350
< 		$admtext['mergeexpl'] = "(Dette vil fjerne træet fra alle Stednavne)";
---
> 		$admtext['mergeexpl'] = "(Dette vil fjerne træet fra alle stednavne)";
1266,1267c1357,1358
< 		$admtext['showshare'] = "Vis Share Link";
< 		$admtext['defpgsize'] = "Standard PDF Sidestørrelse";
---
> 		$admtext['showshare'] = "Vis Del Link";
> 		$admtext['defpgsize'] = "Standard PDF-sidestørrelse";
1270c1361
< 		$admtext['usedefthumbs'] = "Brug standard miniaturebilleder";
---
> 		$admtext['usedefthumbs'] = "Brug standard miniature";
1273c1364
<         $admtext['assumepriv'] = "Formod privat hvis ikke død i så mange år";
---
>         $admtext['assumepriv'] = "Formod privat, hvis ikke død i så mange år";
1276c1367
< 		$admtext['shownamespr'] = "Vis Navne på Private";
---
> 		$admtext['shownamespr'] = "Vis navne på private personer";
1278,1281c1369,1370
< 		//changed in 10.0.0
< 		$admtext['regnotes'] = "Vis noter og brugerdefinerede begivenheder på Registrene";
< 		//added in 10.0.0
< 		$admtext['collation'] = "Kollation";
---
> 		$admtext['regnotes'] = "Vis notater og brugerdefinerede begivenheder i registrene";
> 		$admtext['collation'] = "Sortering";
1285,1286c1374,1375
< 		$admtext['searchchoice'] = "Søg Link Destination";
< 		$admtext['quicksearch'] = "Hurtig Søgning";
---
> 		$admtext['searchchoice'] = "Søg indstilling";
> 		$admtext['quicksearch'] = "Hurtig søgning";
1289,1290c1378,1379
< 		$admtext['vboxwidth'] = "Rubrik Bredde";
< 		$admtext['vboxheight'] = "Rubrik Højde";
---
> 		$admtext['vboxwidth'] = "Rubrikbredde";
> 		$admtext['vboxheight'] = "Rubrikhøjde";
1292,1293c1381
< 		$admtext['vchart'] = "Lodret Stamtræ";
< 		//added in 10.1.0
---
> 		$admtext['vchart'] = "Lodret tavle";
1296,1298c1384
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Encryption";
<         //added in 11.0.0
---
>         $admtext['mailenc'] = "Kryptering";
1303,1312c1389,1398
< 		$admtext['personprefix'] = "Person præfiks";
< 		$admtext['personsuffix'] = "Person suffiks";
< 		$admtext['familyprefix'] = "Familie præfiks";
< 		$admtext['familysuffix'] = "Familie suffiks";
< 		$admtext['sourceprefix'] = "Kilde præfiks";
< 		$admtext['sourcesuffix'] = "Kilde suffiks";
< 		$admtext['repoprefix'] = "Arkiv præfiks";
< 		$admtext['reposuffix'] = "Arkiv suffiks";
< 		$admtext['noteprefix'] = "Note præfiks";
< 		$admtext['notesuffix'] = "Note suffiks";
---
> 		$admtext['personprefix'] = "Personpræfiks";
> 		$admtext['personsuffix'] = "Personsuffiks";
> 		$admtext['familyprefix'] = "Familiepræfiks";
> 		$admtext['familysuffix'] = "Familiesuffiks";
> 		$admtext['sourceprefix'] = "Kildepræfiks";
> 		$admtext['sourcesuffix'] = "Kildesuffiks";
> 		$admtext['repoprefix'] = "Arkivpræfiks";
> 		$admtext['reposuffix'] = "Arkivsuffiks";
> 		$admtext['noteprefix'] = "Notatpræfiks";
> 		$admtext['notesuffix'] = "Notatsuffiks";
1314c1400
< 		$admtext['mobilesite'] = "Mobil hjemmeside bliver ";
---
> 		$admtext['mobilesite'] = "Mobilside bliver ";
1318,1322c1404,1408
< 		$admtext['tabletype'] = "Responsiv tabel type";
< 		$admtext['enablemodeswitch'] = "Aktivér responsive tabeller funktion skifter";
< 		$admtext['enableminimap'] = "Aktivér responsive tabeller mini kort";
< 		$admtext['showtasks'] = "Vis 'Vigtige opgaver' beskeder";
< 		$admtext['showtotals'] = "Vis samlede antal på Admin menuen";
---
> 		$admtext['tabletype'] = "Responsiv tabeltype";
> 		$admtext['enablemodeswitch'] = "Aktivér funktionsomskifter for responsive tabeller";
> 		$admtext['enableminimap'] = "Aktivér minikort for responsive tabeller";
> 		$admtext['showtasks'] = "Vis besked om 'Vigtige opgaver'";
> 		$admtext['showtotals'] = "Vis samlet antal i Admin-menuen";
1324c1410
< 		$admtext['backupnote'] = "BEMÆRK: Hvis databasen er meget stor, kan du bruge et selvstændigt værktøj (f.eks. mysqldumper eller phpMyAdmin) til at lave backup af databasen eller gendanne databasen. phpMyAdmin findes altid hos din udbyder/webhotel.";
---
> 		$admtext['backupnote'] = "BEMÆRK: Hvis databasen er meget stor, kan man bruge et selvstændigt værktøj (f.eks. mysqldumper eller phpMyAdmin) til at foretage en backup af databasen eller gendanne databasen. phpMyAdmin findes altid hos udbyderen / webhotellet.";
1328c1414
< 		$admtext['hidedna'] = "Skjul alle DNA sider og data";
---
> 		$admtext['hidedna'] = "Skjul alle DNA-sider og -data";
1330d1415
< 		//changed in 11.0.2
1338c1423
< 		$admtext['footermsg'] = "Brugerdefineret sidefod meddelelse";
---
> 		$admtext['footermsg'] = "Brugerdefineret sidefodsmeddelelse";
1340,1341c1425,1426
< 		$admtext['mediatrees'] = "Adskil medier i tree mapper";
< 		$admtext['mediaexpl'] = "xxx medie filer flyttet";
---
> 		$admtext['mediatrees'] = "Adskil medier i træmapper";
> 		$admtext['mediaexpl'] = "xxx mediefiler flyttet";
1344,1345c1429,1430
< 		$admtext['mainbackground'] = "Hovedoverskrift baggrundsfarve";
< 		$admtext['modebackground'] = "Tilstandsværdier baggrundsfarve";
---
> 		$admtext['mainbackground'] = "Baggrundsfarve for hovedoverskrift";
> 		$admtext['modebackground'] = "Baggrundsfarve for tilstandsværdier";
1347,1357c1432,1442
< 		$admtext['background1_12'] = "Markers 1-12 baggrundsfarve";
< 		$admtext['background13_25'] = "Markers 13-25 baggrundsfarve";
< 		$admtext['background26_37'] = "Markers 26-37 baggrundsfarve";
< 		$admtext['background38_67'] = "Markers 38-67 baggrundsfarve";
< 		$admtext['background111'] = "Markers 68-111 baggrundsfarve";
< 		$admtext['textcolor'] = "Tekst farve";
< 		$admtext['show_test_number'] = "Vis DNA Test Nummer Offentligt";
< 		$admtext['excludefromancsn'] = "Ekskludér Fra Ane Efternavne";
< 		$admtext['upperancsunames'] = "Ane Efternavne med Store Bogstaver";
< 		$admtext['autofillancsunames'] = "Autofill Ancestral Surnames";
< 		$admtext['colorschemer'] = "ColorSchemer - Online Color Scheme Generator";
---
> 		$admtext['background1_12'] = "Baggrundsfarve for markører 1-12";
> 		$admtext['background13_25'] = "Baggrundsfarve for markører 13-25";
> 		$admtext['background26_37'] = "Baggrundsfarve for markører 26-37";
> 		$admtext['background38_67'] = "Baggrundsfarve for markører 38-67";
> 		$admtext['background111'] = "Baggrundsfarve for markører 68-111";
> 		$admtext['textcolor'] = "Tekstfarve";
> 		$admtext['show_test_number'] = "Vis DNA-testnummer offentligt";
> 		$admtext['excludefromancsn'] = "Ekskludér fra forfædres efternavne";
> 		$admtext['upperancsunames'] = "Forfædres efternavne med store bogstaver";
> 		$admtext['autofillancsunames'] = "Udfyld forfædres efternavne automatisk";
> 		$admtext['colorschemer'] = "Farveskema - Online farveskema generator";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Skift indkommende præfikser til at matche TNG indstillinger";
> 		$admtext['sortevents'] = "Sortér begivenheder efter";
> 		$admtext['sortbydate'] = "Begivenhedsdato";
> 		$admtext['sortbytype'] = "Begivenhedstype";
> 		$admtext['allowsuggest'] = "Tillad forslag fra besøgende";
> 		$admtext['livingchecked'] = "Levende flag tilføjet til nye personer og familier";
> 		$admtext['maxmarried'] = "Markér familien som levende hvis gift mindre end<br/>dette antal år";
> 		$admtext['imagetags'] = "Rektangler";
> 		$admtext['allowcsv'] = "Tillad at hente rapporter i CSV format";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup muligheder";
> 		$admtext['dosql'] = "Eksportér som SQL";
> 		$admtext['dodrop'] = "Medtag DROP-TABEL HVIS DEN FINDES";
> 		$admtext['docreate'] = "Medtag OPRET TABEL";
> 		$admtext['onrestore'] = "Gendan muligheder";
> 		$admtext['dodel'] = "Slet tidligere indhold først";
> 		$admtext['download'] = "Hent";
> 		$admtext['altbirthtypes'] = "Dåbsbegivenheder";
> 		$admtext['dtformat'] = "Tabel Format";
> 		$admtext['conchart'] = "Forbindelsesdiagram";
> 		$admtext['maxropt'] = "Maks. antal stier, der skal kontrolleres";
> 		$admtext['maxlopt'] = "Maks. forbindelses-længde";
> 		$admtext['showtxtopt'] = "Vis forbindelsen som tekst";
> 		$admtext['compactboxopt'] = "Vis kompakte personkasser";
> 		$admtext['sortbyopt'] = "Sortér forbindelsen efter";
> 		$admtext['anchoridopt'] = "Anker ID";
> 		$admtext['maxmopt'] = "Maks. antal ægteskaber i forbindelsen";
> 		$admtext['saveincfg'] = "Gem i konfigurations-stien (se Generalle Indstillinger)";
1377c1491
< 		$admtext['modifyplace'] = "Redigér et nuværende sted";
---
> 		$admtext['modifyplace'] = "Redigér et eksisterende sted";
1381c1495
< 		$admtext['existingplaceinfo'] = "Oplysninger om et nuværende sted";
---
> 		$admtext['existingplaceinfo'] = "Oplysninger om et eksisterende sted";
1385c1499
< 		$admtext['findmerge'] = "Find mulige duplikater af sted";
---
> 		$admtext['findmerge'] = "Find mulige steddubletter";
1391c1505
< 		$admtext['enterkeep'] = "Vælg venligst et mål for fletningen.";
---
> 		$admtext['enterkeep'] = "Vælg et mål for fletningen.";
1393c1507
< 		$admtext['confdeleteplace'] = "Er du sikker på, at du vil slette dette sted?";
---
> 		$admtext['confdeleteplace'] = "Er det sikkert, at dette sted skal slettes?";
1395,1396c1509
< 		//added in 8.0.0
< 		$admtext['confdelcemlink'] = "Er du sikker på, at du vil fjerne linket til denne kirkegård?";
---
> 		$admtext['confdelcemlink'] = "Er det sikkert, at linket til denne kirkegård skal fjernes?";
1398,1399c1511,1512
< 		$admtext['istemple'] = "Dette stednavn er en LDS tempelkode";
< 		$admtext['findtemples'] = "Find kun LDS tempelkoder";
---
> 		$admtext['istemple'] = "Dette stednavn er en SDH-tempelkode";
> 		$admtext['findtemples'] = "Find kun SDH-tempelkoder";
1410c1523
<         $admtext['geoexpl'] = "Geokod alle Steder uden breddegrad og længdegrad";
---
>         $admtext['geoexpl'] = "Geokod alle steder uden breddegrad og længdegrad";
1412c1525
<         $admtext['backgeo'] = "Tilbage til Geokode menu";
---
>         $admtext['backgeo'] = "Tilbage til geokodemenu";
1416d1528
<         $admtext['nogeocode'] = "Kunne ikke blive geokodet";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Undlad at geokode";
1436d1549
< 		$admtext['backtosecondary'] = "Tilbage til sekundære processer";
1443,1444c1556,1557
< 		$admtext['creatinggendex'] = "Danner GENDEX fil...";
< 		$admtext['finishedgendex'] = "Færdig med GENDEX fildannelse.";
---
> 		$admtext['creatinggendex'] = "Danner GENDEX-fil...";
> 		$admtext['finishedgendex'] = "Færdig med GENDEX-fildannelse.";
1446c1559
< 		$admtext['postgdx'] = "Hvor vil du gemme GENDEX filen";
---
> 		$admtext['postgdx'] = "Hvor skal GENDEX-filen gemmes";
1448c1561
< 		$admtext['evalmedia'] = "Beskær Media Menuer";
---
> 		$admtext['evalmedia'] = "Beskær mediemenuer";
1454c1567
< 		$admtext['chtoliving'] = "ændret til levende";
---
> 		$admtext['chtoliving'] = "ændret til nulevende";
1456c1569,1571
< 		$admtext['makeprivate'] = "Gør Privat";
---
> 		$admtext['makeprivate'] = "Gør privat";
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Tilbage til Hjælpeprogrammer efter Import";
1468,1470c1583,1585
< 		$admtext['conflangdelete'] = "Er du sikker på, at du vil slette dette sprog??";
< 		$admtext['existinglanguages'] = "Oplysninger om nuværende sprog";
< 		$admtext['modifylanguage'] = "Redigér nuværende sprog";
---
> 		$admtext['conflangdelete'] = "Er det sikkert, at dette sprog skal slettes?";
> 		$admtext['existinglanguages'] = "Oplysninger om eksisterende sprog";
> 		$admtext['modifylanguage'] = "Redigér eksisterende sprog";
1480c1595
< 		$admtext['existingtrees'] = "Nuværende oplysninger om træ";
---
> 		$admtext['existingtrees'] = "Oplysninger om eksisterende træ";
1484,1485c1599,1600
< 		$admtext['conftreedelete'] = "Er du sikker på, at du vil slette dette træ og alle og alt, det er knyttet til?";
< 		$admtext['conftreeclear'] = "Er du sikker på, at du vil tømme dette træ for alle data?";
---
> 		$admtext['conftreedelete'] = "Er det sikkert, at dette træ, og alt og alle der er knyttet til det, skal slettes?";
> 		$admtext['conftreeclear'] = "Er det sikkert, at dette træ skal tømmes for alle data?";
1488c1603
< 		$admtext['existingtreeinfo'] = "Oplysninger om nuværende træ";
---
> 		$admtext['existingtreeinfo'] = "Oplysninger om eksisterende træ";
1501d1615
< 		//added in 8.0.0
1504,1505c1618,1619
< 		$admtext['currtree'] = "Nuværende træ";
< 		$admtext['chwarn'] = "ADVARSEL: Denne handling vil fjerne alle familietilknytninger, og alle andre referencer til denne person i dette træ.";
---
> 		$admtext['currtree'] = "Eksisterende træ";
> 		$admtext['chwarn'] = "ADVARSEL: Denne handling vil fjerne alle familietilknytninger og alle andre referencer til denne person i dette træ.";
1507d1620
< 		//changed in 9.0.0
1509c1622
< 		$admtext['nopdf'] = "Forbyd brugerne at danne PDF filer";
---
> 		$admtext['nopdf'] = "Tillad ikke brugerne at danne PDF-filer";
1513c1626,1631
< 		$admtext['importfilename'] = "Importer Filnavn";
---
> 		$admtext['importfilename'] = "Importer filnavn";
> 		//added in 13.0
> 		$admtext['exnotes'] = "Udelad noter";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip og medtag mediefiler";
> 		$admtext['downloadzip'] = "Download ZIP";
1521c1639
< 		$admtext['existingusers'] = "Nuværende brugerinformation";
---
> 		$admtext['existingusers'] = "Eksisterende brugerinformation";
1523c1641
< 		$admtext['confuserdelete'] = "Er du sikker på, at du vil slette denne bruger?";
---
> 		$admtext['confuserdelete'] = "Er det sikkert, at denne bruger skal slettes?";
1528,1529c1646,1647
< 		$admtext['existinguserinfo'] = "Nuværende brugerinformation";
< 		$admtext['modifyuser'] = "Redigér nuværende bruger";
---
> 		$admtext['existinguserinfo'] = "Eksisterende brugerinformation";
> 		$admtext['modifyuser'] = "Redigér eksisterende bruger";
1531,1532c1649,1650
< 		$admtext['allow_lds'] = "Tillad at se LDS oplysninger";
< 		$admtext['enteruserdesc'] = "Indtast venligst en beskrivelse af brugeren.";
---
> 		$admtext['allow_lds'] = "Tillad at se SDH-oplysninger";
> 		$admtext['enteruserdesc'] = "Indtast beskrivelse af brugeren.";
1535c1653
< 		$admtext['firstuser'] = "Den første bruger, du opretter, vil blive administrator (INTET træ valgt) og vil have adgang til alle systemindstillinger.";
---
> 		$admtext['firstuser'] = "Den første bruger, der oprettes, vil blive administrator (INTET træ valgt) og vil have adgang til alle systemindstillinger.";
1552c1670
< 		$admtext['emailusers'] = "Brugers mail";
---
> 		$admtext['emailusers'] = "Brugers mailadresse";
1556c1674
< 		$admtext['messagetext'] = "Besked Tekst";
---
> 		$admtext['messagetext'] = "Beskedtekst";
1558,1559c1676,1677
< 		$admtext['treemailmsg'] = "Indstilling. Valg af et træ vil begrænse meddelelsen til de brugere, der er tilknyttet det træ.";
< 		$admtext['branchmailmsg'] = "Indstilling. Valg af en gren vil begrænse meddelelsen til de brugere, der er tilknyttet den gren.";
---
> 		$admtext['treemailmsg'] = "Valg af et træ vil begrænse meddelelsen til de brugere, der er tilknyttet det træ.";
> 		$admtext['branchmailmsg'] = "Valg af en gren vil begrænse meddelelsen til de brugere, der er tilknyttet den gren.";
1562,1563c1680,1681
< 		$admtext['succmail'] = "Din mail er blevet sendt.";
< 		$admtext['mailfailed'] = "Din mail blev ikke sendt.";
---
> 		$admtext['succmail'] = "Mailen er blevet sendt.";
> 		$admtext['mailfailed'] = "Mailen blev ikke sendt.";
1565c1683
< 		$admtext['entermsgtext'] = "Indtast din besked.";
---
> 		$admtext['entermsgtext'] = "Indtast en besked.";
1575d1692
< 		//added in 8.0.0
1578c1695
< 		$admtext['noadmin'] = "Ingen adgang til Admin siderne.";
---
> 		$admtext['noadmin'] = "Ingen adgang til Admin-funktionerne.";
1582c1699
< 		$admtext['usrcontribd'] = "Tilføj oplysninger, inklusiv medier";
---
> 		$admtext['usrcontribd'] = "Tilføj oplysninger, inklusive medier";
1584c1701
< 		$admtext['usreditord'] = "Tilføj, redigér og slet alle oplysninger, inklusiv medier.";
---
> 		$admtext['usreditord'] = "Tilføj, redigér og slet alle oplysninger, inklusive medier.";
1598d1714
<         //added in 9.0.0
1600c1716
< 		$admtext['allow_pdf'] = "Tillad at hente PDF filer";
---
> 		$admtext['allow_pdf'] = "Tillad at hente PDF-filer";
1606,1607c1722,1729
< 		$admtext['consented'] = "Consent given";
< 		$admtext['consentdate'] = "Date Consented";
---
> 		$admtext['consented'] = "Samtykke givet";
> 		$admtext['consentdate'] = "Samtykke dato";
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Vis kun deaktiverede brugere";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Send også til administratorerne, når der er valgt et enkelt træ";
1615c1737
< 		$admtext['sessexp'] = "Din session er udløbet.";
---
> 		$admtext['sessexp'] = "Sessionen er udløbet.";
1617d1738
< 		//added in 8.1.0
1622,1628c1743,1749
< 		$admtext['createnewtlevent'] = "Opret en ny tidslinje begivenhed";
< 		$admtext['modifytlevent'] = "Redigér nuværende tidslinje begivenhed";
< 		$admtext['leaveblankalltlevents'] = "lad stå tom for at se alle tidslinje begivenheder";
< 		$admtext['evyear'] = "Begivenheds år";
< 		$admtext['evdetail'] = "Begivenheds detaljer";
< 		$admtext['selecttleventaction'] = "Vælg tidslinje begivenhed og handling";
< 		$admtext['changestotlevent'] = "Ændringer til tidslinje begivenhed";
---
> 		$admtext['createnewtlevent'] = "Opret en ny tidslinjebegivenhed";
> 		$admtext['modifytlevent'] = "Redigér nuværende tidslinjebegivenhed";
> 		$admtext['leaveblankalltlevents'] = "lad stå tom for at se alle tidslinjebegivenheder";
> 		$admtext['evyear'] = "Begivenhedsår";
> 		$admtext['evdetail'] = "Begivenhedsdetaljer";
> 		$admtext['selecttleventaction'] = "Vælg tidslinjebegivenhed og handling";
> 		$admtext['changestotlevent'] = "Ændringer til tidslinjebegivenhed";
1630,1631c1751,1752
< 		$admtext['confdeletetlevent'] = "Er du sikker på, at du vil slette denne tidslinje begivenhed?";
< 		$admtext['enterevyear'] = "Indtast begivenheds året.";
---
> 		$admtext['confdeletetlevent'] = "Er det sikkert, at denne tidslinjebegivenhed skal slettes?";
> 		$admtext['enterevyear'] = "Indtast begivenhedsåret.";
1633,1636c1754,1757
< 		$admtext['existingtleventinfo'] = "Nuværende tidslinje begivenhed";
< 		$admtext['newtleventinfo'] = "Ny tidslinje begivenhed";
< 		$admtext['edittleventinfo'] = "Tilføj, redigér eller slet tidslinje begivenhed";
< 		$admtext['addnewtlevent'] = "Tilføj ny tidslinje begivenhed";
---
> 		$admtext['existingtleventinfo'] = "Eksisterende tidslinjebegivenhed";
> 		$admtext['newtleventinfo'] = "Ny tidslinjebegivenhed";
> 		$admtext['edittleventinfo'] = "Tilføj, redigér eller slet tidslinjebegivenhed";
> 		$admtext['addnewtlevent'] = "Tilføj ny tidslinjebegivenhed";
1640,1641c1761
< 		//added in 9.0.0
< 		$admtext['evtitle'] = "Begivenheds titel";
---
> 		$admtext['evtitle'] = "Begivenhedstitel";
1656d1775
< 	//added in 8.0.0
1660c1779
< 		$admtext['mwblurb'] = "Opret en liste over ukendte personer eller billeder, i håb om at mere opmærksomhed kan give flere oplysninger om disse personer og billeder.";
---
> 		$admtext['mwblurb'] = "Opret en liste over ukendte personer eller billeder, så der er mulighed for flere oplysninger om disse personer og billeder.";
1670c1789
< 		$admtext['not_living'] = "Person markeret som levende, dødsdato eksisterer";
---
> 		$admtext['not_living'] = "Person markeret som nulevende, dødsdato eksisterer";
1672,1673c1791,1792
< 		$admtext['parmarr'] = "Forældrenes Vielse";
< 		$admtext['motherbirth'] = "Moders Fødsel";
---
> 		$admtext['parmarr'] = "Forældrenes vielse";
> 		$admtext['motherbirth'] = "Mors fødsel";
1687c1806
< 		$admtext['badtarget'] = "Forkert mål-fil";
---
> 		$admtext['badtarget'] = "Forkert målfil";
1694,1695c1813,1814
< 		$admtext['nodesc'] = "Parameter definitionsfejl, mangler beskrivelse";
< 		$admtext['defval'] = "Standard værdi";
---
> 		$admtext['nodesc'] = "Parameterdefinitionsfejl, mangler beskrivelse";
> 		$admtext['defval'] = "Standardværdi";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1705c1822
< 		$admtext['editperf'] = "Redigér parametre blev ændret således:";
---
> 		$admtext['editperf'] = "Redigeringsparametre blev ændret således:";
1708,1709c1825,1826
< 		$admtext['viewlog'] = "Vis Log";
< 		$admtext['target'] = "Changes";
---
> 		$admtext['viewlog'] = "Vis log";
> 		$admtext['target'] = "Mål";
1713,1718c1830,1835
< 		$admtext['logoptions'] = "Mod Manager Log Indstillinger";
< 		$admtext['mmlogfilename'] = "Log File Navn";
< 		$admtext['sortlistby'] = "Sortér Listerne efter";
< 		$admtext['modname'] = "Mod Navn";
< 		$admtext['bypassconfirm'] = "Forbigå Bekræftelserne";
< 		$admtext['modifyoptions'] = "Redigér Mod Manager Indstillinger";
---
> 		$admtext['logoptions'] = "Mod managers logindstillinger";
> 		$admtext['mmlogfilename'] = "Logfilnavn";
> 		$admtext['sortlistby'] = "Sortér listerne efter";
> 		$admtext['modname'] = "Mod navn";
> 		$admtext['bypassconfirm'] = "Udelad bekræftelserne";
> 		$admtext['modifyoptions'] = "Redigér Mod Manager indstillinger";
1722,1724c1839,1841
< 		$admtext['showlogfile'] = "Vis Mod Manager Handlings Log";
< 		$admtext['recentactions'] = "Mod Manager Seneste Handlinger";
< 		$admtext['clearlog'] = "Slet Loggen";
---
> 		$admtext['showlogfile'] = "Vis Mod Manager handlingslog";
> 		$admtext['recentactions'] = "Mod Manager seneste handlinger";
> 		$admtext['clearlog'] = "Slet loggen";
1726,1727c1843,1844
< 		$admtext['modsyntax'] = "Mod Syntaks";
< 		$admtext['modguidelines'] = "Mod Standarder";
---
> 		$admtext['modsyntax'] = "Mod syntaks";
> 		$admtext['modguidelines'] = "Mod standarder";
1743c1860
< 		$admtext['mmmaxloglines'] = "Max antal af transaktioner";
---
> 		$admtext['mmmaxloglines'] = "Maks. antal transaktioner";
1746c1863
< 		$admtext['uninstall'] = "Afinstallere";    // was $admtext['remove'] = "Remove"
---
> 		$admtext['uninstall'] = "Afinstaller";    // was $admtext['remove'] = "Remove"
1756c1873
< 		$admtext['copiesreq'] = "fil kopier angivet";
---
> 		$admtext['copiesreq'] = "filkopier angivet";
1763c1880
< 		$admtext['format'] = "format fejl";
---
> 		$admtext['format'] = "formatfejl";
1766c1883
< 		$admtext['line'] = "Linie";
---
> 		$admtext['line'] = "Linje";
1768c1885
< 		$admtext['modsinst'] = "kode ændringer installed";
---
> 		$admtext['modsinst'] = "kodeændringer installeret";
1770,1771c1887,1888
< 		$admtext['modsrem'] = "kode ændringer fjernet";
< 		$admtext['modsreq'] = "kode ændringer angivet";
---
> 		$admtext['modsrem'] = "kodeændringer fjernet";
> 		$admtext['modsreq'] = "kodeændringer angivet";
1774c1891
< 		$admtext['noact'] = "handlings kode ugyldig";
---
> 		$admtext['noact'] = "handlingskode ugyldig";
1778c1895
< 		$admtext['nolocation'] = "manglende sted kode";
---
> 		$admtext['nolocation'] = "manglende stedkode";
1786c1903
< 		$admtext['restparam'] = "Genopretter standard parameter";
---
> 		$admtext['restparam'] = "Genopretter standardparameter";
1790c1907
< 		$admtext['tgtfile'] = "mål fil";
---
> 		$admtext['tgtfile'] = "målfil";
1795,1796c1912,1913
< 		$admtext['allowdeletepartial'] = "Tillad Slet markerede af delvist installeret MODs";
< 		$admtext['allowdeleteinstalled'] = "Tillad Slet af individuelt installerede MODs";
---
> 		$admtext['allowdeletepartial'] = "Tillad delvis sletning af markerede MODs";
> 		$admtext['allowdeleteinstalled'] = "Tillad sletning af individuelt installerede MODs";
1798c1915
< 		$admtext['logfullpath'] = "Log fuld sti for fil handlinger";
---
> 		$admtext['logfullpath'] = "Log fuld sti for filhandlinger";
1806,1807c1923,1924
< 		$admtext['bypassed'] = "forbigået";
< 		$admtext['willbypass'] = "vil forbigå";  // was "will bypass"
---
> 		$admtext['bypassed'] = "Udeladt";
> 		$admtext['willbypass'] = "vil udelade";  // was "will bypass"
1826,1827c1943,1944
< 		$admtext['fixedheader'] = "Brug Faste Overskrifter";
< 		$admtext['cantremok'] = "kan ikke fjernes, valgfri, forbigået";
---
> 		$admtext['fixedheader'] = "Brug faste overskrifter";
> 		$admtext['cantremok'] = "kan ikke fjernes, valgfri, udeladt";
1830c1947
< 		$admtext['compresslog'] = "Skjul Log Visning";
---
> 		$admtext['compresslog'] = "Skjul logvisning";
1833c1950
< 		$admtext['fileperms'] = "Tjek fil egenskaber";
---
> 		$admtext['fileperms'] = "Tjek filegenskaber";
1836,1838c1953,1955
< 		$admtext['redirect2log'] = "Omdirigering til Log For";
< 		$admtext['on_error'] = "Kun Fejl";
< 		$admtext['on_all'] = "Alle Handlinger";
---
> 		$admtext['redirect2log'] = "Omdirigering til log For";
> 		$admtext['on_error'] = "Kun fejl";
> 		$admtext['on_all'] = "Alle handlinger";
1840,1843c1957,1960
< 		$admtext['stripeafter'] = "Stripe efter antal rækker";
< 		$admtext['adjusthdrs'] = "Tilpas Faste Overskrifter";
< 		$admtext['displayoptions'] = "Visning Indstillinger";
< 		$admtext['no_frag'] = "kode fragment ikke tilladt her";
---
> 		$admtext['stripeafter'] = "Stribe efter antal rækker";
> 		$admtext['adjusthdrs'] = "Tilpas faste overskrifter";
> 		$admtext['displayoptions'] = "Visningsindstillinger";
> 		$admtext['no_frag'] = "kodefragment ikke tilladt her";
1850c1967
< 		$admtext['showupdates'] = "Vis fanen med Anbefalede Opdateringer";
---
> 		$admtext['showupdates'] = "Vis fanen med anbefalede opdateringer";
1852,1854c1969,1971
< 		$admtext['parsetable'] = "Se Parser Tabel";
< 		$admtext['recommendedfixes'] = "Anbefalede Opdateringer";
< 		$admtext['selectmod'] = "Vælg en MOD config-fil for at se resultaterne i parser tabellen";
---
> 		$admtext['parsetable'] = "Se Parsertabel";
> 		$admtext['recommendedfixes'] = "Anbefalede opdateringer";
> 		$admtext['selectmod'] = "Vælg en MOD config-fil for at se resultaterne i parsertabellen";
1858c1975
< 		$admtext['custtextfixes'] = "Det anbefales i de opdaterede MOD Retningslinjer, at brugerdefineret tekst indsættes før kommentarerne i begyndelsen af filen cust_text.php, således at MOD'er ikke påvirker ændringer af brugermanualen foretaget efter kommentarlinjerne.";
---
> 		$admtext['custtextfixes'] = "Det anbefales i de opdaterede MOD retningslinjer, at brugerdefineret tekst indsættes før kommentarerne i begyndelsen af filen cust_text.php, således at MOD'er ikke påvirker ændringer af brugermanualen foretaget efter kommentarlinjerne.";
1866c1983
< 		$admtext['newanchor'] = "Den nye kommentarlinie bør ikke oversættes i sprogfilerne, så den kan bruges som et anker for at indsætte brugerdefineret tekst før denne nye kommentarlinje af MOD-udviklerne.";
---
> 		$admtext['newanchor'] = "Den nye kommentarlinje bør ikke oversættes i sprogfilerne, så den kan bruges som et anker for at indsætte brugerdefineret tekst før denne nye kommentarlinje af MOD-udviklerne.";
1871,1872c1988,1989
< 		$admtext['confdelmod'] = "Er det sikkert, at denne MOD og tilhørende mappe skal slettes? Man kan ikke fortryde denne operation!";
< 		$admtext['allowdeletesupport'] = "Tillad Slet Støtte mappe, når MOD bliver slettet";
---
> 		$admtext['confdelmod'] = "Er det sikkert, at denne MOD og tilhørende mappe skal slettes? Man kan ikke fortryde denne handling!";
> 		$admtext['allowdeletesupport'] = "Tillad sletning af støttemappe, når MOD bliver slettet";
1874,1875c1991,1992
< 		$admtext['delpartinfo'] = "Man bør kun sætte denne indstilling til Ja, hvis man glemte at Afinstallere tidligere versioner af MOD'en før man installerede en ny version.";
< 		$admtext['delinstinfo'] = "Man bør kun sætte denne indstilling til Ja, hvis man installerede en ny version af MOD'en og den tidligere version stadig står som installeret.";
---
> 		$admtext['delpartinfo'] = "Man bør kun sætte denne indstilling til Ja, hvis man glemte at afinstallere tidligere versioner af MOD'en, før man installerede en ny version.";
> 		$admtext['delinstinfo'] = "Man bør kun sætte denne indstilling til Ja, hvis man installerede en ny version af MOD'en, og den tidligere version stadig står som installeret.";
1877c1994
< 		$admtext['confdelmod1'] = "Er det sikkert, at denne MOD skal slettes? Man kan ikke fortryde denne operation!";
---
> 		$admtext['confdelmod1'] = "Er det sikkert, at denne MOD skal slettes? Man kan ikke fortryde denne handling!";
1879c1996,2002
< 		$admtext['cfgnowrite'] = "Warning: Cfg file is write-protected. Parameters cannot be changed.";
---
> 		$admtext['cfgnowrite'] = "Advarsel: Cfg-fil er skrivebeskyttet. Parametre kan ikke ændres.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alle Mods";
> 		$admtext['installedmods'] = "Kun Installerede Mods";
> 		$admtext['partinstmods'] = "Installerede + Delvis Installerede Mods";
> 		$admtext['showanalyzeractions'] = "Vis handlinger i Mod Analyzer";
> 		$admtext['badchar'] = "Ugyldigt tegn";
1885,1888c2008,2010
< 		$admtext['test_type'] = "Test Type";
< 		$admtext['test_number'] = "Test Nummer";
< 		$admtext['test_date'] = "Test Dato";
< 		$admtext['modifydna'] = "Redigér Eksisterende DNA-Test";
---
> 		$admtext['test_type'] = "Testtype";
> 		$admtext['test_date'] = "Testdato";
> 		$admtext['modifydna'] = "Redigér eksisterende DNA-test";
1890,1897c2012,2019
< 		$admtext['addnewdna'] = "Tilføj Ny DNA-Test";
< 		$admtext['testinfo'] = "Test Oplysning";
< 		$admtext['urls'] = "Relevante Links";
< 		$admtext['dnalater'] = "Bemærk: Flere oplysninger kan tilføjes, og testen kan knyttes til flere personer, på den næste skærm.";
< 		$admtext['selecttype'] = "Vælg en test type.";
< 		$admtext['entertestnum'] = "Indtast test nummer.";
< 		$admtext['test_taker'] = "Person som tog denne test";
< 		$admtext['test_links'] = "Personer forbundet via denne Test";
---
> 		$admtext['addnewdna'] = "Tilføj ny DNA-test";
> 		$admtext['testinfo'] = "Testoplysning";
> 		$admtext['urls'] = "Relevante links";
> 		$admtext['dnalater'] = "Bemærk: Flere oplysninger kan tilføjes, og testen kan knyttes til flere personer i næste vindue.";
> 		$admtext['selecttype'] = "Vælg en testtype.";
> 		$admtext['entertestnum'] = "Indtast testnummer.";
> 		$admtext['test_taker'] = "Person, som tog denne test";
> 		$admtext['test_links'] = "Personer forbundet via denne test";
1900,1902c2022,2024
< 		$admtext['dnalater'] = "Bemærk: Flere oplysninger kan tilføjes, og testen kan knyttes til flere personer, på den næste skærm.";
< 		$admtext['markers'] = "Antal Markers";
< 		$admtext['test_values'] = "Test Værdier";
---
> 		$admtext['dnalater'] = "Bemærk: Flere oplysninger kan tilføjes, og testen kan knyttes til flere personer i næste vindue.";
> 		$admtext['markers'] = "Antal markører";
> 		$admtext['test_values'] = "Testværdier";
1906,1912c2028,2034
< 		$admtext['configsettings'] = "Generelle Indstillinger";
< 		$admtext['addtotestgroup'] = "Tilføj Test Til En Gruppe";
< 		$admtext['dna_group'] = "DNA Gruppe";
< 		$admtext['groupid'] = "Gruppe ID";
< 		$admtext['addgroup'] = "Tilføj Gruppe";
< 		$admtext['entergroupid'] = "Indtast gruppe ID";
< 		$admtext['entergroupdesc'] = "Indtast gruppe beskrivelse";
---
> 		$admtext['configsettings'] = "Generelle indstillinger";
> 		$admtext['addtotestgroup'] = "Tilføj test til en gruppe";
> 		$admtext['dna_group'] = "DNA-Gruppe";
> 		$admtext['groupid'] = "Gruppe-ID";
> 		$admtext['addgroup'] = "Tilføj gruppe";
> 		$admtext['entergroupid'] = "Indtast gruppe-ID";
> 		$admtext['entergroupdesc'] = "Indtast gruppebeskrivelse";
1914c2036
< 		$admtext['modifygroup'] = "Redigér eksisterende Gruppe";
---
> 		$admtext['modifygroup'] = "Redigér eksisterende gruppe";
1916,1918c2038,2049
< 		$admtext['test_results'] = "Test Results";
< 		$admtext['mdaID'] = "Første forfader ID";
< 		$admtext['mrcaID'] = "Første fælles forfader ID";
---
> 		$admtext['test_results'] = "Testresultater";
> 		$admtext['mdaID'] = "Ældste anes ID";
> 		$admtext['mrcaID'] = "Ældste fælles anes ID";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testnummer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Hold denne test privat";
> 		$admtext['multivalues'] = "Brug bindestreget mellem multiværdier";
> 		$admtext['changestogroup'] = "Ændringer til DNa-Gruppe";
> 		$admtext['modifydnagroup'] = "Redigér eksisterende DNA-Gruppe";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Knyt denne DNA-test til en person";
1945c2076
< $admtext['exactmatch'] = "Kun præcis match";
---
> $admtext['exactmatch'] = "Kun præcist match";
1965d2095
< $admtext['otherevents'] = "Andre begivenheder";
1988c2118
< $admtext['confdeleteevent'] = "Er du sikker på, at du vil slette denne begivenhed?";
---
> $admtext['confdeleteevent'] = "Er det sikkert, at denne begivenhed skal slettes?";
1999c2129
< $admtext['histories'] = "Historier";
---
> $admtext['histories'] = "Fortællinger";
2006c2136
< $admtext['confdeleteentity'] = "Er du sikker på, at du vil slette det valgte";
---
> $admtext['confdeleteentity'] = "Er det sikkert, at det valgte skal slettes";
2016c2146
< $admtext['treebefevent'] = "Du skal vælge eller indtaste et trænavn, før du kan tilføje nye begivenheder.";
---
> $admtext['treebefevent'] = "Man skal vælge eller indtaste et trænavn, før man kan tilføje nye begivenheder.";
2024,2025c2154,2155
< $admtext['confdeletenote'] = "Er du sikker på, at du vil slette dette notat?";
< $admtext['treebefnote'] = "Du skal vælge eller indtaste et trænavn, før du kan tilføje nye notater.";
---
> $admtext['confdeletenote'] = "Er det sikkert, at dette notat skal slettes?";
> $admtext['treebefnote'] = "Man skal vælge eller indtaste et trænavn, før man kan tilføje nye notater.";
2030,2031c2160,2161
< $admtext['lds'] = "LDS";
< $admtext['norights'] = "Du har ikke tilladelse til at se denne side. Hvis du har brugernavn og adgangskode, så log venligst ind herunder.";
---
> $admtext['lds'] = "SDH";
> $admtext['norights'] = "Du har ikke tilladelse til at se denne side. Hvis du har brugernavn og adgangskode, så log ind nedenfor.";
2042c2172
< $admtext['confdeletepers'] = "Er du sikker på, at du vil slette denne person?";
---
> $admtext['confdeletepers'] = "Er det sikkert, at denne person skal slettes?";
2050,2051d2179
< $admtext['savereturn'] = "Tilbage til denne side";
< $admtext['saveback'] = "Tilbage til menuen";
2058,2059d2185
< $admtext['secondary'] = "Sekundære processer";
< $admtext['commas'] = "Adskil flere indtastninger med kommaer";
2088,2089c2214,2215
< $admtext['eventdate'] = "Begivenheds Dato";
< $admtext['eventplace'] = "Begivenheds Sted";
---
> $admtext['eventdate'] = "Begivenhedsdato";
> $admtext['eventplace'] = "Begivenhedssted";
2116,2118c2242,2244
< $admtext['divplace'] = "Skilsmisse Sted";
< $admtext['divdate'] = "Skilsmisse Dato";
< $admtext['divdatetr'] = "Skilsmisse Dato (Sand)";
---
> $admtext['divplace'] = "Skilsmissested";
> $admtext['divdate'] = "Skilsmissedato";
> $admtext['divdatetr'] = "Skilsmissedato (Sand)";
2129,2130d2254
< $admtext['secondarymaint'] = "Sekundære vedligeholdelses processer";
< $admtext['customeventtypes'] = "Begivenhedstyper";
2140c2264
< $admtext['combineextras'] = "Kombiner billeder og historier";  //changed as well
---
> $admtext['combineextras'] = "Kombiner billeder og fortællinger";  //changed as well
2147,2148c2271,2272
< $admtext['combinenotesonly'] = "Kombinér notater";
< $admtext['addmedia'] = "Tilføj Medie";
---
> $admtext['combinenotesonly'] = "Flet notater";
> $admtext['addmedia'] = "Tilføj medie";
2151c2275
< $admtext['gedimport'] = "GEDCOM import";
---
> $admtext['gedimport'] = "GEDCOM-import";
2153c2277
< $admtext['confdeleterecs'] = "Er du sikker på, at du vil slette de valgte poster?";
---
> $admtext['confdeleterecs'] = "Er det sikkert, at de valgte poster skal slettes?";
2156c2280
< $admtext['notfound'] = " ikke fundet. Prøv en anden søgning. Kontroller Hjælp til Kortsøgning for mulige årsager til at søgningen fejlede eller prøv igen via Fuld Google Kortsøgning";
---
> $admtext['notfound'] = " ikke fundet. Prøv en anden søgning. Kontroller 'Hjælp til Kortsøgning' for mulige årsager til at søgningen fejlede eller prøv igen via fuld Google kortsøgning";
2162,2163c2286,2287
< $admtext['difficultmap'] = "Fuld Google Kortsøgning";
< $admtext['maphelp'] = "Hjælp til Kortsøgning";
---
> $admtext['difficultmap'] = "Fuld Google kortsøgning";
> $admtext['maphelp'] = "Hjælp til kortsøgning";
2173c2297
< $admtext['entereventinfo'] = "Indtast venligst en ny begivenhedsdato, et begivenhedssted eller detaljerne for denne begivenhed.";
---
> $admtext['entereventinfo'] = "Indtast en ny begivenhedsdato, et begivenhedssted eller detaljerne for denne begivenhed.";
2175c2299
< $admtext['enternote'] = "Indtast venligst notat teksten.";
---
> $admtext['enternote'] = "Indtast notatteksten.";
2177c2301
< $admtext['confdeletecite'] = "Er du sikker på, at du vil slette denne henvisning?";
---
> $admtext['confdeletecite'] = "Er det sikkert, at denne henvisning skal slettes?";
2187c2311
< $admtext['donotreplace'] = "Erstat ingen data";
---
> $admtext['donotreplace'] = "Udskift ikke nogen data";
2190c2314
< $admtext['website'] = "Hjemmeside";
---
> $admtext['website'] = "Websted";
2203c2327
< $admtext['toggle'] = "Skift Visning";
---
> $admtext['toggle'] = "Skift visning";
2210c2334
< $admtext['alphanum'] = "Brug kun alfanummeriske karakterer i træ ID.";
---
> $admtext['alphanum'] = "Brug kun alfanummeriske karakterer i træ-ID.";
2218,2220c2342,2343
< $admtext['confdeletefile'] = "Er du sikker på, at du vil slette denne fil?";
< //changed in 8.0.0
< $admtext['datenote'] = "<strong>Bemærk:</strong> Ved indtastning af datoer bruges standard formatet dd mmm åååå. For eksempel: 10 apr 2004.";
---
> $admtext['confdeletefile'] = "Er det sikkert, at denne fil skal slettes?";
> $admtext['datenote'] = "<strong>Bemærk:</strong> Ved indtastning af datoer bruges standardformatet dd mmm åååå. F.eks: 10 apr 2004.";
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2240c2360
< $admtext['confdeleteassoc'] = "Er du sikker på, at du vil slette denne tilknytning?";
---
> $admtext['confdeleteassoc'] = "Er det sikkert, at denne tilknytning skal slettes?";
2245d2364
< //added in 9.0.0
2247c2366
< $admtext['copylast'] = "Kopier Sidste";
---
> $admtext['copylast'] = "Kopier sidste";
2249,2250c2368,2369
< $admtext['nicitalic'] = "Klik for Kursiv Skrift";
< $admtext['nicunderline'] = "Klik for Understreget Skrift";
---
> $admtext['nicitalic'] = "Klik for kursiv skrift";
> $admtext['nicunderline'] = "Klik for understreget skrift";
2255,2263c2374,2382
< $admtext['nicinsol'] = "Indsæt Sorteret Liste";
< $admtext['nicinsul'] = "Indsæt Usorteret Liste";
< $admtext['nicsub'] = "Klik for Sænket Skrift";
< $admtext['nicsup'] = "Klik for Hævet Skrift";
< $admtext['nicstrike'] = "Klik for Gennemstreget Skrift";
< $admtext['nicremfmt'] = "Fjern Formatering";
< $admtext['nicindent'] = "Indryk Tekst";
< $admtext['nicremind'] = "Fjern Indrykning";
< $admtext['nichr'] = "Vandret Linie";
---
> $admtext['nicinsol'] = "Indsæt sorteret liste";
> $admtext['nicinsul'] = "Indsæt usorteret liste";
> $admtext['nicsub'] = "Klik for sænket skrift";
> $admtext['nicsup'] = "Klik for hævet skrift";
> $admtext['nicstrike'] = "Klik for gennemstreget skrift";
> $admtext['nicremfmt'] = "Fjern formatering";
> $admtext['nicindent'] = "Indryk tekst";
> $admtext['nicremind'] = "Fjern indrykning";
> $admtext['nichr'] = "Vandret linje";
2267,2270c2386,2389
< $admtext['niclink'] = "Tilføj Link";
< $admtext['nicremlink'] = "Fjern Link";
< $admtext['nictxtcol'] = "Skift Tekst Farve";
< $admtext['nicbkgcol'] = "Skift Baggrunds Farve";
---
> $admtext['niclink'] = "Tilføj link";
> $admtext['nicremlink'] = "Fjern link";
> $admtext['nictxtcol'] = "Skift tekstfarve";
> $admtext['nicbkgcol'] = "Skift baggrundsfarve";
2273c2392
< $admtext['editwarn'] = "Din lås på denne post er ved at udløbe. Gem dine ændringer nu for at forhindre dem i at blive overskrevet af en anden bruger.";
---
> $admtext['editwarn'] = "Låsen på denne post er ved at udløbe. Gem ændringerne nu for at forhindre at de bliver overskrevet af en anden bruger.";
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2290,2291c2405,2406
< $admtext['confdellink'] = "Er du sikker på, at du vil slette dette link?";
< $admtext['existlinks'] = "Nuværende links";
---
> $admtext['confdellink'] = "Er det sikkert, at dette link skal slettes?";
> $admtext['existlinks'] = "Eksisterende links";
2295c2410
< $admtext['unlink'] = "Fjern Linket";
---
> $admtext['unlink'] = "Fjern linket";
2297,2299c2412,2414
< $admtext['dna_links'] = "DNA Links";
< $admtext['dataval'] = "Data Godkendelse";
< $admtext['norels'] = "Slå slægtskabs meddelelser fra";
---
> $admtext['dna_links'] = "DNA-links";
> $admtext['dataval'] = "Datagodkendelse";
> $admtext['norels'] = "Slå slægtskabsmeddelelser fra";
2302c2417
< $admtext['findciteid'] = "Find Citat ID";
---
> $admtext['findciteid'] = "Find Citat-ID";
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Efternavne";
> $admtext['subhead'] = "Underhead";
> $admtext['image'] = "Billede";
> $admtext['author'] = "Forfatter";
2310,2311c2430,2464
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Kom i gang";
> $admtext['showlog'] = "Admin-Log";
> $admtext['nobirthinfo'] = "Ingen fødselsinfo";
> //changed in 13.0
> $admtext['savereturn'] = "Gem + Tilbage til denne side";
> $admtext['saveback'] = "Gem + Tilbage til Admin Menu";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alting blev slettet.";
> $admtext['private'] = "Private";
> $admtext['imgtags'] = "Billede Etiketter";
> 
> $admtext['removelink'] = "Slet dette link";
> $admtext['eloptions'] = "Gennemse eller slet";
> $admtext['pleaseenter'] = "Skriv venligst en ";
> 
> $admtext['nolinks'] = "Der er endnu ingen links";
> $admtext['nogeocode'] = "Kunne ikke geokodes";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Vælg<br/>standard<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Begivenheds- og Egenskabs typer";
> $admtext['secondary'] = "Hjælperedskaber efter import";
> $admtext['otherevents'] = "Andre Begivenheder og Egenskaber";
> //added in 14.0
> $admtext['newlinks'] = "Oprettet links";
> $admtext['newcemlinks'] = "Oprettet links til kirkegårde";
> $admtext['utility'] = "Hjælperedskaber";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Flyt";
> $admtext['copy'] = "Kopiér";
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Danish/alltext.php TNG1403/languages/Danish/alltext.php
29,30c29,30
< $dates['BEF'] = "før";
< $dates['BEFORE'] = "før";
---
> $dates['BEF'] = "før";
> $dates['BEFORE'] = "før";
40c40
< $dates['EST'] = "Skønnet";
---
> $dates['EST'] = "Skønnet";
43c43
< $text['cannotexecutequery'] = "Kan ikke køre forespørgsel";
---
> $text['cannotexecutequery'] = "Kan ikke køre forespørgsel";
46c46
< $text['text_next'] = "Næste";
---
> $text['text_next'] = "Næste";
50,51c50,51
< $text['forgot1'] = "<strong>Har du glemt brugernavn eller kodeord?</strong><br />Indtast din mailadresse nedenfor, så sendes dit brugernavn til dig.";
< $text['forgot2'] = "Indtast din mailadresse ovenfor og dit brugernavn nedenfor for at få et nyt kodeord (et midlertidigt kodeord vil blive sendt til dig).";
---
> $text['forgot1'] = "<strong>Har du glemt brugernavn eller kodeord?</strong><br />Indtast din mailadresse nedenfor, så sendes dit brugernavn til dig.";
> $text['forgot2'] = "Indtast din mailadresse ovenfor og dit brugernavn nedenfor for at få et nyt kodeord (et midlertidigt kodeord vil blive sendt til dig).";
65c65
< $text['histories'] = "Historier";
---
> $text['histories'] = "Fortællinger";
82c82
< $text['loading'] = "Indlæser...";
---
> $text['loading'] = "Indlæser...";
86c86
< $text['mainton'] = "Hjemmesiden opdateres i øjeblikket";
---
> $text['mainton'] = "Webstedet opdateres i øjeblikket";
88d87
< //moved here in 8.0.0
91,94c90,93
< $admtext['confunlink'] = "Er du sikker på, at du vil fjerne denne person som partner i denne familie?";
< $admtext['confunlinkc'] = "Er du sikker på, at du vil fjerne denne persons tilknytning som barn i familien?";
< $admtext['confremchild'] = "Er du sikker på, at du vil fjerne dette barn fra denne familie? (Barnet slettes ikke fra databasen).";
< $admtext['enterfamilyid'] = "Skriv venligst et familie-ID.";
---
> $admtext['confunlink'] = "Er det sikkert, at denne person skal fjernes som partner i denne familie?";
> $admtext['confunlinkc'] = "Er det sikkert, at denne persons tilknytning som barn i familien skal fjernes?";
> $admtext['confremchild'] = "Er det sikkert, at dette barn skal fjernes fra denne familie? (Barnet slettes ikke fra databasen).";
> $admtext['enterfamilyid'] = "Indtast et familie-ID.";
97,99c96,98
< $admtext['BIRT'] = "Fødsel";
< $admtext['DEAT'] = "Død";
< $admtext['CHR'] = "Dåb";
---
> $admtext['BIRT'] = "Fødsel";
> $admtext['DEAT'] = "Død";
> $admtext['CHR'] = "DÃ¥b";
101,103c100,102
< $admtext['BAPL'] = "Dåb (LDS)";
< $admtext['ENDL'] = "Begavelse (LDS)";
< $admtext['NICK'] = "Kælenavn/Kaldenavn";
---
> $admtext['BAPL'] = "DÃ¥b (SDH)";
> $admtext['ENDL'] = "Begavelse (SDH)";
> $admtext['NICK'] = "Kælenavn/Kaldenavn";
107c106
< $admtext['SLGC'] = "Beseglet til forældre (LDS)";
---
> $admtext['SLGC'] = "Beseglet til forældre (SDH)";
109c108
< $admtext['SLGS'] = "Beseglet til partner (LDS)";
---
> $admtext['SLGS'] = "Beseglet til partner (SDH)";
111c110
< $admtext['activated'] = "Din adgang til hjemmesiden er aktiveret. ";
---
> $admtext['activated'] = "Din adgang til webstedet er aktiveret. ";
113,115c112
< $admtext['subjectline'] = "Din adgang til hjemmesiden er aktiveret";
< 
< //moved here in 8.1.0
---
> $admtext['subjectline'] = "Din adgang til webstedet er aktiveret";
117c114
< $admtext['birth'] = "Fødsel";
---
> $admtext['birth'] = "Fødsel";
119,120c116
< $admtext['sealing'] = "Besegling";
< //added in 11.0.3
---
> $admtext['sealing'] = "Besegling (SDH)";
123,126c119
< //added in 9.0.0
< $text['editprofile'] = "Redigér Profil";
< 
< //moved here in 9.0.0
---
> $text['editprofile'] = "Redigér profil";
129c122
< $text['sunday'] = "søndag";  //first day of week on calendar
---
> $text['sunday'] = "søndag";  //first day of week on calendar
135c128
< $text['saturday'] = "lørdag";
---
> $text['saturday'] = "lørdag";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
146,151c136,139
< $text['go'] = "Udfør";
< $text['years'] = "år";
< 
< //added in 10.0.0
< $admtext['CONL'] = "Konfirmation (LDS)";
< $admtext['INIT'] = "Forberedende (LDS)";
---
> $text['go'] = "Udfør";
> $text['years'] = "Ã¥r";
> $admtext['CONL'] = "Bekræftelse (SDH)";
> $admtext['INIT'] = "Forberedende (SDH)";
153,157c141,143
< $text['switchm'] = "Skift til mobil site";
< $text['switchs'] = "Skift til standard site";
< 
< //added in 11.0.0
< $text['dna_tests'] = "DNA Tests";
---
> $text['switchm'] = "Skift til mobilvisning";
> $text['switchs'] = "Skift til standardvisning";
> $text['dna_tests'] = "DNA-tests";
159,160c145
< $text['problem'] = "Der er opstået en fejl i TNG-softwaren. Dette kan skyldes et opsætnings problem, en ufuldstændig opgradering eller en program fejl. Ejeren af webstedet kan kontakte TNG support for at få hjælp med dette problem. Kopier og indsæt forespørgslen herunder i henvendelsen.";
< $text['query'] = "Forespørgsel";
---
> $text['query'] = "Forespørgsel";
163d147
< //moved here in 12.0.0
165,169c149,153
< $admtext['dna_groups'] = "DNA Gruppe";
< $admtext['allbranches'] = "All Branches";
< $admtext['active'] = "Active";
< $admtext['select'] = "Vælg";
< $admtext['selectall'] = "Vælg alt";
---
> $admtext['dna_groups'] = "DNA-gruppe";
> $admtext['allbranches'] = "Alle grene";
> $admtext['active'] = "Aktiv";
> $admtext['select'] = "Vælg";
> $admtext['selectall'] = "Vælg alt";
173,184c157,166
< //added here in 12.0.0
< $text['testgroup'] = "Test Gruppe";
< $text['test_number'] = "Test Nummer/Name";
< $text['test_info_display'] = "Test Information To Display";
< $text['confirmed'] = "Confirmed";
< $text['predicted'] = "Predicted";
< $admtext['ancestral_surnames'] = "Ane efternavne";
< $admtext['admin_notes'] = "Administrator bemærkninger";
< $admtext['mda'] = "Første forfader";
< $admtext['mrca'] = "Første fælles forfader ";
< $admtext['marker_values'] = "Marker Værdier";
< $admtext['ref_seq'] = "Reference sequence";
---
> $text['testgroup'] = "Testgruppe";
> $text['test_info_display'] = "Vis testinformation";
> $text['confirmed'] = "Bekræftet";
> $text['predicted'] = "Forudset";
> $admtext['ancestral_surnames'] = "Aneefternavne";
> $admtext['admin_notes'] = "Administrator bemærkninger";
> $admtext['mda'] = "Ældste ane";
> $admtext['mrca'] = "Ældste fælles ane (MRCA) ";
> $admtext['marker_values'] = "Markørværdier";
> $admtext['ref_seq'] = "Referencesekvens";
187,195c169,177
< $admtext['hvr_values'] = "HVR Forskelle";
< $admtext['hvr1_values'] = "HVR1 Forskelle";
< $admtext['hvr2_values'] = "HVR2 Forskelle";
< $admtext['coding_reg'] = "Kodning regions forskelle";
< $text['keep_name_private'] = "Hold Navn Privat";
< $text['test_results'] = "Test Results";
< $admtext['dna_tests'] = "DNA Tests";
< $admtext['vendor'] = "Sælger";
< $admtext['markers'] = "Antal Markeringer";
---
> $admtext['hvr_values'] = "HVR forskelle";
> $admtext['hvr1_values'] = "HVR1 forskelle";
> $admtext['hvr2_values'] = "HVR2 forskelle";
> $admtext['coding_reg'] = "Kodning regionsforskelle";
> $text['keep_name_private'] = "Hold navn privat";
> $text['test_results'] = "Testresultater";
> $admtext['dna_tests'] = "DNA-tests";
> $admtext['vendor'] = "Testfirma";
> $admtext['markers'] = "Antal markører";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Testnummer/navn";
> $admtext['match_date'] = "Matchdato";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Slægtskabsafsnit";
> $admtext['relationship_range'] = "Slægtskabsomfang";
> $admtext['suggested_relationship'] = "Foreslået";
> $admtext['actual_relationship'] = "Aktuelt slægtskab";
> $admtext['related_side'] = "Beslægtet gren";
> $admtext['shared_dna'] = "Delt DNA";
> $admtext['shared centimorgans'] = "Totalt delte cMs";
> $admtext['shared_segments'] = "Delte segmenter";
> $admtext['largest_segment'] = "Største segment";
> $admtext['chromosome'] = "Kromosom nr.";
> $admtext['segment_start'] = "Segment begyndelse";
> $admtext['segment_end'] = "Segment slut";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matchende SNPer";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Privat test";
> $text['shared_dna'] = "Delt DNA segment";
> $text['for_match'] = "for denne match";
> $admtext['keeptest'] = "Privat test";
> $admtext['keepname'] = "Privat navn";
> $admtext['allgroups'] = "Alle grupper";
> $admtext['alltypes'] = "Alle typer";
> $admtext['generation_num'] = "Generationer af forfædres efternavne";
> 
> $text['birthabbr'] = "f.";
> $text['chrabbr'] = "dbt.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "begr.";  //from descend
> $text['marrabbr'] = "g.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find alle personer med begivenheder på dette sted";
> $text['firstpage'] = "Første side";
> $text['lastpage'] = "Sidste side";
> 
> //changed in 13.0.0
> $text['problem'] = "Der er fejl i TNG-softwaren. Hvad skal man gøre:<p>Hvis man netop har installeret en opgradering, kan man muligvis have sprunget over en del af installationsinstruktionerne. Gå tilbage til opgraderings readme siden og læst instruktionerne igen. Vær særlig opmærksom på databasestruktur trinnet. </p><p>Hvis det er første gang, at TNG er blevet installeret, kan det være nødvendigt at oprette databasetabellerne. Gå tilbage til siden readme.html for at finde det trin.</p><p>Ejeren af webstedet kan kontakte TNG support for yderligere hjælp til dette problem. Kopier nedenstående forespørgsel, og indsæt den i en meddelelse.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Ingen gren";
> 
> //added in 14.0
> $text['oneyear'] = "Ã¥r";
> $text['pwdcodelink'] = "Klik på dette link for at få tilsendt en midlertidig adgangskode.";
> $text['pwdcodesent'] = "Et link til nulstilling af adgangskoden er blevet sendt til din e-mail-adresse.";
> $text['moved'] = "Flyttet";
> $text['citation'] = "Citat";
> $text['other'] = "Andre oplysninger";
> $text['death'] = "Død";
> $text['burial'] = "Begravelse";
> $text['cremation'] = "Kremering";
> $text['marriage'] = "Ægteskab";
> $text['divorce'] = "Skilsmisse";
> $text['bylength'] = "Trin";
> $text['bymarriages'] = "Ægteskaber";
> $text['none'] = "Ingen";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Kilde";
> $text['repository'] = "Arkiv";
> $text['place'] = "Sted";
> $admtext['BAPM'] = "DÃ¥b";
> 
> $text['glang'] = "da";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Danish: readme.html
diff -r TNG/languages/Danish/text.php TNG1403/languages/Danish/text.php
23c23
< 		$text['standby'] = "Webstedet er ikke tilgængelig i øjeblikket pga. opdatering. Prøv igen om nogle minutter. Hvis siden ikke er tilgængelig inden for kort tid, <a href=\"suggest.php\">kontakt da webstedets administrator</a>.";
---
> 		$text['standby'] = "Webstedet er ikke tilgængelig i øjeblikket pga. opdatering. Prøv igen om nogle minutter. <a href=\"suggest.php\">Kontakt webstedets administrator,</a> hvis siden er nede i længere tid.";
31c31
< 		$text['includelds'] = "Inkluder LDS oplysninger";
---
> 		$text['includelds'] = "Inkluder SDH-oplysninger";
34c34
< 		$text['nomaxgen'] = "Angiv antal generationer. Brug Tilbage tasten for at rette fejlen";
---
> 		$text['nomaxgen'] = "Angiv antal generationer. Brug Tilbage-tasten for at rette fejlen";
46c46
< 		$text['mailnotsent'] = "Beklager, men beskeden kunne ikke leveres. Kontakt venligst xxx direkte på yyy.";
---
> 		$text['mailnotsent'] = "Beklager, men beskeden kunne ikke leveres. Kontakt xxx direkte på yyy.";
48,49c48,49
< 		$text['entername'] = "Skriv venligst dit navn";
< 		$text['entercomments'] = "Skriv venligst dine kommentarer";
---
> 		$text['entername'] = "Skriv dit navn";
> 		$text['entercomments'] = "Skriv dine bemærkninger";
57c57
< 		$text['photoshistoriesfor'] = "Billeder og historier for";
---
> 		$text['photoshistoriesfor'] = "Billeder og fortællinger for";
66c66
< 		$text['received'] = "Dit forslag er videresendt.";
---
> 		$text['received'] = "Forslaget er videresendt.";
69d68
< 		$text['general'] = "Generelt";
72,73c71,72
< 		$text['reviewmsg'] = "Du har foreslået en ændring som skal tjekkes. Indsendelsen vedrører:";
<         $text['revsubject'] = "Foreslået ændring kræver din revision";
---
> 		$text['reviewmsg'] = "Du har foreslået en ændring, som skal tjekkes. Indsendelsen vedrører:";
>         $text['revsubject'] = "Foreslået ændring skal godkendes";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "De to personer er identiske.";
---
> 		$text['sameperson'] = "De to personer er én og samme person.";
92,93c92,93
< 		$text['findrelinstr'] = "For at vise slægtskabet mellem to personer, skal du bruge 'Find'-knapperne nedenfor for at finde de aktuelle personer (eller behold de viste personer), derefter klikkes på 'Beregn'.";
< 		$text['sometimes'] = "(Sommetider kan man ved at vælge et andet antal generationer få et andet resultat.)";
---
> 		$text['findrelinstr'] = "For at vise slægtskabet mellem to personer, skal man bruge 'Find'-knapperne nedenfor for at finde de aktuelle personer (eller behold de viste personer), derefter klikkes på 'Beregn'.";
> 		$text['sometimes'] = "(Nogle gange får man et andet resultat ved at søge et andet antal generationer.)";
126,132c126,132
< 		$text['gencheck'] = "Max. antal generationer,<br />der skal tjekkes";
< 		$text['mcousin'] = "xxx fætter/kusine yyy til";  //male cousin; xxx = cousin number, yyy = times removed
< 		$text['fcousin'] = "xxx fætter/kusine yyy til";  //female cousin
< 		$text['cousin'] = "xxx fætter/kusine yyy til";
< 		$text['mhalfcousin'] = "xxx halvfætter yyy til";  //male cousin
< 		$text['fhalfcousin'] = "xxx halvkusine yyy til";  //female cousin
< 		$text['halfcousin'] = "xxx halvfætter eller halvkusine yyy til";
---
>         $text['gencheck'] = "Maks. antal generationer,<br />der skal tjekkes";
>         $text['mcousin'] = "xxx fætter yyy til";  //male cousin; xxx = cousin number, yyy = times removed
>         $text['fcousin'] = "xxx kusine yyy til";  //female cousin
>         $text['cousin'] = "xxx fætter/kusine yyy til";
>         $text['mhalfcousin'] = "xxx halvfætter yyy til";  //male cousin
>         $text['fhalfcousin'] = "xxx halvkusine yyy til";  //female cousin
>         $text['halfcousin'] = "xxx halvfætter eller halvkusine yyy til";
147c147
< 		$text['fmil'] = "svigerfar/mor til";
---
> 		$text['fmil'] = "svigerfar/-mor til";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Søg efter forbindelser";
> 		$text['findrel2'] = "Find slægtskaber og andre forbindelser";
> 		$text['makeme2nd'] = "Brug mit ID";
> 		$text['usebookmarks'] = "Brug bogmærker";
> 		$text['select2inds'] = "Vælg to personer.";
> 		$text['indinfofor'] = "Individual info for";
> 		$text['nobookmarks'] = "Der er ikke fundet nogen bogmærker";
> 		$text['bkmtitle'] = "Personer fundet i bogmærker";
> 		$text['bkminfo'] = "Vælg en person:";
> 		$text['sortpathsby'] = "Sortér stier efter antal af";
> 		$text['sortbyshort'] = "Sortér efter";
> 		$text['bylengthshort'] = "Længde";
> 		$text['badID1'] = ": forkert person1 ID - gå tilbage og ret";
> 		$text['badID2'] = ": forkert person2 ID - gå tilbage og ret";
> 		$text['notintree'] = ": personen med dette ID er ikke i dette træs database.";
> 		$text['sameperson'] = "De to personer er én og samme person.";;
> 		$text['nopaths'] = "Der er ingen forbindelse mellem disse personer.";
> 		$text['nopaths1'] = "Der er ingen forbindelser kortere end xxx";
> 		$text['nopaths2'] = "i xxx søge trin";
> 		$text['longestpath'] = "(længste sti tjekket var xxx trin lang)";
> 		$text['relevantpaths'] = "Antallet af forskellige relevante stier: xxx";
> 		$text['skipMarr'] = "(antal af stier, der ikke er vist på grund af for mange ægteskaber: xxx)";
> 		$text['mjaor'] = "eller";
> 		$text['connectionsto'] = "Forbindelser til ";
> 		$text['findanotherpers'] = "Find en anden person...";
> 		$text['sometimes'] = "(Nogle gange får man et andet resultat ved at søge et andet antal generationer.)";
> 		$text['anotherpath'] = "Søg efter andre forbindelser";
> 		$text['xpath'] = "Sti ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Slut Person";
> 		$text['parent'] = "Forældre";
> 		$text['mhfather'] = "hans far";
> 		$text['mhmother'] = "hans mor";
> 		$text['mhhusband'] = "hans mand";
> 		$text['mhwife'] = "hans kone";
> 		$text['mhson'] = "hans søn";
> 		$text['mhdaughter'] = "hans datter";
> 		$text['fhfather'] = "hendes far";
> 		$text['fhmother'] = "hendes mor";
> 		$text['fhhusband'] = "hendes mand";
> 		$text['fhwife'] = "hendes kone";
> 		$text['fhson'] = "hendes søn";
> 		$text['fhdaughter'] = "hendes datter";
> 		$text['hfather'] = "far";
> 		$text['hmother'] = "mor";
> 		$text['hhusband'] = "mand";
> 		$text['hwife'] = "kone";
> 		$text['hson'] = "søn";
> 		$text['hdaughter'] = "datter";
> 		$text['maxruns'] = "Maks. antal stier, der skal tjekkes";
> 		$text['maxrshort'] = "Maks. antal stier";
> 		$text['maxlength'] = "Forbindelsesstien ikke længere end";
> 		$text['maxlshort'] = "Maks. længde";
> 		$text['xstep'] = "trin";
> 		$text['xsteps'] = "trin";
> 		$text['xmarriages'] = "xxx ægteskaber";
> 		$text['xmarriage'] = "1 ægteskab";
> 		$text['showspouses'] = "Vis begge ægtefæller";
> 		$text['showTxt'] = "Vis stibeskrivelse";
> 		$text['showTxtshort'] = "Beskriv.";
> 		$text['compactBox'] = "Vis kompakte personkasser";
> 		$text['compactBoxshort'] = "Kompakte kasser";
> 		$text['paths'] = "Stier";
> 		$text['dospouses2'] = "Vis ægtefæller";
> 		$text['maxmopt'] = " Maks. ægteskaber pr. forbindelse ";
> 		$text['maxm'] = " Maks. antal ægteskaber";
> 		$text['arerelated'] = "Disse personer er beslægtede - deres slægtskab er vist i sti 1";
> 		$text['simplerel'] = "Enkel slægtskabs søgning";
176,180c245,249
< 		$text['ldsords'] = "LDS ordinancer";
< 		$text['baptizedlds'] = "Døbt (LDS)";
< 		$text['endowedlds'] = "Begavet (LDS)";
< 		$text['sealedplds'] = "Beseglet F (LDS)";
< 		$text['sealedslds'] = "Beseglet Æ (LDS)";
---
> 		$text['ldsords'] = "SDH ordinancer";
> 		$text['baptizedlds'] = "Døbt (SDH)";
> 		$text['endowedlds'] = "Begavet (SDH)";
> 		$text['sealedplds'] = "Beseglet F (SDH)";
> 		$text['sealedslds'] = "Beseglet Æ (SDH)";
196d264
< 		$text['scrollnote'] = "NB: Rul ned for at se hele træet.";
199d266
< 		$text['popupnote2'] = " = Ny anetavle";
230c297
< 		$text['pedbox'] = "Boks";
---
> 		$text['pedbox'] = "Felt";
232c299
< 		$text['extrasexpl'] = "Hvis der eksisterer billeder eller historier for de følgende personer, vil tilhørende ikoner blive vist ved siden af navnene.";
---
> 		$text['extrasexpl'] = "Hvis der eksisterer billeder eller fortællinger for de følgende personer, vil tilhørende ikoner blive vist ved siden af navnene.";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabeller";
> 		$text['dtchildren'] = "Børn";
> 		$text['dtgrandchildren'] = "Børnebørn";
> 		$text['dtggrandchildren'] = "Oldebørn";
> 		$text['dtgggrandchildren'] = "Oldebørn"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Ingen efterkommere";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Vælg";
> 		$text['dteachfulltable'] = "Hver fuld tabel vil have";
> 		$text['dtrows'] = "rækker";
> 		$text['dtdisplayingtable'] = "Viser tabel";
> 		$text['dtgototable'] = "Gå til tabel:";
> 		$text['fcinstrdn'] = "Vis familie med partner";
> 		$text['fcinstrup'] = "Vis familie med forældre";
> 		$text['fcinstrplus'] = "Vælg partner";
> 		$text['fcinstrfam'] = "Vælg forældre";
321,328c407,414
< 		$text['baptdate'] = "Dåbsdato (LDS)";
< 		$text['baptplace'] = "Dåbssted (LDS)";
< 		$text['endldate'] = "Begavelsesdato (LDS)";
< 		$text['endlplace'] = "Begavelsessted (LDS)";
< 		$text['ssealdate'] = "Beseglingsdato Æ (LDS)";   //Sealed to spouse
< 		$text['ssealplace'] = "Beseglingssted Æ (LDS)";
< 		$text['psealdate'] = "Beseglingsdato F (LDS)";   //Sealed to parents
< 		$text['psealplace'] = "Beseglingssted F (LDS)";
---
> 		$text['baptdate'] = "Dåbsdato (SDH)";
> 		$text['baptplace'] = "Dåbssted (SDH)";
> 		$text['endldate'] = "Begavelsesdato (SDH)";
> 		$text['endlplace'] = "Begavelsessted (SDH)";
> 		$text['ssealdate'] = "Beseglingsdato Æ (SDH)";   //Sealed to spouse
> 		$text['ssealplace'] = "Beseglingssted Æ (SDH)";
> 		$text['psealdate'] = "Beseglingsdato F (SDH)";   //Sealed to parents
> 		$text['psealplace'] = "Beseglingssted F (SDH)";
337c423
< 		$text['otherevents'] = "Andre Begivenheder";
---
> 		$text['otherevents'] = "Andre begivenheder";
346c432
< 		$text['divdatetr'] = "Skilsmisse år";
---
> 		$text['divdatetr'] = "Skilsmisseår";
349c435
< 		$text['filter'] = "Filtrer";
---
> 		$text['filter'] = "Filter";
355,358c441,444
< 		$text['confdate'] = "Konfirmations Dato (LDS)";
< 		$text['confplace'] = "Konfirmations Sted (LDS)";
< 		$text['initdate'] = "Forberedende Dato (LDS)";
< 		$text['initplace'] = "Forberedende Sted (LDS)";
---
> 		$text['confdate'] = "Bekræftelsesdato (SDH)";
> 		$text['confplace'] = "Bekræftelsessted (SDH)";
> 		$text['initdate'] = "Forberedende dato (SDH)";
> 		$text['initplace'] = "Forberedende sted (SDH)";
381,382d466
< 		$text['firstpage'] = "Første side";
< 		$text['lastpage'] = "Sidste side";
403c487
< 		$text['gallery'] = "Kun miniaturer";
---
> 		$text['gallery'] = "Kun thumbnails";
432c516
<         $text['iptc092'] = "Sub-location";
---
>         $text['iptc092'] = "Underlokation";
434,435c518,521
< 		$text['iptc065'] = "Oprindeligt Program";
< 		$text['iptc070'] = "Program Version";
---
> 		$text['iptc065'] = "Oprindeligt program";
> 		$text['iptc070'] = "Programversion";
> 		//added in 13.0
> 		$text['toggletags'] = "Skift Tags";
455c541
< 		$text['showmatchingplaces'] = "Klik på et efternavn for at vise matchende poster.";
---
> 		$text['showmatchingplaces'] = "Klik på et sted for at vise matchende poster.";
466,467c552,553
< 		$text['firstnamelist'] = "Fornavne Liste";
< 		$text['firstnamesstarting'] = "Vis Fornavne begyndende med";
---
> 		$text['firstnamelist'] = "Fornavneliste";
> 		$text['firstnamesstarting'] = "Vis fornavne begyndende med";
470c556
< 		$text['allfirstnames'] = "Alle Fornavne";
---
> 		$text['allfirstnames'] = "Alle fornavne";
481c567
< 		$text['pastxdays'] = "(sidste xx dage)";
---
> 		$text['pastxdays'] = "(seneste xx dage)";
484c570
< 		$text['history'] = "Historie/Dokument";
---
> 		$text['history'] = "Fortælling/Dokument";
489c575
< 		$text['wifename'] = "Mors Navn";
---
> 		$text['wifename'] = "Kvindes navn";
510c596
< 		$text['treename'] = "Navn på træ";
---
> 		$text['treename'] = "Trænavn";
530c616
< 		$text['leaveblank'] = "(tomt, hvis du vil have nyt træ)";
---
> 		$text['leaveblank'] = "(skal være tomt, hvis man vil have nyt træ)";
532,535c618,621
< 		$text['enterpassword'] = " Indtast venligst en adgangskode.";
< 		$text['enterusername'] = "Indtast venligst et brugernavn.";
< 		$text['failure'] = "Det angivne brugernavn er desværre allerede i brug. Brug Tilbage tasten på din browser for at komme tilbage til forrige side og vælg et andet brugernavn.";
< 		$text['success'] = "Mange tak for din anmodning om adgang til Webstedet. Jeg sender en mail, når din adgang til webstedet er aktiveret.";
---
> 		$text['enterpassword'] = " Indtast en adgangskode.";
> 		$text['enterusername'] = "Indtast et brugernavn.";
> 		$text['failure'] = "Det angivne brugernavn er desværre allerede i brug. Brug Tilbage-tasten i browseren for at komme tilbage til forrige side og vælg et andet brugernavn.";
> 		$text['success'] = "Mange tak for anmodningen om adgang til webstedet. Vi kontakter dig, når kontoen er aktiv, eller hvis der er behov for flere oplysninger.";
541c627
< 		$text['enterrealname'] = "Indtast venligst dit fulde navn.";
---
> 		$text['enterrealname'] = "Indtast dit fulde navn.";
544c630
< 		$text['accmail'] = "<strong>OBS:</strong> For at kunne modtage mail fra Webstedet vedr. registreringen, vær sikker på, at mail ikke er blokeret fra dette domæne.";
---
> 		$text['accmail'] = "<strong>OBS:</strong> For at kunne modtage mails fra webstedet vedr. registreringen, skal man sikre sig, at mails fra dette domæne ikke er blokeret.";
548,552c634,637
< 		$text['noregs'] = "Der kan desværre ikke accepteres flere nye brugerregistreringer for øjeblikket. Vær venlig at <a href=\"suggest.php\">kontakte mig</a>, hvis du har kommentarer til eller spørgsmål ang. webstedet.";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Du har modtaget en anmodning om adgang til dit websted.";
< 		$text['accactive'] = "Adgangen er blevet aktiveret, men brugeren har ingen ekstra rettigheder, før du tildeler dem.";
< 		$text['accinactive'] = "Gå til Admin/Brugere/Gennemse for at administrere brugeren. Brugerens konto vil forblive inaktiv, indtil den er redigeret og gemt.";
---
> 		$text['noregs'] = "Der kan desværre ikke accepteres flere nye brugerregistreringer for øjeblikket. <a href=\"suggest.php\">Skriv en besked,</a> hvis du har nogen spørgsmål eller bemærkninger ang. webstedet.";
> 		$text['emailmsg'] = "Du har modtaget en anmodning om adgang til webstedet.";
> 		$text['accactive'] = "Adgangen er blevet aktiveret, men brugeren har ingen ekstra rettigheder, før de er blevet indstillet.";
> 		$text['accinactive'] = "Gå til Admin/Brugere/Gennemse for at godkende brugerens adgang til webstedet. Brugerens konto vil forblive inaktiv, indtil den er redigeret og godkendt.";
554c639
< 		$text['enterpassword2'] = "Indtast din adgangskode igen.";
---
> 		$text['enterpassword2'] = "Indtast adgangskoden igen.";
556,558c641,642
< 		//added in 8.0.0
< 		$text['acksubject'] = "Tak for din henvendelse"; //for a new user account
< 		$text['ackmessage'] = "Anmodningen er modtaget. Kontoen vil være inaktiv, indtil administratoren aktiverer den. Du vil modtage en mail, når du kan logge på.";
---
> 		$text['acksubject'] = "Tak for henvendelsen"; //for a new user account
> 		$text['ackmessage'] = "Anmodningen er modtaget. Kontoen vil være inaktiv, indtil administratoren aktiverer den. Du vil modtage en mail, når dit login er klar til brug.";
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Ny adgangskode igen";
> 		$text['resetsuccess'] = "Succes: Adgangskoden er blevet nulstillet";
> 		$text['resetfail'] = "Fejl: Adgangskoden blev ikke nulstillet";
> 		$text['failreason0'] = " (ukendt databasefejl)";
> 		$text['failreason2'] = " (du har ikke tilladelse til at ændre din adgangskode)";
> 		$text['failreason3'] = " (adgangskoderne matchede ikke)";
565c656
< 		$text['browseallbranches'] = "Gennemse Alle Grene";
---
> 		$text['browseallbranches'] = "Gennemse alle grene";
591c682,684
< 		$text['totdeceased'] = "Antal Afdøde";
---
> 		$text['totdeceased'] = "Antal afdøde";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totalt antal kildehenvisninger";
605c698
< 		$text['manual'] = "Vær venlig at oprette dem manuelt.";
---
> 		$text['manual'] = "Oprette dem manuelt.";
608c701
< 		$text['nocreate'] = "Kunne ikke oprettes. Vær venlig at gøre det manuelt.";
---
> 		$text['nocreate'] = "Kunne ikke oprettes. Opret det manuelt.";
612c705
< 		$text['nocomm'] = "TNG kommunikerer ikke med din database. Der er ikke oprettet tabeller.";
---
> 		$text['nocomm'] = "TNG kommunikerer ikke med databasen. Der er ikke oprettet tabeller.";
615c708
< 		$text['nodb'] = "Oplysningerne er gemt. Forbindelsen er skabt, men databasen eksisterer ikke og kunne ikke oprettes her. Vær venlig at bekræfte, at navnet på databasen er korrekt, eller brug kontrolpanelet til at oprette den.";
---
> 		$text['nodb'] = "Oplysningerne er gemt. Forbindelsen er skabt, men databasen eksisterer ikke og kunne ikke oprettes her. Bekræft at navnet på databasen er korrekt, eller brug kontrolpanelet til at oprette den.";
618d710
< 		$text['loginfirst'] = "Du skal først logge på.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Eksisterende brugerposter fundet. For at fortsætte skal man først logge ind eller fjerne alle poster fra brugertabellen.";
629,630d722
< 		$text['zoomin'] = "Zoom ind";
< 		$text['zoomout'] = "Zoom ud";
640c732
< 		$text['vwrctrls'] = "Aktiver billedvisnings værktøjer";
---
> 		$text['vwrctrls'] = "Aktiver billedvisningsværktøjer";
645c737
< 		$text['test_date'] = "Test dato";
---
> 		$text['test_date'] = "Testdato";
650,654c742,746
< 		$text['compareselected'] = "Sammenlign Valgte";
< 		$text['dnatestscompare'] = "Sammenlign Y-DNA Tests";
< 		$text['keep_name_private'] = "Hold Navn Privat";
< 		$text['browsealltests'] = "Gennemse Alle Tests";
< 		$text['all_dna_tests'] = "Alle DNA tests";
---
> 		$text['compareselected'] = "Sammenlign valgte";
> 		$text['dnatestscompare'] = "Sammenlign Y-DNA tests";
> 		$text['keep_name_private'] = "Hold navn privat";
> 		$text['browsealltests'] = "Gennemse alle tests";
> 		$text['all_dna_tests'] = "Alle DNA-tests";
656,658c748,749
< 		$text['dna_info_head'] = "DNA Test Oplysning";
< 		$text['alltypes'] = "Alle Typer";
< 		$text['allgroups'] = "Alle Grupper";
---
> 		$text['alltypes'] = "Alle typer";
> 		$text['allgroups'] = "Alle grupper";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Sammenlign valgte mtDNA-tests";
> 		$text['dnatestscompare_atdna'] = "Sammenlign valgte atDNA-tests";
> 		$text['chromosome'] = "Krom";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Ekstra mutationer";
> 		$text['mrca'] = "Most Recent Common Ancestor";
> 		$text['ydna_test'] = "Y-DNA-tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "Slut";
> 		$text['suggested_relationship'] = "Foreslået";
> 		$text['actual_relationship'] = "Aktuelt";
> 		$text['12markers'] = "Markører 1-12";
> 		$text['25markers'] = "Markører 13-25";
> 		$text['37markers'] = "Markører 26-37";
> 		$text['67markers'] = "Markører 38-67";
> 		$text['111markers'] = "Markører 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "f.";
< $text['chrabbr'] = "dbt.";
673c787
< $text['andlocation'] = "& lokation";
---
> $text['andlocation'] = "& sted";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
702c814
< $text['spouse'] = "Partner";  //from search
---
> $text['spouse'] = "Ægtefælle/Partner";  //from search
706,707c818
< $text['burialabbr'] = "begr.";  //from descend
< $text['descendchart'] = "Efterkommere";
---
> $text['descendchart'] = "Efterslægt";
712d822
< $text['place'] = "Sted";
715d824
< $text['marrabbr'] = "g.";
738d846
< $text['source'] = "Kilde";
745,748c853,856
< $text['baptizedlds'] = "Døbt (LDS)";
< $text['endowedlds'] = "Begavet (LDS)";
< $text['sealedplds'] = "Beseglet F (LDS)";
< $text['sealedslds'] = "Beseglet Æ (LDS)";
---
> $text['baptizedlds'] = "Døbt (SDH)";
> $text['endowedlds'] = "Begavet (SDH)";
> $text['sealedplds'] = "Beseglet F (SDH)";
> $text['sealedslds'] = "Beseglet Æ (SDH)";
757c865
< $text['historiesdocs'] = "Historier & Dokumenter";
---
> $text['historiesdocs'] = "Fortællinger & Dokumenter";
766d873
< $text['repository'] = "Arkiv";
770d876
< $text['findplaces'] = "Find alle personer med begivenheder på dette sted";
772c878
< $text['faminfo'] = "Familie oplysninger";
---
> $text['faminfo'] = "Familieoplysninger";
778c884
< $text['databasestatistics'] = "Database Statistik"; //needed to be shorter to fit on menu
---
> $text['databasestatistics'] = "Databasestatistik"; //needed to be shorter to fit on menu
802c908
< $text['gmapevent'] = "Begivenheds Kort";
---
> $text['gmapevent'] = "Begivenhedskort";
804d909
< $text['glang'] = "&amp;hl=da";
809c914
< $text['located'] = "Lokaliseret";
---
> $text['located'] = "fundet";
811c916
< $text['notyetlocated'] = "Endnu ikke lokaliseret";
---
> $text['notyetlocated'] = "Endnu ikke fundet";
816d920
< $text['none'] = "Ingen";
835,837c939,941
< $text['ourhist'] = "Vores families historie";
< $text['ourhistanc'] = "Vores families historie og aner";
< $text['ourpages'] = "Vores Slægtsforskningsider";
---
> $text['ourhist'] = "Fortællingen om vores familie";
> $text['ourhistanc'] = "Fortællingen om vores familie og aner";
> $text['ourpages'] = "Vores slægtsforskningsider";
842c946
< $text['anon'] = "Du er ikke logget ind";
---
> $text['anon'] = "Du er i øjeblikket anonym";
844c948
< $text['featarts'] = "Feature Artikler";
---
> $text['featarts'] = "Temaartikler";
847c951
< $text['reliability'] = "Pålidelighed";
---
> $text['reliability'] = "Troværdighed";
865,866c969,970
< $text['mnuhistories'] = "Historier";
< $text['mnumyancestors'] = "Billeder af &amp; historier om aner til [Person]";
---
> $text['mnuhistories'] = "Fortællinger";
> $text['mnumyancestors'] = "Billeder af &amp; fortællinger om aner til [Person]";
876c980
< $text['contactus'] = "Kontakt os";
---
> $text['contactus'] = "Kontakt";
900,901c1004,1005
< $text['disabled'] = "Din bruger konto er blevet deaktiveret. Kontakt venligst webredaktøren for yderligere oplysninger.";
< $text['contactus_long'] = "Hvis du har spørgsmål eller kommentarer til oplysningerne på dette websted, vær venlig <span class=\"emphasis\"><a href=\"suggest.php\">at kontakte os</a></span>. Vi glæder os til at høre fra dig.";
---
> $text['disabled'] = "Din bruger konto er blevet deaktiveret. Kontakt administrator for yderligere oplysninger.";
> $text['contactus_long'] = "Hvis du har spørgsmål eller kommentarer til oplysningerne på dette websted, så <span class=\"emphasis\"><a href=\"suggest.php\">skriv til os</a></span>. ";
904c1008
< $text['latestnews'] = "Sidste Nyt";
---
> $text['latestnews'] = "Seneste nyt";
909c1013
< $text['enteremail2'] = "Indtast din mail-adresse igen.";
---
> $text['enteremail2'] = "Indtast din mailadresse igen.";
924,926c1028,1029
< $text['otherevents'] = "Andre Begivenheder";
< $text['conflds'] = "Konfirmeret (LDS)";
< $text['initlds'] = "Forberedende (LDS)";
---
> $text['conflds'] = "Bekræftet (SDH)";
> $text['initlds'] = "Forberedende (SDH)";
937,940c1040,1043
< $text['refreshmap'] = "Opdatér Kortet";
< $text['remnums'] = "Fjern Numre og Kortnåle";
< $text['photoshistories'] = "Billeder &amp; Historier";
< $text['familychart'] = "Familie Tavle";
---
> $text['refreshmap'] = "Opdatér kortet";
> $text['remnums'] = "Fjern Numre og kortnåle";
> $text['photoshistories'] = "Billeder &amp; Fortællinger";
> $text['familychart'] = "Familietavle";
944,946c1047,1049
< $text['dna_test'] = "DNA Test";
< $text['test_type'] = "Test Type";
< $text['test_info'] = "Test Oplysning";
---
> $text['dna_test'] = "DNA-test";
> $text['test_type'] = "Testtype";
> $text['test_info'] = "Testoplysning";
952,953d1054
< $text['people_have'] = "personer har knyttet en DNA-test til";
< $text['person_has'] = "person har knyttet en DNA-test til";
958c1059
< $text['viewpolicy'] = "Vis Databeskyttelsespolitik";
---
> $text['viewpolicy'] = "Vis databeskyttelsespolitik";
960c1061
< $text['consent'] = "Jeg giver mit samtykke til, at dette websted kan gemme de personlige oplysninger, der er indsamlet her. Jeg forstår, at jeg kan bede webstedsejeren om at fjerne disse oplysninger til enhver tid.";
---
> $text['consent'] = "Jeg giver mit samtykke til, at dette websted kan gemme de personlige oplysninger, der er indsamlet her. Jeg forstår, at jeg kan bede webstedets ejer om at fjerne disse oplysninger til enhver tid.";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA-tests er knyttet til";
> $text['testislinked'] = "DNA-test er knyttet til";
> 
> //added in 12.2
> $text['quicklinks'] = "Hurtige links";
> $text['yourname'] = "Dit navn";
> $text['youremail'] = "Din mailadresse";
> $text['liketoadd'] = "Alle oplysninger, du gerne vil tilføje";
> $text['webmastermsg'] = "Webmaster-meddelelse";
> $text['gallery'] = "Se Galleri";
> $text['wasborn_male'] = "blev født";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "blev født"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "blev døbt";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "blev døbt";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "døde";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "døde";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "blev begravet"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "blev begravet"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "blev kremeret";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "blev kremeret";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "blev gift med ";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "blev gift med ";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "blev skilt";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "blev skilt";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " i ";			// used as a preposition to the location
> $text['onthisdate'] = " den ";		// when used with full date
> $text['inthisyear'] = " i ";		// when used with year only or month / year dates
> $text['and'] = "og ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA-testoplysning";
> //added in 13.0
> $text['visitor'] = "Gæst";
> 
> $text['popupnote2'] = " = Ny anetavle";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom ind";
> $text['zoomout'] = "Zoom ud";
> $text['scrollnote'] = "Træk eller rul for at se mere af diagrammet.";
> $text['general'] = "Generelt";
> 
> //changed in 14.0
> $text['otherevents'] = "Andre Begivenheder og Egenskaber";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Forbindelser";
> $text['continue'] = "Fortsæt";
> $text['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Danish-UTF8/admintext.php TNG1403/languages/Danish-UTF8/admintext.php
5,6c5,6
< 		$admtext['branchlabel'] = "Gren navn";
< 		$admtext['existingbranch'] = "Nuværende gren";
---
> 		$admtext['branchlabel'] = "Grennavn";
> 		$admtext['existingbranch'] = "Eksisterende gren";
21c21
< 		$admtext['enterstartingind'] = "Indtast ID for den person, du vil begynde med";
---
> 		$admtext['enterstartingind'] = "Indtast ID for den person, der skal begyndes med";
29c29
< 		$admtext['confbranchdelete'] = "Er du sikker på, at du vil slette denne gren?";
---
> 		$admtext['confbranchdelete'] = "Er det sikkert, at denne gren skal slettes?";
39c39
< 		$admtext['branchdiscl'] = "Dette antal repræsenterer det totale antal grene, ikke nødvendigvis det antal personer eller familier, der pt. er knyttet til denne gren. Hvis du for nylig har genimporteret dine data, kan det være nødvendigt at gennemgå de enkelte grene igen.";
---
> 		$admtext['branchdiscl'] = "Dette antal repræsenterer det totale antal grene, ikke nødvendigvis det antal personer eller familier, der pt. er knyttet til denne gren. Hvis man for nylig har genimporteret data, kan det være nødvendigt at gennemgå de enkelte grene igen.";
42c42
< 		$admtext['confbrdel'] = "Er du sikker på, at du vil slette alle personer og familier i denne gren?";
---
> 		$admtext['confbrdel'] = "Er det sikkert, at alle personer og familier skal slettes i denne gren?";
47c47
< 		$admtext['mapnotcopied'] = "Kort billedfilen kunne ikke kopieres til";
---
> 		$admtext['mapnotcopied'] = "Kortbilledfilen kunne ikke kopieres til";
49c49
< 		$admtext['modifycemetery'] = "Ændring til nuværende kirkegård";
---
> 		$admtext['modifycemetery'] = "Ændring til eksisterende kirkegård";
54c54
< 		$admtext['confdeletecem'] = "Er du sikker på, at du vil slette denne kirkegård?";
---
> 		$admtext['confdeletecem'] = "Er det sikkert, at denne kirkegård skal slettes?";
58c58
< 		$admtext['mapfilename'] = "Navn på kort filen";
---
> 		$admtext['mapfilename'] = "Navn på kortfilen";
62,63c62,63
< 		$admtext['entermapfile'] = "Indtast et filnavn for din kortfil på Web-serveren.";
< 		$admtext['existingceminfo'] = "Oplysninger om nuværende kirkegård";
---
> 		$admtext['entermapfile'] = "Indtast et filnavn for kortfilen på Web-serveren.";
> 		$admtext['existingceminfo'] = "Oplysninger om eksisterende kirkegård";
67,68c67,68
< 		$admtext['ifmapuploaded'] = "Lad dette felt være tomt, hvis filen allerede er blevet uploaded til din gravstensmappe.";
< 		$admtext['requiredmap'] = "Nødvendigt, hvis du bruger et kort. Dette skal svare til navn og placering af din fil <em>i gravstensmappen,</em> når din fil er uploaded. For eksempel, hvis din gravstensmappe hedder <em>gravsten</em>,	og du vil kalde din fil <em>kort.jpg</em> og lægge den i en gravstensundermappe, der hedder <em>minekort</em>, skal du indtaste <em>minekort/kort.jpg</em> i dette felt.";
---
> 		$admtext['ifmapuploaded'] = "Lad dette felt være tomt, hvis filen allerede er blevet uploaded til gravstensmappen.";
> 		$admtext['requiredmap'] = "Nødvendigt, hvis man bruger et kort. Dette skal svare til navn og placering af filen <em>i gravstensmappen,</em> når filen er uploaded. For eksempel, hvis gravstensmappen hedder <em>gravsten</em>,	og man vil kalde filen <em>kort.jpg</em> og lægge den i en gravstensundermappe, der hedder <em>minekort</em>, skal der indtastes <em>minekort/kort.jpg</em> i dette felt.";
71c71
< 		$admtext['fillplace'] = "Udfyld Sted";
---
> 		$admtext['fillplace'] = "Udfyld sted";
80,81c80
< 		$admtext['pleaseenter'] = "Skriv venligst en ";
< 		$admtext['netscapereload'] = "Netscape brugere: <br>Du skal geninstallere kirkegårdssiden for at se din nye";
---
> 		$admtext['netscapereload'] = "Netscape brugere: <br>Siden med Kirkegårde skal genopfriskes for at se den nye";
126c125
< 		$admtext['invfperms'] = "Din 'gedcom' mappe har måske utilstrækkelige rettigheder (prøv 755 eller 777).";
---
> 		$admtext['invfperms'] = "gedcom mappen har måske utilstrækkelige rettigheder (prøv 755 eller 777).";
128c127,162
< 		$admtext['turnonsis'] = "Vær sikker på, at 'Gem Importstatus' er valgt i Importindstillinger.";
---
> 		$admtext['turnonsis'] = "Vær sikker på, at 'Gem importstatus' er valgt i Importindstillinger.";
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Vælg den fil, der skal importeres.";
> 		$admtext['addreplacedata'] = "Tilføj til eller erstat dit slægtstræ (dette kan tage flere minutter afhængig af filstørrelsen)";
> 		$admtext['fromyourcomputer'] = "Fra computeren";
> 		$admtext['importdata'] = "Importer data";
> 		$admtext['replace'] = "Erstat (i det valgte træ)";
> 		$admtext['desttree'] = "Destinationstræ";
> 		$admtext['selectdesttree'] = "Vælg eller indtast et destinationstræ.";
> 		$admtext['selectexisting'] = "Importer ind i";
> 		$admtext['ucaselast'] = "Skriv alle efternavne med versaler";
> 		$admtext['norecalc'] = "Udfør ikke genberegninger for 'nulevende'-markeringer";
> 		$admtext['autooffset'] = "Begynd ID'er ved første ledige nummer";
> 		$admtext['mustselecttree'] = "Man skal vælge et træ, før man vælger denne mulighed.";
> 		$admtext['onwebserver'] = "Fra webserver (i GEDCOM-mappen)";
> 		$admtext['imphints'] = "OBS: Med “Alle aktuelle data� menes alle personer, familier, kilder og notater (medietilknytninger går ikke tabt, så længe ID'erne er de samme). Matchende poster baseres altid kun på ID'er. Nye poster tilføjes altid. Med “Tilføj alle poster� menes alle poster med nye ID'er.";
> 		$admtext['destbranch'] = "Destination for gren (valgfri)";
> 		$admtext['importlatlong'] = "Importér bredde- og længdegrad hvis de findes";
> 		$admtext['opening'] = "Ã…bner";
> 		$admtext['reopen'] = "Genåbner";
> 		$admtext['uploading'] = "Uploader";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import stoppet";
> 		$admtext['resume'] = "Fortsæt";
> 		$admtext['neweronly'] = "Erstat kun hvis nyere";
> 		$admtext['oldimport'] = "Gammeldags import (uden forløbsbjælke)";
> 		$admtext['importgedcom'] = "Importér GEDCOM-fil (kan være zippet)";
> 		$admtext['stopbackup'] = "Stop! Man bør sikkerhedskopiere databasen, før man fortsætter.";
> 		$admtext['importmedia'] = "Importér links til nuværende billeder m.m.";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Sørg for at præfikser og suffikser (fra Generelle Indstillinger) er korrekte i denne fil.";
> 		$admtext['chkimpsettings'] = "Tjek Import indstillinger for flere muligheder.";
> 		$admtext['eventsonly'] = "Importér begivenhedstyper og egenskaber (ingen data bliver erstattet eller tilføjet)";
> 		$admtext['allevents'] = "Godkend data for alle nye begivenheds typer og egenskaber";
> 		$admtext['finishingimporting'] = "Afslutter...";
> 		$admtext['fileuploadfailed'] = "Upload af filen mislykkedes. Dette kunne skyldes, at filen er for stor. Brug FTP til at uploade filen til GEDCOM mappen, og derefter vælg filen og importér den.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Ændre nuværende begivenhedstype";
135,138d168
< 		$admtext['entertypedesc'] = "Indtast en type/beskrivelse for denne nye begivenhedstype.";
< 		$admtext['enterdisplay'] = "Indtast tekst, der skal vises for denne nye begivenhedstype.";
< 		$admtext['existingeventtypeinfo'] = "Nuværende begivenhedstype oplysninger";
< 		$admtext['neweventtypeinfo'] = "Ny begivenhedstype oplysninger";
145,146d174
< 		$admtext['addnewevtype'] = "Tilføj ny begivenhedstype";
< 		$admtext['createnewevtype'] = "Opret en ny begivenhedstype";
149,150d176
< 		$admtext['existingevtypes'] = "Nuværende begivenhedstyper";
< 		$admtext['edsevtypes'] = "Redigér, slet eller sorter tidligere tilføjede begivenhedstyper";
152,154c178
< 		$admtext['confdeleteevtype'] = "Er du sikker på, at du vil slette denne begivenhedstype?";
< 		$admtext['selecttag'] = "Vælg Gedcom kode";
< 		$admtext['selectentertag'] = "Vælg venligst Gedcom koden for denne begivenhedstype.";
---
> 		$admtext['selecttag'] = "Vælg gedcom-kode";
167c191
< 		$admtext['CREM'] = "Kremeret";
---
> 		$admtext['CREM'] = "Kremering";
208d231
< 		$admtext['changestoallevtypes'] = "Ændringer for alle begivenhedstyper";
214,215c237
< 		$admtext['BAPM'] = "DÃ¥b";
< 		$admtext['umps'] = "Din GEDCOM-fil er muligvis større end den maksimalt tilladte størrelse iht. din PHP installation. Du kan bede din leverandør om at øge den tilladte størrelse, eller du kan kopiere din fil til 'gedcom' -mappen på din hjemmeside og importere filen derfra i stedet for.;";
---
> 		$admtext['umps'] = "GEDCOM-filen er muligvis større end den maksimalt tilladte størrelse iht. PHP-installationen. Man kan bede udbyderen om at øge den tilladte størrelse, eller man kan kopiere filen til 'gedcom'-mappen på serveren og importere filen derfra i stedet for.;";
220,222c242,244
< 		$admtext['collapseev'] = "Kollaps  Begivenhed";
< 		$admtext['collapse'] = "Kollaps";
< 		$admtext['collapseselected'] = "Kollaps Valgt";
---
> 		$admtext['collapseev'] = "Fold begivenheder sammen";
> 		$admtext['collapse'] = "Fold sammen";
> 		$admtext['collapseselected'] = "Fold sammen valgt";
224c246
< 		$admtext['expselected'] = "Udvid Valgte";
---
> 		$admtext['expselected'] = "Udvid valgte";
226c248,262
< 		$admtext['ldsevent'] = "LDS Begivenhed";
---
> 		$admtext['ldsevent'] = "SDH Begivenhed";
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Er det sikkert, at denne begivenhedstype skal slettes?";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Tilføj ny Type";
> 		$admtext['createnewevtype'] = "Opret en ny egenskab eller begivenhedstype";
> 		$admtext['modifyeventtype'] = "Redigér Nuværende Type";
> 		$admtext['entertypedesc'] = "Indtast en type eller beskrivelse for denne nye egenskab eller begivenhedstype.";
> 		$admtext['enterdisplay'] = "Indtast en visningsstreng for denne nye egenskab eller begivenhedstype.";
> 		$admtext['existingeventtypeinfo'] = "Oplysninger om nuværende egenskab eller begivenhedstype";
> 		$admtext['neweventtypeinfo'] = "Oplysninger om ny egenskab eller begivenhedstype";
> 		$admtext['existingevtypes'] = "Nuværende Egenskabs- eller Begivenhedstyper";
> 		$admtext['edsevtypes'] = "Redigér, slet eller sortér tidligere indtastede egenskaber og begivenhedstyper";
> 		$admtext['selectentertag'] = "Vælg eller indtast tagget for denne egenskab eller begivenhedstype.";
> 		$admtext['changestoallevtypes'] = "Ændringer af alle egenskabs- eller begivenhedstyper";
233c269
< 		$admtext['modifyfamily'] = "Redigér nuværende familie";
---
> 		$admtext['modifyfamily'] = "Redigér eksisterende familie";
235,239c271,275
< 		$admtext['confdeletefam'] = "Er du sikker på, at du vil slette denne familie?";
< 		$admtext['existingfamilyinfo'] = "Nuværende oplysninger for familie";
< 		$admtext['newfamilyinfo'] = "Ny familie oplysninger";
< 		$admtext['sealedsdate'] = "Beseglet dato (LDS)";     //S is for spouse
< 		$admtext['sealedsplace'] = "Beseglet sted (LDS)";     //S is for spouse
---
> 		$admtext['confdeletefam'] = "Er det sikkert, at denne familie skal slettes?";
> 		$admtext['existingfamilyinfo'] = "Oplysninger om eksisterende familie";
> 		$admtext['newfamilyinfo'] = "Oplysninger om ny familie";
> 		$admtext['sealedsdate'] = "Beseglet dato (SDH)";     //S is for spouse
> 		$admtext['sealedsplace'] = "Beseglet sted (SDH)";     //S is for spouse
242c278
< 		$admtext['createnewfamily'] = "Opret en ny familie";
---
> 		$admtext['createnewfamily'] = "Opret ny familie";
268,269c304
< 		$admtext['nobirthinfo'] = "Ingen fødselsinfo";
< 		$admtext['modifyperson'] = "Redigér nuværende person";
---
> 		$admtext['modifyperson'] = "Redigér eksisterende person";
271c306
< 		$admtext['existingpersoninfo'] = "Nuværende oplysninger for person";
---
> 		$admtext['existingpersoninfo'] = "Oplysninger om eksisterende person";
277,279c312,314
< 		$admtext['bapldate'] = "DÃ¥bsdato (LDS)";
< 		$admtext['baplplace'] = "DÃ¥bssted (LDS)";
< 		$admtext['endldate'] = "Begavelsesdato (LDS)";
---
> 		$admtext['bapldate'] = "DÃ¥bsdato (SDH)";
> 		$admtext['baplplace'] = "DÃ¥bssted (SDH)";
> 		$admtext['endldate'] = "Begavelsesdato (SDH)";
285,286c320,321
< 		$admtext['sealedpdate'] = "Beseglet dato (LDS)";     //P is for parents
< 		$admtext['sealedpplace'] = "Beseglet sted (LDS)";     //P is for parents
---
> 		$admtext['sealedpdate'] = "Beseglet dato (SDH)";     //P is for parents
> 		$admtext['sealedpplace'] = "Beseglet sted (SDH)";     //P is for parents
291c326
< 		$admtext['nonewfamily'] = "Vil du gå til ny familie ved gem";
---
> 		$admtext['nonewfamily'] = "GÃ¥ ikke til ny familie efter gem";
294c329
< 		$admtext['personidbefevent'] = "Du skal indtaste et person-ID, før du kan tilføje en ny begivenhed.";
---
> 		$admtext['personidbefevent'] = "Man skal indtaste et person-ID, før man kan tilføje en ny begivenhed.";
297c332
< 		$admtext['newpersoninfo'] = "Ny person oplysninger";
---
> 		$admtext['newpersoninfo'] = "Oplysninger om ny person";
302,304c337,339
< 		$admtext['personidbefnote'] = "Du skal indtaste et person-ID, før du kan tilføje nye notater.";
< 		$admtext['endlplace'] = "Begavelsessted (LDS)";
< 		$admtext['personidbefcite'] = "Du skal indtaste et person-ID, før du kan bruge henvisninger med denne person.";
---
> 		$admtext['personidbefnote'] = "Man skal indtaste et person-ID, før man kan tilføje nye notater.";
> 		$admtext['endlplace'] = "Begavelsessted (SDH)";
> 		$admtext['personidbefcite'] = "Man skal indtaste et person-ID, før man kan bruge henvisninger med denne person.";
310c345
< 		$admtext['sdxdisclaimer'] = "Hvis du bruger denne mulighed, vil det tage programmet længere tid at finde næste match eller dublet.";
---
> 		$admtext['sdxdisclaimer'] = "Hvis man bruger denne mulighed, vil det tage programmet længere tid at finde næste match eller dublet.";
312c347
< 		$admtext['confirmmerge'] = "Er du sikker på, at du vil flette disse to personer?";
---
> 		$admtext['confirmmerge'] = "Er det sikkert, at disse to personer skal flettes?";
323c358
< 		$admtext['modifyassoc'] = "Tilpas nuværende tilknytning";
---
> 		$admtext['modifyassoc'] = "Tilpas eksisterende tilknytning";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Vælg<br/>standard<br/>foto"; //has to fit in a small box
335,338c368,376
< 		$admtext['confdate'] = "Konfirmations Dato (LDS)";
< 		$admtext['confplace'] = "Konfirmations Sted (LDS)";
< 		$admtext['initdate'] = "Forberedende Dato (LDS)";
< 		$admtext['initplace'] = "Forberedende Sted (LDS)";
---
> 		$admtext['confdate'] = "Bekræftelsesdato (SDH)";
> 		$admtext['confplace'] = "Bekræftelsessted (SDH)";
> 		$admtext['initdate'] = "Forberedende dato (SDH)";
> 		$admtext['initplace'] = "Forberedende sted (SDH)";
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Gem + Nye Forældre";
> 		$admtext['savenewspouse'] = "Gem + Ny Partner";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "DÃ¥b";
344c382
< 		$admtext['thumbnailnotcopied'] = "Thumbnail-filen kunne ikke kopieres til";
---
> 		$admtext['thumbnailnotcopied'] = "Miniature-filen kunne ikke kopieres til";
347c385
< 		$admtext['modifyphoto'] = "Redigér nuværende billede";
---
> 		$admtext['modifyphoto'] = "Redigér eksisterende billede";
351,354c389,391
< 		$admtext['confdeletephoto'] = "Er du sikker på, at du vil slette dette billede og alle links forbundet med det?";
< 		$admtext['enterphotopath'] = "Indtast venligst stien (mappe og filnavn) for billedfilen i billedmappen på din webserver.";
< 		$admtext['enterthumbnailpath'] = "Indtast venligst stien (mappe og filnavn) for thumbnailfilen i billedmappen på din webserver.";
< 		$admtext['enterphotodesc'] = "Indtast venligst en beskrivelse af billedet.";
---
> 		$admtext['confdeletephoto'] = "Er det sikkert, at dette billede og alle dets links skal slettes?";
> 		$admtext['enterphotopath'] = "Indtast stien (mappe og filnavn) for billedfilen i billedmappen på serveren.";
> 		$admtext['enterthumbnailpath'] = "Indtast venligst stien (mappe og filnavn) for miniature-filen i billedmappen på serveren.";
357c394
< 		$admtext['thumbnailfile'] = "Thumbnail-fil";
---
> 		$admtext['thumbnailfile'] = "Miniature-fil";
360,361c397,398
< 		$admtext['sortphotos'] = "Sorter billeder";
< 		$admtext['sortphotosfor'] = "Sorter billeder for";
---
> 		$admtext['sortphotos'] = "Sortér billeder";
> 		$admtext['sortphotosfor'] = "Sortér billeder for";
369c406
< 		$admtext['confdeletehs'] = "Er du sikker på, at du vil slette denne gravsten?";
---
> 		$admtext['confdeletehs'] = "Er det sikkert, at denne gravsten skal slettes?";
371,374c408,411
< 		$admtext['selectcemetery'] = "Vælg venligst en kirkegård";
< 		$admtext['enterhsimage'] = "Indtast venligst et filnavn for dit gravstensbillede på webserveren.";
< 		$admtext['existinghsinfo'] = "Oplysninger om nuværende gravsten";
< 		$admtext['newhsinfo'] = "Ny gravstens oplysninger";
---
> 		$admtext['selectcemetery'] = "Vælg en kirkegård";
> 		$admtext['enterhsimage'] = "Indtast et filnavn for gravstensbilledet på webserveren.";
> 		$admtext['existinghsinfo'] = "Oplysninger om eksisterende gravsten";
> 		$admtext['newhsinfo'] = "Oplysninger om ny gravsten";
380,381c417,418
< 		$admtext['leaveblankhs'] = "Lad dette felt være tomt, hvis filen allerede er uploaded til din gravstensmappe.";
< 		$admtext['requiredhs'] = "Nødvendigt. Dette skal svare til navn og placeringen for din fil <em>i gravstensmappen</em> når filen er uploadet. For eksempel, hvis din gravstensmappe hedder, <em>fotografier/gravsten</em>, og du vil kalde din fil <em>gravsten.jpg</em> og lægge den i en undermappe til fotografier/gravsten, der hedder <em>nyegravsten</em>, skal du indtaste <em>nyegravsten/gravsten.jpg</em> i dette felt.";
---
> 		$admtext['leaveblankhs'] = "Lad dette felt være tomt, hvis filen allerede er uploaded til gravstensmappen.";
> 		$admtext['requiredhs'] = "Nødvendigt. Dette skal svare til navn og placering af filen <em>i gravstensmappen</em> når filen er overført. For eksempel, hvis gravstensmappen hedder, <em>fotografier/gravsten</em>, og filen hedder <em>gravsten.jpg</em> og den skal lægges i en undermappen til fotografier/gravsten, der hedder <em>nyegravsten</em>, skal man indtaste <em>nyegravsten/gravsten.jpg</em> i dette felt.";
388d424
< 		$admtext['photoowner'] = "Ejer";
394c430
< 		$admtext['genthumbs'] = "Opret Thumbnails";
---
> 		$admtext['genthumbs'] = "Opret Miniaturer";
396c432
< 		$admtext['thumbsgenerated'] = "Thumbnails oprettet";
---
> 		$admtext['thumbsgenerated'] = "Miniaturer er blevet oprettet";
399c435
< 		$admtext['recsupdated'] = "Posterne er opdateret";
---
> 		$admtext['recsupdated'] = "Posterne er blevet opdaterede";
402,404c438,440
< 		$admtext['sortheadstones'] = "Sorter gravsten";
< 		$admtext['sortheadstonesfor'] = "Sorter gravsten for";
< 		$admtext['sortheadstonesind'] = "Sorter gravsten for en person";
---
> 		$admtext['sortheadstones'] = "Sortér gravsten";
> 		$admtext['sortheadstonesfor'] = "Sortér gravsten for";
> 		$admtext['sortheadstonesind'] = "Sortér gravsten for en person";
417d452
< 		$admtext['imgmap'] = "Billedkort";
435c470
< 		$admtext['abspath'] = "Dette billede kommer fra en ekstern kilde (du skal selv skaffe en thumbnail)";
---
> 		$admtext['abspath'] = "Dette billede kommer fra en ekstern kilde (man skal selv skaffe en miniature)";
439c474
< 		$admtext['defphotonote'] = "Brug thumbnailen for dette billede til at identificere denne person, familie eller kilde på anetavle og andre kort, inklusive familiegruppekort.";
---
> 		$admtext['defphotonote'] = "Brug miniaturen for dette billede til at identificere denne person, familie eller kilde på anetavle og andre kort, inklusive familiegruppekort.";
441,443c476,478
< 		$admtext['requiredphoto'] = "Nødvendigt. Dette skal svare til navn og placering for din fil <em>i billedmappen,</em> når filen er uploadet. For eksempel, hvis billedmappen hedder <em>fotografier</em>, og du vil kalde din fil <em>mitbillede.jpg</em> og lægge den i en undermappe, der hedder <em>nyefotografier</em>, skal du indtaste <em>nyefotografier/mitbillede.jpg</em> i dette felt.";
< 		$admtext['leaveblankphoto'] = "Lad dette felt være tomt, hvis filen allerede er uploaded til din billedmappe.";
< 		$admtext['thumbconflicts'] = "Thumbnails ikke oprettet på grund af sti-, tilladelses- eller filnavnproblemer";
---
> 		$admtext['requiredphoto'] = "Nødvendigt. Dette skal svare til navn og placering af filen <em>i billedmappen,</em> når filen er uploadet. For eksempel, hvis billedmappen hedder <em>fotografier</em>, og filen skal hedde <em>mitbillede.jpg</em> og lægges i en undermappe, der hedder <em>nyefotografier</em>, skal man indtaste <em>nyefotografier/mitbillede.jpg</em> i dette felt.";
> 		$admtext['leaveblankphoto'] = "Lad dette felt være tomt, hvis filen allerede er uploaded til billedmappen.";
> 		$admtext['thumbconflicts'] = "Miniatuer er ikke blevet oprettet på grund af sti-, tilladelses- eller filnavnproblemer";
450,452c485,487
< 		$admtext['confdeletemedia'] = "Er du sikker på, at du vil slette dette billede?";
< 		$admtext['thumbnails'] = "Miniaturebilleder";
< 		$admtext['modifyalbum'] = "Tilpas nuværende album";
---
> 		$admtext['confdeletemedia'] = "Er det sikkert, at dette billede skal slettes?";
> 		$admtext['thumbnails'] = "Miniaturer";
> 		$admtext['modifyalbum'] = "Tilpas eksisterende album";
455c490
< 		$admtext['confdeletealbum'] = "Er du sikker på, at du vil slette dette album?";
---
> 		$admtext['confdeletealbum'] = "Er det sikkert, at dette album skal slettes?";
474,475c509,510
< 		$admtext['sortmediaind'] = "Sorter billeder for person, familie, kilde, arkiv eller sted";
< 		$admtext['sortmedia'] = "Sorter xxx for";
---
> 		$admtext['sortmediaind'] = "Sortér billeder for person, familie, kilde, arkiv eller sted";
> 		$admtext['sortmedia'] = "Sortér xxx for";
477,478c512,513
< 		$admtext['samepaths'] = "Det foretrukne billede og thumbnail'en er muligvis ikke samme fil. Vælg et andet thumbnail, eller få lavet et.";
< 		$admtext['regenerate'] = "Genskab nuværende thumbnails";
---
> 		$admtext['samepaths'] = "Det foretrukne billede og miniaturen er muligvis ikke samme fil. Vælg en anden miniature, eller opret en.";
> 		$admtext['regenerate'] = "Gendan nuværende miniaturer";
484c519
< 		$admtext['controller'] = "Tillad ca. 16 vertikale pixels for medieafspiller kontrollen.";
---
> 		$admtext['controller'] = "Tillad ca. 16 vertikale pixels for medieafspillerkontrollen.";
489,491c524,525
< 		$admtext['mapinstr2'] = "Tilknyt et udsnit af dit billede til forskellige personer eller andre sider (valgfrit) ved at udfylde HTML billedkortet nedenfor, eller ved at følge instruktionen ved billedet herunder.";
< 		$admtext['mapinstr3'] = "For at knytte et udsnit af dette billede til en person, skal man først vælge den enkeltes træ og derefter oprette et rektangel for det ønskede udsnit. Dette gøres ved at klikke i øverste venstre hjørne af udsnittet og derefter trække til det nederste højre hjørne. Eller man kan klikke i øverste venstre hjørne og derefter i det nederste højre hjørne. En pop op boks vil så hjælpe til med at vælge personen. Når valget er foretaget, vil koordinaterne for udsnittet blive tilføjet i boksen nedenfor. Gentag denne metode for yderligere udsnit.";
< 		$admtext['albumlinks'] = "Album links";
---
> 		$admtext['mapinstr2'] = "Tilknyt et udsnit af dit billede til forskellige personer eller andre sider (valgfrit) ved at udfylde HTML-billedkortet nedenfor, eller ved at følge instruktionen ved billedet herunder.";
> 		$admtext['albumlinks'] = "Albumlinks";
493c527
< 		$admtext['invlinkmsg'] = "Du har indtastet en ugyldig ID. Der blev ikke lavet et link.";
---
> 		$admtext['invlinkmsg'] = "Der er indtastet et ugyldigt ID. Der blev ikke oprettet noget link.";
495,496c529
< 		$admtext['removelink'] = "Slet dette link";
< 		$admtext['confremmedia'] = "er du sikker på, at du vil slette dette billede fra albummet?";
---
> 		$admtext['confremmedia'] = "er det sikkert, at dette billede skal slettes fra albummet?";
499c532
< 		$admtext['existmedia'] = "Nuværende billeder";
---
> 		$admtext['existmedia'] = "Eksisterende billeder";
502d534
< 		$admtext['eloptions'] = "Gennemse eller slet";
509d540
< 		$admtext['nolinks'] = "Der er endnu ingen links";
513c544
< 		$admtext['uplsel'] = "Upload en ny fil fra din pc eller vælg en fil, der allerede er på din hjemmeside";
---
> 		$admtext['uplsel'] = "Upload en ny fil fra computeren eller vælg en fil, der allerede er på websiden";
515c546
< 		$admtext['medlater'] = "Bemærk: På næste side kan der tilføjes yderligere oplysninger, og emnet kan linkes til personer eller familier.";
---
> 		$admtext['medlater'] = "Bemærk: På næste side kan der tilføjes yderligere oplysninger, og mediet kan linkes til personer eller familier.";
523c554
< 		$admtext['colldisplay'] = "Display Title";
---
> 		$admtext['colldisplay'] = "Vis titel";
532,535c563,566
< 		$admtext['confmtdelete'] = "Er du sikker på, at du vil slette denne billedtype?";
< 		$admtext['histlimit'] = "<strong>Bemærk!</strong> De fleste browsere begrænser datamængden, der kan sendes i et webskema til omkring 64 kb. Hvis du har meget tekst, der skal indtastes i eller kopieres til tekstfeltet ovenfor, kan du i stedet overveje at bruge historytemplate.php. Slå op i Hjælp for yderligere oplysninger.";
< 		$admtext['repath'] = "Genskab thumbnail sti navne, hvor fil ikke findes";
< 		$admtext['sortalbumind'] = "Sorter albummer for en person, familie, kilde, arkiv eller sted.";
---
> 		$admtext['confmtdelete'] = "Er det sikkert, at denne billedtype skal slettes?";
> 		$admtext['histlimit'] = "<strong>Bemærk!</strong> De fleste browsere begrænser datamængden, der kan sendes i et webskema til omkring 64 kb. Hvis der er meget tekst, der skal indtastes i eller kopieres til tekstfeltet ovenfor, kan man i stedet overveje at bruge historytemplate.php. Slå op i Hjælp for yderligere oplysninger.";
> 		$admtext['repath'] = "Genskab miniature stinavne, hvor fil ikke findes";
> 		$admtext['sortalbumind'] = "Sortér albummer for en person, familie, kilde, arkiv eller sted.";
538d568
< 		//added in 8.0.0
540c570
< 		$admtext['collthumb'] = "Thumbnail fil";
---
> 		$admtext['collthumb'] = "Miniature-fil";
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
547c575
< 		$admtext['mediaupl'] = "Upload Medie";
---
> 		$admtext['mediaupl'] = "Upload medie";
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Billed Kort (for bagud kompatibilitet)";
> 		$admtext['photoowner'] = "Ejer af Originalen";
> 		$admtext['nothumb'] = "Ingen miniature";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Elementet kunne ikke tilføjes, sandsynligvis fordi filen var for stor og ikke kunne uploades eller filen bruges til at oprette et miniaturebillede.";
> 		$admtext['moved'] = "Flyttet";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Indtast en titel eller beskrivelse for dette medie.";
> 		$admtext['mapinstr3'] = "For at knytte et område af dette billede til en person eller en familie eller anden enhed, skal man først vælge et træ og enhedstype, og derefter opretter man et rektangel for det ønskede område. Dette gøres ved at klikke i øverste venstre hjørne af området og derefter trække til nederste højre hjørne. Eller man kan klikke i øverste venstre hjørne og derefter klikker man i nederste højre hjørne. Et pop-op-vindue hjælper derefter med at vælge personen eller en anden enhed. Foretag et valg, og gentag derefter dette forløb efter behov for andre områder i billedet. Klik på et eksisterende område for at vælge det, og træk derefter for at flytte det eller klik på 'X' for at slette det.";
561,562c599,600
< 		$admtext['modifyreport'] = "Redigér nuværende rapport";
< 		$admtext['existingreportinfo'] = "Nuværende oplysninger om rapport";
---
> 		$admtext['modifyreport'] = "Redigér eksisterende rapport";
> 		$admtext['existingreportinfo'] = "Oplysninger om eksisterende rapport";
564c602
< 		$admtext['newreportinfo'] = "Ny rapport oplysninger";
---
> 		$admtext['newreportinfo'] = "Oplysninger om ny rapport";
571,578c609,616
< 		$admtext['ldsbapldate'] = "LDS dåbsdato";
< 		$admtext['ldsbaplplace'] = "LDS dåbssted";
< 		$admtext['ldsendldate'] = "LDS begavelsesdato";
< 		$admtext['ldsendlplace'] = "LDS begavelsessted";
< 		$admtext['ldssealsdate'] = "LDS beseglingdato/ægtefælle";
< 		$admtext['ldssealsplace'] = "LDS beseglingssted/ægtefælle";
< 		$admtext['ldssealpdate'] = "LDS beseglingsdato/forældre";
< 		$admtext['ldssealpplace'] = "LDS beseglingssted/forældre";
---
> 		$admtext['ldsbapldate'] = "SDH dåbsdato";
> 		$admtext['ldsbaplplace'] = "SDH dåbssted";
> 		$admtext['ldsendldate'] = "SDH begavelsesdato";
> 		$admtext['ldsendlplace'] = "SDH begavelsessted";
> 		$admtext['ldssealsdate'] = "SDH beseglingdato/ægtefælle";
> 		$admtext['ldssealsplace'] = "SDH beseglingssted/ægtefælle";
> 		$admtext['ldssealpdate'] = "SDH beseglingsdato/forældre";
> 		$admtext['ldssealpplace'] = "SDH beseglingssted/forældre";
596,597c634
< 		$admtext['foremptystring'] = "For en tom streng, lad dette felt være tomt, og klik \"Tilføj >>.\"";
< 		$admtext['choosesort'] = "Vælg sorter felter";
---
> 		$admtext['choosesort'] = "Vælg 'Sortér felter'";
603c640
< 		$admtext['confreportdelete'] = "Er du sikker på, at du vil slette denne rapport?";
---
> 		$admtext['confreportdelete'] = "Er det sikkert at denne rapport skal slettes?";
614,617c651,654
< 		$admtext['ldsbapldatetr'] = "LDS dåbsdato (Sand)";
< 		$admtext['ldsendldatetr'] = "LDS begavelsesdato (Sand)";
< 		$admtext['ldssealsdatetr'] = "LDS beseglingsdato/ægtefælle (Sand)";
< 		$admtext['ldssealpdatetr'] = "LDS beseglingsdato/forældre (Sand)";
---
> 		$admtext['ldsbapldatetr'] = "SDH dåbsdato (Sand)";
> 		$admtext['ldsendldatetr'] = "SDH begavelsesdato (Sand)";
> 		$admtext['ldssealsdatetr'] = "SDH beseglingsdato/ægtefælle (Sand)";
> 		$admtext['ldssealpdatetr'] = "SDH beseglingsdato/forældre (Sand)";
633c670
< 		$admtext['confremmw'] = "Er du sikker på, at du vil fjerne dette emne?";
---
> 		$admtext['confremmw'] = "Er det sikkert, at dette emne skal fjernes?";
635d671
< 		//added in 9.1.1
639,644c675,680
< 		$admtext['ldsconfdate'] = "LDS Bekræftelses Dato";
< 		$admtext['ldsconfplace'] = "LDS Bekræftelses Sted";
< 		$admtext['ldsconfdatetr'] = "LDS Bekræftelses Dato (Sand)";
< 		$admtext['ldsinitdate'] = "LDS Forberedende Dato";
< 		$admtext['ldsinitplace'] = "LDS Forberedende Sted";
< 		$admtext['ldsinitdatetr'] = "LDS Forberedende Dato (Sand)";
---
> 		$admtext['ldsconfdate'] = "SDH Bekræftelsesdato";
> 		$admtext['ldsconfplace'] = "SDH Bekræftelsessted";
> 		$admtext['ldsconfdatetr'] = "SDH Bekræftelsessato (Sand)";
> 		$admtext['ldsinitdate'] = "SDH Forberedende dato";
> 		$admtext['ldsinitplace'] = "SDH Forberedende sted";
> 		$admtext['ldsinitdatetr'] = "SDH Forberedende dato (Sand)";
646c682,686
< 		$admtext['activeonly'] = "Kun Aktive";
---
> 		$admtext['activeonly'] = "Kun aktive";
> 		//added in 14.0
> 		$admtext['instr'] = "Instruktioner: Træk eller dobbeltklik på elementer til venstre for at tilføje dem til listen til højre. Træk elementerne op eller ned for at omarrangere dem. Dobbeltklik for at fjerne elementerne.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For en tom streng, lad dette felt stå tomt og klik >>";
651,655d690
< 		$admtext['selectimportfile'] = "Vælg den fil, du vil importere.";
< 		$admtext['importgedcom'] = "Importer GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Tilføj til eller erstat dit slægtstræ (dette kan tage flere minutter afhængig af filstørrelsen)";
< 		$admtext['fromyourcomputer'] = "Fra din computer";
< 		$admtext['importdata'] = "Importer data";
657,660d691
< 		$admtext['replace'] = "Erstat (i det valgte træ)";
< 		$admtext['desttree'] = "Destinationstræ";
< 		$admtext['selectdesttree'] = "Vælg eller indtast et destinationstræ.";
< 		$admtext['selectexisting'] = "Importer ind i";
668,673d698
< 		$admtext['ucaselast'] = "Skriv alle efternavne med stort";
< 		$admtext['norecalc'] = "Udfør ikke genberegninger for 'nulevende'-markeringer";
< 		$admtext['autooffset'] = "Begynd ID'er ved første ledige nummer";
< 
< 		$admtext['mustselecttree'] = "Du skal vælge et træ, før du vælger denne option.";
< 		$admtext['importmedia'] = "Importér nuværende billeder m.m.";
675,692c700
< 		$admtext['neweronly'] = "Erstat kun hvis nyere";
< 		$admtext['secondaryitems'] = "Opret en GENDEX fil, spor efterkommerlinjer";
< 		$admtext['onwebserver'] = "Fra webserver (i GEDCOM-mappen)";
< 		$admtext['eventsonly'] = "Importer kun standard begivenhedstyper";
< 		$admtext['imphints'] = "OBS: Med “Alle aktuelle data� menes alle personer, familier, kilder og notater (medie tilknytninger går ikke tabt, så længe ID'erne er de samme). Matchende poster baseres altid kun på ID'er. Nye poster tilføjes altid. Med “Tilføj alle poster� menes alle poster med nye ID'er.";
< 		$admtext['allevents'] = "Acceptér data for alle nye almindelige begivenhedstyper";
< 		$admtext['destbranch'] = "Destination for gren (valgfri)";
< 		$admtext['inframe'] = "(i ramme)";
< 		$admtext['getstart'] = "Kom i gang";
< 		$admtext['importlatlong'] = "Importér bredde- og længdegrad hvis de findes";
< 		$admtext['opening'] = "Ã…bner";
< 		$admtext['reopen'] = "Genåbner";
< 		$admtext['uploading'] = "Uploader";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stoppet";
< 		$admtext['resume'] = "Fortsæt";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Admin Log";
---
> 		$admtext['secondaryitems'] = "Opret en GENDEX-fil, spor efterkommerlinjer";
694,696c702
< 		$admtext['mmgritems'] = "Konfigurer 3-parts tilføjelser";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Gammeldags import (uden forløbsbjælke)";
---
> 		$admtext['mmgritems'] = "Konfigurer 3.-parts tilføjelser";
698c704
< 		$admtext['miscitems'] = "Nyheder, Mest eftersøgte, Data Validering";
---
> 		$admtext['miscitems'] = "Nyheder, Mest eftersøgte, Datavalidering";
700,701c706,707
< 		$admtext['tasks'] = "Vigtige Opgaver";
< 		$admtext['task_revusers'] = "Gennemse nye bruger registreringer";
---
> 		$admtext['tasks'] = "Vigtige opgaver";
> 		$admtext['task_revusers'] = "Gennemse nye brugerregistreringer";
706,710c712,716
< 		$admtext['task_revind'] = "Gennemse foreslåede ændringer til person begivenheder";
< 		$admtext['task_revfam'] = "Gennemse foreslåede ændringer til familie begivenheder";
< 		$admtext['task_backup'] = "Backup data";
< 		$admtext['nobackups'] = "Der findes ingen backups";
< 		$admtext['lastbackup'] = "sidste backup mere end xxx dage siden";
---
> 		$admtext['task_revind'] = "Gennemse foreslåede ændringer til personbegivenheder";
> 		$admtext['task_revfam'] = "Gennemse foreslåede ændringer til familiebegivenheder";
> 		$admtext['task_backup'] = "Lav sikkerhedskopi";
> 		$admtext['nobackups'] = "Der findes ingen sikkerhedskopier";
> 		$admtext['lastbackup'] = "sidste sikkerhedskopi mere end xxx dage gammel";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Opgradering";
> 		$admtext['need_upgrade'] = "Afslut disse opgraderings instruktioner";
> 		$admtext['upgrade_missing'] = "Opgraderings filen ser ud til at mangle, så muligvis er opgraderingen allerede færdig.";
> 		$admtext['delete_upgrade'] = "Når man er færdig, skal man klikke her for at slette opgraderingsfilen og vende tilbage til menuen.";
723d733
< 		$admtext['author'] = "Forfatter";
727c737
< 		$admtext['confdeletesrc'] = "Er du sikker på, at du vil slette denne kilde?";
---
> 		$admtext['confdeletesrc'] = "Er det sikkert, at denne kilde skal slettes?";
729,730c739,740
< 		$admtext['existingsourceinfo'] = "Nuværende oplysninger for kilde";
< 		$admtext['newsourceinfo'] = "Ny kilde oplysninger";
---
> 		$admtext['existingsourceinfo'] = "Oplysninger om eksisterende kilde";
> 		$admtext['newsourceinfo'] = "Oplysninger om ny kilde";
732c742
< 		$admtext['prefixsourceid'] = "Begynd kilde-ID med \"S\" for \"Source\"";
---
> 		$admtext['prefixsourceid'] = "Begynd kilde-ID med \"K\" for \"Kilde\"";
734c744
< 		$admtext['validsourceid'] = "Indtast et gyldigt kilde-ID. Et gyldigt ID er en numerisk streng, der starter med 'S'.";
---
> 		$admtext['validsourceid'] = "Indtast et gyldigt kilde-ID. Et gyldigt ID er en numerisk streng, der starter med 'K'.";
736c746
< 		$admtext['editexistingsource'] = "Redigér oplysninger for en tidligere tilføjet kilde";
---
> 		$admtext['editexistingsource'] = "Redigér oplysninger om en tidligere tilføjet kilde";
738,739c748,749
< 		$admtext['reliability'] = "PÃ¥lidelighed";
< 		$admtext['relyexplain'] = "Jo højere nummer, jo større pålidelighed.";
---
> 		$admtext['reliability'] = "Kildetroværdighed";
> 		$admtext['relyexplain'] = "Jo højere tal, jo større troværdighed.";
748c758
< 		$admtext['modifyrepo'] = "Redigér nuværende arkiv";
---
> 		$admtext['modifyrepo'] = "Redigér eksisterende arkiv";
750c760
< 		$admtext['editexistingrepo'] = "Redigér oplysninger for et tidligere oprettet arkiv";
---
> 		$admtext['editexistingrepo'] = "Redigér oplysninger om et tidligere oprettet arkiv";
753,754c763,764
< 		$admtext['newrepoinfo'] = "Nyt arkiv oplysninger";
< 		$admtext['prefixrepoid'] = "Indled arkiv-ID med \"REPO\" for \"Repository\"";
---
> 		$admtext['newrepoinfo'] = "Oplysninger om nyt arkiv";
> 		$admtext['prefixrepoid'] = "Indled arkiv-ID med \"ARKIV\" for \"Arkiv\"";
756c766
< 		$admtext['confdeleterepo'] = "Er du sikker på, at du vil slette dette arkiv?";
---
> 		$admtext['confdeleterepo'] = "Er det sikkert at dette arkiv skal slettes?";
758c768
< 		$admtext['existingrepoinfo'] = "Nuværende oplysninger for arkiv";
---
> 		$admtext['existingrepoinfo'] = "Oplysninger om eksisterende arkiv";
761c771
< 		$admtext['confirmmergesources'] = "Er du sikker på, at du vil flette disse to kilder?";
---
> 		$admtext['confirmmergesources'] = "Er det sikkert, at disse to kilder skal flettes?";
763c773
< 		$admtext['confirmmergerepos'] = "Er du sikker på, at du vil flette disse to arkiver?";
---
> 		$admtext['confirmmergerepos'] = "Er det sikkert, at disse to arkiver skal flettes?";
765c775
< 		$admtext['confdeleterepo'] = "Er du sikker på, at du vil slette dette arkiv?";
---
> 		$admtext['confdeleterepo'] = "Er det sikkert at dette arkiv skal slettes?";
783,784c793,794
< 		$admtext['mainpara'] = "Velkommen paragraf";  //1, 4, 6, 7, 8
< 		$admtext['headimgplustitle'] = "Billede i sidehoved (inkl. titel)"; //1
---
> 		$admtext['mainpara'] = "Velkomsttekst";  //1, 4, 6, 7, 8
> 		$admtext['headimgplustitle'] = "Billede på sidehoved (inkl. titel)"; //1
787,788c797,798
< 		$admtext['phhistperson'] = "Billeder & Historier for person-ID"; //2
< 		$admtext['phhisttree'] = "Billeder & Historier tavle-ID"; //2
---
> 		$admtext['phhistperson'] = "Billeder & Fortællinger for person-ID"; //2
> 		$admtext['phhisttree'] = "Billeder & Fortællinger tavle-ID"; //2
792,798c802,808
< 		$admtext['searchpara'] = "Search tekst"; //6
< 		$admtext['fhpara'] = "Family Histories tekst"; //6
< 		$admtext['fhlinkshis'] = "Family Histories links (Hans)"; //6
< 		$admtext['fhlinkshers'] = "Family Histories links (Hendes)"; //6
< 		$admtext['mwpara'] = "Most Wanted tekst"; //6
< 		$admtext['respara'] = "Resources tekst"; //6
< 		$admtext['reslinks'] = "Links til Ressourcer"; //6
---
> 		$admtext['searchpara'] = "Søgetekst"; //6
> 		$admtext['fhpara'] = "Familiefortællinger tekst"; //6
> 		$admtext['fhlinkshis'] = "Familiefortællinger links (Hans)"; //6
> 		$admtext['fhlinkshers'] = "Familiefortællinger links (Hendes)"; //6
> 		$admtext['mwpara'] = "Mest søgte tekst"; //6
> 		$admtext['respara'] = "Ressourcer tekst"; //6
> 		$admtext['reslinks'] = "Links til ressourcer"; //6
804,825c814,835
< 		$admtext['momside'] = "Mors side"; //8
< 		$admtext['dadside'] = "Fars side"; //8
< 		$admtext['momperson'] = "Mors side person-ID"; //8
< 		$admtext['momtree'] = "Mors side træ-ID"; //8
< 		$admtext['dadperson'] = "Fars side person-ID"; //8
< 		$admtext['dadtree'] = "Fars side træ-ID"; //8
< 		$admtext['featurethumb1'] = "Feature 1 miniaturebillede"; //4
< 		$admtext['featurelink1'] = "Feature 1 link"; //4
< 		$admtext['featuretitle1'] = "Feature 1 titel"; //4
< 		$admtext['featurepara1'] = "Feature 1 afsnit"; //4
< 		$admtext['featurethumb2'] = "Feature 2 miniaturebillede"; //4
< 		$admtext['featurelink2'] = "Feature 2 link"; //4
< 		$admtext['featuretitle2'] = "Feature 2 titel"; //4
< 		$admtext['featurepara2'] = "Feature 2 afsnit"; //4
< 		$admtext['featurethumb3'] = "Feature 3 miniaturebillede"; //4
< 		$admtext['featurelink3'] = "Feature 3 link"; //4
< 		$admtext['featuretitle3'] = "Feature 3 titel"; //4
< 		$admtext['featurepara3'] = "Feature 3 afsnit"; //4
< 		$admtext['featurethumb4'] = "Feature 4 miniaturebillede"; //4
< 		$admtext['featurelink4'] = "Feature 4 link"; //4
< 		$admtext['featuretitle4'] = "Feature 4 titel"; //4
< 		$admtext['featurepara4'] = "Feature 4 afsnit"; //4
---
> 		$admtext['momside'] = "Mors side"; //8, 20
> 		$admtext['dadside'] = "Fars side"; //8, 20
> 		$admtext['momperson'] = "Mors side person-ID"; //8, 20
> 		$admtext['momtree'] = "Mors side træ-ID"; //8, 20
> 		$admtext['dadperson'] = "Fars side person-ID"; //8, 20
> 		$admtext['dadtree'] = "Fars side træ-ID"; //8, 20
> 		$admtext['featurethumb1'] = "Artikel 1 miniature-billede"; //4
> 		$admtext['featurelink1'] = "Artikel 1 link"; //4
> 		$admtext['featuretitle1'] = "Artikel 1 titel"; //4
> 		$admtext['featurepara1'] = "Artikel 1 afsnit"; //4
> 		$admtext['featurethumb2'] = "Artikel 2 miniature-billede"; //4
> 		$admtext['featurelink2'] = "Artikel 2 link"; //4
> 		$admtext['featuretitle2'] = "Artikel 2 titel"; //4
> 		$admtext['featurepara2'] = "Artikel 2 afsnit"; //4
> 		$admtext['featurethumb3'] = "Artikel 3 miniature-billede"; //4
> 		$admtext['featurelink3'] = "Artikel 3 link"; //4
> 		$admtext['featuretitle3'] = "Artikel 3 titel"; //4
> 		$admtext['featurepara3'] = "Artikel 3 afsnit"; //4
> 		$admtext['featurethumb4'] = "Artikel 4 miniature-billede"; //4
> 		$admtext['featurelink4'] = "Artikel 4 link"; //4
> 		$admtext['featuretitle4'] = "Artikel 4 titel"; //4
> 		$admtext['featurepara4'] = "Artikel 4 afsnit"; //4
832c842
< 		$admtext['templateswitching'] = "Aktivér Valg af Skabelon";
---
> 		$admtext['templateswitching'] = "Aktivér Valg af skabelon";
837,838c847,848
< 		$admtext['featurepara'] = "Artikel paragraf"; //9, 10
< 		$admtext['welcome'] = "Velkommen overskrift"; //9, 10
---
> 		$admtext['featurepara'] = "Artikelafsnit"; //9, 10
> 		$admtext['welcome'] = "Velkomst overskrift"; //9, 10
840,841c850,851
< 		$admtext['momsidenames'] = "Mom's Side names"; //8
< 		$admtext['dadsidenames'] = "Dad's Side names"; //8
---
> 		$admtext['momsidenames'] = "Mors side navne"; //8
> 		$admtext['dadsidenames'] = "Fars side navne"; //8
843,845c853,855
< 		$admtext['featurespara'] = "Artikel paragraf";
< 		$admtext['menutitle'] = "Menu Titel";
< 		$admtext['titlechoice'] = "Titel valg";
---
> 		$admtext['featurespara'] = "Artikelafsnit";
> 		$admtext['menutitle'] = "Menutitel";
> 		$admtext['titlechoice'] = "Titelvalg";
847c857
< 		$admtext['phototitlel'] = "Venstre billede titel";
---
> 		$admtext['phototitlel'] = "Venstre billedtitel";
850c860
< 		$admtext['phototitler'] = "Højre billede titel";
---
> 		$admtext['phototitler'] = "Højre billedtitel";
853,858c863,868
< 		$admtext['headimg2'] = "Header billede 2"; //14
< 		$admtext['headimg3'] = "Header billede 3"; //14
< 		$admtext['showprev'] = "Vis Gennemsyn";
< 		$admtext['hideprev'] = "Skjul Gennemsyn";
< 		$admtext['ttitleimage'] = "Image";
< 		$admtext['ttitletext'] = "Text";
---
> 		$admtext['headimg2'] = "Sidehovedbillede 2"; //14
> 		$admtext['headimg3'] = "Sidehovedbillede 3"; //14
> 		$admtext['showprev'] = "Forhåndsvisning";
> 		$admtext['hideprev'] = "Skjul forhåndsvisning";
> 		$admtext['ttitleimage'] = "Billede";
> 		$admtext['ttitletext'] = "Tekst";
860,876c870,886
< 		$admtext['featurethumb5'] = "Feature 5 miniaturebillede"; //15
< 		$admtext['featurelink5'] = "Feature 5 link"; //15
< 		$admtext['featuretitle5'] = "Feature 5 titel"; //15
< 		$admtext['featurepara5'] = "Feature 5 paragraf"; //15
< 		$admtext['featurethumb6'] = "Feature 6 miniaturebillede"; //15
< 		$admtext['featurelink6'] = "Feature 6 link"; //15
< 		$admtext['featuretitle6'] = "Feature 6 titel"; //15
< 		$admtext['featurepara6'] = "Feature 6 paragraf"; //15
< 		$admtext['featurethumb7'] = "Feature 7 miniaturebillede"; //15
< 		$admtext['featurelink7'] = "Feature 7 link"; //15
< 		$admtext['featurepara7'] = "Feature 7 paragraf"; //15
< 		$admtext['featurethumb8'] = "Feature 8 miniaturebillede"; //15
< 		$admtext['featurelink8'] = "Feature 8 link"; //15
< 		$admtext['featurepara8'] = "Feature 8 paragraf"; //15
< 		$admtext['sidebarhead1'] = "Sidebjælke header 1"; //15
< 		$admtext['sidebarhead2'] = "Sidebjælke header 2"; //15
< 		$admtext['sidebarhead3'] = "Sidebjælke header 3"; //15
---
> 		$admtext['featurethumb5'] = "Artikel 5 miniature-billede"; //15
> 		$admtext['featurelink5'] = "Artikel 5 link"; //15
> 		$admtext['featuretitle5'] = "Artikel 5 titel"; //15
> 		$admtext['featurepara5'] = "Artikel 5 afsnit"; //15
> 		$admtext['featurethumb6'] = "Artikel 6 miniature-billede"; //15
> 		$admtext['featurelink6'] = "Artikel 6 link"; //15
> 		$admtext['featuretitle6'] = "Artikel 6 titel"; //15
> 		$admtext['featurepara6'] = "Artikel 6 afsnit"; //15
> 		$admtext['featurethumb7'] = "Artikel 7 miniature-billede"; //15
> 		$admtext['featurelink7'] = "Artikel 7 link"; //15
> 		$admtext['featurepara7'] = "Artikel 7 afsnit"; //15
> 		$admtext['featurethumb8'] = "Artikel 8 miniature-billede"; //15
> 		$admtext['featurelink8'] = "Artikel 8 link"; //15
> 		$admtext['featurepara8'] = "Artikel 8 afsnit"; //15
> 		$admtext['sidebarhead1'] = "Sidebjælke sidehoved 1"; //15
> 		$admtext['sidebarhead2'] = "Sidebjælke sidehoved 2"; //15
> 		$admtext['sidebarhead3'] = "Sidebjælke sidehoved 3"; //15
879c889
< 		$admtext['textpara1'] = "Tekst 1 paragraf"; //15
---
> 		$admtext['textpara1'] = "Tekst 1 afsnit"; //15
882c892
< 		$admtext['textpara2'] = "Tekst 2 paragraf"; //15
---
> 		$admtext['textpara2'] = "Tekst 2 afsnit"; //15
884,887c894,980
< 		$admtext['textpara3'] = "Tekst 3 paragraf"; //15
< 		$admtext['subhead1'] = "Subheader 1"; //15
< 		$admtext['subhead2'] = "Subheader 2"; //15
< 
---
> 		$admtext['textpara3'] = "Tekst 3 afsnit"; //15
> 		$admtext['subhead1'] = "Underoverskrift 1"; //15
> 		$admtext['subhead2'] = "Underoverskrift 2"; //15
> 		//added in 12.2
> 		$admtext['quotehead'] = "Citater header";
> 		$admtext['quotesubhead'] = "Citater subheader";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Funktionsnavn";
> 		$admtext['snipinfoone'] = "Featurette første linje";
> 		$admtext['snipinfotwo'] = "Featurette anden linje";
> 		$admtext['snipimage'] = "Featurette billede";
> 		$admtext['snipperson'] = "Featurette person-ID";
> 		$admtext['sniptree'] = "Featurette træ-ID";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7-titel";
> 		$admtext['featuretitle8'] = "Feature 8-titel";
> 		$admtext['featuretitle9'] = "Feature 9-titel";
> 		$admtext['featurethumb9'] = "Feature 9 miniature"; //15
> 		$admtext['featurelink9'] = "Feature 9-link"; //15
> 		$admtext['featurepara9'] = "Funktion 9 afsnit"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Header Venstre Billede";
> 		$admtext['rightimg'] = "Header Højre Billede";
> 		$admtext['photoption'] = "Foto mulighederne er<br />&nbsp;&nbsp;(statisk eller tilfældig)";
> 		$admtext['randomphotowidth'] = "Tilfældig Foto Bredde";
> 		$admtext['randomphotoheight'] = "Tilfældig Foto Højjde";
> 		$admtext['randomphotomediatypeID'] = "Tilfældig Foto Samling";
> 		$admtext['momheading'] = "Mors Familie Overskrift";
> 		$admtext['mompara'] = "Mors Familie ";
> 		$admtext['mompagelink'] = "Mors Familie Side Link";
> 		$admtext['dadheading'] = "Fars Familie Overskrift";
> 		$admtext['dadpara'] = "Fars Familie Paragraf";
> 		$admtext['dadpagelink'] = "Fars Familie Side Link";
> 		$admtext['spmomheading'] = "Partners Mors Familie Overskrift";
> 		$admtext['spmompara'] = "Partners Mors Familie Paragraf";
> 		$admtext['spmompagelink'] = "Partners Mors Familie Side Link";
> 		$admtext['spmomside'] = "Partners Mors Side label";
> 		$admtext['spdadside'] = "Partners Fars Side label";
> 		$admtext['spmomperson'] = "Partners Mors Side person-ID";
> 		$admtext['spmomtree'] = "Partners Mors Side træ-ID";
> 		$admtext['spdadheading'] = "Partners Fars Familie Overskrift";
> 		$admtext['spdadpara'] = "Partners Fars Familie Paragraf";
> 		$admtext['spdadpagelink'] = "Partners Fars Familie Side Link";
> 		$admtext['spdadperson'] = "Partners Fars Side person-ID";
> 		$admtext['spdadtree'] = "Partners Fars Side træ-ID";
> 		$admtext['storiesheading'] = "Vores Families Fortællinger";
> 		$admtext['nbrsurnames'] = "Antal af Efternavne<br />&nbsp;&nbsp; i Efternavns Skyen";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature miniature";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
897,900c990,993
< 		$admtext['createdbtables'] = "Opret database tabellerne, der skal indeholde oplysninger.";
< 		$admtext['tcwarning'] = "<strong>Advarsel!</strong> Vælg kun denne mulighed, når du sætter din hjemmeside op for første gang. <strong>Alle nuværende data, inklusive billeder, historier, gravsten og kirkegårds oplysninger, vil blive slettet!</strong>";
< 		$admtext['conftabledelete'] = "Dette vil slette ALLE dine nuværende data!! Er du sikker på, at du vil fortsætte?";
< 		$admtext['performdatamaint'] = "Udfør datavedligeholdelse og sorter billeder, historier og andre komponenter.";
---
> 		$admtext['createdbtables'] = "Opret de databasetabeller, der skal indeholde oplysninger.";
> 		$admtext['tcwarning'] = "<strong>Advarsel!</strong> Vælg kun denne mulighed, når TNG installeres for første gang. <strong>Alle nuværende data vil blive slettet! Dette indbefatter historier og oplysninger om billeder, gravsten og kirkegårde.</strong>";
> 		$admtext['conftabledelete'] = "Dette vil slette ALLE nuværende data!! Er det i orden at fortsætte?";
> 		$admtext['performdatamaint'] = "Udfør datavedligeholdelse og sortér billeder, fortællinger og andet indhold.";
908c1001
< 		$admtext['fromphp'] = "Denne oplysning kommer fra din server og hører til PHP installationen, ikke TNG.";
---
> 		$admtext['fromphp'] = "Denne oplysning kommer fra serveren og hører til PHP installationen, ikke TNG.";
910c1003
< 		$admtext['phpreq'] = "(TNG kræver 5.3 eller højere.)";
---
> 		$admtext['phpreq'] = "(TNG kræver 7.0 eller højere.)";
912c1005
< 		$admtext['gdreq'] = "(Krævet til TNG's thumbnail dannelsesværktøj.)";
---
> 		$admtext['gdreq'] = "(Værktøj nødvendigt til at danne TNG miniaturer.)";
921c1014
< 		$admtext['notperm'] = "Ikke tilladt, brug FTP istedet";
---
> 		$admtext['notperm'] = "Ikke tilladt, brug FTP i stedet";
929c1022
< 		$admtext['usrprob'] = "Du har måske ikke det nødvendige filadgangsniveau til at køre TNG uden problemer, hvis du bruger både FTP og TNG admin-funktionerne til filbehandling.";
---
> 		$admtext['usrprob'] = "You may not have the necessary level of file access to run TNG without problems if you use both FTP and the TNG admin functions to manage files.";
933c1026
< 		$admtext['admlog'] = "Admin log";
---
> 		$admtext['admlog'] = "Adminlog";
938,940c1031,1033
< 		$admtext['restricted'] = "Nogle funktioner kan være begrænsede. Du kan opleve fejl under installationen, eller mens du kører TNG.";
< 		$admtext['needchngs'] = "TNG vil måske ikke virke uden ændringer i din PHP- eller serverkonfiguration.";
< 		$admtext['yourbrowser'] = "Din browser:";
---
> 		$admtext['restricted'] = "Nogle funktioner kan være begrænsede. Der kan opstå fejl under installationen, eller mens TNG kører.";
> 		$admtext['needchngs'] = "TNG vil måske ikke virke uden ændringer i PHP- eller serverkonfiguration.";
> 		$admtext['yourbrowser'] = "Browseren:";
949c1042
< 		$admtext['siteowner'] = "Hjemmesideejer";
---
> 		$admtext['siteowner'] = "Ejer af webstedet";
951c1044
< 		$admtext['disallow'] = "Forbyd";
---
> 		$admtext['disallow'] = "Tillad ikke";
956c1049
< 		$admtext['lastbackup'] = "Seneste backup";
---
> 		$admtext['lastbackup'] = "Seneste sikkerhedskopi";
968c1061
< 		$admtext['ldsdefault'] = "Vis LDS data";
---
> 		$admtext['ldsdefault'] = "Vis SDH-data";
973c1066
< 		$admtext['chooselang'] = "Dynamisk sprogskift";
---
> 		$admtext['chooselang'] = "Dynamisk sprogskifte";
983c1076
< 		$admtext['historypath'] = "Historiemappe";
---
> 		$admtext['historypath'] = "Fortællingsmappe";
989,993c1082,1086
< 		$admtext['thumbprefix'] = "Thumbnail præfiks";
< 		$admtext['thumbmaxh'] = "Thumbnail maks. højde";
< 		$admtext['thumbmaxw'] = "Thumbnail maks. bredde";
< 		$admtext['thumbsuffix'] = "Thumbnail suffiks";
< 		$admtext['showextended'] = "Vis udvidet billede oplysninger";
---
> 		$admtext['thumbprefix'] = "Miniature præfiks";
> 		$admtext['thumbmaxh'] = "Miniature maks. højde";
> 		$admtext['thumbmaxw'] = "Miniature maks. bredde";
> 		$admtext['thumbsuffix'] = "Miniature suffiks";
> 		$admtext['showextended'] = "Vis udvidede billedoplysninger";
1004,1005c1097,1098
< 		$admtext['newmedialinks'] = "Nyt link for billeder/historier";
< 		$admtext['maxgedcom'] = "Maks. generationer, GEDCOM download";
---
> 		$admtext['newmedialinks'] = "Nyt link for billeder/fortællinger";
> 		$admtext['maxgedcom'] = "Maks. generationer, GEDCOM-download";
1030,1031c1123,1124
< 		$admtext['surerestore'] = "Er du sikker på, at du vil gendanne de valgte tabeller?";
< 		$admtext['surerestorets'] = "Er du sikker på, at du vil gendanne tabelstrukturen? Alle nuværende data vil gå tabt!";
---
> 		$admtext['surerestore'] = "Er det sikkert, at de valgte tabeller skal gendannes?";
> 		$admtext['surerestorets'] = "Er det sikkert, at tabelstrukturen skal gendannes? Alle nuværende data vil gå tabt!";
1040c1133
< 		$admtext['gendex'] = "GENDEX mappe";
---
> 		$admtext['gendex'] = "GENDEX-mappe";
1043c1136
< 		$admtext['boxnamesize'] = "Boksnavn, størrelse";
---
> 		$admtext['boxnamesize'] = "Feltnavn, størrelse";
1045c1138
< 		$admtext['boxdatessize'] = "Boksdato, størrelse";
---
> 		$admtext['boxdatessize'] = "Feltdato, størrelse";
1047c1140
< 		$admtext['boxcolor'] = "Boksfarve";
---
> 		$admtext['boxcolor'] = "Feltfarve";
1052,1057c1145,1150
< 		$admtext['boxwidth'] = "Boksbredde (uden popups)";
< 		$admtext['boxheight'] = "Bokshøjde (uden popups)";
< 		$admtext['boxalign'] = "Boksjustering (uden popups)";
< 		$admtext['boxheightshift'] = "Skift bokshøjde (uden popups)";
< 		$admtext['boxHsep'] = "Boks, vandret adskillelse";
< 		$admtext['boxVsep'] = "Boks, lodret adskillelse";
---
> 		$admtext['boxwidth'] = "Feltbredde (uden popups)";
> 		$admtext['boxheight'] = "Felthøjde (uden popups)";
> 		$admtext['boxalign'] = "Feltjustering (uden popups)";
> 		$admtext['boxheightshift'] = "Skift felthøjde (uden popups)";
> 		$admtext['boxHsep'] = "Felt, vandret adskillelse";
> 		$admtext['boxVsep'] = "Felt, lodret adskillelse";
1066,1069c1159,1162
< 		$admtext['puboxwidth'] = "Boksbredde (m/popups)";
< 		$admtext['puboxheight'] = "Bokshøjde (m/popups)";
< 		$admtext['puboxalign'] = "Boksjustering (m/popups)";
< 		$admtext['puboxheightshift'] = "Skift bokshøjde (m/popups)";
---
> 		$admtext['puboxwidth'] = "Feltbredde (m/popups)";
> 		$admtext['puboxheight'] = "Felthøjde (m/popups)";
> 		$admtext['puboxalign'] = "Feltjustering (m/popups)";
> 		$admtext['puboxheightshift'] = "Skift felthøjde (m/popups)";
1078,1079c1171,1172
< 		$admtext['relchart'] = "Slægtskabstavle";
< 		$admtext['maxupgen'] = "Maks. antal slægtskabsgenerationer";
---
>         $admtext['relchart'] = " Slægtskabsdiagram";
>         $admtext['maxupgen'] = "Maks. antal Generationer af Slægtskaber";
1086,1088c1179,1181
< 		$admtext['pedbox'] = "Boks";
< 		$admtext['hideempty'] = "Skjul tomme bokse";
< 		$admtext['logfilename'] = "Logfil navn";
---
> 		$admtext['pedbox'] = "Felt";
> 		$admtext['hideempty'] = "Skjul tomme felter";
> 		$admtext['logfilename'] = "Logfilnavn";
1100c1193
< 		$admtext['localdocpath'] = "Lokal(e) historiesti(er)";
---
> 		$admtext['localdocpath'] = "Lokal(e) fortællingssti(er)";
1119c1212
< 		$admtext['sitesection'] = "Hjemmeside design og definitioner";
---
> 		$admtext['sitesection'] = "Webstedets design og definitioner";
1137c1230
< 		$admtext['suredelbk'] = "Er du sikker på, at du vil slette de valgte backup-filer?";
---
> 		$admtext['suredelbk'] = "Er det sikkert, at de valgte backup-filer skal slettes?";
1145,1146c1238,1239
< 		$admtext['sitename'] = "Hjemmesidens navn";
< 		$admtext['site_desc'] = "Beskrivelse af hjemmesiden";
---
> 		$admtext['sitename'] = "Webstedets Navn";
> 		$admtext['site_desc'] = "Beskrivelse af Webstedet";
1148c1241
< 		$admtext['custvars'] = "OBS: Du kan lave din egen opsætning i \"customconfig.php\" (åbn i teksteditor og følg instruktionerne).";
---
> 		$admtext['custvars'] = "OBS: Man kan oprette sin egen opsætning i \"customconfig.php\" (åbn i teksteditor og følg instruktionerne).";
1159,1161c1252,1254
< 		$admtext['mapdimsind'] = "Dimensioner, Person-sider";
< 		$admtext['mapdimshst'] = "Dimensioner, Gravsten-sider";
< 		$admtext['mapdimsadm'] = "Dimensioner, Admin-sider";
---
> 		$admtext['mapdimsind'] = "Dimensioner, Personsider";
> 		$admtext['mapdimshst'] = "Dimensioner, Gravstenssider";
> 		$admtext['mapdimsadm'] = "Dimensioner, Adminsider";
1179,1180c1272,1273
< 		$admtext['temptable'] = "Midlertidig begivenheds tabel";
< 		$admtext['tleventstable'] = "Tidslinje begivenheds tabel";
---
> 		$admtext['temptable'] = "Midlertidig begivenhedstabel";
> 		$admtext['tleventstable'] = "Tidslinje begivenhedstabel";
1183c1276
< 		$admtext['cemrows'] = "Maks. antal linier pr. kolonne (ca.)";
---
> 		$admtext['cemrows'] = "Maks. antal linjer pr. kolonne (ca.)";
1189,1190c1282,1283
< 		$admtext['maintexp'] = "Adgang til databasen er midlertidig forhindret pga. opdaterings. Vær venlig at prøve igen senere. Hvis problemet ikke er løst inden for nogle timer, kontakt da venligst hjemmesidens administrator.";
< 		$admtext['defimpopt'] = "Standard erstatningsmulighed";
---
> 		$admtext['maintexp'] = "Adgang til databasen er midlertidig forhindret pga. opdatering. Vær venlig at prøve igen senere. Hvis problemet ikke er løst inden for nogle timer, kontakt da venligst webstedets administrator.";
> 		$admtext['defimpopt'] = "Standarderstatningsmulighed";
1192c1285
< 		$admtext['renumber'] = "Omnummerer ID'er";
---
> 		$admtext['renumber'] = "Omnummerér ID'er";
1198,1199c1291,1292
< 		$admtext['needmaint'] = "Du skal være i opdaterings-mode for at bruge denne funktion. (gå til Opsætning &gt;&gt; Konfiguration &gt;&gt; Generel)";
< 		$admtext['reseqwarn'] = "<strong>ADVARSEL:</strong> Omnummerering af dine ID'er kan medføre, at eksterne links til din hjemmeside slettes eller henviser til forkerte adresser.";
---
> 		$admtext['needmaint'] = "Database opdatering skal være slået til for at bruge denne funktion. (gå til Opsætning &gt;&gt; Konfiguration &gt;&gt; Generel)";
> 		$admtext['reseqwarn'] = "<strong>ADVARSEL:</strong> Omnummerering af ID'er kan medføre, at eksterne links til websiden side slettes eller henviser til forkerte adresser.";
1210c1303
< 		$admtext['pstdonly'] = "Vis kun standard familiebegivenheder";
---
> 		$admtext['pstdonly'] = "Vis kun standardfamiliebegivenheder";
1213,1214c1306,1307
< 		$admtext['sitetime'] = "og hjemmesidetid er";
< 		$admtext['srexpl'] = "Valgfri. Brug et absolut sti-navn, som den du ser i rodstien, flyt derefter de følgende filer til Konfig. sti <strong>straks</strong> efter at have gemt og gør dem skrivbare (664 permissions): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
---
> 		$admtext['sitetime'] = "og webstedets tid er";
> 		$admtext['srexpl'] = "Valgfrit. Brug et absolut stinavn, ligesom den i rodstien, flyt derefter de følgende filer til config stien <strong>straks</strong> efter at have gemt dem og gjort dem skrivbare (664 permissions): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
1229,1230c1322,1323
< 		$admtext['rangeevs'] = "Kun begivenheder indenfor levetiden for personer på tavlen";
< 		$admtext['tcwidth'] = "Oprindelig bredde af tavlen";
---
> 		$admtext['rangeevs'] = "Kun begivenheder indenfor aktuel persons levetid";
> 		$admtext['tcwidth'] = "Oprindelig tavlebredde";
1232d1324
< 		//added in 8.0.0
1235c1327
< 		$admtext['initrels'] = "Begynd med antal slægtskaber";
---
> 		$admtext['initrels'] = "Standard antal Slægtskaber";
1241c1333
< 		$admtext['autoapp'] = "Autogodkend nye brugere";
---
> 		$admtext['autoapp'] = "Godkend automatisk nye brugere";
1255d1346
< 		//added in 9.0.0
1259c1350
< 		$admtext['mergeexpl'] = "(Dette vil fjerne træet fra alle Stednavne)";
---
> 		$admtext['mergeexpl'] = "(Dette vil fjerne træet fra alle stednavne)";
1266,1267c1357,1358
< 		$admtext['showshare'] = "Vis Share Link";
< 		$admtext['defpgsize'] = "Standard PDF Sidestørrelse";
---
> 		$admtext['showshare'] = "Vis Del Link";
> 		$admtext['defpgsize'] = "Standard PDF-sidestørrelse";
1270c1361
< 		$admtext['usedefthumbs'] = "Brug standard miniaturebilleder";
---
> 		$admtext['usedefthumbs'] = "Brug standard miniature";
1273c1364
<         $admtext['assumepriv'] = "Formod privat hvis ikke død i så mange år";
---
>         $admtext['assumepriv'] = "Formod privat, hvis ikke død i så mange år";
1276c1367
< 		$admtext['shownamespr'] = "Vis Navne på Private";
---
> 		$admtext['shownamespr'] = "Vis navne på private personer";
1278,1281c1369,1370
< 		//changed in 10.0.0
< 		$admtext['regnotes'] = "Vis noter og brugerdefinerede begivenheder på Registrene";
< 		//added in 10.0.0
< 		$admtext['collation'] = "Kollation";
---
> 		$admtext['regnotes'] = "Vis notater og brugerdefinerede begivenheder i registrene";
> 		$admtext['collation'] = "Sortering";
1285,1286c1374,1375
< 		$admtext['searchchoice'] = "Søg Link Destination";
< 		$admtext['quicksearch'] = "Hurtig Søgning";
---
> 		$admtext['searchchoice'] = "Søg indstilling";
> 		$admtext['quicksearch'] = "Hurtig søgning";
1289,1290c1378,1379
< 		$admtext['vboxwidth'] = "Rubrik Bredde";
< 		$admtext['vboxheight'] = "Rubrik Højde";
---
> 		$admtext['vboxwidth'] = "Rubrikbredde";
> 		$admtext['vboxheight'] = "Rubrikhøjde";
1292,1293c1381
< 		$admtext['vchart'] = "Lodret Stamtræ";
< 		//added in 10.1.0
---
> 		$admtext['vchart'] = "Lodret tavle";
1296,1298c1384
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Encryption";
<         //added in 11.0.0
---
>         $admtext['mailenc'] = "Kryptering";
1303,1312c1389,1398
< 		$admtext['personprefix'] = "Person præfiks";
< 		$admtext['personsuffix'] = "Person suffiks";
< 		$admtext['familyprefix'] = "Familie præfiks";
< 		$admtext['familysuffix'] = "Familie suffiks";
< 		$admtext['sourceprefix'] = "Kilde præfiks";
< 		$admtext['sourcesuffix'] = "Kilde suffiks";
< 		$admtext['repoprefix'] = "Arkiv præfiks";
< 		$admtext['reposuffix'] = "Arkiv suffiks";
< 		$admtext['noteprefix'] = "Note præfiks";
< 		$admtext['notesuffix'] = "Note suffiks";
---
> 		$admtext['personprefix'] = "Personpræfiks";
> 		$admtext['personsuffix'] = "Personsuffiks";
> 		$admtext['familyprefix'] = "Familiepræfiks";
> 		$admtext['familysuffix'] = "Familiesuffiks";
> 		$admtext['sourceprefix'] = "Kildepræfiks";
> 		$admtext['sourcesuffix'] = "Kildesuffiks";
> 		$admtext['repoprefix'] = "Arkivpræfiks";
> 		$admtext['reposuffix'] = "Arkivsuffiks";
> 		$admtext['noteprefix'] = "Notatpræfiks";
> 		$admtext['notesuffix'] = "Notatsuffiks";
1314c1400
< 		$admtext['mobilesite'] = "Mobil hjemmeside bliver ";
---
> 		$admtext['mobilesite'] = "Mobilside bliver ";
1318,1322c1404,1408
< 		$admtext['tabletype'] = "Responsiv tabel type";
< 		$admtext['enablemodeswitch'] = "Aktivér responsive tabeller funktion skifter";
< 		$admtext['enableminimap'] = "Aktivér responsive tabeller mini kort";
< 		$admtext['showtasks'] = "Vis 'Vigtige opgaver' beskeder";
< 		$admtext['showtotals'] = "Vis samlede antal på Admin menuen";
---
> 		$admtext['tabletype'] = "Responsiv tabeltype";
> 		$admtext['enablemodeswitch'] = "Aktivér funktionsomskifter for responsive tabeller";
> 		$admtext['enableminimap'] = "Aktivér minikort for responsive tabeller";
> 		$admtext['showtasks'] = "Vis besked om 'Vigtige opgaver'";
> 		$admtext['showtotals'] = "Vis samlet antal i Admin-menuen";
1324c1410
< 		$admtext['backupnote'] = "BEMÆRK: Hvis databasen er meget stor, kan du bruge et selvstændigt værktøj (f.eks. mysqldumper eller phpMyAdmin) til at lave backup af databasen eller gendanne databasen. phpMyAdmin findes altid hos din udbyder/webhotel.";
---
> 		$admtext['backupnote'] = "BEMÆRK: Hvis databasen er meget stor, kan man bruge et selvstændigt værktøj (f.eks. mysqldumper eller phpMyAdmin) til at foretage en backup af databasen eller gendanne databasen. phpMyAdmin findes altid hos udbyderen / webhotellet.";
1328c1414
< 		$admtext['hidedna'] = "Skjul alle DNA sider og data";
---
> 		$admtext['hidedna'] = "Skjul alle DNA-sider og -data";
1330d1415
< 		//changed in 11.0.2
1338c1423
< 		$admtext['footermsg'] = "Brugerdefineret sidefod meddelelse";
---
> 		$admtext['footermsg'] = "Brugerdefineret sidefodsmeddelelse";
1340,1341c1425,1426
< 		$admtext['mediatrees'] = "Adskil medier i tree mapper";
< 		$admtext['mediaexpl'] = "xxx medie filer flyttet";
---
> 		$admtext['mediatrees'] = "Adskil medier i træmapper";
> 		$admtext['mediaexpl'] = "xxx mediefiler flyttet";
1344,1345c1429,1430
< 		$admtext['mainbackground'] = "Hovedoverskrift baggrundsfarve";
< 		$admtext['modebackground'] = "Tilstandsværdier baggrundsfarve";
---
> 		$admtext['mainbackground'] = "Baggrundsfarve for hovedoverskrift";
> 		$admtext['modebackground'] = "Baggrundsfarve for tilstandsværdier";
1347,1357c1432,1442
< 		$admtext['background1_12'] = "Markers 1-12 baggrundsfarve";
< 		$admtext['background13_25'] = "Markers 13-25 baggrundsfarve";
< 		$admtext['background26_37'] = "Markers 26-37 baggrundsfarve";
< 		$admtext['background38_67'] = "Markers 38-67 baggrundsfarve";
< 		$admtext['background111'] = "Markers 68-111 baggrundsfarve";
< 		$admtext['textcolor'] = "Tekst farve";
< 		$admtext['show_test_number'] = "Vis DNA Test Nummer Offentligt";
< 		$admtext['excludefromancsn'] = "Ekskludér Fra Ane Efternavne";
< 		$admtext['upperancsunames'] = "Ane Efternavne med Store Bogstaver";
< 		$admtext['autofillancsunames'] = "Autofill Ancestral Surnames";
< 		$admtext['colorschemer'] = "ColorSchemer - Online Color Scheme Generator";
---
> 		$admtext['background1_12'] = "Baggrundsfarve for markører 1-12";
> 		$admtext['background13_25'] = "Baggrundsfarve for markører 13-25";
> 		$admtext['background26_37'] = "Baggrundsfarve for markører 26-37";
> 		$admtext['background38_67'] = "Baggrundsfarve for markører 38-67";
> 		$admtext['background111'] = "Baggrundsfarve for markører 68-111";
> 		$admtext['textcolor'] = "Tekstfarve";
> 		$admtext['show_test_number'] = "Vis DNA-testnummer offentligt";
> 		$admtext['excludefromancsn'] = "Ekskludér fra forfædres efternavne";
> 		$admtext['upperancsunames'] = "Forfædres efternavne med store bogstaver";
> 		$admtext['autofillancsunames'] = "Udfyld forfædres efternavne automatisk";
> 		$admtext['colorschemer'] = "Farveskema - Online farveskema generator";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Skift indkommende præfikser til at matche TNG indstillinger";
> 		$admtext['sortevents'] = "Sortér begivenheder efter";
> 		$admtext['sortbydate'] = "Begivenhedsdato";
> 		$admtext['sortbytype'] = "Begivenhedstype";
> 		$admtext['allowsuggest'] = "Tillad forslag fra besøgende";
> 		$admtext['livingchecked'] = "Levende flag tilføjet til nye personer og familier";
> 		$admtext['maxmarried'] = "Markér familien som levende hvis gift mindre end<br/>dette antal år";
> 		$admtext['imagetags'] = "Rektangler";
> 		$admtext['allowcsv'] = "Tillad at hente rapporter i CSV format";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup muligheder";
> 		$admtext['dosql'] = "Eksportér som SQL";
> 		$admtext['dodrop'] = "Medtag DROP-TABEL HVIS DEN FINDES";
> 		$admtext['docreate'] = "Medtag OPRET TABEL";
> 		$admtext['onrestore'] = "Gendan muligheder";
> 		$admtext['dodel'] = "Slet tidligere indhold først";
> 		$admtext['download'] = "Hent";
> 		$admtext['altbirthtypes'] = "DÃ¥bsbegivenheder";
> 		$admtext['dtformat'] = "Tabel Format";
> 		$admtext['conchart'] = "Forbindelsesdiagram";
> 		$admtext['maxropt'] = "Maks. antal stier, der skal kontrolleres";
> 		$admtext['maxlopt'] = "Maks. forbindelses-længde";
> 		$admtext['showtxtopt'] = "Vis forbindelsen som tekst";
> 		$admtext['compactboxopt'] = "Vis kompakte personkasser";
> 		$admtext['sortbyopt'] = "Sortér forbindelsen efter";
> 		$admtext['anchoridopt'] = "Anker ID";
> 		$admtext['maxmopt'] = "Maks. antal ægteskaber i forbindelsen";
> 		$admtext['saveincfg'] = "Gem i konfigurations-stien (se Generalle Indstillinger)";
1377c1491
< 		$admtext['modifyplace'] = "Redigér et nuværende sted";
---
> 		$admtext['modifyplace'] = "Redigér et eksisterende sted";
1381c1495
< 		$admtext['existingplaceinfo'] = "Oplysninger om et nuværende sted";
---
> 		$admtext['existingplaceinfo'] = "Oplysninger om et eksisterende sted";
1385c1499
< 		$admtext['findmerge'] = "Find mulige duplikater af sted";
---
> 		$admtext['findmerge'] = "Find mulige steddubletter";
1391c1505
< 		$admtext['enterkeep'] = "Vælg venligst et mål for fletningen.";
---
> 		$admtext['enterkeep'] = "Vælg et mål for fletningen.";
1393c1507
< 		$admtext['confdeleteplace'] = "Er du sikker på, at du vil slette dette sted?";
---
> 		$admtext['confdeleteplace'] = "Er det sikkert, at dette sted skal slettes?";
1395,1396c1509
< 		//added in 8.0.0
< 		$admtext['confdelcemlink'] = "Er du sikker på, at du vil fjerne linket til denne kirkegård?";
---
> 		$admtext['confdelcemlink'] = "Er det sikkert, at linket til denne kirkegård skal fjernes?";
1398,1399c1511,1512
< 		$admtext['istemple'] = "Dette stednavn er en LDS tempelkode";
< 		$admtext['findtemples'] = "Find kun LDS tempelkoder";
---
> 		$admtext['istemple'] = "Dette stednavn er en SDH-tempelkode";
> 		$admtext['findtemples'] = "Find kun SDH-tempelkoder";
1410c1523
<         $admtext['geoexpl'] = "Geokod alle Steder uden breddegrad og længdegrad";
---
>         $admtext['geoexpl'] = "Geokod alle steder uden breddegrad og længdegrad";
1412c1525
<         $admtext['backgeo'] = "Tilbage til Geokode menu";
---
>         $admtext['backgeo'] = "Tilbage til geokodemenu";
1416d1528
<         $admtext['nogeocode'] = "Kunne ikke blive geokodet";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Undlad at geokode";
1436d1549
< 		$admtext['backtosecondary'] = "Tilbage til sekundære processer";
1443,1444c1556,1557
< 		$admtext['creatinggendex'] = "Danner GENDEX fil...";
< 		$admtext['finishedgendex'] = "Færdig med GENDEX fildannelse.";
---
> 		$admtext['creatinggendex'] = "Danner GENDEX-fil...";
> 		$admtext['finishedgendex'] = "Færdig med GENDEX-fildannelse.";
1446c1559
< 		$admtext['postgdx'] = "Hvor vil du gemme GENDEX filen";
---
> 		$admtext['postgdx'] = "Hvor skal GENDEX-filen gemmes";
1448c1561
< 		$admtext['evalmedia'] = "Beskær Media Menuer";
---
> 		$admtext['evalmedia'] = "Beskær mediemenuer";
1454c1567
< 		$admtext['chtoliving'] = "ændret til levende";
---
> 		$admtext['chtoliving'] = "ændret til nulevende";
1456c1569,1571
< 		$admtext['makeprivate'] = "Gør Privat";
---
> 		$admtext['makeprivate'] = "Gør privat";
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Tilbage til Hjælpeprogrammer efter Import";
1468,1470c1583,1585
< 		$admtext['conflangdelete'] = "Er du sikker på, at du vil slette dette sprog??";
< 		$admtext['existinglanguages'] = "Oplysninger om nuværende sprog";
< 		$admtext['modifylanguage'] = "Redigér nuværende sprog";
---
> 		$admtext['conflangdelete'] = "Er det sikkert, at dette sprog skal slettes?";
> 		$admtext['existinglanguages'] = "Oplysninger om eksisterende sprog";
> 		$admtext['modifylanguage'] = "Redigér eksisterende sprog";
1480c1595
< 		$admtext['existingtrees'] = "Nuværende oplysninger om træ";
---
> 		$admtext['existingtrees'] = "Oplysninger om eksisterende træ";
1484,1485c1599,1600
< 		$admtext['conftreedelete'] = "Er du sikker på, at du vil slette dette træ og alle og alt, det er knyttet til?";
< 		$admtext['conftreeclear'] = "Er du sikker på, at du vil tømme dette træ for alle data?";
---
> 		$admtext['conftreedelete'] = "Er det sikkert, at dette træ, og alt og alle der er knyttet til det, skal slettes?";
> 		$admtext['conftreeclear'] = "Er det sikkert, at dette træ skal tømmes for alle data?";
1488c1603
< 		$admtext['existingtreeinfo'] = "Oplysninger om nuværende træ";
---
> 		$admtext['existingtreeinfo'] = "Oplysninger om eksisterende træ";
1501d1615
< 		//added in 8.0.0
1504,1505c1618,1619
< 		$admtext['currtree'] = "Nuværende træ";
< 		$admtext['chwarn'] = "ADVARSEL: Denne handling vil fjerne alle familietilknytninger, og alle andre referencer til denne person i dette træ.";
---
> 		$admtext['currtree'] = "Eksisterende træ";
> 		$admtext['chwarn'] = "ADVARSEL: Denne handling vil fjerne alle familietilknytninger og alle andre referencer til denne person i dette træ.";
1507d1620
< 		//changed in 9.0.0
1509c1622
< 		$admtext['nopdf'] = "Forbyd brugerne at danne PDF filer";
---
> 		$admtext['nopdf'] = "Tillad ikke brugerne at danne PDF-filer";
1513c1626,1631
< 		$admtext['importfilename'] = "Importer Filnavn";
---
> 		$admtext['importfilename'] = "Importer filnavn";
> 		//added in 13.0
> 		$admtext['exnotes'] = "Udelad noter";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip og medtag mediefiler";
> 		$admtext['downloadzip'] = "Download ZIP";
1521c1639
< 		$admtext['existingusers'] = "Nuværende brugerinformation";
---
> 		$admtext['existingusers'] = "Eksisterende brugerinformation";
1523c1641
< 		$admtext['confuserdelete'] = "Er du sikker på, at du vil slette denne bruger?";
---
> 		$admtext['confuserdelete'] = "Er det sikkert, at denne bruger skal slettes?";
1528,1529c1646,1647
< 		$admtext['existinguserinfo'] = "Nuværende brugerinformation";
< 		$admtext['modifyuser'] = "Redigér nuværende bruger";
---
> 		$admtext['existinguserinfo'] = "Eksisterende brugerinformation";
> 		$admtext['modifyuser'] = "Redigér eksisterende bruger";
1531,1532c1649,1650
< 		$admtext['allow_lds'] = "Tillad at se LDS oplysninger";
< 		$admtext['enteruserdesc'] = "Indtast venligst en beskrivelse af brugeren.";
---
> 		$admtext['allow_lds'] = "Tillad at se SDH-oplysninger";
> 		$admtext['enteruserdesc'] = "Indtast beskrivelse af brugeren.";
1535c1653
< 		$admtext['firstuser'] = "Den første bruger, du opretter, vil blive administrator (INTET træ valgt) og vil have adgang til alle systemindstillinger.";
---
> 		$admtext['firstuser'] = "Den første bruger, der oprettes, vil blive administrator (INTET træ valgt) og vil have adgang til alle systemindstillinger.";
1552c1670
< 		$admtext['emailusers'] = "Brugers mail";
---
> 		$admtext['emailusers'] = "Brugers mailadresse";
1556c1674
< 		$admtext['messagetext'] = "Besked Tekst";
---
> 		$admtext['messagetext'] = "Beskedtekst";
1558,1559c1676,1677
< 		$admtext['treemailmsg'] = "Indstilling. Valg af et træ vil begrænse meddelelsen til de brugere, der er tilknyttet det træ.";
< 		$admtext['branchmailmsg'] = "Indstilling. Valg af en gren vil begrænse meddelelsen til de brugere, der er tilknyttet den gren.";
---
> 		$admtext['treemailmsg'] = "Valg af et træ vil begrænse meddelelsen til de brugere, der er tilknyttet det træ.";
> 		$admtext['branchmailmsg'] = "Valg af en gren vil begrænse meddelelsen til de brugere, der er tilknyttet den gren.";
1562,1563c1680,1681
< 		$admtext['succmail'] = "Din mail er blevet sendt.";
< 		$admtext['mailfailed'] = "Din mail blev ikke sendt.";
---
> 		$admtext['succmail'] = "Mailen er blevet sendt.";
> 		$admtext['mailfailed'] = "Mailen blev ikke sendt.";
1565c1683
< 		$admtext['entermsgtext'] = "Indtast din besked.";
---
> 		$admtext['entermsgtext'] = "Indtast en besked.";
1575d1692
< 		//added in 8.0.0
1578c1695
< 		$admtext['noadmin'] = "Ingen adgang til Admin siderne.";
---
> 		$admtext['noadmin'] = "Ingen adgang til Admin-funktionerne.";
1582c1699
< 		$admtext['usrcontribd'] = "Tilføj oplysninger, inklusiv medier";
---
> 		$admtext['usrcontribd'] = "Tilføj oplysninger, inklusive medier";
1584c1701
< 		$admtext['usreditord'] = "Tilføj, redigér og slet alle oplysninger, inklusiv medier.";
---
> 		$admtext['usreditord'] = "Tilføj, redigér og slet alle oplysninger, inklusive medier.";
1598d1714
<         //added in 9.0.0
1600c1716
< 		$admtext['allow_pdf'] = "Tillad at hente PDF filer";
---
> 		$admtext['allow_pdf'] = "Tillad at hente PDF-filer";
1606,1607c1722,1729
< 		$admtext['consented'] = "Consent given";
< 		$admtext['consentdate'] = "Date Consented";
---
> 		$admtext['consented'] = "Samtykke givet";
> 		$admtext['consentdate'] = "Samtykke dato";
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Vis kun deaktiverede brugere";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Send også til administratorerne, når der er valgt et enkelt træ";
1615c1737
< 		$admtext['sessexp'] = "Din session er udløbet.";
---
> 		$admtext['sessexp'] = "Sessionen er udløbet.";
1617d1738
< 		//added in 8.1.0
1622,1628c1743,1749
< 		$admtext['createnewtlevent'] = "Opret en ny tidslinje begivenhed";
< 		$admtext['modifytlevent'] = "Redigér nuværende tidslinje begivenhed";
< 		$admtext['leaveblankalltlevents'] = "lad stå tom for at se alle tidslinje begivenheder";
< 		$admtext['evyear'] = "Begivenheds år";
< 		$admtext['evdetail'] = "Begivenheds detaljer";
< 		$admtext['selecttleventaction'] = "Vælg tidslinje begivenhed og handling";
< 		$admtext['changestotlevent'] = "Ændringer til tidslinje begivenhed";
---
> 		$admtext['createnewtlevent'] = "Opret en ny tidslinjebegivenhed";
> 		$admtext['modifytlevent'] = "Redigér nuværende tidslinjebegivenhed";
> 		$admtext['leaveblankalltlevents'] = "lad stå tom for at se alle tidslinjebegivenheder";
> 		$admtext['evyear'] = "Begivenhedsår";
> 		$admtext['evdetail'] = "Begivenhedsdetaljer";
> 		$admtext['selecttleventaction'] = "Vælg tidslinjebegivenhed og handling";
> 		$admtext['changestotlevent'] = "Ændringer til tidslinjebegivenhed";
1630,1631c1751,1752
< 		$admtext['confdeletetlevent'] = "Er du sikker på, at du vil slette denne tidslinje begivenhed?";
< 		$admtext['enterevyear'] = "Indtast begivenheds året.";
---
> 		$admtext['confdeletetlevent'] = "Er det sikkert, at denne tidslinjebegivenhed skal slettes?";
> 		$admtext['enterevyear'] = "Indtast begivenhedsåret.";
1633,1636c1754,1757
< 		$admtext['existingtleventinfo'] = "Nuværende tidslinje begivenhed";
< 		$admtext['newtleventinfo'] = "Ny tidslinje begivenhed";
< 		$admtext['edittleventinfo'] = "Tilføj, redigér eller slet tidslinje begivenhed";
< 		$admtext['addnewtlevent'] = "Tilføj ny tidslinje begivenhed";
---
> 		$admtext['existingtleventinfo'] = "Eksisterende tidslinjebegivenhed";
> 		$admtext['newtleventinfo'] = "Ny tidslinjebegivenhed";
> 		$admtext['edittleventinfo'] = "Tilføj, redigér eller slet tidslinjebegivenhed";
> 		$admtext['addnewtlevent'] = "Tilføj ny tidslinjebegivenhed";
1640,1641c1761
< 		//added in 9.0.0
< 		$admtext['evtitle'] = "Begivenheds titel";
---
> 		$admtext['evtitle'] = "Begivenhedstitel";
1656d1775
< 	//added in 8.0.0
1660c1779
< 		$admtext['mwblurb'] = "Opret en liste over ukendte personer eller billeder, i håb om at mere opmærksomhed kan give flere oplysninger om disse personer og billeder.";
---
> 		$admtext['mwblurb'] = "Opret en liste over ukendte personer eller billeder, så der er mulighed for flere oplysninger om disse personer og billeder.";
1670c1789
< 		$admtext['not_living'] = "Person markeret som levende, dødsdato eksisterer";
---
> 		$admtext['not_living'] = "Person markeret som nulevende, dødsdato eksisterer";
1672,1673c1791,1792
< 		$admtext['parmarr'] = "Forældrenes Vielse";
< 		$admtext['motherbirth'] = "Moders Fødsel";
---
> 		$admtext['parmarr'] = "Forældrenes vielse";
> 		$admtext['motherbirth'] = "Mors fødsel";
1687c1806
< 		$admtext['badtarget'] = "Forkert mål-fil";
---
> 		$admtext['badtarget'] = "Forkert målfil";
1694,1695c1813,1814
< 		$admtext['nodesc'] = "Parameter definitionsfejl, mangler beskrivelse";
< 		$admtext['defval'] = "Standard værdi";
---
> 		$admtext['nodesc'] = "Parameterdefinitionsfejl, mangler beskrivelse";
> 		$admtext['defval'] = "Standardværdi";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1705c1822
< 		$admtext['editperf'] = "Redigér parametre blev ændret således:";
---
> 		$admtext['editperf'] = "Redigeringsparametre blev ændret således:";
1708,1709c1825,1826
< 		$admtext['viewlog'] = "Vis Log";
< 		$admtext['target'] = "Changes";
---
> 		$admtext['viewlog'] = "Vis log";
> 		$admtext['target'] = "MÃ¥l";
1713,1718c1830,1835
< 		$admtext['logoptions'] = "Mod Manager Log Indstillinger";
< 		$admtext['mmlogfilename'] = "Log File Navn";
< 		$admtext['sortlistby'] = "Sortér Listerne efter";
< 		$admtext['modname'] = "Mod Navn";
< 		$admtext['bypassconfirm'] = "Forbigå Bekræftelserne";
< 		$admtext['modifyoptions'] = "Redigér Mod Manager Indstillinger";
---
> 		$admtext['logoptions'] = "Mod managers logindstillinger";
> 		$admtext['mmlogfilename'] = "Logfilnavn";
> 		$admtext['sortlistby'] = "Sortér listerne efter";
> 		$admtext['modname'] = "Mod navn";
> 		$admtext['bypassconfirm'] = "Udelad bekræftelserne";
> 		$admtext['modifyoptions'] = "Redigér Mod Manager indstillinger";
1722,1724c1839,1841
< 		$admtext['showlogfile'] = "Vis Mod Manager Handlings Log";
< 		$admtext['recentactions'] = "Mod Manager Seneste Handlinger";
< 		$admtext['clearlog'] = "Slet Loggen";
---
> 		$admtext['showlogfile'] = "Vis Mod Manager handlingslog";
> 		$admtext['recentactions'] = "Mod Manager seneste handlinger";
> 		$admtext['clearlog'] = "Slet loggen";
1726,1727c1843,1844
< 		$admtext['modsyntax'] = "Mod Syntaks";
< 		$admtext['modguidelines'] = "Mod Standarder";
---
> 		$admtext['modsyntax'] = "Mod syntaks";
> 		$admtext['modguidelines'] = "Mod standarder";
1743c1860
< 		$admtext['mmmaxloglines'] = "Max antal af transaktioner";
---
> 		$admtext['mmmaxloglines'] = "Maks. antal transaktioner";
1746c1863
< 		$admtext['uninstall'] = "Afinstallere";    // was $admtext['remove'] = "Remove"
---
> 		$admtext['uninstall'] = "Afinstaller";    // was $admtext['remove'] = "Remove"
1756c1873
< 		$admtext['copiesreq'] = "fil kopier angivet";
---
> 		$admtext['copiesreq'] = "filkopier angivet";
1763c1880
< 		$admtext['format'] = "format fejl";
---
> 		$admtext['format'] = "formatfejl";
1766c1883
< 		$admtext['line'] = "Linie";
---
> 		$admtext['line'] = "Linje";
1768c1885
< 		$admtext['modsinst'] = "kode ændringer installed";
---
> 		$admtext['modsinst'] = "kodeændringer installeret";
1770,1771c1887,1888
< 		$admtext['modsrem'] = "kode ændringer fjernet";
< 		$admtext['modsreq'] = "kode ændringer angivet";
---
> 		$admtext['modsrem'] = "kodeændringer fjernet";
> 		$admtext['modsreq'] = "kodeændringer angivet";
1774c1891
< 		$admtext['noact'] = "handlings kode ugyldig";
---
> 		$admtext['noact'] = "handlingskode ugyldig";
1778c1895
< 		$admtext['nolocation'] = "manglende sted kode";
---
> 		$admtext['nolocation'] = "manglende stedkode";
1786c1903
< 		$admtext['restparam'] = "Genopretter standard parameter";
---
> 		$admtext['restparam'] = "Genopretter standardparameter";
1790c1907
< 		$admtext['tgtfile'] = "mål fil";
---
> 		$admtext['tgtfile'] = "målfil";
1795,1796c1912,1913
< 		$admtext['allowdeletepartial'] = "Tillad Slet markerede af delvist installeret MODs";
< 		$admtext['allowdeleteinstalled'] = "Tillad Slet af individuelt installerede MODs";
---
> 		$admtext['allowdeletepartial'] = "Tillad delvis sletning af markerede MODs";
> 		$admtext['allowdeleteinstalled'] = "Tillad sletning af individuelt installerede MODs";
1798c1915
< 		$admtext['logfullpath'] = "Log fuld sti for fil handlinger";
---
> 		$admtext['logfullpath'] = "Log fuld sti for filhandlinger";
1806,1807c1923,1924
< 		$admtext['bypassed'] = "forbigået";
< 		$admtext['willbypass'] = "vil forbigå";  // was "will bypass"
---
> 		$admtext['bypassed'] = "Udeladt";
> 		$admtext['willbypass'] = "vil udelade";  // was "will bypass"
1826,1827c1943,1944
< 		$admtext['fixedheader'] = "Brug Faste Overskrifter";
< 		$admtext['cantremok'] = "kan ikke fjernes, valgfri, forbigået";
---
> 		$admtext['fixedheader'] = "Brug faste overskrifter";
> 		$admtext['cantremok'] = "kan ikke fjernes, valgfri, udeladt";
1830c1947
< 		$admtext['compresslog'] = "Skjul Log Visning";
---
> 		$admtext['compresslog'] = "Skjul logvisning";
1833c1950
< 		$admtext['fileperms'] = "Tjek fil egenskaber";
---
> 		$admtext['fileperms'] = "Tjek filegenskaber";
1836,1838c1953,1955
< 		$admtext['redirect2log'] = "Omdirigering til Log For";
< 		$admtext['on_error'] = "Kun Fejl";
< 		$admtext['on_all'] = "Alle Handlinger";
---
> 		$admtext['redirect2log'] = "Omdirigering til log For";
> 		$admtext['on_error'] = "Kun fejl";
> 		$admtext['on_all'] = "Alle handlinger";
1840,1843c1957,1960
< 		$admtext['stripeafter'] = "Stripe efter antal rækker";
< 		$admtext['adjusthdrs'] = "Tilpas Faste Overskrifter";
< 		$admtext['displayoptions'] = "Visning Indstillinger";
< 		$admtext['no_frag'] = "kode fragment ikke tilladt her";
---
> 		$admtext['stripeafter'] = "Stribe efter antal rækker";
> 		$admtext['adjusthdrs'] = "Tilpas faste overskrifter";
> 		$admtext['displayoptions'] = "Visningsindstillinger";
> 		$admtext['no_frag'] = "kodefragment ikke tilladt her";
1850c1967
< 		$admtext['showupdates'] = "Vis fanen med Anbefalede Opdateringer";
---
> 		$admtext['showupdates'] = "Vis fanen med anbefalede opdateringer";
1852,1854c1969,1971
< 		$admtext['parsetable'] = "Se Parser Tabel";
< 		$admtext['recommendedfixes'] = "Anbefalede Opdateringer";
< 		$admtext['selectmod'] = "Vælg en MOD config-fil for at se resultaterne i parser tabellen";
---
> 		$admtext['parsetable'] = "Se Parsertabel";
> 		$admtext['recommendedfixes'] = "Anbefalede opdateringer";
> 		$admtext['selectmod'] = "Vælg en MOD config-fil for at se resultaterne i parsertabellen";
1858c1975
< 		$admtext['custtextfixes'] = "Det anbefales i de opdaterede MOD Retningslinjer, at brugerdefineret tekst indsættes før kommentarerne i begyndelsen af filen cust_text.php, således at MOD'er ikke påvirker ændringer af brugermanualen foretaget efter kommentarlinjerne.";
---
> 		$admtext['custtextfixes'] = "Det anbefales i de opdaterede MOD retningslinjer, at brugerdefineret tekst indsættes før kommentarerne i begyndelsen af filen cust_text.php, således at MOD'er ikke påvirker ændringer af brugermanualen foretaget efter kommentarlinjerne.";
1866c1983
< 		$admtext['newanchor'] = "Den nye kommentarlinie bør ikke oversættes i sprogfilerne, så den kan bruges som et anker for at indsætte brugerdefineret tekst før denne nye kommentarlinje af MOD-udviklerne.";
---
> 		$admtext['newanchor'] = "Den nye kommentarlinje bør ikke oversættes i sprogfilerne, så den kan bruges som et anker for at indsætte brugerdefineret tekst før denne nye kommentarlinje af MOD-udviklerne.";
1871,1872c1988,1989
< 		$admtext['confdelmod'] = "Er det sikkert, at denne MOD og tilhørende mappe skal slettes? Man kan ikke fortryde denne operation!";
< 		$admtext['allowdeletesupport'] = "Tillad Slet Støtte mappe, når MOD bliver slettet";
---
> 		$admtext['confdelmod'] = "Er det sikkert, at denne MOD og tilhørende mappe skal slettes? Man kan ikke fortryde denne handling!";
> 		$admtext['allowdeletesupport'] = "Tillad sletning af støttemappe, når MOD bliver slettet";
1874,1875c1991,1992
< 		$admtext['delpartinfo'] = "Man bør kun sætte denne indstilling til Ja, hvis man glemte at Afinstallere tidligere versioner af MOD'en før man installerede en ny version.";
< 		$admtext['delinstinfo'] = "Man bør kun sætte denne indstilling til Ja, hvis man installerede en ny version af MOD'en og den tidligere version stadig står som installeret.";
---
> 		$admtext['delpartinfo'] = "Man bør kun sætte denne indstilling til Ja, hvis man glemte at afinstallere tidligere versioner af MOD'en, før man installerede en ny version.";
> 		$admtext['delinstinfo'] = "Man bør kun sætte denne indstilling til Ja, hvis man installerede en ny version af MOD'en, og den tidligere version stadig står som installeret.";
1877c1994
< 		$admtext['confdelmod1'] = "Er det sikkert, at denne MOD skal slettes? Man kan ikke fortryde denne operation!";
---
> 		$admtext['confdelmod1'] = "Er det sikkert, at denne MOD skal slettes? Man kan ikke fortryde denne handling!";
1879c1996,2002
< 		$admtext['cfgnowrite'] = "Warning: Cfg file is write-protected. Parameters cannot be changed.";
---
> 		$admtext['cfgnowrite'] = "Advarsel: Cfg-fil er skrivebeskyttet. Parametre kan ikke ændres.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alle Mods";
> 		$admtext['installedmods'] = "Kun Installerede Mods";
> 		$admtext['partinstmods'] = "Installerede + Delvis Installerede Mods";
> 		$admtext['showanalyzeractions'] = "Vis handlinger i Mod Analyzer";
> 		$admtext['badchar'] = "Ugyldigt tegn";
1885,1888c2008,2010
< 		$admtext['test_type'] = "Test Type";
< 		$admtext['test_number'] = "Test Nummer";
< 		$admtext['test_date'] = "Test Dato";
< 		$admtext['modifydna'] = "Redigér Eksisterende DNA-Test";
---
> 		$admtext['test_type'] = "Testtype";
> 		$admtext['test_date'] = "Testdato";
> 		$admtext['modifydna'] = "Redigér eksisterende DNA-test";
1890,1897c2012,2019
< 		$admtext['addnewdna'] = "Tilføj Ny DNA-Test";
< 		$admtext['testinfo'] = "Test Oplysning";
< 		$admtext['urls'] = "Relevante Links";
< 		$admtext['dnalater'] = "Bemærk: Flere oplysninger kan tilføjes, og testen kan knyttes til flere personer, på den næste skærm.";
< 		$admtext['selecttype'] = "Vælg en test type.";
< 		$admtext['entertestnum'] = "Indtast test nummer.";
< 		$admtext['test_taker'] = "Person som tog denne test";
< 		$admtext['test_links'] = "Personer forbundet via denne Test";
---
> 		$admtext['addnewdna'] = "Tilføj ny DNA-test";
> 		$admtext['testinfo'] = "Testoplysning";
> 		$admtext['urls'] = "Relevante links";
> 		$admtext['dnalater'] = "Bemærk: Flere oplysninger kan tilføjes, og testen kan knyttes til flere personer i næste vindue.";
> 		$admtext['selecttype'] = "Vælg en testtype.";
> 		$admtext['entertestnum'] = "Indtast testnummer.";
> 		$admtext['test_taker'] = "Person, som tog denne test";
> 		$admtext['test_links'] = "Personer forbundet via denne test";
1900,1902c2022,2024
< 		$admtext['dnalater'] = "Bemærk: Flere oplysninger kan tilføjes, og testen kan knyttes til flere personer, på den næste skærm.";
< 		$admtext['markers'] = "Antal Markers";
< 		$admtext['test_values'] = "Test Værdier";
---
> 		$admtext['dnalater'] = "Bemærk: Flere oplysninger kan tilføjes, og testen kan knyttes til flere personer i næste vindue.";
> 		$admtext['markers'] = "Antal markører";
> 		$admtext['test_values'] = "Testværdier";
1906,1912c2028,2034
< 		$admtext['configsettings'] = "Generelle Indstillinger";
< 		$admtext['addtotestgroup'] = "Tilføj Test Til En Gruppe";
< 		$admtext['dna_group'] = "DNA Gruppe";
< 		$admtext['groupid'] = "Gruppe ID";
< 		$admtext['addgroup'] = "Tilføj Gruppe";
< 		$admtext['entergroupid'] = "Indtast gruppe ID";
< 		$admtext['entergroupdesc'] = "Indtast gruppe beskrivelse";
---
> 		$admtext['configsettings'] = "Generelle indstillinger";
> 		$admtext['addtotestgroup'] = "Tilføj test til en gruppe";
> 		$admtext['dna_group'] = "DNA-Gruppe";
> 		$admtext['groupid'] = "Gruppe-ID";
> 		$admtext['addgroup'] = "Tilføj gruppe";
> 		$admtext['entergroupid'] = "Indtast gruppe-ID";
> 		$admtext['entergroupdesc'] = "Indtast gruppebeskrivelse";
1914c2036
< 		$admtext['modifygroup'] = "Redigér eksisterende Gruppe";
---
> 		$admtext['modifygroup'] = "Redigér eksisterende gruppe";
1916,1918c2038,2049
< 		$admtext['test_results'] = "Test Results";
< 		$admtext['mdaID'] = "Første forfader ID";
< 		$admtext['mrcaID'] = "Første fælles forfader ID";
---
> 		$admtext['test_results'] = "Testresultater";
> 		$admtext['mdaID'] = "Ældste anes ID";
> 		$admtext['mrcaID'] = "Ældste fælles anes ID";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testnummer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Hold denne test privat";
> 		$admtext['multivalues'] = "Brug bindestreget mellem multiværdier";
> 		$admtext['changestogroup'] = "Ændringer til DNa-Gruppe";
> 		$admtext['modifydnagroup'] = "Redigér eksisterende DNA-Gruppe";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Knyt denne DNA-test til en person";
1945c2076
< $admtext['exactmatch'] = "Kun præcis match";
---
> $admtext['exactmatch'] = "Kun præcist match";
1965d2095
< $admtext['otherevents'] = "Andre begivenheder";
1988c2118
< $admtext['confdeleteevent'] = "Er du sikker på, at du vil slette denne begivenhed?";
---
> $admtext['confdeleteevent'] = "Er det sikkert, at denne begivenhed skal slettes?";
1999c2129
< $admtext['histories'] = "Historier";
---
> $admtext['histories'] = "Fortællinger";
2006c2136
< $admtext['confdeleteentity'] = "Er du sikker på, at du vil slette det valgte";
---
> $admtext['confdeleteentity'] = "Er det sikkert, at det valgte skal slettes";
2016c2146
< $admtext['treebefevent'] = "Du skal vælge eller indtaste et trænavn, før du kan tilføje nye begivenheder.";
---
> $admtext['treebefevent'] = "Man skal vælge eller indtaste et trænavn, før man kan tilføje nye begivenheder.";
2024,2025c2154,2155
< $admtext['confdeletenote'] = "Er du sikker på, at du vil slette dette notat?";
< $admtext['treebefnote'] = "Du skal vælge eller indtaste et trænavn, før du kan tilføje nye notater.";
---
> $admtext['confdeletenote'] = "Er det sikkert, at dette notat skal slettes?";
> $admtext['treebefnote'] = "Man skal vælge eller indtaste et trænavn, før man kan tilføje nye notater.";
2030,2031c2160,2161
< $admtext['lds'] = "LDS";
< $admtext['norights'] = "Du har ikke tilladelse til at se denne side. Hvis du har brugernavn og adgangskode, så log venligst ind herunder.";
---
> $admtext['lds'] = "SDH";
> $admtext['norights'] = "Du har ikke tilladelse til at se denne side. Hvis du har brugernavn og adgangskode, så log ind nedenfor.";
2042c2172
< $admtext['confdeletepers'] = "Er du sikker på, at du vil slette denne person?";
---
> $admtext['confdeletepers'] = "Er det sikkert, at denne person skal slettes?";
2050,2051d2179
< $admtext['savereturn'] = "Tilbage til denne side";
< $admtext['saveback'] = "Tilbage til menuen";
2058,2059d2185
< $admtext['secondary'] = "Sekundære processer";
< $admtext['commas'] = "Adskil flere indtastninger med kommaer";
2088,2089c2214,2215
< $admtext['eventdate'] = "Begivenheds Dato";
< $admtext['eventplace'] = "Begivenheds Sted";
---
> $admtext['eventdate'] = "Begivenhedsdato";
> $admtext['eventplace'] = "Begivenhedssted";
2116,2118c2242,2244
< $admtext['divplace'] = "Skilsmisse Sted";
< $admtext['divdate'] = "Skilsmisse Dato";
< $admtext['divdatetr'] = "Skilsmisse Dato (Sand)";
---
> $admtext['divplace'] = "Skilsmissested";
> $admtext['divdate'] = "Skilsmissedato";
> $admtext['divdatetr'] = "Skilsmissedato (Sand)";
2129,2130d2254
< $admtext['secondarymaint'] = "Sekundære vedligeholdelses processer";
< $admtext['customeventtypes'] = "Begivenhedstyper";
2140c2264
< $admtext['combineextras'] = "Kombiner billeder og historier";  //changed as well
---
> $admtext['combineextras'] = "Kombiner billeder og fortællinger";  //changed as well
2147,2148c2271,2272
< $admtext['combinenotesonly'] = "Kombinér notater";
< $admtext['addmedia'] = "Tilføj Medie";
---
> $admtext['combinenotesonly'] = "Flet notater";
> $admtext['addmedia'] = "Tilføj medie";
2151c2275
< $admtext['gedimport'] = "GEDCOM import";
---
> $admtext['gedimport'] = "GEDCOM-import";
2153c2277
< $admtext['confdeleterecs'] = "Er du sikker på, at du vil slette de valgte poster?";
---
> $admtext['confdeleterecs'] = "Er det sikkert, at de valgte poster skal slettes?";
2156c2280
< $admtext['notfound'] = " ikke fundet. Prøv en anden søgning. Kontroller Hjælp til Kortsøgning for mulige årsager til at søgningen fejlede eller prøv igen via Fuld Google Kortsøgning";
---
> $admtext['notfound'] = " ikke fundet. Prøv en anden søgning. Kontroller 'Hjælp til Kortsøgning' for mulige årsager til at søgningen fejlede eller prøv igen via fuld Google kortsøgning";
2162,2163c2286,2287
< $admtext['difficultmap'] = "Fuld Google Kortsøgning";
< $admtext['maphelp'] = "Hjælp til Kortsøgning";
---
> $admtext['difficultmap'] = "Fuld Google kortsøgning";
> $admtext['maphelp'] = "Hjælp til kortsøgning";
2173c2297
< $admtext['entereventinfo'] = "Indtast venligst en ny begivenhedsdato, et begivenhedssted eller detaljerne for denne begivenhed.";
---
> $admtext['entereventinfo'] = "Indtast en ny begivenhedsdato, et begivenhedssted eller detaljerne for denne begivenhed.";
2175c2299
< $admtext['enternote'] = "Indtast venligst notat teksten.";
---
> $admtext['enternote'] = "Indtast notatteksten.";
2177c2301
< $admtext['confdeletecite'] = "Er du sikker på, at du vil slette denne henvisning?";
---
> $admtext['confdeletecite'] = "Er det sikkert, at denne henvisning skal slettes?";
2187c2311
< $admtext['donotreplace'] = "Erstat ingen data";
---
> $admtext['donotreplace'] = "Udskift ikke nogen data";
2190c2314
< $admtext['website'] = "Hjemmeside";
---
> $admtext['website'] = "Websted";
2203c2327
< $admtext['toggle'] = "Skift Visning";
---
> $admtext['toggle'] = "Skift visning";
2210c2334
< $admtext['alphanum'] = "Brug kun alfanummeriske karakterer i træ ID.";
---
> $admtext['alphanum'] = "Brug kun alfanummeriske karakterer i træ-ID.";
2218,2220c2342,2343
< $admtext['confdeletefile'] = "Er du sikker på, at du vil slette denne fil?";
< //changed in 8.0.0
< $admtext['datenote'] = "<strong>Bemærk:</strong> Ved indtastning af datoer bruges standard formatet dd mmm åååå. For eksempel: 10 apr 2004.";
---
> $admtext['confdeletefile'] = "Er det sikkert, at denne fil skal slettes?";
> $admtext['datenote'] = "<strong>Bemærk:</strong> Ved indtastning af datoer bruges standardformatet dd mmm åååå. F.eks: 10 apr 2004.";
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2240c2360
< $admtext['confdeleteassoc'] = "Er du sikker på, at du vil slette denne tilknytning?";
---
> $admtext['confdeleteassoc'] = "Er det sikkert, at denne tilknytning skal slettes?";
2245d2364
< //added in 9.0.0
2247c2366
< $admtext['copylast'] = "Kopier Sidste";
---
> $admtext['copylast'] = "Kopier sidste";
2249,2250c2368,2369
< $admtext['nicitalic'] = "Klik for Kursiv Skrift";
< $admtext['nicunderline'] = "Klik for Understreget Skrift";
---
> $admtext['nicitalic'] = "Klik for kursiv skrift";
> $admtext['nicunderline'] = "Klik for understreget skrift";
2255,2263c2374,2382
< $admtext['nicinsol'] = "Indsæt Sorteret Liste";
< $admtext['nicinsul'] = "Indsæt Usorteret Liste";
< $admtext['nicsub'] = "Klik for Sænket Skrift";
< $admtext['nicsup'] = "Klik for Hævet Skrift";
< $admtext['nicstrike'] = "Klik for Gennemstreget Skrift";
< $admtext['nicremfmt'] = "Fjern Formatering";
< $admtext['nicindent'] = "Indryk Tekst";
< $admtext['nicremind'] = "Fjern Indrykning";
< $admtext['nichr'] = "Vandret Linie";
---
> $admtext['nicinsol'] = "Indsæt sorteret liste";
> $admtext['nicinsul'] = "Indsæt usorteret liste";
> $admtext['nicsub'] = "Klik for sænket skrift";
> $admtext['nicsup'] = "Klik for hævet skrift";
> $admtext['nicstrike'] = "Klik for gennemstreget skrift";
> $admtext['nicremfmt'] = "Fjern formatering";
> $admtext['nicindent'] = "Indryk tekst";
> $admtext['nicremind'] = "Fjern indrykning";
> $admtext['nichr'] = "Vandret linje";
2267,2270c2386,2389
< $admtext['niclink'] = "Tilføj Link";
< $admtext['nicremlink'] = "Fjern Link";
< $admtext['nictxtcol'] = "Skift Tekst Farve";
< $admtext['nicbkgcol'] = "Skift Baggrunds Farve";
---
> $admtext['niclink'] = "Tilføj link";
> $admtext['nicremlink'] = "Fjern link";
> $admtext['nictxtcol'] = "Skift tekstfarve";
> $admtext['nicbkgcol'] = "Skift baggrundsfarve";
2273c2392
< $admtext['editwarn'] = "Din lås på denne post er ved at udløbe. Gem dine ændringer nu for at forhindre dem i at blive overskrevet af en anden bruger.";
---
> $admtext['editwarn'] = "Låsen på denne post er ved at udløbe. Gem ændringerne nu for at forhindre at de bliver overskrevet af en anden bruger.";
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2290,2291c2405,2406
< $admtext['confdellink'] = "Er du sikker på, at du vil slette dette link?";
< $admtext['existlinks'] = "Nuværende links";
---
> $admtext['confdellink'] = "Er det sikkert, at dette link skal slettes?";
> $admtext['existlinks'] = "Eksisterende links";
2295c2410
< $admtext['unlink'] = "Fjern Linket";
---
> $admtext['unlink'] = "Fjern linket";
2297,2299c2412,2414
< $admtext['dna_links'] = "DNA Links";
< $admtext['dataval'] = "Data Godkendelse";
< $admtext['norels'] = "Slå slægtskabs meddelelser fra";
---
> $admtext['dna_links'] = "DNA-links";
> $admtext['dataval'] = "Datagodkendelse";
> $admtext['norels'] = "Slå slægtskabsmeddelelser fra";
2302c2417
< $admtext['findciteid'] = "Find Citat ID";
---
> $admtext['findciteid'] = "Find Citat-ID";
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Efternavne";
> $admtext['subhead'] = "Underhead";
> $admtext['image'] = "Billede";
> $admtext['author'] = "Forfatter";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Kom i gang";
> $admtext['showlog'] = "Admin-Log";
> $admtext['nobirthinfo'] = "Ingen fødselsinfo";
> //changed in 13.0
> $admtext['savereturn'] = "Gem + Tilbage til denne side";
> $admtext['saveback'] = "Gem + Tilbage til Admin Menu";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alting blev slettet.";
> $admtext['private'] = "Private";
> $admtext['imgtags'] = "Billede Etiketter";
> 
> $admtext['removelink'] = "Slet dette link";
> $admtext['eloptions'] = "Browse or Delete";
> $admtext['pleaseenter'] = "Skriv venligst en ";
> 
> $admtext['nolinks'] = "Der er endnu ingen links";
> $admtext['nogeocode'] = "Kunne ikke geokodes";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Vælg<br/>standard<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Begivenheds- og Egenskabs typer";
> $admtext['secondary'] = "Hjælperedskaber efter import";
> $admtext['otherevents'] = "Andre Begivenheder og Egenskaber";
> //added in 14.0
> $admtext['newlinks'] = "Oprettet links";
> $admtext['newcemlinks'] = "Oprettet links til kirkegårde";
> $admtext['utility'] = "Hjælperedskaber";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Flyt";
> $admtext['copy'] = "Kopiér";
> $admtext['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Danish-UTF8/alltext.php TNG1403/languages/Danish-UTF8/alltext.php
65c65
< $text['histories'] = "Historier";
---
> $text['histories'] = "Fortællinger";
86c86
< $text['mainton'] = "Hjemmesiden opdateres i øjeblikket";
---
> $text['mainton'] = "Webstedet opdateres i øjeblikket";
88d87
< //moved here in 8.0.0
91,94c90,93
< $admtext['confunlink'] = "Er du sikker på, at du vil fjerne denne person som partner i denne familie?";
< $admtext['confunlinkc'] = "Er du sikker på, at du vil fjerne denne persons tilknytning som barn i familien?";
< $admtext['confremchild'] = "Er du sikker på, at du vil fjerne dette barn fra denne familie? (Barnet slettes ikke fra databasen).";
< $admtext['enterfamilyid'] = "Skriv venligst et familie-ID.";
---
> $admtext['confunlink'] = "Er det sikkert, at denne person skal fjernes som partner i denne familie?";
> $admtext['confunlinkc'] = "Er det sikkert, at denne persons tilknytning som barn i familien skal fjernes?";
> $admtext['confremchild'] = "Er det sikkert, at dette barn skal fjernes fra denne familie? (Barnet slettes ikke fra databasen).";
> $admtext['enterfamilyid'] = "Indtast et familie-ID.";
101,102c100,101
< $admtext['BAPL'] = "DÃ¥b (LDS)";
< $admtext['ENDL'] = "Begavelse (LDS)";
---
> $admtext['BAPL'] = "DÃ¥b (SDH)";
> $admtext['ENDL'] = "Begavelse (SDH)";
107c106
< $admtext['SLGC'] = "Beseglet til forældre (LDS)";
---
> $admtext['SLGC'] = "Beseglet til forældre (SDH)";
109c108
< $admtext['SLGS'] = "Beseglet til partner (LDS)";
---
> $admtext['SLGS'] = "Beseglet til partner (SDH)";
111c110
< $admtext['activated'] = "Din adgang til hjemmesiden er aktiveret. ";
---
> $admtext['activated'] = "Din adgang til webstedet er aktiveret. ";
113,115c112
< $admtext['subjectline'] = "Din adgang til hjemmesiden er aktiveret";
< 
< //moved here in 8.1.0
---
> $admtext['subjectline'] = "Din adgang til webstedet er aktiveret";
119,120c116
< $admtext['sealing'] = "Besegling";
< //added in 11.0.3
---
> $admtext['sealing'] = "Besegling (SDH)";
123,126c119
< //added in 9.0.0
< $text['editprofile'] = "Redigér Profil";
< 
< //moved here in 9.0.0
---
> $text['editprofile'] = "Redigér profil";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,151c138,139
< 
< //added in 10.0.0
< $admtext['CONL'] = "Konfirmation (LDS)";
< $admtext['INIT'] = "Forberedende (LDS)";
---
> $admtext['CONL'] = "Bekræftelse (SDH)";
> $admtext['INIT'] = "Forberedende (SDH)";
153,157c141,143
< $text['switchm'] = "Skift til mobil site";
< $text['switchs'] = "Skift til standard site";
< 
< //added in 11.0.0
< $text['dna_tests'] = "DNA Tests";
---
> $text['switchm'] = "Skift til mobilvisning";
> $text['switchs'] = "Skift til standardvisning";
> $text['dna_tests'] = "DNA-tests";
159d144
< $text['problem'] = "Der er opstået en fejl i TNG-softwaren. Dette kan skyldes et opsætnings problem, en ufuldstændig opgradering eller en program fejl. Ejeren af webstedet kan kontakte TNG support for at få hjælp med dette problem. Kopier og indsæt forespørgslen herunder i henvendelsen.";
163d147
< //moved here in 12.0.0
165,167c149,151
< $admtext['dna_groups'] = "DNA Gruppe";
< $admtext['allbranches'] = "All Branches";
< $admtext['active'] = "Active";
---
> $admtext['dna_groups'] = "DNA-gruppe";
> $admtext['allbranches'] = "Alle grene";
> $admtext['active'] = "Aktiv";
173,176c157,158
< //added here in 12.0.0
< $text['testgroup'] = "Test Gruppe";
< $text['test_number'] = "Test Nummer/Name";
< $text['test_info_display'] = "Test Information To Display";
---
> $text['testgroup'] = "Testgruppe";
> $text['test_info_display'] = "Vis testinformation";
179c161
< $admtext['ancestral_surnames'] = "Ane efternavne";
---
> $admtext['ancestral_surnames'] = "Aneefternavne";
181,184c163,166
< $admtext['mda'] = "Første forfader";
< $admtext['mrca'] = "Første fælles forfader ";
< $admtext['marker_values'] = "Marker Værdier";
< $admtext['ref_seq'] = "Reference sequence";
---
> $admtext['mda'] = "Ældste ane";
> $admtext['mrca'] = "Ældste fælles ane (MRCA) ";
> $admtext['marker_values'] = "Markørværdier";
> $admtext['ref_seq'] = "Referencesekvens";
187,195c169,177
< $admtext['hvr_values'] = "HVR Forskelle";
< $admtext['hvr1_values'] = "HVR1 Forskelle";
< $admtext['hvr2_values'] = "HVR2 Forskelle";
< $admtext['coding_reg'] = "Kodning regions forskelle";
< $text['keep_name_private'] = "Hold Navn Privat";
< $text['test_results'] = "Test Results";
< $admtext['dna_tests'] = "DNA Tests";
< $admtext['vendor'] = "Sælger";
< $admtext['markers'] = "Antal Markeringer";
---
> $admtext['hvr_values'] = "HVR forskelle";
> $admtext['hvr1_values'] = "HVR1 forskelle";
> $admtext['hvr2_values'] = "HVR2 forskelle";
> $admtext['coding_reg'] = "Kodning regionsforskelle";
> $text['keep_name_private'] = "Hold navn privat";
> $text['test_results'] = "Testresultater";
> $admtext['dna_tests'] = "DNA-tests";
> $admtext['vendor'] = "Testfirma";
> $admtext['markers'] = "Antal markører";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Testnummer/navn";
> $admtext['match_date'] = "Matchdato";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Slægtskabsafsnit";
> $admtext['relationship_range'] = "Slægtskabsomfang";
> $admtext['suggested_relationship'] = "Foreslået";
> $admtext['actual_relationship'] = "Aktuelt slægtskab";
> $admtext['related_side'] = "Beslægtet gren";
> $admtext['shared_dna'] = "Delt DNA";
> $admtext['shared centimorgans'] = "Totalt delte cMs";
> $admtext['shared_segments'] = "Delte segmenter";
> $admtext['largest_segment'] = "Største segment";
> $admtext['chromosome'] = "Kromosom nr.";
> $admtext['segment_start'] = "Segment begyndelse";
> $admtext['segment_end'] = "Segment slut";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matchende SNPer";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Privat test";
> $text['shared_dna'] = "Delt DNA segment";
> $text['for_match'] = "for denne match";
> $admtext['keeptest'] = "Privat test";
> $admtext['keepname'] = "Privat navn";
> $admtext['allgroups'] = "Alle grupper";
> $admtext['alltypes'] = "Alle typer";
> $admtext['generation_num'] = "Generationer af forfædres efternavne";
> 
> $text['birthabbr'] = "f.";
> $text['chrabbr'] = "dbt.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "begr.";  //from descend
> $text['marrabbr'] = "g.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find alle personer med begivenheder på dette sted";
> $text['firstpage'] = "Første side";
> $text['lastpage'] = "Sidste side";
> 
> //changed in 13.0.0
> $text['problem'] = "Der er fejl i TNG-softwaren. Hvad skal man gøre:<p>Hvis man netop har installeret en opgradering, kan man muligvis have sprunget over en del af installationsinstruktionerne. Gå tilbage til opgraderings readme siden og læst instruktionerne igen. Vær særlig opmærksom på databasestruktur trinnet. </p><p>Hvis det er første gang, at TNG er blevet installeret, kan det være nødvendigt at oprette databasetabellerne. Gå tilbage til siden readme.html for at finde det trin.</p><p>Ejeren af webstedet kan kontakte TNG support for yderligere hjælp til dette problem. Kopier nedenstående forespørgsel, og indsæt den i en meddelelse.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Ingen gren";
> 
> //added in 14.0
> $text['oneyear'] = "Ã¥r";
> $text['pwdcodelink'] = "Klik på dette link for at få tilsendt en midlertidig adgangskode.";
> $text['pwdcodesent'] = "Et link til nulstilling af adgangskoden er blevet sendt til din e-mail-adresse.";
> $text['moved'] = "Flyttet";
> $text['citation'] = "Citat";
> $text['other'] = "Andre oplysninger";
> $text['death'] = "Død";
> $text['burial'] = "Begravelse";
> $text['cremation'] = "Kremering";
> $text['marriage'] = "Ægteskab";
> $text['divorce'] = "Skilsmisse";
> $text['bylength'] = "Trin";
> $text['bymarriages'] = "Ægteskaber";
> $text['none'] = "Ingen";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Kilde";
> $text['repository'] = "Arkiv";
> $text['place'] = "Sted";
> $admtext['BAPM'] = "DÃ¥b";
> 
> $text['glang'] = "da";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Danish-UTF8: data_protection_policy.php
Only in TNG1403/languages/Danish-UTF8: readme.html
diff -r TNG/languages/Danish-UTF8/text.php TNG1403/languages/Danish-UTF8/text.php
23c23
< 		$text['standby'] = "Webstedet er ikke tilgængelig i øjeblikket pga. opdatering. Prøv igen om nogle minutter. Hvis siden ikke er tilgængelig inden for kort tid, <a href=\"suggest.php\">kontakt da webstedets administrator</a>.";
---
> 		$text['standby'] = "Webstedet er ikke tilgængelig i øjeblikket pga. opdatering. Prøv igen om nogle minutter. <a href=\"suggest.php\">Kontakt webstedets administrator,</a> hvis siden er nede i længere tid.";
31c31
< 		$text['includelds'] = "Inkluder LDS oplysninger";
---
> 		$text['includelds'] = "Inkluder SDH-oplysninger";
34c34
< 		$text['nomaxgen'] = "Angiv antal generationer. Brug Tilbage tasten for at rette fejlen";
---
> 		$text['nomaxgen'] = "Angiv antal generationer. Brug Tilbage-tasten for at rette fejlen";
46c46
< 		$text['mailnotsent'] = "Beklager, men beskeden kunne ikke leveres. Kontakt venligst xxx direkte på yyy.";
---
> 		$text['mailnotsent'] = "Beklager, men beskeden kunne ikke leveres. Kontakt xxx direkte på yyy.";
48,49c48,49
< 		$text['entername'] = "Skriv venligst dit navn";
< 		$text['entercomments'] = "Skriv venligst dine kommentarer";
---
> 		$text['entername'] = "Skriv dit navn";
> 		$text['entercomments'] = "Skriv dine bemærkninger";
57c57
< 		$text['photoshistoriesfor'] = "Billeder og historier for";
---
> 		$text['photoshistoriesfor'] = "Billeder og fortællinger for";
66c66
< 		$text['received'] = "Dit forslag er videresendt.";
---
> 		$text['received'] = "Forslaget er videresendt.";
69d68
< 		$text['general'] = "Generelt";
72,73c71,72
< 		$text['reviewmsg'] = "Du har foreslået en ændring som skal tjekkes. Indsendelsen vedrører:";
<         $text['revsubject'] = "Foreslået ændring kræver din revision";
---
> 		$text['reviewmsg'] = "Du har foreslået en ændring, som skal tjekkes. Indsendelsen vedrører:";
>         $text['revsubject'] = "Foreslået ændring skal godkendes";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "De to personer er identiske.";
---
> 		$text['sameperson'] = "De to personer er én og samme person.";
92,93c92,93
< 		$text['findrelinstr'] = "For at vise slægtskabet mellem to personer, skal du bruge 'Find'-knapperne nedenfor for at finde de aktuelle personer (eller behold de viste personer), derefter klikkes på 'Beregn'.";
< 		$text['sometimes'] = "(Sommetider kan man ved at vælge et andet antal generationer få et andet resultat.)";
---
> 		$text['findrelinstr'] = "For at vise slægtskabet mellem to personer, skal man bruge 'Find'-knapperne nedenfor for at finde de aktuelle personer (eller behold de viste personer), derefter klikkes på 'Beregn'.";
> 		$text['sometimes'] = "(Nogle gange får man et andet resultat ved at søge et andet antal generationer.)";
126,132c126,132
< 		$text['gencheck'] = "Max. antal generationer,<br />der skal tjekkes";
< 		$text['mcousin'] = "xxx fætter/kusine yyy til";  //male cousin; xxx = cousin number, yyy = times removed
< 		$text['fcousin'] = "xxx fætter/kusine yyy til";  //female cousin
< 		$text['cousin'] = "xxx fætter/kusine yyy til";
< 		$text['mhalfcousin'] = "xxx halvfætter yyy til";  //male cousin
< 		$text['fhalfcousin'] = "xxx halvkusine yyy til";  //female cousin
< 		$text['halfcousin'] = "xxx halvfætter eller halvkusine yyy til";
---
>         $text['gencheck'] = "Maks. antal generationer,<br />der skal tjekkes";
>         $text['mcousin'] = "xxx fætter yyy til";  //male cousin; xxx = cousin number, yyy = times removed
>         $text['fcousin'] = "xxx kusine yyy til";  //female cousin
>         $text['cousin'] = "xxx fætter/kusine yyy til";
>         $text['mhalfcousin'] = "xxx halvfætter yyy til";  //male cousin
>         $text['fhalfcousin'] = "xxx halvkusine yyy til";  //female cousin
>         $text['halfcousin'] = "xxx halvfætter eller halvkusine yyy til";
147c147
< 		$text['fmil'] = "svigerfar/mor til";
---
> 		$text['fmil'] = "svigerfar/-mor til";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Søg efter forbindelser";
> 		$text['findrel2'] = "Find slægtskaber og andre forbindelser";
> 		$text['makeme2nd'] = "Brug mit ID";
> 		$text['usebookmarks'] = "Brug bogmærker";
> 		$text['select2inds'] = "Vælg to personer.";
> 		$text['indinfofor'] = "Individual info for";
> 		$text['nobookmarks'] = "Der er ikke fundet nogen bogmærker";
> 		$text['bkmtitle'] = "Personer fundet i bogmærker";
> 		$text['bkminfo'] = "Vælg en person:";
> 		$text['sortpathsby'] = "Sortér stier efter antal af";
> 		$text['sortbyshort'] = "Sortér efter";
> 		$text['bylengthshort'] = "Længde";
> 		$text['badID1'] = ": forkert person1 ID - gå tilbage og ret";
> 		$text['badID2'] = ": forkert person2 ID - gå tilbage og ret";
> 		$text['notintree'] = ": personen med dette ID er ikke i dette træs database.";
> 		$text['sameperson'] = "De to personer er én og samme person.";;
> 		$text['nopaths'] = "Der er ingen forbindelse mellem disse personer.";
> 		$text['nopaths1'] = "Der er ingen forbindelser kortere end xxx";
> 		$text['nopaths2'] = "i xxx søge trin";
> 		$text['longestpath'] = "(længste sti tjekket var xxx trin lang)";
> 		$text['relevantpaths'] = "Antallet af forskellige relevante stier: xxx";
> 		$text['skipMarr'] = "(antal af stier, der ikke er vist på grund af for mange ægteskaber: xxx)";
> 		$text['mjaor'] = "eller";
> 		$text['connectionsto'] = "Forbindelser til ";
> 		$text['findanotherpers'] = "Find en anden person...";
> 		$text['sometimes'] = "(Nogle gange får man et andet resultat ved at søge et andet antal generationer.)";
> 		$text['anotherpath'] = "Søg efter andre forbindelser";
> 		$text['xpath'] = "Sti ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Slut Person";
> 		$text['parent'] = "Forældre";
> 		$text['mhfather'] = "hans far";
> 		$text['mhmother'] = "hans mor";
> 		$text['mhhusband'] = "hans mand";
> 		$text['mhwife'] = "hans kone";
> 		$text['mhson'] = "hans søn";
> 		$text['mhdaughter'] = "hans datter";
> 		$text['fhfather'] = "hendes far";
> 		$text['fhmother'] = "hendes mor";
> 		$text['fhhusband'] = "hendes mand";
> 		$text['fhwife'] = "hendes kone";
> 		$text['fhson'] = "hendes søn";
> 		$text['fhdaughter'] = "hendes datter";
> 		$text['hfather'] = "far";
> 		$text['hmother'] = "mor";
> 		$text['hhusband'] = "mand";
> 		$text['hwife'] = "kone";
> 		$text['hson'] = "søn";
> 		$text['hdaughter'] = "datter";
> 		$text['maxruns'] = "Maks. antal stier, der skal tjekkes";
> 		$text['maxrshort'] = "Maks. antal stier";
> 		$text['maxlength'] = "Forbindelsesstien ikke længere end";
> 		$text['maxlshort'] = "Maks. længde";
> 		$text['xstep'] = "trin";
> 		$text['xsteps'] = "trin";
> 		$text['xmarriages'] = "xxx ægteskaber";
> 		$text['xmarriage'] = "1 ægteskab";
> 		$text['showspouses'] = "Vis begge ægtefæller";
> 		$text['showTxt'] = "Vis stibeskrivelse";
> 		$text['showTxtshort'] = "Beskriv.";
> 		$text['compactBox'] = "Vis kompakte personkasser";
> 		$text['compactBoxshort'] = "Kompakte kasser";
> 		$text['paths'] = "Stier";
> 		$text['dospouses2'] = "Vis ægtefæller";
> 		$text['maxmopt'] = " Maks. ægteskaber pr. forbindelse ";
> 		$text['maxm'] = " Maks. antal ægteskaber";
> 		$text['arerelated'] = "Disse personer er beslægtede - deres slægtskab er vist i sti 1";
> 		$text['simplerel'] = "Enkel slægtskabs søgning";
176,180c245,249
< 		$text['ldsords'] = "LDS ordinancer";
< 		$text['baptizedlds'] = "Døbt (LDS)";
< 		$text['endowedlds'] = "Begavet (LDS)";
< 		$text['sealedplds'] = "Beseglet F (LDS)";
< 		$text['sealedslds'] = "Beseglet Æ (LDS)";
---
> 		$text['ldsords'] = "SDH ordinancer";
> 		$text['baptizedlds'] = "Døbt (SDH)";
> 		$text['endowedlds'] = "Begavet (SDH)";
> 		$text['sealedplds'] = "Beseglet F (SDH)";
> 		$text['sealedslds'] = "Beseglet Æ (SDH)";
196d264
< 		$text['scrollnote'] = "NB: Rul ned for at se hele træet.";
199d266
< 		$text['popupnote2'] = " = Ny anetavle";
230c297
< 		$text['pedbox'] = "Boks";
---
> 		$text['pedbox'] = "Felt";
232c299
< 		$text['extrasexpl'] = "Hvis der eksisterer billeder eller historier for de følgende personer, vil tilhørende ikoner blive vist ved siden af navnene.";
---
> 		$text['extrasexpl'] = "Hvis der eksisterer billeder eller fortællinger for de følgende personer, vil tilhørende ikoner blive vist ved siden af navnene.";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabeller";
> 		$text['dtchildren'] = "Børn";
> 		$text['dtgrandchildren'] = "Børnebørn";
> 		$text['dtggrandchildren'] = "Oldebørn";
> 		$text['dtgggrandchildren'] = "Oldebørn"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Ingen efterkommere";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Vælg";
> 		$text['dteachfulltable'] = "Hver fuld tabel vil have";
> 		$text['dtrows'] = "rækker";
> 		$text['dtdisplayingtable'] = "Viser tabel";
> 		$text['dtgototable'] = "GÃ¥ til tabel:";
> 		$text['fcinstrdn'] = "Vis familie med partner";
> 		$text['fcinstrup'] = "Vis familie med forældre";
> 		$text['fcinstrplus'] = "Vælg partner";
> 		$text['fcinstrfam'] = "Vælg forældre";
321,328c407,414
< 		$text['baptdate'] = "DÃ¥bsdato (LDS)";
< 		$text['baptplace'] = "DÃ¥bssted (LDS)";
< 		$text['endldate'] = "Begavelsesdato (LDS)";
< 		$text['endlplace'] = "Begavelsessted (LDS)";
< 		$text['ssealdate'] = "Beseglingsdato Æ (LDS)";   //Sealed to spouse
< 		$text['ssealplace'] = "Beseglingssted Æ (LDS)";
< 		$text['psealdate'] = "Beseglingsdato F (LDS)";   //Sealed to parents
< 		$text['psealplace'] = "Beseglingssted F (LDS)";
---
> 		$text['baptdate'] = "DÃ¥bsdato (SDH)";
> 		$text['baptplace'] = "DÃ¥bssted (SDH)";
> 		$text['endldate'] = "Begavelsesdato (SDH)";
> 		$text['endlplace'] = "Begavelsessted (SDH)";
> 		$text['ssealdate'] = "Beseglingsdato Æ (SDH)";   //Sealed to spouse
> 		$text['ssealplace'] = "Beseglingssted Æ (SDH)";
> 		$text['psealdate'] = "Beseglingsdato F (SDH)";   //Sealed to parents
> 		$text['psealplace'] = "Beseglingssted F (SDH)";
337c423
< 		$text['otherevents'] = "Andre Begivenheder";
---
> 		$text['otherevents'] = "Andre begivenheder";
346c432
< 		$text['divdatetr'] = "Skilsmisse år";
---
> 		$text['divdatetr'] = "Skilsmisseår";
349c435
< 		$text['filter'] = "Filtrer";
---
> 		$text['filter'] = "Filter";
355,358c441,444
< 		$text['confdate'] = "Konfirmations Dato (LDS)";
< 		$text['confplace'] = "Konfirmations Sted (LDS)";
< 		$text['initdate'] = "Forberedende Dato (LDS)";
< 		$text['initplace'] = "Forberedende Sted (LDS)";
---
> 		$text['confdate'] = "Bekræftelsesdato (SDH)";
> 		$text['confplace'] = "Bekræftelsessted (SDH)";
> 		$text['initdate'] = "Forberedende dato (SDH)";
> 		$text['initplace'] = "Forberedende sted (SDH)";
381,382d466
< 		$text['firstpage'] = "Første side";
< 		$text['lastpage'] = "Sidste side";
403c487
< 		$text['gallery'] = "Kun miniaturer";
---
> 		$text['gallery'] = "Kun thumbnails";
432c516
<         $text['iptc092'] = "Sub-location";
---
>         $text['iptc092'] = "Underlokation";
434,435c518,521
< 		$text['iptc065'] = "Oprindeligt Program";
< 		$text['iptc070'] = "Program Version";
---
> 		$text['iptc065'] = "Oprindeligt program";
> 		$text['iptc070'] = "Programversion";
> 		//added in 13.0
> 		$text['toggletags'] = "Skift Tags";
455c541
< 		$text['showmatchingplaces'] = "Klik på et efternavn for at vise matchende poster.";
---
> 		$text['showmatchingplaces'] = "Klik på et sted for at vise matchende poster.";
466,467c552,553
< 		$text['firstnamelist'] = "Fornavne Liste";
< 		$text['firstnamesstarting'] = "Vis Fornavne begyndende med";
---
> 		$text['firstnamelist'] = "Fornavneliste";
> 		$text['firstnamesstarting'] = "Vis fornavne begyndende med";
470c556
< 		$text['allfirstnames'] = "Alle Fornavne";
---
> 		$text['allfirstnames'] = "Alle fornavne";
481c567
< 		$text['pastxdays'] = "(sidste xx dage)";
---
> 		$text['pastxdays'] = "(seneste xx dage)";
484c570
< 		$text['history'] = "Historie/Dokument";
---
> 		$text['history'] = "Fortælling/Dokument";
489c575
< 		$text['wifename'] = "Mors Navn";
---
> 		$text['wifename'] = "Kvindes navn";
510c596
< 		$text['treename'] = "Navn på træ";
---
> 		$text['treename'] = "Trænavn";
530c616
< 		$text['leaveblank'] = "(tomt, hvis du vil have nyt træ)";
---
> 		$text['leaveblank'] = "(skal være tomt, hvis man vil have nyt træ)";
532,535c618,621
< 		$text['enterpassword'] = " Indtast venligst en adgangskode.";
< 		$text['enterusername'] = "Indtast venligst et brugernavn.";
< 		$text['failure'] = "Det angivne brugernavn er desværre allerede i brug. Brug Tilbage tasten på din browser for at komme tilbage til forrige side og vælg et andet brugernavn.";
< 		$text['success'] = "Mange tak for din anmodning om adgang til Webstedet. Jeg sender en mail, når din adgang til webstedet er aktiveret.";
---
> 		$text['enterpassword'] = " Indtast en adgangskode.";
> 		$text['enterusername'] = "Indtast et brugernavn.";
> 		$text['failure'] = "Det angivne brugernavn er desværre allerede i brug. Brug Tilbage-tasten i browseren for at komme tilbage til forrige side og vælg et andet brugernavn.";
> 		$text['success'] = "Mange tak for anmodningen om adgang til webstedet. Vi kontakter dig, når kontoen er aktiv, eller hvis der er behov for flere oplysninger.";
541c627
< 		$text['enterrealname'] = "Indtast venligst dit fulde navn.";
---
> 		$text['enterrealname'] = "Indtast dit fulde navn.";
544c630
< 		$text['accmail'] = "<strong>OBS:</strong> For at kunne modtage mail fra Webstedet vedr. registreringen, vær sikker på, at mail ikke er blokeret fra dette domæne.";
---
> 		$text['accmail'] = "<strong>OBS:</strong> For at kunne modtage mails fra webstedet vedr. registreringen, skal man sikre sig, at mails fra dette domæne ikke er blokeret.";
548,552c634,637
< 		$text['noregs'] = "Der kan desværre ikke accepteres flere nye brugerregistreringer for øjeblikket. Vær venlig at <a href=\"suggest.php\">kontakte mig</a>, hvis du har kommentarer til eller spørgsmål ang. webstedet.";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Du har modtaget en anmodning om adgang til dit websted.";
< 		$text['accactive'] = "Adgangen er blevet aktiveret, men brugeren har ingen ekstra rettigheder, før du tildeler dem.";
< 		$text['accinactive'] = "GÃ¥ til Admin/Brugere/Gennemse for at administrere brugeren. Brugerens konto vil forblive inaktiv, indtil den er redigeret og gemt.";
---
> 		$text['noregs'] = "Der kan desværre ikke accepteres flere nye brugerregistreringer for øjeblikket. <a href=\"suggest.php\">Skriv en besked,</a> hvis du har nogen spørgsmål eller bemærkninger ang. webstedet.";
> 		$text['emailmsg'] = "Du har modtaget en anmodning om adgang til webstedet.";
> 		$text['accactive'] = "Adgangen er blevet aktiveret, men brugeren har ingen ekstra rettigheder, før de er blevet indstillet.";
> 		$text['accinactive'] = "GÃ¥ til Admin/Brugere/Gennemse for at godkende brugerens adgang til webstedet. Brugerens konto vil forblive inaktiv, indtil den er redigeret og godkendt.";
554c639
< 		$text['enterpassword2'] = "Indtast din adgangskode igen.";
---
> 		$text['enterpassword2'] = "Indtast adgangskoden igen.";
556,558c641,642
< 		//added in 8.0.0
< 		$text['acksubject'] = "Tak for din henvendelse"; //for a new user account
< 		$text['ackmessage'] = "Anmodningen er modtaget. Kontoen vil være inaktiv, indtil administratoren aktiverer den. Du vil modtage en mail, når du kan logge på.";
---
> 		$text['acksubject'] = "Tak for henvendelsen"; //for a new user account
> 		$text['ackmessage'] = "Anmodningen er modtaget. Kontoen vil være inaktiv, indtil administratoren aktiverer den. Du vil modtage en mail, når dit login er klar til brug.";
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Ny adgangskode igen";
> 		$text['resetsuccess'] = "Succes: Adgangskoden er blevet nulstillet";
> 		$text['resetfail'] = "Fejl: Adgangskoden blev ikke nulstillet";
> 		$text['failreason0'] = " (ukendt databasefejl)";
> 		$text['failreason2'] = " (du har ikke tilladelse til at ændre din adgangskode)";
> 		$text['failreason3'] = " (adgangskoderne matchede ikke)";
565c656
< 		$text['browseallbranches'] = "Gennemse Alle Grene";
---
> 		$text['browseallbranches'] = "Gennemse alle grene";
591c682,684
< 		$text['totdeceased'] = "Antal Afdøde";
---
> 		$text['totdeceased'] = "Antal afdøde";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totalt antal kildehenvisninger";
605c698
< 		$text['manual'] = "Vær venlig at oprette dem manuelt.";
---
> 		$text['manual'] = "Oprette dem manuelt.";
608c701
< 		$text['nocreate'] = "Kunne ikke oprettes. Vær venlig at gøre det manuelt.";
---
> 		$text['nocreate'] = "Kunne ikke oprettes. Opret det manuelt.";
612c705
< 		$text['nocomm'] = "TNG kommunikerer ikke med din database. Der er ikke oprettet tabeller.";
---
> 		$text['nocomm'] = "TNG kommunikerer ikke med databasen. Der er ikke oprettet tabeller.";
615c708
< 		$text['nodb'] = "Oplysningerne er gemt. Forbindelsen er skabt, men databasen eksisterer ikke og kunne ikke oprettes her. Vær venlig at bekræfte, at navnet på databasen er korrekt, eller brug kontrolpanelet til at oprette den.";
---
> 		$text['nodb'] = "Oplysningerne er gemt. Forbindelsen er skabt, men databasen eksisterer ikke og kunne ikke oprettes her. Bekræft at navnet på databasen er korrekt, eller brug kontrolpanelet til at oprette den.";
618d710
< 		$text['loginfirst'] = "Du skal først logge på.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Eksisterende brugerposter fundet. For at fortsætte skal man først logge ind eller fjerne alle poster fra brugertabellen.";
629,630d722
< 		$text['zoomin'] = "Zoom ind";
< 		$text['zoomout'] = "Zoom ud";
640c732
< 		$text['vwrctrls'] = "Aktiver billedvisnings værktøjer";
---
> 		$text['vwrctrls'] = "Aktiver billedvisningsværktøjer";
645c737
< 		$text['test_date'] = "Test dato";
---
> 		$text['test_date'] = "Testdato";
650,654c742,746
< 		$text['compareselected'] = "Sammenlign Valgte";
< 		$text['dnatestscompare'] = "Sammenlign Y-DNA Tests";
< 		$text['keep_name_private'] = "Hold Navn Privat";
< 		$text['browsealltests'] = "Gennemse Alle Tests";
< 		$text['all_dna_tests'] = "Alle DNA tests";
---
> 		$text['compareselected'] = "Sammenlign valgte";
> 		$text['dnatestscompare'] = "Sammenlign Y-DNA tests";
> 		$text['keep_name_private'] = "Hold navn privat";
> 		$text['browsealltests'] = "Gennemse alle tests";
> 		$text['all_dna_tests'] = "Alle DNA-tests";
656,658c748,749
< 		$text['dna_info_head'] = "DNA Test Oplysning";
< 		$text['alltypes'] = "Alle Typer";
< 		$text['allgroups'] = "Alle Grupper";
---
> 		$text['alltypes'] = "Alle typer";
> 		$text['allgroups'] = "Alle grupper";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Sammenlign valgte mtDNA-tests";
> 		$text['dnatestscompare_atdna'] = "Sammenlign valgte atDNA-tests";
> 		$text['chromosome'] = "Krom";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Ekstra mutationer";
> 		$text['mrca'] = "Most Recent Common Ancestor";
> 		$text['ydna_test'] = "Y-DNA-tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "Slut";
> 		$text['suggested_relationship'] = "Foreslået";
> 		$text['actual_relationship'] = "Aktuelt";
> 		$text['12markers'] = "Markører 1-12";
> 		$text['25markers'] = "Markører 13-25";
> 		$text['37markers'] = "Markører 26-37";
> 		$text['67markers'] = "Markører 38-67";
> 		$text['111markers'] = "Markører 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "f.";
< $text['chrabbr'] = "dbt.";
673c787
< $text['andlocation'] = "& lokation";
---
> $text['andlocation'] = "& sted";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
702c814
< $text['spouse'] = "Partner";  //from search
---
> $text['spouse'] = "Ægtefælle/Partner";  //from search
706,707c818
< $text['burialabbr'] = "begr.";  //from descend
< $text['descendchart'] = "Efterkommere";
---
> $text['descendchart'] = "Efterslægt";
712d822
< $text['place'] = "Sted";
715d824
< $text['marrabbr'] = "g.";
738d846
< $text['source'] = "Kilde";
745,748c853,856
< $text['baptizedlds'] = "Døbt (LDS)";
< $text['endowedlds'] = "Begavet (LDS)";
< $text['sealedplds'] = "Beseglet F (LDS)";
< $text['sealedslds'] = "Beseglet Æ (LDS)";
---
> $text['baptizedlds'] = "Døbt (SDH)";
> $text['endowedlds'] = "Begavet (SDH)";
> $text['sealedplds'] = "Beseglet F (SDH)";
> $text['sealedslds'] = "Beseglet Æ (SDH)";
757c865
< $text['historiesdocs'] = "Historier & Dokumenter";
---
> $text['historiesdocs'] = "Fortællinger & Dokumenter";
766d873
< $text['repository'] = "Arkiv";
770d876
< $text['findplaces'] = "Find alle personer med begivenheder på dette sted";
772c878
< $text['faminfo'] = "Familie oplysninger";
---
> $text['faminfo'] = "Familieoplysninger";
778c884
< $text['databasestatistics'] = "Database Statistik"; //needed to be shorter to fit on menu
---
> $text['databasestatistics'] = "Databasestatistik"; //needed to be shorter to fit on menu
802c908
< $text['gmapevent'] = "Begivenheds Kort";
---
> $text['gmapevent'] = "Begivenhedskort";
804d909
< $text['glang'] = "&amp;hl=da";
809c914
< $text['located'] = "Lokaliseret";
---
> $text['located'] = "fundet";
811c916
< $text['notyetlocated'] = "Endnu ikke lokaliseret";
---
> $text['notyetlocated'] = "Endnu ikke fundet";
816d920
< $text['none'] = "Ingen";
835,837c939,941
< $text['ourhist'] = "Vores families historie";
< $text['ourhistanc'] = "Vores families historie og aner";
< $text['ourpages'] = "Vores Slægtsforskningsider";
---
> $text['ourhist'] = "Fortællingen om vores familie";
> $text['ourhistanc'] = "Fortællingen om vores familie og aner";
> $text['ourpages'] = "Vores slægtsforskningsider";
842c946
< $text['anon'] = "Du er ikke logget ind";
---
> $text['anon'] = "Du er i øjeblikket anonym";
844c948
< $text['featarts'] = "Feature Artikler";
---
> $text['featarts'] = "Temaartikler";
847c951
< $text['reliability'] = "PÃ¥lidelighed";
---
> $text['reliability'] = "Troværdighed";
865,866c969,970
< $text['mnuhistories'] = "Historier";
< $text['mnumyancestors'] = "Billeder af &amp; historier om aner til [Person]";
---
> $text['mnuhistories'] = "Fortællinger";
> $text['mnumyancestors'] = "Billeder af &amp; fortællinger om aner til [Person]";
876c980
< $text['contactus'] = "Kontakt os";
---
> $text['contactus'] = "Kontakt";
900,901c1004,1005
< $text['disabled'] = "Din bruger konto er blevet deaktiveret. Kontakt venligst webredaktøren for yderligere oplysninger.";
< $text['contactus_long'] = "Hvis du har spørgsmål eller kommentarer til oplysningerne på dette websted, vær venlig <span class=\"emphasis\"><a href=\"suggest.php\">at kontakte os</a></span>. Vi glæder os til at høre fra dig.";
---
> $text['disabled'] = "Din bruger konto er blevet deaktiveret. Kontakt administrator for yderligere oplysninger.";
> $text['contactus_long'] = "Hvis du har spørgsmål eller kommentarer til oplysningerne på dette websted, så <span class=\"emphasis\"><a href=\"suggest.php\">skriv til os</a></span>. ";
904c1008
< $text['latestnews'] = "Sidste Nyt";
---
> $text['latestnews'] = "Seneste nyt";
909c1013
< $text['enteremail2'] = "Indtast din mail-adresse igen.";
---
> $text['enteremail2'] = "Indtast din mailadresse igen.";
924,926c1028,1029
< $text['otherevents'] = "Andre Begivenheder";
< $text['conflds'] = "Konfirmeret (LDS)";
< $text['initlds'] = "Forberedende (LDS)";
---
> $text['conflds'] = "Bekræftet (SDH)";
> $text['initlds'] = "Forberedende (SDH)";
937,940c1040,1043
< $text['refreshmap'] = "Opdatér Kortet";
< $text['remnums'] = "Fjern Numre og Kortnåle";
< $text['photoshistories'] = "Billeder &amp; Historier";
< $text['familychart'] = "Familie Tavle";
---
> $text['refreshmap'] = "Opdatér kortet";
> $text['remnums'] = "Fjern Numre og kortnåle";
> $text['photoshistories'] = "Billeder &amp; Fortællinger";
> $text['familychart'] = "Familietavle";
944,946c1047,1049
< $text['dna_test'] = "DNA Test";
< $text['test_type'] = "Test Type";
< $text['test_info'] = "Test Oplysning";
---
> $text['dna_test'] = "DNA-test";
> $text['test_type'] = "Testtype";
> $text['test_info'] = "Testoplysning";
952,953d1054
< $text['people_have'] = "personer har knyttet en DNA-test til";
< $text['person_has'] = "person har knyttet en DNA-test til";
958c1059
< $text['viewpolicy'] = "Vis Databeskyttelsespolitik";
---
> $text['viewpolicy'] = "Vis databeskyttelsespolitik";
960c1061
< $text['consent'] = "Jeg giver mit samtykke til, at dette websted kan gemme de personlige oplysninger, der er indsamlet her. Jeg forstår, at jeg kan bede webstedsejeren om at fjerne disse oplysninger til enhver tid.";
---
> $text['consent'] = "Jeg giver mit samtykke til, at dette websted kan gemme de personlige oplysninger, der er indsamlet her. Jeg forstår, at jeg kan bede webstedets ejer om at fjerne disse oplysninger til enhver tid.";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA-tests er knyttet til";
> $text['testislinked'] = "DNA-test er knyttet til";
> 
> //added in 12.2
> $text['quicklinks'] = "Hurtige links";
> $text['yourname'] = "Dit navn";
> $text['youremail'] = "Din mailadresse";
> $text['liketoadd'] = "Alle oplysninger, du gerne vil tilføje";
> $text['webmastermsg'] = "Webmaster-meddelelse";
> $text['gallery'] = "Se Galleri";
> $text['wasborn_male'] = "blev født";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "blev født"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "blev døbt";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "blev døbt";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "døde";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "døde";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "blev begravet"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "blev begravet"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "blev kremeret";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "blev kremeret";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "blev gift med ";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "blev gift med ";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "blev skilt";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "blev skilt";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " i ";			// used as a preposition to the location
> $text['onthisdate'] = " den ";		// when used with full date
> $text['inthisyear'] = " i ";		// when used with year only or month / year dates
> $text['and'] = "og ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA-testoplysning";
> //added in 13.0
> $text['visitor'] = "Gæst";
> 
> $text['popupnote2'] = " = Ny anetavle";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom ind";
> $text['zoomout'] = "Zoom ud";
> $text['scrollnote'] = "Træk eller rul for at se mere af diagrammet.";
> $text['general'] = "Generelt";
> 
> //changed in 14.0
> $text['otherevents'] = "Andre Begivenheder og Egenskaber";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Forbindelser";
> $text['continue'] = "Fortsæt";
> $text['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Dutch/admintext.php TNG1403/languages/Dutch/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Typ een ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Selecteer een bestand dat u wenst te importeren.";
> 		$admtext['addreplacedata'] = "Toevoegen aan of vervangen van uw genealogie (kan enkele minuten duren, afhankelijk van de grootte van uw bestand)";
> 		$admtext['fromyourcomputer'] = "Vanaf uw computer";
> 		$admtext['importdata'] = "Importeer data";
> 		$admtext['replace'] = "Vervang (in geselecteerde stamboom)";
> 		$admtext['desttree'] = "Bestemmings-stamboom";
> 		$admtext['selectdesttree'] = "Selecteer of vul de naam van een bestemmings-stamboom in.";
> 		$admtext['selectexisting'] = "Importeer in";
> 		$admtext['ucaselast'] = "Alle familienamen in hoofdletters";
> 		$admtext['norecalc'] = "De 'Levend' vlag niet opnieuw berekenen";
> 		$admtext['autooffset'] = "Begin ID's met het eerst beschikbare nummer";
> 		$admtext['mustselecttree'] = "voor deze optie moet u een stamboom selecteren.";
> 		$admtext['onwebserver'] = "Vanaf website (in GEDCOM map)";
> 		$admtext['imphints'] = "Hint: Alle bestaande gegevens betekent: alle personen, gezinnen, bronnen en notities (media koppelingen gaan niet verloren zolang de ID's gelijk blijven). Exacte records zijn altijd alleen gebaseerd op ID's. Nieuwe records worden altijd toegevoegd. Toevoegen importeert alle gegevens met nieuwe ID's";
> 		$admtext['destbranch'] = "Bestemmings-tak (optioneel)";
> 		$admtext['importlatlong'] = "Importeer latitude / longitude gegevens indien aanwezig";
> 		$admtext['opening'] = "Openen";
> 		$admtext['reopen'] = "Opnieuw openen";
> 		$admtext['uploading'] = "Uploaden";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import gestopt";
> 		$admtext['resume'] = "Doorgaan";
> 		$admtext['neweronly'] = "Alleen vervangen indien nieuwer";
> 		$admtext['oldimport'] = "Oude stijl importeren (zonder voortgangsbalk)";
> 		$admtext['importgedcom'] = "Importeer GEDCOM bestand (mag zip bestand zijn)";
> 		$admtext['stopbackup'] = "Stop! Missschien is het een goed idee om nu een back up van je huidige data te maken voordat je doorgaat.";
> 		$admtext['importmedia'] = "Importeer media indien aanwezig";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Zorg ervoor dat de voor- en achtervoegsels (Algemene instellingen) voor dit bestand correct zijn.";
> 		$admtext['chkimpsettings'] = "Controleer de import instelling voor meer instellingen.";
> 		$admtext['eventsonly'] = "Importer alleen standaard gebeurtenis soorten en attributen  only (er wordt geen data toegevoegd, vervangen of aangevuld)";
> 		$admtext['allevents'] = "Accepteer data voor alle nieuwe gebeurtenis soorten en attributen";
> 		$admtext['finishingimporting'] = "Afmaken...";
> 		$admtext['fileuploadfailed'] = "Bestand uploaden gefaald. Bestand kan te groot zijn. Gebruik FTP om dit bestand te opladen naar je GEDCOM map, daarna selecteren en vanaf daar importeren.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Verander een bestaand gebeurtenis-type";
135,138d168
< 		$admtext['entertypedesc'] = "Vul een type of beschrijving voor dit nieuwe gebeurtenis-type in.";
< 		$admtext['enterdisplay'] = "Typ een naam of afkorting voor dit nieuwe gebeurtenis-type.";
< 		$admtext['existingeventtypeinfo'] = "Informatie over een bestaand gebeurtenis-type";
< 		$admtext['neweventtypeinfo'] = "Informatie over een nieuw gebeurtenis-type";
145,146d174
< 		$admtext['addnewevtype'] = "Voeg een nieuw gebeurtenis-type toe";
< 		$admtext['createnewevtype'] = "Maak een nieuw record voor een gebeurtenis-type";
149,150d176
< 		$admtext['existingevtypes'] = "Bestaande gebeurtenis-typen";
< 		$admtext['edsevtypes'] = "Wijzig, verwijder of sorteer vooraf ingevoerde gebeurtenis-typen";
152d177
< 		$admtext['confdeleteevtype'] = "Weet u zeker dat u dit gebeurtenis-type wilt verwijderen?";
154d178
< 		$admtext['selectentertag'] = "Selecteer of vul de tag voor dit gebeurtenis-type in.";
208d231
< 		$admtext['changestoallevtypes'] = "Wijzigingen voor alle gebeurtenis-typen";
214d236
< 		$admtext['BAPM'] = "Doop";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Weet u zeker dat u deze gebeurtenis soort wil verwijderen? Alle gebeurtenissen van dit soort zullen ook verwijderd wordeen.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Voeg nieuw soort toee";
> 		$admtext['createnewevtype'] = "Maak een nieuw attribut of gebeurtenis soort aan";
> 		$admtext['modifyeventtype'] = "Bewerk Bestaand Soort";
> 		$admtext['entertypedesc'] = "Geef altublieft een Soort/Beschrijving voor dit nieuwe attribuut of gebeurtenis soort.";
> 		$admtext['enterdisplay'] = "Geef altublieft een weergavenaam op voor dit nieuwe attribuut of gebeurtenis soort.";
> 		$admtext['existingeventtypeinfo'] = "Bestaand attribuut of gebeurtenis soort informatie";
> 		$admtext['neweventtypeinfo'] = "Nieuw attribuut of gebeurtenis soort";
> 		$admtext['existingevtypes'] = "Bestaande gebeurtenis-typen";
> 		$admtext['edsevtypes'] = "Bewerk, verwijder of sorteer de zojuist toegevoegde attributen of gebeurtenis soorten";
> 		$admtext['selectentertag'] = "Selecteer of tag dit attribuut of gebeurtenis soort.";
> 		$admtext['changestoallevtypes'] = "Veranderingen voor alle attributen of gebeurtenis soorten";
268d303
< 		$admtext['nobirthinfo'] = "Geen geboorte informatie";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Kies<br/>standaard<br/>foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Opslaan + Nieuwe Ouders";
> 		$admtext['savenewspouse'] = "Opslaan + Nieuwe Echtgenoot";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alternatief Geboorte";
354d391
< 		$admtext['enterphotodesc'] = "Geef een beschrijving van deze foto.";
388d424
< 		$admtext['photoowner'] = "Eigenaar / Bron";
417d452
< 		$admtext['imgmap'] = "Afbeeldingen map";
490d524
< 		$admtext['mapinstr3'] = "Om een gedeelte van een foto aan een persoon te koppelen kies je eerst de stamboom van die persoon en vervolgens maak je een rechthoek op de juiste positie. Dit doe je door op de bovenste linkerhoek te gaan staan en een rechthoek te trekken naar de onderste rechterhoek, je kan dit ook met twee klikken doen op dezelfde posities. Een pop-up scherm helpt je verder bij het kiezen van een persoon. Als de keuze gemaakt is zal de code daarvoor in het scherm verschijnen. Herhaal deze procedure voor alle gedeeltes die nodig zijn.";
495d528
< 		$admtext['removelink'] = "Verwijder link";
502d534
< 		$admtext['eloptions'] = "Bekijken of verwijderen";
509d540
< 		$admtext['nolinks'] = "Er zijn nog geen linken";
523c554
< 		$admtext['colldisplay'] = "Display Title";
---
> 		$admtext['colldisplay'] = "Laat titel zien";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Afbeelding Map (voor achterwaartse compatibiliteit)";
> 		$admtext['photoowner'] = "Eigenaar van het origineel";
> 		$admtext['nothumb'] = "Geen miniatuur";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Het item kon niet worden toegevoegd, waarschijnlijk omdat het bestand te groot is en kon niet geladen worden om een thumbnail te maken.";
> 		$admtext['moved'] = "Verplaatst";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Geef een beschrijving van deze foto.";
> 		$admtext['mapinstr3'] = "Om een deel van deze foto te koppelen aan een individu, selecteer eerst de stamboom van die persoon, maak een rechthoek voor het gewenste deel. Dit doe je door te klikken in de bovenste linkerhoek en dan te slepen naar de rechteronderhoek. Alternatief is: klik in de bovenste linkerhoek en dan daarna in de onderste rechterhoek. Er komt een scherm naar voren waar je de selectie voor een individu kan maken. Maak de selectie en herhaal dit net zo vaak als nodig is (meerdere individuen). Klik op een bestaand deel om het te selecteren, daarna slepen om te verplaatsen of klik de 'X' om te verwijderen.";
596d633
< 		$admtext['foremptystring'] = "Voor een lege reeks, laat dit veld leeg en klik op het pijltje hiernaast 'Voeg toe >>.'";
635d671
< 		//added in 9.1.1
641c677
< 		$admtext['ldsconfdatetr'] = "LDS Confirmation Date (True)";
---
> 		$admtext['ldsconfdatetr'] = "LDS Confirmatie Datum (True)";
644c680
< 		$admtext['ldsinitdatetr'] = "LDS Initiatory Date (True)";
---
> 		$admtext['ldsinitdatetr'] = "LDS Initiatie Datum (True)";
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructie: Sleep of dubbel klik items links om ze naar rechts te verplaatsen. Sleep op en neer om opnieuw te sorteren. Dubbel klik nogmaals om te verwijderen.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Voor een lege reeks, laat dit veld leeg en klik op het pijltje hiernaast 'Voeg toe >>.'";
651,655d690
< 		$admtext['selectimportfile'] = "Selecteer een bestand dat u wenst te importeren.";
< 		$admtext['importgedcom'] = "Importeer GEDCOM (standaard 5.5 formaat)";
< 		$admtext['addreplacedata'] = "Toevoegen aan of vervangen van uw genealogie (kan enkele minuten duren, afhankelijk van de grootte van uw bestand)";
< 		$admtext['fromyourcomputer'] = "Vanaf uw computer";
< 		$admtext['importdata'] = "Importeer data";
657,660d691
< 		$admtext['replace'] = "Vervang (in geselecteerde stamboom)";
< 		$admtext['desttree'] = "Bestemmings-stamboom";
< 		$admtext['selectdesttree'] = "Selecteer of vul de naam van een bestemmings-stamboom in.";
< 		$admtext['selectexisting'] = "Importeer in";
668,673d698
< 		$admtext['ucaselast'] = "Alle familienamen in hoofdletters";
< 		$admtext['norecalc'] = "De 'Levend' vlag niet opnieuw berekenen";
< 		$admtext['autooffset'] = "Begin ID's met het eerst beschikbare nummer";
< 
< 		$admtext['mustselecttree'] = "voor deze optie moet u een stamboom selecteren.";
< 		$admtext['importmedia'] = "Importeer media indien aanwezig";
675d699
< 		$admtext['neweronly'] = "Alleen vervangen indien nieuwer";
677,692d700
< 		$admtext['onwebserver'] = "Vanaf website (in GEDCOM map)";
< 		$admtext['eventsonly'] = "Importeer alleen aangepaste gebeurtenis-typen (er worden geen gegevens toegevoegd, vervangen of aangevuld)";
< 		$admtext['imphints'] = "Hint: Alle bestaande gegevens betekent: alle personen, gezinnen, bronnen en notities (media koppelingen gaan niet verloren zolang de ID's gelijk blijven). Exacte records zijn altijd alleen gebaseerd op ID's. Nieuwe records worden altijd toegevoegd. Toevoegen importeert alle gegevens met nieuwe ID's";
< 		$admtext['allevents'] = "Accepteer gegevens voor alle nieuwe aangepaste gebeurtenis-typen";
< 		$admtext['destbranch'] = "Bestemmings-tak (optioneel)";
< 		$admtext['inframe'] = "(in venster)";
< 		$admtext['getstart'] = "Aan de slag";
< 		$admtext['importlatlong'] = "Importeer latitude / longitude gegevens indien aanwezig";
< 		$admtext['opening'] = "Openen";
< 		$admtext['reopen'] = "Opnieuw openen";
< 		$admtext['uploading'] = "Uploaden";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import gestopt";
< 		$admtext['resume'] = "Doorgaan";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Overzicht meest recente aanpassingen";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Oude stijl importeren (zonder voortgangsbalk)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Beeindig deze upgrade instructies";
> 		$admtext['upgrade_missing'] = "Het upgrade bestand is niet gevonden, vermoedelijk is de upgrade al uitgevoerd.";
> 		$admtext['delete_upgrade'] = "Wanneer de upgrade beeindigd is, klik hier om het bestand te verwijderen en naar het menu terug te keren.";
723d733
< 		$admtext['author'] = "Auteur";
804,809c814,819
< 		$admtext['momside'] = "Moeders kant label"; //8
< 		$admtext['dadside'] = "Vader kant label"; //8
< 		$admtext['momperson'] = "Moeders kant persoons-ID"; //8
< 		$admtext['momtree'] = "Moeders kant stamboom-ID"; //8
< 		$admtext['dadperson'] = "Vader kant persoons-ID"; //8
< 		$admtext['dadtree'] = "Vader kant stamboom-ID"; //8
---
> 		$admtext['momside'] = "Moeders kant label"; //8, 20
> 		$admtext['dadside'] = "Vader kant label"; //8, 20
> 		$admtext['momperson'] = "Moeders kant persoons-ID"; //8, 20
> 		$admtext['momtree'] = "Moeders kant stamboom-ID"; //8, 20
> 		$admtext['dadperson'] = "Vader kant persoons-ID"; //8, 20
> 		$admtext['dadtree'] = "Vader kant stamboom-ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Quotes header";
> 		$admtext['quotesubhead'] = "Subheader citaten";
> 		$admtext['sniptitle'] = "Featurette titel";
> 		$admtext['snipname'] = "Featurette naam";
> 		$admtext['snipinfoone'] = "Eerste regel met featurette";
> 		$admtext['snipinfotwo'] = "Tweede regel featurette";
> 		$admtext['snipimage'] = "Featurette afbeelding";
> 		$admtext['snipperson'] = "Featurette persoon ID";
> 		$admtext['sniptree'] = "Featurette tree ID";
> 		$admtext['quote'] = "Citaat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7 titel";
> 		$admtext['featuretitle8'] = "Feature 8 titel";
> 		$admtext['featuretitle9'] = "Feature 9 titel";
> 		$admtext['featurethumb9'] = "Feature 9 thumbnail"; //15
> 		$admtext['featurelink9'] = "Feature 9 link"; //15
> 		$admtext['featurepara9'] = "Feature 9 paragraaf"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Titel Linker Afbeelding";
> 		$admtext['rightimg'] = "Titel Rechter Afbeelding";
> 		$admtext['photoption'] = "Foto opties zijn<br />&nbsp;&nbsp;(statisch or willekeurig)";
> 		$admtext['randomphotowidth'] = "willekeurig foto Breedte";
> 		$admtext['randomphotoheight'] = "willekeurig foto Hoogte";
> 		$admtext['randomphotomediatypeID'] = "willekeurige foto Collectie";
> 		$admtext['momheading'] = "Moederlijke Familie Titel";
> 		$admtext['mompara'] = "Moederlijke Familie Paragraaf";
> 		$admtext['mompagelink'] = "Maternal Family Page Link";
> 		$admtext['dadheading'] = "Vaderlijke Familie Titel";
> 		$admtext['dadpara'] = "Vaderlijke Familie Paragraaf";
> 		$admtext['dadpagelink'] = "Paternal Family Page Link";
> 		$admtext['spmomheading'] = "Echtgenoot Moederlijke Familie Titel";
> 		$admtext['spmompara'] = "Echtgenoot Moederlijke Familie Paragraaf";
> 		$admtext['spmompagelink'] = "Spouse Maternal Family Page Link";
> 		$admtext['spmomside'] = "Echtgenoot Moederlijke label";
> 		$admtext['spdadside'] = "Echtgenote Vaderlijke Kant label";
> 		$admtext['spmomperson'] = "Echtgenoot Moederlijke Kant persoonID";
> 		$admtext['spmomtree'] = "Echtgenoot Moederlijke Kant boomID";
> 		$admtext['spdadheading'] = "Echtgenote Vaderlijke Familly Titel";
> 		$admtext['spdadpara'] = "Echtgenote Vaderlijke Familie Paragraaf";
> 		$admtext['spdadpagelink'] = "Spouse Paternal Family Page Link";
> 		$admtext['spdadperson'] = "Echtgenote Vaderlijke Kant persoonID";
> 		$admtext['spdadtree'] = "Echtgenote Vaderlijke Kant boomID";
> 		$admtext['storiesheading'] = "Onze Familie verhalen";
> 		$admtext['nbrsurnames'] = "Aantal achternamen<br />&nbsp;&nbsp; in de Achternaam Wolk";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature thumbnail";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vereist 5.3 of hoger.)";
---
> 		$admtext['phpreq'] = "(TNG vereist 7.0 of hoger.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1277,1278c1368
< 		$admtext['tables'] = "Tables";
< 		//changed in 10.0.0
---
> 		$admtext['tables'] = "Tabellen";
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1340c1425
< 		$admtext['mediatrees'] = "Verschillende media in drie mappen";
---
> 		$admtext['mediatrees'] = "Media per stamboom verdelen";
1343c1428
< 		$admtext['getcolorcodes'] = "Get Color Codes Here";
---
> 		$admtext['getcolorcodes'] = "Zoek hier de Kleurcodes op";
1356,1357c1441,1442
< 		$admtext['autofillancsunames'] = "Autofill Ancestral Surnames";
< 		$admtext['colorschemer'] = "ColorSchemer - Online Color Scheme Generator";
---
> 		$admtext['autofillancsunames'] = "Automatisch aanvullen voor voorvaderlijke Achternamen";
> 		$admtext['colorschemer'] = "Colorschemer – Online Kleur schema maker";
1359,1362c1444,1476
< 		$admtext['cookieapproval'] = "Toon cookie goedkeurings bericht"; 
< 		$admtext['dataprotectmsg'] = "Toon link naar Data Beschermings Beleid "; 
< 		$admtext['nointernet'] = "Ik gebruik TNG offline"; 
< 		$admtext['askconsent'] =  "Attenderen voor toestemming betreffende persoonlijke informatie"; 
---
> 		$admtext['cookieapproval'] = "Toon cookie goedkeurings bericht";
> 		$admtext['dataprotectmsg'] = "Toon link naar Data Beschermings Beleid ";
> 		$admtext['nointernet'] = "Ik gebruik TNG offline";
> 		$admtext['askconsent'] = "Attenderen voor toestemming betreffende persoonlijke informatie";
> 		//added in 13.0
> 		$admtext['coerce'] = "Wijzig de geïmporteerde voor- en achtervoegsels conform de TNG instelling";
> 		$admtext['sortevents'] = "Sorteer Gebeurtenissen op";
> 		$admtext['sortbydate'] = "Gebeurtenis datum";
> 		$admtext['sortbytype'] = "Gebeurtenis soort";
> 		$admtext['allowsuggest'] = "Sta suggesties toe voor gasten";
> 		$admtext['livingchecked'] = "Levend aangevinkt voor personen en gezinnen";
> 		$admtext['maxmarried'] = "Markeer de gezinnen als levend indien getrouwd<br/>gedurend minder jaren dan";
> 		$admtext['imagetags'] = "Rechthoeken";
> 		$admtext['allowcsv'] = "Sta downloaden van CSV rapporten toe";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup opties";
> 		$admtext['dosql'] = "Export als SQL";
> 		$admtext['dodrop'] = "Inclusief DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Inclusief CREATE TABLE";
> 		$admtext['onrestore'] = "Restore opties";
> 		$admtext['dodel'] = "Verwijder bestaande inhoud eerst";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternatieve geboorte gebeurtenissen";
> 		$admtext['dtformat'] = "Tabellen Format";
> 		$admtext['conchart'] = "Connectie Kaart";
> 		$admtext['maxropt'] = "Max aantal connecties zoek opdracht";
> 		$admtext['maxlopt'] = "Max lengte connection paden";
> 		$admtext['showtxtopt'] = "Toon tekst pad beschrijving";
> 		$admtext['compactboxopt'] = "Toon personen boxes in compacte vorm";
> 		$admtext['sortbyopt'] = "Sorteer paden op";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max huwelijken in connecties";
> 		$admtext['saveincfg'] = "Opslaan in config pad (zie Algemene instellingen)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kon niet worden gegeocodeerd";
1423c1535,1537
< 		$admtext['noevents'] = "Geen associated gebeurtenissen";
---
> 		$admtext['noevents'] = "Geen geassocieerde gebeurtenissen";
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Niet geocoderen";
1436d1549
< 		$admtext['backtosecondary'] = "Terug naar bijkomstige handelingen";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Terug naar Post-import Utilities";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Aantekeningen uitsluiten";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip an voeg media bestanden toe";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1606c1722
< 		$admtext['consented'] = "Toestemming gegeven"; 
---
> 		$admtext['consented'] = "Toestemming gegeven";
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Toon alleen uitgeschakelde gebruikers";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Toestaan om verborgen notities te zien";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Stuur ook naar de admins als er een inkele stamboom is geselecteerd";
1617,1618c1739
< 		//added in 8.1.0
< 		$admtext['logininactive'] = "Your login is not yet active. Please try again later or contact the site administrator.";
---
> 		$admtext['logininactive'] = "Uw Login is nog niet actief. Probeer het later nogmaals of neem contact op met de administrator.";
1622c1743
< 		$admtext['createnewtlevent'] = "Create a new timeline event";
---
> 		$admtext['createnewtlevent'] = "Creër een nieuwe tijdlijn-gebeurtenis";
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1662,1673c1781,1792
< 		$admtext['wr_gender'] = "Wrong gender";
< 		$admtext['unk_gender'] = "Unknown gender";
< 		$admtext['marr_young'] = "Married too young (less than 15 years old)";
< 		$admtext['marr_aft_death'] = "Married after death";
< 		$admtext['marr_bef_birth'] = "Married before birth";
< 		$admtext['died_bef_birth'] = "Died before birth";
< 		$admtext['parents_younger'] = "Born too early (parents less than 15 years old, or child born before marriage)";
< 		$admtext['children_late'] = "Born too late (mother more than 50 years old)";
< 		$admtext['not_living'] = "Person marked as living, death date present";
< 		$admtext['not_dead'] = "Person marked as deceased, possibly still living";
< 		$admtext['parmarr'] = "Parents' Marriage";
< 		$admtext['motherbirth'] = "Mother's Birth";
---
> 		$admtext['wr_gender'] = "Fout geslacht";
> 		$admtext['unk_gender'] = "Onbekend geslacht";
> 		$admtext['marr_young'] = "Te jong getrouwd (jonger dan 15 jaar)";
> 		$admtext['marr_aft_death'] = "Getrouwd na overlijden";
> 		$admtext['marr_bef_birth'] = "Getrouwd voor geboorte";
> 		$admtext['died_bef_birth'] = "Overleden voor geboorte";
> 		$admtext['parents_younger'] = "Te vroeg geboren (ouders jonger dan 15 jaar of kind geboren voor huwelijk ouders)";
> 		$admtext['children_late'] = "Te laat geboren (moeder ouder dan 50 jaar)";
> 		$admtext['not_living'] = "Persoon gemarkeerd als levend, overlijdensdatum bekend";
> 		$admtext['not_dead'] = "Persoon gemarkeerd als overleden, mogelijk nog levend";
> 		$admtext['parmarr'] = "Ouders' Huwelijk";
> 		$admtext['motherbirth'] = "Moeders's Geboorte";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1727,1730c1844,1847
< 		$admtext['modguidelines'] = "Mod Standards";
< 		$admtext['filemod'] = "File xxx is modified by";
< 		$admtext['potconf'] = "Potential Conflicts";
< 		$admtext['modifications'] = "modifications";
---
> 		$admtext['modguidelines'] = "Mod Standaarden";
> 		$admtext['filemod'] = "Bestand xxx is gemodificeerd door";
> 		$admtext['potconf'] = "Potentiele Conflicten";
> 		$admtext['modifications'] = "modificaties";
1732c1849,1850
< 		$admtext['file'] = "File";
---
> 		$admtext['file'] = "Bestand";
> 		$admtext['tngmods'] = "Mods voor TNG";
1807c1925
< 		$admtext['willbypass'] = "zal negeren";  // was "will bypass"
---
> 		$admtext['willbypass'] = "zal negeren";
1865,1867c1983,1985
< 		$admtext['reasontoupdate'] = "If you have not run the cust_text_update.php script as part of the TNG v12 upgrade, you need to update your cust_text.php files to <ul><li>add a new line to the files and </li><li>also update out-of-date line in your existing cust_text.php files</li></ul> which are not replaced during TNG upgrades.";
< 		$admtext['newanchor'] = "The new comment line should not be translated in the language files so that it can be used as an anchor to insert custom text before this new comment line by the mod developers.";
< 		$admtext['translateissue'] = "If you translate the new comment line, mod installs will fail.";
---
> 		$admtext['reasontoupdate'] = "Als u het cust_text_update.php script niet hebt uitgevoerd als onderdeel van de TNG v12-upgrade, moet u uw cust_text.php bestanden bijwerken naar <ul><li>voeg een nieuwe regel toe aan de bestanden en </li><li>werk ook verouderde regels bij in uw bestaande cust_text.php-bestanden</li></ul> die niet worden vervangen tijdens TNG-upgrades.";
> 		$admtext['newanchor'] = "De nieuwe commentaarregel mag niet worden vertaald in de taalbestanden, omdat deze kan worden gebruikt als een anker om aangepaste tekst in te voegen vóór deze nieuwe commentaarregel door de mod-ontwikkelaars.";
> 		$admtext['translateissue'] = "Als u de nieuwe commentaar regel vertaalt zal de mod niet kunnen worden geïnstalleerd.";
1871c1989
< 		$admtext['confdelmod'] = "Do you really want to delete this mod and associated folder from your system? Dit kan niet ongedaan gemaakt worden!";
---
> 		$admtext['confdelmod'] = "Wilt u deze mod en de bijbehorende map daadwerkelijk verwijderen? Dit kan niet ongedaan gemaakt worden!";
1876,1877c1994,1995
< 		$admtext['updateopts'] = "Your mmconfig.php needs to be updated! Please click on the Options tab above and click on the Save button.";
< 		$admtext['confdelmod1'] = "Do you really want to delete this mod from your system? Dit kan niet ongedaan gemaakt worden!";
---
> 		$admtext['updateopts'] = "Uw mmconfig.php moet worden bijgewerkt! Klik op de Options tab en vervolgens op de Save knop.";
> 		$admtext['confdelmod1'] = "Wilt u deze mod daadwerkelijk verwijderen? Dit kan niet ongedaan gemaakt worden!";
1879c1997,2003
< 		$admtext['cfgnowrite'] = "Warning: Cfg file is write-protected. Parameters cannot be changed.";
---
> 		$admtext['cfgnowrite'] = "Waarschuwing: Cfg file is alleen lezen. Parameters kunnen niet veranderd worden.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Alleen geïnstalleerde mods";
> 		$admtext['partinstmods'] = "Geïnstalleerde + deels geïnstalleerde mods + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Laat acties zien in Mod Analyzer";
> 		$admtext['badchar'] = "Ongeldig karakter";
1886d2009
< 		$admtext['test_number'] = "Test Nummer";
1918c2041,2050
< 		$admtext['mrcaID'] = "Meest recent common voorouder ID";
---
> 		$admtext['mrcaID'] = "Meest recente gemeenschappelijke voorouder ID";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Nummer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Hou de Test Privé";
> 		$admtext['multivalues'] = "Streepjes tussen meerdere waarden gebruiken";
> 		$admtext['changestogroup'] = "Wijzigingen in DNA Groep";
> 		$admtext['modifydnagroup'] = "Bewerk bestaande DNA Groep";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Koppel deze DNA test aan een persoon";
1965d2096
< $admtext['otherevents'] = "Andere gebeurtenissen";
2050,2051d2180
< $admtext['savereturn'] = "Terug naar deze pagina";
< $admtext['saveback'] = "Terug naar menu";
2058,2059d2186
< $admtext['secondary'] = "Bijkomstige handelingen";
< $admtext['commas'] = "Meerdere invoer gescheiden door komma's";
2129,2130d2255
< $admtext['secondarymaint'] = "Bijkomstige handelingen";
< $admtext['customeventtypes'] = "Aangepaste gebeurtenis-typen";
2219d2343
< //changed in 8.0.0
2223d2346
< //moved here in 8.0.0
2228,2229c2351
< //added in 8.0.0
< $admtext['show'] = "Voorbeeld";
---
> $admtext['show'] = "Toon";
2236d2357
< //moved here in 9.0.0
2245d2365
< //added in 9.0.0
2277,2279d2396
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2282d2398
< //added in 10.0.0
2299c2415
< $admtext['norels'] = "Turn off relationship messages";
---
> $admtext['norels'] = "Zet de verwantschap berichten uit";
2305a2422,2426
> //added in 12.2
> $admtext['surnames'] = "Surnames";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Image";
> $admtext['author'] = "Auteur";
2310,2311c2431,2466
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Aan de slag";
> $admtext['showlog'] = "Overzicht meest recente aanpassingen";
> $admtext['nobirthinfo'] = "Geen geboorte informatie";
> //changed in 13.0
> $admtext['savereturn'] = "Opslaan + Blijven";
> $admtext['saveback'] = "Opslaan + Sluiten";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alle items zijn succesvol verwijderd.";
> $admtext['private'] = "Privé";
> $admtext['imgtags'] = "Afbeelding Tags";
> 
> $admtext['removelink'] = "Verwijder link";
> $admtext['eloptions'] = "Bekijken of verwijderen";
> $admtext['pleaseenter'] = "Typ een ";
> 
> $admtext['nolinks'] = "Er zijn nog geen linken";
> $admtext['nogeocode'] = "Kon niet worden gegeocodeerd";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Kies<br/>standaard<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Aangepaste gebeurtenis-typen";
> $admtext['secondary'] = "Bijkomstige handelingen";
> $admtext['otherevents'] = "Andere gebeurtenissen";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Move";
> $admtext['copy'] = "Copy";
> $admtext['title2'] = "Titel"; //voor media, bronnen, etc (geen personen)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Dutch/alltext.php TNG1403/languages/Dutch/alltext.php
88d87
< //moved here in 8.0.0
99c98
< $admtext['CHR'] = "Doop";
---
> $admtext['CHR'] = "Doop (CHR)";
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123,127c119,120
< //added in 9.0.0
< $text['editprofile'] = "Edit Profile";
< 
< //moved here in 9.0.0
< $text['letter'] = "Letter"; //as in page size
---
> $text['editprofile'] = "Wijzig Profiel";
> $text['letter'] = "Brief"; //as in page size
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Er deed zich een fout voor in de TNG software. Dit kan het gevolg zijn van een setup issue, een incomplete upgrade of een bug in het programma. Als je de eigenaar bent van de site, mag je contact opnemen met TNG support voor hulp met dit probleem. Kopieer a.u.b. de query hieronder en plak hem in je bericht.";
163d147
< //moved here in 12.0.0
165c149
< $admtext['dna_groups'] = "DNA Groups";
---
> $admtext['dna_groups'] = "DNA Groepen";
173d156
< //added here in 12.0.0
175,179c158,161
< $text['test_number'] = "Test Number/Name";
< $text['test_info_display'] = "Test Information To Display";
< $text['confirmed'] = "Confirmed";
< $text['predicted'] = "Predicted";
< $admtext['ancestral_surnames'] = "Ancestral achternaam";
---
> $text['test_info_display'] = "Test Informatie om te tonen";
> $text['confirmed'] = "Bevestigd";
> $text['predicted'] = "Voorspeld";
> $admtext['ancestral_surnames'] = "Voorouderlijke achternaam";
184c166
< $admtext['ref_seq'] = "Reference sequence";
---
> $admtext['ref_seq'] = "Referentie volgorde";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Nummer / Naam";
> $admtext['match_date'] = "Vergelijking gegevens";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relatie Sectie";
> $admtext['relationship_range'] = "Relatie schaal";
> $admtext['suggested_relationship'] = "Voorgesteld";
> $admtext['actual_relationship'] = "Werkelijke Relatie";
> $admtext['related_side'] = "Gerelateerde Tak";
> $admtext['shared_dna'] = "Overeenkomsig DNA";
> $admtext['shared centimorgans'] = "Totaal overeenkomstige cMs";
> $admtext['shared_segments'] = "Overeenkomstige segmenten";
> $admtext['largest_segment'] = "Grootste Segment";
> $admtext['chromosome'] = "Chromosoom Nr";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment Einde";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Overeenkomstige SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Houdt test privé";
> $text['shared_dna'] = "Overeenkomstige DNA Segmenten";
> $text['for_match'] = "voor deze overeenkomst";
> $admtext['keeptest'] = "Houdt test";
> $admtext['keepname'] = "Houdt Naam";
> $admtext['allgroups'] = "Alle Groepen";
> $admtext['alltypes'] = "Alle Typen";
> $admtext['generation_num'] = "Aantal generaties voor voorvaderlijke Achternamen";
> 
> $text['birthabbr'] = "geb.";
> $text['chrabbr'] = "ged.";
> $text['deathabbr'] = "ovl.";  //from descend
> $text['burialabbr'] = "begr.";  //from descend
> $text['marrabbr'] = "getr.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Vindt alle personen met gebeurtenissen op deze locatie";
> $text['firstpage'] = "Eerste bladzijde";
> $text['lastpage'] = "Laatste bladzijde";
> 
> //changed in 13.0.0
> $text['problem'] = "Er is een fout opgetreden in de TNG software. Wat wilt u doen:<p>Als u zojuist een update geinstalleerd hebt, controleer of u alle stappen van de installatie instructies gevolgd hebt. Ga terug naar de update Lees Mij pagina en lees de instructie opnieuw. Speciale aandacht voor de database structuur stap.</p><p>Als u TNG voor de eerste keer geintalleerd hebt, dan moeten miscchien nog de database teabellen aangemaakt wordeen. Ga terug naar de readme.html Pagina om deze stap te vinden.</p><p>Als u de website eigenaar bent, kunt u contact opnemen met TNG support voor assistentie bij dit prrobleem. Kopieer onderstaande query en plak deze in uw bericht.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Geen tak";
> 
> //added in 14.0
> $text['oneyear'] = "jaar";
> $text['pwdcodelink'] = "Klik  deze link om een tijdelijk wachtwoord toegezonden te krijgen";
> $text['pwdcodesent'] = "Een link om je wachtwoord te herstellen is naar je -mail verzonden.";
> $text['moved'] = "Verplaatst";
> $text['citation'] = "Citaat";
> $text['other'] = "Anders";
> $text['death'] = "Overlijden";
> $text['burial'] = "Begraven";
> $text['cremation'] = "Crematie";
> $text['marriage'] = "Huwelijk";
> $text['divorce'] = "Scheiding";
> $text['bylength'] = "Steps";
> $text['bymarriages'] = "Geen";
> $text['none'] = "Geen";
> 
> //moved here in 14.0
> $text['family'] = "Gezin";
> $text['source'] = "Bron";
> $text['repository'] = "Vindplaats";
> $text['place'] = "Plaats";
> $admtext['BAPM'] = "Doop (BAPM)";
> 
> $text['glang'] = "nl";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Dutch/text.php TNG1403/languages/Dutch/text.php
69d68
< 		$text['general'] = "Algemeen";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Aub twee personen selecteren.";
---
> 		$text['select2inds'] = "Selecteer twee personen.";
90c90
< 		$text['sameperson'] = "De twee personen zijn één en dezelfde persoon.";
---
> 		$text['sameperson'] = "De twee individuen zijn dezelfde persoon.";
93c93
< 		$text['sometimes'] = "(NB Het is goed mogelijk dat een andere keuze van het max. aantal te controleren generaties, een ander resultaat oplevert.)";
---
> 		$text['sometimes'] = "(Door verschillende aantallen generaties te gebruiken zal ook verschillende uitkomsten geven.)";
144c144
< 		$text['dospouses2'] = "Laat partners zien";
---
> 		$text['dospouses2'] = "Toon echtelieden";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Zoek naar connecties";
> 		$text['findrel2'] = "Vind relaties en andere connecties";
> 		$text['makeme2nd'] = "Gebruik mijn ID";
> 		$text['usebookmarks'] = "Gebruik bookmarks";
> 		$text['select2inds'] = "Selecteer twee personen.";
> 		$text['indinfofor'] = "Individuele info voor";
> 		$text['nobookmarks'] = "Er is geen bookmark om te gebruiken";
> 		$text['bkmtitle'] = "Personen gevonden in bookmarks";
> 		$text['bkminfo'] = "Selecter een persoon:";
> 		$text['sortpathsby'] = "Sorteer paden op nummer";
> 		$text['sortbyshort'] = "Sorteer op";
> 		$text['bylengthshort'] = "Lengte";
> 		$text['badID1'] = ": verkeerd persoon1 ID - ga terug en corrigeer";
> 		$text['badID2'] = ": verkeerd persoon2 ID - ga terug en corrigeer";
> 		$text['notintree'] = ": de person met dit ID zit niet in de huidige tak database.";
> 		$text['sameperson'] = "De twee individuen zijn dezelfde persoon.";;
> 		$text['nopaths'] = "Deze personen zijn niet gerelateerd.";
> 		$text['nopaths1'] = "Niet meer connectie korter dan xxx";
> 		$text['nopaths2'] = "in xxx zoek stappen";
> 		$text['longestpath'] = "(langste pad tot nu toe was xxx stappen lang)";
> 		$text['relevantpaths'] = "Het aantal gevonden relevante paden is: xxx";
> 		$text['skipMarr'] = "(toelichting, Het aantal paden gevonden maar niet getoond (reden te veel huwelijken) is: xxx)";
> 		$text['mjaor'] = "of";
> 		$text['connectionsto'] = "Connecties naar ";
> 		$text['findanotherpers'] = "Vind nog een persoon...";
> 		$text['sometimes'] = "(Door verschillende aantallen generaties te gebruiken zal ook verschillende uitkomsten geven.)";
> 		$text['anotherpath'] = "Zoek naar andere connecties";
> 		$text['xpath'] = "Pad ";
> 		$text['primary'] = "Start Persoon"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Einde Persoon";
> 		$text['parent'] = "Ouder";
> 		$text['mhfather'] = "zijn vader";
> 		$text['mhmother'] = "zijn moeder";
> 		$text['mhhusband'] = "zijn echgenote";
> 		$text['mhwife'] = "zijn vrouw";
> 		$text['mhson'] = "zijn zoon";
> 		$text['mhdaughter'] = "zijn dochter";
> 		$text['fhfather'] = "haar vader";
> 		$text['fhmother'] = "haar moeder";
> 		$text['fhhusband'] = "haar echtgenoot";
> 		$text['fhwife'] = "haar vrouw";
> 		$text['fhson'] = "haar zoon";
> 		$text['fhdaughter'] = "haar dochter";
> 		$text['hfather'] = "vader";
> 		$text['hmother'] = "moeder";
> 		$text['hhusband'] = "echtgenoot";
> 		$text['hwife'] = "vrouw";
> 		$text['hson'] = "zoon";
> 		$text['hdaughter'] = "dochter";
> 		$text['maxruns'] = "Max paden om te controleren";
> 		$text['maxrshort'] = "Max paden";
> 		$text['maxlength'] = "Connectie paden niet langer dan";
> 		$text['maxlshort'] = "Max lengte";
> 		$text['xstep'] = "stap";
> 		$text['xsteps'] = "stappen";
> 		$text['xmarriages'] = "xxx huwelijken";
> 		$text['xmarriage'] = "1 huwelijk";
> 		$text['showspouses'] = "Toon beide echtelieden";
> 		$text['showTxt'] = "Toon pad in tekstvorm";
> 		$text['showTxtshort'] = "Tekst omsch.";
> 		$text['compactBox'] = "Toon persoons boxem compact";
> 		$text['compactBoxshort'] = "Compacte boxen";
> 		$text['paths'] = "Paden";
> 		$text['dospouses2'] = "Toon echtelieden";
> 		$text['maxmopt'] = "Max huwelijken per connectie";
> 		$text['maxm'] = "Max huwelijken";
> 		$text['arerelated'] = "Deze personen zijn gerelateerd - hun relatie word getoond in pad 1";
> 		$text['simplerel'] = "Simpele relatie zoeken";
196d264
< 		$text['scrollnote'] = "Opm.: Scroll eventueel naar beneden of naar rechts om alles te kunnen zien.";
199d266
< 		$text['popupnote2'] = " = Start nieuw voorouder-overzicht vanaf deze persoon";
253,261c320,328
< 		$text['familywith'] = "Family with";
< 		$text['fcmlogin'] = "Please log in to see details";
< 		$text['isthe'] = "is the";
< 		$text['otherspouses'] = "other spouses";
< 		$text['parentfamily'] = "The parent family ";
< 		$text['showfamily'] = "Toon de Familie";
< 		$text['shown'] = "shown";
< 		$text['showparentfamily'] = "show parent family";
< 		$text['showperson'] = "show person";
---
> 		$text['familywith'] = "Familie van";
> 		$text['fcmlogin'] = "Log a.u.b. in om de details te zien";
> 		$text['isthe'] = "de";
> 		$text['otherspouses'] = "andere echtelieden";
> 		$text['parentfamily'] = "Het ouderlijk gezin";
> 		$text['showfamily'] = "Toon het gezin";
> 		$text['shown'] = "getoond";
> 		$text['showparentfamily'] = "toon het ouderlijke gezin";
> 		$text['showperson'] = "toon persoon";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabellen";
> 		$text['dtchildren'] = "Kinderen";
> 		$text['dtgrandchildren'] = "Kleinkinderen";
> 		$text['dtggrandchildren'] = "Achter kleinkinderen";
> 		$text['dtgggrandchildren'] = "Achter kleinkindereren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Geen nageslacht";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totaal";
> 		$text['dtselect'] = "Selecteer";
> 		$text['dteachfulltable'] = "Iedere volle tabel bevat";
> 		$text['dtrows'] = "rijen";
> 		$text['dtdisplayingtable'] = "Toon tabel";
> 		$text['dtgototable'] = "Ga naar tabel:";
> 		$text['fcinstrdn'] = "Toon familie met partner";
> 		$text['fcinstrup'] = "Toon familie met ouders";
> 		$text['fcinstrplus'] = "Selecter andere partner";
> 		$text['fcinstrfam'] = "Selecter andere ouders";
360,361c446,447
< 		$text['marrtype'] = "Marriage Type";
< 		$text['searchfor'] = "Search for";
---
> 		$text['marrtype'] = "Type huwelijk";
> 		$text['searchfor'] = "Zoek naar";
381,382d466
< 		$text['firstpage'] = "Eerste bladzijde";
< 		$text['lastpage'] = "Laatste bladzijde";
431,435c515,521
<         $text['iptc025'] = "Keywords";
<         $text['iptc092'] = "Sub-location";
< 		$text['iptc015'] = "Category";
< 		$text['iptc065'] = "Originating Program";
< 		$text['iptc070'] = "Program Version";
---
>         $text['iptc025'] = "Sleutelwoorden";
>         $text['iptc092'] = "Sub-locatie";
> 		$text['iptc015'] = "Categorie";
> 		$text['iptc065'] = "Programma waarvan afkomstig";
> 		$text['iptc070'] = "Programma Versie";
> 		//added in 13.0
> 		$text['toggletags'] = "Toon / Toon niet Labels";
454c540
< 		$text['placesstarting'] = "Toon de meest gebruikte plaatsen beginnend met";
---
> 		$text['placesstarting'] = "Toon de grootste plaatsen beginnend met";
457c543
< 		$text['showallplaces'] = "Alle meest gebruikte plaatsen";
---
> 		$text['showallplaces'] = "Alle grootste plaatsen";
460c546
< 		$text['allplaces'] = "Alle meest gebruikte plaatsen";
---
> 		$text['allplaces'] = "Alle grootste plaatsen";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Nogmaals nieuw wachtwoord";
> 		$text['resetsuccess'] = "Succes: Wachtwoord is hersteld";
> 		$text['resetfail'] = "Fout: Wachtwoord niet hersteld";
> 		$text['failreason0'] = " (onbekende database fout)";
> 		$text['failreason2'] = " (U heeft geen rechten om uw wachtwoord te wijzigen)";
> 		$text['failreason3'] = " (wachtwoorden komen niet overeen)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totaal Bron Citaten";
618d710
< 		$text['loginfirst'] = "U moet zich eerst aanmelden.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "U moet zich eerst aanmelden.";
629,630d722
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Uit";
645,646c737,738
< 		$text['test_date'] = "Test date";
< 		$text['links'] = "Relevant links";
---
> 		$text['test_date'] = "Testdatum";
> 		$text['links'] = "Relevante links";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Vergelijk geselecteerde mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Vergelijk geselecteerde atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutaties";
> 		$text['mrca'] = "MRC voorouder";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "Einde";
> 		$text['suggested_relationship'] = "Voorgesteld";
> 		$text['actual_relationship'] = "Daadwerkelijk";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "geb.";
< $text['chrabbr'] = "ged.";
675d788
< $text['family'] = "Gezin"; //from getperson
685d797
< $text['deathabbr'] = "ovl.";  //from descend
706d817
< $text['burialabbr'] = "begr.";  //from descend
712d822
< $text['place'] = "Plaats";
715d824
< $text['marrabbr'] = "getr.";
738d846
< $text['source'] = "Bron";
766d873
< $text['repository'] = "Vindplaats";
770d876
< $text['findplaces'] = "Zoek alle personen met gebeurtenissen in deze plaats";
804d909
< $text['glang'] = "&amp;hl=nl";
816d920
< $text['none'] = "Geen";
838c942
< $text['pwrdby'] = "Deze site wordt aangemaakt door";
---
> $text['pwrdby'] = "Deze site werd aangemaakt door";
850c954
< $text['cont'] = "(cont.)"; //abbreviation for continued
---
> $text['cont'] = "(vervolg)"; //abbreviation for continued
884c988
< $text['wasborn'] = "geboren";
---
> $text['wasborn'] = "is geboren";
906c1010
< $text['wasburied'] = "begraven";
---
> $text['wasburied'] = "werd begraven";
924d1027
< $text['otherevents'] = "Andere gebeurtenissen";
952,953d1054
< $text['people_have'] = "personen die ook een DNA test gelinkt hebben";
< $text['person_has'] = "persoon die ook een DNA test gelinkt heeft";
956,960c1057,1061
< $text['cookieuse'] = "Opmerking: Deze website gebruikt cookies."; 
< $text['dataprotect'] = "Data Beschermings Beleid"; 
< $text['viewpolicy'] = "Bekijk beleid"; 
< $text['understand'] = "Ik begrijp het"; 
< $text['consent'] = "Ik geef mijn toestemming aan deze website om de verzamelde persoonlijke informative hier op te slaan. Ik begrijp dat ik de website eigenaar op ieder moment mag vragen om deze informatie weer te verwijderen.";
---
> $text['cookieuse'] = "Opmerking: Deze website gebruikt cookies.";
> $text['dataprotect'] = "Data Beschermings Beleid";
> $text['viewpolicy'] = "Bekijk beleid";
> $text['understand'] = "Ik begrijp het";
> $text['consent'] = "Ik geef mijn toestemming aan deze website om de persoonlijke informatie die ik hier opgeef op te slaan.. Ik begrijp dat ik de website eigenaar op ieder moment mag vragen om deze informatie weer te verwijderen.";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Snelle Links ";
> $text['yourname'] = "Uw naam";
> $text['youremail'] = "Uw e-mailadres";
> $text['liketoadd'] = "Alle informatie die u wilt toevoegen";
> $text['webmastermsg'] = "Bericht Beheerder";
> $text['gallery'] = "Zie Galerij";
> $text['wasborn_male'] = "is geboren";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "is geboren"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "is gedoopt";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "is gedoopt";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "is gestorven";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "is gestorven";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "is begraven"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "is begraven"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "is gecremeerd";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "is gecremeerd";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "is getrouwd met";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "is getrouwd met";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "is gescheiden van";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "is gescheiden van";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " op ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "en ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Bezoeker";
> 
> $text['popupnote2'] = " = Start nieuw voorouder-overzicht vanaf deze persoon";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom In";
> $text['zoomout'] = "Zoom Uit";
> $text['scrollnote'] = "Opm.: Scroll eventueel naar beneden of naar rechts om alles te kunnen zien.";
> $text['general'] = "Algemeen";
> 
> //changed in 14.0
> $text['otherevents'] = "Andere gebeurtenis soorten en attributen";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connecties";
> $text['continue'] = "Doorgaan";
> $text['title2'] = "Titel"; //voor media, bronnen, etc (geen personen)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Dutch-UTF8/admintext.php TNG1403/languages/Dutch-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Typ een ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Selecteer een bestand dat u wenst te importeren.";
> 		$admtext['addreplacedata'] = "Toevoegen aan of vervangen van uw genealogie (kan enkele minuten duren, afhankelijk van de grootte van uw bestand)";
> 		$admtext['fromyourcomputer'] = "Vanaf uw computer";
> 		$admtext['importdata'] = "Importeer data";
> 		$admtext['replace'] = "Vervang (in geselecteerde stamboom)";
> 		$admtext['desttree'] = "Bestemmings-stamboom";
> 		$admtext['selectdesttree'] = "Selecteer of vul de naam van een bestemmings-stamboom in.";
> 		$admtext['selectexisting'] = "Importeer in";
> 		$admtext['ucaselast'] = "Alle familienamen in hoofdletters";
> 		$admtext['norecalc'] = "De 'Levend' vlag niet opnieuw berekenen";
> 		$admtext['autooffset'] = "Begin ID's met het eerst beschikbare nummer";
> 		$admtext['mustselecttree'] = "voor deze optie moet u een stamboom selecteren.";
> 		$admtext['onwebserver'] = "Vanaf website (in GEDCOM map)";
> 		$admtext['imphints'] = "Hint: Alle bestaande gegevens betekent: alle personen, gezinnen, bronnen en notities (media koppelingen gaan niet verloren zolang de ID's gelijk blijven). Exacte records zijn altijd alleen gebaseerd op ID's. Nieuwe records worden altijd toegevoegd. Toevoegen importeert alle gegevens met nieuwe ID's";
> 		$admtext['destbranch'] = "Bestemmings-tak (optioneel)";
> 		$admtext['importlatlong'] = "Importeer latitude / longitude gegevens indien aanwezig";
> 		$admtext['opening'] = "Openen";
> 		$admtext['reopen'] = "Opnieuw openen";
> 		$admtext['uploading'] = "Uploaden";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import gestopt";
> 		$admtext['resume'] = "Doorgaan";
> 		$admtext['neweronly'] = "Alleen vervangen indien nieuwer";
> 		$admtext['oldimport'] = "Oude stijl importeren (zonder voortgangsbalk)";
> 		$admtext['importgedcom'] = "Importeer GEDCOM bestand (mag zip bestand zijn)";
> 		$admtext['stopbackup'] = "Stop! Missschien is het een goed idee om nu een back up van je huidige data te maken voordat je doorgaat.";
> 		$admtext['importmedia'] = "Importeer media indien aanwezig";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Zorg ervoor dat de voor- en achtervoegsels (Algemene instellingen) voor dit bestand correct zijn.";
> 		$admtext['chkimpsettings'] = "Controleer de import instelling voor meer instellingen.";
> 		$admtext['eventsonly'] = "Importer alleen standaard gebeurtenis soorten en attributen  only (er wordt geen data toegevoegd, vervangen of aangevuld)";
> 		$admtext['allevents'] = "Accepteer data voor alle nieuwe gebeurtenis soorten en attributen";
> 		$admtext['finishingimporting'] = "Afmaken...";
> 		$admtext['fileuploadfailed'] = "Bestand uploaden gefaald. Bestand kan te groot zijn. Gebruik FTP om dit bestand te opladen naar je GEDCOM map, daarna selecteren en vanaf daar importeren.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Verander een bestaand gebeurtenis-type";
135,138d168
< 		$admtext['entertypedesc'] = "Vul een type of beschrijving voor dit nieuwe gebeurtenis-type in.";
< 		$admtext['enterdisplay'] = "Typ een naam of afkorting voor dit nieuwe gebeurtenis-type.";
< 		$admtext['existingeventtypeinfo'] = "Informatie over een bestaand gebeurtenis-type";
< 		$admtext['neweventtypeinfo'] = "Informatie over een nieuw gebeurtenis-type";
145,146d174
< 		$admtext['addnewevtype'] = "Voeg een nieuw gebeurtenis-type toe";
< 		$admtext['createnewevtype'] = "Maak een nieuw record voor een gebeurtenis-type";
149,150d176
< 		$admtext['existingevtypes'] = "Bestaande gebeurtenis-typen";
< 		$admtext['edsevtypes'] = "Wijzig, verwijder of sorteer vooraf ingevoerde gebeurtenis-typen";
152d177
< 		$admtext['confdeleteevtype'] = "Weet u zeker dat u dit gebeurtenis-type wilt verwijderen?";
154d178
< 		$admtext['selectentertag'] = "Selecteer of vul de tag voor dit gebeurtenis-type in.";
208d231
< 		$admtext['changestoallevtypes'] = "Wijzigingen voor alle gebeurtenis-typen";
214d236
< 		$admtext['BAPM'] = "Doop";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Weet u zeker dat u deze gebeurtenis soort wil verwijderen? Alle gebeurtenissen van dit soort zullen ook verwijderd wordeen.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Voeg nieuw soort toee";
> 		$admtext['createnewevtype'] = "Maak een nieuw attribut of gebeurtenis soort aan";
> 		$admtext['modifyeventtype'] = "Bewerk Bestaand Soort";
> 		$admtext['entertypedesc'] = "Geef altublieft een Soort/Beschrijving voor dit nieuwe attribuut of gebeurtenis soort.";
> 		$admtext['enterdisplay'] = "Geef altublieft een weergavenaam op voor dit nieuwe attribuut of gebeurtenis soort.";
> 		$admtext['existingeventtypeinfo'] = "Bestaand attribuut of gebeurtenis soort informatie";
> 		$admtext['neweventtypeinfo'] = "Nieuw attribuut of gebeurtenis soort";
> 		$admtext['existingevtypes'] = "Bestaande gebeurtenis-typen";
> 		$admtext['edsevtypes'] = "Bewerk, verwijder of sorteer de zojuist toegevoegde attributen of gebeurtenis soorten";
> 		$admtext['selectentertag'] = "Selecteer of tag dit attribuut of gebeurtenis soort.";
> 		$admtext['changestoallevtypes'] = "Veranderingen voor alle attributen of gebeurtenis soorten";
268d303
< 		$admtext['nobirthinfo'] = "Geen geboorte informatie";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Kies<br/>standaard<br/>foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Opslaan + Nieuwe Ouders";
> 		$admtext['savenewspouse'] = "Opslaan + Nieuwe Echtgenoot";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alternatief Geboorte";
354d391
< 		$admtext['enterphotodesc'] = "Geef een beschrijving van deze foto.";
388d424
< 		$admtext['photoowner'] = "Eigenaar / Bron";
417d452
< 		$admtext['imgmap'] = "Afbeeldingen map";
490d524
< 		$admtext['mapinstr3'] = "Om een gedeelte van een foto aan een persoon te koppelen kies je eerst de stamboom van die persoon en vervolgens maak je een rechthoek op de juiste positie. Dit doe je door op de bovenste linkerhoek te gaan staan en een rechthoek te trekken naar de onderste rechterhoek, je kan dit ook met twee klikken doen op dezelfde posities. Een pop-up scherm helpt je verder bij het kiezen van een persoon. Als de keuze gemaakt is zal de code daarvoor in het scherm verschijnen. Herhaal deze procedure voor alle gedeeltes die nodig zijn.";
495d528
< 		$admtext['removelink'] = "Verwijder link";
502d534
< 		$admtext['eloptions'] = "Bekijken of verwijderen";
509d540
< 		$admtext['nolinks'] = "Er zijn nog geen linken";
523c554
< 		$admtext['colldisplay'] = "Display Title";
---
> 		$admtext['colldisplay'] = "Laat titel zien";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Afbeelding Map (voor achterwaartse compatibiliteit)";
> 		$admtext['photoowner'] = "Eigenaar van het origineel";
> 		$admtext['nothumb'] = "Geen miniatuur";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Het item kon niet worden toegevoegd, waarschijnlijk omdat het bestand te groot is en kon niet geladen worden om een thumbnail te maken.";
> 		$admtext['moved'] = "Verplaatst";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Geef een beschrijving van deze foto.";
> 		$admtext['mapinstr3'] = "Om een deel van deze foto te koppelen aan een individu, selecteer eerst de stamboom van die persoon, maak een rechthoek voor het gewenste deel. Dit doe je door te klikken in de bovenste linkerhoek en dan te slepen naar de rechteronderhoek. Alternatief is: klik in de bovenste linkerhoek en dan daarna in de onderste rechterhoek. Er komt een scherm naar voren waar je de selectie voor een individu kan maken. Maak de selectie en herhaal dit net zo vaak als nodig is (meerdere individuen). Klik op een bestaand deel om het te selecteren, daarna slepen om te verplaatsen of klik de 'X' om te verwijderen.";
596d633
< 		$admtext['foremptystring'] = "Voor een lege reeks, laat dit veld leeg en klik op het pijltje hiernaast 'Voeg toe >>.'";
635d671
< 		//added in 9.1.1
641c677
< 		$admtext['ldsconfdatetr'] = "LDS Confirmation Date (True)";
---
> 		$admtext['ldsconfdatetr'] = "LDS Confirmatie Datum (True)";
644c680
< 		$admtext['ldsinitdatetr'] = "LDS Initiatory Date (True)";
---
> 		$admtext['ldsinitdatetr'] = "LDS Initiatie Datum (True)";
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructie: Sleep of dubbel klik items links om ze naar rechts te verplaatsen. Sleep op en neer om opnieuw te sorteren. Dubbel klik nogmaals om te verwijderen.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Voor een lege reeks, laat dit veld leeg en klik op het pijltje hiernaast 'Voeg toe >>.'";
651,655d690
< 		$admtext['selectimportfile'] = "Selecteer een bestand dat u wenst te importeren.";
< 		$admtext['importgedcom'] = "Importeer GEDCOM (standaard 5.5 formaat)";
< 		$admtext['addreplacedata'] = "Toevoegen aan of vervangen van uw genealogie (kan enkele minuten duren, afhankelijk van de grootte van uw bestand)";
< 		$admtext['fromyourcomputer'] = "Vanaf uw computer";
< 		$admtext['importdata'] = "Importeer data";
657,660d691
< 		$admtext['replace'] = "Vervang (in geselecteerde stamboom)";
< 		$admtext['desttree'] = "Bestemmings-stamboom";
< 		$admtext['selectdesttree'] = "Selecteer of vul de naam van een bestemmings-stamboom in.";
< 		$admtext['selectexisting'] = "Importeer in";
668,673d698
< 		$admtext['ucaselast'] = "Alle familienamen in hoofdletters";
< 		$admtext['norecalc'] = "De 'Levend' vlag niet opnieuw berekenen";
< 		$admtext['autooffset'] = "Begin ID's met het eerst beschikbare nummer";
< 
< 		$admtext['mustselecttree'] = "voor deze optie moet u een stamboom selecteren.";
< 		$admtext['importmedia'] = "Importeer media indien aanwezig";
675d699
< 		$admtext['neweronly'] = "Alleen vervangen indien nieuwer";
677,692d700
< 		$admtext['onwebserver'] = "Vanaf website (in GEDCOM map)";
< 		$admtext['eventsonly'] = "Importeer alleen aangepaste gebeurtenis-typen (er worden geen gegevens toegevoegd, vervangen of aangevuld)";
< 		$admtext['imphints'] = "Hint: Alle bestaande gegevens betekent: alle personen, gezinnen, bronnen en notities (media koppelingen gaan niet verloren zolang de ID's gelijk blijven). Exacte records zijn altijd alleen gebaseerd op ID's. Nieuwe records worden altijd toegevoegd. Toevoegen importeert alle gegevens met nieuwe ID's";
< 		$admtext['allevents'] = "Accepteer gegevens voor alle nieuwe aangepaste gebeurtenis-typen";
< 		$admtext['destbranch'] = "Bestemmings-tak (optioneel)";
< 		$admtext['inframe'] = "(in venster)";
< 		$admtext['getstart'] = "Aan de slag";
< 		$admtext['importlatlong'] = "Importeer latitude / longitude gegevens indien aanwezig";
< 		$admtext['opening'] = "Openen";
< 		$admtext['reopen'] = "Opnieuw openen";
< 		$admtext['uploading'] = "Uploaden";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import gestopt";
< 		$admtext['resume'] = "Doorgaan";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Overzicht meest recente aanpassingen";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Oude stijl importeren (zonder voortgangsbalk)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Beeindig deze upgrade instructies";
> 		$admtext['upgrade_missing'] = "Het upgrade bestand is niet gevonden, vermoedelijk is de upgrade al uitgevoerd.";
> 		$admtext['delete_upgrade'] = "Wanneer de upgrade beeindigd is, klik hier om het bestand te verwijderen en naar het menu terug te keren.";
723d733
< 		$admtext['author'] = "Auteur";
804,809c814,819
< 		$admtext['momside'] = "Moeders kant label"; //8
< 		$admtext['dadside'] = "Vader kant label"; //8
< 		$admtext['momperson'] = "Moeders kant persoons-ID"; //8
< 		$admtext['momtree'] = "Moeders kant stamboom-ID"; //8
< 		$admtext['dadperson'] = "Vader kant persoons-ID"; //8
< 		$admtext['dadtree'] = "Vader kant stamboom-ID"; //8
---
> 		$admtext['momside'] = "Moeders kant label"; //8, 20
> 		$admtext['dadside'] = "Vader kant label"; //8, 20
> 		$admtext['momperson'] = "Moeders kant persoons-ID"; //8, 20
> 		$admtext['momtree'] = "Moeders kant stamboom-ID"; //8, 20
> 		$admtext['dadperson'] = "Vader kant persoons-ID"; //8, 20
> 		$admtext['dadtree'] = "Vader kant stamboom-ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Quotes header";
> 		$admtext['quotesubhead'] = "Subheader citaten";
> 		$admtext['sniptitle'] = "Featurette titel";
> 		$admtext['snipname'] = "Featurette naam";
> 		$admtext['snipinfoone'] = "Eerste regel met featurette";
> 		$admtext['snipinfotwo'] = "Tweede regel featurette";
> 		$admtext['snipimage'] = "Featurette afbeelding";
> 		$admtext['snipperson'] = "Featurette persoon ID";
> 		$admtext['sniptree'] = "Featurette tree ID";
> 		$admtext['quote'] = "Citaat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7 titel";
> 		$admtext['featuretitle8'] = "Feature 8 titel";
> 		$admtext['featuretitle9'] = "Feature 9 titel";
> 		$admtext['featurethumb9'] = "Feature 9 thumbnail"; //15
> 		$admtext['featurelink9'] = "Feature 9 link"; //15
> 		$admtext['featurepara9'] = "Feature 9 paragraaf"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Titel Linker Afbeelding";
> 		$admtext['rightimg'] = "Titel Rechter Afbeelding";
> 		$admtext['photoption'] = "Foto opties zijn<br />&nbsp;&nbsp;(statisch or willekeurig)";
> 		$admtext['randomphotowidth'] = "willekeurig foto Breedte";
> 		$admtext['randomphotoheight'] = "willekeurig foto Hoogte";
> 		$admtext['randomphotomediatypeID'] = "willekeurige foto Collectie";
> 		$admtext['momheading'] = "Moederlijke Familie Titel";
> 		$admtext['mompara'] = "Moederlijke Familie Paragraaf";
> 		$admtext['mompagelink'] = "Maternal Family Page Link";
> 		$admtext['dadheading'] = "Vaderlijke Familie Titel";
> 		$admtext['dadpara'] = "Vaderlijke Familie Paragraaf";
> 		$admtext['dadpagelink'] = "Paternal Family Page Link";
> 		$admtext['spmomheading'] = "Echtgenoot Moederlijke Familie Titel";
> 		$admtext['spmompara'] = "Echtgenoot Moederlijke Familie Paragraaf";
> 		$admtext['spmompagelink'] = "Spouse Maternal Family Page Link";
> 		$admtext['spmomside'] = "Echtgenoot Moederlijke label";
> 		$admtext['spdadside'] = "Echtgenote Vaderlijke Kant label";
> 		$admtext['spmomperson'] = "Echtgenoot Moederlijke Kant persoonID";
> 		$admtext['spmomtree'] = "Echtgenoot Moederlijke Kant boomID";
> 		$admtext['spdadheading'] = "Echtgenote Vaderlijke Familly Titel";
> 		$admtext['spdadpara'] = "Echtgenote Vaderlijke Familie Paragraaf";
> 		$admtext['spdadpagelink'] = "Spouse Paternal Family Page Link";
> 		$admtext['spdadperson'] = "Echtgenote Vaderlijke Kant persoonID";
> 		$admtext['spdadtree'] = "Echtgenote Vaderlijke Kant boomID";
> 		$admtext['storiesheading'] = "Onze Familie verhalen";
> 		$admtext['nbrsurnames'] = "Aantal achternamen<br />&nbsp;&nbsp; in de Achternaam Wolk";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature thumbnail";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vereist 5.3 of hoger.)";
---
> 		$admtext['phpreq'] = "(TNG vereist 7.0 of hoger.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1277,1278c1368
< 		$admtext['tables'] = "Tables";
< 		//changed in 10.0.0
---
> 		$admtext['tables'] = "Tabellen";
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1340c1425
< 		$admtext['mediatrees'] = "Verschillende media in drie mappen";
---
> 		$admtext['mediatrees'] = "Media per stamboom verdelen";
1343c1428
< 		$admtext['getcolorcodes'] = "Get Color Codes Here";
---
> 		$admtext['getcolorcodes'] = "Zoek hier de Kleurcodes op";
1356,1357c1441,1442
< 		$admtext['autofillancsunames'] = "Autofill Ancestral Surnames";
< 		$admtext['colorschemer'] = "ColorSchemer - Online Color Scheme Generator";
---
> 		$admtext['autofillancsunames'] = "Automatisch aanvullen voor voorvaderlijke Achternamen";
> 		$admtext['colorschemer'] = "Colorschemer – Online Kleur schema maker";
1359,1362c1444,1476
< 		$admtext['cookieapproval'] = "Toon cookie goedkeurings bericht"; 
< 		$admtext['dataprotectmsg'] = "Toon link naar Data Beschermings Beleid "; 
< 		$admtext['nointernet'] = "Ik gebruik TNG offline"; 
< 		$admtext['askconsent'] =  "Attenderen voor toestemming betreffende persoonlijke informatie"; 
---
> 		$admtext['cookieapproval'] = "Toon cookie goedkeurings bericht";
> 		$admtext['dataprotectmsg'] = "Toon link naar Data Beschermings Beleid ";
> 		$admtext['nointernet'] = "Ik gebruik TNG offline";
> 		$admtext['askconsent'] = "Attenderen voor toestemming betreffende persoonlijke informatie";
> 		//added in 13.0
> 		$admtext['coerce'] = "Wijzig de geïmporteerde voor- en achtervoegsels conform de TNG instelling";
> 		$admtext['sortevents'] = "Sorteer Gebeurtenissen op";
> 		$admtext['sortbydate'] = "Gebeurtenis datum";
> 		$admtext['sortbytype'] = "Gebeurtenis soort";
> 		$admtext['allowsuggest'] = "Sta suggesties toe voor gasten";
> 		$admtext['livingchecked'] = "Levend aangevinkt voor personen en gezinnen";
> 		$admtext['maxmarried'] = "Markeer de gezinnen als levend indien getrouwd<br/>gedurend minder jaren dan";
> 		$admtext['imagetags'] = "Rechthoeken";
> 		$admtext['allowcsv'] = "Sta downloaden van CSV rapporten toe";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup opties";
> 		$admtext['dosql'] = "Export als SQL";
> 		$admtext['dodrop'] = "Inclusief DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Inclusief CREATE TABLE";
> 		$admtext['onrestore'] = "Restore opties";
> 		$admtext['dodel'] = "Verwijder bestaande inhoud eerst";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternatieve geboorte gebeurtenissen";
> 		$admtext['dtformat'] = "Tabellen Format";
> 		$admtext['conchart'] = "Connectie Kaart";
> 		$admtext['maxropt'] = "Max aantal connecties zoek opdracht";
> 		$admtext['maxlopt'] = "Max lengte connection paden";
> 		$admtext['showtxtopt'] = "Toon tekst pad beschrijving";
> 		$admtext['compactboxopt'] = "Toon personen boxes in compacte vorm";
> 		$admtext['sortbyopt'] = "Sorteer paden op";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max huwelijken in connecties";
> 		$admtext['saveincfg'] = "Opslaan in config pad (zie Algemene instellingen)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kon niet worden gegeocodeerd";
1423c1535,1537
< 		$admtext['noevents'] = "Geen associated gebeurtenissen";
---
> 		$admtext['noevents'] = "Geen geassocieerde gebeurtenissen";
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Niet geocoderen";
1436d1549
< 		$admtext['backtosecondary'] = "Terug naar bijkomstige handelingen";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Terug naar Post-import Utilities";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Aantekeningen uitsluiten";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip an voeg media bestanden toe";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1606c1722
< 		$admtext['consented'] = "Toestemming gegeven"; 
---
> 		$admtext['consented'] = "Toestemming gegeven";
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Toon alleen uitgeschakelde gebruikers";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Toestaan om verborgen notities te zien";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Stuur ook naar de admins als er een inkele stamboom is geselecteerd";
1617,1618c1739
< 		//added in 8.1.0
< 		$admtext['logininactive'] = "Your login is not yet active. Please try again later or contact the site administrator.";
---
> 		$admtext['logininactive'] = "Uw Login is nog niet actief. Probeer het later nogmaals of neem contact op met de administrator.";
1622c1743
< 		$admtext['createnewtlevent'] = "Create a new timeline event";
---
> 		$admtext['createnewtlevent'] = "Creër een nieuwe tijdlijn-gebeurtenis";
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1661,1673c1780,1792
< 		$admtext['dvblurb'] = "Find potential problems in your information.";
< 		$admtext['wr_gender'] = "Wrong gender";
< 		$admtext['unk_gender'] = "Unknown gender";
< 		$admtext['marr_young'] = "Married too young (less than 15 years old)";
< 		$admtext['marr_aft_death'] = "Married after death";
< 		$admtext['marr_bef_birth'] = "Married before birth";
< 		$admtext['died_bef_birth'] = "Died before birth";
< 		$admtext['parents_younger'] = "Born too early (parents less than 15 years old, or child born before marriage)";
< 		$admtext['children_late'] = "Born too late (mother more than 50 years old)";
< 		$admtext['not_living'] = "Person marked as living, death date present";
< 		$admtext['not_dead'] = "Person marked as deceased, possibly still living";
< 		$admtext['parmarr'] = "Parents' Marriage";
< 		$admtext['motherbirth'] = "Mother's Birth";
---
> 		$admtext['dvblurb'] = "Vindt potentiële fouten in je informatie.";
> 		$admtext['wr_gender'] = "Fout geslacht";
> 		$admtext['unk_gender'] = "Onbekend geslacht";
> 		$admtext['marr_young'] = "Te jong getrouwd (jonger dan 15 jaar)";
> 		$admtext['marr_aft_death'] = "Getrouwd na overlijden";
> 		$admtext['marr_bef_birth'] = "Getrouwd voor geboorte";
> 		$admtext['died_bef_birth'] = "Overleden voor geboorte";
> 		$admtext['parents_younger'] = "Te vroeg geboren (ouders jonger dan 15 jaar of kind geboren voor huwelijk ouders)";
> 		$admtext['children_late'] = "Te laat geboren (moeder ouder dan 50 jaar)";
> 		$admtext['not_living'] = "Persoon gemarkeerd als levend, overlijdensdatum bekend";
> 		$admtext['not_dead'] = "Persoon gemarkeerd als overleden, mogelijk nog levend";
> 		$admtext['parmarr'] = "Ouders' Huwelijk";
> 		$admtext['motherbirth'] = "Moeders's Geboorte";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1727,1730c1844,1847
< 		$admtext['modguidelines'] = "Mod Standards";
< 		$admtext['filemod'] = "File xxx is modified by";
< 		$admtext['potconf'] = "Potential Conflicts";
< 		$admtext['modifications'] = "modifications";
---
> 		$admtext['modguidelines'] = "Mod Standaarden";
> 		$admtext['filemod'] = "Bestand xxx is gemodificeerd door";
> 		$admtext['potconf'] = "Potentiele Conflicten";
> 		$admtext['modifications'] = "modificaties";
1732c1849
< 		$admtext['file'] = "File";
---
> 		$admtext['file'] = "Bestand";
1807c1924
< 		$admtext['willbypass'] = "zal negeren";  // was "will bypass"
---
> 		$admtext['willbypass'] = "zal negeren";
1865,1867c1982,1984
< 		$admtext['reasontoupdate'] = "If you have not run the cust_text_update.php script as part of the TNG v12 upgrade, you need to update your cust_text.php files to <ul><li>add a new line to the files and </li><li>also update out-of-date line in your existing cust_text.php files</li></ul> which are not replaced during TNG upgrades.";
< 		$admtext['newanchor'] = "The new comment line should not be translated in the language files so that it can be used as an anchor to insert custom text before this new comment line by the mod developers.";
< 		$admtext['translateissue'] = "If you translate the new comment line, mod installs will fail.";
---
> 		$admtext['reasontoupdate'] = "Als u het cust_text_update.php script niet hebt uitgevoerd als onderdeel van de TNG v12-upgrade, moet u uw cust_text.php bestanden bijwerken naar <ul><li>voeg een nieuwe regel toe aan de bestanden en </li><li>werk ook verouderde regels bij in uw bestaande cust_text.php-bestanden</li></ul> die niet worden vervangen tijdens TNG-upgrades.";
> 		$admtext['newanchor'] = "De nieuwe commentaarregel mag niet worden vertaald in de taalbestanden, omdat deze kan worden gebruikt als een anker om aangepaste tekst in te voegen vóór deze nieuwe commentaarregel door de mod-ontwikkelaars.";
> 		$admtext['translateissue'] = "Als u de nieuwe commentaar regel vertaalt zal de mod niet kunnen worden geïnstalleerd.";
1871c1988
< 		$admtext['confdelmod'] = "Do you really want to delete this mod and associated folder from your system? Dit kan niet ongedaan gemaakt worden!";
---
> 		$admtext['confdelmod'] = "Wilt u deze mod en de bijbehorende map daadwerkelijk verwijderen? Dit kan niet ongedaan gemaakt worden!";
1876,1877c1993,1994
< 		$admtext['updateopts'] = "Your mmconfig.php needs to be updated! Please click on the Options tab above and click on the Save button.";
< 		$admtext['confdelmod1'] = "Do you really want to delete this mod from your system? Dit kan niet ongedaan gemaakt worden!";
---
> 		$admtext['updateopts'] = "Uw mmconfig.php moet worden bijgewerkt! Klik op de Options tab en vervolgens op de Save knop.";
> 		$admtext['confdelmod1'] = "Wilt u deze mod daadwerkelijk verwijderen? Dit kan niet ongedaan gemaakt worden!";
1879c1996,2002
< 		$admtext['cfgnowrite'] = "Warning: Cfg file is write-protected. Parameters cannot be changed.";
---
> 		$admtext['cfgnowrite'] = "Waarschuwing: Cfg file is alleen lezen. Parameters kunnen niet veranderd worden.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Alleen geïnstalleerde mods";
> 		$admtext['partinstmods'] = "Geïnstalleerde + deels geïnstalleerde mods + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Laat acties zien in Mod Analyzer";
> 		$admtext['badchar'] = "Ongeldig karakter";
1886d2008
< 		$admtext['test_number'] = "Test Nummer";
1918c2040,2049
< 		$admtext['mrcaID'] = "Meest recent common voorouder ID";
---
> 		$admtext['mrcaID'] = "Meest recente gemeenschappelijke voorouder ID";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Nummer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Hou de Test Privé";
> 		$admtext['multivalues'] = "Streepjes tussen meerdere waarden gebruiken";
> 		$admtext['changestogroup'] = "Wijzigingen in DNA Groep";
> 		$admtext['modifydnagroup'] = "Bewerk bestaande DNA Groep";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Koppel deze DNA test aan een persoon";
1965d2095
< $admtext['otherevents'] = "Andere gebeurtenissen";
2050,2051d2179
< $admtext['savereturn'] = "Terug naar deze pagina";
< $admtext['saveback'] = "Terug naar menu";
2058,2059d2185
< $admtext['secondary'] = "Bijkomstige handelingen";
< $admtext['commas'] = "Meerdere invoer gescheiden door komma's";
2129,2130d2254
< $admtext['secondarymaint'] = "Bijkomstige handelingen";
< $admtext['customeventtypes'] = "Aangepaste gebeurtenis-typen";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228,2229c2350
< //added in 8.0.0
< $admtext['show'] = "Voorbeeld";
---
> $admtext['show'] = "Toon";
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2299c2414
< $admtext['norels'] = "Turn off relationship messages";
---
> $admtext['norels'] = "Zet de verwantschap berichten uit";
2301c2416
< $admtext['templates'] = "Templates";
---
> $admtext['templates'] = "Sjablonen";
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Surnames";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Image";
> $admtext['author'] = "Auteur";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Aan de slag";
> $admtext['showlog'] = "Overzicht meest recente aanpassingen";
> $admtext['nobirthinfo'] = "Geen geboorte informatie";
> //changed in 13.0
> $admtext['savereturn'] = "Opslaan + Blijven";
> $admtext['saveback'] = "Opslaan + Sluiten";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alle items zijn succesvol verwijderd.";
> $admtext['private'] = "Privé";
> $admtext['imgtags'] = "Afbeelding Tags";
> 
> $admtext['removelink'] = "Verwijder link";
> $admtext['eloptions'] = "Bekijken of verwijderen";
> $admtext['pleaseenter'] = "Typ een ";
> 
> $admtext['nolinks'] = "Er zijn nog geen linken";
> $admtext['nogeocode'] = "Kon niet worden gegeocodeerd";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Kies<br/>standaard<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Gebeurtenis / Attribuut Soorten";
> $admtext['secondary'] = "Post-import Utilities";
> $admtext['otherevents'] = "Andere gebeurtenissen / Attributen";
> //added in 14.0
> $admtext['newlinks'] = "Links aangemaakt";
> $admtext['newcemlinks'] = "Begraafplaats links aangemaakt";
> $admtext['utility'] = "Voorziening";
> $admtext['linktype'] = "Soort";
> $admtext['move'] = "Verplaats";
> $admtext['copy'] = "Copieer";
> $admtext['title2'] = "Titel"; //voor media, bronnen, etc (geen personen)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Dutch-UTF8/alltext.php TNG1403/languages/Dutch-UTF8/alltext.php
88d87
< //moved here in 8.0.0
99c98
< $admtext['CHR'] = "Doop";
---
> $admtext['CHR'] = "Doop (CHR)";
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123,127c119,120
< //added in 9.0.0
< $text['editprofile'] = "Edit Profile";
< 
< //moved here in 9.0.0
< $text['letter'] = "Letter"; //as in page size
---
> $text['editprofile'] = "Wijzig Profiel";
> $text['letter'] = "Brief"; //as in page size
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Er deed zich een fout voor in de TNG software. Dit kan het gevolg zijn van een setup issue, een incomplete upgrade of een bug in het programma. Als je de eigenaar bent van de site, mag je contact opnemen met TNG support voor hulp met dit probleem. Kopieer a.u.b. de query hieronder en plak hem in je bericht.";
163d147
< //moved here in 12.0.0
165c149
< $admtext['dna_groups'] = "DNA Groups";
---
> $admtext['dna_groups'] = "DNA Groepen";
173d156
< //added here in 12.0.0
175,179c158,161
< $text['test_number'] = "Test Number/Name";
< $text['test_info_display'] = "Test Information To Display";
< $text['confirmed'] = "Confirmed";
< $text['predicted'] = "Predicted";
< $admtext['ancestral_surnames'] = "Ancestral achternaam";
---
> $text['test_info_display'] = "Test Informatie om te tonen";
> $text['confirmed'] = "Bevestigd";
> $text['predicted'] = "Voorspeld";
> $admtext['ancestral_surnames'] = "Voorouderlijke achternaam";
184c166
< $admtext['ref_seq'] = "Reference sequence";
---
> $admtext['ref_seq'] = "Referentie volgorde";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Nummer / Naam";
> $admtext['match_date'] = "Vergelijking gegevens";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relatie Sectie";
> $admtext['relationship_range'] = "Relatie schaal";
> $admtext['suggested_relationship'] = "Voorgesteld";
> $admtext['actual_relationship'] = "Werkelijke Relatie";
> $admtext['related_side'] = "Gerelateerde Tak";
> $admtext['shared_dna'] = "Overeenkomsig DNA";
> $admtext['shared centimorgans'] = "Totaal overeenkomstige cMs";
> $admtext['shared_segments'] = "Overeenkomstige segmenten";
> $admtext['largest_segment'] = "Grootste Segment";
> $admtext['chromosome'] = "Chromosoom Nr";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment Einde";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Overeenkomstige SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Houdt test privé";
> $text['shared_dna'] = "Overeenkomstige DNA Segmenten";
> $text['for_match'] = "voor deze overeenkomst";
> $admtext['keeptest'] = "Houdt test";
> $admtext['keepname'] = "Houdt Naam";
> $admtext['allgroups'] = "Alle Groepen";
> $admtext['alltypes'] = "Alle Typen";
> $admtext['generation_num'] = "Aantal generaties voor voorvaderlijke Achternamen";
> 
> $text['birthabbr'] = "geb.";
> $text['chrabbr'] = "ged.";
> $text['deathabbr'] = "ovl.";  //from descend
> $text['burialabbr'] = "begr.";  //from descend
> $text['marrabbr'] = "getr.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Vindt alle personen met gebeurtenissen op deze locatie";
> $text['firstpage'] = "Eerste bladzijde";
> $text['lastpage'] = "Laatste bladzijde";
> 
> //changed in 13.0.0
> $text['problem'] = "Er is een fout opgetreden in de TNG software. Wat wilt u doen:<p>Als u zojuist een update geinstalleerd hebt, controleer of u alle stappen van de installatie instructies gevolgd hebt. Ga terug naar de update Lees Mij pagina en lees de instructie opnieuw. Speciale aandacht voor de database structuur stap.</p><p>Als u TNG voor de eerste keer geintalleerd hebt, dan moeten miscchien nog de database teabellen aangemaakt wordeen. Ga terug naar de readme.html Pagina om deze stap te vinden.</p><p>Als u de website eigenaar bent, kunt u contact opnemen met TNG support voor assistentie bij dit prrobleem. Kopieer onderstaande query en plak deze in uw bericht.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Geen tak";
> 
> //added in 14.0
> $text['oneyear'] = "jaar";
> $text['pwdcodelink'] = "Klik  deze link om een tijdelijk wachtwoord toegezonden te krijgen";
> $text['pwdcodesent'] = "Een link om je wachtwoord te herstellen is naar je -mail verzonden.";
> $text['moved'] = "Verplaatst";
> $text['citation'] = "Citaat";
> $text['other'] = "Anders";
> $text['death'] = "Overlijden";
> $text['burial'] = "Begraven";
> $text['cremation'] = "Crematie";
> $text['marriage'] = "Huwelijk";
> $text['divorce'] = "Scheiding";
> $text['bylength'] = "Steps";
> $text['bymarriages'] = "Geen";
> $text['none'] = "Geen";
> 
> //moved here in 14.0
> $text['family'] = "Gezin";
> $text['source'] = "Bron";
> $text['repository'] = "Vindplaats";
> $text['place'] = "Plaats";
> $admtext['BAPM'] = "Doop (BAPM)";
> 
> $text['glang'] = "nl";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Dutch-UTF8/text.php TNG1403/languages/Dutch-UTF8/text.php
69d68
< 		$text['general'] = "Algemeen";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Aub twee personen selecteren.";
---
> 		$text['select2inds'] = "Selecteer twee personen.";
90c90
< 		$text['sameperson'] = "De twee personen zijn één en dezelfde persoon.";
---
> 		$text['sameperson'] = "De twee individuen zijn dezelfde persoon.";
93c93
< 		$text['sometimes'] = "(NB Het is goed mogelijk dat een andere keuze van het max. aantal te controleren generaties, een ander resultaat oplevert.)";
---
> 		$text['sometimes'] = "(Door verschillende aantallen generaties te gebruiken zal ook verschillende uitkomsten geven.)";
144c144
< 		$text['dospouses2'] = "Laat partners zien";
---
> 		$text['dospouses2'] = "Toon echtelieden";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Zoek naar connecties";
> 		$text['findrel2'] = "Vind relaties en andere connecties";
> 		$text['makeme2nd'] = "Gebruik mijn ID";
> 		$text['usebookmarks'] = "Gebruik bookmarks";
> 		$text['select2inds'] = "Selecteer twee personen.";
> 		$text['indinfofor'] = "Individuele info voor";
> 		$text['nobookmarks'] = "Er is geen bookmark om te gebruiken";
> 		$text['bkmtitle'] = "Personen gevonden in bookmarks";
> 		$text['bkminfo'] = "Selecter een persoon:";
> 		$text['sortpathsby'] = "Sorteer paden op nummer";
> 		$text['sortbyshort'] = "Sorteer op";
> 		$text['bylengthshort'] = "Lengte";
> 		$text['badID1'] = ": verkeerd persoon1 ID - ga terug en corrigeer";
> 		$text['badID2'] = ": verkeerd persoon2 ID - ga terug en corrigeer";
> 		$text['notintree'] = ": de person met dit ID zit niet in de huidige tak database.";
> 		$text['sameperson'] = "De twee individuen zijn dezelfde persoon.";;
> 		$text['nopaths'] = "Deze personen zijn niet gerelateerd.";
> 		$text['nopaths1'] = "Niet meer connectie korter dan xxx";
> 		$text['nopaths2'] = "in xxx zoek stappen";
> 		$text['longestpath'] = "(langste pad tot nu toe was xxx stappen lang)";
> 		$text['relevantpaths'] = "Het aantal gevonden relevante paden is: xxx";
> 		$text['skipMarr'] = "(toelichting, Het aantal paden gevonden maar niet getoond (reden te veel huwelijken) is: xxx)";
> 		$text['mjaor'] = "of";
> 		$text['connectionsto'] = "Connecties naar ";
> 		$text['findanotherpers'] = "Vind nog een persoon...";
> 		$text['sometimes'] = "(Door verschillende aantallen generaties te gebruiken zal ook verschillende uitkomsten geven.)";
> 		$text['anotherpath'] = "Zoek naar andere connecties";
> 		$text['xpath'] = "Pad ";
> 		$text['primary'] = "Start Persoon"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Einde Persoon";
> 		$text['parent'] = "Ouder";
> 		$text['mhfather'] = "zijn vader";
> 		$text['mhmother'] = "zijn moeder";
> 		$text['mhhusband'] = "zijn echgenote";
> 		$text['mhwife'] = "zijn vrouw";
> 		$text['mhson'] = "zijn zoon";
> 		$text['mhdaughter'] = "zijn dochter";
> 		$text['fhfather'] = "haar vader";
> 		$text['fhmother'] = "haar moeder";
> 		$text['fhhusband'] = "haar echtgenoot";
> 		$text['fhwife'] = "haar vrouw";
> 		$text['fhson'] = "haar zoon";
> 		$text['fhdaughter'] = "haar dochter";
> 		$text['hfather'] = "vader";
> 		$text['hmother'] = "moeder";
> 		$text['hhusband'] = "echtgenoot";
> 		$text['hwife'] = "vrouw";
> 		$text['hson'] = "zoon";
> 		$text['hdaughter'] = "dochter";
> 		$text['maxruns'] = "Max paden om te controleren";
> 		$text['maxrshort'] = "Max paden";
> 		$text['maxlength'] = "Connectie paden niet langer dan";
> 		$text['maxlshort'] = "Max lengte";
> 		$text['xstep'] = "stap";
> 		$text['xsteps'] = "stappen";
> 		$text['xmarriages'] = "xxx huwelijken";
> 		$text['xmarriage'] = "1 huwelijk";
> 		$text['showspouses'] = "Toon beide echtelieden";
> 		$text['showTxt'] = "Toon pad in tekstvorm";
> 		$text['showTxtshort'] = "Tekst omsch.";
> 		$text['compactBox'] = "Toon persoons boxem compact";
> 		$text['compactBoxshort'] = "Compacte boxen";
> 		$text['paths'] = "Paden";
> 		$text['dospouses2'] = "Toon echtelieden";
> 		$text['maxmopt'] = "Max huwelijken per connectie";
> 		$text['maxm'] = "Max huwelijken";
> 		$text['arerelated'] = "Deze personen zijn gerelateerd - hun relatie word getoond in pad 1";
> 		$text['simplerel'] = "Simpele relatie zoeken";
196d264
< 		$text['scrollnote'] = "Opm.: Scroll eventueel naar beneden of naar rechts om alles te kunnen zien.";
199d266
< 		$text['popupnote2'] = " = Start nieuw voorouder-overzicht vanaf deze persoon";
253,261c320,328
< 		$text['familywith'] = "Family with";
< 		$text['fcmlogin'] = "Please log in to see details";
< 		$text['isthe'] = "is the";
< 		$text['otherspouses'] = "other spouses";
< 		$text['parentfamily'] = "The parent family ";
< 		$text['showfamily'] = "Toon de Familie";
< 		$text['shown'] = "shown";
< 		$text['showparentfamily'] = "show parent family";
< 		$text['showperson'] = "show person";
---
> 		$text['familywith'] = "Familie van";
> 		$text['fcmlogin'] = "Log a.u.b. in om de details te zien";
> 		$text['isthe'] = "de";
> 		$text['otherspouses'] = "andere echtelieden";
> 		$text['parentfamily'] = "Het ouderlijk gezin";
> 		$text['showfamily'] = "Toon het gezin";
> 		$text['shown'] = "getoond";
> 		$text['showparentfamily'] = "toon het ouderlijke gezin";
> 		$text['showperson'] = "toon persoon";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabellen";
> 		$text['dtchildren'] = "Kinderen";
> 		$text['dtgrandchildren'] = "Kleinkinderen";
> 		$text['dtggrandchildren'] = "Achter kleinkinderen";
> 		$text['dtgggrandchildren'] = "Achter kleinkindereren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Geen nageslacht";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totaal";
> 		$text['dtselect'] = "Selecteer";
> 		$text['dteachfulltable'] = "Iedere volle tabel bevat";
> 		$text['dtrows'] = "rijen";
> 		$text['dtdisplayingtable'] = "Toon tabel";
> 		$text['dtgototable'] = "Ga naar tabel:";
> 		$text['fcinstrdn'] = "Toon familie met partner";
> 		$text['fcinstrup'] = "Toon familie met ouders";
> 		$text['fcinstrplus'] = "Selecter andere partner";
> 		$text['fcinstrfam'] = "Selecter andere ouders";
360,361c446,447
< 		$text['marrtype'] = "Marriage Type";
< 		$text['searchfor'] = "Search for";
---
> 		$text['marrtype'] = "Type huwelijk";
> 		$text['searchfor'] = "Zoek naar";
381,382d466
< 		$text['firstpage'] = "Eerste bladzijde";
< 		$text['lastpage'] = "Laatste bladzijde";
431,435c515,521
<         $text['iptc025'] = "Keywords";
<         $text['iptc092'] = "Sub-location";
< 		$text['iptc015'] = "Category";
< 		$text['iptc065'] = "Originating Program";
< 		$text['iptc070'] = "Program Version";
---
>         $text['iptc025'] = "Sleutelwoorden";
>         $text['iptc092'] = "Sub-locatie";
> 		$text['iptc015'] = "Categorie";
> 		$text['iptc065'] = "Programma waarvan afkomstig";
> 		$text['iptc070'] = "Programma Versie";
> 		//added in 13.0
> 		$text['toggletags'] = "Toon / Toon niet Labels";
454c540
< 		$text['placesstarting'] = "Toon de meest gebruikte plaatsen beginnend met";
---
> 		$text['placesstarting'] = "Toon de grootste plaatsen beginnend met";
457c543
< 		$text['showallplaces'] = "Alle meest gebruikte plaatsen";
---
> 		$text['showallplaces'] = "Alle grootste plaatsen";
460c546
< 		$text['allplaces'] = "Alle meest gebruikte plaatsen";
---
> 		$text['allplaces'] = "Alle grootste plaatsen";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Nogmaals nieuw wachtwoord";
> 		$text['resetsuccess'] = "Succes: Wachtwoord is hersteld";
> 		$text['resetfail'] = "Fout: Wachtwoord niet hersteld";
> 		$text['failreason0'] = " (onbekende database fout)";
> 		$text['failreason2'] = " (U heeft geen rechten om uw wachtwoord te wijzigen)";
> 		$text['failreason3'] = " (wachtwoorden komen niet overeen)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totaal Bron Citaten";
618d710
< 		$text['loginfirst'] = "U moet zich eerst aanmelden.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "U moet zich eerst aanmelden.";
629,630d722
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Uit";
645,646c737,738
< 		$text['test_date'] = "Test date";
< 		$text['links'] = "Relevant links";
---
> 		$text['test_date'] = "Testdatum";
> 		$text['links'] = "Relevante links";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Vergelijk geselecteerde mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Vergelijk geselecteerde atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutaties";
> 		$text['mrca'] = "MRC voorouder";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "Einde";
> 		$text['suggested_relationship'] = "Voorgesteld";
> 		$text['actual_relationship'] = "Daadwerkelijk";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "geb.";
< $text['chrabbr'] = "ged.";
675d788
< $text['family'] = "Gezin"; //from getperson
685d797
< $text['deathabbr'] = "ovl.";  //from descend
706d817
< $text['burialabbr'] = "begr.";  //from descend
712d822
< $text['place'] = "Plaats";
715d824
< $text['marrabbr'] = "getr.";
738d846
< $text['source'] = "Bron";
766d873
< $text['repository'] = "Vindplaats";
770d876
< $text['findplaces'] = "Zoek alle personen met gebeurtenissen in deze plaats";
804d909
< $text['glang'] = "&amp;hl=nl";
816d920
< $text['none'] = "Geen";
838c942
< $text['pwrdby'] = "Deze site wordt aangemaakt door";
---
> $text['pwrdby'] = "Deze site werd aangemaakt door";
850c954
< $text['cont'] = "(cont.)"; //abbreviation for continued
---
> $text['cont'] = "(vervolg)"; //abbreviation for continued
884c988
< $text['wasborn'] = "geboren";
---
> $text['wasborn'] = "is geboren";
906c1010
< $text['wasburied'] = "begraven";
---
> $text['wasburied'] = "werd begraven";
924d1027
< $text['otherevents'] = "Andere gebeurtenissen";
952,953d1054
< $text['people_have'] = "personen die ook een DNA test gelinkt hebben";
< $text['person_has'] = "persoon die ook een DNA test gelinkt heeft";
956,960c1057,1061
< $text['cookieuse'] = "Opmerking: Deze website gebruikt cookies."; 
< $text['dataprotect'] = "Data Beschermings Beleid"; 
< $text['viewpolicy'] = "Bekijk beleid"; 
< $text['understand'] = "Ik begrijp het"; 
< $text['consent'] = "Ik geef mijn toestemming aan deze website om de verzamelde persoonlijke informative hier op te slaan. Ik begrijp dat ik de website eigenaar op ieder moment mag vragen om deze informatie weer te verwijderen.";
---
> $text['cookieuse'] = "Opmerking: Deze website gebruikt cookies.";
> $text['dataprotect'] = "Data Beschermings Beleid";
> $text['viewpolicy'] = "Bekijk beleid";
> $text['understand'] = "Ik begrijp het";
> $text['consent'] = "Ik geef mijn toestemming aan deze website om de persoonlijke informatie die ik hier opgeef op te slaan.. Ik begrijp dat ik de website eigenaar op ieder moment mag vragen om deze informatie weer te verwijderen.";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Snelle Links ";
> $text['yourname'] = "Uw naam";
> $text['youremail'] = "Uw e-mailadres";
> $text['liketoadd'] = "Alle informatie die u wilt toevoegen";
> $text['webmastermsg'] = "Bericht Beheerder";
> $text['gallery'] = "Zie Galerij";
> $text['wasborn_male'] = "is geboren";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "is geboren"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "is gedoopt";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "is gedoopt";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "is gestorven";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "is gestorven";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "is begraven"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "is begraven"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "is gecremeerd";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "is gecremeerd";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "is getrouwd met";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "is getrouwd met";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "is gescheiden van";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "is gescheiden van";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " op ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "en ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Bezoeker";
> 
> $text['popupnote2'] = " = Start nieuw voorouder-overzicht vanaf deze persoon";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom In";
> $text['zoomout'] = "Zoom Uit";
> $text['scrollnote'] = "Opm.: Scroll eventueel naar beneden of naar rechts om alles te kunnen zien.";
> $text['general'] = "Algemeen";
> 
> //changed in 14.0
> $text['otherevents'] = "Andere gebeurtenis soorten en attributen";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connecties";
> $text['continue'] = "Doorgaan";
> $text['title2'] = "Titel"; //voor media, bronnen, etc (geen personen)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/English/admintext.php TNG1403/languages/English/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Please enter a ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Please select a file to import.";
> 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
> 		$admtext['fromyourcomputer'] = "From your computer";
> 		$admtext['importdata'] = "Import Data";
> 		$admtext['replace'] = "Replace (in selected tree)";
> 		$admtext['desttree'] = "Destination Tree";
> 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
> 		$admtext['selectexisting'] = "Import into";
> 		$admtext['ucaselast'] = "Upper case all surnames";
> 		$admtext['norecalc'] = "Do not recalculate Living flag";
> 		$admtext['autooffset'] = "Start IDs at first available number";
> 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
> 		$admtext['onwebserver'] = "From web site (in GEDCOM folder)";
> 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
> 		$admtext['destbranch'] = "Destination Branch (optional)";
> 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
> 		$admtext['opening'] = "Opening";
> 		$admtext['reopen'] = "Reopening";
> 		$admtext['uploading'] = "Uploading";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import stopped";
> 		$admtext['resume'] = "Resume";
> 		$admtext['neweronly'] = "Replace only if newer";
> 		$admtext['oldimport'] = "Old style import (no progress bar)";
> 		$admtext['importgedcom'] = "Import GEDCOM file (may be zipped)";
> 		$admtext['stopbackup'] = "Stop! It might be a good idea to back up your current data before proceeding.";
> 		$admtext['importmedia'] = "Import media links";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Import custom event types and attributes only (no data is added, replaced or appended)";
> 		$admtext['allevents'] = "Accept data for all new event types and attributes";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Edit Existing Event Type";
135,138d168
< 		$admtext['entertypedesc'] = "Please enter a type/description for this new event type.";
< 		$admtext['enterdisplay'] = "Please enter a display string for this new event type.";
< 		$admtext['existingeventtypeinfo'] = "Existing Event Type Information";
< 		$admtext['neweventtypeinfo'] = "New Event Type Information";
145,146d174
< 		$admtext['addnewevtype'] = "Add New Event Type";
< 		$admtext['createnewevtype'] = "Create a new event type record";
149,150d176
< 		$admtext['existingevtypes'] = "Existing Event Types";
< 		$admtext['edsevtypes'] = "Edit, delete or sort previously entered event types";
152d177
< 		$admtext['confdeleteevtype'] = "Are you sure you want to delete this event type?";
154d178
< 		$admtext['selectentertag'] = "Please select or enter the tag for this event type.";
208d231
< 		$admtext['changestoallevtypes'] = "Changes to all event types";
214d236
< 		$admtext['BAPM'] = "Baptism";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Are you sure you want to delete this event type? All events of this type will also be deleted.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Add New Type";
> 		$admtext['createnewevtype'] = "Create a new event or attribute type record";
> 		$admtext['modifyeventtype'] = "Edit Existing Type";
> 		$admtext['entertypedesc'] = "Please enter a type/description for this new attribute or event type.";
> 		$admtext['enterdisplay'] = "Please enter a display string for this new attribute or event type.";
> 		$admtext['existingeventtypeinfo'] = "Existing attribute or event type information";
> 		$admtext['neweventtypeinfo'] = "New attribute or event type information";
> 		$admtext['existingevtypes'] = "Existing Attribute or Event Types";
> 		$admtext['edsevtypes'] = "Edit, delete or sort previously entered attribute and event types";
> 		$admtext['selectentertag'] = "Please select or enter the tag for this attribute or event type.";
> 		$admtext['changestoallevtypes'] = "Changes to all attribute or event types";
232c268
< 		$admtext['marrdate'] = "Marr Date"; //marriage date
---
> 		$admtext['marrdate'] = "Marriage Date"; //marriage date
268d303
< 		$admtext['nobirthinfo'] = "No birth info";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Save + New Parents";
> 		$admtext['savenewspouse'] = "Save + New Spouse";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Please enter a description for the image.";
388d424
< 		$admtext['photoowner'] = "Owner/Source";
417d452
< 		$admtext['imgmap'] = "Image Map";
490d524
< 		$admtext['mapinstr3'] = "To link a region of this photo to an individual, first select the individual's tree, then create a rectangle for the desired region. This is done by clicking in the upper left corner of the region and then dragging to the lower right corner. Alternately, you may click in the upper left corner and then again in the lower right corner. A popup box will then help you select the individual. After the selection is made, code for the image map will be added to the box below. Repeat this process as needed for additional regions.";
495d528
< 		$admtext['removelink'] = "Remove Link";
502d534
< 		$admtext['eloptions'] = "Browse or Delete";
509d540
< 		$admtext['nolinks'] = "No links exist yet";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Image Map (for backward compatibility)";
> 		$admtext['photoowner'] = "Owner of original";
> 		$admtext['nothumb'] = "No thumbnail";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "The item could not be added, most likely because the file was too large and could not be uploaded or used to make a thumbnail.";
> 		$admtext['moved'] = "Moved";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Please enter a title or description for this media.";
> 		$admtext['mapinstr3'] = "To link a region of this photo to an person, family or other entity, first select the relevant tree and entity type, then create a rectangle for the desired region. This is done by clicking in the upper left corner of the region and then dragging to the lower right corner. Alternately, you may click in the upper left corner and then again in the lower right corner. A popup box will then help you select the person or other entity. Make your selection, then repeat this process as needed for additional regions. Click an existing region to select, then drag to move or click the 'X' to delete.";
596d633
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions: Drag or double-click items at left into lists at right. Drag up and down to re-order. Double-click again to remove.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click >>";
651,655d690
< 		$admtext['selectimportfile'] = "Please select a file to import.";
< 		$admtext['importgedcom'] = "Import GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
< 		$admtext['fromyourcomputer'] = "From your computer";
< 		$admtext['importdata'] = "Import Data";
657,660d691
< 		$admtext['replace'] = "Replace (in selected tree)";
< 		$admtext['desttree'] = "Destination Tree";
< 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
< 		$admtext['selectexisting'] = "Import into";
668,673d698
< 		$admtext['ucaselast'] = "Upper case all surnames";
< 		$admtext['norecalc'] = "Do not recalculate Living flag";
< 		$admtext['autooffset'] = "Start IDs at first available number";
< 
< 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
< 		$admtext['importmedia'] = "Import media if present";
675d699
< 		$admtext['neweronly'] = "Replace only if newer";
677,692d700
< 		$admtext['onwebserver'] = "From web site (in GEDCOM folder)";
< 		$admtext['eventsonly'] = "Import Custom Event Types only (no data is added, replaced or appended)";
< 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "Resume";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Admin Log";
694,696c702
< 		$admtext['mmgritems'] = "Install and Remove TNG Mods";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
---
> 		$admtext['mmgritems'] = "Install and uninstall TNG Mods";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Author";
804,809c814,819
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
---
> 		$admtext['momside'] = "Mom's Side label"; //8, 20
> 		$admtext['dadside'] = "Dad's Side label"; //8, 20
> 		$admtext['momperson'] = "Mom's Side person ID"; //8, 20
> 		$admtext['momtree'] = "Mom's Side tree ID"; //8, 20
> 		$admtext['dadperson'] = "Dad's Side person ID"; //8, 20
> 		$admtext['dadtree'] = "Dad's Side tree ID"; //8, 20
837c847
< 		$admtext['featurepara'] = "Features paragraph"; //9, 10
---
> 		$admtext['featurepara'] = "Feature paragraph"; //9, 10
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Quotes header";
> 		$admtext['quotesubhead'] = "Quotes subhead";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Featurette name";
> 		$admtext['snipinfoone'] = "Featurette first line";
> 		$admtext['snipinfotwo'] = "Featurette second line";
> 		$admtext['snipimage'] = "Featurette image";
> 		$admtext['snipperson'] = "Featurette person ID";
> 		$admtext['sniptree'] = "Featurette tree ID";
> 		$admtext['quote'] = "Quote";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7 title";
> 		$admtext['featuretitle8'] = "Feature 8 title";
> 		$admtext['featuretitle9'] = "Feature 9 title";
> 		$admtext['featurethumb9'] = "Feature 9 thumbnail"; //15
> 		$admtext['featurelink9'] = "Feature 9 link"; //15
> 		$admtext['featurepara9'] = "Feature 9 paragraph"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Header Left Image"; 
> 		$admtext['rightimg'] = "Header Right Image"; 
> 		$admtext['photoption'] = "Photo options are<br />&nbsp;&nbsp;(static or random)";
> 		$admtext['randomphotowidth'] = "Random Photo Width";
> 		$admtext['randomphotoheight'] = "Random Photo Height";
> 		$admtext['randomphotomediatypeID'] = "Random Photo Collection";
> 		$admtext['momheading'] = "Maternal Family Heading"; 
> 		$admtext['mompara'] = "Maternal Family Paragraph"; 
> 		$admtext['mompagelink'] = "Maternal Family Page Link"; 
> 		$admtext['dadheading'] = "Paternal Family Heading"; 
> 		$admtext['dadpara'] = "Paternal Family Paragraph"; 
> 		$admtext['dadpagelink'] = "Paternal Family Page Link"; 
> 		$admtext['spmomheading'] = "Spouse Maternal Family Heading"; 
> 		$admtext['spmompara'] = "Spouse Maternal Family Paragraph"; 
> 		$admtext['spmompagelink'] = "Spouse Maternal Family Page Link"; 
> 		$admtext['spmomside'] = "Spouse Maternal Side label"; 
> 		$admtext['spdadside'] = "Spouse Paternal Side label"; 
> 		$admtext['spmomperson'] = "Spouse Maternal Side personID"; 
> 		$admtext['spmomtree'] = "Spouse Maternal Side treeID"; 
> 		$admtext['spdadheading'] = "Spouse Paternal Family Heading"; 
> 		$admtext['spdadpara'] = "Spouse Paternal Family Paragrph"; 
> 		$admtext['spdadpagelink'] = "Spouse Paternal Family Page Link"; 
> 		$admtext['spdadperson'] = "Spouse Paternal Side personID"; 
> 		$admtext['spdadtree'] = "Spouse Paternal Side treeID"; 
> 		$admtext['storiesheading'] = "Our Family Stories"; 
> 		$admtext['nbrsurnames'] = "Number of Surnames<br />&nbsp;&nbsp; in Surname Cloud"; 
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature thumbnail";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG requires 5.3 or higher.)";
---
> 		$admtext['phpreq'] = "(TNG requires 7.0 or higher.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Change incoming prefixes to match TNG settings";
> 		$admtext['sortevents'] = "Sort events by";
> 		$admtext['sortbydate'] = "Event date";
> 		$admtext['sortbytype'] = "Event type";
> 		$admtext['allowsuggest'] = "Allow suggestions from visitors";
> 		$admtext['livingchecked'] = "Living flag set for new people and families";
> 		$admtext['maxmarried'] = "Mark family living if married less than<br/>this many years";
> 		$admtext['imagetags'] = "Rectangles";
> 		$admtext['allowcsv'] = "Allow CSV downloads for reports";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Export as SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of connection search runs";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Display textual path statement";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages in connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Could not be geocoded";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Do not geocode";
1436d1549
< 		$admtext['backtosecondary'] = "Back to Secondary Processes";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Back to Post-import Utilities";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exclude notes";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip and include media files";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Show disabled users only";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1739c1856
< 		$admtext['install'] = "install";
---
> 		$admtext['install'] = "Install";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Invalid character";
1886d2008
< 		$admtext['test_number'] = "Test Number";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Number/Name";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Link this DNA test to a person";
1965d2095
< $admtext['otherevents'] = "Other Events";
2050,2051d2179
< $admtext['savereturn'] = "Return to this page";
< $admtext['saveback'] = "Return to menu";
2058d2185
< $admtext['secondary'] = "Secondary Processes";
2119c2246
< $admtext['datamaint'] = "Import/Export";
---
> $admtext['datamaint'] = "Import / Export";
2128,2129d2254
< $admtext['secondarymaint'] = "Secondary Processes";
< $admtext['customeventtypes'] = "Custom Event Types";
2218d2342
< //changed in 8.0.0
2222d2345
< //moved here in 8.0.0
2227d2349
< //added in 8.0.0
2235d2356
< //moved here in 9.0.0
2244d2364
< //added in 9.0.0
2276,2278d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2281d2397
< //added in 10.0.0
2304a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Surnames";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Image";
> $admtext['author'] = "Author";
2309,2310c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Getting Started";
> $admtext['showlog'] = "Admin Log";
> $admtext['nobirthinfo'] = "No birth info";
> //changed in 13.0
> $admtext['savereturn'] = "Save + Stay";
> $admtext['saveback'] = "Save + Exit";
> //added in 13.0
> $admtext['allitemsdeleted'] = "All items were successfully deleted.";
> $admtext['private'] = "Private";
> $admtext['imgtags'] = "Image Tags";
> 
> $admtext['removelink'] = "Remove Link";
> $admtext['eloptions'] = "Browse or Delete";
> $admtext['pleaseenter'] = "Please enter a ";
> 
> $admtext['nolinks'] = "No links exist yet";
> $admtext['nogeocode'] = "Could not be geocoded";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Event / Attribute Types";
> $admtext['secondary'] = "Post-import Utilities";
> $admtext['otherevents'] = "Other Events / Attributes";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Move";
> $admtext['copy'] = "Copy";
> $admtext['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/English/alltext.php TNG1403/languages/English/alltext.php
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "b.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "bur.";  //from descend
> $text['marrabbr'] = "m.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "First Page";
> $text['lastpage'] = "Last Page";
> 
> //changed in 13.0.0
> $text['problem'] = "An error has occurred in the TNG software. What to do:<p>If you just installed an upgrade, you might have skipped part of the installation instructions. Go back to the upgrade readme page reread the instructions. Pay special attention to the database structure step.</p><p>If you just installed TNG for the first time, you might still need to create the database tables. Return to the readme.html page to find that step.</p><p>If you are the site owner, you may contact TNG support for further assistance with this problem. Please copy the query below and paste it into your message.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "No branch";
> 
> //added in 14.0
> $text['oneyear'] = "year";
> $text['pwdcodelink'] = "Click this link to have a temporary password sent to you";
> $text['pwdcodesent'] = "A password reset link has been sent to your e-mail address.";
> $text['moved'] = "Moved";
> $text['citation'] = "Citation";
> $text['other'] = "Other";
> $text['death'] = "Death";
> $text['burial'] = "Burial";
> $text['cremation'] = "Cremation";
> $text['marriage'] = "Marriage";
> $text['divorce'] = "Divorce";
> $text['bylength'] = "Steps";
> $text['bymarriages'] = "Marriages";
> $text['none'] = "None";
> 
> //moved here in 14.0
> $text['family'] = "Family";
> $text['source'] = "Source";
> $text['repository'] = "Repository";
> $text['place'] = "Place";
> $admtext['BAPM'] = "Baptism";
> 
> $text['glang'] = "en";
208c257
< //$english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> //$english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/English/backuprestore_help.php TNG1403/languages/English/backuprestore_help.php
33,34c33,36
< 		<a name="tables"><p class="subheadbold">Back up, Restore &amp; Optimize Table Data</p></a>
< 		<p>Use these functions to secure your data and keep your site running fast.</p>
---
> 		<a name="tables"><p class="subheadbold">Back up, Restore, Optimize &amp; Download Table Data</p></a>
> 		<p>Use these functions to secure your data and keep your site running fast. Take note that if you are storing your backups in a private folder,
> 			the Download option will not be available here. In that case you would need to use an FTP program or online file manager to download
> 			your backup files.</p>
41a44,61
> 		<p class="optionhead">Backup options
> 			<ul>
> 				<li><b>Export as SQL:</b> Create the backup data in SQL format. The advantage is that the backup could be restored to another MySQL database
> 					without TNG present.</li>
> 				<li><b>Include CREATE TABLE:</b> If the "CREATE TABLE" command is included in the backup, then a restore operation will attempt to create the table
> 					before restoring the data.</li>
> 				<li><b>Include DROP TABLE IF EXISTS:</b> Can only be used if CREATE TABLE is also included. When both are present, a restore operation that finds
> 					an existing table with the same name will delete it first, then recreate it.</li>
> 			</ul>
> 		</p>
> 		<p class="optionhead">Restore options
> 			<ul>
> 				<li><b>Delete previous contents first:</b> Even if the DROP TABLE option was not selected, this option will ensure that the existing contents of the
> 					table being restored will be deleted before the restoration proceeds. If the existing data is not deleted before a restore, duplicate records
> 					could result.</li>
> 			</ul>
> 		</p>
> 
86c106,107
< 		<p>To back up your TNG table structure, click on the Backup icon in this section. If the operation is successful, the page will be redisplayed with a red message at the top
---
> 		<p>To back up your TNG table structure, click on the Backup icon in this section. As of TNG 14, this backup will always be created as a .SQL file.
> 			If the operation is successful, the page will be redisplayed with a red message at the top
diff -r TNG/languages/English/branches_help.php TNG1403/languages/English/branches_help.php
15c15
< 			<a href="eventtypes_help.php" class="lightlink">Help: Custom Event Types &raquo;</a>
---
> 			<a href="eventtypes_help.php" class="lightlink">Help: Event / Attribute Types &raquo;</a>
109,110c109,113
< 		<p>Choose whether you'll be adding new labels or clearing out existing ones. If you're clearing labels, then you will also choose whether this action will clear
< 		the branch label  from All members of your tree or just clear the labels based on the criteria selected. </p>
---
> 		<p>Choose whether you'll be adding new labels, clearing existing labels or deleting people with the selected branch label. If you're clearing labels
> 		or deleting individuals, then you will also choose whether this action will cover your entire tree ("All") or just the records that match the criteria selected ("Partial"). 
> 		IMPORTANT: If you choose "Delete", the people will also be deleted, not just the branch labels! There is no "undo" option, so you might want to back up
> 		your tables before you begin.
> 		</p>
diff -r TNG/languages/English/citations_help.php TNG1403/languages/English/citations_help.php
82a83,85
> 		<span class="optionhead">Events</span>
> 		<p>The event(s) this citation will be attached to. Use shift+ or ctrl/cmd+ click to select multiple events. If multiple events are selected, a copy of the new citation will be created for each event. If no event is selected, the citation will be attached to the individual in general.</p>
> 
diff -r TNG/languages/English/collections_help.php TNG1403/languages/English/collections_help.php
82,83c82,84
< 		In other words, if the files on your computer are located in "C:\MyGenealogy\MyCollectionFiles", that is what you should enter here. TNG will then
< 		strip that part from each incoming path name, leaving you with just the file name and any additional subfolder names.
---
> 		In other words, if the files on your computer are located in "C:\MyGenealogy\MyCollectionFiles", that is what you should enter here.</p>
> 
> 		<p>TNG will then strip that part from each incoming path name, leaving you with just the file name and any additional subfolder names.
89a91,92
> 		<p>TNG also uses the local path to populate the export local path when you select Export Media Links</p>
> 
diff -r TNG/languages/English/config_help.php TNG1403/languages/English/config_help.php
29d28
< 			<a href="#mobile" class="lightlink">Mobile</a> &nbsp; | &nbsp;
30a30
> 			<a href="#mobile" class="lightlink">Mobile</a> &nbsp; | &nbsp;
45,47c45,47
< 		<span class="optionhead">Database Host, Name, User Name, Password</span>
< 		<p>This is the information TNG and PHP will use to connect to your database. These fields must be filled in before your database 
< 		can be accessed. <strong>Note</strong>: The user name and password mentioned here may be different from
---
> 		<span class="optionhead">Database Host, Name, User Name, Password, Port and Socket</span>
> 		<p>This is the information TNG and PHP will use to connect to your database. Except for the port and socket (rarely used), these fields must be filled in before your database 
> 		can be accessed. <strong>Notes</strong>: The user name and password mentioned here may be different from
50c50
< 		hosting provider. The host name may also require a port number or a socket path (i.e., "localhost:3306" or "localhost:/path/to/socket"). 
---
> 		hosting provider. The port number or a socket path may be required to be entered as part of the host name (i.e., "localhost:3306" or "localhost:/path/to/socket"). 
101c101
< 		<span class="optionhead">Photo / Document / History / Headstone / Multimedia / GENDEX / Backup / Mods / Extensions Folders</span>
---
> 		<span class="optionhead">Photo / Document / History / Headstone / Multimedia / Mods / Extensions / GENDEX / Backup Folders</span>
104c104,105
< 		audio recordings). These folders can be created from this screen by clicking on the "Make Folder" buttons.</p>
---
> 		audio recordings). The names of these folders can be changed by entering the new names and clicking the corresponding "Rename" buttons. Don't forget to click "Save" when you are done with this page.</p>
> 		<p>Note: Check the box under the Backup Folder name to have the Backup Folder stored at the Config Path location (see above). You must move the actual folder to the config location yourself outside of TNG.</p>
116c117
< 		TNG files. It must be a relative link ("index.php" or "../otherhomepage.html"), not an absolute link ("http://yoursite.com").</p>
---
> 		TNG files. It must be a relative link ("index.php" or "../otherhomepage.html"), not an absolute link ("https://yoursite.com").</p>
119c120
< 		<p>The web address for your genealogy folder (i.e., "http://mysite.com/genealogy").</p>
---
> 		<p>The web address for your genealogy folder (i.e., "https://mysite.com/genealogy").</p>
136,139d136
< 		<span class="optionhead">Target Frame</span>
< 		<p>If your site uses frames, use this field to indicate in which frame the TNG pages should display. If you are not using frames, 
< 		leave this as "_self".</p>
< 
144a142,144
> 		<span class="optionhead">Custom footer message</span>
> 		<p>A message or an HTML snippet to be displayed at the bottom of each page.</p>
> 
146,148c146,148
< 		<p>The file that dictates the style of tabs displayed on many of the public pages. The default style (tngtabs1.css) features slanted tabs, but
< 		an alternate style with "squarish" tabs (tngtabs2.css) also comes with TNG. To view tabs with this style, enter "tngtabs2.css"
< 		in this field and click "Save" at the bottom of the page, then look up any individual in the public area. The default style (tngtabs1.css) makes use of two images, "tngtab.png" (inactive
---
> 		<p>The file that dictates the style of tabs displayed on many of the public pages. The default style (tngtabs2.css) features gently rounded tabs, but
> 		an alternate style with slanted tabs (tngtabs1.css) also comes with TNG. To view tabs with this style, enter "tngtabs1.css"
> 		in this field and click "Save" at the bottom of the page, then look up any individual in the public area. The tngtabs1.css style makes use of two images, "tngtab.png" (inactive
151c151
< 		tngtab.gif or tngtabactive.png. <a href="http://lythgoes.net/genealogy/switchcolor.php">http://lythgoes.net/genealogy/switchcolor.php</a></p>
---
> 		tngtab.gif or tngtabactive.png. <a href="https://lythgoes.net/genealogy/switchcolor.php">https://lythgoes.net/genealogy/switchcolor.php</a></p>
169,171c169,171
< 		<span class="optionhead">Hide all DNA pages and data</span>
< 		<p>If you're not going to use any of the DNA-related features and would like it removed from all public pages, set this option to Yes. DNA Tests will no longer be accessible from the public menus,
< 			nor will they be seen on any person's individual page.</p>
---
> 		<span class="optionhead">Alternate birth events</span>
> 		<p>The default alternate birth events are Christening (CHR) and Baptism (BAPM), but you may change that here by adding or substituting your own GEDCOM tags. 
> 		Users making changes to the data will then be able to select the appropriate event from this list.</p>
215,218d214
< 		<span class="optionhead">Columns in Thumbnail View</span>
< 		<p>When browsing all photos in thumbnail view, this many thumbnails will be displayed in a single row. If more
< 		exist, additional rows will be displayed up to the "Maximum Search Result" number of rows.</p>
< 
259,260c255,258
< 		<p>A "favicon" is a small icon displayed in the browser's address bar, just to the left of the site URL. TNG does not include a utility to help you create such an icon, but if
< 			you have one, upload it to the main TNG folder and enter the file name here.</p>
---
> 		<p>A "favicon" is a small icon displayed in the browser's address bar, just to the left of the site URL. TNG includes default icons for both the public
> 			and admin parts of the program. TNG does not include a utility to help you create these icons, but if
> 			you have one (or separate ones for both public and admin), upload your icon(s) to the img/public and/or img/admin folders and enter the file name here
> 			in the settings. Note that if you have separate icons for public and admin, you will need to give them each the same name.</p>
280a279,281
> 		<span class="optionhead">Turn off relationship messages</span>
> 		<p>This will hide the written relationship explanation at the bottom of the Relationship Chart. This might be useful if the wording of the explanation doesn't always make sense in this language.</p>
> 
335a337,342
> 		<span class="optionhead">Living flag set for new people and families</span>
> 		<p>When turned on, this option defaults all new individuals and families as living. You may uncheck that designation for each person or family</p>
> 
> 		<span class="optionhead">Allow CSV downloads for reports</span>
> 		<p>When users run your reports, allow them to download a comma-delimited file of the results. Such files often make it easier to import the information into a spreadsheet.</p>
> 
446a454,465
> 		<a name="pref"><p class="subheadbold">Prefixes and Suffixes</p></a>
> 
> 		<p>These letters are combined with a number to form IDs for the people, families, sources, repositories and notes in your database. Most genealogy
> 		programs use the same set of standard prefixes (and no suffixes). If your desktop program uses suffixes or different prefixes instead, enter them here.
> 		If the proper prefixes or suffixes are not entered, some TNG features may not work correctly.</p>
> 
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Top</a></p>
477,481c496
< 		<a name="pref"><p class="subheadbold">Prefixes and Suffixes</p></a>
< 
< 		<p>These letters are combined with a number to form IDs for the people, families, sources, repositories and notes in your database. Most genealogy
< 		programs use the same set of standard prefixes (and no suffixes). If your desktop program uses suffixes or different prefixes instead, enter them here.
< 		If the proper prefixes or suffixes are not entered, some TNG features may not work correctly.</p>
---
> 		<a name="misc"><p class="subheadbold">DNA Tests</p></a>
482a498,512
> 		<span class="optionhead">Hide all DNA pages and data</span>
> 		<p>If you're not going to use any of the DNA-related features and would like it removed from all public pages, set this option to Yes. DNA Tests will no longer be accessible from the public menus,
> 			nor will they be seen on any person's individual page.</p>
> 		<span class="optionhead">Max Search Results</span>
> 		<p>The Max Search Results in the DNA Test section controls the number of DNA results that can be displayed independently from the TNG search results for queries from the browse DNA tests.</p><p><strong>Note:</strong> If you are not able to select the DNA test you want to compare because it is on another page, increase this limit so all DNA Tests you want to compare are shown on the same page.</p>
> 		<span class="optionhead">Show DNA Test Number Publicly</span>
> 		<p>This option allows you to hide or show the DNA Test Number on the public DNA test pages.</p>
> 		<span class="optionhead">Autofill Ancestral Surnames</span>
> 		<p>This option automatically adds the Ancestral surnames in your maternal and paternal direct lines when you save the DNA Test. You may want to limit the numbers of generations to use.</p>
> 		<span class="optionhead">Uppercase Ancestral Surnames </span>
> 		<p>This option uses all uppercases for the ancestral surnames if Autofill Ancestral Surnames is set to Yes. It defaults to No to display surnames as entered.</p>
> 		<span class="optionhead">Generations For Ancestral Surnames</span> 
> 		<p>Specifies how many generations back to search for the ancestral surnames when using the autofill ancestral surnames option</p>
> 		<span class="optionhead">Exclude From Ancestral Surnames</span>
> 		<p>Specifies which surnames not to include when using the autofill ancestral surnames option.</p>
484c514
< </tr>
---
> </tr>		
diff -r TNG/languages/English/data_help.php TNG1403/languages/English/data_help.php
15c15
< 			<a href="second_help.php" class="lightlink">Help: Secondary Processes &raquo;</a>
---
> 			<a href="second_help.php" class="lightlink">Help: Post-Import Utilities &raquo;</a>
24,25c24,25
< <tr class="databack">
< 	<td class="tngshadow">
---
> <tr>
> 	<td class="tngshadow databack">
35c35
< 		<p><span class="optionhead">Before Importing:</span> Use your desktop genealogy software to create a standard 5.5 GEDCOM file (4.0 will also work). You may choose to exclude
---
> 		<p><span class="optionhead">Before Importing:</span> Use your desktop genealogy software to create a standard GEDCOM file (5.5 or 7.0 are preferred, but 4.0 will also work). You may choose to exclude
40c40
< 		<p><span class="optionhead">[Import GEDCOM] From your computer</span>
---
> 		<p><span class="optionhead">Import GEDCOM From your computer</span>
42c42
< 		<strong>NOTE</strong>: If your GEDCOM file is very large (> 2Mb), you might need to check with your hosting provider before you can upload your file this way, as the server may have a maximum size
---
> 		<strong>NOTE</strong>: If your GEDCOM file is large (> 2Mb), you can try "zipping" it first (TNG will automatically extract the file after it is uploaded). If the resulting file is still large, you might need to check with your hosting provider before you can upload your file this way, as the server may have a maximum size
45,46c45,46
< 		<span class="optionhead">OR [Import GEDCOM] From web site (in GEDCOM folder)</span>
< 		<p>If you used FTP or an online file manager to transfer the file to the GEDCOM folder on your site, enter the exact name of your uploaded file here, or click on
---
> 		<span class="optionhead">OR Import GEDCOM From web site (in GEDCOM folder)</span>
> 		<p>If you used FTP or an online file manager to transfer the GEDCOM or ZIP file to the GEDCOM folder on your site, enter the exact name of your uploaded file here, or click on
50,53c50,55
< 		<span class="optionhead">Accept data for all new Custom Event Types</span>
< 		<p>Your GEDCOM file might contain events that TNG considers as "Custom" events. Normally, new Custom Event Types included in a GEDCOM file are entered into the database, but
< 		the data is set to be ignored. You would need to change the status of a Custom Event Type to "Accept" in order for events of that type to be imported (in other words,
< 		you would need to import your file twice). If you check this option, TNG will automatically set all new Custom Event Types to "Accept", and all your events
---
> 		<p>Note: If you upload/import a ZIP file and include actual media in the file, TNG will extract the media to the appropriate media folders (eg, "photos" or a subfolder of "photos"). See Admin/Setup/Import Settings for more options related to embedded media.</p>
> 
> 		<span class="optionhead">Accept data for all new event and attribute types</span>
> 		<p>Your GEDCOM file might contain events that TNG considers as non-standard events. Normally, new event or attribute types included in a GEDCOM file are entered into the database, but
> 		the data is set to be ignored. You would need to change the status of such a type to "Accept" in order for events or attributes of that type to be imported (in other words,
> 		you would need to import your file twice). If you check this option, TNG will automatically set all new event or attribute types to "Accept", and all your events
56,57c58,59
< 		<span class="optionhead">Import Custom Event Types Only (no data is added, replaced or appended)</span>
< 		<p>Checking this option will cause only Custom Event Types to be imported (see Admin/Custom Event Types). All other data is ignored. This is an ideal
---
> 		<span class="optionhead">Import Event / Attribute Types Only (no data is added, replaced or appended)</span>
> 		<p>Checking this option will cause only custom event or attribute types to be imported (see Admin/Event / Attribute Types). All other data is ignored. This is an ideal
124,125c126,127
< <tr class="databack">
< 	<td class="tngshadow">
---
> <tr>
> 	<td class="tngshadow databack">
141a144,147
> 		<span class="optionhead">Zip and include media files</span>
> 		<p>If you check the option to export media links, you also have the option to zip the finished file and include the physical media
> 		files mentioned in the GEDCOM file by checking this box. Take note that this could make your file extremely large.</p>
> 
153a160,163
> 
> 		<span class="optionhead">Totals</span>
> 		<p>When the export finishes, you should see a summary of how many people, families, sources, notes, repositories, media and places were exported. It should
> 		be noted that only places that have latitude/longitude information or notes will be tallied in the place total.</p>
diff -r TNG/languages/English/dna_help.php TNG1403/languages/English/dna_help.php
21a22,25
> 			<a href="#ydna" class="lightlink">Y-DNA Fields</a> &nbsp; | &nbsp;
> 			<a href="#mtdna" class="lightlink">mtDNA Fields</a> &nbsp; | &nbsp;
> 			<a href="#atdna" class="lightlink">atDNA Fields</a> &nbsp; | &nbsp;
> 			<a href="#common" class="lightlink">Common Fields</a> &nbsp; | &nbsp;
52a57
> 		<p>Note that fields can be left empty and will not be displayed in most cases.</p>
58c63
< 		<p>Enter the ID number or name associated with this test. If you can't find a number or the vendor didn't give you one, feel free to make up a new number or name.</p>
---
> 		<p>Enter the ID number or name associated with this test. If you can't find a number or the vendor didn't give you one, feel free to make up a new number or name. <br /><strong>Note </strong> that if you do not enter a value for the Test Number/Name field, you will not have a quick link to edit the DNA data from DNA report screens such as browse_dna_tests.php.</p>
62a68,79
> 		<span class="optionhead">Test Date</span>
> 		<p>This is the date the DNA test was taken if known.</p>
> 
> 		<span class="optionhead">Match Date</span>
> 		<p>This is the date on which your test was matched to the person who took the DNA test.</p>
> 
> 		<span class="optionhead">GEDmatch ID.</span>
> 		<p>The ID on GEDmatch web site for this test.  Applies to atDNA tests only.</p>
> 
> 		<span class="optionhead">Keep Test Private.</span>
> 		<p>If you enter Yes to keep this test private, the test display will be restricted to logged in users who have the <strong>Allow Private</strong> privilege.  This allows you to restrict access to DNA Tests that you marked as Keep Test Private. The test will be viewable by the TNG Administrator</p>
> 
67c84
< 		<p>If this box is checked, the name assigned for "Test Taker" will display as "Private" publicly. The name will be viewable by the TNG Administrator</p>
---
> 		<p>If this box is checked, the name assigned for "Test Taker" will display as "Private" publicly. The name will be viewable to the TNG Administrator</p>
72,73c89,90
< 		<span class="optionhead">DNA Group</span>
< 		<p>DNA Groups are used to linked different DNA tests together.  For example, you might create a group for your paternal line and another group for your maternal line.  Other relatives who have taken Y-DNA or mtDNA test could be linked to the groups you defined.  DNA Groups are just a way to link multiple tests together.  Linking tests to a group is optional.  The DNA Group might be helpful in one-name studies where the same surname could be in different DNA groups.</p>
---
> 		<span class="optionhead">DNA Groups</span>
> 		<p>DNA Groups are used to select or filter DNA tests or test_types in a list.  You should consider creating your DNA Groups in a meaningul way to restrict the list of tests displayed. For example, you might create a group for your paternal line and another group for your maternal line. DNA Groups are just a way to filter a list of tests. Linking tests to a group is optional.  Note that you DNA Groups are now associated to the test type and you cannot use the same DNA Group name for two different test types.</p>
75,76c92,109
< 		<span class="optionhead">Number of Markers</span>
< 		<p>A genetic marker is a gene or DNA sequence with a known location on a chromosome that can be used to identify an individual. DNA tests can be distinguished by the number of markers they test for.<br />Typical Y-DNA tests can be done for 12, 25, 37, 44, 67, 91, 101 or 111 markers.</p>
---
> 		<span class="optionhead">Haplogroup</span>
> 		<p>A haplogroup is a genetic population of people who share a common ancestor on the patrilineal or matrilineal line. Haplogroups are assigned letters of the alphabet (A-T), and refinements (SNPs) consist of additional number and letter combinations. Two separate input fields are provided because some testing companies provide both as estimated haplogroups on atDNA tests or if the test taker also took the mtDNA or Y-DNA test.</p>
> 		<p>The <strong>mtDNA Haplogroup</strong> field is provided for the matrilineal haplogroup normally provided with the mtDNA test.</p>
> 		<p>The <strong>Y-DNA Haplogroup</strong> field is provided for the patrilineal line normally provided with the Y-DNA test.</p>
> 		<p>Some testing companies provide a mtDNA and Y-DNA Haplogroup on their atDNA tests.  Family Tree DNA provides it if the corresponding mtDNA and Y-DNA tests were taken. Other testing companies predict what the haplogroups might be.</p>
> 
> 		<p>The confirmed checkbox is used to indicate that the test provided a confirmed haplogroup as opposed to a predicted one. Because a haplogroup consists of similar haplotypes, it is possible to predict a haplogroup from the haplotype. A SNP test is required to confirm the haplogroup prediction. Not all the testing companies offer SNP testing, and consequently their customer's haplogroup predictions are sometimes inaccurate.</p>
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Top</a></p>
> 		<a name="ydna"><p class="subheadbold">Y-DNA Test Result Fields</p></a>
> 			
> 		<p>Your Y-chromosome DNA (Y-DNA) can trace your father, his father, his father’s father, and so forth using STR markers, which are places where your genetic code has a variable number of repeated parts.</p>
> 		<p><strong>Number of Markers</strong></p>
> 		<p>A genetic marker is a gene or DNA sequence with a known location on a chromosome that can be used to identify an individual. DNA tests can be distinguished by the number of markers they test for.<br />Typical Y-DNA tests can be done for 12, 25, 37, 44, 67, 91, 101 or 111 markers.<br />Because Family Tree DNA is currently the only vendor offering Y-DNA tests these days, 12, 25, 37, 67, and 111 markers are used in the Y-DNA comparison report.</p>
78,79c111,113
< 			<span class="optionhead">Marker Values</span>
< 		<p>Enter your Y-DNA marker values separated by commas.<br />For example, "13,24,14,10,11-14,12,12,12,13,14,30,17,9-10,11,11,24,15,19,30,15-15-16-17".</p>
---
> 		<p><strong>Marker Values</strong></p>
> 		<p>Enter your Y-DNA marker values separated by commas.<br />For example, "13,24,14,10,11-14,12,12,12,13,14,30,17,9-10,11,11,24,15,19,30,15-15-16-17" (without quotes).<br />or with blanks after the comma for readability, "13, 24, 14, 10, 11-14, 12, 12, 12, 13, 14, 30, 17, 9-10, 11, 11, 24, 15, 19, 30,1 5-15-16-17" (without quotes).</p>
> 		<p>Note that Y-DNA STRs that have multiple values must be entered using a dash between the values since the number of multiple values can be variable</p>
81,85c115,116
< 		<span class="optionhead">Haplogroup</span>
< 		<p>A haplogroup is a genetic population of people who share a common ancestor on the patrilineal or matrilineal line. 
< 			Haplogroups are assigned letters of the alphabet (A-T), and refinements (SNPs) consist of additional number and letter combinations.</p>
< 		<p>An SNP (Single-nucleotide polymorphism) happens when a single place in the genome sequence is altered during the cell formation process and this mutation 
< 			persists in the progeny. A person has many inherited SNPs that together create a unique (UEP) DNA pattern for that individual.</p>
---
> 		<strong>SNPs</strong></p>
> 		<p>An SNP (Single-nucleotide polymorphism) happens when a single place in the genome sequence is altered during the cell formation process and this mutation persists in the progeny. A person has many inherited SNPs that together create a unique (UEP) DNA pattern for that individual.</p>
87,90d117
< 		<p>The confirmed checkbox is used to indicate that the test provided a confirmed haplogroup as opposed to a predicted one. Because a haplogroup consists of similar haplotypes, it is possible to predict a haplogroup from the haplotype. A SNP test is required to confirm the haplogroup prediction. Not all the testing companies offer SNP testing, and consequently their customers' haplogroup predictions are sometimes inaccurate.</p>
< 		
< 		<span class="optionhead">HVR1/HVR2/Coding region Differences, Extra mutations</span>
< 		<p>Enter your mtDNA test results separated by commas.<br />For example, "A16129G,T16187C,C16189T,T16223C,G16230A,T16278C,C16311T,C16519T".<br />There is not currently a program that compares the HVR1, HVR2, and Coding Region values like there is to compare the Y-DNA markers</p>
92c119
< 		<span class="optionhead">Significant SNPs</span>
---
> 		<p><strong>Significant SNPs</strong></p>
95,96c122,123
< 		<span class="optionhead">Terminal SNP</span>
< 		<p>A terminal SNP is the defining SNP of the latest branch of a haplogroup known by current research. It should be unique and constant in time.</p>
---
> 		<p><strong>Terminal SNP</strong></p>
> 		<p>A terminal SNP is the defining SNP of the latest branch of a haplogroup known by current research. It should be unique and constant in time. Sometimes “terminal SNP� is used to mean the SNP for which a man has most recently tested.</p>
97a125,197
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Top</a></p>
> 		<a name="mtdna"><p class="subheadbold">mtDNA Test Result Fields</p></a>
> 		
> 		<p><span class="optionhead">Mitochondrial DNA (mtDNA) </span> traces your ancestry from your mother to her mother, her mother's mother, and so forth and has two major parts, the control region and the coding region. The control region is often called the hypervariable region (HVR) and is further divided into two hypervariable regions
> 		<ul>
> 		<li><strong>HVR1</strong> which runs from nucleotide 16001 to nucleotide 16569. </li>
> 		<li><strong>HVR2</strong> which runs from nucleotide 00001 to nucleotide 00574. </li>
> 		<li>The <strong>coding region (CR)</strong> is the part of your mtDNA genome that contains genes which runs from nucleotide 00575 to nucleotide 16000.</li></ul></p>
> 		<p>The sbove information on mtDNA was extracted from the <a href="https://www.familytreedna.com/learn/mtdna-testing/parts-mitochondrial-dna-mtdna-hvr1-hvr2-coding-region/" target="_blank">The Family Tree DNA Learning Center</a></p>
> 
> 		<p><strong>Reference Sequence</strong></p>
> 		<p> You can select one of two reference sequence for the mtDNA test result fields.  Family Tree DNA provides both sequence, so you need to chose which version of the results you are entering in the input fields.
> 		<ul><li><strong>RSRS</strong> - Reconstructed Sapiens Reference Sequence is a mitochondrial DNA (mtDNA) reference sequence that uses both a global sampling of modern human samples and samples from ancient hominids. It was introduced in early 2012 as a replacement for the rCRS (revised Cambridge Reference Sequence). The RSRS keeps the same numbering system as the CRS, but represents the ancestral genome of Mitochondrial Eve, from which all currently known human mitochondria descend.</li>
> 		
> 		<li><strong>rCRS</strong> - Revised Cambridge Reference Sequence for human mitochondrial DNA was first announced in 1981 leading to the initiation of the human genome project.</li></ul> </p>
> 			
> 		<p><span class="optionhead">HVR1/HVR2/Coding region Differences, Extra mutations</span></p>
> 		<p>Enter your mtDNA test results in the provided input fields separated by commas.<br />For example, "A16129G,T16187C,C16189T,T16223C,G16230A,T16278C,C16311T,C16519T".<br />You can also enter the results with a blank after the comma for increased reasability, for example "A16129G, T16187C, C16189T, T16223C, G16230A, T16278C, C16311T, C16519T" (without the quotes)</p>
> 
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Top</a></p>
> 		<a name="atdna"><p class="subheadbold">atDNA Test Result Fields</p></a>
> 
> 		<p><span class="optionhead">Autosomal DNA (atDNA) </span> checks your autosomal chromosomes, that is the other 22 pairs beyond the sex-linked X and Y chromosomes. Autosomal DNA tests may help identify relatives who share recent ancestors. The more segments you share and the greater the length of those segments, the more closely related you are.</p>
> 		
> 		<p><strong>Shared DNA</strong><br />
> 		Shared DNA segments, also referred to as ‘matching segments’, are the sections of DNA that are identical between two individuals. These segments were most likely inherited from a common ancestor. When deciding which DNA matches to pursue, follow up on the ones with more than one large segment; those are your closer relatives, the ones whose trees may be easier to connect to yours.</p>
> 		
> 		<p><strong>Total shared cMs</strong><br />
> 		This is the sum of the autosomal DNA, given in centimorgans (cM), that you and your genetic match share.<br />See <a href="https://dnapainter.com/tools/sharedcmv4" traget="_blank">The Shared cM Project Tool</a> for the relationship probabilities based on the total shared cMs.</p> 
> 		
> 		<p><strong>shared segments</strong><br />
> 		Number of shared segments in this shared DNA match. The more segments you share and the greater the length of those segments, the more closely related you are.</p>
> 		
> 		<p><strong>Largest Segment</strong><br />
> 		Segments which share a large number of centiMorgans in common are more likely to be of significance and to indicate a common ancestor within a genealogical timeframe.  This is the largest shared seqment in this DNA match.</p>
> 		
> 		<p><strong>Chromosome No</strong><br />
> 		>This is the chromosome number of the largest matching segment.</p>
> 		
> 		<p><strong>Segment Start</strong><br />
> 		This is the starting location of the largest matching shared DNA segment</p>	
> 		
> 		<p><strong>Segment End</strong><br />
> 		This is the ending location of the largest matching shared DNA segment</p>
> 		
> 		<p><strong>centiMorgans</strong><br />
> 		In genetic genealogy, a centiMorgan (cM) or map unit (m.u.) is a unit of recombinant frequency which is used to measure genetic distance.  This is the number of cMs in the largest matching seqment.</p>
> 		
> 		<p><strong>Matching SNPs</strong><br />
> 		This is the number of SNPs for the largest matching segment,</p>
> 		
> 		<p><strong>X-Match</strong><br />
> 		This field indicates whether the autosomal DNA match also matches on the X-chromosome.</p>
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Top</a></p>
> 		<a name="common"><p class="subheadbold">Common Test Result Fields</p></a>
> 		
> 		<p>The following fields are common to all test types>/p>
> 
105c205
< 		<p>This field applies to all test types and will be auto-filled with comma separated ancestral surnames of the person who took the Y-DNA and mtDNA tests only<br />The surnames returned depends on the test type and you may edit any way you like.<br />In Admin >> Setup >> Configuration >> General Settings>>Names there is an option for surname exclusion such as unknown or UNKNOWN and an option to display the surnames in uppercase.</p>
---
> 		<p>This field applies to all test types and will be auto-filled with comma separated ancestral surnames of the person who took the Y-DNA and mtDNA tests only<br />The surnames returned depends on the test type and you may edit any way you like.<br />In Admin >> Setup >> Configuration >> General Settings>>Names there is an option for surname exclusion such as unknown or UNKNOWN and an option to display the surnames in uppercase.<br />There is now also an option for how many generations of your family tree the ancestral surnames will be returned for atDNA tests</p>
114,115c214
< 		<p>If there are web sites or pages associated with this test, enter them here. Put each link on a new line. Enter the site or page title and the URL, 
< 			separated by a comma. For example, "Ancestry.com,https://www.ancestry.com". If you don't include the site or page title, the link itself will be used as the title.</p>
---
> 		<p>If there are web sites or pages associated with this test, enter them here. Put each link on a new line. Enter the site or page title and the URL, separated by a comma. For example, "Ancestry.com,https://www.ancestry.com". If you don't include the site or page title, the link itself will be used as the title.</p>
128a228,229
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/DNA_Tests_Enhancements‎" target="_blank">DNA Tests Enhancements‎<a></li>
> 			<li><a href="https://tng.lythgoes.net/wiki/index.php/Compare_DNA_Test_Results‎" target="_blank">Compare DNA Test Results‎<a></li>
diff -r TNG/languages/English/eventtypes_help.php TNG1403/languages/English/eventtypes_help.php
3c3
< echo help_header("Help: Custom Event Types");
---
> echo help_header("Help: Event / Attribute Types");
17c17
< 		<span class="largeheader">Help: Custom Event Types</span>
---
> 		<span class="largeheader">Help: Event / Attribute Types</span>
35c35
< 		<p>Locate existing Custom Event Types by searching for all or part of the <strong>Tag, Type/Description (for EVEN events)</strong> or <strong>Display</strong>. 
---
> 		<p>Locate existing Event or Attribute Types by searching for all or part of the <strong>Tag, Type/Description (for EVEN events)</strong> or <strong>Display</strong>. 
37c37
< 		Searching with no options selected and no value in the search box will find all Custom Event Types in your database. Search options include:</p>
---
> 		Searching with no options selected and no value in the search box will find all Event / Attribute Types in your database. Search options include:</p>
40c40
< 		Choose an option from this dropdown box to limit the search to Custom Event Types associated with
---
> 		Choose an option from this dropdown box to limit the search to Event / Attribute Types associated with
44c44
< 		Select one of these options to limit the search to Custom Event Types that are being <strong>accepted</strong> or those
---
> 		Select one of these options to limit the search to Event / Attribute Types that are being <strong>accepted</strong> or those
63c63
< 		<a name="add"><p class="subheadbold">Adding or Editing Custom Event Types</p></a>
---
> 		<a name="add"><p class="subheadbold">Adding or Editing Event / Attribute Types</p></a>
65,69c65,68
< 		<p>The more common or "Standard" event types, such as Birth, Death, Marriage and a few others, are managed directly on the main People, Families, Sources and Repositories pages.
< 		All other events are associated with "Custom" event types
< 		and are managed in the <strong>Other Events</strong> sections of the People, Families, Sources and Repositories pages. Before you can enter one of these "other"
< 		events, you must have a record for the associated Custom Event Type. TNG automatically sets up Custom Event Types for all non-standard events included in
< 		your GEDCOM file, but you may also set up Custom Event Types by hand.</p>
---
> 		<p>The more common or "standard" event types, such as Birth, Death, Marriage and a few others, are managed directly on the main People, Families, Sources and Repositories pages.
> 		All other events and attributes are managed in the <strong>Other Events / Attributes</strong> sections of the People, Families, Sources and Repositories pages. Before you can enter one of these "other"
> 		events, you must have a record for the associated Event / Attribute Type. TNG automatically sets up Event / Attribute Types for all non-standard events included in
> 		your GEDCOM file, but you may also set up types by hand.</p>
71c70
< 		<p>To add a new Custom Event Type, click on the "Add New" tab, then fill out the form. To make changes to an existing Custom Event Type, use
---
> 		<p>To add a new Event / Attribute Type, click on the "Add New" tab, then fill out the form. To make changes to an existing type, use
73c72
< 		When adding or editing a Custom Event Type, take note of the following:</p>
---
> 		When adding or editing a type, take note of the following:</p>
76,77c75,76
< 		<p>Choose an option from this dropdown box to associate this custom event type with individuals, families, sources
< 		or repositories. A single custom event type may not be associated with more than one of these options. The
---
> 		<p>Choose an option from this dropdown box to associate this event or attribute type with individuals, families, sources
> 		or repositories. A single event or attribute type may not be associated with more than one of these options. The
101c100
< 		<p>To accept imported data corresponding to this custom event type, select <em>Accept</em>. To reject data corresponding to this type and cause it to not
---
> 		<p>To accept imported data corresponding to this event or attribute type, select <em>Accept</em>. To reject data corresponding to this type and cause it to not
112c111
< 	   	<p><span class="optionhead">Required fields:</span> You must select or enter a GEDCOM tag for your event. If you choose "EVEN" (generic custom event) for
---
> 	   	<p><span class="optionhead">Required fields:</span> You must select or enter a GEDCOM tag for your event. If you choose "EVEN" (generic event) for
123c122
< 		<p>To flag multiple custom event types as <strong>Accept</strong> or <strong>Ignore</strong> at the same time, check the Select box next to each Custom Event Type
---
> 		<p>To flag multiple types as <strong>Accept</strong> or <strong>Ignore</strong> at the same time, check the Select box next to each Event / Attribute Type
132,134c131,133
< 		<a name="delete"><p class="subheadbold">Deleting Custom Event Types</p></a>
< 		<p>To delete one Custom Event Type, use the <a href="#search">Search</a> tab to locate the item, then click on the Delete icon next to that record. The row will
< 		change color and then vanish as the Custom Event Type is deleted. To delete more than one record at a time, check the box in the Select column next to each record to be
---
> 		<a name="delete"><p class="subheadbold">Deleting Event / Attribute Types</p></a>
> 		<p>To delete one Event / Attribute Type, use the <a href="#search">Search</a> tab to locate the item, then click on the Delete icon next to that record. The row will
> 		change color and then vanish as the Event / Attribute Type is deleted. To delete more than one record at a time, check the box in the Select column next to each record to be
diff -r TNG/languages/English/importconfig_help.php TNG1403/languages/English/importconfig_help.php
31,33c31
< 		<span class="optionhead">Save Import State</span>
< 		<p>If your data import or export fails to complete for any reason, select this option and rerun the import/export. If it fails again, click on the link to resume and the import/export will continue where it left
< 		off. For imports, this option only works if your GEDCOM file is already in your GEDCOM folder (it does not work with files uploaded and imported directly from the Data Import screen).</p>
---
> 		<p>Note: For added security regarding your GEDCOM files, check the box labeled "Store in config path" to have TNG keep the GEDCOM files in that location. You must move the GEDCOM folder to that location yourself prior to saving this value or immediately afterward.</p>
64c62
< 		this field blank or set it to zero to prevent the Private flag from ever getting set in this manner.</p>
---
> 		this field blank or set it to zero to prevent the Private flag from getting set in this manner.</p>
68c66,70
< 		this field blank or set it to zero to prevent the Living flag from ever getting set in this manner.</p>
---
> 		this field blank or set it to zero to prevent the Living flag from getting set in this manner.</p>
> 
> 		<span class="optionhead">Mark family living if married less than this many years</span>
> 		<p>TNG will set the Living flag for a family during a GEDCOM import if the family's marriage occurred less than this many years. Leave
> 		this field blank or set it to zero to prevent the Living flag from getting set in this manner.</p>
74c76
< 		names for previously imported media and now import the name media without selecting this option, you will have duplicate files.</p>
---
> 		names for previously imported media and now import the same media without selecting this option, you will have duplicate files.</p>
121a124,127
> 		<span class="optionhead">Change incoming prefixes to match TNG settings</span>
> 		<p>If you receive a GEDCOM file from a different source, it's possible the file may include IDs with different ID prefixes or suffixes.
> 		To have TNG standardize the incoming IDs so that the prefixes match your settings, turn on this option.</p>
> 
diff -r TNG/languages/English/index_help.php TNG1403/languages/English/index_help.php
43c43
< 				<li><p><strong>Look at the Secondary Processes</strong> (under Import/Export) and perform any of those that you think necessary (see the Help
---
> 				<li><p><strong>Look at the Post-import Utilities</strong> (under Import/Export) and perform any of those that you think necessary (see the Help
88,90c88,90
< 			<li><p>PHP Reference: <a href="http://www.php.net" target="_blank">http://www.php.net</a>.</p></li>
< 			<li><p>MySQL Reference: <a href="http://www.mysql.com" target="_blank">http://www.mysql.com</a>.</p></li>
< 			<li><p>HTML Reference: <a href="http://www.htmlhelp.com" target="_blank">http://www.htmlhelp.com</a>.</p></li>
---
> 			<li><p>PHP Reference: <a href="https://php.net" target="_blank">https://php.net</a>.</p></li>
> 			<li><p>MySQL Reference: <a href="https://mysql.com" target="_blank">https://mysql.com</a>.</p></li>
> 			<li><p>HTML Reference: <a href="https://htmlhelp.com" target="_blank">https://htmlhelp.com</a>.</p></li>
92a93
> 		<p>Need research help? Try <a href="https://legacytree.com/tng" target="_blank">LegacyTree Genealogists</a>.</p>
diff -r TNG/languages/English/logconfig_help.php TNG1403/languages/English/logconfig_help.php
28c28
< 		<span class="optionhead">Log File Name</span>
---
> 		<span class="optionhead">Log File Name (Public)</span>
31,32c31,37
< 		<span class="optionhead">Max Log Lines</span>
< 		<p>Max Log Lines indicates how many actions should be
---
> 		<span class="optionhead">Log File Name (Admin)</span>
> 		<p>The log file where actions in the Admin area are recorded. You shouldn't have to change this from "genlog.txt".</p>
> 
> 		<p>Note: For added security regarding your log files, check the box labeled "Store in config path" to have TNG keep the log files in that location. You must move the log files to that location yourself prior to saving this value or immediately afterward.</p>
> 
> 		<span class="optionhead">Max Log Lines (Public)</span>
> 		<p>Max Log Lines indicates how many actions relating to the public side should be
34a40,42
> 		<span class="optionhead">Max Log Lines (Admin)</span>
> 		<p>Indicates how many actions should be retained at any one time in the Admin log file. If this number gets too high, you may experience a performance hit.</p>
> 
44,49d51
< 		<span class="optionhead">Log File Name (Admin)</span>
< 		<p>The log file where actions in the Admin area are recorded. You shouldn't have to change this from "genlog.txt".</p>
< 
< 		<span class="optionhead">Max Log Lines (Admin)</span>
< 		<p>Indicates how many actions should be retained at any one time in the Admin log file. If this number gets too high, you may experience a performance hit.</p>
< 
diff -r TNG/languages/English/mapconfig_help.php TNG1403/languages/English/mapconfig_help.php
29,31c29,45
< 		<p>As of June 2016, you must get a map <strong>key</strong> from Google in order to use Google Maps on your site. You can obtain a key here:
< 		<a href="https://developers.google.com/maps/documentation/javascript/get-api-key#key" target="_blank">https://developers.google.com/maps/documentation/javascript/get-api-key#key</a>.
< 		After you receive your key, paste it into the <strong>Map Key</strong> field on the TNG Map Settings page. If later you decide not to use Google Maps,
---
> 		<p>You must get a map <strong>key</strong> from Google in order to use Google Maps on your site. To get a map key, you must also 
> 			have a Google user ID. If you are already signed up for Google Mail, you can use that user ID, otherwise you will need to create a new 
> 			Google account. You must also enable billing on your Google account. Once you have an account with billing enabled, you can obtain a key here:
> 			<a href="https://console.cloud.google.com/" target="_blank">https://console.cloud.google.com/</a>.</p>
> 		<p>Once you're there, first select your project. From the API library (section Maps) select and enable the following three keys: 
> 			Maps JavaScript API , Geocoding API, and Places API. Maps JavaScript API is needed to show the google map to your site visitors, 
> 			with a marker at the various places (place of birth, death, mariage etc). Geocoding API is used in the admin section of your 
> 			website to associate places with coordinates.
> 		</p>
> 		<p>Go to <a href="https://tng.lythgoes.net/wiki/index.php/Google_Maps_-_Getting_Started">https://tng.lythgoes.net/wiki/index.php/Google_Maps_-_Getting_Started</a> for more information.
> 
> <ul>
> <li>Generate the API key under "APIs &amp; Services (Credentials)", plus add your site address as an "HTTP referrer".</li>
> <li>Enable the "Maps Javascript API" under the "Google Maps" menu.</li>
> </ul>
> 
> 		<p>After you receive your key, paste it into the <strong>Map Key</strong> field on the TNG Map Settings page. If later you decide not to use Google Maps,
diff -r TNG/languages/English/media_help.php TNG1403/languages/English/media_help.php
90c90
< 		an absolute web address (for example, <em>http://www.thatsite.com/image.jpg</em>) in the field labeled "Media URL", and
---
> 		an absolute web address (for example, <em>https://www.thatsite.com/image.jpg</em>) in the field labeled "Media URL", and
171c171
< 		<p><strong>(Headstones only)</strong> The cemetery where the headstone is located. You must first add the cemetery
---
> 		<p>To associate this media item with a cemetery, select the cemetery from the dropdown box. Typically this is used with headstones to indicate where the headstone is located. You must first add the cemetery
185a186,188
> 		<span class="optionhead">Private</span>
> 		<p>Check to hide this item unless the user has access to private data.</p>
> 
245,247c248,250
< 		<span class="optionhead">Image Map</span>
< 		<p>This section will start out collapsed. To expand, click on the "Image Map" header, or the arrow next to it. This section allows you to link
< 		different portions of the image to individuals in your database, or to display short messages when the mouse pointer is over those portions.</p>
---
> 		<span class="optionhead">Image Tags</span>
> 		<p>This section will start out collapsed. To expand, click on the "Image Tags" header, or the arrow next to it. This section allows you to link
> 		different portions of the image to individuals, families, sources, repositories or places in your database, or to external URLs.</p>
251c254,255
< 		<p>For each region you want to link to an individual, first select the individual's tree, then define the region by drawing a rectangle on the image with your
---
> 		<p>For each region you want to link, first select the tree and entity type (individual, family, etc), OR enter the title and external URL for another web page. 
> 		Then define the region by drawing a rectangle on the image with your
254,257c258,261
< 		select your image coordinates. After the coordinates have been selected, a popup box will be displayed to allow you to find or enter the individual's ID. Enter
< 		all or part of the individual's name or ID to locate possible matches, then choose the correct individual from the candidates displayed. The
< 		box will close and the code for this region will be added to the Image Map box below the image. You may edit that code if necessary, or you
< 		may enter the image map code directly if desired.</p>
---
> 		select your image coordinates. After the coordinates have been selected, a popup box will be displayed to allow you to find or enter the entity's ID. Enter
> 		all or part of the name or ID to locate possible matches, then choose the correct item from the candidates displayed. The
> 		box will close and a box for this region will be added on top of the image. To select an existing region, click on the box. You can then drag the box to move it, or click the "X"
> 		in the upper right corner to delete it.</p>
diff -r TNG/languages/English/modhandler_help.php TNG1403/languages/English/modhandler_help.php
20,24c20,22
< 			<a href="#operation" class="lightlink">Operation</a> &nbsp; | &nbsp;
< 			<a href="#status" class="lightlink">Status</a> &nbsp; | &nbsp;
< 			<a href="#syntax" class="lightlink">Mod Syntax</a> &nbsp; | &nbsp;
< 			<a href="#files" class="lightlink">Config Files</a> &nbsp; | &nbsp;
< 			<a href="#batch" class="lightlink">Batch Operations</a> &nbsp; | &nbsp;
---
> 			<a href="#modlist" class="lightlink">Mod List</a> &nbsp; | &nbsp;
> 			<a href="#editor" class="lightlink">Mod Editor</a> &nbsp; | &nbsp;
> 			<a href="#viewlog" class="lightlink">View Log</a> &nbsp; | &nbsp;
26c24
< 			<a href="#analyze" class="lightlink">Analyze TNG Files</a> &nbsp; | &nbsp;
---
> 			<a href="#analyzer" class="lightlink">Analyze TNG Files</a> &nbsp; | &nbsp;
28c26,27
< 			<a href="#custtext" class="lightlink">Recommended Updates</a>
---
>       <a href="#recommended" class="lightlink">Recommended Updates</a> &nbsp; | &nbsp;
> 			<a href="#credits" class="lightlink">Credits</a>
42,60c41,43
< 		<p>The TNG 12 version of the Mod Manager is based on the Mod Manager originally developed by Brian McFadyen, updated by Sean Schwoere to work with the Joomla TNG Component, and updated in TNG 10.0.3 and 10.1 to provide a more integrated way to install, remove and manage modifications to the TNG software package that have been coded to work with this manager.</p>
< 		<p>The new Mod Manager provides a single line summary of the mod status which can be expanded to view the complete Description and errors when applicable.  The Affected Files List can be displayed by hovering over the + plus sign in the Files column.  You can also use the <strong>Expand All</strong> inner menu to expand all entries to show the status like the old Mod Manager used to do.  The Expand All option is helpful when filtering the list by <strong>Partially Installed</strong> or <strong>Cannot Install</strong> so you can see what the errors are.</p> 
< 		<p>The Mod Manager is connected into the TNG Administrative page for easy access. The Mod Manager adds the following folders to TNG:
< 		<ul>
< 			<li><strong>mods</strong> to contain the Mod configuration files and associated Mod support files. The mods folder can now be renamed.  The Mod Manager uses the $modspath variable to resolve the folder name.</li>
< 			<li><strong>extensions</strong> to contain some of the mod extensions that are installed by other Mod Manager config files. The extensions folder can now be renamed.  The Mod Manager uses the $extspath variable to resolve the folder name.</li>
< 			<li><strong>classes</strong> which contain the Object Orient Progamming classes that were split and enhanced from the previous managemods.class.php created by Sean Schwoere from Brian's original Mod Manager code.</li>
< 		</ul></p>
< 		<p>The <strong>Mod List</strong> tab now combines the previous Mod List and Batch Updates that was added by Rick Bisbee in TNG 10.0.3 to provide the capability to execute the same action against multiple mods. The Description and extended status can be displayed by clicking the right arrow in the Status column or anywhere on the line. Hovering over the line will high light the line to make it easier to select the status to expand.  Hovering over the + plus sign in the Files column will display the Affected Files list, that is the files modified, created, and copied by this mod.</p>
< 		<p>TNG v12 adds the following changes if the Show Other Developer Tools option is enabled: <ul><li>a click on the file name will open the Parser Table for that mod</li>
< 		<li>a click on the cfg file name will display the cfg file in another tab</li>
< 		<li>a <strong>Detail</strong> button in the Status cell acts as a toggle to expand or collapse the display of the file directives when the status is Installed or OK to Install.</li></ul></p>
< 		<p>The <strong>View Log</strong> tab was added by Ken Roy in TNG 10.0.3 to display the Mod Manager Log which is now split from the Admin Log.  The Mod Manager log is the reformated log from the Mod Manager created by Rick Bisbee and Robin Richmond in TNG 10.03 for easier readability of the actions.  The messages were also greatly simplified.</p>
< 		<p>The <strong>Options</strong> tab is a modification of the one added by Ken Roy in TNG 10.0.3 to allow changing some of the execution behavior of the Mod Manager.</p>
< 		<p>The <strong>Analyze TNG Files</strong> tab is an optional tab that can be enabled in the Options screen that allows you to select a TNG file and view which mods change that specific TNG file.</p> 
< 		<p>The <strong>View Parser Table</strong> tab is an optional tab that can be enabled in the Options screen by enabling the <strong>Show Other Development Tools</strong> that allows you to view how the mod is parsed by the Mod Manager.</p> 
< 		<p>The <strong>Recommended Changes</strong> tab is an optional tab that can be enabled in the Options screen that allows you to update your cust_text.php files if you did not do so as part of the TNG upgrade readme.</p> 
< <p>Additional information can be found in the <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager" target="_blank">Mod Manager</a> article and in the <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:TNG_Mod_Manager" target="_blank">TNG Mod Manager</a> category of articles on the TNG Wiki.</p>
< <p>You can view the <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Enhancements" target="_blank">Mod Manager</a> article in TNG Wiki to see what enhancements were made in TNG v12.</p>
---
>     <p>If you are new to TNG, the Mod Manager is a tool for administrators to install, manage and remove modifications to the TNG software package, either by downloading and installing "Mods" created by others from the TNGWiki, or by creating (and perhaps sharing) them yourself.</p>
> 
>     <p>A <b>Mod</b> is a text file using extension .cfg written with a code editor. It contains "directives" telling Mod Manager (MM) how to modify code in targeted files to install it. It can also copy files from an accompanying support folder, or even create new files. -- see the<i><a href="https://tng.lythgoes.net/wiki/index.php/Mod_Manager" target="_blank"> TNGWiki Mod Manager for details</a></i>.</p>
63a47
> 
65a50,51
>     <p style="float:right"><a href="#top">Top</a></p>
>     <a name="modlist"><p class="subheadbold">Mod List</p></a>
67,68c53
< 		<p style="float:right"><a href="#top">Top</a></p>
< 		<a name="operation"><p class="subheadbold">Operation</p></a>
---
>     <p>When selected from the TNG Admin page, Mod Manager (MM) displays a listing of all mods in the site's "mods" directory.  You can rename this directory in the Admin Setup >> General Settings >> Paths and Folders if you like.</p>
70,83c55
< 		<p>The Mod Manager examines the mods folder and reads each <strong>cfg</strong> file that it finds. The <strong>cfg</strong> files are directive files that describe the mod, the files and locations to be modified, and the code that is used in the modification.
< 		<p>The Mod Manager checks the following:
< 			<ul>
< 				<li>ensures the user is logged in
< 				<li>examines each code location and change
< 					<ul>
< 						<li>ensures the location can be found</li>
< 						<li>ensures the target location is unique</li>
< 						<li>identifies whether the target location has already been installed</li>
< 					</ul>
< 			<li>creates any specified folder or directory</li>
< 			<li>identifies new files to be created. If the file is marked as protected it will not be removed by the Uninstall or Clean Up.</li>
< 			<li>identifies files to be copied to the TNG root or a specified folder. If the file is marked as protected it will not be removed by the Uninstall or Clean Up.</li>
< 			</ul></p>
---
>     <p>If you have not yet loaded any mods into your site's "mods" directory, the MM listing will be empty. You can download hundreds of mods from the TNGWiki. They come in the form of zip files which you will have to unzip and upload to your site's "mods" folder using an FTP program such as FileZilla or WinSCP that you can get free from the Internet</p>
85,88c57
< 	</td>
< </tr>
< <tr class="databack">
< 	<td class="tngshadow">
---
>     <p>Before mods are displayed, Mod Manager checks each one to see if it is already Installed or Okay to Install, and looks for errors that would prevent it from being either <i>Installed</i> or <i>Removed</i>. The result is displayed in the mod listing <i>Status column</i>. Details can be seen by clicking on the arrow icon or status text and then on the <i>Detail button</i>.</p>
90,99c59,74
< 		<p style="float:right"><a href="#top">Top</a></p>
< 		<a name="status"><p class="subheadbold">Status</p></a>
< 			<p>The Mod Manager returns the following status:
< 			<ul>
< 			<li><strong>Ok to Install</strong> if the mod is not yet installed and the target locations can be identified, then the <strong>Install</strong> button is displayed</li>
< 			<li><strong>Installed</strong> if the mod is completely installed, the option to <strong>Uninstall</strong> the Mod is presented and the option to <strong>Edit</strong> parameters if any exist.  Mods with edit parameters are identified by[Option] after the Installed status.</li>
< 			<li><strong>Partially installed</strong> if the mod is partially installed, the <strong>Cleanup</strong> button is provided. A Clean up operation will attempt to remove any inserted code, restore and replaced code, and remove any created or copied files.</li>
< 			<li><strong>Cannot Install</strong> if the mod <strong>cannot</strong> be installed. You will need to expand the Status to get more detailed messages as to why the mod cannot be installed.</li>
< 			</ul>
< 		<p>For examples of the Mod Manager Status screens and how to interpret the various statuses, see <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Interpreting_Status" target="_blank">Mod Manager - Interpreting Status</a></p>
---
>     <p>All listed Mods have a color-coded installation status:
>       <ul>
>         <li>
>           <b>Okay to Install</b> (white) -- Modlister has confirmed that all directives in the Mod configuration file can be installed without error.
>         </li>
>         <li>
>           <b>Installed </b> (green) -- all components called for in the Mod configuration file are installed.
>         </li>
>         <li>
>           <b>Partially Installed</b> (orange) -- some of the Mod components are installed and some are not. This can happen if you refresh a TNG file that was part of a Mod installation.
>         </li>
>         <li>
>           <b>Cannot Install</b> (red) -- some of the Mod Configuration file cannot be installed, for example, because the target file is missing.
>         </li>
>       </ul>
>     </p>
101c76
< </p>
---
>     <h3>Filter Bar</h3>
103,106c78
< 	</td>
< </tr>
< <tr class="databack">
< 	<td class="tngshadow">
---
>     <p>At the top of the mod listing is a filter bar to limit the display to mods with a selected status, or to <b>All</b> mods or just those you <b>Select</b>. Selecting any filter except <b>All</b> will present a list with a check box for each displayed mod. Checking one or more boxes allows further processing of the selected mod(s).</p>
108,124c80
< 		<p style="float:right"><a href="#top">Top</a></p>
< 		<a name="syntax"><p class="subheadbold">Mod Syntax</p></a>
< 			<p>The Mod Manager syntax basically includes:
< 			<p><strong>Header section</strong> that includes</p>
< 				<ul><li>Name - the name of the mod, wiki article and file name</li>
< 				<li>Version - the version of the mod, where the first 3 period places represents the lowest TNG version to which the mod applies</li>
< 				<li>Description - provides a brief description of the mod, the Mod Developer's name, and a URL link to the TNG Wiki article for the mod.</li>
< 				</ul>
< 			</p>
< 			<p><strong>Target sections</strong> that specify the file that is the target of the change and includes the following directives. A note can now be added to the target.</p>
< 			<ul><li>Location - that specifies the code location to be changed. A note can now be added to the location.</li>
< 			<li>Action keyword - that specifies whether to replace or insert code before or after the location</li>
< 			</ul>
< 			</p>
< 			<p><strong>New File directives</strong> that create the file when the mod is installed</p>
< 			<p><strong>Copy File directives</strong> that copy the specified file to the TNG root (%copyfile) or to a subfolder (%copyfile2)</p>
< 		<p>For detailed information on the Mod Manager Syntax, see <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax" target="_blank">Mod Manager Syntax</a></p>
---
>     <p>For example, if you filter for mods that are <i>Okay to Install</i> and then hit <i>Go</i>, your listing will contain only those mods that are ready to be installed. Using the new check boxes on the filtered list, you can select one, a few or all of them, then hit the Install button and they will batch install.  Note the <i>Select All</i> and <i>Clear All buttons</i> to help with the check boxes.</p>
126a83
> <p><strong><font color="#990000">Caution:You should only do batch operations if you have a good backup of your website and can quickly restore it if the batch operations renders your site inoperable, which can easily happen if you do not delete previous versions of the mods.</font></strong></p>
128,131c85,107
< 	</td>
< </tr>
< <tr class="databack">
< 	<td class="tngshadow">
---
>   <p><strong>Note: We recommend that you batch Uninstall all your Installed mods and then batch Clean Up any remaining Partially Installed mods before doing a TNG upgrade.</strong></p>
> 
>    <p>The <b>Select</b> filter displays all mods and adds checkboxes. Select one or more of them and hit the  <i>Select button</i>. Mod Manager only shows the selected mods. This can be useful for isolating and testing a single mod without displaying or processing the others.</p>
> 
>   <p>If you check the <b>Lock</b> box for any filtered listing, it will remain filtered, even after doing page refreshes. The listing will stay locked until you uncheck it or apply a different filter.</p>
> 
>     <h3>Mod listing Columns</h3>
> 
>     <p>The first three columns are self-explanatory. Depending on the Mod Manager Display settings in the <i>Options tab</i>, you can click on the Mod Name and its Parse Table will be displayed in a new tab. Clicking on the Config File Name will show the contents of the mod's configuration file in a new tab.</p>
> 
>     <p>If the <b>Wiki</b> column contains the wiki icon (W), you can click on it to go to the TNGWiki article that contains a description and other information about the mod, as well as a mod download link.</p>
> 
>     <p>The fifth column is the <b>Status</b> column. It shows the color-coded installation status of the mod as explained above. Clicking on the status text opens a panel with a description and appropriate controls to manage the mod. If there is a <i>Detail</i> button you can see an itemized list of all actions taken or to be taken to manage the mod. Any errors will be displayed.</p>
> 
>     <p>For advanced users, error messages are often accompanied by an E-number. This refers to the line number in the MM file where the error occurred.  E-numbers in the Mod List are all generated by the classes/modlister.class.php file. Near that line number will often appear commentary explaining the nature of the error and suggesting possible fixes.</p>
> 
>     <p>If there are no errors, you simply press the appropiate control to Install or Uninstall (remove) a mod.</p>
>     <p>Some mods end up partly installed. When you see this status, hit the <i>Clean Up</i> button and MM will remove any installed components. You are usually left with a clean Mod that can be fully installed again.</p>
> 
>   <p>If the mod still remains Partially installed after several attemps to clean it up, you should notifiy the mod developer. To notify the developer click on the Wiki icon (W) to go to the TNGWiki page, then click on the <i>Mod Support</i> link. If there is no support link, <a href="#morehelp" >click here</a> for additional help.</p>
> 
> 
>     <p>The final column, <i>Files</i>, contains an icon for more information. Hover it and a popup window will tell you all the files that are modified or will be modified by this mod.</p>
133,134c109,125
< 		<p style="float:right"><a href="#top">Top</a></p>
< 		<a name="files"><p class="subheadbold">Config Files</p></a>
---
>     <a name="morehelp"><h3>Finding Additional Help</h3></a>
> 
>     <p>If you need more help, either with Mod Manager or with a particular Mod, you can do one of the following:
>     <ul>
>       <li>For help with <b>Mod Manager</b> bugs or issues
>       <ul>
>         <li>contact Rick Bisbee <a href="https://bisbeefamily.com/suggest.php?page=Mod Manager Issues" target="_blank">Here</a></li>
>         <li>contact Ken Roy: <a href="mailto:ken@royandboucher.com?subject=Mod&nbsp;Manager&nbsp;Help">Here</a></li>
>       </ul>
>       <li>For Help with a mod</li>
>         <ul>
>           <li>Contact the mod developer from the TNGWiki page associated with the mod</li>
>           <li>Go to the <a href="https://tng.community/index.php?/forums/" target="_blank"> TNG Forum</a> and search for the name of the mod. If you find nothing useful, you can create an account and leave a query for help from other users.</li>
>           <li>Use the <b>Email Discussion List</b> and ask your question. <a href="https://tng.lythgoes.net/wiki/index.php/TNG_Discussion_Forums" target="_blank"> Click here to get started</a>.</li>
>         </ul>
>     </ul>
>     </p>
136,146d126
< 		<span class="optionhead">Installing Mods</span>
< 		<p>The TNG Wiki provides information on <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Installing_Config_Files" target="_blank">Installing Config Files</a> to install the TNG mods.</p>
< 		
< 		<span class="optionhead">Interpreting Status</span>
< 		<p>The TNG Wiki provides information on <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Interpreting_Status" target="_blank">Interpreting Status</a>.</p>
< 		
< 		<span class="optionhead">Config File Syntax</span>
< 		<p>The TNG Wiki provides information on the <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Syntax" target="_blank">Mod Manager Syntax</a>.</p>
< 		
< 		<span class="optionhead">Creating Config Files</span>
< 		<p>The TNG Wiki provides information for the mod developers on the <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_-_Creating_Config_Files" target="_blank">Creating Config Files</a>.</p>
151a132,133
>     <p style="float:right"><a href="#top">Top</a></p>
>     <a name="editor"><p class="subheadbold">Mod Editor</p></a>
153,154c135
< 		<p style="float:right"><a href="#top">Top</a></p>
< 		<a name="batch"><p class="subheadbold">Batch Operations</p></a>
---
>     <p>The Mod (Parameter) Editor is accessed from the mod listings page.  If an installed mod has editable parameters, you will see it noted in the Mod Listing Status column as -- <i>Installed [Options]</i>. To edit parameters for the mod, open the Status panel and click on the "Edit Options" button. The editable parameters are the mod's user options, for example, to set the color for something.</p>
156,182c137,141
< 		<p>The Batch Operations function introduced in TNG 10.0.3 as a Batch Updates tab is now combined in the Mod List and allows specific actions on multiple mods using the Select Filter.  You must choose from the status filter list pull down and click <strong>Go</strong> to display the available controls for the specific status selected.  <strong>Delete</strong> is only available for the Partially Installed status if you enable the Option, which we recommend that you leave as No, except for when you need to delete multiple mods in the Partially Installed status, such as a prior version of the same mod. Likewise there is a Delete Installed mods option that will allow deleting installed mods without first uninstalling them.  This option was added to allow deleting previous versions of the same mod, if you forgot to delete them before installing the new version.  Here again it is recommend that you leave the option as No and just enable it when needed.  The <strong>Delete</strong> button is only shown on the Select list if both allow delete options are enabled.</p>
< 		<p><strong><font color="red">Caution:You should only use Batch Operations if you have a good backup of your website and can quickly restore it if the batch operations renders your site inoperable, which can easily happen if you do not delete previous versions of the mods.</font> Note that it is recommended that you batch Uninstall all your Installed mods and then batch Clean Up all Partially Installed mods before doing a TNG upgrade.</strong></p>
< 		<p>The Select Filter options are:
< 			<ul>
< 				<li><strong>All</strong> - displays all a list of all the .cfg files in the mods folder.  When you select a specific status then Action buttons will become available
< 				<li><strong>Ok to Install</strong> - displays a list of all the mods that can be</li>
< 					<ul>
< 						<li>Installed based on your selections and clicking the <strong>Install</strong> button</li>
< 						<li>Deleted from your mods folder based on your selections and clicking the <strong>Delete</strong> button</li>
< 					</ul>
< 				<li><strong>Installed</strong> - displays a list of all the mods that are currently installed that can be</li>
< 					<ul>
< 						<li>Removed based on your selections and clicking the <strong>Remove</strong> button</li>
< 					</ul>
< 				<li><strong>Partially Installed</strong> - displays a list of all the mods that are partially installed and must be</li>
< 					<ul>
< 						<li>Cleaned up based on your selections and clicking the <strong>Clean Up Selected</strong> button</li>
< 					</ul>
< 				<li><strong>Cannot Install</strong> - displays a list of all the mods that cannot be installed, either due to Bad Targets or Missing files, that can be</li>
< 					<ul>
< 						<li>Deleted from your mods folder based on your selections and clicking the <strong>Delete Selected</strong> button</li>
< 					</ul>
< 				<li><strong>Select</strong> - added in TNG v12 - displays a list of all the mods that can be selected regardless of status and then just returns those mods in the list</li>
< 					<ul>
< 						<li>The <strong>Delete</strong> button will only be available on the Select list if you Allow Delete Selected of Partially Installed Mods and Allow Delete of individually Installed Mods.  This capability was added mainly for the mod developer to clean up their testing environments.</li>
< 					</ul>
< 			</ul>
---
>     <p>The target file's behavior can be controlled by the value of the parameters. For example, a Mod user may be asked to enter the number of days he wishes to keep certain log files.</p>
> 
>     <p>There is no limit to the number of parameters a Mod can use.  Each paramter has a default value shown in the Mod Editor description panel on the left. The panel on the right contains a area for changing the parameter value.  There are also two buttons, one to Update the target file with the value in the input box, the other to reset the parameter with the default value.</p>
> 
>     <p><b>Whether entering strings or integers, it is not necessary to surround them with quotes</b>.  The Mod Editor will figure that out when updating values.</p>
187a147,149
>     <p style="float:right"><a href="#top">Top</a></p>
>     <a name="viewlog"><p class="subheadbold">View Log</p></a>
>     <p>Depending on user preferences in the Options tab, errors generated during Mod installation or removal will automatically open the error log so the administrator can see what went wrong.  Otherwise you can open the log to see the details of your operations.</p>
189,190c151,152
< 		<p style="float:right"><a href="#top">Top</a></p>
< 		<a name="options"><p class="subheadbold">Options</p></a>
---
>     <p>The log line shows the date and time, the attempted operation, the name and version of the Mod, the result and the functionary (Site Administrator) who performed the operation.
>     </p>
192,213c154,171
< 		<p>The Options allows you to specify some of the Mod Manager behavior for the 
< 		<p><strong>Mod Manager Log Options</strong> 
< 			<ul>
< 				<li><strong>Log File Name</strong> - allows you to specify the file name to be used for the Mod Manager log.  The default is <strong>modmgrlog.txt</strong>.</li>
< 				<li><strong>Max number of Transactions</strong> - allows you to specify how many log transactions to keep in the log. The default is <strong>200</strong> transactions.</li>
< 				<li><strong>Collapse Log display</strong> - allows you to specify if you want the View Log displayed in a collapsed or expanded format initially.  The default is <strong>Yes</strong> but can be changed to <strong>No</strong> to display the log expanded normally.</li>
< 				<li><strong>Redirect to Log For</strong> - allows you to specify if you want go to the Mod List to be redirected to the View Log on <strong>Errors Only</strong> or for <strong>All Transactions</strong>.  The default is to redirect on <strong>Errors Only</strong> which displays the View Log only if errors are encountered in the install, uninstall, clean up, or delete transaction.</li>
< 				<li><strong>Log full path for file actions</strong> - allows you to select No to only display the relative path for files in the log. The default is <strong>Yes</strong> to display the full absolute path.</li>
< 			</ul></p>
< 		<p><strong>Display Settings Options</strong> 
< 			<ul>
< 				<li><strong>Sort Lists by</strong> - allows you to specify on which column to sort the Mod List.  Options are Mod Name or Config File Name.  The default is <strong>Mod Name</strong>.</li>
< 				<li><strong>Use Fixed Headers</strong> - allows you to change the option so that fixed headers are not displayed.  This option is not noticable if you have a large monitor and few mods.  The default is <strong>Yes</strong> to display the fixed headers.  Note that regardless of this option setting, fixed headers will not be displayed for smart phones (mobile mode).</li>
< 				<li><strong>Adjust Fixed Headers</strong> - allows you to enable the adjust fixed headers jQuery when the fixed headers are not displayed correctly.  This option is only needed on certain monitors.  The default is <strong>No</strong> to not use the jQuery javascript to adjust the fixed headers.</li>
< 				<li><strong>Use Stripes</strong> - allows you to change the option not to use stripes when displaying the Mod List.  The default is <strong>Yes</strong> which uses the databackalt class to provide alternate color striping after N number of rows.</li>
< 				<li><strong>Stripe after number of rows</strong> - allows you to set the number of rows to display before the alternate color stripe is displayed.  The default is <strong>3</strong> rows of databack and then 3 rows of databackalt.</li>
< 				<li><strong>Remove spaces from file names in Mod List:</strong> - allows you to remove the blanks from the Mod Names before displaying them in the Mod Name list.  The default is <strong>No</strong> which will display the embedded blanks in the Mod Name which should match the TNG Wiki article name.</li>
< 				<li><strong>Show Analyze TNG Files tab</strong> - allows you to specify if you want the Analyzer TNG Files tab to be displayed.  The default is <strong>No</strong> which is to suppress the display of the Analyze TNG Files tab.</li>
< 				<li><strong>Show Other Developer tools</strong> - allows you to specify if you want the View Parser Table tab to be displayed.  The default is <strong>No</strong> which is to suppress the display of the View Parser Table tab.  This option also controls whether a click on the Mod Name will display the Parser Table for that specific mod, and whether a click on the Config File Name will show the config file in another tab.</li>
< 				<li><strong>Show Recommended Updates tab</strong> - allows you to specify if you want the Recommended Updates tab to be displayed.  The default is <strong>No</strong> which is to suppress the display of the Recommended Updates tab.  Note that this tab should not be necessary if you did the TNG v12 cust_text.php upgrade.</li>
< 			</ul></p>
< 		<p><strong>Other Options</strong> 
---
>     <p>To see the details, click on the log line.  A panel will open. Each directive (starting with a %character) shows a line number in the Mod configuration file where the directive was executed, and the result.
>     </p>
> 
>     <p>As noted previously, errors are accompanied by an E-number referencing the line number in the TNG Mod Manager file where the error occurred.  If it occurred during an attempted installation, the E-number will refer to the classes/modinstaller.class.php file.  Opening that file to the line number, you will often see nearby commentary explaining the error and suggesting solutions.</p>
> 
>     <p>For help with directives and how to use them, please consult the TNGWiki.  You can also click on the <b>Mod Syntax</b> link just below the Mod Manager tabs on most MM screens.</p>
> 
> </td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Top</a></p>
>     <a name="options"><p class="subheadbold">Options</p></a>
> 		<p>The <strong>Options</strong> tab opens a user preference screen dividied into three sections.</p>
> </p>In the <b>Mod Manager Log</b> section you can enter preferences concerning the log file. Under the <i>Log File Name</i> you can actually enter a server path to place your log outside the area of the website that can be accessed by a browers.  The default is to put it in the TNG root directory.</p>
>     <p><b>Display Settings</b> is where you show or hide the Mod Manager page tabs.</p>
>     <p><b>Other</b> lets you decide how to configure Mod Manager's ability to delete mods and their support folders.</p>
>     <p>
215,219c173,179
< 				<li><strong>Allow Delete Selected on Partially Installed Mods</strong> - enables the <strong>Delete</strong> button on the Partially Installed filtered list screen that allows deleting more than one mod at a time, such as deleting the prior versions of mods that were not deleted prior to installing the newer versions.  The default is <strong>No</strong>.  We recommend that you only enable this option when you need it to delete multiple mods without having to uninstall the current versions to delete the prior versions of the mod when you forgot to Uninstall and Delete previous versions of the mod before installing a new version and that you normally leave this option set to No and reset the option to No after you deleted previous versions of the mod that show as partially installed.</li>
< 				<li><strong>Allow Delete of individually Installed Mods</strong> - allows you to turn on the option to display a Delete button next to the Uninstall button for individually installed mods, such as deleting the prior version of a mod that was not deleted prior to installing the newer version.  We recommend that you only enable this option when you need it to delete a previous version of a mod without having to uninstall the current version in order to delete the prior version and that you normally leave the option set to <strong>No</strong> and reset the option to No after you deleted previous versions of the mod that show as installed..</li>
< 				<li><strong>Allow Delete support folder when mod is deleted:</strong> - allows you to turn on the option to delete the folder(s) associated with a mod when deleting the mod.  The default is <strong>No</strong>.  We recommend that you only enable this option if you understand the risk that unintended folders could be deleted. We believe this risk is very small..</li>
< 			</ul></p>
< 	</td>
---
> 				<li><strong>Allow Delete Selected on Partially Installed Mods</strong> - enables the <strong>Delete</strong> button on the Partially Installed filtered list screen that allows deleting more than one mod at a time, such as deleting the prior versions of mods that were not deleted before installing the newer versions.  The default is <strong>No</strong>.  We recommend that you only enable this option when you need it to delete multiple mods without having to uninstall the current versions to delete the prior versions of the mod when you forgot to Uninstall and Delete previous versions of the mod before installing a new version and that you normally leave this option set to No and reset the option to No after you deleted previous versions of the mod that show as partially installed.</li>
> 				<li><strong>Allow Delete of individually Installed Mods</strong> - allows you to turn on the option to display a Delete button next to the Uninstall button for individually installed mods, such as deleting the prior version of a mod that was not deleted before installing the newer version.  We recommend that you only enable this option when you need it to delete a previous version of a mod without having to uninstall the current version in order to delete the prior version and that you normally leave the option set to <strong>No</strong> and reset the option to No after you deleted previous versions of the mod that show as installed..</li>
> 				<li><strong>Allow Delete support folder when mod is deleted</strong> - some mod configuration files are accompanied by a support folder containing files to be copied, for example, or language support files.  This option allows you to to delete the mod's support folder when deleting the mod.  The default is <strong>No</strong>.  We recommend that you only enable this option if you understand the risk that unintended folders could be deleted. We believe this risk is very small.        </li>
> 		</ul>
>   </p>
>     <p>Set the preferences as you like and hit the <i>Save</i> button.</p>
> </td>
221d180
< 
223a183,185
>     <p style="float:right"><a href="#top">Top</a></p>
>     <a name="analyzer"><p class="subheadbold">Analyze TNG Files</p></a>
> 		<p>The <strong>Analyze TNG Files</strong> tab is an optional tab that can be enabled in the Options screen.</p>
225,226c187
< 		<p style="float:right"><a href="#top">Top</a></p>
< 		<a name="analyze"><p class="subheadbold">Analyze TNG Files</p></a>
---
> <p>This is an advanced tool that allows you to select a TNG file and view which mods change or will change that specific TNG file. If a file does not appear in the left-hand list, it means that no mods are targeting it.</p>
228c189
< 		<p>Created by Rick Bisbee this tool located under the <strong>Analyze TNG Files</strong> tab was previously provided as a mod. This tool lets developers examine mods to see precisely how they interact with each other. Two mods changing the same block of code almost always results in Mod Manager errors.  You must enable the <strong>Show Analyzer TNG Files tab</strong> by setting the Options to Yes if want the Analyze TNG Files tab to be displayed.</p>
---
> <p>When you select a file in the left-hand column, it will be displayed in the right-hand column with the names and status of mods that will affect it. From there you can click the link to "Show modification" and see the actual change it makes to the target file. <i>It is not within the scope of this Help file to discuss Mod configuration directives and how they work</i>.  Please consult the TNGWiki for information.</p>
230,231c191,192
< 		<p>The analyzer works by examining every mod in the mods folder and cataloging which target files and which blocks of code each one modifies. It then lists the affected file names in the left hand column.  Selecting one of those target files displays a list on the right showing all the mods that change it.  Each mod shown on the right has a link to open a section of the page displaying the actual modifications made by the Mod Manager Config file. A user can compare changes to the target file to see where potential conflicts might be. </p>
< 		<p>This is helpful not only to find conflicts between two mods but also to know which mods need to be cleaned up and re-installed after replacing the given target file. </p>
---
> <p>If you have chosen in the Options tab, Display Settings, "Show actions in Mod Analyzer," you will also see links to allow you to Install, Uninstall or Delete the Mod right from this screen, depending on it's current status.</p>
> <p>At the top of the lising you will see a filter bar with selectors for <i>All Mods</i>, <i>Installed Mods Only</i>, or <i>Installed+Partially Installed Mods</i>. Selecting <i>Installed Mods Only</i> and clicking on <i>Submit Query</i> will limit the Files in the left-hand column to those which are affected by currently Installed mods only.</p>
233,234c194,198
< 		<p>The TNG Wiki provides additional information for the mod developers on <a href="https://tng.lythgoes.net/wiki/index.php?title=Using_the_Mod_Analyzer" target="_blank">Using the Mod Analyzer</a>.</p>
< 	</td>
---
> 		<p>This tool is helpful not only to find conflicts between two mods but also to know which mods need to be cleaned up and re-installed after replacing the given target file. </p>
> 
>     <p>The TNG Wiki provides additional information for the mod developers on <a href="https://tng.lythgoes.net/wiki/index.php?title=Using_the_Mod_Analyzer" target="_blank">Using the Mod Analyzer</a>.</p>
> 
> </td>
238,242c202,205
<     <td class="tngshadow">
< 
<         <p style="float:right"><a href="#top">Top</a></p>
<         <a name="parser"><p class="subheadbold">View Parser Table</p></a>
<         <p>This tool is designed mainly for developers. The Parser Table shows how the Mod Manager parsed the mod config file (.cfg) for processing its components into a table, which is then passed to other mod manager scripts for further processing. If there is a problem with a mod, the first place to check is the parse table to see if all the mod's directives and arguments are being captured properly.</p>
---
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Top</a></p>
>     <a name="parser"><p class="subheadbold">View Parser Table</p></a>
>     <p>This tool is designed mainly for debugging Mods. The Parser Table shows how the Mod Manager parsed the Mod config file (.cfg) directives.  It is shown in the form of table, with each row representing a Mod directive.  The data shown in the table is passed to other mod manager scripts for further processing -- installing, removing, and so on. If there is a problem with a Mod, a good place to start is with the parse table to see if all the Mod's directives and arguments are being captured properly.</p>
244c207
<       <p>You can use this tab to select a mod from a list whose table you want to view, or alternatively you can click on the mod name in the Mod List to view the parse table for that mod, if you enabled the Show Other Developer Tools option.</p>
---
>       <p>You can use this tab to select a mod from a list whose table you want to view, or alternatively you can click on the mod name in the Mod List to view the parse table for that mod, <i>if you've enabled the Show Other Developer Tools option</i>.</p>
247a211,212
>       <p><i>It is not within the scope of this Help file to discuss Mod configuration directives and how they work</i>.  Please consult the TNGWiki for information.</p>
> 
252c217,220
<     <td class="tngshadow">
---
> 	<td class="tngshadow">
>     <p style="float:right"><a href="#top">Top</a></p>
>     <a name="recommended"><p class="subheadbold">Recommended Updates</p></a>
> 		<p>The <strong>Recommended Changes</strong> tab is an optional tab that can be enabled in the Options screen that allows you to update your cust_text.php files if you did not do so as part of the TNG upgrade readme.</p>
254,257d221
<         <p style="float:right"><a href="#top">Top</a></p>
<         <a name="custtext"><p class="subheadbold">Recommended Changes</p></a>
<         <p>The Recommended Changes tab is an optional tab that can be enabled in the Options screen that allows you to update your cust_text.php files if you did not do so as part of the TNG upgrade readme.</p>
< 		<p>It is intended to be used if a mod cannot be installed because it is looking for the new comment string at the top of the cust_text.php files starting with TNG v12.  The option will be turned off when you click the Update button to change your existing cust_text.php files.  The code checks whether the files have previously been updated.</p>
259c223,227
<     </td>
---
> 
> <p>Additional information can be found in the <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager" target="_blank">Mod Manager</a> article and in the <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:TNG_Mod_Manager" target="_blank">TNG Mod Manager</a> category of articles on the TNG Wiki.</p>
> <p>You can view the <a href="https://tng.lythgoes.net/wiki/index.php?title=Mod_Manager_Enhancements" target="_blank">Mod Manager</a> article in TNG Wiki to see what enhancements were made in TNG v12.</p>
> 
> 	</td>
261a230,342
> <tr class="databack">
>   <td class="tngshadow">
>     <p style="float:right"><a href="#top">Top</a></p>
>     <a name="credits"><p class="subheadbold">Credits</p></a>
> 
>       <table style='table-layout:fixed;width:100%'>
>         <tr>
>           <td style='width:20%;vertical-align:top;'>
>             Brian McFadyen
>           </td>
>           <td style='width:80%'>
>             <ul><li>author</li></ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Sean Schwoere
>           </td>
>           <td>
>             <ul>
>                 <li>integration for Joomla</li>
>                 <li>better integration to install, remove and manage mods</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Ken Roy
>           </td>
>           <td>
>             <ul>
>                 <li>development team leader, versions 12 - 14</li>
>                 <li>created the View Log tab</li>
>                 <li>created the Options tab</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Rick Bisbee
>           </td>
>           <td>
>             <ul>
>                 <li>lead programmer, versions 12 - 14</li>
>                 <li>added batch processing</li>
>                 <li>added View Parser Table tab</li>
>                 <li>added Ananlyze TNG Files tab</li>
>                 <li>refactored TNG code for maintenance, v14</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Jeff Robson
>           </td>
>           <td>
>             <ul>
>                 <li>beta testing team, version 12</li>
>                 <li>added the Affected Files tab</li>
>                 <li>major contributions to the styling</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Robin Richmond
>           </td>
>           <td>
>             <ul>
>                 <li>beta testing team, version 12</li>
>                 <li>provided code to break long lines of text with no spaces in them used primarily in the MM Status column</li>
>                 <li>major contributions to the MM log display</li>
>             </ul>
>           </td>
>         </tr>
> 
> 
>         <tr>
>           <td style='vertical-align:top;'>
>             Michel Kirsh
>           </td>
>           <td>
>             <ul>
>                 <li>beta testing team, version 14</li>
>                 <li>major update to Analyze TNG Files</li>
>             </ul>
>           </td>
>         </tr>
> 
>         <tr>
>           <td style='vertical-align:top;'>
>               TNGv14 beta test team
>           </td>
>           <td>
> 
>             <ul>
>                 <li>Mogens C. Fenger</li>
>                 <li>William Herndon</li>
>                 <li>Michel Kirsch</li>
>                 <li>Ron Krzmarzick</li>
>                 <li>Roger Moffat</li>
>                 <li>Jan-Thore Solem</li>
>             </ul>
>           </td>
>         </tr>
>       </table>
>   </td>
> </tr>
263,264c344
< </body>
< </html>
\ No newline at end of file
---
> </body>
\ No newline at end of file
diff -r TNG/languages/English/pedconfig_help.php TNG1403/languages/English/pedconfig_help.php
123c123
< 		<span class="optionhead">Show Notes on Register</span>
---
> 		<span class="optionhead">Show Notes and Custom Events on Register</span>
126c126
< 		<span class="optionhead">Register Generations</strong><br/>
---
> 		<span class="optionhead">Register Generations</span><br/>
137,151c137,162
< 		<a name="rel"><p class="subheadbold">Relationship Chart</p></a>
< 		<span class="optionhead">Initial Relationships</span>
< 		<p>When a new Relationship chart is requested, this is how many relationships TNG will try to find. As soon as that many
< 		relationships are found, the process will stop. If your tree contains no complicated relationships, you may want to set
< 		this to 1 in order to save processing time.</p>
< 
< 		<span class="optionhead">Max Relationships</span>
< 		<p>If the user believes that more relationships exist, they may want to increase the number of relationships TNG will
< 		try to find. This number represents to most relationships you will allow the program to search for. Try not to set it
< 		higher than the level of complexity in your tree. The lower this number is, the more time you will save people as
< 		they view this chart. For example, if only one relationship exists between two people but you are searching for five,
< 		TNG will continue searching in vain after the first relationship is found.</p>
< 
< 		<span class="optionhead">Max Generations</span>
< 		<p>The maximum number of generations you will allow visitors to search at one time on the Relationship page. This will also be the initial default on that page.</p>
---
> 		<a name="rel"><p class="subheadbold">Connections Chart</p></a>
> 		<span class="optionhead">Max number of connection search runs</span>
> 		<p>The maximum number of connections that can be found in any search. Set between 1 and 9999. Note that only some rare runs result in displaying a path.
> 			If set to 1 only the shortest path is searched. The default is 99.</p>
> 
> 		<span class="optionhead">Max length of connection paths</span>
> 		<p>The maximum number of steps in each connection. The default is 30.</p>
> 
> 		<span class="optionhead">Display textual path statement</span>
> 		<p>Choose whether to display a textual description of each path above the graphical presentation by default.</p>
> 
> 		<span class="optionhead">Show person boxes in compact form</span>
> 		<p>Choose whether to display each person box in minimal form, with no thumb photos and some full name elements shortened.
> 			In other words, if you set this to <i>false</i>, the thumbnails and complete full names are displayed. If you set it to <i>true</i>
> 			the diagram will become more compact.</p>
> 
> 		<span class="optionhead">Sort paths by</span>
> 		<p>Choose whether paths found will be sorted by length, number of marriages, or not at all. The default is length.</p>
> 
> 		<span class="optionhead">Anchor ID</span>
> 		<p>The "Person 2" ID that will be used to search for connections until a Person 2 is selected by the user. NOTE: It should be a valid ID in the same tree as Person 1.
> 		If this parameter is empty and the logged in user is a member of the tree, the user ID will be suggested as Person 2.</p>
> 
> 		<span class="optionhead">Max marriages in connection</span>
> 		<p>The maximum number of marriages allowed in any connection path. If the value is exceeded, the connection is ignored to avoid
> 		displaying diagrams that are too wide.</p>
diff -r TNG/languages/English/people_help.php TNG1403/languages/English/people_help.php
83c83
< 		<span class="optionhead">Gender / Nickname / Title / Prefix / Suffix / Name Order</span>
---
> 		<span class="optionhead">Nickname / Title / Prefix / Suffix / Name Order</span>
88a89,91
> 		<span class="optionhead">Gender</span>
> 		<p>Choose Unknown, Male, Female or Other. If Other is chosen, a new field will appear to the right where you may enter the preferred gender description.</p>
> 
102a106,107
> 		<p>Note on Alternate Birth events: The default alternate birth event type is "Christening". The Christening field may be turned off altogether from Setup/General Settings/Site Design & Definition, but you may also choose there to enter the GEDCOM tag(s) for other alternate birth events. For example, if you enter "CHR,BAPM" as alternate birth event types, the user may choose to designate either Christening or Baptism as the alternate birth event for an individual. The order also indicates which event type is preferred as default.
> 
105c110
< 		<strong>Note:</strong> If you prefer not to see the LDS fields, go to Setup/General Settings and turn them off there (requires that you logout and back in again).</p>
---
> 		<strong>Note:</strong> If you prefer not to see the LDS fields, go to Setup/General Settings/Privacy and turn them off there (requires that you logout and back in again).</p>
122,124c127,129
< 		<span class="optionhead">Other Events</span>
< 		<p>To add or manage additional events, click on the "Add New" button next to <strong>Other Events</strong>. See the <a href="events_help.php">Help</a> link there for more
< 		information on adding new events. Once an event has been added, a short summary will be displayed in a table under the "Add New" button. Action buttons for
---
> 		<span class="optionhead">Other Events / Attributes</span>
> 		<p>To add or manage additional events, click on the "Add New" button next to <strong>Other Events / Attributes</strong>. See the <a href="events_help.php">Help</a> link there for more
> 		information on adding new events or attributes. Once an event or attribute has been added, a short summary will be displayed in a table under the "Add New" button. Action buttons for
diff -r TNG/languages/English/places_googlemap_help.php TNG1403/languages/English/places_googlemap_help.php
44c44
< 		Streetmap (<a href="http://www.streetmap.co.uk" target="_blank">http://www.streetmap.co.uk</a>) can also be used to look up coordinates.</p>
---
> 		Streetmap (<a href="https://www.streetmap.co.uk" target="_blank">https://www.streetmap.co.uk</a>) can also be used to look up coordinates.</p>
67c67
< 		For these countries, you will need to use the <a href="http://maps.google.com/" target="_blank">Full Google Map Search</a> link.</p>
---
> 		For these countries, you will need to use the <a href="https://maps.google.com/" target="_blank">Full Google Map Search</a> link.</p>
diff -r TNG/languages/English/places_help.php TNG1403/languages/English/places_help.php
169a170,172
> 		<span class="optionhead">Reset</span>
> 		<p>Check this box to start again from the beginning of the list of places. Otherwise, geocoding will resume from where the last batch ended.</p>
> 
diff -r TNG/languages/English/reports_help.php TNG1403/languages/English/reports_help.php
14c14
< 			<a href="eventtypes_help.php" class="lightlink">&laquo; Help: Custom Event Types</a> &nbsp; | &nbsp;
---
> 			<a href="eventtypes_help.php" class="lightlink">&laquo; Help: Event / Attribute Types</a> &nbsp; | &nbsp;
34c34
<         <p>Locate existing cemeteries by searching for all or part of the <strong>Report Name</strong> or <strong>Description</strong>.
---
>         <p>Locate existing reports by searching for all or part of the <strong>Report Name</strong> or <strong>Description</strong>.
75c75
< 		selecting a field and then clicking the <em>Add >></em> button, or by simply double-clicking on the field name (IE only). </p>
---
> 		dragging the field from the lefthand box to the right, or by simply double-clicking on the field name. </p>
77,78c77
< 		<p>You can remove a field from the display list by selecting
< 		it in the righthand box and then clicking the <em><< Remove</em> button, or by simply double-clicking on the field name (IE only). </p>
---
> 		<p>You can remove a field from the display list on the right by double-clicking on the field name. </p>
81c80
< 		change the order of the display fields, select a field in the righthand box and move it up or down within the list by clicking on the <em>Move Up</em> and <em>Move Down</em> buttons.</p>
---
> 		change the order of the display fields, click and hold a field in the righthand box and drag it up or down within the list.</p>
88,89c87
< 		<p>Begin any statement by choosing a field name from the upper lefthand box and adding it to the righthand box. You can do this by
< 		selecting a field and then clicking the adjacent <em>Add >></em> button, or by simply double-clicking on the field name (IE only). </p>
---
> 		<p>Begin any statement by choosing a field name from the upper lefthand box and dragging it to the righthand box. You can also double-click on the field name. </p>
110c108
< 		the operator to the righthand box by selecting it and then clicking the adjacent <em>Add >></em> button, or by simply double-clicking on the operator name (IE only).</p>
---
> 		the operator to the righthand box by dragging it there or by double-clicking on the operator name.</p>
113c111
< 		<em>Current Day</em>. To select a constant string value, enter the string without quotes in the <em>Constant String</em> field and click the adjacent <em>Add >></em> button.
---
> 		<em>Current Day</em>. To select a constant string value, enter the string without quotes in the <em>Constant String</em> field and click the adjacent <em>>></em> button.
115c113
< 		<em>Add >></em> button.</p>
---
> 		<em>>></em> button.</p>
117c115
< 		<p>You can remove any item from the righthand box by selecting it and then clicking the <em><< Remove</em> button, or by simply double-clicking on the item (IE only).
---
> 		<p>You can remove any item from the righthand box by double-clicking on the item.
124c122
< 		Select fields to be in the sort order by copying them from the lefthand box to the right. You can do this by selecting a field and then clicking the <em>Add >></em> button, or by simply double-clicking on the field name (IE only).</p>
---
> 		Select fields to be in the sort order by dragging them from the lefthand box to the right, or by double-clicking on the field name.</p>
141,142c139,140
< 		<span class="optionhead">Save Report vs. Save and Exit</span>
< 		<p>When you're ready to save your report, click "Save Report" to save and stay on the same page and continue editing. Click "Save and Exit" to save and return to the Reports
---
> 		<span class="optionhead">Save + Exit vs. Save + Stay</span>
> 		<p>When you're ready to save your report, click "Save + Stay" to save and stay on the same page and continue editing. Click "Save + Exit" to save and return to the Reports
145c143
< 		<p>To see some sample reports, please visit <a href="http://lythgoes.net/genealogy/demo.php" target="_blank">http://lythgoes.net/genealogy/demo.php</a>, choose the Administrative Demo, and browse the Reports section there.</p>
---
> 		<p>To see some sample reports, please visit <a href="https://lythgoes.net/genealogy/demo.php" target="_blank">https://lythgoes.net/genealogy/demo.php</a>, choose the Administrative Demo, and browse the Reports section there.</p>
diff -r TNG/languages/English/second_help.php TNG1403/languages/English/second_help.php
3c3
< echo help_header("Help: Secondary Processes");
---
> echo help_header("Help: Post-Import Utilities");
17c17
< 		<span class="largeheader">Help: Secondary Processes</span>
---
> 		<span class="largeheader">Help: Post-Import Utilities</span>
31,32c31,32
< 		<a name="what"><p class="subheadbold">What are Secondary Processes?</p></a>
< 		<p>Secondary Processes are operations you may want to perform on your data directly following an import. To perform one of these operations,
---
> 		<a name="what"><p class="subheadbold">What are Post-Import Utilities?</p></a>
> 		<p>Post-Import Utilities are operations you may want to perform on your data directly following an import. To perform one of these operations,
56c56
< 		<a href="http://www.gendexnetwork.org">GenDex Network</a> or <a href="http://www.familytreeseeker.com">FamilyTreeSeeker.com</a> for further instructions.</p>
---
> 		<!--<a href="https://www.gendexnetwork.org">GenDex Network</a> or --><a href="https://www.familytreeseeker.com">FamilyTreeSeeker.com</a> for further instructions.</p>
59c59
< 		<p>To have the file indexed by GENDEX, visit <a href="http://www.gendexnetwork.org">GenDex Network</a> or <a href="http://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.
---
> 		<p>To have the file indexed by GENDEX, visit <!--<a href="https://www.gendexnetwork.org">GenDex Network</a> or --><a href="https://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.
diff -r TNG/languages/English/setup_help.php TNG1403/languages/English/setup_help.php
12c12
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
14c14
< 			<a href="second_help.php" class="lightlink">&laquo; Help: Secondary Processes</a> &nbsp; | &nbsp;
---
> 			<a href="second_help.php" class="lightlink">&laquo; Help: Post-Import Utilities</a> &nbsp; | &nbsp;
diff -r TNG/languages/English/templateconfig_help.php TNG1403/languages/English/templateconfig_help.php
12c12
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
30c30
< 			<a href="http://lythgoes.net/genealogy/templates.php">http://lythgoes.net/genealogy/templates.php</a>). Once the changes are saved, the new template style will take effect.</p>
---
> 			<a href="https://tngsitebuilding.com/templates.php">https://tngsitebuilding.com/templates.php</a>). Once the changes are saved, the new template style will take effect.</p>
56c56
< 			sections by listing the link label and the link URL on the same line, separated by a comma. For example, <em>TNG, http://www.tngsitebuilding.com</em>.</p>
---
> 			sections by listing the link label and the link URL on the same line, separated by a comma. For example, <em>TNG, https://tngsitebuilding.com</em>.</p>
diff -r TNG/languages/English/text.php TNG1403/languages/English/text.php
69d68
< 		$text['general'] = "General";
77a77
> 	case "connections":
79c79
< 		$text['findrel'] = "Find Relationship";
---
> 		$text['findrel'] = "Find relationship";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Search for connections";
> 		$text['findrel2'] = "Find relationships and other connections";
> 		$text['makeme2nd'] = "Use my ID";
> 		$text['usebookmarks'] = "Use bookmarks";
> 		$text['select2inds'] = "Please select two individuals.";
> 		$text['indinfofor'] = "Individual info for";
> 		$text['nobookmarks'] = "There is no bookmark to use";
> 		$text['bkmtitle'] = "Persons found in bookmarks";
> 		$text['bkminfo'] = "Select a person:";
> 		$text['sortpathsby'] = "Sort paths by number of";
> 		$text['sortbyshort'] = "Sort by";
> 		$text['bylengthshort'] = "Length";
> 		$text['badID1'] = ": bad person1 ID - please go back and correct";
> 		$text['badID2'] = ": bad person2 ID - please go back and correct";
> 		$text['notintree'] = ": the person with this ID is not in the current tree database.";
> 		$text['sameperson'] = "The two individuals are the same person.";;
> 		$text['nopaths'] = "These people are not connected.";
> 		$text['nopaths1'] = "No more connections shorter than xxx";
> 		$text['nopaths2'] = "in xxx search steps";
> 		$text['longestpath'] = "(longest path checked so far was xxx steps long)";
> 		$text['relevantpaths'] = "The number of different relevant paths found: xxx";
> 		$text['skipMarr'] = "(in addition, the number of paths found but not displayed due to too many marriages was: xxx)";
> 		$text['mjaor'] = "or";
> 		$text['connectionsto'] = "Connections to ";
> 		$text['findanotherpers'] = "Find another person...";
> 		$text['sometimes'] = "(Sometimes checking over a different number of generations yields a different result.)";
> 		$text['anotherpath'] = "Search for other connections";
> 		$text['xpath'] = "Path ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Parent";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "his daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "father";
> 		$text['hmother'] = "mother";
> 		$text['hhusband'] = "husband";
> 		$text['hwife'] = "wife";
> 		$text['hson'] = "son";
> 		$text['hdaughter'] = "daughter";
> 		$text['maxruns'] = "Max number of paths to be checked";
> 		$text['maxrshort'] = "Max paths";
> 		$text['maxlength'] = "Connection paths no longer than";
> 		$text['maxlshort'] = "Max length";
> 		$text['xstep'] = "step";
> 		$text['xsteps'] = "steps";
> 		$text['xmarriages'] = "xxx marriages";
> 		$text['xmarriage'] = "1 marriage";
> 		$text['showspouses'] = "Show both spouses";
> 		$text['showTxt'] = "Show textual path description";
> 		$text['showTxtshort'] = "Textual desc.";
> 		$text['compactBox'] = "Show person boxes in compact form";
> 		$text['compactBoxshort'] = "Compact boxes";
> 		$text['paths'] = "Paths";
> 		$text['dospouses2'] = "Show spouses";
> 		$text['maxmopt'] = "Max marriages per connection";
> 		$text['maxm'] = "Max marriages";
> 		$text['arerelated'] = "These persons are relatives - their relationship is shown in Path 1";
> 		$text['simplerel'] = "Simple relationship search";
177d245
< 		$text['baptizedlds'] = "Baptized (LDS)";
196d263
< 		$text['scrollnote'] = "Notes: You may have to scroll down or right to see chart.";
199d265
< 		$text['popupnote2'] = "New pedigree";
263a330,348
> 		//added in 14.0
> 		$text['dtformat'] = "Tables";
> 		$text['dtchildren'] = "Children";
> 		$text['dtgrandchildren'] = "Grandchildren";
> 		$text['dtggrandchildren'] = "Great grandchildren";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "No descendants";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Select";
> 		$text['dteachfulltable'] = "Each full table will have";
> 		$text['dtrows'] = "rows";
> 		$text['dtdisplayingtable'] = "Displaying table";
> 		$text['dtgototable'] = "Go to table:";
> 		$text['fcinstrdn'] = "Show family with spouse";
> 		$text['fcinstrup'] = "Show family with parents";
> 		$text['fcinstrplus'] = "Select other spouses";
> 		$text['fcinstrfam'] = "Select other parents";
381,383c466
< 		$text['firstpage'] = "First Page";
< 		$text['lastpage'] = "Last Page";
< 		$text['photoowner'] = "Owner/Source";
---
> 		$text['photoowner'] = "Owner of original";
435a519,520
> 		//added in 13.0
> 		$text['toggletags'] = "Toggle Tags";
545c630
< 		$text['newpassword'] = "New Password";
---
> 		$text['newpassword'] = "New password";
549d633
< 		//changed in 8.0.0
556d639
< 		//added in 8.0.0
560a644,650
> 		//added in 14.0
> 		$text['newpassword2'] = "New password again";
> 		$text['resetsuccess'] = "Success: Password has been reset";
> 		$text['resetfail'] = "Failure: Password not reset";
> 		$text['failreason0'] = " (unknown database error)";
> 		$text['failreason2'] = " (you don't have permission to change your password)";
> 		$text['failreason3'] = " (passwords did not match)";
591a682,683
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total Source Citations";
618d709
< 		$text['loginfirst'] = "You must log in first.";
625a717,718
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Existing user records have been detected. To proceed you must first log in or remove all records from the users table.";
629,630d721
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Out";
656d746
< 		$text['dna_info_head'] = "DNA Test Info";
659a750,774
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d784
< $text['birthabbr'] = "b.";
< $text['chrabbr'] = "c.";
675d787
< $text['family'] = "Family"; //from getperson
685d796
< $text['deathabbr'] = "d.";  //from descend
706d816
< $text['burialabbr'] = "bur.";  //from descend
712d821
< $text['place'] = "Place";
715d823
< $text['marrabbr'] = "m.";
738d845
< $text['source'] = "Source";
766d872
< $text['repository'] = "Repository";
770d875
< $text['findplaces'] = "Find all individuals with events at this location";
804d908
< $text['glang'] = "&amp;hl=en";
816d919
< $text['none'] = "None";
924d1026
< $text['otherevents'] = "Other Events";
952,953d1053
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
963,965c1063,1116
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Quick Links";
> $text['yourname'] = "Your Name";
> $text['youremail'] = "Your Email Address";
> $text['liketoadd'] = "Any info you'd like to add";
> $text['webmastermsg'] = "Webmaster Message";
> $text['gallery'] = "See Gallery";
> $text['wasborn_male'] = "was born";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "was born"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "died";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "died";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "was buried"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "was buried"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "was cremated";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "was cremated";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "married";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "married";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "was divorced";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "was divorced";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " on ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "and ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Visitor";
> 
> $text['popupnote2'] = "New pedigree";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom In";
> $text['zoomout'] = "Zoom Out";
> $text['scrollnote'] = "Drag or scroll to see more of the chart.";
> $text['general'] = "General";
> 
> //changed in 14.0
> $text['otherevents'] = "Other Events and Attributes";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connections";
> $text['continue'] = "Continue";
> $text['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/English/users_help.php TNG1403/languages/English/users_help.php
182a183,185
>         <span class="optionhead">Allow to view private notes</span>
> 		<p>User may view notes marked as private while in the public area.</p>
> 
diff -r TNG/languages/English-UTF8/admintext.php TNG1403/languages/English-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Please enter a ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Please select a file to import.";
> 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
> 		$admtext['fromyourcomputer'] = "From your computer";
> 		$admtext['importdata'] = "Import Data";
> 		$admtext['replace'] = "Replace (in selected tree)";
> 		$admtext['desttree'] = "Destination Tree";
> 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
> 		$admtext['selectexisting'] = "Import into";
> 		$admtext['ucaselast'] = "Upper case all surnames";
> 		$admtext['norecalc'] = "Do not recalculate Living flag";
> 		$admtext['autooffset'] = "Start IDs at first available number";
> 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
> 		$admtext['onwebserver'] = "From web site (in GEDCOM folder)";
> 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
> 		$admtext['destbranch'] = "Destination Branch (optional)";
> 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
> 		$admtext['opening'] = "Opening";
> 		$admtext['reopen'] = "Reopening";
> 		$admtext['uploading'] = "Uploading";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import stopped";
> 		$admtext['resume'] = "Resume";
> 		$admtext['neweronly'] = "Replace only if newer";
> 		$admtext['oldimport'] = "Old style import (no progress bar)";
> 		$admtext['importgedcom'] = "Import GEDCOM file (may be zipped)";
> 		$admtext['stopbackup'] = "Stop! It might be a good idea to back up your current data before proceeding.";
> 		$admtext['importmedia'] = "Import media links";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Import custom event types and attributes only (no data is added, replaced or appended)";
> 		$admtext['allevents'] = "Accept data for all new event types and attributes";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Edit Existing Event Type";
135,138d168
< 		$admtext['entertypedesc'] = "Please enter a type/description for this new event type.";
< 		$admtext['enterdisplay'] = "Please enter a display string for this new event type.";
< 		$admtext['existingeventtypeinfo'] = "Existing Event Type Information";
< 		$admtext['neweventtypeinfo'] = "New Event Type Information";
145,146d174
< 		$admtext['addnewevtype'] = "Add New Event Type";
< 		$admtext['createnewevtype'] = "Create a new event type record";
149,150d176
< 		$admtext['existingevtypes'] = "Existing Event Types";
< 		$admtext['edsevtypes'] = "Edit, delete or sort previously entered event types";
152d177
< 		$admtext['confdeleteevtype'] = "Are you sure you want to delete this event type?";
154d178
< 		$admtext['selectentertag'] = "Please select or enter the tag for this event type.";
208d231
< 		$admtext['changestoallevtypes'] = "Changes to all event types";
214d236
< 		$admtext['BAPM'] = "Baptism";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Are you sure you want to delete this event type? All events of this type will also be deleted.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Add New Type";
> 		$admtext['createnewevtype'] = "Create a new event or attribute type record";
> 		$admtext['modifyeventtype'] = "Edit Existing Type";
> 		$admtext['entertypedesc'] = "Please enter a type/description for this new attribute or event type.";
> 		$admtext['enterdisplay'] = "Please enter a display string for this new attribute or event type.";
> 		$admtext['existingeventtypeinfo'] = "Existing attribute or event type information";
> 		$admtext['neweventtypeinfo'] = "New attribute or event type information";
> 		$admtext['existingevtypes'] = "Existing Attribute or Event Types";
> 		$admtext['edsevtypes'] = "Edit, delete or sort previously entered attribute and event types";
> 		$admtext['selectentertag'] = "Please select or enter the tag for this attribute or event type.";
> 		$admtext['changestoallevtypes'] = "Changes to all attribute or event types";
232c268
< 		$admtext['marrdate'] = "Marr Date"; //marriage date
---
> 		$admtext['marrdate'] = "Marriage Date"; //marriage date
268d303
< 		$admtext['nobirthinfo'] = "No birth info";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Save + New Parents";
> 		$admtext['savenewspouse'] = "Save + New Spouse";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Please enter a description for the image.";
388d424
< 		$admtext['photoowner'] = "Owner/Source";
417d452
< 		$admtext['imgmap'] = "Image Map";
490d524
< 		$admtext['mapinstr3'] = "To link a region of this photo to an individual, first select the individual's tree, then create a rectangle for the desired region. This is done by clicking in the upper left corner of the region and then dragging to the lower right corner. Alternately, you may click in the upper left corner and then again in the lower right corner. A popup box will then help you select the individual. After the selection is made, code for the image map will be added to the box below. Repeat this process as needed for additional regions.";
495d528
< 		$admtext['removelink'] = "Remove Link";
502d534
< 		$admtext['eloptions'] = "Browse or Delete";
509d540
< 		$admtext['nolinks'] = "No links exist yet";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Image Map (for backward compatibility)";
> 		$admtext['photoowner'] = "Owner of original";
> 		$admtext['nothumb'] = "No thumbnail";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "The item could not be added, most likely because the file was too large and could not be uploaded or used to make a thumbnail.";
> 		$admtext['moved'] = "Moved";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Please enter a title or description for this media.";
> 		$admtext['mapinstr3'] = "To link a region of this photo to an person, family or other entity, first select the relevant tree and entity type, then create a rectangle for the desired region. This is done by clicking in the upper left corner of the region and then dragging to the lower right corner. Alternately, you may click in the upper left corner and then again in the lower right corner. A popup box will then help you select the person or other entity. Make your selection, then repeat this process as needed for additional regions. Click an existing region to select, then drag to move or click the 'X' to delete.";
596d633
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions: Drag or double-click items at left into lists at right. Drag up and down to re-order. Double-click again to remove.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click >>";
651,655d690
< 		$admtext['selectimportfile'] = "Please select a file to import.";
< 		$admtext['importgedcom'] = "Import GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
< 		$admtext['fromyourcomputer'] = "From your computer";
< 		$admtext['importdata'] = "Import Data";
657,660d691
< 		$admtext['replace'] = "Replace (in selected tree)";
< 		$admtext['desttree'] = "Destination Tree";
< 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
< 		$admtext['selectexisting'] = "Import into";
668,673d698
< 		$admtext['ucaselast'] = "Upper case all surnames";
< 		$admtext['norecalc'] = "Do not recalculate Living flag";
< 		$admtext['autooffset'] = "Start IDs at first available number";
< 
< 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
< 		$admtext['importmedia'] = "Import media if present";
675d699
< 		$admtext['neweronly'] = "Replace only if newer";
677,692d700
< 		$admtext['onwebserver'] = "From web site (in GEDCOM folder)";
< 		$admtext['eventsonly'] = "Import Custom Event Types only (no data is added, replaced or appended)";
< 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "Resume";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Admin Log";
694,696c702
< 		$admtext['mmgritems'] = "Install and Remove TNG Mods";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
---
> 		$admtext['mmgritems'] = "Install and uninstall TNG Mods";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Author";
804,809c814,819
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
---
> 		$admtext['momside'] = "Mom's Side label"; //8, 20
> 		$admtext['dadside'] = "Dad's Side label"; //8, 20
> 		$admtext['momperson'] = "Mom's Side person ID"; //8, 20
> 		$admtext['momtree'] = "Mom's Side tree ID"; //8, 20
> 		$admtext['dadperson'] = "Dad's Side person ID"; //8, 20
> 		$admtext['dadtree'] = "Dad's Side tree ID"; //8, 20
837c847
< 		$admtext['featurepara'] = "Features paragraph"; //9, 10
---
> 		$admtext['featurepara'] = "Feature paragraph"; //9, 10
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Quotes header";
> 		$admtext['quotesubhead'] = "Quotes subhead";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Featurette name";
> 		$admtext['snipinfoone'] = "Featurette first line";
> 		$admtext['snipinfotwo'] = "Featurette second line";
> 		$admtext['snipimage'] = "Featurette image";
> 		$admtext['snipperson'] = "Featurette person ID";
> 		$admtext['sniptree'] = "Featurette tree ID";
> 		$admtext['quote'] = "Quote";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7 title";
> 		$admtext['featuretitle8'] = "Feature 8 title";
> 		$admtext['featuretitle9'] = "Feature 9 title";
> 		$admtext['featurethumb9'] = "Feature 9 thumbnail"; //15
> 		$admtext['featurelink9'] = "Feature 9 link"; //15
> 		$admtext['featurepara9'] = "Feature 9 paragraph"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Header Left Image"; 
> 		$admtext['rightimg'] = "Header Right Image"; 
> 		$admtext['photoption'] = "Photo options are<br />&nbsp;&nbsp;(static or random)";
> 		$admtext['randomphotowidth'] = "Random Photo Width";
> 		$admtext['randomphotoheight'] = "Random Photo Height";
> 		$admtext['randomphotomediatypeID'] = "Random Photo Collection";
> 		$admtext['momheading'] = "Maternal Family Heading"; 
> 		$admtext['mompara'] = "Maternal Family Paragraph"; 
> 		$admtext['mompagelink'] = "Maternal Family Page Link"; 
> 		$admtext['dadheading'] = "Paternal Family Heading"; 
> 		$admtext['dadpara'] = "Paternal Family Paragraph"; 
> 		$admtext['dadpagelink'] = "Paternal Family Page Link"; 
> 		$admtext['spmomheading'] = "Spouse Maternal Family Heading"; 
> 		$admtext['spmompara'] = "Spouse Maternal Family Paragraph"; 
> 		$admtext['spmompagelink'] = "Spouse Maternal Family Page Link"; 
> 		$admtext['spmomside'] = "Spouse Maternal Side label"; 
> 		$admtext['spdadside'] = "Spouse Paternal Side label"; 
> 		$admtext['spmomperson'] = "Spouse Maternal Side personID"; 
> 		$admtext['spmomtree'] = "Spouse Maternal Side treeID"; 
> 		$admtext['spdadheading'] = "Spouse Paternal Family Heading"; 
> 		$admtext['spdadpara'] = "Spouse Paternal Family Paragrph"; 
> 		$admtext['spdadpagelink'] = "Spouse Paternal Family Page Link"; 
> 		$admtext['spdadperson'] = "Spouse Paternal Side personID"; 
> 		$admtext['spdadtree'] = "Spouse Paternal Side treeID"; 
> 		$admtext['storiesheading'] = "Our Family Stories"; 
> 		$admtext['nbrsurnames'] = "Number of Surnames<br />&nbsp;&nbsp; in Surname Cloud"; 
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature thumbnail";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG requires 5.3 or higher.)";
---
> 		$admtext['phpreq'] = "(TNG requires 7.0 or higher.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Change incoming prefixes to match TNG settings";
> 		$admtext['sortevents'] = "Sort events by";
> 		$admtext['sortbydate'] = "Event date";
> 		$admtext['sortbytype'] = "Event type";
> 		$admtext['allowsuggest'] = "Allow suggestions from visitors";
> 		$admtext['livingchecked'] = "Living flag set for new people and families";
> 		$admtext['maxmarried'] = "Mark family living if married less than<br/>this many years";
> 		$admtext['imagetags'] = "Rectangles";
> 		$admtext['allowcsv'] = "Allow CSV downloads for reports";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Export as SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of paths to be checked";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Show textual path description";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages per connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Could not be geocoded";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Do not geocode";
1436d1549
< 		$admtext['backtosecondary'] = "Back to Secondary Processes";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Back to Post-import Utilities";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exclude notes";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip and include media files";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Show disabled users only";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1739c1856
< 		$admtext['install'] = "install";
---
> 		$admtext['install'] = "Install";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Invalid character";
1886d2008
< 		$admtext['test_number'] = "Test Number";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Number/Name";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Link this DNA test to a person";
1965d2095
< $admtext['otherevents'] = "Other Events";
2050,2051d2179
< $admtext['savereturn'] = "Return to this page";
< $admtext['saveback'] = "Return to menu";
2058d2185
< $admtext['secondary'] = "Secondary Processes";
2119c2246
< $admtext['datamaint'] = "Import/Export";
---
> $admtext['datamaint'] = "Import / Export";
2128,2129d2254
< $admtext['secondarymaint'] = "Secondary Processes";
< $admtext['customeventtypes'] = "Custom Event Types";
2218d2342
< //changed in 8.0.0
2222d2345
< //moved here in 8.0.0
2227d2349
< //added in 8.0.0
2235d2356
< //moved here in 9.0.0
2244d2364
< //added in 9.0.0
2276,2278d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2281d2397
< //added in 10.0.0
2304a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Surnames";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Image";
> $admtext['author'] = "Author";
2309,2310c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Getting Started";
> $admtext['showlog'] = "Admin Log";
> $admtext['nobirthinfo'] = "No birth info";
> //changed in 13.0
> $admtext['savereturn'] = "Save + Stay";
> $admtext['saveback'] = "Save + Exit";
> //added in 13.0
> $admtext['allitemsdeleted'] = "All items were successfully deleted.";
> $admtext['private'] = "Private";
> $admtext['imgtags'] = "Image Tags";
> 
> $admtext['removelink'] = "Remove Link";
> $admtext['eloptions'] = "Browse or Delete";
> $admtext['pleaseenter'] = "Please enter a ";
> 
> $admtext['nolinks'] = "No links exist yet";
> $admtext['nogeocode'] = "Could not be geocoded";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Event / Attribute Types";
> $admtext['secondary'] = "Post-import Utilities";
> $admtext['otherevents'] = "Other Events / Attributes";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Move";
> $admtext['copy'] = "Copy";
> $admtext['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/English-UTF8/alltext.php TNG1403/languages/English-UTF8/alltext.php
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "b.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "bur.";  //from descend
> $text['marrabbr'] = "m.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "First Page";
> $text['lastpage'] = "Last Page";
> 
> //changed in 13.0.0
> $text['problem'] = "An error has occurred in the TNG software. What to do:<p>If you just installed an upgrade, you might have skipped part of the installation instructions. Go back to the upgrade readme page reread the instructions. Pay special attention to the database structure step.</p><p>If you just installed TNG for the first time, you might still need to create the database tables. Return to the readme.html page to find that step.</p><p>If you are the site owner, you may contact TNG support for further assistance with this problem. Please copy the query below and paste it into your message.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "No branch";
> 
> //added in 14.0
> $text['oneyear'] = "year";
> $text['pwdcodelink'] = "Click this link to have a temporary password sent to you";
> $text['pwdcodesent'] = "A password reset link has been sent to your e-mail address.";
> $text['moved'] = "Moved";
> $text['citation'] = "Citation";
> $text['other'] = "Other";
> $text['death'] = "Death";
> $text['burial'] = "Burial";
> $text['cremation'] = "Cremation";
> $text['marriage'] = "Marriage";
> $text['divorce'] = "Divorce";
> $text['bylength'] = "Steps";
> $text['bymarriages'] = "Marriages";
> $text['none'] = "None";
> 
> //moved here in 14.0
> $text['family'] = "Family";
> $text['source'] = "Source";
> $text['repository'] = "Repository";
> $text['place'] = "Place";
> $admtext['BAPM'] = "Baptism";
> 
> $text['glang'] = "en";
208c257
< //$english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> //$english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/English-UTF8/text.php TNG1403/languages/English-UTF8/text.php
69d68
< 		$text['general'] = "General";
77a77
> 	case "connections":
79c79
< 		$text['findrel'] = "Find Relationship";
---
> 		$text['findrel'] = "Find relationship";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Search for connections";
> 		$text['findrel2'] = "Find relationships and other connections";
> 		$text['makeme2nd'] = "Use my ID";
> 		$text['usebookmarks'] = "Use bookmarks";
> 		$text['select2inds'] = "Please select two individuals.";
> 		$text['indinfofor'] = "Individual info for";
> 		$text['nobookmarks'] = "There is no bookmark to use";
> 		$text['bkmtitle'] = "Persons found in bookmarks";
> 		$text['bkminfo'] = "Select a person:";
> 		$text['sortpathsby'] = "Sort paths by number of";
> 		$text['sortbyshort'] = "Sort by";
> 		$text['bylengthshort'] = "Length";
> 		$text['badID1'] = ": bad person1 ID - please go back and correct";
> 		$text['badID2'] = ": bad person2 ID - please go back and correct";
> 		$text['notintree'] = ": the person with this ID is not in the current tree database.";
> 		$text['sameperson'] = "The two individuals are the same person.";;
> 		$text['nopaths'] = "These people are not connected.";
> 		$text['nopaths1'] = "No more connections shorter than xxx";
> 		$text['nopaths2'] = "in xxx search steps";
> 		$text['longestpath'] = "(longest path checked so far was xxx steps long)";
> 		$text['relevantpaths'] = "The number of different relevant paths found: xxx";
> 		$text['skipMarr'] = "(in addition, the number of paths found but not displayed due to too many marriages was: xxx)";
> 		$text['mjaor'] = "or";
> 		$text['connectionsto'] = "Connections to ";
> 		$text['findanotherpers'] = "Find another person...";
> 		$text['sometimes'] = "(Sometimes checking over a different number of generations yields a different result.)";
> 		$text['anotherpath'] = "Search for other connections";
> 		$text['xpath'] = "Path ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Parent";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "his daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "father";
> 		$text['hmother'] = "mother";
> 		$text['hhusband'] = "husband";
> 		$text['hwife'] = "wife";
> 		$text['hson'] = "son";
> 		$text['hdaughter'] = "daughter";
> 		$text['maxruns'] = "Max number of paths to be checked";
> 		$text['maxrshort'] = "Max paths";
> 		$text['maxlength'] = "Connection paths no longer than";
> 		$text['maxlshort'] = "Max length";
> 		$text['xstep'] = "step";
> 		$text['xsteps'] = "steps";
> 		$text['xmarriages'] = "xxx marriages";
> 		$text['xmarriage'] = "1 marriage";
> 		$text['showspouses'] = "Show both spouses";
> 		$text['showTxt'] = "Show textual path description";
> 		$text['showTxtshort'] = "Textual desc.";
> 		$text['compactBox'] = "Show person boxes in compact form";
> 		$text['compactBoxshort'] = "Compact boxes";
> 		$text['paths'] = "Paths";
> 		$text['dospouses2'] = "Show spouses";
> 		$text['maxmopt'] = "Max marriages per connection";
> 		$text['maxm'] = "Max marriages";
> 		$text['arerelated'] = "These persons are relatives - their relationship is shown in Path 1";
> 		$text['simplerel'] = "Simple relationship search";
177d245
< 		$text['baptizedlds'] = "Baptized (LDS)";
196d263
< 		$text['scrollnote'] = "Notes: You may have to scroll down or right to see chart.";
199d265
< 		$text['popupnote2'] = "New pedigree";
263a330,348
> 		//added in 14.0
> 		$text['dtformat'] = "Tables";
> 		$text['dtchildren'] = "Children";
> 		$text['dtgrandchildren'] = "Grandchildren";
> 		$text['dtggrandchildren'] = "Great grandchildren";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "No descendants";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Select";
> 		$text['dteachfulltable'] = "Each full table will have";
> 		$text['dtrows'] = "rows";
> 		$text['dtdisplayingtable'] = "Displaying table";
> 		$text['dtgototable'] = "Go to table:";
> 		$text['fcinstrdn'] = "Show family with spouse";
> 		$text['fcinstrup'] = "Show family with parents";
> 		$text['fcinstrplus'] = "Select other spouses";
> 		$text['fcinstrfam'] = "Select other parents";
381,383c466
< 		$text['firstpage'] = "First Page";
< 		$text['lastpage'] = "Last Page";
< 		$text['photoowner'] = "Owner/Source";
---
> 		$text['photoowner'] = "Owner of original";
435a519,520
> 		//added in 13.0
> 		$text['toggletags'] = "Toggle Tags";
545c630
< 		$text['newpassword'] = "New Password";
---
> 		$text['newpassword'] = "New password";
549d633
< 		//changed in 8.0.0
556d639
< 		//added in 8.0.0
560a644,650
> 		//added in 14.0
> 		$text['newpassword2'] = "New password again";
> 		$text['resetsuccess'] = "Success: Password has been reset";
> 		$text['resetfail'] = "Failure: Password not reset";
> 		$text['failreason0'] = " (unknown database error)";
> 		$text['failreason2'] = " (you don't have permission to change your password)";
> 		$text['failreason3'] = " (passwords did not match)";
591a682,683
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total Source Citations";
618d709
< 		$text['loginfirst'] = "You must log in first.";
625a717,718
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Existing user records have been detected. To proceed you must first log in or remove all records from the users table.";
629,630d721
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Out";
656d746
< 		$text['dna_info_head'] = "DNA Test Info";
659a750,774
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d784
< $text['birthabbr'] = "b.";
< $text['chrabbr'] = "c.";
675d787
< $text['family'] = "Family"; //from getperson
685d796
< $text['deathabbr'] = "d.";  //from descend
706d816
< $text['burialabbr'] = "bur.";  //from descend
712d821
< $text['place'] = "Place";
715d823
< $text['marrabbr'] = "m.";
738d845
< $text['source'] = "Source";
766d872
< $text['repository'] = "Repository";
770d875
< $text['findplaces'] = "Find all individuals with events at this location";
804d908
< $text['glang'] = "&amp;hl=en";
816d919
< $text['none'] = "None";
924d1026
< $text['otherevents'] = "Other Events";
952,953d1053
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
963,965c1063,1116
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Quick Links";
> $text['yourname'] = "Your Name";
> $text['youremail'] = "Your Email Address";
> $text['liketoadd'] = "Any info you'd like to add";
> $text['webmastermsg'] = "Webmaster Message";
> $text['gallery'] = "See Gallery";
> $text['wasborn_male'] = "was born";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "was born"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "died";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "died";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "was buried"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "was buried"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "was cremated";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "was cremated";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "married";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "married";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "was divorced";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "was divorced";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " on ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "and ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Visitor";
> 
> $text['popupnote2'] = "New pedigree";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom In";
> $text['zoomout'] = "Zoom Out";
> $text['scrollnote'] = "Drag or scroll to see more of the chart.";
> $text['general'] = "General";
> 
> //changed in 14.0
> $text['otherevents'] = "Other Events and Attributes";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connections";
> $text['continue'] = "Continue";
> $text['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
Only in TNG1403/languages: Farsi-UTF8
diff -r TNG/languages/Finnish/admintext.php TNG1403/languages/Finnish/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Anna ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Valitse tuotava tiedosto.";
> 		$admtext['addreplacedata'] = "Lisää tai korvaa sukututkimustietosi (voi viedä useita minuutteja tiedoston koosta riippuen )";
> 		$admtext['fromyourcomputer'] = "Tietokoneeltasi";
> 		$admtext['importdata'] = "Lue tiedot";
> 		$admtext['replace'] = "Korvaa (valitusta sukupuusta)";
> 		$admtext['desttree'] = "Kohde sukupuu";
> 		$admtext['selectdesttree'] = "Valitse tai kirjoita kohde sukupuu.";
> 		$admtext['selectexisting'] = "Tuo";
> 		$admtext['ucaselast'] = "Sukunimet isoilla kirjaimilla";
> 		$admtext['norecalc'] = "Älä laske uudelleen Elossa-merkintöjä";
> 		$admtext['autooffset'] = "Aloita IDt ensimmäisestä vapaasta numerosta";
> 		$admtext['mustselecttree'] = "Valitse sukupuu ennen tätä toimintoa.";
> 		$admtext['onwebserver'] = "Web-palvelimella (GEDCOM hakemistossa)";
> 		$admtext['imphints'] = "Vinkki: Kaikki nykyinen data tarkoittaa kaikkia henkilöitä, perheitä, lähteitä ja muistiinpanoja (mediakytkennät eivät katoa niin kauan kuin ID:t pysyvät samoina). Osumat perustuvat aina pelkkiin ID-numeroihin. Uudet tietueet lisätään aina uusina. Lisääminen tuo kaikki tietueet uusilla ID-numeroilla.";
> 		$admtext['destbranch'] = "Kohdesukuhaara (vaihtoehtoinen)";
> 		$admtext['importlatlong'] = "Tuo pituus- ja leveysasteet, jos niitä on";
> 		$admtext['opening'] = "Avataan";
> 		$admtext['reopen'] = "Avataan uudelleen";
> 		$admtext['uploading'] = "Ladataan";
> 		$admtext['stop'] = "Keskeytä";
> 		$admtext['stopped'] = "Tuonti keskeytetty";
> 		$admtext['resume'] = "klikkaa jatkaaksesi";
> 		$admtext['neweronly'] = "Korvaa vain, jos uudempi";
> 		$admtext['oldimport'] = "Vanha tapa tuoda (ei edistymispalkkia)";
> 		$admtext['importgedcom'] = "Tuo GEDCOM tiedosto (voi olla zip-pakattu)";
> 		$admtext['stopbackup'] = "Seis! Saattaisi olla hyvä ajatus tehdä varmistus tämän hetken tiedoista ennen etenemistä.";
> 		$admtext['importmedia'] = "Tuo media (jos saatavilla)";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Varmista, että etuliitteet ja päätteet (Yleiset asetukset) ovat oikein tälle tiedostolle.";
> 		$admtext['chkimpsettings'] = "Tarkista Tuonnin asetukset saadaksesi lisää vaihtoehtoja.";
> 		$admtext['eventsonly'] = "Tuo vain mukautetut tapahtumatyypit ja määritteet (dataa ei lisätä, korvata tai liitetä)";
> 		$admtext['allevents'] = "Hyväksy tiedot kaikille uusille tapahtumatyypeille ja -määritteille";
> 		$admtext['finishingimporting'] = "Lopetetaan...";
> 		$admtext['fileuploadfailed'] = "Tiedoston lataus epäonnisui. Voi johtua siitä, että tiedosto on liian suuri. Kokeile ladata tiedosto FTP:llä GEDCOM kansioosi. Valitse ja tuo tiedosto sitten sieltä.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Muokkaa olemassa olevaa tapahtumaluokkaa";
135,138d168
< 		$admtext['entertypedesc'] = "Anna tyyppi/kuvaus tälle uudelle tapahtumaluokalle.";
< 		$admtext['enterdisplay'] = "Anna näyttönimi tälle tapahtumaluokalle.";
< 		$admtext['existingeventtypeinfo'] = "Olemassa olevan tapahtumaluokan tiedot";
< 		$admtext['neweventtypeinfo'] = "Uuden tapahtumaluokan tiedot";
145,146d174
< 		$admtext['addnewevtype'] = "Lisää uusi tapahtumaluokka";
< 		$admtext['createnewevtype'] = "Luo uusi tapahtumaluokka";
149,150d176
< 		$admtext['existingevtypes'] = "Olemassa olevat tapahtumaluokat";
< 		$admtext['edsevtypes'] = "Muokkaa, poista tai lajittele aiemmin syötettyjä tapahtumaluokkia";
152d177
< 		$admtext['confdeleteevtype'] = "Haluatko poistaa tämän tapahtumaluokan?";
154d178
< 		$admtext['selectentertag'] = "Valitse tai syötä tagi tälle tapahtumaluokalle.";
208d231
< 		$admtext['changestoallevtypes'] = "Muutokset kaikille tapahtumaluokille";
214d236
< 		$admtext['BAPM'] = "Kaste";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Haluatko varmasti poistaa tämän tapahtumatyypin? Kaikki tämän tyypin tapahtumat tullaan myös poistamaan.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Lisää uusi tyyppi";
> 		$admtext['createnewevtype'] = "Luo uusi määrite- tai tapahtumatyyppitietue";
> 		$admtext['modifyeventtype'] = "Muokkaa nykyistä tyyppiä";
> 		$admtext['entertypedesc'] = "Anna tyyppi/kuvaus tälle uudelle määritteelle tai tapahtumatyypille.";
> 		$admtext['enterdisplay'] = "Anna tälle uudelle määritteelle tai tapahtumatyypille näyttöteksti.";
> 		$admtext['existingeventtypeinfo'] = "Olemassa olevat määritteen tai tapahtumatyypin tiedot";
> 		$admtext['neweventtypeinfo'] = "Uudet määritteen tai tapahtumatyypin tiedot";
> 		$admtext['existingevtypes'] = "Olemassa olevat määrite- tai tapahtumatyypit";
> 		$admtext['edsevtypes'] = "Muokkaa, poista tai lajittele aiemmin syötettyjä määrite- ja tapahtumatyyppejä";
> 		$admtext['selectentertag'] = "Valitse tai syötä tunniste tälle määrite- tai tapahtumatyypille.";
> 		$admtext['changestoallevtypes'] = "Muutokset kaikkiin määrite- tai tapahtumatyyppeihin";
268d303
< 		$admtext['nobirthinfo'] = "Ei syntymätietoa";
316c351
< 		$admtext['nokids'] = "Ei lapisia";
---
> 		$admtext['nokids'] = "Ei lapsia";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Valitse<br/>oletus<br/>kuva"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Tallenna + Uudet vanhemmat";
> 		$admtext['savenewspouse'] = "Tallenna + Uusi puoliso";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Vaiht. syntymä";
354d391
< 		$admtext['enterphotodesc'] = "Syötä kuvaus kuvalle.";
388d424
< 		$admtext['photoowner'] = "Omistaja/lähde";
417d452
< 		$admtext['imgmap'] = "Kuvakartta";
449c484
< 		$admtext['addnewmedia'] = "Lisää uusi mediatiedosto";
---
> 		$admtext['addnewmedia'] = "Lisää uusi mediatiedsoto";
462c497
< 		$admtext['fileext'] = "Tiedostopääte"; //file extension (abbreviation)
---
> 		$admtext['fileext'] = "Tiedostopääte."; //file extension (abbreviation)
488c523
< 		$admtext['newmediainfo'] = "New Media Information";
---
> 		$admtext['newmediainfo'] = "Uuden mediatiedoston metatiedot";
490d524
< 		$admtext['mapinstr3'] = "Linkittääksesi tietyn alueen valokuvasta tiettyyn henkilöön, valitse henkilön sukupuu, ja valitse alueen muoto ja koko. Klikkaa sen jälkeen alueen keskikohtaa valokuvassa. Popup-ikkuna auttaa haluamasi henkilön valinnassa. Kun valinta on tehty, kuvakartan html-koodi lisätään oheiseen tekstikenttään. Toista kuvakartan teko jokaiselle haluamallesi alueelle.";
495d528
< 		$admtext['removelink'] = "Poista linkki";
502d534
< 		$admtext['eloptions'] = "Selaa tai poista";
509d540
< 		$admtext['nolinks'] = "Ei vielä linkkejä";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544,545c573
< 		//added in 9.2.0
< 		$admtext['upload'] = "Lataa";
---
> 		$admtext['upload'] = "Lataus";
547c575
< 		$admtext['mediaupl'] = "Lataa mediatiedosto";
---
> 		$admtext['mediaupl'] = "Lataa mediatiedostoja";
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Image Map (taaksepäin yhteensopivuuden vuoksi)";
> 		$admtext['photoowner'] = "Alkuperäisen kuvan omistaja";
> 		$admtext['nothumb'] = "Ei peukalokuvaa";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Kohdetta ei voitu lisätä, todennäköisesti koska tiedosto oli liian suuri eikä sitä voitu ladata tai käyttää pikkukuvan tekemiseen.";
> 		$admtext['moved'] = "Siirretty";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Kirjoita tälle medialle otsikko tai kuvaus.";
> 		$admtext['mapinstr3'] = "Jos haluat linkittää tämän valokuvan alueen henkilöön, perheeseen tai muuhun kokonaisuuteen, valitse ensin asianmukainen puu ja kokonaisuus ja luo sitten suorakulmio halutulle alueelle. Tämä tehdään napsauttamalla alueen vasenta yläkulmaa ja vetämällä sitten oikeaan alakulmaan. Vaihtoehtoisesti voit napsauttaa vasenta yläkulmaa ja sitten uudelleen oikeaa alakulmaa. Ponnahdusikkuna auttaa sinua valitsemaan henkilön tai muun tahon. Tee valinta ja toista tämä prosessi tarvittaessa muille alueille. Valitse olemassa oleva alue napsauttamalla ja siirrä sitten vetämällä tai poista napsauttamalla X-merkkiä.";
596d633
< 		$admtext['foremptystring'] = "Jätä tämä kenttä tyhjäksi ja osoita \"Lisää >>.\" syöttääksesi tyhjän tekstin";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Ohjeet: Vedä tai kaksoisnapsauta vasemmalla olevia kohteita oikealla oleviin luetteloihin. Järjestä uudelleen vetämällä ylös ja alas. Poista kaksoisnapsauttamalla uudelleen.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Jos merkkijono on tyhjä, jätä tämä kenttä tyhjäksi ja napsauta >>";
651,655d690
< 		$admtext['selectimportfile'] = "Valitse tuotava tiedosto.";
< 		$admtext['importgedcom'] = "Tuo GEDCOM (standardi 5.5 tiedostomuoto)";
< 		$admtext['addreplacedata'] = "Lisää tai korvaa sukututkimustietosi (voi viedä useita minuutteja tiedoston koosta riippuen )";
< 		$admtext['fromyourcomputer'] = "Tietokoneeltasi";
< 		$admtext['importdata'] = "Lue tiedot";
657,660d691
< 		$admtext['replace'] = "Korvaa (valitusta sukupuusta)";
< 		$admtext['desttree'] = "Kohde sukupuu";
< 		$admtext['selectdesttree'] = "Valitse tai kirjoita kohde sukupuu.";
< 		$admtext['selectexisting'] = "Tuo";
668,673d698
< 		$admtext['ucaselast'] = "Sukunimet isoilla kirjaimilla";
< 		$admtext['norecalc'] = "Älä laske uudelleen Elossa-merkintöjä";
< 		$admtext['autooffset'] = "Aloita IDt ensimmäisestä vapaasta numerosta";
< 
< 		$admtext['mustselecttree'] = "Valitse sukupuu ennen tätä toimintoa.";
< 		$admtext['importmedia'] = "Tuo media (jos saatavilla)";
675d699
< 		$admtext['neweronly'] = "Korvaa vain, jos uudempi";
677,692d700
< 		$admtext['onwebserver'] = "Web-palvelimella (GEDCOM hakemistossa)";
< 		$admtext['eventsonly'] = "Only import Custom Event Types";
< 		$admtext['imphints'] = "Vinkki: Kaikki nykyinen data tarkoittaa kaikkia henkilöitä, perheitä, lähteitä ja muistiinpanoja (mediakytkennät eivät katoa niin kauan kuin ID:t pysyvät samoina). Osumat perustuvat aina pelkkiin ID-numeroihin. Uudet tietueet lisätään aina uusina. Lisääminen tuo kaikki tietueet uusilla ID-numeroilla.";
< 		$admtext['allevents'] = "Salli data kaikille uusille Custom Event Type tiedoille";
< 		$admtext['destbranch'] = "Kohdesukuhaara (vaihtoehtoinen)";
< 		$admtext['inframe'] = "(kehyksessä)";
< 		$admtext['getstart'] = "Aloitus";
< 		$admtext['importlatlong'] = "Tuo pituus- ja leveysasteet, jos niitä on";
< 		$admtext['opening'] = "Avataan";
< 		$admtext['reopen'] = "Avataan uudelleen";
< 		$admtext['uploading'] = "Ladataan";
< 		$admtext['stop'] = "Keskeytä";
< 		$admtext['stopped'] = "Tuonti keskeytetty";
< 		$admtext['resume'] = "klikkaa jatkaaksesi";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Muutosloki";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Vanha tapa tuoda (ei edistymispalkkia)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Päivitä";
> 		$admtext['need_upgrade'] = "Viimeistele nämä päivitysohjeet";
> 		$admtext['upgrade_missing'] = "Päivitystiedosto näyttää puuttuvan, joten saatat olla jo valmis.";
> 		$admtext['delete_upgrade'] = "Kun olet valmis, napsauta tätä poistaaksesi päivityksen ja palataksesi valikkoon.";
723d733
< 		$admtext['author'] = "Kirjoittaja";
751c761
< 		$admtext['enterrepoid'] = "Anna tietovaraston ID-numero.";
---
> 		$admtext['enterrepoid'] = "Anna tietovaraston ID.";
754c764
< 		$admtext['prefixrepoid'] = "Laita tietovaraston ID-numeron eteen \"REPO\" (engl. \"Repository\" suom. tietovarasto)";
---
> 		$admtext['prefixrepoid'] = "Laita tietovaraston ID:n eteen \"REPO\" (engl. \"Repository\" suom. tietovarasto)";
774,775c784,785
< 		$admtext['isok'] = "on OK käyttää";
< 		$admtext['isinuse'] = "on jo käytössä.";
---
> 		$admtext['isok'] = "is OK to use";
> 		$admtext['isinuse'] = "is already in use.";
804,809c814,819
< 		$admtext['momside'] = "Äidin puolen nimiö"; //8
< 		$admtext['dadside'] = "Isän puolen nimiö"; //8
< 		$admtext['momperson'] = "Äidin puolen henkilön ID"; //8
< 		$admtext['momtree'] = "Päidin puolen sukupuun ID"; //8
< 		$admtext['dadperson'] = "Isän puolen henkilön ID"; //8
< 		$admtext['dadtree'] = "Isän puolen sukupuun ID"; //8
---
> 		$admtext['momside'] = "Äidin puolen nimiö"; //8, 20
> 		$admtext['dadside'] = "Isän puolen nimiö"; //8, 20
> 		$admtext['momperson'] = "Äidin puolen henkilön ID"; //8, 20
> 		$admtext['momtree'] = "Päidin puolen sukupuun ID"; //8, 20
> 		$admtext['dadperson'] = "Isän puolen henkilön ID"; //8, 20
> 		$admtext['dadtree'] = "Isän puolen sukupuun ID"; //8, 20
857,858c867,868
< 		$admtext['ttitleimage'] = "Kuva";
< 		$admtext['ttitletext'] = "Teksti";
---
> 		$admtext['ttitleimage'] = "Image";
> 		$admtext['ttitletext'] = "Text";
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Lainausotsikko";
> 		$admtext['quotesubhead'] = "Quotes subheader";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Ominaisuuden nimi";
> 		$admtext['snipinfoone'] = "Featurette first line";
> 		$admtext['snipinfotwo'] = "Featurette toinen rivi";
> 		$admtext['snipimage'] = "Featurette-kuva";
> 		$admtext['snipperson'] = "Featurette-henkilötunnus";
> 		$admtext['sniptree'] = "Featurette-puun tunnus";
> 		$admtext['quote'] = "Lainaus";
> 		$admtext['link'] = "Linkki";
> 		$admtext['featuretitle7'] = "Ominaisuuden 7 otsikko";
> 		$admtext['featuretitle8'] = "Ominaisuuden 8 otsikko";
> 		$admtext['featuretitle9'] = "Ominaisuuden 9 otsikko";
> 		$admtext['featurethumb9'] = "Ominaisuuden 9 pikkukuva"; //15
> 		$admtext['featurelink9'] = "Ominaisuuden 9 linkki"; //15
> 		$admtext['featurepara9'] = "Ominaisuuden 9 kappale"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Ylätunnisteen vasen kuva";
> 		$admtext['rightimg'] = "Ylätunnisteen oikea kuva";
> 		$admtext['photoption'] = "Valokuva-asetukset ovat<br />&nbsp;&nbsp;(staattinen tai satunnainen)";
> 		$admtext['randomphotowidth'] = "Satunnainen kuvan leveys";
> 		$admtext['randomphotoheight'] = "Satunnainen kuvan korkeus";
> 		$admtext['randomphotomediatypeID'] = "Satunnainen kuvakokoelma";
> 		$admtext['momheading'] = "Äidin perheen otsikko";
> 		$admtext['mompara'] = "Äidin perheen leipäteksti";
> 		$admtext['mompagelink'] = "Äidin perheen sivun osoite";
> 		$admtext['dadheading'] = "Isän perheen otsikko";
> 		$admtext['dadpara'] = "Isän perheen leipäteksti";
> 		$admtext['dadpagelink'] = "Isän perheen sivun osoite";
> 		$admtext['spmomheading'] = "Puolison äidin perheen otsikko";
> 		$admtext['spmompara'] = "Puolison äidin perheen leipäteksti";
> 		$admtext['spmompagelink'] = "Puolison äidin perheen sivun osoite";
> 		$admtext['spmomside'] = "Puolison äidin puolen nimiö";
> 		$admtext['spdadside'] = "Puolison isän puolen nimiö";
> 		$admtext['spmomperson'] = "Puolison äidin puolen henkilö ID";
> 		$admtext['spmomtree'] = "Puolison äidin puolen sukupuu ID";
> 		$admtext['spdadheading'] = "Puolison isän perheen otsikko";
> 		$admtext['spdadpara'] = "Puolison isän perheen leipäteksti";
> 		$admtext['spdadpagelink'] = "Puolison isän perheen sivun osoite";
> 		$admtext['spdadperson'] = "Puolison isän puolen henkilö ID";
> 		$admtext['spdadtree'] = "Puolison isän puolen sukupuu ID";
> 		$admtext['storiesheading'] = "Perheemme elämäkerrat";
> 		$admtext['nbrsurnames'] = "Sukunimien lukumäärä <br />&nbsp;&nbsp; sukunimipilvessä";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Ominaisuuden pikkukuva";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vaatii version 5.3 tai sitä uudemman)";
---
> 		$admtext['phpreq'] = "(TNG vaatii version 7.0 tai sitä uudemman)";
1171c1264
< 		$admtext['albumlinkstable'] = "Album Links Table";
---
> 		$admtext['albumlinkstable'] = "Albumilinkkien taulu";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280,1282c1370,1371
< 		//added in 10.0.0
< 		$admtext['collation'] = "Tietojen kerääminen";
< 		$admtext['collationexpl'] = "(jätä tyhjäksi hyväksyäksesi oletusarvo)";
---
> 		$admtext['collation'] = "Tietojen jäsennys";
> 		$admtext['collationexpl'] = "(jätä tyhjäksi hyväksyäksesi oletusarvon)";
1293,1298c1382,1384
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Käytä uudelleen poistetut IDt";
< 		$admtext['lastimport'] = "Näytä viimeisin tuonti";
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Salaus";
<         //added in 11.0.0
---
> 		$admtext['reuseids'] = "Re-use deleted IDs";
> 		$admtext['lastimport'] = "Show last import";
>         $admtext['mailenc'] = "Encryption";
1328,1330c1414,1415
< 		$admtext['hidedna'] = "Piilota kaikki DNA sivut ja data";
<         $admtext['assumeliving'] = "Oleta olevan elossa jos ei kuollut näin moneen vuoteen";
< 		//changed in 11.0.2
---
> 		$admtext['hidedna'] = "Hide all DNA pages and data";
>         $admtext['assumeliving'] = "Assume living if not dead this many years";
1342,1355c1427,1440
< 		$admtext['dnatestscomparecolors'] = "Y-DNA vertaus testien sarake otsikoiden värit";
< 		$admtext['getcolorcodes'] = "Valitse värikoodit tässä";
< 		$admtext['mainbackground'] = "Pääotsikon taustaväri";
< 		$admtext['modebackground'] = "Mode values taustaväri";
< 		$admtext['fastmutbackground'] = "Nopeasti mutatoivien taustaväri";
< 		$admtext['background1_12'] = "Markkereiden 1-12 taustaväri";
< 		$admtext['background13_25'] = "Markkereiden 13-25 taustaväri";
< 		$admtext['background26_37'] = "Markkereiden 26-37 taustaväri";
< 		$admtext['background38_67'] = "Markkereiden 38-67 taustaväri";
< 		$admtext['background111'] = "Markkereiden 68-111 taustaväri";
< 		$admtext['textcolor'] = "Tekstin väri";
< 		$admtext['show_test_number'] = "Näytä DNA testin numero julkisesti";
< 		$admtext['excludefromancsn'] = "Poista perityistä sukunimistä";
< 		$admtext['upperancsunames'] = "Perityt sukunimet VERSAALILLA";
---
> 		$admtext['dnatestscomparecolors'] = "Y-DNA Compare Tests Column Heading Colors";
> 		$admtext['getcolorcodes'] = "Get Color Codes Here";
> 		$admtext['mainbackground'] = "Main heading background color";
> 		$admtext['modebackground'] = "Mode values background color";
> 		$admtext['fastmutbackground'] = "Fast mutating background color";
> 		$admtext['background1_12'] = "Markers 1-12 background color";
> 		$admtext['background13_25'] = "Markers 13-25 background color";
> 		$admtext['background26_37'] = "Markers 26-37 background color";
> 		$admtext['background38_67'] = "Markers 38-67 background color";
> 		$admtext['background111'] = "Markers 68-111 background color";
> 		$admtext['textcolor'] = "Text color";
> 		$admtext['show_test_number'] = "Show DNA Test Number Publicly";
> 		$admtext['excludefromancsn'] = "Exclude From Ancestral Surnames";
> 		$admtext['upperancsunames'] = "Uppercase Ancestral Surnames";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Muuta asetetut etuliitteet TNG asetusten mukaisiksi";
> 		$admtext['sortevents'] = "Lajittele tapahtumat";
> 		$admtext['sortbydate'] = "Tapahtuman päiväys";
> 		$admtext['sortbytype'] = "Tapahtuman tyyppi";
> 		$admtext['allowsuggest'] = "Salli vierailijoiden ehdotukset";
> 		$admtext['livingchecked'] = "Uudet henkilöt ja perheet merkitään elossa oleviksi";
> 		$admtext['maxmarried'] = "Merkitse perheen olevan elossa jos ollut naimisissa alle<br/>tämän vuosimäärän";
> 		$admtext['imagetags'] = "Suorakaiteet";
> 		$admtext['allowcsv'] = "Salli raporttien lataus CSV muodossa";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Varmuuskopiointivaihtoehdot";
> 		$admtext['dosql'] = "Vie SQL:nä";
> 		$admtext['dodrop'] = "Sisällytä DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Sisällytä CREATE TABLE";
> 		$admtext['onrestore'] = "Palautusvaihtoehdot";
> 		$admtext['dodel'] = "Poista ensin aiempi sisältö";
> 		$admtext['download'] = "Lataa";
> 		$admtext['altbirthtypes'] = "Vaihtoehtoiset syntymätapahtumat";
> 		$admtext['dtformat'] = "Taulukkomuoto";
> 		$admtext['conchart'] = "Yhteyskaavio";
> 		$admtext['maxropt'] = "Enimmäismäärä yhteyksiä hauille";
> 		$admtext['maxlopt'] = "Yhteyspolkujen enimmäispituus";
> 		$admtext['showtxtopt'] = "Näytä tekstimuotoinen polkulause";
> 		$admtext['compactboxopt'] = "Näytä henkilölaatikot tiiviissä muodossa";
> 		$admtext['sortbyopt'] = "Lajittele polut";
> 		$admtext['anchoridopt'] = "Ankkuri ID";
> 		$admtext['maxmopt'] = "Enimmäismäärä avioliittoja kytköksessä";
> 		$admtext['saveincfg'] = "Tallenna asetus polulle (kts Yleiset asetukset)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Ei voitu antaa paikkatietoja";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Älä kohdenna maantieteellisesti";
1436d1549
< 		$admtext['backtosecondary'] = "Takaisin toissijaisiin toimintoihin";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Takaisin tuonnin jälkeisiin apuohjelmiin";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Poista muistiinpanot";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Pakkaa ja sisällytä mediatiedostot";
> 		$admtext['downloadzip'] = "Tallenna ZIP-tiedosto";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Näytä vain käytöstä poistetut käyttäjät";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Lähetä myös järjestelmänvalvojille, kun yksi puu on valittuna";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1661c1780
< 		$admtext['dvblurb'] = "Etsi mahdollisia ongelmia tiedoissasi..";
---
> 		$admtext['dvblurb'] = "Mahdollisia virheitä tiedoissasi.";
1663,1666c1782,1785
< 		$admtext['unk_gender'] = "Tuntematon sukupuoli";
< 		$admtext['marr_young'] = "Vihitty liian nuorena (alle 15 vuotiaana)";
< 		$admtext['marr_aft_death'] = "Vihitty kuoleman jälkeen";
< 		$admtext['marr_bef_birth'] = "Vihitty ennen syntymää";
---
> 		$admtext['unk_gender'] = "Sukupuoli tuntematon";
> 		$admtext['marr_young'] = "Avioliitto liian nuorena (alle 15 vuotias)";
> 		$admtext['marr_aft_death'] = "Avioliitto kuoleman jälkeen";
> 		$admtext['marr_bef_birth'] = "Avioliitto ennen syntymää";
1668c1787
< 		$admtext['parents_younger'] = "Syntynyt liian aikaisin (vanhemmat alle 15 vuotiaita tai lapsi syntynyt ennen vihkimistä)";
---
> 		$admtext['parents_younger'] = "Syntynyt liian aikaisin (vanhemmat alle 15 vuotiaat tai lapsi syntynyt ennen avioliittoa)";
1670,1671c1789,1790
< 		$admtext['not_living'] = "Henkilö merkitty olevan elossa vaikka kuolinpäivä asetettu";
< 		$admtext['not_dead'] = "Henkilö merkitty kuolleeksi vaikka mahdollisesti vielä elää";
---
> 		$admtext['not_living'] = "Henkilö merkitty elossa olevaksi, kuolinaika annettu";
> 		$admtext['not_dead'] = "Henkilö merkitty kuolleeksi, mahdollisesti edelleen elää";
1677,1678c1796,1797
< 		$admtext['modlist'] = "Laajennosten lista";
< 		$admtext['removed'] = "removed";
---
> 		$admtext['modlist'] = "Muunnosten lista";
> 		$admtext['removed'] = "poistettu";
1680,1681c1799,1800
< 		$admtext['deleted'] = "deleted";
< 		$admtext['cantdel'] = "can't delete";
---
> 		$admtext['deleted'] = "tuhottu";
> 		$admtext['cantdel'] = "ei voida poistaa";
1684c1803
< 		$admtext['nomods'] = "Laajennosten asetustiedostoja (xxx) ei löytynyt laajennosten kansiosta";
---
> 		$admtext['nomods'] = "Muunnosten asetustiedostoja (xxx) ei löytynyt muunnosten kansiosta";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1701,1702c1818,1819
< 		$admtext['cannotinstall'] = "Tämän laajennoksen asentaminen ei onnistu";
< 		$admtext['emptytarget'] = "Kohdetiedosto on tyhjä.";
---
> 		$admtext['cannotinstall'] = "Unable to install this mod";
> 		$admtext['emptytarget'] = "Target file is an empty file.";
1705c1822
< 		$admtext['editperf'] = "Muutosparametreja muutettiin seuraavasti:";
---
> 		$admtext['editperf'] = "Muokkausparametreja muutettiin seuraavasti:";
1707,1709c1824,1826
< 		$admtext['options'] = "Vaihtoehdot";
< 		$admtext['viewlog'] = "Katso loki";
< 		$admtext['target'] = "Changes";
---
> 		$admtext['options'] = "Asetukset";
> 		$admtext['viewlog'] = "Näytä loki";
> 		$admtext['target'] = "Muutokset";
1711c1828
< 		$admtext['copiesfile'] = "Copies";
---
> 		$admtext['copiesfile'] = "Kopio";
1713c1830
< 		$admtext['logoptions'] = "Laajennosten hallinnan loki";
---
> 		$admtext['logoptions'] = "Muunnosten hallinnan loki";
1715,1720c1832,1837
< 		$admtext['sortlistby'] = "Lajittele";
< 		$admtext['modname'] = "Laajennoksen nimi";
< 		$admtext['bypassconfirm'] = "Ohita vahvistuspyynnöt";
< 		$admtext['modifyoptions'] = "Modify Mod Manager Options";
< 		$admtext['ready'] = "OK to Install";
< 		$admtext['noselected'] = "Et ole valinnut tiedostoja!";
---
> 		$admtext['sortlistby'] = "Listojen lajittelukenttä";
> 		$admtext['modname'] = "Muunnoksen nimi";
> 		$admtext['bypassconfirm'] = "Ohita vahvistusket";
> 		$admtext['modifyoptions'] = "Muokkaa Muunnosten hallinnan vaihtoehtoja";
> 		$admtext['ready'] = "OK asentaa";
> 		$admtext['noselected'] = "Et ole valinnut yhteään tiedostoa!";
1722,1731c1839,1848
< 		$admtext['showlogfile'] = "Show Mod Manager Action Log";
< 		$admtext['recentactions'] = "Laajennosten hallinnan viimeisimmät toimenpiteet";
< 		$admtext['clearlog'] = "Puhdista loki";
< 		$admtext['confirmclearlog'] = "Haluatko varmasti puhdistaa lokin?";
< 		$admtext['modsyntax'] = "Laajennosten syntaksi";
< 		$admtext['modguidelines'] = "Mod Standards";
< 		$admtext['filemod'] = "File xxx is modified by";
< 		$admtext['potconf'] = "Potential Conflicts";
< 		$admtext['modifications'] = "modifications";
< 		$admtext['othermmoptions'] = "Toinen";
---
> 		$admtext['showlogfile'] = "Näytä muunnosten hallinnan loki";
> 		$admtext['recentactions'] = "Muunnosten hallinnan viimeisimmät toimet";
> 		$admtext['clearlog'] = "Tyhjennä loki";
> 		$admtext['confirmclearlog'] = "Haluatko varmasti tyhjentää lokin?";
> 		$admtext['modsyntax'] = "Muunnosten syntaksi";
> 		$admtext['modguidelines'] = "Muunnosten standardit";
> 		$admtext['filemod'] = "Tiedostoa xxx on muokannut";
> 		$admtext['potconf'] = "Mahdolliset konfliktit";
> 		$admtext['modifications'] = "muutokset";
> 		$admtext['othermmoptions'] = "Muut";
1733c1850
< 		$admtext['tngmods'] = "TNG laajennokset ";
---
> 		$admtext['tngmods'] = "Muunnoksia TNG:lle ";
1735c1852
< 		$admtext['copied'] = "copied";
---
> 		$admtext['copied'] = "kopioitu";
1737c1854
< 		$admtext['filescopied'] = "tiedostoja kopioitu";
---
> 		$admtext['filescopied'] = "tiedostoa kopioitu";
1742,1743c1859,1860
< 		$admtext['choosefilter'] = "Choose the filter and click Go for the available controls";
< 		$admtext['mmmaxloglines'] = "Max number of transactions";
---
> 		$admtext['choosefilter'] = "Valitse suodatin ja napsauta OK nähdäksesi käytettävissä olevat säätimet";
> 		$admtext['mmmaxloglines'] = "Tapahtumien enimmäismäärä";
1748,1749c1865,1866
< 		$admtext['edopts'] = "Edit Options";  // previously used as $admtext['edit'] without Option text
< 		$admtext['ok2inst'] = "OK to install";  // previously used $admtext['ready'] which is already translated
---
> 		$admtext['edopts'] = "Muokkaa asetuksia";  // previously used as $admtext['edit'] without Option text
> 		$admtext['ok2inst'] = "Voidaan asentaa";  // previously used $admtext['ready'] which is already translated
1753,1759c1870,1876
< 		$admtext['cantproc'] = "laajennosta ei voida poistaa";
< 		$admtext['cantupd'] = "unable to update parameter";
< 		$admtext['cleanupall'] = "Clean up";
< 		$admtext['copiesreq'] = "file copies specified";
< 		$admtext['delete'] = "Poista";
< 		$admtext['deleteall'] = "Poista";
< 		$admtext['errors'] = "virheet";
---
> 		$admtext['cantproc'] = "muunnosta ei voi poistaa";
> 		$admtext['cantupd'] = "parametria ei voi päivittää";
> 		$admtext['cleanupall'] = "Siivoa";
> 		$admtext['copiesreq'] = "tiedoston kopiointeja määritelty";
> 		$admtext['delete'] = "poista";
> 		$admtext['deleteall'] = "poista";
> 		$admtext['errors'] = "virheitä";
1761,1762c1878,1879
< 		$admtext['filesinst'] = "asennetut tiedostot";
< 		$admtext['filesrem'] = "poistetut tiedostot";
---
> 		$admtext['filesinst'] = "tiedostot asennettu";
> 		$admtext['filesrem'] = "files removed";
1764,1765c1881,1882
< 		$admtext['installall'] = "Asenna";
< 		$admtext['installing'] = "Asennetaan";
---
> 		$admtext['installall'] = "asenna";
> 		$admtext['installing'] = "asennetaan";
1768,1778c1885,1895
< 		$admtext['modsinst'] = "code modifications installed";
< 		$admtext['modrem'] = "mod uninstalled";
< 		$admtext['modsrem'] = "code modifications removed";
< 		$admtext['modsreq'] = "code modifications specified";
< 		$admtext['newfilesreq'] = "new files specified";
< 		$admtext['nfcreated'] = "uusi tiedosto luotu";
< 		$admtext['noact'] = "action tag invalid";
< 		$admtext['nocfgfile'] = "mod file not found";
< 		$admtext['nocomps'] = "missing elements";
< 		$admtext['noend'] = "%end:% tag missing";
< 		$admtext['nolocation'] = "missing location tag";
---
> 		$admtext['modsinst'] = "koodin muutokset asennettu";
> 		$admtext['modrem'] = "muunnoksen asennus poistettu";
> 		$admtext['modsrem'] = "koodimuutokset poistettu";
> 		$admtext['modsreq'] = "koodimuutoksia määritelty";
> 		$admtext['newfilesreq'] = "uusia tiedostoja määritelty";
> 		$admtext['nfcreated'] = "uusia tiedostoja luotu";
> 		$admtext['noact'] = "toimintotägi virheellinen";
> 		$admtext['nocfgfile'] = "muunnoksen tiedostoa ei löydy";
> 		$admtext['nocomps'] = "puuttuvia elementtejä";
> 		$admtext['noend'] = "%end:% tägi puuttuu";
> 		$admtext['nolocation'] = "sijaintitägi puuttuu";
1781c1898
< 		$admtext['optional'] = "vaihtoehtoinen";
---
> 		$admtext['optional'] = "valinnainen";
1784,1799c1901,1916
< 		$admtext['removing'] = "Poistetaan asennusta";    // was Removing
< 		$admtext['reqtag'] = "required tag missing";
< 		$admtext['restparam'] = "Restoring default parameter";
< 		$admtext['return'] = "Return to Mod Manager";
< 		$admtext['tagnoterm'] = "tag not terminated";
< 		$admtext['tagunk'] = "tag is unknown";
< 		$admtext['tgtfile'] = "target file";
< 		$admtext['updated'] = "updated";
< 		$admtext['updparam'] = "Updating parameter";
< 		$admtext['unxend'] = "unexpected end of file";
< 		$admtext['warnings'] = "Warnings";
< 		$admtext['allowdeletepartial'] = "Allow Delete Selected of Partially Installed Mods";
< 		$admtext['allowdeleteinstalled'] = "Allow Delete of individually Installed Mods";
< 		$admtext['showwarnings'] = "Show Mod Warnings in Status";
< 		$admtext['logfullpath'] = "Log full path for file actions";
< 		$admtext['deleting'] = "Deleting ";
---
> 		$admtext['removing'] = "Poistamassa asennusta";    // was Removing
> 		$admtext['reqtag'] = "vaadittu tägi puuttuu";
> 		$admtext['restparam'] = "Palautetaan oletusparametria";
> 		$admtext['return'] = "Palaa Muunnosten hallintaan";
> 		$admtext['tagnoterm'] = "tägiä ei ole lopetettu";
> 		$admtext['tagunk'] = "tägi on tuntematon";
> 		$admtext['tgtfile'] = "kohdetiedosto";
> 		$admtext['updated'] = "päivitetty";
> 		$admtext['updparam'] = "Päivitetään parametria";
> 		$admtext['unxend'] = "tiedoston odottamaton loppu";
> 		$admtext['warnings'] = "Varoitukset";
> 		$admtext['allowdeletepartial'] = "Salli valittujen tai osittain asennettujen muunnosten poistaminen";
> 		$admtext['allowdeleteinstalled'] = "Salli yksittäin asennettujen muunnosten poistaminen";
> 		$admtext['showwarnings'] = "Näytä muunnosten varoitukset tila-kentässä";
> 		$admtext['logfullpath'] = "Kirjaa tiedostotoimintojen koko polku";
> 		$admtext['deleting'] = "Poistetaan ";
1801,1843c1918,1960
< 		$admtext['aflist'] = "Files";
< 		$admtext['hasoptions'] = "Options";
< 		$admtext['restore'] = "Restore Default";
< 		$admtext['stayon'] = "Lock";
< 		$admtext['accessible'] = "accessible";
< 		$admtext['bypassed'] = "bypassed";
< 		$admtext['willbypass'] = "will ignore";  // was "will bypass"
< 		$admtext['cantdel'] = "can't delete";
< 		$admtext['optmissing'] = "file missing (optional)";
< 		$admtext['tgtmissing'] = "target file missing";
< 		$admtext['optlocked'] = "file locked (optional)";
< 		$admtext['tgtlocked'] = "file locked";
< 		$admtext['alreadyrem'] = "already removed";
< 		$admtext['noaccess'] = "no access";
< 		$admtext['badinstall'] = "failed to install";
< 		$admtext['removed'] = "removed";
< 		$admtext['deleted'] = "deleted";
< 		$admtext['optsrcfilemissing'] = "optional source missing";
< 		$admtext['srcfilemissing'] = "source missing";
< 		$admtext['optnocopy'] = "optional file not copied";
< 		$admtext['notcopied'] = "not copied";
< 		$admtext['copied'] = "copied";
< 		$admtext['notcreated'] = "can't create new file";
< 		$admtext['optnotcreated'] = "can't create optional new file";
< 		$admtext['nocreated'] = "not created";
< 		$admtext['fixedheader'] = "Use Fixed Headers";
< 		$admtext['cantremok'] = "can't remove, optional, bypassed";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['edparams'] = "edit parameters";
< 		$admtext['compresslog'] = "Collapse Log Display";
< 		$admtext['formodname'] = "for mod name ";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['fileperms'] = "Please check file permissions";
< 		$admtext['noparam'] = "parameter missing";
< 		$admtext['editing'] = "editing";
< 		$admtext['redirect2log'] = "Redirect to Log For";
< 		$admtext['on_error'] = "Errors Only";
< 		$admtext['on_all'] = "All Transactions";
< 		$admtext['usestriping'] = "Use stripes";
< 		$admtext['stripeafter'] = "Stripe after number of rows";
< 		$admtext['adjusthdrs'] = "Adjust Fixed Headers";
< 		$admtext['displayoptions'] = "Display Settings";
< 		$admtext['no_frag'] = "code fragment not allowed here";
---
> 		$admtext['aflist'] = "Tiedostot";
> 		$admtext['hasoptions'] = "Vaihtoehdot";
> 		$admtext['restore'] = "Palauta oletusarvot";
> 		$admtext['stayon'] = "Lukittu";
> 		$admtext['accessible'] = "saatavilla";
> 		$admtext['bypassed'] = "ohitettu";
> 		$admtext['willbypass'] = "jätetään huomiomatta";  // was "will bypass"
> 		$admtext['cantdel'] = "ei voida poistaa";
> 		$admtext['optmissing'] = "tieodsto puuttuu (valinnainen)";
> 		$admtext['tgtmissing'] = "kohdetiedosto puuttuu";
> 		$admtext['optlocked'] = "tiedosto lukittu (valinnainen)";
> 		$admtext['tgtlocked'] = "tiedosto lukittu";
> 		$admtext['alreadyrem'] = "on jo poistettu";
> 		$admtext['noaccess'] = "ei saatavilla";
> 		$admtext['badinstall'] = "asennus epäonnistui";
> 		$admtext['removed'] = "poistettu";
> 		$admtext['deleted'] = "tuhottu";
> 		$admtext['optsrcfilemissing'] = "valinnainen lähde puuttuu";
> 		$admtext['srcfilemissing'] = "lähde puuttuu";
> 		$admtext['optnocopy'] = "valinnaista tiedostoa ei kopioitu";
> 		$admtext['notcopied'] = "ei kopioitu";
> 		$admtext['copied'] = "kopioitu";
> 		$admtext['notcreated'] = "uutta tiedostoa ei voida luoda";
> 		$admtext['optnotcreated'] = "uutta valinnaista tiedostoa ei voida luoda";
> 		$admtext['nocreated'] = "ei luotu";
> 		$admtext['fixedheader'] = "Käytä kiinteitä otsakkeita";
> 		$admtext['cantremok'] = "ei voi poistaa, valinnainen, ohitettu";
> 		$admtext['nofolder'] = "kohdekansio puuttuu";
> 		$admtext['edparams'] = "muokkaa parametrejä";
> 		$admtext['compresslog'] = "Kutista lokinäkymä";
> 		$admtext['formodname'] = "muunnoksen nimelle ";
> 		$admtext['nofolder'] = "kohdekansio puuttuu";
> 		$admtext['fileperms'] = "Tarkista tiedosto-oikeudet";
> 		$admtext['noparam'] = "parametri puuttuu";
> 		$admtext['editing'] = "muokataan";
> 		$admtext['redirect2log'] = "Ohjaa lokiin";
> 		$admtext['on_error'] = "Vain virheet";
> 		$admtext['on_all'] = "Kaikki toiminnot";
> 		$admtext['usestriping'] = "Käytä raidoitusta";
> 		$admtext['stripeafter'] = "Raidoitus rivin jälkeen";
> 		$admtext['adjusthdrs'] = "Muokkaa kiinteitä otsikoita";
> 		$admtext['displayoptions'] = "Näyttöasetukset";
> 		$admtext['no_frag'] = "koodin palanen ei sallittu tässä";
1848c1965
< 		$admtext['showanalyzer'] = "Näytä analysoi TNG tiedostot välilehti";
---
> 		$admtext['showanalyzer'] = "Näytä Analysoi TNG tiedostot -välilehti";
1850c1967
< 		$admtext['showupdates'] = "Näytä suositellut päivitykset välilehti";
---
> 		$admtext['showupdates'] = "Näytä Suositellut päivitykset -välilehti";
1861c1978
< 		$admtext['compressnames'] = "Poista välilyönnit tiedostonimistä Laajennosten listalla";
---
> 		$admtext['compressnames'] = "Poista välilyönnit tiedostonimistä listalla";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Kaikki munnokset";
> 		$admtext['installedmods'] = "Vain asennetut muunnokset";
> 		$admtext['partinstmods'] = "Asennetut ja osittain asennetut muunnokset";
> 		$admtext['showanalyzeractions'] = "Näytä toiminnot Mod Analyzerissa";
> 		$admtext['badchar'] = "Virheellinen merkki";
1886d2008
< 		$admtext['test_number'] = "Testin numero";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testin numero";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Linkitä tämä DNA testi henkilöön";
1955c2086
< $admtext['find'] = "Etsi...";
---
> $admtext['find'] = "Hae...";
1965d2095
< $admtext['otherevents'] = "Muut tapahtumat";
2050,2051d2179
< $admtext['savereturn'] = "Palaa tälle sivulle";
< $admtext['saveback'] = "Palaa valikkoon";
2058,2059d2185
< $admtext['secondary'] = "Toissijaiset prosessit";
< $admtext['commas'] = "Erota arvot toisistaan pilkuilla";
2101c2227
< $admtext['nobranch'] = "Ei sukuhaaraa";
---
> $admtext['nobranch'] = "Ei haaraa";
2129,2130d2254
< $admtext['secondarymaint'] = "Toissijaiset ylläpitotoiminnot";
< $admtext['customeventtypes'] = "Tapahtumaluokat";
2219d2342
< //changed in 8.0.0
2223,2224c2346
< //moved here in 8.0.0
< $admtext['repoid'] = "Tietovaraston ID-numero";
---
> $admtext['repoid'] = "Tietovaraston ID";
2228,2229c2350
< //added in 8.0.0
< $admtext['show'] = "Esikatselu";
---
> $admtext['show'] = "Esikatsele";
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tyyppi";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Sukunimet";
> $admtext['subhead'] = "Alaotsikko";
> $admtext['image'] = "Kuva";
> $admtext['author'] = "Kirjoittaja";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Aloitus";
> $admtext['showlog'] = "Muutosloki";
> $admtext['nobirthinfo'] = "Ei syntymätietoa";
> //changed in 13.0
> $admtext['savereturn'] = "Tallenna ja pysy sivulla";
> $admtext['saveback'] = "Tallenna ja poistu";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Kaikki kohteet onnistuneesti poistettu.";
> $admtext['private'] = "Yksityinen";
> $admtext['imgtags'] = "Kuvan tunnisteet";
> 
> $admtext['removelink'] = "Poista linkki";
> $admtext['eloptions'] = "Selaa tai poista";
> $admtext['pleaseenter'] = "Anna ";
> 
> $admtext['nolinks'] = "Ei vielä linkkejä";
> $admtext['nogeocode'] = "Ei voitu antaa paikkatietoja";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Valitse<br/>oletus<br/>kuva"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Tapahtuma- / määritetyypit";
> $admtext['secondary'] = "Tuonnin jälkeiset apuohjelmat";
> $admtext['otherevents'] = "Muut tapahtumat / määritteet";
> //added in 14.0
> $admtext['newlinks'] = "Linkit luotu";
> $admtext['newcemlinks'] = "Hautausmaalinkit luotu";
> $admtext['utility'] = "Apuohjelma";
> $admtext['linktype'] = "Tyyppi";
> $admtext['move'] = "Siirrä";
> $admtext['copy'] = "Kopioi";
> $admtext['title2'] = "Otsikko"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Finnish/alltext.php TNG1403/languages/Finnish/alltext.php
13,16c13,16
< $dates['JUN'] = "kesä";
< $dates['JUNE'] = "kesäkuu";
< $dates['JUL'] = "heinä";
< $dates['JULY'] = "heinäkuu";
---
> $dates['JUN'] = "kesä";
> $dates['JUNE'] = "kesäkuu";
> $dates['JUL'] = "heinä";
> $dates['JULY'] = "heinäkuu";
31,32c31,32
< $dates['AFT'] = "jälk.";
< $dates['AFTER'] = "jälkeen";
---
> $dates['AFT'] = "jälk.";
> $dates['AFTER'] = "jälkeen";
36c36
< $dates['FROM'] = "Mistä";
---
> $dates['FROM'] = "Mistä";
38c38
< $dates['Y'] = "Kyllä, päiväys tuntematon";
---
> $dates['Y'] = "Kyllä, päiväys tuntematon";
48c48
< $text['clickdisplay'] = "Klikkaa näyttääksesi";
---
> $text['clickdisplay'] = "Klikkaa näyttääksesi";
50,56c50,56
< $text['forgot1'] = "<strong>Unohditko käyttäjätunnuksesi tai salasanasi?</strong><br />Syötä sähköpostiosoitteesi, johon lähetämme käyttäjätunnuksesi.";
< $text['forgot2'] = "Syötä sähköpostiosoitteesi ja käyttäjätunnuksesi nollataksesi salasanasi (tilapäinen salasana lähetetään sinulle).";
< $text['newpass'] = "Uusi tilapäinen salasanasi";
< $text['usersent'] = "Käyttäjätunnuksesi on lähetetty sähköpostiosoitteeseesi.";
< $text['pwdsent'] = "Uusi tilapäinen salasanasi on lähetetty sähköpostiosoitteeseesi.";
< $text['loginnotsent2'] = "Sähköpostiosoite, jonka annoit, ei täsmää tietojemme kanssa. Mitään tietoja ei lähetetty.";
< $text['loginnotsent3'] = "Sähköpostiosoite ja käyttäjätunnus, jotka annoit, eivät täsmää yhteenkään käyttäjäämme. Mitään tietoja ei lähetetty.";
---
> $text['forgot1'] = "<strong>Unohditko käyttäjätunnuksesi tai salasanasi?</strong><br />Syötä sähköpostiosoitteesi, johon lähetämme käyttäjätunnuksesi.";
> $text['forgot2'] = "Syötä sähköpostiosoitteesi ja käyttäjätunnuksesi nollataksesi salasanasi (tilapäinen salasana lähetetään sinulle).";
> $text['newpass'] = "Uusi tilapäinen salasanasi";
> $text['usersent'] = "Käyttäjätunnuksesi on lähetetty sähköpostiosoitteeseesi.";
> $text['pwdsent'] = "Uusi tilapäinen salasanasi on lähetetty sähköpostiosoitteeseesi.";
> $text['loginnotsent2'] = "Sähköpostiosoite, jonka annoit, ei täsmää tietojemme kanssa. Mitään tietoja ei lähetetty.";
> $text['loginnotsent3'] = "Sähköpostiosoite ja käyttäjätunnus, jotka annoit, eivät täsmää yhteenkään käyttäjäämme. Mitään tietoja ei lähetetty.";
65,66c65,66
< $text['histories'] = "Elämäkerrat";
< $text['recordings'] = "Äänitteet";
---
> $text['histories'] = "Elämäkerrat";
> $text['recordings'] = "Äänitteet";
74c74
< $admtext['level4'] = "Lääni";
---
> $admtext['level4'] = "Lääni";
85,86c85,86
< $text['none'] = "None";
< $text['mainton'] = "Ylläpitotila on päällä";
---
> $text['none'] = "Ei mitään";
> $text['mainton'] = "Ylläpitotila on päällä";
88d87
< //moved here in 8.0.0
91,95c90,94
< $admtext['confunlink'] = "Haluatko varmasti poistaa tämän henkilön linkityksen puolisona tähän perheeseen?";
< $admtext['confunlinkc'] = "Haluatko varmasti poistaa tämän henkilön linkityksen lapsena tähän perheeseen?";
< $admtext['confremchild'] = "Haluatko varmasti poistaa tämän lapsen tästä perheestä? Henkilöä ei poisteta tietokannasta.";
< $admtext['enterfamilyid'] = "Syötä perhe-ID.";
< $admtext['yes'] = "Kyllä";
---
> $admtext['confunlink'] = "Haluatko varmasti poistaa tämän henkilön linkityksen puolisona tähän perheeseen?";
> $admtext['confunlinkc'] = "Haluatko varmasti poistaa tämän henkilön linkityksen lapsena tähän perheeseen?";
> $admtext['confremchild'] = "Haluatko varmasti poistaa tämän lapsen tästä perheestä? Henkilöä ei poisteta tietokannasta.";
> $admtext['enterfamilyid'] = "Syötä perhe-ID.";
> $admtext['yes'] = "Kyllä";
107c106
< $admtext['SLGC'] = "Sinetöity vanhemmille (LDS)";
---
> $admtext['SLGC'] = "Sinetöity vanhemmille (LDS)";
109,115c108,112
< $admtext['SLGS'] = "Sinetöity puolisolle (LDS)";
< $admtext['hello'] = "Hauska nähdä taas,";
< $admtext['activated'] = "Hakemasi käyttäjätunnus sukusivuille on luotu";
< $admtext['infois'] = "Käyttäjätietosi ovat";
< $admtext['subjectline'] = "Sukutietojen käyttäjätunnuksesi on aktivoitu.";
< 
< //moved here in 8.1.0
---
> $admtext['SLGS'] = "Sinetöity puolisolle (LDS)";
> $admtext['hello'] = "Hauska nähdä taas,";
> $admtext['activated'] = "Hakemasi käyttäjätunnus sukusivuille on luotu";
> $admtext['infois'] = "Käyttäjätietosi ovat";
> $admtext['subjectline'] = "Sukutietojen käyttäjätunnuksesi on aktivoitu.";
119,120c116
< $admtext['sealing'] = "sinetöinti";
< //added in 11.0.3
---
> $admtext['sealing'] = "sinetöinti";
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
136c129
< $text['contains'] = "sisältää";
---
> $text['contains'] = "sisältää";
139,144c132,134
< //moved here in 9.0.4
< $text['top'] = "Yleisimmät";
< 
< //moved here in 10.0.0
< $text['startingind'] = "Lähdehenkilö";
< $text['enteremail'] = "Anna oikean muotoinen sähköpostiosoite";
---
> $text['top'] = "Yleisimmät";
> $text['startingind'] = "Lähdehenkilö";
> $text['enteremail'] = "Anna oikean muotoinen sähköpostiosoite";
148,149d137
< 
< //added in 10.0.0
152c140
< $admtext['step'] = "veli- tai tytärpuoli";
---
> $admtext['step'] = "veli- tai tytärpuoli";
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "TNG ohjelmistossa tapahtui virhe. Tämä voi johtua virheellisistä asetuksista, vajavaisesta päivityksestä tai ohjelmistovirheestä. Jos olet sivuston omistaja, ota yhteyttä TNG:n tukeen saadaksesi apua ongelmaan. Ole hyvä ja kopioi alla näkyvä haku viestiisi.";
163,170c148,154
< //moved here in 12.0.0
< $admtext['menu'] = "Menu";
< $admtext['dna_groups'] = "DNA ryhmät";
< $admtext['allbranches'] = "All Branches";
< $admtext['active'] = "Active";
< $admtext['select'] = "Select";
< $admtext['selectall'] = "Select All";
< $admtext['clearall'] = "Clear All";
---
> $admtext['menu'] = "Valikko";
> $admtext['dna_groups'] = "DNA ryhmät";
> $admtext['allbranches'] = "Kaikki haarat";
> $admtext['active'] = "Aktiivinen";
> $admtext['select'] = "Valitse";
> $admtext['selectall'] = "Valitse kaikki";
> $admtext['clearall'] = "Tyhjennä kaikki";
173,178c157,160
< //added here in 12.0.0
< $text['testgroup'] = "Testiryhmä";
< $text['test_number'] = "Test Number/Name";
< $text['test_info_display'] = "Test Information To Display";
< $text['confirmed'] = "Confirmed";
< $text['predicted'] = "Predicted";
---
> $text['testgroup'] = "Testiryhmä";
> $text['test_info_display'] = "Näytettävä testitieto";
> $text['confirmed'] = "Vahvistettu";
> $text['predicted'] = "Ennustettu";
180,182c162,164
< $admtext['admin_notes'] = "Ylläpitäjän muistiinpanot";
< $admtext['mda'] = "Kaukaisin esi-isä";
< $admtext['mrca'] = "Viimeisin yhteinen esi-isä";
---
> $admtext['admin_notes'] = "Ylläpitäjän muistiinpanot";
> $admtext['mda'] = "Kaukaisin esi-isä";
> $admtext['mrca'] = "Viimeisin yhteinen esi-isä";
184c166
< $admtext['ref_seq'] = "Reference sequence";
---
> $admtext['ref_seq'] = "Viitesekvenssi";
191c173
< $text['keep_name_private'] = "Pidä nimi yksityisenä";
---
> $text['keep_name_private'] = "Pidä nimi yksityisenä";
194,198c176,180
< $admtext['vendor'] = "Myyjä";
< $admtext['markers'] = "Markkereiden lukumäärä";
< $admtext['haplo'] = "Haploryhmä";
< $admtext['termsnp'] = "Pääte SNP";
< $admtext['signsnp'] = "Merkitsevä SNPs";
---
> $admtext['vendor'] = "Myyjä";
> $admtext['markers'] = "Markkereiden lukumäärä";
> $admtext['haplo'] = "Haploryhmä";
> $admtext['termsnp'] = "Pääte SNP";
> $admtext['signsnp'] = "Merkitsevä SNPs";
202a185,252
> $admtext['xtra_mut'] = "Lisä mutaatiot";
> $text['test_number'] = "Testin numero/nimi";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suositeltu";
> $admtext['actual_relationship'] = "Todellinen suhde";
> $admtext['related_side'] = "Liittyvä haara";
> $admtext['shared_dna'] = "Jaettu DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Jaetut segmentit";
> $admtext['largest_segment'] = "Suurin segmentti";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segmentin alku";
> $admtext['segment_end'] = "Segmentin loppu";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Yksityinen testi";
> $text['shared_dna'] = "Jaettu DNA-segmentti";
> $text['for_match'] = "tälle osumalle";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "Kaikki ryhmät";
> $admtext['alltypes'] = "Kaikki tyypit";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "s.";
> $text['chrabbr'] = "kas.";
> $text['deathabbr'] = "k.";  //from descend
> $text['burialabbr'] = "haud.";  //from descend
> $text['marrabbr'] = "vih.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Etsi kaikki henkilöt, joilla on merkitty tapahtuma tällä paikalla";
> $text['firstpage'] = "Ensimmäinen sivu";
> $text['lastpage'] = "Viimeinen sivu";
> 
> //changed in 13.0.0
> $text['problem'] = "TNG ohjelmistossa tapahtui virhe. Mitä tehdä:<p>Jos asensit juuri päivityksen, saatoit hypätä jonkin asennusvaiheen yli. Siirry takaisin päivitysohjeeseen ja lue ohjeet uudelleen. Kiinnitä erityistä huomiota tietokantarakenne vaiheeseen.</p><p>Jos asensit TNG ohjelmiston ensimmäistä kertaa, sinun tulee mahdollisesti edelleen luoda tietokantataulut. Palaa readme.html sivulle löytääksesi kyseisen vaiheen.</p><p>Jos olet sivuston omistaja, voit ottaa yhteyttä TNG tukeen saadaksesi lisäohjeita tämän ongelman selvittämiseksi. Kopioi alla oleva hakulauseke osaksi kysymystäsi.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Ei haaraa";
> 
> //added in 14.0
> $text['oneyear'] = "vuosi";
> $text['pwdcodelink'] = "Napsauta tätä linkkiä saadaksesi väliaikaisen salasanan";
> $text['pwdcodesent'] = "Salasanan palautuslinkki on lähetetty sähköpostiosoitteeseesi.";
> $text['moved'] = "Siirretty";
> $text['citation'] = "Sitaatti";
> $text['other'] = "Muu";
> $text['death'] = "Kuollut";
> $text['burial'] = "Haudattu";
> $text['cremation'] = "Tuhkattu";
> $text['marriage'] = "Vihitty";
> $text['divorce'] = "Ero";
> $text['bylength'] = "Vaiheet";
> $text['bymarriages'] = "Avioliitot";
> $text['none'] = "Ei mitään";
> 
> //moved here in 14.0
> $text['family'] = "Perhe";
> $text['source'] = "Lähde";
> $text['repository'] = "Tietovarasto";
> $text['place'] = "Paikka";
> $admtext['BAPM'] = "Kaste";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Lisä mutaatiot";
---
> $text['glang'] = "fi";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Finnish/text.php TNG1403/languages/Finnish/text.php
13c13
< 		$text['repoid'] = "Tietovaraston ID-numero";
---
> 		$text['repoid'] = "Tietovaraston ID";
69d68
< 		$text['general'] = "Yleinen";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Ole hyvä ja valitse kaksi henkilöä.";
---
> 		$text['select2inds'] = "Valitse kaksi henkilöä.";
90c90
< 		$text['sameperson'] = "Valitsit molempiin kenttiin saman henkilön!";
---
> 		$text['sameperson'] = "Nämä kaksi henkilöä ovat sama henkilö.";
92,93c92,93
< 		$text['findrelinstr'] = "Sukulaisuussuhteen selvittämiseksi, anna kahden henkilön ID-numerot, tai pidä henkilöt näkyvillä. Klikkaa sitten 'Selvitä' selvittääksesi heidän sukulaisuussuhteensa.";
< 		$text['sometimes'] = "(Sukupolvien eri määrä voi joskus antaa eri tuloksen.)";
---
> 		$text['findrelinstr'] = "Sukulaisuussuhteen selvittämiseksi, anna kahden henkilön ID-numerot, tai pidä henkilöt näkyvillä. Klikkaa sitten ‘Selvitä’ selvittääksesi heidän sukulaisuussuhteensa.";
> 		$text['sometimes'] = "(Joskus eri sukupolvien tarkistaminen antaa erilaisen tuloksen.)";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Etsi yhteyksiä";
> 		$text['findrel2'] = "Valitse sukulaisuussuhteita ja muita kytköksiä";
> 		$text['makeme2nd'] = "Käytä minun ID:tä";
> 		$text['usebookmarks'] = "Käytä kirjanmerkkejä";
> 		$text['select2inds'] = "Valitse kaksi henkilöä.";
> 		$text['indinfofor'] = "Yksilölliset tiedot";
> 		$text['nobookmarks'] = "Käytettävää kirjanmerkkiä ei ole";
> 		$text['bkmtitle'] = "Kirjanmerkeistä löydetyt henkilöt";
> 		$text['bkminfo'] = "Valitse henkilö:";
> 		$text['sortpathsby'] = "Lajittele polut lukumäärän mukaan";
> 		$text['sortbyshort'] = "Lajittele";
> 		$text['bylengthshort'] = "Pituus";
> 		$text['badID1'] = ": väärä henkilö1 ID - palaa korjaamaan";
> 		$text['badID2'] = ": väärä henkilö2 ID - palaa korjaamaan";
> 		$text['notintree'] = ": henkilö tällä ID:llä ei ole nykyisessä tietokantapuussa.";
> 		$text['sameperson'] = "Nämä kaksi henkilöä ovat sama henkilö.";;
> 		$text['nopaths'] = "Nämä henkilöt eivät ole yhteydessä toisiinsa.";
> 		$text['nopaths1'] = "Ei enempää yhteyksiä lyhyempiä kuin xxx";
> 		$text['nopaths2'] = "xxx hakuvaihetta";
> 		$text['longestpath'] = "(pisin tarkastettu polku tähän mennessä oli xxx vaihetta pitkä)";
> 		$text['relevantpaths'] = "Löydettyjen erilaisten osuvien polkujen lukumäärä: xxx";
> 		$text['skipMarr'] = "(lisäksi löydettyjen polkujen määrä, joita ei näytetä liian monen avioliiton vuoksi, oli: xxx)";
> 		$text['mjaor'] = "tai";
> 		$text['connectionsto'] = "Yhteydet ";
> 		$text['findanotherpers'] = "Etsi toinen henkilö...";
> 		$text['sometimes'] = "(Joskus eri sukupolvien tarkistaminen antaa erilaisen tuloksen.)";
> 		$text['anotherpath'] = "Etsi muita yhteyksiä";
> 		$text['xpath'] = "Polku ";
> 		$text['primary'] = "Aloitushenkilö"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Loppuhenkilö";
> 		$text['parent'] = "Vanhempi";
> 		$text['mhfather'] = "isänsä";
> 		$text['mhmother'] = "äitinsä";
> 		$text['mhhusband'] = "aviomiehensä";
> 		$text['mhwife'] = "vaimonsa";
> 		$text['mhson'] = "poikansa";
> 		$text['mhdaughter'] = "tyttärensä";
> 		$text['fhfather'] = "isänsä";
> 		$text['fhmother'] = "äitinsä";
> 		$text['fhhusband'] = "aviomiehensä";
> 		$text['fhwife'] = "vaimonsa";
> 		$text['fhson'] = "poikansa";
> 		$text['fhdaughter'] = "tyttärensä";
> 		$text['hfather'] = "isä";
> 		$text['hmother'] = "äiti";
> 		$text['hhusband'] = "aviomies";
> 		$text['hwife'] = "vaimo";
> 		$text['hson'] = "poika";
> 		$text['hdaughter'] = "tytär";
> 		$text['maxruns'] = "Enimmäismäärä polkuja tarkistettavaksi";
> 		$text['maxrshort'] = "Enimmäispolut";
> 		$text['maxlength'] = "Yhteyspolut korkeintaan";
> 		$text['maxlshort'] = "Maksimipituus";
> 		$text['xstep'] = "vaihe";
> 		$text['xsteps'] = "vaiheet";
> 		$text['xmarriages'] = "xxx avioliitot";
> 		$text['xmarriage'] = "1 avioliitto";
> 		$text['showspouses'] = "Näytä molemmat puolisot";
> 		$text['showTxt'] = "Näytä tekstimuotoinen polun kuvaus";
> 		$text['showTxtshort'] = "Tekstimuotoinen kuvaus.";
> 		$text['compactBox'] = "Näytä henkilölaatikot tiiviinä";
> 		$text['compactBoxshort'] = "Kompaktit laatikot";
> 		$text['paths'] = "Polut";
> 		$text['dospouses2'] = "Näytä puolisot";
> 		$text['maxmopt'] = "Maksimi määrä avioliittoja kytkökselle";
> 		$text['maxm'] = "Maksimi avioliitot";
> 		$text['arerelated'] = "Nämä henkilöt ovat sukulaisia, joiden yhteys näytetään polulla 1";
> 		$text['simplerel'] = "Yksinkertainen sukulaisuussuhteen haku";
196d264
< 		$text['scrollnote'] = "Huomioi: Voit joutua vierittämään sivua alas tai oikealle nähdäksesi koko kaavion.";
199d266
< 		$text['popupnote2'] = " = Uusi sukupuu tästä henkilöstä alkaen";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Taulukot";
> 		$text['dtchildren'] = "Lapset";
> 		$text['dtgrandchildren'] = "Lapsenlapset";
> 		$text['dtggrandchildren'] = "Lapsenlapsenlapset";
> 		$text['dtgggrandchildren'] = "lapsenlapsenlapsi"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Ei jälkeläisiä";
> 		$text['dtgen'] = "Sp";
> 		$text['dttotal'] = "Yhteensä";
> 		$text['dtselect'] = "Valitse";
> 		$text['dteachfulltable'] = "Jokaisessa täydessä taulussa on";
> 		$text['dtrows'] = "rivit";
> 		$text['dtdisplayingtable'] = "Näytetään taulukko";
> 		$text['dtgototable'] = "Siirry taulukkoon:";
> 		$text['fcinstrdn'] = "Näytä perhe puolison kanssa";
> 		$text['fcinstrup'] = "Näytä perhe vanhempien kanssa";
> 		$text['fcinstrplus'] = "Valitse muut puolisot";
> 		$text['fcinstrfam'] = "Valitse muut vanhemmat";
381,383c467
< 		$text['firstpage'] = "Ensimmäinen sivu";
< 		$text['lastpage'] = "Viimeinen sivu";
< 		$text['photoowner'] = "Omistaja/Lähde";
---
> 		$text['photoowner'] = "Alkuperäisen kuvan omistaja";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Vaihda tunnisteiden tilaa";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Uusi salasana uudestaan";
> 		$text['resetsuccess'] = "Onnistui: Salasana on nollattu";
> 		$text['resetfail'] = "Virhe: Salasanaa ei nollattu";
> 		$text['failreason0'] = " (tuntematon tietokantavirhe)";
> 		$text['failreason2'] = " (sinulla ei ole lupaa vaihtaa salasanaasi)";
> 		$text['failreason3'] = " (salasanat eivät täsmänneet)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Lähdeviitteet yhteensä";
618d710
< 		$text['loginfirst'] = "Kirjaudu ensin sisään.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Käyttäjätiedot löydetty rekisteristä. Jatkaaksesi sinun tulee joko kirjautua sisään tai poistaa kaikki tiedot käyttäjätaulusta.";
629,630d722
< 		$text['zoomin'] = "Suurenna";
< 		$text['zoomout'] = "Pienennä";
656d747
< 		$text['dna_info_head'] = "DNA testi tiedot";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Vertaa valittuja mtDNA testejä";
> 		$text['dnatestscompare_atdna'] = "Vertaa valittuja atDNA testejä";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Vähintään kaksi testiä tulee valita vertailtavaksi.";
670,671d785
< $text['birthabbr'] = "s.";
< $text['chrabbr'] = "kas.";
675d788
< $text['family'] = "Perhe"; //from getperson
685d797
< $text['deathabbr'] = "k.";  //from descend
706d817
< $text['burialabbr'] = "haud.";  //from descend
712d822
< $text['place'] = "Paikka";
715d824
< $text['marrabbr'] = "vih.";
738d846
< $text['source'] = "Lähde";
766d873
< $text['repository'] = "Tietovarasto";
770d876
< $text['findplaces'] = "Etsi kaikki henkilöt, joilla on merkitty tapahtuma tällä paikalla";
804d909
< $text['glang'] = "&amp;hl=fi";
816d920
< $text['none'] = "Ei mikään";
916c1020
< $text['livingnote'] = "Ainakin yksi elävä henkilö on linkitetty tähän muistiinpanoon - Yksityiskohtaisia tietoja ei näytetä.";
---
> $text['livingnote'] = "Ainakin yksi elävä henkilö on linkitetty tähän muistiinpanoon – Yksityiskohtaisia tietoja ei näytetä.";
924d1027
< $text['otherevents'] = "Muut tapahtumat";
952,953d1054
< $text['people_have'] = "henkilö on linkittänyt DNA testin";
< $text['person_has'] = "henkilöt ovat linkittäneet DNA testin";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA-testit kytketty henkilöön";
> $text['testislinked'] = "DNA-testi kytketty henkilöön";
> 
> //added in 12.2
> $text['quicklinks'] = "Pikalinkit";
> $text['yourname'] = "Nimesi";
> $text['youremail'] = "Sähköpostiosoitteesi";
> $text['liketoadd'] = "Kaikki tiedot, jotka haluat lisätä";
> $text['webmastermsg'] = "Verkkovastaavan viesti";
> $text['gallery'] = "Katso galleria";
> $text['wasborn_male'] = "syntyi";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "syntyi"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "kastettiin";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "kastettiin";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "died";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "died";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "haudattiin"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "haudattiin"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "tuhrattiin";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "tuhrattiin";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "naimisissa";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "naimisissa";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "erotettiin";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "erotettiin";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = "sisään";			// used as a preposition to the location
> $text['onthisdate'] = "päällä";		// when used with full date
> $text['inthisyear'] = "sisään";		// when used with year only or month / year dates
> $text['and'] = "ja";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA testi tiedot";
> //added in 13.0
> $text['visitor'] = "Vierailija";
> 
> $text['popupnote2'] = " = Uusi sukupuu tästä henkilöstä alkaen";
> 
> //moved here in 14.0
> $text['zoomin'] = "Suurenna";
> $text['zoomout'] = "Pienennä";
> $text['scrollnote'] = "Vedä tai vieritä nähdäksesi enemmän kaaviosta.";
> $text['general'] = "Yleinen";
> 
> //changed in 14.0
> $text['otherevents'] = "Muut tapahtumat ja määritteet";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Yhteydet";
> $text['continue'] = "Jatka";
> $text['title2'] = "Otsikko"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Finnish-UTF8/admintext.php TNG1403/languages/Finnish-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Anna ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Valitse tuotava tiedosto.";
> 		$admtext['addreplacedata'] = "Lisää tai korvaa sukututkimustietosi (voi viedä useita minuutteja tiedoston koosta riippuen )";
> 		$admtext['fromyourcomputer'] = "Tietokoneeltasi";
> 		$admtext['importdata'] = "Lue tiedot";
> 		$admtext['replace'] = "Korvaa (valitusta sukupuusta)";
> 		$admtext['desttree'] = "Kohde sukupuu";
> 		$admtext['selectdesttree'] = "Valitse tai kirjoita kohde sukupuu.";
> 		$admtext['selectexisting'] = "Tuo";
> 		$admtext['ucaselast'] = "Sukunimet isoilla kirjaimilla";
> 		$admtext['norecalc'] = "Älä laske uudelleen Elossa-merkintöjä";
> 		$admtext['autooffset'] = "Aloita IDt ensimmäisestä vapaasta numerosta";
> 		$admtext['mustselecttree'] = "Valitse sukupuu ennen tätä toimintoa.";
> 		$admtext['onwebserver'] = "Web-palvelimella (GEDCOM hakemistossa)";
> 		$admtext['imphints'] = "Vinkki: Kaikki nykyinen data tarkoittaa kaikkia henkilöitä, perheitä, lähteitä ja muistiinpanoja (mediakytkennät eivät katoa niin kauan kuin ID:t pysyvät samoina). Osumat perustuvat aina pelkkiin ID-numeroihin. Uudet tietueet lisätään aina uusina. Lisääminen tuo kaikki tietueet uusilla ID-numeroilla.";
> 		$admtext['destbranch'] = "Kohdesukuhaara (vaihtoehtoinen)";
> 		$admtext['importlatlong'] = "Tuo pituus- ja leveysasteet, jos niitä on";
> 		$admtext['opening'] = "Avataan";
> 		$admtext['reopen'] = "Avataan uudelleen";
> 		$admtext['uploading'] = "Ladataan";
> 		$admtext['stop'] = "Keskeytä";
> 		$admtext['stopped'] = "Tuonti keskeytetty";
> 		$admtext['resume'] = "klikkaa jatkaaksesi";
> 		$admtext['neweronly'] = "Korvaa vain, jos uudempi";
> 		$admtext['oldimport'] = "Vanha tapa tuoda (ei edistymispalkkia)";
> 		$admtext['importgedcom'] = "Tuo GEDCOM tiedosto (voi olla zip-pakattu)";
> 		$admtext['stopbackup'] = "Seis! Saattaisi olla hyvä ajatus tehdä varmistus tämän hetken tiedoista ennen etenemistä.";
> 		$admtext['importmedia'] = "Tuo media (jos saatavilla)";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Varmista, että etuliitteet ja päätteet (Yleiset asetukset) ovat oikein tälle tiedostolle.";
> 		$admtext['chkimpsettings'] = "Tarkista Tuonnin asetukset saadaksesi lisää vaihtoehtoja.";
> 		$admtext['eventsonly'] = "Tuo vain mukautetut tapahtumatyypit ja määritteet (dataa ei lisätä, korvata tai liitetä)";
> 		$admtext['allevents'] = "Hyväksy tiedot kaikille uusille tapahtumatyypeille ja -määritteille";
> 		$admtext['finishingimporting'] = "Lopetetaan...";
> 		$admtext['fileuploadfailed'] = "Tiedoston lataus epäonnisui. Voi johtua siitä, että tiedosto on liian suuri. Kokeile ladata tiedosto FTP:llä GEDCOM kansioosi. Valitse ja tuo tiedosto sitten sieltä.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Muokkaa olemassa olevaa tapahtumaluokkaa";
135,138d168
< 		$admtext['entertypedesc'] = "Anna tyyppi/kuvaus tälle uudelle tapahtumaluokalle.";
< 		$admtext['enterdisplay'] = "Anna näyttönimi tälle tapahtumaluokalle.";
< 		$admtext['existingeventtypeinfo'] = "Olemassa olevan tapahtumaluokan tiedot";
< 		$admtext['neweventtypeinfo'] = "Uuden tapahtumaluokan tiedot";
145,146d174
< 		$admtext['addnewevtype'] = "Lisää uusi tapahtumaluokka";
< 		$admtext['createnewevtype'] = "Luo uusi tapahtumaluokka";
149,150d176
< 		$admtext['existingevtypes'] = "Olemassa olevat tapahtumaluokat";
< 		$admtext['edsevtypes'] = "Muokkaa, poista tai lajittele aiemmin syötettyjä tapahtumaluokkia";
152d177
< 		$admtext['confdeleteevtype'] = "Haluatko poistaa tämän tapahtumaluokan?";
154d178
< 		$admtext['selectentertag'] = "Valitse tai syötä tagi tälle tapahtumaluokalle.";
208d231
< 		$admtext['changestoallevtypes'] = "Muutokset kaikille tapahtumaluokille";
214d236
< 		$admtext['BAPM'] = "Kaste";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Haluatko varmasti poistaa tämän tapahtumatyypin? Kaikki tämän tyypin tapahtumat tullaan myös poistamaan.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Lisää uusi tyyppi";
> 		$admtext['createnewevtype'] = "Luo uusi määrite- tai tapahtumatyyppitietue";
> 		$admtext['modifyeventtype'] = "Muokkaa nykyistä tyyppiä";
> 		$admtext['entertypedesc'] = "Anna tyyppi/kuvaus tälle uudelle määritteelle tai tapahtumatyypille.";
> 		$admtext['enterdisplay'] = "Anna tälle uudelle määritteelle tai tapahtumatyypille näyttöteksti.";
> 		$admtext['existingeventtypeinfo'] = "Olemassa olevat määritteen tai tapahtumatyypin tiedot";
> 		$admtext['neweventtypeinfo'] = "Uudet määritteen tai tapahtumatyypin tiedot";
> 		$admtext['existingevtypes'] = "Olemassa olevat määrite- tai tapahtumatyypit";
> 		$admtext['edsevtypes'] = "Muokkaa, poista tai lajittele aiemmin syötettyjä määrite- ja tapahtumatyyppejä";
> 		$admtext['selectentertag'] = "Valitse tai syötä tunniste tälle määrite- tai tapahtumatyypille.";
> 		$admtext['changestoallevtypes'] = "Muutokset kaikkiin määrite- tai tapahtumatyyppeihin";
268d303
< 		$admtext['nobirthinfo'] = "Ei syntymätietoa";
316c351
< 		$admtext['nokids'] = "Ei lapisia";
---
> 		$admtext['nokids'] = "Ei lapsia";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Valitse<br/>oletus<br/>kuva"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Tallenna + Uudet vanhemmat";
> 		$admtext['savenewspouse'] = "Tallenna + Uusi puoliso";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Vaiht. syntymä";
354d391
< 		$admtext['enterphotodesc'] = "Syötä kuvaus kuvalle.";
388d424
< 		$admtext['photoowner'] = "Omistaja/lähde";
417d452
< 		$admtext['imgmap'] = "Kuvakartta";
488c523
< 		$admtext['newmediainfo'] = "New Media Information";
---
> 		$admtext['newmediainfo'] = "Uuden mediatiedoston metatiedot";
490d524
< 		$admtext['mapinstr3'] = "Linkittääksesi tietyn alueen valokuvasta tiettyyn henkilöön, valitse henkilön sukupuu, ja valitse alueen muoto ja koko. Klikkaa sen jälkeen alueen keskikohtaa valokuvassa. Popup-ikkuna auttaa haluamasi henkilön valinnassa. Kun valinta on tehty, kuvakartan html-koodi lisätään oheiseen tekstikenttään. Toista kuvakartan teko jokaiselle haluamallesi alueelle.";
495d528
< 		$admtext['removelink'] = "Poista linkki";
502d534
< 		$admtext['eloptions'] = "Selaa tai poista";
509d540
< 		$admtext['nolinks'] = "Ei vielä linkkejä";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544,545c573
< 		//added in 9.2.0
< 		$admtext['upload'] = "Lähetä";
---
> 		$admtext['upload'] = "Lataus";
547c575
< 		$admtext['mediaupl'] = "Lähetä mediatiedosto";
---
> 		$admtext['mediaupl'] = "Lataa mediatiedostoja";
549c577
< 		$admtext['startupl'] = "Käynnistä lähetys";
---
> 		$admtext['startupl'] = "Käynnistä lataus";
551,552c579
< 		$admtext['cancelupl'] = "Peru lähetys";
< 		//added in 11.0.0
---
> 		$admtext['cancelupl'] = "Peru lataus";
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Image Map (taaksepäin yhteensopivuuden vuoksi)";
> 		$admtext['photoowner'] = "Alkuperäisen kuvan omistaja";
> 		$admtext['nothumb'] = "Ei peukalokuvaa";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Kohdetta ei voitu lisätä, todennäköisesti koska tiedosto oli liian suuri eikä sitä voitu ladata tai käyttää pikkukuvan tekemiseen.";
> 		$admtext['moved'] = "Siirretty";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Kirjoita tälle medialle otsikko tai kuvaus.";
> 		$admtext['mapinstr3'] = "Jos haluat linkittää tämän valokuvan alueen henkilöön, perheeseen tai muuhun kokonaisuuteen, valitse ensin asianmukainen puu ja kokonaisuus ja luo sitten suorakulmio halutulle alueelle. Tämä tehdään napsauttamalla alueen vasenta yläkulmaa ja vetämällä sitten oikeaan alakulmaan. Vaihtoehtoisesti voit napsauttaa vasenta yläkulmaa ja sitten uudelleen oikeaa alakulmaa. Ponnahdusikkuna auttaa sinua valitsemaan henkilön tai muun tahon. Tee valinta ja toista tämä prosessi tarvittaessa muille alueille. Valitse olemassa oleva alue napsauttamalla ja siirrä sitten vetämällä tai poista napsauttamalla X-merkkiä.";
596d633
< 		$admtext['foremptystring'] = "Jätä tämä kenttä tyhjäksi ja osoita \"Lisää >>.\" syöttääksesi tyhjän tekstin";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Ohjeet: Vedä tai kaksoisnapsauta vasemmalla olevia kohteita oikealla oleviin luetteloihin. Järjestä uudelleen vetämällä ylös ja alas. Poista kaksoisnapsauttamalla uudelleen.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Jos merkkijono on tyhjä, jätä tämä kenttä tyhjäksi ja napsauta >>";
651,655d690
< 		$admtext['selectimportfile'] = "Valitse tuotava tiedosto.";
< 		$admtext['importgedcom'] = "Tuo GEDCOM (standardi 5.5 tiedostomuoto)";
< 		$admtext['addreplacedata'] = "Lisää tai korvaa sukututkimustietosi (voi viedä useita minuutteja tiedoston koosta riippuen )";
< 		$admtext['fromyourcomputer'] = "Tietokoneeltasi";
< 		$admtext['importdata'] = "Lue tiedot";
657,660d691
< 		$admtext['replace'] = "Korvaa (valitusta sukupuusta)";
< 		$admtext['desttree'] = "Kohde sukupuu";
< 		$admtext['selectdesttree'] = "Valitse tai kirjoita kohde sukupuu.";
< 		$admtext['selectexisting'] = "Tuo";
668,673d698
< 		$admtext['ucaselast'] = "Sukunimet isoilla kirjaimilla";
< 		$admtext['norecalc'] = "Älä laske uudelleen Elossa-merkintöjä";
< 		$admtext['autooffset'] = "Aloita IDt ensimmäisestä vapaasta numerosta";
< 
< 		$admtext['mustselecttree'] = "Valitse sukupuu ennen tätä toimintoa.";
< 		$admtext['importmedia'] = "Tuo media (jos saatavilla)";
675d699
< 		$admtext['neweronly'] = "Korvaa vain, jos uudempi";
677,692d700
< 		$admtext['onwebserver'] = "Web-palvelimella (GEDCOM hakemistossa)";
< 		$admtext['eventsonly'] = "Only import Custom Event Types";
< 		$admtext['imphints'] = "Vinkki: Kaikki nykyinen data tarkoittaa kaikkia henkilöitä, perheitä, lähteitä ja muistiinpanoja (mediakytkennät eivät katoa niin kauan kuin ID:t pysyvät samoina). Osumat perustuvat aina pelkkiin ID-numeroihin. Uudet tietueet lisätään aina uusina. Lisääminen tuo kaikki tietueet uusilla ID-numeroilla.";
< 		$admtext['allevents'] = "Salli data kaikille uusille Custom Event Type tiedoille";
< 		$admtext['destbranch'] = "Kohdesukuhaara (vaihtoehtoinen)";
< 		$admtext['inframe'] = "(kehyksessä)";
< 		$admtext['getstart'] = "Aloitus";
< 		$admtext['importlatlong'] = "Tuo pituus- ja leveysasteet, jos niitä on";
< 		$admtext['opening'] = "Avataan";
< 		$admtext['reopen'] = "Avataan uudelleen";
< 		$admtext['uploading'] = "Ladataan";
< 		$admtext['stop'] = "Keskeytä";
< 		$admtext['stopped'] = "Tuonti keskeytetty";
< 		$admtext['resume'] = "klikkaa jatkaaksesi";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Muutosloki";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Vanha tapa tuoda (ei edistymispalkkia)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Päivitä";
> 		$admtext['need_upgrade'] = "Viimeistele nämä päivitysohjeet";
> 		$admtext['upgrade_missing'] = "Päivitystiedosto näyttää puuttuvan, joten saatat olla jo valmis.";
> 		$admtext['delete_upgrade'] = "Kun olet valmis, napsauta tätä poistaaksesi päivityksen ja palataksesi valikkoon.";
723d733
< 		$admtext['author'] = "Kirjoittaja";
751c761
< 		$admtext['enterrepoid'] = "Anna tietovaraston ID-numero.";
---
> 		$admtext['enterrepoid'] = "Anna tietovaraston ID.";
754c764
< 		$admtext['prefixrepoid'] = "Laita tietovaraston ID-numeron eteen \"REPO\" (engl. \"Repository\" suom. tietovarasto)";
---
> 		$admtext['prefixrepoid'] = "Laita tietovaraston ID:n eteen \"REPO\" (engl. \"Repository\" suom. tietovarasto)";
804,809c814,819
< 		$admtext['momside'] = "Äidin puolen nimiö"; //8
< 		$admtext['dadside'] = "Isän puolen nimiö"; //8
< 		$admtext['momperson'] = "Äidin puolen henkilön ID"; //8
< 		$admtext['momtree'] = "Päidin puolen sukupuun ID"; //8
< 		$admtext['dadperson'] = "Isän puolen henkilön ID"; //8
< 		$admtext['dadtree'] = "Isän puolen sukupuun ID"; //8
---
> 		$admtext['momside'] = "Äidin puolen nimiö"; //8, 20
> 		$admtext['dadside'] = "Isän puolen nimiö"; //8, 20
> 		$admtext['momperson'] = "Äidin puolen henkilön ID"; //8, 20
> 		$admtext['momtree'] = "Päidin puolen sukupuun ID"; //8, 20
> 		$admtext['dadperson'] = "Isän puolen henkilön ID"; //8, 20
> 		$admtext['dadtree'] = "Isän puolen sukupuun ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Lainausotsikko";
> 		$admtext['quotesubhead'] = "Quotes subheader";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Ominaisuuden nimi";
> 		$admtext['snipinfoone'] = "Featurette first line";
> 		$admtext['snipinfotwo'] = "Featurette toinen rivi";
> 		$admtext['snipimage'] = "Featurette-kuva";
> 		$admtext['snipperson'] = "Featurette-henkilötunnus";
> 		$admtext['sniptree'] = "Featurette-puun tunnus";
> 		$admtext['quote'] = "Lainaus";
> 		$admtext['link'] = "Linkki";
> 		$admtext['featuretitle7'] = "Ominaisuuden 7 otsikko";
> 		$admtext['featuretitle8'] = "Ominaisuuden 8 otsikko";
> 		$admtext['featuretitle9'] = "Ominaisuuden 9 otsikko";
> 		$admtext['featurethumb9'] = "Ominaisuuden 9 pikkukuva"; //15
> 		$admtext['featurelink9'] = "Ominaisuuden 9 linkki"; //15
> 		$admtext['featurepara9'] = "Ominaisuuden 9 kappale"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Ylätunnisteen vasen kuva";
> 		$admtext['rightimg'] = "Ylätunnisteen oikea kuva";
> 		$admtext['photoption'] = "Valokuva-asetukset ovat<br />&nbsp;&nbsp;(staattinen tai satunnainen)";
> 		$admtext['randomphotowidth'] = "Satunnainen kuvan leveys";
> 		$admtext['randomphotoheight'] = "Satunnainen kuvan korkeus";
> 		$admtext['randomphotomediatypeID'] = "Satunnainen kuvakokoelma";
> 		$admtext['momheading'] = "Äidin perheen otsikko";
> 		$admtext['mompara'] = "Äidin perheen leipäteksti";
> 		$admtext['mompagelink'] = "Äidin perheen sivun osoite";
> 		$admtext['dadheading'] = "Isän perheen otsikko";
> 		$admtext['dadpara'] = "Isän perheen leipäteksti";
> 		$admtext['dadpagelink'] = "Isän perheen sivun osoite";
> 		$admtext['spmomheading'] = "Puolison äidin perheen otsikko";
> 		$admtext['spmompara'] = "Puolison äidin perheen leipäteksti";
> 		$admtext['spmompagelink'] = "Puolison äidin perheen sivun osoite";
> 		$admtext['spmomside'] = "Puolison äidin puolen nimiö";
> 		$admtext['spdadside'] = "Puolison isän puolen nimiö";
> 		$admtext['spmomperson'] = "Puolison äidin puolen henkilö ID";
> 		$admtext['spmomtree'] = "Puolison äidin puolen sukupuu ID";
> 		$admtext['spdadheading'] = "Puolison isän perheen otsikko";
> 		$admtext['spdadpara'] = "Puolison isän perheen leipäteksti";
> 		$admtext['spdadpagelink'] = "Puolison isän perheen sivun osoite";
> 		$admtext['spdadperson'] = "Puolison isän puolen henkilö ID";
> 		$admtext['spdadtree'] = "Puolison isän puolen sukupuu ID";
> 		$admtext['storiesheading'] = "Perheemme elämäkerrat";
> 		$admtext['nbrsurnames'] = "Sukunimien lukumäärä <br />&nbsp;&nbsp; sukunimipilvessä";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Ominaisuuden pikkukuva";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vaatii version 5.3 tai sitä uudemman)";
---
> 		$admtext['phpreq'] = "(TNG vaatii version 7.0 tai sitä uudemman)";
1171c1264
< 		$admtext['albumlinkstable'] = "Album Links Table";
---
> 		$admtext['albumlinkstable'] = "Albumilinkkien taulu";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280,1282c1370,1371
< 		//added in 10.0.0
< 		$admtext['collation'] = "Tietojen kerääminen";
< 		$admtext['collationexpl'] = "(jätä tyhjäksi hyväksyäksesi oletusarvo)";
---
> 		$admtext['collation'] = "Tietojen jäsennys";
> 		$admtext['collationexpl'] = "(jätä tyhjäksi hyväksyäksesi oletusarvon)";
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Muuta asetetut etuliitteet TNG asetusten mukaisiksi";
> 		$admtext['sortevents'] = "Lajittele tapahtumat";
> 		$admtext['sortbydate'] = "Tapahtuman päiväys";
> 		$admtext['sortbytype'] = "Tapahtuman tyyppi";
> 		$admtext['allowsuggest'] = "Salli vierailijoiden ehdotukset";
> 		$admtext['livingchecked'] = "Uudet henkilöt ja perheet merkitään elossa oleviksi";
> 		$admtext['maxmarried'] = "Merkitse perheen olevan elossa jos ollut naimisissa alle<br/>tämän vuosimäärän";
> 		$admtext['imagetags'] = "Suorakaiteet";
> 		$admtext['allowcsv'] = "Salli raporttien lataus CSV muodossa";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Varmuuskopiointivaihtoehdot";
> 		$admtext['dosql'] = "Vie SQL:nä";
> 		$admtext['dodrop'] = "Sisällytä DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Sisällytä CREATE TABLE";
> 		$admtext['onrestore'] = "Palautusvaihtoehdot";
> 		$admtext['dodel'] = "Poista ensin aiempi sisältö";
> 		$admtext['download'] = "Lataa";
> 		$admtext['altbirthtypes'] = "Vaihtoehtoiset syntymätapahtumat";
> 		$admtext['dtformat'] = "Taulukkomuoto";
> 		$admtext['conchart'] = "Yhteyskaavio";
> 		$admtext['maxropt'] = "Enimmäismäärä yhteyksiä hauille";
> 		$admtext['maxlopt'] = "Yhteyspolkujen enimmäispituus";
> 		$admtext['showtxtopt'] = "Näytä tekstimuotoinen polkulause";
> 		$admtext['compactboxopt'] = "Näytä henkilölaatikot tiiviissä muodossa";
> 		$admtext['sortbyopt'] = "Lajittele polut";
> 		$admtext['anchoridopt'] = "Ankkuri ID";
> 		$admtext['maxmopt'] = "Enimmäismäärä avioliittoja kytköksessä";
> 		$admtext['saveincfg'] = "Tallenna asetus polulle (kts Yleiset asetukset)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Ei voitu antaa paikkatietoja";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Älä kohdenna maantieteellisesti";
1436d1549
< 		$admtext['backtosecondary'] = "Takaisin toissijaisiin toimintoihin";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Takaisin tuonnin jälkeisiin apuohjelmiin";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Poista muistiinpanot";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Pakkaa ja sisällytä mediatiedostot";
> 		$admtext['downloadzip'] = "Tallenna ZIP-tiedosto";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Näytä vain käytöstä poistetut käyttäjät";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Lähetä myös järjestelmänvalvojille, kun yksi puu on valittuna";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1661,1673c1780,1792
< 		$admtext['dvblurb'] = "Find potential problems in your information.";
< 		$admtext['wr_gender'] = "Wrong gender";
< 		$admtext['unk_gender'] = "Unknown gender";
< 		$admtext['marr_young'] = "Married too young (less than 15 years old)";
< 		$admtext['marr_aft_death'] = "Married after death";
< 		$admtext['marr_bef_birth'] = "Married before birth";
< 		$admtext['died_bef_birth'] = "Died before birth";
< 		$admtext['parents_younger'] = "Born too early (parents less than 15 years old, or child born before marriage)";
< 		$admtext['children_late'] = "Born too late (mother more than 50 years old)";
< 		$admtext['not_living'] = "Person marked as living, death date present";
< 		$admtext['not_dead'] = "Person marked as deceased, possibly still living";
< 		$admtext['parmarr'] = "Parents' Marriage";
< 		$admtext['motherbirth'] = "Mother's Birth";
---
> 		$admtext['dvblurb'] = "Mahdollisia virheitä tiedoissasi.";
> 		$admtext['wr_gender'] = "Väärä sukupuoli";
> 		$admtext['unk_gender'] = "Sukupuoli tuntematon";
> 		$admtext['marr_young'] = "Avioliitto liian nuorena (alle 15 vuotias)";
> 		$admtext['marr_aft_death'] = "Avioliitto kuoleman jälkeen";
> 		$admtext['marr_bef_birth'] = "Avioliitto ennen syntymää";
> 		$admtext['died_bef_birth'] = "Kuollut ennen syntymää";
> 		$admtext['parents_younger'] = "Syntynyt liian aikaisin (vanhemmat alle 15 vuotiaat tai lapsi syntynyt ennen avioliittoa)";
> 		$admtext['children_late'] = "Syntynyt liian myöhään (äiti yli 50 vuotias)";
> 		$admtext['not_living'] = "Henkilö merkitty elossa olevaksi, kuolinaika annettu";
> 		$admtext['not_dead'] = "Henkilö merkitty kuolleeksi, mahdollisesti edelleen elää";
> 		$admtext['parmarr'] = "Vanhempien avioliitto";
> 		$admtext['motherbirth'] = "Äidin syntymä";
1678c1797
< 		$admtext['removed'] = "removed";
---
> 		$admtext['removed'] = "poistettu";
1680,1681c1799,1800
< 		$admtext['deleted'] = "deleted";
< 		$admtext['cantdel'] = "can't delete";
---
> 		$admtext['deleted'] = "tuhottu";
> 		$admtext['cantdel'] = "ei voida poistaa";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1705c1822
< 		$admtext['editperf'] = "The Edit parameters were changed as follows:";
---
> 		$admtext['editperf'] = "Muokkausparametreja muutettiin seuraavasti:";
1707,1709c1824,1826
< 		$admtext['options'] = "Options";
< 		$admtext['viewlog'] = "View Log";
< 		$admtext['target'] = "Changes";
---
> 		$admtext['options'] = "Asetukset";
> 		$admtext['viewlog'] = "Näytä loki";
> 		$admtext['target'] = "Muutokset";
1711c1828
< 		$admtext['copiesfile'] = "Copies";
---
> 		$admtext['copiesfile'] = "Kopio";
1713,1733c1830,1850
< 		$admtext['logoptions'] = "Mod Manager Log";
< 		$admtext['mmlogfilename'] = "Log File Name";
< 		$admtext['sortlistby'] = "Sort Lists by";
< 		$admtext['modname'] = "Mod Name";
< 		$admtext['bypassconfirm'] = "Bypass the Confirmations";
< 		$admtext['modifyoptions'] = "Modify Mod Manager Options";
< 		$admtext['ready'] = "OK to Install";
< 		$admtext['noselected'] = "You have not selected any files!";
< 		$admtext['choose'] = "Select";
< 		$admtext['showlogfile'] = "Show Mod Manager Action Log";
< 		$admtext['recentactions'] = "Mod Manager Most Recent Actions";
< 		$admtext['clearlog'] = "Clear Log";
< 		$admtext['confirmclearlog'] = "Are you sure you want to clear the log?";
< 		$admtext['modsyntax'] = "Mod Syntax";
< 		$admtext['modguidelines'] = "Mod Standards";
< 		$admtext['filemod'] = "File xxx is modified by";
< 		$admtext['potconf'] = "Potential Conflicts";
< 		$admtext['modifications'] = "modifications";
< 		$admtext['othermmoptions'] = "Other";
< 		$admtext['file'] = "File";
< 		$admtext['tngmods'] = "Mods for TNG ";
---
> 		$admtext['logoptions'] = "Muunnosten hallinnan loki";
> 		$admtext['mmlogfilename'] = "Lokitiedoston nimi";
> 		$admtext['sortlistby'] = "Listojen lajittelukenttä";
> 		$admtext['modname'] = "Muunnoksen nimi";
> 		$admtext['bypassconfirm'] = "Ohita vahvistusket";
> 		$admtext['modifyoptions'] = "Muokkaa Muunnosten hallinnan vaihtoehtoja";
> 		$admtext['ready'] = "OK asentaa";
> 		$admtext['noselected'] = "Et ole valinnut yhteään tiedostoa!";
> 		$admtext['choose'] = "Valitse";
> 		$admtext['showlogfile'] = "Näytä muunnosten hallinnan loki";
> 		$admtext['recentactions'] = "Muunnosten hallinnan viimeisimmät toimet";
> 		$admtext['clearlog'] = "Tyhjennä loki";
> 		$admtext['confirmclearlog'] = "Haluatko varmasti tyhjentää lokin?";
> 		$admtext['modsyntax'] = "Muunnosten syntaksi";
> 		$admtext['modguidelines'] = "Muunnosten standardit";
> 		$admtext['filemod'] = "Tiedostoa xxx on muokannut";
> 		$admtext['potconf'] = "Mahdolliset konfliktit";
> 		$admtext['modifications'] = "muutokset";
> 		$admtext['othermmoptions'] = "Muut";
> 		$admtext['file'] = "Tiedosto";
> 		$admtext['tngmods'] = "Muunnoksia TNG:lle ";
1735,1744c1852,1861
< 		$admtext['copied'] = "copied";
< 		$admtext['emptyfile'] = "file is empty";
< 		$admtext['filescopied'] = "files copied";
< 		$admtext['notinst'] = "not installed";
< 		$admtext['install'] = "install";
< 		$admtext['filedel'] = "File deleted";
< 		$admtext['created'] = "created";
< 		$admtext['choosefilter'] = "Choose the filter and click Go for the available controls";
< 		$admtext['mmmaxloglines'] = "Max number of transactions";
< 		$admtext['statusfilter'] = "Status";
---
> 		$admtext['copied'] = "kopioitu";
> 		$admtext['emptyfile'] = "tiedosto on tyhjä";
> 		$admtext['filescopied'] = "tiedostoa kopioitu";
> 		$admtext['notinst'] = "ei asennettu";
> 		$admtext['install'] = "asenna";
> 		$admtext['filedel'] = "Tiedosto poistettu";
> 		$admtext['created'] = "luotu";
> 		$admtext['choosefilter'] = "Valitse suodatin ja napsauta OK nähdäksesi käytettävissä olevat säätimet";
> 		$admtext['mmmaxloglines'] = "Tapahtumien enimmäismäärä";
> 		$admtext['statusfilter'] = "Tila";
1746,1749c1863,1866
< 		$admtext['uninstall'] = "Uninstall";    // was $admtext['remove'] = "Remove"
< 		$admtext['cleanup'] = "Clean Up";  // previously used as $admtext['clean']
< 		$admtext['edopts'] = "Edit Options";  // previously used as $admtext['edit'] without Option text
< 		$admtext['ok2inst'] = "OK to install";  // previously used $admtext['ready'] which is already translated
---
> 		$admtext['uninstall'] = "Poista asennus";    // was $admtext['remove'] = "Remove"
> 		$admtext['cleanup'] = "Siivoa";  // previously used as $admtext['clean']
> 		$admtext['edopts'] = "Muokkaa asetuksia";  // previously used as $admtext['edit'] without Option text
> 		$admtext['ok2inst'] = "Voidaan asentaa";  // previously used $admtext['ready'] which is already translated
1752,1759c1869,1876
< 		$admtext['cantinst'] = "cannot install";
< 		$admtext['cantproc'] = "cannot remove mod";
< 		$admtext['cantupd'] = "unable to update parameter";
< 		$admtext['cleanupall'] = "Clean up";
< 		$admtext['copiesreq'] = "file copies specified";
< 		$admtext['delete'] = "Delete";
< 		$admtext['deleteall'] = "Delete";
< 		$admtext['errors'] = "errors";
---
> 		$admtext['cantinst'] = "ei voida asentaa";
> 		$admtext['cantproc'] = "muunnosta ei voi poistaa";
> 		$admtext['cantupd'] = "parametria ei voi päivittää";
> 		$admtext['cleanupall'] = "Siivoa";
> 		$admtext['copiesreq'] = "tiedoston kopiointeja määritelty";
> 		$admtext['delete'] = "poista";
> 		$admtext['deleteall'] = "poista";
> 		$admtext['errors'] = "virheitä";
1761c1878
< 		$admtext['filesinst'] = "files installed";
---
> 		$admtext['filesinst'] = "tiedostot asennettu";
1764,1778c1881,1895
< 		$admtext['installall'] = "Install";
< 		$admtext['installing'] = "Installing";
< 		$admtext['line'] = "Line";
< 		$admtext['modified'] = "modified";
< 		$admtext['modsinst'] = "code modifications installed";
< 		$admtext['modrem'] = "mod uninstalled";
< 		$admtext['modsrem'] = "code modifications removed";
< 		$admtext['modsreq'] = "code modifications specified";
< 		$admtext['newfilesreq'] = "new files specified";
< 		$admtext['nfcreated'] = "new file created";
< 		$admtext['noact'] = "action tag invalid";
< 		$admtext['nocfgfile'] = "mod file not found";
< 		$admtext['nocomps'] = "missing elements";
< 		$admtext['noend'] = "%end:% tag missing";
< 		$admtext['nolocation'] = "missing location tag";
---
> 		$admtext['installall'] = "asenna";
> 		$admtext['installing'] = "asennetaan";
> 		$admtext['line'] = "Rivi";
> 		$admtext['modified'] = "muokattu";
> 		$admtext['modsinst'] = "koodin muutokset asennettu";
> 		$admtext['modrem'] = "muunnoksen asennus poistettu";
> 		$admtext['modsrem'] = "koodimuutokset poistettu";
> 		$admtext['modsreq'] = "koodimuutoksia määritelty";
> 		$admtext['newfilesreq'] = "uusia tiedostoja määritelty";
> 		$admtext['nfcreated'] = "uusia tiedostoja luotu";
> 		$admtext['noact'] = "toimintotägi virheellinen";
> 		$admtext['nocfgfile'] = "muunnoksen tiedostoa ei löydy";
> 		$admtext['nocomps'] = "puuttuvia elementtejä";
> 		$admtext['noend'] = "%end:% tägi puuttuu";
> 		$admtext['nolocation'] = "sijaintitägi puuttuu";
1780,1799c1897,1916
< 		$admtext['opened'] = "opened";
< 		$admtext['optional'] = "optional";
< 		$admtext['partinst'] = "partially installed";
< 		$admtext['removeall'] = "Uninstall";    // was Remove Selected mods
< 		$admtext['removing'] = "Uninstalling";    // was Removing
< 		$admtext['reqtag'] = "required tag missing";
< 		$admtext['restparam'] = "Restoring default parameter";
< 		$admtext['return'] = "Return to Mod Manager";
< 		$admtext['tagnoterm'] = "tag not terminated";
< 		$admtext['tagunk'] = "tag is unknown";
< 		$admtext['tgtfile'] = "target file";
< 		$admtext['updated'] = "updated";
< 		$admtext['updparam'] = "Updating parameter";
< 		$admtext['unxend'] = "unexpected end of file";
< 		$admtext['warnings'] = "Warnings";
< 		$admtext['allowdeletepartial'] = "Allow Delete Selected of Partially Installed Mods";
< 		$admtext['allowdeleteinstalled'] = "Allow Delete of individually Installed Mods";
< 		$admtext['showwarnings'] = "Show Mod Warnings in Status";
< 		$admtext['logfullpath'] = "Log full path for file actions";
< 		$admtext['deleting'] = "Deleting ";
---
> 		$admtext['opened'] = "avattu";
> 		$admtext['optional'] = "valinnainen";
> 		$admtext['partinst'] = "osittain asennettu";
> 		$admtext['removeall'] = "Poista asennus";    // was Remove Selected mods
> 		$admtext['removing'] = "Poistamassa asennusta";    // was Removing
> 		$admtext['reqtag'] = "vaadittu tägi puuttuu";
> 		$admtext['restparam'] = "Palautetaan oletusparametria";
> 		$admtext['return'] = "Palaa Muunnosten hallintaan";
> 		$admtext['tagnoterm'] = "tägiä ei ole lopetettu";
> 		$admtext['tagunk'] = "tägi on tuntematon";
> 		$admtext['tgtfile'] = "kohdetiedosto";
> 		$admtext['updated'] = "päivitetty";
> 		$admtext['updparam'] = "Päivitetään parametria";
> 		$admtext['unxend'] = "tiedoston odottamaton loppu";
> 		$admtext['warnings'] = "Varoitukset";
> 		$admtext['allowdeletepartial'] = "Salli valittujen tai osittain asennettujen muunnosten poistaminen";
> 		$admtext['allowdeleteinstalled'] = "Salli yksittäin asennettujen muunnosten poistaminen";
> 		$admtext['showwarnings'] = "Näytä muunnosten varoitukset tila-kentässä";
> 		$admtext['logfullpath'] = "Kirjaa tiedostotoimintojen koko polku";
> 		$admtext['deleting'] = "Poistetaan ";
1801,1843c1918,1960
< 		$admtext['aflist'] = "Files";
< 		$admtext['hasoptions'] = "Options";
< 		$admtext['restore'] = "Restore Default";
< 		$admtext['stayon'] = "Lock";
< 		$admtext['accessible'] = "accessible";
< 		$admtext['bypassed'] = "bypassed";
< 		$admtext['willbypass'] = "will ignore";  // was "will bypass"
< 		$admtext['cantdel'] = "can't delete";
< 		$admtext['optmissing'] = "file missing (optional)";
< 		$admtext['tgtmissing'] = "target file missing";
< 		$admtext['optlocked'] = "file locked (optional)";
< 		$admtext['tgtlocked'] = "file locked";
< 		$admtext['alreadyrem'] = "already removed";
< 		$admtext['noaccess'] = "no access";
< 		$admtext['badinstall'] = "failed to install";
< 		$admtext['removed'] = "removed";
< 		$admtext['deleted'] = "deleted";
< 		$admtext['optsrcfilemissing'] = "optional source missing";
< 		$admtext['srcfilemissing'] = "source missing";
< 		$admtext['optnocopy'] = "optional file not copied";
< 		$admtext['notcopied'] = "not copied";
< 		$admtext['copied'] = "copied";
< 		$admtext['notcreated'] = "can't create new file";
< 		$admtext['optnotcreated'] = "can't create optional new file";
< 		$admtext['nocreated'] = "not created";
< 		$admtext['fixedheader'] = "Use Fixed Headers";
< 		$admtext['cantremok'] = "can't remove, optional, bypassed";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['edparams'] = "edit parameters";
< 		$admtext['compresslog'] = "Collapse Log Display";
< 		$admtext['formodname'] = "for mod name ";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['fileperms'] = "Please check file permissions";
< 		$admtext['noparam'] = "parameter missing";
< 		$admtext['editing'] = "editing";
< 		$admtext['redirect2log'] = "Redirect to Log For";
< 		$admtext['on_error'] = "Errors Only";
< 		$admtext['on_all'] = "All Transactions";
< 		$admtext['usestriping'] = "Use stripes";
< 		$admtext['stripeafter'] = "Stripe after number of rows";
< 		$admtext['adjusthdrs'] = "Adjust Fixed Headers";
< 		$admtext['displayoptions'] = "Display Settings";
< 		$admtext['no_frag'] = "code fragment not allowed here";
---
> 		$admtext['aflist'] = "Tiedostot";
> 		$admtext['hasoptions'] = "Vaihtoehdot";
> 		$admtext['restore'] = "Palauta oletusarvot";
> 		$admtext['stayon'] = "Lukittu";
> 		$admtext['accessible'] = "saatavilla";
> 		$admtext['bypassed'] = "ohitettu";
> 		$admtext['willbypass'] = "jätetään huomiomatta";  // was "will bypass"
> 		$admtext['cantdel'] = "ei voida poistaa";
> 		$admtext['optmissing'] = "tieodsto puuttuu (valinnainen)";
> 		$admtext['tgtmissing'] = "kohdetiedosto puuttuu";
> 		$admtext['optlocked'] = "tiedosto lukittu (valinnainen)";
> 		$admtext['tgtlocked'] = "tiedosto lukittu";
> 		$admtext['alreadyrem'] = "on jo poistettu";
> 		$admtext['noaccess'] = "ei saatavilla";
> 		$admtext['badinstall'] = "asennus epäonnistui";
> 		$admtext['removed'] = "poistettu";
> 		$admtext['deleted'] = "tuhottu";
> 		$admtext['optsrcfilemissing'] = "valinnainen lähde puuttuu";
> 		$admtext['srcfilemissing'] = "lähde puuttuu";
> 		$admtext['optnocopy'] = "valinnaista tiedostoa ei kopioitu";
> 		$admtext['notcopied'] = "ei kopioitu";
> 		$admtext['copied'] = "kopioitu";
> 		$admtext['notcreated'] = "uutta tiedostoa ei voida luoda";
> 		$admtext['optnotcreated'] = "uutta valinnaista tiedostoa ei voida luoda";
> 		$admtext['nocreated'] = "ei luotu";
> 		$admtext['fixedheader'] = "Käytä kiinteitä otsakkeita";
> 		$admtext['cantremok'] = "ei voi poistaa, valinnainen, ohitettu";
> 		$admtext['nofolder'] = "kohdekansio puuttuu";
> 		$admtext['edparams'] = "muokkaa parametrejä";
> 		$admtext['compresslog'] = "Kutista lokinäkymä";
> 		$admtext['formodname'] = "muunnoksen nimelle ";
> 		$admtext['nofolder'] = "kohdekansio puuttuu";
> 		$admtext['fileperms'] = "Tarkista tiedosto-oikeudet";
> 		$admtext['noparam'] = "parametri puuttuu";
> 		$admtext['editing'] = "muokataan";
> 		$admtext['redirect2log'] = "Ohjaa lokiin";
> 		$admtext['on_error'] = "Vain virheet";
> 		$admtext['on_all'] = "Kaikki toiminnot";
> 		$admtext['usestriping'] = "Käytä raidoitusta";
> 		$admtext['stripeafter'] = "Raidoitus rivin jälkeen";
> 		$admtext['adjusthdrs'] = "Muokkaa kiinteitä otsikoita";
> 		$admtext['displayoptions'] = "Näyttöasetukset";
> 		$admtext['no_frag'] = "koodin palanen ei sallittu tässä";
1848c1965
< 		$admtext['showanalyzer'] = "Näytä analysoi TNG tiedostot välilehti";
---
> 		$admtext['showanalyzer'] = "Näytä Analysoi TNG tiedostot -välilehti";
1850c1967
< 		$admtext['showupdates'] = "Näytä suositellut päivitykset välilehti";
---
> 		$admtext['showupdates'] = "Näytä Suositellut päivitykset -välilehti";
1861c1978
< 		$admtext['compressnames'] = "Poista välilyönnit tiedostonimistä Laajennosten listalla";
---
> 		$admtext['compressnames'] = "Poista välilyönnit tiedostonimistä listalla";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Kaikki munnokset";
> 		$admtext['installedmods'] = "Vain asennetut muunnokset";
> 		$admtext['partinstmods'] = "Asennetut ja osittain asennetut muunnokset";
> 		$admtext['showanalyzeractions'] = "Näytä toiminnot Mod Analyzerissa";
> 		$admtext['badchar'] = "Virheellinen merkki";
1886d2008
< 		$admtext['test_number'] = "Testin numero";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testin numero";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Linkitä tämä DNA testi henkilöön";
1955c2086
< $admtext['find'] = "Etsi...";
---
> $admtext['find'] = "Hae...";
1965d2095
< $admtext['otherevents'] = "Muut tapahtumat";
2050,2051d2179
< $admtext['savereturn'] = "Palaa tälle sivulle";
< $admtext['saveback'] = "Palaa valikkoon";
2058,2059d2185
< $admtext['secondary'] = "Toissijaiset prosessit";
< $admtext['commas'] = "Erota arvot toisistaan pilkuilla";
2101c2227
< $admtext['nobranch'] = "Ei sukuhaaraa";
---
> $admtext['nobranch'] = "Ei haaraa";
2129,2130d2254
< $admtext['secondarymaint'] = "Toissijaiset ylläpitotoiminnot";
< $admtext['customeventtypes'] = "Tapahtumaluokat";
2219d2342
< //changed in 8.0.0
2223,2224c2346
< //moved here in 8.0.0
< $admtext['repoid'] = "Tietovaraston ID-numero";
---
> $admtext['repoid'] = "Tietovaraston ID";
2228,2229c2350
< //added in 8.0.0
< $admtext['show'] = "Esikatselu";
---
> $admtext['show'] = "Esikatsele";
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tyyppi";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Sukunimet";
> $admtext['subhead'] = "Alaotsikko";
> $admtext['image'] = "Kuva";
> $admtext['author'] = "Kirjoittaja";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Aloitus";
> $admtext['showlog'] = "Muutosloki";
> $admtext['nobirthinfo'] = "Ei syntymätietoa";
> //changed in 13.0
> $admtext['savereturn'] = "Tallenna ja pysy sivulla";
> $admtext['saveback'] = "Tallenna ja poistu";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Kaikki kohteet onnistuneesti poistettu.";
> $admtext['private'] = "Yksityinen";
> $admtext['imgtags'] = "Kuvan tunnisteet";
> 
> $admtext['removelink'] = "Poista linkki";
> $admtext['eloptions'] = "Selaa tai poista";
> $admtext['pleaseenter'] = "Anna ";
> 
> $admtext['nolinks'] = "Ei vielä linkkejä";
> $admtext['nogeocode'] = "Ei voitu antaa paikkatietoja";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Valitse<br/>oletus<br/>kuva"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Tapahtuma- / määritetyypit";
> $admtext['secondary'] = "Tuonnin jälkeiset apuohjelmat";
> $admtext['otherevents'] = "Muut tapahtumat / määritteet";
> //added in 14.0
> $admtext['newlinks'] = "Linkit luotu";
> $admtext['newcemlinks'] = "Hautausmaalinkit luotu";
> $admtext['utility'] = "Apuohjelma";
> $admtext['linktype'] = "Tyyppi";
> $admtext['move'] = "Siirrä";
> $admtext['copy'] = "Kopioi";
> $admtext['title2'] = "Otsikko"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Finnish-UTF8/alltext.php TNG1403/languages/Finnish-UTF8/alltext.php
85c85
< $text['none'] = "None";
---
> $text['none'] = "Ei mitään";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "TNG ohjelmistossa tapahtui virhe. Tämä voi johtua virheellisistä asetuksista, vajavaisesta päivityksestä tai ohjelmistovirheestä. Jos olet sivuston omistaja, ota yhteyttä TNG:n tukeen saadaksesi apua ongelmaan. Ole hyvä ja kopioi alla näkyvä haku viestiisi.";
163,164c148
< //moved here in 12.0.0
< $admtext['menu'] = "Menu";
---
> $admtext['menu'] = "Valikko";
166,170c150,154
< $admtext['allbranches'] = "All Branches";
< $admtext['active'] = "Active";
< $admtext['select'] = "Select";
< $admtext['selectall'] = "Select All";
< $admtext['clearall'] = "Clear All";
---
> $admtext['allbranches'] = "Kaikki haarat";
> $admtext['active'] = "Aktiivinen";
> $admtext['select'] = "Valitse";
> $admtext['selectall'] = "Valitse kaikki";
> $admtext['clearall'] = "Tyhjennä kaikki";
173d156
< //added here in 12.0.0
175,178c158,160
< $text['test_number'] = "Test Number/Name";
< $text['test_info_display'] = "Test Information To Display";
< $text['confirmed'] = "Confirmed";
< $text['predicted'] = "Predicted";
---
> $text['test_info_display'] = "Näytettävä testitieto";
> $text['confirmed'] = "Vahvistettu";
> $text['predicted'] = "Ennustettu";
184c166
< $admtext['ref_seq'] = "Reference sequence";
---
> $admtext['ref_seq'] = "Viitesekvenssi";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Testin numero/nimi";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suositeltu";
> $admtext['actual_relationship'] = "Todellinen suhde";
> $admtext['related_side'] = "Liittyvä haara";
> $admtext['shared_dna'] = "Jaettu DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Jaetut segmentit";
> $admtext['largest_segment'] = "Suurin segmentti";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segmentin alku";
> $admtext['segment_end'] = "Segmentin loppu";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Yksityinen testi";
> $text['shared_dna'] = "Jaettu DNA-segmentti";
> $text['for_match'] = "tälle osumalle";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "Kaikki ryhmät";
> $admtext['alltypes'] = "Kaikki tyypit";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "s.";
> $text['chrabbr'] = "kas.";
> $text['deathabbr'] = "k.";  //from descend
> $text['burialabbr'] = "haud.";  //from descend
> $text['marrabbr'] = "vih.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Etsi kaikki henkilöt, joilla on merkitty tapahtuma tällä paikalla";
> $text['firstpage'] = "Ensimmäinen sivu";
> $text['lastpage'] = "Viimeinen sivu";
> 
> //changed in 13.0.0
> $text['problem'] = "TNG ohjelmistossa tapahtui virhe. Mitä tehdä:<p>Jos asensit juuri päivityksen, saatoit hypätä jonkin asennusvaiheen yli. Siirry takaisin päivitysohjeeseen ja lue ohjeet uudelleen. Kiinnitä erityistä huomiota tietokantarakenne vaiheeseen.</p><p>Jos asensit TNG ohjelmiston ensimmäistä kertaa, sinun tulee mahdollisesti edelleen luoda tietokantataulut. Palaa readme.html sivulle löytääksesi kyseisen vaiheen.</p><p>Jos olet sivuston omistaja, voit ottaa yhteyttä TNG tukeen saadaksesi lisäohjeita tämän ongelman selvittämiseksi. Kopioi alla oleva hakulauseke osaksi kysymystäsi.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Ei haaraa";
> 
> //added in 14.0
> $text['oneyear'] = "vuosi";
> $text['pwdcodelink'] = "Napsauta tätä linkkiä saadaksesi väliaikaisen salasanan";
> $text['pwdcodesent'] = "Salasanan palautuslinkki on lähetetty sähköpostiosoitteeseesi.";
> $text['moved'] = "Siirretty";
> $text['citation'] = "Sitaatti";
> $text['other'] = "Muu";
> $text['death'] = "Kuollut";
> $text['burial'] = "Haudattu";
> $text['cremation'] = "Tuhkattu";
> $text['marriage'] = "Vihitty";
> $text['divorce'] = "Ero";
> $text['bylength'] = "Vaiheet";
> $text['bymarriages'] = "Avioliitot";
> $text['none'] = "Ei mitään";
> 
> //moved here in 14.0
> $text['family'] = "Perhe";
> $text['source'] = "Lähde";
> $text['repository'] = "Tietovarasto";
> $text['place'] = "Paikka";
> $admtext['BAPM'] = "Kaste";
> 
> $text['glang'] = "fi";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Finnish-UTF8/text.php TNG1403/languages/Finnish-UTF8/text.php
13c13
< 		$text['repoid'] = "Tietovaraston ID-numero";
---
> 		$text['repoid'] = "Tietovaraston ID";
69d68
< 		$text['general'] = "Yleinen";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Ole hyvä ja valitse kaksi henkilöä.";
---
> 		$text['select2inds'] = "Valitse kaksi henkilöä.";
90c90
< 		$text['sameperson'] = "Valitsit molempiin kenttiin saman henkilön!";
---
> 		$text['sameperson'] = "Nämä kaksi henkilöä ovat sama henkilö.";
93c93
< 		$text['sometimes'] = "(Sukupolvien eri määrä voi joskus antaa eri tuloksen.)";
---
> 		$text['sometimes'] = "(Joskus eri sukupolvien tarkistaminen antaa erilaisen tuloksen.)";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Etsi yhteyksiä";
> 		$text['findrel2'] = "Valitse sukulaisuussuhteita ja muita kytköksiä";
> 		$text['makeme2nd'] = "Käytä minun ID:tä";
> 		$text['usebookmarks'] = "Käytä kirjanmerkkejä";
> 		$text['select2inds'] = "Valitse kaksi henkilöä.";
> 		$text['indinfofor'] = "Yksilölliset tiedot";
> 		$text['nobookmarks'] = "Käytettävää kirjanmerkkiä ei ole";
> 		$text['bkmtitle'] = "Kirjanmerkeistä löydetyt henkilöt";
> 		$text['bkminfo'] = "Valitse henkilö:";
> 		$text['sortpathsby'] = "Lajittele polut lukumäärän mukaan";
> 		$text['sortbyshort'] = "Lajittele";
> 		$text['bylengthshort'] = "Pituus";
> 		$text['badID1'] = ": väärä henkilö1 ID - palaa korjaamaan";
> 		$text['badID2'] = ": väärä henkilö2 ID - palaa korjaamaan";
> 		$text['notintree'] = ": henkilö tällä ID:llä ei ole nykyisessä tietokantapuussa.";
> 		$text['sameperson'] = "Nämä kaksi henkilöä ovat sama henkilö.";;
> 		$text['nopaths'] = "Nämä henkilöt eivät ole yhteydessä toisiinsa.";
> 		$text['nopaths1'] = "Ei enempää yhteyksiä lyhyempiä kuin xxx";
> 		$text['nopaths2'] = "xxx hakuvaihetta";
> 		$text['longestpath'] = "(pisin tarkastettu polku tähän mennessä oli xxx vaihetta pitkä)";
> 		$text['relevantpaths'] = "Löydettyjen erilaisten osuvien polkujen lukumäärä: xxx";
> 		$text['skipMarr'] = "(lisäksi löydettyjen polkujen määrä, joita ei näytetä liian monen avioliiton vuoksi, oli: xxx)";
> 		$text['mjaor'] = "tai";
> 		$text['connectionsto'] = "Yhteydet ";
> 		$text['findanotherpers'] = "Etsi toinen henkilö...";
> 		$text['sometimes'] = "(Joskus eri sukupolvien tarkistaminen antaa erilaisen tuloksen.)";
> 		$text['anotherpath'] = "Etsi muita yhteyksiä";
> 		$text['xpath'] = "Polku ";
> 		$text['primary'] = "Aloitushenkilö"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Loppuhenkilö";
> 		$text['parent'] = "Vanhempi";
> 		$text['mhfather'] = "isänsä";
> 		$text['mhmother'] = "äitinsä";
> 		$text['mhhusband'] = "aviomiehensä";
> 		$text['mhwife'] = "vaimonsa";
> 		$text['mhson'] = "poikansa";
> 		$text['mhdaughter'] = "tyttärensä";
> 		$text['fhfather'] = "isänsä";
> 		$text['fhmother'] = "äitinsä";
> 		$text['fhhusband'] = "aviomiehensä";
> 		$text['fhwife'] = "vaimonsa";
> 		$text['fhson'] = "poikansa";
> 		$text['fhdaughter'] = "tyttärensä";
> 		$text['hfather'] = "isä";
> 		$text['hmother'] = "äiti";
> 		$text['hhusband'] = "aviomies";
> 		$text['hwife'] = "vaimo";
> 		$text['hson'] = "poika";
> 		$text['hdaughter'] = "tytär";
> 		$text['maxruns'] = "Enimmäismäärä polkuja tarkistettavaksi";
> 		$text['maxrshort'] = "Enimmäispolut";
> 		$text['maxlength'] = "Yhteyspolut korkeintaan";
> 		$text['maxlshort'] = "Maksimipituus";
> 		$text['xstep'] = "vaihe";
> 		$text['xsteps'] = "vaiheet";
> 		$text['xmarriages'] = "xxx avioliitot";
> 		$text['xmarriage'] = "1 avioliitto";
> 		$text['showspouses'] = "Näytä molemmat puolisot";
> 		$text['showTxt'] = "Näytä tekstimuotoinen polun kuvaus";
> 		$text['showTxtshort'] = "Tekstimuotoinen kuvaus.";
> 		$text['compactBox'] = "Näytä henkilölaatikot tiiviinä";
> 		$text['compactBoxshort'] = "Kompaktit laatikot";
> 		$text['paths'] = "Polut";
> 		$text['dospouses2'] = "Näytä puolisot";
> 		$text['maxmopt'] = "Maksimi määrä avioliittoja kytkökselle";
> 		$text['maxm'] = "Maksimi avioliitot";
> 		$text['arerelated'] = "Nämä henkilöt ovat sukulaisia, joiden yhteys näytetään polulla 1";
> 		$text['simplerel'] = "Yksinkertainen sukulaisuussuhteen haku";
196d264
< 		$text['scrollnote'] = "Huomioi: Voit joutua vierittämään sivua alas tai oikealle nähdäksesi koko kaavion.";
199d266
< 		$text['popupnote2'] = " = Uusi sukupuu tästä henkilöstä alkaen";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Taulukot";
> 		$text['dtchildren'] = "Lapset";
> 		$text['dtgrandchildren'] = "Lapsenlapset";
> 		$text['dtggrandchildren'] = "Lapsenlapsenlapset";
> 		$text['dtgggrandchildren'] = "lapsenlapsenlapsi"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Ei jälkeläisiä";
> 		$text['dtgen'] = "Sp";
> 		$text['dttotal'] = "Yhteensä";
> 		$text['dtselect'] = "Valitse";
> 		$text['dteachfulltable'] = "Jokaisessa täydessä taulussa on";
> 		$text['dtrows'] = "rivit";
> 		$text['dtdisplayingtable'] = "Näytetään taulukko";
> 		$text['dtgototable'] = "Siirry taulukkoon:";
> 		$text['fcinstrdn'] = "Näytä perhe puolison kanssa";
> 		$text['fcinstrup'] = "Näytä perhe vanhempien kanssa";
> 		$text['fcinstrplus'] = "Valitse muut puolisot";
> 		$text['fcinstrfam'] = "Valitse muut vanhemmat";
381,383c467
< 		$text['firstpage'] = "Ensimmäinen sivu";
< 		$text['lastpage'] = "Viimeinen sivu";
< 		$text['photoowner'] = "Omistaja/Lähde";
---
> 		$text['photoowner'] = "Alkuperäisen kuvan omistaja";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Vaihda tunnisteiden tilaa";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Uusi salasana uudestaan";
> 		$text['resetsuccess'] = "Onnistui: Salasana on nollattu";
> 		$text['resetfail'] = "Virhe: Salasanaa ei nollattu";
> 		$text['failreason0'] = " (tuntematon tietokantavirhe)";
> 		$text['failreason2'] = " (sinulla ei ole lupaa vaihtaa salasanaasi)";
> 		$text['failreason3'] = " (salasanat eivät täsmänneet)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Lähdeviitteet yhteensä";
618d710
< 		$text['loginfirst'] = "Kirjaudu ensin sisään.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Käyttäjätiedot löydetty rekisteristä. Jatkaaksesi sinun tulee joko kirjautua sisään tai poistaa kaikki tiedot käyttäjätaulusta.";
629,630d722
< 		$text['zoomin'] = "Suurenna";
< 		$text['zoomout'] = "Pienennä";
656d747
< 		$text['dna_info_head'] = "DNA testi tiedot";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Vertaa valittuja mtDNA testejä";
> 		$text['dnatestscompare_atdna'] = "Vertaa valittuja atDNA testejä";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Vähintään kaksi testiä tulee valita vertailtavaksi.";
670,671d785
< $text['birthabbr'] = "s.";
< $text['chrabbr'] = "kas.";
675d788
< $text['family'] = "Perhe"; //from getperson
685d797
< $text['deathabbr'] = "k.";  //from descend
706d817
< $text['burialabbr'] = "haud.";  //from descend
712d822
< $text['place'] = "Paikka";
715d824
< $text['marrabbr'] = "vih.";
738d846
< $text['source'] = "Lähde";
766d873
< $text['repository'] = "Tietovarasto";
770d876
< $text['findplaces'] = "Etsi kaikki henkilöt, joilla on merkitty tapahtuma tällä paikalla";
804d909
< $text['glang'] = "&amp;hl=fi";
816d920
< $text['none'] = "Ei mikään";
924d1027
< $text['otherevents'] = "Muut tapahtumat";
952,953d1054
< $text['people_have'] = "henkilö on linkittänyt DNA testin";
< $text['person_has'] = "henkilöt ovat linkittäneet DNA testin";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA-testit kytketty henkilöön";
> $text['testislinked'] = "DNA-testi kytketty henkilöön";
> 
> //added in 12.2
> $text['quicklinks'] = "Pikalinkit";
> $text['yourname'] = "Nimesi";
> $text['youremail'] = "Sähköpostiosoitteesi";
> $text['liketoadd'] = "Kaikki tiedot, jotka haluat lisätä";
> $text['webmastermsg'] = "Verkkovastaavan viesti";
> $text['gallery'] = "Katso galleria";
> $text['wasborn_male'] = "syntyi";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "syntyi"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "kastettiin";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "kastettiin";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "died";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "died";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "haudattiin"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "haudattiin"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "tuhrattiin";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "tuhrattiin";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "naimisissa";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "naimisissa";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "erotettiin";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "erotettiin";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = "sisään";			// used as a preposition to the location
> $text['onthisdate'] = "päällä";		// when used with full date
> $text['inthisyear'] = "sisään";		// when used with year only or month / year dates
> $text['and'] = "ja";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA testi tiedot";
> //added in 13.0
> $text['visitor'] = "Vierailija";
> 
> $text['popupnote2'] = " = Uusi sukupuu tästä henkilöstä alkaen";
> 
> //moved here in 14.0
> $text['zoomin'] = "Suurenna";
> $text['zoomout'] = "Pienennä";
> $text['scrollnote'] = "Vedä tai vieritä nähdäksesi enemmän kaaviosta.";
> $text['general'] = "Yleinen";
> 
> //changed in 14.0
> $text['otherevents'] = "Muut tapahtumat ja määritteet";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Yhteydet";
> $text['continue'] = "Jatka";
> $text['title2'] = "Otsikko"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/French/admintext.php TNG1403/languages/French/admintext.php
5c5
< 		$admtext['branchlabel'] = "Nom de Branche ";
---
> 		$admtext['branchlabel'] = "Nom de branche ";
7,8c7,8
< 		$admtext['newbranch'] = "Nouvelle Branche";
< 		$admtext['numgenerations'] = "Nombre de Générations";
---
> 		$admtext['newbranch'] = "Nouvelle branche";
> 		$admtext['numgenerations'] = "Nombre de générations";
20c20
< 		$admtext['enterbranch'] = "Sélectionner une branche existante ou créer une nouvelle .";
---
> 		$admtext['enterbranch'] = "Sélectionner une branche existante ou en créer une nouvelle.";
68c68
< 		$admtext['requiredmap'] = "Requis. Ceci doit correspondre au nom et et à l'emplacement de votre fichier <em>dans le dossier photostombes</em> une fois le fichier chargé. Exemple : si votre dossier tombes s'appelle <em>tombes</em>,	et que votre fichier doit s'appeler <em>plan.jpg</em> et aller dans un sous-dossier nommé <em>mesplans</em>, vous devrez saisir <em>mesplans/plan.jpg</em> dans ce champ.";
---
> 		$admtext['requiredmap'] = "Requis. Ceci doit correspondre au nom et et à l'emplacement de votre fichier <em>dans le dossier tombes</em> une fois le fichier chargé. Exemple : si votre dossier tombes s'appelle <em>tombes</em>, et que votre fichier doit s'appeler <em>plan.jpg</em> et aller dans un sous-dossier nommé <em>mesplans</em>, vous devrez saisir <em>mesplans/plan.jpg</em> dans ce champ.";
80d79
< 		$admtext['pleaseenter'] = "Veuillez saisir un ";
101c100
< 		$admtext['addnewevent'] = "Ajouter un nouvel événement";
---
> 		$admtext['addnewevent'] = "Ajouter un nouvel Événement";
126c125
< 		$admtext['invfperms'] = "Le dossier 'gedcom' peut avoir des permissions insuffisantes (essai 755 ou 777).";
---
> 		$admtext['invfperms'] = "Le dossier 'gedcom' peut avoir des permissions insuffisantes (essayez CHMOD 755 ou 777).";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Choisir un fichier à importer.";
> 		$admtext['addreplacedata'] = "Complète ou remplace vos données généalogiques (peut prendre plusieurs minutes, en fonction de la taille de votre fichier)";
> 		$admtext['fromyourcomputer'] = "Depuis votre ordinateur ";
> 		$admtext['importdata'] = "Importer les données";
> 		$admtext['replace'] = "Remplacer (dans arbre sélectionné)";
> 		$admtext['desttree'] = "Arbre cible";
> 		$admtext['selectdesttree'] = "Veuillez choisir ou saisir une arbre cible.";
> 		$admtext['selectexisting'] = "Importer dans";
> 		$admtext['ucaselast'] = "Mettre les noms de famille en majuscules";
> 		$admtext['norecalc'] = "Ne pas recalculer les indicateurs 'En vie'";
> 		$admtext['autooffset'] = "Faire débuter les IDs au premier nombre disponible";
> 		$admtext['mustselecttree'] = "Vous devez sélectionner un arbre avant d'utiliser cette option.";
> 		$admtext['onwebserver'] = "Sur le serveur web (dans le dossier GEDCOM)";
> 		$admtext['imphints'] = "Notes: \"Toutes les données\" signifie tous les individus, familles, sources et notes (les associations à des fichiers média ne sont pas perdues tant que les IDs demeurent inchangés). Les correspondances sont toujours basées sur les IDs seulement. Les nouveaux enregistrements sont toujours ajoutés. \"Ajouter...\" importe tous les enregistrements qui ont un nouvel ID.";
> 		$admtext['destbranch'] = "Branche de destination (facultatif)";
> 		$admtext['importlatlong'] = "Importez les données de latitude/longitude si elles existent";
> 		$admtext['opening'] = "Ouverture";
> 		$admtext['reopen'] = "Réouverture";
> 		$admtext['uploading'] = "Téléchargement";
> 		$admtext['stop'] = "Arrêt";
> 		$admtext['stopped'] = "L'importation s'est arrêtée";
> 		$admtext['resume'] = "cliquer ici pour recommencer";
> 		$admtext['neweronly'] = "Remplacer uniquement si plus récent";
> 		$admtext['oldimport'] = "Importer par l'ancienne méthode (pas de barre de progression)";
> 		$admtext['importgedcom'] = "Importer un GEDCOM (format standard 5.5, peut être zippé)";
> 		$admtext['stopbackup'] = "Stop! Ce serait une bonne idée d'enregistrer les données en cours avant de continuer.";
> 		$admtext['importmedia'] = "Importer des médias s'ils existent";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Assurez-vous que les préfixes et les suffixes sont corrects pour ce fichier. (Voir dans Configuration générale) ";
> 		$admtext['chkimpsettings'] = "Consulter la Configuration d'importation pour plus d'options.";
> 		$admtext['eventsonly'] = "Importer uniquement les types d'événements/attributs personnalisés (aucune donnée n'est ajoutée, remplacée ou modifiée)";
> 		$admtext['allevents'] = "Accepter les données pour tous les nouveaux types d'événements/attributs";
> 		$admtext['finishingimporting'] = "Presque terminé...";
> 		$admtext['fileuploadfailed'] = " Le téléversement du fichier a échoué. Peut-être le fichier est-il trop gros. Essayez d'utiliser le FTP pour téléverser votre fichier dans votre répertoire GEDCOM, puis sélectionnez-le et importez-le à partir d'ici.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Modifier un type d'évènement existant";
135,138d168
< 		$admtext['entertypedesc'] = "Veuillez saisir un type et une description pour ce nouveau type d'évènement.";
< 		$admtext['enterdisplay'] = "Veuillez saisir une chaîne pour ce nouveau type d'évènement.";
< 		$admtext['existingeventtypeinfo'] = "Information Type d'évènement existant";
< 		$admtext['neweventtypeinfo'] = "Nouveau Type d'évènement";
145,146d174
< 		$admtext['addnewevtype'] = "Ajouter un type d'évènement";
< 		$admtext['createnewevtype'] = "Crée un type d'évènement";
149,150d176
< 		$admtext['existingevtypes'] = "Types d'évènement existants";
< 		$admtext['edsevtypes'] = "Édite, supprime ou trie les types d'évènement déjà saisis";
152d177
< 		$admtext['confdeleteevtype'] = "Êtes-vous certain de vouloir supprimer ce type d'évènement ?";
154d178
< 		$admtext['selectentertag'] = "Veuillez choisir ou saisir le tag pour ce type d'évènement.";
208d231
< 		$admtext['changestoallevtypes'] = "Modifications de tous les types d'évènement";
214d236
< 		$admtext['BAPM'] = "Baptême";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Êtes-vous sûr de vouloir supprimer ce type d'événement ? Tous les événements de ce type seront alors détruits.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Ajouter un nouveau type";
> 		$admtext['createnewevtype'] = "Créer un nouvel enregistrement de type d'événement/attribut";
> 		$admtext['modifyeventtype'] = "Modifier un type existant";
> 		$admtext['entertypedesc'] = "Merci de saisir un type ou une description pour ce nouveau type d'événement/attribut.";
> 		$admtext['enterdisplay'] = "Merci de saisir un texte d'affichage pour ce nouveau type d'événement/attribut.";
> 		$admtext['existingeventtypeinfo'] = "Information sur un type d'événement/attribut existant";
> 		$admtext['neweventtypeinfo'] = "Information sur un nouveau type d'événement/attribut";
> 		$admtext['existingevtypes'] = "Types d'événements/attributs existants";
> 		$admtext['edsevtypes'] = "Modifier, supprimer ou trier les types d'événements/attributs précédemment saisis.";
> 		$admtext['selectentertag'] = "Merci de sélectionner ou de saisir le tag pour ce type d'événement/attribut.";
> 		$admtext['changestoallevtypes'] = "Modifications de tous les types d'événements/attributs";
254c290
< 		$admtext['fevslater'] = "Note: les évènements additionnels, et les notes spécifiques aux évènements et les citations, peuvent être ajoutés après avoir sauvegardé la nouvelle famille.";
---
> 		$admtext['fevslater'] = "Note: les évènements additionnels, les notes spécifiques aux évènements et les citations peuvent être ajoutés après avoir sauvegardé la nouvelle famille.";
256c292
< 		$admtext['wifeid'] = "ID Epouse";
---
> 		$admtext['wifeid'] = "ID Épouse";
268d303
< 		$admtext['nobirthinfo'] = "Aucune info de naissance";
274c309
< 		$admtext['nickname'] = "Surnom";
---
> 		$admtext['nickname'] = "Autre nom";
295c330
< 		$admtext['prefixpersonid'] = "Veuillez préfixer l'ID de Personne avec un \"I\" pour \"Individuel\"";
---
> 		$admtext['prefixpersonid'] = "Veuillez préfixer l'ID de Personne avec un \"I\" pour \"Individu\"";
324c359
< 		$admtext['pevslater'] = "Note: les évènements additionnels, et les notes spécifiques aux évènements et les citations, peuvent être ajoutés après avoir sauvegardé le nouvel individu.";
---
> 		$admtext['pevslater'] = "Note: les évènements additionnels, les notes spécifiques aux évènements et les citations peuvent être ajoutés après avoir sauvegardé le nouvel individu.";
327c362
< 		$admtext['pevslater2'] = "Note: Des événements additionnels, des notes associées à des événement et des citations, peuvent être ajoutés plus tard.";
---
> 		$admtext['pevslater2'] = "Note: Des événements additionnels, des notes associées à des événements et des citations peuvent être ajoutés plus tard.";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Sélectionner la photo par<br/>défaut<br/>"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Enregistrer + Nouveaux Parents";
> 		$admtext['savenewspouse'] = "Enregistrer + Nouveau conjoint";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Date de naissance alternative";
354d391
< 		$admtext['enterphotodesc'] = "Veuillez saisir une description pour cette image.";
388d424
< 		$admtext['photoowner'] = "Propriétaire - source";
390c426
< 		$admtext['selectphoto'] = "Selectionner l'image";
---
> 		$admtext['selectphoto'] = "Sélectionner l'image";
417d452
< 		$admtext['imgmap'] = "Carte d'image";
490d524
< 		$admtext['mapinstr3'] = "Pour associer une région de cette photo à un individu spécifique, sélectionner l'arbre de l'individu, choisir une forme et des dimensions pour la zone de la photo que vous désirez associer à l'individu, puis cliquer au centre de la zone sélectionnée sur la photo. Une fenêtre s'ouvrira pour vous aider à sélectionner l'individu. Une fois que vous l'aurez sélectionné, le code pour la carte d'image sera ajouté dans le champ. Répéter ce processus autant de fois que vous désirez ajouter des individus à la photo.";
495d528
< 		$admtext['removelink'] = "Supprimer le lien";
502d534
< 		$admtext['eloptions'] = "Explorer ou supprimer";
509d540
< 		$admtext['nolinks'] = "Aucune association n'a encore été créée";
521c552
< 		$admtext['addnewcoll'] = "Ajouter la collection";
---
> 		$admtext['addnewcoll'] = "Ajouter une collection";
536c567
< 		$admtext['cidexists'] = "L'ID de la collection que vous avez saisie peut ne pas être ajoutée si elle existe déjà.";
---
> 		$admtext['cidexists'] = "L'ID de la collection que vous avez saisi ne peut ne pas être ajouté car il existe déjà.";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
546c574
< 		$admtext['linksel'] = "Associé à la sélection";
---
> 		$admtext['linksel'] = "Associer à la sélection";
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Carte d'image HTML (pour la rétrocompatibilité)";
> 		$admtext['photoowner'] = "Propriétaire de l'original";
> 		$admtext['nothumb'] = "Pas de miniature";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Cet élément n'a pas pu être ajouté, probablement parce que le fichier est trop volumineux et n'a pas pu être téléversé ou utilisé pour fabriquer une vignette.";
> 		$admtext['moved'] = "Déplacé";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Merci de saisir une description pour cette image.";
> 		$admtext['mapinstr3'] = "Pour lier une zone de cette photo à une personne, une famille ou une autre entité, sélectionner d'abord l'arbre pertinent et le type d'entité, puis créer un rectangle de la zone choisie. Pour ce faire, cliquer sur l'angle en haut à gauche de la zone, puis étirer le rectangle jusqu'à l'angle en bas à droite. Vous pouvez aussi cliquer sur l'angle en haut à gauche, puis sur l'angle en bas à droite. Une boîte en popup vous aidera alors à sélectionner la personne ou toute autre entité. Faire votre choix, puis répéter le processus autant de fois que nécessaire pour d'autres zones. Cliquer sur une zone existante pour la choisir, puis la faire glisser pour la déplacer. Vous pouvez aussi cliquer sur le 'X' pour supprimer la zone.";
561c599
< 		$admtext['modifyreport'] = "Modifier le Rapport existant";
---
> 		$admtext['modifyreport'] = "Modifier un rapport existant";
564,565c602,603
< 		$admtext['newreportinfo'] = "Nouveau Rapport";
< 		$admtext['reportname'] = "Nom du Rapport";
---
> 		$admtext['newreportinfo'] = "Nouveau rapport";
> 		$admtext['reportname'] = "Nom du rapport";
596d633
< 		$admtext['foremptystring'] = "Pour une chaîne vide, laissez ce champ vide et cliquez sur \"Ajouter >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions : Double-cliquez sur les éléments de gauche ou les faire glisser pour les placer dans les listes de droite.<br>Les faire glisser vers le haut et vers le bas pour les réorganiser.<br> Double-cliquez sur un élément des listes de droite pour le supprimer.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Pour une chaîne vide, laisser ce champ vide et cliquer sur >>";
651,655d690
< 		$admtext['selectimportfile'] = "Choisir un fichier à importer.";
< 		$admtext['importgedcom'] = "Importer GEDCOM (format standard 5.5)";
< 		$admtext['addreplacedata'] = "Complète ou remplace vos données généalogiques (peut prendre plusieurs minutes, en fonction de la taille de votre fichier)";
< 		$admtext['fromyourcomputer'] = "Depuis votre ordinateur ";
< 		$admtext['importdata'] = "Importer les données";
657,660d691
< 		$admtext['replace'] = "Remplacer (dans arbre sélectionné)";
< 		$admtext['desttree'] = "Arbre cible";
< 		$admtext['selectdesttree'] = "Veuillez choisir ou saisir une arbre cible.";
< 		$admtext['selectexisting'] = "Importer dans";
668,673d698
< 		$admtext['ucaselast'] = "Mettre les noms de famille en majuscules";
< 		$admtext['norecalc'] = "Ne pas recalculer les indicateurs 'En vie'";
< 		$admtext['autooffset'] = "Faire débuter les IDs au premier nombre disponible";
< 
< 		$admtext['mustselecttree'] = "Vous devez sélectionner un arbre avant d'utiliser cette option.";
< 		$admtext['importmedia'] = "Importer des médias s'ils existent";
675d699
< 		$admtext['neweronly'] = "Remplacer uniquement si plus récent";
677,692d700
< 		$admtext['onwebserver'] = "Sur le serveur web (dans le dossier GEDCOM)";
< 		$admtext['eventsonly'] = "Importer seulement les types d'évènement personnalisés (aucune donnée n'est ajoutée ou remplacée)";
< 		$admtext['imphints'] = "Notes: \"Toutes les données\" signifie tous les individus, familles, sources et notes (les associations à des fichiers média ne sont pas perdues tant que les IDs demeurent inchangés). Les correspondances sont toujours basées sur les IDs seulement. Les nouveaux enregistrements sont toujours ajoutés. \"Ajouter...\" importe tous les enregistrements qui ont un nouvel ID.";
< 		$admtext['allevents'] = "Accepter les données relatives à tous les nouveaux types d'événements personnalisés";
< 		$admtext['destbranch'] = "Branche de destination (facultatif)";
< 		$admtext['inframe'] = "(dans le cadre)";
< 		$admtext['getstart'] = "Mise en route";
< 		$admtext['importlatlong'] = "Importez les données de latitude/longitude si elles existent";
< 		$admtext['opening'] = "Ouverture";
< 		$admtext['reopen'] = "Réouverture";
< 		$admtext['uploading'] = "Téléchargement";
< 		$admtext['stop'] = "Arrêt";
< 		$admtext['stopped'] = "L'importation s'est arrêtée";
< 		$admtext['resume'] = "cliquer ici pour recommencer";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Journal";
694,696c702
< 		$admtext['mmgritems'] = "Installez ou supprimez les TNG Mods";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Importer par l'ancienne méthode (pas de barre de progression)";
---
> 		$admtext['mmgritems'] = "Installer et désinstaller les Mods";
700,701c706,707
< 		$admtext['tasks'] = "Des tâches importantes";
< 		$admtext['task_revusers'] = "Examiner les enregistrement de nouveaux utilisateurs";
---
> 		$admtext['tasks'] = "Tâches importantes";
> 		$admtext['task_revusers'] = "Examiner les enregistrements de nouveaux utilisateurs";
706c712
< 		$admtext['task_revind'] = "Examiner les modifications proposées pour des événements d'individu";
---
> 		$admtext['task_revind'] = "Examiner les modifications proposées pour des événements d'individus";
709c715
< 		$admtext['nobackups'] = "il y a aucune sauvegarde";
---
> 		$admtext['nobackups'] = "Il n'y a aucune sauvegarde";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Mise à jour";
> 		$admtext['need_upgrade'] = "Terminer ces instructions de mise à jour";
> 		$admtext['upgrade_missing'] = "Le fichier de mise à jour semble être manquant. La cause peut être que la mise à jour soit terminée.";
> 		$admtext['delete_upgrade'] = "Quand vous avez terminé, cliquez ici pour supprimer le fichier de mise à jour et revenir au menu.";
718c729
< 		$admtext['changestosource'] = "Modification d'une source";
---
> 		$admtext['changestosource'] = "Modifications de la source";
723d733
< 		$admtext['author'] = "Auteur";
785,788c795,798
< 		$admtext['pedperson'] = "Id de personne du diagramme"; //2
< 		$admtext['pedtree'] = "Id d'arbre du diagramme"; //2
< 		$admtext['phhistperson'] = "Id de personne de photos et d'histoires"; //2
< 		$admtext['phhisttree'] = "Id d'arbre de photos et d'histoires"; //2
---
> 		$admtext['pedperson'] = "ID de personne du diagramme"; //2
> 		$admtext['pedtree'] = "ID d'arbre du diagramme"; //2
> 		$admtext['phhistperson'] = "ID de personne de photos et d'histoires"; //2
> 		$admtext['phhisttree'] = "ID d'arbre de photos et d'histoires"; //2
804,825c814,835
< 		$admtext['momside'] = "Étiquette de côté de la mère"; //8
< 		$admtext['dadside'] = "Étiquette de côté du père"; //8
< 		$admtext['momperson'] = "ID de personne de côté de la mère"; //8
< 		$admtext['momtree'] = "Id d'arbre du côté de la mère"; //8
< 		$admtext['dadperson'] = "ID de personne de côté du père"; //8
< 		$admtext['dadtree'] = "Id d'arbre du côté du père"; //8
< 		$admtext['featurethumb1'] = "Vignette du 1er dispositif"; //4
< 		$admtext['featurelink1'] = "Lien du 1er dispositif"; //4
< 		$admtext['featuretitle1'] = "Titre du 1er dispositif"; //4
< 		$admtext['featurepara1'] = "Paragraphe du 1er dispositif"; //4
< 		$admtext['featurethumb2'] = "Vignette du 2e dispositif"; //4
< 		$admtext['featurelink2'] = "Lien du 2e dispositif"; //4
< 		$admtext['featuretitle2'] = "Titre du 2e dispositif"; //4
< 		$admtext['featurepara2'] = "Paragraphe du 2e dispositif"; //4
< 		$admtext['featurethumb3'] = "Vignette du 3e dispositif"; //4
< 		$admtext['featurelink3'] = "Lien du 3e dispositif"; //4
< 		$admtext['featuretitle3'] = "Titre du 3e dispositif"; //4
< 		$admtext['featurepara3'] = "Paragraphe du 3e dispositif"; //4
< 		$admtext['featurethumb4'] = "Vignette du 4e dispositif"; //4
< 		$admtext['featurelink4'] = "Lien du 4e dispositif"; //4
< 		$admtext['featuretitle4'] = "Titre du 4e dispositif"; //4
< 		$admtext['featurepara4'] = "Paragraphe du 4e dispositif"; //4
---
> 		$admtext['momside'] = "Étiquette d'affichage pour le côté maternel"; //8, 20
> 		$admtext['dadside'] = "Étiquette d'affichage pour le côté paternel"; //8, 20
> 		$admtext['momperson'] = "personID pour le côté maternel"; //8, 20
> 		$admtext['momtree'] = "treeID pour le côté maternel"; //8, 20
> 		$admtext['dadperson'] = "personID pour le côté paternel"; //8, 20
> 		$admtext['dadtree'] = "treeID pour le côté paternel"; //8, 20
> 		$admtext['featurethumb1'] = "Vignette du 1er article"; //4
> 		$admtext['featurelink1'] = "Lien du 1er article"; //4
> 		$admtext['featuretitle1'] = "Titre du 1er article"; //4
> 		$admtext['featurepara1'] = "Paragraphe du 1er article"; //4
> 		$admtext['featurethumb2'] = "Vignette du 2e article"; //4
> 		$admtext['featurelink2'] = "Lien du 2e article"; //4
> 		$admtext['featuretitle2'] = "Titre du 2e article"; //4
> 		$admtext['featurepara2'] = "Paragraphe du 2e article"; //4
> 		$admtext['featurethumb3'] = "Vignette du 3e article"; //4
> 		$admtext['featurelink3'] = "Lien du 3e article"; //4
> 		$admtext['featuretitle3'] = "Titre du 3e article"; //4
> 		$admtext['featurepara3'] = "Feature 3 paragraph"; //4
> 		$admtext['featurethumb4'] = "Vignette du 4e article"; //4
> 		$admtext['featurelink4'] = "Lien du 4e article"; //4
> 		$admtext['featuretitle4'] = "Titre du 4e article"; //4
> 		$admtext['featurepara4'] = "Paragraphe du 4e article"; //4
852c862
< 		$admtext['topsurnames'] = "Premiers noms de famille";
---
> 		$admtext['topsurnames'] = "Noms de famille les plus fréquents";
860,876c870,886
< 		$admtext['featurethumb5'] = "Vignette du 5e dispositif"; //15
< 		$admtext['featurelink5'] = "Lien du 5e dispositif"; //15
< 		$admtext['featuretitle5'] = "Titre du 5e dispositif"; //15
< 		$admtext['featurepara5'] = "Paragraphe du 5e dispositif"; //15
< 		$admtext['featurethumb6'] = "Vignette du 6e dispositif"; //15
< 		$admtext['featurelink6'] = "Lien du 6e dispositif"; //15
< 		$admtext['featuretitle6'] = "Titre du 6e dispositif"; //15
< 		$admtext['featurepara6'] = "Paragraphe du 6e dispositif"; //15
< 		$admtext['featurethumb7'] = "Vignette du 7e dispositif"; //15
< 		$admtext['featurelink7'] = "Lien du 7e dispositif"; //15
< 		$admtext['featurepara7'] = "Paragraphe du 7e dispositif"; //15
< 		$admtext['featurethumb8'] = "Vignette du 8e dispositif"; //15
< 		$admtext['featurelink8'] = "Lien du 8e dispositif"; //15
< 		$admtext['featurepara8'] = "Paragraphe du 8e dispositif"; //15
< 		$admtext['sidebarhead1'] = "En-tête du volet latéral 1"; //15
< 		$admtext['sidebarhead2'] = "En-tête du volet latéral 2"; //15
< 		$admtext['sidebarhead3'] = "En-tête du volet latéral 3"; //15
---
> 		$admtext['featurethumb5'] = "Vignette du 5e article"; //15
> 		$admtext['featurelink5'] = "Lien du 5e article"; //15
> 		$admtext['featuretitle5'] = "Titre du 5e article"; //15
> 		$admtext['featurepara5'] = "Paragraphe du 5e article"; //15
> 		$admtext['featurethumb6'] = "Vignette du 6e article"; //15
> 		$admtext['featurelink6'] = "Lien du 6e article"; //15
> 		$admtext['featuretitle6'] = "Titre du 6e article"; //15
> 		$admtext['featurepara6'] = "Paragraphe du 6e article"; //15
> 		$admtext['featurethumb7'] = "Vignette du 7e article"; //15
> 		$admtext['featurelink7'] = "Lien du 7e article"; //15
> 		$admtext['featurepara7'] = "Paragraphe du 7e article"; //15
> 		$admtext['featurethumb8'] = "Vignette du 8e article"; //15
> 		$admtext['featurelink8'] = "Lien du 8e article"; //15
> 		$admtext['featurepara8'] = "Paragraphe du 8e article"; //15
> 		$admtext['sidebarhead1'] = "En-tête de l'encadré 1"; //15
> 		$admtext['sidebarhead2'] = "En-tête de l'encadré 2"; //15
> 		$admtext['sidebarhead3'] = "En-tête de l'encadré 3"; //15
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "En-tête de citations";
> 		$admtext['quotesubhead'] = "Sous en-tête de citations";
> 		$admtext['sniptitle'] = "Titre de la Featurette";
> 		$admtext['snipname'] = "Nom de la Featurette";
> 		$admtext['snipinfoone'] = "Première ligne de la Featurette";
> 		$admtext['snipinfotwo'] = "Deuxième ligne de la Featurette";
> 		$admtext['snipimage'] = "Image Featurette";
> 		$admtext['snipperson'] = "Identifiant de la personne";
> 		$admtext['sniptree'] = "ID de l’arbre de la Featurette";
> 		$admtext['quote'] = "Citation";
> 		$admtext['link'] = "Lien";
> 		$admtext['featuretitle7'] = "Titre de la fonction 7";
> 		$admtext['featuretitle8'] = "Titre de la fonction 8";
> 		$admtext['featuretitle9'] = "Titre de la fonction 9";
> 		$admtext['featurethumb9'] = "Vignette fonction 9"; //15
> 		$admtext['featurelink9'] = "Lien fonction 9"; //15
> 		$admtext['featurepara9'] = "Paragraphe fonction 9"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Image d'en-tête à gauche";
> 		$admtext['rightimg'] = "Image d'en-tête à droite";
> 		$admtext['photoption'] = "Les options de photo sont<br />&nbsp;&nbsp;(fixe ou aléatoire)";
> 		$admtext['randomphotowidth'] = "Largeur de la photo aléatoire";
> 		$admtext['randomphotoheight'] = "Hauteur de la photo aléatoire";
> 		$admtext['randomphotomediatypeID'] = "Collection de photos aléatoires";
> 		$admtext['momheading'] = "Titre famille maternelle";
> 		$admtext['mompara'] = "Paragraphe sur la famille maternelle";
> 		$admtext['mompagelink'] = "Page sur la famille maternelle";
> 		$admtext['dadheading'] = "Titre famille paternelle";
> 		$admtext['dadpara'] = "Paragraphe sur la famille paternelle";
> 		$admtext['dadpagelink'] = "Page sur la famille paternelle";
> 		$admtext['spmomheading'] = "Titre famille maternelle du conjoint";
> 		$admtext['spmompara'] = "Paragraphe de la mère du conjoint";
> 		$admtext['spmompagelink'] = "Lien à la page sur la famille maternelle<br />&nbsp;&nbsp; du conjoint";
> 		$admtext['spmomside'] = "Étiquette d'affichage pour le côté maternel<br />&nbsp;&nbsp; du conjoint";
> 		$admtext['spdadside'] = "Étiquette d'affichage pour le côté paternel<br />&nbsp;&nbsp; du conjoint";
> 		$admtext['spmomperson'] = "personID pour le côté maternel du conjoint";
> 		$admtext['spmomtree'] = "treeID pour le côté maternel du conjoint";
> 		$admtext['spdadheading'] = "Titre famille paternelle du conjoint";
> 		$admtext['spdadpara'] = "Paragraphe du père du conjoint";
> 		$admtext['spdadpagelink'] = "Lien à la page sur la famille paternelle<br />&nbsp;&nbsp; du conjoint";
> 		$admtext['spdadperson'] = "personID pour le côté paternel du conjoint";
> 		$admtext['spdadtree'] = "ID de l'arbre pour le côté paternel du conjoint";
> 		$admtext['storiesheading'] = "Nos histoires de famille";
> 		$admtext['nbrsurnames'] = "Nombre de noms<br />&nbsp;&nbsp;dans le nuage de noms";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Vignette fonction";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Titre de la diapositive";
> 		$admtext['slideimg'] = "Image de la diapositive";
> 		$admtext['slideheadline'] = "Manchette de la diapositive";
> 		$admtext['slidetext'] = "Texte de la diapositive";
> 		$admtext['slidelink'] = "Lien de la diapositive";
> 		$admtext['slidelinktext'] = "Nom du lien de la diapositive";
> 		$admtext['featurelink'] = "Lien pour l'affichage";
> 		$admtext['featurelinktext'] = "Nom du lien pour l'affichage";
> 		$admtext['featuretitle'] = "Titre de l'affichage";
> 		$admtext['featuresub'] = "Sous-titre de l'affichage";
> 		$admtext['quoteimg'] = "Image de citation";
> 		$admtext['quotelink'] = "Lien de citation";
> 		$admtext['quotelinktext'] = "Nom du lien de citation";
> 		$admtext['sidebarpara'] = "Paragraphe de la barre latérale";
> 		$admtext['sidebarlink'] = "Lien de la barre latérale";
> 		$admtext['sidebarlinktext'] = "Nom du lien de la barre latérale";
> 		$admtext['sidebarimg'] = "Image de la barre latérale";
> 		$admtext['sidebartitle'] = "Titre de la barre latérale";
> 		$admtext['sidebarsub'] = "Sous-titre de la barre latérale";
> 		$admtext['snipheadline'] = "Manchette de l'affichette";
> 		$admtext['snipsubhead'] = "Sous-titre de l'affichette";
> 		$admtext['snipimg'] = "Image de l'affichette";
> 		$admtext['sniplink'] = "Lien de l'affichette";
> 		$admtext['sniplinktext'] = "Nom du lien de l'affichette";
> 		$admtext['linktext'] = "Texte du lien";
> 		$admtext['footerheadline'] = "Manchette du pied de page";
> 		$admtext['footerpara'] = "Texte du pied de page";
> 		$admtext['footerlink'] = "Lien du pied de page";
> 		$admtext['footerlinktext'] = "Nom du lien du pied de page";
> 		$admtext['footerheadline'] = "Manchette du pied de page";
> 		$admtext['footerpara'] = "Texte du pied de page";
> 		$admtext['footerlink'] = "Lien du pied de page";
> 		$admtext['footerlinktext'] = "Nom du lien du pied de page";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG nécessite 5.3 ou plus élevé.)";
---
> 		$admtext['phpreq'] = "(TNG nécessite 7.0 ou plus élevé.)";
1002,1003c1095,1096
< 		$admtext['lnpfxnum'] = "Num. chaque préfixe (max)";
< 		$admtext['specpfx'] = "ou ces préfixes particuliers";
---
> 		$admtext['lnpfxnum'] = "Nombre maximum de préfixes à considérer<br /> (Van = 1, Van der = 2, etc.)";
> 		$admtext['specpfx'] = "OU ces préfixes particuliers ";
1014c1107
< 		$admtext['brinstructions'] = "Pour sauvegarder, restaurer ou optimiser une table, selectionnez l'action adéquate pour cette table, ou sélectionnez plusieurs tables et appliquez l'action désirée à toute la sélection en appuyant sur le bouton correspondant au bas de l'écran.";
---
> 		$admtext['brinstructions'] = "Pour sauvegarder, restaurer ou optimiser une table, selectionnez l'action adéquate pour cette table. <br /> OU sélectionnez plusieurs tables, sélectionnez l'action désirée dans la liste déroulante puis appliquez-la à toute la sélection en appuyant sur le bouton [Aller].";
1032c1125
< 		$admtext['backupstruct'] = "Sauvegarder la Structure des tables";
---
> 		$admtext['backupstruct'] = "Sauvegarder la structure des tables";
1078c1171
< 		$admtext['relchart'] = "Schéma relationnel";
---
> 		$admtext['relchart'] = "Tableau de parenté";
1162c1255
< 		$admtext['mapwidth'] = "Largeur (% or px)";
---
> 		$admtext['mapwidth'] = "Largeur (% ou px)";
1171c1264
< 		$admtext['albumlinkstable'] = "Table des Liens albums";
---
> 		$admtext['albumlinkstable'] = "Table des Liens des albums";
1175,1176c1268,1269
< 		$admtext['notelinkstable'] = "Table Liens notes";
< 		$admtext['medialinkstable'] = "Table des Liens médias";
---
> 		$admtext['notelinkstable'] = "Table Liens des notes";
> 		$admtext['medialinkstable'] = "Table des Liens des médias";
1198c1291
< 		$admtext['needmaint'] = "Vous devez être en mode Maintenance pour lancer cet outil (Aller à  Configurations &gt;&gt; Configuration &gt;&gt; Configuration générale>>Bases de données)";
---
> 		$admtext['needmaint'] = "Vous devez être en mode Maintenance pour lancer cet outil (Aller à Configurations &gt;&gt; Configuration générale &gt;&gt; Bases de données et choisissez 'Oui' pour le Mode maintenance)";
1207c1300
< 		$admtext['localhspath'] = "Chemin local de pierre tombale";
---
> 		$admtext['localhspath'] = "Chemin local pour les pierres tombales";
1232d1324
< 		//added in 8.0.0
1235c1327
< 		$admtext['initrels'] = "Premier lien";
---
> 		$admtext['initrels'] = "Nb initial de relations à voir";
1246,1247c1338,1339
< 		$admtext['modspath'] = "Dossier mods";
< 		$admtext['extspath'] = "Dossier extensions";
---
> 		$admtext['modspath'] = "Dossier Mods";
> 		$admtext['extspath'] = "Dossier Extensions";
1255d1346
< 		//added in 9.0.0
1258c1349
< 		$admtext['convexpl'] = "(Cela assignera tous les lieux actuels à l'arbre sélectionné)";
---
> 		$admtext['convexpl'] = "(Cela assignera tous les Lieux actuels à l'arbre sélectionné)";
1264c1355
<         $admtext['mailpass'] = "mot de passe mail";
---
>         $admtext['mailpass'] = "Mot de passe mail";
1273c1364
<         $admtext['assumepriv'] = "Considérer comme confidentiel si non décédé <br />depuis de nombreuses années";
---
>         $admtext['assumepriv'] = "Considérer comme confidentiel si non décédé <br />depuis ce nombre d'années";
1276c1367
< 		$admtext['shownamespr'] = "Montrer les noms des individus marqués confidentiels";
---
> 		$admtext['shownamespr'] = "Montrer les noms des individus marqués 'Confidentiel'";
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1288c1377
< 		$admtext['pedvertical'] = "Ascendant";
---
> 		$admtext['pedvertical'] = "Vertical";
1293,1294c1382
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Re-utiliser les IDs supprimés";
---
> 		$admtext['reuseids'] = "Réutiliser les IDs supprimés";
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1316c1402
< 		$admtext['belowbar'] = "dessous la barre de menu mobile";
---
> 		$admtext['belowbar'] = "sous la barre de menu mobile";
1329,1330c1415
<         $admtext['assumeliving'] = "Supposer en vie si pas mort tant d'années";
< 		//changed in 11.0.2
---
>         $admtext['assumeliving'] = "Supposer en vie si agé de moins de <br />ce nombre d'années";
1360c1445
< 		$admtext['dataprotectmsg'] = "Afficher le lien de la politique de protection des données";
---
> 		$admtext['dataprotectmsg'] = "Afficher le lien de la charte de protection des données";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Modifier les préfixes entrants pour qu'ils correspondent aux paramètres de TNG";
> 		$admtext['sortevents'] = "Trier les événements par";
> 		$admtext['sortbydate'] = "Date de l'événement";
> 		$admtext['sortbytype'] = "Type de l'événement";
> 		$admtext['allowsuggest'] = "Autoriser les suggestions des visiteurs";
> 		$admtext['livingchecked'] = "Marqueur \"en vie\" pour les personnes et familles nouvelles";
> 		$admtext['maxmarried'] = "Marquer une famille \"en vie\" si le mariage a eu lieu<br/>il y a moins de ce nombre d'années";
> 		$admtext['imagetags'] = "Rectangles";
> 		$admtext['allowcsv'] = "Autoriser les téléchargements CSV pour les rapports";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Options de sauvegarde";
> 		$admtext['dosql'] = "Exporter sous forme SQL";
> 		$admtext['dodrop'] = "Inclure DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Inclure CREATE TABLE";
> 		$admtext['onrestore'] = "Restaurer les options";
> 		$admtext['dodel'] = "Supprimer d'abord le contenu précédent";
> 		$admtext['download'] = "Téléchargement";
> 		$admtext['altbirthtypes'] = "Autres événements liés à la naissance";
> 		$admtext['dtformat'] = "Format des tableaux";
> 		$admtext['conchart'] = "Diagramme des connexions";
> 		$admtext['maxropt'] = "Nombre maximal de recherches de connexions";
> 		$admtext['maxlopt'] = "Longueur maximale des chemins de connexion";
> 		$admtext['showtxtopt'] = "Afficher l'énoncé textuel du chemin";
> 		$admtext['compactboxopt'] = "Afficher les boîtes de personnes sous forme compacte";
> 		$admtext['sortbyopt'] = "Trier les chemins par";
> 		$admtext['anchoridopt'] = "ID de l'ancre";
> 		$admtext['maxmopt'] = "Nombre maximum de mariages dans la connexion";
> 		$admtext['saveincfg'] = "Stocker dans le chemin de configuration (voir Configuration générale)";
1374c1488
< 		$admtext['pleaseplacepart'] = "Veuillez saisir une partie d'un nom de lieu.";
---
> 		$admtext['pleaseplacepart'] = "Veuillez saisir une partie d'un nom de Lieu.";
1389,1390c1503,1504
< 		$admtext['pmsucc'] = "la fusion des lieux a réussi";
< 		$admtext['nomerge'] = "rien à fusionner";
---
> 		$admtext['pmsucc'] = "La fusion des Lieux a réussi";
> 		$admtext['nomerge'] = "Rien à fusionner";
1394,1395c1508
< 		$admtext['propagate'] = "appliquer cette modification aux évênements existants";
< 		//added in 8.0.0
---
> 		$admtext['propagate'] = "Appliquer cette modification aux événements existants";
1409c1522
<         $admtext['multchoice'] = "Si plusieurs résultats sont trouvés pour un lieu:";
---
>         $admtext['multchoice'] = "Si plusieurs résultats sont trouvés pour un Lieu:";
1416d1528
<         $admtext['nogeocode'] = "N'a pu être géocodé";
1418c1530
< 		$admtext['treesgone'] = "Assignation des arbres supprimée pour tous les lieux";
---
> 		$admtext['treesgone'] = "Assignation aux arbres supprimée pour tous les Lieux";
1420,1421c1532,1533
< 		$admtext['nolevel'] = "Type de lieu non spécifié";
< 		$admtext['placenotsaved'] = "Lieu non enregistré. Un autre lieu existe déjà avec le même nom. Merci de fusionner les lieux.";
---
> 		$admtext['nolevel'] = "Type de Lieu non spécifié";
> 		$admtext['placenotsaved'] = "Lieu non enregistré. Un autre Lieu existe déjà avec le même nom. Merci de fusionner les Lieux.";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Ne pas géocoder";
1436d1549
< 		$admtext['backtosecondary'] = "Retour aux outils secondaires";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Retour aux outils post-importation";
1469,1470c1584,1585
< 		$admtext['existinglanguages'] = "Info Langue(s) existante(s)";
< 		$admtext['modifylanguage'] = "Modifier Langue existante";
---
> 		$admtext['existinglanguages'] = "Info langue(s) existante(s)";
> 		$admtext['modifylanguage'] = "Modifier langue existante";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exclure les notes";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zipper et inclure les fichiers de médias";
> 		$admtext['downloadzip'] = "Télécharger le ZIP";
1575d1692
< 		//added in 8.0.0
1584c1701
< 		$admtext['usreditord'] = "Ajouter , supprimer ou modifier les données y compris médias";
---
> 		$admtext['usreditord'] = "Ajouter, supprimer ou modifier les données y compris les médias";
1591,1593c1708,1710
< 		$admtext['allow_media_edit'] = "Autoriser d'éditer médias seulement";
< 		$admtext['allow_media_add'] = "Autoriser d'ajouter médias seulement";
< 		$admtext['allow_media_delete'] = "Autoriser de supprimer médias seulement";
---
> 		$admtext['allow_media_edit'] = "Autoriser l'édition de médias seulement";
> 		$admtext['allow_media_add'] = "Autoriser l'ajout de médias seulement";
> 		$admtext['allow_media_delete'] = "Autoriser la suppression de médias seulement";
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Afficher seulement les utilisateurs désactivés";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Autoriser la visualisation des notes confidentielles";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Envoyer aussi aux admins quand un seul arbre est sélectionné";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1684c1803
< 		$admtext['nomods'] = "Aucun fichier de definition Mod (xxx) retrouvé dans le dossier Mod";
---
> 		$admtext['nomods'] = "Aucun fichier de configuration du Mod (xxx) retrouvé dans votre répertoire Mods";
1690c1809
< 		$admtext['checkwrite'] = "Vérifier les droits d'accès, droit être accessible";
---
> 		$admtext['checkwrite'] = "Vérifier les droits d'accès, doit être accessible";
1695c1814
< 		$admtext['defval'] = "Valeur de défaut";
---
> 		$admtext['defval'] = "Valeur par défaut";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1705c1822
< 		$admtext['editperf'] = "Les paramètres d'édition ont été modifiées comme suit:";
---
> 		$admtext['editperf'] = "Les paramètres d'édition ont été modifiés comme suit:";
1713c1830
< 		$admtext['logoptions'] = "Journal du gestionnaire de Mod ";
---
> 		$admtext['logoptions'] = "Journal du Gestionnaire des Mods ";
1716,1718c1833,1835
< 		$admtext['modname'] = "Nom du mod";
< 		$admtext['bypassconfirm'] = "Passer outre les confirmations";
< 		$admtext['modifyoptions'] = "Modifier les options du Gestionnaire de Mod";
---
> 		$admtext['modname'] = "Nom du Mod";
> 		$admtext['bypassconfirm'] = "Outrepasser les confirmations";
> 		$admtext['modifyoptions'] = "Modifier les options du Gestionnaire des Mods";
1722,1723c1839,1840
< 		$admtext['showlogfile'] = "Afficher le journal des actions du gestionnaire de Mod";
< 		$admtext['recentactions'] = "actions les plus récentes du gestionnaire de Mod";
---
> 		$admtext['showlogfile'] = "Afficher le journal des actions du Gestionnaire des Mods";
> 		$admtext['recentactions'] = "Actions les plus récentes du Gestionnaire de Mods";
1726,1727c1843,1844
< 		$admtext['modsyntax'] = "Syntaxe des mods";
< 		$admtext['modguidelines'] = "Normes des Mod";
---
> 		$admtext['modsyntax'] = "Syntaxe des Mods";
> 		$admtext['modguidelines'] = "Normes des Mods";
1769,1771c1886,1888
< 		$admtext['modrem'] = "mod désinstallé";
< 		$admtext['modsrem'] = "modifications du code supprimées";
< 		$admtext['modsreq'] = "modifications de code spécifiées";
---
> 		$admtext['modrem'] = "Mod désinstallé";
> 		$admtext['modsrem'] = "Mods désinstallés";
> 		$admtext['modsreq'] = "Mods spécifiés";
1775c1892
< 		$admtext['nocfgfile'] = "fichier mod introuvable";
---
> 		$admtext['nocfgfile'] = "Fichier Mod introuvable";
1787c1904
< 		$admtext['return'] = "Retour au gestionnaire de Mod";
---
> 		$admtext['return'] = "Retour au Gestionnaire des Mods";
1789c1906
< 		$admtext['tagunk'] = "étiquette  inconnue";
---
> 		$admtext['tagunk'] = "étiquette inconnue";
1795,1796c1912,1913
< 		$admtext['allowdeletepartial'] = "Supprimer les mods sélectionnés partiellement installés";
< 		$admtext['allowdeleteinstalled'] = "Supprimer les mods installés individuellement";
---
> 		$admtext['allowdeletepartial'] = "Supprimer les Mods sélectionnés partiellement installés";
> 		$admtext['allowdeleteinstalled'] = "Supprimer les Mods installés individuellement";
1831c1948
< 		$admtext['formodname'] = "pour le nom du mod ";
---
> 		$admtext['formodname'] = "pour le nom du Mod ";
1840c1957
< 		$admtext['stripeafter'] = "Rayure après nombre de lignes";
---
> 		$admtext['stripeafter'] = "Rayures toutes les x lignes";
1843c1960
< 		$admtext['no_frag'] = "fragment de code non autorisé ici";
---
> 		$admtext['no_frag'] = "Fragment de code non autorisé ici";
1854c1971
< 		$admtext['selectmod'] = "Sélectionner un fichier de configuration de mod pour visualiser les résultats du tableau de l'analyseur";
---
> 		$admtext['selectmod'] = "Sélectionner un Mod pour visualiser les résultats du tableau de l'analyseur.";
1857c1974
< 		$admtext['filesel'] = "Sélectionner un fichier TNG pour voir quels mods le concernent";
---
> 		$admtext['filesel'] = "Sélectionner un fichier TNG pour voir quels Mods le modifient";
1865,1867c1982,1984
< 		$admtext['reasontoupdate'] = "Si vous n'avez pas lancé le script cust_text_update.php script lors de votre mise à jour vers TNG v12, il vous faudra mettre à jour vos fichiers cust_text.php files en <ul><li>ajoutant une nouvelle ligne aux fichiers et</li><li>aussi en mettant à jour la ligne obsolète de vos fichiers cust_text.php </li></ul> qui n'avaient pas été remplacés pendant les mises-à jour de TNG.";
< 		$admtext['newanchor'] = "La nouvelle ligne de commentaire ne doit pas être traduite dans les fichiers de langue de façon à pouvoir être utilisée comme une ancre pour que les développeurs de mods puissent insérer du texte personnalisé avant cette nouvelle ligne de commentaire.";
< 		$admtext['translateissue'] = "Si vous traduisez cette nouvelle ligne de commentaire, les mods ne pourront pas s'installer.";
---
> 		$admtext['reasontoupdate'] = "Si vous n'avez pas lancé le script cust_text_update.php lors de votre mise à jour vers TNG v12, il vous faudra mettre à jour vos fichiers cust_text.php en <ul><li>ajoutant une nouvelle ligne aux fichiers et</li><li> en mettant à jour la ligne obsolète de vos fichiers cust_text.php </li></ul> qui n'avaient pas été remplacés pendant les mises à jour de TNG.";
> 		$admtext['newanchor'] = "La nouvelle ligne de commentaire ne doit pas être traduite dans les fichiers de langue de façon à pouvoir être utilisée comme une ancre pour que les développeurs de Mods puissent insérer du texte personnalisé avant cette nouvelle ligne de commentaire.";
> 		$admtext['translateissue'] = "Si vous traduisez cette nouvelle ligne de commentaire, les Mods ne pourront pas s'installer.";
1871,1872c1988,1989
< 		$admtext['confdelmod'] = "Voulez-vous vraiment supprimer  de votre système ce mod et son dossier associé ? Cette opération ne pourra pas être annulée !";
< 		$admtext['allowdeletesupport'] = "Autoriser la suppression du dossier d'aide quand le mod est supprimé";
---
> 		$admtext['confdelmod'] = "Voulez-vous vraiment supprimer ce Mod et son dossier associé de votre système ? Cette opération ne pourra pas être annulée !";
> 		$admtext['allowdeletesupport'] = "Lors de la suppression du mod, autoriser la suppression de dossier(s) créé(s) lors du dézippage du mod";
1874,1875c1991,1992
< 		$admtext['delpartinfo'] = "Vous devez mettre Oui pour cette option si vous avez oublié de désinstaller les versions précédentes du mod avant d'installer la nouvelle version.";
< 		$admtext['delinstinfo'] = "Vous devez mettre Oui pour cette option si vous avez installé une nouvelle version du mod et que l'ancienne version s'affiche encore comme installée.";
---
> 		$admtext['delpartinfo'] = "Vous devez mettre Oui pour cette option si vous avez oublié de désinstaller les versions précédentes du Mod avant d'installer la nouvelle version.";
> 		$admtext['delinstinfo'] = "Vous devez mettre Oui pour cette option si vous avez installé une nouvelle version du Mod et que l'ancienne version s'affiche encore comme installée.";
1877c1994
< 		$admtext['confdelmod1'] = "Voulez-vous vraiment supprimer ce mod de votre système ? Impossible d'annuler cette operation!";
---
> 		$admtext['confdelmod1'] = "Voulez-vous vraiment supprimer ce Mod de votre système ? Impossible d'annuler cette opération !";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Tous les Mods";
> 		$admtext['installedmods'] = "Mods installés seulement";
> 		$admtext['partinstmods'] = "Mods installés et partiellement installés";
> 		$admtext['showanalyzeractions'] = "Afficher les actions dans l'analyseur de mods";
> 		$admtext['badchar'] = "Caractère invalide";
1886d2008
< 		$admtext['test_number'] = "Numéro du test";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Nom/Numéro du test";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Garder le test confidentiel";
> 		$admtext['multivalues'] = "Utilisez des tirets entre plusieurs valeurs";
> 		$admtext['changestogroup'] = "Changements au groupe ADN";
> 		$admtext['modifydnagroup'] = "Modifier un groupe d'ADN existant";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Lier cet ADN à une personne";
1925c2056
< $admtext['individuals'] = "individuels";
---
> $admtext['individuals'] = "individus";
1965d2095
< $admtext['otherevents'] = "Autres évènements";
1977,1979c2107,2109
< $admtext['sex'] = "Sexe";
< $admtext['marriagedate'] = "Date mariage";
< $admtext['marriageplace'] = "Lieu mariage";
---
> $admtext['sex'] = "Genre";
> $admtext['marriagedate'] = "Date de mariage";
> $admtext['marriageplace'] = "Lieu de mariage";
1982c2112
< $admtext['filename'] = "Nom fichier";
---
> $admtext['filename'] = "Nom de fichier";
2042c2172
< $admtext['confdeletepers'] = "Êtes-vous certain de vouloir supprimer cette personne ?";
---
> $admtext['confdeletepers'] = "Êtes-vous certain de vouloir supprimer cette personne? Elle sera complètement effacée de votre arbre.";
2050,2051d2179
< $admtext['savereturn'] = "Retour à cette page";
< $admtext['saveback'] = "Retour au menu";
2058,2059d2185
< $admtext['secondary'] = "Processus Secondaires";
< $admtext['commas'] = "Séparer les entrées multiples avec des virgules";
2064c2190
< $admtext['findperson'] = "Chercher la  Personne...";
---
> $admtext['findperson'] = "Chercher la Personne...";
2101c2227
< $admtext['nobranch'] = "Pas de Branche";
---
> $admtext['nobranch'] = "Aucune branche";
2122c2248
< $admtext['indfamorsrc'] = "individus, familles ou sources";
---
> $admtext['indfamorsrc'] = "individus, familles, sources, archives ou lieux";
2129,2130d2254
< $admtext['secondarymaint'] = "Outils secondaires de maintenance ";
< $admtext['customeventtypes'] = "Types d'évènement";
2141c2265
< $admtext['fasterdisplay'] = "Note: Cette page est formatée autrement pour Autoriser un affichage rapide.";
---
> $admtext['fasterdisplay'] = "Note: Cette page est formatée autrement pour permettre un affichage rapide.";
2165c2289
< $admtext['findpersonid'] = "Chercher ID Personne";
---
> $admtext['findpersonid'] = "Chercher l'ID de la personne";
2182c2306
< $admtext['eventtypes'] = "Types d'évènement";
---
> $admtext['eventtypes'] = "Types d'évènements";
2217c2341
< $admtext['notdeleted'] = "Le fichier n'a pu être supprimé. Vérifier les CHMODS.";
---
> $admtext['notdeleted'] = "Le fichier n'a pu être supprimé. Vérifier les CHMODS (permissions du fichier).";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2231c2352
< $admtext['savefirst'] = "Sauvgarder les modifications ?";
---
> $admtext['savefirst'] = "Sauvegarder les modifications ?";
2233c2354
< $admtext['modmgr'] = "Gestionnaire de Mod";
---
> $admtext['modmgr'] = "Gestionnaire Mods";
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2250c2369
< $admtext['nicunderline'] = "Cliquer pour Souligner";
---
> $admtext['nicunderline'] = "Cliquer pour mettre en Souligné";
2259c2378
< $admtext['nicstrike'] = "Cliquer pour barrer";
---
> $admtext['nicstrike'] = "Cliquer pour mettre en Barré";
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Noms de famille";
> $admtext['subhead'] = "Sous-titre";
> $admtext['image'] = "Image";
> $admtext['author'] = "Auteur";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Mise en route";
> $admtext['showlog'] = "Journal";
> $admtext['nobirthinfo'] = "Aucune info de naissance";
> //changed in 13.0
> $admtext['savereturn'] = "Enregistrer et rester sur la page";
> $admtext['saveback'] = "Enregistrer et quitter la page";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Tous les éléments ont bien été supprimés.";
> $admtext['private'] = "Privé";
> $admtext['imgtags'] = "Étiquettes d'images";
> 
> $admtext['removelink'] = "Supprimer le lien";
> $admtext['eloptions'] = "Explorer ou supprimer";
> $admtext['pleaseenter'] = "Veuillez saisir un ";
> 
> $admtext['nolinks'] = "Aucune association n'a encore été créée";
> $admtext['nogeocode'] = "N'a pu être géocodé";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Sélectionner la photo par<br/>défaut<br/>"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Types d'événement/attribut";
> $admtext['secondary'] = "Outils post-importation";
> $admtext['otherevents'] = "Autres événements/attributs";
> //added in 14.0
> $admtext['newlinks'] = "Nouveaux liens";
> $admtext['newcemlinks'] = "Nouveaux liens de cimetière";
> $admtext['utility'] = "Outil";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Déplacer";
> $admtext['copy'] = "Copier";
> $admtext['title2'] = "Titre";  //from getperson
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/French/alltext.php TNG1403/languages/French/alltext.php
6,7c6,7
< $dates['FEB'] = "fév";
< $dates['FEBRUARY'] = "février";
---
> $dates['FEB'] = "fév";
> $dates['FEBRUARY'] = "février";
17,18c17,18
< $dates['AUG'] = "août";
< $dates['AUGUST'] = "août";
---
> $dates['AUG'] = "août";
> $dates['AUGUST'] = "août";
25,26c25,26
< $dates['DEC'] = "déc";
< $dates['DECEMBER'] = "décembre";
---
> $dates['DEC'] = "déc";
> $dates['DECEMBER'] = "décembre";
31,32c31,32
< $dates['AFT'] = "après";
< $dates['AFTER'] = "après";
---
> $dates['AFT'] = "après";
> $dates['AFTER'] = "après";
36,37c36,37
< $dates['FROM'] = "depuis";
< $dates['TO'] = "à";
---
> $dates['FROM'] = "du";
> $dates['TO'] = "to";
39,40c39,40
< $dates['CAL'] = "Calculé";
< $dates['EST'] = "Estimé";
---
> $dates['CAL'] = "Calculé";
> $dates['EST'] = "Estimé";
43,44c43,44
< $text['cannotexecutequery'] = "Ne peut exécuter la requête";
< $text['to'] = "à";
---
> $text['cannotexecutequery'] = "Ne peut exécuter la requête";
> $text['to'] = "à";
47c47
< $text['text_prev'] = "Précédent";
---
> $text['text_prev'] = "Précédent";
50,51c50,51
< $text['forgot1'] = "<strong>Avez-vous oublié votre nom utilisateur ou votre mot de passe ?</strong><br />Saisir votre courriel ci-dessous afin que votre nom utilisateur vous soit envoyé.";
< $text['forgot2'] = "Saisir votre courriel ci-dessus et votre nom utilisateur ci-dessous pour désactiver votre mot de passe. Un autre mot de passe temporaire vous sera envoyé par courriel.";
---
> $text['forgot1'] = "<strong>Avez-vous oublié votre nom utilisateur ou votre mot de passe ?</strong><br />Saisir votre courriel ci-dessous afin que votre nom utilisateur vous soit envoyé.";
> $text['forgot2'] = "Saisir votre courriel ci-dessus et votre nom utilisateur ci-dessous pour désactiver votre mot de passe. Un autre mot de passe temporaire vous sera envoyé par courriel.";
53,56c53,56
< $text['usersent'] = "Votre pseudonyme vous a été envoyé dans un courriel.";
< $text['pwdsent'] = "Votre mot de passe temporaire vous a été envoyé dans un courriel.";
< $text['loginnotsent2'] = "L'adresse de courriel que vous aver fournie ne correspond à aucun compte enregistré. Aucune information n'a été envoyée.";
< $text['loginnotsent3'] = "L'adresse de courriel et le pseudonyme que vous aver fournis ne correspondent à aucun compte enregistré. Aucune information n'a été envoyée.";
---
> $text['usersent'] = "Votre pseudonyme vous a été envoyé dans un courriel.";
> $text['pwdsent'] = "Votre mot de passe temporaire vous a été envoyé dans un courriel.";
> $text['loginnotsent2'] = "L'adresse de courriel que vous avez fournie ne correspond à aucun compte enregistré. Aucune information n'a été envoyée.";
> $text['loginnotsent3'] = "L'adresse de courriel et le pseudonyme que vous avez fournis ne correspondent à aucun compte enregistré. Aucune information n'a été envoyée.";
58,59c58,59
< $text['collapseall'] = "Tout réduire";
< $text['expandall'] = "Tout développer,";
---
> $text['collapseall'] = "Tout réduire";
> $text['expandall'] = "Tout développer,";
74,75c74,75
< $admtext['level4'] = "Comté/Département";
< $admtext['level5'] = "État/Province/Région";
---
> $admtext['level4'] = "Comté/Département";
> $admtext['level5'] = "État/Province/Région";
77c77
< $admtext['level0'] = "Non spécifié";
---
> $admtext['level0'] = "Non spécifié";
79,81c79,81
< $text['male'] = "M";
< $text['female'] = "F";
< $text['closewindow'] = "Fermer cette fenêtre";
---
> $text['male'] = "Masculin";
> $text['female'] = "Féminin";
> $text['closewindow'] = "Fermer cette fenêtre";
86c86
< $text['mainton'] = "Le mode de maintenance est activé";
---
> $text['mainton'] = "Le mode de maintenance est activé";
88d87
< //moved here in 8.0.0
93c92
< $admtext['confremchild'] = "Faut-il vraiment retirer cet enfant dans cette famille ? La fiche de l'enfant ne sera pas effacée pour autant du fichier.";
---
> $admtext['confremchild'] = "Faut-il vraiment retirer cet enfant dans cette famille ? La fiche de l'enfant ne sera pas effacée pour autant du fichier.";
98,101c97,100
< $admtext['DEAT'] = "Décès";
< $admtext['CHR'] = "Baptême";
< $admtext['BURI'] = "Sépulture";
< $admtext['BAPL'] = "Baptême (SDJ)";
---
> $admtext['DEAT'] = "Décès";
> $admtext['CHR'] = "Baptême";
> $admtext['BURI'] = "Sépulture";
> $admtext['BAPL'] = "Baptême (SDJ)";
107c106
< $admtext['SLGC'] = "Scellé aux Parents (SDJ)";
---
> $admtext['SLGC'] = "Scellé aux Parents (SDJ)";
109c108
< $admtext['SLGS'] = "Scellé au conjoint(e) (SDJ)";
---
> $admtext['SLGS'] = "Scellé au conjoint(e) (SDJ)";
111,115c110,112
< $admtext['activated'] = "Votre compte généalogiste a été activé";
< $admtext['infois'] = "Vos données de connexion sont:";
< $admtext['subjectline'] = "Votre compte généalogiste a été activé.";
< 
< //moved here in 8.1.0
---
> $admtext['activated'] = "Votre compte généalogiste a été activé";
> $admtext['infois'] = "Vos données de connexion sont:";
> $admtext['subjectline'] = "Votre compte généalogiste a été activé.";
117c114
< $admtext['birth'] = "géniteur / génitrice";
---
> $admtext['birth'] = "géniteur / génitrice";
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
128c121
< $text['legal'] = "Légal"; //as in page size
---
> $text['legal'] = "Légal"; //as in page size
139d131
< //moved here in 9.0.4
141,143c133
< 
< //moved here in 10.0.0
< $text['startingind'] = "Individu de départ";
---
> $text['startingind'] = "Individu de départ";
148,149d137
< 
< //added in 10.0.0
152c140
< $admtext['step'] = "de famille reconstituée";
---
> $admtext['step'] = "de famille reconstituée";
155,156d142
< 
< //added in 11.0.0
158,160c144,145
< $admtext['preflang'] = "Langue préférée";
< $text['problem'] = "Une erreur est survenue dans le logiciel TNG. Cela pourrait être dû à un problème de paramétrage, une mise à jour incomplète ou un bogue du programme. Si vous êtes le propriétaire du site, vous pouver contacter le support TNG pour avoir de l'aide avec ce problème. Merci de copier la requête ci-dessous et de la coller dans votre message.";
< $text['query'] = "Requête";
---
> $admtext['preflang'] = "Langue préférée";
> $text['query'] = "Requête";
163d147
< //moved here in 12.0.0
168,171c152,155
< $admtext['select'] = "Sélectionner";
< $admtext['selectall'] = "Tout sélectionner";
< $admtext['clearall'] = "Tout supprimer";
< $admtext['medialinks'] = "liens des médias";
---
> $admtext['select'] = "Sélectionner";
> $admtext['selectall'] = "Tout sélectionner";
> $admtext['clearall'] = "Tout désélectionner";
> $admtext['medialinks'] = "liens des médias";
173d156
< //added here in 12.0.0
175,179c158,161
< $text['test_number'] = "Nom/Numéro du test";
< $text['test_info_display'] = "Information de test à afficher";
< $text['confirmed'] = "Confirmé";
< $text['predicted'] = "Estimé";
< $admtext['ancestral_surnames'] = "Noms de famille des ancêtres";
---
> $text['test_info_display'] = "Information de test à afficher";
> $text['confirmed'] = "Confirmé";
> $text['predicted'] = "Estimé";
> $admtext['ancestral_surnames'] = "Noms de famille des ancêtres";
181,182c163,164
< $admtext['mda'] = "Ancêtre le plus lointain";
< $admtext['mrca'] = "Ancêtre commun le plus récent";
---
> $admtext['mda'] = "Ancêtre le plus lointain";
> $admtext['mrca'] = "Ancêtre commun le plus récent";
184c166
< $admtext['ref_seq'] = "Séquence de référence";
---
> $admtext['ref_seq'] = "Séquence de référence";
186,190c168,172
< $admtext['rcrs'] = "rCRS (Séquence de Référence de Cambridge révisée)";
< $admtext['hvr_values'] = "Différences HVR";
< $admtext['hvr1_values'] = "Différences HVR1";
< $admtext['hvr2_values'] = "Différences HVR2";
< $admtext['coding_reg'] = "Différences entre les régions de codage";
---
> $admtext['rcrs'] = "rCRS (Séquence de Référence de Cambridge révisée)";
> $admtext['hvr_values'] = "Différences HVR";
> $admtext['hvr1_values'] = "Différences HVR1";
> $admtext['hvr2_values'] = "Différences HVR2";
> $admtext['coding_reg'] = "Différences entre les régions de codage";
192c174
< $text['test_results'] = "Résultats de test";
---
> $text['test_results'] = "Résultats de test";
202a185,252
> $admtext['xtra_mut'] = "Mutations supplémentaires";
> $text['test_number'] = "Nom/Numéro";
> $admtext['match_date'] = "Date des résultats";
> $admtext['gedmatchID'] = "ID GEDmatch";
> $admtext['ydna_haplogroup'] = "Y-ADN Haplogroupe";
> $admtext['mtdna_haplogroup'] = "ADNmt Haplogroupe";
> $admtext['relationship_section'] = "Section de la parenté";
> $admtext['relationship_range'] = "Lien de parenté possible";
> $admtext['suggested_relationship'] = "Suggéré";
> $admtext['actual_relationship'] = "Lien de parenté réel";
> $admtext['related_side'] = "Branche apparentée";
> $admtext['shared_dna'] = "ADN partagé";
> $admtext['shared centimorgans'] = "Total des cMs partagés";
> $admtext['shared_segments'] = "Segments partagés";
> $admtext['largest_segment'] = "Le plus grand segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Début du segment";
> $admtext['segment_end'] = "Fin du segment";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "SNPs correspondants";
> $admtext['xmatch'] = "Correspondance X";
> $text['keep_test_private'] = "Test confidentiel";
> $text['shared_dna'] = "Segment d'ADN partagé";
> $text['for_match'] = "pour ce résultat";
> $admtext['keeptest'] = "Confidentialité<br />du test";
> $admtext['keepname'] = "Protection<br />du nom";
> $admtext['allgroups'] = "Tous les groupes";
> $admtext['alltypes'] = "Tous les types";
> $admtext['generation_num'] = "Générations pour les noms de famille ancestraux";
> 
> $text['birthabbr'] = "n.";
> $text['chrabbr'] = "b.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "ent.";  //from descend
> $text['marrabbr'] = "mar.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Première page";
> $text['lastpage'] = "Dernière page";
> 
> //changed in 13.0.0
> $text['problem'] = "Une erreur est intervenue dans le logiciel TNG. Ce que vous devez faire :<p>Si vous venez d'installer une mise à jour, vous avez peut-être sauté une partie des instructions d'installation. Retournez à la page du Lisez-moi pour relire les instructions. Prêtez une attention particulière à l'étape de la structure de la base de données.</p><p>Si vous venez de faire une première installation de TNG, il est peut-être encore nécessaire de créer les tables de la base de données. Revenez à la page du lisez-moi pour retrouver cette étape.</p><p>Si vous êtes le propriétaire du site, vous pouvez contacter le service assistance de TNG pour obtenir une aide supplémentaire sur ce problème. Merci de copier la requête ci-après et collez-la dans votre message.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Aucune branche";
> 
> //added in 14.0
> $text['oneyear'] = "an";
> $text['pwdcodelink'] = "Cliquer sur ce lien pour recevoir un mot de passe provisoire";
> $text['pwdcodesent'] = "Un lien de réinitialisation du mot de passe a été envoyé à votre adresse de courriel.";
> $text['moved'] = "Déplacé";
> $text['citation'] = "Citation";
> $text['other'] = "Autre";
> $text['death'] = "Décès";
> $text['burial'] = "Inhumation";
> $text['cremation'] = "Crémation";
> $text['marriage'] = "Mariage";
> $text['divorce'] = "Divorce";
> $text['bylength'] = "Longueur";
> $text['bymarriages'] = "Mariages";
> $text['none'] = "Aucun";
> 
> //moved here in 14.0
> $text['family'] = "Famille";
> $text['source'] = "Source";
> $text['repository'] = "Archives";
> $text['place'] = "Lieu";
> $admtext['BAPM'] = "Baptême";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Mutations supplémentaires";
---
> $text['glang'] = "fr";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/French/cust_text.php TNG1403/languages/French/cust_text.php
5,6d4
< //Insérez votre propre message personnalisé ici, comme suit:
< //$text[messagename] = "Ceci est un message";
diff -r TNG/languages/French/index_help.php TNG1403/languages/French/index_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
65,68c65,68
< 			<li><p>Forum des utilisateurs : <a href="http://tngforum.us" target="_blank">http://tngforum.us</a>.</p></li>
< 			<li><p>Référence PHP : <a href="http://www.php.net" target="_blank">http://www.php.net</a>.</p></li>
< 			<li><p>RéférenceMySQL : <a href="http://www.mysql.com" target="_blank">http://www.mysql.com</a>.</p></li>
< 			<li><p>Référence HTML: <a href="http://www.htmlhelp.com" target="_blank">http://www.htmlhelp.com</a>.</p></li>
---
> 			<li><p>Forum des utilisateurs : <a href="https://tng.community" target="_blank">https://tng.community</a>.</p></li>
> 			<li><p>Référence PHP : <a href="https://php.net" target="_blank">https://php.net</a>.</p></li>
> 			<li><p>RéférenceMySQL : <a href="https://mysql.com" target="_blank">https://mysql.com</a>.</p></li>
> 			<li><p>Référence HTML: <a href="https://htmlhelp.com" target="_blank">https://htmlhelp.com</a>.</p></li>
diff -r TNG/languages/French/text.php TNG1403/languages/French/text.php
13,14c13,14
< 		$text['repoid'] = "ID du Lieu de dépôt";
< 		$text['browseallrepos'] = "Rehercher les lieux de dépôt";
---
> 		$text['repoid'] = "ID du lieu des Archives";
> 		$text['browseallrepos'] = "Rechercher les lieux des Archives";
32c32
< 		$text['buildged'] = "Contruire GEDCOM";
---
> 		$text['buildged'] = "Construire GEDCOM";
60c60
< 		$text['age'] = "âge";
---
> 		$text['age'] = "Âgé de";
69d68
< 		$text['general'] = "Généralités";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Sélectionner deux individus.";
---
> 		$text['select2inds'] = "Merci de choisir deux personnes.";
90c90
< 		$text['sameperson'] = "Les deux individus sont identiques";
---
> 		$text['sameperson'] = "Ces deux individus sont la même personne.";
93c93
< 		$text['sometimes'] = "(Parfois le fait de vérifier un autre nombre de générations donne un résultat différent)";
---
> 		$text['sometimes'] = "(Parfois, la vérification d'un nombre différent de générations donne un résultat différent..)";
126c126
< 		$text['gencheck'] = "Générations max <br />à investiguer";
---
> 		$text['gencheck'] = "Générations max à explorer";
144c144
< 		$text['dospouses2'] = "voir les épouses";
---
> 		$text['dospouses2'] = "Afficher les conjoints";
147c147
< 		$text['fmil'] = "le beau-père ou bell- mère de";
---
> 		$text['fmil'] = "le beau-père ou belle-mère de";
161c161
< 		$text['ggdau'] = "la xxx petite-fille";
---
> 		$text['ggdau'] = "la xxx petite-fille de";
164c164
< 		$text['gstepgdau'] = "la xxx petite-fille";
---
> 		$text['gstepgdau'] = "la xxx petite-fille de";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Rechercher des connexions";
> 		$text['findrel2'] = "Trouver des liens de parenté et d'autres connexions";
> 		$text['makeme2nd'] = "Utiliser mon identifiant (ID)";
> 		$text['usebookmarks'] = "Utiliser des marque-pages";
> 		$text['select2inds'] = "Merci de choisir deux personnes.";
> 		$text['indinfofor'] = "Informations individuelles pour";
> 		$text['nobookmarks'] = "Il n'y a aucun marque-page à utiliser";
> 		$text['bkmtitle'] = "Personnes trouvées dans les marque-pages";
> 		$text['bkminfo'] = "Choisir une personne:";
> 		$text['sortpathsby'] = "Trier les chemins par";
> 		$text['sortbyshort'] = "Trier par";
> 		$text['bylengthshort'] = "Longueur";
> 		$text['badID1'] = ": mauvais identifiant de la personne n°1 - revenir en arrière et recommencer";
> 		$text['badID2'] = ": mauvais identifiant de la personne n°2 - revenir en arrière et recommencer";
> 		$text['notintree'] = ": la personne avec cet identifiant n'est pas dans la base de l'arbre actuel.";
> 		$text['sameperson'] = "Ces deux individus sont la même personne.";;
> 		$text['nopaths'] = "Ces personnes ne sont pas liées.";
> 		$text['nopaths1'] = "Pas d'autre chemin plus court que xxx étapes";
> 		$text['nopaths2'] = "sur xxx testées";
> 		$text['longestpath'] = "(Le plus long chemin testé avait une longueur de xxx étapes.)";
> 		$text['relevantpaths'] = "Nombre de chemins trouvés: xxx";
> 		$text['skipMarr'] = "(en outre, le nombre de chemins trouvés mais non affichés en raison d'un trop grand nombre de mariages était de: xxx)";
> 		$text['mjaor'] = "ou";
> 		$text['connectionsto'] = "Connexions avec";
> 		$text['findanotherpers'] = "Trouver une autre personne...";
> 		$text['sometimes'] = "(Parfois, la vérification d'un nombre différent de générations donne un résultat différent..)";
> 		$text['anotherpath'] = "Rechercher d'autres connexions";
> 		$text['xpath'] = "Chemin ";
> 		$text['primary'] = "Personne de départ"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Personne finale";
> 		$text['parent'] = "Parent";
> 		$text['mhfather'] = "son père";
> 		$text['mhmother'] = "sa mère";
> 		$text['mhhusband'] = "son mari";
> 		$text['mhwife'] = "sa femme";
> 		$text['mhson'] = "son fils";
> 		$text['mhdaughter'] = "sa fille";
> 		$text['fhfather'] = "son père";
> 		$text['fhmother'] = "sa mère";
> 		$text['fhhusband'] = "son mari";
> 		$text['fhwife'] = "sa femme";
> 		$text['fhson'] = "son fils";
> 		$text['fhdaughter'] = "sa fille";
> 		$text['hfather'] = "père";
> 		$text['hmother'] = "mère";
> 		$text['hhusband'] = "mari";
> 		$text['hwife'] = "femme";
> 		$text['hson'] = "fils";
> 		$text['hdaughter'] = "fille";
> 		$text['maxruns'] = "Nombre maximum de chemins à vérifier";
> 		$text['maxrshort'] = "Nb Max chemins";
> 		$text['maxlength'] = "Longueur de chemin maximale";
> 		$text['maxlshort'] = "Long. Max de chemin";
> 		$text['xstep'] = "étape";
> 		$text['xsteps'] = "étapes";
> 		$text['xmarriages'] = "xxx mariages";
> 		$text['xmarriage'] = "1 mariage";
> 		$text['showspouses'] = "Afficher les deux conjoints";
> 		$text['showTxt'] = "Afficher l'énoncé textuel du chemin";
> 		$text['showTxtshort'] = "Descr. texte";
> 		$text['compactBox'] = "Afficher les boîtes de personnes sous forme compacte";
> 		$text['compactBoxshort'] = "Compact";
> 		$text['paths'] = "Chemins";
> 		$text['dospouses2'] = "Afficher les conjoints";
> 		$text['maxmopt'] = "Max mariages par connexion";
> 		$text['maxm'] = "Max mariages";
> 		$text['arerelated'] = "Ces personnes sont parentes. Leur relation est montrée dans le Chemin 1";
> 		$text['simplerel'] = "Recherche de liens de parenté";
196d264
< 		$text['scrollnote'] = "Note : Utiliser les barres de défilement pour voir tout l'arbre.";
199d266
< 		$text['popupnote2'] = " = Nouvel arbre";
238,240c305,307
< 		$text['borchr'] = "Naissance/Alt - Mort/Enterrement (deux)";
< 		$text['nobd'] = "Aucune date de naissance ou de mort";
< 		$text['bcdb'] = "Naissance/Alt/Mort/Enterrement (quatre)";
---
> 		$text['borchr'] = "Naissance/Baptême – Décès/Sépultures (deux)";
> 		$text['nobd'] = "Aucune date de naissance ou de décès";
> 		$text['bcdb'] = "Naissance/Baptême/Décès/Sépulture (quatre)";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tableaux";
> 		$text['dtchildren'] = "Enfants";
> 		$text['dtgrandchildren'] = "Petits-enfants";
> 		$text['dtggrandchildren'] = "Arrière-petits-enfants";
> 		$text['dtgggrandchildren'] = "Arrière-petits-enfants"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Aucun descendant";
> 		$text['dtgen'] = "Gén.";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Choisir";
> 		$text['dteachfulltable'] = "Chaque tableau complet aura";
> 		$text['dtrows'] = "rangées";
> 		$text['dtdisplayingtable'] = "Afficher le tableau";
> 		$text['dtgototable'] = "Aller au tableau :";
> 		$text['fcinstrdn'] = "Afficher la famille avec le conjoint";
> 		$text['fcinstrup'] = "Afficher la famille avec les parents";
> 		$text['fcinstrplus'] = "Choisir un autre conjoint";
> 		$text['fcinstrfam'] = "Choisir d'autres parents";
330,331c416,417
< 		$text['spousesurname'] = "Nom de famille de l'épouse";
< 		$text['spousemore'] = "Si vous entrez une valeur pour le nom de famille de l'épouse, vous devez sélectionner un sexe";
---
> 		$text['spousesurname'] = "Nom de famille du conjoint";
> 		$text['spousemore'] = "Si vous entrez une valeur pour le nom de famille du conjoint, vous devez sélectionner un sexe";
351c437
< 		$text['nodayevents'] = "événments de ce mois non associés à un jour spécifique";
---
> 		$text['nodayevents'] = "événements de ce mois non associés à un jour spécifique";
381,383c467
< 		$text['firstpage'] = "Première page";
< 		$text['lastpage'] = "Dernière page";
< 		$text['photoowner'] = "Source ou propriétaire";
---
> 		$text['photoowner'] = "Propriétaire de l'original";
405c489
< 		$text['photosize'] = "Taille";
---
> 		$text['photosize'] = "Dimensions";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Montrer/Cacher les étiquettes";
489c575
< 		$text['wifename'] = "Le nom de l'épouse";
---
> 		$text['wifename'] = "Nom de l'épouse";
502c588
< 		$text['noliving'] = "L'individu suivant est enregistré comme étant en vie ou marqué privé et n'est pas affiché parce que vous n'êtes pas connecté avec les autorisations nécessaires";
---
> 		$text['noliving'] = "L'individu suivant est enregistré comme étant en vie ou marqué privé et n'est pas affiché parce que vous n’avez pas les autorisations nécessaires";
548,549c634
< 		$text['noregs'] = "Désolés, mais nous n'acceptons pas de nouveaux enregistrements d'utilisateurs pour le moment. Merci de <a href=\"suggest.php\">nous contacter</a> directement si vous avez des commentaires ou des questions concernant n'importe quoi sur ce site Web.";
< 		//changed in 8.0.0
---
> 		$text['noregs'] = "Nous sommes désolés, mais nous n'acceptons pas de nouveaux enregistrements d'utilisateurs pour le moment. Merci de <a href=\"suggest.php\">nous contacter</a> directement si vous avez commentaires ou questions concernant ce site.";
551c636
< 		$text['accactive'] = "Le compte à été activé, mais l'utilisateur n'a pas de droit spécifique tant que vous ne les avez pas spécifiés..";
---
> 		$text['accactive'] = "Le compte a été activé, mais l'utilisateur n'a pas de droit spécifique tant que vous ne les avez pas spécifiés...";
556d640
< 		//added in 8.0.0
558c642
< 		$text['ackmessage'] = "Votre demande d'un compte d'utilisateur à bien été reçue. Votre compte restera inactif en attendant une vérification par l'administrateur. Nous vous contacterons par courriel dès que votre compte sera activé.";
---
> 		$text['ackmessage'] = "Votre demande d'un compte d'utilisateur a bien été reçue. Votre compte restera inactif en attendant une vérification par l'administrateur. Nous vous contacterons par courriel dès que votre compte sera activé.";
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Répéter le nouveau mot de passe";
> 		$text['resetsuccess'] = "Succès : le mot de passe a été réinitialisé";
> 		$text['resetfail'] = "Échec : le mot de passe n'a pas été réinitialisé";
> 		$text['failreason0'] = " (erreur inconnue de base de données)";
> 		$text['failreason2'] = " (vous n'avez pas l'autorisation de changer votre mot de passe)";
> 		$text['failreason3'] = " (les mots de passe ne correspondent pas)";
586c677
< 		$text['age'] = "âge";
---
> 		$text['age'] = "Âgé de";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total des citations de source";
618d710
< 		$text['loginfirst'] = "Vous devez d'abord ouvrir une session.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Des enregistrements d'utilisateur existants ont été détectés. Pour continuer, vous devez d'abord vous connecter ou supprimer tous les enregistrements dans la table des utilisateurs.";
629,630d722
< 		$text['zoomin'] = "Augmenter le Zoom";
< 		$text['zoomout'] = "Diminuer le Zoom";
656d747
< 		$text['dna_info_head'] = "Info test ADN";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Comparer les tests d'ADNmt sélectionnés";
> 		$text['dnatestscompare_atdna'] = "Comparer les tests d'ADNat sélectionnés";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "ADN-Y";
> 		$text['mt_haplogroup'] = "ADNmt";
> 		$text['sequence'] = "Réf";
> 		$text['extra_mutations'] = "Mutations additionnelles";
> 		$text['mrca'] = "Ancêtre RPC";
> 		$text['ydna_test'] = "Tests ADN-Y ";
> 		$text['mtdna_test'] = "Tests ADNmt (Mitochondrial)";
> 		$text['atdna_test'] = "Tests ADNat (autosomal)";
> 		$text['segment_start'] = "Début";
> 		$text['segment_end'] = "Fin";
> 		$text['suggested_relationship'] = "Suggéré";
> 		$text['actual_relationship'] = "Réel";
> 		$text['12markers'] = "Marqueurs 1-12";
> 		$text['25markers'] = "Marqueurs 13-25";
> 		$text['37markers'] = "Marqueurs 26-37";
> 		$text['67markers'] = "Marqueurs 38-67";
> 		$text['111markers'] = "Marqueurs 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Au moins deux tests doivent être sélectionnés pour être comparés";
670,671d785
< $text['birthabbr'] = "n.";
< $text['chrabbr'] = "b.";
675d788
< $text['family'] = "Famille"; //from getperson
684,685c797
< $text['nickname'] = "Surnom";  //from getperson
< $text['deathabbr'] = "d.";  //from descend
---
> $text['nickname'] = "Autre nom";  //from getperson
706d817
< $text['burialabbr'] = "ent.";  //from descend
712d822
< $text['place'] = "Lieu";
715d824
< $text['marrabbr'] = "mar.";
727c836
< $text['homepage'] = "Page d'accueil";
---
> $text['homepage'] = "Accueil";
738,739c847
< $text['source'] = "Source";
< $text['surnamelist'] = "Liste des noms de famille";
---
> $text['surnamelist'] = "Noms de famille";
766d873
< $text['repository'] = "Dépôt";
770d876
< $text['findplaces'] = "Trouver tous les individus avec un évènement dans ce lieu";
780c886
< $text['repoinfo'] = "Infos lieu de dépôt";
---
> $text['repoinfo'] = "Infos lieu des Archives";
784c890
< $text['repositories'] = "Dépôts";
---
> $text['repositories'] = "Archives";
791c897
< $text['gender'] = "Sexe";
---
> $text['gender'] = "Genre";
804d909
< $text['glang'] = "&hl=fr";
816d920
< $text['none'] = "Aucun";
838c942
< $text['pwrdby'] = "Ce site est propulsé par le logiciel";
---
> $text['pwrdby'] = "Ce site fonctionne grace au logiciel";
851c955
< $text['mnuheader'] = "Page d'accueil";
---
> $text['mnuheader'] = "Accueil";
884c988
< $text['wasborn'] = "Né-e le ";
---
> $text['wasborn'] = "est né-e ";
895,896c999,1000
< $text['wasmarried'] = "Mariage";
< $text['anddied'] = "Décès";
---
> $text['wasmarried'] = "a épousé ";
> $text['anddied'] = "est mort-e ";
906c1010
< $text['wasburied'] = "a été enterré";
---
> $text['wasburied'] = "a été enterré-e ";
918c1022
< $text['waschristened'] = "Baptême";
---
> $text['waschristened'] = "a été baptisé-e ";
922,924c1026,1027
< $text['moredetail'] = "Plus détail";
< $text['lessdetail'] = "Moins détail";
< $text['otherevents'] = "Autres événements";
---
> $text['moredetail'] = "Plus de détails";
> $text['lessdetail'] = "Moins de détails";
936c1039
< $text['heatmap'] = "Carte de chaleur";
---
> $text['heatmap'] = "Carte de densité";
947c1050
< $text['takenby'] = "Pris par";
---
> $text['takenby'] = "Réalisé par";
952,953d1054
< $text['people_have'] = "personnes ont associé un test ADN à";
< $text['person_has'] = "personne a associé un test ADN à";
957,958c1058,1059
< $text['dataprotect'] = "Politique de protection des données";
< $text['viewpolicy'] = "Afficher la politique";
---
> $text['dataprotect'] = "Charte de protection des données";
> $text['viewpolicy'] = "Afficher la charte";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "tests ADN sont associé à";
> $text['testislinked'] = "test ADN est associé à";
> 
> //added in 12.2
> $text['quicklinks'] = "Liens rapides";
> $text['yourname'] = "Votre nom";
> $text['youremail'] = "Votre adresse email";
> $text['liketoadd'] = "Toutes les informations que vous souhaitez ajouter";
> $text['webmastermsg'] = "Message du webmaster";
> $text['gallery'] = "Voir la galerie";
> $text['wasborn_male'] = "est né";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "est née"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "a été baptisé";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "a été baptisée";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "est mort";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "est morte";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "a été enterré"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "a été enterrée"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "a été incinéré";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "a été incinérée";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "a épousé";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "a épousé";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "est divorcé";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "est divorcée";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " à ";			// used as a preposition to the location
> $text['onthisdate'] = " le ";		// when used with full date
> $text['inthisyear'] = " en ";		// when used with year only or month / year dates
> $text['and'] = "et ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Info test ADN";
> //added in 13.0
> $text['visitor'] = "Visiteur";
> 
> $text['popupnote2'] = " = Nouvel arbre";
> 
> //moved here in 14.0
> $text['zoomin'] = "Augmenter le Zoom";
> $text['zoomout'] = "Diminuer le Zoom";
> $text['scrollnote'] = "Étirer ou faire défiler pour voir plus de détails sur le tableau.";
> $text['general'] = "Généralités";
> 
> //changed in 14.0
> $text['otherevents'] = "Autres événements/attributs";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connexions";
> $text['continue'] = "Continuer";
> $text['title2'] = "Titre";  //from getperson
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
Only in TNG1403/languages: FrenchQC-UTF8
diff -r TNG/languages/French-UTF8/admintext.php TNG1403/languages/French-UTF8/admintext.php
5c5
< 		$admtext['branchlabel'] = "Nom de Branche ";
---
> 		$admtext['branchlabel'] = "Nom de branche ";
7,8c7,8
< 		$admtext['newbranch'] = "Nouvelle Branche";
< 		$admtext['numgenerations'] = "Nombre de Générations";
---
> 		$admtext['newbranch'] = "Nouvelle branche";
> 		$admtext['numgenerations'] = "Nombre de générations";
20c20
< 		$admtext['enterbranch'] = "Sélectionner une branche existante ou créer une nouvelle .";
---
> 		$admtext['enterbranch'] = "Sélectionner une branche existante ou en créer une nouvelle.";
68c68
< 		$admtext['requiredmap'] = "Requis. Ceci doit correspondre au nom et et à l'emplacement de votre fichier <em>dans le dossier photostombes</em> une fois le fichier chargé. Exemple : si votre dossier tombes s'appelle <em>tombes</em>,	et que votre fichier doit s'appeler <em>plan.jpg</em> et aller dans un sous-dossier nommé <em>mesplans</em>, vous devrez saisir <em>mesplans/plan.jpg</em> dans ce champ.";
---
> 		$admtext['requiredmap'] = "Requis. Ceci doit correspondre au nom et et à l'emplacement de votre fichier <em>dans le dossier tombes</em> une fois le fichier chargé. Exemple : si votre dossier tombes s'appelle <em>tombes</em>, et que votre fichier doit s'appeler <em>plan.jpg</em> et aller dans un sous-dossier nommé <em>mesplans</em>, vous devrez saisir <em>mesplans/plan.jpg</em> dans ce champ.";
80d79
< 		$admtext['pleaseenter'] = "Veuillez saisir un ";
101c100
< 		$admtext['addnewevent'] = "Ajouter un nouvel événement";
---
> 		$admtext['addnewevent'] = "Ajouter un nouvel Événement";
126c125
< 		$admtext['invfperms'] = "Le dossier 'gedcom' peut avoir des permissions insuffisantes (essai 755 ou 777).";
---
> 		$admtext['invfperms'] = "Le dossier 'gedcom' peut avoir des permissions insuffisantes (essayez CHMOD 755 ou 777).";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Choisir un fichier à importer.";
> 		$admtext['addreplacedata'] = "Complète ou remplace vos données généalogiques (peut prendre plusieurs minutes, en fonction de la taille de votre fichier)";
> 		$admtext['fromyourcomputer'] = "Depuis votre ordinateur ";
> 		$admtext['importdata'] = "Importer les données";
> 		$admtext['replace'] = "Remplacer (dans arbre sélectionné)";
> 		$admtext['desttree'] = "Arbre cible";
> 		$admtext['selectdesttree'] = "Veuillez choisir ou saisir une arbre cible.";
> 		$admtext['selectexisting'] = "Importer dans";
> 		$admtext['ucaselast'] = "Mettre les noms de famille en majuscules";
> 		$admtext['norecalc'] = "Ne pas recalculer les indicateurs 'En vie'";
> 		$admtext['autooffset'] = "Faire débuter les IDs au premier nombre disponible";
> 		$admtext['mustselecttree'] = "Vous devez sélectionner un arbre avant d'utiliser cette option.";
> 		$admtext['onwebserver'] = "Sur le serveur web (dans le dossier GEDCOM)";
> 		$admtext['imphints'] = "Notes: \"Toutes les données\" signifie tous les individus, familles, sources et notes (les associations à des fichiers média ne sont pas perdues tant que les IDs demeurent inchangés). Les correspondances sont toujours basées sur les IDs seulement. Les nouveaux enregistrements sont toujours ajoutés. \"Ajouter...\" importe tous les enregistrements qui ont un nouvel ID.";
> 		$admtext['destbranch'] = "Branche de destination (facultatif)";
> 		$admtext['importlatlong'] = "Importez les données de latitude/longitude si elles existent";
> 		$admtext['opening'] = "Ouverture";
> 		$admtext['reopen'] = "Réouverture";
> 		$admtext['uploading'] = "Téléchargement";
> 		$admtext['stop'] = "Arrêt";
> 		$admtext['stopped'] = "L'importation s'est arrêtée";
> 		$admtext['resume'] = "cliquer ici pour recommencer";
> 		$admtext['neweronly'] = "Remplacer uniquement si plus récent";
> 		$admtext['oldimport'] = "Importer par l'ancienne méthode (pas de barre de progression)";
> 		$admtext['importgedcom'] = "Importer un GEDCOM (format standard 5.5, peut être zippé)";
> 		$admtext['stopbackup'] = "Stop! Ce serait une bonne idée d'enregistrer les données en cours avant de continuer.";
> 		$admtext['importmedia'] = "Importer des médias s'ils existent";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Assurez-vous que les préfixes et les suffixes sont corrects pour ce fichier. (Voir dans Configuration générale) ";
> 		$admtext['chkimpsettings'] = "Consulter la Configuration d'importation pour plus d'options.";
> 		$admtext['eventsonly'] = "Importer uniquement les types d'événements/attributs personnalisés (aucune donnée n'est ajoutée, remplacée ou modifiée)";
> 		$admtext['allevents'] = "Accepter les données pour tous les nouveaux types d'événements/attributs";
> 		$admtext['finishingimporting'] = "Presque terminé...";
> 		$admtext['fileuploadfailed'] = " Le téléversement du fichier a échoué. Peut-être le fichier est-il trop gros. Essayez d'utiliser le FTP pour téléverser votre fichier dans votre répertoire GEDCOM, puis sélectionnez-le et importez-le à partir d'ici.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Modifier un type d'évènement existant";
135,138d168
< 		$admtext['entertypedesc'] = "Veuillez saisir un type et une description pour ce nouveau type d'évènement.";
< 		$admtext['enterdisplay'] = "Veuillez saisir une chaîne pour ce nouveau type d'évènement.";
< 		$admtext['existingeventtypeinfo'] = "Information Type d'évènement existant";
< 		$admtext['neweventtypeinfo'] = "Nouveau Type d'évènement";
145,146d174
< 		$admtext['addnewevtype'] = "Ajouter un type d'évènement";
< 		$admtext['createnewevtype'] = "Crée un type d'évènement";
149,150d176
< 		$admtext['existingevtypes'] = "Types d'évènement existants";
< 		$admtext['edsevtypes'] = "Édite, supprime ou trie les types d'évènement déjà saisis";
152d177
< 		$admtext['confdeleteevtype'] = "Êtes-vous certain de vouloir supprimer ce type d'évènement ?";
154d178
< 		$admtext['selectentertag'] = "Veuillez choisir ou saisir le tag pour ce type d'évènement.";
208d231
< 		$admtext['changestoallevtypes'] = "Modifications de tous les types d'évènement";
214d236
< 		$admtext['BAPM'] = "Baptême";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Êtes-vous sûr de vouloir supprimer ce type d'événement ? Tous les événements de ce type seront alors détruits.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Ajouter un nouveau type";
> 		$admtext['createnewevtype'] = "Créer un nouvel enregistrement de type d'événement/attribut";
> 		$admtext['modifyeventtype'] = "Modifier un type existant";
> 		$admtext['entertypedesc'] = "Merci de saisir un type ou une description pour ce nouveau type d'événement/attribut.";
> 		$admtext['enterdisplay'] = "Merci de saisir un texte d'affichage pour ce nouveau type d'événement/attribut.";
> 		$admtext['existingeventtypeinfo'] = "Information sur un type d'événement/attribut existant";
> 		$admtext['neweventtypeinfo'] = "Information sur un nouveau type d'événement/attribut";
> 		$admtext['existingevtypes'] = "Types d'événements/attributs existants";
> 		$admtext['edsevtypes'] = "Modifier, supprimer ou trier les types d'événements/attributs précédemment saisis.";
> 		$admtext['selectentertag'] = "Merci de sélectionner ou de saisir le tag pour ce type d'événement/attribut.";
> 		$admtext['changestoallevtypes'] = "Modifications de tous les types d'événements/attributs";
254c290
< 		$admtext['fevslater'] = "Note: les évènements additionnels, et les notes spécifiques aux évènements et les citations, peuvent être ajoutés après avoir sauvegardé la nouvelle famille.";
---
> 		$admtext['fevslater'] = "Note: les évènements additionnels, les notes spécifiques aux évènements et les citations peuvent être ajoutés après avoir sauvegardé la nouvelle famille.";
256c292
< 		$admtext['wifeid'] = "ID Epouse";
---
> 		$admtext['wifeid'] = "ID Épouse";
268d303
< 		$admtext['nobirthinfo'] = "Aucune info de naissance";
274c309
< 		$admtext['nickname'] = "Surnom";
---
> 		$admtext['nickname'] = "Autre nom";
295c330
< 		$admtext['prefixpersonid'] = "Veuillez préfixer l'ID de Personne avec un \"I\" pour \"Individuel\"";
---
> 		$admtext['prefixpersonid'] = "Veuillez préfixer l'ID de Personne avec un \"I\" pour \"Individu\"";
324c359
< 		$admtext['pevslater'] = "Note: les évènements additionnels, et les notes spécifiques aux évènements et les citations, peuvent être ajoutés après avoir sauvegardé le nouvel individu.";
---
> 		$admtext['pevslater'] = "Note: les évènements additionnels, les notes spécifiques aux évènements et les citations peuvent être ajoutés après avoir sauvegardé le nouvel individu.";
327c362
< 		$admtext['pevslater2'] = "Note: Des événements additionnels, des notes associées à des événement et des citations, peuvent être ajoutés plus tard.";
---
> 		$admtext['pevslater2'] = "Note: Des événements additionnels, des notes associées à des événements et des citations peuvent être ajoutés plus tard.";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Sélectionner la photo par<br/>défaut<br/>"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Enregistrer + Nouveaux Parents";
> 		$admtext['savenewspouse'] = "Enregistrer + Nouveau conjoint";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Date de naissance alternative";
354d391
< 		$admtext['enterphotodesc'] = "Veuillez saisir une description pour cette image.";
388d424
< 		$admtext['photoowner'] = "Propriétaire - source";
390c426
< 		$admtext['selectphoto'] = "Selectionner l'image";
---
> 		$admtext['selectphoto'] = "Sélectionner l'image";
417d452
< 		$admtext['imgmap'] = "Carte d'image";
490d524
< 		$admtext['mapinstr3'] = "Pour associer une région de cette photo à un individu spécifique, sélectionner l'arbre de l'individu, choisir une forme et des dimensions pour la zone de la photo que vous désirez associer à l'individu, puis cliquer au centre de la zone sélectionnée sur la photo. Une fenêtre s'ouvrira pour vous aider à sélectionner l'individu. Une fois que vous l'aurez sélectionné, le code pour la carte d'image sera ajouté dans le champ. Répéter ce processus autant de fois que vous désirez ajouter des individus à la photo.";
495d528
< 		$admtext['removelink'] = "Supprimer le lien";
502d534
< 		$admtext['eloptions'] = "Explorer ou supprimer";
509d540
< 		$admtext['nolinks'] = "Aucune association n'a encore été créée";
521c552
< 		$admtext['addnewcoll'] = "Ajouter la collection";
---
> 		$admtext['addnewcoll'] = "Ajouter une collection";
536c567
< 		$admtext['cidexists'] = "L'ID de la collection que vous avez saisie peut ne pas être ajoutée si elle existe déjà.";
---
> 		$admtext['cidexists'] = "L'ID de la collection que vous avez saisi ne peut ne pas être ajouté car il existe déjà.";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
546c574
< 		$admtext['linksel'] = "Associé à la sélection";
---
> 		$admtext['linksel'] = "Associer à la sélection";
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Carte d'image HTML (pour la rétrocompatibilité)";
> 		$admtext['photoowner'] = "Propriétaire de l'original";
> 		$admtext['nothumb'] = "Pas de miniature";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Cet élément n'a pas pu être ajouté, probablement parce que le fichier est trop volumineux et n'a pas pu être téléversé ou utilisé pour fabriquer une vignette.";
> 		$admtext['moved'] = "Déplacé";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Merci de saisir une description pour cette image.";
> 		$admtext['mapinstr3'] = "Pour lier une zone de cette photo à une personne, une famille ou une autre entité, sélectionner d'abord l'arbre pertinent et le type d'entité, puis créer un rectangle de la zone choisie. Pour ce faire, cliquer sur l'angle en haut à gauche de la zone, puis étirer le rectangle jusqu'à l'angle en bas à droite. Vous pouvez aussi cliquer sur l'angle en haut à gauche, puis sur l'angle en bas à droite. Une boîte en popup vous aidera alors à sélectionner la personne ou toute autre entité. Faire votre choix, puis répéter le processus autant de fois que nécessaire pour d'autres zones. Cliquer sur une zone existante pour la choisir, puis la faire glisser pour la déplacer. Vous pouvez aussi cliquer sur le 'X' pour supprimer la zone.";
561c599
< 		$admtext['modifyreport'] = "Modifier le Rapport existant";
---
> 		$admtext['modifyreport'] = "Modifier un rapport existant";
564,565c602,603
< 		$admtext['newreportinfo'] = "Nouveau Rapport";
< 		$admtext['reportname'] = "Nom du Rapport";
---
> 		$admtext['newreportinfo'] = "Nouveau rapport";
> 		$admtext['reportname'] = "Nom du rapport";
596d633
< 		$admtext['foremptystring'] = "Pour une chaîne vide, laissez ce champ vide et cliquez sur \"Ajouter >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions : Double-cliquez sur les éléments de gauche ou les faire glisser pour les placer dans les listes de droite.<br>Les faire glisser vers le haut et vers le bas pour les réorganiser.<br> Double-cliquez sur un élément des listes de droite pour le supprimer.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Pour une chaîne vide, laisser ce champ vide et cliquer sur >>";
651,655d690
< 		$admtext['selectimportfile'] = "Choisir un fichier à importer.";
< 		$admtext['importgedcom'] = "Importer GEDCOM (format standard 5.5)";
< 		$admtext['addreplacedata'] = "Complète ou remplace vos données généalogiques (peut prendre plusieurs minutes, en fonction de la taille de votre fichier)";
< 		$admtext['fromyourcomputer'] = "Depuis votre ordinateur ";
< 		$admtext['importdata'] = "Importer les données";
657,660d691
< 		$admtext['replace'] = "Remplacer (dans arbre sélectionné)";
< 		$admtext['desttree'] = "Arbre cible";
< 		$admtext['selectdesttree'] = "Veuillez choisir ou saisir une arbre cible.";
< 		$admtext['selectexisting'] = "Importer dans";
668,673d698
< 		$admtext['ucaselast'] = "Mettre les noms de famille en majuscules";
< 		$admtext['norecalc'] = "Ne pas recalculer les indicateurs 'En vie'";
< 		$admtext['autooffset'] = "Faire débuter les IDs au premier nombre disponible";
< 
< 		$admtext['mustselecttree'] = "Vous devez sélectionner un arbre avant d'utiliser cette option.";
< 		$admtext['importmedia'] = "Importer des médias s'ils existent";
675d699
< 		$admtext['neweronly'] = "Remplacer uniquement si plus récent";
677,692d700
< 		$admtext['onwebserver'] = "Sur le serveur web (dans le dossier GEDCOM)";
< 		$admtext['eventsonly'] = "Importer seulement les types d'évènement personnalisés (aucune donnée n'est ajoutée ou remplacée)";
< 		$admtext['imphints'] = "Notes: \"Toutes les données\" signifie tous les individus, familles, sources et notes (les associations à des fichiers média ne sont pas perdues tant que les IDs demeurent inchangés). Les correspondances sont toujours basées sur les IDs seulement. Les nouveaux enregistrements sont toujours ajoutés. \"Ajouter...\" importe tous les enregistrements qui ont un nouvel ID.";
< 		$admtext['allevents'] = "Accepter les données relatives à tous les nouveaux types d'événements personnalisés";
< 		$admtext['destbranch'] = "Branche de destination (facultatif)";
< 		$admtext['inframe'] = "(dans le cadre)";
< 		$admtext['getstart'] = "Mise en route";
< 		$admtext['importlatlong'] = "Importez les données de latitude/longitude si elles existent";
< 		$admtext['opening'] = "Ouverture";
< 		$admtext['reopen'] = "Réouverture";
< 		$admtext['uploading'] = "Téléchargement";
< 		$admtext['stop'] = "Arrêt";
< 		$admtext['stopped'] = "L'importation s'est arrêtée";
< 		$admtext['resume'] = "cliquer ici pour recommencer";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Journal";
694,696c702
< 		$admtext['mmgritems'] = "Installez ou supprimez les TNG Mods";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Importer par l'ancienne méthode (pas de barre de progression)";
---
> 		$admtext['mmgritems'] = "Installer et désinstaller les Mods";
700,701c706,707
< 		$admtext['tasks'] = "Des tâches importantes";
< 		$admtext['task_revusers'] = "Examiner les enregistrement de nouveaux utilisateurs";
---
> 		$admtext['tasks'] = "Tâches importantes";
> 		$admtext['task_revusers'] = "Examiner les enregistrements de nouveaux utilisateurs";
706c712
< 		$admtext['task_revind'] = "Examiner les modifications proposées pour des événements d'individu";
---
> 		$admtext['task_revind'] = "Examiner les modifications proposées pour des événements d'individus";
709c715
< 		$admtext['nobackups'] = "il y a aucune sauvegarde";
---
> 		$admtext['nobackups'] = "Il n'y a aucune sauvegarde";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Mise à jour";
> 		$admtext['need_upgrade'] = "Terminer ces instructions de mise à jour";
> 		$admtext['upgrade_missing'] = "Le fichier de mise à jour semble être manquant. La cause peut être que la mise à jour soit terminée.";
> 		$admtext['delete_upgrade'] = "Quand vous avez terminé, cliquez ici pour supprimer le fichier de mise à jour et revenir au menu.";
718c729
< 		$admtext['changestosource'] = "Modification d'une source";
---
> 		$admtext['changestosource'] = "Modifications de la source";
723d733
< 		$admtext['author'] = "Auteur";
785,788c795,798
< 		$admtext['pedperson'] = "Id de personne du diagramme"; //2
< 		$admtext['pedtree'] = "Id d'arbre du diagramme"; //2
< 		$admtext['phhistperson'] = "Id de personne de photos et d'histoires"; //2
< 		$admtext['phhisttree'] = "Id d'arbre de photos et d'histoires"; //2
---
> 		$admtext['pedperson'] = "ID de personne du diagramme"; //2
> 		$admtext['pedtree'] = "ID d'arbre du diagramme"; //2
> 		$admtext['phhistperson'] = "ID de personne de photos et d'histoires"; //2
> 		$admtext['phhisttree'] = "ID d'arbre de photos et d'histoires"; //2
804,825c814,835
< 		$admtext['momside'] = "Étiquette de côté de la mère"; //8
< 		$admtext['dadside'] = "Étiquette de côté du père"; //8
< 		$admtext['momperson'] = "ID de personne de côté de la mère"; //8
< 		$admtext['momtree'] = "Id d'arbre du côté de la mère"; //8
< 		$admtext['dadperson'] = "ID de personne de côté du père"; //8
< 		$admtext['dadtree'] = "Id d'arbre du côté du père"; //8
< 		$admtext['featurethumb1'] = "Vignette du 1er dispositif"; //4
< 		$admtext['featurelink1'] = "Lien du 1er dispositif"; //4
< 		$admtext['featuretitle1'] = "Titre du 1er dispositif"; //4
< 		$admtext['featurepara1'] = "Paragraphe du 1er dispositif"; //4
< 		$admtext['featurethumb2'] = "Vignette du 2e dispositif"; //4
< 		$admtext['featurelink2'] = "Lien du 2e dispositif"; //4
< 		$admtext['featuretitle2'] = "Titre du 2e dispositif"; //4
< 		$admtext['featurepara2'] = "Paragraphe du 2e dispositif"; //4
< 		$admtext['featurethumb3'] = "Vignette du 3e dispositif"; //4
< 		$admtext['featurelink3'] = "Lien du 3e dispositif"; //4
< 		$admtext['featuretitle3'] = "Titre du 3e dispositif"; //4
< 		$admtext['featurepara3'] = "Paragraphe du 3e dispositif"; //4
< 		$admtext['featurethumb4'] = "Vignette du 4e dispositif"; //4
< 		$admtext['featurelink4'] = "Lien du 4e dispositif"; //4
< 		$admtext['featuretitle4'] = "Titre du 4e dispositif"; //4
< 		$admtext['featurepara4'] = "Paragraphe du 4e dispositif"; //4
---
> 		$admtext['momside'] = "Étiquette d'affichage pour le côté maternel"; //8, 20
> 		$admtext['dadside'] = "Étiquette d'affichage pour le côté paternel"; //8, 20
> 		$admtext['momperson'] = "personID pour le côté maternel"; //8, 20
> 		$admtext['momtree'] = "treeID pour le côté maternel"; //8, 20
> 		$admtext['dadperson'] = "personID pour le côté paternel"; //8, 20
> 		$admtext['dadtree'] = "treeID pour le côté paternel"; //8, 20
> 		$admtext['featurethumb1'] = "Vignette du 1er article"; //4
> 		$admtext['featurelink1'] = "Lien du 1er article"; //4
> 		$admtext['featuretitle1'] = "Titre du 1er article"; //4
> 		$admtext['featurepara1'] = "Paragraphe du 1er article"; //4
> 		$admtext['featurethumb2'] = "Vignette du 2e article"; //4
> 		$admtext['featurelink2'] = "Lien du 2e article"; //4
> 		$admtext['featuretitle2'] = "Titre du 2e article"; //4
> 		$admtext['featurepara2'] = "Paragraphe du 2e article"; //4
> 		$admtext['featurethumb3'] = "Vignette du 3e article"; //4
> 		$admtext['featurelink3'] = "Lien du 3e article"; //4
> 		$admtext['featuretitle3'] = "Titre du 3e article"; //4
> 		$admtext['featurepara3'] = "Feature 3 paragraph"; //4
> 		$admtext['featurethumb4'] = "Vignette du 4e article"; //4
> 		$admtext['featurelink4'] = "Lien du 4e article"; //4
> 		$admtext['featuretitle4'] = "Titre du 4e article"; //4
> 		$admtext['featurepara4'] = "Paragraphe du 4e article"; //4
852c862
< 		$admtext['topsurnames'] = "Premiers noms de famille";
---
> 		$admtext['topsurnames'] = "Noms de famille les plus fréquents";
860,876c870,886
< 		$admtext['featurethumb5'] = "Vignette du 5e dispositif"; //15
< 		$admtext['featurelink5'] = "Lien du 5e dispositif"; //15
< 		$admtext['featuretitle5'] = "Titre du 5e dispositif"; //15
< 		$admtext['featurepara5'] = "Paragraphe du 5e dispositif"; //15
< 		$admtext['featurethumb6'] = "Vignette du 6e dispositif"; //15
< 		$admtext['featurelink6'] = "Lien du 6e dispositif"; //15
< 		$admtext['featuretitle6'] = "Titre du 6e dispositif"; //15
< 		$admtext['featurepara6'] = "Paragraphe du 6e dispositif"; //15
< 		$admtext['featurethumb7'] = "Vignette du 7e dispositif"; //15
< 		$admtext['featurelink7'] = "Lien du 7e dispositif"; //15
< 		$admtext['featurepara7'] = "Paragraphe du 7e dispositif"; //15
< 		$admtext['featurethumb8'] = "Vignette du 8e dispositif"; //15
< 		$admtext['featurelink8'] = "Lien du 8e dispositif"; //15
< 		$admtext['featurepara8'] = "Paragraphe du 8e dispositif"; //15
< 		$admtext['sidebarhead1'] = "En-tête du volet latéral 1"; //15
< 		$admtext['sidebarhead2'] = "En-tête du volet latéral 2"; //15
< 		$admtext['sidebarhead3'] = "En-tête du volet latéral 3"; //15
---
> 		$admtext['featurethumb5'] = "Vignette du 5e article"; //15
> 		$admtext['featurelink5'] = "Lien du 5e article"; //15
> 		$admtext['featuretitle5'] = "Titre du 5e article"; //15
> 		$admtext['featurepara5'] = "Paragraphe du 5e article"; //15
> 		$admtext['featurethumb6'] = "Vignette du 6e article"; //15
> 		$admtext['featurelink6'] = "Lien du 6e article"; //15
> 		$admtext['featuretitle6'] = "Titre du 6e article"; //15
> 		$admtext['featurepara6'] = "Paragraphe du 6e article"; //15
> 		$admtext['featurethumb7'] = "Vignette du 7e article"; //15
> 		$admtext['featurelink7'] = "Lien du 7e article"; //15
> 		$admtext['featurepara7'] = "Paragraphe du 7e article"; //15
> 		$admtext['featurethumb8'] = "Vignette du 8e article"; //15
> 		$admtext['featurelink8'] = "Lien du 8e article"; //15
> 		$admtext['featurepara8'] = "Paragraphe du 8e article"; //15
> 		$admtext['sidebarhead1'] = "En-tête de l'encadré 1"; //15
> 		$admtext['sidebarhead2'] = "En-tête de l'encadré 2"; //15
> 		$admtext['sidebarhead3'] = "En-tête de l'encadré 3"; //15
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "En-tête de citations";
> 		$admtext['quotesubhead'] = "Sous en-tête de citations";
> 		$admtext['sniptitle'] = "Titre de la Featurette";
> 		$admtext['snipname'] = "Nom de la Featurette";
> 		$admtext['snipinfoone'] = "Première ligne de la Featurette";
> 		$admtext['snipinfotwo'] = "Deuxième ligne de la Featurette";
> 		$admtext['snipimage'] = "Image Featurette";
> 		$admtext['snipperson'] = "Identifiant de la personne";
> 		$admtext['sniptree'] = "ID de l’arbre de la Featurette";
> 		$admtext['quote'] = "Citation";
> 		$admtext['link'] = "Lien";
> 		$admtext['featuretitle7'] = "Titre de la fonction 7";
> 		$admtext['featuretitle8'] = "Titre de la fonction 8";
> 		$admtext['featuretitle9'] = "Titre de la fonction 9";
> 		$admtext['featurethumb9'] = "Vignette fonction 9"; //15
> 		$admtext['featurelink9'] = "Lien fonction 9"; //15
> 		$admtext['featurepara9'] = "Paragraphe fonction 9"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Image d'en-tête à gauche";
> 		$admtext['rightimg'] = "Image d'en-tête à droite";
> 		$admtext['photoption'] = "Les options de photo sont<br />&nbsp;&nbsp;(fixe ou aléatoire)";
> 		$admtext['randomphotowidth'] = "Largeur de la photo aléatoire";
> 		$admtext['randomphotoheight'] = "Hauteur de la photo aléatoire";
> 		$admtext['randomphotomediatypeID'] = "Collection de photos aléatoires";
> 		$admtext['momheading'] = "Titre famille maternelle";
> 		$admtext['mompara'] = "Paragraphe sur la famille maternelle";
> 		$admtext['mompagelink'] = "Page sur la famille maternelle";
> 		$admtext['dadheading'] = "Titre famille paternelle";
> 		$admtext['dadpara'] = "Paragraphe sur la famille paternelle";
> 		$admtext['dadpagelink'] = "Page sur la famille paternelle";
> 		$admtext['spmomheading'] = "Titre famille maternelle du conjoint";
> 		$admtext['spmompara'] = "Paragraphe de la mère du conjoint";
> 		$admtext['spmompagelink'] = "Lien à la page sur la famille maternelle<br />&nbsp;&nbsp; du conjoint";
> 		$admtext['spmomside'] = "Étiquette d'affichage pour le côté maternel<br />&nbsp;&nbsp; du conjoint";
> 		$admtext['spdadside'] = "Étiquette d'affichage pour le côté paternel<br />&nbsp;&nbsp; du conjoint";
> 		$admtext['spmomperson'] = "personID pour le côté maternel du conjoint";
> 		$admtext['spmomtree'] = "treeID pour le côté maternel du conjoint";
> 		$admtext['spdadheading'] = "Titre famille paternelle du conjoint";
> 		$admtext['spdadpara'] = "Paragraphe du père du conjoint";
> 		$admtext['spdadpagelink'] = "Lien à la page sur la famille paternelle<br />&nbsp;&nbsp; du conjoint";
> 		$admtext['spdadperson'] = "personID pour le côté paternel du conjoint";
> 		$admtext['spdadtree'] = "ID de l'arbre pour le côté paternel du conjoint";
> 		$admtext['storiesheading'] = "Nos histoires de famille";
> 		$admtext['nbrsurnames'] = "Nombre de noms<br />&nbsp;&nbsp;dans le nuage de noms";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Vignette fonction";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Titre de la diapositive";
> 		$admtext['slideimg'] = "Image de la diapositive";
> 		$admtext['slideheadline'] = "Manchette de la diapositive";
> 		$admtext['slidetext'] = "Texte de la diapositive";
> 		$admtext['slidelink'] = "Lien de la diapositive";
> 		$admtext['slidelinktext'] = "Nom du lien de la diapositive";
> 		$admtext['featurelink'] = "Lien pour l'affichage";
> 		$admtext['featurelinktext'] = "Nom du lien pour l'affichage";
> 		$admtext['featuretitle'] = "Titre de l'affichage";
> 		$admtext['featuresub'] = "Sous-titre de l'affichage";
> 		$admtext['quoteimg'] = "Image de citation";
> 		$admtext['quotelink'] = "Lien de citation";
> 		$admtext['quotelinktext'] = "Nom du lien de citation";
> 		$admtext['sidebarpara'] = "Paragraphe de la barre latérale";
> 		$admtext['sidebarlink'] = "Lien de la barre latérale";
> 		$admtext['sidebarlinktext'] = "Nom du lien de la barre latérale";
> 		$admtext['sidebarimg'] = "Image de la barre latérale";
> 		$admtext['sidebartitle'] = "Titre de la barre latérale";
> 		$admtext['sidebarsub'] = "Sous-titre de la barre latérale";
> 		$admtext['snipheadline'] = "Manchette de l'affichette";
> 		$admtext['snipsubhead'] = "Sous-titre de l'affichette";
> 		$admtext['snipimg'] = "Image de l'affichette";
> 		$admtext['sniplink'] = "Lien de l'affichette";
> 		$admtext['sniplinktext'] = "Nom du lien de l'affichette";
> 		$admtext['linktext'] = "Texte du lien";
> 		$admtext['footerheadline'] = "Manchette du pied de page";
> 		$admtext['footerpara'] = "Texte du pied de page";
> 		$admtext['footerlink'] = "Lien du pied de page";
> 		$admtext['footerlinktext'] = "Nom du lien du pied de page";
> 		$admtext['footerheadline'] = "Manchette du pied de page";
> 		$admtext['footerpara'] = "Texte du pied de page";
> 		$admtext['footerlink'] = "Lien du pied de page";
> 		$admtext['footerlinktext'] = "Nom du lien du pied de page";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG nécessite 5.3 ou plus élevé.)";
---
> 		$admtext['phpreq'] = "(TNG nécessite 7.0 ou plus élevé.)";
1002,1003c1095,1096
< 		$admtext['lnpfxnum'] = "Num. chaque préfixe (max)";
< 		$admtext['specpfx'] = "ou ces préfixes particuliers";
---
> 		$admtext['lnpfxnum'] = "Nombre maximum de préfixes à considérer<br /> (Van = 1, Van der = 2, etc.)";
> 		$admtext['specpfx'] = "OU ces préfixes particuliers ";
1014c1107
< 		$admtext['brinstructions'] = "Pour sauvegarder, restaurer ou optimiser une table, selectionnez l'action adéquate pour cette table, ou sélectionnez plusieurs tables et appliquez l'action désirée à toute la sélection en appuyant sur le bouton correspondant au bas de l'écran.";
---
> 		$admtext['brinstructions'] = "Pour sauvegarder, restaurer ou optimiser une table, selectionnez l'action adéquate pour cette table. <br /> OU sélectionnez plusieurs tables, sélectionnez l'action désirée dans la liste déroulante puis appliquez-la à toute la sélection en appuyant sur le bouton [Aller].";
1032c1125
< 		$admtext['backupstruct'] = "Sauvegarder la Structure des tables";
---
> 		$admtext['backupstruct'] = "Sauvegarder la structure des tables";
1078c1171
< 		$admtext['relchart'] = "Schéma relationnel";
---
> 		$admtext['relchart'] = "Tableau de parenté";
1162c1255
< 		$admtext['mapwidth'] = "Largeur (% or px)";
---
> 		$admtext['mapwidth'] = "Largeur (% ou px)";
1171c1264
< 		$admtext['albumlinkstable'] = "Table des Liens albums";
---
> 		$admtext['albumlinkstable'] = "Table des Liens des albums";
1175,1176c1268,1269
< 		$admtext['notelinkstable'] = "Table Liens notes";
< 		$admtext['medialinkstable'] = "Table des Liens médias";
---
> 		$admtext['notelinkstable'] = "Table Liens des notes";
> 		$admtext['medialinkstable'] = "Table des Liens des médias";
1198c1291
< 		$admtext['needmaint'] = "Vous devez être en mode Maintenance pour lancer cet outil (Aller à  Configurations &gt;&gt; Configuration &gt;&gt; Configuration générale>>Bases de données)";
---
> 		$admtext['needmaint'] = "Vous devez être en mode Maintenance pour lancer cet outil (Aller à Configurations &gt;&gt; Configuration générale &gt;&gt; Bases de données et choisissez 'Oui' pour le Mode maintenance)";
1207c1300
< 		$admtext['localhspath'] = "Chemin local de pierre tombale";
---
> 		$admtext['localhspath'] = "Chemin local pour les pierres tombales";
1232d1324
< 		//added in 8.0.0
1235c1327
< 		$admtext['initrels'] = "Premier lien";
---
> 		$admtext['initrels'] = "Nb initial de relations à voir";
1246,1247c1338,1339
< 		$admtext['modspath'] = "Dossier mods";
< 		$admtext['extspath'] = "Dossier extensions";
---
> 		$admtext['modspath'] = "Dossier Mods";
> 		$admtext['extspath'] = "Dossier Extensions";
1255d1346
< 		//added in 9.0.0
1258c1349
< 		$admtext['convexpl'] = "(Cela assignera tous les lieux actuels à l'arbre sélectionné)";
---
> 		$admtext['convexpl'] = "(Cela assignera tous les Lieux actuels à l'arbre sélectionné)";
1264c1355
<         $admtext['mailpass'] = "mot de passe mail";
---
>         $admtext['mailpass'] = "Mot de passe mail";
1273c1364
<         $admtext['assumepriv'] = "Considérer comme confidentiel si non décédé <br />depuis de nombreuses années";
---
>         $admtext['assumepriv'] = "Considérer comme confidentiel si non décédé <br />depuis ce nombre d'années";
1276c1367
< 		$admtext['shownamespr'] = "Montrer les noms des individus marqués confidentiels";
---
> 		$admtext['shownamespr'] = "Montrer les noms des individus marqués 'Confidentiel'";
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293,1294c1382
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Re-utiliser les IDs supprimés";
---
> 		$admtext['reuseids'] = "Réutiliser les IDs supprimés";
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1316c1402
< 		$admtext['belowbar'] = "dessous la barre de menu mobile";
---
> 		$admtext['belowbar'] = "sous la barre de menu mobile";
1329,1330c1415
<         $admtext['assumeliving'] = "Supposer en vie si pas mort tant d'années";
< 		//changed in 11.0.2
---
>         $admtext['assumeliving'] = "Supposer en vie si agé de moins de <br />ce nombre d'années";
1360c1445
< 		$admtext['dataprotectmsg'] = "Afficher le lien de la politique de protection des données";
---
> 		$admtext['dataprotectmsg'] = "Afficher le lien de la charte de protection des données";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Modifier les préfixes entrants pour qu'ils correspondent aux paramètres de TNG";
> 		$admtext['sortevents'] = "Trier les événements par";
> 		$admtext['sortbydate'] = "Date de l'événement";
> 		$admtext['sortbytype'] = "Type de l'événement";
> 		$admtext['allowsuggest'] = "Autoriser les suggestions des visiteurs";
> 		$admtext['livingchecked'] = "Marqueur \"en vie\" pour les personnes et familles nouvelles";
> 		$admtext['maxmarried'] = "Marquer une famille \"en vie\" si le mariage a eu lieu<br/>il y a moins de ce nombre d'années";
> 		$admtext['imagetags'] = "Rectangles";
> 		$admtext['allowcsv'] = "Autoriser les téléchargements CSV pour les rapports";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Options de sauvegarde";
> 		$admtext['dosql'] = "Exporter sous forme SQL";
> 		$admtext['dodrop'] = "Inclure DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Inclure CREATE TABLE";
> 		$admtext['onrestore'] = "Restaurer les options";
> 		$admtext['dodel'] = "Supprimer d'abord le contenu précédent";
> 		$admtext['download'] = "Téléchargement";
> 		$admtext['altbirthtypes'] = "Autres événements liés à la naissance";
> 		$admtext['dtformat'] = "Format des tableaux";
> 		$admtext['conchart'] = "Diagramme des connexions";
> 		$admtext['maxropt'] = "Nombre maximal de recherches de connexions";
> 		$admtext['maxlopt'] = "Longueur maximale des chemins de connexion";
> 		$admtext['showtxtopt'] = "Afficher l'énoncé textuel du chemin";
> 		$admtext['compactboxopt'] = "Afficher les boîtes de personnes sous forme compacte";
> 		$admtext['sortbyopt'] = "Trier les chemins par";
> 		$admtext['anchoridopt'] = "ID de l'ancre";
> 		$admtext['maxmopt'] = "Nombre maximum de mariages dans la connexion";
> 		$admtext['saveincfg'] = "Stocker dans le chemin de configuration (voir Configuration générale)";
1374c1488
< 		$admtext['pleaseplacepart'] = "Veuillez saisir une partie d'un nom de lieu.";
---
> 		$admtext['pleaseplacepart'] = "Veuillez saisir une partie d'un nom de Lieu.";
1389,1390c1503,1504
< 		$admtext['pmsucc'] = "la fusion des lieux a réussi";
< 		$admtext['nomerge'] = "rien à fusionner";
---
> 		$admtext['pmsucc'] = "La fusion des Lieux a réussi";
> 		$admtext['nomerge'] = "Rien à fusionner";
1394,1395c1508
< 		$admtext['propagate'] = "appliquer cette modification aux évênements existants";
< 		//added in 8.0.0
---
> 		$admtext['propagate'] = "Appliquer cette modification aux événements existants";
1409c1522
<         $admtext['multchoice'] = "Si plusieurs résultats sont trouvés pour un lieu:";
---
>         $admtext['multchoice'] = "Si plusieurs résultats sont trouvés pour un Lieu:";
1416d1528
<         $admtext['nogeocode'] = "N'a pu être géocodé";
1418c1530
< 		$admtext['treesgone'] = "Assignation des arbres supprimée pour tous les lieux";
---
> 		$admtext['treesgone'] = "Assignation aux arbres supprimée pour tous les Lieux";
1420,1421c1532,1533
< 		$admtext['nolevel'] = "Type de lieu non spécifié";
< 		$admtext['placenotsaved'] = "Lieu non enregistré. Un autre lieu existe déjà avec le même nom. Merci de fusionner les lieux.";
---
> 		$admtext['nolevel'] = "Type de Lieu non spécifié";
> 		$admtext['placenotsaved'] = "Lieu non enregistré. Un autre Lieu existe déjà avec le même nom. Merci de fusionner les Lieux.";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Ne pas géocoder";
1436d1549
< 		$admtext['backtosecondary'] = "Retour aux outils secondaires";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Retour aux outils post-importation";
1469,1470c1584,1585
< 		$admtext['existinglanguages'] = "Info Langue(s) existante(s)";
< 		$admtext['modifylanguage'] = "Modifier Langue existante";
---
> 		$admtext['existinglanguages'] = "Info langue(s) existante(s)";
> 		$admtext['modifylanguage'] = "Modifier langue existante";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exclure les notes";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zipper et inclure les fichiers de médias";
> 		$admtext['downloadzip'] = "Télécharger le ZIP";
1575d1692
< 		//added in 8.0.0
1584c1701
< 		$admtext['usreditord'] = "Ajouter , supprimer ou modifier les données y compris médias";
---
> 		$admtext['usreditord'] = "Ajouter, supprimer ou modifier les données y compris les médias";
1591,1593c1708,1710
< 		$admtext['allow_media_edit'] = "Autoriser d'éditer médias seulement";
< 		$admtext['allow_media_add'] = "Autoriser d'ajouter médias seulement";
< 		$admtext['allow_media_delete'] = "Autoriser de supprimer médias seulement";
---
> 		$admtext['allow_media_edit'] = "Autoriser l'édition de médias seulement";
> 		$admtext['allow_media_add'] = "Autoriser l'ajout de médias seulement";
> 		$admtext['allow_media_delete'] = "Autoriser la suppression de médias seulement";
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Afficher seulement les utilisateurs désactivés";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Autoriser la visualisation des notes confidentielles";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Envoyer aussi aux admins quand un seul arbre est sélectionné";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1684c1803
< 		$admtext['nomods'] = "Aucun fichier de definition Mod (xxx) retrouvé dans le dossier Mod";
---
> 		$admtext['nomods'] = "Aucun fichier de configuration du Mod (xxx) retrouvé dans votre répertoire Mods";
1690c1809
< 		$admtext['checkwrite'] = "Vérifier les droits d'accès, droit être accessible";
---
> 		$admtext['checkwrite'] = "Vérifier les droits d'accès, doit être accessible";
1695c1814
< 		$admtext['defval'] = "Valeur de défaut";
---
> 		$admtext['defval'] = "Valeur par défaut";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1705c1822
< 		$admtext['editperf'] = "Les paramètres d'édition ont été modifiées comme suit:";
---
> 		$admtext['editperf'] = "Les paramètres d'édition ont été modifiés comme suit:";
1713c1830
< 		$admtext['logoptions'] = "Journal du gestionnaire de Mod ";
---
> 		$admtext['logoptions'] = "Journal du Gestionnaire des Mods ";
1716,1718c1833,1835
< 		$admtext['modname'] = "Nom du mod";
< 		$admtext['bypassconfirm'] = "Passer outre les confirmations";
< 		$admtext['modifyoptions'] = "Modifier les options du Gestionnaire de Mod";
---
> 		$admtext['modname'] = "Nom du Mod";
> 		$admtext['bypassconfirm'] = "Outrepasser les confirmations";
> 		$admtext['modifyoptions'] = "Modifier les options du Gestionnaire des Mods";
1722,1723c1839,1840
< 		$admtext['showlogfile'] = "Afficher le journal des actions du gestionnaire de Mod";
< 		$admtext['recentactions'] = "actions les plus récentes du gestionnaire de Mod";
---
> 		$admtext['showlogfile'] = "Afficher le journal des actions du Gestionnaire des Mods";
> 		$admtext['recentactions'] = "Actions les plus récentes du Gestionnaire de Mods";
1726,1727c1843,1844
< 		$admtext['modsyntax'] = "Syntaxe des mods";
< 		$admtext['modguidelines'] = "Normes des Mod";
---
> 		$admtext['modsyntax'] = "Syntaxe des Mods";
> 		$admtext['modguidelines'] = "Normes des Mods";
1769,1771c1886,1888
< 		$admtext['modrem'] = "mod désinstallé";
< 		$admtext['modsrem'] = "modifications du code supprimées";
< 		$admtext['modsreq'] = "modifications de code spécifiées";
---
> 		$admtext['modrem'] = "Mod désinstallé";
> 		$admtext['modsrem'] = "Mods désinstallés";
> 		$admtext['modsreq'] = "Mods spécifiés";
1775c1892
< 		$admtext['nocfgfile'] = "fichier mod introuvable";
---
> 		$admtext['nocfgfile'] = "Fichier Mod introuvable";
1787c1904
< 		$admtext['return'] = "Retour au gestionnaire de Mod";
---
> 		$admtext['return'] = "Retour au Gestionnaire des Mods";
1789c1906
< 		$admtext['tagunk'] = "étiquette  inconnue";
---
> 		$admtext['tagunk'] = "étiquette inconnue";
1795,1796c1912,1913
< 		$admtext['allowdeletepartial'] = "Supprimer les mods sélectionnés partiellement installés";
< 		$admtext['allowdeleteinstalled'] = "Supprimer les mods installés individuellement";
---
> 		$admtext['allowdeletepartial'] = "Supprimer les Mods sélectionnés partiellement installés";
> 		$admtext['allowdeleteinstalled'] = "Supprimer les Mods installés individuellement";
1831c1948
< 		$admtext['formodname'] = "pour le nom du mod ";
---
> 		$admtext['formodname'] = "pour le nom du Mod ";
1840c1957
< 		$admtext['stripeafter'] = "Rayure après nombre de lignes";
---
> 		$admtext['stripeafter'] = "Rayures toutes les x lignes";
1843c1960
< 		$admtext['no_frag'] = "fragment de code non autorisé ici";
---
> 		$admtext['no_frag'] = "Fragment de code non autorisé ici";
1854c1971
< 		$admtext['selectmod'] = "Sélectionner un fichier de configuration de mod pour visualiser les résultats du tableau de l'analyseur";
---
> 		$admtext['selectmod'] = "Sélectionner un Mod pour visualiser les résultats du tableau de l'analyseur.";
1857c1974
< 		$admtext['filesel'] = "Sélectionner un fichier TNG pour voir quels mods le concernent";
---
> 		$admtext['filesel'] = "Sélectionner un fichier TNG pour voir quels Mods le modifient";
1865,1867c1982,1984
< 		$admtext['reasontoupdate'] = "Si vous n'avez pas lancé le script cust_text_update.php script lors de votre mise à jour vers TNG v12, il vous faudra mettre à jour vos fichiers cust_text.php files en <ul><li>ajoutant une nouvelle ligne aux fichiers et</li><li>aussi en mettant à jour la ligne obsolète de vos fichiers cust_text.php </li></ul> qui n'avaient pas été remplacés pendant les mises-à jour de TNG.";
< 		$admtext['newanchor'] = "La nouvelle ligne de commentaire ne doit pas être traduite dans les fichiers de langue de façon à pouvoir être utilisée comme une ancre pour que les développeurs de mods puissent insérer du texte personnalisé avant cette nouvelle ligne de commentaire.";
< 		$admtext['translateissue'] = "Si vous traduisez cette nouvelle ligne de commentaire, les mods ne pourront pas s'installer.";
---
> 		$admtext['reasontoupdate'] = "Si vous n'avez pas lancé le script cust_text_update.php lors de votre mise à jour vers TNG v12, il vous faudra mettre à jour vos fichiers cust_text.php en <ul><li>ajoutant une nouvelle ligne aux fichiers et</li><li> en mettant à jour la ligne obsolète de vos fichiers cust_text.php </li></ul> qui n'avaient pas été remplacés pendant les mises à jour de TNG.";
> 		$admtext['newanchor'] = "La nouvelle ligne de commentaire ne doit pas être traduite dans les fichiers de langue de façon à pouvoir être utilisée comme une ancre pour que les développeurs de Mods puissent insérer du texte personnalisé avant cette nouvelle ligne de commentaire.";
> 		$admtext['translateissue'] = "Si vous traduisez cette nouvelle ligne de commentaire, les Mods ne pourront pas s'installer.";
1871,1872c1988,1989
< 		$admtext['confdelmod'] = "Voulez-vous vraiment supprimer  de votre système ce mod et son dossier associé ? Cette opération ne pourra pas être annulée !";
< 		$admtext['allowdeletesupport'] = "Autoriser la suppression du dossier d'aide quand le mod est supprimé";
---
> 		$admtext['confdelmod'] = "Voulez-vous vraiment supprimer ce Mod et son dossier associé de votre système ? Cette opération ne pourra pas être annulée !";
> 		$admtext['allowdeletesupport'] = "Lors de la suppression du mod, autoriser la suppression de dossier(s) créé(s) lors du dézippage du mod";
1874,1875c1991,1992
< 		$admtext['delpartinfo'] = "Vous devez mettre Oui pour cette option si vous avez oublié de désinstaller les versions précédentes du mod avant d'installer la nouvelle version.";
< 		$admtext['delinstinfo'] = "Vous devez mettre Oui pour cette option si vous avez installé une nouvelle version du mod et que l'ancienne version s'affiche encore comme installée.";
---
> 		$admtext['delpartinfo'] = "Vous devez mettre Oui pour cette option si vous avez oublié de désinstaller les versions précédentes du Mod avant d'installer la nouvelle version.";
> 		$admtext['delinstinfo'] = "Vous devez mettre Oui pour cette option si vous avez installé une nouvelle version du Mod et que l'ancienne version s'affiche encore comme installée.";
1877c1994
< 		$admtext['confdelmod1'] = "Voulez-vous vraiment supprimer ce mod de votre système ? Impossible d'annuler cette operation!";
---
> 		$admtext['confdelmod1'] = "Voulez-vous vraiment supprimer ce Mod de votre système ? Impossible d'annuler cette opération !";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Tous les Mods";
> 		$admtext['installedmods'] = "Mods installés seulement";
> 		$admtext['partinstmods'] = "Mods installés et partiellement installés";
> 		$admtext['showanalyzeractions'] = "Afficher les actions dans l'analyseur de mods";
> 		$admtext['badchar'] = "Caractère invalide";
1886d2008
< 		$admtext['test_number'] = "Numéro du test";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Nom/Numéro du test";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Garder le test confidentiel";
> 		$admtext['multivalues'] = "Utilisez des tirets entre plusieurs valeurs";
> 		$admtext['changestogroup'] = "Changements au groupe ADN";
> 		$admtext['modifydnagroup'] = "Modifier un groupe d'ADN existant";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Lier cet ADN à une personne";
1925c2056
< $admtext['individuals'] = "individuels";
---
> $admtext['individuals'] = "individus";
1965d2095
< $admtext['otherevents'] = "Autres évènements";
1977,1979c2107,2109
< $admtext['sex'] = "Sexe";
< $admtext['marriagedate'] = "Date mariage";
< $admtext['marriageplace'] = "Lieu mariage";
---
> $admtext['sex'] = "Genre";
> $admtext['marriagedate'] = "Date de mariage";
> $admtext['marriageplace'] = "Lieu de mariage";
1982c2112
< $admtext['filename'] = "Nom fichier";
---
> $admtext['filename'] = "Nom de fichier";
2042c2172
< $admtext['confdeletepers'] = "Êtes-vous certain de vouloir supprimer cette personne ?";
---
> $admtext['confdeletepers'] = "Êtes-vous certain de vouloir supprimer cette personne? Elle sera complètement effacée de votre arbre.";
2050,2051d2179
< $admtext['savereturn'] = "Retour à cette page";
< $admtext['saveback'] = "Retour au menu";
2058,2059d2185
< $admtext['secondary'] = "Processus Secondaires";
< $admtext['commas'] = "Séparer les entrées multiples avec des virgules";
2064c2190
< $admtext['findperson'] = "Chercher la  Personne...";
---
> $admtext['findperson'] = "Chercher la Personne...";
2101c2227
< $admtext['nobranch'] = "Pas de Branche";
---
> $admtext['nobranch'] = "Aucune branche";
2122c2248
< $admtext['indfamorsrc'] = "individus, familles ou sources";
---
> $admtext['indfamorsrc'] = "individus, familles, sources, archives ou lieux";
2129,2130d2254
< $admtext['secondarymaint'] = "Outils secondaires de maintenance ";
< $admtext['customeventtypes'] = "Types d'évènement";
2141c2265
< $admtext['fasterdisplay'] = "Note: Cette page est formatée autrement pour Autoriser un affichage rapide.";
---
> $admtext['fasterdisplay'] = "Note: Cette page est formatée autrement pour permettre un affichage rapide.";
2165c2289
< $admtext['findpersonid'] = "Chercher ID Personne";
---
> $admtext['findpersonid'] = "Chercher l'ID de la personne";
2182c2306
< $admtext['eventtypes'] = "Types d'évènement";
---
> $admtext['eventtypes'] = "Types d'évènements";
2217c2341
< $admtext['notdeleted'] = "Le fichier n'a pu être supprimé. Vérifier les CHMODS.";
---
> $admtext['notdeleted'] = "Le fichier n'a pu être supprimé. Vérifier les CHMODS (permissions du fichier).";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2231c2352
< $admtext['savefirst'] = "Sauvgarder les modifications ?";
---
> $admtext['savefirst'] = "Sauvegarder les modifications ?";
2233c2354
< $admtext['modmgr'] = "Gestionnaire de Mod";
---
> $admtext['modmgr'] = "Gestionnaire Mods";
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2250c2369
< $admtext['nicunderline'] = "Cliquer pour Souligner";
---
> $admtext['nicunderline'] = "Cliquer pour mettre en Souligné";
2259c2378
< $admtext['nicstrike'] = "Cliquer pour barrer";
---
> $admtext['nicstrike'] = "Cliquer pour mettre en Barré";
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Noms de famille";
> $admtext['subhead'] = "Sous-titre";
> $admtext['image'] = "Image";
> $admtext['author'] = "Auteur";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Mise en route";
> $admtext['showlog'] = "Journal";
> $admtext['nobirthinfo'] = "Aucune info de naissance";
> //changed in 13.0
> $admtext['savereturn'] = "Enregistrer et rester sur la page";
> $admtext['saveback'] = "Enregistrer et quitter la page";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Tous les éléments ont bien été supprimés.";
> $admtext['private'] = "Privé";
> $admtext['imgtags'] = "Étiquettes d'images";
> 
> $admtext['removelink'] = "Supprimer le lien";
> $admtext['eloptions'] = "Explorer ou supprimer";
> $admtext['pleaseenter'] = "Veuillez saisir un ";
> 
> $admtext['nolinks'] = "Aucune association n'a encore été créée";
> $admtext['nogeocode'] = "N'a pu être géocodé";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Sélectionner la photo par<br/>défaut<br/>"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Types d'événement/attribut";
> $admtext['secondary'] = "Outils post-importation";
> $admtext['otherevents'] = "Autres événements/attributs";
> //added in 14.0
> $admtext['newlinks'] = "Nouveaux liens";
> $admtext['newcemlinks'] = "Nouveaux liens de cimetière";
> $admtext['utility'] = "Outil";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Déplacer";
> $admtext['copy'] = "Copier";
> $admtext['title2'] = "Titre";  //from getperson
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/French-UTF8/alltext.php TNG1403/languages/French-UTF8/alltext.php
36,37c36,37
< $dates['FROM'] = "depuis";
< $dates['TO'] = "à";
---
> $dates['FROM'] = "du";
> $dates['TO'] = "au";
55,56c55,56
< $text['loginnotsent2'] = "L'adresse de courriel que vous aver fournie ne correspond à aucun compte enregistré. Aucune information n'a été envoyée.";
< $text['loginnotsent3'] = "L'adresse de courriel et le pseudonyme que vous aver fournis ne correspondent à aucun compte enregistré. Aucune information n'a été envoyée.";
---
> $text['loginnotsent2'] = "L'adresse de courriel que vous avez fournie ne correspond à aucun compte enregistré. Aucune information n'a été envoyée.";
> $text['loginnotsent3'] = "L'adresse de courriel et le pseudonyme que vous avez fournis ne correspondent à aucun compte enregistré. Aucune information n'a été envoyée.";
79,80c79,80
< $text['male'] = "M";
< $text['female'] = "F";
---
> $text['male'] = "Masculin";
> $text['female'] = "Féminin";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Une erreur est survenue dans le logiciel TNG. Cela pourrait être dû à un problème de paramétrage, une mise à jour incomplète ou un bogue du programme. Si vous êtes le propriétaire du site, vous pouver contacter le support TNG pour avoir de l'aide avec ce problème. Merci de copier la requête ci-dessous et de la coller dans votre message.";
163d147
< //moved here in 12.0.0
170c154
< $admtext['clearall'] = "Tout supprimer";
---
> $admtext['clearall'] = "Tout désélectionner";
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Nom/Numéro du test";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Nom/Numéro";
> $admtext['match_date'] = "Date des résultats";
> $admtext['gedmatchID'] = "ID GEDmatch";
> $admtext['ydna_haplogroup'] = "Y-ADN Haplogroupe";
> $admtext['mtdna_haplogroup'] = "ADNmt Haplogroupe";
> $admtext['relationship_section'] = "Section de la parenté";
> $admtext['relationship_range'] = "Lien de parenté possible";
> $admtext['suggested_relationship'] = "Suggéré";
> $admtext['actual_relationship'] = "Lien de parenté réel";
> $admtext['related_side'] = "Branche apparentée";
> $admtext['shared_dna'] = "ADN partagé";
> $admtext['shared centimorgans'] = "Total des cMs partagés";
> $admtext['shared_segments'] = "Segments partagés";
> $admtext['largest_segment'] = "Le plus grand segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Début du segment";
> $admtext['segment_end'] = "Fin du segment";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "SNPs correspondants";
> $admtext['xmatch'] = "Correspondance X";
> $text['keep_test_private'] = "Test confidentiel";
> $text['shared_dna'] = "Segment d'ADN partagé";
> $text['for_match'] = "pour ce résultat";
> $admtext['keeptest'] = "Confidentialité<br />du test";
> $admtext['keepname'] = "Protection<br />du nom";
> $admtext['allgroups'] = "Tous les groupes";
> $admtext['alltypes'] = "Tous les types";
> $admtext['generation_num'] = "Générations pour les noms de famille ancestraux";
> 
> $text['birthabbr'] = "n.";
> $text['chrabbr'] = "b.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "ent.";  //from descend
> $text['marrabbr'] = "mar.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Trouver tous les individus avec un évènement dans ce lieu";
> $text['firstpage'] = "Première page";
> $text['lastpage'] = "Dernière page";
> 
> //changed in 13.0.0
> $text['problem'] = "Une erreur est intervenue dans le logiciel TNG. Ce que vous devez faire :<p>Si vous venez d'installer une mise à jour, vous avez peut-être sauté une partie des instructions d'installation. Retournez à la page du Lisez-moi pour relire les instructions. Prêtez une attention particulière à l'étape de la structure de la base de données.</p><p>Si vous venez de faire une première installation de TNG, il est peut-être encore nécessaire de créer les tables de la base de données. Revenez à la page du lisez-moi pour retrouver cette étape.</p><p>Si vous êtes le propriétaire du site, vous pouvez contacter le service assistance de TNG pour obtenir une aide supplémentaire sur ce problème. Merci de copier la requête ci-après et collez-la dans votre message.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Aucune branche";
> 
> //added in 14.0
> $text['oneyear'] = "an";
> $text['pwdcodelink'] = "Cliquer sur ce lien pour recevoir un mot de passe provisoire";
> $text['pwdcodesent'] = "Un lien de réinitialisation du mot de passe a été envoyé à votre adresse de courriel.";
> $text['moved'] = "Déplacé";
> $text['citation'] = "Citation";
> $text['other'] = "Autre";
> $text['death'] = "Décès";
> $text['burial'] = "Inhumation";
> $text['cremation'] = "Crémation";
> $text['marriage'] = "Mariage";
> $text['divorce'] = "Divorce";
> $text['bylength'] = "Longueur";
> $text['bymarriages'] = "Mariages";
> $text['none'] = "Aucun";
> 
> //moved here in 14.0
> $text['family'] = "Famille";
> $text['source'] = "Source";
> $text['repository'] = "Archives";
> $text['place'] = "Lieu";
> $admtext['BAPM'] = "Baptême";
> 
> $text['glang'] = "fr";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/French-UTF8/index_help.php TNG1403/languages/French-UTF8/index_help.php
2,6c2,3
< $relpath = "../../";
< include($relpath . "begin.php");
< include($relpath . "version.php");
< echo $tngconfig['doctype'] ? $tngconfig['doctype'] . "\n\n" : "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n\n";
< echo "<!-- $tng_title, v.$tng_version ($tng_date), Written by Darrin Lythgoe, $tng_copyright -->\n";
---
> include("../../helplib.php");
> echo help_header("Aide : Mise en route");
8,18d4
< <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
< <head>
< 	<title>Aide : Administration</title>
<     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
< <?php
< 	include($relpath . "adminmeta.php");
< ?>
< <style>
< p {margin-top: 0px;}
< </style>
< </head>
26,27c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
79,82c65,68
< 			<li><p>Forum des utilisateurs : <a href="http://tngforum.us" target="_blank">http://tngforum.us</a>.</p></li>
< 			<li><p>Référence PHP : <a href="http://www.php.net" target="_blank">http://www.php.net</a>.</p></li>
< 			<li><p>RéférenceMySQL : <a href="http://www.mysql.com" target="_blank">http://www.mysql.com</a>.</p></li>
< 			<li><p>Référence HTML: <a href="http://www.htmlhelp.com" target="_blank">http://www.htmlhelp.com</a>.</p></li>
---
> 			<li><p>Forum des utilisateurs : <a href="https://tng.community" target="_blank">https://tng.community</a>.</p></li>
> 			<li><p>Référence PHP : <a href="https://php.net" target="_blank">https://php.net</a>.</p></li>
> 			<li><p>RéférenceMySQL : <a href="https://mysql.com" target="_blank">https://mysql.com</a>.</p></li>
> 			<li><p>Référence HTML: <a href="https://htmlhelp.com" target="_blank">https://htmlhelp.com</a>.</p></li>
diff -r TNG/languages/French-UTF8/text.php TNG1403/languages/French-UTF8/text.php
13,14c13,14
< 		$text['repoid'] = "ID du Lieu de dépôt";
< 		$text['browseallrepos'] = "Rehercher les lieux de dépôt";
---
> 		$text['repoid'] = "ID du lieu des Archives";
> 		$text['browseallrepos'] = "Rechercher les lieux des Archives";
32c32
< 		$text['buildged'] = "Contruire GEDCOM";
---
> 		$text['buildged'] = "Construire GEDCOM";
60c60
< 		$text['age'] = "âge";
---
> 		$text['age'] = "Âgé de";
69d68
< 		$text['general'] = "Généralités";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Sélectionner deux individus.";
---
> 		$text['select2inds'] = "Merci de choisir deux personnes.";
90c90
< 		$text['sameperson'] = "Les deux individus sont identiques";
---
> 		$text['sameperson'] = "Ces deux individus sont la même personne.";
93c93
< 		$text['sometimes'] = "(Parfois le fait de vérifier un autre nombre de générations donne un résultat différent)";
---
> 		$text['sometimes'] = "(Parfois, la vérification d'un nombre différent de générations donne un résultat différent..)";
126c126
< 		$text['gencheck'] = "Générations max <br />à investiguer";
---
> 		$text['gencheck'] = "Générations max à explorer";
144c144
< 		$text['dospouses2'] = "voir les épouses";
---
> 		$text['dospouses2'] = "Afficher les conjoints";
147c147
< 		$text['fmil'] = "le beau-père ou bell- mère de";
---
> 		$text['fmil'] = "le beau-père ou belle-mère de";
161c161
< 		$text['ggdau'] = "la xxx petite-fille";
---
> 		$text['ggdau'] = "la xxx petite-fille de";
164c164
< 		$text['gstepgdau'] = "la xxx petite-fille";
---
> 		$text['gstepgdau'] = "la xxx petite-fille de";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Rechercher des connexions";
> 		$text['findrel2'] = "Trouver des liens de parenté et d'autres connexions";
> 		$text['makeme2nd'] = "Utiliser mon identifiant (ID)";
> 		$text['usebookmarks'] = "Utiliser des marque-pages";
> 		$text['select2inds'] = "Merci de choisir deux personnes.";
> 		$text['indinfofor'] = "Informations individuelles pour";
> 		$text['nobookmarks'] = "Il n'y a aucun marque-page à utiliser";
> 		$text['bkmtitle'] = "Personnes trouvées dans les marque-pages";
> 		$text['bkminfo'] = "Choisir une personne:";
> 		$text['sortpathsby'] = "Trier les chemins par";
> 		$text['sortbyshort'] = "Trier par";
> 		$text['bylengthshort'] = "Longueur";
> 		$text['badID1'] = ": mauvais identifiant de la personne n°1 - revenir en arrière et recommencer";
> 		$text['badID2'] = ": mauvais identifiant de la personne n°2 - revenir en arrière et recommencer";
> 		$text['notintree'] = ": la personne avec cet identifiant n'est pas dans la base de l'arbre actuel.";
> 		$text['sameperson'] = "Ces deux individus sont la même personne.";;
> 		$text['nopaths'] = "Ces personnes ne sont pas liées.";
> 		$text['nopaths1'] = "Pas d'autre chemin plus court que xxx étapes";
> 		$text['nopaths2'] = "sur xxx testées";
> 		$text['longestpath'] = "(Le plus long chemin testé avait une longueur de xxx étapes.)";
> 		$text['relevantpaths'] = "Nombre de chemins trouvés: xxx";
> 		$text['skipMarr'] = "(en outre, le nombre de chemins trouvés mais non affichés en raison d'un trop grand nombre de mariages était de: xxx)";
> 		$text['mjaor'] = "ou";
> 		$text['connectionsto'] = "Connexions avec";
> 		$text['findanotherpers'] = "Trouver une autre personne...";
> 		$text['sometimes'] = "(Parfois, la vérification d'un nombre différent de générations donne un résultat différent..)";
> 		$text['anotherpath'] = "Rechercher d'autres connexions";
> 		$text['xpath'] = "Chemin ";
> 		$text['primary'] = "Personne de départ"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Personne finale";
> 		$text['parent'] = "Parent";
> 		$text['mhfather'] = "son père";
> 		$text['mhmother'] = "sa mère";
> 		$text['mhhusband'] = "son mari";
> 		$text['mhwife'] = "sa femme";
> 		$text['mhson'] = "son fils";
> 		$text['mhdaughter'] = "sa fille";
> 		$text['fhfather'] = "son père";
> 		$text['fhmother'] = "sa mère";
> 		$text['fhhusband'] = "son mari";
> 		$text['fhwife'] = "sa femme";
> 		$text['fhson'] = "son fils";
> 		$text['fhdaughter'] = "sa fille";
> 		$text['hfather'] = "père";
> 		$text['hmother'] = "mère";
> 		$text['hhusband'] = "mari";
> 		$text['hwife'] = "femme";
> 		$text['hson'] = "fils";
> 		$text['hdaughter'] = "fille";
> 		$text['maxruns'] = "Nombre maximum de chemins à vérifier";
> 		$text['maxrshort'] = "Nb Max chemins";
> 		$text['maxlength'] = "Longueur de chemin maximale";
> 		$text['maxlshort'] = "Long. Max de chemin";
> 		$text['xstep'] = "étape";
> 		$text['xsteps'] = "étapes";
> 		$text['xmarriages'] = "xxx mariages";
> 		$text['xmarriage'] = "1 mariage";
> 		$text['showspouses'] = "Afficher les deux conjoints";
> 		$text['showTxt'] = "Afficher l'énoncé textuel du chemin";
> 		$text['showTxtshort'] = "Descr. texte";
> 		$text['compactBox'] = "Afficher les boîtes de personnes sous forme compacte";
> 		$text['compactBoxshort'] = "Compact";
> 		$text['paths'] = "Chemins";
> 		$text['dospouses2'] = "Afficher les conjoints";
> 		$text['maxmopt'] = "Max mariages par connexion";
> 		$text['maxm'] = "Max mariages";
> 		$text['arerelated'] = "Ces personnes sont parentes. Leur relation est montrée dans le Chemin 1";
> 		$text['simplerel'] = "Recherche de liens de parenté";
196d264
< 		$text['scrollnote'] = "Note : Utiliser les barres de défilement pour voir tout l'arbre.";
199d266
< 		$text['popupnote2'] = " = Nouvel arbre";
238,240c305,307
< 		$text['borchr'] = "Naissance/Alt - Mort/Enterrement (deux)";
< 		$text['nobd'] = "Aucune date de naissance ou de mort";
< 		$text['bcdb'] = "Naissance/Alt/Mort/Enterrement (quatre)";
---
> 		$text['borchr'] = "Naissance/Baptême – Décès/Sépultures (deux)";
> 		$text['nobd'] = "Aucune date de naissance ou de décès";
> 		$text['bcdb'] = "Naissance/Baptême/Décès/Sépulture (quatre)";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tableaux";
> 		$text['dtchildren'] = "Enfants";
> 		$text['dtgrandchildren'] = "Petits-enfants";
> 		$text['dtggrandchildren'] = "Arrière-petits-enfants";
> 		$text['dtgggrandchildren'] = "Arrière-petits-enfants"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Aucun descendant";
> 		$text['dtgen'] = "Gén.";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Choisir";
> 		$text['dteachfulltable'] = "Chaque tableau complet aura";
> 		$text['dtrows'] = "rangées";
> 		$text['dtdisplayingtable'] = "Afficher le tableau";
> 		$text['dtgototable'] = "Aller au tableau :";
> 		$text['fcinstrdn'] = "Afficher la famille avec le conjoint";
> 		$text['fcinstrup'] = "Afficher la famille avec les parents";
> 		$text['fcinstrplus'] = "Choisir un autre conjoint";
> 		$text['fcinstrfam'] = "Choisir d'autres parents";
330,331c416,417
< 		$text['spousesurname'] = "Nom de famille de l'épouse";
< 		$text['spousemore'] = "Si vous entrez une valeur pour le nom de famille de l'épouse, vous devez sélectionner un sexe";
---
> 		$text['spousesurname'] = "Nom de famille du conjoint";
> 		$text['spousemore'] = "Si vous entrez une valeur pour le nom de famille du conjoint, vous devez sélectionner un sexe";
351c437
< 		$text['nodayevents'] = "événments de ce mois non associés à un jour spécifique";
---
> 		$text['nodayevents'] = "événements de ce mois non associés à un jour spécifique";
381,383c467
< 		$text['firstpage'] = "Première page";
< 		$text['lastpage'] = "Dernière page";
< 		$text['photoowner'] = "Source ou propriétaire";
---
> 		$text['photoowner'] = "Propriétaire de l'original";
405c489
< 		$text['photosize'] = "Taille";
---
> 		$text['photosize'] = "Dimensions";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Montrer/Cacher les étiquettes";
489c575
< 		$text['wifename'] = "Le nom de l'épouse";
---
> 		$text['wifename'] = "Nom de l'épouse";
502c588
< 		$text['noliving'] = "L'individu suivant est enregistré comme étant en vie ou marqué privé et n'est pas affiché parce que vous n'êtes pas connecté avec les autorisations nécessaires";
---
> 		$text['noliving'] = "L'individu suivant est enregistré comme étant en vie ou marqué privé et n'est pas affiché parce que vous n’avez pas les autorisations nécessaires";
548,549c634
< 		$text['noregs'] = "Désolés, mais nous n'acceptons pas de nouveaux enregistrements d'utilisateurs pour le moment. Merci de <a href=\"suggest.php\">nous contacter</a> directement si vous avez des commentaires ou des questions concernant n'importe quoi sur ce site Web.";
< 		//changed in 8.0.0
---
> 		$text['noregs'] = "Nous sommes désolés, mais nous n'acceptons pas de nouveaux enregistrements d'utilisateurs pour le moment. Merci de <a href=\"suggest.php\">nous contacter</a> directement si vous avez commentaires ou questions concernant ce site.";
551c636
< 		$text['accactive'] = "Le compte à été activé, mais l'utilisateur n'a pas de droit spécifique tant que vous ne les avez pas spécifiés..";
---
> 		$text['accactive'] = "Le compte a été activé, mais l'utilisateur n'a pas de droit spécifique tant que vous ne les avez pas spécifiés...";
556d640
< 		//added in 8.0.0
558c642
< 		$text['ackmessage'] = "Votre demande d'un compte d'utilisateur à bien été reçue. Votre compte restera inactif en attendant une vérification par l'administrateur. Nous vous contacterons par courriel dès que votre compte sera activé.";
---
> 		$text['ackmessage'] = "Votre demande d'un compte d'utilisateur a bien été reçue. Votre compte restera inactif en attendant une vérification par l'administrateur. Nous vous contacterons par courriel dès que votre compte sera activé.";
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Répéter le nouveau mot de passe";
> 		$text['resetsuccess'] = "Succès : le mot de passe a été réinitialisé";
> 		$text['resetfail'] = "Échec : le mot de passe n'a pas été réinitialisé";
> 		$text['failreason0'] = " (erreur inconnue de base de données)";
> 		$text['failreason2'] = " (vous n'avez pas l'autorisation de changer votre mot de passe)";
> 		$text['failreason3'] = " (les mots de passe ne correspondent pas)";
586c677
< 		$text['age'] = "âge";
---
> 		$text['age'] = "Âgé de";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total des citations de source";
618d710
< 		$text['loginfirst'] = "Vous devez d'abord ouvrir une session.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Des enregistrements d'utilisateur existants ont été détectés. Pour continuer, vous devez d'abord vous connecter ou supprimer tous les enregistrements dans la table des utilisateurs.";
629,630d722
< 		$text['zoomin'] = "Augmenter le Zoom";
< 		$text['zoomout'] = "Diminuer le Zoom";
656d747
< 		$text['dna_info_head'] = "Info test ADN";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Comparer les tests d'ADNmt sélectionnés";
> 		$text['dnatestscompare_atdna'] = "Comparer les tests d'ADNat sélectionnés";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "ADN-Y";
> 		$text['mt_haplogroup'] = "ADNmt";
> 		$text['sequence'] = "Réf";
> 		$text['extra_mutations'] = "Mutations additionnelles";
> 		$text['mrca'] = "Ancêtre RPC";
> 		$text['ydna_test'] = "Tests ADN-Y ";
> 		$text['mtdna_test'] = "Tests ADNmt (Mitochondrial)";
> 		$text['atdna_test'] = "Tests ADNat (autosomal)";
> 		$text['segment_start'] = "Début";
> 		$text['segment_end'] = "Fin";
> 		$text['suggested_relationship'] = "Suggéré";
> 		$text['actual_relationship'] = "Réel";
> 		$text['12markers'] = "Marqueurs 1-12";
> 		$text['25markers'] = "Marqueurs 13-25";
> 		$text['37markers'] = "Marqueurs 26-37";
> 		$text['67markers'] = "Marqueurs 38-67";
> 		$text['111markers'] = "Marqueurs 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Au moins deux tests doivent être sélectionnés pour être comparés";
670,671d785
< $text['birthabbr'] = "n.";
< $text['chrabbr'] = "b.";
675d788
< $text['family'] = "Famille"; //from getperson
684,685c797
< $text['nickname'] = "Surnom";  //from getperson
< $text['deathabbr'] = "d.";  //from descend
---
> $text['nickname'] = "Autre nom";  //from getperson
706d817
< $text['burialabbr'] = "ent.";  //from descend
712d822
< $text['place'] = "Lieu";
715d824
< $text['marrabbr'] = "mar.";
727c836
< $text['homepage'] = "Page d'accueil";
---
> $text['homepage'] = "Accueil";
738,739c847
< $text['source'] = "Source";
< $text['surnamelist'] = "Liste des noms de famille";
---
> $text['surnamelist'] = "Noms de famille";
766d873
< $text['repository'] = "Dépôt";
770d876
< $text['findplaces'] = "Trouver tous les individus avec un évènement dans ce lieu";
780c886
< $text['repoinfo'] = "Infos lieu de dépôt";
---
> $text['repoinfo'] = "Infos lieu des Archives";
784c890
< $text['repositories'] = "Dépôts";
---
> $text['repositories'] = "Archives";
791c897
< $text['gender'] = "Sexe";
---
> $text['gender'] = "Genre";
804d909
< $text['glang'] = "&hl=fr";
816d920
< $text['none'] = "Aucun";
838c942
< $text['pwrdby'] = "Ce site est propulsé par le logiciel";
---
> $text['pwrdby'] = "Ce site fonctionne grace au logiciel";
851c955
< $text['mnuheader'] = "Page d'accueil";
---
> $text['mnuheader'] = "Accueil";
884c988
< $text['wasborn'] = "Né-e le ";
---
> $text['wasborn'] = "est né-e ";
895,896c999,1000
< $text['wasmarried'] = "Mariage";
< $text['anddied'] = "Décès";
---
> $text['wasmarried'] = "a épousé ";
> $text['anddied'] = "est mort-e ";
906c1010
< $text['wasburied'] = "a été enterré";
---
> $text['wasburied'] = "a été enterré-e ";
918c1022
< $text['waschristened'] = "Baptême";
---
> $text['waschristened'] = "a été baptisé-e ";
922,924c1026,1027
< $text['moredetail'] = "Plus détail";
< $text['lessdetail'] = "Moins détail";
< $text['otherevents'] = "Autres événements";
---
> $text['moredetail'] = "Plus de détails";
> $text['lessdetail'] = "Moins de détails";
936c1039
< $text['heatmap'] = "Carte de chaleur";
---
> $text['heatmap'] = "Carte de densité";
947c1050
< $text['takenby'] = "Pris par";
---
> $text['takenby'] = "Réalisé par";
952,953d1054
< $text['people_have'] = "personnes ont associé un test ADN à";
< $text['person_has'] = "personne a associé un test ADN à";
957,958c1058,1059
< $text['dataprotect'] = "Politique de protection des données";
< $text['viewpolicy'] = "Afficher la politique";
---
> $text['dataprotect'] = "Charte de protection des données";
> $text['viewpolicy'] = "Afficher la charte";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "tests ADN sont associé à";
> $text['testislinked'] = "test ADN est associé à";
> 
> //added in 12.2
> $text['quicklinks'] = "Liens rapides";
> $text['yourname'] = "Votre nom";
> $text['youremail'] = "Votre adresse email";
> $text['liketoadd'] = "Toutes les informations que vous souhaitez ajouter";
> $text['webmastermsg'] = "Message du webmaster";
> $text['gallery'] = "Voir la galerie";
> $text['wasborn_male'] = "est né";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "est née"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "a été baptisé";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "a été baptisée";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "est mort";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "est morte";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "a été enterré"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "a été enterrée"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "a été incinéré";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "a été incinérée";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "a épousé";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "a épousé";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "est divorcé";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "est divorcée";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " à ";			// used as a preposition to the location
> $text['onthisdate'] = " le ";		// when used with full date
> $text['inthisyear'] = " en ";		// when used with year only or month / year dates
> $text['and'] = "et ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Info test ADN";
> //added in 13.0
> $text['visitor'] = "Visiteur";
> 
> $text['popupnote2'] = " = Nouvel arbre";
> 
> //moved here in 14.0
> $text['zoomin'] = "Augmenter le Zoom";
> $text['zoomout'] = "Diminuer le Zoom";
> $text['scrollnote'] = "Étirer ou faire défiler pour voir plus de détails sur le tableau.";
> $text['general'] = "Généralités";
> 
> //changed in 14.0
> $text['otherevents'] = "Autres événements/attributs";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connexions";
> $text['continue'] = "Continuer";
> $text['title2'] = "Titre";  //from getperson
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/German/admintext.php TNG1403/languages/German/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Bitte eingeben ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Wählen Sie die Datei, die Sie importieren möchten.";
> 		$admtext['addreplacedata'] = "Daten hinzufügen oder ersetzen (kann mehrere Minuten dauern, je nach Größe der Datei)";
> 		$admtext['fromyourcomputer'] = "Von Ihrem Rechner";
> 		$admtext['importdata'] = "Daten importieren";
> 		$admtext['replace'] = "Ersetze (in gewähltem Stammbaum)";
> 		$admtext['desttree'] = "Ziel-Stammbaum";
> 		$admtext['selectdesttree'] = "Name des Ziel-Stammbaums eingeben.";
> 		$admtext['selectexisting'] = "Importiere in";
> 		$admtext['ucaselast'] = "Alle Nachnamen in Großbuchstaben umwandeln";
> 		$admtext['norecalc'] = "\"Lebend\"-Kennzeichen nicht neu berechnen";
> 		$admtext['autooffset'] = "Starte Kennungen bei der ersten verfügbaren Nummer";
> 		$admtext['mustselecttree'] = "Sie müssen einen Stammbaum auswählen, bevor Sie diese Option wählen.";
> 		$admtext['onwebserver'] = "Vom Webserver (aus dem GEDCOM-Verzeichnis)";
> 		$admtext['imphints'] = "Hinweise: Alle vorhandenen Daten bedeutet: alle Personen, Familien, Quellen und Notizen (Medien-Verknüpfungen gehen nicht verloren, solange die Kennungen gleich bleiben). Vergleiche basieren nur auf den Kennungen. Neue Datensätze werden stets hinzugefügt. Beim Hinzufügen werden alle Datensätze mit neuen Kennungen importiert.";
> 		$admtext['destbranch'] = "Ziel-Zweig (optional)";
> 		$admtext['importlatlong'] = "Breite/Länge importieren, falls vorhanden";
> 		$admtext['opening'] = "Öffnen";
> 		$admtext['reopen'] = "Erneut öffnen";
> 		$admtext['uploading'] = "Hochladen";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import gestoppt";
> 		$admtext['resume'] = "Fortsetzen";
> 		$admtext['neweronly'] = "Nur ersetzen, wenn neuer";
> 		$admtext['oldimport'] = "Import im alten Stil (ohne Ladebalken)";
> 		$admtext['importgedcom'] = "GEDCOM-Datei importieren (darf gezippt sein)";
> 		$admtext['stopbackup'] = "Stop! Möchten Sie Ihre Daten sichern, bevor Sie weitermachen?";
> 		$admtext['importmedia'] = "Medien-Daten importieren, falls vorhanden";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Stelle sicher, dass Prefixe und Suffixe (General Settings) für diesen File korrekt sind.";
> 		$admtext['chkimpsettings'] = "Überprüfe die Import-Einstellungen für weitere Optionen.";
> 		$admtext['eventsonly'] = "Ausschließlich Kunden-Ereignis Typen und Attribute importieren (es werden keine Daten hinzugefügt, ersetzt oder angehängt)";
> 		$admtext['allevents'] = "Daten für alle neuen Ereignistypen und Attribute akzeptieren";
> 		$admtext['finishingimporting'] = "Beenden...";
> 		$admtext['fileuploadfailed'] = "Datei upload fehlgeschlagen. Die Datei könnte zu groß sein. Versuche, die Datei mit FTP in dein GEDCOM-Verzeichnis zu laden, dann selektiere sie und importiere sie von dort.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Ereignistyp bearbeiten";
135,138d168
< 		$admtext['entertypedesc'] = "Beschreibung des Ereignistyps.";
< 		$admtext['enterdisplay'] = "Kurzbeschreibung des Ereignistyps.";
< 		$admtext['existingeventtypeinfo'] = "Angaben zu bestehendem Ereignistyp";
< 		$admtext['neweventtypeinfo'] = "Angaben zum neuen Ereignistyp";
145,146d174
< 		$admtext['addnewevtype'] = "Neuen Ereignistyp hinzufügen";
< 		$admtext['createnewevtype'] = "Neuen Ereignistyp anlegen";
149,150d176
< 		$admtext['existingevtypes'] = "Bestehende Ereignistypen";
< 		$admtext['edsevtypes'] = "Bearbeite, lösche oder sortiere vorhandene Ereignistypen";
152d177
< 		$admtext['confdeleteevtype'] = "Sind Sie sicher, dass Sie diesen Ereignistyp löschen wollen?";
154d178
< 		$admtext['selectentertag'] = "Bitte für diesen Ereignistyp den Tag angeben oder auswählen.";
208d231
< 		$admtext['changestoallevtypes'] = "Änderungen an allen Ereignissen";
214d236
< 		$admtext['BAPM'] = "Taufe";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Sind Sie sicher, dass Sie dieses Typ von Benutzerdefinierten Ereignissen löschen wollen? Alle Benutzerdefinierten Ereignisse dieses Typs werden auch gelöscht.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Neuen Typ hinzufügen";
> 		$admtext['createnewevtype'] = "Neuen Attribut- oder Ereignisdatensatz erstellen";
> 		$admtext['modifyeventtype'] = "Existierenden Typ ändern";
> 		$admtext['entertypedesc'] = "Bitte Typ/Beschreibung für dieses neue Attribute oder Ereignis-Typ eingeben.";
> 		$admtext['enterdisplay'] = "Bitte einen Anzeige-Text für dieses neue Attribute oder Ereignis-Typ eingeben.";
> 		$admtext['existingeventtypeinfo'] = "Existierende Information für Attribut oder Ereignis-Typ";
> 		$admtext['neweventtypeinfo'] = "Neue Information für Attribut oder Ereignis-Typ";
> 		$admtext['existingevtypes'] = "Existierende Attribute oder Ereignis-Typen";
> 		$admtext['edsevtypes'] = "Zuvor eingegebene Attribute oder Ereignis-Typen ändern, löschen oder sortieren";
> 		$admtext['selectentertag'] = "Bitte Bezeichnung für diese Attribut oder Ereignis-Typ auswählen oder eingeben.";
> 		$admtext['changestoallevtypes'] = "Änderungen für alle Attribute oder Ereignis-Typen";
250c286
< 		$admtext['familyidbefcite'] = "Sie müssen eine Familien-Kennung eingeben, bevor Sie Zitate dieser Familie benutzen können.";
---
> 		$admtext['familyidbefcite'] = "Sie müssen eine Familien-Kennung eingeben, bevor Sie Quellenangaben dieser Familie benutzen können.";
254c290
< 		$admtext['fevslater'] = "Hinweis: Kinder und zusätzliche Ereignisse können, ebenso wie ereignis-spezifische Notizen und Zitate, auf der folgenden Seite hinzugefügt werden.";
---
> 		$admtext['fevslater'] = "Hinweis: Kinder und zusätzliche Ereignisse können ebenso wie ereignis-spezifische Notizen und Quellenangaben auf der folgenden Seite hinzugefügt werden.";
268d303
< 		$admtext['nobirthinfo'] = "Keine Geburts-Angaben";
304c339
< 		$admtext['personidbefcite'] = "Sie müssen die Personen-Kennung eingeben, bevor Sie ein Zitat dieser Person verwenden können.";
---
> 		$admtext['personidbefcite'] = "Sie müssen die Personen-Kennung eingeben, bevor Sie eine Quellenangabe dieser Person verwenden können.";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Standard<br />-Foto<br />auswählen"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Speichern und neue Eltern anlegen";
> 		$admtext['savenewspouse'] = "Speichern und neuen Ehepartner anlegen";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alternative Geburtsdaten";
354d391
< 		$admtext['enterphotodesc'] = "Beschreibung für dieses Bild eingeben.";
388d424
< 		$admtext['photoowner'] = "Besitzer/Quelle";
417d452
< 		$admtext['imgmap'] = "Verweis-sensitive Graphik (Image Map)";
490d524
< 		$admtext['mapinstr3'] = "Um einen Bereich dieses Bildes mit einer Person zu verknüpfen, wählen Sie den Stammbaum dieser Person aus. Danach erstellen Sie ein Rechteck über den Bereich des Bildes, den sie auswählen möchten. Dazu klicken Sie die obere linke Ecke des auszuwählenden Bereiches an, ziehen dann das Rechteck zur unteren rechten Ecke auf und klicken dort, um das Rechteck zu schließen. Alternativ können Sie den Bereich auch nacheinander zunächst oben links und dann unten rechts anklicken. Ein Popup-Fenster gestattet Ihnen jetzt die Auswahl der zu verknüpfenden Person. Nachdem die Auswahl erfolgt ist, wird ein entsprechender HTML-Code zum nachstehenden Eingabefeld hinzugefügt. Wiederholen Sie diesen Vorgang nach Bedarf für weitere Bereiche des Bildes.";
495d528
< 		$admtext['removelink'] = "Verknüpfung entfernen";
502d534
< 		$admtext['eloptions'] = "Blättern oder Löschen";
509d540
< 		$admtext['nolinks'] = "Noch keine Verknüpfungen im Album";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
546c574
< 		$admtext['linksel'] = "Verlinken mit Auswahl";
---
> 		$admtext['linksel'] = "Ausgewählte Medien mit dieser Person verknüpfen";
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Image-Map (für Abwärts-Kompatibilität)";
> 		$admtext['photoowner'] = "Besitzer des Originals bzw. der Vorlage";
> 		$admtext['nothumb'] = "Kein Thumbnail";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Das Photo konnte nicht hinzugefügt werden. Wahrscheinlich war die Datei zu groß oder es konnte kein Miniaturbild erstellt werden.";
> 		$admtext['moved'] = "Verschoben";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Bitte Titel oder Beschreibung für dieses Medium eingeben.";
> 		$admtext['mapinstr3'] = "Um einen Bereich dieses Photos mit einer Person, einer Familie oder einem anderen Objekt zu verbinden muss zuerst der betreffende Zweig oder Objekt-Typ ausgewählt und dann ein Rechteck um die Bildregion erstellt werden. Dies geschieht mit einem Klick auf die linke obere Ecke und einem Ziehen zur rechten unteren Ecke. Alternativ gebnügt auch ein Klick auf die linke obere Ecke und ein weiterer Klick auf die rechte untere Ecke. In einem Popup kann die Person oder das Objekt ausgewählt werden. Bei Bedarf klann dieser Vorgang für weitere Bereiche wiederholt werden. Mit einem Klick auf einen existierenden Bereich kann der Bereich verschoben oder mit einem Klick auf 'X' gelöscht werden.";
596d633
< 		$admtext['foremptystring'] = "Für leere Zeichenfolge, Feld leer lassen und \"Hinzufügen >>\" klicken.";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Anleitung: Ziehe oder doppelklicke das Objekt links und füge es in die Liste rechts ein. Umsortieren mit aufwärts oder abwärts ziehen. Erneuter Doppelklick um das Objekt zu entfernen.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Für einen leeren String das Feld leer lassen und klicken >>";
651,655d690
< 		$admtext['selectimportfile'] = "Wählen Sie die Datei, die Sie importieren möchten.";
< 		$admtext['importgedcom'] = "GEDCOM-Datei importieren (Standard 5.5-Format)";
< 		$admtext['addreplacedata'] = "Daten hinzufügen oder ersetzen (kann mehrere Minuten dauern, je nach Größe der Datei)";
< 		$admtext['fromyourcomputer'] = "Von Ihrem Rechner";
< 		$admtext['importdata'] = "Daten importieren";
657,660d691
< 		$admtext['replace'] = "Ersetze (in gewähltem Stammbaum)";
< 		$admtext['desttree'] = "Ziel-Stammbaum";
< 		$admtext['selectdesttree'] = "Name des Ziel-Stammbaums eingeben.";
< 		$admtext['selectexisting'] = "Importiere in";
668,673d698
< 		$admtext['ucaselast'] = "Alle Nachnamen in Großbuchstaben umwandeln";
< 		$admtext['norecalc'] = "\"Lebend\"-Kennzeichen nicht neu berechnen";
< 		$admtext['autooffset'] = "Starte Kennungen bei der ersten verfügbaren Nummer";
< 
< 		$admtext['mustselecttree'] = "Sie müssen einen Stammbaum auswählen, bevor Sie diese Option wählen.";
< 		$admtext['importmedia'] = "Medien-Daten importieren, falls vorhanden";
675d699
< 		$admtext['neweronly'] = "Nur ersetzen, wenn neuer";
677,692d700
< 		$admtext['onwebserver'] = "Vom Webserver (aus dem GEDCOM-Verzeichnis)";
< 		$admtext['eventsonly'] = "Nur benutzerdefinierte Ereignistypen importieren (keine Daten werden hinzugefügt, ersetzt oder angefügt)";
< 		$admtext['imphints'] = "Hinweise: Alle vorhandenen Daten bedeutet: alle Personen, Familien, Quellen und Notizen (Medien-Verknüpfungen gehen nicht verloren, solange die Kennungen gleich bleiben). Vergleiche basieren nur auf den Kennungen. Neue Datensätze werden stets hinzugefügt. Beim Hinzufügen werden alle Datensätze mit neuen Kennungen importiert.";
< 		$admtext['allevents'] = "Daten für alle neuen benutzerdefinierten Ereignisse automatisch akzeptieren";
< 		$admtext['destbranch'] = "Ziel-Zweig (optional)";
< 		$admtext['inframe'] = "(in Frame)";
< 		$admtext['getstart'] = "Erste Schritte";
< 		$admtext['importlatlong'] = "Breite/Länge importieren, falls vorhanden";
< 		$admtext['opening'] = "Öffnen";
< 		$admtext['reopen'] = "Erneut öffnen";
< 		$admtext['uploading'] = "Hochladen";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import gestoppt";
< 		$admtext['resume'] = "Fortsetzen";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Protokoll der Änderungen";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Import im alten Stil (ohne Ladebalken)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Diese Upgrade-Anweisungen beenden";
> 		$admtext['upgrade_missing'] = "Die Upgrade-Datei fehlt, wahrscheinlich wurde das Upgrade bereits ausgeführt.";
> 		$admtext['delete_upgrade'] = "Wenn das Upgrade fertig ist, hier klicken um das Upgrade zu entfernen und zum Menü zurückzukehren.";
723d733
< 		$admtext['author'] = "Autor";
737c747
< 		$admtext['addnewcite'] = "Neues Zitat hinzufügen";
---
> 		$admtext['addnewcite'] = "Quellenangabe hinzufügen";
740,744c750,754
< 		$admtext['citedate'] = "Zitat-Datum";
< 		$admtext['modifycite'] = "Zitat bearbeiten";
< 		$admtext['addingcite'] = "Zitat wird gespeichert...";
< 		$admtext['deletingcite'] = "Zitat wird gelöscht...";
< 		$admtext['updatingcite'] = "Zitat wird aktualisiert...";
---
> 		$admtext['citedate'] = "Datum";
> 		$admtext['modifycite'] = "Quellenangabe bearbeiten";
> 		$admtext['addingcite'] = "Quellenangabe wird gespeichert...";
> 		$admtext['deletingcite'] = "Quellenangabe wird gelöscht...";
> 		$admtext['updatingcite'] = "Quellenangabe wird aktualisiert...";
779,781c789,791
< 		$admtext['templatenum'] = "Template Nummer";
< 		$admtext['mainimage'] = "Haupt Bild (Homepage)"; //1, 2, 3, 4, 5, 7
< 		$admtext['titleimage'] = "Titel Bild (Homepage)"; //1, 2, 3
---
> 		$admtext['templatenum'] = "Template-Nummer";
> 		$admtext['mainimage'] = "Hauptbild (Homepage)"; //1, 2, 3, 4, 5, 7
> 		$admtext['titleimage'] = "Titelbild (Homepage)"; //1, 2, 3
783,791c793,801
< 		$admtext['mainpara'] = "Willkommens Absatz";  //1, 4, 6, 7, 8
< 		$admtext['headimgplustitle'] = "Header Bild (inklusive Titel)"; //1
< 		$admtext['pedperson'] = "Stammbaum Personen-Kennung"; //2
< 		$admtext['pedtree'] = "Stammbaum Baum-Kennung"; //2
< 		$admtext['phhistperson'] = "Fotos &amp; Geschichten Personen-Kennung"; //2
< 		$admtext['phhisttree'] = "Fotos &amp; Geschichten Baum-Kennung"; //2
< 		$admtext['headimg'] = "Header Bild"; //2, 3, 4, 5, 6, 8
< 		$admtext['headtitleimg'] = "Header Titel Bild"; //2, 3
< 		$admtext['titleimg'] = "Titel Bild (alle Seiten)"; //4, 7
---
> 		$admtext['mainpara'] = "Begrüßungstext";  //1, 4, 6, 7, 8
> 		$admtext['headimgplustitle'] = "Headerbild (inklusive Titel)"; //1
> 		$admtext['pedperson'] = "Startperson: Personen-Kennung"; //2
> 		$admtext['pedtree'] = "Startperson: Stammbaum"; //2
> 		$admtext['phhistperson'] = "Fotos und Geschichten: Personen-Kennung"; //2
> 		$admtext['phhisttree'] = "Fotos und Geschichten: Stammbaum-Kennung"; //2
> 		$admtext['headimg'] = "Header-Bild"; //2, 3, 4, 5, 6, 8
> 		$admtext['headtitleimg'] = "Titelbild (Header)"; //2, 3
> 		$admtext['titleimg'] = "Titelbild (alle Seiten)"; //4, 7
793,801c803,811
< 		$admtext['fhpara'] = "Familien Geschichten Absatz"; //6
< 		$admtext['fhlinkshis'] = "Familien Geschichten Verknüpfungen (Seine)"; //6
< 		$admtext['fhlinkshers'] = "Familien Geschichten Verknüpfungen (Ihre)"; //6
< 		$admtext['mwpara'] = "Absatz Am häufigsten gesucht"; //6
< 		$admtext['respara'] = "Ressourcen Absatz"; //6
< 		$admtext['reslinks'] = "Ressourcen Links"; //6
< 		$admtext['headtitle1'] = "Header Titel, Teil 1"; //8
< 		$admtext['headtitle2'] = "Header Titel, Teil 2"; //8
< 		$admtext['headtitle3'] = "Header Titel, Teil 3"; //8
---
> 		$admtext['fhpara'] = "Absatz 'Geschichten'"; //6
> 		$admtext['fhlinkshis'] = "Verknüpfungen mit Geschichten (väterliche Seite)"; //6
> 		$admtext['fhlinkshers'] = "Verknüpfungen mit Geschichten (mütterliche Seite)"; //6
> 		$admtext['mwpara'] = "Derzeit besonders gesucht"; //6
> 		$admtext['respara'] = "Verfügbare Quellen und Informationen"; //6
> 		$admtext['reslinks'] = "Links zu wichtigen Quellen und Informationen"; //6
> 		$admtext['headtitle1'] = "Headertitel, Teil 1"; //8
> 		$admtext['headtitle2'] = "Headertitel, Teil 2"; //8
> 		$admtext['headtitle3'] = "Headertitel, Teil 3"; //8
803,830c813,840
< 		$admtext['latestnews'] = "Letzte Neuheiten"; //8
< 		$admtext['momside'] = "Mutter´s Seite Beschriftung"; //8
< 		$admtext['dadside'] = "Vater's Seite Beschriftung"; //8
< 		$admtext['momperson'] = "Mutter's Seite Personen-Kennung"; //8
< 		$admtext['momtree'] = "Mutter's Seite Baum-Kennung"; //8
< 		$admtext['dadperson'] = "Vater's Seite Personen-Kennung"; //8
< 		$admtext['dadtree'] = "Vater's Seite Baum-Kennung"; //8
< 		$admtext['featurethumb1'] = "Merkmal 1 Thumbnail"; //4
< 		$admtext['featurelink1'] = "Merkmal 1 Verknüpfung"; //4
< 		$admtext['featuretitle1'] = "Merkmal 1 Titel"; //4
< 		$admtext['featurepara1'] = "Merkmal 1 Absatz"; //4
< 		$admtext['featurethumb2'] = "Merkmal 2 Thumbnail"; //4
< 		$admtext['featurelink2'] = "Merkmal 2 Verknüpfung"; //4
< 		$admtext['featuretitle2'] = "Merkmal 2 Titel"; //4
< 		$admtext['featurepara2'] = "Merkmal 2 Absatz"; //4
< 		$admtext['featurethumb3'] = "Merkmal 3 Thumbnail"; //4
< 		$admtext['featurelink3'] = "Merkmal 3 Verknüpfung"; //4
< 		$admtext['featuretitle3'] = "Merkmal 3 Titel"; //4
< 		$admtext['featurepara3'] = "Merkmal 3 Absatz"; //4
< 		$admtext['featurethumb4'] = "Merkmal 4 Thumbnail"; //4
< 		$admtext['featurelink4'] = "Merkmal 4 Verknüpfung"; //4
< 		$admtext['featuretitle4'] = "Merkmal 4 Titel"; //4
< 		$admtext['featurepara4'] = "Merkmal 4 Absatz"; //4
< 		$admtext['photocaption'] = "Haupt Bild Beschreibung"; //4
< 		$admtext['maintitle'] = "Haupt Titel"; //5
< 		$admtext['hisside'] = "Seine Seite Beschriftung"; //5
< 		$admtext['herside'] = "Ihre Seite Beschriftung"; //5
< 		$admtext['newstext'] = "Neuheiten Text"; //5
---
> 		$admtext['latestnews'] = "Jüngste Neuigkeiten"; //8
> 		$admtext['momside'] = "Beschriftung für die mütterliche Seite"; //8, 20
> 		$admtext['dadside'] = "Beschriftung für die väterliche Seite"; //8, 20
> 		$admtext['momperson'] = "Personen-Kennung für die mütterliche Seite"; //8, 20
> 		$admtext['momtree'] = "Baum-Kennung für die mütterliche Seite"; //8, 20
> 		$admtext['dadperson'] = "Personen-Kennung für die väterliche Seite"; //8, 20
> 		$admtext['dadtree'] = "Baum-Kennung für die väterliche Seite"; //8, 20
> 		$admtext['featurethumb1'] = "Informationstext 1: Vorschaubild"; //4
> 		$admtext['featurelink1'] = "Informationstext 1: Verknüpfung"; //4
> 		$admtext['featuretitle1'] = "Informationstext 1: Überschrift"; //4
> 		$admtext['featurepara1'] = "Informationstext 1: Text"; //4
> 		$admtext['featurethumb2'] = "Informationstext 2: Vorschaubild"; //4
> 		$admtext['featurelink2'] = "Informationstext 2: Verknüpfung"; //4
> 		$admtext['featuretitle2'] = "Informationstext 2: Überschrift"; //4
> 		$admtext['featurepara2'] = "Informationstext 2: Text"; //4
> 		$admtext['featurethumb3'] = "Informationstext 3: Vorschaubild"; //4
> 		$admtext['featurelink3'] = "Informationstext 3: Verknüpfung"; //4
> 		$admtext['featuretitle3'] = "Informationstext 3: Überschrift"; //4
> 		$admtext['featurepara3'] = "Informationstext 3: Text"; //4
> 		$admtext['featurethumb4'] = "Informationstext 4: Vorschaubild"; //4
> 		$admtext['featurelink4'] = "Informationstext 4: Verknüpfung"; //4
> 		$admtext['featuretitle4'] = "Informationstext 4: Überschrift"; //4
> 		$admtext['featurepara4'] = "Informationstext 4: Text"; //4
> 		$admtext['photocaption'] = "Hauptbild: Beschreibung"; //4
> 		$admtext['maintitle'] = "Haupttitel"; //5
> 		$admtext['hisside'] = "Beschriftung für die väterliche Seite"; //5
> 		$admtext['herside'] = "Beschriftung für die mütterliche Seite"; //5
> 		$admtext['newstext'] = "Text zu Neuigkeiten"; //5
840,841c850,851
< 		$admtext['momsidenames'] = "Mutters Seite Nachnamen"; //8
< 		$admtext['dadsidenames'] = "Vaters Seite Nachnamen"; //8
---
> 		$admtext['momsidenames'] = "Nachnamen der mütterlichen Seite"; //8
> 		$admtext['dadsidenames'] = "Nachnamen der väterlichen Seite"; //8
860,873c870,883
< 		$admtext['featurethumb5'] = "Merkmal 5 Thumbnail"; //15
< 		$admtext['featurelink5'] = "Merkmal 5 Verknüpfung"; //15
< 		$admtext['featuretitle5'] = "Feature 5 title"; //15
< 		$admtext['featurepara5'] = "Merkmal 5 Absatz"; //15
< 		$admtext['featurethumb6'] = "Merkmal 6 Thumbnail"; //15
< 		$admtext['featurelink6'] = "Merkmal 6 Verknüpfung"; //15
< 		$admtext['featuretitle6'] = "Feature 6 title"; //15
< 		$admtext['featurepara6'] = "Merkmal 6 Absatz"; //15
< 		$admtext['featurethumb7'] = "Merkmal 7 Thumbnail"; //15
< 		$admtext['featurelink7'] = "Merkmal 7 Verknüpfung"; //15
< 		$admtext['featurepara7'] = "Merkmal 7 Absatz"; //15
< 		$admtext['featurethumb8'] = "Merkmal 8 Thumbnail"; //15
< 		$admtext['featurelink8'] = "Merkmal 8 Verknüpfung"; //15
< 		$admtext['featurepara8'] = "Merkmal 8 Absatz"; //15
---
> 		$admtext['featurethumb5'] = "Informationstext 5: Vorschaubild"; //15
> 		$admtext['featurelink5'] = "Informationstext 5: Verknüpfung"; //15
> 		$admtext['featuretitle5'] = "Informationstext 5: Überschrift"; //15
> 		$admtext['featurepara5'] = "Informationstext 5: Text"; //15
> 		$admtext['featurethumb6'] = "Informationstext 6: Vorschaubild"; //15
> 		$admtext['featurelink6'] = "Informationstext 6: Verknüpfung"; //15
> 		$admtext['featuretitle6'] = "Informationstext 6: Überschrift"; //15
> 		$admtext['featurepara6'] = "Informationstext 6: Text"; //15
> 		$admtext['featurethumb7'] = "Informationstext 7: Vorschaubild"; //15
> 		$admtext['featurelink7'] = "Informationstext 7: Verknüpfung"; //15
> 		$admtext['featurepara7'] = "Informationstext 7: Text"; //15
> 		$admtext['featurethumb8'] = "Informationstext 8: Vorschaubild"; //15
> 		$admtext['featurelink8'] = "Informationstext 8: Verknüpfung"; //15
> 		$admtext['featurepara8'] = "Informationstext 8: Text"; //15
877,884c887,894
< 		$admtext['texttitle1'] = "Text 1 Titel"; //15
< 		$admtext['textlink1'] = "Text 1 Verknüpfung"; //15
< 		$admtext['textpara1'] = "Text 1 Absatz"; //15
< 		$admtext['texttitle2'] = "Text 2 Titel"; //15
< 		$admtext['textlink2'] = "Text 2 Verknüpfung"; //15
< 		$admtext['textpara2'] = "Text 2 Absatz"; //15
< 		$admtext['texttitle3'] = "Text 3 Titel"; //15
< 		$admtext['textpara3'] = "Text 3 Absatz"; //15
---
> 		$admtext['texttitle1'] = "Informationstext 1: Überschrift"; //15
> 		$admtext['textlink1'] = "Informationstext 1: Verknüpfung"; //15
> 		$admtext['textpara1'] = "Informationstext 1: Text"; //15
> 		$admtext['texttitle2'] = "Informationstext 2: Überschrift"; //15
> 		$admtext['textlink2'] = "Informationstext 2: Verknüpfung"; //15
> 		$admtext['textpara2'] = "Informationstext 2: Absatz"; //15
> 		$admtext['texttitle3'] = "Informationstext 3: Überschrift"; //15
> 		$admtext['textpara3'] = "Informationstext 3: Text"; //15
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Anführungszeichenüberschrift";
> 		$admtext['quotesubhead'] = "untergeordneter Anführungszeichen";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Featurette name";
> 		$admtext['snipinfoone'] = "Featurette erste Zeile";
> 		$admtext['snipinfotwo'] = "Featurette zweite Zeile";
> 		$admtext['snipimage'] = "Featurette Bild";
> 		$admtext['snipperson'] = "ID der Featurette-Person";
> 		$admtext['sniptree'] = "Featurette-Baum-ID";
> 		$admtext['quote'] = "Quote";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Informationstext 7: Überschrift";
> 		$admtext['featuretitle8'] = "Informationstext 8: Überschrift";
> 		$admtext['featuretitle9'] = "Informationstext 9: Überschrift";
> 		$admtext['featurethumb9'] = "Informationstext 9: Vorschaubild"; //15
> 		$admtext['featurelink9'] = "Informationstext 9: Verknüpfung"; //15
> 		$admtext['featurepara9'] = "Informationstext 9: Text"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Bild für den Header, linke Seite";
> 		$admtext['rightimg'] = "Bild für den Header, rechte Seite";
> 		$admtext['photoption'] = "Darstellung von Bildern ('static' oder 'random')";
> 		$admtext['randomphotowidth'] = "Breite der Fotos/Bilder bei zufälliger Anzeige";
> 		$admtext['randomphotoheight'] = "Höhe der Fotos/Bilder bei zufälliger Anzeige";
> 		$admtext['randomphotomediatypeID'] = "Verzeichnis für die zufällige Anzeige von Fotos/Bildern";
> 		$admtext['momheading'] = "Überschrift für die mütterliche Seite der Familie";
> 		$admtext['mompara'] = "Abschnitt für die mütterliche Seite der Familie";
> 		$admtext['mompagelink'] = "Link zur mütterlichen Seite der Familie";
> 		$admtext['dadheading'] = "Überschrift für die väterliche Seite der Familie";
> 		$admtext['dadpara'] = "Abschnitt für die väterliche Seite der Familie";
> 		$admtext['dadpagelink'] = "Link zur väterlichen Seite der Familie";
> 		$admtext['spmomheading'] = "Überschrift für die mütterliche Seite des Ehepartners";
> 		$admtext['spmompara'] = "Abschnitt für die mütterliche Seite des Ehepartners";
> 		$admtext['spmompagelink'] = "Link zur mütterlichen Seite der Familie des Ehepartners";
> 		$admtext['spmomside'] = "Kennzeichnung für die mütterliche Seite des Ehepartners";
> 		$admtext['spdadside'] = "Kennzeichnung für die väterliche Seite des Ehepartners";
> 		$admtext['spmomperson'] = "Kennung für die mütterliche Seite des Ehepartners";
> 		$admtext['spmomtree'] = "Kennung des Stammbaums für die mütterliche Seite des Ehepartners";
> 		$admtext['spdadheading'] = "Überschrift für die väterliche Seite des Ehepartners";
> 		$admtext['spdadpara'] = "Abschnitt für die väterliche Seite des Ehepartners";
> 		$admtext['spdadpagelink'] = "Link zur väterlichen Seite des Ehepartners";
> 		$admtext['spdadperson'] = "Kennung für die väterliche Seite des Ehepartners";
> 		$admtext['spdadtree'] = "Kennung des Stammbaums für die väterliche Seite des Ehepartners";
> 		$admtext['storiesheading'] = "Unsere Familiengeschichte";
> 		$admtext['nbrsurnames'] = "Anzahl der Familiennamen in der Namen-Wolke";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Informationstext Vorschaubild";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG benötigt 5.3 oder höher.)";
---
> 		$admtext['phpreq'] = "(TNG benötigt 7.0 oder höher.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Präfixe beim Import an die TNG-Einstellungen anpassen";
> 		$admtext['sortevents'] = "Ereignisse sortieren nach";
> 		$admtext['sortbydate'] = "Ereignisdatum";
> 		$admtext['sortbytype'] = "Ereignistyp";
> 		$admtext['allowsuggest'] = "Änderungsvorschläge von Besuchern zulassen";
> 		$admtext['livingchecked'] = "Neue Personen und Familien als lebend kennzeichnen";
> 		$admtext['maxmarried'] = "Familien als lebend kennzeichnen, wenn weniger als so viele Jahre verheiratet";
> 		$admtext['imagetags'] = "Rechtecke";
> 		$admtext['allowcsv'] = "Download von Reports im CSV-Format zulassen";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup Optionen";
> 		$admtext['dosql'] = "als SQL exportieren";
> 		$admtext['dodrop'] = "DROP TABLE einfügen, falls bereits existiert";
> 		$admtext['docreate'] = "CREATE TABLE einfügen";
> 		$admtext['onrestore'] = "Wiederherstellungs-Optionen";
> 		$admtext['dodel'] = "Zuerst bisherigen Inhalt entfernen";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternative Geburts-Ereignisse";
> 		$admtext['dtformat'] = "Tabellen Format";
> 		$admtext['conchart'] = "Verbindungs-Grafik";
> 		$admtext['maxropt'] = "Max Anzahl von Verbindungssuche-Durchläufen";
> 		$admtext['maxlopt'] = "Max Länge der Verbindungs-Pfade";
> 		$admtext['showtxtopt'] = "Pfad-Anweisung als Text anzeigen";
> 		$admtext['compactboxopt'] = "Zeige Personen-Kästchen in kompakter Form";
> 		$admtext['sortbyopt'] = "Pfade sortieren nach";
> 		$admtext['anchoridopt'] = "Anker-ID";
> 		$admtext['maxmopt'] = "Max Eheschließungen pro Verbindung";
> 		$admtext['saveincfg'] = "Im Konfigurations-Verzeichnis speichern (siehe Allgemeine Einstellungenm)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kann nicht geocodiert werden";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "nicht georeferenzieren";
1436d1549
< 		$admtext['backtosecondary'] = "Zurück zu zusätzlichen Aktionen";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Zurück zu den Post-Import Werkzeugen";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Notizen ausschließen";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Media-Dateien komprimieren (ZIP) und einfügen";
> 		$admtext['downloadzip'] = "ZIP herunterladen";
1570,1571c1688,1689
< 		$admtext['allow_admin'] = "Zugriff auf alle System-Einstellungen und Verwaltungsfunktionen erlauben, und obige Rechte auf alle Stammbäume und Zweige anwenden.";
< 		$admtext['limitedrights'] = "Beschränke die obigen Rechte auf Folgendes:";
---
> 		$admtext['allow_admin'] = "Die vorstehenden Einstellungen auf alle Stammbäume und Zweige anwenden.";
> 		$admtext['limitedrights'] = "Beschränke die obigen Rechte auf folgenden Stammbaum:";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Nur deaktivierte Nutzeraccounts anzeigen";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Auch an Admins schicken, wenn ein einzelner Zweig ausgewählt ist";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1661c1780
< 		$admtext['dvblurb'] = "Mögliche Probleme in Ihren Daten finden.";
---
> 		$admtext['dvblurb'] = "Mögliche Probleme/Unstimmigkeiten in der Datenbank suchen.";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alle Mods";
> 		$admtext['installedmods'] = "Nur installierte Mods";
> 		$admtext['partinstmods'] = "Installierte + teilweise installierte Mods";
> 		$admtext['showanalyzeractions'] = "Aktionen im Mod Analyzer anzeigen";
> 		$admtext['badchar'] = "unzulässiges Zeichen";
1886d2008
< 		$admtext['test_number'] = "Testnummer";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testnummer / Name";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Test vertraulich halten";
> 		$admtext['multivalues'] = "Mehrfachwerte durch Bindestrich trennen";
> 		$admtext['changestogroup'] = "Änderungen an der DNA-Gruppe";
> 		$admtext['modifydnagroup'] = "EBearbeitung einer vorhandenen DNA-Gruppe";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Verbinde diesen DNA Test mit einer Person";
1965d2095
< $admtext['otherevents'] = "Andere Ereignisse";
2050,2051d2179
< $admtext['savereturn'] = "Zurück zu dieser Seite";
< $admtext['saveback'] = "Zurück zum Menü";
2058,2059d2185
< $admtext['secondary'] = "Zusätzliche Aktionen";
< $admtext['commas'] = "Mehrere Eingaben mit Kommata trennen";
2120c2246
< $admtext['datamaint'] = "Daten importieren/exportieren";
---
> $admtext['datamaint'] = "Daten importieren / exportieren";
2129,2130d2254
< $admtext['secondarymaint'] = "Zusätzliche Aktionen";
< $admtext['customeventtypes'] = "Benutzerdefinierte Ereignisse";
2138c2262
< $admtext['mswitch'] = "Auswahl vertauschen";
---
> $admtext['mswitch'] = "Datensätze vertauschen";
2177c2301
< $admtext['confdeletecite'] = "Sind Sie sicher, dass Sie dieses Zitat löschen möchten?";
---
> $admtext['confdeletecite'] = "Sind Sie sicher, dass Sie diese Quellenangabe löschen möchten?";
2181c2305
< $admtext['citations'] = "Zitate";
---
> $admtext['citations'] = "Quellenangaben";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Typ";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2300c2415
< //added in 12.0.0
---
> ///added in 12.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Familienname";
> $admtext['subhead'] = "Untertitel";
> $admtext['image'] = "Bild";
> $admtext['author'] = "Autor";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Erste Schritte";
> $admtext['showlog'] = "Protokoll der Änderungen";
> $admtext['nobirthinfo'] = "Keine Geburts-Angaben";
> //changed in 13.0
> $admtext['savereturn'] = "Speichern";
> $admtext['saveback'] = "Speichern und zurück";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alle Elemente wurden erfolgreich gelöscht";
> $admtext['private'] = "privat";
> $admtext['imgtags'] = "Beschriftungen der Bilder";
> 
> $admtext['removelink'] = "Verknüpfung entfernen";
> $admtext['eloptions'] = "Blättern oder Löschen";
> $admtext['pleaseenter'] = "Bitte eingeben ";
> 
> $admtext['nolinks'] = "Noch keine Verknüpfungen im Album";
> $admtext['nogeocode'] = "Kann nicht geocodiert werden";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Standard<br />-Foto<br />auswählen"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Ereignis / Attribute Typen";
> $admtext['secondary'] = "Post-Import Werkzeuge";
> $admtext['otherevents'] = "Andere Ereignisse / Attribute";
> //added in 14.0
> $admtext['newlinks'] = "erstellte Links";
> $admtext['newcemlinks'] = "Links zum Friedhof erstellt";
> $admtext['utility'] = "Werkzeug";
> $admtext['linktype'] = "Typ";
> $admtext['move'] = "Verschieben";
> $admtext['copy'] = "Kopieren";
> $admtext['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/German/alltext.php TNG1403/languages/German/alltext.php
9c9
< $dates['MARCH'] = "März";
---
> $dates['MARCH'] = "März";
40c40
< $dates['EST'] = "geschätzt";
---
> $dates['EST'] = "geschätzt";
43c43
< $text['cannotexecutequery'] = "Kann Abfrage nicht ausführen";
---
> $text['cannotexecutequery'] = "Kann Abfrage nicht ausführen";
46,47c46,47
< $text['text_next'] = "Vorwärts";
< $text['text_prev'] = "Zurück";
---
> $text['text_next'] = "Vorwärts";
> $text['text_prev'] = "Zurück";
51,52c51,52
< $text['forgot2'] = "Geben Sie oben Ihre E-Mail-Adresse und unten Ihre Benutzerkennung ein. Ihr Passwort wird zurückgesetzt. (Ein temporäres Passwort wird Ihnen zugesendet.)";
< $text['newpass'] = "Ihr neues, temporäres Passwort";
---
> $text['forgot2'] = "Geben Sie oben Ihre E-Mail-Adresse und unten Ihre Benutzerkennung ein. Ihr Passwort wird zurückgesetzt. (Ein temporäres Passwort wird Ihnen zugesendet.)";
> $text['newpass'] = "Ihr neues temporäres Passwort";
54,55c54,55
< $text['pwdsent'] = "Ihr neues, temporäres Passwort wurde an Ihre E-Mail-Adresse gesendet.";
< $text['loginnotsent2'] = "Die von Ihnen angegebene E-Mail-Adresse stimmt mit keiner vorhandenen Benutzerkennung überein. Es wurde nichts versendet.";
---
> $text['pwdsent'] = "Ihr neues temporäres Passwort wurde an Ihre E-Mail-Adresse gesendet.";
> $text['loginnotsent2'] = "Die von Ihnen angegebene E-Mail-Adresse stimmt mit keiner vorhandenen Benutzerkennung überein. Es wurde nichts versendet.";
57c57
< $text['logininfo'] = "Ihre Anmelde-Informationen";
---
> $text['logininfo'] = "Ihre Anmeldedaten";
79c79
< $text['male'] = "männlich";
---
> $text['male'] = "männlich";
81c81
< $text['closewindow'] = "Fenster schließen";
---
> $text['closewindow'] = "Fenster schließen";
88d87
< //moved here in 8.0.0
91,93c90,92
< $admtext['confunlink'] = "Sind Sie sicher, dass Sie die Verknüpfung dieser Person als Ehepartner in dieser Familie lösen möchten?";
< $admtext['confunlinkc'] = "Sind Sie sicher, dass Sie die Verknüpfung dieser Person als Kind dieser Familie lösen möchten?";
< $admtext['confremchild'] = "Sind Sie sicher, dass Sie die Verknüpfung des Kindes zu dieser Familie lösen möchten? Das Kind wird nicht aus der Datenbank gelöscht.";
---
> $admtext['confunlink'] = "Sind Sie sicher, dass Sie die Verknüpfung dieser Person als Ehepartner in dieser Familie lösen möchten?";
> $admtext['confunlinkc'] = "Sind Sie sicher, dass Sie die Verknüpfung dieser Person als Kind dieser Familie lösen möchten?";
> $admtext['confremchild'] = "Sind Sie sicher, dass Sie die Verknüpfung des Kindes zu dieser Familie lösen möchten? Das Kind wird nicht aus der Datenbank gelöscht.";
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
136c129
< $text['contains'] = "enthält";
---
> $text['contains'] = "enthält";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
144c134
< $text['enteremail'] = "Bitte eine gültige E-Mail-Adresse eingeben.";
---
> $text['enteremail'] = "Bitte eine gültige E-Mail-Adresse eingeben.";
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Ein Fehler ist in TNG aufgetreten. Ursache kann das Setup, ein unvollständiges Upgrade oder ein Programmfehler sein. Wenn Sie der Webseitenbetreiber sind, kontaktieren Sie den TNG-Support, um Hilfe zu erhalten. Bitte kopieren Sie die untenstehende Meldung in Ihre Nachricht.";
163d147
< //moved here in 12.0.0
168,169c152,153
< $admtext['select'] = "Auswählen";
< $admtext['selectall'] = "Alle auswählen";
---
> $admtext['select'] = "Auswählen";
> $admtext['selectall'] = "Alle auswählen";
171c155
< $admtext['medialinks'] = "Medien-Verknüpfungen";
---
> $admtext['medialinks'] = "Medien-Verknüpfungen";
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test-Nummer/Bezeichnung";
177c159
< $text['confirmed'] = "Haplogruppe bestätigt";
---
> $text['confirmed'] = "Haplogruppe bestätigt";
182c164
< $admtext['mrca'] = "Nächster gemeinsamer Vorfahre";
---
> $admtext['mrca'] = "Nächster gemeinsamer Vorfahre";
191c173
< $text['keep_name_private'] = "Namen nicht veröffentlichen";
---
> $text['keep_name_private'] = "Namen nicht veröffentlichen";
202a185,252
> $admtext['xtra_mut'] = "Zusätzliche Mutationen";
> $text['test_number'] = "Test-Nr.";
> $admtext['match_date'] = "Datum des Matchs";
> $admtext['gedmatchID'] = "GEDmatch-Nummer";
> $admtext['ydna_haplogroup'] = "Haplogruppe der Y-DNA";
> $admtext['mtdna_haplogroup'] = "Haplogruppe der mtDNA";
> $admtext['relationship_section'] = "Verwandtschaft";
> $admtext['relationship_range'] = "Mögliche Verwandtschaft";
> $admtext['suggested_relationship'] = "Vermutete Verwandtschaft";
> $admtext['actual_relationship'] = "Tatsächliche Verwandtschaft";
> $admtext['related_side'] = "Verwandter Zweig";
> $admtext['shared_dna'] = "Gemeinsame DNA";
> $admtext['shared centimorgans'] = "Gemeinsame DNA in cM";
> $admtext['shared_segments'] = "Gemeinsame Segmente";
> $admtext['largest_segment'] = "Größtes Segment";
> $admtext['chromosome'] = "Chromosom";
> $admtext['segment_start'] = "Beginn";
> $admtext['segment_end'] = "Ende";
> $admtext['centiMorgans'] = "cM";
> $admtext['matchingSNPs'] = "Anzahl der SNP";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Test vertraulich halten";
> $text['shared_dna'] = "Gemeinsames DNA-Segment";
> $text['for_match'] = "für diesen Match";
> $admtext['keeptest'] = "Test vertraulich";
> $admtext['keepname'] = "Name vertraulich";
> $admtext['allgroups'] = "Alle Gruppen";
> $admtext['alltypes'] = "Alle Testtypen";
> $admtext['generation_num'] = "Familiennamen eintragen (Anzahl der Generationen)";
> 
> $text['birthabbr'] = "geb.";
> $text['chrabbr'] = "get.";
> $text['deathabbr'] = "gest.";  //from descend
> $text['burialabbr'] = "begr.";  //from descend
> $text['marrabbr'] = "verh.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Suche alle Personen mit Ereignissen an diesem Ort";
> $text['firstpage'] = "Erste Seite";
> $text['lastpage'] = "Letzte Seite";
> 
> //changed in 13.0.0
> $text['problem'] = "In TNG ist ein Fehler aufgetreten. <p>Falls Sie ein Update installiert haben, haben Sie möglicherweise einen Teil der Anleitung übersprungen. Bitte rufen Sie die Datei 'Readme' erneut auf und achten Sie besonders auf die Hinweise zur Anpassung der Datenbankstruktur.</p><p>Wenn Sie TNG zum ersten Mal installiert haben, müssen Sie möglicherweise noch die Datenbank anlegen. Bitte rufen Sie die Datei readme.html erneut auf.</p><p>Wenn Sie der Eigentümer der Internet-Site sind, möchten Sie vielleicht den Support für TNG kontaktieren. Bitte kopieren Sie die untenstehende Meldung und fügen Sie sie in eine E-Mail ein.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Kein Zweig";
> 
> //added in 14.0
> $text['oneyear'] = "Jahr";
> $text['pwdcodelink'] = "Auf diesen Link klicken, damit Dir ein temporäres Passwort geschickt wird";
> $text['pwdcodesent'] = "Ein Link, um das Passwort zurückzusetzen, wurde an Deine Email-Adresse geschickt.";
> $text['moved'] = "Verschoben";
> $text['citation'] = "Zitat";
> $text['other'] = "Anders";
> $text['death'] = "Tod";
> $text['burial'] = "Beerdigung";
> $text['cremation'] = "Einäscherung";
> $text['marriage'] = "Eheschließung";
> $text['divorce'] = "Scheidung";
> $text['bylength'] = "Schritte";
> $text['bymarriages'] = "Eheschließungen";
> $text['none'] = "Kein";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Quelle";
> $text['repository'] = "Aufbewahrungsort";
> $text['place'] = "Ort";
> $admtext['BAPM'] = "Taufe";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Zusätzliche Mutationen";
---
> $text['glang'] = "de";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/German/text.php TNG1403/languages/German/text.php
66c66
< 		$text['received'] = "Ihre Anmerkung wurde zur Überprüfung an den Verwalter dieser Website gesendet.";
---
> 		$text['received'] = "Ihre Anmerkung wurde zur Überprüfung an den Betreuer dieser Website gesendet.";
69d68
< 		$text['general'] = "Allgemein";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "Die zwei Personen sind identisch.";
---
> 		$text['sameperson'] = "Die beiden Individuen sind dieselbe Person.";
93c93
< 		$text['sometimes'] = " (Eine unterschiedliche Anzahl der zu berücksichtigenden Generationen kann manchmal zu unterschiedlichen Ergebnissen führen.)";
---
> 		$text['sometimes'] = "(Manchmal ergibt eine andere Anzahl von Generationen ein anderes Ergebnis.)";
144c144
< 		$text['dospouses2'] = "Auch Beziehungen über Partner anzeigen";
---
> 		$text['dospouses2'] = "Zeige Ehepartner";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Nach Verbindungen suchen";
> 		$text['findrel2'] = "Suche Verwandtschaft und andere Verbindungen";
> 		$text['makeme2nd'] = "Verwende meine ID";
> 		$text['usebookmarks'] = "verwende Favoriten";
> 		$text['select2inds'] = "Bitte zwei Personen auswählen.";
> 		$text['indinfofor'] = "Personeninformation zu";
> 		$text['nobookmarks'] = "Es gibt keinen Favoriteneintrag";
> 		$text['bkmtitle'] = "Mehrere Personen in Favoriten gefunden";
> 		$text['bkminfo'] = "Wähle eine Person aus:";
> 		$text['sortpathsby'] = "Pfade sortieren nach Anzahl von";
> 		$text['sortbyshort'] = "Sortieren nach";
> 		$text['bylengthshort'] = "Länge";
> 		$text['badID1'] = ": Falsche ID für person1 - bitte zurückgehen und korrigieren";
> 		$text['badID2'] = ": Falsche ID für person2 - bitte zurückgehen und korrigieren";
> 		$text['notintree'] = ": Die Person mit dieser ID ist nicht im aktuellen Zweig.";
> 		$text['sameperson'] = "Die beiden Individuen sind dieselbe Person.";;
> 		$text['nopaths'] = "Diese Personen haben keine Verbindung.";
> 		$text['nopaths1'] = "Keine weiteren Verbindungen kürzer als xxx";
> 		$text['nopaths2'] = "in xxx Suchschritten";
> 		$text['longestpath'] = "(Der bis jetzt längste überprüfte Pfad war xxx Schritte lang)";
> 		$text['relevantpaths'] = "Anzahl gefundener relevanten Pfade: xxx";
> 		$text['skipMarr'] = "(zusätzlich, Anzahl gefundener aber wegen zu vieler Heiraten nicht dargestellter Pfade: xxx)";
> 		$text['mjaor'] = "oder";
> 		$text['connectionsto'] = "Verbindungen zu ";
> 		$text['findanotherpers'] = "Suche eine andere Person...";
> 		$text['sometimes'] = "(Manchmal ergibt eine andere Anzahl von Generationen ein anderes Ergebnis.)";
> 		$text['anotherpath'] = "Suche nach anderen Verbindungen";
> 		$text['xpath'] = "Pfad ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Eltern";
> 		$text['mhfather'] = "sein Vater";
> 		$text['mhmother'] = "seine Mutter";
> 		$text['mhhusband'] = "sein Ehemann";
> 		$text['mhwife'] = "seine Ehefrau";
> 		$text['mhson'] = "sein Sohn";
> 		$text['mhdaughter'] = "seine Tochter";
> 		$text['fhfather'] = "ihr Vater";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "ihr Ehemann";
> 		$text['fhwife'] = "ihre Ehefrau";
> 		$text['fhson'] = "ihr Sohn";
> 		$text['fhdaughter'] = "ihre Tochter";
> 		$text['hfather'] = "Vater";
> 		$text['hmother'] = "Mutter";
> 		$text['hhusband'] = "Ehemann";
> 		$text['hwife'] = "Ehefrau";
> 		$text['hson'] = "Sohn";
> 		$text['hdaughter'] = "Tochter";
> 		$text['maxruns'] = "Max. Anzahl Pfade zur Überprüfung";
> 		$text['maxrshort'] = "Max. Anzahl Pfade";
> 		$text['maxlength'] = "Verbindungspfade nicht länger als";
> 		$text['maxlshort'] = "Max. Länge";
> 		$text['xstep'] = "Schritt";
> 		$text['xsteps'] = "Schritte";
> 		$text['xmarriages'] = "xxx Eheschließungen";
> 		$text['xmarriage'] = "1 Eheschließung";
> 		$text['showspouses'] = "Zeige beide Ehepartner";
> 		$text['showTxt'] = "Zeige die Pfadbeschreibung als Text";
> 		$text['showTxtshort'] = "Beschreibungstext.";
> 		$text['compactBox'] = "Zeige Personen-Kästchen in kompakter Form";
> 		$text['compactBoxshort'] = "Kompakte Kästchen";
> 		$text['paths'] = "Pfade";
> 		$text['dospouses2'] = "Zeige Ehepartner";
> 		$text['maxmopt'] = "Max. Anzahl Eheschließungen pro Verbindung";
> 		$text['maxm'] = "Max. Anzahl Eheschließungen";
> 		$text['arerelated'] = "Diese Personen sind Verwandte - Ihre Beziehung ist in Pfad 1 dargestellt";
> 		$text['simplerel'] = "Einfache Verwandtschaftssuche";
196d264
< 		$text['scrollnote'] = "Hinweis: Evtl. müssen Sie nach unten oder nach rechts scrollen, um alles sehen zu können.";
199d266
< 		$text['popupnote2'] = " = neuen Stammbaum zeigen";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabellen";
> 		$text['dtchildren'] = "Kinder";
> 		$text['dtgrandchildren'] = "Enkel";
> 		$text['dtggrandchildren'] = "Urenkel";
> 		$text['dtgggrandchildren'] = "Urenkel"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Keine Nachkommen";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Gesamt";
> 		$text['dtselect'] = "Auswahl";
> 		$text['dteachfulltable'] = "Jede volle Tabelle wird";
> 		$text['dtrows'] = "Zeilen";
> 		$text['dtdisplayingtable'] = "Tabellendarstellung";
> 		$text['dtgototable'] = "Gehe zur Tabelle:";
> 		$text['fcinstrdn'] = "Zeige Familie mit Ehepartner";
> 		$text['fcinstrup'] = "Zeige Familie mit Eltern";
> 		$text['fcinstrplus'] = "Wähle andere Ehepartner";
> 		$text['fcinstrfam'] = "Wähle andere Eltern";
381,383c467
< 		$text['firstpage'] = "Erste Seite";
< 		$text['lastpage'] = "Letzte Seite";
< 		$text['photoowner'] = "Besitzer/Quelle";
---
> 		$text['photoowner'] = "Besitzer des Originals bzw. der Vorlage";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Beschriftungen ein-/ausschalten";
535c621
< 		$text['success'] = "Vielen Dank. Wir haben Ihre Registrierung empfangen. Wir werden Kontakt mit Ihnen aufnehmen, wenn Ihre Benutzerkennung freigeschaltet worden ist oder wenn wir weitere Angaben benötigen.";
---
> 		$text['success'] = "Vielen Dank. Ich habe Ihre Anmeldung erhalten. Ich werde Sie nach Freischaltung Ihrer Benutzerkennung kontaktieren.";
542c628
< 		$text['rempass'] = "Auf diesem Rechner angemeldet bleiben";
---
> 		$text['rempass'] = "Auf diesem Gerät angemeldet bleiben";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Neues Passwort wiederholen";
> 		$text['resetsuccess'] = "Erfolg: Das Passwort wurde zurückgesetzt";
> 		$text['resetfail'] = "Fehler: Passwort wurde nicht zurückgesetzt";
> 		$text['failreason0'] = " (unbekannter Datenbankfehler)";
> 		$text['failreason2'] = " (Du hast keine Berechtigung das Passwort zu ändern)";
> 		$text['failreason3'] = " (Passworte sind unterschiedlich)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Gesamtzahl Quellen-Zitate";
618d710
< 		$text['loginfirst'] = "Sie müssen sich zuerst anmelden.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Es gibt bereits Nutzereinträge. Um fortzufahren, müssen Sie sich erst einloggen oder alle Einträge aus der Nutzer-Tabelle entfernen.";
629,630d722
< 		$text['zoomin'] = "Vergrößern";
< 		$text['zoomout'] = "Verkleinern";
656d747
< 		$text['dna_info_head'] = "Informationen zu DNA-Tests";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Vergleiche ausgewählte mtDNA-Tests";
> 		$text['dnatestscompare_atdna'] = "Vergleiche ausgewählte atDNA-Tests";
> 		$text['chromosome'] = "Chr.";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNP";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref.";
> 		$text['extra_mutations'] = "Zusätzliche Mutationen";
> 		$text['mrca'] = "Nächster gem. Vorfahre";
> 		$text['ydna_test'] = "Tests der Y-DNA";
> 		$text['mtdna_test'] = "Tests der mtDNA";
> 		$text['atdna_test'] = "Tests der atDNA";
> 		$text['segment_start'] = "Beginn";
> 		$text['segment_end'] = "Ende";
> 		$text['suggested_relationship'] = "Vermutet";
> 		$text['actual_relationship'] = "Tatsächlich";
> 		$text['12markers'] = "Marker 1-12";
> 		$text['25markers'] = "Marker 13-25";
> 		$text['37markers'] = "Marker 26-37";
> 		$text['67markers'] = "Marker 38-67";
> 		$text['111markers'] = "Marker 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Für einen Vergleich müssen mindestens zwei Tests ausgewählt werden.";
670,671d785
< $text['birthabbr'] = "geb.";
< $text['chrabbr'] = "get.";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "gest.";  //from descend
706d817
< $text['burialabbr'] = "begr.";  //from descend
712d822
< $text['place'] = "Ort";
715d824
< $text['marrabbr'] = "verh.";
738d846
< $text['source'] = "Quelle";
766d873
< $text['repository'] = "Aufbewahrungsort";
768c875
< $text['suggest'] = "Anmerkung";
---
> $text['suggest'] = "Änderungsvorschlag";
770d876
< $text['findplaces'] = "Suche alle Personen mit Ereignissen an diesem Ort";
778c884
< $text['databasestatistics'] = "Datenbankstatistiken"; //needed to be shorter to fit on menu
---
> $text['databasestatistics'] = "Statistiken"; //needed to be shorter to fit on menu
804d909
< $text['glang'] = "&amp;hl=de";
816d920
< $text['none'] = "Keine";
924d1027
< $text['otherevents'] = "Weitere Ereignisse";
952,953d1054
< $text['people_have'] = "Personen sind durch einen DNA-Test verbunden mit";
< $text['person_has'] = "Person ist durch einen DNA-Test verbunden mit";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA-Tests sind verbunden mit";
> $text['testislinked'] = "DNA-Test ist verbunden mit";
> 
> //added in 12.2
> $text['quicklinks'] = "Quick Links";
> $text['yourname'] = "Ihre Name";
> $text['youremail'] = "Ihre E-Mail-Adresse";
> $text['liketoadd'] = "Alle Informationen, die Sie hinzufügen möchten";
> $text['webmastermsg'] = "Webmaster-Nachricht";
> $text['gallery'] = "Galerie zeigen";
> $text['wasborn_male'] = "wurde geboren";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "wurde geboren"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "getauft";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "getauft";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "gestorben";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "gestorben";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "wurde beigesetzt"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "wurde beigesetzt"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "wurde eingeäschert";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "wurde eingeäschert";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "heiratete";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "heiratete";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "geschieden";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "geschieden";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " am ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "und ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informationen zu DNA-Tests";
> //added in 13.0
> $text['visitor'] = "Besucher";
> 
> $text['popupnote2'] = " = neuen Stammbaum zeigen";
> 
> //moved here in 14.0
> $text['zoomin'] = "Vergrößern";
> $text['zoomout'] = "Verkleinern";
> $text['scrollnote'] = "Ziehen oder scrollen, um mehr zu sehen";
> $text['general'] = "Allgemein";
> 
> //changed in 14.0
> $text['otherevents'] = "Anderer Ereignisse und Attribute";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Verbindungen";
> $text['continue'] = "Fortsetzen";
> $text['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/German-UTF8/admintext.php TNG1403/languages/German-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Bitte eingeben ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Wählen Sie die Datei, die Sie importieren möchten.";
> 		$admtext['addreplacedata'] = "Daten hinzufügen oder ersetzen (kann mehrere Minuten dauern, je nach Größe der Datei)";
> 		$admtext['fromyourcomputer'] = "Von Ihrem Rechner";
> 		$admtext['importdata'] = "Daten importieren";
> 		$admtext['replace'] = "Ersetze (in gewähltem Stammbaum)";
> 		$admtext['desttree'] = "Ziel-Stammbaum";
> 		$admtext['selectdesttree'] = "Name des Ziel-Stammbaums eingeben.";
> 		$admtext['selectexisting'] = "Importiere in";
> 		$admtext['ucaselast'] = "Alle Nachnamen in Großbuchstaben umwandeln";
> 		$admtext['norecalc'] = "\"Lebend\"-Kennzeichen nicht neu berechnen";
> 		$admtext['autooffset'] = "Starte Kennungen bei der ersten verfügbaren Nummer";
> 		$admtext['mustselecttree'] = "Sie müssen einen Stammbaum auswählen, bevor Sie diese Option wählen.";
> 		$admtext['onwebserver'] = "Vom Webserver (aus dem GEDCOM-Verzeichnis)";
> 		$admtext['imphints'] = "Hinweise: Alle vorhandenen Daten bedeutet: alle Personen, Familien, Quellen und Notizen (Medien-Verknüpfungen gehen nicht verloren, solange die Kennungen gleich bleiben). Vergleiche basieren nur auf den Kennungen. Neue Datensätze werden stets hinzugefügt. Beim Hinzufügen werden alle Datensätze mit neuen Kennungen importiert.";
> 		$admtext['destbranch'] = "Ziel-Zweig (optional)";
> 		$admtext['importlatlong'] = "Breite/Länge importieren, falls vorhanden";
> 		$admtext['opening'] = "Öffnen";
> 		$admtext['reopen'] = "Erneut öffnen";
> 		$admtext['uploading'] = "Hochladen";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import gestoppt";
> 		$admtext['resume'] = "Fortsetzen";
> 		$admtext['neweronly'] = "Nur ersetzen, wenn neuer";
> 		$admtext['oldimport'] = "Import im alten Stil (ohne Ladebalken)";
> 		$admtext['importgedcom'] = "GEDCOM-Datei importieren (darf gezippt sein)";
> 		$admtext['stopbackup'] = "Stop! Möchten Sie Ihre Daten sichern, bevor Sie weitermachen?";
> 		$admtext['importmedia'] = "Medien-Daten importieren, falls vorhanden";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Stelle sicher, dass Prefixe und Suffixe (General Settings) für diesen File korrekt sind.";
> 		$admtext['chkimpsettings'] = "Überprüfe die Import-Einstellungen für weitere Optionen.";
> 		$admtext['eventsonly'] = "Ausschließlich Kunden-Ereignis Typen und Attribute importieren (es werden keine Daten hinzugefügt, ersetzt oder angehängt)";
> 		$admtext['allevents'] = "Daten für alle neuen Ereignistypen und Attribute akzeptieren";
> 		$admtext['finishingimporting'] = "Beenden...";
> 		$admtext['fileuploadfailed'] = "Datei upload fehlgeschlagen. Die Datei könnte zu groß sein. Versuche, die Datei mit FTP in dein GEDCOM-Verzeichnis zu laden, dann selektiere sie und importiere sie von dort.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Ereignistyp bearbeiten";
135,138d168
< 		$admtext['entertypedesc'] = "Beschreibung des Ereignistyps.";
< 		$admtext['enterdisplay'] = "Kurzbeschreibung des Ereignistyps.";
< 		$admtext['existingeventtypeinfo'] = "Angaben zu bestehendem Ereignistyp";
< 		$admtext['neweventtypeinfo'] = "Angaben zum neuen Ereignistyp";
145,146d174
< 		$admtext['addnewevtype'] = "Neuen Ereignistyp hinzufügen";
< 		$admtext['createnewevtype'] = "Neuen Ereignistyp anlegen";
149,150d176
< 		$admtext['existingevtypes'] = "Bestehende Ereignistypen";
< 		$admtext['edsevtypes'] = "Bearbeite, lösche oder sortiere vorhandene Ereignistypen";
152d177
< 		$admtext['confdeleteevtype'] = "Sind Sie sicher, dass Sie diesen Ereignistyp löschen wollen?";
154d178
< 		$admtext['selectentertag'] = "Bitte für diesen Ereignistyp den Tag angeben oder auswählen.";
208d231
< 		$admtext['changestoallevtypes'] = "Änderungen an allen Ereignissen";
214d236
< 		$admtext['BAPM'] = "Taufe";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Sind Sie sicher, dass Sie dieses Typ von Benutzerdefinierten Ereignissen löschen wollen? Alle Benutzerdefinierten Ereignisse dieses Typs werden auch gelöscht.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Neuen Typ hinzufügen";
> 		$admtext['createnewevtype'] = "Neuen Attribut- oder Ereignisdatensatz erstellen";
> 		$admtext['modifyeventtype'] = "Existierenden Typ ändern";
> 		$admtext['entertypedesc'] = "Bitte Typ/Beschreibung für dieses neue Attribute oder Ereignis-Typ eingeben.";
> 		$admtext['enterdisplay'] = "Bitte einen Anzeige-Text für dieses neue Attribute oder Ereignis-Typ eingeben.";
> 		$admtext['existingeventtypeinfo'] = "Existierende Information für Attribut oder Ereignis-Typ";
> 		$admtext['neweventtypeinfo'] = "Neue Information für Attribut oder Ereignis-Typ";
> 		$admtext['existingevtypes'] = "Existierende Attribute oder Ereignis-Typen";
> 		$admtext['edsevtypes'] = "Zuvor eingegebene Attribute oder Ereignis-Typen ändern, löschen oder sortieren";
> 		$admtext['selectentertag'] = "Bitte Bezeichnung für diese Attribut oder Ereignis-Typ auswählen oder eingeben.";
> 		$admtext['changestoallevtypes'] = "Änderungen für alle Attribute oder Ereignis-Typen";
250c286
< 		$admtext['familyidbefcite'] = "Sie müssen eine Familien-Kennung eingeben, bevor Sie Zitate dieser Familie benutzen können.";
---
> 		$admtext['familyidbefcite'] = "Sie müssen eine Familien-Kennung eingeben, bevor Sie Quellenangaben dieser Familie benutzen können.";
254c290
< 		$admtext['fevslater'] = "Hinweis: Kinder und zusätzliche Ereignisse können, ebenso wie ereignis-spezifische Notizen und Zitate, auf der folgenden Seite hinzugefügt werden.";
---
> 		$admtext['fevslater'] = "Hinweis: Kinder und zusätzliche Ereignisse können ebenso wie ereignis-spezifische Notizen und Quellenangaben auf der folgenden Seite hinzugefügt werden.";
268d303
< 		$admtext['nobirthinfo'] = "Keine Geburts-Angaben";
304c339
< 		$admtext['personidbefcite'] = "Sie müssen die Personen-Kennung eingeben, bevor Sie ein Zitat dieser Person verwenden können.";
---
> 		$admtext['personidbefcite'] = "Sie müssen die Personen-Kennung eingeben, bevor Sie eine Quellenangabe dieser Person verwenden können.";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Standard<br />-Foto<br />auswählen"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Speichern und neue Eltern anlegen";
> 		$admtext['savenewspouse'] = "Speichern und neuen Ehepartner anlegen";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alternative Geburtsdaten";
354d391
< 		$admtext['enterphotodesc'] = "Beschreibung für dieses Bild eingeben.";
388d424
< 		$admtext['photoowner'] = "Besitzer/Quelle";
417d452
< 		$admtext['imgmap'] = "Verweis-sensitive Graphik (Image Map)";
490d524
< 		$admtext['mapinstr3'] = "Um einen Bereich dieses Bildes mit einer Person zu verknüpfen, wählen Sie den Stammbaum dieser Person aus. Danach erstellen Sie ein Rechteck über den Bereich des Bildes, den sie auswählen möchten. Dazu klicken Sie die obere linke Ecke des auszuwählenden Bereiches an, ziehen dann das Rechteck zur unteren rechten Ecke auf und klicken dort, um das Rechteck zu schließen. Alternativ können Sie den Bereich auch nacheinander zunächst oben links und dann unten rechts anklicken. Ein Popup-Fenster gestattet Ihnen jetzt die Auswahl der zu verknüpfenden Person. Nachdem die Auswahl erfolgt ist, wird ein entsprechender HTML-Code zum nachstehenden Eingabefeld hinzugefügt. Wiederholen Sie diesen Vorgang nach Bedarf für weitere Bereiche des Bildes.";
495d528
< 		$admtext['removelink'] = "Verknüpfung entfernen";
502d534
< 		$admtext['eloptions'] = "Blättern oder Löschen";
509d540
< 		$admtext['nolinks'] = "Noch keine Verknüpfungen im Album";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
546c574
< 		$admtext['linksel'] = "Verlinken mit Auswahl";
---
> 		$admtext['linksel'] = "Ausgewählte Medien mit dieser Person verknüpfen";
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Image-Map (für Abwärts-Kompatibilität)";
> 		$admtext['photoowner'] = "Besitzer des Originals bzw. der Vorlage";
> 		$admtext['nothumb'] = "Kein Thumbnail";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Das Photo konnte nicht hinzugefügt werden. Wahrscheinlich war die Datei zu groß oder es konnte kein Miniaturbild erstellt werden.";
> 		$admtext['moved'] = "Verschoben";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Bitte Titel oder Beschreibung für dieses Medium eingeben.";
> 		$admtext['mapinstr3'] = "Um einen Bereich dieses Photos mit einer Person, einer Familie oder einem anderen Objekt zu verbinden muss zuerst der betreffende Zweig oder Objekt-Typ ausgewählt und dann ein Rechteck um die Bildregion erstellt werden. Dies geschieht mit einem Klick auf die linke obere Ecke und einem Ziehen zur rechten unteren Ecke. Alternativ gebnügt auch ein Klick auf die linke obere Ecke und ein weiterer Klick auf die rechte untere Ecke. In einem Popup kann die Person oder das Objekt ausgewählt werden. Bei Bedarf klann dieser Vorgang für weitere Bereiche wiederholt werden. Mit einem Klick auf einen existierenden Bereich kann der Bereich verschoben oder mit einem Klick auf 'X' gelöscht werden.";
596d633
< 		$admtext['foremptystring'] = "Für leere Zeichenfolge, Feld leer lassen und \"Hinzufügen >>\" klicken.";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Anleitung: Ziehe oder doppelklicke das Objekt links und füge es in die Liste rechts ein. Umsortieren mit aufwärts oder abwärts ziehen. Erneuter Doppelklick um das Objekt zu entfernen.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Für einen leeren String das Feld leer lassen und klicken >>";
651,655d690
< 		$admtext['selectimportfile'] = "Wählen Sie die Datei, die Sie importieren möchten.";
< 		$admtext['importgedcom'] = "GEDCOM-Datei importieren (Standard 5.5-Format)";
< 		$admtext['addreplacedata'] = "Daten hinzufügen oder ersetzen (kann mehrere Minuten dauern, je nach Größe der Datei)";
< 		$admtext['fromyourcomputer'] = "Von Ihrem Rechner";
< 		$admtext['importdata'] = "Daten importieren";
657,660d691
< 		$admtext['replace'] = "Ersetze (in gewähltem Stammbaum)";
< 		$admtext['desttree'] = "Ziel-Stammbaum";
< 		$admtext['selectdesttree'] = "Name des Ziel-Stammbaums eingeben.";
< 		$admtext['selectexisting'] = "Importiere in";
668,673d698
< 		$admtext['ucaselast'] = "Alle Nachnamen in Großbuchstaben umwandeln";
< 		$admtext['norecalc'] = "\"Lebend\"-Kennzeichen nicht neu berechnen";
< 		$admtext['autooffset'] = "Starte Kennungen bei der ersten verfügbaren Nummer";
< 
< 		$admtext['mustselecttree'] = "Sie müssen einen Stammbaum auswählen, bevor Sie diese Option wählen.";
< 		$admtext['importmedia'] = "Medien-Daten importieren, falls vorhanden";
675d699
< 		$admtext['neweronly'] = "Nur ersetzen, wenn neuer";
677,692d700
< 		$admtext['onwebserver'] = "Vom Webserver (aus dem GEDCOM-Verzeichnis)";
< 		$admtext['eventsonly'] = "Nur benutzerdefinierte Ereignistypen importieren (keine Daten werden hinzugefügt, ersetzt oder angefügt)";
< 		$admtext['imphints'] = "Hinweise: Alle vorhandenen Daten bedeutet: alle Personen, Familien, Quellen und Notizen (Medien-Verknüpfungen gehen nicht verloren, solange die Kennungen gleich bleiben). Vergleiche basieren nur auf den Kennungen. Neue Datensätze werden stets hinzugefügt. Beim Hinzufügen werden alle Datensätze mit neuen Kennungen importiert.";
< 		$admtext['allevents'] = "Daten für alle neuen benutzerdefinierten Ereignisse automatisch akzeptieren";
< 		$admtext['destbranch'] = "Ziel-Zweig (optional)";
< 		$admtext['inframe'] = "(in Frame)";
< 		$admtext['getstart'] = "Erste Schritte";
< 		$admtext['importlatlong'] = "Breite/Länge importieren, falls vorhanden";
< 		$admtext['opening'] = "Öffnen";
< 		$admtext['reopen'] = "Erneut öffnen";
< 		$admtext['uploading'] = "Hochladen";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import gestoppt";
< 		$admtext['resume'] = "Fortsetzen";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Protokoll der Änderungen";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Import im alten Stil (ohne Ladebalken)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Diese Upgrade-Anweisungen beenden";
> 		$admtext['upgrade_missing'] = "Die Upgrade-Datei fehlt, wahrscheinlich wurde das Upgrade bereits ausgeführt.";
> 		$admtext['delete_upgrade'] = "Wenn das Upgrade fertig ist, hier klicken um das Upgrade zu entfernen und zum Menü zurückzukehren.";
723d733
< 		$admtext['author'] = "Autor";
737c747
< 		$admtext['addnewcite'] = "Neues Zitat hinzufügen";
---
> 		$admtext['addnewcite'] = "Quellenangabe hinzufügen";
740,744c750,754
< 		$admtext['citedate'] = "Zitat-Datum";
< 		$admtext['modifycite'] = "Zitat bearbeiten";
< 		$admtext['addingcite'] = "Zitat wird gespeichert...";
< 		$admtext['deletingcite'] = "Zitat wird gelöscht...";
< 		$admtext['updatingcite'] = "Zitat wird aktualisiert...";
---
> 		$admtext['citedate'] = "Datum";
> 		$admtext['modifycite'] = "Quellenangabe bearbeiten";
> 		$admtext['addingcite'] = "Quellenangabe wird gespeichert...";
> 		$admtext['deletingcite'] = "Quellenangabe wird gelöscht...";
> 		$admtext['updatingcite'] = "Quellenangabe wird aktualisiert...";
779,781c789,791
< 		$admtext['templatenum'] = "Template Nummer";
< 		$admtext['mainimage'] = "Haupt Bild (Homepage)"; //1, 2, 3, 4, 5, 7
< 		$admtext['titleimage'] = "Titel Bild (Homepage)"; //1, 2, 3
---
> 		$admtext['templatenum'] = "Template-Nummer";
> 		$admtext['mainimage'] = "Hauptbild (Homepage)"; //1, 2, 3, 4, 5, 7
> 		$admtext['titleimage'] = "Titelbild (Homepage)"; //1, 2, 3
783,791c793,801
< 		$admtext['mainpara'] = "Willkommens Absatz";  //1, 4, 6, 7, 8
< 		$admtext['headimgplustitle'] = "Header Bild (inklusive Titel)"; //1
< 		$admtext['pedperson'] = "Stammbaum Personen-Kennung"; //2
< 		$admtext['pedtree'] = "Stammbaum Baum-Kennung"; //2
< 		$admtext['phhistperson'] = "Fotos &amp; Geschichten Personen-Kennung"; //2
< 		$admtext['phhisttree'] = "Fotos &amp; Geschichten Baum-Kennung"; //2
< 		$admtext['headimg'] = "Header Bild"; //2, 3, 4, 5, 6, 8
< 		$admtext['headtitleimg'] = "Header Titel Bild"; //2, 3
< 		$admtext['titleimg'] = "Titel Bild (alle Seiten)"; //4, 7
---
> 		$admtext['mainpara'] = "Begrüßungstext";  //1, 4, 6, 7, 8
> 		$admtext['headimgplustitle'] = "Headerbild (inklusive Titel)"; //1
> 		$admtext['pedperson'] = "Startperson: Personen-Kennung"; //2
> 		$admtext['pedtree'] = "Startperson: Stammbaum"; //2
> 		$admtext['phhistperson'] = "Fotos und Geschichten: Personen-Kennung"; //2
> 		$admtext['phhisttree'] = "Fotos und Geschichten: Stammbaum-Kennung"; //2
> 		$admtext['headimg'] = "Header-Bild"; //2, 3, 4, 5, 6, 8
> 		$admtext['headtitleimg'] = "Titelbild (Header)"; //2, 3
> 		$admtext['titleimg'] = "Titelbild (alle Seiten)"; //4, 7
793,801c803,811
< 		$admtext['fhpara'] = "Familien Geschichten Absatz"; //6
< 		$admtext['fhlinkshis'] = "Familien Geschichten Verknüpfungen (Seine)"; //6
< 		$admtext['fhlinkshers'] = "Familien Geschichten Verknüpfungen (Ihre)"; //6
< 		$admtext['mwpara'] = "Absatz Am häufigsten gesucht"; //6
< 		$admtext['respara'] = "Ressourcen Absatz"; //6
< 		$admtext['reslinks'] = "Ressourcen Links"; //6
< 		$admtext['headtitle1'] = "Header Titel, Teil 1"; //8
< 		$admtext['headtitle2'] = "Header Titel, Teil 2"; //8
< 		$admtext['headtitle3'] = "Header Titel, Teil 3"; //8
---
> 		$admtext['fhpara'] = "Absatz 'Geschichten'"; //6
> 		$admtext['fhlinkshis'] = "Verknüpfungen mit Geschichten (väterliche Seite)"; //6
> 		$admtext['fhlinkshers'] = "Verknüpfungen mit Geschichten (mütterliche Seite)"; //6
> 		$admtext['mwpara'] = "Derzeit besonders gesucht"; //6
> 		$admtext['respara'] = "Verfügbare Quellen und Informationen"; //6
> 		$admtext['reslinks'] = "Links zu wichtigen Quellen und Informationen"; //6
> 		$admtext['headtitle1'] = "Headertitel, Teil 1"; //8
> 		$admtext['headtitle2'] = "Headertitel, Teil 2"; //8
> 		$admtext['headtitle3'] = "Headertitel, Teil 3"; //8
803,830c813,840
< 		$admtext['latestnews'] = "Letzte Neuheiten"; //8
< 		$admtext['momside'] = "Mutter´s Seite Beschriftung"; //8
< 		$admtext['dadside'] = "Vater's Seite Beschriftung"; //8
< 		$admtext['momperson'] = "Mutter's Seite Personen-Kennung"; //8
< 		$admtext['momtree'] = "Mutter's Seite Baum-Kennung"; //8
< 		$admtext['dadperson'] = "Vater's Seite Personen-Kennung"; //8
< 		$admtext['dadtree'] = "Vater's Seite Baum-Kennung"; //8
< 		$admtext['featurethumb1'] = "Merkmal 1 Thumbnail"; //4
< 		$admtext['featurelink1'] = "Merkmal 1 Verknüpfung"; //4
< 		$admtext['featuretitle1'] = "Merkmal 1 Titel"; //4
< 		$admtext['featurepara1'] = "Merkmal 1 Absatz"; //4
< 		$admtext['featurethumb2'] = "Merkmal 2 Thumbnail"; //4
< 		$admtext['featurelink2'] = "Merkmal 2 Verknüpfung"; //4
< 		$admtext['featuretitle2'] = "Merkmal 2 Titel"; //4
< 		$admtext['featurepara2'] = "Merkmal 2 Absatz"; //4
< 		$admtext['featurethumb3'] = "Merkmal 3 Thumbnail"; //4
< 		$admtext['featurelink3'] = "Merkmal 3 Verknüpfung"; //4
< 		$admtext['featuretitle3'] = "Merkmal 3 Titel"; //4
< 		$admtext['featurepara3'] = "Merkmal 3 Absatz"; //4
< 		$admtext['featurethumb4'] = "Merkmal 4 Thumbnail"; //4
< 		$admtext['featurelink4'] = "Merkmal 4 Verknüpfung"; //4
< 		$admtext['featuretitle4'] = "Merkmal 4 Titel"; //4
< 		$admtext['featurepara4'] = "Merkmal 4 Absatz"; //4
< 		$admtext['photocaption'] = "Haupt Bild Beschreibung"; //4
< 		$admtext['maintitle'] = "Haupt Titel"; //5
< 		$admtext['hisside'] = "Seine Seite Beschriftung"; //5
< 		$admtext['herside'] = "Ihre Seite Beschriftung"; //5
< 		$admtext['newstext'] = "Neuheiten Text"; //5
---
> 		$admtext['latestnews'] = "Jüngste Neuigkeiten"; //8
> 		$admtext['momside'] = "Beschriftung für die mütterliche Seite"; //8, 20
> 		$admtext['dadside'] = "Beschriftung für die väterliche Seite"; //8, 20
> 		$admtext['momperson'] = "Personen-Kennung für die mütterliche Seite"; //8, 20
> 		$admtext['momtree'] = "Baum-Kennung für die mütterliche Seite"; //8, 20
> 		$admtext['dadperson'] = "Personen-Kennung für die väterliche Seite"; //8, 20
> 		$admtext['dadtree'] = "Baum-Kennung für die väterliche Seite"; //8, 20
> 		$admtext['featurethumb1'] = "Informationstext 1: Vorschaubild"; //4
> 		$admtext['featurelink1'] = "Informationstext 1: Verknüpfung"; //4
> 		$admtext['featuretitle1'] = "Informationstext 1: Ãœberschrift"; //4
> 		$admtext['featurepara1'] = "Informationstext 1: Text"; //4
> 		$admtext['featurethumb2'] = "Informationstext 2: Vorschaubild"; //4
> 		$admtext['featurelink2'] = "Informationstext 2: Verknüpfung"; //4
> 		$admtext['featuretitle2'] = "Informationstext 2: Ãœberschrift"; //4
> 		$admtext['featurepara2'] = "Informationstext 2: Text"; //4
> 		$admtext['featurethumb3'] = "Informationstext 3: Vorschaubild"; //4
> 		$admtext['featurelink3'] = "Informationstext 3: Verknüpfung"; //4
> 		$admtext['featuretitle3'] = "Informationstext 3: Ãœberschrift"; //4
> 		$admtext['featurepara3'] = "Informationstext 3: Text"; //4
> 		$admtext['featurethumb4'] = "Informationstext 4: Vorschaubild"; //4
> 		$admtext['featurelink4'] = "Informationstext 4: Verknüpfung"; //4
> 		$admtext['featuretitle4'] = "Informationstext 4: Ãœberschrift"; //4
> 		$admtext['featurepara4'] = "Informationstext 4: Text"; //4
> 		$admtext['photocaption'] = "Hauptbild: Beschreibung"; //4
> 		$admtext['maintitle'] = "Haupttitel"; //5
> 		$admtext['hisside'] = "Beschriftung für die väterliche Seite"; //5
> 		$admtext['herside'] = "Beschriftung für die mütterliche Seite"; //5
> 		$admtext['newstext'] = "Text zu Neuigkeiten"; //5
840,841c850,851
< 		$admtext['momsidenames'] = "Mutters Seite Nachnamen"; //8
< 		$admtext['dadsidenames'] = "Vaters Seite Nachnamen"; //8
---
> 		$admtext['momsidenames'] = "Nachnamen der mütterlichen Seite"; //8
> 		$admtext['dadsidenames'] = "Nachnamen der väterlichen Seite"; //8
860,873c870,883
< 		$admtext['featurethumb5'] = "Merkmal 5 Thumbnail"; //15
< 		$admtext['featurelink5'] = "Merkmal 5 Verknüpfung"; //15
< 		$admtext['featuretitle5'] = "Feature 5 title"; //15
< 		$admtext['featurepara5'] = "Merkmal 5 Absatz"; //15
< 		$admtext['featurethumb6'] = "Merkmal 6 Thumbnail"; //15
< 		$admtext['featurelink6'] = "Merkmal 6 Verknüpfung"; //15
< 		$admtext['featuretitle6'] = "Feature 6 title"; //15
< 		$admtext['featurepara6'] = "Merkmal 6 Absatz"; //15
< 		$admtext['featurethumb7'] = "Merkmal 7 Thumbnail"; //15
< 		$admtext['featurelink7'] = "Merkmal 7 Verknüpfung"; //15
< 		$admtext['featurepara7'] = "Merkmal 7 Absatz"; //15
< 		$admtext['featurethumb8'] = "Merkmal 8 Thumbnail"; //15
< 		$admtext['featurelink8'] = "Merkmal 8 Verknüpfung"; //15
< 		$admtext['featurepara8'] = "Merkmal 8 Absatz"; //15
---
> 		$admtext['featurethumb5'] = "Informationstext 5: Vorschaubild"; //15
> 		$admtext['featurelink5'] = "Informationstext 5: Verknüpfung"; //15
> 		$admtext['featuretitle5'] = "Informationstext 5: Ãœberschrift"; //15
> 		$admtext['featurepara5'] = "Informationstext 5: Text"; //15
> 		$admtext['featurethumb6'] = "Informationstext 6: Vorschaubild"; //15
> 		$admtext['featurelink6'] = "Informationstext 6: Verknüpfung"; //15
> 		$admtext['featuretitle6'] = "Informationstext 6: Ãœberschrift"; //15
> 		$admtext['featurepara6'] = "Informationstext 6: Text"; //15
> 		$admtext['featurethumb7'] = "Informationstext 7: Vorschaubild"; //15
> 		$admtext['featurelink7'] = "Informationstext 7: Verknüpfung"; //15
> 		$admtext['featurepara7'] = "Informationstext 7: Text"; //15
> 		$admtext['featurethumb8'] = "Informationstext 8: Vorschaubild"; //15
> 		$admtext['featurelink8'] = "Informationstext 8: Verknüpfung"; //15
> 		$admtext['featurepara8'] = "Informationstext 8: Text"; //15
877,884c887,894
< 		$admtext['texttitle1'] = "Text 1 Titel"; //15
< 		$admtext['textlink1'] = "Text 1 Verknüpfung"; //15
< 		$admtext['textpara1'] = "Text 1 Absatz"; //15
< 		$admtext['texttitle2'] = "Text 2 Titel"; //15
< 		$admtext['textlink2'] = "Text 2 Verknüpfung"; //15
< 		$admtext['textpara2'] = "Text 2 Absatz"; //15
< 		$admtext['texttitle3'] = "Text 3 Titel"; //15
< 		$admtext['textpara3'] = "Text 3 Absatz"; //15
---
> 		$admtext['texttitle1'] = "Informationstext 1: Ãœberschrift"; //15
> 		$admtext['textlink1'] = "Informationstext 1: Verknüpfung"; //15
> 		$admtext['textpara1'] = "Informationstext 1: Text"; //15
> 		$admtext['texttitle2'] = "Informationstext 2: Ãœberschrift"; //15
> 		$admtext['textlink2'] = "Informationstext 2: Verknüpfung"; //15
> 		$admtext['textpara2'] = "Informationstext 2: Absatz"; //15
> 		$admtext['texttitle3'] = "Informationstext 3: Ãœberschrift"; //15
> 		$admtext['textpara3'] = "Informationstext 3: Text"; //15
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Anführungszeichenüberschrift";
> 		$admtext['quotesubhead'] = "untergeordneter Anführungszeichen";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Featurette name";
> 		$admtext['snipinfoone'] = "Featurette erste Zeile";
> 		$admtext['snipinfotwo'] = "Featurette zweite Zeile";
> 		$admtext['snipimage'] = "Featurette Bild";
> 		$admtext['snipperson'] = "ID der Featurette-Person";
> 		$admtext['sniptree'] = "Featurette-Baum-ID";
> 		$admtext['quote'] = "Quote";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Informationstext 7: Ãœberschrift";
> 		$admtext['featuretitle8'] = "Informationstext 8: Ãœberschrift";
> 		$admtext['featuretitle9'] = "Informationstext 9: Ãœberschrift";
> 		$admtext['featurethumb9'] = "Informationstext 9: Vorschaubild"; //15
> 		$admtext['featurelink9'] = "Informationstext 9: Verknüpfung"; //15
> 		$admtext['featurepara9'] = "Informationstext 9: Text"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Bild für den Header, linke Seite";
> 		$admtext['rightimg'] = "Bild für den Header, rechte Seite";
> 		$admtext['photoption'] = "Darstellung von Bildern ('static' oder 'random')";
> 		$admtext['randomphotowidth'] = "Breite der Fotos/Bilder bei zufälliger Anzeige";
> 		$admtext['randomphotoheight'] = "Höhe der Fotos/Bilder bei zufälliger Anzeige";
> 		$admtext['randomphotomediatypeID'] = "Verzeichnis für die zufällige Anzeige von Fotos/Bildern";
> 		$admtext['momheading'] = "Überschrift für die mütterliche Seite der Familie";
> 		$admtext['mompara'] = "Abschnitt für die mütterliche Seite der Familie";
> 		$admtext['mompagelink'] = "Link zur mütterlichen Seite der Familie";
> 		$admtext['dadheading'] = "Überschrift für die väterliche Seite der Familie";
> 		$admtext['dadpara'] = "Abschnitt für die väterliche Seite der Familie";
> 		$admtext['dadpagelink'] = "Link zur väterlichen Seite der Familie";
> 		$admtext['spmomheading'] = "Überschrift für die mütterliche Seite des Ehepartners";
> 		$admtext['spmompara'] = "Abschnitt für die mütterliche Seite des Ehepartners";
> 		$admtext['spmompagelink'] = "Link zur mütterlichen Seite der Familie des Ehepartners";
> 		$admtext['spmomside'] = "Kennzeichnung für die mütterliche Seite des Ehepartners";
> 		$admtext['spdadside'] = "Kennzeichnung für die väterliche Seite des Ehepartners";
> 		$admtext['spmomperson'] = "Kennung für die mütterliche Seite des Ehepartners";
> 		$admtext['spmomtree'] = "Kennung des Stammbaums für die mütterliche Seite des Ehepartners";
> 		$admtext['spdadheading'] = "Überschrift für die väterliche Seite des Ehepartners";
> 		$admtext['spdadpara'] = "Abschnitt für die väterliche Seite des Ehepartners";
> 		$admtext['spdadpagelink'] = "Link zur väterlichen Seite des Ehepartners";
> 		$admtext['spdadperson'] = "Kennung für die väterliche Seite des Ehepartners";
> 		$admtext['spdadtree'] = "Kennung des Stammbaums für die väterliche Seite des Ehepartners";
> 		$admtext['storiesheading'] = "Unsere Familiengeschichte";
> 		$admtext['nbrsurnames'] = "Anzahl der Familiennamen in der Namen-Wolke";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Informationstext Vorschaubild";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG benötigt 5.3 oder höher.)";
---
> 		$admtext['phpreq'] = "(TNG benötigt 7.0 oder höher.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Präfixe beim Import an die TNG-Einstellungen anpassen";
> 		$admtext['sortevents'] = "Ereignisse sortieren nach";
> 		$admtext['sortbydate'] = "Ereignisdatum";
> 		$admtext['sortbytype'] = "Ereignistyp";
> 		$admtext['allowsuggest'] = "Änderungsvorschläge von Besuchern zulassen";
> 		$admtext['livingchecked'] = "Neue Personen und Familien als lebend kennzeichnen";
> 		$admtext['maxmarried'] = "Familien als lebend kennzeichnen, wenn weniger als so viele Jahre verheiratet";
> 		$admtext['imagetags'] = "Rechtecke";
> 		$admtext['allowcsv'] = "Download von Reports im CSV-Format zulassen";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup Optionen";
> 		$admtext['dosql'] = "als SQL exportieren";
> 		$admtext['dodrop'] = "DROP TABLE einfügen, falls bereits existiert";
> 		$admtext['docreate'] = "CREATE TABLE einfügen";
> 		$admtext['onrestore'] = "Wiederherstellungs-Optionen";
> 		$admtext['dodel'] = "Zuerst bisherigen Inhalt entfernen";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternative Geburts-Ereignisse";
> 		$admtext['dtformat'] = "Tabellen Format";
> 		$admtext['conchart'] = "Verbindungs-Grafik";
> 		$admtext['maxropt'] = "Max Anzahl von Verbindungssuche-Durchläufen";
> 		$admtext['maxlopt'] = "Max Länge der Verbindungs-Pfade";
> 		$admtext['showtxtopt'] = "Pfad-Anweisung als Text anzeigen";
> 		$admtext['compactboxopt'] = "Zeige Personen-Kästchen in kompakter Form";
> 		$admtext['sortbyopt'] = "Pfade sortieren nach";
> 		$admtext['anchoridopt'] = "Anker-ID";
> 		$admtext['maxmopt'] = "Max Eheschließungen pro Verbindung";
> 		$admtext['saveincfg'] = "Im Konfigurations-Verzeichnis speichern (siehe Allgemeine Einstellungenm)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kann nicht geocodiert werden";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "nicht georeferenzieren";
1436d1549
< 		$admtext['backtosecondary'] = "Zurück zu zusätzlichen Aktionen";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Zurück zu den Post-Import Werkzeugen";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Notizen ausschließen";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Media-Dateien komprimieren (ZIP) und einfügen";
> 		$admtext['downloadzip'] = "ZIP herunterladen";
1570,1571c1688,1689
< 		$admtext['allow_admin'] = "Zugriff auf alle System-Einstellungen und Verwaltungsfunktionen erlauben, und obige Rechte auf alle Stammbäume und Zweige anwenden.";
< 		$admtext['limitedrights'] = "Beschränke die obigen Rechte auf Folgendes:";
---
> 		$admtext['allow_admin'] = "Die vorstehenden Einstellungen auf alle Stammbäume und Zweige anwenden.";
> 		$admtext['limitedrights'] = "Beschränke die obigen Rechte auf folgenden Stammbaum:";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Nur deaktivierte Nutzeraccounts anzeigen";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Auch an Admins schicken, wenn ein einzelner Zweig ausgewählt ist";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1661c1780
< 		$admtext['dvblurb'] = "Mögliche Probleme in Ihren Daten finden.";
---
> 		$admtext['dvblurb'] = "Mögliche Probleme/Unstimmigkeiten in der Datenbank suchen.";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alle Mods";
> 		$admtext['installedmods'] = "Nur installierte Mods";
> 		$admtext['partinstmods'] = "Installierte + teilweise installierte Mods";
> 		$admtext['showanalyzeractions'] = "Aktionen im Mod Analyzer anzeigen";
> 		$admtext['badchar'] = "unzulässiges Zeichen";
1886d2008
< 		$admtext['test_number'] = "Testnummer";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testnummer / Name";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Test vertraulich halten";
> 		$admtext['multivalues'] = "Mehrfachwerte durch Bindestrich trennen";
> 		$admtext['changestogroup'] = "Änderungen an der DNA-Gruppe";
> 		$admtext['modifydnagroup'] = "EBearbeitung einer vorhandenen DNA-Gruppe";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Verbinde diesen DNA Test mit einer Person";
1965d2095
< $admtext['otherevents'] = "Andere Ereignisse";
2050,2051d2179
< $admtext['savereturn'] = "Zurück zu dieser Seite";
< $admtext['saveback'] = "Zurück zum Menü";
2058,2059d2185
< $admtext['secondary'] = "Zusätzliche Aktionen";
< $admtext['commas'] = "Mehrere Eingaben mit Kommata trennen";
2120c2246
< $admtext['datamaint'] = "Daten importieren/exportieren";
---
> $admtext['datamaint'] = "Daten importieren / exportieren";
2129,2130d2254
< $admtext['secondarymaint'] = "Zusätzliche Aktionen";
< $admtext['customeventtypes'] = "Benutzerdefinierte Ereignisse";
2138c2262
< $admtext['mswitch'] = "Auswahl vertauschen";
---
> $admtext['mswitch'] = "Datensätze vertauschen";
2177c2301
< $admtext['confdeletecite'] = "Sind Sie sicher, dass Sie dieses Zitat löschen möchten?";
---
> $admtext['confdeletecite'] = "Sind Sie sicher, dass Sie diese Quellenangabe löschen möchten?";
2181c2305
< $admtext['citations'] = "Zitate";
---
> $admtext['citations'] = "Quellenangaben";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Typ";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2300c2415
< //added in 12.0.0
---
> ///added in 12.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Familienname";
> $admtext['subhead'] = "Untertitel";
> $admtext['image'] = "Bild";
> $admtext['author'] = "Autor";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Erste Schritte";
> $admtext['showlog'] = "Protokoll der Änderungen";
> $admtext['nobirthinfo'] = "Keine Geburts-Angaben";
> //changed in 13.0
> $admtext['savereturn'] = "Speichern";
> $admtext['saveback'] = "Speichern und zurück";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alle Elemente wurden erfolgreich gelöscht";
> $admtext['private'] = "privat";
> $admtext['imgtags'] = "Beschriftungen der Bilder";
> 
> $admtext['removelink'] = "Verknüpfung entfernen";
> $admtext['eloptions'] = "Blättern oder Löschen";
> $admtext['pleaseenter'] = "Bitte eingeben ";
> 
> $admtext['nolinks'] = "Noch keine Verknüpfungen im Album";
> $admtext['nogeocode'] = "Kann nicht geocodiert werden";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Standard<br />-Foto<br />auswählen"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Ereignis / Attribute Typen";
> $admtext['secondary'] = "Post-Import Werkzeuge";
> $admtext['otherevents'] = "Andere Ereignisse / Attribute";
> //added in 14.0
> $admtext['newlinks'] = "erstellte Links";
> $admtext['newcemlinks'] = "Links zum Friedhof erstellt";
> $admtext['utility'] = "Werkzeug";
> $admtext['linktype'] = "Typ";
> $admtext['move'] = "Verschieben";
> $admtext['copy'] = "Kopieren";
> $admtext['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/German-UTF8/alltext.php TNG1403/languages/German-UTF8/alltext.php
52c52
< $text['newpass'] = "Ihr neues, temporäres Passwort";
---
> $text['newpass'] = "Ihr neues temporäres Passwort";
54c54
< $text['pwdsent'] = "Ihr neues, temporäres Passwort wurde an Ihre E-Mail-Adresse gesendet.";
---
> $text['pwdsent'] = "Ihr neues temporäres Passwort wurde an Ihre E-Mail-Adresse gesendet.";
57c57
< $text['logininfo'] = "Ihre Anmelde-Informationen";
---
> $text['logininfo'] = "Ihre Anmeldedaten";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Ein Fehler ist in TNG aufgetreten. Ursache kann das Setup, ein unvollständiges Upgrade oder ein Programmfehler sein. Wenn Sie der Webseitenbetreiber sind, kontaktieren Sie den TNG-Support, um Hilfe zu erhalten. Bitte kopieren Sie die untenstehende Meldung in Ihre Nachricht.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test-Nummer/Bezeichnung";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test-Nr.";
> $admtext['match_date'] = "Datum des Matchs";
> $admtext['gedmatchID'] = "GEDmatch-Nummer";
> $admtext['ydna_haplogroup'] = "Haplogruppe der Y-DNA";
> $admtext['mtdna_haplogroup'] = "Haplogruppe der mtDNA";
> $admtext['relationship_section'] = "Verwandtschaft";
> $admtext['relationship_range'] = "Mögliche Verwandtschaft";
> $admtext['suggested_relationship'] = "Vermutete Verwandtschaft";
> $admtext['actual_relationship'] = "Tatsächliche Verwandtschaft";
> $admtext['related_side'] = "Verwandter Zweig";
> $admtext['shared_dna'] = "Gemeinsame DNA";
> $admtext['shared centimorgans'] = "Gemeinsame DNA in cM";
> $admtext['shared_segments'] = "Gemeinsame Segmente";
> $admtext['largest_segment'] = "Größtes Segment";
> $admtext['chromosome'] = "Chromosom";
> $admtext['segment_start'] = "Beginn";
> $admtext['segment_end'] = "Ende";
> $admtext['centiMorgans'] = "cM";
> $admtext['matchingSNPs'] = "Anzahl der SNP";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Test vertraulich halten";
> $text['shared_dna'] = "Gemeinsames DNA-Segment";
> $text['for_match'] = "für diesen Match";
> $admtext['keeptest'] = "Test vertraulich";
> $admtext['keepname'] = "Name vertraulich";
> $admtext['allgroups'] = "Alle Gruppen";
> $admtext['alltypes'] = "Alle Testtypen";
> $admtext['generation_num'] = "Familiennamen eintragen (Anzahl der Generationen)";
> 
> $text['birthabbr'] = "geb.";
> $text['chrabbr'] = "get.";
> $text['deathabbr'] = "gest.";  //from descend
> $text['burialabbr'] = "begr.";  //from descend
> $text['marrabbr'] = "verh.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Suche alle Personen mit Ereignissen an diesem Ort";
> $text['firstpage'] = "Erste Seite";
> $text['lastpage'] = "Letzte Seite";
> 
> //changed in 13.0.0
> $text['problem'] = "In TNG ist ein Fehler aufgetreten. <p>Falls Sie ein Update installiert haben, haben Sie möglicherweise einen Teil der Anleitung übersprungen. Bitte rufen Sie die Datei 'Readme' erneut auf und achten Sie besonders auf die Hinweise zur Anpassung der Datenbankstruktur.</p><p>Wenn Sie TNG zum ersten Mal installiert haben, müssen Sie möglicherweise noch die Datenbank anlegen. Bitte rufen Sie die Datei readme.html erneut auf.</p><p>Wenn Sie der Eigentümer der Internet-Site sind, möchten Sie vielleicht den Support für TNG kontaktieren. Bitte kopieren Sie die untenstehende Meldung und fügen Sie sie in eine E-Mail ein.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Kein Zweig";
> 
> //added in 14.0
> $text['oneyear'] = "Jahr";
> $text['pwdcodelink'] = "Auf diesen Link klicken, damit Dir ein temporäres Passwort geschickt wird";
> $text['pwdcodesent'] = "Ein Link, um das Passwort zurückzusetzen, wurde an Deine Email-Adresse geschickt.";
> $text['moved'] = "Verschoben";
> $text['citation'] = "Zitat";
> $text['other'] = "Anders";
> $text['death'] = "Tod";
> $text['burial'] = "Beerdigung";
> $text['cremation'] = "Einäscherung";
> $text['marriage'] = "Eheschließung";
> $text['divorce'] = "Scheidung";
> $text['bylength'] = "Schritte";
> $text['bymarriages'] = "Eheschließungen";
> $text['none'] = "Kein";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Quelle";
> $text['repository'] = "Aufbewahrungsort";
> $text['place'] = "Ort";
> $admtext['BAPM'] = "Taufe";
> 
> $text['glang'] = "de";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/German-UTF8/data_protection_policy.php TNG1403/languages/German-UTF8/data_protection_policy.php
0a1
> <!-- Version V12.0.1-01DE translated on June 12, 2018 -->
2,42c3,6
< 
< <h3>Datenschutzerklärung</h3>
< <p>Diese Website ist eine private Genealogiewebsite. Die Rechtmäßigkeit der Datenverarbeitung beim Aufruf und der Benutzung dieser Website ergibt sich aus Kap. 2, Art. 6, Lit. a (Einwilligung) oder Lit. f (berechtigtes Interesse) der DSGVO.</p>
< 
< <p>Die Betreiber dieser Website nehmen den Schutz Ihrer persönlichen Daten sehr ernst. Wir behandeln Ihre personenbezogenen Daten vertraulich und entsprechend den gesetzlichen Bestimmungen. Ihre Daten werden nicht an Dritte weitergegeben oder mit anderen Daten zusammengeführt.
< Sollten Sie  Fragen bzw. Beschwerden zu einem von der Datenschutzerklärung berührten Thema haben, kontaktieren Sie uns bitte über die im Impressum angegebene Adresse. Unabhängig davon weisen wir auf das Beschwerderecht bei der zuständigen Aufsichtsbehörde hin.
< 
< <h3>Verantwortlich für diese Website</h3>
< 
< <p>Siehe Impressum.</p>
< <p>Für den Inhalt der Datenschutzerklärung ist ausschließlich der Betreiber der Website verantwortlich.
< 
< <h3>Direkt personenbezogene Daten</h3>
< 
< <p>Im Zusammenhang mit der Beantragung und Einrichtung einer Benutzerkennung zur Benutzung dieser Website werden folgende Daten gespeichert: die von Ihnen eingegebenen Daten (v.a. Name, Benutzername, E-Mail-Adresse, Passwort) und Ihre Zustimmung zur Datenschutzerklärung / Datenverarbeitung.
< 
< <p>Ihre Angaben aus dem Anfrageformular einschließlich Kontaktdaten werden gespeichert, um die Anfrage bearbeiten zu können. Danach werden nicht mehr erforderliche Daten gelöscht.</p>
< 
< <h3>Zugriffsdaten und Logfiles</h3>
< 
< <p>Der Internetprovider dieser Website erstellt automatisiert Logfiles, in denen folgende Angaben gespeichert werden:</p>
< 	<ul>
< 		<li>Browser (Typ und Version)</li>
< 		<li>Betriebssystem</li>
< 		<li>Referrer-URL</li>
< 		<li>Hostname der Computers, mit dem die Website aufgerufen wird</li>
< 		<li>IP-Adresse</li>
< 		<li>Zeitpunkt des Zugriffs</li>
< 		<li>übertragene Datenmenge</li>
< 	</ul>
< <p>Diese Daten geben keinen direkten Aufschluss über Ihre Identität. Die Betreiber dieser Website werden diese Daten nicht mit Daten aus anderen Quellen zusammenführen. Bei Anhaltspunkten für eine rechtswidrige Nutzung behalten wir uns eine Datenprüfung vor.</p>
< 
< <p>In Logfiles des Programms TNG werden zusätzlich folgende Daten gespeichert:</p>
< 	<ul>
< 		<li>Zeitpunkt des Zugriffs</li>
< 		<li>Benutzername</li>
< 		<li>aufgerufene TNG-Seite</li>
< 		<li>IP-Adresse</li>
< 	</ul>
< <p>Die Speicherung erfolgt aus dem berechtigten Interesse, den allgemeinen Betrieb der Webseite, die Sicherheit der Daten und die technische Sicherheit zu gewährleisten.</p>
< 
---
> <h3>Datenschutz</h3>
> <p>Die Betreiber dieser Seiten nehmen den Schutz Ihrer persönlichen Daten sehr ernst. Wir behandeln Ihre personenbezogenen Daten vertraulich und entsprechend der gesetzlichen Datenschutzbestimmungen und dieser Datenschutzerklärung.</p>
> <p>Die Nutzung unserer Website ist ohne Angabe personenbezogener Daten möglich. Wenn personenbezogene Daten erhoben werden (z. B. Name und E-Mail-Adresse im Kontaktformular), werden diese freiwillig angegeben. Diese Daten werden nicht an Dritte weitergegeben.</p>
> <p>Wir weisen darauf hin, dass das Versenden von Informationen im Internet Sicherheitslücken aufweisen kann. Ein lückenloser Schutz der Daten vor dem Zugriff durch Dritte ist nicht möglich.</p>
44,72c8,25
< 
< <p>Diese Website verwendet Cookies. Cookies sind kleine Textdateien, die auf Ihrem Endgerät gespeichert werden und dazu dienen, bestimmte Eingaben (etwa den Benutzernamen) und Einstellungen (z. B. Sprache, Schriftgröße, Bildschirmgröße, Mobil- oder Desktopansicht) über einen bestimmten Zeitraum zu speichern, so dass Sie die entsprechenden Einstellungen nicht jedes Mal selbst vornehmen müssen.</p>
< 
< <p>Sie können Ihren Internetbrowser so konfigurieren, dass Sie über die Speicherung von Cookies informiert werden und/oder Cookies nur in bestimmten Fällen zulassen. Das Deaktivieren von Cookies kann die Funktionalität dieser Website einschränken.</p>
< <p>Diese Website verwendet nur eigene Cookies (first party cookies) und keine Cookies von Drittanbietern (third party cookies). Die Cookies werden teilweise für die Dauer des Besuchs gespeichert (session cookies), teilweise für einen längeren Zeitraum (maximal ein Jahr).</p>
< 
< <h3>Einbindung von Inhalten und Diensten Dritter</h3>
< 
< <p>TNG verwendet mehrere Google-Dienste:
< 	<ul>
< 		<li>Google Maps: Der Google-Kartendienst ist in TNG auf jeder Seite aktiv.</li>
< 		<li>Google Recaptcha: Dieses Spamschutztool ist notwendig für den Zugriff auf TNG.</li>
< 		<li>Google Fonts: TNG verwendet je nach Einstellung Schriftarten von "Google Fonts".</li>
< 	</ul>
< <p> Der Anbieter dieser Dienste ist Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA (<a href="https://www.google.com/policies/privacy/">Datenschutzerklärung</a>). Infolge der Einbindung dieser Dienste werden beim Aufruf dieser Website Ihre IP-Adresse und die URL der besuchten TNG-Seite zu Google übertragen und werden auch außerhalb der EU gespeichert. Durch die Nutzung von TNG auf dieser Website erklären Sie sich mit der Nutzung der automatisiert erhobenen Daten durch Google Inc gemäß den Nutzungsbedingungen des jeweiligen Google-Dienstes einverstanden.</p>
< 
< <p>Außerdem werden externe Skripte von jQuery oder Ajax verwendet, die bei Google oder der jQuery Foundation gehostet sind.</p>
< 
< <h3>Rechte des Nutzers: Auskunft, Berichtigung und Löschung</h3>
< 
< <p>Sie haben das Recht auf unentgeltliche und unverzügliche Auskunft über die Sie betreffenden gespeicherten personenbezogenen Daten sowie ein Recht auf Berichtigung, Sperrung oder Löschung dieser Daten. Wenden Sie sich an den <a href="suggest.php">Betreiber der Website</a>.</p>
< 
< <h3>Datenverarbeitung innerhalb der genealogischen Datenbank</h3>
< 
< <p>Nach <a href="https://dsgvo-gesetz.de/erwaegungsgruende/nr-160/">Erwägungsgrund 160</a> ist die DSGVO auf historische und genealogische Forschungen anzuwenden, soweit die Daten Lebender betroffen sind.</p>
< 
< <p>Die Daten Lebender sind in dieser genealogischen Datenbank nur enthalten und ggf. zugänglich, wenn die entsprechenden Voraussetzung gemäß Kap. 2, Art. 6, Lit. a (Einwilligung) oder Lit. f (berechtigtes Interesse) der DSGVO erfüllt sind.</p>
< 
< <p>Auch hier gilt für den jeweils Betroffenen das Recht auf Auskunft, Berichtigung, Sperrung und Löschung dieser Daten.</p>
\ No newline at end of file
---
> <p>Diese Website verwendet Cookies. Cookies schaden Ihrem Computer nicht und enthalten keine Viren. Cookies übernehmen wichtige Funktionen beim Betrieb dieser Site. Cookies sind kleine Textdateien, die von Ihrem Browser auf Ihrem Computer gespeichert werden.</p>
> <p>Die meisten der von uns verwendeten Cookies sind "Session-Cookies". Sie werden automatisch gelöscht, wenn Sie Ihren Browser schließen. Andere Cookies bleiben auf Ihrem Gerät gespeichert, bis Sie sie löschen. Diese Cookies ermöglichen es uns, Ihren Browser beim nächsten Besuch wiederzuerkennen und einige Ihrer Präferenzen wiederherzustellen (z. B. Ihre bevorzugte Sprache).</p>
> <p>Sie können Ihre Browsereinstellungen so konfigurieren, dass Sie über das Setzen von Cookies informiert werden und Cookies nur in bestimmten Fällen zulassen. Das Deaktivieren von Cookies kann die Funktionalität dieser Website einschränken.</p>
> <h3>Serverprotokolldateien</h3>
> <p>Der Provider dieser Seiten erhebt und speichert automatisch Informationen in Server Log Files, die Ihr Browser an uns übermittelt. Diese sind:</p>
> <ul>
> 	<li>Browsertyp und -version</li>
> 	<li>Betriebssystem</li>
> 	<li>Referrer URL</li>
> 	<li>Hostname des zugreifenden Computers</li>
> 	<li>IP-Adresse (anonymisiert)</li>
> 	<li>Zeitpunkt der Anfrage</li>
> </ul>
> <p>Diese Daten können nicht bestimmten Personen zugeordnet werden. Diese Daten werden nicht mit anderen Datenquellen zusammengeführt. Wir behalten uns vor, diese Daten nachträglich zu überprüfen, wenn uns konkrete Anhaltspunkte für eine rechtswidrige Nutzung bekannt werden.</p>
> <h3>Kontaktformular</h3>
> <p>Wenn Sie uns über das Kontaktformular Anfragen senden, werden Ihre Angaben aus dem Anfrageformular einschließlich der von Ihnen dort angegebenen Kontaktdaten gespeichert, um die Anfrage und Folgefragen bearbeiten zu können. Selbstverständlich werden wir diese Daten nicht weitergeben.</p>
> <h3>Recht auf Auskunft, Löschung, Sperrung</h3>
> <p>Sie haben jederzeit das Recht auf Auskunft über Ihre gespeicherten personenbezogenen Daten, deren Herkunft und Empfänger und den Zweck der weiteren Verarbeitung und Übermittlung sowie ein Recht auf Berichtigung, Sperrung oder Löschung dieser Daten. Für weitere Informationen zu personenbezogenen Daten können Sie uns jederzeit <a href="suggest.php">kontaktieren</a></p>.
diff -r TNG/languages/German-UTF8/text.php TNG1403/languages/German-UTF8/text.php
66c66
< 		$text['received'] = "Ihre Anmerkung wurde zur Überprüfung an den Verwalter dieser Website gesendet.";
---
> 		$text['received'] = "Ihre Anmerkung wurde zur Überprüfung an den Betreuer dieser Website gesendet.";
69d68
< 		$text['general'] = "Allgemein";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "Die zwei Personen sind identisch.";
---
> 		$text['sameperson'] = "Die beiden Individuen sind dieselbe Person.";
93c93
< 		$text['sometimes'] = " (Eine unterschiedliche Anzahl der zu berücksichtigenden Generationen kann manchmal zu unterschiedlichen Ergebnissen führen.)";
---
> 		$text['sometimes'] = "(Manchmal ergibt eine andere Anzahl von Generationen ein anderes Ergebnis.)";
144c144
< 		$text['dospouses2'] = "Auch Beziehungen über Partner anzeigen";
---
> 		$text['dospouses2'] = "Zeige Ehepartner";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Nach Verbindungen suchen";
> 		$text['findrel2'] = "Suche Verwandtschaft und andere Verbindungen";
> 		$text['makeme2nd'] = "Verwende meine ID";
> 		$text['usebookmarks'] = "verwende Favoriten";
> 		$text['select2inds'] = "Bitte zwei Personen auswählen.";
> 		$text['indinfofor'] = "Personeninformation zu";
> 		$text['nobookmarks'] = "Es gibt keinen Favoriteneintrag";
> 		$text['bkmtitle'] = "Mehrere Personen in Favoriten gefunden";
> 		$text['bkminfo'] = "Wähle eine Person aus:";
> 		$text['sortpathsby'] = "Pfade sortieren nach Anzahl von";
> 		$text['sortbyshort'] = "Sortieren nach";
> 		$text['bylengthshort'] = "Länge";
> 		$text['badID1'] = ": Falsche ID für person1 - bitte zurückgehen und korrigieren";
> 		$text['badID2'] = ": Falsche ID für person2 - bitte zurückgehen und korrigieren";
> 		$text['notintree'] = ": Die Person mit dieser ID ist nicht im aktuellen Zweig.";
> 		$text['sameperson'] = "Die beiden Individuen sind dieselbe Person.";;
> 		$text['nopaths'] = "Diese Personen haben keine Verbindung.";
> 		$text['nopaths1'] = "Keine weiteren Verbindungen kürzer als xxx";
> 		$text['nopaths2'] = "in xxx Suchschritten";
> 		$text['longestpath'] = "(Der bis jetzt längste überprüfte Pfad war xxx Schritte lang)";
> 		$text['relevantpaths'] = "Anzahl gefundener relevanten Pfade: xxx";
> 		$text['skipMarr'] = "(zusätzlich, Anzahl gefundener aber wegen zu vieler Heiraten nicht dargestellter Pfade: xxx)";
> 		$text['mjaor'] = "oder";
> 		$text['connectionsto'] = "Verbindungen zu ";
> 		$text['findanotherpers'] = "Suche eine andere Person...";
> 		$text['sometimes'] = "(Manchmal ergibt eine andere Anzahl von Generationen ein anderes Ergebnis.)";
> 		$text['anotherpath'] = "Suche nach anderen Verbindungen";
> 		$text['xpath'] = "Pfad ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Eltern";
> 		$text['mhfather'] = "sein Vater";
> 		$text['mhmother'] = "seine Mutter";
> 		$text['mhhusband'] = "sein Ehemann";
> 		$text['mhwife'] = "seine Ehefrau";
> 		$text['mhson'] = "sein Sohn";
> 		$text['mhdaughter'] = "seine Tochter";
> 		$text['fhfather'] = "ihr Vater";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "ihr Ehemann";
> 		$text['fhwife'] = "ihre Ehefrau";
> 		$text['fhson'] = "ihr Sohn";
> 		$text['fhdaughter'] = "ihre Tochter";
> 		$text['hfather'] = "Vater";
> 		$text['hmother'] = "Mutter";
> 		$text['hhusband'] = "Ehemann";
> 		$text['hwife'] = "Ehefrau";
> 		$text['hson'] = "Sohn";
> 		$text['hdaughter'] = "Tochter";
> 		$text['maxruns'] = "Max. Anzahl Pfade zur Überprüfung";
> 		$text['maxrshort'] = "Max. Anzahl Pfade";
> 		$text['maxlength'] = "Verbindungspfade nicht länger als";
> 		$text['maxlshort'] = "Max. Länge";
> 		$text['xstep'] = "Schritt";
> 		$text['xsteps'] = "Schritte";
> 		$text['xmarriages'] = "xxx Eheschließungen";
> 		$text['xmarriage'] = "1 Eheschließung";
> 		$text['showspouses'] = "Zeige beide Ehepartner";
> 		$text['showTxt'] = "Zeige die Pfadbeschreibung als Text";
> 		$text['showTxtshort'] = "Beschreibungstext.";
> 		$text['compactBox'] = "Zeige Personen-Kästchen in kompakter Form";
> 		$text['compactBoxshort'] = "Kompakte Kästchen";
> 		$text['paths'] = "Pfade";
> 		$text['dospouses2'] = "Zeige Ehepartner";
> 		$text['maxmopt'] = "Max. Anzahl Eheschließungen pro Verbindung";
> 		$text['maxm'] = "Max. Anzahl Eheschließungen";
> 		$text['arerelated'] = "Diese Personen sind Verwandte - Ihre Beziehung ist in Pfad 1 dargestellt";
> 		$text['simplerel'] = "Einfache Verwandtschaftssuche";
196d264
< 		$text['scrollnote'] = "Hinweis: Evtl. müssen Sie nach unten oder nach rechts scrollen, um alles sehen zu können.";
199d266
< 		$text['popupnote2'] = " = neuen Stammbaum zeigen";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabellen";
> 		$text['dtchildren'] = "Kinder";
> 		$text['dtgrandchildren'] = "Enkel";
> 		$text['dtggrandchildren'] = "Urenkel";
> 		$text['dtgggrandchildren'] = "Urenkel"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Keine Nachkommen";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Gesamt";
> 		$text['dtselect'] = "Auswahl";
> 		$text['dteachfulltable'] = "Jede volle Tabelle wird";
> 		$text['dtrows'] = "Zeilen";
> 		$text['dtdisplayingtable'] = "Tabellendarstellung";
> 		$text['dtgototable'] = "Gehe zur Tabelle:";
> 		$text['fcinstrdn'] = "Zeige Familie mit Ehepartner";
> 		$text['fcinstrup'] = "Zeige Familie mit Eltern";
> 		$text['fcinstrplus'] = "Wähle andere Ehepartner";
> 		$text['fcinstrfam'] = "Wähle andere Eltern";
381,383c467
< 		$text['firstpage'] = "Erste Seite";
< 		$text['lastpage'] = "Letzte Seite";
< 		$text['photoowner'] = "Besitzer/Quelle";
---
> 		$text['photoowner'] = "Besitzer des Originals bzw. der Vorlage";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Beschriftungen ein-/ausschalten";
535c621
< 		$text['success'] = "Vielen Dank. Wir haben Ihre Registrierung empfangen. Wir werden Kontakt mit Ihnen aufnehmen, wenn Ihre Benutzerkennung freigeschaltet worden ist oder wenn wir weitere Angaben benötigen.";
---
> 		$text['success'] = "Vielen Dank. Ich habe Ihre Anmeldung erhalten. Ich werde Sie nach Freischaltung Ihrer Benutzerkennung kontaktieren.";
542c628
< 		$text['rempass'] = "Auf diesem Rechner angemeldet bleiben";
---
> 		$text['rempass'] = "Auf diesem Gerät angemeldet bleiben";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Neues Passwort wiederholen";
> 		$text['resetsuccess'] = "Erfolg: Das Passwort wurde zurückgesetzt";
> 		$text['resetfail'] = "Fehler: Passwort wurde nicht zurückgesetzt";
> 		$text['failreason0'] = " (unbekannter Datenbankfehler)";
> 		$text['failreason2'] = " (Du hast keine Berechtigung das Passwort zu ändern)";
> 		$text['failreason3'] = " (Passworte sind unterschiedlich)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Gesamtzahl Quellen-Zitate";
618d710
< 		$text['loginfirst'] = "Sie müssen sich zuerst anmelden.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Es gibt bereits Nutzereinträge. Um fortzufahren, müssen Sie sich erst einloggen oder alle Einträge aus der Nutzer-Tabelle entfernen.";
629,630d722
< 		$text['zoomin'] = "Vergrößern";
< 		$text['zoomout'] = "Verkleinern";
656d747
< 		$text['dna_info_head'] = "Informationen zu DNA-Tests";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Vergleiche ausgewählte mtDNA-Tests";
> 		$text['dnatestscompare_atdna'] = "Vergleiche ausgewählte atDNA-Tests";
> 		$text['chromosome'] = "Chr.";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNP";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref.";
> 		$text['extra_mutations'] = "Zusätzliche Mutationen";
> 		$text['mrca'] = "Nächster gem. Vorfahre";
> 		$text['ydna_test'] = "Tests der Y-DNA";
> 		$text['mtdna_test'] = "Tests der mtDNA";
> 		$text['atdna_test'] = "Tests der atDNA";
> 		$text['segment_start'] = "Beginn";
> 		$text['segment_end'] = "Ende";
> 		$text['suggested_relationship'] = "Vermutet";
> 		$text['actual_relationship'] = "Tatsächlich";
> 		$text['12markers'] = "Marker 1-12";
> 		$text['25markers'] = "Marker 13-25";
> 		$text['37markers'] = "Marker 26-37";
> 		$text['67markers'] = "Marker 38-67";
> 		$text['111markers'] = "Marker 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Für einen Vergleich müssen mindestens zwei Tests ausgewählt werden.";
670,671d785
< $text['birthabbr'] = "geb.";
< $text['chrabbr'] = "get.";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "gest.";  //from descend
706d817
< $text['burialabbr'] = "begr.";  //from descend
712d822
< $text['place'] = "Ort";
715d824
< $text['marrabbr'] = "verh.";
738d846
< $text['source'] = "Quelle";
766d873
< $text['repository'] = "Aufbewahrungsort";
768c875
< $text['suggest'] = "Anmerkung";
---
> $text['suggest'] = "Änderungsvorschlag";
770d876
< $text['findplaces'] = "Suche alle Personen mit Ereignissen an diesem Ort";
778c884
< $text['databasestatistics'] = "Datenbankstatistiken"; //needed to be shorter to fit on menu
---
> $text['databasestatistics'] = "Statistiken"; //needed to be shorter to fit on menu
804d909
< $text['glang'] = "&amp;hl=de";
816d920
< $text['none'] = "Keine";
924d1027
< $text['otherevents'] = "Weitere Ereignisse";
952,953d1054
< $text['people_have'] = "Personen sind durch einen DNA-Test verbunden mit";
< $text['person_has'] = "Person ist durch einen DNA-Test verbunden mit";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA-Tests sind verbunden mit";
> $text['testislinked'] = "DNA-Test ist verbunden mit";
> 
> //added in 12.2
> $text['quicklinks'] = "Quick Links";
> $text['yourname'] = "Ihre Name";
> $text['youremail'] = "Ihre E-Mail-Adresse";
> $text['liketoadd'] = "Alle Informationen, die Sie hinzufügen möchten";
> $text['webmastermsg'] = "Webmaster-Nachricht";
> $text['gallery'] = "Galerie zeigen";
> $text['wasborn_male'] = "wurde geboren";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "wurde geboren"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "getauft";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "getauft";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "gestorben";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "gestorben";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "wurde beigesetzt"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "wurde beigesetzt"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "wurde eingeäschert";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "wurde eingeäschert";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "heiratete";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "heiratete";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "geschieden";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "geschieden";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " am ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "und ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informationen zu DNA-Tests";
> //added in 13.0
> $text['visitor'] = "Besucher";
> 
> $text['popupnote2'] = " = neuen Stammbaum zeigen";
> 
> //moved here in 14.0
> $text['zoomin'] = "Vergrößern";
> $text['zoomout'] = "Verkleinern";
> $text['scrollnote'] = "Ziehen oder scrollen, um mehr zu sehen";
> $text['general'] = "Allgemein";
> 
> //changed in 14.0
> $text['otherevents'] = "Anderer Ereignisse und Attribute";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Verbindungen";
> $text['continue'] = "Fortsetzen";
> $text['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Greek-UTF8/admintext.php TNG1403/languages/Greek-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Πα�ακαλώ εισάγετε ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Πα�ακαλώ επιλέξετε α�χείο π�ος εισαγωγή.";
> 		$admtext['addreplacedata'] = "Π�οσθήκη ή αλλαγή της γενεαλογίας σας (μπο�εί να πά�ει με�ικά λεπτά, ανάλογα με το μέγεθος του α�χείου σας)";
> 		$admtext['fromyourcomputer'] = "Από τον υπολογιστή σας";
> 		$admtext['importdata'] = "Εισαγωγή Δεδομένων";
> 		$admtext['replace'] = "Αλλαγή (στο δέντ�ο που έχει επιλεχθεί)";
> 		$admtext['desttree'] = "Δέντ�ο Π�οο�ισμο�";
> 		$admtext['selectdesttree'] = "Πα�ακαλώ επιλέξετε ή εισάγετε το δέντ�ο π�οο�ισμο�.";
> 		$admtext['selectexisting'] = "Εισαγωγή σε";
> 		$admtext['ucaselast'] = "Με κεφαλαία γ�άμματα όλα τα επώνυμα";
> 		$admtext['norecalc'] = "�α μην υπολογιστεί εκ νέου η σήμανση εν ζωή";
> 		$admtext['autooffset'] = "Εκκίνηση Κωδικών (IDs) με τον π�ώτο διαθέσιμο α�ιθμό";
> 		$admtext['mustselecttree'] = "Π�έπει να επιλέξετε δέντ�ο π�ιν την επιλογή αυτή.";
> 		$admtext['onwebserver'] = "Στο web server (στον κατάλογο GEDCOM)";
> 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
> 		$admtext['destbranch'] = "Destination Branch (optional)";
> 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
> 		$admtext['opening'] = "Opening";
> 		$admtext['reopen'] = "Reopening";
> 		$admtext['uploading'] = "Uploading";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import stopped";
> 		$admtext['resume'] = "επιλέξετε εδώ για να συνεχίσετε";
> 		$admtext['neweronly'] = "Αντικατάσταση μόνο εάν είναι νεώτε�ο";
> 		$admtext['oldimport'] = "Old style import (no progress bar)";
> 		$admtext['importgedcom'] = "Εισαγωγή GEDCOM (standard 5.5 format)";
> 		$admtext['stopbackup'] = "Stop! It might be a good idea to back up your current data before proceeding.";
> 		$admtext['importmedia'] = "Εισαγωγή πολυμέσων εάν υπά�χουν";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Only import Custom Event Types";
> 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Αλλαγές σε Υπά�χον Τ�πο Γεγονότος";
135,138d168
< 		$admtext['entertypedesc'] = "Πα�ακαλώ εισάγετε τ�πο/πε�ιγ�αφή για το νέο αυτό τ�πο γεγονότος.";
< 		$admtext['enterdisplay'] = "Πα�ακαλώ εισάγετε display string για το νέο αυτό τ�πο γεγονότος.";
< 		$admtext['existingeventtypeinfo'] = "Πλη�οφο�ίες για Υπά�χον Τ�πους Γεγονότων";
< 		$admtext['neweventtypeinfo'] = "Πλη�οφο�ίες για �έο Τ�πο Γεγονότων";
145,146d174
< 		$admtext['addnewevtype'] = "Π�οσθήκη �έου Τ�που Γεγονότων";
< 		$admtext['createnewevtype'] = "Δημιου�γία νέου στοιχείου τ�που γεγονότος";
149,150d176
< 		$admtext['existingevtypes'] = "Υπά�χον Τ�ποι Γεγονότων";
< 		$admtext['edsevtypes'] = "Αλλαγή, διαγ�αφή ή ταξινόμιση εισαχθέντων τ�πων γεγονότων";
152d177
< 		$admtext['confdeleteevtype'] = "Είστε σίγου�οι ότι θέλετε να διαγ�άψετε αυτόν τον τ�πο γεγονότος;";
154d178
< 		$admtext['selectentertag'] = "Πα�ακαλώ επιλέξτε ή εισάγετε το tag για αυτό το τ�πο γεγονότος.";
208d231
< 		$admtext['changestoallevtypes'] = "Αλλαγές σε όλους τους τ�πους γεγονότων";
214d236
< 		$admtext['BAPM'] = "Baptism";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Είστε σίγου�οι ότι θέλετε να διαγ�άψετε αυτόν τον τ�πο γεγονότος;";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Π�οσθήκη �έου Τ�που Γεγονότων";
> 		$admtext['createnewevtype'] = "Δημιου�γία νέου στοιχείου τ�που γεγονότος";
> 		$admtext['modifyeventtype'] = "Αλλαγές σε Υπά�χον Τ�πο Γεγονότος";
> 		$admtext['entertypedesc'] = "Πα�ακαλώ εισάγετε τ�πο/πε�ιγ�αφή για το νέο αυτό τ�πο γεγονότος.";
> 		$admtext['enterdisplay'] = "Πα�ακαλώ εισάγετε display string για το νέο αυτό τ�πο γεγονότος.";
> 		$admtext['existingeventtypeinfo'] = "Πλη�οφο�ίες για Υπά�χον Τ�πους Γεγονότων";
> 		$admtext['neweventtypeinfo'] = "Πλη�οφο�ίες για �έο Τ�πο Γεγονότων";
> 		$admtext['existingevtypes'] = "Υπά�χον Τ�ποι Γεγονότων";
> 		$admtext['edsevtypes'] = "Αλλαγή, διαγ�αφή ή ταξινόμιση εισαχθέντων τ�πων γεγονότων";
> 		$admtext['selectentertag'] = "Πα�ακαλώ επιλέξτε ή εισάγετε το tag για αυτό το τ�πο γεγονότος.";
> 		$admtext['changestoallevtypes'] = "Αλλαγές σε όλους τους τ�πους γεγονότων";
268d303
< 		$admtext['nobirthinfo'] = "Δεν υπά�χουν πλη�οφο�ίες γέννησης";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Save + New Parents";
> 		$admtext['savenewspouse'] = "Save + New Spouse";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Πα�ακαλώ εισάγετε πε�ιγ�αφή για την εικόνα.";
388d424
< 		$admtext['photoowner'] = "Ιδιοκτήτης/Πηγή";
417d452
< 		$admtext['imgmap'] = "Εικόνα Χά�τη - Image Map";
490d524
< 		$admtext['mapinstr3'] = "Για την σ�νδεση τμήματος της φωτογ�αφίας αυτής σε κάποιο συγκεκ�ιμένο άτομα, επιλέξτε το δέντ�ο του ατόμου, επιλέξτε σχήμα και διαστάσεις για το τμήμα, και μετά κάντε click στο κέντ�ο τμήματος. Ένα popup πα�άθυ�ο θα σας βοηθήσει να επιλέξτε το άτομο. Μετά την ολοκλή�ωση της επιλογής, κώδικας για το image map θα π�οστεθεί στο κουτί. Επαναλάβετε την διαδικασία για άλλα τμήματα.";
495d528
< 		$admtext['removelink'] = "Remove Link";
502d534
< 		$admtext['eloptions'] = "Browse or Delete";
509d540
< 		$admtext['nolinks'] = "No links exist yet";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Εικόνα Χά�τη - Image Map";
> 		$admtext['photoowner'] = "Ιδιοκτήτης/Πηγή";
> 		$admtext['nothumb'] = "No thumbnail";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "The item could not be added, most likely because the file was too large and could not be uploaded or used to make a thumbnail.";
> 		$admtext['moved'] = "Moved";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Πα�ακαλώ εισάγετε πε�ιγ�αφή για την εικόνα.";
> 		$admtext['mapinstr3'] = "Για την σ�νδεση τμήματος της φωτογ�αφίας αυτής σε κάποιο συγκεκ�ιμένο άτομα, επιλέξτε το δέντ�ο του ατόμου, επιλέξτε σχήμα και διαστάσεις για το τμήμα, και μετά κάντε click στο κέντ�ο τμήματος. Ένα popup πα�άθυ�ο θα σας βοηθήσει να επιλέξτε το άτομο. Μετά την ολοκλή�ωση της επιλογής, κώδικας για το image map θα π�οστεθεί στο κουτί. Επαναλάβετε την διαδικασία για άλλα τμήματα.";
596d633
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions: Drag or double-click items at left into lists at right. Drag up and down to re-order. Double-click again to remove.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
651,655d690
< 		$admtext['selectimportfile'] = "Πα�ακαλώ επιλέξετε α�χείο π�ος εισαγωγή.";
< 		$admtext['importgedcom'] = "Εισαγωγή GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Π�οσθήκη ή αλλαγή της γενεαλογίας σας (μπο�εί να πά�ει με�ικά λεπτά, ανάλογα με το μέγεθος του α�χείου σας)";
< 		$admtext['fromyourcomputer'] = "Από τον υπολογιστή σας";
< 		$admtext['importdata'] = "Εισαγωγή Δεδομένων";
657,660d691
< 		$admtext['replace'] = "Αλλαγή (στο δέντ�ο που έχει επιλεχθεί)";
< 		$admtext['desttree'] = "Δέντ�ο Π�οο�ισμο�";
< 		$admtext['selectdesttree'] = "Πα�ακαλώ επιλέξετε ή εισάγετε το δέντ�ο π�οο�ισμο�.";
< 		$admtext['selectexisting'] = "Εισαγωγή σε";
668,673d698
< 		$admtext['ucaselast'] = "Με κεφαλαία γ�άμματα όλα τα επώνυμα";
< 		$admtext['norecalc'] = "�α μην υπολογιστεί εκ νέου η σήμανση εν ζωή";
< 		$admtext['autooffset'] = "Εκκίνηση Κωδικών (IDs) με τον π�ώτο διαθέσιμο α�ιθμό";
< 
< 		$admtext['mustselecttree'] = "Π�έπει να επιλέξετε δέντ�ο π�ιν την επιλογή αυτή.";
< 		$admtext['importmedia'] = "Εισαγωγή πολυμέσων εάν υπά�χουν";
675d699
< 		$admtext['neweronly'] = "Αντικατάσταση μόνο εάν είναι νεώτε�ο";
677,692d700
< 		$admtext['onwebserver'] = "Στο web server (στον κατάλογο GEDCOM)";
< 		$admtext['eventsonly'] = "Only import Custom Event Types";
< 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "επιλέξετε εδώ για να συνεχίσετε";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Ημε�ολόγιο Αλλαγών";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Συγγ�αφέας";
804,809c814,819
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
---
> 		$admtext['momside'] = "Mom's Side label"; //8, 20
> 		$admtext['dadside'] = "Dad's Side label"; //8, 20
> 		$admtext['momperson'] = "Mom's Side person ID"; //8, 20
> 		$admtext['momtree'] = "Mom's Side tree ID"; //8, 20
> 		$admtext['dadperson'] = "Dad's Side person ID"; //8, 20
> 		$admtext['dadtree'] = "Dad's Side tree ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Κεφαλίδα εισαγωγών";
> 		$admtext['quotesubhead'] = "Υποκατηγο�ία εισαγωγικών";
> 		$admtext['sniptitle'] = "τίτλος Featurette";
> 		$admtext['snipname'] = "Όνομα επωνυμίας";
> 		$admtext['snipinfoone'] = "Π�οτεινόμενη π�ώτη γ�αμμή";
> 		$admtext['snipinfotwo'] = "Δε�τε�η σει�ά χα�ακτή�ων";
> 		$admtext['snipimage'] = "Εικόνα Featurette";
> 		$admtext['snipperson'] = "Αναγνω�ιστικό αναγνω�ιστικο� π�οσώπου";
> 		$admtext['sniptree'] = "Αναγνω�ιστικό δέντ�ου Featurette";
> 		$admtext['quote'] = "Πα�άθεση";
> 		$admtext['link'] = "Σ�νδεσμος";
> 		$admtext['featuretitle7'] = "Χα�ακτη�ιστικο� 7 τι�τλο";
> 		$admtext['featuretitle8'] = "Χα�ακτη�ιστικο� 8 τι�τλο";
> 		$admtext['featuretitle9'] = "Χα�ακτη�ιστικο� 9 τι�τλο";
> 		$admtext['featurethumb9'] = "Χα�ακτη�ιστικο� 9 μικ�ογ�αφι�α"; //15
> 		$admtext['featurelink9'] = "Χα�ακτη�ιστικο� 9 συ�νδεση"; //15
> 		$admtext['featurepara9'] = "Χα�ακτη�ιστικο� 9 πα�α�γ�αφο"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Header Left Image";
> 		$admtext['rightimg'] = "Header Right Image";
> 		$admtext['photoption'] = "Photo options are<br />&nbsp;&nbsp;(static or random)";
> 		$admtext['randomphotowidth'] = "Random Photo Width";
> 		$admtext['randomphotoheight'] = "Random Photo Height";
> 		$admtext['randomphotomediatypeID'] = "Random Photo Collection";
> 		$admtext['momheading'] = "Maternal Family Heading";
> 		$admtext['mompara'] = "Maternal Family Paragraph";
> 		$admtext['mompagelink'] = "Maternal Family Page Link";
> 		$admtext['dadheading'] = "Paternal Family Heading";
> 		$admtext['dadpara'] = "Paternal Family Paragraph";
> 		$admtext['dadpagelink'] = "Paternal Family Page Link";
> 		$admtext['spmomheading'] = "Spouse Maternal Family Heading";
> 		$admtext['spmompara'] = "Spouse Maternal Family Paragraph";
> 		$admtext['spmompagelink'] = "Spouse Maternal Family Page Link";
> 		$admtext['spmomside'] = "Spouse Maternal Side label";
> 		$admtext['spdadside'] = "Spouse Paternal Side label";
> 		$admtext['spmomperson'] = "Spouse Maternal Side personID";
> 		$admtext['spmomtree'] = "Spouse Maternal Side treeID";
> 		$admtext['spdadheading'] = "Spouse Paternal Family Heading";
> 		$admtext['spdadpara'] = "Spouse Paternal Family Paragrph";
> 		$admtext['spdadpagelink'] = "Spouse Paternal Family Page Link";
> 		$admtext['spdadperson'] = "Spouse Paternal Side personID";
> 		$admtext['spdadtree'] = "Spouse Paternal Side treeID";
> 		$admtext['storiesheading'] = "Our Family Stories";
> 		$admtext['nbrsurnames'] = "Number of Surnames<br />&nbsp;&nbsp; in Surname Cloud";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Χα�ακτη�ιστικο� μικ�ογ�αφι�α";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG απαιτεί 5.3 ή μεγαλήτε�η έκδοση.)";
---
> 		$admtext['phpreq'] = "(TNG απαιτεί 7.0 ή μεγαλήτε�η έκδοση.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Change incoming prefixes to match TNG settings";
> 		$admtext['sortevents'] = "Sort events by";
> 		$admtext['sortbydate'] = "Event date";
> 		$admtext['sortbytype'] = "Event type";
> 		$admtext['allowsuggest'] = "Allow suggestions from visitors";
> 		$admtext['livingchecked'] = "Living flag set for new people and families";
> 		$admtext['maxmarried'] = "Mark family living if married less than<br/>this many years";
> 		$admtext['imagetags'] = "Rectangles";
> 		$admtext['allowcsv'] = "Allow CSV downloads for reports";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Export as SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of connection search runs";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Display textual path statement";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages in connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Could not be geocoded";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Do not geocode";
1436d1549
< 		$admtext['backtosecondary'] = "Πίσω στις Δευτε�ε�ουσες Διαδικασίες";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Πίσω στις Δευτε�ε�ουσες Διαδικασίες";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exclude notes";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip and include media files";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Show disabled users only";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Invalid character";
1886d2008
< 		$admtext['test_number'] = "Test α�ιθμο�";
1916d2037
< 		$admtext['xtra_mut'] = "Extra mutations";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test α�ιθμο�";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Link this DNA test to a person";
1966d2095
< $admtext['otherevents'] = "Άλλα Γεγονότα";
2051,2052d2179
< $admtext['savereturn'] = "Επιστ�οφή στη σελίδα αυτή";
< $admtext['saveback'] = "Επιστ�οφή στο μενο�";
2059,2060d2185
< $admtext['secondary'] = "Δευτε�ε�ουσες Διαδικασίες";
< $admtext['commas'] = "Διαχω�ισμός πολλαπλών πεδίων με κόμμα";
2102c2227
< $admtext['nobranch'] = "Δεν υπά�χει Κλαδί";
---
> $admtext['nobranch'] = "No branch";
2130,2131d2254
< $admtext['secondarymaint'] = "Δευτε�ε�ουσες Διαδικασίες Συντή�ησης";
< $admtext['customeventtypes'] = "Custom Τ�ποι Γεγονότων";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Link Type";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Επώνυμα";
> $admtext['subhead'] = "Υποκατηγο�ία";
> $admtext['image'] = "Εικόνα";
> $admtext['author'] = "Συγγ�αφέας";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Getting Started";
> $admtext['showlog'] = "Ημε�ολόγιο Αλλαγών";
> $admtext['nobirthinfo'] = "Δεν υπά�χουν πλη�οφο�ίες γέννησης";
> //changed in 13.0
> $admtext['savereturn'] = "Επιστ�οφή στη σελίδα αυτή";
> $admtext['saveback'] = "Επιστ�οφή στο μενο�";
> //added in 13.0
> $admtext['allitemsdeleted'] = "All items were successfully deleted.";
> $admtext['private'] = "Private";
> $admtext['imgtags'] = "Image Tags";
> 
> $admtext['removelink'] = "Remove Link";
> $admtext['eloptions'] = "Browse or Delete";
> $admtext['pleaseenter'] = "Πα�ακαλώ εισάγετε ";
> 
> $admtext['nolinks'] = "No links exist yet";
> $admtext['nogeocode'] = "Could not be geocoded";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Custom Τ�ποι Γεγονότων";
> $admtext['secondary'] = "Δευτε�ε�ουσες Διαδικασίες";
> $admtext['otherevents'] = "Άλλα Γεγονότα";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Link Type";
> $admtext['move'] = "Move";
> $admtext['copy'] = "Copy";
> $admtext['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Greek-UTF8/alltext.php TNG1403/languages/Greek-UTF8/alltext.php
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "γ.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "θ.";  //from descend
> $text['burialabbr'] = "ταφ.";  //from descend
> $text['marrabbr'] = "γαμ.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Π�ώτη Σελίδα";
> $text['lastpage'] = "Τελευταία Σελίδα";
> 
> //changed in 13.0.0
> $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
> //added in 13.0.0
> $admtext['nobranch'] = "No branch";
> 
> //added in 14.0
> $text['oneyear'] = "year";
> $text['pwdcodelink'] = "Click this link to have a temporary password sent to you";
> $text['pwdcodesent'] = "A password reset link has been sent to your e-mail address.";
> $text['moved'] = "Moved";
> $text['citation'] = "Citation";
> $text['other'] = "Άλλες Πλη�οφο�ίες";
> $text['death'] = "Death";
> $text['burial'] = "Burial";
> $text['cremation'] = "Cremation";
> $text['marriage'] = "Marriage";
> $text['divorce'] = "Divorce";
> $text['bylength'] = "Steps";
> $text['bymarriages'] = "Marriages";
> $text['none'] = "None";
> 
> //moved here in 14.0
> $text['family'] = "Οικογένεια";
> $text['source'] = "Πηγή";
> $text['repository'] = "Αποθετή�ιο";
> $text['place'] = "Τοποθεσία";
> $admtext['BAPM'] = "Baptism";
> 
> $text['glang'] = "el";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Greek-UTF8: cust_text.php
diff -r TNG/languages/Greek-UTF8/text.php TNG1403/languages/Greek-UTF8/text.php
69d68
< 		$text['general'] = "General";
77a77
> 	case "connections":
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Search for connections";
> 		$text['findrel2'] = "Ε��εση Συγγένειας";
> 		$text['makeme2nd'] = "Use my ID";
> 		$text['usebookmarks'] = "Use bookmarks";
> 		$text['select2inds'] = "Πα�ακαλώ επιλέξτε δ�ο άτομα.";
> 		$text['indinfofor'] = "Ατομικές πλη�οφο�ίες για";
> 		$text['nobookmarks'] = "There is no bookmark to use";
> 		$text['bkmtitle'] = "Persons found in bookmarks";
> 		$text['bkminfo'] = "Select a person:";
> 		$text['sortpathsby'] = "Sort paths by number of";
> 		$text['sortbyshort'] = "Sort by";
> 		$text['bylengthshort'] = "Length";
> 		$text['badID1'] = ": bad person1 ID - please go back and correct";
> 		$text['badID2'] = ": bad person2 ID - please go back and correct";
> 		$text['notintree'] = ": the person with this ID is not in the current tree database.";
> 		$text['sameperson'] = "Τα δ�ο άτομα είναι το ίδιο π�όσωπο.";;
> 		$text['nopaths'] = "These persons are not connected.";
> 		$text['nopaths1'] = "No more connections shorter than xxx";
> 		$text['nopaths2'] = "in xxx search steps";
> 		$text['longestpath'] = "(longest path checked so far was xxx steps long)";
> 		$text['relevantpaths'] = "The number of different relevant paths found: xxx";
> 		$text['skipMarr'] = "(in addition, the number of paths found but not displayed due to too many marriages was: xxx)";
> 		$text['mjaor'] = "or";
> 		$text['connectionsto'] = "Connections to ";
> 		$text['findanotherpers'] = "Find another person...";
> 		$text['sometimes'] = "(Sometimes checking over a different number of generations yields a different result.)";
> 		$text['anotherpath'] = "Search for other connections";
> 		$text['xpath'] = "Path ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Parent";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "her daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "father";
> 		$text['hmother'] = "mother";
> 		$text['hhusband'] = "husband";
> 		$text['hwife'] = "wife";
> 		$text['hson'] = "son";
> 		$text['hdaughter'] = "daughter";
> 		$text['maxruns'] = "Max number of paths to be checked";
> 		$text['maxrshort'] = "Max paths";
> 		$text['maxlength'] = "Connection paths no longer than";
> 		$text['maxlshort'] = "Max length";
> 		$text['xstep'] = "step";
> 		$text['xsteps'] = "steps";
> 		$text['xmarriages'] = "xxx marriages";
> 		$text['xmarriage'] = "1 marriage";
> 		$text['showspouses'] = "Show both spouses";
> 		$text['showTxt'] = "Show textual path description";
> 		$text['showTxtshort'] = "Textual desc.";
> 		$text['compactBox'] = "Show person boxes compacted";
> 		$text['compactBoxshort'] = "Compact boxes";
> 		$text['paths'] = "Paths";
> 		$text['dospouses2'] = "Show Spouses";
> 		$text['maxmopt'] = "Max marriages per connection";
> 		$text['maxm'] = "Max marriages";
> 		$text['arerelated'] = "These persons are relatives - their relationship is shown in the Path 1";
> 		$text['simplerel'] = "Simple relationship search";
196d264
< 		$text['scrollnote'] = "Σημείωση: Ίσως χ�εαιστεί να μετακινηθείτε κάτω ή δεξιά για να δείτε το διάγ�αμμα.";
199d266
< 		$text['popupnote2'] = " = �έο γενεαλόγιο";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tables";
> 		$text['dtchildren'] = "Children";
> 		$text['dtgrandchildren'] = "Grandchildren";
> 		$text['dtggrandchildren'] = "Great grandchildren";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "No descendants";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Select";
> 		$text['dteachfulltable'] = "Each full table will have";
> 		$text['dtrows'] = "rows";
> 		$text['dtdisplayingtable'] = "Displaying table";
> 		$text['dtgototable'] = "Go to table:";
> 		$text['fcinstrdn'] = "Show family with spouse";
> 		$text['fcinstrup'] = "Show family with parents";
> 		$text['fcinstrplus'] = "Select other spouses";
> 		$text['fcinstrfam'] = "Select other parents";
381,382d466
< 		$text['firstpage'] = "Π�ώτη Σελίδα";
< 		$text['lastpage'] = "Τελευταία Σελίδα";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Toggle Tags";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "New password again";
> 		$text['resetsuccess'] = "Success: Password has been reset";
> 		$text['resetfail'] = "Failure: Password not reset";
> 		$text['failreason0'] = " (unknown database error)";
> 		$text['failreason2'] = " (you don't have permission to change your password)";
> 		$text['failreason3'] = " (passwords did not match)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total Source Citations";
618d710
< 		$text['loginfirst'] = "You must log in first.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "You must log in first.";
629,630d722
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Out";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "γ.";
< $text['chrabbr'] = "c.";
675d788
< $text['family'] = "Οικογένεια"; //from getperson
685d797
< $text['deathabbr'] = "θ.";  //from descend
706d817
< $text['burialabbr'] = "ταφ.";  //from descend
712d822
< $text['place'] = "Τοποθεσία";
715d824
< $text['marrabbr'] = "γαμ.";
738d846
< $text['source'] = "Πηγή";
766d873
< $text['repository'] = "Αποθετή�ιο";
770d876
< $text['findplaces'] = "Β�είτε όλους όσους έχουν γεγονότα στη τοποθεσία αυτή";
804d909
< $text['glang'] = "&amp;hl=el";
816d920
< $text['none'] = "None";
924d1027
< $text['otherevents'] = "Άλλα Γεγονότα";
952,953d1054
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Γ�ήγο�οι σ�νδεσμοι";
> $text['yourname'] = "Το όνομά σας";
> $text['youremail'] = "Η διε�θυνσή σας ηλεκτ�ονικο� ταχυδ�ομείου";
> $text['liketoadd'] = "Οποιεσδήποτε πλη�οφο�ίες θέλετε να π�οσθέσετε";
> $text['webmastermsg'] = "Μήνυμα Webmaster";
> $text['gallery'] = "Δείτε τη συλλογή";
> $text['wasborn_male'] = "γεννήθηκε";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "γεννήθηκε"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "βαπτίστηκε";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "βαπτίστηκε";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "died";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "πέθανε";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "θάφτηκε"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "θάφτηκε"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "έχει αποτεφ�ωθεί";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "έχει αποτεφ�ωθεί";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "Έγγαμος";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "Έγγαμος";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "διαζευγμένος";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "διαζευγμένος";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = "σε";			// used as a preposition to the location
> $text['onthisdate'] = "σε";		// when used with full date
> $text['inthisyear'] = "σε";		// when used with year only or month / year dates
> $text['and'] = "και";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Visitor";
> 
> $text['popupnote2'] = " = �έο γενεαλόγιο";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom In";
> $text['zoomout'] = "Zoom Out";
> $text['scrollnote'] = "Σημείωση: Ίσως χ�εαιστεί να μετακινηθείτε κάτω ή δεξιά για να δείτε το διάγ�αμμα.";
> $text['general'] = "General";
> 
> //changed in 14.0
> $text['otherevents'] = "Άλλα Γεγονότα";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connections";
> $text['continue'] = "Continue";
> $text['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
Only in TNG1403/languages: Hungarian-UTF8
diff -r TNG/languages/Icelandic/admintext.php TNG1403/languages/Icelandic/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Vinsamlegast sláðu inn ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Veljið skýrslu sem setja á inn.";
> 		$admtext['addreplacedata'] = "Bæta við eða skipta út ættfræðiupplýsingum þínum (gæti tekið nokkrar mínútur, allt eftir skýrslustærð)";
> 		$admtext['fromyourcomputer'] = "Frá tölvunni þinni";
> 		$admtext['importdata'] = "Innsetning gagna";
> 		$admtext['replace'] = "Skipta út (í völdu tré)";
> 		$admtext['desttree'] = "Ákvörðunartré";
> 		$admtext['selectdesttree'] = "Vinsamlegast veljið eða sláið inn ákvörðunartré.";
> 		$admtext['selectexisting'] = "Setjið inn í";
> 		$admtext['ucaselast'] = "Hástafa öll eftirnöfn";
> 		$admtext['norecalc'] = "Endurreikna ekki Falin(n) merkingu";
> 		$admtext['autooffset'] = "Hefja nr. á fyrsta mögulega númeri";
> 		$admtext['mustselecttree'] = "Þú verður að velja tré áður en þú velur þennan möguleika.";
> 		$admtext['onwebserver'] = "Frá heimasíðu (í GEDCOM möppu)";
> 		$admtext['imphints'] = "Aths: Öll núverandi gögn, þýðir allir einstaklingar, fjöskyldur, heimildir og athugasemdir (margmiðlunartengingar tapast ekki svo lengi sem að nr. haldast eins).  Samsvaranir byggjast alltaf eingöngu á nr.  Nýjum færslum er alltaf bætt við.  Append imports all records with new IDs.";
> 		$admtext['destbranch'] = "Ákvörðunargrein (valfrjálst)";
> 		$admtext['importlatlong'] = "Setja inn upplýsingar um lengdargráðu / breiddargráðu ef þær eru til staðar";
> 		$admtext['opening'] = "Opna";
> 		$admtext['reopen'] = "Opna aftur";
> 		$admtext['uploading'] = "Uppflyt gögn";
> 		$admtext['stop'] = "Stoppa";
> 		$admtext['stopped'] = "Innsetning stöðvuð";
> 		$admtext['resume'] = "smelltu hér til að halda áfram";
> 		$admtext['neweronly'] = "Aðeins skipta út ef nýrri";
> 		$admtext['oldimport'] = "Old style import (no progress bar)";
> 		$admtext['importgedcom'] = "Færa inn GEDCOM skýrslu (má vera pökkuð)";
> 		$admtext['stopbackup'] = "Stopp! Það gæti verið góð hugmynd að taka afrit af gögnunum þínum áður en þú heldur áfram.";
> 		$admtext['importmedia'] = "Innflytja margmiðlun ef hún er til staðar";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Import Custom Event Types Only (no data is added, replaced or appended)";
> 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Breyta atburði á skrá";
135,138d168
< 		$admtext['entertypedesc'] = "Vinsamlegast sláðu inn tegund/lýsingu á þessum nýja atburði.";
< 		$admtext['enterdisplay'] = "Vinsamlegast sláðu inn texta fyrir þennan nýja atburð.";
< 		$admtext['existingeventtypeinfo'] = "Núverandi upplýsingar um atburð";
< 		$admtext['neweventtypeinfo'] = "Upplýsingar um nýjan atburð";
141c171
< 		$admtext['onimport'] = "On Import";
---
> 		$admtext['onimport'] = "Við innsetningu";
143c173
< 		$admtext['ignore'] = "Hunsa";
---
> 		$admtext['ignore'] = "Hundsa";
145,146d174
< 		$admtext['addnewevtype'] = "Bæta við nýrri tegund atburðar";
< 		$admtext['createnewevtype'] = "Búa til nýjan atburð";
149,150d176
< 		$admtext['existingevtypes'] = "Atburðir sem eru til nú þegar";
< 		$admtext['edsevtypes'] = "Breyta, eyða eða raða, áður skráðum atburðar tegundum";
152d177
< 		$admtext['confdeleteevtype'] = "Ertu viss um að þú viljir eyða þessari tegund atburðar?";
154d178
< 		$admtext['selectentertag'] = "Vinsamlegast sláðu inn eða veldu merki fyrir þessa tegund atburðar.";
171c195
< 		$admtext['FCOM'] = "First Communion";
---
> 		$admtext['FCOM'] = "Fyrsta altarisganga";
208d231
< 		$admtext['changestoallevtypes'] = "Breyta öllum tegundum atburða";
214d236
< 		$admtext['BAPM'] = "Skírn";
224c246
< 		$admtext['expselected'] = "Expand Selected";
---
> 		$admtext['expselected'] = "Þenja út valið";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Ertu viss um að þú viljir eyða þessari atburðategund? Öllum atburðum af þessari tegund verður líka eytt.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Bæta við nýrri atburðartegund";
> 		$admtext['createnewevtype'] = "Búa til nýjan atburð";
> 		$admtext['modifyeventtype'] = "Breyta skráðum atburði";
> 		$admtext['entertypedesc'] = "Vinsamlegast sláðu inn tegund/lýsingu á þessum nýja atburði.";
> 		$admtext['enterdisplay'] = "Vinsamlegast sláðu inn texta fyrir þennan nýja atburð.";
> 		$admtext['existingeventtypeinfo'] = "Núverandi upplýsingar um atburð";
> 		$admtext['neweventtypeinfo'] = "Upplýsingar um nýjan atburð";
> 		$admtext['existingevtypes'] = "Atburðir sem eru til nú þegar";
> 		$admtext['edsevtypes'] = "Breyta, eyða eða raða, áður skráðum atburðar tegundum";
> 		$admtext['selectentertag'] = "Vinsamlegast sláðu inn eða veldu merki fyrir þessa tegund atburðar.";
> 		$admtext['changestoallevtypes'] = "Breyta öllum tegundum atburða";
268d303
< 		$admtext['nobirthinfo'] = "Engar fæðingarupplýsingar";
308c343
< 		$admtext['choosemerge'] = "Choose individuals to merge or find potential matches";
---
> 		$admtext['choosemerge'] = "Veldu einstaklinga til að sameina eða finna mögulegar samstæður.";
311c346
< 		$admtext['combinenotes'] = "Combine notes &amp; citations";
---
> 		$admtext['combinenotes'] = "Sameina athugasemdir og heimildir";
324c359
< 		$admtext['pevslater'] = "Note: Additional events, as well as event-specific notes and citations,<br />may be added after the new person has been saved.";
---
> 		$admtext['pevslater'] = "Ath.: Hægt erð að bæta fleiri atburðum við, sem og athugasemdum og heimildum,<br />eftir að þessi nýji einstaklingur hefur verið geymdur.";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Geyma + Nýir foreldrar";
> 		$admtext['savenewspouse'] = "Geyma + Nýr maki";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Please enter a description for the image.";
388d424
< 		$admtext['photoowner'] = "Eigandi/heimild";
417d452
< 		$admtext['imgmap'] = "Kortlagning myndar";
462c497
< 		$admtext['fileext'] = "File ext."; //file extension (abbreviation)
---
> 		$admtext['fileext'] = "Skýrslutegund"; //file extension (abbreviation)
464c499
< 		$admtext['mediaurl'] = "Media URL";
---
> 		$admtext['mediaurl'] = "Slóð á margmiðlun";
490,491c525
< 		$admtext['mapinstr3'] = "Til að tengja svæði á þessari mynd við einstakling, veldu þá fyrst það tré sem einstaklingurinn er í og búðu svo til rétthyrning fyrir svæðið.  Það gerirðu með því að smella í efra vinstra horn svæðiðsins og síðan dregurðu með músinni niður í neðra hægra horn.  Þú getur líka smellt einu sinni í efra vinstra horn og svo smellt aftur í neðra hægra hornið.  Sprettigluggi mun síðan opnast til að hjálpa þér að velja einstaklinginn.  Eftir að valið hefur farið fram, mun kóðinn fyrir kortlagninguna bætast við í kassann fyrir neðan. Endurtakið eins oft og þörf er á.";
< 		$admtext['albumlinks'] = "Albúm tenglar";
---
> 		$admtext['albumlinks'] = "Tengingar við þetta albúm";
494,496c528,529
< 		$admtext['albmedia'] = "Album Media";
< 		$admtext['removelink'] = "Fjarlægja tengil";
< 		$admtext['confremmedia'] = "Are you sure you want to remove this media from this album?";
---
> 		$admtext['albmedia'] = "Margmiðlun í þessu albúmi";
> 		$admtext['confremmedia'] = "Ertu viss um að þú viljir fjarlægja þetta atriði úr albúminu?";
502d534
< 		$admtext['eloptions'] = "Skoða eða eyða";
504c536
< 		$admtext['mediasubt'] = "Manage media included in this album (Add, Delete, Sort)";
---
> 		$admtext['mediasubt'] = "Stýra margmiðlun í þessu albúmi (Bæta við, Eyða, Raða)";
509d540
< 		$admtext['nolinks'] = "No links exist yet";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML myndhlutakort (fyrir afturhæfni)";
> 		$admtext['photoowner'] = "Eigandi frumrits";
> 		$admtext['nothumb'] = "Engin smámynd";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Það var ekki hægt að bæta þessu við, líklegast vegna þess að skýrslan var of stór og ekki var hægt að hlaða henni inn eða nota hana til að búa til smámynd.";
> 		$admtext['moved'] = "Flutt";
> 		$admtext['url'] = "Vefslóð";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Vinsamlegast skrifaðu inn lýsingu fyrir þessa skýrslu.";
> 		$admtext['mapinstr3'] = "Til að tengja hluta af þessari mynd við einstakling þarftu fyrst að velja það tré sem einstaklingurinn er hluti af. Síðan býrðu til rétthyrning á tilheyrandi svæði. Það gerirðu með því að smella í efra vinstra horni svæðisins og draga músina niður í neðra hægra horn svæðsins. Þegar þessu er lokið mun sprettigluggi birtast og þar geturðu valið viðeigandi einstakling. Þegar þú hefur valið réttan einstakling, geturðu síðan endurtekið þetta ferli til að bæta við öðrum svæðum. Smelltu á tiltæk svæði til að velja þau og dragðu það til færa það eða smelltu á 'X' til að eyða.";
563,564c601,602
< 		$admtext['existingreports'] = "Existing Reports";
< 		$admtext['newreportinfo'] = "New Report Information";
---
> 		$admtext['existingreports'] = "Núverandi skýrslur";
> 		$admtext['newreportinfo'] = "Upplýsingar um nýja skýrslu";
566,567c604,605
< 		$admtext['rankpriority'] = "Rank/Priority";
< 		$admtext['choosedisplay'] = "Choose Fields to Display";
---
> 		$admtext['rankpriority'] = "Staða/Forgangsröðun";
> 		$admtext['choosedisplay'] = "Veldu reiti sem á að sýna";
580c618
< 		$admtext['choosecriteria'] = "Choose Criteria";
---
> 		$admtext['choosecriteria'] = "Veldu skilyrði";
586c624
< 		$admtext['operators'] = "Operators";
---
> 		$admtext['operators'] = "Virkjar";
591,593c629,631
< 		$admtext['currentmonth'] = "Current Month";
< 		$admtext['currentyear'] = "Current Year";
< 		$admtext['currentday'] = "Current Day";
---
> 		$admtext['currentmonth'] = "Núverandi mánuður";
> 		$admtext['currentyear'] = "Núveraendi ár";
> 		$admtext['currentday'] = "Núverandi dagur";
596d633
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
598,604c635,641
< 		$admtext['savereport'] = "Save Report";
< 		$admtext['addnewreport'] = "Add New Report";
< 		$admtext['createreport'] = "Create a new report";
< 		$admtext['noreports'] = "No reports exist";
< 		$admtext['rank'] = "Rank";
< 		$admtext['confreportdelete'] = "Are you sure you want to delete this report?";
< 		$admtext['enterreportname'] = "Please enter a Report Name.";
---
> 		$admtext['savereport'] = "Geyma skýrslu";
> 		$admtext['addnewreport'] = "Bæta við nýrri skýrslu";
> 		$admtext['createreport'] = "Búa til nýja skýrslu";
> 		$admtext['noreports'] = "Engar skýrslur til";
> 		$admtext['rank'] = "Staða";
> 		$admtext['confreportdelete'] = "Ertu viss um að þú viljir eyða þessari skýrslu?";
> 		$admtext['enterreportname'] = "Vinsamlegast skrifaðu nafnið á skýrslunni.";
618c655
< 		$admtext['currentmonthnum'] = "Current Month Number";
---
> 		$admtext['currentmonthnum'] = "Númer núverandi mánaðar";
624c661
< 		$admtext['fact'] = "Fact";
---
> 		$admtext['fact'] = "Staðreynd";
633,635c670,671
< 		$admtext['confremmw'] = "Are you sure you want to remove this item?";
< 		$admtext['msgsaved'] = "Message saved";
< 		//added in 9.1.1
---
> 		$admtext['confremmw'] = "Ertu viss um að þú viljir fjarlægja þennan hlut?";
> 		$admtext['msgsaved'] = "Skilaboð geymd";
645,646c681,686
< 		$admtext['savecopy'] = "Save as copy";
< 		$admtext['activeonly'] = "Active only";
---
> 		$admtext['savecopy'] = "Geyma sem afrit";
> 		$admtext['activeonly'] = "Eingöngu virkar";
> 		//added in 14.0
> 		$admtext['instr'] = "Leiðbeiningar: Dragðu eða tvísmelltu á punkta vinstra megin til að færa þá yfir til hægri. Dragðu þá upp og niður til að endurraða eftir þörfum. Tvísmelltu á þá til að fjarlægja þá..";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
651,655d690
< 		$admtext['selectimportfile'] = "Veljið skýrslu sem setja á inn.";
< 		$admtext['importgedcom'] = "Innsetning á GEDCOM skýrslu (staðlað 5.5 snið)";
< 		$admtext['addreplacedata'] = "Bæta við eða skipta út ættfræðiupplýsingum þínum (gæti tekið nokkrar mínútur, allt eftir skýrslustærð)";
< 		$admtext['fromyourcomputer'] = "Frá tölvunni þinni";
< 		$admtext['importdata'] = "Innsetning gagna";
657,660d691
< 		$admtext['replace'] = "Skipta út (í völdu tré)";
< 		$admtext['desttree'] = "Ákvörðunartré";
< 		$admtext['selectdesttree'] = "Vinsamlegast veljið eða sláið inn ákvörðunartré.";
< 		$admtext['selectexisting'] = "Setjið inn í";
668,673d698
< 		$admtext['ucaselast'] = "Hástafa öll eftirnöfn";
< 		$admtext['norecalc'] = "Do not recalculate Living flag";
< 		$admtext['autooffset'] = "Hefja nr. á fyrsta mögulega númeri";
< 
< 		$admtext['mustselecttree'] = "Þú verður að velja tré áður en þú velur þennan möguleika.";
< 		$admtext['importmedia'] = "Innflytja margmiðlun ef hún er til staðar";
675d699
< 		$admtext['neweronly'] = "Aðeins skipta út ef nýrri";
677,692d700
< 		$admtext['onwebserver'] = "Frá heimasíðu (í GEDCOM möppu)";
< 		$admtext['eventsonly'] = "Import Custom Event Types Only (no data is added, replaced or appended)";
< 		$admtext['imphints'] = "Aths: Öll núverandi gögn, þýðir allir einstaklingar, fjöskyldur, heimildir og athugasemdir (margmiðlunartengingar tapast ekki svo lengi sem að nr. haldast eins).  Samsvaranir byggjast alltaf eingöngu á nr.  Nýjum færslum er alltaf bætt við.  Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Ákvörðunargrein (valfrjálst)";
< 		$admtext['inframe'] = "(í ramma)";
< 		$admtext['getstart'] = "Byrjunarleiðbeiningar";
< 		$admtext['importlatlong'] = "Setja inn upplýsingar um lengdargráðu / breiddargráðu ef þær eru til staðar";
< 		$admtext['opening'] = "Opna";
< 		$admtext['reopen'] = "Opna aftur";
< 		$admtext['uploading'] = "Uppflyt gögn";
< 		$admtext['stop'] = "Stoppa";
< 		$admtext['stopped'] = "Innsetning stöðvuð";
< 		$admtext['resume'] = "smelltu hér til að halda áfram";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Skrá yfir breytingar";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
700,703c706,709
< 		$admtext['tasks'] = "Important tasks";
< 		$admtext['task_revusers'] = "Review new user registrations";
< 		$admtext['task_tree'] = "Create your first tree";
< 		$admtext['task_user'] = "Create a user account for yourself";
---
> 		$admtext['tasks'] = "Mikilvæg verkefni";
> 		$admtext['task_revusers'] = "Skoða nýjar notendaskráningar";
> 		$admtext['task_tree'] = "Búðu til fyrsta tréið þitt";
> 		$admtext['task_user'] = "Búðu til notendareikning fyrir þig";
708c714
< 		$admtext['task_backup'] = "Back up the data";
---
> 		$admtext['task_backup'] = "Búa til afrit af gögnunum";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Höfundur";
771,775c781,785
< 		$admtext['idnotvalid'] = "is not a valid ID. A valid ID is a numeric string prefixed with";
< 		$admtext['idinuse'] = "is in use. Please choose a different ID";
< 		$admtext['idok'] = "is OK to use";
< 		$admtext['isok'] = "is OK to use";
< 		$admtext['isinuse'] = "is already in use.";
---
> 		$admtext['idnotvalid'] = "er ekki leyfilegt númer. Leyfilegt númer er tala með forskeytinu";
> 		$admtext['idinuse'] = "er í notkun. Vinsamlegast notið annað númer";
> 		$admtext['idok'] = "er hægt að nota";
> 		$admtext['isok'] = "er hægt að nota";
> 		$admtext['isinuse'] = "er í notkun.";
804,809c814,819
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
---
> 		$admtext['momside'] = "Mom's Side label"; //8, 20
> 		$admtext['dadside'] = "Dad's Side label"; //8, 20
> 		$admtext['momperson'] = "Mom's Side person ID"; //8, 20
> 		$admtext['momtree'] = "Mom's Side tree ID"; //8, 20
> 		$admtext['dadperson'] = "Dad's Side person ID"; //8, 20
> 		$admtext['dadtree'] = "Dad's Side tree ID"; //8, 20
861,863c871,873
< 		$admtext['featurelink5'] = "Feature 5 link"; //15
< 		$admtext['featuretitle5'] = "Feature 5 title"; //15
< 		$admtext['featurepara5'] = "Feature 5 paragraph"; //15
---
> 		$admtext['featurelink5'] = "Feature 5 hlekkur"; //15
> 		$admtext['featuretitle5'] = "Feature 5 titill"; //15
> 		$admtext['featurepara5'] = "Feature 5 málsgreinar"; //15
865,867c875,877
< 		$admtext['featurelink6'] = "Feature 6 link"; //15
< 		$admtext['featuretitle6'] = "Feature 6 title"; //15
< 		$admtext['featurepara6'] = "Feature 6 paragraph"; //15
---
> 		$admtext['featurelink6'] = "Feature 6 hlekkur"; //15
> 		$admtext['featuretitle6'] = "Feature 6 titill"; //15
> 		$admtext['featurepara6'] = "Feature 6 málsgreinar"; //15
869,870c879,880
< 		$admtext['featurelink7'] = "Feature 7 link"; //15
< 		$admtext['featurepara7'] = "Feature 7 paragraph"; //15
---
> 		$admtext['featurelink7'] = "Feature 7 hlekkur"; //15
> 		$admtext['featurepara7'] = "Feature 7 málsgreinar"; //15
872,873c882,883
< 		$admtext['featurelink8'] = "Feature 8 link"; //15
< 		$admtext['featurepara8'] = "Feature 8 paragraph"; //15
---
> 		$admtext['featurelink8'] = "Feature 8 hlekkur"; //15
> 		$admtext['featurepara8'] = "Feature 8 málsgreinar"; //15
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Vitnar í haus";
> 		$admtext['quotesubhead'] = "Tilvitnanir í undirhöfða";
> 		$admtext['sniptitle'] = "Lögunartitill";
> 		$admtext['snipname'] = "Nafn á lögun";
> 		$admtext['snipinfoone'] = "Fyrsta lína lögun";
> 		$admtext['snipinfotwo'] = "Önnur lína lögun";
> 		$admtext['snipimage'] = "Lögunarmynd";
> 		$admtext['snipperson'] = "Persónuskilríki persónuleika";
> 		$admtext['sniptree'] = "Auðkenni lögun tré";
> 		$admtext['quote'] = "Tilvitnun";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7 titill";
> 		$admtext['featuretitle8'] = "Feature 8 titill";
> 		$admtext['featuretitle9'] = "Feature 9 titill";
> 		$admtext['featurethumb9'] = "Feature 9 smámynd"; //15
> 		$admtext['featurelink9'] = "Feature 9 hlekkur"; //15
> 		$admtext['featurepara9'] = "Feature 9 málsgreinar"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Vinstri mynd hauss";
> 		$admtext['rightimg'] = "Hægri mynd hauss";
> 		$admtext['photoption'] = "Valmöguleikar fyrir mynd eru<br />&nbsp;&nbsp;(föst eða af handahófi)";
> 		$admtext['randomphotowidth'] = "Breidd fyrir mynd af handahófi";
> 		$admtext['randomphotoheight'] = "Hæð fyrir mynd af handahófi";
> 		$admtext['randomphotomediatypeID'] = "Myndir af handahófi";
> 		$admtext['momheading'] = "Fyrirsögn fyrir móðurætt";
> 		$admtext['mompara'] = "Málsgrein fyrir móðurætt";
> 		$admtext['mompagelink'] = "Tengill á síðu móðurættar";
> 		$admtext['dadheading'] = "Fyrirsögn fyrir föðurætt";
> 		$admtext['dadpara'] = "Málsgrein fyrir föðurætt";
> 		$admtext['dadpagelink'] = "Tengill á síðu föðurættar";
> 		$admtext['spmomheading'] = "Haus fyrir móðurætt maka";
> 		$admtext['spmompara'] = "Málsgrein fyrir móðurætt maka";
> 		$admtext['spmompagelink'] = "Tengill á síðu móðurættar maka";
> 		$admtext['spmomside'] = "Merki fyrir móðurætt maka";
> 		$admtext['spdadside'] = "Merki fyrir föðurætt maka";
> 		$admtext['spmomperson'] = "Nr. einstaklings í móðurætt maka";
> 		$admtext['spmomtree'] = "Nr. trés fyrir móðurætt maka";
> 		$admtext['spdadheading'] = "Haus fyrir föðurætt maka";
> 		$admtext['spdadpara'] = "Málsgrein fyrir föðurætt maka";
> 		$admtext['spdadpagelink'] = "Tengill á síðu föðurættar maka";
> 		$admtext['spdadperson'] = "Nr. einstaklings í föðurætt maka";
> 		$admtext['spdadtree'] = "Tré nr. föðurættar maka";
> 		$admtext['storiesheading'] = "Ættarsögur okkar";
> 		$admtext['nbrsurnames'] = "Fjöldi eftirnafna<br />&nbsp;&nbsp; í eftirnafna skýi";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature smámynd";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
893c986
< 		$admtext['tablesuccess'] = "Tables created successfully.";
---
> 		$admtext['tablesuccess'] = "Töflumyndun tókst.";
896c989
< 		$admtext['entersysvars'] = "Enter values for system variables.";
---
> 		$admtext['entersysvars'] = "Stillingar fyrir kerfisbreytur.";
910c1003
< 		$admtext['phpreq'] = "(TNG krefst 5.3 eða hærri.)";
---
> 		$admtext['phpreq'] = "(TNG krefst 7.0 eða hærri.)";
915c1008
< 		$admtext['safemode'] = "Safe Mode";
---
> 		$admtext['safemode'] = "Öryggishamur";
926c1019
< 		$admtext['fpreq'] = "(TNG requires some files and folders to have special access rights.)";
---
> 		$admtext['fpreq'] = "(Sumar skýrslur og möppur í TNG þurfa að sérstök aðgangsréttindi.)";
935,936c1028,1029
< 		$admtext['keyrw'] = "Key folders are all read/write";
< 		$admtext['cfgrw'] = "Configuration files are all read/write";
---
> 		$admtext['keyrw'] = "Lykilmöppur hafa allar les- og skrifréttindi.";
> 		$admtext['cfgrw'] = "Stillingarskýrslur hafa allar les- og skrifréttindi.";
946c1039
< 		$admtext['rootpath'] = "Root Path";
---
> 		$admtext['rootpath'] = "Aðalskráasafn";
951,952c1044,1045
< 		$admtext['disallow'] = "Disallow";
< 		$admtext['defaultallowed'] = "Default: Allowed";
---
> 		$admtext['disallow'] = "Ekki leyfa";
> 		$admtext['defaultallowed'] = "Sjálfgefið: Leyfa";
955c1048
< 		$admtext['table'] = "Table";
---
> 		$admtext['table'] = "Tafla";
960,961c1053,1054
< 		$admtext['succbackedup'] = "successfully backed up";
< 		$admtext['succrestored'] = "successfully restored";
---
> 		$admtext['succbackedup'] = "öryggisafritun tókst";
> 		$admtext['succrestored'] = "enduruppsetning tókst";
973c1066
< 		$admtext['chooselang'] = "Dynamic Language Change";
---
> 		$admtext['chooselang'] = "Notendastýrt tungumálaval";
980,984c1073,1077
< 		$admtext['backuppath'] = "Afrita mappa";
< 		$admtext['photopath'] = "Mynda mappa";
< 		$admtext['headstonepath'] = "Legsteina mappa";
< 		$admtext['historypath'] = "Sögu mappa";
< 		$admtext['backuprestoretables'] = "Afrite, endurheimta og fínstilla gögn í töflum";
---
> 		$admtext['backuppath'] = "Mappa fyrir afrit";
> 		$admtext['photopath'] = "Mappa fyrir myndir";
> 		$admtext['headstonepath'] = "Mappa fyrir legsteina";
> 		$admtext['historypath'] = "Mappa fyrir sögur";
> 		$admtext['backuprestoretables'] = "Afrita, endurheimta og fínstilla gögn í töflum";
1009c1102
< 		$admtext['charset'] = "Character set";
---
> 		$admtext['charset'] = "Stafamengi";
1039,1040c1132,1133
< 		$admtext['asdrop'] = "As dropdown list";
< 		$admtext['gendex'] = "GENDEX mappa";
---
> 		$admtext['asdrop'] = "Sem fellilisti";
> 		$admtext['gendex'] = "Mappa fyrir GENDEX";
1050c1143
< 		$admtext['bordercolor'] = "Border Color";
---
> 		$admtext['bordercolor'] = "Litur jaðars";
1059c1152
< 		$admtext['linewidth'] = "Line Width";
---
> 		$admtext['linewidth'] = "Línubreidd";
1083,1084c1176,1177
< 		$admtext['mouseover'] = "Mouse Over";
< 		$admtext['mousedown'] = "Mouse Down";
---
> 		$admtext['mouseover'] = "Mús yfir";
> 		$admtext['mousedown'] = "Mús niður";
1102,1103c1195,1196
< 		$admtext['wholepath'] = "Import entire path";
< 		$admtext['justname'] = "Import file name only";
---
> 		$admtext['wholepath'] = "Innsetja alla slóðina";
> 		$admtext['justname'] = "Innsetja eingöngu skýrslunafn";
1126,1127c1219,1220
< 		$admtext['descchart'] = "Descendancy Chart";
< 		$admtext['pedchart'] = "Pedigree Chart";
---
> 		$admtext['descchart'] = "Niðjatré";
> 		$admtext['pedchart'] = "Ættartré";
1130c1223
< 		$admtext['documentpath'] = "Skjala mappa";
---
> 		$admtext['documentpath'] = "Mappa fyrir skjöl";
1132c1225
< 		$admtext['localotherpath'] = "Local Path(s) for Other Media";
---
> 		$admtext['localotherpath'] = "Staðbundin slóð(ir) fyrir aðra margmiðlun";
1172,1174c1265,1267
< 		$admtext['addresstable'] = "Heimilisfanga tafla";
< 		$admtext['statestable'] = "Fylkja tafla";
< 		$admtext['countriestable'] = "Landa tafla";
---
> 		$admtext['addresstable'] = "Tafla fyrir heimilisföng";
> 		$admtext['statestable'] = "Tafla fyrir fylki";
> 		$admtext['countriestable'] = "Tafla fyrir lönd";
1180c1273
< 		$admtext['tleventstable'] = "Tímalínu tafla";
---
> 		$admtext['tleventstable'] = "Tafla fyrir tímalínu";
1232d1324
< 		//added in 8.0.0
1239c1331
< 		$admtext['maxnoteprev'] = "Max characters in list notes";
---
> 		$admtext['maxnoteprev'] = "Hámarks stafafjöldi í athugasemdum";
1247c1339
< 		$admtext['extspath'] = "Extensions Folder";
---
> 		$admtext['extspath'] = "Mappa fyrir viðbætur";
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293,1300c1382,1386
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Re-use deleted IDs";
< 		$admtext['lastimport'] = "Show last import";
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Encryption";
<         //added in 11.0.0
< 		$admtext['dbport'] = "Database Port";
< 		$admtext['dbsocket'] = "Database Socket";
---
> 		$admtext['reuseids'] = "Endurnýta nr. einstaklings";
> 		$admtext['lastimport'] = "Sýna síðustu innsetningu";
>         $admtext['mailenc'] = "Dulkóðun";
> 		$admtext['dbport'] = "Gagnagrunnstengi (port)";
> 		$admtext['dbsocket'] = "Gagnagrunnstengill (socket)";
1302c1388
< 		$admtext['prefsection'] = "Prefixes and Suffixes";
---
> 		$admtext['prefsection'] = "Forskeyti og viðskeyti";
1330d1415
< 		//changed in 11.0.2
1339c1424
< 		$admtext['templatestable'] = "Template Settings";
---
> 		$admtext['templatestable'] = "Sniðmátsstillingar";
1359,1362c1444,1476
< 		$admtext['cookieapproval'] = "Show cookie approval message";
< 		$admtext['dataprotectmsg'] = "Show link to data protection policy";
< 		$admtext['nointernet'] = "I am using TNG offline";
< 		$admtext['askconsent'] = "Prompt for consent regarding personal info";
---
> 		$admtext['cookieapproval'] = "Sýna skilaboð um skilmála fyrir kökur (cookies)";
> 		$admtext['dataprotectmsg'] = "Sýna tengil til persónuverndarstefnu";
> 		$admtext['nointernet'] = "Ég nota TNG utankerfis.";
> 		$admtext['askconsent'] = "Biðja um samþykki fyrir persónulegum upplýsingum";
> 		//added in 13.0
> 		$admtext['coerce'] = "Breyta forskeytum sem koma inn til að þau passi við TNG stillingar";
> 		$admtext['sortevents'] = "Raða atburðum eftir";
> 		$admtext['sortbydate'] = "Dags. atburðar";
> 		$admtext['sortbytype'] = "Tegund atburðar";
> 		$admtext['allowsuggest'] = "Leyfa tillögur frá gestum";
> 		$admtext['livingchecked'] = "Nýtt fólk og fjölskyldur merkar lifandi";
> 		$admtext['maxmarried'] = "Merkja fjölskyldur lifandi ef hjónabandið hefur varað skemur en<br/>þetta mörg ár";
> 		$admtext['imagetags'] = "Rétthyrningar";
> 		$admtext['allowcsv'] = "Leyfa niðurhal á CSV skýrslum";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Flytja út sem SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Niðurhal";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of connection search runs";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Display textual path statement";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages in connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Ekki var hægt að skrá GPS hnit";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Ekki skrá landkóða";
1436d1549
< 		$admtext['backtosecondary'] = "Back to Secondary Processes";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Back to Secondary Processes";
1472c1587
< 		$admtext['charset'] = "Character set";
---
> 		$admtext['charset'] = "Stafamengi";
1478c1593
< 		$admtext['createtree'] = "Create a record for a new tree";
---
> 		$admtext['createtree'] = "Búa til skrá fyrir nýtt tré";
1480,1481c1595,1596
< 		$admtext['existingtrees'] = "Existing Tree Information";
< 		$admtext['editexistingtree'] = "Edit information for a previously entered tree";
---
> 		$admtext['existingtrees'] = "Upplýsingar um núverandi tré";
> 		$admtext['editexistingtree'] = "Breyta upplýsingum um áður skráð tré";
1485,1487c1600,1602
< 		$admtext['conftreeclear'] = "Are you sure you want to clear all data from this tree?";
< 		$admtext['changestotree'] = "Changes to tree";
< 		$admtext['newtreeinfo'] = "New Tree Information";
---
> 		$admtext['conftreeclear'] = "Ertu viss um að þú viljir hreinsa öll gögn úr þessu tréi?";
> 		$admtext['changestotree'] = "Breytingar á tréi";
> 		$admtext['newtreeinfo'] = "Upplýsingar um nýtt tré";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513c1626,1631
< 		$admtext['importfilename'] = "Import File Name";
---
> 		$admtext['importfilename'] = "Innsetja skýrslunafn";
> 		//added in 13.0
> 		$admtext['exnotes'] = "Útiloka athugasemdir";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip-skrá og taka margmiðlunarskýrslur með";
> 		$admtext['downloadzip'] = "Niðurhlaða ZIP";
1572,1575c1690,1692
< 		$admtext['allow_edit'] = "Allow to edit existing records";
< 		$admtext['allow_add'] = "Allow to add new records";
< 		$admtext['allow_delete'] = "Allow to delete existing records";
< 		//added in 8.0.0
---
> 		$admtext['allow_edit'] = "Réttindi til að breyta gögnum í gagnagrunni.";
> 		$admtext['allow_add'] = "Réttindi til að búa til ný gögn.";
> 		$admtext['allow_delete'] = "Réttindi til að eyða skráðu gögnum.";
1579c1696
< 		$admtext['usrsubm'] = "Innsendari m/takmörkkuð réttindi";
---
> 		$admtext['usrsubm'] = "Innsendari m/takmörkuð réttindi";
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Sýna aðeins óvirka notendur";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1651c1771
< 		$admtext['igndel'] = "Ignore and Delete";
---
> 		$admtext['igndel'] = "Hundsa og eyða";
1656d1775
< 	//added in 8.0.0
1661,1663c1780,1782
< 		$admtext['dvblurb'] = "Find potential problems in your information.";
< 		$admtext['wr_gender'] = "Wrong gender";
< 		$admtext['unk_gender'] = "Unknown gender";
---
> 		$admtext['dvblurb'] = "Finndu mögulegar villur í gögnunum þínum.";
> 		$admtext['wr_gender'] = "Rangt kyn";
> 		$admtext['unk_gender'] = "Óþekkt kyn";
1665,1673c1784,1792
< 		$admtext['marr_aft_death'] = "Married after death";
< 		$admtext['marr_bef_birth'] = "Married before birth";
< 		$admtext['died_bef_birth'] = "Died before birth";
< 		$admtext['parents_younger'] = "Born too early (parents less than 15 years old, or child born before marriage)";
< 		$admtext['children_late'] = "Born too late (mother more than 50 years old)";
< 		$admtext['not_living'] = "Person marked as living, death date present";
< 		$admtext['not_dead'] = "Person marked as deceased, possibly still living";
< 		$admtext['parmarr'] = "Parents' Marriage";
< 		$admtext['motherbirth'] = "Mother's Birth";
---
> 		$admtext['marr_aft_death'] = "Í hjónaband eftir andlát";
> 		$admtext['marr_bef_birth'] = "Í hjónaband fyrir fæðingu";
> 		$admtext['died_bef_birth'] = "Lést fyrir fæðingu";
> 		$admtext['parents_younger'] = "Fæddist of snemma (foreldrar undir 15 ára eða barn fætt fyrir hjónaband)";
> 		$admtext['children_late'] = "Fæddist of seint (móðir eldri en 50 ára)";
> 		$admtext['not_living'] = "Einstaklingur merktur á lífi en dánardagur er skráður";
> 		$admtext['not_dead'] = "Einstaklingur skráður sem látinn en hugsanlega enn á lífi";
> 		$admtext['parmarr'] = "Hjónaband foreldra";
> 		$admtext['motherbirth'] = "Fæðing móður";
1677c1796
< 		$admtext['modlist'] = "Mod List";
---
> 		$admtext['modlist'] = "Listi yfir viðbætur";
1682c1801
< 		$admtext['cfgname'] = "Config File Name";
---
> 		$admtext['cfgname'] = "Heiti stillingarskýrslu";
1686c1805
< 		$admtext['missing'] = "Missing";
---
> 		$admtext['missing'] = "Vantar";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1707c1824
< 		$admtext['options'] = "Options";
---
> 		$admtext['options'] = "Valmöguleikar";
1711c1828
< 		$admtext['copiesfile'] = "Copies";
---
> 		$admtext['copiesfile'] = "Afrit";
1716c1833
< 		$admtext['modname'] = "Mod Name";
---
> 		$admtext['modname'] = "Nafn viðbótar";
1719c1836
< 		$admtext['ready'] = "OK to Install";
---
> 		$admtext['ready'] = "Hægt að setja inn";
1733c1850
< 		$admtext['tngmods'] = "Mods for TNG ";
---
> 		$admtext['tngmods'] = "Viðbætur fyrir TNG ";
1742c1859
< 		$admtext['choosefilter'] = "Choose the filter and click Go for the available controls";
---
> 		$admtext['choosefilter'] = "Veldu síu og smelltu svo á hnappinn til að fá fram niðurstöðurnar";
1744c1861
< 		$admtext['statusfilter'] = "Status";
---
> 		$admtext['statusfilter'] = "Staða";
1747c1864
< 		$admtext['cleanup'] = "Clean Up";  // previously used as $admtext['clean']
---
> 		$admtext['cleanup'] = "Hreinsa";  // previously used as $admtext['clean']
1801c1918
< 		$admtext['aflist'] = "Files";
---
> 		$admtext['aflist'] = "Skýrslur";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Ógildur stafur";
1886d2008
< 		$admtext['test_number'] = "Prófnúmer";
1916d2037
< 		$admtext['xtra_mut'] = "Extra mutations";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Prófnúmer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Tengja þetta DNA próf við einstakling";
1966d2095
< $admtext['otherevents'] = "Aðrir atburðir";
1993c2122
< $admtext['tablecreation'] = "Table Creation";
---
> $admtext['tablecreation'] = "Töflu gerð";
2051,2054c2180,2181
< $admtext['savereturn'] = "Snúa aftur á þessa síðu";
< $admtext['saveback'] = "Snúa aftur til valmyndar";
< $admtext['user'] = "Notandanum";
< $admtext['DIV'] = "Skilin";
---
> $admtext['user'] = "Notandi";
> $admtext['DIV'] = "Fráskilin";
2059,2060d2185
< $admtext['secondary'] = "Secondary Processes";
< $admtext['commas'] = "Separate multiple entries with commas";
2130,2134c2255,2257
< $admtext['secondarymaint'] = "Secondary Processes";
< $admtext['customeventtypes'] = "Sérsniðnir atburðir";
< $admtext['findmatches'] = "Find Matches";
< $admtext['matchthese'] = "Match the following fields:";
< $admtext['otheroptions'] = "Other Options:";
---
> $admtext['findmatches'] = "Finna samstæður";
> $admtext['matchthese'] = "Finna samstæður fyrir eftirfarandi möguleika:";
> $admtext['otheroptions'] = "Aðrir valmöguleikar:";
2136c2259
< $admtext['nextmatch'] = "Next Match";
---
> $admtext['nextmatch'] = "Næsta samstæða";
2138,2141c2261,2264
< $admtext['comprefresh'] = "Compare/Refresh";
< $admtext['mswitch'] = "Switch";
< $admtext['nomatches'] = "No Matches";
< $admtext['combineextras'] = "Combine media";  //changed as well
---
> $admtext['comprefresh'] = "Bera saman/Endurhlaða síðuna";
> $admtext['mswitch'] = "Víxla";
> $admtext['nomatches'] = "Engar samstæður";
> $admtext['combineextras'] = "Sameina miðlun";  //changed as well
2211c2334
< $admtext['alphanum'] = "Vinstamlegast notaðu einungis tölustafi í nr. tré þíns.";
---
> $admtext['alphanum'] = "Vinsamlegast notaðu einungis tölustafi í númerinu á tréinu þínu.";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tegund";
< //moved here in 10.0.0
2283,2285c2398,2399
< //added in 10.0.0
< $admtext['videos'] = "Videos";
< $admtext['recordings'] = "Recordings";
---
> $admtext['videos'] = "Myndbönd";
> $admtext['recordings'] = "Upptökur";
2297,2299c2411,2413
< $admtext['privateonly'] = "Private only";
< $admtext['dna_links'] = "DNA Links";
< $admtext['dataval'] = "Data Validation";
---
> $admtext['privateonly'] = "Eingöngu faldir einstaklingar";
> $admtext['dna_links'] = "DNA tenglar";
> $admtext['dataval'] = "Notkunarprófun gagna";
2302,2303c2416,2417
< $admtext['templates'] = "Templates";
< $admtext['findciteid'] = "Find Citation ID";
---
> $admtext['templates'] = "Sniðmát";
> $admtext['findciteid'] = "Finna númer tilvitnunar";
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Eftirnöfn";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Mynd";
> $admtext['author'] = "Höfundur";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Byrjunarleiðbeiningar";
> $admtext['showlog'] = "Skrá yfir breytingar";
> $admtext['nobirthinfo'] = "Engar fæðingarupplýsingar";
> //changed in 13.0
> $admtext['savereturn'] = "Geyma + Halda áfram";
> $admtext['saveback'] = "Geyma + Hætta";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Öllum atriðum var eytt.";
> $admtext['private'] = "Falin(n)";
> $admtext['imgtags'] = "Merki myndar";
> 
> $admtext['removelink'] = "Fjarlægja tengil";
> $admtext['eloptions'] = "Skoða eða eyða";
> $admtext['pleaseenter'] = "Vinsamlegast sláðu inn ";
> 
> $admtext['nolinks'] = "Engir tenglar til";
> $admtext['nogeocode'] = "Ekki var hægt að skrá GPS hnit";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Sérsniðnir atburðir";
> $admtext['secondary'] = "Secondary Processes";
> $admtext['otherevents'] = "Aðrir atburðir";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Tegund";
> $admtext['move'] = "Færa";
> $admtext['copy'] = "Afrita";
> $admtext['title2'] = "Titill"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Icelandic/alltext.php TNG1403/languages/Icelandic/alltext.php
4,8c4,8
< $dates['JAN'] = "jan";
< $dates['JANUARY'] = "janúar";
< $dates['FEB'] = "feb";
< $dates['FEBRUARY'] = "febrúar";
< $dates['MAR'] = "mar";
---
> $dates['JAN'] = "jan.";
> $dates['JANUARY'] = "janúar";
> $dates['FEB'] = "feb.";
> $dates['FEBRUARY'] = "febrúar";
> $dates['MAR'] = "mar.";
10,19c10,19
< $dates['APR'] = "apr";
< $dates['APRIL'] = "apríl";
< $dates['MAY'] = "maí";
< $dates['JUN'] = "jún";
< $dates['JUNE'] = "júní";
< $dates['JUL'] = "júl";
< $dates['JULY'] = "júlí";
< $dates['AUG'] = "ágú";
< $dates['AUGUST'] = "ágúst";
< $dates['SEP'] = "sep";
---
> $dates['APR'] = "apr.";
> $dates['APRIL'] = "apríl";
> $dates['MAY'] = "maí";
> $dates['JUN'] = "jún.";
> $dates['JUNE'] = "júní";
> $dates['JUL'] = "júl.";
> $dates['JULY'] = "júlí";
> $dates['AUG'] = "ágú.";
> $dates['AUGUST'] = "ágúst";
> $dates['SEP'] = "sep.";
21,25c21,25
< $dates['OCT'] = "okt";
< $dates['OCTOBER'] = "október";
< $dates['NOV'] = "nóv";
< $dates['NOVEMBER'] = "nóvember";
< $dates['DEC'] = "des";
---
> $dates['OCT'] = "okt.";
> $dates['OCTOBER'] = "október";
> $dates['NOV'] = "nóv.";
> $dates['NOVEMBER'] = "nóvember";
> $dates['DEC'] = "des.";
29c29
< $dates['BEF'] = "fyr";
---
> $dates['BEF'] = "fyrir";
31c31
< $dates['AFT'] = "eft";
---
> $dates['AFT'] = "eftir";
36c36
< $dates['FROM'] = "Frá";
---
> $dates['FROM'] = "Frá";
38c38
< $dates['Y'] = "Já, dagsetning ókunn";
---
> $dates['Y'] = "Já, dagsetning ókunn";
40c40
< $dates['EST'] = "Est";
---
> $dates['EST'] = "Ca.";
43c43
< $text['cannotexecutequery'] = "Ekki hægt að verða við beiðni";
---
> $text['cannotexecutequery'] = "Ekki hægt að verða við beiðni";
46c46
< $text['text_next'] = "Næsta";
---
> $text['text_next'] = "Næsta";
48,59c48,59
< $text['clickdisplay'] = "Smelltu til að sýna";
< $text['clickhide'] = "Smelltu til að fela";
< $text['forgot1'] = "<strong>Ertu búinn að gleyma notendanafninu eða lykilorðinu?</strong><br />Sláðu inn netfangið þitt hér fyrir neðan og við sendum þér notendanafnið.";
< $text['forgot2'] = "Sláðu inn netfangið hér fyrir ofan og notendanafnið fyrir neðan til að fá nýtt lykilorð (þér verður sent tímabundið lykilorð).";
< $text['newpass'] = "Nýja bráðarbirgða lykilorðið þitt";
< $text['usersent'] = "Notendanafnð hefur verið sent á netfangið þitt.";
< $text['pwdsent'] = "Nýja bráðarbirgða lykilorðið hefur verið sent á netfangið þitt.";
< $text['loginnotsent2'] = "Þetta netfang er ekki til á skrá hjá okkur, engar upplýsingar hafa verið sendar.";
< $text['loginnotsent3'] = "Þetta netfang og/eða notendanafn er ekki til á skrá hjá okkur, engar upplýsingar hafa verið sendar.";
< $text['logininfo'] = "Notendanafnið þitt";
< $text['collapseall'] = "Fella allt";
< $text['expandall'] = " útlista allt nánar ";
---
> $text['clickdisplay'] = "Smelltu til að sýna";
> $text['clickhide'] = "Smelltu til að fela";
> $text['forgot1'] = "<strong>Ertu búinn að gleyma notendanafninu eða lykilorðinu?</strong><br />Sláðu inn netfangið þitt hér fyrir neðan og við sendum þér notendanafnið.";
> $text['forgot2'] = "Sláðu inn netfangið hér fyrir ofan og notendanafnið fyrir neðan til að fá nýtt lykilorð (þér verður sent tímabundið lykilorð).";
> $text['newpass'] = "Nýja bráðarbirgða lykilorðið þitt";
> $text['usersent'] = "Notendanafnð hefur verið sent á netfangið þitt.";
> $text['pwdsent'] = "Nýja bráðarbirgða lykilorðið hefur verið sent á netfangið þitt.";
> $text['loginnotsent2'] = "Þetta netfang er ekki til á skrá hjá okkur, engar upplýsingar hafa verið sendar.";
> $text['loginnotsent3'] = "Þetta netfang og/eða notendanafn er ekki til á skrá hjá okkur, engar upplýsingar hafa verið sendar.";
> $text['logininfo'] = "Notendanafnið þitt";
> $text['collapseall'] = "Fella allt saman";
> $text['expandall'] = " Þenja allt út";
62,63c62,63
< $text['photos'] = "Ljósmyndir";
< $text['documents'] = "Skjöl";
---
> $text['photos'] = "Ljósmyndir";
> $text['documents'] = "Skjöl";
65,67c65,67
< $text['histories'] = "Sögur";
< $text['recordings'] = "Upptökur";
< $text['videos'] = "Myndbönd";
---
> $text['histories'] = "Sögur";
> $text['recordings'] = "Upptökur";
> $text['videos'] = "Myndbönd";
70c70
< $admtext['placelevel'] = "Gerð staðar";
---
> $admtext['placelevel'] = "Gerð staðar";
72,73c72,73
< $admtext['level2'] = "Staðsetning";
< $admtext['level3'] = "Bær/Borg";
---
> $admtext['level2'] = "Staðsetning";
> $admtext['level3'] = "Bær/Borg";
75c75
< $admtext['level5'] = "Sýsla";
---
> $admtext['level5'] = "Sýsla";
79c79
< $text['male'] = "Maður";
---
> $text['male'] = "Maður";
81,82c81,82
< $text['closewindow'] = "Loka þessum glugga";
< $text['loading'] = "Hleð inn síðu...";
---
> $text['closewindow'] = "Loka þessum glugga";
> $text['loading'] = "Hleð inn síðu...";
84,86c84,86
< $text['cancel'] = "Hætta við";
< $text['none'] = "ekkert";
< $text['mainton'] = "Viðhald í gangi";
---
> $text['cancel'] = "Hætta við";
> $text['none'] = "enginn";
> $text['mainton'] = "Viðhald í gangi";
88,89c88
< //moved here in 8.0.0
< $text['living'] = "Á lífi";
---
> $text['living'] = "� lífi";
91,95c90,94
< $admtext['confunlink'] = "Ertu viss um að þú viljir aftengja þennan einstakling sem maka í þessari fjölskyldu?";
< $admtext['confunlinkc'] = "Ertu viss um að þú viljir aftengja þennan einstakling sem barn í fjölskyldunni?";
< $admtext['confremchild'] = "Ertu viss um að þú viljir fjarlægja þetta barn frá fjölskyldunni? Einstklingurinn verður ekki eytt úr gagnagrunninum.";
< $admtext['enterfamilyid'] = "Sláðu inn fjölskyldu ID.";
< $admtext['yes'] = "Já";
---
> $admtext['confunlink'] = "Ertu viss um að þú viljir aftengja þennan einstakling sem maka í þessari fjölskyldu?";
> $admtext['confunlinkc'] = "Ertu viss um að þú viljir aftengja þennan einstakling sem barn í fjölskyldunni?";
> $admtext['confremchild'] = "Ertu viss um að þú viljir fjarlægja þetta barn frá fjölskyldunni? Einstklingurinn verður ekki eytt úr gagnagrunninum.";
> $admtext['enterfamilyid'] = "Sláðu inn fjölskyldu ID.";
> $admtext['yes'] = "Já";
97,101c96,100
< $admtext['BIRT'] = "Fæðing";
< $admtext['DEAT'] = "Andlát";
< $admtext['CHR'] = "Skírn";
< $admtext['BURI'] = "Jarðsetning";
< $admtext['BAPL'] = "Skírn (LDS)";
---
> $admtext['BIRT'] = "Fæðing";
> $admtext['DEAT'] = "Andlát";
> $admtext['CHR'] = "Skírn";
> $admtext['BURI'] = "Jarðsetning";
> $admtext['BAPL'] = "Skírn (LDS)";
110,118c109,115
< $admtext['hello'] = "Halló";
< $admtext['activated'] = "Notendareikningur þinn hefur verið búinn til.";
< $admtext['infois'] = "Skráningarupplýsingarnar þínar eru";
< $admtext['subjectline'] = "Ættfræði - Notendareikningur þinn hefur verið búinn til";
< 
< //moved here in 8.1.0
< $admtext['adopted'] = "Ættleiðing";
< $admtext['birth'] = "fæðing";
< $admtext['foster'] = "Fóstur";
---
> $admtext['hello'] = "Halló";
> $admtext['activated'] = "Notendareikningur þinn hefur verið búinn til.";
> $admtext['infois'] = "Skráningarupplýsingarnar þínar eru";
> $admtext['subjectline'] = "Ættfræði - Notendareikningur þinn hefur verið búinn til";
> $admtext['adopted'] = "Ættleiðing";
> $admtext['birth'] = "fæðing";
> $admtext['foster'] = "Fóstur";
120d116
< //added in 11.0.3
123,128c119,121
< //added in 9.0.0
< $text['editprofile'] = "Breyta notendaupplýsingum";
< 
< //moved here in 9.0.0
< $text['letter'] = "Bréf"; //as in page size
< $text['legal'] = "Löglegt"; //as in page size
---
> $text['editprofile'] = "Breyta notendaupplýsingum";
> $text['letter'] = "Bréf"; //as in page size
> $text['legal'] = "Löglegt"; //as in page size
130,132c123,125
< $text['monday'] = "Mánudagur";
< $text['tuesday'] = "Þriðjudagur";
< $text['wednesday'] = "Miðvikudagur";
---
> $text['monday'] = "Mánudagur";
> $text['tuesday'] = "Þriðjudagur";
> $text['wednesday'] = "Miðvikudagur";
134c127
< $text['friday'] = "Föstudagur";
---
> $text['friday'] = "Föstudagur";
137c130
< $text['startswith'] = "byrjar á";
---
> $text['startswith'] = "byrjar á";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
144,149c134,137
< $text['enteremail'] = "Vinsamlegast sláðu inn netfang.";
< $text['page'] = "Síða";
< $text['go'] = "Áfram";
< $text['years'] = "ára";
< 
< //added in 10.0.0
---
> $text['enteremail'] = "Vinsamlegast sláðu inn netfang.";
> $text['page'] = "Síða";
> $text['go'] = "�fram";
> $text['years'] = "ára";
152c140
< $admtext['step'] = "Stepchild";
---
> $admtext['step'] = "Stjúpbarn";
154a143,146
> $text['dna_tests'] = "DNA próf";
> $admtext['preflang'] = "Valið tungumál";
> $text['query'] = "Fyrirspurn";
> $text['fanchart'] = "Ættarhringur";
156,163d147
< //added in 11.0.0
< $text['dna_tests'] = "DNA próf";
< $admtext['preflang'] = "Valið tungumál";
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
< $text['query'] = "Query";
< $text['fanchart'] = "Fan Chart";
< 
< //moved here in 12.0.0
165c149
< $admtext['dna_groups'] = "DNA hópar";
---
> $admtext['dna_groups'] = "DNA hópar";
167c151
< $admtext['active'] = "Active";
---
> $admtext['active'] = "Virk";
171c155
< $admtext['medialinks'] = "Tengingar við margmiðlun";
---
> $admtext['medialinks'] = "Tengingar við margmiðlun";
173,175c157
< //added here in 12.0.0
< $text['testgroup'] = "Test Group";
< $text['test_number'] = "Heiti/númer prófs";
---
> $text['testgroup'] = "Prófhópur";
177,181c159,163
< $text['confirmed'] = "Staðfest";
< $text['predicted'] = "Spáð";
< $admtext['ancestral_surnames'] = "Ancestral surnames";
< $admtext['admin_notes'] = "Administrator notes";
< $admtext['mda'] = "Most distant ancestor";
---
> $text['confirmed'] = "Staðfest";
> $text['predicted'] = "Spáð";
> $admtext['ancestral_surnames'] = "Eftirnöfn forfeðra";
> $admtext['admin_notes'] = "Athugasemdir stjórnanda";
> $admtext['mda'] = "Fjarskyldasti forfaðirinn";
191,193c173,175
< $text['keep_name_private'] = "Keep Name Private";
< $text['test_results'] = "Niðurstöður";
< $admtext['dna_tests'] = "DNA próf";
---
> $text['keep_name_private'] = "Halda nöfnum földum";
> $text['test_results'] = "Niðurstöður";
> $admtext['dna_tests'] = "DNA próf";
196c178
< $admtext['haplo'] = "Haplogroup";
---
> $admtext['haplo'] = "haplohópur";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Heiti/númer prófs";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Deilt DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Litninganúmer";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "Allir hópar";
> $admtext['alltypes'] = "Allar tegundir";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "f.";
> $text['chrabbr'] = "s.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "graf.";  //from descend
> $text['marrabbr'] = "G.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Finna alla einstaklinga með viðburði á þessum stað";
> $text['firstpage'] = "Fyrsta síða";
> $text['lastpage'] = "Síðasta síða";
> 
> //changed in 13.0.0
> $text['problem'] = "Villa hefur komið upp í TNG forritinu. Hvað skal gera:<p>Ef þú ert nýbúin(n) að setja inn uppfærslu, þá gæti verið að þú hafir hoppað yfir hlutann með uppsetningarleiðbeiningum. Farðu aftur í readme skýrslu uppfærslunnar og lestu leiðbeiningarnar yfir aftur. Skoðaðu hlutann um uppbyggingu gagnagrunnins sérstaklega vel.</p><p>Ef þú varst að setja TNG upp í fyrsta sinn, gæti verið að þig vanti að búa til töflurnar í gagnagrunninum. Farðu aftur á readme.html síðuna til að finna það skref í leiðbeiningunum.</p><p>Ef þetta er heimasíðan þín, geturðu haft samband við TNG aðstoðina (þar sem þú keyptir forritið). Vinsamlegast afritið fyrirspurnina (query) hér fyrir neðan og settu það inn í tölvupósinn.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Engin grein";
> 
> //added in 14.0
> $text['oneyear'] = "ár";
> $text['pwdcodelink'] = "Smelltu á þennan tengil til að fá sent tímabundið lykilorð.";
> $text['pwdcodesent'] = "Þér hefur verið sendur hlekkur til að endursetja lykilorðið þitt.";
> $text['moved'] = "Flutt";
> $text['citation'] = "Heimild";
> $text['other'] = "Aðrar upplýsingar";
> $text['death'] = "Andlát";
> $text['burial'] = "Greftrun";
> $text['cremation'] = "Líkbrennsla";
> $text['marriage'] = "Hjónaband";
> $text['divorce'] = "Skilnaður";
> $text['bylength'] = "Skref";
> $text['bymarriages'] = "Hjónabönd";
> $text['none'] = "enginn";
> 
> //moved here in 14.0
> $text['family'] = "Fjölskylda";
> $text['source'] = "Heimildir";
> $text['repository'] = "Greftrunarstaður";
> $text['place'] = "Staður";
> $admtext['BAPM'] = "Skírn";
> 
> $text['glang'] = "is";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Icelandic/text.php TNG1403/languages/Icelandic/text.php
69d68
< 		$text['general'] = "Almennt";
78c77,78
< 		$text['relcalc'] = "Skyldleika reiknir";
---
> 	case "connections":
> 		$text['relcalc'] = "Skyldleika reiknivél";
84,85c84,85
< 		$text['findpersonid'] = "Finna einstaklings númer";
< 		$text['enternamepart'] = "Sláður inn hluta fyrra nafns/eða seinna nafns";
---
> 		$text['findpersonid'] = "Finna númer einstaklings";
> 		$text['enternamepart'] = "Sláðu inn hluta fyrra nafns/eða seinna nafns";
91c91
< 		$text['notrelated'] = "þessir 2 einstaklingar eru ekki skyldir innan xxx kynslóða."; //xxx will be replaced with number of generations
---
> 		$text['notrelated'] = "Þessir 2 einstaklingar eru ekki skyldir innan xxx kynslóða."; //xxx will be replaced with number of generations
126c126
< 		$text['gencheck'] = "Hámarks fjöldi kynslóða<br />sem skal athugast";
---
> 		$text['gencheck'] = "Hámarks fjöldi kynslóða<br />sem skoða skal";
157,158c157,158
< 		$text['ggfath'] = "the xxx great grandfather of";
< 		$text['ggmoth'] = "the xxx great grandmother of";
---
> 		$text['ggfath'] = "xxx langafi";
> 		$text['ggmoth'] = "xxx langamma";
160c160
< 		$text['ggson'] = "the xxx great grandson of";
---
> 		$text['ggson'] = "xxx barnabarnabarn";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Leita að tengingum";
> 		$text['findrel2'] = "Rekja saman";
> 		$text['makeme2nd'] = "Use my ID";
> 		$text['usebookmarks'] = "Nota bókamerki";
> 		$text['select2inds'] = "Veldu 2 einstaklinga.";
> 		$text['indinfofor'] = "Einstaklings upplýsingar fyrir";
> 		$text['nobookmarks'] = "Það er ekkert bókamerki til";
> 		$text['bkmtitle'] = "Einstaklingar fundnir í bókamerkjum";
> 		$text['bkminfo'] = "Velja einstakling:";
> 		$text['sortpathsby'] = "Sort paths by number of";
> 		$text['sortbyshort'] = "Raða eftir";
> 		$text['bylengthshort'] = "Lengd";
> 		$text['badID1'] = ": bad person1 ID - please go back and correct";
> 		$text['badID2'] = ": bad person2 ID - please go back and correct";
> 		$text['notintree'] = ": the person with this ID is not in the current tree database.";
> 		$text['sameperson'] = "Þetta er sama manneskjan.";;
> 		$text['nopaths'] = "Þessir einstaklingar eru ekki tengdir.";
> 		$text['nopaths1'] = "No more connections shorter than xxx";
> 		$text['nopaths2'] = "í xxx leitarskrefum";
> 		$text['longestpath'] = "(longest path checked so far was xxx steps long)";
> 		$text['relevantpaths'] = "The number of different relevant paths found: xxx";
> 		$text['skipMarr'] = "(in addition, the number of paths found but not displayed due to too many marriages was: xxx)";
> 		$text['mjaor'] = "or";
> 		$text['connectionsto'] = "Connections to ";
> 		$text['findanotherpers'] = "Finna annan einstakling...";
> 		$text['sometimes'] = "(Stundum þegar athugað er yfir mismunandi fjölda kynslóða kemur önnur niðurstaða.)";
> 		$text['anotherpath'] = "Leita að öðrum tengingum";
> 		$text['xpath'] = "Leið ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Foreldri";
> 		$text['mhfather'] = "faðir hans";
> 		$text['mhmother'] = "móðir hans";
> 		$text['mhhusband'] = "eiginmaður hans";
> 		$text['mhwife'] = "eiginkona hans";
> 		$text['mhson'] = "sonur hans";
> 		$text['mhdaughter'] = "dóttir hans";
> 		$text['fhfather'] = "faðir hennar";
> 		$text['fhmother'] = "móðir hennar";
> 		$text['fhhusband'] = "eiginmaður hennar";
> 		$text['fhwife'] = "eiginkona hennar";
> 		$text['fhson'] = "sonur hennar";
> 		$text['fhdaughter'] = "dóttir hennar";
> 		$text['hfather'] = "faðir";
> 		$text['hmother'] = "móðir";
> 		$text['hhusband'] = "eiginmaður";
> 		$text['hwife'] = "eiginkona";
> 		$text['hson'] = "sonur";
> 		$text['hdaughter'] = "dóttir";
> 		$text['maxruns'] = "Max number of paths to be checked";
> 		$text['maxrshort'] = "Max paths";
> 		$text['maxlength'] = "Connection paths no longer than";
> 		$text['maxlshort'] = "Hámarkslengd";
> 		$text['xstep'] = "skref";
> 		$text['xsteps'] = "skref";
> 		$text['xmarriages'] = "xxx hjónabönd";
> 		$text['xmarriage'] = "1 hjónaband";
> 		$text['showspouses'] = "Sýna báða maka";
> 		$text['showTxt'] = "Show textual path description";
> 		$text['showTxtshort'] = "Textual desc.";
> 		$text['compactBox'] = "Show person boxes compacted";
> 		$text['compactBoxshort'] = "Compact boxes";
> 		$text['paths'] = "Paths";
> 		$text['dospouses2'] = "Sýna maka";
> 		$text['maxmopt'] = "Hámarksfjöldi hjónabanda í tengingu";
> 		$text['maxm'] = "Hámarksfjöldi hjónabanda";
> 		$text['arerelated'] = "Þessir einstaklingar eru skyldir - tenging þeirra er sýnd á Leið 1";
> 		$text['simplerel'] = "Einföld tengsla leit";
196d264
< 		$text['scrollnote'] = "Ath: Þú þarft kannski að skruna niður eða til hægri til að sjá.";
199d266
< 		$text['popupnote2'] = " = Nýtt niðjatal";
215,216c282,283
< 		$text['paternal'] = "Paternal";
< 		$text['maternal'] = "Maternal";
---
> 		$text['paternal'] = "Föður";
> 		$text['maternal'] = "Móður";
232c299
< 		$text['extrasexpl'] = "Ef að ljósmyndir eða sögur eru til um viðkomandi einstakling, koma viðeigandi myndir næst við nöfnin.";
---
> 		$text['extrasexpl'] = "Ef að ljósmyndir eða sögur eru til um viðkomandi einstakling, koma viðeigandi myndir við nöfnin.";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Töflur";
> 		$text['dtchildren'] = "Börn";
> 		$text['dtgrandchildren'] = "Barnabörn";
> 		$text['dtggrandchildren'] = "Barnabarnabörn";
> 		$text['dtgggrandchildren'] = "Barnabarnabörn"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Engir afkomendur";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Samtals";
> 		$text['dtselect'] = "Velja";
> 		$text['dteachfulltable'] = "Each full table will have";
> 		$text['dtrows'] = "raðir";
> 		$text['dtdisplayingtable'] = "Displaying table";
> 		$text['dtgototable'] = "Go to table:";
> 		$text['fcinstrdn'] = "Sýna fjölskyldu með maka";
> 		$text['fcinstrup'] = "Sýna fjölskyldu með foreldrum";
> 		$text['fcinstrplus'] = "Velja aðra maka";
> 		$text['fcinstrfam'] = "Velja aðra foreldra";
309c395
< 		$text['explain'] = "Sláðu inn dagsetningu til að sjá atburði þann dag eða skyldu reitina eftir auða til að sjá alla atburði.";
---
> 		$text['explain'] = "Sláðu inn dagsetningu til að sjá atburði þann dag, eða skyldu reitina eftir auða til að sjá alla atburði.";
316c402
< 		$text['spousename'] = "Nafn Maka";
---
> 		$text['spousename'] = "Nafn maka";
331c417
< 		$text['spousemore'] = "Ef þú slærð in eftirnafn maka verður þú að minnsta kosti að slá inn í einn annan reit hjá honum.";
---
> 		$text['spousemore'] = "Ef þú slærð in eftirnafn maka verður þú að minnsta kosti að slá inn í einn annan reit fyrir viðkomandi.";
381,383c467
< 		$text['firstpage'] = "Fyrsta síða";
< 		$text['lastpage'] = "Síðasta síða";
< 		$text['photoowner'] = "Eigandi/heimild";
---
> 		$text['photoowner'] = "Eigandi frumrits";
404c488
< 		$text['cemphotos'] = "Myndir af kirkjugörðum";
---
> 		$text['cemphotos'] = "Myndir úr kirkjugarði";
412c496
< 		$text['editcem'] = "Breyta grafreit";
---
> 		$text['editcem'] = "Breyta kirkjugarði";
428c512
< 		$text['allburials'] = "Allir kirkjugarðar";
---
> 		$text['allburials'] = "Allar greftranir";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Víxla merkjum";
447c533
< 		$text['mainsurnamepage'] = "Aðal eftirnafna síðan";
---
> 		$text['mainsurnamepage'] = "Upphafssíða fyrir eftirnöfn";
453c539
< 		$text['numoccurrences'] = "fjöldi í foreldrartölu";
---
> 		$text['numoccurrences'] = "fjöldi í sviga";
459,460c545,546
< 		$text['mainplacepage'] = "Aðal staðir síða";
< 		$text['allplaces'] = "Öll stærstu umhverfin";
---
> 		$text['mainplacepage'] = "Upphafssíða fyrir staði";
> 		$text['allplaces'] = "Allir staðir";
481c567
< 		$text['pastxdays'] = "(Síðustu xx daga)";
---
> 		$text['pastxdays'] = "(Síðustu xx dagana)";
549d634
< 		//changed in 8.0.0
555,556c640
< 		$text['pwdsmatch'] = "lykilorð þín passa ekki saman. Vinsamlegast sláðu inn sama aðgangsorðið í hvern reit.";
< 		//added in 8.0.0
---
> 		$text['pwdsmatch'] = "Lykilorð þín eru ekki samstæð. Vinsamlegast sláðu inn sama aðgangsorðið í hvern reit.";
560c644,651
< 		$text['switch'] = "Switch";
---
> 		$text['switch'] = "Víxla";
> 		//added in 14.0
> 		$text['newpassword2'] = "New password again";
> 		$text['resetsuccess'] = "Success: Password has been reset";
> 		$text['resetfail'] = "Failure: Password not reset";
> 		$text['failreason0'] = " (unknown database error)";
> 		$text['failreason2'] = " (you don't have permission to change your password)";
> 		$text['failreason3'] = " (passwords did not match)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total Source Citations";
618d710
< 		$text['loginfirst'] = "Þú verður að skrá  þig inn fyrst.";
621c713
< 		$text['nouser'] = "Notandi var ekki búinn til. notendanafn er líklega til.";
---
> 		$text['nouser'] = "Notandi var ekki búinn til. Notendanafn er líklega þegar til.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Notendagögn finnast fyrir í kerfinu. Til að halda áfram verður þú fyrst að skrá þig inn eða að eyða öllum skráningum í notendatöflu.";
629,630d722
< 		$text['zoomin'] = "þysja Inn";
< 		$text['zoomout'] = "þysja úr";
638c730
< 		$text['magnifyreg'] = "Smelltu tul að stækka hluta af myndinni";
---
> 		$text['magnifyreg'] = "Smelltu til að stækka hluta af myndinni";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC forfaðir";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Byrjun";
> 		$text['segment_end'] = "Endir";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "f.";
< $text['chrabbr'] = "c.";
675d788
< $text['family'] = "Fjölskylda"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
700,701c812,813
< $text['died'] = "Dáin(n)";
< $text['buried'] = "Jarðsett(ur)";
---
> $text['died'] = "Andlát";
> $text['buried'] = "Jarðsetning";
706d817
< $text['burialabbr'] = "graf.";  //from descend
712d822
< $text['place'] = "Staður";
715d824
< $text['marrabbr'] = "G.";
726,727c835,836
< $text['diedburied'] = "Dáin(n)/Jarðsett(ur)";
< $text['homepage'] = "Aðalsíða";
---
> $text['diedburied'] = "Andlát/Jarðsetning";
> $text['homepage'] = "Upphafssíða";
738d846
< $text['source'] = "Heimildir";
756c864
< $text['headstone'] = "Legsteinn";
---
> $text['headstone'] = "Legsteinar";
766d873
< $text['repository'] = "Greftrunarstaður";
770d876
< $text['findplaces'] = "Finna alla einstaklinga með viðburði á þessum stað";
804d909
< $text['glang'] = "&amp;hl=is";
809c914
< $text['located'] = "Staðsetning";
---
> $text['located'] = "Staðsettur";
816d920
< $text['none'] = "Ekkert";
890,891c994,995
< $text['collapse'] = "Fella";
< $text['expand'] = " útlista nánar ";
---
> $text['collapse'] = "Fella allt saman";
> $text['expand'] = " Þenja allt út";
911c1015
< $text['getdirections'] = "Smelltu til að fá leiðbeningar";
---
> $text['getdirections'] = "Smelltu hér til að fá upplýsingar um það hvernig þú kemst til:";
924d1027
< $text['otherevents'] = "Aðrir atburðir";
939c1042
< $text['photoshistories'] = "Photos &amp; Histories";
---
> $text['photoshistories'] = "Myndir &amp; Sögur";
952,953d1054
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
956,958c1057,1059
< $text['cookieuse'] = "Note: This site uses cookies.";
< $text['dataprotect'] = "Data Protection Policy";
< $text['viewpolicy'] = "View policy";
---
> $text['cookieuse'] = "Ath.: Athugið þessi síða notar fótspor/vafrakökur.";
> $text['dataprotect'] = "Persónuverndarstefna";
> $text['viewpolicy'] = "Skoða persónuverndarstefnu";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Flýtileiðir";
> $text['yourname'] = "Nafn þitt";
> $text['youremail'] = "Netfangið þitt";
> $text['liketoadd'] = "Þær uppl. sem þú vilt bæta við";
> $text['webmastermsg'] = "Skilaboð vefstjóra";
> $text['gallery'] = "Sjá gallerí";
> $text['wasborn_male'] = "fæddist";         // same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "fæddist";      // same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "var skírður";         // same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "var skírð";         // same as $text['waschristened'] if no gender verb
> $text['died_male'] = "dó";            // same as $text['anddied'] of no gender verb
> $text['died_female'] = "dó";        // same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "var jarðaður";            // same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "var jörðuð";            // same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "var brenndur";                     // same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "var brennd";      // same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "giftist";       // same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "giftist";    // same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "skildi";       // might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "skildi";    // might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " í ";                                   // used as a preposition to the location
> $text['onthisdate'] = " þann ";                    // when used with full date
> $text['inthisyear'] = " á ";                             // when used with year only or month / year dates
> $text['and'] = " og ";                                                     // used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Gestur";
> 
> $text['popupnote2'] = " = Nýtt niðjatal";
> 
> //moved here in 14.0
> $text['zoomin'] = "þysja inn";
> $text['zoomout'] = "þysja út";
> $text['scrollnote'] = "Skrunaðu eða dragðu til að sjá meira af myndinni.";
> $text['general'] = "Almennt";
> 
> //changed in 14.0
> $text['otherevents'] = "Aðrir atburðir";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Tengingar";
> $text['continue'] = "Halda áfram";
> $text['title2'] = "Titill"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Icelandic-UTF8/admintext.php TNG1403/languages/Icelandic-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Vinsamlegast sláðu inn ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Veljið skýrslu sem setja á inn.";
> 		$admtext['addreplacedata'] = "Bæta við eða skipta út ættfræðiupplýsingum þínum (gæti tekið nokkrar mínútur, allt eftir skýrslustærð)";
> 		$admtext['fromyourcomputer'] = "Frá tölvunni þinni";
> 		$admtext['importdata'] = "Innsetning gagna";
> 		$admtext['replace'] = "Skipta út (í völdu tré)";
> 		$admtext['desttree'] = "�kvörðunartré";
> 		$admtext['selectdesttree'] = "Vinsamlegast veljið eða sláið inn ákvörðunartré.";
> 		$admtext['selectexisting'] = "Setjið inn í";
> 		$admtext['ucaselast'] = "Hástafa öll eftirnöfn";
> 		$admtext['norecalc'] = "Endurreikna ekki Falin(n) merkingu";
> 		$admtext['autooffset'] = "Hefja nr. á fyrsta mögulega númeri";
> 		$admtext['mustselecttree'] = "Þú verður að velja tré áður en þú velur þennan möguleika.";
> 		$admtext['onwebserver'] = "Frá heimasíðu (í GEDCOM möppu)";
> 		$admtext['imphints'] = "Aths: Öll núverandi gögn, þýðir allir einstaklingar, fjöskyldur, heimildir og athugasemdir (margmiðlunartengingar tapast ekki svo lengi sem að nr. haldast eins).  Samsvaranir byggjast alltaf eingöngu á nr.  Nýjum færslum er alltaf bætt við.  Append imports all records with new IDs.";
> 		$admtext['destbranch'] = "�kvörðunargrein (valfrjálst)";
> 		$admtext['importlatlong'] = "Setja inn upplýsingar um lengdargráðu / breiddargráðu ef þær eru til staðar";
> 		$admtext['opening'] = "Opna";
> 		$admtext['reopen'] = "Opna aftur";
> 		$admtext['uploading'] = "Uppflyt gögn";
> 		$admtext['stop'] = "Stoppa";
> 		$admtext['stopped'] = "Innsetning stöðvuð";
> 		$admtext['resume'] = "smelltu hér til að halda áfram";
> 		$admtext['neweronly'] = "Aðeins skipta út ef nýrri";
> 		$admtext['oldimport'] = "Old style import (no progress bar)";
> 		$admtext['importgedcom'] = "Færa inn GEDCOM skýrslu (má vera pökkuð)";
> 		$admtext['stopbackup'] = "Stopp! Það gæti verið góð hugmynd að taka afrit af gögnunum þínum áður en þú heldur áfram.";
> 		$admtext['importmedia'] = "Innflytja margmiðlun ef hún er til staðar";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Import Custom Event Types Only (no data is added, replaced or appended)";
> 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Breyta atburði á skrá";
135,138d168
< 		$admtext['entertypedesc'] = "Vinsamlegast sláðu inn tegund/lýsingu á þessum nýja atburði.";
< 		$admtext['enterdisplay'] = "Vinsamlegast sláðu inn texta fyrir þennan nýja atburð.";
< 		$admtext['existingeventtypeinfo'] = "Núverandi upplýsingar um atburð";
< 		$admtext['neweventtypeinfo'] = "Upplýsingar um nýjan atburð";
141c171
< 		$admtext['onimport'] = "On Import";
---
> 		$admtext['onimport'] = "Við innsetningu";
143c173
< 		$admtext['ignore'] = "Hunsa";
---
> 		$admtext['ignore'] = "Hundsa";
145,146d174
< 		$admtext['addnewevtype'] = "Bæta við nýrri tegund atburðar";
< 		$admtext['createnewevtype'] = "Búa til nýjan atburð";
149,150d176
< 		$admtext['existingevtypes'] = "Atburðir sem eru til nú þegar";
< 		$admtext['edsevtypes'] = "Breyta, eyða eða raða, áður skráðum atburðar tegundum";
152d177
< 		$admtext['confdeleteevtype'] = "Ertu viss um að þú viljir eyða þessari tegund atburðar?";
154d178
< 		$admtext['selectentertag'] = "Vinsamlegast sláðu inn eða veldu merki fyrir þessa tegund atburðar.";
171c195
< 		$admtext['FCOM'] = "First Communion";
---
> 		$admtext['FCOM'] = "Fyrsta altarisganga";
208d231
< 		$admtext['changestoallevtypes'] = "Breyta öllum tegundum atburða";
214d236
< 		$admtext['BAPM'] = "Skírn";
224c246
< 		$admtext['expselected'] = "Expand Selected";
---
> 		$admtext['expselected'] = "Þenja út valið";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Ertu viss um að þú viljir eyða þessari atburðategund? Öllum atburðum af þessari tegund verður líka eytt.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Bæta við nýrri atburðartegund";
> 		$admtext['createnewevtype'] = "Búa til nýjan atburð";
> 		$admtext['modifyeventtype'] = "Breyta skráðum atburði";
> 		$admtext['entertypedesc'] = "Vinsamlegast sláðu inn tegund/lýsingu á þessum nýja atburði.";
> 		$admtext['enterdisplay'] = "Vinsamlegast sláðu inn texta fyrir þennan nýja atburð.";
> 		$admtext['existingeventtypeinfo'] = "Núverandi upplýsingar um atburð";
> 		$admtext['neweventtypeinfo'] = "Upplýsingar um nýjan atburð";
> 		$admtext['existingevtypes'] = "Atburðir sem eru til nú þegar";
> 		$admtext['edsevtypes'] = "Breyta, eyða eða raða, áður skráðum atburðar tegundum";
> 		$admtext['selectentertag'] = "Vinsamlegast sláðu inn eða veldu merki fyrir þessa tegund atburðar.";
> 		$admtext['changestoallevtypes'] = "Breyta öllum tegundum atburða";
268d303
< 		$admtext['nobirthinfo'] = "Engar fæðingarupplýsingar";
308c343
< 		$admtext['choosemerge'] = "Choose individuals to merge or find potential matches";
---
> 		$admtext['choosemerge'] = "Veldu einstaklinga til að sameina eða finna mögulegar samstæður.";
311c346
< 		$admtext['combinenotes'] = "Combine notes &amp; citations";
---
> 		$admtext['combinenotes'] = "Sameina athugasemdir og heimildir";
324c359
< 		$admtext['pevslater'] = "Note: Additional events, as well as event-specific notes and citations,<br />may be added after the new person has been saved.";
---
> 		$admtext['pevslater'] = "Ath.: Hægt erð að bæta fleiri atburðum við, sem og athugasemdum og heimildum,<br />eftir að þessi nýji einstaklingur hefur verið geymdur.";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Geyma + Nýir foreldrar";
> 		$admtext['savenewspouse'] = "Geyma + Nýr maki";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Please enter a description for the image.";
388d424
< 		$admtext['photoowner'] = "Eigandi/heimild";
417d452
< 		$admtext['imgmap'] = "Kortlagning myndar";
462c497
< 		$admtext['fileext'] = "File ext."; //file extension (abbreviation)
---
> 		$admtext['fileext'] = "Skýrslutegund"; //file extension (abbreviation)
464c499
< 		$admtext['mediaurl'] = "Media URL";
---
> 		$admtext['mediaurl'] = "Slóð á margmiðlun";
490,491c525
< 		$admtext['mapinstr3'] = "Til að tengja svæði á þessari mynd við einstakling, veldu þá fyrst það tré sem einstaklingurinn er í og búðu svo til rétthyrning fyrir svæðið.  Það gerirðu með því að smella í efra vinstra horn svæðiðsins og síðan dregurðu með músinni niður í neðra hægra horn.  Þú getur líka smellt einu sinni í efra vinstra horn og svo smellt aftur í neðra hægra hornið.  Sprettigluggi mun síðan opnast til að hjálpa þér að velja einstaklinginn.  Eftir að valið hefur farið fram, mun kóðinn fyrir kortlagninguna bætast við í kassann fyrir neðan. Endurtakið eins oft og þörf er á.";
< 		$admtext['albumlinks'] = "Albúm tenglar";
---
> 		$admtext['albumlinks'] = "Tengingar við þetta albúm";
494,496c528,529
< 		$admtext['albmedia'] = "Album Media";
< 		$admtext['removelink'] = "Fjarlægja tengil";
< 		$admtext['confremmedia'] = "Are you sure you want to remove this media from this album?";
---
> 		$admtext['albmedia'] = "Margmiðlun í þessu albúmi";
> 		$admtext['confremmedia'] = "Ertu viss um að þú viljir fjarlægja þetta atriði úr albúminu?";
502d534
< 		$admtext['eloptions'] = "Skoða eða eyða";
504c536
< 		$admtext['mediasubt'] = "Manage media included in this album (Add, Delete, Sort)";
---
> 		$admtext['mediasubt'] = "Stýra margmiðlun í þessu albúmi (Bæta við, Eyða, Raða)";
509d540
< 		$admtext['nolinks'] = "No links exist yet";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML myndhlutakort (fyrir afturhæfni)";
> 		$admtext['photoowner'] = "Eigandi frumrits";
> 		$admtext['nothumb'] = "Engin smámynd";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Það var ekki hægt að bæta þessu við, líklegast vegna þess að skýrslan var of stór og ekki var hægt að hlaða henni inn eða nota hana til að búa til smámynd.";
> 		$admtext['moved'] = "Flutt";
> 		$admtext['url'] = "Vefslóð";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Vinsamlegast skrifaðu inn lýsingu fyrir þessa skýrslu.";
> 		$admtext['mapinstr3'] = "Til að tengja hluta af þessari mynd við einstakling þarftu fyrst að velja það tré sem einstaklingurinn er hluti af. Síðan býrðu til rétthyrning á tilheyrandi svæði. Það gerirðu með því að smella í efra vinstra horni svæðisins og draga músina niður í neðra hægra horn svæðsins. Þegar þessu er lokið mun sprettigluggi birtast og þar geturðu valið viðeigandi einstakling. Þegar þú hefur valið réttan einstakling, geturðu síðan endurtekið þetta ferli til að bæta við öðrum svæðum. Smelltu á tiltæk svæði til að velja þau og dragðu það til færa það eða smelltu á 'X' til að eyða.";
563,564c601,602
< 		$admtext['existingreports'] = "Existing Reports";
< 		$admtext['newreportinfo'] = "New Report Information";
---
> 		$admtext['existingreports'] = "Núverandi skýrslur";
> 		$admtext['newreportinfo'] = "Upplýsingar um nýja skýrslu";
566,567c604,605
< 		$admtext['rankpriority'] = "Rank/Priority";
< 		$admtext['choosedisplay'] = "Choose Fields to Display";
---
> 		$admtext['rankpriority'] = "Staða/Forgangsröðun";
> 		$admtext['choosedisplay'] = "Veldu reiti sem á að sýna";
580c618
< 		$admtext['choosecriteria'] = "Choose Criteria";
---
> 		$admtext['choosecriteria'] = "Veldu skilyrði";
586c624
< 		$admtext['operators'] = "Operators";
---
> 		$admtext['operators'] = "Virkjar";
591,593c629,631
< 		$admtext['currentmonth'] = "Current Month";
< 		$admtext['currentyear'] = "Current Year";
< 		$admtext['currentday'] = "Current Day";
---
> 		$admtext['currentmonth'] = "Núverandi mánuður";
> 		$admtext['currentyear'] = "Núveraendi ár";
> 		$admtext['currentday'] = "Núverandi dagur";
596d633
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
598,604c635,641
< 		$admtext['savereport'] = "Save Report";
< 		$admtext['addnewreport'] = "Add New Report";
< 		$admtext['createreport'] = "Create a new report";
< 		$admtext['noreports'] = "No reports exist";
< 		$admtext['rank'] = "Rank";
< 		$admtext['confreportdelete'] = "Are you sure you want to delete this report?";
< 		$admtext['enterreportname'] = "Please enter a Report Name.";
---
> 		$admtext['savereport'] = "Geyma skýrslu";
> 		$admtext['addnewreport'] = "Bæta við nýrri skýrslu";
> 		$admtext['createreport'] = "Búa til nýja skýrslu";
> 		$admtext['noreports'] = "Engar skýrslur til";
> 		$admtext['rank'] = "Staða";
> 		$admtext['confreportdelete'] = "Ertu viss um að þú viljir eyða þessari skýrslu?";
> 		$admtext['enterreportname'] = "Vinsamlegast skrifaðu nafnið á skýrslunni.";
618c655
< 		$admtext['currentmonthnum'] = "Current Month Number";
---
> 		$admtext['currentmonthnum'] = "Númer núverandi mánaðar";
624c661
< 		$admtext['fact'] = "Fact";
---
> 		$admtext['fact'] = "Staðreynd";
633,635c670,671
< 		$admtext['confremmw'] = "Are you sure you want to remove this item?";
< 		$admtext['msgsaved'] = "Message saved";
< 		//added in 9.1.1
---
> 		$admtext['confremmw'] = "Ertu viss um að þú viljir fjarlægja þennan hlut?";
> 		$admtext['msgsaved'] = "Skilaboð geymd";
645,646c681,686
< 		$admtext['savecopy'] = "Save as copy";
< 		$admtext['activeonly'] = "Active only";
---
> 		$admtext['savecopy'] = "Geyma sem afrit";
> 		$admtext['activeonly'] = "Eingöngu virkar";
> 		//added in 14.0
> 		$admtext['instr'] = "Leiðbeiningar: Dragðu eða tvísmelltu á punkta vinstra megin til að færa þá yfir til hægri. Dragðu þá upp og niður til að endurraða eftir þörfum. Tvísmelltu á þá til að fjarlægja þá..";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
651,655d690
< 		$admtext['selectimportfile'] = "Veljið skýrslu sem setja á inn.";
< 		$admtext['importgedcom'] = "Innsetning á GEDCOM skýrslu (staðlað 5.5 snið)";
< 		$admtext['addreplacedata'] = "Bæta við eða skipta út ættfræðiupplýsingum þínum (gæti tekið nokkrar mínútur, allt eftir skýrslustærð)";
< 		$admtext['fromyourcomputer'] = "Frá tölvunni þinni";
< 		$admtext['importdata'] = "Innsetning gagna";
657,660d691
< 		$admtext['replace'] = "Skipta út (í völdu tré)";
< 		$admtext['desttree'] = "�kvörðunartré";
< 		$admtext['selectdesttree'] = "Vinsamlegast veljið eða sláið inn ákvörðunartré.";
< 		$admtext['selectexisting'] = "Setjið inn í";
668,673d698
< 		$admtext['ucaselast'] = "Hástafa öll eftirnöfn";
< 		$admtext['norecalc'] = "Do not recalculate Living flag";
< 		$admtext['autooffset'] = "Hefja nr. á fyrsta mögulega númeri";
< 
< 		$admtext['mustselecttree'] = "Þú verður að velja tré áður en þú velur þennan möguleika.";
< 		$admtext['importmedia'] = "Innflytja margmiðlun ef hún er til staðar";
675d699
< 		$admtext['neweronly'] = "Aðeins skipta út ef nýrri";
677,692d700
< 		$admtext['onwebserver'] = "Frá heimasíðu (í GEDCOM möppu)";
< 		$admtext['eventsonly'] = "Import Custom Event Types Only (no data is added, replaced or appended)";
< 		$admtext['imphints'] = "Aths: Öll núverandi gögn, þýðir allir einstaklingar, fjöskyldur, heimildir og athugasemdir (margmiðlunartengingar tapast ekki svo lengi sem að nr. haldast eins).  Samsvaranir byggjast alltaf eingöngu á nr.  Nýjum færslum er alltaf bætt við.  Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "�kvörðunargrein (valfrjálst)";
< 		$admtext['inframe'] = "(í ramma)";
< 		$admtext['getstart'] = "Byrjunarleiðbeiningar";
< 		$admtext['importlatlong'] = "Setja inn upplýsingar um lengdargráðu / breiddargráðu ef þær eru til staðar";
< 		$admtext['opening'] = "Opna";
< 		$admtext['reopen'] = "Opna aftur";
< 		$admtext['uploading'] = "Uppflyt gögn";
< 		$admtext['stop'] = "Stoppa";
< 		$admtext['stopped'] = "Innsetning stöðvuð";
< 		$admtext['resume'] = "smelltu hér til að halda áfram";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Skrá yfir breytingar";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
700,703c706,709
< 		$admtext['tasks'] = "Important tasks";
< 		$admtext['task_revusers'] = "Review new user registrations";
< 		$admtext['task_tree'] = "Create your first tree";
< 		$admtext['task_user'] = "Create a user account for yourself";
---
> 		$admtext['tasks'] = "Mikilvæg verkefni";
> 		$admtext['task_revusers'] = "Skoða nýjar notendaskráningar";
> 		$admtext['task_tree'] = "Búðu til fyrsta tréið þitt";
> 		$admtext['task_user'] = "Búðu til notendareikning fyrir þig";
708c714
< 		$admtext['task_backup'] = "Back up the data";
---
> 		$admtext['task_backup'] = "Búa til afrit af gögnunum";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Höfundur";
771,775c781,785
< 		$admtext['idnotvalid'] = "is not a valid ID. A valid ID is a numeric string prefixed with";
< 		$admtext['idinuse'] = "is in use. Please choose a different ID";
< 		$admtext['idok'] = "is OK to use";
< 		$admtext['isok'] = "is OK to use";
< 		$admtext['isinuse'] = "is already in use.";
---
> 		$admtext['idnotvalid'] = "er ekki leyfilegt númer. Leyfilegt númer er tala með forskeytinu";
> 		$admtext['idinuse'] = "er í notkun. Vinsamlegast notið annað númer";
> 		$admtext['idok'] = "er hægt að nota";
> 		$admtext['isok'] = "er hægt að nota";
> 		$admtext['isinuse'] = "er í notkun.";
804,809c814,819
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
---
> 		$admtext['momside'] = "Mom's Side label"; //8, 20
> 		$admtext['dadside'] = "Dad's Side label"; //8, 20
> 		$admtext['momperson'] = "Mom's Side person ID"; //8, 20
> 		$admtext['momtree'] = "Mom's Side tree ID"; //8, 20
> 		$admtext['dadperson'] = "Dad's Side person ID"; //8, 20
> 		$admtext['dadtree'] = "Dad's Side tree ID"; //8, 20
861,863c871,873
< 		$admtext['featurelink5'] = "Feature 5 link"; //15
< 		$admtext['featuretitle5'] = "Feature 5 title"; //15
< 		$admtext['featurepara5'] = "Feature 5 paragraph"; //15
---
> 		$admtext['featurelink5'] = "Feature 5 hlekkur"; //15
> 		$admtext['featuretitle5'] = "Feature 5 titill"; //15
> 		$admtext['featurepara5'] = "Feature 5 málsgreinar"; //15
865,867c875,877
< 		$admtext['featurelink6'] = "Feature 6 link"; //15
< 		$admtext['featuretitle6'] = "Feature 6 title"; //15
< 		$admtext['featurepara6'] = "Feature 6 paragraph"; //15
---
> 		$admtext['featurelink6'] = "Feature 6 hlekkur"; //15
> 		$admtext['featuretitle6'] = "Feature 6 titill"; //15
> 		$admtext['featurepara6'] = "Feature 6 málsgreinar"; //15
869,870c879,880
< 		$admtext['featurelink7'] = "Feature 7 link"; //15
< 		$admtext['featurepara7'] = "Feature 7 paragraph"; //15
---
> 		$admtext['featurelink7'] = "Feature 7 hlekkur"; //15
> 		$admtext['featurepara7'] = "Feature 7 málsgreinar"; //15
872,873c882,883
< 		$admtext['featurelink8'] = "Feature 8 link"; //15
< 		$admtext['featurepara8'] = "Feature 8 paragraph"; //15
---
> 		$admtext['featurelink8'] = "Feature 8 hlekkur"; //15
> 		$admtext['featurepara8'] = "Feature 8 málsgreinar"; //15
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Vitnar í haus";
> 		$admtext['quotesubhead'] = "Tilvitnanir í undirhöfða";
> 		$admtext['sniptitle'] = "Lögunartitill";
> 		$admtext['snipname'] = "Nafn á lögun";
> 		$admtext['snipinfoone'] = "Fyrsta lína lögun";
> 		$admtext['snipinfotwo'] = "Önnur lína lögun";
> 		$admtext['snipimage'] = "Lögunarmynd";
> 		$admtext['snipperson'] = "Persónuskilríki persónuleika";
> 		$admtext['sniptree'] = "Auðkenni lögun tré";
> 		$admtext['quote'] = "Tilvitnun";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7 titill";
> 		$admtext['featuretitle8'] = "Feature 8 titill";
> 		$admtext['featuretitle9'] = "Feature 9 titill";
> 		$admtext['featurethumb9'] = "Feature 9 smámynd"; //15
> 		$admtext['featurelink9'] = "Feature 9 hlekkur"; //15
> 		$admtext['featurepara9'] = "Feature 9 málsgreinar"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Vinstri mynd hauss";
> 		$admtext['rightimg'] = "Hægri mynd hauss";
> 		$admtext['photoption'] = "Valmöguleikar fyrir mynd eru<br />&nbsp;&nbsp;(föst eða af handahófi)";
> 		$admtext['randomphotowidth'] = "Breidd fyrir mynd af handahófi";
> 		$admtext['randomphotoheight'] = "Hæð fyrir mynd af handahófi";
> 		$admtext['randomphotomediatypeID'] = "Myndir af handahófi";
> 		$admtext['momheading'] = "Fyrirsögn fyrir móðurætt";
> 		$admtext['mompara'] = "Málsgrein fyrir móðurætt";
> 		$admtext['mompagelink'] = "Tengill á síðu móðurættar";
> 		$admtext['dadheading'] = "Fyrirsögn fyrir föðurætt";
> 		$admtext['dadpara'] = "Málsgrein fyrir föðurætt";
> 		$admtext['dadpagelink'] = "Tengill á síðu föðurættar";
> 		$admtext['spmomheading'] = "Haus fyrir móðurætt maka";
> 		$admtext['spmompara'] = "Málsgrein fyrir móðurætt maka";
> 		$admtext['spmompagelink'] = "Tengill á síðu móðurættar maka";
> 		$admtext['spmomside'] = "Merki fyrir móðurætt maka";
> 		$admtext['spdadside'] = "Merki fyrir föðurætt maka";
> 		$admtext['spmomperson'] = "Nr. einstaklings í móðurætt maka";
> 		$admtext['spmomtree'] = "Nr. trés fyrir móðurætt maka";
> 		$admtext['spdadheading'] = "Haus fyrir föðurætt maka";
> 		$admtext['spdadpara'] = "Málsgrein fyrir föðurætt maka";
> 		$admtext['spdadpagelink'] = "Tengill á síðu föðurættar maka";
> 		$admtext['spdadperson'] = "Nr. einstaklings í föðurætt maka";
> 		$admtext['spdadtree'] = "Tré nr. föðurættar maka";
> 		$admtext['storiesheading'] = "Ættarsögur okkar";
> 		$admtext['nbrsurnames'] = "Fjöldi eftirnafna<br />&nbsp;&nbsp; í eftirnafna skýi";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature smámynd";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
893c986
< 		$admtext['tablesuccess'] = "Tables created successfully.";
---
> 		$admtext['tablesuccess'] = "Töflumyndun tókst.";
896c989
< 		$admtext['entersysvars'] = "Enter values for system variables.";
---
> 		$admtext['entersysvars'] = "Stillingar fyrir kerfisbreytur.";
910c1003
< 		$admtext['phpreq'] = "(TNG krefst 5.3 eða hærri.)";
---
> 		$admtext['phpreq'] = "(TNG krefst 7.0 eða hærri.)";
915c1008
< 		$admtext['safemode'] = "Safe Mode";
---
> 		$admtext['safemode'] = "Öryggishamur";
926c1019
< 		$admtext['fpreq'] = "(TNG requires some files and folders to have special access rights.)";
---
> 		$admtext['fpreq'] = "(Sumar skýrslur og möppur í TNG þurfa að sérstök aðgangsréttindi.)";
935,936c1028,1029
< 		$admtext['keyrw'] = "Key folders are all read/write";
< 		$admtext['cfgrw'] = "Configuration files are all read/write";
---
> 		$admtext['keyrw'] = "Lykilmöppur hafa allar les- og skrifréttindi.";
> 		$admtext['cfgrw'] = "Stillingarskýrslur hafa allar les- og skrifréttindi.";
946c1039
< 		$admtext['rootpath'] = "Root Path";
---
> 		$admtext['rootpath'] = "Aðalskráasafn";
951,952c1044,1045
< 		$admtext['disallow'] = "Disallow";
< 		$admtext['defaultallowed'] = "Default: Allowed";
---
> 		$admtext['disallow'] = "Ekki leyfa";
> 		$admtext['defaultallowed'] = "Sjálfgefið: Leyfa";
955c1048
< 		$admtext['table'] = "Table";
---
> 		$admtext['table'] = "Tafla";
960,961c1053,1054
< 		$admtext['succbackedup'] = "successfully backed up";
< 		$admtext['succrestored'] = "successfully restored";
---
> 		$admtext['succbackedup'] = "öryggisafritun tókst";
> 		$admtext['succrestored'] = "enduruppsetning tókst";
973c1066
< 		$admtext['chooselang'] = "Dynamic Language Change";
---
> 		$admtext['chooselang'] = "Notendastýrt tungumálaval";
980,984c1073,1077
< 		$admtext['backuppath'] = "Afrita mappa";
< 		$admtext['photopath'] = "Mynda mappa";
< 		$admtext['headstonepath'] = "Legsteina mappa";
< 		$admtext['historypath'] = "Sögu mappa";
< 		$admtext['backuprestoretables'] = "Afrite, endurheimta og fínstilla gögn í töflum";
---
> 		$admtext['backuppath'] = "Mappa fyrir afrit";
> 		$admtext['photopath'] = "Mappa fyrir myndir";
> 		$admtext['headstonepath'] = "Mappa fyrir legsteina";
> 		$admtext['historypath'] = "Mappa fyrir sögur";
> 		$admtext['backuprestoretables'] = "Afrita, endurheimta og fínstilla gögn í töflum";
1009c1102
< 		$admtext['charset'] = "Character set";
---
> 		$admtext['charset'] = "Stafamengi";
1039,1040c1132,1133
< 		$admtext['asdrop'] = "As dropdown list";
< 		$admtext['gendex'] = "GENDEX mappa";
---
> 		$admtext['asdrop'] = "Sem fellilisti";
> 		$admtext['gendex'] = "Mappa fyrir GENDEX";
1050c1143
< 		$admtext['bordercolor'] = "Border Color";
---
> 		$admtext['bordercolor'] = "Litur jaðars";
1059c1152
< 		$admtext['linewidth'] = "Line Width";
---
> 		$admtext['linewidth'] = "Línubreidd";
1083,1084c1176,1177
< 		$admtext['mouseover'] = "Mouse Over";
< 		$admtext['mousedown'] = "Mouse Down";
---
> 		$admtext['mouseover'] = "Mús yfir";
> 		$admtext['mousedown'] = "Mús niður";
1102,1103c1195,1196
< 		$admtext['wholepath'] = "Import entire path";
< 		$admtext['justname'] = "Import file name only";
---
> 		$admtext['wholepath'] = "Innsetja alla slóðina";
> 		$admtext['justname'] = "Innsetja eingöngu skýrslunafn";
1126,1127c1219,1220
< 		$admtext['descchart'] = "Descendancy Chart";
< 		$admtext['pedchart'] = "Pedigree Chart";
---
> 		$admtext['descchart'] = "Niðjatré";
> 		$admtext['pedchart'] = "Ættartré";
1130c1223
< 		$admtext['documentpath'] = "Skjala mappa";
---
> 		$admtext['documentpath'] = "Mappa fyrir skjöl";
1132c1225
< 		$admtext['localotherpath'] = "Local Path(s) for Other Media";
---
> 		$admtext['localotherpath'] = "Staðbundin slóð(ir) fyrir aðra margmiðlun";
1172,1174c1265,1267
< 		$admtext['addresstable'] = "Heimilisfanga tafla";
< 		$admtext['statestable'] = "Fylkja tafla";
< 		$admtext['countriestable'] = "Landa tafla";
---
> 		$admtext['addresstable'] = "Tafla fyrir heimilisföng";
> 		$admtext['statestable'] = "Tafla fyrir fylki";
> 		$admtext['countriestable'] = "Tafla fyrir lönd";
1180c1273
< 		$admtext['tleventstable'] = "Tímalínu tafla";
---
> 		$admtext['tleventstable'] = "Tafla fyrir tímalínu";
1232d1324
< 		//added in 8.0.0
1239c1331
< 		$admtext['maxnoteprev'] = "Max characters in list notes";
---
> 		$admtext['maxnoteprev'] = "Hámarks stafafjöldi í athugasemdum";
1247c1339
< 		$admtext['extspath'] = "Extensions Folder";
---
> 		$admtext['extspath'] = "Mappa fyrir viðbætur";
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293,1300c1382,1386
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Re-use deleted IDs";
< 		$admtext['lastimport'] = "Show last import";
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Encryption";
<         //added in 11.0.0
< 		$admtext['dbport'] = "Database Port";
< 		$admtext['dbsocket'] = "Database Socket";
---
> 		$admtext['reuseids'] = "Endurnýta nr. einstaklings";
> 		$admtext['lastimport'] = "Sýna síðustu innsetningu";
>         $admtext['mailenc'] = "Dulkóðun";
> 		$admtext['dbport'] = "Gagnagrunnstengi (port)";
> 		$admtext['dbsocket'] = "Gagnagrunnstengill (socket)";
1302c1388
< 		$admtext['prefsection'] = "Prefixes and Suffixes";
---
> 		$admtext['prefsection'] = "Forskeyti og viðskeyti";
1330d1415
< 		//changed in 11.0.2
1339c1424
< 		$admtext['templatestable'] = "Template Settings";
---
> 		$admtext['templatestable'] = "Sniðmátsstillingar";
1359,1362c1444,1476
< 		$admtext['cookieapproval'] = "Show cookie approval message";
< 		$admtext['dataprotectmsg'] = "Show link to data protection policy";
< 		$admtext['nointernet'] = "I am using TNG offline";
< 		$admtext['askconsent'] = "Prompt for consent regarding personal info";
---
> 		$admtext['cookieapproval'] = "Sýna skilaboð um skilmála fyrir kökur (cookies)";
> 		$admtext['dataprotectmsg'] = "Sýna tengil til persónuverndarstefnu";
> 		$admtext['nointernet'] = "Ég nota TNG utankerfis.";
> 		$admtext['askconsent'] = "Biðja um samþykki fyrir persónulegum upplýsingum";
> 		//added in 13.0
> 		$admtext['coerce'] = "Breyta forskeytum sem koma inn til að þau passi við TNG stillingar";
> 		$admtext['sortevents'] = "Raða atburðum eftir";
> 		$admtext['sortbydate'] = "Dags. atburðar";
> 		$admtext['sortbytype'] = "Tegund atburðar";
> 		$admtext['allowsuggest'] = "Leyfa tillögur frá gestum";
> 		$admtext['livingchecked'] = "Nýtt fólk og fjölskyldur merkar lifandi";
> 		$admtext['maxmarried'] = "Merkja fjölskyldur lifandi ef hjónabandið hefur varað skemur en<br/>þetta mörg ár";
> 		$admtext['imagetags'] = "Rétthyrningar";
> 		$admtext['allowcsv'] = "Leyfa niðurhal á CSV skýrslum";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Flytja út sem SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Niðurhal";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of connection search runs";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Display textual path statement";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages in connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Ekki var hægt að skrá GPS hnit";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Ekki skrá landkóða";
1436d1549
< 		$admtext['backtosecondary'] = "Back to Secondary Processes";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Back to Secondary Processes";
1472c1587
< 		$admtext['charset'] = "Character set";
---
> 		$admtext['charset'] = "Stafamengi";
1478c1593
< 		$admtext['createtree'] = "Create a record for a new tree";
---
> 		$admtext['createtree'] = "Búa til skrá fyrir nýtt tré";
1480,1481c1595,1596
< 		$admtext['existingtrees'] = "Existing Tree Information";
< 		$admtext['editexistingtree'] = "Edit information for a previously entered tree";
---
> 		$admtext['existingtrees'] = "Upplýsingar um núverandi tré";
> 		$admtext['editexistingtree'] = "Breyta upplýsingum um áður skráð tré";
1485,1487c1600,1602
< 		$admtext['conftreeclear'] = "Are you sure you want to clear all data from this tree?";
< 		$admtext['changestotree'] = "Changes to tree";
< 		$admtext['newtreeinfo'] = "New Tree Information";
---
> 		$admtext['conftreeclear'] = "Ertu viss um að þú viljir hreinsa öll gögn úr þessu tréi?";
> 		$admtext['changestotree'] = "Breytingar á tréi";
> 		$admtext['newtreeinfo'] = "Upplýsingar um nýtt tré";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513c1626,1631
< 		$admtext['importfilename'] = "Import File Name";
---
> 		$admtext['importfilename'] = "Innsetja skýrslunafn";
> 		//added in 13.0
> 		$admtext['exnotes'] = "Útiloka athugasemdir";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip-skrá og taka margmiðlunarskýrslur með";
> 		$admtext['downloadzip'] = "Niðurhlaða ZIP";
1572,1575c1690,1692
< 		$admtext['allow_edit'] = "Allow to edit existing records";
< 		$admtext['allow_add'] = "Allow to add new records";
< 		$admtext['allow_delete'] = "Allow to delete existing records";
< 		//added in 8.0.0
---
> 		$admtext['allow_edit'] = "Réttindi til að breyta gögnum í gagnagrunni.";
> 		$admtext['allow_add'] = "Réttindi til að búa til ný gögn.";
> 		$admtext['allow_delete'] = "Réttindi til að eyða skráðu gögnum.";
1579c1696
< 		$admtext['usrsubm'] = "Innsendari m/takmörkkuð réttindi";
---
> 		$admtext['usrsubm'] = "Innsendari m/takmörkuð réttindi";
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Sýna aðeins óvirka notendur";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1651c1771
< 		$admtext['igndel'] = "Ignore and Delete";
---
> 		$admtext['igndel'] = "Hundsa og eyða";
1656d1775
< 	//added in 8.0.0
1661,1663c1780,1782
< 		$admtext['dvblurb'] = "Find potential problems in your information.";
< 		$admtext['wr_gender'] = "Wrong gender";
< 		$admtext['unk_gender'] = "Unknown gender";
---
> 		$admtext['dvblurb'] = "Finndu mögulegar villur í gögnunum þínum.";
> 		$admtext['wr_gender'] = "Rangt kyn";
> 		$admtext['unk_gender'] = "Óþekkt kyn";
1665,1673c1784,1792
< 		$admtext['marr_aft_death'] = "Married after death";
< 		$admtext['marr_bef_birth'] = "Married before birth";
< 		$admtext['died_bef_birth'] = "Died before birth";
< 		$admtext['parents_younger'] = "Born too early (parents less than 15 years old, or child born before marriage)";
< 		$admtext['children_late'] = "Born too late (mother more than 50 years old)";
< 		$admtext['not_living'] = "Person marked as living, death date present";
< 		$admtext['not_dead'] = "Person marked as deceased, possibly still living";
< 		$admtext['parmarr'] = "Parents' Marriage";
< 		$admtext['motherbirth'] = "Mother's Birth";
---
> 		$admtext['marr_aft_death'] = "� hjónaband eftir andlát";
> 		$admtext['marr_bef_birth'] = "� hjónaband fyrir fæðingu";
> 		$admtext['died_bef_birth'] = "Lést fyrir fæðingu";
> 		$admtext['parents_younger'] = "Fæddist of snemma (foreldrar undir 15 ára eða barn fætt fyrir hjónaband)";
> 		$admtext['children_late'] = "Fæddist of seint (móðir eldri en 50 ára)";
> 		$admtext['not_living'] = "Einstaklingur merktur á lífi en dánardagur er skráður";
> 		$admtext['not_dead'] = "Einstaklingur skráður sem látinn en hugsanlega enn á lífi";
> 		$admtext['parmarr'] = "Hjónaband foreldra";
> 		$admtext['motherbirth'] = "Fæðing móður";
1677c1796
< 		$admtext['modlist'] = "Mod List";
---
> 		$admtext['modlist'] = "Listi yfir viðbætur";
1682c1801
< 		$admtext['cfgname'] = "Config File Name";
---
> 		$admtext['cfgname'] = "Heiti stillingarskýrslu";
1686c1805
< 		$admtext['missing'] = "Missing";
---
> 		$admtext['missing'] = "Vantar";
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1707c1824
< 		$admtext['options'] = "Options";
---
> 		$admtext['options'] = "Valmöguleikar";
1711c1828
< 		$admtext['copiesfile'] = "Copies";
---
> 		$admtext['copiesfile'] = "Afrit";
1716c1833
< 		$admtext['modname'] = "Mod Name";
---
> 		$admtext['modname'] = "Nafn viðbótar";
1719c1836
< 		$admtext['ready'] = "OK to Install";
---
> 		$admtext['ready'] = "Hægt að setja inn";
1733c1850
< 		$admtext['tngmods'] = "Mods for TNG ";
---
> 		$admtext['tngmods'] = "Viðbætur fyrir TNG ";
1742c1859
< 		$admtext['choosefilter'] = "Choose the filter and click Go for the available controls";
---
> 		$admtext['choosefilter'] = "Veldu síu og smelltu svo á hnappinn til að fá fram niðurstöðurnar";
1744c1861
< 		$admtext['statusfilter'] = "Status";
---
> 		$admtext['statusfilter'] = "Staða";
1747c1864
< 		$admtext['cleanup'] = "Clean Up";  // previously used as $admtext['clean']
---
> 		$admtext['cleanup'] = "Hreinsa";  // previously used as $admtext['clean']
1801c1918
< 		$admtext['aflist'] = "Files";
---
> 		$admtext['aflist'] = "Skýrslur";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Ógildur stafur";
1886d2008
< 		$admtext['test_number'] = "Prófnúmer";
1916d2037
< 		$admtext['xtra_mut'] = "Extra mutations";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Prófnúmer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Tengja þetta DNA próf við einstakling";
1966d2095
< $admtext['otherevents'] = "Aðrir atburðir";
1993c2122
< $admtext['tablecreation'] = "Table Creation";
---
> $admtext['tablecreation'] = "Töflu gerð";
2051,2054c2180,2181
< $admtext['savereturn'] = "Snúa aftur á þessa síðu";
< $admtext['saveback'] = "Snúa aftur til valmyndar";
< $admtext['user'] = "Notandanum";
< $admtext['DIV'] = "Skilin";
---
> $admtext['user'] = "Notandi";
> $admtext['DIV'] = "Fráskilin";
2059,2060d2185
< $admtext['secondary'] = "Secondary Processes";
< $admtext['commas'] = "Separate multiple entries with commas";
2130,2134c2255,2257
< $admtext['secondarymaint'] = "Secondary Processes";
< $admtext['customeventtypes'] = "Sérsniðnir atburðir";
< $admtext['findmatches'] = "Find Matches";
< $admtext['matchthese'] = "Match the following fields:";
< $admtext['otheroptions'] = "Other Options:";
---
> $admtext['findmatches'] = "Finna samstæður";
> $admtext['matchthese'] = "Finna samstæður fyrir eftirfarandi möguleika:";
> $admtext['otheroptions'] = "Aðrir valmöguleikar:";
2136c2259
< $admtext['nextmatch'] = "Next Match";
---
> $admtext['nextmatch'] = "Næsta samstæða";
2138,2141c2261,2264
< $admtext['comprefresh'] = "Compare/Refresh";
< $admtext['mswitch'] = "Switch";
< $admtext['nomatches'] = "No Matches";
< $admtext['combineextras'] = "Combine media";  //changed as well
---
> $admtext['comprefresh'] = "Bera saman/Endurhlaða síðuna";
> $admtext['mswitch'] = "Víxla";
> $admtext['nomatches'] = "Engar samstæður";
> $admtext['combineextras'] = "Sameina miðlun";  //changed as well
2211c2334
< $admtext['alphanum'] = "Vinstamlegast notaðu einungis tölustafi í nr. tré þíns.";
---
> $admtext['alphanum'] = "Vinsamlegast notaðu einungis tölustafi í númerinu á tréinu þínu.";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tegund";
< //moved here in 10.0.0
2283,2285c2398,2399
< //added in 10.0.0
< $admtext['videos'] = "Videos";
< $admtext['recordings'] = "Recordings";
---
> $admtext['videos'] = "Myndbönd";
> $admtext['recordings'] = "Upptökur";
2297,2299c2411,2413
< $admtext['privateonly'] = "Private only";
< $admtext['dna_links'] = "DNA Links";
< $admtext['dataval'] = "Data Validation";
---
> $admtext['privateonly'] = "Eingöngu faldir einstaklingar";
> $admtext['dna_links'] = "DNA tenglar";
> $admtext['dataval'] = "Notkunarprófun gagna";
2302,2303c2416,2417
< $admtext['templates'] = "Templates";
< $admtext['findciteid'] = "Find Citation ID";
---
> $admtext['templates'] = "Sniðmát";
> $admtext['findciteid'] = "Finna númer tilvitnunar";
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Eftirnöfn";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Mynd";
> $admtext['author'] = "Höfundur";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Byrjunarleiðbeiningar";
> $admtext['showlog'] = "Skrá yfir breytingar";
> $admtext['nobirthinfo'] = "Engar fæðingarupplýsingar";
> //changed in 13.0
> $admtext['savereturn'] = "Geyma + Halda áfram";
> $admtext['saveback'] = "Geyma + Hætta";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Öllum atriðum var eytt.";
> $admtext['private'] = "Falin(n)";
> $admtext['imgtags'] = "Merki myndar";
> 
> $admtext['removelink'] = "Fjarlægja tengil";
> $admtext['eloptions'] = "Skoða eða eyða";
> $admtext['pleaseenter'] = "Vinsamlegast sláðu inn ";
> 
> $admtext['nolinks'] = "Engir tenglar til";
> $admtext['nogeocode'] = "Ekki var hægt að skrá GPS hnit";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Sérsniðnir atburðir";
> $admtext['secondary'] = "Secondary Processes";
> $admtext['otherevents'] = "Aðrir atburðir";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Tegund";
> $admtext['move'] = "Færa";
> $admtext['copy'] = "Afrita";
> $admtext['title2'] = "Titill"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Icelandic-UTF8/alltext.php TNG1403/languages/Icelandic-UTF8/alltext.php
4c4
< $dates['JAN'] = "jan";
---
> $dates['JAN'] = "jan.";
6c6
< $dates['FEB'] = "feb";
---
> $dates['FEB'] = "feb.";
8c8
< $dates['MAR'] = "mar";
---
> $dates['MAR'] = "mar.";
10c10
< $dates['APR'] = "apr";
---
> $dates['APR'] = "apr.";
13c13
< $dates['JUN'] = "jún";
---
> $dates['JUN'] = "jún.";
15c15
< $dates['JUL'] = "júl";
---
> $dates['JUL'] = "júl.";
17c17
< $dates['AUG'] = "ágú";
---
> $dates['AUG'] = "ágú.";
19c19
< $dates['SEP'] = "sep";
---
> $dates['SEP'] = "sep.";
21c21
< $dates['OCT'] = "okt";
---
> $dates['OCT'] = "okt.";
23c23
< $dates['NOV'] = "nóv";
---
> $dates['NOV'] = "nóv.";
25c25
< $dates['DEC'] = "des";
---
> $dates['DEC'] = "des.";
29c29
< $dates['BEF'] = "fyr";
---
> $dates['BEF'] = "fyrir";
31c31
< $dates['AFT'] = "eft";
---
> $dates['AFT'] = "eftir";
40c40
< $dates['EST'] = "Est";
---
> $dates['EST'] = "Ca.";
58,59c58,59
< $text['collapseall'] = "Fella allt";
< $text['expandall'] = " útlista allt nánar ";
---
> $text['collapseall'] = "Fella allt saman";
> $text['expandall'] = " Þenja allt út";
85c85
< $text['none'] = "ekkert";
---
> $text['none'] = "enginn";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
152c140
< $admtext['step'] = "Stepchild";
---
> $admtext['step'] = "Stjúpbarn";
155,156d142
< 
< //added in 11.0.0
159,161c145,146
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
< $text['query'] = "Query";
< $text['fanchart'] = "Fan Chart";
---
> $text['query'] = "Fyrirspurn";
> $text['fanchart'] = "Ættarhringur";
163d147
< //moved here in 12.0.0
167c151
< $admtext['active'] = "Active";
---
> $admtext['active'] = "Virk";
173,175c157
< //added here in 12.0.0
< $text['testgroup'] = "Test Group";
< $text['test_number'] = "Heiti/númer prófs";
---
> $text['testgroup'] = "Prófhópur";
179,181c161,163
< $admtext['ancestral_surnames'] = "Ancestral surnames";
< $admtext['admin_notes'] = "Administrator notes";
< $admtext['mda'] = "Most distant ancestor";
---
> $admtext['ancestral_surnames'] = "Eftirnöfn forfeðra";
> $admtext['admin_notes'] = "Athugasemdir stjórnanda";
> $admtext['mda'] = "Fjarskyldasti forfaðirinn";
191c173
< $text['keep_name_private'] = "Keep Name Private";
---
> $text['keep_name_private'] = "Halda nöfnum földum";
196c178
< $admtext['haplo'] = "Haplogroup";
---
> $admtext['haplo'] = "haplohópur";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Heiti/númer prófs";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Deilt DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Litninganúmer";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "Allir hópar";
> $admtext['alltypes'] = "Allar tegundir";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "f.";
> $text['chrabbr'] = "s.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "graf.";  //from descend
> $text['marrabbr'] = "G.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Finna alla einstaklinga með viðburði á þessum stað";
> $text['firstpage'] = "Fyrsta síða";
> $text['lastpage'] = "Síðasta síða";
> 
> //changed in 13.0.0
> $text['problem'] = "Villa hefur komið upp í TNG forritinu. Hvað skal gera:<p>Ef þú ert nýbúin(n) að setja inn uppfærslu, þá gæti verið að þú hafir hoppað yfir hlutann með uppsetningarleiðbeiningum. Farðu aftur í readme skýrslu uppfærslunnar og lestu leiðbeiningarnar yfir aftur. Skoðaðu hlutann um uppbyggingu gagnagrunnins sérstaklega vel.</p><p>Ef þú varst að setja TNG upp í fyrsta sinn, gæti verið að þig vanti að búa til töflurnar í gagnagrunninum. Farðu aftur á readme.html síðuna til að finna það skref í leiðbeiningunum.</p><p>Ef þetta er heimasíðan þín, geturðu haft samband við TNG aðstoðina (þar sem þú keyptir forritið). Vinsamlegast afritið fyrirspurnina (query) hér fyrir neðan og settu það inn í tölvupósinn.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Engin grein";
> 
> //added in 14.0
> $text['oneyear'] = "ár";
> $text['pwdcodelink'] = "Smelltu á þennan tengil til að fá sent tímabundið lykilorð.";
> $text['pwdcodesent'] = "Þér hefur verið sendur hlekkur til að endursetja lykilorðið þitt.";
> $text['moved'] = "Flutt";
> $text['citation'] = "Heimild";
> $text['other'] = "Aðrar upplýsingar";
> $text['death'] = "Andlát";
> $text['burial'] = "Greftrun";
> $text['cremation'] = "Líkbrennsla";
> $text['marriage'] = "Hjónaband";
> $text['divorce'] = "Skilnaður";
> $text['bylength'] = "Skref";
> $text['bymarriages'] = "Hjónabönd";
> $text['none'] = "enginn";
> 
> //moved here in 14.0
> $text['family'] = "Fjölskylda";
> $text['source'] = "Heimildir";
> $text['repository'] = "Greftrunarstaður";
> $text['place'] = "Staður";
> $admtext['BAPM'] = "Skírn";
> 
> $text['glang'] = "is";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Icelandic-UTF8/text.php TNG1403/languages/Icelandic-UTF8/text.php
69d68
< 		$text['general'] = "Almennt";
78c77,78
< 		$text['relcalc'] = "Skyldleika reiknir";
---
> 	case "connections":
> 		$text['relcalc'] = "Skyldleika reiknivél";
84,85c84,85
< 		$text['findpersonid'] = "Finna einstaklings númer";
< 		$text['enternamepart'] = "Sláður inn hluta fyrra nafns/eða seinna nafns";
---
> 		$text['findpersonid'] = "Finna númer einstaklings";
> 		$text['enternamepart'] = "Sláðu inn hluta fyrra nafns/eða seinna nafns";
91c91
< 		$text['notrelated'] = "þessir 2 einstaklingar eru ekki skyldir innan xxx kynslóða."; //xxx will be replaced with number of generations
---
> 		$text['notrelated'] = "Þessir 2 einstaklingar eru ekki skyldir innan xxx kynslóða."; //xxx will be replaced with number of generations
126c126
< 		$text['gencheck'] = "Hámarks fjöldi kynslóða<br />sem skal athugast";
---
> 		$text['gencheck'] = "Hámarks fjöldi kynslóða<br />sem skoða skal";
157,158c157,158
< 		$text['ggfath'] = "the xxx great grandfather of";
< 		$text['ggmoth'] = "the xxx great grandmother of";
---
> 		$text['ggfath'] = "xxx langafi";
> 		$text['ggmoth'] = "xxx langamma";
160c160
< 		$text['ggson'] = "the xxx great grandson of";
---
> 		$text['ggson'] = "xxx barnabarnabarn";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Leita að tengingum";
> 		$text['findrel2'] = "Rekja saman";
> 		$text['makeme2nd'] = "Use my ID";
> 		$text['usebookmarks'] = "Nota bókamerki";
> 		$text['select2inds'] = "Veldu 2 einstaklinga.";
> 		$text['indinfofor'] = "Einstaklings upplýsingar fyrir";
> 		$text['nobookmarks'] = "Það er ekkert bókamerki til";
> 		$text['bkmtitle'] = "Einstaklingar fundnir í bókamerkjum";
> 		$text['bkminfo'] = "Velja einstakling:";
> 		$text['sortpathsby'] = "Sort paths by number of";
> 		$text['sortbyshort'] = "Raða eftir";
> 		$text['bylengthshort'] = "Lengd";
> 		$text['badID1'] = ": bad person1 ID - please go back and correct";
> 		$text['badID2'] = ": bad person2 ID - please go back and correct";
> 		$text['notintree'] = ": the person with this ID is not in the current tree database.";
> 		$text['sameperson'] = "Þetta er sama manneskjan.";;
> 		$text['nopaths'] = "Þessir einstaklingar eru ekki tengdir.";
> 		$text['nopaths1'] = "No more connections shorter than xxx";
> 		$text['nopaths2'] = "í xxx leitarskrefum";
> 		$text['longestpath'] = "(longest path checked so far was xxx steps long)";
> 		$text['relevantpaths'] = "The number of different relevant paths found: xxx";
> 		$text['skipMarr'] = "(in addition, the number of paths found but not displayed due to too many marriages was: xxx)";
> 		$text['mjaor'] = "or";
> 		$text['connectionsto'] = "Connections to ";
> 		$text['findanotherpers'] = "Finna annan einstakling...";
> 		$text['sometimes'] = "(Stundum þegar athugað er yfir mismunandi fjölda kynslóða kemur önnur niðurstaða.)";
> 		$text['anotherpath'] = "Leita að öðrum tengingum";
> 		$text['xpath'] = "Leið ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Foreldri";
> 		$text['mhfather'] = "faðir hans";
> 		$text['mhmother'] = "móðir hans";
> 		$text['mhhusband'] = "eiginmaður hans";
> 		$text['mhwife'] = "eiginkona hans";
> 		$text['mhson'] = "sonur hans";
> 		$text['mhdaughter'] = "dóttir hans";
> 		$text['fhfather'] = "faðir hennar";
> 		$text['fhmother'] = "móðir hennar";
> 		$text['fhhusband'] = "eiginmaður hennar";
> 		$text['fhwife'] = "eiginkona hennar";
> 		$text['fhson'] = "sonur hennar";
> 		$text['fhdaughter'] = "dóttir hennar";
> 		$text['hfather'] = "faðir";
> 		$text['hmother'] = "móðir";
> 		$text['hhusband'] = "eiginmaður";
> 		$text['hwife'] = "eiginkona";
> 		$text['hson'] = "sonur";
> 		$text['hdaughter'] = "dóttir";
> 		$text['maxruns'] = "Max number of paths to be checked";
> 		$text['maxrshort'] = "Max paths";
> 		$text['maxlength'] = "Connection paths no longer than";
> 		$text['maxlshort'] = "Hámarkslengd";
> 		$text['xstep'] = "skref";
> 		$text['xsteps'] = "skref";
> 		$text['xmarriages'] = "xxx hjónabönd";
> 		$text['xmarriage'] = "1 hjónaband";
> 		$text['showspouses'] = "Sýna báða maka";
> 		$text['showTxt'] = "Show textual path description";
> 		$text['showTxtshort'] = "Textual desc.";
> 		$text['compactBox'] = "Show person boxes compacted";
> 		$text['compactBoxshort'] = "Compact boxes";
> 		$text['paths'] = "Paths";
> 		$text['dospouses2'] = "Sýna maka";
> 		$text['maxmopt'] = "Hámarksfjöldi hjónabanda í tengingu";
> 		$text['maxm'] = "Hámarksfjöldi hjónabanda";
> 		$text['arerelated'] = "Þessir einstaklingar eru skyldir - tenging þeirra er sýnd á Leið 1";
> 		$text['simplerel'] = "Einföld tengsla leit";
196d264
< 		$text['scrollnote'] = "Ath: Þú þarft kannski að skruna niður eða til hægri til að sjá.";
199d266
< 		$text['popupnote2'] = " = Nýtt niðjatal";
215,216c282,283
< 		$text['paternal'] = "Paternal";
< 		$text['maternal'] = "Maternal";
---
> 		$text['paternal'] = "Föður";
> 		$text['maternal'] = "Móður";
232c299
< 		$text['extrasexpl'] = "Ef að ljósmyndir eða sögur eru til um viðkomandi einstakling, koma viðeigandi myndir næst við nöfnin.";
---
> 		$text['extrasexpl'] = "Ef að ljósmyndir eða sögur eru til um viðkomandi einstakling, koma viðeigandi myndir við nöfnin.";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Töflur";
> 		$text['dtchildren'] = "Börn";
> 		$text['dtgrandchildren'] = "Barnabörn";
> 		$text['dtggrandchildren'] = "Barnabarnabörn";
> 		$text['dtgggrandchildren'] = "Barnabarnabörn"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Engir afkomendur";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Samtals";
> 		$text['dtselect'] = "Velja";
> 		$text['dteachfulltable'] = "Each full table will have";
> 		$text['dtrows'] = "raðir";
> 		$text['dtdisplayingtable'] = "Displaying table";
> 		$text['dtgototable'] = "Go to table:";
> 		$text['fcinstrdn'] = "Sýna fjölskyldu með maka";
> 		$text['fcinstrup'] = "Sýna fjölskyldu með foreldrum";
> 		$text['fcinstrplus'] = "Velja aðra maka";
> 		$text['fcinstrfam'] = "Velja aðra foreldra";
309c395
< 		$text['explain'] = "Sláðu inn dagsetningu til að sjá atburði þann dag eða skyldu reitina eftir auða til að sjá alla atburði.";
---
> 		$text['explain'] = "Sláðu inn dagsetningu til að sjá atburði þann dag, eða skyldu reitina eftir auða til að sjá alla atburði.";
316c402
< 		$text['spousename'] = "Nafn Maka";
---
> 		$text['spousename'] = "Nafn maka";
331c417
< 		$text['spousemore'] = "Ef þú slærð in eftirnafn maka verður þú að minnsta kosti að slá inn í einn annan reit hjá honum.";
---
> 		$text['spousemore'] = "Ef þú slærð in eftirnafn maka verður þú að minnsta kosti að slá inn í einn annan reit fyrir viðkomandi.";
381,383c467
< 		$text['firstpage'] = "Fyrsta síða";
< 		$text['lastpage'] = "Síðasta síða";
< 		$text['photoowner'] = "Eigandi/heimild";
---
> 		$text['photoowner'] = "Eigandi frumrits";
404c488
< 		$text['cemphotos'] = "Myndir af kirkjugörðum";
---
> 		$text['cemphotos'] = "Myndir úr kirkjugarði";
412c496
< 		$text['editcem'] = "Breyta grafreit";
---
> 		$text['editcem'] = "Breyta kirkjugarði";
428c512
< 		$text['allburials'] = "Allir kirkjugarðar";
---
> 		$text['allburials'] = "Allar greftranir";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Víxla merkjum";
447c533
< 		$text['mainsurnamepage'] = "Aðal eftirnafna síðan";
---
> 		$text['mainsurnamepage'] = "Upphafssíða fyrir eftirnöfn";
453c539
< 		$text['numoccurrences'] = "fjöldi í foreldrartölu";
---
> 		$text['numoccurrences'] = "fjöldi í sviga";
459,460c545,546
< 		$text['mainplacepage'] = "Aðal staðir síða";
< 		$text['allplaces'] = "Öll stærstu umhverfin";
---
> 		$text['mainplacepage'] = "Upphafssíða fyrir staði";
> 		$text['allplaces'] = "Allir staðir";
481c567
< 		$text['pastxdays'] = "(Síðustu xx daga)";
---
> 		$text['pastxdays'] = "(Síðustu xx dagana)";
549d634
< 		//changed in 8.0.0
555,556c640
< 		$text['pwdsmatch'] = "lykilorð þín passa ekki saman. Vinsamlegast sláðu inn sama aðgangsorðið í hvern reit.";
< 		//added in 8.0.0
---
> 		$text['pwdsmatch'] = "Lykilorð þín eru ekki samstæð. Vinsamlegast sláðu inn sama aðgangsorðið í hvern reit.";
560c644,651
< 		$text['switch'] = "Switch";
---
> 		$text['switch'] = "Víxla";
> 		//added in 14.0
> 		$text['newpassword2'] = "New password again";
> 		$text['resetsuccess'] = "Success: Password has been reset";
> 		$text['resetfail'] = "Failure: Password not reset";
> 		$text['failreason0'] = " (unknown database error)";
> 		$text['failreason2'] = " (you don't have permission to change your password)";
> 		$text['failreason3'] = " (passwords did not match)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total Source Citations";
618d710
< 		$text['loginfirst'] = "Þú verður að skrá  þig inn fyrst.";
621c713
< 		$text['nouser'] = "Notandi var ekki búinn til. notendanafn er líklega til.";
---
> 		$text['nouser'] = "Notandi var ekki búinn til. Notendanafn er líklega þegar til.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Notendagögn finnast fyrir í kerfinu. Til að halda áfram verður þú fyrst að skrá þig inn eða að eyða öllum skráningum í notendatöflu.";
629,630d722
< 		$text['zoomin'] = "þysja Inn";
< 		$text['zoomout'] = "þysja úr";
638c730
< 		$text['magnifyreg'] = "Smelltu tul að stækka hluta af myndinni";
---
> 		$text['magnifyreg'] = "Smelltu til að stækka hluta af myndinni";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC forfaðir";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Byrjun";
> 		$text['segment_end'] = "Endir";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "f.";
< $text['chrabbr'] = "c.";
675d788
< $text['family'] = "Fjölskylda"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
700,701c812,813
< $text['died'] = "Dáin(n)";
< $text['buried'] = "Jarðsett(ur)";
---
> $text['died'] = "Andlát";
> $text['buried'] = "Jarðsetning";
706d817
< $text['burialabbr'] = "graf.";  //from descend
712d822
< $text['place'] = "Staður";
715d824
< $text['marrabbr'] = "G.";
726,727c835,836
< $text['diedburied'] = "Dáin(n)/Jarðsett(ur)";
< $text['homepage'] = "Aðalsíða";
---
> $text['diedburied'] = "Andlát/Jarðsetning";
> $text['homepage'] = "Upphafssíða";
738d846
< $text['source'] = "Heimildir";
756c864
< $text['headstone'] = "Legsteinn";
---
> $text['headstone'] = "Legsteinar";
766d873
< $text['repository'] = "Greftrunarstaður";
770d876
< $text['findplaces'] = "Finna alla einstaklinga með viðburði á þessum stað";
804d909
< $text['glang'] = "&amp;hl=is";
809c914
< $text['located'] = "Staðsetning";
---
> $text['located'] = "Staðsettur";
816d920
< $text['none'] = "Ekkert";
890,891c994,995
< $text['collapse'] = "Fella";
< $text['expand'] = " útlista nánar ";
---
> $text['collapse'] = "Fella allt saman";
> $text['expand'] = " Þenja allt út";
911c1015
< $text['getdirections'] = "Smelltu til að fá leiðbeningar";
---
> $text['getdirections'] = "Smelltu hér til að fá upplýsingar um það hvernig þú kemst til:";
924d1027
< $text['otherevents'] = "Aðrir atburðir";
939c1042
< $text['photoshistories'] = "Photos &amp; Histories";
---
> $text['photoshistories'] = "Myndir &amp; Sögur";
952,953d1054
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
956,958c1057,1059
< $text['cookieuse'] = "Note: This site uses cookies.";
< $text['dataprotect'] = "Data Protection Policy";
< $text['viewpolicy'] = "View policy";
---
> $text['cookieuse'] = "Ath.: Athugið þessi síða notar fótspor/vafrakökur.";
> $text['dataprotect'] = "Persónuverndarstefna";
> $text['viewpolicy'] = "Skoða persónuverndarstefnu";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Flýtileiðir";
> $text['yourname'] = "Nafn þitt";
> $text['youremail'] = "Netfangið þitt";
> $text['liketoadd'] = "Þær uppl. sem þú vilt bæta við";
> $text['webmastermsg'] = "Skilaboð vefstjóra";
> $text['gallery'] = "Sjá gallerí";
> $text['wasborn_male'] = "fæddist";         // same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "fæddist";      // same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "var skírður";         // same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "var skírð";         // same as $text['waschristened'] if no gender verb
> $text['died_male'] = "dó";            // same as $text['anddied'] of no gender verb
> $text['died_female'] = "dó";        // same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "var jarðaður";            // same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "var jörðuð";            // same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "var brenndur";                     // same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "var brennd";      // same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "giftist";       // same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "giftist";    // same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "skildi";       // might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "skildi";    // might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " í ";                                   // used as a preposition to the location
> $text['onthisdate'] = " þann ";                    // when used with full date
> $text['inthisyear'] = " á ";                             // when used with year only or month / year dates
> $text['and'] = " og ";                                                     // used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Gestur";
> 
> $text['popupnote2'] = " = Nýtt niðjatal";
> 
> //moved here in 14.0
> $text['zoomin'] = "þysja inn";
> $text['zoomout'] = "þysja út";
> $text['scrollnote'] = "Skrunaðu eða dragðu til að sjá meira af myndinni.";
> $text['general'] = "Almennt";
> 
> //changed in 14.0
> $text['otherevents'] = "Aðrir atburðir";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Tengingar";
> $text['continue'] = "Halda áfram";
> $text['title2'] = "Titill"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Italian/admintext.php TNG1403/languages/Italian/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Volete entrare uno ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Volete scegliere un archivio da importare.";
> 		$admtext['addreplacedata'] = "Aggiunta o sostituisce la vostra genealogia (può prendere molti minuti, in funzione della dimensione del vostro archivio)";
> 		$admtext['fromyourcomputer'] = "Dal vostro computer";
> 		$admtext['importdata'] = "Importare i dati";
> 		$admtext['replace'] = "Sostituire (in albero scelto)";
> 		$admtext['desttree'] = "Albero determina";
> 		$admtext['selectdesttree'] = "Volete scegliere o afferrare un albero determina.";
> 		$admtext['selectexisting'] = "Importare in";
> 		$admtext['ucaselast'] = "Mettere i nomi di famiglia maiuscola";
> 		$admtext['norecalc'] = "Non ricalcolare gli indicatori 'in vita '";
> 		$admtext['autooffset'] = "Fare cominciare ID al primo numero disponibile";
> 		$admtext['mustselecttree'] = "Dovete scegliere un albero prima di utilizzare quest'opzione.";
> 		$admtext['onwebserver'] = "Sul server web (nell'archivio GEDCOM)";
> 		$admtext['imphints'] = "Suggerimenti: Tutti i dati correnti significano tutte le gente, famiglie, fonti e note (le associazioni di mezzi non sono perse finchè le identificazioni (IDs) rimangono le stesse). I fiammiferi sono basati sempre sulle identificazioni (IDs) soltanto. Le nuove annotazioni sono aggiunte sempre. Colleghi le importazioni tutte le annotazioni con le nuove identificazioni (IDs).";
> 		$admtext['destbranch'] = "Ramo della destinazione (facoltativo)";
> 		$admtext['importlatlong'] = "Dati di latitudine/longitudine dell'importazione se presente";
> 		$admtext['opening'] = "In corso di aperutra";
> 		$admtext['reopen'] = "In corso di riapertura";
> 		$admtext['uploading'] = "In carica";
> 		$admtext['stop'] = "Fermare";
> 		$admtext['stopped'] = "Importazione annullata";
> 		$admtext['resume'] = "Riprendere";
> 		$admtext['neweronly'] = "Sostituire soltanto così più recente";
> 		$admtext['oldimport'] = "Importazione vecchio stile (niente barra di avanzamento)";
> 		$admtext['importgedcom'] = "Importare GEDCOM (formato standard 5.5, può essere compresso)";
> 		$admtext['stopbackup'] = "Ferma!  Eseguendo il backup dei dati attuali prima di procedere sarebbe una buona idea.";
> 		$admtext['importmedia'] = "Importare media se esistono";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Soltanto tipi su ordinazione di evento dell'importazione";
> 		$admtext['allevents'] = "Accetti i dati per tutti i nuovi tipi su ordinazione di evento";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Modificare un tipo d'evento esistente";
135,138d168
< 		$admtext['entertypedesc'] = "Volete osservare un tipo/descrizione per questo nuovo tipo d'evento.";
< 		$admtext['enterdisplay'] = "Volete afferrare una catena per questo nuovo tipo d'evento.";
< 		$admtext['existingeventtypeinfo'] = "Informazione tipo d'evento esistente";
< 		$admtext['neweventtypeinfo'] = "Nuovo tipo d'evento";
145,146d174
< 		$admtext['addnewevtype'] = "Aggiungere un tipo d'evento";
< 		$admtext['createnewevtype'] = "Crea un tipo d'evento";
149,150d176
< 		$admtext['existingevtypes'] = "Tipi d'evento esistenti";
< 		$admtext['edsevtypes'] = "Modifica, cancella o separa i tipi d'evento già osservati";
152d177
< 		$admtext['confdeleteevtype'] = "Essete certi volere cancellare questo tipo d'evento ?";
154d178
< 		$admtext['selectentertag'] = "Volete scegliere o afferrare il tag per questo tipo d'evento.";
208d231
< 		$admtext['changestoallevtypes'] = "Cambiamenti a tutti i tipi d'evento";
214d236
< 		$admtext['BAPM'] = "Battesimo";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Sei sicuro di voler eliminare questo tipo di evento?  Tutti gli eventi di questo tipo anche vengono eliminati.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Aggiungere un tipo d'evento";
> 		$admtext['createnewevtype'] = "Crea un tipo d'evento";
> 		$admtext['modifyeventtype'] = "Modificare un tipo d'evento esistente";
> 		$admtext['entertypedesc'] = "Volete osservare un tipo/descrizione per questo nuovo tipo d'evento.";
> 		$admtext['enterdisplay'] = "Volete afferrare una catena per questo nuovo tipo d'evento.";
> 		$admtext['existingeventtypeinfo'] = "Informazione tipo d'evento esistente";
> 		$admtext['neweventtypeinfo'] = "Nuovo tipo d'evento";
> 		$admtext['existingevtypes'] = "Tipi d'evento esistenti";
> 		$admtext['edsevtypes'] = "Modifica, cancella o separa i tipi d'evento già osservati";
> 		$admtext['selectentertag'] = "Volete scegliere o afferrare il tag per questo tipo d'evento.";
> 		$admtext['changestoallevtypes'] = "Cambiamenti a tutti i tipi d'evento";
268d303
< 		$admtext['nobirthinfo'] = "Nessuno info. di nascita ";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Scegli <br/> predefinita <br/> foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Salvare + Nuovi Genitori";
> 		$admtext['savenewspouse'] = "Salvare + Nuovo Coniuge";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Volete osservare una descrizione per quest'immagine.";
388d424
< 		$admtext['photoowner'] = "Proprietario - fonte";
417d452
< 		$admtext['imgmap'] = "Carta d'immagine";
490d524
< 		$admtext['mapinstr3'] = "Per legare una regione di questa fotografia ad un individuo specifico, scegliete l'albero dell'individuo, scegliete una forma e dimensioni per la zona della fotografia che desiderate legare all'individuo, quindi premete il centro della zona scelta sulla fotografia. Una finestra si aprirà per aiutarli a scegliere l'individuo. Una volta che lo avrete scelto, il codice per la carta d'immagine sarà aggiunto nel campo. Ripetete questo processo tanto di volta che desiderate aggiungere individui alla fotografia.";
495d528
< 		$admtext['removelink'] = "Rimuova il collegamento";
502d534
< 		$admtext['eloptions'] = "Passi in rassegna o cancelli";
509d540
< 		$admtext['nolinks'] = "Nessun collegamento esiste ancora";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Mappa Immagine HTML (per retrocompatibilità)";
> 		$admtext['photoowner'] = "Proprietario dell'originario";
> 		$admtext['nothumb'] = "Nessun miniatura";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "The item could not be added, most likely because the file was too large and could not be uploaded or used to make a thumbnail.";
> 		$admtext['moved'] = "Moved";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Volete osservare una descrizione per quest'immagine.";
> 		$admtext['mapinstr3'] = "Per collegare una regione della questa foto ad un individuo, prima di tutto scegli l’albero del individuo, poi crei un rettangolo per la regione desiderata.  Questo viene fatto da cliccando nell'angolo superiore sinistro della regione e poi trascinando all’angelo inferiore destro. Alternativamente, si può cliccare nell’angolo superiore sinistro e poi di nuovo nell’angelo inferiore destro. Una finestra popup ti aiuterà scegliere l’individuo. Effettui la selezione, ripetendo questo processo come necessario per ulteriori regioni.  Cliccare su una regione esistente per sceglierla, e poi trascinare per muoverla o si può cliccare il ‘X’ per eliminarla.";
596d633
< 		$admtext['foremptystring'] = "Per una stringa vuota, lasci questo \"Add dello spazio in bianco e di scatto del campo >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions: Drag or double-click items at left into lists at right. Drag up and down to re-order. Double-click again to remove.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Per una stringa vuota, lasci questo \"Add dello spazio in bianco e di scatto del campo >>.\"";
651,655d690
< 		$admtext['selectimportfile'] = "Volete scegliere un archivio da importare.";
< 		$admtext['importgedcom'] = "Importare GEDCOM (formato standardo 5.5)";
< 		$admtext['addreplacedata'] = "Aggiunta o sostituisce la vostra genealogia (può prendere molti minuti, in funzione della dimensione del vostro archivio)";
< 		$admtext['fromyourcomputer'] = "Dal vostro computer";
< 		$admtext['importdata'] = "Importare i dati";
657,660d691
< 		$admtext['replace'] = "Sostituire (in albero scelto)";
< 		$admtext['desttree'] = "Albero determina";
< 		$admtext['selectdesttree'] = "Volete scegliere o afferrare un albero determina.";
< 		$admtext['selectexisting'] = "Importare in";
668,673d698
< 		$admtext['ucaselast'] = "Mettere i nomi di famiglia maiuscola";
< 		$admtext['norecalc'] = "Non ricalcolare gli indicatori 'in vita '";
< 		$admtext['autooffset'] = "Fare cominciare ID al primo numero disponibile";
< 
< 		$admtext['mustselecttree'] = "Dovete scegliere un albero prima di utilizzare quest'opzione.";
< 		$admtext['importmedia'] = "Importare media se esistono";
675d699
< 		$admtext['neweronly'] = "Sostituire soltanto così più recente";
677,692d700
< 		$admtext['onwebserver'] = "Sul server web (nell'archivio GEDCOM)";
< 		$admtext['eventsonly'] = "Soltanto tipi su ordinazione di evento dell'importazione";
< 		$admtext['imphints'] = "Suggerimenti: Tutti i dati correnti significano tutte le gente, famiglie, fonti e note (le associazioni di mezzi non sono perse finchè le identificazioni (IDs) rimangono le stesse). I fiammiferi sono basati sempre sulle identificazioni (IDs) soltanto. Le nuove annotazioni sono aggiunte sempre. Colleghi le importazioni tutte le annotazioni con le nuove identificazioni (IDs).";
< 		$admtext['allevents'] = "Accetti i dati per tutti i nuovi tipi su ordinazione di evento";
< 		$admtext['destbranch'] = "Ramo della destinazione (facoltativo)";
< 		$admtext['inframe'] = "(nel telaio)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Dati di latitudine/longitudine dell'importazione se presente";
< 		$admtext['opening'] = "In corso di aperutra";
< 		$admtext['reopen'] = "In corso di riapertura";
< 		$admtext['uploading'] = "In carica";
< 		$admtext['stop'] = "Fermare";
< 		$admtext['stopped'] = "Importazione annullata";
< 		$admtext['resume'] = "Riprendere";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Cambiare ceppo";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Importazione vecchio stile (niente barra di avanzamento)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Autore";
804,809c814,819
< 		$admtext['momside'] = "Etichetta dal lato madri"; //8
< 		$admtext['dadside'] = "Etichetta dal lato padri"; //8
< 		$admtext['momperson'] = "Persona ID dal lato madri"; //8
< 		$admtext['momtree'] = "Albero ID dal lato madri"; //8
< 		$admtext['dadperson'] = "Persona ID dal lato madri"; //8
< 		$admtext['dadtree'] = "Albero ID dal lato padri"; //8
---
> 		$admtext['momside'] = "Etichetta dal lato madri"; //8, 20
> 		$admtext['dadside'] = "Etichetta dal lato padri"; //8, 20
> 		$admtext['momperson'] = "Persona ID dal lato madri"; //8, 20
> 		$admtext['momtree'] = "Albero ID dal lato madri"; //8, 20
> 		$admtext['dadperson'] = "Persona ID dal lato madri"; //8, 20
> 		$admtext['dadtree'] = "Albero ID dal lato padri"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Intestazione virgolette";
> 		$admtext['quotesubhead'] = "Sottotitoli virgolette";
> 		$admtext['sniptitle'] = "Titolo featurette";
> 		$admtext['snipname'] = "Nome featurette";
> 		$admtext['snipinfoone'] = "Prima linea di featurette";
> 		$admtext['snipinfotwo'] = "Seconda linea di featurette";
> 		$admtext['snipimage'] = "Immagine featurette";
> 		$admtext['snipperson'] = "ID persona featurette";
> 		$admtext['sniptree'] = "ID albero featurette";
> 		$admtext['quote'] = "Quote";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Funzione 7 documenti";
> 		$admtext['featuretitle8'] = "Funzione 8 documenti";
> 		$admtext['featuretitle9'] = "Funzione 9 documenti";
> 		$admtext['featurethumb9'] = "Funzione 9 miniatura"; //15
> 		$admtext['featurelink9'] = "Funzione 9 collegamento"; //15
> 		$admtext['featurepara9'] = "Funzione 9 paragrafo"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Intestazione Immagine Sinistra";
> 		$admtext['rightimg'] = "Intestazione Immagine Destra";
> 		$admtext['photoption'] = "Le opzioni della foto sono<br />&nbsp;&nbsp;(statiche o casuali)";
> 		$admtext['randomphotowidth'] = "Larghezza Foto Casuale";
> 		$admtext['randomphotoheight'] = "Altezza Foto Casuale";
> 		$admtext['randomphotomediatypeID'] = "Collezione delle Fotografie Casuali";
> 		$admtext['momheading'] = "Intestazione della Famiglia Materna";
> 		$admtext['mompara'] = "Paragrafo della Famiglia Materna";
> 		$admtext['mompagelink'] = "Pagina Collegata della Famiglia Materna";
> 		$admtext['dadheading'] = "Intestazione della Famiglia Paterna";
> 		$admtext['dadpara'] = "Paragrafo della Famiglia Paterna";
> 		$admtext['dadpagelink'] = "Pagina Collegata della Famiglia Paterna";
> 		$admtext['spmomheading'] = "Intestazione della Famiglia Materna del Coniuge";
> 		$admtext['spmompara'] = "Paragrafo della Famiglia Materna del Coniuge";
> 		$admtext['spmompagelink'] = "Pagina Collegata della Famiglia Materna del Coniuge";
> 		$admtext['spmomside'] = "Etichetta dalla parte Materna del Coniuge";
> 		$admtext['spdadside'] = "Etichetta dalla parte Paterna del Coniuge";
> 		$admtext['spmomperson'] = "PersonID dalla parte Materna del Coniuge";
> 		$admtext['spmomtree'] = "TreeID dalla parte Materna del Coniuge";
> 		$admtext['spdadheading'] = "Intestazione della Famiglia Paterna del Coniuge";
> 		$admtext['spdadpara'] = "Paragrafo della Famiglia Paterna del Coniuge";
> 		$admtext['spdadpagelink'] = "Pagina Collegata della Famiglia Paterna del Coniuge";
> 		$admtext['spdadperson'] = "PersonID dalla parte Paterna del Coniuge";
> 		$admtext['spdadtree'] = "TreeID dalla parte Paterna del Coniuge";
> 		$admtext['storiesheading'] = "I nostri racconti familiari";
> 		$admtext['nbrsurnames'] = "Numeri di cognomi<br />&nbsp;&nbsp; nel Cloud dei cognomi";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Funzione miniatura";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
983c1076
< 		$admtext['historypath'] = "Cartella storici";
---
> 		$admtext['historypath'] = "Cartella storie";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Cambiare i prefissi in arrivo per abbinare le impostazioni di TNG";
> 		$admtext['sortevents'] = "Ordinare gli eventi";
> 		$admtext['sortbydate'] = "Data dell'evento";
> 		$admtext['sortbytype'] = "Tipo d'evento";
> 		$admtext['allowsuggest'] = "Consentire suggerimenti dai visitatori";
> 		$admtext['livingchecked'] = "Indicatore Vivente per nuove persone e famiglie";
> 		$admtext['maxmarried'] = "Segnare la famiglia vivente se è sposata meno di<br/>questo molti anni";
> 		$admtext['imagetags'] = "Rettangoli";
> 		$admtext['allowcsv'] = "Consente scaricare CSV per i rapporti";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Export as SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of connection search runs";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Display textual path statement";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages in connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Non potrebbe essere geocodificato";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Non fare geocodificare";
1436d1549
< 		$admtext['backtosecondary'] = "Ritorno agli Strumenti secondari";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Ritorno agli Strumenti secondari";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Escludere appunti";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip and include media files";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Mostrare solo gli utenti disattivati";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Invalid character";
1886d2008
< 		$admtext['test_number'] = "Test Numero";
1916d2037
< 		$admtext['xtra_mut'] = "Extra mutations";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Numero";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Link this DNA test to a person";
1966d2095
< $admtext['otherevents'] = "Altri eventi";
2000c2129
< $admtext['histories'] = "Storici";
---
> $admtext['histories'] = "Storie";
2051,2052d2179
< $admtext['savereturn'] = "Ritorno a questa pagina";
< $admtext['saveback'] = "Ritorno al frammento";
2059,2060d2185
< $admtext['secondary'] = "Processi secondari";
< $admtext['commas'] = "Separare le entrate multiple con punti-virgola";
2102c2227
< $admtext['nobranch'] = "Non un ramo";
---
> $admtext['nobranch'] = "Nessun ramo";
2130,2131d2254
< $admtext['secondarymaint'] = "Strumenti secondari di manutenzione";
< $admtext['customeventtypes'] = "Tipi di eventi personalizzati";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tipo";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Cognomi";
> $admtext['subhead'] = "Sottotitolo";
> $admtext['image'] = "Image";
> $admtext['author'] = "Autore";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Getting Started";
> $admtext['showlog'] = "Cambiare ceppo";
> $admtext['nobirthinfo'] = "Nessuno info. di nascita ";
> //changed in 13.0
> $admtext['savereturn'] = "Salvare + Rimanere";
> $admtext['saveback'] = "Salvare + Uscire";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Tutti gli elementi sono stati eliminati con successo.";
> $admtext['private'] = "Privato";
> $admtext['imgtags'] = "Etichette d’immagine";
> 
> $admtext['removelink'] = "Rimuova il collegamento";
> $admtext['eloptions'] = "Passi in rassegna o cancelli";
> $admtext['pleaseenter'] = "Volete entrare uno ";
> 
> $admtext['nolinks'] = "Nessun collegamento esiste ancora";
> $admtext['nogeocode'] = "Non potrebbe essere geocodificato";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Scegli <br/> predefinita <br/> foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Tipi di eventi personalizzati";
> $admtext['secondary'] = "Processi secondari";
> $admtext['otherevents'] = "Altri eventi";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Tipo";
> $admtext['move'] = "Move";
> $admtext['copy'] = "Copy";
> $admtext['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Italian/alltext.php TNG1403/languages/Italian/alltext.php
38c38
< $dates['Y'] = "sì, data sconosciuta";
---
> $dates['Y'] = "sì, data sconosciuta";
43c43
< $text['cannotexecutequery'] = "Non può effettuare la richiesta";
---
> $text['cannotexecutequery'] = "Non può effettuare la richiesta";
53,54c53,54
< $text['usersent'] = "Il nome utente è stato inviato al tuo indirizzo email.";
< $text['pwdsent'] = "La nuova password provvisoria è stata inviata al tuo indirizzo email.";
---
> $text['usersent'] = "Il nome utente è stato inviato al tuo indirizzo email.";
> $text['pwdsent'] = "La nuova password provvisoria è stata inviata al tuo indirizzo email.";
65c65
< $text['histories'] = "Storici";
---
> $text['histories'] = "Storie";
73c73
< $admtext['level3'] = "Città";
---
> $admtext['level3'] = "Città";
86c86
< $text['mainton'] = "Il modo manutenzione è attivo";
---
> $text['mainton'] = "Il modo manutenzione è attivo";
88d87
< //moved here in 8.0.0
93c92
< $admtext['confremchild'] = "Sei sicuro voi volete rimuovere questo bambino da questa famiglia? L'individuo non sarà cancellato dal database.";
---
> $admtext['confremchild'] = "Sei sicuro voi volete rimuovere questo bambino da questa famiglia? L'individuo non sarà cancellato dal database.";
95c94
< $admtext['yes'] = "Sì";
---
> $admtext['yes'] = "Sì";
111c110
< $admtext['activated'] = "Il vostro account è stato attivato";
---
> $admtext['activated'] = "Il vostro account è stato attivato";
113,115c112
< $admtext['subjectline'] = "Il vostro conto utente genealogia è stato attivato";
< 
< //moved here in 8.1.0
---
> $admtext['subjectline'] = "Il vostro conto utente genealogia è stato attivato";
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "n.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "dec.";  //from descend
> $text['burialabbr'] = "Sep.";  //from descend
> $text['marrabbr'] = "Mar.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Prima pagina";
> $text['lastpage'] = "Ultima pagina";
> 
> //changed in 13.0.0
> $text['problem'] = "Si è verificato un errore nel software TNG.  Cosa da fare:<p>Se hai appena installato un aggiornamento, potresti aver saltato parte delle istruzioni di installazione.  Ritorni alla pagina readme dell'aggiornamento e rileggi le istruzioni.  Prestare particolare attenzione alla fase della struttura del database.</p><p>Se hai appena installato TNG per la prima volta, potresti avere bisogno di creare le tabelle del database. Ritorni alla pagina readme.html per trovare quella fase.</p><p>Se sei il proprietario del sito web, puoi contattare TNG per ulteriore assistenza con questo problema. Per favore, fai una copia dell'interrogazione qui sotto e la incolli nel tuo messaggio.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Nessun ramo";
> 
> //added in 14.0
> $text['oneyear'] = "year";
> $text['pwdcodelink'] = "Click this link to have a temporary password sent to you";
> $text['pwdcodesent'] = "A password reset link has been sent to your e-mail address.";
> $text['moved'] = "Moved";
> $text['citation'] = "Citation";
> $text['other'] = "Altre Informazioni";
> $text['death'] = "Death";
> $text['burial'] = "Burial";
> $text['cremation'] = "Cremation";
> $text['marriage'] = "Marriage";
> $text['divorce'] = "Divorce";
> $text['bylength'] = "Steps";
> $text['bymarriages'] = "Marriages";
> $text['none'] = "Nulla";
> 
> //moved here in 14.0
> $text['family'] = "Famiglia";
> $text['source'] = "Fonte";
> $text['repository'] = "Deposito";
> $text['place'] = "Luogo";
> $admtext['BAPM'] = "Battesimo";
> 
> $text['glang'] = "it";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Italian/text.php TNG1403/languages/Italian/text.php
13,14c13,14
< 		$text['repoid'] = "ID del Luogo di deposito";
< 		$text['browseallrepos'] = "Cercare i Luoghi di deposito";
---
> 		$text['repoid'] = "ID del Luogo di Deposito";
> 		$text['browseallrepos'] = "Cerca i Luoghi di Deposito";
21c21
< 		$text['languagesaved'] = "Lingua Registrata";
---
> 		$text['languagesaved'] = "Lingua Salvata";
28c28
< 		$text['gedstart'] = "Avvio GEDCOM";
---
> 		$text['gedstart'] = "Avvio GEDCOM da";
31c31
< 		$text['includelds'] = "Includere informazione LDS";
---
> 		$text['includelds'] = "Includi informazione LDS";
34c34
< 		$text['nomaxgen'] = "Dovete precisare un numero massimo di generazioni. Premere sul bottone 'precedente' e correggere l'errore ";
---
> 		$text['nomaxgen'] = "Devi precisare un numero massimo di generazioni. Premi sul tasto 'Indietro' e correggi";
36,41c36,41
< 		$text['gedcreatedfor'] = "Creato per";
< 		$text['creategedfor'] = "Creare un archivio GEDCOM";
< 		$text['email'] = "Indirizzo elettronico";
< 		$text['suggestchange'] = "Suggerite una modifica";
< 		$text['yourname'] = "Il vostro Nome";
< 		$text['comments'] = "Note o commenti";
---
> 		$text['gedcreatedfor'] = "creato per";
> 		$text['creategedfor'] = "Crea un file GEDCOM";
> 		$text['email'] = "La tua email";
> 		$text['suggestchange'] = "Suggerisci una modifica";
> 		$text['yourname'] = "Il tuo Nome";
> 		$text['comments'] = "Note / Commenti";
43,50c43,50
< 		$text['submitsugg'] = "Presentate una Proposta";
< 		$text['proposed'] = "Cambiamento Proposto";
< 		$text['mailsent'] = "Grazie. Il vostro messaggio è stato inviato.";
< 		$text['mailnotsent'] = "Spiacente, ma il vostro messaggio non ha potuto essere inviato. Volete direttamente contattare xxx a yyy ";
< 		$text['mailme'] = "Inviate una copia a questo indirizzo";
< 		$text['entername'] = "Iscrivete il vostro nome";
< 		$text['entercomments'] = "Iscrivete i vostri commenti";
< 		$text['sendmsg'] = "Inviate un Messaggio";
---
> 		$text['submitsugg'] = "Invia una Proposta";
> 		$text['proposed'] = "Modifica Proposta";
> 		$text['mailsent'] = "Grazie. Il tuo messaggio è stato inoltrato.";
> 		$text['mailnotsent'] = "Spiacente, non è stato possibile inviare il tuo messaggio. Contatta direttamente xxx a yyy "; //xxx and yyy will be replaced ???
> 		$text['mailme'] = "Invia una copia a questo indirizzo";
> 		$text['entername'] = "Indica il tuo nome";
> 		$text['entercomments'] = "Scrivi i tuoi commenti";
> 		$text['sendmsg'] = "Invia il Messaggio";
52c52
< 		$text['subject'] = "Soggetto";
---
> 		$text['subject'] = "Oggetto";
57,58c57,58
< 		$text['photoshistoriesfor'] = "Fotografie e Cronistoria di";
< 		$text['indinfofor'] = "Info. personale che riguarda";
---
> 		$text['photoshistoriesfor'] = "Foto e Cronistoria di";
> 		$text['indinfofor'] = "Informazioni personali di";
64c64
< 		$text['closewindow'] = "Chiudi finestra";
---
> 		$text['closewindow'] = "Chiudi questa finestra";
66,70c66,69
< 		$text['received'] = "Il cambiamento che avete proposto sarà incluso dopo verifica dall'amministratore del sito.";
< 		$text['indreport'] = "Rapporto specifico";
< 		$text['indreportfor'] = "Rapporto specifico per";
< 		$text['general'] = "Generalità";
< 		$text['bkmkvis'] = "<strong>Nota:</strong> Questi segnalibri sono soltanto visibili su questo computer ed in questo browser.";
---
> 		$text['received'] = "Il tuo suggerimento è stato inviato all'amministratore per la revisione.";
> 		$text['indreport'] = "Rapporto individuale";
> 		$text['indreportfor'] = "Rapporto individuale per";
> 		$text['bkmkvis'] = "<strong>Nota:</strong> Questi segnalibri sono visibili solo su questo computer ed in questo browser.";
72,73c71,72
< 		$text['reviewmsg'] = "Hai suggerito un cambiamento che ha bisogno della tua opinione. Questa presentazione riguarda:";
<         $text['revsubject'] = "Il cambiamento suggerito necessita della tua opinione";
---
> 		$text['reviewmsg'] = "C'è un suggerimento che necessita la tua revisione. Il suggerimento riguarda:";
>         $text['revsubject'] = "Il suggerimento necessita della tua revisione";
78,79c77,79
< 		$text['relcalc'] = "Elaboratore di Relazione";
< 		$text['findrel'] = "Ricerca di Relazione";
---
> 	case "connections":
> 		$text['relcalc'] = "Calcolatore Parentela";
> 		$text['findrel'] = "Ricerca Parentela";
82,83c82,83
< 		$text['calculate'] = "Calcolo";
< 		$text['select2inds'] = "Volete scegliere due individui.";
---
> 		$text['calculate'] = "Calcola";
> 		$text['select2inds'] = "Scegli due persone.";
85,93c85,93
< 		$text['enternamepart'] = "Introdurre il nome o il nome di famiglia";
< 		$text['pleasenamepart'] = "Volete introdurre il nome o il nome di famiglia.";
< 		$text['clicktoselect'] = "Premete per scegliere";
< 		$text['nobirthinfo'] = "Non dati di nascita";
< 		$text['relateto'] = "Relazione a";
< 		$text['sameperson'] = "I due individui sono identici";
< 		$text['notrelated'] = "I due individui non sono legati su xxx generazioni."; //xxx will be replaced with number of generations
< 		$text['findrelinstr'] = "Per pubblicare la relazione tra due persone, utilizza il bottone 'ricerca 'sotto per trovare gli individui (o conservate gli individui pubblicati), in seguito premete 'su calcolare'.";
< 		$text['sometimes'] = "(a volte il fatto di verificare un altro numero di generazioni dà un risultato diverso)";
---
> 		$text['enternamepart'] = "Inserisci parte del nome o cognome";
> 		$text['pleasenamepart'] = "Inserisci una porzione del nome o del cognome.";
> 		$text['clicktoselect'] = "Premi per selezionare";
> 		$text['nobirthinfo'] = "Nessuna informazione di nascita";
> 		$text['relateto'] = "Parentela con";
> 		$text['sameperson'] = "I due individui sono la stessa persona";
> 		$text['notrelated'] = "I due individui non sono collegati su xxx generazioni."; //xxx will be replaced with number of generations
> 		$text['findrelinstr'] = "Per visualizzare la parentela tra due persone, utilizza il tasto 'Cerca' qui sotto per trovare gli individui (o mantenere la visualizzazione), poi premi 'Elabora'.";
> 		$text['sometimes'] = "(a volte calcolare un elevato numero di generazioni restituisce un risultato diverso)";
100c100
< 		$text['uncleaunt'] = "il xxx zio/la zia di";
---
> 		$text['uncleaunt'] = "il xxx zio/zia di";
103c103
< 		$text['nephnc'] = "i xxx nipote di";
---
> 		$text['nephnc'] = "il/la xxx nipote di";
106,107c106,107
< 		$text['rwife'] = "la Moglje di ";
< 		$text['rspouse'] = "il Sposo(a) di ";
---
> 		$text['rwife'] = "la Moglie di ";
> 		$text['rspouse'] = "lo Sposo(a) di ";
110c110
< 		$text['rchild'] = "il Bambino(a) di";
---
> 		$text['rchild'] = "il Bimbo/a di";
116c116
< 		$text['gsondau'] = "i xxx Nipote di";
---
> 		$text['gsondau'] = "il xxx Nipote di";
118c118
< 		$text['spouses'] = "sono Coniuge";
---
> 		$text['spouses'] = "sono Coniugi";
120,121c120,121
< 		$text['changeto'] = "Cambiate in:";
< 		$text['notvalid'] = "L' ID della Persona non è valido o non esiste in questo database. Riprovate di nuovo.";
---
> 		$text['changeto'] = "Cambia in (inserisci l'ID):";
> 		$text['notvalid'] = "L' ID della Persona non è valido o non esiste in questo database. Riprova.";
129c129
< 		$text['cousin'] = "il xxx cugino(a) yyy di";
---
> 		$text['cousin'] = "il xxx cugino/a yyy di";
141,142c141,142
< 		$text['maxrels'] = "parentela massimi all'esposizione";
< 		$text['dospouses'] = "Mostri la parentela che fanno partecipare uno sposo";
---
> 		$text['maxrels'] = "Parentele massime da visualizzare";
> 		$text['dospouses'] = "Mostra parentele riguardanti un coniuge";
144c144
< 		$text['dospouses2'] = "mostra i coniuge";
---
> 		$text['dospouses2'] = "Mostra il coniuge";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Ricerca di connessioni";
> 		$text['findrel2'] = "Ricerca di Parentela";
> 		$text['makeme2nd'] = "Usa il mio ID";
> 		$text['usebookmarks'] = "Usa segnalibri";
> 		$text['select2inds'] = "Scegli due individui.";
> 		$text['indinfofor'] = "Informazioni personali di";
> 		$text['nobookmarks'] = "Nessun segnalibro da usare";
> 		$text['bkmtitle'] = "Persone trovate nei segnalibri";
> 		$text['bkminfo'] = "Seleziona una persona:";
> 		$text['sortpathsby'] = "Ordina i percorsi per numero di";
> 		$text['sortbyshort'] = "Ordina per";
> 		$text['bylengthshort'] = "Lunghezza";
> 		$text['badID1'] = ": ID persona1 errato - torna indietro e correggi";
> 		$text['badID2'] = ": ID persona2 errato - torna indietro e correggi";
> 		$text['notintree'] = ": la persona con questo ID non fa parte di questo albero.";
> 		$text['sameperson'] = "I due individui sono la stessa persona";;
> 		$text['nopaths'] = "Queste persone non sono collegate.";
> 		$text['nopaths1'] = "Nessun'altra connessione più corta di xxx";
> 		$text['nopaths2'] = "in xxx passaggi di ricerca";
> 		$text['longestpath'] = "(il percorso più lungo cercato finora era lungo xxx passaggi)";
> 		$text['relevantpaths'] = "Numero di percorsi diversi rilevanti trovati: xxx";
> 		$text['skipMarr'] = "(in aggiunta, il numero di percorsi trovati ma non visualizzati a causa di troppi matrimoni era: xxx)";
> 		$text['mjaor'] = "o";
> 		$text['connectionsto'] = "Connessioni a ";
> 		$text['findanotherpers'] = "Cerca un'altra persona...";
> 		$text['sometimes'] = "(a volte il fatto di verificare un altro numero di generazioni dà un risultato diverso)";
> 		$text['anotherpath'] = "Cerca altre connessioni";
> 		$text['xpath'] = "Percorso ";
> 		$text['primary'] = "Persona Iniziale"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Persona finale";
> 		$text['parent'] = "Genitore";
> 		$text['mhfather'] = "suo padre";
> 		$text['mhmother'] = "sua madre";
> 		$text['mhhusband'] = "suo marito";
> 		$text['mhwife'] = "sua moglie";
> 		$text['mhson'] = "suo figlio";
> 		$text['mhdaughter'] = "sua figlia";
> 		$text['fhfather'] = "suo padre";
> 		$text['fhmother'] = "sua madre";
> 		$text['fhhusband'] = "suo marito";
> 		$text['fhwife'] = "sua moglie";
> 		$text['fhson'] = "suo figlio";
> 		$text['fhdaughter'] = "sua figlia";
> 		$text['hfather'] = "padre";
> 		$text['hmother'] = "madre";
> 		$text['hhusband'] = "marito";
> 		$text['hwife'] = "moglie";
> 		$text['hson'] = "figlio";
> 		$text['hdaughter'] = "figlia";
> 		$text['maxruns'] = "Numero massimo di percorsi da controllare";
> 		$text['maxrshort'] = "Num. massimo";
> 		$text['maxlength'] = "Percorso di connessione non più lungo di";
> 		$text['maxlshort'] = "Lunghezza Max";
> 		$text['xstep'] = "passaggio";
> 		$text['xsteps'] = "passaggi";
> 		$text['xmarriages'] = "xxx matrimoni";
> 		$text['xmarriage'] = "1 matrimonio";
> 		$text['showspouses'] = "Mostra entrambi i coniugi";
> 		$text['showTxt'] = "Mostra descrizione testuale percorso";
> 		$text['showTxtshort'] = "Descr. testuale";
> 		$text['compactBox'] = "Mostra box persone compatti";
> 		$text['compactBoxshort'] = "Box compatti";
> 		$text['paths'] = "Percorsi";
> 		$text['dospouses2'] = "mostra i coniugi";
> 		$text['maxmopt'] = "Numero massimo di matrimoni per connessione";
> 		$text['maxm'] = "Matrimoni Max";
> 		$text['arerelated'] = "Queste persone sono parenti - la loro parentela è visualizzata nel Percorso 1";
> 		$text['simplerel'] = "Ricerca parentela semplice";
175c244
< 		$text['familygroupfor'] = "Pagina di";
---
> 		$text['familygroupfor'] = "Foglio del Gruppo Famiglia di";
178c247
< 		$text['endowedlds'] = "Dotato (LDS)";
---
> 		$text['endowedlds'] = "Conferma (LDS)";
182,183c251,252
< 		$text['husband'] = "Marito";
< 		$text['wife'] = "Moglie";
---
> 		$text['husband'] = "Padre";
> 		$text['wife'] = "Madre";
196d264
< 		$text['scrollnote'] = "Nota: Utilizzate le barre di scorrimento per vedere tutto l'albero.";
198,199c266
< 		$text['popupnote1'] = "Informazione ulteriore";
< 		$text['popupnote2'] = "Nuovo albero";
---
> 		$text['popupnote1'] = "Informazioni ulteriori";
202,203c269,270
< 		$text['pedtextonly'] = "Testo solo";
< 		$text['descendfor'] = "Discesa di";
---
> 		$text['pedtextonly'] = "Solo Testo";
> 		$text['descendfor'] = "Discendenza di";
205c272
< 		$text['gensatonce'] = "Generazioni pubblicate allo stesso tempo";
---
> 		$text['gensatonce'] = "generazioni pubblicate contemporaneamente";
209,212c276,279
< 		$text['stdformat'] = "formato stendardo";
< 		$text['ahnentafel'] = "Ahnentafel";
< 		$text['addnewfam'] = "Aggiungere una nuova famiglia";
< 		$text['editfam'] = "Pubblicare la famiglia";
---
> 		$text['stdformat'] = "Formato Standard";
> 		$text['ahnentafel'] = "Albero genealogico";
> 		$text['addnewfam'] = "Aggiungi una nuova famiglia";
> 		$text['editfam'] = "Pubblica la famiglia";
219,243c286,310
< 		$text['gen3'] = "Grande-genitore (nonni)";
< 		$text['gen4'] = "Secondi nonni";
< 		$text['gen5'] = "Terzi nonni";
< 		$text['gen6'] = "quarti nonni";
< 		$text['gen7'] = "quinti nonni";
< 		$text['gen8'] = "sesti nonni";
< 		$text['gen9'] = "settimi nonni";
< 		$text['gen10'] = "ottavi nonni";
< 		$text['gen11'] = "noni nonni";
< 		$text['gen12'] = "decimi nonni";
< 		$text['graphdesc'] = "Tabella di discesa fino a questo punto";
< 		$text['pedbox'] = "Scatola";
< 		$text['regformat'] = "formato registro";
< 		$text['extrasexpl'] = "Se fotografie o storie esistono per gli individui seguenti, le icone corrispondenti saranno pubblicate accanto ai nomi.";
< 		$text['popupnote3'] = " = Carta Nouva";
< 		$text['mediaavail'] = "Mezzi Disponibile";
< 		$text['pedigreefor'] = "Albero di";
< 		$text['pedigreech'] = "Tabella di razza";
< 		$text['datesloc'] = "Date e posizioni";
< 		$text['borchr'] = "Nascita/Alt - morte/sepoltura (due)";
< 		$text['nobd'] = "Nessun date di morte o di nascita";
< 		$text['bcdb'] = "Nascita/Alt/Morte/Sepoltura (quattro)";
< 		$text['numsys'] = "Sistema di numerazione";
< 		$text['gennums'] = "Numeri di generazione";
< 		$text['henrynums'] = "Numeri del Henry";
---
> 		$text['gen3'] = "Nonni";
> 		$text['gen4'] = "Bisnonni";
> 		$text['gen5'] = "Trisnonni";
> 		$text['gen6'] = "Quadrisnonni";
> 		$text['gen7'] = "Quinti Nonni";
> 		$text['gen8'] = "Sesti Nonni";
> 		$text['gen9'] = "Settimi Nonni";
> 		$text['gen10'] = "Ottavi Nonni";
> 		$text['gen11'] = "Noni Nonni";
> 		$text['gen12'] = "Decimi Nonni";
> 		$text['graphdesc'] = "Grafico discendenza fino a questo punto";
> 		$text['pedbox'] = "Riquadro";
> 		$text['regformat'] = "Formato registro";
> 		$text['extrasexpl'] = "= Esiste almeno una foto, una storia o altri media per questo individuo.";
> 		$text['popupnote3'] = "Nuovo grafico";
> 		$text['mediaavail'] = "Media disponibili";
> 		$text['pedigreefor'] = "Albero Genealogico di";
> 		$text['pedigreech'] = "Albero Genealogico";
> 		$text['datesloc'] = "Date e Luoghi";
> 		$text['borchr'] = "Nascita/Alt - Morte/Sepoltura";
> 		$text['nobd'] = "Nessuna data di nascita o morte";
> 		$text['bcdb'] = "Tutte le date di Nascita/Alt/Morte/Sepoltura";
> 		$text['numsys'] = "Sistema di Numerazione";
> 		$text['gennums'] = "Numeri di Generazione";
> 		$text['henrynums'] = "Numeri di Henry";
246c313
< 		$text['dispopts'] = "Opzioni dell'esposizione";
---
> 		$text['dispopts'] = "Opzioni di visualizzazione";
248,251c315,318
< 		$text['no_ancestors'] = "No ancestors found";
< 		$text['ancestor_chart'] = "Vertical ancestor chart";
< 		$text['opennewwindow'] = "Open in a new window";
< 		$text['pedvertical'] = "Vertical";
---
> 		$text['no_ancestors'] = "Nessun antenato trovato";
> 		$text['ancestor_chart'] = "Grafico antenati verticale";
> 		$text['opennewwindow'] = "Apri in una nuova finestra";
> 		$text['pedvertical'] = "Verticale";
254c321
< 		$text['fcmlogin'] = "Si prega di autenticarsi per vedere dettagli";
---
> 		$text['fcmlogin'] = "Fai il login per vedere i dettagli";
257c324
< 		$text['parentfamily'] = "La famiglia del padre ";
---
> 		$text['parentfamily'] = "La famiglia del genitore ";
259c326
< 		$text['shown'] = "mostrato";
---
> 		$text['shown'] = "visualizzato";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabelle";
> 		$text['dtchildren'] = "Bambini";
> 		$text['dtgrandchildren'] = "Nipoti";
> 		$text['dtggrandchildren'] = "Pronipoti";
> 		$text['dtgggrandchildren'] = "Pronipoti"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nessun discendente";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totale";
> 		$text['dtselect'] = "Seleziona";
> 		$text['dteachfulltable'] = "Ogni tabella intera avrà";
> 		$text['dtrows'] = "righe";
> 		$text['dtdisplayingtable'] = "Visualizzazione tabella";
> 		$text['dtgototable'] = "Vai alla tabella:";
> 		$text['fcinstrdn'] = "Mosta famiglia con coniuge";
> 		$text['fcinstrup'] = "Mostra famiglia con genitori";
> 		$text['fcinstrplus'] = "Scegli altri coniugi";
> 		$text['fcinstrfam'] = "Scegli altri genitori";
270,273c356,359
< 		$text['noreports'] = "Nulla Rapporto.";
< 		$text['reportname'] = "Nome del Rapporto";
< 		$text['allreports'] = "Tutte gli Rapporti";
< 		$text['report'] = "Rapporto";
---
> 		$text['noreports'] = "Non esiste alcun report.";
> 		$text['reportname'] = "Nome del Report";
> 		$text['allreports'] = "Tutti i Report";
> 		$text['report'] = "Report";
275,277c361,363
< 		$text['reportsyntax'] = "la sintassi di questa richiesta";
< 		$text['wasincorrect'] = "è sbagliata, e il rapporto non ha potuto essere lanciato. Si prega di contattare il vostro amministratore sistema a ";
< 		$text['errormessage'] = "Messaggio d'errore";
---
> 		$text['reportsyntax'] = "La sintassi della query lanciata con questo report";
> 		$text['wasincorrect'] = "era errata, e come risultato non è stato possibile lanciare il report. Contatta l'amministratore a";
> 		$text['errormessage'] = "Messaggio di Errore";
279c365
< 		$text['endswith'] = "si conclude";
---
> 		$text['endswith'] = "termina con";
282,286c368,372
< 		$text['plusminus10'] = "+/- 10 anni di";
< 		$text['lessthan'] = "inferiore a ";
< 		$text['greaterthan'] = "superiore a ";
< 		$text['lessthanequal'] = "inferiore o uguaglia a ";
< 		$text['greaterthanequal'] = "superiore o uguaglia a ";
---
> 		$text['plusminus10'] = "+/- 10 anni da";
> 		$text['lessthan'] = "meno di ";
> 		$text['greaterthan'] = "più di ";
> 		$text['lessthanequal'] = "meno o uguale a ";
> 		$text['greaterthanequal'] = "più o uguale a ";
288,289c374,375
< 		$text['tryagain'] = "Volete provare di nuovo";
< 		$text['joinwith'] = "legame";
---
> 		$text['tryagain'] = "Riprova";
> 		$text['joinwith'] = "Legame con";
292,303c378,389
< 		$text['showspouse'] = "pubblicare coniuge (pubblicherà doppi se una persona ha più di uno coniuge)";
< 		$text['submitquery'] = "Ricercare";
< 		$text['birthplace'] = "Luogo di nascita";
< 		$text['deathplace'] = "Luogo di decessi";
< 		$text['birthdatetr'] = "Anno di nascita";
< 		$text['deathdatetr'] = "Anno di decessi";
< 		$text['plusminus2'] = "+/- 2 anni";
< 		$text['resetall'] = "Reinizializzare tutti i valori";
< 		$text['showdeath'] = "Mostrare le informazioni di decessi/sepoltura";
< 		$text['altbirthplace'] = "Luogo di Baptesimo";
< 		$text['altbirthdatetr'] = "Anno di Baptesimo";
< 		$text['burialplace'] = "Luogo della Sepoltura";
---
> 		$text['showspouse'] = "Mostra coniuge (mostrerà duplicati se l'individuo ha più di un coniuge)";
> 		$text['submitquery'] = "Ricerca";
> 		$text['birthplace'] = "Luogo di Nascita";
> 		$text['deathplace'] = "Luogo del Decesso";
> 		$text['birthdatetr'] = "Anno di Nascita";
> 		$text['deathdatetr'] = "Anno del Decesso";
> 		$text['plusminus2'] = "+/- 2 anni da";
> 		$text['resetall'] = "Resetta tutti i valori";
> 		$text['showdeath'] = "Visualizza le informazioni di Decesso/Sepoltura";
> 		$text['altbirthplace'] = "Luogo di Battesimo";
> 		$text['altbirthdatetr'] = "Anno di Battesimo";
> 		$text['burialplace'] = "Luogo di Sepoltura";
305c391
< 		$text['event'] = "Evento(i)";
---
> 		$text['event'] = "Evento";
308,310c394,396
< 		$text['keyword'] = "Parola chiave (ad esempio, \"Verso\")";
< 		$text['explain'] = "Introdurre le date per vedere gli eventi corrispondenti. Lasciare un campo vuoto per vedere tutte le corrispondenze.";
< 		$text['enterdate'] = "Volete introdurre o scegliere almeno uno degli elementi seguenti: Giorno, mese, anno, parola chiave: ";
---
> 		$text['keyword'] = "Parola chiave (ad esempio, \"Circa\")";
> 		$text['explain'] = "Inserisci porzioni di date per vedere gli eventi corrispondenti. Lascia vuoto per vedere tutte le corrispondenze.";
> 		$text['enterdate'] = "Inserisci o scegli almeno uno degli seguenti: Giorno, Mese, Anno, Parola Chiave";
312,314c398,400
< 		$text['birthdate'] = "Data di nascita";
< 		$text['altbirthdate'] = "Data di baptesimo";
< 		$text['marrdate'] = "Data delle nozze";
---
> 		$text['birthdate'] = "Data di Nascita";
> 		$text['altbirthdate'] = "Data di Battesimo";
> 		$text['marrdate'] = "Data di Matrimonio";
317,319c403,405
< 		$text['deathdate'] = "Data di decessi";
< 		$text['burialdate'] = "Data della sepoltura";
< 		$text['changedate'] = "Data dell'ultima modifica";
---
> 		$text['deathdate'] = "Data del Decesso";
> 		$text['burialdate'] = "Data della Sepoltura";
> 		$text['changedate'] = "Data Ultima Modifica";
321,331c407,417
< 		$text['baptdate'] = "Data di baptesimo (SDJ)";
< 		$text['baptplace'] = "Luogo di baptesimo (SDJ)";
< 		$text['endldate'] = "Data di conferma (SDJ)";
< 		$text['endlplace'] = "Luogo di conferma (SDJ)";
< 		$text['ssealdate'] = "Data del sigillo S (SDJ)";   //Sealed to spouse
< 		$text['ssealplace'] = "Luogo del sigillo S (SDJ)";
< 		$text['psealdate'] = "Data del sigillo (SDJ)";   //Sealed to parents
< 		$text['psealplace'] = "Luogo del sigillo P (SDJ)";
< 		$text['marrplace'] = "Luogo di Nozze";
< 		$text['spousesurname'] = "Nome di famiglia del coniuge";
< 		$text['spousemore'] = "se inserite un valore per il nome di famiglia del coniuge, dovete inserire almeno un'altro valore.";
---
> 		$text['baptdate'] = "Data di Battesimo (LDS)";
> 		$text['baptplace'] = "Luogo di Battesimo (LDS)";
> 		$text['endldate'] = "Data di Conferma (LDS)";
> 		$text['endlplace'] = "Luogo di Conferma (LDS)";
> 		$text['ssealdate'] = "Data del Sigillo al Coniuge (LDS)";   //Sealed to spouse
> 		$text['ssealplace'] = "Luogo del Sigillo al Coniuge (LDS)";
> 		$text['psealdate'] = "Data del Sigillo ai Genitori (LDS)";   //Sealed to parents
> 		$text['psealplace'] = "Luogo del sigillo ai Genitori (LDS)";
> 		$text['marrplace'] = "Luogo di Matrimonio";
> 		$text['spousesurname'] = "Cognome del coniuge";
> 		$text['spousemore'] = "se inserisci un valore per il Cognome del coniuge, devi selezionare il sesso.";
333,337c419,423
< 		$text['exists'] = "Esiste";
< 		$text['dnexist'] = "Non Esiste";
< 		$text['divdate'] = "Data di divorzio";
< 		$text['divplace'] = "Posto di divorzio";
< 		$text['otherevents'] = "Altri Eventi";
---
> 		$text['exists'] = "esiste";
> 		$text['dnexist'] = "non esiste";
> 		$text['divdate'] = "Data del Divorzio";
> 		$text['divplace'] = "Luogo del Divorzio";
> 		$text['otherevents'] = "Altri criteri di Ricerca";
339,341c425,427
< 		$text['mysphoto'] = "Foto di mistero";
< 		$text['mysperson'] = "Gente evasiva";
< 		$text['joinor'] = "Il ' Unisca con OR' l'opzione non può essere usata con il cognome del sposo/a";
---
> 		$text['mysphoto'] = "Foto misteriosa";
> 		$text['mysperson'] = "Persone sfuggenti";
> 		$text['joinor'] = "L'opzione 'Unisci con O' non può essere usata con il Cognome del Coniuge";
345,348c431,434
< 		$text['marrdatetr'] = "anno di matrimonio";
< 		$text['divdatetr'] = "anno di divorzio";
< 		$text['mothername'] = "nome della madre";
< 		$text['fathername'] = "nome del padre";
---
> 		$text['marrdatetr'] = "Anno di Matrimonio";
> 		$text['divdatetr'] = "Anno di Divorzio";
> 		$text['mothername'] = "Nome della Madre";
> 		$text['fathername'] = "Nome del Padre";
350c436
< 		$text['notliving'] = "non vivendo";
---
> 		$text['notliving'] = "non vivente";
353c439
< 		$text['csv'] = "Delimitato da virgola file CSV";
---
> 		$text['csv'] = "File CSV (Delimitato da virgola)";
355,358c441,444
< 		$text['confdate'] = "Confirmation Date (LDS)";
< 		$text['confplace'] = "Confirmation Place (LDS)";
< 		$text['initdate'] = "Initiatory Date (LDS)";
< 		$text['initplace'] = "Initiatory Place (LDS)";
---
> 		$text['confdate'] = "Data di Conferma (LDS)";
> 		$text['confplace'] = "Luogo di Conferma (LDS)";
> 		$text['initdate'] = "Data Iniziazione (LDS)";
> 		$text['initplace'] = "Luogo Iniziazizone (LDS)";
360c446
< 		$text['marrtype'] = "Tipo di matrimonio";
---
> 		$text['marrtype'] = "Tipo di Matrimonio";
362c448
< 		$text['searchnote'] = "Nota: Questa pagina utilizza Google per eseguire la ricerca. Il numero di risultati restituiti influiranno direttamente nella misura in cui Google è stato in grado di indicizzare il sito.";
---
> 		$text['searchnote'] = "Nota: Questa pagina utilizza Google per eseguire la ricerca. Il numero di risultati restituiti verrà influenzato direttamente dalla misura in cui Google è stato in grado di indicizzare il sito.";
367,370c453,456
< 		$text['logfilefor'] = "Archivio registro per";
< 		$text['mostrecentactions'] = "ultime azioni";
< 		$text['autorefresh'] = "Rinfreschi automatico (30 secondi)";
< 		$text['refreshoff'] = "Eliminare il rinfreschi automatico";
---
> 		$text['logfilefor'] = "File di Log per";
> 		$text['mostrecentactions'] = "Azioni più recenti";
> 		$text['autorefresh'] = "Auto Refresh (30 secondi)";
> 		$text['refreshoff'] = "Disattiva Auto Refresh";
375,379c461,465
< 		$text['cemeteriesheadstones'] = "Cimiteri e Pietri Tombale";
< 		$text['showallhsr'] = "Mostrare tutte le registrazioni delle tombe";
< 		$text['in'] = "in3";
< 		$text['showmap'] = "Mostrare la carta";
< 		$text['headstonefor'] = "Pietra Tombale di";
---
> 		$text['cemeteriesheadstones'] = "Cimiteri e Lapidi";
> 		$text['showallhsr'] = "Mostra tutte le registrazioni delle lapidi";
> 		$text['in'] = "in";
> 		$text['showmap'] = "Mostra la mappa";
> 		$text['headstonefor'] = "Lapide di";
381,384c467,468
< 		$text['firstpage'] = "Prima pagina";
< 		$text['lastpage'] = "Ultima pagina";
< 		$text['photoowner'] = "Fonte del proprietario";
< 		$text['nocemetery'] = "Non un cimitero";
---
> 		$text['photoowner'] = "Proprietario dell'originale";
> 		$text['nocemetery'] = "Nessun cimitero";
388c472
< 		$text['iptc055'] = "Data di creazione";
---
> 		$text['iptc055'] = "Data di Creazione";
390c474
< 		$text['iptc085'] = "Posizione dell'autore";
---
> 		$text['iptc085'] = "Posizione dell'Autore";
392,393c476,477
< 		$text['iptc095'] = "Stato";
< 		$text['iptc101'] = "Paese";
---
> 		$text['iptc095'] = "Stato/Provincia";
> 		$text['iptc101'] = "Nazione";
397,398c481,482
< 		$text['iptc115'] = "Fonte della fotografia";
< 		$text['iptc116'] = "Nota di diritto d'autore";
---
> 		$text['iptc115'] = "Fonte della Foto";
> 		$text['iptc116'] = "Nota di Diritto D'Autore";
400,420c484,504
< 		$text['iptc122'] = "Autore del sottotitolo";
< 		$text['mapof'] = "Carta di";
< 		$text['regphotos'] = "Vista descrittiva";
< 		$text['gallery'] = "Soltanto le etichette";
< 		$text['cemphotos'] = "Fotografie di cimiteri";
< 		$text['photosize'] = "Dimensione";
<         $text['iptc010'] = "Priorita";
< 		$text['filesize'] = "Grandezza di File";
< 		$text['seeloc'] = "Vedeste Posizione";
< 		$text['showall'] = "Mostrare tutto";
< 		$text['editmedia'] = "Curare Media";
< 		$text['viewitem'] = "Vedere Questo Dettaglio";
< 		$text['editcem'] = "Curacre Cimiterio";
< 		$text['numitems'] = "# Dettaglio";
< 		$text['allalbums'] = "Tutti l'album";
< 		$text['slidestop'] = "Pausa La Proiezione di diapositive";
< 		$text['slideresume'] = "Riassunto La Proiezione di diapositive";
< 		$text['slidesecs'] = "Secondi per ogni scorrevole :";
< 		$text['minussecs'] = "di meno 0.5 secondi";
< 		$text['plussecs'] = "più 0.5 secondi";
< 		$text['nocountry'] = "Paese sconosciuto";
---
> 		$text['iptc122'] = "Autore del Sottotitolo";
> 		$text['mapof'] = "Mappa di";
> 		$text['regphotos'] = "Vista Descrittiva";
> 		$text['gallery'] = "Solo miniature";
> 		$text['cemphotos'] = "Foto di Cimiteri";
> 		$text['photosize'] = "Dimensioni";
>         $text['iptc010'] = "Priorità";
> 		$text['filesize'] = "Dimensione del File";
> 		$text['seeloc'] = "Vedi Luogo";
> 		$text['showall'] = "Mostra tutto";
> 		$text['editmedia'] = "Modifica Media";
> 		$text['viewitem'] = "Mostra questo oggetto";
> 		$text['editcem'] = "Modifica Cimitero";
> 		$text['numitems'] = "# Oggetti";
> 		$text['allalbums'] = "Tutti gli Albums";
> 		$text['slidestop'] = "Metti in pausa le Diapositive";
> 		$text['slideresume'] = "Riprendi la visualizzazione delle Diapositive";
> 		$text['slidesecs'] = "Secondi per ogni diapositiva:";
> 		$text['minussecs'] = "riduci di 0.5 secondi";
> 		$text['plussecs'] = "aumenta di 0.5 secondi";
> 		$text['nocountry'] = "Nazione sconosciuta";
422c506
< 		$text['nocounty'] = "Paese sconosciuto";
---
> 		$text['nocounty'] = "Provincia sconosciuta";
424,426c508,510
< 		$text['nocemname'] = "Nome sconosciuto del cimitero";
< 		$text['editalbum'] = "Pubblichi l'album";
< 		$text['mediamaptext'] = "<strong>Nota:</strong> Sposti il vostro puntatore del mouse sopra l'immagine verso i nomi di esposizione. Scatti per vedere una pagina per ogni nome.";
---
> 		$text['nocemname'] = "Nome del Cimitero sconosciuto";
> 		$text['editalbum'] = "Modifica l'album";
> 		$text['mediamaptext'] = "<strong>Nota:</strong> Sposta il mouse sopra l'immagine per vedere i nomi. Clicca per vedere la pagina di ogni nome.";
428,429c512,513
< 		$text['allburials'] = "Tutte le sepolture";
< 		$text['moreinfo'] = "Ulteriori informazioni:";
---
> 		$text['allburials'] = "Tutte le Sepolture";
> 		$text['moreinfo'] = "Clicca per ulteriori informazioni su questa immagine";
432c516
<         $text['iptc092'] = "Sub-luogo";
---
>         $text['iptc092'] = "Sub-Luogo";
434,435c518,521
< 		$text['iptc065'] = "Originario del programma";
< 		$text['iptc070'] = "Programma Versione";
---
> 		$text['iptc065'] = "Programma Originario";
> 		$text['iptc070'] = "Versione Programma";
> 		//added in 13.0
> 		$text['toggletags'] = "Attiva/Disattiva Etichette";
441,445c527,531
< 		$text['surnamesstarting'] = "Pubblicare i cognome che cominciano con";
< 		$text['showtop'] = "Mostrare la cima";
< 		$text['showallsurnames'] = "Pubblicare tutti i Cognome";
< 		$text['sortedalpha'] = "Selezione alfabetica";
< 		$text['byoccurrence'] = "Classificati da verificarsi";
---
> 		$text['surnamesstarting'] = "Mostra i cognomi che cominciano con";
> 		$text['showtop'] = "Mostra l'inizio";
> 		$text['showallsurnames'] = "Pubblica tutti i Cognomi";
> 		$text['sortedalpha'] = "ordinati alfabeticamente";
> 		$text['byoccurrence'] = "ordinati per occorrenze";
447,461c533,547
< 		$text['mainsurnamepage'] = "Cognome";
< 		$text['allsurnames'] = "Tutti i Cognome";
< 		$text['showmatchingsurnames'] = "Premete su uno Cognomo per pubblicare i risultati.";
< 		$text['backtotop'] = "Rirtorno in testa della pagina";
< 		$text['beginswith'] = "Cominciando con";
< 		$text['allbeginningwith'] = "Tutti i Cognomo che cominciano con";
< 		$text['numoccurrences'] = "Numero di risultati tra parentesi";
< 		$text['placesstarting'] = "Mostrare i luoghi più grande cominciano con";
< 		$text['showmatchingplaces'] = "Premete su un nome per vedere le registrazioni legate.";
< 		$text['totalnames'] = "Totale degli individui";
< 		$text['showallplaces'] = "Mostrare i più grande luoghi";
< 		$text['totalplaces'] = "Totale dei luoghi";
< 		$text['mainplacepage'] = "Pagina dei luoghi principali";
< 		$text['allplaces'] = "Tutte le più grandi località";
< 		$text['placescont'] = "Mostrare tutti i luoghi che contengono";
---
> 		$text['mainsurnamepage'] = "Pagina Cognome principale";
> 		$text['allsurnames'] = "Tutti i Cognomi";
> 		$text['showmatchingsurnames'] = "Premi su un Cognome per visualizzare i risultati.";
> 		$text['backtotop'] = "Ritorna all'inizio";
> 		$text['beginswith'] = "Inizia con";
> 		$text['allbeginningwith'] = "Tutti i Cognomi che iniziano con";
> 		$text['numoccurrences'] = "numero totale località tra parentesi";
> 		$text['placesstarting'] = "Mostra località maggiori che iniziano con";
> 		$text['showmatchingplaces'] = "Premi su un luogo per vedere località minori. Clicca sull'icona di ricerca per vedere individui corrispondenti.";
> 		$text['totalnames'] = "totale individui";
> 		$text['showallplaces'] = "Mostra tutte le località maggiori";
> 		$text['totalplaces'] = "totale luoghi";
> 		$text['mainplacepage'] = "Pagina luoghi principali";
> 		$text['allplaces'] = "Tutte le località maggiori";
> 		$text['placescont'] = "Mostra tutti i luoghi che contengono";
463,464c549,550
< 		$text['top30'] = "Cognomi del principale xxx";
< 		$text['top30places'] = "Più grandi località del principale xxx";
---
> 		$text['top30'] = "Primi xxx cognomi";
> 		$text['top30places'] = "Prime xxx località maggiori";
466,476c552,562
< 		$text['firstnamelist'] = "First Name List";
< 		$text['firstnamesstarting'] = "Show first names starting with";
< 		$text['showallfirstnames'] = "Show all first names";
< 		$text['mainfirstnamepage'] = "Main first name page";
< 		$text['allfirstnames'] = "All First Names";
< 		$text['showmatchingfirstnames'] = "Click on a first name to show matching records.";
< 		$text['allfirstbegwith'] = "All first names beginning with";
< 		$text['top30first'] = "Top xxx first names";
< 		$text['allothers'] = "All others";
< 		$text['amongall'] = "(among all names)";
< 		$text['justtop'] = "Just the top xxx";
---
> 		$text['firstnamelist'] = "Lista Nomi";
> 		$text['firstnamesstarting'] = "Mostra nomi che iniziano con";
> 		$text['showallfirstnames'] = "Mostra tutti i nomi";
> 		$text['mainfirstnamepage'] = "Pagina nomi principali";
> 		$text['allfirstnames'] = "Tutti i Nomi";
> 		$text['showmatchingfirstnames'] = "Clicca su un nome per mostrare i record corrispondenti.";
> 		$text['allfirstbegwith'] = "Tutti i nomi che iniziano con";
> 		$text['top30first'] = "Primi xxx nomi";
> 		$text['allothers'] = "Tutti gli altri";
> 		$text['amongall'] = "(tra tutti i nomi)";
> 		$text['justtop'] = "Solo i primi xxx";
484,487c570,573
< 		$text['history'] = "Storia/documento";
< 		$text['husbid'] = "ID Coniuge";
< 		$text['husbname'] = "Nome del Coniuge";
< 		$text['wifeid'] = "ID Coniuge";
---
> 		$text['history'] = "Storia/Documento";
> 		$text['husbid'] = "ID Padre";
> 		$text['husbname'] = "Nome del Padre";
> 		$text['wifeid'] = "ID Madre";
489c575
< 		$text['wifename'] = "Nome della madre";
---
> 		$text['wifename'] = "Nome della Madre";
494,496c580,582
< 		$text['text_delete'] = "Eliminare";
< 		$text['addperson'] = "Aggiungere individuo";
< 		$text['nobirth'] = "L'individuo seguente non ha date di nascita valida e non è stato dunque aggiunto";
---
> 		$text['text_delete'] = "Elimina";
> 		$text['addperson'] = "Aggiungi Individuo";
> 		$text['nobirth'] = "Il seguente individuo non ha una data di nascita valida e non è stato possibile aggiungerlo";
498,500c584,586
< 		$text['chartwidth'] = "Larghezza del grafico";
< 		$text['timelineinstr'] = "Aggiungete fino a quattro individui che entrano nel loro IDs qui di seguito:";
< 		$text['togglelines'] = "Ginocchiera Linee";
---
> 		$text['chartwidth'] = "Larghezza grafico";
> 		$text['timelineinstr'] = "Aggiungi individui";
> 		$text['togglelines'] = "Attiva/Disattiva linee";
502c588
< 		$text['noliving'] = "L'individuo seguente è registrato poiché essendo in vita e non è pubblicato perché non siete collegati con le autorizzazioni necessarie";
---
> 		$text['noliving'] = "Il seguente individuo è registrato come vivente o privato e non è stato possibile aggiungerlo perché non sei loggato con le autorizzazioni necessarie";
516,517c602,603
< 		$text['country'] = "Paese";
< 		$text['email'] = "Indirizzo elettronico";
---
> 		$text['country'] = "Nazione";
> 		$text['email'] = "email";
519,521c605,607
< 		$text['username'] = "Nome d'utente";
< 		$text['password'] = "Parola d'ordine";
< 		$text['loginfailed'] = "Errore di collegamento.";
---
> 		$text['username'] = "Nome utente";
> 		$text['password'] = "Password";
> 		$text['loginfailed'] = "Login fallito.";
523,524c609,610
< 		$text['regnewacct'] = "Registrazione nuovamente conta utente";
< 		$text['realname'] = "il vostro nome vero";
---
> 		$text['regnewacct'] = "Registrazione Nuovo Account Utente";
> 		$text['realname'] = "Il tuo vero nome";
526c612
< 		$text['email'] = "Indirizzo elettronico";
---
> 		$text['email'] = "email";
528,536c614,622
< 		$text['acctcomments'] = "Note o commenti";
< 		$text['submit'] = "Sottoporre";
< 		$text['leaveblank'] = "(lasciare in vuoto se desiderate un nuovo albero)";
< 		$text['required'] = "Campi necessari";
< 		$text['enterpassword'] = "Introdurte una parola d'ordine.";
< 		$text['enterusername'] = "Introdurte un nome d'utente.";
< 		$text['failure'] = "Il vostro nome d'utente è già preso. Utilizza il bottone indietro del vostro browser per ritornare alla pagina precedente e scegliere un altro nome di utente.";
< 		$text['success'] = "Grazie. Abbiamo ricevuto la vostra registrazione. Ti contatteremo quando il vostro account sarà attivato o se abbiamo bisogno di più informazioni.";
< 		$text['emailsubject'] = "Domanda di registrazione di nuovo utente TNG";
---
> 		$text['acctcomments'] = "Note o Commenti";
> 		$text['submit'] = "Invia";
> 		$text['leaveblank'] = "(lasciare vuoto se desiderate un nuovo albero)";
> 		$text['required'] = "Campi obbligatori";
> 		$text['enterpassword'] = "Inserisci una password.";
> 		$text['enterusername'] = "Inserisci un nome utente.";
> 		$text['failure'] = "Ci dispiace ma il nome utente scelto è già in uso. Usa il tasto Indietro del tuo browser per tornare alla pagina precedente e scegliere un nome utente diverso.";
> 		$text['success'] = "Grazie. Abbiamo ricevuto la tua registrazione. Ti contatteremo quando il tuo account sarà attivato o se abbiamo bisogno di maggiori informazioni.";
> 		$text['emailsubject'] = "Richiesta di registrazione Nuovo Utente TNG";
538,542c624,628
< 		$text['nologin'] = "Non avete profilo di collegamento?";
< 		$text['loginsent'] = "I vostri dati di collegamento sono stati inviati";
< 		$text['loginnotsent'] = "I vostri dati di collegamento non sono stati inviati";
< 		$text['enterrealname'] = "volete inserire il vostro vero nome.";
< 		$text['rempass'] = "Restate collegati su questo computer";
---
> 		$text['nologin'] = "Non hai ancora un account?";
> 		$text['loginsent'] = "Dati di accesso inviati";
> 		$text['loginnotsent'] = "Dati di accesso NON inviati";
> 		$text['enterrealname'] = "Inserisci il tuo vero nome.";
> 		$text['rempass'] = "Resta collegato con questo computer";
544c630
< 		$text['accmail'] = "<strong>NOTA:</strong> Al fine di ricevere la posta dall'amministratore del sito relativo al tuo account, assicurati di non bloccare la posta da questo dominio.";
---
> 		$text['accmail'] = "<strong>NOTA:</strong> Per poter ricevere la posta dall'amministratore del sito in merito al tuo account, assicurati di non bloccare la posta in arrivo da questo dominio.";
546,558c632,642
< 		$text['resetpass'] = "Resettare la vostra Password";
< 		$text['nousers'] = "Questa forma non può essere usata fino a che almeno un utente record non esista. Se siete il proprietario del sito, vai prego agli utenti di Admin / generare il vostro cliente del coordinatore.";
< 		$text['noregs'] = "Siamo spiacenti, ma non stiamo accettando i nuovi registri di utente attualmente. Si metta in <a href=\"suggest.php\">contatto</a> con prego direttamente se avete le osservazioni o domande per quanto riguarda qualche cosa su questo luogo.";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Avete ricevuto una nuova domanda di conto utilizzatore TNG. Volete collegare alla sezione amministrazione di TNG ed accordare le autorizzazioni adeguate a questo nuovo conto. Se approvate questa registrazione, volete informare il richiedente rispondendo questo a message.";
< 		$text['accactive'] = "Il cliente è stato attivato, ma l'utente non avrà diritti dello special fino a che non li assegniate.";
< 		$text['accinactive'] = "Vada al Admin/Utenti/Revista accedere alle regolazioni di cliente. Il cliente rimarrà inattivo fino a che non pubblichiate almeno una volta e conserviate l'annotazione.";
< 		$text['pwdagain'] = "Parola d'accesso ancora";
< 		$text['enterpassword2'] = "Digiti prego ancora la vostra parola d'accesso.";
< 		$text['pwdsmatch'] = "Le vostre parole d'accesso non abbinano. Digiti prego la stessa parola d'accesso in ogni campo.";
< 		//added in 8.0.0
< 		$text['acksubject'] = "Grazie per la registrazione"; //for a new user account
< 		$text['ackmessage'] = "La vostra richiesta per un account utente è stata ricevuta. Il vostro account sarà inattivo fino a che non sarà controllato dal coordinatore del sito. Sarete avvisati per email quando il vostro account sarà attivato.";
---
> 		$text['resetpass'] = "Resetta la tua Password";
> 		$text['nousers'] = "Questo form non può essere usato fino a che non esista almeno un record utente. Se sei il proprietario del sito, vai ad Amministrazione/Utenti per creare il tuo Account Amministratore.";
> 		$text['noregs'] = "Siamo spiacenti, ma non accettiamo nuove registrazioni utente al momento. <a href=\"suggest.php\">Contattaci</a> direttamente se hai osservazioni o domande riguardo qualcosa su questo sito.";
> 		$text['emailmsg'] = "Hai ricevuto una nuova richiesta per un Account Utente TNG. Collegati all' Amministrazione di TNG ed accorda le autorizzazioni adeguate a questo nuovo Account. Ricorda di informare il richiedente rispondendo questo a messaggio.";
> 		$text['accactive'] = "L'account utente è stato attivato, ma l'utente non avrà alcun diritto fino a che non gleli assegnerai.";
> 		$text['accinactive'] = "Vai ad Amministrazione/Utenti/Rivedi per accedere ai Settaggi Utente. L'utente rimarrà inattivo fino a che non modificherai e salverai i dati almeno una volta.";
> 		$text['pwdagain'] = "Ripeti la password";
> 		$text['enterpassword2'] = "Digita nuovamente la tua password.";
> 		$text['pwdsmatch'] = "Le tue password non coincidono. Digita la stessa password nei 2 campi.";
> 		$text['acksubject'] = "Grazie per esserti registrato"; //for a new user account
> 		$text['ackmessage'] = "La tua richiesta per un Account Utente è stata ricevuta. Il tuo account rimarrà inattivo fino a che non sarà verificato dal proprietario del sito. Sarai avvisato via email quando il tua account sarà pronto per l'uso.";
560c644,651
< 		$text['switch'] = "Switch";
---
> 		$text['switch'] = "Cambia";
> 		//added in 14.0
> 		$text['newpassword2'] = "Ripeti la password";
> 		$text['resetsuccess'] = "Bene ! La Password è stata resettata";
> 		$text['resetfail'] = "Errore: Password non resettata";
> 		$text['failreason0'] = " (errore database sconosciuto)";
> 		$text['failreason2'] = " (non hai i permessi per modificare la tua password)";
> 		$text['failreason3'] = " (le password non coincidono)";
565c656
< 		$text['browseallbranches'] = "Browse All Branches";
---
> 		$text['browseallbranches'] = "Scorri tutti i Rami";
571,582c662,673
< 		$text['totindividuals'] = "Numero totale di individui";
< 		$text['totmales'] = "Totale uomini";
< 		$text['totfemales'] = "Totale donne";
< 		$text['totunknown'] = "Totale sesso sconosciuto";
< 		$text['totliving'] = "Totale individui in vita";
< 		$text['totfamilies'] = "Totale famiglie";
< 		$text['totuniquesn'] = "Totale nomi di famiglia unici";
< 		//$text['totphotos'] = "Total Photos";
< 		//$text['totdocs'] = "Total Histories &amp; Documents";
< 		//$text['totheadstones'] = "Total Headstones";
< 		$text['totsources'] = "Totale fonti";
< 		$text['avglifespan'] = "Durata di vita media";
---
> 		$text['totindividuals'] = "Numero totale di Individui";
> 		$text['totmales'] = "Totale Uomini";
> 		$text['totfemales'] = "Totale Donne";
> 		$text['totunknown'] = "Totale Sesso Non Determinato";
> 		$text['totliving'] = "Totale Individui Viventi";
> 		$text['totfamilies'] = "Totale Famiglie";
> 		$text['totuniquesn'] = "Totale Cognomi unici";
> 		//$text['totphotos'] = "Totale Foto";
> 		//$text['totdocs'] = "Totale Storie &amp; Documenti";
> 		//$text['totheadstones'] = "Totale Lapidi";
> 		$text['totsources'] = "Totale Fonti";
> 		$text['avglifespan'] = "Durata media di vita";
587,588c678,679
< 		$text['agedisclaimer'] = "i calcoli legati all'età sono basati sugli individui con una data di nascita conosciuta ed una data di decesso. A causa dell'esistenza di dati incompleti(p.e. una data di decessi registrata come \"1945 \" o \"avt 1860 \"), questi calcoli non sono precisi al 100%.";
< 		$text['treedetail'] = "Più informazione su quest'albero";
---
> 		$text['agedisclaimer'] = "I calcoli legati all'età sono basati sugli Individui con una data di nascita ed una data di decesso conosciute. A causa dell'esistenza di dati incompleti (ad esempio una data di decesso registrata come \"1945 \" o \"AVT 1860 \"), questi calcoli non sono precisi al 100%.";
> 		$text['treedetail'] = "Maggiori informazioni su quest'albero";
591c682,684
< 		$text['totdeceased'] = "Total Deceased";
---
> 		$text['totdeceased'] = "Totale Deceduti";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totale Citazioni Fonti";
595c688
< 		$text['browseallnotes'] = "Mostrare tutte le note";
---
> 		$text['browseallnotes'] = "Scorri tutte le Note";
599c692
< 		$text['menuhelp'] = "Chiave del frammento";
---
> 		$text['menuhelp'] = "Tasto Menu";
603,609c696,702
< 		$text['perms'] = "Tutti i permessi sono stati fissati.";
< 		$text['noperms'] = "I permessi non hanno potuto essere fissati per queste lime:";
< 		$text['manual'] = "Prego regolarli manualmente.";
< 		$text['folder'] = "Dispositivo di piegatura";
< 		$text['created'] = "è stato generato";
< 		$text['nocreate'] = "non ha potuto essere generato. Si prega di generarlo manualmente.";
< 		$text['infosaved'] = "Le informazioni conservate, il collegamento hanno verificato!";
---
> 		$text['perms'] = "Tutti i permessi sono stati settati.";
> 		$text['noperms'] = "Non è stato possibile settare i permessi per i seguenti files:";
> 		$text['manual'] = "Per cortesia, settali manualmente.";
> 		$text['folder'] = "La cartella";
> 		$text['created'] = "è stata creata";
> 		$text['nocreate'] = "non è stata creata. Si prega di crearla manualmente.";
> 		$text['infosaved'] = "Informazioni memorizzate, collegamento verificato!";
611,619c704,711
< 		$text['notables'] = "Le seguenti tabelle non hanno potuto essere generate:";
< 		$text['nocomm'] = "TNG non sta comunicando con la vostra base di dati. Nessuna tabella è stata generata.";
< 		$text['newdb'] = "Le informazioni conservate, il collegamento verificato, nuova base di dati hanno generato:";
< 		$text['noattach'] = "Le informazioni hanno risparmiato. Il collegamento fatto e la base di dati generata, ma TNG non possono attaccare ad esso.";
< 		$text['nodb'] = "Le informazioni hanno risparmiato. Il collegamento fatto, ma la base di dati non esiste e non potrebbe essere generata qui. Verifichi prego che il nome di base di dati sia corretto, o usi il vostro quadro di controllo per generarlo.";
< 		$text['noconn'] = "Le informazioni conservate ma il collegamento sono venuto a mancare. Uno o più di quanto segue sono errati:";
< 		$text['exists'] = "Esiste";
< 		$text['loginfirst'] = "Dovete entrare in primo luogo.";
< 		$text['noop'] = "Nessun funzionamento è stato realizzato.";
---
> 		$text['notables'] = "Non è stato possibile generare le seguenti tabelle:";
> 		$text['nocomm'] = "TNG non riesce a comunicare con il tuo database. Non è stata creata nessuna tabella.";
> 		$text['newdb'] = "Informazioni memorizzate, connessione verificata, nuovo database creato:";
> 		$text['noattach'] = "Informazioni memorizzate. Connessione stabilita e database creato, ma TNG non è riuscito a collegarcisi.";
> 		$text['nodb'] = "Informazioni memorizzate. Connessione stabilita, ma il database non esiste e non è stato possibile crearlo. Verifica che il nome del database sia corrretto, che l'utente del database abbia accesso correttamente o usa il pannello di controllo per crearlo.";
> 		$text['noconn'] = "Informazioni memorizzate ma connessione fallita. Uno o più dei seguenti elementi non è corretto:";
> 		$text['exists'] = "Esiste già.";
> 		$text['noop'] = "Non è stata eseguita nessuna operazione.";
621,622c713,714
< 		$text['nouser'] = "L'utente non è stato generato. Il username può già esistere.";
< 		$text['notree'] = "L'albero non è stato generato. L'identificazione dell'albero può già esistere.";
---
> 		$text['nouser'] = "Utente non creato. Il nome utente potrebbe esistere già.";
> 		$text['notree'] = "Albero non creato. L'ID dell'Albero potrebbe esistere già.";
624c716
< 		$text['renamedto'] = "rinominato";
---
> 		$text['renamedto'] = "rinominato con";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Sono stati rilevati record di utenti esistenti. Per procedere devi prima collegarti o rimuovere tutti i record dalla tabella utenti.";
629,634c723,726
< 		$text['zoomin'] = "Zumare";
< 		$text['zoomout'] = "Zumare all’indietro.";
< 		$text['magmode'] = "Ingrandire modalità";
< 		$text['panmode'] = "Panoramicare modalità";
< 		$text['pan'] = "Fare clic e trascinare per spostare all'interno dell'immagine";
< 		$text['fitwidth'] = "Adatta alla Larghezza";
---
> 		$text['magmode'] = "Modalità ingrandimento";
> 		$text['panmode'] = "Modalità panoramica";
> 		$text['pan'] = "Clicca e trascina per muoverti all'interno dell'immagine";
> 		$text['fitwidth'] = "Adatta in Larghezza";
636c728
< 		$text['newwin'] = "Nuova finestra";
---
> 		$text['newwin'] = "Nuova Finestra";
645,647c737,739
< 		$text['test_date'] = "Test date";
< 		$text['links'] = "Relevant links";
< 		$text['testid'] = "Test ID";
---
> 		$text['test_date'] = "Verifica data";
> 		$text['links'] = "Collegamenti rilevanti";
> 		$text['testid'] = "Verifica ID";
649,659c741,775
< 		$text['mode_values'] = "Mode Values";
< 		$text['compareselected'] = "Compare Selected";
< 		$text['dnatestscompare'] = "Compare Y-DNA Tests";
< 		$text['keep_name_private'] = "Keep Name Private";
< 		$text['browsealltests'] = "Browse All Tests";
< 		$text['all_dna_tests'] = "All DNA tests";
< 		$text['fastmutating'] = "Fast&nbsp;Mutating";
< 		$text['dna_info_head'] = "DNA Test Info";
< 		$text['alltypes'] = "All Types";
< 		$text['allgroups'] = "All Groups";
< 		$text['Ydna_LITbox_info'] = "Test(s) linked to this person were not necessarily taken by this person.<br />The 'Haplogroup' column displays data in red if the result is 'Predicted' or green if the test is 'Confirmed'";
---
> 		$text['mode_values'] = "Valori Modo";
> 		$text['compareselected'] = "Confronta selezionati";
> 		$text['dnatestscompare'] = "Confronta Test Y-DNA";
> 		$text['keep_name_private'] = "Mantieni privati i nomi";
> 		$text['browsealltests'] = "Scorri tutti i Tests";
> 		$text['all_dna_tests'] = "Tutti i test DNA";
> 		$text['fastmutating'] = "Rapido&nbsp;Mutevole";
> 		$text['alltypes'] = "Tutti i Tipi";
> 		$text['allgroups'] = "Tutti i Gruppi";
> 		$text['Ydna_LITbox_info'] = "Il/I Test collegati a questa persona non sono stati necessariamente effettuati da questa persona.<br />La colonna 'Haplogroup' mostra dati in rosso se il risultato è 'Previsto' o verde se il test è 'Confermato'";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Confronta Test mtDNA selezionati";
> 		$text['dnatestscompare_atdna'] = "Confronta Test atDNA selezionati";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Mutazioni Extra";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "Test mtDNA (Mitocondriale)";
> 		$text['atdna_test'] = "Test atDNA (autosomico)";
> 		$text['segment_start'] = "Inizio";
> 		$text['segment_end'] = "Fine";
> 		$text['suggested_relationship'] = "Suggeriti";
> 		$text['actual_relationship'] = "Attuali";
> 		$text['12markers'] = "Marcatori 1-12";
> 		$text['25markers'] = "Marcatori 13-25";
> 		$text['37markers'] = "Marcatori 26-37";
> 		$text['67markers'] = "Marcatori 38-67";
> 		$text['111markers'] = "Marcatori 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Devi selezionare almeno 2 test da confrontare.";
670,672c786
< $text['birthabbr'] = "n.";
< $text['chrabbr'] = "c.";
< $text['seephoto'] = "Vedi fotografia";
---
> $text['seephoto'] = "Vedi foto";
675,676c789
< $text['family'] = "Famiglia"; //from getperson
< $text['children'] = "Figlie";  //from getperson
---
> $text['children'] = "Bambini";  //from getperson
680c793
< $text['thumb'] = "Etichetta";  //as in Thumbnail
---
> $text['thumb'] = "Miniatura";  //as in Thumbnail
685,686c798
< $text['deathabbr'] = "dec.";  //from descend
< $text['lastmodified'] = "Ultimo modif.";  //from getperson
---
> $text['lastmodified'] = "Ultima modifica";  //from getperson
690c802
< $text['lastfirst'] = "Nome, nome dato(i)";  //from search
---
> $text['lastfirst'] = "Nome, Nomignolo";  //from search
706d817
< $text['burialabbr'] = "Sep.";  //from descend
709,710c820,821
< $text['indinfo'] = "Persone";
< $text['edit'] = "Pubblicare";
---
> $text['indinfo'] = "Persona";
> $text['edit'] = "Modifica";
712,716c823,825
< $text['place'] = "Luogo";
< $text['login'] = "Collegarsi";
< $text['logout'] = "Staccarsi";
< $text['marrabbr'] = "Mar.";
< $text['groupsheet'] = "Strato familiare";
---
> $text['login'] = "Accedi";
> $text['logout'] = "Esci";
> $text['groupsheet'] = "Foglio di Gruppo";
721,723c830,832
< $text['search'] = "Cercare";
< $text['user'] = "Utilizzatore";
< $text['firstname'] = "Primo nome";
---
> $text['search'] = "Cerca";
> $text['user'] = "Utente";
> $text['firstname'] = "Nome";
725,726c834,835
< $text['searchresults'] = "Risultati della ricerca";
< $text['diedburied'] = "Deceduto/inumato";
---
> $text['searchresults'] = "Risultati ricerca";
> $text['diedburied'] = "Deceduto/Sepolto";
729,730c838,839
< $text['relationship'] = "Relazione";		//in German, Verwandtschaft
< $text['relationship2'] = "Rapporto"; //different in some languages, at least in German (Beziehung)
---
> $text['relationship'] = "Parentela";		//in German, Verwandtschaft
> $text['relationship2'] = "Relazione"; //different in some languages, at least in German (Beziehung)
738,739c847
< $text['source'] = "Fonte";
< $text['surnamelist'] = "Lista dei cognome";
---
> $text['surnamelist'] = "Lista dei cognomi";
741,744c849,852
< $text['refresh'] = "Rinfrescare";
< $text['whatsnew'] = "Che di nuovo?";
< $text['reports'] = "Ripporti";
< $text['placelist'] = "Lista di luoghi";
---
> $text['refresh'] = "Aggiorna";
> $text['whatsnew'] = "Novità";
> $text['reports'] = "Reports";
> $text['placelist'] = "Lista di Luoghi";
746,748c854,856
< $text['endowedlds'] = "Dotato (LDS)";
< $text['sealedplds'] = "Dotato genitori (LDS)";
< $text['sealedslds'] = "Coniuge dotato (LDS)";
---
> $text['endowedlds'] = "Conferma (LDS)";
> $text['sealedplds'] = "Sigillo ai Genitori (LDS)";
> $text['sealedslds'] = "Sigillo al Coniuge (LDS)";
754c862
< $text['savechanges'] = "Registrare le modifiche";
---
> $text['savechanges'] = "Memorizza le modifiche";
758c866
< $text['anonymous'] = "Anonimo";
---
> $text['anonymous'] = "anonimo";
760c868
< $text['anniversaries'] = "Data e Anniversario";
---
> $text['anniversaries'] = "Date ed Anniversari";
766d873
< $text['repository'] = "Deposito";
768,774c875,880
< $text['suggest'] = "Proposta";
< $text['editevent'] = "Suggerite una modifica per quest'evento";
< $text['findplaces'] = "Trovate tutti gli individui con un evento in questo luogo";
< $text['morelinks'] = "Più legami";
< $text['faminfo'] = "Informazione sulla famiglia";
< $text['persinfo'] = "Informazione Personelle";
< $text['srcinfo'] = "Info. sulla fonte";
---
> $text['suggest'] = "Suggerimento";
> $text['editevent'] = "Suggerisci una modifica per questo evento";
> $text['morelinks'] = "Altri Collegamenti";
> $text['faminfo'] = "Informazioni Famiglia";
> $text['persinfo'] = "Informazioni Personali";
> $text['srcinfo'] = "Informazioni sulla Fonte";
776,778c882,884
< $text['goto'] = "Scegliete una pagina";
< $text['tngprint'] = "Stampare";
< $text['databasestatistics'] = "Statistiche della base di dati"; //needed to be shorter to fit on menu
---
> $text['goto'] = "Scegli una pagina";
> $text['tngprint'] = "Stampa";
> $text['databasestatistics'] = "Statistiche"; //needed to be shorter to fit on menu
780,785c886,891
< $text['repoinfo'] = "Info. luogo di deposito";
< $text['tng_reset'] = "Rimettere a zero";
< $text['noresults'] = "Nulla risultato";
< $text['allmedia'] = "Tutti Media";
< $text['repositories'] = "Deposito";
< $text['albums'] = "Album";
---
> $text['repoinfo'] = "Informazioni Deposito";
> $text['tng_reset'] = "Resetta";
> $text['noresults'] = "Nessun risultato";
> $text['allmedia'] = "Tutti i Media";
> $text['repositories'] = "Depositi";
> $text['albums'] = "Albums";
787,789c893,895
< $text['surnames'] = "Cognome";
< $text['dates'] = "Data";
< $text['link'] = "Collegare";
---
> $text['surnames'] = "Cognomi";
> $text['dates'] = "Date";
> $text['link'] = "Collegamenti";
794,799c900,905
< $text['bookmarks'] = "Bookmark";
< $text['bookmark'] = "Aggiungi Bookmark";
< $text['mngbookmarks'] = "Andare a Bookmarks";
< $text['bookmarked'] = "Bookmark Aggiungiato";
< $text['remove'] = "Togliere";
< $text['find_menu'] = "Trovare";
---
> $text['bookmarks'] = "Segnalibri";
> $text['bookmark'] = "Aggiungi Segnalibro";
> $text['mngbookmarks'] = "Vai ai Segnalibri";
> $text['bookmarked'] = "Segnalibro aggiunto";
> $text['remove'] = "Rimuovi";
> $text['find_menu'] = "Trova";
801,802c907,908
< $text['cemetery'] = "Cimiteri";
< $text['gmapevent'] = "Mappa Evento ";
---
> $text['cemetery'] = "Cimitero";
> $text['gmapevent'] = "Mappa Evento";
804d909
< $text['glang'] = "&amp;hl=it";
807,810c912,915
< $text['gmaplegend'] = "Perno Leggenda";
< $text['unmarked'] = "Non segnata (s)";
< $text['located'] = "Situato(i)";
< $text['albclicksee'] = "Premere per vedere tutti gli articoli in questo album";
---
> $text['gmaplegend'] = "Legenda Pins";
> $text['unmarked'] = "Senza marcatori";
> $text['located'] = "Individuato";
> $text['albclicksee'] = "Clicca per vedere tutti gli elementi in questo album";
813,816c918,920
< $text['missing'] = "Perso";
< $text['pdfgen'] = "Generatore del PDF";
< $text['blank'] = "Tabella in bianco";
< $text['none'] = "Nulla";
---
> $text['missing'] = "Mancante";
> $text['pdfgen'] = "Generatore PDF";
> $text['blank'] = "Grafico vuoto";
820,821c924,925
< $text['pgsetup'] = "Messa a punto di pagina";
< $text['pgsize'] = "Formato di pagina";
---
> $text['pgsetup'] = "Impostazioni pagina";
> $text['pgsize'] = "Formato pagina";
823,824c927,928
< $text['portrait'] = "Ritratto";
< $text['landscape'] = "Paesaggio";
---
> $text['portrait'] = "Verticale";
> $text['landscape'] = "Orizzontale";
827,829c931,933
< $text['lmargin'] = "Margine di sinistra";
< $text['rmargin'] = "Margine di destra";
< $text['createch'] = "Generi la tabella";
---
> $text['lmargin'] = "Margine sinistro";
> $text['rmargin'] = "Margine destro";
> $text['createch'] = "Genera Grafico";
831,833c935,937
< $text['mostwanted'] = "La maggior parte hanno voluto";
< $text['latupdates'] = "Aggiornamenti ultimi";
< $text['featphoto'] = "Foto descritta";
---
> $text['mostwanted'] = "I più cercati";
> $text['latupdates'] = "Aggiornamenti recenti";
> $text['featphoto'] = "Foto in evidenza";
835,838c939,942
< $text['ourhist'] = "La nostra storia di famiglia";
< $text['ourhistanc'] = "Nostre storia di famiglia ed ascendenza";
< $text['ourpages'] = "Le nostre pagine di genealogia della famiglia";
< $text['pwrdby'] = "Powered by";
---
> $text['ourhist'] = "La storia della nostra Famiglia";
> $text['ourhistanc'] = "La storia della nostra Famiglia e dei nostri Antenati";
> $text['ourpages'] = "Le pagine Genealogiche di Famiglia";
> $text['pwrdby'] = "Sito gestito con";
840,846c944,950
< $text['searchtngnet'] = "Rete di ricerca TNG (GENDEX)";
< $text['viewphotos'] = "Osservi tutte le foto";
< $text['anon'] = "Siete attualmente anonimo";
< $text['whichbranch'] = "Quale ramo siete?";
< $text['featarts'] = "Articoli speciali";
< $text['maintby'] = "Effettuato da";
< $text['createdon'] = "Generato sopra";
---
> $text['searchtngnet'] = "Cerca nel Network TNG (GENDEX)";
> $text['viewphotos'] = "Guarda tutte le foto";
> $text['anon'] = "Non sei collegato";
> $text['whichbranch'] = "A quale rampo appartenete?";
> $text['featarts'] = "Articoli in evidenza";
> $text['maintby'] = "Gestito da";
> $text['createdon'] = "Creato nel";
849c953
< $text['inclsrcs'] = "Includi fonti";
---
> $text['inclsrcs'] = "Includi Fonti";
852c956
< $text['mnusearchfornames'] = "Cerca nomi";
---
> $text['mnusearchfornames'] = "Cerca";
854,855c958,959
< $text['mnufirstname'] = "Primo nome";
< $text['mnusearch'] = "Cercare";
---
> $text['mnufirstname'] = "Nome";
> $text['mnusearch'] = "Cerca";
860c964
< $text['mnuregister'] = "Registrati";
---
> $text['mnuregister'] = "Registra un Account Utente";
862,864c966,968
< $text['mnulastnames'] = "Cognome";
< $text['mnustatistics'] = "Statistici";
< $text['mnuphotos'] = "Fotografie";
---
> $text['mnulastnames'] = "Cognomi";
> $text['mnustatistics'] = "Statistiche";
> $text['mnuphotos'] = "Foto";
866c970
< $text['mnumyancestors'] = "Fotografie &amp; Storie per Antenati di [Persona]";
---
> $text['mnumyancestors'] = "Foto &amp; Storie per Antenati di [Persona]";
871,873c975,977
< $text['mnuwhatsnew'] = "Che di nuovo?";
< $text['mnushowlog'] = "Giornale d'Accesso";
< $text['mnulanguage'] = "Cambiare lingua";
---
> $text['mnuwhatsnew'] = "Novità";
> $text['mnushowlog'] = "Log di accesso";
> $text['mnulanguage'] = "Cambia lingua";
875c979
< $text['welcome'] = "Benvenuti";
---
> $text['welcome'] = "Benvenuto";
879c983
< $text['searchnames'] = "Ricerca";
---
> $text['searchnames'] = "Cerca";
881,882c985,986
< $text['editperson'] = "Modifica la persona";
< $text['loadmap'] = "Carica la mappa";
---
> $text['editperson'] = "Modifica Persona";
> $text['loadmap'] = "Carica Mappa";
885,886c989,990
< $text['startnum'] = "Primo numero";
< $text['searching'] = "Ricerca";
---
> $text['startnum'] = "Primo Numero";
> $text['searching'] = "Sto cercando";
888c992
< $text['location'] = "Posizione";
---
> $text['location'] = "Luogo";
890,893c994,997
< $text['collapse'] = "Ridurre";
< $text['expand'] = "Sviluppare";
< $text['plot'] = "Edificabile";
< $text['searchfams'] = "Ricerca Famiglie";
---
> $text['collapse'] = "Riduci";
> $text['expand'] = "Espandi";
> $text['plot'] = "Disegna";
> $text['searchfams'] = "Cerca Famiglie";
895c999
< $text['wasmarried'] = "Sposato";
---
> $text['wasmarried'] = "Sposato(a)";
898,901c1002,1005
< $text['share'] = "Dividere";
< $text['hide'] = "Nascondere";
< $text['disabled'] = "Il tuo conto utente è stato disattivato. Si prega di contattare l'amministratore del sito per ulteriori informazioni.";
< $text['contactus_long'] = "Se avete domande o commenti su questo sito, <span class=\"emphasis\"><a href=\"suggest.php\">contatti</a></span>. Non vediamo l'ora di sentire qualcosa da te.";
---
> $text['share'] = "Condividi";
> $text['hide'] = "Nascondi";
> $text['disabled'] = "Il tuo Account Utente è stato disattivato. Contatta l'amministratore del sito per ulteriori informazioni.";
> $text['contactus_long'] = "Se hai domande o commenti sui contenuti di questo sito, <span class=\"emphasis\"><a href=\"suggest.php\">contattaci</a></span>. Non vediamo l'ora di sentirti.";
905c1009
< $text['trees'] = "gli alberi";
---
> $text['trees'] = "Alberi";
908,911c1012,1015
< $text['emailagain'] = "E-mail di nuovo";
< $text['enteremail2'] = "Inserisci il tuo indirizzo e-mail di nuovo.";
< $text['emailsmatch'] = "I tuoi indirizzi e-mail non corrispondono. Inserisci lo stesso indirizzo e-mail in ogni campo.";
< $text['getdirections'] = "Premi per ottenere indicazioni";
---
> $text['emailagain'] = "Ripeti email";
> $text['enteremail2'] = "Inserisci il tuo indirizzo email di nuovo.";
> $text['emailsmatch'] = "I tuoi indirizzi email non corrispondono. Inserisci lo stesso indirizzo e-mail nei 2 campi.";
> $text['getdirections'] = "Clicca per ottenere indicazioni";
915,917c1019,1021
< $text['slidestart'] = "Diapositive";
< $text['livingnote'] = "Almeno una persona viva è legata a questa nota - i dettagli non sono dunque pubblicati.";
< $text['livingphoto'] = "Almeno un individuo vivo è legato a questa fotografia - Dettagli nascosti.";
---
> $text['slidestart'] = "Presentazione";
> $text['livingnote'] = "Almeno un individuo vivente o privato è collegata a questa Nota - Dettagli non divulgabili.";
> $text['livingphoto'] = "Almeno un individuo vivente o privato è collegato a questa Foto - Dettagli non divulgabili.";
920,927c1024,1030
< $text['branches'] = "Branches";
< $text['detail'] = "Detail";
< $text['moredetail'] = "More detail";
< $text['lessdetail'] = "Less detail";
< $text['otherevents'] = "Altri Eventi";
< $text['conflds'] = "Confirmed (LDS)";
< $text['initlds'] = "Initiatory (LDS)";
< $text['wascremated'] = "was cremated";
---
> $text['branches'] = "Rami";
> $text['detail'] = "Dettagli";
> $text['moredetail'] = "Ulteriori dettagli";
> $text['lessdetail'] = "Meno dettagli";
> $text['conflds'] = "Confermato (LDS)";
> $text['initlds'] = "Iniziazione (LDS)";
> $text['wascremated'] = "è stato cremato";
931c1034
< $text['searchsite'] = "Search this site";
---
> $text['searchsite'] = "Cerca nel sito";
933c1036
< $text['kmlfile'] = "Scaricare un file .kml per mostrare questa posizione in Google Earth";
---
> $text['kmlfile'] = "Scarica un file .KML per vedere questo luogo in Google Earth";
936,940c1039,1043
< $text['heatmap'] = "Heat Map";
< $text['refreshmap'] = "Refresh Map";
< $text['remnums'] = "cancellare i numeri ed Pins";
< $text['photoshistories'] = "Foto &amp; storie";
< $text['familychart'] = "Famiglia grafico";
---
> $text['heatmap'] = "Mappa Termica";
> $text['refreshmap'] = "Aggiorna Mappa";
> $text['remnums'] = "Cancella Numeri e Pins";
> $text['photoshistories'] = "Foto &amp; Storie";
> $text['familychart'] = "Grafico Famiglia";
942c1045
< $text['firstnames'] = "First Names";
---
> $text['firstnames'] = "Nomi";
944,947c1047,1050
< $text['dna_test'] = "DNA Test";
< $text['test_type'] = "Test type";
< $text['test_info'] = "Test Information";
< $text['takenby'] = "Taken by";
---
> $text['dna_test'] = "Test DNA";
> $text['test_type'] = "Tipo di Test";
> $text['test_info'] = "Informazioni Test";
> $text['takenby'] = "Effettuato da";
951,954c1054,1055
< $text['relevant_links'] = "Relevant links";
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
< $text['nofirstname'] = "[no first name]";
---
> $text['relevant_links'] = "Collegamenti rilevanti";
> $text['nofirstname'] = "[nessun nome]";
956,965c1057,1117
< $text['cookieuse'] = "Nota: questo sito utilizza i cookie.";
< $text['dataprotect'] = "Criterio di protezione dati";
< $text['viewpolicy'] = "Visualizza i criteri";
< $text['understand'] = "Ho capito";
< $text['consent'] = "Io do il mio consenso per questo sito per memorizzare i dati personali raccolti qui. Capisco che io possa chiedere al proprietario del sito di rimuovere queste informazioni in qualsiasi momento.";
< $text['consentreq'] = "Si prega di dare il vostro consenso per questo sito per memorizzare le informazioni personali.";
< 
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> $text['cookieuse'] = "Nota: questo sito utilizza cookies.";
> $text['dataprotect'] = "Protezione dei Dati Personali";
> $text['viewpolicy'] = "Vedi la Policy";
> $text['understand'] = "Ho compreso";
> $text['consent'] = "Fornisco il mio consenso a questo sito di memorizzare i miei dati personali qui forniti. Comprendo che potrò richiedere al proprietario del sito di rimuovere queste informazioni in qualsiasi momento.";
> $text['consentreq'] = "Sei pregato di fornire a questo sito il tuo consenso di memorizzare le informazioni personali fornite.";
> 
> //added in 12.1.0
> $text['testsarelinked'] = "I Test DNA sono associati con";
> $text['testislinked'] = "Il Test DNA è associato con";
> 
> //added in 12.2
> $text['quicklinks'] = "Collegamenti rapidi";
> $text['yourname'] = "Il tuo nome";
> $text['youremail'] = "La tua email";
> $text['liketoadd'] = "Altre informazioni che desideri aggiungere";
> $text['webmastermsg'] = "Messaggio del webmaster";
> $text['gallery'] = "Vedi la Galleria";
> $text['wasborn_male'] = "è nato";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "è nata"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "è stato battezzato";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "è stata battezzata";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "morto";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "morta";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "è stato sepolto"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "è stata sepolta"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "è stato cremato";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "è stata cremata";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "sposato";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "sposata";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "era divorziato";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "era divorziata";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " a ";			// used as a preposition to the location
> $text['onthisdate'] = " il ";		// when used with full date
> $text['inthisyear'] = " nel ";		// when used with year only or month / year dates
> $text['and'] = "ed ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Info Test DNA";
> //added in 13.0
> $text['visitor'] = "Visitatore";
> 
> $text['popupnote2'] = "Nuovo pedigree";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom IN";
> $text['zoomout'] = "Zoom OUT";
> $text['scrollnote'] = "Trascina o scorri per vedere di più del grafico.";
> $text['general'] = "Generale";
> 
> //changed in 14.0
> $text['otherevents'] = "Altri Eventi ed Attributi";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connessioni";
> $text['continue'] = "Continua";
> $text['title2'] = "Titolo"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Italian-UTF8/admintext.php TNG1403/languages/Italian-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Volete entrare uno ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Volete scegliere un archivio da importare.";
> 		$admtext['addreplacedata'] = "Aggiunta o sostituisce la vostra genealogia (può prendere molti minuti, in funzione della dimensione del vostro archivio)";
> 		$admtext['fromyourcomputer'] = "Dal vostro computer";
> 		$admtext['importdata'] = "Importare i dati";
> 		$admtext['replace'] = "Sostituire (in albero scelto)";
> 		$admtext['desttree'] = "Albero determina";
> 		$admtext['selectdesttree'] = "Volete scegliere o afferrare un albero determina.";
> 		$admtext['selectexisting'] = "Importare in";
> 		$admtext['ucaselast'] = "Mettere i nomi di famiglia maiuscola";
> 		$admtext['norecalc'] = "Non ricalcolare gli indicatori 'in vita '";
> 		$admtext['autooffset'] = "Fare cominciare ID al primo numero disponibile";
> 		$admtext['mustselecttree'] = "Dovete scegliere un albero prima di utilizzare quest'opzione.";
> 		$admtext['onwebserver'] = "Sul server web (nell'archivio GEDCOM)";
> 		$admtext['imphints'] = "Suggerimenti: Tutti i dati correnti significano tutte le gente, famiglie, fonti e note (le associazioni di mezzi non sono perse finchè le identificazioni (IDs) rimangono le stesse). I fiammiferi sono basati sempre sulle identificazioni (IDs) soltanto. Le nuove annotazioni sono aggiunte sempre. Colleghi le importazioni tutte le annotazioni con le nuove identificazioni (IDs).";
> 		$admtext['destbranch'] = "Ramo della destinazione (facoltativo)";
> 		$admtext['importlatlong'] = "Dati di latitudine/longitudine dell'importazione se presente";
> 		$admtext['opening'] = "In corso di aperutra";
> 		$admtext['reopen'] = "In corso di riapertura";
> 		$admtext['uploading'] = "In carica";
> 		$admtext['stop'] = "Fermare";
> 		$admtext['stopped'] = "Importazione annullata";
> 		$admtext['resume'] = "Riprendere";
> 		$admtext['neweronly'] = "Sostituire soltanto così più recente";
> 		$admtext['oldimport'] = "Importazione vecchio stile (niente barra di avanzamento)";
> 		$admtext['importgedcom'] = "Importare GEDCOM (formato standard 5.5, può essere compresso)";
> 		$admtext['stopbackup'] = "Ferma!  Eseguendo il backup dei dati attuali prima di procedere sarebbe una buona idea.";
> 		$admtext['importmedia'] = "Importare media se esistono";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Soltanto tipi su ordinazione di evento dell'importazione";
> 		$admtext['allevents'] = "Accetti i dati per tutti i nuovi tipi su ordinazione di evento";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Modificare un tipo d'evento esistente";
135,138d168
< 		$admtext['entertypedesc'] = "Volete osservare un tipo/descrizione per questo nuovo tipo d'evento.";
< 		$admtext['enterdisplay'] = "Volete afferrare una catena per questo nuovo tipo d'evento.";
< 		$admtext['existingeventtypeinfo'] = "Informazione tipo d'evento esistente";
< 		$admtext['neweventtypeinfo'] = "Nuovo tipo d'evento";
145,146d174
< 		$admtext['addnewevtype'] = "Aggiungere un tipo d'evento";
< 		$admtext['createnewevtype'] = "Crea un tipo d'evento";
149,150d176
< 		$admtext['existingevtypes'] = "Tipi d'evento esistenti";
< 		$admtext['edsevtypes'] = "Modifica, cancella o separa i tipi d'evento già osservati";
152d177
< 		$admtext['confdeleteevtype'] = "Essete certi volere cancellare questo tipo d'evento ?";
154d178
< 		$admtext['selectentertag'] = "Volete scegliere o afferrare il tag per questo tipo d'evento.";
208d231
< 		$admtext['changestoallevtypes'] = "Cambiamenti a tutti i tipi d'evento";
214d236
< 		$admtext['BAPM'] = "Battesimo";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Sei sicuro di voler eliminare questo tipo di evento?  Tutti gli eventi di questo tipo anche vengono eliminati.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Aggiungere un tipo d'evento";
> 		$admtext['createnewevtype'] = "Crea un tipo d'evento";
> 		$admtext['modifyeventtype'] = "Modificare un tipo d'evento esistente";
> 		$admtext['entertypedesc'] = "Volete osservare un tipo/descrizione per questo nuovo tipo d'evento.";
> 		$admtext['enterdisplay'] = "Volete afferrare una catena per questo nuovo tipo d'evento.";
> 		$admtext['existingeventtypeinfo'] = "Informazione tipo d'evento esistente";
> 		$admtext['neweventtypeinfo'] = "Nuovo tipo d'evento";
> 		$admtext['existingevtypes'] = "Tipi d'evento esistenti";
> 		$admtext['edsevtypes'] = "Modifica, cancella o separa i tipi d'evento già osservati";
> 		$admtext['selectentertag'] = "Volete scegliere o afferrare il tag per questo tipo d'evento.";
> 		$admtext['changestoallevtypes'] = "Cambiamenti a tutti i tipi d'evento";
268d303
< 		$admtext['nobirthinfo'] = "Nessuno info. di nascita ";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Scegli <br/> predefinita <br/> foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Salvare + Nuovi Genitori";
> 		$admtext['savenewspouse'] = "Salvare + Nuovo Coniuge";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Volete osservare una descrizione per quest'immagine.";
388d424
< 		$admtext['photoowner'] = "Proprietario - fonte";
417d452
< 		$admtext['imgmap'] = "Carta d'immagine";
490d524
< 		$admtext['mapinstr3'] = "Per legare una regione di questa fotografia ad un individuo specifico, scegliete l'albero dell'individuo, scegliete una forma e dimensioni per la zona della fotografia che desiderate legare all'individuo, quindi premete il centro della zona scelta sulla fotografia. Una finestra si aprirà per aiutarli a scegliere l'individuo. Una volta che lo avrete scelto, il codice per la carta d'immagine sarà aggiunto nel campo. Ripetete questo processo tanto di volta che desiderate aggiungere individui alla fotografia.";
495d528
< 		$admtext['removelink'] = "Rimuova il collegamento";
502d534
< 		$admtext['eloptions'] = "Passi in rassegna o cancelli";
509d540
< 		$admtext['nolinks'] = "Nessun collegamento esiste ancora";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Mappa Immagine HTML (per retrocompatibilità)";
> 		$admtext['photoowner'] = "Proprietario dell'originario";
> 		$admtext['nothumb'] = "Nessun miniatura";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "The item could not be added, most likely because the file was too large and could not be uploaded or used to make a thumbnail.";
> 		$admtext['moved'] = "Moved";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Volete osservare una descrizione per quest'immagine.";
> 		$admtext['mapinstr3'] = "Per collegare una regione della questa foto ad un individuo, prima di tutto scegli l’albero del individuo, poi crei un rettangolo per la regione desiderata.  Questo viene fatto da cliccando nell'angolo superiore sinistro della regione e poi trascinando all’angelo inferiore destro. Alternativamente, si può cliccare nell’angolo superiore sinistro e poi di nuovo nell’angelo inferiore destro. Una finestra popup ti aiuterà scegliere l’individuo. Effettui la selezione, ripetendo questo processo come necessario per ulteriori regioni.  Cliccare su una regione esistente per sceglierla, e poi trascinare per muoverla o si può cliccare il ‘X’ per eliminarla.";
596d633
< 		$admtext['foremptystring'] = "Per una stringa vuota, lasci questo \"Add dello spazio in bianco e di scatto del campo >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions: Drag or double-click items at left into lists at right. Drag up and down to re-order. Double-click again to remove.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Per una stringa vuota, lasci questo \"Add dello spazio in bianco e di scatto del campo >>.\"";
651,655d690
< 		$admtext['selectimportfile'] = "Volete scegliere un archivio da importare.";
< 		$admtext['importgedcom'] = "Importare GEDCOM (formato standardo 5.5)";
< 		$admtext['addreplacedata'] = "Aggiunta o sostituisce la vostra genealogia (può prendere molti minuti, in funzione della dimensione del vostro archivio)";
< 		$admtext['fromyourcomputer'] = "Dal vostro computer";
< 		$admtext['importdata'] = "Importare i dati";
657,660d691
< 		$admtext['replace'] = "Sostituire (in albero scelto)";
< 		$admtext['desttree'] = "Albero determina";
< 		$admtext['selectdesttree'] = "Volete scegliere o afferrare un albero determina.";
< 		$admtext['selectexisting'] = "Importare in";
668,673d698
< 		$admtext['ucaselast'] = "Mettere i nomi di famiglia maiuscola";
< 		$admtext['norecalc'] = "Non ricalcolare gli indicatori 'in vita '";
< 		$admtext['autooffset'] = "Fare cominciare ID al primo numero disponibile";
< 
< 		$admtext['mustselecttree'] = "Dovete scegliere un albero prima di utilizzare quest'opzione.";
< 		$admtext['importmedia'] = "Importare media se esistono";
675d699
< 		$admtext['neweronly'] = "Sostituire soltanto così più recente";
677,692d700
< 		$admtext['onwebserver'] = "Sul server web (nell'archivio GEDCOM)";
< 		$admtext['eventsonly'] = "Soltanto tipi su ordinazione di evento dell'importazione";
< 		$admtext['imphints'] = "Suggerimenti: Tutti i dati correnti significano tutte le gente, famiglie, fonti e note (le associazioni di mezzi non sono perse finchè le identificazioni (IDs) rimangono le stesse). I fiammiferi sono basati sempre sulle identificazioni (IDs) soltanto. Le nuove annotazioni sono aggiunte sempre. Colleghi le importazioni tutte le annotazioni con le nuove identificazioni (IDs).";
< 		$admtext['allevents'] = "Accetti i dati per tutti i nuovi tipi su ordinazione di evento";
< 		$admtext['destbranch'] = "Ramo della destinazione (facoltativo)";
< 		$admtext['inframe'] = "(nel telaio)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Dati di latitudine/longitudine dell'importazione se presente";
< 		$admtext['opening'] = "In corso di aperutra";
< 		$admtext['reopen'] = "In corso di riapertura";
< 		$admtext['uploading'] = "In carica";
< 		$admtext['stop'] = "Fermare";
< 		$admtext['stopped'] = "Importazione annullata";
< 		$admtext['resume'] = "Riprendere";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Cambiare ceppo";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Importazione vecchio stile (niente barra di avanzamento)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Autore";
804,809c814,819
< 		$admtext['momside'] = "Etichetta dal lato madri"; //8
< 		$admtext['dadside'] = "Etichetta dal lato padri"; //8
< 		$admtext['momperson'] = "Persona ID dal lato madri"; //8
< 		$admtext['momtree'] = "Albero ID dal lato madri"; //8
< 		$admtext['dadperson'] = "Persona ID dal lato madri"; //8
< 		$admtext['dadtree'] = "Albero ID dal lato padri"; //8
---
> 		$admtext['momside'] = "Etichetta dal lato madri"; //8, 20
> 		$admtext['dadside'] = "Etichetta dal lato padri"; //8, 20
> 		$admtext['momperson'] = "Persona ID dal lato madri"; //8, 20
> 		$admtext['momtree'] = "Albero ID dal lato madri"; //8, 20
> 		$admtext['dadperson'] = "Persona ID dal lato madri"; //8, 20
> 		$admtext['dadtree'] = "Albero ID dal lato padri"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Intestazione virgolette";
> 		$admtext['quotesubhead'] = "Sottotitoli virgolette";
> 		$admtext['sniptitle'] = "Titolo featurette";
> 		$admtext['snipname'] = "Nome featurette";
> 		$admtext['snipinfoone'] = "Prima linea di featurette";
> 		$admtext['snipinfotwo'] = "Seconda linea di featurette";
> 		$admtext['snipimage'] = "Immagine featurette";
> 		$admtext['snipperson'] = "ID persona featurette";
> 		$admtext['sniptree'] = "ID albero featurette";
> 		$admtext['quote'] = "Quote";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Funzione 7 documenti";
> 		$admtext['featuretitle8'] = "Funzione 8 documenti";
> 		$admtext['featuretitle9'] = "Funzione 9 documenti";
> 		$admtext['featurethumb9'] = "Funzione 9 miniatura"; //15
> 		$admtext['featurelink9'] = "Funzione 9 collegamento"; //15
> 		$admtext['featurepara9'] = "Funzione 9 paragrafo"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Intestazione Immagine Sinistra";
> 		$admtext['rightimg'] = "Intestazione Immagine Destra";
> 		$admtext['photoption'] = "Le opzioni della foto sono<br />&nbsp;&nbsp;(statiche o casuali)";
> 		$admtext['randomphotowidth'] = "Larghezza Foto Casuale";
> 		$admtext['randomphotoheight'] = "Altezza Foto Casuale";
> 		$admtext['randomphotomediatypeID'] = "Collezione delle Fotografie Casuali";
> 		$admtext['momheading'] = "Intestazione della Famiglia Materna";
> 		$admtext['mompara'] = "Paragrafo della Famiglia Materna";
> 		$admtext['mompagelink'] = "Pagina Collegata della Famiglia Materna";
> 		$admtext['dadheading'] = "Intestazione della Famiglia Paterna";
> 		$admtext['dadpara'] = "Paragrafo della Famiglia Paterna";
> 		$admtext['dadpagelink'] = "Pagina Collegata della Famiglia Paterna";
> 		$admtext['spmomheading'] = "Intestazione della Famiglia Materna del Coniuge";
> 		$admtext['spmompara'] = "Paragrafo della Famiglia Materna del Coniuge";
> 		$admtext['spmompagelink'] = "Pagina Collegata della Famiglia Materna del Coniuge";
> 		$admtext['spmomside'] = "Etichetta dalla parte Materna del Coniuge";
> 		$admtext['spdadside'] = "Etichetta dalla parte Paterna del Coniuge";
> 		$admtext['spmomperson'] = "PersonID dalla parte Materna del Coniuge";
> 		$admtext['spmomtree'] = "TreeID dalla parte Materna del Coniuge";
> 		$admtext['spdadheading'] = "Intestazione della Famiglia Paterna del Coniuge";
> 		$admtext['spdadpara'] = "Paragrafo della Famiglia Paterna del Coniuge";
> 		$admtext['spdadpagelink'] = "Pagina Collegata della Famiglia Paterna del Coniuge";
> 		$admtext['spdadperson'] = "PersonID dalla parte Paterna del Coniuge";
> 		$admtext['spdadtree'] = "TreeID dalla parte Paterna del Coniuge";
> 		$admtext['storiesheading'] = "I nostri racconti familiari";
> 		$admtext['nbrsurnames'] = "Numeri di cognomi<br />&nbsp;&nbsp; nel Cloud dei cognomi";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Funzione miniatura";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
983c1076
< 		$admtext['historypath'] = "Cartella storici";
---
> 		$admtext['historypath'] = "Cartella storie";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Cambiare i prefissi in arrivo per abbinare le impostazioni di TNG";
> 		$admtext['sortevents'] = "Ordinare gli eventi";
> 		$admtext['sortbydate'] = "Data dell’evento";
> 		$admtext['sortbytype'] = "Tipo d’evento";
> 		$admtext['allowsuggest'] = "Consentire suggerimenti dai visitatori";
> 		$admtext['livingchecked'] = "Indicatore Vivente per nuove persone e famiglie";
> 		$admtext['maxmarried'] = "Segnare la famiglia vivente se è sposata meno di<br/>questo molti anni";
> 		$admtext['imagetags'] = "Rettangoli";
> 		$admtext['allowcsv'] = "Consente scaricare CSV per i rapporti";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Export as SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of connection search runs";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Display textual path statement";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages in connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Non potrebbe essere geocodificato";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Non fare geocodificare";
1436d1549
< 		$admtext['backtosecondary'] = "Ritorno agli Strumenti secondari";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Ritorno agli Strumenti secondari";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Escludere appunti";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip and include media files";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Mostrare solo gli utenti disattivati";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Invalid character";
1886d2008
< 		$admtext['test_number'] = "Test Numero";
1916d2037
< 		$admtext['xtra_mut'] = "Extra mutations";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Numero";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Link this DNA test to a person";
1966d2095
< $admtext['otherevents'] = "Altri eventi";
2000c2129
< $admtext['histories'] = "Storici";
---
> $admtext['histories'] = "Storie";
2051,2052d2179
< $admtext['savereturn'] = "Ritorno a questa pagina";
< $admtext['saveback'] = "Ritorno al frammento";
2059,2060d2185
< $admtext['secondary'] = "Processi secondari";
< $admtext['commas'] = "Separare le entrate multiple con punti-virgola";
2102c2227
< $admtext['nobranch'] = "Non un ramo";
---
> $admtext['nobranch'] = "Nessun ramo";
2130,2131d2254
< $admtext['secondarymaint'] = "Strumenti secondari di manutenzione";
< $admtext['customeventtypes'] = "Tipi di eventi personalizzati";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tipo";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Cognomi";
> $admtext['subhead'] = "Sottotitolo";
> $admtext['image'] = "Image";
> $admtext['author'] = "Autore";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Getting Started";
> $admtext['showlog'] = "Cambiare ceppo";
> $admtext['nobirthinfo'] = "Nessuno info. di nascita ";
> //changed in 13.0
> $admtext['savereturn'] = "Salvare + Rimanere";
> $admtext['saveback'] = "Salvare + Uscire";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Tutti gli elementi sono stati eliminati con successo.";
> $admtext['private'] = "Privato";
> $admtext['imgtags'] = "Etichette d’immagine";
> 
> $admtext['removelink'] = "Rimuova il collegamento";
> $admtext['eloptions'] = "Passi in rassegna o cancelli";
> $admtext['pleaseenter'] = "Volete entrare uno ";
> 
> $admtext['nolinks'] = "Nessun collegamento esiste ancora";
> $admtext['nogeocode'] = "Non potrebbe essere geocodificato";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Scegli <br/> predefinita <br/> foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Tipi di eventi personalizzati";
> $admtext['secondary'] = "Processi secondari";
> $admtext['otherevents'] = "Altri eventi";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Tipo";
> $admtext['move'] = "Move";
> $admtext['copy'] = "Copy";
> $admtext['title2'] = "Title"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Italian-UTF8/alltext.php TNG1403/languages/Italian-UTF8/alltext.php
65c65
< $text['histories'] = "Storici";
---
> $text['histories'] = "Storie";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "n.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "dec.";  //from descend
> $text['burialabbr'] = "Sep.";  //from descend
> $text['marrabbr'] = "Mar.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Prima pagina";
> $text['lastpage'] = "Ultima pagina";
> 
> //changed in 13.0.0
> $text['problem'] = "Si è verificato un errore nel software TNG.  Cosa da fare:<p>Se hai appena installato un aggiornamento, potresti aver saltato parte delle istruzioni di installazione.  Ritorni alla pagina readme dell'aggiornamento e rileggi le istruzioni.  Prestare particolare attenzione alla fase della struttura del database.</p><p>Se hai appena installato TNG per la prima volta, potresti avere bisogno di creare le tabelle del database. Ritorni alla pagina readme.html per trovare quella fase.</p><p>Se sei il proprietario del sito web, puoi contattare TNG per ulteriore assistenza con questo problema. Per favore, fai una copia dell'interrogazione qui sotto e la incolli nel tuo messaggio.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Nessun ramo";
> 
> //added in 14.0
> $text['oneyear'] = "year";
> $text['pwdcodelink'] = "Click this link to have a temporary password sent to you";
> $text['pwdcodesent'] = "A password reset link has been sent to your e-mail address.";
> $text['moved'] = "Moved";
> $text['citation'] = "Citation";
> $text['other'] = "Altre Informazioni";
> $text['death'] = "Death";
> $text['burial'] = "Burial";
> $text['cremation'] = "Cremation";
> $text['marriage'] = "Marriage";
> $text['divorce'] = "Divorce";
> $text['bylength'] = "Steps";
> $text['bymarriages'] = "Marriages";
> $text['none'] = "Nulla";
> 
> //moved here in 14.0
> $text['family'] = "Famiglia";
> $text['source'] = "Fonte";
> $text['repository'] = "Deposito";
> $text['place'] = "Luogo";
> $admtext['BAPM'] = "Battesimo";
> 
> $text['glang'] = "it";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Italian-UTF8: data_protection_policy.php
diff -r TNG/languages/Italian-UTF8/text.php TNG1403/languages/Italian-UTF8/text.php
13,14c13,14
< 		$text['repoid'] = "ID del Luogo di deposito";
< 		$text['browseallrepos'] = "Cercare i Luoghi di deposito";
---
> 		$text['repoid'] = "ID del Luogo di Deposito";
> 		$text['browseallrepos'] = "Cerca i Luoghi di Deposito";
21c21
< 		$text['languagesaved'] = "Lingua Registrata";
---
> 		$text['languagesaved'] = "Lingua Salvata";
28c28
< 		$text['gedstart'] = "Avvio GEDCOM";
---
> 		$text['gedstart'] = "Avvio GEDCOM da";
31c31
< 		$text['includelds'] = "Includere informazione LDS";
---
> 		$text['includelds'] = "Includi informazione LDS";
34c34
< 		$text['nomaxgen'] = "Dovete precisare un numero massimo di generazioni. Premere sul bottone 'precedente' e correggere l'errore ";
---
> 		$text['nomaxgen'] = "Devi precisare un numero massimo di generazioni. Premi sul tasto 'Indietro' e correggi";
36,41c36,41
< 		$text['gedcreatedfor'] = "Creato per";
< 		$text['creategedfor'] = "Creare un archivio GEDCOM";
< 		$text['email'] = "Indirizzo elettronico";
< 		$text['suggestchange'] = "Suggerite una modifica";
< 		$text['yourname'] = "Il vostro Nome";
< 		$text['comments'] = "Note o commenti";
---
> 		$text['gedcreatedfor'] = "creato per";
> 		$text['creategedfor'] = "Crea un file GEDCOM";
> 		$text['email'] = "La tua email";
> 		$text['suggestchange'] = "Suggerisci una modifica";
> 		$text['yourname'] = "Il tuo Nome";
> 		$text['comments'] = "Note / Commenti";
43,50c43,50
< 		$text['submitsugg'] = "Presentate una Proposta";
< 		$text['proposed'] = "Cambiamento Proposto";
< 		$text['mailsent'] = "Grazie. Il vostro messaggio è stato inviato.";
< 		$text['mailnotsent'] = "Spiacente, ma il vostro messaggio non ha potuto essere inviato. Volete direttamente contattare xxx a yyy ";
< 		$text['mailme'] = "Inviate una copia a questo indirizzo";
< 		$text['entername'] = "Iscrivete il vostro nome";
< 		$text['entercomments'] = "Iscrivete i vostri commenti";
< 		$text['sendmsg'] = "Inviate un Messaggio";
---
> 		$text['submitsugg'] = "Invia una Proposta";
> 		$text['proposed'] = "Modifica Proposta";
> 		$text['mailsent'] = "Grazie. Il tuo messaggio è stato inoltrato.";
> 		$text['mailnotsent'] = "Spiacente, non è stato possibile inviare il tuo messaggio. Contatta direttamente xxx a yyy "; //xxx and yyy will be replaced ???
> 		$text['mailme'] = "Invia una copia a questo indirizzo";
> 		$text['entername'] = "Indica il tuo nome";
> 		$text['entercomments'] = "Scrivi i tuoi commenti";
> 		$text['sendmsg'] = "Invia il Messaggio";
52c52
< 		$text['subject'] = "Soggetto";
---
> 		$text['subject'] = "Oggetto";
57,58c57,58
< 		$text['photoshistoriesfor'] = "Fotografie e Cronistoria di";
< 		$text['indinfofor'] = "Info. personale che riguarda";
---
> 		$text['photoshistoriesfor'] = "Foto e Cronistoria di";
> 		$text['indinfofor'] = "Informazioni personali di";
64c64
< 		$text['closewindow'] = "Chiudi finestra";
---
> 		$text['closewindow'] = "Chiudi questa finestra";
66,70c66,69
< 		$text['received'] = "Il cambiamento che avete proposto sarà incluso dopo verifica dall'amministratore del sito.";
< 		$text['indreport'] = "Rapporto specifico";
< 		$text['indreportfor'] = "Rapporto specifico per";
< 		$text['general'] = "Generalità";
< 		$text['bkmkvis'] = "<strong>Nota:</strong> Questi segnalibri sono soltanto visibili su questo computer ed in questo browser.";
---
> 		$text['received'] = "Il tuo suggerimento è stato inviato all'amministratore per la revisione.";
> 		$text['indreport'] = "Rapporto individuale";
> 		$text['indreportfor'] = "Rapporto individuale per";
> 		$text['bkmkvis'] = "<strong>Nota:</strong> Questi segnalibri sono visibili solo su questo computer ed in questo browser.";
72,73c71,72
< 		$text['reviewmsg'] = "Hai suggerito un cambiamento che ha bisogno della tua opinione. Questa presentazione riguarda:";
<         $text['revsubject'] = "Il cambiamento suggerito necessita della tua opinione";
---
> 		$text['reviewmsg'] = "C'è un suggerimento che necessita la tua revisione. Il suggerimento riguarda:";
>         $text['revsubject'] = "Il suggerimento necessita della tua revisione";
78,79c77,79
< 		$text['relcalc'] = "Elaboratore di Relazione";
< 		$text['findrel'] = "Ricerca di Relazione";
---
> 	case "connections":
> 		$text['relcalc'] = "Calcolatore Parentela";
> 		$text['findrel'] = "Ricerca Parentela";
82,83c82,83
< 		$text['calculate'] = "Calcolo";
< 		$text['select2inds'] = "Volete scegliere due individui.";
---
> 		$text['calculate'] = "Calcola";
> 		$text['select2inds'] = "Scegli due persone.";
85,93c85,93
< 		$text['enternamepart'] = "Introdurre il nome o il nome di famiglia";
< 		$text['pleasenamepart'] = "Volete introdurre il nome o il nome di famiglia.";
< 		$text['clicktoselect'] = "Premete per scegliere";
< 		$text['nobirthinfo'] = "Non dati di nascita";
< 		$text['relateto'] = "Relazione a";
< 		$text['sameperson'] = "I due individui sono identici";
< 		$text['notrelated'] = "I due individui non sono legati su xxx generazioni."; //xxx will be replaced with number of generations
< 		$text['findrelinstr'] = "Per pubblicare la relazione tra due persone, utilizza il bottone 'ricerca 'sotto per trovare gli individui (o conservate gli individui pubblicati), in seguito premete 'su calcolare'.";
< 		$text['sometimes'] = "(a volte il fatto di verificare un altro numero di generazioni dà un risultato diverso)";
---
> 		$text['enternamepart'] = "Inserisci parte del nome o cognome";
> 		$text['pleasenamepart'] = "Inserisci una porzione del nome o del cognome.";
> 		$text['clicktoselect'] = "Premi per selezionare";
> 		$text['nobirthinfo'] = "Nessuna informazione di nascita";
> 		$text['relateto'] = "Parentela con";
> 		$text['sameperson'] = "I due individui sono la stessa persona";
> 		$text['notrelated'] = "I due individui non sono collegati su xxx generazioni."; //xxx will be replaced with number of generations
> 		$text['findrelinstr'] = "Per visualizzare la parentela tra due persone, utilizza il tasto 'Cerca' qui sotto per trovare gli individui (o mantenere la visualizzazione), poi premi 'Elabora'.";
> 		$text['sometimes'] = "(a volte calcolare un elevato numero di generazioni restituisce un risultato diverso)";
100c100
< 		$text['uncleaunt'] = "il xxx zio/la zia di";
---
> 		$text['uncleaunt'] = "il xxx zio/zia di";
103c103
< 		$text['nephnc'] = "i xxx nipote di";
---
> 		$text['nephnc'] = "il/la xxx nipote di";
106,107c106,107
< 		$text['rwife'] = "la Moglje di ";
< 		$text['rspouse'] = "il Sposo(a) di ";
---
> 		$text['rwife'] = "la Moglie di ";
> 		$text['rspouse'] = "lo Sposo(a) di ";
110c110
< 		$text['rchild'] = "il Bambino(a) di";
---
> 		$text['rchild'] = "il Bimbo/a di";
116c116
< 		$text['gsondau'] = "i xxx Nipote di";
---
> 		$text['gsondau'] = "il xxx Nipote di";
118c118
< 		$text['spouses'] = "sono Coniuge";
---
> 		$text['spouses'] = "sono Coniugi";
120,121c120,121
< 		$text['changeto'] = "Cambiate in:";
< 		$text['notvalid'] = "L' ID della Persona non è valido o non esiste in questo database. Riprovate di nuovo.";
---
> 		$text['changeto'] = "Cambia in (inserisci l'ID):";
> 		$text['notvalid'] = "L' ID della Persona non è valido o non esiste in questo database. Riprova.";
129c129
< 		$text['cousin'] = "il xxx cugino(a) yyy di";
---
> 		$text['cousin'] = "il xxx cugino/a yyy di";
141,142c141,142
< 		$text['maxrels'] = "parentela massimi all'esposizione";
< 		$text['dospouses'] = "Mostri la parentela che fanno partecipare uno sposo";
---
> 		$text['maxrels'] = "Parentele massime da visualizzare";
> 		$text['dospouses'] = "Mostra parentele riguardanti un coniuge";
144c144
< 		$text['dospouses2'] = "mostra i coniuge";
---
> 		$text['dospouses2'] = "Mostra il coniuge";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Ricerca di connessioni";
> 		$text['findrel2'] = "Ricerca di Parentela";
> 		$text['makeme2nd'] = "Usa il mio ID";
> 		$text['usebookmarks'] = "Usa segnalibri";
> 		$text['select2inds'] = "Scegli due individui.";
> 		$text['indinfofor'] = "Informazioni personali di";
> 		$text['nobookmarks'] = "Nessun segnalibro da usare";
> 		$text['bkmtitle'] = "Persone trovate nei segnalibri";
> 		$text['bkminfo'] = "Seleziona una persona:";
> 		$text['sortpathsby'] = "Ordina i percorsi per numero di";
> 		$text['sortbyshort'] = "Ordina per";
> 		$text['bylengthshort'] = "Lunghezza";
> 		$text['badID1'] = ": ID persona1 errato - torna indietro e correggi";
> 		$text['badID2'] = ": ID persona2 errato - torna indietro e correggi";
> 		$text['notintree'] = ": la persona con questo ID non fa parte di questo albero.";
> 		$text['sameperson'] = "I due individui sono la stessa persona";;
> 		$text['nopaths'] = "Queste persone non sono collegate.";
> 		$text['nopaths1'] = "Nessun'altra connessione più corta di xxx";
> 		$text['nopaths2'] = "in xxx passaggi di ricerca";
> 		$text['longestpath'] = "(il percorso più lungo cercato finora era lungo xxx passaggi)";
> 		$text['relevantpaths'] = "Numero di percorsi diversi rilevanti trovati: xxx";
> 		$text['skipMarr'] = "(in aggiunta, il numero di percorsi trovati ma non visualizzati a causa di troppi matrimoni era: xxx)";
> 		$text['mjaor'] = "o";
> 		$text['connectionsto'] = "Connessioni a ";
> 		$text['findanotherpers'] = "Cerca un'altra persona...";
> 		$text['sometimes'] = "(a volte il fatto di verificare un altro numero di generazioni dà un risultato diverso)";
> 		$text['anotherpath'] = "Cerca altre connessioni";
> 		$text['xpath'] = "Percorso ";
> 		$text['primary'] = "Persona Iniziale"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Persona finale";
> 		$text['parent'] = "Genitore";
> 		$text['mhfather'] = "suo padre";
> 		$text['mhmother'] = "sua madre";
> 		$text['mhhusband'] = "suo marito";
> 		$text['mhwife'] = "sua moglie";
> 		$text['mhson'] = "suo figlio";
> 		$text['mhdaughter'] = "sua figlia";
> 		$text['fhfather'] = "suo padre";
> 		$text['fhmother'] = "sua madre";
> 		$text['fhhusband'] = "suo marito";
> 		$text['fhwife'] = "sua moglie";
> 		$text['fhson'] = "suo figlio";
> 		$text['fhdaughter'] = "sua figlia";
> 		$text['hfather'] = "padre";
> 		$text['hmother'] = "madre";
> 		$text['hhusband'] = "marito";
> 		$text['hwife'] = "moglie";
> 		$text['hson'] = "figlio";
> 		$text['hdaughter'] = "figlia";
> 		$text['maxruns'] = "Numero massimo di percorsi da controllare";
> 		$text['maxrshort'] = "Num. massimo";
> 		$text['maxlength'] = "Percorso di connessione non più lungo di";
> 		$text['maxlshort'] = "Lunghezza Max";
> 		$text['xstep'] = "passaggio";
> 		$text['xsteps'] = "passaggi";
> 		$text['xmarriages'] = "xxx matrimoni";
> 		$text['xmarriage'] = "1 matrimonio";
> 		$text['showspouses'] = "Mostra entrambi i coniugi";
> 		$text['showTxt'] = "Mostra descrizione testuale percorso";
> 		$text['showTxtshort'] = "Descr. testuale";
> 		$text['compactBox'] = "Mostra box persone compatti";
> 		$text['compactBoxshort'] = "Box compatti";
> 		$text['paths'] = "Percorsi";
> 		$text['dospouses2'] = "mostra i coniugi";
> 		$text['maxmopt'] = "Numero massimo di matrimoni per connessione";
> 		$text['maxm'] = "Matrimoni Max";
> 		$text['arerelated'] = "Queste persone sono parenti - la loro parentela è visualizzata nel Percorso 1";
> 		$text['simplerel'] = "Ricerca parentela semplice";
175c244
< 		$text['familygroupfor'] = "Pagina di";
---
> 		$text['familygroupfor'] = "Foglio del Gruppo Famiglia di";
178c247
< 		$text['endowedlds'] = "Dotato (LDS)";
---
> 		$text['endowedlds'] = "Conferma (LDS)";
182,183c251,252
< 		$text['husband'] = "Marito";
< 		$text['wife'] = "Moglie";
---
> 		$text['husband'] = "Padre";
> 		$text['wife'] = "Madre";
196d264
< 		$text['scrollnote'] = "Nota: Utilizzate le barre di scorrimento per vedere tutto l'albero.";
198,199c266
< 		$text['popupnote1'] = "Informazione ulteriore";
< 		$text['popupnote2'] = "Nuovo albero";
---
> 		$text['popupnote1'] = "Informazioni ulteriori";
202,203c269,270
< 		$text['pedtextonly'] = "Testo solo";
< 		$text['descendfor'] = "Discesa di";
---
> 		$text['pedtextonly'] = "Solo Testo";
> 		$text['descendfor'] = "Discendenza di";
205c272
< 		$text['gensatonce'] = "Generazioni pubblicate allo stesso tempo";
---
> 		$text['gensatonce'] = "generazioni pubblicate contemporaneamente";
209,212c276,279
< 		$text['stdformat'] = "formato stendardo";
< 		$text['ahnentafel'] = "Ahnentafel";
< 		$text['addnewfam'] = "Aggiungere una nuova famiglia";
< 		$text['editfam'] = "Pubblicare la famiglia";
---
> 		$text['stdformat'] = "Formato Standard";
> 		$text['ahnentafel'] = "Albero genealogico";
> 		$text['addnewfam'] = "Aggiungi una nuova famiglia";
> 		$text['editfam'] = "Pubblica la famiglia";
219,243c286,310
< 		$text['gen3'] = "Grande-genitore (nonni)";
< 		$text['gen4'] = "Secondi nonni";
< 		$text['gen5'] = "Terzi nonni";
< 		$text['gen6'] = "quarti nonni";
< 		$text['gen7'] = "quinti nonni";
< 		$text['gen8'] = "sesti nonni";
< 		$text['gen9'] = "settimi nonni";
< 		$text['gen10'] = "ottavi nonni";
< 		$text['gen11'] = "noni nonni";
< 		$text['gen12'] = "decimi nonni";
< 		$text['graphdesc'] = "Tabella di discesa fino a questo punto";
< 		$text['pedbox'] = "Scatola";
< 		$text['regformat'] = "formato registro";
< 		$text['extrasexpl'] = "Se fotografie o storie esistono per gli individui seguenti, le icone corrispondenti saranno pubblicate accanto ai nomi.";
< 		$text['popupnote3'] = " = Carta Nouva";
< 		$text['mediaavail'] = "Mezzi Disponibile";
< 		$text['pedigreefor'] = "Albero di";
< 		$text['pedigreech'] = "Tabella di razza";
< 		$text['datesloc'] = "Date e posizioni";
< 		$text['borchr'] = "Nascita/Alt - morte/sepoltura (due)";
< 		$text['nobd'] = "Nessun date di morte o di nascita";
< 		$text['bcdb'] = "Nascita/Alt/Morte/Sepoltura (quattro)";
< 		$text['numsys'] = "Sistema di numerazione";
< 		$text['gennums'] = "Numeri di generazione";
< 		$text['henrynums'] = "Numeri del Henry";
---
> 		$text['gen3'] = "Nonni";
> 		$text['gen4'] = "Bisnonni";
> 		$text['gen5'] = "Trisnonni";
> 		$text['gen6'] = "Quadrisnonni";
> 		$text['gen7'] = "Quinti Nonni";
> 		$text['gen8'] = "Sesti Nonni";
> 		$text['gen9'] = "Settimi Nonni";
> 		$text['gen10'] = "Ottavi Nonni";
> 		$text['gen11'] = "Noni Nonni";
> 		$text['gen12'] = "Decimi Nonni";
> 		$text['graphdesc'] = "Grafico discendenza fino a questo punto";
> 		$text['pedbox'] = "Riquadro";
> 		$text['regformat'] = "Formato registro";
> 		$text['extrasexpl'] = "= Esiste almeno una foto, una storia o altri media per questo individuo.";
> 		$text['popupnote3'] = "Nuovo grafico";
> 		$text['mediaavail'] = "Media disponibili";
> 		$text['pedigreefor'] = "Albero Genealogico di";
> 		$text['pedigreech'] = "Albero Genealogico";
> 		$text['datesloc'] = "Date e Luoghi";
> 		$text['borchr'] = "Nascita/Alt - Morte/Sepoltura";
> 		$text['nobd'] = "Nessuna data di nascita o morte";
> 		$text['bcdb'] = "Tutte le date di Nascita/Alt/Morte/Sepoltura";
> 		$text['numsys'] = "Sistema di Numerazione";
> 		$text['gennums'] = "Numeri di Generazione";
> 		$text['henrynums'] = "Numeri di Henry";
246c313
< 		$text['dispopts'] = "Opzioni dell'esposizione";
---
> 		$text['dispopts'] = "Opzioni di visualizzazione";
248,251c315,318
< 		$text['no_ancestors'] = "No ancestors found";
< 		$text['ancestor_chart'] = "Vertical ancestor chart";
< 		$text['opennewwindow'] = "Open in a new window";
< 		$text['pedvertical'] = "Vertical";
---
> 		$text['no_ancestors'] = "Nessun antenato trovato";
> 		$text['ancestor_chart'] = "Grafico antenati verticale";
> 		$text['opennewwindow'] = "Apri in una nuova finestra";
> 		$text['pedvertical'] = "Verticale";
254c321
< 		$text['fcmlogin'] = "Si prega di autenticarsi per vedere dettagli";
---
> 		$text['fcmlogin'] = "Fai il login per vedere i dettagli";
257c324
< 		$text['parentfamily'] = "La famiglia del padre ";
---
> 		$text['parentfamily'] = "La famiglia del genitore ";
259c326
< 		$text['shown'] = "mostrato";
---
> 		$text['shown'] = "visualizzato";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabelle";
> 		$text['dtchildren'] = "Bambini";
> 		$text['dtgrandchildren'] = "Nipoti";
> 		$text['dtggrandchildren'] = "Pronipoti";
> 		$text['dtgggrandchildren'] = "Pronipoti"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nessun discendente";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totale";
> 		$text['dtselect'] = "Seleziona";
> 		$text['dteachfulltable'] = "Ogni tabella intera avrà";
> 		$text['dtrows'] = "righe";
> 		$text['dtdisplayingtable'] = "Visualizzazione tabella";
> 		$text['dtgototable'] = "Vai alla tabella:";
> 		$text['fcinstrdn'] = "Mosta famiglia con coniuge";
> 		$text['fcinstrup'] = "Mostra famiglia con genitori";
> 		$text['fcinstrplus'] = "Scegli altri coniugi";
> 		$text['fcinstrfam'] = "Scegli altri genitori";
270,273c356,359
< 		$text['noreports'] = "Nulla Rapporto.";
< 		$text['reportname'] = "Nome del Rapporto";
< 		$text['allreports'] = "Tutte gli Rapporti";
< 		$text['report'] = "Rapporto";
---
> 		$text['noreports'] = "Non esiste alcun report.";
> 		$text['reportname'] = "Nome del Report";
> 		$text['allreports'] = "Tutti i Report";
> 		$text['report'] = "Report";
275,277c361,363
< 		$text['reportsyntax'] = "la sintassi di questa richiesta";
< 		$text['wasincorrect'] = "è sbagliata, e il rapporto non ha potuto essere lanciato. Si prega di contattare il vostro amministratore sistema a ";
< 		$text['errormessage'] = "Messaggio d'errore";
---
> 		$text['reportsyntax'] = "La sintassi della query lanciata con questo report";
> 		$text['wasincorrect'] = "era errata, e come risultato non è stato possibile lanciare il report. Contatta l'amministratore a";
> 		$text['errormessage'] = "Messaggio di Errore";
279c365
< 		$text['endswith'] = "si conclude";
---
> 		$text['endswith'] = "termina con";
282,286c368,372
< 		$text['plusminus10'] = "+/- 10 anni di";
< 		$text['lessthan'] = "inferiore a ";
< 		$text['greaterthan'] = "superiore a ";
< 		$text['lessthanequal'] = "inferiore o uguaglia a ";
< 		$text['greaterthanequal'] = "superiore o uguaglia a ";
---
> 		$text['plusminus10'] = "+/- 10 anni da";
> 		$text['lessthan'] = "meno di ";
> 		$text['greaterthan'] = "più di ";
> 		$text['lessthanequal'] = "meno o uguale a ";
> 		$text['greaterthanequal'] = "più o uguale a ";
288,289c374,375
< 		$text['tryagain'] = "Volete provare di nuovo";
< 		$text['joinwith'] = "legame";
---
> 		$text['tryagain'] = "Riprova";
> 		$text['joinwith'] = "Legame con";
292,303c378,389
< 		$text['showspouse'] = "pubblicare coniuge (pubblicherà doppi se una persona ha più di uno coniuge)";
< 		$text['submitquery'] = "Ricercare";
< 		$text['birthplace'] = "Luogo di nascita";
< 		$text['deathplace'] = "Luogo di decessi";
< 		$text['birthdatetr'] = "Anno di nascita";
< 		$text['deathdatetr'] = "Anno di decessi";
< 		$text['plusminus2'] = "+/- 2 anni";
< 		$text['resetall'] = "Reinizializzare tutti i valori";
< 		$text['showdeath'] = "Mostrare le informazioni di decessi/sepoltura";
< 		$text['altbirthplace'] = "Luogo di Baptesimo";
< 		$text['altbirthdatetr'] = "Anno di Baptesimo";
< 		$text['burialplace'] = "Luogo della Sepoltura";
---
> 		$text['showspouse'] = "Mostra coniuge (mostrerà duplicati se l'individuo ha più di un coniuge)";
> 		$text['submitquery'] = "Ricerca";
> 		$text['birthplace'] = "Luogo di Nascita";
> 		$text['deathplace'] = "Luogo del Decesso";
> 		$text['birthdatetr'] = "Anno di Nascita";
> 		$text['deathdatetr'] = "Anno del Decesso";
> 		$text['plusminus2'] = "+/- 2 anni da";
> 		$text['resetall'] = "Resetta tutti i valori";
> 		$text['showdeath'] = "Visualizza le informazioni di Decesso/Sepoltura";
> 		$text['altbirthplace'] = "Luogo di Battesimo";
> 		$text['altbirthdatetr'] = "Anno di Battesimo";
> 		$text['burialplace'] = "Luogo di Sepoltura";
305c391
< 		$text['event'] = "Evento(i)";
---
> 		$text['event'] = "Evento";
308,310c394,396
< 		$text['keyword'] = "Parola chiave (ad esempio, \"Verso\")";
< 		$text['explain'] = "Introdurre le date per vedere gli eventi corrispondenti. Lasciare un campo vuoto per vedere tutte le corrispondenze.";
< 		$text['enterdate'] = "Volete introdurre o scegliere almeno uno degli elementi seguenti: Giorno, mese, anno, parola chiave: ";
---
> 		$text['keyword'] = "Parola chiave (ad esempio, \"Circa\")";
> 		$text['explain'] = "Inserisci porzioni di date per vedere gli eventi corrispondenti. Lascia vuoto per vedere tutte le corrispondenze.";
> 		$text['enterdate'] = "Inserisci o scegli almeno uno degli seguenti: Giorno, Mese, Anno, Parola Chiave";
312,314c398,400
< 		$text['birthdate'] = "Data di nascita";
< 		$text['altbirthdate'] = "Data di baptesimo";
< 		$text['marrdate'] = "Data delle nozze";
---
> 		$text['birthdate'] = "Data di Nascita";
> 		$text['altbirthdate'] = "Data di Battesimo";
> 		$text['marrdate'] = "Data di Matrimonio";
317,319c403,405
< 		$text['deathdate'] = "Data di decessi";
< 		$text['burialdate'] = "Data della sepoltura";
< 		$text['changedate'] = "Data dell'ultima modifica";
---
> 		$text['deathdate'] = "Data del Decesso";
> 		$text['burialdate'] = "Data della Sepoltura";
> 		$text['changedate'] = "Data Ultima Modifica";
321,331c407,417
< 		$text['baptdate'] = "Data di baptesimo (SDJ)";
< 		$text['baptplace'] = "Luogo di baptesimo (SDJ)";
< 		$text['endldate'] = "Data di conferma (SDJ)";
< 		$text['endlplace'] = "Luogo di conferma (SDJ)";
< 		$text['ssealdate'] = "Data del sigillo S (SDJ)";   //Sealed to spouse
< 		$text['ssealplace'] = "Luogo del sigillo S (SDJ)";
< 		$text['psealdate'] = "Data del sigillo (SDJ)";   //Sealed to parents
< 		$text['psealplace'] = "Luogo del sigillo P (SDJ)";
< 		$text['marrplace'] = "Luogo di Nozze";
< 		$text['spousesurname'] = "Nome di famiglia del coniuge";
< 		$text['spousemore'] = "se inserite un valore per il nome di famiglia del coniuge, dovete inserire almeno un'altro valore.";
---
> 		$text['baptdate'] = "Data di Battesimo (LDS)";
> 		$text['baptplace'] = "Luogo di Battesimo (LDS)";
> 		$text['endldate'] = "Data di Conferma (LDS)";
> 		$text['endlplace'] = "Luogo di Conferma (LDS)";
> 		$text['ssealdate'] = "Data del Sigillo al Coniuge (LDS)";   //Sealed to spouse
> 		$text['ssealplace'] = "Luogo del Sigillo al Coniuge (LDS)";
> 		$text['psealdate'] = "Data del Sigillo ai Genitori (LDS)";   //Sealed to parents
> 		$text['psealplace'] = "Luogo del sigillo ai Genitori (LDS)";
> 		$text['marrplace'] = "Luogo di Matrimonio";
> 		$text['spousesurname'] = "Cognome del coniuge";
> 		$text['spousemore'] = "se inserisci un valore per il Cognome del coniuge, devi selezionare il sesso.";
333,337c419,423
< 		$text['exists'] = "Esiste";
< 		$text['dnexist'] = "Non Esiste";
< 		$text['divdate'] = "Data di divorzio";
< 		$text['divplace'] = "Posto di divorzio";
< 		$text['otherevents'] = "Altri Eventi";
---
> 		$text['exists'] = "esiste";
> 		$text['dnexist'] = "non esiste";
> 		$text['divdate'] = "Data del Divorzio";
> 		$text['divplace'] = "Luogo del Divorzio";
> 		$text['otherevents'] = "Altri criteri di Ricerca";
339,341c425,427
< 		$text['mysphoto'] = "Foto di mistero";
< 		$text['mysperson'] = "Gente evasiva";
< 		$text['joinor'] = "Il ' Unisca con OR' l'opzione non può essere usata con il cognome del sposo/a";
---
> 		$text['mysphoto'] = "Foto misteriosa";
> 		$text['mysperson'] = "Persone sfuggenti";
> 		$text['joinor'] = "L'opzione 'Unisci con O' non può essere usata con il Cognome del Coniuge";
345,348c431,434
< 		$text['marrdatetr'] = "anno di matrimonio";
< 		$text['divdatetr'] = "anno di divorzio";
< 		$text['mothername'] = "nome della madre";
< 		$text['fathername'] = "nome del padre";
---
> 		$text['marrdatetr'] = "Anno di Matrimonio";
> 		$text['divdatetr'] = "Anno di Divorzio";
> 		$text['mothername'] = "Nome della Madre";
> 		$text['fathername'] = "Nome del Padre";
350c436
< 		$text['notliving'] = "non vivendo";
---
> 		$text['notliving'] = "non vivente";
353c439
< 		$text['csv'] = "Delimitato da virgola file CSV";
---
> 		$text['csv'] = "File CSV (Delimitato da virgola)";
355,358c441,444
< 		$text['confdate'] = "Confirmation Date (LDS)";
< 		$text['confplace'] = "Confirmation Place (LDS)";
< 		$text['initdate'] = "Initiatory Date (LDS)";
< 		$text['initplace'] = "Initiatory Place (LDS)";
---
> 		$text['confdate'] = "Data di Conferma (LDS)";
> 		$text['confplace'] = "Luogo di Conferma (LDS)";
> 		$text['initdate'] = "Data Iniziazione (LDS)";
> 		$text['initplace'] = "Luogo Iniziazizone (LDS)";
360c446
< 		$text['marrtype'] = "Tipo di matrimonio";
---
> 		$text['marrtype'] = "Tipo di Matrimonio";
362c448
< 		$text['searchnote'] = "Nota: Questa pagina utilizza Google per eseguire la ricerca. Il numero di risultati restituiti influiranno direttamente nella misura in cui Google è stato in grado di indicizzare il sito.";
---
> 		$text['searchnote'] = "Nota: Questa pagina utilizza Google per eseguire la ricerca. Il numero di risultati restituiti verrà influenzato direttamente dalla misura in cui Google è stato in grado di indicizzare il sito.";
367,370c453,456
< 		$text['logfilefor'] = "Archivio registro per";
< 		$text['mostrecentactions'] = "ultime azioni";
< 		$text['autorefresh'] = "Rinfreschi automatico (30 secondi)";
< 		$text['refreshoff'] = "Eliminare il rinfreschi automatico";
---
> 		$text['logfilefor'] = "File di Log per";
> 		$text['mostrecentactions'] = "Azioni più recenti";
> 		$text['autorefresh'] = "Auto Refresh (30 secondi)";
> 		$text['refreshoff'] = "Disattiva Auto Refresh";
375,379c461,465
< 		$text['cemeteriesheadstones'] = "Cimiteri e Pietri Tombale";
< 		$text['showallhsr'] = "Mostrare tutte le registrazioni delle tombe";
< 		$text['in'] = "in3";
< 		$text['showmap'] = "Mostrare la carta";
< 		$text['headstonefor'] = "Pietra Tombale di";
---
> 		$text['cemeteriesheadstones'] = "Cimiteri e Lapidi";
> 		$text['showallhsr'] = "Mostra tutte le registrazioni delle lapidi";
> 		$text['in'] = "in";
> 		$text['showmap'] = "Mostra la mappa";
> 		$text['headstonefor'] = "Lapide di";
381,384c467,468
< 		$text['firstpage'] = "Prima pagina";
< 		$text['lastpage'] = "Ultima pagina";
< 		$text['photoowner'] = "Fonte del proprietario";
< 		$text['nocemetery'] = "Non un cimitero";
---
> 		$text['photoowner'] = "Proprietario dell'originale";
> 		$text['nocemetery'] = "Nessun cimitero";
388c472
< 		$text['iptc055'] = "Data di creazione";
---
> 		$text['iptc055'] = "Data di Creazione";
390c474
< 		$text['iptc085'] = "Posizione dell'autore";
---
> 		$text['iptc085'] = "Posizione dell'Autore";
392,393c476,477
< 		$text['iptc095'] = "Stato";
< 		$text['iptc101'] = "Paese";
---
> 		$text['iptc095'] = "Stato/Provincia";
> 		$text['iptc101'] = "Nazione";
397,398c481,482
< 		$text['iptc115'] = "Fonte della fotografia";
< 		$text['iptc116'] = "Nota di diritto d'autore";
---
> 		$text['iptc115'] = "Fonte della Foto";
> 		$text['iptc116'] = "Nota di Diritto D'Autore";
400,420c484,504
< 		$text['iptc122'] = "Autore del sottotitolo";
< 		$text['mapof'] = "Carta di";
< 		$text['regphotos'] = "Vista descrittiva";
< 		$text['gallery'] = "Soltanto le etichette";
< 		$text['cemphotos'] = "Fotografie di cimiteri";
< 		$text['photosize'] = "Dimensione";
<         $text['iptc010'] = "Priorita";
< 		$text['filesize'] = "Grandezza di File";
< 		$text['seeloc'] = "Vedeste Posizione";
< 		$text['showall'] = "Mostrare tutto";
< 		$text['editmedia'] = "Curare Media";
< 		$text['viewitem'] = "Vedere Questo Dettaglio";
< 		$text['editcem'] = "Curacre Cimiterio";
< 		$text['numitems'] = "# Dettaglio";
< 		$text['allalbums'] = "Tutti l'album";
< 		$text['slidestop'] = "Pausa La Proiezione di diapositive";
< 		$text['slideresume'] = "Riassunto La Proiezione di diapositive";
< 		$text['slidesecs'] = "Secondi per ogni scorrevole :";
< 		$text['minussecs'] = "di meno 0.5 secondi";
< 		$text['plussecs'] = "più 0.5 secondi";
< 		$text['nocountry'] = "Paese sconosciuto";
---
> 		$text['iptc122'] = "Autore del Sottotitolo";
> 		$text['mapof'] = "Mappa di";
> 		$text['regphotos'] = "Vista Descrittiva";
> 		$text['gallery'] = "Solo miniature";
> 		$text['cemphotos'] = "Foto di Cimiteri";
> 		$text['photosize'] = "Dimensioni";
>         $text['iptc010'] = "Priorità";
> 		$text['filesize'] = "Dimensione del File";
> 		$text['seeloc'] = "Vedi Luogo";
> 		$text['showall'] = "Mostra tutto";
> 		$text['editmedia'] = "Modifica Media";
> 		$text['viewitem'] = "Mostra questo oggetto";
> 		$text['editcem'] = "Modifica Cimitero";
> 		$text['numitems'] = "# Oggetti";
> 		$text['allalbums'] = "Tutti gli Albums";
> 		$text['slidestop'] = "Metti in pausa le Diapositive";
> 		$text['slideresume'] = "Riprendi la visualizzazione delle Diapositive";
> 		$text['slidesecs'] = "Secondi per ogni diapositiva:";
> 		$text['minussecs'] = "riduci di 0.5 secondi";
> 		$text['plussecs'] = "aumenta di 0.5 secondi";
> 		$text['nocountry'] = "Nazione sconosciuta";
422c506
< 		$text['nocounty'] = "Paese sconosciuto";
---
> 		$text['nocounty'] = "Provincia sconosciuta";
424,426c508,510
< 		$text['nocemname'] = "Nome sconosciuto del cimitero";
< 		$text['editalbum'] = "Pubblichi l'album";
< 		$text['mediamaptext'] = "<strong>Nota:</strong> Sposti il vostro puntatore del mouse sopra l'immagine verso i nomi di esposizione. Scatti per vedere una pagina per ogni nome.";
---
> 		$text['nocemname'] = "Nome del Cimitero sconosciuto";
> 		$text['editalbum'] = "Modifica l'album";
> 		$text['mediamaptext'] = "<strong>Nota:</strong> Sposta il mouse sopra l'immagine per vedere i nomi. Clicca per vedere la pagina di ogni nome.";
428,429c512,513
< 		$text['allburials'] = "Tutte le sepolture";
< 		$text['moreinfo'] = "Ulteriori informazioni:";
---
> 		$text['allburials'] = "Tutte le Sepolture";
> 		$text['moreinfo'] = "Clicca per ulteriori informazioni su questa immagine";
432c516
<         $text['iptc092'] = "Sub-luogo";
---
>         $text['iptc092'] = "Sub-Luogo";
434,435c518,521
< 		$text['iptc065'] = "Originario del programma";
< 		$text['iptc070'] = "Programma Versione";
---
> 		$text['iptc065'] = "Programma Originario";
> 		$text['iptc070'] = "Versione Programma";
> 		//added in 13.0
> 		$text['toggletags'] = "Attiva/Disattiva Etichette";
441,445c527,531
< 		$text['surnamesstarting'] = "Pubblicare i cognome che cominciano con";
< 		$text['showtop'] = "Mostrare la cima";
< 		$text['showallsurnames'] = "Pubblicare tutti i Cognome";
< 		$text['sortedalpha'] = "Selezione alfabetica";
< 		$text['byoccurrence'] = "Classificati da verificarsi";
---
> 		$text['surnamesstarting'] = "Mostra i cognomi che cominciano con";
> 		$text['showtop'] = "Mostra l'inizio";
> 		$text['showallsurnames'] = "Pubblica tutti i Cognomi";
> 		$text['sortedalpha'] = "ordinati alfabeticamente";
> 		$text['byoccurrence'] = "ordinati per occorrenze";
447,461c533,547
< 		$text['mainsurnamepage'] = "Cognome";
< 		$text['allsurnames'] = "Tutti i Cognome";
< 		$text['showmatchingsurnames'] = "Premete su uno Cognomo per pubblicare i risultati.";
< 		$text['backtotop'] = "Rirtorno in testa della pagina";
< 		$text['beginswith'] = "Cominciando con";
< 		$text['allbeginningwith'] = "Tutti i Cognomo che cominciano con";
< 		$text['numoccurrences'] = "Numero di risultati tra parentesi";
< 		$text['placesstarting'] = "Mostrare i luoghi più grande cominciano con";
< 		$text['showmatchingplaces'] = "Premete su un nome per vedere le registrazioni legate.";
< 		$text['totalnames'] = "Totale degli individui";
< 		$text['showallplaces'] = "Mostrare i più grande luoghi";
< 		$text['totalplaces'] = "Totale dei luoghi";
< 		$text['mainplacepage'] = "Pagina dei luoghi principali";
< 		$text['allplaces'] = "Tutte le più grandi località";
< 		$text['placescont'] = "Mostrare tutti i luoghi che contengono";
---
> 		$text['mainsurnamepage'] = "Pagina Cognome principale";
> 		$text['allsurnames'] = "Tutti i Cognomi";
> 		$text['showmatchingsurnames'] = "Premi su un Cognome per visualizzare i risultati.";
> 		$text['backtotop'] = "Ritorna all'inizio";
> 		$text['beginswith'] = "Inizia con";
> 		$text['allbeginningwith'] = "Tutti i Cognomi che iniziano con";
> 		$text['numoccurrences'] = "numero totale località tra parentesi";
> 		$text['placesstarting'] = "Mostra località maggiori che iniziano con";
> 		$text['showmatchingplaces'] = "Premi su un luogo per vedere località minori. Clicca sull'icona di ricerca per vedere individui corrispondenti.";
> 		$text['totalnames'] = "totale individui";
> 		$text['showallplaces'] = "Mostra tutte le località maggiori";
> 		$text['totalplaces'] = "totale luoghi";
> 		$text['mainplacepage'] = "Pagina luoghi principali";
> 		$text['allplaces'] = "Tutte le località maggiori";
> 		$text['placescont'] = "Mostra tutti i luoghi che contengono";
463,464c549,550
< 		$text['top30'] = "Cognomi del principale xxx";
< 		$text['top30places'] = "Più grandi località del principale xxx";
---
> 		$text['top30'] = "Primi xxx cognomi";
> 		$text['top30places'] = "Prime xxx località maggiori";
466,476c552,562
< 		$text['firstnamelist'] = "First Name List";
< 		$text['firstnamesstarting'] = "Show first names starting with";
< 		$text['showallfirstnames'] = "Show all first names";
< 		$text['mainfirstnamepage'] = "Main first name page";
< 		$text['allfirstnames'] = "All First Names";
< 		$text['showmatchingfirstnames'] = "Click on a first name to show matching records.";
< 		$text['allfirstbegwith'] = "All first names beginning with";
< 		$text['top30first'] = "Top xxx first names";
< 		$text['allothers'] = "All others";
< 		$text['amongall'] = "(among all names)";
< 		$text['justtop'] = "Just the top xxx";
---
> 		$text['firstnamelist'] = "Lista Nomi";
> 		$text['firstnamesstarting'] = "Mostra nomi che iniziano con";
> 		$text['showallfirstnames'] = "Mostra tutti i nomi";
> 		$text['mainfirstnamepage'] = "Pagina nomi principali";
> 		$text['allfirstnames'] = "Tutti i Nomi";
> 		$text['showmatchingfirstnames'] = "Clicca su un nome per mostrare i record corrispondenti.";
> 		$text['allfirstbegwith'] = "Tutti i nomi che iniziano con";
> 		$text['top30first'] = "Primi xxx nomi";
> 		$text['allothers'] = "Tutti gli altri";
> 		$text['amongall'] = "(tra tutti i nomi)";
> 		$text['justtop'] = "Solo i primi xxx";
484,487c570,573
< 		$text['history'] = "Storia/documento";
< 		$text['husbid'] = "ID Coniuge";
< 		$text['husbname'] = "Nome del Coniuge";
< 		$text['wifeid'] = "ID Coniuge";
---
> 		$text['history'] = "Storia/Documento";
> 		$text['husbid'] = "ID Padre";
> 		$text['husbname'] = "Nome del Padre";
> 		$text['wifeid'] = "ID Madre";
489c575
< 		$text['wifename'] = "Nome della madre";
---
> 		$text['wifename'] = "Nome della Madre";
494,496c580,582
< 		$text['text_delete'] = "Eliminare";
< 		$text['addperson'] = "Aggiungere individuo";
< 		$text['nobirth'] = "L'individuo seguente non ha date di nascita valida e non è stato dunque aggiunto";
---
> 		$text['text_delete'] = "Elimina";
> 		$text['addperson'] = "Aggiungi Individuo";
> 		$text['nobirth'] = "Il seguente individuo non ha una data di nascita valida e non è stato possibile aggiungerlo";
498,500c584,586
< 		$text['chartwidth'] = "Larghezza del grafico";
< 		$text['timelineinstr'] = "Aggiungete fino a quattro individui che entrano nel loro IDs qui di seguito:";
< 		$text['togglelines'] = "Ginocchiera Linee";
---
> 		$text['chartwidth'] = "Larghezza grafico";
> 		$text['timelineinstr'] = "Aggiungi individui";
> 		$text['togglelines'] = "Attiva/Disattiva linee";
502c588
< 		$text['noliving'] = "L'individuo seguente è registrato poiché essendo in vita e non è pubblicato perché non siete collegati con le autorizzazioni necessarie";
---
> 		$text['noliving'] = "Il seguente individuo è registrato come vivente o privato e non è stato possibile aggiungerlo perché non sei loggato con le autorizzazioni necessarie";
516,517c602,603
< 		$text['country'] = "Paese";
< 		$text['email'] = "Indirizzo elettronico";
---
> 		$text['country'] = "Nazione";
> 		$text['email'] = "email";
519,521c605,607
< 		$text['username'] = "Nome d'utente";
< 		$text['password'] = "Parola d'ordine";
< 		$text['loginfailed'] = "Errore di collegamento.";
---
> 		$text['username'] = "Nome utente";
> 		$text['password'] = "Password";
> 		$text['loginfailed'] = "Login fallito.";
523,524c609,610
< 		$text['regnewacct'] = "Registrazione nuovamente conta utente";
< 		$text['realname'] = "il vostro nome vero";
---
> 		$text['regnewacct'] = "Registrazione Nuovo Account Utente";
> 		$text['realname'] = "Il tuo vero nome";
526c612
< 		$text['email'] = "Indirizzo elettronico";
---
> 		$text['email'] = "email";
528,536c614,622
< 		$text['acctcomments'] = "Note o commenti";
< 		$text['submit'] = "Sottoporre";
< 		$text['leaveblank'] = "(lasciare in vuoto se desiderate un nuovo albero)";
< 		$text['required'] = "Campi necessari";
< 		$text['enterpassword'] = "Introdurte una parola d'ordine.";
< 		$text['enterusername'] = "Introdurte un nome d'utente.";
< 		$text['failure'] = "Il vostro nome d'utente è già preso. Utilizza il bottone indietro del vostro browser per ritornare alla pagina precedente e scegliere un altro nome di utente.";
< 		$text['success'] = "Grazie. Abbiamo ricevuto la vostra registrazione. Ti contatteremo quando il vostro account sarà attivato o se abbiamo bisogno di più informazioni.";
< 		$text['emailsubject'] = "Domanda di registrazione di nuovo utente TNG";
---
> 		$text['acctcomments'] = "Note o Commenti";
> 		$text['submit'] = "Invia";
> 		$text['leaveblank'] = "(lasciare vuoto se desiderate un nuovo albero)";
> 		$text['required'] = "Campi obbligatori";
> 		$text['enterpassword'] = "Inserisci una password.";
> 		$text['enterusername'] = "Inserisci un nome utente.";
> 		$text['failure'] = "Ci dispiace ma il nome utente scelto è già in uso. Usa il tasto Indietro del tuo browser per tornare alla pagina precedente e scegliere un nome utente diverso.";
> 		$text['success'] = "Grazie. Abbiamo ricevuto la tua registrazione. Ti contatteremo quando il tuo account sarà attivato o se abbiamo bisogno di maggiori informazioni.";
> 		$text['emailsubject'] = "Richiesta di registrazione Nuovo Utente TNG";
538,542c624,628
< 		$text['nologin'] = "Non avete profilo di collegamento?";
< 		$text['loginsent'] = "I vostri dati di collegamento sono stati inviati";
< 		$text['loginnotsent'] = "I vostri dati di collegamento non sono stati inviati";
< 		$text['enterrealname'] = "volete inserire il vostro vero nome.";
< 		$text['rempass'] = "Restate collegati su questo computer";
---
> 		$text['nologin'] = "Non hai ancora un account?";
> 		$text['loginsent'] = "Dati di accesso inviati";
> 		$text['loginnotsent'] = "Dati di accesso NON inviati";
> 		$text['enterrealname'] = "Inserisci il tuo vero nome.";
> 		$text['rempass'] = "Resta collegato con questo computer";
544c630
< 		$text['accmail'] = "<strong>NOTA:</strong> Al fine di ricevere la posta dall'amministratore del sito relativo al tuo account, assicurati di non bloccare la posta da questo dominio.";
---
> 		$text['accmail'] = "<strong>NOTA:</strong> Per poter ricevere la posta dall'amministratore del sito in merito al tuo account, assicurati di non bloccare la posta in arrivo da questo dominio.";
546,558c632,642
< 		$text['resetpass'] = "Resettare la vostra Password";
< 		$text['nousers'] = "Questa forma non può essere usata fino a che almeno un utente record non esista. Se siete il proprietario del sito, vai prego agli utenti di Admin / generare il vostro cliente del coordinatore.";
< 		$text['noregs'] = "Siamo spiacenti, ma non stiamo accettando i nuovi registri di utente attualmente. Si metta in <a href=\"suggest.php\">contatto</a> con prego direttamente se avete le osservazioni o domande per quanto riguarda qualche cosa su questo luogo.";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Avete ricevuto una nuova domanda di conto utilizzatore TNG. Volete collegare alla sezione amministrazione di TNG ed accordare le autorizzazioni adeguate a questo nuovo conto. Se approvate questa registrazione, volete informare il richiedente rispondendo questo a message.";
< 		$text['accactive'] = "Il cliente è stato attivato, ma l'utente non avrà diritti dello special fino a che non li assegniate.";
< 		$text['accinactive'] = "Vada al Admin/Utenti/Revista accedere alle regolazioni di cliente. Il cliente rimarrà inattivo fino a che non pubblichiate almeno una volta e conserviate l'annotazione.";
< 		$text['pwdagain'] = "Parola d'accesso ancora";
< 		$text['enterpassword2'] = "Digiti prego ancora la vostra parola d'accesso.";
< 		$text['pwdsmatch'] = "Le vostre parole d'accesso non abbinano. Digiti prego la stessa parola d'accesso in ogni campo.";
< 		//added in 8.0.0
< 		$text['acksubject'] = "Grazie per la registrazione"; //for a new user account
< 		$text['ackmessage'] = "La vostra richiesta per un account utente è stata ricevuta. Il vostro account sarà inattivo fino a che non sarà controllato dal coordinatore del sito. Sarete avvisati per email quando il vostro account sarà attivato.";
---
> 		$text['resetpass'] = "Resetta la tua Password";
> 		$text['nousers'] = "Questo form non può essere usato fino a che non esista almeno un record utente. Se sei il proprietario del sito, vai ad Amministrazione/Utenti per creare il tuo Account Amministratore.";
> 		$text['noregs'] = "Siamo spiacenti, ma non accettiamo nuove registrazioni utente al momento. <a href=\"suggest.php\">Contattaci</a> direttamente se hai osservazioni o domande riguardo qualcosa su questo sito.";
> 		$text['emailmsg'] = "Hai ricevuto una nuova richiesta per un Account Utente TNG. Collegati all' Amministrazione di TNG ed accorda le autorizzazioni adeguate a questo nuovo Account. Ricorda di informare il richiedente rispondendo questo a messaggio.";
> 		$text['accactive'] = "L'account utente è stato attivato, ma l'utente non avrà alcun diritto fino a che non gleli assegnerai.";
> 		$text['accinactive'] = "Vai ad Amministrazione/Utenti/Rivedi per accedere ai Settaggi Utente. L'utente rimarrà inattivo fino a che non modificherai e salverai i dati almeno una volta.";
> 		$text['pwdagain'] = "Ripeti la password";
> 		$text['enterpassword2'] = "Digita nuovamente la tua password.";
> 		$text['pwdsmatch'] = "Le tue password non coincidono. Digita la stessa password nei 2 campi.";
> 		$text['acksubject'] = "Grazie per esserti registrato"; //for a new user account
> 		$text['ackmessage'] = "La tua richiesta per un Account Utente è stata ricevuta. Il tuo account rimarrà inattivo fino a che non sarà verificato dal proprietario del sito. Sarai avvisato via email quando il tua account sarà pronto per l'uso.";
560c644,651
< 		$text['switch'] = "Switch";
---
> 		$text['switch'] = "Cambia";
> 		//added in 14.0
> 		$text['newpassword2'] = "Ripeti la password";
> 		$text['resetsuccess'] = "Bene ! La Password è stata resettata";
> 		$text['resetfail'] = "Errore: Password non resettata";
> 		$text['failreason0'] = " (errore database sconosciuto)";
> 		$text['failreason2'] = " (non hai i permessi per modificare la tua password)";
> 		$text['failreason3'] = " (le password non coincidono)";
565c656
< 		$text['browseallbranches'] = "Browse All Branches";
---
> 		$text['browseallbranches'] = "Scorri tutti i Rami";
571,582c662,673
< 		$text['totindividuals'] = "Numero totale di individui";
< 		$text['totmales'] = "Totale uomini";
< 		$text['totfemales'] = "Totale donne";
< 		$text['totunknown'] = "Totale sesso sconosciuto";
< 		$text['totliving'] = "Totale individui in vita";
< 		$text['totfamilies'] = "Totale famiglie";
< 		$text['totuniquesn'] = "Totale nomi di famiglia unici";
< 		//$text['totphotos'] = "Total Photos";
< 		//$text['totdocs'] = "Total Histories &amp; Documents";
< 		//$text['totheadstones'] = "Total Headstones";
< 		$text['totsources'] = "Totale fonti";
< 		$text['avglifespan'] = "Durata di vita media";
---
> 		$text['totindividuals'] = "Numero totale di Individui";
> 		$text['totmales'] = "Totale Uomini";
> 		$text['totfemales'] = "Totale Donne";
> 		$text['totunknown'] = "Totale Sesso Non Determinato";
> 		$text['totliving'] = "Totale Individui Viventi";
> 		$text['totfamilies'] = "Totale Famiglie";
> 		$text['totuniquesn'] = "Totale Cognomi unici";
> 		//$text['totphotos'] = "Totale Foto";
> 		//$text['totdocs'] = "Totale Storie &amp; Documenti";
> 		//$text['totheadstones'] = "Totale Lapidi";
> 		$text['totsources'] = "Totale Fonti";
> 		$text['avglifespan'] = "Durata media di vita";
587,588c678,679
< 		$text['agedisclaimer'] = "i calcoli legati all'età sono basati sugli individui con una data di nascita conosciuta ed una data di decesso. A causa dell'esistenza di dati incompleti(p.e. una data di decessi registrata come \"1945 \" o \"avt 1860 \"), questi calcoli non sono precisi al 100%.";
< 		$text['treedetail'] = "Più informazione su quest'albero";
---
> 		$text['agedisclaimer'] = "I calcoli legati all'età sono basati sugli Individui con una data di nascita ed una data di decesso conosciute. A causa dell'esistenza di dati incompleti (ad esempio una data di decesso registrata come \"1945 \" o \"AVT 1860 \"), questi calcoli non sono precisi al 100%.";
> 		$text['treedetail'] = "Maggiori informazioni su quest'albero";
591c682,684
< 		$text['totdeceased'] = "Total Deceased";
---
> 		$text['totdeceased'] = "Totale Deceduti";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totale Citazioni Fonti";
595c688
< 		$text['browseallnotes'] = "Mostrare tutte le note";
---
> 		$text['browseallnotes'] = "Scorri tutte le Note";
599c692
< 		$text['menuhelp'] = "Chiave del frammento";
---
> 		$text['menuhelp'] = "Tasto Menu";
603,609c696,702
< 		$text['perms'] = "Tutti i permessi sono stati fissati.";
< 		$text['noperms'] = "I permessi non hanno potuto essere fissati per queste lime:";
< 		$text['manual'] = "Prego regolarli manualmente.";
< 		$text['folder'] = "Dispositivo di piegatura";
< 		$text['created'] = "è stato generato";
< 		$text['nocreate'] = "non ha potuto essere generato. Si prega di generarlo manualmente.";
< 		$text['infosaved'] = "Le informazioni conservate, il collegamento hanno verificato!";
---
> 		$text['perms'] = "Tutti i permessi sono stati settati.";
> 		$text['noperms'] = "Non è stato possibile settare i permessi per i seguenti files:";
> 		$text['manual'] = "Per cortesia, settali manualmente.";
> 		$text['folder'] = "La cartella";
> 		$text['created'] = "è stata creata";
> 		$text['nocreate'] = "non è stata creata. Si prega di crearla manualmente.";
> 		$text['infosaved'] = "Informazioni memorizzate, collegamento verificato!";
611,619c704,711
< 		$text['notables'] = "Le seguenti tabelle non hanno potuto essere generate:";
< 		$text['nocomm'] = "TNG non sta comunicando con la vostra base di dati. Nessuna tabella è stata generata.";
< 		$text['newdb'] = "Le informazioni conservate, il collegamento verificato, nuova base di dati hanno generato:";
< 		$text['noattach'] = "Le informazioni hanno risparmiato. Il collegamento fatto e la base di dati generata, ma TNG non possono attaccare ad esso.";
< 		$text['nodb'] = "Le informazioni hanno risparmiato. Il collegamento fatto, ma la base di dati non esiste e non potrebbe essere generata qui. Verifichi prego che il nome di base di dati sia corretto, o usi il vostro quadro di controllo per generarlo.";
< 		$text['noconn'] = "Le informazioni conservate ma il collegamento sono venuto a mancare. Uno o più di quanto segue sono errati:";
< 		$text['exists'] = "Esiste";
< 		$text['loginfirst'] = "Dovete entrare in primo luogo.";
< 		$text['noop'] = "Nessun funzionamento è stato realizzato.";
---
> 		$text['notables'] = "Non è stato possibile generare le seguenti tabelle:";
> 		$text['nocomm'] = "TNG non riesce a comunicare con il tuo database. Non è stata creata nessuna tabella.";
> 		$text['newdb'] = "Informazioni memorizzate, connessione verificata, nuovo database creato:";
> 		$text['noattach'] = "Informazioni memorizzate. Connessione stabilita e database creato, ma TNG non è riuscito a collegarcisi.";
> 		$text['nodb'] = "Informazioni memorizzate. Connessione stabilita, ma il database non esiste e non è stato possibile crearlo. Verifica che il nome del database sia corrretto, che l'utente del database abbia accesso correttamente o usa il pannello di controllo per crearlo.";
> 		$text['noconn'] = "Informazioni memorizzate ma connessione fallita. Uno o più dei seguenti elementi non è corretto:";
> 		$text['exists'] = "Esiste già.";
> 		$text['noop'] = "Non è stata eseguita nessuna operazione.";
621,622c713,714
< 		$text['nouser'] = "L'utente non è stato generato. Il username può già esistere.";
< 		$text['notree'] = "L'albero non è stato generato. L'identificazione dell'albero può già esistere.";
---
> 		$text['nouser'] = "Utente non creato. Il nome utente potrebbe esistere già.";
> 		$text['notree'] = "Albero non creato. L'ID dell'Albero potrebbe esistere già.";
624c716
< 		$text['renamedto'] = "rinominato";
---
> 		$text['renamedto'] = "rinominato con";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Sono stati rilevati record di utenti esistenti. Per procedere devi prima collegarti o rimuovere tutti i record dalla tabella utenti.";
629,634c723,726
< 		$text['zoomin'] = "Zumare";
< 		$text['zoomout'] = "Zumare all’indietro.";
< 		$text['magmode'] = "Ingrandire modalità";
< 		$text['panmode'] = "Panoramicare modalità";
< 		$text['pan'] = "Fare clic e trascinare per spostare all'interno dell'immagine";
< 		$text['fitwidth'] = "Adatta alla Larghezza";
---
> 		$text['magmode'] = "Modalità ingrandimento";
> 		$text['panmode'] = "Modalità panoramica";
> 		$text['pan'] = "Clicca e trascina per muoverti all'interno dell'immagine";
> 		$text['fitwidth'] = "Adatta in Larghezza";
636c728
< 		$text['newwin'] = "Nuova finestra";
---
> 		$text['newwin'] = "Nuova Finestra";
645,647c737,739
< 		$text['test_date'] = "Test date";
< 		$text['links'] = "Relevant links";
< 		$text['testid'] = "Test ID";
---
> 		$text['test_date'] = "Verifica data";
> 		$text['links'] = "Collegamenti rilevanti";
> 		$text['testid'] = "Verifica ID";
649,659c741,775
< 		$text['mode_values'] = "Mode Values";
< 		$text['compareselected'] = "Compare Selected";
< 		$text['dnatestscompare'] = "Compare Y-DNA Tests";
< 		$text['keep_name_private'] = "Keep Name Private";
< 		$text['browsealltests'] = "Browse All Tests";
< 		$text['all_dna_tests'] = "All DNA tests";
< 		$text['fastmutating'] = "Fast&nbsp;Mutating";
< 		$text['dna_info_head'] = "DNA Test Info";
< 		$text['alltypes'] = "All Types";
< 		$text['allgroups'] = "All Groups";
< 		$text['Ydna_LITbox_info'] = "Test(s) linked to this person were not necessarily taken by this person.<br />The 'Haplogroup' column displays data in red if the result is 'Predicted' or green if the test is 'Confirmed'";
---
> 		$text['mode_values'] = "Valori Modo";
> 		$text['compareselected'] = "Confronta selezionati";
> 		$text['dnatestscompare'] = "Confronta Test Y-DNA";
> 		$text['keep_name_private'] = "Mantieni privati i nomi";
> 		$text['browsealltests'] = "Scorri tutti i Tests";
> 		$text['all_dna_tests'] = "Tutti i test DNA";
> 		$text['fastmutating'] = "Rapido&nbsp;Mutevole";
> 		$text['alltypes'] = "Tutti i Tipi";
> 		$text['allgroups'] = "Tutti i Gruppi";
> 		$text['Ydna_LITbox_info'] = "Il/I Test collegati a questa persona non sono stati necessariamente effettuati da questa persona.<br />La colonna 'Haplogroup' mostra dati in rosso se il risultato è 'Previsto' o verde se il test è 'Confermato'";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Confronta Test mtDNA selezionati";
> 		$text['dnatestscompare_atdna'] = "Confronta Test atDNA selezionati";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Mutazioni Extra";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "Test mtDNA (Mitocondriale)";
> 		$text['atdna_test'] = "Test atDNA (autosomico)";
> 		$text['segment_start'] = "Inizio";
> 		$text['segment_end'] = "Fine";
> 		$text['suggested_relationship'] = "Suggeriti";
> 		$text['actual_relationship'] = "Attuali";
> 		$text['12markers'] = "Marcatori 1-12";
> 		$text['25markers'] = "Marcatori 13-25";
> 		$text['37markers'] = "Marcatori 26-37";
> 		$text['67markers'] = "Marcatori 38-67";
> 		$text['111markers'] = "Marcatori 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Devi selezionare almeno 2 test da confrontare.";
670,672c786
< $text['birthabbr'] = "n.";
< $text['chrabbr'] = "c.";
< $text['seephoto'] = "Vedi fotografia";
---
> $text['seephoto'] = "Vedi foto";
675,676c789
< $text['family'] = "Famiglia"; //from getperson
< $text['children'] = "Figlie";  //from getperson
---
> $text['children'] = "Bambini";  //from getperson
680c793
< $text['thumb'] = "Etichetta";  //as in Thumbnail
---
> $text['thumb'] = "Miniatura";  //as in Thumbnail
685,686c798
< $text['deathabbr'] = "dec.";  //from descend
< $text['lastmodified'] = "Ultimo modif.";  //from getperson
---
> $text['lastmodified'] = "Ultima modifica";  //from getperson
690c802
< $text['lastfirst'] = "Nome, nome dato(i)";  //from search
---
> $text['lastfirst'] = "Nome, Nomignolo";  //from search
706d817
< $text['burialabbr'] = "Sep.";  //from descend
709,710c820,821
< $text['indinfo'] = "Persone";
< $text['edit'] = "Pubblicare";
---
> $text['indinfo'] = "Persona";
> $text['edit'] = "Modifica";
712,716c823,825
< $text['place'] = "Luogo";
< $text['login'] = "Collegarsi";
< $text['logout'] = "Staccarsi";
< $text['marrabbr'] = "Mar.";
< $text['groupsheet'] = "Strato familiare";
---
> $text['login'] = "Accedi";
> $text['logout'] = "Esci";
> $text['groupsheet'] = "Foglio di Gruppo";
721,723c830,832
< $text['search'] = "Cercare";
< $text['user'] = "Utilizzatore";
< $text['firstname'] = "Primo nome";
---
> $text['search'] = "Cerca";
> $text['user'] = "Utente";
> $text['firstname'] = "Nome";
725,726c834,835
< $text['searchresults'] = "Risultati della ricerca";
< $text['diedburied'] = "Deceduto/inumato";
---
> $text['searchresults'] = "Risultati ricerca";
> $text['diedburied'] = "Deceduto/Sepolto";
729,730c838,839
< $text['relationship'] = "Relazione";		//in German, Verwandtschaft
< $text['relationship2'] = "Rapporto"; //different in some languages, at least in German (Beziehung)
---
> $text['relationship'] = "Parentela";		//in German, Verwandtschaft
> $text['relationship2'] = "Relazione"; //different in some languages, at least in German (Beziehung)
738,739c847
< $text['source'] = "Fonte";
< $text['surnamelist'] = "Lista dei cognome";
---
> $text['surnamelist'] = "Lista dei cognomi";
741,744c849,852
< $text['refresh'] = "Rinfrescare";
< $text['whatsnew'] = "Che di nuovo?";
< $text['reports'] = "Ripporti";
< $text['placelist'] = "Lista di luoghi";
---
> $text['refresh'] = "Aggiorna";
> $text['whatsnew'] = "Novità";
> $text['reports'] = "Reports";
> $text['placelist'] = "Lista di Luoghi";
746,748c854,856
< $text['endowedlds'] = "Dotato (LDS)";
< $text['sealedplds'] = "Dotato genitori (LDS)";
< $text['sealedslds'] = "Coniuge dotato (LDS)";
---
> $text['endowedlds'] = "Conferma (LDS)";
> $text['sealedplds'] = "Sigillo ai Genitori (LDS)";
> $text['sealedslds'] = "Sigillo al Coniuge (LDS)";
754c862
< $text['savechanges'] = "Registrare le modifiche";
---
> $text['savechanges'] = "Memorizza le modifiche";
758c866
< $text['anonymous'] = "Anonimo";
---
> $text['anonymous'] = "anonimo";
760c868
< $text['anniversaries'] = "Data e Anniversario";
---
> $text['anniversaries'] = "Date ed Anniversari";
766d873
< $text['repository'] = "Deposito";
768,774c875,880
< $text['suggest'] = "Proposta";
< $text['editevent'] = "Suggerite una modifica per quest'evento";
< $text['findplaces'] = "Trovate tutti gli individui con un evento in questo luogo";
< $text['morelinks'] = "Più legami";
< $text['faminfo'] = "Informazione sulla famiglia";
< $text['persinfo'] = "Informazione Personelle";
< $text['srcinfo'] = "Info. sulla fonte";
---
> $text['suggest'] = "Suggerimento";
> $text['editevent'] = "Suggerisci una modifica per questo evento";
> $text['morelinks'] = "Altri Collegamenti";
> $text['faminfo'] = "Informazioni Famiglia";
> $text['persinfo'] = "Informazioni Personali";
> $text['srcinfo'] = "Informazioni sulla Fonte";
776,778c882,884
< $text['goto'] = "Scegliete una pagina";
< $text['tngprint'] = "Stampare";
< $text['databasestatistics'] = "Statistiche della base di dati"; //needed to be shorter to fit on menu
---
> $text['goto'] = "Scegli una pagina";
> $text['tngprint'] = "Stampa";
> $text['databasestatistics'] = "Statistiche"; //needed to be shorter to fit on menu
780,785c886,891
< $text['repoinfo'] = "Info. luogo di deposito";
< $text['tng_reset'] = "Rimettere a zero";
< $text['noresults'] = "Nulla risultato";
< $text['allmedia'] = "Tutti Media";
< $text['repositories'] = "Deposito";
< $text['albums'] = "Album";
---
> $text['repoinfo'] = "Informazioni Deposito";
> $text['tng_reset'] = "Resetta";
> $text['noresults'] = "Nessun risultato";
> $text['allmedia'] = "Tutti i Media";
> $text['repositories'] = "Depositi";
> $text['albums'] = "Albums";
787,789c893,895
< $text['surnames'] = "Cognome";
< $text['dates'] = "Data";
< $text['link'] = "Collegare";
---
> $text['surnames'] = "Cognomi";
> $text['dates'] = "Date";
> $text['link'] = "Collegamenti";
794,799c900,905
< $text['bookmarks'] = "Bookmark";
< $text['bookmark'] = "Aggiungi Bookmark";
< $text['mngbookmarks'] = "Andare a Bookmarks";
< $text['bookmarked'] = "Bookmark Aggiungiato";
< $text['remove'] = "Togliere";
< $text['find_menu'] = "Trovare";
---
> $text['bookmarks'] = "Segnalibri";
> $text['bookmark'] = "Aggiungi Segnalibro";
> $text['mngbookmarks'] = "Vai ai Segnalibri";
> $text['bookmarked'] = "Segnalibro aggiunto";
> $text['remove'] = "Rimuovi";
> $text['find_menu'] = "Trova";
801,802c907,908
< $text['cemetery'] = "Cimiteri";
< $text['gmapevent'] = "Mappa Evento ";
---
> $text['cemetery'] = "Cimitero";
> $text['gmapevent'] = "Mappa Evento";
804d909
< $text['glang'] = "&amp;hl=it";
807,810c912,915
< $text['gmaplegend'] = "Perno Leggenda";
< $text['unmarked'] = "Non segnata (s)";
< $text['located'] = "Situato(i)";
< $text['albclicksee'] = "Premere per vedere tutti gli articoli in questo album";
---
> $text['gmaplegend'] = "Legenda Pins";
> $text['unmarked'] = "Senza marcatori";
> $text['located'] = "Individuato";
> $text['albclicksee'] = "Clicca per vedere tutti gli elementi in questo album";
813,816c918,920
< $text['missing'] = "Perso";
< $text['pdfgen'] = "Generatore del PDF";
< $text['blank'] = "Tabella in bianco";
< $text['none'] = "Nulla";
---
> $text['missing'] = "Mancante";
> $text['pdfgen'] = "Generatore PDF";
> $text['blank'] = "Grafico vuoto";
820,821c924,925
< $text['pgsetup'] = "Messa a punto di pagina";
< $text['pgsize'] = "Formato di pagina";
---
> $text['pgsetup'] = "Impostazioni pagina";
> $text['pgsize'] = "Formato pagina";
823,824c927,928
< $text['portrait'] = "Ritratto";
< $text['landscape'] = "Paesaggio";
---
> $text['portrait'] = "Verticale";
> $text['landscape'] = "Orizzontale";
827,829c931,933
< $text['lmargin'] = "Margine di sinistra";
< $text['rmargin'] = "Margine di destra";
< $text['createch'] = "Generi la tabella";
---
> $text['lmargin'] = "Margine sinistro";
> $text['rmargin'] = "Margine destro";
> $text['createch'] = "Genera Grafico";
831,833c935,937
< $text['mostwanted'] = "La maggior parte hanno voluto";
< $text['latupdates'] = "Aggiornamenti ultimi";
< $text['featphoto'] = "Foto descritta";
---
> $text['mostwanted'] = "I più cercati";
> $text['latupdates'] = "Aggiornamenti recenti";
> $text['featphoto'] = "Foto in evidenza";
835,838c939,942
< $text['ourhist'] = "La nostra storia di famiglia";
< $text['ourhistanc'] = "Nostre storia di famiglia ed ascendenza";
< $text['ourpages'] = "Le nostre pagine di genealogia della famiglia";
< $text['pwrdby'] = "Powered by";
---
> $text['ourhist'] = "La storia della nostra Famiglia";
> $text['ourhistanc'] = "La storia della nostra Famiglia e dei nostri Antenati";
> $text['ourpages'] = "Le pagine Genealogiche di Famiglia";
> $text['pwrdby'] = "Sito gestito con";
840,846c944,950
< $text['searchtngnet'] = "Rete di ricerca TNG (GENDEX)";
< $text['viewphotos'] = "Osservi tutte le foto";
< $text['anon'] = "Siete attualmente anonimo";
< $text['whichbranch'] = "Quale ramo siete?";
< $text['featarts'] = "Articoli speciali";
< $text['maintby'] = "Effettuato da";
< $text['createdon'] = "Generato sopra";
---
> $text['searchtngnet'] = "Cerca nel Network TNG (GENDEX)";
> $text['viewphotos'] = "Guarda tutte le foto";
> $text['anon'] = "Non sei collegato";
> $text['whichbranch'] = "A quale rampo appartenete?";
> $text['featarts'] = "Articoli in evidenza";
> $text['maintby'] = "Gestito da";
> $text['createdon'] = "Creato nel";
849c953
< $text['inclsrcs'] = "Includi fonti";
---
> $text['inclsrcs'] = "Includi Fonti";
852c956
< $text['mnusearchfornames'] = "Cerca nomi";
---
> $text['mnusearchfornames'] = "Cerca";
854,855c958,959
< $text['mnufirstname'] = "Primo nome";
< $text['mnusearch'] = "Cercare";
---
> $text['mnufirstname'] = "Nome";
> $text['mnusearch'] = "Cerca";
860c964
< $text['mnuregister'] = "Registrati";
---
> $text['mnuregister'] = "Registra un Account Utente";
862,864c966,968
< $text['mnulastnames'] = "Cognome";
< $text['mnustatistics'] = "Statistici";
< $text['mnuphotos'] = "Fotografie";
---
> $text['mnulastnames'] = "Cognomi";
> $text['mnustatistics'] = "Statistiche";
> $text['mnuphotos'] = "Foto";
866c970
< $text['mnumyancestors'] = "Fotografie &amp; Storie per Antenati di [Persona]";
---
> $text['mnumyancestors'] = "Foto &amp; Storie per Antenati di [Persona]";
871,873c975,977
< $text['mnuwhatsnew'] = "Che di nuovo?";
< $text['mnushowlog'] = "Giornale d'Accesso";
< $text['mnulanguage'] = "Cambiare lingua";
---
> $text['mnuwhatsnew'] = "Novità";
> $text['mnushowlog'] = "Log di accesso";
> $text['mnulanguage'] = "Cambia lingua";
875c979
< $text['welcome'] = "Benvenuti";
---
> $text['welcome'] = "Benvenuto";
879c983
< $text['searchnames'] = "Ricerca";
---
> $text['searchnames'] = "Cerca";
881,882c985,986
< $text['editperson'] = "Modifica la persona";
< $text['loadmap'] = "Carica la mappa";
---
> $text['editperson'] = "Modifica Persona";
> $text['loadmap'] = "Carica Mappa";
885,886c989,990
< $text['startnum'] = "Primo numero";
< $text['searching'] = "Ricerca";
---
> $text['startnum'] = "Primo Numero";
> $text['searching'] = "Sto cercando";
888c992
< $text['location'] = "Posizione";
---
> $text['location'] = "Luogo";
890,893c994,997
< $text['collapse'] = "Ridurre";
< $text['expand'] = "Sviluppare";
< $text['plot'] = "Edificabile";
< $text['searchfams'] = "Ricerca Famiglie";
---
> $text['collapse'] = "Riduci";
> $text['expand'] = "Espandi";
> $text['plot'] = "Disegna";
> $text['searchfams'] = "Cerca Famiglie";
895c999
< $text['wasmarried'] = "Sposato";
---
> $text['wasmarried'] = "Sposato(a)";
898,901c1002,1005
< $text['share'] = "Dividere";
< $text['hide'] = "Nascondere";
< $text['disabled'] = "Il tuo conto utente è stato disattivato. Si prega di contattare l'amministratore del sito per ulteriori informazioni.";
< $text['contactus_long'] = "Se avete domande o commenti su questo sito, <span class=\"emphasis\"><a href=\"suggest.php\">contatti</a></span>. Non vediamo l'ora di sentire qualcosa da te.";
---
> $text['share'] = "Condividi";
> $text['hide'] = "Nascondi";
> $text['disabled'] = "Il tuo Account Utente è stato disattivato. Contatta l'amministratore del sito per ulteriori informazioni.";
> $text['contactus_long'] = "Se hai domande o commenti sui contenuti di questo sito, <span class=\"emphasis\"><a href=\"suggest.php\">contattaci</a></span>. Non vediamo l'ora di sentirti.";
905c1009
< $text['trees'] = "gli alberi";
---
> $text['trees'] = "Alberi";
908,911c1012,1015
< $text['emailagain'] = "E-mail di nuovo";
< $text['enteremail2'] = "Inserisci il tuo indirizzo e-mail di nuovo.";
< $text['emailsmatch'] = "I tuoi indirizzi e-mail non corrispondono. Inserisci lo stesso indirizzo e-mail in ogni campo.";
< $text['getdirections'] = "Premi per ottenere indicazioni";
---
> $text['emailagain'] = "Ripeti email";
> $text['enteremail2'] = "Inserisci il tuo indirizzo email di nuovo.";
> $text['emailsmatch'] = "I tuoi indirizzi email non corrispondono. Inserisci lo stesso indirizzo e-mail nei 2 campi.";
> $text['getdirections'] = "Clicca per ottenere indicazioni";
915,917c1019,1021
< $text['slidestart'] = "Diapositive";
< $text['livingnote'] = "Almeno una persona viva è legata a questa nota - i dettagli non sono dunque pubblicati.";
< $text['livingphoto'] = "Almeno un individuo vivo è legato a questa fotografia - Dettagli nascosti.";
---
> $text['slidestart'] = "Presentazione";
> $text['livingnote'] = "Almeno un individuo vivente o privato è collegata a questa Nota - Dettagli non divulgabili.";
> $text['livingphoto'] = "Almeno un individuo vivente o privato è collegato a questa Foto - Dettagli non divulgabili.";
920,927c1024,1030
< $text['branches'] = "Branches";
< $text['detail'] = "Detail";
< $text['moredetail'] = "More detail";
< $text['lessdetail'] = "Less detail";
< $text['otherevents'] = "Altri Eventi";
< $text['conflds'] = "Confirmed (LDS)";
< $text['initlds'] = "Initiatory (LDS)";
< $text['wascremated'] = "was cremated";
---
> $text['branches'] = "Rami";
> $text['detail'] = "Dettagli";
> $text['moredetail'] = "Ulteriori dettagli";
> $text['lessdetail'] = "Meno dettagli";
> $text['conflds'] = "Confermato (LDS)";
> $text['initlds'] = "Iniziazione (LDS)";
> $text['wascremated'] = "è stato cremato";
931c1034
< $text['searchsite'] = "Search this site";
---
> $text['searchsite'] = "Cerca nel sito";
933c1036
< $text['kmlfile'] = "Scaricare un file .kml per mostrare questa posizione in Google Earth";
---
> $text['kmlfile'] = "Scarica un file .KML per vedere questo luogo in Google Earth";
936,940c1039,1043
< $text['heatmap'] = "Heat Map";
< $text['refreshmap'] = "Refresh Map";
< $text['remnums'] = "cancellare i numeri ed Pins";
< $text['photoshistories'] = "Foto &amp; storie";
< $text['familychart'] = "Famiglia grafico";
---
> $text['heatmap'] = "Mappa Termica";
> $text['refreshmap'] = "Aggiorna Mappa";
> $text['remnums'] = "Cancella Numeri e Pins";
> $text['photoshistories'] = "Foto &amp; Storie";
> $text['familychart'] = "Grafico Famiglia";
942c1045
< $text['firstnames'] = "First Names";
---
> $text['firstnames'] = "Nomi";
944,947c1047,1050
< $text['dna_test'] = "DNA Test";
< $text['test_type'] = "Test type";
< $text['test_info'] = "Test Information";
< $text['takenby'] = "Taken by";
---
> $text['dna_test'] = "Test DNA";
> $text['test_type'] = "Tipo di Test";
> $text['test_info'] = "Informazioni Test";
> $text['takenby'] = "Effettuato da";
951,954c1054,1055
< $text['relevant_links'] = "Relevant links";
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
< $text['nofirstname'] = "[no first name]";
---
> $text['relevant_links'] = "Collegamenti rilevanti";
> $text['nofirstname'] = "[nessun nome]";
956,965c1057,1117
< $text['cookieuse'] = "Nota: questo sito utilizza i cookie.";
< $text['dataprotect'] = "Criterio di protezione dati";
< $text['viewpolicy'] = "Visualizza i criteri";
< $text['understand'] = "Ho capito";
< $text['consent'] = "Io do il mio consenso per questo sito per memorizzare i dati personali raccolti qui. Capisco che io possa chiedere al proprietario del sito di rimuovere queste informazioni in qualsiasi momento.";
< $text['consentreq'] = "Si prega di dare il vostro consenso per questo sito per memorizzare le informazioni personali.";
< 
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> $text['cookieuse'] = "Nota: questo sito utilizza cookies.";
> $text['dataprotect'] = "Protezione dei Dati Personali";
> $text['viewpolicy'] = "Vedi la Policy";
> $text['understand'] = "Ho compreso";
> $text['consent'] = "Fornisco il mio consenso a questo sito di memorizzare i miei dati personali qui forniti. Comprendo che potrò richiedere al proprietario del sito di rimuovere queste informazioni in qualsiasi momento.";
> $text['consentreq'] = "Sei pregato di fornire a questo sito il tuo consenso di memorizzare le informazioni personali fornite.";
> 
> //added in 12.1.0
> $text['testsarelinked'] = "I Test DNA sono associati con";
> $text['testislinked'] = "Il Test DNA è associato con";
> 
> //added in 12.2
> $text['quicklinks'] = "Collegamenti rapidi";
> $text['yourname'] = "Il tuo nome";
> $text['youremail'] = "La tua email";
> $text['liketoadd'] = "Altre informazioni che desideri aggiungere";
> $text['webmastermsg'] = "Messaggio del webmaster";
> $text['gallery'] = "Vedi la Galleria";
> $text['wasborn_male'] = "è nato";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "è nata"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "è stato battezzato";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "è stata battezzata";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "morto";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "morta";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "è stato sepolto"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "è stata sepolta"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "è stato cremato";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "è stata cremata";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "sposato";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "sposata";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "era divorziato";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "era divorziata";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " a ";			// used as a preposition to the location
> $text['onthisdate'] = " il ";		// when used with full date
> $text['inthisyear'] = " nel ";		// when used with year only or month / year dates
> $text['and'] = "ed ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Info Test DNA";
> //added in 13.0
> $text['visitor'] = "Visitatore";
> 
> $text['popupnote2'] = "Nuovo pedigree";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom IN";
> $text['zoomout'] = "Zoom OUT";
> $text['scrollnote'] = "Trascina o scorri per vedere di più del grafico.";
> $text['general'] = "Generale";
> 
> //changed in 14.0
> $text['otherevents'] = "Altri Eventi ed Attributi";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connessioni";
> $text['continue'] = "Continua";
> $text['title2'] = "Titolo"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Norwegian/admintext.php TNG1403/languages/Norwegian/admintext.php
24c24
< 		$admtext['branchid'] = "Gren ID";
---
> 		$admtext['branchid'] = "GrenID";
30c30
< 		$admtext['enterbranchid'] = "Angi en gren ID.";
---
> 		$admtext['enterbranchid'] = "Angi en grenID.";
80d79
< 		$admtext['pleaseenter'] = "Skriv inn en ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Velg en fil som skal importeres.";
> 		$admtext['addreplacedata'] = "Legg til eller erstatt database (kan ta flere minutter, avhengig av størrelse på GEDCOM filen og Internett tilkobling)";
> 		$admtext['fromyourcomputer'] = "Fra din datamaskin";
> 		$admtext['importdata'] = "Importer data";
> 		$admtext['replace'] = "Erstatt (i valgt tre)";
> 		$admtext['desttree'] = "Måltre";
> 		$admtext['selectdesttree'] = "Velg eller skriv inn mål (tre).";
> 		$admtext['selectexisting'] = "Importer til";
> 		$admtext['ucaselast'] = "Endre alle etternavn til store bokstaver";
> 		$admtext['norecalc'] = "Ikke kalkuler Nålevende 'flagget' på nytt";
> 		$admtext['autooffset'] = "Start ID med første ledige nummer";
> 		$admtext['mustselecttree'] = "Du må velge et tre først.";
> 		$admtext['onwebserver'] = "på vertsmaskin (i GEDCOM mappe)";
> 		$admtext['imphints'] = "Tips: 'Alle eksisterende data' betyr alle personer, familier, kilder og notater (assosierte media blir ikke borte så lenge ID-nummeret forblir det samme). Sammenfallende poster er alltid basert på kun ID. Nye poster legges alltid til. 'Legg til alle poster' importerer alle poster med nye ID'er.";
> 		$admtext['destbranch'] = "Målgren (valgfritt)";
> 		$admtext['importlatlong'] = "Importer breddegrad / lengdegrad data hvis det finnes";
> 		$admtext['opening'] = "Åpner";
> 		$admtext['reopen'] = "Åpner på nytt";
> 		$admtext['uploading'] = "Laster opp";
> 		$admtext['stop'] = "Stopp";
> 		$admtext['stopped'] = "Import stoppet";
> 		$admtext['resume'] = "klikk her for å fortsette";
> 		$admtext['neweronly'] = "Erstatt kun hvis nyere";
> 		$admtext['oldimport'] = "Gammel importmetode (ingen fremdriftsindikator)";
> 		$admtext['importgedcom'] = "Importer GEDCOM (kan være zip'et)";
> 		$admtext['stopbackup'] = "Stopp! Det kan være en god idé å ta en sikkerhetskopi av gjeldende data før du fortsetter.";
> 		$admtext['importmedia'] = "Importer medialinker hvis det finnes";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Sjekk at Prefikser og suffikser (Oppsett - Generelle) er korrekte for denne GEDCOM-filen.";
> 		$admtext['chkimpsettings'] = "Sjekk importinnstillingene (Oppsett - Import) for flere alternativer.";
> 		$admtext['eventsonly'] = "Importer kun hendelses- og egenskaps-typer (ingen data blir lagt til, erstattet eller utvidet)";
> 		$admtext['allevents'] = "Aksepter data for alle nye hendelses- og egenskaps-typer";
> 		$admtext['finishingimporting'] = "Fullfører...";
> 		$admtext['fileuploadfailed'] = "Filopplasting feilet. Filen kan være for stor. Prøv og bruke FTP til å laste opp filen til GEDCOM mappen, for så å velge import derfra.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Endre eksisterende hendelsestype";
135,138d168
< 		$admtext['entertypedesc'] = "En beskrivelse av den nye type hendelse.";
< 		$admtext['enterdisplay'] = "Skriv en forkortelse for den nye type hendelse.";
< 		$admtext['existingeventtypeinfo'] = "Informasjon om eksisterende hendelser";
< 		$admtext['neweventtypeinfo'] = "Informasjon om nye hendelser";
145,146d174
< 		$admtext['addnewevtype'] = "Legg til ny hendelse type";
< 		$admtext['createnewevtype'] = "Lag en fil for ny hendelsetype";
149,150d176
< 		$admtext['existingevtypes'] = "Eksisterende hendelsetyper";
< 		$admtext['edsevtypes'] = "Rediger, slett eller sorter eksisterende hendelsetyper";
152d177
< 		$admtext['confdeleteevtype'] = "Er du sikker på at du vil slette denne hendelsetype?";
154d178
< 		$admtext['selectentertag'] = "Velg eller skriv koden for denne hendelsetype.";
207,208c231
< 		$admtext['acceptselected'] = "Godkjenn valgte";
< 		$admtext['changestoallevtypes'] = "Endringer for alle hendelsestyper";
---
> 		$admtext['acceptselected'] = "Aksepter valgte";
214d236
< 		$admtext['BAPM'] = "Dåp";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Er du sikker på at du vil slette denne hendelsetype? Alle hendelser med hendelsetypen vil også bli slettet.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Legg til ny type";
> 		$admtext['createnewevtype'] = "Lag ny hendelses- eller egenskaps-type";
> 		$admtext['modifyeventtype'] = "Endre eksisterende type";
> 		$admtext['entertypedesc'] = "Skriv en type/beskrivelse for den nye hendelses- eller egenskaps-type.";
> 		$admtext['enterdisplay'] = "Skriv en visningstekst for den nye hendelses- eller egenskaps-type.";
> 		$admtext['existingeventtypeinfo'] = "Informasjon om eksisterende hendelses- eller egenskaps-typer";
> 		$admtext['neweventtypeinfo'] = "Informasjon om nye hendelses- eller egenskaps-typer";
> 		$admtext['existingevtypes'] = "Eksisterende hendelses- eller egenskaps-typer";
> 		$admtext['edsevtypes'] = "Rediger, slett eller sorter eksisterende hendelses- eller egenskaps-typer";
> 		$admtext['selectentertag'] = "Velg eller skriv koden for denne hendelses- eller egenskaps-typen.";
> 		$admtext['changestoallevtypes'] = "Endringer for alle hendelses- eller egenskaps-typer";
268d303
< 		$admtext['nobirthinfo'] = "Ingen fødselsinformasjon";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Velg<br/>standard<br/>foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Lagre + Nye Foreldre";
> 		$admtext['savenewspouse'] = "Lagre + Ny Ektefelle/Partner";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Fødsel";
354d391
< 		$admtext['enterphotodesc'] = "Skriv en beskrivelse av bildet.";
388d424
< 		$admtext['photoowner'] = "Eier/Kilde";
417d452
< 		$admtext['imgmap'] = "Bildekart";
489,490c524
< 		$admtext['mapinstr2'] = "Du kan linke ulike deler av bildet til ulike personer eller steder (valgfritt) ved å legge inn 'HTML image map' informasjon under, eller ved å følge instruksjonene ved bildet under.";
< 		$admtext['mapinstr3'] = "For å linke en del av dette bildet til en bestemt person, velg først personens tre og deretter opprette et rektangel for det ønskede utsnitt. Dette gjøres ved å klikke i øvre venstre hjørne av utsnittet og deretter dra musepekeren til det nedre høyre hjørne. Alternativt kan du klikke en gang i øvre venstre hjørne, for så å klikke igjen i nedre høyre hjørne. Et dialogboks for å velge tilknyttet person kommer deretter opp. Når valget er foretatt, vil koden for bildekart automatisk bli lagt til i tekstboksen nedenfor. Gjenta denne prosessen for å lage flere utsnitt i samme bilde.";
---
> 		$admtext['mapinstr2'] = "Du kan linke ulike deler av bildet til ulike personer eller andre sider (valgfritt)";
495d528
< 		$admtext['removelink'] = "Fjern Link";
502d534
< 		$admtext['eloptions'] = "Bla gjennom eller slett";
509d540
< 		$admtext['nolinks'] = "Ingen Linker finnes enda";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Bildekart (for bakoverkompatibilitet)";
> 		$admtext['photoowner'] = "Eier av original/Kilde";
> 		$admtext['nothumb'] = "Mangler miniatyrbilde";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Elementet kunne ikke legges til, sannsynligvis fordi filen var for stor og ikke kunne lastes opp eller brukes til å lage et miniatyrbilde.";
> 		$admtext['moved'] = "Flyttet";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Skriv en tittel eller beskrivelse til dette bildet.";
> 		$admtext['mapinstr3'] = "For å linke en del av dette bildet til en bestemt person, familie eller annet dataobjekt, velg først relevant tre og dataobjekt, deretter opprett et rektangel for det ønskede utsnitt. Dette gjøres ved å klikke i øvre venstre hjørne av utsnittet og deretter dra musepekeren til det nedre høyre hjørne av ønsket utsnitt. Alternativt kan du klikke en gang i øvre venstre hjørne, for så å klikke igjen i nedre høyre hjørne av ønsket utsnitt. En dialogboks for å velge tilknyttet person eller dataobjekt kommer deretter opp. Gjenta denne prosessen for å lage flere utsnitt i samme bilde. Klikk et eksisterende utsnitt for å velge, dra for å flytte eller trykk 'X' for å slette.";
596d633
< 		$admtext['foremptystring'] = "For tomt innhold, la feltet være tomt og klikk \"Legg til >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instruksjoner: Dra eller dobbelklikk fra felt på venstre side, til lister på høyre side. Dra opp og ned for å endre rekkefølge. Dobbelklikk igjen for å fjerne.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For tomt innhold, la feltet være blankt og klikk >>";
651,655d690
< 		$admtext['selectimportfile'] = "Velg en fil som skal importeres.";
< 		$admtext['importgedcom'] = "Importer GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Legg til eller erstatt database (kan ta flere minutter, avhengig av størrelse på GEDCOM filen og Internett tilkobling)";
< 		$admtext['fromyourcomputer'] = "Fra din datamaskin";
< 		$admtext['importdata'] = "Importer data";
657,660d691
< 		$admtext['replace'] = "Erstatt (i valgt tre)";
< 		$admtext['desttree'] = "Måltre";
< 		$admtext['selectdesttree'] = "Velg eller skriv inn mål (tre).";
< 		$admtext['selectexisting'] = "Importer til";
668,673d698
< 		$admtext['ucaselast'] = "Endre alle etternavn til store bokstaver";
< 		$admtext['norecalc'] = "Ikke kalkuler Nålevende 'flagget' på nytt";
< 		$admtext['autooffset'] = "Start ID med første ledige nummer";
< 
< 		$admtext['mustselecttree'] = "Du må velge et tre først.";
< 		$admtext['importmedia'] = "Importer media hvis det finnes";
675d699
< 		$admtext['neweronly'] = "Erstatt kun hvis nyere";
677,692d700
< 		$admtext['onwebserver'] = "på vertsmaskin (i GEDCOM mappe)";
< 		$admtext['eventsonly'] = "Importer kun Egendefinerte hendelsetyper (ingen data blir lagt til, erstattet eller utvidet)";
< 		$admtext['imphints'] = "Tips: 'Alle eksisterende data' betyr alle personer, familier, kilder og notater (assosierte media blir ikke borte så lenge ID-nummeret forblir det samme). Sammenfallende poster er alltid basert på kun ID. Nye poster legges alltid til. 'Legg til alle poster' importerer alle poster med nye ID'er.";
< 		$admtext['allevents'] = "Aksepter data for alle nye Egendefinerte hendelsetyper";
< 		$admtext['destbranch'] = "Målgren (valgfritt)";
< 		$admtext['inframe'] = "(i 'frame')";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Importer breddegrad / lengdegrad data hvis det finnes";
< 		$admtext['opening'] = "Åpner";
< 		$admtext['reopen'] = "Åpner på nytt";
< 		$admtext['uploading'] = "Laster opp";
< 		$admtext['stop'] = "Stopp";
< 		$admtext['stopped'] = "Import stoppet";
< 		$admtext['resume'] = "klikk her for å fortsette";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Endringslogg";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Gammel importmetode (ingen fremdriftsindikator)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Oppgrader";
> 		$admtext['need_upgrade'] = "Fullfør disse oppgraderingsinstruksjonene";
> 		$admtext['upgrade_missing'] = "Oppgraderingsfilen synes å mangle, så oppgraderingen kan være gjort allerede.";
> 		$admtext['delete_upgrade'] = "Når du er ferdig, klikk her for å slette oppgraderingsfilen og returnere til menyen.";
723d733
< 		$admtext['author'] = "Forfatter";
785,788c795,798
< 		$admtext['pedperson'] = "Anetre person ID"; //2
< 		$admtext['pedtree'] = "Tre ID"; //2
< 		$admtext['phhistperson'] = "Bilder & Historier person ID"; //2
< 		$admtext['phhisttree'] = "Bilder & Historier tre ID"; //2
---
> 		$admtext['pedperson'] = "Anetre personID"; //2
> 		$admtext['pedtree'] = "TreID"; //2
> 		$admtext['phhistperson'] = "Bilder & Historier personID"; //2
> 		$admtext['phhisttree'] = "Bilder & Historier treID"; //2
804,809c814,819
< 		$admtext['momside'] = "Mors side betegnelse"; //8
< 		$admtext['dadside'] = "Fars side betegnelse"; //8
< 		$admtext['momperson'] = "Mors side person ID"; //8
< 		$admtext['momtree'] = "Mors side tre ID"; //8
< 		$admtext['dadperson'] = "Fars side person ID"; //8
< 		$admtext['dadtree'] = "Fars side tre ID"; //8
---
> 		$admtext['momside'] = "Morsfamilie - betegnelse"; //8, 20
> 		$admtext['dadside'] = "Farsfamilie - betegnelse"; //8, 20
> 		$admtext['momperson'] = "Morsfamilie - personID"; //8, 20
> 		$admtext['momtree'] = "Morsfamilie - treID"; //8, 20
> 		$admtext['dadperson'] = "Farsfamilie - personID"; //8, 20
> 		$admtext['dadtree'] = "Farsfamilie - treID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Sitater overskrift";
> 		$admtext['quotesubhead'] = "Sitater undertittel";
> 		$admtext['sniptitle'] = "Featurette tittel";
> 		$admtext['snipname'] = "Featurette navn";
> 		$admtext['snipinfoone'] = "Featurette første linje";
> 		$admtext['snipinfotwo'] = "Featurette andre linje";
> 		$admtext['snipimage'] = "Featurette bilde";
> 		$admtext['snipperson'] = "Featurette personID";
> 		$admtext['sniptree'] = "Featurette treID";
> 		$admtext['quote'] = "Sitat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Aktuelt 7 tittel";
> 		$admtext['featuretitle8'] = "Aktuelt 8 tittel";
> 		$admtext['featuretitle9'] = "Aktuelt 9 tittel";
> 		$admtext['featurethumb9'] = "Aktuelt 9 miniatyrbilde"; //15
> 		$admtext['featurelink9'] = "Aktuelt 9 link"; //15
> 		$admtext['featurepara9'] = "Aktuelt 9 avsnitt"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Toppbilde venstre";
> 		$admtext['rightimg'] = "Toppbilde høyre";
> 		$admtext['photoption'] = "Valg av foto er<br />&nbsp;&nbsp;(static or random)";
> 		$admtext['randomphotowidth'] = "Tilfeldig foto bredde";
> 		$admtext['randomphotoheight'] = "Tilfeldig foto høyde";
> 		$admtext['randomphotomediatypeID'] = "Tilfeldig foto Samling";
> 		$admtext['momheading'] = "Morsfamilie - Overskrift";
> 		$admtext['mompara'] = "Morsfamilie - Avsnitt";
> 		$admtext['mompagelink'] = "Morsfamilie - Sidelink";
> 		$admtext['dadheading'] = "Farsfamilie - Overskrift";
> 		$admtext['dadpara'] = "Farsfamilie - Avsnitt";
> 		$admtext['dadpagelink'] = "Farsfamilie - Sidelink";
> 		$admtext['spmomheading'] = "Ektefelles/Partners Morsfamilie - Overskrift";
> 		$admtext['spmompara'] = "Ektefelles/Partners Morsfamilie - Avsnitt";
> 		$admtext['spmompagelink'] = "Ektefelles/Partners Morsfamilie - Sidelink";
> 		$admtext['spmomside'] = "Ektefelles/Partners Morsfamilie - betegnelse";
> 		$admtext['spdadside'] = "Ektefelles/Partners Farsfamilie - betegnelse";
> 		$admtext['spmomperson'] = "Ektefelles/Partners Morsfamilie - personID";
> 		$admtext['spmomtree'] = "Ektefelles/Partners Morsfamilie - treID";
> 		$admtext['spdadheading'] = "Ektefelles/Partners Farsfamilie - Overskrift";
> 		$admtext['spdadpara'] = "Ektefelles/Partners Farsfamilie - Avsnitt";
> 		$admtext['spdadpagelink'] = "Ektefelles/Partners Farsfamilie - Sidelink";
> 		$admtext['spdadperson'] = "Ektefelles/Partners Farsfamilie - personID";
> 		$admtext['spdadtree'] = "Ektefelles/Partners Farsfamilie - treID";
> 		$admtext['storiesheading'] = "Våre familiehistorier";
> 		$admtext['nbrsurnames'] = "Antall etternavn<br />&nbsp;&nbsp; i ordsky for etternavn";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Aktuelt miniatyrbilde";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Lysbilde Tittel";
> 		$admtext['slideimg'] = "Lysbilde Bilde";
> 		$admtext['slideheadline'] = "Lysbilde Overskrift";
> 		$admtext['slidetext'] = "Lysbilde Tekst";
> 		$admtext['slidelink'] = "Lysbilde Link";
> 		$admtext['slidelinktext'] = "Lysbilde Link Navn";
> 		$admtext['featurelink'] = "Aktuelt Link";
> 		$admtext['featurelinktext'] = "Aktuelt Link Navn";
> 		$admtext['featuretitle'] = "Aktuelt Tittel";
> 		$admtext['featuresub'] = "Aktuelt Undertittel";
> 		$admtext['quoteimg'] = "Sitater Bilde";
> 		$admtext['quotelink'] = "Sitater Link";
> 		$admtext['quotelinktext'] = "Sitater Link Navn";
> 		$admtext['sidebarpara'] = "Sidepanel Paragraph";
> 		$admtext['sidebarlink'] = "Sidepanel Link";
> 		$admtext['sidebarlinktext'] = "Sidepanel Link Navn";
> 		$admtext['sidebarimg'] = "Sidepanel Bilde";
> 		$admtext['sidebartitle'] = "Sidepanel Tittel";
> 		$admtext['sidebarsub'] = "Sidepanel Undertittel";
> 		$admtext['snipheadline'] = "Artikkel Overskrift";
> 		$admtext['snipsubhead'] = "Artikkel Undertittel";
> 		$admtext['snipimg'] = "Artikkel Bilde";
> 		$admtext['sniplink'] = "Artikkel Link";
> 		$admtext['sniplinktext'] = "Artikkel Link Navn";
> 		$admtext['linktext'] = "Link Tekst";
> 		$admtext['footerheadline'] = "Bunntekst Overskrift";
> 		$admtext['footerpara'] = "Bunntekst Tekst";
> 		$admtext['footerlink'] = "Bunntekst Link";
> 		$admtext['footerlinktext'] = "Bunntekst Link Navn";
> 		$admtext['footerheadline'] = "Bunntekst Overskrift";
> 		$admtext['footerpara'] = "Bunntekst Tekst";
> 		$admtext['footerlink'] = "Bunntekst Link";
> 		$admtext['footerlinktext'] = "Bunntekst Link Navn";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG krever 5.3 eller nyere.)";
---
> 		$admtext['phpreq'] = "(TNG krever 7.0 eller nyere.)";
1043c1136
< 		$admtext['boxnamesize'] = "Størrelse for navneboks";
---
> 		$admtext['boxnamesize'] = "Skriftstørrelse for navn i boksen";
1045c1138
< 		$admtext['boxdatessize'] = "Størrelse for datoer i boksen";
---
> 		$admtext['boxdatessize'] = "Skriftstørrelse for datoer i boksen";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Endre importerte prefiks for å passe med TNG konfigurasjon";
> 		$admtext['sortevents'] = "Sorter hendelser";
> 		$admtext['sortbydate'] = "Hendelse dato";
> 		$admtext['sortbytype'] = "Hendelse type";
> 		$admtext['allowsuggest'] = "Tillat forslag fra besøkende";
> 		$admtext['livingchecked'] = "Sett nye personer og familier som Nålevende";
> 		$admtext['maxmarried'] = "Sett familie som Nålevende hvis gift mindre enn<br/>så mange år";
> 		$admtext['imagetags'] = "Rektangler";
> 		$admtext['allowcsv'] = "Tillat CSV-nedlastinger for rapporter";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Valg for sikkerhetskopiering";
> 		$admtext['dosql'] = "Eksporter som SQL";
> 		$admtext['dodrop'] = "Inkluder DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Inkluder CREATE TABLE";
> 		$admtext['onrestore'] = "Valg for gjenoppretting";
> 		$admtext['dodel'] = "Slett tidligere innhold først";
> 		$admtext['download'] = "Last ned";
> 		$admtext['altbirthtypes'] = "Alternative fødselshendelser";
> 		$admtext['dtformat'] = "Tabellformat";
> 		$admtext['conchart'] = "Forbindelser diagram";
> 		$admtext['maxropt'] = "Maks antall stier som skal sjekkes";
> 		$admtext['maxlopt'] = "Maks sti-lengde";
> 		$admtext['showtxtopt'] = "Vis forbindelse(r) som tekst";
> 		$admtext['compactboxopt'] = "Vis kompakte personbokser";
> 		$admtext['sortbyopt'] = "Sorter stier etter";
> 		$admtext['anchoridopt'] = "Anker ID";
> 		$admtext['maxmopt'] = "Maks antall ekteskap/partnerskap i forbindelsen";
> 		$admtext['saveincfg'] = "Lagre i Konfigurasjonssti (se Oppsett - Generelle - Stier og mapper)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kunne ikke geokodes";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Ikke geokode";
1436d1549
< 		$admtext['backtosecondary'] = "Tilbake til Sekundære Prosesser";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Tilbake til Verktøy etter import";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Ekskluder notater";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip og inkluder mediafiler";
> 		$admtext['downloadzip'] = "Last ned ZIP";
1570c1688
< 		$admtext['allow_admin'] = "Gir tilgang til alle systeminnstillinger og administrative funksjoner, og tildeler rettigheter til alle tre og grener.";
---
> 		$admtext['allow_admin'] = "Bruk rettighetene gitt over, på alle trær og grener.";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Vis bare deaktiverte brukere";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Tillat å se Private notater";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Send til administratorer når også et enkelt Tre er valgt";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alle Mods";
> 		$admtext['installedmods'] = "Kun 'Installert' Mods";
> 		$admtext['partinstmods'] = "'Installert' + 'Delvis installert' Mods";
> 		$admtext['showanalyzeractions'] = "Vis handlinger (Avinstaller/Slett) i Analyse av TNG filer";
> 		$admtext['badchar'] = "Ugyldig bokstav/tegn";
1886d2008
< 		$admtext['test_number'] = "Testnummer";
1916d2037
< 		$admtext['xtra_mut'] = "Ekstra mutasjoner";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testnummer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Hold test Privat";
> 		$admtext['multivalues'] = "Bruk bindestrek mellom multi-verdier";
> 		$admtext['changestogroup'] = "Endringer for DNA gruppe";
> 		$admtext['modifydnagroup'] = "Rediger eksisterende DNA gruppe";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Koble denne DNA testen til en person";
1965,1966c2095
< $admtext['personid'] = "Person ID";
< $admtext['otherevents'] = "Andre hendelser";
---
> $admtext['personid'] = "PersonID";
1984c2113
< $admtext['linkspersonid'] = "Kobling (Person ID)";
---
> $admtext['linkspersonid'] = "Kobling (PersonID)";
2051,2052d2179
< $admtext['savereturn'] = "Returner til denne siden";
< $admtext['saveback'] = "Returner til meny";
2059,2060d2185
< $admtext['secondary'] = "Sekundære prosesser";
< $admtext['commas'] = "Separer oppføringer med komma";
2086c2211
< $admtext['treeid'] = "Tre ID";
---
> $admtext['treeid'] = "TreID";
2130,2131d2254
< $admtext['secondarymaint'] = "Sekundære vedlikeholdsprosesser";
< $admtext['customeventtypes'] = "Egendefinerte hendelser";
2166,2168c2289,2291
< $admtext['findpersonid'] = "Finn Person ID";
< $admtext['findfamilyid'] = "Finn Familie ID";
< $admtext['findsourceid'] = "Finn Kilde ID";
---
> $admtext['findpersonid'] = "Finn PersonID";
> $admtext['findfamilyid'] = "Finn FamilieID";
> $admtext['findsourceid'] = "Finn KildeID";
2170c2293
< $admtext['findrepoid'] = "Finn Arkiv ID";
---
> $admtext['findrepoid'] = "Finn ArkivID";
2220d2342
< //changed in 8.0.0
2224,2225c2346
< //moved here in 8.0.0
< $admtext['repoid'] = "Arkiv ID";
---
> $admtext['repoid'] = "ArkivID";
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Etternavn";
> $admtext['subhead'] = "Undertittel";
> $admtext['image'] = "Bilde";
> $admtext['author'] = "Forfatter";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Kom i gang";
> $admtext['showlog'] = "Endringslogg";
> $admtext['nobirthinfo'] = "Ingen fødselsinformasjon";
> //changed in 13.0
> $admtext['savereturn'] = "Lagre + Forbli på siden";
> $admtext['saveback'] = "Lagre + Avslutt redigering";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alle elementene ble slettet.";
> $admtext['private'] = "Privat";
> $admtext['imgtags'] = "Bildemerker";
> 
> $admtext['removelink'] = "Fjern Link";
> $admtext['eloptions'] = "Bla gjennom eller slett";
> $admtext['pleaseenter'] = "Skriv inn en ";
> 
> $admtext['nolinks'] = "Ingen Linker finnes enda";
> $admtext['nogeocode'] = "Kunne ikke geokodes";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Velg<br/>standard<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Hendelse / Egenskap typer";
> $admtext['secondary'] = "Verktøy etter import";
> $admtext['otherevents'] = "Andre hendelser / egenskaper";
> //added in 14.0
> $admtext['newlinks'] = "Linker opprettet";
> $admtext['newcemlinks'] = "Kirkegårdslinker opprettet";
> $admtext['utility'] = "Verktøy";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Flytt";
> $admtext['copy'] = "Kopier";
> $admtext['title2'] = "Tittel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Norwegian/alltext.php TNG1403/languages/Norwegian/alltext.php
29,30c29,30
< $dates['BEF'] = "Før";
< $dates['BEFORE'] = "Før";
---
> $dates['BEF'] = "Før";
> $dates['BEFORE'] = "Før";
43c43
< $text['cannotexecutequery'] = "Kan ikke utføre spørringen";
---
> $text['cannotexecutequery'] = "Kan ikke utføre spørringen";
48,51c48,51
< $text['clickdisplay'] = "Klikk for å vise";
< $text['clickhide'] = "Klikk for å skjule";
< $text['forgot1'] = "<strong>Glemt brukernavn og passord?</strong><br />Skriv din e-postadresse nedenfor, så blir det sendt til deg.";
< $text['forgot2'] = "Skriv din e-postadresse ovenfor og brukernavnet nedenfor, for å resette passordet ditt (et midlertidig passord vil bli sendt til deg).";
---
> $text['clickdisplay'] = "Klikk for å vise";
> $text['clickhide'] = "Klikk for å skjule";
> $text['forgot1'] = "<strong>Glemt brukernavn og passord?</strong><br />Skriv din e-postadresse nedenfor, så blir det sendt til deg.";
> $text['forgot2'] = "Skriv din e-postadresse ovenfor og brukernavnet nedenfor, for å resette passordet ditt (et midlertidig passord vil bli sendt til deg).";
70c70
< $admtext['placelevel'] = "Stedsnivå";
---
> $admtext['placelevel'] = "Stedsnivå";
86c86
< $text['mainton'] = "Vedlikeholdsmodus PÅ";
---
> $text['mainton'] = "Vedlikeholdsmodus PÃ…";
88,89c88
< //moved here in 8.0.0
< $text['living'] = "Nålevende";
---
> $text['living'] = "NÃ¥levende";
91,93c90,92
< $admtext['confunlink'] = "Er du sikker på at du vil fjerne linken for denne personen som ektefelle/partner i denne familien?";
< $admtext['confunlinkc'] = "Er du sikker på at du vil fjerne linken for denne personen som barn i denne familien?";
< $admtext['confremchild'] = "Er du sikker på at du vil fjerne dette barnet fra denne familien? Personen vil ikke bli slettet fra databasen.";
---
> $admtext['confunlink'] = "Er du sikker på at du vil fjerne linken for denne personen som ektefelle/partner i denne familien?";
> $admtext['confunlinkc'] = "Er du sikker på at du vil fjerne linken for denne personen som barn i denne familien?";
> $admtext['confremchild'] = "Er du sikker på at du vil fjerne dette barnet fra denne familien? Personen vil ikke bli slettet fra databasen.";
97,101c96,100
< $admtext['BIRT'] = "Fødsel";
< $admtext['DEAT'] = "Død";
< $admtext['CHR'] = "Dåp";
< $admtext['BURI'] = "Gravferd";
< $admtext['BAPL'] = "Dåp (LDS)";
---
> $admtext['BIRT'] = "Fødsel";
> $admtext['DEAT'] = "Død";
> $admtext['CHR'] = "DÃ¥p";
> $admtext['BURI'] = "Begravelse";
> $admtext['BAPL'] = "DÃ¥p (LDS)";
114,115d112
< 
< //moved here in 8.1.0
117c114
< $admtext['birth'] = "fødsel";
---
> $admtext['birth'] = "fødsel";
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
129c122
< $text['sunday'] = "søndag";  //first day of week on calendar
---
> $text['sunday'] = "søndag";  //first day of week on calendar
135c128
< $text['saturday'] = "lørdag";
---
> $text['saturday'] = "lørdag";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
146,149c136,137
< $text['go'] = "Utfør";
< $text['years'] = "år";
< 
< //added in 10.0.0
---
> $text['go'] = "Utfør";
> $text['years'] = "Ã¥r";
155,156d142
< 
< //added in 11.0.0
158,160c144,145
< $admtext['preflang'] = "Foretrukket språk";
< $text['problem'] = "Det har oppstått en feil i TNG programvaren. Dette kan skyldes et konfigurasjonsproblem, en ufullstendig oppgradering eller en programfeil. Hvis du er eieren av nettstedet, kan du kontakte TNG systemstøtte for å få hjelp med dette problemet. Vennligst kopier spørringen under og lim den inn i meldingen.";
< $text['query'] = "Spørring";
---
> $admtext['preflang'] = "Foretrukket språk";
> $text['query'] = "Spørring";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Nummer/Navn";
182,183c164,165
< $admtext['mrca'] = "Yngste (nærmeste) felles ane";
< $admtext['marker_values'] = "Markørverdier";
---
> $admtext['mrca'] = "Yngste (nærmeste) felles ane";
> $admtext['marker_values'] = "Markørverdier";
194,195c176,177
< $admtext['vendor'] = "Leverandør";
< $admtext['markers'] = "Antall STR-markører";
---
> $admtext['vendor'] = "Leverandør";
> $admtext['markers'] = "Antall STR-markører";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Nummer/Navn";
> $admtext['match_date'] = "Treffdato";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogruppe";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogruppe";
> $admtext['relationship_section'] = "Slektskap";
> $admtext['relationship_range'] = "Estimert slektskap";
> $admtext['suggested_relationship'] = "Foreslått slektskap";
> $admtext['actual_relationship'] = "Faktisk slektskap";
> $admtext['related_side'] = "Slektskap via Gren";
> $admtext['shared_dna'] = "Delt DNA";
> $admtext['shared centimorgans'] = "Totalt delt cM";
> $admtext['shared_segments'] = "Delte segmenter";
> $admtext['largest_segment'] = "Største segment";
> $admtext['chromosome'] = "Kromosom Nr";
> $admtext['segment_start'] = "Segment start";
> $admtext['segment_end'] = "Segment slutt";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Delte SNP'er";
> $admtext['xmatch'] = "X-Treff";
> $text['keep_test_private'] = "Privat test";
> $text['shared_dna'] = "Delt DNA segment";
> $text['for_match'] = "for dette treff";
> $admtext['keeptest'] = "Test personvern";
> $admtext['keepname'] = "Navn personvern";
> $admtext['allgroups'] = "Alle grupper";
> $admtext['alltypes'] = "Alle typer";
> $admtext['generation_num'] = "Generasjoner for aners etternavn";
> 
> $text['birthabbr'] = "f.";
> $text['chrabbr'] = "dp.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "gravl.";  //from descend
> $text['marrabbr'] = "g.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Finn alle personer med hendelser på dette stedet";
> $text['firstpage'] = "Første side";
> $text['lastpage'] = "Siste side";
> 
> //changed in 13.0.0
> $text['problem'] = "Det har oppstått en feil i TNG programvaren. Hva du kan gjøre:<p>Hvis du nettopp har installert en oppgradering, har du kanskje hoppet over et punkt i installasjonsinstruksjonene. Vær spesielt oppmerksom på punktet som gjelder oppdatering av databasestruktur.</p><p>Hvis du nettopp har installert TNG for første gang, kan det hende du fremdeles må opprette databasetabellene. Gå tilbake til readme.html siden for å finne det punktet.</p><p>Hvis du er nettstedets eier, kan du kontakte TNG kundestøtte for videre assistanse med dette problemet. Kopier spørringen nedenfor og lim den inn i meldingen til kundestøtte.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Ingen gren";
> 
> //added in 14.0
> $text['oneyear'] = "Ã¥r";
> $text['pwdcodelink'] = "Klikk denne linken for å få sendt et midlertidig passord til deg";
> $text['pwdcodesent'] = "En link til siden for resetting av passordet er sendt til din epostadresse.";
> $text['moved'] = "Flyttet";
> $text['citation'] = "Henvisning";
> $text['other'] = "Annet";
> $text['death'] = "Død";
> $text['burial'] = "Begravelse";
> $text['cremation'] = "Kremasjon";
> $text['marriage'] = "Ekteskap";
> $text['divorce'] = "Skilsmisse";
> $text['bylength'] = "Steg";
> $text['bymarriages'] = "Ekteskap/Partnerskap";
> $text['none'] = "Ingen";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Kilde";
> $text['repository'] = "Arkiv";
> $text['place'] = "Sted";
> $admtext['BAPM'] = "DÃ¥p";
> 
> $text['glang'] = "no";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Norwegian/text.php TNG1403/languages/Norwegian/text.php
69d68
< 		$text['general'] = "Generelt";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "De to personene er samme person.";
---
> 		$text['sameperson'] = "Samme person er valgt to ganger.";
93c93
< 		$text['sometimes'] = "(Noen ganger kan en ved å sjekke et annet antall generasjoner, få et annet resultat.)";
---
> 		$text['sometimes'] = "(Enkelte ganger vil søk med forskjellig antall generasjoner gi forskjellige resultat.)";
144c144
< 		$text['dospouses2'] = "Vis partnere";
---
> 		$text['dospouses2'] = "Vis ektefeller/partnere";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Søk etter forbindelser";
> 		$text['findrel2'] = "Finn slektskap og andre forbindelser";
> 		$text['makeme2nd'] = "Bruk min ID";
> 		$text['usebookmarks'] = "Bruk bokmerker";
> 		$text['select2inds'] = "Vennligst velg to personer.";
> 		$text['indinfofor'] = "Personside for";
> 		$text['nobookmarks'] = "Det finnes ingen bokmerker som kan brukes";
> 		$text['bkmtitle'] = "Personer funnet i bokmerker:";
> 		$text['bkminfo'] = "Velg en person:";
> 		$text['sortpathsby'] = "Sorter stier etter antall";
> 		$text['sortbyshort'] = "Sorter sti(er) etter";
> 		$text['bylengthshort'] = "lengde";
> 		$text['badID1'] = ": feil i person1 ID - vennligst gå tilbake og korriger";
> 		$text['badID2'] = ": feil i person2 ID - vennligst gå tilbake og korriger";
> 		$text['notintree'] = ": personen med denne ID'en finnes ikke i valgt database.";
> 		$text['sameperson'] = "Samme person er valgt to ganger.";;
> 		$text['nopaths'] = "Disse personene har ingen forbindelse.";
> 		$text['nopaths1'] = "Ingen flere forbindelser kortere enn xxx";
> 		$text['nopaths2'] = "i xxx søkesteg";
> 		$text['longestpath'] = "(lengste sti sjekket så langt var xxx steg lang)";
> 		$text['relevantpaths'] = "Antall forskjellige relevante stier funnet: xxx";
> 		$text['skipMarr'] = "(i tillegg, antall stier funnet men ikke vist på grunn av antall ekteskap/partnerskap var: xxx)";
> 		$text['mjaor'] = "eller";
> 		$text['connectionsto'] = "Forbindelse(r) til ";
> 		$text['findanotherpers'] = "Finn en annen person...";
> 		$text['sometimes'] = "(Enkelte ganger vil søk med forskjellig antall generasjoner gi forskjellige resultat.)";
> 		$text['anotherpath'] = "Finn slektskap og andre forbindelser";
> 		$text['xpath'] = "Sti ";
> 		$text['primary'] = "Startperson"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Målperson";
> 		$text['parent'] = "Forelder";
> 		$text['mhfather'] = "hans far";
> 		$text['mhmother'] = "hans mor";
> 		$text['mhhusband'] = "hans ektemann/partner";
> 		$text['mhwife'] = "hans kone/partner";
> 		$text['mhson'] = "hans sønn";
> 		$text['mhdaughter'] = "hans datter";
> 		$text['fhfather'] = "hennes far";
> 		$text['fhmother'] = "hennes mor";
> 		$text['fhhusband'] = "hennes ektemann/partner";
> 		$text['fhwife'] = "hennes kone/partner";
> 		$text['fhson'] = "hennes sønn";
> 		$text['fhdaughter'] = "hennes datter";
> 		$text['hfather'] = "far";
> 		$text['hmother'] = "mor";
> 		$text['hhusband'] = "ektemann/partner";
> 		$text['hwife'] = "kone/partner";
> 		$text['hson'] = "sønn";
> 		$text['hdaughter'] = "datter";
> 		$text['maxruns'] = "Maks antall stier som skal sjekkes";
> 		$text['maxrshort'] = "Maks antall stier";
> 		$text['maxlength'] = "Forbindelsesstier ikke lengre enn";
> 		$text['maxlshort'] = "Maks sti-lengde";
> 		$text['xstep'] = "steg";
> 		$text['xsteps'] = "steg";
> 		$text['xmarriages'] = "inklusiv xxx ekteskap/partnerskap";
> 		$text['xmarriage'] = "inklusiv 1 ekteskap/partnerskap";
> 		$text['showspouses'] = "Vis begge ektefeller/partnere";
> 		$text['showTxt'] = "Vis forbindelse(r) som tekst";
> 		$text['showTxtshort'] = "Tekst for sti(er)";
> 		$text['compactBox'] = "Vis kompakte personbokser";
> 		$text['compactBoxshort'] = "Kompakte bokser";
> 		$text['paths'] = "Stier";
> 		$text['dospouses2'] = "Vis ektefeller/partnere";
> 		$text['maxmopt'] = "Maks antall ekteskap/partnerskap i forbindelsen";
> 		$text['maxm'] = "Maks antall ekteskap/partnerskap";
> 		$text['arerelated'] = "Disse personene er beslektet - deres slektskap vises i Sti 1";
> 		$text['simplerel'] = "Finn direkte slektskap";
196d264
< 		$text['scrollnote'] = "NB: Du må kanskje bla ned for å se hele treet.";
199d266
< 		$text['popupnote2'] = " = Nytt anetre";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabeller";
> 		$text['dtchildren'] = "Barn";
> 		$text['dtgrandchildren'] = "Barnebarn";
> 		$text['dtggrandchildren'] = "Oldebarn";
> 		$text['dtgggrandchildren'] = "Tippoldebarn"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "1"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Ingen etterkommere";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totalt";
> 		$text['dtselect'] = "Velg";
> 		$text['dteachfulltable'] = "Hver fulle tabell vil ha";
> 		$text['dtrows'] = "rader";
> 		$text['dtdisplayingtable'] = "Viser tabell";
> 		$text['dtgototable'] = "Gå til tabell:";
> 		$text['fcinstrdn'] = "Vis familie med ektefelle/partner";
> 		$text['fcinstrup'] = "Vis familie med foreldre";
> 		$text['fcinstrplus'] = "Velg andre ektefeller/partnere";
> 		$text['fcinstrfam'] = "Velg andre foreldre";
337c423
< 		$text['otherevents'] = "Andre hendelser";
---
> 		$text['otherevents'] = "Andre Hendelser og Egenskaper";
381,383c467
< 		$text['firstpage'] = "Første side";
< 		$text['lastpage'] = "Siste side";
< 		$text['photoowner'] = "Eier/kilde";
---
> 		$text['photoowner'] = "Eier av original/Kilde";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Bildemerker av/på";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Nytt passord en gang til";
> 		$text['resetsuccess'] = "Vellykket: Passordet har blitt tilbakestilt";
> 		$text['resetfail'] = "Feil: Passordet ikke tilbakestilt";
> 		$text['failreason0'] = " (ukjent databasefeil)";
> 		$text['failreason2'] = " (du har ikke tillatelse til å endre ditt passord)";
> 		$text['failreason3'] = " (passordene stemte ikke)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Antall kildehenvisninger";
595c688
< 		$text['browseallnotes'] = "Søk i alle notater";
---
> 		$text['browseallnotes'] = "Bla gjennom alle notater";
618d710
< 		$text['loginfirst'] = "Du må først logge på.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Eksisterende brukerposter er blitt oppdaget. For å fortsette, må du først logge på eller fjerne alle poster fra brukertabellen.";
629,630d722
< 		$text['zoomin'] = "Zoom inn";
< 		$text['zoomout'] = "Zoom ut";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Sammenlign valgte mtDNA tester";
> 		$text['dnatestscompare_atdna'] = "Sammenlign valgte atDNA tester";
> 		$text['chromosome'] = "Kromosom";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNP'er";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Ekstra mutasjoner";
> 		$text['mrca'] = "Yngste felles ane";
> 		$text['ydna_test'] = "Y-DNA tester";
> 		$text['mtdna_test'] = "mtDNA (Mitokondrial) tester";
> 		$text['atdna_test'] = "atDNA (autosomal) tester";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "Slutt";
> 		$text['suggested_relationship'] = "Foreslått";
> 		$text['actual_relationship'] = "Faktisk";
> 		$text['12markers'] = "Markører 1-12";
> 		$text['25markers'] = "Markører 13-25";
> 		$text['37markers'] = "Markører 26-37";
> 		$text['67markers'] = "Markører 38-67";
> 		$text['111markers'] = "Markører 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Minst to tester må velges for å sammenligne.";
670,671d785
< $text['birthabbr'] = "f.";
< $text['chrabbr'] = "dp.";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
706d817
< $text['burialabbr'] = "gravl.";  //from descend
712d822
< $text['place'] = "Sted";
715d824
< $text['marrabbr'] = "g.";
738d846
< $text['source'] = "Kilde";
766d873
< $text['repository'] = "Arkiv";
770d876
< $text['findplaces'] = "Finn alle personer med hendelser på dette stedet";
804d909
< $text['glang'] = "&amp;hl=no";
816d920
< $text['none'] = "Ingen";
924d1027
< $text['otherevents'] = "Andre hendelser";
952,953d1054
< $text['people_have'] = "personer har linket en DNA test til";
< $text['person_has'] = "person har linket en DNA test til";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tester er linket til";
> $text['testislinked'] = "DNA test er linket til";
> 
> //added in 12.2
> $text['quicklinks'] = "Hurtigkoblinger";
> $text['yourname'] = "Ditt navn";
> $text['youremail'] = "Din e-postadresse";
> $text['liketoadd'] = "All informasjon du vil legge til";
> $text['webmastermsg'] = "Webmaster melding";
> $text['gallery'] = "Se galleri";
> $text['wasborn_male'] = "ble født";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "ble født"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "ble døpt";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "ble døpt";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "døde";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "døde";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "ble begravet"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "ble begravet"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "ble kremert";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "ble kremert";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "giftet seg med";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "giftet seg med";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "ble skilt";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "ble skilt";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = ", ";			// used as a preposition to the location
> $text['onthisdate'] = " ";		// when used with full date
> $text['inthisyear'] = " ";		// when used with year only or month / year dates
> $text['and'] = "og ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Besøkende";
> 
> $text['popupnote2'] = " = Nytt anetre";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom inn";
> $text['zoomout'] = "Zoom ut";
> $text['scrollnote'] = "NB: Du må kanskje dra eller bla ned for å se hele treet.";
> $text['general'] = "Generelt";
> 
> //changed in 14.0
> $text['otherevents'] = "Andre Hendelser og Egenskaper";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Forbindelser";
> $text['continue'] = "Fortsett";
> $text['title2'] = "Tittel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Norwegian-UTF8/admintext.php TNG1403/languages/Norwegian-UTF8/admintext.php
24c24
< 		$admtext['branchid'] = "Gren ID";
---
> 		$admtext['branchid'] = "GrenID";
30c30
< 		$admtext['enterbranchid'] = "Angi en gren ID.";
---
> 		$admtext['enterbranchid'] = "Angi en grenID.";
80d79
< 		$admtext['pleaseenter'] = "Skriv inn en ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Velg en fil som skal importeres.";
> 		$admtext['addreplacedata'] = "Legg til eller erstatt database (kan ta flere minutter, avhengig av størrelse på GEDCOM filen og Internett tilkobling)";
> 		$admtext['fromyourcomputer'] = "Fra din datamaskin";
> 		$admtext['importdata'] = "Importer data";
> 		$admtext['replace'] = "Erstatt (i valgt tre)";
> 		$admtext['desttree'] = "MÃ¥ltre";
> 		$admtext['selectdesttree'] = "Velg eller skriv inn mål (tre).";
> 		$admtext['selectexisting'] = "Importer til";
> 		$admtext['ucaselast'] = "Endre alle etternavn til store bokstaver";
> 		$admtext['norecalc'] = "Ikke kalkuler Nålevende 'flagget' på nytt";
> 		$admtext['autooffset'] = "Start ID med første ledige nummer";
> 		$admtext['mustselecttree'] = "Du må velge et tre først.";
> 		$admtext['onwebserver'] = "på vertsmaskin (i GEDCOM mappe)";
> 		$admtext['imphints'] = "Tips: 'Alle eksisterende data' betyr alle personer, familier, kilder og notater (assosierte media blir ikke borte så lenge ID-nummeret forblir det samme). Sammenfallende poster er alltid basert på kun ID. Nye poster legges alltid til. 'Legg til alle poster' importerer alle poster med nye ID'er.";
> 		$admtext['destbranch'] = "MÃ¥lgren (valgfritt)";
> 		$admtext['importlatlong'] = "Importer breddegrad / lengdegrad data hvis det finnes";
> 		$admtext['opening'] = "Ã…pner";
> 		$admtext['reopen'] = "Åpner på nytt";
> 		$admtext['uploading'] = "Laster opp";
> 		$admtext['stop'] = "Stopp";
> 		$admtext['stopped'] = "Import stoppet";
> 		$admtext['resume'] = "klikk her for å fortsette";
> 		$admtext['neweronly'] = "Erstatt kun hvis nyere";
> 		$admtext['oldimport'] = "Gammel importmetode (ingen fremdriftsindikator)";
> 		$admtext['importgedcom'] = "Importer GEDCOM (kan være zip'et)";
> 		$admtext['stopbackup'] = "Stopp! Det kan være en god idé å ta en sikkerhetskopi av gjeldende data før du fortsetter.";
> 		$admtext['importmedia'] = "Importer medialinker hvis det finnes";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Sjekk at Prefikser og suffikser (Oppsett - Generelle) er korrekte for denne GEDCOM-filen.";
> 		$admtext['chkimpsettings'] = "Sjekk importinnstillingene (Oppsett - Import) for flere alternativer.";
> 		$admtext['eventsonly'] = "Importer kun hendelses- og egenskaps-typer (ingen data blir lagt til, erstattet eller utvidet)";
> 		$admtext['allevents'] = "Aksepter data for alle nye hendelses- og egenskaps-typer";
> 		$admtext['finishingimporting'] = "Fullfører...";
> 		$admtext['fileuploadfailed'] = "Filopplasting feilet. Filen kan være for stor. Prøv og bruke FTP til å laste opp filen til GEDCOM mappen, for så å velge import derfra.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Endre eksisterende hendelsestype";
135,138d168
< 		$admtext['entertypedesc'] = "En beskrivelse av den nye type hendelse.";
< 		$admtext['enterdisplay'] = "Skriv en forkortelse for den nye type hendelse.";
< 		$admtext['existingeventtypeinfo'] = "Informasjon om eksisterende hendelser";
< 		$admtext['neweventtypeinfo'] = "Informasjon om nye hendelser";
145,146d174
< 		$admtext['addnewevtype'] = "Legg til ny hendelse type";
< 		$admtext['createnewevtype'] = "Lag en fil for ny hendelsetype";
149,150d176
< 		$admtext['existingevtypes'] = "Eksisterende hendelsetyper";
< 		$admtext['edsevtypes'] = "Rediger, slett eller sorter eksisterende hendelsetyper";
152d177
< 		$admtext['confdeleteevtype'] = "Er du sikker på at du vil slette denne hendelsetype?";
154d178
< 		$admtext['selectentertag'] = "Velg eller skriv koden for denne hendelsetype.";
207,208c231
< 		$admtext['acceptselected'] = "Godkjenn valgte";
< 		$admtext['changestoallevtypes'] = "Endringer for alle hendelsestyper";
---
> 		$admtext['acceptselected'] = "Aksepter valgte";
214d236
< 		$admtext['BAPM'] = "DÃ¥p";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Er du sikker på at du vil slette denne hendelsetype? Alle hendelser med hendelsetypen vil også bli slettet.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Legg til ny type";
> 		$admtext['createnewevtype'] = "Lag ny hendelses- eller egenskaps-type";
> 		$admtext['modifyeventtype'] = "Endre eksisterende type";
> 		$admtext['entertypedesc'] = "Skriv en type/beskrivelse for den nye hendelses- eller egenskaps-type.";
> 		$admtext['enterdisplay'] = "Skriv en visningstekst for den nye hendelses- eller egenskaps-type.";
> 		$admtext['existingeventtypeinfo'] = "Informasjon om eksisterende hendelses- eller egenskaps-typer";
> 		$admtext['neweventtypeinfo'] = "Informasjon om nye hendelses- eller egenskaps-typer";
> 		$admtext['existingevtypes'] = "Eksisterende hendelses- eller egenskaps-typer";
> 		$admtext['edsevtypes'] = "Rediger, slett eller sorter eksisterende hendelses- eller egenskaps-typer";
> 		$admtext['selectentertag'] = "Velg eller skriv koden for denne hendelses- eller egenskaps-typen.";
> 		$admtext['changestoallevtypes'] = "Endringer for alle hendelses- eller egenskaps-typer";
268d303
< 		$admtext['nobirthinfo'] = "Ingen fødselsinformasjon";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Velg<br/>standard<br/>foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Lagre + Nye Foreldre";
> 		$admtext['savenewspouse'] = "Lagre + Ny Ektefelle/Partner";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Fødsel";
354d391
< 		$admtext['enterphotodesc'] = "Skriv en beskrivelse av bildet.";
388d424
< 		$admtext['photoowner'] = "Eier/Kilde";
417d452
< 		$admtext['imgmap'] = "Bildekart";
489,490c524
< 		$admtext['mapinstr2'] = "Du kan linke ulike deler av bildet til ulike personer eller steder (valgfritt) ved å legge inn 'HTML image map' informasjon under, eller ved å følge instruksjonene ved bildet under.";
< 		$admtext['mapinstr3'] = "For å linke en del av dette bildet til en bestemt person, velg først personens tre og deretter opprette et rektangel for det ønskede utsnitt. Dette gjøres ved å klikke i øvre venstre hjørne av utsnittet og deretter dra musepekeren til det nedre høyre hjørne. Alternativt kan du klikke en gang i øvre venstre hjørne, for så å klikke igjen i nedre høyre hjørne. Et dialogboks for å velge tilknyttet person kommer deretter opp. Når valget er foretatt, vil koden for bildekart automatisk bli lagt til i tekstboksen nedenfor. Gjenta denne prosessen for å lage flere utsnitt i samme bilde.";
---
> 		$admtext['mapinstr2'] = "Du kan linke ulike deler av bildet til ulike personer eller andre sider (valgfritt)";
495d528
< 		$admtext['removelink'] = "Fjern Link";
502d534
< 		$admtext['eloptions'] = "Bla gjennom eller slett";
509d540
< 		$admtext['nolinks'] = "Ingen Linker finnes enda";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Bildekart (for bakoverkompatibilitet)";
> 		$admtext['photoowner'] = "Eier av original/Kilde";
> 		$admtext['nothumb'] = "Mangler miniatyrbilde";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Elementet kunne ikke legges til, sannsynligvis fordi filen var for stor og ikke kunne lastes opp eller brukes til å lage et miniatyrbilde.";
> 		$admtext['moved'] = "Flyttet";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Skriv en tittel eller beskrivelse til dette bildet.";
> 		$admtext['mapinstr3'] = "For å linke en del av dette bildet til en bestemt person, familie eller annet dataobjekt, velg først relevant tre og dataobjekt, deretter opprett et rektangel for det ønskede utsnitt. Dette gjøres ved å klikke i øvre venstre hjørne av utsnittet og deretter dra musepekeren til det nedre høyre hjørne av ønsket utsnitt. Alternativt kan du klikke en gang i øvre venstre hjørne, for så å klikke igjen i nedre høyre hjørne av ønsket utsnitt. En dialogboks for å velge tilknyttet person eller dataobjekt kommer deretter opp. Gjenta denne prosessen for å lage flere utsnitt i samme bilde. Klikk et eksisterende utsnitt for å velge, dra for å flytte eller trykk 'X' for å slette.";
596d633
< 		$admtext['foremptystring'] = "For tomt innhold, la feltet være tomt og klikk \"Legg til >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instruksjoner: Dra eller dobbelklikk fra felt på venstre side, til lister på høyre side. Dra opp og ned for å endre rekkefølge. Dobbelklikk igjen for å fjerne.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "For tomt innhold, la feltet være blankt og klikk >>";
651,655d690
< 		$admtext['selectimportfile'] = "Velg en fil som skal importeres.";
< 		$admtext['importgedcom'] = "Importer GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Legg til eller erstatt database (kan ta flere minutter, avhengig av størrelse på GEDCOM filen og Internett tilkobling)";
< 		$admtext['fromyourcomputer'] = "Fra din datamaskin";
< 		$admtext['importdata'] = "Importer data";
657,660d691
< 		$admtext['replace'] = "Erstatt (i valgt tre)";
< 		$admtext['desttree'] = "MÃ¥ltre";
< 		$admtext['selectdesttree'] = "Velg eller skriv inn mål (tre).";
< 		$admtext['selectexisting'] = "Importer til";
668,673d698
< 		$admtext['ucaselast'] = "Endre alle etternavn til store bokstaver";
< 		$admtext['norecalc'] = "Ikke kalkuler Nålevende 'flagget' på nytt";
< 		$admtext['autooffset'] = "Start ID med første ledige nummer";
< 
< 		$admtext['mustselecttree'] = "Du må velge et tre først.";
< 		$admtext['importmedia'] = "Importer media hvis det finnes";
675d699
< 		$admtext['neweronly'] = "Erstatt kun hvis nyere";
677,692d700
< 		$admtext['onwebserver'] = "på vertsmaskin (i GEDCOM mappe)";
< 		$admtext['eventsonly'] = "Importer kun Egendefinerte hendelsetyper (ingen data blir lagt til, erstattet eller utvidet)";
< 		$admtext['imphints'] = "Tips: 'Alle eksisterende data' betyr alle personer, familier, kilder og notater (assosierte media blir ikke borte så lenge ID-nummeret forblir det samme). Sammenfallende poster er alltid basert på kun ID. Nye poster legges alltid til. 'Legg til alle poster' importerer alle poster med nye ID'er.";
< 		$admtext['allevents'] = "Aksepter data for alle nye Egendefinerte hendelsetyper";
< 		$admtext['destbranch'] = "MÃ¥lgren (valgfritt)";
< 		$admtext['inframe'] = "(i 'frame')";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Importer breddegrad / lengdegrad data hvis det finnes";
< 		$admtext['opening'] = "Ã…pner";
< 		$admtext['reopen'] = "Åpner på nytt";
< 		$admtext['uploading'] = "Laster opp";
< 		$admtext['stop'] = "Stopp";
< 		$admtext['stopped'] = "Import stoppet";
< 		$admtext['resume'] = "klikk her for å fortsette";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Endringslogg";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Gammel importmetode (ingen fremdriftsindikator)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Oppgrader";
> 		$admtext['need_upgrade'] = "Fullfør disse oppgraderingsinstruksjonene";
> 		$admtext['upgrade_missing'] = "Oppgraderingsfilen synes å mangle, så oppgraderingen kan være gjort allerede.";
> 		$admtext['delete_upgrade'] = "Når du er ferdig, klikk her for å slette oppgraderingsfilen og returnere til menyen.";
723d733
< 		$admtext['author'] = "Forfatter";
785,788c795,798
< 		$admtext['pedperson'] = "Anetre person ID"; //2
< 		$admtext['pedtree'] = "Tre ID"; //2
< 		$admtext['phhistperson'] = "Bilder & Historier person ID"; //2
< 		$admtext['phhisttree'] = "Bilder & Historier tre ID"; //2
---
> 		$admtext['pedperson'] = "Anetre personID"; //2
> 		$admtext['pedtree'] = "TreID"; //2
> 		$admtext['phhistperson'] = "Bilder & Historier personID"; //2
> 		$admtext['phhisttree'] = "Bilder & Historier treID"; //2
804,809c814,819
< 		$admtext['momside'] = "Mors side betegnelse"; //8
< 		$admtext['dadside'] = "Fars side betegnelse"; //8
< 		$admtext['momperson'] = "Mors side person ID"; //8
< 		$admtext['momtree'] = "Mors side tre ID"; //8
< 		$admtext['dadperson'] = "Fars side person ID"; //8
< 		$admtext['dadtree'] = "Fars side tre ID"; //8
---
> 		$admtext['momside'] = "Morsfamilie - betegnelse"; //8, 20
> 		$admtext['dadside'] = "Farsfamilie - betegnelse"; //8, 20
> 		$admtext['momperson'] = "Morsfamilie - personID"; //8, 20
> 		$admtext['momtree'] = "Morsfamilie - treID"; //8, 20
> 		$admtext['dadperson'] = "Farsfamilie - personID"; //8, 20
> 		$admtext['dadtree'] = "Farsfamilie - treID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Sitater overskrift";
> 		$admtext['quotesubhead'] = "Sitater undertittel";
> 		$admtext['sniptitle'] = "Featurette tittel";
> 		$admtext['snipname'] = "Featurette navn";
> 		$admtext['snipinfoone'] = "Featurette første linje";
> 		$admtext['snipinfotwo'] = "Featurette andre linje";
> 		$admtext['snipimage'] = "Featurette bilde";
> 		$admtext['snipperson'] = "Featurette personID";
> 		$admtext['sniptree'] = "Featurette treID";
> 		$admtext['quote'] = "Sitat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Aktuelt 7 tittel";
> 		$admtext['featuretitle8'] = "Aktuelt 8 tittel";
> 		$admtext['featuretitle9'] = "Aktuelt 9 tittel";
> 		$admtext['featurethumb9'] = "Aktuelt 9 miniatyrbilde"; //15
> 		$admtext['featurelink9'] = "Aktuelt 9 link"; //15
> 		$admtext['featurepara9'] = "Aktuelt 9 avsnitt"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Toppbilde venstre";
> 		$admtext['rightimg'] = "Toppbilde høyre";
> 		$admtext['photoption'] = "Valg av foto er<br />&nbsp;&nbsp;(static or random)";
> 		$admtext['randomphotowidth'] = "Tilfeldig foto bredde";
> 		$admtext['randomphotoheight'] = "Tilfeldig foto høyde";
> 		$admtext['randomphotomediatypeID'] = "Tilfeldig foto Samling";
> 		$admtext['momheading'] = "Morsfamilie - Overskrift";
> 		$admtext['mompara'] = "Morsfamilie - Avsnitt";
> 		$admtext['mompagelink'] = "Morsfamilie - Sidelink";
> 		$admtext['dadheading'] = "Farsfamilie - Overskrift";
> 		$admtext['dadpara'] = "Farsfamilie - Avsnitt";
> 		$admtext['dadpagelink'] = "Farsfamilie - Sidelink";
> 		$admtext['spmomheading'] = "Ektefelles/Partners Morsfamilie - Overskrift";
> 		$admtext['spmompara'] = "Ektefelles/Partners Morsfamilie - Avsnitt";
> 		$admtext['spmompagelink'] = "Ektefelles/Partners Morsfamilie - Sidelink";
> 		$admtext['spmomside'] = "Ektefelles/Partners Morsfamilie - betegnelse";
> 		$admtext['spdadside'] = "Ektefelles/Partners Farsfamilie - betegnelse";
> 		$admtext['spmomperson'] = "Ektefelles/Partners Morsfamilie - personID";
> 		$admtext['spmomtree'] = "Ektefelles/Partners Morsfamilie - treID";
> 		$admtext['spdadheading'] = "Ektefelles/Partners Farsfamilie - Overskrift";
> 		$admtext['spdadpara'] = "Ektefelles/Partners Farsfamilie - Avsnitt";
> 		$admtext['spdadpagelink'] = "Ektefelles/Partners Farsfamilie - Sidelink";
> 		$admtext['spdadperson'] = "Ektefelles/Partners Farsfamilie - personID";
> 		$admtext['spdadtree'] = "Ektefelles/Partners Farsfamilie - treID";
> 		$admtext['storiesheading'] = "VÃ¥re familiehistorier";
> 		$admtext['nbrsurnames'] = "Antall etternavn<br />&nbsp;&nbsp; i ordsky for etternavn";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Aktuelt miniatyrbilde";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Lysbilde Tittel";
> 		$admtext['slideimg'] = "Lysbilde Bilde";
> 		$admtext['slideheadline'] = "Lysbilde Overskrift";
> 		$admtext['slidetext'] = "Lysbilde Tekst";
> 		$admtext['slidelink'] = "Lysbilde Link";
> 		$admtext['slidelinktext'] = "Lysbilde Link Navn";
> 		$admtext['featurelink'] = "Aktuelt Link";
> 		$admtext['featurelinktext'] = "Aktuelt Link Navn";
> 		$admtext['featuretitle'] = "Aktuelt Tittel";
> 		$admtext['featuresub'] = "Aktuelt Undertittel";
> 		$admtext['quoteimg'] = "Sitater Bilde";
> 		$admtext['quotelink'] = "Sitater Link";
> 		$admtext['quotelinktext'] = "Sitater Link Navn";
> 		$admtext['sidebarpara'] = "Sidepanel Paragraph";
> 		$admtext['sidebarlink'] = "Sidepanel Link";
> 		$admtext['sidebarlinktext'] = "Sidepanel Link Navn";
> 		$admtext['sidebarimg'] = "Sidepanel Bilde";
> 		$admtext['sidebartitle'] = "Sidepanel Tittel";
> 		$admtext['sidebarsub'] = "Sidepanel Undertittel";
> 		$admtext['snipheadline'] = "Artikkel Overskrift";
> 		$admtext['snipsubhead'] = "Artikkel Undertittel";
> 		$admtext['snipimg'] = "Artikkel Bilde";
> 		$admtext['sniplink'] = "Artikkel Link";
> 		$admtext['sniplinktext'] = "Artikkel Link Navn";
> 		$admtext['linktext'] = "Link Tekst";
> 		$admtext['footerheadline'] = "Bunntekst Overskrift";
> 		$admtext['footerpara'] = "Bunntekst Tekst";
> 		$admtext['footerlink'] = "Bunntekst Link";
> 		$admtext['footerlinktext'] = "Bunntekst Link Navn";
> 		$admtext['footerheadline'] = "Bunntekst Overskrift";
> 		$admtext['footerpara'] = "Bunntekst Tekst";
> 		$admtext['footerlink'] = "Bunntekst Link";
> 		$admtext['footerlinktext'] = "Bunntekst Link Navn";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG krever 5.3 eller nyere.)";
---
> 		$admtext['phpreq'] = "(TNG krever 7.0 eller nyere.)";
1043c1136
< 		$admtext['boxnamesize'] = "Størrelse for navneboks";
---
> 		$admtext['boxnamesize'] = "Skriftstørrelse for navn i boksen";
1045c1138
< 		$admtext['boxdatessize'] = "Størrelse for datoer i boksen";
---
> 		$admtext['boxdatessize'] = "Skriftstørrelse for datoer i boksen";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Endre importerte prefiks for å passe med TNG konfigurasjon";
> 		$admtext['sortevents'] = "Sorter hendelser";
> 		$admtext['sortbydate'] = "Hendelse dato";
> 		$admtext['sortbytype'] = "Hendelse type";
> 		$admtext['allowsuggest'] = "Tillat forslag fra besøkende";
> 		$admtext['livingchecked'] = "Sett nye personer og familier som NÃ¥levende";
> 		$admtext['maxmarried'] = "Sett familie som Nålevende hvis gift mindre enn<br/>så mange år";
> 		$admtext['imagetags'] = "Rektangler";
> 		$admtext['allowcsv'] = "Tillat CSV-nedlastinger for rapporter";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Valg for sikkerhetskopiering";
> 		$admtext['dosql'] = "Eksporter som SQL";
> 		$admtext['dodrop'] = "Inkluder DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Inkluder CREATE TABLE";
> 		$admtext['onrestore'] = "Valg for gjenoppretting";
> 		$admtext['dodel'] = "Slett tidligere innhold først";
> 		$admtext['download'] = "Last ned";
> 		$admtext['altbirthtypes'] = "Alternative fødselshendelser";
> 		$admtext['dtformat'] = "Tabellformat";
> 		$admtext['conchart'] = "Forbindelser diagram";
> 		$admtext['maxropt'] = "Maks antall stier som skal sjekkes";
> 		$admtext['maxlopt'] = "Maks sti-lengde";
> 		$admtext['showtxtopt'] = "Vis forbindelse(r) som tekst";
> 		$admtext['compactboxopt'] = "Vis kompakte personbokser";
> 		$admtext['sortbyopt'] = "Sorter stier etter";
> 		$admtext['anchoridopt'] = "Anker ID";
> 		$admtext['maxmopt'] = "Maks antall ekteskap/partnerskap i forbindelsen";
> 		$admtext['saveincfg'] = "Lagre i Konfigurasjonssti (se Oppsett - Generelle - Stier og mapper)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kunne ikke geokodes";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Ikke geokode";
1436d1549
< 		$admtext['backtosecondary'] = "Tilbake til Sekundære Prosesser";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Tilbake til Verktøy etter import";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Ekskluder notater";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip og inkluder mediafiler";
> 		$admtext['downloadzip'] = "Last ned ZIP";
1570c1688
< 		$admtext['allow_admin'] = "Gir tilgang til alle systeminnstillinger og administrative funksjoner, og tildeler rettigheter til alle tre og grener.";
---
> 		$admtext['allow_admin'] = "Bruk rettighetene gitt over, på alle trær og grener.";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Vis bare deaktiverte brukere";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Tillat å se Private notater";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Send til administratorer når også et enkelt Tre er valgt";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alle Mods";
> 		$admtext['installedmods'] = "Kun 'Installert' Mods";
> 		$admtext['partinstmods'] = "'Installert' + 'Delvis installert' Mods";
> 		$admtext['showanalyzeractions'] = "Vis handlinger (Avinstaller/Slett) i Analyse av TNG filer";
> 		$admtext['badchar'] = "Ugyldig bokstav/tegn";
1886d2008
< 		$admtext['test_number'] = "Testnummer";
1916d2037
< 		$admtext['xtra_mut'] = "Ekstra mutasjoner";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testnummer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Hold test Privat";
> 		$admtext['multivalues'] = "Bruk bindestrek mellom multi-verdier";
> 		$admtext['changestogroup'] = "Endringer for DNA gruppe";
> 		$admtext['modifydnagroup'] = "Rediger eksisterende DNA gruppe";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Koble denne DNA testen til en person";
1965,1966c2095
< $admtext['personid'] = "Person ID";
< $admtext['otherevents'] = "Andre hendelser";
---
> $admtext['personid'] = "PersonID";
1984c2113
< $admtext['linkspersonid'] = "Kobling (Person ID)";
---
> $admtext['linkspersonid'] = "Kobling (PersonID)";
2051,2052d2179
< $admtext['savereturn'] = "Returner til denne siden";
< $admtext['saveback'] = "Returner til meny";
2059,2060d2185
< $admtext['secondary'] = "Sekundære prosesser";
< $admtext['commas'] = "Separer oppføringer med komma";
2086c2211
< $admtext['treeid'] = "Tre ID";
---
> $admtext['treeid'] = "TreID";
2130,2131d2254
< $admtext['secondarymaint'] = "Sekundære vedlikeholdsprosesser";
< $admtext['customeventtypes'] = "Egendefinerte hendelser";
2166,2168c2289,2291
< $admtext['findpersonid'] = "Finn Person ID";
< $admtext['findfamilyid'] = "Finn Familie ID";
< $admtext['findsourceid'] = "Finn Kilde ID";
---
> $admtext['findpersonid'] = "Finn PersonID";
> $admtext['findfamilyid'] = "Finn FamilieID";
> $admtext['findsourceid'] = "Finn KildeID";
2170c2293
< $admtext['findrepoid'] = "Finn Arkiv ID";
---
> $admtext['findrepoid'] = "Finn ArkivID";
2220d2342
< //changed in 8.0.0
2224,2225c2346
< //moved here in 8.0.0
< $admtext['repoid'] = "Arkiv ID";
---
> $admtext['repoid'] = "ArkivID";
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Etternavn";
> $admtext['subhead'] = "Undertittel";
> $admtext['image'] = "Bilde";
> $admtext['author'] = "Forfatter";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Kom i gang";
> $admtext['showlog'] = "Endringslogg";
> $admtext['nobirthinfo'] = "Ingen fødselsinformasjon";
> //changed in 13.0
> $admtext['savereturn'] = "Lagre + Forbli på siden";
> $admtext['saveback'] = "Lagre + Avslutt redigering";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alle elementene ble slettet.";
> $admtext['private'] = "Privat";
> $admtext['imgtags'] = "Bildemerker";
> 
> $admtext['removelink'] = "Fjern Link";
> $admtext['eloptions'] = "Bla gjennom eller slett";
> $admtext['pleaseenter'] = "Skriv inn en ";
> 
> $admtext['nolinks'] = "Ingen Linker finnes enda";
> $admtext['nogeocode'] = "Kunne ikke geokodes";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Velg<br/>standard<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Hendelse / Egenskap typer";
> $admtext['secondary'] = "Verktøy etter import";
> $admtext['otherevents'] = "Andre hendelser / egenskaper";
> //added in 14.0
> $admtext['newlinks'] = "Linker opprettet";
> $admtext['newcemlinks'] = "Kirkegårdslinker opprettet";
> $admtext['utility'] = "Verktøy";
> $admtext['linktype'] = "Type";
> $admtext['move'] = "Flytt";
> $admtext['copy'] = "Kopier";
> $admtext['title2'] = "Tittel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Norwegian-UTF8/alltext.php TNG1403/languages/Norwegian-UTF8/alltext.php
88d87
< //moved here in 8.0.0
100c99
< $admtext['BURI'] = "Gravferd";
---
> $admtext['BURI'] = "Begravelse";
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Det har oppstått en feil i TNG programvaren. Dette kan skyldes et konfigurasjonsproblem, en ufullstendig oppgradering eller en programfeil. Hvis du er eieren av nettstedet, kan du kontakte TNG systemstøtte for å få hjelp med dette problemet. Vennligst kopier spørringen under og lim den inn i meldingen.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Nummer/Navn";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Nummer/Navn";
> $admtext['match_date'] = "Treffdato";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogruppe";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogruppe";
> $admtext['relationship_section'] = "Slektskap";
> $admtext['relationship_range'] = "Estimert slektskap";
> $admtext['suggested_relationship'] = "Foreslått slektskap";
> $admtext['actual_relationship'] = "Faktisk slektskap";
> $admtext['related_side'] = "Slektskap via Gren";
> $admtext['shared_dna'] = "Delt DNA";
> $admtext['shared centimorgans'] = "Totalt delt cM";
> $admtext['shared_segments'] = "Delte segmenter";
> $admtext['largest_segment'] = "Største segment";
> $admtext['chromosome'] = "Kromosom Nr";
> $admtext['segment_start'] = "Segment start";
> $admtext['segment_end'] = "Segment slutt";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Delte SNP'er";
> $admtext['xmatch'] = "X-Treff";
> $text['keep_test_private'] = "Privat test";
> $text['shared_dna'] = "Delt DNA segment";
> $text['for_match'] = "for dette treff";
> $admtext['keeptest'] = "Test personvern";
> $admtext['keepname'] = "Navn personvern";
> $admtext['allgroups'] = "Alle grupper";
> $admtext['alltypes'] = "Alle typer";
> $admtext['generation_num'] = "Generasjoner for aners etternavn";
> 
> $text['birthabbr'] = "f.";
> $text['chrabbr'] = "dp.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "gravl.";  //from descend
> $text['marrabbr'] = "g.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Finn alle personer med hendelser på dette stedet";
> $text['firstpage'] = "Første side";
> $text['lastpage'] = "Siste side";
> 
> //changed in 13.0.0
> $text['problem'] = "Det har oppstått en feil i TNG programvaren. Hva du kan gjøre:<p>Hvis du nettopp har installert en oppgradering, har du kanskje hoppet over et punkt i installasjonsinstruksjonene. Vær spesielt oppmerksom på punktet som gjelder oppdatering av databasestruktur.</p><p>Hvis du nettopp har installert TNG for første gang, kan det hende du fremdeles må opprette databasetabellene. Gå tilbake til readme.html siden for å finne det punktet.</p><p>Hvis du er nettstedets eier, kan du kontakte TNG kundestøtte for videre assistanse med dette problemet. Kopier spørringen nedenfor og lim den inn i meldingen til kundestøtte.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Ingen gren";
> 
> //added in 14.0
> $text['oneyear'] = "Ã¥r";
> $text['pwdcodelink'] = "Klikk denne linken for å få sendt et midlertidig passord til deg";
> $text['pwdcodesent'] = "En link til siden for resetting av passordet er sendt til din epostadresse.";
> $text['moved'] = "Flyttet";
> $text['citation'] = "Henvisning";
> $text['other'] = "Annet";
> $text['death'] = "Død";
> $text['burial'] = "Begravelse";
> $text['cremation'] = "Kremasjon";
> $text['marriage'] = "Ekteskap";
> $text['divorce'] = "Skilsmisse";
> $text['bylength'] = "Steg";
> $text['bymarriages'] = "Ekteskap/Partnerskap";
> $text['none'] = "Ingen";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Kilde";
> $text['repository'] = "Arkiv";
> $text['place'] = "Sted";
> $admtext['BAPM'] = "DÃ¥p";
> 
> $text['glang'] = "no";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Norwegian-UTF8/text.php TNG1403/languages/Norwegian-UTF8/text.php
69d68
< 		$text['general'] = "Generelt";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "De to personene er samme person.";
---
> 		$text['sameperson'] = "Samme person er valgt to ganger.";
93c93
< 		$text['sometimes'] = "(Noen ganger kan en ved å sjekke et annet antall generasjoner, få et annet resultat.)";
---
> 		$text['sometimes'] = "(Enkelte ganger vil søk med forskjellig antall generasjoner gi forskjellige resultat.)";
144c144
< 		$text['dospouses2'] = "Vis partnere";
---
> 		$text['dospouses2'] = "Vis ektefeller/partnere";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Søk etter forbindelser";
> 		$text['findrel2'] = "Finn slektskap og andre forbindelser";
> 		$text['makeme2nd'] = "Bruk min ID";
> 		$text['usebookmarks'] = "Bruk bokmerker";
> 		$text['select2inds'] = "Vennligst velg to personer.";
> 		$text['indinfofor'] = "Personside for";
> 		$text['nobookmarks'] = "Det finnes ingen bokmerker som kan brukes";
> 		$text['bkmtitle'] = "Personer funnet i bokmerker:";
> 		$text['bkminfo'] = "Velg en person:";
> 		$text['sortpathsby'] = "Sorter stier etter antall";
> 		$text['sortbyshort'] = "Sorter sti(er) etter";
> 		$text['bylengthshort'] = "lengde";
> 		$text['badID1'] = ": feil i person1 ID - vennligst gå tilbake og korriger";
> 		$text['badID2'] = ": feil i person2 ID - vennligst gå tilbake og korriger";
> 		$text['notintree'] = ": personen med denne ID'en finnes ikke i valgt database.";
> 		$text['sameperson'] = "Samme person er valgt to ganger.";;
> 		$text['nopaths'] = "Disse personene har ingen forbindelse.";
> 		$text['nopaths1'] = "Ingen flere forbindelser kortere enn xxx";
> 		$text['nopaths2'] = "i xxx søkesteg";
> 		$text['longestpath'] = "(lengste sti sjekket så langt var xxx steg lang)";
> 		$text['relevantpaths'] = "Antall forskjellige relevante stier funnet: xxx";
> 		$text['skipMarr'] = "(i tillegg, antall stier funnet men ikke vist på grunn av antall ekteskap/partnerskap var: xxx)";
> 		$text['mjaor'] = "eller";
> 		$text['connectionsto'] = "Forbindelse(r) til ";
> 		$text['findanotherpers'] = "Finn en annen person...";
> 		$text['sometimes'] = "(Enkelte ganger vil søk med forskjellig antall generasjoner gi forskjellige resultat.)";
> 		$text['anotherpath'] = "Finn slektskap og andre forbindelser";
> 		$text['xpath'] = "Sti ";
> 		$text['primary'] = "Startperson"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "MÃ¥lperson";
> 		$text['parent'] = "Forelder";
> 		$text['mhfather'] = "hans far";
> 		$text['mhmother'] = "hans mor";
> 		$text['mhhusband'] = "hans ektemann/partner";
> 		$text['mhwife'] = "hans kone/partner";
> 		$text['mhson'] = "hans sønn";
> 		$text['mhdaughter'] = "hans datter";
> 		$text['fhfather'] = "hennes far";
> 		$text['fhmother'] = "hennes mor";
> 		$text['fhhusband'] = "hennes ektemann/partner";
> 		$text['fhwife'] = "hennes kone/partner";
> 		$text['fhson'] = "hennes sønn";
> 		$text['fhdaughter'] = "hennes datter";
> 		$text['hfather'] = "far";
> 		$text['hmother'] = "mor";
> 		$text['hhusband'] = "ektemann/partner";
> 		$text['hwife'] = "kone/partner";
> 		$text['hson'] = "sønn";
> 		$text['hdaughter'] = "datter";
> 		$text['maxruns'] = "Maks antall stier som skal sjekkes";
> 		$text['maxrshort'] = "Maks antall stier";
> 		$text['maxlength'] = "Forbindelsesstier ikke lengre enn";
> 		$text['maxlshort'] = "Maks sti-lengde";
> 		$text['xstep'] = "steg";
> 		$text['xsteps'] = "steg";
> 		$text['xmarriages'] = "inklusiv xxx ekteskap/partnerskap";
> 		$text['xmarriage'] = "inklusiv 1 ekteskap/partnerskap";
> 		$text['showspouses'] = "Vis begge ektefeller/partnere";
> 		$text['showTxt'] = "Vis forbindelse(r) som tekst";
> 		$text['showTxtshort'] = "Tekst for sti(er)";
> 		$text['compactBox'] = "Vis kompakte personbokser";
> 		$text['compactBoxshort'] = "Kompakte bokser";
> 		$text['paths'] = "Stier";
> 		$text['dospouses2'] = "Vis ektefeller/partnere";
> 		$text['maxmopt'] = "Maks antall ekteskap/partnerskap i forbindelsen";
> 		$text['maxm'] = "Maks antall ekteskap/partnerskap";
> 		$text['arerelated'] = "Disse personene er beslektet - deres slektskap vises i Sti 1";
> 		$text['simplerel'] = "Finn direkte slektskap";
196d264
< 		$text['scrollnote'] = "NB: Du må kanskje bla ned for å se hele treet.";
199d266
< 		$text['popupnote2'] = " = Nytt anetre";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabeller";
> 		$text['dtchildren'] = "Barn";
> 		$text['dtgrandchildren'] = "Barnebarn";
> 		$text['dtggrandchildren'] = "Oldebarn";
> 		$text['dtgggrandchildren'] = "Tippoldebarn"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "1"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Ingen etterkommere";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totalt";
> 		$text['dtselect'] = "Velg";
> 		$text['dteachfulltable'] = "Hver fulle tabell vil ha";
> 		$text['dtrows'] = "rader";
> 		$text['dtdisplayingtable'] = "Viser tabell";
> 		$text['dtgototable'] = "GÃ¥ til tabell:";
> 		$text['fcinstrdn'] = "Vis familie med ektefelle/partner";
> 		$text['fcinstrup'] = "Vis familie med foreldre";
> 		$text['fcinstrplus'] = "Velg andre ektefeller/partnere";
> 		$text['fcinstrfam'] = "Velg andre foreldre";
337c423
< 		$text['otherevents'] = "Andre hendelser";
---
> 		$text['otherevents'] = "Andre Hendelser og Egenskaper";
381,383c467
< 		$text['firstpage'] = "Første side";
< 		$text['lastpage'] = "Siste side";
< 		$text['photoowner'] = "Eier/kilde";
---
> 		$text['photoowner'] = "Eier av original/Kilde";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Bildemerker av/på";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Nytt passord en gang til";
> 		$text['resetsuccess'] = "Vellykket: Passordet har blitt tilbakestilt";
> 		$text['resetfail'] = "Feil: Passordet ikke tilbakestilt";
> 		$text['failreason0'] = " (ukjent databasefeil)";
> 		$text['failreason2'] = " (du har ikke tillatelse til å endre ditt passord)";
> 		$text['failreason3'] = " (passordene stemte ikke)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Antall kildehenvisninger";
595c688
< 		$text['browseallnotes'] = "Søk i alle notater";
---
> 		$text['browseallnotes'] = "Bla gjennom alle notater";
618d710
< 		$text['loginfirst'] = "Du må først logge på.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Eksisterende brukerposter er blitt oppdaget. For å fortsette, må du først logge på eller fjerne alle poster fra brukertabellen.";
629,630d722
< 		$text['zoomin'] = "Zoom inn";
< 		$text['zoomout'] = "Zoom ut";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Sammenlign valgte mtDNA tester";
> 		$text['dnatestscompare_atdna'] = "Sammenlign valgte atDNA tester";
> 		$text['chromosome'] = "Kromosom";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNP'er";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Ekstra mutasjoner";
> 		$text['mrca'] = "Yngste felles ane";
> 		$text['ydna_test'] = "Y-DNA tester";
> 		$text['mtdna_test'] = "mtDNA (Mitokondrial) tester";
> 		$text['atdna_test'] = "atDNA (autosomal) tester";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "Slutt";
> 		$text['suggested_relationship'] = "Foreslått";
> 		$text['actual_relationship'] = "Faktisk";
> 		$text['12markers'] = "Markører 1-12";
> 		$text['25markers'] = "Markører 13-25";
> 		$text['37markers'] = "Markører 26-37";
> 		$text['67markers'] = "Markører 38-67";
> 		$text['111markers'] = "Markører 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Minst to tester må velges for å sammenligne.";
670,671d785
< $text['birthabbr'] = "f.";
< $text['chrabbr'] = "dp.";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
706d817
< $text['burialabbr'] = "gravl.";  //from descend
712d822
< $text['place'] = "Sted";
715d824
< $text['marrabbr'] = "g.";
738d846
< $text['source'] = "Kilde";
766d873
< $text['repository'] = "Arkiv";
770d876
< $text['findplaces'] = "Finn alle personer med hendelser på dette stedet";
804d909
< $text['glang'] = "&amp;hl=no";
816d920
< $text['none'] = "Ingen";
924d1027
< $text['otherevents'] = "Andre hendelser";
952,953d1054
< $text['people_have'] = "personer har linket en DNA test til";
< $text['person_has'] = "person har linket en DNA test til";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tester er linket til";
> $text['testislinked'] = "DNA test er linket til";
> 
> //added in 12.2
> $text['quicklinks'] = "Hurtigkoblinger";
> $text['yourname'] = "Ditt navn";
> $text['youremail'] = "Din e-postadresse";
> $text['liketoadd'] = "All informasjon du vil legge til";
> $text['webmastermsg'] = "Webmaster melding";
> $text['gallery'] = "Se galleri";
> $text['wasborn_male'] = "ble født";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "ble født"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "ble døpt";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "ble døpt";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "døde";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "døde";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "ble begravet"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "ble begravet"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "ble kremert";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "ble kremert";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "giftet seg med";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "giftet seg med";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "ble skilt";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "ble skilt";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = ", ";			// used as a preposition to the location
> $text['onthisdate'] = " ";		// when used with full date
> $text['inthisyear'] = " ";		// when used with year only or month / year dates
> $text['and'] = "og ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Besøkende";
> 
> $text['popupnote2'] = " = Nytt anetre";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom inn";
> $text['zoomout'] = "Zoom ut";
> $text['scrollnote'] = "NB: Du må kanskje dra eller bla ned for å se hele treet.";
> $text['general'] = "Generelt";
> 
> //changed in 14.0
> $text['otherevents'] = "Andre Hendelser og Egenskaper";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Forbindelser";
> $text['continue'] = "Fortsett";
> $text['title2'] = "Tittel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
Only in TNG1403/languages: Polish
diff -r TNG/languages/Polish-UTF8/admintext.php TNG1403/languages/Polish-UTF8/admintext.php
21c21
< 		$admtext['enterstartingind'] = "Podaj ID osoby rozpoczynajÄ…cej.";
---
> 		$admtext['enterstartingind'] = "Podaj ID osoby poczÄ…tkowej.";
39,40c39,42
< 		$admtext['branchdiscl'] = "Ta cyfra reprezentuje liczbę sumaryczną wiązań gałęzi, niekoniecznie liczbę osób albo rodzin aktualnie powiązanych z tą  gałęzią. Jeśli ostatnio importowałeś Twoje dane, możesz potrzebować zmiany etykiet Twoich gałęzi.";
< 		$admtext['inclspouses'] = "�ącznie ze współmałżonkami wszystkich potomków";
---
> 		$admtext['branchdiscl'] = "Ta wartość reprezentuje sumaryczną liczbę łączy gałęzi,
> niekoniecznie liczbę osób albo rodzin faktycznie powiązanych z tą gałęzią.
> Jeśli ostatnio importowałeś Twoje dane, może być konieczne odświeżenie etykiet gałęzi.";
> 		$admtext['inclspouses'] = "�ącznie z małżonkami wszystkich potomków";
44c46
< 		
---
> 
66,68c68,74
< 		$admtext['mapfilenamefolder'] = "Nazwa pliku cmentarza<br/>w folderze Cmentarze";
< 		$admtext['ifmapuploaded'] = "Jeśli ten plik znajduje się już w folderze cmentarze, pozostaw to pole wolne.";
< 		$admtext['requiredmap'] = "Wymagane jeśli używasz mapy.<br/> Powinno odpowiadać nazwie i lokalizacji Twojego pliku w folderze <em><font color=\"#0000ff\" size=\"2\"> nagrobków </font></em>, jeśli plik  jest załadowany. <br/>Na przykład: jeśli Twój folder nagrobków nazwany jest <em><font color=\"#0000ff\" size=\"2\">nagrobki</font> </em> i chcesz, by Twój plik został nazwany <b><em><font color=\"#ff00ff\" size=\"2\"> mapa.jpg</font> </em></b> <br/>i miał zostać wprowadzony do podfoldera <font color=\"#0000ff\" size=\"2\">nagrobków</font> nazwanego <em><font color=\"#ff00ff\" size=\"2\"> <b>mymaps</b></font></em>,<br/> wpisz w tym polu <b><em><font color=\"#ff00ff\" size=\"2\"> mymaps/mapa.jpg</font> </em></b>.";
---
> 		$admtext['mapfilenamefolder'] = "Nazwa pliku cmentarza<br/>w folderze Nagrobki";
> 		$admtext['ifmapuploaded'] = "Jeśli ten plik znajduje się już w folderze Nagrobki, pozostaw to pole wolne.";
> 		$admtext['requiredmap'] = "Wymagane jeśli używasz mapy.<br/> Powinno odpowiadać nazwie i lokalizacji pliku w folderze <em>Nagrobków</em>, jeśli plik jest załadowany.
> <br/>Na przykład: jeśli folder nagrobków nazwany jest <em>Nagrobki</em> i chcesz by plik
> został nazwany <em>mapa.jpg</em>
> <br/>i został wprowadzony do podfoldera nagrobków nazwanego <em>mymaps</em>,
> <br/> wpisz w tym polu <em>mymaps/mapa.jpg</em>.";
72c78
< 		$admtext['usecemcoords'] = "Skopiuj informację Geokodu do miejsca powyżej";
---
> 		$admtext['usecemcoords'] = "Skopiuj informację Geokodu do Miejsca powyżej";
74c80
< 	
---
> 
80,81c86
< 		$admtext['pleaseenter'] = "Podaj ";
< 		$admtext['netscapereload'] = "Użytkownicy Netscape : <br/>musisz załadować stronę cmentarze na nowo";
---
> 		$admtext['netscapereload'] = "Użytkownicy Netscape : <br/>musisz załadować stronę Cmentarze na nowo";
86,90c91,95
< 		$admtext['deletingnote'] = "DUsuwanie notatki...";
< 		$admtext['addingnote'] = "Dodawanie notatki...";
< 		$admtext['addnewnote'] = "Dodaj nowÄ… notatkÄ™";
< 		$admtext['note'] = "Notatka";
< 		$admtext['modifynote'] = "Modyfikacja notatki";
---
> 		$admtext['deletingnote'] = "Usuwanie przypisu...";
> 		$admtext['addingnote'] = "Dodawanie przypisu...";
> 		$admtext['addnewnote'] = "Dodaj nowy przypis";
> 		$admtext['note'] = "Przypis";
> 		$admtext['modifynote'] = "Modyfikacja przypisu";
92c97
< 		$admtext['notechanges'] = "Zmiany w notatkach";
---
> 		$admtext['notechanges'] = "Zmiany w przypisach";
109c114
< 		$admtext['dupfor'] = "Duplikat dla";
---
> 		$admtext['dupfor'] = "Zduplikuj dla";
114c119
< 		$admtext['importinggedcom'] = "Import GEDCOM-u...<br/>(może potrwać kilka minut)";
---
> 		$admtext['importinggedcom'] = "Import GEDCOM...<br/>(może potrwać nawet kilka minut)";
120c125
< 		$admtext['finishedimporting'] = "Import GEDCOM-u zakończony";
---
> 		$admtext['finishedimporting'] = "Import GEDCOM zakończony";
124c129
< 		$admtext['removeged'] = "Usuń GEDCOM plik (opcjonalne)";
---
> 		$admtext['removeged'] = "Usuń plik GEDCOM (opcjonalne)";
126,128c131,170
< 		$admtext['invfperms'] = "Twój 'gedcom' folder może nie ma wystarczającego pozwolenia (próbuj 755 albo 777).";
< 		$admtext['maybedone'] = "Może zostało zakończone.";
< 		$admtext['turnonsis'] = "Bądź pewien 'Save Import State' jest włączony w ustawieniu importu.";
---
> 		$admtext['invfperms'] = "Twój folder \"gedcom\" może nie mieć wystarczających uprawnień (próbuj 755 albo 777).";
> 		$admtext['maybedone'] = "Być może zakończono.";
> 		$admtext['turnonsis'] = "Upewnij się, że opcja 'Zapisz stan importu' jest włączona w ustawieniu importu.";
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Wybierz plik do importu.";
> 		$admtext['addreplacedata'] = "Dopisywanie lub nadpisywanie danych (zależnie od wielkości pliku może potrwać nawet kilka minut!)";
> 		$admtext['fromyourcomputer'] = "Z Twojego komputera";
> 		$admtext['importdata'] = "Import danych";
> 		$admtext['replace'] = "Nadpisz w wybranym drzewie";
> 		$admtext['desttree'] = "Do drzewa";
> 		$admtext['selectdesttree'] = "Wybierz lub wprowadź nazwę drzewa.";
> 		$admtext['selectexisting'] = "Importuj do";
> 		$admtext['ucaselast'] = "Wszystkie nazwiska dużymi literami";
> 		$admtext['norecalc'] = "Nie obliczaj od nowa wskaźnika \"Żyjący\"";
> 		$admtext['autooffset'] = "Prydzielaj IDs od pierwszych dostępnych numerów";
> 		$admtext['mustselecttree'] = "Zanim wybierzesz tę opcję, musisz wskazać drzewo.";
> 		$admtext['onwebserver'] = "z foldera gedcom";
> 		$admtext['imphints'] = "Wskazówki: <q>Wszystkie dane</q> oznacza wszystkie osoby, rodziny, źródła i przypisy
> (łącza do mediów nie zginą póki ich ID pozostają bez zmian). <q>Pasujący zapis</q> oznacza zgodność ID; dopisywane są wówczas tylko nowe informacje.
> <q>Dołączanie</q> importuje wszystkie dane nadając nowe IDs.";
> 		$admtext['destbranch'] = "Gałąź docelowa (opcjonalnie)";
> 		$admtext['importlatlong'] = "Import szerokości/długości geogr., jeśli podana";
> 		$admtext['opening'] = "Otwarcie";
> 		$admtext['reopen'] = "Powtórne otwarcie";
> 		$admtext['uploading'] = "Wysyłanie";
> 		$admtext['stop'] = "Zatrzymaj";
> 		$admtext['stopped'] = "Import zatrzymany";
> 		$admtext['resume'] = "powtórz";
> 		$admtext['neweronly'] = "Zastępuj tylko starsze dane nowszymi";
> 		$admtext['oldimport'] = "Import w starym stylu (bez paska postępu)";
> 		$admtext['importgedcom'] = "Import pliku GEDCOM (może być skompresowany w <b>ZIP</b>)";
> 		$admtext['stopbackup'] = "UWAGA! Warto zrobić kopię zapasową bieżących danych przed kontynuowaniem.";
> 		$admtext['importmedia'] = "Importuj media (dane o nich, nie pliki)";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Upewnij się, czy Prefiksy i Sufiksy identyfikatorów (zdefiniowane w Ustawieniach głównych) są zgodne z używanymi w tym pliku.";
> 		$admtext['chkimpsettings'] = "Sprawdź dodatkowe opcje w Ustawieniach importu.";
> 		$admtext['eventsonly'] = " Import wyłącznie definicji niestandardowych wydarzeń (zdefiniowanych przez użytkownika)";
> 		$admtext['allevents'] = "Akceptuj dane dla wszystkich niestandardowych wydarzeń";
> 		$admtext['finishingimporting'] = "Kończenie importu...";
> 		$admtext['fileuploadfailed'] = "�adowanie pliku nieudane. Być może plik jest zbyt duży. Spróbuj użyć FTP do załadowania pliku do twojego katalogu GEDCOM, a następnie wskaż go i wykonaj import stamtąd.";
129a172
> 
132,133c175
< 		$admtext['changestoevtype'] = "Zmiany rodzaju wydarzenia";
< 		$admtext['modifyeventtype'] = "Modyfikacja istniejących rodzajów wydarzeń";
---
> 		$admtext['changestoevtype'] = "Modyfikowanie Typu wydarzenia";
135,140c177,178
< 		$admtext['entertypedesc'] = "Podaj rodzaj/opis dla nowego rodzaju wydarzenia.";
< 		$admtext['enterdisplay'] = "Podaj krótki opis rodzaju wydarzenia.";
< 		$admtext['existingeventtypeinfo'] = "Info o istniejących rodzajach wydarzeń";
< 		$admtext['neweventtypeinfo'] = "Info o nowych rodzajach wydarzeń";
< 		$admtext['tag'] = "Oznakowanie";
< 		$admtext['typedescription'] = "Rodzaj/Opis";
---
> 		$admtext['tag'] = "Etykieta";
> 		$admtext['typedescription'] = "Typ/Opis";
144,146c182
< 		$admtext['typerequired'] = "W wydarzeniach zdefiniowanych przez użytkownika(oznakowanych = \"EVEN\"), jest to TYP i dlatego jest wymagane. Opcjonalnie  dla wszystkich innych oznakowań.";
< 		$admtext['addnewevtype'] = "Dodaj nowy rodzaj wydarzenia";
< 		$admtext['createnewevtype'] = "Twórz rekord nowego wydarzenia";
---
> 		$admtext['typerequired'] = "W wydarzeniach zdefiniowanych przez użytkownika o etykiecie EVEN dodanie Typu jest obowiązkowe. Dla innych wydarzeń jest opcjonalne.";
149,150d184
< 		$admtext['existingevtypes'] = "Istniejące rodzaje wydarzeń";
< 		$admtext['edsevtypes'] = "Edytuj, usuń, sortuj istniejące rodzaje wydarzeń";
152,154c186
< 		$admtext['confdeleteevtype'] = "Napewno chcesz usunąć ten rodzaj wydarzenia? *";
< 		$admtext['selecttag'] = "Wybierz oznakowanie";
< 		$admtext['selectentertag'] = "Podaj lub wybierz oznakowanie dla tego rodzaju wydarzenia.";
---
> 		$admtext['selecttag'] = "Wybierz etykietÄ™";
156c188
< 		$admtext['ifbothdata'] = "będzie ważne, jeśli obydwa pola będą wypełnione";
---
> 		$admtext['ifbothdata'] = "ta nazwa będzie decydująca, jeśli zostanie podana oprócz etykiety powyżej";
158c190
< 		$admtext['ADOP'] = "Adoptowany/a";
---
> 		$admtext['ADOP'] = "Adopcja";
171,172c203,204
< 		$admtext['FCOM'] = "I Komunia Święta";
< 		$admtext['GRAD'] = "Ukończona szkoła";
---
> 		$admtext['FCOM'] = "Pierwsza komunia";
> 		$admtext['GRAD'] = "Ukończone studia";
179c211
< 		$admtext['NMR'] = "Ilość związków małżeńskich";
---
> 		$admtext['NMR'] = "Liczba związków małżeńskich";
192c224
< 		$admtext['WILL'] = "Wola";
---
> 		$admtext['WILL'] = "Wyrażenie woli";
208,210c240,241
< 		$admtext['changestoallevtypes'] = "Zmiany we wszystkich rodzajach wydarzeń";
< 		$admtext['forrepos'] = "Do archiwum...";
< 		$admtext['noevtypes'] = "Brak rodzajów wydarzeń.";
---
> 		$admtext['forrepos'] = "Do repozytorium...";
> 		$admtext['noevtypes'] = "Brak Typów wydarzeń.";
212c243
< 		$admtext['allnone'] = "Wpisz w okienku hasło dla danego języka,<br />albo zostaw puste i przejdź do okienka powyżej.";
---
> 		$admtext['allnone'] = "Podaj jak wyświetlać w danym języku<br/>albo zostaw puste i wróć do okienka powyżej.";
214,215c245
< 		$admtext['BAPM'] = "Chrzest kościelny";
< 		$admtext['umps'] = "Twój plik GEDCOM może być większy niż pozwala na to Twoja instalacja PHP. Możesz poprosić Twojego operatora o zwiększenie wartości  upload_max_filesize, lub skopiować Twój plik do foldera gedcom na serwerze i importować to stamtąd.";
---
> 		$admtext['umps'] = "Twój plik GEDCOM jest chyba większy, niż pozwalają na to ustawienia PHP. Możesz poprosić Twojego operatora o zwiększenie wartości  upload_max_filesize, lub skopiować plik do foldera gedcom na serwerze i importować go stamtąd.";
220,222c250,252
< 		$admtext['collapseev'] = "Rozwiń wydarzenia";
< 		$admtext['collapse'] = "Rozwiń";
< 		$admtext['collapseselected'] = "Rozwiń wybrane";
---
> 		$admtext['collapseev'] = "Zwiń wydarzenia";
> 		$admtext['collapse'] = "Zwiń";
> 		$admtext['collapseselected'] = "Zwiń wybrane";
226a257,270
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Czy na pewno chcesz usunąć ten rodzaj wydarzenia? Wszystkie użycia takiego wydarzenia zostaną również usunięte.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Dodaj nowy Typ wydarzenia";
> 		$admtext['createnewevtype'] = "Twórz definicję nowego wydarzenia";
> 		$admtext['modifyeventtype'] = "Modyfikacja istniejących rodzajów wydarzeń";
> 		$admtext['entertypedesc'] = "Podaj Typ/opis dla nowego rodzaju wydarzenia.";
> 		$admtext['enterdisplay'] = "Podaj krótki opis rodzaju wydarzenia.";
> 		$admtext['existingeventtypeinfo'] = "Informacja o istniejących rodzajach wydarzeń";
> 		$admtext['neweventtypeinfo'] = "Nowe rodzaje wydarzeń";
> 		$admtext['existingevtypes'] = "Istniejące rodzaje wydarzeń";
> 		$admtext['edsevtypes'] = "Edytuj, usuń, sortuj istniejące definicje wydarzeń";
> 		$admtext['selectentertag'] = "Wybierz lub Wprowadź etykietę (tag) tego wydarzenia.";
> 		$admtext['changestoallevtypes'] = "Zmiany dla wszystkich rodzajów wydarzeń";
235,236c279,280
< 		$admtext['confdeletefam'] = "Napewno chcesz usunąć tę rodzinę?";
< 		$admtext['existingfamilyinfo'] = "Informacje o istniejacej rodzinie";
---
> 		$admtext['confdeletefam'] = "Czy na pewno chcesz usunąć tę rodzinę?";
> 		$admtext['existingfamilyinfo'] = "Informacje o istniejÄ…cej rodzinie";
243c287
< 		$admtext['editexistingfaminfo'] = "Edytuj info o wczesniej umieszczonej rodzinie";
---
> 		$admtext['editexistingfaminfo'] = "Edytuj info o wcześniej umieszczonej rodzinie";
247,250c291,294
< 		$admtext['prefixfamilyid'] = "Podaj przedrostek ID rodziny jako \"F\" dla \"Rodzina\"";
< 		$admtext['validfamilyid'] = "Podaj ważny ID rodziny. Ważny ID jest ciągiem cyfr poprzedzonych przedrostkiem 'F'.";
< 		$admtext['familyidbefnote'] = "Musisz podać ID Rodziny zanim dodasz nową notatkę.";
< 		$admtext['familyidbefcite'] = "Zanim wpiszesz nowy cytat musisz podać ID rodziny.";
---
> 		$admtext['prefixfamilyid'] = "Podaj prefiks ID rodziny jako \"F\" dla \"Rodzina\"";
> 		$admtext['validfamilyid'] = "Podaj ważny ID rodziny. Ważny ID jest ciągiem cyfr poprzedzonych prefiksem 'F'.";
> 		$admtext['familyidbefnote'] = "Musisz podać ID Rodziny zanim dodasz nowy przypis.";
> 		$admtext['familyidbefcite'] = "Zanim utworzysz nowy odnośnik, musisz podać ID rodziny.";
252c296
< 		$admtext['marriagetype'] = "Rodzaj zwiÄ…zku";
---
> 		$admtext['marriagetype'] = "Typ zwiÄ…zku";
254c298
< 		$admtext['fevslater'] = "Uwaga: Dodatkowe wydarzenia, notatki i cytaty mogą zostać dodane dopiero po zapisaniu nowej rodziny.";
---
> 		$admtext['fevslater'] = "Uwaga: Dodatkowe wydarzenia, przypisy i odnośniki mogą zostać dodane dopiero po zapisaniu nowej rodziny.";
257c301
< 		$admtext['enternamepart'] = "Wpisz część nazwiska i / lub imienia";
---
> 		$admtext['enternamepart'] = "Wpisuj nazwisko i/lub imiÄ™...";
268d311
< 		$admtext['nobirthinfo'] = "Brak informacji o urodzeniu";
272c315
< 		$admtext['firstgivennames'] = "ImiÄ™(imiona)";
---
> 		$admtext['firstgivennames'] = "ImiÄ™ (Imiona)";
283,284c326,327
< 		$admtext['unlinkindividual'] = "Usuń łącze tej osoby";
< 		$admtext['aschild'] = "jako dziecko";
---
> 		$admtext['unlinkindividual'] = "Usuń powiązanie tej osoby";
> 		$admtext['aschild'] = "jako dziecka";
287,288c330,331
< 		$admtext['asspouse'] = "jako małżonek/ka";
< 		$admtext['spouse'] = "Współmałżonek";
---
> 		$admtext['asspouse'] = "jako małżonka";
> 		$admtext['spouse'] = "Małżonek";
295c338
< 		$admtext['prefixpersonid'] = "Podaj przedrostek ID osoby jako \"I\" dla \"Osoba\"";
---
> 		$admtext['prefixpersonid'] = "Podaj prefiks ID osoby jako \"I\" dla \"Osoba\"";
301,302c344,345
< 		$admtext['unknown'] = "Nieznany/a";
< 		$admtext['personidbefnote'] = "Zanim dodasz nową notatkę musisz podać ID osoby.";
---
> 		$admtext['unknown'] = "Nieznane";
> 		$admtext['personidbefnote'] = "Zanim dodasz nowy przypis musisz podać ID osoby.";
304,306c347,349
< 		$admtext['personidbefcite'] = "Zanim skorzystasz z cytatu dot. osoby musisz podać jej ID.";
< 		$admtext['relationship'] = "Wzajemny stosunek";
< 		$admtext['asspouse'] = "jako małżonek/ka";
---
> 		$admtext['personidbefcite'] = "Przed użyciem odnośnika dot. osoby musisz podać jej ID.";
> 		$admtext['relationship'] = "Typ relacji";
> 		$admtext['asspouse'] = "jako małżonka";
311c354
< 		$admtext['combinenotes'] = "Wspólne notatki &amp; cytaty";
---
> 		$admtext['combinenotes'] = "Wspólne przypisy i odnośniki";
316,324c359,367
< 		$admtext['nokids'] = "Bez dzieci";
< 		$admtext['noparents'] = "Bez rodziców";
< 		$admtext['association'] = "ZwiÄ…zek";
< 		$admtext['deletingassoc'] = "Usuwanie zwiÄ…zku...";
< 		$admtext['addingassoc'] = "Dodawanie zwiÄ…zku...";
< 		$admtext['updatingassoc'] = "Zaktualizacja zwiÄ…zku...";
< 		$admtext['addnewassoc'] = "Dodaj nowy zwiÄ…zek";
< 		$admtext['modifyassoc'] = "Modyfikuj istniejÄ…ce zwiÄ…zki";
< 		$admtext['pevslater'] = "Uwaga: dodatkowe wydarzenia oraz dotyczące wydarzeń notatki i cytaty mogą zostać dodane dopiero po zapisaniu nowej osoby.";
---
> 		$admtext['nokids'] = "Brak dzieci";
> 		$admtext['noparents'] = "Brak rodziców";
> 		$admtext['association'] = "Asocjacja";
> 		$admtext['deletingassoc'] = "Usuwanie asocjacji...";
> 		$admtext['addingassoc'] = "Dodawanie asocjacji...";
> 		$admtext['updatingassoc'] = "Aktualizacja asocjacji...";
> 		$admtext['addnewassoc'] = "Dodaj nowÄ… asocjacjÄ™";
> 		$admtext['modifyassoc'] = "Modyfikuj istniejÄ…ce asocjacje";
> 		$admtext['pevslater'] = "Uwaga: dodatkowe wydarzenia oraz dotyczące wydarzeń przypisy i odnośniki mogą zostać dodane dopiero po zapisaniu nowej osoby.";
327,330c370,373
< 		$admtext['pevslater2'] = "Uwaga: Dodatkowe wydarzenia jak również notatki i cytaty dotyczące wydarzeń mogą zostać później dodane.";
< 		$admtext['nospouse'] = "Brak współmałżonka";
< 		$admtext['revassoc'] = "Utwórz dodatkowo odwrócone łącze dla tych dwóch osób";
< 		$admtext['prefix'] = "Przedrostek";
---
> 		$admtext['pevslater2'] = "Uwaga: Dodatkowe wydarzenia jak również przypisy i odnośniki dotyczące wydarzeń mogą zostać później dodane.";
> 		$admtext['nospouse'] = "Brak małżonka";
> 		$admtext['revassoc'] = "Utwórz dodatkowo odwrotną asocjację pomiędzy tymi osobami";
> 		$admtext['prefix'] = "Prefiks";
332,333d374
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Wybierz<br/>domyślne<br/>zdjęcie"; //has to fit in a small box
338a380,384
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Zapisz z nowymi rodzicami";
> 		$admtext['savenewspouse'] = "Zapisz z nowym małżonkiem";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt.Urodz.";
343c389
< 		//$admtext['photonotcopied'] = "The photo file could not be copied to";
---
> 		//$admtext['photonotcopied'] = "Nie można skopiować zdjęcia do";
351c397
< 		$admtext['confdeletephoto'] = "Na pewno chcesz usuną zdjęcie wraz ze wszystkimi linkami?";
---
> 		$admtext['confdeletephoto'] = "Czy na pewno chcesz usunąć zdjęcie wraz ze wszystkimi linkami?";
354,355c400
< 		$admtext['enterphotodesc'] = "Podaj opis dla tego zdjęcia.";
< 		$admtext['existingphotoinfo'] = "Informacje o obecnym zdjęciu";
---
> 		$admtext['existingphotoinfo'] = "Informacje o zdjęciu";
359,361c404,406
< 		$admtext['fileandpath'] = "Nazwa zdjęcia i ścieżki";
< 		$admtext['sortphotos'] = "Sortuj zdjęcia";
< 		$admtext['sortphotosfor'] = "Sortuj zdjęcia dla";
---
> 		$admtext['fileandpath'] = "Nazwa pliku i ścieżki zdjęcia";
> 		$admtext['sortphotos'] = "Sortowanie zdjęć";
> 		$admtext['sortphotosfor'] = "Sortowanie zdjęć dla";
381c426,428
< 		$admtext['requiredhs'] = "Wymagane. Musi być zgodne ze ścieżką i nazwą pliku w folderze <em><font color=\"#ff00ff\" size=\"2\">Zdjecia</font></em>. Jeżeli Twój folder zdjęć nazywa się <em><font color=\"#ff00ff\" size=\"2\">Zdjęcia</font></em> a plik <em>mojezdjecie.jpg</em> ma zostac zapisany w folderze podrzędnym nazwanym <em>NoweZdjecia</em>, wpisz w tym polu <em>nowezdjecia/mojezdjecie.jpg</em>.";
---
> 		$admtext['requiredhs'] = "Wymagane. Musi być zgodne ze ścieżką i nazwą pliku w folderze <em>Zdjęcia</em>.
> Jeżeli np. folder zdjęć nazywa się <em>Zdjęcia</em> a plik <em>mojezdjecie.jpg</em> ma zostać zapisany w folderze
> podrzędnym nazwanym <em>NoweZdjecia</em>, wpisz w tym polu <em>NoweZdjecia/mojezdjecie.jpg</em>.";
383c430
< 		$admtext['createnewhs'] = "Zapisz jako nowy nagrobek i utwórż łącze do osoby";
---
> 		$admtext['createnewhs'] = "Zapisz jako nowy nagrobek i utwórz łącze do osoby";
388d434
< 		$admtext['photoowner'] = "Właściciel/źródło";
402,404c448,450
< 		$admtext['sortheadstones'] = "Sortuj nagrobki";
< 		$admtext['sortheadstonesfor'] = "Sortuj nagrobki dla";
< 		$admtext['sortheadstonesind'] = "Sortuj nagrobki dla osoby";
---
> 		$admtext['sortheadstones'] = "Sortowanie nagrobków";
> 		$admtext['sortheadstonesfor'] = "Sortowanie nagrobków dla";
> 		$admtext['sortheadstonesind'] = "Sortowanie nagrobków dla osoby";
409c455
< 		$admtext['numlinkphoto'] = "Liczba osób, rodzin albo żródeł łączonych z tym zdjęciem";
---
> 		$admtext['numlinkphoto'] = "Liczba osób, rodzin albo źródeł powiązanych z tym zdjęciem";
417,418c463
< 		$admtext['imgmap'] = "Mapa zdjęcia";
< 		$admtext['circle'] = "KrÄ…g";
---
> 		$admtext['circle'] = "Koło";
422c467
< 		//$admtext['radius'] = "Promień (pixels)";
---
> 		//$admtext['radius'] = "Promień (w pikselach)";
428,430c473,475
< 		//$admtext['convtohs'] = "Convert to Headstones";
< 		//$admtext['convtodoc'] = "Convert to Documents";
< 		//$admtext['convtophoto'] = "Convert to Photos";
---
> 		//$admtext['convtohs'] = "Konwertuj do nagrobków";
> 		//$admtext['convtodoc'] = "Konwertuj do dokumentów";
> 		//$admtext['convtophoto'] = "Konwertuj do zdjęć";
438c483
< 		$admtext['linktocem'] = "�ącz bezpośrednio z wybranym cmentarzem";
---
> 		$admtext['linktocem'] = "Ustaw jako zdjęcie wybranego cmentarza";
441,442c486,487
< 		$admtext['requiredphoto'] = "Wymagane. Musi być zgodne ze ścieżką i nazwą pliku <em>w folderze kolekcji</em>. Jeżeli Twój folder zdjęć nazywa się  <em><font color=\"#0000ff\" size=\"2\">Zdjecia</font></em> a plik <em><font color=\"#ff00ff\" size=\"2\"> <strong>mojezdjecie.jpg</strong></font></em> ma zostac zapisany w folderze podrzednym nazwanym <em><font color=\"#0000ff\" size=\"2\">NoweZdjecia</font></em>, wpisz w tym polu <em><font color=\"#ff00ff\" size=\"2\"> <strong>nowezdjecia/mojezdjecie.jpg</strong></font></em>.";
< 		$admtext['leaveblankphoto'] = "Jeśli ten plik znajduje się już w folderze <em><font color=\"#ff00ff\" size=\"2\">Zdjęcia</font></em>, pozostaw to pole wolne.";
---
> 		$admtext['requiredphoto'] = "Wymagane. Musi być zgodne ze ścieżką i nazwą pliku <em>w folderze kolekcji</em>. Jeżeli Twój folder zdjęć nazywa się  <em>Zdjecia</em> a plik <em>mojezdjecie.jpg</em> ma zostać zapisany w folderze podrzędnym nazwanym <em>NoweZdjecia</em>, wpisz w tym polu <em>NoweZdjecia/mojezdjecie.jpg</em>.";
> 		$admtext['leaveblankphoto'] = "Jeśli ten plik znajduje się już w folderze <em>Zdjęcia</em>, pozostaw to pole wolne.";
444,445c489,490
< 		$admtext['showmap'] = "Pokaż mapę cmentarza i media za każdym razem, kiedy ta pozycja zostanie wybrana";
< 		$admtext['bodytext'] = "<strong>ALBO</strong><br/>Tekst główny";
---
> 		$admtext['showmap'] = "Pokaż mapę cmentarza za każdym razem, kiedy ta pozycja zostanie wybrana";
> 		$admtext['bodytext'] = "<strong>ALBO</strong><br/>Tekst główny<br/>(tylko dla Historii)";
462c507
< 		$admtext['fileext'] = "Format pliku."; //file extension (abbreviation)
---
> 		$admtext['fileext'] = "Rozszerzenie pliku"; //file extension (abbreviation)
467c512
< 		$admtext['usecollect'] = "Folder kolekcji (np., \"Zdjęcia\")";
---
> 		$admtext['usecollect'] = "Folder kolekcji (np. \"Zdjęcia\")";
474,475c519,520
< 		$admtext['sortmediaind'] = "Sortuj media dla osoby, rodziny, źródła, dokumenty lub miejsca";
< 		$admtext['sortmedia'] = "Sortuj xxx dla";
---
> 		$admtext['sortmediaind'] = "Sortowanie media dla osoby, rodziny, źródła, dokumenty lub miejsca";
> 		$admtext['sortmedia'] = "Sortowanie xxx dla";
479,482c524,527
< 		$admtext['forcircles'] = "Dla kręgu";
< 		$admtext['forrects'] = "Dla prostokÄ…tu";
< 		$admtext['circleinstr'] = "Pierwsze kliknięcie na środek kręgu, drugie kliknięcie na dowolny punkt na obwodzie.";
< 		$admtext['rectinstr'] = "Pierwsze kliknięcie-lewy dolny róg prostokąta, drugie-prawy górny róg.";
---
> 		$admtext['forcircles'] = "Dla koła";
> 		$admtext['forrects'] = "Dla prostokÄ…ta";
> 		$admtext['circleinstr'] = "Pierwsze kliknięcie na środek koła, drugie kliknięcie na dowolny punkt na obwodzie.";
> 		$admtext['rectinstr'] = "Pierwsze kliknięcie - lewy górny róg prostokąta, drugie - prawy dolny róg.";
484c529
< 		$admtext['controller'] = "Wyznacz około 16 pionowych pikseli dla kontrolera odtwarzacza mediów.";
---
> 		$admtext['controller'] = "Pozostaw około 16 pionowych pikseli dla kontrolera odtwarzacza mediów.";
490,491c535
< 		$admtext['mapinstr3'] = "Aby utworzyć łącze określonego obszaru (np.twarzy) zdjęcia do konkretnej osoby, wybierz drzewo tej osoby oraz kształt i rozmiar  obszaru i kliknij na środek obszaru na zdjęciu. Okienko popup pomoże Ci wybrać osobę. Po wybraniu osoby w powyższym polu zostanie automatycznie utworzony kod odpowiadający łączu. Dla kolejnych regionów należy ten proces powtórzyć.";
< 		$admtext['albumlinks'] = "Linki do albumów";
---
> 		$admtext['albumlinks'] = "�ącza do albumów";
495,496c539
< 		$admtext['removelink'] = "Usuń link";
< 		$admtext['confremmedia'] = "Jesteś pewny, że chcesz usunąć to medium z tego albumu?";
---
> 		$admtext['confremmedia'] = "Czy na pewno usunąć to medium z albumu?";
502d544
< 		$admtext['eloptions'] = "Szukaj lub usuń";
509d550
< 		$admtext['nolinks'] = "Nie zawiera jeszcze żadnych łączy";
513c554
< 		$admtext['uplsel'] = "Załaduj plik z Twojego komputera lub wybierz istniejący z Twojej strony.<b><br/><U>UWAGA!</U> <br/><font color=\"#800000\" size=\"3\">W  nazwie pliku mediów <U>nie może być przerw między wyrazami, przecinków, kropek ani polskich znaków</U>.<br/>Na przykład zamiast: Władysław.Józef,Jagiełło.jpg  należy napisać <b><font color=\"red\" size=\"3\">Jagiello_Wladyslaw_Jozef.jpg</font></b><br/>Format pliku ma być:<br/>Rezolucja=<font color=\"red\">max. 92  dots/inch</font><br/>Wysokość zdjęcia=<font color=\"red\">max. 500 pixels</font><br/>Szerokość zdjęcia=<font color=\"red\">max. 750 pixels</font><br/><U>Pliki  których nazwa lub format nie spełniają wymagań będą usunięte.</U></font><br/></b>";
---
> 		$admtext['uplsel'] = "Załaduj plik z komputera lub wybierz istniejący z serwera.<b>UWAGA!</b> W  nazwie pliku mediów <U>nie może być spacji, przecinków, kropek ani polskich znaków</U>.";
523c564
< 		$admtext['colldisplay'] = "Tytuł wyświetlenia";
---
> 		$admtext['colldisplay'] = "Tytuł kolekcji";
528c569
< 		$admtext['entercolldisplay'] = "Podaj nazwÄ™ kolekcji do widoku.";
---
> 		$admtext['entercolldisplay'] = "Podaj nazwę kolekcji (do wyświetlania).";
532,533c573,574
< 		$admtext['confmtdelete'] = "Jesteś pewny, że chcesz usunąć ten rodzaj medium?";
< 		$admtext['histlimit'] = "<font color=\"#ff0000\"><strong>Uwaga:</strong></font> <br/>Większość wyszukiwarek ogranicza ilość danych przesyłanych przy pomocy formularzy w internecie do 64 kB.  <br/>Jeśli chcesz w pole przeznaczone dla tekstu zasadniczego wpisać lub wprowadzić z pamięci podręcznej obszerny tekst, powinieneś wziąć pod uwagę skorzystanie z  <font color=\"#ff00ff\" size=\"2\"><b>historytemplate.php</b></font>. <br/>Dalsze informacje na ten temat w pomocy online.";
---
> 		$admtext['confmtdelete'] = "Czy jesteś pewien, że chcesz usunąć ten rodzaj mediów?";
> 		$admtext['histlimit'] = "<b>Uwaga:</b>Większość przeglądarek ogranicza ilość danych przesyłanych poprzez formularze do 64 kB. Jeśli chcesz w pole przeznaczone dla tekstu zasadniczego wpisać lub wprowadzić z pamięci podręcznej obszerniejszy tekst, rozważ skorzystanie z <b>historytemplate.php</b> Dalsze informacje na ten temat znajdziesz w pomocy online.";
535c576
< 		$admtext['sortalbumind'] = "Sortuj albumy osób, rodzin, źródeł, repozytoriów lub miejsc";
---
> 		$admtext['sortalbumind'] = "Sortowanie albumów osób, rodzin, źródeł, repozytoriów lub miejsc";
538d578
< 		//added in 8.0.0
542d581
< 		//added in 9.0.0
544,545c583
< 		//added in 9.2.0
< 		$admtext['upload'] = "Wyślij";
---
> 		$admtext['upload'] = "Załaduj";
547c585
< 		$admtext['mediaupl'] = "Wyślij Media";
---
> 		$admtext['mediaupl'] = "Załaduj media";
552d589
< 		//added in 11.0.0
555a593,605
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Mapa zdjęcia HTML (dla kompatybilności wstecznej)";
> 		$admtext['photoowner'] = "Właściciel oryginału";
> 		$admtext['nothumb'] = "Brak miniatury";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Obiekt nie może być dodany; prawdopodobnie plik jest zbyt duży i nie mógł być załadowany lub użyty do utworzenia miniatury.";
> 		$admtext['moved'] = "Przeniesiono";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Wprowadź tytuł lub opis tego zdjęcia.";
> 		$admtext['mapinstr3'] = "Aby połączyć obszar tego zdjęcia z osobą, najpierw wybierz drzewo osoby, a następnie utwórz prostokąt dla żądanego regionu. Można to zrobić klikając w lewym górnym rogu regionu i przeciągając do 
> 		prawego dolnego rogu. Alternatywnie można kliknąć w lewym górnym rogu, a następnie w prawym dolnym rogu. Wyskakujące okienko pomoże ci wybrać osobę. Dokonaj wyboru, i powtórz ten proces w razie potrzeby dla dodatkowych 
> 		regionów. Aby przenieść lub usunąć, kliknij istniejący region, aby go wybrać, a następnie przeciągnij lub kliknij „X�.";
568,570c618,620
< 		$admtext['spouseid'] = "ID współmałżonka";
< 		$admtext['spousename'] = "Nazwisko współmałżonka";
< 		$admtext['lastmodified'] = "Ostatnie modyfikacje";
---
> 		$admtext['spouseid'] = "ID małżonka";
> 		$admtext['spousename'] = "Nazwisko małżonka";
> 		$admtext['lastmodified'] = "Ostatnia modyfikacja";
575,579c625,629
< 		$admtext['ldssealsdate'] = "LDS Data przekazania współmałżonka";
< 		$admtext['ldssealsplace'] = "LDS Miejsce przekazania współmałżonka";
< 		$admtext['ldssealpdate'] = "LDS Data przekazania rodzicom";
< 		$admtext['ldssealpplace'] = "LDS Miejsce przekazania Rodzicom";
< 		//$admtext['makelink'] = "Stwórz link";
---
> 		$admtext['ldssealsdate'] = "LDS data przekazania małżonka";
> 		$admtext['ldssealsplace'] = "LDS miejsce przekazania małżonka";
> 		$admtext['ldssealpdate'] = "LDS data przekazania rodzicom";
> 		$admtext['ldssealpplace'] = "LDS miejsce przekazania rodzicom";
> 		//$admtext['makelink'] = "Utwórz link";
587,589c637,639
< 		$admtext['contains'] = "zawartości";
< 		$admtext['startswith'] = "rozpoczynaj z";
< 		$admtext['endswith'] = "kończ z";
---
> 		$admtext['contains'] = "zawiera";
> 		$admtext['startswith'] = "zaczyna siÄ™ od";
> 		$admtext['endswith'] = "kończy się na";
596d645
< 		$admtext['foremptystring'] = "Dla pustego ciągu znaków pozostaw wolne pole i kliknij \"Dodaj >>.\"";
613,617c662,666
< 		$admtext['marriagedatetr'] = "Data ślubu (dokladna)";
< 		$admtext['ldsbapldatetr'] = "LDS Data chrztu (Rzeczywista)";
< 		$admtext['ldsendldatetr'] = "LDS Data wprowadzenia (Rzeczywista)";
< 		$admtext['ldssealsdatetr'] = "LDS Data przekazania małżonka (Rzeczywista)";
< 		$admtext['ldssealpdatetr'] = "LDS Data przekazania rodzicom (Rzeczywista)";
---
> 		$admtext['marriagedatetr'] = "Data ślubu (dokładna)";
> 		$admtext['ldsbapldatetr'] = "LDS Data chrztu (rzeczywista)";
> 		$admtext['ldsendldatetr'] = "LDS Data wprowadzenia (rzeczywista)";
> 		$admtext['ldssealsdatetr'] = "LDS Data przekazania/małżonka (rzeczywista)";
> 		$admtext['ldssealpdatetr'] = "LDS Data przekazania/rodzicom (rzeczywista)";
621c670
< 		$admtext['altreport'] = "ALBO pozostaw <I><font color=\"red\"> wybierz pola do widoku, wybierz kryteria i kolejność sortowania</font></I> wolne i wejdź tutaj bezpośrednio na SQL WYBRANEJ dyrektywy";
---
> 		$admtext['altreport'] = "ALBO pozostaw<I><font color=\"red\"> Wybierz pola do widoku, wybierz kryteria i kolejność sortowania</font></I> ALBO pozostaw wolne i wejdź bezpośrednio na SQL WYBRANEJ dyrektywy tutaj";
627c676
< 		$admtext['mwtype'] = "Rodzaj";
---
> 		$admtext['mwtype'] = "Typ";
633c682
< 		$admtext['confremmw'] = "Jesteś pewny, że chccesz usunąć ten element?";
---
> 		$admtext['confremmw'] = "Czy na pewno chcesz usunąć ten element?";
635d683
< 		//added in 9.1.1
646a695,698
> 		//added in 14.0
> 		$admtext['instr'] = "Instrukcja: Przeciągaj albo klikaj dwukrotnie obiekty z lewej listy, aby przenieść je do prawej. Przeciągaj w górę lub w dół, aby zmienić kolejność. Kliknij znów dwukrotnie, aby usunąć.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Aby uzyskać pusty napis pozostaw to pole puste i kliknij >>";
651,655d702
< 		$admtext['selectimportfile'] = "Wybierz plik do importu.";
< 		$admtext['importgedcom'] = "Import GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Dodawanie lub nadpisywanie plików genealogicznych (zależnie od wielkości pliku może potrwać kilka minut)";
< 		$admtext['fromyourcomputer'] = "Z Twojego komputera";
< 		$admtext['importdata'] = "Import danych";
657,662c704,705
< 		$admtext['replace'] = "Nadpisz (tylko w wybranym drzewie)";
< 		$admtext['desttree'] = "Dla drzewa";
< 		$admtext['selectdesttree'] = "Podaj nazwÄ™ szukanego drzewa.";
< 		$admtext['selectexisting'] = "Importuj do";
< 		$admtext['importgedcom2'] = "Import, Export pliku GEDCOM";
< 		$admtext['setupitems'] = "Ustawienia, konfiguracje, diagnostyka";
---
> 		$admtext['importgedcom2'] = "Importuj plik GEDCOM";
> 		$admtext['setupitems'] = "Ustawienia, tworzenie tabel";
667,673c710
< 		$admtext['backupitems'] = "Kopie zapasowe, ich odtwarzanie oraz optymalizacja bazy danych tabel";
< 		$admtext['ucaselast'] = "Wszystkie nazwiska dużymi literami";
< 		$admtext['norecalc'] = "Nie obliczaj jeśli zaznaczono jako Żyjący";
< 		$admtext['autooffset'] = "Startuj ID przy pierwszych dostępnych numerach";
< 
< 		$admtext['mustselecttree'] = "Zanim wybierzesz tą opcję, musisz wybrać drzewo.";
< 		$admtext['importmedia'] = "Importuj zawarte media";
---
> 		$admtext['backupitems'] = "Kopia zapasowa, odtwarzanie kopii i optymalizacja tabel bazy danych";
675d711
< 		$admtext['neweronly'] = "Zastąp tylko jeśli nowszy";
677,692d712
< 		$admtext['onwebserver'] = "Z foldera GEDCOM ";
< 		$admtext['eventsonly'] = "Import tylko specyficznych rodzajow wydarzeń (żadne dane nie zostaną wprowadzone, dodane ani nadpisane)";
< 		$admtext['imphints'] = "Wskazówki: <B>Wszystkie dane</B>, tzn. wszyscy ludzie, rodziny, źródła i notatki (połączenia z mediami nie zginą póki ich ID  pozostają bez zmian). <B>Dokładny zapis</B> zawsze bazuje tylko na ID. <B>Dodawane</B> są tylko nowe informacje. <B>Dodawanie</B> importuje wszystkie nowe dane z nowym ID.";
< 		$admtext['allevents'] = "Akceptuj dane dla wszystkich zdefiniowanych przez użytkownika rodzajów wydarzeń";
< 		$admtext['destbranch'] = "Gałąź docelowa (opcjonalnie)";
< 		$admtext['inframe'] = "(w ramce)";
< 		$admtext['getstart'] = "Pierwsze kroki";
< 		$admtext['importlatlong'] = "Import danych szerokości/dlugości, jeśli istnieją";
< 		$admtext['opening'] = "Otwarcie";
< 		$admtext['reopen'] = "Powtórne otwarcie";
< 		$admtext['uploading'] = "Wysyłanie";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import zatrzymany";
< 		$admtext['resume'] = "powtórz";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Modyfikacje";
694,696c714
< 		$admtext['mmgritems'] = "Konfiguracja dodatkowych modułów";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Stary import stylu (bez paska postępu)";
---
> 		$admtext['mmgritems'] = "Konfiguracja Modów";
698c716
< 		$admtext['miscitems'] = "Co nowego, Niewyjaśnione zdarzenia, Weryfikacja danych";
---
> 		$admtext['miscitems'] = "Co nowego, Niewyjaśnione zagadki, Weryfikacja danych";
701c719
< 		$admtext['task_revusers'] = "Oceń nowe rejestracje użytkowników";
---
> 		$admtext['task_revusers'] = "Przegląd nowych rejestracji użytkowników";
705,707c723,725
< 		$admtext['task_families'] = "Dodaj nowe rodziny";
< 		$admtext['task_revind'] = "Ocena proponowanych zmian w poszczególnych zdarzeniach";
< 		$admtext['task_revfam'] = "Ocena proponowanych zmian w rodzinnych zdarzeniach";
---
> 		$admtext['task_families'] = "dodaj nowe rodziny";
> 		$admtext['task_revind'] = "Przegląd sugestii dotyczących osób";
> 		$admtext['task_revfam'] = "PrzeglÄ…d sugestii dotyczÄ…cych rodzin";
711c729
< 		$admtext['dna_blurb'] = "Zaloguj testy DNA i połącz je z osobami";
---
> 		$admtext['dna_blurb'] = "Zarejestruj testy DNA i połącz je z osobami";
713a732,736
> 		//added in 14.0
> 		$admtext['upgrade'] = "Aktualizacja";
> 		$admtext['need_upgrade'] = "Należy wykonać aktualizację";
> 		$admtext['upgrade_missing'] = "Wygląda na to, że brakuje pliku aktualizacji, więc prawdopodobnie została już wykonana.";
> 		$admtext['delete_upgrade'] = "Jeżeli już skończyłeś - kliknij tu, aby usunąć plik aktualizacji i powrócić do menu.";
723d745
< 		$admtext['author'] = "Autor";
730c752
< 		$admtext['newsourceinfo'] = "Informacje o nowym zródle";
---
> 		$admtext['newsourceinfo'] = "Informacje o nowym źródle";
732c754
< 		$admtext['prefixsourceid'] = "Podaj przedrostek źródła ID jako \"S\" dla \"Źródło\"";
---
> 		$admtext['prefixsourceid'] = "Podaj prefiks źródła ID jako \"S\" dla \"Źródło\"";
737c759
< 		$admtext['addnewcite'] = "Dodaj nowe cytaty";
---
> 		$admtext['addnewcite'] = "Dodaj nowe źródła";
740,745c762,767
< 		$admtext['citedate'] = "Data cytatu";
< 		$admtext['modifycite'] = "Modyfikuj istniejÄ…ce cytaty";
< 		$admtext['addingcite'] = "Dodawanie cytatu...";
< 		$admtext['deletingcite'] = "Usuwanie cytatu...";
< 		$admtext['updatingcite'] = "Aktualizacja cytatu...";
< 		$admtext['sevslater'] = "Uwaga: Dodatkowe wydarzenia i notatki mogą zostać dodane dopiero, kiedy nowe źródło zostanie zapisane.";
---
> 		$admtext['citedate'] = "Data źródła";
> 		$admtext['modifycite'] = "Modyfikuj istniejące źródła";
> 		$admtext['addingcite'] = "Dodawanie źródła...";
> 		$admtext['deletingcite'] = "Usuwanie źródła...";
> 		$admtext['updatingcite'] = "Aktualizacja źródła...";
> 		$admtext['sevslater'] = "Uwaga: Dodatkowe wydarzenia i przypisy mogą zostać dodane dopiero, kiedy nowe źródło zostanie zapisane.";
754c776
< 		$admtext['prefixrepoid'] = "Podaj przedrostek ID dokumentu jako \"REPO\" dla \"repozytorium\"";
---
> 		$admtext['prefixrepoid'] = "Podaj prefiks ID dokumentu jako \"REPO\" dla \"repozytorium\"";
756c778
< 		$admtext['confdeleterepo'] = "Na pewno chcesz usunąć z repozytorium?";
---
> 		$admtext['confdeleterepo'] = "Czy na pewno chcesz usunąć repozytorium?";
764,765c786,787
< 		$admtext['revslater'] = "Uwaga. Dodatkowe wydarzenia i notatki mogą zostać dodane dopiero kiedy nowe repozytorium zostanie zapisane.";
< 		$admtext['confdeleterepo'] = "Na pewno chcesz usunąć z repozytorium?";
---
> 		$admtext['revslater'] = "Uwaga. Dodatkowe wydarzenia i przypisy mogą zostać dodane dopiero po zapisaniu nowego repozytorium.";
> 		$admtext['confdeleterepo'] = "Czy na pewno chcesz usunąć repozytorium?";
780,783c802,805
< 		$admtext['mainimage'] = "Główna grafika (strona domowa)"; //1, 2, 3, 4, 5, 7
< 		$admtext['titleimage'] = "Tytuł grafiki (strona domowa)"; //1, 2, 3
< 		$admtext['headline'] = "Nagłówek"; //4, 7
< 		$admtext['mainpara'] = "Ustęp powitalny";  //1, 4, 6, 7, 8
---
> 		$admtext['mainimage'] = "Główna grafika (strona główna)"; //1, 2, 3, 4, 5, 7
> 		$admtext['titleimage'] = "Tytuł grafiki (strona główna)"; //1, 2, 3
> 		$admtext['headline'] = "Tytuł tekstu powitalnego"; //4, 7
> 		$admtext['mainpara'] = "Tekst powitalny";  //1, 4, 6, 7, 8
785,786c807,808
< 		$admtext['pedperson'] = "ID osoby Przodków"; //2
< 		$admtext['pedtree'] = "ID drzewa Przodków"; //2
---
> 		$admtext['pedperson'] = "ID przodka"; //2
> 		$admtext['pedtree'] = "ID drzewa przodka"; //2
791c813
< 		$admtext['titleimg'] = "Grafika tytułu (wszystkie strony)"; //4, 7
---
> 		$admtext['titleimg'] = "Grafika nagłówka"; //4, 7
793,796c815,818
< 		$admtext['fhpara'] = "Ustęp Rodzinnej historii"; //6
< 		$admtext['fhlinkshis'] = "Linki Rodzinnych historii (Jego)"; //6
< 		$admtext['fhlinkshers'] = "Linki Rodzinnych historii (Jej)"; //6
< 		$admtext['mwpara'] = "Ustęp Bardzo poszukiwanych"; //6
---
> 		$admtext['fhpara'] = "Ustęp rodzinnej historii"; //6
> 		$admtext['fhlinkshis'] = "�ącza rodzinnych historii (Jego)"; //6
> 		$admtext['fhlinkshers'] = "�ącza rodzinnych historii (Jej)"; //6
> 		$admtext['mwpara'] = "Ustęp niewyjaśnionych zagadek"; //6
798,801c820,823
< 		$admtext['reslinks'] = "Linki do źródeł"; //6
< 		$admtext['headtitle1'] = "Tytuł nagłówka, część 1"; //8
< 		$admtext['headtitle2'] = "Tytuł nagłówka, część 2"; //8
< 		$admtext['headtitle3'] = "Tytuł nagłówka, część 3"; //8
---
> 		$admtext['reslinks'] = "�ącza do źródeł"; //6
> 		$admtext['headtitle1'] = "Tytuł nagłówka cz. 1"; //8
> 		$admtext['headtitle2'] = "Tytuł nagłówka cz. 2"; //8
> 		$admtext['headtitle3'] = "Tytuł nagłówka cz. 3"; //8
804,809c826,831
< 		$admtext['momside'] = "Matki boczna etykieta"; //8
< 		$admtext['dadside'] = "Ojca boczna etykieta"; //8
< 		$admtext['momperson'] = "Matki boczne osobiste ID"; //8
< 		$admtext['momtree'] = "Mamy boczne drzewa ID"; //8
< 		$admtext['dadperson'] = "Ojca boczne osobiste ID"; //8
< 		$admtext['dadtree'] = "Ojca boczne drzewa ID"; //8
---
> 		$admtext['momside'] = "Matka (opis)"; //8, 20
> 		$admtext['dadside'] = "Ojciec (opis)"; //8, 20
> 		$admtext['momperson'] = "ID matki"; //8, 20
> 		$admtext['momtree'] = "ID drzewa matki"; //8, 20
> 		$admtext['dadperson'] = "ID ojca"; //8, 20
> 		$admtext['dadtree'] = "ID drzewa ojca"; //8, 20
818c840
< 		$admtext['featurethumb3'] = "Akcent 3 miniaturkal"; //4
---
> 		$admtext['featurethumb3'] = "Akcent 3 miniaturka"; //4
835c857
< 		$admtext['createcopy'] = "Utworzenie kopii dla";  //as in, "create copy in Dutch"
---
> 		$admtext['createcopy'] = "Uwórz odpowiednik w języku";  //as in, "create copy in Dutch"
838c860
< 		$admtext['welcome'] = "Powitalny nagłówek"; //9, 10
---
> 		$admtext['welcome'] = "Nagłówek powitalny"; //9, 10
840,841c862,863
< 		$admtext['momsidenames'] = "Z matki strony - nazwiska"; //8
< 		$admtext['dadsidenames'] = "Z ojca strony - nazwiska"; //8
---
> 		$admtext['momsidenames'] = "Ze strony matki"; //8
> 		$admtext['dadsidenames'] = "Ze strony ojca"; //8
857c879
< 		$admtext['ttitleimage'] = "Grafika";
---
> 		$admtext['ttitleimage'] = "Zdjęcie";
887c909,992
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Nagłówek odnośnika";
> 		$admtext['quotesubhead'] = "Podtytuł odnośnika";
> 		$admtext['sniptitle'] = "Tytuł artykułu";
> 		$admtext['snipname'] = "Nazwa cechy";
> 		$admtext['snipinfoone'] = "Featurette first line";
> 		$admtext['snipinfotwo'] = "Featurette drugi wiersz";
> 		$admtext['snipimage'] = "Featurette image";
> 		$admtext['snipperson'] = "Featurette ID osoby";
> 		$admtext['sniptree'] = "Identyfikator drzewa wyróżnionego";
> 		$admtext['quote'] = "Odnośnik";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Funkcja 7 tytuł";
> 		$admtext['featuretitle8'] = "Funkcja 8 tytuł";
> 		$admtext['featuretitle9'] = "Funkcja 9 tytuł";
> 		$admtext['featurethumb9'] = "Funkcja 9 miniatura"; //15
> 		$admtext['featurelink9'] = "Funkcja 9 link"; //15
> 		$admtext['featurepara9'] = "Funkcja 9 paragraf"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Lewy obraz nagłówka";
> 		$admtext['rightimg'] = "Prawy obraz nagłówka";
> 		$admtext['photoption'] = "Opcje zdjęć to<br/>&nbsp;&nbsp;(statyczne lub losowe)";
> 		$admtext['randomphotowidth'] = "Losowa szerokość zdjęcia";
> 		$admtext['randomphotoheight'] = "Losowa wysokość zdjęcia";
> 		$admtext['randomphotomediatypeID'] = "Losowy zbiór zdjęć";
> 		$admtext['momheading'] = "Nagłówek rodziny macierzyńskiej";
> 		$admtext['mompara'] = "Akapit rodziny macierzyńskiej";
> 		$admtext['mompagelink'] = "�ącze strony rodziny macierzyńskiej";
> 		$admtext['dadheading'] = "Nagłówek rodziny ojcowskiej";
> 		$admtext['dadpara'] = "Akapit rodziny ojcowskiej";
> 		$admtext['dadpagelink'] = "�ącze strony rodziny ojcowskiej";
> 		$admtext['spmomheading'] = "Nagłówek rodziny małżonka macierzyńskiego";
> 		$admtext['spmompara'] = "Akapit rodziny małżonka macierzyńskiego";
> 		$admtext['spmompagelink'] = "�ącze strony małżonka macierzyńskiego";
> 		$admtext['spmomside'] = "Etykieta małżonka macierzyńskiego";
> 		$admtext['spdadside'] = "Etykieta małżonka ojcowskiego";
> 		$admtext['spmomperson'] = "personID małżonka macierzyńskiego";
> 		$admtext['spmomtree'] = "treeID małżonka macierzyńskiego";
> 		$admtext['spdadheading'] = "Nagłówek rodziny małżonka ojcowskiego";
> 		$admtext['spdadpara'] = "Akapit rodziny małżonka ojcowskiego";
> 		$admtext['spdadpagelink'] = "�ącze strony małżonka ojcowskiego";
> 		$admtext['spdadperson'] = "personID małżonka ojcowskiego";
> 		$admtext['spdadtree'] = "treeID małżonka ojcowskiego";
> 		$admtext['storiesheading'] = "Nasze historie rodzinne";
> 		$admtext['nbrsurnames'] = "Liczba nazwisk<br/>&nbsp;&nbsp;w chmurze";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Funkcja miniatura";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
899,900c1004,1005
< 		$admtext['conftabledelete'] = "Czy na pewno chcesz usnąć WSZYSTKIE dane!! Jesteś pewien, że chcesz kontynuować?";
< 		$admtext['performdatamaint'] = "Wykonaj konserwację danych i zarządaj zdjęciami, historiami i innymi elementami.";
---
> 		$admtext['conftabledelete'] = "Czy na pewno chcesz usnąć WSZYSTKIE dane?? Jesteś pewien, że chcesz kontynuować?";
> 		$admtext['performdatamaint'] = "Wykonaj konserwację danych i zarządzaj zdjęciami, historiami i innymi elementami.";
902,904c1007,1009
< 		$admtext['configsettings'] = "Główne ustawienia konfiguracji";
< 		$admtext['logconfigsettings'] = "Konfiguracja dziennika logowań";
< 		$admtext['importconfigsettings'] = "Konfiguracja importu";
---
> 		$admtext['configsettings'] = "Ustawienia główne";
> 		$admtext['logconfigsettings'] = "Ustawienia logu";
> 		$admtext['importconfigsettings'] = "Ustawienia importu";
910c1015
< 		$admtext['phpreq'] = "(TNG wymaga 5.3 lub wyższy.)";
---
> 		$admtext['phpreq'] = "(TNG wymaga 7.0 lub wyższy.)";
919c1024
< 		$admtext['fureq'] = "(Wymagany dla załadowania GEDCOM-u bazującego na stronie www, załadowania zdjęć i innych form funkcjonalności.)";
---
> 		$admtext['fureq'] = "(Wymagany dla załadowania GEDCOM bazującego na stronie www, załadowania zdjęć i innych form funkcjonalności.)";
924c1029
< 		$admtext['wsrvr'] = "Server www";
---
> 		$admtext['wsrvr'] = "Serwer www";
935,936c1040
< 		$admtext['keyrw'] = "Wszystkie kluczowe foldery sÄ… jako read/write";
< 		$admtext['cfgrw'] = "Wszystkie foldery konfiguracyjne sÄ… jako read/write";
---
> 		$admtext['cfgrw'] = "Wszystkie foldery konfiguracyjne sÄ… ustawione jako R/W";
938c1042
< 		$admtext['restricted'] = "Niektóre funkcje mogą być ograniczone. Możesz napotkać błędy podczas instalacji lub prowadzenia TNG.";
---
> 		$admtext['restricted'] = "Niektóre funkcje mogą być ograniczone. Możesz napotkać błędy podczas instalacji lub używania TNG.";
947,948c1051,1052
< 		$admtext['homepage'] = "Strona użytkownika";
< 		$admtext['emailaddress'] = "Adres E-mail";
---
> 		$admtext['homepage'] = "Strona główna";
> 		$admtext['emailaddress'] = "Adres mail";
953c1057
< 		$admtext['maxsearchresults'] = "Maksymalna ilość wyszukiwanych wyników";
---
> 		$admtext['maxsearchresults'] = "Maksymalna liczba wyszukiwanych wyników";
957c1061
< 		$admtext['backup'] = "Kopia zapasowa";
---
> 		$admtext['backup'] = "Twórz Kopię zapasową";
962,963c1066,1067
< 		$admtext['change_cutoff'] = "Maksymalna ilość dni w 'Co nowego'";
< 		$admtext['change_limit'] = "Maksymalna ilość tematów w 'Co nowego'";
---
> 		$admtext['change_cutoff'] = "Maksymalna liczba dni w 'Co nowego'";
> 		$admtext['change_limit'] = "Maksymalna liczba tematów w 'Co nowego'";
968c1072
< 		$admtext['ldsdefault'] = "Pokaż dane niezbędne dla LDS (Kościół Jezusa Chrystusa Świętych w Dniach Ostatnich)";
---
> 		$admtext['ldsdefault'] = "Pokazuj dane LDS";
974c1078
< 		$admtext['optimize'] = "Optimalizuj";
---
> 		$admtext['optimize'] = "Optymalizuj";
984c1088
< 		$admtext['backuprestoretables'] = "Kopie zapasowe, ich przywracanie oraz optymalizacja tabel danych";
---
> 		$admtext['backuprestoretables'] = "Kopie zapasowe, przywracanie i optymalizacja tabel bazy danych";
987c1091
< 		$admtext['regformat'] = "Format rejestracji";
---
> 		$admtext['regformat'] = "Format rejestru pokoleń";
989c1093
< 		$admtext['thumbprefix'] = "Przedrostek miniaturek";
---
> 		$admtext['thumbprefix'] = "Prefiks miniaturek";
992c1096
< 		$admtext['thumbsuffix'] = "Przyrostek dla miniaturek";
---
> 		$admtext['thumbsuffix'] = "Sufiks dla miniaturek";
994c1098
< 		$admtext['shownotes'] = "Pokaż notatki";
---
> 		$admtext['shownotes'] = "Pokaż przypisy";
996,998c1100,1102
< 		$admtext['notestogether2'] = "Pod wydarzeniem, za wyjątkiem ogólnych notatek";
< 		$admtext['notesapart'] = "W sekcji notatek";
< 		$admtext['lnprefixes'] = "Przedrostki do nazwiska (np., van, de)";
---
> 		$admtext['notestogether2'] = "Pod wydarzeniami, z wyjątkiem przypisów ogólnych";
> 		$admtext['notesapart'] = "W sekcji przypisów";
> 		$admtext['lnprefixes'] = "Przedrostki nazwisk (np. van, de, albo hr.)";
1000,1007c1104,1111
< 		$admtext['lnapart'] = "Użyć jako własnej części";
< 		$admtext['detectpfx'] = "Wykrywanie prefiksów nazwisk w czasie importu";
< 		$admtext['lnpfxnum'] = "Maksymalna liczba prefiksów";
< 		$admtext['specpfx'] = "ALBO specjalne prefiksy";
< 		$admtext['newmedialinks'] = "Nowe łącza do Zdjęcia / Historii";
< 		$admtext['maxgedcom'] = "Maksimum generacji, GEDCOM download";
< 		$admtext['placestable'] = "Tabela miejsc";
< 		//$admtext['hslinkstable'] = "Headstone Links Table";
---
> 		$admtext['lnapart'] = "Użyć jako oddzielne części";
> 		$admtext['detectpfx'] = "W czasie importu wykrywać przedrostki nazwisk";
> 		$admtext['lnpfxnum'] = "Maksymalna liczba przedrostków";
> 		$admtext['specpfx'] = "ALBO te specjalne przedrostki";
> 
> 		$admtext['maxgedcom'] = "Max liczba generacji przy imporcie GEDCOM";
> 		$admtext['placestable'] = "Miejsca";
> 		//$admtext['hslinkstable'] = "Tabela łączy do nagrobków";
1017,1021c1121,1125
< 		$admtext['topleft'] = "Z lewej nad tytułem";
< 		$admtext['topright'] = "Z prawej obok tytułu";
< 		$admtext['indstart'] = "\"Osoby\" zaczynajÄ… siÄ™ od";
< 		$admtext['persinfo'] = "Info o osobie";
< 		$admtext['allinfo'] = "\"Wszystko\"";
---
> 		$admtext['topleft'] = "Z lewej nad linkiem \"Strona główna\"";
> 		$admtext['topright'] = "Z prawej obok linku \"Strona główna\"";
> 		$admtext['indstart'] = "Osoby zaczynajÄ… siÄ™ z";
> 		$admtext['persinfo'] = "Tylko informacja osobista";
> 		$admtext['allinfo'] = "Wszystkie informacje";
1025c1129
< 		$admtext['stcollapse'] = "Złożony";
---
> 		$admtext['stcollapse'] = "Zwinięty";
1027,1028c1131,1132
< 		$admtext['chshow'] = "Widoczny dla wszystkich";
< 		$admtext['chifsp'] = "Usuń osoby bez rodziny";
---
> 		$admtext['chshow'] = "Pokazuj wszystkich";
> 		$admtext['chifsp'] = "Ukryj osoby bez rodziny";
1034c1138
< 		$admtext['brinstructions2'] = "Aby zrobić kopię zapasową struktury tabeli lub ją odtworzyć kliknij na odpowiednią ikonę poniżej. <B>OSTRZEŻNIE:</B>  Odtwarzanie usuwa wszystkie zapisane dane!";
---
> 		$admtext['brinstructions2'] = "Aby zrobić kopię zapasową struktury tabeli lub ją odtworzyć kliknij na odpowiednią ikonę poniżej. <B>OSTRZEŻENIE:</B>  Odtwarzanie usuwa wszystkie zapisane dane!";
1039c1143
< 		$admtext['asdrop'] = "Jako lista podnieś-upuść";
---
> 		$admtext['asdrop'] = "Jako lista podnieś - upuść";
1042,1043c1146,1147
< 		$admtext['leftindent'] = "Przesunięcie lewej krawędzi (px):";
< 		$admtext['boxnamesize'] = "Wielkość bloku z nazwiskiem (points/inch):";
---
> 		$admtext['leftindent'] = "Przesunięcie lewej krawędzi (px)";
> 		$admtext['boxnamesize'] = "Wielkość bloku z nazwiskiem (points/inch)";
1045c1149
< 		$admtext['boxdatessize'] = "Wielkość bloku z datami (points/inch):";
---
> 		$admtext['boxdatessize'] = "Wielkość bloku z datami (points/inch)";
1053c1157
< 		$admtext['boxheight'] = "Wysokość bloku (oprócz okienek pomocniczych popups)";
---
> 		$admtext['boxheight'] = "Wysokość bloku (oprócz okienek pomocniczych)";
1058c1162
< 		$admtext['shadowoffset'] = "Przesunięcie cieni (px):";
---
> 		$admtext['shadowoffset'] = "Przesunięcie cieni (px)";
1070,1072c1174,1176
< 		$admtext['popupspouses'] = "Okienko pomocnicze: Partnerzy";
< 		$admtext['popupkids'] = "Okienko pomocnicze: Dzieci";
< 		$admtext['popupchartlinks'] = "Okienko pomocnicze: �ącza";
---
> 		$admtext['popupspouses'] = "Okienko pomocnicze partnerzy";
> 		$admtext['popupkids'] = "Okienko pomocnicze dzieci";
> 		$admtext['popupchartlinks'] = "Okienko pomocnicze Å‚Ä…cza";
1079c1183
< 		$admtext['maxupgen'] = "Maksimum pokrewienstw generacji";
---
> 		$admtext['maxupgen'] = "Maksimum pokrewieństw generacji";
1088,1093c1192,1197
< 		$admtext['logfilename'] = "Nazwa pliku dziennika";
< 		$admtext['maxloglines'] = "Maksymalna ilość linii dziennika";
< 		$admtext['modifylogsettings'] = "Zmodyfikuj Log Configuration Settings";
< 		$admtext['badhosts'] = "Wyłącz nazwy Hosta";
< 		$admtext['admin'] = "Administrator";
< 		$admtext['text_public'] = "(Publiczny)";
---
> 		$admtext['logfilename'] = "Nazwa pliku logu";
> 		$admtext['maxloglines'] = "Maksymalna liczba linii logu";
> 		$admtext['modifylogsettings'] = "Zmodyfikuj Ustawienia logu";
> 		$admtext['badhosts'] = "Wyłącz nazwy hostów";
> 		$admtext['admin'] = "administratora";
> 		$admtext['text_public'] = "publicznego";
1096c1200
< 		$admtext['modifyimportsettings'] = "Mododyfikuj konfigurację ustawień importu";
---
> 		$admtext['modifyimportsettings'] = "Modyfikuj konfigurację ustawień importu";
1104c1208
< 		$admtext['gedpath'] = "Folder GEDCOM (Import/Eksport)";
---
> 		$admtext['gedpath'] = "Folder gedcom (Import/Eksport)";
1109c1213
< 		$admtext['nobirthdate'] = "Jeśli brak daty urodzin, przyjmij, że";
---
> 		$admtext['nobirthdate'] = "Jeśli brak daty urodzenia, przyjmij";
1112c1216
< 		$admtext['nodeathdate'] = "Jeśli brak daty śmierci przyjmij, że zmarły, jeśli starszy niż";
---
> 		$admtext['nodeathdate'] = "Jeśli brak daty śmierci przyjmij,  że zmarły, jeśli starszy niż";
1115c1219
< 		$admtext['maxpedgens'] = "Maks. generacji";
---
> 		$admtext['maxpedgens'] = "Maks. liczba generacji";
1120c1224
< 		$admtext['privsection'] = "Prywatne";
---
> 		$admtext['privsection'] = "Prywatność";
1124c1228
< 		$admtext['mediatable'] = "Tabela mediów";
---
> 		$admtext['mediatable'] = "Media";
1128c1232
< 		$admtext['initgens'] = "Wstępna ilość generacji";
---
> 		$admtext['initgens'] = "PoczÄ…tkowa liczba generacji";
1131,1132c1235,1236
< 		$admtext['localdocumentpath'] = "Lokalne ścieżki dostępu do Dokumentów ";
< 		$admtext['localotherpath'] = "Lokalne ścieżki dostępu do innych mediow ";
---
> 		$admtext['localdocumentpath'] = "Lokalne ścieżki dostępu dokumentów ";
> 		$admtext['localotherpath'] = "Lokalne ścieżki dostępu innych mediów ";
1144c1248
< 		$admtext['client'] = "(client)";
---
> 		$admtext['client'] = "(klient)";
1147,1150c1251,1254
< 		$admtext['privnote'] = "Prefiks dla prywatnych notatek";
< 		$admtext['custvars'] = "Uwaga: Możesz utworzyć swoje, osobiste, ustawienia w \"customconfig.php\" (otwórz je w edytorze tekstu i postępuj wg. instrukcji).";
< 		$admtext['blockemail'] = "Blokada sugestii albo rejestracji nowego użytkownika gdzie";
< 		$admtext['addrcontains'] = "Adres zawiera";
---
> 		$admtext['privnote'] = "Prefiks dla przypisów prywatnych";
> 		$admtext['custvars'] = "Uwaga: Możesz utworzyć Twoje osobiste ustawienia w <b>customconfig.php</b> (otwórz w edytorze tekstu i postępuj wg. instrukcji).";
> 		$admtext['blockemail'] = "Blokada sugestii albo rejestracji nowego użytkownika, gdzie";
> 		$admtext['addrcontains'] = "Adres URL zawiera";
1159,1161c1263,1265
< 		$admtext['mapdimsind'] = "Wymiary: (Strony indywidualne)";
< 		$admtext['mapdimshst'] = "Wymiary: (Strony nagrobków)";
< 		$admtext['mapdimsadm'] = "Wymiary: (Strony administracyjne)";
---
> 		$admtext['mapdimsind'] = "Wymiary, strony indywidualne";
> 		$admtext['mapdimshst'] = "Wymiary, strony nagrobków";
> 		$admtext['mapdimsadm'] = "Wymiary, strony administratora";
1171,1180c1275,1284
< 		$admtext['albumlinkstable'] = "Tabela linków do albumów";
< 		$admtext['addresstable'] = "Tabela adresów";
< 		$admtext['statestable'] = "Tabela stanów/województw";
< 		$admtext['countriestable'] = "Tabela państw";
< 		$admtext['notelinkstable'] = "Tabela linków do notatek";
< 		$admtext['medialinkstable'] = "Tabela linków do mediów";
< 		$admtext['saveimporttable'] = "Tabela zapisu importu";
< 		$admtext['brlinkstable'] = "Tabela linków do gałęzi";
< 		$admtext['temptable'] = "Tabela tymczasowych wydarzeń";
< 		$admtext['tleventstable'] = "Tabela linii czasu wydarzeń";
---
> 		$admtext['albumlinkstable'] = "Tabela łączy do albumów";
> 		$admtext['addresstable'] = "Adresy";
> 		$admtext['statestable'] = "Województwa/stany";
> 		$admtext['countriestable'] = "Państwa";
> 		$admtext['notelinkstable'] = "Tabela łączy do przypisów";
> 		$admtext['medialinkstable'] = "Tabela łączy do mediów";
> 		$admtext['saveimporttable'] = "Zapisy importu";
> 		$admtext['brlinkstable'] = "Tabela łączy do gałęzi";
> 		$admtext['temptable'] = "Wydarzenia tymczasowe";
> 		$admtext['tleventstable'] = "Linia czasu";
1189c1293
< 		$admtext['maintexp'] = "Dostęp do bazy danych jest z powodu konserwacji niemożliwy. Ponów próbę za jakiś czas. Jeśli kilka godzin po ukazaniu się tej informacji korzystanie z tej strony będzie nadal niemożliwe, skontaktuj się z administratorem.";
---
> 		$admtext['maintexp'] = "Dostęp do bazy danych jest z powodu konserwacji niemożliwy. Ponów próbę za jakiś czas. Jeśli kilka godzin po ukazaniu się tej  informacji korzystanie z tej strony będzie nadal niemożliwe, skontaktuj się z administratorem.";
1191c1295
< 		$admtext['seltable'] = "Wybierz przynajmnie jednÄ… tabelÄ™.";
---
> 		$admtext['seltable'] = "Wybierz przynajmniej jednÄ… tabelÄ™.";
1195c1299
< 		$admtext['niprefix'] = "Brak przedrostka ID";
---
> 		$admtext['niprefix'] = "Brak prefiksu ID";
1198,1199c1302,1303
< 		$admtext['needmaint'] = "Aby uruchomić to narzędzie musisz przejść do trybu konserwacji (przejdź do Ustawienia i konfiguracja &gt;&gt; Konfiguracja  &gt;&gt; Główne ustawienia konfiguracji)";
< 		$admtext['reseqwarn'] = "<B>Ostrzeżenie:</B> Optymalizacja numerów ID może spowodować, że istniejące łącza kierujące na Twoją witryną będą kierować na pusty lub niewłaściwy wiersz.";
---
> 		$admtext['needmaint'] = "Aby uruchomić to narzędzie musisz przejść do trybu konserwacji (przejdź do Ustawienia i konfiguracja &gt;&gt; Konfiguracja  &gt;&gt; Ustawienia główne)";
> 		$admtext['reseqwarn'] = "<b>Ostrzeżenie:</b> Optymalizacja numerów ID może spowodować, że istniejące łącza kierujące na Twoją witrynę będą  kierować na pusty lub niewłaściwy wiersz.";
1207c1311
< 		$admtext['localhspath'] = "Lokalne(a) ścieżki(a) do Nagrobków";
---
> 		$admtext['localhspath'] = "Lokalne(a) ścieżki(a) nagrobków";
1214c1318
< 		$admtext['srexpl'] = "*<b>Opcjonalnie:</b> Wpisz pełną ścieżkę pliku, tak jak jest wpisane powyżej w \"Ścieżce głównej\"i przenieś kolejne pliki: </br><i>config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php</i>, do \"Katalogu konfiguracyjnego\". </br>Następnie zapisz i zmień atrybuty plików na (664).";
---
> 		$admtext['srexpl'] = "*Opcjonalnie. Wpisz pełną ścieżkę pliku, tak jak jest wpisane powyżej w ścieżce głównej. <b>Natychmiast</b> po zapisaniu ustawień przenieś pliki: config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, pedconfig.php i templateconfig.php do katalogu konfiguracyjnego i nadaj im uprawnienia 664 lub 666 (muszą być zapisywalne).";
1217c1321
< 		$admtext['rrnum'] = "Numer rejestru w raporcie";
---
> 		$admtext['rrnum'] = "Liczba zapisów w raporcie";
1229c1333
< 		$admtext['rangeevs'] = "Tylko wydarzenia na wykresie które mieszczą się w okresie życia ludzi";
---
> 		$admtext['rangeevs'] = "Tylko wydarzenia na wykresie które mieszczą się w okresie życia osób";
1231,1233c1335,1336
< 		$admtext['simile'] = "WÅ‚Ä…cz \"Simile\" w linii czasu";
< 		//added in 8.0.0
< 		$admtext['pstartoff'] = "Ukryj mapy na starcie dla 'Użytkownika'";
---
> 		$admtext['simile'] = "WÅ‚Ä…cz liniÄ™ czasu SIMILE";
> 		$admtext['pstartoff'] = "Ukryj mapy publiczne na starcie";
1236c1339
< 		$admtext['templateconfigsettings'] = "Ustawienia szablonów";
---
> 		$admtext['templateconfigsettings'] = "Ustawienia szablonu";
1239c1342
< 		$admtext['maxnoteprev'] = "Maksymalna ilość znaków w liście";
---
> 		$admtext['maxnoteprev'] = "Maksymalna liczba znaków w liście";
1242,1243c1345,1346
< 		$admtext['inclpwd'] = "Dołącz hasło w powitalnym emailu";
< 		$admtext['ackemail'] = "Wyślij potwierdzenie emailem";
---
> 		$admtext['inclpwd'] = "Dołącz hasło w powitalnym e-mailu";
> 		$admtext['ackemail'] = "Wyślij potwierdzenie e-mailem";
1246,1247c1349,1350
< 		$admtext['modspath'] = "Ścieżka modułu";
< 		$admtext['extspath'] = "Ścieżka rozszerzenia";
---
> 		$admtext['modspath'] = "Ścieżka modyfikacji";
> 		$admtext['extspath'] = "Ścieżka rozszerzeń";
1250c1353
< 		$admtext['imgviewer'] = "WÅ‚Ä…cz przegladarkÄ™ grafiki";
---
> 		$admtext['imgviewer'] = "WÅ‚Ä…cz przeglÄ…darkÄ™ grafiki";
1255,1256c1358
< 		//added in 9.0.0
< 		$admtext['places1tree'] = "Przypisywanie zapisów Miejsca do drzewa genealogicznego";
---
> 		$admtext['places1tree'] = "Przypisywanie zapisów miejsca do drzewa genealogicznego";
1258,1259c1360,1361
< 		$admtext['convexpl'] = "(To przypisze wszystkie obecne Miejsca do wybranego drzewa genealogicznego)";
< 		$admtext['mergeexpl'] = "(To usunie przypisane drzewa geanealogiczne z wszystkich zapisów dotyczących Miejsca)";
---
> 		$admtext['convexpl'] = "(To przypisze wszystkie obecne miejsca do wybranego drzewa genealogicznego)";
> 		$admtext['mergeexpl'] = "(To usunie przypisane drzewa geanealogiczne z wszystkich zapisów dotyczących miejsca)";
1266c1368
< 		$admtext['showshare'] = "Pokaż link wspólnego użytkowania";
---
> 		$admtext['showshare'] = "Pokaż linki do Facebooka i in.";
1270,1273c1372,1375
< 		$admtext['usedefthumbs'] = "Używaj domyślną miniaturę";
<         $admtext['autogeo'] = "Dodaj geokody do wszystkich nowych miejsc";
<         $admtext['revmail'] = "Powiadom o zgłoszeniach do przeglądu";
<         $admtext['assumepriv'] = "Załóżmy, że prywatnie, jeśli nie jest zmarły przez ostatnie kilka lat";
---
> 		$admtext['usedefthumbs'] = "Użyj domyślnej miniaturki";
>         $admtext['autogeo'] = "WÅ‚Ä…cz geokodowanie masowe";
>         $admtext['revmail'] = "Powiadom o zgłoszeniach do sprawdzenia";
>         $admtext['assumepriv'] = "Jeśli po tylu latach nie zmarły, uznaj za prywatne";
1278,1283c1380,1383
< 		//changed in 10.0.0
< 		$admtext['regnotes'] = "Pokaż Uwagi i niestandardowe Wydarzenia w rejestrze";
< 		//added in 10.0.0
< 		$admtext['collation'] = "Porównanie";
< 		$admtext['collationexpl'] = "(pozostaw puste, aby zaakceptowaæ domyślne)";
< 		$admtext['scrollcite'] = "Przewiń cytaty";
---
> 		$admtext['regnotes'] = "Pokaż przypisy i niestandardowe wydarzenia w rejestrze";
> 		$admtext['collation'] = "Kodowanie";
> 		$admtext['collationexpl'] = "wpisz <b>utf8_general_ci</b> (lub pozostaw puste, aby zaakceptować domyślne)";
> 		$admtext['scrollcite'] = "Przewijanie odnośników";
1285c1385
< 		$admtext['searchchoice'] = "Wyszukaj link docelowy";
---
> 		$admtext['searchchoice'] = "Link docelowy wyszukiwania";
1293,1294c1393
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Ponowne użycie usuniętych IDs";
---
> 		$admtext['reuseids'] = "Użyj ponownie usuniętych ID";
1296,1298c1395
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Encryption";
<         //added in 11.0.0
---
>         $admtext['mailenc'] = "Szyfrowanie";
1302,1316c1399,1413
< 		$admtext['prefsection'] = "Przedrostki i przyrostki";
< 		$admtext['personprefix'] = "Przedrostek osoby";
< 		$admtext['personsuffix'] = "Przyrostek osoby";
< 		$admtext['familyprefix'] = "Przedrostek rodziny";
< 		$admtext['familysuffix'] = "Przyrostek rodziny";
< 		$admtext['sourceprefix'] = "Przedrostek źródła";
< 		$admtext['sourcesuffix'] = "Przyrostek źródła";
< 		$admtext['repoprefix'] = "Przedrostek repozytorni";
< 		$admtext['reposuffix'] = "Przyrostek repozytorni";
< 		$admtext['noteprefix'] = "Przedrostek notatki";
< 		$admtext['notesuffix'] = "Przyrostek notatki";
< 		$admtext['mobilesection'] = "Przenośne urządzenie";
< 		$admtext['mobilesite'] = "Nazwa przenośnego urządzenia będzie ";
< 		$admtext['menubar'] = "w menu przenośnego urządzenia";
< 		$admtext['belowbar'] = "poniżej menu przenośnego urządzenia";
---
> 		$admtext['prefsection'] = "Prefiksy i sufiksy";
> 		$admtext['personprefix'] = "Prefiks osoby";
> 		$admtext['personsuffix'] = "Sufiks osoby";
> 		$admtext['familyprefix'] = "Prefiks rodziny";
> 		$admtext['familysuffix'] = "Sufiks rodziny";
> 		$admtext['sourceprefix'] = "Prefiks źródła";
> 		$admtext['sourcesuffix'] = "Sufiks źródła";
> 		$admtext['repoprefix'] = "Prefiks repozytorium";
> 		$admtext['reposuffix'] = "Sufiks repozytorium";
> 		$admtext['noteprefix'] = "Prefiks przypisu";
> 		$admtext['notesuffix'] = "Sufiks przypisu";
> 		$admtext['mobilesection'] = "Urządzenia przenośne";
> 		$admtext['mobilesite'] = "Nazwa urządzenia przenośnego będzie ";
> 		$admtext['menubar'] = "w menu urządzenia przenośnego";
> 		$admtext['belowbar'] = "poniżej menu urządzenia przenośnego";
1319,1320c1416,1417
< 		$admtext['enablemodeswitch'] = "Włączenie przełącznika trybu Wrażliwe tabele";
< 		$admtext['enableminimap'] = "Włączenie minimapy wrażliwych tabel";
---
> 		$admtext['enablemodeswitch'] = "Włączenie przełącznika trybu 'Wrażliwe tabele'";
> 		$admtext['enableminimap'] = "Włącz minimapy wrażliwych tabel";
1322,1331c1419,1427
< 		$admtext['showtotals'] = "Pokaż sumę rejestrów w menu Admin";
< 		$admtext['backupdays'] = "Alarm w przypadku braku kopii zapasowej, po wiele dniach";
< 		$admtext['backupnote'] = "UWAGA: Jeśli baza danych jest bardzo duża, warto skorzystać z usług niezależnego narzędzia (jak mysqldump lub phpMyAdmin) do tworzenia kopii zapasowych i przywracania tabel. Co najmniej jeden z nich powinien być dostępny z panelu sterowania.";
< 		//$admtext['showmatches'] = "Pokaż MyHeritage dopasowania";
< 		//$admtext['mhconfidence'] = "Minimalny poziom zaufania";
< 		//$admtext['mhmatchtype'] = "Typ dopasowania";
< 		$admtext['hidedna'] = "Ukryj wszystkie DNA strony i dane";
<     $admtext['assumeliving'] = "Załóżmy że żyjący, jeśli nie jest zmarły od wiele lat";
< 		//changed in 11.0.2
< 		$admtext['mapkey'] = "Klucz mapy";
---
> 		$admtext['showtotals'] = "Pokaż liczbę rejestracji w menu Admin";
> 		$admtext['backupdays'] = "Ostrzeżenie w przypadku braku kopii zapasowej po tylu dniach";
> 		$admtext['backupnote'] = "UWAGA: Jeśli baza danych jest bardzo duża, warto skorzystać ze specjalistycznego narzędzia (jak mysqldump lub phpMyAdmin) do tworzenia kopii zapasowych i przywracania tabel. Co najmniej jedno z nich jest zwykle dostępne z panelu sterowania.";
> 		//$admtext['showmatches'] = "Show MyHeritage matches";
> 		//$admtext['mhconfidence'] = "Minimum confidence level";
> 		//$admtext['mhmatchtype'] = "Match type";
> 		$admtext['hidedna'] = "Ukryj wszystkie strony i dane DNA";
>         $admtext['assumeliving'] = "Załóż że żyjący, jeśli nie jest zmarły do wieku";
> 		$admtext['mapkey'] = "Klucz mapy Google";
1333,1334c1429,1430
< 		$admtext['sitekey'] = "reCAPTCHA klucza strony";
< 		$admtext['secret'] = "reCAPTCHA Sekret";
---
> 		$admtext['sitekey'] = "reCAPTCHA - klucz strony";
> 		$admtext['secret'] = "reCAPTCHA - sekret";
1336c1432
< 		$admtext['onrequest'] = "na żadanie";
---
> 		$admtext['onrequest'] = "na żądanie";
1342,1343c1438,1439
< 		$admtext['dnatestscomparecolors'] = "Testy porównywania Y-DNA kolorów kolumny";
< 		$admtext['getcolorcodes'] = "Uzyskaj tutaj Kody Kolorów";
---
> 		$admtext['dnatestscomparecolors'] = "Kolory kolumn testów porównawczych Y-DNA";
> 		$admtext['getcolorcodes'] = "Uzyskaj tutaj kody kolorów";
1345c1441
< 		$admtext['modebackground'] = "Kolor tła wartości Mod";
---
> 		$admtext['modebackground'] = "Kolor tła wartości modułu";
1347,1351c1443,1447
< 		$admtext['background1_12'] = "Markery 1-12 koloru tła";
< 		$admtext['background13_25'] = "Markery 13-25 koloru tła";
< 		$admtext['background26_37'] = "Markery 26-37 koloru tła";
< 		$admtext['background38_67'] = "Markery 38-67 koloru tła";
< 		$admtext['background111'] = "Markery 68-111 koloru tła";
---
> 		$admtext['background1_12'] = "Kolor tła markerów 1-12";
> 		$admtext['background13_25'] = "Kolor tła markerów 13-25";
> 		$admtext['background26_37'] = "Kolor tła markerów 26-37";
> 		$admtext['background38_67'] = "Kolor tła markerów 38-67";
> 		$admtext['background111'] = "Kolor tła markerów 68-111";
1359c1455
< 		$admtext['cookieapproval'] = "Pokaż komunikat zatwierdzenia pliku cookie";
---
> 		$admtext['cookieapproval'] = "Pokaż komunikat zatwierdzenia plików cookie";
1362a1459,1487
> 		//added in 13.0
> 		$admtext['coerce'] = "Zmień przychodzące prefiksy, aby pasowały do ustawień TNG";
> 		$admtext['sortevents'] = "Sortuj wydarzenia według";
> 		$admtext['sortbydate'] = "Data wydarzenia";
> 		$admtext['sortbytype'] = "Typ wydarzenia";
> 		$admtext['allowsuggest'] = "Pozwól gościom na sugestie";
> 		$admtext['livingchecked'] = "Ustawiono właściwość „żyjący� dla nowych osób i rodzin";
> 		$admtext['maxmarried'] = "Zaznacz rodzinę jako żyjącą, jeśli<br/>są w małżeństwie krócej niż tyle lat";
> 		$admtext['imagetags'] = "ProstokÄ…ty";
> 		$admtext['allowcsv'] = "Zezwalaj na pobieranie plików CSV do raportów";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Opcje kopii zapasowej";
> 		$admtext['dosql'] = "Eksport jako SQL";
> 		$admtext['dodrop'] = "Uwzględnij DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Uwzględnij CREATE TABLE";
> 		$admtext['onrestore'] = "Opcje przywracania z kopii zapasowej";
> 		$admtext['dodel'] = "Najpierw usuń poprzednią zawartość";
> 		$admtext['download'] = "Pobieranie";
> 		$admtext['altbirthtypes'] = "Inne odmiany zdarzenia Urodzenie";
> 		$admtext['dtformat'] = "Format tabel";
> 		$admtext['conchart'] = "Wykres powiązań";
> 		$admtext['maxropt'] = "Maksymalna liczba cykli wyszukiwania powiązań";
> 		$admtext['maxlopt'] = "Maksymalna długość szukanych połączeń";
> 		$admtext['showtxtopt'] = "Wyświetlaj tekstowe opisy połączeń";
> 		$admtext['compactboxopt'] = "Wyświetlaj osoby w kompaktowych blokach";
> 		$admtext['sortbyopt'] = "Sortuj ścieżki połączeń wg";
> 		$admtext['anchoridopt'] = "ID osoby zapisanej jako poczÄ…tkowa";
> 		$admtext['maxmopt'] = "Maksymalna liczba małżeństw w pokazywanych ścieżkach powiązań";
> 		$admtext['saveincfg'] = "Zapamiętaj w ścieżce konfiguracyjnej (patrz Ustawienia główne)";
1367c1492
< 		$admtext['enternamepart'] = "Wpisz część nazwiska i / lub imienia";
---
> 		$admtext['enternamepart'] = "Podaj część nazwiska i / lub imienia";
1369c1494
< 		$admtext['enternamepart2'] = "podaj ID albo część nazwiska i / lub imienia";
---
> 		$admtext['enternamepart2'] = "Podaj ID albo część nazwiska i / lub imienia";
1375,1380c1500,1505
< 		$admtext['addnewplace'] = "Dodaj nowe Miejsce";
< 		$admtext['createplace'] = "Twórz rekord o nowym Miejscu;";
< 		$admtext['modifyplace'] = "Modyfikacja istniejÄ…cych Miejsc";
< 		$admtext['editexistingplaceinfo'] = "Edycja informacji o poprzednio zapisanym Miejscu";
< 		$admtext['enterplace'] = "Podaj Miejsce.";
< 		$admtext['newplaceinfo'] = "Informacje o nowych Miejscach";
---
> 		$admtext['addnewplace'] = "Dodaj nowe miejsce";
> 		$admtext['createplace'] = "Twórz rekord o nowym miejscu;";
> 		$admtext['modifyplace'] = "Modyfikacja istniejÄ…cych miejsc";
> 		$admtext['editexistingplaceinfo'] = "Edycja informacji o poprzednio zapisanym miejscu";
> 		$admtext['enterplace'] = "Podaj miejsce.";
> 		$admtext['newplaceinfo'] = "Informacje o nowych miejscach";
1382c1507
< 		$admtext['changestoplace'] = "Zmiany w Miejscu";
---
> 		$admtext['changestoplace'] = "Zmiany w miejscu";
1384,1386c1509,1511
< 		$admtext['mergeplaces'] = "Scalaj Miejsca";
< 		$admtext['findmerge'] = "Znajdż kandydatów do scalenia";
< 		$admtext['selectplacemerge'] = "Wybierz Miejsca do scalenia";
---
> 		$admtext['mergeplaces'] = "Scalaj miejsca";
> 		$admtext['findmerge'] = "Znajdź kandydatów do scalenia";
> 		$admtext['selectplacemerge'] = "Wybierz miejsca do scalenia";
1395d1519
< 		//added in 8.0.0
1401c1525
< 		$admtext['geocopy'] = "Skopiuj powyższą informację Geokodu do tego cmentarza";
---
> 		$admtext['geocopy'] = "Skopiuj powyższą informację geokodu do tego cmentarza";
1403c1527
< 		$admtext['cemsavail'] = "Lista zawiera tylko te cmentarze które nie zostały jeszcze przypisane Miejscom";
---
> 		$admtext['cemsavail'] = "Lista zawiera tylko te cmentarze które nie zostały jeszcze przypisane miejscom";
1409,1410c1533,1534
<         $admtext['multchoice'] = "Jeśli znaleziono wiele wyników dla Miejsc:";
<         $admtext['geoexpl'] = "Geokody dla wszystkich Miejsc bez szerokości i długości geograficznej";
---
>         $admtext['multchoice'] = "Jeśli znaleziono wiele wyników dla miejsc:";
>         $admtext['geoexpl'] = "Geokody dla wszystkich miejsc bez szerokości i długości geograficznej";
1412c1536
<         $admtext['backgeo'] = "Powrót do menu Geokodowania";
---
>         $admtext['backgeo'] = "Powrót do menu geokodowania";
1416d1539
<         $admtext['nogeocode'] = "Nie może być geokodowane";
1421c1544
< 		$admtext['placenotsaved'] = "Miejsce nie zostało zapisane. Istnieje inne miejsce o tej nazwie. Można je połączyć zamiast dodawać.";
---
> 		$admtext['placenotsaved'] = "Miejsce nie zostało zapisane. Istnieje inne miejsce o tej nazwie. Można je scalić zamiast dodawać.";
1423a1547,1548
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Nie geokoduj";
1434,1436c1559,1560
< 		$admtext['trackinglines'] = "Śledzenie linii potomków...";
< 		$admtext['finishedtracking'] = "Zakończono śledzenie linii potomków.";
< 		$admtext['backtosecondary'] = "Wróć do procesów drugorzędnych";
---
> 		$admtext['trackinglines'] = "Tworzenie linii potomków...";
> 		$admtext['finishedtracking'] = "Zakończono tworzenie linii potomków.";
1439,1440c1563,1564
< 		$admtext['sortspouses'] = "Sortuj współmałżonków";
< 		$admtext['sortingspouses'] = "Sortowanie współmałżonków";
---
> 		$admtext['sortspouses'] = "Sortuj małżonków";
> 		$admtext['sortingspouses'] = "Sortowanie małżonków";
1448c1572
< 		$admtext['evalmedia'] = "Przytnij media menu";
---
> 		$admtext['evalmedia'] = "Przytnij manu media";
1452c1576
< 		$admtext['refreshliving'] = "Odśwież żyjących";
---
> 		$admtext['refreshliving'] = "odśwież żyjących";
1456c1580,1582
< 		$admtext['makeprivate'] = "Zaznacz jako prywatne";
---
> 		$admtext['makeprivate'] = "zaznacz jako prywatne";
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Powrót do zadań pomocniczych";
1465,1466c1591,1592
< 		$admtext['langdisplay'] = "Nazwa języka<br/>tak, jak będzie ona czytana przez odwiedzających";
< 		$admtext['createlanguage'] = "Utwórz nowy język";
---
> 		$admtext['langdisplay'] = "Nazwa języka<br/>tak, jak będzie ona widziana przez odwiedzających";
> 		$admtext['createlanguage'] = "Twórz nowy język";
1478,1482c1604,1608
< 		$admtext['createtree'] = "Twórz rekord dla nowego Drzewa";
< 		$admtext['notrees'] = "Brak zapisów dot. Drzewa";
< 		$admtext['existingtrees'] = "Informacje o obecnym Drzewie";
< 		$admtext['editexistingtree'] = "Edytuj informacje o wcześniej oglądanym Drzewie";
< 		$admtext['treename'] = "Nazwa Drzewa";
---
> 		$admtext['createtree'] = "Twórz zapis dla nowego drzewa";
> 		$admtext['notrees'] = "Brak zapisów dot. drzewa";
> 		$admtext['existingtrees'] = "Informacje o obecnym drzewie";
> 		$admtext['editexistingtree'] = "Edytuj informacje o wcześniej oglądanym drzewie";
> 		$admtext['treename'] = "Nazwa drzewa";
1484,1489c1610,1615
< 		$admtext['conftreedelete'] = "Na pewno chcesz usunąć to Drzewo wraz ze wszystkimi elementami?";
< 		$admtext['conftreeclear'] = "Na pewno chcesz wyczyścić wszystkie dane z Drzewa?";
< 		$admtext['changestotree'] = "Zmiany w Drzewie";
< 		$admtext['newtreeinfo'] = "Informacje o nowym Drzewie";
< 		$admtext['existingtreeinfo'] = "Informacje o obecnym Drzewie";
< 		$admtext['modifytree'] = "Modyfikuj obecne Drzewo";
---
> 		$admtext['conftreedelete'] = "Na pewno chcesz usunąć to drzewo wraz ze wszystkimi elementami?";
> 		$admtext['conftreeclear'] = "Na pewno chcesz wyczyścić wszystkie dane z drzewa?";
> 		$admtext['changestotree'] = "Zmiany w drzewie";
> 		$admtext['newtreeinfo'] = "Informacje o nowym drzewie";
> 		$admtext['existingtreeinfo'] = "Informacje o obecnym drzewie";
> 		$admtext['modifytree'] = "Modyfikuj obecne drzewo";
1491c1617
< 		$admtext['gedcomextraction'] = "Użytkownicy nie mogą eksportowac plików GEDCOM";
---
> 		$admtext['gedcomextraction'] = "Użytkownicy nie mogą eksportować plików GEDCOM";
1494c1620
< 		$admtext['ifexportfails'] = "Jeśli nie można zakończyć Eksportu,";
---
> 		$admtext['ifexportfails'] = "Jeśli nie można zakończyć eksportu,";
1496c1622
< 		$admtext['backtotrees'] = "Powrót do Drzew";
---
> 		$admtext['backtotrees'] = "Powrót do drzew";
1498,1499c1624,1625
< 		$admtext['lastimport'] = "Ostatni Import";
< 		$admtext['treeexists'] = "Drzewo z tym ID już istnieje. Wybierz inne ID i spróbuj jeszcze raz.";
---
> 		$admtext['lastimport'] = "Ostatni import";
> 		$admtext['treeexists'] = "Drzewo z tym ID już istnieje. Wybierz inny ID i spróbuj jeszcze raz.";
1501,1507c1627,1631
< 		//added in 8.0.0
< 		$admtext['changetree'] = "Zmień Drzewo";
< 		$admtext['newtree'] = "Nowe Drzewo";
< 		$admtext['currtree'] = "Obecne Drzewo";
< 		$admtext['chwarn'] = "UWAGA: Ta operacja usunie wszystkie powiązania rodzinne, cytaty i odniesienia do tego bytu w ramach bieżącego Drzewa.";
< 		$admtext['keepprivate'] = "Przechowywaj informacje dotyczące właściciela jako prywatne";
< 		//changed in 9.0.0
---
> 		$admtext['changetree'] = "Zmień drzewo";
> 		$admtext['newtree'] = "Nowe drzewo";
> 		$admtext['currtree'] = "Obecne drzewo";
> 		$admtext['chwarn'] = "UWAGA: Ta operacja usunie wszystkie powiązania rodzinne, odnośniki i inne łącza do tego obiektu w ramach bieżącego drzewa.";
> 		$admtext['keepprivate'] = "Przechowuj informacje dotyczące właściciela jako prywatne";
1512,1513c1636,1642
< 		$admtext['exliving'] = "Wyklucz żywych";
< 		$admtext['importfilename'] = "Import nazwy pliku";
---
> 		$admtext['exliving'] = "Wyklucz żyjących";
> 		$admtext['importfilename'] = "Nazwa importowanego pliku";
> 		//added in 13.0
> 		$admtext['exnotes'] = "Wyklucz przypisy";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Spakuj i dołącz pliki mediów";
> 		$admtext['downloadzip'] = "Pobierz plik ZIP";
1535c1664
< 		$admtext['firstuser'] = "Pierwszy użytkownik, którego utworzysz zostaje administratorem (BEZ wybranego drzewa)i ma dostęp do wszystkich ustawień systemowych.";
---
> 		$admtext['firstuser'] = "Pierwszy użytkownik, którego utworzysz zostaje administratorem (BEZ wybranego drzewa)i ma dostęp do wszystkich ustawień  systemowych.";
1543c1672
< 		$admtext['realname'] = "Nazwisko ImiÄ™";
---
> 		$admtext['realname'] = "Nazwisko i imiÄ™";
1546c1675
< 		$admtext['editnewusers'] = "Ustawienia dla nowo zarejestrowanych użytkowników. Nowi użytkownicy nie mają żadnych uprawnień, dopóki nie zostaną im one przyznane";
---
> 		$admtext['editnewusers'] = "Ustawienia dla nowo zarejestrowanych użytkowników. Nowi użytkownicy nie mają żadnych uprawnień, dopóki nie zostaną im one  przyznane";
1549c1678
< 		$admtext['tentative_edit'] = "Zgoda na składanie komentarzy do podglądu administratora (tylko ludzie, rodziny i źródła)";
---
> 		$admtext['tentative_edit'] = "Zgoda na składanie komentarzy do podglądu administratora (tylko osoby, rodziny i źródła)";
1554c1683
< 		$admtext['emailmessage'] = "Poczta e-mail do użytkowników";
---
> 		$admtext['emailmessage'] = "Poczta e-mail do Użytkowników";
1564c1693
< 		$admtext['entersubject'] = "Wpisz temet Twego maila.";
---
> 		$admtext['entersubject'] = "Wpisz temat Twego maila.";
1570c1699
< 		$admtext['allow_admin'] = "Ma dostęp do wszystkich ustawień systemowych oraz do wprowadzania zmian na wszystkich drzewach i gałęziach.";
---
> 		$admtext['allow_admin'] = "Dostęp do wszystkich ustawień systemowych oraz do wprowadzania zmian na wszystkich drzewach i gałęziach.";
1575d1703
< 		//added in 8.0.0
1578,1582c1706,1710
< 		$admtext['noadmin'] = "Brak dostepu do strefy Admin.";
< 		$admtext['usrsubm'] = "PodajÄ…cy";
< 		$admtext['usrsubmd'] = "Podane zmiany podlegajÄ… przeglÄ…dowi.";
< 		$admtext['usrcontrib'] = "Kontrybutor";
< 		$admtext['usrcontribd'] = "Dodaj informacje, włączając w to media.";
---
> 		$admtext['noadmin'] = "Brak dostępu do strefy Admin.";
> 		$admtext['usrsubm'] = "Wnioskodawca";
> 		$admtext['usrsubmd'] = "Proponuje zmiany podlegajÄ…ce akceptacji administratora.";
> 		$admtext['usrcontrib'] = "Współtwórca";
> 		$admtext['usrcontribd'] = "Dodaje informacje, włączając w to media.";
1584c1712
< 		$admtext['usreditord'] = "Dodawać, edytować i usuwać wszelkie informacje, w tym media.";
---
> 		$admtext['usreditord'] = "Dodaje, edytuje i usuwa wszelkie informacje, w tym media.";
1587,1588c1715,1716
< 		$admtext['usrmcontrib'] = "Kontrybutor mediów";
< 		$admtext['usrmcontribd'] = "Dodaj tylko media.";
---
> 		$admtext['usrmcontrib'] = "Współpracownik dot. mediów";
> 		$admtext['usrmcontribd'] = "Dodaje wyłącznie media.";
1590,1593c1718,1721
< 		$admtext['usrmeditord'] = "Dodawać, edytować i usuwać, tylko, media.";
< 		$admtext['allow_media_edit'] = "Zezwolenie na edytowanie, tylko mediów";
< 		$admtext['allow_media_add'] = "Zezwolenie na dodanie, tylko mediów";
< 		$admtext['allow_media_delete'] = "Zezwolenie na usuwanie, tylko mediów";
---
> 		$admtext['usrmeditord'] = "Dodaje, edytuje i usuwa wyłącznie media.";
> 		$admtext['allow_media_edit'] = "Zezwolenie na edytowanie wyłącznie mediów";
> 		$admtext['allow_media_add'] = "Zezwolenie na dodanie wyłącznie mediów";
> 		$admtext['allow_media_delete'] = "Zezwolenie na usuwanie wyłącznie mediów";
1598,1600c1726,1727
<         //added in 9.0.0
< 		$admtext['allow_private'] = "Pozwól, aby wyświetlić informacje dla osób prywatnych";
< 		$admtext['allow_pdf'] = "Pozwól pobrać plik PDF";
---
> 		$admtext['allow_private'] = "Zgoda na pokazanie informacji o osobach oznaczonych jako \"Prywatne\"";
> 		$admtext['allow_pdf'] = "Może pobierać pliki PDF";
1607a1735,1740
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Pokaż tylko użytkowników wyłączonych";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Zezwól na oglądanie przypisów prywatnych";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Wyślij również do administratorów, jeśli wybrano pojedyncze drzewo";
1617,1618c1750
< 		//added in 8.1.0
< 		$admtext['logininactive'] = "Twój login nie jest jeszcze aktywny. Spróbuj ponownie później lub skontaktuj się z administratorem serwisu.";
---
> 		$admtext['logininactive'] = "Twój login nie jest jeszcze aktywny. Spróbuj ponownie później, lub skontaktuj się z administratorem strony.";
1622,1624c1754,1756
< 		$admtext['createnewtlevent'] = "Twórz nowe wydarzenie, \"Linię czasu\"";
< 		$admtext['modifytlevent'] = "Modyfikuj obecnÄ… \"LiniÄ™ czasu\"";
< 		$admtext['leaveblankalltlevents'] = "pozostaw wolne jeśli chcesz zobaczyć wszystkie wydarzenia w lini czasu";
---
> 		$admtext['createnewtlevent'] = "Twórz nową linię czasu";
> 		$admtext['modifytlevent'] = "Modyfikuj obecnÄ… liniÄ™ czasu";
> 		$admtext['leaveblankalltlevents'] = "pozostaw wolne jeśli chcesz zobaczyć wszystkie wydarzenia w linii czasu";
1628c1760
< 		$admtext['changestotlevent'] = "Zmiany w linii czasu wydarzen";
---
> 		$admtext['changestotlevent'] = "Zmiany w linii czasu wydarzeń";
1632c1764
< 		$admtext['enterevdetail'] = "Podaj szczegóły wydzarzenia.";
---
> 		$admtext['enterevdetail'] = "Podaj szczegóły wydarzenia.";
1640,1641c1772
< 		//added in 9.0.0
< 		$admtext['evtitle'] = "Nazwa wydarzenia";
---
> 		$admtext['evtitle'] = "Tytuł wydarzenia";
1647c1778
< 		$admtext['usernotes'] = "Odnośnie notatek<br />sugerowane zmiany<br />(nie zostanie zapisane)";
---
> 		$admtext['usernotes'] = "Uwagi dotyczÄ…ce<br/>sugerowanych zmian<br/>(nie zostanÄ… zapisane)";
1656d1786
< 	//added in 8.0.0
1658,1660c1788,1790
< 		$admtext['noteblurb'] = "Bezpośrednie szukanie, edytowanie lub usuwanie notatek w bazie danych.";
< 		$admtext['whatsnewblurb'] = "Podawanie odwiedząjacym bieżących informacji wraz linkiem do strony aktualizacji na górze strony Co nowego.";
< 		$admtext['mwblurb'] = "Tworzenie listy osób nieuchwytnych i zdjęć niezidentyfikowanych, w nadziei uzyskania większego rozgłosu dla pozycji, które przynoszą Ci najwięcej problemów.";
---
> 		$admtext['noteblurb'] = "Bezpośrednie szukanie, edytowanie lub usuwanie przypisów w bazie danych.";
> 		$admtext['whatsnewblurb'] = "Podawanie odwiedzającym bieżących informacji wraz linkiem do strony aktualizacji na górze strony Co nowego.";
> 		$admtext['mwblurb'] = "Tworzenie listy nieuchwytnych osób i nierozpoznanych zdjęć, w nadziei uzyskania informacji dla pozycji, które przynoszą Ci najwięcej problemów.";
1670,1671c1800,1801
< 		$admtext['not_living'] = "Osoba zaznaczona jako żywa, ma datę śmierci";
< 		$admtext['not_dead'] = "Osoba zaznaczona jako zmarła, przypuszczalnie jest żyjąca";
---
> 		$admtext['not_living'] = "Osoba zaznaczona jako żywa ma podaną datę śmierci";
> 		$admtext['not_dead'] = "Osoba zaznaczona jako zmarła jest przypuszczalnie żyjąca";
1677c1807
< 		$admtext['modlist'] = "Lista modułów";
---
> 		$admtext['modlist'] = "Lista modów";
1679,1680c1809,1810
< 		$admtext['installed'] = "Zainstalowane";
< 		$admtext['deleted'] = "skasowany";
---
> 		$admtext['installed'] = "Zainstalowany";
> 		$admtext['deleted'] = "usunięty";
1682c1812
< 		$admtext['cfgname'] = "Nazwa pliku konfiguracyjnego";
---
> 		$admtext['cfgname'] = "Nazwa pliku cfg";
1684c1814
< 		$admtext['nomods'] = "Ilość modulowych plików definicji (xxx) znajdujących się w folderze modułów";
---
> 		$admtext['nomods'] = "W folderze modów znajduje się (xxx) plików definicji cfg";
1686c1816
< 		$admtext['missing'] = "Zaginiony";
---
> 		$admtext['missing'] = "BrakujÄ…cy";
1689c1819
< 		$admtext['notwrite'] = "nie ma możliwości nagrywania, sprawdź uprawnienia";
---
> 		$admtext['notwrite'] = "nie ma możliwości zapisu, sprawdź uprawnienia";
1691c1821
< 		$admtext['toterrors'] = "Razem, błędów";
---
> 		$admtext['toterrors'] = "Razem błędów";
1697d1826
< 		//changed in 9.0.0
1699,1702c1828,1830
< 		//added in 9.0.0
< 		$admtext['needmodupdate'] = "Wymagana jest aktualizacja Modułu";
< 		$admtext['cannotinstall'] = "Nie można zainstalować tego modułu";
< 		$admtext['emptytarget'] = "Plik docelowy jest pustym plikiem.";
---
> 		$admtext['needmodupdate'] = "Wymagana jest aktualizacja modu";
> 		$admtext['cannotinstall'] = "Nie można zainstalować tego modu";
> 		$admtext['emptytarget'] = "Plik docelowy jest pusty.";
1705c1833
< 		$admtext['editperf'] = "Parametry w trybie Edycji zostały zmienione w następujący sposób:";
---
> 		$admtext['editperf'] = "Parametry w trybie edycji zostały zmienione w następujący sposób:";
1709c1837
< 		$admtext['target'] = "Zmiany";
---
> 		$admtext['target'] = "Zmodyfikowano";
1712,1714c1840,1842
< 		$admtext['copiesfile2'] = "Kopie do";
< 		$admtext['logoptions'] = "Dziennik Mod Manager'a";
< 		$admtext['mmlogfilename'] = "Nazwa pliku dziennika";
---
> 		$admtext['copiesfile2'] = "Skopiowano do";
> 		$admtext['logoptions'] = "Dziennik Managera modów";
> 		$admtext['mmlogfilename'] = "Nazwa pliku logu";
1716c1844
< 		$admtext['modname'] = "Nazwa Mod";
---
> 		$admtext['modname'] = "Nazwa modu";
1718,1719c1846,1847
< 		$admtext['modifyoptions'] = "Zmodyfikuj opcje Mod Manager'a";
< 		$admtext['ready'] = "OK dla instalacji";
---
> 		$admtext['modifyoptions'] = "Zmodyfikuj opcje Managera";
> 		$admtext['ready'] = "Gotowe do instalacji";
1722,1723c1850,1851
< 		$admtext['showlogfile'] = "Pokaż dziennik operacji Mod Manager'a";
< 		$admtext['recentactions'] = "Najnowsze operacje Mod Manager'a";
---
> 		$admtext['showlogfile'] = "Pokaż dziennik operacji Managera modów";
> 		$admtext['recentactions'] = "Najnowsze operacje Managera modów";
1725,1728c1853,1856
< 		$admtext['confirmclearlog'] = "Czy na pewno chcesz wyczyścić dziennik?";
< 		$admtext['modsyntax'] = "Składnia Mod";
< 		$admtext['modguidelines'] = "Standarty Mod";
< 		$admtext['filemod'] = "Plik xxx jest zmodyfikowany przez";
---
> 		$admtext['confirmclearlog'] = "Czy na pewno chcesz wyczyścić log?";
> 		$admtext['modsyntax'] = "Składnia modów";
> 		$admtext['modguidelines'] = "Standardy modów";
> 		$admtext['filemod'] = "Plik xxx został zmodyfikowany przez";
1730c1858
< 		$admtext['modifications'] = "modifikacje";
---
> 		$admtext['modifications'] = "modyfikacje";
1732,1733c1860,1861
< 		$admtext['file'] = "pLIK";
< 		$admtext['tngmods'] = "Mods dla TNG ";
---
> 		$admtext['file'] = "plik";
> 		$admtext['tngmods'] = "Mody dla TNG ";
1735,1743c1863,1871
< 		$admtext['copied'] = "skopiowane";
< 		$admtext['emptyfile'] = "pusty plik";
< 		$admtext['filescopied'] = "skopiowane pliki";
< 		$admtext['notinst'] = "nie zainstalowane";
< 		$admtext['install'] = "instalacja";
< 		$admtext['filedel'] = "Usunięty plik";
< 		$admtext['created'] = "utworzone";
< 		$admtext['choosefilter'] = "Wybierz filtr i kliknij przycisk Start aby przejść do dostępnych kontroli";
< 		$admtext['mmmaxloglines'] = "Max ilość transakcji";
---
> 		$admtext['copied'] = "Skopiowano";
> 		$admtext['emptyfile'] = "plik jest pusty";
> 		$admtext['filescopied'] = "pliki skopiowane";
> 		$admtext['notinst'] = "Nie wykonano";
> 		$admtext['install'] = "Instaluj";
> 		$admtext['filedel'] = "Plik xxx został usunięty.";
> 		$admtext['created'] = "Utworzono";
> 		$admtext['choosefilter'] = "Wybierz i potwierdź opcję wyświetlania, aby wyświetlić opcje edycji.";
> 		$admtext['mmmaxloglines'] = "Maksymalna liczba zapisów w logu";
1747,1750c1875,1878
< 		$admtext['cleanup'] = "SprzÄ…tanie";  // previously used as $admtext['clean']
< 		$admtext['edopts'] = "Opcje edycji";  // previously used as $admtext['edit'] without Option text
< 		$admtext['ok2inst'] = "OK dla instalacji";  // previously used $admtext['ready'] which is already translated
< 		$admtext['badversion'] = "Wersja pliku/niezgodna wersja";
---
> 		$admtext['cleanup'] = "Wyczyść";  // previously used as $admtext['clean']
> 		$admtext['edopts'] = "opcje edycji";  // previously used as $admtext['edit'] without Option text
> 		$admtext['ok2inst'] = "Gotowy do instalacji";  // previously used $admtext['ready'] which is already translated
> 		$admtext['badversion'] = "niezgodność wersji pliku";
1752c1880
< 		$admtext['cantinst'] = "nie można zainstalować";
---
> 		$admtext['cantinst'] = "instalacja niemożliwa";
1754,1756c1882,1884
< 		$admtext['cantupd'] = "nie można zaktualizować parametru";
< 		$admtext['cleanupall'] = "SprzÄ…tanie wszystkich";
< 		$admtext['copiesreq'] = "kopie określone";
---
> 		$admtext['cantupd'] = "nie można zaktualizować parametrów";
> 		$admtext['cleanupall'] = "Czyść";
> 		$admtext['copiesreq'] = "Żądania kopii plików";
1758,1759c1886,1887
< 		$admtext['deleteall'] = "Usuń wszystko";
< 		$admtext['errors'] = "błędy";
---
> 		$admtext['deleteall'] = "Usuń wszystkie";
> 		$admtext['errors'] = "Błędy";
1764,1765c1892,1893
< 		$admtext['installall'] = "Instalowanie wszystkiego";
< 		$admtext['installing'] = "Instalowanie";
---
> 		$admtext['installall'] = "Instaluj";
> 		$admtext['installing'] = "Instalacja";
1767,1768c1895,1896
< 		$admtext['modified'] = "zmodyfikowane";
< 		$admtext['modsinst'] = "zainstalowany kod modyfikacji";
---
> 		$admtext['modified'] = "Zmodyfikowano";
> 		$admtext['modsinst'] = "zainstalowane mody";
1770,1777c1898,1905
< 		$admtext['modsrem'] = "kod modifikacji usunięty";
< 		$admtext['modsreq'] = "kod modifikacji określony";
< 		$admtext['newfilesreq'] = "nowe pliki określone";
< 		$admtext['nfcreated'] = "utworzony nowy plik";
< 		$admtext['noact'] = "nieprawidłowy tag działania ";
< 		$admtext['nocfgfile'] = "nie znaleziono pliku modu";
< 		$admtext['nocomps'] = "brakujÄ…ce elementy";
< 		$admtext['noend'] = "%end:% brakujÄ…cy tag";
---
> 		$admtext['modsrem'] = "usunięte mody";
> 		$admtext['modsreq'] = "Żądania modyfikacji";
> 		$admtext['newfilesreq'] = "Żądania tworzenia plików";
> 		$admtext['nfcreated'] = "nowe pliki utworzone";
> 		$admtext['noact'] = "nieprawidłowy tag akcji";
> 		$admtext['nocfgfile'] = "nie znaleziono pliku cfg modu";
> 		$admtext['nocomps'] = "brak elementów";
> 		$admtext['noend'] = "brak tagu %end:%";
1780,1783c1908,1911
< 		$admtext['opened'] = "otwarte";
< 		$admtext['optional'] = "opcjonalne";
< 		$admtext['partinst'] = "częściowo zainstalowane";
< 		$admtext['removeall'] = "Odinstaluj wszystko";    // was Remove Selected mods
---
> 		$admtext['opened'] = "otwarty";
> 		$admtext['optional'] = "opcjonalny";
> 		$admtext['partinst'] = "częściowo zainstalowany";
> 		$admtext['removeall'] = "Odinstaluj wybrane";    // was Remove Selected mods
1785,1788c1913,1916
< 		$admtext['reqtag'] = "brakuje wymaganego tagu";
< 		$admtext['restparam'] = "Przywracanie domyślnego parametru";
< 		$admtext['return'] = "Powrót do Mod Manager";
< 		$admtext['tagnoterm'] = "tag nie zamknięty";
---
> 		$admtext['reqtag'] = "brak wymaganego tagu";
> 		$admtext['restparam'] = "Przywracanie parametrów domyślnych";
> 		$admtext['return'] = "Powrót do managera modów";
> 		$admtext['tagnoterm'] = "brak zamknięcia tagu";
1791,1792c1919,1920
< 		$admtext['updated'] = "zaktualizowane";
< 		$admtext['updparam'] = "Aktualizacja parametru";
---
> 		$admtext['updated'] = "zaktualizowany";
> 		$admtext['updparam'] = "Parametry aktualizacji";
1795,1798c1923,1926
< 		$admtext['allowdeletepartial'] = "Pozwól usuń wybrane lub częściowo zainstalowane Mody";
< 		$admtext['allowdeleteinstalled'] = "Pozwól usuń indywidualnie zainstalowane Mody";
< 		$admtext['showwarnings'] = "Pokaż ostrzeżenia Modu w statusie";
< 		$admtext['logfullpath'] = "Zaloguj pełną ścieżkę dostępu do pliku działań";
---
> 		$admtext['allowdeletepartial'] = "Zgoda na usunięcie częściowo zainstalowanych modów";
> 		$admtext['allowdeleteinstalled'] = "Zgoda na usunięcie zainstalowanych modułów";
> 		$admtext['showwarnings'] = "Pokaż ostrzeżenia dotycząte modów w statusie";
> 		$admtext['logfullpath'] = "Pełna ścieżka logów dot. działań plików";
1806,1807c1934,1935
< 		$admtext['bypassed'] = "pominięte";
< 		$admtext['willbypass'] = "będzie zingnorowane";  // was "will bypass"
---
> 		$admtext['bypassed'] = "pominięto";
> 		$admtext['willbypass'] = "będzie pominięte";  // was "will bypass"
1809c1937
< 		$admtext['optmissing'] = "brakuje pliku (opcjonalnie)";
---
> 		$admtext['optmissing'] = "brakuje pliku (opcjonalnego)";
1811c1939
< 		$admtext['optlocked'] = "plik zablokowany (opcjonalnie)";
---
> 		$admtext['optlocked'] = "plik zablokowany (opcjonalny)";
1813c1941
< 		$admtext['alreadyrem'] = "już usunięte";
---
> 		$admtext['alreadyrem'] = "już usunięto";
1818,1819c1946,1947
< 		$admtext['optsrcfilemissing'] = "brakuje opcjonalnego źródła";
< 		$admtext['srcfilemissing'] = "brakuje źródła";
---
> 		$admtext['optsrcfilemissing'] = "brakuje opcjonalnego pliku źródłowego";
> 		$admtext['srcfilemissing'] = "brakuje pliku źródłowego";
1821,1822c1949,1950
< 		$admtext['notcopied'] = "nie zostały skopiowane";
< 		$admtext['copied'] = "skopiowane";
---
> 		$admtext['notcopied'] = "Nie skopiowano";
> 		$admtext['copied'] = "Skopiowano";
1824,1825c1952,1953
< 		$admtext['optnotcreated'] = "Nie można utworzyć nowy pliku opcjonalnego";
< 		$admtext['nocreated'] = "nie utworzono";
---
> 		$admtext['optnotcreated'] = "Nie można utworzyć nowego pliku opcjonalnego";
> 		$admtext['nocreated'] = "Nie utworzono";
1827c1955
< 		$admtext['cantremok'] = "Nie można usunąć, opcjonalnie, pomijanego";
---
> 		$admtext['cantremok'] = "Nie można usunąć - był opcjonalny - pominięto";
1830,1831c1958,1959
< 		$admtext['compresslog'] = "Zwiń log wyświetlania";
< 		$admtext['formodname'] = "dla nazwy Modu ";
---
> 		$admtext['compresslog'] = "Skompresuj log";
> 		$admtext['formodname'] = "dla nazwy modu ";
1833c1961
< 		$admtext['fileperms'] = "Proszę sprawdzić uprawnienia do plików";
---
> 		$admtext['fileperms'] = "Sprawdź uprawnienia plików";
1835,1836c1963,1964
< 		$admtext['editing'] = "edytowanie";
< 		$admtext['redirect2log'] = "Przekierowanie do dziennika dla";
---
> 		$admtext['editing'] = "edycja";
> 		$admtext['redirect2log'] = "Przekierowanie do logu dla";
1839,1841c1967,1969
< 		$admtext['usestriping'] = "Stosuj paski";
< 		$admtext['stripeafter'] = "Paski po kilku rzędach";
< 		$admtext['adjusthdrs'] = "Regulacja stałych nagłówków";
---
> 		$admtext['usestriping'] = "Użyj pasków";
> 		$admtext['stripeafter'] = "Pasek co ile wierszy";
> 		$admtext['adjusthdrs'] = "Ustaw stałe nagłówki";
1843c1971
< 		$admtext['no_frag'] = "Nie dozwolone miejsce dla fragmentu kodu";
---
> 		$admtext['no_frag'] = "Niedozwolone miejsce dla fragmentu kodu";
1846c1974
< 		$admtext['newdirsreq'] = "określone nowe foldery";
---
> 		$admtext['newdirsreq'] = "Żądania tworzenia folderów";
1848c1976
< 		$admtext['showanalyzer'] = "Pokaż tab Analizuj pliki TNG";
---
> 		$admtext['showanalyzer'] = "Pokaż zakładkę Analizuj pliki TNG";
1850c1978
< 		$admtext['showupdates'] = "Pokaż tab Zalecane aktualizacje";
---
> 		$admtext['showupdates'] = "Pokaż zakładkę Zalecane aktualizacje";
1852c1980
< 		$admtext['parsetable'] = "Wyświetl Tabelę parsera";
---
> 		$admtext['parsetable'] = "Wyświetl tabelę parsera";
1854c1982
< 		$admtext['selectmod'] = "Wybierz plik konfiguracyjny Mod, aby wyświetlić wyniki tabeli parsera";
---
> 		$admtext['selectmod'] = "Wybierz plik cfg modu, aby wyświetlić wyniki tabeli parsera";
1857,1858c1985,1986
< 		$admtext['filesel'] = "Wybierz plik TNG, aby zobaczyć, które Mody wpływają na niego";
< 		$admtext['custtextfixes'] = "Zaktualizowane Wytyczne Mod zalecają wstawienie niestandardowego tekstu przed komentarzami na początku pliku cust_text.php, aby modyfikacje nie wpływały na zmiany wprowadzone przez użytkownika po liniach komentarzy.";
---
> 		$admtext['filesel'] = "Wybierz plik TNG, aby zobaczyć, które mody wpływają na niego";
> 		$admtext['custtextfixes'] = "Zaktualizowane wytyczne dla modów zalecają wstawianie niestandardowych tekstów przed komentarzem na początku pliku cust_text.php, aby mody nie wpływały na zmiany wprowadzone przez użytkownika poniżej tych linii komentarzy.";
1861,1862c1989,1990
< 		$admtext['compressnames'] = "Usuń spacje z nazw plików na liście modyfikacji";
< 		$admtext['verified'] = "zweryfikowany";
---
> 		$admtext['compressnames'] = "Usuń spacje z nazw plików na liście modów";
> 		$admtext['verified'] = "Zweryfikowano";
1864,1869c1992,1997
< 		$admtext['backtoprevious'] = "Powróć do poprzedniej strony";
< 		$admtext['reasontoupdate'] = "Jeśli nie uruchomiłeś skryptu cust_text_update.php w ramach aktualizacji TNG v12, musisz zaktualizować pliki cust_text.php do <ul> <li> dodaj nową linię do plików i </ li> <li> również zaktualizuj nieaktualną linię w istniejących plikach cust_text.php </ li> </ ul>, które nie są zastępowane podczas aktualizacji TNG.";
< 		$admtext['newanchor'] = "Nowa linia komentarza nie powinna być tłumaczona na pliki językowe, aby mogła zostać użyta jako kotwica do wstawienia niestandardowego tekstu przed tą nową linią komentarza przez twórców modów.";
< 		$admtext['translateissue'] = "Jeśli przetłumaczysz nową linię komentarza, instalacje Modowe zawiodą.";
< 		$admtext['privatemod'] = "Prywatny Mod";
< 		$admtext['protected'] = "bezpiecznie-usuń plik ręcznie";
---
> 		$admtext['backtoprevious'] = "Wróć do poprzedniej strony";
> 		$admtext['reasontoupdate'] = "Jeśli nie uruchomiłeś skryptu cust_text_update.php w ramach aktualizacji TNG v12, <b>musisz zaktualizować pliki cust_text.php aby</b> <ul> <li> dodać nową linię do plików a także </ li> <li> zaktualizować nieaktualne linie w istniejących plikach cust_text.php </ li> </ ul>, które nie są zastępowane podczas aktualizacji TNG.";
> 		$admtext['newanchor'] = "Linie komentarza nie powinny być tłumaczone, aby mogły zostać użyte jako kotwica do wstawienia niestandardowego tekstu przed tymi liniami przez twórców modów.";
> 		$admtext['translateissue'] = "Jeśli przetłumaczysz nowe linie komentarza, instalacja modów nie będzie możliwa.";
> 		$admtext['privatemod'] = "Mod prywatny";
> 		$admtext['protected'] = "zabezpieczony plik usuń ręcznie";
1871,1879c1999,2013
< 		$admtext['confdelmod'] = "Czy na pewno chcesz usunąć ten Mod i skojarzony z nim folder ze swojego systemu? Nie będzie można cofnąć tej operacji!";
< 		$admtext['allowdeletesupport'] = "Zezwól Usuń folder wsparcia po usunięciu Mod";
< 		$admtext['delrisk'] = "Wybierając tę opcję, użytkownik akceptuje wszelkie ryzyko, że niezamierzone foldery mogą zostać usunięte. Uważamy, że ryzyko to jest bardzo małe.";
< 		$admtext['delpartinfo'] = "Powinieneś ustawić tę opcję na TAK, jeśli zapomniałeś odinstalować poprzednie wersje Mod przed zainstalowaniem nowej wersji.";
< 		$admtext['delinstinfo'] = "Powinieneś ustawić tę opcję na TAK, jeśli zainstalowałeś nową wersję Modu i poprzednia wersja nadal jest zainstalowana.";
< 		$admtext['updateopts'] = "Twój mmconfig.php musi zostać zaktualizowany! Kliknij tab Opcje powyżej i kliknij przycisk Zapisz.";
< 		$admtext['confdelmod1'] = "Czy na pewno chcesz usunąć ten Mod ze swojego systemu? Nie będzie można cofnąć tej operacji!";
< 		$admtext['noeffect'] = "Ostrzeżenie: Niczego nie zmieniaj w TNG!";
< 		$admtext['cfgnowrite'] = "Ostrzeżenie: Plik Cfg jest write-protected. Parametrów nie można zmienić.";
---
> 		$admtext['confdelmod'] = "Czy na pewno chcesz usunąć ten mod i skojarzony z nim folder pomocniczy ze swojego systemu? Nie będzie można cofnąć tej operacji!";
> 		$admtext['allowdeletesupport'] = "Zezwól na usunięcie foldera pomocniczego po usunięciu modu";
> 		$admtext['delrisk'] = "Wybierając tę opcję, użytkownik akceptuje ryzyko, że niezamierzone foldery mogą zostać usunięte. Uważamy, że ryzyko to jest bardzo małe.";
> 		$admtext['delpartinfo'] = "Należy ustawić tę opcję na TAK, jeśli nie odinstalowano poprzedniej wersji modu przed zainstalowaniem nowej wersji.";
> 		$admtext['delinstinfo'] = "Należy ustawić tę opcję na TAK, jeśli zainstalowano nową wersję modułu, a poprzednia wersja nadal jest zainstalowana.";
> 		$admtext['updateopts'] = "Plik mmconfig.php musi zostać zaktualizowany! Zaznacz opcję powyżej i kliknij przycisk Zapisz.";
> 		$admtext['confdelmod1'] = "Czy na pewno chcesz usunąć ten mod ze swojego systemu? Nie będzie można cofnąć tej operacji!";
> 		$admtext['noeffect'] = "Ostrzeżenie: Niczego nie zmieniono w TNG!";
> 		$admtext['cfgnowrite'] = "Ostrzeżenie: Plik Cfg jest chroniony przed zapisem. Parametrów nie można zmienić.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Wszystkie mody";
> 		$admtext['installedmods'] = "Tylko zainstalowane mody";
> 		$admtext['partinstmods'] = "Zainstalowane i częściowo zainstalowane mody";
> 		$admtext['showanalyzeractions'] = "Pokaż akcje w Analizatorze modów";
> 		$admtext['badchar'] = "Niedozwolony znak";
1886d2019
< 		$admtext['test_number'] = "Numer badania DNA";
1897c2030
< 		$admtext['test_links'] = "Ludzie powiÄ…zani tym badaniem";
---
> 		$admtext['test_links'] = "Osoby powiÄ…zane tym badaniem";
1900d2032
< 		$admtext['dnalater'] = "Uwaga: Badanie może być powiązane z innymi osobami na następnym ekranie.";
1904c2036
< 		$admtext['person_name'] = "Osoba nie jest w bazie danych";
---
> 		$admtext['person_name'] = "osoby nie ma w bazie danych";
1916d2047
< 		$admtext['xtra_mut'] = "Dodatkowe mutacje";
1918,1919c2049,2059
< 		$admtext['mdaID'] = "Najdalszy przodek ID";
< 		$admtext['mrcaID'] = "Najnowszy wspólny przodek ID";
---
> 		$admtext['mdaID'] = "ID najstarszego przodka";
> 		$admtext['mrcaID'] = "ID najmłodszego wspólnego przodka";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Numer badania DNA";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Ustaw test jako prywatny";
> 		$admtext['multivalues'] = "Użyj kresek między wartościami wielowymiarowymi";
> 		$admtext['changestogroup'] = "Zmiany w rupie DNA";
> 		$admtext['modifydnagroup'] = "Edycja istniejÄ…cej grupy DNA";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Powiąż ten test DNA z osobą";
1933c2073
< $admtext['deleted'] = "Usunięte";
---
> $admtext['deleted'] = "Usunięto";
1939,1940c2079,2080
< $admtext['notes'] = "Notatki";
< $admtext['name'] = "Nazwa";
---
> $admtext['notes'] = "Przypisy";
> $admtext['name'] = "Nazwa"; // nie Nazwisko?
1946c2086
< $admtext['exactmatch'] = "Tylko dokładna nazwa";
---
> $admtext['exactmatch'] = "Dokładne dopasowanie";
1952c2092
< $admtext['eventtype'] = "Rodzaj wydarzenia";
---
> $admtext['eventtype'] = "Typ wydarzenia";
1961c2101
< $admtext['remove'] = "Usuń z listy";
---
> $admtext['remove'] = "usuń z listy";
1966d2105
< $admtext['otherevents'] = "Inne wydarzenia";
1990,1991c2129,2130
< $admtext['existinglinks'] = "Istniejące łącza:<br/>(sprawdź przed usunięciem)";
< $admtext['lowersortfirst'] = "Najpierw wybierz liczbę. Mozesz używać systemu dziesiętnego.";
---
> $admtext['existinglinks'] = "Istniejące łącza:<br/>(sprawdź do usunięcia)";
> $admtext['lowersortfirst'] = "Najpierw wybierz liczbę. Możesz używać systemu dziesiętnego.";
1994c2133
< $admtext['tracklines'] = "Rysuj linie";
---
> $admtext['tracklines'] = "Twórz linie potomków";
2005c2144
< $admtext['suffix'] = "Przyrostek ";
---
> $admtext['suffix'] = "Przyrostek";
2010c2149
< $admtext['display'] = "Widok";
---
> $admtext['display'] = "Wyświetlanie";
2023c2162
< $admtext['lastmodified'] = "Ostatnie modyfikacje";
---
> $admtext['lastmodified'] = "Ostatnia modyfikacja";
2025,2026c2164,2165
< $admtext['confdeletenote'] = "Na pewno chcesz usunąć tę notatkę?";
< $admtext['treebefnote'] = "Zanim dodasz nową notatkę musisz wybrać lub dodać Drzewo.";
---
> $admtext['confdeletenote'] = "Na pewno chcesz usunąć ten przypis?";
> $admtext['treebefnote'] = "Zanim dodasz nowy przypis musisz wybrać lub dodać drzewo.";
2032,2033c2171,2172
< $admtext['norights'] = "Brak autoryzacji. Podaj nazwę użytkownika oraz hasło i zaloguj się.";
< $admtext['username'] = "Nazwa użytkownika";
---
> $admtext['norights'] = "Wymagana autoryzacja. Podaj nazwę użytkownika oraz hasło i zaloguj się.";
> $admtext['username'] = "Login";
2035,2036c2174,2175
< $admtext['login'] = "Zaloguj";
< $admtext['logout'] = "Wyloguj";
---
> $admtext['login'] = "Zaloguj siÄ™";
> $admtext['logout'] = "Wyloguj siÄ™";
2050,2052c2189
< $admtext['altnotes'] = "Kolejne notatki";
< $admtext['savereturn'] = "Powrót na tę stronę";
< $admtext['saveback'] = "Powrót do menu";
---
> $admtext['altnotes'] = "Kolejne przypisy";
2059,2060d2195
< $admtext['secondary'] = "Procesy drugorzędne";
< $admtext['commas'] = "Wielokrotne wpisy rozdziel przecinkani";
2062c2197
< $admtext['adminhome'] = "Strona administracyjna";
---
> $admtext['adminhome'] = "Administracja";
2065c2200
< $admtext['findperson'] = "Znajdz osobÄ™...";
---
> $admtext['findperson'] = "Znajdź osobę...";
2087c2222
< $admtext['email'] = "E-mail";
---
> $admtext['email'] = "Mail";
2102c2237
< $admtext['nobranch'] = "Bez gałęzi";
---
> $admtext['nobranch'] = "Nie ma gałęzi";
2105c2240
< $admtext['review'] = "PrzeglÄ…d zmian.";
---
> $admtext['review'] = "PrzeglÄ…d sugestii";
2108c2243
< $admtext['burialabbr'] = "pog.";
---
> $admtext['burialabbr'] = "poch.";
2121c2256
< $admtext['datamaint'] = "Import/Eksport GEDCOM-u";
---
> $admtext['datamaint'] = "Import/Eksport GEDCOM";
2128c2263
< $admtext['reset'] = "Zerowanie";
---
> $admtext['reset'] = "Wyczyść";
2130,2131d2264
< $admtext['secondarymaint'] = "Procesy drugorzędne";
< $admtext['customeventtypes'] = "Niestandardowe rodzaje wydarzeń";
2148c2281
< $admtext['combinenotesonly'] = "Połącz notatki";
---
> $admtext['combinenotesonly'] = "Połącz przypisy";
2152,2153c2285,2286
< $admtext['gedimport'] = "Import GEDCOM-u";
< $admtext['improper2'] = "ponieważ oryginalne zdjęcie jest za duże albo jest nieodpowiednie (w nazwie zdjęcia nie może być znaków ą, ę, ź itp.), albo ten folder nie istnieje (sprawdź główną ścieżkę) lub nie ma odpowiedniego zezwolenia (spróbuj(777)).";
---
> $admtext['gedimport'] = "Import GEDCOM";
> $admtext['improper2'] = "ponieważ oryginalne zdjęcie jest za duże albo ma nieodpowiednia nazwę (zabronione są znaki ą, ę, ź itp.), albo ten folder nie istnieje (sprawdź główną ścieżkę) lub nie ma odpowiednich uprawnień (spróbuj(777)).";
2175,2176c2308,2309
< $admtext['entereventtype'] = "Wybierz rodzaj wydarzenia.";
< $admtext['enternote'] = "Wpisz tekst notatki.";
---
> $admtext['entereventtype'] = "Wybierz Typ wydarzenia.";
> $admtext['enternote'] = "Wpisz tekst przypisu.";
2178c2311
< $admtext['confdeletecite'] = "Na pewno chcesz usunąć ten cytat?";
---
> $admtext['confdeletecite'] = "Czy na pewno chcesz usunąć ten Odnośnik do źródła?";
2182,2184c2315,2317
< $admtext['citations'] = "Cytaty";
< $admtext['eventtypes'] = "Rodzaje wydarzeń";
< $admtext['associations'] = "ZwiÄ…zki";
---
> $admtext['citations'] = "Odnośniki";
> $admtext['eventtypes'] = "Typy wydarzeń";
> $admtext['associations'] = "Asocjacje";
2187c2320
< $admtext['matchingonly'] = "Tylko dokładny zapis";
---
> $admtext['matchingonly'] = "Tylko pasujÄ…ce zapisy";
2212c2345
< $admtext['mediatypes'] = "Rodzaje mediów";
---
> $admtext['mediatypes'] = "Typy mediów (Kolekcje)";
2219,2221c2352,2353
< $admtext['confdeletefile'] = "Czy jesteś pewnien, że chcesz usunąć ten plik?";
< //changed in 8.0.0
< $admtext['datenote'] = "<font color=\"#800000\" size=\"3\"><strong>Ważne:</strong> Przy zapisie daty używaj formatu: <strong><font  color=\"red\">DD/MM/RRRR</font></strong>, lub standardowego formatu genealogcznego DD MMM RRRR.<br />Np. 10 Apr 2004.(Jan, Feb, Mar, Apr, May, Jun, Jul, Aug,  Sep, Oct, Nov, Dec)<br/> Dla <strong><font color=\"black\">daty nieznanej</font></strong> wpisz <strong><font color=\"red\">Y</font></strong><br/> Przed datą dla '<strong><font color=\"black\">przed</font></strong>' wpisz <strong><font color=\"red\">bef</font></strong>, dla '<strong><font color=\"black\">po</font></strong>' wpisz <strong><font color=\"red\">aft</font></strong>, dla '<strong><font color=\"black\">około</font></strong>': wpisz  <strong><font color=\"red\">abt</font></strong>, dla '<strong><font color=\"black\">pomiędzy</font></strong>' wpisz <strong><font color=\"red\">bet 1910 - 1920</font></strong>.<br/> Dla <strong><font color=\"black\">nieznanego nazwiska</font></strong> wpisz <strong><font color=\"red\">NN</font></strong></font>";
---
> $admtext['confdeletefile'] = "Czy na pewno chcesz usunąć ten plik?";
> $admtext['datenote'] = "<b>Uwaga:</b> Datę należy wprowadzać w standardowym formacie genealogicznym DD MMM YYYY np. 10 Kwi 2004.";
2224d2355
< //moved here in 8.0.0
2229,2232c2360,2362
< //added in 8.0.0
< $admtext['show'] = "PrzeglÄ…d";
< $admtext['lnfirst'] = "Pierwsze Nazwisko (z przecinkami)";
< $admtext['savefirst'] = "Najpierw zapisać zmiany?";
---
> $admtext['show'] = "Pokazuj";
> $admtext['lnfirst'] = "Pierwsze nazwisko (z przecinkami)";
> $admtext['savefirst'] = "Zapisać najpierw zmiany?";
2234c2364
< $admtext['modmgr'] = "Zarządzanie modułami";
---
> $admtext['modmgr'] = "Manager modów";
2236,2237c2366
< $admtext['reviewsh'] = "PrzeglÄ…d zmian."; //short version
< //moved here in 9.0.0
---
> $admtext['reviewsh'] = "PrzeglÄ…d sugestii"; //short version
2241c2370
< $admtext['confdeleteassoc'] = "Na pewno chcez usunąć ten związek?";
---
> $admtext['confdeleteassoc'] = "Na pewno chcez usunąć tę asocjację?";
2246d2374
< //added in 9.0.0
2249,2275c2377,2403
< $admtext['nicbold'] = "Kliknij, aby wytłuścić tekst";
< $admtext['nicitalic'] = "Kliknij, aby zmienić tekst na Italic";
< $admtext['nicunderline'] = "Kliknij, aby podkreślić";
< $admtext['niclalign'] = "Wyrównaj do lewej";
< $admtext['niccalign'] = "Wycentruj";
< $admtext['nicralign'] = "Wyrównaj do prawej";
< $admtext['nicjalign'] = "Wyrównaj paragraf";
< $admtext['nicinsol'] = "Wstaw ListÄ™ uporzÄ…dkowanÄ…";
< $admtext['nicinsul'] = "Wstaw ListÄ™ nieuporzÄ…dkowanÄ…";
< $admtext['nicsub'] = "Kliknij, aby wstawić Indeks dolny";
< $admtext['nicsup'] = "Kliknij, aby wstawić Indeks górny";
< $admtext['nicstrike'] = "Kliknij aby Przekreślić";
< $admtext['nicremfmt'] = "Usuń formatowanie";
< $admtext['nicindent'] = "Wcięcie tekstu";
< $admtext['nicremind'] = "Usuń Wcięcie";
< $admtext['nichr'] = "Pozioma linia";
< $admtext['nicfontsz'] = "Rozmiar&nbsp;czcionki";
< $admtext['nicfontfam'] = "Rodzina&nbsp;czcionek";
< $admtext['nicfontfmt'] = "Format&nbsp;czcionki";
< $admtext['niclink'] = "Dodaj link";
< $admtext['nicremlink'] = "Usuń link";
< $admtext['nictxtcol'] = "Zmień kolor tekstu";
< $admtext['nicbkgcol'] = "Zmień kolor tła";
< $admtext['nicimage'] = "Dodaj grafikÄ™";
< $admtext['change'] = "Zmień";
< $admtext['editwarn'] = "Twoja blokada zapisu kończy się. Zapisz teraz zmiany, aby zapobiec ich zastąpienia przez zmiany dokonane innego użytkownika.";
< $admtext['editconflict'] = "Inny użytkownik obecnie edytuje ten zapis. Spróbuj później, ponownie.";
---
> $admtext['nicbold'] = "pogrubiony";
> $admtext['nicitalic'] = "kursywa";
> $admtext['nicunderline'] = "podkreślenie";
> $admtext['niclalign'] = "do lewej";
> $admtext['niccalign'] = "wyśrodkowanie";
> $admtext['nicralign'] = "do prawej";
> $admtext['nicjalign'] = "justowanie";
> $admtext['nicinsol'] = "wprowadź listę numerowaną";
> $admtext['nicinsul'] = "wprowadź spis";
> $admtext['nicsub'] = "indeks dolny";
> $admtext['nicsup'] = "indeks górny";
> $admtext['nicstrike'] = "przekreślenie";
> $admtext['nicremfmt'] = "usuń formatowanie";
> $admtext['nicindent'] = "zwiększ wcięcie tekstu";
> $admtext['nicremind'] = "zmniejsz wcięcie tekstu";
> $admtext['nichr'] = "pozioma linia";
> $admtext['nicfontsz'] = "wielk. czcionki";
> $admtext['nicfontfam'] = "zest. czcionek";
> $admtext['nicfontfmt'] = "format czcionki";
> $admtext['niclink'] = "dodaj link";
> $admtext['nicremlink'] = "usuń link";
> $admtext['nictxtcol'] = "zmień kolor tekstu";
> $admtext['nicbkgcol'] = "zmień kolor tła";
> $admtext['nicimage'] = "dołącz zdjęcie";
> $admtext['change'] = "zmień";
> $admtext['editwarn'] = "Twój czas dostępu do tego zapisu kończy się. Zapisz teraz Twoje zmiany, aby zapobiec zastąpieniu ich przez innego użytkownika.";
> $admtext['editconflict'] = "Ten wpis jest edytowany przez innego użytkownika. Spróbuj ponownie później.";
2277,2280c2405
< $admtext['notsaved'] = "Zmiany nie zostały zapisane. Inny użytkownik zablokował zapis.";
< //changed in 9.2.0
< $admtext['linktype'] = "Rodzaj";
< //moved here in 10.0.0
---
> $admtext['notsaved'] = "Zmiany nie zostały zapisane. Ten zapis został zablokowany przez innego użytkownika.";
2282,2283c2407
< $admtext['cremated'] = "Skremowany/a";
< //added in 10.0.0
---
> $admtext['cremated'] = "Kremacja";
2303c2427
< $admtext['findciteid'] = "Znajdź ID cytatu";
---
> $admtext['findciteid'] = "Znajdź ID odnośnika";
2305c2429
< $admtext['citation'] = "Cytat";
---
> $admtext['citation'] = "Odnośnik";
2306a2431,2435
> //added in 12.2
> $admtext['surnames'] = "Nazwiska";
> $admtext['subhead'] = "Podrubryka";
> $admtext['image'] = "Zdjęcie";
> $admtext['author'] = "Autor";
2311,2312c2440,2475
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Pierwsze kroki";
> $admtext['showlog'] = "Modyfikacje";
> $admtext['nobirthinfo'] = "Brak informacji o urodzeniu";
> //changed in 13.0
> $admtext['savereturn'] = "Zapisz i zostań";
> $admtext['saveback'] = "Zapisz i zamknij";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Wszystkie elementy zostały pomyślnie usunięte.";
> $admtext['private'] = "Prywatne";
> $admtext['imgtags'] = "Opisy postaci na zdjęciu";
> 
> $admtext['removelink'] = "Usuń link";
> $admtext['eloptions'] = "Szukaj lub usuń";
> $admtext['pleaseenter'] = "Podaj ";
> 
> $admtext['nolinks'] = "Nie zawiera jeszcze żadnych łączy";
> $admtext['nogeocode'] = "Nie może być geokodowane";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Wybierz<br/>domyślne<br/>zdjęcie"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Niestandardowe wydarzenia";
> $admtext['secondary'] = "Zadania pomocnicze";
> $admtext['otherevents'] = "Inne wydarzenia";
> //added in 14.0
> $admtext['newlinks'] = "�ącza utworzono";
> $admtext['newcemlinks'] = "Utworzono Å‚Ä…cza do cmentarzy";
> $admtext['utility'] = "Narzędzie";
> $admtext['linktype'] = "Typ Å‚Ä…cza";
> $admtext['move'] = "PrzenieÅ›";
> $admtext['copy'] = "Skopiuj";
> $admtext['title2'] = "Tytuł"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Polish-UTF8/albums_help.php TNG1403/languages/Polish-UTF8/albums_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31,32c31,32
<         <p>Znajdź istniejące media szukając  całości lub części <strong>nazwy albumu, opisu</strong> lub
< 		<strong>hasła</strong>. Szukanie bez podania żadnych kryteriów spowoduje, że ukażą się wszystkie albumy z Twojej bazy danych.</p>
---
>  <p>Znajdź istniejący album szukając całości lub części <strong>nazwy albumu, opisu</strong> lub
> 		<strong>słów kluczowych</strong>. Szukanie bez podania żadnych kryteriów spowoduje, że ukażą się wszystkie albumy z Twojej bazy danych.</p>
34c34
< 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie klikniesz przycisku <strong>Zerowanie</strong>, który przywraca domyślne wartości wszystkich wyszukiwań.</p>
---
> 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie klikniesz przycisku <strong>Wyczyść</strong>, który przywraca domyślną wartość pola wyszukiwania.</p>
46,47c46,47
< 		<p><strong>Album</strong>  w TNG jest grupą mediów. Album może zawierać dowolną liczbę mediów, pojedyncze media  mogą należeć do wielu albumów.
< 		Podobnie jak  poszczególne media, albumy mogą być połączone z osobami, rodzinami, źródłami, repozytoriami lub miejscami.</p>
---
> 		<p><strong>Album</strong> w TNG jest grupą mediów. Album może zawierać dowolną liczbę mediów, pojedyncze media mogą należeć do wielu albumów.
> 		Podobnie jak poszczególne media, albumy mogą być połączone z osobami, rodzinami, źródłami, repozytoriami lub miejscami.</p>
49c49
< 		<p>Aby dodać nowy album, kliknij przycisk <strong>Dodaj nowe</strong> , a następnie wypełnić formularz. Informacje dotyczące mediów i łącza
---
> 		<p>Aby dodać nowy album, kliknij przycisk <strong>Dodaj nowe</strong>, a następnie wypełnij formularz. Informacje dotyczące mediów i łącza
61c61,67
< 		<p><span class="optionhead">Pola wymagane:</span> Tylko nazwa albumu jest wymagana, ale powinno być w Twoim interesie wypełnić również  pozostałe pola.</p>
---
> 		<p><span class="optionhead">Aktywny</span><br />
> 		Jeżeli album jest oznaczony jako Aktywny ("Tak"), będzie pokazywany na publicznej liście albumów na Twojej stronie; w przeciwnym razie odwiedzający stronę nie zobaczą go.</p>
> 
> 		<p><span class="optionhead">Zawsze widoczne</span><br />
> Jeżeli zaznaczymy pole "Zawsze widoczne", a album jest powiązany z osobą, rodziną, źródłem lub repozytorium, taki album będzie zawsze pokazywany na stronie powiązanego obiektu, i to nawet w przypadku żyjącej osoby lub rodziny. Normalnie aktywne albumy i inne media powiązane z żyjącymi osobami są ukryte dla odwiedzjących,którym nie nadano prawa do oglądania informacji o takich osobach.</p>
> 
> 		<p><span class="optionhead">Pola wymagane:</span> Tylko nazwa albumu jest wymagana, jest w Twoim interesie wypełnić również pozostałe pola.</p>
70,71c76,77
< 		<p>Aby wprowadzić zmiany do istniejącego albumu, należy nacisnąć przycisk <a href="#search">Szukaj</a> aby znaleźć album, a następnie kliknąć na ikonkę Edycja obok tego albumu.
< 		Następujących elementów nie ma na karcie "dodaj nowy album ":</p>
---
> 		<p>Aby wprowadzić zmiany do istniejącego albumu, należy nacisnąć przycisk <a href="#search">Szukaj</a> w celu znalezienia albumu, a następnie kliknąć na ikonę Edycja obok tego albumu.
> 		Oprócz elementów widocznych na karcie "dodaj nowy album", podczas edytowania są dodatkowe możliwości:</p>
74,77c80,83
< 		<p>Aby dodać media do albumu, kliknij na "Dodaj media", a następnie skorzystaj z wyskakującego okienka, aby wybrać  media znajdujące się w bazie danych.
<                  Aby to zrobić, wybierz Kolekcję i / lub drzewo (oba pola opcjonalne), a następnie wpisz część nazwy lub opisu medium w polu "Szukaj dla" i kliknij "Szukaj".
< 		 Po znalezieniu elementu, który chcesz dodać do albumu, kliknij na "Dodaj" po lewej stronie medium . Ta pozycja zostanie dodana ale okno pozostanie otwarte.
< 		Powtórz ten krok, aby zlokalizować i dodać więcej mediów, lub zamknij okno klikając na czerwone pole z krzyżykiem w prawym górnym rogu aby powrócić na kartę edycji albumu.</p>
---
> 		<p>Aby dodać media do albumu, kliknij na "Dodaj media", a następnie skorzystaj z wyskakującego okienka, aby wybrać media znajdujące się w bazie danych.
> Aby to zrobić, wybierz Kolekcję i / lub drzewo (oba pola opcjonalne), a następnie wpisz część nazwy lub opisu medium w polu "Szukaj dla" i kliknij "Szukaj".
> 		Po znalezieniu elementu, który chcesz dodać do albumu, kliknij na "Dodaj" po lewej stronie medium . Ta pozycja zostanie dodana ale okno pozostanie otwarte.
> 		Powtórz ten krok, aby zlokalizować i dodać więcej mediów, lub zamknij okno klikając na czerwone pole z krzyżykiem w prawym górnym rogu aby powrócić na zakładkę edycji albumu.</p>
84c90
< 		Aby usunąć zdjęcie standardowe, kliknij na "Usuń zdjęcie standardowe" u góry strony.</p>
---
> 		Aby usunąć zdjęcie standardowe, kliknij na "Usuń zdjęcie standardowe" powyżej tabeli wyników.</p>
90,92c96,98
< 		<p>Możesz utworzyć łącze albumu do osób, rodzin, źródeł, repozytoriów lub miejsc. Dla każdego łącza, najpierw należy wybrać drzewo związane z łączem podmiotu.
< 		Następnie należy wybrać link "Rodzaj łącza" (osoby, rodziny, źródła,  repozytoria lub miejsca), i wreszcie wprowadzić numer ID lub nazwę (tylko miejsca)
< 		linku podmiotu. Po wprowadzeniu wszystkich informacji kliknij przycisk "Dodaj".</p>
---
> 		<p>Możesz powiązać album z osobami, rodzinami, źródłami, repozytoriami lub miejscami. Dla każdego łącza, najpierw należy wybrać drzewo związane z łączem podmiotu.
> 		Następnie należy wybrać link "Typ łącza" (Osoba, Rodzina, Źródło, Repozytorium, Odnośnik, Miejsce), i wreszcie wprowadzić numer ID lub nazwę (tylko miejsca)
> 		Å‚Ä…czonego podmiotu. Po wprowadzeniu wszystkich informacji kliknij przycisk "Dodaj".</p>
94,95c100,101
< 		<p>Jeśli nie znasz numeru ID lub dokładnej nazwy miejsca, kliknij na ikonę lupy aby w celu wyszukiwania. Pojawi się okienko popup. Gdy znajdziesz żądany opis podmiotu,
< 		kliknij przycisk "Dodaj" po lewej stronie. Możesz kliknąć "Dodaj" dla wielu podmiotów. Po zakończeniu tworzenia  łączy kliknij na czerwone pole z krzyżykiem w prawym górnym rogu.</p>
---
> 		<p>Jeśli nie znasz numeru ID lub dokładnej nazwy miejsca, kliknij na ikonę lupy w celu wyszukiwania. Pojawi się okienko popup. Gdy znajdziesz żądany opis podmiotu,
> 		kliknij przycisk "Dodaj" po lewej stronie. Możesz kliknąć "Dodaj" dla wielu podmiotów. Po zakończeniu tworzenia łączy kliknij na czerwone pole z krzyżykiem w prawym górnym rogu.</p>
107c113
< 		<p>Aby usunąć album, wybierz kartę <a href="#search">Szukaj</a> w celu lokalizacji albumu, a następnie kliknij ikonę "Usuń" obok wybranego albumu.
---
> 		<p>Aby usunąć album, wybierz zakładkę <a href="#search">Szukaj</a> w celu lokalizacji albumu, a następnie kliknij ikonę "Usuń" obok wybranego albumu.
118c124
< 		Aby zmienić tę kolejność, należy przejść na kartę "Sortuj".</p>
---
> 		Aby zmienić tę kolejność, należy przejść na zakładkę "Sortuj".</p>
120,121c126,127
< 		<span class="optionhead">Drzewo, Rodzaj Å‚Ä…cza, Kolekcja:</span>
< 		<p>Wybierz  drzewo powiązane z podmiotem, dla którego chcesz sortować Albumy. Następnie wybierz rodzaj łącza (osoby, rodziny, źródła, repozytoria lub miejsca)
---
> 		<span class="optionhead">Drzewo, Typ Å‚Ä…cza, Kolekcja:</span>
> 		<p>Wybierz drzewo powiązane z podmiotem, dla którego chcesz sortować Albumy. Następnie wybierz rodzaj łącza (osoby, rodziny, źródła, repozytoria lub miejsca)
132c138,139
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/alltext.php TNG1403/languages/Polish-UTF8/alltext.php
33c33
< $dates['BET'] = "pomiędzy";
---
> $dates['BET'] = "pom.";
35,36c35,36
< $dates['TEXT_AND'] = "oraz";
< $dates['FROM'] = "z";
---
> $dates['TEXT_AND'] = "a";
> $dates['FROM'] = "od";
39,40c39,40
< $dates['CAL'] = "Kal";
< $dates['EST'] = "Szac.";
---
> $dates['CAL'] = "(wylicz.)";
> $dates['EST'] = "(szac.)";
43c43
< $text['cannotexecutequery'] = "Brak odpowiedzi na pytanie";
---
> $text['cannotexecutequery'] = "Nie udało się wykonać zapytania";
45c45
< $text['of'] = "z";
---
> $text['of'] = "od";
47,52c47,52
< $text['text_prev'] = "Przegl.";
< $text['clickdisplay'] = "Pokaż";
< $text['clickhide'] = "Ukryj";
< $text['forgot1'] = "<strong>Zapomniałeś login lub hasło?</strong><br />Wpisz Twój adres e-mail abyśmy mogli Ci wysłać nowe, tymczasowe, hasło.";
< $text['forgot2'] = "Aby zmienić hasło, podaj, w polu powyżej, Twój adres e-mail i poniżej, Twoją nazwę użytkownika (hasło tymczasowe zostanie wysłane na podany adres).";
< $text['newpass'] = "Twoje nowe, tymczasowe, hasło";
---
> $text['text_prev'] = "Poprz.";
> $text['clickdisplay'] = "pokaż";
> $text['clickhide'] = "ukryj";
> $text['forgot1'] = "<strong>Zapomniałeś loginu lub hasła?</strong><br />Wpisz Twój adres e-mail abyśmy mogli Ci wysłać nowe tymczasowe hasło.";
> $text['forgot2'] = "Aby zmienić hasło, podaj w polach powyżej swój adres eMail i nazwę użytkownika.<br />Hasło tymczasowe zostanie wysłane na podany adres.";
> $text['newpass'] = "Twoje nowe,tymczasowe hasło";
54,56c54,56
< $text['pwdsent'] = "Twoje nowe, tymczasowe, hasło zostało wysłane na Twój adres e-mail .";
< $text['loginnotsent2'] = "Adres e-mail, który podałeś, nie figuruje w bazie danych. Żadna informacja nie została wysłana.";
< $text['loginnotsent3'] = "Adres e-mail i nazwa użytkownika, które podałeś, nie figurują w bazie danych. Żadna informacja nie została wysłana.";
---
> $text['pwdsent'] = "Twoje nowe tymczasowe hasło zostało wysłane na Twój adres e-mail .";
> $text['loginnotsent2'] = "Adres e-mail który podałeś nie figuruje w bazie danych. Żadna informacja nie została wysłana.";
> $text['loginnotsent3'] = "Adres e-mail i nazwa użytkownika które podałeś nie figurują w bazie danych. Żadna informacja nie została wysłana.";
58c58
< $text['collapseall'] = "Złóż wszystko";
---
> $text['collapseall'] = "Zwiń wszystko";
86c86
< $text['mainton'] = "Tryb konserwacji jest włączony";
---
> $text['mainton'] = "<font color='red'>WÅ‚Ä…czony jest Tryb konserwacji - strona w trakcie aktualizacji. Przepraszamy za utrudnienia.</font>";
88d87
< //moved here in 8.0.0
91,93c90,92
< $admtext['confunlink'] = "Czy jesteś pewien, że chcesz usunąć łącze tej osoby, jako współmałżonka, z tej rodziny?";
< $admtext['confunlinkc'] = "Czy jesteś pewien, że chcesz odłączyć tą osobę, jako dziecko, z tej rodzinie?";
< $admtext['confremchild'] = "Czy jesteś pewien, że chcesz usunąć łącze tego dziecka z tej rodziny? To dziecko nie zostanie usunięte z bazy danych.";
---
> $admtext['confunlink'] = "Czy jesteś pewien, że chcesz odłączyć tę osobę jako małżonka z tej rodziny?";
> $admtext['confunlinkc'] = "Czy jesteś pewien, że chcesz odłączyć tę osobę jako dziecko z tej rodziny?";
> $admtext['confremchild'] = "Czy jesteś pewien, że chcesz odłączyć to dziecka z tej rodziny? Dziecko nie zostanie usunięte z bazy danych.";
97c96
< $admtext['BIRT'] = "Urodziny";
---
> $admtext['BIRT'] = "Narodziny";
108,109c107,108
< $admtext['MARR'] = "Åšlub";
< $admtext['SLGS'] = "Zaręczony(a) (LDS)";
---
> $admtext['MARR'] = "ZwiÄ…zek";
> $admtext['SLGS'] = "Zaręczyny (LDS)";
111c110
< $admtext['activated'] = "Pana/Pani konto genealogiczne jest już aktywne.";
---
> $admtext['activated'] = "Twoje konto genealogiczne jest już aktywne.";
114,118c113,115
< 
< //moved here in 8.1.0
< $admtext['adopted'] = "adoptowany/a";
< $admtext['birth'] = "rodzony/a";
< $admtext['foster'] = "przybrany/a";
---
> $admtext['adopted'] = "adopt.";
> $admtext['birth'] = "rodz.";  //mja zmienione żeby wykrywać i nie wyswietlać
> $admtext['foster'] = "przybr.";
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,135c120,128
< 
< //moved here in 9.0.0
< $text['letter'] = "Pismo"; //as in page size
< $text['legal'] = "Prawnie"; //as in page size
< $text['sunday'] = "Niedziela";  //first day of week on calendar
< $text['monday'] = "Poniedziałek";
< $text['tuesday'] = "Wtorek";
< $text['wednesday'] = "Åšroda";
< $text['thursday'] = "Czwartek";
< $text['friday'] = "PiÄ…tek";
< $text['saturday'] = "Sobota";
---
> $text['letter'] = "Letter"; //as in page size
> $text['legal'] = "Legal"; //as in page size
> $text['sunday'] = "niedziela";  //first day of week on calendar
> $text['monday'] = "poniedziałek";
> $text['tuesday'] = "wtorek";
> $text['wednesday'] = "środa";
> $text['thursday'] = "czwartek";
> $text['friday'] = "piÄ…tek";
> $text['saturday'] = "sobota";
139,142c132
< //moved here in 9.0.4
< $text['top'] = "najliczniejszych";
< 
< //moved here in 10.0.0
---
> $text['top'] = "najliczniejsze";
144c134
< $text['enteremail'] = "ProszÄ™, podaj poprawny adres e-mail.";
---
> $text['enteremail'] = "Podaj poprawny adres mail.";
149d138
< //added in 10.0.0
155,156d143
< 
< //added in 11.0.0
159d145
< $text['problem'] = "Wystąpił błąd w oprogramowaniu TNG. To może być ze względu na problem instalacji, modernizacji lub błędu programu. Jeśli jesteś właścicielem witryny, możesz skontaktować się z obsługą TNG o pomoc w rozwiązaniu tego problemu. Proszę wpisać poniżej zapytanie i wkleić go do wiadomości.";
163d148
< //moved here in 12.0.0
171c156
< $admtext['medialinks'] = "Linki mediów";
---
> $admtext['medialinks'] = "�ącza mediów";
173d157
< //added here in 12.0.0
175d158
< $text['test_number'] = "Numer testu/nazwa";
180c163
< $admtext['admin_notes'] = "Notatki Administratora";
---
> $admtext['admin_notes'] = "Przypisy Administratora";
182,183c165,166
< $admtext['mrca'] = "Najnowszy wspólny przodek";
< $admtext['marker_values'] = "Wartości Markera";
---
> $admtext['mrca'] = "Najbliższy wspólny przodek";
> $admtext['marker_values'] = "Wartości markera";
194c177
< $admtext['vendor'] = "Nazwa firmy";
---
> $admtext['vendor'] = "Nazwa laboratorium";
196,199c179,182
< $admtext['haplo'] = "Haplogroup";
< $admtext['termsnp'] = "Terminal SNP";
< $admtext['signsnp'] = "ZnaczÄ…ce SNPs";
< $admtext['atdna_test'] = "atDNA (Autosomal)";
---
> $admtext['haplo'] = "Haplogrupa";
> $admtext['termsnp'] = "Terminalne SNP";
> $admtext['signsnp'] = "Znaczniki SNPs";
> $admtext['atdna_test'] = "atDNA (autosomalne)";
201c184
< $admtext['mtdna_test'] = "mtDNA (Mitochondrial)";
---
> $admtext['mtdna_test'] = "mtDNA (mitochondrialne)";
203,204d185
< 
< //moved here in 12.0.0
205a187,258
> $text['test_number'] = "Numer testu/nazwa";
> $admtext['match_date'] = "Data dopasowania";
> $admtext['gedmatchID'] = "ID dopasowania GED";
> $admtext['ydna_haplogroup'] = "Haplogrupa Y-DNA ";
> $admtext['mtdna_haplogroup'] = "Haplogrupa mtDNA ";
> $admtext['relationship_section'] = "Sekcja pokrewieństw";
> $admtext['relationship_range'] = "Zakres pokrewieństw";
> $admtext['suggested_relationship'] = "Sugerowane";
> $admtext['actual_relationship'] = "Rzeczywiste pokrewieństwo";
> $admtext['related_side'] = "Pokrewna gałąź";
> $admtext['shared_dna'] = "Wspólne DNA";
> $admtext['shared centimorgans'] = "Wszystkie wspólne cMs";
> $admtext['shared_segments'] = "Wspólne segmenty";
> $admtext['largest_segment'] = "Największy segment";
> $admtext['chromosome'] = "Numer chromosomu";
> $admtext['segment_start'] = "PoczÄ…tek segmentu";
> $admtext['segment_end'] = "Koniec segmentu";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "PasujÄ…ce SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Prywatne testy";
> $text['shared_dna'] = "Wspólny segment DNA";
> $text['for_match'] = "dla tego dopasowania";
> $admtext['keeptest'] = "Test prywatny";
> $admtext['keepname'] = "Nazwa prywatna";
> $admtext['allgroups'] = "Wszystkie grupy";
> $admtext['alltypes'] = "Wszystkie typy";
> $admtext['generation_num'] = "Pokolenia dla nazwisk rodowych";
> 
> $text['birthabbr'] = "ur.";
> $text['chrabbr'] = "ch.";
> $text['deathabbr'] = "zm.";  //from descend
> $text['burialabbr'] = "poch.";  //from descend
> $text['marrabbr'] = "i";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Wyszukaj wszystkie osoby powiÄ…zane z tÄ… lokalizacjÄ…";
> $text['firstpage'] = "Pierwsza strona";
> $text['lastpage'] = "Ostatnia strona";
> 
> //changed in 13.0.0
> $text['problem'] = "Wystąpił błąd w oprogramowaniu TNG. Co należy zrobić:<p>Jeśli właśnie zainstalowałeś aktualizację, być może pominąłeś część instrukcji aktualizacji.
> Wróć do strony Readme i ponownie przeczytaj instrukcje. Zwróć szczególną uwagę na krok dot. struktury bazy danych.</p>
> <p>Jeśli właśnie zainstalowałeś TNG po raz pierwszy, może być konieczne utworzenie tabel w bazie danych. Przeczytaj plik readme.html i postępuj zgodnie z instrukcjami.</p>
> <p>Jeśli jesteś właścicielem witryny, możesz skontaktować się z pomocą techniczną TNG, aby uzyskać pomoc w rozwiązaniu tego problemu. Skopiuj poniższe zapytanie i wklej do wiadomości.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Brak gałęzi";
> 
> //added in 14.0
> $text['oneyear'] = "rok";
> $text['pwdcodelink'] = "Po kliknięciu tego linku zostanie wysłane mailem tymczasowe hasło";
> $text['pwdcodesent'] = "Link do zresetowania hasła został wysłany na podany adres mailowy.";
> $text['moved'] = "Przeniesiono";
> $text['citation'] = "Odnośniki";
> $text['other'] = "Inne";
> $text['death'] = "Zgon";
> $text['burial'] = "Pogrzeb";
> $text['cremation'] = "Kremacja";
> $text['marriage'] = "Małżeństwo";
> $text['divorce'] = "Rozwód";
> $text['bylength'] = "długości";
> $text['bymarriages'] = "małżeństw";
> $text['none'] = "wcale";
> 
> //moved here in 14.0
> $text['family'] = "Rodzina";
> $text['source'] = "Źródło";
> $text['repository'] = "Archiwum";
> $text['place'] = "Miejsce";
> $admtext['BAPM'] = "Chrzest kościelny";
> 
> $text['glang'] = "pl";
208c261
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c263
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Polish-UTF8/assoc_help.php TNG1403/languages/Polish-UTF8/assoc_help.php
3c3
< echo help_header("Pomoc: ZwiÄ…zki");
---
> echo help_header("Pomoc: Asocjacje");
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
15c15
< 			<a href="notes_help.php" class="lightlink">Pomoc: Notatki &raquo;</a>
---
> 			<a href="notes_help.php" class="lightlink">Pomoc: Przypisy &raquo;</a>
17c17
< 		<span class="largeheader">Pomoc: ZwiÄ…zki</span>
---
> 		<span class="largeheader">Pomoc: Asocjacje</span>
19c19
< 			<a href="#what" class="lightlink">Co to sÄ… zwiÄ…zki?</a> &nbsp; | &nbsp;
---
> 			<a href="#what" class="lightlink">Co to sÄ… asocjacje?</a> &nbsp; | &nbsp;
27c27
< 		<a name="what"><p class="subheadbold">Co to sÄ… zwiÄ…zki?</p></a>
---
> 		<a name="what"><p class="subheadbold">Co to sÄ… asocjacje?</p></a>
29,31c29,31
< 		<p><strong>Związek</strong> jest zapisem relacji między dwojgiem ludzi w Twojej bazie danych, które
<                 nie muszą być oczywiste w regularnej strukturze Twego drzewa genealogicznego. Dwoje ludzi (np. chrześniak i matka chrzestna lub osoba zmarła i świadek zgonu),
<                 którzy są ze sobą powiązani w związku nie musi być ze sobą związanych w rzeczywistości.</p>
---
> 		<p><strong>Asocjacja</strong> jest zapisem relacji między dwiema osobami w Twojej bazie danych, które
>                 nie muszą być odzwierciedlone w strukturze Twego drzewa genealogicznego. Dwie osoby (np. chrześniak i matka chrzestna, albo osoba zmarła i świadek zgonu),
>                 które są ze sobą powiązane w asocjacji, nie muszą mieć między sobą jakichkolwiek powiązań rodzinnych.</p>
38c38
< 		<a name="add"><p class="subheadbold">Dodawanie/Edycja/Usuwanie związków</p></a>
---
> 		<a name="add"><p class="subheadbold">Dodawanie/Edycja/Usuwanie asocjacji</p></a>
40,42c40,42
< 		<p>Aby dodać, edytować lub usuwać związki dla osób, zlokalizuj osobę w Administracja / Osoby i edytuj poszczególne zapisy,
<                 a następnie kliknij na ikonkę <em>Związki</em> na górze ekranu (jeśli istnieją już jakieś związki, ikonka będzie oznaczona zieloną kropką).
<                 Po kliknięciu ikonki, pojawi się małe okienko (popup), w którym zobaczysz wszystkie istniejące dla danej osoby związki.</p>
---
> 		<p>Aby dodawać, edytować lub usuwać asocjacje, zlokalizuj osobę w Administracja / Osoby i edytuj poszczególne zapisy,
>                 a następnie kliknij na ikonkę <em>Asocjacje</em> na górze ekranu (jeśli istnieją już jakieś asocjacje, ikonka będzie oznaczona zieloną kropką).
>                 Po kliknięciu ikonki, pojawi się małe okienko (popup), w którym zobaczysz wszystkie istniejące dla danej osoby asocjacje.</p>
44c44
< 		<p>Aby dodać nowy związek, kliknij na "Dodaj nowe" i wypełnić formularz. </p>
---
> 		<p>Aby dodać nową asocjację, kliknij na "Dodaj nowe" i wypełnij formularz.</p>
46c46
< 		<p>Aby edytować lub usunąć istniejące związki, kliknij na odpowiednią ikonkę obok tego związku.</p>
---
> 		<p>Aby edytować lub usuwać istniejące asocjacje, kliknij na odpowiednią ikonkę obok tej asocjacji.</p>
48c48
< 		<p>Podczas dodawania lub edycji związków dostępne są następujące pola:</p>
---
> 		<p>Podczas dodawania lub edycji asocjacji dostępne są następujące pola:</p>
51c51
< 		<p>Wprowadź ID osoby, które mają być związane z wybraną osobą, lub kliknij ikonę "Znajdź" aby wyszukać jej ID.</p>
---
> 		<p>Wprowadź ID osoby, która ma uzyskać asocjację z wybraną osobą, lub kliknij ikonę "Znajdź" aby wyszukać jej ID.</p>
54c54
< 		<p>Wprowadź charakter związku między dwoma osobami. Na przykład, <em>ojciec chrzestny</em>, <em>świadek</em> itp.</p>
---
> 		<p>Wprowadź charakter asocjacji między tymi osobami. Na przykład, <em>ojciec chrzestny</em>, <em>świadek</em> itp.</p>
56,57c56,58
< 		<p>Po dodaniu, edycji lub usunięciu związków tej osoby, kliknij przycisk "Koniec", aby zamknąć okno.</p>
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 		<p>Po dodaniu, edycji lub usunięciu asocjacji kliknij przycisk "Koniec", aby zamknąć okno.</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/cemeteries_help.php TNG1403/languages/Polish-UTF8/cemeteries_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
29,32c29,30
<         <p>Znajdź istniejący cmentarz szukając jego pełnej nazwy lub jej części, ID cmentarza, miasta, powiatu, województwa, kraju lub nazwy pliku mapy. Jeśli nic nie wybierzesz,
<                 w polu wyszukiwania znajdziesz wszystkie cmentarze zapisane w bazie danych.</p>
< 
< 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie naciśniesz przycisku <strong>Zerowanie</strong>, który przywraca domyślne wartości i wszystkich wyszukiwań.</p>
---
> <p>Znajdź istniejący cmentarz wpisując jego pełną nazwę lub jej część, ID cmentarza, miasto, powiat, województwo, kraj lub nazwę pliku mapy. Jeśli nic nie wpiszesz,
> w polu wyszukiwania zostaną wyświetlone wszystkie cmentarze zapisane w bazie danych.</p>
33a32
> 		<p>Kryteria wyszukiwania na tej stronie zostaną zapamiętane, dopóki nie naciśniesz przycisku <strong>Wyczyść</strong>, który przywraca domyślne wartości wszystkich kryteriów.</p>
35,37c34,36
< 		<p>Ikonki w polu "czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, kliknij pole w kolumnie
< 		<strong>Wybierz</strong> dla każdego rekordu, który ma zostać usunięty, a następnie kliknąć przycisk "Usuń wybrane" znajdujący się na górze listy. Użyj <strong>Wybierz wszystko</strong> lub <strong>Wyczyść wszystko</strong>
< 		aby zaznaczyć lub usunąć zaznaczenie wszystkich pól wyboru naraz.</p>
---
> 		<p>Ikonki w polu "czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, zaznacz pole w kolumnie
> 		<strong>Wybierz</strong> dla każdego rekordu, który ma zostać usunięty, a następnie kliknąć przycisk "Usuń wybrane" znajdujący się na górze listy. Użyj <strong>Wybierz wszystkie</strong> lub <strong>Wyczyść wszystkie</strong>
> 		aby zaznaczyć lub usunąć zaznaczenie wszystkich wyświetlonych rekordów.</p>
46,47c45,46
< 		<p>TNG pozwala na grupowanie nagrobków i wyświetlanie przy danym cmentarzu. Aby to zrobić, należy utworzyć nowy cmentarz  dla każdej lokalizacji. Zapisy dotyczące cmentarzy w TNG nie są związane z zapisami miejsc
<                 pogrzebu i w pliku GEDCOM nie mają odwołania do cmentarzy. Jeśli więc nawet plik GEDCOM zawiera nazwy miejsc pogrzebów, nazwy te nie będą połączone z nazwami cmentarzy i po imporcie pliku GEDCOM łącza te muszą być utworzone w TNG.</p>
---
> 		<p>TNG pozwala na grupowanie nagrobków i wyświetlanie ich przy danym cmentarzu. Aby to zrobić, należy utworzyć nowy cmentarz dla każdej lokalizacji. Zapisy dotyczące cmentarzy w TNG nie są związane z zapisami miejsc
> pogrzebu i w pliku GEDCOM nie mają odwołania do cmentarzy. Jeśli więc nawet plik GEDCOM zawiera nazwy miejsc pogrzebów, nazwy te nie będą połączone z nazwami cmentarzy i po imporcie pliku GEDCOM łącza te muszą być utworzone w TNG. Standard GEDCOM nie obejmuje takiego typu obiektów jak cmentarze; jest własność specyficzna dla TNG.</p>
49,50c48,49
< 		<p>Aby dodać nowy cmentarz, kliknij przycisk <strong>Dodaj nowe</strong>, a następnie wypełnić formularz. Aby edytować istniejący cmentarz, należy użyć przycisku <a href="#search">Szukaj</a> aby zlokalizować cmentarz,
<                 a następnie kliknąć na ikonkę Edycja obok wybranej linii. Podczas dodawania lub edycji cmentarza dostępne są następujące elementy:</p>
---
> 		<p>Aby dodać nowy cmentarz, kliknij przycisk <strong>Dodaj nowe</strong>, a następnie wypełnić formularz. Aby edytować istniejący cmentarz, należy znaleźć go w zakładce <a href="#search">Szukaj</a>,
> a następnie kliknąć na ikonkę Edycja obok wybranej linii. Podczas dodawania lub edycji cmentarza dostępne są następujące elementy:</p>
53c52
< 		<p>Wpisz pełną nazwę cmentarza. Na przykład cmentarz  znajdujący się w Warszawie na Wilanowie należy zapisać jako <em>Cmentarz rzymsko-katolicki w Wilanowie</em> lub <em>Warszawa, Wilanów, cmentarz rzymsko-katolicki</em> a nie tylko <em>Warszawa</em> lub <em>Wilanów</em>.</p>
---
> 		<p>Wpisz pełną nazwę cmentarza. Na przykład cmentarz znajdujący się w Warszawie na Wilanowie należy zapisać jako <em>Cmentarz rzymsko-katolicki w Wilanowie</em> lub <em>Warszawa, Wilanów, cmentarz rzymsko-katolicki</em> a nie tylko <em>Warszawa</em> lub <em>Wilanów</em>.</p>
55,57c54,56
< 		<span class="optionhead">Zdjęcie mapy do załadowania</span>
< 		<p>Jeśli masz mapę lub inne zdjęcia z tego cmentarza, które nie zostało jeszcze przesłane do Twojej witryny, kliknij przycisk "Przeglądaj" i znajdź go na dysku twardym Twego komputera. Jeśli zdjęcie jest już w folderze nagrobków na swojej stronie,
<                 zostaw to pole puste i użyj zamiast tego pola "Nazwa pliku mapy w folderze nagrobki"</p>
---
> 		<span class="optionhead">Zdjęcie cmentarza do załadowania</span>
> 		<p>Jeśli masz plan lub inne zdjęcia z tego cmentarza, kliknij przycisk "Wybierz plik" i znajdź go na dysku twardym Twego komputera. Jeśli zdjęcie jest już umieszczone w folderze Cmentarze na Twojej stronie,
> zostaw to pole puste i użyj zamiast tego pola "Nazwa pliku cmentarza w folderze Cmentarze"</p>
60,64c59
< 		<p> Jeśli poprzednio załadowałeś plik mapy albo zdjęcie na serwer, podaj ścieżkę dostępu i dokładną nazwę pliku, jaka figuruje w katalogu Nagrobki . Możesz także kliknąć na przycisk Wybierz, aby zlokalizować plik. Jeśli przesyłałeś plik mapy lub zdjęcia przy użyciu
<                 poprzedniego pola, ścieżka i nazwa pliku zostanie Ci zaproponowana.</p>
< 
< 		<p> <span class="optionhead">UWAGA</span>:  Jeśli załadowujesz nowy plik, folder musi już istnieć i musi być zapisywalny. Jeśli folder jeszcze nie istnieje możesz skorzystać z funkcji "Utwórz folder" w Ustawieniach głównych. Jeśli to zawiedzie, należy użyć programu FTP lub menedżera plików w online.
<                 Folder ten musi mieć uprawnienia 777 lub 755, które w wielu przypadkach również wystarczą. Nie używaj polskich liter takich jak np. ą, ę ż, ź. Pisz małymi literami, nie rozdzielaj nazwy kropkami lub przecinkami (np. 12.10.99 moje zdjęcie.jpg) Staraj się zapisywać nazwy plików jak w przykładzie: <strong>12_10_99_moje_zdjecie.jpg</strong>.</p>
---
> 		<p> Jeśli poprzednio załadowałeś plik mapy albo zdjęcie na serwer, podaj ścieżkę dostępu i dokładną nazwę pliku. Możesz także kliknąć na przycisk Wybierz, aby zlokalizować plik. Jeśli przesyłałeś plik mapy lub zdjęcia przy użyciu poprzedniego pola, ścieżka i nazwa pliku zostanie Ci zaproponowana.</p>
66,67c61,62
< 		<p><span class="optionhead">Miasto, powiat, województwo, kraj</span>
< 		<p>Podaj tyle informacji, ile wiesz o lokalizacji tego cmentarza. Kraj jest wymagany, pozostałe pola opcjonalne.</p>
---
> 		<p><span class="optionhead">UWAGA</span>: Jeśli załadowujesz nowy plik, folder musi już istnieć i musi być zapisywalny. Jeśli folder jeszcze nie istnieje możesz skorzystać z funkcji "Utwórz folder" w Ustawieniach głównych. Jeśli to zawiedzie, należy użyć programu FTP lub menedżera plików online.
> Folder ten musi mieć uprawnienia 777 lub 755, które w wielu przypadkach również wystarczą. Nie używaj polskich liter takich jak np. ą, ę ż, ź. Pisz małymi literami, nie rozdzielaj nazwy kropkami lub przecinkami (np. 12.10.99 moje zdjęcie.jpg) Staraj się zapisywać nazwy plików jak w przykładzie: <strong>12_10_99_moje_zdjecie.jpg</strong>.</p>
69c64,66
< 		<p>W polach <strong>Województwo</strong> i <strong>Kraj</strong> wybierz istniejący zapis korzystając z rozwijanej listy. Jeśli żądanego wpisu nie ma, skorzystaj z "Dodaj nowe", aby go dodać. Jeśli znajdziesz na liście niewłaściwy wpis zaznacz go, a następnie kliknij przycisk "Usuń zaznaczone".</p>
---
> 		<span class="optionhead">Miasto, Powiat, Województwo, Kraj</span>
> 		<p>Podaj tyle informacji, ile wiesz o lokalizacji tego cmentarza. Kraj jest wymagany, pozostałe pola opcjonalne.
> 		W polach <strong>Województwo</strong> i <strong>Kraj</strong> wybierz istniejący zapis korzystając z rozwijanej listy. Jeśli żądanego wpisu nie ma, skorzystaj z "Dodaj nowe", aby go dodać. Jeśli znajdziesz na liście niewłaściwy wpis zaznacz go, a następnie kliknij przycisk "Usuń zaznaczone".</p>
72,74c69,71
< 		<p>Kliknij przycisk "Pokaż / Ukryj mapę Google", aby pokazać mapę. Ta opcja jest dostępna tylko jeśli masz "klucz mapy" z Google i wpisałeś go w Administracja/Ustawienia i konfiguracja/Ustawienia mapy (patrz <a href="mapsettings_help.php">Pomoc: Ustawienia mapy</a>). Kliknij przycisk ponownie, aby ukryć mapę. Aby wyszukać
<                 miejscowość na mapie, wpisz jej nazwę w polu <strong>Określenie miejsca Geocode</strong> i kliknij "Szukaj". Możesz też kliknąć  na mapę i przeciągnąć, aby przenieść "szpilkę" na żądaną lokalizację. Można również użyć kontroli Zoom, aby pokazać bardziej szczegółowo żądany obszar. Zobacz stronę
< 		<a href="places_googlemap_help.php">Pomoc: Mapy Google</a> aby uzyskać więcej informacji. W celu uzyskania informacji na temat domyślnych ustawień mapy patrz również <a href="mapsettings_help.php">Pomoc: Ustawienia mapy</a>.</p>
---
> 		<p>Kliknij przycisk "Pokaż / Ukryj mapę Google", aby pokazać mapę. Ta opcja jest dostępna tylko jeśli masz "klucz mapy" z Google i wpisałeś go w Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia mapy (patrz <a href="mapsettings_help.php">Pomoc: Ustawienia mapy</a>). Kliknij przycisk ponownie, aby ukryć mapę. Aby wyszukać
> miejscowość na mapie, wpisz jej nazwę w polu <strong>Określenie miejsca Geocode</strong> i kliknij "Szukaj". Możesz też kliknąć na mapę i przeciągnąć, aby przenieść "szpilkę" na żądaną lokalizację. Można użyć kontroli Zoom, aby pokazyeać bardziej lub mniej szczegółowo żądany obszar. Zobacz stronę
> <a href="places_googlemap_help.php">Pomoc: Mapy Google</a> aby uzyskać więcej informacji. W celu uzyskania informacji na temat domyślnych ustawień mapy patrz również <a href="mapsettings_help.php">Pomoc: Ustawienia mapy</a>.</p>
77c74
< 		<p>Wprowadź szerokość i długość geograficzną lokalizacji cmentarza lub kliknij na wybrany punkt na mapie aby ustawić te wartości (opcjonalnie, patrz wyżej).</p>
---
> 		<p>Wprowadź szerokość i długość geograficzną lokalizacji cmentarza lub kliknij na wybrany punkt na mapie aby ustawić te wartości (jeśli możesz korzystać z mapy, patrz wyżej).</p>
81c78
<                 wpisałeś go w Administracja/Ustawienia i konfiguracja/Ustawienia mapy.</p>
---
> wpisałeś go w Administracja/Ustawienia i konfiguracja/Ustawienia mapy.</p>
83c80
< 		<span class="optionhead">Notatki</span>
---
> 		<span class="optionhead">Przypisy</span>
93c90
< 		<p>Aby usunąć jeden cmentarz, należy nacisnąć przycisk <a href="#search">Szukaj</a> w celu jego zlokalizowania, a następnie kliknąć na ikonkę Usuń  obok tego cmentarza. Wiersz zmieni kolor,
---
> 		<p>Aby usunąć jeden cmentarz, należy nacisnąć przycisk <a href="#search">Szukaj</a> w celu jego zlokalizowania, a następnie kliknąć na ikonę Usuń obok tego cmentarza. Wiersz zmieni kolor,
95,96c92,94
<                 przycisk "Usuń wybrane" znajdujący się na górze strony.</p>
<                 <li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> przycisk "Usuń wybrane" ponad tabelą.</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/citations_help.php TNG1403/languages/Polish-UTF8/citations_help.php
3c3
< echo help_header("Pomoc: Cytaty");
---
> echo help_header("Pomoc: Odnośniki");
12,14c12,14
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
< 			<a href="notes_help.php" class="lightlink">&laquo; Pomoc: Notatki</a> &nbsp; | &nbsp;
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
> 			<a href="notes_help.php" class="lightlink">&laquo; Pomoc: Przypisy</a> &nbsp; | &nbsp;
17c17
< 		<span class="largeheader">Pomoc: Cytaty</span>
---
> 		<span class="largeheader">Pomoc: Odnośniki</span>
19c19
< 			<a href="#what" class="lightlink">Co to jest cytat?</a> &nbsp; | &nbsp;
---
> 			<a href="#what" class="lightlink">Co to jest odnośnik?</a> &nbsp; | &nbsp;
27,31c27
< 		<a name="what"><p class="subheadbold">Co to sÄ… cytaty?</p></a>
< 
< 		<p><strong>Cytat</strong> jest odniesieniem do zapisu źródła, dokonanym z zamiarem udowodnienia prawdziwości niektórych informacji. Źródło zawiera
<                 zwykle ogólne dane, gdzie została znaleziona informacja (np. księga lub spis ludności), cytat natomiast zawiera zwylke więcej szczegółowych
<                 informacji (np. na której stronie). To samo źródło może być cytowane w treści dokumentu wiele razy dla różnych osób, rodzin, notatek i wydarzeń.</p>
---
> 		<a name="what"><p class="subheadbold">Co to są Odnośniki?</p></a>
32a29,33
> 		<p><strong>Odnośnik</strong> jest odniesieniem do zapisu źródła, dokonanym z zamiarem udowodnienia
> prawdziwości niektórych informacji. Źródło zawiera zwykle dane, wśród których została znaleziona 
> informacja (np. księga lub spis ludności), odnośnik natomiast wskazuje w którym miejscu źródła znajduje
> się informacja (np. na której stronie). Do tego samego źródła może odwoływać się wiele odnośników, 
> wskazujących różne informacje podawane w treści dokumentu dla różnych osób, rodzin, przypisów i wydarzeń.</p>
39c40
< 		<a name="add"><p class="subheadbold">Dodawanie/Edycja/Usuwanie cytatów</p></a>
---
> 		<a name="add"><p class="subheadbold">Dodawanie/Edycja/Usuwanie odnośników</p></a>
41,42c42,45
< 		<p>Aby dodać, edytować lub usuwać cytaty, należy kliknąć na ikonkę na górze ekranu lub obok wybranego pola (jeśli istnieją już jakieś cytaty,
<                 ikonka będzie oznaczona zieloną kropką). Po kliknięciu ikonki, pojawi się małe okienko (popup), w którym zobaczysz wszystkie istniejące dla wybranego źródła, wydarzenia cytaty.</p>
---
> 		<p>Aby dodawać, edytować lub usuwać odnośniki, należy kliknąć na ikonę na górze ekranu lub obok 
> wybranego pola (jeśli istnieją już jakieś odnośniki, ikona będzie oznaczona zieloną kropką). Po kliknięciu 
> ikony pojawi się małe okienko (popup), w którym zobaczysz wszystkie istniejące odnośniki dotyczące 
> wybranego źródła, wydarzenia itp.</p>
44c47
< 		<p>Aby dodać nowy cytat, kliknij na "Dodaj nowe" i wypełnić formularz. </p>
---
> 		<p>Aby dodać nowy odnośnik, kliknij na "Dodaj nowe" i wypełnij formularz. </p>
46c49
< 		<p>Aby edytować lub usunąć istniejące cytaty, kliknij na odpowiednią ikonkę obok tego cytatu.</p>
---
> 		<p>Aby edytować lub usuwać istniejące odnośniki, kliknij na odpowiednią ikonkę obok tego odnośnika.</p>
48c51
< 		<p>Podczas dodawania lub edycji cytatów dostępne są następujące pola:</p>
---
> 		<p>Podczas dodawania lub edycji odnośników dostępne są następujące pola:</p>
51,53c54,57
< 		<p>Wybierz istniejące źródło do cytowania. Jeśli źródło, które chcemy cytować nie pojawia się na liście źródeł, to znaczy że
<                 albo nie zostało jeszcze utworzone albo istnieje w innym drzewie. Najpierw przejdź do Administracja / Źródła i utwórz źródło
<                 dla właściwego drzewa, a następnie wrócić do listy cytatów i wybierz źródło.</p>
---
> 		<p>Wybierz istniejące źródło, do którego ma powstać odnośnik. Jeśli źródło nie pojawia się na 
> liście źródeł, to znaczy że albo nie zostało jeszcze utworzone albo istnieje w innym drzewie. Najpierw 
> przejdź do Administracja / Źródła i utwórz źródło dla właściwego drzewa, a następnie wróć do listy 
> odnośników i wybierz to źródło.</p>
55,56c59,60
<         <!--<span class="optionhead">Opis</span>
< 		<p>Jeśli Twój program genealogiczny nie przydziela numerów ID swoim źródłom, cytaty będą miały swój opis. Nie zobaczysz pola do opisu nowych cytatów.</p>-->
---
> <!--<span class="optionhead">Opis</span>
> 		<p>Jeśli Twój program genealogiczny nie przydziela numerów ID swoim źródłom, Odnośniki będą miały swój opis. Nie zobaczysz pola do opisu nowych cytatów.</p>-->
64,65c68,69
< 		<span class="optionhead">Data cytatu</span>
< 		<p>Data zwiÄ…zana z tym cytatem (opcjonalne).</p>
---
> 		<span class="optionhead">Data odnośnika</span>
> 		<p>Data związana z tym odnośnikiem (opcjonalne).</p>
70,72c74,77
< 		<span class="optionhead">Notatki</span>
< 		<p>Wszelkie uwagi pomocnicze dotyczące tego źródła (opcjonalne).</p><br>
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 		<span class="optionhead">Przypisy</span>
> 		<p>Wszelkie dodatkowe uwagi dotyczące tego źródła (opcjonalne).</p><br>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/collections_help.php TNG1403/languages/Polish-UTF8/collections_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
29,32c29,33
< 		<p><strong>Kolekcja</strong> w TNG odnosi się do rodzaju mediów. Standardowymi kolekcjami w TNG są  zdjęcia, dokumenty, nagrobki, historie,
<                 filmy i nagrania. TNG pozwala jednak również na tworzenie własnych kolekcji. Kolekcja nie jest ograniczona do jednego rodzaju plików.
<                 Na przykład zdjęcia w formacie jpg mogą być częścią każdej kolekcji, nie tylko zdjęć lub dokumentów. Kolekcja zdjęć nie musi zawierać wyłącznie plików graficznych.</p>
< 
---
> 		<p><strong>Kolekcja</strong> w TNG odnosi się do rodzaju mediów. Standardowymi kolekcjami w TNG 
> są  zdjęcia, dokumenty, nagrobki, historie, filmy i nagrania. TNG pozwala jednak również na tworzenie 
> własnych kolekcji. Kolekcja nie jest ograniczona do jednego formatu (rodzaju) plików.
> Na przykład zdjęcia w formacie jpg mogą być częścią każdej kolekcji, nie tylko zdjęć lub dokumentów. 
> Kolekcja zdjęć nie musi zawierać wyłącznie plików graficznych.</p>
41,42c42,44
< 		<p>Aby dodać nową kolekcję, kliknij na przycisk "Dodaj kolekcję" tam gdzie jest on widoczny (na przykład w dziale Media na kartach Szukaj i Dodaj nowe).
<                 Kiedy pojawi się okienko popup, wypełnij formularz. Do dyspozycji są następujące pola:</p>
---
> 		<p>Aby dodać nową kolekcję, kliknij na przycisk "Dodaj kolekcję" tam gdzie jest on widoczny
> (na przykład w dziale Media na kartach Szukaj i Dodaj nowe).
> Kiedy pojawi się okienko popup, wypełnij formularz. Do dyspozycji są następujące pola:</p>
45,47c47,49
< 		<p>ID kolekcji to bardzo krótki ciąg znaków. Nie powinno zawierać spacji ani znaków, które nie są alfanumeryczne. Idealnie było by to 10 znaków lub mniej.
<                 Na przykład, jeśli tworzysz kolekcję dla tematów wojskowych, możesz podać "wojsko" jako jej ID . Ta wartość nie będzie wyświetlana więc to, jak ją nazwiesz
<                 nie jest ważne tak długo, jak długo jest ona niepowtarzalna.</p>
---
> 		<p>ID kolekcji to krótki ciąg znaków alfanumerycznych. Nie powinien by dłuższy niż 10 znaków.
> Na przykład, jeśli tworzysz kolekcję dla tematów wojskowych, możesz podać "wojsko" jako jej ID.
> Ta wartość nie będzie wyświetlana więc to, jak ją nazwiesz nie jest ważne, o ile jest unikalna.</p>
50,54c52,57
< 		<p>Nazwa ta będzie wyświetlana na liście kolekcji i gdy będą pokazywane elementy tej kolekcji. Wyświetlany tytuł może być nieco dłuższy niż ID kolekcji, ale powinien
<                 on być nadal stosunkowo krótki. Korzystając z tego samego przykładu możesz wpisać "Zdjęcia z wojska" jako nazwę dla tej kolekcji . Możesz wybraną nazwę używać we
<                 wszystkich językach. Jeśli korzystasz na Twojej stronie z wielu języków, i chcesz by wyświetlany tytuł został przetłumaczony w tych językach, musisz do utworzyć wpis w
<                 pliku "cust_text.php" w folderze każdego języka. W kluczu wiadomości $text należy wpisać ID, a wartość jest wyświetlanym tytułem. Dla tego przykładu Twój wpis będzie wyglądać następująco:</p>
< 
---
> 		<p>Nazwa ta będzie wyświetlana na liście kolekcji i gdy będą pokazywane elementy tej kolekcji.
> Wyświetlany tytuł może być nieco dłuższy niż ID kolekcji, ale powinien być nadal stosunkowo krótki.
> Korzystając z tego samego przykładu możesz wpisać "Zdjęcia z wojska" jako nazwę dla tej kolekcji.
> Jeśli korzystasz na Twojej stronie z wielu języków i chcesz by wyświetlany tytuł został przetłumaczony, 
> musisz utworzyć wpis w pliku "cust_text.php" w folderze każdego języka. W kluczu wiadomości $text należy 
> wpisać ID, a wartość jest wyświetlanym tytułem. Dla tego przykładu Twój wpis będzie wyglądać następująco:</p>
57c60
< 		<p>Musisz powielić plik cust_text.php dla każdego języka, tłumacząc tylko nazwę "Zdjęcia z wojska". Ani klucz ani ID ( "wojsko") nie może być tłumaczone.</p>
---
> 		<p>Musisz powielić plik cust_text.php dla każdego języka, tłumacząc tylko nazwę "Zdjęcia z wojska". Ani klucz ani ID ("wojsko") nie może być tłumaczone.</p>
60,63c63,70
< 		<p>Nazwa fizycznego folderu lub katalogu na Twojej stronie internetowej, w którym będą przechowywane elementy tej kolekcji. Powinna być stosunkowo krótka, bez spacji i składać się wyłącznie ze
<                 znaków alfanumerycznych (np. "wojsko"). Po wprowadzeniu wartości, możesz kliknąć na przycisk "Twórz folder". Powinien pojawić się komunikat informujący, czy tworzenie było udane, czy nie.
<                 Jeśli serwer nie pozwala na tę operację, będziesz musiał skorzystać z programu FTP lub menedżera plików online w celu utworzenia folderu. Powinien on zostać utworzony w tym samym folderze
<                 nadrzędnym jak "zdjęcia", "dokumenty", "historie" i inne foldery kolekcji. Upewnij się, że jego rzeczywista nazwa odpowiada dokładnie nazwie wpisanej tutaj  ( "Wojsko" to nie to samo co "wojsko").</p>
---
> 		<p>Nazwa folderu (katalogu) na serwerze Twojej strony internetowej, w którym będą przechowywane 
> elementy tej kolekcji. Powinna być stosunkowo krótka, bez spacji i składać się wyłącznie ze
> znaków alfanumerycznych (np. "wojsko"). Po wprowadzeniu wartości, możesz kliknąć na przycisk "Twórz 
> folder". Powinien pojawić się komunikat informujący, czy tworzenie było udane, czy nie.
> Jeśli serwer nie pozwala na tę operację, będziesz musiał skorzystać z programu FTP lub menedżera plików 
> online w celu utworzenia folderu. Powinien on zostać utworzony w tym samym folderze
> nadrzędnym co "zdjęcia", "dokumenty", "historie" i inne foldery kolekcji. Upewnij się, że jego 
> rzeczywista nazwa odpowiada dokładnie nazwie wpisanej tutaj ("Wojsko" to nie to samo co "wojsko").</p>
66c73,74
< 		<p>Musisz utworzyć własną ikonę, lub użyć jednego z już istniejących i podać nazwę pliku ikony. Plik ikony powinien znajdować się w folderze głównym TNG, wraz z innymi standardowymi ikonami mediów (np. "tng_photo.gif" lub "tng_doc.gif").</p>
---
> 		<p>Musisz utworzyć własną ikonę lub użyć jednej z już istniejących i podać nazwę pliku ikony.
> Plik ikony powinien znajdować się w głównym folderze grafik TNG (tzn. <i>img</i>), wraz z innymi standardowymi ikonami mediów (np. "tng_photo.gif" lub "tng_doc.gif").</p>
69c77,78
< 		<p>Wpisz tutaj liczbę aby wskazać kolejność, w jakiej będą wyświetlane w menu publicznym niestandardowe  typy kolekcji. Jako pierwsze pojawiają się najniższe numery.</p>
---
> 		<p>Wpisz tutaj liczbę aby wskazać kolejność wyświetlania w menu publicznym niestandardowych
> kolekcji. Jako pierwsze pojawiają się najniższe numery.</p>
72,73c81,83
< 		<p>Być może zauważyliście, że karty  Dodaj nowe i Edycja zmieniają się nieco w zależności od wybranej kolekcji. Pole "Takie same ustawienia jak " pozwala na wskazanie rodzaju standardowej kolekcji, który w odniesieniu do układu tych kart
<                 powinna najbardziej przypominać Twoja nowa kolekcja.</p>
---
> 		<p>Być może zauważyliście, że karty Dodaj nowe i Edycja zmieniają się nieco w zależności od 
> wybranej kolekcji. Pole "Takie same ustawienia jak" pozwala na wskazanie jednej ze standardowych 
> kolekcji, którą w odniesieniu do układu tych kart powinna najbardziej przypominać nowa kolekcja.</p>
77,80c87,94
< 		<p>Aby edytować istniejące niestandardowe kolekcje (standardowe nie mogą być edytowane, chyba że w Ustawieniach głównych), zaznacz kolekcję na liście i kliknij przycisk Edycja. Pola wypełnij w sposób opisany powyżej.</p>
< 
< 		<p>Aby usunąć istniejącą kolekcję niestandardową wybierz ją z listy i kliknij przycisk Usuń. Ani fizyczny folder kolekcji utworzony na serwerze, ani żaden z jego elementów nie powinny zostać usunięte.</p>
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 		<p>Aby edytować istniejące niestandardowe kolekcje (standardowe nie mogą być edytowane, chyba że 
> w Ustawieniach głównych), zaznacz kolekcję na liście i kliknij przycisk Edycja. Pola wypełnij w sposób 
> opisany powyżej.</p>
> 
> 		<p>Aby usunąć istniejącą kolekcję niestandardową wybierz ją z listy i kliknij przycisk Usuń.
> Ani folder kolekcji utworzony na serwerze, ani żaden z jego elementów nie zostaną usunięte.</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/cust_text.php TNG1403/languages/Polish-UTF8/cust_text.php
5,6d4
< //Wpisz tu swoje własne opisy, tak jak w następnej linii:
< //$text[messagename] = "Nazwa opisu";
diff -r TNG/languages/Polish-UTF8/data_protection_policy.php TNG1403/languages/Polish-UTF8/data_protection_policy.php
4,5c4,5
< <p>W³aœciciel(e) tej strony bardzo powa¿nie traktuj¹ ochronê Twoich danych osobowych. 
< Traktujemy Twoje dane osobowe w sposób poufny i zgodnie z ustawowymi przepisami o ochronie danych i niniejsz¹ polityk¹ prywatnoœci.</p>
---
> <p>Właściciel tej strony bardzo poważnie traktuje ochronę Twoich danych osobowych. 
> Traktujemy Twoje dane osobowe w sposób poufny i zgodnie z ustawowymi przepisami o ochronie danych i niniejszą polityką prywatności.</p>
7,9c7,9
< <p>Korzystanie z naszej strony internetowej jest mo¿liwe bez podawania danych osobowych.</br> 
< Gdy dane osobowe s¹ wymagane (na przyk³ad imiê i nazwisko oraz adres e-mail w formularzu kontaktowym), s¹ one podawane dobrowolnie. 
< Te dane nie bêd¹ przekazywane stronom trzecim.</p>
---
> <p>Korzystanie z naszej strony internetowej jest możliwe bez podawania danych osobowych.</br> 
> Gdy prosimy o dane osobowe (np. imiÄ™ i nazwisko oraz adres e-mail w formularzu kontaktowym), sÄ… one podawane dobrowolnie. 
> Te dane nie będą przekazywane stronom trzecim.</p>
11,12c11,12
< <p>Zwracamy uwagê, ¿e przesy³anie informacji przez Internet podlega kwestiom bezpieczeñstwa.
< Ca³kowita ochrona danych przed dostêpem osób trzecich nie jest mo¿liwa.</p>
---
> <p>Zwracamy uwagę, że przesyłanie informacji przez Internet podlega kwestiom bezpieczeństwa.
> Całkowita ochrona danych przed dostępem osób trzecich nie jest możliwa.</p>
15,16c15,16
< <p>Ta strona korzysta z plików cookie. Pliki cookie nie szkodz¹ komputerowi i nie zawieraj¹ wirusów. Pliki cookie pe³ni¹ wa¿ne funkcje w dzia³aniu tej strony.</br>
< Pliki cookie to ma³e pliki tekstowe przechowywane na komputerze u¿ytkownika przez przegl¹darkê.</p>
---
> <p>Ta strona korzysta z plików cookie. Pliki cookie nie szkodzą komputerowi i nie zawierają wirusów. Pliki cookie pełnią ważne funkcje w działaniu tej strony.</br>
> Pliki cookie to małe pliki tekstowe przechowywane na komputerze użytkownika przez przeglądarkę.</p>
18,20c18,20
< <p>Wiêkszoœæ plików cookie, których u¿ywamy, to "cookie sesji". S¹ one automatycznie usuwane po zamkniêciu przegl¹darki. Inne pliki cookie
< pozostan¹ zapisane na Twoim urz¹dzeniu, dopóki ich nie usuniesz.</br>
< Te pliki cookie pozwalaj¹ nam rozpoznaæ Twoj¹ przegl¹darkê przy nastêpnej wizycie i przywróciæ niektóre z Twoich preferencji (takich jak preferowany jêzyk).</p>
---
> <p>Większość plików cookie, których używamy, to "cookie sesji". Są one automatycznie usuwane po zamknięciu przeglądarki. Inne pliki cookie
> pozostaną zapisane na Twoim urządzeniu, dopóki ich nie usuniesz.</br>
> Te pliki cookie pozwalają nam rozpoznać Twoją przeglądarkę przy następnej wizycie i przywrócić niektóre z Twoich preferencji (takich jak preferowany język i zakładki).</p>
22,26c22,23
< <p>Mo¿esz skonfigurowaæ ustawienia przegl¹darki tak, abyœ by³ informowany o ustawieniach plików cookie i zezwoli³ na pliki cookie tylko w niektórych przypadkach.</br>
< Wy³¹czenie plików cookie mo¿e ograniczyæ funkcjonalnoœæ tej witryny.</p>
< 
< <h3>Pliki dziennika serwera</h3>
< <p>Dostawca tych stron automatycznie zbiera i przechowuje informacje w plikach dziennika serwera, które Twoja przegl¹darka przekazuje nam. To s¹:</p>
---
> <p>Możesz skonfigurować ustawienia przeglądarki tak, aby informowała o ustawieniach plików cookie i zezwalała na zapis plików cookie tylko w niektórych przypadkach.</br>
> Wyłączenie plików cookie może ograniczyć funkcjonalność tej witryny.</p>
27a25,26
> <h3>Pliki logu serwera</h3>
> <p>Dostawca tych stron automatycznie zbiera i przechowuje informacje w plikach logu serwera, które Twoja przeglądarka przekazuje serwerowi. Są to:</p>
29c28
< 		<li>Typ i wersja przegl¹darki</li>
---
> 		<li>Typ i wersja przeglÄ…darki</li>
31,32c30,31
< 		<li>URL strony polecaj¹cej</li>
< 		<li>Nazwa hosta komputera uzyskuj¹cego dostêp</li>
---
> 		<li>URL strony polecajÄ…cej</li>
> 		<li>Nazwa hosta komputera uzyskującego dostęp</li>
34c33
< 		<li>Czas ¿¹dania</li>
---
> 		<li>Data/czas żądania</li>
36,37c35,36
< <p>Dane te nie mog¹ byæ przypisane do konkretnych osób. Te dane nie zostan¹ po³¹czone z innymi Ÿród³ami danych.</br>
< Zastrzegamy sobie prawo do sprawdzenia tych danych z moc¹ wsteczn¹, jeœli dowiemy siê o konkretnych wskazaniach do nielegalnego u¿ycia.</p>
---
> <p>Dane te nie będą przypisane do konkretnych osób, ani nie zostaną powiązane z innymi źródłami danych.</br>
> Zastrzegamy sobie prawo do sprawdzenia tych danych z mocą wsteczną, jeśli dowiemy się o konkretnych wskazaniach do nielegalnego użycia.</p>
40,42c39,41
< <p>Jeœli przeœlesz nam zapytania za poœrednictwem formularza kontaktowego, Twoje dane z formularza, w tym dane kontaktowe, które poda³eœ,
< bêd¹ przechowywane w celu przetworzenia wniosku oraz w przypadku dalszych pytañ.</br>
< Oczywiœcie nie przekazujemy tych danych.</p>
---
> <p>Jeśli prześlesz nam zapytania za pośrednictwem formularza kontaktowego, Twoje dane z formularza, w tym dane kontaktowe, które podałeś,
> będą przechowywane w celu przetworzenia wniosku oraz w przypadku dalszych pytań.</br>
> Oczywiście nie przekazujemy nikomu tych danych.</p>
45,47c44,46
< <p>W ka¿dej chwili masz prawo do uzyskania informacji na temat swoich przechowywanych danych osobowych, ich pochodzenia i odbiorców oraz
< celu jakiegokolwiek przetwarzania lub przesy³ania, wraz z prawem do poprawiania, blokowania lub usuwania tych danych. W celu uzyskania dalszych informacji
< na temat danych osobowych mo¿esz <a href="suggest.php"> skontaktowaæ siê z nami w dowolnym momencie</a>.</p>
---
> <p>W każdej chwili masz prawo do uzyskania informacji na temat przechowywanych Twoich danych osobowych, ich pochodzenia oraz
> celu jakiegokolwiek przetwarzania lub przesyłania, wraz z prawem do poprawiania, blokowania lub usuwania tych danych. W celu uzyskania dalszych informacji
> na temat danych osobowych możesz <a href="suggest.php"> skontaktować się z nami</a> w dowolnym momencie.</p>
diff -r TNG/languages/Polish-UTF8/events_help.php TNG1403/languages/Polish-UTF8/events_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31,34c31,34
< 		Większość wspólnych wydarzeń takich jak narodziny, śmierć, małżeństwo i kilka innych, jest zawarta na głównych stronach osób, rodzin, źródeł i repozytoriów.
< 		Te wydarzenia są przechowywane w odpowiednich tabelach bazy danych. Dokumentacja TNG odnosi się do tych wydarzeń jako "standardowe".
< 		Wszystkie inne wydarzenia są  "niestandardowe" i są zarządzane w sekcji <strong>Inne wydarzenia</strong> na kartach osób, rodzin, źródeł i repozytoriów.
< 		Te wydarzenia są przechowywane w oddzielnym tabelach wydarzeń. Pomoc ta odnosi się do kwestii zarządzania tymi <em>niestandardowymi</em> wydarzeniami.</p>
---
> 		Większość wydarzeń takich jak narodziny, śmierć, małżeństwo i kilka innych, jest wprowadzana na głównych stronach osób, rodzin, źródeł i repozytoriów.
> 		Te wydarzenia są przechowywane w odpowiednich tabelach bazy danych. Dokumentacja TNG odnosi się do tych wydarzeń jako "standardowych".
> 		Wszystkie inne wydarzenia są "niestandardowe" i zarządza się nimi w sekcji <strong>Inne wydarzenia</strong> na kartach osób, rodzin, źródeł i repozytoriów.
> 		Te wydarzenia są przechowywane w oddzielnych tabelach wydarzeń. Pomoc niniejsza odnosi się do zarządzania tymi <em>niestandardowymi</em> wydarzeniami.</p>
44c44
<                 będą one wyświetlane w tabeli w sekcji Inne wydarzenia. Dla wyjaśnienia na temat dostępnych pól, patrz rozdział poniżej.</p>
---
> będą one wyświetlane w tabeli w sekcji Inne wydarzenia. Wyjaśnienia na temat dostępnych pól są przedstawione w rozdziale poniżej.</p>
53,54c53
< 		<p>Aby edytować istniejące wydarzenie, należy kliknąć na ikonkę Edycja obok tego wydarzenia w sekcji Inne wydarzenia (aby edytować dane w "standardowym" wydarzeniu takim jak na
<                 przykład narodziny lub zgon, zmień po prostu tekst).</p>
---
> 		<p>Aby edytować istniejące wydarzenie należy kliknąć na ikonę Edycja obok tego wydarzenia w sekcji Inne wydarzenia. Otworzy się wówczas pomocnicze okno Modyfikacja wydarzenia.<br/>Aby edytować dane w "standardowym" wydarzeniu, takim jak np. narodziny lub zgon, zmień po prostu tekst.</p>
56c55
< 		<p>Podczas dodawania lub edycji notatki dostępne są następujące pola:</p>
---
> 		<p>Podczas dodawania lub edycji wydarzenia niestandardowego dostępne są następujące pola:</p>
58,60c57,59
< 		<span class="optionhead">Rodzaj wydarzenia</span>
< 		<p>Wybierz rodzaj wydarzenia (nie można zmienić rodzaju wydarzenia dla istniejącego wydarzenia). Jeśli potrzebnego rodzaju wydarzenia nie ma w polu wyboru, przejdź najpierw do
<                 Administracja / Niestandardowe rodzaje wydarzeń i ustaw rodzaj wydarzenia, a następnie powrócić na tę kartę, aby je wybrać.</p>
---
> 		<span class="optionhead">Typ wydarzenia</span>
> 		<p>Wybierz typ wydarzenia z rozwijanej listy (nie można zmienić typu istniejącego wydarzenia). Jeśli potrzebnego typu wydarzenia nie ma na liście, przejdź najpierw do
> Administracja / Niestandardowe wydarzenia i zdefiniuj pożądany typ wydarzenia, a następnie powróć na tę kartę, aby je wybrać.</p>
62,63c61,62
<         <span class="optionhead">Data wydarzenia</span>
< 		<p>Rzeczywista lub zbliżona data związana z wydarzeniem.</p>
---
> <span class="optionhead">Data wydarzenia</span>
> 		<p>Rzeczywista lub przybliżona data związana z wydarzeniem.</p>
65,66c64,65
<         <span class="optionhead">Miejsce wydarzenia</span>
< 		<p>Miejsce, gdzie nastąpiło wydarzenie. Podaj nazwę miejsca lub kliknij ikonkę "Znajdź" (lupka), aby zlokalizować wprowadzone wcześniej miejsce.</p>
---
> <span class="optionhead">Miejsce wydarzenia</span>
> 		<p>Miejsce, gdzie nastąpiło wydarzenie. Podaj nazwę miejsca lub kliknij ikonkę "Znajdź" (lupka), aby wykorzystać mijsce wprowadzone już wcześniej.</p>
68,69c67,68
<         <span class="optionhead">Szczegóły</span>
< 		<p>Wszelkie dodatkowe wyjaśnienia w przypadku, jeśli jest to konieczne. Jeśli nie ma miejsca lub daty związanych z wydarzeniem, pole "szczegóły"  powinno zawierać informacje dotyczące tych brakujących danych.</p>
---
> <span class="optionhead">Szczegóły</span>
> 		<p>Wszelkie dodatkowe informacje, jeśli są one konieczne. Jeśli nie ma daty lub miejsca związanego z wydarzeniem, pole "szczegóły" może zawierać informacje dotyczące tych brakujących danych.</p>
71,73c70,72
<         <span class="optionhead">Więcej</span><br />
< 		<p>Więcej rzadziej używanych informacji można dodać do każdego wydarzenia klikając na napis "Więcej" lub strzałkę obok niego. W ten sposób pojawią dodatkowe pola. Pola te możesz ukryć przez ponowne kliknięcie
<                 na napis lub strzałkę. Ukrywanie pól nie usuwa zapisanych informacji. Te dodatkowe pola to:</p>
---
> 		<span class="optionhead">Duplikuj dla:</span>
> 		<p>W celu zduplikowania tego wydarzenia dla jednej lub więcej osób lub rodzin, w polu ID: wprowadź identyfikatory tych osób lub rodzin. Jeżeli wprowadzasz więcej niż jeden identyfikator, rozdzielaj je przecinkami. Jeżeli nie znasz identyfikatora, kliknij ikonę "Szukaj" z prawej aby wyszukać osobę po nazwisku. Powielenie wydarzenia nastąpi po kliknięciu przycisku "Zapisz".
> <br/>Gdy okienko będzie ponownie otwarte później, jego pola znów będą puste. Zmiany wydarzenia wówczas wprowadzane <strong>nie będą</strong> propagowane dla duplikatów wykonanych wcześniej!</p>
75c74,76
<         <p><span class="optionhead">Wiek</span>: Wiek osoby w czasie wydarzenia.</p>
---
> <span class="optionhead">Więcej</span><br />
> 		<p>Inne rzadziej używane rodzaje informacji można dodać do każdego wydarzenia klikając na napis "Więcej" lub strzałkę obok niego. W ten sposób pojawią dodatkowe pola. Pola te możesz ukryć przez ponowne kliknięcie
> na napis lub strzałkę. Ukrywanie pól nie usuwa zapisanych informacji. Te dodatkowe pola to:</p>
77c78
<         <p><span class="optionhead">UrzÄ…d</span>: Kompetentny i / lub odpowiedzialny w momencie wydarzenia organ lub instytucja.</p>
---
> <p><span class="optionhead">Wiek</span>: Wiek osoby w czasie wydarzenia.</p>
79c80
<         <p><span class="optionhead">Przyczyna</span>: Przyczyna zdarzenia (najczęściej używane ze śmiercią).</p>
---
> <p><span class="optionhead">UrzÄ…d</span>: Kompetentny i/lub odpowiedzialny w momencie wydarzenia organ lub instytucja.</p>
81c82
<         <p><span class="optionhead">Adres 1/Adres 2/Miasto/Województwo/Kod pocztowy/Kraj/Telefon/E-mail/Strona Web</span>: Adres oraz inne informacje kontaktowe związane z wydarzeniem..</p>
---
> <p><span class="optionhead">Przyczyna</span>: Przyczyna zdarzenia (najczęściej używane dla podania przyczyny zgonu).</p>
83,84c84,87
<         <span class="optionhead">Wymagane pola:</span>
< 		<p>Musisz wybrać rodzaj wydarzenia i wpisać coś w co najmniej jednym z następujących pól: <strong>data wydarzenia</strong>, <strong>miejsce wydarzenia</strong>,
---
> <p><span class="optionhead">Adres 1/Adres 2/Miasto/Województwo/Kod pocztowy/Kraj/Telefon/Mail/Witryna internetowa</span>: Adres oraz inne informacje kontaktowe związane z wydarzeniem.</p>
> 
> <span class="optionhead">Wymagane pola:</span>
> 		<p>Musisz wybrać rodzaj wydarzenia i wpisać coś w przynajmniej jednym z następujących pól: <strong>data wydarzenia</strong>, <strong>miejsce wydarzenia</strong>,
94c97
< 		<p>Aby usunąć istniejące wydarzenie, należy kliknąć na ikonkę Usuń obok tego wydarzenia w sekcji Inne wydarzenia. Wydarzenie zostanie usunięte, niezależnie od tego, czy strona zostanie zapisana.</p>
---
> 		<p>Aby usunąć istniejące wydarzenie, należy kliknąć na ikonę Usuń obok tego wydarzenia w sekcji Inne wydarzenia. Wydarzenie zostanie usunięte, niezależnie od tego, czy strona zostanie zapisana.</p>
101,103c104,107
< 		<a name="citations"><p class="subheadbold">Cytaty</p>
< 		<p>Aby dodać lub edytować cytat ze źródła do wydarzenia musisz najpierw zapisać wydarzenie, a następnie kliknąć na ikonkę obok zapisu tego wydarzenia na liście wydarzeń. Aby uzyskać więcej informacji na ten temat cytatów, zobacz <a href="citations_help.php">Pomoc: Cytaty</a>.</p>
<                 <li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 		<a name="citations"><p class="subheadbold">Źródła</p>
> 		<p>Aby dodać lub edytować odnośnik do źródła dla wydarzenia trzeba najpierw zapisać wydarzenie, a następnie kliknąć na ikonę obok zapisu tego wydarzenia na liście wydarzeń. Aby uzyskać więcej informacji na ten temat odnośników do źródeł, zobacz <a href="citations_help.php">Pomoc: Odnośniki</a>.</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/families_help.php TNG1403/languages/Polish-UTF8/families_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
31,35c31,35
<         <p>Znajdź istniejące rodziny wpisując <strong>ID rodziny</strong>, <strong>Imię męża</strong> lub <strong>Imię żony</strong> albo ich część.
< 		Wybierz drzewo lub zaznacz "Tylko dokładna nazwa" do dalszego zawężenia kryteriów wyszukiwania. Jeśli wybierzesz "Imię męża", będą wyszukiwani wszyscy żonaci mężczyźni z Twojej bazy danych.
< 		Jeśli wybierzesz "Imię żony", będą wyszukiwane wszystkie zamężne kobiety z Twojej bazy danych. Wybierz "Bez imienia" w celu wyszukiwania ID rodzin.</p>
< 
< 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie naciśniesz przycisku <strong>Zerowanie</strong>, który przywraca domyślne wartości i wszystkich wyszukiwań.</p>
---
>         <p>Znajdź istniejące rodziny wpisując <strong>ID rodziny</strong>, <strong>Imię męża</strong> lub
> <strong>Imię żony</strong> albo ich część. Wybierz drzewo lub zaznacz "Tylko dokładna nazwa" do dalszego zawężenia 
> kryteriów wyszukiwania. Jeśli wybierzesz "Imię męża", będą wyszukiwani wszyscy żonaci mężczyźni z Twojej bazy danych.
> Jeśli wybierzesz "Imię żony", będą wyszukiwane wszystkie zamężne kobiety z Twojej bazy danych. Wybierz "Bez imienia" 
> w celu wyszukiwania ID rodzin.</p>
36a37
> 				<p>Kryteria wyszukiwania na tej stronie zostaną zapamiętane, dopóki nie naciśniesz przycisku <strong>Wyczyść</strong>, który przywraca domyślne wartości wszystkich kryteriów.</p>
38,40c39,43
< 		<p>Ikonki w polu "czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, kliknij pole w kolumnie
< 		<strong>Wybierz</strong> dla każdego rekordu, który ma zostać usunięty, a następnie kliknąć przycisk "Usuń wybrane" znajdujący się na górze listy. Użyj <strong>Wybierz wszystko</strong> lub <strong>Wyczyść wszystko</strong>
< 		aby zaznaczyć lub usunąć zaznaczenie wszystkich pól wyboru naraz.</p>
---
> 		<p>Ikonki w polu "czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego 
> wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, kliknij pole w kolumnie <strong>Wybierz</strong> dla każdego 
> rekordu, który ma zostać usunięty, a następnie kliknąć przycisk "Usuń wybrane" znajdujący się na górze listy. Użyj 
> <strong>Wybierz wszystko</strong>  lub <strong>Wyczyść wszystko</strong> aby zaznaczyć lub usunąć zaznaczenie 
> wszystkich pól wyboru naraz.</p>
49,53c52,58
< 		<p><strong>Rodzina</strong> Rodzina jest potrzebna dla każdego związku między "Ojcem" i "Matką" (dzieci mogą ale nie muszą zostać dodane). Jeżeli dana osoba jest zamężna/żonata
< 		i ma dzieci z wieloma partnerami, należy utworzyć nową rodzinę dla każdej pary małżonków lub partnerów.</p>
< 
< 		<p>Aby dodać nową rodzinę, kliknij na <strong>Dodaj nowe</strong>, a następnie wypełnić formularz. Niektóre informacje (notatki, cytaty, związki i dodatkowe wydarzenia)
< 		 mogą być dodane dopiero po kliknięciu na przycisk <strong>Zapisz i kontynuuj</strong>. Do dyspozycji są następujące pola:</p>
---
> 		<p><strong>Rodzina</strong> Rodzina jest potrzebna dla każdego związku między "Ojcem" i "Matką" (dzieci mogą 
> ale nie muszą zostać dodane). Jeżeli dana osoba jest zamężna/żonata i ma dzieci z wieloma partnerami, należy utworzyć 
> nową rodzinę dla każdej pary małżonków lub partnerów.</p>
> 
> 		<p>Aby dodać nową rodzinę, kliknij na <strong>Dodaj nowe</strong>, a następnie wypełnić formularz.
> Niektóre informacje (przypisy, odnośniki, asocjacje i dodatkowe wydarzenia) mogą być dodane dopiero po kliknięciu na 
> przycisk <strong>Zapisz i kontynuuj</strong>. Do dyspozycji są następujące pola:</p>
59,62c64,69
< 		<p>Przypisanie "Gałęzi" do rodziny ogranicza dostęp do danych rodzinnych do użytkowników którzy są przypisani do tej samej gałęzi.  Jeśli co najmniej jedna gałąź została
< 		zdefiniowana i konto użytkownika nie jest przypisane do danej gałęzi, może on przypisać nową rodzinę do jednej lub większej liczby istniejących gałęzi. Aby wybrać
< 		"Gałęzie", kliknij na przycisk "Edycja" w celu otwarcia pola wyboru gałęzi wybranego drzewa. Użyj przycisku Ctrl (Windows) lub Command (Mac), aby wybrać więcej niż jedną gałąź.
<                 Po dokonaniu wyboru przenieś wskaźnik myszy na pole edycji, a pole wyboru zniknie.</p>
---
> 		<p>Przypisanie "Gałęzi" do rodziny ogranicza dostęp do danych rodzinnych do użytkowników którzy są przypisani 
> do tej samej gałęzi.  Jeśli co najmniej jedna gałąź została
> zdefiniowana i konto użytkownika nie jest przypisane do danej gałęzi, może on przypisać nową rodzinę do jednej lub 
> większej liczby istniejących gałęzi. Aby wybrać "Gałęzie", kliknij na przycisk "Edycja" w celu otwarcia pola wyboru 
> gałęzi wybranego drzewa. Użyj przycisku Ctrl (Windows) lub Command (Mac), aby wybrać więcej niż jedną gałąź.
> Po dokonaniu wyboru przenieś wskaźnik myszy na pole edycji, a pole wyboru zniknie.</p>
65,74c72,86
< 		ID rodziny musi być unikalne w obrębie wybranego drzewa i powinno składać się z litery <strong>F</strong> oraz następujących po niej cyfr (nie więcej niż 21).
< 		Numer ID jest generowany automatycznie za każdym razem, gdy strona jest wyświetlana po raz pierwszy,  ale można także w  razie potrzeby wpisać własny ID.
< 		Aby sprawdzić, czy wpisany ID jest unikalny, kliknij przycisk <strong>Sprawdź</strong>. Pojawi się informacja mówiąca, czy wybrany ID jest dostępny.
< 		Aby wygenerować unikalny ID, kliknij przycisk <strong>Generuj</strong>. Będzie to najwyższa liczba zlokalizowana w bazie danych (najwyższe używane ID + 1).
< 	        Aby zabezpieczyć wybrany ID przed zajęciem go przez innego użytkownika podczas wprowadzania danych, kliknij przycisk <strong>Zastosuj</strong>.</p>
< 
< 		<p><strong>UWAGA</strong>: Jeśli korzystasz na Twoim komputerze z programu genealogicznego, który także tworzy numery ID dla nowych rodzin,
< 		jest WYSOCE ZALECANE zachowanie tych ID dla synchronizacji między dwoma programami. Brak tej synchronizacji może skutkować konfliktami, które mogą spowodować,
< 		że Twoje łącza do zdjęć, historii i nagrobków mogą stać się nie do użycia. Jeśli Twój program tworzy ID, nie dostosowane do tradycyjnych standardów
< 		(na przykład <strong>I</strong> jest na końcu, nie na początku), możesz zmodyfikować plik "prefixes.php" tak, aby przyjmował inne prefiksy.</p>
---
> 		ID rodziny musi być unikalny w obrębie wybranego drzewa i powinien składać się z litery <strong>F</strong> 
> oraz następujących po niej cyfr (nie więcej niż 21). Numer ID jest generowany automatycznie za każdym razem,
> gdy strona jest wyświetlana po raz pierwszy,ale można także w  razie potrzeby wpisać własny ID.
> Aby sprawdzić, czy wpisany ID jest unikalny, kliknij przycisk <strong>Sprawdź</strong>. Pojawi się informacja 
> mówiąca, czy wybrany ID jest dostępny. Aby wygenerować unikalny ID, kliknij przycisk <strong>Generuj</strong>.
> Będzie to najmniejsza możliwa liczba dla tej bazy danych (najwyższe używane ID + 1). Aby zabezpieczyć wybrany ID 
> przed zajęciem go przez innego użytkownika podczas wprowadzania danych, kliknij przycisk <strong>Zastosuj</strong>.</p>
> 
> <p><strong>UWAGA</strong>: Jeśli korzystasz na Twoim komputerze z programu genealogicznego, który tworzy 
> identyfikatory rodzin, jest WYSOCE ZALECANE zachowanie tych ID dla synchronizacji między TNG a programem.
> Brak tej synchronizacji może skutkować konfliktami, w których konsekwencji łącza do mediów staną się nie do użycia. 
> Jeśli Twój program tworzy ID niezgodne ze standardowymi ustawieniami TNG (na przykład prefiks <strong>F</strong>
> jest na końcu identyfikatora, a nie na początku), powinieneś zmodyfikować
> <em>Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia główne</em> i tam <em>Prefiksy i sufiksy</em>,
> tak aby TNG przyjmował te prefiksy.</p>
77,80c89,93
< 		<p>Wybierz istniejące osoby, które mają być <strong>ojcem</strong> lub <strong>matką</strong> w rodzinie klikając przycisk "Znajdź ...", lub twórz nowe klikając" Twórz ".
< 		Jeśli wybierzesz tworzenie, informacje o nowej osobie będą mogły zostać wprowadzone  bez opuszczania tej strony. Po utworzeniu nowej osoby jej nazwisko,
< 		imię (imiona) oraz numer ID pojawią się w polu ojca lub matki (nie można edytować bezpośrednio). Aby usunąć małżonków ze związku
< 		(nie usuwając  z bazy danych), kliknij przycisk "Usuń". Aby edytować małżonka, kliknij przycisk "Edycja".</p>
---
> 		<p>Wybierz istniejące osoby, które mają być <strong>ojcem</strong> lub <strong>matką</strong> w rodzinie 
> klikając przycisk "Znajdź...", lub twórz nowe klikając "Twórz". Jeśli tworzysz nową osobę, informacje o niej będą 
> mogły zostać wprowadzone bez opuszczania tej strony. Po utworzeniu nowej osoby jej nazwisko, imię (imiona) oraz
> numer ID pojawią się w polu ojca lub matki (nie można tych pól edytować bezpośrednio). Aby usunąć małżonków
> ze związku (nie usuwając z bazy danych), kliknij przycisk "Usuń". Aby edytować małżonka, kliknij przycisk "Edycja".</p>
83c96
< 		<p>Zaznacz to pole, jeśli jeden z małżonkó żyje lub jeśli chcesz ograniczyć widok danych tej rodziny (np. daty urodzenia, ślubu, zdjęcia) tylko do użytkowników, którzy są zalogowani z dostatecznymi uprawnieniami.</p>
---
> 		<p>Zaznacz to pole, jeśli jeden z małżonków żyje lub jeśli chcesz ograniczyć widoczność danych tej rodziny (np. daty urodzenia, ślubu, zdjęcia) tylko do użytkowników, którzy są zalogowani z dostatecznymi uprawnieniami.</p>
86,91c99,110
< 		<p>Wprowadź daty i miejsca dla wymienionych standardowych wydarzeń (jeśli je znasz).Jeśli nie znasz jakiejś daty, wpisz w odpowiednie pole literkę <strong>Y</strong> (wyświetli się "data nieznana").
< 		Jeśli pole przeznaczone dla daty pozostanie puste, użytkownicy z uprawnieniami <em>Zgoda na składanie komentarzy do podglądu administratora (tylko ludzie, rodziny i źródła)</em> nie będą mogli składać propozycji zmian dot. daty.
< 		Dodatkowe wydarzenia mogą zostać dodane po zapisaniu lub kliknięciu przycisku "zastosuj". Daty należy zawsze podawać w standardowym formacie genealogicznych, DD MMM YYYY (na przykład <em>18 Feb 2008</em>).
< 		Miesiąc należy zawsze wpisywać podając trzy pierwsze litery jego nazwy w języku angielskim (widoczny będzie jego odpowiednik w języku polskim).Oto angielskie odpowiedniki miesięcy: Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec.
< 		Informacje na temat miejsca powinny być rozdzielane przecinkami ( na przykład, <em>Boston, Suffolk, Massachusetts, USA</em>). Możesz również wybrać istniejącą nazwę miejsca przez kliknięcie ikonki "Znajdź" (lupa).
< 		 Aby ograniczyć ilość wyświetleń, podaj przed kliknięciem część nazwy miejsca. Wyświetlą się wszystkie miejsca zawierające w nazwie podane hasło.</p>
---
> 		<p>Wprowadź daty i miejsca dla wymienionych standardowych wydarzeń (jeśli je znasz).Jeśli nie znasz
> jakiejś daty, wpisz w odpowiednie pole literkę <strong>Y</strong> (wyświetli się "data nieznana").
> Jeśli pole przeznaczone dla daty pozostanie puste, użytkownicy z uprawnieniami <em>Zgoda na składanie komentarzy
> do podglądu administratora (tylko ludzie, rodziny i źródła)</em> nie będą mogli składać propozycji zmian dot. daty.
> Dodatkowe wydarzenia mogą zostać dodane po zapisaniu lub kliknięciu przycisku "zastosuj". Daty należy zawsze podawać 
> w standardowym formacie genealogicznym DD MMM YYYY (na przykład <em>18 Feb 2008</em>).
> Miesiąc należy zawsze wpisywać podając trzy pierwsze litery jego nazwy w języku angielskim (widoczny będzie
> jego odpowiednik w języku polskim). Oto angielskie skróty miesięcy:
> Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec.<br />
> Informacje na temat miejsca powinny być rozdzielane przecinkami (np. <em>Boston, Suffolk, Massachusetts, USA</em>). 
> Możesz również wybrać istniejącą nazwę miejsca przez kliknięcie ikonki "Znajdź" (lupa).
> Aby ograniczyć liczbę wyświetleń, podaj przed kliknięciem część nazwy miejsca. Wyświetlą się wszystkie miejsca zawierające tę część nazwy.</p>
94,95c113,117
< 		Te zdarzenia są związane z nakazami praktykowanymi przez Mormonów w Kościele Jezusa Chrystusa Świętych w Dniach Ostatnich (kościół LDS wymyślił standard GEDCOM).
< 		<strong>Uwaga:</strong> Jeśli nie chcesz, aby dane LDS były widoczne, przejdź do <em>Ustawienia i konfiguracja/Ustawienia główne</em> i ustaw tam odpowiednią opcję (musisz się wylogować i ponownie zalogować).</p>
---
> 		Te zdarzenia są związane z nakazami praktykowanymi przez Mormonów w Kościele Jezusa Chrystusa Świętych
> w Dniach Ostatnich (to właśnie kościół LDS opracował standard GEDCOM).
> 		<strong>Uwaga:</strong> Jeśli nie chcesz, aby dane LDS były widoczne, przejdź do
> <em>Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia główne</em> i w sekcji <em>Prywatność</em>
> ustaw odpowiedniÄ… opcjÄ™.</p>
106,110c128,133
< 		<span class="optionhead">Notatki / Cytaty / "Więcej"</span>
< 		<p>Notatki, cytaty i związki możesz łączyć z wydarzeniami lub rodzinami klikając na ikony łączy u góry strony lub obok każdego wydarzenia.
< 		"Więcej" informacji dla wydarzenia można dodać klikając na ikonkę "Plus ". Jeśli w którejś z kategorii istnieją już jakieś elementy,
< 		odpowiednie ikonki oznaczone są zielonymi kropkami w prawym górnym rogu. Aby uzyskać więcej informacji na temat każdej z kategorii, zobacz <em>Pomoc</em>  w okienkach,
< 		które stają się widoczne, gdy ikona zostanie naciśnięta.</p>
---
> 		<span class="optionhead">Przypisy / Odnośniki / "Więcej"</span>
> 		<p>Przypisy, odnośniki i asocjacje możesz łączyć z wydarzeniami lub rodzinami klikając na ikony łączy na 
> górze strony lub obok każdego wydarzenia. "Więcej" informacji dla wydarzenia można dodać klikając na ikonkę 
> "Plus". Jeśli w którejś z kategorii istnieją już jakieś elementy, odpowiednie ikonki oznaczone są zielonymi 
> kropkami w prawym górnym rogu. Aby uzyskać więcej informacji na temat każdej z kategorii, zobacz
> <em>Pomoc</em> w okienkach, które stają się widoczne po naciśnięciu ikony.</p>
113,121c136,147
< 		<p>Aby dodać lub zarządzać dodatkowymi wydarzeniami, kliknij na przycisk "Dodaj nowe" obok <strong>Inne wydarzenia</strong>. Klikając <a href="events_help.php">Pomoc</a> znajdziesz więcej informacji na temat dodawania nowych wydarzeń.
< 	        Gdy wydarzenie zostało dodane, pod polem "Dodaj nowe"  pokaże się krótkie streszczenie. Przyciski w polu "Czynność" dla każdego wydarzenia pozwalają na edycję
< 		lub usunięcie wydarzenia, oraz dodawanie notatek lub cytatów. Kolejność, w której wydarzenia są wyświetlane jest ustalana wg daty (jeżeli dotyczy) i przez przypisany w "Rodzajach wydarzeń " priorytet
< 	        (jeśli nie jest związane terminem). Priorytet ten może ulec zmianie podczas edycji rodzajów wydarzeń.
< 
< 
< 		<p><strong>Uwaga</strong>: Takie informacje o standardowych wydarzeniach jak uwagi, cytaty ze źródeł, związki, "inne" wydarzenia i "więcej"  są zapisywane
< 		automatycznie. Inne zmiany (dotyczące np. nazwiska lub standardowego wydarzenia) można zapisać klikając przycisk "Zapisz" na dole strony,
< 		lub klikając na ikonkę "Zapisz" u góry strony. Drzewo oraz ID osoby nie mogą zostać zmienione.</p>
---
> 		<p>Aby dodać lub zarządzać dodatkowymi wydarzeniami, kliknij na przycisk "Dodaj nowe" obok
> <strong>Inne wydarzenia</strong>. Klikając <a href="events_help.php">Pomoc</a> znajdziesz więcej informacji 
> na temat dodawania nowych wydarzeń.
> Po dodaniu wydarzenia pod polem "Dodaj nowe" pokaże się krótkie streszczenie. Przyciski w polu "Czynność"
> dla każdego wydarzenia pozwalają na edycję lub usunięcie wydarzenia oraz dodawanie przypisów lub odnośników. 
> Kolejność wyświetlania wydarzeń zależy od ich daty (jeżeli dotyczy) i od przypisanego w "Rodzajach wydarzeń" 
> priorytetu (jeśli nie jest związane datą). Priorytet ten może zostać zmieniony podczas edycji rodzajów wydarzeń.
> 
> 		<p><strong>Uwaga</strong>: Informacje o standardowych wydarzeniach takie jak przypisy, odnośniki
> do źródeł, asocjacje, "inne" wydarzenia i "więcej" są zapisywane automatycznie. Inne zmiany (dotyczące np. 
> nazwiska lub standardowego wydarzenia) można zapisać klikając przycisk "Zapisz" na dole strony, lub klikając 
> na ikonkę "Zapisz" na górze strony. Drzewo oraz ID osoby nie mogą zostać zmienione.</p>
124,132c150,162
< 		Wybierz istniejące osoby, które mają być dziećmi w tej rodzinie klikając przycisk "Znajdź...", lub utwórz nowe, klikając "Twórz...".
< 		Jeśli wybierzesz tworzenie, informacje o nowej osobie będą mogły zostać wprowadzone bez opuszczania tej strony. Po utworzeniu nowej osoby
< 		jej nazwisko, imię (imiona) oraz numer ID pojawią się w polu dzieci. Ta lista nie może być edytowana bezpośrednio, ale możesz użyć przycisku "Usuń"
< 		(widoczne, gdy umieścisz wskaźnik myszy nad dowolnym dzieckiem), aby usunąć dziecko z listy. Można także użyć przycisku "Usuń" w rubryce czynność.
< 		Użyj przycisku "Usuń", aby usunąć dziecko z bazy danych, lub "Edycja", aby edytować indywidualny zapis.</p>
< 
< 		<span class="optionhead">Sortowanie rodziców lub małżonów</span>
<                 <p>Jeżeli istnieje więcej niż jeden małżonek lub para rodziców, można zmienić kolejność przez "przeciąganie" bloków w górę i w dół. Aby to zrobić kliknij myszą na pole "Przeciągnij" i przytrzymaj
< 		przycisk, a następnie przesuń w górę lub w dół na stronie. Gdy blok znajdzie się w wybranym miejscu zwolnij przycisk myszy. Zmiany dokonane podczas sortowania są zapisywane automatycznie.</p>
---
> 		Wybierz istniejące osoby, które mają być dziećmi w tej rodzinie, klikając przycisk "Znajdź...",
> lub utwórz nowe, klikając "Twórz...". Jeśli wybierzesz utworzenie, informacje o nowej osobie będą mogły być 
> wprowadzone bez opuszczania tej strony. Po utworzeniu nowej osoby jej nazwisko, imiÄ™ (imiona) oraz numer ID 
> pojawią się w polu dzieci. Ta lista nie może być edytowana bezpośrednio, ale możesz użyć przycisku "Usuń"
> (widoczny, gdy umieścisz wskaźnik myszy nad dowolnym dzieckiem), aby usunąć dziecko z listy. Można także użyć 
> przycisku "Usuń" w rubryce czynność. Użyj przycisku "Usuń", aby usunąć dziecko z bazy danych, lub "Edycja", 
> aby edytować indywidualny zapis.</p>
> 
> 		<span class="optionhead">Sortowanie rodziców lub małżonków</span>
> 		<p>Jeżeli istnieje więcej niż jeden małżonek lub para rodziców, można zmienić ich kolejność przez 
> "przeciąganie" bloków w górę i w dół. Aby to zrobić kliknij myszą na pole "Przeciągnij" i przytrzymaj
> przycisk, a następnie przesuń w górę lub w dół na stronie. Gdy blok znajdzie się w wybranym miejscu zwolnij 
> przycisk myszy. Zmiany dokonane podczas sortowania sÄ… zapisywane automatycznie.</p>
141,143c171,175
< 		<p>Aby usunąć jedną rodzinę, należy nacisnąć przycisk <a href="#search">Szukaj</a> w celu jej zlokalizowania, a następnie kliknąć na ikonkę Usuń obok tej rodziny. Wiersz zmieni kolor,
< 		a następnie zniknie. (małżonkowie i dzieci nie zostaną usunięci z bazy danych, ale małżeństwo zostanie rozwiązane). Aby usunąć więcej niż jedną rodzinę naraz,
< 		zaznacz pole w kolumnie Wybierz obok każdej rodziny, która ma zostać usunięta, a następnie kliknąć przycisk "Usuń wybrane" znajdujący się na górze strony.</p>
---
> 		<p>Aby usunąć jedną rodzinę, należy nacisnąć przycisk <a href="#search">Szukaj</a> w celu jej 
> zlokalizowania, a następnie kliknąć na ikonkę Usuń obok tej rodziny. Wiersz zmieni kolor, a następnie zniknie 
> (małżonkowie i dzieci nie zostaną usunięci z bazy danych, ale małżeństwo zostanie rozwiązane). Aby usunąć 
> więcej niż jedną rodzinę naraz, zaznacz pole w kolumnie Wybierz obok każdej rodziny, która ma zostać 
> usunięta, a następnie kliknąć przycisk "Usuń wybrane" znajdujący się na górze strony.</p>
151,153c183,187
< 		<a name="review"><p class="subheadbold">PrzeglÄ…d zmian</p></a>
<                 <p>Aby sprawdzić propozycje zmian dokonane przez innych użytkowników, kliknij na przycisk "Przegląd zmian". Jeśli są tam jakieś wpisy, w polu "Propozycje zmian" pojawi się gwiazdka (*).
< 		Możesz zadecydować o tym, czy przyjąć czy też usunąć proponowane zmiany. W celu przeglądania możesz wybrać pole drzewa, użytkownika lub oba.</p>
---
> 		<a name="review"><p class="subheadbold">PrzeglÄ…d sugestii</p></a>
> 		<p>Aby sprawdzić sugestie zmian podane przez innych użytkowników, kliknij na przycisk
> "Przegląd sugestii". Jeśli są tam jakieś wpisy, w polu "Przegląd sugestii" pojawi się gwiazdka (*).
> Możesz zadecydować o tym, czy zaakceptować, czy też usunąć proponowane zmiany. W celu przeglądania możesz 
> wybrać pole drzewa, użytkownika lub oba.</p>
156,164c190,198
< 		<p>Zlokalizuj wiersz w tabeli, która opisuje zdarzenie, które chcesz obejrzeć usunąć. Listę wyników  możesz zawęzić przez wybranie użytkownika (osoby odpowiedzialnej za
<                 proponowaną zmianę) oraz / lub drzewa. Kiedy wyniki zostaną wyświetlone, kliknij na jedną z opcji widocznych z lewej strony wiersza.
< 		Aby sprawdzić i ewentualnie nanieść zmiany wybierz <em>Przegląd zmian</em>. Aby odrzucić proponowane zmiany, wybierz <em>Usuń</em>.</p>
< 
< 		<span class="optionhead">PrzeglÄ…d zmian</span><br />
< 		<p>Na tej karcie możesz dokonywać różnych dodatkowych zmian, w tym dotyczących notatek lub źródeł, a następnie kliknąć przycisk "Zapisz i Usuń",
< 		aby zapisać zmiany i usunąć wpis. Można również zdecydować się na usunięcie propozycji klikając przycisk "Ignoruj i Usuń",
< 		lub odłożyć decyzję na później klikając przycisk "Odłóż".</p>
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 		<p>Zlokalizuj wiersz w tabeli, która opisuje zdarzenie, które chcesz obejrzeć usunąć. Listę wyników  możesz zawęzić przez wybranie użytkownika (osoby sugerującej zmianę) oraz / lub drzewa. Kiedy wyniki zostaną wyświetlone, kliknij na jedną z opcji widocznych z lewej strony wiersza. Aby sprawdzić i ewentualnie nanieść zmiany wybierz <em>Przegląd sugestii</em>. Aby odrzucić proponowane zmiany, wybierz <em>Usuń</em>.</p>
> 
> 		<span class="optionhead">PrzeglÄ…d sugestii</span><br />
> 		<p>Na tej karcie możesz dokonywać różnych dodatkowych zmian, w tym dotyczących przypisów lub źródeł,
> a następnie kliknąć przycisk "Zapisz i Usuń", aby zapisać zmiany i usunąć wpis. Można również zdecydować się
> na usunięcie propozycji klikając przycisk "Ignoruj i Usuń", lub odłożyć decyzję na później klikając
> przycisk "Odłóż".</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/index_help.php TNG1403/languages/Polish-UTF8/index_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
20c20
< 			<a href="#notes" class="lightlink">Notatki</a> &nbsp; | &nbsp;
---
> 			<a href="#notes" class="lightlink">Przypisy</a> &nbsp; | &nbsp;
28c28
< 		<p>Nie wiesz co zrobić najpierw? Oto podstawowe informacje:</p>
---
> 		<p>Nie wiesz od czego zacząć? Oto podstawowe informacje:</p>
30,39c30,46
< 				<li><p><strong>Postępuj zgodnie z instrukcjami instalacji w pliku <a href="../readme.html" target="_blank">readme.html</a> albo <a href="http://kielakowie.pl/tng/readme620-700.html" target="blank">readme.html po polsku</a>.
<                                 </strong> Wszystkich podstawowych konfiguracji
< 					można dokonać bezpośrednio z tej strony, tutaj możesz również wprowadzić wszystkie potrzebne wartości w dziale <strong>Ustawienia i konfiguracja</strong> w menu Admina</p></li>
< 				<li><p><strong>Utwórz co najmniej jedno drzewo.</strong> Jeśli masz jeden samodzielny plik GEDCOM, potrzebujesz tylko jedno drzewo.</p></li>
< 				<li><p><strong>Utwórz co najmniej jednego użytkownika.</strong> Pierwszy użytkownik musi być Administratorem (musi on mieć wszystkie uprawnienia i nie może być związany z żadnym drzewem).</p></li>
< 				<li><p><strong>Importuj Twoje dane, lub rozpocznij wpisywanie ręczne</strong>. Jeśli wpisujesz jeden zapis na raz, nie ma znaczenia, od czego zaczynasz.
<                                         Najlepiej jest zaczynać od osób, a następnie łączyć je w rodziny. Później dodawać dzieci i w ten sposób budować drzewo. </p></li>
< 				<li><p><strong>Wejdź na Procesy drugorzędne</strong> (pod Import / Export) i wybierz tam opcje, które uważasz za konieczne (aby uzyskać więcej informacji zobacz "Pomoc").</p></li>
< 				<li><p><strong>Media.</strong> Gdy dane zostały wpisane lub importowane, możesz zacząć tworzyć łącza do zdjęć, historii i innych mediów. Miłej zabawy!</p></li>
< 				<li><p><strong>Inne.</strong> Jeśli będziesz chciał zajrzeć do innych sekcji w menu administratora, na każdej stronie możesz znaleźć dodatkową pomoc.</p></li>
---
> 			<li><p><strong>Postępuj zgodnie z instrukcjami instalacji zawartymi w pliku
> <a href="../readme.html" target="_blank">readme.html</a>.
> </strong> Wszystkich podstawowych konfiguracji można dokonać bezpośrednio z tej strony, tutaj możesz
> również wprowadzić wszystkie potrzebne wartości w dziale <strong>Ustawienia i konfiguracja</strong>
> w menu Administracja.</p></li>
> 			<li><p><strong>Utwórz co najmniej jedno drzewo.</strong> Jeśli masz jeden samodzielny plik GEDCOM, potrzebujesz tylko jedno drzewo.</p></li>
> 			<li><p><strong>Utwórz co najmniej jednego użytkownika.</strong> Pierwszy użytkownik musi być 
> Administratorem (musi on mieć wszystkie uprawnienia i nie może być związany z żadnym drzewem).</p></li>
> 			<li><p><strong>Importuj Twoje dane z pliku GEDCOM lub rozpocznij wprowadzanie ręczne</strong>. 
> Jeśli jednorazowo wprowadzasz jeden zapis, nie ma znaczenia, od czego zaczynasz. Najlepiej jest zaczynać 
> od osób, a następnie łączyć je w rodziny. Później dodawać dzieci i w ten sposób budować drzewo.</p></li>
> 			<li><p><strong>Wejdź na Procesy drugorzędne</strong> (pod Import / Export) i wybierz tam 
> opcje, które uważasz za konieczne (aby uzyskać więcej informacji zobacz "Pomoc").</p></li>
> 			<li><p><strong>Media.</strong> Gdy dane zostały wpisane lub zaimportowane, możesz zacząć 
> tworzyć łącza do zdjęć, historii i innych mediów. Miłej zabawy!</p></li>
> 			<li><p><strong>Inne.</strong> Jeśli będziesz chciał zajrzeć do innych sekcji w menu 
> Administracji, na każdej stronie możesz znaleźć dodatkową pomoc.</p></li>
41d47
< 
49,52c55,59
< 				<li><p>Jeśli zauważysz brak jakichś opcji w menu Administratora, znaczy to prawdopodobnie, że nie jesteś zalogowany z pełnymi uprawnieniami, albo masz uprawnienia tylko do określonego drzewa.
<                                 Aby dokonać zmian uprawnień użytkownika, musisz się wylogować i zalogować ponownie jako </p></li>
< 				<li><p>Link do "Strony publicznej" w menu Administratora po lewej stronie, otwiera okno Twojej przeglądarki w polu obok. Pozwala to na swobodną nawigację na Twojej stronie z możliwością natychmiastowego
<                                 powrotu do sekcji Administratora. </p></li>
---
> 			<li><p>Jeśli zauważysz brak jakichś opcji w menu Administracji, znaczy to prawdopodobnie, że 
> nie jesteś zalogowany z pełnymi uprawnieniami, albo masz uprawnienia tylko do określonego drzewa.
> Aby dokonać zmian uprawnień użytkownika, musisz się wylogować i zalogować ponownie jako Administrator.</p></li>
> 			<li><p>Aby swobodnie nawigować po swojej stronie publicznej, otwórz ją w nowym oknie przeglądarki.
> Pozwala to przełączać się natychmiast pomiędzy stronami publicznymi a Administracją.</p></li>
62,73c69,90
< 			<li><p>Updates mailing list: <a href="mailto:tngusers@lythgoes.net">tngusers@lythgoes.net</a>. To subscribe, send a message to
< 				<a href="mailto:tngusers-subscribe@lythgoes.net">tngusers-subscribe@lythgoes.net</a>. This list is used exclusively to inform users of
< 				software updates and related issues. </p></li>
< 			<li><p>Users mailing list: <a href="mailto:tngusers2@lythgoes.net">tngusers2@lythgoes.net</a>. To subscribe, send a message to
< 				  <a href="mailto:tngusers2-subscribe@lythgoes.net">tngusers2-subscribe@lythgoes.net</a>. This list may be used for all discussion among TNG users. </p></li>
< 			<li><p>Forum użytkowników: <a href="http://tngforum.us" target="_blank">http://tngforum.us</a>.</p></li>
< 			<li><p>PHP Reference: <a href="http://www.php.net" target="_blank">http://www.php.net</a>.</p></li>
< 			<li><p>MySQL Reference: <a href="http://www.mysql.com" target="_blank">http://www.mysql.com</a>.</p></li>
< 			<li><p>HTML Reference: <a href="http://www.htmlhelp.com" target="_blank">http://www.htmlhelp.com</a>.</p></li>
< 			<li><p>Bezpośredni kontakt z autorem: <a href="mailto:darrin@lythgoes.net">darrin@lythgoes.net</a>.</p></li>
< 			<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
<                         </ol>
---
> 			<li><p>Lista mailingowa ogłoszeń o nowych edycjach systemu TNG:
> <a href="mailto:tngusers@lythgoes.net">tngusers@lythgoes.net</a>.
> W celu zasubskrybowania tej listy należy wysłać mail do
> <a href="mailto:tngusers-subscribe@lythgoes.net">tngusers-subscribe@lythgoes.net</a>.
> Ta lista jest używana wyłącznie do informowania użytkowników TNG o aktualizacjach oprogramowania
> i sprawach z tym zwiÄ…zanych.</p></li>
> 			<li><p>Lista mailingowa użytkowników:
> <a href="mailto:tngusers2@lythgoes.net">tngusers2@lythgoes.net</a>.
> W celu zasubskrybowania tej listy należy wysłać mail do
> <a href="mailto:tngusers2-subscribe@lythgoes.net">tngusers2-subscribe@lythgoes.net</a>.
> Ta lista może być używana do wszelkich dyskusji pomiędzy użytkownikami TNG.
> </p></li>
> 			<li><p>Forum użytkowników:
> <a href="https://tng.community" target="_blank">https://tng.community</a>.
> To bardzo aktywne forum pozwala znaleźć wiele przydatnych informacji, a w przypadku problemów zazwyczaj bardzo szybko uzyskuje się pomoc.</p></li>
> 			<li><p>PHP Reference: <a href="https://php.net" target="_blank">https://php.net</a>.</p></li>
> 			<li><p>MySQL Reference: <a href="https://mysql.com" target="_blank">https://mysql.com</a>.</p></li>
> 			<li><p>HTML Reference: <a href="https://htmlhelp.com" target="_blank">https://htmlhelp.com</a>.</p></li>
> 			<li><p>Bezpośredni kontakt z autorem systemu TNG: <a href="mailto:darrin@lythgoes.net">darrin@lythgoes.net</a>.</p></li>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
> 		</ol>
diff -r TNG/languages/Polish-UTF8/media_help.php TNG1403/languages/Polish-UTF8/media_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
37c37
<                 Jeśli nie wybierzesz żadnej z proponowanych opcji, w polu wyszukiwania wyświetlą się wszystkie media zapisane w bazie danych. Opcje szukania zawierają:</p>
---
> Jeśli nie wybierzesz żadnej z proponowanych opcji, w polu wyszukiwania wyświetlą się wszystkie media zapisane w bazie danych. Opcje szukania zawierają:</p>
43,45c43,45
< 		<p>Ogranicza wyniki wyszukiwania do mediów z wybranej kolekcji. Aby dodać nową kolekcję, kliknij na "Dodaj kolekcję", a następnie wypełnić formularz w okienku (popup).
<                 Aby utworzyć folder dla nowej kolekcji, należy utworzyć własną ikonkę (lub wybrać istniejącą). Pole "Takie same ustawienie jak" pozwala na wskazanie
<                 jednego z podstawowych rodzajów Twoich kolekcji, z jakiego nowa kolekcja powinna przejąć ustawienia.</p>
---
> 		<p>Ogranicza wyniki wyszukiwania do mediów z wybranej kolekcji. Aby dodać nową kolekcję, kliknij na "Dodaj kolekcję", a następnie wypełnij formularz w okienku (popup).
> Aby utworzyć folder dla nowej kolekcji, należy utworzyć własną ikonkę (lub wybrać istniejącą). Pole "Takie same ustawienie jak" pozwala na wskazanie
> jednego ze standardowych rodzajów kolekcji TNG, z jakiego nowa kolekcja powinna przejąć ustawienia.</p>
51c51
< 		<p>Zaznacz to pole przed kliknięciem przycisku Szukaj, aby ograniczyć wyniki wyszukiwania do mediów, które nie są powiązane z żadnymi osobami, rodzinami, źródłami, repozytoriami lub miejscami.</p>
---
> 		<p>Zaznacz to pole, aby ograniczyć wyniki wyszukiwania do mediów, które nie są powiązane z żadnymi osobami, rodzinami, źródłami, repozytoriami lub miejscami.</p>
54c54
< 		<p><strong>(Tylko nagrobki)</strong> Wybierz z status listy przed kliknięciem przycisku Szukaj, aby wyszukać wszystkie nagrobki o tym samym statusie.</p>
---
> 		<p><strong>(Tylko nagrobki)</strong> Wybierz status nagrobka rozwijanej listy, aby wyszukać tylko nagrobki o tym statusie.</p>
57c57
< 		<p><strong>(Tylko nagrobki)</strong> Wybierz z listy cmentarz przed kliknięciem przycisku Szukaj, aby wyszukać wszystkie nagrobki z tego samego cmentarza.</p>
---
> 		<p><strong>(Tylko nagrobki)</strong> Wybierz z listy cmentarz, aby wyszukać tylko nagrobki z tego cmentarza.</p>
59c59
< 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie naciśniesz przycisku <strong>Zerowanie</strong>, który przywraca domyślne wartości wszystkich wyszukiwań.</p>
---
> 		<p>Kryteria wyszukiwania na tej stronie zostaną zapamiętane, dopóki nie naciśniesz przycisku <strong>Wyczyść</strong>, który przywraca domyślne wartości wszystkich kryteriów.</p>
62,64c62,65
< 		<p>Ikonki w polu "czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, kliknij pole w kolumnie
< 		<strong>Wybierz</strong> dla każdego rekordu, który ma zostać usunięty, a następnie kliknąć przycisk "Usuń wybrane" znajdujący się na górze listy. Użyj <strong>Wybierz wszystko</strong> lub <strong>Wyczyść wszystko</strong>
< 		aby zaznaczyć lub usunąć zaznaczenie wszystkich pól naraz. Można również konwertować wiele mediów z jednej kolekcji do innej, lub dodać do albumu w ten sam sposób (patrz poniżej, aby uzyskać więcej informacji).</p>
---
> 		<p>Ikony w kolumnie "Czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku.
> <br/>Aby usunąć jednocześnie więcej rekordów, pozaznaczaj pole w kolumnie
> <strong>Wybierz</strong> dla każdego rekordu, który ma zostać usunięty, a następnie kliknij przycisk "Usuń wybrane" znajdujący się ponad listą. Użyj <strong>Wybierz wszystko</strong> lub <strong>Wyczyść wszystko</strong> aby zaznaczyć lub usunąć zaznaczenie wszystkich pól naraz.
> <br/>Można również konwertować wiele mediów z jednej kolekcji do innej, lub dodawać do albumu w podobny sposób (patrz poniżej, aby uzyskać więcej informacji).</p>
73,74c74
< 		<p>Aby dodać nowe media, kliknij przycisk <strong>Dodaj nowe</strong> a następnie wypełnić formularz. Niektóre informacje, w tym  Mapa zdjęcia, informacje o lokalizacji, oraz łącza do osób, rodzin i itp. mogą zostać dodane
<                 dopiero po kliknięciu na "Zapisz i kontynuuj". Do dyspozycji są następujące pola:</p>
---
> 		<p>Aby dodać nowe media, kliknij przycisk <strong>Dodaj nowe</strong> a następnie wypełnij formularz. Niektóre informacje, w tym Mapa zdjęcia, informacje o lokalizacji, oraz łącza do osób, rodzin itp. mogą zostać dodane dopiero po kliknięciu na "Zapisz i kontynuuj". Do dyspozycji są następujące pola:</p>
76,77c76,77
< 		<span class="optionhead">Kolekcje</span>
< 		<p>Wybierz rodzaj medium (np. zdjęcie, dokument, nagrobek, historia, nagranie lub film). Nie ma ograniczeń dotyczących typów plików dla żadnej z <span class="emphasis">kolekcji</span>.</p>
---
> 		<span class="optionhead">Kolekcja</span>
> 		<p>Wybierz z rozwijanej listy kolekcję, do której ma zostać dodane medium (Zdjęcia, Dokumenty itd.) Nie ma ograniczeń dotyczących rozzerzeń (typów) plików dla żadnej z <span class="emphasis">kolekcji</span>.<br/>Jeżeli docelowa kolekcja jeszcze nie istnieje, można ją teraz utworzyć klikając "Dodaj kolekcję" - tak jak to już opisano w części <a href="#search">Szukaj</a></p>
80,81c80
< 		<p>Zaznacz to pole, jeśli Twoje medium znajduje się w innym miejscu niż na Twoim serwerze. Musisz dostarczyć dokładną ścieżkę dostępu ( na przykład, "http://www.thatsite.com/image.jpg") w polu
<                 oznaczonym "Nazwa pliku na stronie" (pozostaw pole "Plik do załadowania " wolne). Jeśli chcesz mieć miniaturkę zdjęcia, musisz dostarczyć swoją (TNG jej nie utworzy).</p>
---
> 		<p>Zaznacz to pole, jeśli Twoje medium znajduje się w innym miejscu niż na Twoim serwerze. Musisz podać URL tzn. pełną ścieżkę dostępu do tego medium (np. "http://www.thatsite.com/image.jpg"). Jeśli chcesz mieć miniaturkę medium, musisz dostarczyć swoją (TNG jej dla takiego medium nie utworzy).</p>
84c83
< 		<p>Wybierz fizyczny plik (z Twojego komputera lub z serwera) dla tego medium.</p>
---
> 		<p>Użyj przycisku "Wybierz plik", aby wskazać plik medium na swoim komputerze, albo podaj nazwę pliku znajdującego się on już na serwerze lub wyszukaj go tam używając przycisku "Wybierz..."</p>
86,87c85,89
< 		<span class="optionhead">Plik do załadowania</span>
< 		<p>Jeśli Twój plik nie został jeszcze załadowany na serwer naciśnij przycisk Przeglądaj, aby zlokalizować go w Twoim komputerze. Jeśli plik znajduje się już na serwerze, pozostaw to pole wolne.</p>
---
> 		<p><strong>UWAGA</strong>: Jeśli załadowujesz nowe pliki, zarówno one jak i zawierające je katalogi muszą mieć ustawienia dostępu pozwalające na dostęp do nich. Jeśli nie, użyj programu FTP albo skontaktuj się z Administratorem, aby nadać właściwe uprawnienia (powinny być ustawione na 775, ale w niektórych przypadkach wymagane jest 777).<br>
> Nie można w nazwach plików stosować polskich liter (takich jak np. ą czy ę), przecinków ani kropek (z wyjątkiem kropki przed rozszerzeniem pliku - .jpg czy .gif). Nie powinno się również używać spacji. Na przykład zdjęcie o nazwie "zdjęcie Józefa Mrówczyńskiego 12.11.1988.jpg" może być poprawnie zapisane jako "zdjecie_jozefaMrowczynskiego_12_11_1988.jpg".</p>
> 
> 		<span class="optionhead">ALBO Tekst główny (tylko dla Historii)</span>
> 		<p>Zamiast przesyłania plików tekstowych do historii, można tu wpisać lub wkleić tekst lub kod HTML. Można przy tym wykorzystać kontrolki (nad oknem tekstu) do formatowania tekstu. Ustawienie myszy nad kontrolką powoduje wyświetlenie podpowiedzi dla tej kontrolki.</p>
89,107c91
< 		<span class="optionhead">Nazwa pliku na stronie / Media URL</span>
< 		<p>Jeśli poprzednio załadowałeś Twój plik mediów, podaj ścieżkę dostępu i nazwę tego medium jaka istnieje w folderze odpowiedniej kolekcji na serwerze (lub na innej stronie www). Jeśli nie znasz dokładnej
<                 nazwy pliku, możesz kliknąć na przycisk Szukaj, aby zlokalizować plik na serwerze. Jeśli załadowujesz Twój plik korzystając z poprzedniej możliwości, w tym polu ukaże się ścieżka dostępu i nazwa Twojego pliku,
<                 która będzie zapisana w wybranej kolekcji na serwerze. Zasugerowana ścieżka dostępu i nazwa pliku zostaną dla Ciebie wypełnione. Jeśli zaznaczysz "To medium pochodzi z zewnętrznego źródła" ,
<                 zobaczysz pole "Media  URL", w którym należy podać dokładny adres Twojego medium.</p>
< 
< 		<p><strong>UWAGA</strong>: Jeśli załadowujesz nowy plik, informacje, które tutaj podajesz muszą być "czytane przez wszystko". Jeśli nie, użyj Twojego programu FTP albo skontaktuj się z Administratorem,
<                 aby nadać temu plikowi właściwe uprawnienia (powinny być ustawione na 775, ale w niektórych przypadkach wymagane jest 777).<br>
<                 Nie można stosować polskich liter takich jak na przykład ą, ę, ź, ś itp, przecinków ani kropek (z wyjątkiem kropki przed rozszerzeniem pliku - .jpg czy .gif). Nie powinno się również używać spacji. Na przykład zdjęcie o nazwie "zdjęcie Józefa Mrówczyńskiego 12.11.1988.jpg"
<                 powinno zostać zapisane jako "zdjecie_jozefa_mrowczynskiego_12_11_1988.jpg </p>
< 
< 		<span class="optionhead">ALBO Tekst Body</span>
< 		<p><strong>(Tylko historie)</strong> Zamiast fizycznego przesyłania plików do historii, można tu wpisać lub wkleić tekst lub kod HTML.</p>
< 
< 		<p><strong>UWAGA:</strong> Jeśli użyjesz HTML <strong>nie może</strong> on zawierać znaczników HTML lub BODY.</p>
< 
< 		<span class="optionhead">Konwertuj nowe linie (BR) do HTML</span>
< 		<p><strong>(Tylko historie)</strong> Wybierz tę opcję, aby TNG skonwertowało "nowe linie" zawarte w polu "Tekst BODY" do "nowych linii HTML". Pozostawianie tej kratki niezaznaczonej spowoduje, że "nowe linie" będą ignorowane.
<                 "Nowe linie HTML" z tego pola będą wszędzie respektowane. </p>
---
> 		<p><strong>UWAGA:</strong> Jeśli użyjesz HTML, <strong>nie może</strong> on zawierać znaczników &lt;html&gt; lub &lt;body&gt;.</p>
110,111c94
< 		<p>Wskaż istniejący plik (z twojego komputera lub ze strony WEB) aby stworzyć "miniaturkę" (mały obrazek) dla tego medium (jest to opcjonalne). Ważne: idealne miniaturki powinny mieć od 50 do 100 pixeli na stronę. Twoja miniaturka <strong>NIE MOŻE</strong> być tym samym obrazem co oryginał!
<                 TNG zgłosi zastrzeżenia jeżeli spróbujesz użyć oryginalnego obrazu jako miniaturki. TNG może stworzyć dla ciebie miniaturkę tylko jeżeli zawartość Twojego medium jest obowiązującym JPG, GIF lub PNG obrazem.</p>
---
> 		<p>Bedziesz tu mógł zlecić TNG utworzenie miniaturki (o ile tylko Twój serwer wspiera bibliotekę GD Image Library, co zazwyczaj ma miejsce), albo wskazać do wykorzystania istniejący plik z twojego komputera lub ze strony www.</p>
113,117c96,100
< 		<span class="optionhead">Określone zdjęcie/Twórz z oryginału</span>
< 		<p>Jeśli Twój serwer wspiera bibliotekę GD image library, będziesz tutaj miał możliwość dostarczyć Twoją własną miniaturkę, albo utworzyć ją przy pomocy TNG z oryginału. W tym celu zaznacz pole Twórz z oryginału.
<                 Jeśli wybierzesz tę opcję, domyślnie nazwa nowego pliku będzie taka sama jak oryginał, tyle że dołączony zostanie na początku prefiks lub na końcu sufiks (przyrostek). Ten prefiks i sufiks, wraz z maks. szerokością i wysokością
<                 miniaturki są wyznaczone w Administracja/Ustawienia główne. <strong>UWAGA:</strong> Twoja miniaturka <strong>NIE MOŻE</strong> być tym samym oryginalnym zdjęciem! TNG będzie reklamować, jeśli będziesz usiłował użyć oryginalnego zdjęcia jako miniaturki.
<                 TNG może utworzyć dla Ciebie miniaturkę tylko wtedy, kiedy Twój plik mediów jest w aktualnym formacie JPG, GIF lub PNG, może jednak reklamować, jeśli miniaturka ma zostać utworzona ze zbyt dużego zdjęcia (ponad 1 MB).</p>
---
> 		<span class="optionhead">Twórz z oryginału / Określone zdjęcie</span>
> 		<p>Jeżeli wybierzesz opcję "Twórz z oryginału" plik miniaturki będzie miał domyślnie nazwę taką jak oryginał, tyle że dołączony zostanie na początku prefiks lub na końcu sufiks, stosownie do ustawień Administracja >> Ustawienia główne. TNG może utworzyć miniaturkę tylko wtedy, jeżeli medium jest w obowiązującym formacie JPG, GIF lub PNG; może jednak reklamować, jeśli miniaturka ma zostać utworzona ze zbyt dużego zdjęcia (znacznie ponad 1 MB).
> <br/>
> <strong>UWAGA:</strong> Miniaturka <strong>NIE MOŻE</strong> być tym samym obrazem co oryginał!
> TNG zgłosi zastrzeżenia jeżeli spróbujesz użyć oryginalnego obrazu jako miniaturki.</p>
120,121c103
< 		<p>Jeśli sobie życzysz, miniatury obrazów każdego zdjęcia związanego z osobą są wyświetlane na jej stronie. Jeśli dla Twojego medium nie ma jeszcze na serwerze załadowanego pliku miniaturki, kliknij przycisk "Przeglądaj" i zlokalizuj miniaturkę w Twoim komputerze.
<                 Musisz wtedy wpisać ścieżkę dostępu do punktu docelowego i nazwę miniaturki w następnym polu ("Nazwa pliku na stronie"). Jeśli miniaturka jest już na serwerze, zostaw to pole puste.</p>
---
> 		<p>Jeśli sobie życzysz, miniatury obrazów każdego zdjęcia związanego z osobą są wyświetlane na jej stronie. Jeśli dla Twojego medium nie ma jeszcze na serwerze załadowanego pliku miniaturki, kliknij przycisk "Przeglądaj" i zlokalizuj miniaturkę w Twoim komputerze.</p>
123,125c105,107
< 		<span class="optionhead">Nazwa pliku na stronie</span>
< 		<p>Jeśli poprzednio załadowałeś Twoją miniaturkę, podaj jej ścieżkę dostępu i dokładną nazwę taką, jaka zapisana jest w odpowiednim dla danej kolekcji folderze na serwerze (rada: jeśli chcesz trzymać miniaturki i oryginały oddzielnie, możesz je zapisywać w
<                 folderze podrzędnym. Będą mogły mieć te same nazwy, jak oryginały). Jeśli nie znasz dokładnej nazwy pliku, możesz kliknąć przycisk Wybierz, aby go zlokalizować w Twoim komputerze. Sugerowana ścieżka dostępu i nazwa pliku zostaną dla Ciebie wypełnione. </p>
---
> 		<span class="optionhead">Nazwa pliku na serwerze</span>
> 		<p>Jeśli poprzednio załadowałeś własną miniaturkę, podaj jej ścieżkę dostępu i dokładną nazwę pliku taką, jaka zapisana jest w odpowiednim dla danej kolekcji folderze na serwerze (rada: jeśli chcesz trzymać miniaturki i oryginały oddzielnie, możesz je zapisywać w
> folderze podrzędnym. Będą mogły mieć te same nazwy, jak oryginały). Jeśli nie znasz dokładnej nazwy pliku, możesz kliknąć przycisk Wybierz, aby go wyszukać na serwerze. Sugerowana ścieżka dostępu i nazwa pliku zostaną dla Ciebie wypełnione.</p>
127,128c109
< 		<p><strong>UWAGA</strong>: Jeśli załadowujesz nowy plik, informacje, które tutaj podajesz muszą być "czytane przez wszystko". Jeśli nie, użyj Twojego programu FTP albo skontaktuj się z Administratorem, aby nadać plikom właściwe uprawnienia
<                 (775 powinien funkcjonować, ale czasami wymagany jest 777). </p>
---
> 		<p><strong>UWAGA</strong>: Jeśli załadowujesz nowe pliki, zarówno one jak i zawierające je katalogi muszą mieć ustawienia dostępu pozwalające na dostęp do nich. Jeśli nie, użyj programu FTP albo skontaktuj się z Administratorem, aby nadać właściwe uprawnienia (powinny być ustawione na 775, ale w niektórych przypadkach wymagane jest 777).</p>
130,131c111,119
< 		<span class="optionhead">Zapisz pliki w: Folder multimediów/Folder kolekcji</span>
< 		<p>Możesz wybrać zapisywanie mediów w folderze odpowiadającym wybranej kolekcji (opcja domyślna), lub w folderze multimediów .</p>
---
> 		<span class="optionhead">Zapisz pliki w: Folder kolekcji (np."Zdjęcia") / Folder multimediów</span>
> 		<p>Możesz wybrać zapisywanie mediów w folderze odpowiadającym wybranej kolekcji (opcja domyślna), lub w ogólnym folderze multimediów.</p>
> 
> 		<span class="optionhead">Szerokość, wysokość</span>
> 		<p><strong>(dotyczy tylko filmów)</strong> Niektóre odtwarzacze wideo (np. Quicktime) wymagają podania wymiarów filmu. Jeśli nie będą one wyszczególnione,
> film może zostać za mocno obcięty i jego fragmenty nie będą widoczne. Dlatego zalecamy podanie tutaj wymiarów Twojego filmu w pikselach. Proszę też pamiętać o
> pozostawieniu około 16 pionowych pikseli dla pulpitu sterowania odtwarzacza wideo ( odtwarzanie / stop / regulacje głośności, itp.).</p>
> 
> 		<p><span class="optionhead">Informacje o nowych mediach</span></p>
134c122
< 		<p>Powinno to być krótkie określenie &#151;  służące do identyfikacji Twojego medium. To określenie będzie użyte jako łącze do strony pokazującej Twoje medium.</p>
---
> 		<p>Powinno to być krótka nazwa &#151; służąca do identyfikacji Twojego medium. Ta nazwa będzie użyta jako łącze do strony pokazującej Twoje medium.</p>
137,142c125
< 		<p>Tutaj możesz podać więcej szczegółów zawierających informację o przedstawionym medium. Będzie widoczne jako notatka towarzysząca Twojemu tytułowi (poprzednie pole).</p>
< 
< 		<span class="optionhead">Szerokość, wysokość</span>
< 		<p><strong>(dotyczy tylko filmów)</strong> Niektóre odtwarzacze wideo (np. Quicktime) wymagają podania wymiarów filmu. Jeśli nie będą one wyszczególnione,
<                 film może zostać za mocno obcięty i jego fragmenty nie będą widoczne. Dlatego polecamy podanie tutaj wymiarów Twojego filmu w pikselach. Proszę też pamiętać o
<                 pozostawieniu około 16 pionowych pikseli dla pulpitu sterowania odtwarzacza wideo ( odtwarzanie / stop / regulacje głośności, itp.).</p>
---
> 		<p>Tutaj możesz podać więcej informacji o przedstawionym medium. Będą one widoczne jako przypis towarzyszący Tytułowi (poprzednie pole).</p>
148c131
< 		<p>If Jeśli chciałbyś łączyć to medium z wybranym drzewem, wybierz to drzewo tutaj. Mogą to robić tylko użytkownicy mający uprawnienia do edycji danych dotyczących tych drzew.</p>
---
> 		<p>Jeśli chciałbyś łączyć to medium z wybranym drzewem, wybierz to drzewo tutaj. Mogą to robić tylko użytkownicy mający uprawnienia do edycji danych dotyczących tych drzew.</p>
162c145
< 		<span class="optionhead">Otwór w nowym oknie</span>
---
> 		<span class="optionhead">Otwieraj w nowym oknie</span>
165,166c148,149
< 		<span class="optionhead">�ącz bezpośrednio z wybranym cmentarzem</span>
< 		<p><strong>(Tylko nagrobki)</strong> Zaznacz to pole, aby połączyć to zdjęcie nagrobka z samym cmentarzem. Kiedy otworzy się ta strona, będą na niej widoczne wszystkie nagrobki zapisane dla tego cmentarza, to zdjęcie zaś pokaże się na szczycie strony.</p>
---
> 		<span class="optionhead">Ustaw jako zdjęcie wybranego cmentarza</span>
> 		<p><strong>(Tylko nagrobki)</strong> Zaznacz to pole, aby połączyć to zdjęcie nagrobka z samym cmentarzem. Kiedy otworzy się ta strona, będą na niej widoczne wszystkie nagrobki zapisane dla tego cmentarza, zaś to zdjęcie zaś pokaże się jako pierwsze.</p>
178,179c161,162
< 		<p>Aby wprowadzić zmiany do istniejących mediów, kliknij przycisk <a href="#search">Szukaj</a> w celu znalezienia medium a następnie kliknij na ikonkę Edycja obok tego elementu.
< 		 Oto elementy, których nie ma w "Dodaj nowe":</p>
---
> 		<p>Aby wprowadzić zmiany do istniejących mediów, znajdź je w zakładce <a href="#search">Szukaj</a> w celu znalezienia medium, a następnie kliknij na ikonę Edycja obok tego elementu.
> 		 Do dypozycji będą dodatkowe możliwości, których nie było w "Dodaj nowe":</p>
182,183c165,166
< 		<p>Możesz tworzyć łącza mediów do osób, rodzin, źródeł, repozytoriów lub miejsc. Dla każdego łącza, należy najpierw wybrać drzewo związane z łączonym medium. Następnie rodzaj łącza
<                 (osoby, rodziny, źródła,  repozytoria lub miejsca) i wreszcie wprowadzić numer ID lub nazwę (tylko miejsca) łączonego podmiotu. Po wykonaniu tych czynności kliknij przycisk "Dodaj".</p>
---
> 		<p>Możesz tworzyć łącza mediów do osób, rodzin, źródeł, repozytoriów lub miejsc. Dla każdego łącza, należy najpierw wybrać drzewo związane z łączonym medium. Następnie typ łącza
> (Osoba, Rodzina, Źródło, Repozytorium, Miejsce) i wreszcie wprowadzić numer ID lub nazwę (tylko w przypadku miejsca) łączonego podmiotu. Po wykonaniu tych czynności kliknij przycisk "Dodaj".</p>
188,189c171,172
< 		<p><strong>Istniejące łącza:</strong> Możesz edytować lub usuwać istniejące łącza mediów klikając na ikonkę Edycja lub Usuń obok wybranego łącza. Edycja łącza umożliwia
<                 jego skojarzenie wydarzeniem oraz wpisanie<strong>dodatkowego tytułu</strong> i <strong>dodatkowego opisu</strong>.</p>
---
> 		<p><strong>Istniejące łącza:</strong> Możesz edytować lub usuwać istniejące łącza mediów klikając na ikonę Edycja lub Usuń obok wybranego łącza. Edycja łącza umożliwia
> jego skojarzenie wydarzeniem oraz wpisanie <strong>dodatkowego tytułu</strong> i <strong>dodatkowego opisu</strong>.</p>
191c174
< 		<p><strong>OSTRZEŻENIE</strong>: �ącza do wydarzeń niestandardowych utworzonych w ramach TNG mogą zostać nadpisane przy następnym imporcie GEDCOM-u.</p>
---
> 		<p><strong>OSTRZEŻENIE</strong>: �ącza do wydarzeń niestandardowych utworzonych w ramach TNG mogą zostać nadpisane przy następnym imporcie GEDCOM.</p>
193,194c176,177
< 		<span class="optionhead">Jako standard</span>
< 		<p>Zaznacz to pole podczas edycji łączy mediów, aby użyć miniaturki tego medium w diagramach i na szczytach innych stron związanych z daną osobą lub obiektem, które są z nim połączone.</p>
---
> 		<span class="optionhead">Zdjęcie standardowe</span>
> 		<p>Zaznacz to pole podczas edycji łączy mediów, aby użyć miniaturki tego medium w diagramach i w tytułowych częściach innych stron związanych z daną osobą lub obiektem, które są z nim połączone.</p>
196,197c179,181
< 		<span class="optionhead">Miejsce wykonania zdjęcia</span>
< 		<p><p>Ta sekcja jest przy starcie zamknięta. Aby ją rozwinąć, kliknij na napis "Miejsce wykonania zdjęcia" lub strzałkę obok niego. Jeśli znasz nazwę miejsca, gdzie zdjęcie zostało zrobione, wpisz ją w polu "Miejsce wykonania zdjęcia".</p>
---
> 		<span class="optionhead">Opisy postaci na zdjęciu</span>
> 		<p>Ta sekcja jest przy starcie zamknięta. Aby ją rozwinąć, kliknij na napis "Opisy postaci na zdjęciu" lub strzałkę obok niego. Wyświetlona zostanie krótka instrukcja. Możliwe tu będzie łączenie fragmentów obrazu z osobami w bazie danych, lub do wyświetlania krótkich wiadomości,
> kiedy wskaźnik myszy zostanie umieszczony nad tymi fragmentami.</p>
199,201c183
< 		<span class="optionhead">Szerokość, Długość (geograficzna)</span>
< 		<p>Jeśli znasz współrzędne geograficzne miejsca związanego z Twoim medium wpisz je tutaj, aby pomóc innym dokładniej zlokalizować dane miejsce.
< 		Alternatywnie możesz użyć funkcji geocode Google Map, aby ustawić szerokość i długość geograficzną lokalizacji mediów. Kliknij na "Pokaż / Ukryj mapę Google", aby zobaczyć mapę Google.</p>
---
> 		<p><strong>Uwaga</strong>: Abyś mógł skorzystać z tej funkcji, medium musi być zapisane w formacie JPG, GIF lub PNG.</p>
203,204c185,187
< 		<span class="optionhead">Zoom</span>
< 		<p>Wpisz poziom powiększenia mapy, lub dostosuj poziom przy pomocy suwaka na mapie Google. Ta opcja jest dostępna tylko jeśli masz "klucz mapy" z Google i wpisałeś go w Administracja/Ustawienia i konfiguracja/Ustawienia mapy.</p>
---
> 		<p>Jeśli chcesz utworzyć łącze do osoby, musisz po pierwsze wybrać jej drzewo, a następnie kształt (okrąg albo prostokąt) obszaru ( złożone kształty są również możliwe, ale musisz sam dostarczyć dla nich tekst lub kod łącza).
> Następnie postępuj według instrukcji dla wybranego kształtu, aby we właściwy sposób wybrać współrzędne łącza. Gdy współrzędne zostały wybrane, ukaże się okienko "Znajdź ID osoby". Podaj nazwisko oraz / lub imię (lub jego część) albo ID osoby.
> Okienko zamknie się, kiedy klikniesz na wybraną osobę i tekst lub kod łącza dla wybranego obszaru zostanie dodany do pola "Opisy postaci na zdjęciu". Jeśli jest to konieczne, możesz ten tekst lub kod łącza edytować.</p>
206c189
< 		<p>Uwaga: Szerokość/Długość/Zoom to dane o lokalizacji mediów tylko w celach informacyjnych. Ta lokalizacja nie jest oznakowana na mapie w strefie publicznej.</p>
---
> 		<p>Powtórz ten proces dla wszystkich obszarów, które będziesz potrzebował. Wszystkie nowe teksty lub kody łączy będą dodane w polu "Opisy postaci na zdjęciu".</p>
208,210c191,192
< 		<span class="optionhead">Mapa zdjęcia</span>
< 		<p>Ta sekcja jest przy starcie zamknięta. Aby ją rozwinąć, kliknij na napis "Mapa zdjęcia" lub strzałkę obok niego. Umożliwia ona łączenie różnych fragmentów obrazu z osobami w bazie danych, lub do wyświetlania krótkich wiadomości,
<                 kiedy wskaźnik myszy zostanie umieszczony nad tymi fragmentami.</p>
---
> 		<p>Aby połączyć różne fragmenty zdjęcia do różnych stron, lub uzyskać wyświetlanie krótkich wiadomości, kiedy wskaźnik myszy znajduje się nad tymi fragmentami, wprowadź potrzebny kod mapy zdjęcia w tym polu.
> Aby budować własną mapę zdjęcia, wykorzystaj pole "Mapa zdjęcia HTML" na dole strony (pod zdjęciem).</p>
212c194,195
< 		<p><strong>Uwaga</strong>: Abyś mógł skorzystać z tej funkcji, medium musi być zapisane w formacie JPG, GIF lub PNG.</p>
---
> 		<span class="optionhead">Miejsce wykonania zdjęcia</span>
> 		<p><p>Ta sekcja jest przy starcie zamknięta. Aby ją rozwinąć, kliknij na napis "Miejsce wykonania zdjęcia" lub strzałkę obok niego. Jeśli znasz nazwę miejsca, gdzie zdjęcie zostało zrobione, wpisz ją w polu "Miejsce wykonania zdjęcia".</p>
214,216c197,200
< 		<p>Jeśli chcesz utworzyć łącze do osoby, musisz po pierwsze wybrać jej drzewo, a następnie kształt (okrąg albo prostokąt) obszaru ( złożone kształty są również możliwe, ale musisz sam dostarczyć dla nich tekst lub kod łącza).
<                 Następnie postępuj według instrukcji dla wybranego kształtu, aby we właściwy sposób wybrać współrzędne łącza. Gdy współrzędne zostały wybrane, ukaże się okienko "Znajdź ID osoby". Podaj nazwisko oraz / lub imię (lub jego część) albo ID osoby.
<                 Okienko zamknie się, kiedy klikniesz na wybraną osobę i tekst lub kod łącza dla wybranego obszaru zostanie dodany do pola "Mapa zdjęcia". Jeśli jest to konieczne, możesz ten tekst lub kod łącza edytować.</p>
---
> 		<span class="optionhead">Szerokość, Długość (geograficzna)</span>
> 		<p>Jeśli znasz współrzędne geograficzne miejsca związanego z tym medium, wpisz je tutaj, aby pomóc innym dokładniej zlokalizować dane miejsce.
> 		Alternatywnie możesz użyć funkcji geocode Google Map, aby ustawić szerokość i długość geograficzną lokalizacji mediów. Kliknij na "Pokaż/ukryj mapę Google", aby zobaczyć mapę Google.
> <br/>Ta opcja jest dostępna tylko jeśli masz "klucz mapy" z Google i wpisałeś go w Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia mapy.</p>
218c202,203
< 		<p>Powtórz ten proces dla wszystkich obszarów, które będziesz potrzebował. Wszystkie nowe teksty lub kody łączy będą dodane w polu "Mapa zdjęcia".</p>
---
> 		<span class="optionhead">Powiększenie</span>
> 		<p>Wpisz poziom powiększenia mapy, lub dostosuj poziom przy pomocy suwaka na mapie Google.</p>
220,221c205
< 		<p>Aby połączyć różne fragmenty zdjęcia do różnych stron, lub do wyświetlania krótkich wiadomości, kiedy wskaźnik myszy znajduje się nad tymi fragmentami, wprowadź potrzebny kod mapy zdjęcia w tym polu.
<                 Aby budować własną mapę zdjęcia, zobacz pole "Mapa zdjęcia" na dole strony (pod zdjęciem).</p>
---
> 		<p>Uwaga: Szerokość/Długość/Zoom to dane o lokalizacji mediów tylko w celach informacyjnych. Ta lokalizacja nie jest oznakowana na mapie w strefie publicznej.</p>
230,232c214,216
< 		<p>Aby usunąć jedno medium, należy nacisnąć przycisk <a href="#search">Szukaj</a> w celu jego zlokalizowania, a następnie kliknąć na ikonkę Usuń  obok tego medium. Wiersz zmieni kolor,
< 		a następnie zniknie. Medium zostało usunięte. Aby usunąć więcej niż jedno medium naraz, zaznacz pole w kolumnie Wybierz obok każdego medium, które ma zostać usunięte, a następnie kliknąć
<                 przycisk "Usuń wybrane" znajdujący się na górze strony.</p>
---
> 		<p>Aby usunąć jedno medium, należy nacisnąć przycisk <a href="#search">Szukaj</a> w celu jego zlokalizowania, a następnie kliknąć na ikonę Usuń  obok tego medium. Wiersz zmieni kolor,
> 		a następnie zniknie. Medium zostało usunięte. Aby usunąć więcej niż jedno medium naraz, zaznacz pole w kolumnie Wybierz obok każdego medium, które ma zostać usunięte, a następnie kliknij
> przycisk "Usuń wybrane" znajdujący się nad listą mediów.</p>
241,242c225,226
< 		Aby przekonwertować media z jednej "Kolekcji" do innej, zaznacz odpowiednie pozycje w polu "Wybierz" na karcie Szukaj a następnie wybierz nową kolekcję z rozwijanej listy u góry strony
<                 obok "Konwertuj wybrane do ". Po dokonaniu wyboru kliknij przycisk "Konwertuj wybrane do". Strona zostanie otwarta ponownie i ukaże się czerwony napis informujący o statusie operacji.</p>
---
> 		Aby przekonwertować media z jednej kolekcji do innej, zaznacz je w kolumnie "Wybierz" na karcie Szukaj a następnie wybierz nową kolekcję z rozwijanej listy u góry strony
> obok przycisku "Wybrane konwertuj do". Po dokonaniu wyboru kliknij ten przycisk. Strona zostanie otwarta ponownie i ukaże się czerwony napis informujący o statusie operacji.</p>
251,252c235,236
< 		Aby dołączyć media do albumu, zaznacz odpowiednie pozycje w polu "Wybierz" na karcie Szukaj a następnie wybierz album z rozwijanej listy u góry strony obok "Dodaj do albumu". Po dokonaniu
<                 wyboru kliknij przycisk "Dodaj do albumu". Media mogą być także dodane do albumów w Administracja / Albumy.</p>
---
> 		Aby dołączyć media do albumu, zaznacz odpowiednie pozycje w kolumnie "Wybierz" na karcie Szukaj, a następnie wybierz album z rozwijanej listy u góry strony obok przycisku "Dodaj do albumu". Po dokonaniu
> wyboru kliknij ten przycisk. Media mogą być także dodane do albumów w Administracja / Albumy.</p>
261,262c245,246
< 		<p>Domyślnie media połączone z osobami, rodzinami, źródłami, repozytoriami lub miejscami są sortowane według kolejności, w jakiej zostały utworzone łącza. Aby zmienić tę kolejność, możesz na karcie
<                 Media / Sortuj przesuwać media według życzenia.</p>
---
> 		<p>Domyślnie media połączone z osobami, rodzinami, źródłami, repozytoriami lub miejscami są sortowane według kolejności, w jakiej zostały utworzone łącza. Aby zmienić tę kolejność, możesz w zakładce
> Media / Sortuj przesuwać media według życzenia.</p>
265c249
< 		<p>Wybierz z drzewo związane z podmiotem, dla którego chcesz sortować media. Następnie wybierz rodzaj łącza (osoby, rodziny, źródła, repozytoria lub miejsca) oraz kolekcję, w której chcesz posortować media.</p>
---
> 		<p>Wybierz z drzewo związane z podmiotem, dla którego chcesz sortować media. Następnie wybierz typ łącza z rozwijanej listy (Osoba, Rodzina, Źródło, Repozytorium, Miejsce), a także kolekcję, w której chcesz posortować media.</p>
268,269c252,253
< 		<p>Wprowadź numer ID lub nazwę (tylko miejsca) podmiotu. Jeśli nie znasz numeru ID lub dokładnej nazwy miejsca, kliknij ikonkę lupy w celu ich wyszukania. Po znalezieniu żądanego podmiotu, kliknij przycisk
<                 "Wybierz" obok danego podmiotu. Okienko popup zostanie zamknięte i w polu ID pojawi się wybrany identyfikator .</p>
---
> 		<p>Wprowadź numer ID lub nazwę (tylko miejsca) podmiotu. Jeśli nie znasz numeru ID lub dokładnej nazwy miejsca, kliknij ikonę lupy w celu ich wyszukania. Po znalezieniu żądanego podmiotu, kliknij przycisk
> "Wybierz" obok danego podmiotu. Okienko popup zostanie zamknięte i w polu ID pojawi się wybrany identyfikator.</p>
273c257
<                 inne pola zostaną wypełnione &mdash; w tym numer ID. Spowoduje to otwarcie dodatkowego pola , w którym można wybrać określone wydarzenie (opcjonalnie).</p>
---
> inne pola zostaną wypełnione &mdash; w tym numer ID. Spowoduje to otwarcie dodatkowego pola, w którym można wybrać określone wydarzenie (opcjonalnie).</p>
277c261
<                 dla każdego medium, przytrzymaj przycisk myszy a następnie przesuń wskaźnika myszy do żądanej lokalizacji w obrębie listy, poczym zwolnij przycisk myszy ( "przeciągnij i upuść"). Zmiany są zapisywane automatycznie .</p>
---
> dla każdego medium, przytrzymaj przycisk myszy a następnie przesuń wskaźnik myszy do żądanej lokalizacji w obrębie listy, po czym zwolnij przycisk myszy ("przeciągnij i upuść"). Zmiany są zapisywane automatycznie .</p>
280,282c264,266
< 		<p>Podczas sortowania, możesz również wybrać dowolne zdjęcie  jako "Zdjęcie domyślne". Oznacza to, że miniaturka wybranego zdjęcia będzie wyświetlana na diagramach i nagłówkach aktualnie wybranej nazwy podmiotu lub tytułu.
<                 Aby ustawić lub usunąć zdjęcie standardowe, zatrzymaj wskaźnik myszy nad dowolnym z widocznych zdjęć a następnie kliknij na jedną z opcji "Jako standard" lub "Usuń". Aktualne zdjęcie standardowe może zostać również usunięte
<                 przez kliknięcie przycisku "Usuń zdjęcie standardowe" u góry strony.</p>
---
> 		<p>Podczas sortowania, możesz również wybrać dowolne zdjęcie jako "zdjęcie domyślne". Oznacza to, że miniaturka wybranego zdjęcia będzie wyświetlana na diagramach i nagłówkach aktualnie wybranej nazwy podmiotu lub tytułu.
> Aby ustawić lub usunąć zdjęcie standardowe, zatrzymaj wskaźnik myszy nad dowolnym z widocznych zdjęć a następnie kliknij na jedną z opcji "Jako standard" lub "Usuń". Aktualne zdjęcie standardowe może zostać również usunięte
> przez kliknięcie przycisku "Usuń zdjęcie standardowe" u góry strony.</p>
290c274
< 		<a name="thumbs"><p class="subheadbold">Miniaturki</p></a>
---
> 		<a name="thumbs"><p class="subheadbold">Miniatury</p></a>
292,303c276,286
< 		<span class="optionhead">Generowanie miniaturek</span>
< 		<p> Kiedy klikniesz na przycisk "Generuj", TNG automatycznie utworzy miniaturki dla wszystkich plików JPG, GIF oraz PNG, które jej jeszcze nie mają. Nazwa nowej miniaturki będzie taka sama jak oryginał, ale będzie poprzedzona
<                 prefiksem i / albo będzie miała przyrostek taki, jak to zostało przez Ciebie zdefiniowane w Ustawieniach ogólnych. Zaznacz pole "Regeneruj istniejące miniaturki", aby ponownie utworzyć miniaturki dla mediów, które już je posiadają.
<                 "Regeneruj nazwę ścieżki pliku miniaturki jeśli plik nie istnieje" jeśli sądzisz, że niektóre miniaturki dotyczą nieprawidłowych plików. To spowoduje przywrócenie przez TNG nazw łączy miniaturek przed ich regeneracją.
<                 Bez tej funkcji nieprawidłowe nazwy miniaturek będą regenerowane "tam i z powrotem".</p>
< 
< 		<p><strong>Uwaga</strong>: Jeśli nie widzisz pola Generuj miniaturki, znaczy że Twój serwer nie wspiera biblioteki GD image library.</p>
< 
< 		<span class="optionhead">Twórz zdjęcia standardowe</span>
< 		<p>Ta opcja pozwala na wybranie pierwszego zdjęcia dla każdej osoby, rodziny i źródła się jako zdjęcie standardowe (wyświetlanych w nagłówkach diagramów, arkuszy  osób i rodzin oraz innych stron tego podmiotu).
<                 Przyporządkowanie może być dokonane w odniesieniu do wszystkich osób, rodzin, źródła i repozytoriów w wybranym drzewie. Zaznacz pole "Nadpisz aktualne ustawienia standardowe ", aby zmienić domyślne ustawienia niezależnie od tego,
<                 co zostało wcześniej ustalone. Jeśli nie zaznaczysz tego pola, poprzednie ustawienia pozostaną bez zmian.</p>
---
> 		<span class="optionhead">Tworzenie miniaturek</span>
> 		<p> Kiedy klikniesz na przycisk "Twórz", TNG automatycznie utworzy miniaturki dla wszystkich plików JPG, GIF oraz PNG, które jej jeszcze nie mają. Nazwa nowej miniaturki będzie taka jak oryginału, ale będzie poprzedzona
> prefiksem zdefiniowanym w Ustawieniach ogólnych. Zaznacz pole "Regeneruj istniejące miniaturki", aby ponownie utworzyć miniaturki dla mediów, które już je posiadają.
> "Regeneruj nazwę ścieżki pliku miniaturki jeśli plik nie istnieje" jeśli sądzisz, że niektóre miniaturki dotyczą nieprawidłowych plików. To spowoduje przywrócenie przez TNG nazw łączy miniaturek przed ich regeneracją.</p>
> 
> 		<p><strong>Uwaga</strong>: Jeśli nie widzisz pola Twórz miniaturki, Twój serwer nie wspiera biblioteki GD Image Library.</p>
> 
> 		<span class="optionhead">Tworzenie zdjęć standardowych</span>
> 		<p>Ta opcja pozwala na wybranie pierwszego zdjęcia dla każdej osoby, rodziny i źródła jako zdjęcia standardowego (wyświetlanych w nagłówkach diagramów, arkuszy osób i rodzin oraz innych stron tego podmiotu).
> Przyporządkowanie może być dokonane dla wszystkich osób, rodzin, źródła i repozytoriów w wybranym drzewie. Zaznacz pole "Nadpisz aktualne ustawienia standardowe", aby zmienić przyporządkowanie niezależnie od tego,
> które zostało wcześniej ustalone. Jeśli nie zaznaczysz tego pola, poprzednie ustawienia pozostaną bez zmian.</p>
313,314c296,315
<                 (jeżeli importowana zawartość powinna być połączona z tym drzewem). Następnie kliknij przycisk "Import". Jeżeli zapis już istnieje dla tej zawartości to nowy zapis nie zostanie utworzony.</p>
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> (jeżeli importowana zawartość powinna być połączona z tym drzewem). Następnie kliknij przycisk "Import". Jeżeli istnieje już zapis dla tej zawartości, to nowy zapis nie zostanie utworzony.</p>
> 
> 	</td>
> </tr>
> <tr class="databack">
> 	<td class="tngshadow">
> 
> 		<p style="float:right"><a href="#top">Wróć</a></p>
> 		<a name="upload"><p class="subheadbold">�adowanie plików mediów na serwer</p></a>
> 
> 		<span class="optionhead">Cel i sposób użycia</span>
> 		<p>Zakładka "Załaduj" umożliwia załadowanie na serwer wielu mediów na raz, a następnie nadanie im lepszych tytułów i opisów oraz powiązanie ich z osobami, rodzinami, źródłami lub miejscami.</p>
> 
> 		<p>Najpierw należy wybrać kolekcję z rozwijanej listy oraz drzewo (jeżeli obiekty mają być powiązane z konkretnym drzewem), a następnie kliknąć przycisk "Dodaj pliki" aby wybrać pliki mediów z komputera. Większość przeglądarek umożliwi także przeciąganie plików do białego obszaru poniżej przycisków na tym ekranie. Jeżeli pliki mają trafić do podkatalogu wybranego katalogu mediów, można wprowadzić nazwę podkatalogu w polu Folder albo użyć przycisku Wybierz umożliwiającego wybranie istniejącego katalogu. Jeżeli wskazanie podkatalogu jest niepotrzebne, należy zostawić to pole puste.</p>
> 
> 		<p>Po wybraniu plików oraz ich miejsca przeznaczenia można rozpocząć ładowanie wszystkich plików przez kliknięcie przycisku "Zacznij wysyłanie". Można też ładować pliki pojedyńczo klikając przycisk "Start" obok nazwy każdego pliku.
> Po zakończeniu ładowania można nadać nowe tytuły i opisy, a także powiązać media z obiektami w bazie danych, ewentualnie pousuwać je.</p>
> 
> 		<span class="optionhead">Zmiana tytułu i opisu</span>
> 		<p>Po załadowaniu pliku wyświetlaja sie pola Tytuł i Opis, których zawartość jest tworzona z nazwy pliku. Można je zmienić wpisując żądaney tekst i klikając przycisk "Zapisz". Inne informacje można będzie dodać później edytując media, jak to opisano w rozdziale <a href="#edit">Edycja istniejących mediów</a></p>
315a317,322
> 		<span class="optionhead">Dodaj Å‚Ä…cza</span>
> 		<p>Powiązanie mediów z obiektami w bazie danych jest możliwe po zakończeniu ładowania plików.Można wówczas kliknąć przycisk "�ącza mediów" w linii danego pliku.
> Wprowadź identyfikator ID lub użyj ikonki Wyszukaj (lupka) w celu znalezienia i wyboru żądanego obiektu.
> <br/>W celu wygodnego powiązania wielu mediów z tym samym obiektem należy zaznacz pola Wybierz w wierszu każdego z tych mediów (albo użyj "Zaznacz wszystko"), a następnie użyj pól w dolnej części strony aby zakończyć definiowanie łączy. Jeżeli w polu ID wyświetlony jest identyfikator i wybrane zostało przynajmniej jedno medium, kliknięcie przycisku "Link do wybranych" spowoduje utworzenie wszystkich żądanych łączy.</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/more_help.php TNG1403/languages/Polish-UTF8/more_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
32c32
<         <p><span class="optionhead">UrzÄ…d</span>: Kompetentny i / lub odpowiedzialny w momencie wydarzenia organ lub instytucja.</p>
---
>         <p><span class="optionhead">UrzÄ…d</span>: Kompetentny i/lub odpowiedzialny w momencie wydarzenia organ lub instytucja.</p>
34c34
<         <p><span class="optionhead">Przyczyna</span>: Przyczyna zdarzenia (najczęściej używane ze śmiercią).</p>
---
>         <p><span class="optionhead">Przyczyna</span>: Przyczyna zdarzenia (najczęściej używane w związku ze śmiercią).</p>
40c40,41
< 	<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>	
---
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
Only in TNG1403/languages/Polish-UTF8: notes2_help.php
diff -r TNG/languages/Polish-UTF8/notes_help.php TNG1403/languages/Polish-UTF8/notes_help.php
3c3
< echo help_header("Pomoc: Notatki");
---
> echo help_header("Pomoc: Przypisy");
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
17c17
< 		<span class="largeheader">Pomoc: Notatki</span>
---
> 		<span class="largeheader">Pomoc: Przypisy</span>
20c20
< 			<a href="#cite" class="lightlink">Notatki</a>
---
> 			<a href="#cite" class="lightlink">Przypisy</a>
27c27
< 		<a name="add"><p class="subheadbold">Dodawanie/Edycja/Usuwanie notatek</p></a>
---
> 		<a name="add"><p class="subheadbold">Dodawanie/Edycja/Usuwanie przypisów</p></a>
29,31c29,32
< 		<p>Aby dodać, edytować lub usuwać notatki dla osoby, rodziny, źródła, repozytorium lub wydarzenia, należy kliknąć na ikonkę na górze ekranu lub obok wybranego pola
<                    (jeśli istnieją już jakieś notatki, ikonka będzie oznaczona zieloną kropką). Po kliknięciu ikonki, pojawi się małe okienko (popup),
<                    w którym zobaczysz wszystkie istniejące dla  wybranego źródła, wydarzenia itp. notatki.</p>
---
> 		<p>Aby dodawać, edytować lub usuwać przypisy podczas edycji osoby, rodziny, źródła, repozytorium lub wydarzenia, 
> należy kliknąć na ikonę przypisów na górze ekranu lub obok wybranego pola (jeśli istnieją już jakieś przypisy,
> ikona będzie oznaczona zieloną kropką). Po kliknięciu ikony pojawi się małe okienko (popup),
> w którym zobaczysz wszystkie istniejące przypisy dotyczące tej osoby, źródła itp.</p>
33c34
< 		<p>Aby dodać nową notatkę, kliknij na "Dodaj nowe" i wypełnić formularz. </p>
---
> 		<p>Aby dodać nowy przypis, kliknij na "Dodaj nowe" i wypełnij formularz. </p>
35c36
< 		<p>Aby edytować lub usunąć istniejące notatki, kliknij na odpowiednią ikonkę obok tej notatki.</p>
---
> 		<p>Aby edytować lub usuwać istniejące przypisy, kliknij na odpowiednią ikonkę obok przypisu.</p>
37c38
< 		<p>Podczas dodawania lub edycji notatek dostępne są następujące pola:</p>
---
> 		<p>Podczas dodawania lub edycji przypisów dostępne są następujące pola:</p>
39,41c40,43
< 		<span class="optionhead">Notatka</span>
< 		<p>Wpisz swoją notatkę, lub dokonaj zmian w dużym polu <strong>Notatek</strong> i kliknij przycisk "Zapisz".
<                 Notatka zostanie zapisana, nawet jeśli inne informacje dla aktywnego podmiotu nie są aktywne. Można tu wprowadzić kod HTML. Kody PHP i Javascript nie będą działać.</p>
---
> 		<span class="optionhead">Przypis</span>
> 		<p>Wpisz swój przypis lub dokonaj zmian w dużym polu <strong>Przypisów</strong> i kliknij przycisk "Zapisz".
> Przypis zostanie zapisany, nawet jeśli inne informacje dla aktywnego podmiotu nie są aktywne. Można tu wprowadzić
> kod HTML, natomiast kody PHP i Javascript nie będą działać.</p>
44c46
< 		<p>Zaznacz to pole aby zapobiec wyświetlaniu notatki w obszarze publicznym.</p>
---
> 		<p>Zaznacz to pole aby zapobiec wyświetlaniu przypisu w obszarze publicznym.</p>
52,55c54,60
< 		<a name="cite"><p class="subheadbold">Dodawanie do notatek cytatów ze źródeł</p></a>
< 		<p>Aby dodać lub edytować cytaty ze źródeł w notatkach musisz najpierw zapisać notatkę, a następnie kliknąć na ikonkę "Cytat" obok wybranego zapisu notatki na wyświetlonej liście notatek.
<                 Aby uzyskać więcej informacji na temat cytatów zobacz <a href="citations_help.php">Pomoc: Cytaty</a>.</p>
<                 <li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 		<a name="cite"><p class="subheadbold">Dodawanie do przypisów odnośników do źródeł</p></a>
> 		<p>Aby dodawać lub edytować odnośniki do źródeł w przypisach, musisz najpierw zapisać przypis, a następnie kliknąć
> na ikonkę "Odnośnik" obok wybranego przypisu na wyświetlonej liście przypisów.
> Aby uzyskać więcej informacji na temat odnośników zobacz <a href="citations_help.php">Pomoc: Odnośniki</a>.</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
> 
diff -r TNG/languages/Polish-UTF8/people_help.php TNG1403/languages/Polish-UTF8/people_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
35c35
< 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie naciśniesz przycisku <strong>Zerowanie</strong>, który przywraca domyślne wartości i wszystkich wyszukiwań.</p>
---
> 		<p>Kryteria wyszukiwania na tej stronie zostaną zapamiętane, dopóki nie naciśniesz przycisku <strong>Wyczyść</strong>, który przywraca domyślne wartości wszystkich kryteriów.</p>
49c49
< 		<p>Aby dodać nową osobę, kliknij na <strong>Dodaj nowe</strong>, a następnie wypełnij formularz. Niektóre informacje (notatki, cytaty, związki i dodatkowe wydarzenia)
---
> 		<p>Aby dodać nową osobę, kliknij na <strong>Dodaj nowe</strong>, a następnie wypełnij formularz. Niektóre informacje (przypisy, cytaty, asocjacje i dodatkowe wydarzenia)
62c62
< 		<p>ID osoby musi być unikalne w obrębie wybranego drzewa i powinno składać się z litery <strong>I</strong> oraz następujących po niej cyfr (nie więcej niż 21).
---
> 		<p>ID osoby musi być unikalny w obrębie wybranego drzewa i powinien składać się z litery <strong>I</strong> oraz następujących po niej cyfr (nie więcej niż 21).
65c65
< 		Aby wygenerować unikalny ID, kliknij przycisk <strong>Generuj</strong>. Będzie to najwyższa liczba zlokalizowana w bazie danych (najwyższe używane ID + 1).
---
> 		Aby wygenerować unikalny ID, kliknij przycisk <strong>Generuj</strong>. Będzie to najmniejsza możliwa liczba dla tej bazy danych (najwyższe używane ID + 1).
68,82c68,82
< 		<p><strong>UWAGA</strong>: Jeśli korzystasz na Twoim komputerze z programu genealogicznego, który także tworzy numery ID dla nowych osób,
< 		jest WYSOCE ZALECANE zachowanie tych ID dla synchronizacji między dwoma programami. Brak tej synchronizacji może skutkować konfliktami, które mogą spowodować,
< 		że Twoje łącza do zdjęć, historii i nagrobków mogą stać się nie do użycia. Jeśli Twój program tworzy ID, nie dostosowane do tradycyjnych standardów
< 		(na przykład <strong>I</strong> jest na końcu, nie na początku), możesz zmodyfikować plik "prefixes.php" tak, aby przyjmował inne prefiksy.</p>
< 
< 		<span class="optionhead">ImiÄ™ i nzwisko</span>
< 		<p>Podaj dla osoby imię oraz / albo nazwisko.  Jeśli zdecydowałeś, by poprzeć prefiksy (np. van, de itp.) i nazwiska jako rozłączną całość (będą one
< 		ignorowane podczas sortowania), podaj prefiks w polu nazwanym Prefiks do nazwiska.
< 		<strong>Uwaga:</strong> Jeśli to pole nie jest widoczne, przejdź do Ustawienia i konfiguracja / Ustawienia główne i ustaw odpowiednią opcję, aby można było użyć prefiksów nazwisk.</p>
< 
< 		<span class="optionhead">Płeć / Przydomek / Tytuł / Prefix / Suffix / Kolejność nazwisko/imię</span>
< 		<p>Podaj tutaj jak najwięcej informacji o osobie. <strong>Pseudonim</strong> jest nieformalnym imieniem czasami łączonym z osobą.
< 		<strong>Tytuł</strong> jest używany przed imieniem lub nazwiskiem (np., <em>Hr.</em> albo <em>Prof.</em>) ale nie jest jego częścią. <strong>Prefix</strong> używany jest przed nazwiskiem i jest zwykle uważany za jego część.
< 		<strong>Suffix</strong> będzie się wyświetlał po przecinku za imieniem lub nawiskiem. <strong>Kolejność nazwisko/imię</strong> kolejność w jakiej powinny być wyświetlane.
< 		Kolejność nazwisko/imię możesz zmienić  dla wszystkich osób w bazie danych pod Ustawienia i konfiguracja / Ustawienia główne.</p>
---
> 		<p><strong>UWAGA</strong>: Jeśli korzystasz na Twoim komputerze z programu genealogicznego, który także tworzy identyfikatory ID dla nowych osób,
> 		jest WYSOCE ZALECANE zachowanie tych ID dla synchronizacji między TNG a programem. Brak tej synchronizacji może skutkować konfliktami, w których konsekwencji łącza do zdjęć, historii i nagrobków  staną się nie do użycia. Jeśli Twój program tworzy ID niezgodne ze standardowymi ustawieniami TNG
> 		(na przykład <strong>I</strong> jest na końcu, a nie na początku), powinieneś zmodyfikować
> <em>Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia główne</em> i tam <em>Prefiksy i sufiksy</em>,
> tak aby TNG przyjmował inne prefiksy.</p>
> 
> 		<span class="optionhead">ImiÄ™ i nazwisko</span>
> 		<p>Podaj dla osoby imię oraz / albo nazwisko. Jeśli zdecydowałeś, by przedrostki (np. van, albo hr. itp.) i nazwiska były traktowane jako odrębne części (ignorowane podczas sortowania po nazwiskach), podaj ten przedrostek w polu Przedrostki nazwisk.
> 		<strong>Uwaga:</strong> Jeśli to pole nie jest widoczne, przejdź do <em>Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia główne</em> i tam <em>Nazwiska</em> i ustaw odpowiednią opcję, aby można było użyć prefiksów nazwisk.</p>
> 
> 		<span class="optionhead">Płeć / Przydomek / Tytuł / Przedrostek / Przyrostek / Kolejność nazwisko/imię</span>
> 		<p>Podaj tutaj jak najwięcej informacji o osobie. <strong>Przydomek</strong> jest nieformalnym imieniem czasami łączonym z osobą.
> 		<strong>Tytuł</strong> jest używany przed imieniem lub nazwiskiem (np., <em>hr.</em> albo <em>Prof.</em>) ale nie jest jego częścią. <strong>Przedrostek</strong> używany jest przed nazwiskiem i jest zwykle uważany za jego część.
> 		<strong>Przyrostek</strong> będzie się wyświetlał po przecinku za imieniem lub nawiskiem. <strong>Kolejność nazwisko/imię</strong> określa kolejność w jakiej powinny być wyświetlane.
> 		Kolejność nazwisko/imię możesz zmienić  dla wszystkich osób w bazie danych pod <em>Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia główne</em> i tam <em>Nazwiska</em>.</p>
85c85
< 		<p>Zaznacz to pole, jeśli ta osoba żyje lub jeśli chcesz ograniczyć widok danych tej osoby (np. data urodzenia, zdjęcia) tylko do użytkowników, którzy są zalogowani z dostatecznymi uprawnieniami.</p>
---
> 		<p>Zaznacz to pole, jeśli ta osoba żyje lub jeśli chcesz ograniczyć widoczność danych tej osoby (np. data urodzenia, zdjęcia) tylko do użytkowników, którzy są zalogowani z dostatecznymi uprawnieniami.</p>
88,93c88,94
< 		<p>Wprowadź daty i miejsca dla wymienionych standardowych wydarzeń (jeśli je znasz).Jeśli nie znasz jakiejś daty, wpisz w odpowiednie pole literkę <strong>Y</strong> (wyświetli się "data nieznana").
< 		Jeśli pole przeznaczone dla daty pozostanie puste, użytkownicy z uprawnieniami <em>Zgoda na składanie komentarzy do podglądu administratora (tylko ludzie, rodziny i źródła)</em> nie będą mogli składać propozycji zmian dot. daty.
< 		Dodatkowe wydarzenia mogą zostać dodane po zapisaniu lub kliknięciu przycisku "zastosuj". Daty należy zawsze podawać w standardowym formacie genealogicznych, DD MMM YYYY (na przykład <em>18 Feb 2008</em>).
< 		Miesiąc należy zawsze wpisywać podając trzy pierwsze litery jego nazwy w języku angielskim (widoczny będzie jego odpowiednik w języku polskim).Oto angielskie odpowiedniki miesięcy: Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec.
< 		Informacje na temat miejsca powinny być rozdzielane przecinkami ( na przykład, <em>Boston, Suffolk, Massachusetts, USA</em>). Możesz również wybrać istniejącą nazwę miejsca przez kliknięcie ikonki "Znajdź" (lupa).
< 		 Aby ograniczyć ilość wyświetleń, podaj przed kliknięciem część nazwy miejsca. Wyświetlą się wszystkie miejsca zawierające w nazwie podane hasło.</p>
---
> 		<p>Wprowadź daty i miejsca dla wymienionych standardowych wydarzeń. Jeśli nie znasz jakiejś daty, wpisz w odpowiednie pole literkę <strong>Y</strong> (wyświetlać się będzie jako "data nieznana").
> 		Jeśli pole przeznaczone dla daty pozostanie puste, użytkownicy z uprawnieniami <em>Zgoda na składanie sugestii do akceptacji administratora (tylko ludzie, rodziny i źródła)</em> nie będą mogli składać propozycji zmian dot. daty.
> 		Dodatkowe wydarzenia mogą zostać dodane po zapisaniu lub kliknięciu przycisku "zastosuj". Daty należy zawsze podawać w standardowym formacie genealogicznym DD MMM YYYY (na przykład <em>18 Feb 2008</em>).
> 		Miesiąc należy zawsze wpisywać podając trzy pierwsze litery jego nazwy w języku angielskim (widoczny będzie jego odpowiednik w języku polskim). Oto angielskie skróty nazw miesięcy:
> Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec.
> 		Informacje na temat miejsca powinny być rozdzielane przecinkami np. <em>Boston, Suffolk, Massachusetts, USA</em>). Możesz również wybrać istniejącą nazwę miejsca przez kliknięcie ikonki "Znajdź" (lupa).
> 		 Aby ograniczyć ilość wyświetleń, podaj przed kliknięciem część nazwy miejsca. Wyświetlą się wszystkie miejsca zawierające w nazwie tę podaną część.</p>
96,97c97,100
< 		Te zdarzenia są związane z nakazami praktykowanymi przez Mormonów w Kościele Jezusa Chrystusa Świętych w Dniach Ostatnich (kościół LDS wymyślił standard GEDCOM).
< 		<strong>Uwaga:</strong> Jeśli nie chcesz, aby dane LDS były widoczne, przejdź do <em>Ustawienia i konfiguracja/Ustawienia główne</em> i ustaw tam odpowiednią opcję (musisz się wylogować i ponownie zalogować).</p>
---
> 		Te zdarzenia są związane z nakazami praktykowanymi przez Mormonów w Kościele Jezusa Chrystusa Świętych w Dniach Ostatnich (to właśnie kościół LDS opracował standard GEDCOM).
> 		<strong>Uwaga:</strong> Jeśli nie chcesz, aby dane LDS były widoczne, przejdź do
> <em>Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia główne</em> i w sekcji <em>Prywatność</em>
> ustaw odpowiedniÄ… opcjÄ™.</p>
106c109
< 		<p>Aby wprowadzić zmiany dotyczące istniejącej osoby, należy kliknąć przycisk <a href="#search">Szukaj</a> w celu jej zlokalizowania, a następnie kliknąć na ikonkę "Edycja" obok wybranej osoby.</p>
---
> 		<p>Aby wprowadzić zmiany dotyczące istniejącej osoby, należy kliknąć przycisk <a href="#search">Szukaj</a> w celu jej znalezienia, a następnie kliknąć na ikonkę "Edycja" obok wybranej osoby.</p>
108,112c111,115
< 		<span class="optionhead">Notatki / Cytaty / Związki / "Więcej"</span>
< 		<p>Notatki, cytaty i związki możesz łączyć z wydarzeniami lub osobami klikając na ikony łączy u góry strony lub obok każdego wydarzenia.
< 		"Więcej" informacji dla wydarzenia można dodać klikając na ikonkę "Plus ". Jeśli w którejś z kategorii istnieją już jakieś elementy,
< 		odpowiednie ikonki oznaczone są zielonymi kropkami w prawym górnym rogu. Aby uzyskać więcej informacji na temat każdej z kategorii, zobacz <em>Pomoc</em>  w okienkach,
< 		które stają się widoczne, gdy ikona zostanie naciśnięta.</p>
---
> 		<span class="optionhead">Przypisy / Odnośniki / Asocjacje / "Więcej"</span>
> 		<p>Przypisy, odnośniki do źródeł i asocjacje możesz łączyć z wydarzeniami lub osobami klikając na ikony łączy u góry strony lub obok każdego wydarzenia.
> "Więcej" informacji dla wydarzenia można dodać klikając na ikonkę "Plus". Jeśli w którejś z kategorii istnieją już jakieś elementy,
> odpowiednie ikony oznaczone są zielonymi kropkami w prawym górnym rogu. Aby uzyskać więcej informacji na temat każdej z kategorii, zobacz <em>Pomoc</em>  w okienkach,
> które stają się widoczne po naciśnięciu ikony.</p>
115,121c118,125
< 		<p>Aby dodać lub zarządzać dodatkowymi wydarzeniami, kliknij na przycisk "Dodaj nowe" obok <strong>Inne wydarzenia</strong>. Klikając <a href="events_help.php">Pomoc</a> znajdziesz więcej informacji na temat dodawania nowych wydarzeń.
< 	        Gdy wydarzenie zostało dodane, pod polem "Dodaj nowe"  pokaże się krótkie streszczenie. Przyciski w polu "Czynność" dla każdego wydarzenia pozwalają na edycję
< 		lub usunięcie wydarzenia, oraz dodawanie notatek lub cytatów. Kolejność, w której wydarzenia są wyświetlane jest ustalana wg daty (jeżeli dotyczy) i przez przypisany w "Rodzajach wydarzeń " priorytet
< 	        (jeśli nie jest związane terminem). Priorytet ten może ulec zmianie podczas edycji rodzajów wydarzeń.
< 
< 
< 		<p><strong>Uwaga</strong>: Takie informacje o standardowych wydarzeniach jak uwagi, cytaty ze źródeł, związki, "inne" wydarzenia i "więcej"  są zapisywane
---
> 		<p>Aby dodać lub zarządzać dodatkowymi wydarzeniami, kliknij na przycisk "Dodaj nowe" obok
> <strong>Inne wydarzenia</strong>. Klikając <a href="events_help.php">Pomoc</a> znajdziesz więcej informacji 
> na temat dodawania nowych wydarzeń.
> Po dodaniu wydarzenia pod polem "Dodaj nowe" pokaże się krótkie streszczenie. Przyciski w polu "Czynność"
> dla każdego wydarzenia pozwalają na edycję lub usunięcie wydarzenia oraz dodawanie przypisów lub odnośników. 
> Kolejność wyświetlania wydarzeń zależy od ich daty (jeżeli dotyczy) i od przypisanego w "Rodzajach wydarzeń" 
> priorytetu (jeśli nie jest związane datą). Priorytet ten może zostać zmieniony podczas edycji rodzajów wydarzeń.
> 		<p><strong>Uwaga</strong>: Takie informacje o standardowych wydarzeniach jak przypisy, odnośniki do źródeł, asocjacje, "inne" wydarzenia i "więcej"  są zapisywane
126,129c130,131
< 		<p>Jeśli dana osoba ma rodziców, sekcja <strong>Rodzice</strong> będzie widoczna w sekcji Wydarzenia. Ta sekcja jest zamknięta i wskazuje w nawiasie liczbę (par) rodziców.
<                 Aby rozwinąć sekcję i wyświetlić wszystkich rodziców, kliknij na napis "Rodzice" lub strzałkę obok niego.  Niektóre informacje, włączając w to wzajemny stosunek pomiędzy daną osobą i każdą parą rodziców,
< 		mogą być edytowane w każdym polu. Gdy zatrzymasz wskaźnik myszy nad sekcją rodziców, w prawym  górnym rogu pola ukaże się opcja <strong>Usuń łącze</strong>
< 		Kliknij, aby usunąć łącze danej osoby z tą parą rodziców.</p>
---
> 		<p>Jeśli dana osoba ma rodziców, sekcja <strong>Rodzice</strong> będzie widoczna pod sekcją Wydarzenia. W nawiasie wyświetlana jest liczba (par) rodziców.
> Typ relacji pomiędzy daną osobą i każdą parą rodziców może być wybrany z z rozwijanej listy. Gdy zatrzymasz wskaźnik myszy nad którymś z rodziców, w prawym  górnym rogu tej sekcji ukaże się opcja <strong>Usuń łącze</strong> umożliwiająca usuwanie powiązań danej osoby z rodzicami.</p>
132,134c134,135
< 		<p>Jeśli dana osoba posiada co najmniej jednego współmałżonka lub partnera, sekcja <strong>Małżonkowie/partnerzy</strong> będzie widoczna w sekcji Rodzice. Ta sekcja jest zamknięta i wskazuje liczbę małżonków / partnerów w nawiasie.
< 		Aby rozwinąć sekcję i wyświetlić wszystkich małżonków lub partnerów, kliknij na napis "Małżonkowie / partnerzy" lub strzałkę obok niego. Gdy zatrzymasz wskaźnik myszy nad sekcją  Małżonkowie / partnerzy, w prawym górnym rogu pola ukaże się opcja <strong>Usuń łącze</strong>.
< 		Kliknij, aby usunąć łącze danej osoby z  jej współmałżonkiem lub partnerem.</p>
---
> 		<p>Jeśli dana osoba posiada co najmniej jednego małżonka lub partnera, sekcja <strong>Małżonkowie/partnerzy</strong> będzie widoczna w sekcji Rodzice. W nawiasie podana jest liczba małżonków / partnerów.
> Gdy zatrzymasz wskaźnik myszy nad którymś z małżonków/partnerów, w prawym górnym rogu sekcji ukaże się opcja <strong>Usuń łącze</strong> umożliwiająca usuwanie powiązań danej osoby z małżonkiem lub partnerem.</p>
136c137
< 		<span class="optionhead">Sortowanie rodziców lub małżonów</span>
---
> 		<span class="optionhead">Sortowanie rodziców lub małżonków</span>
138c139
< 		przycisk, a następnie przesuń w górę lub w dół na stronie. Gdy blok znajdzie się w wybranym miejscu zwolnij przycisk myszy. Zmiany dokonane podczas sortowania są zapisywane automatycznie.</p>
---
> 		przycisk, a następnie przesuń w górę lub w dół. Gdy blok znajdzie się w wybranym miejscu zwolnij przycisk myszy. Zmiany dokonane podczas sortowania są zapisywane automatycznie.</p>
148,149c149
< 		a następnie zniknie. Osoba została usunięta. Aby usunąć więcej niż jedną osobę naraz, zaznacz pole w kolumnie Wybierz obok każdej osoby, która
< 		ma zostać usunięta, a następnie kliknąć przycisk "Usuń wybrane" znajdujący się na górze strony.</p>
---
> a następnie zniknie. Osoba została usunięta. Aby usunąć więcej niż jedną osobę naraz, zaznacz pole w kolumnie Wybierz obok każdej osoby, która ma zostać usunięta, a następnie kliknij przycisk "Usuń wybrane" znajdujący się na górze strony.</p>
157,159c157,161
< 		<a name="review"><p class="subheadbold">PrzeglÄ…d zmian</p></a>
<                 <p>Aby sprawdzić propozycje zmian dokonane przez innych użytkowników, kliknij na przycisk "Przegląd zmian". Jeśli są tam jakieś wpisy, w polu "Propozycje zmian" pojawi się gwiazdka (*).
< 		Możesz zadecydować o tym, czy przyjąć czy też usunąć proponowane zmiany. W celu przeglądania możesz wybrać pole drzewa, użytkownika lub oba.</p>
---
> 		<a name="review"><p class="subheadbold">PrzeglÄ…d sugestii</p></a>
> 		<p>Aby sprawdzić sugestie zmian otrzymane od innych użytkowników, kliknij na przycisk
> "Przegląd sugestii". Jeśli są tam jakieś wpisy, w polu "Przegląd sugestii" pojawi się gwiazdka (*).
> Możesz zadecydować o tym, czy zaakceptować, czy też usunąć proponowane zmiany. W celu przeglądania możesz 
> wybrać pole drzewa, użytkownika lub oba.</p>
162,169c164,168
< 		<p>Zlokalizuj wiersz w tabeli, która opisuje zdarzenie, które chcesz obejrzeć usunąć. Listę wyników  możesz zawęzić przez wybranie użytkownika (osoby odpowiedzialnej za
<                 proponowaną zmianę) oraz / lub drzewa. Kiedy wyniki zostaną wyświetlone, kliknij na jedną z opcji widocznych z lewej strony wiersza.
< 		Aby sprawdzić i ewentualnie nanieść zmiany wybierz <em>Przegląd zmian</em>. Aby odrzucić proponowane zmiany, wybierz <em>Usuń</em>.</p>
< 
< 		<span class="optionhead">PrzeglÄ…d zmian</span><br />
< 		<p>Na tej karcie możesz dokonywać różnych dodatkowych zmian, w tym dotyczących notatek lub źródeł, a następnie kliknąć przycisk "Zapisz i Usuń",
< 		aby zapisać zmiany i usunąć wpis. Można również zdecydować się na usunięcie propozycji klikając przycisk "Ignoruj i Usuń",
< 		lub odłożyć decyzję na później klikając przycisk "Odłóż".</p>
---
> 		<p>Zlokalizuj wiersz w tabeli, która opisuje zdarzenie, które chcesz obejrzeć lub usunąć. Listę wyników możesz zawęzić przez wybranie użytkownika (osoby sugerującej zmianę) oraz / lub drzewa. Kiedy wyniki zostaną wyświetlone, kliknij na jedną z opcji widocznych z lewej strony wiersza. Aby sprawdzić i ewentualnie nanieść zmiany wybierz <em>Przegląd sugestii</em>. Aby odrzucić proponowane zmiany, wybierz <em>Usuń</em>.</p>
> 
> 		<span class="optionhead">PrzeglÄ…d sugestii</span><br />
> 		<p>Na tej karcie możesz dokonywać różnych dodatkowych zmian, w tym dotyczących przypisów lub źródeł,
> a następnie kliknąć przycisk "Zapisz i Usuń", aby zapisać zmiany i usunąć wpis. Można również usunąć propozycję klikając przycisk "Ignoruj i Usuń", lub odłożyć decyzję na później klikając przycisk "Odłóż".</p>
178c177
< 		Aby znaleźć i scalić dwa powtarzające się zapisy, kliknij na przycisk "Scalanie". Użytkownik decyduje, czy dwa zapisy są identyczne, czy też nie.</p>
---
> 		Aby znaleźć i scalić dane dwóch różnych osób, skorzystaj z zakładki "Scalanie". Użytkownik decyduje, czy dwa zapisy dotyczą w istocie tej samej osoby, czy też nie.</p>
181,183c180,182
< 		<p>Po pierwsze, wybierz drzewo. Nie możesz połączyć osób z różnych drzew, tak więc tylko jedno drzewo może zostać wybrane. Dalej, masz możliwość wybrać osobę jako punkt wyjściowy
<                 dla Twojego szukania (Osoba 1), albo zezwolić TNG na szukanie pierwszej zgodności za Ciebie. Jeśli zdecydowałeś, że TNG wyszukuje zgodności, pozostaw pole ID Osoby 1 puste.</p>
< 		<p>Jeśli wybrałeś osobę jako Osoba 1, możesz też wybrać ręcznie ID Osoby 2. Wskazane jest jednak, aby pozwolić TNG na szukanie duplikatów dla Osoby 1, pozostawiając pole ID Osoby 2 puste.</p>
---
> 		<p>Po pierwsze, wybierz drzewo. Nie możesz połączyć osób z różnych drzew, tak więc musi zostać wybrane konkretne drzewo. Dalej, możesz wybrać osobę jako punkt wyjściowy
> (Osoba 1), albo zezwolić TNG na szukanie pierwszej zgodności za Ciebie. Jeśli zdecydowałeś, że TNG wyszukuje zgodności, pozostaw pole ID Osoby 1 puste.</p>
> 		<p>Jeśli wybrałeś jakąś osobę jako Osoba 1, możesz też wybrać ręcznie ID Osoby 2. Wskazane jest jednak, aby pozwolić TNG na szukanie potencjalnych duplikatów dla Osoby 1, pozostawiając pole ID Osoby 2 puste.</p>
186,187c185
< 		<p>Te kryteria TNG służą do określania możliwych zgodności. Imię i nazwisko są wybrane jako domyślne. To oznacza, że te pola muszą zgadzać się w obydwóch zapisach, aby zostały wzięte pod uwagę
<                 jako możliwe zgodności. Jeśli wybierzesz też datę urodzenia, miejsce urodzenia, datę oraz / lub miejsce zgonu, to te pola muszą się też zgadzać.</p>
---
> 		<p>Te kryteria TNG służą do określania możliwych zgodności. Imię i nazwisko są wybrane jako domyślne. To oznacza, że te pola muszą zgadzać się w obydwóch zapisach, aby zostały wzięte pod uwagę jako możliwe zgodności. Jeśli wybierzesz też datę urodzenia, miejsce urodzenia, datę oraz / lub miejsce zgonu, to te pola muszą się też zgadzać.</p>
190c188,189
<         <p><em>Ignoruj puste pola</em> znaczy, że puste pola nie będą brane pod uwagę. Na przykład, ktoś z nazwiskiem ale bez imienia nie zostanie uwzględniony, jeśli imię będzie wśród zaznaczonych kryteriów.</p>
---
> 		<p><em>Ignoruj puste pola</em> znaczy, że puste pola nie będą brane pod uwagę. Na przykład, ktoś z nazwiskiem ale bez imienia nie zostanie uwzględniony, jeśli imię będzie wśród zaznaczonych kryteriów.</p>
> 		<p><em>Użyj Soundex</em> znaczy, że do porównywnania nazwisk i imion będzie używana funkcja Soundex, uwzględniająca podobne brzmienie, a nie tylko zgodność tekstową. W tym przypadku, "Halina" mógłaby zostać uznana jako zgodność dla "Helena". (Soundex daje nie zawsze trafne rezultaty dla języka polskiego.)</p>
192,195c191,192
<         <p><em>Użyj Soundex</em> znaczy, że funkcja Soundex MySQL będzie użyta do porównania imion. W tym przypadku, "Blakely" mógłby zostać uznany jako zgodność dla "Blackley".</p>
< 
<         <p><em>Wspólne notatki &amp; cytaty</em> znaczy, że notatki i cytaty Osoby 2 będą dodane do notatek i cytatów Osoby 1 we wszystkich polach. Jeśli ta możliwość nie zostanie wybrana,
<         notatki i cytaty dotyczące Osoby 2 zostaną utracone, ponieważ zostaną skasowane przez te, odpowiadające polu Osoby 1.</p>
---
> 		<p>Wybranie opcji <em>Wspólne przypisy i odnośniki</em> powoduje, że przypisy i odnośniki Osoby 2 będą dodane do przypisów i odnośników Osoby 1 we wszystkich polach. Jeśli ta możliwość nie zostanie wybrana,
> przypisy i odnośniki dotyczące Osoby 2 zostaną utracone, a pozostaną tylko te odpowiadające polom Osoby 1.</p>
198c195
<                 zostaną utracone, ponieważ zostaną skasowane przez te, odpowiadające polu Osoby 1.</p>
---
> zostanÄ… utracone, a pozostanÄ… tylko te odpowiadajÄ…ce polom Osoby 1.</p>
200,201c197
< 		<p><span class="optionhead">Ostrzeżenie!</span> Raz wykonane scalanie nie może zostać cofnięte! Proszę rozważyć wykonanie kopii zapasowej tabel bazy danych zanim dokonasz operacji scalania na wypadek,
<                 gdybyś scalił niechcący niewłaściwe osoby.</p>
---
> 		<p><span class="optionhead">Ostrzeżenie!</span> Raz wykonane scalanie nie może zostać cofnięte! Proszę rozważyć wykonanie kopii zapasowej tabel bazy danych przed dokonaniem operacji scalania, na wypadek gdybyś scalił niechcący niewłaściwe osoby.</p>
204c200
< 		<p>Znajdź następną możliwą zgodność, która nie wymaga podania Osoby 1. TNG zmienia listę możliwych osób w przyporządkowany ID osoby ciąg znaków. To znaczy, że "10" następuje po "1" ale przed "2".</p>
---
> 		<p>Znajdź następną zgodność w drzewie - bez brania pod uwagę ew. wpisów w polu Osoby 1.</p>
207c203
< 		<p>Znajdź następny możliwy duplikat dla Osoby 1. Jeśli ta operacja zakończy się brakiem zapisu dla Osoby 2, znaczy, że duplikat nie został znaleziony.</p>
---
> 		<p>Znajdź następny możliwy duplikat dla Osoby 1. Jeśli ta operacja zakończy się brakiem zapisu dla Osoby 2, znaczy to że nie znaleziono duplikatu.</p>
209,210c205,206
< 		<span class="optionhead">Porównaj / odśwież.</span><br />
< 		<p>Porównanie osób 1 i 2. Jeśli to porównanie jest już widoczne, kliknięcie na ten przycisk spowoduje odświeżenie strony.</p>
---
> 		<span class="optionhead">Porównaj/odśwież.</span><br />
> 		<p>Wyświetlenie porównania danych osób 1 i 2. Jeśli to porównanie jest już widoczne, kliknięcie na ten przycisk spowoduje odświeżenie strony.</p>
213c209
< 		<p>Zamiana - Osoba 1 staje siÄ™ OsobÄ… 2 i vice versa.</p>
---
> 		<p>Zamiana - Osoba 1 staje siÄ™ OsobÄ… 2 i odwrotnie.</p>
216,218c212,214
< 		<p>Osoba 2 jest scalana z osobą 1. ID Osoby 1 oraz jej wszystkie inne dane zostaną zachowane, chyba, że dla Osoby 2 zostało zaznaczone odpowiednie pole(a).
<                 Na przykład, jeśli zaznaczyłeś pole obok daty urodzenia Osoby 2, dane w tym polu będą podczas scalania skopiowane od Osoby 2 do Osoby 1. Odpowiadające im dane Osoby 1 zostaną wtedy usunięte.
<                 Pola dla Osoby 2 są znaczone automatycznie, jeśli żadne odpowiadające im dane nie istnieją dla Osoby 1. Jeśli pole danych dla Osoby 1 lub 2 jest puste, znaczy, że nie istnieją żadne dane dla którejkolwiek osoby.</p>
---
> 		<p>Osoba 2 jest scalana z Osobą 1. ID Osoby 1 oraz jej wszystkie inne dane zostaną zachowane, chyba, że dla Osoby 2 zostało zaznaczone odpowiednie pole(a).
> Na przykład, jeśli zaznaczyłeś pole obok daty urodzenia Osoby 2, dane w tym polu będą podczas scalania skopiowane od Osoby 2 do Osoby 1. Odpowiadające im dane Osoby 1 zostaną wtedy utracone.
> Pola dla Osoby 2 są znaczone automatycznie, jeśli żadne odpowiadające im dane nie istnieją dla Osoby 1. Jeśli pole danych dla Osoby 1 lub 2 jest puste, znaczy, że te dane nie istnieją dla tych osób.</p>
221,222c217,220
< 		<p>Edytuj indywidualny zapis dla tej osoby w nowym oknie. Jeśli dokonałeś zmian, musisz kliknąć Porównaj / odśwież by zobaczyć zmiany w widoku scalania.</p>
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 		<p>Edytuj indywidualne dane tej osoby w nowym oknie.Jeśli dokonałeś zmian, musisz kliknąć Porównaj/odśwież by zobaczyć zmiany w widoku scalania.</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
> 
diff -r TNG/languages/Polish-UTF8/places_googlemap_help.php TNG1403/languages/Polish-UTF8/places_googlemap_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
29,30c29,30
< 		Kliknij przycisk "Pokaż /ukryj mapę Google", aby pokazać mapę Google i szukać szerokości i długości geograficznej lokalizacji oraz zoomu, lub ukryć mapę po
<                 zakończeniu. Domyślnie jest ustawienie początkowe określone w Administrator /Ustawienia i konfiguracja / Ustawienia mapy.</p>
---
> 		Kliknij przycisk "Pokaż/ukryj mapę Google", aby pokazać mapę Google i szukać szerokości i długości geograficznej lokalizacji oraz zoomu, lub ukryć mapę po
>  zakończeniu. Domyślnie jest ustawienie początkowe określone w Administrator /Ustawienia i konfiguracja / Ustawienia mapy.</p>
38,39c38,39
< 		<p>Interfejs Google Map Geocoder  pozwala na zlokalizowanie szerokości i długości geograficznej miejsca za pomocą wywołania poprzez kliknięcie w wybrany punkt.
<                 Możesz również skorzystać z StreetMap (<a href="http://www.streetmap.co.uk" target="_blank">http://www.streetmap.co.uk</a>) aby odnaleźć współrzędne w Anglii, lub z Mapy Szukacza (<a href="http://mapa.szukacz.pl" target="_blank">http://mapa.szukacz.pl</a>) w Polsce.</p>
---
> 		<p>Interfejs Google Map Geocoder pozwala na zlokalizowanie szerokości i długości geograficznej miejsca za pomocą wywołania poprzez kliknięcie w wybrany punkt.
>  Możesz również skorzystać z StreetMap (<a href="https://www.streetmap.co.uk" target="_blank">https://www.streetmap.co.uk</a>) aby odnaleźć współrzędne w Anglii, lub z Mapy Szukacza (<a href="https://mapa.szukacz.pl" target="_blank">https://mapa.szukacz.pl</a>) w Polsce.</p>
43,45c43,45
<                 każdego miejsca noszącego tę samą nazwę. Podczas dodawania lub cmentarzy mediów będą dotyczyły jednak wyłącznie jednej lokalizacji.</p>
< 		<p>Być może trzeba będzie dla istniejących nazw miejsc w TNG  zmienić je w polu "Określenie miejsca Geocode" . Na przykład Google nie lubi <em>powiatu (County)</em> jako części nazwy miejsca dla lokalizacji w USA i Szkocji ani nie radzi sobie z prowincjami Nowej Zelandii.
<                 Być może warto spróbować podać dodatkowo nazwę kraju. Można także wpisać nazwę kraju w języku Angielskim.</p>
---
>  każdego miejsca noszącego tę samą nazwę. Podczas dodawania lub cmentarzy mediów będą dotyczyły jednak wyłącznie jednej lokalizacji.</p>
> 		<p>Być może trzeba będzie dla istniejących nazw miejsc w TNG zmienić je w polu "Określenie miejsca Geocode" . Na przykład Google nie lubi <em>powiatu (County)</em> jako części nazwy miejsca dla lokalizacji w USA i Szkocji ani nie radzi sobie z prowincjami Nowej Zelandii.
>  Być może warto spróbować podać dodatkowo nazwę kraju. Można także wpisać nazwę kraju w języku Angielskim.</p>
50c50
<                         <li>1102 Shipwatch Circle, Tampa, Florida</li>
---
> 			<li>1102 Shipwatch Circle, Tampa, Florida</li>
52d51
< 			<li>Avenida de Velasquez 126, Malaga</li>
54,55d52
< 			<li>Ocean Drive, Twin Waters, Queensland, Australia</li>
< 			<li>Rue de la Wastinne 45, 1301 Wavre, Belgium</li>
61c58
< 		<p>Mapy niektórych krajów są niedostępne dla geocodera powodu nacjonalistycznych praw autorskich i licencji. Dla tych krajów, będziesz musiał użyć linku <a href="http://maps.google.com/" target="_blank">Full Google Map Search</a>.</p>
---
> 		<p>Mapy niektórych krajów są niedostępne dla geocodera powodu krajowych praw autorskich i licencji. Dla tych krajów, będziesz musiał użyć linku <a href="https://maps.google.com/" target="_blank">Full Google Map Search</a>.</p>
65,66c62,63
<                 czego oczekuje przed zaakceptowaniem tego, co jest proponowane na mapce. Jeżeli "szpilka" na mapie nie znajduje się w oczekiwanej lokalizacji, proponowana
<                 szerokość i długość mogą być niepoprawne. W takim przypadku, należy kliknąć na żądany punkt na mapie w celu ustalenia lepszej lokalizacji.</p>
---
>  czego oczekuje przed zaakceptowaniem tego, co jest proponowane na mapce. Jeżeli "szpilka" na mapie nie znajduje się w oczekiwanej lokalizacji, proponowana
>  szerokość i długość mogą być niepoprawne. W takim przypadku, należy kliknąć na żądany punkt na mapie w celu ustalenia lepszej lokalizacji.</p>
68,69c65,66
< 		<p>Należy również sprawdzić  przyjęte współrzędne za pomocą ikonki Test na liście miejsc, a następnie kliknąć na "szpilkę" przy wydarzeniu w celu otwarcia mapy
<                 zewnętrznej, aby zweryfikować to położenie.</p>
---
> 		<p>Należy również sprawdzić przyjęte współrzędne za pomocą ikonki Test na liście miejsc, a następnie kliknąć na "szpilkę" przy wydarzeniu w celu otwarcia mapy
>  zewnętrznej, aby zweryfikować to położenie.</p>
73,74c70,71
<                 szczególnie potrzebne w celu wyeliminowania komunikatu błędu informującego, że Google nie jest w stanie powiększyć mapy żądanego poziomu.
<                 Ustawione wartości powiększenia będą zapisywane w bazie danych TNG.</p>
---
>  szczególnie potrzebne w celu wyeliminowania komunikatu błędu informującego, że Google nie jest w stanie powiększyć mapy żądanego poziomu.
>  Ustawione wartości powiększenia będą zapisywane w bazie danych TNG.</p>
78,80c75,77
<                 Można określić w Twoim pliku cust_text.php zastępcze preferencje do $admtext dla poziomów od 1 do 6 zawartych w pliku alltext.php. Poziomy etykietek od 2 do 5 mogą być zmienione w celu odzwierciedlenia na
<                 przykład kościółów / szpitali / domów opieki / cmentarzy, miejscowości/ miast / gmin, powiatów / wydziałów, stanów / województw / regionów. Różne kolorowe szpilki będą wskazywać różne skale poziomów
<                 miejsc na karcie osoby. Wskaźnika poziomu nie stosuje się do kart cmentarzy, ani mediów. Szpilki wyświetlane na  cmentarzach są ustawione domyślnie do poziomu 2 w celu uwidocznienia nagrobków na najbardziej szczegółowym poziomie.</p>
---
>  Można określić w Twoim pliku cust_text.php zastępcze preferencje do $admtext dla poziomów od 1 do 6 zawartych w pliku alltext.php. Poziomy etykietek od 2 do 5 mogą być zmienione w celu odzwierciedlenia na
>  przykład kościółów / szpitali / domów opieki / cmentarzy, miejscowości/ miast / gmin, powiatów / wydziałów, stanów / województw / regionów. Różne kolorowe szpilki będą wskazywać różne skale poziomów
>  miejsc na karcie osoby. Wskaźnika poziomu nie stosuje się do kart cmentarzy, ani mediów. Szpilki wyświetlane na cmentarzach są ustawione domyślnie do poziomu 2 w celu uwidocznienia nagrobków na najbardziej szczegółowym poziomie.</p>
90,91c87,88
< 		<p>Aby precyzyjnie ustawić szerokość i długość geograficzną, kliknij na mapę Google  w wybranym przez Ciebie miejscu. Być może trzeba będzie skorzystać z przycisków Mapa, Satelita lub Hybrydowa
<                 aby łatwiej było ustalić współrzędne miejsca.</p>
---
> 		<p>Aby precyzyjnie ustawić szerokość i długość geograficzną, kliknij na mapę Google w wybranym przez Ciebie miejscu. Być może trzeba będzie skorzystać z przycisków Mapa, Satelita lub Hybrydowa
>  aby łatwiej było ustalić współrzędne miejsca.</p>
95c92
<                 The drag and pan capability means there is no clicking and waiting for graphics to reload each time you want to view the adjacent parts of a map.</p>
---
>  The drag and pan capability means there is no clicking and waiting for graphics to reload each time you want to view the adjacent parts of a map.</p>
99c96
<                 Jeśli dokonasz zmiany poziomu powiększenia, wartości zoom  zostaną zapisane w tabeli TNG.</p>
---
>  Jeśli dokonasz zmiany poziomu powiększenia, wartości zoom zostaną zapisane w tabeli TNG.</p>
108,110c105,108
< 		<p>Tutaj możesz uzyskać dodatkową pomoc: <a href="http://www.google.com/apis/maps/documentation/" target="_blank">Google Maps API</a>.</p>
< 		<p>Możesz również skorzystać z tej: <a href="http://www.google.com/intl/en_us/help/maps/tour/" target="_blank">Google Maps tour</a>.</p>
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 		<p>Tutaj możesz uzyskać dodatkową pomoc: <a href="https://www.google.com/apis/maps/documentation/" target="_blank">Google Maps API</a>.</p>
> 		<p>Możesz również skorzystać z tej: <a href="https://www.google.com/intl/en_us/help/maps/tour/" target="_blank">Google Maps tour</a>.</p>
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/places_help.php TNG1403/languages/Polish-UTF8/places_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
30,31c30,31
<         <p><p>Znajdź istniejące miejsce szukając jego pełnej nazwy lub jej części. Wybierz drzewo lub zaznacz pole "Tylko dokładna nazwa" w celu dalszego zawężenia kryteriów wyszukiwania.
<               Jeśli nic nie wybierzesz, w polu wyszukiwania znajdziesz wszystkie miejsca zapisane w bazie danych.</p></p>
---
>         <p><p>Znajdź istniejące miejsce szukając jego pełnej nazwy lub jej części. Możesz wybrać drzewo lub zaznaczyć pole "Dokładne dopasowanie" w celu dalszego zawężenia kryteriów wyszukiwania.
>               Jeśli nich nie wpiszesz w polu wyszukiwania, wyświetlone zostaną wszystkie miejsca zapisane w bazie danych.</p></p>
33c33
< 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie naciśniesz przycisku <strong>Zerowanie</strong>, który przywraca domyślne wartości i wszystkich wyszukiwań.</p>
---
> 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie naciśniesz przycisku <strong>Wyczyść</strong>, który przywraca domyślne wartości i opcje.</p>
36c36
< 		<p>Ikonki w polu "czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, kliknij pole w kolumnie
---
> 		<p>Ikonki w kolumnie "Czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, kliknij pole w kolumnie
48c48
< 		<p>TNG automatycznie dodaje nowy rekord Miejsca za każdym razem, gdy są dodawane nowe miejsca w Administracja / Osoby,  Administracja / Rodziny oraz jako część niestandardowe wydarzenia.
---
> 		<p>TNG automatycznie dodaje nowy rekord Miejsca za każdym razem, gdy są dodawane nowe miejsca w Administracja >> Osoby, Administracja >> Rodziny oraz jako część niestandardowego wydarzenia.
52c52,53
<                  a następnie kliknąć na ikonkę Edycja obok wybranej linii. Podczas dodawania lub edycji miejsca dostępne są następujące elementy:</p>
---
>                  a następnie kliknąć na ikonkę Edycja obok wybranej linii.</p>
>                  <p>Podczas dodawania lub edycji miejsca dostępne są następujące elementy:</p>
55c56
< 		<p>Wybierz jedno z istniejących drzew. Każde miejsce musi być przypisane do drzewa. <strong> Uwaga: </strong> Drzewo nie może być zmieniane dla raz utworzonego miejsca (zamiast tego możesz usunąć miejsce i dodać go ponownie dla innego drzewa).</p>
---
> 		<p>Wybierz jedno z istniejących drzew. Każde miejsce musi być przypisane do drzewa. <strong> Uwaga: </strong> Drzewo nie może być zmieniane dla raz utworzonego miejsca (zamiast tego musisz usunąć miejsce i dodać je ponownie dla innego drzewa).</p>
58c59
< 		<p>Podaj nazwę miejsca w kolejności do najmniejszej miejscowości do największej. Wszystkie miejscowości powinny być oddzielone przecinkami. Na przykład <em>Jabłoń, Pisz, piski, warmińsko-mazurskie, Polska</em>.
---
> 		<p>Podaj nazwę miejsca oraz jego przynależności administracyjnej, podając nazwy jednostek administracyjnych w kolejności do najniższej do najwyższej (oddzielając je przecinkami). Na przykład <em>Jabłoń, Pisz, piski, warmińsko-mazurskie, Polska</em>.
62,63c63,64
< 		<p>Kliknij przycisk "Pokaż / Ukryj mapę Google", aby pokazać mapę. Ta opcja jest dostępna tylko jeśli masz "klucz mapy" z Google i wpisałeś go w Administracja/Ustawienia i konfiguracja/Ustawienia mapy (patrz <a href="mapsettings_help.php">Pomoc: Ustawienia mapy</a>). Kliknij przycisk ponownie, aby ukryć mapę. Aby wyszukać
<                 miejscowość na mapie, wpisz jej nazwę w polu <strong>Określenie miejsca Geocode</strong> i kliknij "Szukaj". Możesz też kliknąć  na mapę i przeciągnąć, aby przenieść "szpilkę" na żądaną lokalizację. Można również użyć kontroli Zoom, aby pokazać bardziej szczegółowo żądany obszar. Zobacz stronę
---
> 		<p>Kliknij przycisk "Pokaż / Ukryj mapę Google", aby pokazać mapę. Ta opcja jest dostępna tylko jeśli masz "klucz mapy" z Google i wpisałeś go w Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia mapy (patrz <a href="mapsettings_help.php">Pomoc: Ustawienia mapy</a>). Kliknij przycisk ponownie, aby ukryć mapę. Aby wyszukać
>                 miejscowość na mapie, wpisz jej nazwę w polu <strong>Określenie miejsca Geocode</strong> i kliknij "Szukaj". Możesz też kliknąć  na mapę i przeciągnąć, aby przenieść "szpilkę" na żądaną lokalizację. Można również użyć kontroli Powiększenie, aby pokazać bardziej szczegółowo żądany obszar. Zobacz stronę
69c70
< 		<span class="optionhead">Zoom</span>
---
> 		<span class="optionhead">Powiększenie</span>
76c77
< 		<span class="optionhead">Notatki</span>
---
> 		<span class="optionhead">Przypisy</span>
79c80
< 		<span class="optionhead">Zmień w nazwy miejsca w istniejących wydarzeniach</span>
---
> 		<span class="optionhead">Zmień nazwy miejsca w istniejących wydarzeniach</span>
83c84
<                 szerokości, długości lub notatkach, lub jeśli są załączone jakiekolwiek media.</p>
---
>                 szerokości, długości lub przypisach, lub jeśli są załączone jakiekolwiek media.</p>
103,104c104
< 		Aby dokonać scalenia nazw miejsc, które mogą być nieco inne, lecz odnosić się do tej samej lokalizacji, kliknij na "Scalanie".
<                 Użytkownik decyduje, czy dwa zapisy są takie same, czy też nie.</p>
---
> 		Aby dokonać scalenia nazw miejsc, których nazwy mogą być nieco inne, lecz odnoszą się do tej samej lokalizacji, kliknij na "Scalanie".</p>
117,119c117
<                 aktualnie wybranego. <strong>Uwaga:</strong> informacje w polach Notatki i Szerokość / długość  będzie tylko zachowane dla miejsca które pozostaje.</p>
< 
< 		<p>Proszę również pamiętać, że wydajność obniża się, im więcej elementów jest wybranych do scalania. Innymi słowy, scalanie dwóch miejscach odbędzie się znacznie szybciej niż scalanie 20 miejsc.</p>
---
>                 aktualnie wybranego. <strong>Uwaga:</strong> informacje w polach Przypis i Szerokość / długość  będzie tylko zachowane dla miejsca które pozostaje.</p>
122,123c120,121
< 		
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/repositories_help.php TNG1403/languages/Polish-UTF8/repositories_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
15c15
< 			<a href="assoc_help.php" class="lightlink">Pomoc: ZwiÄ…zki &raquo;</a>
---
> 			<a href="assoc_help.php" class="lightlink">Pomoc: Asocjacje &raquo;</a>
35c35
< 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie naciśniesz przycisku <strong>Zerowanie</strong>, który przywraca domyślne wartości i wszystkich wyszukiwań.</p>
---
> 		<p>Kryteria wyszukiwania na tej stronie zostaną zapamiętane, dopóki nie naciśniesz przycisku <strong>Wyczyść</strong>, który przywraca domyślne wartości wszystkich kryteriów.</p>
38c38
< 		<p>Ikonki w polu "czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, kliknij pole w kolumnie
---
> 		<p>Ikonki w polu "czynność" obok każdego wyniku wyszukiwania pozwalają na edycję, usuwanie lub podgląd tego wyniku. Aby usunąć więcej niż jeden rekord jednocześnie, klikaj w pola wyboru w kolumnie
51c51
< 		<p>Aby dodać nowe repozytorium, kliknij na <strong>Dodaj nowe</strong> a następnie wypełnić formularz. Niektóre informacje (notatki i dodatkowe wydarzenia)
---
> 		<p>Aby zdefiniować nowe repozytorium, kliknij na <strong>Dodaj nowe</strong> a następnie wypełnij formularz. Niektóre informacje (przypisy i dodatkowe wydarzenia)
55c55
< 		<p>Jeśli masz tylko jedno drzewo, zostanie ono zaznaczone automatycznie. W innym przypadku, należy wybrać drzewo na nowego repozytorium.</p>
---
> 		<p>Jeśli masz tylko jedno drzewo, zostanie ono zaznaczone automatycznie. W innym przypadku, należy wybrać drzewo dla nowego repozytorium.</p>
58c58
< 		<p>ID repozytorium musi być unikalne w obrębie wybranego drzewa i może składać się ze skrótu <strong>REPO</strong> lub litery <strong>R</strong> oraz następujących po nich cyfr (nie więcej niż 22 znaki w sumie).
---
> 		<p>ID repozytorium musi być unikalny w obrębie wybranego drzewa i powinien składać się ze prefiksu <strong>REPO</strong> oraz następujących po nim cyfr (nie więcej niż 22 znaki w sumie).
61c61
< 		Aby wygenerować unikalny ID, kliknij przycisk <strong>Generuj</strong>. Będzie to najwyższa liczba zlokalizowana w bazie danych (najwyższe używane ID + 1). Aby zabezpieczyć wybrany ID przed zajęciem go przez
---
> 		Aby wygenerować unikalny ID, kliknij przycisk <strong>Generuj</strong>. Będzie to niższa możliwa liczba dla tej bazy danych (najwyższe używane ID + 1). Aby zabezpieczyć wybrany ID przed zajęciem go przez
64,67c64,66
< 		<p><strong>UWAGA</strong>: Jeśli korzystasz na Twoim komputerze z programu genealogicznego, który także tworzy numery ID dla nowych osób,
< 		jest WYSOCE ZALECANE zachowanie tych ID dla synchronizacji między dwoma programami. Brak tej synchronizacji może skutkować konfliktami, które mogą spowodować,
< 		że Twoje łącza do zdjęć, historii i nagrobków mogą stać się nie do użycia. Jeśli Twój program tworzy ID, nie dostosowane do tradycyjnych standardów
< 		(na przykład <strong>I</strong> jest na końcu, nie na początku), możesz zmodyfikować plik "prefixes.php" tak, aby przyjmował inne prefiksy.</p>
---
> 		<p><strong>UWAGA</strong>: Jeśli korzystasz na Twoim komputerze z programu genealogicznego, który tworzy identyfikatory repozytoriów,
> 		jest WYSOCE ZALECANE zachowanie tych ID dla synchronizacji między TNG a programem. Brak tej synchronizacji może skutkować konfliktami, w których konsekwencji łącza do mediów staną się nie do użycia. Jeśli Twój program tworzy ID niezgodne z tradycyjnymi standardami
> 		(na przykład prefiks <strong>REPO</strong> jest na końcu identyfikatora, a nie na początku), powinieneś zmodyfikować <em>Ustawienia i konfiguracja >> Konfiguracja >> Ustawienia główne</em> i tam <em>Prefiksy i sufiksy</em>, tak aby TNG przyjmował te prefiksy.</p>
84,85c83,84
< 		<span class="optionhead">Notatki</span>
< 		<p>Notatki możesz łączyć z wydarzeniami lub repozytorium klikając na ikony łączy u góry strony lub obok każdego wydarzenia.
---
> 		<span class="optionhead">Przypisy</span>
> 		<p>Przypisy możesz łączyć z wydarzeniami lub repozytorium klikając na ikony łączy u góry strony lub obok każdego wydarzenia.
93,94c92,93
< 		lub usunięcie wydarzenia, oraz dodawanie notatek lub cytatów. Kolejność, w której wydarzenia są wyświetlane jest ustalana wg daty (jeżeli dotyczy) i przez przypisany w "Rodzajach wydarzeń " priorytet
< 	        (jeśli nie jest związane terminem). Priorytet ten może ulec zmianie podczas edycji rodzajów wydarzeń.
---
> 		lub usunięcie wydarzenia, oraz dodawanie przypisów lub odnośników. Kolejność, w której wydarzenia są wyświetlane jest ustalana wg daty (jeżeli dotyczy) i przez przypisany w "Rodzajach wydarzeń " priorytet
> 	        (jeśli nie jest związane z datą). Priorytet ten może ulec zmianie podczas edycji rodzajów wydarzeń.
97c96
< 		<p><strong>Uwaga</strong>: Takie informacje o standardowych wydarzeniach jak uwagi, cytaty ze źródeł, związki, "inne" wydarzenia i "więcej"  są zapisywane
---
> 		<p><strong>Uwaga</strong>: Takie informacje o standardowych wydarzeniach jak przypisy, odnośniki do źródeł, asocjacje, "inne" wydarzenia i "więcej" są zapisywane
123,124c122,123
< 		<p>Po pierwsze, wybierz drzewo. Nie możesz połączyć repozytoriów z różnych drzew, tak więc tylko jedno drzewo może zostać wybrane. Dalej, masz możliwość
<                 wyboru źródła jako punkt wyjściowy dla Twojego szukania (Repozytorium 1), albo zezwolić TNG na szukanie pierwszej zgodności za Ciebie. Jeśli zdecydowałeś,
---
> 		<p>Po pierwsze, wybierz drzewo. Nie możesz połączyć repozytoriów z różnych drzew, tak więc może zostać wybrane tylko jedno drzewo. Dalej, możesz
>                 wybrać źródło jako punkt wyjściowy dla Twojego szukania (Repozytorium 1), albo zezwolić TNG na szukanie pierwszej zgodności za Ciebie. Jeśli zdecydowałeś,
131,132c130,131
<         <p><em>Połącz notatki</em> znaczy, że notatki z Repozytorium 2 będą dodane do notatek z Repozytorium 1 we wszystkich polach. Jeśli ta możliwość nie zostanie wybrana,
<                notatki dotyczące Repozytorium 2 zostaną utracone, ponieważ zostaną skasowane przez te, odpowiadające polu Repozytorium 1.</p>
---
>         <p><em>Połącz przypisy</em> znaczy, że przypisy z Repozytorium 2 będą dodane do przypisów z Repozytorium 1 we wszystkich polach. Jeśli ta możliwość nie zostanie wybrana,
>                przypisy dotyczące Repozytorium 2 zostaną utracone, ponieważ pozostaną tylko te odpowiadające polu Repozytorium 1.</p>
135c134
<                media dotyczące Repozytorium 2 zostaną utracone, ponieważ zostaną skasowane przez te, odpowiadające polu Repozytorium 1.</p>
---
>                media dotyczące Repozytorium 2 zostaną utracone, ponieważ pozostaną tylko te odpowiadające polu Repozytorium 1.</p>
137,138c136,137
< 		<p><span class="optionhead">Ostrzeżenie!</span> Raz wykonane scalanie nie może zostać cofnięte! Proszę rozważyć wykonanie kopii zapasowej tabel bazy danych zanim dokonasz operacji scalania na wypadek,
<                 gdybyś scalił niechcąco niewłaściwe osoby.</p>
---
> 		<p><span class="optionhead">Ostrzeżenie!</span> Raz wykonane scalanie nie może zostać cofnięte! Proszę rozważyć wykonanie kopii zapasowej tabel bazy danych przed dokonaniem operacji scalania na wypadek,
>                 gdybyś scalił niechcący niewłaściwe repozytoria.</p>
141c140
< 		<p>Znajdź następną możliwą zgodność, która nie wymaga podania Repozytorium 1. TNG zmienia listę możliwych repozytoriów w przyporządkowany ID repozytorium ciąg znaków.
---
> 		<p>Znajdź następną możliwą zgodność, która nie wymaga podania Repozytorium 1. TNG traktuje ID repozytorium jako ciąg znaków (leksykograficznie).
151c150
< 		<p>Zamiana - Repozytorium 1 staje siÄ™ Repozytorium 2 i vice versa.</p>
---
> 		<p>Zamiana - Repozytorium 1 staje siÄ™ Repozytorium 2 i odwrotnie.</p>
155c154
<                 zaznaczone odpowiednie pole(a).  Na przykład, jeśli zaznaczyłeś pole autor dla Repozytorium 2, dane w tym polu będą podczas scalania skopiowane ze Repozytorium 2 do Repozytorium 1.
---
>                 zaznaczone odpowiednie pole(a).  Na przykład, jeśli zaznaczyłeś pole Autor dla Repozytorium 2, dane w tym polu będą podczas scalania skopiowane ze Repozytorium 2 do Repozytorium 1.
157c156
<                 ID Repozytorium 1 zostanie zachowane. Jeśli pole danych dla Repozytorium 1 lub 2 jest puste, znaczy, że nie istnieją żadne dane dla któregokolwiek repozytorium.</p>
---
>                 Identyfikator ID Repozytorium 1 zostanie zachowany. Jeśli pole danych dla Repozytorium 1 lub 2 jest puste, znaczy, że nie istnieją żadne dane dla któregokolwiek repozytorium.</p>
161c160,161
< 
---
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/sources_help.php TNG1403/languages/Polish-UTF8/sources_help.php
12,13c12,13
< 			<a href="http://tngforum.us" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
< 			<a href="http://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
---
> 			<a href="https://tng.community" target="_blank" class="lightlink">TNG Forum</a> &nbsp; | &nbsp;
> 			<a href="https://tng.lythgoes.net/wiki" target="_blank" class="lightlink">TNG Wiki</a><br />
35c35
< 		<p>Twoje kryteria wyszukiwania na tej stronie zostaną zapamiętane dopóki nie naciśniesz przycisku <strong>Zerowanie</strong>, który przywraca domyślne wartości i wszystkich wyszukiwań.</p>
---
> 		<p>Kryteria wyszukiwania na tej stronie zostaną zapamiętane, dopóki nie naciśniesz przycisku <strong>Wyczyść</strong>, który przywraca domyślne wartości wszystkich kryteriów.</p>
49c49
< 		<p><strong>Źródło</strong> jest  formą ewidencji cytatów przeznaczonych do udowodnienia lub uzasadnienia jakiegoś elementu danych. To samo źródło może być cytowane w treści dokumentu wielokrotnie na wielu osób,
---
> 		<p><strong>Źródło</strong> jest  formą ewidencji odnośników przeznaczonych do uzasadnienia jakiegoś elementu danych. To samo źródło może być wykorzystywane wielokrotnie (poprzez odnośniki) dla wielu osób,
52c52
< 		<p>Aby dodać nowe źródło, kliknij na <strong>Dodaj nowe</strong> a następnie wypełnić formularz. Niektóre informacje (notatki i dodatkowe wydarzenia) mogą być dodane dopiero po kliknięciu na
---
> 		<p>Aby dodać nowe źródło, kliknij na <strong>Dodaj nowe</strong> a następnie wypełnić formularz. Niektóre informacje (przypisy i dodatkowe wydarzenia) mogą być dodane dopiero po kliknięciu na
59,60c59,60
< 		<p>ID źródła musi być unikalne w obrębie wybranego drzewa i powinno składać się z litery <strong>S</strong> oraz następujących po niej cyfr (nie więcej niż 21).
< 		Numer ID jest generowany automatycznie za każdym razem, gdy strona jest wyświetlana po raz pierwszy,  ale można także w  razie potrzeby wpisać własny ID.
---
> 		<p>ID źródła musi być unikalny w obrębie wybranego drzewa i powinno składać się z litery <strong>S</strong> oraz następujących po niej cyfr (nie więcej niż 21).
> 		Numer ID jest generowany automatycznie za każdym razem, gdy strona jest wyświetlana po raz pierwszy, ale można także w  razie potrzeby wpisać własny ID.
62c62
< 		Aby wygenerować unikalny ID, kliknij przycisk <strong>Generuj</strong>. Będzie to najwyższa liczba zlokalizowana w bazie danych (najwyższe używane ID + 1).
---
> 		Aby wygenerować unikalny ID, kliknij przycisk <strong>Generuj</strong>. Będzie to najmniejsza liczba możliwa obecnie do użycia bazie danych (najwyższe używane ID + 1).
67,68c67,68
< 		że Twoje łącza do zdjęć, historii i nagrobków mogą stać się nie do użycia. Jeśli Twój program tworzy ID, nie dostosowane do tradycyjnych standardów
< 		(na przykład <strong>I</strong> jest na końcu, nie na początku), możesz zmodyfikować plik "prefixes.php" tak, aby przyjmował inne prefiksy.</p>
---
> 		że Twoje łącza do zdjęć, historii i nagrobków mogą stać się nie do użycia. Jeśli więc program tworzy ID nie dostosowane do ustawień TNG
> 		(na przykład <strong>S</strong> jest na końcu, nie na początku), możesz zmodyfikować plik "prefixes.php" tak, aby przyjmował inne prefiksy.</p>
74c74
< 		<p>Formalny, długi tytuł dla źródła.</p>
---
> 		<p>Formalny, pełny tytuł dla źródła.</p>
80c80
< 		<p>Wybierz repozytorium, w którym znajduje się to źródło. Jeśli repozytorium jeszcze nie istnieje, przejdź do działu Administracja/Repozytoria, dodaj go tam,
---
> 		<p>Wybierz repozytorium, w którym znajduje się to źródło. Jeśli repozytorium nie zostało jeszcze zdefiniowane, przejdź do działu Administracja/Repozytoria, dodaj go tam,
95,96c95,96
< 		<span class="optionhead">Notatki</span>
< 		<p>Notatki możesz łączyć z wydarzeniami lub źródłami klikając na ikony łączy u góry strony lub obok każdego wydarzenia.
---
> 		<span class="optionhead">Przypisy</span>
> 		<p>Przypisy możesz łączyć z wydarzeniami lub źródłami klikając na ikony łączy u góry strony lub obok każdego wydarzenia.
104,105c104,105
< 	        Gdy wydarzenie zostało dodane, pod polem "Dodaj nowe"  pokaże się krótkie streszczenie. Przyciski w polu "Czynność" dla każdego wydarzenia pozwalają na edycję
< 		lub usunięcie wydarzenia, oraz dodawanie notatek lub cytatów. Kolejność, w której wydarzenia są wyświetlane jest ustalana wg daty (jeżeli dotyczy) i przez przypisany w "Rodzajach wydarzeń " priorytet
---
> 	        Gdy wydarzenie zostało dodane, pod polem "Dodaj nowe" pokaże się krótkie streszczenie. Przyciski w polu "Czynność" dla każdego wydarzenia pozwalają na edycję
> 		lub usunięcie wydarzenia, oraz dodawanie przypisów lub odnośników. Kolejność, w której wydarzenia są wyświetlane jest ustalana wg daty (jeżeli dotyczy) i przez przypisany w "Rodzajach wydarzeń " priorytet
143c143
< 		<p>Te kryteria TNG służą do określania możliwych zgodności. Tytuł i krótki tytuł jako domyślne. To oznacza, że te pola muszą zgadzać się w obydwóch
---
> 		<p>Te kryteria TNG służą do określania możliwych zgodności. Tytuł i krótki tytuł są zaznaczone domyślnie. To oznacza, że te pola muszą zgadzać się w obydwu
148c148
<         <p><em>Ignoruj puste pola</em> znaczy, że puste pola nie będą brane pod uwagę. Na przykład, źródła z krótkim, nie pełnym tytułem nie zostanie uwzględnione,
---
>         <p><em>Ignoruj puste pola</em> znaczy, że puste pola nie będą brane pod uwagę. Na przykład, źródła z podanym tylko krótkim (a nie pełnym) tytułem nie zostaną uwzględnione,
151,152c151,152
<         <p><em>Połącz notatki</em> znaczy, że notatki ze Źródła 2 będą dodane do notatek ze Źródła 1 we wszystkich polach. Jeśli ta możliwość nie zostanie wybrana,
<                notatki dotyczące Źródła 2 zostaną utracone, ponieważ zostaną skasowane przez te, odpowiadające polu Źródła 1.</p>
---
>         <p><em>Połącz przypisy</em> znaczy, że przypisy ze Źródła 2 będą dołączone do przypisów ze Źródła 1 we wszystkich polach. Jeśli ta możliwość nie zostanie wybrana,
>                przypisy dotyczące Źródła 2 zostaną utracone, ponieważ pozostaną tylko te odpowiadające polu Źródła 1.</p>
154,155c154,155
<         <p><em>Połącz media</em> znaczy, że media ze Źródła 2 będą dodane do mediów ze Źródła 1 we wszystkich polach. Jeśli ta możliwość nie zostanie wybrana,
<                media dotyczące Źródła 2 zostaną utracone, ponieważ zostaną skasowane przez te, odpowiadające polu Źródła 1.</p>
---
>         <p><em>Połącz media</em> znaczy, że media ze Źródła 2 będą dołączone do mediów ze Źródła 1 we wszystkich polach. Jeśli ta możliwość nie zostanie wybrana,
>                media dotyczące Źródła 2 zostaną utracone.</p>
157,158c157,158
< 		<p><span class="optionhead">Ostrzeżenie!</span> Raz wykonane scalanie nie może zostać cofnięte! Proszę rozważyć wykonanie kopii zapasowej tabel bazy danych zanim dokonasz operacji scalania na wypadek,
<                 gdybyś scalił niechcąco niewłaściwe osoby.</p>
---
> 		<p><span class="optionhead">Ostrzeżenie!</span> Raz wykonane scalanie nie może zostać cofnięte! Proszę rozważyć wykonanie kopii zapasowej tabel bazy danych zanim dokonasz operacji scalania, na wypadek
>                 gdybyś scalił niechcący niewłaściwe źródła.</p>
180c180,181
< 		<li><p>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.</p></li>
---
> 	
> 	<hr>Uwagi dotyczące polskiego tłumaczenia: <a href="mailto:michal@jarocinscy.pl">michal@jarocinscy.pl</a> lub <a href="mailto:januszkielak@gmail.com">januszkielak@gmail.com</a>. Prosimy zgłaszać ewentualne błędy lub niejasności.
diff -r TNG/languages/Polish-UTF8/text.php TNG1403/languages/Polish-UTF8/text.php
5c5
< 		$text['browseallsources'] = "Przeglądaj wszystkie żródła";
---
> 		$text['browseallsources'] = "Przeglądaj źródła";
11,12c11,12
< 		$text['sourceid'] = "ID żródła";
< 		$text['moresrc'] = "Więcej żródeł";
---
> 		$text['sourceid'] = "ID źródła";
> 		$text['moresrc'] = "Więcej źródeł";
14,15c14,15
< 		$text['browseallrepos'] = "PrzeglÄ…daj wszystkie repozytoria";
< 		break;
---
> 		$text['browseallrepos'] = "PrzeglÄ…daj repozytoria";
> 	break;
24c24
< 		break;
---
> 	break;
29c29
< 		$text['producegedfrom'] = "Twórz plik gedcom z";
---
> 		$text['producegedfrom'] = "Twórz plik GEDCOM dla";
34c34
< 		$text['nomaxgen'] = "Musisz wskazać maksymalną liczbę generacji. Proszę powróć i popraw ten błąd";
---
> 		$text['nomaxgen'] = "Określ maksymalną liczbę generacji.";
39c39
< 		$text['suggestchange'] = "Proponowane zmiany";
---
> 		$text['suggestchange'] = "Sugerowane zmiany";
44,46c44,46
< 		$text['proposed'] = "Propozycja zmian";
< 		$text['mailsent'] = "Dziękujemy, list wysłany.";
< 		$text['mailnotsent'] = "Przepraszamy, Twój list nie mógł być wysłany. Skontaktuj się z xxx bezpośrednio na yyy.";
---
> 		$text['proposed'] = "Sugestia zmian";
> 		$text['mailsent'] = "Dziękujemy, mail wysłany.";
> 		$text['mailnotsent'] = "Przepraszamy, Twój mail nie mógł być wysłany. Skontaktuj się z xxx bezpośrednio na yyy.";
48c48
< 		$text['entername'] = "Podaj swoje imiÄ™";
---
> 		$text['entername'] = "Podaj imiÄ™";
53c53
< 		break;
---
> 	break;
60c60
< 		$text['age'] = "Wiek";
---
> 		$text['age'] = "wiek";
66c66
< 		$text['received'] = "Twoja sugestia zostanie dostarczona do administratora tej strony.";
---
> 		$text['received'] = "Twoja sugestia zostanie przekazana administratorowi witryny.";
69d68
< 		$text['general'] = "Ogólny";
71,74c70,73
<         //added in 9.0.0
< 		$text['reviewmsg'] = "Masz propozycję zmian, które potrzebują twojej opinii. Ten wniosek dotyczy:";
<         $text['revsubject'] = "Proponowane zmiany potrzebujÄ… twojej opinii";
<         break;
---
> 		//added in 9.0.0
> 		$text['reviewmsg'] = "Masz sugestie zmian, które wymagają twojej akceptacji. Ten wniosek dotyczy:";
> 		$text['revsubject'] = "Sugerowane zmiany wymagajÄ… twojej akceptacji";
> 	break;
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Wybierz dwie osoby.";
---
> 		$text['select2inds'] = "Należy wskazać dwie osoby.";
90c90
< 		$text['sameperson'] = "Ta sama osoba występuje dwa razy.";
---
> 		$text['sameperson'] = "Wskazano dwukrotnie tę samą osobę. Spróbuj jeszcze raz.";
95c95
< 		$text['brother'] = "brata(em)";
---
> 		$text['brother'] = "bratem";
101c101
< 		$text['nephew'] = "xxx bratankiem/siostrzenicÄ…";
---
> 		$text['nephew'] = "xxx bratankiem/siostrzeńcem";
103c103
< 		$text['nephnc'] = "xxx bratankiem,siostrzenicÄ…/bratanicÄ…,siostrzenicÄ…";
---
> 		$text['nephnc'] = "xxx bratankiem,siostrzeńcem / bratanicą,siostrzenicą";
121,123c121,123
< 		$text['notvalid'] = "jest to, albo nieważne ID osoby,albo nie ma go w bazie danych. Spróbuj jeszcze raz.";
< 		$text['halfbrother'] = "przyrodni brat";
< 		$text['halfsister'] = "przyrodnia siostra";
---
> 		$text['notvalid'] = "Wskazany ID osoby jest niepoprawny albo nie ma go w bazie danych. Spróbuj jeszcze raz.";
> 		$text['halfbrother'] = "przyrodnim bratem";
> 		$text['halfsister'] = "przyrodniÄ… siostrÄ…";
127,128c127,128
< 		$text['mcousin'] = "xxx kuzynem";  //male cousin; xxx = cousin number, yyy = times removed
< 		$text['fcousin'] = "xxx kuzynkÄ…";  //female cousin
---
> 		$text['mcousin'] = "xxx kuzynem";	//male cousin; xxx = cousin number, yyy = times removed
> 		$text['fcousin'] = "xxx kuzynkÄ…";	//female cousin
130,131c130,131
< 		$text['mhalfcousin'] = "xxx przyrodnim kuzyn";  //male cousin
< 		$text['fhalfcousin'] = "xxx przyrodniÄ… kuzynkÄ…";  //female cousin
---
> 		$text['mhalfcousin'] = "xxx przyrodnim kuzynem";	//male cousin
> 		$text['fhalfcousin'] = "xxx przyrodniÄ… kuzynkÄ…";	//female cousin
135,136c135,136
< 		$text['gfath'] = "xxx dziadek";
< 		$text['gmoth'] = "xxx babka";
---
> 		$text['gfath'] = "xxx dziadkiem";
> 		$text['gmoth'] = "xxx babkÄ…";
138,139c138,139
< 		$text['mothof'] = "matka";
< 		$text['fathof'] = "ojciec";
---
> 		$text['mothof'] = "matkÄ…";
> 		$text['fathof'] = "ojcem";
144,146c144,146
< 		$text['dospouses2'] = "Pokaż małżonków";
< 		$text['fil'] = "teść";
< 		$text['mil'] = "teściowa";
---
> 		$text['dospouses2'] = "Uwzględnij małżonków";
> 		$text['fil'] = "teściem";
> 		$text['mil'] = "teściową";
151,153c151,153
< 		$text['stepgson'] = "the xxx synem pasierba";
< 		$text['stepgdau'] = "the xxx córką pasierba";
< 		$text['stepgchild'] = "the xxx dzieckiem pasierba";
---
> 		$text['stepgson'] = "xxx synem pasierba";
> 		$text['stepgdau'] = "xxx córką pasierba";
> 		$text['stepgchild'] = "xxx dziecko pasierba";
159c159
< 		$text['ggpar'] = "xxx pra rodzicami";
---
> 		$text['ggpar'] = "xxx pradziadkowie";
162c162
< 		$text['ggsondau'] = "xxx prawnukami";
---
> 		$text['ggsondau'] = "xxx prawnuk";
172c172,240
< 		break;
---
> 		$text['pathscalc'] = "Szukaj powiązań";
> 		$text['findrel2'] = "Znajdź pokrewieństwo i inne powiązania";
> 		$text['makeme2nd'] = "Użyj mojego ID";
> 		$text['usebookmarks'] = "Użyj zakładek";
> 		$text['select2inds'] = "Należy wskazać dwie osoby.";
> 		$text['indinfofor'] = "Informacja indywidualna dla";
> 		$text['nobookmarks'] = "Nie ma zakładek, które mogłyby być użyte";
> 		$text['bkmtitle'] = "Osoby znalezione w zakładkach";
> 		$text['bkminfo'] = "Wybierz osobÄ™:";
> 		$text['sortpathsby'] = "Sortuj ścieżki wg liczby";
> 		$text['sortbyshort'] = "Sortuj wg";
> 		$text['bylengthshort'] = "długości";
> 		$text['badID1'] = ": niepoprawny ID Osoby 1 - wróć i popraw";
> 		$text['badID2'] = ": niepoprawny ID Osoby 2 - wróć i popraw";
> 		$text['notintree'] = ": osoby o tym ID nie ma w bieżącym drzewie.";
> 		$text['sameperson'] = "Wskazano dwukrotnie tÄ™ samÄ… osobÄ™.";;
> 		$text['nopaths'] = "Nie znaleziono powiązania pomiędzy tymi osobami.";
> 		$text['nopaths1'] = "Nie znaleziono więcej powiązań";
> 		$text['nopaths2'] = "w xxx krokach wyszukiwania";
> 		$text['longestpath'] = "Nnajdłuższa z dotąd zbadanych ścieżek miała długość xxx.";
> 		$text['relevantpaths'] = "Liczba znalezionych różnych powiązań (ścieżek): xxx";
> 		$text['skipMarr'] = "(ponadto liczba ścieżek znalezionych, lecz nie wyświetlonych z powodu zbyt dużej liczby małżeństw: xxx)";
> 		$text['mjaor'] = "albo";
> 		$text['connectionsto'] = "PowiÄ…zania z osobÄ…: ";
> 		$text['findanotherpers'] = "lub znajdź inną osobę...";
> 		$text['sometimes'] = "(Czasami sprawdzenie innej liczby pokoleń daje inny rezultat.)";
> 		$text['anotherpath'] = "Znajdź powiązania z inną osobą";
> 		$text['xpath'] = "Ścieżka nr ";
> 		$text['primary'] = "Osoba poczÄ…tkowa"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Osoba końcowa";
> 		$text['parent'] = "rodzic / Parent";
> 		$text['mhfather'] = "jego ojciec";
> 		$text['mhmother'] = "jego matka";
> 		$text['mhhusband'] = "jego małżonek";
> 		$text['mhwife'] = "jego żona";
> 		$text['mhson'] = "jego syn";
> 		$text['mhdaughter'] = "jego córka";
> 		$text['fhfather'] = "jej ojciec";
> 		$text['fhmother'] = "jej matka";
> 		$text['fhhusband'] = "jej mąż";
> 		$text['fhwife'] = "jej małżonka";
> 		$text['fhson'] = "jej syn";
> 		$text['fhdaughter'] = "jej córka";
> 		$text['hfather'] = "ojciec";
> 		$text['hmother'] = "matka";
> 		$text['hhusband'] = "mąż";
> 		$text['hwife'] = "żona";
> 		$text['hson'] = "syn";
> 		$text['hdaughter'] = "córka";
> 		$text['maxruns'] = "Max. liczba ścieżek do sprawdzenia";
> 		$text['maxrshort'] = "Liczba prób";
> 		$text['maxlength'] = "Ścieżki powiązań nie dłuższe niż";
> 		$text['maxlshort'] = "max.dł.ścieżki";
> 		$text['xstep'] = "krok";
> 		$text['xsteps'] = "kroków";
> 		$text['xmarriages'] = "w tym xxx małżeństw";
> 		$text['xmarriage'] = "w tym 1 małżeństwo";
> 		$text['showspouses'] = "Pokazuj w ścieżce oboje małżonków";
> 		$text['showTxt'] = "Pokazuj również opis tekstowy powiązania";
> 		$text['showTxtshort'] = "Opis tekstowy";
> 		$text['compactBox'] = "Pokazuj diagram bardziej kompaktowy";
> 		$text['compactBoxshort'] = "Diagram kompaktowy";
> 		$text['paths'] = "PowiÄ…zania";
> 		$text['dospouses2'] = "Pokaż małżonków";
> 		$text['maxmopt'] = "Max liczba małżeństw w ścieżce"; // note: this is only to prevent the display of "too wide" diagrams, without changing the search process
> 		$text['maxm'] = "Max liczba małżeństw";
> 		$text['arerelated'] = "Te osoby są spokrewnione - ich pokrewieństwo pokazuje Ścieżka nr 1";
> 		$text['simplerel'] = "Szukanie pokrewieństwa";
> 	break;
184c252
< 		break;
---
> 	break;
191c259
< 		$text['capburialabbr'] = "pog.";
---
> 		$text['capburialabbr'] = "poch.";
194,196c262,264
< 		$text['capspouseabbr'] = "SP";
< 		$text['redraw'] = "Ponownie narysuj z";
< 		$text['scrollnote'] = "Uwaga: Być może musisz przewinąć w prawo lub w dół aby wszystko zobaczyć.";
---
> 		$text['capspouseabbr'] = "małż.";
> 		$text['redraw'] = "Ponownie narysuj";
> 		$text['scrollnote'] = "Uwaga: Być może trzeba przewinąć/przeciągnąć w prawo lub w dół aby wszystko zobaczyć.";
199d266
< 		$text['popupnote2'] = " = Nowy rodowód";
201c268
< 		$text['pedstandard'] = "Standartowe";
---
> 		$text['pedstandard'] = "Standardowe";
206,207c273,274
< 		$text['sonof'] = "syn";
< 		$text['daughterof'] = "córka";
---
> 		$text['sonof'] = "synem";
> 		$text['daughterof'] = "córką";
214,228c281,295
< 		$text['familyof'] = "Rodzina";
< 		$text['paternal'] = "Ojcowski";
< 		$text['maternal'] = "Matczyny";
< 		$text['gen1'] = "Sam";
< 		$text['gen2'] = "Rodzice";
< 		$text['gen3'] = "Dziadkowie";
< 		$text['gen4'] = "Pradziadkowie";
< 		$text['gen5'] = "Prapradziadkowie";
< 		$text['gen6'] = "Praprapradziadkowie";
< 		$text['gen7'] = "Prapraprapradziadkowie";
< 		$text['gen8'] = "Praprapraprapradziadkowie";
< 		$text['gen9'] = "Prapraprapraprapradziadkowie";
< 		$text['gen10'] = "Praprapraprapraprapradziadkowie";
< 		$text['gen11'] = "Prapraprapraprapraprapradziadkowie";
< 		$text['gen12'] = "Praprapraprapraprapraprapradziadkowie";
---
> 		$text['familyof'] = "rodzina";
> 		$text['paternal'] = "ojcowski";
> 		$text['maternal'] = "matczyny";
> 		$text['gen1'] = "probant";
> 		$text['gen2'] = "rodzice";
> 		$text['gen3'] = "dziadkowie";
> 		$text['gen4'] = "pradziadkowie";
> 		$text['gen5'] = "prapradziadkowie";
> 		$text['gen6'] = "Pra(3)dziadkowie";
> 		$text['gen7'] = "Pra(4)dziadkowie";
> 		$text['gen8'] = "Pra(5)dziadkowie";
> 		$text['gen9'] = "Pra(6)dziadkowie";
> 		$text['gen10'] = "Pra(7)dziadkowie";
> 		$text['gen11'] = "Pra(8)dziadkowie";
> 		$text['gen12'] = "Pra(9)dziadkowie";
232c299
< 		$text['extrasexpl'] = "= Dla tej osoby istnieje już przynajmniej jedno zdjęcie,historia lub inne medium.";
---
> 		$text['extrasexpl'] = "= Dla tej osoby istnieje już przynajmniej jedno zdjęcie lub inny plik mediów.";
243,245c310,312
< 		$text['henrynums'] = "Numerowanie w.g Henry'ego";
< 		$text['abovnums'] = "Numerowanie w.g d'Aboville";
< 		$text['devnums'] = "Numerowanie w.g de Villiers";
---
> 		$text['henrynums'] = "Numerowanie wg Henry'ego";
> 		$text['abovnums'] = "Numerowanie wg d'Aboville";
> 		$text['devnums'] = "Numerowanie wg de Villiers";
253c320
< 		$text['familywith'] = "Rodzina z";
---
> 		$text['familywith'] = "Rodzina dla";
256c323
< 		$text['otherspouses'] = "inni małżonkowie";
---
> 		$text['otherspouses'] = "inni małżonkowie"; 
258c325
< 		$text['showfamily'] = "Pokaż rodzinę";
---
> 		$text['showfamily'] = "Pokaż tę rodzinę";
264c331,350
< 		break;
---
> 		//added in 14.0
> 		$text['dtformat'] = "Tabele";
> 		$text['dtchildren'] = "Dzieci";
> 		$text['dtgrandchildren'] = "Wnuki";
> 		$text['dtggrandchildren'] = "Prawnuki";
> 		$text['dtgggrandchildren'] = "Praprawnuki"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nie ma potomstwa";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Razem";
> 		$text['dtselect'] = "Wybierz";
> 		$text['dteachfulltable'] = "Każda pełna tabela będzie miała";
> 		$text['dtrows'] = "wierszy";
> 		$text['dtdisplayingtable'] = "Wyświetlanie tabeli";
> 		$text['dtgototable'] = "Idź do tabeli:";
> 		$text['fcinstrdn'] = "Pokaż rodzinę z małżonkiem";
> 		$text['fcinstrup'] = "Pokaż rodzinę z rodzicami";
> 		$text['fcinstrplus'] = "Wybierz innego małżonka";
> 		$text['fcinstrfam'] = "Wybierz innych rodziców";
> 	break;
270c356
< 		$text['noreports'] = "Raporty nie istniejÄ…";
---
> 		$text['noreports'] = "Nie ma zdefiniowanych raportów.";
272c358
< 		$text['allreports'] = "Raporty";
---
> 		$text['allreports'] = "Wszystkie raporty";
278c364
< 		$text['equals'] = "równe";
---
> 		$text['equals'] = "jest równy";
280,281c366,367
< 		$text['soundexof'] = "soundex of";
< 		$text['metaphoneof'] = "metaphone of";
---
> 		$text['soundexof'] = "przybliżony (soundex)";
> 		$text['metaphoneof'] = "podobnie brzmiÄ…ce (metaphone)";
288,292c374,378
< 		$text['tryagain'] = "Spróbuj ponownie napisać nazwisko dużymi literami";
< 		$text['joinwith'] = "Połącz z";
< 		$text['cap_and'] = "AND";
< 		$text['cap_or'] = "OR";
< 		$text['showspouse'] = "Pokaż współmałżonka (pokazuje duplikaty jeśli osoba ma więcej niż jednego partnera)";
---
> 		$text['tryagain'] = "Spróbuj zmienić kryteria wyszukiwania";
> 		$text['joinwith'] = "�ączenie argumentów";
> 		$text['cap_and'] = "ORAZ";
> 		$text['cap_or'] = "LUB";
> 		$text['showspouse'] = "Pokaż małżonka (pokazuje duplikaty jeśli osoba ma więcej niż jednego partnera)";
308,309c394,395
< 		$text['keyword'] = "Słowo kluczowe (\"Około\")";
< 		$text['explain'] = "Podaj składniki daty aby zobaczyć wydarzenia w danym dniu. Pozostaw wolne pole aby zobaczyć wszystkie wydarzenia.";
---
> 		$text['keyword'] = "SÅ‚owo kluczowe (np. \"ok.\")";
> 		$text['explain'] = "Podaj składniki daty aby zobaczyć zgodności wydarzeń. Pozostaw pole wolne aby zobaczyć wszystkie zgodności.";
311c397
< 		$text['fullname'] = "Imie i nazwisko";
---
> 		$text['fullname'] = "Imie i Nazwisko";
315,316c401,402
< 		$text['spouseid'] = "ID współmałżonka";
< 		$text['spousename'] = "Imię współmałżonka";
---
> 		$text['spouseid'] = "ID małżonka";
> 		$text['spousename'] = "Imię małżonka";
325c411
< 		$text['ssealdate'] = "Data przekazania S (LDS)";   //Sealed to spouse
---
> 		$text['ssealdate'] = "Data przekazania S (LDS)";	 //Sealed to spouse
327c413
< 		$text['psealdate'] = "Data przekazania P (LDS)";   //Sealed to parents
---
> 		$text['psealdate'] = "Data przekazania P (LDS)";	 //Sealed to parents
330,331c416,417
< 		$text['spousesurname'] = "Nazwisko współmałżonka";
< 		$text['spousemore'] = "Jeżeli podasz nazwisko współmałżonka, to musisz również podać płeć osoby szukanej a nie współmałżonka.";
---
> 		$text['spousesurname'] = "Nazwisko małżonka";
> 		$text['spousemore'] = "Jeżeli podasz nazwisko małżonka, to musisz podać również płeć.";
335,336c421,422
< 		$text['divdate'] = "Data separacji";
< 		$text['divplace'] = "Miejsce separacji";
---
> 		$text['divdate'] = "Data rozwodu";
> 		$text['divplace'] = "Miejsce rozwodu";
338c424
< 		$text['numresults'] = "Wyniki dla strony";
---
> 		$text['numresults'] = "Wyników na stronę";
341c427
< 		$text['joinor'] = "Opcja 'Dołącz w LUB' nie może być użyta przy nazwiskach wspómałżonków";
---
> 		$text['joinor'] = "Opcja '�ączenie argumentów LUB' nie może być użyta przy nazwiskach małżonków";
353c439
< 		$text['csv'] = "Format pliku CSV (wartości rozdzielone przecinkiem)";
---
> 		$text['csv'] = "Format pliku CSV (wartości rozdzielone przecinkami)";
362,363c448,449
< 		$text['searchnote'] = "Uwaga: Ta strona korzysta z Google, aby wykonywać wyszukiwanie. Ilość wyszukowań będzie zależna od tego w jakim stopniu Google indeksuje witryny.";
< 		break;
---
> 		$text['searchnote'] = "Uwaga: Ta strona korzysta z wyszukiwarki Google. Ilość trafień zależy od zaindeksowania przez Google."; 
> 	break;
368c454
< 		$text['mostrecentactions'] = "Ostatnich logowań";
---
> 		$text['mostrecentactions'] = "ostatnich operacji";
371c457
< 		break;
---
> 	break;
381,383c467
< 		$text['firstpage'] = "Pierwsza strona";
< 		$text['lastpage'] = "Ostatnia strona";
< 		$text['photoowner'] = "Użytkownik/źródło";
---
> 		$text['photoowner'] = "Właściciel/źródło";
400c484
< 		$text['iptc122'] = "Autor tytułu";
---
> 		$text['iptc122'] = "Autor";
406c490
<         $text['iptc010'] = "Priorytet";
---
> 		$text['iptc010'] = "Priorytet";
413,415c497,499
< 		$text['numitems'] = "Liczba pozycji";
< 		$text['allalbums'] = "Albumy";
< 		$text['slidestop'] = "Pauza przeglądu slajdów";
---
> 		$text['numitems'] = "# pozycji";
> 		$text['allalbums'] = "Liczba albumów";
> 		$text['slidestop'] = "Wstrzymaj przegląd slajdów";
421c505
< 		$text['nostate'] = "Nieznane województwo (stan))";
---
> 		$text['nostate'] = "Nieznane województwo (stan)";
426c510
< 		$text['mediamaptext'] = "<strong>Uwaga:</strong> Podczas przesuwania strzałki myszy po zdjęciu będą się pokazywać nazwiska. Klikając na wybrane otrzymasz bardziej szczegółowe informacje.";
---
> 		$text['mediamaptext'] = "<strong>Uwaga:</strong> Podczas przesuwania kursora myszy po zdjęciu będą się pokazywać nazwiska. Klikając na wybrane otrzymasz bardziej szczegółowe informacje.";
428c512
< 		$text['allburials'] = "Pogrzeby";
---
> 		$text['allburials'] = "Liczba pogrzebów";
431,436c515,522
<         $text['iptc025'] = "SÅ‚owa";
<         $text['iptc092'] = "Sub-lokalizacja";
< 		$text['iptc015'] = "Kategoria";
< 		$text['iptc065'] = "Pochodzenie programu";
< 		$text['iptc070'] = "Wersja programu";
< 		break;
---
> 				$text['iptc025'] =	"SÅ‚owa kluczowe";
> 				$text['iptc092'] =	"Dokładne miejsce wykonania zdjęcia";
> 				$text['iptc015'] =	"Kategoria";
> 				$text['iptc065'] =	"Wykorzystany program graficzny";
> 				$text['iptc070'] =	"Wersja programu";
> 		//added in 13.0
> 		$text['toggletags'] = "Przełącz znaczniki";
> 	break;
448c534
< 		$text['allsurnames'] = "Nazwiska";
---
> 		$text['allsurnames'] = "Wszystkie nazwiska";
453,454c539,540
< 		$text['numoccurrences'] = "liczba występujących w nawiasie";
< 		$text['placesstarting'] = "Zaczynaj od największych miejsc";
---
> 		$text['numoccurrences'] = "liczba wystąpień w nawiasie";
> 		$text['placesstarting'] = "Zaczynaj od najczęściej występujących miejsc";
456c542
< 		$text['totalnames'] = "Osoby";
---
> 		$text['totalnames'] = "Liczba osób";
458c544
< 		$text['totalplaces'] = "Miejsca";
---
> 		$text['totalplaces'] = "Liczba miejsc";
460c546
< 		$text['allplaces'] = "Wszystkie największe miejsca";
---
> 		$text['allplaces'] = "Najczęstsze miejsca";
464c550
< 		$text['top30places'] = "xxx największych lokalizacji";
---
> 		$text['top30places'] = "xxx najczęściej występujących lokalizacji";
467,468c553,554
< 		$text['firstnamesstarting'] = "Przedstawia imiona zaczynajÄ…ce siÄ™ od";
< 		$text['showallfirstnames'] = "Przedstawia wszystkie imiona";
---
> 		$text['firstnamesstarting'] = "Imiona zaczynajÄ…ce siÄ™ od";
> 		$text['showallfirstnames'] = "Wszystkie imiona";
473c559
< 		$text['top30first'] = "Pierwsze xxx imion(a)";
---
> 		$text['top30first'] = "Pierwsze xxx imion";
477c563
< 		break;
---
> 	break;
486c572
< 		$text['husbname'] = "Imię męża";
---
> 		$text['husbname'] = "Nazwisko męża";
490c576
< 		break;
---
> 	break;
496c582
< 		$text['nobirth'] = "Ta osoba nie może zostać dodana ponieważ brakuje jej aktualnej daty urodzin";
---
> 		$text['nobirth'] = "Ta osoba nie może zostać dodana ponieważ brakuje jej daty urodzin";
503c589
< 		break;
---
> 	break;
510c596
< 		$text['treename'] = "Nazwa drzewa";
---
> 		$text['treename'] = "Drzewo";
515c601
< 		$text['zip'] = "Numer kodu poczt.";
---
> 		$text['zip'] = "Kod pocztowy";
519c605
< 		$text['username'] = "Nazwisko (login)";
---
> 		$text['username'] = "Nazwa użytkownika (login)";
522,523c608
< 
< 		$text['regnewacct'] = "Rejestracja";
---
> 		$text['regnewacct'] = "Rejestracja nowego użytkownika";
528c613
< 		$text['acctcomments'] = "Notatki lub komentarz";
---
> 		$text['acctcomments'] = "Uwagi i komentarze";
532,534c617,619
< 		$text['enterpassword'] = "Podaj hasło.";
< 		$text['enterusername'] = "Podaj nazwę użytkownika.";
< 		$text['failure'] = "Przepraszamy. Ta nazwa drzewa jest zajęta albo nie podano Tree ID, gdzie trzeba podać krótką nazwę drzewa, jedno słowo, bez spacji. Prosimy powrócić do rejestracji i wybrać nową nazwę.";
---
> 		$text['enterpassword'] = "Podaj hasło";
> 		$text['enterusername'] = "Podaj nazwę użytkownika";
> 		$text['failure'] = "Przepraszamy - ta nazwa użytkownika jest zajęta. Kliknij przycisk Wstecz w przeglądarce, aby powrócić do rejestracji i wybrać inną nazwę.";
536c621
< 		$text['emailsubject'] = "W  zarejestrował się nowy użytkownik";
---
> 		$text['emailsubject'] = "W TNG zarejestrował się nowy użytkownik";
544c629
< 		$text['accmail'] = "<strong>UWAGA:</strong> Aby otrzymać pocztę od administratora dotyczącą Twego konta sprawdź, czy ta domena nie jest przez Ciebie blokowana <br>(czy wiadomość nie zostanie potraktowana jako spam).";
---
> 		$text['accmail'] = "<strong>UWAGA:</strong> Aby otrzymać pocztę od administratora dotyczącą Twego konta upewnij się, że ta domena nie jest przez Ciebie blokowana <br/>(czy wiadomość nie zostanie potraktowana jako spam).";
549,552c634,636
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Otrzymałeś wniosek o założenie konta dla nowego użytkownika TNG. Zaloguj się na konto administratora i nadaj mu odpowiednie uprawnienia. Jeśli zatwierdzisz tę rejestrację powiadom wnioskodawcę, odpowiadając na tę wiadomść.";
< 		$text['accactive'] = "Konto zostało aktywowane, ale użytkownik nie ma specjalnych uprawnień do czasy, aż zostaną mu nadane.";
< 		$text['accinactive'] = "Idź do Admin/Users/Review aby uruchomić ustawienie konta. Konto będzie nieaktywne do czasu, aż zostanie edytowane lub, przynajmniej raz, zachowane.";
---
> 		$text['emailmsg'] = "Otrzymałeś wniosek o założenie konta dla nowego użytkownika. Zaloguj się na konto administratora i nadaj mu odpowiednie uprawnienia.";
> 		$text['accactive'] = "Konto zostało aktywowane, ale użytkownik nie ma uprawnień dopóki nie zostaną mu nadane.";
> 		$text['accinactive'] = "Idź do Administracja/Użytkownicy/Przegląd sugestii aby uruchomić ustawienia konta. Konto będzie nieaktywne do czasu, aż zostanie edytowane lub, przynajmniej raz, zachowane.";
556,558c640,641
< 		//added in 8.0.0
< 		$text['acksubject'] = "Dziękuję za zarejestrowanie się"; //for a new user account
< 		$text['ackmessage'] = "Twoje zapotrzebowanie na otwarcie nowego konta zostało odebrane. Konto będzie nie aktywne do czasu, aż zostanie zatwierdzone przez Administratora. Zostaniesz powiadomiony emailem kiedy konto będzie aktywowane.";
---
> 		$text['acksubject'] = "Dziękujmy za zarejestrowanie się"; //for a new user account
> 		$text['ackmessage'] = "Konto zostanie aktywowane po zatwierdzeniu przez Administratora. Zostaniesz o tym powiadomiony mailem.";
560a644,650
> 		//added in 14.0
> 		$text['newpassword2'] = "Nowe hasło ponownie";
> 		$text['resetsuccess'] = "Sukces: hasło zostało zresetowane";
> 		$text['resetfail'] = "Błąd: hasło nie zostało zresetowane";
> 		$text['failreason0'] = " (nieznany błąd bazy danych)";
> 		$text['failreason2'] = " (nie masz uprawnień do zmiany hasła)";
> 		$text['failreason3'] = " (podane hasło nie zgadza się)";
565,566c655,656
< 		$text['browseallbranches'] = "Przejrzyj wszystkie gałęzie";
< 		break;
---
> 		$text['browseallbranches'] = "Przeglądaj wszystkie gałęzie";
> 	break;
574c664
< 		$text['totunknown'] = "Nieznanej płci";
---
> 		$text['totunknown'] = "Osoby nieznanej płci";
579c669
< 		//$text['totdocs'] = "Historie &amp; Documenty";
---
> 		//$text['totdocs'] = "Historie i Dokumenty";
586,587c676,677
< 		$text['age'] = "Wiek";
< 		$text['agedisclaimer'] = "Obliczenia bazujące na wieku odnoszą się do osób z podaną datą urodzenia <EM><B>oraz</B></EM> śmierci.  Przy niepełnych datach(np., data urodzenia podana jako \"1945\" lub \"JAN 1860\"), obliczenia mogę być nieprecyzyjne.";
---
> 		$text['age'] = "wiek";
> 		$text['agedisclaimer'] = "Obliczenia wieku dotycza tylko osób z podanymi datami urodzenia <EM><B>oraz</B></EM> zgonu.	Przy niepełnych datach (np. data ur. podana jako \"1945\" lub \"JAN 1860\") obliczenia są mniej dokładne.";
589c679
< 		$text['total'] = "Wszystkie";
---
> 		$text['total'] = "Razem";
592c682,684
< 		break;
---
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Liczba odwołań do źródeł";
> 	break;
595,596c687,688
< 		$text['browseallnotes'] = "Przeszukaj wszystkie notatki";
< 		break;
---
> 		$text['browseallnotes'] = "PrzeglÄ…daj przypisy";
> 	break;
600c692
< 		break;
---
> 	break;
618d709
< 		$text['loginfirst'] = "Musisz się najpierw zalogować.";
626c717,719
< 		break;
---
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Wykryto istniejące rekordy użytkowników. Aby kontynuować, zaloguj się lub usuń wszystkie rekordy z tabeli użytkowników.";
> 	break;
629,631c722
< 		$text['zoomin'] = "Powiększ";
< 		$text['zoomout'] = "Zmniejsz";
< 		$text['magmode'] = "Moduł powiekszenia";
---
> 		$text['magmode'] = "Moduł powiększenia";
633c724
< 		$text['pan'] = "Kliknij i przeciagnij, aby przesunąć grafikę";
---
> 		$text['pan'] = "Kliknij i przeciągnij, aby przesunąć grafikę";
641,642c732,733
< 		$text['vwrclose'] = "Zamknij przegladarkÄ™ grafiki";
< 		break;
---
> 		$text['vwrclose'] = "Zamknij przeglÄ…darkÄ™ grafiki";
> 	break;
647c738
< 		$text['testid'] = "Test ID";
---
> 		$text['testid'] = "ID testu";
649c740
< 		$text['mode_values'] = "Wartości Mod";
---
> 		$text['mode_values'] = "Wartości średnie (Mod)";
655,656c746
< 		$text['fastmutating'] = "Szybka mutacja";
< 		$text['dna_info_head'] = "Informacja dotyczÄ…ca testu DNA";
---
> 		$text['fastmutating'] = "Szybko mutujÄ…ce";
660c750,775
< 		break;
---
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Porównaj wybrane testy mtDNA";
> 		$text['dnatestscompare_atdna'] = "Porównaj wybrane testy atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Sekw.";
> 		$text['extra_mutations'] = "Ekstra mutacje";
> 		$text['mrca'] = "Przodek MRC";
> 		$text['ydna_test'] = "Testy Y-DNA";
> 		$text['mtdna_test'] = "Testy mtDNA (Mitochondrialne)";
> 		$text['atdna_test'] = "Testy atDNA (autosomalne)";
> 		$text['segment_start'] = "PoczÄ…tek";
> 		$text['segment_end'] = "Koniec";
> 		$text['suggested_relationship'] = "Sugerowane";
> 		$text['actual_relationship'] = "Aktualne";
> 		$text['12markers'] = "Markery 1-12";
> 		$text['25markers'] = "Markery 13-25";
> 		$text['37markers'] = "Markery 26-37";
> 		$text['67markers'] = "Markery 38-67";
> 		$text['111markers'] = "Markery 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Do porównania należy wskazać przynajmniej dwa testy.";
> 	break;
666c781
< $text['notes'] = "Notatki";
---
> $text['notes'] = "Przypisy";
670,671d784
< $text['birthabbr'] = "ur.";
< $text['chrabbr'] = "ch.";
675,676c788,789
< $text['family'] = "ZwiÄ…zek"; //from getperson
< $text['children'] = "Dzieci";  //from getperson
---
> $text['family'] = "Rodzina"; //from getperson
> $text['children'] = "Dzieci"; //from getperson
678c791
< $text['alltrees'] = "Drzewa";
---
> $text['alltrees'] = "Wszystkie drzewa";
680c793
< $text['thumb'] = "Miniatura";  //as in Thumbnail
---
> $text['thumb'] = "Miniatura";	//as in Thumbnail
682,687c795,799
< $text['title'] = "Tytuł";  //from getperson
< $text['suffix'] = "Przyrostek";  //from getperson
< $text['nickname'] = "Przydomek";  //from getperson
< $text['deathabbr'] = "zm.";  //from descend
< $text['lastmodified'] = "Ostatnia modyfikacja";  //from getperson
< $text['married'] = "Åšlub";  //from getperson
---
> $text['title'] = "Tytuł";	//from getperson
> $text['suffix'] = "Suffix";	//from getperson
> $text['nickname'] = "Przydomek";	//from getperson
> $text['lastmodified'] = "Ostatnia modyfikacja";	//from getperson
> $text['married'] = "Åšlub";	//from getperson
690,692c802,804
< $text['lastfirst'] = "Nazwisko, ImiÄ™";  //from search
< $text['bornchr'] = "Data urodzenia lub chrztu";  //from search
< $text['individuals'] = "Osoby";  //from whats new
---
> $text['lastfirst'] = "Nazwisko, imiÄ™";	//from search
> $text['bornchr'] = "Data urodzenia/chrztu";	//from search
> $text['individuals'] = "Osoby";	//from whats new
695c807
< $text['sources'] = "Źródła";  //from getperson (next several)
---
> $text['sources'] = "Źródła";	//from getperson (next several)
701,707c813,818
< $text['buried'] = "Pogrzeb";
< $text['spouse'] = "Partner";  //from search
< $text['parents'] = "Rodzice";  //from pedigree
< $text['text'] = "Tekst";  //from sources
< $text['language'] = "Język";  //from languages
< $text['burialabbr'] = "pog.";  //from descend
< $text['descendchart'] = "Linia potomków";
---
> $text['buried'] = "Pochówek";
> $text['spouse'] = "Małżonek";	//from search
> $text['parents'] = "Rodzice";	//from pedigree
> $text['text'] = "Tekst";	//from sources
> $text['language'] = "Język";	//from languages
> $text['descendchart'] = "Diagram potomków";
712,715c823,824
< $text['place'] = "Miejsce";
< $text['login'] = "Zaloguj";
< $text['logout'] = "Wyloguj";
< $text['marrabbr'] = "i";
---
> $text['login'] = "Zaloguj siÄ™";
> $text['logout'] = "Wyloguj siÄ™";
725,726c834,835
< $text['searchresults'] = "Szukaj w wynikach";
< $text['diedburied'] = "Data śmierci";
---
> $text['searchresults'] = "Wyniki wyszukiwania";
> $text['diedburied'] = "Zmarł/Poch.";
729,730c838,839
< $text['relationship'] = "Pokrewieństwo";		//in German, Verwandtschaft
< $text['relationship2'] = "Wzajemna relacja"; //different in some languages, at least in German (Beziehung)
---
> $text['relationship'] = "Sprawdź pokrewieństwo";		//in German, Verwandtschaft
> $text['relationship2'] = "Typ relacji"; //different in some languages, at least in German (Beziehung)
732c841
< $text['yesabbr'] = "R";               //abbreviation for 'yes'
---
> $text['yesabbr'] = "T";							 //abbreviation for 'yes'
738d846
< $text['source'] = "Źródło";
753c861
< $text['type'] = "Typ";
---
> $text['type'] = "Rodzaj";
763c871
< //$text['documents'] = "Documents";
---
> //$text['documents'] = "Dokumenty";
766d873
< $text['repository'] = "Repozytorium";
770d876
< $text['findplaces'] = "Wyszukaj wszystkie osoby powiÄ…zane z tÄ… lokalizacjÄ…";
772c878
< $text['faminfo'] = "Informacja o zwiÄ…zku";
---
> $text['faminfo'] = "Informacja o rodzinie";
779c885
< $text['child'] = "Dziecko";  //from familygroup
---
> $text['child'] = "Dziecko";	//from familygroup
783c889
< $text['allmedia'] = "Media";
---
> $text['allmedia'] = "Wszystkie media";
795c901
< $text['bookmark'] = "Dodaj zakładki";
---
> $text['bookmark'] = "Dodaj zakładkę";
802c908
< $text['gmapevent'] = "Mapa wydarzenia";
---
> $text['gmapevent'] = "Mapa wydarzeń";
804d909
< $text['glang'] = "&amp;hl=pl";
811c916
< $text['notyetlocated'] = "Nie zlokalizowany";
---
> $text['notyetlocated'] = "Jeszcze nie zlokalizowany";
816d920
< $text['none'] = "Brak";
822c926
< $text['orient'] = "Ukierunkowanie"; //for a page
---
> $text['orient'] = "Orientacja strony"; //for a page
830c934
< $text['prefix'] = "Prefix";
---
> $text['prefix'] = "Prefiks";
832,833c936,937
< $text['latupdates'] = "Ostatnia aktualizacja";
< $text['featphoto'] = "Przedstawione zdjęcie";
---
> $text['lastupdates'] = "Ostatnio aktualizowane";
> $text['featphoto'] = "Losowo wybrane zdjęcie";
838,839c942,943
< $text['pwrdby'] = "oparty na bazie";
< $text['writby'] = "napisanej przez";
---
> $text['pwrdby'] = "Strona www oparta jest na systemie";
> $text['writby'] = "";
845c949
< $text['maintby'] = "ZarzÄ…dzane przez";
---
> $text['maintby'] = "Administrator: ";
850,851c954,955
< $text['cont'] = "(cont.)"; //abbreviation for continued
< $text['mnuheader'] = "Strona domowa";
---
> $text['cont'] = "(c.d.)"; //abbreviation for continued
> $text['mnuheader'] = "Strona startowa";
857,858c961,962
< $text['mnulogon'] = "Zaloguj";
< $text['mnulogout'] = "Wyloguj";
---
> $text['mnulogon'] = "Zaloguj siÄ™";
> $text['mnulogout'] = "Wyloguj siÄ™";
860,861c964,965
< $text['mnuregister'] = "Rejestracja nowego<br> konta użytkownika";
< $text['mnuadvancedsearch'] = "Szukanie zaawansowane";
---
> $text['mnuregister'] = "Rejestracja<br/>nowego<br/>użytkownika";
> $text['mnuadvancedsearch'] = "Wyszukiwanie zaawansowane";
863c967
< $text['mnustatistics'] = "Statystyka";
---
> $text['mnustatistics'] = "Statystyki";
867c971
< $text['mnucemeteries'] = "Cmentarze";
---
> $text['mnucemeteries'] = "Lista cmentarzy";
872,873c976,977
< $text['mnushowlog'] = "Ostatnie logowania";
< $text['mnulanguage'] = "Language (Język)";
---
> $text['mnushowlog'] = "Log użytkowników";
> $text['mnulanguage'] = "Language<br/>(Zmiana języka)";
878c982
< $text['born'] = "Urodzenie";
---
> $text['born'] = "Urodz.";
883c987
< $text['birth'] = "Urodzenie";
---
> $text['birth'] = "Urodz.";
888c992
< $text['location'] = "Miejsce";
---
> $text['location'] = "Lokalizacja";
890,892c994,996
< $text['collapse'] = "Składanie";
< $text['expand'] = "Rozszerzanie";
< $text['plot'] = "Położenie";
---
> $text['collapse'] = "Zwiń";
> $text['expand'] = "Rozwiń";
> $text['plot'] = "Sektor";
898c1002
< $text['share'] = "Wspólne korzystanie";
---
> $text['share'] = "Udostępnij";
901,902c1005,1006
< $text['contactus_long'] = "Jeśli masz jakieś pytania lub komentarze dotyczące informacji na tej stronie, prosimy o <span class=\"emphasis\"><a href=\"suggest.php\">kontakt</a></span>. Czekamy na kontakt z Państwem.";
< $text['features'] = "Nowe funkcje";
---
> $text['contactus_long'] = "Jeśli masz jakieś pytania lub komentarze dotyczące informacji na tej stronie, prosimy o <span class=\"emphasis\"><a href=\"suggest.php\">kontakt</a></span>.";
> $text['features'] = "Nowości";
906c1010
< $text['wasburied'] = "was buried";
---
> $text['wasburied'] = "pochowany";
908,911c1012,1015
< $text['emailagain'] = "Email ponownie";
< $text['enteremail2'] = "Wpisz swój email adres ponownie.";
< $text['emailsmatch'] = "Twoje maile nie zgadzają się. Wpisz ten sam email adres w każdym polu.";
< $text['getdirections'] = "Kliknij aby uzyskac połączenie";
---
> $text['emailagain'] = "Adres mail ponownie";
> $text['enteremail2'] = "Wpisz swój adres e-mail ponownie.";
> $text['emailsmatch'] = "Podane maile nie zgadzajÄ… siÄ™. Wpisz ten sam adres email w obu polach.";
> $text['getdirections'] = "Kliknij aby uzyskac wskazówki";
916,917c1020,1021
< $text['livingnote'] = "<font color=\"#FF0000\"><b>Dane osób żyjących ukryte. - Dostępne po zarejestrowaniu.</b></font>";
< $text['livingphoto'] = "<font color=\"#FF0000\"><b>Detale ukryte ponieważ przynajmniej jedna żyjąca osoba jest związana z tą informacj±. - Dostępne po zarejestrowaniu.</b></font>";
---
> $text['livingnote'] = "Szczegóły nie są dostępne, ponieważ ten przypis jest związany z co najmniej jedną żyjącą lub prywatną osobą";
> $text['livingphoto'] = "Szczegóły nie są dostępne, ponieważ ten obiekt jest związany z co najmniej jedną żyjącą lub prywatną osobą";
924d1027
< $text['otherevents'] = "Inne wydarzenia";
927c1030
< $text['wascremated'] = "został/została skremowany";
---
> $text['wascremated'] = "kremacja";
931c1034
< $text['searchsite'] = "Przeszukaj tÄ… stronÄ™";
---
> $text['searchsite'] = "Przeszukaj tÄ™ stronÄ™";
933c1036
< $text['kmlfile'] = "Pobierz plik .kml aby pokazać tą lokalizację w Google Earth";
---
> $text['kmlfile'] = "Pobierz plik .kml aby pokazać tę lokalizację w Google Earth";
936c1039
< $text['heatmap'] = "Mapa cieplna";
---
> $text['heatmap'] = "\"Heat Map\"";
947c1050
< $text['takenby'] = "Pobrane przez";
---
> $text['takenby'] = "Laboratorium";
952,953d1054
< $text['people_have'] = "ludzie powiÄ…zali test DNA z";
< $text['person_has'] = "osoba powiązała test DNA z";
960,961c1061,1114
< $text['consent'] = "Wyrażam zgodę, dla tej witryny, na umieszczenie, tu zgromadzonych, dotyczących mnie, danych osobowych. Rozumiem, że mogę poprosić właściciela witryny o usunięcie tych informacji w dowolnym momencie. ";
< $text['consentreq'] = "Proszę wyrazić zgodę na przechowywanie Twoich danych osobowych w tej witrynie.";
---
> $text['consent'] = "Wyrażam zgodę dla tej witryny na przechowywanie tu podanych danych osobowych. Rozumiem, że mogę poprosić właściciela witryny o usunięcie tych informacji w dowolnym momencie.";
> $text['consentreq'] = "Proszę o wyrażenie zgody na przechowywanie danych osobowych w tej witrynie.";
> 
> //added in 12.1.0
> $text['testsarelinked'] = "Testy DNA sÄ… powiÄ…zane z";
> $text['testislinked'] = "Test DNA jest powiÄ…zany z";
> 
> //added in 12.2
> $text['quicklinks'] = "Szybkie Å‚Ä…cza";
> $text['yourname'] = "Twoje imiÄ™";
> $text['youremail'] = "Twój adres e-mail";
> $text['liketoadd'] = "Wszelkie informacje, które chcesz dodać";
> $text['webmastermsg'] = "Wiadomość dla webmasterów";
> $text['gallery'] = "Zobacz galeriÄ™";
> $text['wasborn_male'] = "urodził się";		// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "urodziła się"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "został ochrzczony";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "została ochrzczona";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "zmarł";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "zmarła";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "został pochowany"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "została pochowana"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "został poddany kremacji";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "została poddana kremacji";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "żonaty";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "zamężna";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "rozwiedziony";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "rozwiedziona";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = "w";			// used as a preposition to the location
> $text['onthisdate'] = "";		// when used with full date
> $text['inthisyear'] = "";		// when used with year only or month / year dates
> $text['and'] = "i";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informacja dotyczÄ…ca testu DNA";
> //added in 13.0
> $text['visitor'] = "Gość";
> 
> $text['popupnote2'] = "Nowy rodowód";
> 
> //moved here in 14.0
> $text['zoomin'] = "Powiększ";
> $text['zoomout'] = "Zmniejsz";
> $text['scrollnote'] = "Przeciągnij lub przewiń, aby zobaczyć więcej.";
> $text['general'] = "Ogólny";
> 
> //changed in 14.0
> $text['otherevents'] = "Inne zdarzenia i atrybuty zdarzeń";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "PowiÄ…zania";
> $text['continue'] = "Kontynuacja";
> $text['title2'] = "Tytuł"; //for media, sources, etc (not people)
963,965c1116,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/PortugueseBR/admintext.php TNG1403/languages/PortugueseBR/admintext.php
25c25
< 		$admtext['addnewbranch'] = "Incluir novo Ramo";
---
> 		$admtext['addnewbranch'] = "Incluir um novo Ramo";
78c78
< 		$admtext['added'] = "Incluido";
---
> 		$admtext['added'] = "Incluído";
80d79
< 		$admtext['pleaseenter'] = "Por favor, informe um";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Por favor, selecione um arquivo para importar.";
> 		$admtext['addreplacedata'] = "Adicionar ou substituir sua genealogia (pode levar vários minutos, dependendo do tamanho de seu arquivo)";
> 		$admtext['fromyourcomputer'] = "Do seu computador";
> 		$admtext['importdata'] = "Importar Dados";
> 		$admtext['replace'] = "Substituir (na árvore selecionada)";
> 		$admtext['desttree'] = "Árvore de Destino";
> 		$admtext['selectdesttree'] = "Por favor, selecione ou informe uma árvore de destino.";
> 		$admtext['selectexisting'] = "Importar para";
> 		$admtext['ucaselast'] = "Todos os sobrenomes em maiúsculas";
> 		$admtext['norecalc'] = "Não recalcular a marcação de pessoas vivas";
> 		$admtext['autooffset'] = "Começar IDs com o 1º número disponível";
> 		$admtext['mustselecttree'] = "É necessário selecionar uma árvore antes de poder usar esta opção.";
> 		$admtext['onwebserver'] = "No servidor web (na pasta GEDCOM)";
> 		$admtext['imphints'] = "Dicas: Todos Dados Atuais significa todas pessoas, famílias e fontes (associações a mídias não são perdidas, desde que os IDs fiquem os mesmos). Registros são coincidentes quanto têm o mesmo ID. Novos registros são sempre adicionados. Anexar importa todos registros com novos IDs.";
> 		$admtext['destbranch'] = "Ramo de Destino (opcional)";
> 		$admtext['importlatlong'] = "Importar dados de latitude / longitude quando presentes";
> 		$admtext['opening'] = "Abrindo";
> 		$admtext['reopen'] = "Reabrindo";
> 		$admtext['uploading'] = "Carregando";
> 		$admtext['stop'] = "Parar";
> 		$admtext['stopped'] = "Importação interrompida";
> 		$admtext['resume'] = "Reiniciar";
> 		$admtext['neweronly'] = "Substituir somente se for mais novo";
> 		$admtext['oldimport'] = "Importar na versão antiga (sem barra de progresso)";
> 		$admtext['importgedcom'] = "Importar arquivo GEDCOM (opcionalmente zipado)";
> 		$admtext['stopbackup'] = "Pare! É recomendável fazer uma cópia de segurança antes de executar esta operação.";
> 		$admtext['importmedia'] = "Importar multimídia, se existir";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Assegure que os prefixos e sufixos (Configuração geral) estão corretos para este arquivo.";
> 		$admtext['chkimpsettings'] = "Verifique as configurações de importação para mais opções.";
> 		$admtext['eventsonly'] = "Importar apenas tipos de atributo/evento personalizados (nenhum dado é adicionado, substituído ou anexado)";
> 		$admtext['allevents'] = "Aceitar dados para todos novos tipos de atributo/evento";
> 		$admtext['finishingimporting'] = "Finalizando...";
> 		$admtext['fileuploadfailed'] = "Falha no upload do arquivo. A causa pode ser um arquivo grande demais. Tente enviar o arquivo por FTP para sua pasta GEDCOM e, em seguida, selecione e importe de lá.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Modificar Tipo de Evento Existente";
135,138d168
< 		$admtext['entertypedesc'] = "Por favor, escreva um tipo/descrição para este novo tipo de evento";
< 		$admtext['enterdisplay'] = "Por favor, escreva um texto de vídeo para este novo tipo de evento.";
< 		$admtext['existingeventtypeinfo'] = "Informações Existentes de Tipos de Eventos";
< 		$admtext['neweventtypeinfo'] = "Informação de Novo Tipo de Evento";
145,146d174
< 		$admtext['addnewevtype'] = "Incluir Novo Tipo de Evento";
< 		$admtext['createnewevtype'] = "Criar um registro de novo tipo de evento";
149,150d176
< 		$admtext['existingevtypes'] = "Tipos de Eventos Existentes";
< 		$admtext['edsevtypes'] = "Editar, excluir ou ordenar tipos de eventos incluidos anteriormente";
152d177
< 		$admtext['confdeleteevtype'] = "Tem certeza que quer excluir este tipo de evento?";
154d178
< 		$admtext['selectentertag'] = "Por favor, selecione ou informe um rótulo para este tipo de evento.";
208d231
< 		$admtext['changestoallevtypes'] = "Mudanças de todos os tipos de eventos";
214d236
< 		$admtext['BAPM'] = "Batismo";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Você tem certeza de que deseja excluir este tipo de evento? Todos os eventos deste tipo serão igualmente excluídos.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Adicionar um novo tipo";
> 		$admtext['createnewevtype'] = "Criar um novo tipo de atributo/evento";
> 		$admtext['modifyeventtype'] = "Editar tipo existente";
> 		$admtext['entertypedesc'] = "Insira um tipo/descrição para este novo tipo de atributo/evento.";
> 		$admtext['enterdisplay'] = "Insira uma string de exibição para este novo tipo de atributo/evento.";
> 		$admtext['existingeventtypeinfo'] = "Informações sobre um tipo de atributo/evento existente";
> 		$admtext['neweventtypeinfo'] = "Informações sobre um novo tipo de atributo/evento";
> 		$admtext['existingevtypes'] = "Tipos de atributo/evento existentes";
> 		$admtext['edsevtypes'] = "Editar, excluir ou classificar tipos de atributo/evento inseridos anteriormente";
> 		$admtext['selectentertag'] = "Selecione ou insira a tag para este tipo de atributo/evento.";
> 		$admtext['changestoallevtypes'] = "Alterações em todos os tipos de atributo/evento";
268d303
< 		$admtext['nobirthinfo'] = "Sem informação de nascimento";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Escolha<br/>foto<br/>padrão"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Salvar + Novos Pais";
> 		$admtext['savenewspouse'] = "Salvar + Novo Cônjuge";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Nascimento alternativo";
354d391
< 		$admtext['enterphotodesc'] = "Por favor, informe uma descrição para a imagem.";
388d424
< 		$admtext['photoowner'] = "Dono/Fonte";
417d452
< 		$admtext['imgmap'] = "Mapa da Imagem";
444c479
< 		$admtext['showmap'] = "Mostar o mapa e as fotos do cemitério sempre que for exibida esta imagem";
---
> 		$admtext['showmap'] = "Mostrar o mapa e as fotos do cemitério sempre que for exibida esta imagem";
490d524
< 		$admtext['mapinstr3'] = "Para ligar uma região desta fotografia a um indivíduo, primeiro selecione a árvore em que o indivíduo se encontra e depois crie um retângulo na área correspondente da fotografia. Para tal, clique no canto superior esquerdo do retângulo e arraste o cursor até o seu canto inferior direito. Alternativamente, você pode iniciar pelo canto superior esquerdo e arrastar o cursor até o canto inferior direito. Após, você deve selecionar o indivíduo na caixa de diálogo aberta. Com isso, o código necessário para estabelecer a ligação entre a região do mapa e o indivíduo é exibida na caixa abaixo. Repita o processo conforme necessário, ligando outras regiões da fotografia a indivíduos.";
495d528
< 		$admtext['removelink'] = "Remover Ligação";
502d534
< 		$admtext['eloptions'] = "Percorrer ou Excluir";
509d540
< 		$admtext['nolinks'] = "Ainda não há ligações";
518c549
< 		$admtext['alttd'] = "Tit altern/Desc";   //short abbreviation for "Alternate Title or Description"
---
> 		$admtext['alttd'] = "Tit. altern./Descr.";   //short abbreviation for "Alternate Title or Description"
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Mapa de Imagem HTML (para compatibilidade com versões anteriores)";
> 		$admtext['photoowner'] = "Proprietário do original";
> 		$admtext['nothumb'] = "Sem miniatura";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "O item não pôde ser adicionado, provavelmente porque o arquivo era muito grande. Por isso, não pôde ser carregado ou sua miniatura não pôde ser criada.";
> 		$admtext['moved'] = "Movido";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Insira um título ou uma descrição para esta mídia.";
> 		$admtext['mapinstr3'] = "Para vincular uma região desta foto a uma pessoa, família ou outra entidade, primeiro selecione a árvore e o tipo de entidade relevantes e, em seguida, desenhe um retângulo sobre a região desejada. Isso é feito clicando no canto superior esquerdo da região e depois arrastando para o canto inferior direito. Alternativamente, você pode clicar no canto superior esquerdo e depois clicar novamente no canto inferior direito. Uma caixa pop-up irá ajudá-lo a selecionar a pessoa ou entidade. Faça a seleção e repita esse processo conforme necessário para regiões adicionais. Clique em uma região existente para selecionar e arraste para mover ou clique no 'X' para excluir.";
596d633
< 		$admtext['foremptystring'] = "Para uma seqüência vazia, deixe este campo em branco e clique em \"Incluir >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instruções: Arraste ou clique duas vezes um item da lista à esquerda para movê-lo para a lista à direita. Arraste para cima e para baixo para reordenar. Clique duas vezes novamente para remover.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Para uma string vazia, deixe este campo em branco e clique em >>";
651,655d690
< 		$admtext['selectimportfile'] = "Por favor, selecione um arquivo para importar.";
< 		$admtext['importgedcom'] = "Importar GEDCOM (formato padrão 5.5)";
< 		$admtext['addreplacedata'] = "Adicionar ou substituir sua genealogia (pode levar vários minutos, dependendo do tamanho de seu arquivo)";
< 		$admtext['fromyourcomputer'] = "Do seu computador";
< 		$admtext['importdata'] = "Importar Dados";
657,660d691
< 		$admtext['replace'] = "Substituir (na árvore selecionada)";
< 		$admtext['desttree'] = "Árvore de Destino";
< 		$admtext['selectdesttree'] = "Por favor, selecione ou informe uma árvore de destino.";
< 		$admtext['selectexisting'] = "Importar para";
668,673d698
< 		$admtext['ucaselast'] = "Todos os sobrenomes em maiúsculas";
< 		$admtext['norecalc'] = "Não recalcular a marcação de pessoas vivas";
< 		$admtext['autooffset'] = "Começar IDs com o 1º número disponível";
< 
< 		$admtext['mustselecttree'] = "É necessário selecionar uma árvore antes de poder usar esta opção.";
< 		$admtext['importmedia'] = "Importar multimídia, se existir";
675d699
< 		$admtext['neweronly'] = "Substituir somente se for mais novo";
677,692d700
< 		$admtext['onwebserver'] = "No servidor web (na pasta GEDCOM)";
< 		$admtext['eventsonly'] = "Apenas importar eventos definidos pelo usuário (custom events)";
< 		$admtext['imphints'] = "Dicas: Todos Dados Atuais significa todas pessoas, famílias e fontes (associações a mídias não são perdidas, desde que os IDs fiquem os mesmos). Registros são coincidentes quanto têm o mesmo ID. Novos registros são sempre adicionados. Anexar importa todos registros com novos IDs.";
< 		$admtext['allevents'] = "Aceitar dados para todos novos Tipos de Evento";
< 		$admtext['destbranch'] = "Ramo de Destino (opcional)";
< 		$admtext['inframe'] = "(sem frame)";
< 		$admtext['getstart'] = "Iniciação";
< 		$admtext['importlatlong'] = "Importar dados de latitude / longitude quando presentes";
< 		$admtext['opening'] = "Abrindo";
< 		$admtext['reopen'] = "Reabrindo";
< 		$admtext['uploading'] = "Carregando";
< 		$admtext['stop'] = "Parar";
< 		$admtext['stopped'] = "Importação interrompida";
< 		$admtext['resume'] = "Reiniciar";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Registro de Alterações";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Importar na versão antiga (sem barra de progresso)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Atualizar";
> 		$admtext['need_upgrade'] = "Concluir estas instruções de atualização";
> 		$admtext['upgrade_missing'] = "O arquivo de atualização parece estar faltando, então possivelmente você já tenha terminado.";
> 		$admtext['delete_upgrade'] = "Quando tiver terminado, clique aqui para excluir a atualização e retornar ao menu.";
723d733
< 		$admtext['author'] = "Autor";
804,809c814,819
< 		$admtext['momside'] = "Rótulo para a parte de mãe"; //8
< 		$admtext['dadside'] = "Rótulo para a parte do pai"; //8
< 		$admtext['momperson'] = "ID da pessoa por parte de mãe"; //8
< 		$admtext['momtree'] = "ID da árvore por parte de mãe"; //8
< 		$admtext['dadperson'] = "ID da pessoa por parte de pai"; //8
< 		$admtext['dadtree'] = "ID da árvore por parte de pai"; //8
---
> 		$admtext['momside'] = "Rótulo para a parte de mãe"; //8, 20
> 		$admtext['dadside'] = "Rótulo para a parte do pai"; //8, 20
> 		$admtext['momperson'] = "ID da pessoa por parte de mãe"; //8, 20
> 		$admtext['momtree'] = "ID da árvore por parte de mãe"; //8, 20
> 		$admtext['dadperson'] = "ID da pessoa por parte de pai"; //8, 20
> 		$admtext['dadtree'] = "ID da árvore por parte de pai"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Cabeçalho das aspas";
> 		$admtext['quotesubhead'] = "Subtítulo das aspas";
> 		$admtext['sniptitle'] = "Título da feature";
> 		$admtext['snipname'] = "Nome do recurso";
> 		$admtext['snipinfoone'] = "Primeira linha do recurso";
> 		$admtext['snipinfotwo'] = "Característica da segunda linha";
> 		$admtext['snipimage'] = "Imagem da característica";
> 		$admtext['snipperson'] = "ID da pessoa do recurso";
> 		$admtext['sniptree'] = "ID da árvore do recurso";
> 		$admtext['quote'] = "Citação";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Título da característica 7";
> 		$admtext['featuretitle8'] = "Título da característica 8";
> 		$admtext['featuretitle9'] = "Título da característica 9";
> 		$admtext['featurethumb9'] = "Miniatura da característica 9"; //15
> 		$admtext['featurelink9'] = "Link da característica 9"; //15
> 		$admtext['featurepara9'] = "Parágrafo da característica"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Imagem Esquerda do Cabeçalho";
> 		$admtext['rightimg'] = "Imagem Direita do Cabeçalho";
> 		$admtext['photoption'] = "As opções de fotos são<br />&nbsp;&nbsp;(estática ou aleatória)";
> 		$admtext['randomphotowidth'] = "Largura da Foto Aleatória";
> 		$admtext['randomphotoheight'] = "Altura da Foto Aleatória";
> 		$admtext['randomphotomediatypeID'] = "Coleção das Fotos Aleatórias";
> 		$admtext['momheading'] = "Cabeçalho da Família Materna";
> 		$admtext['mompara'] = "Parágrafo da Família Materna";
> 		$admtext['mompagelink'] = "Link da Família Materna";
> 		$admtext['dadheading'] = "Cabeçalho da Família Paterna";
> 		$admtext['dadpara'] = "Parágrafo da Família Paterna";
> 		$admtext['dadpagelink'] = "Link da Família Paterna";
> 		$admtext['spmomheading'] = "Cabeçalho da Família Materna do Cônjuge";
> 		$admtext['spmompara'] = "Parágrafo da Família Materna do Cônjuge";
> 		$admtext['spmompagelink'] = "Link da Família Materna do Cônjuge";
> 		$admtext['spmomside'] = "Rótulo do Lado Materno do Cônjuge";
> 		$admtext['spdadside'] = "Rótulo do Lado Paterno do Cônjuge";
> 		$admtext['spmomperson'] = "PersonID do Lado Materno do Cônjuge";
> 		$admtext['spmomtree'] = "TreeID do Lado Materno do Cônjuge";
> 		$admtext['spdadheading'] = "Cabeçalho da Família Paterna do Cônjuge";
> 		$admtext['spdadpara'] = "Parágrafo da Família Paterna do Cônjuge";
> 		$admtext['spdadpagelink'] = "Link da Família Paterna do Cônjuge";
> 		$admtext['spdadperson'] = "PersonID do Lado Paterno do Cônjuge";
> 		$admtext['spdadtree'] = "TreeID do Lado Paterno do Cônjuge";
> 		$admtext['storiesheading'] = "Nossas Histórias de Família";
> 		$admtext['nbrsurnames'] = "Número de sobrenomes<br />&nbsp;&nbsp; na Nuvem de Sobrenomes";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Miniatura da característica";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Título do slide";
> 		$admtext['slideimg'] = "Imagem do slide";
> 		$admtext['slideheadline'] = "Cabeçalho do slide";
> 		$admtext['slidetext'] = "Texto do slide";
> 		$admtext['slidelink'] = "Link do slide";
> 		$admtext['slidelinktext'] = "Nome do link do slide";
> 		$admtext['featurelink'] = "Link do recurso";
> 		$admtext['featurelinktext'] = "Nome do link do recurso";
> 		$admtext['featuretitle'] = "Título do recurso";
> 		$admtext['featuresub'] = "Subtítulo do recurso";
> 		$admtext['quoteimg'] = "Imagem de citação";
> 		$admtext['quotelink'] = "Link de citação";
> 		$admtext['quotelinktext'] = "Nome do link de citação";
> 		$admtext['sidebarpara'] = "Parágrafo da barra lateral";
> 		$admtext['sidebarlink'] = "Link da barra lateral";
> 		$admtext['sidebarlinktext'] = "Nome do link da barra lateral";
> 		$admtext['sidebarimg'] = "Imagem da barra lateral";
> 		$admtext['sidebartitle'] = "Título da barra lateral";
> 		$admtext['sidebarsub'] = "Subtítulo da barra lateral";
> 		$admtext['snipheadline'] = "Título de destaque";
> 		$admtext['snipsubhead'] = "Subtítulo de destaque";
> 		$admtext['snipimg'] = "Imagem de destaque";
> 		$admtext['sniplink'] = "Link de destaque";
> 		$admtext['sniplinktext'] = "Nome do link de destaque";
> 		$admtext['linktext'] = "Texto do link";
> 		$admtext['footerheadline'] = "Título do rodapé";
> 		$admtext['footerpara'] = "Texto do rodapé";
> 		$admtext['footerlink'] = "Link do rodapé";
> 		$admtext['footerlinktext'] = "Nome do link do rodapé";
> 		$admtext['footerheadline'] = "Título do rodapé";
> 		$admtext['footerpara'] = "Texto do rodapé";
> 		$admtext['footerlink'] = "Link do rodapé";
> 		$admtext['footerlinktext'] = "Nome do link do rodapé";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG requer versão 5.3 ou posterior.)";
---
> 		$admtext['phpreq'] = "(TNG requer versão 7.0 ou posterior.)";
985c1078
< 		$admtext['shownames'] = "Mostar nomes de pessoas vivas";
---
> 		$admtext['shownames'] = "Mostrar nomes de pessoas vivas";
1115c1208
< 		$admtext['maxpedgens'] = "Nº Máximo de Gerações na Árvore de Ascendentes";
---
> 		$admtext['maxpedgens'] = "No máximo de gerações";
1232d1324
< 		//added in 8.0.0
1234c1326
< 		$admtext['maxrels'] = "Max Parentescos";
---
> 		$admtext['maxrels'] = "Max parentescos";
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1333,1334c1418,1419
< 		$admtext['sitekey'] = "reCAPTCHA Site Key";
< 		$admtext['secret'] = "reCAPTCHA Secret";
---
> 		$admtext['sitekey'] = "Cahve reCAPTCHA do sítio";
> 		$admtext['secret'] = "Segredo do reCAPTCHA";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Alterar prefixos carregados para casar com os ajustes do TNGs";
> 		$admtext['sortevents'] = "Classificar eventos por";
> 		$admtext['sortbydate'] = "Data do evento";
> 		$admtext['sortbytype'] = "Tipo do evento";
> 		$admtext['allowsuggest'] = "Permitir que visitantes façam sugestões";
> 		$admtext['livingchecked'] = "Ligar o sinal de vivo para novas pessoas e famílias";
> 		$admtext['maxmarried'] = "Marcar a família como viva se casada<br/>a menos que este número de anos";
> 		$admtext['imagetags'] = "Retângulos";
> 		$admtext['allowcsv'] = "Permitir baixar relatórios como CSV";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Opções de backup";
> 		$admtext['dosql'] = "Exportar como SQL";
> 		$admtext['dodrop'] = "Incluir DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Incluir CREATE TABLE";
> 		$admtext['onrestore'] = "Restaurar as opções";
> 		$admtext['dodel'] = "Excluir o conteúdo anterior primeiro";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Eventos alternativos de nascimento";
> 		$admtext['dtformat'] = "Formatos de tabela";
> 		$admtext['conchart'] = "Gráfico de parentescos (busca avançada)";
> 		$admtext['maxropt'] = "No. máx. de execuções de busca";
> 		$admtext['maxlopt'] = "Tamanho máximo de um caminho de parentesco";
> 		$admtext['showtxtopt'] = "Exibir declaração textual de caminho";
> 		$admtext['compactboxopt'] = "Mostrar retângulos de pessoas em formato compacto";
> 		$admtext['sortbyopt'] = "Ordenar caminhos por";
> 		$admtext['anchoridopt'] = "ID âncora";
> 		$admtext['maxmopt'] = "Número máximo de casamentos em um parentesco";
> 		$admtext['saveincfg'] = "Armazenar no caminho de configuração (ver Configuração geral)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Não pode ser geocodificado";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Não geocodificar";
1436d1549
< 		$admtext['backtosecondary'] = "Voltar para Processos Secundários";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "De volta para os utilitários pós-importação";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Excluir notas";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Compacte (Zip) e inclua arquivos de mídia";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Mostrar apenas usuários desabilitados";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Também enviar aos administradores quando uma única árvore for selecionada";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1722c1839
< 		$admtext['showlogfile'] = "Mostar o Log de acões do gerente de Mods";
---
> 		$admtext['showlogfile'] = "Mostrar o Log de ações do gerente de Mods";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Todos os Mods";
> 		$admtext['installedmods'] = "Apenas os Mods instalados";
> 		$admtext['partinstmods'] = "Mods instalados + parcialmente instalados";
> 		$admtext['showanalyzeractions'] = "Mostrar ações no analisador";
> 		$admtext['badchar'] = "Caractere inválido";
1886d2008
< 		$admtext['test_number'] = "Número do teste";
1916d2037
< 		$admtext['xtra_mut'] = "Mutações extra";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Número do teste";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Mantenha o teste privativo";
> 		$admtext['multivalues'] = "Use hifens entre múltiplos valores";
> 		$admtext['changestogroup'] = "Alterações do Grupo de DNA";
> 		$admtext['modifydnagroup'] = "Editar Grupo de DNA existente";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Vincular este teste de DNA a uma pessoa";
1924c2054
< $admtext['cannotexecutequery'] = "Não dá para fazer a consulta";
---
> $admtext['cannotexecutequery'] = "Não é possível fazer a consulta";
1966d2095
< $admtext['otherevents'] = "Outros Eventos";
2051,2052d2179
< $admtext['savereturn'] = "Voltar a esta página";
< $admtext['saveback'] = "Voltar ao menu";
2059,2060d2185
< $admtext['secondary'] = "Processos Secundários";
< $admtext['commas'] = "Separar múltiplas entradas com vírgulas";
2102c2227
< $admtext['nobranch'] = "Nenhum Ramo";
---
> $admtext['nobranch'] = "Nenhum ramo";
2130,2131d2254
< $admtext['secondarymaint'] = "Processos Secundários";
< $admtext['customeventtypes'] = "Tipos de Eventos Personalizados";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tipo";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Sobrenomes";
> $admtext['subhead'] = "Subtítulo";
> $admtext['image'] = "Imagem";
> $admtext['author'] = "Autor";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Iniciação";
> $admtext['showlog'] = "Registro de Alterações";
> $admtext['nobirthinfo'] = "Sem informação de nascimento";
> //changed in 13.0
> $admtext['savereturn'] = "Salvar + Permanecer";
> $admtext['saveback'] = "Salvar + Sair";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Todos itens excluídos com sucesso.";
> $admtext['private'] = "Privado";
> $admtext['imgtags'] = "Rótulos de Imagens";
> 
> $admtext['removelink'] = "Remover Ligação";
> $admtext['eloptions'] = "Percorrer ou Excluir";
> $admtext['pleaseenter'] = "Por favor, informe um";
> 
> $admtext['nolinks'] = "Ainda não há ligações";
> $admtext['nogeocode'] = "Não pode ser geocodificado";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Escolha<br/>foto<br/>padrão"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Tipos de atributo/evento";
> $admtext['secondary'] = "Utilitários pós-importação";
> $admtext['otherevents'] = "Outros atributos/eventos";
> //added in 14.0
> $admtext['newlinks'] = "Links criados";
> $admtext['newcemlinks'] = "Links de cemitério criados";
> $admtext['utility'] = "Utilitário";
> $admtext['linktype'] = "Tipo";
> $admtext['move'] = "Mover";
> $admtext['copy'] = "Copiar";
> $admtext['title2'] = "Título"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/PortugueseBR/alltext.php TNG1403/languages/PortugueseBR/alltext.php
9c9
< $dates['MARCH'] = "Março";
---
> $dates['MARCH'] = "Março";
31c31
< $dates['AFT'] = "PÓS";
---
> $dates['AFT'] = "PÓS";
37c37
< $dates['TO'] = "até";
---
> $dates['TO'] = "até";
43,44c43,44
< $text['cannotexecutequery'] = "Não dá para fazer a consulta";
< $text['to'] = "até";
---
> $text['cannotexecutequery'] = "Não dá para fazer a consulta";
> $text['to'] = "até";
46c46
< $text['text_next'] = "Próx";
---
> $text['text_next'] = "Próx";
50,59c50,59
< $text['forgot1'] = "<strong>Esqueceu seu nome de usuário ou senha?</strong><br />Entre seu email abaixo para receber seu nome de usuário.";
< $text['forgot2'] = "Entre seu email acima e nome de usuário abaixo para gerar uma nova senha.";
< $text['newpass'] = "Sua senha temporária";
< $text['usersent'] = "Seu nome de usuário foi enviado para seu email.";
< $text['pwdsent'] = "Sua senha temporária foi gerada e enviada para seu email.";
< $text['loginnotsent2'] = "O email fornecido não corresponde a nenhuma conta de usuário. Nenhuma informação foi enviada para seu email.";
< $text['loginnotsent3'] = "O email e o nome de usuário fornecidos não correspondem a nenhuma conta de usuário. Nenhuma informaão foi enviada para seu email.";
< $text['logininfo'] = "Sua informação de login";
< $text['collapseall'] = "Minimizar representação";
< $text['expandall'] = "Maximizar representação";
---
> $text['forgot1'] = "<strong>Esqueceu seu nome de usuário ou senha?</strong><br />Entre seu e-mail abaixo para receber seu nome de usuário.";
> $text['forgot2'] = "Entre seu e-mail acima e nome de usuário abaixo para gerar uma nova senha.";
> $text['newpass'] = "Sua senha temporária";
> $text['usersent'] = "Seu nome de usuário foi enviado para seu e-mail.";
> $text['pwdsent'] = "Sua senha temporária foi gerada e enviada para seu e-mail.";
> $text['loginnotsent2'] = "O e-mail fornecido não corresponde a nenhuma conta de usuário. Nenhuma informação foi enviada para seu e-mail.";
> $text['loginnotsent3'] = "O e-mail e o nome de usuário fornecidos não correspondem a nenhuma conta de usuário. Nenhuma informaão foi enviada para seu e-mail.";
> $text['logininfo'] = "Sua informação de login";
> $text['collapseall'] = "Minimizar representação";
> $text['expandall'] = "Maximizar representação";
64,66c64,66
< $text['headstones'] = "Lápides";
< $text['histories'] = "Histórias";
< $text['recordings'] = "Áudios";
---
> $text['headstones'] = "Lápides";
> $text['histories'] = "Histórias";
> $text['recordings'] = "�udios";
70,71c70,71
< $admtext['placelevel'] = "Nível do lugar";
< $admtext['level1'] = "Endereço";
---
> $admtext['placelevel'] = "Nível do lugar";
> $admtext['level1'] = "Endereço";
76,77c76,77
< $admtext['level6'] = "País";
< $admtext['level0'] = "Não Definido";
---
> $admtext['level6'] = "País";
> $admtext['level0'] = "Não Definido";
86c86
< $text['mainton'] = "Modo de Manutenção Ligado";
---
> $text['mainton'] = "Modo de Manutenção Ligado";
88d87
< //moved here in 8.0.0
90,94c89,93
< $admtext['text_private'] = "Manter privadas as informações do proprietário";
< $admtext['confunlink'] = "Tem certeza de que deseja ligar este indivíduo como esposa a esta família?";
< $admtext['confunlinkc'] = "Está seguro de que deseja desligar este indivíduo como filho desta família?";
< $admtext['confremchild'] = "Tem certeza de que deseja remover este filho desta família? O indivíduo não será excluído da base de dados.";
< $admtext['enterfamilyid'] = "Por favor, informe um ID de Família.";
---
> $admtext['text_private'] = "Manter privadas as informações do proprietário";
> $admtext['confunlink'] = "Tem certeza de que deseja ligar este indivíduo como esposa a esta família?";
> $admtext['confunlinkc'] = "Está seguro de que deseja desligar este indivíduo como filho desta família?";
> $admtext['confremchild'] = "Tem certeza de que deseja remover este filho desta família? O indivíduo não será excluído da base de dados.";
> $admtext['enterfamilyid'] = "Por favor, informe um ID de Família.";
96c95
< $admtext['no'] = "Não";
---
> $admtext['no'] = "Não";
104c103
< $admtext['TITL'] = "Título";
---
> $admtext['TITL'] = "Título";
109,115c108,112
< $admtext['SLGS'] = "Selamento ao Cônjuge (SUD)";
< $admtext['hello'] = "Olá";
< $admtext['activated'] = "A sua conta de usuário do sítio foi ativada";
< $admtext['infois'] = "Sua informação de login é a seguinte:";
< $admtext['subjectline'] = "Sua conta de usuário foi ativada.";
< 
< //moved here in 8.1.0
---
> $admtext['SLGS'] = "Selamento ao Cônjuge (SUD)";
> $admtext['hello'] = "Olá";
> $admtext['activated'] = "A sua conta de usuário do sítio foi ativada";
> $admtext['infois'] = "Sua informação de login é a seguinte:";
> $admtext['subjectline'] = "Sua conta de usuário foi ativada.";
118c115
< $admtext['foster'] = "de criação";
---
> $admtext['foster'] = "de criação";
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
128c121
< $text['legal'] = "Ofício"; //as in page size
---
> $text['legal'] = "Ofício"; //as in page size
131c124
< $text['tuesday'] = "Terça-feira";
---
> $text['tuesday'] = "Terça-feira";
134,137c127,130
< $text['friday'] = "Sexta";
< $text['saturday'] = "Sábado";
< $text['contains'] = "contém";
< $text['startswith'] = "começa com";
---
> $text['friday'] = "Sexta-feira";
> $text['saturday'] = "Sábado";
> $text['contains'] = "contém";
> $text['startswith'] = "começa com";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
144,145c134,135
< $text['enteremail'] = "Por favor, forneça um e-mail.";
< $text['page'] = "Página";
---
> $text['enteremail'] = "Please enter a valid e-mail address.";
> $text['page'] = "Página";
148,151c138,139
< 
< //added in 10.0.0
< $admtext['CONL'] = "Confirmação (SUD)";
< $admtext['INIT'] = "Iniciação (SUD)";
---
> $admtext['CONL'] = "Confirmação (SUD)";
> $admtext['INIT'] = "Iniciação (SUD)";
153,156c141,142
< $text['switchm'] = "Alternar para sítio móvel";
< $text['switchs'] = "Alternar para sítio padrão";
< 
< //added in 11.0.0
---
> $text['switchm'] = "Alternar para sítio móvel";
> $text['switchs'] = "Alternar para sítio padrão";
159d144
< $text['problem'] = "Ocorreu um erro. Isto pode ter sido causado por um problema de configuração, uma atualização incompleta de software ou um erro de programa. Caso você seja o proprietário do sítio, pode contactar o suporte do TNG para ajuda. Por favor, copie a consulta abaixo em sua mensagem ao suporte.";
163d147
< //moved here in 12.0.0
165c149
< $admtext['dna_groups'] = "DNA Groups";
---
> $admtext['dna_groups'] = "Grupos de DNA";
171c155
< $admtext['medialinks'] = "Ligações da Mídia";
---
> $admtext['medialinks'] = "Ligações da Mídia";
173d156
< //added here in 12.0.0
175,176c158
< $text['test_number'] = "Número/Nome do Teste";
< $text['test_info_display'] = "Informação sobre o Teste para Mostrar";
---
> $text['test_info_display'] = "Informação para mostrar sobre o teste";
187,190c169,172
< $admtext['hvr_values'] = "Diferenças de HVR";
< $admtext['hvr1_values'] = "Diferenças de HVR1";
< $admtext['hvr2_values'] = "Diferenças de HVR2";
< $admtext['coding_reg'] = "Diferença de região de codificaçãos";
---
> $admtext['hvr_values'] = "Diferenças de HVR";
> $admtext['hvr1_values'] = "Diferenças de HVR1";
> $admtext['hvr2_values'] = "Diferenças de HVR2";
> $admtext['coding_reg'] = "Diferença de região de codificaçãos";
195c177
< $admtext['markers'] = "Número de marcadores SDR testados";
---
> $admtext['markers'] = "Número de marcadores SDR testados";
202a185,252
> $admtext['xtra_mut'] = "Mutações extra";
> $text['test_number'] = "Número/Nome do Teste";
> $admtext['match_date'] = "Data da Coincidência";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Seção de Relacionamento";
> $admtext['relationship_range'] = "Faixa de Relacionamento";
> $admtext['suggested_relationship'] = "Sugerido";
> $admtext['actual_relationship'] = "Relacionamento Real";
> $admtext['related_side'] = "Ramo Relacionado";
> $admtext['shared_dna'] = "DNA compartilhado";
> $admtext['shared centimorgans'] = "Total de cMs compartilhados";
> $admtext['shared_segments'] = "Segmentos compartilhados";
> $admtext['largest_segment'] = "Maior Segmento";
> $admtext['chromosome'] = "Número do Chromosoma";
> $admtext['segment_start'] = "Início do Segmento";
> $admtext['segment_end'] = "Fim do Segmento";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "SNPs Coincidentes";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Teste privado";
> $text['shared_dna'] = "Segmento de DNA compartilhado";
> $text['for_match'] = "para esta coincidência";
> $admtext['keeptest'] = "Privacidade do Teste";
> $admtext['keepname'] = "Provacidade do Nome";
> $admtext['allgroups'] = "Todos Grupos";
> $admtext['alltypes'] = "Todos Tipos";
> $admtext['generation_num'] = "Gerações de Sobrenomes de Ancestrais";
> 
> $text['birthabbr'] = "nasc.";
> $text['chrabbr'] = "bat.";
> $text['deathabbr'] = "fal.";  //from descend
> $text['burialabbr'] = "sep.";  //from descend
> $text['marrabbr'] = "cas.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Encontrar todos indivíduos com eventos neste local";
> $text['firstpage'] = "Primeira páginas";
> $text['lastpage'] = "Última página";
> 
> //changed in 13.0.0
> $text['problem'] = "Ocorreu um erro no software TNG. Algumas alternativas para resolvê-lo são:<p>Se você acabou de instalar uma atualização do TNG, talvez tenha inadvertidamente saltado um dos passos da instalação. Retorne ao arquivo leia-me (readme.html) da atualização e releia as instruções. Particularmente, preste atenção ao passo referente à atualização do banco de dados.</p><p>Se você acabou de fazer uma nova instalação do TNG, talvez tenha deixado de criar as tabelas no banco de dados. Retorne ao arquivo readme.html para encontrar este passo.</p><p>Se você é o proprietário deste sítio, pode contactar o suporte do TNG para assistência com este problema. Por favor copie e cole a consulta abaixo em sua mensagem.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Nenhum ramo";
> 
> //added in 14.0
> $text['oneyear'] = "ano";
> $text['pwdcodelink'] = "Clique neste link para receber uma senha temporária";
> $text['pwdcodesent'] = "Um link de redefinição de senha foi enviado para seu endereço de e-mail.";
> $text['moved'] = "Movido";
> $text['citation'] = "Citação";
> $text['other'] = "Outro";
> $text['death'] = "Falecimento";
> $text['burial'] = "Sepultamento";
> $text['cremation'] = "Cremação";
> $text['marriage'] = "Casamento";
> $text['divorce'] = "Divórcio";
> $text['bylength'] = "Passos";
> $text['bymarriages'] = "Casamentos";
> $text['none'] = "Nenhum";
> 
> //moved here in 14.0
> $text['family'] = "Família";
> $text['source'] = "Fonte";
> $text['repository'] = "Repositório";
> $text['place'] = "Lugar";
> $admtext['BAPM'] = "Batismo";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Mutações extra";
---
> $text['glang'] = "pt-BR";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/PortugueseBR/text.php TNG1403/languages/PortugueseBR/text.php
5c5
< 		$text['browseallsources'] = "Mostrar todas fontes";
---
> 		$text['browseallsources'] = "Mostrar todas as fontes";
14c14
< 		$text['browseallrepos'] = "Folhar pelos arquivos";
---
> 		$text['browseallrepos'] = "Folhear os arquivos";
22,23c22,23
< 		$text['sitemaint'] = "Manutenção do site em andamento";
< 		$text['standby'] = "O site está temporariamente fora do ar por manutenção na base de dados. Favor tentar novamente depois de alguns minutos. Se o site permanecer fora do ar por um período mais longo, favor <a href=\"suggest.php\">contatar o proprietário do site</a>.";
---
> 		$text['sitemaint'] = "Site em manutenção";
> 		$text['standby'] = "O site está temporariamente fora do ar para manutenção da base de dados. Por favor tente novamente depois de alguns minutos. Se o site permanecer fora do ar por um período mais longo, por favor <a href=\"suggest.php\">contacte o proprietário do site</a>.";
40c40
< 		$text['yourname'] = "Seu nome";
---
> 		$text['yourname'] = "O seu nome";
45,49c45,49
< 		$text['mailsent'] = "Obrigado. Sua mensagem foi enviada.";
< 		$text['mailnotsent'] = "Sua mensagem não pode ser enviada. Favor contatar xxx diretamente através do e-mail yyy.";
< 		$text['mailme'] = "Enviar uma cópia a este endereço";
< 		$text['entername'] = "Por favor, entre seu nome";
< 		$text['entercomments'] = "Por favor, entre seus comentários";
---
> 		$text['mailsent'] = "Obrigado. A sua mensagem foi enviada.";
> 		$text['mailnotsent'] = "A sua mensagem não pôde ser enviada. Por favor, contacte o Administrador do site directamente através do e-mail luis@@belard.pt.";
> 		$text['mailme'] = "Enviar uma cópia para este endereço";
> 		$text['entername'] = "Por favor, indique o seu nome";
> 		$text['entercomments'] = "Por favor, escreva os seus comentários";
59c59
< 		$text['pp'] = "pp."; //page abbreviation
---
> 		$text['pp'] = "pg."; //page abbreviation
66c66
< 		$text['received'] = "Sua sugestão foi enviada ao administrador.";
---
> 		$text['received'] = "A sua sugestão foi enviada ao Administrador.";
69d68
< 		$text['general'] = "Geral";
78c77,78
< 		$text['relcalc'] = "Computar relações de parentesco";
---
> 	case "connections":
> 		$text['relcalc'] = "Busca simples de parentescos (parentes consanguíneos e seus cônjuges)";
82c82
< 		$text['calculate'] = "Computar";
---
> 		$text['calculate'] = "Buscar";
91c91
< 		$text['notrelated'] = "As duas pessoas não têm parentesco em xxx gerações."; //xxx will be replaced with number of generations
---
> 		$text['notrelated'] = "As duas pessoas não têm parentesco consanguíneo entre si em xxx gerações."; //xxx will be replaced with number of generations
98,100c98,100
< 		$text['uncle'] = "tio xxx de";
< 		$text['aunt'] = "tia xxx de";
< 		$text['uncleaunt'] = "tio/tia xxx de";
---
> 		$text['uncle'] = "xxx tio de";
> 		$text['aunt'] = "xxx tia de";
> 		$text['uncleaunt'] = "xxx tio/tia de";
104c104
< 		$text['removed'] = "vezes removido";
---
> 		$text['removed'] = "vezes afastado";
117c117
< 		$text['great'] = "grande";
---
> 		$text['great'] = "bis";
127,132c127,132
< 		$text['mcousin'] = "xxx primo yyy de";  //male cousin; xxx = cousin number, yyy = times removed
< 		$text['fcousin'] = "xxx prima yyy de";  //female cousin
< 		$text['cousin'] = "xxx primo/prima yyy de";
< 		$text['mhalfcousin'] = "xxx meio-primo yyy de";  //male cousin
< 		$text['fhalfcousin'] = "xxx meia-prima yyy de";  //female cousin
< 		$text['halfcousin'] = "xxx meio-primo yyy de";
---
> 		$text['mcousin'] = "primo xxxº yyy de";  //male cousin; xxx = cousin number, yyy = times removed
> 		$text['fcousin'] = "prima xxxª yyy de"; //female cousin
> 		$text['cousin'] = "primo/primaxxxº yyy de";
> 		$text['mhalfcousin'] = "meio-primo xxxº yyy de"; //male cousin
> 		$text['fhalfcousin'] = "meia-prima xxxª yyy de"; //female cousin
> 		$text['halfcousin'] = "meio-primo xxxº yyy de";
134c134
< 		$text['oneremoved'] = "removido uma vez";
---
> 		$text['oneremoved'] = "uma vez afastado";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Buscar parentscos";
> 		$text['findrel2'] = "inclui parentes não-consanguíneos";
> 		$text['makeme2nd'] = "Usar meu ID";
> 		$text['usebookmarks'] = "Usar marcadores";
> 		$text['select2inds'] = "Selecione duas pessoas.";
> 		$text['indinfofor'] = "Informações pessoais para";
> 		$text['nobookmarks'] = "Não há marcador para usar";
> 		$text['bkmtitle'] = "Pessoas encontradas em marcadores";
> 		$text['bkminfo'] = "Selecionar a pessoa:";
> 		$text['sortpathsby'] = "Classificar caminhos por número de";
> 		$text['sortbyshort'] = "Classificar por";
> 		$text['bylengthshort'] = "Comprimento";
> 		$text['badID1'] = ": ID da pessoa1 inválido - volte e corrija";
> 		$text['badID2'] = ": ID da pessoa2 inválido - volte e corrija";
> 		$text['notintree'] = ": a pessoa com este ID não está na árvore atual.";
> 		$text['sameperson'] = "Os dois indivíduos são a mesma pessoa.";;
> 		$text['nopaths'] = "Estas pessoas não têm parentesco.";
> 		$text['nopaths1'] = "Não há outros parentescos de comprimento menor que xxx";
> 		$text['nopaths2'] = "em xxx passos de busca";
> 		$text['longestpath'] = "(o caminho mais longo verificado até agora tem xxx passos)";
> 		$text['relevantpaths'] = "Número de diferentes caminhos relevantes encontrados: xxx";
> 		$text['skipMarr'] = "(além disso, o número de caminhos encontrados mas não exibidos devido a número excessivo de casamentos é: xxx)";
> 		$text['mjaor'] = "ou";
> 		$text['connectionsto'] = "Parentescos com ";
> 		$text['findanotherpers'] = "Buscar outra pessoa...";
> 		$text['sometimes'] = "(Às vezes, verificar um número diferente de gerações produz um resultado diferente.)";
> 		$text['anotherpath'] = "Busca avançada de parentescos";
> 		$text['xpath'] = "Caminho ";
> 		$text['primary'] = "Pessoa inicial"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Pessoa final";
> 		$text['parent'] = "Pai/mãe";
> 		$text['mhfather'] = "seu pai";
> 		$text['mhmother'] = "sua mãe";
> 		$text['mhhusband'] = "seu marido";
> 		$text['mhwife'] = "sua esposa";
> 		$text['mhson'] = "seu filho";
> 		$text['mhdaughter'] = "sua filha";
> 		$text['fhfather'] = "seu pai";
> 		$text['fhmother'] = "sua mãe";
> 		$text['fhhusband'] = "seu marido";
> 		$text['fhwife'] = "sua esposa";
> 		$text['fhson'] = "seu filho";
> 		$text['fhdaughter'] = "sua filha";
> 		$text['hfather'] = "pai";
> 		$text['hmother'] = "mãe";
> 		$text['hhusband'] = "marido";
> 		$text['hwife'] = "esposa";
> 		$text['hson'] = "filho";
> 		$text['hdaughter'] = "filha";
> 		$text['maxruns'] = "Número máximo de caminhos por verificar";
> 		$text['maxrshort'] = "Nº máximo de caminhos";
> 		$text['maxlength'] = "Caminhos de relacionamento não maiores que";
> 		$text['maxlshort'] = "Comprimento máximo";
> 		$text['xstep'] = "passo";
> 		$text['xsteps'] = "passos";
> 		$text['xmarriages'] = "xxx casamentos";
> 		$text['xmarriage'] = "1 casamento";
> 		$text['showspouses'] = "Mostrar ambos os cônjuges";
> 		$text['showTxt'] = "Mostrar descrição textual do caminho";
> 		$text['showTxtshort'] = "Descrição textual";
> 		$text['compactBox'] = "Compactar os retângulos de indivíduo";
> 		$text['compactBoxshort'] = "Retângulos compactados";
> 		$text['paths'] = "Caminhos";
> 		$text['dospouses2'] = "Mostrar cônjuges";
> 		$text['maxmopt'] = "Número máximo de casamentos por parentesco";
> 		$text['maxm'] = "Max casamentos";
> 		$text['arerelated'] = "Estas pessoas têm parentesco consanguíneo - seu relacionamento é mostrado no caminho 1";
> 		$text['simplerel'] = "Busca simples de parentescos";
182,183c251,252
< 		$text['husband'] = "Pai";
< 		$text['wife'] = "Mãe";
---
> 		$text['husband'] = "Marido";
> 		$text['wife'] = "Mulher";
196d264
< 		$text['scrollnote'] = "Observação: talvez seja necessário rolar para a direita ou para baixo para visualizar todo o diagrama.";
199d266
< 		$text['popupnote2'] = " = Nova árvore";
215c282
< 		$text['paternal'] = "Lado paterno";
---
> 		$text['paternal'] = "lado paterno";
218c285
< 		$text['gen2'] = "Pais ";
---
> 		$text['gen2'] = "Pais";
221c288
< 		$text['gen5'] = "Tataravós 16";
---
> 		$text['gen5'] = "Trisavós 16";
231,232c298,299
< 		$text['regformat'] = "Formato Registro";
< 		$text['extrasexpl'] = "Se houver textos ou fotos para estas pessoas, ícones correspondentes aparecerão junto a seus nomes.";
---
> 		$text['regformat'] = "Formato de Registro";
> 		$text['extrasexpl'] = "Se houver textos ou fotos para estas pessoas, os ícones correspondentes aparecerão junto aos seus nomes.";
254c321
< 		$text['fcmlogin'] = "Favor fazer login para ver mais detalhes";
---
> 		$text['fcmlogin'] = "Por favor faça login para ver mais detalhes";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabelas";
> 		$text['dtchildren'] = "Filhos";
> 		$text['dtgrandchildren'] = "Netos";
> 		$text['dtggrandchildren'] = "Bisnetos";
> 		$text['dtgggrandchildren'] = "netos"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "-1"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Sem descendentes";
> 		$text['dtgen'] = "Ger";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Selecionar";
> 		$text['dteachfulltable'] = "Cada tabela completa terá";
> 		$text['dtrows'] = "linhas";
> 		$text['dtdisplayingtable'] = "Exibindo tabela";
> 		$text['dtgototable'] = "Ir para tabela:";
> 		$text['fcinstrdn'] = "Mostrar família com cônjuge";
> 		$text['fcinstrup'] = "Mostrar família com os pais";
> 		$text['fcinstrplus'] = "Selecione outros cônjuges";
> 		$text['fcinstrfam'] = "Selecione outros pais";
272c358
< 		$text['allreports'] = "Todos relatórios";
---
> 		$text['allreports'] = "Todos os relatórios";
288,289c374,375
< 		$text['tryagain'] = "Favor tentar novamente";
< 		$text['joinwith'] = "Conectivo lógico";
---
> 		$text['tryagain'] = "Por favor tente novamente";
> 		$text['joinwith'] = "Conector lógico";
292c378
< 		$text['showspouse'] = "Mostre cônjuge; em caso de vários cônjuges, serão mostradas duplicatas";
---
> 		$text['showspouse'] = "Mostrar cônjuge; em caso de vários cônjuges, serão mostradas duplicatas";
299c385
< 		$text['resetall'] = "Limpar todos valores";
---
> 		$text['resetall'] = "Limpar todos os valores";
339c425
< 		$text['mysphoto'] = "Fotos Misteriosas";
---
> 		$text['mysphoto'] = "Fotos Procuradas";
343c429
< 		$text['moreinfo'] = "Mais Informação:";
---
> 		$text['moreinfo'] = "Mais Informações:";
381,383c467
< 		$text['firstpage'] = "Primeira páginas";
< 		$text['lastpage'] = "Última página";
< 		$text['photoowner'] = "Proprietário/fonte";
---
> 		$text['photoowner'] = "Proprietário do original";
397c481
< 		$text['iptc115'] = "Fonte des Fotografias";
---
> 		$text['iptc115'] = "Fonte das Fotografias";
414,416c498,500
< 		$text['allalbums'] = "Todos álbuns";
< 		$text['slidestop'] = "Suspender apresentação";
< 		$text['slideresume'] = "Reiniciar apresentação";
---
> 		$text['allalbums'] = "Todos os álbuns";
> 		$text['slidestop'] = "Suspender a apresentação";
> 		$text['slideresume'] = "Reiniciar a apresentação";
418,419c502,503
< 		$text['minussecs'] = "menos 0.5 segundos";
< 		$text['plussecs'] = "mais 0.5 segundos";
---
> 		$text['minussecs'] = "menos 0,5 segundos";
> 		$text['plussecs'] = "mais 0,5 segundos";
428,429c512,513
< 		$text['allburials'] = "Todos sepultamentos";
< 		$text['moreinfo'] = "Mais Informação:";
---
> 		$text['allburials'] = "Todos os sepultamentos";
> 		$text['moreinfo'] = "Mais Informações:";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Alternar Rótulos";
461c547
< 		$text['placescont'] = "Mostar todos lugares que contém ...";
---
> 		$text['placescont'] = "Mostrar todos lugares que contém ...";
464c550
< 		$text['top30places'] = "xxx lugares com mais indivíduos";
---
> 		$text['top30places'] = "xxx maiores lugares";
504c590
< 		
---
> 
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
558c642
< 		$text['ackmessage'] = "Sua solicitação de uma conta de usuário foi recebida. Sua conta permanecerá inativa até que seja revista pelo administrador do sítio. Você será notificado por email, tão logo a solicitação seja aprovada.";
---
> 		$text['ackmessage'] = "Sua solicitação de uma conta de usuário foi recebida. Sua conta permanecerá inativa até que seja revista pelo administrador do sítio. Você será notificado por e-mail, tão logo a solicitação seja aprovada.";
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Repetir nova senha";
> 		$text['resetsuccess'] = "Sucesso: a senha foi redefinida";
> 		$text['resetfail'] = "Falha: Senha não redefinida";
> 		$text['failreason0'] = " (erro desconhecido de banco de dados)";
> 		$text['failreason2'] = " (você não tem permissão para alterar sua senha)";
> 		$text['failreason3'] = " (as senhas não correspondem)";
582c673
< 		$text['avglifespan'] = "Tempo média de vida";
---
> 		$text['avglifespan'] = "Tempo médio de vida";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total de citações de fontes";
618d710
< 		$text['loginfirst'] = "Você deve fazer login (entrar) primeiro.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Foram detectados registros de usuário pré-existentes. Para prosseguir, faça login primeiro ou remova todos registros da tabela de usuários.";
629,632c723,724
< 		$text['zoomin'] = "Mais Zoom";
< 		$text['zoomout'] = "Menos Zoom";
< 		$text['magmode'] = "Modo de magnificação";
< 		$text['panmode'] = "Mode de varredura";
---
> 		$text['magmode'] = "Modo de ampliação";
> 		$text['panmode'] = "Modo de varredura";
637c729
< 		$text['opennw'] = "Abrir imagem em uma nova janela";
---
> 		$text['opennw'] = "Abrir a imagem em uma nova janela";
641c733
< 		$text['vwrclose'] = "Fechar visualizador de imagem";
---
> 		$text['vwrclose'] = "Fechar o visualizador de imagem";
651c743
< 		$text['dnatestscompare'] = "Comparar Testes de  Y-DNA";
---
> 		$text['dnatestscompare'] = "Comparar Testes de Y-DNA";
654c746
< 		$text['all_dna_tests'] = "Todos testes de DNA";
---
> 		$text['all_dna_tests'] = "Todos os testes de DNA";
656,659c748,775
< 		$text['dna_info_head'] = "Informação do Teste de DNA";
< 		$text['alltypes'] = "Todos Tipos";
< 		$text['allgroups'] = "Todos Grupos";
< 		$text['Ydna_LITbox_info'] = "Testes vinculados a esta pessoa não foram necessariamente feitos por esta pessoa. <br /> A coluna 'Haplogrupo' exibe dados em vermelho se o resultado for 'Previsto', e em verde se o teste for 'Confirmado'";
---
> 		$text['alltypes'] = "Todos os Tipos";
> 		$text['allgroups'] = "Todos os Grupos";
> 		$text['Ydna_LITbox_info'] = "Os testes vinculados a esta pessoa não foram necessariamente feitos por esta pessoa. <br /> A coluna 'Haplogrupo' exibe dados em vermelho se o resultado for 'Previsto', e em verde se o teste for 'Confirmado'";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Comparar testes mtDNA";
> 		$text['dnatestscompare_atdna'] = "Comparar testes atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Mutações extra";
> 		$text['mrca'] = "Ancestral MRC";
> 		$text['ydna_test'] = "Testes Y-DNA";
> 		$text['mtdna_test'] = "Testes mtDNA (mitocondriais)";
> 		$text['atdna_test'] = "Testes atDNA (autosômicos)";
> 		$text['segment_start'] = "Início";
> 		$text['segment_end'] = "Fim";
> 		$text['suggested_relationship'] = "Sugerido";
> 		$text['actual_relationship'] = "Real";
> 		$text['12markers'] = "Marcadores 1-12";
> 		$text['25markers'] = "Marcadores 13-25";
> 		$text['37markers'] = "Marcadores 26-37";
> 		$text['67markers'] = "Marcadores 38-67";
> 		$text['111markers'] = "Marcadores 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Ao menos dois testes devem ser selecionados para comparar.";
670,671d785
< $text['birthabbr'] = "nasc.";
< $text['chrabbr'] = "bat.";
675d788
< $text['family'] = "Família"; //from getperson
678c791
< $text['alltrees'] = "Todas árvores";
---
> $text['alltrees'] = "Todas as árvores";
685d797
< $text['deathabbr'] = "fal.";  //from descend
706d817
< $text['burialabbr'] = "sep.";  //from descend
712d822
< $text['place'] = "Lugar";
715d824
< $text['marrabbr'] = "Cas.";
738d846
< $text['source'] = "Fonte";
766d873
< $text['repository'] = "Repositório";
770d876
< $text['findplaces'] = "Encontrar todas pessoas com eventos nestes local";
783c889
< $text['allmedia'] = "Toda mídia";
---
> $text['allmedia'] = "Todas as mídia";
795c901
< $text['bookmark'] = "Adicionar marcadores";
---
> $text['bookmark'] = "Adicionar marcador";
804d909
< $text['glang'] = "&amp;hl=pt-BR";
810c915
< $text['albclicksee'] = "Clicar para ver todos itens do álbum";
---
> $text['albclicksee'] = "Clicar para ver todos os itens do álbum";
813c918
< $text['missing'] = "Faltando";
---
> $text['missing'] = "Em falta";
816d920
< $text['none'] = "Nenhum";
828c932
< $text['rmargin'] = "Margem Direita";
---
> $text['rmargin'] = " Margem Direita";
835,838c939,942
< $text['ourhist'] = "Nossa História de Família";
< $text['ourhistanc'] = "Nossa História de Família e Ancestrais";
< $text['ourpages'] = "Nossas Páginas de Genealogia da Família";
< $text['pwrdby'] = "Este site é gerenciado por";
---
> $text['ourhist'] = "A Nossa História de Família";
> $text['ourhistanc'] = "A Nossa História de Família e Antepassados";
> $text['ourpages'] = "As Nossas Páginas de Genealogia da Família";
> $text['pwrdby'] = "Este site é produzido com ";
841c945
< $text['viewphotos'] = "Ver todas fotos";
---
> $text['viewphotos'] = "Ver todas as fotos";
843c947
< $text['whichbranch'] = "De que ramo você é?";
---
> $text['whichbranch'] = "De que ramo é?";
845c949
< $text['maintby'] = "Mantido por";
---
> $text['maintby'] = "Criado e gerenciado por";
852c956
< $text['mnusearchfornames'] = "Pesquisar Pessoa";
---
> $text['mnusearchfornames'] = "Buscar Pessoa";
855c959
< $text['mnusearch'] = "Pesquisar";
---
> $text['mnusearch'] = "Buscar";
861c965
< $text['mnuadvancedsearch'] = "Pesquisa Avançada";
---
> $text['mnuadvancedsearch'] = "Busca avançada";
871c975
< $text['mnuwhatsnew'] = "O que há de novo";
---
> $text['mnuwhatsnew'] = "Novidades";
908,910c1012,1014
< $text['emailagain'] = "Repita o email";
< $text['enteremail2'] = "Favor entrar com seu email novamente.";
< $text['emailsmatch'] = "Emails diferentes. Favor entrar com o mesmo email em ambos campos.";
---
> $text['emailagain'] = "Repita o e-mail";
> $text['enteremail2'] = "Favor entrar com seu e-mail novamente.";
> $text['emailsmatch'] = "E-mails diferentes. Favor entrar com o mesmo e-mail em ambos campos.";
924d1027
< $text['otherevents'] = "Outros eventos";
944c1047
< $text['dna_test'] = "DNA Test";
---
> $text['dna_test'] = "Teste de DNA";
952,953d1054
< $text['people_have'] = "pessoas têm ligado um teste de DNA para";
< $text['person_has'] = "pessoa tem ligado um teste de DNA para";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "Testes de DNA estão associados com";
> $text['testislinked'] = "Teste de DNA está associado com";
> 
> //added in 12.2
> $text['quicklinks'] = "Links rápidos";
> $text['yourname'] = "Seu nome";
> $text['youremail'] = "Seu endereço de e-mail";
> $text['liketoadd'] = "Qualquer informação que você gostaria de adicionar";
> $text['webmastermsg'] = "Mensagem do webmaster";
> $text['gallery'] = "Ver galeria";
> $text['wasborn_male'] = "nasceu";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "nasceu"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "foi batizado";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "foi batizado";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "morreu";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "morreu";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "foi enterrado"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "foi enterrado"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "foi cremado";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "foi cremado";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "casado";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "casado";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "divorciou-se";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "divorciou-se";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " em ";			// used as a preposition to the location
> $text['onthisdate'] = " em ";		// when used with full date
> $text['inthisyear'] = " em ";		// when used with year only or month / year dates
> $text['and'] = "e ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informação do Teste de DNA";
> //added in 13.0
> $text['visitor'] = "Visitante";
> 
> $text['popupnote2'] = " = Nova árvore";
> 
> //moved here in 14.0
> $text['zoomin'] = "Mais Zoom";
> $text['zoomout'] = "Menos Zoom";
> $text['scrollnote'] = "Observação: talvez seja necessário deslizar para a esquerda/direita ou para baixo para visualizar todo o diagrama.";
> $text['general'] = "Geral";
> 
> //changed in 14.0
> $text['otherevents'] = "Outros atributos/eventos";
> 
> //added in 14.0
> $text['times'] = "-";
> $text['connections'] = "Parentescos";
> $text['continue'] = "Continuar";
> $text['title2'] = "Título"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/PortugueseBR-UTF8/admintext.php TNG1403/languages/PortugueseBR-UTF8/admintext.php
25c25
< 		$admtext['addnewbranch'] = "Incluir novo Ramo";
---
> 		$admtext['addnewbranch'] = "Incluir um novo Ramo";
78c78
< 		$admtext['added'] = "Incluido";
---
> 		$admtext['added'] = "Incluído";
80d79
< 		$admtext['pleaseenter'] = "Por favor, informe um";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Por favor, selecione um arquivo para importar.";
> 		$admtext['addreplacedata'] = "Adicionar ou substituir sua genealogia (pode levar vários minutos, dependendo do tamanho de seu arquivo)";
> 		$admtext['fromyourcomputer'] = "Do seu computador";
> 		$admtext['importdata'] = "Importar Dados";
> 		$admtext['replace'] = "Substituir (na árvore selecionada)";
> 		$admtext['desttree'] = "�rvore de Destino";
> 		$admtext['selectdesttree'] = "Por favor, selecione ou informe uma árvore de destino.";
> 		$admtext['selectexisting'] = "Importar para";
> 		$admtext['ucaselast'] = "Todos os sobrenomes em maiúsculas";
> 		$admtext['norecalc'] = "Não recalcular a marcação de pessoas vivas";
> 		$admtext['autooffset'] = "Começar IDs com o 1º número disponível";
> 		$admtext['mustselecttree'] = "É necessário selecionar uma árvore antes de poder usar esta opção.";
> 		$admtext['onwebserver'] = "No servidor web (na pasta GEDCOM)";
> 		$admtext['imphints'] = "Dicas: Todos Dados Atuais significa todas pessoas, famílias e fontes (associações a mídias não são perdidas, desde que os IDs fiquem os mesmos). Registros são coincidentes quanto têm o mesmo ID. Novos registros são sempre adicionados. Anexar importa todos registros com novos IDs.";
> 		$admtext['destbranch'] = "Ramo de Destino (opcional)";
> 		$admtext['importlatlong'] = "Importar dados de latitude / longitude quando presentes";
> 		$admtext['opening'] = "Abrindo";
> 		$admtext['reopen'] = "Reabrindo";
> 		$admtext['uploading'] = "Carregando";
> 		$admtext['stop'] = "Parar";
> 		$admtext['stopped'] = "Importação interrompida";
> 		$admtext['resume'] = "Reiniciar";
> 		$admtext['neweronly'] = "Substituir somente se for mais novo";
> 		$admtext['oldimport'] = "Importar na versão antiga (sem barra de progresso)";
> 		$admtext['importgedcom'] = "Importar arquivo GEDCOM (opcionalmente zipado)";
> 		$admtext['stopbackup'] = "Pare! É recomendável fazer uma cópia de segurança antes de executar esta operação.";
> 		$admtext['importmedia'] = "Importar multimídia, se existir";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Assegure que os prefixos e sufixos (Configuração geral) estão corretos para este arquivo.";
> 		$admtext['chkimpsettings'] = "Verifique as configurações de importação para mais opções.";
> 		$admtext['eventsonly'] = "Importar apenas tipos de atributo/evento personalizados (nenhum dado é adicionado, substituído ou anexado)";
> 		$admtext['allevents'] = "Aceitar dados para todos novos tipos de atributo/evento";
> 		$admtext['finishingimporting'] = "Finalizando...";
> 		$admtext['fileuploadfailed'] = "Falha no upload do arquivo. A causa pode ser um arquivo grande demais. Tente enviar o arquivo por FTP para sua pasta GEDCOM e, em seguida, selecione e importe de lá.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Modificar Tipo de Evento Existente";
135,138d168
< 		$admtext['entertypedesc'] = "Por favor, escreva um tipo/descrição para este novo tipo de evento";
< 		$admtext['enterdisplay'] = "Por favor, escreva um texto de vídeo para este novo tipo de evento.";
< 		$admtext['existingeventtypeinfo'] = "Informações Existentes de Tipos de Eventos";
< 		$admtext['neweventtypeinfo'] = "Informação de Novo Tipo de Evento";
145,146d174
< 		$admtext['addnewevtype'] = "Incluir Novo Tipo de Evento";
< 		$admtext['createnewevtype'] = "Criar um registro de novo tipo de evento";
149,150d176
< 		$admtext['existingevtypes'] = "Tipos de Eventos Existentes";
< 		$admtext['edsevtypes'] = "Editar, excluir ou ordenar tipos de eventos incluidos anteriormente";
152d177
< 		$admtext['confdeleteevtype'] = "Tem certeza que quer excluir este tipo de evento?";
154d178
< 		$admtext['selectentertag'] = "Por favor, selecione ou informe um rótulo para este tipo de evento.";
208d231
< 		$admtext['changestoallevtypes'] = "Mudanças de todos os tipos de eventos";
214d236
< 		$admtext['BAPM'] = "Batismo";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Você tem certeza de que deseja excluir este tipo de evento? Todos os eventos deste tipo serão igualmente excluídos.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Adicionar um novo tipo";
> 		$admtext['createnewevtype'] = "Criar um novo tipo de atributo/evento";
> 		$admtext['modifyeventtype'] = "Editar tipo existente";
> 		$admtext['entertypedesc'] = "Insira um tipo/descrição para este novo tipo de atributo/evento.";
> 		$admtext['enterdisplay'] = "Insira uma string de exibição para este novo tipo de atributo/evento.";
> 		$admtext['existingeventtypeinfo'] = "Informações sobre um tipo de atributo/evento existente";
> 		$admtext['neweventtypeinfo'] = "Informações sobre um novo tipo de atributo/evento";
> 		$admtext['existingevtypes'] = "Tipos de atributo/evento existentes";
> 		$admtext['edsevtypes'] = "Editar, excluir ou classificar tipos de atributo/evento inseridos anteriormente";
> 		$admtext['selectentertag'] = "Selecione ou insira a tag para este tipo de atributo/evento.";
> 		$admtext['changestoallevtypes'] = "Alterações em todos os tipos de atributo/evento";
268d303
< 		$admtext['nobirthinfo'] = "Sem informação de nascimento";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Escolha<br/>foto<br/>padrão"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Salvar + Novos Pais";
> 		$admtext['savenewspouse'] = "Salvar + Novo Cônjuge";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Nascimento alternativo";
354d391
< 		$admtext['enterphotodesc'] = "Por favor, informe uma descrição para a imagem.";
388d424
< 		$admtext['photoowner'] = "Dono/Fonte";
417d452
< 		$admtext['imgmap'] = "Mapa da Imagem";
444c479
< 		$admtext['showmap'] = "Mostar o mapa e as fotos do cemitério sempre que for exibida esta imagem";
---
> 		$admtext['showmap'] = "Mostrar o mapa e as fotos do cemitério sempre que for exibida esta imagem";
490d524
< 		$admtext['mapinstr3'] = "Para ligar uma região desta fotografia a um indivíduo, primeiro selecione a árvore em que o indivíduo se encontra e depois crie um retângulo na área correspondente da fotografia. Para tal, clique no canto superior esquerdo do retângulo e arraste o cursor até o seu canto inferior direito. Alternativamente, você pode iniciar pelo canto superior esquerdo e arrastar o cursor até o canto inferior direito. Após, você deve selecionar o indivíduo na caixa de diálogo aberta. Com isso, o código necessário para estabelecer a ligação entre a região do mapa e o indivíduo é exibida na caixa abaixo. Repita o processo conforme necessário, ligando outras regiões da fotografia a indivíduos.";
495d528
< 		$admtext['removelink'] = "Remover Ligação";
502d534
< 		$admtext['eloptions'] = "Percorrer ou Excluir";
509d540
< 		$admtext['nolinks'] = "Ainda não há ligações";
518c549
< 		$admtext['alttd'] = "Tit altern/Desc";   //short abbreviation for "Alternate Title or Description"
---
> 		$admtext['alttd'] = "Tit. altern./Descr.";   //short abbreviation for "Alternate Title or Description"
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Mapa de Imagem HTML (para compatibilidade com versões anteriores)";
> 		$admtext['photoowner'] = "Proprietário do original";
> 		$admtext['nothumb'] = "Sem miniatura";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "O item não pôde ser adicionado, provavelmente porque o arquivo era muito grande. Por isso, não pôde ser carregado ou sua miniatura não pôde ser criada.";
> 		$admtext['moved'] = "Movido";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Insira um título ou uma descrição para esta mídia.";
> 		$admtext['mapinstr3'] = "Para vincular uma região desta foto a uma pessoa, família ou outra entidade, primeiro selecione a árvore e o tipo de entidade relevantes e, em seguida, desenhe um retângulo sobre a região desejada. Isso é feito clicando no canto superior esquerdo da região e depois arrastando para o canto inferior direito. Alternativamente, você pode clicar no canto superior esquerdo e depois clicar novamente no canto inferior direito. Uma caixa pop-up irá ajudá-lo a selecionar a pessoa ou entidade. Faça a seleção e repita esse processo conforme necessário para regiões adicionais. Clique em uma região existente para selecionar e arraste para mover ou clique no 'X' para excluir.";
596d633
< 		$admtext['foremptystring'] = "Para uma seqüência vazia, deixe este campo em branco e clique em \"Incluir >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instruções: Arraste ou clique duas vezes um item da lista à esquerda para movê-lo para a lista à direita. Arraste para cima e para baixo para reordenar. Clique duas vezes novamente para remover.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Para uma string vazia, deixe este campo em branco e clique em >>";
651,655d690
< 		$admtext['selectimportfile'] = "Por favor, selecione um arquivo para importar.";
< 		$admtext['importgedcom'] = "Importar GEDCOM (formato padrão 5.5)";
< 		$admtext['addreplacedata'] = "Adicionar ou substituir sua genealogia (pode levar vários minutos, dependendo do tamanho de seu arquivo)";
< 		$admtext['fromyourcomputer'] = "Do seu computador";
< 		$admtext['importdata'] = "Importar Dados";
657,660d691
< 		$admtext['replace'] = "Substituir (na árvore selecionada)";
< 		$admtext['desttree'] = "�rvore de Destino";
< 		$admtext['selectdesttree'] = "Por favor, selecione ou informe uma árvore de destino.";
< 		$admtext['selectexisting'] = "Importar para";
668,673d698
< 		$admtext['ucaselast'] = "Todos os sobrenomes em maiúsculas";
< 		$admtext['norecalc'] = "Não recalcular a marcação de pessoas vivas";
< 		$admtext['autooffset'] = "Começar IDs com o 1º número disponível";
< 
< 		$admtext['mustselecttree'] = "É necessário selecionar uma árvore antes de poder usar esta opção.";
< 		$admtext['importmedia'] = "Importar multimídia, se existir";
675d699
< 		$admtext['neweronly'] = "Substituir somente se for mais novo";
677,692d700
< 		$admtext['onwebserver'] = "No servidor web (na pasta GEDCOM)";
< 		$admtext['eventsonly'] = "Apenas importar eventos definidos pelo usuário (custom events)";
< 		$admtext['imphints'] = "Dicas: Todos Dados Atuais significa todas pessoas, famílias e fontes (associações a mídias não são perdidas, desde que os IDs fiquem os mesmos). Registros são coincidentes quanto têm o mesmo ID. Novos registros são sempre adicionados. Anexar importa todos registros com novos IDs.";
< 		$admtext['allevents'] = "Aceitar dados para todos novos Tipos de Evento";
< 		$admtext['destbranch'] = "Ramo de Destino (opcional)";
< 		$admtext['inframe'] = "(sem frame)";
< 		$admtext['getstart'] = "Iniciação";
< 		$admtext['importlatlong'] = "Importar dados de latitude / longitude quando presentes";
< 		$admtext['opening'] = "Abrindo";
< 		$admtext['reopen'] = "Reabrindo";
< 		$admtext['uploading'] = "Carregando";
< 		$admtext['stop'] = "Parar";
< 		$admtext['stopped'] = "Importação interrompida";
< 		$admtext['resume'] = "Reiniciar";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Registro de Alterações";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Importar na versão antiga (sem barra de progresso)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Atualizar";
> 		$admtext['need_upgrade'] = "Concluir estas instruções de atualização";
> 		$admtext['upgrade_missing'] = "O arquivo de atualização parece estar faltando, então possivelmente você já tenha terminado.";
> 		$admtext['delete_upgrade'] = "Quando tiver terminado, clique aqui para excluir a atualização e retornar ao menu.";
723d733
< 		$admtext['author'] = "Autor";
804,809c814,819
< 		$admtext['momside'] = "Rótulo para a parte de mãe"; //8
< 		$admtext['dadside'] = "Rótulo para a parte do pai"; //8
< 		$admtext['momperson'] = "ID da pessoa por parte de mãe"; //8
< 		$admtext['momtree'] = "ID da árvore por parte de mãe"; //8
< 		$admtext['dadperson'] = "ID da pessoa por parte de pai"; //8
< 		$admtext['dadtree'] = "ID da árvore por parte de pai"; //8
---
> 		$admtext['momside'] = "Rótulo para a parte de mãe"; //8, 20
> 		$admtext['dadside'] = "Rótulo para a parte do pai"; //8, 20
> 		$admtext['momperson'] = "ID da pessoa por parte de mãe"; //8, 20
> 		$admtext['momtree'] = "ID da árvore por parte de mãe"; //8, 20
> 		$admtext['dadperson'] = "ID da pessoa por parte de pai"; //8, 20
> 		$admtext['dadtree'] = "ID da árvore por parte de pai"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Cabeçalho das aspas";
> 		$admtext['quotesubhead'] = "Subtítulo das aspas";
> 		$admtext['sniptitle'] = "Título da feature";
> 		$admtext['snipname'] = "Nome do recurso";
> 		$admtext['snipinfoone'] = "Primeira linha do recurso";
> 		$admtext['snipinfotwo'] = "Característica da segunda linha";
> 		$admtext['snipimage'] = "Imagem da característica";
> 		$admtext['snipperson'] = "ID da pessoa do recurso";
> 		$admtext['sniptree'] = "ID da árvore do recurso";
> 		$admtext['quote'] = "Citação";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Título da característica 7";
> 		$admtext['featuretitle8'] = "Título da característica 8";
> 		$admtext['featuretitle9'] = "Título da característica 9";
> 		$admtext['featurethumb9'] = "Miniatura da característica 9"; //15
> 		$admtext['featurelink9'] = "Link da característica 9"; //15
> 		$admtext['featurepara9'] = "Parágrafo da característica"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Imagem Esquerda do Cabeçalho";
> 		$admtext['rightimg'] = "Imagem Direita do Cabeçalho";
> 		$admtext['photoption'] = "As opções de fotos são<br />&nbsp;&nbsp;(estática ou aleatória)";
> 		$admtext['randomphotowidth'] = "Largura da Foto Aleatória";
> 		$admtext['randomphotoheight'] = "Altura da Foto Aleatória";
> 		$admtext['randomphotomediatypeID'] = "Coleção das Fotos Aleatórias";
> 		$admtext['momheading'] = "Cabeçalho da Família Materna";
> 		$admtext['mompara'] = "Parágrafo da Família Materna";
> 		$admtext['mompagelink'] = "Link da Família Materna";
> 		$admtext['dadheading'] = "Cabeçalho da Família Paterna";
> 		$admtext['dadpara'] = "Parágrafo da Família Paterna";
> 		$admtext['dadpagelink'] = "Link da Família Paterna";
> 		$admtext['spmomheading'] = "Cabeçalho da Família Materna do Cônjuge";
> 		$admtext['spmompara'] = "Parágrafo da Família Materna do Cônjuge";
> 		$admtext['spmompagelink'] = "Link da Família Materna do Cônjuge";
> 		$admtext['spmomside'] = "Rótulo do Lado Materno do Cônjuge";
> 		$admtext['spdadside'] = "Rótulo do Lado Paterno do Cônjuge";
> 		$admtext['spmomperson'] = "PersonID do Lado Materno do Cônjuge";
> 		$admtext['spmomtree'] = "TreeID do Lado Materno do Cônjuge";
> 		$admtext['spdadheading'] = "Cabeçalho da Família Paterna do Cônjuge";
> 		$admtext['spdadpara'] = "Parágrafo da Família Paterna do Cônjuge";
> 		$admtext['spdadpagelink'] = "Link da Família Paterna do Cônjuge";
> 		$admtext['spdadperson'] = "PersonID do Lado Paterno do Cônjuge";
> 		$admtext['spdadtree'] = "TreeID do Lado Paterno do Cônjuge";
> 		$admtext['storiesheading'] = "Nossas Histórias de Família";
> 		$admtext['nbrsurnames'] = "Número de sobrenomes<br />&nbsp;&nbsp; na Nuvem de Sobrenomes";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Miniatura da característica";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Título do slide";
> 		$admtext['slideimg'] = "Imagem do slide";
> 		$admtext['slideheadline'] = "Cabeçalho do slide";
> 		$admtext['slidetext'] = "Texto do slide";
> 		$admtext['slidelink'] = "Link do slide";
> 		$admtext['slidelinktext'] = "Nome do link do slide";
> 		$admtext['featurelink'] = "Link do recurso";
> 		$admtext['featurelinktext'] = "Nome do link do recurso";
> 		$admtext['featuretitle'] = "Título do recurso";
> 		$admtext['featuresub'] = "Subtítulo do recurso";
> 		$admtext['quoteimg'] = "Imagem de citação";
> 		$admtext['quotelink'] = "Link de citação";
> 		$admtext['quotelinktext'] = "Nome do link de citação";
> 		$admtext['sidebarpara'] = "Parágrafo da barra lateral";
> 		$admtext['sidebarlink'] = "Link da barra lateral";
> 		$admtext['sidebarlinktext'] = "Nome do link da barra lateral";
> 		$admtext['sidebarimg'] = "Imagem da barra lateral";
> 		$admtext['sidebartitle'] = "Título da barra lateral";
> 		$admtext['sidebarsub'] = "Subtítulo da barra lateral";
> 		$admtext['snipheadline'] = "Título de destaque";
> 		$admtext['snipsubhead'] = "Subtítulo de destaque";
> 		$admtext['snipimg'] = "Imagem de destaque";
> 		$admtext['sniplink'] = "Link de destaque";
> 		$admtext['sniplinktext'] = "Nome do link de destaque";
> 		$admtext['linktext'] = "Texto do link";
> 		$admtext['footerheadline'] = "Título do rodapé";
> 		$admtext['footerpara'] = "Texto do rodapé";
> 		$admtext['footerlink'] = "Link do rodapé";
> 		$admtext['footerlinktext'] = "Nome do link do rodapé";
> 		$admtext['footerheadline'] = "Título do rodapé";
> 		$admtext['footerpara'] = "Texto do rodapé";
> 		$admtext['footerlink'] = "Link do rodapé";
> 		$admtext['footerlinktext'] = "Nome do link do rodapé";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG requer versão 5.3 ou posterior.)";
---
> 		$admtext['phpreq'] = "(TNG requer versão 7.0 ou posterior.)";
985c1078
< 		$admtext['shownames'] = "Mostar nomes de pessoas vivas";
---
> 		$admtext['shownames'] = "Mostrar nomes de pessoas vivas";
1115c1208
< 		$admtext['maxpedgens'] = "Nº Máximo de Gerações na �rvore de Ascendentes";
---
> 		$admtext['maxpedgens'] = "No máximo de gerações";
1232d1324
< 		//added in 8.0.0
1234c1326
< 		$admtext['maxrels'] = "Max Parentescos";
---
> 		$admtext['maxrels'] = "Max parentescos";
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1333,1334c1418,1419
< 		$admtext['sitekey'] = "reCAPTCHA Site Key";
< 		$admtext['secret'] = "reCAPTCHA Secret";
---
> 		$admtext['sitekey'] = "Cahve reCAPTCHA do sítio";
> 		$admtext['secret'] = "Segredo do reCAPTCHA";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Alterar prefixos carregados para casar com os ajustes do TNGs";
> 		$admtext['sortevents'] = "Classificar eventos por";
> 		$admtext['sortbydate'] = "Data do evento";
> 		$admtext['sortbytype'] = "Tipo do evento";
> 		$admtext['allowsuggest'] = "Permitir que visitantes façam sugestões";
> 		$admtext['livingchecked'] = "Ligar o sinal de vivo para novas pessoas e famílias";
> 		$admtext['maxmarried'] = "Marcar a família como viva se casada<br/>a menos que este número de anos";
> 		$admtext['imagetags'] = "Retângulos";
> 		$admtext['allowcsv'] = "Permitir baixar relatórios como CSV";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Opções de backup";
> 		$admtext['dosql'] = "Exportar como SQL";
> 		$admtext['dodrop'] = "Incluir DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Incluir CREATE TABLE";
> 		$admtext['onrestore'] = "Restaurar as opções";
> 		$admtext['dodel'] = "Excluir o conteúdo anterior primeiro";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Eventos alternativos de nascimento";
> 		$admtext['dtformat'] = "Formatos de tabela";
> 		$admtext['conchart'] = "Gráfico de parentescos (busca avançada)";
> 		$admtext['maxropt'] = "No. máx. de execuções de busca";
> 		$admtext['maxlopt'] = "Tamanho máximo de um caminho de parentesco";
> 		$admtext['showtxtopt'] = "Exibir declaração textual de caminho";
> 		$admtext['compactboxopt'] = "Mostrar retângulos de pessoas em formato compacto";
> 		$admtext['sortbyopt'] = "Ordenar caminhos por";
> 		$admtext['anchoridopt'] = "ID âncora";
> 		$admtext['maxmopt'] = "Número máximo de casamentos em um parentesco";
> 		$admtext['saveincfg'] = "Armazenar no caminho de configuração (ver Configuração geral)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Não pode ser geocodificado";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Não geocodificar";
1436d1549
< 		$admtext['backtosecondary'] = "Voltar para Processos Secundários";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "De volta para os utilitários pós-importação";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Excluir notas";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Compacte (Zip) e inclua arquivos de mídia";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Mostrar apenas usuários desabilitados";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Também enviar aos administradores quando uma única árvore for selecionada";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1722c1839
< 		$admtext['showlogfile'] = "Mostar o Log de acões do gerente de Mods";
---
> 		$admtext['showlogfile'] = "Mostrar o Log de ações do gerente de Mods";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Todos os Mods";
> 		$admtext['installedmods'] = "Apenas os Mods instalados";
> 		$admtext['partinstmods'] = "Mods instalados + parcialmente instalados";
> 		$admtext['showanalyzeractions'] = "Mostrar ações no analisador";
> 		$admtext['badchar'] = "Caractere inválido";
1886d2008
< 		$admtext['test_number'] = "Número do teste";
1916d2037
< 		$admtext['xtra_mut'] = "Mutações extra";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Número do teste";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Mantenha o teste privativo";
> 		$admtext['multivalues'] = "Use hifens entre múltiplos valores";
> 		$admtext['changestogroup'] = "Alterações do Grupo de DNA";
> 		$admtext['modifydnagroup'] = "Editar Grupo de DNA existente";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Vincular este teste de DNA a uma pessoa";
1924c2054
< $admtext['cannotexecutequery'] = "Não dá para fazer a consulta";
---
> $admtext['cannotexecutequery'] = "Não é possível fazer a consulta";
1966d2095
< $admtext['otherevents'] = "Outros Eventos";
2051,2052d2179
< $admtext['savereturn'] = "Voltar a esta página";
< $admtext['saveback'] = "Voltar ao menu";
2059,2060d2185
< $admtext['secondary'] = "Processos Secundários";
< $admtext['commas'] = "Separar múltiplas entradas com vírgulas";
2102c2227
< $admtext['nobranch'] = "Nenhum Ramo";
---
> $admtext['nobranch'] = "Nenhum ramo";
2130,2131d2254
< $admtext['secondarymaint'] = "Processos Secundários";
< $admtext['customeventtypes'] = "Tipos de Eventos Personalizados";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tipo";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Sobrenomes";
> $admtext['subhead'] = "Subtítulo";
> $admtext['image'] = "Imagem";
> $admtext['author'] = "Autor";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Iniciação";
> $admtext['showlog'] = "Registro de Alterações";
> $admtext['nobirthinfo'] = "Sem informação de nascimento";
> //changed in 13.0
> $admtext['savereturn'] = "Salvar + Permanecer";
> $admtext['saveback'] = "Salvar + Sair";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Todos itens excluídos com sucesso.";
> $admtext['private'] = "Privado";
> $admtext['imgtags'] = "Rótulos de Imagens";
> 
> $admtext['removelink'] = "Remover Ligação";
> $admtext['eloptions'] = "Percorrer ou Excluir";
> $admtext['pleaseenter'] = "Por favor, informe um";
> 
> $admtext['nolinks'] = "Ainda não há ligações";
> $admtext['nogeocode'] = "Não pode ser geocodificado";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Escolha<br/>foto<br/>padrão"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Tipos de atributo/evento";
> $admtext['secondary'] = "Utilitários pós-importação";
> $admtext['otherevents'] = "Outros atributos/eventos";
> //added in 14.0
> $admtext['newlinks'] = "Links criados";
> $admtext['newcemlinks'] = "Links de cemitério criados";
> $admtext['utility'] = "Utilitário";
> $admtext['linktype'] = "Tipo";
> $admtext['move'] = "Mover";
> $admtext['copy'] = "Copiar";
> $admtext['title2'] = "Título"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/PortugueseBR-UTF8/alltext.php TNG1403/languages/PortugueseBR-UTF8/alltext.php
50,51c50,51
< $text['forgot1'] = "<strong>Esqueceu seu nome de usuário ou senha?</strong><br />Entre seu email abaixo para receber seu nome de usuário.";
< $text['forgot2'] = "Entre seu email acima e nome de usuário abaixo para gerar uma nova senha.";
---
> $text['forgot1'] = "<strong>Esqueceu seu nome de usuário ou senha?</strong><br />Entre seu e-mail abaixo para receber seu nome de usuário.";
> $text['forgot2'] = "Entre seu e-mail acima e nome de usuário abaixo para gerar uma nova senha.";
53,56c53,56
< $text['usersent'] = "Seu nome de usuário foi enviado para seu email.";
< $text['pwdsent'] = "Sua senha temporária foi gerada e enviada para seu email.";
< $text['loginnotsent2'] = "O email fornecido não corresponde a nenhuma conta de usuário. Nenhuma informação foi enviada para seu email.";
< $text['loginnotsent3'] = "O email e o nome de usuário fornecidos não correspondem a nenhuma conta de usuário. Nenhuma informaão foi enviada para seu email.";
---
> $text['usersent'] = "Seu nome de usuário foi enviado para seu e-mail.";
> $text['pwdsent'] = "Sua senha temporária foi gerada e enviada para seu e-mail.";
> $text['loginnotsent2'] = "O e-mail fornecido não corresponde a nenhuma conta de usuário. Nenhuma informação foi enviada para seu e-mail.";
> $text['loginnotsent3'] = "O e-mail e o nome de usuário fornecidos não correspondem a nenhuma conta de usuário. Nenhuma informaão foi enviada para seu e-mail.";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
134c127
< $text['friday'] = "Sexta";
---
> $text['friday'] = "Sexta-feira";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
144c134
< $text['enteremail'] = "Por favor, forneça um e-mail.";
---
> $text['enteremail'] = "Please enter a valid e-mail address.";
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Ocorreu um erro. Isto pode ter sido causado por um problema de configuração, uma atualização incompleta de software ou um erro de programa. Caso você seja o proprietário do sítio, pode contactar o suporte do TNG para ajuda. Por favor, copie a consulta abaixo em sua mensagem ao suporte.";
163d147
< //moved here in 12.0.0
165c149
< $admtext['dna_groups'] = "DNA Groups";
---
> $admtext['dna_groups'] = "Grupos de DNA";
173d156
< //added here in 12.0.0
175,176c158
< $text['test_number'] = "Número/Nome do Teste";
< $text['test_info_display'] = "Informação sobre o Teste para Mostrar";
---
> $text['test_info_display'] = "Informação para mostrar sobre o teste";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Número/Nome do Teste";
> $admtext['match_date'] = "Data da Coincidência";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Seção de Relacionamento";
> $admtext['relationship_range'] = "Faixa de Relacionamento";
> $admtext['suggested_relationship'] = "Sugerido";
> $admtext['actual_relationship'] = "Relacionamento Real";
> $admtext['related_side'] = "Ramo Relacionado";
> $admtext['shared_dna'] = "DNA compartilhado";
> $admtext['shared centimorgans'] = "Total de cMs compartilhados";
> $admtext['shared_segments'] = "Segmentos compartilhados";
> $admtext['largest_segment'] = "Maior Segmento";
> $admtext['chromosome'] = "Número do Chromosoma";
> $admtext['segment_start'] = "Início do Segmento";
> $admtext['segment_end'] = "Fim do Segmento";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "SNPs Coincidentes";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Teste privado";
> $text['shared_dna'] = "Segmento de DNA compartilhado";
> $text['for_match'] = "para esta coincidência";
> $admtext['keeptest'] = "Privacidade do Teste";
> $admtext['keepname'] = "Provacidade do Nome";
> $admtext['allgroups'] = "Todos Grupos";
> $admtext['alltypes'] = "Todos Tipos";
> $admtext['generation_num'] = "Gerações de Sobrenomes de Ancestrais";
> 
> $text['birthabbr'] = "nasc.";
> $text['chrabbr'] = "bat.";
> $text['deathabbr'] = "fal.";  //from descend
> $text['burialabbr'] = "sep.";  //from descend
> $text['marrabbr'] = "cas.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Encontrar todos indivíduos com eventos neste local";
> $text['firstpage'] = "Primeira páginas";
> $text['lastpage'] = "Última página";
> 
> //changed in 13.0.0
> $text['problem'] = "Ocorreu um erro no software TNG. Algumas alternativas para resolvê-lo são:<p>Se você acabou de instalar uma atualização do TNG, talvez tenha inadvertidamente saltado um dos passos da instalação. Retorne ao arquivo leia-me (readme.html) da atualização e releia as instruções. Particularmente, preste atenção ao passo referente à atualização do banco de dados.</p><p>Se você acabou de fazer uma nova instalação do TNG, talvez tenha deixado de criar as tabelas no banco de dados. Retorne ao arquivo readme.html para encontrar este passo.</p><p>Se você é o proprietário deste sítio, pode contactar o suporte do TNG para assistência com este problema. Por favor copie e cole a consulta abaixo em sua mensagem.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Nenhum ramo";
> 
> //added in 14.0
> $text['oneyear'] = "ano";
> $text['pwdcodelink'] = "Clique neste link para receber uma senha temporária";
> $text['pwdcodesent'] = "Um link de redefinição de senha foi enviado para seu endereço de e-mail.";
> $text['moved'] = "Movido";
> $text['citation'] = "Citação";
> $text['other'] = "Outro";
> $text['death'] = "Falecimento";
> $text['burial'] = "Sepultamento";
> $text['cremation'] = "Cremação";
> $text['marriage'] = "Casamento";
> $text['divorce'] = "Divórcio";
> $text['bylength'] = "Passos";
> $text['bymarriages'] = "Casamentos";
> $text['none'] = "Nenhum";
> 
> //moved here in 14.0
> $text['family'] = "Família";
> $text['source'] = "Fonte";
> $text['repository'] = "Repositório";
> $text['place'] = "Lugar";
> $admtext['BAPM'] = "Batismo";
> 
> $text['glang'] = "pt-BR";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/PortugueseBR-UTF8/text.php TNG1403/languages/PortugueseBR-UTF8/text.php
5c5
< 		$text['browseallsources'] = "Mostrar todas fontes";
---
> 		$text['browseallsources'] = "Mostrar todas as fontes";
14c14
< 		$text['browseallrepos'] = "Folhar pelos arquivos";
---
> 		$text['browseallrepos'] = "Folhear os arquivos";
22,23c22,23
< 		$text['sitemaint'] = "Manutenção do site em andamento";
< 		$text['standby'] = "O site está temporariamente fora do ar por manutenção na base de dados. Favor tentar novamente depois de alguns minutos. Se o site permanecer fora do ar por um período mais longo, favor <a href=\"suggest.php\">contatar o proprietário do site</a>.";
---
> 		$text['sitemaint'] = "Site em manutenção";
> 		$text['standby'] = "O site está temporariamente fora do ar para manutenção da base de dados. Por favor tente novamente depois de alguns minutos. Se o site permanecer fora do ar por um período mais longo, por favor <a href=\"suggest.php\">contacte o proprietário do site</a>.";
40c40
< 		$text['yourname'] = "Seu nome";
---
> 		$text['yourname'] = "O seu nome";
45,49c45,49
< 		$text['mailsent'] = "Obrigado. Sua mensagem foi enviada.";
< 		$text['mailnotsent'] = "Sua mensagem não pode ser enviada. Favor contatar xxx diretamente através do e-mail yyy.";
< 		$text['mailme'] = "Enviar uma cópia a este endereço";
< 		$text['entername'] = "Por favor, entre seu nome";
< 		$text['entercomments'] = "Por favor, entre seus comentários";
---
> 		$text['mailsent'] = "Obrigado. A sua mensagem foi enviada.";
> 		$text['mailnotsent'] = "A sua mensagem não pôde ser enviada. Por favor, contacte o Administrador do site directamente através do e-mail luis@@belard.pt.";
> 		$text['mailme'] = "Enviar uma cópia para este endereço";
> 		$text['entername'] = "Por favor, indique o seu nome";
> 		$text['entercomments'] = "Por favor, escreva os seus comentários";
59c59
< 		$text['pp'] = "pp."; //page abbreviation
---
> 		$text['pp'] = "pg."; //page abbreviation
66c66
< 		$text['received'] = "Sua sugestão foi enviada ao administrador.";
---
> 		$text['received'] = "A sua sugestão foi enviada ao Administrador.";
69d68
< 		$text['general'] = "Geral";
78c77,78
< 		$text['relcalc'] = "Computar relações de parentesco";
---
> 	case "connections":
> 		$text['relcalc'] = "Busca simples de parentescos (parentes consanguíneos e seus cônjuges)";
82c82
< 		$text['calculate'] = "Computar";
---
> 		$text['calculate'] = "Buscar";
91c91
< 		$text['notrelated'] = "As duas pessoas não têm parentesco em xxx gerações."; //xxx will be replaced with number of generations
---
> 		$text['notrelated'] = "As duas pessoas não têm parentesco consanguíneo entre si em xxx gerações."; //xxx will be replaced with number of generations
98,100c98,100
< 		$text['uncle'] = "tio xxx de";
< 		$text['aunt'] = "tia xxx de";
< 		$text['uncleaunt'] = "tio/tia xxx de";
---
> 		$text['uncle'] = "xxx tio de";
> 		$text['aunt'] = "xxx tia de";
> 		$text['uncleaunt'] = "xxx tio/tia de";
104c104
< 		$text['removed'] = "vezes removido";
---
> 		$text['removed'] = "vezes afastado";
117c117
< 		$text['great'] = "grande";
---
> 		$text['great'] = "bis";
127,132c127,132
< 		$text['mcousin'] = "xxx primo yyy de";  //male cousin; xxx = cousin number, yyy = times removed
< 		$text['fcousin'] = "xxx prima yyy de";  //female cousin
< 		$text['cousin'] = "xxx primo/prima yyy de";
< 		$text['mhalfcousin'] = "xxx meio-primo yyy de";  //male cousin
< 		$text['fhalfcousin'] = "xxx meia-prima yyy de";  //female cousin
< 		$text['halfcousin'] = "xxx meio-primo yyy de";
---
> 		$text['mcousin'] = "primo xxxº yyy de";  //male cousin; xxx = cousin number, yyy = times removed
> 		$text['fcousin'] = "prima xxxª yyy de"; //female cousin
> 		$text['cousin'] = "primo/primaxxxº yyy de";
> 		$text['mhalfcousin'] = "meio-primo xxxº yyy de"; //male cousin
> 		$text['fhalfcousin'] = "meia-prima xxxª yyy de"; //female cousin
> 		$text['halfcousin'] = "meio-primo xxxº yyy de";
134c134
< 		$text['oneremoved'] = "removido uma vez";
---
> 		$text['oneremoved'] = "uma vez afastado";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Buscar parentscos";
> 		$text['findrel2'] = "inclui parentes não-consanguíneos";
> 		$text['makeme2nd'] = "Usar meu ID";
> 		$text['usebookmarks'] = "Usar marcadores";
> 		$text['select2inds'] = "Selecione duas pessoas.";
> 		$text['indinfofor'] = "Informações pessoais para";
> 		$text['nobookmarks'] = "Não há marcador para usar";
> 		$text['bkmtitle'] = "Pessoas encontradas em marcadores";
> 		$text['bkminfo'] = "Selecionar a pessoa:";
> 		$text['sortpathsby'] = "Classificar caminhos por número de";
> 		$text['sortbyshort'] = "Classificar por";
> 		$text['bylengthshort'] = "Comprimento";
> 		$text['badID1'] = ": ID da pessoa1 inválido - volte e corrija";
> 		$text['badID2'] = ": ID da pessoa2 inválido - volte e corrija";
> 		$text['notintree'] = ": a pessoa com este ID não está na árvore atual.";
> 		$text['sameperson'] = "Os dois indivíduos são a mesma pessoa.";;
> 		$text['nopaths'] = "Estas pessoas não têm parentesco.";
> 		$text['nopaths1'] = "Não há outros parentescos de comprimento menor que xxx";
> 		$text['nopaths2'] = "em xxx passos de busca";
> 		$text['longestpath'] = "(o caminho mais longo verificado até agora tem xxx passos)";
> 		$text['relevantpaths'] = "Número de diferentes caminhos relevantes encontrados: xxx";
> 		$text['skipMarr'] = "(além disso, o número de caminhos encontrados mas não exibidos devido a número excessivo de casamentos é: xxx)";
> 		$text['mjaor'] = "ou";
> 		$text['connectionsto'] = "Parentescos com ";
> 		$text['findanotherpers'] = "Buscar outra pessoa...";
> 		$text['sometimes'] = "(Às vezes, verificar um número diferente de gerações produz um resultado diferente.)";
> 		$text['anotherpath'] = "Busca avançada de parentescos";
> 		$text['xpath'] = "Caminho ";
> 		$text['primary'] = "Pessoa inicial"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Pessoa final";
> 		$text['parent'] = "Pai/mãe";
> 		$text['mhfather'] = "seu pai";
> 		$text['mhmother'] = "sua mãe";
> 		$text['mhhusband'] = "seu marido";
> 		$text['mhwife'] = "sua esposa";
> 		$text['mhson'] = "seu filho";
> 		$text['mhdaughter'] = "sua filha";
> 		$text['fhfather'] = "seu pai";
> 		$text['fhmother'] = "sua mãe";
> 		$text['fhhusband'] = "seu marido";
> 		$text['fhwife'] = "sua esposa";
> 		$text['fhson'] = "seu filho";
> 		$text['fhdaughter'] = "sua filha";
> 		$text['hfather'] = "pai";
> 		$text['hmother'] = "mãe";
> 		$text['hhusband'] = "marido";
> 		$text['hwife'] = "esposa";
> 		$text['hson'] = "filho";
> 		$text['hdaughter'] = "filha";
> 		$text['maxruns'] = "Número máximo de caminhos por verificar";
> 		$text['maxrshort'] = "Nº máximo de caminhos";
> 		$text['maxlength'] = "Caminhos de relacionamento não maiores que";
> 		$text['maxlshort'] = "Comprimento máximo";
> 		$text['xstep'] = "passo";
> 		$text['xsteps'] = "passos";
> 		$text['xmarriages'] = "xxx casamentos";
> 		$text['xmarriage'] = "1 casamento";
> 		$text['showspouses'] = "Mostrar ambos os cônjuges";
> 		$text['showTxt'] = "Mostrar descrição textual do caminho";
> 		$text['showTxtshort'] = "Descrição textual";
> 		$text['compactBox'] = "Compactar os retângulos de indivíduo";
> 		$text['compactBoxshort'] = "Retângulos compactados";
> 		$text['paths'] = "Caminhos";
> 		$text['dospouses2'] = "Mostrar cônjuges";
> 		$text['maxmopt'] = "Número máximo de casamentos por parentesco";
> 		$text['maxm'] = "Max casamentos";
> 		$text['arerelated'] = "Estas pessoas têm parentesco consanguíneo - seu relacionamento é mostrado no caminho 1";
> 		$text['simplerel'] = "Busca simples de parentescos";
182,183c251,252
< 		$text['husband'] = "Pai";
< 		$text['wife'] = "Mãe";
---
> 		$text['husband'] = "Marido";
> 		$text['wife'] = "Mulher";
196d264
< 		$text['scrollnote'] = "Observação: talvez seja necessário rolar para a direita ou para baixo para visualizar todo o diagrama.";
199d266
< 		$text['popupnote2'] = " = Nova árvore";
215c282
< 		$text['paternal'] = "Lado paterno";
---
> 		$text['paternal'] = "lado paterno";
218c285
< 		$text['gen2'] = "Pais ";
---
> 		$text['gen2'] = "Pais";
221c288
< 		$text['gen5'] = "Tataravós 16";
---
> 		$text['gen5'] = "Trisavós 16";
231,232c298,299
< 		$text['regformat'] = "Formato Registro";
< 		$text['extrasexpl'] = "Se houver textos ou fotos para estas pessoas, ícones correspondentes aparecerão junto a seus nomes.";
---
> 		$text['regformat'] = "Formato de Registro";
> 		$text['extrasexpl'] = "Se houver textos ou fotos para estas pessoas, os ícones correspondentes aparecerão junto aos seus nomes.";
254c321
< 		$text['fcmlogin'] = "Favor fazer login para ver mais detalhes";
---
> 		$text['fcmlogin'] = "Por favor faça login para ver mais detalhes";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabelas";
> 		$text['dtchildren'] = "Filhos";
> 		$text['dtgrandchildren'] = "Netos";
> 		$text['dtggrandchildren'] = "Bisnetos";
> 		$text['dtgggrandchildren'] = "netos"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "-1"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Sem descendentes";
> 		$text['dtgen'] = "Ger";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Selecionar";
> 		$text['dteachfulltable'] = "Cada tabela completa terá";
> 		$text['dtrows'] = "linhas";
> 		$text['dtdisplayingtable'] = "Exibindo tabela";
> 		$text['dtgototable'] = "Ir para tabela:";
> 		$text['fcinstrdn'] = "Mostrar família com cônjuge";
> 		$text['fcinstrup'] = "Mostrar família com os pais";
> 		$text['fcinstrplus'] = "Selecione outros cônjuges";
> 		$text['fcinstrfam'] = "Selecione outros pais";
272c358
< 		$text['allreports'] = "Todos relatórios";
---
> 		$text['allreports'] = "Todos os relatórios";
288,289c374,375
< 		$text['tryagain'] = "Favor tentar novamente";
< 		$text['joinwith'] = "Conectivo lógico";
---
> 		$text['tryagain'] = "Por favor tente novamente";
> 		$text['joinwith'] = "Conector lógico";
292c378
< 		$text['showspouse'] = "Mostre cônjuge; em caso de vários cônjuges, serão mostradas duplicatas";
---
> 		$text['showspouse'] = "Mostrar cônjuge; em caso de vários cônjuges, serão mostradas duplicatas";
299c385
< 		$text['resetall'] = "Limpar todos valores";
---
> 		$text['resetall'] = "Limpar todos os valores";
339c425
< 		$text['mysphoto'] = "Fotos Misteriosas";
---
> 		$text['mysphoto'] = "Fotos Procuradas";
343c429
< 		$text['moreinfo'] = "Mais Informação:";
---
> 		$text['moreinfo'] = "Mais Informações:";
381,383c467
< 		$text['firstpage'] = "Primeira páginas";
< 		$text['lastpage'] = "Última página";
< 		$text['photoowner'] = "Proprietário/fonte";
---
> 		$text['photoowner'] = "Proprietário do original";
397c481
< 		$text['iptc115'] = "Fonte des Fotografias";
---
> 		$text['iptc115'] = "Fonte das Fotografias";
414,416c498,500
< 		$text['allalbums'] = "Todos álbuns";
< 		$text['slidestop'] = "Suspender apresentação";
< 		$text['slideresume'] = "Reiniciar apresentação";
---
> 		$text['allalbums'] = "Todos os álbuns";
> 		$text['slidestop'] = "Suspender a apresentação";
> 		$text['slideresume'] = "Reiniciar a apresentação";
418,419c502,503
< 		$text['minussecs'] = "menos 0.5 segundos";
< 		$text['plussecs'] = "mais 0.5 segundos";
---
> 		$text['minussecs'] = "menos 0,5 segundos";
> 		$text['plussecs'] = "mais 0,5 segundos";
428,429c512,513
< 		$text['allburials'] = "Todos sepultamentos";
< 		$text['moreinfo'] = "Mais Informação:";
---
> 		$text['allburials'] = "Todos os sepultamentos";
> 		$text['moreinfo'] = "Mais Informações:";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Alternar Rótulos";
461c547
< 		$text['placescont'] = "Mostar todos lugares que contém ...";
---
> 		$text['placescont'] = "Mostrar todos lugares que contém ...";
464c550
< 		$text['top30places'] = "xxx lugares com mais indivíduos";
---
> 		$text['top30places'] = "xxx maiores lugares";
504c590
< 		
---
> 
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
558c642
< 		$text['ackmessage'] = "Sua solicitação de uma conta de usuário foi recebida. Sua conta permanecerá inativa até que seja revista pelo administrador do sítio. Você será notificado por email, tão logo a solicitação seja aprovada.";
---
> 		$text['ackmessage'] = "Sua solicitação de uma conta de usuário foi recebida. Sua conta permanecerá inativa até que seja revista pelo administrador do sítio. Você será notificado por e-mail, tão logo a solicitação seja aprovada.";
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Repetir nova senha";
> 		$text['resetsuccess'] = "Sucesso: a senha foi redefinida";
> 		$text['resetfail'] = "Falha: Senha não redefinida";
> 		$text['failreason0'] = " (erro desconhecido de banco de dados)";
> 		$text['failreason2'] = " (você não tem permissão para alterar sua senha)";
> 		$text['failreason3'] = " (as senhas não correspondem)";
582c673
< 		$text['avglifespan'] = "Tempo média de vida";
---
> 		$text['avglifespan'] = "Tempo médio de vida";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total de citações de fontes";
618d710
< 		$text['loginfirst'] = "Você deve fazer login (entrar) primeiro.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Foram detectados registros de usuário pré-existentes. Para prosseguir, faça login primeiro ou remova todos registros da tabela de usuários.";
629,632c723,724
< 		$text['zoomin'] = "Mais Zoom";
< 		$text['zoomout'] = "Menos Zoom";
< 		$text['magmode'] = "Modo de magnificação";
< 		$text['panmode'] = "Mode de varredura";
---
> 		$text['magmode'] = "Modo de ampliação";
> 		$text['panmode'] = "Modo de varredura";
637c729
< 		$text['opennw'] = "Abrir imagem em uma nova janela";
---
> 		$text['opennw'] = "Abrir a imagem em uma nova janela";
641c733
< 		$text['vwrclose'] = "Fechar visualizador de imagem";
---
> 		$text['vwrclose'] = "Fechar o visualizador de imagem";
651c743
< 		$text['dnatestscompare'] = "Comparar Testes de  Y-DNA";
---
> 		$text['dnatestscompare'] = "Comparar Testes de Y-DNA";
654c746
< 		$text['all_dna_tests'] = "Todos testes de DNA";
---
> 		$text['all_dna_tests'] = "Todos os testes de DNA";
656,659c748,775
< 		$text['dna_info_head'] = "Informação do Teste de DNA";
< 		$text['alltypes'] = "Todos Tipos";
< 		$text['allgroups'] = "Todos Grupos";
< 		$text['Ydna_LITbox_info'] = "Testes vinculados a esta pessoa não foram necessariamente feitos por esta pessoa. <br /> A coluna 'Haplogrupo' exibe dados em vermelho se o resultado for 'Previsto', e em verde se o teste for 'Confirmado'";
---
> 		$text['alltypes'] = "Todos os Tipos";
> 		$text['allgroups'] = "Todos os Grupos";
> 		$text['Ydna_LITbox_info'] = "Os testes vinculados a esta pessoa não foram necessariamente feitos por esta pessoa. <br /> A coluna 'Haplogrupo' exibe dados em vermelho se o resultado for 'Previsto', e em verde se o teste for 'Confirmado'";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Comparar testes mtDNA";
> 		$text['dnatestscompare_atdna'] = "Comparar testes atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Mutações extra";
> 		$text['mrca'] = "Ancestral MRC";
> 		$text['ydna_test'] = "Testes Y-DNA";
> 		$text['mtdna_test'] = "Testes mtDNA (mitocondriais)";
> 		$text['atdna_test'] = "Testes atDNA (autosômicos)";
> 		$text['segment_start'] = "Início";
> 		$text['segment_end'] = "Fim";
> 		$text['suggested_relationship'] = "Sugerido";
> 		$text['actual_relationship'] = "Real";
> 		$text['12markers'] = "Marcadores 1-12";
> 		$text['25markers'] = "Marcadores 13-25";
> 		$text['37markers'] = "Marcadores 26-37";
> 		$text['67markers'] = "Marcadores 38-67";
> 		$text['111markers'] = "Marcadores 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Ao menos dois testes devem ser selecionados para comparar.";
670,671d785
< $text['birthabbr'] = "nasc.";
< $text['chrabbr'] = "bat.";
675d788
< $text['family'] = "Família"; //from getperson
678c791
< $text['alltrees'] = "Todas árvores";
---
> $text['alltrees'] = "Todas as árvores";
685d797
< $text['deathabbr'] = "fal.";  //from descend
706d817
< $text['burialabbr'] = "sep.";  //from descend
712d822
< $text['place'] = "Lugar";
715d824
< $text['marrabbr'] = "Cas.";
738d846
< $text['source'] = "Fonte";
766d873
< $text['repository'] = "Repositório";
770d876
< $text['findplaces'] = "Encontrar todas pessoas com eventos nestes local";
783c889
< $text['allmedia'] = "Toda mídia";
---
> $text['allmedia'] = "Todas as mídia";
795c901
< $text['bookmark'] = "Adicionar marcadores";
---
> $text['bookmark'] = "Adicionar marcador";
804d909
< $text['glang'] = "&amp;hl=pt-BR";
810c915
< $text['albclicksee'] = "Clicar para ver todos itens do álbum";
---
> $text['albclicksee'] = "Clicar para ver todos os itens do álbum";
813c918
< $text['missing'] = "Faltando";
---
> $text['missing'] = "Em falta";
816d920
< $text['none'] = "Nenhum";
828c932
< $text['rmargin'] = "Margem Direita";
---
> $text['rmargin'] = " Margem Direita";
835,838c939,942
< $text['ourhist'] = "Nossa História de Família";
< $text['ourhistanc'] = "Nossa História de Família e Ancestrais";
< $text['ourpages'] = "Nossas Páginas de Genealogia da Família";
< $text['pwrdby'] = "Este site é gerenciado por";
---
> $text['ourhist'] = "A Nossa História de Família";
> $text['ourhistanc'] = "A Nossa História de Família e Antepassados";
> $text['ourpages'] = "As Nossas Páginas de Genealogia da Família";
> $text['pwrdby'] = "Este site é produzido com ";
841c945
< $text['viewphotos'] = "Ver todas fotos";
---
> $text['viewphotos'] = "Ver todas as fotos";
843c947
< $text['whichbranch'] = "De que ramo você é?";
---
> $text['whichbranch'] = "De que ramo é?";
845c949
< $text['maintby'] = "Mantido por";
---
> $text['maintby'] = "Criado e gerenciado por";
852c956
< $text['mnusearchfornames'] = "Pesquisar Pessoa";
---
> $text['mnusearchfornames'] = "Buscar Pessoa";
855c959
< $text['mnusearch'] = "Pesquisar";
---
> $text['mnusearch'] = "Buscar";
861c965
< $text['mnuadvancedsearch'] = "Pesquisa Avançada";
---
> $text['mnuadvancedsearch'] = "Busca avançada";
871c975
< $text['mnuwhatsnew'] = "O que há de novo";
---
> $text['mnuwhatsnew'] = "Novidades";
908,910c1012,1014
< $text['emailagain'] = "Repita o email";
< $text['enteremail2'] = "Favor entrar com seu email novamente.";
< $text['emailsmatch'] = "Emails diferentes. Favor entrar com o mesmo email em ambos campos.";
---
> $text['emailagain'] = "Repita o e-mail";
> $text['enteremail2'] = "Favor entrar com seu e-mail novamente.";
> $text['emailsmatch'] = "E-mails diferentes. Favor entrar com o mesmo e-mail em ambos campos.";
924d1027
< $text['otherevents'] = "Outros eventos";
944c1047
< $text['dna_test'] = "DNA Test";
---
> $text['dna_test'] = "Teste de DNA";
952,953d1054
< $text['people_have'] = "pessoas têm ligado um teste de DNA para";
< $text['person_has'] = "pessoa tem ligado um teste de DNA para";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "Testes de DNA estão associados com";
> $text['testislinked'] = "Teste de DNA está associado com";
> 
> //added in 12.2
> $text['quicklinks'] = "Links rápidos";
> $text['yourname'] = "Seu nome";
> $text['youremail'] = "Seu endereço de e-mail";
> $text['liketoadd'] = "Qualquer informação que você gostaria de adicionar";
> $text['webmastermsg'] = "Mensagem do webmaster";
> $text['gallery'] = "Ver galeria";
> $text['wasborn_male'] = "nasceu";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "nasceu"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "foi batizado";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "foi batizado";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "morreu";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "morreu";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "foi enterrado"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "foi enterrado"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "foi cremado";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "foi cremado";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "casado";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "casado";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "divorciou-se";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "divorciou-se";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " em ";			// used as a preposition to the location
> $text['onthisdate'] = " em ";		// when used with full date
> $text['inthisyear'] = " em ";		// when used with year only or month / year dates
> $text['and'] = "e ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informação do Teste de DNA";
> //added in 13.0
> $text['visitor'] = "Visitante";
> 
> $text['popupnote2'] = " = Nova árvore";
> 
> //moved here in 14.0
> $text['zoomin'] = "Mais Zoom";
> $text['zoomout'] = "Menos Zoom";
> $text['scrollnote'] = "Observação: talvez seja necessário deslizar para a esquerda/direita ou para baixo para visualizar todo o diagrama.";
> $text['general'] = "Geral";
> 
> //changed in 14.0
> $text['otherevents'] = "Outros atributos/eventos";
> 
> //added in 14.0
> $text['times'] = "-";
> $text['connections'] = "Parentescos";
> $text['continue'] = "Continuar";
> $text['title2'] = "Título"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
Only in TNG1403/languages: PortuguesePT-UTF8
diff -r TNG/languages/Romanian/admintext.php TNG1403/languages/Romanian/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Va rugam introduce-ti un";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Va rugam selectati fisierul de importat.";
> 		$admtext['addreplacedata'] = "Adauga sau inlocuieste la istoria familiei tale (poate lua mai multe minute, depinde de marimea fisierului dumneavoastra)";
> 		$admtext['fromyourcomputer'] = "Din calculatorul dumneavoastra";
> 		$admtext['importdata'] = "Importa date";
> 		$admtext['replace'] = "Inlocuieste (in arborele selectat)";
> 		$admtext['desttree'] = "Arbore destinatie";
> 		$admtext['selectdesttree'] = "Va rugam selectati sau introduceti arbore destinatie.";
> 		$admtext['selectexisting'] = "Importa in";
> 		$admtext['ucaselast'] = "Majuscule toate numele de familie";
> 		$admtext['norecalc'] = "Nu recalcula marcat in viata";
> 		$admtext['autooffset'] = "ID-ul la primul numar permis";
> 		$admtext['mustselecttree'] = "Trebuie sa selectezi un arbore inaintea acestei optiuni.";
> 		$admtext['onwebserver'] = "Din  pagina web (in dosar GEDCOM)";
> 		$admtext['imphints'] = "Hints: Toate datele curente inseamna toate persoanele, familiile, sursele si notele (Asocieri media nu sunt pierdute atata timp cat ID-urile ramana aceleasi). Potrivirile sunt bazate doar pe ID-uri. Inregistrari noi sunt intotdeauna adaugate. Importuri anexate la toate inregistrarile cu ID-uri noi.";
> 		$admtext['destbranch'] = "Destination Branch (optional)";
> 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
> 		$admtext['opening'] = "Opening";
> 		$admtext['reopen'] = "Reopening";
> 		$admtext['uploading'] = "Uploading";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import stopped";
> 		$admtext['resume'] = "apasa aici pentru a relua";
> 		$admtext['neweronly'] = "Inlocuieste doar nouReplace only if newer";
> 		$admtext['oldimport'] = "Old style import (no progress bar)";
> 		$admtext['importgedcom'] = "Importă fișierul  GEDCOM (poate fi comprimat)";
> 		$admtext['stopbackup'] = "Stop! Ar putea fi o idee bună să faceți o copie de rezervă a datelor curente înainte de a continua.";
> 		$admtext['importmedia'] = "Importa media daca exista";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Asigurati-v� c� prefixele is sufixele sunt corecte pentru documentul acesta (General Settings).";
> 		$admtext['chkimpsettings'] = "Verifica set�rile important pentru  mai multi opțiuni.";
> 		$admtext['eventsonly'] = "Importa doar tip eveniment personalizat (Nu sunt date adaugate, inlocuite sau anexate)";
> 		$admtext['allevents'] = "Accept date pantru toate tipurile de evenimente și atribuții";
> 		$admtext['finishingimporting'] = "Finisare...";
> 		$admtext['fileuploadfailed'] = "Incărcarea fișierului a eșuat.Asta înseamnă că fișierul e prea mare.Încearcă folosind FTP să încărcați fișierul în  pliantul GEDCOM , atunci selectați și importați de acolo.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Modifica tip eveniment";
135,138d168
< 		$admtext['entertypedesc'] = "Va rugam introduce-ti tip/descriere pentru acest noul eveniment.";
< 		$admtext['enterdisplay'] = "Va rugam introduce-ti mesaj afisat pentru acest nou tip eveniment.";
< 		$admtext['existingeventtypeinfo'] = "Informatii existente tip eveniment";
< 		$admtext['neweventtypeinfo'] = "Informatii nou tip eveniment";
145,146d174
< 		$admtext['addnewevtype'] = "Adauga nou tip eveniment";
< 		$admtext['createnewevtype'] = "Creaza Create a new event type record";
149,150d176
< 		$admtext['existingevtypes'] = "Tipuri eveniment existent";
< 		$admtext['edsevtypes'] = "Editeaza, sterge sau sorteaza previously entered event types";
152d177
< 		$admtext['confdeleteevtype'] = "Esti sigur ca doresti sa stergi acest tip?";
154d178
< 		$admtext['selectentertag'] = "Va rog selectati sau introduce-ti un tag pentru tipul acestui eveniment.";
208d231
< 		$admtext['changestoallevtypes'] = "Schimbari la  toate tipurile eveniment";
214d236
< 		$admtext['BAPM'] = "Botez";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Sunteți sigur că doriți să ștergeți acest tip de eveniment? Toate evenimentele de acest tip vor fi de asemenea șterse.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Adauga nou tip eveniment";
> 		$admtext['createnewevtype'] = "Creaza  fișierul";
> 		$admtext['modifyeventtype'] = "Modifica tip eveniment";
> 		$admtext['entertypedesc'] = "Va rugam introduce-ti tip/descriere pentru acest noul eveniment.";
> 		$admtext['enterdisplay'] = "Va rugam introduce-ti mesaj afisat pentru acest nou tip eveniment.";
> 		$admtext['existingeventtypeinfo'] = "Informatii existente tip eveniment";
> 		$admtext['neweventtypeinfo'] = "Informatii nou tip eveniment";
> 		$admtext['existingevtypes'] = "Tipuri eveniment existent";
> 		$admtext['edsevtypes'] = "Editeaza, sterge sau sorteaza previously entered event types";
> 		$admtext['selectentertag'] = "Va rog selectati sau introduce-ti un tag pentru tipul acestui eveniment.";
> 		$admtext['changestoallevtypes'] = "Schimbari la  toate tipurile eveniment";
268d303
< 		$admtext['nobirthinfo'] = "Nu exista informatii nastere";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Salvați + părinți noi";
> 		$admtext['savenewspouse'] = "Salvați + Soțul nou ";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Naștere Alt";
354d391
< 		$admtext['enterphotodesc'] = "Va rugam introduceti o descriere pentru imagine.";
388d424
< 		$admtext['photoowner'] = "Proprietar/Sursa";
417d452
< 		$admtext['imgmap'] = "Imagine harta";
490d524
< 		$admtext['mapinstr3'] = "Pentru conectarea unei regiuni a acestei imagni la o persoana, selecteaza arbore, alege forma si dimensiunile regiunii, apoi apasati in centrul acestei regiuni in imagine. O fereastra tip popup va va ajuta sa selectati persoana. Dupa ce selectia este facuta, codul pentru harta imagine va fi adaugata la casuta de mai sus. Repeta acest proces la fel pentru adaugare regiuni.";
495d528
< 		$admtext['removelink'] = "Remove Link";
502d534
< 		$admtext['eloptions'] = "Browse or Delete";
509d540
< 		$admtext['nolinks'] = "No links exist yet";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Harta imaginii HTML (pentru compatibilitate înapoi) ";
> 		$admtext['photoowner'] = "Proprietar de original ";
> 		$admtext['nothumb'] = "Fara pictograma";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Articolul nu a putut fi adăugat, cel mai probabil deoarece fișierul  a fast area lung și nu a putut fi încărcat sau folosit să faci o miniatură.";
> 		$admtext['moved'] = "Mutat";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Va rugam introduceti o descriere pentru imagine.";
> 		$admtext['mapinstr3'] = "Pentru conectarea unei regiuni a acestei imagni la o persoana, selecteaza arbore, alege forma si dimensiunile regiunii, apoi apasati in centrul acestei regiuni in imagine. O fereastra tip popup va va ajuta sa selectati persoana. Dupa ce selectia este facuta, codul pentru harta imagine va fi adaugata la casuta de mai sus. Repeta acest proces la fel pentru adaugare regiuni.";
596d633
< 		$admtext['foremptystring'] = "Pentru un sit gol, lasati acest camp necompletata si apasati \"Adauga >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructiuni: Trage sau double click elementele din st�nga în listete din dreapta.Trage în sun și în Jos să reordonezi..Dublu click din nt să stergi.Instructions: ";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Pentru un sit gol, lasati acest camp necompletat si apasati \"Adauga >>.";
651,655d690
< 		$admtext['selectimportfile'] = "Va rugam selectati fisierul de importat.";
< 		$admtext['importgedcom'] = "Importa GEDCOM (format standard 5.5)";
< 		$admtext['addreplacedata'] = "Adauga sau inlocuieste la istoria familiei tale (poate lua mai multe minute, depinde de marimea fisierului dumneavoastra)";
< 		$admtext['fromyourcomputer'] = "Din calculatorul dumneavoastra";
< 		$admtext['importdata'] = "Importa date";
657,660d691
< 		$admtext['replace'] = "Inlocuieste (in arborele selectat)";
< 		$admtext['desttree'] = "Arbore destinatie";
< 		$admtext['selectdesttree'] = "Va rugam selectati sau introduceti arbore destinatie.";
< 		$admtext['selectexisting'] = "Importa in";
668,673d698
< 		$admtext['ucaselast'] = "Majuscule toate numele de familie";
< 		$admtext['norecalc'] = "Nu recalcula marcat in viata";
< 		$admtext['autooffset'] = "ID-ul la primul numar permis";
< 
< 		$admtext['mustselecttree'] = "Trebuie sa selectezi un arbore inaintea acestei optiuni.";
< 		$admtext['importmedia'] = "Importa media daca exista";
675d699
< 		$admtext['neweronly'] = "Inlocuieste doar nouReplace only if newer";
677,692d700
< 		$admtext['onwebserver'] = "Din  pagina web (in dosar GEDCOM)";
< 		$admtext['eventsonly'] = "Importa doar tip eveniment personalizat  Custom Event Types Only (Nu sunt date adaugate, inlocuite sau anexate)";
< 		$admtext['imphints'] = "Hints: Toate datele curente inseamna toate persoanele, familiile, sursele si notele (Asocieri media nu sunt pierdute atata timp cat ID-urile ramana aceleasi). Potrivirile sunt bazate doar pe ID-uri. Inregistrari noi sunt intotdeauna adaugate. Importuri anexate la toate inregistrarile cu ID-uri noi.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "apasa aici pentru a relua";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Log schimbari";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Actualizare Upgrade";
> 		$admtext['need_upgrade'] = "Finalizați aceste instrucțiuni de actualizare Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "Fișierul de actualizare  pare să lipsească,așa că poate ai terminat deja.";
> 		$admtext['delete_upgrade'] = "C�nd ai terminal,  dă click aici să stergi actualizarea și re�ntoarcete la meniu.";
723d733
< 		$admtext['author'] = "Autor";
804,809c814,819
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
---
> 		$admtext['momside'] = "Mom's Side label"; //8, 20
> 		$admtext['dadside'] = "Dad's Side label"; //8, 20
> 		$admtext['momperson'] = "Mom's Side person ID"; //8, 20
> 		$admtext['momtree'] = "Mom's Side tree ID"; //8, 20
> 		$admtext['dadperson'] = "Dad's Side person ID"; //8, 20
> 		$admtext['dadtree'] = "Dad's Side tree ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Antetul ghilimelelor";
> 		$admtext['quotesubhead'] = "Subcapitolul cotațiilor";
> 		$admtext['sniptitle'] = "Titlu Featurette";
> 		$admtext['snipname'] = "Numele Featurette";
> 		$admtext['snipinfoone'] = "Featurette prima linie";
> 		$admtext['snipinfotwo'] = "Featurette a doua linie";
> 		$admtext['snipimage'] = "Imaginea caracteristică";
> 		$admtext['snipperson'] = "ID persoană de persoană";
> 		$admtext['sniptree'] = "ID arborele Featurette";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Titlul caracteristic 7";
> 		$admtext['featuretitle8'] = "Titlul caracteristic 8";
> 		$admtext['featuretitle9'] = "Titlul caracteristicii 9";
> 		$admtext['featurethumb9'] = "Miniatură cu caracteristica 9"; //15
> 		$admtext['featurelink9'] = "Legătură cu caracteristica 9"; //15
> 		$admtext['featurepara9'] = "Funcția 9 paragraf"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Imaginea antet din stânga";
> 		$admtext['rightimg'] = "Imaginea antet din dreapta ";
> 		$admtext['photoption'] = "Opțiunile foto sunt <br />&nbsp;&nbsp;(static sau aleatoriu)";
> 		$admtext['randomphotowidth'] = "Lățimea fotografiei aleatorii";
> 		$admtext['randomphotoheight'] = "Înălțimea fotografiei aleatorii ";
> 		$admtext['randomphotomediatypeID'] = "Colecția de fotografii aleatorii";
> 		$admtext['momheading'] = "Direcția familiei materne";
> 		$admtext['mompara'] = "Paragraful familiei materne";
> 		$admtext['mompagelink'] = "Legătura paginii familiei materne ";
> 		$admtext['dadheading'] = "Direcția familiei paterne";
> 		$admtext['dadpara'] = "Paragraful familiei paterne";
> 		$admtext['dadpagelink'] = "Legătura paginii familiei paterne";
> 		$admtext['spmomheading'] = "Rubrica familiei materne a soțului / soției";
> 		$admtext['spmompara'] = "Paragraful familiei materne a soțului / soției";
> 		$admtext['spmompagelink'] = "Legătura paginii familiei materne";
> 		$admtext['spmomside'] = "Eticheta părții materne a soțului";
> 		$admtext['spdadside'] = "Eticheta părții paterne a soțului";
> 		$admtext['spmomperson'] = "Soțul din partea  maternă persoanăID";
> 		$admtext['spmomtree'] = "Arborele părții materne a soțuluiID";
> 		$admtext['spdadheading'] = "Rubrica familiei paterne a soției";
> 		$admtext['spdadpara'] = "Paragraful familiei paterne a soțului / soției";
> 		$admtext['spdadpagelink'] = "Legătura paginii familiei paterne";
> 		$admtext['spdadperson'] = "Soțul din partea  paternă  persoanăID";
> 		$admtext['spdadtree'] = "Arborele părții paterne a soțuluiID";
> 		$admtext['storiesheading'] = "Poveștile noastre familiale";
> 		$admtext['nbrsurnames'] = "Numele prenumelor <br />&nbsp;&nbsp;  în cloudul prenumelor";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Miniatură cu caracteristica";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(Necesita TNG 5.3 sau ulterior.)";
---
> 		$admtext['phpreq'] = "(Necesita TNG 5.6 sau ulterior.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Schimbați prefixele primite pentru a se potrivi cu setările TNG";
> 		$admtext['sortevents'] = "Sortează evenimentele după";
> 		$admtext['sortbydate'] = "Data evenimentului";
> 		$admtext['sortbytype'] = "Tip de eveniment";
> 		$admtext['allowsuggest'] = "Permiteți sugestii de la vizitatori";
> 		$admtext['livingchecked'] = "Set de pavilion viu pentru oameni și familii noi";
> 		$admtext['maxmarried'] = "Marcați familia care trăiește dacă sunt căsătoriți mai puțin de <br/> atâți ani ";
> 		$admtext['imagetags'] = "Etichetă imagine";
> 		$admtext['allowcsv'] = "Permite descărcări CSV pentru rapoarte";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Opțiuni de back up.";
> 		$admtext['dosql'] = " Exportă ca SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Opțiuni de restaurare";
> 		$admtext['dodel'] = "Ștergeți mai înt�i conținutul anterior ";
> 		$admtext['download'] = "Descarcă";
> 		$admtext['altbirthtypes'] = "Evenimente alternative de naștere";
> 		$admtext['dtformat'] = "Format tabele";
> 		$admtext['conchart'] = "Diagramm de conexiuni";
> 		$admtext['maxropt'] = "Numărul maxim de căutare de conexiuni rulează";
> 		$admtext['maxlopt'] = "Lungimea maximă a căilor de conectare";
> 		$admtext['showtxtopt'] = "Afișează declarația de cale textuală";
> 		$admtext['compactboxopt'] = "Arată casetele persoanei în formă compactă";
> 		$admtext['sortbyopt'] = "Sortați căile după";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max căsătorii în legătură";
> 		$admtext['saveincfg'] = "Stocați în calea configurare Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Could not be geocoded";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Nu geocodează";
1436d1549
< 		$admtext['backtosecondary'] = "Inapoi la procesul secundar";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Inapoi la procesul secundar";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Excludeți notele";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip și include fișiere media";
> 		$admtext['downloadzip'] = "Descarcă ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Afișați numai utilizatori neautorizați";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Deasemenea trimite adminului cand un singur arbore e selectat";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Litera invalidă";
1886d2008
< 		$admtext['test_number'] = "Test Number";
1916d2037
< 		$admtext['xtra_mut'] = "Extra mutations";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Number";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Conectează acest DNA test cu o pesoană";
1966d2095
< $admtext['otherevents'] = "Alte evenimente";
2051,2052d2179
< $admtext['savereturn'] = "Inapoi la aceasta pagina";
< $admtext['saveback'] = "Inapoi la meniu";
2059,2060d2185
< $admtext['secondary'] = "Procese secundare";
< $admtext['commas'] = "Separa intrari multiple cu virgula";
2102c2227
< $admtext['nobranch'] = "Fara ramuri";
---
> $admtext['nobranch'] = "No branch";
2130,2131d2254
< $admtext['secondarymaint'] = "Procese secundare";
< $admtext['customeventtypes'] = "Personalizare tip evenimente";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Prenume";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Imagine";
> $admtext['author'] = "Autor";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Getting Started";
> $admtext['showlog'] = "Log schimbari";
> $admtext['nobirthinfo'] = "Nu exista informatii nastere";
> //changed in 13.0
> $admtext['savereturn'] = "Salvați + rămâneți";
> $admtext['saveback'] = "Salvați + ieșiți";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Toate articolele au fost șterse cu succes.";
> $admtext['private'] = "Privat";
> $admtext['imgtags'] = "Etichetă imagine";
> 
> $admtext['removelink'] = "Remove Link";
> $admtext['eloptions'] = "Browse or Delete";
> $admtext['pleaseenter'] = "Va rugam introduce-ti un";
> 
> $admtext['nolinks'] = "No links exist yet";
> $admtext['nogeocode'] = "Could not be geocoded";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Personalizare tip evenimente";
> $admtext['secondary'] = "Procese secundare";
> $admtext['otherevents'] = "Alte evenimente";
> //added in 14.0
> $admtext['newlinks'] = "Links create";
> $admtext['newcemlinks'] = "Cimitir links create";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Tip";
> $admtext['move'] = "Mut�";
> $admtext['copy'] = "Copiaz�";
> $admtext['title2'] = "Titlu"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Romanian/alltext.php TNG1403/languages/Romanian/alltext.php
53,54c53,54
< $text['usersent'] = "Nume dumneavoastra de utilizator a fost trimis în casuta de email.";
< $text['pwdsent'] = "Parola dumneavoastra temporara a fost trimisã în casuta de email.";
---
> $text['usersent'] = "Nume dumneavoastra de utilizator a fost trimis în casuta de email.";
> $text['pwdsent'] = "Parola dumneavoastra temporara a fost trimisã în casuta de email.";
85c85
< $text['none'] = "None";
---
> $text['none'] = "Nici unul";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "b.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "urm.";  //from descend
> $text['marrabbr'] = "m.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Prima pagina";
> $text['lastpage'] = "Ultima pagina";
> 
> //changed in 13.0.0
> $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
> //added in 13.0.0
> $admtext['nobranch'] = "No branch";
> 
> //added in 14.0
> $text['oneyear'] = "year";
> $text['pwdcodelink'] = "Apasă aces link să ai o parolă trimisă ție";
> $text['pwdcodesent'] = " Un link de resetare a parolei a fost trimis la adresa ta de mail.";
> $text['moved'] = "Mutat";
> $text['citation'] = "Citare";
> $text['other'] = "Alte";
> $text['death'] = "Mort";
> $text['burial'] = "Înmorm�ntare";
> $text['cremation'] = "Incinerare";
> $text['marriage'] = "Căsătorie";
> $text['divorce'] = "DivorÈ›";
> $text['bylength'] = "Trepte";
> $text['bymarriages'] = "Căsătorii ";
> $text['none'] = "Nici unul";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Sursa";
> $text['repository'] = "Depozite";
> $text['place'] = "Locatie";
> $admtext['BAPM'] = "Botez";
> 
> $text['glang'] = "ro";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Romanian/text.php TNG1403/languages/Romanian/text.php
69d68
< 		$text['general'] = "General";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Va rugam selectati doua persoane.";
---
> 		$text['select2inds'] = "Selectează te rog  doi indivizi.";
90c90
< 		$text['sameperson'] = "Doi indivizi sunt aceeasi persoana.";
---
> 		$text['sameperson'] = "Chi dot indivisible sent aceeași persoană.";
93c93
< 		$text['sometimes'] = "(Uneori verificand dupa un numar diferit de generatii campurile rezultate pot fi diferite.)";
---
> 		$text['sometimes'] = "(Cateodată căutând asupra numărului diferit de generații afișează un rezultat diferit.)";
144c144
< 		$text['dospouses2'] = "Show Spouses";
---
> 		$text['dospouses2'] = "Arată soții";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Caută după conexiuni";
> 		$text['findrel2'] = "Caută relații și alte conexiuni";
> 		$text['makeme2nd'] = "Folosește ID meu";
> 		$text['usebookmarks'] = "Folosește marcajul meu";
> 		$text['select2inds'] = "Selectează te rog  doi indivizi.";
> 		$text['indinfofor'] = "Informații individuale pentru";
> 		$text['nobookmarks'] = "Nu este maraca de folosit";
> 		$text['bkmtitle'] = "Persoane găsite în marcaje";
> 		$text['bkminfo'] = "Selectează o persoană:";
> 		$text['sortpathsby'] = "Sortati căile după număr de";
> 		$text['sortbyshort'] = "Filtrează după";
> 		$text['bylengthshort'] = "Lungime";
> 		$text['badID1'] = ": bad person1 ID - întoarce și corectează";
> 		$text['badID2'] = ": bad person2 ID - întoarce și corectează";
> 		$text['notintree'] = ":Persoana cu acest ID nu este în baza de date.";
> 		$text['sameperson'] = "Chi dot indivisible sent aceeași persoană.";;
> 		$text['nopaths'] = "Această persoană nu este conectată.";
> 		$text['nopaths1'] = "Nu mai sunt conexiuni dec�t xxx";
> 		$text['nopaths2'] = "in xxx etape de căutare";
> 		$text['longestpath'] = "(Calea cea mai lungă verificată a fost xxx etape)";
> 		$text['relevantpaths'] = "numărul relevant de căi diferite a fost de: xxx";
> 		$text['skipMarr'] = "( în  plus, numărul de căi găsit dar nu afișat din cauza prea multelor căsătorii a fost: xxx)";
> 		$text['mjaor'] = "sau or";
> 		$text['connectionsto'] = "Conexiuni la ";
> 		$text['findanotherpers'] = "Găsește altă persoană ...";
> 		$text['sometimes'] = "(Cateodată căutând asupra numărului diferit de generații afișează un rezultat diferit.)";
> 		$text['anotherpath'] = "Caută alte conexiuni";
> 		$text['xpath'] = "Cale";
> 		$text['primary'] = "Person de pornire ,,notă folosește pantry amândouă Start și End  daca1 textual  fin nu setează"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Părinte";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "his daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "tată";
> 		$text['hmother'] = "mamă";
> 		$text['hhusband'] = "soÈ›";
> 		$text['hwife'] = "soție";
> 		$text['hson'] = "fiu";
> 		$text['hdaughter'] = "fiică";
> 		$text['maxruns'] = "numărul maxim  de căi de verificat";
> 		$text['maxrshort'] = "Căile maxime";
> 		$text['maxlength'] = "Căile de conexiune nu mai lungi de";
> 		$text['maxlshort'] = "Lungimea maximă";
> 		$text['xstep'] = "Etapă";
> 		$text['xsteps'] = "Etape";
> 		$text['xmarriages'] = "xxx căsătorii";
> 		$text['xmarriage'] = "căsătorie";
> 		$text['showspouses'] = "Arată ambele soții";
> 		$text['showTxt'] = "Arată textual căilor descrise";
> 		$text['showTxtshort'] = "Descriere text";
> 		$text['compactBox'] = "Arată cutiile persoanei compacte";
> 		$text['compactBoxshort'] = "Cutii compacte";
> 		$text['paths'] = "Căile";
> 		$text['dospouses2'] = "Arată soții";
> 		$text['maxmopt'] = "Maximum de căsătorii pe conexiune";
> 		$text['maxm'] = "Maximum de căsătorii";
> 		$text['arerelated'] = "Aceste persoane sunt rude-relatația lor este în Path 1";
> 		$text['simplerel'] = "Modul simplu de căutare a rudeniei";
196d264
< 		$text['scrollnote'] = "Note: Trebuie sa rasfoiti in jos sau in dreapta pentru a vedea grafic.";
199d266
< 		$text['popupnote2'] = " = Arbore nou";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tables";
> 		$text['dtchildren'] = "Copii";
> 		$text['dtgrandchildren'] = "Nepoți";
> 		$text['dtggrandchildren'] = "Strănepoți";
> 		$text['dtgggrandchildren'] = "Strănepoți"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Niciun descendent";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Selecteză Select";
> 		$text['dteachfulltable'] = "Fiecare tabel plin va avea";
> 		$text['dtrows'] = "rânduri";
> 		$text['dtdisplayingtable'] = "Afiseaza tabelul";
> 		$text['dtgototable'] = " Mergi la tabel:";
> 		$text['fcinstrdn'] = "Arată familia cu soție";
> 		$text['fcinstrup'] = "Arată familia cu parinți";
> 		$text['fcinstrplus'] = "Selectează alte soții";
> 		$text['fcinstrfam'] = "Selectează alți părinți";
381,383c467
< 		$text['firstpage'] = "Prima pagina";
< 		$text['lastpage'] = "Ultima pagina";
< 		$text['photoowner'] = "Proprietar/Sursa";
---
> 		$text['photoowner'] = "Proprietar de original";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Etichetă de comutare, pornire/stopare";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Parola noua din nou";
> 		$text['resetsuccess'] = "Parola a fost restată";
> 		$text['resetfail'] = "Eroare. Parola nu  a fost resetată";
> 		$text['failreason0'] = "(eroare baze de date necunoscuta)";
> 		$text['failreason2'] = "(nu ai permisiunea sa schimbi parola)";
> 		$text['failreason3'] = "(parola nu e corecta)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Sursele totale citate";
618d710
< 		$text['loginfirst'] = "You must log in first.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Au fost detectate înregistrări de utilizatori existente. Pentru a continua, trebuie mai întâi să vă autentificați sau să eliminați toate înregistrările din tabelul utilizatorilor.";
629,630d722
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Out";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "b.";
< $text['chrabbr'] = "c.";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
706d817
< $text['burialabbr'] = "urm.";  //from descend
712d822
< $text['place'] = "Locatie";
715d824
< $text['marrabbr'] = "m.";
738d846
< $text['source'] = "Sursa";
766d873
< $text['repository'] = "Depozite";
770d876
< $text['findplaces'] = "Gaseste toate persoanele cu evenimente la aceasta locatie";
804d909
< $text['glang'] = "&amp;hl=ro";
816d920
< $text['none'] = "None";
924d1027
< $text['otherevents'] = "Alte evenimente";
952,953d1054
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Link-uri rapide";
> $text['yourname'] = "Numele tău";
> $text['youremail'] = "Adresa ta de e-mail";
> $text['liketoadd'] = "Orice informație pe care doriți să o adăugați";
> $text['webmastermsg'] = "Mesaj pentru webmasteri";
> $text['gallery'] = "Vezi Galerie";
> $text['wasborn_male'] = "sa născut";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "sa născut"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "a fost botezat";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "a fost botezat";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "a murit";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "a murit";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "a fost îngropat"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "a fost îngropat"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "a fost cremat";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "a fost cremat";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "căsătorit";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "căsătorit";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "a fost divorțat";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "a fost divorțat";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " pe ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "și ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Vizitator";
> 
> $text['popupnote2'] = " = Arbore nou";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom In";
> $text['zoomout'] = "Zoom Out";
> $text['scrollnote'] = "Note: Trebuie sa rasfoiti in jos sau in dreapta pentru a vedea grafic.";
> $text['general'] = "General";
> 
> //changed in 14.0
> $text['otherevents'] = "Alte evenimente";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Conexiuni";
> $text['continue'] = "Continua...";
> $text['title2'] = "Titlu"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Romanian-UTF8/admintext.php TNG1403/languages/Romanian-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Va rugam introduce-ti un";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Va rugam selectati fisierul de importat.";
> 		$admtext['addreplacedata'] = "Adauga sau inlocuieste la istoria familiei tale (poate lua mai multe minute, depinde de marimea fisierului dumneavoastra)";
> 		$admtext['fromyourcomputer'] = "Din calculatorul dumneavoastra";
> 		$admtext['importdata'] = "Importa date";
> 		$admtext['replace'] = "Inlocuieste (in arborele selectat)";
> 		$admtext['desttree'] = "Arbore destinatie";
> 		$admtext['selectdesttree'] = "Va rugam selectati sau introduceti arbore destinatie.";
> 		$admtext['selectexisting'] = "Importa in";
> 		$admtext['ucaselast'] = "Majuscule toate numele de familie";
> 		$admtext['norecalc'] = "Nu recalcula marcat in viata";
> 		$admtext['autooffset'] = "ID-ul la primul numar permis";
> 		$admtext['mustselecttree'] = "Trebuie sa selectezi un arbore inaintea acestei optiuni.";
> 		$admtext['onwebserver'] = "Din  pagina web (in dosar GEDCOM)";
> 		$admtext['imphints'] = "Hints: Toate datele curente inseamna toate persoanele, familiile, sursele si notele (Asocieri media nu sunt pierdute atata timp cat ID-urile ramana aceleasi). Potrivirile sunt bazate doar pe ID-uri. Inregistrari noi sunt intotdeauna adaugate. Importuri anexate la toate inregistrarile cu ID-uri noi.";
> 		$admtext['destbranch'] = "Destination Branch (optional)";
> 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
> 		$admtext['opening'] = "Opening";
> 		$admtext['reopen'] = "Reopening";
> 		$admtext['uploading'] = "Uploading";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import stopped";
> 		$admtext['resume'] = "apasa aici pentru a relua";
> 		$admtext['neweronly'] = "Inlocuieste doar nouReplace only if newer";
> 		$admtext['oldimport'] = "Old style import (no progress bar)";
> 		$admtext['importgedcom'] = "Importă fișierul  GEDCOM (poate fi comprimat)";
> 		$admtext['stopbackup'] = "Stop! Ar putea fi o idee bună să faceți o copie de rezervă a datelor curente înainte de a continua.";
> 		$admtext['importmedia'] = "Importa media daca exista";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Asigurati-v� c� prefixele is sufixele sunt corecte pentru documentul acesta (General Settings).";
> 		$admtext['chkimpsettings'] = "Verifica set�rile important pentru  mai multi opțiuni.";
> 		$admtext['eventsonly'] = "Importa doar tip eveniment personalizat (Nu sunt date adaugate, inlocuite sau anexate)";
> 		$admtext['allevents'] = "Accept date pantru toate tipurile de evenimente și atribuții";
> 		$admtext['finishingimporting'] = "Finisare...";
> 		$admtext['fileuploadfailed'] = "Incărcarea fișierului a eșuat.Asta înseamnă că fișierul e prea mare.Încearcă folosind FTP să încărcați fișierul în  pliantul GEDCOM , atunci selectați și importați de acolo.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Modifica tip eveniment";
135,138d168
< 		$admtext['entertypedesc'] = "Va rugam introduce-ti tip/descriere pentru acest noul eveniment.";
< 		$admtext['enterdisplay'] = "Va rugam introduce-ti mesaj afisat pentru acest nou tip eveniment.";
< 		$admtext['existingeventtypeinfo'] = "Informatii existente tip eveniment";
< 		$admtext['neweventtypeinfo'] = "Informatii nou tip eveniment";
145,146d174
< 		$admtext['addnewevtype'] = "Adauga nou tip eveniment";
< 		$admtext['createnewevtype'] = "Creaza Create a new event type record";
149,150d176
< 		$admtext['existingevtypes'] = "Tipuri eveniment existent";
< 		$admtext['edsevtypes'] = "Editeaza, sterge sau sorteaza previously entered event types";
152d177
< 		$admtext['confdeleteevtype'] = "Esti sigur ca doresti sa stergi acest tip?";
154d178
< 		$admtext['selectentertag'] = "Va rog selectati sau introduce-ti un tag pentru tipul acestui eveniment.";
208d231
< 		$admtext['changestoallevtypes'] = "Schimbari la  toate tipurile eveniment";
214d236
< 		$admtext['BAPM'] = "Botez";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Sunteți sigur că doriți să ștergeți acest tip de eveniment? Toate evenimentele de acest tip vor fi de asemenea șterse.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Adauga nou tip eveniment";
> 		$admtext['createnewevtype'] = "Creaza  fișierul";
> 		$admtext['modifyeventtype'] = "Modifica tip eveniment";
> 		$admtext['entertypedesc'] = "Va rugam introduce-ti tip/descriere pentru acest noul eveniment.";
> 		$admtext['enterdisplay'] = "Va rugam introduce-ti mesaj afisat pentru acest nou tip eveniment.";
> 		$admtext['existingeventtypeinfo'] = "Informatii existente tip eveniment";
> 		$admtext['neweventtypeinfo'] = "Informatii nou tip eveniment";
> 		$admtext['existingevtypes'] = "Tipuri eveniment existent";
> 		$admtext['edsevtypes'] = "Editeaza, sterge sau sorteaza previously entered event types";
> 		$admtext['selectentertag'] = "Va rog selectati sau introduce-ti un tag pentru tipul acestui eveniment.";
> 		$admtext['changestoallevtypes'] = "Schimbari la  toate tipurile eveniment";
268d303
< 		$admtext['nobirthinfo'] = "Nu exista informatii nastere";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Salvați + părinți noi";
> 		$admtext['savenewspouse'] = "Salvați + Soțul nou ";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Naștere Alt";
354d391
< 		$admtext['enterphotodesc'] = "Va rugam introduceti o descriere pentru imagine.";
388d424
< 		$admtext['photoowner'] = "Proprietar/Sursa";
417d452
< 		$admtext['imgmap'] = "Imagine harta";
490d524
< 		$admtext['mapinstr3'] = "Pentru conectarea unei regiuni a acestei imagni la o persoana, selecteaza arbore, alege forma si dimensiunile regiunii, apoi apasati in centrul acestei regiuni in imagine. O fereastra tip popup va va ajuta sa selectati persoana. Dupa ce selectia este facuta, codul pentru harta imagine va fi adaugata la casuta de mai sus. Repeta acest proces la fel pentru adaugare regiuni.";
495d528
< 		$admtext['removelink'] = "Remove Link";
502d534
< 		$admtext['eloptions'] = "Browse or Delete";
509d540
< 		$admtext['nolinks'] = "No links exist yet";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Harta imaginii HTML (pentru compatibilitate înapoi) ";
> 		$admtext['photoowner'] = "Proprietar de original ";
> 		$admtext['nothumb'] = "Fara pictograma";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Articolul nu a putut fi adăugat, cel mai probabil deoarece fișierul  a fast area lung și nu a putut fi încărcat sau folosit să faci o miniatură.";
> 		$admtext['moved'] = "Mutat";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Va rugam introduceti o descriere pentru imagine.";
> 		$admtext['mapinstr3'] = "Pentru conectarea unei regiuni a acestei imagni la o persoana, selecteaza arbore, alege forma si dimensiunile regiunii, apoi apasati in centrul acestei regiuni in imagine. O fereastra tip popup va va ajuta sa selectati persoana. Dupa ce selectia este facuta, codul pentru harta imagine va fi adaugata la casuta de mai sus. Repeta acest proces la fel pentru adaugare regiuni.";
596d633
< 		$admtext['foremptystring'] = "Pentru un sit gol, lasati acest camp necompletata si apasati \"Adauga >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructiuni: Trage sau double click elementele din st�nga în listete din dreapta.Trage în sun și în Jos să reordonezi..Dublu click din nt să stergi.Instructions: ";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Pentru un sit gol, lasati acest camp necompletat si apasati \"Adauga >>.";
651,655d690
< 		$admtext['selectimportfile'] = "Va rugam selectati fisierul de importat.";
< 		$admtext['importgedcom'] = "Importa GEDCOM (format standard 5.5)";
< 		$admtext['addreplacedata'] = "Adauga sau inlocuieste la istoria familiei tale (poate lua mai multe minute, depinde de marimea fisierului dumneavoastra)";
< 		$admtext['fromyourcomputer'] = "Din calculatorul dumneavoastra";
< 		$admtext['importdata'] = "Importa date";
657,660d691
< 		$admtext['replace'] = "Inlocuieste (in arborele selectat)";
< 		$admtext['desttree'] = "Arbore destinatie";
< 		$admtext['selectdesttree'] = "Va rugam selectati sau introduceti arbore destinatie.";
< 		$admtext['selectexisting'] = "Importa in";
668,673d698
< 		$admtext['ucaselast'] = "Majuscule toate numele de familie";
< 		$admtext['norecalc'] = "Nu recalcula marcat in viata";
< 		$admtext['autooffset'] = "ID-ul la primul numar permis";
< 
< 		$admtext['mustselecttree'] = "Trebuie sa selectezi un arbore inaintea acestei optiuni.";
< 		$admtext['importmedia'] = "Importa media daca exista";
675d699
< 		$admtext['neweronly'] = "Inlocuieste doar nouReplace only if newer";
677,692d700
< 		$admtext['onwebserver'] = "Din  pagina web (in dosar GEDCOM)";
< 		$admtext['eventsonly'] = "Importa doar tip eveniment personalizat  Custom Event Types Only (Nu sunt date adaugate, inlocuite sau anexate)";
< 		$admtext['imphints'] = "Hints: Toate datele curente inseamna toate persoanele, familiile, sursele si notele (Asocieri media nu sunt pierdute atata timp cat ID-urile ramana aceleasi). Potrivirile sunt bazate doar pe ID-uri. Inregistrari noi sunt intotdeauna adaugate. Importuri anexate la toate inregistrarile cu ID-uri noi.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "apasa aici pentru a relua";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Log schimbari";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Actualizare Upgrade";
> 		$admtext['need_upgrade'] = "Finalizați aceste instrucțiuni de actualizare Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "Fișierul de actualizare  pare să lipsească,așa că poate ai terminat deja.";
> 		$admtext['delete_upgrade'] = "C�nd ai terminal,  dă click aici să stergi actualizarea și re�ntoarcete la meniu.";
723d733
< 		$admtext['author'] = "Autor";
804,809c814,819
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
---
> 		$admtext['momside'] = "Mom's Side label"; //8, 20
> 		$admtext['dadside'] = "Dad's Side label"; //8, 20
> 		$admtext['momperson'] = "Mom's Side person ID"; //8, 20
> 		$admtext['momtree'] = "Mom's Side tree ID"; //8, 20
> 		$admtext['dadperson'] = "Dad's Side person ID"; //8, 20
> 		$admtext['dadtree'] = "Dad's Side tree ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Antetul ghilimelelor";
> 		$admtext['quotesubhead'] = "Subcapitolul cotațiilor";
> 		$admtext['sniptitle'] = "Titlu Featurette";
> 		$admtext['snipname'] = "Numele Featurette";
> 		$admtext['snipinfoone'] = "Featurette prima linie";
> 		$admtext['snipinfotwo'] = "Featurette a doua linie";
> 		$admtext['snipimage'] = "Imaginea caracteristică";
> 		$admtext['snipperson'] = "ID persoană de persoană";
> 		$admtext['sniptree'] = "ID arborele Featurette";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Titlul caracteristic 7";
> 		$admtext['featuretitle8'] = "Titlul caracteristic 8";
> 		$admtext['featuretitle9'] = "Titlul caracteristicii 9";
> 		$admtext['featurethumb9'] = "Miniatură cu caracteristica 9"; //15
> 		$admtext['featurelink9'] = "Legătură cu caracteristica 9"; //15
> 		$admtext['featurepara9'] = "Funcția 9 paragraf"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Imaginea antet din stânga";
> 		$admtext['rightimg'] = "Imaginea antet din dreapta ";
> 		$admtext['photoption'] = "Opțiunile foto sunt <br />&nbsp;&nbsp;(static sau aleatoriu)";
> 		$admtext['randomphotowidth'] = "Lățimea fotografiei aleatorii";
> 		$admtext['randomphotoheight'] = "Înălțimea fotografiei aleatorii ";
> 		$admtext['randomphotomediatypeID'] = "Colecția de fotografii aleatorii";
> 		$admtext['momheading'] = "Direcția familiei materne";
> 		$admtext['mompara'] = "Paragraful familiei materne";
> 		$admtext['mompagelink'] = "Legătura paginii familiei materne ";
> 		$admtext['dadheading'] = "Direcția familiei paterne";
> 		$admtext['dadpara'] = "Paragraful familiei paterne";
> 		$admtext['dadpagelink'] = "Legătura paginii familiei paterne";
> 		$admtext['spmomheading'] = "Rubrica familiei materne a soțului / soției";
> 		$admtext['spmompara'] = "Paragraful familiei materne a soțului / soției";
> 		$admtext['spmompagelink'] = "Legătura paginii familiei materne";
> 		$admtext['spmomside'] = "Eticheta părții materne a soțului";
> 		$admtext['spdadside'] = "Eticheta părții paterne a soțului";
> 		$admtext['spmomperson'] = "Soțul din partea  maternă persoanăID";
> 		$admtext['spmomtree'] = "Arborele părții materne a soțuluiID";
> 		$admtext['spdadheading'] = "Rubrica familiei paterne a soției";
> 		$admtext['spdadpara'] = "Paragraful familiei paterne a soțului / soției";
> 		$admtext['spdadpagelink'] = "Legătura paginii familiei paterne";
> 		$admtext['spdadperson'] = "Soțul din partea  paternă  persoanăID";
> 		$admtext['spdadtree'] = "Arborele părții paterne a soțuluiID";
> 		$admtext['storiesheading'] = "Poveștile noastre familiale";
> 		$admtext['nbrsurnames'] = "Numele prenumelor <br />&nbsp;&nbsp;  în cloudul prenumelor";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Miniatură cu caracteristica";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(Necesita TNG 5.3 sau ulterior.)";
---
> 		$admtext['phpreq'] = "(Necesita TNG 5.6 sau ulterior.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Schimbați prefixele primite pentru a se potrivi cu setările TNG";
> 		$admtext['sortevents'] = "Sortează evenimentele după";
> 		$admtext['sortbydate'] = "Data evenimentului";
> 		$admtext['sortbytype'] = "Tip de eveniment";
> 		$admtext['allowsuggest'] = "Permiteți sugestii de la vizitatori";
> 		$admtext['livingchecked'] = "Set de pavilion viu pentru oameni și familii noi";
> 		$admtext['maxmarried'] = "Marcați familia care trăiește dacă sunt căsătoriți mai puțin de <br/> atâți ani ";
> 		$admtext['imagetags'] = "Etichetă imagine";
> 		$admtext['allowcsv'] = "Permite descărcări CSV pentru rapoarte";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Opțiuni de back up.";
> 		$admtext['dosql'] = " Exportă ca SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Opțiuni de restaurare";
> 		$admtext['dodel'] = "Ștergeți mai înt�i conținutul anterior ";
> 		$admtext['download'] = "Descarcă";
> 		$admtext['altbirthtypes'] = "Evenimente alternative de naștere";
> 		$admtext['dtformat'] = "Format tabele";
> 		$admtext['conchart'] = "Diagramm de conexiuni";
> 		$admtext['maxropt'] = "Numărul maxim de căutare de conexiuni rulează";
> 		$admtext['maxlopt'] = "Lungimea maximă a căilor de conectare";
> 		$admtext['showtxtopt'] = "Afișează declarația de cale textuală";
> 		$admtext['compactboxopt'] = "Arată casetele persoanei în formă compactă";
> 		$admtext['sortbyopt'] = "Sortați căile după";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max căsătorii în legătură";
> 		$admtext['saveincfg'] = "Stocați în calea configurare Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Could not be geocoded";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Nu geocodează";
1436d1549
< 		$admtext['backtosecondary'] = "Inapoi la procesul secundar";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Inapoi la procesul secundar";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Excludeți notele";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip și include fișiere media";
> 		$admtext['downloadzip'] = "Descarcă ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Afișați numai utilizatori neautorizați";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Deasemenea trimite adminului cand un singur arbore e selectat";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Litera invalidă";
1886d2008
< 		$admtext['test_number'] = "Test Number";
1916d2037
< 		$admtext['xtra_mut'] = "Extra mutations";
1919a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Number";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Conectează acest DNA test cu o pesoană";
1966d2095
< $admtext['otherevents'] = "Alte evenimente";
2051,2052d2179
< $admtext['savereturn'] = "Inapoi la aceasta pagina";
< $admtext['saveback'] = "Inapoi la meniu";
2059,2060d2185
< $admtext['secondary'] = "Procese secundare";
< $admtext['commas'] = "Separa intrari multiple cu virgula";
2102c2227
< $admtext['nobranch'] = "Fara ramuri";
---
> $admtext['nobranch'] = "În nicio ramură";
2130,2131d2254
< $admtext['secondarymaint'] = "Procese secundare";
< $admtext['customeventtypes'] = "Personalizare tip evenimente";
2220d2342
< //changed in 8.0.0
2224d2345
< //moved here in 8.0.0
2229d2349
< //added in 8.0.0
2237d2356
< //moved here in 9.0.0
2246d2364
< //added in 9.0.0
2278,2280d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2283d2397
< //added in 10.0.0
2306a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Prenume";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Imagine";
> $admtext['author'] = "Autor";
2311,2312c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Getting Started";
> $admtext['showlog'] = "Log schimbari";
> $admtext['nobirthinfo'] = "Nu exista informatii nastere";
> //changed in 13.0
> $admtext['savereturn'] = "Salvați + rămâneți";
> $admtext['saveback'] = "Salvați + ieșiți";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Toate articolele au fost șterse cu succes.";
> $admtext['private'] = "Privat";
> $admtext['imgtags'] = "Etichetă imagine";
> 
> $admtext['removelink'] = "Remove Link";
> $admtext['eloptions'] = "Browse or Delete";
> $admtext['pleaseenter'] = "Va rugam introduce-ti un";
> 
> $admtext['nolinks'] = "No links exist yet";
> $admtext['nogeocode'] = "Could not be geocoded";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Personalizare tip evenimente";
> $admtext['secondary'] = "Procese secundare";
> $admtext['otherevents'] = "Alte evenimente";
> //added in 14.0
> $admtext['newlinks'] = "Links create";
> $admtext['newcemlinks'] = "Cimitir links create";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Tip";
> $admtext['move'] = "Mut�";
> $admtext['copy'] = "Copiaz�";
> $admtext['title2'] = "Titlu"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Romanian-UTF8/alltext.php TNG1403/languages/Romanian-UTF8/alltext.php
85c85
< $text['none'] = "None";
---
> $text['none'] = "Nici unul";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "b.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "urm.";  //from descend
> $text['marrabbr'] = "m.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Gaseste toate persoanele cu evenimente la aceasta locatie";
> $text['firstpage'] = "Prima pagina";
> $text['lastpage'] = "Ultima pagina";
> 
> //changed in 13.0.0
> $text['problem'] = "A apărut o eroare în software-ul TNG. Ce trebuie să faceți: <p> Dacă tocmai ați instalat o actualizare, este posibil să fi omis o parte din instrucțiunile de instalare. Reveniți la pagina readme de actualizare pentru a citi instrucțiunile. Acordați o atenție deosebită pasului cu structura bazei de date. </p> <p> Dacă tocmai ați instalat TNG pentru prima dată, este posibil să fiți necesar să creați tabelele bazei de date. Reveniți la pagina readme.html pentru a găsi acest pas. </p> <p> Dacă sunteți proprietarul site-ului, puteți contacta asistența TNG pentru asistență suplimentară cu această problemă. Vă rugăm să copiați interogarea de mai jos și să o inserați în mesajul dvs.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "În nicio ramură";
> 
> //added in 14.0
> $text['oneyear'] = "year";
> $text['pwdcodelink'] = "Apasă aces link să ai o parolă trimisă ție";
> $text['pwdcodesent'] = " Un link de resetare a parolei a fost trimis la adresa ta de mail.";
> $text['moved'] = "Mutat";
> $text['citation'] = "Citare";
> $text['other'] = "Alte";
> $text['death'] = "Mort";
> $text['burial'] = "Înmorm�ntare";
> $text['cremation'] = "Incinerare";
> $text['marriage'] = "Căsătorie";
> $text['divorce'] = "DivorÈ›";
> $text['bylength'] = "Trepte";
> $text['bymarriages'] = "Căsătorii ";
> $text['none'] = "Nici unul";
> 
> //moved here in 14.0
> $text['family'] = "Familie";
> $text['source'] = "Sursa";
> $text['repository'] = "Depozite";
> $text['place'] = "Locatie";
> $admtext['BAPM'] = "Botez";
> 
> $text['glang'] = "ro";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Romanian-UTF8/text.php TNG1403/languages/Romanian-UTF8/text.php
69d68
< 		$text['general'] = "General";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Va rugam selectati doua persoane.";
---
> 		$text['select2inds'] = "Selectează te rog  doi indivizi.";
90c90
< 		$text['sameperson'] = "Doi indivizi sunt aceeasi persoana.";
---
> 		$text['sameperson'] = "Chi dot indivisible sent aceeași persoană.";
93c93
< 		$text['sometimes'] = "(Uneori verificand dupa un numar diferit de generatii campurile rezultate pot fi diferite.)";
---
> 		$text['sometimes'] = "(Cateodată căutând asupra numărului diferit de generații afișează un rezultat diferit.)";
144c144
< 		$text['dospouses2'] = "Show Spouses";
---
> 		$text['dospouses2'] = "Arată soții";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Caută după conexiuni";
> 		$text['findrel2'] = "Caută relații și alte conexiuni";
> 		$text['makeme2nd'] = "Folosește ID meu";
> 		$text['usebookmarks'] = "Folosește marcajul meu";
> 		$text['select2inds'] = "Selectează te rog  doi indivizi.";
> 		$text['indinfofor'] = "Informații individuale pentru";
> 		$text['nobookmarks'] = "Nu este maraca de folosit";
> 		$text['bkmtitle'] = "Persoane găsite în marcaje";
> 		$text['bkminfo'] = "Selectează o persoană:";
> 		$text['sortpathsby'] = "Sortati căile după număr de";
> 		$text['sortbyshort'] = "Filtrează după";
> 		$text['bylengthshort'] = "Lungime";
> 		$text['badID1'] = ": bad person1 ID - întoarce și corectează";
> 		$text['badID2'] = ": bad person2 ID - întoarce și corectează";
> 		$text['notintree'] = ":Persoana cu acest ID nu este în baza de date.";
> 		$text['sameperson'] = "Chi dot indivisible sent aceeași persoană.";;
> 		$text['nopaths'] = "Această persoană nu este conectată.";
> 		$text['nopaths1'] = "Nu mai sunt conexiuni dec�t xxx";
> 		$text['nopaths2'] = "in xxx etape de căutare";
> 		$text['longestpath'] = "(Calea cea mai lungă verificată a fost xxx etape)";
> 		$text['relevantpaths'] = "numărul relevant de căi diferite a fost de: xxx";
> 		$text['skipMarr'] = "( în  plus, numărul de căi găsit dar nu afișat din cauza prea multelor căsătorii a fost: xxx)";
> 		$text['mjaor'] = "sau or";
> 		$text['connectionsto'] = "Conexiuni la ";
> 		$text['findanotherpers'] = "Găsește altă persoană ...";
> 		$text['sometimes'] = "(Cateodată căutând asupra numărului diferit de generații afișează un rezultat diferit.)";
> 		$text['anotherpath'] = "Caută alte conexiuni";
> 		$text['xpath'] = "Cale";
> 		$text['primary'] = "Person de pornire ,,notă folosește pantry amândouă Start și End  daca1 textual  fin nu setează"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Părinte";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "his daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "tată";
> 		$text['hmother'] = "mamă";
> 		$text['hhusband'] = "soÈ›";
> 		$text['hwife'] = "soție";
> 		$text['hson'] = "fiu";
> 		$text['hdaughter'] = "fiică";
> 		$text['maxruns'] = "numărul maxim  de căi de verificat";
> 		$text['maxrshort'] = "Căile maxime";
> 		$text['maxlength'] = "Căile de conexiune nu mai lungi de";
> 		$text['maxlshort'] = "Lungimea maximă";
> 		$text['xstep'] = "Etapă";
> 		$text['xsteps'] = "Etape";
> 		$text['xmarriages'] = "xxx căsătorii";
> 		$text['xmarriage'] = "căsătorie";
> 		$text['showspouses'] = "Arată ambele soții";
> 		$text['showTxt'] = "Arată textual căilor descrise";
> 		$text['showTxtshort'] = "Descriere text";
> 		$text['compactBox'] = "Arată cutiile persoanei compacte";
> 		$text['compactBoxshort'] = "Cutii compacte";
> 		$text['paths'] = "Căile";
> 		$text['dospouses2'] = "Arată soții";
> 		$text['maxmopt'] = "Maximum de căsătorii pe conexiune";
> 		$text['maxm'] = "Maximum de căsătorii";
> 		$text['arerelated'] = "Aceste persoane sunt rude-relatația lor este în Path 1";
> 		$text['simplerel'] = "Modul simplu de căutare a rudeniei";
196d264
< 		$text['scrollnote'] = "Note: Trebuie sa rasfoiti in jos sau in dreapta pentru a vedea grafic.";
199d266
< 		$text['popupnote2'] = " = Arbore nou";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tables";
> 		$text['dtchildren'] = "Copii";
> 		$text['dtgrandchildren'] = "Nepoți";
> 		$text['dtggrandchildren'] = "Strănepoți";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Niciun descendent";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Selecteză Select";
> 		$text['dteachfulltable'] = "Fiecare tabel plin va avea";
> 		$text['dtrows'] = "rânduri";
> 		$text['dtdisplayingtable'] = "Afiseaza tabelul";
> 		$text['dtgototable'] = " Mergi la tabel:";
> 		$text['fcinstrdn'] = "Arată familia cu soție";
> 		$text['fcinstrup'] = "Arată familia cu parinți";
> 		$text['fcinstrplus'] = "Selectează alte soții";
> 		$text['fcinstrfam'] = "Selectează alți părinți";
381,383c467
< 		$text['firstpage'] = "Prima pagina";
< 		$text['lastpage'] = "Ultima pagina";
< 		$text['photoowner'] = "Proprietar/Sursa";
---
> 		$text['photoowner'] = "Proprietar de original";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Etichetă de comutare, pornire/stopare";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Parola noua din nou";
> 		$text['resetsuccess'] = "Parola a fost restată";
> 		$text['resetfail'] = "Eroare. Parola nu  a fost resetată";
> 		$text['failreason0'] = "(eroare baze de date necunoscuta)";
> 		$text['failreason2'] = "(nu ai permisiunea sa schimbi parola)";
> 		$text['failreason3'] = "(parola nu e corecta)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Sursele totale citate";
618d710
< 		$text['loginfirst'] = "You must log in first.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Au fost detectate înregistrări de utilizatori existente. Pentru a continua, trebuie mai întâi să vă autentificați sau să eliminați toate înregistrările din tabelul utilizatorilor.";
629,630d722
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Out";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "b.";
< $text['chrabbr'] = "c.";
675d788
< $text['family'] = "Familie"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
706d817
< $text['burialabbr'] = "urm.";  //from descend
712d822
< $text['place'] = "Locatie";
715d824
< $text['marrabbr'] = "m.";
738d846
< $text['source'] = "Sursa";
766d873
< $text['repository'] = "Depozite";
770d876
< $text['findplaces'] = "Gaseste toate persoanele cu evenimente la aceasta locatie";
804d909
< $text['glang'] = "&amp;hl=ro";
816d920
< $text['none'] = "None";
924d1027
< $text['otherevents'] = "Alte evenimente";
952,953d1054
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Link-uri rapide";
> $text['yourname'] = "Numele tău";
> $text['youremail'] = "Adresa ta de e-mail";
> $text['liketoadd'] = "Orice informație pe care doriți să o adăugați";
> $text['webmastermsg'] = "Mesaj pentru webmasteri";
> $text['gallery'] = "Vezi Galerie";
> $text['wasborn_male'] = "sa născut";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "sa născut"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "a fost botezat";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "a fost botezat";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "a murit";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "a murit";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "a fost îngropat"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "a fost îngropat"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "a fost cremat";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "a fost cremat";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "căsătorit";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "căsătorit";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "a fost divorțat";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "a fost divorțat";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " pe ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "și ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Vizitator";
> 
> $text['popupnote2'] = " = Arbore nou";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom In";
> $text['zoomout'] = "Zoom Out";
> $text['scrollnote'] = "Note: Trebuie sa rasfoiti in jos sau in dreapta pentru a vedea grafic.";
> $text['general'] = "General";
> 
> //changed in 14.0
> $text['otherevents'] = "Alte evenimente";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Conexiuni";
> $text['continue'] = "Continua...";
> $text['title2'] = "Titlu"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Russian-UTF8/admintext.php TNG1403/languages/Russian-UTF8/admintext.php
1,2311c1,2465
< <?php
< switch ( $textpart ) {
< 	//branches.php, branchmenu.php
< 	case "branches":
< 		$admtext['branchlabel'] = "�азвание ветви";
< 		$admtext['existingbranch'] = "Суще�твующа� ветвь";
< 		$admtext['newbranch'] = "�ова� ветвь";
< 		$admtext['numgenerations'] = "Количе�тво поколений";
< 		$admtext['ancestors'] = "Предки";
< 		$admtext['descofanc'] = "Потомки каждого предка";
< 		$admtext['descendants'] = "Потомки";
< 		$admtext['includespouses'] = "Включить �упругов потомков";
< 		$admtext['partial'] = "Ча�тично";
< 		$admtext['addlabels'] = "Добавить ��ылки на ветвь";
< 		$admtext['clearlabels'] = "Удалить ��ылки на ветвь";
< 		$admtext['clearingbranch'] = "Удаление ��ылок на ветвь...";
< 		$admtext['addingbranch'] = "Добавление ��ылок на ветвь...";
< 		$admtext['totalaffected'] = "Полно�тью изменено";
< 		$admtext['labelmore'] = "Св�зать больше ветвей";
< 		$admtext['enterbranch'] = "Выберите �уще�твующую ветвь или добавьте новую.";
< 		$admtext['enterstartingind'] = "Выберите ID первого человека.";
< 		$admtext['gensnumeric'] = "Количе�тво предков и потомков должно быть вне�ено чи�лами.";
< 		$admtext['overwrite'] = "Перепи�ать";
< 		$admtext['branchid'] = "ID ветви";
< 		$admtext['addnewbranch'] = "Добавить новую ветвь";
< 		$admtext['createbranch'] = "Сделать запи�ь дл� новой ветви";
< 		$admtext['existingbranchinfo'] = "Информаци� о �уще�твующей ветви";
< 		$admtext['editexistingbranch'] = "Изменить информацию о ранее добавленной ветви";
< 		$admtext['confbranchdelete'] = "Вы уверены, что хотите удалить �ту ветвь?";
< 		$admtext['enterbranchid'] = "Введите, пожалуй�та, номер ветви.";
< 		$admtext['entertreedesc'] = "Введите, пожалуй�та, опи�ание ветви.";
< 		$admtext['newbranchinfo'] = "Информаци� об �той новой ветви";
< 		$admtext['modifybranch'] = "Изменить �уще�твующую ветвь";
< 		$admtext['changestobranch'] = "Изменени� �той ветви";
< 		$admtext['existlabels'] = "Суще�твующие ��ылки";
< 		$admtext['leave'] = "�е измен�ть";
< 		$admtext['append'] = "Добавить новую";
< 		$admtext['showpeople'] = "Показать людей �той ветви";
< 		$admtext['branchdiscl'] = "Это чи�ло отражает количе�тво ��ылок на ветвь, но оно не об�зательно должно равн�ть�� количе�тву людей или �емей, которые в данный момент �в�заны � �той ветвью. Е�ли Вы недавно �нова импортировали ваши данные, может быть необходимо оп�ть при�воить �рлыки ветв�м.";
< 		$admtext['inclspouses'] = "Включать �упругов дл� в�ех потомков";
< 		$admtext['delpeople'] = "Удалить людей и �емьи �той ветви";
< 		$admtext['confbrdel'] = "Вы дей�твительно хотите удалить людей и �емьи �той ветви?";
< 		break;
< 		
< 	//addcemetery.php, updatecemetery.php, findcemetery.php, cemeteries.php, editcemetery.php, newcemetery.php
< 	case "cemeteries":
< 		$admtext['mapnotcopied'] = "Файл карты не может быть �копирован в";
< 		$admtext['changestocem'] = "Изменени� в кладбищах";
< 		$admtext['modifycemetery'] = "Изменить �уще�твующие кладбища";
< 		$admtext['addnewcemetery'] = "Добавить новое кладбище";
< 		$admtext['createnewcemetery'] = "Сделайте запи�ь дл� нового кладбища";
< 		$admtext['selectcemaction'] = "Выберите кладбище и дей�твие";
< 		$admtext['location'] = "Ме�то";
< 		$admtext['confdeletecem'] = "Вы уверены, что хотите удалить �то кладбище?";
< 		$admtext['editceminfo'] = "Изменить информацию об уже добавленном кладбище";
< 		$admtext['leaveblankallcems'] = "О�тавить незаполненным, чтобы показать в�е кладбища";
< 		$admtext['cemeteryname'] = "�азвание кладбища";
< 		$admtext['mapfilename'] = "�азвание файла � картой";
< 		$admtext['countyparish'] = "Район/Обла�ть";
< 		$admtext['stateprovince'] = "Провинци�/Го�удар�тво";
< 		$admtext['entercountry'] = "Введите название �траны.";
< 		$admtext['entermapfile'] = "Введите название файла Вашего файла � картой на веб-�ервер.";
< 		$admtext['existingceminfo'] = "Информаци� о �уще�твующем кладбище";
< 		$admtext['newceminfo'] = "Информаци� о новом кладбище";
< 		$admtext['maptoupload'] = "Загрузить изображение карты";
< 		$admtext['mapfilenamefolder'] = "�азвание файла � картой<br/>в папке надгробий";
< 		$admtext['ifmapuploaded'] = "О�тавить �то поле пу�тым, е�ли �тот файл уже е�ть в папке надгробий.";
< 		$admtext['requiredmap'] = "Об�зательно к заполнению, е�ли Вы и�пользуете карту. Содержимое пол� должно �овпадать � названием и ме�том Вашего файла в папке надгробий  по�ле того, как файл загружен. �апример, е�ли Ваша папка надгробий называет�� <em>&#171;�адгроби�&#187;</em>,  и Вы хотите Ваш файл назвать <em>&#171;Карта.jpg&#187;</em> и поме�тить в подкаталог, названный <em>&#171;Мои карты&#187;</em>, тогда Вы должны запи�ать �то так: <em>&#171;Мои карты/Карта.jpg&#187;</em> в �том поле.";
< 		//added in 8.0.0
< 		$admtext['linkplace'] = "Св�занное ме�то";
< 		$admtext['fillplace'] = "Заполнить ме�то";
< 		$admtext['usecemcoords'] = "Скопировать информацию о геокодировании ниже в �то ме�то";
< 		break;
< 	
< 	//addentity.php, newentity.php
< 	case "entities":
< 		$admtext['alreadyexists'] = "уже �уще�твует";
< 		$admtext['added'] = "Добавлено";
< 		$admtext['enternew'] = "Добавьте новую, пожалуй�та";
< 		$admtext['pleaseenter'] = "�ажмите enter";
< 		$admtext['netscapereload'] = "Пользовател�м Netscape: <br>Вы должны заново загрузить �траницу � ме�том захоронени�, чтобы увидеть новые";
< 		break;
< 		
< 	//addnote.php, deletenote.php, updatenote.php, newnote.php
< 	case "notes":
< 		$admtext['deletingnote'] = "Заметка удал�ет��...";
< 		$admtext['addingnote'] = "Заметка добавл�ет��...";
< 		$admtext['addnewnote'] = "Добавить новую заметку";
< 		$admtext['note'] = "Заметка";
< 		$admtext['modifynote'] = "Изменить заметку";
< 		//added in 8.0.0
< 		$admtext['notechanges'] = "Изменени� в заметке";
< 		break;
< 
< 	//addevent.php, deleteevent.php, updateevent.php, editevent.php, newevent.php
< 	case "events":
< 		$admtext['addingevent'] = "Событие добавл�ет��...";
< 		$admtext['deletingevent'] = "Событие удал�ет��...";
< 		$admtext['updatingevent'] = "Событие обрабатывает��...";
< 		$admtext['modifyevent'] = "Изменить �обытие";
< 		$admtext['addnewevent'] = "Добавить новое �обытие";
< 
< 		$admtext['dateformat'] = "(ДД ММ ГГГГ)";
< 		$admtext['age'] = "Возра�т";
< 		$admtext['agency'] = "Учреждение";
< 		$admtext['cause'] = "Причина";
< 		$admtext['moreinfo'] = "Дополнительна� информаци�";
< 		//added in 11.0.0
< 		$admtext['dupfor'] = "Дубликат дл�";
< 		break;
< 
< 	//gedimport.php
< 	case "gedimport":
< 		$admtext['importinggedcom'] = "Импортирует�� GEDCOM...<br>(�то может зан�ть не�колько минут)";
< 		$admtext['ifimportfails'] = "Е�ли импорт прервет��,";
< 		$admtext['opened'] = "открыто...";
< 		$admtext['toresume'] = "чтобы возобновить импорт";  //cannot open to resume import
< 		$admtext['openedtoresume'] = "открыто, чтобы возобновить импорт...";
< 		$admtext['notresumed'] = "�евозможно возобновить импорт.";
< 		$admtext['finishedimporting'] = "GEDCOM импортирован";
< 		$admtext['treeexists'] = "Генеалогиче�кое древо � выбранным идентификационным номером уже �уще�твует. Выберите другой номер и попробуйте �нова.";
< 		$admtext['backtodataimport'] = "�азад к импорту �ведений";
< 		$admtext['moreoptions'] = "Больше опций";
< 		$admtext['removeged'] = "Удалить GEDCOM файл (опци�)";
< 		$admtext['cannotupload'] = "�е удало�ь загрузить файл:";
< 		$admtext['invfperms'] = "У Вашей папки &#171;gedcom&#187; могут быть не�оответ�твующие разрешени� (попробуйте 755 или 777).";
< 		$admtext['maybedone'] = "Это, возможно, уже закончило�ь.";
< 		$admtext['turnonsis'] = "Убедите�ь, что &#171;Сохранить �о�то�ние импорта&#187; включено в на�тройках импорта.";
< 		//no break here is intentional to allow import scripts to have access to eventtypes messages
< 	//addeventtype.php, updateeventtype.php, eventtypes.php, neweventtype.php, editeventtype.php
< 	case "eventtypes":
< 		$admtext['changestoevtype'] = "Изменени� в типе �обыти�";
< 		$admtext['modifyeventtype'] = "Изменить �уще�твующий тип �обыти�";
< 		$admtext['individual'] = "Человек";
< 		$admtext['entertypedesc'] = "Введите тип или опи�ание дл� �того нового �обыти�.";
< 		$admtext['enterdisplay'] = "Введите название или �окращенное название дл� �того нового типа �обытий.";
< 		$admtext['existingeventtypeinfo'] = "Информаци� о �уще�твующем типе �обытий";
< 		$admtext['neweventtypeinfo'] = "Информаци� о новом типе �обытий";
< 		$admtext['tag'] = "Метка";
< 		$admtext['typedescription'] = "Тип/Опи�ание";
< 		$admtext['onimport'] = "При импортировании";
< 		$admtext['accept'] = "Прин�ть";
< 		$admtext['ignore'] = "Отменить";
< 		$admtext['typerequired'] = "Е�ли выбрана метка &#171;EVEN&#187;, то поле �вл�ет�� об�зательным, а дл� о�тальных меток не об�зательно.";
< 		$admtext['addnewevtype'] = "Добавить новый тип �обытий";
< 		$admtext['createnewevtype'] = "Сделать новую запи�ь дл� типа �обытий";
< 		$admtext['forindividuals'] = "Дл� людей...";
< 		$admtext['forfamilies'] = "Дл� �емей...";
< 		$admtext['existingevtypes'] = "Суще�твующие типы �обытий";
< 		$admtext['edsevtypes'] = "Изменить, удалить или �ортировать заранее введенные типы �обытий";
< 		$admtext['indfam'] = "Семь�";  //individual family
< 		$admtext['confdeleteevtype'] = "Вы уверены, что хотите удалить �тот тип �обытий?";
< 		$admtext['selecttag'] = "Выбрать метку";
< 		$admtext['selectentertag'] = "Выбрать или вне�ти метку дл� �того типа �обытий.";
< 		$admtext['orenter'] = "или вве�ти новую";
< 		$admtext['ifbothdata'] = "Е�ли оба пол� �одержат данные, будет и�пользована метка в �том поле.";
< 		$admtext['EVEN'] = "Событие";
< 		$admtext['ADOP'] = "У�ыновление";
< 		$admtext['ADDR'] = "�дре�";
< 		$admtext['ALIA'] = "Также изве�тен как";
< 		$admtext['BARM'] = "Бар-мицва";
< 		$admtext['BASM'] = "Ба�-мицва";
< 		$admtext['CAST'] = "Ка�та / Социальный �тату�";
< 		$admtext['CENS'] = "Перепи�ь на�елени�";
< 		$admtext['CHRA'] = "Крещение взро�лых";
< 		$admtext['CONF'] = "Конфирмаци�";
< 		$admtext['CREM'] = "Кремаци�";
< 		$admtext['DSCR'] = "Опи�ание внешно�ти";
< 		$admtext['EDUC'] = "Образование";
< 		$admtext['EMIG'] = "Эмиграци�";
< 		$admtext['FCOM'] = "Первое прича�тие";
< 		$admtext['GRAD'] = "Диплом / Степень";
< 		$admtext['IDNO'] = "Идентификационный номер";
< 		$admtext['IMMI'] = "Эмиграци�";
< 		$admtext['LANG'] = "Язык";
< 		$admtext['NATI'] = "�ационально�ть";
< 		$admtext['NATU'] = "�атурализаци�";
< 		$admtext['NCHI'] = "Количе�ктво детей";
< 		$admtext['NMR'] = "Количе�тво браков";
< 		$admtext['OCCU'] = "Профе��и�";
< 		$admtext['ORDI'] = "По�тановление";
< 		$admtext['ORDN'] = "По�триг";
< 		$admtext['PHON'] = "Телефон";
< 		$admtext['PROB'] = "Реги�траци�";
< 		$admtext['PROP'] = "Имуще�тво";
< 		$admtext['RELI'] = "Религи�";
< 		$admtext['RESI'] = "Ме�то пребывани�";
< 		$admtext['RESN'] = "Ограничение";
< 		$admtext['RETI'] = "�а пен�ии";
< 		$admtext['RFN'] = "По�то�нный реги�трационный номер";
< 		$admtext['SSN'] = "�омер SOFI";
< 		$admtext['WILL'] = "Завещание";
< 		$admtext['ANUL'] = "Уничтожение";
< 		$admtext['DIVF'] = "Зареги�трированный развод";
< 		$admtext['ENGA'] = "Обручение";
< 		$admtext['MARB'] = "Объ�вление о пред�то�щем браке";
< 		$admtext['MARC'] = "Брачный контракт";
< 		$admtext['MARL'] = "Согла�ие на брак";
< 		$admtext['MARS'] = "У�лови� дл� заключени� брака";
< 		$admtext['forsources'] = "И�точники...";
< 		$admtext['RIN'] = "�омер запи�и";
< 		$admtext['REFN'] = "�омер рекомендаций";
< 		$admtext['REPO'] = "Ме�то находки";
< 
< 		$admtext['deleteselected'] = "Удалить выбранное";
< 		$admtext['ignoreselected'] = "Отменить выбор";
< 		$admtext['acceptselected'] = "Сохранить выбранное";
< 		$admtext['changestoallevtypes'] = "Изменени� дл� в�ех типов �обытий";
< 		$admtext['forrepos'] = "Дл� ме�т находки...";
< 		$admtext['noevtypes'] = "�е�уще�твующий тип �обытий.";
< 		$admtext['DESI'] = "Потомки-интере�ы";
< 		$admtext['allnone'] = "Введите отображаемое �ообщение дл� каждого �зыка,<br />или о�тавьте в�е пу�тым и введите одно отображаемое �ообщение выше.";
< 		$admtext['assocwith'] = "Св�зано �";
< 		$admtext['BAPM'] = "Крещение";
< 		$admtext['umps'] = "Возможно, что Ваш GEDCOM-файл больше, чем позвол�ет Ваши параметры PHP. Попро�ите Вашего провайдера увеличить параметр &#171;upload_max_filesize&#187;, или �копируйте GEDCOM-файл в папку &#171;gedcom&#187; на Вашем �айте и импортируйте файл оттуда.";
< 		$admtext['othlangs'] = "Другие �зыки";
< 		$admtext['evdata'] = "Данные �обыти�";
< 		$admtext['ANCI'] = "Предок-интере�ы";
< 		//added in 10.0.0
< 		$admtext['collapseev'] = "Свернуть �обытие";
< 		$admtext['collapse'] = "Свернуть";
< 		$admtext['collapseselected'] = "Свернуть выбранные";
< 		//added in 11.0.0
< 		$admtext['expselected'] = "Развернуть выбранные";
< 		//added in 12.0.0
< 		$admtext['ldsevent'] = "Событие СПД";
< 		break;
< 
< 	//addfamily.php, updatefamily.php, findfamily.php, editfamily.php, newfamily.php
< 	case "families":
< 		$admtext['changestofamily'] = "Изменени� в �емье";
< 		$admtext['marrdate'] = "Дата �вадьбы"; //marriage date
< 		$admtext['modifyfamily'] = "Изменить �уще�твующую �емью";
< 		$admtext['selectfamaction'] = "Выбрать �емью и дей�твие";
< 		$admtext['confdeletefam'] = "Вы уверены, что хотите удалить �ту �емью?";
< 		$admtext['existingfamilyinfo'] = "Информаци� о �уще�твующей �емье";
< 		$admtext['newfamilyinfo'] = "Информаци� о новой �емье";
< 		$admtext['sealedsdate'] = "Дата обр�да запечатывани� (СПД)";     //S is for spouse
< 		$admtext['sealedsplace'] = "Ме�то обр�да запечатывани� (СПД)";     //S is for spouse
< 		$admtext['newchildren'] = "�овые дети";
< 		$admtext['addnewfamily'] = "Добавить новую �емью";
< 		$admtext['createnewfamily'] = "Сделать запи�ь о новой �емье";
< 		$admtext['editexistingfaminfo'] = "Изменить информацию об уже зане�енной �еьме";
< 		$admtext['spousesids'] = " Идентификационный номер �упругов";
< 		$admtext['noname'] = "�ет имени";
< 		$admtext['familyidbefevent'] = "Сначала Вы должны вне�ти Идентификационный номер �емьи, прежде чем Вы �можете добавить новые �обыти�.";
< 		$admtext['prefixfamilyid'] = "Вначале ID �емьи должна �то�ть буква &#171;F&#187; (Family)";
< 		$admtext['validfamilyid'] = "Введите дей�твительный ID �емьи. Дей�твительный ID - �то по�ледовательно�ть цифр, начинающих�� � буквы &#171;F&#187;.";
< 		$admtext['familyidbefnote'] = "Вы должны вне�ти Идентификационный номер �емьи, прежде чем �можете добавить новые запи�и.";
< 		$admtext['familyidbefcite'] = "Вы должны �начала вве�ти Идентификационный номер �емьи, чтобы иметь возможно�ть и�пользовать цитаты дл� �той �емьи.";
< 		$admtext['genfamily'] = "Стандартна� �емь�";
< 		$admtext['marriagetype'] = "Тип брака";
< 		$admtext['reviewfamilies'] = "Сохранить или изменить предложенные изменени� дл� �емьи";
< 		$admtext['fevslater'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента";
< 		$admtext['husbid'] = "ID мужа";  //husband ID
< 		$admtext['wifeid'] = " ID жены";
< 		$admtext['enternamepart'] = "Введите ча�ть имени и/или фамилии";
< 		$admtext['pleasenamepart'] = "Пожалуй�та, Введите ча�ть имени и/или фамилии.";
< 		$admtext['clickfind'] = "�ажмите �айти или Создать =>";
< 		$admtext['chunlinked'] = "Ребёнок не �в�зан � �емьёй";
< 		$admtext['child'] = "Ребёнок";
< 		break;
< 
< 	//addperson.php, addperson2.php, updateperson.php, findperson.php, editperson.php, newperson.php, newperson2.php, people.php, findperson2.php
< 	case "people":
< 		$admtext['addingperson'] = "Добавление человека...";
< 		$admtext['changestoperson'] = "Изменени� дл� человека";
< 		$admtext['nobirthinfo'] = "�ет информации о рождении";
< 		$admtext['modifyperson'] = "Редактировать �уще�твующего человека";
< 		$admtext['selectpersaction'] = "Выберите человека и дей�твие";
< 		$admtext['existingpersoninfo'] = "Суще�твующа� информаци� о человеке";
< 		$admtext['firstgivennames'] = "Полное им�";
< 		$admtext['lastsurname'] = "Фамили�";
< 		$admtext['nickname'] = "Прозвище";
< 		$admtext['male'] = "Мужчина";
< 		$admtext['female'] = "Женщина";
< 		$admtext['bapldate'] = "Дата крещени� (СПД)";
< 		$admtext['baplplace'] = "Ме�то крещени� (СПД)";
< 		$admtext['endldate'] = "Дата благо�ловени� (СПД)";
< 		$admtext['parents'] = "Родители";
< 		$admtext['father'] = "Отец";
< 		$admtext['mother'] = "Мать";
< 		$admtext['unlinkindividual'] = "От�оединить �того человека";
< 		$admtext['aschild'] = "в каче�тве ребёнка";
< 		$admtext['sealedpdate'] = "Дата обр�да запечатывани� O (СПД)";     //P is for parents
< 		$admtext['sealedpplace'] = "Ме�то обр�да запечатывани� 0 (СПД)";     //P is for parents
< 		$admtext['asspouse'] = "в каче�тве �упруга/�упруги";
< 		$admtext['spouse'] = "Супруг(а)";
< 		$admtext['ordernumber'] = "�омер по пор�дку";
< 		$admtext['married'] = "Замужем (женат)";
< 		$admtext['nonewfamily'] = "При �охранении не переходить на новую �емью.";
< 		$admtext['addnewperson'] = "Добавить нового человека";
< 		$admtext['createperson'] = "Создать запи�ь дл� нового человека";
< 		$admtext['personidbefevent'] = "Сначала необходимо вве�ти Идентификационный номер (ID) человека, прежде чем добавл�ть �обыти�.";
< 		$admtext['prefixpersonid'] = "Вначале ID человека должна �то�ть буква &#171;I&#187; (Individual)";
< 		$admtext['validpersonid'] = "Введите дей�твительный ID человека. Дей�твительный ID �то �трока из не�кольких чи�ел, начинающа��� � &#171;I&#187;.";
< 		$admtext['newpersoninfo'] = "Информаци� о новом человеке";
< 		$admtext['selectsex'] = "Выберите пол.";
< 		$admtext['shortform'] = "Кратка� форма";
< 		$admtext['editexistingpersoninfo'] = "Изменить информацию дл� ранее введенного человека";
< 		$admtext['unknown'] = "�еизве�тно";
< 		$admtext['personidbefnote'] = "Прежде, чем Вы �можете добавл�ть новые запи�и, Вы должны вве�ти идентификационный номер человека.";
< 		$admtext['endlplace'] = "Ме�то дарени� (СПД)";
< 		$admtext['personidbefcite'] = "Прежде, чем Вы �можете и�пользовать цитаты по отношению к �тому человеку, Вы должны вве�ти идентификационный номер �того человека.";
< 		$admtext['relationship'] = "Отношени�";
< 		$admtext['asspouse'] = "в каче�тве �упруга/�упруги";
< 		$admtext['mergepeople'] = "Объединить информацию из разных запи�ей об одном человеке.";
< 		$admtext['choosemerge'] = "Выбрать людей дл� объединени� или найти возможные �овпадени�";
< 		$admtext['usesoundex'] = "И�пользовать Soundex (алгоритм �равнени� по звучанию)";
< 		$admtext['sdxdisclaimer'] = "При и�пользовании �той опции программа будет дольше и�кать �ледующее �овпадение или дубликат.";
< 		$admtext['combinenotes'] = "Объедините заметки и цитаты";
< 		$admtext['confirmmerge'] = "Вы уверены, что хотите объединить запи�и об �тих люд�х?";
< 		$admtext['gotonewfamily'] = "Создать новую �емью, и�пользу� информацию об �том человеке";
< 		$admtext['genperson'] = "Общие данные о человеке";
< 		$admtext['reviewpeople'] = "Прин�ть или отклонить предварительные изменени� дл� людей";
< 		$admtext['nokids'] = "�ет детей";
< 		$admtext['noparents'] = "�ет родителей";
< 		$admtext['association'] = "Св�зь";
< 		$admtext['deletingassoc'] = "Св�зь удал�ет��...";
< 		$admtext['addingassoc'] = "Св�зь добавл�ет��...";
< 		$admtext['updatingassoc'] = "Св�зь измен�ет��...";
< 		$admtext['addnewassoc'] = "Добавить новую �в�зь";
< 		$admtext['modifyassoc'] = "Изменить �уще�твующую �в�зь";
< 		$admtext['pevslater'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента.";
< 		$admtext['ashusband'] = "как �упруг";
< 		$admtext['aswife'] = "как �упруга";
< 		$admtext['pevslater2'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента.";
< 		$admtext['nospouse'] = "�ет �упруга(и)";
< 		$admtext['revassoc'] = "Также добавить обратную �в�зь дл� �тих людей";
< 		$admtext['prefix'] = "Префик�";
< 		$admtext['chkdel'] = "У�тановите пу�той флажок, чтобы удалить �лемент �лева";
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Выберете фото <br/>по умолчанию<br/>"; //has to fit in a small box
< 		//added in 10.0.0
< 		$admtext['confdate'] = "Дата конфирмации (СПД)";
< 		$admtext['confplace'] = "Ме�то конфирмации (СПД)";
< 		$admtext['initdate'] = "Дата по�в�щени� (СПД)";
< 		$admtext['initplace'] = "Ме�то по�в�щени� (СПД)";
< 		break;
< 
< 	case "headstones":
< 	case "photos":
< 		//$admtext['photonotcopied'] = "The photo file could not be copied to";
< 		$admtext['thumbnailnotcopied'] = "�е удало�ь �копировать файл миниатюры в";
< 		$admtext['photo'] = "фото";
< 		$admtext['changestophoto'] = "Изменени� фотографии";
< 		$admtext['modifyphoto'] = "Изменить �уще�твующее фото";
< 		$admtext['addnewphoto'] = "Добавить новую фотографию";
< 		$admtext['selectphotoaction'] = "Выбрать фотографию и дей�твие";
< 		$admtext['photoid'] = "Идентификационный номер фотографии";
< 		$admtext['confdeletephoto'] = "Вы уверены, что хотите удалить �ту фотографию и в�е ��ылки на нее?";
< 		$admtext['enterphotopath'] = "Введите путь (папку и название файла) дл� �того файла � фотографией в Вашей папке � фотографи�ми на Вашем веб-�ервере.";
< 		$admtext['enterthumbnailpath'] = " Введите путь (папку и название файла) дл� �той миниатюры в Вашей папке � фотографи�ми на Вашем веб-�ервере.";
< 		$admtext['enterphotodesc'] = "Дайте опи�ание �той фотографии.";
< 		$admtext['existingphotoinfo'] = "Информаци� о �уще�твующей фотографии";
< 		//$admtext['newphotoinfo'] = "New Photo Information";
< 		$admtext['thumbnailfile'] = "Файл миниатюры";
< 		//$admtext['thumbnailtoupload'] = "Image file to upload";
< 		$admtext['fileandpath'] = "�азвание файла и пути";
< 		$admtext['sortphotos'] = "Сортировать фотографии";
< 		$admtext['sortphotosfor'] = "Сортировать фотографии дл�";
< 		$admtext['editexistingphotoinfo'] = "Изменить информацию об уже добавленной фотографии";
< 		$admtext['leaveblankallphotos'] = "Очи�тить, чтобы показать в�е фотографии";
< 		$admtext['headstone'] = "�адгробие";
< 		$admtext['imagenotcopied'] = "Файл � изображением не может быть �копирован";
< 		$admtext['changestohs'] = "Изменени� в надгроби�х";
< 		$admtext['modifyheadstone'] = "Измените данные �уще�твующего надгроби�";
< 		$admtext['selecthsaction'] = "Выберите надгробие и дей�твие";
< 		$admtext['confdeletehs'] = "Вы уверены, что хотите удалить �ведени� об �том надгробии?";
< 		$admtext['photostatus'] = "Фотографи�/Стату�";
< 		$admtext['selectcemetery'] = "Выберите кладбище.";
< 		$admtext['enterhsimage'] = "Введите название папки дл� Ваших фотографий надгробий на веб-�ервере.";
< 		$admtext['existinghsinfo'] = "Информаци� о �уще�твующем надгробии";
< 		$admtext['newhsinfo'] = "Информаци� о новом надгробии";
< 		$admtext['hsimagefile'] = "Файл � фотографией надгроби�";
< 		$admtext['located'] = "Локализировано";
< 		$admtext['notyetlocated'] = "не локализировано";
< 		$admtext['unmarked'] = "�е отмечено";
< 		$admtext['missing'] = "От�ут�твует";
< 		$admtext['leaveblankhs'] = "О�тавьте �то поле пу�тым, е�ли файлы уже наход�т�� в папке � надгроби�ми.";
< 		$admtext['requiredhs'] = "Об�зательно. Это �одержание �того пол� должно �овпадать � названием и ме�том Вашего файла <em> в папке � надгроби�ми</em> по�ле того, как файл загружен. �апример, е�ли Ваша папка называет�� <em>&#171;Фотографии/�адгроби�&#187;</em>, и Вы хотите файл назвать <em>&#171;�адгробие.jpg&#187;</em> и хотите его поме�тить в подкаталог названный &#171;Фотографии/�адгроби�&#187;, <em>&#171;�овые надгроби�&#187;</em> , тогда Вам �ледует набрать в �том поле <em>&#171;�овые надгроби�/�адгробие.jpg&#187;</em>.";
< 		$admtext['addnewhs'] = "Добавить новое надгробие";
< 		$admtext['createnewhs'] = "Сделать запи�ь о новом надгробии и прив�зать ее к человеку";
< 		$admtext['editexistinghsinfo'] = "Изменить информацию об уже введенном надгробии";
< 		$admtext['leaveblankallhs'] = "О�тавить незаполненной, чтобы показать в�е надгроби�";
< 		$admtext['cemnamelocation'] = "�азвание ме�тонахождени� кладбища";
< 		$admtext['pedphoto'] = "И�пользуйте �ту фотографию в таблицах потомков и в naamtitels";
< 		$admtext['photoowner'] = "Владелец/И�точник";
< 		$admtext['dimensions'] = "Размеры";
< 		$admtext['selectphoto'] = "Выбрать фотографию";
< 		$admtext['specifyimg'] = "Указать изображение";
< 		$admtext['autoimg'] = "Сделать из оригинала";
< 		$admtext['enterthumbpath'] = "Выберете ме�то дл� миниатюры";
< 		$admtext['genthumbs'] = "Создать миниатюры";
< 		$admtext['genthumbsdesc'] = "�втоматиче�ки �оздавать уменьшенные вер�ии в�ех фотографий, дл� которых нет миниатюр.";
< 		$admtext['thumbsgenerated'] = "Миниатюры �озданы";
< 		$admtext['makedefault'] = "И�пользовать по умолчанию";
< 		$admtext['filewithinhs'] = "Путь в папке � надгроби�ми <br>(подкаталог и название файла)";
< 		$admtext['recsupdated'] = "Сведени� изменены";
< 		$admtext['removedef'] = "Удалить �тандартную фотографию";
< 		$admtext['numlinkhs'] = "Количе�тво людей дл� �в�зывани� � �тим надгробием";
< 		$admtext['sortheadstones'] = "Сортировать надгроби�";
< 		$admtext['sortheadstonesfor'] = "Сортировать надгроби� дл�";
< 		$admtext['sortheadstonesind'] = "Сортировать надгроби� дл� человека";
< 		$admtext['headstoneorder'] = "Задайте пор�док надгробий, �в�занных � определенным человеком";
< 		$admtext['enternumberforphoto'] = "Задайте каждой теме пор�дковый номер.";
< 		$admtext['updownforphoto'] = "Кликните на �трелки, чтобы изменить пор�док.";
< 		$admtext['createnewphoto'] = "Сделать запи�ь дл� новой фотографии и �в�зать ее � лицами, �емь�ми или и�точниками";
< 		$admtext['numlinkphoto'] = "Количе�тво людей, �емей или и�точников, которое Вы хотите �в�зать � �той фотографией";
< 		$admtext['photoorder'] = "Задайте пор�док предпочтений дл� фотографий, �в�занных � определенным человеком, �емьей или и�точником";
< 		$admtext['assigndefs'] = "�азначить фотографии по умолчанию";
< 		$admtext['assigndefsdesc'] = "Дл� человека или �емьи назначить первую загруженную фотографию фотографией по умолчанию";
< 		$admtext['overwritedefs'] = "Перезапи�ать �уще�твующие фотографии по умолчанию";
< 		$admtext['assign'] = "�азначить";
< 		$admtext['defsassigned'] = "Заданные фотографии по умолчанию";
< 		//$admtext['isdocument'] = "This image is a document";
< 		$admtext['imgmap'] = "Карта изображений";
< 		$admtext['circle'] = "круг";
< 		$admtext['rect'] = "пр�моугольник";
< 		$admtext['poly'] = "многоугольник";
< 		$admtext['shape'] = "Форма обла�ти";
< 		//$admtext['radius'] = "Radius (pixels)";
< 		$admtext['width'] = "Ширина (пик�ели)";
< 		$admtext['height'] = "Вы�ота (пик�ели)";
< 		$admtext['imgdim'] = "Сведени� об изображении";
< 		$admtext['pixw'] = "пик�елей в ширину";
< 		$admtext['pixh'] = "пик�елей в вы�оту";
< 		//$admtext['convtohs'] = "Convert to Headstones";
< 		//$admtext['convtodoc'] = "Convert to Documents";
< 		//$admtext['convtophoto'] = "Convert to Photos";
< 		$admtext['changestoallphotos'] = "Применить изменени� ко в�ем выбранным фотографи�м";
< 		$admtext['changestoallhs'] = " Применить изменени� ко в�ем выбранным надгроби�м";
< 		$admtext['datetaken'] = "Дата �ъёмки/�оздани�";
< 		$admtext['placetaken'] = "Ме�то �ъёмки/�оздани�";
< 		$admtext['abspath'] = "Этот медиафайл из внешнего и�точника (вы должны �ами �оздать его миниатюру)";
< 		$admtext['imagefile'] = "Медиафайл";
< 		$admtext['pathwithinphotos'] = "�азвание файла на �айте";
< 		$admtext['linktocem'] = "Св�жите �тот �нимок напр�мую � выбранным кладбищем";
< 		$admtext['defphotonote'] = "И�пользовать миниатюру, чтобы идентифицировать �того человека, �емью или и�точник на родо�ловной и других диаграммах, включа� �емейные ли�ты.";
< 		$admtext['photonotadded'] = "Элемент не может быть добавлен, �корее в�его, потому, что уже �уще�твует друга� запи�ь дл� указанной коллекции и файла.";
< 		$admtext['requiredphoto'] = "Об�зательно. По�ле того, как файл загружен, �одержание �того пол� должно �оответ�твовать названию и ме�ту файла <em>в папке � медиафайлами (коллекцией)</em>. �апример, е�ли Ваша коллекци� называет�� <em>&#171;Мультимедиа&#187;</em>, и Вы хотите назвать Ваш файл <em>&#171;Мо� фотографи�.jpg&#187;</em> и хотите поме�тить его в подпапку <em>&#171;�овые фотографии&#187;</em>, тогда Вы должны вве�ти в �том поле <em>&#171;�овые фотографии/Мо� фотографи�.jpg&#187;</em>.";
< 		$admtext['leaveblankphoto'] = "О�тавьте �то поле пу�тым, е�ли файл уже загружен.";
< 		$admtext['thumbconflicts'] = "Миниатюры не были �озданы из-за путей, разрешений, проблем � размерами или именами файлов";
< 		$admtext['showmap'] = "Показывать карту кладбища и фото в��кий раз, когда отображает�� �тот �лемент";
< 		$admtext['bodytext'] = "<strong>ИЛИ</strong><br/>только тек�т";
< 		$admtext['usenl'] = "Заменить концы �трок в тек�те на концы �трок в HTML-кодировке, чтобы их можно было увидеть на �кране";
< 		$admtext['newwin'] = "Открывать в новом окне";
< 		$admtext['modifymedia'] = "Изменить �уще�твующий �нимок";
< 		$admtext['addnewmedia'] = "Добавить новый медиафайл";
< 		$admtext['confdeletemedia'] = "Вы уверены, что хотите удалить �тот медиафайл?";
< 		$admtext['thumbnails'] = "Миниатюры";
< 		$admtext['modifyalbum'] = "Изменить �уще�твующий альбом";
< 		$admtext['addnewalbum'] = "Добавить новый альбом";
< 		$admtext['newalbuminfo'] = "Информаци� о новом альбоме";
< 		$admtext['confdeletealbum'] = "Вы уверены, что хотите удалить �тот альбом?";
< 		$admtext['enteralbumname'] = "Дайте альбому название.";
< 		$admtext['albumname'] = "�азвание альбома";
< 		$admtext['keywords'] = "Ключевые �лова";
< 		$admtext['changestoalbum'] = "Изменени� в альбоме";
< 		$admtext['addtoalbum'] = "Добавить новый альбом";
< 		$admtext['mediatype'] = "Коллекци�";
< 		$admtext['fileext'] = "Ра�ширени� файлов."; //file extension (abbreviation)
< 		$admtext['anotherlink'] = "Добавить новый линк";
< 		$admtext['mediaurl'] = "URL медиафайла";
< 		$admtext['put_in'] = "Сохранить файлы в";
< 		$admtext['usemedia'] = "Папка дл� медиафайлов";
< 		$admtext['usecollect'] = "Папка коллекции (например, &#171;Мои фотографии&#187;)";
< 		$admtext['notcopied'] = "Этот файл нельз� �копировать в";
< 		$admtext['existingmediainfo'] = "Информаци� о �уще�твующем медиафайле";
< 		$admtext['convto'] = "Преобразовать избранное в";
< 		$admtext['changestoallmedia'] = "изменени� в выбранных медиафайлах";
< 		$admtext['changestoitem'] = "Изменени� в теме";
< 		$admtext['eventlink'] = "С�ылка на конкретное �обытие";
< 		$admtext['sortmediaind'] = "Сортировать медиафайлы дл� отдельного человка, �емьи, и�точника, архива или ме�та";
< 		$admtext['sortmedia'] = "Сортировать xxx по";
< 		$admtext['unlinked'] = "Только не �в�занные";
< 		$admtext['samepaths'] = "Стандартное изображение и картинка не могут быть одним и тем же файлом. Пожалуй�та, выберете другую картинку или �делайте ее.";
< 		$admtext['regenerate'] = "Обновить �уще�твующие миниатюры";
< 		$admtext['forcircles'] = "Дл� кругов";
< 		$admtext['forrects'] = "Дл� пр�моугольников";
< 		$admtext['circleinstr'] = "Кликните �начала по�редине круга, а потом на �амом круге.";
< 		$admtext['rectinstr'] = "Кликните �начала в левом верхнем углу пр�моугольника, а потом внизу �права.";
< 		$admtext['firstone'] = "первый";
< 		$admtext['controller'] = "Учитывайте, что медиаплеер займет примерно 16 пик�елей по вертикали.";
< 		$admtext['nostatus'] = "�ет �тату�а";
< 		$admtext['enterid'] = "Задайте, пожалуй�та, идентификационный номер.";
< 		$admtext['existingalbuminfo'] = "Информаци� об альбоме";
< 		$admtext['newmediainfo'] = "Информаци� о медиафайле";
< 		$admtext['mapinstr2'] = "Св�жите обла�ти вашего изображени� � разными людьми или другими �траницами (необ�зательно)";
< 		$admtext['mapinstr3'] = "Чтобы �в�зать обла�ть �ту фотографию человека, �начала выберите дерево индивида, то �оздаем пр�моугольник дл� нужного региона. Это можно �делать, нажав в верхнем левом углу обла�ти, а затем перетащить в правом нижнем углу. Кроме того, вы можете нажать в левом верхнем углу, а затем �нова в правом нижнем углу. В�плывающего окна будет помочь вам выбрать человека. По�ле того, как выбор �делан, код карты изображени� будут добавлены в поле ниже. Повторите �тот проце�� по мере необходимо�ти в дополнительных регионах.";
< 		$admtext['albumlinks'] = "С�ылка на альбом";
< 		$admtext['duplinkmsg'] = "С�ылка на выбранный объект уже �уще�твует в �том альбоме.";
< 		$admtext['invlinkmsg'] = "ID объекта, который вы ввели, недей�твителен. С�ылка не �оздана.";
< 		$admtext['albmedia'] = "Медиафайлы альбома";
< 		$admtext['removelink'] = "Удалить ��ылку";
< 		$admtext['confremmedia'] = "Вы уверены, что хотите удалить �то медиа из альбома?";
< 		$admtext['selmedia'] = "�айти �уще�твующие медиа дл� включени� в �тот альбом";
< 		$admtext['uploadfirst'] = "Сначала загрузите новые медиа";
< 		$admtext['existmedia'] = "Суще�твующие медиа";
< 		$admtext['emoptions'] = "Про�мотр, Удаление или Перета�кивание дл� Сортировки";
< 		$admtext['addlinks'] = "Добавить новые ��ылки";
< 		$admtext['eloptions'] = "Про�мотр или Удаление";
< 		$admtext['inclmsg'] = " включено";
< 		$admtext['mediasubt'] = "Управление медифайлами, включёнными в �тот альбом (Добавить, Удалить, Сортировка)";
< 		$admtext['infosubt'] = "Редактировать название альбома, опи�ание и ключевые �лова";
< 		$admtext['linkssubt'] = "Св�зать �тот медиафайл � человеком, �емьёй, и�точником, архивом или ме�том";
< 		$admtext['inclmedia'] = "Включённое медиа";
< 		$admtext['nomedia'] = "Медиафайлов ещё нет";
< 		$admtext['nolinks'] = "С�ылок ещё нет";
< 		$admtext['thumbsize'] = "(оригинал �лишком большой)";
< 		$admtext['thumbinv'] = "(недопу�тимое изображение или не�оответ�твующие разрешени�)";
< 		$admtext['thumblost'] = "(оригинал не найден)";
< 		$admtext['uplsel'] = "Загрузите новый файл � компьютера или выберите из файлов, уже наход�щих�� на �айте.";
< 		$admtext['alblater'] = "Примечание: Добавить дополнительную информацию и медиафайлы, а также �в�зать альбом � отдельными людьми или �емь�ми можно на �ледующем �кране.";
< 		$admtext['medlater'] = "Примечание: Добавить дополнительную информацию и �в�зать медиафайл � отдельными людьми или �емь�ми можно на �ледующем �кране.";
< 		$admtext['minfosubt'] = "Отредактируйте название медиафайла, опи�ание и другие о�новные �ведени�";
< 		$admtext['defphoto'] = "Фото по умолчанию";
< 		$admtext['alttd'] = "Синоним";   //short abbreviation for "Alternate Title or Description"
< 		$admtext['editmedialink'] = "Изменить медиа-��ылку";
< 		$admtext['plot'] = "Уча�ток";
< 		$admtext['addnewcoll'] = "Добавить коллекцию";
< 		$admtext['collid'] = "ID коллекции";
< 		$admtext['colldisplay'] = "Отображать заголовок";
< 		$admtext['collpath'] = "�азвание папки";
< 		$admtext['collicon'] = "Файл значка";
< 		$admtext['colllike'] = "Та же на�тройка, как";
< 		$admtext['entercollid'] = "Пожалуй�та, введите ID коллекции.";
< 		$admtext['entercolldisplay'] = "Пожалуй�та, введите отображаемое им� коллекции.";
< 		$admtext['entercollpath'] = "Пожалуй�та, введите им� папки коллекции.";
< 		$admtext['entercollicon'] = "Пожалуй�та, введите им� файла значка коллекции.";
< 		$admtext['editcoll'] = "Редактировать Коллекцию";
< 		$admtext['confmtdelete'] = "Вы уверены, что хотите удалить �тот тип медиа?";
< 		$admtext['histlimit'] = "<strong>Замечание к размеру:</strong> Большин�тво браузеров ограничивают объем данных, которые могут быть отправлены в виде веб-формы, примерно до 64 КБ. Е�ли у ва� большой объём тек�та дл� ввода или в�тавки в тек�товое поле выше, то можно и�пользовать historytemplate.php. Дополнительную информацию �мотрите в �правке.";
< 		$admtext['repath'] = "Обновить пути к миниатюрам, е�ли файл не �уще�твует";
< 		$admtext['sortalbumind'] = "Сортировка альбомов по люд�м, �емь�м и ме�ту";
< 		$admtext['cidexists'] = "Введённый ID коллекции не может быть добавлено, т.к. оно уже �уще�твует.";
< 		$admtext['phalltrees'] = "�еоб�зательно. О�тавьте пу�тым, чтобы фотографии были видны во в�ех родовых древе�ах.";
< 		//added in 8.0.0
< 		$admtext['fileexists'] = "Этот файл уже �уще�твует. Перезапи�ать?";
< 		$admtext['collthumb'] = "Файл миниатюры";
< 		$admtext['movetop'] = "Перейти наверх";
< 		//added in 9.0.0
< 		$admtext['collexpas'] = "Эк�порт как";
< 		//added in 9.2.0
< 		$admtext['upload'] = "Загрузить";
< 		$admtext['linksel'] = "С�ылка на выбранные";
< 		$admtext['mediaupl'] = "Загрузить медиафайл";
< 		$admtext['addfiles'] = "Добавить файлы...";
< 		$admtext['startupl'] = "�ачать загрузку";
< 		$admtext['start'] = "Старт";
< 		$admtext['cancelupl'] = "Отмена загрузки";
< 		//added in 11.0.0
< 		$admtext['localpath'] = "Локальный путь (пути)";
< 		//added in 12.0.0
< 		$admtext['confdelmediafile'] = "Вы также хотите удалить файл физиче�ки?";
< 		break;
< 
< 	//addreport.php, updatereport.php, newreport.php, editreport.php
< 	case "reports":
< 		$admtext['changestoreport'] = "Изменени� в отчёте";
< 		$admtext['modifyreport'] = "Изменить �уще�твующий отчёт";
< 		$admtext['existingreportinfo'] = "Информаци� о �уще�твующем отчёте";
< 		$admtext['existingreports'] = "Суще�твующие отчёты";
< 		$admtext['newreportinfo'] = "Информаци� о новом отчёте";
< 		$admtext['reportname'] = "�азвание отчёта";
< 		$admtext['rankpriority'] = "Приоритет";
< 		$admtext['choosedisplay'] = "Пол� дл� отображени�";
< 		$admtext['spouseid'] = "идентификационный номер �упруга";
< 		$admtext['spousename'] = "Им� партнера";
< 		$admtext['lastmodified'] = "По�ледние изменени� были";
< 		$admtext['ldsbapldate'] = "Дата крещени� (СПД)";
< 		$admtext['ldsbaplplace'] = "Ме�то крещени� (СПД)";
< 		$admtext['ldsendldate'] = "Дата дарени� (СПД)";
< 		$admtext['ldsendlplace'] = "Ме�то дарени� (СПД)";
< 		$admtext['ldssealsdate'] = "Дата Запечатывани�/Супруга (СПД)";
< 		$admtext['ldssealsplace'] = "Ме�то Запечатывани�/Супруга (СПД)";
< 		$admtext['ldssealpdate'] = " Дата Запечатывани� /Родители (СПД)";
< 		$admtext['ldssealpplace'] = "Ме�то Запечатывани�/Родители (СПД)";
< 		//$admtext['makelink'] = "Make Link";
< 		$admtext['choosecriteria'] = "Критерии";
< 		$admtext['fullname'] = "Фамили�";
< 		$admtext['lastfirst'] = "Фамили�, им�";
< 		$admtext['monthonlyfrom'] = "Только ме��ц";
< 		$admtext['yearonlyfrom'] = "Только год";
< 		$admtext['dayonlyfrom'] = "Только день";
< 		$admtext['operators'] = "Операторы и о�обые ценно�ти";
< 		$admtext['contains'] = "Содержит";
< 		$admtext['startswith'] = "�ачинает�� �";
< 		$admtext['endswith'] = "Заканчивает�� на";
< 		$admtext['text_and'] = "И";
< 		$admtext['currentmonth'] = "текущий ме��ц";
< 		$admtext['currentyear'] = "Текущий год";
< 		$admtext['currentday'] = "Текущий день";
< 		$admtext['constantstring'] = "По�то�нный р�д (буквенно-чи�ловой)";
< 		$admtext['constantvalue'] = "По�то�нна� величина (чи�лова�)";
< 		$admtext['foremptystring'] = "Чтобы добавить пу�тую �троку, о�тавьте �то поле пу�тым и нажмите кнопку &#171;Добавить&#187;.";
< 		$admtext['choosesort'] = "Сортировка";
< 		$admtext['savereport'] = "Сохранить отчёт";
< 		$admtext['addnewreport'] = "Добавить новый отчёт";
< 		$admtext['createreport'] = "Сделать новый отчёт";
< 		$admtext['noreports'] = "�е�уще�твующий отчёт";
< 		$admtext['rank'] = "Разр�д";
< 		$admtext['confreportdelete'] = "Вы уверены, что хотите удалить �тот отчёт?";
< 		$admtext['enterreportname'] = "Введите название отчёта.";
< 		$admtext['selectdisplayfield'] = "Выберите по крайней мере одно поле дл� показа.";
< 		$admtext['today'] = "Сегодн� (на �амом деле)";
< 		$admtext['convtodays'] = "Переве�ти в дни";
< 		$admtext['desc'] = "В ни�ход�щем пор�дке (Предыдущие)";
< 		$admtext['birthdatetr'] = "Дата рождени� (на�то�ща�)";
< 		$admtext['chrdatetr'] = "Дата крещени� (на�то�ща�)";
< 		$admtext['deathdatetr'] = "Дата �мерти (на�то�ща�)";
< 		$admtext['burialdatetr'] = "Дата похорон (на�то�ща�)";
< 		$admtext['marriagedatetr'] = "Дата брако�очетани� (на�то�ща�)";
< 		$admtext['ldsbapldatetr'] = "Дата крещени� (на�то�ща�) (СПД)";
< 		$admtext['ldsendldatetr'] = "Дата дарени� (на�то�ща�) (СПД)";
< 		$admtext['ldssealsdatetr'] = "Дата запечатывани�/Супруг (на�то�ща�) (СПД)";
< 		$admtext['ldssealpdatetr'] = "Дата запечатывани�/Родители (на�то�ща�) (СПД)";
< 		$admtext['currentmonthnum'] = "Текущий ме��ц (чи�ло)";
< 		$admtext['livingtrue'] = "Живой = да";
< 		$admtext['livingfalse'] = "Живой = нет";
< 		$admtext['altreport'] = "Или о�тавьте пол� критериев и �ортировки пу�тыми и введите команду SQL";
< 		$admtext['rptdate'] = "Дата";
< 		$admtext['rptdatetr'] = "Дата (на�то�ща�)";
< 		$admtext['fact'] = "Факт";
< 		$admtext['testeditdelete'] = "Добавление, изменение, проверка или удаление отчётов";
< 		$admtext['wnmsg'] = "Сообщение на �транице &#171;Что нового&#187;";
< 		$admtext['mwtype'] = "Тип";
< 		$admtext['mysphoto'] = "�еизве�тные фотографии";
< 		$admtext['mysperson'] = "�еизве�тные люди";
< 		$admtext['selphoto'] = "Выберите фото";
< 		$admtext['entertitle'] = "Пожалуй�та, введите название";
< 		$admtext['enterdesc'] = "Пожалуй�та, введите опи�ание";
< 		$admtext['confremmw'] = "Вы дей�твительно хотите удалить �тот �лемент?";
< 		$admtext['msgsaved'] = "Сообщение �охранено";
< 		//added in 9.1.1
< 		$admtext['privatetrue'] = "Личное = да";
< 		$admtext['privatefalse'] = "Личное = нет";
< 		//added in 11.0.0
< 		$admtext['ldsconfdate'] = "Дата конфирмации (СПД)";
< 		$admtext['ldsconfplace'] = "Ме�то конфирмации (СПД)";
< 		$admtext['ldsconfdatetr'] = "Дата конфирмации (на�то�ща�) (СПД)";
< 		$admtext['ldsinitdate'] = "Дата по�в�щени� (СПД)";
< 		$admtext['ldsinitplace'] = "Ме�то по�в�щени� (СПД)";
< 		$admtext['ldsinitdatetr'] = "Дата по�в�щени� (на�то�ща�) (СПД)";
< 		$admtext['savecopy'] = "Сохранить как копию";
< 		$admtext['activeonly'] = "Только активные";
< 		break;
< 
< 	//index.php
< 	case "index":
< 		$admtext['selectimportfile'] = "Выберите файл, который Вы хотите импортировать.";
< 		$admtext['importgedcom'] = "Импортировать GEDCOM (�тандартный формат 5.5)";
< 		$admtext['addreplacedata'] = "Добавление или замена Ваших генеалогииче�ких данных (может зан�ть не�колько минут, в зави�имо�ти от размера файла).";
< 		$admtext['fromyourcomputer'] = "Из Вашего компьютера";
< 		$admtext['importdata'] = "Импортировать данные";
< 		$admtext['setupfirsttime'] = "У�тановить программу впервые.";
< 		$admtext['replace'] = "Заменить (в выбранном генеалогиче�ком древе)";
< 		$admtext['desttree'] = "Древо назначени�";
< 		$admtext['selectdesttree'] = "Выбрать или вве�ти название необходимого генеалогиче�кого древа.";
< 		$admtext['selectexisting'] = "Импортировать в";
< 		$admtext['importgedcom2'] = "Импортировать файл GEDCOM";
< 		$admtext['setupitems'] = "Создание таблиц базы данных, у�тановка параметров";
< 		$admtext['custeventitems'] = "Управление пользователь�кими метками и типами �обытий";
< 		$admtext['usersitems'] = "Управление пользовател�ми и разрешени�ми";
< 		$admtext['reportsitems'] = "Создание пользователь�ких �пи�ков и отчетов";
< 		$admtext['langitems'] = "Управление альтернативными �зыками";
< 		$admtext['backupitems'] = "Резервное копирование, во��тановление и оптимизаци� таблиц";
< 		$admtext['ucaselast'] = "В�е фамилии ПРОПИС�ЫМИ буквами";
< 		$admtext['norecalc'] = "�е пере�читывать флаг &#171;Жив&#187;";
< 		$admtext['autooffset'] = "�ачинать идентификационные номера � первого до�тупного номера";
< 
< 		$admtext['mustselecttree'] = "дл� �той опции Вы должны выбрать генеалогиче�кое древо.";
< 		$admtext['importmedia'] = "Импортировать медиафайлы, е�ли при�ут�твуют";
< 		$admtext['mainmenu'] = "Главное меню";
< 		$admtext['neweronly'] = "Замен�ть только более новыми";
< 		$admtext['secondaryitems'] = "Создать GENDEX-файл, �о�читать родовые линии";
< 		$admtext['onwebserver'] = "� веб-�айта (из папке GEDCOM)";
< 		$admtext['eventsonly'] = "Импортировать только пользователь�кие типы �обытий (данные не добавл�ют��, не замен�ют�� и не объедин�ют��)";
< 		$admtext['imphints'] = "Под�казка: В�е �уще�твующие данные означает: в�е люди, �емьи, и�точники и запи�и (�в�зи медиа не удал�ют��, пока �охран�ет�� тот же идентификационный номер). Точные �оответ�тви� определ�ют�� только по идентификационному номеру. �овые запи�и в�егда добавл�ют��. При добавлении импортируют�� в�е �ведени� � новыми идентификационными номерами";
< 		$admtext['allevents'] = "Прин�ть данные дл� в�ех новых типов пользователь�ких �обытий";
< 		$admtext['destbranch'] = "По назначению (опци�)";
< 		$admtext['inframe'] = "(во фрейме)";
< 		$admtext['getstart'] = "�ачало работы";
< 		$admtext['importlatlong'] = "Импорт данных широты/долготы, е�ли при�ут�твуют";
< 		$admtext['opening'] = "Открытие";
< 		$admtext['reopen'] = "Открыть �нова";
< 		$admtext['uploading'] = "Загрузка";
< 		$admtext['stop'] = "Стоп";
< 		$admtext['stopped'] = "Импорт о�тановлен";
< 		$admtext['resume'] = "Возобновить";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Журнал изменений";
< 		//added in 8.0.0
< 		$admtext['mmgritems'] = "У�тановка и удаление модов TNG";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Импорт в �таром �тиле (без индикатора выполнени�)";
< 		//changed in 11.0.0
< 		$admtext['miscitems'] = "Что нового, розы�к, проверка данных";
< 		//added in 11.0.0
< 		$admtext['tasks'] = "Важные задачи";
< 		$admtext['task_revusers'] = "Про�мотр реги�трации новых пользователей";
< 		$admtext['task_tree'] = "Создайть �воё первое дерево";
< 		$admtext['task_user'] = "Создать �вою учётную запи�ь";
< 		$admtext['task_people'] = "Добавить новых людей";
< 		$admtext['task_families'] = "Добавить новые �емьи";
< 		$admtext['task_revind'] = "Про�мотр предлагаемых изменений �обытий у людей";
< 		$admtext['task_revfam'] = "Про�мотр предлагаемых изменений �обытий у �емей";
< 		$admtext['task_backup'] = "Резервное копирование";
< 		$admtext['nobackups'] = "нет резервных копий";
< 		$admtext['lastbackup'] = "По�леднее �оздание резервной копии";
< 		$admtext['dna_blurb'] = "Ввод те�тов Д�К и �в�зывание их � людьми";
< 		//added in 12.0.0
< 		$admtext['task_mapkey'] = "Получить ключ дл� и�пользование карт Google";
< 		break;
< 
< 	//addsource.php, updatesource.php, newsource.php, editsource.php, sources.php
< 	case "sources":
< 		$admtext['changestosource'] = "Изменени� в и�точнике";
< 		$admtext['modifysource'] = "Изменить �уще�твующий и�точник";
< 		$admtext['selectsrcaction'] = "Выбрать и�точник и дей�твие";
< 		$admtext['shorttitle'] = "Краткое название";
< 		$admtext['longtitle'] = "Полное название";
< 		$admtext['author'] = "�втор";
< 		$admtext['callnumber'] = "Телефонный номер";
< 		$admtext['publisher'] = "Издатель";
< 		$admtext['actualtext'] = "Фактиче�кий тек�т";
< 		$admtext['confdeletesrc'] = "Вы уверены, что хотите удалить �тот и�точник?";
< 		$admtext['selectshorttitle'] = "Выберите или введите краткий заголовок дл� �того типа �обытий.";
< 		$admtext['existingsourceinfo'] = "Информаци� о �уще�твующем и�точнике";
< 		$admtext['newsourceinfo'] = "Информаци� о новом и�точнике";
< 		$admtext['addnewsource'] = "Добавить новый и�точник";
< 		$admtext['prefixsourceid'] = "Вначале ID и�точника должна �то�ть буква &#171;S&#187; (Source)";
< 		$admtext['entersourceid'] = "Введите ID и�точника.";
< 		$admtext['validsourceid'] = "Введите правильный ID и�точника. Правильный ID – �то по�ледовательно�ть чи�ел, начинающа��� � буквы &#171;S&#187;.";
< 		$admtext['createsource'] = "Сделайте запи�ь дл� нового и�точника";
< 		$admtext['editexistingsource'] = "Изменить информацию об уже добавленном и�точнике";
< 		$admtext['addnewcite'] = "Добавить новую цитату";
< 		$admtext['reliability'] = "До�товерно�ть";
< 		$admtext['relyexplain'] = "Более вы�окие цифры указывают на большую до�товерно�ть";
< 		$admtext['citedate'] = "Дата цитировани�";
< 		$admtext['modifycite'] = "Изменить �уще�твующую цитату";
< 		$admtext['addingcite'] = "Цитата добавл�ет��...";
< 		$admtext['deletingcite'] = "Цитата удал�ет��...";
< 		$admtext['updatingcite'] = "Цитата обрабатывает��...";
< 		$admtext['sevslater'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента.";
< 		$admtext['pleasesourcepart'] = "Пожалуй�та, введите ча�ть наименовани�.";
< 		$admtext['addnewrepo'] = "Добавить новый архив";
< 		$admtext['modifyrepo'] = "Изменить �уще�твующее архив";
< 		$admtext['createrepo'] = "Сделать запи�ь дл� нового архива";
< 		$admtext['editexistingrepo'] = "Изменить информацию об уже добавленном архиве";
< 		$admtext['enterrepoid'] = "Введите, пожалуй�та, ID архива.";
< 		$admtext['enterreponame'] = "Введите, пожалуй�та, опи�ание архива (например, название).";
< 		$admtext['newrepoinfo'] = "�ова� информаци� об архиве";
< 		$admtext['prefixrepoid'] = "Вначале ID архива должна �то�ть буква &#171;R&#187; (Repository)";
< 		$admtext['selectrepoaction'] = "Выберите архив и дей�твие";
< 		$admtext['confdeleterepo'] = "вы уверены, что хотите удалить �тот архив?";
< 		$admtext['changestorepo'] = "Изменени� в �том архиве";
< 		$admtext['existingrepoinfo'] = "�уще�твующа� информаци� об архиве";
< 		$admtext['pleaserepopart'] = "Пожалуй�та, Введите ча�ть опи�ани� архива.";
< 		$admtext['choosemergesources'] = "Выбрать и�точники дл� объединени� или найти возможные �овпадени�";
< 		$admtext['confirmmergesources'] = "Вы уверены, что хотите объединить �ти и�точники?";
< 		$admtext['choosemergerepos'] = "Выбрать архивы дл� объединени� или найти возможные �овпадени�";
< 		$admtext['confirmmergerepos'] = "Вы уверены, что хотите объединить �ти архивы?";
< 		$admtext['revslater'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента.";
< 		$admtext['confdeleterepo'] = "вы уверены, что хотите удалить �тот архив?";
< 		break;
< 
< 	//checkID.php
< 	case "checkID":
< 		$admtext['checknewid'] = "Проверить правильно�ть нового идентификационного номера";
< 		$admtext['idnotvalid'] = "�то недей�твительный идентификационный номер. Дей�твительный идентификационный номер – �то по�ледовательно�ть чи�ел, котора� начинает�� �";
< 		$admtext['idinuse'] = "уже и�пользует��. Выберите другой идентификационный номер";
< 		$admtext['idok'] = "можно и�пользовать";
< 		$admtext['isok'] = "можно и�пользовать";
< 		$admtext['isinuse'] = "уже и�пользует��.";
< 		break;
< 	
< 	case "templates":
< 		$admtext['templatenum'] = "�омер шаблона";
< 		$admtext['mainimage'] = "О�новное изображение<br/>на домашней �транице"; //1, 2, 3, 4, 5, 7
< 		$admtext['titleimage'] = "Изображение заголовка<br/>на домашней �транице"; //1, 2, 3
< 		$admtext['headline'] = "Шапка"; //4, 7
< 		$admtext['mainpara'] = "Тек�т блока<br/>&#171;Добро пожаловать&#187;";  //1, 4, 6, 7, 8
< 		$admtext['headimgplustitle'] = "Изображение в шапке<br/>(включа� название)"; //1
< 		$admtext['pedperson'] = "ID члена родо�ловной"; //2
< 		$admtext['pedtree'] = "ID генеалогиче�кого древа"; //2
< 		$admtext['phhistperson'] = "Фотографии и и�тории члена � ID"; //2
< 		$admtext['phhisttree'] = "Фотографии и и�тории генеалогиче�кого древа � ID"; //2
< 		$admtext['headimg'] = "Изображение в шапке"; //2, 3, 4, 5, 6, 8
< 		$admtext['headtitleimg'] = "Файл изображени�"; //2, 3
< 		$admtext['titleimg'] = "Изображени� в заголовке<br/>на в�ех �траницах"; //4, 7
< 		$admtext['searchpara'] = "Раздел пои�ка"; //6
< 		$admtext['fhpara'] = "Раздел �емейных и�торий"; //6
< 		$admtext['fhlinkshis'] = "С�ылки на �емейные и�тории (Его)"; //6
< 		$admtext['fhlinkshers'] = "С�ылки на �емейные и�тории (Её)"; //6
< 		$admtext['mwpara'] = "Любимый раздел"; //6
< 		$admtext['respara'] = "Раздел ре�ур�ов"; //6
< 		$admtext['reslinks'] = "С�ылки на Ре�ур�ы"; //6
< 		$admtext['headtitle1'] = "1-� ча�ть заголовка"; //8
< 		$admtext['headtitle2'] = "2-� ча�ть заголовка"; //8
< 		$admtext['headtitle3'] = "3-� ча�ть заголовка"; //8
< 		$admtext['headsubtitle'] = "Подзаголовок</br>домашней �траницы"; //8
< 		$admtext['latestnews'] = "По�ледние ново�ти"; //8
< 		$admtext['momside'] = "�азвание �тороны матери"; //8
< 		$admtext['dadside'] = "�азвание �тороны отца"; //8
< 		$admtext['momperson'] = "ID человека �тороны матери"; //8
< 		$admtext['momtree'] = "ID генеалогиче�кого древа<br/>�тороны матери"; //8
< 		$admtext['dadperson'] = "ID человека �тороны отца"; //8
< 		$admtext['dadtree'] = "ID дерево �тороны отца"; //8
< 		$admtext['featurethumb1'] = "Миниатюра 1-го блока";
< 		$admtext['featurelink1'] = "С�ылка 1-го блока";
< 		$admtext['featuretitle1'] = "�азвание 1-го блока";
< 		$admtext['featurepara1'] = "Содержимое 1-го блока";
< 		$admtext['featurethumb2'] = "Миниатюра 2-го блока";
< 		$admtext['featurelink2'] = "С�ылка 2-го блока";
< 		$admtext['featuretitle2'] = "�азвание 2-го блока";
< 		$admtext['featurepara2'] = "Содержимое 2-го блока";
< 		$admtext['featurethumb3'] = "Миниатюра 3-го блока";
< 		$admtext['featurelink3'] = "С�ылка 3-го блока";
< 		$admtext['featuretitle3'] = "�азвание 3-го блока";
< 		$admtext['featurepara3'] = "Содержимое 3-го блока";
< 		$admtext['featurethumb4'] = "Миниатюра 4-го блока";
< 		$admtext['featurelink4'] = "С�ылка 4-го блока";
< 		$admtext['featuretitle4'] = "�азвание 4-го блока";
< 		$admtext['featurepara4'] = "Содержимое 4-го блока";
< 		$admtext['photocaption'] = "Подпи�ь<br/>о�новного изображени�"; //4
< 		$admtext['maintitle'] = "Заголовок<br/>домашней �траницы"; //5
< 		$admtext['hisside'] = "Ярлык его �тороны"; //5
< 		$admtext['herside'] = "Ярлык её �тороны"; //5
< 		$admtext['newstext'] = "Тек�т ново�тей"; //5
< 		//added in 8.1.0
< 		$admtext['templateswitching'] = "И�пользовать шаблоны";
< 		//added in 9.0.0
< 		$admtext['template'] = "Шаблон";
< 		$admtext['createcopy'] = "Создать копию в";  //as in, "create copy in Dutch"
< 		$admtext['featurelinks'] = "Тематиче�кие ��ылки"; //9, 10
< 		$admtext['featurepara'] = "Раздел блоков"; //9, 10
< 		$admtext['welcome'] = "Заголовок блока<br/>&#171;Добро пожаловать&#187;"; //9, 10
< 		//added in 9.0.3
< 		$admtext['momsidenames'] = "Имена �тороны матери"; //8
< 		$admtext['dadsidenames'] = "Имена �тороны отца"; //8
< 		//added in 10.0.0
< 		$admtext['featurespara'] = "Раздел блоков";
< 		$admtext['menutitle'] = "�азвание меню";
< 		$admtext['titlechoice'] = "Параметры названи�";
< 		$admtext['photol'] = "Изображение �лева";
< 		$admtext['phototitlel'] = "Заголовок<br/>изображени� �лева";
< 		$admtext['photocaptionl'] = "Подпи�ь<br/>изображени� �лева";
< 		$admtext['photor'] = "Изображение �права";
< 		$admtext['phototitler'] = "Заголовок<br/>изображени� �права";
< 		$admtext['photocaptionr'] = "Подпи�ь<br/>изображени� �права";
< 		$admtext['topsurnames'] = "�адпи�ь<br/>&#171;Топ 100 фамилий&#187;";
< 		$admtext['headimg2'] = "Изображение заголовка 2"; //14
< 		$admtext['headimg3'] = "Изображение заголовка 3"; //14
< 		$admtext['showprev'] = "Предпро�мотр";
< 		$admtext['hideprev'] = "Скрыть предпро�мотр";
< 		$admtext['ttitleimage'] = "Изображение";
< 		$admtext['ttitletext'] = "Тек�т";
< 		//added in 11.0.0
< 		$admtext['featurethumb5'] = "Миниатюра 5-го блока";
< 		$admtext['featurelink5'] = "С�ылка 5-го блока";
< 		$admtext['featuretitle5'] = "�азвание 5-го блока";
< 		$admtext['featurepara5'] = "Содержимое 5-го блока";
< 		$admtext['featurethumb6'] = "Миниатюра 6-го блока";
< 		$admtext['featurelink6'] = "С�ылка 6-го блока";
< 		$admtext['featuretitle6'] = "�азвание 6-го блока";
< 		$admtext['featurepara6'] = "Содержимое 6-го блока";
< 		$admtext['featurethumb7'] = "Миниатюра 7-го блока";
< 		$admtext['featurelink7'] = "С�ылка 7-го блока";
< 		$admtext['featurepara7'] = "Содержимое 7-го блока";
< 		$admtext['featurethumb8'] = "Миниатюра 8-го блока";
< 		$admtext['featurelink8'] = "С�ылка 8-го блока";
< 		$admtext['featurepara8'] = "Содержимое 8-го блока";
< 		$admtext['sidebarhead1'] = "Заголовок 1-й<br/>боковой панели"; //15
< 		$admtext['sidebarhead2'] = "Заголовок 2-й<br/>боковой панели"; //15
< 		$admtext['sidebarhead3'] = "Заголовок 3-й<br/>боковой панели"; //15
< 		$admtext['texttitle1'] = "�азвание 1-го тек�та";
< 		$admtext['textlink1'] = "С�ылка 1-го тек�та";
< 		$admtext['textpara1'] = "Содержимое 1-го тек�та";
< 		$admtext['texttitle2'] = "�азвание 2-го тек�та";
< 		$admtext['textlink2'] = "С�ылка 2-го тек�та";
< 		$admtext['textpara2'] = "Содержимое 2-го тек�та";
< 		$admtext['texttitle3'] = "�азвание 3-го тек�та";
< 		$admtext['textpara3'] = "Содержимое 3-го тек�та";
< 		$admtext['subhead1'] = "Заголовок 1-го<br/>раздела блоков"; //15
< 		$admtext['subhead2'] = "Заголовок 2-го<br/>раздела блоков"; //15
< 
< 		//break intentionally left out here so processing will fall through
< 
< 	//setup.php
< 	//editconfig.php, backuprestore.php
< 	case "setup":
< 		$admtext['tablesuccess'] = "Таблицы у�пешно �озданы.";
< 		$admtext['backtosetup'] = "�азад к меню на�троек";
< 		$admtext['configuration'] = "Конфигураци�";
< 		$admtext['entersysvars'] = "Ввод значений �и�темных переменных.";
< 		$admtext['createdbtables'] = "Создать таблицы базы данных, где будет хранить�� Ваша информаци�.";
< 		$admtext['tcwarning'] = "<strong>Внимание!</strong> Выбирайте �ту опцию только в том �лучае, когда у�танавливаете Ваш �айт в первый раз! <strong>В�е �уще�твующие �ведени�, вме�те � информацией о фотографи�х, и�тори�х, надгроби�х и кладбищах будут удалены!</strong>";
< 		$admtext['conftabledelete'] = "Сейча� будут удалены ВСЯ Ваша информаци� !!! Вы уверены, что хотите продолжить?";
< 		$admtext['performdatamaint'] = "Разработайте базу данных и обработайте фотографии, и�тории и другие компоненты.";
< 		$admtext['createtables'] = "Создать таблицы";
< 		$admtext['configsettings'] = "Общие на�тройки";
< 		$admtext['logconfigsettings'] = "�а�тройки журнала";
< 		$admtext['importconfigsettings'] = "�а�тройки импорта";
< 		$admtext['diagnostics'] = "Те�т";
< 		$admtext['rundiags'] = "Выполнить те�т";
< 		$admtext['phpinf'] = "Окошко PHP-информации";
< 		$admtext['fromphp'] = "Эта информаци� � Вашего �ервера и зави�ит от на�троек PHP, а не TNG.";
< 		$admtext['phpver'] = "Вер�и� PHP";
< 		$admtext['phpreq'] = "(TNG требует 5.3 или выше.)";
< 		$admtext['gdlib'] = "Библиотека GD шрифтов";
< 		$admtext['gdreq'] = "(�ужно дл� �оздани� миниатюр в TNG.)";
< 		$admtext['availnogif'] = "До�тупно, но не поддерживает изображени� � ра�ширением .gif";
< 		$admtext['notinst'] = "�е у�тановлено";
< 		$admtext['safemode'] = "Безопа�ный режим";
< 		$admtext['off'] = "Выключено";
< 		$admtext['on'] = "Включено";
< 		$admtext['fileuploads'] = "Загрузка файлов";
< 		$admtext['fureq'] = "(�ужно дл� загрузки GEDCOM из интернета, загрузки изображений и других.)";
< 		$admtext['perm'] = "Разрешить";
< 		$admtext['notperm'] = "�е разрешено, по�тому и�пользуйте FTP";
< 		$admtext['sqlver'] = "Вер�и� MySQL";
< 		$admtext['sqlreq'] = "(Дл� TNG нужна вер�и� 5.5 или более поздн��.)";
< 		$admtext['wsrvr'] = "Веб �ервер";
< 		$admtext['fperms'] = "Разрешени� дл� файлов/папок";
< 		$admtext['fpreq'] = "(TNG требует, чтобы некоторые файлы и директории имели о�обые права до�тупа.)";
< 		$admtext['scruser'] = "Сценарий как дл� пользовател�:";
< 		$admtext['phpuser'] = "PHP �ообщает об �том как пользователь:";
< 		$admtext['usrprob'] = "Возможно, у Ва� нет необходимых прав до�тупа, чтобы запу�тить TNG без помех, е�ли Вы и�пользуете админи�тративные функции и FTP и  TNG дл� работы � файлами.";
< 		$admtext['rofile'] = "Файл только дл� чтени�:";
< 		$admtext['rofolder'] = "Директори� только дл� чтени�:";
< 		$admtext['publog'] = "Общий файл";
< 		$admtext['admlog'] = "Файл дл� админи�трировани�";
< 		$admtext['folderdne'] = "Така� директори� не �уще�твует:";
< 		$admtext['keyrw'] = "Ключевые папки в�е дл� чтени�/запи�и";
< 		$admtext['cfgrw'] = "Файлы конфигурации в�е дл� чтени�/запи�и";
< 		$admtext['acceptable'] = "Приемлимый.";
< 		$admtext['restricted'] = "�екоторые функции могут быть ограничены. Вы можете �толкнуть�� � ошибками во врем� у�тановки или во врем� работы TNG.";
< 		$admtext['needchngs'] = "TNG может не работать без изменений в вашей конфигурации PHP или �ервера.";
< 		$admtext['yourbrowser'] = "Ваш браузер:";
< 		$admtext['modifysettings'] = "Изменить на�тройки";
< 		$admtext['dbhost'] = "Хо�т";
< 		$admtext['dbname'] = "Базы данных";
< 		$admtext['dbusername'] = "Пользователь";
< 		$admtext['dbpassword'] = "Пароль";
< 		$admtext['rootpath'] = "Корневой путь";
< 		$admtext['homepage'] = "Главна� �траница";
< 		$admtext['emailaddress'] = "E-mail";
< 		$admtext['siteowner'] = "Владелец �айта";
< 		$admtext['maxdescgens'] = "Мак�имальное количе�тво поколений потомков";
< 		$admtext['disallow'] = "Отменить";
< 		$admtext['defaultallowed'] = "Стандарт: Разрешить";
< 		$admtext['maxsearchresults'] = "Мак�имальное количе�тво результатов пои�ка";
< 		$admtext['targetframe'] = "�трибут target";
< 		$admtext['table'] = "Таблица";
< 		$admtext['lastbackup'] = "По�леднее �оздание резервной копии";
< 		$admtext['backup'] = "резервна� копи�";
< 		$admtext['restore'] = "во��тановить";
< 		$admtext['backupfilesize'] = "Величина файла";
< 		$admtext['succbackedup'] = "резервна� копи� �оздана";
< 		$admtext['succrestored'] = "во��тановлено";
< 		$admtext['change_cutoff'] = "Количе�тво дней в &#171;Что нового&#187;";
< 		$admtext['change_limit'] = "Мак�имальное количе�тво топиков в &#171;Что нового&#187;";
< 		$admtext['photosext'] = "Увеличение фото";
< 		$admtext['defaulttree'] = "Генеалогиче�кое древо<br/>по умолчанию";
< 		$admtext['requirelogin'] = "Требовать вход";
< 		$admtext['defaultdontrequire'] = "Стандартно : �е требует��";
< 		$admtext['ldsdefault'] = "Показать данные СПД";
< 		$admtext['ldson'] = "В�егда";
< 		$admtext['ldsoff'] = "�икогда";
< 		$admtext['ldspermit'] = "Зави�ит от пользователь�ких прав";
< 		$admtext['allow'] = "Разрешить";
< 		$admtext['chooselang'] = "Бы�трое изменение �зыка";
< 		$admtext['optimize'] = "оптимизировать";
< 		$admtext['succoptimized'] = "оптимизаци� произошла";
< 		$admtext['customheader'] = "Шапка (&#60;Header&#62;)";
< 		$admtext['customfooter'] = "Подвал (&#60;Footer&#62;)";
< 		$admtext['custommeta'] = "Тег &#60;meta&#62;";
< 		$admtext['lineending'] = "Конец �троки";
< 		$admtext['backuppath'] = "Папка дл� резервных копий";
< 		$admtext['photopath'] = "Папка дл� фото";
< 		$admtext['headstonepath'] = "Папка дл� надгробий";
< 		$admtext['historypath'] = "Папка дл� и�торий";
< 		$admtext['backuprestoretables'] = "Резервное копирование, во��тановление и оптимизаци� таблиц";
< 		$admtext['shownames'] = "Показать имена живущих";
< 		$admtext['initials'] = "Инициалы";
< 		$admtext['regformat'] = "Рее�тр";
< 		$admtext['stdformat'] = "Стандартный";
< 		$admtext['thumbprefix'] = "Префик� файла изображени�";
< 		$admtext['thumbmaxh'] = "Мак�имальна� вы�ота миниатюры";
< 		$admtext['thumbmaxw'] = "Мак�имальна� ширина миниатюры";
< 		$admtext['thumbsuffix'] = "Увеличение миниатюр";
< 		$admtext['showextended'] = "Показать подробную информацию о фото";
< 		$admtext['shownotes'] = "Показать запи�и";
< 		$admtext['notestogether'] = "При �оответ�твующем �обытии, е�ли возможно";
< 		$admtext['notestogether2'] = "Под �обыти�ми, кроме общих примечаний";
< 		$admtext['notesapart'] = "В �екции запи�ей";
< 		$admtext['lnprefixes'] = "Предлоги (такие как:van, de)";
< 		$admtext['lntogether'] = "Сохранить как ча�ть фамилии";
< 		$admtext['lnapart'] = "Обрабатывать как отдельную ча�ть";
< 		$admtext['detectpfx'] = "Детекци� предлогов при импортировании";
< 		$admtext['lnpfxnum'] = "Количе�тво предлогов (мак�имальное)";
< 		$admtext['specpfx'] = "ИЛИ �ти о�обые предлоги";
< 		$admtext['newmedialinks'] = "Количе�тво новых ��ылок при фото/и�тори�х";
< 		$admtext['maxgedcom'] = "Мак�имальное количе�тво поколений, которые может загрузить GEDCOM";
< 		$admtext['placestable'] = "Таблица ме�т";
< 		//$admtext['hslinkstable'] = "Headstone Links Table";
< 		$admtext['tngdomain'] = "URL �айта";
< 		$admtext['charset'] = "Знаки";
< 		$admtext['time_offset'] = "Разница во времени на �ервере (ча�ы)";
< 		$admtext['backupall'] = "Выбрано �оздание резервной копии";
< 		$admtext['optimizeall'] = "Выбрана оптимизаци�";
< 		$admtext['alltables'] = "Выбранные таблицы";
< 		$admtext['brinstructions'] = "Чтобы выполнить резервное копирование, во��тановить или оптимизировать таблицу, щелкните по �оответ�твующему значку в колонке &#171;Дей�твие&#187; дл� �той таблицы. Дл� не�кольких таблиц надо выбрать дей�твие из выпадающего �пи�ка и нажать кнопку &#171;OK&#187;.";
< 		$admtext['tabstyle'] = "Страница �тилей �рлыков";
< 		$admtext['iconloc'] = "Ме�то дл� меню пиктограмм";
< 		$admtext['topleft'] = "Вверху �лева, над названием";
< 		$admtext['topright'] = "Вверху �права, р�дом � названием";
< 		$admtext['indstart'] = "Пои�к людей на букву";
< 		$admtext['persinfo'] = "Только лична� информаци�";
< 		$admtext['allinfo'] = "В�� информаци�";
< 		$admtext['thumbcols'] = "Столбцы в режиме миниатюр";
< 		$admtext['stdesc'] = "�ачать родо�ловную";
< 		$admtext['stexpand'] = "Развернуто";
< 		$admtext['stcollapse'] = "Свернуто";
< 		$admtext['regnosp'] = "Рее�тр поколений";
< 		$admtext['chshow'] = "В�егда показывать в�ех";
< 		$admtext['chifsp'] = "�е показывать людей без �емьи";
< 		$admtext['restoreall'] = "Во��тановить выбранное";
< 		$admtext['surerestore'] = "Вы уверены, что хотите во��тановить выбранные таблицы?";
< 		$admtext['surerestorets'] = "Вы уверены, что хотите во��тановить �труктуру таблицы? В�� �уще�твующа� информаци� будет утер�на!";
< 		$admtext['backupstruct'] = "Создать резервную копию �труктуры таблицы";
< 		$admtext['tablestruct'] = "Структрура таблицы";
< 		$admtext['brinstructions2'] = "Чтобы �оздать резервную копию или во��тановить �труктуру таблицы, щелкните по �оответ�твующему значку в колонке &#171;Дей�твие&#187; дл� �той таблицы. В�ИМ��ИЕ: Во��тановление �труктуры таблицы приведёт к удалению в�ех �уще�твующих данных!";
< 		$admtext['livedefault'] = "Показать �ведени� о живущих";
< 		$admtext['nodisplay'] = "�е показывать";
< 		$admtext['menudisp'] = "Меню во�произведени�";
< 		$admtext['asicons'] = "В виде пиктограмм";
< 		$admtext['asdrop'] = "В виде развернутого �пи�ка";
< 		$admtext['gendex'] = "Папка GENDEX";
< 		$admtext['modifypedsettings'] = "Изменение параметров конфигурации родо�ловной";
< 		$admtext['leftindent'] = "От�туп �лева";
< 		$admtext['boxnamesize'] = "Размер пр�моугольника имени";
< 		$admtext['namesizeshift'] = "Сдвиг размера пр�моугольника имени";
< 		$admtext['boxdatessize'] = "Размер пр�моугольника дат";
< 		$admtext['datessizeshift'] = "Сдвиг размера пр�моугольника дат";
< 		$admtext['boxcolor'] = "Цвет пр�моугольника";
< 		$admtext['colorshift'] = "Сдвиг цвета (%)";
< 		$admtext['emptycolor'] = "От�ут�твие цвета";
< 		$admtext['bordercolor'] = "Цвет границы";
< 		$admtext['shadowcolor'] = "Цвет тени";
< 		$admtext['boxwidth'] = "Ширина пр�моугольника<br/>(без в�плывающих окон)";
< 		$admtext['boxheight'] = "Вы�ота пр�моугольника<br/>(без в�плывающих окон)";
< 		$admtext['boxalign'] = "Выравнивание пр�моугольника<br/>(без в�плывающих окон)";
< 		$admtext['boxheightshift'] = "Изменение вы�оты пр�моугольника<br/>(без в�плывающих окон)";
< 		$admtext['boxHsep'] = "Горизонтальное разделение в пр�моугольнике";
< 		$admtext['boxVsep'] = "Вертикальное разделение в пр�моугольнике";
< 		$admtext['shadowoffset'] = "Смещение тени";
< 		$admtext['linewidth'] = "Толщина границы";
< 		$admtext['borderwidth'] = "Ширина границы";
< 		$admtext['popupcolor'] = "Цвет в�плывающего окна";
< 		$admtext['popupinfosize'] = "Размер в�плывающего окна �правки";
< 		$admtext['popupinfosizeshift'] = "Изменение размера в�плывающего окна �правки";
< 		$admtext['popuptimer'] = "В�плывающее окно таймера (м�)";
< 		$admtext['pedevent'] = "В�плывающее окно �обыти�";
< 		$admtext['puboxwidth'] = "Ширина пр�моугольника<br/>(� в�плывающим окном)";
< 		$admtext['puboxheight'] = "Вы�ота пр�моугольника<br/>(� в�плывающим окном)";
< 		$admtext['puboxalign'] = "Выравнивание пр�моугольника<br/>(� в�плывающим окном)";
< 		$admtext['puboxheightshift'] = "Изменение вы�оты пр�моугольника<br/>(� в�плывающим окном)";
< 		$admtext['popupspouses'] = "В�плывающие окна �упругов";
< 		$admtext['popupkids'] = "В�плывающие окна детей";
< 		$admtext['popupchartlinks'] = "В�плывающие окна дл� ��ылок";
< 		$admtext['inclphotos'] = "Включить фотографии";
< 		$admtext['overflow'] = "Переполнение";
< 		$admtext['pedcompact'] = "Компактный";
< 		$admtext['pedstandard'] = "Стандартный";
< 		$admtext['pedtextonly'] = "Только тек�т";
< 		$admtext['relchart'] = "Диаграмма отношений";
< 		$admtext['maxupgen'] = "Мак�имальное количе�тво отношений в поколении";
< 		$admtext['left'] = "Слева";
< 		$admtext['right'] = "Справа";
< 		$admtext['center'] = "По центру";
< 		$admtext['mouseover'] = "Движение мышки";
< 		$admtext['mousedown'] = "Клик мышки";
< 		$admtext['ahnentafel'] = "Си�тема &#171;Ahnentafel&#187;";
< 		$admtext['pedbox'] = "Пр�моугольник";
< 		$admtext['hideempty'] = "�е показывать пу�тые";
< 		$admtext['logfilename'] = "Им� файла журнала";
< 		$admtext['maxloglines'] = "Мак�имальное количе�тво �трок в журнале";
< 		$admtext['modifylogsettings'] = "Изменить на�тройки журнала";
< 		$admtext['badhosts'] = "И�ключить имена хо�тов";
< 		$admtext['admin'] = "Admin";
< 		$admtext['text_public'] = "(Общедо�тупный)";
< 		$admtext['saveimportstate'] = "Сохранить �тату� импорта";
< 		$admtext['allowresume'] = "Сохранить, чтобы вернуть��, е�ли импортировани� не произойдет";
< 		$admtext['modifyimportsettings'] = "Изменить на�тройки конфигурации импортировани�";
< 		$admtext['embeddedmedia'] = "В�троенное медиа";
< 		$admtext['assignnames'] = "Разрешить TNG давать названи� в�троенному медиа";
< 		$admtext['localphotopath'] = "Локальный(е) путь(и) дл� фотографий";
< 		$admtext['localdocpath'] = "Локальный(е) путь(и) дл� и�торий";
< 		$admtext['nopathmatch'] = "Е�ли локальный путь �овпадает";
< 		$admtext['wholepath'] = "Импортировать ве�ь путь";
< 		$admtext['justname'] = "Импортировать только название файла";
< 		$admtext['gedpath'] = "Папка GEDCOMа  (Импорт/Эк�порт)";
< 		$admtext['makefolder'] = "Создать папку";
< 		$admtext['blankchangedt'] = "Е�ли Дата изменений от�ут�твует";
< 		$admtext['usetoday'] = "И�пользовать �егодн�шнее чи�ло";
< 		$admtext['useblank'] = "О�тавить без изменений";
< 		$admtext['nobirthdate'] = "Принимать при от�ут�твии даты рождени�";
< 		$admtext['persliving'] = "Человек ещё жив";
< 		$admtext['persdead'] = "Человека нет в живых";
< 		$admtext['nodeathdate'] = "Принимать при от�ут�твии даты �мерти <br />е�ли �тарше, чем";
< 		$admtext['pedconfigsettings'] = "�а�тройки диаграмм";
< 		$admtext['usepopups'] = "�ачальный вид";
< 		$admtext['maxpedgens'] = "Мак�имальное количе�тво поколений";
< 		$admtext['dbsection'] = "База данных";
< 		$admtext['tablesection'] = "�азвани� таблиц";
< 		$admtext['foldersection'] = "Пути и папки";
< 		$admtext['sitesection'] = "Дизайн �айта и определение";
< 		$admtext['privsection'] = "Конфиденциально�ть";
< 		$admtext['namesection'] = "Имена";
< 		$admtext['descsection'] = "Потомки";
< 		$admtext['miscsection'] = "Разное";
< 		$admtext['mediatable'] = "Таблица медифайлов";
< 		$admtext['pedanddesc'] = "Общие �лементы";
< 		$admtext['descchart'] = "Диаграмма прои�хождени�";
< 		$admtext['pedchart'] = "Диаграмма генеалогиче�кого древа";
< 		$admtext['initgens'] = "�ачальные поколени�";
< 		$admtext['mediapath'] = "Папка дл� медиафайлов";
< 		$admtext['documentpath'] = "Папка дл� документов";
< 		$admtext['localdocumentpath'] = "Ме�тный(е) путь(и) дл� документов";
< 		$admtext['localotherpath'] = "Ме�тный(е) путь(и) дл� о�тавшего�� медиа";
< 		$admtext['imgmaxh'] = "Мак�имальна� вы�ота изображени�";
< 		$admtext['imgmaxw'] = "Мак�имальна� ширина изображени�";
< 		$admtext['succdel'] = "у�пешно удалено";
< 		$admtext['delbkups'] = "Удалить выбранные резервные копии";
< 		$admtext['suredelbk'] = "Вы уверены, что хотите удалить выбранные резервные копии?";
< 		$admtext['showhome'] = "Показать ��ылку на главную �траницу";
< 		$admtext['showsearch'] = "Показать ��ылку пои�ка";
< 		$admtext['showlogin'] = "Показать ��ылку входа/выхода";
< 		$admtext['showprint'] = "Показать ��ылку дл� печати";
< 		$admtext['showbmarks'] = "Показать ��ылку &#171;Добавить закладку&#187;";
< 		$admtext['server'] = "(�ервер)";
< 		$admtext['client'] = "(клиент)";
< 		$admtext['sitename'] = "�азвание �айта";
< 		$admtext['site_desc'] = "Опи�ание �айта";
< 		$admtext['privnote'] = "Префик� дл� личных заметок";
< 		$admtext['custvars'] = "Примечание: Свои на�тройки вы можете запи�ать в &#171;customconfig.php&#187; (откройте �тот файл в тек�товом редакторе и прочитайте ин�трукции).";
< 		$admtext['blockemail'] = "Блокировать предложени� или реги�трацию новых пользователей, где";
< 		$admtext['addrcontains'] = "�дре� �одержит";
< 		$admtext['msgcontains'] = "�ообщение �одержит";
< 		$admtext['reqloginset'] = "&#171;Требовать вход&#187; должено быть у�тановлено Да, чтобы включить �ту опцию";
< 		$admtext['treerestrict'] = "Ограничить до�туп к назначенному древу";
< 		$admtext['mapconfigsettings'] = "�а�тройки карты";
< 		$admtext['modifymapsettings'] = "Изменить параметры конфигурации карты";
< 		$admtext['maptype'] = "Тип карты:";
< 		$admtext['maphybrid'] = "Гибрид";
< 		$admtext['mapsatellite'] = "Спутник";
< 		$admtext['mapdimsind'] = "Размеры индивидуальной �траницы";
< 		$admtext['mapdimshst'] = "Размеры �траницы надгробий";
< 		$admtext['mapdimsadm'] = "Размеры �траницы �дмини�тратора";
< 		$admtext['mapwidth'] = "Ширина (% в px)";
< 		$admtext['mapheight'] = "Вы�ота (px)";
< 		$admtext['mapstlat'] = "�ачальна� Широта";
< 		$admtext['mapstlong'] = "�ачальна� Долгота";
< 		$admtext['startoff'] = "Скрыть навигационные карты дл� запу�ка";
< 		$admtext['conslpins'] = "Объединить повтор�ющие�� маркеры";
< 		$admtext['ssenabled'] = "Включить �лайд-шоу";
< 		$admtext['ssrepeat'] = "Слайд-шоу �вто повтор";
< 		$admtext['sysinfo'] = "Информаци� о �реде веб-�айта.";
< 		$admtext['albumlinkstable'] = "Медиа��ылки в альбоме";
< 		$admtext['addresstable'] = "�дре�а";
< 		$admtext['statestable'] = "Штаты";
< 		$admtext['countriestable'] = "Страны";
< 		$admtext['notelinkstable'] = "С�ылки на заметки";
< 		$admtext['medialinkstable'] = "Медиа��ылки";
< 		$admtext['saveimporttable'] = "Параметры импорта";
< 		$admtext['brlinkstable'] = "С�ылки на ветви";
< 		$admtext['temptable'] = "Временна�";
< 		$admtext['tleventstable'] = "Хронологи�";
< 		$admtext['album2entitiestable'] = "С�ылки на альбомы";
< 		$admtext['doctype'] = "Тип документа (&#60;!DOCTYPE&#62;)";
< 		$admtext['cemrows'] = "Мак�имальное количе�тво �трок в �толбце (приблизительно)";
< 		$admtext['cemblanks'] = "Опу�кать &#171;�еизве�тные&#187; категории";
< 		$admtext['success'] = "У�пешно";
< 		$admtext['fexists'] = "�е удало�ь. Папка уже �уще�твует.";
< 		$admtext['fmanual'] = "�е удало�ь. Создайте � помощью FTP-программы или �етевого файлового менеджера.";
< 		$admtext['maintmode'] = "Режим об�луживани�";
< 		$admtext['maintexp'] = "В�е до�тупы к базам данных временно недо�тупны из за об�луживани� �айта. Пожалуй�та, повторите попытку позже. Е�ли регул�рные функции не возобнов�ть�� в течение не�кольких ча�ов по�ле �того �ообщени�, пожалуй�та, �в�жите�ь � админи�трацией �айта.";
< 		$admtext['defimpopt'] = "Вариант замены по умолчанию";
< 		$admtext['seltable'] = "Пожалуй�та, выберите хот� бы одну таблицу.";
< 		$admtext['renumber'] = "Перенумеровать ID";
< 		$admtext['idtype'] = "Тип ID";
< 		$admtext['mindigits'] = "Минимум Цифр";
< 		$admtext['niprefix'] = "�е включа� префик� ID";
< 		$admtext['finreseq'] = "Готовые переупор�дочени�";
< 		$admtext['recsreseq'] = "records resequenced";
< 		$admtext['needmaint'] = "Дл� запу�ка �той утилиты необходимо быть в режиме об�луживани� (перейдите в меню &#171;�а�тройка >> Конфигураци� >> Общие параметры&#187;)";
< 		$admtext['reseqwarn'] = "<strong>ПРЕДУПРЕЖДЕ�ИЕ:</strong> Повторное переупор�дочение идентификаторов может приве�ти к нарушению внешних ��ылок на ваш �айт или указанию на ошибочные ме�тоположени�.";
< 		$admtext['subroot'] = "Путь конфигурации";
< 		$admtext['hidechr'] = "Скрыть �тикетки крещени�";
< 		$admtext['datefmt'] = "Чи�ловое предпочтение даты";
< 		$admtext['dayfirst'] = "День/Ме��ц/Год";
< 		$admtext['monthfirst'] = "Ме��ц/День/Год";
< 		$admtext['exusers'] = "И�ключа� имена пользователей";
< 		$admtext['allowreg'] = "Разрешить реги�трацию новых пользователей";
< 		$admtext['localhspath'] = "Ме�тный путь (пути) надгробного камн�";
< 		$admtext['pardata'] = "Данные родителей на личной �транице";
< 		$admtext['pnoevents'] = "�е показывать �обыти�";
< 		$admtext['pstdonly'] = "Показать только �тандартные �емейные �обыти�";
< 		$admtext['palldata'] = "Показать в�е �обыти� и медиа";
< 		$admtext['servertime'] = "Серверное врем�";
< 		$admtext['sitetime'] = "и врем� �айта";
< 		$admtext['srexpl'] = "�еоб�зательно. И�пользуйте аб�олютный путь, как в корневой папке, переме�тите �ледующие файлы в папку конфигурации<strong> �разу </strong> по�ле �охранени� и �делайте их до�тупными дл� запи�и (664 разрешени�): config.php, customconfig.php , importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
< 		$admtext['mapstzm'] = "Ма�штаб по умолчинию";
< 		$admtext['mapfoundzm'] = "Ма�штаб по положению";
< 		$admtext['rrnum'] = "Запи�ь номера отчёта";
< 		$admtext['progint'] = "Интервал выполнени� (м�)";
< 		$admtext['timechart'] = "Диаграмма шкалы времени";
< 		$admtext['tcheight'] = "Вы�ота Диаграммы";
< 		$admtext['distances'] = "В�е ра��то�ни� измер�ют�� в пик�ел�х.";
< 		$admtext['mpixels'] = "Пик�ели между ме��цами";
< 		$admtext['ypixels'] = "Пик�ели между годами";
< 		$admtext['ymult'] = "Количе�тво лет между метками годов";
< 		$admtext['mpct'] = "Процент по вертикали дл� ме��цев";
< 		$admtext['ypct'] = "Процент по вертикали дл� годов";
< 		$admtext['inclevs'] = "Включать �обыти�";
< 		$admtext['allevs'] = "В�е �обыти�";
< 		$admtext['rangeevs'] = "Только �обыти�, которые прои�ходили в период жизни людей на диаграмме";
< 		$admtext['tcwidth'] = "�ачальна� ширина графика";
< 		$admtext['simile'] = "Включить Simile TimeLine";
< 		//added in 8.0.0
< 		$admtext['pstartoff'] = "Скрыть общедо�тупные карты, чтобы начать";
< 		$admtext['maxrels'] = "Мак�имум отношений";
< 		$admtext['initrels'] = "�ачальные отношени�";
< 		$admtext['templateconfigsettings'] = "�а�тройки шаблонов";
< 		$admtext['modifytemplatesettings'] = "Изменить параметры конфигурации шаблонов";
< 		$admtext['ucsurnames'] = "В�е фамилии в верхнем реги�тре";
< 		$admtext['maxnoteprev'] = "Мак�имальное количе�тво �имволов в �пи�ках примечаний";
< 		$admtext['mailreg'] = "Почта и реги�траци�";
< 		$admtext['autoapp'] = "�втоматиче�ка� активаци� новых пользователей";
< 		$admtext['inclpwd'] = "Добавить пароль в привет�твенное пи�ьмо";
< 		$admtext['ackemail'] = "Отправить почту подтверждени�";
< 		$admtext['fromadmin'] = "Отправить в�ю почту от указанного выше адре�а";
< 		$admtext['autotree'] = "Создать новое дерево дл� пользовател�";
< 		$admtext['modspath'] = "Папка дл� модов";
< 		$admtext['extspath'] = "Папка дл� ра�ширений";
< 		$admtext['encrtype'] = "Тип шифровани�";
< 		$admtext['none'] = "Без шифровани�";
< 		$admtext['imgviewer'] = "Включить про�мотрщик изображений";
< 		$admtext['docsonly'] = "Только документы";
< 		$admtext['imgvheight'] = "Вы�ота про�мотрщика изображений";
< 		$admtext['flex'] = "В�егда показывать изображение полно�тью";
< 		$admtext['setheight'] = "Фик�ированна� (640px)";
< 		//added in 9.0.0
< 		$admtext['places1tree'] = "�азначить древе�ам запи�и � ме�тами";
< 		$admtext['convert'] = "Преобразовать";
< 		$admtext['convexpl'] = "(Это назначит в�е текущие ме�та дл� выбранного генеалогиче�кого древа)";
< 		$admtext['mergeexpl'] = "(Это приведёт к удалению запи�ей генеалогиче�кого древа из в�ех назначенных ме�т)";
<         $admtext['nocutoff'] = "О�тавьте пу�тым или равным нулю, чтобы убрать ограничение";
<         $admtext['usesmtp'] = "И�пользовать аутентификацию SMTP";
<         $admtext['mailhost'] = "Им� хо�та SMTP";
<         $admtext['mailuser'] = "Им� пользовател� почты";
<         $admtext['mailpass'] = "Пароль почты";
<         $admtext['mailport'] = "�омер порта";
< 		$admtext['showshare'] = "Показать ��ылку дл� общего до�тупа";
< 		$admtext['defpgsize'] = "Размер �траницы PDF по умолчанию";
< 		$admtext['mapterrain'] = "Карта ме�тно�ти";
< 		$admtext['maproadmap'] = "Дорожна� карта";
< 		$admtext['usedefthumbs'] = "И�пользовать миниатюры по умолчанию";
<         $admtext['autogeo'] = "Геокодировать в�е новые ме�та";
<         $admtext['revmail'] = "Уведомл�ть о про�мотренных материалах";
<         $admtext['assumepriv'] = "Предполагает�� приватный, е�ли не умер �ти многие годы";
<         $admtext['calstart'] = "Первый день недели";
< 		$admtext['edit_timeout'] = "Изменить тайм-аут (минуты)";
< 		$admtext['shownamespr'] = "Показать имена дл� приватных";
< 		$admtext['tables'] = "Таблицы";
< 		//changed in 10.0.0
< 		$admtext['regnotes'] = "Показать заметки и пользователь�кие �обыти� в рее�тре";
< 		//added in 10.0.0
< 		$admtext['collation'] = "Сопо�тавление";
< 		$admtext['collationexpl'] = "(о�тавьте пу�тым, чтобы прин�ть значение по умолчанию)";
< 		$admtext['scrollcite'] = "Прокрутка цитат";
< 		$admtext['hidemedia'] = "Скрыть личные медиа";
< 		$admtext['searchchoice'] = "С�ылка &#171;Пои�к&#187;";
< 		$admtext['quicksearch'] = "Бы�трый пои�к";
< 		$admtext['advsearch'] = "Ра�ширенный пои�к";
< 		$admtext['pedvertical'] = "Вертикальный";
< 		$admtext['vboxwidth'] = "Ширина пр�моугольника";
< 		$admtext['vboxheight'] = "Вы�ота пр�моугольника";
< 		$admtext['vspacing'] = "Вертикальный интервал";
< 		$admtext['vchart'] = "Вертикальна� диаграмма";
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Повторно и�пользовать удалённые ID";
< 		$admtext['lastimport'] = "Показать по�ледний импорт";
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Шифрование";
<         //added in 11.0.0
< 		$admtext['dbport'] = "Порт";
< 		$admtext['dbsocket'] = "Сокет";
< 		//$admtext['mhrequests'] = "Partner Requests";
< 		$admtext['prefsection'] = "Префик�ы и �уффик�ы";
< 		$admtext['personprefix'] = "Префик� человека";
< 		$admtext['personsuffix'] = "Суффик� человека";
< 		$admtext['familyprefix'] = "Префик� �емьи";
< 		$admtext['familysuffix'] = "Суффик� �емьи";
< 		$admtext['sourceprefix'] = "Префик� и�точника";
< 		$admtext['sourcesuffix'] = "Суффик� и�точника";
< 		$admtext['repoprefix'] = "Префик� хранилища";
< 		$admtext['reposuffix'] = "Суффик� хранилища";
< 		$admtext['noteprefix'] = "Префик� заметки";
< 		$admtext['notesuffix'] = "Суффик� заметки";
< 		$admtext['mobilesection'] = "Мобильна� вер�и�";
< 		$admtext['mobilesite'] = "Им� мобильного �айта будет";
< 		$admtext['menubar'] = "в �троке мобильного меню";
< 		$admtext['belowbar'] = "под �трокой мобильного меню";
< 		$admtext['responsivetables'] = "Включить адаптивные таблицы";
< 		$admtext['tabletype'] = "Тип адаптивной таблицы";
< 		$admtext['enablemodeswitch'] = "Включить переключатель режима адаптивных таблиц";
< 		$admtext['enableminimap'] = "Включить Mini Map plugin";
< 		$admtext['showtasks'] = "Показать �ообщени� о важных задачах";
< 		$admtext['showtotals'] = "Показывать итоговые �уммы в меню админи�тратора";
< 		$admtext['backupdays'] = "Оповещение, е�ли резервна� копи� от�ут�твует в течение не�кольких дней";
< 		$admtext['backupnote'] = "Примечание: Е�ли ваша база данных очень больша�, вы можете и�пользовать незави�имый ин�трумент (например, mysqldumper или phpMyAdmin) дл� резервного копировани� и во��тановлени� таблиц. По крайней мере, один из них должен быть до�тупен � панели управлени� вашего �айта.";		//$admtext['showmatches'] = "Show MyHeritage matches";
< 		//$admtext['showmatches'] = "Show MyHeritage matches";
< 		//$admtext['mhconfidence'] = "Minimum confidence level";
< 		//$admtext['mhmatchtype'] = "Match type";
< 		$admtext['hidedna'] = "Скрыть в�е �траницы и данные Д�К";
<         $admtext['assumeliving'] = "Предполагает��, что живой, е�ли не умер за �ти много лет";
< 		//changed in 11.0.2
< 		$admtext['mapkey'] = "Ключ карты";
< 		//added in 12.0
< 		$admtext['sitekey'] = "Ключ �айта reCAPTCHA";
< 		$admtext['secret'] = "Секрет reCAPTCHA";
< 		$admtext['mediadel'] = "Удалить физиче�кий файл при удалении";
< 		$admtext['onrequest'] = "По запро�у";
< 		$admtext['mediathumbs'] = "Показать фотографии в одной �троке";
< 		$admtext['footermsg'] = "Тек�т в нижнем колонтитуле";
< 		$admtext['templatestable'] = "�а�тройки шаблона";
< 		$admtext['mediatrees'] = "Отдельные медиафайлы в папках генеалогиче�кого древа";
< 		$admtext['mediaexpl'] = "xxx медиафайлы перемещены";
< 		$admtext['dnatestscomparecolors'] = "Сравнение цветов заголовков �толбцов те�тов Y-DNA";
< 		$admtext['getcolorcodes'] = "Получить цветовые коды зде�ь";
< 		$admtext['mainbackground'] = "Цвет фона о�новного заголовка";
< 		$admtext['modebackground'] = "Цвет фона режима значений";
< 		$admtext['fastmutbackground'] = "Цвет фона бы�трой мутации";
< 		$admtext['background1_12'] = "Цвет фона маркеров 1-12";
< 		$admtext['background13_25'] = "Цвет фона маркеров 13-25";
< 		$admtext['background26_37'] = "Цвет фона маркеров 26-37";
< 		$admtext['background38_67'] = "Цвет фона маркеров 38-67";
< 		$admtext['background111'] = "Цвет фона маркеров 68-111";
< 		$admtext['textcolor'] = "Цвет тек�та";
< 		$admtext['show_test_number'] = "Показать номер те�та Д�К публично";
< 		$admtext['excludefromancsn'] = "И�ключить из фамилий предков";
< 		$admtext['upperancsunames'] = "Фамилии Предков в верхнем реги�тре";
< 		$admtext['autofillancsunames'] = "�втозаполнение Фамилий Предков";
< 		$admtext['colorschemer'] = "ColorSchemer - онлайн генератор цветовой �хемы";
< 		//added in 12.0.1
< 		$admtext['cookieapproval'] = "Показать �ообщение об утверждении cookie";
< 		$admtext['dataprotectmsg'] = "Показать ��ылку на политику защиты данных";
< 		$admtext['nointernet'] = "Я и�пользую TNG в автономном режиме";
< 		$admtext['askconsent'] = "Запро� �огла�и� в отношении личной информации";
< 		break;
< 
< 	//findpersonform.php
< 	case "findpersonform":
< 		$admtext['enternamepart'] = "Введите ча�ть имени и/или фамилии";
< 		$admtext['pleasenamepart'] = "Пожалуй�та, Введите ча�ть имени и/или фамилии.";
< 		$admtext['enternamepart2'] = "Введите идентификационный номер человека или ча�ть имени и/или фамилии";
< 		break;
< 
< 	//findplace.php, findplaceform.php
< 	case "findplace":
< 		$admtext['pleaseplacepart'] = "Пожалуй�та, Введите ча�ть названи� ме�та.";
< 		$admtext['addnewplace'] = "Добавить новое ме�то";
< 		$admtext['createplace'] = "Сделать запи�ь дл� нового ме�та";
< 		$admtext['modifyplace'] = "Изменить �уще�твующее ме�то";
< 		$admtext['editexistingplaceinfo'] = "Изменить информацию дл� ранее введенного ме�та";
< 		$admtext['enterplace'] = "Введите, пожалуй�та, название ме�та.";
< 		$admtext['newplaceinfo'] = "Информаци� о новом ме�те";
< 		$admtext['existingplaceinfo'] = "Суще�твующа� информаци� об �том ме�те";
< 		$admtext['changestoplace'] = "Изменени� в �том ме�те";
< 		$admtext['selectplaceaction'] = "Выбрать ме�то и дей�твие";
< 		$admtext['mergeplaces'] = "Объединить ме�та";
< 		$admtext['findmerge'] = "�айти ме�та дл� объединени�";
< 		$admtext['selectplacemerge'] = "Выбрать ме�та дл� объединени�";
< 		$admtext['mcol1'] = "Добавить<br/>�то<br/>(�тереть)";
< 		$admtext['mcol2'] = "вме�те<br/>�<br/>(держать)";
< 		$admtext['pmsucc'] = "Объединение ме�т произошло у�пешно";
< 		$admtext['nomerge'] = "�ечего объединить";
< 		$admtext['enterkeep'] = "Выберите, пожалуй�та, цель объединени�.";
< 		$admtext['backmerge'] = "Повторный пои�к";
< 		$admtext['confdeleteplace'] = "Вы уверены, что хотите удалить �то ме�то?";
< 		$admtext['propagate'] = "Изменить названи� ме�т в �уще�твующих �обыти�х";
< 		//added in 8.0.0
< 		$admtext['confdelcemlink'] = "Вы уверены, что хотите разорвать �в�зь � �тим кладбищем?";
< 		$admtext['nocoords'] = "От�ут�твует широта или долгота";
< 		$admtext['istemple'] = "Это топоним храма СПД";
< 		$admtext['findtemples'] = "�айти только коды храма СПД";
< 		$admtext['choosecem'] = "Выберите кладбище";
< 		$admtext['geocopy'] = "Скопируйте данные геокода ниже на �то кладбище";
< 		$admtext['linkcem'] = "Св�жите �то ме�то � кладбищем";
< 		$admtext['cemsavail'] = "Спи�ок включает в �еб� только кладбища, которые ещё не �в�заны � ме�том";
< 		$admtext['nocemsavail'] = "�е �уще�твует  кладбищ, или каждое кладбище уже было �в�зано � ме�том.";
<         //added in 9.0.0
<         $admtext['geocode'] = "Геокодировать";
<         $admtext['ignoreall'] = "Игнорировать в�ё";
<         $admtext['usefirst'] = "И�пользовать первое �овпадение";
<         $admtext['multchoice'] = "Е�ли найдено не�колько результатов дл� ме�та:";
<         $admtext['geoexpl'] = "Геокодирование в�ех ме�т без координат широты и долготы";
<         $admtext['geocoding'] = "Геокодирование...";
<         $admtext['backgeo'] = "Вернуть�� в меню Геокодировани�";
<         $admtext['limit'] = "Лимит:";
<         $admtext['nolimit'] = "Безлимитный";
< 		$admtext['blankplace'] = "�азвание пу�того ме�та";
<         $admtext['nogeocode'] = "�е удало�ь геокодировать";
<         $admtext['toomany'] = "Игнорирует�� (�лишком много результатов)";
< 		$admtext['treesgone'] = "�азначени� деревьев удалены из запи�ей в�ех ме�т";
< 		//added in 11.0.0
< 		$admtext['nolevel'] = "Уровень ме�та не у�тановлен";
< 		$admtext['placenotsaved'] = "Ме�то не �охранено. Другое ме�то � таким названием уже �уще�твует. Пожалуй�та, объедините �ти ме�та.";
< 		//added in 12.0.0
< 		$admtext['noevents'] = "�ет �в�занных �обытий";
<     	break;
< 		
< 	//generateID.php
< 	case "generateID":
< 		$admtext['generatenewid'] = "Создать новый идентификационный номер";
< 		$admtext['generating'] = "Создает��... Подождите немного!";
< 		break;
< 	
< 	//secondary.php
< 	case "secondary":
< 		$admtext['trackinglines'] = "Ра�читывают�� линии родов...";
< 		$admtext['finishedtracking'] = "Ра�чет линий родов закончен.";
< 		$admtext['backtosecondary'] = "�азад к вторичным проце��ам";
< 		$admtext['sortchildren'] = "Сортировать детей";
< 		$admtext['sortingchildren'] = "Сортирование детей...";
< 		$admtext['sortspouses'] = "Сортировать �упругов";
< 		$admtext['sortingspouses'] = "Сортировка �упругов...";
< 		$admtext['relabelbranches'] = "Отметить ветви";
< 		$admtext['relabeling'] = "Отметка ветвей...";
< 		$admtext['creatinggendex'] = "Создает�� файл GENDEX...";
< 		$admtext['finishedgendex'] = "Закончил �оздание файла GENDEX.";
< 		//added in 8.0.0
< 		$admtext['postgdx'] = "Где разме�тить файл GENDEX";
< 		//added in 10.0.0
< 		$admtext['evalmedia'] = "Обрезать меню &#171;Медиа&#187;";
< 		$admtext['evaluating'] = "Под�чёт медиафайлов";
< 		$admtext['finished'] = "Завершено";
< 		//added in 12.0.0
< 		$admtext['refreshliving'] = "Обновить живых/умерших";
< 		$admtext['chtodeceased'] = "Изменён на умерший";
< 		$admtext['chtoliving'] = "Изменён на живущий";
< 		$admtext['chtoprivate'] = "Изменен на приватный";
< 		$admtext['makeprivate'] = "Сделать приватным";
< 		break;
< 
< 	//newlanguage.php
< 	case "language":
< 		$admtext['addnewlanguage'] = "Добавить новый �зык";
< 		$admtext['enterlangdisplay'] = "Вве�ти название �зыка.";
< 		$admtext['enterlangfolder'] = "�абрать название папки, где будут �охран�ть�� файлы дл� �того �зыка.";
< 		$admtext['newlanguageinfo'] = "Информаци� о новом �зыке";
< 		$admtext['langdisplay'] = "Отображаемое название";
< 		$admtext['createlanguage'] = "Сделать запи�ь дл� нового �зыка";
< 		$admtext['nolanguages'] = "�ет запи�и о �зыке";
< 		$admtext['conflangdelete'] = "Вы уверены, что хотите удалить �тот �зык?";
< 		$admtext['existinglanguages'] = "Информаци� о �уще�твующем �зыке";
< 		$admtext['modifylanguage'] = "Изменить �уще�твующий �зык";
< 		$admtext['changestolanguage'] = "Изменени� в �зыке";
< 		$admtext['charset'] = "�абор �имволов";
< 		$admtext['editexistinglanguage'] = "Изменить, удалить или добавить �зык";
< 		break;
< 	
< 	//addtree.php, trees.php, edittree.php, deletetree.php, newtree.php, updatetree.php
< 	case "trees":
< 		$admtext['createtree'] = "Создание запи�и дл� нового генеалогиче�кого древа";
< 		$admtext['notrees'] = "�ет запи�ей о генеалогиче�ком древе";
< 		$admtext['existingtrees'] = "Информаци� о �уще�твующем генеалогиче�ком древе";
< 		$admtext['editexistingtree'] = "Изменить информацию об уже добавленном генеалогиче�ком древе";
< 		$admtext['treename'] = "�азвание генеалогиче�кого древа";
< 		$admtext['owner'] = "Владелец";
< 		$admtext['conftreedelete'] = "Вы уверены, что хотите удалить �то генеалогиче�кое древо, а также в�е, �в�занные � ним �лементы?";
< 		$admtext['conftreeclear'] = "Вы уверены, что хотите удалить в�е �ведени� об �том генеалогиче�ком древе?";
< 		$admtext['changestotree'] = "Изменени� в генеалогиче�ком древе";
< 		$admtext['newtreeinfo'] = "Информаци� о новом генеалогиче�ком древе";
< 		$admtext['existingtreeinfo'] = "Информаци� о �уще�твующем генеалогиче�ком древе";
< 		$admtext['modifytree'] = "Изменить �уще�твующее генеалогиче�кое древо";
< 		$admtext['succcleared'] = "у�пешно удалено";
< 		$admtext['gedcomextraction'] = "Запретить пользовател�м загружать GEDCOM";
< 		$admtext['gedexport'] = "Эк�портировать GEDCOM";
< 		$admtext['exporting'] = "Эк�портирует GEDCOM...";
< 		$admtext['ifexportfails'] = "Е�ли �к�порт не произойдет,";
< 		$admtext['finishedexporting'] = "Закончил �к�порт GEDCOMа";
< 		$admtext['backtotrees'] = "Вернуть�� к генеалогиче�ким древе�ам";
< 		$admtext['downloadged'] = "Загрузить GEDCOM";
< 		$admtext['lastimport'] = "Импорт";
< 		$admtext['treeexists'] = "Генеалогиче�кое древо � выбранным ID уже �уще�твует. Выберите другой ID и попробуйте �нова.";
< 		$admtext['exportmedia'] = "Эк�порт медиалинков";
< 		//added in 8.0.0
< 		$admtext['changetree'] = "Помен�ть Древо";
< 		$admtext['newtree'] = "�овое Древо";
< 		$admtext['currtree'] = "Текущее Древо";
< 		$admtext['chwarn'] = "ПРЕДУПРЕЖДЕ�ИЕ: Эта операци� удалит в�е �емейные ��ылки, цитаты и другие ��ылки на �тот объект в текущем дереве.";
< 		$admtext['keepprivate'] = "Скрыть информацию о владельце";
< 		//changed in 9.0.0
< 		$admtext['exppaths'] = "Ме�тные пути дл�";
< 		$admtext['nopdf'] = "Запретить пользовател�м �оздавать PDF файлы";
< 		//added in 10.0.0
< 		$admtext['exprivate'] = "И�ключить приватные";
< 		$admtext['exliving'] = "И�ключить живущих";
< 		$admtext['importfilename'] = "Им� файла импорта";
< 		break;
< 
< 	//adduser.php, users.php, edituser.php, deleteuser.php, newuser.php, updateuser.php
< 	case "users":
< 		$admtext['addnewuser'] = "Добавить нового пользовател�";
< 		$admtext['createuser'] = "Сделать запи�ь дл� нового пользовател�";
< 		$admtext['nousers'] = "�ет запи�и дл� пользовател�";
< 		$admtext['existingusers'] = "Информаци� о �уще�твующем пользователе";
< 		$admtext['editexistinguser'] = "Изменить информацию об уже добавленном пользователе";
< 		$admtext['confuserdelete'] = "Вы уверены, что хотите удалить �того пользовател�?";
< 		$admtext['changestouser'] = "Изменени� в пользователе";
< 		$admtext['enteruserpassword'] = "Введите пароль.";
< 		$admtext['enterusername'] = "Введите им� пользовател�.";
< 		$admtext['newuserinfo'] = "Информаци� о новом пользователе";
< 		$admtext['existinguserinfo'] = "Информаци� о �уще�твующем пользователе";
< 		$admtext['modifyuser'] = "Изменить �уще�твующего пользовател�";
< 		$admtext['allow_living'] = "Разрешить про�мотр информации дл� живых людей";
< 		$admtext['allow_lds'] = "Разрешить про�мотр данных СПД";
< 		$admtext['enteruserdesc'] = "Введите опи�ание имени пользховател�.";
< 		$admtext['enterpassword'] = "введите пароль.";
< 		$admtext['admin'] = "Admin";
< 		$admtext['firstuser'] = "Первый пользователь, которого вы введете, будет админи�тратором TNG-�айта (генеалогиче�кое древо �Е выбрано) и будет иметь до�туп ко в�ем на�тройкам TNG-�айта.";
< 		$admtext['userfailed'] = "ОШИБК�: �тот пользователь не может быть �оздан, потому что уже �уще�твует пользователь � таким именем.";
< 		$admtext['allow_ged'] = "Разрешить �оздание файлов GEDCOM";
< 		$admtext['assigned'] = "Выдано";
< 		$admtext['treemsg'] = "�еоб�зательный. От�ут�твие при�воени� пользователю генеалогиче�кого древа приведёт к тому, что у пользовател� будут права дл� в�ех древе� и в�ех ветвей. �дмини�тратору �айта не �ледует назначать дерево.";
< 		$admtext['branchmsg'] = "�еоб�зательный. При�воение ветви пользователю ограничивает права, предо�тавленные на �той �транице, назначенной ветви в выбранном дереве.";
< 		$admtext['accesslimits'] = "Ограничени� до�тупа:";
< 		$admtext['rights'] = "Права:";
< 		$admtext['realname'] = "Им�";
< 		$admtext['gedcom'] = "GEDCOM";
< 		$admtext['newusers'] = "Реги�траци�(и) новых пользователей";
< 		$admtext['editnewusers'] = "Обработка запи�ей дл� вновь зареги�трированных пользователей. �овые пользователи получают права по�ле обработки реги�трации.";
< 		$admtext['nonewusers'] = "�ет новых пользователей";
< 		$admtext['lastlogin'] = "По�ледний вход";
< 		$admtext['tentative_edit'] = "Разрешить рецензирование админи�тратором (только людей, �емей и и�точников)";
< 		$admtext['notify'] = "Сообщить �тому пользователю об активации аккаунта";
< 		$admtext['no_edit'] = "Изменени� �уще�твующих запи�ей <strong>не</strong> разрешено";
< 		$admtext['emailusers'] = "Отправьте E-mail пользовател�м";
< 		//$admtext['sendemailstousers'] = "Send an E-mail to all registered users";
< 		$admtext['emailmessage'] = "E-mail �ообщение пользовател�м";
< 		$admtext['subject'] = "Тема �ообщени�";
< 		$admtext['messagetext'] = "Тек�т �ообщени�";
< 		$admtext['selectgroup'] = "Выберите группу, котора� должна получить E-mail (о�тавить незаполненным, чтобы выбрать в�е группы)";
< 		$admtext['treemailmsg'] = "Выборочно. Выбор генеалогиче�кого древа дает возможно�ть получить �то �ообщение в�ем пользовател�м �того генеалогиче�кого древа.";
< 		$admtext['branchmailmsg'] = "Выборочно. Выбор ветви дает возможно�ть получить �то �ообщение в�ем пользовател�м �той ветви.";
< 		$admtext['send'] = "Отправить E-mail";
< 		$admtext['sentmailmessage'] = "Отправить �ообщение";
< 		$admtext['succmail'] = "Ваше �ообщение отправлено.";
< 		$admtext['mailfailed'] = "При отправке вашего �ообщени� произошла ошибка.";
< 		$admtext['entersubject'] = "Задайте, пожалуй�та, тему �ообщени�.";
< 		$admtext['entermsgtext'] = "�апишите, пожалуй�та, тек�т.";
< 		$admtext['adminonly'] = "Показать только пользователей Admin";
< 		$admtext['dtregistered'] = "Дата реги�трации";
< 		$admtext['dtactivated'] = "Дата активации";
< 		$admtext['no_email'] = "�е отправл�ть общего �ообщени� �тому пользователю";
< 		$admtext['allow_admin'] = "Дать до�туп ко в�ем �и�темным на�тройкам  и функци�м и дать права на в�е генеалогиче�кие древе�а и ветви.";
< 		$admtext['limitedrights'] = "Ограничить до�туп к �ледующему:";
< 		$admtext['allow_edit'] = "Изменени� �уще�твующих запи�ей разрешено (через �траницу админи�тратора)";
< 		$admtext['allow_add'] = "Добавление новых запи�ей разрешено";
< 		$admtext['allow_delete'] = "Удаление �уще�твующих запи�ей разрешено";
< 		//added in 8.0.0
< 		$admtext['usrguest'] = "Го�ть";
< 		$admtext['usrguestd'] = "�ет прав добавл�ть, редактировать и удал�ть, ";
< 		$admtext['noadmin'] = "нет прав админи�трировани�";
< 		$admtext['usrsubm'] = "Податель";
< 		$admtext['usrsubmd'] = "Разрешены изменени� подлежащие к ра��мотрению, ";
< 		$admtext['usrcontrib'] = "Помощник";
< 		$admtext['usrcontribd'] = "Добавл�ть информацию, в том чи�ле медиафайлы";
< 		$admtext['usreditor'] = "Редактор";
< 		$admtext['usreditord'] = "Добавить, редактировать и удал�ть в�ю информацию, в том чи�ле  медиа";
< 		$admtext['usradmin'] = "�дмини�тратор";
< 		$admtext['usradmind'] = "В�е права";
< 		$admtext['usrmcontrib'] = "По�тавщик медиафайлов";
< 		$admtext['usrmcontribd'] = "Добавл�ть только медиафайлы";
< 		$admtext['usrmeditor'] = "Редактор медиафайлов";
< 		$admtext['usrmeditord'] = "Добавл�ть, редактировать и удал�ть только медиафайлы";
< 		$admtext['allow_media_edit'] = "Разрешить редактировать только медиафайлы";
< 		$admtext['allow_media_add'] = "Разрешить добавление только медиафайлов";
< 		$admtext['allow_media_delete'] = "Разрешить только удаление медиафайлов";
< 		$admtext['no_add'] = "�ет прав добавл�ть";
< 		$admtext['no_delete'] = "�ет прав удал�ть";
< 		$admtext['roles'] = "Роли";
< 		$admtext['usrcustom'] = "Пользователь�кий";
<         //added in 9.0.0
< 		$admtext['allow_private'] = "Разрешить ра��матривать информацию дл� приватных людей";
< 		$admtext['allow_pdf'] = "Разрешить �качивать PDF файлы";
< 		//changed in 12.0.0
< 		$admtext['allow_profile'] = "Разрешить редактировать профиль пользовател�";
< 		//added in 12.0.0
< 		$admtext['mult_trees'] = "Применить права дл� не�кольких деревьев";
< 		//added in 12.0.1
< 		$admtext['consented'] = "Дано �огла�ие";
< 		$admtext['consentdate'] = "Дата �огла�и�";
< 		break;
< 
< 	case "login":
< 		$admtext['loginfailed'] = "Ошибка входа.";
< 		$admtext['adminlogfile'] = "Журнал админи�тратора";
< 		$admtext['mostrecentactions'] = "По�ледние дей�тви�";
< 		$admtext['rempass'] = "Запомнить мой логин на �том компьютере";
< 		$admtext['sessexp'] = "Врем� �еан�а и�текло.";
< 		$admtext['logagain'] = "�ажмите, чтобы �нова войти.";
< 		//added in 8.1.0
< 		$admtext['logininactive'] = "Ваш логин ещё не активирован. Пожалуй�та, повторите попытку позже или обратите�ь к админи�тратору �айта.";
< 		break;
< 
< 	case "timeline":		
< 		$admtext['createnewtlevent'] = "Создать новое �обыти� на шкале времени";
< 		$admtext['modifytlevent'] = "Изменить �уще�твующее �обытие на шкале времени";
< 		$admtext['leaveblankalltlevents'] = "о�тавить поле пу�тым дл� отображени� в�ех �обытий на шкале времени";
< 		$admtext['evyear'] = "Год �обыти�";
< 		$admtext['evdetail'] = "Детальна� информаци�";
< 		$admtext['selecttleventaction'] = "Выбрать �обытие на шкале времени и дей�твие";
< 		$admtext['changestotlevent'] = "Изменени� в �обытии шкалы времени";
< 		$admtext['location'] = "Ме�то";
< 		$admtext['confdeletetlevent'] = "Вы уверены, что хотите удалить �то �обытие на шкале времени?";
< 		$admtext['enterevyear'] = "Заполните, пожалуй�та, год �обыти�.";
< 		$admtext['enterevdetail'] = "Заполните, пожалуй�та, подробно�ти �той шкалы времени �обытий.";
< 		$admtext['existingtleventinfo'] = "Суще�твующее �обытие на шкале времени";
< 		$admtext['newtleventinfo'] = "�овое �обытие на  шкале времени";
< 		$admtext['edittleventinfo'] = "Добавление, изменени� или удаление �обытий на шкале времени";
< 		$admtext['addnewtlevent'] = "Добавить новое �обытие";
< 		$admtext['yrreq'] = "(об�зателен только год)";
< 		$admtext['startdt'] = "�ачальна� дата";
< 		$admtext['enddt'] = "Конечна� дата";
< 		//added in 9.0.0
< 		$admtext['evtitle'] = "�азвание �обыти�";
< 		break;
< 
< 	case "review":
< 		$admtext['selectevaction'] = "Выберите предложенное изменение и дей�твие";
< 		$admtext['suggested'] = "Предложение";
< 		$admtext['usernotes'] = "Примечани� в отношении<br />предложенного изменени�<br />(не будут �охранены)";
< 		$admtext['postdate'] = "Введено";
< 		$admtext['savedel'] = "Обработать & удалить";
< 		$admtext['postpone'] = "Отложить";
< 		$admtext['igndel'] = "Отменить & удалить";
< 		$admtext['tentdel'] = "было удалено";
< 		$admtext['tentadd'] = "�делано по�то�нным";
< 		break;
< 
< 	//added in 8.0.0
< 	case "misc":
< 		$admtext['noteblurb'] = "�епо�ред�твенно найти, отредактировать или удалить любую заметку в базе данных.";
< 		$admtext['whatsnewblurb'] = "Предо�тавьте �воим по�етител�м информацию об обновлени�х на �айте или другую актуальную информацию в верхней ча�ти �траницы &#171;Что �ового&#187;.";
< 		$admtext['mwblurb'] = "Ведите �пи�ок людей и фотографий, о которых нет данных, в надежде �о временем получить больше информации о них.";
< 		$admtext['dvblurb'] = "Пои�к возможных проблем в �уще�твующей информации.";
< 		$admtext['wr_gender'] = "�еправильный пол";
< 		$admtext['unk_gender'] = "�еизве�тный пол";
< 		$admtext['marr_young'] = "Женат �лишком рано (моложе 15 лет)";
< 		$admtext['marr_aft_death'] = "Женат по�ле �мерти";
< 		$admtext['marr_bef_birth'] = "Женат до рождени�";
< 		$admtext['died_bef_birth'] = "Умер до рождени�";
< 		$admtext['parents_younger'] = "Родил�� �лишком рано (родители моложе 15 лет, или ребёнок родил�� до брака)";
< 		$admtext['children_late'] = "Родил�� �лишком поздно (мать �тарше 50 лет)";
< 		$admtext['not_living'] = "Человек отмечен как живой, но указана дата �мерти";
< 		$admtext['not_dead'] = "Человек, отмечен как умерший, возможно, в�ё ещё жив";
< 		$admtext['parmarr'] = "Брак родителей";
< 		$admtext['motherbirth'] = "Рождение матери";
< 		break;
< 		
< 	case "mods":
< 		$admtext['modlist'] = "Спи�ок модов";
< 		$admtext['removed'] = "удалён";
< 		$admtext['installed'] = "У�тановлено";
< 		$admtext['deleted'] = "удалённый";
< 		$admtext['cantdel'] = "не удает�� удалить";
< 		$admtext['cfgname'] = "Им� файла конфигурации";
< 		$admtext['version'] = "Вер�и�";
< 		$admtext['nomods'] = "�ет файлов определений мода (xxx) в папке мода";
< 		$admtext['location'] = "Ра�положение";
< 		$admtext['missing'] = "От�ут�твует";
< 		$admtext['badtarget'] = "Плохой целевой путь";
< 		$admtext['cantwrite'] = "�евозможно запи�ать в";
< 		$admtext['notwrite'] = "не до�тупен дл� запи�и, проверьте разрешени�";
< 		$admtext['checkwrite'] = "Проверьте разрешени�, должна быть разрешена запи�ь.";
< 		$admtext['toterrors'] = "В�его ошибок";
< 		$admtext['missfile'] = "От�ут�твует файл";
< 		$admtext['notunique'] = "не уникальный";
< 		$admtext['nodesc'] = "Ошибка определени� параметра, от�ут�твует опи�ание";
< 		$admtext['defval'] = "Значение по умолчанию";
< 		$admtext['written'] = "Файл запи�ан";
< 		//changed in 9.0.0
< 		$admtext['locmissing'] = "Дл� у�тановки от�ут�твует локальна� копи� ххх";
< 		//added in 9.0.0
< 		$admtext['needmodupdate'] = "Требует�� обновление мода";
< 		$admtext['cannotinstall'] = "�евозможно у�тановить �тот мод";
< 		$admtext['emptytarget'] = "Целевой файл пу�той.";
< 		$admtext['cantdelmissing'] = "�е удает�� удалить, файл от�ут�твует";
< 		//changed in 10.0.3 
< 		$admtext['editperf'] = "Параметры редактировани� были изменены �ледующим образом:";
< 		//added in 10.0.3 
< 		$admtext['options'] = "Параметры";
< 		$admtext['viewlog'] = "Про�мотр журнала";
< 		$admtext['target'] = "Изменени�";
< 		$admtext['newfile'] = "Создает";
< 		$admtext['copiesfile'] = "Копии";
< 		$admtext['copiesfile2'] = "Копии в";
< 		$admtext['logoptions'] = "Журнал менеджера модов";
< 		$admtext['mmlogfilename'] = "Им� журнала";
< 		$admtext['sortlistby'] = "Сортировать �пи�ки по";
< 		$admtext['modname'] = "Им� мода";
< 		$admtext['bypassconfirm'] = "Без подтверждений";
< 		$admtext['modifyoptions'] = "Изменить параметры менеджера модов";
< 		$admtext['ready'] = "OK дл� у�тановки";
< 		$admtext['noselected'] = "Вы не выбрали ни одного файла!";
< 		$admtext['choose'] = "Выбрать";
< 		$admtext['showlogfile'] = "Показать журнал дей�твий менеджера модов";
< 		$admtext['recentactions'] = "По�ледние дей�тви� менеджера модов";
< 		$admtext['clearlog'] = "Очи�тить журнал";
< 		$admtext['confirmclearlog'] = "Вы дей�твительно хотите очи�тить журнал ?";
< 		$admtext['modsyntax'] = "Синтак�и� мода";
< 		$admtext['modguidelines'] = "Стандарты мода";
< 		$admtext['filemod'] = "Файл xxx изменён";
< 		$admtext['potconf'] = "Потенциальные конфликты";
< 		$admtext['modifications'] = "изменени�";
< 		$admtext['othermmoptions'] = "Другие";
< 		$admtext['file'] = "Файл";
< 		$admtext['tngmods'] = "Моды дл� TNG";
< 		//changed in TNG 10.1
< 		$admtext['copied'] = "�копированный";
< 		$admtext['emptyfile'] = "файл пу�т";
< 		$admtext['filescopied'] = "файлы �копированы";
< 		$admtext['notinst'] = "не у�тановлен";
< 		$admtext['install'] = "у�тановить";
< 		$admtext['filedel'] = "Файл удалён";
< 		$admtext['created'] = "�оздан";
< 		$admtext['choosefilter'] = "Выберите фильтр и нажмите &#171;ОК&#187; дл� до�тупных �лементов управлени�";
< 		$admtext['mmmaxloglines'] = "Мак�имальное количе�тво транзакций";
< 		$admtext['statusfilter'] = "Стату�";
< 		//added in TNG 10.1
< 		$admtext['uninstall'] = "Удалить";    // was $admtext['remove'] = "Remove"
< 		$admtext['cleanup'] = "Очи�тить";  // previously used as $admtext['clean']
< 		$admtext['edopts'] = "Изменить параметры";  // previously used as $admtext['edit'] without Option text
< 		$admtext['ok2inst'] = "ОК дл� у�тановки";  // previously used $admtext['ready'] which is already translated
< 		$admtext['badversion'] = "не�оответ�твие вер�ии файла";
< 		$admtext['bomfound'] = "Спецификаци� удалена";
< 		$admtext['cantinst'] = "не удает�� у�тановить";
< 		$admtext['cantproc'] = "не удает�� удалить мод";
< 		$admtext['cantupd'] = "не удало�ь обновить параметр";
< 		$admtext['cleanupall'] = "Очи�тить в�ё";
< 		$admtext['copiesreq'] = "указанные копии файлов";
< 		$admtext['delete'] = "Удалить";
< 		$admtext['deleteall'] = "Удалить в�ё";
< 		$admtext['errors'] = "ошибки";
< 		$admtext['excused'] = "файлы о�вобождены";
< 		$admtext['filesinst'] = "у�тановленные файлы";
< 		$admtext['filesrem'] = "файлы удалены";
< 		$admtext['format'] = "ошибка форматировани�";
< 		$admtext['installall'] = "У�тановить";
< 		$admtext['installing'] = "У�тановка";
< 		$admtext['line'] = "Строка";
< 		$admtext['modified'] = "модифицировано";
< 		$admtext['modsinst'] = "у�тановленные модификации кода";
< 		$admtext['modrem'] = "мод удален";
< 		$admtext['modsrem'] = "изменени� кода удалены";
< 		$admtext['modsreq'] = "изменени� кода";
< 		$admtext['newfilesreq'] = "указаны новые файлы";
< 		$admtext['nfcreated'] = "новый файл �оздан";
< 		$admtext['noact'] = "неверный тег дей�тви�";
< 		$admtext['nocfgfile'] = "mod файл не найден";
< 		$admtext['nocomps'] = "от�ут�твующие �лементы";
< 		$admtext['noend'] = "%end:%  тег от�ут�твует";
< 		$admtext['nolocation'] = "от�ут�твует тег ме�тоположени�";
< 		$admtext['okay'] = "OK";
< 		$admtext['opened'] = "открытый";
< 		$admtext['optional'] = "необ�зательный";
< 		$admtext['partinst'] = "ча�тично у�тановлен";
< 		$admtext['removeall'] = "Удалить";    // was Remove Selected mods
< 		$admtext['removing'] = "Удаление";    // was Removing
< 		$admtext['reqtag'] = "требуемый тег от�ут�твует";
< 		$admtext['restparam'] = "Во��тановление параметра по умолчанию";
< 		$admtext['return'] = "Вернуть�� к менеджеру модов";
< 		$admtext['tagnoterm'] = "тег не завершен";
< 		$admtext['tagunk'] = "тег неизве�тен";
< 		$admtext['tgtfile'] = "целевой файл";
< 		$admtext['updated'] = "обновленный";
< 		$admtext['updparam'] = "Обновление параметра";
< 		$admtext['unxend'] = "неожиданный конец файла";
< 		$admtext['warnings'] = "Предупреждени�";
< 		$admtext['allowdeletepartial'] = "Разрешить удаление выбранных ча�тично у�тановленных модов";
< 		$admtext['allowdeleteinstalled'] = "Разрешить удаление индивидуально у�тановленных модов";
< 		$admtext['showwarnings'] = "Показывать предупреждени� модов в �тату�е";
< 		$admtext['logfullpath'] = "Журналировать полный путь к файлам дл� файловых операций";
< 		$admtext['deleting'] = "Удаление";
< 		$admtext['wiki'] = "Вики";
< 		$admtext['aflist'] = "Файлы";
< 		$admtext['hasoptions'] = "Опции";
< 		$admtext['restore'] = "Сбро� на�троек";
< 		$admtext['stayon'] = "Заблокировать";
< 		$admtext['accessible'] = "до�тупно";
< 		$admtext['bypassed'] = "пропущено";
< 		$admtext['willbypass'] = "будет проигнорировано";
< 		$admtext['cantdel'] = "не удает�� удалить";
< 		$admtext['optmissing'] = "файл от�ут�твует (необ�зательно)";
< 		$admtext['tgtmissing'] = "целевой файл от�ут�твует";
< 		$admtext['optlocked'] = "файл заблокирован (необ�зательно)";
< 		$admtext['tgtlocked'] = "файл заблокирован";
< 		$admtext['alreadyrem'] = "уже удалён";
< 		$admtext['noaccess'] = "нет до�тупа";
< 		$admtext['badinstall'] = "не удало�ь у�тановить";
< 		$admtext['removed'] = "удалён";
< 		$admtext['deleted'] = "удалённый";
< 		$admtext['optsrcfilemissing'] = "необ�зательный и�точник от�ут�твует";
< 		$admtext['srcfilemissing'] = "и�точник от�ут�твует";
< 		$admtext['optnocopy'] = "необ�зательный файл не �копирован";
< 		$admtext['notcopied'] = "не �копирован";
< 		$admtext['copied'] = "�копированный";
< 		$admtext['notcreated'] = "не удаёт�� �оздать новый файл";
< 		$admtext['optnotcreated'] = "не удаёт�� �оздать необ�зательный новый файл";
< 		$admtext['nocreated'] = "не �оздан";
< 		$admtext['fixedheader'] = "И�пользовать фик�ированные заголовки";
< 		$admtext['cantremok'] = "не удаёт�� удалить, необ�зательный, пропущен";
< 		$admtext['nofolder'] = "целева� папка от�ут�твует";
< 		$admtext['edparams'] = "изменить параметры";
< 		$admtext['compresslog'] = "Свернуть журнал";
< 		$admtext['formodname'] = "дл� имени мода";
< 		$admtext['nofolder'] = "целева� папка от�ут�твует";
< 		$admtext['fileperms'] = "Пожалуй�та, проверьте права до�тупа к файлам";
< 		$admtext['noparam'] = "от�ут�твует параметр";
< 		$admtext['editing'] = "редактирование";
< 		$admtext['redirect2log'] = "Перенаправление в журнал дл�";
< 		$admtext['on_error'] = "Только ошибки";
< 		$admtext['on_all'] = "В�е транзакции";
< 		$admtext['usestriping'] = "И�пользовать поло�ы";
< 		$admtext['stripeafter'] = "Поло�а по�ле чи�ла �трок";
< 		$admtext['adjusthdrs'] = "Отрегулировать фик�ированные заголовки";
< 		$admtext['displayoptions'] = "�а�тройки отображени�";
< 		$admtext['no_frag'] = "фрагмент кода зде�ь не разрешен";
< 		//added in 12.0.0
< 		$admtext['exists'] = "�уще�твует";
< 		$admtext['newdirsreq'] = "новые папки";
< 		$admtext['cantrem'] = "не удает�� удалить";
< 		$admtext['showanalyzer'] = "Показать вкладку �нализ файлов TNG";
< 		$admtext['showdeveloper'] = "Показать другие ин�трументы разработчика";
< 		$admtext['showupdates'] = "Показать вкладку Рекомендуемые обновлени�";
< 		$admtext['analyzefiles'] = "�нализ файлов TNG";
< 		$admtext['parsetable'] = "По�мотреть таблицу пар�ера";
< 		$admtext['recommendedfixes'] = "Рекомендуемые обновлени�";
< 		$admtext['selectmod'] = "Выберите файл конфигурации мод дл� про�мотра результатов таблицы пар�ера";
< 		$admtext['parsertags'] = "Ма��ив тегов пар�ера:";
< 		$admtext['parsererror'] = "Ошибка: ";
< 		$admtext['filesel'] = "Выберите файл TNG, чтобы увидеть, какой мод на него вли�ет";
< 		$admtext['custtextfixes'] = "В обновленных модел�х рекомендует��, чтобы пользователь�кий тек�т был в�тавлен перед комментари�ми в начале файла cust_text.php, чтобы моды не вли�ли на изменени� вручную пользовател�, �деланные по�ле �трок комментариев.";
< 		$admtext['updcusttext'] = "Обновить файлы cust_text.php";
< 		$admtext['confirmupdcusttext'] = "Вы дей�твительно хотите обновить файлы cust_text.php?";
< 		$admtext['compressnames'] = "Сжатие имен мод в �пи�ке мод";
< 		$admtext['verified'] = "проверен";
< 		$admtext['provisional'] = "(предварительный) должны быть до�тупны";
< 		$admtext['backtoprevious'] = "Вернуть�� на предыдущую �траницу";
< 		$admtext['reasontoupdate'] = "Е�ли вы не запу�каете �крипт cust_text_update.php как ча�ть обновлени� TNG v12, вам необходимо обновить файлы cust_text.php до <ul><li> добавить новую �троку в файлы и </li><li> также обновите у�таревшую �троку в �уще�твующих файлах cust_text.php </li></ul>, которые не будут заменены во врем� обновлений TNG.";
< 		$admtext['newanchor'] = "�ова� �трока комментариев не должна быть переведена в �зыковые файлы, чтобы ее можно было и�пользовать в каче�тве прив�зки дл� в�тавки пользователь�кого тек�та перед �той новой �трокой комментариев разработчиками модов.";
< 		$admtext['translateissue'] = "Е�ли вы переводите новую �троку комментариев, у�тановка мода завершит�� неудачно.";
< 		$admtext['privatemod'] = "Приватный мод";
< 		$admtext['protected'] = "защищенный файл удалить вручную";
< 		$admtext['restored'] = "во��тановлен";
< 		$admtext['confdelmod'] = "Вы дей�твительно хотите удалить �тот мод из �воей �и�темы? Отмена операции будет невозможна!";
< 		$admtext['allowdeletesupport'] = "Разрешить удаление папки поддержки при удалении мода";
< 		$admtext['delrisk'] = "Выбрав �тот параметр, пользователь принимает в�е ри�ки по удалению непредвиденных папок. Мы надеем��, что �тот ри�к очень мал.";
< 		$admtext['delpartinfo'] = "Вы должны у�тановить �тот параметр только в &#171;Да&#187;, е�ли вы забыли удалить предыдущие вер�ии мода перед у�тановкой новой вер�ии.";
< 		$admtext['delinstinfo'] = "Вы должны у�тановить �тот параметр только в &#171;Да&#187;, е�ли вы у�тановили новую вер�ию мода, и предыдуща� вер�и� в�е ещё отображает��.";
< 		$admtext['updateopts'] = "Ваш mmconfig.php необходимо обновить! Перейдите на вкладку &#171;Параметры&#187; выше и нажмите кнопку &#171;Сохранить&#187;.";
< 		$admtext['confdelmod1'] = "Вы дей�твительно хотите удалить �тот мод из �воей �и�темы? Вы не можете отменить �ту операцию!";
< 		$admtext['noeffect'] = "Предупреждение: ничего не мен�ет в TNG!";
< 		$admtext['cfgnowrite'] = "Внимание: Cfg-файл защищен от запи�и. Параметры не могут быть изменены.";
< 		break;
< 
< 	//added in 11.0.0
< 	case "dna":
< 		$admtext['confdeletedna'] = "Вы дей�твительно хотите удалить �тот те�т?";
< 		$admtext['test_type'] = "Тип те�та";
< 		$admtext['test_number'] = "�омер те�та";
< 		$admtext['test_date'] = "Дата те�та";
< 		$admtext['modifydna'] = "Изменить �уще�твующий те�т Д�К";
< 		$admtext['changestoalldna'] = "Изменени� ко в�ем те�там";
< 		$admtext['addnewdna'] = "Добавить новый те�т Д�К";
< 		$admtext['testinfo'] = "Информаци� о те�те";
< 		$admtext['urls'] = "Св�занные ��ылки";
< 		$admtext['dnalater'] = "Примечание. Больше информации может быть добавлено, и те�т можно �в�зать � другими людьми на �ледующем �кране.";
< 		$admtext['selecttype'] = "Выберите тип те�та.";
< 		$admtext['entertestnum'] = "Введите номер те�та.";
< 		$admtext['test_taker'] = "Человек, который прошел �тот те�т";
< 		$admtext['test_links'] = "Люди, �в�занные � �тим те�том";
< 		$admtext['changestotest'] = "Изменени� в те�те";
< 		//added in 12.0.0
< 		$admtext['dnalater'] = "Примечание. Те�т можно �в�зать � другими людьми на �ледующем �кране.";
< 		$admtext['markers'] = "Количе�тво маркеров";
< 		$admtext['test_values'] = "Те�товые значени�";
< 		$admtext['separate'] = "Раздел�ть значени� зап�тыми";
< 		$admtext['person_name'] = "Человека нет в базе данных";
< 		$admtext['privsection'] = "Приватное";
< 		$admtext['configsettings'] = "Общие на�тройки";
< 		$admtext['addtotestgroup'] = "Добавить те�т в группу";
< 		$admtext['dna_group'] = "Группа Д�К";
< 		$admtext['groupid'] = "ID группы";
< 		$admtext['addgroup'] = "Добавить группу";
< 		$admtext['entergroupid'] = "Введите идентификатор группы";
< 		$admtext['entergroupdesc'] = "Введите опи�ание группы";
< 		$admtext['confgroupdelete'] = "Вы дей�твительно хотите удалить �ту группу?";
< 		$admtext['modifygroup'] = "Изменить �уще�твующую группу";
< 		$admtext['mrcaiorf'] = "Е�ли необходимо, введите идентификатор лица или идентификатор �емьи";
< 		$admtext['test_results'] = "Результаты те�та";
< 		$admtext['mdaID'] = "ID �амого дальнего предка";
< 		$admtext['mrcaID'] = "Самый по�ледний ID общего предка";
< 		break;
< }
< 
< //common
< $admtext['cannotexecutequery'] = "Запро� не может быть выполнен";
< $admtext['addnew'] = "Добавить";
< $admtext['individuals'] = "Люди";
< $admtext['succadded'] = "у�пешно добавлено";
< $admtext['succaddedlinked'] = "у�пешно добавлено и при�оединено к";
< $admtext['succsaved'] = "у�пешно �охранено";
< $admtext['succdeleted'] = "у�пешно удалено";
< $admtext['succdeletedpluslinks'] = "у�пешно удалено, также, как и в�е ��ылки";
< $admtext['text_delete'] = "Удалить";
< $admtext['deleted'] = "Удалено";
< $admtext['deleteselected'] = "Удалить выбранное";
< $admtext['noresults'] = "�е найдено результатов. Попробуйте ещё раз.";
< $admtext['action'] = "Дей�твие";
< $admtext['id'] = "ID";
< $admtext['edit'] = "Изменить";
< $admtext['notes'] = "Заметки";
< $admtext['name'] = "�азвание";
< $admtext['description'] = "Опи�ание";
< $admtext['text_continue'] = "Продолжить...";
< $admtext['searchfor'] = "Пои�к";
< $admtext['lookin'] = "По�мотреть в (отметьте то, что вам нужно)";
< $admtext['cemeteryid'] = "ID кладбища";
< $admtext['exactmatch'] = "Точное �овпадение";
< $admtext['nothingtodelete'] = "�ичего не удал�ть";
< $admtext['state'] = "провинци�/го�удар�тво";
< $admtext['country'] = "�трана";
< $admtext['finish'] = "Закончить";
< $admtext['ifphotouploaded'] = "О�тавьте �то поле пу�тым, е�ли файлы уже наход�т�� в папке � фото.";
< $admtext['eventtype'] = "Тип �обыти�";
< $admtext['source'] = "И�точник";
< $admtext['savechanges'] = "Сохранить изменени�";
< $admtext['family'] = "Семь�";
< $admtext['find'] = "�айти...";
< $admtext['create'] = "Создать...";
< $admtext['sourceid'] = "ID и�точника";
< $admtext['birthabbr'] = "рожд.";
< $admtext['chrabbr'] = "крещ.";
< $admtext['remove'] = "Убрать";
< $admtext['moveup'] = "Переме�тить вверх";
< $admtext['movedown'] = "Переме�тить вниз";
< $admtext['enterpersonid'] = "Введите идентификационный номер человека";
< $admtext['personid'] = "ID человека";
< $admtext['otherevents'] = "Другие �обыти�";
< $admtext['required'] = "об�зательно";
< $admtext['children'] = "Дети";
< $admtext['chrdate'] = "Дата крещени�";
< $admtext['chrplace'] = "Ме�то крещени�";
< $admtext['deathdate'] = "Дата �мерти";
< $admtext['deathplace'] = "Ме�то �мерти";
< $admtext['burialdate'] = "Дата похорон";
< $admtext['burialplace'] = "Ме�то захоронени�";
< $admtext['birthdate'] = "Дата рождени�";
< $admtext['birthplace'] = "Ме�то рождени�";
< $admtext['title'] = "�азвание";
< $admtext['sex'] = "Пол";
< $admtext['marriagedate'] = "Дата �вадьбы";
< $admtext['marriageplace'] = "Ме�то �вадьбы";
< $admtext['lastname'] = "Фамили�";
< $admtext['firstname'] = "Им�";
< $admtext['filename'] = "�азвание файла";
< $admtext['linkspersonid'] = "С�ылки (ID человека)";
< $admtext['cannotopen'] = "Файл не может быть открыт";
< $admtext['check'] = "Проверить";
< $admtext['generate'] = "Создать";
< $admtext['update'] = "Обновить";
< $admtext['confdeleteevent'] = "Вы уверены, что хотите удалить �то �обытие?";
< $admtext['existinglinks'] = "Суще�твующий (е) линк(и)):<br>(отметить, чтобы удалить)";
< $admtext['lowersortfirst'] = "Сортировка прои�ходит �низу вверх. Де��тичные тоже могут быть и�пользованы..";
< $admtext['personsname'] = "ФИО человека";
< $admtext['tablecreation'] = "Создать таблицу";
< $admtext['tracklines'] = "Ра��читать потомков";
< $admtext['administration'] = "Страница �дмини�тратора";
< $admtext['text_or'] = "ИЛИ";
< $admtext['cemeteries'] = "Кладбища";
< $admtext['families'] = "Семьи";
< $admtext['headstones'] = "�адгроби�";
< $admtext['histories'] = "Жизненные и�тории";
< $admtext['people'] = "Люди";
< $admtext['photos'] = "Фотографии";
< $admtext['reports'] = "Отчёты";
< $admtext['sources'] = "И�точники";
< $admtext['suffix'] = "Суффик�";
< $admtext['add'] = "Добавить";
< $admtext['confdeleteentity'] = "Вы уверены, что хотите удалить выбранное?";
< $admtext['cemetery'] = "Кладбище";
< $admtext['language'] = "Язык";
< $admtext['display'] = "Отображать как";
< $admtext['languages'] = "Языки";
< $admtext['orderpound'] = "�омер по пор�дку";
< $admtext['tree'] = "Генеалогиче�кое древо";
< $admtext['alltrees'] = "В�е древе�а";
< $admtext['selectaddtree'] = "Генеалогиче�кое древо (выберите или добавьте)";
< $admtext['selecttree'] = "Выбрать / добавить генеалогиче�кое древо.";
< $admtext['treebefevent'] = "Вы должны выбрать генеалогиче�кое древо или вве�ти его прежде, чем �можете добавить новое �обытие.";
< $admtext['text_rename'] = "Изменить им�";
< $admtext['clear'] = "Очи�тить";
< $admtext['linktothis'] = "Прив�зать к �тому человеку";
< $admtext['linkexample'] = "(Введите идентификационный №, напр. &#171;I###&#187;)";
< $admtext['existingconfig'] = "Суще�твующа� конфигураци�";
< $admtext['lastmodified'] = "По�ледние изменени� были";
< $admtext['addnotes'] = "Дополнительные запи�и";
< $admtext['confdeletenote'] = "Вы уверены, что хотите удалить �ту запи�ь?";
< $admtext['treebefnote'] = "Вы должны выбрать генеалогиче�кое древо или вве�ти его прежде, чем �можете добавить новые запи�и.";
< $admtext['general'] = "Обшее";
< $admtext['entersearchvalue'] = "Введите �лово дл� пои�ка.";
< $admtext['trees'] = "Генеалогиче�кие древе�а";
< $admtext['users'] = "Пользователи";
< $admtext['lds'] = "СПД";
< $admtext['norights'] = "Вы не авторизованы и не можете про�мотреть �ту �траницу. Е�ли у ва� е�ть логин и пароль, войдите под �воим именем.";
< $admtext['username'] = "Им� пользовател�";
< $admtext['password'] = "Пароль";
< $admtext['login'] = "Войти";
< $admtext['logout'] = "Выйти";
< $admtext['city'] = "Город";  //from cemeteries
< $admtext['cap_country'] = "Страна";  //from cemeteries
< $admtext['addnewtree'] = "Добавить новое генеалогиче�кое древо";
< $admtext['test'] = "Те�т";
< $admtext['page'] = "Страница";  //from sources
< $admtext['folder'] = "Папка";   //from languages
< $admtext['confdeletepers'] = "Вы уверены, что хотите удалить �ту лицо?";
< $admtext['save'] = "Сохранить";
< $admtext['of'] = "из";
< $admtext['size'] = "Ведичина";
< $admtext['open'] = "Открыть";
< $admtext['selectfile'] = "Выбрать файл";
< $admtext['altdesc'] = "�льтернативное опи�ание";
< $admtext['altnotes'] = "�льтернативные запи�и";
< $admtext['savereturn'] = "Вернуть�� на �ту �траницу";
< $admtext['saveback'] = "Вернуть�� к меню";
< $admtext['user'] = "Пользователь";
< $admtext['DIV'] = "Разведен (а)";
< $admtext['search'] = "Пои�к";  //from findpersonform
< $admtext['searchresults'] = "Результаты пои�ка";  //from people
< $admtext['clicktoselect'] = "Кликните, чтобы выбрать";
< $admtext['familyid'] = "ID �емьи";  //from families
< $admtext['secondary'] = "Дополнительные дей�тви�";
< $admtext['commas'] = "�е�колько вариантов вводите, раздел�� зап�тыми";
< $admtext['onsave'] = "По�ле �охранени�";
< $admtext['adminhome'] = "Страница админи�тратора";
< $admtext['labelbranches'] = "Выделить ветви";
< $admtext['branch'] = "Ветвь";
< $admtext['findperson'] = "Пои�к человека...";
< $admtext['findfamily'] = "Пои�к �емьи...";
< $admtext['repeatlastq'] = "Повторить по�ледний пои�к";
< $admtext['alwayson'] = "В�егда до�тупно дл� про�мотра";
< $admtext['all'] = "В�е";
< $admtext['lnprefix'] = "Инфик�";
< $admtext['nameorder'] = "Пор�док напи�ани�";
< $admtext['western'] = "Сначала им�";
< $admtext['lockid'] = "Блокировать";
< $admtext['linktothese'] = "При�оединить к:";
< $admtext['alsolinkto'] = "Также при�оединить к:";
< $admtext['linkspersfam'] = "С�ылки (ID человека, Семьи или И�точника)";
< $admtext['findsource'] = "�айти и�точник...";
< $admtext['address'] = "�дре�";
< $admtext['stateprov'] = "Штат / Провинци�";
< $admtext['zip'] = "Почтовый индек�";
< $admtext['merge'] = "Объединить";
< $admtext['otherinfo'] = "Друга� информаци�";
< $admtext['available'] = "До�тупно";
< $admtext['backuprestore'] = "Утилиты";
< $admtext['place'] = "Ме�то";
< $admtext['treeid'] = "ID генеалогиче�кого древа";
< $admtext['email'] = "E-mail";
< $admtext['event'] = "Событи�";
< $admtext['eventdate'] = "Дата �обыти�";
< $admtext['eventplace'] = "Ме�то �обыти�";
< $admtext['detail'] = "Детали";
< $admtext['export'] = "Эк�портировать";
< $admtext['tlevents'] = "Хронологи�";
< $admtext['places'] = "Ме�та";
< $admtext['duplicate'] = "Изменени� не �охранены. Запи�ь � таким ключом уже �уще�твует.";
< $admtext['alttitle'] = "�льтернативный заголовок";
< $admtext['enttitle'] = "Заголовок";  //title for a history or photo, not a person
< $admtext['address1'] = "�дре� 1";
< $admtext['address2'] = "�дре� 2";
< $admtext['countryaddr'] = "Страна";
< $admtext['branches'] = "Ветви";
< $admtext['nobranch'] = "�ет ветви";
< $admtext['scrollbranch'] = "(Прокрутить, чтобы увидеть в�е возможно�ти)";
< $admtext['matches'] = "Совпадени�";
< $admtext['review'] = "Обзор*";
< $admtext['allusers'] = "В�е пользователи";
< $admtext['deathabbr'] = "умер.";
< $admtext['burialabbr'] = "похорон.";
< $admtext['nochanges'] = "�е произведено изменений.";
< $admtext['changestoallitems'] = "Изменени� во в�ех топиках";  //were made successfully
< $admtext['find2'] = "�айти";
< $admtext['text_sort'] = "Сортировать";
< $admtext['documents'] = "Документы";
< $admtext['repository'] = "�рхив";
< $admtext['more'] = "Больше информации";
< $admtext['repositories'] = "�рхивы";
< $admtext['divplace'] = "Ме�то развода";
< $admtext['divdate'] = "Дата развода";
< $admtext['divdatetr'] = "Дата развода (на�то�ща�)";
< $admtext['creategendex'] = "Создать файл  GENDEX";
< $admtext['datamaint'] = "Импорт/�к�порт";
< $admtext['imagefiletoupload'] = "Файл дл� загрузки";
< $admtext['indfamorsrc'] = "Люди, �емьи, и�точники, ме�тонахождени� или ме�та";
< $admtext['improperpermissions'] = "по�кольку папка не �уще�твует (проверьте корневой путь) или не имеет �оответ�твующих разрешений (попробуйте chmod(777)).";
< $admtext['person'] = "Человек";
< $admtext['setup'] = "�а�тройки";
< $admtext['manage'] = "Поддерживать";
< $admtext['reset'] = "Сбро�";
< $admtext['norecords'] = "Запи�и не �уще�твуют.";
< $admtext['secondarymaint'] = "Дополнительные дей�тви�";
< $admtext['customeventtypes'] = "�а�траиваемые типы �обытий";
< $admtext['findmatches'] = "Пои�к �овпадений";
< $admtext['matchthese'] = "Сравнить �о �ледующими пол�ми:";
< $admtext['otheroptions'] = "Другие опции:";
< $admtext['ignoreblanks'] = "Игнорировать пробелы";
< $admtext['nextmatch'] = "Следующее �овпадение";
< $admtext['nextdup'] = "Следующий дубликат";
< $admtext['comprefresh'] = "Сравнить/Обновить";
< $admtext['mswitch'] = "Заменить";
< $admtext['nomatches'] = "Совпадений не найдено.";
< $admtext['combineextras'] = "Объединить медиафайлы, жизненные и�тории и т.п.";  //changed as well
< $admtext['fasterdisplay'] = "NB: Эта �траница будет отображать�� в другом формате, чтобы бы�трей произве�ти обработку.";
< $admtext['publichome'] = "Страница пользовател�";
< $admtext['media'] = "Медиафайлы";
< $admtext['albums'] = "�льбомы";
< $admtext['import'] = "Импорт";
< $admtext['item'] = "Топик";
< $admtext['combinenotesonly'] = "Объединить заметки";
< $admtext['addmedia'] = "Добавить медиа";
< $admtext['latitude'] = "Широта";
< $admtext['longitude'] = "Долгота";
< $admtext['gedimport'] = "Импорт файла GEDCOM";
< $admtext['improper2'] = "из-за того, что первоначальный файл �лишком большой или имеет неверный формат, или потому что така� папка не �уще�твует (проверьте корневой путь), или не обладает нужными правами до�тупа (попробуйте chmod(777)).";
< $admtext['confdeleterecs'] = "Вы уверены, что хотите удалить выбранные запи�и?";
< //For Google maps use - admin pages
< $admtext['googleplace'] = "Геокодирование ме�тоположени�";
< $admtext['notfound'] = " не найден. Повторите пои�к. Обратите�ь к �правке по пои�ку на карте дл� вы�влени� возможных причин неудачного пои�ка, или проведите �амо�то�тельный пои�к, и�пользу� ��ылку на Google Map Search";
< $admtext['showhidemap'] = "Показать / �крыть интерактивные карты";
< $admtext['getcoords'] = "(определить широту, долготу и ма�штаб)";
< $admtext['searchstring'] = "Пои�к ме�та";
< $admtext['zoom'] = "Увеличение/Уменьшение";
< $admtext['selectplacelevel'] = "Выберите уровень ме�та";
< $admtext['difficultmap'] = "Пои�к в картах Google";
< $admtext['maphelp'] = "Справка по пои�ку на карте";
< $admtext['gobutton'] = "Пои�к";
< $admtext['findpersonid'] = "�айти ID человека";
< $admtext['findfamilyid'] = "�айти ID �емьи";
< $admtext['findsourceid'] = "�айти ID и�точника";
< $admtext['entersourcepart'] = "Введите ча�ть названи�";
< $admtext['findrepoid'] = "�айти ID архива";
< $admtext['enterrepopart'] = "Введите ча�ть названи� архива";
< $admtext['findplace'] = "�айти ме�то";
< $admtext['enterplacepart'] = "Введите ча�ть названи� ме�та";
< $admtext['entereventinfo'] = "Вне�ти дату �обыти�, ме�то �обыти� или подробно�ти об �том �обытии.";
< $admtext['entereventtype'] = "Выбрать тип �обыти�.";
< $admtext['enternote'] = "Введите тек�т запи�и.";
< $admtext['selectsource'] = "Выбрать и�точник.";
< $admtext['confdeletecite'] = "Вы уверены, что хотите удалить �ту цитату?";
< $admtext['spouses'] = "Супруги";
< $admtext['entertreeid'] = "Введите идентификационный номер генеалогиче�кого древа.";
< $admtext['entertreename'] = "Введите название генеалогиче�кого древа.";
< $admtext['citations'] = "Цитаты";
< $admtext['eventtypes'] = "Типы �обытий";
< $admtext['associations'] = "Св�зи";
< $admtext['makefolder'] = "Создать папку";
< $admtext['allcurrentdata'] = "В�е �уще�твующие данные";
< $admtext['matchingonly'] = "Только �овпадающие запи�и";
< $admtext['donotreplace'] = "�е замен�ть данные";
< $admtext['useroffset'] = "начинать идентификационные номера �:";
< $admtext['phone'] = "Телефон";
< $admtext['website'] = "Веб-�айт";
< $admtext['thumb'] = "Миниатюра";  //as in thumbnail
< $admtext['displayorder'] = "Пор�док отображени�";
< $admtext['go'] = "OK";
< $admtext['help'] = "Помощь";
< $admtext['husband'] = "Супруг";
< $admtext['wife'] = "Супруга";
< $admtext['husbname'] = "Им� �упруга";
< $admtext['wifename'] = "Им� �упруги";
< $admtext['drag'] = "Перетащить";
< $admtext['enterinamepart'] = "введите ча�ть фамилии и/или имени";
< $admtext['enterfnamepart'] = "Введите ча�ть фамилии отца и/или матери";
< $admtext['hide'] = "Скрыть";
< $admtext['toggle'] = "показать";
< $admtext['wsel'] = "С выбранными:";
< $admtext['msg'] = "Сообщение";
< $admtext['default'] = "По умолчанию";
< $admtext['events'] = "Событи�";
< $admtext['date'] = "Дата";
< $admtext['savecont'] = "Сохранить и продолжить...";
< $admtext['alphanum'] = "Пожалуй�та, и�пользуйте только буквы и цифры в ID генеалогиче�кого древа.";
< $admtext['mediatypes'] = "Типы медиафайлов";
< $admtext['appendall'] = "Добавить в�е запи�и";
< $admtext['NPFX'] = "Префик�";
< $admtext['prefix'] = "Префик�";
< $admtext['mostwanted'] = "Розы�к";
< $admtext['idexists'] = "не может быть добавлено, потому что �тот идентификационный номер уже �уще�твует. Во�пользуйте�ь кнопкой Возврат вашего браузера, чтобы вернуть�� на предыдущую �траницу и выберите другой идентификационный номер.";
< $admtext['notdeleted'] = "Файл не может быть удален. Пожалуй�та, проверьте права до�тупа к файлам.";
< $admtext['confdeletefile'] = "Вы уверены, что хотите удалить �тот файл?";
< //changed in 8.0.0
< $admtext['datenote'] = "<strong>Примечание:</strong> Вводите, пожалуй�та, даты в формате ДД.MM.ГГГГ (напр. 22.01.1980).";
< $admtext['oriental'] = "Сначала фамили� (без зап�тых)";
< $admtext['langfolder'] = "Папка, где будут хранить��<br>файлы � �зыками";
< //moved here in 8.0.0
< $admtext['repoid'] = "ID архива";
< $admtext['whatsnew'] = "Что нового";
< $admtext['linkedto'] = "Св�занный �";
< $admtext['status'] = "Стату�";
< //added in 8.0.0
< $admtext['show'] = "Показать";
< $admtext['lnfirst'] = "Сначала фамили� (через зап�тую)";
< $admtext['savefirst'] = "Сначала �охранить изменени�?";
< $admtext['misc'] = "Разное";
< $admtext['modmgr'] = "Менеджер модов";
< $admtext['cannotopendir'] = "�е могу открыть папку";
< $admtext['reviewsh'] = "Оценить"; //short version
< //moved here in 9.0.0
< $admtext['cancel'] = "Отменить";
< $admtext['enterpassoc'] = "Введите, пожалуй�та, идентификационный номер человека �той �в�зи.";
< $admtext['enterrela'] = "Опишите, пожалуй�та, характер �той �в�зи.";
< $admtext['confdeleteassoc'] = "Вы уверены, что хотите удалить �ту �в�зь?";
< $admtext['preview'] = "Показать";
< $admtext['livingonly'] = "Живые";
< $admtext['tentdata'] = "Временна� запи�ь о �обытии";
< $admtext['checking'] = "Провер�ет��... Подождите немного !";
< //added in 9.0.0
< $admtext['clickresume'] = "нажмите зде�ь, чтобы продолжить";
< $admtext['copylast'] = "Копировать по�ледний";
< $admtext['nicbold'] = "�ажмите, чтобы �делать жирным";
< $admtext['nicitalic'] = "�ажмите, чтобы �делать кур�ивом";
< $admtext['nicunderline'] = "�ажмите, чтобы �делать подчёркнутым";
< $admtext['niclalign'] = "Выровн�ть по левому краю";
< $admtext['niccalign'] = "Выровн�ть по центру";
< $admtext['nicralign'] = "Выровн�ть по правому краю";
< $admtext['nicjalign'] = "Выровн�ть по ширине";
< $admtext['nicinsol'] = "В�тавить упор�доченный �пи�ок";
< $admtext['nicinsul'] = "В�тавить неупор�доченный �пи�ок";
< $admtext['nicsub'] = "�ажмите, чтобы �делать под�трочным";
< $admtext['nicsup'] = "�ажмите, чтобы �делать над�трочным";
< $admtext['nicstrike'] = "�ажмите, чтобы �делать зачёркнутым";
< $admtext['nicremfmt'] = "Удалить форматирование";
< $admtext['nicindent'] = "Тек�т от�тупа";
< $admtext['nicremind'] = "Удалить от�туп";
< $admtext['nichr'] = "Горизонтальное линейка";
< $admtext['nicfontsz'] = "Шрифт&nbsp;Размер";
< $admtext['nicfontfam'] = "Шрифт&nbsp;Семей�тво";
< $admtext['nicfontfmt'] = "Шрифт&nbsp;Формат";
< $admtext['niclink'] = "Добавить ��ылку";
< $admtext['nicremlink'] = "Удалить ��ылку";
< $admtext['nictxtcol'] = "Изменить цвет тек�та";
< $admtext['nicbkgcol'] = "Изменить цвет фона";
< $admtext['nicimage'] = "Добавить изображение";
< $admtext['change'] = "Изменить";
< $admtext['editwarn'] = "Ваша блокировка �той запи�и близка к и�течению �рока дей�тви�. Сохраните изменени�, чтобы предотвратить изменени� другими пользовател�ми.";
< $admtext['editconflict'] = "Другой пользователь уже редактирует �ту запи�ь. Пожалуй�та, повторите попытку позже.";
< $admtext['retry'] = "Попробуйте ещё раз";
< $admtext['notsaved'] = "Изменени� не были �охранены. Другой пользователь заблокировал запи�ь.";
< //changed in 9.2.0
< $admtext['linktype'] = "Тип";
< //moved here in 10.0.0
< $admtext['disabled'] = "Отключено";
< $admtext['cremated'] = "Кремирован";
< //added in 10.0.0
< $admtext['videos'] = "Видео";
< $admtext['recordings'] = "Запи�и";
< $admtext['saveexit'] = "Сохранить и выйти";
< //moved here in 11.0.0
< $admtext['nickname'] = "Прозвище";
< $admtext['role'] = "Роль";
< $admtext['commas'] = "Разделите не�колько запи�ей зап�тыми";
< $admtext['confdellink'] = "Вы дей�твительно хотите удалить �ту ��ылку?";
< $admtext['existlinks'] = "Суще�твующие ��ылки";
< $admtext['report'] = "Отчёт";
< //added in 11.0.0
< $admtext['sortby'] = "Сортировать по";
< $admtext['unlink'] = "Разъединить";
< $admtext['privateonly'] = "Приватно";
< $admtext['dna_links'] = "С�ылки на Д�К";
< $admtext['dataval'] = "Проверка правильно�ти данных";
< $admtext['norels'] = "Отключить �ообщени� о взаимо�в�з�х";
< //added in 12.0.0
< $admtext['templates'] = "Шаблоны";
< $admtext['findciteid'] = "�айти идентификатор цитаты";
< //moved here in 12.0.0
< $admtext['citation'] = "Цитата";
< $admtext['text_and'] = "И";
< 
< //change to $text
< $admtext['living'] = "Живой";
< 
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> <?php
> switch ( $textpart ) {
> 	//branches.php, branchmenu.php
> 	case "branches":
> 		$admtext['branchlabel'] = "�азвание ветви";
> 		$admtext['existingbranch'] = "Суще�твующа� ветвь";
> 		$admtext['newbranch'] = "�ова� ветвь";
> 		$admtext['numgenerations'] = "Количе�тво поколений";
> 		$admtext['ancestors'] = "Предки";
> 		$admtext['descofanc'] = "Потомки каждого предка";
> 		$admtext['descendants'] = "Потомки";
> 		$admtext['includespouses'] = "Включить �упругов потомков";
> 		$admtext['partial'] = "Ча�тично";
> 		$admtext['addlabels'] = "Добавить ��ылки на ветвь";
> 		$admtext['clearlabels'] = "Удалить ��ылки на ветвь";
> 		$admtext['clearingbranch'] = "Удаление ��ылок на ветвь...";
> 		$admtext['addingbranch'] = "Добавление ��ылок на ветвь...";
> 		$admtext['totalaffected'] = "Полно�тью изменено";
> 		$admtext['labelmore'] = "Св�зать больше ветвей";
> 		$admtext['enterbranch'] = "Выберите �уще�твующую ветвь или добавьте новую.";
> 		$admtext['enterstartingind'] = "Выберите ID первого человека.";
> 		$admtext['gensnumeric'] = "Количе�тво предков и потомков должно быть вне�ено чи�лами.";
> 		$admtext['overwrite'] = "Перепи�ать";
> 		$admtext['branchid'] = "ID ветви";
> 		$admtext['addnewbranch'] = "Добавить новую ветвь";
> 		$admtext['createbranch'] = "Сделать запи�ь дл� новой ветви";
> 		$admtext['existingbranchinfo'] = "Информаци� о �уще�твующей ветви";
> 		$admtext['editexistingbranch'] = "Изменить информацию о ранее добавленной ветви";
> 		$admtext['confbranchdelete'] = "Вы уверены, что хотите удалить �ту ветвь?";
> 		$admtext['enterbranchid'] = "Введите, пожалуй�та, номер ветви.";
> 		$admtext['entertreedesc'] = "Введите, пожалуй�та, опи�ание ветви.";
> 		$admtext['newbranchinfo'] = "Информаци� об �той новой ветви";
> 		$admtext['modifybranch'] = "Изменить �уще�твующую ветвь";
> 		$admtext['changestobranch'] = "Изменени� �той ветви";
> 		$admtext['existlabels'] = "Суще�твующие ��ылки";
> 		$admtext['leave'] = "�е измен�ть";
> 		$admtext['append'] = "Добавить новую";
> 		$admtext['showpeople'] = "Показать людей �той ветви";
> 		$admtext['branchdiscl'] = "Это чи�ло отражает количе�тво ��ылок на ветвь, но оно не об�зательно должно равн�ть�� количе�тву людей или �емей, которые в данный момент �в�заны � �той ветвью. Е�ли Вы недавно �нова импортировали ваши данные, может быть необходимо оп�ть при�воить �рлыки ветв�м.";
> 		$admtext['inclspouses'] = "Включать �упругов дл� в�ех потомков";
> 		$admtext['delpeople'] = "Удалить людей и �емьи �той ветви";
> 		$admtext['confbrdel'] = "Вы дей�твительно хотите удалить людей и �емьи �той ветви?";
> 		break;
> 		
> 	//addcemetery.php, updatecemetery.php, findcemetery.php, cemeteries.php, editcemetery.php, newcemetery.php
> 	case "cemeteries":
> 		$admtext['mapnotcopied'] = "Файл карты не может быть �копирован в";
> 		$admtext['changestocem'] = "Изменени� в кладбищах";
> 		$admtext['modifycemetery'] = "Изменить �уще�твующие кладбища";
> 		$admtext['addnewcemetery'] = "Добавить новое кладбище";
> 		$admtext['createnewcemetery'] = "Сделайте запи�ь дл� нового кладбища";
> 		$admtext['selectcemaction'] = "Выберите кладбище и дей�твие";
> 		$admtext['location'] = "Ме�то";
> 		$admtext['confdeletecem'] = "Вы уверены, что хотите удалить �то кладбище?";
> 		$admtext['editceminfo'] = "Изменить информацию об уже добавленном кладбище";
> 		$admtext['leaveblankallcems'] = "О�тавить незаполненным, чтобы показать в�е кладбища";
> 		$admtext['cemeteryname'] = "�азвание кладбища";
> 		$admtext['mapfilename'] = "�азвание файла � картой";
> 		$admtext['countyparish'] = "Район/Обла�ть";
> 		$admtext['stateprovince'] = "Провинци�/Го�удар�тво";
> 		$admtext['entercountry'] = "Введите название �траны.";
> 		$admtext['entermapfile'] = "Введите название файла Вашего файла � картой на веб-�ервер.";
> 		$admtext['existingceminfo'] = "Информаци� о �уще�твующем кладбище";
> 		$admtext['newceminfo'] = "Информаци� о новом кладбище";
> 		$admtext['maptoupload'] = "Загрузить изображение карты";
> 		$admtext['mapfilenamefolder'] = "�азвание файла � картой<br/>в папке надгробий";
> 		$admtext['ifmapuploaded'] = "О�тавить �то поле пу�тым, е�ли �тот файл уже е�ть в папке надгробий.";
> 		$admtext['requiredmap'] = "Об�зательно к заполнению, е�ли Вы и�пользуете карту. Содержимое пол� должно �овпадать � названием и ме�том Вашего файла в папке надгробий  по�ле того, как файл загружен. �апример, е�ли Ваша папка надгробий называет�� <em>&#171;�адгроби�&#187;</em>,  и Вы хотите Ваш файл назвать <em>&#171;Карта.jpg&#187;</em> и поме�тить в подкаталог, названный <em>&#171;Мои карты&#187;</em>, тогда Вы должны запи�ать �то так: <em>&#171;Мои карты/Карта.jpg&#187;</em> в �том поле.";
> 		//added in 8.0.0
> 		$admtext['linkplace'] = "Св�занное ме�то";
> 		$admtext['fillplace'] = "Заполнить ме�то";
> 		$admtext['usecemcoords'] = "Скопировать информацию о геокодировании ниже в �то ме�то";
> 		break;
> 	
> 	//addentity.php, newentity.php
> 	case "entities":
> 		$admtext['alreadyexists'] = "уже �уще�твует";
> 		$admtext['added'] = "Добавлено";
> 		$admtext['enternew'] = "Добавьте новую, пожалуй�та";
> 		$admtext['netscapereload'] = "Пользовател�м Netscape: <br>Вы должны заново загрузить �траницу � ме�том захоронени�, чтобы увидеть новые";
> 		break;
> 		
> 	//addnote.php, deletenote.php, updatenote.php, newnote.php
> 	case "notes":
> 		$admtext['deletingnote'] = "Заметка удал�ет��...";
> 		$admtext['addingnote'] = "Заметка добавл�ет��...";
> 		$admtext['addnewnote'] = "Добавить новую заметку";
> 		$admtext['note'] = "Заметка";
> 		$admtext['modifynote'] = "Изменить заметку";
> 		//added in 8.0.0
> 		$admtext['notechanges'] = "Изменени� в заметке";
> 		break;
> 
> 	//addevent.php, deleteevent.php, updateevent.php, editevent.php, newevent.php
> 	case "events":
> 		$admtext['addingevent'] = "Событие добавл�ет��...";
> 		$admtext['deletingevent'] = "Событие удал�ет��...";
> 		$admtext['updatingevent'] = "Событие обрабатывает��...";
> 		$admtext['modifyevent'] = "Изменить �обытие";
> 		$admtext['addnewevent'] = "Добавить новое �обытие";
> 
> 		$admtext['dateformat'] = "(ДД ММ ГГГГ)";
> 		$admtext['age'] = "Возра�т";
> 		$admtext['agency'] = "Учреждение";
> 		$admtext['cause'] = "Причина";
> 		$admtext['moreinfo'] = "Дополнительна� информаци�";
> 		//added in 11.0.0
> 		$admtext['dupfor'] = "Дубликат дл�";
> 		break;
> 
> 	//gedimport.php
> 	case "gedimport":
> 		$admtext['importinggedcom'] = "Импортирует�� GEDCOM...<br>(�то может зан�ть не�колько минут)";
> 		$admtext['ifimportfails'] = "Е�ли импорт прервет��,";
> 		$admtext['opened'] = "открыто...";
> 		$admtext['toresume'] = "чтобы возобновить импорт";  //cannot open to resume import
> 		$admtext['openedtoresume'] = "открыто, чтобы возобновить импорт...";
> 		$admtext['notresumed'] = "�евозможно возобновить импорт.";
> 		$admtext['finishedimporting'] = "GEDCOM импортирован";
> 		$admtext['treeexists'] = "Генеалогиче�кое древо � выбранным идентификационным номером уже �уще�твует. Выберите другой номер и попробуйте �нова.";
> 		$admtext['backtodataimport'] = "�азад к импорту �ведений";
> 		$admtext['moreoptions'] = "Больше опций";
> 		$admtext['removeged'] = "Удалить GEDCOM файл (опци�)";
> 		$admtext['cannotupload'] = "�е удало�ь загрузить файл:";
> 		$admtext['invfperms'] = "У Вашей папки &#171;gedcom&#187; могут быть не�оответ�твующие разрешени� (попробуйте 755 или 777).";
> 		$admtext['maybedone'] = "Это, возможно, уже закончило�ь.";
> 		$admtext['turnonsis'] = "Убедите�ь, что &#171;Сохранить �о�то�ние импорта&#187; включено в на�тройках импорта.";
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Выберите файл, который Вы хотите импортировать.";
> 		$admtext['addreplacedata'] = "Добавление или замена Ваших генеалогииче�ких данных (может зан�ть не�колько минут, в зави�имо�ти от размера файла).";
> 		$admtext['fromyourcomputer'] = "Из Вашего компьютера";
> 		$admtext['importdata'] = "Импортировать данные";
> 		$admtext['replace'] = "Заменить (в выбранном генеалогиче�ком древе)";
> 		$admtext['desttree'] = "Древо назначени�";
> 		$admtext['selectdesttree'] = "Выбрать или вве�ти название необходимого генеалогиче�кого древа.";
> 		$admtext['selectexisting'] = "Импортировать в";
> 		$admtext['ucaselast'] = "В�е фамилии ПРОПИС�ЫМИ буквами";
> 		$admtext['norecalc'] = "�е пере�читывать флаг &#171;Жив&#187;";
> 		$admtext['autooffset'] = "�ачинать идентификационные номера � первого до�тупного номера";
> 		$admtext['mustselecttree'] = "дл� �той опции Вы должны выбрать генеалогиче�кое древо.";
> 		$admtext['onwebserver'] = "� веб-�айта (из папке GEDCOM)";
> 		$admtext['imphints'] = "Под�казка: В�е �уще�твующие данные означает: в�е люди, �емьи, и�точники и запи�и (�в�зи медиа не удал�ют��, пока �охран�ет�� тот же идентификационный номер). Точные �оответ�тви� определ�ют�� только по идентификационному номеру. �овые запи�и в�егда добавл�ют��. При добавлении импортируют�� в�е �ведени� � новыми идентификационными номерами";
> 		$admtext['destbranch'] = "По назначению (опци�)";
> 		$admtext['importlatlong'] = "Импорт данных широты/долготы, е�ли при�ут�твуют";
> 		$admtext['opening'] = "Открытие";
> 		$admtext['reopen'] = "Открыть �нова";
> 		$admtext['uploading'] = "Загрузка";
> 		$admtext['stop'] = "Стоп";
> 		$admtext['stopped'] = "Импорт о�тановлен";
> 		$admtext['resume'] = "Возобновить";
> 		$admtext['neweronly'] = "Замен�ть только более новыми";
> 		$admtext['oldimport'] = "Импорт в �таром �тиле (без индикатора выполнени�)";
> 		$admtext['importgedcom'] = "Импортировать файл GEDCOM (может быть файлом архива)";
> 		$admtext['stopbackup'] = "О�тановите�ь! Прежде, чем продолжить, правильнее было бы �делать резервную копию.";
> 		$admtext['importmedia'] = "Импортировать медиафайлы, е�ли при�ут�твуют";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Убедите�ь, что префик�ы и �уффик�ы (Общие на�тройки) указаны правильно дл� �того файла.";
> 		$admtext['chkimpsettings'] = "Проверьте на�тройки импорта дл� получени� дополнительных параметров.";
> 		$admtext['eventsonly'] = "Импортируйте только пользователь�кие типы �обытий и атрибуты (данные не добавл�ют��, не замен�ют�� и не дополн�ют��)";
> 		$admtext['allevents'] = "Принимать данные дл� в�ех новых типов �обытий и атрибутов";
> 		$admtext['finishingimporting'] = "Завершение...";
> 		$admtext['fileuploadfailed'] = "�е удало�ь загрузить файл. Это может означать, что файл �лишком велик. Попробуйте и�пользовать FTP дл� загрузки файла в вашу папку GEDCOM, затем выберите и импортируйте оттуда.";
> 		//no break here is intentional to allow import scripts to have access to eventtypes messages
> 
> 	//addeventtype.php, updateeventtype.php, eventtypes.php, neweventtype.php, editeventtype.php
> 	case "eventtypes":
> 		$admtext['changestoevtype'] = "Изменени� в типе �обыти�";
> 		$admtext['individual'] = "Человек";
> 		$admtext['tag'] = "Метка";
> 		$admtext['typedescription'] = "Тип/Опи�ание";
> 		$admtext['onimport'] = "При импортировании";
> 		$admtext['accept'] = "Прин�ть";
> 		$admtext['ignore'] = "Отменить";
> 		$admtext['typerequired'] = "Е�ли выбрана метка &#171;EVEN&#187;, то поле �вл�ет�� об�зательным, а дл� о�тальных меток не об�зательно.";
> 		$admtext['forindividuals'] = "Дл� людей...";
> 		$admtext['forfamilies'] = "Дл� �емей...";
> 		$admtext['indfam'] = "Семь�";  //individual family
> 		$admtext['selecttag'] = "Выбрать метку";
> 		$admtext['orenter'] = "или вве�ти новую";
> 		$admtext['ifbothdata'] = "Е�ли оба пол� �одержат данные, будет и�пользована метка в �том поле.";
> 		$admtext['EVEN'] = "Событие";
> 		$admtext['ADOP'] = "У�ыновление";
> 		$admtext['ADDR'] = "�дре�";
> 		$admtext['ALIA'] = "Также изве�тен как";
> 		$admtext['BARM'] = "Бар-мицва";
> 		$admtext['BASM'] = "Ба�-мицва";
> 		$admtext['CAST'] = "Ка�та / Социальный �тату�";
> 		$admtext['CENS'] = "Перепи�ь на�елени�";
> 		$admtext['CHRA'] = "Крещение взро�лых";
> 		$admtext['CONF'] = "Конфирмаци�";
> 		$admtext['CREM'] = "Кремаци�";
> 		$admtext['DSCR'] = "Опи�ание внешно�ти";
> 		$admtext['EDUC'] = "Образование";
> 		$admtext['EMIG'] = "Эмиграци�";
> 		$admtext['FCOM'] = "Первое прича�тие";
> 		$admtext['GRAD'] = "Диплом / Степень";
> 		$admtext['IDNO'] = "Идентификационный номер";
> 		$admtext['IMMI'] = "Эмиграци�";
> 		$admtext['LANG'] = "Язык";
> 		$admtext['NATI'] = "�ационально�ть";
> 		$admtext['NATU'] = "�атурализаци�";
> 		$admtext['NCHI'] = "Количе�ктво детей";
> 		$admtext['NMR'] = "Количе�тво браков";
> 		$admtext['OCCU'] = "Профе��и�";
> 		$admtext['ORDI'] = "По�тановление";
> 		$admtext['ORDN'] = "По�триг";
> 		$admtext['PHON'] = "Телефон";
> 		$admtext['PROB'] = "Реги�траци�";
> 		$admtext['PROP'] = "Имуще�тво";
> 		$admtext['RELI'] = "Религи�";
> 		$admtext['RESI'] = "Ме�то пребывани�";
> 		$admtext['RESN'] = "Ограничение";
> 		$admtext['RETI'] = "�а пен�ии";
> 		$admtext['RFN'] = "По�то�нный реги�трационный номер";
> 		$admtext['SSN'] = "�омер SOFI";
> 		$admtext['WILL'] = "Завещание";
> 		$admtext['ANUL'] = "Уничтожение";
> 		$admtext['DIVF'] = "Зареги�трированный развод";
> 		$admtext['ENGA'] = "Обручение";
> 		$admtext['MARB'] = "Объ�вление о пред�то�щем браке";
> 		$admtext['MARC'] = "Брачный контракт";
> 		$admtext['MARL'] = "Согла�ие на брак";
> 		$admtext['MARS'] = "У�лови� дл� заключени� брака";
> 		$admtext['forsources'] = "И�точники...";
> 		$admtext['RIN'] = "�омер запи�и";
> 		$admtext['REFN'] = "�омер рекомендаций";
> 		$admtext['REPO'] = "Ме�то находки";
> 
> 		$admtext['deleteselected'] = "Удалить выбранное";
> 		$admtext['ignoreselected'] = "Отменить выбор";
> 		$admtext['acceptselected'] = "Сохранить выбранное";
> 		$admtext['forrepos'] = "Дл� ме�т находки...";
> 		$admtext['noevtypes'] = "�е�уще�твующий тип �обытий.";
> 		$admtext['DESI'] = "Потомки-интере�ы";
> 		$admtext['allnone'] = "Введите отображаемое �ообщение дл� каждого �зыка,<br />или о�тавьте в�е пу�тым и введите одно отображаемое �ообщение выше.";
> 		$admtext['assocwith'] = "Св�зано �";
> 		$admtext['umps'] = "Возможно, что Ваш GEDCOM-файл больше, чем позвол�ет Ваши параметры PHP. Попро�ите Вашего провайдера увеличить параметр &#171;upload_max_filesize&#187;, или �копируйте GEDCOM-файл в папку &#171;gedcom&#187; на Вашем �айте и импортируйте файл оттуда.";
> 		$admtext['othlangs'] = "Другие �зыки";
> 		$admtext['evdata'] = "Данные �обыти�";
> 		$admtext['ANCI'] = "Предок-интере�ы";
> 		//added in 10.0.0
> 		$admtext['collapseev'] = "Свернуть �обытие";
> 		$admtext['collapse'] = "Свернуть";
> 		$admtext['collapseselected'] = "Свернуть выбранные";
> 		//added in 11.0.0
> 		$admtext['expselected'] = "Развернуть выбранные";
> 		//added in 12.0.0
> 		$admtext['ldsevent'] = "Событие СПД";
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Вы уверены, что хотите удалить �тот тип �обыти�? В�е �обыти� �того типа также будут удалены.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Добавить новый тип";
> 		$admtext['createnewevtype'] = "Создать новую запи�ь � типом атрибута или �обыти�";
> 		$admtext['modifyeventtype'] = "Редактировать �уще�твующий тип";
> 		$admtext['entertypedesc'] = "Пожалуй�та, введите тип/опи�ание дл� �того нового типа атрибута или �обыти�.";
> 		$admtext['enterdisplay'] = "Пожалуй�та, введите �троку отображени� дл� �того нового типа атрибута или �обыти�.";
> 		$admtext['existingeventtypeinfo'] = "Информаци� о �уще�твующем типе атрибута или �обыти�";
> 		$admtext['neweventtypeinfo'] = "Информаци� о новом типе атрибута или �обыти�";
> 		$admtext['existingevtypes'] = "Суще�твующие типы атрибутов или �обытий";
> 		$admtext['edsevtypes'] = "Редактировать, удалить или �ортировать ранее введенные типы атрибутов и �обытий";
> 		$admtext['selectentertag'] = "Пожалуй�та, выберите или введите тег дл� �того типа атрибута или �обыти�.";
> 		$admtext['changestoallevtypes'] = "Изменени� дл� в�ех типов атрибутов или �обытий";
> 		break;
> 
> 	//addfamily.php, updatefamily.php, findfamily.php, editfamily.php, newfamily.php
> 	case "families":
> 		$admtext['changestofamily'] = "Изменени� в �емье";
> 		$admtext['marrdate'] = "Дата �вадьбы"; //marriage date
> 		$admtext['modifyfamily'] = "Изменить �уще�твующую �емью";
> 		$admtext['selectfamaction'] = "Выбрать �емью и дей�твие";
> 		$admtext['confdeletefam'] = "Вы уверены, что хотите удалить �ту �емью?";
> 		$admtext['existingfamilyinfo'] = "Информаци� о �уще�твующей �емье";
> 		$admtext['newfamilyinfo'] = "Информаци� о новой �емье";
> 		$admtext['sealedsdate'] = "Дата обр�да запечатывани� (СПД)";     //S is for spouse
> 		$admtext['sealedsplace'] = "Ме�то обр�да запечатывани� (СПД)";     //S is for spouse
> 		$admtext['newchildren'] = "�овые дети";
> 		$admtext['addnewfamily'] = "Добавить новую �емью";
> 		$admtext['createnewfamily'] = "Сделать запи�ь о новой �емье";
> 		$admtext['editexistingfaminfo'] = "Изменить информацию об уже зане�енной �еьме";
> 		$admtext['spousesids'] = " Идентификационный номер �упругов";
> 		$admtext['noname'] = "�ет имени";
> 		$admtext['familyidbefevent'] = "Сначала Вы должны вне�ти Идентификационный номер �емьи, прежде чем Вы �можете добавить новые �обыти�.";
> 		$admtext['prefixfamilyid'] = "Вначале ID �емьи должна �то�ть буква &#171;F&#187; (Family)";
> 		$admtext['validfamilyid'] = "Введите дей�твительный ID �емьи. Дей�твительный ID - �то по�ледовательно�ть цифр, начинающих�� � буквы &#171;F&#187;.";
> 		$admtext['familyidbefnote'] = "Вы должны вне�ти Идентификационный номер �емьи, прежде чем �можете добавить новые запи�и.";
> 		$admtext['familyidbefcite'] = "Вы должны �начала вве�ти Идентификационный номер �емьи, чтобы иметь возможно�ть и�пользовать цитаты дл� �той �емьи.";
> 		$admtext['genfamily'] = "Стандартна� �емь�";
> 		$admtext['marriagetype'] = "Тип брака";
> 		$admtext['reviewfamilies'] = "Сохранить или изменить предложенные изменени� дл� �емьи";
> 		$admtext['fevslater'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента";
> 		$admtext['husbid'] = "ID мужа";  //husband ID
> 		$admtext['wifeid'] = " ID жены";
> 		$admtext['enternamepart'] = "Введите ча�ть имени и/или фамилии";
> 		$admtext['pleasenamepart'] = "Пожалуй�та, Введите ча�ть имени и/или фамилии.";
> 		$admtext['clickfind'] = "�ажмите �айти или Создать =>";
> 		$admtext['chunlinked'] = "Ребёнок не �в�зан � �емьёй";
> 		$admtext['child'] = "Ребёнок";
> 		break;
> 
> 	//addperson.php, addperson2.php, updateperson.php, findperson.php, editperson.php, newperson.php, newperson2.php, people.php, findperson2.php
> 	case "people":
> 		$admtext['addingperson'] = "Добавление человека...";
> 		$admtext['changestoperson'] = "Изменени� дл� человека";
> 		$admtext['modifyperson'] = "Редактировать �уще�твующего человека";
> 		$admtext['selectpersaction'] = "Выберите человека и дей�твие";
> 		$admtext['existingpersoninfo'] = "Суще�твующа� информаци� о человеке";
> 		$admtext['firstgivennames'] = "Полное им�";
> 		$admtext['lastsurname'] = "Фамили�";
> 		$admtext['nickname'] = "Прозвище";
> 		$admtext['male'] = "Мужчина";
> 		$admtext['female'] = "Женщина";
> 		$admtext['bapldate'] = "Дата крещени� (СПД)";
> 		$admtext['baplplace'] = "Ме�то крещени� (СПД)";
> 		$admtext['endldate'] = "Дата благо�ловени� (СПД)";
> 		$admtext['parents'] = "Родители";
> 		$admtext['father'] = "Отец";
> 		$admtext['mother'] = "Мать";
> 		$admtext['unlinkindividual'] = "От�оединить �того человека";
> 		$admtext['aschild'] = "в каче�тве ребёнка";
> 		$admtext['sealedpdate'] = "Дата обр�да запечатывани� O (СПД)";     //P is for parents
> 		$admtext['sealedpplace'] = "Ме�то обр�да запечатывани� 0 (СПД)";     //P is for parents
> 		$admtext['asspouse'] = "в каче�тве �упруга/�упруги";
> 		$admtext['spouse'] = "Супруг(а)";
> 		$admtext['ordernumber'] = "�омер по пор�дку";
> 		$admtext['married'] = "Замужем (женат)";
> 		$admtext['nonewfamily'] = "При �охранении не переходить на новую �емью.";
> 		$admtext['addnewperson'] = "Добавить нового человека";
> 		$admtext['createperson'] = "Создать запи�ь дл� нового человека";
> 		$admtext['personidbefevent'] = "Сначала необходимо вве�ти Идентификационный номер (ID) человека, прежде чем добавл�ть �обыти�.";
> 		$admtext['prefixpersonid'] = "Вначале ID человека должна �то�ть буква &#171;I&#187; (Individual)";
> 		$admtext['validpersonid'] = "Введите дей�твительный ID человека. Дей�твительный ID �то �трока из не�кольких чи�ел, начинающа��� � &#171;I&#187;.";
> 		$admtext['newpersoninfo'] = "Информаци� о новом человеке";
> 		$admtext['selectsex'] = "Выберите пол.";
> 		$admtext['shortform'] = "Кратка� форма";
> 		$admtext['editexistingpersoninfo'] = "Изменить информацию дл� ранее введенного человека";
> 		$admtext['unknown'] = "�еизве�тно";
> 		$admtext['personidbefnote'] = "Прежде, чем Вы �можете добавл�ть новые запи�и, Вы должны вве�ти идентификационный номер человека.";
> 		$admtext['endlplace'] = "Ме�то дарени� (СПД)";
> 		$admtext['personidbefcite'] = "Прежде, чем Вы �можете и�пользовать цитаты по отношению к �тому человеку, Вы должны вве�ти идентификационный номер �того человека.";
> 		$admtext['relationship'] = "Отношени�";
> 		$admtext['asspouse'] = "в каче�тве �упруга/�упруги";
> 		$admtext['mergepeople'] = "Объединить информацию из разных запи�ей об одном человеке.";
> 		$admtext['choosemerge'] = "Выбрать людей дл� объединени� или найти возможные �овпадени�";
> 		$admtext['usesoundex'] = "И�пользовать Soundex (алгоритм �равнени� по звучанию)";
> 		$admtext['sdxdisclaimer'] = "При и�пользовании �той опции программа будет дольше и�кать �ледующее �овпадение или дубликат.";
> 		$admtext['combinenotes'] = "Объедините заметки и цитаты";
> 		$admtext['confirmmerge'] = "Вы уверены, что хотите объединить запи�и об �тих люд�х?";
> 		$admtext['gotonewfamily'] = "Создать новую �емью, и�пользу� информацию об �том человеке";
> 		$admtext['genperson'] = "Общие данные о человеке";
> 		$admtext['reviewpeople'] = "Прин�ть или отклонить предварительные изменени� дл� людей";
> 		$admtext['nokids'] = "�ет детей";
> 		$admtext['noparents'] = "�ет родителей";
> 		$admtext['association'] = "Св�зь";
> 		$admtext['deletingassoc'] = "Св�зь удал�ет��...";
> 		$admtext['addingassoc'] = "Св�зь добавл�ет��...";
> 		$admtext['updatingassoc'] = "Св�зь измен�ет��...";
> 		$admtext['addnewassoc'] = "Добавить новую �в�зь";
> 		$admtext['modifyassoc'] = "Изменить �уще�твующую �в�зь";
> 		$admtext['pevslater'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента.";
> 		$admtext['ashusband'] = "как �упруг";
> 		$admtext['aswife'] = "как �упруга";
> 		$admtext['pevslater2'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента.";
> 		$admtext['nospouse'] = "�ет �упруга(и)";
> 		$admtext['revassoc'] = "Также добавить обратную �в�зь дл� �тих людей";
> 		$admtext['prefix'] = "Префик�";
> 		$admtext['chkdel'] = "У�тановите пу�той флажок, чтобы удалить �лемент �лева";
> 		//added in 10.0.0
> 		$admtext['confdate'] = "Дата конфирмации (СПД)";
> 		$admtext['confplace'] = "Ме�то конфирмации (СПД)";
> 		$admtext['initdate'] = "Дата по�в�щени� (СПД)";
> 		$admtext['initplace'] = "Ме�то по�в�щени� (СПД)";
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Сохранить + �овые родители";
> 		$admtext['savenewspouse'] = "Сохранить + �овый �упруг";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "�льт. Д.Р.";
> 		break;
> 
> 	case "headstones":
> 	case "photos":
> 		//$admtext['photonotcopied'] = "The photo file could not be copied to";
> 		$admtext['thumbnailnotcopied'] = "�е удало�ь �копировать файл миниатюры в";
> 		$admtext['photo'] = "фото";
> 		$admtext['changestophoto'] = "Изменени� фотографии";
> 		$admtext['modifyphoto'] = "Изменить �уще�твующее фото";
> 		$admtext['addnewphoto'] = "Добавить новую фотографию";
> 		$admtext['selectphotoaction'] = "Выбрать фотографию и дей�твие";
> 		$admtext['photoid'] = "Идентификационный номер фотографии";
> 		$admtext['confdeletephoto'] = "Вы уверены, что хотите удалить �ту фотографию и в�е ��ылки на нее?";
> 		$admtext['enterphotopath'] = "Введите путь (папку и название файла) дл� �того файла � фотографией в Вашей папке � фотографи�ми на Вашем веб-�ервере.";
> 		$admtext['enterthumbnailpath'] = " Введите путь (папку и название файла) дл� �той миниатюры в Вашей папке � фотографи�ми на Вашем веб-�ервере.";
> 		$admtext['existingphotoinfo'] = "Информаци� о �уще�твующей фотографии";
> 		//$admtext['newphotoinfo'] = "New Photo Information";
> 		$admtext['thumbnailfile'] = "Файл миниатюры";
> 		//$admtext['thumbnailtoupload'] = "Image file to upload";
> 		$admtext['fileandpath'] = "�азвание файла и пути";
> 		$admtext['sortphotos'] = "Сортировать фотографии";
> 		$admtext['sortphotosfor'] = "Сортировать фотографии дл�";
> 		$admtext['editexistingphotoinfo'] = "Изменить информацию об уже добавленной фотографии";
> 		$admtext['leaveblankallphotos'] = "Очи�тить, чтобы показать в�е фотографии";
> 		$admtext['headstone'] = "�адгробие";
> 		$admtext['imagenotcopied'] = "Файл � изображением не может быть �копирован";
> 		$admtext['changestohs'] = "Изменени� в надгроби�х";
> 		$admtext['modifyheadstone'] = "Измените данные �уще�твующего надгроби�";
> 		$admtext['selecthsaction'] = "Выберите надгробие и дей�твие";
> 		$admtext['confdeletehs'] = "Вы уверены, что хотите удалить �ведени� об �том надгробии?";
> 		$admtext['photostatus'] = "Фотографи�/Стату�";
> 		$admtext['selectcemetery'] = "Выберите кладбище.";
> 		$admtext['enterhsimage'] = "Введите название папки дл� Ваших фотографий надгробий на веб-�ервере.";
> 		$admtext['existinghsinfo'] = "Информаци� о �уще�твующем надгробии";
> 		$admtext['newhsinfo'] = "Информаци� о новом надгробии";
> 		$admtext['hsimagefile'] = "Файл � фотографией надгроби�";
> 		$admtext['located'] = "Локализировано";
> 		$admtext['notyetlocated'] = "не локализировано";
> 		$admtext['unmarked'] = "�е отмечено";
> 		$admtext['missing'] = "От�ут�твует";
> 		$admtext['leaveblankhs'] = "О�тавьте �то поле пу�тым, е�ли файлы уже наход�т�� в папке � надгроби�ми.";
> 		$admtext['requiredhs'] = "Об�зательно. Это �одержание �того пол� должно �овпадать � названием и ме�том Вашего файла <em> в папке � надгроби�ми</em> по�ле того, как файл загружен. �апример, е�ли Ваша папка называет�� <em>&#171;Фотографии/�адгроби�&#187;</em>, и Вы хотите файл назвать <em>&#171;�адгробие.jpg&#187;</em> и хотите его поме�тить в подкаталог названный &#171;Фотографии/�адгроби�&#187;, <em>&#171;�овые надгроби�&#187;</em> , тогда Вам �ледует набрать в �том поле <em>&#171;�овые надгроби�/�адгробие.jpg&#187;</em>.";
> 		$admtext['addnewhs'] = "Добавить новое надгробие";
> 		$admtext['createnewhs'] = "Сделать запи�ь о новом надгробии и прив�зать ее к человеку";
> 		$admtext['editexistinghsinfo'] = "Изменить информацию об уже введенном надгробии";
> 		$admtext['leaveblankallhs'] = "О�тавить незаполненной, чтобы показать в�е надгроби�";
> 		$admtext['cemnamelocation'] = "�азвание ме�тонахождени� кладбища";
> 		$admtext['pedphoto'] = "И�пользуйте �ту фотографию в таблицах потомков и в naamtitels";
> 		$admtext['dimensions'] = "Размеры";
> 		$admtext['selectphoto'] = "Выбрать фотографию";
> 		$admtext['specifyimg'] = "Указать изображение";
> 		$admtext['autoimg'] = "Сделать из оригинала";
> 		$admtext['enterthumbpath'] = "Выберете ме�то дл� миниатюры";
> 		$admtext['genthumbs'] = "Создать миниатюры";
> 		$admtext['genthumbsdesc'] = "�втоматиче�ки �оздавать уменьшенные вер�ии в�ех фотографий, дл� которых нет миниатюр.";
> 		$admtext['thumbsgenerated'] = "Миниатюры �озданы";
> 		$admtext['makedefault'] = "И�пользовать по умолчанию";
> 		$admtext['filewithinhs'] = "Путь в папке � надгроби�ми <br>(подкаталог и название файла)";
> 		$admtext['recsupdated'] = "Сведени� изменены";
> 		$admtext['removedef'] = "Удалить �тандартную фотографию";
> 		$admtext['numlinkhs'] = "Количе�тво людей дл� �в�зывани� � �тим надгробием";
> 		$admtext['sortheadstones'] = "Сортировать надгроби�";
> 		$admtext['sortheadstonesfor'] = "Сортировать надгроби� дл�";
> 		$admtext['sortheadstonesind'] = "Сортировать надгроби� дл� человека";
> 		$admtext['headstoneorder'] = "Задайте пор�док надгробий, �в�занных � определенным человеком";
> 		$admtext['enternumberforphoto'] = "Задайте каждой теме пор�дковый номер.";
> 		$admtext['updownforphoto'] = "Кликните на �трелки, чтобы изменить пор�док.";
> 		$admtext['createnewphoto'] = "Сделать запи�ь дл� новой фотографии и �в�зать ее � лицами, �емь�ми или и�точниками";
> 		$admtext['numlinkphoto'] = "Количе�тво людей, �емей или и�точников, которое Вы хотите �в�зать � �той фотографией";
> 		$admtext['photoorder'] = "Задайте пор�док предпочтений дл� фотографий, �в�занных � определенным человеком, �емьей или и�точником";
> 		$admtext['assigndefs'] = "�азначить фотографии по умолчанию";
> 		$admtext['assigndefsdesc'] = "Дл� человека или �емьи назначить первую загруженную фотографию фотографией по умолчанию";
> 		$admtext['overwritedefs'] = "Перезапи�ать �уще�твующие фотографии по умолчанию";
> 		$admtext['assign'] = "�азначить";
> 		$admtext['defsassigned'] = "Заданные фотографии по умолчанию";
> 		//$admtext['isdocument'] = "This image is a document";
> 		$admtext['circle'] = "круг";
> 		$admtext['rect'] = "пр�моугольник";
> 		$admtext['poly'] = "многоугольник";
> 		$admtext['shape'] = "Форма обла�ти";
> 		//$admtext['radius'] = "Radius (pixels)";
> 		$admtext['width'] = "Ширина (пик�ели)";
> 		$admtext['height'] = "Вы�ота (пик�ели)";
> 		$admtext['imgdim'] = "Сведени� об изображении";
> 		$admtext['pixw'] = "пик�елей в ширину";
> 		$admtext['pixh'] = "пик�елей в вы�оту";
> 		//$admtext['convtohs'] = "Convert to Headstones";
> 		//$admtext['convtodoc'] = "Convert to Documents";
> 		//$admtext['convtophoto'] = "Convert to Photos";
> 		$admtext['changestoallphotos'] = "Применить изменени� ко в�ем выбранным фотографи�м";
> 		$admtext['changestoallhs'] = " Применить изменени� ко в�ем выбранным надгроби�м";
> 		$admtext['datetaken'] = "Дата �ъёмки/�оздани�";
> 		$admtext['placetaken'] = "Ме�то �ъёмки/�оздани�";
> 		$admtext['abspath'] = "Этот медиафайл из внешнего и�точника (вы должны �ами �оздать его миниатюру)";
> 		$admtext['imagefile'] = "Медиафайл";
> 		$admtext['pathwithinphotos'] = "�азвание файла на �айте";
> 		$admtext['linktocem'] = "Св�жите �тот �нимок напр�мую � выбранным кладбищем";
> 		$admtext['defphotonote'] = "И�пользовать миниатюру, чтобы идентифицировать �того человека, �емью или и�точник на родо�ловной и других диаграммах, включа� �емейные ли�ты.";
> 		$admtext['photonotadded'] = "Элемент не может быть добавлен, �корее в�его, потому, что уже �уще�твует друга� запи�ь дл� указанной коллекции и файла.";
> 		$admtext['requiredphoto'] = "Об�зательно. По�ле того, как файл загружен, �одержание �того пол� должно �оответ�твовать названию и ме�ту файла <em>в папке � медиафайлами (коллекцией)</em>. �апример, е�ли Ваша коллекци� называет�� <em>&#171;Мультимедиа&#187;</em>, и Вы хотите назвать Ваш файл <em>&#171;Мо� фотографи�.jpg&#187;</em> и хотите поме�тить его в подпапку <em>&#171;�овые фотографии&#187;</em>, тогда Вы должны вве�ти в �том поле <em>&#171;�овые фотографии/Мо� фотографи�.jpg&#187;</em>.";
> 		$admtext['leaveblankphoto'] = "О�тавьте �то поле пу�тым, е�ли файл уже загружен.";
> 		$admtext['thumbconflicts'] = "Миниатюры не были �озданы из-за путей, разрешений, проблем � размерами или именами файлов";
> 		$admtext['showmap'] = "Показывать карту кладбища и фото в��кий раз, когда отображает�� �тот �лемент";
> 		$admtext['bodytext'] = "<strong>ИЛИ</strong><br/>только тек�т";
> 		$admtext['usenl'] = "Заменить концы �трок в тек�те на концы �трок в HTML-кодировке, чтобы их можно было увидеть на �кране";
> 		$admtext['newwin'] = "Открывать в новом окне";
> 		$admtext['modifymedia'] = "Изменить �уще�твующий �нимок";
> 		$admtext['addnewmedia'] = "Добавить новый медиафайл";
> 		$admtext['confdeletemedia'] = "Вы уверены, что хотите удалить �тот медиафайл?";
> 		$admtext['thumbnails'] = "Миниатюры";
> 		$admtext['modifyalbum'] = "Изменить �уще�твующий альбом";
> 		$admtext['addnewalbum'] = "Добавить новый альбом";
> 		$admtext['newalbuminfo'] = "Информаци� о новом альбоме";
> 		$admtext['confdeletealbum'] = "Вы уверены, что хотите удалить �тот альбом?";
> 		$admtext['enteralbumname'] = "Дайте альбому название.";
> 		$admtext['albumname'] = "�азвание альбома";
> 		$admtext['keywords'] = "Ключевые �лова";
> 		$admtext['changestoalbum'] = "Изменени� в альбоме";
> 		$admtext['addtoalbum'] = "Добавить новый альбом";
> 		$admtext['mediatype'] = "Коллекци�";
> 		$admtext['fileext'] = "Ра�ширени� файлов."; //file extension (abbreviation)
> 		$admtext['anotherlink'] = "Добавить новый линк";
> 		$admtext['mediaurl'] = "URL медиафайла";
> 		$admtext['put_in'] = "Сохранить файлы в";
> 		$admtext['usemedia'] = "Папка дл� медиафайлов";
> 		$admtext['usecollect'] = "Папка коллекции (например, &#171;Мои фотографии&#187;)";
> 		$admtext['notcopied'] = "Этот файл нельз� �копировать в";
> 		$admtext['existingmediainfo'] = "Информаци� о �уще�твующем медиафайле";
> 		$admtext['convto'] = "Преобразовать избранное в";
> 		$admtext['changestoallmedia'] = "изменени� в выбранных медиафайлах";
> 		$admtext['changestoitem'] = "Изменени� в теме";
> 		$admtext['eventlink'] = "С�ылка на конкретное �обытие";
> 		$admtext['sortmediaind'] = "Сортировать медиафайлы дл� отдельного человка, �емьи, и�точника, архива или ме�та";
> 		$admtext['sortmedia'] = "Сортировать xxx по";
> 		$admtext['unlinked'] = "Только не �в�занные";
> 		$admtext['samepaths'] = "Стандартное изображение и картинка не могут быть одним и тем же файлом. Пожалуй�та, выберете другую картинку или �делайте ее.";
> 		$admtext['regenerate'] = "Обновить �уще�твующие миниатюры";
> 		$admtext['forcircles'] = "Дл� кругов";
> 		$admtext['forrects'] = "Дл� пр�моугольников";
> 		$admtext['circleinstr'] = "Кликните �начала по�редине круга, а потом на �амом круге.";
> 		$admtext['rectinstr'] = "Кликните �начала в левом верхнем углу пр�моугольника, а потом внизу �права.";
> 		$admtext['firstone'] = "первый";
> 		$admtext['controller'] = "Учитывайте, что медиаплеер займет примерно 16 пик�елей по вертикали.";
> 		$admtext['nostatus'] = "�ет �тату�а";
> 		$admtext['enterid'] = "Задайте, пожалуй�та, идентификационный номер.";
> 		$admtext['existingalbuminfo'] = "Информаци� об альбоме";
> 		$admtext['newmediainfo'] = "Информаци� о медиафайле";
> 		$admtext['mapinstr2'] = "Св�жите обла�ти вашего изображени� � разными людьми или другими �траницами (необ�зательно)";
> 		$admtext['albumlinks'] = "С�ылка на альбом";
> 		$admtext['duplinkmsg'] = "С�ылка на выбранный объект уже �уще�твует в �том альбоме.";
> 		$admtext['invlinkmsg'] = "ID объекта, который вы ввели, недей�твителен. С�ылка не �оздана.";
> 		$admtext['albmedia'] = "Медиафайлы альбома";
> 		$admtext['confremmedia'] = "Вы уверены, что хотите удалить �то медиа из альбома?";
> 		$admtext['selmedia'] = "�айти �уще�твующие медиа дл� включени� в �тот альбом";
> 		$admtext['uploadfirst'] = "Сначала загрузите новые медиа";
> 		$admtext['existmedia'] = "Суще�твующие медиа";
> 		$admtext['emoptions'] = "Про�мотр, Удаление или Перета�кивание дл� Сортировки";
> 		$admtext['addlinks'] = "Добавить новые ��ылки";
> 		$admtext['inclmsg'] = " включено";
> 		$admtext['mediasubt'] = "Управление медифайлами, включёнными в �тот альбом (Добавить, Удалить, Сортировка)";
> 		$admtext['infosubt'] = "Редактировать название альбома, опи�ание и ключевые �лова";
> 		$admtext['linkssubt'] = "Св�зать �тот медиафайл � человеком, �емьёй, и�точником, архивом или ме�том";
> 		$admtext['inclmedia'] = "Включённое медиа";
> 		$admtext['nomedia'] = "Медиафайлов ещё нет";
> 		$admtext['thumbsize'] = "(оригинал �лишком большой)";
> 		$admtext['thumbinv'] = "(недопу�тимое изображение или не�оответ�твующие разрешени�)";
> 		$admtext['thumblost'] = "(оригинал не найден)";
> 		$admtext['uplsel'] = "Загрузите новый файл � компьютера или выберите из файлов, уже наход�щих�� на �айте.";
> 		$admtext['alblater'] = "Примечание: Добавить дополнительную информацию и медиафайлы, а также �в�зать альбом � отдельными людьми или �емь�ми можно на �ледующем �кране.";
> 		$admtext['medlater'] = "Примечание: Добавить дополнительную информацию и �в�зать медиафайл � отдельными людьми или �емь�ми можно на �ледующем �кране.";
> 		$admtext['minfosubt'] = "Отредактируйте название медиафайла, опи�ание и другие о�новные �ведени�";
> 		$admtext['defphoto'] = "Фото по умолчанию";
> 		$admtext['alttd'] = "Синоним";   //short abbreviation for "Alternate Title or Description"
> 		$admtext['editmedialink'] = "Изменить медиа-��ылку";
> 		$admtext['plot'] = "Уча�ток";
> 		$admtext['addnewcoll'] = "Добавить коллекцию";
> 		$admtext['collid'] = "ID коллекции";
> 		$admtext['colldisplay'] = "Отображать заголовок";
> 		$admtext['collpath'] = "�азвание папки";
> 		$admtext['collicon'] = "Файл значка";
> 		$admtext['colllike'] = "Та же на�тройка, как";
> 		$admtext['entercollid'] = "Пожалуй�та, введите ID коллекции.";
> 		$admtext['entercolldisplay'] = "Пожалуй�та, введите отображаемое им� коллекции.";
> 		$admtext['entercollpath'] = "Пожалуй�та, введите им� папки коллекции.";
> 		$admtext['entercollicon'] = "Пожалуй�та, введите им� файла значка коллекции.";
> 		$admtext['editcoll'] = "Редактировать Коллекцию";
> 		$admtext['confmtdelete'] = "Вы уверены, что хотите удалить �тот тип медиа?";
> 		$admtext['histlimit'] = "<strong>Замечание к размеру:</strong> Большин�тво браузеров ограничивают объем данных, которые могут быть отправлены в виде веб-формы, примерно до 64 КБ. Е�ли у ва� большой объём тек�та дл� ввода или в�тавки в тек�товое поле выше, то можно и�пользовать historytemplate.php. Дополнительную информацию �мотрите в �правке.";
> 		$admtext['repath'] = "Обновить пути к миниатюрам, е�ли файл не �уще�твует";
> 		$admtext['sortalbumind'] = "Сортировка альбомов по люд�м, �емь�м и ме�ту";
> 		$admtext['cidexists'] = "Введённый ID коллекции не может быть добавлено, т.к. оно уже �уще�твует.";
> 		$admtext['phalltrees'] = "�еоб�зательно. О�тавьте пу�тым, чтобы фотографии были видны во в�ех родовых древе�ах.";
> 		$admtext['fileexists'] = "Этот файл уже �уще�твует. Перезапи�ать?";
> 		$admtext['collthumb'] = "Файл миниатюры";
> 		$admtext['movetop'] = "Перейти наверх";
> 		$admtext['collexpas'] = "Эк�порт как";
> 		$admtext['upload'] = "Загрузить";
> 		$admtext['linksel'] = "С�ылка на выбранные";
> 		$admtext['mediaupl'] = "Загрузить медиафайл";
> 		$admtext['addfiles'] = "Добавить файлы...";
> 		$admtext['startupl'] = "�ачать загрузку";
> 		$admtext['start'] = "Старт";
> 		$admtext['cancelupl'] = "Отмена загрузки";
> 		$admtext['localpath'] = "Локальный путь (пути)";
> 		//added in 12.0.0
> 		$admtext['confdelmediafile'] = "Вы также хотите удалить файл физиче�ки?";
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML Image Map (дл� обратной �овме�тимо�ти)";
> 		$admtext['photoowner'] = "Владелец оригинала";
> 		$admtext['nothumb'] = "�ет миниатюры";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Элемент не удало�ь добавить, �корее в�его, потому, что файл был �лишком большим и его нельз� было загрузить или и�пользовать дл� �оздани� миниатюры.";
> 		$admtext['moved'] = "Перемещено";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Пожалуй�та, введите название или опи�ание дл� �того медиа.";
> 		$admtext['mapinstr3'] = "Чтобы �в�зать обла�ть �той фотографии � человеком, �емьей или другим объектом, �начала выберите �оответ�твующее древо и тип объекта, затем �оздайте пр�моугольник дл� нужной обла�ти. Это делает�� щелчком мыши в левом верхнем углу обла�ти, а затем перета�киванием в правый нижний угол. Поочередно вы можете щелкнуть в левом верхнем углу, а затем �нова в правом нижнем углу. Затем в�плывающее окно поможет вам выбрать нужного человека или другой объект. Сделайте �вой выбор, затем повторите �тот проце�� по мере необходимо�ти дл� дополнительных обла�тей. Щелкните �уще�твующую обла�ть, чтобы выбрать, затем перетащите дл� перемещени� или нажмите 'X' дл� удалени�.";
> 		break;
> 
> 	//addreport.php, updatereport.php, newreport.php, editreport.php
> 	case "reports":
> 		$admtext['changestoreport'] = "Изменени� в отчёте";
> 		$admtext['modifyreport'] = "Изменить �уще�твующий отчёт";
> 		$admtext['existingreportinfo'] = "Информаци� о �уще�твующем отчёте";
> 		$admtext['existingreports'] = "Суще�твующие отчёты";
> 		$admtext['newreportinfo'] = "Информаци� о новом отчёте";
> 		$admtext['reportname'] = "�азвание отчёта";
> 		$admtext['rankpriority'] = "Приоритет";
> 		$admtext['choosedisplay'] = "Пол� дл� отображени�";
> 		$admtext['spouseid'] = "идентификационный номер �упруга";
> 		$admtext['spousename'] = "Им� партнера";
> 		$admtext['lastmodified'] = "По�ледние изменени� были";
> 		$admtext['ldsbapldate'] = "Дата крещени� (СПД)";
> 		$admtext['ldsbaplplace'] = "Ме�то крещени� (СПД)";
> 		$admtext['ldsendldate'] = "Дата дарени� (СПД)";
> 		$admtext['ldsendlplace'] = "Ме�то дарени� (СПД)";
> 		$admtext['ldssealsdate'] = "Дата Запечатывани�/Супруга (СПД)";
> 		$admtext['ldssealsplace'] = "Ме�то Запечатывани�/Супруга (СПД)";
> 		$admtext['ldssealpdate'] = " Дата Запечатывани� /Родители (СПД)";
> 		$admtext['ldssealpplace'] = "Ме�то Запечатывани�/Родители (СПД)";
> 		//$admtext['makelink'] = "Make Link";
> 		$admtext['choosecriteria'] = "Критерии";
> 		$admtext['fullname'] = "Фамили�";
> 		$admtext['lastfirst'] = "Фамили�, им�";
> 		$admtext['monthonlyfrom'] = "Только ме��ц";
> 		$admtext['yearonlyfrom'] = "Только год";
> 		$admtext['dayonlyfrom'] = "Только день";
> 		$admtext['operators'] = "Операторы и о�обые ценно�ти";
> 		$admtext['contains'] = "Содержит";
> 		$admtext['startswith'] = "�ачинает�� �";
> 		$admtext['endswith'] = "Заканчивает�� на";
> 		$admtext['text_and'] = "И";
> 		$admtext['currentmonth'] = "текущий ме��ц";
> 		$admtext['currentyear'] = "Текущий год";
> 		$admtext['currentday'] = "Текущий день";
> 		$admtext['constantstring'] = "По�то�нный р�д (буквенно-чи�ловой)";
> 		$admtext['constantvalue'] = "По�то�нна� величина (чи�лова�)";
> 		$admtext['choosesort'] = "Сортировка";
> 		$admtext['savereport'] = "Сохранить отчёт";
> 		$admtext['addnewreport'] = "Добавить новый отчёт";
> 		$admtext['createreport'] = "Сделать новый отчёт";
> 		$admtext['noreports'] = "�е�уще�твующий отчёт";
> 		$admtext['rank'] = "Разр�д";
> 		$admtext['confreportdelete'] = "Вы уверены, что хотите удалить �тот отчёт?";
> 		$admtext['enterreportname'] = "Введите название отчёта.";
> 		$admtext['selectdisplayfield'] = "Выберите по крайней мере одно поле дл� показа.";
> 		$admtext['today'] = "Сегодн� (на �амом деле)";
> 		$admtext['convtodays'] = "Переве�ти в дни";
> 		$admtext['desc'] = "В ни�ход�щем пор�дке (Предыдущие)";
> 		$admtext['birthdatetr'] = "Дата рождени� (на�то�ща�)";
> 		$admtext['chrdatetr'] = "Дата крещени� (на�то�ща�)";
> 		$admtext['deathdatetr'] = "Дата �мерти (на�то�ща�)";
> 		$admtext['burialdatetr'] = "Дата похорон (на�то�ща�)";
> 		$admtext['marriagedatetr'] = "Дата брако�очетани� (на�то�ща�)";
> 		$admtext['ldsbapldatetr'] = "Дата крещени� (на�то�ща�) (СПД)";
> 		$admtext['ldsendldatetr'] = "Дата дарени� (на�то�ща�) (СПД)";
> 		$admtext['ldssealsdatetr'] = "Дата запечатывани�/Супруг (на�то�ща�) (СПД)";
> 		$admtext['ldssealpdatetr'] = "Дата запечатывани�/Родители (на�то�ща�) (СПД)";
> 		$admtext['currentmonthnum'] = "Текущий ме��ц (чи�ло)";
> 		$admtext['livingtrue'] = "Живой = да";
> 		$admtext['livingfalse'] = "Живой = нет";
> 		$admtext['altreport'] = "Или о�тавьте пол� критериев и �ортировки пу�тыми и введите команду SQL";
> 		$admtext['rptdate'] = "Дата";
> 		$admtext['rptdatetr'] = "Дата (на�то�ща�)";
> 		$admtext['fact'] = "Факт";
> 		$admtext['testeditdelete'] = "Добавление, изменение, проверка или удаление отчётов";
> 		$admtext['wnmsg'] = "Сообщение на �транице &#171;Что нового&#187;";
> 		$admtext['mwtype'] = "Тип";
> 		$admtext['mysphoto'] = "�еизве�тные фотографии";
> 		$admtext['mysperson'] = "�еизве�тные люди";
> 		$admtext['selphoto'] = "Выберите фото";
> 		$admtext['entertitle'] = "Пожалуй�та, введите название";
> 		$admtext['enterdesc'] = "Пожалуй�та, введите опи�ание";
> 		$admtext['confremmw'] = "Вы дей�твительно хотите удалить �тот �лемент?";
> 		$admtext['msgsaved'] = "Сообщение �охранено";
> 		$admtext['privatetrue'] = "Личное = да";
> 		$admtext['privatefalse'] = "Личное = нет";
> 		//added in 11.0.0
> 		$admtext['ldsconfdate'] = "Дата конфирмации (СПД)";
> 		$admtext['ldsconfplace'] = "Ме�то конфирмации (СПД)";
> 		$admtext['ldsconfdatetr'] = "Дата конфирмации (на�то�ща�) (СПД)";
> 		$admtext['ldsinitdate'] = "Дата по�в�щени� (СПД)";
> 		$admtext['ldsinitplace'] = "Ме�то по�в�щени� (СПД)";
> 		$admtext['ldsinitdatetr'] = "Дата по�в�щени� (на�то�ща�) (СПД)";
> 		$admtext['savecopy'] = "Сохранить как копию";
> 		$admtext['activeonly'] = "Только активные";
> 		//added in 14.0
> 		$admtext['instr'] = "Ин�трукции: Перетащите или дважды щелкните �лементы �лева в �пи�ки �права. Перетащите вверх и вниз, чтобы изменить пор�док. Дважды щелкните еще раз, чтобы удалить.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Дл� пу�той �троки о�тавьте �то поле пу�тым и нажмите >>";
> 		break;
> 
> 	//index.php
> 	case "index":
> 		$admtext['setupfirsttime'] = "У�тановить программу впервые.";
> 		$admtext['importgedcom2'] = "Импортировать файл GEDCOM";
> 		$admtext['setupitems'] = "Создание таблиц базы данных, у�тановка параметров";
> 		$admtext['custeventitems'] = "Управление пользователь�кими метками и типами �обытий";
> 		$admtext['usersitems'] = "Управление пользовател�ми и разрешени�ми";
> 		$admtext['reportsitems'] = "Создание пользователь�ких �пи�ков и отчетов";
> 		$admtext['langitems'] = "Управление альтернативными �зыками";
> 		$admtext['backupitems'] = "Резервное копирование, во��тановление и оптимизаци� таблиц";
> 		$admtext['mainmenu'] = "Главное меню";
> 		$admtext['secondaryitems'] = "Создать GENDEX-файл, �о�читать родовые линии";
> 		//added in 8.0.0
> 		$admtext['mmgritems'] = "У�тановка и удаление модов TNG";
> 		//changed in 11.0.0
> 		$admtext['miscitems'] = "Что нового, розы�к, проверка данных";
> 		//added in 11.0.0
> 		$admtext['tasks'] = "Важные задачи";
> 		$admtext['task_revusers'] = "Про�мотр реги�трации новых пользователей";
> 		$admtext['task_tree'] = "Создайть �воё первое дерево";
> 		$admtext['task_user'] = "Создать �вою учётную запи�ь";
> 		$admtext['task_people'] = "Добавить новых людей";
> 		$admtext['task_families'] = "Добавить новые �емьи";
> 		$admtext['task_revind'] = "Про�мотр предлагаемых изменений �обытий у людей";
> 		$admtext['task_revfam'] = "Про�мотр предлагаемых изменений �обытий у �емей";
> 		$admtext['task_backup'] = "Резервное копирование";
> 		$admtext['nobackups'] = "нет резервных копий";
> 		$admtext['lastbackup'] = "По�леднее �оздание резервной копии";
> 		$admtext['dna_blurb'] = "Ввод те�тов Д�К и �в�зывание их � людьми";
> 		//added in 12.0.0
> 		$admtext['task_mapkey'] = "Получить ключ дл� и�пользование карт Google";
> 		//added in 14.0
> 		$admtext['upgrade'] = "Обновить";
> 		$admtext['need_upgrade'] = "Выполните �ти ин�трукции по обновлению";
> 		$admtext['upgrade_missing'] = "Файл обновлени�, похоже, от�ут�твует, возможно, оно уже у�тановлено.";
> 		$admtext['delete_upgrade'] = "Когда вы закончите, нажмите зде�ь, чтобы удалить обновление и вернуть�� в меню.";
> 		break;
> 
> 	//addsource.php, updatesource.php, newsource.php, editsource.php, sources.php
> 	case "sources":
> 		$admtext['changestosource'] = "Изменени� в и�точнике";
> 		$admtext['modifysource'] = "Изменить �уще�твующий и�точник";
> 		$admtext['selectsrcaction'] = "Выбрать и�точник и дей�твие";
> 		$admtext['shorttitle'] = "Краткое название";
> 		$admtext['longtitle'] = "Полное название";
> 		$admtext['callnumber'] = "Телефонный номер";
> 		$admtext['publisher'] = "Издатель";
> 		$admtext['actualtext'] = "Фактиче�кий тек�т";
> 		$admtext['confdeletesrc'] = "Вы уверены, что хотите удалить �тот и�точник?";
> 		$admtext['selectshorttitle'] = "Выберите или введите краткий заголовок дл� �того типа �обытий.";
> 		$admtext['existingsourceinfo'] = "Информаци� о �уще�твующем и�точнике";
> 		$admtext['newsourceinfo'] = "Информаци� о новом и�точнике";
> 		$admtext['addnewsource'] = "Добавить новый и�точник";
> 		$admtext['prefixsourceid'] = "Вначале ID и�точника должна �то�ть буква &#171;S&#187; (Source)";
> 		$admtext['entersourceid'] = "Введите ID и�точника.";
> 		$admtext['validsourceid'] = "Введите правильный ID и�точника. Правильный ID – �то по�ледовательно�ть чи�ел, начинающа��� � буквы &#171;S&#187;.";
> 		$admtext['createsource'] = "Сделайте запи�ь дл� нового и�точника";
> 		$admtext['editexistingsource'] = "Изменить информацию об уже добавленном и�точнике";
> 		$admtext['addnewcite'] = "Добавить новую цитату";
> 		$admtext['reliability'] = "До�товерно�ть";
> 		$admtext['relyexplain'] = "Более вы�окие цифры указывают на большую до�товерно�ть";
> 		$admtext['citedate'] = "Дата цитировани�";
> 		$admtext['modifycite'] = "Изменить �уще�твующую цитату";
> 		$admtext['addingcite'] = "Цитата добавл�ет��...";
> 		$admtext['deletingcite'] = "Цитата удал�ет��...";
> 		$admtext['updatingcite'] = "Цитата обрабатывает��...";
> 		$admtext['sevslater'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента.";
> 		$admtext['pleasesourcepart'] = "Пожалуй�та, введите ча�ть наименовани�.";
> 		$admtext['addnewrepo'] = "Добавить новый архив";
> 		$admtext['modifyrepo'] = "Изменить �уще�твующее архив";
> 		$admtext['createrepo'] = "Сделать запи�ь дл� нового архива";
> 		$admtext['editexistingrepo'] = "Изменить информацию об уже добавленном архиве";
> 		$admtext['enterrepoid'] = "Введите, пожалуй�та, ID архива.";
> 		$admtext['enterreponame'] = "Введите, пожалуй�та, опи�ание архива (например, название).";
> 		$admtext['newrepoinfo'] = "�ова� информаци� об архиве";
> 		$admtext['prefixrepoid'] = "Вначале ID архива должна �то�ть буква &#171;R&#187; (Repository)";
> 		$admtext['selectrepoaction'] = "Выберите архив и дей�твие";
> 		$admtext['confdeleterepo'] = "вы уверены, что хотите удалить �тот архив?";
> 		$admtext['changestorepo'] = "Изменени� в �том архиве";
> 		$admtext['existingrepoinfo'] = "�уще�твующа� информаци� об архиве";
> 		$admtext['pleaserepopart'] = "Пожалуй�та, Введите ча�ть опи�ани� архива.";
> 		$admtext['choosemergesources'] = "Выбрать и�точники дл� объединени� или найти возможные �овпадени�";
> 		$admtext['confirmmergesources'] = "Вы уверены, что хотите объединить �ти и�точники?";
> 		$admtext['choosemergerepos'] = "Выбрать архивы дл� объединени� или найти возможные �овпадени�";
> 		$admtext['confirmmergerepos'] = "Вы уверены, что хотите объединить �ти архивы?";
> 		$admtext['revslater'] = "Примечание: Добавление дополнительных �обытий и заметок возможно только по�ле �оздани� нового �лемента.";
> 		$admtext['confdeleterepo'] = "вы уверены, что хотите удалить �тот архив?";
> 		break;
> 
> 	//checkID.php
> 	case "checkID":
> 		$admtext['checknewid'] = "Проверить правильно�ть нового идентификационного номера";
> 		$admtext['idnotvalid'] = "�то недей�твительный идентификационный номер. Дей�твительный идентификационный номер – �то по�ледовательно�ть чи�ел, котора� начинает�� �";
> 		$admtext['idinuse'] = "уже и�пользует��. Выберите другой идентификационный номер";
> 		$admtext['idok'] = "можно и�пользовать";
> 		$admtext['isok'] = "можно и�пользовать";
> 		$admtext['isinuse'] = "уже и�пользует��.";
> 		break;
> 	
> 	case "templates":
> 		$admtext['templatenum'] = "�омер шаблона";
> 		$admtext['mainimage'] = "О�новное изображение<br/>на домашней �транице"; //1, 2, 3, 4, 5, 7
> 		$admtext['titleimage'] = "Изображение заголовка<br/>на домашней �транице"; //1, 2, 3
> 		$admtext['headline'] = "Шапка"; //4, 7
> 		$admtext['mainpara'] = "Тек�т блока<br/>&#171;Добро пожаловать&#187;";  //1, 4, 6, 7, 8
> 		$admtext['headimgplustitle'] = "Изображение в шапке<br/>(включа� название)"; //1
> 		$admtext['pedperson'] = "ID члена родо�ловной"; //2
> 		$admtext['pedtree'] = "ID генеалогиче�кого древа"; //2
> 		$admtext['phhistperson'] = "Фотографии и и�тории члена � ID"; //2
> 		$admtext['phhisttree'] = "Фотографии и и�тории генеалогиче�кого древа � ID"; //2
> 		$admtext['headimg'] = "Изображение в шапке"; //2, 3, 4, 5, 6, 8
> 		$admtext['headtitleimg'] = "Файл изображени�"; //2, 3
> 		$admtext['titleimg'] = "Изображени� в заголовке<br/>на в�ех �траницах"; //4, 7
> 		$admtext['searchpara'] = "Раздел пои�ка"; //6
> 		$admtext['fhpara'] = "Раздел �емейных и�торий"; //6
> 		$admtext['fhlinkshis'] = "С�ылки на �емейные и�тории (Его)"; //6
> 		$admtext['fhlinkshers'] = "С�ылки на �емейные и�тории (Её)"; //6
> 		$admtext['mwpara'] = "Любимый раздел"; //6
> 		$admtext['respara'] = "Раздел ре�ур�ов"; //6
> 		$admtext['reslinks'] = "С�ылки на Ре�ур�ы"; //6
> 		$admtext['headtitle1'] = "1-� ча�ть заголовка"; //8
> 		$admtext['headtitle2'] = "2-� ча�ть заголовка"; //8
> 		$admtext['headtitle3'] = "3-� ча�ть заголовка"; //8
> 		$admtext['headsubtitle'] = "Подзаголовок</br>домашней �траницы"; //8
> 		$admtext['latestnews'] = "По�ледние ново�ти"; //8
> 		$admtext['momside'] = "�азвание �тороны матери"; //8, 20
> 		$admtext['dadside'] = "�азвание �тороны отца"; //8, 20
> 		$admtext['momperson'] = "ID человека �тороны матери"; //8, 20
> 		$admtext['momtree'] = "ID генеалогиче�кого древа<br/>�тороны матери"; //8, 20
> 		$admtext['dadperson'] = "ID человека �тороны отца"; //8, 20
> 		$admtext['dadtree'] = "ID дерево �тороны отца"; //8, 20
> 		$admtext['featurethumb1'] = "Миниатюра 1-го блока"; //4
> 		$admtext['featurelink1'] = "С�ылка 1-го блока"; //4
> 		$admtext['featuretitle1'] = "�азвание 1-го блока"; //4
> 		$admtext['featurepara1'] = "Содержимое 1-го блока"; //4
> 		$admtext['featurethumb2'] = "Миниатюра 2-го блока"; //4
> 		$admtext['featurelink2'] = "С�ылка 2-го блока"; //4
> 		$admtext['featuretitle2'] = "�азвание 2-го блока"; //4
> 		$admtext['featurepara2'] = "Содержимое 2-го блока"; //4
> 		$admtext['featurethumb3'] = "Миниатюра 3-го блока"; //4
> 		$admtext['featurelink3'] = "С�ылка 3-го блока"; //4
> 		$admtext['featuretitle3'] = "�азвание 3-го блока"; //4
> 		$admtext['featurepara3'] = "Содержимое 3-го блока"; //4
> 		$admtext['featurethumb4'] = "Миниатюра 4-го блока"; //4
> 		$admtext['featurelink4'] = "С�ылка 4-го блока"; //4
> 		$admtext['featuretitle4'] = "�азвание 4-го блока"; //4
> 		$admtext['featurepara4'] = "Содержимое 4-го блока"; //4
> 		$admtext['photocaption'] = "Подпи�ь<br/>о�новного изображени�"; //4
> 		$admtext['maintitle'] = "Заголовок<br/>домашней �траницы"; //5
> 		$admtext['hisside'] = "Ярлык его �тороны"; //5
> 		$admtext['herside'] = "Ярлык её �тороны"; //5
> 		$admtext['newstext'] = "Тек�т ново�тей"; //5
> 		//added in 8.1.0
> 		$admtext['templateswitching'] = "И�пользовать шаблоны";
> 		//added in 9.0.0
> 		$admtext['template'] = "Шаблон";
> 		$admtext['createcopy'] = "Создать копию в";  //as in, "create copy in Dutch"
> 		$admtext['featurelinks'] = "Тематиче�кие ��ылки"; //9, 10
> 		$admtext['featurepara'] = "Раздел блоков"; //9, 10
> 		$admtext['welcome'] = "Заголовок блока<br/>&#171;Добро пожаловать&#187;"; //9, 10
> 		//added in 9.0.3
> 		$admtext['momsidenames'] = "Имена �тороны матери"; //8
> 		$admtext['dadsidenames'] = "Имена �тороны отца"; //8
> 		//added in 10.0.0
> 		$admtext['featurespara'] = "Раздел блоков";
> 		$admtext['menutitle'] = "�азвание меню";
> 		$admtext['titlechoice'] = "Параметры названи�";
> 		$admtext['photol'] = "Изображение �лева";
> 		$admtext['phototitlel'] = "Заголовок<br/>изображени� �лева";
> 		$admtext['photocaptionl'] = "Подпи�ь<br/>изображени� �лева";
> 		$admtext['photor'] = "Изображение �права";
> 		$admtext['phototitler'] = "Заголовок<br/>изображени� �права";
> 		$admtext['photocaptionr'] = "Подпи�ь<br/>изображени� �права";
> 		$admtext['topsurnames'] = "�адпи�ь<br/>&#171;Топ 100 фамилий&#187;";
> 		$admtext['headimg2'] = "Изображение заголовка 2"; //14
> 		$admtext['headimg3'] = "Изображение заголовка 3"; //14
> 		$admtext['showprev'] = "Предпро�мотр";
> 		$admtext['hideprev'] = "Скрыть предпро�мотр";
> 		$admtext['ttitleimage'] = "Изображение";
> 		$admtext['ttitletext'] = "Тек�т";
> 		//added in 11.0.0
> 		$admtext['featurethumb5'] = "Миниатюра 5-го блока"; //15
> 		$admtext['featurelink5'] = "С�ылка 5-го блока"; //15
> 		$admtext['featuretitle5'] = "�азвание 5-го блока"; //15
> 		$admtext['featurepara5'] = "Содержимое 5-го блока"; //15
> 		$admtext['featurethumb6'] = "Миниатюра 6-го блока"; //15
> 		$admtext['featurelink6'] = "С�ылка 6-го блока"; //15
> 		$admtext['featuretitle6'] = "�азвание 6-го блока"; //15
> 		$admtext['featurepara6'] = "Содержимое 6-го блока"; //15
> 		$admtext['featurethumb7'] = "Миниатюра 7-го блока"; //15
> 		$admtext['featurelink7'] = "С�ылка 7-го блока"; //15
> 		$admtext['featurepara7'] = "Содержимое 7-го блока"; //15
> 		$admtext['featurethumb8'] = "Миниатюра 8-го блока"; //15
> 		$admtext['featurelink8'] = "С�ылка 8-го блока"; //15
> 		$admtext['featurepara8'] = "Содержимое 8-го блока"; //15
> 		$admtext['sidebarhead1'] = "Заголовок 1-й<br/>боковой панели"; //15
> 		$admtext['sidebarhead2'] = "Заголовок 2-й<br/>боковой панели"; //15
> 		$admtext['sidebarhead3'] = "Заголовок 3-й<br/>боковой панели"; //15
> 		$admtext['texttitle1'] = "�азвание 1-го тек�та"; //15
> 		$admtext['textlink1'] = "С�ылка 1-го тек�та"; //15
> 		$admtext['textpara1'] = "Содержимое 1-го тек�та"; //15
> 		$admtext['texttitle2'] = "�азвание 2-го тек�та"; //15
> 		$admtext['textlink2'] = "С�ылка 2-го тек�та"; //15
> 		$admtext['textpara2'] = "Содержимое 2-го тек�та"; //15
> 		$admtext['texttitle3'] = "�азвание 3-го тек�та"; //15
> 		$admtext['textpara3'] = "Содержимое 3-го тек�та"; //15
> 		$admtext['subhead1'] = "Заголовок 1-го<br/>раздела блоков"; //15
> 		$admtext['subhead2'] = "Заголовок 2-го<br/>раздела блоков"; //15
> 		//added in 12.2
> 		$admtext['quotehead'] = "Заголовок цитат";
> 		$admtext['quotesubhead'] = "Подзаголовок цитат";
> 		$admtext['sniptitle'] = "�азвание Featurette";
> 		$admtext['snipname'] = "Им� Featurette";
> 		$admtext['snipinfoone'] = "Перва� �трока Featurette";
> 		$admtext['snipinfotwo'] = "Featurette втора� �трока";
> 		$admtext['snipimage'] = "Изображение Featurette";
> 		$admtext['snipperson'] = "Идентификатор лица Featurette";
> 		$admtext['sniptree'] = "Идентификатор дерева функций";
> 		$admtext['quote'] = "Цитата";
> 		$admtext['link'] = "С�ылка";
> 		$admtext['featuretitle7'] = "�азвание 7-го блока";
> 		$admtext['featuretitle8'] = "�азвание 8-го блока";
> 		$admtext['featuretitle9'] = "�азвание 9-го блока";
> 		$admtext['featurethumb9'] = "Миниатюра 9-го блока"; //15
> 		$admtext['featurelink9'] = "С�ылка 9-го блока"; //15
> 		$admtext['featurepara9'] = "Содержимое 9-го блока"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Левое изображение заголовка";
> 		$admtext['rightimg'] = "Правое изображение заголовка";
> 		$admtext['photoption'] = "Варианты фото<br />&nbsp;&nbsp;(по�то�нное или �лучайное)";
> 		$admtext['randomphotowidth'] = "Ширина �лучайного фото";
> 		$admtext['randomphotoheight'] = "Вы�ота �лучайного фото";
> 		$admtext['randomphotomediatypeID'] = "Коллекци� �лучайных фото";
> 		$admtext['momheading'] = "Заголовок материн�кой линии";
> 		$admtext['mompara'] = "Параграф материн�кой линии";
> 		$admtext['mompagelink'] = "С�ылка на �траницу материн�кой линии";
> 		$admtext['dadheading'] = "Заголовок отцов�кой линии";
> 		$admtext['dadpara'] = "Параграф отцов�кой линии";
> 		$admtext['dadpagelink'] = "С�ылка на �траницу отцов�кой линии";
> 		$admtext['spmomheading'] = "Заголовок материн�кой линии �упруга";
> 		$admtext['spmompara'] = "Параграф материн�кой линии �упруга";
> 		$admtext['spmompagelink'] = "С�ылка на �траницу материн�кой линии �упруга";
> 		$admtext['spmomside'] = "Метка материн�кой линии �упруга";
> 		$admtext['spdadside'] = "Метка отцов�кой линии �упруга";
> 		$admtext['spmomperson'] = "ID человека материн�кой линии �упруга";
> 		$admtext['spmomtree'] = "ID древа материн�кой линии �упруга";
> 		$admtext['spdadheading'] = "Заголовок отцов�кой линии �упруга";
> 		$admtext['spdadpara'] = "Параграф отцов�кой линии �упруга";
> 		$admtext['spdadpagelink'] = "С�ылка на отцов�кую линию �упруга";
> 		$admtext['spdadperson'] = "ID человека отцов�кой линии �упруга";
> 		$admtext['spdadtree'] = "ID древа отцов�кой линии �упруга";
> 		$admtext['storiesheading'] = "И�тории нашей �емьи";
> 		$admtext['nbrsurnames'] = "Чи�ло фамилий<br />&nbsp;&nbsp; в облаке фамилий";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Миниатюра блока";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
> 		//break intentionally left out here so processing will fall through
> 
> 	//setup.php
> 	//editconfig.php, backuprestore.php
> 	case "setup":
> 		$admtext['tablesuccess'] = "Таблицы у�пешно �озданы.";
> 		$admtext['backtosetup'] = "�азад к меню на�троек";
> 		$admtext['configuration'] = "Конфигураци�";
> 		$admtext['entersysvars'] = "Ввод значений �и�темных переменных.";
> 		$admtext['createdbtables'] = "Создать таблицы базы данных, где будет хранить�� Ваша информаци�.";
> 		$admtext['tcwarning'] = "<strong>Внимание!</strong> Выбирайте �ту опцию только в том �лучае, когда у�танавливаете Ваш �айт в первый раз! <strong>В�е �уще�твующие �ведени�, вме�те � информацией о фотографи�х, и�тори�х, надгроби�х и кладбищах будут удалены!</strong>";
> 		$admtext['conftabledelete'] = "Сейча� будут удалены ВСЯ Ваша информаци� !!! Вы уверены, что хотите продолжить?";
> 		$admtext['performdatamaint'] = "Разработайте базу данных и обработайте фотографии, и�тории и другие компоненты.";
> 		$admtext['createtables'] = "Создать таблицы";
> 		$admtext['configsettings'] = "Общие на�тройки";
> 		$admtext['logconfigsettings'] = "�а�тройки журнала";
> 		$admtext['importconfigsettings'] = "�а�тройки импорта";
> 		$admtext['diagnostics'] = "Те�т";
> 		$admtext['rundiags'] = "Выполнить те�т";
> 		$admtext['phpinf'] = "Окошко PHP-информации";
> 		$admtext['fromphp'] = "Эта информаци� � Вашего �ервера и зави�ит от на�троек PHP, а не TNG.";
> 		$admtext['phpver'] = "Вер�и� PHP";
> 		$admtext['phpreq'] = "(TNG требует 7.0 или выше.)";
> 		$admtext['gdlib'] = "Библиотека GD шрифтов";
> 		$admtext['gdreq'] = "(�ужно дл� �оздани� миниатюр в TNG.)";
> 		$admtext['availnogif'] = "До�тупно, но не поддерживает изображени� � ра�ширением .gif";
> 		$admtext['notinst'] = "�е у�тановлено";
> 		$admtext['safemode'] = "Безопа�ный режим";
> 		$admtext['off'] = "Выключено";
> 		$admtext['on'] = "Включено";
> 		$admtext['fileuploads'] = "Загрузка файлов";
> 		$admtext['fureq'] = "(�ужно дл� загрузки GEDCOM из интернета, загрузки изображений и других.)";
> 		$admtext['perm'] = "Разрешить";
> 		$admtext['notperm'] = "�е разрешено, по�тому и�пользуйте FTP";
> 		$admtext['sqlver'] = "Вер�и� MySQL";
> 		$admtext['sqlreq'] = "(Дл� TNG нужна вер�и� 5.5 или более поздн��.)";
> 		$admtext['wsrvr'] = "Веб �ервер";
> 		$admtext['fperms'] = "Разрешени� дл� файлов/папок";
> 		$admtext['fpreq'] = "(TNG требует, чтобы некоторые файлы и директории имели о�обые права до�тупа.)";
> 		$admtext['scruser'] = "Сценарий как дл� пользовател�:";
> 		$admtext['phpuser'] = "PHP �ообщает об �том как пользователь:";
> 		$admtext['usrprob'] = "Возможно, у Ва� нет необходимых прав до�тупа, чтобы запу�тить TNG без помех, е�ли Вы и�пользуете админи�тративные функции и FTP и  TNG дл� работы � файлами.";
> 		$admtext['rofile'] = "Файл только дл� чтени�:";
> 		$admtext['rofolder'] = "Директори� только дл� чтени�:";
> 		$admtext['publog'] = "Общий файл";
> 		$admtext['admlog'] = "Файл дл� админи�трировани�";
> 		$admtext['folderdne'] = "Така� директори� не �уще�твует:";
> 		$admtext['keyrw'] = "Ключевые папки в�е дл� чтени�/запи�и";
> 		$admtext['cfgrw'] = "Файлы конфигурации в�е дл� чтени�/запи�и";
> 		$admtext['acceptable'] = "Приемлимый.";
> 		$admtext['restricted'] = "�екоторые функции могут быть ограничены. Вы можете �толкнуть�� � ошибками во врем� у�тановки или во врем� работы TNG.";
> 		$admtext['needchngs'] = "TNG может не работать без изменений в вашей конфигурации PHP или �ервера.";
> 		$admtext['yourbrowser'] = "Ваш браузер:";
> 		$admtext['modifysettings'] = "Изменить на�тройки";
> 		$admtext['dbhost'] = "Хо�т";
> 		$admtext['dbname'] = "Базы данных";
> 		$admtext['dbusername'] = "Пользователь";
> 		$admtext['dbpassword'] = "Пароль";
> 		$admtext['rootpath'] = "Корневой путь";
> 		$admtext['homepage'] = "Главна� �траница";
> 		$admtext['emailaddress'] = "E-mail";
> 		$admtext['siteowner'] = "Владелец �айта";
> 		$admtext['maxdescgens'] = "Мак�имальное количе�тво поколений потомков";
> 		$admtext['disallow'] = "Отменить";
> 		$admtext['defaultallowed'] = "Стандарт: Разрешить";
> 		$admtext['maxsearchresults'] = "Мак�имальное количе�тво результатов пои�ка";
> 		$admtext['targetframe'] = "�трибут target";
> 		$admtext['table'] = "Таблица";
> 		$admtext['lastbackup'] = "По�леднее �оздание резервной копии";
> 		$admtext['backup'] = "резервна� копи�";
> 		$admtext['restore'] = "во��тановить";
> 		$admtext['backupfilesize'] = "Величина файла";
> 		$admtext['succbackedup'] = "резервна� копи� �оздана";
> 		$admtext['succrestored'] = "во��тановлено";
> 		$admtext['change_cutoff'] = "Количе�тво дней в &#171;Что нового&#187;";
> 		$admtext['change_limit'] = "Мак�имальное количе�тво топиков в &#171;Что нового&#187;";
> 		$admtext['photosext'] = "Увеличение фото";
> 		$admtext['defaulttree'] = "Генеалогиче�кое древо<br/>по умолчанию";
> 		$admtext['requirelogin'] = "Требовать вход";
> 		$admtext['defaultdontrequire'] = "Стандартно : �е требует��";
> 		$admtext['ldsdefault'] = "Показать данные СПД";
> 		$admtext['ldson'] = "В�егда";
> 		$admtext['ldsoff'] = "�икогда";
> 		$admtext['ldspermit'] = "Зави�ит от пользователь�ких прав";
> 		$admtext['allow'] = "Разрешить";
> 		$admtext['chooselang'] = "Бы�трое изменение �зыка";
> 		$admtext['optimize'] = "оптимизировать";
> 		$admtext['succoptimized'] = "оптимизаци� произошла";
> 		$admtext['customheader'] = "Шапка (&#60;Header&#62;)";
> 		$admtext['customfooter'] = "Подвал (&#60;Footer&#62;)";
> 		$admtext['custommeta'] = "Тег &#60;meta&#62;";
> 		$admtext['lineending'] = "Конец �троки";
> 		$admtext['backuppath'] = "Папка дл� резервных копий";
> 		$admtext['photopath'] = "Папка дл� фото";
> 		$admtext['headstonepath'] = "Папка дл� надгробий";
> 		$admtext['historypath'] = "Папка дл� и�торий";
> 		$admtext['backuprestoretables'] = "Резервное копирование, во��тановление и оптимизаци� таблиц";
> 		$admtext['shownames'] = "Показать имена живущих";
> 		$admtext['initials'] = "Инициалы";
> 		$admtext['regformat'] = "Рее�тр";
> 		$admtext['stdformat'] = "Стандартный";
> 		$admtext['thumbprefix'] = "Префик� файла изображени�";
> 		$admtext['thumbmaxh'] = "Мак�имальна� вы�ота миниатюры";
> 		$admtext['thumbmaxw'] = "Мак�имальна� ширина миниатюры";
> 		$admtext['thumbsuffix'] = "Увеличение миниатюр";
> 		$admtext['showextended'] = "Показать подробную информацию о фото";
> 		$admtext['shownotes'] = "Показать запи�и";
> 		$admtext['notestogether'] = "При �оответ�твующем �обытии, е�ли возможно";
> 		$admtext['notestogether2'] = "Под �обыти�ми, кроме общих примечаний";
> 		$admtext['notesapart'] = "В �екции запи�ей";
> 		$admtext['lnprefixes'] = "Предлоги (такие как:van, de)";
> 		$admtext['lntogether'] = "Сохранить как ча�ть фамилии";
> 		$admtext['lnapart'] = "Обрабатывать как отдельную ча�ть";
> 		$admtext['detectpfx'] = "Детекци� предлогов при импортировании";
> 		$admtext['lnpfxnum'] = "Количе�тво предлогов (мак�имальное)";
> 		$admtext['specpfx'] = "ИЛИ �ти о�обые предлоги";
> 		$admtext['newmedialinks'] = "Количе�тво новых ��ылок при фото/и�тори�х";
> 		$admtext['maxgedcom'] = "Мак�имальное количе�тво поколений, которые может загрузить GEDCOM";
> 		$admtext['placestable'] = "Таблица ме�т";
> 		//$admtext['hslinkstable'] = "Headstone Links Table";
> 		$admtext['tngdomain'] = "URL �айта";
> 		$admtext['charset'] = "Знаки";
> 		$admtext['time_offset'] = "Разница во времени на �ервере (ча�ы)";
> 		$admtext['backupall'] = "Выбрано �оздание резервной копии";
> 		$admtext['optimizeall'] = "Выбрана оптимизаци�";
> 		$admtext['alltables'] = "Выбранные таблицы";
> 		$admtext['brinstructions'] = "Чтобы выполнить резервное копирование, во��тановить или оптимизировать таблицу, щелкните по �оответ�твующему значку в колонке &#171;Дей�твие&#187; дл� �той таблицы. Дл� не�кольких таблиц надо выбрать дей�твие из выпадающего �пи�ка и нажать кнопку &#171;OK&#187;.";
> 		$admtext['tabstyle'] = "Страница �тилей �рлыков";
> 		$admtext['iconloc'] = "Ме�то дл� меню пиктограмм";
> 		$admtext['topleft'] = "Вверху �лева, над названием";
> 		$admtext['topright'] = "Вверху �права, р�дом � названием";
> 		$admtext['indstart'] = "Пои�к людей на букву";
> 		$admtext['persinfo'] = "Только лична� информаци�";
> 		$admtext['allinfo'] = "В�� информаци�";
> 		$admtext['thumbcols'] = "Столбцы в режиме миниатюр";
> 		$admtext['stdesc'] = "�ачать родо�ловную";
> 		$admtext['stexpand'] = "Развернуто";
> 		$admtext['stcollapse'] = "Свернуто";
> 		$admtext['regnosp'] = "Рее�тр поколений";
> 		$admtext['chshow'] = "В�егда показывать в�ех";
> 		$admtext['chifsp'] = "�е показывать людей без �емьи";
> 		$admtext['restoreall'] = "Во��тановить выбранное";
> 		$admtext['surerestore'] = "Вы уверены, что хотите во��тановить выбранные таблицы?";
> 		$admtext['surerestorets'] = "Вы уверены, что хотите во��тановить �труктуру таблицы? В�� �уще�твующа� информаци� будет утер�на!";
> 		$admtext['backupstruct'] = "Создать резервную копию �труктуры таблицы";
> 		$admtext['tablestruct'] = "Структрура таблицы";
> 		$admtext['brinstructions2'] = "Чтобы �оздать резервную копию или во��тановить �труктуру таблицы, щелкните по �оответ�твующему значку в колонке &#171;Дей�твие&#187; дл� �той таблицы. В�ИМ��ИЕ: Во��тановление �труктуры таблицы приведёт к удалению в�ех �уще�твующих данных!";
> 		$admtext['livedefault'] = "Показать �ведени� о живущих";
> 		$admtext['nodisplay'] = "�е показывать";
> 		$admtext['menudisp'] = "Меню во�произведени�";
> 		$admtext['asicons'] = "В виде пиктограмм";
> 		$admtext['asdrop'] = "В виде развернутого �пи�ка";
> 		$admtext['gendex'] = "Папка GENDEX";
> 		$admtext['modifypedsettings'] = "Изменение параметров конфигурации родо�ловной";
> 		$admtext['leftindent'] = "От�туп �лева";
> 		$admtext['boxnamesize'] = "Размер пр�моугольника имени";
> 		$admtext['namesizeshift'] = "Сдвиг размера пр�моугольника имени";
> 		$admtext['boxdatessize'] = "Размер пр�моугольника дат";
> 		$admtext['datessizeshift'] = "Сдвиг размера пр�моугольника дат";
> 		$admtext['boxcolor'] = "Цвет пр�моугольника";
> 		$admtext['colorshift'] = "Сдвиг цвета (%)";
> 		$admtext['emptycolor'] = "От�ут�твие цвета";
> 		$admtext['bordercolor'] = "Цвет границы";
> 		$admtext['shadowcolor'] = "Цвет тени";
> 		$admtext['boxwidth'] = "Ширина пр�моугольника<br/>(без в�плывающих окон)";
> 		$admtext['boxheight'] = "Вы�ота пр�моугольника<br/>(без в�плывающих окон)";
> 		$admtext['boxalign'] = "Выравнивание пр�моугольника<br/>(без в�плывающих окон)";
> 		$admtext['boxheightshift'] = "Изменение вы�оты пр�моугольника<br/>(без в�плывающих окон)";
> 		$admtext['boxHsep'] = "Горизонтальное разделение в пр�моугольнике";
> 		$admtext['boxVsep'] = "Вертикальное разделение в пр�моугольнике";
> 		$admtext['shadowoffset'] = "Смещение тени";
> 		$admtext['linewidth'] = "Толщина границы";
> 		$admtext['borderwidth'] = "Ширина границы";
> 		$admtext['popupcolor'] = "Цвет в�плывающего окна";
> 		$admtext['popupinfosize'] = "Размер в�плывающего окна �правки";
> 		$admtext['popupinfosizeshift'] = "Изменение размера в�плывающего окна �правки";
> 		$admtext['popuptimer'] = "В�плывающее окно таймера (м�)";
> 		$admtext['pedevent'] = "В�плывающее окно �обыти�";
> 		$admtext['puboxwidth'] = "Ширина пр�моугольника<br/>(� в�плывающим окном)";
> 		$admtext['puboxheight'] = "Вы�ота пр�моугольника<br/>(� в�плывающим окном)";
> 		$admtext['puboxalign'] = "Выравнивание пр�моугольника<br/>(� в�плывающим окном)";
> 		$admtext['puboxheightshift'] = "Изменение вы�оты пр�моугольника<br/>(� в�плывающим окном)";
> 		$admtext['popupspouses'] = "В�плывающие окна �упругов";
> 		$admtext['popupkids'] = "В�плывающие окна детей";
> 		$admtext['popupchartlinks'] = "В�плывающие окна дл� ��ылок";
> 		$admtext['inclphotos'] = "Включить фотографии";
> 		$admtext['overflow'] = "Переполнение";
> 		$admtext['pedcompact'] = "Компактный";
> 		$admtext['pedstandard'] = "Стандартный";
> 		$admtext['pedtextonly'] = "Только тек�т";
> 		$admtext['relchart'] = "Диаграмма отношений";
> 		$admtext['maxupgen'] = "Мак�имальное количе�тво отношений в поколении";
> 		$admtext['left'] = "Слева";
> 		$admtext['right'] = "Справа";
> 		$admtext['center'] = "По центру";
> 		$admtext['mouseover'] = "Движение мышки";
> 		$admtext['mousedown'] = "Клик мышки";
> 		$admtext['ahnentafel'] = "Си�тема &#171;Ahnentafel&#187;";
> 		$admtext['pedbox'] = "Пр�моугольник";
> 		$admtext['hideempty'] = "�е показывать пу�тые";
> 		$admtext['logfilename'] = "Им� файла журнала";
> 		$admtext['maxloglines'] = "Мак�имальное количе�тво �трок в журнале";
> 		$admtext['modifylogsettings'] = "Изменить на�тройки журнала";
> 		$admtext['badhosts'] = "И�ключить имена хо�тов";
> 		$admtext['admin'] = "Admin";
> 		$admtext['text_public'] = "(Общедо�тупный)";
> 		$admtext['saveimportstate'] = "Сохранить �тату� импорта";
> 		$admtext['allowresume'] = "Сохранить, чтобы вернуть��, е�ли импортировани� не произойдет";
> 		$admtext['modifyimportsettings'] = "Изменить на�тройки конфигурации импортировани�";
> 		$admtext['embeddedmedia'] = "В�троенное медиа";
> 		$admtext['assignnames'] = "Разрешить TNG давать названи� в�троенному медиа";
> 		$admtext['localphotopath'] = "Локальный(е) путь(и) дл� фотографий";
> 		$admtext['localdocpath'] = "Локальный(е) путь(и) дл� и�торий";
> 		$admtext['nopathmatch'] = "Е�ли локальный путь �овпадает";
> 		$admtext['wholepath'] = "Импортировать ве�ь путь";
> 		$admtext['justname'] = "Импортировать только название файла";
> 		$admtext['gedpath'] = "Папка GEDCOMа  (Импорт/Эк�порт)";
> 		$admtext['makefolder'] = "Создать папку";
> 		$admtext['blankchangedt'] = "Е�ли Дата изменений от�ут�твует";
> 		$admtext['usetoday'] = "И�пользовать �егодн�шнее чи�ло";
> 		$admtext['useblank'] = "О�тавить без изменений";
> 		$admtext['nobirthdate'] = "Принимать при от�ут�твии даты рождени�";
> 		$admtext['persliving'] = "Человек ещё жив";
> 		$admtext['persdead'] = "Человека нет в живых";
> 		$admtext['nodeathdate'] = "Принимать при от�ут�твии даты �мерти <br />е�ли �тарше, чем";
> 		$admtext['pedconfigsettings'] = "�а�тройки диаграмм";
> 		$admtext['usepopups'] = "�ачальный вид";
> 		$admtext['maxpedgens'] = "Мак�имальное количе�тво поколений";
> 		$admtext['dbsection'] = "База данных";
> 		$admtext['tablesection'] = "�азвани� таблиц";
> 		$admtext['foldersection'] = "Пути и папки";
> 		$admtext['sitesection'] = "Дизайн �айта и определение";
> 		$admtext['privsection'] = "Конфиденциально�ть";
> 		$admtext['namesection'] = "Имена";
> 		$admtext['descsection'] = "Потомки";
> 		$admtext['miscsection'] = "Разное";
> 		$admtext['mediatable'] = "Таблица медифайлов";
> 		$admtext['pedanddesc'] = "Общие �лементы";
> 		$admtext['descchart'] = "Диаграмма прои�хождени�";
> 		$admtext['pedchart'] = "Диаграмма генеалогиче�кого древа";
> 		$admtext['initgens'] = "�ачальные поколени�";
> 		$admtext['mediapath'] = "Папка дл� медиафайлов";
> 		$admtext['documentpath'] = "Папка дл� документов";
> 		$admtext['localdocumentpath'] = "Ме�тный(е) путь(и) дл� документов";
> 		$admtext['localotherpath'] = "Ме�тный(е) путь(и) дл� о�тавшего�� медиа";
> 		$admtext['imgmaxh'] = "Мак�имальна� вы�ота изображени�";
> 		$admtext['imgmaxw'] = "Мак�имальна� ширина изображени�";
> 		$admtext['succdel'] = "у�пешно удалено";
> 		$admtext['delbkups'] = "Удалить выбранные резервные копии";
> 		$admtext['suredelbk'] = "Вы уверены, что хотите удалить выбранные резервные копии?";
> 		$admtext['showhome'] = "Показать ��ылку на главную �траницу";
> 		$admtext['showsearch'] = "Показать ��ылку пои�ка";
> 		$admtext['showlogin'] = "Показать ��ылку входа/выхода";
> 		$admtext['showprint'] = "Показать ��ылку дл� печати";
> 		$admtext['showbmarks'] = "Показать ��ылку &#171;Добавить закладку&#187;";
> 		$admtext['server'] = "(�ервер)";
> 		$admtext['client'] = "(клиент)";
> 		$admtext['sitename'] = "�азвание �айта";
> 		$admtext['site_desc'] = "Опи�ание �айта";
> 		$admtext['privnote'] = "Префик� дл� личных заметок";
> 		$admtext['custvars'] = "Примечание: Свои на�тройки вы можете запи�ать в &#171;customconfig.php&#187; (откройте �тот файл в тек�товом редакторе и прочитайте ин�трукции).";
> 		$admtext['blockemail'] = "Блокировать предложени� или реги�трацию новых пользователей, где";
> 		$admtext['addrcontains'] = "�дре� �одержит";
> 		$admtext['msgcontains'] = "�ообщение �одержит";
> 		$admtext['reqloginset'] = "&#171;Требовать вход&#187; должено быть у�тановлено Да, чтобы включить �ту опцию";
> 		$admtext['treerestrict'] = "Ограничить до�туп к назначенному древу";
> 		$admtext['mapconfigsettings'] = "�а�тройки карты";
> 		$admtext['modifymapsettings'] = "Изменить параметры конфигурации карты";
> 		$admtext['maptype'] = "Тип карты:";
> 		$admtext['maphybrid'] = "Гибрид";
> 		$admtext['mapsatellite'] = "Спутник";
> 		$admtext['mapdimsind'] = "Размеры индивидуальной �траницы";
> 		$admtext['mapdimshst'] = "Размеры �траницы надгробий";
> 		$admtext['mapdimsadm'] = "Размеры �траницы �дмини�тратора";
> 		$admtext['mapwidth'] = "Ширина (% в px)";
> 		$admtext['mapheight'] = "Вы�ота (px)";
> 		$admtext['mapstlat'] = "�ачальна� Широта";
> 		$admtext['mapstlong'] = "�ачальна� Долгота";
> 		$admtext['startoff'] = "Скрыть навигационные карты дл� запу�ка";
> 		$admtext['conslpins'] = "Объединить повтор�ющие�� маркеры";
> 		$admtext['ssenabled'] = "Включить �лайд-шоу";
> 		$admtext['ssrepeat'] = "Слайд-шоу �вто повтор";
> 		$admtext['sysinfo'] = "Информаци� о �реде веб-�айта.";
> 		$admtext['albumlinkstable'] = "Медиа��ылки в альбоме";
> 		$admtext['addresstable'] = "�дре�а";
> 		$admtext['statestable'] = "Штаты";
> 		$admtext['countriestable'] = "Страны";
> 		$admtext['notelinkstable'] = "С�ылки на заметки";
> 		$admtext['medialinkstable'] = "Медиа��ылки";
> 		$admtext['saveimporttable'] = "Параметры импорта";
> 		$admtext['brlinkstable'] = "С�ылки на ветви";
> 		$admtext['temptable'] = "Временна�";
> 		$admtext['tleventstable'] = "Хронологи�";
> 		$admtext['album2entitiestable'] = "С�ылки на альбомы";
> 		$admtext['doctype'] = "Тип документа (&#60;!DOCTYPE&#62;)";
> 		$admtext['cemrows'] = "Мак�имальное количе�тво �трок в �толбце (приблизительно)";
> 		$admtext['cemblanks'] = "Опу�кать &#171;�еизве�тные&#187; категории";
> 		$admtext['success'] = "У�пешно";
> 		$admtext['fexists'] = "�е удало�ь. Папка уже �уще�твует.";
> 		$admtext['fmanual'] = "�е удало�ь. Создайте � помощью FTP-программы или �етевого файлового менеджера.";
> 		$admtext['maintmode'] = "Режим об�луживани�";
> 		$admtext['maintexp'] = "В�е до�тупы к базам данных временно недо�тупны из за об�луживани� �айта. Пожалуй�та, повторите попытку позже. Е�ли регул�рные функции не возобнов�ть�� в течение не�кольких ча�ов по�ле �того �ообщени�, пожалуй�та, �в�жите�ь � админи�трацией �айта.";
> 		$admtext['defimpopt'] = "Вариант замены по умолчанию";
> 		$admtext['seltable'] = "Пожалуй�та, выберите хот� бы одну таблицу.";
> 		$admtext['renumber'] = "Перенумеровать ID";
> 		$admtext['idtype'] = "Тип ID";
> 		$admtext['mindigits'] = "Минимум Цифр";
> 		$admtext['niprefix'] = "�е включа� префик� ID";
> 		$admtext['finreseq'] = "Готовые переупор�дочени�";
> 		$admtext['recsreseq'] = "records resequenced";
> 		$admtext['needmaint'] = "Дл� запу�ка �той утилиты необходимо быть в режиме об�луживани� (перейдите в меню &#171;�а�тройка >> Конфигураци� >> Общие параметры&#187;)";
> 		$admtext['reseqwarn'] = "<strong>ПРЕДУПРЕЖДЕ�ИЕ:</strong> Повторное переупор�дочение идентификаторов может приве�ти к нарушению внешних ��ылок на ваш �айт или указанию на ошибочные ме�тоположени�.";
> 		$admtext['subroot'] = "Путь конфигурации";
> 		$admtext['hidechr'] = "Скрыть �тикетки крещени�";
> 		$admtext['datefmt'] = "Чи�ловое предпочтение даты";
> 		$admtext['dayfirst'] = "День/Ме��ц/Год";
> 		$admtext['monthfirst'] = "Ме��ц/День/Год";
> 		$admtext['exusers'] = "И�ключа� имена пользователей";
> 		$admtext['allowreg'] = "Разрешить реги�трацию новых пользователей";
> 		$admtext['localhspath'] = "Ме�тный путь (пути) надгробного камн�";
> 		$admtext['pardata'] = "Данные родителей на личной �транице";
> 		$admtext['pnoevents'] = "�е показывать �обыти�";
> 		$admtext['pstdonly'] = "Показать только �тандартные �емейные �обыти�";
> 		$admtext['palldata'] = "Показать в�е �обыти� и медиа";
> 		$admtext['servertime'] = "Серверное врем�";
> 		$admtext['sitetime'] = "и врем� �айта";
> 		$admtext['srexpl'] = "�еоб�зательно. И�пользуйте аб�олютный путь, как в корневой папке, переме�тите �ледующие файлы в папку конфигурации<strong> �разу </strong> по�ле �охранени� и �делайте их до�тупными дл� запи�и (664 разрешени�): config.php, customconfig.php , importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
> 		$admtext['mapstzm'] = "Ма�штаб по умолчинию";
> 		$admtext['mapfoundzm'] = "Ма�штаб по положению";
> 		$admtext['rrnum'] = "Запи�ь номера отчёта";
> 		$admtext['progint'] = "Интервал выполнени� (м�)";
> 		$admtext['timechart'] = "Диаграмма шкалы времени";
> 		$admtext['tcheight'] = "Вы�ота Диаграммы";
> 		$admtext['distances'] = "В�е ра��то�ни� измер�ют�� в пик�ел�х.";
> 		$admtext['mpixels'] = "Пик�ели между ме��цами";
> 		$admtext['ypixels'] = "Пик�ели между годами";
> 		$admtext['ymult'] = "Количе�тво лет между метками годов";
> 		$admtext['mpct'] = "Процент по вертикали дл� ме��цев";
> 		$admtext['ypct'] = "Процент по вертикали дл� годов";
> 		$admtext['inclevs'] = "Включать �обыти�";
> 		$admtext['allevs'] = "В�е �обыти�";
> 		$admtext['rangeevs'] = "Только �обыти�, которые прои�ходили в период жизни людей на диаграмме";
> 		$admtext['tcwidth'] = "�ачальна� ширина графика";
> 		$admtext['simile'] = "Включить Simile TimeLine";
> 		$admtext['pstartoff'] = "Скрыть общедо�тупные карты, чтобы начать";
> 		$admtext['maxrels'] = "Мак�имум отношений";
> 		$admtext['initrels'] = "�ачальные отношени�";
> 		$admtext['templateconfigsettings'] = "�а�тройки шаблонов";
> 		$admtext['modifytemplatesettings'] = "Изменить параметры конфигурации шаблонов";
> 		$admtext['ucsurnames'] = "В�е фамилии в верхнем реги�тре";
> 		$admtext['maxnoteprev'] = "Мак�имальное количе�тво �имволов в �пи�ках примечаний";
> 		$admtext['mailreg'] = "Почта и реги�траци�";
> 		$admtext['autoapp'] = "�втоматиче�ка� активаци� новых пользователей";
> 		$admtext['inclpwd'] = "Добавить пароль в привет�твенное пи�ьмо";
> 		$admtext['ackemail'] = "Отправить почту подтверждени�";
> 		$admtext['fromadmin'] = "Отправить в�ю почту от указанного выше адре�а";
> 		$admtext['autotree'] = "Создать новое дерево дл� пользовател�";
> 		$admtext['modspath'] = "Папка дл� модов";
> 		$admtext['extspath'] = "Папка дл� ра�ширений";
> 		$admtext['encrtype'] = "Тип шифровани�";
> 		$admtext['none'] = "Без шифровани�";
> 		$admtext['imgviewer'] = "Включить про�мотрщик изображений";
> 		$admtext['docsonly'] = "Только документы";
> 		$admtext['imgvheight'] = "Вы�ота про�мотрщика изображений";
> 		$admtext['flex'] = "В�егда показывать изображение полно�тью";
> 		$admtext['setheight'] = "Фик�ированна� (640px)";
> 		$admtext['places1tree'] = "�азначить древе�ам запи�и � ме�тами";
> 		$admtext['convert'] = "Преобразовать";
> 		$admtext['convexpl'] = "(Это назначит в�е текущие ме�та дл� выбранного генеалогиче�кого древа)";
> 		$admtext['mergeexpl'] = "(Это приведёт к удалению запи�ей генеалогиче�кого древа из в�ех назначенных ме�т)";
>         $admtext['nocutoff'] = "О�тавьте пу�тым или равным нулю, чтобы убрать ограничение";
>         $admtext['usesmtp'] = "И�пользовать аутентификацию SMTP";
>         $admtext['mailhost'] = "Им� хо�та SMTP";
>         $admtext['mailuser'] = "Им� пользовател� почты";
>         $admtext['mailpass'] = "Пароль почты";
>         $admtext['mailport'] = "�омер порта";
> 		$admtext['showshare'] = "Показать ��ылку дл� общего до�тупа";
> 		$admtext['defpgsize'] = "Размер �траницы PDF по умолчанию";
> 		$admtext['mapterrain'] = "Карта ме�тно�ти";
> 		$admtext['maproadmap'] = "Дорожна� карта";
> 		$admtext['usedefthumbs'] = "И�пользовать миниатюры по умолчанию";
>         $admtext['autogeo'] = "Геокодировать в�е новые ме�та";
>         $admtext['revmail'] = "Уведомл�ть о про�мотренных материалах";
>         $admtext['assumepriv'] = "Предполагает�� приватный, е�ли не умер �ти многие годы";
>         $admtext['calstart'] = "Первый день недели";
> 		$admtext['edit_timeout'] = "Изменить тайм-аут (минуты)";
> 		$admtext['shownamespr'] = "Показать имена дл� приватных";
> 		$admtext['tables'] = "Таблицы";
> 		$admtext['regnotes'] = "Показать заметки и пользователь�кие �обыти� в рее�тре";
> 		$admtext['collation'] = "Сопо�тавление";
> 		$admtext['collationexpl'] = "(о�тавьте пу�тым, чтобы прин�ть значение по умолчанию)";
> 		$admtext['scrollcite'] = "Прокрутка цитат";
> 		$admtext['hidemedia'] = "Скрыть личные медиа";
> 		$admtext['searchchoice'] = "С�ылка &#171;Пои�к&#187;";
> 		$admtext['quicksearch'] = "Бы�трый пои�к";
> 		$admtext['advsearch'] = "Ра�ширенный пои�к";
> 		$admtext['pedvertical'] = "Вертикальный";
> 		$admtext['vboxwidth'] = "Ширина пр�моугольника";
> 		$admtext['vboxheight'] = "Вы�ота пр�моугольника";
> 		$admtext['vspacing'] = "Вертикальный интервал";
> 		$admtext['vchart'] = "Вертикальна� диаграмма";
> 		$admtext['reuseids'] = "Повторно и�пользовать удалённые ID";
> 		$admtext['lastimport'] = "Показать по�ледний импорт";
>         $admtext['mailenc'] = "Шифрование";
> 		$admtext['dbport'] = "Порт";
> 		$admtext['dbsocket'] = "Сокет";
> 		//$admtext['mhrequests'] = "Partner Requests";
> 		$admtext['prefsection'] = "Префик�ы и �уффик�ы";
> 		$admtext['personprefix'] = "Префик� человека";
> 		$admtext['personsuffix'] = "Суффик� человека";
> 		$admtext['familyprefix'] = "Префик� �емьи";
> 		$admtext['familysuffix'] = "Суффик� �емьи";
> 		$admtext['sourceprefix'] = "Префик� и�точника";
> 		$admtext['sourcesuffix'] = "Суффик� и�точника";
> 		$admtext['repoprefix'] = "Префик� хранилища";
> 		$admtext['reposuffix'] = "Суффик� хранилища";
> 		$admtext['noteprefix'] = "Префик� заметки";
> 		$admtext['notesuffix'] = "Суффик� заметки";
> 		$admtext['mobilesection'] = "Мобильна� вер�и�";
> 		$admtext['mobilesite'] = "Им� мобильного �айта будет";
> 		$admtext['menubar'] = "в �троке мобильного меню";
> 		$admtext['belowbar'] = "под �трокой мобильного меню";
> 		$admtext['responsivetables'] = "Включить адаптивные таблицы";
> 		$admtext['tabletype'] = "Тип адаптивной таблицы";
> 		$admtext['enablemodeswitch'] = "Включить переключатель режима адаптивных таблиц";
> 		$admtext['enableminimap'] = "Включить Mini Map plugin";
> 		$admtext['showtasks'] = "Показать �ообщени� о важных задачах";
> 		$admtext['showtotals'] = "Показывать итоговые �уммы в меню админи�тратора";
> 		$admtext['backupdays'] = "Оповещение, е�ли резервна� копи� от�ут�твует в течение не�кольких дней";
> 		$admtext['backupnote'] = "ПРИМЕЧ��ИЕ: Е�ли ваша база данных очень больша�, вы можете и�пользовать незави�имый ин�трумент (например, mysqldump или phpMyAdmin) дл� резервного копировани� и во��тановлени� ваших таблиц. По крайней мере один из них должен быть до�тупен в панели управлени� вашего �айта.";
> 		//$admtext['showmatches'] = "Show MyHeritage matches";
> 		//$admtext['mhconfidence'] = "Minimum confidence level";
> 		//$admtext['mhmatchtype'] = "Match type";
> 		$admtext['hidedna'] = "Скрыть в�е �траницы и данные Д�К";
>         $admtext['assumeliving'] = "Предполагает��, что живой, е�ли не умер за �ти много лет";
> 		$admtext['mapkey'] = "Ключ карты";
> 		//added in 12.0
> 		$admtext['sitekey'] = "Ключ �айта reCAPTCHA";
> 		$admtext['secret'] = "Секрет reCAPTCHA";
> 		$admtext['mediadel'] = "Удалить физиче�кий файл при удалении";
> 		$admtext['onrequest'] = "По запро�у";
> 		$admtext['mediathumbs'] = "Показать фотографии в одной �троке";
> 		$admtext['footermsg'] = "Тек�т в нижнем колонтитуле";
> 		$admtext['templatestable'] = "�а�тройки шаблона";
> 		$admtext['mediatrees'] = "Отдельные медиафайлы в папках генеалогиче�кого древа";
> 		$admtext['mediaexpl'] = "xxx медиафайлы перемещены";
> 		$admtext['dnatestscomparecolors'] = "Сравнение цветов заголовков �толбцов те�тов Y-DNA";
> 		$admtext['getcolorcodes'] = "Получить цветовые коды зде�ь";
> 		$admtext['mainbackground'] = "Цвет фона о�новного заголовка";
> 		$admtext['modebackground'] = "Цвет фона режима значений";
> 		$admtext['fastmutbackground'] = "Цвет фона бы�трой мутации";
> 		$admtext['background1_12'] = "Цвет фона маркеров 1-12";
> 		$admtext['background13_25'] = "Цвет фона маркеров 13-25";
> 		$admtext['background26_37'] = "Цвет фона маркеров 26-37";
> 		$admtext['background38_67'] = "Цвет фона маркеров 38-67";
> 		$admtext['background111'] = "Цвет фона маркеров 68-111";
> 		$admtext['textcolor'] = "Цвет тек�та";
> 		$admtext['show_test_number'] = "Показать номер те�та Д�К публично";
> 		$admtext['excludefromancsn'] = "И�ключить из фамилий предков";
> 		$admtext['upperancsunames'] = "Фамилии Предков в верхнем реги�тре";
> 		$admtext['autofillancsunames'] = "�втозаполнение Фамилий Предков";
> 		$admtext['colorschemer'] = "ColorSchemer - онлайн генератор цветовой �хемы";
> 		//added in 12.0.1
> 		$admtext['cookieapproval'] = "Показать �ообщение об утверждении cookie";
> 		$admtext['dataprotectmsg'] = "Показать ��ылку на политику защиты данных";
> 		$admtext['nointernet'] = "Я и�пользую TNG в автономном режиме";
> 		$admtext['askconsent'] = "Запро� �огла�и� в отношении личной информации";
> 		//added in 13.0
> 		$admtext['coerce'] = "Изменить префик�ы в �оответ�твии � на�тройками TNG";
> 		$admtext['sortevents'] = "Сортировать �обыти� по";
> 		$admtext['sortbydate'] = "Дата �обыти�";
> 		$admtext['sortbytype'] = "Тип �обыти�";
> 		$admtext['allowsuggest'] = "Разрешить предложени� от по�етителей";
> 		$admtext['livingchecked'] = "У�танавливать флаг 'Жив' дл� новых людей и �емей";
> 		$admtext['maxmarried'] = "У�танавливать флаг 'Жив', е�ли �емь� в браке<br/>много лет";
> 		$admtext['imagetags'] = "Пр�моугольники";
> 		$admtext['allowcsv'] = "Разрешить загрузку CSV дл� отчетов";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Параметры резервного копировани�";
> 		$admtext['dosql'] = "Эк�порт в формате SQL";
> 		$admtext['dodrop'] = "Включать DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Включать CREATE TABLE";
> 		$admtext['onrestore'] = "Во��тановить на�тройки";
> 		$admtext['dodel'] = "Сначала удалить предыдущий контент";
> 		$admtext['download'] = "Загрузить";
> 		$admtext['altbirthtypes'] = "Событи� альт. рождени�";
> 		$admtext['dtformat'] = "Формат таблиц";
> 		$admtext['conchart'] = "Схема �оединений";
> 		$admtext['maxropt'] = "Мак�имальное количе�тво запу�ков пои�ка �оединений";
> 		$admtext['maxlopt'] = "Мак�имальна� длина �оединительных путей";
> 		$admtext['showtxtopt'] = "Отображение тек�тового указани� пути";
> 		$admtext['compactboxopt'] = "Показать пер�ональные карточки в компактной форме";
> 		$admtext['sortbyopt'] = "Сортировка путей по";
> 		$admtext['anchoridopt'] = "ID прив�зки";
> 		$admtext['maxmopt'] = "Мак�имальное количе�тво браков в �в�зи";
> 		$admtext['saveincfg'] = "Сохранить пути в конфигурации (�м. Общие на�тройки)";
> 		break;
> 
> 	//findpersonform.php
> 	case "findpersonform":
> 		$admtext['enternamepart'] = "Введите ча�ть имени и/или фамилии";
> 		$admtext['pleasenamepart'] = "Пожалуй�та, Введите ча�ть имени и/или фамилии.";
> 		$admtext['enternamepart2'] = "Введите идентификационный номер человека или ча�ть имени и/или фамилии";
> 		break;
> 
> 	//findplace.php, findplaceform.php
> 	case "findplace":
> 		$admtext['pleaseplacepart'] = "Пожалуй�та, Введите ча�ть названи� ме�та.";
> 		$admtext['addnewplace'] = "Добавить новое ме�то";
> 		$admtext['createplace'] = "Сделать запи�ь дл� нового ме�та";
> 		$admtext['modifyplace'] = "Изменить �уще�твующее ме�то";
> 		$admtext['editexistingplaceinfo'] = "Изменить информацию дл� ранее введенного ме�та";
> 		$admtext['enterplace'] = "Введите, пожалуй�та, название ме�та.";
> 		$admtext['newplaceinfo'] = "Информаци� о новом ме�те";
> 		$admtext['existingplaceinfo'] = "Суще�твующа� информаци� об �том ме�те";
> 		$admtext['changestoplace'] = "Изменени� в �том ме�те";
> 		$admtext['selectplaceaction'] = "Выбрать ме�то и дей�твие";
> 		$admtext['mergeplaces'] = "Объединить ме�та";
> 		$admtext['findmerge'] = "�айти ме�та дл� объединени�";
> 		$admtext['selectplacemerge'] = "Выбрать ме�та дл� объединени�";
> 		$admtext['mcol1'] = "Добавить<br/>�то<br/>(�тереть)";
> 		$admtext['mcol2'] = "вме�те<br/>�<br/>(держать)";
> 		$admtext['pmsucc'] = "Объединение ме�т произошло у�пешно";
> 		$admtext['nomerge'] = "�ечего объединить";
> 		$admtext['enterkeep'] = "Выберите, пожалуй�та, цель объединени�.";
> 		$admtext['backmerge'] = "Повторный пои�к";
> 		$admtext['confdeleteplace'] = "Вы уверены, что хотите удалить �то ме�то?";
> 		$admtext['propagate'] = "Изменить названи� ме�т в �уще�твующих �обыти�х";
> 		$admtext['confdelcemlink'] = "Вы уверены, что хотите разорвать �в�зь � �тим кладбищем?";
> 		$admtext['nocoords'] = "От�ут�твует широта или долгота";
> 		$admtext['istemple'] = "Это топоним храма СПД";
> 		$admtext['findtemples'] = "�айти только коды храма СПД";
> 		$admtext['choosecem'] = "Выберите кладбище";
> 		$admtext['geocopy'] = "Скопируйте данные геокода ниже на �то кладбище";
> 		$admtext['linkcem'] = "Св�жите �то ме�то � кладбищем";
> 		$admtext['cemsavail'] = "Спи�ок включает в �еб� только кладбища, которые ещё не �в�заны � ме�том";
> 		$admtext['nocemsavail'] = "�е �уще�твует  кладбищ, или каждое кладбище уже было �в�зано � ме�том.";
>         //added in 9.0.0
>         $admtext['geocode'] = "Геокодировать";
>         $admtext['ignoreall'] = "Игнорировать в�ё";
>         $admtext['usefirst'] = "И�пользовать первое �овпадение";
>         $admtext['multchoice'] = "Е�ли найдено не�колько результатов дл� ме�та:";
>         $admtext['geoexpl'] = "Геокодирование в�ех ме�т без координат широты и долготы";
>         $admtext['geocoding'] = "Геокодирование...";
>         $admtext['backgeo'] = "Вернуть�� в меню Геокодировани�";
>         $admtext['limit'] = "Лимит:";
>         $admtext['nolimit'] = "Безлимитный";
> 		$admtext['blankplace'] = "�азвание пу�того ме�та";
>         $admtext['toomany'] = "Игнорирует�� (�лишком много результатов)";
> 		$admtext['treesgone'] = "�азначени� деревьев удалены из запи�ей в�ех ме�т";
> 		//added in 11.0.0
> 		$admtext['nolevel'] = "Уровень ме�та не у�тановлен";
> 		$admtext['placenotsaved'] = "Ме�то не �охранено. Другое ме�то � таким названием уже �уще�твует. Пожалуй�та, объедините �ти ме�та.";
> 		//added in 12.0.0
> 		$admtext['noevents'] = "�ет �в�занных �обытий";
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "�е производить геокодирование";
>     	break;
> 		
> 	//generateID.php
> 	case "generateID":
> 		$admtext['generatenewid'] = "Создать новый идентификационный номер";
> 		$admtext['generating'] = "Создает��... Подождите немного!";
> 		break;
> 	
> 	//secondary.php
> 	case "secondary":
> 		$admtext['trackinglines'] = "Ра�читывают�� линии родов...";
> 		$admtext['finishedtracking'] = "Ра�чет линий родов закончен.";
> 		$admtext['sortchildren'] = "Сортировать детей";
> 		$admtext['sortingchildren'] = "Сортирование детей...";
> 		$admtext['sortspouses'] = "Сортировать �упругов";
> 		$admtext['sortingspouses'] = "Сортировка �упругов...";
> 		$admtext['relabelbranches'] = "Отметить ветви";
> 		$admtext['relabeling'] = "Отметка ветвей...";
> 		$admtext['creatinggendex'] = "Создает�� файл GENDEX...";
> 		$admtext['finishedgendex'] = "Закончил �оздание файла GENDEX.";
> 		//added in 8.0.0
> 		$admtext['postgdx'] = "Где разме�тить файл GENDEX";
> 		//added in 10.0.0
> 		$admtext['evalmedia'] = "Обрезать меню &#171;Медиа&#187;";
> 		$admtext['evaluating'] = "Под�чёт медиафайлов";
> 		$admtext['finished'] = "Завершено";
> 		//added in 12.0.0
> 		$admtext['refreshliving'] = "Обновить живых/умерших";
> 		$admtext['chtodeceased'] = "Изменён на умерший";
> 		$admtext['chtoliving'] = "Изменён на живущий";
> 		$admtext['chtoprivate'] = "Изменен на приватный";
> 		$admtext['makeprivate'] = "Сделать приватным";
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Вернуть�� к ин�трументам по�ле импорта";
> 		break;
> 
> 	//newlanguage.php
> 	case "language":
> 		$admtext['addnewlanguage'] = "Добавить новый �зык";
> 		$admtext['enterlangdisplay'] = "Вве�ти название �зыка.";
> 		$admtext['enterlangfolder'] = "�абрать название папки, где будут �охран�ть�� файлы дл� �того �зыка.";
> 		$admtext['newlanguageinfo'] = "Информаци� о новом �зыке";
> 		$admtext['langdisplay'] = "Отображаемое название";
> 		$admtext['createlanguage'] = "Сделать запи�ь дл� нового �зыка";
> 		$admtext['nolanguages'] = "�ет запи�и о �зыке";
> 		$admtext['conflangdelete'] = "Вы уверены, что хотите удалить �тот �зык?";
> 		$admtext['existinglanguages'] = "Информаци� о �уще�твующем �зыке";
> 		$admtext['modifylanguage'] = "Изменить �уще�твующий �зык";
> 		$admtext['changestolanguage'] = "Изменени� в �зыке";
> 		$admtext['charset'] = "�абор �имволов";
> 		$admtext['editexistinglanguage'] = "Изменить, удалить или добавить �зык";
> 		break;
> 	
> 	//addtree.php, trees.php, edittree.php, deletetree.php, newtree.php, updatetree.php
> 	case "trees":
> 		$admtext['createtree'] = "Создание запи�и дл� нового генеалогиче�кого древа";
> 		$admtext['notrees'] = "�ет запи�ей о генеалогиче�ком древе";
> 		$admtext['existingtrees'] = "Информаци� о �уще�твующем генеалогиче�ком древе";
> 		$admtext['editexistingtree'] = "Изменить информацию об уже добавленном генеалогиче�ком древе";
> 		$admtext['treename'] = "�азвание генеалогиче�кого древа";
> 		$admtext['owner'] = "Владелец";
> 		$admtext['conftreedelete'] = "Вы уверены, что хотите удалить �то генеалогиче�кое древо, а также в�е, �в�занные � ним �лементы?";
> 		$admtext['conftreeclear'] = "Вы уверены, что хотите удалить в�е �ведени� об �том генеалогиче�ком древе?";
> 		$admtext['changestotree'] = "Изменени� в генеалогиче�ком древе";
> 		$admtext['newtreeinfo'] = "Информаци� о новом генеалогиче�ком древе";
> 		$admtext['existingtreeinfo'] = "Информаци� о �уще�твующем генеалогиче�ком древе";
> 		$admtext['modifytree'] = "Изменить �уще�твующее генеалогиче�кое древо";
> 		$admtext['succcleared'] = "у�пешно удалено";
> 		$admtext['gedcomextraction'] = "Запретить пользовател�м загружать GEDCOM";
> 		$admtext['gedexport'] = "Эк�портировать GEDCOM";
> 		$admtext['exporting'] = "Эк�портирует GEDCOM...";
> 		$admtext['ifexportfails'] = "Е�ли �к�порт не произойдет,";
> 		$admtext['finishedexporting'] = "Закончил �к�порт GEDCOMа";
> 		$admtext['backtotrees'] = "Вернуть�� к генеалогиче�ким древе�ам";
> 		$admtext['downloadged'] = "Загрузить GEDCOM";
> 		$admtext['lastimport'] = "Импорт";
> 		$admtext['treeexists'] = "Генеалогиче�кое древо � выбранным ID уже �уще�твует. Выберите другой ID и попробуйте �нова.";
> 		$admtext['exportmedia'] = "Эк�порт медиалинков";
> 		$admtext['changetree'] = "Помен�ть Древо";
> 		$admtext['newtree'] = "�овое Древо";
> 		$admtext['currtree'] = "Текущее Древо";
> 		$admtext['chwarn'] = "ПРЕДУПРЕЖДЕ�ИЕ: Эта операци� удалит в�е �емейные ��ылки, цитаты и другие ��ылки на �тот объект в текущем дереве.";
> 		$admtext['keepprivate'] = "Скрыть информацию о владельце";
> 		$admtext['exppaths'] = "Ме�тные пути дл�";
> 		$admtext['nopdf'] = "Запретить пользовател�м �оздавать PDF файлы";
> 		//added in 10.0.0
> 		$admtext['exprivate'] = "И�ключить приватные";
> 		$admtext['exliving'] = "И�ключить живущих";
> 		$admtext['importfilename'] = "Им� файла импорта";
> 		//added in 13.0
> 		$admtext['exnotes'] = "И�ключить заметки";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Включать медиафайлы в архив";
> 		$admtext['downloadzip'] = "Загрузить ZIP";
> 		break;
> 
> 	//adduser.php, users.php, edituser.php, deleteuser.php, newuser.php, updateuser.php
> 	case "users":
> 		$admtext['addnewuser'] = "Добавить нового пользовател�";
> 		$admtext['createuser'] = "Сделать запи�ь дл� нового пользовател�";
> 		$admtext['nousers'] = "�ет запи�и дл� пользовател�";
> 		$admtext['existingusers'] = "Информаци� о �уще�твующем пользователе";
> 		$admtext['editexistinguser'] = "Изменить информацию об уже добавленном пользователе";
> 		$admtext['confuserdelete'] = "Вы уверены, что хотите удалить �того пользовател�?";
> 		$admtext['changestouser'] = "Изменени� в пользователе";
> 		$admtext['enteruserpassword'] = "Введите пароль.";
> 		$admtext['enterusername'] = "Введите им� пользовател�.";
> 		$admtext['newuserinfo'] = "Информаци� о новом пользователе";
> 		$admtext['existinguserinfo'] = "Информаци� о �уще�твующем пользователе";
> 		$admtext['modifyuser'] = "Изменить �уще�твующего пользовател�";
> 		$admtext['allow_living'] = "Разрешить про�мотр информации дл� живых людей";
> 		$admtext['allow_lds'] = "Разрешить про�мотр данных СПД";
> 		$admtext['enteruserdesc'] = "Введите опи�ание имени пользховател�.";
> 		$admtext['enterpassword'] = "введите пароль.";
> 		$admtext['admin'] = "Admin";
> 		$admtext['firstuser'] = "Первый пользователь, которого вы введете, будет админи�тратором TNG-�айта (генеалогиче�кое древо �Е выбрано) и будет иметь до�туп ко в�ем на�тройкам TNG-�айта.";
> 		$admtext['userfailed'] = "ОШИБК�: �тот пользователь не может быть �оздан, потому что уже �уще�твует пользователь � таким именем.";
> 		$admtext['allow_ged'] = "Разрешить �оздание файлов GEDCOM";
> 		$admtext['assigned'] = "Выдано";
> 		$admtext['treemsg'] = "�еоб�зательный. От�ут�твие при�воени� пользователю генеалогиче�кого древа приведёт к тому, что у пользовател� будут права дл� в�ех древе� и в�ех ветвей. �дмини�тратору �айта не �ледует назначать дерево.";
> 		$admtext['branchmsg'] = "�еоб�зательный. При�воение ветви пользователю ограничивает права, предо�тавленные на �той �транице, назначенной ветви в выбранном дереве.";
> 		$admtext['accesslimits'] = "Ограничени� до�тупа:";
> 		$admtext['rights'] = "Права:";
> 		$admtext['realname'] = "Им�";
> 		$admtext['gedcom'] = "GEDCOM";
> 		$admtext['newusers'] = "Реги�траци�(и) новых пользователей";
> 		$admtext['editnewusers'] = "Обработка запи�ей дл� вновь зареги�трированных пользователей. �овые пользователи получают права по�ле обработки реги�трации.";
> 		$admtext['nonewusers'] = "�ет новых пользователей";
> 		$admtext['lastlogin'] = "По�ледний вход";
> 		$admtext['tentative_edit'] = "Разрешить рецензирование админи�тратором (только людей, �емей и и�точников)";
> 		$admtext['notify'] = "Сообщить �тому пользователю об активации аккаунта";
> 		$admtext['no_edit'] = "Изменени� �уще�твующих запи�ей <strong>не</strong> разрешено";
> 		$admtext['emailusers'] = "Отправьте E-mail пользовател�м";
> 		//$admtext['sendemailstousers'] = "Send an e-mail to all registered users";
> 		$admtext['emailmessage'] = "E-mail �ообщение пользовател�м";
> 		$admtext['subject'] = "Тема �ообщени�";
> 		$admtext['messagetext'] = "Тек�т �ообщени�";
> 		$admtext['selectgroup'] = "Выберите группу, котора� должна получить E-mail (о�тавить незаполненным, чтобы выбрать в�е группы)";
> 		$admtext['treemailmsg'] = "Выборочно. Выбор генеалогиче�кого древа дает возможно�ть получить �то �ообщение в�ем пользовател�м �того генеалогиче�кого древа.";
> 		$admtext['branchmailmsg'] = "Выборочно. Выбор ветви дает возможно�ть получить �то �ообщение в�ем пользовател�м �той ветви.";
> 		$admtext['send'] = "Отправить E-mail";
> 		$admtext['sentmailmessage'] = "Отправить �ообщение";
> 		$admtext['succmail'] = "Ваше �ообщение отправлено.";
> 		$admtext['mailfailed'] = "При отправке вашего �ообщени� произошла ошибка.";
> 		$admtext['entersubject'] = "Задайте, пожалуй�та, тему �ообщени�.";
> 		$admtext['entermsgtext'] = "�апишите, пожалуй�та, тек�т.";
> 		$admtext['adminonly'] = "Показать только пользователей Admin";
> 		$admtext['dtregistered'] = "Дата реги�трации";
> 		$admtext['dtactivated'] = "Дата активации";
> 		$admtext['no_email'] = "�е отправл�ть общего �ообщени� �тому пользователю";
> 		$admtext['allow_admin'] = "Дать до�туп ко в�ем �и�темным на�тройкам  и функци�м и дать права на в�е генеалогиче�кие древе�а и ветви.";
> 		$admtext['limitedrights'] = "Ограничить до�туп к �ледующему:";
> 		$admtext['allow_edit'] = "Изменени� �уще�твующих запи�ей разрешено (через �траницу админи�тратора)";
> 		$admtext['allow_add'] = "Добавление новых запи�ей разрешено";
> 		$admtext['allow_delete'] = "Удаление �уще�твующих запи�ей разрешено";
> 		$admtext['usrguest'] = "Го�ть";
> 		$admtext['usrguestd'] = "�ет прав добавл�ть, редактировать и удал�ть, ";
> 		$admtext['noadmin'] = "нет прав админи�трировани�";
> 		$admtext['usrsubm'] = "Податель";
> 		$admtext['usrsubmd'] = "Разрешены изменени� подлежащие к ра��мотрению, ";
> 		$admtext['usrcontrib'] = "Помощник";
> 		$admtext['usrcontribd'] = "Добавл�ть информацию, в том чи�ле медиафайлы";
> 		$admtext['usreditor'] = "Редактор";
> 		$admtext['usreditord'] = "Добавить, редактировать и удал�ть в�ю информацию, в том чи�ле  медиа";
> 		$admtext['usradmin'] = "�дмини�тратор";
> 		$admtext['usradmind'] = "В�е права";
> 		$admtext['usrmcontrib'] = "По�тавщик медиафайлов";
> 		$admtext['usrmcontribd'] = "Добавл�ть только медиафайлы";
> 		$admtext['usrmeditor'] = "Редактор медиафайлов";
> 		$admtext['usrmeditord'] = "Добавл�ть, редактировать и удал�ть только медиафайлы";
> 		$admtext['allow_media_edit'] = "Разрешить редактировать только медиафайлы";
> 		$admtext['allow_media_add'] = "Разрешить добавление только медиафайлов";
> 		$admtext['allow_media_delete'] = "Разрешить только удаление медиафайлов";
> 		$admtext['no_add'] = "�ет прав добавл�ть";
> 		$admtext['no_delete'] = "�ет прав удал�ть";
> 		$admtext['roles'] = "Роли";
> 		$admtext['usrcustom'] = "Пользователь�кий";
> 		$admtext['allow_private'] = "Разрешить ра��матривать информацию дл� приватных людей";
> 		$admtext['allow_pdf'] = "Разрешить �качивать PDF файлы";
> 		//changed in 12.0.0
> 		$admtext['allow_profile'] = "Разрешить редактировать профиль пользовател�";
> 		//added in 12.0.0
> 		$admtext['mult_trees'] = "Применить права дл� не�кольких деревьев";
> 		//added in 12.0.1
> 		$admtext['consented'] = "Дано �огла�ие";
> 		$admtext['consentdate'] = "Дата �огла�и�";
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Отобразить только отключенных пользователей";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Также оправить админи�траторам, когда выбрано одно древо";
> 		break;
> 
> 	case "login":
> 		$admtext['loginfailed'] = "Ошибка входа.";
> 		$admtext['adminlogfile'] = "Журнал админи�тратора";
> 		$admtext['mostrecentactions'] = "По�ледние дей�тви�";
> 		$admtext['rempass'] = "Запомнить мой логин на �том компьютере";
> 		$admtext['sessexp'] = "Врем� �еан�а и�текло.";
> 		$admtext['logagain'] = "�ажмите, чтобы �нова войти.";
> 		$admtext['logininactive'] = "Ваш логин ещё не активирован. Пожалуй�та, повторите попытку позже или обратите�ь к админи�тратору �айта.";
> 		break;
> 
> 	case "timeline":		
> 		$admtext['createnewtlevent'] = "Создать новое �обыти� на шкале времени";
> 		$admtext['modifytlevent'] = "Изменить �уще�твующее �обытие на шкале времени";
> 		$admtext['leaveblankalltlevents'] = "о�тавить поле пу�тым дл� отображени� в�ех �обытий на шкале времени";
> 		$admtext['evyear'] = "Год �обыти�";
> 		$admtext['evdetail'] = "Детальна� информаци�";
> 		$admtext['selecttleventaction'] = "Выбрать �обытие на шкале времени и дей�твие";
> 		$admtext['changestotlevent'] = "Изменени� в �обытии шкалы времени";
> 		$admtext['location'] = "Ме�то";
> 		$admtext['confdeletetlevent'] = "Вы уверены, что хотите удалить �то �обытие на шкале времени?";
> 		$admtext['enterevyear'] = "Заполните, пожалуй�та, год �обыти�.";
> 		$admtext['enterevdetail'] = "Заполните, пожалуй�та, подробно�ти �той шкалы времени �обытий.";
> 		$admtext['existingtleventinfo'] = "Суще�твующее �обытие на шкале времени";
> 		$admtext['newtleventinfo'] = "�овое �обытие на  шкале времени";
> 		$admtext['edittleventinfo'] = "Добавление, изменени� или удаление �обытий на шкале времени";
> 		$admtext['addnewtlevent'] = "Добавить новое �обытие";
> 		$admtext['yrreq'] = "(об�зателен только год)";
> 		$admtext['startdt'] = "�ачальна� дата";
> 		$admtext['enddt'] = "Конечна� дата";
> 		$admtext['evtitle'] = "�азвание �обыти�";
> 		break;
> 
> 	case "review":
> 		$admtext['selectevaction'] = "Выберите предложенное изменение и дей�твие";
> 		$admtext['suggested'] = "Предложение";
> 		$admtext['usernotes'] = "Примечани� в отношении<br />предложенного изменени�<br />(не будут �охранены)";
> 		$admtext['postdate'] = "Введено";
> 		$admtext['savedel'] = "Обработать & удалить";
> 		$admtext['postpone'] = "Отложить";
> 		$admtext['igndel'] = "Отменить & удалить";
> 		$admtext['tentdel'] = "было удалено";
> 		$admtext['tentadd'] = "�делано по�то�нным";
> 		break;
> 
> 	case "misc":
> 		$admtext['noteblurb'] = "�епо�ред�твенно найти, отредактировать или удалить любую заметку в базе данных.";
> 		$admtext['whatsnewblurb'] = "Предо�тавьте �воим по�етител�м информацию об обновлени�х на �айте или другую актуальную информацию в верхней ча�ти �траницы &#171;Что �ового&#187;.";
> 		$admtext['mwblurb'] = "Ведите �пи�ок людей и фотографий, о которых нет данных, в надежде �о временем получить больше информации о них.";
> 		$admtext['dvblurb'] = "Пои�к возможных проблем в �уще�твующей информации.";
> 		$admtext['wr_gender'] = "�еправильный пол";
> 		$admtext['unk_gender'] = "�еизве�тный пол";
> 		$admtext['marr_young'] = "Женат �лишком рано (моложе 15 лет)";
> 		$admtext['marr_aft_death'] = "Женат по�ле �мерти";
> 		$admtext['marr_bef_birth'] = "Женат до рождени�";
> 		$admtext['died_bef_birth'] = "Умер до рождени�";
> 		$admtext['parents_younger'] = "Родил�� �лишком рано (родители моложе 15 лет, или ребёнок родил�� до брака)";
> 		$admtext['children_late'] = "Родил�� �лишком поздно (мать �тарше 50 лет)";
> 		$admtext['not_living'] = "Человек отмечен как живой, но указана дата �мерти";
> 		$admtext['not_dead'] = "Человек, отмечен как умерший, возможно, в�ё ещё жив";
> 		$admtext['parmarr'] = "Брак родителей";
> 		$admtext['motherbirth'] = "Рождение матери";
> 		break;
> 		
> 	case "mods":
> 		$admtext['modlist'] = "Спи�ок модов";
> 		$admtext['removed'] = "удалён";
> 		$admtext['installed'] = "У�тановлено";
> 		$admtext['deleted'] = "удалённый";
> 		$admtext['cantdel'] = "не удает�� удалить";
> 		$admtext['cfgname'] = "Им� файла конфигурации";
> 		$admtext['version'] = "Вер�и�";
> 		$admtext['nomods'] = "�ет файлов определений мода (xxx) в папке мода";
> 		$admtext['location'] = "Ра�положение";
> 		$admtext['missing'] = "От�ут�твует";
> 		$admtext['badtarget'] = "Плохой целевой путь";
> 		$admtext['cantwrite'] = "�евозможно запи�ать в";
> 		$admtext['notwrite'] = "не до�тупен дл� запи�и, проверьте разрешени�";
> 		$admtext['checkwrite'] = "Проверьте разрешени�, должна быть разрешена запи�ь.";
> 		$admtext['toterrors'] = "В�его ошибок";
> 		$admtext['missfile'] = "От�ут�твует файл";
> 		$admtext['notunique'] = "не уникальный";
> 		$admtext['nodesc'] = "Ошибка определени� параметра, от�ут�твует опи�ание";
> 		$admtext['defval'] = "Значение по умолчанию";
> 		$admtext['written'] = "Файл запи�ан";
> 		$admtext['locmissing'] = "Дл� у�тановки от�ут�твует локальна� копи� ххх";
> 		$admtext['needmodupdate'] = "Требует�� обновление мода";
> 		$admtext['cannotinstall'] = "�евозможно у�тановить �тот мод";
> 		$admtext['emptytarget'] = "Целевой файл пу�той.";
> 		$admtext['cantdelmissing'] = "�е удает�� удалить, файл от�ут�твует";
> 		//changed in 10.0.3 
> 		$admtext['editperf'] = "Параметры редактировани� были изменены �ледующим образом:";
> 		//added in 10.0.3 
> 		$admtext['options'] = "Параметры";
> 		$admtext['viewlog'] = "Про�мотр журнала";
> 		$admtext['target'] = "Изменени�";
> 		$admtext['newfile'] = "Создает";
> 		$admtext['copiesfile'] = "Копии";
> 		$admtext['copiesfile2'] = "Копии в";
> 		$admtext['logoptions'] = "Журнал менеджера модов";
> 		$admtext['mmlogfilename'] = "Им� журнала";
> 		$admtext['sortlistby'] = "Сортировать �пи�ки по";
> 		$admtext['modname'] = "Им� мода";
> 		$admtext['bypassconfirm'] = "Без подтверждений";
> 		$admtext['modifyoptions'] = "Изменить параметры менеджера модов";
> 		$admtext['ready'] = "OK дл� у�тановки";
> 		$admtext['noselected'] = "Вы не выбрали ни одного файла!";
> 		$admtext['choose'] = "Выбрать";
> 		$admtext['showlogfile'] = "Показать журнал дей�твий менеджера модов";
> 		$admtext['recentactions'] = "По�ледние дей�тви� менеджера модов";
> 		$admtext['clearlog'] = "Очи�тить журнал";
> 		$admtext['confirmclearlog'] = "Вы дей�твительно хотите очи�тить журнал ?";
> 		$admtext['modsyntax'] = "Синтак�и� мода";
> 		$admtext['modguidelines'] = "Стандарты мода";
> 		$admtext['filemod'] = "Файл xxx изменён";
> 		$admtext['potconf'] = "Потенциальные конфликты";
> 		$admtext['modifications'] = "изменени�";
> 		$admtext['othermmoptions'] = "Другие";
> 		$admtext['file'] = "Файл";
> 		$admtext['tngmods'] = "Моды дл� TNG";
> 		//changed in TNG 10.1
> 		$admtext['copied'] = "�копированный";
> 		$admtext['emptyfile'] = "файл пу�т";
> 		$admtext['filescopied'] = "файлы �копированы";
> 		$admtext['notinst'] = "не у�тановлен";
> 		$admtext['install'] = "у�тановить";
> 		$admtext['filedel'] = "Файл удалён";
> 		$admtext['created'] = "�оздан";
> 		$admtext['choosefilter'] = "Выберите фильтр и нажмите &#171;ОК&#187; дл� до�тупных �лементов управлени�";
> 		$admtext['mmmaxloglines'] = "Мак�имальное количе�тво транзакций";
> 		$admtext['statusfilter'] = "Стату�";
> 		//added in TNG 10.1
> 		$admtext['uninstall'] = "Удалить";    // was $admtext['remove'] = "Remove"
> 		$admtext['cleanup'] = "Очи�тить";  // previously used as $admtext['clean']
> 		$admtext['edopts'] = "Изменить параметры";  // previously used as $admtext['edit'] without Option text
> 		$admtext['ok2inst'] = "ОК дл� у�тановки";  // previously used $admtext['ready'] which is already translated
> 		$admtext['badversion'] = "не�оответ�твие вер�ии файла";
> 		$admtext['bomfound'] = "Спецификаци� удалена";
> 		$admtext['cantinst'] = "не удает�� у�тановить";
> 		$admtext['cantproc'] = "не удает�� удалить мод";
> 		$admtext['cantupd'] = "не удало�ь обновить параметр";
> 		$admtext['cleanupall'] = "Очи�тить в�ё";
> 		$admtext['copiesreq'] = "указанные копии файлов";
> 		$admtext['delete'] = "Удалить";
> 		$admtext['deleteall'] = "Удалить в�ё";
> 		$admtext['errors'] = "ошибки";
> 		$admtext['excused'] = "файлы о�вобождены";
> 		$admtext['filesinst'] = "у�тановленные файлы";
> 		$admtext['filesrem'] = "файлы удалены";
> 		$admtext['format'] = "ошибка форматировани�";
> 		$admtext['installall'] = "У�тановить";
> 		$admtext['installing'] = "У�тановка";
> 		$admtext['line'] = "Строка";
> 		$admtext['modified'] = "модифицировано";
> 		$admtext['modsinst'] = "у�тановленные модификации кода";
> 		$admtext['modrem'] = "мод удален";
> 		$admtext['modsrem'] = "изменени� кода удалены";
> 		$admtext['modsreq'] = "изменени� кода";
> 		$admtext['newfilesreq'] = "указаны новые файлы";
> 		$admtext['nfcreated'] = "новый файл �оздан";
> 		$admtext['noact'] = "неверный тег дей�тви�";
> 		$admtext['nocfgfile'] = "mod файл не найден";
> 		$admtext['nocomps'] = "от�ут�твующие �лементы";
> 		$admtext['noend'] = "%end:%  тег от�ут�твует";
> 		$admtext['nolocation'] = "от�ут�твует тег ме�тоположени�";
> 		$admtext['okay'] = "OK";
> 		$admtext['opened'] = "открытый";
> 		$admtext['optional'] = "необ�зательный";
> 		$admtext['partinst'] = "ча�тично у�тановлен";
> 		$admtext['removeall'] = "Удалить";    // was Remove Selected mods
> 		$admtext['removing'] = "Удаление";    // was Removing
> 		$admtext['reqtag'] = "требуемый тег от�ут�твует";
> 		$admtext['restparam'] = "Во��тановление параметра по умолчанию";
> 		$admtext['return'] = "Вернуть�� к менеджеру модов";
> 		$admtext['tagnoterm'] = "тег не завершен";
> 		$admtext['tagunk'] = "тег неизве�тен";
> 		$admtext['tgtfile'] = "целевой файл";
> 		$admtext['updated'] = "обновленный";
> 		$admtext['updparam'] = "Обновление параметра";
> 		$admtext['unxend'] = "неожиданный конец файла";
> 		$admtext['warnings'] = "Предупреждени�";
> 		$admtext['allowdeletepartial'] = "Разрешить удаление выбранных ча�тично у�тановленных модов";
> 		$admtext['allowdeleteinstalled'] = "Разрешить удаление индивидуально у�тановленных модов";
> 		$admtext['showwarnings'] = "Показывать предупреждени� модов в �тату�е";
> 		$admtext['logfullpath'] = "Журналировать полный путь к файлам дл� файловых операций";
> 		$admtext['deleting'] = "Удаление";
> 		$admtext['wiki'] = "Вики";
> 		$admtext['aflist'] = "Файлы";
> 		$admtext['hasoptions'] = "Опции";
> 		$admtext['restore'] = "Сбро� на�троек";
> 		$admtext['stayon'] = "Заблокировать";
> 		$admtext['accessible'] = "до�тупно";
> 		$admtext['bypassed'] = "пропущено";
> 		$admtext['willbypass'] = "будет проигнорировано";  // was "will bypass"
> 		$admtext['cantdel'] = "не удает�� удалить";
> 		$admtext['optmissing'] = "файл от�ут�твует (необ�зательно)";
> 		$admtext['tgtmissing'] = "целевой файл от�ут�твует";
> 		$admtext['optlocked'] = "файл заблокирован (необ�зательно)";
> 		$admtext['tgtlocked'] = "файл заблокирован";
> 		$admtext['alreadyrem'] = "уже удалён";
> 		$admtext['noaccess'] = "нет до�тупа";
> 		$admtext['badinstall'] = "не удало�ь у�тановить";
> 		$admtext['removed'] = "удалён";
> 		$admtext['deleted'] = "удалённый";
> 		$admtext['optsrcfilemissing'] = "необ�зательный и�точник от�ут�твует";
> 		$admtext['srcfilemissing'] = "и�точник от�ут�твует";
> 		$admtext['optnocopy'] = "необ�зательный файл не �копирован";
> 		$admtext['notcopied'] = "не �копирован";
> 		$admtext['copied'] = "�копированный";
> 		$admtext['notcreated'] = "не удаёт�� �оздать новый файл";
> 		$admtext['optnotcreated'] = "не удаёт�� �оздать необ�зательный новый файл";
> 		$admtext['nocreated'] = "не �оздан";
> 		$admtext['fixedheader'] = "И�пользовать фик�ированные заголовки";
> 		$admtext['cantremok'] = "не удаёт�� удалить, необ�зательный, пропущен";
> 		$admtext['nofolder'] = "целева� папка от�ут�твует";
> 		$admtext['edparams'] = "изменить параметры";
> 		$admtext['compresslog'] = "Свернуть журнал";
> 		$admtext['formodname'] = "дл� имени мода";
> 		$admtext['nofolder'] = "целева� папка от�ут�твует";
> 		$admtext['fileperms'] = "Пожалуй�та, проверьте права до�тупа к файлам";
> 		$admtext['noparam'] = "от�ут�твует параметр";
> 		$admtext['editing'] = "редактирование";
> 		$admtext['redirect2log'] = "Перенаправление в журнал дл�";
> 		$admtext['on_error'] = "Только ошибки";
> 		$admtext['on_all'] = "В�е транзакции";
> 		$admtext['usestriping'] = "И�пользовать поло�ы";
> 		$admtext['stripeafter'] = "Поло�а по�ле чи�ла �трок";
> 		$admtext['adjusthdrs'] = "Отрегулировать фик�ированные заголовки";
> 		$admtext['displayoptions'] = "�а�тройки отображени�";
> 		$admtext['no_frag'] = "фрагмент кода зде�ь не разрешен";
> 		//added in 12.0.0
> 		$admtext['exists'] = "�уще�твует";
> 		$admtext['newdirsreq'] = "новые папки";
> 		$admtext['cantrem'] = "не удает�� удалить";
> 		$admtext['showanalyzer'] = "Показать вкладку �нализ файлов TNG";
> 		$admtext['showdeveloper'] = "Показать другие ин�трументы разработчика";
> 		$admtext['showupdates'] = "Показать вкладку Рекомендуемые обновлени�";
> 		$admtext['analyzefiles'] = "�нализ файлов TNG";
> 		$admtext['parsetable'] = "По�мотреть таблицу пар�ера";
> 		$admtext['recommendedfixes'] = "Рекомендуемые обновлени�";
> 		$admtext['selectmod'] = "Выберите файл конфигурации мод дл� про�мотра результатов таблицы пар�ера";
> 		$admtext['parsertags'] = "Ма��ив тегов пар�ера:";
> 		$admtext['parsererror'] = "Ошибка: ";
> 		$admtext['filesel'] = "Выберите файл TNG, чтобы увидеть, какой мод на него вли�ет";
> 		$admtext['custtextfixes'] = "В обновленных модел�х рекомендует��, чтобы пользователь�кий тек�т был в�тавлен перед комментари�ми в начале файла cust_text.php, чтобы моды не вли�ли на изменени� вручную пользовател�, �деланные по�ле �трок комментариев.";
> 		$admtext['updcusttext'] = "Обновить файлы cust_text.php";
> 		$admtext['confirmupdcusttext'] = "Вы дей�твительно хотите обновить файлы cust_text.php?";
> 		$admtext['compressnames'] = "Сжатие имен мод в �пи�ке мод";
> 		$admtext['verified'] = "проверен";
> 		$admtext['provisional'] = "(предварительный) должны быть до�тупны";
> 		$admtext['backtoprevious'] = "Вернуть�� на предыдущую �траницу";
> 		$admtext['reasontoupdate'] = "Е�ли вы не запу�каете �крипт cust_text_update.php как ча�ть обновлени� TNG v12, вам необходимо обновить файлы cust_text.php до <ul><li> добавить новую �троку в файлы и </li><li> также обновите у�таревшую �троку в �уще�твующих файлах cust_text.php </li></ul>, которые не будут заменены во врем� обновлений TNG.";
> 		$admtext['newanchor'] = "�ова� �трока комментариев не должна быть переведена в �зыковые файлы, чтобы ее можно было и�пользовать в каче�тве прив�зки дл� в�тавки пользователь�кого тек�та перед �той новой �трокой комментариев разработчиками модов.";
> 		$admtext['translateissue'] = "Е�ли вы переводите новую �троку комментариев, у�тановка мода завершит�� неудачно.";
> 		$admtext['privatemod'] = "Приватный мод";
> 		$admtext['protected'] = "защищенный файл удалить вручную";
> 		$admtext['restored'] = "во��тановлен";
> 		$admtext['confdelmod'] = "Вы дей�твительно хотите удалить �тот мод из �воей �и�темы? Отмена операции будет невозможна!";
> 		$admtext['allowdeletesupport'] = "Разрешить удаление папки поддержки при удалении мода";
> 		$admtext['delrisk'] = "Выбрав �тот параметр, пользователь принимает в�е ри�ки по удалению непредвиденных папок. Мы надеем��, что �тот ри�к очень мал.";
> 		$admtext['delpartinfo'] = "Вы должны у�тановить �тот параметр только в &#171;Да&#187;, е�ли вы забыли удалить предыдущие вер�ии мода перед у�тановкой новой вер�ии.";
> 		$admtext['delinstinfo'] = "Вы должны у�тановить �тот параметр только в &#171;Да&#187;, е�ли вы у�тановили новую вер�ию мода, и предыдуща� вер�и� в�е ещё отображает��.";
> 		$admtext['updateopts'] = "Ваш mmconfig.php необходимо обновить! Перейдите на вкладку &#171;Параметры&#187; выше и нажмите кнопку &#171;Сохранить&#187;.";
> 		$admtext['confdelmod1'] = "Вы дей�твительно хотите удалить �тот мод из �воей �и�темы? Вы не можете отменить �ту операцию!";
> 		$admtext['noeffect'] = "Предупреждение: ничего не мен�ет в TNG!";
> 		$admtext['cfgnowrite'] = "Внимание: Cfg-файл защищен от запи�и. Параметры не могут быть изменены.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "�едопу�тимый �имвол";
> 		break;
> 
> 	//added in 11.0.0
> 	case "dna":
> 		$admtext['confdeletedna'] = "Вы дей�твительно хотите удалить �тот те�т?";
> 		$admtext['test_type'] = "Тип те�та";
> 		$admtext['test_date'] = "Дата те�та";
> 		$admtext['modifydna'] = "Изменить �уще�твующий те�т Д�К";
> 		$admtext['changestoalldna'] = "Изменени� ко в�ем те�там";
> 		$admtext['addnewdna'] = "Добавить новый те�т Д�К";
> 		$admtext['testinfo'] = "Информаци� о те�те";
> 		$admtext['urls'] = "Св�занные ��ылки";
> 		$admtext['dnalater'] = "Примечание. Те�т можно �в�зать � другими людьми на �ледующем �кране.";
> 		$admtext['selecttype'] = "Выберите тип те�та.";
> 		$admtext['entertestnum'] = "Введите номер те�та.";
> 		$admtext['test_taker'] = "Человек, который прошел �тот те�т";
> 		$admtext['test_links'] = "Люди, �в�занные � �тим те�том";
> 		$admtext['changestotest'] = "Изменени� в те�те";
> 		//added in 12.0.0
> 		$admtext['dnalater'] = "Примечание. Те�т можно �в�зать � другими людьми на �ледующем �кране.";
> 		$admtext['markers'] = "Количе�тво маркеров";
> 		$admtext['test_values'] = "Те�товые значени�";
> 		$admtext['separate'] = "Раздел�ть значени� зап�тыми";
> 		$admtext['person_name'] = "Человека нет в базе данных";
> 		$admtext['privsection'] = "Приватное";
> 		$admtext['configsettings'] = "Общие на�тройки";
> 		$admtext['addtotestgroup'] = "Добавить те�т в группу";
> 		$admtext['dna_group'] = "Группа Д�К";
> 		$admtext['groupid'] = "ID группы";
> 		$admtext['addgroup'] = "Добавить группу";
> 		$admtext['entergroupid'] = "Введите идентификатор группы";
> 		$admtext['entergroupdesc'] = "Введите опи�ание группы";
> 		$admtext['confgroupdelete'] = "Вы дей�твительно хотите удалить �ту группу?";
> 		$admtext['modifygroup'] = "Изменить �уще�твующую группу";
> 		$admtext['mrcaiorf'] = "Е�ли необходимо, введите идентификатор лица или идентификатор �емьи";
> 		$admtext['test_results'] = "Результаты те�та";
> 		$admtext['mdaID'] = "ID �амого дальнего предка";
> 		$admtext['mrcaID'] = "Самый по�ледний ID общего предка";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "�омер те�та";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Св�жите �тот те�т Д�К � человеком";
> 		break;
> }
> 
> //common
> $admtext['cannotexecutequery'] = "Запро� не может быть выполнен";
> $admtext['addnew'] = "Добавить";
> $admtext['individuals'] = "Люди";
> $admtext['succadded'] = "у�пешно добавлено";
> $admtext['succaddedlinked'] = "у�пешно добавлено и при�оединено к";
> $admtext['succsaved'] = "у�пешно �охранено";
> $admtext['succdeleted'] = "у�пешно удалено";
> $admtext['succdeletedpluslinks'] = "у�пешно удалено, также, как и в�е ��ылки";
> $admtext['text_delete'] = "Удалить";
> $admtext['deleted'] = "Удалено";
> $admtext['deleteselected'] = "Удалить выбранное";
> $admtext['noresults'] = "�е найдено результатов. Попробуйте ещё раз.";
> $admtext['action'] = "Дей�твие";
> $admtext['id'] = "ID";
> $admtext['edit'] = "Изменить";
> $admtext['notes'] = "Заметки";
> $admtext['name'] = "�азвание";
> $admtext['description'] = "Опи�ание";
> $admtext['text_continue'] = "Продолжить...";
> $admtext['searchfor'] = "Пои�к";
> $admtext['lookin'] = "По�мотреть в (отметьте то, что вам нужно)";
> $admtext['cemeteryid'] = "ID кладбища";
> $admtext['exactmatch'] = "Точное �овпадение";
> $admtext['nothingtodelete'] = "�ичего не удал�ть";
> $admtext['state'] = "провинци�/го�удар�тво";
> $admtext['country'] = "�трана";
> $admtext['finish'] = "Закончить";
> $admtext['ifphotouploaded'] = "О�тавьте �то поле пу�тым, е�ли файлы уже наход�т�� в папке � фото.";
> $admtext['eventtype'] = "Тип �обыти�";
> $admtext['source'] = "И�точник";
> $admtext['savechanges'] = "Сохранить изменени�";
> $admtext['family'] = "Семь�";
> $admtext['find'] = "�айти...";
> $admtext['create'] = "Создать...";
> $admtext['sourceid'] = "ID и�точника";
> $admtext['birthabbr'] = "рожд.";
> $admtext['chrabbr'] = "крещ.";
> $admtext['remove'] = "Убрать";
> $admtext['moveup'] = "Переме�тить вверх";
> $admtext['movedown'] = "Переме�тить вниз";
> $admtext['enterpersonid'] = "Введите идентификационный номер человека";
> $admtext['personid'] = "ID человека";
> $admtext['required'] = "об�зательно";
> $admtext['children'] = "Дети";
> $admtext['chrdate'] = "Дата крещени�";
> $admtext['chrplace'] = "Ме�то крещени�";
> $admtext['deathdate'] = "Дата �мерти";
> $admtext['deathplace'] = "Ме�то �мерти";
> $admtext['burialdate'] = "Дата похорон";
> $admtext['burialplace'] = "Ме�то захоронени�";
> $admtext['birthdate'] = "Дата рождени�";
> $admtext['birthplace'] = "Ме�то рождени�";
> $admtext['title'] = "�азвание";
> $admtext['sex'] = "Пол";
> $admtext['marriagedate'] = "Дата �вадьбы";
> $admtext['marriageplace'] = "Ме�то �вадьбы";
> $admtext['lastname'] = "Фамили�";
> $admtext['firstname'] = "Им�";
> $admtext['filename'] = "�азвание файла";
> $admtext['linkspersonid'] = "С�ылки (ID человека)";
> $admtext['cannotopen'] = "Файл не может быть открыт";
> $admtext['check'] = "Проверить";
> $admtext['generate'] = "Создать";
> $admtext['update'] = "Обновить";
> $admtext['confdeleteevent'] = "Вы уверены, что хотите удалить �то �обытие?";
> $admtext['existinglinks'] = "Суще�твующий (е) линк(и)):<br>(отметить, чтобы удалить)";
> $admtext['lowersortfirst'] = "Сортировка прои�ходит �низу вверх. Де��тичные тоже могут быть и�пользованы..";
> $admtext['personsname'] = "ФИО человека";
> $admtext['tablecreation'] = "Создать таблицу";
> $admtext['tracklines'] = "Ра��читать потомков";
> $admtext['administration'] = "Страница �дмини�тратора";
> $admtext['text_or'] = "ИЛИ";
> $admtext['cemeteries'] = "Кладбища";
> $admtext['families'] = "Семьи";
> $admtext['headstones'] = "�адгроби�";
> $admtext['histories'] = "Жизненные и�тории";
> $admtext['people'] = "Люди";
> $admtext['photos'] = "Фотографии";
> $admtext['reports'] = "Отчёты";
> $admtext['sources'] = "И�точники";
> $admtext['suffix'] = "Суффик�";
> $admtext['add'] = "Добавить";
> $admtext['confdeleteentity'] = "Вы уверены, что хотите удалить выбранное?";
> $admtext['cemetery'] = "Кладбище";
> $admtext['language'] = "Язык";
> $admtext['display'] = "Отображать как";
> $admtext['languages'] = "Языки";
> $admtext['orderpound'] = "�омер по пор�дку";
> $admtext['tree'] = "Генеалогиче�кое древо";
> $admtext['alltrees'] = "В�е древе�а";
> $admtext['selectaddtree'] = "Генеалогиче�кое древо (выберите или добавьте)";
> $admtext['selecttree'] = "Выбрать / добавить генеалогиче�кое древо.";
> $admtext['treebefevent'] = "Вы должны выбрать генеалогиче�кое древо или вве�ти его прежде, чем �можете добавить новое �обытие.";
> $admtext['text_rename'] = "Изменить им�";
> $admtext['clear'] = "Очи�тить";
> $admtext['linktothis'] = "Прив�зать к �тому человеку";
> $admtext['linkexample'] = "(Введите идентификационный №, напр. &#171;I###&#187;)";
> $admtext['existingconfig'] = "Суще�твующа� конфигураци�";
> $admtext['lastmodified'] = "По�ледние изменени� были";
> $admtext['addnotes'] = "Дополнительные запи�и";
> $admtext['confdeletenote'] = "Вы уверены, что хотите удалить �ту запи�ь?";
> $admtext['treebefnote'] = "Вы должны выбрать генеалогиче�кое древо или вве�ти его прежде, чем �можете добавить новые запи�и.";
> $admtext['general'] = "Обшее";
> $admtext['entersearchvalue'] = "Введите �лово дл� пои�ка.";
> $admtext['trees'] = "Генеалогиче�кие древе�а";
> $admtext['users'] = "Пользователи";
> $admtext['lds'] = "СПД";
> $admtext['norights'] = "Вы не авторизованы и не можете про�мотреть �ту �траницу. Е�ли у ва� е�ть логин и пароль, войдите под �воим именем.";
> $admtext['username'] = "Им� пользовател�";
> $admtext['password'] = "Пароль";
> $admtext['login'] = "Войти";
> $admtext['logout'] = "Выйти";
> $admtext['city'] = "Город";  //from cemeteries
> $admtext['cap_country'] = "Страна";  //from cemeteries
> $admtext['addnewtree'] = "Добавить новое генеалогиче�кое древо";
> $admtext['test'] = "Те�т";
> $admtext['page'] = "Страница";  //from sources
> $admtext['folder'] = "Папка";   //from languages
> $admtext['confdeletepers'] = "Вы уверены, что хотите удалить �ту лицо?";
> $admtext['save'] = "Сохранить";
> $admtext['of'] = "из";
> $admtext['size'] = "Ведичина";
> $admtext['open'] = "Открыть";
> $admtext['selectfile'] = "Выбрать файл";
> $admtext['altdesc'] = "�льтернативное опи�ание";
> $admtext['altnotes'] = "�льтернативные запи�и";
> $admtext['user'] = "Пользователь";
> $admtext['DIV'] = "Разведен (а)";
> $admtext['search'] = "Пои�к";  //from findpersonform
> $admtext['searchresults'] = "Результаты пои�ка";  //from people
> $admtext['clicktoselect'] = "Кликните, чтобы выбрать";
> $admtext['familyid'] = "ID �емьи";  //from families
> $admtext['onsave'] = "По�ле �охранени�";
> $admtext['adminhome'] = "Страница админи�тратора";
> $admtext['labelbranches'] = "Выделить ветви";
> $admtext['branch'] = "Ветвь";
> $admtext['findperson'] = "Пои�к человека...";
> $admtext['findfamily'] = "Пои�к �емьи...";
> $admtext['repeatlastq'] = "Повторить по�ледний пои�к";
> $admtext['alwayson'] = "В�егда до�тупно дл� про�мотра";
> $admtext['all'] = "В�е";
> $admtext['lnprefix'] = "Инфик�";
> $admtext['nameorder'] = "Пор�док напи�ани�";
> $admtext['western'] = "Сначала им�";
> $admtext['lockid'] = "Блокировать";
> $admtext['linktothese'] = "При�оединить к:";
> $admtext['alsolinkto'] = "Также при�оединить к:";
> $admtext['linkspersfam'] = "С�ылки (ID человека, Семьи или И�точника)";
> $admtext['findsource'] = "�айти и�точник...";
> $admtext['address'] = "�дре�";
> $admtext['stateprov'] = "Штат / Провинци�";
> $admtext['zip'] = "Почтовый индек�";
> $admtext['merge'] = "Объединить";
> $admtext['otherinfo'] = "Друга� информаци�";
> $admtext['available'] = "До�тупно";
> $admtext['backuprestore'] = "Утилиты";
> $admtext['place'] = "Ме�то";
> $admtext['treeid'] = "ID генеалогиче�кого древа";
> $admtext['email'] = "E-mail";
> $admtext['event'] = "Событи�";
> $admtext['eventdate'] = "Дата �обыти�";
> $admtext['eventplace'] = "Ме�то �обыти�";
> $admtext['detail'] = "Детали";
> $admtext['export'] = "Эк�портировать";
> $admtext['tlevents'] = "Хронологи�";
> $admtext['places'] = "Ме�та";
> $admtext['duplicate'] = "Изменени� не �охранены. Запи�ь � таким ключом уже �уще�твует.";
> $admtext['alttitle'] = "�льтернативный заголовок";
> $admtext['enttitle'] = "Заголовок";  //title for a history or photo, not a person
> $admtext['address1'] = "�дре� 1";
> $admtext['address2'] = "�дре� 2";
> $admtext['countryaddr'] = "Страна";
> $admtext['branches'] = "Ветви";
> $admtext['nobranch'] = "�ет ветви";
> $admtext['scrollbranch'] = "(Прокрутить, чтобы увидеть в�е возможно�ти)";
> $admtext['matches'] = "Совпадени�";
> $admtext['review'] = "Обзор*";
> $admtext['allusers'] = "В�е пользователи";
> $admtext['deathabbr'] = "умер.";
> $admtext['burialabbr'] = "похорон.";
> $admtext['nochanges'] = "�е произведено изменений.";
> $admtext['changestoallitems'] = "Изменени� во в�ех топиках";  //were made successfully
> $admtext['find2'] = "�айти";
> $admtext['text_sort'] = "Сортировать";
> $admtext['documents'] = "Документы";
> $admtext['repository'] = "�рхив";
> $admtext['more'] = "Больше информации";
> $admtext['repositories'] = "�рхивы";
> $admtext['divplace'] = "Ме�то развода";
> $admtext['divdate'] = "Дата развода";
> $admtext['divdatetr'] = "Дата развода (на�то�ща�)";
> $admtext['creategendex'] = "Создать файл  GENDEX";
> $admtext['datamaint'] = "Импорт/�к�порт";
> $admtext['imagefiletoupload'] = "Файл дл� загрузки";
> $admtext['indfamorsrc'] = "Люди, �емьи, и�точники, ме�тонахождени� или ме�та";
> $admtext['improperpermissions'] = "по�кольку папка не �уще�твует (проверьте корневой путь) или не имеет �оответ�твующих разрешений (попробуйте chmod(777)).";
> $admtext['person'] = "Человек";
> $admtext['setup'] = "�а�тройки";
> $admtext['manage'] = "Поддерживать";
> $admtext['reset'] = "Сбро�";
> $admtext['norecords'] = "Запи�и не �уще�твуют.";
> $admtext['findmatches'] = "Пои�к �овпадений";
> $admtext['matchthese'] = "Сравнить �о �ледующими пол�ми:";
> $admtext['otheroptions'] = "Другие опции:";
> $admtext['ignoreblanks'] = "Игнорировать пробелы";
> $admtext['nextmatch'] = "Следующее �овпадение";
> $admtext['nextdup'] = "Следующий дубликат";
> $admtext['comprefresh'] = "Сравнить/Обновить";
> $admtext['mswitch'] = "Заменить";
> $admtext['nomatches'] = "Совпадений не найдено.";
> $admtext['combineextras'] = "Объединить медиафайлы, жизненные и�тории и т.п.";  //changed as well
> $admtext['fasterdisplay'] = "NB: Эта �траница будет отображать�� в другом формате, чтобы бы�трей произве�ти обработку.";
> $admtext['publichome'] = "Страница пользовател�";
> $admtext['media'] = "Медиафайлы";
> $admtext['albums'] = "�льбомы";
> $admtext['import'] = "Импорт";
> $admtext['item'] = "Топик";
> $admtext['combinenotesonly'] = "Объединить заметки";
> $admtext['addmedia'] = "Добавить медиа";
> $admtext['latitude'] = "Широта";
> $admtext['longitude'] = "Долгота";
> $admtext['gedimport'] = "Импорт файла GEDCOM";
> $admtext['improper2'] = "из-за того, что первоначальный файл �лишком большой или имеет неверный формат, или потому что така� папка не �уще�твует (проверьте корневой путь), или не обладает нужными правами до�тупа (попробуйте chmod(777)).";
> $admtext['confdeleterecs'] = "Вы уверены, что хотите удалить выбранные запи�и?";
> //For Google maps use - admin pages
> $admtext['googleplace'] = "Геокодирование ме�тоположени�";
> $admtext['notfound'] = " не найден. Повторите пои�к. Обратите�ь к �правке по пои�ку на карте дл� вы�влени� возможных причин неудачного пои�ка, или проведите �амо�то�тельный пои�к, и�пользу� ��ылку на Google Map Search";
> $admtext['showhidemap'] = "Показать / �крыть интерактивные карты";
> $admtext['getcoords'] = "(определить широту, долготу и ма�штаб)";
> $admtext['searchstring'] = "Пои�к ме�та";
> $admtext['zoom'] = "Увеличение/Уменьшение";
> $admtext['selectplacelevel'] = "Выберите уровень ме�та";
> $admtext['difficultmap'] = "Пои�к в картах Google";
> $admtext['maphelp'] = "Справка по пои�ку на карте";
> $admtext['gobutton'] = "Пои�к";
> $admtext['findpersonid'] = "�айти ID человека";
> $admtext['findfamilyid'] = "�айти ID �емьи";
> $admtext['findsourceid'] = "�айти ID и�точника";
> $admtext['entersourcepart'] = "Введите ча�ть названи�";
> $admtext['findrepoid'] = "�айти ID архива";
> $admtext['enterrepopart'] = "Введите ча�ть названи� архива";
> $admtext['findplace'] = "�айти ме�то";
> $admtext['enterplacepart'] = "Введите ча�ть названи� ме�та";
> $admtext['entereventinfo'] = "Вне�ти дату �обыти�, ме�то �обыти� или подробно�ти об �том �обытии.";
> $admtext['entereventtype'] = "Выбрать тип �обыти�.";
> $admtext['enternote'] = "Введите тек�т запи�и.";
> $admtext['selectsource'] = "Выбрать и�точник.";
> $admtext['confdeletecite'] = "Вы уверены, что хотите удалить �ту цитату?";
> $admtext['spouses'] = "Супруги";
> $admtext['entertreeid'] = "Введите идентификационный номер генеалогиче�кого древа.";
> $admtext['entertreename'] = "Введите название генеалогиче�кого древа.";
> $admtext['citations'] = "Цитаты";
> $admtext['eventtypes'] = "Типы �обытий";
> $admtext['associations'] = "Св�зи";
> $admtext['makefolder'] = "Создать папку";
> $admtext['allcurrentdata'] = "В�е �уще�твующие данные";
> $admtext['matchingonly'] = "Только �овпадающие запи�и";
> $admtext['donotreplace'] = "�е замен�ть данные";
> $admtext['useroffset'] = "начинать идентификационные номера �:";
> $admtext['phone'] = "Телефон";
> $admtext['website'] = "Веб-�айт";
> $admtext['thumb'] = "Миниатюра";  //as in thumbnail
> $admtext['displayorder'] = "Пор�док отображени�";
> $admtext['go'] = "OK";
> $admtext['help'] = "Помощь";
> $admtext['husband'] = "Супруг";
> $admtext['wife'] = "Супруга";
> $admtext['husbname'] = "Им� �упруга";
> $admtext['wifename'] = "Им� �упруги";
> $admtext['drag'] = "Перетащить";
> $admtext['enterinamepart'] = "введите ча�ть фамилии и/или имени";
> $admtext['enterfnamepart'] = "Введите ча�ть фамилии отца и/или матери";
> $admtext['hide'] = "Скрыть";
> $admtext['toggle'] = "показать";
> $admtext['wsel'] = "С выбранными:";
> $admtext['msg'] = "Сообщение";
> $admtext['default'] = "По умолчанию";
> $admtext['events'] = "Событи�";
> $admtext['date'] = "Дата";
> $admtext['savecont'] = "Сохранить и продолжить...";
> $admtext['alphanum'] = "Пожалуй�та, и�пользуйте только буквы и цифры в ID генеалогиче�кого древа.";
> $admtext['mediatypes'] = "Типы медиафайлов";
> $admtext['appendall'] = "Добавить в�е запи�и";
> $admtext['NPFX'] = "Префик�";
> $admtext['prefix'] = "Префик�";
> $admtext['mostwanted'] = "Розы�к";
> $admtext['idexists'] = "не может быть добавлено, потому что �тот идентификационный номер уже �уще�твует. Во�пользуйте�ь кнопкой Возврат вашего браузера, чтобы вернуть�� на предыдущую �траницу и выберите другой идентификационный номер.";
> $admtext['notdeleted'] = "Файл не может быть удален. Пожалуй�та, проверьте права до�тупа к файлам.";
> $admtext['confdeletefile'] = "Вы уверены, что хотите удалить �тот файл?";
> $admtext['datenote'] = "<strong>Примечание:</strong> Вводите, пожалуй�та, даты в формате ДД.MM.ГГГГ (напр. 22.01.1980).";
> $admtext['oriental'] = "Сначала фамили� (без зап�тых)";
> $admtext['langfolder'] = "Папка, где будут хранить��<br>файлы � �зыками";
> $admtext['repoid'] = "ID архива";
> $admtext['whatsnew'] = "Что нового";
> $admtext['linkedto'] = "Св�занный �";
> $admtext['status'] = "Стату�";
> $admtext['show'] = "Показать";
> $admtext['lnfirst'] = "Сначала фамили� (через зап�тую)";
> $admtext['savefirst'] = "Сначала �охранить изменени�?";
> $admtext['misc'] = "Разное";
> $admtext['modmgr'] = "Менеджер модов";
> $admtext['cannotopendir'] = "�е могу открыть папку";
> $admtext['reviewsh'] = "Оценить"; //short version
> $admtext['cancel'] = "Отменить";
> $admtext['enterpassoc'] = "Введите, пожалуй�та, идентификационный номер человека �той �в�зи.";
> $admtext['enterrela'] = "Опишите, пожалуй�та, характер �той �в�зи.";
> $admtext['confdeleteassoc'] = "Вы уверены, что хотите удалить �ту �в�зь?";
> $admtext['preview'] = "Показать";
> $admtext['livingonly'] = "Живые";
> $admtext['tentdata'] = "Временна� запи�ь о �обытии";
> $admtext['checking'] = "Провер�ет��... Подождите немного !";
> $admtext['clickresume'] = "нажмите зде�ь, чтобы продолжить";
> $admtext['copylast'] = "Копировать по�ледний";
> $admtext['nicbold'] = "�ажмите, чтобы �делать жирным";
> $admtext['nicitalic'] = "�ажмите, чтобы �делать кур�ивом";
> $admtext['nicunderline'] = "�ажмите, чтобы �делать подчёркнутым";
> $admtext['niclalign'] = "Выровн�ть по левому краю";
> $admtext['niccalign'] = "Выровн�ть по центру";
> $admtext['nicralign'] = "Выровн�ть по правому краю";
> $admtext['nicjalign'] = "Выровн�ть по ширине";
> $admtext['nicinsol'] = "В�тавить упор�доченный �пи�ок";
> $admtext['nicinsul'] = "В�тавить неупор�доченный �пи�ок";
> $admtext['nicsub'] = "�ажмите, чтобы �делать под�трочным";
> $admtext['nicsup'] = "�ажмите, чтобы �делать над�трочным";
> $admtext['nicstrike'] = "�ажмите, чтобы �делать зачёркнутым";
> $admtext['nicremfmt'] = "Удалить форматирование";
> $admtext['nicindent'] = "Тек�т от�тупа";
> $admtext['nicremind'] = "Удалить от�туп";
> $admtext['nichr'] = "Горизонтальное линейка";
> $admtext['nicfontsz'] = "Шрифт&nbsp;Размер";
> $admtext['nicfontfam'] = "Шрифт&nbsp;Семей�тво";
> $admtext['nicfontfmt'] = "Шрифт&nbsp;Формат";
> $admtext['niclink'] = "Добавить ��ылку";
> $admtext['nicremlink'] = "Удалить ��ылку";
> $admtext['nictxtcol'] = "Изменить цвет тек�та";
> $admtext['nicbkgcol'] = "Изменить цвет фона";
> $admtext['nicimage'] = "Добавить изображение";
> $admtext['change'] = "Изменить";
> $admtext['editwarn'] = "Ваша блокировка �той запи�и близка к и�течению �рока дей�тви�. Сохраните изменени�, чтобы предотвратить изменени� другими пользовател�ми.";
> $admtext['editconflict'] = "Другой пользователь уже редактирует �ту запи�ь. Пожалуй�та, повторите попытку позже.";
> $admtext['retry'] = "Попробуйте ещё раз";
> $admtext['notsaved'] = "Изменени� не были �охранены. Другой пользователь заблокировал запи�ь.";
> $admtext['disabled'] = "Отключено";
> $admtext['cremated'] = "Кремирован";
> $admtext['videos'] = "Видео";
> $admtext['recordings'] = "Запи�и";
> $admtext['saveexit'] = "Сохранить и выйти";
> //moved here in 11.0.0
> $admtext['nickname'] = "Прозвище";
> $admtext['role'] = "Роль";
> $admtext['commas'] = "Разделите не�колько запи�ей зап�тыми";
> $admtext['confdellink'] = "Вы дей�твительно хотите удалить �ту ��ылку?";
> $admtext['existlinks'] = "Суще�твующие ��ылки";
> $admtext['report'] = "Отчёт";
> //added in 11.0.0
> $admtext['sortby'] = "Сортировать по";
> $admtext['unlink'] = "Разъединить";
> $admtext['privateonly'] = "Приватно";
> $admtext['dna_links'] = "С�ылки на Д�К";
> $admtext['dataval'] = "Проверка правильно�ти данных";
> $admtext['norels'] = "Отключить �ообщени� о взаимо�в�з�х";
> //added in 12.0.0
> $admtext['templates'] = "Шаблоны";
> $admtext['findciteid'] = "�айти идентификатор цитаты";
> //moved here in 12.0.0
> $admtext['citation'] = "Цитата";
> $admtext['text_and'] = "И";
> //added in 12.2
> $admtext['surnames'] = "Фамилии";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Изображение";
> $admtext['author'] = "�втор";
> 
> //change to $text
> $admtext['living'] = "Живой";
> 
> //moved here in 13.0.0
> $admtext['getstart'] = "�ачало работы";
> $admtext['showlog'] = "Журнал изменений";
> $admtext['nobirthinfo'] = "�ет информации о рождении";
> //changed in 13.0
> $admtext['savereturn'] = "Сохранить + О�тать��";
> $admtext['saveback'] = "Сохранить + Выйти";
> //added in 13.0
> $admtext['allitemsdeleted'] = "В�е �лементы были у�пешно удалены.";
> $admtext['private'] = "Личный";
> $admtext['imgtags'] = "Теги изображени�";
> 
> $admtext['removelink'] = "Удалить ��ылку";
> $admtext['eloptions'] = "Про�мотр или Удаление";
> $admtext['pleaseenter'] = "�ажмите enter";
> 
> $admtext['nolinks'] = "С�ылок ещё нет";
> $admtext['nogeocode'] = "�е удало�ь геокодировать";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Выберите фото <br/>по умолчанию<br/>"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Типы �обытий / �трибутов";
> $admtext['secondary'] = "Утилиты по�ле импорта";
> $admtext['otherevents'] = "Другие Событи� / �трибуты";
> //added in 14.0
> $admtext['newlinks'] = "С�ылки �озданы";
> $admtext['newcemlinks'] = "С�ылки на кладбища �озданы";
> $admtext['utility'] = "Служебна� программа";
> $admtext['linktype'] = "Тип ��ылки";
> $admtext['move'] = "Переме�тить";
> $admtext['copy'] = "Копировать";
> $admtext['title2'] = "�аименование"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Russian-UTF8/alltext.php TNG1403/languages/Russian-UTF8/alltext.php
1,210c1,259
< <?php
< $alltextloaded = 1;
< 
< $dates['JAN'] = "Янв";
< $dates['JANUARY'] = "Январь";
< $dates['FEB'] = "Фев";
< $dates['FEBRUARY'] = "Февраль";
< $dates['MAR'] = "Март";
< $dates['MARCH'] = "Март";
< $dates['APR'] = "�пр";
< $dates['APRIL'] = "�прель";
< $dates['MAY'] = "Май";
< $dates['JUN'] = "Июнь";
< $dates['JUNE'] = "Июнь";
< $dates['JUL'] = "Июль";
< $dates['JULY'] = "Июль";
< $dates['AUG'] = "�вг";
< $dates['AUGUST'] = "�вгу�т";
< $dates['SEP'] = "Сент";
< $dates['SEPTEMBER'] = "Сент�брь";
< $dates['OCT'] = "Окт";
< $dates['OCTOBER'] = "Окт�брь";
< $dates['NOV'] = "�о�б";
< $dates['NOVEMBER'] = "�о�брь";
< $dates['DEC'] = "Дек";
< $dates['DECEMBER'] = "Декабрь";
< $dates['ABT'] = ".Приблиз.";
< $dates['ABOUT'] = "Приблизительно";
< $dates['BEF'] = "До";
< $dates['BEFORE'] = "До";
< $dates['AFT'] = "По�ле";
< $dates['AFTER'] = "По�ле";
< $dates['BET'] = "Между";
< $dates['BETWEEN'] = "Между";
< $dates['TEXT_AND'] = "И";
< $dates['FROM'] = "С";
< $dates['TO'] = "До";
< $dates['Y'] = "Дата �еизве�тна";
< $dates['CAL'] = "Счит.";
< $dates['EST'] = "Оцен.";
< 
< //global messages
< $text['cannotexecutequery'] = "�е удает�� выполнить запро�";
< $text['to'] = "в";
< $text['of'] = "из";
< $text['text_next'] = "След";
< $text['text_prev'] = "Пред";
< $text['clickdisplay'] = "�ажмите, чтобы показать";
< $text['clickhide'] = "�ажмите, чтобы �крыть";
< $text['forgot1'] = "<strong>Забыли �вое им� пользовател� или пароль</strong><br/>Введите �вой адре� �лектронной почты ниже, чтобы Ваше им� пользовател� было отправлено Вам.";
< $text['forgot2'] = "Введите �вой E-mail выше и �вое им� пользовател� ниже, чтобы �бро�ить пароль (Вам будет отправлен временный пароль).";
< $text['newpass'] = "Ваш новый временный пароль";
< $text['usersent'] = "Ваше им� пользовател� отправлено на ваш адре� �лектронной почты.";
< $text['pwdsent'] = "Ваш новый временный пароль был отправлен на ваш адре� �лектронной почты.";
< $text['loginnotsent2'] = "Указанный адре� �лектронной почты не �оответ�твует учетной запи�и пользовател�. Информаци� не была отправлена.";
< $text['loginnotsent3'] = "�дре� �лектронной почты и им� пользовател�, которые вы указали, не �оответ�твуют учетной запи�и пользовател�. Информаци� не была отправлена.";
< $text['logininfo'] = "Ваши реги�трационные данные";
< $text['collapseall'] = "Свернуть в�е";
< $text['expandall'] = "Развернуть в�е";
< 
< //media types
< $text['photos'] = "Фотографии";
< $text['documents'] = "Документы";
< $text['headstones'] = "�адгроби�";
< $text['histories'] = "И�тории";
< $text['recordings'] = "Звукозапи�и";
< $text['videos'] = "Видеозапи�и";
< 
< //For Google maps use - admin and public pages
< $admtext['placelevel'] = "Уровень ме�та";
< $admtext['level1'] = "�дре�";
< $admtext['level2'] = "Ме�тора�положение";
< $admtext['level3'] = "Город";
< $admtext['level4'] = "Округ/Граф�тво";
< $admtext['level5'] = "Го�удар�тво/Провинци�";
< $admtext['level6'] = "Страна";
< $admtext['level0'] = "�е у�тановлено";
< 
< $text['male'] = "Муж�кой";
< $text['female'] = "Жен�кий";
< $text['closewindow'] = "Закрыть окно";
< $text['loading'] = "Загрузка...";
< 
< $text['cancel'] = "Отменить";
< $text['none'] = "�ет";
< $text['mainton'] = "Режим об�луживани� включён";
< 
< //moved here in 8.0.0
< $text['living'] = "Жив";
< $admtext['text_private'] = "Приватно";
< $admtext['confunlink'] = "Вы уверены, что хотите разорвать �в�зь �того человека как �упруга в �той �емье?";
< $admtext['confunlinkc'] = "Вы уверены, что хотите разорвать �в�зь � �тим человеком, как � ребенком в �той �емье?";
< $admtext['confremchild'] = "Вы уверены, что хотите удалить �того ребенка из �той �емьи? Человек не будет удален из базы данных.";
< $admtext['enterfamilyid'] = "Пожалуй�та, введите ID �емьи.";
< $admtext['yes'] = "Да";
< $admtext['no'] = "�ет";
< $admtext['BIRT'] = "Дата рождени�";
< $admtext['DEAT'] = "Дата �мерти";
< $admtext['CHR'] = "Дата крещени�";
< $admtext['BURI'] = "Дата захоронени�";
< $admtext['BAPL'] = "Дата крещени� (СПД)";
< $admtext['ENDL'] = "Дата пожертвовани� (СПД)";
< $admtext['NICK'] = "Прозвище";
< $admtext['TITL'] = "�азвание";
< $admtext['NSFX'] = "Суффик�";
< $admtext['NAME'] = "Им�";
< $admtext['SLGC'] = "Запечатано дл� родителей (СПД)";
< $admtext['MARR'] = "Женат (Замужем)";
< $admtext['SLGS'] = "Запечатанное �упругом (СПД)";
< $admtext['hello'] = "Здрав�твуйте";
< $admtext['activated'] = "Ваша учетна� запи�ь была активирована.";
< $admtext['infois'] = "Ваша реги�трационна� информаци�";
< $admtext['subjectline'] = "Ваша учетна� запи�ь пользовател� была активирована.";
< 
< //moved here in 8.1.0
< $admtext['adopted'] = "У�ыновлён";
< $admtext['birth'] = "Родной(а�)";
< $admtext['foster'] = "Приёмный(а�)";
< $admtext['sealing'] = "Запечатывание";
< //added in 11.0.3
< $admtext['putative'] = "Предполагаемый";
< 
< //added in 9.0.0
< $text['editprofile'] = "Мой профиль";
< 
< //moved here in 9.0.0
< $text['letter'] = "Letter"; //as in page size
< $text['legal'] = "Legal"; //as in page size
< $text['sunday'] = "Во�кре�ение";  //first day of week on calendar
< $text['monday'] = "Понедельник";
< $text['tuesday'] = "Вторник";
< $text['wednesday'] = "Среда";
< $text['thursday'] = "Четверг";
< $text['friday'] = "П�тница";
< $text['saturday'] = "Суббота";
< $text['contains'] = "�одержит";
< $text['startswith'] = "начинает�� �";
< 
< //moved here in 9.0.4
< $text['top'] = "Верхний";
< 
< //moved here in 10.0.0
< $text['startingind'] = "Первый человек";
< $text['enteremail'] = "Пожалуй�та, введите дей�твительный адре� �лектронной почты.";
< $text['page'] = "Страница";
< $text['go'] = "Выполнить";
< $text['years'] = "лет";
< 
< //added in 10.0.0
< $admtext['CONL'] = "Конфирмаци� (СПД)";
< $admtext['INIT'] = "По�в�щение (СПД)";
< $admtext['step'] = "Па�ынок";
< $text['switchm'] = "Переключить�� на мобильный �айт";
< $text['switchs'] = "Переключить�� на �тандартный �айт";
< 
< //added in 11.0.0
< $text['dna_tests'] = "Те�ты Д�К";
< $admtext['preflang'] = "Предпочтительный �зык";
< $text['problem'] = "Произошла ошибка в программном обе�печении TNG. Это может быть �в�зано � проблемой у�тановки, неполным обновлением или ошибкой программы. Е�ли вы �вл�ете�ь владельцем �айта, вы можете обратить�� в �лужбу поддержки TNG за помощью в решении �той проблемы. Скопируйте запро� ниже и в�тавьте его в �вое �ообщение.";
< $text['query'] = "Запро�";
< $text['fanchart'] = "Диаграмма &#171;Вентил�тор&#187;";
< 
< //moved here in 12.0.0
< $admtext['menu'] = "Меню";
< $admtext['dna_groups'] = "Группы Д�К";
< $admtext['allbranches'] = "В�е ветви";
< $admtext['active'] = "�ктивный";
< $admtext['select'] = "Выбрать";
< $admtext['selectall'] = "Выбрать в�е";
< $admtext['clearall'] = "Очи�тить в�е";
< $admtext['medialinks'] = "С�ылки на медиафайл";
< 
< //added here in 12.0.0
< $text['testgroup'] = "Группа и�пытаний";
< $text['test_number'] = "�омер/им� те�та";
< $text['test_info_display'] = "Информаци� о те�тировании дл� отображени�";
< $text['confirmed'] = "Подтверждено";
< $text['predicted'] = "Пред�казано";
< $admtext['ancestral_surnames'] = "Фамилии предков";
< $admtext['admin_notes'] = "Заметки админи�тратора";
< $admtext['mda'] = "Самый отдаленный предок";
< $admtext['mrca'] = "Самый по�ледний общий предок";
< $admtext['marker_values'] = "Значени� маркера";
< $admtext['ref_seq'] = "Опорна� по�ледовательно�ть";
< $admtext['rsrs'] = "RSRS (рекон�труированна� ��ылочна� по�ледовательно�ть Сапиен�)";
< $admtext['rcrs'] = "rCRS (пере�мотренна� контрольна� по�ледовательно�ть Кембридж)";
< $admtext['hvr_values'] = "Различи� в HVR";
< $admtext['hvr1_values'] = "Различи� HVR1";
< $admtext['hvr2_values'] = "Различи� в HVR2";
< $admtext['coding_reg'] = "Различи� в обла�ти кодировани�";
< $text['keep_name_private'] = "Хранить им� приватно";
< $text['test_results'] = "Результаты те�та";
< $admtext['dna_tests'] = "Те�ты Д�К";
< $admtext['vendor'] = "По�тавщик";
< $admtext['markers'] = "Количе�тво проверенных маркеров STR";
< $admtext['haplo'] = "Гаплогруппа";
< $admtext['termsnp'] = "Терминал SNP";
< $admtext['signsnp'] = "Значительные SNP";
< $admtext['atdna_test'] = "atDNA (�уто�омный)";
< $admtext['ydna_test'] = "Y-Д�К";
< $admtext['mtdna_test'] = "мтД�К (Митохондриальный)";
< $admtext['xdna_test'] = "Х-Д�К";
< 
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Дополнительные мутации";
< 
< // loading English or English-UTF8 is required to display custom text for mods that do not provide all translations
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
< @include($rootpath . $endrootpath . "languages/$english/cust_text.php");
< @include("cust_text.php");
---
> <?php
> $alltextloaded = 1;
> 
> $dates['JAN'] = "Янв";
> $dates['JANUARY'] = "Январь";
> $dates['FEB'] = "Фев";
> $dates['FEBRUARY'] = "Февраль";
> $dates['MAR'] = "Март";
> $dates['MARCH'] = "Март";
> $dates['APR'] = "�пр";
> $dates['APRIL'] = "�прель";
> $dates['MAY'] = "Май";
> $dates['JUN'] = "Июнь";
> $dates['JUNE'] = "Июнь";
> $dates['JUL'] = "Июль";
> $dates['JULY'] = "Июль";
> $dates['AUG'] = "�вг";
> $dates['AUGUST'] = "�вгу�т";
> $dates['SEP'] = "Сент";
> $dates['SEPTEMBER'] = "Сент�брь";
> $dates['OCT'] = "Окт";
> $dates['OCTOBER'] = "Окт�брь";
> $dates['NOV'] = "�о�б";
> $dates['NOVEMBER'] = "�о�брь";
> $dates['DEC'] = "Дек";
> $dates['DECEMBER'] = "Декабрь";
> $dates['ABT'] = ".Приблиз.";
> $dates['ABOUT'] = "Приблизительно";
> $dates['BEF'] = "До";
> $dates['BEFORE'] = "До";
> $dates['AFT'] = "По�ле";
> $dates['AFTER'] = "По�ле";
> $dates['BET'] = "Между";
> $dates['BETWEEN'] = "Между";
> $dates['TEXT_AND'] = "И";
> $dates['FROM'] = "С";
> $dates['TO'] = "До";
> $dates['Y'] = "Дата �еизве�тна";
> $dates['CAL'] = "Счит.";
> $dates['EST'] = "Оцен.";
> 
> //global messages
> $text['cannotexecutequery'] = "�е удает�� выполнить запро�";
> $text['to'] = "в";
> $text['of'] = "из";
> $text['text_next'] = "След";
> $text['text_prev'] = "Пред";
> $text['clickdisplay'] = "�ажмите, чтобы показать";
> $text['clickhide'] = "�ажмите, чтобы �крыть";
> $text['forgot1'] = "<strong>Забыли �вое им� пользовател� или пароль</strong><br/>Введите �вой адре� �лектронной почты ниже, чтобы Ваше им� пользовател� было отправлено Вам.";
> $text['forgot2'] = "Введите �вой E-mail выше и �вое им� пользовател� ниже, чтобы �бро�ить пароль (Вам будет отправлен временный пароль).";
> $text['newpass'] = "Ваш новый временный пароль";
> $text['usersent'] = "Ваше им� пользовател� отправлено на ваш адре� �лектронной почты.";
> $text['pwdsent'] = "Ваш новый временный пароль был отправлен на ваш адре� �лектронной почты.";
> $text['loginnotsent2'] = "Указанный адре� �лектронной почты не �оответ�твует учетной запи�и пользовател�. Информаци� не была отправлена.";
> $text['loginnotsent3'] = "�дре� �лектронной почты и им� пользовател�, которые вы указали, не �оответ�твуют учетной запи�и пользовател�. Информаци� не была отправлена.";
> $text['logininfo'] = "Ваши реги�трационные данные";
> $text['collapseall'] = "Свернуть в�е";
> $text['expandall'] = "Развернуть в�е";
> 
> //media types
> $text['photos'] = "Фотографии";
> $text['documents'] = "Документы";
> $text['headstones'] = "�адгроби�";
> $text['histories'] = "И�тории";
> $text['recordings'] = "Звукозапи�и";
> $text['videos'] = "Видеозапи�и";
> 
> //For Google maps use - admin and public pages
> $admtext['placelevel'] = "Уровень ме�та";
> $admtext['level1'] = "�дре�";
> $admtext['level2'] = "Ме�тора�положение";
> $admtext['level3'] = "Город";
> $admtext['level4'] = "Округ/Граф�тво";
> $admtext['level5'] = "Го�удар�тво/Провинци�";
> $admtext['level6'] = "Страна";
> $admtext['level0'] = "�е у�тановлено";
> 
> $text['male'] = "Муж�кой";
> $text['female'] = "Жен�кий";
> $text['closewindow'] = "Закрыть окно";
> $text['loading'] = "Загрузка...";
> 
> $text['cancel'] = "Отменить";
> $text['none'] = "Пу�то";
> $text['mainton'] = "Режим об�луживани� включён";
> 
> $text['living'] = "Жив";
> $admtext['text_private'] = "Приватно";
> $admtext['confunlink'] = "Вы уверены, что хотите разорвать �в�зь �того человека как �упруга в �той �емье?";
> $admtext['confunlinkc'] = "Вы уверены, что хотите разорвать �в�зь � �тим человеком, как � ребенком в �той �емье?";
> $admtext['confremchild'] = "Вы уверены, что хотите удалить �того ребенка из �той �емьи? Человек не будет удален из базы данных.";
> $admtext['enterfamilyid'] = "Пожалуй�та, введите ID �емьи.";
> $admtext['yes'] = "Да";
> $admtext['no'] = "�ет";
> $admtext['BIRT'] = "Дата рождени�";
> $admtext['DEAT'] = "Дата �мерти";
> $admtext['CHR'] = "Дата крещени�";
> $admtext['BURI'] = "Дата захоронени�";
> $admtext['BAPL'] = "Дата крещени� (СПД)";
> $admtext['ENDL'] = "Дата пожертвовани� (СПД)";
> $admtext['NICK'] = "Прозвище";
> $admtext['TITL'] = "�азвание";
> $admtext['NSFX'] = "Суффик�";
> $admtext['NAME'] = "Им�";
> $admtext['SLGC'] = "Запечатано дл� родителей (СПД)";
> $admtext['MARR'] = "Женат (Замужем)";
> $admtext['SLGS'] = "Запечатанное �упругом (СПД)";
> $admtext['hello'] = "Здрав�твуйте";
> $admtext['activated'] = "Ваша учетна� запи�ь была активирована.";
> $admtext['infois'] = "Ваша реги�трационна� информаци�";
> $admtext['subjectline'] = "Ваша учетна� запи�ь пользовател� была активирована.";
> $admtext['adopted'] = "У�ыновлён";
> $admtext['birth'] = "Родной(а�)";
> $admtext['foster'] = "Приёмный(а�)";
> $admtext['sealing'] = "Запечатывание";
> $admtext['putative'] = "Предполагаемый";
> 
> $text['editprofile'] = "Мой профиль";
> $text['letter'] = "Letter"; //as in page size
> $text['legal'] = "Legal"; //as in page size
> $text['sunday'] = "Во�кре�ение";  //first day of week on calendar
> $text['monday'] = "Понедельник";
> $text['tuesday'] = "Вторник";
> $text['wednesday'] = "Среда";
> $text['thursday'] = "Четверг";
> $text['friday'] = "П�тница";
> $text['saturday'] = "Суббота";
> $text['contains'] = "�одержит";
> $text['startswith'] = "начинает�� �";
> 
> $text['top'] = "Верхний";
> $text['startingind'] = "Первый человек";
> $text['enteremail'] = "Пожалуй�та, введите дей�твительный адре� �лектронной почты.";
> $text['page'] = "Страница";
> $text['go'] = "Выполнить";
> $text['years'] = "лет";
> $admtext['CONL'] = "Конфирмаци� (СПД)";
> $admtext['INIT'] = "По�в�щение (СПД)";
> $admtext['step'] = "Па�ынок";
> $text['switchm'] = "Переключить�� на мобильный �айт";
> $text['switchs'] = "Переключить�� на �тандартный �айт";
> $text['dna_tests'] = "Те�ты Д�К";
> $admtext['preflang'] = "Предпочтительный �зык";
> $text['query'] = "Запро�";
> $text['fanchart'] = "Диаграмма &#171;Вентил�тор&#187;";
> 
> $admtext['menu'] = "Меню";
> $admtext['dna_groups'] = "Группы Д�К";
> $admtext['allbranches'] = "В�е ветви";
> $admtext['active'] = "�ктивный";
> $admtext['select'] = "Выбрать";
> $admtext['selectall'] = "Выбрать в�е";
> $admtext['clearall'] = "Очи�тить в�е";
> $admtext['medialinks'] = "С�ылки на медиафайл";
> 
> $text['testgroup'] = "Группа и�пытаний";
> $text['test_info_display'] = "Информаци� о те�тировании дл� отображени�";
> $text['confirmed'] = "Подтверждено";
> $text['predicted'] = "Пред�казано";
> $admtext['ancestral_surnames'] = "Фамилии предков";
> $admtext['admin_notes'] = "Заметки админи�тратора";
> $admtext['mda'] = "Самый отдаленный предок";
> $admtext['mrca'] = "Самый по�ледний общий предок";
> $admtext['marker_values'] = "Значени� маркера";
> $admtext['ref_seq'] = "Опорна� по�ледовательно�ть";
> $admtext['rsrs'] = "RSRS (рекон�труированна� ��ылочна� по�ледовательно�ть Сапиен�)";
> $admtext['rcrs'] = "rCRS (пере�мотренна� контрольна� по�ледовательно�ть Кембридж)";
> $admtext['hvr_values'] = "Различи� в HVR";
> $admtext['hvr1_values'] = "Различи� HVR1";
> $admtext['hvr2_values'] = "Различи� в HVR2";
> $admtext['coding_reg'] = "Различи� в обла�ти кодировани�";
> $text['keep_name_private'] = "Хранить им� приватно";
> $text['test_results'] = "Результаты те�та";
> $admtext['dna_tests'] = "Те�ты Д�К";
> $admtext['vendor'] = "По�тавщик";
> $admtext['markers'] = "Количе�тво проверенных маркеров STR";
> $admtext['haplo'] = "Гаплогруппа";
> $admtext['termsnp'] = "Терминал SNP";
> $admtext['signsnp'] = "Значительные SNP";
> $admtext['atdna_test'] = "atDNA (�уто�омный)";
> $admtext['ydna_test'] = "Y-Д�К";
> $admtext['mtdna_test'] = "мтД�К (Митохондриальный)";
> $admtext['xdna_test'] = "Х-Д�К";
> $admtext['xtra_mut'] = "Дополнительные мутации";
> $text['test_number'] = "�омер/им� те�та";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "Р.";
> $text['chrabbr'] = "кр.";
> $text['deathabbr'] = "�.";  //from descend
> $text['burialabbr'] = "пгрб.";  //from descend
> $text['marrabbr'] = "m.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "�айти в�ех людей � �обыти�ми в �том ме�те";
> $text['firstpage'] = "Перва� �траница";
> $text['lastpage'] = "По�ледн�� �траница";
> 
> //changed in 13.0.0
> $text['problem'] = "Произошла ошибка в программном обе�печении TNG. Что делать:<p>Е�ли вы только что у�тановили обновление, возможно, вы пропу�тили ча�ть ин�трукций по обновлению. Верните�ь на �траницу readme.html и перечитайте ин�трукции. Обратите о�обое внимание на шаг �труктуры базы данных.</p><p>Е�ли вы у�тановили TNG в первый раз, вам в�е равно необходимо �оздать таблицы базы данных. Верните�ь на �траницу readme.html, чтобы найти �тот шаг.</p><p>Е�ли вы �вл�ете�ь владельцем �айта, вы можете обратить�� в �лужбу поддержки TNG за помощью в решении �той проблемы. Пожалуй�та, �копируйте запро� ниже и в�тавьте его в ваше �ообщение.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "�ет ветви";
> 
> //added in 14.0
> $text['oneyear'] = "год";
> $text['pwdcodelink'] = "Перейдите по �той ��ылке, чтобы получить временный пароль";
> $text['pwdcodesent'] = "�а ваш адре� �лектронной почты была отправлена ��ылка дл� �бро�а парол�.";
> $text['moved'] = "Перемещено";
> $text['citation'] = "Упоминани�";
> $text['other'] = "Другое";
> $text['death'] = "Смерть";
> $text['burial'] = "Захоронение";
> $text['cremation'] = "Кремаци�";
> $text['marriage'] = "Брак";
> $text['divorce'] = "Развод";
> $text['bylength'] = "Шаги";
> $text['bymarriages'] = "Браки";
> $text['none'] = "Пу�то";
> 
> //moved here in 14.0
> $text['family'] = "Семь�";
> $text['source'] = "И�точник";
> $text['repository'] = "�рхив";
> $text['place'] = "Ме�то";
> $admtext['BAPM'] = "Крещение";
> 
> $text['glang'] = "ru";
> 
> // loading English or English-UTF8 is required to display custom text for mods that do not provide all translations
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
> @include($rootpath . $endrootpath . "languages/$english/cust_text.php");
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Russian-UTF8/text.php TNG1403/languages/Russian-UTF8/text.php
1,965c1,1117
< <?php
< switch ( $textpart ) {
< 	//browsesources.php, showsource.php
< 	case "sources":
< 		$text['browseallsources'] = "Про�мотр в�ех и�точников";
< 		$text['shorttitle'] = "Краткое название";
< 		$text['callnum'] = "�рхивный номер";
< 		$text['author'] = "�втор";
< 		$text['publisher'] = "Издатель";
< 		$text['other'] = "Друга� информаци�";
< 		$text['sourceid'] = "И�точник";
< 		$text['moresrc'] = "Больше и�точников";
< 		$text['repoid'] = "ID архива";
< 		$text['browseallrepos'] = "Показать в�е архивы";
< 		break;
< 
< 	//changelanguage.php, savelanguage.php
< 	case "language":
< 		$text['newlanguage'] = "�овый �зык";
< 		$text['changelanguage'] = "Изменить �зык";
< 		$text['languagesaved'] = "Язык �охранен";
< 		$text['sitemaint'] = "Выполн�ет�� об�луживание �айта";
< 		$text['standby'] = "Сайт временно недо�тупен в �в�зи � обновлением базы данных. Пожалуй�та, попробуйте через не�колько минут. Е�ли �айт недо�тупен длительное врем�, вы можете <a href=\"suggest.php\">�в�зать�� � админи�тратором</a>.";
< 		break;
< 
< 	//gedcom.php, gedform.php
< 	case "gedcom":
< 		$text['gedstart'] = "�ачать GEDCOM �";
< 		$text['producegedfrom'] = "Создать GEDCOM из";
< 		$text['numgens'] = "Количе�тво поколений";
< 		$text['includelds'] = "Включить информацию СПД";
< 		$text['buildged'] = "Создать GEDCOM";
< 		$text['gedstartfrom'] = "�ачать � GEDCOM";
< 		$text['nomaxgen'] = "Вы должны указать мак�имальное количе�тво поколений. Пожалуй�та, и�пользуйте кнопку &#171;�азад&#187;, чтобы вернуть�� на предыдущую �траницу и и�править ошибку";
< 		$text['gedcreatedfrom'] = "GEDCOM �оздан из";
< 		$text['gedcreatedfor'] = "предназначен дл�";
< 		$text['creategedfor'] = "Создать GEDCOM";
< 		$text['email'] = "Ваш Email";
< 		$text['suggestchange'] = "Предложить изменение";
< 		$text['yourname'] = "Ваше им�";
< 		$text['comments'] = "Опи�ание <br/>предлагаемых изменений";
< 		$text['comments2'] = "Комментарии";
< 		$text['submitsugg'] = "Отправить предложение";
< 		$text['proposed'] = "Предлагаемое изменение";
< 		$text['mailsent'] = "Спа�ибо. Ваше �ообщение было отправлено.";
< 		$text['mailnotsent'] = "Извините, но ваше �ообщение не может быть до�тавлено. Пожалуй�та, �в�жите�ь � xxx по yyy.";
< 		$text['mailme'] = "Отправить копию";
< 		$text['entername'] = "Пожалуй�та, введите Ваше им�";
< 		$text['entercomments'] = "Пожалуй�та, введите �вои комментарии";
< 		$text['sendmsg'] = "Отправить �ообщение";
< 		//added in 9.0.0
< 		$text['subject'] = "Тема";
< 		break;
< 
< 	//getextras.php, getperson.php
< 	case "getperson":
< 		$text['photoshistoriesfor'] = "Фотографии и и�тории дл�";
< 		$text['indinfofor'] = "Индивидуальна� информаци� дл�";
< 		$text['pp'] = "�тр."; //page abbreviation
< 		$text['age'] = "Возра�т";
< 		$text['agency'] = "�гент�тво";
< 		$text['cause'] = "Причина";
< 		$text['suggested'] = "Предложенный";
< 		$text['closewindow'] = "Закрыть окно";
< 		$text['thanks'] = "Спа�ибо";
< 		$text['received'] = "Ваше предложение было отправлено админи�тратору �айта дл� ознакомлени�.";
< 		$text['indreport'] = "Индивидуальный отчёт";
< 		$text['indreportfor'] = "Индивидуальный отчёт дл�";
< 		$text['general'] = "Общее";
< 		$text['bkmkvis'] = "<strong>Примечание:</strong> Эти закладки видны только на �том компьютере и только в �том браузере.";
< 		//added in 9.0.0
< 		$text['reviewmsg'] = "У ва� е�ть предлагаемое изменение, которое требует вашей оценки. Это пред�тавление ка�ает��:";
< 		$text['revsubject'] = "Предлагаемое изменение требует вашей оценки";
<         break;
< 
< 	//relateform.php, relationship.php, findpersonform.php, findperson.php
< 	case "relate":
< 		$text['relcalc'] = "Калькул�тор отношений";
< 		$text['findrel'] = "�айти род�твенников";
< 		$text['person1'] = "Человек 1:";
< 		$text['person2'] = "Человек 2:";
< 		$text['calculate'] = "Ра�читать";
< 		$text['select2inds'] = "Выберите двух человек.";
< 		$text['findpersonid'] = "�айти идентификатор лица";
< 		$text['enternamepart'] = "введите ча�ть имени и/или фамилии";
< 		$text['pleasenamepart'] = "Введите ча�ть имени или фамилии.";
< 		$text['clicktoselect'] = "нажмите, чтобы выбрать";
< 		$text['nobirthinfo'] = "�ет информации о рождении";
< 		$text['relateto'] = "Св�зь �";
< 		$text['sameperson'] = "Эти два человека �вл�ют�� одним и тем же человеком.";
< 		$text['notrelated'] = "Эти два человека не �в�заны в поколени�х ххх.";
< 		$text['findrelinstr'] = "Чтобы отобразить �в�зь между двум� людьми, и�пользуйте кнопки «�айти» ниже, чтобы найти людей (или �охранить людей на �кране), затем нажмите «Ра��читать».";
< 		$text['sometimes'] = "(Иногда проверка другого поколени� приводит к другому результату).";
< 		$text['findanother'] = "�айти другое отношение";
< 		$text['brother'] = "брат";
< 		$text['sister'] = "�е�тра";
< 		$text['sibling'] = "брат";
< 		$text['uncle'] = "ххх д�д�";
< 		$text['aunt'] = "тёт� xxx";
< 		$text['uncleaunt'] = "ххх д�д�/тёт�";
< 		$text['nephew'] = "плем�нник xxx";
< 		$text['niece'] = "плем�нница xxx";
< 		$text['nephnc'] = "плем�нник/плем�нница xxx";
< 		$text['removed'] = "раз(а) удалено";
< 		$text['rhusband'] = "муж";
< 		$text['rwife'] = "жена";
< 		$text['rspouse'] = "�упруга";
< 		$text['son'] = "�ын";
< 		$text['daughter'] = "дочь";
< 		$text['rchild'] = "ребенок";
< 		$text['sil'] = "з�ть";
< 		$text['dil'] = "неве�тка";
< 		$text['sdil'] = "�ын или неве�тка";
< 		$text['gson'] = "внук xxx";
< 		$text['gdau'] = "внучка xxx";
< 		$text['gsondau'] = "внук xxx";
< 		$text['great'] = "Великий";
< 		$text['spouses'] = "�упруги";
< 		$text['is'] = "�вл�ет��";
< 		$text['changeto'] = "Изменить на (введите идентификатор):";
< 		$text['notvalid'] = "не �вл�ет�� допу�тимым идентификатором человека или не �уще�твует в �той базе данных. Пожалуй�та, попробуйте ещё раз.";
< 		$text['halfbrother'] = "�водный брат";
< 		$text['halfsister'] = "�водна� �е�тра";
< 		$text['halfsibling'] = "�водный брат или �е�тра";
< 		//changed in 8.0.0
< 		$text['gencheck'] = "Мак�имальное количе�тво поколений дл� проверки";
< 		$text['mcousin'] = "xxx двоюродный брат yyy";
< 		$text['fcousin'] = "xxx двоюродна� �е�тра yyy";
< 		$text['cousin'] = "xxx двоюродный брат yyy";
< 		$text['mhalfcousin'] = "xxx �водный двоюродный брат yyy";
< 		$text['fhalfcousin'] = "xxx �водна� двоюродна� �е�тра yyy";
< 		$text['halfcousin'] = "xxx �водный двоюродный брат yyy";
< 		//added in 8.0.0
< 		$text['oneremoved'] = "по�ле удалени�";
< 		$text['gfath'] = "ххх дедушка";
< 		$text['gmoth'] = "xxx бабушка";
< 		$text['gpar'] = "прародитель xxx";
< 		$text['mothof'] = "мать";
< 		$text['fathof'] = "отец";
< 		$text['parof'] = "родитель";
< 		$text['maxrels'] = "Мак�имум отношений дл� показа";
< 		$text['dospouses'] = "Показать отношени� � уча�тием �упруга";
< 		$text['rels'] = "Отношени�";
< 		$text['dospouses2'] = "Показать �упругов";
< 		$text['fil'] = "те�ть";
< 		$text['mil'] = "теща";
< 		$text['fmil'] = "отец или �векровь";
< 		$text['stepson'] = "па�ынок";
< 		$text['stepdau'] = "падчерица";
< 		$text['stepchild'] = "падчерица";
< 		$text['stepgson'] = "приемный внук xxx";
< 		$text['stepgdau'] = "приемна� внучка xxx";
< 		$text['stepgchild'] = "приемный внук xxx";
< 		//added in 8.1.1
< 		$text['ggreat'] = "пра";
< 		//added in 8.1.2
< 		$text['ggfath'] = "ххх прадедушка";
< 		$text['ggmoth'] = "ххх прабабушка";
< 		$text['ggpar'] = "ххх прародитель";
< 		$text['ggson'] = "ххх правнук";
< 		$text['ggdau'] = "ххх правнучка";
< 		$text['ggsondau'] = "ххх правнук";
< 		$text['gstepgson'] = "xxx приемный правнук";
< 		$text['gstepgdau'] = "xxx приемна� правнучка";
< 		$text['gstepgchild'] = "ххх приемный правнук";
< 		$text['guncle'] = "ххх прад�д�";
< 		$text['gaunt'] = "ххх пратёт� xxx";
< 		$text['guncleaunt'] = "ххх прад�д�/пратёт�";
< 		$text['gnephew'] = "ххх праплем�нник";
< 		$text['gniece'] = "ххх праплем�нница";
< 		$text['gnephnc'] = "ххх праплем�нник/праплем�нница";
< 		break;
< 
< 	case "familygroup":
< 		$text['familygroupfor'] = "Семейна� ведомо�ть дл�";
< 		$text['ldsords'] = "Таин�тва СПД";
< 		$text['baptizedlds'] = "Крещеные (СПД)";
< 		$text['endowedlds'] = "�адел�емый (СПД)";
< 		$text['sealedplds'] = "Запечатано дл� родителей (СПД)";
< 		$text['sealedslds'] = "Запечатанное дл� �упругом (СПД)";
< 		$text['otherspouse'] = "Другой �упруг";
< 		$text['husband'] = "Отец";
< 		$text['wife'] = "Мама";
< 		break;
< 
< 	//pedigree.php
< 	case "pedigree":
< 		$text['capbirthabbr'] = "Р.";
< 		$text['capaltbirthabbr'] = "Д. Р.";
< 		$text['capdeathabbr'] = "С.";
< 		$text['capburialabbr'] = "Пох.";
< 		$text['capplaceabbr'] = "М.";
< 		$text['capmarrabbr'] = "Ж.";
< 		$text['capspouseabbr'] = "С.";
< 		$text['redraw'] = "Перери�овать �";
< 		$text['scrollnote'] = "Примечание: Чтобы увидеть в�ю диаграмму, Вам может потребовать�� прокрутить вниз или вправо.";
< 		$text['unknownlit'] = "�еизве�тный";
< 		$text['popupnote1'] = "Дополнительна� информаци�";
< 		$text['popupnote2'] = "�ова� родо�ловна�";
< 		$text['pedcompact'] = "Компактный";
< 		$text['pedstandard'] = "Стандартный";
< 		$text['pedtextonly'] = "Тек�т";
< 		$text['descendfor'] = "Потом�тво дл�";
< 		$text['maxof'] = "Мак�имум";
< 		$text['gensatonce'] = "генерируемых одновременно.";
< 		$text['sonof'] = "�ын";
< 		$text['daughterof'] = "дочь";
< 		$text['childof'] = "ребенок";
< 		$text['stdformat'] = "Стандартный формат";
< 		$text['ahnentafel'] = "Си�тема &#171;Ahnentafel&#187;";
< 		$text['addnewfam'] = "Добавить новую �емью";
< 		$text['editfam'] = "Изменить �емью";
< 		$text['side'] = "Сторона";
< 		$text['familyof'] = "Семей�тво";
< 		$text['paternal'] = "отече�кий";
< 		$text['maternal'] = "Материн�кий";
< 		$text['gen1'] = "Само";
< 		$text['gen2'] = "Родители";
< 		$text['gen3'] = "дедушка и бабушка";
< 		$text['gen4'] = "Прабабушка и прадедушка";
< 		$text['gen5'] = "2-й прародитель";
< 		$text['gen6'] = "3-й прародитель";
< 		$text['gen7'] = "4-й прародитель";
< 		$text['gen8'] = "5-й прародитель";
< 		$text['gen9'] = "6-й прародитель";
< 		$text['gen10'] = "7-й прародитель";
< 		$text['gen11'] = "8-й прародитель";
< 		$text['gen12'] = "9-й прародитель";
< 		$text['graphdesc'] = "Диаграмма прои�хождени� к �тому моменту";
< 		$text['pedbox'] = "Диаграмма &#171;Коробка&#187;";
< 		$text['regformat'] = "Рее�тр";
< 		$text['extrasexpl'] = "По крайней мере, одна фотографи�, и�тори� или другой медиафайл �уще�твует дл� �того человека.";
< 		$text['popupnote3'] = "�ова� диаграмма";
< 		$text['mediaavail'] = "До�тупные медиафайлы";
< 		$text['pedigreefor'] = "Диаграмма родо�ловной дл�";
< 		$text['pedigreech'] = "Диаграмма родо�ловной";
< 		$text['datesloc'] = "Даты и ме�та";
< 		$text['borchr'] = "Рождение/крещение-�мерть/погребение";
< 		$text['nobd'] = "�ет дат рождени� или �мерти";
< 		$text['bcdb'] = "В�е данные о рождении/крещение/�мерти/погребении";
< 		$text['numsys'] = "Си�тема нумерации";
< 		$text['gennums'] = "�омера поколений";
< 		$text['henrynums'] = "Си�тема Генри";
< 		$text['abovnums'] = "Си�тема д'�бовилла";
< 		$text['devnums'] = "Си�тема де Вильер�а";
< 		$text['dispopts'] = "Показать варианты";
< 		//added in 10.0.0
< 		$text['no_ancestors'] = "�е найдено ни одного предка";
< 		$text['ancestor_chart'] = "Вертикальна� диаграмма предков";
< 		$text['opennewwindow'] = "Открыть в новом окне";
< 		$text['pedvertical'] = "Вертикальный";
< 		//added in 11.0.0
< 		$text['familywith'] = "Семь� �";
< 		$text['fcmlogin'] = "Пожалуй�та, войдите, чтобы увидеть подробно�ти";
< 		$text['isthe'] = "�то";
< 		$text['otherspouses'] = "другие �упруги";
< 		$text['parentfamily'] = "Родитель�кое �емей�тво";
< 		$text['showfamily'] = "Показать �емью";
< 		$text['shown'] = "показанный";
< 		$text['showparentfamily'] = "показать родитель�кую �емью";
< 		$text['showperson'] = "показать человека";
< 		//added in 11.0.2
< 		$text['otherfamilies'] = "Другие �емьи";
< 		break;
< 
< 	//search.php, searchform.php
< 	//merged with reports and showreport in 5.0.0
< 	case "search":
< 	case "reports":
< 		$text['noreports'] = "Отчёты не �уще�твуют.";
< 		$text['reportname'] = "�азвание отчёта";
< 		$text['allreports'] = "В�е отчёты";
< 		$text['report'] = "Отчёт";
< 		$text['error'] = "Ошибка";
< 		$text['reportsyntax'] = "Синтак�и� запро�а, выполн�емого � �тим отчётом";
< 		$text['wasincorrect'] = "неверный, и в результате отчёт не может быть запущен. Пожалуй�та, обратите�ь к �и�темному админи�тратору";
< 		$text['errormessage'] = "Сообщение об ошибке";
< 		$text['equals'] = "равн�ет��";
< 		$text['endswith'] = "заканчивает�� на";
< 		$text['soundexof'] = "звучит (soundex) как";
< 		$text['metaphoneof'] = "звучит (metaphone) как";
< 		$text['plusminus10'] = "+/- 10 лет от";
< 		$text['lessthan'] = "меньше, чем";
< 		$text['greaterthan'] = "больше, чем";
< 		$text['lessthanequal'] = "меньше или равно, чем";
< 		$text['greaterthanequal'] = "больше или равно, чем";
< 		$text['equalto'] = "равно";
< 		$text['tryagain'] = "Попробуйте ещё раз";
< 		$text['joinwith'] = "Объедин�ть и�пользу�";
< 		$text['cap_and'] = "И";
< 		$text['cap_or'] = "ИЛИ";
< 		$text['showspouse'] = "Показать �упруга (покажет дубликаты, е�ли человек имеет более одного �упруга)";
< 		$text['submitquery'] = "Отправить запро�";
< 		$text['birthplace'] = "Ме�то рождени�";
< 		$text['deathplace'] = "Ме�то �мерти";
< 		$text['birthdatetr'] = "Дата рождени�";
< 		$text['deathdatetr'] = "Дата �мерти";
< 		$text['plusminus2'] = "+/- 2 года от";
< 		$text['resetall'] = "Сбро�ить в�е значени�";
< 		$text['showdeath'] = "Показать информацию о �мерти/похоронах";
< 		$text['altbirthplace'] = "Ме�то крещени�";
< 		$text['altbirthdatetr'] = "Дата крещени�";
< 		$text['burialplace'] = "Ме�то погребени�";
< 		$text['burialdatetr'] = "Дата погребени�";
< 		$text['event'] = "Событие(�)";
< 		$text['day'] = "День";
< 		$text['month'] = "Ме��ц";
< 		$text['keyword'] = "Ключевое �лово (например, &#171;Abt (Около)&#187;, &#171;Bef (До)&#187;, &#171;Aft (По�ле)&#187;)";
< 		$text['explain'] = "Введите компоненты даты, чтобы увидеть �оответ�твующие �обыти�. Чтобы игнорировать поле, о�тавьте в нём пу�тое значение.";
< 		$text['enterdate'] = "Пожалуй�та, введите или выберите хот� бы одно из �ледующих значений: &#171;День&#187;, &#171;Ме��ц&#187;, &#171;Год&#187;, &#171;Ключевое �лово&#187;";
< 		$text['fullname'] = "Полное им�";
< 		$text['birthdate'] = "Дата рождени�";
< 		$text['altbirthdate'] = "Дата крещени�";
< 		$text['marrdate'] = "Дата брака";
< 		$text['spouseid'] = "ID Супруг(а)";
< 		$text['spousename'] = "Им� Супруг(а)";
< 		$text['deathdate'] = "Дата �мерти";
< 		$text['burialdate'] = "Дата погребени�";
< 		$text['changedate'] = "Дата по�леднего изменени�";
< 		$text['gedcom'] = "Генеалогиче�кое древо";
< 		$text['baptdate'] = "Дата Крещени� (СПД)";
< 		$text['baptplace'] = "Ме�то крещени� (СПД)";
< 		$text['endldate'] = "Дата пожертвовани� (СПД)";
< 		$text['endlplace'] = "Ме�то пожертвовани� (СПД)";
< 		$text['ssealdate'] = "Дата запечатывани� S (СПД)";
< 		$text['ssealplace'] = "Ме�то запечатывани� S (СПД)";
< 		$text['psealdate'] = "Дата запечатывани� P (СПД)";
< 		$text['psealplace'] = "Ме�то запечатывани� P (СПД)";
< 		$text['marrplace'] = "Ме�то брака";
< 		$text['spousesurname'] = "Фамили� �упруга/�упруги";
< 		$text['spousemore'] = "При вводе значени� фамилии �упруга необходимо выбрать пол.";
< 		$text['plusminus5'] = "+/- 5 лет от";
< 		$text['exists'] = "�уще�твует";
< 		$text['dnexist'] = "не �уще�твует";
< 		$text['divdate'] = "Дата развода";
< 		$text['divplace'] = "Ме�то развода";
< 		$text['otherevents'] = "Другие критерии пои�ка";
< 		$text['numresults'] = "Результатов на �транице";
< 		$text['mysphoto'] = "�еизве�тные фотографии";
< 		$text['mysperson'] = "�еизве�тные люди";
< 		$text['joinor'] = "Параметр &#171;Объедин�ть и�пользу� ИЛИ&#187; не может и�пользовать�� � фамилией �упруга";
< 		$text['tellus'] = "Ра��кажите нам, что вы знаете";
< 		$text['moreinfo'] = "Больше информации:";
< 		//added in 8.0.0
< 		$text['marrdatetr'] = "Год брако�очетани�";
< 		$text['divdatetr'] = "Год развода";
< 		$text['mothername'] = "Им� матери";
< 		$text['fathername'] = "Им� отца";
< 		$text['filter'] = "Фильтр";
< 		$text['notliving'] = "�ет в живых";
< 		$text['nodayevents'] = "Событи� за �тот ме��ц, которые не �в�заны � конкретным днем:";
< 		//added in 9.0.0
< 		$text['csv'] = "Файл CSV � разделител�ми-зап�тыми";
< 		//added in 10.0.0
< 		$text['confdate'] = "Дата конфирмации (СПД)";
< 		$text['confplace'] = "Ме�то конфирмации (СПД)";
< 		$text['initdate'] = "Дата по�в�щени� (СПД)";
< 		$text['initplace'] = "Ме�то по�в�щени� (СПД)";
< 		//added in 11.0.0
< 		$text['marrtype'] = "Тип брака";
< 		$text['searchfor'] = "Пои�к";
< 		$text['searchnote'] = "Примечание: �та �траница и�пользует Google, чтобы выполн�ть пои�к. Количе�тво возвращаемых �овпадений будет напр�мую зави�еть от того, на�колько Google �может индек�ировать �айт.";
< 		break;
< 
< 	//showlog.php
< 	case "showlog":
< 		$text['logfilefor'] = "Журнал запи�ей дл� ";
< 		$text['mostrecentactions'] = "По�ледн�� активно�ть";
< 		$text['autorefresh'] = "�втообновление каждые (30 �екунд)";
< 		$text['refreshoff'] = "Отключить автообновление";
< 		break;
< 
< 	case "headstones":
< 	case "showphoto":
< 		$text['cemeteriesheadstones'] = "Кладбища и надгроби�";
< 		$text['showallhsr'] = "Показать полный �пи�ок надгробий";
< 		$text['in'] = "в";
< 		$text['showmap'] = "Показать карту";
< 		$text['headstonefor'] = "�адгробие дл�";
< 		$text['photoof'] = "Фото";
< 		$text['firstpage'] = "Перва� �траница";
< 		$text['lastpage'] = "По�ледн�� �траница";
< 		$text['photoowner'] = "Владелец/И�точник";
< 		$text['nocemetery'] = "�ет кладбища";
< 		$text['iptc005'] = "�азвание";
< 		$text['iptc020'] = "Дополнительные категории";
< 		$text['iptc040'] = "Специальные ин�трукции";
< 		$text['iptc055'] = "Дата �оздани�";
< 		$text['iptc080'] = "�втор";
< 		$text['iptc085'] = "Должно�ть автора";
< 		$text['iptc090'] = "Город";
< 		$text['iptc095'] = "Штат/провинци�";
< 		$text['iptc101'] = "Страна";
< 		$text['iptc103'] = "OTR";
< 		$text['iptc105'] = "Заголовок";
< 		$text['iptc110'] = "И�точник";
< 		$text['iptc115'] = "И�точник фото";
< 		$text['iptc116'] = "Уведомление об автор�ких правах";
< 		$text['iptc120'] = "титр";
< 		$text['iptc122'] = "Подпи�ь пи�ател�";
< 		$text['mapof'] = "Карта";
< 		$text['regphotos'] = "Подробный вид";
< 		$text['gallery'] = "Только миниатюры";
< 		$text['cemphotos'] = "Фотографии кладбищ";
< 		$text['photosize'] = "Габаритные размеры";
< 		$text['iptc010'] = "Приоритет";
< 		$text['filesize'] = "Размер файла";
< 		$text['seeloc'] = "См. ме�тоположение";
< 		$text['showall'] = "Показать в�е";
< 		$text['editmedia'] = "Редактировать медиафайл";
< 		$text['viewitem'] = "Про�мотреть �тот �лемент";
< 		$text['editcem'] = "Редактировать кладбище";
< 		$text['numitems'] = "# Предметов";
< 		$text['allalbums'] = "В�е альбомы";
< 		$text['slidestop'] = "Пауза Слайд-шоу";
< 		$text['slideresume'] = "Показ �лайдов";
< 		$text['slidesecs'] = "Секунды дл� каждого �лайда:";
< 		$text['minussecs'] = "мину� 0,5 �екунды";
< 		$text['plussecs'] = "плю� 0,5 �екунды";
< 		$text['nocountry'] = "�еизве�тна� �трана";
< 		$text['nostate'] = "�еизве�тный штат";
< 		$text['nocounty'] = "�еизве�тный район";
< 		$text['nocity'] = "�еизве�тный город";
< 		$text['nocemname'] = "�еизве�тное название кладбища";
< 		$text['editalbum'] = "Редактировать альбом";
< 		$text['mediamaptext'] = "<strong>Примечание:</strong> Переме�тите указатель мыши на изображение, чтобы отобразить имена. �ажмите, чтобы про�мотреть �траницу дл� каждого имени.";
< 		//added in 8.0.0
< 		$text['allburials'] = "В�е погребени�";
< 		$text['moreinfo'] = "�ажмите дл� получени� дополнительной информации об �том изображении";
< 		//added in 9.0.0
< 		$text['iptc025'] = "Ключевые �лова";
< 		$text['iptc092'] = "Суб-ме�то";
< 		$text['iptc015'] = "Категори�";
< 		$text['iptc065'] = "И�ходна� программа";
< 		$text['iptc070'] = "Вер�и� программы";
< 		break;
< 
< 	//surnames.php, surnames100.php, surnames-all.php, surnames-oneletter.php
< 	case "surnames":
< 	case "places":
< 		$text['surnamesstarting'] = "Показать фамилии на букву";
< 		$text['showtop'] = "Показать попул�рные";
< 		$text['showallsurnames'] = "Фамилии в виде �пи�ка";
< 		$text['sortedalpha'] = "в алфавитном пор�дке";
< 		$text['byoccurrence'] = "и упор�дочить по дате прои�хождени�";
< 		$text['firstchars'] = "Первые �имволы";
< 		$text['mainsurnamepage'] = "Фамилии в виде диаграммы";
< 		$text['allsurnames'] = "В�е фамилии";
< 		$text['showmatchingsurnames'] = "�ажмите на фамилию, чтобы показать �оответ�твующие запи�и.";
< 		$text['backtotop'] = "�аверх";
< 		$text['beginswith'] = "�ачинает�� на";
< 		$text['allbeginningwith'] = "В�е фамилии на букву";
< 		$text['numoccurrences'] = "общее количе�тво ме�т (на�еленных пунктов) в �кобках";
< 		$text['placesstarting'] = "Ме�та на букву";
< 		$text['showmatchingplaces'] = "�ажмите на ме�то, чтобы показать меньшие на�еленные пункты. �ажмите на значок пои�ка, чтобы показать �оответ�твующих людей.";
< 		$text['totalnames'] = "из общего чи�ла";
< 		$text['showallplaces'] = "Показать в�е ме�та (на�еленные пункты)";
< 		$text['totalplaces'] = "из общего чи�ла";
< 		$text['mainplacepage'] = "Главна� �траница ме�т (на�еленных пунктов)";
< 		$text['allplaces'] = "В�е крупнейшие на�еленные пункты";
< 		$text['placescont'] = "Пои�к ме�т (на�еленных пунктов)";
< 		//changed in 8.0.0
< 		$text['top30'] = "Попул�рные xxx фамилий";
< 		$text['top30places'] = "Попул�рные xxx ме�т";
< 		//added in 12.0.0
< 		$text['firstnamelist'] = "Имена"; //Имена, данные при крещении?
< 		$text['firstnamesstarting'] = "Показать имена на букву";
< 		$text['showallfirstnames'] = "Имена в виде �пи�ка";
< 		$text['mainfirstnamepage'] = "Имена в виде диаграммы";
< 		$text['allfirstnames'] = "В�е имена";
< 		$text['showmatchingfirstnames'] = "�ажмите на им�, чтобы отобразить �оответ�твующие запи�и.";
< 		$text['allfirstbegwith'] = "В�е имена на букву";
< 		$text['top30first'] = "Попул�рные xxx имён";
< 		$text['allothers'] = "В�е о�тальные";
< 		$text['amongall'] = "(�реди в�ех имен)";
< 		$text['justtop'] = "Про�то ххх попул�рных";
< 		break;
< 
< 	//whatsnew.php
< 	case "whatsnew":
< 		$text['pastxdays'] = "(за по�ледние xx дней)";
< 
< 		$text['photo'] = "Фото";
< 		$text['history'] = "И�тори�/Документ";
< 		$text['husbid'] = "ID-отца";
< 		$text['husbname'] = "Им� отца";
< 		$text['wifeid'] = "ID-матери";
< 		//added in 11.0.0
< 		$text['wifename'] = "Им� матери";
< 		break;
< 
< 	//timeline.php, timeline2.php
< 	case "timeline":
< 		$text['text_delete'] = "Удалить";
< 		$text['addperson'] = "Добавить человека";
< 		$text['nobirth'] = "Этот человек не имеют дей�твительную дату рождени� и не может быть добавлен";
< 		$text['event'] = "Событие(�)";
< 		$text['chartwidth'] = "Ширина диаграммы";
< 		$text['timelineinstr'] = "Добавить людей";
< 		$text['togglelines'] = "Тумблер линии";
< 		//changed in 9.0.0
< 		$text['noliving'] = "Следующий человек помечен как живой или �екретный и не может быть добавлен, потому что вы не вошли в �и�тему � надлежащими разрешени�ми";
< 		break;
< 		
< 	//browsetrees.php
< 	//login.php, newacctform.php, addnewacct.php
< 	case "trees":
< 	case "login":
< 		$text['browsealltrees'] = "Про�мотр в�ех деревьев";
< 		$text['treename'] = "Генеалогиче�кое древо";
< 		$text['owner'] = "Владелец";
< 		$text['address'] = "�дре�";
< 		$text['city'] = "Город";
< 		$text['state'] = "Обла�ть";
< 		$text['zip'] = "Почтовый индек�";
< 		$text['country'] = "Страна";
< 		$text['email'] = "E-mail адре�";
< 		$text['phone'] = "Телефон";
< 		$text['username'] = "Логин";
< 		$text['password'] = "Пароль";
< 		$text['loginfailed'] = "�еправильный логин или пароль.";
< 
< 		$text['regnewacct'] = "Создать новую учётную запи�ь";
< 		$text['realname'] = "�а�то�щее им�";
< 		$text['phone'] = "Телефон";
< 		$text['email'] = "E-mail адре�";
< 		$text['address'] = "�дре�";
< 		$text['acctcomments'] = "Примечани� или комментарии";
< 		$text['submit'] = "Отправить";
< 		$text['leaveblank'] = "(О�тавьте пу�тым, е�ли запрашивает�� новое генеалогиче�кое древо)";
< 		$text['required'] = " Об�зательные пол�";
< 		$text['enterpassword'] = "Введите пароль.";
< 		$text['enterusername'] = "Введите логин.";
< 		$text['failure'] = "К �ожалению введенное Вами им� пользовател� уже и�пользует��. Пожалуй�та, и�пользуйте кнопку �азад в вашем браузере, чтобы вернуть�� на предыдущую �траницу и выберите другое им� пользовател�.";
< 		$text['success'] = "Спа�ибо. Мы получили вашы данные дл� реги�трации. Мы �в�жем�� � Вами, когда Ваш профиль будет активирован или потребует�� дополнительна� информаци�.";
< 		$text['emailsubject'] = "�овый пользователь TNG";
< 		$text['website'] = "Веб-�айт";
< 		$text['nologin'] = "Ещё не зареги�трированы?";
< 		$text['loginsent'] = "Информаци� дл� входа отправлена";
< 		$text['loginnotsent'] = "Информаци� дл� входа не отправлена";
< 		$text['enterrealname'] = "Введите Ваше на�то�щее им�.";
< 		$text['rempass'] = "Запомнить пароль на �том компьютере";
< 		$text['morestats'] = "Дополнительна� �тати�тика";
< 		$text['accmail'] = "<strong>Внимание:</strong> Дл� получени� подтверждени� реги�трации от �дмини�тратора �айта, убедите�ь что не блокирует�� адре� �того домена.";
< 		$text['newpassword'] = "�овый пароль";
< 		$text['resetpass'] = "Сбро�ить пароль";
< 		$text['nousers'] = "Эта форма не может быть и�пользован до тех пор, по крайней мере, одна запи�ь пользовател� �уще�твует. Е�ли вы �вл�ете�ь владельцем �айта, пожалуй�та, перейдите на админи�тратора / пользователей дл� �оздани� учетной запи�и админи�тратора.";
< 		$text['noregs'] = "К �ожалению, но мы не принимаем реги�трацию новых пользователей в на�то�щее врем�. Пожалуй�та <a href=\"suggest.php\">�в�жите�ь � админи�тратором</a> напр�мую, е�ли у ва� е�ть замечани� или вопро�ы отно�ительно чего-либо на �том �айте.";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "Вы получили новый запро� дл� учетной запи�и пользовател� TNG. Пожалуй�та, войдите в Вашу панель �дмини�тратора что бы задать �оответ�твующие разрешени� дл� �той новой учетной запи�и.";
< 		$text['accactive'] = "Учетна� запи�ь была активирована, но пользователь не будет иметь никаких о�обых прав, пока не назначать их.";
< 		$text['accinactive'] = "Зайдите в �дмини�трирование/Пользователи/Обзор дл� до�тупа к на�тройкам учетной запи�и. Учётна� запи�ь будет о�тавать�� неактивным, пока её не отредактировать и не �охран�ть  по крайней мере, один раз.";
< 		$text['pwdagain'] = "Пороль ещё раз";
< 		$text['enterpassword2'] = "Пожалуй�та, введите пароль ещё раз.";
< 		$text['pwdsmatch'] = "Ваши пароли не �овпадают. Введите один и тот же пароль в оба пол�.";
< 		//added in 8.0.0
< 		$text['acksubject'] = "Благодарим Ва� за реги�трацию"; //for a new user account
< 		$text['ackmessage'] = "Ваш запро� на реги�трацию учётной запи�и получен. Ваша учетна� запи�ь будет неактивна, пока она не будет ра��мотрена админи�тратором �айта. Вы будете уведомлены по �лектронной почте, когда ваш логин будет готов к и�пользованию.";
< 		//added in 12.0.0
< 		$text['switch'] = "Переключатель";
< 		break;
< 
< 	//added in 10.0.0
< 	case "branches":
< 		$text['browseallbranches'] = "Про�мотр в�ех ветвей";
< 		break;
< 
< 	//statistics.php
< 	case "stats":
< 		$text['quantity'] = "В�его";
< 		$text['totindividuals'] = "В�его людей";
< 		$text['totmales'] = "В�его мужчин";
< 		$text['totfemales'] = "В�его женщин";
< 		$text['totunknown'] = "В�его � неизве�тным полом";
< 		$text['totliving'] = "В�его живущих";
< 		$text['totfamilies'] = "В�его �емей";
< 		$text['totuniquesn'] = "В�его уникальных фамилий";
< 		//$text['totphotos'] = "Total Photos";
< 		//$text['totdocs'] = "Total Histories &amp; Documents";
< 		//$text['totheadstones'] = "Total Headstones";
< 		$text['totsources'] = "В�его и�точников";
< 		$text['avglifespan'] = "Средн�� продолжительно�ть жизни";
< 		$text['earliestbirth'] = "Сама� ранн�� дата рождени�";
< 		$text['longestlived'] = "Долгожители";
< 		$text['days'] = "дней";
< 		$text['age'] = "Возра�т";
< 		$text['agedisclaimer'] = "Стати�тика продолжительно�ти жизни ра�читывает�� по запи��м о люд�х, � указанными датами рождени� и �мерти. Е�ли информаци� не полна� (например одна из дат указана не полно�тью, только год &#171;1945&#187; или только год и ме��ц без чи�ла &#171;май 1755&#187;),  то точно�ть ра�чётов не будет 100%-ой. Периоды &#171;�&#187;, &#171;до&#187;, &#171;по�ле&#187;, &#171;приблизительно&#187;, &#171;между&#187; и т.п. в ра�чётах не уча�твуют.";
< 		$text['treedetail'] = "Иформаци� о древе";
< 		$text['total'] = "В�его";
< 		//added in 12.0
< 		$text['totdeceased'] = "В�его умерших";
< 		break;
< 
< 	case "notes":
< 		$text['browseallnotes'] = "Про�мотр в�ех заметок";
< 		break;
< 
< 	case "help":
< 		$text['menuhelp'] = "Кнопка меню";
< 		break;
< 
< 	case "install":
< 		$text['perms'] = "В�е разрешени� были  у�тановлены.";
< 		$text['noperms'] = "Права до�тупа не могут быть у�тановлены ​​дл� �тих файлов:";
< 		$text['manual'] = "Пожалуй�та, у�тановите их вручную.";
< 		$text['folder'] = "Папка";
< 		$text['created'] = "была �оздана";
< 		$text['nocreate'] = "не может быть �оздана. Пожалуй�та, �оздайте её вручную.";
< 		$text['infosaved'] = "Информаци� �охранена, подключение проверено!";
< 		$text['tablescr'] = "Таблицы были �озданы!";
< 		$text['notables'] = "Таблицы не могут быть �озданы:";
< 		$text['nocomm'] = "TNG не не может �оединить�� � базой данных. Таблицы не были �озданы.";
< 		$text['newdb'] = "Информаци� �охранена, подключение проверено, �оздана нова� база данных:";
< 		$text['noattach'] = "Информаци� �охранена. Соединение у�тановлено и базы данных �оздана, но TNG не может подключить�� к ней.";
< 		$text['nodb'] = "Информаци� �охранена. Соединени� у�тановлено, но база данных не �уще�твует и не может быть �оздана. Пожалуй�та, убедите�ь, что им� базы данных правильное и е�ть права у пользовател� базы данных, или зайдите в панель управлени� дл� её �оздани�.";
< 		$text['noconn'] = "Информаци� �охранена, но �оединение не у�тановлено. �е выполнено одно или не�колько из �ледующих у�ловий:";
< 		$text['exists'] = "уже �уще�твует";
< 		$text['loginfirst'] = "Сначала Вы должны о�уще�твить вход.";
< 		$text['noop'] = "Операци� не выполн�ла�ь.";
< 		//added in 8.0.0
< 		$text['nouser'] = "Пользователь не был �оздан. Возможно, им� пользовател� уже �уще�твует.";
< 		$text['notree'] = "Генеалогиче�кое древо не было �оздано. �омер генеалогиче�кого древа может уже �уще�твовать.";
< 		$text['infosaved2'] = "Информаци� �охранена";
< 		$text['renamedto'] = "переименовано в";
< 		$text['norename'] = "�е может быть переименовано";
< 		break;
< 
< 	case "imgviewer":
< 		$text['zoomin'] = "Увеличить";
< 		$text['zoomout'] = "Уменьшить";
< 		$text['magmode'] = "Режим увеличени�";
< 		$text['panmode'] = "Режим про�мотра";
< 		$text['pan'] = "�ажмите и перетащите дл� перемещени� по изображению";
< 		$text['fitwidth'] = "Впи�ать по ширине";
< 		$text['fitheight'] = "Впи�ать по вы�оте";
< 		$text['newwin'] = "�овое окно";
< 		$text['opennw'] = "Открыть изображение в новом окне";
< 		$text['magnifyreg'] = "�ажмите, чтобы увеличить обла�ть изображени�";
< 		$text['imgctrls'] = "Включить �лементы управлени� изображением";
< 		$text['vwrctrls'] = "Включить �лементы управлени� про�мотрщика изображений";
< 		$text['vwrclose'] = "Закрыть про�мотрщик изображений";
< 		break;
< 
< 	case "dna":
< 		$text['test_date'] = "Дата те�та";
< 		$text['links'] = "Соответ�твующие ��ылки";
< 		$text['testid'] = "ID те�та";
< 		//added in 12.0.0
< 		$text['mode_values'] = "Значени� режима";
< 		$text['compareselected'] = "Сравнить выбранные";
< 		$text['dnatestscompare'] = "Сравнить те�ты Y-DNA";
< 		$text['keep_name_private'] = "Хранить приватно";
< 		$text['browsealltests'] = "Про�мотр в�ех те�тов";
< 		$text['all_dna_tests'] = "В�е те�ты Д�К";
< 		$text['fastmutating'] = "Бы�трые & NBSP; мутации";
< 		$text['dna_info_head'] = "Данные те�та Д�К";
< 		$text['alltypes'] = "В�е типы";
< 		$text['allgroups'] = "В�е группы";
< 		$text['Ydna_LITbox_info'] = "Те�т(ы), �в�занный � �тим человеком, не об�зательно проводили�ь � �тим человеком.<br />в �толбце &#171;Гаплогруппа&#187; данные отображают�� кра�ным цветом, е�ли результат &#171;Пред�казан&#187;, и зелёным, е�ли те�т &#171;Подтверждён&#187;.";
< 		break;
< }
< 
< //common
< $text['matches'] = "Совпадени�";
< $text['description'] = "Опи�ание";
< $text['notes'] = "Заметки";
< $text['status'] = "Стату�";
< $text['newsearch'] = "�овый Пои�к";
< $text['pedigree'] = "Родо�ловна�";
< $text['birthabbr'] = "Р.";
< $text['chrabbr'] = "кр.";
< $text['seephoto'] = "По�мотреть фото";
< $text['andlocation'] = "и ме�тоположение";
< $text['accessedby'] = "До�туп из";
< $text['family'] = "Семь�"; //from getperson
< $text['children'] = "Дети";  //from getperson
< $text['tree'] = "Генеалогиче�кое древо";
< $text['alltrees'] = "В�е древе�а";
< $text['nosurname'] = "[без фамилии]";
< $text['thumb'] = "Миниатюра";  //as in Thumbnail
< $text['people'] = "Люди";
< $text['title'] = "�азвание";  //from getperson
< $text['suffix'] = "Суффик�";  //from getperson
< $text['nickname'] = "Прозвище";  //from getperson
< $text['deathabbr'] = "�.";  //from descend
< $text['lastmodified'] = "По�леднее изменение";  //from getperson
< $text['married'] = "Брако�очетание";  //from getperson
< //$text['photos'] = "Photos";
< $text['name'] = "Им�"; //from showmap
< $text['lastfirst'] = "Фамили�, Им�";  //from search
< $text['bornchr'] = "Рождение/Крещение";  //from search
< $text['individuals'] = "Люди";  //from whats new
< $text['families'] = "Семьи";
< $text['personid'] = "ID человека";
< $text['sources'] = "И�точники";  //from getperson (next several)
< $text['unknown'] = "�еизве�тно";
< $text['father'] = "Отец";
< $text['mother'] = "Мать";
< $text['christened'] = "Крещение";
< $text['died'] = "Смерть";
< $text['buried'] = "Погребение";
< $text['spouse'] = "Супруг(а)";  //from search
< $text['parents'] = "Родители";  //from pedigree
< $text['text'] = "Тек�т";  //from sources
< $text['language'] = "Язык";  //from languages
< $text['burialabbr'] = "пгрб.";  //from descend
< $text['descendchart'] = "Диаграмма прои�хождени�";
< $text['extractgedcom'] = "GEDCOM";
< $text['indinfo'] = "Информаци� о человеке";
< $text['edit'] = "Редактировать";
< $text['date'] = "Дата";
< $text['place'] = "Ме�то";
< $text['login'] = "Войти";
< $text['logout'] = "Выйти";
< $text['marrabbr'] = "m.";
< $text['groupsheet'] = "Семейна� ведомо�ть";
< $text['text_and'] = "и";
< $text['generation'] = "Поколение";
< $text['filename'] = "Им� файла";
< $text['id'] = "ID";
< $text['search'] = "Пои�к";
< $text['user'] = "Пользователь";
< $text['firstname'] = "Им�";
< $text['lastname'] = "Фамили�";
< $text['searchresults'] = "Результаты Пои�ка";
< $text['diedburied'] = "Смерть/Погребение";
< $text['homepage'] = "Главна�";
< $text['find'] = "�айти...";
< $text['relationship'] = "Род�тво";		//in German, Verwandtschaft
< $text['relationship2'] = "Отношение"; //different in some languages, at least in German (Beziehung)
< $text['timeline'] = "Хронологи�";
< $text['yesabbr'] = "Y";               //abbreviation for 'yes'
< $text['divorced'] = "Разведен(а)";
< $text['indlinked'] = "Св�зано �";
< $text['branch'] = "Ветвь";
< $text['moreind'] = "Ещё люди";
< $text['morefam'] = "Ещё �емьи";
< $text['source'] = "И�точник";
< $text['surnamelist'] = "Спи�ок фамилий";
< $text['generations'] = "Поколени�";
< $text['refresh'] = "Обновить";
< $text['whatsnew'] = "Что нового";
< $text['reports'] = "Отчёты";
< $text['placelist'] = "Спи�ок ме�т";
< $text['baptizedlds'] = "Крещение (СПД)";
< $text['endowedlds'] = "Пожертвование (СПД)";
< $text['sealedplds'] = "Запечатывание P (СПД)";
< $text['sealedslds'] = "Запечатывание S (СПД)";
< $text['ancestors'] = "Предки";
< $text['descendants'] = "Потомки";
< //$text['sex'] = "Sex";
< $text['lastimportdate'] = "Дата по�леднего импорта GEDCOM";
< $text['type'] = "Тип";
< $text['savechanges'] = "Сохранить изменени�";
< $text['familyid'] = "ID �емьи";
< $text['headstone'] = "�адгробие";
< $text['historiesdocs'] = "И�тории";
< $text['anonymous'] = "анонимно";
< $text['places'] = "Ме�та";
< $text['anniversaries'] = "Даты и юбилеи";
< $text['administration'] = "�дмини�трирование";
< $text['help'] = "Помощь";
< //$text['documents'] = "Documents";
< $text['year'] = "Год";
< $text['all'] = "В�е";
< $text['repository'] = "�рхив";
< $text['address'] = "�дре�";
< $text['suggest'] = "Замечани�";
< $text['editevent'] = "Предложить изменени� дл� �того �обыти�";
< $text['findplaces'] = "�айти в�ех людей � �обыти�ми в �том ме�те";
< $text['morelinks'] = "Другие ��ылки";
< $text['faminfo'] = "Семейна� информаци�";
< $text['persinfo'] = "Лична� информаци�";
< $text['srcinfo'] = "И�точник информации";
< $text['fact'] = "Факт";
< $text['goto'] = "Выбери �траницу";
< $text['tngprint'] = "Печать";
< $text['databasestatistics'] = "Стати�тика"; //needed to be shorter to fit on menu
< $text['child'] = "ребёнок";  //from familygroup
< $text['repoinfo'] = "Информаци� об архиве";
< $text['tng_reset'] = "Сбро�";
< $text['noresults'] = "Результаты не найдены";
< $text['allmedia'] = "В�е медиафайлы";
< $text['repositories'] = "�рхивы";
< $text['albums'] = "�льбомы";
< $text['cemeteries'] = "Кладбища";
< $text['surnames'] = "Фамилии";
< $text['dates'] = "Даты";
< $text['link'] = "Сно�ка";
< $text['media'] = "Медиа"; //needed to be shorter to fit on menu
< $text['gender'] = "Пол";
< $text['latitude'] = "Широта";
< $text['longitude'] = "Долгота";
< $text['bookmarks'] = "Закладки";
< $text['bookmark'] = "Закладка";
< $text['mngbookmarks'] = "Перейти к закладкам";
< $text['bookmarked'] = "Закладка добавлена";
< $text['remove'] = "Удалить";
< $text['find_menu'] = "�айти";
< $text['info'] = "Инфо"; //this needs to be a very short abbreviation
< $text['cemetery'] = "Кладбище";
< $text['gmapevent'] = "Карта �обытий";
< $text['gevents'] = "Событие";
< $text['glang'] = "&amp;hl=ru";
< $text['googleearthlink'] = "С�ылка на Google Earth";
< $text['googlemaplink'] = "С�ылка на Google Maps";
< $text['gmaplegend'] = "Пин легенды";
< $text['unmarked'] = "�еотмеченный";
< $text['located'] = "Ра�положенный";
< $text['albclicksee'] = "�ажмите, чтобы увидеть в�е �лементы в �том альбоме";
< $text['notyetlocated'] = "Пока не найдено";
< $text['cremated'] = "Кремирован(а)";
< $text['missing'] = "Пропал(а)";
< $text['pdfgen'] = "Генератор PDF-файлов";
< $text['blank'] = "Пу�та� диаграмма";
< $text['none'] = "�икто";
< $text['fonts'] = "Шрифты";
< $text['header'] = "Шапка";
< $text['data'] = "Данные";
< $text['pgsetup'] = "Параметры �траницы";
< $text['pgsize'] = "Размер �траницы";
< $text['orient'] = "Ориентаци�"; //for a page
< $text['portrait'] = "Портрет";
< $text['landscape'] = "Ландшафт";
< $text['tmargin'] = "Верхнее Поле";
< $text['bmargin'] = "�ижнее Поле";
< $text['lmargin'] = "Левое Поле";
< $text['rmargin'] = "Правое Поле";
< $text['createch'] = "Создать PDF";
< $text['prefix'] = "Префик�";
< $text['mostwanted'] = "Розы�к";
< $text['latupdates'] = "По�ледние обновлени�";
< $text['featphoto'] = "Избранные фото";
< $text['news'] = "�ово�ти";
< $text['ourhist'] = "�аше �емейна� и�тори�";
< $text['ourhistanc'] = "�аша �емейна� и�тори� и родо�ловна�";
< $text['ourpages'] = "Страницы нашей �емейной генеалогии";
< $text['pwrdby'] = "Этот �айт работает на";
< $text['writby'] = "�втор:";
< $text['searchtngnet'] = "Пои�к �ети TNG (GENDEX)";
< $text['viewphotos'] = "По�мотр в�ех фотографии";
< $text['anon'] = "Вы в на�то�щее врем� анонимны";
< $text['whichbranch'] = "Из какой ветви Вы?";
< $text['featarts'] = "Избранные �татьи";
< $text['maintby'] = "Поддерживает";
< $text['createdon'] = "Создан";
< $text['reliability'] = "надёжно�ть";
< $text['labels'] = "Метки";
< $text['inclsrcs'] = "Включить и�точники";
< $text['cont'] = "(прод.)"; //abbreviation for continued
< $text['mnuheader'] = "Главна� �траница";
< $text['mnusearchfornames'] = "Пои�к имён";
< $text['mnulastname'] = "Фамили�";
< $text['mnufirstname'] = "Им�, отче�тво";
< $text['mnusearch'] = "Пои�к";
< $text['mnureset'] = "�ачать в�ё �начала";
< $text['mnulogon'] = "Вход";
< $text['mnulogout'] = "Выход";
< $text['mnufeatures'] = "Разделы �айта";
< $text['mnuregister'] = "Зареги�трировать��";
< $text['mnuadvancedsearch'] = "Ра�ширенный пои�к";
< $text['mnulastnames'] = "В�е фамилии";
< $text['mnustatistics'] = "Стати�тика";
< $text['mnuphotos'] = "Фотографии";
< $text['mnuhistories'] = "И�тории из жизни";
< $text['mnumyancestors'] = "Фотографии и и�тории предков";
< $text['mnucemeteries'] = "Кладбища";
< $text['mnutombstones'] = "�адгроби�";
< $text['mnureports'] = "Отчёты";
< $text['mnusources'] = "И�точники";
< $text['mnuwhatsnew'] = "Что нового";
< $text['mnushowlog'] = "По�ледние дей�тви�";
< $text['mnulanguage'] = "Изменить �зык";
< $text['mnuadmin'] = "�дмини�трирование";
< $text['welcome'] = "Добро пожаловать";
< $text['contactus'] = "Обратна� �в�зь";
< //changed in 8.0.0
< $text['born'] = "Рождение";
< $text['searchnames'] = "Пои�к людей";
< //added in 8.0.0
< $text['editperson'] = "Изменить человека";
< $text['loadmap'] = "Загрузить карту";
< $text['birth'] = "Рождение";
< $text['wasborn'] = "Родил��";
< $text['startnum'] = "Первый номер";
< $text['searching'] = "Пои�к";
< //moved here in 8.0.0
< $text['location'] = "Ме�тоположение";
< $text['association'] = "Взаимо�в�зь";
< $text['collapse'] = "Свернуть";
< $text['expand'] = "Развернуть";
< $text['plot'] = "Уча�ток";
< $text['searchfams'] = "Пои�к �емей";
< //added in 8.0.2
< $text['wasmarried'] = "Женат (Замужем)";
< $text['anddied'] = "Умер";
< //added in 9.0.0
< $text['share'] = "Поделить��";
< $text['hide'] = "Спр�тать";
< $text['disabled'] = "Ваша учетна� запи�ь была отключена. Пожалуй�та, обратите�ь к админи�тратору �айта дл� получени� дополнительной информации.";
< $text['contactus_long'] = "Е�ли у ва� возникли вопро�ы или замечани� по поводу информации на �том �айте, пожалуй�та, <span class=\"emphasis\"><a href=\"suggest.php\">�в�жите�ь � админи�тратором</a></span>. ";
< $text['features'] = "Разное";
< $text['resources'] = "С�ылки";
< $text['latestnews'] = "По�ледние ново�ти";
< $text['trees'] = "Древе�а";
< $text['wasburied'] = "был похоронен";
< //moved here in 9.0.0
< $text['emailagain'] = "Email повторно";
< $text['enteremail2'] = "Введите �вой адре� �лектронной почты ещё раз.";
< $text['emailsmatch'] = "Ваши адре�а не �овпадают. Пожалуй�та, введите тот же адре� в каждом поле.";
< $text['getdirections'] = "�ажмите, чтобы проложить маршрут";
< $text['calendar'] = "Календарь";
< //changed in 9.0.0
< $text['directionsto'] = " k ";
< $text['slidestart'] = "Показ �лайдов";
< $text['livingnote'] = "По крайней мере, один живой человек �в�зан � �той заметкой - детали �крыты.";
< $text['livingphoto'] = "По крайней мере, один живой человек �в�зан � �тим предметом - детали �крыты.";
< $text['waschristened'] = "Был крещён";
< //added in 10.0.0
< $text['branches'] = "Ветви";
< $text['detail'] = "Детально";
< $text['moredetail'] = "Больше деталей";
< $text['lessdetail'] = "Меньше деталей";
< $text['otherevents'] = "Другие критерии";
< $text['conflds'] = "Конфирмаци� (СПД)";
< $text['initlds'] = "По�в�щение (СПД)";
< $text['wascremated'] = "кремировали";
< //moved here in 11.0.0
< $text['text_for'] = "дл�";
< //added in 11.0.0
< $text['searchsite'] = "Пои�к по �айту";
< $text['searchsitemenu'] = "Пои�к";
< $text['kmlfile'] = "Загрузите файл .kml, чтобы отобразить �то ме�тоположение в Google Планета Земл�";
< $text['download'] = "�ажмите, чтобы �качать";
< $text['more'] = "Больше";
< $text['heatmap'] = "Теплокарта";
< $text['refreshmap'] = "Обновить карту";
< $text['remnums'] = "Очи�тить номера и маркеры";
< $text['photoshistories'] = "Фотографии и и�тории";
< $text['familychart'] = "Семейна� диаграмма";
< //added in 12.0.0
< $text['firstnames'] = "Имена";
< //moved here in 12.0.0
< $text['dna_test'] = "Те�т Д�К";
< $text['test_type'] = "Тип те�та";
< $text['test_info'] = "Информаци� о те�те";
< $text['takenby'] = "Вз�то";
< $text['haplogroup'] = "Гаплогруппа";
< $text['hvr1'] = "HVR1";
< $text['hvr2'] = "HVR2";
< $text['relevant_links'] = "Соответ�твующие ��ылки";
< $text['people_have'] = "люди �в�зали те�т Д�К �";
< $text['person_has'] = "человек �в�зал те�т Д�К �";
< $text['nofirstname'] = "[нет имени]";
< //added in 12.0.1
< $text['cookieuse'] = "Примечание: Этот �айт и�пользует файлы cookie.";
< $text['dataprotect'] = "Политика защиты данных";
< $text['viewpolicy'] = "Про�мотр политики";
< $text['understand'] = "Я понимаю";
< $text['consent'] = "Я даю �вое �огла�ие на хранение �тим �айтом личной информации, �обранной зде�ь. Я понимаю, что � могу попро�ить владельца �айта удалить �ту информацию в любое врем�.";
< $text['consentreq'] = "Пожалуй�та, дайте �вое �огла�ие на хранение �тим �айтом личной информации.";
< 
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> <?php
> switch ( $textpart ) {
> 	//browsesources.php, showsource.php
> 	case "sources":
> 		$text['browseallsources'] = "Про�мотр в�ех и�точников";
> 		$text['shorttitle'] = "Краткое название";
> 		$text['callnum'] = "�рхивный номер";
> 		$text['author'] = "�втор";
> 		$text['publisher'] = "Издатель";
> 		$text['other'] = "Друга� информаци�";
> 		$text['sourceid'] = "И�точник";
> 		$text['moresrc'] = "Больше и�точников";
> 		$text['repoid'] = "ID архива";
> 		$text['browseallrepos'] = "Показать в�е архивы";
> 		break;
> 
> 	//changelanguage.php, savelanguage.php
> 	case "language":
> 		$text['newlanguage'] = "�овый �зык";
> 		$text['changelanguage'] = "Изменить �зык";
> 		$text['languagesaved'] = "Язык �охранен";
> 		$text['sitemaint'] = "Выполн�ет�� об�луживание �айта";
> 		$text['standby'] = "Сайт временно недо�тупен в �в�зи � обновлением базы данных. Пожалуй�та, попробуйте через не�колько минут. Е�ли �айт недо�тупен длительное врем�, вы можете <a href=\"suggest.php\">�в�зать�� � админи�тратором</a>.";
> 		break;
> 
> 	//gedcom.php, gedform.php
> 	case "gedcom":
> 		$text['gedstart'] = "�ачать GEDCOM �";
> 		$text['producegedfrom'] = "Создать GEDCOM из";
> 		$text['numgens'] = "Количе�тво поколений";
> 		$text['includelds'] = "Включить информацию СПД";
> 		$text['buildged'] = "Создать GEDCOM";
> 		$text['gedstartfrom'] = "�ачать � GEDCOM";
> 		$text['nomaxgen'] = "Вы должны указать мак�имальное количе�тво поколений. Пожалуй�та, и�пользуйте кнопку &#171;�азад&#187;, чтобы вернуть�� на предыдущую �траницу и и�править ошибку";
> 		$text['gedcreatedfrom'] = "GEDCOM �оздан из";
> 		$text['gedcreatedfor'] = "предназначен дл�";
> 		$text['creategedfor'] = "Создать GEDCOM";
> 		$text['email'] = "Ваш Email";
> 		$text['suggestchange'] = "Предложить изменение";
> 		$text['yourname'] = "Ваше им�";
> 		$text['comments'] = "Опи�ание <br/>предлагаемых изменений";
> 		$text['comments2'] = "Комментарии";
> 		$text['submitsugg'] = "Отправить предложение";
> 		$text['proposed'] = "Предлагаемое изменение";
> 		$text['mailsent'] = "Спа�ибо. Ваше �ообщение было отправлено.";
> 		$text['mailnotsent'] = "Извините, но ваше �ообщение не может быть до�тавлено. Пожалуй�та, �в�жите�ь � xxx по yyy.";
> 		$text['mailme'] = "Отправить копию";
> 		$text['entername'] = "Пожалуй�та, введите Ваше им�";
> 		$text['entercomments'] = "Пожалуй�та, введите �вои комментарии";
> 		$text['sendmsg'] = "Отправить �ообщение";
> 		//added in 9.0.0
> 		$text['subject'] = "Тема";
> 		break;
> 
> 	//getextras.php, getperson.php
> 	case "getperson":
> 		$text['photoshistoriesfor'] = "Фотографии и и�тории дл�";
> 		$text['indinfofor'] = "Индивидуальна� информаци� дл�";
> 		$text['pp'] = "�тр."; //page abbreviation
> 		$text['age'] = "Возра�т";
> 		$text['agency'] = "�гент�тво";
> 		$text['cause'] = "Причина";
> 		$text['suggested'] = "Предложенный";
> 		$text['closewindow'] = "Закрыть окно";
> 		$text['thanks'] = "Спа�ибо";
> 		$text['received'] = "Ваше предложение было отправлено админи�тратору �айта дл� ознакомлени�.";
> 		$text['indreport'] = "Индивидуальный отчёт";
> 		$text['indreportfor'] = "Индивидуальный отчёт дл�";
> 		$text['bkmkvis'] = "<strong>Примечание:</strong> Эти закладки видны только на �том компьютере и только в �том браузере.";
>         //added in 9.0.0
> 		$text['reviewmsg'] = "У ва� е�ть предлагаемое изменение, которое требует вашей оценки. Это пред�тавление ка�ает��:";
>         $text['revsubject'] = "Предлагаемое изменение требует вашей оценки";
>         break;
> 
> 	//relateform.php, relationship.php, findpersonform.php, findperson.php
> 	case "relate":
> 	case "connections":
> 		$text['relcalc'] = "Калькул�тор отношений";
> 		$text['findrel'] = "�айти род�твенников";
> 		$text['person1'] = "Человек 1:";
> 		$text['person2'] = "Человек 2:";
> 		$text['calculate'] = "Ра�читать";
> 		$text['select2inds'] = "Пожалуй�та, выберите двух человек.";
> 		$text['findpersonid'] = "�айти идентификатор лица";
> 		$text['enternamepart'] = "введите ча�ть имени и/или фамилии";
> 		$text['pleasenamepart'] = "Введите ча�ть имени или фамилии.";
> 		$text['clicktoselect'] = "нажмите, чтобы выбрать";
> 		$text['nobirthinfo'] = "�ет информации о рождении";
> 		$text['relateto'] = "Св�зь �";
> 		$text['sameperson'] = "Эти два человека - один и тот же человек.";
> 		$text['notrelated'] = "Эти два человека не �в�заны в поколени�х ххх."; //xxx will be replaced with number of generations
> 		$text['findrelinstr'] = "Чтобы отобразить �в�зь между двум� людьми, и�пользуйте кнопки «�айти» ниже, чтобы найти людей (или �охранить людей на �кране), затем нажмите «Ра��читать».";
> 		$text['sometimes'] = "(Иногда проверка по другому количе�тву поколений дает другой результат.)";
> 		$text['findanother'] = "�айти другое отношение";
> 		$text['brother'] = "брат";
> 		$text['sister'] = "�е�тра";
> 		$text['sibling'] = "брат";
> 		$text['uncle'] = "ххх д�д�";
> 		$text['aunt'] = "тёт� xxx";
> 		$text['uncleaunt'] = "ххх д�д�/тёт�";
> 		$text['nephew'] = "плем�нник xxx";
> 		$text['niece'] = "плем�нница xxx";
> 		$text['nephnc'] = "плем�нник/плем�нница xxx";
> 		$text['removed'] = "раз(а) удалено";
> 		$text['rhusband'] = "муж";
> 		$text['rwife'] = "жена";
> 		$text['rspouse'] = "�упруга";
> 		$text['son'] = "�ын";
> 		$text['daughter'] = "дочь";
> 		$text['rchild'] = "ребенок";
> 		$text['sil'] = "з�ть";
> 		$text['dil'] = "неве�тка";
> 		$text['sdil'] = "�ын или неве�тка";
> 		$text['gson'] = "внук xxx";
> 		$text['gdau'] = "внучка xxx";
> 		$text['gsondau'] = "внук xxx";
> 		$text['great'] = "Великий";
> 		$text['spouses'] = "�упруги";
> 		$text['is'] = "�вл�ет��";
> 		$text['changeto'] = "Изменить на (введите идентификатор):";
> 		$text['notvalid'] = "не �вл�ет�� допу�тимым идентификатором человека или не �уще�твует в �той базе данных. Пожалуй�та, попробуйте ещё раз.";
> 		$text['halfbrother'] = "�водный брат";
> 		$text['halfsister'] = "�водна� �е�тра";
> 		$text['halfsibling'] = "�водный брат или �е�тра";
> 		//changed in 8.0.0
> 		$text['gencheck'] = "Мак�имальное количе�тво поколений дл� проверки";
> 		$text['mcousin'] = "xxx двоюродный брат yyy";  //male cousin; xxx = cousin number, yyy = times removed
> 		$text['fcousin'] = "xxx двоюродна� �е�тра yyy";  //female cousin
> 		$text['cousin'] = "xxx двоюродный брат yyy";
> 		$text['mhalfcousin'] = "xxx �водный двоюродный брат yyy";  //male cousin
> 		$text['fhalfcousin'] = "xxx �водна� двоюродна� �е�тра yyy";  //female cousin
> 		$text['halfcousin'] = "xxx �водный двоюродный брат yyy";
> 		//added in 8.0.0
> 		$text['oneremoved'] = "по�ле удалени�";
> 		$text['gfath'] = "ххх дедушка";
> 		$text['gmoth'] = "xxx бабушка";
> 		$text['gpar'] = "прародитель xxx";
> 		$text['mothof'] = "мать";
> 		$text['fathof'] = "отец";
> 		$text['parof'] = "родитель";
> 		$text['maxrels'] = "Мак�имум отношений дл� показа";
> 		$text['dospouses'] = "Показать отношени� � уча�тием �упруга";
> 		$text['rels'] = "Отношени�";
> 		$text['dospouses2'] = "Показать �упругов";
> 		$text['fil'] = "те�ть";
> 		$text['mil'] = "теща";
> 		$text['fmil'] = "отец или �векровь";
> 		$text['stepson'] = "па�ынок";
> 		$text['stepdau'] = "падчерица";
> 		$text['stepchild'] = "падчерица";
> 		$text['stepgson'] = "приемный внук xxx";
> 		$text['stepgdau'] = "приемна� внучка xxx";
> 		$text['stepgchild'] = "приемный внук xxx";
> 		//added in 8.1.1
> 		$text['ggreat'] = "пра";
> 		//added in 8.1.2
> 		$text['ggfath'] = "ххх прадедушка";
> 		$text['ggmoth'] = "ххх прабабушка";
> 		$text['ggpar'] = "ххх прародитель";
> 		$text['ggson'] = "ххх правнук";
> 		$text['ggdau'] = "ххх правнучка";
> 		$text['ggsondau'] = "ххх правнук";
> 		$text['gstepgson'] = "xxx приемный правнук";
> 		$text['gstepgdau'] = "xxx приемна� правнучка";
> 		$text['gstepgchild'] = "ххх приемный правнук";
> 		$text['guncle'] = "ххх прад�д�";
> 		$text['gaunt'] = "ххх пратёт� xxx";
> 		$text['guncleaunt'] = "ххх прад�д�/пратёт�";
> 		$text['gnephew'] = "ххх праплем�нник";
> 		$text['gniece'] = "ххх праплем�нница";
> 		$text['gnephnc'] = "ххх праплем�нник/праплем�нница";
> 		//added in 14.0
> 		$text['pathscalc'] = "Пои�к �в�зей";
> 		$text['findrel2'] = "�айдите отношени� и другие �в�зи";
> 		$text['makeme2nd'] = "И�пользовать мой ID";
> 		$text['usebookmarks'] = "И�пользовать закладки";
> 		$text['select2inds'] = "Пожалуй�та, выберите двух человек.";
> 		$text['indinfofor'] = "Индивидуальна� информаци� дл�";
> 		$text['nobookmarks'] = "�ет закладок дл� и�пользовани�";
> 		$text['bkmtitle'] = "Люди, обнаруженные в закладках";
> 		$text['bkminfo'] = "Выберите человека:";
> 		$text['sortpathsby'] = "Сортировка путей по количе�тву";
> 		$text['sortbyshort'] = "Сортировать по";
> 		$text['bylengthshort'] = "Длине";
> 		$text['badID1'] = ": плохой идентификатор person1 - пожалуй�та, верните�ь назад и и�правьте";
> 		$text['badID2'] = ": плохой идентификатор person2 - пожалуй�та, верните�ь назад и и�правьте";
> 		$text['notintree'] = ": человека � �тим идентификатором нет в текущей базе данных древа.";
> 		$text['sameperson'] = "Эти два человека - один и тот же человек.";;
> 		$text['nopaths'] = "Эти люди не �в�заны между �обой.";
> 		$text['nopaths1'] = "Больше никаких �оединений короче xxx";
> 		$text['nopaths2'] = "в xxx шагах пои�ка";
> 		$text['longestpath'] = "(�амый длинный проверенный путь был длиной в xxx шагов)";
> 		$text['relevantpaths'] = "Количе�тво найденных различных �оответ�твующих путей: xxx";
> 		$text['skipMarr'] = "(iкроме того, количе�тво путей, найденных, но не отображенных из-за �лишком большого количе�тва браков, было: xxx)";
> 		$text['mjaor'] = "или";
> 		$text['connectionsto'] = "Соединени� � ";
> 		$text['findanotherpers'] = "�айди другого человека...";
> 		$text['sometimes'] = "(Иногда проверка по другому количе�тву поколений дает другой результат.)";
> 		$text['anotherpath'] = "Пои�к других �в�зей";
> 		$text['xpath'] = "Путь ";
> 		$text['primary'] = "�ачальный человек"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Конечный человек";
> 		$text['parent'] = "Родитель";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "her daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "отец";
> 		$text['hmother'] = "мать";
> 		$text['hhusband'] = "муж";
> 		$text['hwife'] = "жена";
> 		$text['hson'] = "�ын";
> 		$text['hdaughter'] = "дочь";
> 		$text['maxruns'] = "Мак�имальное количе�тво путей, подлежащих проверке";
> 		$text['maxrshort'] = "Мак�имальное количе�тво путей";
> 		$text['maxlength'] = "Пути подключени� не длиннее, чем";
> 		$text['maxlshort'] = "Мак�имальна� длина";
> 		$text['xstep'] = "шаг";
> 		$text['xsteps'] = "шаги";
> 		$text['xmarriages'] = "xxx брако�очетаний";
> 		$text['xmarriage'] = "1 брако�очетание";
> 		$text['showspouses'] = "Показать обоих �упругов";
> 		$text['showTxt'] = "Показать тек�товое опи�ание пути";
> 		$text['showTxtshort'] = "Тек�товое опи�ание.";
> 		$text['compactBox'] = "Отображить �жатые карточки людей";
> 		$text['compactBoxshort'] = "Компактные карточки";
> 		$text['paths'] = "Пути";
> 		$text['dospouses2'] = "Показать �упругов";
> 		$text['maxmopt'] = "Мак�имальное количе�тво браков на одну �в�зь";
> 		$text['maxm'] = "Мак�имальное количе�тво браков";
> 		$text['arerelated'] = "Эти люди �вл�ют�� род�твенниками - их отношени� показаны на траектории 1";
> 		$text['simplerel'] = "Про�той пои�к отношений";
> 		break;
> 
> 	case "familygroup":
> 		$text['familygroupfor'] = "Семейна� ведомо�ть дл�";
> 		$text['ldsords'] = "Таин�тва СПД";
> 		$text['baptizedlds'] = "Крещеные (СПД)";
> 		$text['endowedlds'] = "�адел�емый (СПД)";
> 		$text['sealedplds'] = "Запечатано дл� родителей (СПД)";
> 		$text['sealedslds'] = "Запечатанное дл� �упругом (СПД)";
> 		$text['otherspouse'] = "Другой �упруг";
> 		$text['husband'] = "Отец";
> 		$text['wife'] = "Мама";
> 		break;
> 
> 	//pedigree.php
> 	case "pedigree":
> 		$text['capbirthabbr'] = "Р.";
> 		$text['capaltbirthabbr'] = "Д. Р.";
> 		$text['capdeathabbr'] = "С.";
> 		$text['capburialabbr'] = "Пох.";
> 		$text['capplaceabbr'] = "М.";
> 		$text['capmarrabbr'] = "Ж.";
> 		$text['capspouseabbr'] = "С.";
> 		$text['redraw'] = "Перери�овать �";
> 		$text['unknownlit'] = "�еизве�тный";
> 		$text['popupnote1'] = "Дополнительна� информаци�";
> 		$text['pedcompact'] = "Компактный";
> 		$text['pedstandard'] = "Стандартный";
> 		$text['pedtextonly'] = "Тек�т";
> 		$text['descendfor'] = "Потом�тво дл�";
> 		$text['maxof'] = "Мак�имум";
> 		$text['gensatonce'] = "генерируемых одновременно.";
> 		$text['sonof'] = "�ын";
> 		$text['daughterof'] = "дочь";
> 		$text['childof'] = "ребенок";
> 		$text['stdformat'] = "Стандартный формат";
> 		$text['ahnentafel'] = "Си�тема &#171;Ahnentafel&#187;";
> 		$text['addnewfam'] = "Добавить новую �емью";
> 		$text['editfam'] = "Изменить �емью";
> 		$text['side'] = "Сторона";
> 		$text['familyof'] = "Семей�тво";
> 		$text['paternal'] = "отече�кий";
> 		$text['maternal'] = "Материн�кий";
> 		$text['gen1'] = "Само";
> 		$text['gen2'] = "Родители";
> 		$text['gen3'] = "дедушка и бабушка";
> 		$text['gen4'] = "Прабабушка и прадедушка";
> 		$text['gen5'] = "2-й прародитель";
> 		$text['gen6'] = "3-й прародитель";
> 		$text['gen7'] = "4-й прародитель";
> 		$text['gen8'] = "5-й прародитель";
> 		$text['gen9'] = "6-й прародитель";
> 		$text['gen10'] = "7-й прародитель";
> 		$text['gen11'] = "8-й прародитель";
> 		$text['gen12'] = "9-й прародитель";
> 		$text['graphdesc'] = "Диаграмма прои�хождени� к �тому моменту";
> 		$text['pedbox'] = "Диаграмма &#171;Коробка&#187;";
> 		$text['regformat'] = "Рее�тр";
> 		$text['extrasexpl'] = "По крайней мере, одна фотографи�, и�тори� или другой медиафайл �уще�твует дл� �того человека.";
> 		$text['popupnote3'] = "�ова� диаграмма";
> 		$text['mediaavail'] = "До�тупные медиафайлы";
> 		$text['pedigreefor'] = "Диаграмма родо�ловной дл�";
> 		$text['pedigreech'] = "Диаграмма родо�ловной";
> 		$text['datesloc'] = "Даты и ме�та";
> 		$text['borchr'] = "Рождение/крещение-�мерть/погребение";
> 		$text['nobd'] = "�ет дат рождени� или �мерти";
> 		$text['bcdb'] = "В�е данные о рождении/крещение/�мерти/погребении";
> 		$text['numsys'] = "Си�тема нумерации";
> 		$text['gennums'] = "�омера поколений";
> 		$text['henrynums'] = "Си�тема Генри";
> 		$text['abovnums'] = "Си�тема д'�бовилла";
> 		$text['devnums'] = "Си�тема де Вильер�а";
> 		$text['dispopts'] = "Показать варианты";
> 		//added in 10.0.0
> 		$text['no_ancestors'] = "�е найдено ни одного предка";
> 		$text['ancestor_chart'] = "Вертикальна� диаграмма предков";
> 		$text['opennewwindow'] = "Открыть в новом окне";
> 		$text['pedvertical'] = "Вертикальный";
> 		//added in 11.0.0
> 		$text['familywith'] = "Семь� �";
> 		$text['fcmlogin'] = "Пожалуй�та, войдите, чтобы увидеть подробно�ти";
> 		$text['isthe'] = "�то";
> 		$text['otherspouses'] = "другие �упруги";
> 		$text['parentfamily'] = "Родитель�кое �емей�тво";
> 		$text['showfamily'] = "Показать �емью";
> 		$text['shown'] = "показанный";
> 		$text['showparentfamily'] = "показать родитель�кую �емью";
> 		$text['showperson'] = "показать человека";
> 		//added in 11.0.2
> 		$text['otherfamilies'] = "Другие �емьи";
> 		//added in 14.0
> 		$text['dtformat'] = "Таблицы";
> 		$text['dtchildren'] = "Дети";
> 		$text['dtgrandchildren'] = "Внучата";
> 		$text['dtggrandchildren'] = "Правнуки";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "�ет потомков";
> 		$text['dtgen'] = "Пок";
> 		$text['dttotal'] = "В�его";
> 		$text['dtselect'] = "Выбрать";
> 		$text['dteachfulltable'] = "Кажда� полна� таблица будет иметь";
> 		$text['dtrows'] = "�трок";
> 		$text['dtdisplayingtable'] = "Отобразить таблицу";
> 		$text['dtgototable'] = "Перейти к таблице:";
> 		$text['fcinstrdn'] = "Показать �емью � �упругом";
> 		$text['fcinstrup'] = "Показать �емью � родител�ми";
> 		$text['fcinstrplus'] = "Выберать других �упругов";
> 		$text['fcinstrfam'] = "Выберать других родителей";
> 		break;
> 
> 	//search.php, searchform.php
> 	//merged with reports and showreport in 5.0.0
> 	case "search":
> 	case "reports":
> 		$text['noreports'] = "Отчёты не �уще�твуют.";
> 		$text['reportname'] = "�азвание отчёта";
> 		$text['allreports'] = "В�е отчёты";
> 		$text['report'] = "Отчёт";
> 		$text['error'] = "Ошибка";
> 		$text['reportsyntax'] = "Синтак�и� запро�а, выполн�емого � �тим отчётом";
> 		$text['wasincorrect'] = "неверный, и в результате отчёт не может быть запущен. Пожалуй�та, обратите�ь к �и�темному админи�тратору";
> 		$text['errormessage'] = "Сообщение об ошибке";
> 		$text['equals'] = "равн�ет��";
> 		$text['endswith'] = "заканчивает�� на";
> 		$text['soundexof'] = "звучит (soundex) как";
> 		$text['metaphoneof'] = "звучит (metaphone) как";
> 		$text['plusminus10'] = "+/- 10 лет от";
> 		$text['lessthan'] = "меньше, чем";
> 		$text['greaterthan'] = "больше, чем";
> 		$text['lessthanequal'] = "меньше или равно, чем";
> 		$text['greaterthanequal'] = "больше или равно, чем";
> 		$text['equalto'] = "равно";
> 		$text['tryagain'] = "Попробуйте ещё раз";
> 		$text['joinwith'] = "Объедин�ть и�пользу�";
> 		$text['cap_and'] = "И";
> 		$text['cap_or'] = "ИЛИ";
> 		$text['showspouse'] = "Показать �упруга (покажет дубликаты, е�ли человек имеет более одного �упруга)";
> 		$text['submitquery'] = "Отправить запро�";
> 		$text['birthplace'] = "Ме�то рождени�";
> 		$text['deathplace'] = "Ме�то �мерти";
> 		$text['birthdatetr'] = "Дата рождени�";
> 		$text['deathdatetr'] = "Дата �мерти";
> 		$text['plusminus2'] = "+/- 2 года от";
> 		$text['resetall'] = "Сбро�ить в�е значени�";
> 		$text['showdeath'] = "Показать информацию о �мерти/похоронах";
> 		$text['altbirthplace'] = "Ме�то крещени�";
> 		$text['altbirthdatetr'] = "Дата крещени�";
> 		$text['burialplace'] = "Ме�то погребени�";
> 		$text['burialdatetr'] = "Дата погребени�";
> 		$text['event'] = "Событие(�)";
> 		$text['day'] = "День";
> 		$text['month'] = "Ме��ц";
> 		$text['keyword'] = "Ключевое �лово (например, &#171;Abt (Около)&#187;, &#171;Bef (До)&#187;, &#171;Aft (По�ле)&#187;)";
> 		$text['explain'] = "Введите компоненты даты, чтобы увидеть �оответ�твующие �обыти�. Чтобы игнорировать поле, о�тавьте в нём пу�тое значение.";
> 		$text['enterdate'] = "Пожалуй�та, введите или выберите хот� бы одно из �ледующих значений: &#171;День&#187;, &#171;Ме��ц&#187;, &#171;Год&#187;, &#171;Ключевое �лово&#187;";
> 		$text['fullname'] = "Полное им�";
> 		$text['birthdate'] = "Дата рождени�";
> 		$text['altbirthdate'] = "Дата крещени�";
> 		$text['marrdate'] = "Дата брака";
> 		$text['spouseid'] = "ID Супруг(а)";
> 		$text['spousename'] = "Им� Супруг(а)";
> 		$text['deathdate'] = "Дата �мерти";
> 		$text['burialdate'] = "Дата погребени�";
> 		$text['changedate'] = "Дата по�леднего изменени�";
> 		$text['gedcom'] = "Генеалогиче�кое древо";
> 		$text['baptdate'] = "Дата Крещени� (СПД)";
> 		$text['baptplace'] = "Ме�то крещени� (СПД)";
> 		$text['endldate'] = "Дата пожертвовани� (СПД)";
> 		$text['endlplace'] = "Ме�то пожертвовани� (СПД)";
> 		$text['ssealdate'] = "Дата запечатывани� S (СПД)";   //Sealed to spouse
> 		$text['ssealplace'] = "Ме�то запечатывани� S (СПД)";
> 		$text['psealdate'] = "Дата запечатывани� P (СПД)";   //Sealed to parents
> 		$text['psealplace'] = "Ме�то запечатывани� P (СПД)";
> 		$text['marrplace'] = "Ме�то брака";
> 		$text['spousesurname'] = "Фамили� �упруга/�упруги";
> 		$text['spousemore'] = "При вводе значени� фамилии �упруга необходимо выбрать пол.";
> 		$text['plusminus5'] = "+/- 5 лет от";
> 		$text['exists'] = "�уще�твует";
> 		$text['dnexist'] = "не �уще�твует";
> 		$text['divdate'] = "Дата развода";
> 		$text['divplace'] = "Ме�то развода";
> 		$text['otherevents'] = "Другие критерии пои�ка";
> 		$text['numresults'] = "Результатов на �транице";
> 		$text['mysphoto'] = "�еизве�тные фотографии";
> 		$text['mysperson'] = "�еизве�тные люди";
> 		$text['joinor'] = "Параметр &#171;Объедин�ть и�пользу� ИЛИ&#187; не может и�пользовать�� � фамилией �упруга";
> 		$text['tellus'] = "Ра��кажите нам, что вы знаете";
> 		$text['moreinfo'] = "Больше информации:";
> 		//added in 8.0.0
> 		$text['marrdatetr'] = "Год брако�очетани�";
> 		$text['divdatetr'] = "Год развода";
> 		$text['mothername'] = "Им� матери";
> 		$text['fathername'] = "Им� отца";
> 		$text['filter'] = "Фильтр";
> 		$text['notliving'] = "�ет в живых";
> 		$text['nodayevents'] = "Событи� за �тот ме��ц, которые не �в�заны � конкретным днем:";
> 		//added in 9.0.0
> 		$text['csv'] = "Файл CSV � разделител�ми-зап�тыми";
> 		//added in 10.0.0
> 		$text['confdate'] = "Дата конфирмации (СПД)";
> 		$text['confplace'] = "Ме�то конфирмации (СПД)";
> 		$text['initdate'] = "Дата по�в�щени� (СПД)";
> 		$text['initplace'] = "Ме�то по�в�щени� (СПД)";
> 		//added in 11.0.0
> 		$text['marrtype'] = "Тип брака";
> 		$text['searchfor'] = "Пои�к";
> 		$text['searchnote'] = "Примечание: �та �траница и�пользует Google, чтобы выполн�ть пои�к. Количе�тво возвращаемых �овпадений будет напр�мую зави�еть от того, на�колько Google �может индек�ировать �айт.";
> 		break;
> 
> 	//showlog.php
> 	case "showlog":
> 		$text['logfilefor'] = "Журнал запи�ей дл� ";
> 		$text['mostrecentactions'] = "По�ледн�� активно�ть";
> 		$text['autorefresh'] = "�втообновление каждые (30 �екунд)";
> 		$text['refreshoff'] = "Отключить автообновление";
> 		break;
> 
> 	case "headstones":
> 	case "showphoto":
> 		$text['cemeteriesheadstones'] = "Кладбища и надгроби�";
> 		$text['showallhsr'] = "Показать полный �пи�ок надгробий";
> 		$text['in'] = "в";
> 		$text['showmap'] = "Показать карту";
> 		$text['headstonefor'] = "�адгробие дл�";
> 		$text['photoof'] = "Фото";
> 		$text['photoowner'] = "Владелец оригинала";
> 		$text['nocemetery'] = "�ет кладбища";
> 		$text['iptc005'] = "�азвание";
> 		$text['iptc020'] = "Дополнительные категории";
> 		$text['iptc040'] = "Специальные ин�трукции";
> 		$text['iptc055'] = "Дата �оздани�";
> 		$text['iptc080'] = "�втор";
> 		$text['iptc085'] = "Должно�ть автора";
> 		$text['iptc090'] = "Город";
> 		$text['iptc095'] = "Штат/провинци�";
> 		$text['iptc101'] = "Страна";
> 		$text['iptc103'] = "OTR";
> 		$text['iptc105'] = "Заголовок";
> 		$text['iptc110'] = "И�точник";
> 		$text['iptc115'] = "И�точник фото";
> 		$text['iptc116'] = "Уведомление об автор�ких правах";
> 		$text['iptc120'] = "титр";
> 		$text['iptc122'] = "Подпи�ь пи�ател�";
> 		$text['mapof'] = "Карта";
> 		$text['regphotos'] = "Подробный вид";
> 		$text['gallery'] = "Только миниатюры";
> 		$text['cemphotos'] = "Фотографии кладбищ";
> 		$text['photosize'] = "Габаритные размеры";
>         $text['iptc010'] = "Приоритет";
> 		$text['filesize'] = "Размер файла";
> 		$text['seeloc'] = "См. ме�тоположение";
> 		$text['showall'] = "Показать в�е";
> 		$text['editmedia'] = "Редактировать медиафайл";
> 		$text['viewitem'] = "Про�мотреть �тот �лемент";
> 		$text['editcem'] = "Редактировать кладбище";
> 		$text['numitems'] = "# Предметов";
> 		$text['allalbums'] = "В�е альбомы";
> 		$text['slidestop'] = "Пауза Слайд-шоу";
> 		$text['slideresume'] = "Показ �лайдов";
> 		$text['slidesecs'] = "Секунды дл� каждого �лайда:";
> 		$text['minussecs'] = "мину� 0,5 �екунды";
> 		$text['plussecs'] = "плю� 0,5 �екунды";
> 		$text['nocountry'] = "�еизве�тна� �трана";
> 		$text['nostate'] = "�еизве�тный штат";
> 		$text['nocounty'] = "�еизве�тный район";
> 		$text['nocity'] = "�еизве�тный город";
> 		$text['nocemname'] = "�еизве�тное название кладбища";
> 		$text['editalbum'] = "Редактировать альбом";
> 		$text['mediamaptext'] = "<strong>Примечание:</strong> Переме�тите указатель мыши на изображение, чтобы отобразить имена. �ажмите, чтобы про�мотреть �траницу дл� каждого имени.";
> 		//added in 8.0.0
> 		$text['allburials'] = "В�е погребени�";
> 		$text['moreinfo'] = "�ажмите дл� получени� дополнительной информации об �том изображении";
> 		//added in 9.0.0
>         $text['iptc025'] = "Ключевые �лова";
>         $text['iptc092'] = "Суб-ме�то";
> 		$text['iptc015'] = "Категори�";
> 		$text['iptc065'] = "И�ходна� программа";
> 		$text['iptc070'] = "Вер�и� программы";
> 		//added in 13.0
> 		$text['toggletags'] = "Переключить теги";
> 		break;
> 
> 	//surnames.php, surnames100.php, surnames-all.php, surnames-oneletter.php
> 	case "surnames":
> 	case "places":
> 		$text['surnamesstarting'] = "Показать фамилии на букву";
> 		$text['showtop'] = "Показать попул�рные";
> 		$text['showallsurnames'] = "Фамилии в виде �пи�ка";
> 		$text['sortedalpha'] = "в алфавитном пор�дке";
> 		$text['byoccurrence'] = "и упор�дочить по дате прои�хождени�";
> 		$text['firstchars'] = "Первые �имволы";
> 		$text['mainsurnamepage'] = "Фамилии в виде диаграммы";
> 		$text['allsurnames'] = "В�е фамилии";
> 		$text['showmatchingsurnames'] = "�ажмите на фамилию, чтобы показать �оответ�твующие запи�и.";
> 		$text['backtotop'] = "�аверх";
> 		$text['beginswith'] = "�ачинает�� на";
> 		$text['allbeginningwith'] = "В�е фамилии на букву";
> 		$text['numoccurrences'] = "общее количе�тво ме�т (на�еленных пунктов) в �кобках";
> 		$text['placesstarting'] = "Ме�та на букву";
> 		$text['showmatchingplaces'] = "�ажмите на ме�то, чтобы показать меньшие на�еленные пункты. �ажмите на значок пои�ка, чтобы показать �оответ�твующих людей.";
> 		$text['totalnames'] = "из общего чи�ла";
> 		$text['showallplaces'] = "Показать в�е ме�та (на�еленные пункты)";
> 		$text['totalplaces'] = "из общего чи�ла";
> 		$text['mainplacepage'] = "Главна� �траница ме�т (на�еленных пунктов)";
> 		$text['allplaces'] = "В�е крупнейшие на�еленные пункты";
> 		$text['placescont'] = "Пои�к ме�т (на�еленных пунктов)";
> 		//changed in 8.0.0
> 		$text['top30'] = "Попул�рные xxx фамилий";
> 		$text['top30places'] = "Попул�рные xxx ме�т";
> 		//added in 12.0.0
> 		$text['firstnamelist'] = "Имена";
> 		$text['firstnamesstarting'] = "Показать имена на букву";
> 		$text['showallfirstnames'] = "Имена в виде �пи�ка";
> 		$text['mainfirstnamepage'] = "Имена в виде диаграммы";
> 		$text['allfirstnames'] = "В�е имена";
> 		$text['showmatchingfirstnames'] = "�ажмите на им�, чтобы отобразить �оответ�твующие запи�и.";
> 		$text['allfirstbegwith'] = "В�е имена на букву";
> 		$text['top30first'] = "Попул�рные xxx имён";
> 		$text['allothers'] = "В�е о�тальные";
> 		$text['amongall'] = "(�реди в�ех имен)";
> 		$text['justtop'] = "Про�то ххх попул�рных";
> 		break;
> 
> 	//whatsnew.php
> 	case "whatsnew":
> 		$text['pastxdays'] = "(за по�ледние xx дней)";
> 
> 		$text['photo'] = "Фото";
> 		$text['history'] = "И�тори�/Документ";
> 		$text['husbid'] = "ID-отца";
> 		$text['husbname'] = "Им� отца";
> 		$text['wifeid'] = "ID-матери";
> 		//added in 11.0.0
> 		$text['wifename'] = "Им� матери";
> 		break;
> 
> 	//timeline.php, timeline2.php
> 	case "timeline":
> 		$text['text_delete'] = "Удалить";
> 		$text['addperson'] = "Добавить человека";
> 		$text['nobirth'] = "Этот человек не имеют дей�твительную дату рождени� и не может быть добавлен";
> 		$text['event'] = "Событие(�)";
> 		$text['chartwidth'] = "Ширина диаграммы";
> 		$text['timelineinstr'] = "Добавить людей";
> 		$text['togglelines'] = "Тумблер линии";
> 		//changed in 9.0.0
> 		$text['noliving'] = "Следующий человек помечен как живой или �екретный и не может быть добавлен, потому что вы не вошли в �и�тему � надлежащими разрешени�ми";
> 		break;
> 		
> 	//browsetrees.php
> 	//login.php, newacctform.php, addnewacct.php
> 	case "trees":
> 	case "login":
> 		$text['browsealltrees'] = "Про�мотр в�ех деревьев";
> 		$text['treename'] = "Генеалогиче�кое древо";
> 		$text['owner'] = "Владелец";
> 		$text['address'] = "�дре�";
> 		$text['city'] = "Город";
> 		$text['state'] = "Обла�ть";
> 		$text['zip'] = "Почтовый индек�";
> 		$text['country'] = "Страна";
> 		$text['email'] = "E-mail адре�";
> 		$text['phone'] = "Телефон";
> 		$text['username'] = "Логин";
> 		$text['password'] = "Пароль";
> 		$text['loginfailed'] = "�еправильный логин или пароль.";
> 
> 		$text['regnewacct'] = "Создать новую учётную запи�ь";
> 		$text['realname'] = "�а�то�щее им�";
> 		$text['phone'] = "Телефон";
> 		$text['email'] = "E-mail адре�";
> 		$text['address'] = "�дре�";
> 		$text['acctcomments'] = "Примечани� или комментарии";
> 		$text['submit'] = "Отправить";
> 		$text['leaveblank'] = "(О�тавьте пу�тым, е�ли запрашивает�� новое генеалогиче�кое древо)";
> 		$text['required'] = " Об�зательные пол�";
> 		$text['enterpassword'] = "Введите пароль.";
> 		$text['enterusername'] = "Введите логин.";
> 		$text['failure'] = "К �ожалению введенное Вами им� пользовател� уже и�пользует��. Пожалуй�та, и�пользуйте кнопку �азад в вашем браузере, чтобы вернуть�� на предыдущую �траницу и выберите другое им� пользовател�.";
> 		$text['success'] = "Спа�ибо. Мы получили вашы данные дл� реги�трации. Мы �в�жем�� � Вами, когда Ваш профиль будет активирован или потребует�� дополнительна� информаци�.";
> 		$text['emailsubject'] = "�овый пользователь TNG";
> 		$text['website'] = "Веб-�айт";
> 		$text['nologin'] = "Ещё не зареги�трированы?";
> 		$text['loginsent'] = "Информаци� дл� входа отправлена";
> 		$text['loginnotsent'] = "Информаци� дл� входа не отправлена";
> 		$text['enterrealname'] = "Введите Ваше на�то�щее им�.";
> 		$text['rempass'] = "Запомнить пароль на �том компьютере";
> 		$text['morestats'] = "Дополнительна� �тати�тика";
> 		$text['accmail'] = "<strong>Внимание:</strong> Дл� получени� подтверждени� реги�трации от �дмини�тратора �айта, убедите�ь что не блокирует�� адре� �того домена.";
> 		$text['newpassword'] = "�овый пароль";
> 		$text['resetpass'] = "Сбро�ить пароль";
> 		$text['nousers'] = "Эта форма не может быть и�пользован до тех пор, по крайней мере, одна запи�ь пользовател� �уще�твует. Е�ли вы �вл�ете�ь владельцем �айта, пожалуй�та, перейдите на админи�тратора / пользователей дл� �оздани� учетной запи�и админи�тратора.";
> 		$text['noregs'] = "К �ожалению, но мы не принимаем реги�трацию новых пользователей в на�то�щее врем�. Пожалуй�та <a href=\"suggest.php\">�в�жите�ь � админи�тратором</a> напр�мую, е�ли у ва� е�ть замечани� или вопро�ы отно�ительно чего-либо на �том �айте.";
> 		$text['emailmsg'] = "Вы получили новый запро� дл� учетной запи�и пользовател� TNG. Пожалуй�та, войдите в Вашу панель �дмини�тратора что бы задать �оответ�твующие разрешени� дл� �той новой учетной запи�и.";
> 		$text['accactive'] = "Учетна� запи�ь была активирована, но пользователь не будет иметь никаких о�обых прав, пока не назначать их.";
> 		$text['accinactive'] = "Зайдите в �дмини�трирование/Пользователи/Обзор дл� до�тупа к на�тройкам учетной запи�и. Учётна� запи�ь будет о�тавать�� неактивным, пока её не отредактировать и не �охран�ть  по крайней мере, один раз.";
> 		$text['pwdagain'] = "Пороль ещё раз";
> 		$text['enterpassword2'] = "Пожалуй�та, введите пароль ещё раз.";
> 		$text['pwdsmatch'] = "Ваши пароли не �овпадают. Введите один и тот же пароль в оба пол�.";
> 		$text['acksubject'] = "Благодарим Ва� за реги�трацию"; //for a new user account
> 		$text['ackmessage'] = "Ваш запро� на реги�трацию учётной запи�и получен. Ваша учетна� запи�ь будет неактивна, пока она не будет ра��мотрена админи�тратором �айта. Вы будете уведомлены по �лектронной почте, когда ваш логин будет готов к и�пользованию.";
> 		//added in 12.0.0
> 		$text['switch'] = "Переключатель";
> 		//added in 14.0
> 		$text['newpassword2'] = "Снова новый пароль";
> 		$text['resetsuccess'] = "У�пех: пароль был �брошен";
> 		$text['resetfail'] = "Ошибка: Пароль не �брошен";
> 		$text['failreason0'] = " (неизве�тна� ошибка базы данных)";
> 		$text['failreason2'] = " (у ва� нет разрешени� на изменение вашего парол�)";
> 		$text['failreason3'] = " (пароли не �овпадали)";
> 		break;
> 
> 	//added in 10.0.0
> 	case "branches":
> 		$text['browseallbranches'] = "Про�мотр в�ех ветвей";
> 		break;
> 
> 	//statistics.php
> 	case "stats":
> 		$text['quantity'] = "В�его";
> 		$text['totindividuals'] = "В�его людей";
> 		$text['totmales'] = "В�его мужчин";
> 		$text['totfemales'] = "В�его женщин";
> 		$text['totunknown'] = "В�его � неизве�тным полом";
> 		$text['totliving'] = "В�его живущих";
> 		$text['totfamilies'] = "В�его �емей";
> 		$text['totuniquesn'] = "В�его уникальных фамилий";
> 		//$text['totphotos'] = "Total Photos";
> 		//$text['totdocs'] = "Total Histories &amp; Documents";
> 		//$text['totheadstones'] = "Total Headstones";
> 		$text['totsources'] = "В�его и�точников";
> 		$text['avglifespan'] = "Средн�� продолжительно�ть жизни";
> 		$text['earliestbirth'] = "Сама� ранн�� дата рождени�";
> 		$text['longestlived'] = "Долгожители";
> 		$text['days'] = "дней";
> 		$text['age'] = "Возра�т";
> 		$text['agedisclaimer'] = "Стати�тика продолжительно�ти жизни ра�читывает�� по запи��м о люд�х, � указанными датами рождени� и �мерти. Е�ли информаци� не полна� (например одна из дат указана не полно�тью, только год &#171;1945&#187; или только год и ме��ц без чи�ла &#171;май 1755&#187;),  то точно�ть ра�чётов не будет 100%-ой. Периоды &#171;�&#187;, &#171;до&#187;, &#171;по�ле&#187;, &#171;приблизительно&#187;, &#171;между&#187; и т.п. в ра�чётах не уча�твуют.";
> 		$text['treedetail'] = "Иформаци� о древе";
> 		$text['total'] = "В�его";
> 		//added in 12.0
> 		$text['totdeceased'] = "В�его умерших";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Общее количе�тво ��ылок на и�точники";
> 		break;
> 
> 	case "notes":
> 		$text['browseallnotes'] = "Про�мотр в�ех заметок";
> 		break;
> 
> 	case "help":
> 		$text['menuhelp'] = "Кнопка меню";
> 		break;
> 
> 	case "install":
> 		$text['perms'] = "В�е разрешени� были  у�тановлены.";
> 		$text['noperms'] = "Права до�тупа не могут быть у�тановлены ​​дл� �тих файлов:";
> 		$text['manual'] = "Пожалуй�та, у�тановите их вручную.";
> 		$text['folder'] = "Папка";
> 		$text['created'] = "была �оздана";
> 		$text['nocreate'] = "не может быть �оздана. Пожалуй�та, �оздайте её вручную.";
> 		$text['infosaved'] = "Информаци� �охранена, подключение проверено!";
> 		$text['tablescr'] = "Таблицы были �озданы!";
> 		$text['notables'] = "Таблицы не могут быть �озданы:";
> 		$text['nocomm'] = "TNG не не может �оединить�� � базой данных. Таблицы не были �озданы.";
> 		$text['newdb'] = "Информаци� �охранена, подключение проверено, �оздана нова� база данных:";
> 		$text['noattach'] = "Информаци� �охранена. Соединение у�тановлено и базы данных �оздана, но TNG не может подключить�� к ней.";
> 		$text['nodb'] = "Информаци� �охранена. Соединени� у�тановлено, но база данных не �уще�твует и не может быть �оздана. Пожалуй�та, убедите�ь, что им� базы данных правильное и е�ть права у пользовател� базы данных, или зайдите в панель управлени� дл� её �оздани�.";
> 		$text['noconn'] = "Информаци� �охранена, но �оединение не у�тановлено. �е выполнено одно или не�колько из �ледующих у�ловий:";
> 		$text['exists'] = "уже �уще�твует";
> 		$text['noop'] = "Операци� не выполн�ла�ь.";
> 		//added in 8.0.0
> 		$text['nouser'] = "Пользователь не был �оздан. Возможно, им� пользовател� уже �уще�твует.";
> 		$text['notree'] = "Генеалогиче�кое древо не было �оздано. �омер генеалогиче�кого древа может уже �уще�твовать.";
> 		$text['infosaved2'] = "Информаци� �охранена";
> 		$text['renamedto'] = "переименовано в";
> 		$text['norename'] = "�е может быть переименовано";
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Обнаружены �уще�твующие запи�и пользовател�. Дл� продолжени� необходимо �начала войти в �и�тему или удалить в�е запи�и из таблицы � пользовател�ми.";
> 		break;
> 
> 	case "imgviewer":
> 		$text['magmode'] = "Режим увеличени�";
> 		$text['panmode'] = "Режим про�мотра";
> 		$text['pan'] = "�ажмите и перетащите дл� перемещени� по изображению";
> 		$text['fitwidth'] = "Впи�ать по ширине";
> 		$text['fitheight'] = "Впи�ать по вы�оте";
> 		$text['newwin'] = "�овое окно";
> 		$text['opennw'] = "Открыть изображение в новом окне";
> 		$text['magnifyreg'] = "�ажмите, чтобы увеличить обла�ть изображени�";
> 		$text['imgctrls'] = "Включить �лементы управлени� изображением";
> 		$text['vwrctrls'] = "Включить �лементы управлени� про�мотрщика изображений";
> 		$text['vwrclose'] = "Закрыть про�мотрщик изображений";
> 		break;
> 
> 	case "dna":
> 		$text['test_date'] = "Дата те�та";
> 		$text['links'] = "Соответ�твующие ��ылки";
> 		$text['testid'] = "ID те�та";
> 		//added in 12.0.0
> 		$text['mode_values'] = "Значени� режима";
> 		$text['compareselected'] = "Сравнить выбранные";
> 		$text['dnatestscompare'] = "Сравнить те�ты Y-DNA";
> 		$text['keep_name_private'] = "Хранить приватно";
> 		$text['browsealltests'] = "Про�мотр в�ех те�тов";
> 		$text['all_dna_tests'] = "В�е те�ты Д�К";
> 		$text['fastmutating'] = "Бы�трые & NBSP; мутации";
> 		$text['alltypes'] = "В�е типы";
> 		$text['allgroups'] = "В�е группы";
> 		$text['Ydna_LITbox_info'] = "Те�т(ы), �в�занный � �тим человеком, не об�зательно проводили�ь � �тим человеком.<br />в �толбце &#171;Гаплогруппа&#187; данные отображают�� кра�ным цветом, е�ли результат &#171;Пред�казан&#187;, и зелёным, е�ли те�т &#171;Подтверждён&#187;.";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
> 		break;
> }
> 
> //common
> $text['matches'] = "Совпадени�";
> $text['description'] = "Опи�ание";
> $text['notes'] = "Заметки";
> $text['status'] = "Стату�";
> $text['newsearch'] = "�овый Пои�к";
> $text['pedigree'] = "Родо�ловна�";
> $text['seephoto'] = "По�мотреть фото";
> $text['andlocation'] = "и ме�тоположение";
> $text['accessedby'] = "До�туп из";
> $text['children'] = "Дети";  //from getperson
> $text['tree'] = "Генеалогиче�кое древо";
> $text['alltrees'] = "В�е древе�а";
> $text['nosurname'] = "[без фамилии]";
> $text['thumb'] = "Миниатюра";  //as in Thumbnail
> $text['people'] = "Люди";
> $text['title'] = "�азвание";  //from getperson
> $text['suffix'] = "Суффик�";  //from getperson
> $text['nickname'] = "Прозвище";  //from getperson
> $text['lastmodified'] = "По�леднее изменение";  //from getperson
> $text['married'] = "Брако�очетание";  //from getperson
> //$text['photos'] = "Photos";
> $text['name'] = "Им�"; //from showmap
> $text['lastfirst'] = "Фамили�, Им�";  //from search
> $text['bornchr'] = "Рождение/Крещение";  //from search
> $text['individuals'] = "Люди";  //from whats new
> $text['families'] = "Семьи";
> $text['personid'] = "ID человека";
> $text['sources'] = "И�точники";  //from getperson (next several)
> $text['unknown'] = "�еизве�тно";
> $text['father'] = "Отец";
> $text['mother'] = "Мать";
> $text['christened'] = "Крещение";
> $text['died'] = "Смерть";
> $text['buried'] = "Погребение";
> $text['spouse'] = "Супруг(а)";  //from search
> $text['parents'] = "Родители";  //from pedigree
> $text['text'] = "Тек�т";  //from sources
> $text['language'] = "Язык";  //from languages
> $text['descendchart'] = "Диаграмма прои�хождени�";
> $text['extractgedcom'] = "GEDCOM";
> $text['indinfo'] = "Информаци� о человеке";
> $text['edit'] = "Редактировать";
> $text['date'] = "Дата";
> $text['login'] = "Войти";
> $text['logout'] = "Выйти";
> $text['groupsheet'] = "Семейна� ведомо�ть";
> $text['text_and'] = "и";
> $text['generation'] = "Поколение";
> $text['filename'] = "Им� файла";
> $text['id'] = "ID";
> $text['search'] = "Пои�к";
> $text['user'] = "Пользователь";
> $text['firstname'] = "Им�";
> $text['lastname'] = "Фамили�";
> $text['searchresults'] = "Результаты Пои�ка";
> $text['diedburied'] = "Смерть/Погребение";
> $text['homepage'] = "Главна�";
> $text['find'] = "�айти...";
> $text['relationship'] = "Род�тво";		//in German, Verwandtschaft
> $text['relationship2'] = "Отношение"; //different in some languages, at least in German (Beziehung)
> $text['timeline'] = "Хронологи�";
> $text['yesabbr'] = "Y";               //abbreviation for 'yes'
> $text['divorced'] = "Разведен(а)";
> $text['indlinked'] = "Св�зано �";
> $text['branch'] = "Ветвь";
> $text['moreind'] = "Ещё люди";
> $text['morefam'] = "Ещё �емьи";
> $text['surnamelist'] = "Спи�ок фамилий";
> $text['generations'] = "Поколени�";
> $text['refresh'] = "Обновить";
> $text['whatsnew'] = "Что нового";
> $text['reports'] = "Отчёты";
> $text['placelist'] = "Спи�ок ме�т";
> $text['baptizedlds'] = "Крещение (СПД)";
> $text['endowedlds'] = "Пожертвование (СПД)";
> $text['sealedplds'] = "Запечатывание P (СПД)";
> $text['sealedslds'] = "Запечатывание S (СПД)";
> $text['ancestors'] = "Предки";
> $text['descendants'] = "Потомки";
> //$text['sex'] = "Sex";
> $text['lastimportdate'] = "Дата по�леднего импорта GEDCOM";
> $text['type'] = "Тип";
> $text['savechanges'] = "Сохранить изменени�";
> $text['familyid'] = "ID �емьи";
> $text['headstone'] = "�адгробие";
> $text['historiesdocs'] = "И�тории";
> $text['anonymous'] = "анонимно";
> $text['places'] = "Ме�та";
> $text['anniversaries'] = "Даты и юбилеи";
> $text['administration'] = "�дмини�трирование";
> $text['help'] = "Помощь";
> //$text['documents'] = "Documents";
> $text['year'] = "Год";
> $text['all'] = "В�е";
> $text['address'] = "�дре�";
> $text['suggest'] = "Замечани�";
> $text['editevent'] = "Предложить изменени� дл� �того �обыти�";
> $text['morelinks'] = "Другие ��ылки";
> $text['faminfo'] = "Семейна� информаци�";
> $text['persinfo'] = "Лична� информаци�";
> $text['srcinfo'] = "И�точник информации";
> $text['fact'] = "Факт";
> $text['goto'] = "Выбери �траницу";
> $text['tngprint'] = "Печать";
> $text['databasestatistics'] = "Стати�тика"; //needed to be shorter to fit on menu
> $text['child'] = "ребёнок";  //from familygroup
> $text['repoinfo'] = "Информаци� об архиве";
> $text['tng_reset'] = "Сбро�";
> $text['noresults'] = "Результаты не найдены";
> $text['allmedia'] = "В�е медиафайлы";
> $text['repositories'] = "�рхивы";
> $text['albums'] = "�льбомы";
> $text['cemeteries'] = "Кладбища";
> $text['surnames'] = "Фамилии";
> $text['dates'] = "Даты";
> $text['link'] = "Сно�ка";
> $text['media'] = "Медиа";
> $text['gender'] = "Пол";
> $text['latitude'] = "Широта";
> $text['longitude'] = "Долгота";
> $text['bookmarks'] = "Закладки";
> $text['bookmark'] = "Закладка";
> $text['mngbookmarks'] = "Перейти к закладкам";
> $text['bookmarked'] = "Закладка добавлена";
> $text['remove'] = "Удалить";
> $text['find_menu'] = "�айти";
> $text['info'] = "Инфо"; //this needs to be a very short abbreviation
> $text['cemetery'] = "Кладбище";
> $text['gmapevent'] = "Карта �обытий";
> $text['gevents'] = "Событие";
> $text['googleearthlink'] = "С�ылка на Google Earth";
> $text['googlemaplink'] = "С�ылка на Google Maps";
> $text['gmaplegend'] = "Пин легенды";
> $text['unmarked'] = "�еотмеченный";
> $text['located'] = "Ра�положенный";
> $text['albclicksee'] = "�ажмите, чтобы увидеть в�е �лементы в �том альбоме";
> $text['notyetlocated'] = "Пока не найдено";
> $text['cremated'] = "Кремирован(а)";
> $text['missing'] = "Пропал(а)";
> $text['pdfgen'] = "Генератор PDF-файлов";
> $text['blank'] = "Пу�та� диаграмма";
> $text['fonts'] = "Шрифты";
> $text['header'] = "Шапка";
> $text['data'] = "Данные";
> $text['pgsetup'] = "Параметры �траницы";
> $text['pgsize'] = "Размер �траницы";
> $text['orient'] = "Ориентаци�"; //for a page
> $text['portrait'] = "Портрет";
> $text['landscape'] = "Ландшафт";
> $text['tmargin'] = "Верхнее Поле";
> $text['bmargin'] = "�ижнее Поле";
> $text['lmargin'] = "Левое Поле";
> $text['rmargin'] = "Правое Поле";
> $text['createch'] = "Создать PDF";
> $text['prefix'] = "Префик�";
> $text['mostwanted'] = "Розы�к";
> $text['latupdates'] = "По�ледние обновлени�";
> $text['featphoto'] = "Избранные фото";
> $text['news'] = "�ово�ти";
> $text['ourhist'] = "�аше �емейна� и�тори�";
> $text['ourhistanc'] = "�аша �емейна� и�тори� и родо�ловна�";
> $text['ourpages'] = "Страницы нашей �емейной генеалогии";
> $text['pwrdby'] = "Этот �айт работает на";
> $text['writby'] = "�втор:";
> $text['searchtngnet'] = "Пои�к �ети TNG (GENDEX)";
> $text['viewphotos'] = "По�мотр в�ех фотографии";
> $text['anon'] = "Вы в на�то�щее врем� анонимны";
> $text['whichbranch'] = "Из какой ветви Вы?";
> $text['featarts'] = "Избранные �татьи";
> $text['maintby'] = "Поддерживает";
> $text['createdon'] = "Создан";
> $text['reliability'] = "надёжно�ть";
> $text['labels'] = "Метки";
> $text['inclsrcs'] = "Включить и�точники";
> $text['cont'] = "(прод.)"; //abbreviation for continued
> $text['mnuheader'] = "Главна� �траница";
> $text['mnusearchfornames'] = "Пои�к имён";
> $text['mnulastname'] = "Фамили�";
> $text['mnufirstname'] = "Им�, отче�тво";
> $text['mnusearch'] = "Пои�к";
> $text['mnureset'] = "�ачать в�ё �начала";
> $text['mnulogon'] = "Вход";
> $text['mnulogout'] = "Выход";
> $text['mnufeatures'] = "Разделы �айта";
> $text['mnuregister'] = "Зареги�трировать��";
> $text['mnuadvancedsearch'] = "Ра�ширенный пои�к";
> $text['mnulastnames'] = "В�е фамилии";
> $text['mnustatistics'] = "Стати�тика";
> $text['mnuphotos'] = "Фотографии";
> $text['mnuhistories'] = "И�тории из жизни";
> $text['mnumyancestors'] = "Фотографии и и�тории предков";
> $text['mnucemeteries'] = "Кладбища";
> $text['mnutombstones'] = "�адгроби�";
> $text['mnureports'] = "Отчёты";
> $text['mnusources'] = "И�точники";
> $text['mnuwhatsnew'] = "Что нового";
> $text['mnushowlog'] = "По�ледние дей�тви�";
> $text['mnulanguage'] = "Изменить �зык";
> $text['mnuadmin'] = "�дмини�трирование";
> $text['welcome'] = "Добро пожаловать";
> $text['contactus'] = "Обратна� �в�зь";
> //changed in 8.0.0
> $text['born'] = "Рождение";
> $text['searchnames'] = "Пои�к людей";
> //added in 8.0.0
> $text['editperson'] = "Изменить человека";
> $text['loadmap'] = "Загрузить карту";
> $text['birth'] = "Рождение";
> $text['wasborn'] = "Родил��";
> $text['startnum'] = "Первый номер";
> $text['searching'] = "Пои�к";
> //moved here in 8.0.0
> $text['location'] = "Ме�тоположение";
> $text['association'] = "Взаимо�в�зь";
> $text['collapse'] = "Свернуть";
> $text['expand'] = "Развернуть";
> $text['plot'] = "Уча�ток";
> $text['searchfams'] = "Пои�к �емей";
> //added in 8.0.2
> $text['wasmarried'] = "Женат (Замужем)";
> $text['anddied'] = "Умер";
> //added in 9.0.0
> $text['share'] = "Поделить��";
> $text['hide'] = "Спр�тать";
> $text['disabled'] = "Ваша учетна� запи�ь была отключена. Пожалуй�та, обратите�ь к админи�тратору �айта дл� получени� дополнительной информации.";
> $text['contactus_long'] = "Е�ли у ва� возникли вопро�ы или замечани� по поводу информации на �том �айте, пожалуй�та, <span class=\"emphasis\"><a href=\"suggest.php\">�в�жите�ь � админи�тратором</a></span>. ";
> $text['features'] = "Разное";
> $text['resources'] = "С�ылки";
> $text['latestnews'] = "По�ледние ново�ти";
> $text['trees'] = "Древе�а";
> $text['wasburied'] = "был похоронен";
> //moved here in 9.0.0
> $text['emailagain'] = "Email повторно";
> $text['enteremail2'] = "Введите �вой адре� �лектронной почты ещё раз.";
> $text['emailsmatch'] = "Ваши адре�а не �овпадают. Пожалуй�та, введите тот же адре� в каждом поле.";
> $text['getdirections'] = "�ажмите, чтобы проложить маршрут";
> $text['calendar'] = "Календарь";
> //changed in 9.0.0
> $text['directionsto'] = " k ";
> $text['slidestart'] = "Показ �лайдов";
> $text['livingnote'] = "По крайней мере, один живой человек �в�зан � �той заметкой - детали �крыты.";
> $text['livingphoto'] = "По крайней мере, один живой человек �в�зан � �тим предметом - детали �крыты.";
> $text['waschristened'] = "Был крещён";
> //added in 10.0.0
> $text['branches'] = "Ветви";
> $text['detail'] = "Детально";
> $text['moredetail'] = "Больше деталей";
> $text['lessdetail'] = "Меньше деталей";
> $text['conflds'] = "Конфирмаци� (СПД)";
> $text['initlds'] = "По�в�щение (СПД)";
> $text['wascremated'] = "кремировали";
> //moved here in 11.0.0
> $text['text_for'] = "дл�";
> //added in 11.0.0
> $text['searchsite'] = "Пои�к по �айту";
> $text['searchsitemenu'] = "Пои�к";
> $text['kmlfile'] = "Загрузите файл .kml, чтобы отобразить �то ме�тоположение в Google Планета Земл�";
> $text['download'] = "�ажмите, чтобы �качать";
> $text['more'] = "Больше";
> $text['heatmap'] = "Теплокарта";
> $text['refreshmap'] = "Обновить карту";
> $text['remnums'] = "Очи�тить номера и маркеры";
> $text['photoshistories'] = "Фотографии и и�тории";
> $text['familychart'] = "Семейна� диаграмма";
> //added in 12.0.0
> $text['firstnames'] = "Имена";
> //moved here in 12.0.0
> $text['dna_test'] = "Те�т Д�К";
> $text['test_type'] = "Тип те�та";
> $text['test_info'] = "Информаци� о те�те";
> $text['takenby'] = "Вз�то";
> $text['haplogroup'] = "Гаплогруппа";
> $text['hvr1'] = "HVR1";
> $text['hvr2'] = "HVR2";
> $text['relevant_links'] = "Соответ�твующие ��ылки";
> $text['nofirstname'] = "[нет имени]";
> //added in 12.0.1
> $text['cookieuse'] = "Примечание: Этот �айт и�пользует файлы cookie.";
> $text['dataprotect'] = "Политика защиты данных";
> $text['viewpolicy'] = "Про�мотр политики";
> $text['understand'] = "Я понимаю";
> $text['consent'] = "Я даю �вое �огла�ие на хранение �тим �айтом личной информации, �обранной зде�ь. Я понимаю, что � могу попро�ить владельца �айта удалить �ту информацию в любое врем�.";
> $text['consentreq'] = "Пожалуй�та, дайте �вое �огла�ие на хранение �тим �айтом личной информации.";
> 
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Бы�трые ��ылки";
> $text['yourname'] = "Ваше им�";
> $text['youremail'] = "Ваш адре� �лектронной почты";
> $text['liketoadd'] = "Люба� информаци�, которую вы хотите добавить";
> $text['webmastermsg'] = "Сообщение веб-ма�тера";
> $text['gallery'] = "Про�мотреть галерею";
> $text['wasborn_male'] = "родил��";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "родил��"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "died";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "died";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "был похоронен"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "был похоронен"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "был кремирован";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "был кремирован";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "замужем";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "замужем";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "был разведен";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "был в разводе";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " on ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "and ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Данные те�та Д�К";
> //added in 13.0
> $text['visitor'] = "По�етитель";
> 
> $text['popupnote2'] = "�ова� родо�ловна�";
> 
> //moved here in 14.0
> $text['zoomin'] = "Увеличить";
> $text['zoomout'] = "Уменьшить";
> $text['scrollnote'] = "Перета�кивайте и прокручивайте дл� про�мотра в�ей диаграммы.";
> $text['general'] = "Общее";
> 
> //changed in 14.0
> $text['otherevents'] = "Другие �обыти� и атрибуты";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Св�зи";
> $text['continue'] = "Продолжить";
> $text['title2'] = "�аименование"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Serbian/admintext.php TNG1403/languages/Serbian/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Upišite ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Please select a file to import.";
> 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
> 		$admtext['fromyourcomputer'] = "From your computer";
> 		$admtext['importdata'] = "Import Data";
> 		$admtext['replace'] = "Replace (in selected tree)";
> 		$admtext['desttree'] = "Destination Tree";
> 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
> 		$admtext['selectexisting'] = "Import into";
> 		$admtext['ucaselast'] = "Upper case all surnames";
> 		$admtext['norecalc'] = "Do not recalculate Living flag";
> 		$admtext['autooffset'] = "Start IDs at first available number";
> 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
> 		$admtext['onwebserver'] = "On web server (in GEDCOM folder)";
> 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
> 		$admtext['destbranch'] = "Destination Branch (optional)";
> 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
> 		$admtext['opening'] = "Opening";
> 		$admtext['reopen'] = "Reopening";
> 		$admtext['uploading'] = "Uploading";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Import stopped";
> 		$admtext['resume'] = "click here to resume";
> 		$admtext['neweronly'] = "Replace only if newer";
> 		$admtext['oldimport'] = "Old style import (no progress bar)";
> 		$admtext['importgedcom'] = "Uvezi GEDCOM fajl (fajl može biti zapakovan)";
> 		$admtext['stopbackup'] = "Stop! It might be a good idea to back up your current data before proceeding.";
> 		$admtext['importmedia'] = "Import media if present";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Uverite se da su prefiksi i sufiksi (Opšta podešavanja) ispravni za ovaj fajl.";
> 		$admtext['chkimpsettings'] = "Proverite podešavanja uvoza za više opcija.";
> 		$admtext['eventsonly'] = "Uvezite samo prilagoðene tipove dogaðaja i atribute (nikakvi podaci se ne dodaju, zamenjuju ili dodaju)";
> 		$admtext['allevents'] = "Prihvatite podatke za sve nove tipove dogaðaja i atribute";
> 		$admtext['finishingimporting'] = "Završeno...";
> 		$admtext['fileuploadfailed'] = "Otpremanje fajlova nije uspelo. To može znaèiti da je fajl prevelik. Pokušajte da koristite FTP da bi otpremili fajl u vaš GEDCOM folder, a zatim izaberite i uvezite odatle.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Obrada postojeceg tipa podatka";
135,138d168
< 		$admtext['entertypedesc'] = "Upišite opis za novi tip podataka.";
< 		$admtext['enterdisplay'] = "Please enter a display string for this new event type.";
< 		$admtext['existingeventtypeinfo'] = "Informacije o postojecem tipu podataka";
< 		$admtext['neweventtypeinfo'] = "Informacije o novom tipu podataka";
145,146d174
< 		$admtext['addnewevtype'] = "Dodavanje novog tipa podataka";
< 		$admtext['createnewevtype'] = "Kreira zapis za novi tip podataka";
149,150d176
< 		$admtext['existingevtypes'] = "Postojeci tipovi podataka";
< 		$admtext['edsevtypes'] = "Obrada, brisanje ili sortiranje prethodno unetih tipova podataka";
152d177
< 		$admtext['confdeleteevtype'] = "Jeste li sigurni da hocete da obrišete ovu vrstu podataka?";
154d178
< 		$admtext['selectentertag'] = "Please select or enter the tag for this event type.";
208d231
< 		$admtext['changestoallevtypes'] = "Promene za sve tipove podataka";
214d236
< 		$admtext['BAPM'] = "Baptism";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Jeste li sigurni da hocete da obrišete ovu vrstu podataka?";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Dodaj novi Tip";
> 		$admtext['createnewevtype'] = "Kreirajte novi atribut ili zapis tipa dogaðaja";
> 		$admtext['modifyeventtype'] = "Izmeni postojeæi tip";
> 		$admtext['entertypedesc'] = "Unesite tip/opis za ovaj novi atribut ili tip dogaðaja.";
> 		$admtext['enterdisplay'] = "Unesite string za prikaz za ovaj novi atribut ili tip dogaðaja.";
> 		$admtext['existingeventtypeinfo'] = "Informacije o postojec´em atributu ili tipu dogaðaja";
> 		$admtext['neweventtypeinfo'] = "Informacije o novom atributu ili tipu dogaðaja";
> 		$admtext['existingevtypes'] = "Postojeæi atributi ili tipovi dogaðaja";
> 		$admtext['edsevtypes'] = "Izmenite, izbrišite ili sortirajte prethodno unete atribute i tipove dogaðaja";
> 		$admtext['selectentertag'] = "Izaberite ili unesite oznaku/tag za ovaj atribut ili tip dogaðaja.";
> 		$admtext['changestoallevtypes'] = "Promene svih tipova atributa ili dogaðaja";
268d303
< 		$admtext['nobirthinfo'] = "No birth info";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Save + New Parents";
> 		$admtext['savenewspouse'] = "Save + New Spouse";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Roðenje";
354d391
< 		$admtext['enterphotodesc'] = "Please enter a description for the image.";
388d424
< 		$admtext['photoowner'] = "Owner/Source";
417d452
< 		$admtext['imgmap'] = "Image Map";
490d524
< 		$admtext['mapinstr3'] = "To link a region of this photo to a specific individual, select the individual's tree, pick a shape and dimensions for the region, then click the center of that region on the photo. A popup window will help you select the individual. After the selection is made, code for the image map will be added to the box above. Repeat this process as needed for additional regions.";
495d528
< 		$admtext['removelink'] = "Remove Link";
502d534
< 		$admtext['eloptions'] = "Browse or Delete";
509d540
< 		$admtext['nolinks'] = "No links exist yet";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Image Map";
> 		$admtext['photoowner'] = "Owner/Source";
> 		$admtext['nothumb'] = "No thumbnail";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Stavka nije mogla da se doda, najverovatnije zato što je fajl prevelik i nije mogao da se otpremi ili upotrebi za pravljenje slièice.";
> 		$admtext['moved'] = "Pomereno";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Unesite naslov ili opis za ovaj medij.";
> 		$admtext['mapinstr3'] = "Da biste povezali region ove fotografije sa osobom, porodicom ili drugim entitetom, prvo izaberite relevantno stablo i tip entiteta, a zatim kreirajte pravougaonik za željeni region. Ovo se radi klikom na gornji levi ugao regiona, a zatim prevlaèenjem u donji desni ugao. Alternativno, možete kliknuti u gornjem levom uglu, a zatim ponovo u donjem desnom uglu. Iskaèuc´i okvir c´e vam pomoc´i da izaberete osobu ili drugi entitet. Napravite svoj izbor, a zatim ponovite ovaj proces po potrebi za dodatne regione. Kliknite na postojeæi region da biste izabrali, a zatim prevucite da biste ga premestili ili kliknite na 'X' da biste izbrisali.";
596d633
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Uputstva: Prevucite ili dvaput kliknite na stavke sa leve strane u liste sa desne strane. Prevucite gore-dole da biste promenili redosled. Ponovite dvostruki-klik da biste uklonili.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Za prazan niz, ostavite ovo polje prazno i kliknite >>";
651,655d690
< 		$admtext['selectimportfile'] = "Please select a file to import.";
< 		$admtext['importgedcom'] = "Import GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
< 		$admtext['fromyourcomputer'] = "From your computer";
< 		$admtext['importdata'] = "Import Data";
657,660d691
< 		$admtext['replace'] = "Replace (in selected tree)";
< 		$admtext['desttree'] = "Destination Tree";
< 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
< 		$admtext['selectexisting'] = "Import into";
668,673d698
< 		$admtext['ucaselast'] = "Upper case all surnames";
< 		$admtext['norecalc'] = "Do not recalculate Living flag";
< 		$admtext['autooffset'] = "Start IDs at first available number";
< 
< 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
< 		$admtext['importmedia'] = "Import media if present";
675d699
< 		$admtext['neweronly'] = "Replace only if newer";
677,692d700
< 		$admtext['onwebserver'] = "On web server (in GEDCOM folder)";
< 		$admtext['eventsonly'] = "Import Custom Event Types Only (no data is added, replaced or appended)";
< 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "click here to resume";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Change Log";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Nadogradnja";
> 		$admtext['need_upgrade'] = "Završite ove instrukcije nadogradnje";
> 		$admtext['upgrade_missing'] = "Èini se da datoteka za nadogradnju nedostaje, pa ste možda vec´ gotovi.";
> 		$admtext['delete_upgrade'] = "Kada završite, kliknite ovde da biste izbrisali nadogradnju i vratili se u meni.";
723d733
< 		$admtext['author'] = "Author";
804,809c814,819
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
---
> 		$admtext['momside'] = "Mom's Side label"; //8, 20
> 		$admtext['dadside'] = "Dad's Side label"; //8, 20
> 		$admtext['momperson'] = "Mom's Side person ID"; //8, 20
> 		$admtext['momtree'] = "Mom's Side tree ID"; //8, 20
> 		$admtext['dadperson'] = "Dad's Side person ID"; //8, 20
> 		$admtext['dadtree'] = "Dad's Side tree ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Quotes header";
> 		$admtext['quotesubhead'] = "Quotes subheader";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Featurette name";
> 		$admtext['snipinfoone'] = "Featurette first line";
> 		$admtext['snipinfotwo'] = "Featurette second line";
> 		$admtext['snipimage'] = "Featurette image";
> 		$admtext['snipperson'] = "Featurette person ID";
> 		$admtext['sniptree'] = "Featurette tree ID";
> 		$admtext['quote'] = "Quote";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Feature 7 title";
> 		$admtext['featuretitle8'] = "Feature 8 title";
> 		$admtext['featuretitle9'] = "Feature 9 title";
> 		$admtext['featurethumb9'] = "Feature 9 thumbnail"; //15
> 		$admtext['featurelink9'] = "Feature 9 link"; //15
> 		$admtext['featurepara9'] = "Feature 9 paragraph"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Header Left Image";
> 		$admtext['rightimg'] = "Header Right Image";
> 		$admtext['photoption'] = "Photo options are<br />&nbsp;&nbsp;(static or random)";
> 		$admtext['randomphotowidth'] = "Random Photo Width";
> 		$admtext['randomphotoheight'] = "Random Photo Height";
> 		$admtext['randomphotomediatypeID'] = "Random Photo Collection";
> 		$admtext['momheading'] = "Maternal Family Heading";
> 		$admtext['mompara'] = "Maternal Family Paragraph";
> 		$admtext['mompagelink'] = "Maternal Family Page Link";
> 		$admtext['dadheading'] = "Paternal Family Heading";
> 		$admtext['dadpara'] = "Paternal Family Paragraph";
> 		$admtext['dadpagelink'] = "Paternal Family Page Link";
> 		$admtext['spmomheading'] = "Spouse Maternal Family Heading";
> 		$admtext['spmompara'] = "Spouse Maternal Family Paragraph";
> 		$admtext['spmompagelink'] = "Spouse Maternal Family Page Link";
> 		$admtext['spmomside'] = "Spouse Maternal Side label";
> 		$admtext['spdadside'] = "Spouse Paternal Side label";
> 		$admtext['spmomperson'] = "Spouse Maternal Side personID";
> 		$admtext['spmomtree'] = "Spouse Maternal Side treeID";
> 		$admtext['spdadheading'] = "Spouse Paternal Family Heading";
> 		$admtext['spdadpara'] = "Spouse Paternal Family Paragrph";
> 		$admtext['spdadpagelink'] = "Spouse Paternal Family Page Link";
> 		$admtext['spdadperson'] = "Spouse Paternal Side personID";
> 		$admtext['spdadtree'] = "Spouse Paternal Side treeID";
> 		$admtext['storiesheading'] = "Our Family Stories";
> 		$admtext['nbrsurnames'] = "Number of Surnames<br />&nbsp;&nbsp; in Surname Cloud";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Feature thumbnail";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG requires 5.3 or higher.)";
---
> 		$admtext['phpreq'] = "(TNG requires 7.0 or higher.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Change incoming prefixes to match TNG settings";
> 		$admtext['sortevents'] = "Sort events by";
> 		$admtext['sortbydate'] = "Event date";
> 		$admtext['sortbytype'] = "Event type";
> 		$admtext['allowsuggest'] = "Allow suggestions from visitors";
> 		$admtext['livingchecked'] = "Living flag set for new people and families";
> 		$admtext['maxmarried'] = "Mark family living if married less than<br/>this many years";
> 		$admtext['imagetags'] = "Rectangles";
> 		$admtext['allowcsv'] = "Allow CSV downloads for reports";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Opcije Rezervnih kopija/Backup";
> 		$admtext['dosql'] = "Izvezi kao SQL";
> 		$admtext['dodrop'] = "Ukljuèi DROP TABLE AKO POSTOJI";
> 		$admtext['docreate'] = "Ukljuèi CREATE TABLE";
> 		$admtext['onrestore'] = "Opcije vraæanja";
> 		$admtext['dodel'] = "Prvo izbrišite prethodni sadržaj";
> 		$admtext['download'] = "Preuzimanje/Download";
> 		$admtext['altbirthtypes'] = "Alternativni dogaðaji roðenja";
> 		$admtext['dtformat'] = "Format Tabela";
> 		$admtext['conchart'] = "Konekcije Grafikona";
> 		$admtext['maxropt'] = "Maksimalan broj pokretanja pretrage povezivanja";
> 		$admtext['maxlopt'] = "Maksimalna dužina putanje povezivanja";
> 		$admtext['showtxtopt'] = "Prikaži tekstualni iskaz putanje";
> 		$admtext['compactboxopt'] = "Prikaži osobe u kompaktnom obliku";
> 		$admtext['sortbyopt'] = "Sortiraj putanje po";
> 		$admtext['anchoridopt'] = "Sidro/Anchor ID";
> 		$admtext['maxmopt'] = "Maksimalan broj uvezanih brakova.";
> 		$admtext['saveincfg'] = "Èuvajte u konfiguracionoj putanji (pogledajte Opšta podešavanja)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Could not be geocoded";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Do not geocode";
1436d1549
< 		$admtext['backtosecondary'] = "Back to Secondary Processes";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Nazad na Posle-Uvoza Usluga/Utilities";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exclude notes";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip arhiv fajlovi i ukljuèite medijske fajlove";
> 		$admtext['downloadzip'] = "Preuzmite/Download ZIP arhiv fajlove";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Show disabled users only";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Takoðe pošaljite administratorima kada je izabrano jedno stablo.";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Invalid character";
1886d2008
< 		$admtext['test_number'] = "Test Number";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Test Number";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Link this DNA test to a person";
1965d2095
< $admtext['otherevents'] = "Other Events";
2050,2051d2179
< $admtext['savereturn'] = "Return to this page";
< $admtext['saveback'] = "Return to menu";
2058,2059d2185
< $admtext['secondary'] = "Secondary Processes";
< $admtext['commas'] = "Separate multiple entries with commas";
2101c2227
< $admtext['nobranch'] = "No Branch";
---
> $admtext['nobranch'] = "No branch";
2129,2130d2254
< $admtext['secondarymaint'] = "Secondary Processes";
< $admtext['customeventtypes'] = "Custom Event Types";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Surnames";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Image";
> $admtext['author'] = "Author";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Getting Started";
> $admtext['showlog'] = "Change Log";
> $admtext['nobirthinfo'] = "No birth info";
> //changed in 13.0
> $admtext['savereturn'] = "Save + Stay";
> $admtext['saveback'] = "Save + Exit";
> //added in 13.0
> $admtext['allitemsdeleted'] = "All items were successfully deleted.";
> $admtext['private'] = "Private";
> $admtext['imgtags'] = "Image Tags";
> 
> $admtext['removelink'] = "Remove Link";
> $admtext['eloptions'] = "Browse or Delete";
> $admtext['pleaseenter'] = "Upišite ";
> 
> $admtext['nolinks'] = "No links exist yet";
> $admtext['nogeocode'] = "Could not be geocoded";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Dogaðaj / Tipovi atributa";
> $admtext['secondary'] = "Uslužni programi nakon uvoza";
> $admtext['otherevents'] = "Drugi Dogaðaji / Attibuti";
> //added in 14.0
> $admtext['newlinks'] = "Kreirani linkovi";
> $admtext['newcemlinks'] = "Kreirani linkovi Groblja";
> $admtext['utility'] = "Uslužni";
> $admtext['linktype'] = "Tip";
> $admtext['move'] = "Pomeri";
> $admtext['copy'] = "Kopiraj";
> $admtext['title2'] = "Naslov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Serbian/alltext.php TNG1403/languages/Serbian/alltext.php
79,80c79,80
< $text['male'] = "Muško";
< $text['female'] = "Žensko";
---
> $text['male'] = "Muško";
> $text['female'] = "Žensko";
85c85
< $text['none'] = "None";
---
> $text['none'] = "Ništa";
88d87
< //moved here in 8.0.0
94c93
< $admtext['enterfamilyid'] = "Upišite ID porodice.";
---
> $admtext['enterfamilyid'] = "Upišite ID porodice.";
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
136c129
< $text['contains'] = "sadrži";
---
> $text['contains'] = "sadrži";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
144c134
< $text['enteremail'] = "Milomo vas upišite važecu E-mail adresu";
---
> $text['enteremail'] = "Milomo vas upišite važecu E-mail adresu";
146c136
< $text['go'] = "Traži";
---
> $text['go'] = "Traži";
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "rod.";
> $text['chrabbr'] = "krš.";
> $text['deathabbr'] = "smr.";  //from descend
> $text['burialabbr'] = "sah.";  //from descend
> $text['marrabbr'] = "ven.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Prva strana";
> $text['lastpage'] = "Poslednja strana";
> 
> //changed in 13.0.0
> $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
> //added in 13.0.0
> $admtext['nobranch'] = "No branch";
> 
> //added in 14.0
> $text['oneyear'] = "godina";
> $text['pwdcodelink'] = "Kliknite na ovu vezu/link da biste dobili privremenu lozinku.";
> $text['pwdcodesent'] = "Poruka sa linkom za resetovanje lozinke je poslata na vašu e-mail adresu.";
> $text['moved'] = "Pomereno";
> $text['citation'] = "Citat";
> $text['other'] = "Ostalo";
> $text['death'] = "Smrt";
> $text['burial'] = "Sahrana";
> $text['cremation'] = "Kremacija";
> $text['marriage'] = "Brak/Venèanje";
> $text['divorce'] = "Razvod";
> $text['bylength'] = "Koraci";
> $text['bymarriages'] = "Brakovi";
> $text['none'] = "Ništa";
> 
> //moved here in 14.0
> $text['family'] = "BRAK";
> $text['source'] = "IZVOR";
> $text['repository'] = "Repository";
> $text['place'] = "Mesto";
> $admtext['BAPM'] = "Baptism";
> 
> $text['glang'] = "sr-Latn";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Serbian/text.php TNG1403/languages/Serbian/text.php
69d68
< 		$text['general'] = "General";
77a77
> 	case "connections":
79c79
< 		$text['findrel'] = "STEPEN SRODSTVA";
---
> 		$text['findrel'] = "Pronaðite srodstva";
83c83
< 		$text['select2inds'] = "Odaberite dve osobe.";
---
> 		$text['select2inds'] = "Izaberite dve osobe.";
90c90
< 		$text['sameperson'] = "Ista ososba je odabrana dva puta.";
---
> 		$text['sameperson'] = "Dve osobe su ista osoba.";
93c93
< 		$text['sometimes'] = "(Ponekad provera za razlicit broj generacija daje razlicit rezultat.)";
---
> 		$text['sometimes'] = "(Ponekad provera razlièitog broja generacija daje drugaèiji rezultat.)";
144c144
< 		$text['dospouses2'] = "Show Spouses";
---
> 		$text['dospouses2'] = "Prikaži supružnike";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Potražite veze";
> 		$text['findrel2'] = "Pronaðite srodstva i druge veze";
> 		$text['makeme2nd'] = "Koristi moj ID";
> 		$text['usebookmarks'] = "Koristite obeleživaèe/bookmarks";
> 		$text['select2inds'] = "Izaberite dve osobe.";
> 		$text['indinfofor'] = "Individualne informacije za";
> 		$text['nobookmarks'] = "Nema obeleživaèa/bookmark  za korišc´enje";
> 		$text['bkmtitle'] = "Osobe pronaðene u obeleživaèima/bookmarks";
> 		$text['bkminfo'] = "Izaberite osobu:";
> 		$text['sortpathsby'] = "Sortiraj putanje po broju";
> 		$text['sortbyshort'] = "Sortiraj po";
> 		$text['bylengthshort'] = "Dužina";
> 		$text['badID1'] = ": ID loše osobe1 - vratite se i ispravite";
> 		$text['badID2'] = ": ID loše osobe2 - vratite se i ispravite";
> 		$text['notintree'] = ": osoba sa ovim ID-om nije u trenutnoj bazi podataka stabla.";
> 		$text['sameperson'] = "Dve osobe su ista osoba.";;
> 		$text['nopaths'] = "Ove osobe nisu povezane, nisu u srodstvu";
> 		$text['nopaths1'] = "Nema više veza krac´ih od xxx";
> 		$text['nopaths2'] = "u xxx koracima pretrage";
> 		$text['longestpath'] = "(najduža do sada proverena putanja bila je duga xxx koraka)";
> 		$text['relevantpaths'] = "Broj pronaðenih razlièitih relevantnih putanja: xxx";
> 		$text['skipMarr'] = "(pored toga, broj putanja pronaðenih, ali nisu prikazani zbog prevelikog broja brakova bio je: xxx)";
> 		$text['mjaor'] = "ili";
> 		$text['connectionsto'] = "Veze za ";
> 		$text['findanotherpers'] = "Naði drugu osobu...";
> 		$text['sometimes'] = "(Ponekad provera razlièitog broja generacija daje drugaèiji rezultat.)";
> 		$text['anotherpath'] = "Potražite druge veze";
> 		$text['xpath'] = "Putanja ";
> 		$text['primary'] = "Poèetna osoba"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Krajnja osoba";
> 		$text['parent'] = "Roditelj";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "her daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "otac";
> 		$text['hmother'] = "majka";
> 		$text['hhusband'] = "suprug";
> 		$text['hwife'] = "supruga";
> 		$text['hson'] = "sin";
> 		$text['hdaughter'] = "æerka";
> 		$text['maxruns'] = "Maksimalan broj putanja koje treba proveriti";
> 		$text['maxrshort'] = "Maksimalan broj putanja";
> 		$text['maxlength'] = "Putanje veza ne duže od";
> 		$text['maxlshort'] = "Maksimalna dužina";
> 		$text['xstep'] = "korak";
> 		$text['xsteps'] = "koraka";
> 		$text['xmarriages'] = "xxx brakova";
> 		$text['xmarriage'] = "1 brak";
> 		$text['showspouses'] = "Prikažite oba supružnika";
> 		$text['showTxt'] = "Prikaži tekstualni opis putanje";
> 		$text['showTxtshort'] = "Tekstualno potomci/descendant";
> 		$text['compactBox'] = "Prikažite osobe u kompatnom obliku";
> 		$text['compactBoxshort'] = "Kompaktni oblik";
> 		$text['paths'] = "Putanje";
> 		$text['dospouses2'] = "Prikaži supružnike";
> 		$text['maxmopt'] = "Maksimalan broj brakova po srodstvu";
> 		$text['maxm'] = "Maksimalan broj brakova";
> 		$text['arerelated'] = "Ove osobe su rodaci - njihovo srodstvo je prikazano u Putanji 1";
> 		$text['simplerel'] = "Jednostavna pretraga srodstva";
196d264
< 		$text['scrollnote'] = "Ako ne vidite ceo dijagram pomerite sliku dole ili desno.";
199d266
< 		$text['popupnote2'] = "= Novi dijagram";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabele";
> 		$text['dtchildren'] = "Deca";
> 		$text['dtgrandchildren'] = "Unuci";
> 		$text['dtggrandchildren'] = "Praunuci";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nema potomaka";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Ukupno";
> 		$text['dtselect'] = "Izabrati";
> 		$text['dteachfulltable'] = "Svaka puna tabela æe imati";
> 		$text['dtrows'] = "redova";
> 		$text['dtdisplayingtable'] = "Prikaz tabele";
> 		$text['dtgototable'] = "Idi do tabele:";
> 		$text['fcinstrdn'] = "Prikaži porodicu sa supružnikom";
> 		$text['fcinstrup'] = "Prikaži porodicu sa roditeljima";
> 		$text['fcinstrplus'] = "Izaberite druge supružnike";
> 		$text['fcinstrfam'] = "Izaberite druge roditelje";
381,382d466
< 		$text['firstpage'] = "Prva strana";
< 		$text['lastpage'] = "Poslednja strana";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Toggle Tags";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Nova lozinka ponovo";
> 		$text['resetsuccess'] = "Uspeh: Lozinka je resetovana";
> 		$text['resetfail'] = "Greška: Lozinka nije resetovana";
> 		$text['failreason0'] = " (nepoznata greška baze podataka)";
> 		$text['failreason2'] = " (nemate dozvolu da promenite lozinku)";
> 		$text['failreason3'] = " (lozinke se ne poklapaju)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Ukupno Izvora Citata";
618d710
< 		$text['loginfirst'] = "You must log in first.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "You must log in first.";
629,630d722
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Out";
656d747
< 		$text['dna_info_head'] = "DNA Test Info";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "rod.";
< $text['chrabbr'] = "krš.";
675d788
< $text['family'] = "BRAK"; //from getperson
685d797
< $text['deathabbr'] = "smr.";  //from descend
706d817
< $text['burialabbr'] = "sah.";  //from descend
712d822
< $text['place'] = "Mesto";
715d824
< $text['marrabbr'] = "ven.";
738d846
< $text['source'] = "IZVOR";
766d873
< $text['repository'] = "Repository";
770d876
< $text['findplaces'] = "Find all individuals with events at this location";
804d909
< $text['glang'] = "&amp;hl=sr";
816d920
< $text['none'] = "None";
924d1027
< $text['otherevents'] = "Drugi dogadaji";
952,953d1054
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Quick Links";
> $text['yourname'] = "Your Name";
> $text['youremail'] = "Your Email Address";
> $text['liketoadd'] = "Any info you'd like to add";
> $text['webmastermsg'] = "Webmaster Message";
> $text['gallery'] = "See Gallery";
> $text['wasborn_male'] = "was born";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "was born"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "was christened";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "died";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "died";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "was buried"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "was buried"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "was cremated";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "was cremated";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "married";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "married";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "was divorced";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "was divorced";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " in ";			// used as a preposition to the location
> $text['onthisdate'] = " on ";		// when used with full date
> $text['inthisyear'] = " in ";		// when used with year only or month / year dates
> $text['and'] = "and ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Visitor";
> 
> $text['popupnote2'] = "= Novi dijagram";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zoom In";
> $text['zoomout'] = "Zoom Out";
> $text['scrollnote'] = "Ako ne vidite ceo dijagram pomerite sliku dole ili desno.";
> $text['general'] = "General";
> 
> //changed in 14.0
> $text['otherevents'] = "Drugi dogaðaji i atributi";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Veze";
> $text['continue'] = "Nastavi";
> $text['title2'] = "Naslov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
Only in TNG1403/languages: SerbianCyrillic-UTF8
diff -r TNG/languages/Serbian-UTF8/admintext.php TNG1403/languages/Serbian-UTF8/admintext.php
5,7c5,7
< 		$admtext['branchlabel'] = "Branch Label";
< 		$admtext['existingbranch'] = "Postojeci odeljak";
< 		$admtext['newbranch'] = "Novi odeljak";
---
> 		$admtext['branchlabel'] = "Oznaka Grane";
> 		$admtext['existingbranch'] = "Postojeća grana";
> 		$admtext['newbranch'] = "Nova grana";
12,22c12,22
< 		$admtext['includespouses'] = "Pokaži i bracnog partnera sa potomke";
< 		$admtext['partial'] = "Delimicno";
< 		$admtext['addlabels'] = "Add labels";
< 		$admtext['clearlabels'] = "Clear labels";
< 		$admtext['clearingbranch'] = "Clearing Branch Labels";
< 		$admtext['addingbranch'] = "Adding Branch Labels";
< 		$admtext['totalaffected'] = "Total Affected";
< 		$admtext['labelmore'] = "Label more branches";
< 		$admtext['enterbranch'] = "Odaberite postojeci odeljak ili upišite novi.";
< 		$admtext['enterstartingind'] = "Upišite ID pocetne ososbe.";
< 		$admtext['gensnumeric'] = "Values for Ancestors and Descendants must be numeric.";
---
> 		$admtext['includespouses'] = "Pokaži i bra�nog partnera sa potomke";
> 		$admtext['partial'] = "Delimi�no";
> 		$admtext['addlabels'] = "Dodaj oznaku";
> 		$admtext['clearlabels'] = "Obriši oznaku";
> 		$admtext['clearingbranch'] = "Obriši Oznaku Grane";
> 		$admtext['addingbranch'] = "Dodaj Oznaku Grane";
> 		$admtext['totalaffected'] = "Ukupno Pogođeni";
> 		$admtext['labelmore'] = "Oznaka sa više Grana";
> 		$admtext['enterbranch'] = "Odaberite postojeću granu ili upišite novu.";
> 		$admtext['enterstartingind'] = "Upišite ID po�etne osobe.";
> 		$admtext['gensnumeric'] = "Vrednosti za pretke i potomke moraju biti numeri�ke.";
24,42c24,42
< 		$admtext['branchid'] = "ID Odeljka";
< 		$admtext['addnewbranch'] = "Dodaj novi odeljak";
< 		$admtext['createbranch'] = "Kreiraj zapis za novi odeljak";
< 		$admtext['existingbranchinfo'] = "Informacije o postojecem odeljku";
< 		$admtext['editexistingbranch'] = "Obrada informacija o prethodno upisanom odeljku";
< 		$admtext['confbranchdelete'] = "Jeste li sigurni da hocete da pbrišete ovaj odeljak?";
< 		$admtext['enterbranchid'] = "Upišite ID odeljka.";
< 		$admtext['entertreedesc'] = "Upišite opis odeljka.";
< 		$admtext['newbranchinfo'] = "Informacije o novom odeljku";
< 		$admtext['modifybranch'] = "Promene postojeceg odeljka";
< 		$admtext['changestobranch'] = "Changes to branch";
< 		$admtext['existlabels'] = "Existing labels";
< 		$admtext['leave'] = "Leave";
< 		$admtext['append'] = "Append all records";
< 		$admtext['showpeople'] = "Show people with this tree/branch";
< 		$admtext['branchdiscl'] = "This number represents the total number of branch links, not necessarily the number of people or families currently linked to this branch. If you have recently re-imported your data, you may need to relabel your branches.";
< 		$admtext['inclspouses'] = "Include spouses for all descendants";
< 		$admtext['delpeople'] = "Delete people and families with this branch label";
< 		$admtext['confbrdel'] = "Are you sure you want to delete all people and families with this branch label?";
---
> 		$admtext['branchid'] = "ID Grane";
> 		$admtext['addnewbranch'] = "Dodaj novu granu";
> 		$admtext['createbranch'] = "Kreiraj zapis za novu granu";
> 		$admtext['existingbranchinfo'] = "Informacije o postojećoj grani";
> 		$admtext['editexistingbranch'] = "Obrada informacija o prethodno upisanoj granu";
> 		$admtext['confbranchdelete'] = "Jeste li sigurni da hoćete da obrišete ovu granu?";
> 		$admtext['enterbranchid'] = "Upišite ID grane.";
> 		$admtext['entertreedesc'] = "Upišite opis stabla.";
> 		$admtext['newbranchinfo'] = "Informacije o novoj grani";
> 		$admtext['modifybranch'] = "Promene postojeće grane";
> 		$admtext['changestobranch'] = "Promene u grani";
> 		$admtext['existlabels'] = "Postojeće oznake";
> 		$admtext['leave'] = "Ostaviti";
> 		$admtext['append'] = "Dodavanje svih zapisa";
> 		$admtext['showpeople'] = "Prikaži osobe u ovom/ovoj drvetu/grani";
> 		$admtext['branchdiscl'] = "Ovaj broj predstavlja ukupan broj grana linkova, a ne nužno broj osoba ili porodica koji su trenutno vezano za ovu granu. Ako ste nedavno uvezli podatke, moraćete možda ponovo izvršiti de ozna�avanje vaše grane.";
> 		$admtext['inclspouses'] = "Uklju�i supružnike za sve potomke";
> 		$admtext['delpeople'] = "Brisanje osoba i porodica sa ovom oznakom grane";
> 		$admtext['confbrdel'] = "Da li ste sigurni da želite da obrišete sve osobe i porodice sa ovom oznakom grane?";
47,49c47,49
< 		$admtext['mapnotcopied'] = "The map image file could not be copied to";
< 		$admtext['changestocem'] = "Changes to cemetery";
< 		$admtext['modifycemetery'] = "Obrada postojeceg groblja";
---
> 		$admtext['mapnotcopied'] = "Fajl, slika mape ne može da se kopira u";
> 		$admtext['changestocem'] = "Promene u groblju";
> 		$admtext['modifycemetery'] = "Izmena postojećeg groblja";
53,54c53,54
< 		$admtext['location'] = "Location";
< 		$admtext['confdeletecem'] = "Jeste li sigurni da hocete da obrišete odabrano groblje?";
---
> 		$admtext['location'] = "Lokacija";
> 		$admtext['confdeletecem'] = "Jeste li sigurni da hoćete da obrišete odabrano groblje?";
59,60c59,60
< 		$admtext['countyparish'] = "County/Parish";
< 		$admtext['stateprovince'] = "State/Province/Shire";
---
> 		$admtext['countyparish'] = "Okrug/Parohija";
> 		$admtext['stateprovince'] = "Država/Pokrajna/Okrug";
62,63c62,63
< 		$admtext['entermapfile'] = "Please enter a file name for your map file on the web server.";
< 		$admtext['existingceminfo'] = "Informacije o postojecem groblju";
---
> 		$admtext['entermapfile'] = "Unesite ime fajla za fajl mape na web serveru.";
> 		$admtext['existingceminfo'] = "Informacije o postojećem groblju";
68c68
< 		$admtext['requiredmap'] = "Neophodno. This should correspond to the name and location of your file <em>within the headstones folder</em> once the file is uploaded. Na primer, ako se vac podskup za spomenike zove <em>headstones</em>,	i vi hocete da se vaš fajl zove <em>map.jpg</em> i da bude upisan u podskup koji se zove <em>mymaps</em>, upisacete <em>mymaps/map.jpg</em> u ovo polje.";
---
> 		$admtext['requiredmap'] = "Neophodno. Ovo bi trebalo da odgovara imenu foldera i lokaciji fajla <em>folderu nadgrobnih spomenika</em> kad se fajl otpremi. Na primer: Ako se vaš podskup za spomenike zove <em>headstones</em>,	i vi hoćete da se Vaš fajl zove <em>map.jpg</em> i da bude upisan u podskup koji se zove <em>mymaps</em>, upisaćete <em>mymaps/map.jpg</em> u ovo polje.";
77c77
< 		$admtext['alreadyexists'] = "vec postoji";
---
> 		$admtext['alreadyexists'] = "već postoji";
80,81c80
< 		$admtext['pleaseenter'] = "Upišite ";
< 		$admtext['netscapereload'] = "Netscape korisnici: <br/>You must reload the Cemeteries page to see your new";
---
> 		$admtext['netscapereload'] = "Netscape korisnici: <br/>Morate ponovo u�itati stranicu sa grobljima, da biste videli groblje koje ste upravo dodali";
92c91
< 		$admtext['notechanges'] = "Changes to note";
---
> 		$admtext['notechanges'] = "Promeni tekst beleške";
99,100c98,99
< 		$admtext['updatingevent'] = "Updating Event...";
< 		$admtext['modifyevent'] = "Obradi podatak";
---
> 		$admtext['updatingevent'] = "Ažuriranje podatka...";
> 		$admtext['modifyevent'] = "Obrada podatka";
109c108
< 		$admtext['dupfor'] = "Duplicate for";
---
> 		$admtext['dupfor'] = "Duplikat za";
115,118c114,117
< 		$admtext['ifimportfails'] = "If the import fails to run to completion,";
< 		$admtext['opened'] = "opened...";
< 		$admtext['toresume'] = "to resume import";  //cannot open to resume import
< 		$admtext['openedtoresume'] = "opened to resume import...";
---
> 		$admtext['ifimportfails'] = "Ako uvoz podataka ne uspe da se završi,";
> 		$admtext['opened'] = "otvoren...";
> 		$admtext['toresume'] = "nastaviti uvoz podataka";  //cannot open to resume import
> 		$admtext['openedtoresume'] = "otvoriti za nastavak uvoza podataka...";
121,128c120,162
< 		$admtext['treeexists'] = "Another tree already exists with the selected ID. Please select a different ID and try again.";
< 		$admtext['backtodataimport'] = "Back to Data Import";
< 		$admtext['moreoptions'] = "More Options";
< 		$admtext['removeged'] = "Delete GEDCOM file (optional)";
< 		$admtext['cannotupload'] = "Could not upload file:";
< 		$admtext['invfperms'] = "Your 'gedcom' folder may have inadequate permissions (try 755 or 777).";
< 		$admtext['maybedone'] = "It may have already finished.";
< 		$admtext['turnonsis'] = "Make sure 'Save Import State' is turned on in the Import Settings.";
---
> 		$admtext['treeexists'] = "Drugo stablo već postoji sa izabranim ID brojem. Unesite drugi ID broj, i pokušajte ponovo.";
> 		$admtext['backtodataimport'] = "Povratak na Uvoz Podataka";
> 		$admtext['moreoptions'] = "Više Opcija";
> 		$admtext['removeged'] = "Brisanje GEDCOM fajla (opciono)";
> 		$admtext['cannotupload'] = "Nije moguće otpremiti fajl:";
> 		$admtext['invfperms'] = "Vaš 'gedcom' folder moguće da ima nedozvoljene dozvole (pokušaj sa 755 ili 777).";
> 		$admtext['maybedone'] = "Možda je već završen.";
> 		$admtext['turnonsis'] = "Budite sigurni da ste i opciju 'Snimi Uvoz Država' uklju�ili u Podešavanja Uvoza.";
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Izaberite fajl za uvoz podataka.";
> 		$admtext['addreplacedata'] = "Dodajte ili zamenite vašu genealogiju (ovo može potrajati nekoliko minuta, u zavisnosti od veli�ine fajla)";
> 		$admtext['fromyourcomputer'] = "Iz vašeg ra�unara";
> 		$admtext['importdata'] = "Uvoz Podataka";
> 		$admtext['replace'] = "Zamenite (u izabranom stablu)";
> 		$admtext['desttree'] = "Destinacioni Stablo";
> 		$admtext['selectdesttree'] = "Izaberite i/ili unesite destinaciono Stablo.";
> 		$admtext['selectexisting'] = "Uvoz podataka u";
> 		$admtext['ucaselast'] = "Velika slova u svim prezimenima";
> 		$admtext['norecalc'] = "Ne prera�uvati osobe koje su ozna�ene živima";
> 		$admtext['autooffset'] = "Pokrenite ID brojeve na prvom dostupnom broju";
> 		$admtext['mustselecttree'] = "Morate da izaberete stablo pre nego Å¡to odaberete ovu opciju.";
> 		$admtext['onwebserver'] = "Na web serveru (u GEDCOM folderu)";
> 		$admtext['imphints'] = "Saveti: Svi trenutni podaci predstavljaju sve osobe, familije, izvores i beleške (povezivanje sa medijima nisu se izgubile onoliko dugo koliko ID identifikacione karte ostaju iste). Poklapanja se uvek zasnivaju samo na  identifikacionim kartama. Novi zapisi se uvek dodaju. Dodavaje iz uvoza dodaje sve zapise sa novim identifikacionim kartama.";
> 		$admtext['destbranch'] = "Destinacija Grana (opciono)";
> 		$admtext['importlatlong'] = "Uvoz podataka geografske širine / dužine, ako je moguće";
> 		$admtext['opening'] = "Otvaranje";
> 		$admtext['reopen'] = "Ponovo otvaranje";
> 		$admtext['uploading'] = "Otpremanje/Slanje";
> 		$admtext['stop'] = "Stop";
> 		$admtext['stopped'] = "Uvoz podataka stopiran";
> 		$admtext['resume'] = "kliknite ovde za nastavak";
> 		$admtext['neweronly'] = "Zamenite samo ona novija";
> 		$admtext['oldimport'] = "Stari stil uvoza podataka (bez progres bara)";
> 		$admtext['importgedcom'] = "Uvezi GEDCOM fajl (fajl može biti zapakovan)";
> 		$admtext['stopbackup'] = "Stop! It might be a good idea to back up your current data before proceeding.";
> 		$admtext['importmedia'] = "Uvoz medija ako su prisutni";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Uverite se da su prefiksi i sufiksi (Opšta podešavanja) ispravni za ovaj fajl.";
> 		$admtext['chkimpsettings'] = "Proverite podešavanja uvoza za više opcija.";
> 		$admtext['eventsonly'] = "Uvezite samo prilagođene tipove događaja i atribute (nikakvi podaci se ne dodaju, zamenjuju ili dodaju)";
> 		$admtext['allevents'] = "Prihvatite podatke za sve nove tipove događaja i atribute";
> 		$admtext['finishingimporting'] = "Završeno...";
> 		$admtext['fileuploadfailed'] = "Otpremanje fajlova nije uspelo. To može zna�iti da je fajl prevelik. Pokušajte da koristite FTP da bi otpremili fajl u vaš GEDCOM folder, a zatim izaberite i uvezite odatle.";
129a164
> 
132,139c167,169
< 		$admtext['changestoevtype'] = "Changes to event type";
< 		$admtext['modifyeventtype'] = "Obrada postojeceg tipa podatka";
< 		$admtext['individual'] = "Individual";
< 		$admtext['entertypedesc'] = "Upišite opis za novi tip podataka.";
< 		$admtext['enterdisplay'] = "Please enter a display string for this new event type.";
< 		$admtext['existingeventtypeinfo'] = "Informacije o postojecem tipu podataka";
< 		$admtext['neweventtypeinfo'] = "Informacije o novom tipu podataka";
< 		$admtext['tag'] = "Tag";
---
> 		$admtext['changestoevtype'] = "Promene u tipu podatka";
> 		$admtext['individual'] = "Individualan";
> 		$admtext['tag'] = "Oznaka/Tag";
143,146c173,174
< 		$admtext['ignore'] = "Preskoci";
< 		$admtext['typerequired'] = "With custom tags (where tag = \"EVEN\"), this is the TYPE and is required. Optional for all other tags.";
< 		$admtext['addnewevtype'] = "Dodavanje novog tipa podataka";
< 		$admtext['createnewevtype'] = "Kreira zapis za novi tip podataka";
---
> 		$admtext['ignore'] = "Preskoći";
> 		$admtext['typerequired'] = "Sa prilagođenim oznakama (gde tag \"EVEN\"), to je TYPE koji je obavezan. Opciono za ostale oznake/tag.";
149,150d176
< 		$admtext['existingevtypes'] = "Postojeci tipovi podataka";
< 		$admtext['edsevtypes'] = "Obrada, brisanje ili sortiranje prethodno unetih tipova podataka";
152,157c178,181
< 		$admtext['confdeleteevtype'] = "Jeste li sigurni da hocete da obrišete ovu vrstu podataka?";
< 		$admtext['selecttag'] = "Select Tag";
< 		$admtext['selectentertag'] = "Please select or enter the tag for this event type.";
< 		$admtext['orenter'] = "or enter";
< 		$admtext['ifbothdata'] = "will take precedence if both fields contain data";
< 		$admtext['EVEN'] = "Event";
---
> 		$admtext['selecttag'] = "Izaberi Oznaku/Tag";
> 		$admtext['orenter'] = "ili unesite";
> 		$admtext['ifbothdata'] = "će imati prednost ako oba polja sadrže podatke";
> 		$admtext['EVEN'] = "Podatak";
161,166c185,190
< 		$admtext['BARM'] = "Barmitzvah";
< 		$admtext['BASM'] = "Basmitzvah";
< 		$admtext['CAST'] = "Caste";
< 		$admtext['CENS'] = "Census";
< 		$admtext['CHRA'] = "Adult Christening";
< 		$admtext['CONF'] = "Confirmation";
---
> 		$admtext['BARM'] = "Bar Micva";
> 		$admtext['BASM'] = "Bat Micva";
> 		$admtext['CAST'] = "Kasta";
> 		$admtext['CENS'] = "Popis/Cenzus";
> 		$admtext['CHRA'] = "Krštenje odraslih";
> 		$admtext['CONF'] = "Potvrda";
168c192
< 		$admtext['DSCR'] = "Physical Description";
---
> 		$admtext['DSCR'] = "Fizi�ki Opis";
170,174c194,198
< 		$admtext['EMIG'] = "Emigration";
< 		$admtext['FCOM'] = "First Communion";
< 		$admtext['GRAD'] = "Graduation";
< 		$admtext['IDNO'] = "National ID Number";
< 		$admtext['IMMI'] = "Immigration";
---
> 		$admtext['EMIG'] = "Emigracija";
> 		$admtext['FCOM'] = "Prva pri�est";
> 		$admtext['GRAD'] = "Diplomiranje";
> 		$admtext['IDNO'] = "Nacionalni/Mati�ni Broj";
> 		$admtext['IMMI'] = "Imigracija";
177c201
< 		$admtext['NATU'] = "Naturalization";
---
> 		$admtext['NATU'] = "Naturalizacija";
181c205
< 		$admtext['ORDI'] = "Ordinance";
---
> 		$admtext['ORDI'] = "Obred/Dekret";
205,206c229,230
< 		$admtext['deleteselected'] = "Delete Selected";
< 		$admtext['ignoreselected'] = "Preskoci odabrano";
---
> 		$admtext['deleteselected'] = "OBRIÅ I Selektovano";
> 		$admtext['ignoreselected'] = "Preskoći odabrano";
208,209c232
< 		$admtext['changestoallevtypes'] = "Promene za sve tipove podataka";
< 		$admtext['forrepos'] = " Za dosijee...";
---
> 		$admtext['forrepos'] = " Za dosije...";
211,218c234,240
< 		$admtext['DESI'] = "Descendant Interest";
< 		$admtext['allnone'] = "Enter a display message for each language,<br />or leave all blank and enter one display message above.";
< 		$admtext['assocwith'] = "Associated with";
< 		$admtext['BAPM'] = "Baptism";
< 		$admtext['umps'] = "Your GEDCOM file may be larger than the maximum size allowed by your PHP installation. You can ask your provider to increase the 'upload_max_filesize' value, or you can copy your file to the 'gedcom' folder on your site and import it from there instead.;";
< 		$admtext['othlangs'] = "Other Languages";
< 		$admtext['evdata'] = "Event Data";
< 		$admtext['ANCI'] = "Submitter";
---
> 		$admtext['DESI'] = "Potomsko zanimanje/interesovanje";
> 		$admtext['allnone'] = "Unesite prikaz poruke za svako pismo/jezik,<br/>ili ostavite sve prazno za unos jedne poruke za sve.";
> 		$admtext['assocwith'] = "Povezano sa";
> 		$admtext['umps'] = "Vaš GEDCOM fajl može biti veći od maksimuma dozvoljenog PHP instalacijom. Možete zamoliti vašeg provajdera da poveća 'upload_max_filesize' rednost, ili da kopirate vaš GEDCOM fajl u 'gedcom' folder na sajtu i uvesti podatke odatle.;";
> 		$admtext['othlangs'] = "Ostala/i pisma/jezici";
> 		$admtext['evdata'] = "Podatak o događaju";
> 		$admtext['ANCI'] = "Podnosilac";
220,222c242,244
< 		$admtext['collapseev'] = "Collapse Event";
< 		$admtext['collapse'] = "Collapse";
< 		$admtext['collapseselected'] = "Collapse Selected";
---
> 		$admtext['collapseev'] = "Skupi Događaj";
> 		$admtext['collapse'] = "Skupi";
> 		$admtext['collapseselected'] = "Skupi Izabrano";
224c246
< 		$admtext['expselected'] = "Expand Selected";
---
> 		$admtext['expselected'] = "Proširi Izabrano";
226c248,262
< 		$admtext['ldsevent'] = "LDS Event";
---
> 		$admtext['ldsevent'] = "LDS Događaj";
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Jeste li sigurni da hoćete da obrišete ovu vrstu podataka?";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Dodaj novi Tip";
> 		$admtext['createnewevtype'] = "Kreirajte novi atribut ili zapis tipa događaja";
> 		$admtext['modifyeventtype'] = "Izmeni postojec�i tip";
> 		$admtext['entertypedesc'] = "Unesite tip/opis za ovaj novi atribut ili tip događaja.";
> 		$admtext['enterdisplay'] = "Unesite string za prikaz za ovaj novi atribut ili tip događaja.";
> 		$admtext['existingeventtypeinfo'] = "Informacije o postojec�em atributu ili tipu događaja";
> 		$admtext['neweventtypeinfo'] = "Informacije o novom atributu ili tipu događaja";
> 		$admtext['existingevtypes'] = "Postojec�i atributi ili tipovi događaja";
> 		$admtext['edsevtypes'] = "Izmenite, izbrišite ili sortirajte prethodno unete atribute i tipove događaja";
> 		$admtext['selectentertag'] = "Izaberite ili unesite oznaku/tag za ovaj atribut ili tip događaja.";
> 		$admtext['changestoallevtypes'] = "Promene svih tipova atributa ili događaja";
231,233c267,269
< 		$admtext['changestofamily'] = "Changes to family";
< 		$admtext['marrdate'] = "Datum ven."; //marriage date
< 		$admtext['modifyfamily'] = "Obrada postojece porodice";
---
> 		$admtext['changestofamily'] = "Promene u Porodici";
> 		$admtext['marrdate'] = "Datum ven�anja"; //marriage date
> 		$admtext['modifyfamily'] = "Obrada postojeće porodice";
235,236c271,272
< 		$admtext['confdeletefam'] = "Jeste li sigurni da hocete da obrišete odabranu porodicu?";
< 		$admtext['existingfamilyinfo'] = "Informacije o postojecoj porodici";
---
> 		$admtext['confdeletefam'] = "Da li ste sigurni da hoćete da obrišete odabranu porodicu?";
> 		$admtext['existingfamilyinfo'] = "Informacije o postojećoj porodici";
238,239c274,275
< 		$admtext['sealedsdate'] = "Datum pecacenja B (LDS)";     //S is for spouse
< 		$admtext['sealedsplace'] = "Mesto pecacenja B (LDS)";     //S is for spouse
---
> 		$admtext['sealedsdate'] = "Datum pe�aćenja B (LDS)";     //S is for spouse
> 		$admtext['sealedsplace'] = "Mesto pe�aćenja B (LDS)";     //S is for spouse
243,244c279,280
< 		$admtext['editexistingfaminfo'] = "Obrada informacija o prethodno upisanoj porodi";
< 		$admtext['spousesids'] = "Spouses' IDs";
---
> 		$admtext['editexistingfaminfo'] = "Obrada informacija o prethodno upisanoj porodici";
> 		$admtext['spousesids'] = "ID Supružnika";
247c283
< 		$admtext['prefixfamilyid'] = "Please prefix Family ID with \"F\" for \"Family\"";
---
> 		$admtext['prefixfamilyid'] = "Unesite prefiks ID Porodice sa \"F\" za \"Family\"";
250,254c286,290
< 		$admtext['familyidbefcite'] = "You must enter a Family ID before you can use citations with this family.";
< 		$admtext['genfamily'] = "General Family";
< 		$admtext['marriagetype'] = "Marriage Type";
< 		$admtext['reviewfamilies'] = "Accept or decline tentative changes to families";
< 		$admtext['fevslater'] = "Note: Additional events, as well as event-specific notes and citations, may be added after the new family has been saved.";
---
> 		$admtext['familyidbefcite'] = "Morate uneti ID Porodice pre nego Å¡to koristite citate povezane sa ovom porodicom.";
> 		$admtext['genfamily'] = "Opšte o porodici/familiji";
> 		$admtext['marriagetype'] = "Tip ženidbe";
> 		$admtext['reviewfamilies'] = "Prihvatate ili odbijate privremene promene u porodicima";
> 		$admtext['fevslater'] = "Napomane: Dodatni događaji, kao i beleške i citati, mogu se dodati nakon snimanja porodica.";
256,261c292,297
< 		$admtext['wifeid'] = "ID Žena";
< 		$admtext['enternamepart'] = "enter part of first and/or last name";
< 		$admtext['pleasenamepart'] = "Please enter a portion of a first or last name.";
< 		$admtext['clickfind'] = "Click Find or Create =>";
< 		$admtext['chunlinked'] = "Child unlinked from family";
< 		$admtext['child'] = "Child";
---
> 		$admtext['wifeid'] = "ID Žene";
> 		$admtext['enternamepart'] = "Unesite ime i/ili prezime";
> 		$admtext['pleasenamepart'] = "Unesite ime ili prezime.";
> 		$admtext['clickfind'] = "Klikni na Pronađi ili Kreiraj =>";
> 		$admtext['chunlinked'] = "Dete odvoji linkom od porodice";
> 		$admtext['child'] = "Dete";
266,333c302,366
< 		$admtext['addingperson'] = "Adding Person...";
< 		$admtext['changestoperson'] = "Changes to person";
< 		$admtext['nobirthinfo'] = "No birth info";
< 		$admtext['modifyperson'] = "Modify Existing Person";
< 		$admtext['selectpersaction'] = "Select Person and Action";
< 		$admtext['existingpersoninfo'] = "Existing Information for Person";
< 		$admtext['firstgivennames'] = "First/Given Name(s)";
< 		$admtext['lastsurname'] = "Last/Surname";
< 		$admtext['nickname'] = "Nickname";
< 		$admtext['male'] = "Male";
< 		$admtext['female'] = "Female";
< 		$admtext['bapldate'] = "Baptism Date (LDS)";
< 		$admtext['baplplace'] = "Baptism Place (LDS)";
< 		$admtext['endldate'] = "Endowment Date (LDS)";
< 		$admtext['parents'] = "Parents";
< 		$admtext['father'] = "Father";
< 		$admtext['mother'] = "Mother";
< 		$admtext['unlinkindividual'] = "Unlink current individual";
< 		$admtext['aschild'] = "as child";
< 		$admtext['sealedpdate'] = "Sealed P Date (LDS)";     //P is for parents
< 		$admtext['sealedpplace'] = "Sealed P Place (LDS)";     //P is for parents
< 		$admtext['asspouse'] = "as spouse";
< 		$admtext['spouse'] = "Spouse";
< 		$admtext['ordernumber'] = "Order Number";
< 		$admtext['married'] = "Married";
< 		$admtext['nonewfamily'] = "Do not go to new family on save";
< 		$admtext['addnewperson'] = "Add New Person";
< 		$admtext['createperson'] = "Create a record for a new individual";
< 		$admtext['personidbefevent'] = "You must enter a Person ID before you can add new events.";
< 		$admtext['prefixpersonid'] = "Please prefix Person ID with \"I\" for \"Individual\"";
< 		$admtext['validpersonid'] = "Please enter a valid Person ID. A valid ID is a numeric string prefixed with 'I'.";
< 		$admtext['newpersoninfo'] = "New Person Information";
< 		$admtext['selectsex'] = "Please select a sex.";
< 		$admtext['shortform'] = "Short Form";
< 		$admtext['editexistingpersoninfo'] = "Obrada informacija o prethodno upisan individual";
< 		$admtext['unknown'] = "Unknown";
< 		$admtext['personidbefnote'] = "You must enter a Person ID before you can add new notes.";
< 		$admtext['endlplace'] = "Endowment Place (LDS)";
< 		$admtext['personidbefcite'] = "You must enter a Person ID before you can use citations with this person.";
< 		$admtext['relationship'] = "Relationship";
< 		$admtext['asspouse'] = "as spouse";
< 		$admtext['mergepeople'] = "Merge information for duplicate individual records.";
< 		$admtext['choosemerge'] = "Choose individuals to merge or find potential matches";
< 		$admtext['usesoundex'] = "Use Soundex";
< 		$admtext['sdxdisclaimer'] = "Using this option will cause the program to take longer when finding the next match or duplicate.";
< 		$admtext['combinenotes'] = "Combine notes &amp; citations";
< 		$admtext['confirmmerge'] = "Are you sure you want to merge these two individuals?";
< 		$admtext['gotonewfamily'] = "Go to new family with current individual";
< 		$admtext['genperson'] = "General Individual";
< 		$admtext['reviewpeople'] = "Accept or decline tentative changes to individuals";
< 		$admtext['nokids'] = "No children";
< 		$admtext['noparents'] = "No parents";
< 		$admtext['association'] = "Association";
< 		$admtext['deletingassoc'] = "Deleting Association...";
< 		$admtext['addingassoc'] = "Adding Association...";
< 		$admtext['updatingassoc'] = "Updating Association...";
< 		$admtext['addnewassoc'] = "Add New Association";
< 		$admtext['modifyassoc'] = "Modify Existing Association";
< 		$admtext['pevslater'] = "Note: Additional events, as well as event-specific notes and citations, may be added after the new person has been saved.";
< 		$admtext['ashusband'] = "as husband";
< 		$admtext['aswife'] = "as wife";
< 		$admtext['pevslater2'] = "Note: Additional events, plus event-specific notes and citations, may be added later.";
< 		$admtext['nospouse'] = "No spouse";
< 		$admtext['revassoc'] = "Also add reverse association for same two people";
< 		$admtext['prefix'] = "Prefix";
< 		$admtext['chkdel'] = "Check empty box to delete item at left";
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Choose<br/>default<br/>photo"; //has to fit in a small box
---
> 		$admtext['addingperson'] = "Dodavanje Osobe...";
> 		$admtext['changestoperson'] = "Promene kod osobe";
> 		$admtext['modifyperson'] = "Izmena postojeće Osobe";
> 		$admtext['selectpersaction'] = "Izaberi Osobu i aktivnost nad njom";
> 		$admtext['existingpersoninfo'] = "Postojeće Informacije Osobe";
> 		$admtext['firstgivennames'] = "Prvo/Po rođenju Ime(na)";
> 		$admtext['lastsurname'] = "Prezime";
> 		$admtext['nickname'] = "Nadimak";
> 		$admtext['male'] = "Muško";
> 		$admtext['female'] = "Žensko";
> 		$admtext['bapldate'] = "Datum Krštenja (LDS)";
> 		$admtext['baplplace'] = "Mesto Krštenja (LDS)";
> 		$admtext['endldate'] = "Datum Zadužbine (LDS)";
> 		$admtext['parents'] = "Roditelji";
> 		$admtext['father'] = "Otac";
> 		$admtext['mother'] = "Majka";
> 		$admtext['unlinkindividual'] = "Odvojite trenutnog pojedinca";
> 		$admtext['aschild'] = "kao deteta";
> 		$admtext['sealedpdate'] = "Datum Pe�atiranja R (LDS)";     //P is for parents
> 		$admtext['sealedpplace'] = "Mesto Pe�atiranja R (LDS)";     //P is for parents
> 		$admtext['asspouse'] = "kao supružnika";
> 		$admtext['spouse'] = "Supruga";
> 		$admtext['ordernumber'] = "Broj duhovni�ke službe";
> 		$admtext['married'] = "Oženjen";
> 		$admtext['nonewfamily'] = "Ne idi na novu porodicu po snimanju";
> 		$admtext['addnewperson'] = "Dodaj novu osobu";
> 		$admtext['createperson'] = "Kreiranje zapisa za novu osobu";
> 		$admtext['personidbefevent'] = "Morate da unesete ID Osobe pre nego što unesete nove događaje.";
> 		$admtext['prefixpersonid'] = "Unesite prefiks za ID Osobe sa \"I\" za \"Osobu\"";
> 		$admtext['validpersonid'] = "Unesite važeći ID Osobe. Važeći ID je numeri�ki niz brojeva, koji po�inje prefiksom 'I'.";
> 		$admtext['newpersoninfo'] = "Informacije o novoj Osobi";
> 		$admtext['selectsex'] = "Izaberite pol.";
> 		$admtext['shortform'] = "Kratka Forma";
> 		$admtext['editexistingpersoninfo'] = "Obrada informacija o prethodno upisanoj osobi";
> 		$admtext['unknown'] = "Nepoznato";
> 		$admtext['personidbefnote'] = "Morate uneti ID Osobe pre nego što unesete novu Belešku.";
> 		$admtext['endlplace'] = "Mesto Zadužbine (LDS)";
> 		$admtext['personidbefcite'] = "Morate uneti ID Osobe da biste mogli da koristite Citate povezane sa ovom osobom.";
> 		$admtext['relationship'] = "Srodstvo";
> 		$admtext['asspouse'] = "kao supružnika";
> 		$admtext['mergepeople'] = "Objedinjavanje/stapanje informacija sa dupliranim individualnim podacima.";
> 		$admtext['choosemerge'] = "Izaberite osobe za objedinjenje/stapanje ili da pronađete potencijalna poklapanja";
> 		$admtext['usesoundex'] = "Koristite Soundex";
> 		$admtext['sdxdisclaimer'] = "Korišćenje ove opcije će prouzrokovati da program radi duže ka pretražuje sledeće poklapanje ili duplikat.";
> 		$admtext['combinenotes'] = "Kombinujte Beleške &amp; Citate.";
> 		$admtext['confirmmerge'] = "Da li ste sigurni da želite da objedinite/stopite ova dve osobe?";
> 		$admtext['gotonewfamily'] = "Idi na novu porodicu trenutne osobe";
> 		$admtext['genperson'] = "Opšte/Generalno o Osobama";
> 		$admtext['reviewpeople'] = "Prihvatate ili odbijate privremene promene kod osoba/pojedinaca";
> 		$admtext['nokids'] = "Koji nemaju dece";
> 		$admtext['noparents'] = "Koji nemaju roditelje";
> 		$admtext['association'] = "Asocijacija";
> 		$admtext['deletingassoc'] = "Brisanje Asocijacije...";
> 		$admtext['addingassoc'] = "Dodavanje Asocijacije...";
> 		$admtext['updatingassoc'] = "Ažuriranje Asocijacije...";
> 		$admtext['addnewassoc'] = "Dodaj novu Asocijaciju";
> 		$admtext['modifyassoc'] = "Izmeni postojeću Asocijaciju";
> 		$admtext['pevslater'] = "Napomena: Dodatni događaji, kao i beleške događaja i citati, mogu se dodati samo posle snimanja nove osobe.";
> 		$admtext['ashusband'] = "kao muža";
> 		$admtext['aswife'] = "kao žene";
> 		$admtext['pevslater2'] = "Napomena: Dodatni događaji, plus beleške događaja i citati, mogu se dodati kasnije.";
> 		$admtext['nospouse'] = "kKoji nemaju supružnika";
> 		$admtext['revassoc'] = "Takođe dodati obrnute asocijacije za iste dve osobe";
> 		$admtext['prefix'] = "Prefiks";
> 		$admtext['chkdel'] = "Proverite prazni CheckBox da izbrišete stavku na levo";
335,338c368,376
< 		$admtext['confdate'] = "Confirmation Date (LDS)";
< 		$admtext['confplace'] = "Confirmation Place (LDS)";
< 		$admtext['initdate'] = "Initiatory Date (LDS)";
< 		$admtext['initplace'] = "Initiatory Place (LDS)";
---
> 		$admtext['confdate'] = "Potvrda Datuma (LDS)";
> 		$admtext['confplace'] = "Potvrda Mesta (LDS)";
> 		$admtext['initdate'] = "Uvodni Datum (LDS)";
> 		$admtext['initplace'] = "Uvodno Mesto (LDS)";
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Save + New Parents";
> 		$admtext['savenewspouse'] = "Save + New Spouse";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Rođenje";
344,355c382,392
< 		$admtext['thumbnailnotcopied'] = "The thumbnail file could not be copied to";
< 		$admtext['photo'] = "Photo";
< 		$admtext['changestophoto'] = "Changes to photo";
< 		$admtext['modifyphoto'] = "Modify Existing Photo";
< 		$admtext['addnewphoto'] = "Add New Photo";
< 		$admtext['selectphotoaction'] = "Select Photo and Action";
< 		$admtext['photoid'] = "Photo ID";
< 		$admtext['confdeletephoto'] = "Jeste li sigurni da hocete da obrišete photo and all links associated with it?";
< 		$admtext['enterphotopath'] = "Please enter the path (folder and file name) of the image file within the photos folder on your web server.";
< 		$admtext['enterthumbnailpath'] = "Please enter the path (folder and file name) of the thumbnail image file within the photos folder on your web server.";
< 		$admtext['enterphotodesc'] = "Please enter a description for the image.";
< 		$admtext['existingphotoinfo'] = "Existing Photo Information";
---
> 		$admtext['thumbnailnotcopied'] = "Fajl sli�ice ne može da se kopira u";
> 		$admtext['photo'] = "Fotografija";
> 		$admtext['changestophoto'] = "Promene fotografije";
> 		$admtext['modifyphoto'] = "Izmena postojeće Fotografije";
> 		$admtext['addnewphoto'] = "Dodaj novu fotografiju";
> 		$admtext['selectphotoaction'] = "Izaberite Fotografiju i Akciju";
> 		$admtext['photoid'] = "ID Fotografije";
> 		$admtext['confdeletephoto'] = "Jeste li sigurni da hoćete da obrišete fotografiju i sve linkove povezane sa tom fotografijom?";
> 		$admtext['enterphotopath'] = "Unesite putanju (folder i naziv fajla) fajla slike u folderu fotografija na vašem web serveru.";
> 		$admtext['enterthumbnailpath'] = "Unesite putanju (folder i naziv fajla) fajla sli�ice u folderu fotografija na vašem web serveru.";
> 		$admtext['existingphotoinfo'] = "Informacije o postojećoj Fotografiji";
357c394
< 		$admtext['thumbnailfile'] = "Thumbnail Image File";
---
> 		$admtext['thumbnailfile'] = "Fajl Sli�ice";
359,415c396,451
< 		$admtext['fileandpath'] = "File and Path Name";
< 		$admtext['sortphotos'] = "Sort Photos";
< 		$admtext['sortphotosfor'] = "Sort Photos for";
< 		$admtext['editexistingphotoinfo'] = "Obrada informacija o prethodno upisan photo";
< 		$admtext['leaveblankallphotos'] = "ostavi prazno da bi video sv photos";
< 		$admtext['headstone'] = "Headstone";
< 		$admtext['imagenotcopied'] = "The image file could not be copied to";
< 		$admtext['changestohs'] = "Changes to headstone";
< 		$admtext['modifyheadstone'] = "Modify Existing Headstone";
< 		$admtext['selecthsaction'] = "Select Headstone and Action";
< 		$admtext['confdeletehs'] = "Jeste li sigurni da hocete da obrišete headstone?";
< 		$admtext['photostatus'] = "Photo/Status";
< 		$admtext['selectcemetery'] = "Please select a cemetery.";
< 		$admtext['enterhsimage'] = "Please enter a file name for your headstone image on the web server.";
< 		$admtext['existinghsinfo'] = "Existing Headstone Information";
< 		$admtext['newhsinfo'] = "New Headstone Information";
< 		$admtext['hsimagefile'] = "Headstone Image File";
< 		$admtext['located'] = "Located";
< 		$admtext['notyetlocated'] = "Not yet located";
< 		$admtext['unmarked'] = "Unmarked";
< 		$admtext['missing'] = "Missing";
< 		$admtext['leaveblankhs'] = "Leave this field blank if the file has already been uploaded to your headstones folder.";
< 		$admtext['requiredhs'] = "Required. This should correspond to the name and location of your file <em>within the headstones folder</em> once the file is uploaded. For example, if your headstones folder is called <em>photos/headstones</em>, and you want your file to be called <em>headstone.jpg</em> and go in a subfolder of photos/headstones called <em>newheadstones</em>, you would enter <em>newheadstones/headstone.jpg</em> in this field.";
< 		$admtext['addnewhs'] = "Add New Headstone";
< 		$admtext['createnewhs'] = "Create a record for a new headstone and link it to an individual";
< 		$admtext['editexistinghsinfo'] = "Obrada informacija o prethodno upisan headstone";
< 		$admtext['leaveblankallhs'] = "ostavi prazno da bi video sv headstones";
< 		$admtext['cemnamelocation'] = "Cemetery Name or Location";
< 		$admtext['pedphoto'] = "Use this photo on pedigree charts and in name titles";
< 		$admtext['photoowner'] = "Owner/Source";
< 		$admtext['dimensions'] = "Dimensions";
< 		$admtext['selectphoto'] = "Select Image";
< 		$admtext['specifyimg'] = "Specify image";
< 		$admtext['autoimg'] = "Create from original";
< 		$admtext['enterthumbpath'] = "Please enter a destination name for your thumbnail image";
< 		$admtext['genthumbs'] = "Generate Thumbnails";
< 		$admtext['genthumbsdesc'] = "Automatically generate smaller versions of all photos without existing thumbnails.";
< 		$admtext['thumbsgenerated'] = "Thumbnails generated";
< 		$admtext['makedefault'] = "Make Default";
< 		$admtext['filewithinhs'] = "Path within headstones folder <br/>(subfolder and file name)";
< 		$admtext['recsupdated'] = "Records updated";
< 		$admtext['removedef'] = "Remove default photo";
< 		$admtext['numlinkhs'] = "Number of people to link to this headstone";
< 		$admtext['sortheadstones'] = "Sort Headstones";
< 		$admtext['sortheadstonesfor'] = "Sort Headstones for";
< 		$admtext['sortheadstonesind'] = "Sort Headstones for an Individual";
< 		$admtext['headstoneorder'] = "Indicate a desired order for the headstones linked to a specific individual";
< 		$admtext['enternumberforphoto'] = "Enter a numeric value for each item.";
< 		$admtext['updownforphoto'] = "Click the up and down arrows to move items up or down in the order.";
< 		$admtext['createnewphoto'] = "Create a record for a new photo and link it to individuals, families or sources";
< 		$admtext['numlinkphoto'] = "Number of people, families or sources to link to this photo";
< 		$admtext['photoorder'] = "Indicate a desired order for the photos linked to a specific individual, family or source";
< 		$admtext['assigndefs'] = "Assign Default Photos";
< 		$admtext['assigndefsdesc'] = "Make first photo for each individual, family and source be that entity's default photo.";
< 		$admtext['overwritedefs'] = "Overwrite existing defaults";
< 		$admtext['assign'] = "Assign Defaults";
< 		$admtext['defsassigned'] = "Default photos assigned";
---
> 		$admtext['fileandpath'] = "Fajl i putanja";
> 		$admtext['sortphotos'] = "Sortiraj Fotografije";
> 		$admtext['sortphotosfor'] = "Sortiraj Fotografije za ";
> 		$admtext['editexistingphotoinfo'] = "Obrada informacija o prethodno upisanoj fotografiji";
> 		$admtext['leaveblankallphotos'] = "ostavi prazno da bi video fotografiju";
> 		$admtext['headstone'] = "Nadgrobni spomenik";
> 		$admtext['imagenotcopied'] = "Fajl slike ne može da se kopira u";
> 		$admtext['changestohs'] = "Promene Nadrogobnog spomenika";
> 		$admtext['modifyheadstone'] = "Izmenuti postojeći Nadgrobni spomenik";
> 		$admtext['selecthsaction'] = "Izaberite Nadgrobni spomenik i Akciju";
> 		$admtext['confdeletehs'] = "Jeste li sigurni da hoćete da obrišete nadgrobni spomenik?";
> 		$admtext['photostatus'] = "Fotografija/Status";
> 		$admtext['selectcemetery'] = "Izaberite groblje.";
> 		$admtext['enterhsimage'] = "Unesite ime slike fajla za nadgrobni spomenik na vašem web serveru.";
> 		$admtext['existinghsinfo'] = "Informacije o postojećem Nadgrobnom spomeniku";
> 		$admtext['newhsinfo'] = "Informacije o novom Nadgrobnom spomeniku";
> 		$admtext['hsimagefile'] = "Fajl slika Nadgrobnog spomenika";
> 		$admtext['located'] = "Lociran";
> 		$admtext['notyetlocated'] = "Još uvek nije lociran";
> 		$admtext['unmarked'] = "Neobeležen";
> 		$admtext['missing'] = "Nedostaje";
> 		$admtext['leaveblankhs'] = "Ostavite ovo polje za unos prazno ako se fajl već otpremio u vaš folder za nadgrobne spomenike.";
> 		$admtext['requiredhs'] = "Obavezno. Ovo bi trebalo da odgovara imenu i lokaciji vašeg fajla u folderu <em>nadgrobnih spomenika</em> kad otpremite fajl. Na primer, ako vaš folder nadgrobnih spomenika se zove <em>photos/headstones</em>, i želite da se fajl da se fajl zove <em>headstone.jpg</em> idite u podfolder photos/headstones koji se zove <em>novinadgrobnispomenici</em>, unećete <em>newheadstones/nadgrobnispomenik.jpg</em> u ovom polju.";
> 		$admtext['addnewhs'] = "Dodaj novi Nadgrobni spomenik";
> 		$admtext['createnewhs'] = "Kreiranje novog zapisa o nadgrobnom spomeniku i povezivanje sa osobom";
> 		$admtext['editexistinghsinfo'] = "Obrada infomracija o prethodnom upisanom nadgrobnom spomeniku";
> 		$admtext['leaveblankallhs'] = "ostavi prazno da bi video nadgrobni spomenik";
> 		$admtext['cemnamelocation'] = "Naziv Groblja ili Lokacije";
> 		$admtext['pedphoto'] = "Koristite ovu fotografiju na grafikonima predaka (pedigree grafikon) i u imenu naslova";
> 		$admtext['dimensions'] = "Dimenzije";
> 		$admtext['selectphoto'] = "Selektuj sliku";
> 		$admtext['specifyimg'] = "Navedite slike";
> 		$admtext['autoimg'] = "Napravite od originala";
> 		$admtext['enterthumbpath'] = "Unesite destinaciono ime za svoju sli�icu";
> 		$admtext['genthumbs'] = "Generiši sli�icu";
> 		$admtext['genthumbsdesc'] = "Automatski generisati manje verzije svih fotografija ali bez postojećih sli�ica (thumbnails).";
> 		$admtext['thumbsgenerated'] = "Sli�ice generisane";
> 		$admtext['makedefault'] = "Postavi kao podrazumevano(Default)";
> 		$admtext['filewithinhs'] = "Putanja sa folderom nadgrobnih spomenika <br/>(podfolder i ime fajla)";
> 		$admtext['recsupdated'] = "Zapisi ažurirani";
> 		$admtext['removedef'] = "Ukloni podrazumevanu fotografiju";
> 		$admtext['numlinkhs'] = "Broj osoba koji su povezani sa ovim Nadgrobnim spomenikom";
> 		$admtext['sortheadstones'] = "Sortiraj Nadgrobne spomenike";
> 		$admtext['sortheadstonesfor'] = "Sortiraj Nadgrobne spomenike za";
> 		$admtext['sortheadstonesind'] = "Sortiraj Nadgrobne spomenike za pojedince";
> 		$admtext['headstoneorder'] = "Navesti željeni zapis nadgrobnog spomenika za povezivanje sa određenom osobom";
> 		$admtext['enternumberforphoto'] = "Unesite numeri�ku vrednost za svaku stavku.";
> 		$admtext['updownforphoto'] = "Kliknite na strelice gore ili na dole za kretanje na gore ili na dole po stavkama.";
> 		$admtext['createnewphoto'] = "Kreiranje zapisa za novu fotografiju i povezivanje sa osoboma, porodicima ili izvorima";
> 		$admtext['numlinkphoto'] = "Broj osoba, porodica ili izvora povezanih sa ovom fotografijom";
> 		$admtext['photoorder'] = "Navesti željeni poredak za fotografije povezane sa određenim osobama, porodicom ili izvorom";
> 		$admtext['assigndefs'] = "Dodelite podrazumevanu (Default) Fotografiju";
> 		$admtext['assigndefsdesc'] = "Napravite prvu fotografiju za svakog pojedinca, porodicu i izvor tih entiteta biće podrazumevana fotografija.";
> 		$admtext['overwritedefs'] = "Promena postojeće podrazumevane";
> 		$admtext['assign'] = "Dodeljivanje podrazumevanih";
> 		$admtext['defsassigned'] = "Dodeljivanje podrazumevane fotografije";
417,421c453,456
< 		$admtext['imgmap'] = "Image Map";
< 		$admtext['circle'] = "circle";
< 		$admtext['rect'] = "rectangle";
< 		$admtext['poly'] = "polygon";
< 		$admtext['shape'] = "Shape of region";
---
> 		$admtext['circle'] = "kružno";
> 		$admtext['rect'] = "pravougano";
> 		$admtext['poly'] = "poligon";
> 		$admtext['shape'] = "Oblik regiona";
423,427c458,462
< 		$admtext['width'] = "Width (pixels)";
< 		$admtext['height'] = "Height (pixels)";
< 		$admtext['imgdim'] = "Image dimensions";
< 		$admtext['pixw'] = "pixels wide";
< 		$admtext['pixh'] = "pixels high";
---
> 		$admtext['width'] = "Å irina (piksela)";
> 		$admtext['height'] = "Visina (piksela)";
> 		$admtext['imgdim'] = "Dimenzije slike";
> 		$admtext['pixw'] = "piksela Å¡irine";
> 		$admtext['pixh'] = "piksela visine";
431,549c466,577
< 		$admtext['changestoallphotos'] = "Changes to all selected photos";
< 		$admtext['changestoallhs'] = "Changes to all selected headstones";
< 		$admtext['datetaken'] = "Date Taken";
< 		$admtext['placetaken'] = "Place Taken";
< 		$admtext['abspath'] = "This image comes from an external source (you must supply your own thumbnail)";
< 		$admtext['imagefile'] = "Image File";
< 		$admtext['pathwithinphotos'] = "File within photos folder";
< 		$admtext['linktocem'] = "Link this image directly to the selected cemetery";
< 		$admtext['defphotonote'] = "Use the thumbnail for this photo to identify this person, family or source on pedigree and other charts, including family group sheets.";
< 		$admtext['photonotadded'] = "The photo could not be added, most likely because another photo record already exists for the physical photo file specified.";
< 		$admtext['requiredphoto'] = "Required. This should correspond to the name and location of your file <em>within the photos folder</em> once the file is uploaded. For example, if your photos folder is called <em>photos</em>, and you want your file to be called <em>myphoto.jpg</em> and go in a subfolder of photos called <em>newphotos</em>, you would enter <em>newphotos/myphoto.jpg</em> in this field.";
< 		$admtext['leaveblankphoto'] = "Leave this field blank if the file has already been uploaded to your photos folder.";
< 		$admtext['thumbconflicts'] = "Thumbnails not generated due to path, permissions or file name problems";
< 		$admtext['showmap'] = "Show cemetery map and photos whenever this image is displayed";
< 		$admtext['bodytext'] = "<strong>OR</strong><br/>Body Text";
< 		$admtext['usenl'] = "Convert line breaks to HTML on display";
< 		$admtext['newwin'] = "Open in new window";
< 		$admtext['modifymedia'] = "Modify Existing Media";
< 		$admtext['addnewmedia'] = "Add New Media";
< 		$admtext['confdeletemedia'] = "Are you sure you want to delete this media?";
< 		$admtext['thumbnails'] = "Thumbnails";
< 		$admtext['modifyalbum'] = "Modify Existing Album";
< 		$admtext['addnewalbum'] = "Add New Album";
< 		$admtext['newalbuminfo'] = "New Album Information";
< 		$admtext['confdeletealbum'] = "Are you sure you want to delete this album?";
< 		$admtext['enteralbumname'] = "Please enter an album name.";
< 		$admtext['albumname'] = "Album Name";
< 		$admtext['keywords'] = "Keywords";
< 		$admtext['changestoalbum'] = "Changes to album";
< 		$admtext['addtoalbum'] = "Add to Album";
< 		$admtext['mediatype'] = "Collection";
< 		$admtext['fileext'] = "File ext."; //file extension (abbreviation)
< 		$admtext['anotherlink'] = "Add Another Link";
< 		$admtext['mediaurl'] = "Media URL";
< 		$admtext['put_in'] = "Store files in";
< 		$admtext['usemedia'] = "Multimedia Folder";
< 		$admtext['usecollect'] = "Collection Folder (e.g., \"photos\")";
< 		$admtext['notcopied'] = "The file could not be copied to";
< 		$admtext['existingmediainfo'] = "Existing Media Information";
< 		$admtext['convto'] = "Convert Selected to";
< 		$admtext['changestoallmedia'] = "Changes to all selected media";
< 		$admtext['changestoitem'] = "Changes to item";
< 		$admtext['eventlink'] = "Link to specific event";
< 		$admtext['sortmediaind'] = "Sort Media for an Individual, Family, Source, Repository or Place";
< 		$admtext['sortmedia'] = "Sort xxx for";
< 		$admtext['unlinked'] = "Unlinked only";
< 		$admtext['samepaths'] = "The principal image and the thumbnail image may not be the same file. Please select a different thumbnail image, or have one created for you.";
< 		$admtext['regenerate'] = "Regenerate existing thumbnails";
< 		$admtext['forcircles'] = "For circles";
< 		$admtext['forrects'] = "For rectangles";
< 		$admtext['circleinstr'] = "First click in the center of the circle, then click anywhere on the outside of the circle.";
< 		$admtext['rectinstr'] = "First click in the upper left corner of the rectangle, then click in the lower right corner.";
< 		$admtext['firstone'] = "first one";
< 		$admtext['controller'] = "Please allow about 16 vertical pixels for the media player controller.";
< 		$admtext['nostatus'] = "No status";
< 		$admtext['enterid'] = "Please enter an ID.";
< 		$admtext['existingalbuminfo'] = "Existing Album Information";
< 		$admtext['newmediainfo'] = "New Media Information";
< 		$admtext['mapinstr2'] = "Link regions of your image to different people or other pages (optional) by entering the HTML image map information below, or by following the instructions near the photo below.";
< 		$admtext['mapinstr3'] = "To link a region of this photo to a specific individual, select the individual's tree, pick a shape and dimensions for the region, then click the center of that region on the photo. A popup window will help you select the individual. After the selection is made, code for the image map will be added to the box above. Repeat this process as needed for additional regions.";
< 		$admtext['albumlinks'] = "Album Links";
< 		$admtext['duplinkmsg'] = "A link to the selected entity already exists in this album.";
< 		$admtext['invlinkmsg'] = "The entity ID you entered is invalid. No link was created.";
< 		$admtext['albmedia'] = "Album Media";
< 		$admtext['removelink'] = "Remove Link";
< 		$admtext['confremmedia'] = "Are you sure you want to remove this media from this album?";
< 		$admtext['selmedia'] = "Search for existing media to include in this album";
< 		$admtext['uploadfirst'] = "upload new media here first";
< 		$admtext['existmedia'] = "Existing Media";
< 		$admtext['emoptions'] = "Browse, Delete or Drag to Sort";
< 		$admtext['addlinks'] = "Add New Links";
< 		$admtext['eloptions'] = "Browse or Delete";
< 		$admtext['inclmsg'] = " included";
< 		$admtext['mediasubt'] = "Manage media included in this album (Add, Delete, Sort)";
< 		$admtext['infosubt'] = "Edit album name, description and keywords";
< 		$admtext['linkssubt'] = "Link this item to People, Families, Sources, Repositories or Places";
< 		$admtext['inclmedia'] = "Included Media";
< 		$admtext['nomedia'] = "No media included yet";
< 		$admtext['nolinks'] = "No links exist yet";
< 		$admtext['thumbsize'] = "(original is too large)";
< 		$admtext['thumbinv'] = "(invalid image or inadequate permissions)";
< 		$admtext['thumblost'] = "(original not found)";
< 		$admtext['uplsel'] = "Upload a new file from your computer, or select from files already on your site";
< 		$admtext['alblater'] = "Note: Media may be added to this album, and the album linked to individuals or families, on the next screen.";
< 		$admtext['medlater'] = "Note: More information may be added, and the item linked to individuals or families, on the next screen.";
< 		$admtext['minfosubt'] = "Edit media title, description and other basic details";
< 		$admtext['defphoto'] = "Default Photo";
< 		$admtext['alttd'] = "Alt Title/Desc";   //short abbreviation for "Alternate Title or Description"
< 		$admtext['editmedialink'] = "Edit Media Link";
< 		$admtext['plot'] = "Plot";
< 		$admtext['addnewcoll'] = "Add Collection";
< 		$admtext['collid'] = "Collection ID";
< 		$admtext['colldisplay'] = "Display Title";
< 		$admtext['collpath'] = "Folder Name";
< 		$admtext['collicon'] = "Icon File";
< 		$admtext['colllike'] = "Same setup as";
< 		$admtext['entercollid'] = "Please enter a collection ID.";
< 		$admtext['entercolldisplay'] = "Please enter a collection display name.";
< 		$admtext['entercollpath'] = "Please enter a collection folder name.";
< 		$admtext['entercollicon'] = "Please enter a collection icon file name.";
< 		$admtext['editcoll'] = "Edit Collection";
< 		$admtext['confmtdelete'] = "Are you sure you want to delete this media type?";
< 		$admtext['histlimit'] = "<strong>Size note:</strong> Most browsers limit the amount of data that can be sent in a web form to about 64Kb. If you have a large amount of text to type or paste in the Body Text field above, you might consider using historytemplate.php instead. See the Help for more information.";
< 		$admtext['repath'] = "Regenerate thumbnail path names where file does not exist";
< 		$admtext['sortalbumind'] = "Sort Albums for an Individual, Family, Source, Repository or Place";
< 		$admtext['cidexists'] = "The Collection ID you entered could not be added because it already exists.";
< 		$admtext['phalltrees'] = "Optional. Leave blank to allow photos to be visible in all trees.";
< 		//added in 8.0.0
< 		$admtext['fileexists'] = "This file already exists. Overwrite?";
< 		$admtext['collthumb'] = "Thumbnail File";
< 		$admtext['movetop'] = "Move to top";
< 		//added in 9.0.0
< 		$admtext['collexpas'] = "Export as";
< 		//added in 9.2.0
< 		$admtext['upload'] = "Upload";
< 		$admtext['linksel'] = "Link to selected";
< 		$admtext['mediaupl'] = "Upload Media";
< 		$admtext['addfiles'] = "Add files...";
< 		$admtext['startupl'] = "Start upload";
---
> 		$admtext['changestoallphotos'] = "Promene u svim izabranim fotografijama";
> 		$admtext['changestoallhs'] = "Promene u svim izabrabim nadgrobnim spomenicima";
> 		$admtext['datetaken'] = "Datum Zauzetosti";
> 		$admtext['placetaken'] = "Mesto Zauzetosti";
> 		$admtext['abspath'] = "Ova slika dolazi iz spoljneg izvora (morate obezbediti svoju sli�icu)";
> 		$admtext['imagefile'] = "Fajl Slike";
> 		$admtext['pathwithinphotos'] = "Fajl u folderu fotografija";
> 		$admtext['linktocem'] = "Poveži/linkuj sliku direktno sa izabranim grobljem";
> 		$admtext['defphotonote'] = "Koristi sli�icu ove fotografije da identifikuje ovu osobu, porodicu ili izvor za preda�ki grafikon ili drugi grafikon, uklju�ujući i porodi�nu grupnu stranicu.";
> 		$admtext['photonotadded'] = "Fotografija nije mogla da se doda, najverovatnije zato što drugi foto zapis već postoji po fizi�ki istom nazivu foto fajla.";
> 		$admtext['requiredphoto'] = "Obavezno. Ovo bi trebalo da odgovara imenu i lokaciji vašeg fajla <em>u folderu fotografija</em> kad jedno otpremite fajl. Na primer, ako se vaš folder sa fotografijama zove <em>photos</em>, i želite da se fajl zove <em>mojafotka.jpg</em> i ide u podfolder sa fotografijama pod nazivom <em>newphotos</em>, morate uneti <em>newphotos/mojafotka.jpg</em> u ovo polje.";
> 		$admtext['leaveblankphoto'] = "Ostavite ovo polje prazno ako se fajl već otpremio/poslat u folder sa fotografijama.";
> 		$admtext['thumbconflicts'] = "Sli�ica nije generisana zbog loše putanje, pravom ili sa problemom u imenu.";
> 		$admtext['showmap'] = "Prikaži mapu groblja i forografije kad god se pojavi ova slika.";
> 		$admtext['bodytext'] = "<strong>ILI</strong><br/>Telo teksta";
> 		$admtext['usenl'] = "Pretvori liniju pauze u HTML na prikazu";
> 		$admtext['newwin'] = "Otvori novi prozor";
> 		$admtext['modifymedia'] = "Izmena postojećeg Medija";
> 		$admtext['addnewmedia'] = "Dodaj Novi Medij";
> 		$admtext['confdeletemedia'] = "Da li ste sigurni da želite da obrišete ovaj medij?";
> 		$admtext['thumbnails'] = "Sli�ice";
> 		$admtext['modifyalbum'] = "Izmena postojećeg Albuma";
> 		$admtext['addnewalbum'] = "Dodaj novi Album";
> 		$admtext['newalbuminfo'] = "Informacije o novom Albumu";
> 		$admtext['confdeletealbum'] = "Da li ste sigurni da želite da obrišete ovaj album?";
> 		$admtext['enteralbumname'] = "Unesi ime Albuma.";
> 		$admtext['albumname'] = "Ime Albuma";
> 		$admtext['keywords'] = "Klju�ne reći";
> 		$admtext['changestoalbum'] = "Promene albuma";
> 		$admtext['addtoalbum'] = "Dodaj u Album";
> 		$admtext['mediatype'] = "Kolekcija";
> 		$admtext['fileext'] = "ektenzija Fajla."; //file extension (abbreviation)
> 		$admtext['anotherlink'] = "Dodaj drugi Link";
> 		$admtext['mediaurl'] = "URL adresa Medija";
> 		$admtext['put_in'] = "Fajlovi smešteni u";
> 		$admtext['usemedia'] = "Multimedijalni Fodler";
> 		$admtext['usecollect'] = "Folder Kolekcije (na primer, \"photos\")";
> 		$admtext['notcopied'] = "Fajl ne može da se kopira u";
> 		$admtext['existingmediainfo'] = "Informacije o postojećem Mediju";
> 		$admtext['convto'] = "Konvertuj izabrane do";
> 		$admtext['changestoallmedia'] = "Izmeni sve izabrane medije";
> 		$admtext['changestoitem'] = "Izmena stavke";
> 		$admtext['eventlink'] = "Link za određeni događaj";
> 		$admtext['sortmediaind'] = "Sortiraj Mediji za pojedinca, Porodicu, Izvor, Repozitorijum/Arhivu ili Mesto";
> 		$admtext['sortmedia'] = "Sortiraj xxx za";
> 		$admtext['unlinked'] = "Bez linka/veze jedino";
> 		$admtext['samepaths'] = "Glavna slika i sli�ica ne mogu biti isti fajl. Izaberite drugu sli�icu ili birajte kreiranje nove.";
> 		$admtext['regenerate'] = "Regenerišite postojeće sli�ice.";
> 		$admtext['forcircles'] = "Za krugove";
> 		$admtext['forrects'] = "Za pravouganike";
> 		$admtext['circleinstr'] = "Prvo kliknite u centar kruga, a onda kliknite bilo gde na spoljnoj strani kruga.";
> 		$admtext['rectinstr'] = "Prvo kliknite u gornji levi ugao pravougaonika, a zatim kliknite u donji desni ugao, za kreiranje pravougaonika.";
> 		$admtext['firstone'] = "prvi";
> 		$admtext['controller'] = "Dozvolite oko 16 vertikalnih piksela za medij pregleda�.";
> 		$admtext['nostatus'] = "Nema status";
> 		$admtext['enterid'] = "Unesite ID za izabrani tip linka.";
> 		$admtext['existingalbuminfo'] = "Informacije o postojećem Albumu.";
> 		$admtext['newmediainfo'] = "Informacije o novom dodatom Mediju";
> 		$admtext['mapinstr2'] = "Link regioni povezuju vašu sliku sa drugim osobama na drugim stranicama (opciono) uvođenjem HTML mape (videti dole), ili prateći uputstva ispod fotografije.";
> 		$admtext['albumlinks'] = "Linkovi Albuma";
> 		$admtext['duplinkmsg'] = "Link za izabrani entitet već postoji u ovom albumu.";
> 		$admtext['invlinkmsg'] = "ID entitet koji ste uneli je nevažeći. Link nije kreiran.";
> 		$admtext['albmedia'] = "Mediji Albuma";
> 		$admtext['confremmedia'] = "Da li ste sigurni da želite da obrišete ovaj medijum uz ovog albuma?";
> 		$admtext['selmedia'] = "Pretraga postojećeg medijuma da se uklju�i/doda u ovaj album";
> 		$admtext['uploadfirst'] = "uvezi novi medij prvo ovde";
> 		$admtext['existmedia'] = "Postojeći Medij";
> 		$admtext['emoptions'] = "Pregled, Brisanje ili Prevuci i Sortiraj";
> 		$admtext['addlinks'] = "Dodaj Nove Linkove";
> 		$admtext['inclmsg'] = " uklju�en";
> 		$admtext['mediasubt'] = "Upravljanje medijumima uklju�ujući i ovaj album (Dodavanje, Brisanje, Sortiranje).";
> 		$admtext['infosubt'] = "Izmena ime albuma, opis i klju�nih re�i.";
> 		$admtext['linkssubt'] = "Linkovi ovog Albuma ka Osobama, Porodicama, Izvorima, Repozitorijumima ili Mestima.";
> 		$admtext['inclmedia'] = "Uklju�eni Medij";
> 		$admtext['nomedia'] = "Ni jedan medij još nije uklju�en";
> 		$admtext['thumbsize'] = "(originalni fajl je suviše veliki)";
> 		$admtext['thumbinv'] = "(pogrešna slika ili neadekvatna prava)";
> 		$admtext['thumblost'] = "(original nije pronađen)";
> 		$admtext['uplsel'] = "Otpremi/upload novi fajl sa li�nog ra�unara, ili izaberi postojeći fajl sa ovog sajta.";
> 		$admtext['alblater'] = "Napomena: Mediji se mogu dodati u ovom Albumu, i album povezati sa osobom/a ili familijom/a, na sledećem ekranu.";
> 		$admtext['medlater'] = "Napomena: Više informacija može da se doda, i stavka povezana sa pojedincem/ima  ili familijom/ima, na sledećem ekranu.";
> 		$admtext['minfosubt'] = "Uredi naslov medija, opis i druge osnovne detalje.";
> 		$admtext['defphoto'] = "Podrazumevana fotografija";
> 		$admtext['alttd'] = "Alt Naslov/Opadajući";   //short abbreviation for "Alternate Title or Description"
> 		$admtext['editmedialink'] = "Uredi Link Medija";
> 		$admtext['plot'] = "grafi�ki podaci";
> 		$admtext['addnewcoll'] = "Dodaj Kolekciju";
> 		$admtext['collid'] = "ID Kolekcije";
> 		$admtext['colldisplay'] = "Prikaz Naslova";
> 		$admtext['collpath'] = "Ime foldera";
> 		$admtext['collicon'] = "Fajl ikone";
> 		$admtext['colllike'] = "Isto kao podešavanje";
> 		$admtext['entercollid'] = "Unesite ID kolekcije.";
> 		$admtext['entercolldisplay'] = "Unesite ime kolekcije za prikaz.";
> 		$admtext['entercollpath'] = "Unesite ime za folder kolekciju.";
> 		$admtext['entercollicon'] = "Unesite ime za fajl ikonu kolekcije.";
> 		$admtext['editcoll'] = "Izmeni Kolekciju";
> 		$admtext['confmtdelete'] = "Da li ste sigurni da želite da obrišete ovaj tip medija?";
> 		$admtext['histlimit'] = "<strong>Napomena o veli�ini:</strong> Većina web broswera ograni�ava veli�inu podataka koja se šalje putem web forme i ona je oko 64Kb. Ako imate veliku koli�inu teksta za unos ili prekopiranje, to radite unosom Body Text polje iznad, takođe razmislite o korišćenju historytemplate.php. Pogledajte Help za više infomracija.";
> 		$admtext['repath'] = "Potražite putanju sli�ica gde fajl ne postoji";
> 		$admtext['sortalbumind'] = "Sortiranje Albuma za pojedince, Familije, Izvore, Repozitorijume ili Mesta.";
> 		$admtext['cidexists'] = "ID Kolekcije koju unosite ne može da se doda jer već postoji.";
> 		$admtext['phalltrees'] = "Opciono. Ostavite prazno da bi fotografije bile vidljive u svim drvećima.";
> 		$admtext['fileexists'] = "Ovaj fajl već postoji. Želite li ga upisati preko postojećeg?";
> 		$admtext['collthumb'] = "Fajl Sli�ice";
> 		$admtext['movetop'] = "Idi na vrh";
> 		$admtext['collexpas'] = "Izvezi kao";
> 		$admtext['upload'] = "Otpremi";
> 		$admtext['linksel'] = "Link za izabrani";
> 		$admtext['mediaupl'] = "Izvoz Medija";
> 		$admtext['addfiles'] = "Dodaj fajlove...";
> 		$admtext['startupl'] = "Start izvoza";
551,553c579,580
< 		$admtext['cancelupl'] = "Cancel upload";
< 		//added in 11.0.0
< 		$admtext['localpath'] = "Local path(s)";
---
> 		$admtext['cancelupl'] = "Prekini izvoz";
> 		$admtext['localpath'] = "Lokalna(e) putanja(e)";
555c582,593
< 		$admtext['confdelmediafile'] = "Do you want to delete the physical file as well?";
---
> 		$admtext['confdelmediafile'] = "Želite li izbrisati i fizi�ki fajl sa sajta?";
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Tagovanje Slike";
> 		$admtext['photoowner'] = "Vlasnik/Izvor";
> 		$admtext['nothumb'] = "No thumbnail";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Stavka nije mogla da se doda, najverovatnije zato što je fajl prevelik i nije mogao da se otpremi ili upotrebi za pravljenje sli�ice.";
> 		$admtext['moved'] = "Pomereno";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Unesite naslov ili opis za ovaj medij.";
> 		$admtext['mapinstr3'] = "Da biste povezali region ove fotografije sa osobom, porodicom ili drugim entitetom, prvo izaberite relevantno stablo i tip entiteta, a zatim kreirajte pravougaonik za željeni region. Ovo se radi klikom na gornji levi ugao regiona, a zatim prevla�enjem u donji desni ugao. Alternativno, možete kliknuti u gornjem levom uglu, a zatim ponovo u donjem desnom uglu. Iska�uc�i okvir c�e vam pomoc�i da izaberete osobu ili drugi entitet. Napravite svoj izbor, a zatim ponovite ovaj proces po potrebi za dodatne regione. Kliknite na postojec�i region da biste izabrali, a zatim prevucite da biste ga premestili ili kliknite na 'X' da biste izbrisali.";
560,578c598,616
< 		$admtext['changestoreport'] = "Changes to report";
< 		$admtext['modifyreport'] = "Modify Existing Report";
< 		$admtext['existingreportinfo'] = "Existing Report Information";
< 		$admtext['existingreports'] = "Existing Reports";
< 		$admtext['newreportinfo'] = "New Report Information";
< 		$admtext['reportname'] = "Report Name";
< 		$admtext['rankpriority'] = "Rank/Priority";
< 		$admtext['choosedisplay'] = "Choose Fields to Display";
< 		$admtext['spouseid'] = "Spouse ID";
< 		$admtext['spousename'] = "Spouse Name";
< 		$admtext['lastmodified'] = "Last Modified";
< 		$admtext['ldsbapldate'] = "LDS Baptism Date";
< 		$admtext['ldsbaplplace'] = "LDS Baptism Place";
< 		$admtext['ldsendldate'] = "LDS Endowment Date";
< 		$admtext['ldsendlplace'] = "LDS Endowment Place";
< 		$admtext['ldssealsdate'] = "LDS Seal/Spouse Date";
< 		$admtext['ldssealsplace'] = "LDS Seal/Spouse Place";
< 		$admtext['ldssealpdate'] = "LDS Seal/Parents Date";
< 		$admtext['ldssealpplace'] = "LDS Seal/Parents Place";
---
> 		$admtext['changestoreport'] = "Promene u izveštaju";
> 		$admtext['modifyreport'] = "Menjanje postojećeg izveštaja";
> 		$admtext['existingreportinfo'] = "Postojeći informativni izveštaj";
> 		$admtext['existingreports'] = "Postojeći izveštaji";
> 		$admtext['newreportinfo'] = "Novi informativni izveštaj";
> 		$admtext['reportname'] = "Naziv izveštaja";
> 		$admtext['rankpriority'] = "Rang/Prioritet";
> 		$admtext['choosedisplay'] = "Izaberi polja za prikaz";
> 		$admtext['spouseid'] = "ID Supruga";
> 		$admtext['spousename'] = "Ime Supruga";
> 		$admtext['lastmodified'] = "Poslednja izmena";
> 		$admtext['ldsbapldate'] = "LDS Datum krštenja";
> 		$admtext['ldsbaplplace'] = "LDS Mesto krštenja";
> 		$admtext['ldsendldate'] = "LDS Datum zadužbine";
> 		$admtext['ldsendlplace'] = "LDS Mesto zadužbine";
> 		$admtext['ldssealsdate'] = "LDS Datum pe�ata/Supruga";
> 		$admtext['ldssealsplace'] = "LDS Mesto pe�ata/Supruga";
> 		$admtext['ldssealpdate'] = "LDS Datum pe�ata/Roditelja";
> 		$admtext['ldssealpplace'] = "LDS Mesto pe�ata/Roditelja";
580,602c618,639
< 		$admtext['choosecriteria'] = "Choose Criteria";
< 		$admtext['fullname'] = "Full Name";
< 		$admtext['lastfirst'] = "Last Name, First Name";
< 		$admtext['monthonlyfrom'] = "Month Only From";
< 		$admtext['yearonlyfrom'] = "Year Only From";
< 		$admtext['dayonlyfrom'] = "Day Only From";
< 		$admtext['operators'] = "Operators";
< 		$admtext['contains'] = "contains";
< 		$admtext['startswith'] = "starts with";
< 		$admtext['endswith'] = "ends with";
< 		$admtext['text_and'] = "AND";
< 		$admtext['currentmonth'] = "Current Month";
< 		$admtext['currentyear'] = "Current Year";
< 		$admtext['currentday'] = "Current Day";
< 		$admtext['constantstring'] = "Constant String";
< 		$admtext['constantvalue'] = "Constant Value";
< 		$admtext['foremptystring'] = "For an empty string, leave this field blank and click \"Add >>.\"";
< 		$admtext['choosesort'] = "Choose Sort Fields";
< 		$admtext['savereport'] = "Save Report";
< 		$admtext['addnewreport'] = "Add New Report";
< 		$admtext['createreport'] = "Create a new report";
< 		$admtext['noreports'] = "No reports exist";
< 		$admtext['rank'] = "Rank";
---
> 		$admtext['choosecriteria'] = "Izaberite kriterijume";
> 		$admtext['fullname'] = "Puno Ime";
> 		$admtext['lastfirst'] = "Prezime, Ime";
> 		$admtext['monthonlyfrom'] = "Samo Mesec od";
> 		$admtext['yearonlyfrom'] = "Samo Godina od";
> 		$admtext['dayonlyfrom'] = "Samo Dan od";
> 		$admtext['operators'] = "Operatori";
> 		$admtext['contains'] = "sadržaji";
> 		$admtext['startswith'] = "po�inje sa";
> 		$admtext['endswith'] = "završava sa";
> 		$admtext['text_and'] = "I";
> 		$admtext['currentmonth'] = "Tekući Mesec";
> 		$admtext['currentyear'] = "Tekuća Godina";
> 		$admtext['currentday'] = "Tekući Dan";
> 		$admtext['constantstring'] = "String konstanta";
> 		$admtext['constantvalue'] = "Vrednost konstante";
> 		$admtext['choosesort'] = "Odaberi polja za sortiranje";
> 		$admtext['savereport'] = "Snimi izveštaj";
> 		$admtext['addnewreport'] = "Dodaj novi izveštaj";
> 		$admtext['createreport'] = "Kreiraj novi izveštaj";
> 		$admtext['noreports'] = "Ne postoje takvi izveštaji";
> 		$admtext['rank'] = "Rang";
604,637c641,673
< 		$admtext['enterreportname'] = "Please enter a Report Name.";
< 		$admtext['selectdisplayfield'] = "Please select at least one display field.";
< 		$admtext['today'] = "Today (true date)";
< 		$admtext['convtodays'] = "Convert to Days";
< 		$admtext['desc'] = "Descending (Prev)";
< 		$admtext['birthdatetr'] = "Birth Date (True)";
< 		$admtext['chrdatetr'] = "Christening Date (True)";
< 		$admtext['deathdatetr'] = "Death Date (True)";
< 		$admtext['burialdatetr'] = "Burial Date (True)";
< 		$admtext['marriagedatetr'] = "Marriage Date (True)";
< 		$admtext['ldsbapldatetr'] = "LDS Baptism Date (True)";
< 		$admtext['ldsendldatetr'] = "LDS Endowment Date (True)";
< 		$admtext['ldssealsdatetr'] = "LDS Seal/Spouse Date (True)";
< 		$admtext['ldssealpdatetr'] = "LDS Seal/Parents Date (True)";
< 		$admtext['currentmonthnum'] = "Current Month Number";
< 		$admtext['livingtrue'] = "Living = yes";
< 		$admtext['livingfalse'] = "Living = no";
< 		$admtext['altreport'] = "OR Leave Display, Criteria and Sort fields blank and enter direct SQL SELECT statement here";
< 		$admtext['rptdate'] = "Date";
< 		$admtext['rptdatetr'] = "Date (True)";
< 		$admtext['fact'] = "Fact";
< 		$admtext['testeditdelete'] = "Test, Edit or delete previously entered reports";
< 		$admtext['wnmsg'] = "Message on \"What's New\" Page";
< 		$admtext['mwtype'] = "Type";
< 		$admtext['mysphoto'] = "Mystery Photos";
< 		$admtext['mysperson'] = "Elusive People";
< 		$admtext['selphoto'] = "Select Photo";
< 		$admtext['entertitle'] = "Please enter a title";
< 		$admtext['enterdesc'] = "Please enter a description";
< 		$admtext['confremmw'] = "Are you sure you want to remove this item?";
< 		$admtext['msgsaved'] = "Message saved";
< 		//added in 9.1.1
< 		$admtext['privatetrue'] = "Private = yes";
< 		$admtext['privatefalse'] = "Private = no";
---
> 		$admtext['enterreportname'] = "Molim Vas unesite Naziv izveštaja.";
> 		$admtext['selectdisplayfield'] = "Izaberite bar jedno polje za prikaz.";
> 		$admtext['today'] = "Današnji datum";
> 		$admtext['convtodays'] = "Pretvori u dane";
> 		$admtext['desc'] = "Opadajući (Preth.)";
> 		$admtext['birthdatetr'] = "Datum rođenja (Istinit)";
> 		$admtext['chrdatetr'] = "Datum krštenja (Istinit)";
> 		$admtext['deathdatetr'] = "Datum smrti (Istinit)";
> 		$admtext['burialdatetr'] = "Datum sahrane (Istinit)";
> 		$admtext['marriagedatetr'] = "Datum ven�anja (Istinit)";
> 		$admtext['ldsbapldatetr'] = "Datum krštenja LDS (Istinit)";
> 		$admtext['ldsendldatetr'] = "Datum zadužbine LDS (Istinit)";
> 		$admtext['ldssealsdatetr'] = "LDS Datum pe�ata/Supruga (Istinit)";
> 		$admtext['ldssealpdatetr'] = "LDS Datum pe�ata/Roditelja (Istinit)";
> 		$admtext['currentmonthnum'] = "Trenutni broj meseca";
> 		$admtext['livingtrue'] = "Živ = da";
> 		$admtext['livingfalse'] = "Živ = ne";
> 		$admtext['altreport'] = "ILI Ostaviti prikaz, Kriterijumi i sortirana polja ostaviti prazno i uneti direktno SQL SELECT upit ovde";
> 		$admtext['rptdate'] = "Datum";
> 		$admtext['rptdatetr'] = "Datum (Istinit)";
> 		$admtext['fact'] = "ÄŒinjenica";
> 		$admtext['testeditdelete'] = "Test, Uredi ili obriši prethodne unete izveštaje";
> 		$admtext['wnmsg'] = "Poruka za \"Å ta ima novo\" Stranica";
> 		$admtext['mwtype'] = "Tip";
> 		$admtext['mysphoto'] = "Zagonetne Fotografije";
> 		$admtext['mysperson'] = "Traženi Ljudi";
> 		$admtext['selphoto'] = "Izaberi Fotografiju";
> 		$admtext['entertitle'] = "Unesite Naslov";
> 		$admtext['enterdesc'] = "Unesite Opis";
> 		$admtext['confremmw'] = "Da li ste sigurni da želite da obrišete ovu stavku?";
> 		$admtext['msgsaved'] = "Poruka snimljena";
> 		$admtext['privatetrue'] = "Privatan = da";
> 		$admtext['privatefalse'] = "Privatan = ne";
639,646c675,686
< 		$admtext['ldsconfdate'] = "LDS Confirmation Date";
< 		$admtext['ldsconfplace'] = "LDS Confirmation Place";
< 		$admtext['ldsconfdatetr'] = "LDS Confirmation Date (True)";
< 		$admtext['ldsinitdate'] = "LDS Initiatory Date";
< 		$admtext['ldsinitplace'] = "LDS Initiatory Place";
< 		$admtext['ldsinitdatetr'] = "LDS Initiatory Date (True)";
< 		$admtext['savecopy'] = "Save as copy";
< 		$admtext['activeonly'] = "Active only";
---
> 		$admtext['ldsconfdate'] = "LDS Datum potvrde";
> 		$admtext['ldsconfplace'] = "LDS Potvrde Mesta";
> 		$admtext['ldsconfdatetr'] = "LDS Datum potvrde (ta�no)";
> 		$admtext['ldsinitdate'] = "LDS Datum inicijacije";
> 		$admtext['ldsinitplace'] = "LDS Mesto inicijacije";
> 		$admtext['ldsinitdatetr'] = "LDS Datum inicijacije (ta�no)";
> 		$admtext['savecopy'] = "Sa�uvaj kao kopiju";
> 		$admtext['activeonly'] = "Samo aktivna";
> 		//added in 14.0
> 		$admtext['instr'] = "Uputstva: Prevucite ili dvaput kliknite na stavke sa leve strane u liste sa desne strane. Prevucite gore-dole da biste promenili redosled. Ponovite dvostruki-klik da biste uklonili.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Za prazan niz, ostavite ovo polje prazno i kliknite >>";
651,692c691,700
< 		$admtext['selectimportfile'] = "Please select a file to import.";
< 		$admtext['importgedcom'] = "Import GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Add to or replace your genealogy (may take several minutes, depending on the size of your file)";
< 		$admtext['fromyourcomputer'] = "From your computer";
< 		$admtext['importdata'] = "Import Data";
< 		$admtext['setupfirsttime'] = "Set up the software for the first time.";
< 		$admtext['replace'] = "Replace (in selected tree)";
< 		$admtext['desttree'] = "Destination Tree";
< 		$admtext['selectdesttree'] = "Please select or enter a destination tree.";
< 		$admtext['selectexisting'] = "Import into";
< 		$admtext['importgedcom2'] = "Import a GEDCOM file";
< 		$admtext['setupitems'] = "Create database tables, Set preferences";
< 		$admtext['custeventitems'] = "Manage custom tags and event types";
< 		$admtext['usersitems'] = "Manage users and permissions";
< 		$admtext['reportsitems'] = "Create custom lists and reports";
< 		$admtext['langitems'] = "Manage alternate languages";
< 		$admtext['backupitems'] = "Back up, restore and optimize database tables";
< 		$admtext['ucaselast'] = "Upper case all surnames";
< 		$admtext['norecalc'] = "Do not recalculate Living flag";
< 		$admtext['autooffset'] = "Start IDs at first available number";
< 
< 		$admtext['mustselecttree'] = "You must select a tree before choosing this option.";
< 		$admtext['importmedia'] = "Import media if present";
< 		$admtext['mainmenu'] = "Main Menu";
< 		$admtext['neweronly'] = "Replace only if newer";
< 		$admtext['secondaryitems'] = "Create a GENDEX file, Track lines of descent";
< 		$admtext['onwebserver'] = "On web server (in GEDCOM folder)";
< 		$admtext['eventsonly'] = "Import Custom Event Types Only (no data is added, replaced or appended)";
< 		$admtext['imphints'] = "Hints: All Current Data means all people, families, sources and notes (media associations are not lost as long as IDs remain the same). Matches are always based on IDs only. New records are always added. Append imports all records with new IDs.";
< 		$admtext['allevents'] = "Accept data for all new Custom Event Types";
< 		$admtext['destbranch'] = "Destination Branch (optional)";
< 		$admtext['inframe'] = "(in frame)";
< 		$admtext['getstart'] = "Getting Started";
< 		$admtext['importlatlong'] = "Import latitude / longitude data if present";
< 		$admtext['opening'] = "Opening";
< 		$admtext['reopen'] = "Reopening";
< 		$admtext['uploading'] = "Uploading";
< 		$admtext['stop'] = "Stop";
< 		$admtext['stopped'] = "Import stopped";
< 		$admtext['resume'] = "click here to resume";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Change Log";
---
> 		$admtext['setupfirsttime'] = "Podesite softver po prvi put.";
> 		$admtext['importgedcom2'] = "Uvoz GEDCOM fajla";
> 		$admtext['setupitems'] = "Kreiranje tabela baze podataka, Podešavanje prioriteta";
> 		$admtext['custeventitems'] = "Upravljanje prilagođenim oznakama i tipovima događaja";
> 		$admtext['usersitems'] = "Upravljanje korisnicima i njihovim pravima";
> 		$admtext['reportsitems'] = "Kreirajte prilagođene liste i izveštaje";
> 		$admtext['langitems'] = "Upravljenje alternativnim jezicima/pismima";
> 		$admtext['backupitems'] = "Arhiviranje, restauracija i optimizacija tabela baze podataka";
> 		$admtext['mainmenu'] = "Glavni Meni";
> 		$admtext['secondaryitems'] = "Kreirajte GENDEX fajl, Pratite linije porekla";
694,696c702
< 		$admtext['mmgritems'] = "Configure 3rd party add-ons";
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Old style import (no progress bar)";
---
> 		$admtext['mmgritems'] = "Instalacija i deinstalacija TNG modula (add-ons) trećih lica";
698c704
< 		$admtext['miscitems'] = "Notes, What's New, Most Wanted";
---
> 		$admtext['miscitems'] = "Napomene, Å ta ima Novo, U potrazi za, Validacija";
700,711c706,717
< 		$admtext['tasks'] = "Important tasks";
< 		$admtext['task_revusers'] = "Review new user registrations";
< 		$admtext['task_tree'] = "Create your first tree";
< 		$admtext['task_user'] = "Create a user account for yourself";
< 		$admtext['task_people'] = "add new people";
< 		$admtext['task_families'] = "Add new families";
< 		$admtext['task_revind'] = "Review proposed changes to individual events";
< 		$admtext['task_revfam'] = "Review proposed changes to family events";
< 		$admtext['task_backup'] = "Back up the data";
< 		$admtext['nobackups'] = "no backups exist";
< 		$admtext['lastbackup'] = "Last Backup";
< 		$admtext['dna_blurb'] = "Log DNA tests and link them to individuals";
---
> 		$admtext['tasks'] = "Važni zadaci";
> 		$admtext['task_revusers'] = "Pregled novih korisni�kih registracija";
> 		$admtext['task_tree'] = "Kreirajte svoje prvo rodoslovno drvo/stablo";
> 		$admtext['task_user'] = "Kreirajte korisni�ki nalog za sebe";
> 		$admtext['task_people'] = "dodajte nove ljude/osobe";
> 		$admtext['task_families'] = "Dodajte nove porodice";
> 		$admtext['task_revind'] = "Pregled predloženih izmena za pojedina�ne događaje";
> 		$admtext['task_revfam'] = "Pregled predloženih izmena za porodi�ne događaje";
> 		$admtext['task_backup'] = "Rezevna kopija podataka";
> 		$admtext['nobackups'] = "Rezevna kopija/Backup ne postoji";
> 		$admtext['lastbackup'] = "Poslednji Backup";
> 		$admtext['dna_blurb'] = "Log DNA testovi i povezivanje sa osobama";
713c719,724
< 		$admtext['task_mapkey'] = "Get a map key from Google to enable maps display";
---
> 		$admtext['task_mapkey'] = "Nabavite klju� Mape od Google-a da biste omogućili prikaz karata";
> 		//added in 14.0
> 		$admtext['upgrade'] = "Nadogradnja";
> 		$admtext['need_upgrade'] = "Završite ove instrukcije nadogradnje";
> 		$admtext['upgrade_missing'] = "Čini se da datoteka za nadogradnju nedostaje, pa ste možda vec� gotovi.";
> 		$admtext['delete_upgrade'] = "Kada završite, kliknite ovde da biste izbrisali nadogradnju i vratili se u meni.";
718,765c729,775
< 		$admtext['changestosource'] = "Changes to source";
< 		$admtext['modifysource'] = "Modify Existing Source";
< 		$admtext['selectsrcaction'] = "Select Source and Action";
< 		$admtext['shorttitle'] = "Short Title";
< 		$admtext['longtitle'] = "Long Title";
< 		$admtext['author'] = "Author";
< 		$admtext['callnumber'] = "Call Number";
< 		$admtext['publisher'] = "Publisher";
< 		$admtext['actualtext'] = "Actual Text";
< 		$admtext['confdeletesrc'] = "Jeste li sigurni da hocete da obrišete source?";
< 		$admtext['selectshorttitle'] = "Please select or enter a short title for this event type.";
< 		$admtext['existingsourceinfo'] = "Existing Information for Source";
< 		$admtext['newsourceinfo'] = "New Source Information";
< 		$admtext['addnewsource'] = "Add New Source";
< 		$admtext['prefixsourceid'] = "Please prefix Source ID with \"S\" for \"Source\"";
< 		$admtext['entersourceid'] = "Please enter a Source ID.";
< 		$admtext['validsourceid'] = "Please enter a valid Source ID. A valid ID is a numeric string prefixed with 'S'.";
< 		$admtext['createsource'] = "Create a record for a new source";
< 		$admtext['editexistingsource'] = "Obrada informacija o prethodno upisan source";
< 		$admtext['addnewcite'] = "Add New Citation";
< 		$admtext['reliability'] = "Reliability";
< 		$admtext['relyexplain'] = "Higher numbers indicate greater reliability.";
< 		$admtext['citedate'] = "Citation Date";
< 		$admtext['modifycite'] = "Modify Existing Citation";
< 		$admtext['addingcite'] = "Adding Citation...";
< 		$admtext['deletingcite'] = "Deleting Citation...";
< 		$admtext['updatingcite'] = "Updating Citation...";
< 		$admtext['sevslater'] = "Note: Additional events and notes may be added after the new source has been saved.";
< 		$admtext['pleasesourcepart'] = "Please enter part of the source title.";
< 		$admtext['addnewrepo'] = "Add New Repository";
< 		$admtext['modifyrepo'] = "Modify Existing Repository";
< 		$admtext['createrepo'] = "Create a record for a new repository";
< 		$admtext['editexistingrepo'] = "Obrada informacija o prethodno upisan repository";
< 		$admtext['enterrepoid'] = "Please enter a Repository ID.";
< 		$admtext['enterreponame'] = "Please enter a Repository name.";
< 		$admtext['newrepoinfo'] = "New Repository Information";
< 		$admtext['prefixrepoid'] = "Please prefix Repository ID with \"REPO\" for \"Repository\"";
< 		$admtext['selectrepoaction'] = "Select Repository and Action";
< 		$admtext['confdeleterepo'] = "Jeste li sigurni da hocete da obrišete repository?";
< 		$admtext['changestorepo'] = "Changes to repository";
< 		$admtext['existingrepoinfo'] = "Existing Information for Repository";
< 		$admtext['pleaserepopart'] = "Please enter part of the repository title.";
< 		$admtext['choosemergesources'] = "Choose sources to merge or find potential matches";
< 		$admtext['confirmmergesources'] = "Are you sure you want to merge these two sources?";
< 		$admtext['choosemergerepos'] = "Choose repositories to merge or find potential matches";
< 		$admtext['confirmmergerepos'] = "Are you sure you want to merge these two repositories?";
< 		$admtext['revslater'] = "Note: Additional events and notes may be added after the new repository has been saved.";
< 		$admtext['confdeleterepo'] = "Jeste li sigurni da hocete da obrišete repository?";
---
> 		$admtext['changestosource'] = "Promena Izvora";
> 		$admtext['modifysource'] = "Izmena postojećeg Izvora";
> 		$admtext['selectsrcaction'] = "Izaberi Izvor i aktivnost nad njom";
> 		$admtext['shorttitle'] = "Kratki Naslov";
> 		$admtext['longtitle'] = "Duži Naslov";
> 		$admtext['callnumber'] = "Pozivni Broj";
> 		$admtext['publisher'] = "Izdava�";
> 		$admtext['actualtext'] = "Aktuelni tekst";
> 		$admtext['confdeletesrc'] = "Jeste li sigurni da hoćete da obrišete Izvor?";
> 		$admtext['selectshorttitle'] = "Izaberite ili unesite kratak naslov za ovu vrstu događaja.";
> 		$admtext['existingsourceinfo'] = "Postojeće informacije za Izvor";
> 		$admtext['newsourceinfo'] = "Nove Izvorne informacije";
> 		$admtext['addnewsource'] = "Dodaj novi Izvor";
> 		$admtext['prefixsourceid'] = "Prefiks za ID Izvora je \"S\" za Izvor na engleskom \"Source\"";
> 		$admtext['entersourceid'] = "Unesite ID Izvora";
> 		$admtext['validsourceid'] = "Unesite važeći ID Izvora. Važeći ID je numeri�ki niz sa prefiksom 'S'.";
> 		$admtext['createsource'] = "Napravite zapis za novi Izvor";
> 		$admtext['editexistingsource'] = "Uredite informacije za prethodno uneseni Izvor";
> 		$admtext['addnewcite'] = "Dodaj novi Citat";
> 		$admtext['reliability'] = "Pouzdanost";
> 		$admtext['relyexplain'] = "Veći brojevi ukazuju na veću pouzdanost.";
> 		$admtext['citedate'] = "Datum Citata";
> 		$admtext['modifycite'] = "Izmenite postojeći Citat";
> 		$admtext['addingcite'] = "Dodavanje Citata...";
> 		$admtext['deletingcite'] = "Brisanje Citata...";
> 		$admtext['updatingcite'] = "Ažuriranje Citata...";
> 		$admtext['sevslater'] = "Napomena: Dodatni događaji i napomene mogu se dodati nakon što je novi izvor snimljen.";
> 		$admtext['pleasesourcepart'] = "Unesite deo naslova Izvora.";
> 		$admtext['addnewrepo'] = "Dodaj novi Repozitorijum/Arhivu";
> 		$admtext['modifyrepo'] = "Izmeni postojeći Repozitorijum";
> 		$admtext['createrepo'] = "Kreirajte zapis za novi Repozitorijum.";
> 		$admtext['editexistingrepo'] = "Izmenite informacije za prethodno unesen Repozitorijum.";
> 		$admtext['enterrepoid'] = "Unesite ID Repozitorijuma.";
> 		$admtext['enterreponame'] = "Unesite naziv Repozitorijuma.";
> 		$admtext['newrepoinfo'] = "Nove informacije o Repozitorijumu";
> 		$admtext['prefixrepoid'] = "Prefiks ID Repozitorijuma je \"REPO\" za \"Repository\"";
> 		$admtext['selectrepoaction'] = "Izaberite Repozitorijum i Akciju";
> 		$admtext['confdeleterepo'] = "Jeste li sigurni da želite izbrisati ovaj Repozitorijum?";
> 		$admtext['changestorepo'] = "Izmene u Repozitorijumu";
> 		$admtext['existingrepoinfo'] = "Postojeće informacije za Repozitorijumu";
> 		$admtext['pleaserepopart'] = "Unesite deo naslova Repozitorijuma.";
> 		$admtext['choosemergesources'] = "Izaberite Izvore za spajanje ili pronalaženje potencijalnih podudaranja.";
> 		$admtext['confirmmergesources'] = "Jeste li sigurni da želite spojiti ova dva Izvora?";
> 		$admtext['choosemergerepos'] = "Izaberite Repozitorijum za spajanje ili pronalaženje potencijalnih podudaranja";
> 		$admtext['confirmmergerepos'] = "Jeste li sigurni da želite spojiti ova dva Repozitorijuma?";
> 		$admtext['revslater'] = "Napomena: Dodatni događaji i napomene mogu se dodati nakon što se nov Repozitorijum snimi.";
> 		$admtext['confdeleterepo'] = "Jeste li sigurni da želite izbrisati ovaj Repozitorijum?";
770,775c780,785
< 		$admtext['checknewid'] = "Check New ID";
< 		$admtext['idnotvalid'] = "is not a valid ID. A valid ID is a numeric string prefixed with";
< 		$admtext['idinuse'] = "is in use. Please choose a different ID";
< 		$admtext['idok'] = "is OK to use";
< 		$admtext['isok'] = "is OK to use";
< 		$admtext['isinuse'] = "is already in use.";
---
> 		$admtext['checknewid'] = "Proverite novi ID";
> 		$admtext['idnotvalid'] = "nije važeći ID. Važeći ID je numeri�ki niz koji ima prefiks";
> 		$admtext['idinuse'] = "je u upotrebi. Izaberite drugi ID";
> 		$admtext['idok'] = "je OK za upotrebu";
> 		$admtext['isok'] = "je OK za upotrebu";
> 		$admtext['isinuse'] = "je već u upotrebi.";
779,825c789,835
< 		$admtext['templatenum'] = "Template Number";
< 		$admtext['mainimage'] = "Main image (home page)"; //1, 2, 3, 4, 5, 7
< 		$admtext['titleimage'] = "Title image (home page)"; //1, 2, 3
< 		$admtext['headline'] = "Headline"; //4, 7
< 		$admtext['mainpara'] = "Welcome paragraph";  //1, 4, 6, 7, 8
< 		$admtext['headimgplustitle'] = "Header image (including title)"; //1
< 		$admtext['pedperson'] = "Pedigree person ID"; //2
< 		$admtext['pedtree'] = "Pedigree tree ID"; //2
< 		$admtext['phhistperson'] = "Photos & Histories person ID"; //2
< 		$admtext['phhisttree'] = "Photos & Histories tree ID"; //2
< 		$admtext['headimg'] = "Header image"; //2, 3, 4, 5, 6, 8
< 		$admtext['headtitleimg'] = "Header title image"; //2, 3
< 		$admtext['titleimg'] = "Title image (all pages)"; //4, 7
< 		$admtext['searchpara'] = "Search paragraph"; //6
< 		$admtext['fhpara'] = "Family Histories paragraph"; //6
< 		$admtext['fhlinkshis'] = "Family Histories links (His)"; //6
< 		$admtext['fhlinkshers'] = "Family Histories links (Hers)"; //6
< 		$admtext['mwpara'] = "Most Wanted paragraph"; //6
< 		$admtext['respara'] = "Resources paragraph"; //6
< 		$admtext['reslinks'] = "Resources links"; //6
< 		$admtext['headtitle1'] = "Header title, part 1"; //8
< 		$admtext['headtitle2'] = "Header title, part 2"; //8
< 		$admtext['headtitle3'] = "Header title, part 3"; //8
< 		$admtext['headsubtitle'] = "Header subtitle"; //8
< 		$admtext['latestnews'] = "Latest news"; //8
< 		$admtext['momside'] = "Mom's Side label"; //8
< 		$admtext['dadside'] = "Dad's Side label"; //8
< 		$admtext['momperson'] = "Mom's Side person ID"; //8
< 		$admtext['momtree'] = "Mom's Side tree ID"; //8
< 		$admtext['dadperson'] = "Dad's Side person ID"; //8
< 		$admtext['dadtree'] = "Dad's Side tree ID"; //8
< 		$admtext['featurethumb1'] = "Feature 1 thumbnail"; //4
< 		$admtext['featurelink1'] = "Feature 1 link"; //4
< 		$admtext['featuretitle1'] = "Feature 1 title"; //4
< 		$admtext['featurepara1'] = "Feature 1 paragraph"; //4
< 		$admtext['featurethumb2'] = "Feature 2 thumbnail"; //4
< 		$admtext['featurelink2'] = "Feature 2 link"; //4
< 		$admtext['featuretitle2'] = "Feature 2 title"; //4
< 		$admtext['featurepara2'] = "Feature 2 paragraph"; //4
< 		$admtext['featurethumb3'] = "Feature 3 thumbnail"; //4
< 		$admtext['featurelink3'] = "Feature 3 link"; //4
< 		$admtext['featuretitle3'] = "Feature 3 title"; //4
< 		$admtext['featurepara3'] = "Feature 3 paragraph"; //4
< 		$admtext['featurethumb4'] = "Feature 4 thumbnail"; //4
< 		$admtext['featurelink4'] = "Feature 4 link"; //4
< 		$admtext['featuretitle4'] = "Feature 4 title"; //4
< 		$admtext['featurepara4'] = "Feature 4 paragraph"; //4
---
> 		$admtext['templatenum'] = "Broj Å ablona";
> 		$admtext['mainimage'] = "Glavna slika (po�etna stranica)"; //1, 2, 3, 4, 5, 7
> 		$admtext['titleimage'] = "Naslov slike (po�etna stranica)"; //1, 2, 3
> 		$admtext['headline'] = "Glavni Naslov"; //4, 7
> 		$admtext['mainpara'] = "Pozdravni paragraf";  //1, 4, 6, 7, 8
> 		$admtext['headimgplustitle'] = "Slika zaglavlja (uklju�ujući naslov)"; //1
> 		$admtext['pedperson'] = "ID rodoslov osobe"; //2
> 		$admtext['pedtree'] = "ID rodoslovnog stabla"; //2
> 		$admtext['phhistperson'] = "Fotografije &amp; ID Istorije osobe"; //2
> 		$admtext['phhisttree'] = "Fotografije &amp; ID Istorije stabla"; //2
> 		$admtext['headimg'] = "Zaglavlje Slike "; //2, 3, 4, 5, 6, 8
> 		$admtext['headtitleimg'] = "Zaglavlje naslova Slike"; //2, 3
> 		$admtext['titleimg'] = "Naslov Slike (sve stranice)"; //4, 7
> 		$admtext['searchpara'] = "Traži paragraf"; //6
> 		$admtext['fhpara'] = "Paragraf - Porodi�nih Istorija"; //6
> 		$admtext['fhlinkshis'] = "Linkovi porodi�nih istorija (njegov)"; //6
> 		$admtext['fhlinkshers'] = "Linkovi porodi�nih istorija (njen)"; //6
> 		$admtext['mwpara'] = "Paragraf - U potrazi za"; //6
> 		$admtext['respara'] = "Paragraf - Izvora"; //6
> 		$admtext['reslinks'] = "Linkovi Izvora"; //6
> 		$admtext['headtitle1'] = "Naslov zaglavlja, deo 1"; //8
> 		$admtext['headtitle2'] = "Naslov zaglavlja, deo 2"; //8
> 		$admtext['headtitle3'] = "Naslov zaglavlja, deo 3"; //8
> 		$admtext['headsubtitle'] = "Podnaslov zaglavlja"; //8
> 		$admtext['latestnews'] = "Najnovije vesti"; //8
> 		$admtext['momside'] = "Labela sa Ženske strane"; //8, 20
> 		$admtext['dadside'] = "Labela sa Muške strane"; //8, 20
> 		$admtext['momperson'] = "ID osobe sa Ženske strane"; //8, 20
> 		$admtext['momtree'] = "ID stabla sa Ženske strane"; //8, 20
> 		$admtext['dadperson'] = "ID osobe sa Muške strane"; //8, 20
> 		$admtext['dadtree'] = "ID stabla sa Muške strane"; //8, 20
> 		$admtext['featurethumb1'] = "Prikaz 1 sli�ice"; //4
> 		$admtext['featurelink1'] = "Prikaz 1 linka"; //4
> 		$admtext['featuretitle1'] = "Prikaz 1 naslova"; //4
> 		$admtext['featurepara1'] = "Prikaz 1 paragrafa"; //4
> 		$admtext['featurethumb2'] = "Prikaz 2 sli�ice"; //4
> 		$admtext['featurelink2'] = "Prikaz 2 linka"; //4
> 		$admtext['featuretitle2'] = "Prikaz 2 naslova"; //4
> 		$admtext['featurepara2'] = "Prikaz 2 paragrafa"; //4
> 		$admtext['featurethumb3'] = "Prikaz 3 sli�ice"; //4
> 		$admtext['featurelink3'] = "Prikaz 3 linka"; //4
> 		$admtext['featuretitle3'] = "Prikaz 3 naslova"; //4
> 		$admtext['featurepara3'] = "Prikaz 3 paragrafa"; //4
> 		$admtext['featurethumb4'] = "Prikaz 4 sli�ice"; //4
> 		$admtext['featurelink4'] = "Prikaz 4 linka"; //4
> 		$admtext['featuretitle4'] = "Prikaz 4 naslova"; //4
> 		$admtext['featurepara4'] = "Prikaz 4 paragrafa"; //4
827,830c837,840
< 		$admtext['maintitle'] = "Main title"; //5
< 		$admtext['hisside'] = "His Side label"; //5
< 		$admtext['herside'] = "Her Side label"; //5
< 		$admtext['newstext'] = "News text"; //5
---
> 		$admtext['maintitle'] = "Glavni naslov"; //5
> 		$admtext['hisside'] = "Muška strana labele"; //5
> 		$admtext['herside'] = "Ženska strana lebele"; //5
> 		$admtext['newstext'] = "Tekst o vestima"; //5
832c842
< 		$admtext['templateswitching'] = "Enable Template Selection";
---
> 		$admtext['templateswitching'] = "Omogući izbor Šablona";
834,838c844,848
< 		$admtext['template'] = "Template";
< 		$admtext['createcopy'] = "Create copy in";  //as in, "create copy in Dutch"
< 		$admtext['featurelinks'] = "Feature links"; //9, 10
< 		$admtext['featurepara'] = "Features paragraph"; //9, 10
< 		$admtext['welcome'] = "Welcome headline"; //9, 10
---
> 		$admtext['template'] = "Å ablon";
> 		$admtext['createcopy'] = "Kreirajte kopiju u";  //as in, "create copy in Dutch"
> 		$admtext['featurelinks'] = "Istaknuti Linkovi"; //9, 10
> 		$admtext['featurepara'] = "Istaknuti paragraf"; //9, 10
> 		$admtext['welcome'] = "Naslov Dobro došlice"; //9, 10
840,841c850,851
< 		$admtext['momsidenames'] = "Mom's Side names"; //8
< 		$admtext['dadsidenames'] = "Dad's Side names"; //8
---
> 		$admtext['momsidenames'] = "Maj�ina bo�na imena"; //8
> 		$admtext['dadsidenames'] = "O�eva bo�na imena"; //8
843,858c853,868
< 		$admtext['featurespara'] = "Features paragraph";
< 		$admtext['menutitle'] = "Menu Title";
< 		$admtext['titlechoice'] = "Title option";
< 		$admtext['photol'] = "Left image";
< 		$admtext['phototitlel'] = "Left image title";
< 		$admtext['photocaptionl'] = "Left image caption";
< 		$admtext['photor'] = "Right image";
< 		$admtext['phototitler'] = "Right image title";
< 		$admtext['photocaptionr'] = "Right image caption";
< 		$admtext['topsurnames'] = "Top Surnames label";
< 		$admtext['headimg2'] = "Header image 2"; //14
< 		$admtext['headimg3'] = "Header image 3"; //14
< 		$admtext['showprev'] = "Show Previews";
< 		$admtext['hideprev'] = "Hide Previews";
< 		$admtext['ttitleimage'] = "Image";
< 		$admtext['ttitletext'] = "Text";
---
> 		$admtext['featurespara'] = "Istaknuti paragraf";
> 		$admtext['menutitle'] = "Naslov Menija";
> 		$admtext['titlechoice'] = "Opcija Naslova";
> 		$admtext['photol'] = "Leva Slika";
> 		$admtext['phototitlel'] = "Naslov leve Slike";
> 		$admtext['photocaptionl'] = "Levi naslov Slike";
> 		$admtext['photor'] = "Desna Slika";
> 		$admtext['phototitler'] = "Naslov desne Slike";
> 		$admtext['photocaptionr'] = "Desni naslov Slike";
> 		$admtext['topsurnames'] = "Labela Prvih Prezimena";
> 		$admtext['headimg2'] = "Zaglavlje slike 2"; //14
> 		$admtext['headimg3'] = "Zaglavlje slike 3"; //14
> 		$admtext['showprev'] = "Prikaži Pregled";
> 		$admtext['hideprev'] = "Sakri Pregled";
> 		$admtext['ttitleimage'] = "Slika";
> 		$admtext['ttitletext'] = "Tekst";
860,883c870,893
< 		$admtext['featurethumb5'] = "Feature 5 thumbnail"; //15
< 		$admtext['featurelink5'] = "Feature 5 link"; //15
< 		$admtext['featuretitle5'] = "Feature 5 title"; //15
< 		$admtext['featurepara5'] = "Feature 5 paragraph"; //15
< 		$admtext['featurethumb6'] = "Feature 6 thumbnail"; //15
< 		$admtext['featurelink6'] = "Feature 6 link"; //15
< 		$admtext['featuretitle6'] = "Feature 6 title"; //15
< 		$admtext['featurepara6'] = "Feature 6 paragraph"; //15
< 		$admtext['featurethumb7'] = "Feature 7 thumbnail"; //15
< 		$admtext['featurelink7'] = "Feature 7 link"; //15
< 		$admtext['featurepara7'] = "Feature 7 paragraph"; //15
< 		$admtext['featurethumb8'] = "Feature 8 thumbnail"; //15
< 		$admtext['featurelink8'] = "Feature 8 link"; //15
< 		$admtext['featurepara8'] = "Feature 8 paragraph"; //15
< 		$admtext['sidebarhead1'] = "Sidebar header 1"; //15
< 		$admtext['sidebarhead2'] = "Sidebar header 2"; //15
< 		$admtext['sidebarhead3'] = "Sidebar header 3"; //15
< 		$admtext['texttitle1'] = "Text 1 title"; //15
< 		$admtext['textlink1'] = "Text 1 link"; //15
< 		$admtext['textpara1'] = "Text 1 paragraph"; //15
< 		$admtext['texttitle2'] = "Text 2 title"; //15
< 		$admtext['textlink2'] = "Text 2 link"; //15
< 		$admtext['textpara2'] = "Text 2 paragraph"; //15
< 		$admtext['texttitle3'] = "Text 3 title"; //15
---
> 		$admtext['featurethumb5'] = "Sli�ica �lanka 5"; //15
> 		$admtext['featurelink5'] = "Link �lanka 5"; //15
> 		$admtext['featuretitle5'] = "Naslov ÄŒlanka 5"; //15
> 		$admtext['featurepara5'] = "ÄŒlanak 5 paragrafa"; //15
> 		$admtext['featurethumb6'] = "Sli�ica �lanka 6"; //15
> 		$admtext['featurelink6'] = "Link �lanka 6"; //15
> 		$admtext['featuretitle6'] = "Naslov ÄŒlanka 6"; //15
> 		$admtext['featurepara6'] = "ÄŒlanak 6 paragrafa"; //15
> 		$admtext['featurethumb7'] = "Sli�ica �lanka 7"; //15
> 		$admtext['featurelink7'] = "Link �lanka 7"; //15
> 		$admtext['featurepara7'] = "ÄŒlanak 7 paragrafa"; //15
> 		$admtext['featurethumb8'] = "Sli�ica �lanka 7"; //15
> 		$admtext['featurelink8'] = "Link �lanka 8"; //15
> 		$admtext['featurepara8'] = "ÄŒlanak 8 paragrafa"; //15
> 		$admtext['sidebarhead1'] = "Zaglavlje Sidebar 1"; //15
> 		$admtext['sidebarhead2'] = "Zaglavlje Sidebar 2"; //15
> 		$admtext['sidebarhead3'] = "Zaglavlje Sidebar 3"; //15
> 		$admtext['texttitle1'] = "Naslov Teksta 1"; //15
> 		$admtext['textlink1'] = "Link Teksta 1"; //15
> 		$admtext['textpara1'] = "Paragraf Teksta 1"; //15
> 		$admtext['texttitle2'] = "Naslov Teksta 2"; //15
> 		$admtext['textlink2'] = "Link Teksta 2"; //15
> 		$admtext['textpara2'] = "Paragraf Teksta 2"; //15
> 		$admtext['texttitle3'] = "Naslov Teksta 3"; //15
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Zaglavlje citata";
> 		$admtext['quotesubhead'] = "Podnaslovi citata";
> 		$admtext['sniptitle'] = "Karakteristike Naslova";
> 		$admtext['snipname'] = "Karakteristike Imena";
> 		$admtext['snipinfoone'] = "Karakteristika prve linije";
> 		$admtext['snipinfotwo'] = "Karakteristika druge linije";
> 		$admtext['snipimage'] = "Karakteristika slike";
> 		$admtext['snipperson'] = "Karakteristika ID Osobe";
> 		$admtext['sniptree'] = "Karakteristika ID stabla";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Link";
> 		$admtext['featuretitle7'] = "Naslov ÄŒlanka 7";
> 		$admtext['featuretitle8'] = " Naslov ÄŒlanka 8";
> 		$admtext['featuretitle9'] = " Naslov ÄŒlanka 9";
> 		$admtext['featurethumb9'] = "Sli�ica �lanka 9"; //15
> 		$admtext['featurelink9'] = "Link �lanka 9"; //15
> 		$admtext['featurepara9'] = "Paragraf �lanka 9"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Header Left Image";
> 		$admtext['rightimg'] = "Header Right Image";
> 		$admtext['photoption'] = "Photo options are<br />&nbsp;&nbsp;(static or random)";
> 		$admtext['randomphotowidth'] = "Random Photo Width";
> 		$admtext['randomphotoheight'] = "Random Photo Height";
> 		$admtext['randomphotomediatypeID'] = "Random Photo Collection";
> 		$admtext['momheading'] = "Maternal Family Heading";
> 		$admtext['mompara'] = "Maternal Family Paragraph";
> 		$admtext['mompagelink'] = "Maternal Family Page Link";
> 		$admtext['dadheading'] = "Paternal Family Heading";
> 		$admtext['dadpara'] = "Paternal Family Paragraph";
> 		$admtext['dadpagelink'] = "Paternal Family Page Link";
> 		$admtext['spmomheading'] = "Spouse Maternal Family Heading";
> 		$admtext['spmompara'] = "Spouse Maternal Family Paragraph";
> 		$admtext['spmompagelink'] = "Spouse Maternal Family Page Link";
> 		$admtext['spmomside'] = "Spouse Maternal Side label";
> 		$admtext['spdadside'] = "Spouse Paternal Side label";
> 		$admtext['spmomperson'] = "Spouse Maternal Side personID";
> 		$admtext['spmomtree'] = "Spouse Maternal Side treeID";
> 		$admtext['spdadheading'] = "Spouse Paternal Family Heading";
> 		$admtext['spdadpara'] = "Spouse Paternal Family Paragrph";
> 		$admtext['spdadpagelink'] = "Spouse Paternal Family Page Link";
> 		$admtext['spdadperson'] = "Spouse Paternal Side personID";
> 		$admtext['spdadtree'] = "Spouse Paternal Side treeID";
> 		$admtext['storiesheading'] = "Our Family Stories";
> 		$admtext['nbrsurnames'] = "Number of Surnames<br />&nbsp;&nbsp; in Surname Cloud";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Sli�ica �lanka";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
893,908c986,1001
< 		$admtext['tablesuccess'] = "Tables created successfully.";
< 		$admtext['backtosetup'] = "Back to the Setup Menu";
< 		$admtext['configuration'] = "Configuration";
< 		$admtext['entersysvars'] = "Enter values for system variables.";
< 		$admtext['createdbtables'] = "Create the database tables to hold your information.";
< 		$admtext['tcwarning'] = "<strong>Warning!</strong> Select this option only when you are setting your site up for the first time. <strong>All existing data, including photos, histories, headstones and cemetery information, will be erased!</strong>";
< 		$admtext['conftabledelete'] = "This will delete ALL your existing data!! Are you sure you want to continue?";
< 		$admtext['performdatamaint'] = "Perform data maintenance and manage photos, histories and other components.";
< 		$admtext['createtables'] = "Create Tables";
< 		$admtext['configsettings'] = "General Settings";
< 		$admtext['logconfigsettings'] = "Log Settings";
< 		$admtext['importconfigsettings'] = "Import Settings";
< 		$admtext['diagnostics'] = "Diagnostics";
< 		$admtext['rundiags'] = "Run Diagnostics";
< 		$admtext['phpinf'] = "PHP Info Screen";
< 		$admtext['fromphp'] = "This information comes from your server and relates to your PHP installation, not TNG.";
---
> 		$admtext['tablesuccess'] = "Tabele su uspešno kreirane.";
> 		$admtext['backtosetup'] = "Povratak u meni za konfigurisanje";
> 		$admtext['configuration'] = "Konfiguracije";
> 		$admtext['entersysvars'] = "Unesite vrijednosti za sistemske varijable.";
> 		$admtext['createdbtables'] = "Kreirajte tabele baze podataka za �uvanje vaših podataka.";
> 		$admtext['tcwarning'] = "<strong>Upozorenje!</strong> Izaberite ovu opciju samo kada prvi put postavljate sajt. <strong>Svi postojeći podaci, uklju�ujući fotografije, istorije, nadgrobne spomenike i informacije o groblju, biće izbrisani!</strong>";
> 		$admtext['conftabledelete'] = "Ovo će izbrisati sve vaše postojeće podatke !! Da li ste sigurni da želite da nastavite?";
> 		$admtext['performdatamaint'] = "Održavanje podataka i upravljanje fotografijama, istorijama i drugim komponentama.";
> 		$admtext['createtables'] = "Napravite Tabele";
> 		$admtext['configsettings'] = "Opšta Podešavanja";
> 		$admtext['logconfigsettings'] = "Podešavanje Logova pristupa";
> 		$admtext['importconfigsettings'] = "Podešavanja Uvoza";
> 		$admtext['diagnostics'] = "Dijagnostike";
> 		$admtext['rundiags'] = "Pokreni Dijagnostiku";
> 		$admtext['phpinf'] = "PHP verzija";
> 		$admtext['fromphp'] = "Ove informacije dolaze sa vašeg servera i odnose se na vašu PHP instalaciju, a ne na TNG.";
910,932c1003,1025
< 		$admtext['phpreq'] = "(TNG requires 5.3 or higher.)";
< 		$admtext['gdlib'] = "GD graphics library";
< 		$admtext['gdreq'] = "(Required for TNG's thumbnail creation tools.)";
< 		$admtext['availnogif'] = "Available, but does not support .gif images";
< 		$admtext['notinst'] = "Not installed";
< 		$admtext['safemode'] = "Safe Mode";
< 		$admtext['off'] = "Off";
< 		$admtext['on'] = "On";
< 		$admtext['fileuploads'] = "File Uploads";
< 		$admtext['fureq'] = "(Required for web-based GEDCOM upload, image upload and other form functionality.)";
< 		$admtext['perm'] = "Permitted";
< 		$admtext['notperm'] = "Not permitted, use FTP instead";
< 		$admtext['sqlver'] = "MySQL version";
< 		$admtext['sqlreq'] = "(TNG requires 5.5 or higher.)";
< 		$admtext['wsrvr'] = "Webserver";
< 		$admtext['fperms'] = "File/Folder Permissions";
< 		$admtext['fpreq'] = "(TNG requires some files and folders to have special access rights.)";
< 		$admtext['scruser'] = "Script running as user:";
< 		$admtext['phpuser'] = "PHP reports it as user:";
< 		$admtext['usrprob'] = "You may not have the necessary level of file access to run TNG without problems if you use both FTP and the TNG admin functions to manage files.";
< 		$admtext['rofile'] = "File is read-only:";
< 		$admtext['rofolder'] = "Folder is read-only:";
< 		$admtext['publog'] = "Public log";
---
> 		$admtext['phpreq'] = "(TNG zahteva 5.3 ili viđu verziju.)";
> 		$admtext['gdlib'] = "GD grafi�ka bibljoteka";
> 		$admtext['gdreq'] = "(Potreban je za TNG-ov alat za kreiranje sli�ica.)";
> 		$admtext['availnogif'] = "Dostupno, ali ne podržava .gif slike";
> 		$admtext['notinst'] = "Nije instalirano";
> 		$admtext['safemode'] = "Bezbedni režim";
> 		$admtext['off'] = "Isklju�i";
> 		$admtext['on'] = "Uklju�i";
> 		$admtext['fileuploads'] = "Slanje Fajlova";
> 		$admtext['fureq'] = "(Potrebno za veb-bazirano GEDCOM slanje, slanje slika i druge funkcionalnosti.)";
> 		$admtext['perm'] = "Dozvoljeno";
> 		$admtext['notperm'] = "Nije dozvoljeno, umesto toga koristite FTP";
> 		$admtext['sqlver'] = "MySQL verzija";
> 		$admtext['sqlreq'] = "(TNG zahteva 5.5 ili viđu verziju.)";
> 		$admtext['wsrvr'] = "Web server";
> 		$admtext['fperms'] = "Prava na Fajlu/Folderu";
> 		$admtext['fpreq'] = "(TNG zahteva da neki fajlovi i fodleri imaju specijalna prava pristupa.)";
> 		$admtext['scruser'] = "Skripta se pokreće kao korisnik:";
> 		$admtext['phpuser'] = "PHP ga prijavljuje kao korisnik:";
> 		$admtext['usrprob'] = "Možda nemate potreban nivo pristupa datotekama za pokretanje TNG-a bez problema, ako koristite i FTP i TNG funkcije administratora za upravljanje datotekama.";
> 		$admtext['rofile'] = "Datoteka je samo za �itanje:";
> 		$admtext['rofolder'] = "Folder je samo za �itanje:";
> 		$admtext['publog'] = "Javni log fajl";
934,986c1027,1079
< 		$admtext['folderdne'] = "Folder does not exist:";
< 		$admtext['keyrw'] = "Key folders are all read/write";
< 		$admtext['cfgrw'] = "Configuration files are all read/write";
< 		$admtext['acceptable'] = "Acceptable.";
< 		$admtext['restricted'] = "Some functionality may be restricted. You may encounter errors during installation or while running TNG.";
< 		$admtext['needchngs'] = "TNG may not run without changes to your PHP or server configuration.";
< 		$admtext['yourbrowser'] = "Your browser:";
< 		$admtext['modifysettings'] = "Modify Configuration Settings";
< 		$admtext['dbhost'] = "Database Host";
< 		$admtext['dbname'] = "Database Name";
< 		$admtext['dbusername'] = "Database User Name";
< 		$admtext['dbpassword'] = "Database Password";
< 		$admtext['rootpath'] = "Root Path";
< 		$admtext['homepage'] = "Home Page";
< 		$admtext['emailaddress'] = "E-mail Address";
< 		$admtext['siteowner'] = "Site Owner";
< 		$admtext['maxdescgens'] = "Max Descendancy Generations";
< 		$admtext['disallow'] = "Disallow";
< 		$admtext['defaultallowed'] = "Default: Allowed";
< 		$admtext['maxsearchresults'] = "Max Search Results";
< 		$admtext['targetframe'] = "Target Frame";
< 		$admtext['table'] = "Table";
< 		$admtext['lastbackup'] = "Last Backup";
< 		$admtext['backup'] = "Back up";
< 		$admtext['restore'] = "Restore";
< 		$admtext['backupfilesize'] = "File Size";
< 		$admtext['succbackedup'] = "successfully backed up";
< 		$admtext['succrestored'] = "successfully restored";
< 		$admtext['change_cutoff'] = "'What's New' Days";
< 		$admtext['change_limit'] = "'What's New' Limit";
< 		$admtext['photosext'] = "Photos Extension";
< 		$admtext['defaulttree'] = "Default Tree";
< 		$admtext['requirelogin'] = "Require Login";
< 		$admtext['defaultdontrequire'] = "Default: Don't Require";
< 		$admtext['ldsdefault'] = "Show LDS Data";
< 		$admtext['ldson'] = "Always";
< 		$admtext['ldsoff'] = "Never";
< 		$admtext['ldspermit'] = "Depending on user rights";
< 		$admtext['allow'] = "Allow";
< 		$admtext['chooselang'] = "Dynamic Language Change";
< 		$admtext['optimize'] = "Optimize";
< 		$admtext['succoptimized'] = "successfully optimized";
< 		$admtext['customheader'] = "Custom Header";
< 		$admtext['customfooter'] = "Custom Footer";
< 		$admtext['custommeta'] = "Custom Meta";
< 		$admtext['lineending'] = "Line Ending";
< 		$admtext['backuppath'] = "Backup Folder";
< 		$admtext['photopath'] = "Photo Folder";
< 		$admtext['headstonepath'] = "Headstone Folder";
< 		$admtext['historypath'] = "History Folder";
< 		$admtext['backuprestoretables'] = "Back up, Restore &amp; Optimize Table Data";
< 		$admtext['shownames'] = "Show Names for Living";
< 		$admtext['initials'] = "Abbreviate first name";
---
> 		$admtext['folderdne'] = "Folder ne postoji:";
> 		$admtext['keyrw'] = "Klju�ne folderi su sve za �itanje / pisanje";
> 		$admtext['cfgrw'] = "Svi konfiguracijski fajlovi su za �itanje/pisanje";
> 		$admtext['acceptable'] = "Prihvatljivo.";
> 		$admtext['restricted'] = "Neke funkcije mogu biti ograni�ene. Možete naići na greške tokom instalacije ili dok radite TNG.";
> 		$admtext['needchngs'] = "TNG se možda neće pokrenuti bez promene konfiguracije PHP-a ili servera.";
> 		$admtext['yourbrowser'] = "Vaš pretraživa�:";
> 		$admtext['modifysettings'] = "Promenite postavke konfiguracije";
> 		$admtext['dbhost'] = "Naziv Host-a Baze Podataka";
> 		$admtext['dbname'] = "Naziv Baze podataka";
> 		$admtext['dbusername'] = "Korisni�ko ime Baze Podataka";
> 		$admtext['dbpassword'] = "Lozinka Baze Podataka";
> 		$admtext['rootpath'] = "Putanja za Koren";
> 		$admtext['homepage'] = "Po�etna stranica";
> 		$admtext['emailaddress'] = "E-mail Adresa";
> 		$admtext['siteowner'] = "Vlasnik sajta";
> 		$admtext['maxdescgens'] = "Maksimalan broj generacija potomaka";
> 		$admtext['disallow'] = "Odbaciti";
> 		$admtext['defaultallowed'] = "Podrazumevano: Dozvoljeno";
> 		$admtext['maxsearchresults'] = "Maksimalan broj Rezultata Pretrage";
> 		$admtext['targetframe'] = "Okvir Pretrage";
> 		$admtext['table'] = "Tabela";
> 		$admtext['lastbackup'] = "Poslednja Arhiva";
> 		$admtext['backup'] = "Arhiva";
> 		$admtext['restore'] = "Vraćanje Arhive";
> 		$admtext['backupfilesize'] = "Veli�ina fajla";
> 		$admtext['succbackedup'] = "uspešno napravljena rezervna kopija";
> 		$admtext['succrestored'] = "uspešno obnovljena rezevna kopija";
> 		$admtext['change_cutoff'] = "'Å ta je novo?' ovih Dana";
> 		$admtext['change_limit'] = "'Å ta je novo' Limit";
> 		$admtext['photosext'] = "Ekstenzije Fotografija";
> 		$admtext['defaulttree'] = "Podrazumevano Drvo";
> 		$admtext['requirelogin'] = "Potrebna je prijava na sajt";
> 		$admtext['defaultdontrequire'] = "Podrazumevano: Nije potrebno";
> 		$admtext['ldsdefault'] = "Prikaži LDS podatke";
> 		$admtext['ldson'] = "Uvek";
> 		$admtext['ldsoff'] = "Nikad";
> 		$admtext['ldspermit'] = "U zavisnosti od korisni�kih prava";
> 		$admtext['allow'] = "Dozvoljeno";
> 		$admtext['chooselang'] = "Dinami�ka promena Jezika";
> 		$admtext['optimize'] = "Optimizira";
> 		$admtext['succoptimized'] = "uspešno optimizovan";
> 		$admtext['customheader'] = "Prilagodljivo Zaglavlje";
> 		$admtext['customfooter'] = "Prilagodljivi Footer";
> 		$admtext['custommeta'] = "Prilagodljivi Meta podaci";
> 		$admtext['lineending'] = "Linija Završetka";
> 		$admtext['backuppath'] = "Folder Rezevnih Kopija";
> 		$admtext['photopath'] = "Folder Fotografija";
> 		$admtext['headstonepath'] = "Folder Nadgrobnih Spomenika";
> 		$admtext['historypath'] = "Folder Istorija";
> 		$admtext['backuprestoretables'] = "Napravite rezervnu kopiju, Vrati nazad rezevnu kopiju &amp; Optimizujte podatke tabele";
> 		$admtext['shownames'] = "Pokaži imena za Života";
> 		$admtext['initials'] = "Skraćeno Ime";
988,1006c1081,1099
< 		$admtext['stdformat'] = "Standard Format";
< 		$admtext['thumbprefix'] = "Thumbnails Prefix";
< 		$admtext['thumbmaxh'] = "Thumbnail Max Height";
< 		$admtext['thumbmaxw'] = "Thumbnail Max Width";
< 		$admtext['thumbsuffix'] = "Thumbnails Suffix";
< 		$admtext['showextended'] = "Show Extended Photo Info";
< 		$admtext['shownotes'] = "Show Notes";
< 		$admtext['notestogether'] = "Underneath corresponding events where possible";
< 		$admtext['notestogether2'] = "Underneath events, except general notes";
< 		$admtext['notesapart'] = "In Notes section";
< 		$admtext['lnprefixes'] = "Surname Prefixes (i.e., van, de)";
< 		$admtext['lntogether'] = "Keep as part of regular surname";
< 		$admtext['lnapart'] = "Treat as separate entity";
< 		$admtext['detectpfx'] = "Prefix Detection on Import";
< 		$admtext['lnpfxnum'] = "Num. prefixes each  (max)";
< 		$admtext['specpfx'] = "OR These specific prefixes";
< 		$admtext['newmedialinks'] = "New links for Photos/Histories";
< 		$admtext['maxgedcom'] = "Max Generations, GEDCOM download";
< 		$admtext['placestable'] = "Places Table";
---
> 		$admtext['stdformat'] = "Standardni format";
> 		$admtext['thumbprefix'] = "Prefiks Sli�ica";
> 		$admtext['thumbmaxh'] = "Maksimalna visina Sli�ice";
> 		$admtext['thumbmaxw'] = "Makimalna širina Sli�ice";
> 		$admtext['thumbsuffix'] = "Sufiks Sli�ica";
> 		$admtext['showextended'] = "Prikaži proširene informacije o fotografiji";
> 		$admtext['shownotes'] = "Prikaži napomene";
> 		$admtext['notestogether'] = "Pod odgovarajućim događajima gde je to moguće";
> 		$admtext['notestogether2'] = "Ispod događaja, osim opštih beleški";
> 		$admtext['notesapart'] = "U odeljku Beleške";
> 		$admtext['lnprefixes'] = "Prefiksi prezimena (npr., Van, de)";
> 		$admtext['lntogether'] = "ÄŒuvajte se kao deo redovnog prezimena";
> 		$admtext['lnapart'] = "Tretirajte kao poseban entitet";
> 		$admtext['detectpfx'] = "Detekcija Prefiksa pri uvozu";
> 		$admtext['lnpfxnum'] = "Num. prefiksi svaki (max)";
> 		$admtext['specpfx'] = "ILI Ovi specifi�ni prefiksi";
> 		$admtext['newmedialinks'] = "Novi linkovi za Fotografije/Istorije";
> 		$admtext['maxgedcom'] = "Maksimalni broj Generacija, GEDCOM preuzimanja";
> 		$admtext['placestable'] = "Tabele Mesta";
1008,1039c1101,1132
< 		$admtext['tngdomain'] = "Genealogy URL";
< 		$admtext['charset'] = "Character set";
< 		$admtext['time_offset'] = "Server time offset (hours)";
< 		$admtext['backupall'] = "Back up Selected";
< 		$admtext['optimizeall'] = "Optimize Selected";
< 		$admtext['alltables'] = "Selected Tables";
< 		$admtext['brinstructions'] = "To back up, restore or optimize a table, click on the appropriate action icon for that table, or select multiple tables and apply that action to all selected by clicking the corresponding button at the bottom of the screen.";
< 		$admtext['tabstyle'] = "Tabs Style Sheet";
< 		$admtext['iconloc'] = "Menu Location";
< 		$admtext['topleft'] = "Top left, over heading";
< 		$admtext['topright'] = "Top right, next to heading";
< 		$admtext['indstart'] = "Individuals start with";
< 		$admtext['persinfo'] = "Personal information only";
< 		$admtext['allinfo'] = "All information";
< 		$admtext['thumbcols'] = "Columns in Thumbnail View";
< 		$admtext['stdesc'] = "Start Descendancy";
< 		$admtext['stexpand'] = "Expanded";
< 		$admtext['stcollapse'] = "Collapsed";
< 		$admtext['regnosp'] = "Register Generations";
< 		$admtext['chshow'] = "Always show everyone";
< 		$admtext['chifsp'] = "Remove individuals with no family";
< 		$admtext['restoreall'] = "Restore Selected";
< 		$admtext['surerestore'] = "Are you sure you want to restore the selected tables?";
< 		$admtext['surerestorets'] = "Are you sure you want to restore the table structure? All existing data will be lost!";
< 		$admtext['backupstruct'] = "Back up Table Structure";
< 		$admtext['tablestruct'] = "Table structure";
< 		$admtext['brinstructions2'] = "To back up or restore the table structure, click on the appropriate action icon below. WARNING: Restoring the table structure will delete all existing data!";
< 		$admtext['livedefault'] = "Show Living Data";
< 		$admtext['nodisplay'] = "Do not display";
< 		$admtext['menudisp'] = "Display menu";
< 		$admtext['asicons'] = "As icons";
< 		$admtext['asdrop'] = "As dropdown list";
---
> 		$admtext['tngdomain'] = "URL Rodoslova";
> 		$admtext['charset'] = "Karakter Set";
> 		$admtext['time_offset'] = "Odstupanje vremena Servera (hours)";
> 		$admtext['backupall'] = "Vrati se na Izbarano";
> 		$admtext['optimizeall'] = "Optimizuj Izabrano";
> 		$admtext['alltables'] = "Izabrane Tabele";
> 		$admtext['brinstructions'] = "Da biste napravili rezervnu kopiju, obnovili ili optimizovali tabelu, kliknite na odgovarajuću ikonu akcije za tu tabelu ili izaberite više tabela i primenite tu akciju na sve izabrane tako što ćete izabrati odgovarajuću radnju na vrhu ekrana.";
> 		$admtext['tabstyle'] = "Tabs Stil Kartica";
> 		$admtext['iconloc'] = "Meni Lokacija";
> 		$admtext['topleft'] = "Gore levo, iznad naslova";
> 		$admtext['topright'] = "Gore desno, pored naslova";
> 		$admtext['indstart'] = "Pojedinci po�inju sa";
> 		$admtext['persinfo'] = "Samo li�ne informacije";
> 		$admtext['allinfo'] = "Sve informacije";
> 		$admtext['thumbcols'] = "Kolone u prikazu sli�ica/minijatura";
> 		$admtext['stdesc'] = "Start Potomaka";
> 		$admtext['stexpand'] = "Proširiti";
> 		$admtext['stcollapse'] = "Sažeti";
> 		$admtext['regnosp'] = "Registar Generacija";
> 		$admtext['chshow'] = "Uvek pokažite svima";
> 		$admtext['chifsp'] = "Uklonite osobe bez porodice";
> 		$admtext['restoreall'] = "Povraćaj izabranog";
> 		$admtext['surerestore'] = "Da li ste sigurni da želite da vratite izabrane tabele?";
> 		$admtext['surerestorets'] = "Da li ste sigurni da želite da vratite strukturu tabele? Svi postojeći podaci će biti izgubljeni!";
> 		$admtext['backupstruct'] = "Napravite rezervnu strukturu tabele";
> 		$admtext['tablestruct'] = "Struktura Tabele";
> 		$admtext['brinstructions2'] = "Da biste napravili rezervnu kopiju ili obnovili strukturu tabele, kliknite na odgovarajuću ikonu akcije ispod. UPOZORENjE: Vraćanje strukture tabele će izbrisati sve postojeće podatke!";
> 		$admtext['livedefault'] = "Prikaži podatke o Živima";
> 		$admtext['nodisplay'] = "Ne prikazujte";
> 		$admtext['menudisp'] = "Meniji za prikaz";
> 		$admtext['asicons'] = "Kao ikone";
> 		$admtext['asdrop'] = "Kao padajuća lista";
1041,1128c1134,1221
< 		$admtext['modifypedsettings'] = "Modify Pedigree Configuration Settings";
< 		$admtext['leftindent'] = "Left Indent";
< 		$admtext['boxnamesize'] = "Box Name Size";
< 		$admtext['namesizeshift'] = "Name Size Shift";
< 		$admtext['boxdatessize'] = "Box Dates Size";
< 		$admtext['datessizeshift'] = "Dates Size Shift";
< 		$admtext['boxcolor'] = "Box Color";
< 		$admtext['colorshift'] = "Color Shift (%)";
< 		$admtext['emptycolor'] = "Empty Color";
< 		$admtext['bordercolor'] = "Border Color";
< 		$admtext['shadowcolor'] = "Shadow Color";
< 		$admtext['boxwidth'] = "Box Width (w/o popups)";
< 		$admtext['boxheight'] = "Box Height (w/o popups)";
< 		$admtext['boxalign'] = "Box Alignment (w/o popups)";
< 		$admtext['boxheightshift'] = "Box Height Shift (w/o popups)";
< 		$admtext['boxHsep'] = "Box Horizontal Separation";
< 		$admtext['boxVsep'] = "Box Vertical Separation";
< 		$admtext['shadowoffset'] = "Shadow Offset";
< 		$admtext['linewidth'] = "Line Width";
< 		$admtext['borderwidth'] = "Border Width";
< 		$admtext['popupcolor'] = "Popup Color";
< 		$admtext['popupinfosize'] = "Popup Info Size";
< 		$admtext['popupinfosizeshift'] = "Popup Info Size Shift";
< 		$admtext['popuptimer'] = "Popup Timer (ms)";
< 		$admtext['pedevent'] = "Popup Event";
< 		$admtext['puboxwidth'] = "Box Width (w/popups)";
< 		$admtext['puboxheight'] = "Box Height (w/popups)";
< 		$admtext['puboxalign'] = "Box Alignment (w/popups)";
< 		$admtext['puboxheightshift'] = "Box Height Shift (w/popups)";
< 		$admtext['popupspouses'] = "Popup Spouses";
< 		$admtext['popupkids'] = "Popup Children";
< 		$admtext['popupchartlinks'] = "Popup Chart Links";
< 		$admtext['inclphotos'] = "Include Photos";
< 		$admtext['overflow'] = "Overflow";
< 		$admtext['pedcompact'] = "Compact";
< 		$admtext['pedstandard'] = "Standard";
< 		$admtext['pedtextonly'] = "Text Only";
< 		$admtext['relchart'] = "Relationship Chart";
< 		$admtext['maxupgen'] = "Max Relationship Generations";
< 		$admtext['left'] = "Left";
< 		$admtext['right'] = "Right";
< 		$admtext['center'] = "Center";
< 		$admtext['mouseover'] = "Mouse Over";
< 		$admtext['mousedown'] = "Mouse Down";
< 		$admtext['ahnentafel'] = "Ahnentafel";
< 		$admtext['pedbox'] = "Box";
< 		$admtext['hideempty'] = "Hide Empty Boxes";
< 		$admtext['logfilename'] = "Log File Name";
< 		$admtext['maxloglines'] = "Max Log Lines";
< 		$admtext['modifylogsettings'] = "Modify Log Configuration Settings";
< 		$admtext['badhosts'] = "Exclude Host Names";
< 		$admtext['admin'] = "Admin";
< 		$admtext['text_public'] = "(Public)";
< 		$admtext['saveimportstate'] = "Save Import State";
< 		$admtext['allowresume'] = "Save to allow resume if import fails";
< 		$admtext['modifyimportsettings'] = "Modify Import Configuration Settings";
< 		$admtext['embeddedmedia'] = "Embedded Media";
< 		$admtext['assignnames'] = "Allow TNG to assign names to embedded media";
< 		$admtext['localphotopath'] = "Local Photo Path(s)";
< 		$admtext['localdocpath'] = "Local History Path(s)";
< 		$admtext['nopathmatch'] = "If no local path match";
< 		$admtext['wholepath'] = "Import entire path";
< 		$admtext['justname'] = "Import file name only";
< 		$admtext['gedpath'] = "GEDCOM Folder (Import/Export)";
< 		$admtext['makefolder'] = "Make Folder";
< 		$admtext['blankchangedt'] = "If 'Change Date' is blank";
< 		$admtext['usetoday'] = "Use current date";
< 		$admtext['useblank'] = "Leave it as is";
< 		$admtext['nobirthdate'] = "If no birth date, assume";
< 		$admtext['persliving'] = "Person is living";
< 		$admtext['persdead'] = "Person is deceased";
< 		$admtext['nodeathdate'] = "If no death date, assume deceased<br />if older than";
< 		$admtext['pedconfigsettings'] = "Pedigree Settings";
< 		$admtext['usepopups'] = "Initial Display";
< 		$admtext['maxpedgens'] = "Max Pedigree Generations";
< 		$admtext['dbsection'] = "Database";
< 		$admtext['tablesection'] = "Table Names";
< 		$admtext['foldersection'] = "Paths and Folders";
< 		$admtext['sitesection'] = "Site Design and Definition";
< 		$admtext['privsection'] = "Privacy";
< 		$admtext['namesection'] = "Names";
< 		$admtext['descsection'] = "Descendancy";
< 		$admtext['miscsection'] = "Miscellaneous";
< 		$admtext['mediatable'] = "Media Table";
< 		$admtext['pedanddesc'] = "Common Elements";
< 		$admtext['descchart'] = "Descendancy Chart";
< 		$admtext['pedchart'] = "Pedigree Chart";
< 		$admtext['initgens'] = "Initial Generations";
---
> 		$admtext['modifypedsettings'] = "Izmenite postavke konfiguracije Rodoslova/Pedigree";
> 		$admtext['leftindent'] = "Levo uvlaćenje";
> 		$admtext['boxnamesize'] = "Veli�ina imena kutije";
> 		$admtext['namesizeshift'] = "Veli�ina imena Shift";
> 		$admtext['boxdatessize'] = "Veli�ina datuma kutije";
> 		$admtext['datessizeshift'] = "Veli�ina datuma Shift";
> 		$admtext['boxcolor'] = "Boja kutije";
> 		$admtext['colorshift'] = "Boja Shift (%)";
> 		$admtext['emptycolor'] = "Bez Boje";
> 		$admtext['bordercolor'] = "BBoja Okvira";
> 		$admtext['shadowcolor'] = "Boja Senke";
> 		$admtext['boxwidth'] = "Å irina kutije (w/o popups)";
> 		$admtext['boxheight'] = "Visina kutije (w/o popups)";
> 		$admtext['boxalign'] = "Poravnanje kutije (w/o popups)";
> 		$admtext['boxheightshift'] = "Visina kutije Shift (w/o popups)";
> 		$admtext['boxHsep'] = "Horizontalna separacija kutije";
> 		$admtext['boxVsep'] = "Vertikalna separacija kutije";
> 		$admtext['shadowoffset'] = "Nagib Senke";
> 		$admtext['linewidth'] = "Å irina Linije";
> 		$admtext['borderwidth'] = "Å irina Okvira";
> 		$admtext['popupcolor'] = "Popup Boja";
> 		$admtext['popupinfosize'] = "'Popup' Veli�ina Informacija";
> 		$admtext['popupinfosizeshift'] = "'Popup' Veli�ina Informacija Shift";
> 		$admtext['popuptimer'] = "'Popup' Vremenska linija (ms)";
> 		$admtext['pedevent'] = "'Popup' Događaj";
> 		$admtext['puboxwidth'] = "Å irina kutije (w/popups)";
> 		$admtext['puboxheight'] = "Visina kutije (w/popups)";
> 		$admtext['puboxalign'] = "Poravnanje (w/popups)";
> 		$admtext['puboxheightshift'] = "Visina okvira Shift (w/popups)";
> 		$admtext['popupspouses'] = "'Popup' prozor Supružnika";
> 		$admtext['popupkids'] = "'Popup' prozor Deteta";
> 		$admtext['popupchartlinks'] = "Linkovi 'Popup' Grafikona";
> 		$admtext['inclphotos'] = "Uklju�i Fotografije";
> 		$admtext['overflow'] = "Prelivanje";
> 		$admtext['pedcompact'] = "Zbijeni prikaz";
> 		$admtext['pedstandard'] = "Standardni prikaz";
> 		$admtext['pedtextonly'] = "Samo Tekst";
> 		$admtext['relchart'] = "Grafikon Srodstva";
> 		$admtext['maxupgen'] = "Maksimalni broj Povezanih Generacija";
> 		$admtext['left'] = "Levo";
> 		$admtext['right'] = "Desno";
> 		$admtext['center'] = "Centar";
> 		$admtext['mouseover'] = "Miš na Gore";
> 		$admtext['mousedown'] = "Miš na Dole";
> 		$admtext['ahnentafel'] = "Pedigre";
> 		$admtext['pedbox'] = "Kutija";
> 		$admtext['hideempty'] = "Sakrij prazne Kutije";
> 		$admtext['logfilename'] = "Ime Log fajla";
> 		$admtext['maxloglines'] = "Maksimalan broj Log linija";
> 		$admtext['modifylogsettings'] = "Promenite postavke Log Podešavanja";
> 		$admtext['badhosts'] = "Izuzmi Imena Hostova";
> 		$admtext['admin'] = "(Admin)";
> 		$admtext['text_public'] = "(Javan)";
> 		$admtext['saveimportstate'] = "Snimi Uvoz Država";
> 		$admtext['allowresume'] = "Sa�uvajte da biste dozvolili nastavak ako uvoz ne uspe";
> 		$admtext['modifyimportsettings'] = "Izmenite postavke Podešavanja Uvoza";
> 		$admtext['embeddedmedia'] = "Ugrađenim Mediji";
> 		$admtext['assignnames'] = "Dozvolite TNG-u da dodeli imena ugrađenim medijima";
> 		$admtext['localphotopath'] = "Putanja lokalne Fotografije";
> 		$admtext['localdocpath'] = "Putanja lokalne Istorije";
> 		$admtext['nopathmatch'] = "Ako ne postoji poklapanje lokalne putanje";
> 		$admtext['wholepath'] = "Uvezite celu putanju";
> 		$admtext['justname'] = "Uvezite samo ime datoteke";
> 		$admtext['gedpath'] = "GEDCOM Folder (Uvoz/Izvoz)";
> 		$admtext['makefolder'] = "Kreiraj Folder";
> 		$admtext['blankchangedt'] = "Ako je 'Promeni datum' prazan";
> 		$admtext['usetoday'] = "Koristi trenutni datum";
> 		$admtext['useblank'] = "Ostavi to kao Å¡to je";
> 		$admtext['nobirthdate'] = "Ako nema datuma rođenja, pretpostavite";
> 		$admtext['persliving'] = "Osoba je živa";
> 		$admtext['persdead'] = "Osoba je preminula";
> 		$admtext['nodeathdate'] = "Ako nema datuma smrti, pretpostavite da je umrli<br/>ako je stariji od";
> 		$admtext['pedconfigsettings'] = "Podešavanja Grafikona";
> 		$admtext['usepopups'] = "Inicijalni Prikaz";
> 		$admtext['maxpedgens'] = "Maksimalni broj Generacija";
> 		$admtext['dbsection'] = "Baza Podataka";
> 		$admtext['tablesection'] = "Nazivi Tabela";
> 		$admtext['foldersection'] = "Putanje i Folderi";
> 		$admtext['sitesection'] = "Dizajn Sajta i Definicije";
> 		$admtext['privsection'] = "Privatnost";
> 		$admtext['namesection'] = "Nazivi";
> 		$admtext['descsection'] = "Potomci";
> 		$admtext['miscsection'] = "Ostala podešavanja";
> 		$admtext['mediatable'] = "Medija Tabela";
> 		$admtext['pedanddesc'] = "Zajedni�ki Elementi";
> 		$admtext['descchart'] = "Grafikon Potomaka";
> 		$admtext['pedchart'] = "Rodoslovni Grafikon";
> 		$admtext['initgens'] = "Inicijalne Generacije";
1130,1142c1223,1235
< 		$admtext['documentpath'] = "Document Folder";
< 		$admtext['localdocumentpath'] = "Local Document Path(s)";
< 		$admtext['localotherpath'] = "Local Path(s) for Other Media";
< 		$admtext['imgmaxh'] = "Image Max Height";
< 		$admtext['imgmaxw'] = "Image Max Width";
< 		$admtext['succdel'] = "successfully deleted";
< 		$admtext['delbkups'] = "Delete Selected Backups";
< 		$admtext['suredelbk'] = "Are you sure you want to delete the selected backups?";
< 		$admtext['showhome'] = "Show Home Link";
< 		$admtext['showsearch'] = "Show Search Link";
< 		$admtext['showlogin'] = "Show Login/Logout Link";
< 		$admtext['showprint'] = "Show Print Link";
< 		$admtext['showbmarks'] = "Show Add Bookmark Link";
---
> 		$admtext['documentpath'] = "Dokument Folder";
> 		$admtext['localdocumentpath'] = "Putanja lokalnih Dokumenata";
> 		$admtext['localotherpath'] = "Lokalni/e put(anje) za druge Medije";
> 		$admtext['imgmaxh'] = "Maksimalna Visina Slike";
> 		$admtext['imgmaxw'] = "Maksimalna Å irina Slike";
> 		$admtext['succdel'] = "uspešno izbrisano";
> 		$admtext['delbkups'] = "Izbriši izabrane rezervne Kopije/Backups";
> 		$admtext['suredelbk'] = "Jeste li sigurni da želite izbrisati odabrane sigurnosne Kopije/Backups?";
> 		$admtext['showhome'] = "Prikaži link za Po�etnu stranicu";
> 		$admtext['showsearch'] = "Prikaži linkove za Pretraživanja";
> 		$admtext['showlogin'] = "Prikaži linkove Prijave/Odjave";
> 		$admtext['showprint'] = "Prikaži link za Štampanje";
> 		$admtext['showbmarks'] = "Prikaži linkoove za dodavanje Bookmark-a";
1144,1261c1237,1352
< 		$admtext['client'] = "(client)";
< 		$admtext['sitename'] = "Site Name";
< 		$admtext['site_desc'] = "Site Description";
< 		$admtext['privnote'] = "Prefix for private notes";
< 		$admtext['custvars'] = "Note: You may create your own custom settings in \"customconfig.php\" (open in a text editor and follow the instructions).";
< 		$admtext['blockemail'] = "Block suggestions or new user registrations where";
< 		$admtext['addrcontains'] = "Address contains";
< 		$admtext['msgcontains'] = "Message contains";
< 		$admtext['reqloginset'] = "\"Require Login\" must be set to Yes to enable this option";
< 		$admtext['treerestrict'] = "Restrict access to assigned tree";
< 		$admtext['mapconfigsettings'] = "Map Settings";
< 		$admtext['modifymapsettings'] = "Modify Map Configuration Settings";
< 		$admtext['maptype'] = "Map Type";
< 		$admtext['maphybrid'] = "Hybrid";
< 		$admtext['mapsatellite'] = "Satellite";
< 		$admtext['mapdimsind'] = "Dimensions, Individual Page";
< 		$admtext['mapdimshst'] = "Dimensions, Headstones Pages";
< 		$admtext['mapdimsadm'] = "Dimensions, Admin Pages";
< 		$admtext['mapwidth'] = "Width (% or px)";
< 		$admtext['mapheight'] = "Height (px)";
< 		$admtext['mapstlat'] = "Starting Latitude";
< 		$admtext['mapstlong'] = "Starting Longitude";
< 		$admtext['startoff'] = "Hide Admin Maps to Start";
< 		$admtext['conslpins'] = "Consolidate Duplicate Pins";
< 		$admtext['ssenabled'] = "Enable Slide Show";
< 		$admtext['ssrepeat'] = "Slide Show Auto Repeat";
< 		$admtext['sysinfo'] = "Display information about your web site environment.";
< 		$admtext['albumlinkstable'] = "Album Links Table";
< 		$admtext['addresstable'] = "Addresses Table";
< 		$admtext['statestable'] = "States Table";
< 		$admtext['countriestable'] = "Countries Table";
< 		$admtext['notelinkstable'] = "Note Links Table";
< 		$admtext['medialinkstable'] = "Media Links Table";
< 		$admtext['saveimporttable'] = "Save Import Table";
< 		$admtext['brlinkstable'] = "Branch Links Table";
< 		$admtext['temptable'] = "Temp Events Table";
< 		$admtext['tleventstable'] = "Timeline Events Table";
< 		$admtext['album2entitiestable'] = "Album Links";
< 		$admtext['doctype'] = "Doctype Declaration";
< 		$admtext['cemrows'] = "Max lines per column (approx.)";
< 		$admtext['cemblanks'] = "Suppress \"Unknown\" categories";
< 		$admtext['success'] = "Success";
< 		$admtext['fexists'] = "Failed. Folder already exists.";
< 		$admtext['fmanual'] = "Failed. Please create using an FTP program or online file manager.";
< 		$admtext['maintmode'] = "Maintenance Mode";
< 		$admtext['maintexp'] = "All database access is temporarily unavailable for site maintenance. Please try again later. If regular functions do not resume within a few hours of first seeing this message, please contact the site administrator.";
< 		$admtext['defimpopt'] = "Default Replace Option";
< 		$admtext['seltable'] = "Please select at least one table.";
< 		$admtext['renumber'] = "Resequence IDs";
< 		$admtext['idtype'] = "ID Type";
< 		$admtext['mindigits'] = "Minimum Digits";
< 		$admtext['niprefix'] = "Not including ID prefix";
< 		$admtext['finreseq'] = "Finished resequencing";
< 		$admtext['recsreseq'] = "records resequenced";
< 		$admtext['needmaint'] = "You must be in Maintenance Mode to run this utility (go to Setup &gt;&gt; Configuration &gt;&gt; General Settings)";
< 		$admtext['reseqwarn'] = "<strong>WARNING:</strong> Resequencing your IDs could cause external links to your site to break or point to erroneous locations.";
< 		$admtext['subroot'] = "Subroot Path";
< 		$admtext['hidechr'] = "Hide Christening Labels";
< 		$admtext['datefmt'] = "Numeric Date Preference";
< 		$admtext['dayfirst'] = "Day/Month/Year";
< 		$admtext['monthfirst'] = "Month/Day/Year";
< 		$admtext['exusers'] = "Exclude Usernames";
< 		$admtext['allowreg'] = "Allow new user registrations";
< 		$admtext['localhspath'] = "Local Headstone Path(s)";
< 		$admtext['pardata'] = "Parental data on person page:";
< 		$admtext['pnoevents'] = "Don't show any events";
< 		$admtext['pstdonly'] = "Show only standard family events";
< 		$admtext['palldata'] = "Show all events and media";
< 		$admtext['servertime'] = "Server time is";
< 		$admtext['sitetime'] = "and site time is";
< 		$admtext['srexpl'] = "Optional. Use an absolute path name, like what you see in the Root Path, then move the following files to the Config Path <strong>immediately</strong> after saving and make them writeable (664 permissions): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
< 		$admtext['mapstzm'] = "Starting Zoom";
< 		$admtext['mapfoundzm'] = "Location Zoom";
< 		$admtext['rrnum'] = "Record Report Number";
< 		$admtext['progint'] = "Progress Interval (ms)";
< 		$admtext['timechart'] = "Timeline Chart";
< 		$admtext['tcheight'] = "Chart height";
< 		$admtext['distances'] = "All distances measured in pixels.";
< 		$admtext['mpixels'] = "Pixels between months";
< 		$admtext['ypixels'] = "Pixels between years";
< 		$admtext['ymult'] = "Years between year markers";
< 		$admtext['mpct'] = "Vertical percentage for months";
< 		$admtext['ypct'] = "Vertical percentage for years";
< 		$admtext['inclevs'] = "Events to include";
< 		$admtext['allevs'] = "All events";
< 		$admtext['rangeevs'] = "Only events that fall within the lifespans of the people on the chart";
< 		$admtext['tcwidth'] = "Starting chart width";
< 		$admtext['simile'] = "Enable Simile timeline";
< 		//added in 8.0.0
< 		$admtext['pstartoff'] = "Hide Public Maps to Start";
< 		$admtext['maxrels'] = "Max Relationships";
< 		$admtext['initrels'] = "Initial Relationships";
< 		$admtext['templateconfigsettings'] = "Template Settings";
< 		$admtext['modifytemplatesettings'] = "Modify Template Configuration Settings";
< 		$admtext['ucsurnames'] = "Uppercase All Surnames";
< 		$admtext['maxnoteprev'] = "Max characters in list notes";
< 		$admtext['mailreg'] = "Mail and Registration";
< 		$admtext['autoapp'] = "Auto approve new users";
< 		$admtext['inclpwd'] = "Include password in welcome email";
< 		$admtext['ackemail'] = "Send acknowledgement email";
< 		$admtext['fromadmin'] = "Send all mail from address above";
< 		$admtext['autotree'] = "Create new tree for user";
< 		$admtext['modspath'] = "Mods Folder";
< 		$admtext['extspath'] = "Extensions Folder";
< 		$admtext['encrtype'] = "Encryption type";
< 		$admtext['none'] = "No encryption";
< 		$admtext['imgviewer'] = "Enable image viewer";
< 		$admtext['docsonly'] = "Documents only";
< 		$admtext['imgvheight'] = "Image viewer height";
< 		$admtext['flex'] = "Always show full image";
< 		$admtext['setheight'] = "Fixed (640px)";
< 		//added in 9.0.0
< 		$admtext['places1tree'] = "Assign Place records to Trees";
< 		$admtext['convert'] = "Convert";
< 		$admtext['convexpl'] = "(This will assign all current places to the selected tree)";
< 		$admtext['mergeexpl'] = "(This will remove the tree assignment from all Place records)";
<         $admtext['nocutoff'] = "Leave blank or set to zero to remove this limit";
<         $admtext['usesmtp'] = "Use SMTP authentication";
---
> 		$admtext['client'] = "(klijent)";
> 		$admtext['sitename'] = "Naziv Sajta";
> 		$admtext['site_desc'] = "Opis Sajta";
> 		$admtext['privnote'] = "Prefiks za privatne beleške";
> 		$admtext['custvars'] = "Beleška: Možete da kreirate sopstvena prilagođena podešavanja \"customconfig.php\" (otvorite u uređiva�u teksta i pratite uputstva).";
> 		$admtext['blockemail'] = "Blokirajte predloge ili registracije novih korisnika gde";
> 		$admtext['addrcontains'] = "Adresa sadrži";
> 		$admtext['msgcontains'] = "Poruka sadrži";
> 		$admtext['reqloginset'] = "\"Potrebno Prijavljivalje na sajtu\" mora biti postavljeno na Da da biste omogućili ovu opciju";
> 		$admtext['treerestrict'] = "Ograni�ite pristup dodeljenom rodoslovnom stablu Restrict access to assigned tree";
> 		$admtext['mapconfigsettings'] = "Podešavanje Mape";
> 		$admtext['modifymapsettings'] = "Izmenite postavke konfiguracije mape";
> 		$admtext['maptype'] = "Tip Mape";
> 		$admtext['maphybrid'] = "Hibrid";
> 		$admtext['mapsatellite'] = "Satelit";
> 		$admtext['mapdimsind'] = "Dimenzije, Individualne osobe Stranice";
> 		$admtext['mapdimshst'] = "Dimenzije, Nadgrobni spomenik Stranice";
> 		$admtext['mapdimsadm'] = "Dimenzije, Admin Stranice";
> 		$admtext['mapwidth'] = "Å irina (% ili px)";
> 		$admtext['mapheight'] = "Visina (px)";
> 		$admtext['mapstlat'] = "Start geografske Å¡irine/latitude";
> 		$admtext['mapstlong'] = "Start geografske dužine/longitutude";
> 		$admtext['startoff'] = "Sakrij mape administratora za Po�etak";
> 		$admtext['conslpins'] = "Objedinite duple Pinove";
> 		$admtext['ssenabled'] = "Omogući prikazivanje slajdova";
> 		$admtext['ssrepeat'] = "Automatsko ponavljanje slajdova";
> 		$admtext['sysinfo'] = "Informacije o okruženju vašeg veb sajta.";
> 		$admtext['albumlinkstable'] = "Album Medija";
> 		$admtext['addresstable'] = "Adrese";
> 		$admtext['statestable'] = "Države";
> 		$admtext['countriestable'] = "Države";
> 		$admtext['notelinkstable'] = "Linkovi Beleški";
> 		$admtext['medialinkstable'] = "Linkovi Medija";
> 		$admtext['saveimporttable'] = "Snimi Uvoz";
> 		$admtext['brlinkstable'] = "Linkovi Rodoslovnih Grana";
> 		$admtext['temptable'] = "Privremeni Događaji";
> 		$admtext['tleventstable'] = "Vremeplov";
> 		$admtext['album2entitiestable'] = "Linkovi Albuma";
> 		$admtext['doctype'] = "Doctype Deklaracije";
> 		$admtext['cemrows'] = "Maksimalni broj linija po koloni (približno)";
> 		$admtext['cemblanks'] = "Potisnite \"Nepoznate\" kategorije";
> 		$admtext['success'] = "Uspelo";
> 		$admtext['fexists'] = "Neuspeh. Folder već postoji.";
> 		$admtext['fmanual'] = "Neuspeh. Molimo kreirajte pomoću FTP programa ili online file manager.";
> 		$admtext['maintmode'] = "Mod Održavanja";
> 		$admtext['maintexp'] = "Pristup bazi podataka je privremeno nedostupan za održavanje sajta. Pokušajte ponovo kasnije. Ako se redovne funkcije ne nastave u roku od nekoliko sati od prvog prikazivanja ove poruke, obratite se administratoru sajta.";
> 		$admtext['defimpopt'] = "Podrazumevana Opcija Zamene";
> 		$admtext['seltable'] = "Izaberite najmanje jednu tabelu.";
> 		$admtext['renumber'] = "ID-vi Resekvence";
> 		$admtext['idtype'] = "ID Tip";
> 		$admtext['mindigits'] = "Minimum Cifara";
> 		$admtext['niprefix'] = "Ne uklju�uje ID prefiks";
> 		$admtext['finreseq'] = "Završeno je resekvenciranje";
> 		$admtext['recsreseq'] = "resekvencirani zapisi";
> 		$admtext['needmaint'] = "Morate biti u modu održavanja da biste pokrenuli ovaj uslužni program (idite na Setup &gt;&gt; Configuration &gt;&gt; General Settings)";
> 		$admtext['reseqwarn'] = "<strong>UPOZORENjE:</strong> Ponovno postavljanje ID-ova može dovesti do toga da eksterne veze na vašu veb-lokaciju se prekinu ili pokažu na pogrešne lokacije.";
> 		$admtext['subroot'] = "Config Putanja";
> 		$admtext['hidechr'] = "Sakrij labele za Krštenja";
> 		$admtext['datefmt'] = "Prvenstvo Numeri�kog Datuma";
> 		$admtext['dayfirst'] = "Dan/Mesec/Godina";
> 		$admtext['monthfirst'] = "Mesec/Dan/Godina";
> 		$admtext['exusers'] = "Izuzmi korisni�ka imena";
> 		$admtext['allowreg'] = "Dozvolite nove registracije korisnika";
> 		$admtext['localhspath'] = "Lokalni put(evi) nadgrobnog spomenika";
> 		$admtext['pardata'] = "Roditeljski podaci na stranici osobe:";
> 		$admtext['pnoevents'] = "Ne prikazuj nikakve događaje";
> 		$admtext['pstdonly'] = "Prikažite samo standardne porodi�ne događaje";
> 		$admtext['palldata'] = "Prikaži sve događaje i medije";
> 		$admtext['servertime'] = "Vreme na serveru je";
> 		$admtext['sitetime'] = "i vreme na sajtu je";
> 		$admtext['srexpl'] = "Opciono. Koristite apsolutno ime putanje, kao ono što vidite na Root putanji, a zatim premestite sledeće fajlove na Config Putanji <strong>odmah</strong> nakon snimanja i u�inite ih zapisivima (664 dozvole): config.php, customconfig.php, importconfig.php, logconfig.php, mapconfig.php, mmconfig.php, pedconfig.php";
> 		$admtext['mapstzm'] = "Startuj Uvećanje";
> 		$admtext['mapfoundzm'] = "Uvećaj Lokaciju na mapi";
> 		$admtext['rrnum'] = "Snimite broj izveštaja";
> 		$admtext['progint'] = "Interval progresa/napretka (ms)";
> 		$admtext['timechart'] = "Vremensko linijski Grafikon";
> 		$admtext['tcheight'] = "Visina grafikona";
> 		$admtext['distances'] = "Sve udaljenosti izmerene u pikselima.";
> 		$admtext['mpixels'] = "Pikseli između meseci";
> 		$admtext['ypixels'] = "Pikseli između godina";
> 		$admtext['ymult'] = "Godine između godina markera";
> 		$admtext['mpct'] = "Vertikalni procenat za mesece";
> 		$admtext['ypct'] = "Vertikalni procenat za godine";
> 		$admtext['inclevs'] = "Događaji koji se uklju�uju";
> 		$admtext['allevs'] = "Svi događaji";
> 		$admtext['rangeevs'] = "Samo događaji koji spadaju u životni vek ljudi na grafikonu";
> 		$admtext['tcwidth'] = "Å irina startne karte";
> 		$admtext['simile'] = "Omogući vremensku liniju Poređenja";
> 		$admtext['pstartoff'] = "Sakrij Javne Mape za Po�etak";
> 		$admtext['maxrels'] = "Maksimalni Odnosi/Veze";
> 		$admtext['initrels'] = "Inicijalni Odnosi/Veze";
> 		$admtext['templateconfigsettings'] = "Postavke Å ablona";
> 		$admtext['modifytemplatesettings'] = "Izmenite postavke konfiguracije Å ablona";
> 		$admtext['ucsurnames'] = "Velika slova u svim Prezimenima";
> 		$admtext['maxnoteprev'] = "Maksimalni broj znakova u listama";
> 		$admtext['mailreg'] = "Mail i Registracija";
> 		$admtext['autoapp'] = "Automatski odobri nove korisnike";
> 		$admtext['inclpwd'] = "Uklju�ite lozinku u pozdravnu poruku";
> 		$admtext['ackemail'] = "Pošalji potvrdu e-pošte";
> 		$admtext['fromadmin'] = "Pošaljite svu poštu sa gornje adrese";
> 		$admtext['autotree'] = "Kreirajte novo rodoslovno stablo za korisnika";
> 		$admtext['modspath'] = "Folder Modova";
> 		$admtext['extspath'] = "Ekstenzija Foldera";
> 		$admtext['encrtype'] = "Tip Å ifriranja";
> 		$admtext['none'] = "Bez Å ifriranja";
> 		$admtext['imgviewer'] = "Omogući pregleda� slika";
> 		$admtext['docsonly'] = "Samo dokumenti";
> 		$admtext['imgvheight'] = "Visina pregleda�a slika";
> 		$admtext['flex'] = "Uvek prikaži punu sliku";
> 		$admtext['setheight'] = "Fiksirano (640px)";
> 		$admtext['places1tree'] = "Dodeli zapise mesta na Rodoslovna Stabla";
> 		$admtext['convert'] = "Pretvoriti";
> 		$admtext['convexpl'] = "(Ovo će dodeliti sva trenutna mesta izabranom rodoslovnom stablu)";
> 		$admtext['mergeexpl'] = "(Ovo će ukloniti dodeljena rodoslovna stabla sa svih mesta zapisa)";
>         $admtext['nocutoff'] = "Ostavite prazno ili postavite na nulu da biste uklonili ovo ograni�enje";
>         $admtext['usesmtp'] = "Koristite SMTP autentifikaciju";
1263,1300c1354,1386
<         $admtext['mailuser'] = "Mail username";
<         $admtext['mailpass'] = "Mail password";
<         $admtext['mailport'] = "Port number";
< 		$admtext['showshare'] = "Show Share Link";
< 		$admtext['defpgsize'] = "Default PDF Page Size";
< 		$admtext['mapterrain'] = "Terrain";
< 		$admtext['maproadmap'] = "Road Map";
< 		$admtext['usedefthumbs'] = "Use default thumbnails";
<         $admtext['autogeo'] = "Geocode all new places";
<         $admtext['revmail'] = "Notify on reviewable submissions";
<         $admtext['assumepriv'] = "Assume private if not dead this many years";
<         $admtext['calstart'] = "First day of week";
< 		$admtext['edit_timeout'] = "Edit timeout (minutes)";
< 		$admtext['shownamespr'] = "Show Names for Private";
< 		$admtext['tables'] = "Tables";
< 		//changed in 10.0.0
< 		$admtext['regnotes'] = "Show Notes on Register";
< 		//added in 10.0.0
< 		$admtext['collation'] = "Collation";
< 		$admtext['collationexpl'] = "(leave blank to accept the default)";
< 		$admtext['scrollcite'] = "Scroll citations";
< 		$admtext['hidemedia'] = "Hide personal media";
< 		$admtext['searchchoice'] = "Search Link Destination";
< 		$admtext['quicksearch'] = "Quick Search";
< 		$admtext['advsearch'] = "Advanced Search";
< 		$admtext['pedvertical'] = "Vertical";
< 		$admtext['vboxwidth'] = "Box Width";
< 		$admtext['vboxheight'] = "Box Height";
< 		$admtext['vspacing'] = "Spacing";
< 		$admtext['vchart'] = "Vertical Chart";
< 		//added in 10.1.0
< 		$admtext['reuseids'] = "Re-use deleted IDs";
< 		$admtext['lastimport'] = "Show last import";
< 		//added in 10.1.2
<         $admtext['mailenc'] = "Encryption";
<         //added in 11.0.0
< 		$admtext['dbport'] = "Database Port";
< 		$admtext['dbsocket'] = "Database Socket";
---
>         $admtext['mailuser'] = "Korisni�ki nalog Maila";
>         $admtext['mailpass'] = "Lozinka Maila";
>         $admtext['mailport'] = "Broj Porta";
> 		$admtext['showshare'] = "Prikaži Deljeni Link";
> 		$admtext['defpgsize'] = "Podrazumevana veli�ina PDF stranica";
> 		$admtext['mapterrain'] = "Teren";
> 		$admtext['maproadmap'] = "Mapa Puta";
> 		$admtext['usedefthumbs'] = "Koristite podrazumevane sli�ice";
>         $admtext['autogeo'] = "Geokodiraj sva nova mesta";
>         $admtext['revmail'] = "Obavesti o podnescima koji se mogu pregledati";
>         $admtext['assumepriv'] = "Pretpostavimo da je privatno, ako nije mrtvo, mnogo godina";
>         $admtext['calstart'] = "Prvi dan u nedelji";
> 		$admtext['edit_timeout'] = "Izmeni vremenski period (minute)";
> 		$admtext['shownamespr'] = "Prikaži Imena kao Privatno";
> 		$admtext['tables'] = "Tabele";
> 		$admtext['regnotes'] = "Prikaži Beleške i Prilagođene Događaje u Registru";
> 		$admtext['collation'] = "Sravnjivanje";
> 		$admtext['collationexpl'] = "(ostavite prazno da biste prihvatili podrazumevano)";
> 		$admtext['scrollcite'] = "Listajte citate";
> 		$admtext['hidemedia'] = "Sakrij li�ne medije";
> 		$admtext['searchchoice'] = "Destinacija za pretragu veze";
> 		$admtext['quicksearch'] = "Brza pretraga";
> 		$admtext['advsearch'] = "Napredna pretraga";
> 		$admtext['pedvertical'] = "Vertikala";
> 		$admtext['vboxwidth'] = "Å irina kutije";
> 		$admtext['vboxheight'] = "Visina kutije";
> 		$admtext['vspacing'] = "Razmak";
> 		$admtext['vchart'] = "Vertikalni Grafikon";
> 		$admtext['reuseids'] = "Ponovo koristite izbrisane ID-ove";
> 		$admtext['lastimport'] = "Prikaži poslednji uvoz";
>         $admtext['mailenc'] = "Å ifrovanje";
> 		$admtext['dbport'] = "Port Baze Podataka";
> 		$admtext['dbsocket'] = "Socket Baze Podataka";
1302,1324c1388,1410
< 		$admtext['prefsection'] = "Prefixes and Suffixes";
< 		$admtext['personprefix'] = "Person prefix";
< 		$admtext['personsuffix'] = "Person suffix";
< 		$admtext['familyprefix'] = "Family prefix";
< 		$admtext['familysuffix'] = "Family suffix";
< 		$admtext['sourceprefix'] = "Source prefix";
< 		$admtext['sourcesuffix'] = "Source suffix";
< 		$admtext['repoprefix'] = "Repository prefix";
< 		$admtext['reposuffix'] = "Repository suffix";
< 		$admtext['noteprefix'] = "Note prefix";
< 		$admtext['notesuffix'] = "Note suffix";
< 		$admtext['mobilesection'] = "Mobile";
< 		$admtext['mobilesite'] = "Mobile site name will be ";
< 		$admtext['menubar'] = "in mobile menu bar";
< 		$admtext['belowbar'] = "below mobile menu bar";
< 		$admtext['responsivetables'] = "Enable responsive tables";
< 		$admtext['tabletype'] = "Responsive table type";
< 		$admtext['enablemodeswitch'] = "Enable responsive tables mode switcher";
< 		$admtext['enableminimap'] = "Enable responsive tables mini map";
< 		$admtext['showtasks'] = "Show 'Important tasks' messages";
< 		$admtext['showtotals'] = "Show record totals on Admin menu";
< 		$admtext['backupdays'] = "Alert if no backup in this many days";
< 		$admtext['backupnote'] = "NOTE: If your database is very large, you might want to use an independent tool (like mysqldumper or phpMyAdmin) to back up and restore your tables. At least one of these should be available from your site control panel.";
---
> 		$admtext['prefsection'] = "Prefiks i Sufiks";
> 		$admtext['personprefix'] = "Prefiks Osobe";
> 		$admtext['personsuffix'] = "Sufiks Osobe";
> 		$admtext['familyprefix'] = "Prefiks Familije";
> 		$admtext['familysuffix'] = "Sufiks Familije";
> 		$admtext['sourceprefix'] = "Prefiks Izvora";
> 		$admtext['sourcesuffix'] = "Sufiks Izvora";
> 		$admtext['repoprefix'] = "Prefiks Repozitorijuma";
> 		$admtext['reposuffix'] = "Sufiks Repozitorijuma";
> 		$admtext['noteprefix'] = "Beleška prefiksa";
> 		$admtext['notesuffix'] = "Beleška sufiksa";
> 		$admtext['mobilesection'] = "Mobilan";
> 		$admtext['mobilesite'] = "Ime mobilnog sajta će biti ";
> 		$admtext['menubar'] = "u mobilnoj traci menija";
> 		$admtext['belowbar'] = "ispod mobilne trake menija";
> 		$admtext['responsivetables'] = "Omogućavanje odgovarajućih tabela";
> 		$admtext['tabletype'] = "Odgovarajući tip tabele";
> 		$admtext['enablemodeswitch'] = "Omogući prekida� režima odgovarajućih tabela";
> 		$admtext['enableminimap'] = "Omogućite odgovarajuću mini mapu tabela";
> 		$admtext['showtasks'] = "Prikaži poruke 'Važni zadaci'";
> 		$admtext['showtotals'] = "Prikažite ukupan broj zapisa u meniju Admin";
> 		$admtext['backupdays'] = "Upozorenje ako nema rezervne kopije u više dana";
> 		$admtext['backupnote'] = "NAPOMENA: Ako je vaša baza podataka veoma velika, možda ćete želeti da koristite nezavisni alat (kao što je mysqldumper ili phpMyAdmin) da napravite rezervne kopije i vratite tabele. Najmanje jedan od ovih treba da bude dostupan na kontrolnoj tabli vaše lokacije.";
1328,1331c1414,1416
< 		$admtext['hidedna'] = "Hide all DNA pages and data";
<         $admtext['assumeliving'] = "Assume living if not dead this many years";
< 		//changed in 11.0.2
< 		$admtext['mapkey'] = "Map Key";
---
> 		$admtext['hidedna'] = "Sakrij sve DNK stranice i podatke";
>         $admtext['assumeliving'] = "Pretpostavljamo  da je živ, ako nije mrtav, mnogo godina";
> 		$admtext['mapkey'] = "Klju� Mape";
1333,1350c1418,1435
< 		$admtext['sitekey'] = "reCAPTCHA Site Key";
< 		$admtext['secret'] = "reCAPTCHA Secret";
< 		$admtext['mediadel'] = "Remove physical file on delete";
< 		$admtext['onrequest'] = "On request";
< 		$admtext['mediathumbs'] = "Show photos on one row";
< 		$admtext['footermsg'] = "Custom footer message";
< 		$admtext['templatestable'] = "Template Settings";
< 		$admtext['mediatrees'] = "Separate media in tree folders";
< 		$admtext['mediaexpl'] = "xxx media files moved";
< 		$admtext['dnatestscomparecolors'] = "Y-DNA Compare Tests Column Heading Colors";
< 		$admtext['getcolorcodes'] = "Get Color Codes Here";
< 		$admtext['mainbackground'] = "Main heading background color";
< 		$admtext['modebackground'] = "Mode values background color";
< 		$admtext['fastmutbackground'] = "Fast mutating background color";
< 		$admtext['background1_12'] = "Markers 1-12 background color";
< 		$admtext['background13_25'] = "Markers 13-25 background color";
< 		$admtext['background26_37'] = "Markers 26-37 background color";
< 		$admtext['background38_67'] = "Markers 38-67 background color";
---
> 		$admtext['sitekey'] = "reCAPTCHA Klju� sajta";
> 		$admtext['secret'] = "reCAPTCHA tajna";
> 		$admtext['mediadel'] = "Ukloni fizi�ki fajl prilikom brisanja";
> 		$admtext['onrequest'] = "Na zahtev";
> 		$admtext['mediathumbs'] = "Prikaži fotografije u jednom redu";
> 		$admtext['footermsg'] = "Obi�ajna footer poruka";
> 		$admtext['templatestable'] = "Podešavanja Šablona";
> 		$admtext['mediatrees'] = "Odvojite medije u folderima stabala";
> 		$admtext['mediaexpl'] = "xxx medijskI fajlovi su premešteni";
> 		$admtext['dnatestscomparecolors'] = "Y-DNA Uporedite testove Naslova Kolona Boja";
> 		$admtext['getcolorcodes'] = "Ovde preuzmite kodove boja";
> 		$admtext['mainbackground'] = "Boja pozadine glavnog naslova";
> 		$admtext['modebackground'] = "Vrednosti boje pozadine";
> 		$admtext['fastmutbackground'] = "Brza mutacija boje pozadine";
> 		$admtext['background1_12'] = "Markeri 1-12 boja pozadine";
> 		$admtext['background13_25'] = "Markeri 13-25 boja pozadine";
> 		$admtext['background26_37'] = "Markeri 26-37 boja pozadine";
> 		$admtext['background38_67'] = "Markeri 38-67 boja pozadine";
1352,1357c1437,1442
< 		$admtext['textcolor'] = "Text color";
< 		$admtext['show_test_number'] = "Show DNA Test Number Publicly";
< 		$admtext['excludefromancsn'] = "Exclude From Ancestral Surnames";
< 		$admtext['upperancsunames'] = "Uppercase Ancestral Surnames";
< 		$admtext['autofillancsunames'] = "Autofill Ancestral Surnames";
< 		$admtext['colorschemer'] = "ColorSchemer - Online Color Scheme Generator";
---
> 		$admtext['textcolor'] = "Boja teksta";
> 		$admtext['show_test_number'] = "Pokažite broj DNK testa javno";
> 		$admtext['excludefromancsn'] = "Izuzeti iz Imena Predaka";
> 		$admtext['upperancsunames'] = "Velika Imena Predaka";
> 		$admtext['autofillancsunames'] = "Automatsko popunjavanje Prezime predaka";
> 		$admtext['colorschemer'] = "ColorSchemer - Online Generator kolor Å¡ema";
1359,1362c1444,1476
< 		$admtext['cookieapproval'] = "Show cookie approval message";
< 		$admtext['dataprotectmsg'] = "Show link to data protection policy";
< 		$admtext['nointernet'] = "I am using TNG offline";
< 		$admtext['askconsent'] = "Prompt for consent regarding personal info";
---
> 		$admtext['cookieapproval'] = "Prikaži poruku odobrenja kola�ića";
> 		$admtext['dataprotectmsg'] = "Prikaži vezu prema politici zaštite podataka";
> 		$admtext['nointernet'] = "Koristim TNG offline";
> 		$admtext['askconsent'] = "Tražite saglasnost u vezi li�nih informacija";
> 		//added in 13.0
> 		$admtext['coerce'] = "Change incoming prefixes to match TNG settings";
> 		$admtext['sortevents'] = "Sort events by";
> 		$admtext['sortbydate'] = "Event date";
> 		$admtext['sortbytype'] = "Event type";
> 		$admtext['allowsuggest'] = "Allow suggestions from visitors";
> 		$admtext['livingchecked'] = "Living flag set for new people and families";
> 		$admtext['maxmarried'] = "Mark family living if married less than<br/>this many years";
> 		$admtext['imagetags'] = "Rectangles";
> 		$admtext['allowcsv'] = "Allow CSV downloads for reports";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Opcije Rezervnih kopija/Backup";
> 		$admtext['dosql'] = "Izvezi kao SQL";
> 		$admtext['dodrop'] = "Uklju�i DROP TABLE AKO POSTOJI";
> 		$admtext['docreate'] = "Uklju�i CREATE TABLE";
> 		$admtext['onrestore'] = "Opcije vraćanja";
> 		$admtext['dodel'] = "Prvo izbrišite prethodni sadržaj";
> 		$admtext['download'] = "Preuzimanje/Download";
> 		$admtext['altbirthtypes'] = "Alternativni događaji rođenja";
> 		$admtext['dtformat'] = "Format Tabela";
> 		$admtext['conchart'] = "Konekcije Grafikona";
> 		$admtext['maxropt'] = "Maksimalan broj pokretanja pretrage povezivanja";
> 		$admtext['maxlopt'] = "Maksimalna dužina putanje povezivanja";
> 		$admtext['showtxtopt'] = "Prikaži tekstualni iskaz putanje";
> 		$admtext['compactboxopt'] = "Prikaži osobe u kompaktnom obliku";
> 		$admtext['sortbyopt'] = "Sortiraj putanje po";
> 		$admtext['anchoridopt'] = "Sidro/Anchor ID";
> 		$admtext['maxmopt'] = "Maksimalan broj uvezanih brakova.";
> 		$admtext['saveincfg'] = "Čuvajte u konfiguracionoj putanji (pogledajte Opšta podešavanja)";
1367,1369c1481,1483
< 		$admtext['enternamepart'] = "enter part of first and/or last name";
< 		$admtext['pleasenamepart'] = "Please enter a portion of a first or last name.";
< 		$admtext['enternamepart2'] = "enter ID or part of first and/or last name";
---
> 		$admtext['enternamepart'] = "unesite deo imena i/ili prezimena";
> 		$admtext['pleasenamepart'] = "Unesite deo imena ili prezimena.";
> 		$admtext['enternamepart2'] = "Unesite ID ili deo prvog i/ili prezimena";
1374,1404c1488,1517
< 		$admtext['pleaseplacepart'] = "Please enter part of a place name.";
< 		$admtext['addnewplace'] = "Add New Place";
< 		$admtext['createplace'] = "Create a record for a new place";
< 		$admtext['modifyplace'] = "Modify Existing Place";
< 		$admtext['editexistingplaceinfo'] = "Obrada informacija o prethodno upisan place";
< 		$admtext['enterplace'] = "Please enter a place.";
< 		$admtext['newplaceinfo'] = "New Place Information";
< 		$admtext['existingplaceinfo'] = "Existing Information for Place";
< 		$admtext['changestoplace'] = "Changes to place";
< 		$admtext['selectplaceaction'] = "Select Place and Action";
< 		$admtext['mergeplaces'] = "Merge Places";
< 		$admtext['findmerge'] = "Find Merge Candidates";
< 		$admtext['selectplacemerge'] = "Select Places to Merge";
< 		$admtext['mcol1'] = "Merge<br/>these<br/>(delete)";
< 		$admtext['mcol2'] = "into<br/>this<br/>(keep)";
< 		$admtext['pmsucc'] = "Place merge successful";
< 		$admtext['nomerge'] = "Nothing to merge";
< 		$admtext['enterkeep'] = "Please select a merge target.";
< 		$admtext['backmerge'] = "Search again";
< 		$admtext['confdeleteplace'] = "Jeste li sigurni da hocete da obrišete place?";
< 		$admtext['propagate'] = "Make this change in existing events";
< 		//added in 8.0.0
< 		$admtext['confdelcemlink'] = "Are you sure you want to unlink this cemetery?";
< 		$admtext['nocoords'] = "Missing Latitude or Longitude";
< 		$admtext['istemple'] = "This place name is an LDS temple code";
< 		$admtext['findtemples'] = "Find only LDS temple codes";
< 		$admtext['choosecem'] = "Choose a Cemetery";
< 		$admtext['geocopy'] = "Copy geocode information below to this cemetery";
< 		$admtext['linkcem'] = "Link this place to a cemetery";
< 		$admtext['cemsavail'] = "List only includes cemeteries that are not already linked to a place";
< 		$admtext['nocemsavail'] = "No cemeteries exist, or each cemetery has already been linked to a place.";
---
> 		$admtext['pleaseplacepart'] = "Unesite deo imena mesta.";
> 		$admtext['addnewplace'] = "Dodaj Novo Mesto";
> 		$admtext['createplace'] = "Napravite zapis za novo Mesto";
> 		$admtext['modifyplace'] = "Uredi postojeće Mesto";
> 		$admtext['editexistingplaceinfo'] = "Uredite informacije za prethodno uneseno Mesto";
> 		$admtext['enterplace'] = "Unesite mesto.";
> 		$admtext['newplaceinfo'] = "Nove informacije o Mestu";
> 		$admtext['existingplaceinfo'] = "Postojeće informacije za Mesto";
> 		$admtext['changestoplace'] = "Promene na mestu";
> 		$admtext['selectplaceaction'] = "Izaberite Mesto i Akciju";
> 		$admtext['mergeplaces'] = "Spoji Mesta";
> 		$admtext['findmerge'] = "Pronađi Kandidate za Spajanje";
> 		$admtext['selectplacemerge'] = "Izaberite Mesta za Spajanje";
> 		$admtext['mcol1'] = "Spojiti<br/>ove<br/>(izbrisati)";
> 		$admtext['mcol2'] = "u<br/>ovo<br/>(zadržati)";
> 		$admtext['pmsucc'] = "Mesto spajanja je uspelo";
> 		$admtext['nomerge'] = "Ništa za spajanje";
> 		$admtext['enterkeep'] = "Izaberite cilj spajanja.";
> 		$admtext['backmerge'] = "Traži ponovo";
> 		$admtext['confdeleteplace'] = "Jeste li sigurni da želite izbrisati ovo mesto?";
> 		$admtext['propagate'] = "Promenite ime mesta u postojećim događajima";
> 		$admtext['confdelcemlink'] = "Da li ste sigurni da želite da prekinete vezu ovog groblja?";
> 		$admtext['nocoords'] = "Nedostaje geografska širina/latituda i dužina/longituda";
> 		$admtext['istemple'] = "Ovo ime mesta je LDS hram kod";
> 		$admtext['findtemples'] = "Pronađite samo LDS šablon kodove";
> 		$admtext['choosecem'] = "Izaberite Groblje";
> 		$admtext['geocopy'] = "Kopirajte informacije geokodiranja ispod na ovo groblja";
> 		$admtext['linkcem'] = "Povežite ovo mesto sa grobljem";
> 		$admtext['cemsavail'] = "Lista obuhvata samo groblja koja još nisu povezana sa mestom";
> 		$admtext['nocemsavail'] = "Ne postoje groblja, ili je svako groblje već povezano sa mestom.";
1406,1412c1519,1525
<         $admtext['geocode'] = "Geocode";
<         $admtext['ignoreall'] = "Ignore all";
<         $admtext['usefirst'] = "Use first match";
<         $admtext['multchoice'] = "If multiple results are found for a place:";
<         $admtext['geoexpl'] = "Geocode all Places without latitude and longitude coordinates";
<         $admtext['geocoding'] = "Geocoding...";
<         $admtext['backgeo'] = "Return to Geocode menu";
---
>         $admtext['geocode'] = "Geokod";
>         $admtext['ignoreall'] = "Ignorisati sve";
>         $admtext['usefirst'] = "Koristi prvo pronađeno";
>         $admtext['multchoice'] = "Ako se pronađe više rezultata za neko mesto:";
>         $admtext['geoexpl'] = "Geokodiranje svih mesta bez koordinata geografske širine/latitude i dužine*longitude";
>         $admtext['geocoding'] = "Geokodiranje...";
>         $admtext['backgeo'] = "Vratite se u meni Geokoda";
1414,1418c1527,1530
<         $admtext['nolimit'] = "No limit";
< 		$admtext['blankplace'] = "Blank place name";
<         $admtext['nogeocode'] = "Could not be geocoded";
<         $admtext['toomany'] = "Ignored (too many results)";
< 		$admtext['treesgone'] = "Tree assignments removed from all place records";
---
>         $admtext['nolimit'] = "Bez limita";
> 		$admtext['blankplace'] = "Prazno Ime mesta";
>         $admtext['toomany'] = "Zanemareno (previše rezultata)";
> 		$admtext['treesgone'] = "Podaci stabla uklonjeni sa svih zapisa mesta";
1420,1421c1532,1533
< 		$admtext['nolevel'] = "Place Level not set";
< 		$admtext['placenotsaved'] = "Place not saved. Another place with that name already exists. Please merge instead.";
---
> 		$admtext['nolevel'] = "Nivo mesta nije postavljen";
> 		$admtext['placenotsaved'] = "Mesto nije sa�uvano. Drugo mesto sa tim imenom već postoji. Umesto toga, spojite ih.";
1423c1535,1537
< 		$admtext['noevents'] = "No associated events";
---
> 		$admtext['noevents'] = "Nema povezanih događaja";
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Do not geocode";
1428,1429c1542,1543
< 		$admtext['generatenewid'] = "Generate New ID";
< 		$admtext['generating'] = "Generating...Please wait";
---
> 		$admtext['generatenewid'] = "Generiši novi ID";
> 		$admtext['generating'] = "Generisanje ... Pri�ekajte";
1434,1444c1548,1557
< 		$admtext['trackinglines'] = "Tracking Lines of Descent...";
< 		$admtext['finishedtracking'] = "Finished tracking lines of descent.";
< 		$admtext['backtosecondary'] = "Back to Secondary Processes";
< 		$admtext['sortchildren'] = "Sort Children";
< 		$admtext['sortingchildren'] = "Sorting Children";
< 		$admtext['sortspouses'] = "Sort Spouses";
< 		$admtext['sortingspouses'] = "Sorting Spouses";
< 		$admtext['relabelbranches'] = "Relabel Branches";
< 		$admtext['relabeling'] = "Relabeling Branches";
< 		$admtext['creatinggendex'] = "Creating GENDEX file...";
< 		$admtext['finishedgendex'] = "Finished with GENDEX file creation.";
---
> 		$admtext['trackinglines'] = "Praćenje linija za Poreklo...";
> 		$admtext['finishedtracking'] = "Završne linije praćenja za poreklo.";
> 		$admtext['sortchildren'] = "Sortirati Decu";
> 		$admtext['sortingchildren'] = "Sortiranje Dece";
> 		$admtext['sortspouses'] = "Sortiraj Supružnike";
> 		$admtext['sortingspouses'] = "Sortiranje Supružnika";
> 		$admtext['relabelbranches'] = "Izmena labele Grana";
> 		$admtext['relabeling'] = "Izmena labele Grane";
> 		$admtext['creatinggendex'] = "Kreiranje GENDEX fajla...";
> 		$admtext['finishedgendex'] = "Završeno je sa GENDEX kreiranim fajlom.";
1446c1559
< 		$admtext['postgdx'] = "Where to post your GENDEX file";
---
> 		$admtext['postgdx'] = "Gde da postavite svoj GENDEX fajl";
1448,1450c1561,1563
< 		$admtext['evalmedia'] = "Trim Media Menus";
< 		$admtext['evaluating'] = "Counting media";
< 		$admtext['finished'] = "Finished";
---
> 		$admtext['evalmedia'] = "Dovesti u red Medija Meni";
> 		$admtext['evaluating'] = "Brojanje Medija";
> 		$admtext['finished'] = "Gotov";
1452,1456c1565,1571
< 		$admtext['refreshliving'] = "Refresh Living";
< 		$admtext['chtodeceased'] = "changed to deceased";
< 		$admtext['chtoliving'] = "changed to living";
< 		$admtext['chtoprivate'] = "changed to private";
< 		$admtext['makeprivate'] = "Make Private";
---
> 		$admtext['refreshliving'] = "Osvežiti Živ";
> 		$admtext['chtodeceased'] = "promenjeno u preminuo";
> 		$admtext['chtoliving'] = "promenjen u živo";
> 		$admtext['chtoprivate'] = "promenjeno u privatno";
> 		$admtext['makeprivate'] = "Napraviti Privatno";
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Nazad na Posle-Uvoza Usluga/Utilities";
1461,1473c1576,1588
< 		$admtext['addnewlanguage'] = "Add New Language";
< 		$admtext['enterlangdisplay'] = "Please enter a language display name.";
< 		$admtext['enterlangfolder'] = "Please enter the name of the folder where files for this language will be stored.";
< 		$admtext['newlanguageinfo'] = "New Language Information";
< 		$admtext['langdisplay'] = "Name for this language<br/>as it will be displayed for visitors";
< 		$admtext['createlanguage'] = "Create a record for a new language";
< 		$admtext['nolanguages'] = "No language records exist";
< 		$admtext['conflangdelete'] = "Jeste li sigurni da hocete da obrišete language?";
< 		$admtext['existinglanguages'] = "Existing Language Information";
< 		$admtext['modifylanguage'] = "Modify Existing Language";
< 		$admtext['changestolanguage'] = "Changes to language";
< 		$admtext['charset'] = "Character set";
< 		$admtext['editexistinglanguage'] = "Obrada informacija o prethodno upisan language";
---
> 		$admtext['addnewlanguage'] = "Dodaj novi Jezik";
> 		$admtext['enterlangdisplay'] = "Unesite naziv za prikaz jezika.";
> 		$admtext['enterlangfolder'] = "Unesite naziv foldera u kojoj će se �uvati fajlovi za ovaj jezik.";
> 		$admtext['newlanguageinfo'] = "Informacije o novom jeziku";
> 		$admtext['langdisplay'] = "Ime za ovaj jezik<br/>on će biti prikazan za posetioce";
> 		$admtext['createlanguage'] = "Napravite zapis za novi jezik";
> 		$admtext['nolanguages'] = "Ne postoje jezi�ki zapisi";
> 		$admtext['conflangdelete'] = "Jeste li sigurni da želite izbrisati ovaj jezik?";
> 		$admtext['existinglanguages'] = "Informacije o postojećem jeziku";
> 		$admtext['modifylanguage'] = "Uredi postojeći jezik";
> 		$admtext['changestolanguage'] = "Promene u jeziku";
> 		$admtext['charset'] = "Set Znakova";
> 		$admtext['editexistinglanguage'] = "Dodajte, uredite ili izbrišite jezike";
1478,1496c1593,1611
< 		$admtext['createtree'] = "Create a record for a new tree";
< 		$admtext['notrees'] = "No tree records exist";
< 		$admtext['existingtrees'] = "Existing Tree Information";
< 		$admtext['editexistingtree'] = "Obrada informacija o prethodno upisan tree";
< 		$admtext['treename'] = "Tree Name";
< 		$admtext['owner'] = "Owner";
< 		$admtext['conftreedelete'] = "Jeste li sigurni da hocete da obrišete tree and all associated items?";
< 		$admtext['conftreeclear'] = "Are you sure you want to clear all data from this tree?";
< 		$admtext['changestotree'] = "Changes to tree";
< 		$admtext['newtreeinfo'] = "New Tree Information";
< 		$admtext['existingtreeinfo'] = "Existing Tree Information";
< 		$admtext['modifytree'] = "Modify Existing Tree";
< 		$admtext['succcleared'] = "was successfully cleared";
< 		$admtext['gedcomextraction'] = "Don't allow users to download GEDCOM files";
< 		$admtext['gedexport'] = "GEDCOM Export";
< 		$admtext['exporting'] = "Exporting GEDCOM...";
< 		$admtext['ifexportfails'] = "If the export fails to run to completion,";
< 		$admtext['finishedexporting'] = "Finished Exporting GEDCOM";
< 		$admtext['backtotrees'] = "Back to Trees";
---
> 		$admtext['createtree'] = "Napravite zapis za novo rodoslovno stablo";
> 		$admtext['notrees'] = "Ne postoje zapisi o rodoslovnom stablu";
> 		$admtext['existingtrees'] = "Postojeće informacije o Rodoslovnom Stablu";
> 		$admtext['editexistingtree'] = "Uredite informacije za prethodno uneseno rodoslovno stablo";
> 		$admtext['treename'] = "Ime Porodi�nog Stabla";
> 		$admtext['owner'] = "Vlasnik";
> 		$admtext['conftreedelete'] = "Jeste li sigurni da želite izbrisati ovo rodoslovno stablo i sve pridružene stavke?";
> 		$admtext['conftreeclear'] = "Jeste li sigurni da želite obrisati sve podatke sa ovog rodoslovnog stabla?";
> 		$admtext['changestotree'] = "Promene u rodoslovnom stablu";
> 		$admtext['newtreeinfo'] = "Informacije o novom Rodoslovnom Stablu";
> 		$admtext['existingtreeinfo'] = "Postojeće informacije o Rodoslovnom Stablu";
> 		$admtext['modifytree'] = "Uredi postojeće Rodoslovno Stablo";
> 		$admtext['succcleared'] = "uspešno je obrisano";
> 		$admtext['gedcomextraction'] = "Nemojte dozvoliti korisnicima da preuzimaju GEDCOM fajlove";
> 		$admtext['gedexport'] = "GEDCOM Izvoz";
> 		$admtext['exporting'] = "Izvoz GEDCOM...";
> 		$admtext['ifexportfails'] = "Ako izvoz ne uspe da se završi,";
> 		$admtext['finishedexporting'] = "Završen Izvoz GEDCOM";
> 		$admtext['backtotrees'] = "Nazad na rodoslovna stabla";
1498,1509c1613,1622
< 		$admtext['lastimport'] = "Last Import";
< 		$admtext['treeexists'] = "Another tree already exists with the selected ID. Please select a different ID and try again.";
< 		$admtext['exportmedia'] = "Export media links (photos and histories)";
< 		//added in 8.0.0
< 		$admtext['changetree'] = "Change Tree";
< 		$admtext['newtree'] = "New Tree";
< 		$admtext['currtree'] = "Current Tree";
< 		$admtext['chwarn'] = "WARNING: This operation will remove all family links, citations and other references to this entity within the current tree.";
< 		$admtext['keepprivate'] = "Keep owner information private";
< 		//changed in 9.0.0
< 		$admtext['exppaths'] = "Local paths for";
< 		$admtext['nopdf'] = "Don't allow users to create PDF files";
---
> 		$admtext['lastimport'] = "Poslednji uvoz";
> 		$admtext['treeexists'] = "Još jedno rodoslovno stablo već postoji sa izabranim ID-om. Izaberite drugi ID i pokušajte ponovo.";
> 		$admtext['exportmedia'] = "Izvoz linkova za medije";
> 		$admtext['changetree'] = "Izmena Porodi�nog Stabla";
> 		$admtext['newtree'] = "Novo Porodi�no Stablo";
> 		$admtext['currtree'] = "Postojeće Rodoslovno Stablo";
> 		$admtext['chwarn'] = "UPOZORENjE: Ova operacija će ukloniti sve porodi�ne veze, citate i druge reference na ovaj entitet unutar trenutnog rodoslovnog stabla.";
> 		$admtext['keepprivate'] = "Držite informacije o vlasniku privatnim";
> 		$admtext['exppaths'] = "Lokalna putanja";
> 		$admtext['nopdf'] = "Nemojte dozvoliti korisnicima da kreiraju PDF datoteke";
1511,1513c1624,1631
< 		$admtext['exprivate'] = "Exclude private";
< 		$admtext['exliving'] = "Exclude living";
< 		$admtext['importfilename'] = "Import File Name";
---
> 		$admtext['exprivate'] = "Izuzmi privatno";
> 		$admtext['exliving'] = "Isklju�i žive osobe";
> 		$admtext['importfilename'] = "Naziv uvezenog fajla";
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exclude notes";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip arhiv fajlovi i uklju�ite medijske fajlove";
> 		$admtext['downloadzip'] = "Preuzmite/Download ZIP arhiv fajlove";
1518,1533c1636,1651
< 		$admtext['addnewuser'] = "Add New User";
< 		$admtext['createuser'] = "Create a record for a new user";
< 		$admtext['nousers'] = "No user records exist";
< 		$admtext['existingusers'] = "Existing User Information";
< 		$admtext['editexistinguser'] = "Obrada informacija o prethodno upisan user";
< 		$admtext['confuserdelete'] = "Jeste li sigurni da hocete da obrišete user?";
< 		$admtext['changestouser'] = "Changes to user";
< 		$admtext['enteruserpassword'] = "Please enter a password.";
< 		$admtext['enterusername'] = "Please enter a username.";
< 		$admtext['newuserinfo'] = "New User Information";
< 		$admtext['existinguserinfo'] = "Existing User Information";
< 		$admtext['modifyuser'] = "Modify Existing User";
< 		$admtext['allow_living'] = "Allow to view information for living individuals";
< 		$admtext['allow_lds'] = "Allow to view LDS information";
< 		$admtext['enteruserdesc'] = "Please enter a user description.";
< 		$admtext['enterpassword'] = "Please enter a password.";
---
> 		$admtext['addnewuser'] = "Dodaj novog Korisnika sajta";
> 		$admtext['createuser'] = "Kreirajte zapis za novog korisnika sajta";
> 		$admtext['nousers'] = "Nema korisni�kih zapisa";
> 		$admtext['existingusers'] = "Postojeće Informacije o Korisniku";
> 		$admtext['editexistinguser'] = "Uredite informacije za prethodno unesenog korisnika";
> 		$admtext['confuserdelete'] = "Jeste li sigurni da želite izbrisati ovog korisnika?";
> 		$admtext['changestouser'] = "Promene korisnika";
> 		$admtext['enteruserpassword'] = "Unesite lozinku.";
> 		$admtext['enterusername'] = "Unesite korisni�ko ime.";
> 		$admtext['newuserinfo'] = "Nove informacije o Korisniku sajta";
> 		$admtext['existinguserinfo'] = "Postojeće Informacije o Korisniku sajta";
> 		$admtext['modifyuser'] = "Izmeni postojećeg korisnika sajta";
> 		$admtext['allow_living'] = "Omogućite pregled informacija za žive osobe";
> 		$admtext['allow_lds'] = "Dozvolite da vidite LDS informacije";
> 		$admtext['enteruserdesc'] = "Unesite opis za korisnika";
> 		$admtext['enterpassword'] = "Unesite lozinku.";
1535,1543c1653,1661
< 		$admtext['firstuser'] = "The first user you create will be an Administrator (NO tree selected) and will have access to all system settings.";
< 		$admtext['userfailed'] = "ERROR: Your user could not be created because another user with the same username already exists.";
< 		$admtext['allow_ged'] = "Allow to download GEDCOMs";
< 		$admtext['assigned'] = "Assigned";
< 		$admtext['treemsg'] = "Optional. Assigning no tree to the user will result in the user have rights for all trees and all branches. The site administrator should not be assigned a tree.";
< 		$admtext['branchmsg'] = "Optional. Assigning a branch to the user will constrain the rights granted on this page to the assigned branch within the selected tree.";
< 		$admtext['accesslimits'] = "Access Limits:";
< 		$admtext['rights'] = "Rights:";
< 		$admtext['realname'] = "Real Name";
---
> 		$admtext['firstuser'] = "Prvi korisnik koji kreirate biće administrator (NE stabla odabrano) i imaće pristup svim sistemskim postavkama.";
> 		$admtext['userfailed'] = "GREŠKA: Vaš korisnik nije mogao biti kreiran jer drugi korisnik sa istim korisni�kim imenom već postoji.";
> 		$admtext['allow_ged'] = "Dozvoli za preuzimanje GEDCOMs";
> 		$admtext['assigned'] = "Dodeljen";
> 		$admtext['treemsg'] = "Opciono. Dodeljivanje nijednog stabla korisniku rezultira time da korisnik ima prava za sva stabla i sve grane. Administratoru sajta ne treba dodeliti rodoslovno stablo.";
> 		$admtext['branchmsg'] = "Opciono. Dodeljivanje grane korisniku ograni�ava prava koja su dodeljena na ovoj stranici na dodeljenu granu unutar odabranog rodoslovnog stabla.";
> 		$admtext['accesslimits'] = "Ograni�enja pristupa:";
> 		$admtext['rights'] = "Prava:";
> 		$admtext['realname'] = "Pravo ime";
1545,1552c1663,1670
< 		$admtext['newusers'] = "New User Registrations";
< 		$admtext['editnewusers'] = "Process records for newly registered users. New users have no rights until registrations are processed.";
< 		$admtext['nonewusers'] = "No new users";
< 		$admtext['lastlogin'] = "Last Login";
< 		$admtext['tentative_edit'] = "Allow to submit edits for administrative review (People, Families and Sources only)";
< 		$admtext['notify'] = "Notify this user upon account activation";
< 		$admtext['no_edit'] = "No edit rights";
< 		$admtext['emailusers'] = "E-mail Users";
---
> 		$admtext['newusers'] = "Nove korisni�ke registracije";
> 		$admtext['editnewusers'] = "Obrada zapisa za novoregistrovane korisnike. Novi korisnici nemaju prava dok se ne obradi/dozvoli registracija.";
> 		$admtext['nonewusers'] = "Nema novih korisnika sajta";
> 		$admtext['lastlogin'] = "Poslednje prijavljivanje na sajt";
> 		$admtext['tentative_edit'] = "Dozvola da se pošalju izmene za administrativni pregled (samo za osobe, porodice i izvori)";
> 		$admtext['notify'] = "Obavesti ovog korisnika o aktivaciji ra�una";
> 		$admtext['no_edit'] = "Nema prava za uređivanje";
> 		$admtext['emailusers'] = "Korisnici e-pošte";
1554,1582c1672,1699
< 		$admtext['emailmessage'] = "E-mail Message To Users";
< 		$admtext['subject'] = "E-mail Subject";
< 		$admtext['messagetext'] = "E-mail Text";
< 		$admtext['selectgroup'] = "Select group to receive e-mail (leave blank to send to all)";
< 		$admtext['treemailmsg'] = "Optional. Choosing a tree will restrict the message to users assigned to that tree.";
< 		$admtext['branchmailmsg'] = "Optional. Choosing a branch will restrict the message to users assigned to that branch.";
< 		$admtext['send'] = "Send E-mail";
< 		$admtext['sentmailmessage'] = "Sent E-mail Message";
< 		$admtext['succmail'] = "Your e-mail message has been sent.";
< 		$admtext['mailfailed'] = "Your e-mail message failed to send.";
< 		$admtext['entersubject'] = "Please enter a subject for your message.";
< 		$admtext['entermsgtext'] = "Please enter the text of your message.";
< 		$admtext['adminonly'] = "Show Admin users only";
< 		$admtext['dtregistered'] = "Date Registered";
< 		$admtext['dtactivated'] = "Date Activated";
< 		$admtext['no_email'] = "Do not send mass e-mail to this user";
< 		$admtext['allow_admin'] = "Allow access to all system settings and administrative functions, and apply rights to all trees and branches.";
< 		$admtext['limitedrights'] = "Restrict access to the following:";
< 		$admtext['allow_edit'] = "Allow to edit existing records";
< 		$admtext['allow_add'] = "Allow to add new records";
< 		$admtext['allow_delete'] = "Allow to delete existing records";
< 		//added in 8.0.0
< 		$admtext['usrguest'] = "Guest";
< 		$admtext['usrguestd'] = "No add, edit or delete rights.";
< 		$admtext['noadmin'] = "No access to Admin area.";
< 		$admtext['usrsubm'] = "Submitter";
< 		$admtext['usrsubmd'] = "Submit changes subject to review.";
< 		$admtext['usrcontrib'] = "Contributor";
< 		$admtext['usrcontribd'] = "Add information, including media.";
---
> 		$admtext['emailmessage'] = "E-mail poruka Korisnicima sajta";
> 		$admtext['subject'] = "E-mail Naslov";
> 		$admtext['messagetext'] = "Tekst e-pošte";
> 		$admtext['selectgroup'] = "Izaberite grupu za primanje e-pošte (ostavite prazno za slanje svima)";
> 		$admtext['treemailmsg'] = "Opciono. Izbor rodoslovnog stabla će ograni�iti poruku korisnicima dodeljenim tom stablu.";
> 		$admtext['branchmailmsg'] = "Opciono. Ako izaberete granu, poruka će biti ograni�ena na korisnike dodeljene toj grani.";
> 		$admtext['send'] = "Å alji E-mail poruku";
> 		$admtext['sentmailmessage'] = "E-mail poruka";
> 		$admtext['succmail'] = "Vaša e-mail poruka je poslata.";
> 		$admtext['mailfailed'] = "Vaša e-mail poruka nije poslata.";
> 		$admtext['entersubject'] = "Unesite temu/naslov poruke.";
> 		$admtext['entermsgtext'] = "Unesite tekst poruke.";
> 		$admtext['adminonly'] = "Prikaži samo administratore";
> 		$admtext['dtregistered'] = "Datum Registracije";
> 		$admtext['dtactivated'] = "Datum Aktiviranja";
> 		$admtext['no_email'] = "Ne šaljite masovnu e-poštu ovom korisniku sajta";
> 		$admtext['allow_admin'] = "Primenite gore navedena prava na sva rodoslovna stabla i grane.";
> 		$admtext['limitedrights'] = "Ograni�ite gore navedena prava na sledeće:";
> 		$admtext['allow_edit'] = "Dozvola da se izmene postojeći podaci";
> 		$admtext['allow_add'] = "Dozvola da se dodaju novi podaci";
> 		$admtext['allow_delete'] = "Dozvola da se obrišu postojeći podaci";
> 		$admtext['usrguest'] = "Gost";
> 		$admtext['usrguestd'] = "Nema dodavanja, uređivanja ili brisanja prava.";
> 		$admtext['noadmin'] = "Nema pristupa Admin podru�ju.";
> 		$admtext['usrsubm'] = "Podnosilac";
> 		$admtext['usrsubmd'] = "Podnesite izmene koje treba pregledati.";
> 		$admtext['usrcontrib'] = "Saradnik";
> 		$admtext['usrcontribd'] = "Dodajte informacije, uklju�ujući medije.";
1584c1701
< 		$admtext['usreditord'] = "Add, edit and delete all information, including media.";
---
> 		$admtext['usreditord'] = "Dodajte, uređujte i brišite sve informacije, uklju�ujući medije.";
1586,1600c1703,1716
< 		$admtext['usradmind'] = "All rights.";
< 		$admtext['usrmcontrib'] = "Media Contributor";
< 		$admtext['usrmcontribd'] = "Add media only.";
< 		$admtext['usrmeditor'] = "Media Editor";
< 		$admtext['usrmeditord'] = "Add, edit and delete media only.";
< 		$admtext['allow_media_edit'] = "Allow to edit media only";
< 		$admtext['allow_media_add'] = "Allow to add media only";
< 		$admtext['allow_media_delete'] = "Allow to delete media only";
< 		$admtext['no_add'] = "No add rights";
< 		$admtext['no_delete'] = "No delete rights";
< 		$admtext['roles'] = "Roles";
< 		$admtext['usrcustom'] = "Custom";
<         //added in 9.0.0
< 		$admtext['allow_private'] = "Allow to view information for private individuals";
< 		$admtext['allow_pdf'] = "Allow to download PDFs";
---
> 		$admtext['usradmind'] = "Sva prava.";
> 		$admtext['usrmcontrib'] = "Medija Saradnik";
> 		$admtext['usrmcontribd'] = "Dodajte samo medije.";
> 		$admtext['usrmeditor'] = "Medija Editor";
> 		$admtext['usrmeditord'] = "Dodajte, uredite i brišite samo medije.";
> 		$admtext['allow_media_edit'] = "Dozvolite samo uređuvanje medija";
> 		$admtext['allow_media_add'] = "Dozvolite dodavanje samo medija";
> 		$admtext['allow_media_delete'] = "Dopustite samo brisanje medija";
> 		$admtext['no_add'] = "Nema dodavanja prava";
> 		$admtext['no_delete'] = "Nema prava brisanja";
> 		$admtext['roles'] = "Uloge";
> 		$admtext['usrcustom'] = "Prilagodljiv";
> 		$admtext['allow_private'] = "Dozvolite da vidite informacije za privatne osobe";
> 		$admtext['allow_pdf'] = "Dozvoli preuzimanje PDF-ova";
1602c1718
< 		$admtext['allow_profile'] = "Allow to edit user profile";
---
> 		$admtext['allow_profile'] = "Dozvolite da uredite korisni�ki profil i promenite lozinku";
1604c1720
< 		$admtext['mult_trees'] = "Apply rights to multiple trees";
---
> 		$admtext['mult_trees'] = "Primenite prava na više rodoslovnih stabala";
1606,1607c1722,1729
< 		$admtext['consented'] = "Consent given";
< 		$admtext['consentdate'] = "Date Consented";
---
> 		$admtext['consented'] = "Data saglasnost";
> 		$admtext['consentdate'] = "Datum Saglasnosti";
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Show disabled users only";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Takođe pošaljite administratorima kada je izabrano jedno stablo.";
1611,1618c1733,1739
< 		$admtext['loginfailed'] = "Login failed.";
< 		$admtext['adminlogfile'] = "Admin Log File";
< 		$admtext['mostrecentactions'] = "Most Recent Actions";
< 		$admtext['rempass'] = "Stay logged in on this computer";
< 		$admtext['sessexp'] = "Your session has expired.";
< 		$admtext['logagain'] = "Click to log in again.";
< 		//added in 8.1.0
< 		$admtext['logininactive'] = "Your login is not yet active. Please try again later or contact the site administrator.";
---
> 		$admtext['loginfailed'] = "Neuspela Prijava.";
> 		$admtext['adminlogfile'] = "Admin Log Fajl";
> 		$admtext['mostrecentactions'] = "Najviše Skorišnjih Događaja";
> 		$admtext['rempass'] = "Ostanite prijavljeni na ovom ra�unaru";
> 		$admtext['sessexp'] = "Vaša sesija je istekla.";
> 		$admtext['logagain'] = "Kliknite da biste se ponovo prijavili.";
> 		$admtext['logininactive'] = "Vaša prijava još nije aktivna. Pokušajte ponovo kasnije ili se obratite administratoru sajta.";
1622,1641c1743,1761
< 		$admtext['createnewtlevent'] = "Create a new timeline event";
< 		$admtext['modifytlevent'] = "Modify Existing Timeline Event";
< 		$admtext['leaveblankalltlevents'] = "ostavi prazno da bi video sv timeline events";
< 		$admtext['evyear'] = "Event year";
< 		$admtext['evdetail'] = "Event detail";
< 		$admtext['selecttleventaction'] = "Select Timeline Event and Action";
< 		$admtext['changestotlevent'] = "Changes to timeline event";
< 		$admtext['location'] = "Location";
< 		$admtext['confdeletetlevent'] = "Jeste li sigurni da hocete da obrišete timeline event?";
< 		$admtext['enterevyear'] = "Please enter the event year.";
< 		$admtext['enterevdetail'] = "Please enter the event detail.";
< 		$admtext['existingtleventinfo'] = "Existing Timeline Event";
< 		$admtext['newtleventinfo'] = "New Timeline Event";
< 		$admtext['edittleventinfo'] = "Edit a previously entered timeline event";
< 		$admtext['addnewtlevent'] = "Add New Timeline Event";
< 		$admtext['yrreq'] = "(only year is required)";
< 		$admtext['startdt'] = "Start Date";
< 		$admtext['enddt'] = "End Date";
< 		//added in 9.0.0
< 		$admtext['evtitle'] = "Event title";
---
> 		$admtext['createnewtlevent'] = "Napravite novi Događaj Vremenske Linije";
> 		$admtext['modifytlevent'] = "Uredi postojeći događaj u Vremenskoj Liniji";
> 		$admtext['leaveblankalltlevents'] = "ostavite prazno da biste prikazali sve vremenske događaje";
> 		$admtext['evyear'] = "Godina Događaja";
> 		$admtext['evdetail'] = "Detalji događaja";
> 		$admtext['selecttleventaction'] = "Izaberite Vremenski Događaj i Aktivnost";
> 		$admtext['changestotlevent'] = "Promene u Događaju Vremenske Linije";
> 		$admtext['location'] = "Lokacija";
> 		$admtext['confdeletetlevent'] = "Jeste li sigurni da želite izbrisati ovaj događaj vremenske linije?";
> 		$admtext['enterevyear'] = "Unesite godinu događaja.";
> 		$admtext['enterevdetail'] = "Unesite detalje događaja.";
> 		$admtext['existingtleventinfo'] = "Postojeći Događaj Vremenske Linije";
> 		$admtext['newtleventinfo'] = "Novi Događaj Vremenske Linije";
> 		$admtext['edittleventinfo'] = "Dodavanje, uređivanje ili brisanje događaja Vremenske Linije";
> 		$admtext['addnewtlevent'] = "Dodaj novi Događaj";
> 		$admtext['yrreq'] = "(potrebna je samo godina)";
> 		$admtext['startdt'] = "Datum po�etka";
> 		$admtext['enddt'] = "Krajnji datum";
> 		$admtext['evtitle'] = "Naslov Događaja";
1645,1653c1765,1773
< 		$admtext['selectevaction'] = "Select Event and Action";
< 		$admtext['suggested'] = "Suggested";
< 		$admtext['usernotes'] = "Notes regarding<br />suggested change<br />(will not be saved)";
< 		$admtext['postdate'] = "Posted on";
< 		$admtext['savedel'] = "Save and Delete";
< 		$admtext['postpone'] = "Postpone";
< 		$admtext['igndel'] = "Ignore and Delete";
< 		$admtext['tentdel'] = "was deleted";
< 		$admtext['tentadd'] = "was made permanent";
---
> 		$admtext['selectevaction'] = "Izaberite Događaj i Aktivnost";
> 		$admtext['suggested'] = "Predloženo";
> 		$admtext['usernotes'] = "Napomene u vezi<br />predložene izmene<br />(neće biti sa�uvana)";
> 		$admtext['postdate'] = "Objavljeno";
> 		$admtext['savedel'] = "Sa�uvaj i Izbriši";
> 		$admtext['postpone'] = "Odložiti";
> 		$admtext['igndel'] = "Zanemari i Izbriši";
> 		$admtext['tentdel'] = "je izbrisan";
> 		$admtext['tentadd'] = "je stalna";
1656d1775
< 	//added in 8.0.0
1658,1673c1777,1792
< 		$admtext['noteblurb'] = "Directly locate, edit or delete any note in your database.";
< 		$admtext['whatsnewblurb'] = "Provide your visitors with a general site update or other timely information at the top of your What's New page.";
< 		$admtext['mwblurb'] = "Create a list of elusive people and unidentified photos, in hopes of getting more publicity for the items that are giving you the most trouble.";
< 		$admtext['dvblurb'] = "Find potential problems in your information.";
< 		$admtext['wr_gender'] = "Wrong gender";
< 		$admtext['unk_gender'] = "Unknown gender";
< 		$admtext['marr_young'] = "Married too young (less than 15 years old)";
< 		$admtext['marr_aft_death'] = "Married after death";
< 		$admtext['marr_bef_birth'] = "Married before birth";
< 		$admtext['died_bef_birth'] = "Died before birth";
< 		$admtext['parents_younger'] = "Born too early (parents less than 15 years old, or child born before marriage)";
< 		$admtext['children_late'] = "Born too late (mother more than 50 years old)";
< 		$admtext['not_living'] = "Person marked as living, death date present";
< 		$admtext['not_dead'] = "Person marked as deceased, possibly still living";
< 		$admtext['parmarr'] = "Parents' Marriage";
< 		$admtext['motherbirth'] = "Mother's Birth";
---
> 		$admtext['noteblurb'] = "Direktno pronađite, uredite ili izbrišite bilo koju napomenu u vašoj bazi podataka.";
> 		$admtext['whatsnewblurb'] = "Obezbedite posetiocima opšte ažuriranje sajta ili druge pravovremene informacije na vrhu stranice Šta je novo.";
> 		$admtext['mwblurb'] = "Napravite listu neuhvatljivih ljudi i neidentifikovanih fotografija, u nadi da ćete dobiti više publiciteta za stavke koje vam daju najviše problema.";
> 		$admtext['dvblurb'] = "Pronađite potencijalne probleme u svojim informacijama.";
> 		$admtext['wr_gender'] = "Pogrešan pol";
> 		$admtext['unk_gender'] = "Nepoznat pol";
> 		$admtext['marr_young'] = "Oženjen je previše mlad (mlađi od 15 godina)";
> 		$admtext['marr_aft_death'] = "Brak nakon smrti";
> 		$admtext['marr_bef_birth'] = "Brak pre rođenja";
> 		$admtext['died_bef_birth'] = "Umro pre rođenja";
> 		$admtext['parents_younger'] = "Rođen prerano (roditelji mlađi od 15 godina, ili dete rođeno pre braka)";
> 		$admtext['children_late'] = "Rođen prekasno (majka starija od 50 godina)";
> 		$admtext['not_living'] = "Osoba ozna�ena kao živa, datum smrti prisutan";
> 		$admtext['not_dead'] = "Osoba ozna�ena kao preminula, možda još živi";
> 		$admtext['parmarr'] = "Brak roditelja";
> 		$admtext['motherbirth'] = "Maj�ino Rođenje";
1677,1703c1796,1820
< 		$admtext['modlist'] = "Mod List";
< 		$admtext['removed'] = "removed";
< 		$admtext['installed'] = "Installed";
< 		$admtext['deleted'] = "deleted";
< 		$admtext['cantdel'] = "can't delete";
< 		$admtext['cfgname'] = "Config File Name";
< 		$admtext['version'] = "Version";
< 		$admtext['nomods'] = "No mod definition files (xxx) found in the mod folder";
< 		$admtext['location'] = "Location";
< 		$admtext['missing'] = "Missing";
< 		$admtext['badtarget'] = "Bad target";
< 		$admtext['cantwrite'] = "Unable to write to";
< 		$admtext['notwrite'] = "is not writable, check permissions";
< 		$admtext['checkwrite'] = "Check permissions, must be writeable.";
< 		$admtext['toterrors'] = "Total Errors";
< 		$admtext['missfile'] = "Missing file";
< 		$admtext['notunique'] = "not unique";
< 		$admtext['nodesc'] = "Parameter definition error, missing description";
< 		$admtext['defval'] = "Default value";
< 		$admtext['written'] = "File written";
< 		//changed in 9.0.0
< 		$admtext['locmissing'] = "Local copy of xxx for installation is missing";
< 		//added in 9.0.0
< 		$admtext['needmodupdate'] = "Mod updates are required";
< 		$admtext['cannotinstall'] = "Unable to install this mod";
< 		$admtext['emptytarget'] = "Target file is an empty file.";
< 		$admtext['cantdelmissing'] = "Cannot delete, file is missing";
---
> 		$admtext['modlist'] = "Mod Lista";
> 		$admtext['removed'] = "uklonjen";
> 		$admtext['installed'] = "Instaliran";
> 		$admtext['deleted'] = "izbrisan";
> 		$admtext['cantdel'] = "ne može da se izbriše";
> 		$admtext['cfgname'] = "Ime Konfiguracijski fajla";
> 		$admtext['version'] = "Verzija";
> 		$admtext['nomods'] = "U mod mapi nisu pronađeni fajlovi definicije moda (xxx)";
> 		$admtext['location'] = "Lokacija";
> 		$admtext['missing'] = "nedostaje";
> 		$admtext['badtarget'] = "Loša meta";
> 		$admtext['cantwrite'] = "Ne može se pisati na";
> 		$admtext['notwrite'] = "nije moguće pisati, proverite dozvole";
> 		$admtext['checkwrite'] = "Proveri dozvole, mora biti omogućeno pisanje.";
> 		$admtext['toterrors'] = "Totalna Greška";
> 		$admtext['missfile'] = "Nedostaje fajl";
> 		$admtext['notunique'] = "nije jedinstven";
> 		$admtext['nodesc'] = "Greška definisanja parametara, nedostaje opis";
> 		$admtext['defval'] = "Podrazumevana vrednost";
> 		$admtext['written'] = "Fajl je napisan";
> 		$admtext['locmissing'] = "Nedostaje lokalna kopija xxx za instalaciju";
> 		$admtext['needmodupdate'] = "Potrebna su ažuriranja Moda";
> 		$admtext['cannotinstall'] = "Nije moguće instalirati ovaj Mod";
> 		$admtext['emptytarget'] = "Ciljni fajl je prazni fajl.";
> 		$admtext['cantdelmissing'] = "Nije moguće izbrisati datoteku";
1705c1822
< 		$admtext['editperf'] = "The Edit parameters were changed as follows:";
---
> 		$admtext['editperf'] = "Parametri za uređivanje su promenjeni na sledeći na�in:";
1707,1733c1824,1850
< 		$admtext['options'] = "Options";
< 		$admtext['viewlog'] = "View Log";
< 		$admtext['target'] = "Changes";
< 		$admtext['newfile'] = "Creates";
< 		$admtext['copiesfile'] = "Copies";
< 		$admtext['copiesfile2'] = "Copies to";
< 		$admtext['logoptions'] = "Mod Manager Log";
< 		$admtext['mmlogfilename'] = "Log File Name";
< 		$admtext['sortlistby'] = "Sort Lists by";
< 		$admtext['modname'] = "Mod Name";
< 		$admtext['bypassconfirm'] = "Bypass the Confirmations";
< 		$admtext['modifyoptions'] = "Modify Mod Manager Options";
< 		$admtext['ready'] = "OK to Install";
< 		$admtext['noselected'] = "You have not selected any files!";
< 		$admtext['choose'] = "Select";
< 		$admtext['showlogfile'] = "Show Mod Manager Action Log";
< 		$admtext['recentactions'] = "Mod Manager Most Recent Actions";
< 		$admtext['clearlog'] = "Clear Log";
< 		$admtext['confirmclearlog'] = "Are you sure you want to clear the log?";
< 		$admtext['modsyntax'] = "Mod Syntax";
< 		$admtext['modguidelines'] = "Mod Standards";
< 		$admtext['filemod'] = "File xxx is modified by";
< 		$admtext['potconf'] = "Potential Conflicts";
< 		$admtext['modifications'] = "modifications";
< 		$admtext['othermmoptions'] = "Other";
< 		$admtext['file'] = "File";
< 		$admtext['tngmods'] = "Mods for TNG ";
---
> 		$admtext['options'] = "Opcije";
> 		$admtext['viewlog'] = "Pogledaj Log Dnevnik";
> 		$admtext['target'] = "Promene";
> 		$admtext['newfile'] = "Kreiranje";
> 		$admtext['copiesfile'] = "Kopije";
> 		$admtext['copiesfile2'] = "Kopije na";
> 		$admtext['logoptions'] = "Mod Menađer Log";
> 		$admtext['mmlogfilename'] = "Log Fajl Ime";
> 		$admtext['sortlistby'] = "Sortiraj liste po";
> 		$admtext['modname'] = "Mod Naziv";
> 		$admtext['bypassconfirm'] = "Zaobići potvrde";
> 		$admtext['modifyoptions'] = "Modifikovati Mod Menađer Opcije";
> 		$admtext['ready'] = "OK za instalaciju";
> 		$admtext['noselected'] = "Niste odabrali nijedan fajl!";
> 		$admtext['choose'] = "Izaberite";
> 		$admtext['showlogfile'] = "Prikažite Mod Log Akcioni Menađer";
> 		$admtext['recentactions'] = "Mod Manager Najnovije Akcije";
> 		$admtext['clearlog'] = "Obriši Log";
> 		$admtext['confirmclearlog'] = "Jeste li sigurni da želite obrisati log?";
> 		$admtext['modsyntax'] = "Mod Sintaksa";
> 		$admtext['modguidelines'] = "Mod Standardi";
> 		$admtext['filemod'] = "Fajl xxx je izmenjen";
> 		$admtext['potconf'] = "Potencijalni Sukobi";
> 		$admtext['modifications'] = "modifikacije";
> 		$admtext['othermmoptions'] = "Drugo";
> 		$admtext['file'] = "Fajl";
> 		$admtext['tngmods'] = "Modovi za TNG ";
1735,1743c1852,1860
< 		$admtext['copied'] = "copied";
< 		$admtext['emptyfile'] = "file is empty";
< 		$admtext['filescopied'] = "files copied";
< 		$admtext['notinst'] = "not installed";
< 		$admtext['install'] = "install";
< 		$admtext['filedel'] = "File deleted";
< 		$admtext['created'] = "created";
< 		$admtext['choosefilter'] = "Choose the filter and click Go for the available controls";
< 		$admtext['mmmaxloglines'] = "Max number of transactions";
---
> 		$admtext['copied'] = "kopirano";
> 		$admtext['emptyfile'] = "fajl je prazan";
> 		$admtext['filescopied'] = "kopirani fajlovi";
> 		$admtext['notinst'] = "nije instalirana";
> 		$admtext['install'] = "instaliraj";
> 		$admtext['filedel'] = "Fajl je izbrisan";
> 		$admtext['created'] = "kreiran";
> 		$admtext['choosefilter'] = "Izaberite filter i kliknite na Idi za dostupne kontrole";
> 		$admtext['mmmaxloglines'] = "Maksimalan broj transakcija";
1746,1778c1863,1895
< 		$admtext['uninstall'] = "Uninstall";    // was $admtext['remove'] = "Remove"
< 		$admtext['cleanup'] = "Clean Up";  // previously used as $admtext['clean']
< 		$admtext['edopts'] = "Edit Options";  // previously used as $admtext['edit'] without Option text
< 		$admtext['ok2inst'] = "OK to install";  // previously used $admtext['ready'] which is already translated
< 		$admtext['badversion'] = "file version/version mismatch";
< 		$admtext['bomfound'] = "BOM removed";
< 		$admtext['cantinst'] = "cannot install";
< 		$admtext['cantproc'] = "cannot remove mod";
< 		$admtext['cantupd'] = "unable to update parameter";
< 		$admtext['cleanupall'] = "Clean up";
< 		$admtext['copiesreq'] = "file copies specified";
< 		$admtext['delete'] = "Delete";
< 		$admtext['deleteall'] = "Delete";
< 		$admtext['errors'] = "errors";
< 		$admtext['excused'] = "files excused";
< 		$admtext['filesinst'] = "files installed";
< 		$admtext['filesrem'] = "files removed";
< 		$admtext['format'] = "format error";
< 		$admtext['installall'] = "Install";
< 		$admtext['installing'] = "Installing";
< 		$admtext['line'] = "Line";
< 		$admtext['modified'] = "modified";
< 		$admtext['modsinst'] = "code modifications installed";
< 		$admtext['modrem'] = "mod uninstalled";
< 		$admtext['modsrem'] = "code modifications removed";
< 		$admtext['modsreq'] = "code modifications specified";
< 		$admtext['newfilesreq'] = "new files specified";
< 		$admtext['nfcreated'] = "new file created";
< 		$admtext['noact'] = "action tag invalid";
< 		$admtext['nocfgfile'] = "mod file not found";
< 		$admtext['nocomps'] = "missing elements";
< 		$admtext['noend'] = "%end:% tag missing";
< 		$admtext['nolocation'] = "missing location tag";
---
> 		$admtext['uninstall'] = "Deinstaliraj";    // was $admtext['remove'] = "Remove"
> 		$admtext['cleanup'] = "Pospremiti";  // previously used as $admtext['clean']
> 		$admtext['edopts'] = "Uredi opcije";  // previously used as $admtext['edit'] without Option text
> 		$admtext['ok2inst'] = "OK za instalaciju";  // previously used $admtext['ready'] which is already translated
> 		$admtext['badversion'] = "verzije fajla/neusklađenost verzije";
> 		$admtext['bomfound'] = "BOM uklonjen";
> 		$admtext['cantinst'] = "ne može da se instalira";
> 		$admtext['cantproc'] = "ne može se ukloniti mod";
> 		$admtext['cantupd'] = "nije moguće ažurirati parametar";
> 		$admtext['cleanupall'] = "Pospremiti";
> 		$admtext['copiesreq'] = "navedene kopije fajlova";
> 		$admtext['delete'] = "Obriši";
> 		$admtext['deleteall'] = "Obriši sve";
> 		$admtext['errors'] = "greške";
> 		$admtext['excused'] = "opravdani fajlovi";
> 		$admtext['filesinst'] = "instalirani fajlovi";
> 		$admtext['filesrem'] = "fajlovi uklonjeni";
> 		$admtext['format'] = "greška u formatu";
> 		$admtext['installall'] = "Instaliraj";
> 		$admtext['installing'] = "Instaliranje";
> 		$admtext['line'] = "Linija";
> 		$admtext['modified'] = "modifikovan";
> 		$admtext['modsinst'] = "instalirane modifikacije koda";
> 		$admtext['modrem'] = "mod deinstaliran";
> 		$admtext['modsrem'] = "uklonjene izmene koda";
> 		$admtext['modsreq'] = "specificirane izmene koda";
> 		$admtext['newfilesreq'] = "navedene su novi fajlovi";
> 		$admtext['nfcreated'] = "kreirana novi fajl";
> 		$admtext['noact'] = "oznaka akcije je nevažeća";
> 		$admtext['nocfgfile'] = "mod fajl nije pronađen";
> 		$admtext['nocomps'] = "nedostaju elementi";
> 		$admtext['noend'] = "%kraj:% nedostaje oznaka";
> 		$admtext['nolocation'] = "nedostaje oznaka lokacije";
1780,1799c1897,1916
< 		$admtext['opened'] = "opened";
< 		$admtext['optional'] = "optional";
< 		$admtext['partinst'] = "partially installed";
< 		$admtext['removeall'] = "Uninstall";    // was Remove Selected mods
< 		$admtext['removing'] = "Uninstalling";    // was Removing
< 		$admtext['reqtag'] = "required tag missing";
< 		$admtext['restparam'] = "Restoring default parameter";
< 		$admtext['return'] = "Return to Mod Manager";
< 		$admtext['tagnoterm'] = "tag not terminated";
< 		$admtext['tagunk'] = "tag is unknown";
< 		$admtext['tgtfile'] = "target file";
< 		$admtext['updated'] = "updated";
< 		$admtext['updparam'] = "Updating parameter";
< 		$admtext['unxend'] = "unexpected end of file";
< 		$admtext['warnings'] = "Warnings";
< 		$admtext['allowdeletepartial'] = "Allow Delete Selected of Partially Installed Mods";
< 		$admtext['allowdeleteinstalled'] = "Allow Delete of individually Installed Mods";
< 		$admtext['showwarnings'] = "Show Mod Warnings in Status";
< 		$admtext['logfullpath'] = "Log full path for file actions";
< 		$admtext['deleting'] = "Deleting ";
---
> 		$admtext['opened'] = "otvoren";
> 		$admtext['optional'] = "opciono";
> 		$admtext['partinst'] = "delimi�no instaliran";
> 		$admtext['removeall'] = "Deinstaliraj";    // was Remove Selected mods
> 		$admtext['removing'] = "Deinstaliranje";    // was Removing
> 		$admtext['reqtag'] = "nedostaje obavezna oznaka";
> 		$admtext['restparam'] = "Vraćanje podrazumevanog parametra";
> 		$admtext['return'] = "Povratak na Mod Manager";
> 		$admtext['tagnoterm'] = "oznaka nije prekinuta";
> 		$admtext['tagunk'] = "oznaka je nepoznata";
> 		$admtext['tgtfile'] = "ciljni fajl";
> 		$admtext['updated'] = "ažuriranje";
> 		$admtext['updparam'] = "Ažuriranje parametra";
> 		$admtext['unxend'] = "neo�ekivani kraj fajla";
> 		$admtext['warnings'] = "Upozorenja";
> 		$admtext['allowdeletepartial'] = "Dozvoli brisanje izabranih delimi�no instaliranih Modova";
> 		$admtext['allowdeleteinstalled'] = "Dopusti brisanje pojedina�no instaliranih Modova";
> 		$admtext['showwarnings'] = "Prikaži Mod upozorenja u statusu";
> 		$admtext['logfullpath'] = "Prijavite punu putanju za radnje fajlove";
> 		$admtext['deleting'] = "Brisanje ";
1801,1843c1918,1960
< 		$admtext['aflist'] = "Files";
< 		$admtext['hasoptions'] = "Options";
< 		$admtext['restore'] = "Restore Default";
< 		$admtext['stayon'] = "Lock";
< 		$admtext['accessible'] = "accessible";
< 		$admtext['bypassed'] = "bypassed";
< 		$admtext['willbypass'] = "will ignore";  // was "will bypass"
< 		$admtext['cantdel'] = "can't delete";
< 		$admtext['optmissing'] = "file missing (optional)";
< 		$admtext['tgtmissing'] = "target file missing";
< 		$admtext['optlocked'] = "file locked (optional)";
< 		$admtext['tgtlocked'] = "file locked";
< 		$admtext['alreadyrem'] = "already removed";
< 		$admtext['noaccess'] = "no access";
< 		$admtext['badinstall'] = "failed to install";
< 		$admtext['removed'] = "removed";
< 		$admtext['deleted'] = "deleted";
< 		$admtext['optsrcfilemissing'] = "optional source missing";
< 		$admtext['srcfilemissing'] = "source missing";
< 		$admtext['optnocopy'] = "optional file not copied";
< 		$admtext['notcopied'] = "not copied";
< 		$admtext['copied'] = "copied";
< 		$admtext['notcreated'] = "can't create new file";
< 		$admtext['optnotcreated'] = "can't create optional new file";
< 		$admtext['nocreated'] = "not created";
< 		$admtext['fixedheader'] = "Use Fixed Headers";
< 		$admtext['cantremok'] = "can't remove, optional, bypassed";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['edparams'] = "edit parameters";
< 		$admtext['compresslog'] = "Collapse Log Display";
< 		$admtext['formodname'] = "for mod name ";
< 		$admtext['nofolder'] = "target folder missing";
< 		$admtext['fileperms'] = "Please check file permissions";
< 		$admtext['noparam'] = "parameter missing";
< 		$admtext['editing'] = "editing";
< 		$admtext['redirect2log'] = "Redirect to Log For";
< 		$admtext['on_error'] = "Errors Only";
< 		$admtext['on_all'] = "All Transactions";
< 		$admtext['usestriping'] = "Use stripes";
< 		$admtext['stripeafter'] = "Stripe after number of rows";
< 		$admtext['adjusthdrs'] = "Adjust Fixed Headers";
< 		$admtext['displayoptions'] = "Display Settings";
< 		$admtext['no_frag'] = "code fragment not allowed here";
---
> 		$admtext['aflist'] = "Fajlovi";
> 		$admtext['hasoptions'] = "Opcije";
> 		$admtext['restore'] = "Povrati Uobi�ajeno";
> 		$admtext['stayon'] = "Zaklju�ati";
> 		$admtext['accessible'] = "pristupa�an";
> 		$admtext['bypassed'] = "zaobiđen";
> 		$admtext['willbypass'] = "će ignorisati";  // was "will bypass"
> 		$admtext['cantdel'] = "ne može da se izbriše";
> 		$admtext['optmissing'] = "nedostaje fajl (opciono)";
> 		$admtext['tgtmissing'] = "nedostaje ciljni fajl";
> 		$admtext['optlocked'] = "Fajl je zaklju�an (opciono)";
> 		$admtext['tgtlocked'] = "Fajl je zaklju�an";
> 		$admtext['alreadyrem'] = "već uklonjen";
> 		$admtext['noaccess'] = "nema pristupa";
> 		$admtext['badinstall'] = "nije uspelo da se instalira";
> 		$admtext['removed'] = "uklonjen";
> 		$admtext['deleted'] = "izbrisan";
> 		$admtext['optsrcfilemissing'] = "nedostaje dodatni izvor";
> 		$admtext['srcfilemissing'] = "nedostaje izvor";
> 		$admtext['optnocopy'] = "opcionalni fajl nije kopiran";
> 		$admtext['notcopied'] = "nije kopirano";
> 		$admtext['copied'] = "kopirano";
> 		$admtext['notcreated'] = "ne može da kreira novi fajl";
> 		$admtext['optnotcreated'] = "ne može da kreira opcioni novi fajl";
> 		$admtext['nocreated'] = "nije kreirano";
> 		$admtext['fixedheader'] = "Koristite Fiksna Zaglavlja";
> 		$admtext['cantremok'] = "ne može ukloniti, opcionalno, zaobići";
> 		$admtext['nofolder'] = "folder cilja nedostaje";
> 		$admtext['edparams'] = "uredi parametre";
> 		$admtext['compresslog'] = "Skupi Log Prikaz";
> 		$admtext['formodname'] = "za ime mod-a ";
> 		$admtext['nofolder'] = "folder cilja nedostaje";
> 		$admtext['fileperms'] = "Proverite dozvole za fajlove";
> 		$admtext['noparam'] = "parametar nedostaje";
> 		$admtext['editing'] = "uređivanje";
> 		$admtext['redirect2log'] = "Redirekcija do Logova za";
> 		$admtext['on_error'] = "Samo Greške";
> 		$admtext['on_all'] = "Sve transakcije";
> 		$admtext['usestriping'] = "Koristite Trake";
> 		$admtext['stripeafter'] = "Traka nakon broja redova";
> 		$admtext['adjusthdrs'] = "Prilagodite Fiksna Zaglavlja";
> 		$admtext['displayoptions'] = "Podešavanja Ekrana";
> 		$admtext['no_frag'] = "ovde nije dozvoljen fragment koda";
1845,1876c1962,1993
< 		$admtext['exists'] = "exists";
< 		$admtext['newdirsreq'] = "new folders specified";
< 		$admtext['cantrem'] = "can't remove";
< 		$admtext['showanalyzer'] = "Show Analyzer tab";
< 		$admtext['showdeveloper'] = "Show Other Developer tools";
< 		$admtext['showupdates'] = "Show Recommended Updates tab";
< 		$admtext['analyzefiles'] = "Analyze TNG Files";
< 		$admtext['parsetable'] = "View Parser Table";
< 		$admtext['recommendedfixes'] = "Recommended Updates";
< 		$admtext['selectmod'] = "Select a mod config file to view the parser table results";
< 		$admtext['parsertags'] = "Parser Tags Array:";
< 		$admtext['parsererror'] = "Error: ";
< 		$admtext['filesel'] = "Select Modified File to examine the changes";
< 		$admtext['custtextfixes'] = "The updated Mod Guidelines recommend that custom text be inserted before the comments at the beginning of the cust_text.php file so that mods do not impact user manual changes made after the comment lines.";
< 		$admtext['updcusttext'] = "Update cust_text.php files";
< 		$admtext['confirmupdcusttext'] = "Are you sure you want to update the cust_text.php files?";
< 		$admtext['compressnames'] = "Compress Mod Names in Mod List";
< 		$admtext['verified'] = "verified";
< 		$admtext['provisional'] = "(provisional) must be available";
< 		$admtext['backtoprevious'] = "Return to previous page";
< 		$admtext['reasontoupdate'] = "If you have not run the cust_text_update.php script as part of the TNG v12 upgrade, you need to update your cust_text.php files to <ul><li>add a new line to the files and </li><li>also update out-of-date line in your existing cust_text.php files</li></ul> which are not replaced during TNG upgrades.";
< 		$admtext['newanchor'] = "The new comment line should not be translated in the language files so that it can be used as an anchor to insert custom text before this new comment line by the mod developers.";
< 		$admtext['translateissue'] = "If you translate the new comment line, mod installs will fail.";
< 		$admtext['privatemod'] = "Private Mod";
< 		$admtext['protected'] = "protected-remove file manually";
< 		$admtext['restored'] = "restored";
< 		$admtext['confdelmod'] = "Do you really want to delete this mod from your system?";
< 		$admtext['allowdeletesupport'] = "Allow Delete support folder when mod is deleted";
< 		$admtext['delrisk'] = "By choosing this option, user accepts all risk that unintended folders could be deleted. We believe this risk is very small.";
< 		$admtext['delpartinfo'] = "You should only set this option to Yes, if you forgot to Uninstall previous versions of the mod before installing a new version.";
< 		$admtext['delinstinfo'] = "You should only set this option to Yes, if you installed a new version of the mod and the previous version still shows installed.";
< 		$admtext['updateopts'] = "Your mmconfig.php needs to be updated! Please click on the Options tab above and click on the Save button.";
---
> 		$admtext['exists'] = "postoji";
> 		$admtext['newdirsreq'] = "navedeni su nove folderi";
> 		$admtext['cantrem'] = "ne može da se ukloni";
> 		$admtext['showanalyzer'] = "Prikaži karticu Analiziraj TNG Fajlove";
> 		$admtext['showdeveloper'] = "Prikaži druge alatke za programere";
> 		$admtext['showupdates'] = "Prikaži karticu Preporu�ena Ažuriranja";
> 		$admtext['analyzefiles'] = "Analizirajte TNG fajlove";
> 		$admtext['parsetable'] = "Pregled Parser Tabele";
> 		$admtext['recommendedfixes'] = "Preporu�ena ažuriranja";
> 		$admtext['selectmod'] = "Izaberite mod config fajl da biste videli rezultate tabele parser-a";
> 		$admtext['parsertags'] = "Parser Tagova Reda:";
> 		$admtext['parsererror'] = "Greška: ";
> 		$admtext['filesel'] = "Izaberite fajl TNG da biste videli koji modovi uti�u na nju";
> 		$admtext['custtextfixes'] = "Ažurirane smjernice za modove preporu�uju, da se prilagođeni tekst ubaci pre komentara na po�etku datoteke cust_text.php tako da modovi ne uti�u na promene korisni�kog priru�nika koje su napravljene nakon linija komentara.";
> 		$admtext['updcusttext'] = "Ažuriranje cust_text.php fajla";
> 		$admtext['confirmupdcusttext'] = "Jeste li sigurni da želite ažurirati fajlove cust_text.php?";
> 		$admtext['compressnames'] = "Uklonite razmake iz imena fajlova u Mod Listi";
> 		$admtext['verified'] = "provereno";
> 		$admtext['provisional'] = "(privremeno) moraju biti dostupni";
> 		$admtext['backtoprevious'] = "Povratak na prethodnu stranicu";
> 		$admtext['reasontoupdate'] = "Ako niste pokrenuli skriptu cust_text_update.php kao dio nadogradnje TNG v12, morate ažurirati datoteke cust_text.php na <ul><li>dodajte novu liniju u fajlu, i </li><li>takođe ažurirate postojeću liniju u postojećim cust_text.php fajlovima</li></ul> koje se ne menjaju tokom nadogradnje TNG-a.";
> 		$admtext['newanchor'] = "Nova linija komentara ne bi trebalo da se prevodi u jezi�ke datoteke tako da se može koristiti kao sidro za umetanje prilagođenog teksta ispred ove nove linije komentara od strane mod programera.";
> 		$admtext['translateissue'] = "Ako prevedete novu liniju komentara, instalirani mod neće uspeti.";
> 		$admtext['privatemod'] = "Privatni Mod";
> 		$admtext['protected'] = "zaštićen-ukloni fajl ru�no";
> 		$admtext['restored'] = "obnavljenje";
> 		$admtext['confdelmod'] = "Da li zaista želite da izbrišete ovaj mod i pridruženi folder iz vašeg sistema? Ne možete poništiti ovu operaciju!";
> 		$admtext['allowdeletesupport'] = "Dozvoli brisanje foldera za podršku kada je mod obrisan";
> 		$admtext['delrisk'] = "Ako izaberete ovu opciju, korisnik prihvata sav rizik da se neželjeni folderi mogu izbrisati. Smatramo da je ovaj rizik veoma mali.";
> 		$admtext['delpartinfo'] = "Ovu opciju postavite samo na Da, ako ste zaboravili da deinstalirate prethodne verzije moda pre instaliranja nove verzije.";
> 		$admtext['delinstinfo'] = "Ovu opciju postavite samo na Da, ako ste instalirali novu verziju moda, a prethodna verzija još uvijek prikazuje instaliranu.";
> 		$admtext['updateopts'] = "Vaš mmconfig.php treba da bude ažuriran! Kliknite na karticu Opcije iznad i kliknite na dugme Sa�uvaj";
1878,1879c1995,2002
< 		$admtext['noeffect'] = "Warning: Does not change anything in TNG!";
< 		$admtext['cfgnowrite'] = "Warning: Cfg file is write-protected. Parameters cannot be changed.";
---
> 		$admtext['noeffect'] = "Upozorenje: Ne menja ništa u TNG-u!";
> 		$admtext['cfgnowrite'] = "Upozorenje: Cfg fajl je zaštićen od pisanja. Parametri se ne mogu menjati.";
> 		//added in 14.0.0
> 		$admtext['allmods'] = "All Mods";
> 		$admtext['installedmods'] = "Installed Mods Only";
> 		$admtext['partinstmods'] = "Installed + Partially Installed Mods";
> 		$admtext['showanalyzeractions'] = "Show actions in Mod Analyzer";
> 		$admtext['badchar'] = "Nevažec�i karakter";
1884,1898c2007,2020
< 		$admtext['confdeletedna'] = "Are you sure you want to delete this test?";
< 		$admtext['test_type'] = "Test Type";
< 		$admtext['test_number'] = "Test Number";
< 		$admtext['test_date'] = "Test Date";
< 		$admtext['modifydna'] = "Edit Existing DNA Test";
< 		$admtext['changestoalldna'] = "Changes to all tests";
< 		$admtext['addnewdna'] = "Add New DNA Test";
< 		$admtext['testinfo'] = "Test Information";
< 		$admtext['urls'] = "Relevant Links";
< 		$admtext['dnalater'] = "Note: Test can be linked to other individuals on the next screen.";
< 		$admtext['selecttype'] = "Please select a test type.";
< 		$admtext['entertestnum'] = "Please enter the test number.";
< 		$admtext['test_taker'] = "Person who took this test";
< 		$admtext['test_links'] = "People Linked by this Test";
< 		$admtext['changestotest'] = "Changes to test";
---
> 		$admtext['confdeletedna'] = "Jeste li sigurni da želite izbrisati ovaj test?";
> 		$admtext['test_type'] = "Tip Testa";
> 		$admtext['test_date'] = "Datum testiranja";
> 		$admtext['modifydna'] = "Uredi postojeći DNK Test";
> 		$admtext['changestoalldna'] = "Promene na svim testovima";
> 		$admtext['addnewdna'] = "Unesi Novi DNA Test";
> 		$admtext['testinfo'] = "Informacije testa";
> 		$admtext['urls'] = "Relevantni linkovi";
> 		$admtext['dnalater'] = "Napomena: Na sledećem ekranu može se dodati više informacija, a test povezati sa više osoba.";
> 		$admtext['selecttype'] = "Izaberite tip testa.";
> 		$admtext['entertestnum'] = "Unesite broj testa.";
> 		$admtext['test_taker'] = "Osoba koja je polagala ovaj test";
> 		$admtext['test_links'] = "Ljudi povezani ovim testom";
> 		$admtext['changestotest'] = "Promene za testiranje";
1900,1918c2022,2049
< 		$admtext['dnalater'] = "Note: Test can be linked to other individuals on the next screen.";
< 		$admtext['markers'] = "Number of Markers";
< 		$admtext['test_values'] = "Test Values";
< 		$admtext['separate'] = "Separate values with commas";
< 		$admtext['person_name'] = "Person not in database";
< 		$admtext['privsection'] = "Privacy";
< 		$admtext['configsettings'] = "General Settings";
< 		$admtext['addtotestgroup'] = "Add Test To A Group";
< 		$admtext['dna_group'] = "DNA Group";
< 		$admtext['groupid'] = "Group ID";
< 		$admtext['addgroup'] = "Add Group";
< 		$admtext['entergroupid'] = "Please enter a group ID";
< 		$admtext['entergroupdesc'] = "Please enter a group description";
< 		$admtext['confgroupdelete'] = "Are you sure you want to delete this group?";
< 		$admtext['modifygroup'] = "Edit Existing Group";
< 		$admtext['mrcaiorf'] = "If relevant, enter a person ID OR a family ID";
< 		$admtext['test_results'] = "Test Results";
< 		$admtext['mdaID'] = "Most distant ancestor ID";
< 		$admtext['mrcaID'] = "Most recent common ancestor ID";
---
> 		$admtext['dnalater'] = "Napomena: Na sledećem ekranu može se dodati više informacija, a test povezati sa više osoba.";
> 		$admtext['markers'] = "Broj markera";
> 		$admtext['test_values'] = "Testne Vrednosti";
> 		$admtext['separate'] = "Odvojite vrednosti zarezima";
> 		$admtext['person_name'] = "Osoba nije u bazi podataka";
> 		$admtext['privsection'] = "Privatnost";
> 		$admtext['configsettings'] = "Opšta Podešavanja";
> 		$admtext['addtotestgroup'] = "Dodaj Test Grupi";
> 		$admtext['dna_group'] = "DNA Grupa";
> 		$admtext['groupid'] = "ID grupe";
> 		$admtext['addgroup'] = "Dodaj grupu";
> 		$admtext['entergroupid'] = "Unesite ID grupe";
> 		$admtext['entergroupdesc'] = "Unesite opis grupe";
> 		$admtext['confgroupdelete'] = "Jeste li sigurni da želite izbrisati ovu grupu?";
> 		$admtext['modifygroup'] = "Uredi postojeću grupu";
> 		$admtext['mrcaiorf'] = "Ako je relevantno, unesite ID osobe ili ID porodice";
> 		$admtext['test_results'] = "Rezultati Testa";
> 		$admtext['mdaID'] = "Najdalji ID pretka";
> 		$admtext['mrcaID'] = "Najbliži ID zajedni�kog pretka";
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Broj Testa";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Držite test privatnim";
> 		$admtext['multivalues'] = "Koristite crtice između više vrednosti";
> 		$admtext['changestogroup'] = "Promene u DNK grupi";
> 		$admtext['modifydnagroup'] = "Uredite postojeću DNK Grupu";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Povežite ovaj DN� test sa osobom";
1923,1935c2054,2066
< $admtext['cannotexecutequery'] = "Cannot execute query";
< $admtext['addnew'] = "Add New";
< $admtext['individuals'] = "individuals";
< $admtext['succadded'] = "was successfully added";
< $admtext['succaddedlinked'] = "was successfully added and linked to";
< $admtext['succsaved'] = "were successfully saved";
< $admtext['succdeleted'] = "was successfully deleted";
< $admtext['succdeletedpluslinks'] = "was successfully deleted, along with all links";
< $admtext['text_delete'] = "Delete";
< $admtext['deleted'] = "Deleted";
< $admtext['deleteselected'] = "Delete Selected";
< $admtext['noresults'] = "No results found. Please try again.";
< $admtext['action'] = "Action";
---
> $admtext['cannotexecutequery'] = "Ne može da se izvrši upit";
> $admtext['addnew'] = "Dodaj Novi";
> $admtext['individuals'] = "pojedninci";
> $admtext['succadded'] = "je uspešno dodato";
> $admtext['succaddedlinked'] = "je uspešno dodan i povezan sa";
> $admtext['succsaved'] = "su uspešno sa�uvane";
> $admtext['succdeleted'] = "je uspešno izbrisan";
> $admtext['succdeletedpluslinks'] = "je uspešno izbrisana, zajedno sa svim vezama";
> $admtext['text_delete'] = "Izbrisati";
> $admtext['deleted'] = "Izbrisati";
> $admtext['deleteselected'] = "Izbriši izabrano";
> $admtext['noresults'] = "Nema rezultata. Molim vas, pokušajte ponovo.";
> $admtext['action'] = "Akcija";
1937,1993c2068,2123
< $admtext['edit'] = "Edit";
< $admtext['notes'] = "Notes";
< $admtext['name'] = "Name";
< $admtext['description'] = "Description";
< $admtext['text_continue'] = "Continue...";
< $admtext['searchfor'] = "Search for";
< $admtext['lookin'] = "Look in (check all that apply)";
< $admtext['cemeteryid'] = "Cemetery ID";
< $admtext['exactmatch'] = "Exact match only";
< $admtext['nothingtodelete'] = "Nothing to delete";
< $admtext['state'] = "state";
< $admtext['country'] = "country";
< $admtext['finish'] = "Finish";
< $admtext['ifphotouploaded'] = "Leave this field blank if the file has already been uploaded to your photos folder.";
< $admtext['eventtype'] = "Event Type";
< $admtext['source'] = "Source";
< $admtext['savechanges'] = "Save Changes";
< $admtext['family'] = "Family";
< $admtext['find'] = "Find...";
< $admtext['create'] = "Create...";
< $admtext['sourceid'] = "Source ID";
< $admtext['birthabbr'] = "b.";
< $admtext['chrabbr'] = "c.";
< $admtext['remove'] = "Remove";
< $admtext['moveup'] = "Move Up";
< $admtext['movedown'] = "Move Down";
< $admtext['enterpersonid'] = "Please enter a Person ID";
< $admtext['personid'] = "Person ID";
< $admtext['otherevents'] = "Other Events";
< $admtext['required'] = "required";
< $admtext['children'] = "Children";
< $admtext['chrdate'] = "Christening Date";
< $admtext['chrplace'] = "Christening Place";
< $admtext['deathdate'] = "Death Date";
< $admtext['deathplace'] = "Death Place";
< $admtext['burialdate'] = "Burial Date";
< $admtext['burialplace'] = "Burial Place";
< $admtext['birthdate'] = "Birth Date";
< $admtext['birthplace'] = "Birth Place";
< $admtext['title'] = "Title";
< $admtext['sex'] = "Sex";
< $admtext['marriagedate'] = "Marriage Date";
< $admtext['marriageplace'] = "Marriage Place";
< $admtext['lastname'] = "Last Name";
< $admtext['firstname'] = "First Name";
< $admtext['filename'] = "File Name";
< $admtext['linkspersonid'] = "Links (Person ID)";
< $admtext['cannotopen'] = "Cannot open file";
< $admtext['check'] = "Check";
< $admtext['generate'] = "Generate";
< $admtext['update'] = "Update";
< $admtext['confdeleteevent'] = "Jeste li sigurni da hocete da obrišete event?";
< $admtext['existinglinks'] = "Existing Links:<br/>(check to delete)";
< $admtext['lowersortfirst'] = "Lower numbers sort first. Decimal numbers may also be used.";
< $admtext['personsname'] = "Person's Name";
< $admtext['tablecreation'] = "Table Creation";
< $admtext['tracklines'] = "Track Lines";
---
> $admtext['edit'] = "Izmeni";
> $admtext['notes'] = "Beleške";
> $admtext['name'] = "Ime";
> $admtext['description'] = "Opis";
> $admtext['text_continue'] = "Nastavi...";
> $admtext['searchfor'] = "Pretraga za";
> $admtext['lookin'] = "Pretraga (ozna�ite sve na koje se primenjuje)";
> $admtext['cemeteryid'] = "ID Groblja";
> $admtext['exactmatch'] = "Samo ta�no podudaranje";
> $admtext['nothingtodelete'] = "Ništa za brisanje";
> $admtext['state'] = "država";
> $admtext['country'] = "domovina";
> $admtext['finish'] = "Završi";
> $admtext['ifphotouploaded'] = "Ostavite ovo polje praznim ako je fajl već u�itan u vaš folder za fotografije.";
> $admtext['eventtype'] = "Tip Događaja";
> $admtext['source'] = "Izvor";
> $admtext['savechanges'] = "Sa�uvaj izmene";
> $admtext['family'] = "Porodica";
> $admtext['find'] = "Pretraga...";
> $admtext['create'] = "Kreirati...";
> $admtext['sourceid'] = "ID Izvora";
> $admtext['birthabbr'] = "rođ.";
> $admtext['chrabbr'] = "smr.";
> $admtext['remove'] = "Ukloni";
> $admtext['moveup'] = "Pomeri gore";
> $admtext['movedown'] = "Pomeri dole";
> $admtext['enterpersonid'] = "Unesite ID Osobe";
> $admtext['personid'] = "ID Osobe";
> $admtext['required'] = "potreban";
> $admtext['children'] = "Deca";
> $admtext['chrdate'] = "Datum krštenja";
> $admtext['chrplace'] = "Mesto krštenja";
> $admtext['deathdate'] = "Datum Smrti";
> $admtext['deathplace'] = "Mesto Smrti";
> $admtext['burialdate'] = "Datum Sahrane";
> $admtext['burialplace'] = "Mesto Sahrane";
> $admtext['birthdate'] = "Datum Rođenja";
> $admtext['birthplace'] = "Mesto Rođenja";
> $admtext['title'] = "Naslov";
> $admtext['sex'] = "Pol";
> $admtext['marriagedate'] = "Datum Braka";
> $admtext['marriageplace'] = "Mesto Braka";
> $admtext['lastname'] = "Prezime";
> $admtext['firstname'] = "Ime";
> $admtext['filename'] = "Naziv Fajla";
> $admtext['linkspersonid'] = "Linkovi (ID Osobe)";
> $admtext['cannotopen'] = "Ne mogu otvoriti fajl";
> $admtext['check'] = "Proverava";
> $admtext['generate'] = "Generisati";
> $admtext['update'] = "Ažurirati";
> $admtext['confdeleteevent'] = "Da li ste sigurni da želite da obrišete izabrano?";
> $admtext['existinglinks'] = "Postojeći linkovi:<br/>(provera brisanja)";
> $admtext['lowersortfirst'] = "Niži brojevi sortiraju prvo. Decimalni brojevi se takođe mogu koristiti.";
> $admtext['personsname'] = "Ime osobe";
> $admtext['tablecreation'] = "Kreiranje tabele";
> $admtext['tracklines'] = "Praćenje Linija";
1996c2126
< $admtext['cemeteries'] = "Groblja";
---
> $admtext['cemeteries'] = "Groblje";
1999,2000c2129,2130
< $admtext['histories'] = "Tekstovi";
< $admtext['people'] = "Oosbe";
---
> $admtext['histories'] = "Istorije";
> $admtext['people'] = "Osobe";
2004c2134
< $admtext['suffix'] = "Suffix";
---
> $admtext['suffix'] = "Sufiks";
2006,2025c2136,2155
< $admtext['confdeleteentity'] = "Are you sure you want to delete the selected";
< $admtext['cemetery'] = "Cemetery";
< $admtext['language'] = "Language";
< $admtext['display'] = "Display";
< $admtext['languages'] = "Languages";
< $admtext['orderpound'] = "Order #";
< $admtext['tree'] = "Tree";
< $admtext['alltrees'] = "All Trees";
< $admtext['selectaddtree'] = "Tree (select or add new)";
< $admtext['selecttree'] = "Please select/add a tree.";
< $admtext['treebefevent'] = "You must select or enter a Tree name before you can add new events.";
< $admtext['text_rename'] = "Rename";
< $admtext['clear'] = "Clear";
< $admtext['linktothis'] = "Link to this individual";
< $admtext['linkexample'] = "(enter ID, i.e. \"I###\")";
< $admtext['existingconfig'] = "Existing Configuration";
< $admtext['lastmodified'] = "Last Modified";
< $admtext['addnotes'] = "Additional Notes";
< $admtext['confdeletenote'] = "Jeste li sigurni da hocete da obrišete note?";
< $admtext['treebefnote'] = "You must select or enter a Tree name before you can add new notes.";
---
> $admtext['confdeleteentity'] = "Da li ste sigurni da želite obrisati odabrano";
> $admtext['cemetery'] = "Groblje";
> $admtext['language'] = "Jezik";
> $admtext['display'] = "Prikaz";
> $admtext['languages'] = "Jezici";
> $admtext['orderpound'] = "Redosled #";
> $admtext['tree'] = "Stablo";
> $admtext['alltrees'] = "Sva Stabla";
> $admtext['selectaddtree'] = "Stablo (izaberi ili dodaj novo)";
> $admtext['selecttree'] = "Izaberite/dodajte stablo.";
> $admtext['treebefevent'] = "Morate da izaberete ili unesete ime stabla pre nego što možete da dodate nove događaje.";
> $admtext['text_rename'] = "Preimenuj";
> $admtext['clear'] = "O�istiti";
> $admtext['linktothis'] = "Veza sa ovom osobom";
> $admtext['linkexample'] = "(uneti ID, i.e. \"I###\")";
> $admtext['existingconfig'] = "Postojeća Konfiguracija";
> $admtext['lastmodified'] = "Poslednja izmena";
> $admtext['addnotes'] = "Dodatne Napomene";
> $admtext['confdeletenote'] = "Jeste li sigurni da želite izbrisati ovu napomenu?";
> $admtext['treebefnote'] = "Da biste dodali nove beleške, morate da izaberete ili unesete ime stabla.";
2027,2029c2157,2159
< $admtext['entersearchvalue'] = "Please enter a search value.";
< $admtext['trees'] = "Trees";
< $admtext['users'] = "Users";
---
> $admtext['entersearchvalue'] = "Unesite vrijednost pretraživanja.";
> $admtext['trees'] = "Stabla";
> $admtext['users'] = "Korisnici sajta";
2031,2038c2161,2168
< $admtext['norights'] = "You are not authorized to view this page. If you have a username and password, please login below.";
< $admtext['username'] = "Username";
< $admtext['password'] = "Password";
< $admtext['login'] = "Login";
< $admtext['logout'] = "Logout";
< $admtext['city'] = "City";  //from cemeteries
< $admtext['cap_country'] = "Country";  //from cemeteries
< $admtext['addnewtree'] = "Add New Tree";
---
> $admtext['norights'] = "Niste ovlašćeni da vidite ovu stranicu. Ako imate korisni�ko ime i lozinku, prijavite se ispod.";
> $admtext['username'] = "Korisni�ko ime";
> $admtext['password'] = "Lozinka";
> $admtext['login'] = "Prijavite se";
> $admtext['logout'] = "Odjavite se";
> $admtext['city'] = "Grad";  //from cemeteries
> $admtext['cap_country'] = "Država";  //from cemeteries
> $admtext['addnewtree'] = "Dodaj Novo Drvo";
2040c2170
< $admtext['page'] = "Page";  //from sources
---
> $admtext['page'] = "Strana";  //from sources
2042,2079c2172,2205
< $admtext['confdeletepers'] = "Jeste li sigurni da hocete da obrišete person?";
< $admtext['save'] = "Save";
< $admtext['of'] = "of";
< $admtext['size'] = "Size";
< $admtext['open'] = "Open";
< $admtext['selectfile'] = "Select File";
< $admtext['altdesc'] = "Alternate Description";
< $admtext['altnotes'] = "Alternate Notes";
< $admtext['savereturn'] = "Return to this page";
< $admtext['saveback'] = "Return to menu";
< $admtext['user'] = "User";
< $admtext['DIV'] = "Divorced";
< $admtext['search'] = "Search";  //from findpersonform
< $admtext['searchresults'] = "Search Results";  //from people
< $admtext['clicktoselect'] = "click to select";
< $admtext['familyid'] = "Family ID";  //from families
< $admtext['secondary'] = "Secondary Processes";
< $admtext['commas'] = "Separate multiple entries with commas";
< $admtext['onsave'] = "On save";
< $admtext['adminhome'] = "Admin Home";
< $admtext['labelbranches'] = "Label Branches";
< $admtext['branch'] = "Branch";
< $admtext['findperson'] = "Find Person...";
< $admtext['findfamily'] = "Find Family...";
< $admtext['repeatlastq'] = "Repeat last search";
< $admtext['alwayson'] = "Always viewable";
< $admtext['all'] = "All";
< $admtext['lnprefix'] = "Surname Prefix";
< $admtext['nameorder'] = "Name Order";
< $admtext['western'] = "First name first";
< $admtext['lockid'] = "Lock";
< $admtext['linktothese'] = "Link to:";
< $admtext['alsolinkto'] = "Also link to:";
< $admtext['linkspersfam'] = "Links (Person, Family or Source ID)";
< $admtext['findsource'] = "Find Source...";
< $admtext['address'] = "Address";
< $admtext['stateprov'] = "State/Province";
< $admtext['zip'] = "Zip/Postal Code";
---
> $admtext['confdeletepers'] = "Jeste li sigurni da želite izbrisati tu osobu? Osoba će biti potpuno izbrisan sa vašeg stabla.";
> $admtext['save'] = "Snimi";
> $admtext['of'] = "od";
> $admtext['size'] = "Veli�ina";
> $admtext['open'] = "Otvori";
> $admtext['selectfile'] = "Izaberite fajl";
> $admtext['altdesc'] = "Alternativni Opis";
> $admtext['altnotes'] = "Alternativna Beleška";
> $admtext['user'] = "Korisnik";
> $admtext['DIV'] = "Razveden";
> $admtext['search'] = "Traži";  //from findpersonform
> $admtext['searchresults'] = "Rezultati pretrage";  //from people
> $admtext['clicktoselect'] = "kliknite da biste izabrali";
> $admtext['familyid'] = "ID Porodice";  //from families
> $admtext['onsave'] = "Snima se";
> $admtext['adminhome'] = "Admin po�etna stranica";
> $admtext['labelbranches'] = "Labele Grane";
> $admtext['branch'] = "Grana";
> $admtext['findperson'] = "Pronađi osobu...";
> $admtext['findfamily'] = "Pronađi porodicu...";
> $admtext['repeatlastq'] = "Ponovi poslednju pretragu";
> $admtext['alwayson'] = "Uvek vidljiv";
> $admtext['all'] = "Sve";
> $admtext['lnprefix'] = "Prefiks prezimena";
> $admtext['nameorder'] = "Redosled Imena";
> $admtext['western'] = "Prvo ime";
> $admtext['lockid'] = "Zaklju�ati";
> $admtext['linktothese'] = "Link za:";
> $admtext['alsolinkto'] = "Takođe link za:";
> $admtext['linkspersfam'] = "Linkovi (Osoba, Porodica ili ID Izvora)";
> $admtext['findsource'] = "Pronađi Izvor...";
> $admtext['address'] = "Adresa";
> $admtext['stateprov'] = "Država/Provincija";
> $admtext['zip'] = "Poštanski broj";
2081,2085c2207,2211
< $admtext['otherinfo'] = "Other Information";
< $admtext['available'] = "Available";
< $admtext['backuprestore'] = "Utilities";
< $admtext['place'] = "Place";
< $admtext['treeid'] = "Tree ID";
---
> $admtext['otherinfo'] = "Ostale informacije";
> $admtext['available'] = "Na raspolaganju";
> $admtext['backuprestore'] = "Tehni�ko održavanje";
> $admtext['place'] = "Mesto";
> $admtext['treeid'] = "ID Porodi�nog Stabla";
2087,2126c2213,2252
< $admtext['event'] = "Event";
< $admtext['eventdate'] = "Event Date";
< $admtext['eventplace'] = "Event Place";
< $admtext['detail'] = "Detail";
< $admtext['export'] = "Export";
< $admtext['tlevents'] = "Timeline Events";
< $admtext['places'] = "Places";
< $admtext['duplicate'] = "Changes were not saved. Another record with the same key already exists.";
< $admtext['alttitle'] = "Alternate Title";
< $admtext['enttitle'] = "Title";  //title for a history or photo, not a person
< $admtext['address1'] = "Address 1";
< $admtext['address2'] = "Address 2";
< $admtext['countryaddr'] = "Country";
< $admtext['branches'] = "Branches";
< $admtext['nobranch'] = "No Branch";
< $admtext['scrollbranch'] = "(Scroll to see all choices)";
< $admtext['matches'] = "Matches";
< $admtext['review'] = "Review";
< $admtext['allusers'] = "All Users";
< $admtext['deathabbr'] = "d.";
< $admtext['burialabbr'] = "bur.";
< $admtext['nochanges'] = "No changes were made.";
< $admtext['changestoallitems'] = "Changes to all items";  //were made successfully
< $admtext['find2'] = "Find";
< $admtext['text_sort'] = "Sort";
< $admtext['documents'] = "Documents";
< $admtext['repository'] = "Repository";
< $admtext['more'] = "More";
< $admtext['repositories'] = "Repositories";
< $admtext['divplace'] = "Divorce Place";
< $admtext['divdate'] = "Divorce Date";
< $admtext['divdatetr'] = "Divorce Date (True)";
< $admtext['creategendex'] = "Create GENDEX";
< $admtext['datamaint'] = "Data Import";
< $admtext['imagefiletoupload'] = "Image file to upload";
< $admtext['indfamorsrc'] = "individual(s), families or sources";
< $admtext['improperpermissions'] = "because the folder does not have proper permissions. Try chmod(777)";
< $admtext['person'] = "Person";
< $admtext['setup'] = "Setup";
< $admtext['manage'] = "Manage";
---
> $admtext['event'] = "Događaj";
> $admtext['eventdate'] = "Datum Događaja";
> $admtext['eventplace'] = "Datum Mesta";
> $admtext['detail'] = "Detalj";
> $admtext['export'] = "Izvesti";
> $admtext['tlevents'] = "Vremeplov";
> $admtext['places'] = "Mesta";
> $admtext['duplicate'] = "Promene nisu sa�uvane. Još jedan zapis sa istim klju�em već postoji.";
> $admtext['alttitle'] = "Alternativni Naslov";
> $admtext['enttitle'] = "Naslov";  //title for a history or photo, not a person
> $admtext['address1'] = "Adresa 1";
> $admtext['address2'] = "Adresa 2";
> $admtext['countryaddr'] = "Domovina";
> $admtext['branches'] = "Grane";
> $admtext['nobranch'] = "No branch";
> $admtext['scrollbranch'] = "(Skrolujte da biste videli sve izbore)";
> $admtext['matches'] = "Pronađeno";
> $admtext['review'] = "Pregled";
> $admtext['allusers'] = "Svi Korinsici";
> $admtext['deathabbr'] = "rođ.";
> $admtext['burialabbr'] = "sahr.";
> $admtext['nochanges'] = "Nije bilo izmena.";
> $admtext['changestoallitems'] = "Promene u svim stavkama";  //were made successfully
> $admtext['find2'] = "Traži";
> $admtext['text_sort'] = "Sortiraj";
> $admtext['documents'] = "Dokumenti";
> $admtext['repository'] = "Repozitorijum";
> $admtext['more'] = "Više";
> $admtext['repositories'] = "Repozitorijumi/Arhive";
> $admtext['divplace'] = "Mesto Razvoda";
> $admtext['divdate'] = "Datum Razvoda";
> $admtext['divdatetr'] = "Datum razvoda (Ta�no)";
> $admtext['creategendex'] = "Kreiraj GENDEX";
> $admtext['datamaint'] = "Uvoz/Izvoz podataka";
> $admtext['imagefiletoupload'] = "Fajl za otpremanje";
> $admtext['indfamorsrc'] = "osoba(e), porodice, izvori, repozitorijumi ili mesta.";
> $admtext['improperpermissions'] = "jer fascikla ne postoji (proverite Root Path) ili nemate odgovarajuće dozvole (pokušajte chmod (777)).";
> $admtext['person'] = "Osoba";
> $admtext['setup'] = "Konfiguracije";
> $admtext['manage'] = "Upravljati";
2128,2135c2254,2259
< $admtext['norecords'] = "No records exist.";
< $admtext['secondarymaint'] = "Secondary Processes";
< $admtext['customeventtypes'] = "Custom Event Types";
< $admtext['findmatches'] = "Find Matches";
< $admtext['matchthese'] = "Match the following fields:";
< $admtext['otheroptions'] = "Other Options:";
< $admtext['ignoreblanks'] = "Ignore Blanks";
< $admtext['nextmatch'] = "Next Match";
---
> $admtext['norecords'] = "Nema zapisa.";
> $admtext['findmatches'] = "Pronađena poklapanja";
> $admtext['matchthese'] = "Odgovara sledećim poljima:";
> $admtext['otheroptions'] = "Druge opcije:";
> $admtext['ignoreblanks'] = "Ignoriši Prazno";
> $admtext['nextmatch'] = "Sledeće Podudaranje";
2137,2153c2261,2277
< $admtext['comprefresh'] = "Compare/Refresh";
< $admtext['mswitch'] = "Switch";
< $admtext['nomatches'] = "No Matches";
< $admtext['combineextras'] = "Combine photos &amp; histories";  //changed as well
< $admtext['fasterdisplay'] = "Note: This page is formatted differently to allow for faster display.";
< $admtext['publichome'] = "Public Home";
< $admtext['media'] = "Media";
< $admtext['albums'] = "Albums";
< $admtext['import'] = "Import";
< $admtext['item'] = "Item";
< $admtext['combinenotesonly'] = "Combine notes";
< $admtext['addmedia'] = "Add Media";
< $admtext['latitude'] = "Latitude";
< $admtext['longitude'] = "Longitude";
< $admtext['gedimport'] = "GEDCOM Import";
< $admtext['improper2'] = "because the original file is too large or is not a valid image, or because the folder does not exist (check the Root Path) or does not have proper permissions (try chmod(777)).";
< $admtext['confdeleterecs'] = "Are you sure you want to delete the selected records?";
---
> $admtext['comprefresh'] = "Uporediti/Osvežiti";
> $admtext['mswitch'] = "Zamena";
> $admtext['nomatches'] = "Nema Podudaranja";
> $admtext['combineextras'] = "Kombinirajte medije &amp; istorije";  //changed as well
> $admtext['fasterdisplay'] = "Napomena: Ova stranica je druga�ije formatirana da bi omogućila brži prikaz.";
> $admtext['publichome'] = "Javna Po�etna Stranica";
> $admtext['media'] = "Mediji";
> $admtext['albums'] = "Albumi";
> $admtext['import'] = "Uvezi";
> $admtext['item'] = "Stavka";
> $admtext['combinenotesonly'] = "Kombinujte napomene/beleške";
> $admtext['addmedia'] = "Dodaj Medij";
> $admtext['latitude'] = "Latituda/Å¡irina";
> $admtext['longitude'] = "Longituda/dužina";
> $admtext['gedimport'] = "GEDCOM Uvoz podataka";
> $admtext['improper2'] = "jer je originalna datoteka prevelika ili nije važeća slika, ili zato što folder ne postoji (proverite Root Path) ili nema odgovarajuće dozvole (pokušajte chmod (777)).";
> $admtext['confdeleterecs'] = "Da li ste sigurni da želite da izbrišete izabrane zapise?";
2155,2226c2279,2348
< $admtext['googleplace'] = "Geocode Location";
< $admtext['notfound'] = " not found. Try another search. Check the Map Search Help for possible reasons the search failed, or try your search using the Full Google Map Search link";
< $admtext['showhidemap'] = "Show/hide clickable map";
< $admtext['getcoords'] = "(to determine latitude, longitude and zoom)";
< $admtext['searchstring'] = "Search for a Place";
< $admtext['zoom'] = "Zoom";
< $admtext['selectplacelevel'] = "Select Place Level";
< $admtext['difficultmap'] = "Full Google Map Search";
< $admtext['maphelp'] = "Map Search Help";
< $admtext['gobutton'] = "Search";
< $admtext['findpersonid'] = "Find Person ID";
< $admtext['findfamilyid'] = "Find Family ID";
< $admtext['findsourceid'] = "Find Source ID";
< $admtext['entersourcepart'] = "Enter part of source title";
< $admtext['findrepoid'] = "Find Repository ID";
< $admtext['enterrepopart'] = "Enter part of repository title";
< $admtext['findplace'] = "Find Place";
< $admtext['enterplacepart'] = "enter part of a place name";
< $admtext['entereventinfo'] = "Upišite datum, mesto ili neki detalj za ovaj podatak.";
< $admtext['entereventtype'] = "Odaberite tip podatka.";
< $admtext['enternote'] = "Upišite tekst beleške.";
< $admtext['selectsource'] = "Please select a Source.";
< $admtext['confdeletecite'] = "Jeste li sigurni da hocete da obrišete citation?";
< $admtext['spouses'] = "Spouses";
< $admtext['entertreeid'] = "Please enter a tree ID.";
< $admtext['entertreename'] = "Please enter a tree name.";
< $admtext['citations'] = "Citations";
< $admtext['eventtypes'] = "Tipovi podataka";
< $admtext['associations'] = "Associations";
< $admtext['makefolder'] = "Make Folder";
< $admtext['allcurrentdata'] = "All current data";
< $admtext['matchingonly'] = "Matching records only";
< $admtext['donotreplace'] = "Do not replace any data";
< $admtext['useroffset'] = "Start IDs at:";
< $admtext['phone'] = "Phone";
< $admtext['website'] = "Web Site";
< $admtext['thumb'] = "Thumb";  //as in thumbnail
< $admtext['displayorder'] = "Display Order";
< $admtext['go'] = "Go";
< $admtext['help'] = "Help";
< $admtext['husband'] = "Husband";
< $admtext['wife'] = "Wife";
< $admtext['husbname'] = "Muževljevo ime";
< $admtext['wifename'] = "Ženino ime";
< $admtext['drag'] = "Drag";
< $admtext['enterinamepart'] = "enter part of first and/or last name";
< $admtext['enterfnamepart'] = "Enter part of father's and/or mother's name";
< $admtext['hide'] = "Hide";
< $admtext['toggle'] = "toggle display";
< $admtext['wsel'] = "With selected:";
< $admtext['msg'] = "Message";
< $admtext['default'] = "Default";
< $admtext['events'] = "Events";
< $admtext['date'] = "Date";
< $admtext['savecont'] = "Save and continue...";
< $admtext['alphanum'] = "Please use only alphanumeric characters in your Tree ID.";
< $admtext['mediatypes'] = "Media Types";
< $admtext['appendall'] = "Append all records";
< $admtext['NPFX'] = "Prefix";
< $admtext['prefix'] = "Prefix";
< $admtext['mostwanted'] = "Most Wanted";
< $admtext['idexists'] = "could not be added because this ID already exists. Use the Back button to return to the previous page and select a different ID.";
< $admtext['notdeleted'] = "File could not be deleted. Please check file permissions.";
< $admtext['confdeletefile'] = "Are you sure you want to delete this file?";
< //changed in 8.0.0
< $admtext['datenote'] = "<strong>Note:</strong> When entering dates, please use the standard genealogical format DD MMM YYYY. For example, 10 Apr 2004.";
< $admtext['oriental'] = "Surname first";
< $admtext['langfolder'] = "Folder where language files<br/>will be stored";
< //moved here in 8.0.0
< $admtext['repoid'] = "Repository ID";
< $admtext['whatsnew'] = "What's New";
< $admtext['linkedto'] = "Linked to";
---
> $admtext['googleplace'] = "Geokod Lokacija";
> $admtext['notfound'] = " nije pronađen. Probajte drugu pretragu. Proverite pomoć za pretraživanje karata za moguće razloge zbog kojih pretraživanje nije uspelo, ili pokušajte sa pretraživanjem pomoću veze Puna pretraga Google karte";
> $admtext['showhidemap'] = "Prikaži/Sakrij mapu";
> $admtext['getcoords'] = "(da odredite geografsku širinu, dužinu i uvećanje)";
> $admtext['searchstring'] = "Potražite mesto";
> $admtext['zoom'] = "Uvećanje";
> $admtext['selectplacelevel'] = "Izaberite Tip Mesta";
> $admtext['difficultmap'] = "Potpuno pretraživanje Google mape";
> $admtext['maphelp'] = "Pomoć za pretraživanje Mapa";
> $admtext['gobutton'] = "Pretraga";
> $admtext['findpersonid'] = "Pronađi ID Osobe";
> $admtext['findfamilyid'] = "Pronađi ID Porodice";
> $admtext['findsourceid'] = "Pronađi ID Izvora";
> $admtext['entersourcepart'] = "Unesite deo naslova Izvora";
> $admtext['findrepoid'] = "Pronađi ID Repozitorijuma";
> $admtext['enterrepopart'] = "Unesite deo naslova Repozitorijuma";
> $admtext['findplace'] = "Pronađi Mesto";
> $admtext['enterplacepart'] = "Unesite deo Naziv za Mesto";
> $admtext['entereventinfo'] = "Unesite datum događaja, mesto događaja ili detalje za ovaj događaj.";
> $admtext['entereventtype'] = "Izaberite Tip događaja.";
> $admtext['enternote'] = "Unesite tekst napomene.";
> $admtext['selectsource'] = "Izaberite Izvor.";
> $admtext['confdeletecite'] = "Jeste li sigurni da želite izbrisati ovaj citat?";
> $admtext['spouses'] = "Supružnici/Partneri";
> $admtext['entertreeid'] = "Unesite ID Rodoslovnog Stabla.";
> $admtext['entertreename'] = "Unesite ime Rodoslovnog Stabla.";
> $admtext['citations'] = "Citati";
> $admtext['eventtypes'] = "Tip događaja";
> $admtext['associations'] = "Udruženja";
> $admtext['makefolder'] = "Kreirati Folder";
> $admtext['allcurrentdata'] = "Svi trenutni podaci";
> $admtext['matchingonly'] = "Samo pronađeni zapisi";
> $admtext['donotreplace'] = "Ne zamenjujte nikakve podatke";
> $admtext['useroffset'] = "Pokrenite ID-ove od:";
> $admtext['phone'] = "Telefon";
> $admtext['website'] = "Web Sajt";
> $admtext['thumb'] = "Sli�ica";  //as in thumbnail
> $admtext['displayorder'] = "Redosled prikaza";
> $admtext['go'] = "Idi";
> $admtext['help'] = "Pomoć za ovu oblast";
> $admtext['husband'] = "Suprug";
> $admtext['wife'] = "Supruga";
> $admtext['husbname'] = "Ime Oca";
> $admtext['wifename'] = "Ime Majke";
> $admtext['drag'] = "Prevuci";
> $admtext['enterinamepart'] = "unesite deo imena i/ili prezimena";
> $admtext['enterfnamepart'] = "Unesite dio imena oca i/ili imena majke";
> $admtext['hide'] = "Sakriti";
> $admtext['toggle'] = "isklju�i prikaz";
> $admtext['wsel'] = "Sa izabranim:";
> $admtext['msg'] = "Poruka";
> $admtext['default'] = "Podrazumevano";
> $admtext['events'] = "Događaji";
> $admtext['date'] = "Datum";
> $admtext['savecont'] = "Snimi i nastavi...";
> $admtext['alphanum'] = "Koristite samo alfanumeri�ke znakove u svom ID-u rodoslovnog stabla.";
> $admtext['mediatypes'] = "Tip Medija";
> $admtext['appendall'] = "Dodajte sve zapise";
> $admtext['NPFX'] = "Prefiks";
> $admtext['prefix'] = "Prefiks";
> $admtext['mostwanted'] = "Najviše se Traži";
> $admtext['idexists'] = "nije moguće dodati jer taj ID već postoji.";
> $admtext['notdeleted'] = "Fajl ne može biti izbrisan. Proverite prava na fajlu.";
> $admtext['confdeletefile'] = "Jeste li sigurni da želite izbrisati ovaj fajl?";
> $admtext['datenote'] = "<strong>Napomena:</strong> Prilikom unošenja datuma, molimo koristite standardni genealoški format datuma DD MMM YYYY. Na primer, 10 Apr 2019.";
> $admtext['oriental'] = "Prezime prvo (bez zareza)";
> $admtext['langfolder'] = "Jezi�ka mapa";
> $admtext['repoid'] = "ID Repozitorijuma";
> $admtext['whatsnew'] = "Å ta ima novo";
> $admtext['linkedto'] = "Povezan sa";
2228,2265c2350,2384
< //added in 8.0.0
< $admtext['show'] = "Preview";
< $admtext['lnfirst'] = "Surname first (with commas)";
< $admtext['savefirst'] = "Save changes first?";
< $admtext['misc'] = "Miscellaneous";
< $admtext['modmgr'] = "Mod Manager";
< $admtext['cannotopendir'] = "Cannot open folder";
< $admtext['reviewsh'] = "Review"; //short version
< //moved here in 9.0.0
< $admtext['cancel'] = "Cancel";
< $admtext['enterpassoc'] = "Please enter the ID of the associated person.";
< $admtext['enterrela'] = "Please enter the relationship.";
< $admtext['confdeleteassoc'] = "Are you sure you want to delete this association?";
< $admtext['preview'] = "Preview";
< $admtext['livingonly'] = "Living only";
< $admtext['tentdata'] = "Temporary event record";
< $admtext['checking'] = "Checking...Please wait";
< //added in 9.0.0
< $admtext['clickresume'] = "click here to resume";
< $admtext['copylast'] = "Copy Last";
< $admtext['nicbold'] = "Click to Bold";
< $admtext['nicitalic'] = "Click to Italic";
< $admtext['nicunderline'] = "Click to Underline";
< $admtext['niclalign'] = "Left Align";
< $admtext['niccalign'] = "Center Align";
< $admtext['nicralign'] = "Right Align";
< $admtext['nicjalign'] = "Justify Align";
< $admtext['nicinsol'] = "Insert Ordered List";
< $admtext['nicinsul'] = "Insert Unordered List";
< $admtext['nicsub'] = "Click to Subscript";
< $admtext['nicsup'] = "Click to Superscript";
< $admtext['nicstrike'] = "Click to Strike Through";
< $admtext['nicremfmt'] = "Remove Formatting";
< $admtext['nicindent'] = "Indent Text";
< $admtext['nicremind'] = "Remove Indent";
< $admtext['nichr'] = "Horizontal Rule";
< $admtext['nicfontsz'] = "Font&nbsp;Size";
< $admtext['nicfontfam'] = "Font&nbsp;Family";
---
> $admtext['show'] = "Pregled";
> $admtext['lnfirst'] = "Prezime prvo (sa zarezima)";
> $admtext['savefirst'] = "Prvo sa�uvajte promene?";
> $admtext['misc'] = "Ostala podešavanja";
> $admtext['modmgr'] = "Upravljanje Modulima";
> $admtext['cannotopendir'] = "Nije moguće otvoriti folder";
> $admtext['reviewsh'] = "Pregled"; //short version
> $admtext['cancel'] = "Prekini";
> $admtext['enterpassoc'] = "Molimo unesite ID pridružene osobe.";
> $admtext['enterrela'] = "Unesite vezu.";
> $admtext['confdeleteassoc'] = "Da li ste sigurni da želite izbrisati ovu asocijaciju?";
> $admtext['preview'] = "Pregled";
> $admtext['livingonly'] = "Živi samo";
> $admtext['tentdata'] = "Zapis o privremenom događaju za";
> $admtext['checking'] = "Provera ... Pri�ekajte";
> $admtext['clickresume'] = "kliknite ovde da biste nastavili";
> $admtext['copylast'] = "Kopiranje Prošlog";
> $admtext['nicbold'] = "Kliknite za Zadebljano";
> $admtext['nicitalic'] = "Kliknite za Kurziv";
> $admtext['nicunderline'] = "Kliknite za Podvućeno";
> $admtext['niclalign'] = "Levo Poravnanje";
> $admtext['niccalign'] = "Poravnanje po Sredini";
> $admtext['nicralign'] = "Desno Poravnanje";
> $admtext['nicjalign'] = "Poravnanje Levo i Desno";
> $admtext['nicinsol'] = "Dodati Uređene Liste";
> $admtext['nicinsul'] = "Dodati Ne uređene Liste";
> $admtext['nicsub'] = "Kliknite za Subscript";
> $admtext['nicsup'] = "Kliknite za Superscript";
> $admtext['nicstrike'] = "Kliknite za Strike Through";
> $admtext['nicremfmt'] = "Ukloni trenutni Format teksta";
> $admtext['nicindent'] = "Uvuci tekst";
> $admtext['nicremind'] = "Ukloni uvla�enje";
> $admtext['nichr'] = "Horizontalno Lenjir";
> $admtext['nicfontsz'] = "Font&nbsp;Veli�ina";
> $admtext['nicfontfam'] = "Font&nbsp;Famiilija";
2267,2285c2386,2400
< $admtext['niclink'] = "Add Link";
< $admtext['nicremlink'] = "Remove Link";
< $admtext['nictxtcol'] = "Change Text Color";
< $admtext['nicbkgcol'] = "Change Background Color";
< $admtext['nicimage'] = "Add Image";
< $admtext['change'] = "Change";
< $admtext['editwarn'] = "Your lock on this record is about to expire. Save your changes now to prevent them from being overwritten by another user.";
< $admtext['editconflict'] = "Another user is already editing this record. Please try again later.";
< $admtext['retry'] = "Try again";
< $admtext['notsaved'] = "Changes were not saved. Another user has locked the record.";
< //changed in 9.2.0
< $admtext['linktype'] = "Type";
< //moved here in 10.0.0
< $admtext['disabled'] = "Disabled";
< $admtext['cremated'] = "Cremated";
< //added in 10.0.0
< $admtext['videos'] = "Videos";
< $admtext['recordings'] = "Recordings";
< $admtext['saveexit'] = "Save and Exit";
---
> $admtext['niclink'] = "Dodaj Link";
> $admtext['nicremlink'] = "Obriši Link";
> $admtext['nictxtcol'] = "Promenite boju teksta";
> $admtext['nicbkgcol'] = "Promenite boju pozadine";
> $admtext['nicimage'] = "Dodaj sliku";
> $admtext['change'] = "Izmeniti";
> $admtext['editwarn'] = "Zaklju�avanje ovog zapisa će uskoro isteći. Sa�uvajte promene sada da biste spre�ili da ih drugi korisnik prepiše.";
> $admtext['editconflict'] = "Drugi korisnik već uređuje ovaj zapis. Pokušajte ponovo kasnije.";
> $admtext['retry'] = "Pokušajte ponovo";
> $admtext['notsaved'] = "Promene nisu sa�uvane. Drugi korisnik je zaklju�ao zapis.";
> $admtext['disabled'] = "Isklju�en";
> $admtext['cremated'] = "Kremiran";
> $admtext['videos'] = "Video snimci";
> $admtext['recordings'] = "Audio snimci";
> $admtext['saveexit'] = "Snimi i izađi";
2287,2292c2402,2407
< $admtext['nickname'] = "Nickname";
< $admtext['role'] = "Role";
< $admtext['commas'] = "Separate multiple entries with commas";
< $admtext['confdellink'] = "Are you sure you want to delete this link?";
< $admtext['existlinks'] = "Existing Links";
< $admtext['report'] = "Report";
---
> $admtext['nickname'] = "Nadimak";
> $admtext['role'] = "Uloge";
> $admtext['commas'] = "Odvojite više stavki zarezima";
> $admtext['confdellink'] = "Da li ste sigurni da želite da obrišete ovu vezu (link)?";
> $admtext['existlinks'] = "Postojeći linkovi";
> $admtext['report'] = "Izveštaj";
2294,2299c2409,2414
< $admtext['sortby'] = "Sort by";
< $admtext['unlink'] = "Unlink";
< $admtext['privateonly'] = "Private only";
< $admtext['dna_links'] = "DNA Links";
< $admtext['dataval'] = "Data Validation";
< $admtext['norels'] = "Turn off relationship messages";
---
> $admtext['sortby'] = "Sortiraj po";
> $admtext['unlink'] = "Otka�iti";
> $admtext['privateonly'] = "Samo privatno";
> $admtext['dna_links'] = "DNA Linkovi";
> $admtext['dataval'] = "Validacija Podataka";
> $admtext['norels'] = "Isklju�ite poruke veza";
2301,2302c2416,2417
< $admtext['templates'] = "Templates";
< $admtext['findciteid'] = "Find Citation ID";
---
> $admtext['templates'] = "Å abloni";
> $admtext['findciteid'] = "Pronađi ID Citata";
2304c2419
< $admtext['citation'] = "Citation";
---
> $admtext['citation'] = "Citati";
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Prezime";
> $admtext['subhead'] = "Podnaslov";
> $admtext['image'] = "Slika";
> $admtext['author'] = "Autor";
2308c2428,2462
< $admtext['living'] = "Living";
---
> $admtext['living'] = "Živ";
> 
> //moved here in 13.0.0
> $admtext['getstart'] = "Uputstvo";
> $admtext['showlog'] = "Admin Log fajl";
> $admtext['nobirthinfo'] = "Nema informacija o rođenju";
> //changed in 13.0
> $admtext['savereturn'] = "Povratak na ovu stranicu";
> $admtext['saveback'] = "Vratite se na meni";
> //added in 13.0
> $admtext['allitemsdeleted'] = "All items were successfully deleted.";
> $admtext['private'] = "Private";
> $admtext['imgtags'] = "Image Tags";
> 
> $admtext['removelink'] = "Obriši Link";
> $admtext['eloptions'] = "Pregled ili Brisanje";
> $admtext['pleaseenter'] = "Upišite ";
> 
> $admtext['nolinks'] = "Za sada nema veza/linkova.";
> $admtext['nogeocode'] = "Nije moguće geokodirati";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Izaberi<br/>podrazumevanu/glavnu<br/>fotografiju"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Događaj / Tipovi atributa";
> $admtext['secondary'] = "Uslužni programi nakon uvoza";
> $admtext['otherevents'] = "Drugi Događaji / Atributi";
> //added in 14.0
> $admtext['newlinks'] = "Kreirani linkovi";
> $admtext['newcemlinks'] = "Kreirani linkovi Groblja";
> $admtext['utility'] = "Uslužni";
> $admtext['linktype'] = "Tip";
> $admtext['move'] = "Pomeri";
> $admtext['copy'] = "Kopiraj";
> $admtext['title2'] = "Naslov"; //for media, sources, etc (not people)
2310,2311c2464,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Serbian-UTF8/alltext.php TNG1403/languages/Serbian-UTF8/alltext.php
33,34c33,34
< $dates['BET'] = "izmedu";
< $dates['BETWEEN'] = "Izmedu";
---
> $dates['BET'] = "između";
> $dates['BETWEEN'] = "Između";
38c38
< $dates['Y'] = "Yes, date unknown";
---
> $dates['Y'] = "Da, datum nepoznat";
43,57c43,57
< $text['cannotexecutequery'] = "Cannot execute query";
< $text['to'] = "to";
< $text['of'] = "of";
< $text['text_next'] = "Next";
< $text['text_prev'] = "Prev";
< $text['clickdisplay'] = "Click to display";
< $text['clickhide'] = "Click to hide";
< $text['forgot1'] = "<strong>Forgot your username or password?</strong><br />Enter your e-mail address below to have your username sent to you.";
< $text['forgot2'] = "Enter your e-mail above and your username below to have your password reset (a temporary password will be sent to you).";
< $text['newpass'] = "Your new temporary password";
< $text['usersent'] = "Your username has been sent to your e-mail address.";
< $text['pwdsent'] = "Your new temporary password has been sent to your e-mail address.";
< $text['loginnotsent2'] = "The e-mail address you provided does not match any user account currently on record. No information has been sent.";
< $text['loginnotsent3'] = "The e-mail address and username you provided do not match any user account currently on record. No information has been sent.";
< $text['logininfo'] = "Your login information";
---
> $text['cannotexecutequery'] = "Ne može da se izvrši SQL upit";
> $text['to'] = "do";
> $text['of'] = "od";
> $text['text_next'] = "Sledeće";
> $text['text_prev'] = "Prethodno";
> $text['clickdisplay'] = "Klikni za prikaz";
> $text['clickhide'] = "Klikni da sakriješ";
> $text['forgot1'] = "<strong>Zaboravili ste korisni�ko ime ili lozinku ?</strong><br />Unesite vašu e-mail adresu ispod, da bi vam poslali korisni�ko ime.";
> $text['forgot2'] = "Unesite vaš e-mail iznad vaše i korisni�ko ime ispod da biste izmenuli vašu lozinku (privremena lozinka će biti poslata vama putem e-maila).";
> $text['newpass'] = "Vaša nova privremena lozinka";
> $text['usersent'] = "Vaše korisni�ko ime je poslato na vašu e-mail adresu.";
> $text['pwdsent'] = "Vaša nova privremena/inicijalna lozinka je poslata na vašu e-mail adresu.";
> $text['loginnotsent2'] = "E-mail adresa koju ste naveli, ne odgovara ni jednom korisni�kom nalogu. Ni jedna informacija vam se ne može dostaviti.";
> $text['loginnotsent3'] = "E-mail adresa i korisni�ko ime koju ste naveli, ne odgovara ni jednom korisni�kom nalogu. Ni jedna informacija vam se ne može dostaviti.";
> $text['logininfo'] = "Informacije o vašem korisni�kom nalogu";
63c63
< $text['documents'] = "Documents";
---
> $text['documents'] = "Dokumenti";
65,67c65,67
< $text['histories'] = "Tekstovi";
< $text['recordings'] = "Recordings";
< $text['videos'] = "Videos";
---
> $text['histories'] = "Istorije";
> $text['recordings'] = "Audio snimci";
> $text['videos'] = "Video snimci";
70,77c70,77
< $admtext['placelevel'] = "Place Level";
< $admtext['level1'] = "Address";
< $admtext['level2'] = "Location";
< $admtext['level3'] = "City/Town";
< $admtext['level4'] = "County/Shire";
< $admtext['level5'] = "State/Province";
< $admtext['level6'] = "Country";
< $admtext['level0'] = "Not Set";
---
> $admtext['placelevel'] = "Tip Mesta";
> $admtext['level1'] = "Adresa";
> $admtext['level2'] = "Lokacija";
> $admtext['level3'] = "Grad/Gradić/Selo/Zaseok";
> $admtext['level4'] = "Okrug/Parohija";
> $admtext['level5'] = "Država/Pokrajna";
> $admtext['level6'] = "Država/Domovina";
> $admtext['level0'] = "Nije podešeno";
82c82
< $text['loading'] = "Loading...";
---
> $text['loading'] = "U�itavanje...";
84,93c84,92
< $text['cancel'] = "Cancel";
< $text['none'] = "None";
< $text['mainton'] = "Maintenance Mode is ON";
< 
< //moved here in 8.0.0
< $text['living'] = "415Living";
< $admtext['text_private'] = "Private";
< $admtext['confunlink'] = "Are you sure you want to unlink this individual as a spouse in this family?";
< $admtext['confunlinkc'] = "Are you sure you want to unlink this individual as a child in this family?";
< $admtext['confremchild'] = "Are you sure you want to remove this child from this family? The individual will not be deleted from the database.";
---
> $text['cancel'] = "Otkazati";
> $text['none'] = "Ništa";
> $text['mainton'] = " za održModavanje je uklju�en";
> 
> $text['living'] = "Živ";
> $admtext['text_private'] = "Privatno";
> $admtext['confunlink'] = "Da li ste sigurni da želite da raskinete vezu, ove osobe kao supružnika u ovoj porodici?";
> $admtext['confunlinkc'] = "Da li ste sigurni da želite da raskinete vezu, ove osobe kao dete u ovoj porodici?";
> $admtext['confremchild'] = "Da li ste sigurni da želite da uklonite ovo dete iz ove porodice? Osoba neće biti obrisana iz baze podataka.";
95,135c94,128
< $admtext['yes'] = "Yes";
< $admtext['no'] = "No";
< $admtext['BIRT'] = "Birth";
< $admtext['DEAT'] = "Death";
< $admtext['CHR'] = "Christening";
< $admtext['BURI'] = "Burial";
< $admtext['BAPL'] = "Baptism (LDS)";
< $admtext['ENDL'] = "Endowment (LDS)";
< $admtext['NICK'] = "Nickname";
< $admtext['TITL'] = "Title";
< $admtext['NSFX'] = "Suffix";
< $admtext['NAME'] = "Name";
< $admtext['SLGC'] = "Sealed to Parents (LDS)";
< $admtext['MARR'] = "Married";
< $admtext['SLGS'] = "Sealed to Spouse (LDS)";
< $admtext['hello'] = "Hello";
< $admtext['activated'] = "Your genealogy user account has been activated";
< $admtext['infois'] = "Your login information is";
< $admtext['subjectline'] = "Your genealogy user account has been activated.";
< 
< //moved here in 8.1.0
< $admtext['adopted'] = "adopted";
< $admtext['birth'] = "birth";
< $admtext['foster'] = "foster";
< $admtext['sealing'] = "sealing";
< //added in 11.0.3
< $admtext['putative'] = "Претпо�тављена";
< 
< //added in 9.0.0
< $text['editprofile'] = "Edit Profile";
< 
< //moved here in 9.0.0
< $text['letter'] = "Letter"; //as in page size
< $text['legal'] = "Legal"; //as in page size
< $text['sunday'] = "Sunday";  //first day of week on calendar
< $text['monday'] = "Monday";
< $text['tuesday'] = "Tuesday";
< $text['wednesday'] = "Wednesday";
< $text['thursday'] = "Thursday";
< $text['friday'] = "Friday";
< $text['saturday'] = "Saturday";
---
> $admtext['yes'] = "Da";
> $admtext['no'] = "Ne";
> $admtext['BIRT'] = "Rođenje";
> $admtext['DEAT'] = "Smrt";
> $admtext['CHR'] = "Krštenje";
> $admtext['BURI'] = "Sahrana";
> $admtext['BAPL'] = "Baptisam (LDS)";
> $admtext['ENDL'] = "Zadužbina (LDS)";
> $admtext['NICK'] = "Nadimak";
> $admtext['TITL'] = "Naslov";
> $admtext['NSFX'] = "Sufiks";
> $admtext['NAME'] = "Ime";
> $admtext['SLGC'] = "Pe�atiran po Roditelju (LDS)";
> $admtext['MARR'] = "Oženjen/Udata";
> $admtext['SLGS'] = "Pe�atiran po Supružniku (LDS)";
> $admtext['hello'] = "Pozdrav";
> $admtext['activated'] = "Vaš genealoški korisni�ki nalog je aktiviran";
> $admtext['infois'] = "Vaše informacije za prijavljivanje su";
> $admtext['subjectline'] = "Aktiviran je vaš genealoški korisni�ki nalog.";
> $admtext['adopted'] = "po usvojenju";
> $admtext['birth'] = "po rođenju";
> $admtext['foster'] = "odgajan";
> $admtext['sealing'] = "pe�atiran";
> $admtext['putative'] = "Navodno";
> 
> $text['editprofile'] = "Izmeni Profil";
> $text['letter'] = "Pismo"; //as in page size
> $text['legal'] = "Pravno legalan"; //as in page size
> $text['sunday'] = "Nedelja";  //first day of week on calendar
> $text['monday'] = "Ponedeljak";
> $text['tuesday'] = "Utorak";
> $text['wednesday'] = "Sreda";
> $text['thursday'] = "ÄŒetvrtak";
> $text['friday'] = "Petak";
> $text['saturday'] = "Subota";
137c130
< $text['startswith'] = "pocinje sa";
---
> $text['startswith'] = "poćinje sa";
139,145c132,135
< //moved here in 9.0.4
< $text['top'] = "Top";
< 
< //moved here in 10.0.0
< $text['startingind'] = "Starting Individual";
< $text['enteremail'] = "Milomo vas upišite važecu E-mail adresu";
< $text['page'] = "Page";
---
> $text['top'] = "Vrh";
> $text['startingind'] = "Polazimo od osobe";
> $text['enteremail'] = "Molimo vas upišite važeću E-mail adresu. E-mail adresa je obavezna";
> $text['page'] = "Stranica";
147,198c137,180
< $text['years'] = "god.";
< 
< //added in 10.0.0
< $admtext['CONL'] = "Confirmation";
< $admtext['INIT'] = "Initiatory (LDS)";
< $admtext['step'] = "Stepchild";
< $text['switchm'] = "Switch to mobile site";
< $text['switchs'] = "Switch to standard site";
< 
< //added in 11.0.0
< $text['dna_tests'] = "DNA Tests";
< $admtext['preflang'] = "Preferred language";
< $text['problem'] = "An error has occurred in the TNG software. This could be due to a setup issue, an incomplete upgrade or a program bug. If you are the site owner, you may contact TNG support for help with this problem. Please copy the query below and paste it into your message.";
< $text['query'] = "Query";
< $text['fanchart'] = "Fan Chart";
< 
< //moved here in 12.0.0
< $admtext['menu'] = "Menu";
< $admtext['dna_groups'] = "DNA Groups";
< $admtext['allbranches'] = "All Branches";
< $admtext['active'] = "Active";
< $admtext['select'] = "Select";
< $admtext['selectall'] = "Select All";
< $admtext['clearall'] = "Clear All";
< $admtext['medialinks'] = "Media Links";
< 
< //added here in 12.0.0
< $text['testgroup'] = "Test Group";
< $text['test_number'] = "Test Number/Name";
< $text['test_info_display'] = "Test Information To Display";
< $text['confirmed'] = "Confirmed";
< $text['predicted'] = "Predicted";
< $admtext['ancestral_surnames'] = "Ancestral surnames";
< $admtext['admin_notes'] = "Administrator notes";
< $admtext['mda'] = "Most distant ancestor";
< $admtext['mrca'] = "Most recent common ancestor";
< $admtext['marker_values'] = "Marker values";
< $admtext['ref_seq'] = "Reference sequence";
< $admtext['rsrs'] = "RSRS (Reconstructed Sapiens Reference Sequence)";
< $admtext['rcrs'] = "rCRS (revised Cambridge Reference Sequence)";
< $admtext['hvr_values'] = "HVR Differences";
< $admtext['hvr1_values'] = "HVR1 Differences";
< $admtext['hvr2_values'] = "HVR2 Differences";
< $admtext['coding_reg'] = "Coding region differences";
< $text['keep_name_private'] = "Keep Name Private";
< $text['test_results'] = "Test Results";
< $admtext['dna_tests'] = "DNA Tests";
< $admtext['vendor'] = "Vendor";
< $admtext['markers'] = "Number of STR markers tested";
< $admtext['haplo'] = "Haplogroup";
< $admtext['termsnp'] = "Terminal SNP";
< $admtext['signsnp'] = "Significant SNPs";
---
> $text['years'] = "godine";
> $admtext['CONL'] = "Potvrda";
> $admtext['INIT'] = "Uvodni (LDS)";
> $admtext['step'] = "pastor�e";
> $text['switchm'] = "Prebacite se na mobilni sajt";
> $text['switchs'] = "Prebacite se na standardni sajt";
> $text['dna_tests'] = "DNA Testovi";
> $admtext['preflang'] = "Prioritetni  jezik";
> $text['query'] = "Pitanje";
> $text['fanchart'] = "Fan Grafikon";
> 
> $admtext['menu'] = "Meni";
> $admtext['dna_groups'] = "DNA Grupe";
> $admtext['allbranches'] = "Sve Grane";
> $admtext['active'] = "Aktivno";
> $admtext['select'] = "Izaberite";
> $admtext['selectall'] = "Izaberite Sve";
> $admtext['clearall'] = "Obrisati Sve";
> $admtext['medialinks'] = "Medija linkovi";
> 
> $text['testgroup'] = "Test Grupa";
> $text['test_info_display'] = "Broj Testa/Naziv";
> $text['confirmed'] = "Potvrđeno";
> $text['predicted'] = "Predviđeno";
> $admtext['ancestral_surnames'] = "Prezimena Predaka";
> $admtext['admin_notes'] = "Administratorske napomene";
> $admtext['mda'] = "Najudaljeniji predak";
> $admtext['mrca'] = "Najnoviji zajedni�ki predak";
> $admtext['marker_values'] = "Vrednosti Markera";
> $admtext['ref_seq'] = "Referentna sekvenca";
> $admtext['rsrs'] = "RSRS (Rekonstruisana referentna sekvenca Sapiensa)";
> $admtext['rcrs'] = "rCRS (Revidirana Cambridge Referenca Sekvence)";
> $admtext['hvr_values'] = "HVR Razlike";
> $admtext['hvr1_values'] = "HVR1 Razlike";
> $admtext['hvr2_values'] = "HVR2 Razlike";
> $admtext['coding_reg'] = "Razlike u kodiranju regiona";
> $text['keep_name_private'] = "Zadrži Ime privatno";
> $text['test_results'] = "Rezultati DNA Testa";
> $admtext['dna_tests'] = "DNA Testovi";
> $admtext['vendor'] = "Vendor/Prodavac";
> $admtext['markers'] = "Broj STR Markera";
> $admtext['haplo'] = "Haplogrupa";
> $admtext['termsnp'] = "SNP Terminal";
> $admtext['signsnp'] = "Zna�ajan SNPs";
201c183
< $admtext['mtdna_test'] = "mtDNA (Mitochondrial)";
---
> $admtext['mtdna_test'] = "mtDNA (mitohondrial dna)";
202a185,252
> $admtext['xtra_mut'] = "Ekstra mutacije";
> $text['test_number'] = "Broj/Ime";
> $admtext['match_date'] = "Datum podudaranja";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroupa";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroupa";
> $admtext['relationship_section'] = "Sekcija povezanosti";
> $admtext['relationship_range'] = "Raspon Povezanosti";
> $admtext['suggested_relationship'] = "Predloženo";
> $admtext['actual_relationship'] = "Stvarna Povezanost";
> $admtext['related_side'] = "Povezane Grane";
> $admtext['shared_dna'] = "Deljeni DNA";
> $admtext['shared centimorgans'] = "Ukupno deljenih cMs";
> $admtext['shared_segments'] = "Deljeni Segmenti";
> $admtext['largest_segment'] = "Najveći Segment";
> $admtext['chromosome'] = "Hromosom br.";
> $admtext['segment_start'] = "Po�etak Segmenta";
> $admtext['segment_end'] = "Kraj Segmenta";
> $admtext['centiMorgans'] = "centi-Morgans (Legth of genetic distance)";
> $admtext['matchingSNPs'] = "Poklapanje SNPs";
> $admtext['xmatch'] = "X-Poklapanje";
> $text['keep_test_private'] = "Privatni test";
> $text['shared_dna'] = "Deljeni DNA segment";
> $text['for_match'] = "za ovo poklapanje";
> $admtext['keeptest'] = "Privatni Test";
> $admtext['keepname'] = "Privatnost Imena";
> $admtext['allgroups'] = "Sve Grupe";
> $admtext['alltypes'] = "Svi Tipovi";
> $admtext['generation_num'] = "Generacije sa nasleđenim prezimenima";
> 
> $text['birthabbr'] = "rođ.";
> $text['chrabbr'] = "krš.";
> $text['deathabbr'] = "smr.";  //from descend
> $text['burialabbr'] = "sahr.";  //from descend
> $text['marrabbr'] = "ven.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Find all individuals with events at this location";
> $text['firstpage'] = "Prva strana";
> $text['lastpage'] = "Poslednja strana";
> 
> //changed in 13.0.0
> $text['problem'] = "Došlo je do greške u TNG softveru. Ovo bi moglo biti zbog pogrešnog podešavanja, nekompatibilnog upgrade ili programske logi�ke greške. Ako ste vlasnik sajta, možete kontaktirati TNG podršku za pomo� u rešavanju ovog problema. Kopirajte upit/tekst ispod i nalepite ga u vašoj poruci.";
> //added in 13.0.0
> $admtext['nobranch'] = "No branch";
> 
> //added in 14.0
> $text['oneyear'] = "godina";
> $text['pwdcodelink'] = "Kliknite na ovu vezu/link da biste dobili privremenu lozinku.";
> $text['pwdcodesent'] = "Poruka sa linkom za resetovanje lozinke je poslata na vašu e-mail adresu.";
> $text['moved'] = "Pomereno";
> $text['citation'] = "Citat";
> $text['other'] = "Ostalo";
> $text['death'] = "Smrt";
> $text['burial'] = "Sahrana";
> $text['cremation'] = "Kremacija";
> $text['marriage'] = "Brak/Ven�anje";
> $text['divorce'] = "Razvod";
> $text['bylength'] = "Koraci";
> $text['bymarriages'] = "Brakovi";
> $text['none'] = "Ništa";
> 
> //moved here in 14.0
> $text['family'] = "BRAK";
> $text['source'] = "IZVOR";
> $text['repository'] = "Repozitorijum";
> $text['place'] = "Mesto";
> $admtext['BAPM'] = "Krštenje";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Extra mutations";
---
> $text['glang'] = "sr-Latn";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Serbian-UTF8: data_protection_policy.php
diff -r TNG/languages/Serbian-UTF8/text.php TNG1403/languages/Serbian-UTF8/text.php
7c7
< 		$text['callnum'] = "Call Number";
---
> 		$text['callnum'] = "Pozivni broj";
9c9
< 		$text['publisher'] = "Publisher";
---
> 		$text['publisher'] = "Izdava�";
13,14c13,14
< 		$text['repoid'] = "Repository ID";
< 		$text['browseallrepos'] = "12Browse All Repositories";
---
> 		$text['repoid'] = "ID Repozitorijuma";
> 		$text['browseallrepos'] = "Prikaži sve Repozitorijume";
22,23c22,23
< 		$text['sitemaint'] = "Site maintenance in progress";
< 		$text['standby'] = "The site is temporarily unavailable while we update our database. Please try again in a few minutes. If the site remains down for an extended period of time, please <a href=\"suggest.php\">contact the site owner</a>.";
---
> 		$text['sitemaint'] = "Održavanje sajta je u toku";
> 		$text['standby'] = "Sajt je privremeno nedostupan, vrši se ažuriranje baze podataka. Molim vas pokušajte malo kasnije da otvorite sajt. Ako sajt ostane ugašen duže vreme, molim vas <a href=\"suggest.php\">kontaktirajte vlasnika sajta</a>.";
28c28
< 		$text['gedstart'] = "GEDCOM pocinje od";
---
> 		$text['gedstart'] = "GEDCOM po�inje od";
31c31
< 		$text['includelds'] = "Ukljuci LDS informacije";
---
> 		$text['includelds'] = "Ukljući LDS informacije";
34c34
< 		$text['nomaxgen'] = "Morate da odredite maksimalan broj generacija. Vratite se na prethodnu stranu, koristeci dugme za nazad i ispravite grešku.";
---
> 		$text['nomaxgen'] = "Morate da odredite maksimalan broj generacija. Vratite se na prethodnu stranu, koristeći dugme za nazad i ispravite grešku.";
41c41
< 		$text['comments'] = "Komentar";
---
> 		$text['comments'] = "Opis <br />predloženih izmena";
43c43
< 		$text['submitsugg'] = "Pošalji primedbu";
---
> 		$text['submitsugg'] = "Pošalji sugestiju";
46c46
< 		$text['mailnotsent'] = "Žao nam je, ali vaša poruka nemože biti isporucena.";
---
> 		$text['mailnotsent'] = "Žao nam je, ali vaša poruka nemože biti isporućena.";
50c50
< 		$text['sendmsg'] = "Send Message";
---
> 		$text['sendmsg'] = "Pošalji Poruku";
52c52
< 		$text['subject'] = "Subject";
---
> 		$text['subject'] = "Naslov poruke";
57,59c57,59
< 		$text['photoshistoriesfor'] = "Fotografije i tekstovi - ";
< 		$text['indinfofor'] = "Licne informacije - ";
< 		$text['pp'] = "42pp."; //page abbreviation
---
> 		$text['photoshistoriesfor'] = "Fotografije i istorije za";
> 		$text['indinfofor'] = "Informacije osobe za";
> 		$text['pp'] = "str."; //page abbreviation
66,70c66,69
< 		$text['received'] = "Vaša primedba je prosledena administratoru.";
< 		$text['indreport'] = "Individual Report";
< 		$text['indreportfor'] = "Individual Report for";
< 		$text['general'] = "General";
< 		$text['bkmkvis'] = "<strong>Note:</strong> These bookmarks are only visible on this computer and in this browser.";
---
> 		$text['received'] = "Vaša sugestija je prosleđena administratoru na pregled.";
> 		$text['indreport'] = "Izveštaj o osobi";
> 		$text['indreportfor'] = "Izveštaj osobe za";
> 		$text['bkmkvis'] = "<strong>Napomena:</strong> Ove omiljene stranice su vidljive samo na ovom ra�unaru i na ovom web pretraživa�u.";
72,73c71,72
< 		$text['reviewmsg'] = "You have a suggested change that needs your review. This submission concerns:";
<         $text['revsubject'] = "Suggested change needs your review";
---
> 		$text['reviewmsg'] = "Imate predloženu primedbu, za koju je potrebno vaše mišljenje. Ovaj podnesak odnosi se na:";
>         $text['revsubject'] = "Predložena sugestija treba vašu recenziju";
78,79c77,79
< 		$text['relcalc'] = "Izracunavanje stepena srodstva";
< 		$text['findrel'] = "STEPEN SRODSTVA";
---
> 	case "connections":
> 		$text['relcalc'] = "Kalkulator stepena srodstva";
> 		$text['findrel'] = "Pronađi Srodstvo";
82,84c82,84
< 		$text['calculate'] = "IZRACUNAJ";
< 		$text['select2inds'] = "Odaberite dve osobe.";
< 		$text['findpersonid'] = "Pronadi licni ID";
---
> 		$text['calculate'] = "IZRAÄŒUNAJ";
> 		$text['select2inds'] = "Izaberite dve osobe.";
> 		$text['findpersonid'] = "Pronađi ID osobe";
87,88c87,88
< 		$text['clicktoselect'] = "Kliknite mišem i odaberite";
< 		$text['nobirthinfo'] = "Nema informacija o rodenju";
---
> 		$text['clicktoselect'] = "kliknite mišem i odaberite";
> 		$text['nobirthinfo'] = "Nema informacija o rođenju";
90,124c90,124
< 		$text['sameperson'] = "Ista ososba je odabrana dva puta.";
< 		$text['notrelated'] = "Ove dve ososbe nisu u srodstvu unazad xxx generacija."; //xxx will be replaced with number of generations
< 		$text['findrelinstr'] = "Da bi ste videli stepen srodstva izmedu dve osobe, koristite dugme 'TRAŽI' za pronalaženje osoba (ili zadržite vec upisanu osobu), zatim pritisnite dugme 'IZRACUNAJ'.";
< 		$text['sometimes'] = "(Ponekad provera za razlicit broj generacija daje razlicit rezultat.)";
< 		$text['findanother'] = "SRODSTVO SA DRUGOM OSOBOM";
< 		$text['brother'] = "the brother of";
< 		$text['sister'] = "the sister of";
< 		$text['sibling'] = "the sibling of";
< 		$text['uncle'] = "the xxx uncle of";
< 		$text['aunt'] = "the xxx aunt of";
< 		$text['uncleaunt'] = "the xxx uncle/aunt of";
< 		$text['nephew'] = "the xxx nephew of";
< 		$text['niece'] = "the xxx niece of";
< 		$text['nephnc'] = "the xxx newphew/niece of";
< 		$text['removed'] = "times removed";
< 		$text['rhusband'] = "the husband of ";
< 		$text['rwife'] = "the wife of ";
< 		$text['rspouse'] = "the spouse of ";
< 		$text['son'] = "the son of";
< 		$text['daughter'] = "the daughter of";
< 		$text['rchild'] = "the child of";
< 		$text['sil'] = "the son-in-law of";
< 		$text['dil'] = "the daughter-in-law of";
< 		$text['sdil'] = "the son- or daughter-in-law of";
< 		$text['gson'] = "the xxx grandson of";
< 		$text['gdau'] = "the xxx granddaughter of";
< 		$text['gsondau'] = "the xxx grandson/granddaughter of";
< 		$text['great'] = "great";
< 		$text['spouses'] = "are spouses";
< 		$text['is'] = "is";
< 		$text['changeto'] = "Promeni u:";
< 		$text['notvalid'] = "is not a valid Person ID number or does not exist in this database. Please try again.";
< 		$text['halfbrother'] = "the half brother of";
< 		$text['halfsister'] = "the half sister of";
< 		$text['halfsibling'] = "the half sibling of";
---
> 		$text['sameperson'] = "Dve osobe su ista osoba.";
> 		$text['notrelated'] = "Ove dve osobe nisu u srodstvu unazad xxx generacija."; //xxx will be replaced with number of generations
> 		$text['findrelinstr'] = "Da bi ste videli stepen srodstva između dve osobe, koristite dugme 'TRAŽI' za pronalaženje osoba (ili zadržite već upisanu osobu), zatim pritisnite dugme 'IZRAČUNAJ'.";
> 		$text['sometimes'] = "(Ponekad provera razli�itog broja generacija daje druga�iji rezultat.)";
> 		$text['findanother'] = "Pronađi drugo srodstvo";
> 		$text['brother'] = "brat";
> 		$text['sister'] = "sestra";
> 		$text['sibling'] = "polubrat";
> 		$text['uncle'] = "xxx stric";
> 		$text['aunt'] = "xxx tetka";
> 		$text['uncleaunt'] = "xxx stric/tetka";
> 		$text['nephew'] = "xxx nećak/bratanac";
> 		$text['niece'] = "xxx sestri�ina/sinovica";
> 		$text['nephnc'] = "xxx nećak/sestri�ina";
> 		$text['removed'] = "puta uklonjena";
> 		$text['rhusband'] = "muž ";
> 		$text['rwife'] = "žena ";
> 		$text['rspouse'] = "supruga ";
> 		$text['son'] = "sin";
> 		$text['daughter'] = "ćerka";
> 		$text['rchild'] = "dete";
> 		$text['sil'] = "sin po zakonu";
> 		$text['dil'] = "ćerka po zakonu";
> 		$text['sdil'] = "sin ili ćerka po zakonu";
> 		$text['gson'] = "xxx unuk";
> 		$text['gdau'] = "xxx unuka";
> 		$text['gsondau'] = "xxx unuk/unuka";
> 		$text['great'] = "veliki";
> 		$text['spouses'] = "su supružnici";
> 		$text['is'] = "je";
> 		$text['changeto'] = "Promeni u: (unesi ID):";
> 		$text['notvalid'] = "nije važeći ID broj Osobe ili broj ne postoji u bazi. Pokušajte ponovo.";
> 		$text['halfbrother'] = "polubrat";
> 		$text['halfsister'] = "polusestra";
> 		$text['halfsibling'] = "polubrat po zakonu";
126,132c126,132
< 		$text['gencheck'] = "Broj generacija<br />za proveru";
< 		$text['mcousin'] = "the xxx cousin yyy of";  //male cousin; xxx = cousin number, yyy = times removed
< 		$text['fcousin'] = "the xxx cousin yyy of";  //female cousin
< 		$text['cousin'] = "the xxx cousin yyy of";
< 		$text['mhalfcousin'] = "the xxx half cousin yyy of";  //male cousin
< 		$text['fhalfcousin'] = "the xxx half cousin yyy of";  //female cousin
< 		$text['halfcousin'] = "the xxx half cousin yyy of";
---
> 		$text['gencheck'] = "Maksimalni broj generacija za proveru";
> 		$text['mcousin'] = "xxx rođak od yyy";  //male cousin; xxx = cousin number, yyy = times removed
> 		$text['fcousin'] = "xxx rođakinja od yyy";  //female cousin
> 		$text['cousin'] = "xxx rođak od yyy";
> 		$text['mhalfcousin'] = "xxx polusestra od yyy";  //male cousin
> 		$text['fhalfcousin'] = "xxx polubrat od yyy";  //female cousin
> 		$text['halfcousin'] = "xxx polurođak od yyy";
134,153c134,153
< 		$text['oneremoved'] = "once removed";
< 		$text['gfath'] = "the xxx grandfather of";
< 		$text['gmoth'] = "the xxx grandmother of";
< 		$text['gpar'] = "the xxx grandparent of";
< 		$text['mothof'] = "the mother of";
< 		$text['fathof'] = "the father of";
< 		$text['parof'] = "the parent of";
< 		$text['maxrels'] = "Maximum relationships to show";
< 		$text['dospouses'] = "Show relationships involving a spouse";
< 		$text['rels'] = "Relationships";
< 		$text['dospouses2'] = "Show Spouses";
< 		$text['fil'] = "the father-in-law of";
< 		$text['mil'] = "the mother-in-law of";
< 		$text['fmil'] = "the father- or mother-in-law of";
< 		$text['stepson'] = "the stepson of";
< 		$text['stepdau'] = "the stepdaughter of";
< 		$text['stepchild'] = "the stepchild of";
< 		$text['stepgson'] = "the xxx step-grandson of";
< 		$text['stepgdau'] = "the xxx step-granddaughter of";
< 		$text['stepgchild'] = "the xxx step-grandchild of";
---
> 		$text['oneremoved'] = "od strica";
> 		$text['gfath'] = "xxx deda od";
> 		$text['gmoth'] = "xxx baba od";
> 		$text['gpar'] = "xxx deda/baba od";
> 		$text['mothof'] = "majka od";
> 		$text['fathof'] = "otac od";
> 		$text['parof'] = "roditelj od";
> 		$text['maxrels'] = "Maksimalni broj veza za prikaz";
> 		$text['dospouses'] = "Prikaži veze gde su uklju�eni i supružici";
> 		$text['rels'] = "SRODSTVO";
> 		$text['dospouses2'] = "Prikaži supružnike";
> 		$text['fil'] = "otac po zakonu (o�uh)";
> 		$text['mil'] = "majka po zakonu (maćeha)";
> 		$text['fmil'] = "otac ili majka po zakonu (o�uh/maćeha)";
> 		$text['stepson'] = "pastorak";
> 		$text['stepdau'] = "pastorka";
> 		$text['stepchild'] = "pastor�e";
> 		$text['stepgson'] = "xxx usvojen-unuk";
> 		$text['stepgdau'] = "xxx usvojena-unuka";
> 		$text['stepgchild'] = "xxx usvojeni-unuci";
155c155
< 		$text['ggreat'] = "great";
---
> 		$text['ggreat'] = "pradeda";
157,171c157,240
< 		$text['ggfath'] = "the xxx great grandfather of";
< 		$text['ggmoth'] = "the xxx great grandmother of";
< 		$text['ggpar'] = "the xxx great grandparent of";
< 		$text['ggson'] = "the xxx great grandson of";
< 		$text['ggdau'] = "the xxx great granddaughter of";
< 		$text['ggsondau'] = "the xxx great grandchild of";
< 		$text['gstepgson'] = "the xxx great step-grandson of";
< 		$text['gstepgdau'] = "the xxx great step-granddaughter of";
< 		$text['gstepgchild'] = "the xxx great step-grandchild of";
< 		$text['guncle'] = "the xxx great uncle of";
< 		$text['gaunt'] = "the xxx great aunt of";
< 		$text['guncleaunt'] = "the xxx great uncle/aunt of";
< 		$text['gnephew'] = "the xxx great nephew of";
< 		$text['gniece'] = "the xxx great niece of";
< 		$text['gnephnc'] = "the xxx great nephew/niece of";
---
> 		$text['ggfath'] = "xxx pradeda od";
> 		$text['ggmoth'] = "xxx prababa od";
> 		$text['ggpar'] = "xxx pradeda/prababa od";
> 		$text['ggson'] = "xxx praunuk od";
> 		$text['ggdau'] = "xxx praunuka od";
> 		$text['ggsondau'] = "xxx praunuk/praunuka od";
> 		$text['gstepgson'] = "xxx usvojen-praunuk od";
> 		$text['gstepgdau'] = "xxx usvojena-praunuka od";
> 		$text['gstepgchild'] = "xxx usvojeno-praunu�e od";
> 		$text['guncle'] = "xxx deda stric ";
> 		$text['gaunt'] = "xxx baba tetka od";
> 		$text['guncleaunt'] = "xxx deda stric/baba tetka od";
> 		$text['gnephew'] = "xxx pra nećak/bratanac od";
> 		$text['gniece'] = "xxx pra nećaka/bratanica od";
> 		$text['gnephnc'] = "xxx pra bratanac/bratanica od";
> 		//added in 14.0
> 		$text['pathscalc'] = "Potražite veze";
> 		$text['findrel2'] = "Pronađite srodstva i druge veze";
> 		$text['makeme2nd'] = "Koristi moj ID";
> 		$text['usebookmarks'] = "Koristite obeleživa�e/bookmarks";
> 		$text['select2inds'] = "Izaberite dve osobe.";
> 		$text['indinfofor'] = "Individualne informacije za";
> 		$text['nobookmarks'] = "Nema obeleživa�a/bookmark  za korišc�enje";
> 		$text['bkmtitle'] = "Osobe pronađene u obeleživa�ima/bookmarks";
> 		$text['bkminfo'] = "Izaberite osobu:";
> 		$text['sortpathsby'] = "Sortiraj putanje po broju";
> 		$text['sortbyshort'] = "Sortiraj po";
> 		$text['bylengthshort'] = "Dužina";
> 		$text['badID1'] = ": ID loše osobe1 - vratite se i ispravite";
> 		$text['badID2'] = ": ID loše osobe2 - vratite se i ispravite";
> 		$text['notintree'] = ": osoba sa ovim ID-om nije u trenutnoj bazi podataka stabla.";
> 		$text['sameperson'] = "Dve osobe su ista osoba.";;
> 		$text['nopaths'] = "Ove osobe nisu povezane, nisu u srodstvu";
> 		$text['nopaths1'] = "Nema više veza krac�ih od xxx";
> 		$text['nopaths2'] = "u xxx koracima pretrage";
> 		$text['longestpath'] = "(najduža do sada proverena putanja bila je duga xxx koraka)";
> 		$text['relevantpaths'] = "Broj pronađenih razli�itih relevantnih putanja: xxx";
> 		$text['skipMarr'] = "(pored toga, broj putanja pronađenih, ali nisu prikazani zbog prevelikog broja brakova bio je: xxx)";
> 		$text['mjaor'] = "ili";
> 		$text['connectionsto'] = "Veze za ";
> 		$text['findanotherpers'] = "Nađi drugu osobu...";
> 		$text['sometimes'] = "(Ponekad provera razli�itog broja generacija daje druga�iji rezultat.)";
> 		$text['anotherpath'] = "Potražite druge veze";
> 		$text['xpath'] = "Putanja ";
> 		$text['primary'] = "Po�etna osoba"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Krajnja osoba";
> 		$text['parent'] = "Roditelj";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "her daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "otac";
> 		$text['hmother'] = "majka";
> 		$text['hhusband'] = "suprug";
> 		$text['hwife'] = "supruga";
> 		$text['hson'] = "sin";
> 		$text['hdaughter'] = "ćerka";
> 		$text['maxruns'] = "Maksimalan broj putanja koje treba proveriti";
> 		$text['maxrshort'] = "Maksimalan broj putanja";
> 		$text['maxlength'] = "Putanje veza ne duže od";
> 		$text['maxlshort'] = "Maksimalna dužina";
> 		$text['xstep'] = "korak";
> 		$text['xsteps'] = "koraka";
> 		$text['xmarriages'] = "xxx brakova";
> 		$text['xmarriage'] = "1 brak";
> 		$text['showspouses'] = "Prikažite oba supružnika";
> 		$text['showTxt'] = "Prikaži tekstualni opis putanje";
> 		$text['showTxtshort'] = "Tekstualno potomci/descendant";
> 		$text['compactBox'] = "Prikažite osobe u kompatnom obliku";
> 		$text['compactBoxshort'] = "Kompaktni oblik";
> 		$text['paths'] = "Putanje";
> 		$text['dospouses2'] = "Prikaži supružnike";
> 		$text['maxmopt'] = "Maksimalan broj brakova po srodstvu";
> 		$text['maxm'] = "Maksimalan broj brakova";
> 		$text['arerelated'] = "Ove osobe su rodaci - njihovo srodstvo je prikazano u Putanji 1";
> 		$text['simplerel'] = "Jednostavna pretraga srodstva";
175,180c244,249
< 		$text['familygroupfor'] = "Porodicni list za - ";
< 		$text['ldsords'] = "70LDS Ordinances";
< 		$text['baptizedlds'] = "Baptized (LDS)";
< 		$text['endowedlds'] = "Endowed (LDS)";
< 		$text['sealedplds'] = "Sealed P (LDS)";
< 		$text['sealedslds'] = "Sealed S (LDS)";
---
> 		$text['familygroupfor'] = "Porodi�ni list za - ";
> 		$text['ldsords'] = "LDS Uredbe (za mormonsku crkvu-nep.kod nas)";
> 		$text['baptizedlds'] = "Krštenje (LDS)";
> 		$text['endowedlds'] = "Obdaren (LDS)";
> 		$text['sealedplds'] = "Zape�aćen P (LDS)";
> 		$text['sealedslds'] = "Zape�aćen S (LDS)";
188c257
< 		$text['capbirthabbr'] = "Rod.";
---
> 		$text['capbirthabbr'] = "Rođ.";
191c260
< 		$text['capburialabbr'] = "Sah.";
---
> 		$text['capburialabbr'] = "Sahr.";
195,196c264
< 		$text['redraw'] = "87Redraw with";
< 		$text['scrollnote'] = "Ako ne vidite ceo dijagram pomerite sliku dole ili desno.";
---
> 		$text['redraw'] = "Iscrtava se";
199d266
< 		$text['popupnote2'] = "= Novi dijagram";
207c274
< 		$text['daughterof'] = "kci - roditelji";
---
> 		$text['daughterof'] = "kći - roditelji";
209,210c276,277
< 		$text['stdformat'] = "STANDARDNO";
< 		$text['ahnentafel'] = "PO GENERACIJAMA";
---
> 		$text['stdformat'] = "STANDARDNI FORMAT";
> 		$text['ahnentafel'] = "PO GENERACIJAMA (PEDIGRE DIJ.)";
212,213c279,280
< 		$text['editfam'] = "Obradi porodicu";
< 		$text['side'] = "- krilo";
---
> 		$text['editfam'] = "Izmeni podatke o porodici";
> 		$text['side'] = "- Krilo";
215,216c282,283
< 		$text['paternal'] = "Ocevo";
< 		$text['maternal'] = "Majcino";
---
> 		$text['paternal'] = "O�evo";
> 		$text['maternal'] = "Maj�ino";
220,221c287,288
< 		$text['gen4'] = "Pradede i prababe";
< 		$text['gen5'] = "Cukundede i cukunbabe";
---
> 		$text['gen4'] = "Pradede i Prababe";
> 		$text['gen5'] = "Čukundede i �ukunbabe";
223,229c290,296
< 		$text['gen7'] = "Kurdeli i kurdele";
< 		$text['gen8'] = "Askurdeli i askurdele";
< 		$text['gen9'] = "Kurdupi i kurdupe";
< 		$text['gen10'] = "Kurlebala i kurlebale";
< 		$text['gen11'] = "Sukurdoli i sukurdole";
< 		$text['gen12'] = "Sudepaci i sudepace";
< 		$text['graphdesc'] = "Grafik do te tacke";
---
> 		$text['gen7'] = "Kurđeli i Kurđele";
> 		$text['gen8'] = "Askurđeli i Askurđele";
> 		$text['gen9'] = "Kurđepi i Kurđepe";
> 		$text['gen10'] = "Kurlebali i Kurlebale";
> 		$text['gen11'] = "Sukurdovi i Sukurdove";
> 		$text['gen12'] = "Surdepa�i i Surdepa�e";
> 		$text['graphdesc'] = "Grafik do te ta�ke";
232,246c299,313
< 		$text['extrasexpl'] = "Ako postoje fotografije ili neka druga dokumenta za neku od osoba, odgovarajuca ikonicace se pojaviti pored tog imena.";
< 		$text['popupnote3'] = " = New chart";
< 		$text['mediaavail'] = "Media Available";
< 		$text['pedigreefor'] = "Pretci - ";
< 		$text['pedigreech'] = "Pedigree Chart";
< 		$text['datesloc'] = "Dates and Locations";
< 		$text['borchr'] = "Birth/Alt - Death/Burial (two)";
< 		$text['nobd'] = "No Birth or Death Dates";
< 		$text['bcdb'] = "Birth/Alt/Death/Burial (four)";
< 		$text['numsys'] = "Numbering System";
< 		$text['gennums'] = "Generation Numbers";
< 		$text['henrynums'] = "Henry Numbers";
< 		$text['abovnums'] = "d'Aboville Numbers";
< 		$text['devnums'] = "de Villiers Numbers";
< 		$text['dispopts'] = "Display Options";
---
> 		$text['extrasexpl'] = "Ako postoje fotografije, mediji ili neka druga dokumenta (istorije,...) za neku od osoba, odgovarajuća ikonica će se pojaviti pored tog imena.";
> 		$text['popupnote3'] = " = Novi grafikon";
> 		$text['mediaavail'] = "Dostupni mediji";
> 		$text['pedigreefor'] = "Graf Predaka (Pedigre) za";
> 		$text['pedigreech'] = "Graf Predaka (Pedigre)";
> 		$text['datesloc'] = "Datumi i Lokacije";
> 		$text['borchr'] = "Rođenje/Alternativno - Smrt/Sahrana (dva)";
> 		$text['nobd'] = "Nema datuma rođenja ili smrti";
> 		$text['bcdb'] = "Rođenje/Alt/Smrt/Sahrana (�etiri)";
> 		$text['numsys'] = "Brojevni Sistem";
> 		$text['gennums'] = "Brojevi Generacije";
> 		$text['henrynums'] = "Henry Brojevi";
> 		$text['abovnums'] = "d'Aboville Brojevi";
> 		$text['devnums'] = "de Villiers Brojevi";
> 		$text['dispopts'] = "Prikaz Opcija";
248,251c315,318
< 		$text['no_ancestors'] = "No ancestors found";
< 		$text['ancestor_chart'] = "Vertical ancestor chart";
< 		$text['opennewwindow'] = "Open in a new window";
< 		$text['pedvertical'] = "Vertical";
---
> 		$text['no_ancestors'] = "Nema pronađenih predaka";
> 		$text['ancestor_chart'] = "Vertikalni grafikon predaka";
> 		$text['opennewwindow'] = "Otvori u novom prozoru";
> 		$text['pedvertical'] = "Vertikalno";
253,261c320,328
< 		$text['familywith'] = "Family with";
< 		$text['fcmlogin'] = "Please log in to see details";
< 		$text['isthe'] = "is the";
< 		$text['otherspouses'] = "other spouses";
< 		$text['parentfamily'] = "The parent family ";
< 		$text['showfamily'] = "Show family";
< 		$text['shown'] = "shown";
< 		$text['showparentfamily'] = "show parent family";
< 		$text['showperson'] = "show person";
---
> 		$text['familywith'] = "Porodica sa";
> 		$text['fcmlogin'] = "Prijavite se da biste videli detalje";
> 		$text['isthe'] = "je";
> 		$text['otherspouses'] = "drugi supružnici";
> 		$text['parentfamily'] = "Roditeljska porodica ";
> 		$text['showfamily'] = "Prikaz porodice";
> 		$text['shown'] = "pokazano";
> 		$text['showparentfamily'] = "prikaz roditeljske porodice";
> 		$text['showperson'] = "prikaz osobe";
263c330,349
< 		$text['otherfamilies'] = "Other families";
---
> 		$text['otherfamilies'] = "Druge porodice";
> 		//added in 14.0
> 		$text['dtformat'] = "Tabele";
> 		$text['dtchildren'] = "Deca";
> 		$text['dtgrandchildren'] = "Unuci";
> 		$text['dtggrandchildren'] = "Praunuci";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Nema potomaka";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Ukupno";
> 		$text['dtselect'] = "Izabrati";
> 		$text['dteachfulltable'] = "Svaka puna tabela c�e imati";
> 		$text['dtrows'] = "redova";
> 		$text['dtdisplayingtable'] = "Prikaz tabele";
> 		$text['dtgototable'] = "Idi do tabele:";
> 		$text['fcinstrdn'] = "Prikaži porodicu sa supružnikom";
> 		$text['fcinstrup'] = "Prikaži porodicu sa roditeljima";
> 		$text['fcinstrplus'] = "Izaberite druge supružnike";
> 		$text['fcinstrfam'] = "Izaberite druge roditelje";
280c366
< 		$text['soundexof'] = "zvuci kao";
---
> 		$text['soundexof'] = "zvući kao";
286c372
< 		$text['greaterthanequal'] = "vece ili jednako";
---
> 		$text['greaterthanequal'] = "veće ili jednako";
292c378
< 		$text['showspouse'] = "Pokaži bracne partnere (ime se po";
---
> 		$text['showspouse'] = "Pokaži bra�ne partnere (će prikazati duplikate ako pojedinac ima više od jednog bra�nog druga)";
294c380
< 		$text['birthplace'] = "Mesto rodenja";
---
> 		$text['birthplace'] = "Mesto rođenja";
296c382
< 		$text['birthdatetr'] = "Godina rodenja";
---
> 		$text['birthdatetr'] = "Godina rođenja";
300c386
< 		$text['showdeath'] = "Pokaži informacije o smrti/sahrani";
---
> 		$text['showdeath'] = "Prikaži informacije o smrti/sahrani";
303c389
< 		$text['burialplace'] = "Mesto sahrant";
---
> 		$text['burialplace'] = "Mesto sahrane";
305c391
< 		$text['event'] = "Dogadaj(i)";
---
> 		$text['event'] = "Događaj(i)";
308,310c394,396
< 		$text['keyword'] = "Kljuc (ie, \"Abt\")";
< 		$text['explain'] = "Unesite podatke o datumu da bi ste videli dogadaje koji odgovaraju zadatom kriterijumu. Ili ostavite prazno da bi ste videli sve odabrane dogadaje.";
< 		$text['enterdate'] = "Upišite ili odaberite minimum jednu od ovih informacijs: dan, mesec, godina, kljucna rec";
---
> 		$text['keyword'] = "Klju�na re� (ie, \"Abt\")";
> 		$text['explain'] = "Unesite podatke o datumu da bi videli događaje koji odgovaraju zadatom kriterijumu. Ili ostavite prazno da bi videli sve odabrane događaje.";
> 		$text['enterdate'] = "Upišite ili odaberite minimum jednu od ovih informacija: dan, mesec, godina, klju�na re�";
312c398
< 		$text['birthdate'] = "Datum rodenja";
---
> 		$text['birthdate'] = "Datum rođenja";
315,316c401,402
< 		$text['spouseid'] = "Bracni drug - ID";
< 		$text['spousename'] = "Ime bracnog druga";
---
> 		$text['spouseid'] = "Bra�ni drug - ID";
> 		$text['spousename'] = "Ime bra�nog druga";
320,328c406,414
< 		$text['gedcom'] = "Porodicno stablo";
< 		$text['baptdate'] = "191Baptism Date (LDS)";
< 		$text['baptplace'] = "192Baptism Place (LDS)";
< 		$text['endldate'] = "193Endowment Date (LDS)";
< 		$text['endlplace'] = "194Endowment Place (LDS)";
< 		$text['ssealdate'] = "195Seal Date S (LDS)";   //Sealed to spouse
< 		$text['ssealplace'] = "196Seal Place S (LDS)";
< 		$text['psealdate'] = "197Seal Date P (LDS)";   //Sealed to parents
< 		$text['psealplace'] = "198Seal Place P (LDS)";
---
> 		$text['gedcom'] = "Porodi�no stablo";
> 		$text['baptdate'] = "Datum krštenja (LDS)";
> 		$text['baptplace'] = "Mesto krštenja (LDS)";
> 		$text['endldate'] = "Datum Zadužbine (LDS)";
> 		$text['endlplace'] = "Mesto Zadužbine (LDS)";
> 		$text['ssealdate'] = "Datum pe�ata S (LDS)";   //Sealed to spouse
> 		$text['ssealplace'] = "Mesto pe�ata S (LDS)";
> 		$text['psealdate'] = "Datum pe�ata P (LDS)";   //Sealed to parents
> 		$text['psealplace'] = "Mesto pe�ata P (LDS)";
330,331c416,417
< 		$text['spousesurname'] = "Prezime bracnog druga";
< 		$text['spousemore'] = "203If you enter a value for Spouse's Last Name, you must enter a value for at least one other field.";
---
> 		$text['spousesurname'] = "Prezime bra�nog druga";
> 		$text['spousemore'] = "Ako unesete prezime supružnika, morate uneti još jednu vrednost i za drugo polje.";
333,343c419,429
< 		$text['exists'] = "exists";
< 		$text['dnexist'] = "does not exist";
< 		$text['divdate'] = "Divorce Date";
< 		$text['divplace'] = "Divorce Place";
< 		$text['otherevents'] = "Drugi dogadaji";
< 		$text['numresults'] = "Results per page";
< 		$text['mysphoto'] = "Mystery Photos";
< 		$text['mysperson'] = "Elusive People";
< 		$text['joinor'] = "The 'Join with OR' option cannot be used with Spouse's Last Name";
< 		$text['tellus'] = "Tell us what you know";
< 		$text['moreinfo'] = "More Information:";
---
> 		$text['exists'] = "postoji";
> 		$text['dnexist'] = "ne postoji";
> 		$text['divdate'] = "Datum Razvoda";
> 		$text['divplace'] = "Mesto Razvoda";
> 		$text['otherevents'] = "Drugi događaji";
> 		$text['numresults'] = "Rezultati po stranici";
> 		$text['mysphoto'] = "Zagonetne Fotografije";
> 		$text['mysperson'] = "Osobe koje se traže, za porodi�no stablo";
> 		$text['joinor'] = "Je 'Član sa ILI ' opcija ne može da se koristi sa prezimenom supružnika";
> 		$text['tellus'] = "Recite nam Å¡ta znate o njima";
> 		$text['moreinfo'] = "Više informacija:";
345,348c431,434
< 		$text['marrdatetr'] = "Marriage Year";
< 		$text['divdatetr'] = "Divorce Year";
< 		$text['mothername'] = "Mother's Name";
< 		$text['fathername'] = "Father's Name";
---
> 		$text['marrdatetr'] = "Godina Braka";
> 		$text['divdatetr'] = "Godina Razvoda";
> 		$text['mothername'] = "Maj�ino Ime";
> 		$text['fathername'] = "O�evo Ime";
350,351c436,437
< 		$text['notliving'] = "Not Living";
< 		$text['nodayevents'] = "Events for this month that are not associated with a specific day:";
---
> 		$text['notliving'] = "Nije u životu";
> 		$text['nodayevents'] = "Događaji za ovaj mesec, a koji nisu povezani sa određenim danoom:";
353c439
< 		$text['csv'] = "Comma-delimited CSV file";
---
> 		$text['csv'] = "Razdvojen zarezima CSV fajl";
355,358c441,444
< 		$text['confdate'] = "Confirmation Date (LDS)";
< 		$text['confplace'] = "Confirmation Place (LDS)";
< 		$text['initdate'] = "Initiatory Date (LDS)";
< 		$text['initplace'] = "Initiatory Place (LDS)";
---
> 		$text['confdate'] = "Datum potvrde (LDS)";
> 		$text['confplace'] = "Mesto povrde (LDS)";
> 		$text['initdate'] = "Uvodni/Inicijatorni Datum (LDS)";
> 		$text['initplace'] = "Uvodno/Inicijatorno Mesto (LDS)";
360,362c446,448
< 		$text['marrtype'] = "Marriage Type";
< 		$text['searchfor'] = "Search for";
< 		$text['searchnote'] = "Note: This page uses Google to perform its search. The number of matches returned will be directly affected by the extent to which Google has been able to index the site.";
---
> 		$text['marrtype'] = "Tip Braka";
> 		$text['searchfor'] = "Traži";
> 		$text['searchnote'] = "Napomena: Ova stranica koristi Google za izvršavanje svojih pretraga. Broj odgovora će direktno uticati u kojoj meri Google je bio u stanju da indeksira sajt.";
375,376c461,462
< 		$text['cemeteriesheadstones'] = "Groblja i nadgrobni spomenici";
< 		$text['showallhsr'] = "Pokaži sve zapise o spomenicima";
---
> 		$text['cemeteriesheadstones'] = "Groblja i nadgrobni Spomenici";
> 		$text['showallhsr'] = "Pokaži sve zapise o Spomenicima";
378c464
< 		$text['showmap'] = "Pokaži plan";
---
> 		$text['showmap'] = "Pokaži mapu";
381,382d466
< 		$text['firstpage'] = "Prva strana";
< 		$text['lastpage'] = "Poslednja strana";
386,388c470,472
< 		$text['iptc020'] = "226Supp. Categories";
< 		$text['iptc040'] = "227Special Instructions";
< 		$text['iptc055'] = "228Creation Date";
---
> 		$text['iptc020'] = "226Kategorije podrške";
> 		$text['iptc040'] = "227Posebna uputstva";
> 		$text['iptc055'] = "228Datum kreiranja";
390,393c474,477
< 		$text['iptc085'] = "230Author's Position";
< 		$text['iptc090'] = "231City";
< 		$text['iptc095'] = "232State";
< 		$text['iptc101'] = "233Country";
---
> 		$text['iptc085'] = "230Pozicija Autora";
> 		$text['iptc090'] = "231Grad";
> 		$text['iptc095'] = "232Država/Pokrajna";
> 		$text['iptc101'] = "233Zemlja";
395,401c479,485
< 		$text['iptc105'] = "235Headline";
< 		$text['iptc110'] = "236Source";
< 		$text['iptc115'] = "237Photo Source";
< 		$text['iptc116'] = "238Copyright Notice";
< 		$text['iptc120'] = "239Caption";
< 		$text['iptc122'] = "240Caption Writer";
< 		$text['mapof'] = "241Map of";
---
> 		$text['iptc105'] = "235Naslov";
> 		$text['iptc110'] = "236Izvor";
> 		$text['iptc115'] = "237Izvor Fotografije";
> 		$text['iptc116'] = "238Obaveštenje o autorskim pravima";
> 		$text['iptc120'] = "239Naslov";
> 		$text['iptc122'] = "240Pisac Naslova";
> 		$text['mapof'] = "241Mapa";
403,426c487,510
< 		$text['gallery'] = "Samo slicice";
< 		$text['cemphotos'] = "Fotografija groblja";
< 		$text['photosize'] = "VELICINA";
<         $text['iptc010'] = "Priority";
< 		$text['filesize'] = "File Size";
< 		$text['seeloc'] = "See Location";
< 		$text['showall'] = "Show All";
< 		$text['editmedia'] = "Edit Media";
< 		$text['viewitem'] = "View this item";
< 		$text['editcem'] = "Edit Cemetery";
< 		$text['numitems'] = "# Items";
< 		$text['allalbums'] = "All Albums";
< 		$text['slidestop'] = "Pause Slide Show";
< 		$text['slideresume'] = "Resume Slide Show";
< 		$text['slidesecs'] = "Seconds for each slide:";
< 		$text['minussecs'] = "minus 0.5 seconds";
< 		$text['plussecs'] = "plus 0.5 seconds";
< 		$text['nocountry'] = "Unknown country";
< 		$text['nostate'] = "Unknown state";
< 		$text['nocounty'] = "Unknown county";
< 		$text['nocity'] = "Unknown city";
< 		$text['nocemname'] = "Unknown cemetery name";
< 		$text['editalbum'] = "Edit Album";
< 		$text['mediamaptext'] = "<strong>Note:</strong> Move your mouse pointer over the image to show names. Click to see a page for each name.";
---
> 		$text['gallery'] = "Samo sli�ice";
> 		$text['cemphotos'] = "Fotografije Groblja";
> 		$text['photosize'] = "Veli�ina";
>         $text['iptc010'] = "Prioritet";
> 		$text['filesize'] = "Veli�ina Fajla";
> 		$text['seeloc'] = "Vidi Lokaciju";
> 		$text['showall'] = "Pokaži Sve";
> 		$text['editmedia'] = "Izmeni Medij";
> 		$text['viewitem'] = "Pogledaj ovu stavku";
> 		$text['editcem'] = "Izmemi Groblje";
> 		$text['numitems'] = "# Stavka";
> 		$text['allalbums'] = "Svi Albumi";
> 		$text['slidestop'] = "Pauziraj Foto slajd";
> 		$text['slideresume'] = "Nastavi Foto slajd";
> 		$text['slidesecs'] = "Sekunde za svaku fotografiju u slajdu:";
> 		$text['minussecs'] = "minus 0.5 sekundi";
> 		$text['plussecs'] = "plus 0.5 sekundi";
> 		$text['nocountry'] = "Nepoznata zamlja";
> 		$text['nostate'] = "Nepoznata država";
> 		$text['nocounty'] = "Nepoznat okrug";
> 		$text['nocity'] = "epoznat grad";
> 		$text['nocemname'] = "Nepoznat naziv groblja";
> 		$text['editalbum'] = "Izmeni Album";
> 		$text['mediamaptext'] = "<strong>Napomena:</strong> Pomerite pokaziva� miša preko slike da biste videli imena osoba. Kliknite da biste videli stranicu osobe sa imenom.";
428,429c512,513
< 		$text['allburials'] = "All Burials";
< 		$text['moreinfo'] = "More Information:";
---
> 		$text['allburials'] = "Sva Sahranjivanja";
> 		$text['moreinfo'] = "Kliknite mišem za više informacija o ovoj slici.";
431,435c515,521
<         $text['iptc025'] = "Keywords";
<         $text['iptc092'] = "Sub-location";
< 		$text['iptc015'] = "Category";
< 		$text['iptc065'] = "Originating Program";
< 		$text['iptc070'] = "Program Version";
---
>         $text['iptc025'] = "Klju�ne re�i";
>         $text['iptc092'] = "Pod-lokacija";
> 		$text['iptc015'] = "Kategorija";
> 		$text['iptc065'] = "Izvorni Program";
> 		$text['iptc070'] = "Verzija Programa";
> 		//added in 13.0
> 		$text['toggletags'] = "Toggle Tags";
441,442c527,528
< 		$text['surnamesstarting'] = "Prikaz prezimena koja pocinju na";
< 		$text['showtop'] = "Pokaži prvih";
---
> 		$text['surnamesstarting'] = "Prikaz prezimena koja poćinju na";
> 		$text['showtop'] = "Prikaži prve";
445,455c531,541
< 		$text['byoccurrence'] = "po ucestalosti";
< 		$text['firstchars'] = "Pocetna slova";
< 		$text['mainsurnamepage'] = "Pocetna strana sa prezimenima";
< 		$text['allsurnames'] = "Sva prezimena";
< 		$text['showmatchingsurnames'] = "Kliknite na prezime da vidite osobe sa tim prezimenom";
< 		$text['backtotop'] = "Na pocetak";
< 		$text['beginswith'] = "koja pocinju sa";
< 		$text['allbeginningwith'] = "Prezimana koja pocinju sa";
< 		$text['numoccurrences'] = "broj osoba";
< 		$text['placesstarting'] = "Pokaži mesta cije ime pocinje sa";
< 		$text['showmatchingplaces'] = "Kliknite na ime mesta da vidite manje lokalitete. Kliknite na lupu ako želite da vidite koje sve povezan sa tom lokacijom.";
---
> 		$text['byoccurrence'] = "po u�estalosti";
> 		$text['firstchars'] = "Po�etna slova";
> 		$text['mainsurnamepage'] = "Po�etna strana sa prezimenima";
> 		$text['allsurnames'] = "Sva Prezimena";
> 		$text['showmatchingsurnames'] = "Kliknite na prezime da vidite osobe sa tim prezimenom.";
> 		$text['backtotop'] = "Povratak na po�etak";
> 		$text['beginswith'] = "Koja po�inju sa";
> 		$text['allbeginningwith'] = "Sva prezimena koja po�inju sa";
> 		$text['numoccurrences'] = "ukupan broj lokaliteta u zagradama";
> 		$text['placesstarting'] = "Prikaži najveća mesta/lokalitete ćije ime po�inje sa";
> 		$text['showmatchingplaces'] = "Kliknite na ime mesta da vidite manje lokalitete. Kliknite na ikonu za pretragu ako želite da vidite ko je sve povezan sa tom osobom.";
457c543
< 		$text['showallplaces'] = "Pokaži sva veca mesta";
---
> 		$text['showallplaces'] = "Prikaži sva veća mesta/lokacije";
459,461c545,547
< 		$text['mainplacepage'] = "Pokaži pocetnu listu mesta";
< 		$text['allplaces'] = "Sva veca mesta";
< 		$text['placescont'] = "Pokaži sva mesta koja u imenu sadrže";
---
> 		$text['mainplacepage'] = "Glavna lista mesta";
> 		$text['allplaces'] = "Sva veća Mesta/Lokacije";
> 		$text['placescont'] = "Prikaži sva mesta koja u imenu sadrže";
463,464c549,550
< 		$text['top30'] = "Top xxx surnames";
< 		$text['top30places'] = "Top xxx largest localities";
---
> 		$text['top30'] = "Prvih xxx prezimena";
> 		$text['top30places'] = "Prvih xxx većih mesta/lokacija";
466,476c552,562
< 		$text['firstnamelist'] = "First Name List";
< 		$text['firstnamesstarting'] = "Show first names starting with";
< 		$text['showallfirstnames'] = "Show all first names";
< 		$text['mainfirstnamepage'] = "Main first name page";
< 		$text['allfirstnames'] = "All First Names";
< 		$text['showmatchingfirstnames'] = "Click on a first name to show matching records.";
< 		$text['allfirstbegwith'] = "All first names beginning with";
< 		$text['top30first'] = "Top xxx first names";
< 		$text['allothers'] = "All others";
< 		$text['amongall'] = "(among all names)";
< 		$text['justtop'] = "Just the top xxx";
---
> 		$text['firstnamelist'] = "Lista Imena";
> 		$text['firstnamesstarting'] = "Prikaži imena koja po�inju sa";
> 		$text['showallfirstnames'] = "Prikaži sva imena";
> 		$text['mainfirstnamepage'] = "Glavna lista imena";
> 		$text['allfirstnames'] = "Sva Imena";
> 		$text['showmatchingfirstnames'] = "Kliknite na Ime da biste prikazali odgovarajuće zapise.";
> 		$text['allfirstbegwith'] = "Sva imena koja po�inju sa";
> 		$text['top30first'] = "Prvih xxx Imena";
> 		$text['allothers'] = "Svi drugi";
> 		$text['amongall'] = "(među svim imenima)";
> 		$text['justtop'] = "Samo prvih xxx";
481c567
< 		$text['pastxdays'] = "(u zadnjih xx dana)";
---
> 		$text['pastxdays'] = "(u poslednjih xx dana)";
484,487c570,573
< 		$text['history'] = "278History/Document";
< 		$text['husbid'] = "SUPRUG ID";
< 		$text['husbname'] = "IME I PREZIME SUPRUGA";
< 		$text['wifeid'] = "SUPRUGA ID";
---
> 		$text['history'] = "278Istorija/Dokument";
> 		$text['husbid'] = "ID Supruga";
> 		$text['husbname'] = "Ime i Prezime Supruga";
> 		$text['wifeid'] = "ID Supruge";
489c575
< 		$text['wifename'] = "Mother's Name";
---
> 		$text['wifename'] = "Ime i Prezime Supruge";
496,500c582,586
< 		$text['nobirth'] = "Odabrana osoba nema korektan datum rodenja i nemože biti dodata.";
< 		$text['event'] = "Dogadaj(i)";
< 		$text['chartwidth'] = "Å IRINA DIJAGRAMA";
< 		$text['timelineinstr'] = "Dodaj nove osobe unoseci njihov ID u donja polja:";
< 		$text['togglelines'] = "Toggle Lines";
---
> 		$text['nobirth'] = "Odabrana osoba nema korktan datum rođenja i ne može biti dodata.";
> 		$text['event'] = "Događaj(i)";
> 		$text['chartwidth'] = "Å irina dijagrama";
> 		$text['timelineinstr'] = "Dodaj nove osobe unoseći njihov ID u donja polja:";
> 		$text['togglelines'] = "Priklju�ene linije";
502c588
< 		$text['noliving'] = "Odabrana osoba je markirana kao živa i ne može biti dodata jer vi nemate dovoljno prava";
---
> 		$text['noliving'] = "Odabrana osoba je markirana kao živa i n može biti dodata jer vi nemate dovoljno prava, za tu aktivnost";
509,510c595,596
< 		$text['browsealltrees'] = "Pretraživanje svih porodicnih stabala";
< 		$text['treename'] = "Porodicno stablo";
---
> 		$text['browsealltrees'] = "Pretražavanje svih porodi�nih stabala";
> 		$text['treename'] = "Porodi�no stablo";
514c600
< 		$text['state'] = "Oblast";
---
> 		$text['state'] = "Oblast/Provincija";
517c603
< 		$text['email'] = "Vaša E-mail adresa";
---
> 		$text['email'] = "Vaša registrovana E-mail adresa";
519c605
< 		$text['username'] = "Korisnicko ime";
---
> 		$text['username'] = "Korisni�ko ime";
523,524c609,610
< 		$text['regnewacct'] = "Registrovanje novog korisnickog konta";
< 		$text['realname'] = "Vaše pravo ime";
---
> 		$text['regnewacct'] = "<strong>Registrovanje novog korisni�kog naloga</strong>";
> 		$text['realname'] = "Vaše puno ime i prezime";
526c612
< 		$text['email'] = "Vaša E-mail adresa";
---
> 		$text['email'] = "Vaša registrovana E-mail adresa";
530,536c616,622
< 		$text['leaveblank'] = "(ostavite prazno ako želite novo porodicno stablo)";
< 		$text['required'] = "Polja koja morate obavezno popuniti";
< 		$text['enterpassword'] = "Molimo vas upišite lozinku";
< 		$text['enterusername'] = "Molimo vas upišite korisnicko ime";
< 		$text['failure'] = "Žao nam je, ali korisnicko ime koje ste odabrali je vec u upotrebi. Vratite se na prethodnu stranu koristeci dugme za nazad i odaberite neko drugo korisnicko ime.";
< 		$text['success'] = "Hvala. Dobili smo vaš zahtev za registraciju. Dobicete mail cim vaša registracija bude aktivirana ili u skucaju da su potrebne dodatne informacije.";
< 		$text['emailsubject'] = "Zahtev za registraciju novog korisnika";
---
> 		$text['leaveblank'] = "(ostavite prezno ako želite novo porodi�no stablo)";
> 		$text['required'] = "Polja koja morate obavezno popuniti. <br><br> (NAPOMENA: Za UPIS LOZINKE, koristite najmanje 8 karaktera: bar jedno malo i veliko slovo i bar jedan broj), Hvala";
> 		$text['enterpassword'] = "Molim Vas upišite lozinku.";
> 		$text['enterusername'] = "Molim Vas upišite korini�ko ime.";
> 		$text['failure'] = "Žao nam je, ali korisni�ko ime koje ste odabrali je već u upotrebi. Vratite se na prethodnu stranicu koristeći dugme za nazad i odaberite neko drugo korisni�ko ime.";
> 		$text['success'] = "Hvala. Dobili smo vaš zahtev za registraciju. Dobićete e-mail, ćim vaša registracija bude aktivirana ili u slu�aju da su potrebne dodatne informacije. Posle toga možete se prijaviti na sajt.";
> 		$text['emailsubject'] = "Zahtev za registraciju novo korisnika";
538,539c624,625
< 		$text['nologin'] = "Niste registrovani?";
< 		$text['loginsent'] = "319Login information sent";
---
> 		$text['nologin'] = "Niste registrovani na sajtu?";
> 		$text['loginsent'] = "319Informacije o prijavi su poslate";
541,542c627,628
< 		$text['enterrealname'] = "Milomo vas upišite vaše pravo ime i prezime";
< 		$text['rempass'] = "Aktiviraj stalnu prijavu na ovom kompjuteru";
---
> 		$text['enterrealname'] = "Molim Vas upišite vaše pravo, puno ime i prezime.";
> 		$text['rempass'] = "Aktiviraj stalnu prijavu na ovom vašem kompjuteru";
544,558c630,642
< 		$text['accmail'] = "<strong>NOTE:</strong> In order to receive mail from the site administrator regarding your account, please make sure that you are not blocking mail from this domain.";
< 		$text['newpassword'] = "New Password";
< 		$text['resetpass'] = "Reset your password";
< 		$text['nousers'] = "This form cannot be used until at least one user record exists. If you are the site owner, please go to Admin/Users to create your Administrator account.";
< 		$text['noregs'] = "We're sorry, but we are not accepting new user registrations at this time. Please <a href=\"suggest.php\">contact us</a> directly if you have comments or questions regarding anything on this site.";
< 		//changed in 8.0.0
< 		$text['emailmsg'] = "You have received a new request for a TNG user account. Please log into your TNG Admin area and assign proper permissions to this new account. If you approve of this registration, please notify the applicant by replying to this message.";
< 		$text['accactive'] = "The account has been activated, but the user will have no special rights until you assign them.";
< 		$text['accinactive'] = "Go to Admin/Users/Review to access the account settings. The account will remain inactive until you edit and save the record at least once.";
< 		$text['pwdagain'] = "Password again";
< 		$text['enterpassword2'] = "Please enter your password again.";
< 		$text['pwdsmatch'] = "Your passwords do not match. Please enter the same password in each field.";
< 		//added in 8.0.0
< 		$text['acksubject'] = "Thank you for registering"; //for a new user account
< 		$text['ackmessage'] = "Your request for a user account has been received. Your account will be inactive until it has been reviewed by the site administrator. You will be notified by email when your login is ready for use.";
---
> 		$text['accmail'] = "<strong>NAPOMENA:</strong> Da bi dobili e-mail poruku od administratora sajta o svom nalogu proverite da niste slu�ajno blokirali e-poštu za ovaj domen. Ovaj sajt je privatan sajt porodice Milićević. Svi podaci sakupljeni u ovom projektu podležu zakonu Republike Srbije  o zaštiti podataka o li�nosti Člana 6. Svako kopiranje podataka bez dozvole autora ovog sajta podleže istom zakonu i može dobiti sudski epolog.";
> 		$text['newpassword'] = "Nova Lozinka";
> 		$text['resetpass'] = "Resetuj lozinku";
> 		$text['nousers'] = "Ovaj obrazac se ne može koristiti, sve dok postoji bar jedan korisni�ki zapis. Ako ste vlasnik sajta, uđite kao Adiministrator da kreirate Administratorski nalog.";
> 		$text['noregs'] = "Žao nam je ali u ovom trenutku ne prihvatamo registraciju novih korisni�kih naloga. Molim Vas <a href=\"suggest.php\">kontaktirajte nas</a> direktno, ako imate sugestije/komentare ili pitanja u vezi svega na ovom sajtu.";
> 		$text['emailmsg'] = "Primili ste novi zahtev za korisni�ki nalog sajta. Prijavite se na admin panel sajta i dodelite odgovarajuća prava za ovaj novi nalog. Ako odobrite ove registracije, molim vas obavestite podnosioca zahteva za odgovor na ovu poruku.";
> 		$text['accactive'] = "Korisni�ki nalog je sada aktiviran, ali korisnik neće imati specijalna prava dok se to ne potvrdi od strane administratora.";
> 		$text['accinactive'] = "Idite na Admin/Users/Review radi pristupu podešavanjima korisni�kim nalozima. Korisni�ki nalog će ostati neaktivan dok se ne izmeni i snimi/sa�uva zapis bar jednom.";
> 		$text['pwdagain'] = "Lozinka ponovo";
> 		$text['enterpassword2'] = "Unesite lozinku ponovo.";
> 		$text['pwdsmatch'] = "Lozinke se ne podudaraju. Unesite istu lozinku u svako polje. (NAPOMENA: Koristite najmanje 8 karaktera: bar jedno malo i veliko slovo i bar jedan broj)";
> 		$text['acksubject'] = "Hvala na registraciji"; //for a new user account
> 		$text['ackmessage'] = "Vaš zahtev za korisni�kim nalogom je primljen. Vaš korisi�ki nalog će biti NEAKTIVAN dok ne bude pregledan od strane administratora sajta. Bićete obavešteni putem e-maila kada vaš korisni�ki nalog bude spreman za upotrebu. Zbog drugih aktivnosti administratora, neki put može i duže trajati odgovor ali budite sigurni da ćete dobili e-mail";
560c644,651
< 		$text['switch'] = "Switch";
---
> 		$text['switch'] = "Prekida�";
> 		//added in 14.0
> 		$text['newpassword2'] = "Nova lozinka ponovo";
> 		$text['resetsuccess'] = "Uspeh: Lozinka je resetovana";
> 		$text['resetfail'] = "Greška: Lozinka nije resetovana";
> 		$text['failreason0'] = " (nepoznata greška baze podataka)";
> 		$text['failreason2'] = " (nemate dozvolu da promenite lozinku)";
> 		$text['failreason3'] = " (lozinke se ne poklapaju)";
565c656
< 		$text['browseallbranches'] = "Browse All Branches";
---
> 		$text['browseallbranches'] = "Pregledaj sve Grane stabla";
570c661
< 		$text['quantity'] = "VELICINA";
---
> 		$text['quantity'] = "VELIÄŒINA";
582,583c673,674
< 		$text['avglifespan'] = "Prosecan životni vek";
< 		$text['earliestbirth'] = "Najranije rodenje";
---
> 		$text['avglifespan'] = "Prose�an životni vek";
> 		$text['earliestbirth'] = "Najranije rođenje";
587,589c678,680
< 		$text['agedisclaimer'] = "Izracunavanje godina je bazirano na podacima rodenja i smrti. Buduci da postoje nepotpuni podaci kao Å¡to su pre 1869 ili oko 1863 ili iza 1780 ova izracunavanje ne mogu biti 100% tacna.";
< 		$text['treedetail'] = "345More information on this tree";
< 		$text['total'] = "Total";
---
> 		$text['agedisclaimer'] = "Izra�unavanje godina je bazirano na podacima rođenja i smrti. Budući da postoje nepotpuni podaci kao što su pre \"1869\" ili oko \"1863\" ili iza \"1780\" ova izra�unavanja ne mogu biti 100% ta�na.";
> 		$text['treedetail'] = "345Više informacija o ovom drvetu";
> 		$text['total'] = "Ukupno";
591c682,684
< 		$text['totdeceased'] = "Total Deceased";
---
> 		$text['totdeceased'] = "Ukupno umrlih";
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Ukupno Izvora Citata";
603,605c696,698
< 		$text['perms'] = "Permissions have all been set.";
< 		$text['noperms'] = "Permissions could not be set for these files:";
< 		$text['manual'] = "Please set them manually.";
---
> 		$text['perms'] = "Prava su sva bila setovana.";
> 		$text['noperms'] = "Prava ne mogu da se podese za ove fajlove:";
> 		$text['manual'] = "Molim Vas postavite ih ru�no.";
607,619c700,711
< 		$text['created'] = "has been created";
< 		$text['nocreate'] = "could not be created. Please create it manually.";
< 		$text['infosaved'] = "Information saved, connection verified!";
< 		$text['tablescr'] = "The tables have been created!";
< 		$text['notables'] = "The following tables could not be created:";
< 		$text['nocomm'] = "TNG is not communicating with your database. No tables were created.";
< 		$text['newdb'] = "Information saved, connection verified, new database created:";
< 		$text['noattach'] = "Information saved. Connection made and database created, but TNG cannot attach to it.";
< 		$text['nodb'] = "Information saved. Connection made, but database does not exist and could not be created here. Please verify that the database name is correct, and that the database user has proper access, or use your control panel to create it.";
< 		$text['noconn'] = "Information saved but connection failed. One or more of the following is incorrect:";
< 		$text['exists'] = "exists";
< 		$text['loginfirst'] = "You must log in first.";
< 		$text['noop'] = "No operation was performed.";
---
> 		$text['created'] = "napravljeno je";
> 		$text['nocreate'] = "ne mogu da se kreiraju. Molim Vas kreirajte ih ru�no.";
> 		$text['infosaved'] = "Informacije su sa�uvane, konekcija potvrđena!";
> 		$text['tablescr'] = "Tabele su kreirane!";
> 		$text['notables'] = "Sledeće tabele nisu mogle biti kreirane:";
> 		$text['nocomm'] = "TNG ne komunicira sa vašom bazom podataka. Tabele nisu kreirane.";
> 		$text['newdb'] = "sa�uvana informacija, verifikovana konekcija, stvorena nova baza podataka:";
> 		$text['noattach'] = "Informacije su sa�uvane. Konekcija je uspostavljena i baza podataka je kreirana, ali TNG se ne može priklju�iti na nju.";
> 		$text['nodb'] = "Informacije su sa�uvane. Veza je napravljena, ali baza podataka ne postoji i nije mogla biti kreirana ovde. Proverite da li je ime baze podataka ta�no i da li korisnik baze podataka ima odgovarajući pristup, ili koristite kontrolni panel da biste ga kreirali.";
> 		$text['noconn'] = "Informacije su sa�uvane, ali veza nije uspela. Jedno ili više od sledećih je pogrešno:";
> 		$text['exists'] = "već postoji.";
> 		$text['noop'] = "Nije izvršena nikakva operacija.";
621,625c713,719
< 		$text['nouser'] = "User was not created. Username may already exist.";
< 		$text['notree'] = "Tree was not created. Tree ID may already exist.";
< 		$text['infosaved2'] = "Information saved";
< 		$text['renamedto'] = "renamed to";
< 		$text['norename'] = "could not be renamed";
---
> 		$text['nouser'] = "Korisnik nije kreiran. Korisni�ko ime možda već postoji.";
> 		$text['notree'] = "Drvo nije kreirano. ID stabla možda već postoji.";
> 		$text['infosaved2'] = "Informacije su sa�uvane";
> 		$text['renamedto'] = "preimenovan u";
> 		$text['norename'] = "nije moguće preimenovati";
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Prvo morate da se prijavite na sajt, a ukoliko nemate korisni�ki nalog morate se registrovati.";
629,641c723,733
< 		$text['zoomin'] = "Zoom In";
< 		$text['zoomout'] = "Zoom Out";
< 		$text['magmode'] = "Magnify Mode";
< 		$text['panmode'] = "Pan Mode";
< 		$text['pan'] = "Click and drag to move within the image";
< 		$text['fitwidth'] = "Fit Width";
< 		$text['fitheight'] = "Fit Height";
< 		$text['newwin'] = "New Window";
< 		$text['opennw'] = "Open image in a new window";
< 		$text['magnifyreg'] = "Click to magnify a region of the image";
< 		$text['imgctrls'] = "Enable Image Controls";
< 		$text['vwrctrls'] = "Enable Image Viewer Controls";
< 		$text['vwrclose'] = "Close Image Viewer";
---
> 		$text['magmode'] = "Prikaz Uveli�avanja";
> 		$text['panmode'] = "Panoramski Prikaz";
> 		$text['pan'] = "Kliknite i povucite da biste se kretali unutar slike";
> 		$text['fitwidth'] = "Podesiva Å irina";
> 		$text['fitheight'] = "Podesiva Visina";
> 		$text['newwin'] = "Novi Prozor";
> 		$text['opennw'] = "Otvori sliku u novom prozoru";
> 		$text['magnifyreg'] = "Kliknite da biste uvećali region slike";
> 		$text['imgctrls'] = "Omogući kontrole slike";
> 		$text['vwrctrls'] = "Omogućiti kontrole pregleda�a slika";
> 		$text['vwrclose'] = "Zatvorite pregleda� slika";
645,647c737,739
< 		$text['test_date'] = "Test date";
< 		$text['links'] = "Relevant links";
< 		$text['testid'] = "Test ID";
---
> 		$text['test_date'] = "Datum testa";
> 		$text['links'] = "Relevantni linkovi";
> 		$text['testid'] = "ID Testa";
649,659c741,775
< 		$text['mode_values'] = "Mode Values";
< 		$text['compareselected'] = "Compare Selected";
< 		$text['dnatestscompare'] = "Compare Y-DNA Tests";
< 		$text['keep_name_private'] = "Keep Name Private";
< 		$text['browsealltests'] = "Browse All Tests";
< 		$text['all_dna_tests'] = "All DNA tests";
< 		$text['fastmutating'] = "Fast&nbsp;Mutating";
< 		$text['dna_info_head'] = "DNA Test Info";
< 		$text['alltypes'] = "All Types";
< 		$text['allgroups'] = "All Groups";
< 		$text['Ydna_LITbox_info'] = "Test(s) linked to this person were not necessarily taken by this person.<br />The 'Haplogroup' column displays data in red if the result is 'Predicted' or green if the test is 'Confirmed'";
---
> 		$text['mode_values'] = "Vrednosti Moda";
> 		$text['compareselected'] = "Izaberi za upoređivanje";
> 		$text['dnatestscompare'] = "Upoređivanje Y-DNA Testove";
> 		$text['keep_name_private'] = "Zadrži Imena Privatno";
> 		$text['browsealltests'] = "Pregledati sve DNA Testove";
> 		$text['all_dna_tests'] = "Svi DNA Testovi";
> 		$text['fastmutating'] = "Brze&nbsp;Mutacije";
> 		$text['alltypes'] = "Svi Tipovi";
> 		$text['allgroups'] = "Sve Grupe";
> 		$text['Ydna_LITbox_info'] = "Testo(vi) koji su povezani sa ovom osobom nisu obavezno preuzeti od ove osobe.<br />'Haplogroupa' prikazuje podatke u crvenoj boji ako je rezultat 'Predviđen unapred' ili zelen ako je test 'Potvrđen'";
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Uporedite izabrane mtDNA Testove";
> 		$text['dnatestscompare_atdna'] = "Uporedite izabrane atDNA Testove";
> 		$text['chromosome'] = "Hrom";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "sekvenca";
> 		$text['extra_mutations'] = "Ekstra Mutacije";
> 		$text['mrca'] = "MRC Predak";
> 		$text['ydna_test'] = "Y-DNA Testovi";
> 		$text['mtdna_test'] = "mtDNA (Mitohondrijski) Testovi";
> 		$text['atdna_test'] = "atDNA (autozomni) Testovi";
> 		$text['segment_start'] = "Po�etak";
> 		$text['segment_end'] = "Kraj";
> 		$text['suggested_relationship'] = "Predloženo";
> 		$text['actual_relationship'] = "Aktuelno";
> 		$text['12markers'] = "Markeri 1-12";
> 		$text['25markers'] = "Markeri 13-25";
> 		$text['37markers'] = "Markeri 26-37";
> 		$text['67markers'] = "Markeri 38-67";
> 		$text['111markers'] = "Markeri 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
664c780
< $text['matches'] = "Lista pronadenih, od";
---
> $text['matches'] = "Lista pronađenih, od";
670,671d785
< $text['birthabbr'] = "rod.";
< $text['chrabbr'] = "krš.";
673c787
< $text['andlocation'] = "360&amp; location";
---
> $text['andlocation'] = "360&amp; lokacija";
675d788
< $text['family'] = "BRAK"; //from getperson
677,680c790,793
< $text['tree'] = "Porodicno stablo";
< $text['alltrees'] = "Sva porodicna stabla";
< $text['nosurname'] = "[no surname]";
< $text['thumb'] = "DETALJ";  //as in Thumbnail
---
> $text['tree'] = "Porodi�no stablo";
> $text['alltrees'] = "Sva porodi�na stabla";
> $text['nosurname'] = "[nema prezime]";
> $text['thumb'] = "Sli�ica";  //as in Thumbnail
683c796
< $text['suffix'] = "373Suffix";  //from getperson
---
> $text['suffix'] = "373Sufiks";  //from getperson
685d797
< $text['deathabbr'] = "smr.";  //from descend
687c799
< $text['married'] = "VENCANJE";  //from getperson
---
> $text['married'] = "VENÄŒANjE";  //from getperson
694c806
< $text['personid'] = "LICNI ID";
---
> $text['personid'] = "LIÄŒNI ID";
706,707c818
< $text['burialabbr'] = "sah.";  //from descend
< $text['descendchart'] = "Opadajuci";
---
> $text['descendchart'] = "Opadajući";
712d822
< $text['place'] = "Mesto";
715,716c825
< $text['marrabbr'] = "ven.";
< $text['groupsheet'] = "Porodicni list";
---
> $text['groupsheet'] = "Porodi�ni list";
726,728c835,837
< $text['diedburied'] = "SMRT / SAHRANA";
< $text['homepage'] = "POCETNA STRANA";
< $text['find'] = "TRAŽI";
---
> $text['diedburied'] = "SMRT/SAHRANA";
> $text['homepage'] = "POÄŒETNA STRANA";
> $text['find'] = "Pronađi...";
730c839
< $text['relationship2'] = "Relationship"; //different in some languages, at least in German (Beziehung)
---
> $text['relationship2'] = "Srodstvo"; //different in some languages, at least in German (Beziehung)
735,738c844,846
< $text['branch'] = "Branch";
< $text['moreind'] = "More individuals";
< $text['morefam'] = "More families";
< $text['source'] = "IZVOR";
---
> $text['branch'] = "Grana";
> $text['moreind'] = "Još osoba";
> $text['morefam'] = "Još porodica/familija";
745,748c853,856
< $text['baptizedlds'] = "Baptized (LDS)";
< $text['endowedlds'] = "Endowed (LDS)";
< $text['sealedplds'] = "Sealed P (LDS)";
< $text['sealedslds'] = "Sealed S (LDS)";
---
> $text['baptizedlds'] = "Krštenje (LDS)";
> $text['endowedlds'] = "Obdaren (LDS)";
> $text['sealedplds'] = "Zape�aćen P (LDS)";
> $text['sealedslds'] = "Zape�aćen S (LDS)";
755c863
< $text['familyid'] = "PORODICNI ID";
---
> $text['familyid'] = "PORODIÄŒNI ID";
757,758c865,866
< $text['historiesdocs'] = "TEKSTOVI";
< $text['anonymous'] = "anonymous";
---
> $text['historiesdocs'] = "Istorije";
> $text['anonymous'] = "anoniman";
762c870
< $text['help'] = "POMOC";
---
> $text['help'] = "POMOĆ";
766d873
< $text['repository'] = "Repository";
768,773c875,879
< $text['suggest'] = "PRIMEDBA";
< $text['editevent'] = "Suggest a change for this event";
< $text['findplaces'] = "Find all individuals with events at this location";
< $text['morelinks'] = "More Links";
< $text['faminfo'] = "PORODICNE INFORMACIJE";
< $text['persinfo'] = "LICNE INFORMACIJE";
---
> $text['suggest'] = "Sugestija";
> $text['editevent'] = "Predlog za izmenu za ovaj događaj";
> $text['morelinks'] = "Više linkova";
> $text['faminfo'] = "PORODIÄŒNE INFORMACIJE";
> $text['persinfo'] = "LIÄŒNE INFORMACIJE";
775c881
< $text['fact'] = "Fact";
---
> $text['fact'] = "ÄŒinjenica";
780,788c886,894
< $text['repoinfo'] = "9Repository Information";
< $text['tng_reset'] = "BRIÅ I";
< $text['noresults'] = "Za zadati kriterijum nije pronaden ni jedan dogadaj.";
< $text['allmedia'] = "All Media";
< $text['repositories'] = "Repositories";
< $text['albums'] = "Albums";
< $text['cemeteries'] = "Cemeteries";
< $text['surnames'] = "Surnames";
< $text['dates'] = "Dates";
---
> $text['repoinfo'] = "9Informacije o Repozitorijumu";
> $text['tng_reset'] = "Reset";
> $text['noresults'] = "Za zadati kriterijum nije pronađen ni jedan događaj.";
> $text['allmedia'] = "Svi Mediji";
> $text['repositories'] = "Repozitorijumi";
> $text['albums'] = "Albumi";
> $text['cemeteries'] = "Groblja";
> $text['surnames'] = "Prezimena";
> $text['dates'] = "Datumi";
790,791c896,897
< $text['media'] = "Media";
< $text['gender'] = "Gender";
---
> $text['media'] = "MEDIJI";
> $text['gender'] = "Pol";
797,800c903,906
< $text['bookmarked'] = "Bookmark Added";
< $text['remove'] = "Remove";
< $text['find_menu'] = "Find";
< $text['info'] = "Info"; //this needs to be a very short abbreviation
---
> $text['bookmarked'] = "Bookmark dodan";
> $text['remove'] = "Obrisati";
> $text['find_menu'] = "TRAŽI";
> $text['info'] = "INFO"; //this needs to be a very short abbreviation
802,808c908,913
< $text['gmapevent'] = "Event Map";
< $text['gevents'] = "Event";
< $text['glang'] = "&amp;hl=sr";
< $text['googleearthlink'] = "Link to Google Earth";
< $text['googlemaplink'] = "Link to Google Maps";
< $text['gmaplegend'] = "Pin Legend";
< $text['unmarked'] = "212Unmarked";
---
> $text['gmapevent'] = "MAPA DOGA�AJA";
> $text['gevents'] = "Događaj";
> $text['googleearthlink'] = "Link ka Google Earth";
> $text['googlemaplink'] = "Link ka Google Maps";
> $text['gmaplegend'] = "Oznake Legende";
> $text['unmarked'] = "212Ne obeležen";
810,813c915,918
< $text['albclicksee'] = "Click to see all the items in this album";
< $text['notyetlocated'] = "Not yet located";
< $text['cremated'] = "Cremated";
< $text['missing'] = "Missing";
---
> $text['albclicksee'] = "Kliknite da biste videli sve stavke u ovom albumu";
> $text['notyetlocated'] = "Još uvek nije lociran";
> $text['cremated'] = "Kremiran";
> $text['missing'] = "Nedostaje";
815,839c920,943
< $text['blank'] = "Blank Chart";
< $text['none'] = "None";
< $text['fonts'] = "Fonts";
< $text['header'] = "Header";
< $text['data'] = "Data";
< $text['pgsetup'] = "Page Setup";
< $text['pgsize'] = "Page Size";
< $text['orient'] = "Orientation"; //for a page
< $text['portrait'] = "Portrait";
< $text['landscape'] = "Landscape";
< $text['tmargin'] = "Top Margin";
< $text['bmargin'] = "Bottom Margin";
< $text['lmargin'] = "Left Margin";
< $text['rmargin'] = "Right Margin";
< $text['createch'] = "Create Chart";
< $text['prefix'] = "Prefix";
< $text['mostwanted'] = "Most Wanted";
< $text['latupdates'] = "Latest Updates";
< $text['featphoto'] = "Featured Photo";
< $text['news'] = "News";
< $text['ourhist'] = "Our Family History";
< $text['ourhistanc'] = "Our Family History and Ancestry";
< $text['ourpages'] = "Our Family Genealogy Pages";
< $text['pwrdby'] = "This site powered by";
< $text['writby'] = "written by";
---
> $text['blank'] = "Prazan Grafikon";
> $text['fonts'] = "Fontovi";
> $text['header'] = "Zaglavlje";
> $text['data'] = "Podaci";
> $text['pgsetup'] = "Podešavanje stranice";
> $text['pgsize'] = "Veli�ina stranice";
> $text['orient'] = "Orijentacija stranice"; //for a page
> $text['portrait'] = "Uspravna orijentacija";
> $text['landscape'] = "Horizontalna orijentacija";
> $text['tmargin'] = "Gornja Margina";
> $text['bmargin'] = "Donja Margina";
> $text['lmargin'] = "Leva Margina";
> $text['rmargin'] = "Desna Margina";
> $text['createch'] = "Kreiraj Grafikon";
> $text['prefix'] = "Prefiks";
> $text['mostwanted'] = "U potrazi za";
> $text['latupdates'] = "Poslednje Izmene";
> $text['featphoto'] = "Istaknute Fotografije";
> $text['news'] = "Vesti";
> $text['ourhist'] = "Naša porodi�na istorija";
> $text['ourhistanc'] = "Naša porodi�na istorija i poreklo";
> $text['ourpages'] = "Naša porodi�na geneaološka stranica";
> $text['pwrdby'] = "Ovaj sajt pokreće";
> $text['writby'] = "napisan od";
841,846c945,950
< $text['viewphotos'] = "View all photos";
< $text['anon'] = "You are currently anonymous";
< $text['whichbranch'] = "Which branch are you from?";
< $text['featarts'] = "Feature Articles";
< $text['maintby'] = "Maintained by";
< $text['createdon'] = "Created on";
---
> $text['viewphotos'] = "Pogledaj sve fotografije";
> $text['anon'] = "Trenutno ste anonimni";
> $text['whichbranch'] = "Kojoj grani pripadaš?";
> $text['featarts'] = "Glavni ÄŒlanci";
> $text['maintby'] = "Održavanje je";
> $text['createdon'] = "Kreirano od";
848,852c952,956
< $text['labels'] = "Labels";
< $text['inclsrcs'] = "Include Sources";
< $text['cont'] = "(cont.)"; //abbreviation for continued
< $text['mnuheader'] = "Pocetna strana";
< $text['mnusearchfornames'] = "Potraži ososbu";
---
> $text['labels'] = "Labele";
> $text['inclsrcs'] = "Uklju�uju Izvore";
> $text['cont'] = "(nastavi)"; //abbreviation for continued
> $text['mnuheader'] = "POÄŒETNA STRANA";
> $text['mnusearchfornames'] = "Potraži osobu";
856c960
< $text['mnureset'] = "481Start Over";
---
> $text['mnureset'] = "481Po�eti iznova";
881,886c985,990
< $text['editperson'] = "Edit Person";
< $text['loadmap'] = "Load the map";
< $text['birth'] = "Birth";
< $text['wasborn'] = "was born";
< $text['startnum'] = "First Number";
< $text['searching'] = "Searching";
---
> $text['editperson'] = "Izmena Osobe";
> $text['loadmap'] = "U�itaj Mapu";
> $text['birth'] = "Rođenje";
> $text['wasborn'] = "je rođen";
> $text['startnum'] = "Prvi Broj";
> $text['searching'] = "Pretraga";
888,889c992,993
< $text['location'] = "Location";
< $text['association'] = "Association";
---
> $text['location'] = "Lokacija/Mesto";
> $text['association'] = "Asocijacija";
893c997
< $text['searchfams'] = "Search Families";
---
> $text['searchfams'] = "Potraži Porodice";
895c999
< $text['wasmarried'] = "VENCANJE";
---
> $text['wasmarried'] = "VENÄŒANjE";
898,906c1002,1010
< $text['share'] = "Share";
< $text['hide'] = "Hide";
< $text['disabled'] = "Your user account has been disabled. Please contact the site administrator for more information.";
< $text['contactus_long'] = "If you have any questions or comments about the information on this site, please <span class=\"emphasis\"><a href=\"suggest.php\">contact us</a></span>. We look forward to hearing from you.";
< $text['features'] = "Features";
< $text['resources'] = "Resources";
< $text['latestnews'] = "Latest News";
< $text['trees'] = "Trees";
< $text['wasburied'] = "was buried";
---
> $text['share'] = "Deli";
> $text['hide'] = "Sakri";
> $text['disabled'] = "Vaš korisni�ki nalog je isklju�en. Kontaktirajte administratora sajta za više informacija.";
> $text['contactus_long'] = "Ukoliko imate neko pitanje ili sugestiju oko ovog sajta, slobodno <span class=\"emphasis\"><a href=\"suggest.php\">kontaktirajte nas</a></span>. Mi o�ekujemo vaše sugestije.";
> $text['features'] = "Karakteristika sajta";
> $text['resources'] = "Genealoški sajtovi";
> $text['latestnews'] = "Najnovije Vesti";
> $text['trees'] = "Porodi�na stabla";
> $text['wasburied'] = "sahranjen";
908,912c1012,1016
< $text['emailagain'] = "Email again";
< $text['enteremail2'] = "Please enter your email address again.";
< $text['emailsmatch'] = "Your emails do not match. Please enter the same email address in each field.";
< $text['getdirections'] = "Click to get directions";
< $text['calendar'] = "Calendar";
---
> $text['emailagain'] = "e-mail ponovo";
> $text['enteremail2'] = "Unesite vašu e-mail adresu ponovo.";
> $text['emailsmatch'] = "Vaše e-mail adrese se ne podudaraju. Unesite istu e-mail adresu u svako polje.";
> $text['getdirections'] = "Kliknite da biste dobili uputstva";
> $text['calendar'] = "Kalendar";
914,917c1018,1021
< $text['directionsto'] = " to the ";
< $text['slidestart'] = "Start Slide Show";
< $text['livingnote'] = "At least one living individual is linked to this note - Details withheld.";
< $text['livingphoto'] = "At least one living individual is linked to this photo - Details withheld.";
---
> $text['directionsto'] = " do ";
> $text['slidestart'] = "Startuj foto slajd";
> $text['livingnote'] = "Najmanje jedna živa osoba je povezana sa ovom beleškom - Detalji uskraćeni.";
> $text['livingphoto'] = "Najmanje jedna živa osoba je povezana sa ovom fotografijom - Detalji uskraćeni.";
920,927c1024,1030
< $text['branches'] = "Branches";
< $text['detail'] = "Detail";
< $text['moredetail'] = "More detail";
< $text['lessdetail'] = "Less detail";
< $text['otherevents'] = "Drugi dogadaji";
< $text['conflds'] = "Confirmed (LDS)";
< $text['initlds'] = "Initiatory (LDS)";
< $text['wascremated'] = "was cremated";
---
> $text['branches'] = "Porodi�ne Grane";
> $text['detail'] = "Detalj";
> $text['moredetail'] = "Više detalja";
> $text['lessdetail'] = "Manje detalja";
> $text['conflds'] = "Potvrđen (LDS)";
> $text['initlds'] = "Uvodni (LDS)";
> $text['wascremated'] = "je kremiran/a";
931,940c1034,1043
< $text['searchsite'] = "Search this site";
< $text['searchsitemenu'] = "Search Site";
< $text['kmlfile'] = "Download a .kml file to show this location in Google Earth";
< $text['download'] = "Click to download";
< $text['more'] = "More";
< $text['heatmap'] = "Heat Map";
< $text['refreshmap'] = "Refresh Map";
< $text['remnums'] = "Clear Numbers and Pins";
< $text['photoshistories'] = "Photos &amp; Histories";
< $text['familychart'] = "Family Chart";
---
> $text['searchsite'] = "Pretraživanje ovog sajta";
> $text['searchsitemenu'] = "Pretraga sajta";
> $text['kmlfile'] = "Preuzmite .kml fajl za prikaz ove lokacije u Google Earth";
> $text['download'] = "Klikni za download";
> $text['more'] = "Više";
> $text['heatmap'] = "Toplotna Mapa";
> $text['refreshmap'] = "Osveži Mapu";
> $text['remnums'] = "Obrisati Brojeve i oznake na karti";
> $text['photoshistories'] = "Fotografije &amp; Istorijski dokumenti ";
> $text['familychart'] = "Grafikon Porodice";
942c1045
< $text['firstnames'] = "First Names";
---
> $text['firstnames'] = "Imena";
945,948c1048,1051
< $text['test_type'] = "Test type";
< $text['test_info'] = "Test Information";
< $text['takenby'] = "Taken by";
< $text['haplogroup'] = "Haplogroup";
---
> $text['test_type'] = "Tip Testa";
> $text['test_info'] = "Informacije o testu";
> $text['takenby'] = "Test uzet od";
> $text['haplogroup'] = "Haplogrupa";
951,954c1054,1055
< $text['relevant_links'] = "Relevant links";
< $text['people_have'] = "people have linked a DNA test to";
< $text['person_has'] = "person has linked a DNA test to";
< $text['nofirstname'] = "[no first name]";
---
> $text['relevant_links'] = "Relevantni linkovi";
> $text['nofirstname'] = "[bez imena]";
956,965c1057,1117
< $text['cookieuse'] = "Note: This site uses cookies.";
< $text['dataprotect'] = "Data Protection Policy";
< $text['viewpolicy'] = "View policy";
< $text['understand'] = "I understand";
< $text['consent'] = "I give my consent for this site to store the personal information collected here. I understand that I may ask the site owner to remove this information at any time.";
< $text['consentreq'] = "Please give your consent for this site to store personal information.";
< 
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> $text['cookieuse'] = "Napomena: Ovaj sajt koristi tzv. kola�iće.";
> $text['dataprotect'] = "Politika zaštite podataka";
> $text['viewpolicy'] = "Prikaži politiku zaštite podataka";
> $text['understand'] = "Razumem";
> $text['consent'] = "Dajem svoj pristanak da ovaj sajt �uva li�ne podatke koji su sakupljeni ovde. Razumem da mogu zatražiti od vlasnika veb lokacije da ukloni ove informacije u bilo koje vreme.";
> $text['consentreq'] = "Molimo Vas da date svoj pristanak da ovaj sajt �uva li�ne podatke.";
> 
> //added in 12.1.0
> $text['testsarelinked'] = "DNA testovi su povezani sa";
> $text['testislinked'] = "DNA test je povezan sa";
> 
> //added in 12.2
> $text['quicklinks'] = "Brzi Linkovi";
> $text['yourname'] = "Tvoje ime";
> $text['youremail'] = "Tvoja email adresa";
> $text['liketoadd'] = "Bilo koju informaciju koju želite da dodate";
> $text['webmastermsg'] = "Poruka Vebmastera";
> $text['gallery'] = "Pogledajte Galeriju";
> $text['wasborn_male'] = "je rođen";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "je rođena"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "kršten";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "krštena";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "umro";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "umrla";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "sahranjen"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "sahranjena"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "kremiran";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "kremirana";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "oženjen";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "udata";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "razveden";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "razvedena";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " na lokaciji";			// used as a preposition to the location
> $text['onthisdate'] = " na ovaj datum ";		// when used with full date
> $text['inthisyear'] = " za mesec/godinu ";		// when used with year only or month / year dates
> $text['and'] = "i ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "DNA Test Info";
> //added in 13.0
> $text['visitor'] = "Visitor";
> 
> $text['popupnote2'] = "= Novi dijagram";
> 
> //moved here in 14.0
> $text['zoomin'] = "Uveli�aj";
> $text['zoomout'] = "Smanji";
> $text['scrollnote'] = "Ako ne vidite ceo dijagram pomerite sliku dole ili desno.";
> $text['general'] = "Generalni";
> 
> //changed in 14.0
> $text['otherevents'] = "Drugi događaji i atributi";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Veze";
> $text['continue'] = "Nastavi";
> $text['title2'] = "Naslov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Slovak/admintext.php TNG1403/languages/Slovak/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Zadajte, prosím, ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Vyberte súbor na import dát.";
> 		$admtext['addreplacedata'] = "Pridávanie alebo nahradzovanie genealogických dát mô¾e trva» niekoµko minút v závislosti od veµkosti súboru";
> 		$admtext['fromyourcomputer'] = "z vá¹ho poèítaèa";
> 		$admtext['importdata'] = "Importova» údaje";
> 		$admtext['replace'] = "Nahradi» (vo vybranom strome)";
> 		$admtext['desttree'] = "Cieµový strom";
> 		$admtext['selectdesttree'] = "Vyberte alebo zadajte cieµový strom.";
> 		$admtext['selectexisting'] = "Importova» do";
> 		$admtext['ucaselast'] = "Previes» v¹etky priezviská na veµké písmená";
> 		$admtext['norecalc'] = "Neprepoèítava» znova znaèku ®ijúca";
> 		$admtext['autooffset'] = "Zaèa» èíslova» ID èísla od prvého voµného èísla";
> 		$admtext['mustselecttree'] = "Musíte zvoli» strom predtým ako vyberiete túto mo¾nos».";
> 		$admtext['onwebserver'] = "zo servera (z prieèinka GEDCOM)";
> 		$admtext['imphints'] = "Vysvetlenie: V¹etky aktuálne údaje znamená v¹etky osoby, rodiny, zdroje a poznámky (spojenie s médiámi sa nepreru¹í, ak zostanú ID èísla rovnaké). Porovnávanie odpovedajúcich záznamov je v¾dy zalo¾ené len na ID èíslach. Nové záznamy sú v¾dy pridané. Pridaním sa importujú v¹etky záznamy s novými ID èíslami.";
> 		$admtext['destbranch'] = "Cieµová vetva (nepovinná)";
> 		$admtext['importlatlong'] = "Importova» údaje o zemepisnej då¾ke / ¹írke, ak existujú";
> 		$admtext['opening'] = "Otváram";
> 		$admtext['reopen'] = "Znova otváram";
> 		$admtext['uploading'] = "Nahrávam";
> 		$admtext['stop'] = "Zastavi»";
> 		$admtext['stopped'] = "Import zastavený";
> 		$admtext['resume'] = "Pokraèova»";
> 		$admtext['neweronly'] = "Nahradi» len v prípade, ak sú údaje nov¹ie";
> 		$admtext['oldimport'] = "Starý ¹týl importu (bez zobrazenia priebehu)";
> 		$admtext['importgedcom'] = "Import súboru GEDCOM (mô¾e by» skomprimovaný)";
> 		$admtext['stopbackup'] = "Stop! It might be a good idea to back up your current data before proceeding.";
> 		$admtext['importmedia'] = "Importova» média, ak existujú";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Preverte, èi sú správne prefixy a sufixy (viï Základné nastavenie) pre tento súbor.";
> 		$admtext['chkimpsettings'] = "Pre viac volieb skontrolujte Nastavenia importu.";
> 		$admtext['eventsonly'] = "Import len pou¾ívateµských typov udalostí a atribútov (¾iadne údaje sa nepridávajú, nenahradzujú ani nepripájajú)";
> 		$admtext['allevents'] = "Akceptova» údaje pre v¹etky nové typy udalostí a atribúty";
> 		$admtext['finishingimporting'] = "Dokonèovanie...";
> 		$admtext['fileuploadfailed'] = "Nahrávanie súboru zlyhalo. Asi súbor je príli¹ veµký. Skúste pou¾i» FTP na nahratie súboru do vá¹ho prieèinka GEDCOM, vyberte a importujte súbor odtiaµ.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Zmeni» existujúci typ udalosti";
135,139c169
< 		$admtext['entertypedesc'] = "Zadajte typ/popis pre tento nový typ udalosti.";
< 		$admtext['enterdisplay'] = "Zadajte názov pre tento nový typ udalosti.";
< 		$admtext['existingeventtypeinfo'] = "Informácie o existujúcich typoch udalostí";
< 		$admtext['neweventtypeinfo'] = "Informácie o nových typoch udalostí";
< 		$admtext['tag'] = "Znaèka";
---
> 		$admtext['tag'] = "Tag";
144,146c174
< 		$admtext['typerequired'] = "Pri pou¾ití vlastných znaèiek, kde znaèka = \"EVEN\", sa povinne vy¾aduje \"Typ/Popis\". Pre v¹etky ostatné znaèky je tento údaj nepovinný.";
< 		$admtext['addnewevtype'] = "Prida» nový typ udalosti";
< 		$admtext['createnewevtype'] = "Vytvori» záznam nového typu udalosti";
---
> 		$admtext['typerequired'] = "Pri pou¾ití vlastných GEDCOM tagov (kde tag = \"EVEN\") to je hodnota TYPE a vy¾aduje sa. Pre v¹etky ostatné tagy je táto hodnota nepovinná.";
149,150d176
< 		$admtext['existingevtypes'] = "Existujúce typy udalostí";
< 		$admtext['edsevtypes'] = "Upravi», vymaza» alebo zoradi» existujúce typy udalostí";
152,154c178
< 		$admtext['confdeleteevtype'] = "Naozaj chcete vymaza» tento typ udalosti?";
< 		$admtext['selecttag'] = "Vybra» znaèku (tag)";
< 		$admtext['selectentertag'] = "Prosím, vyberte alebo zadajte znaèku (tag) pro tento typ udalosti.";
---
> 		$admtext['selecttag'] = "Vybra» tag";
208d231
< 		$admtext['changestoallevtypes'] = "Zmeny ku v¹etkým typom udalostí";
214d236
< 		$admtext['BAPM'] = "Krst";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Naozaj chcete vymaza» tento typ udalosti?";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Prida» nový typ";
> 		$admtext['createnewevtype'] = "Vytvori» nový atribút alebo záznam typu udalostí";
> 		$admtext['modifyeventtype'] = "Editova» existujúci typ";
> 		$admtext['entertypedesc'] = "Prosím, vlo¾te typ/popis pre tento nový atribút alebo typ udalostí.";
> 		$admtext['enterdisplay'] = "Prosím, vlo¾te zobrazovací re»azec pre tento nový atribút alebo typ udalostí.";
> 		$admtext['existingeventtypeinfo'] = "Informácia o existujúcom atribúte alebo type udalostí";
> 		$admtext['neweventtypeinfo'] = "Informácia o novom atribúte alebo type udalostí";
> 		$admtext['existingevtypes'] = "Existujúci atribút alebo typ udalostí";
> 		$admtext['edsevtypes'] = "Upravi», odstráni» alebo zotriedi» predtým vlo¾ené atribúty a typy udalostí";
> 		$admtext['selectentertag'] = "Prosím, vyberte alebo vlo¾te znaèku (tag) pre tento atribút alebo typ udalostí.";
> 		$admtext['changestoallevtypes'] = "Zmeny ku v¹etkým atribútom alebo typom udalostí";
268d303
< 		$admtext['nobirthinfo'] = "Chýbajú informácie o narodení";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Vybra» základný obrázok"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Ulo¾i» + Noví rodièia";
> 		$admtext['savenewspouse'] = "Ulo¾i» + Nový partner";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt. narodenia";
354d391
< 		$admtext['enterphotodesc'] = "Zadajte, prosím, popis obrázka.";
388d424
< 		$admtext['photoowner'] = "Majiteµ/zdroj";
417d452
< 		$admtext['imgmap'] = "Klikacia mapa obrázka";
490d524
< 		$admtext['mapinstr3'] = "Ak chcete prepoji» urèitú oblas» tejto fotografie s nejakou osobou, vyberte najprv strom, do ktorého táto osoba patrí, a potom vytvorte obdå¾nik po¾adovanej oblasti. To urobíte kliknutím do µavého horného rohu oblasti a potom »ahaním do pravého dolného rohu. Prípadne mô¾ete kliknú» do µavého horného rohu a potom znova do pravého dolného rohu. Potom sa objaví okno, pomocou ktorého mô¾ete vybra» danú osobu. Po vykonaní výberu bude kód klikacej mapy pridaný do ni¾¹ie uvedeného poµa. Tento postup opakujte podµa potreby pre ïal¹ie oblasti obrázka.";
495d528
< 		$admtext['removelink'] = "Odstráni» odkaz";
502d534
< 		$admtext['eloptions'] = "Prejs» alebo vymaza»";
509d540
< 		$admtext['nolinks'] = "E¹te neexistujú ¾iadne odkazy";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Klikacia mapa obrázka";
> 		$admtext['photoowner'] = "Majiteµ/zdroj";
> 		$admtext['nothumb'] = "®iadna miniatúra";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Polo¾ka sa nemô¾e prida», najpravdepodobnej¹ie preto, lebo súbor je príli¹ veµký, a tak nemô¾e sa nahra» alebo pou¾i» pri vytváraní miniatúry.";
> 		$admtext['moved'] = "Presunuté";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Prosím, vlo¾te názov alebo popis pre toto médium.";
> 		$admtext['mapinstr3'] = "Na pripojenie oblasti danej fotografie k osobe, rodine alebo inému objektu najprv vyberte odpovedajúci strom a typ objektu, potom vytvorte obdå¾ník pre po¾adovanú oblas». Robí sa to kliknutím do µavého horného rohu oblasti a potom »ahaním do pravého dolného rohu. Iný spôsob: mô¾ete kliknú» do µavého horného rohu a potom do pravého dolného rohu oblasti. Potom vysúvacie okienko pomô¾e vám vybra» osobu alebo iný objekt. Vyberte si, potom zopakujte tento proces podµa potreby pre ïal¹ie oblasti. Kliknutím na existujúcu oblas» ju vyberiete a potom »ahaním ju presuniete, alebo kliknite na \"X\" na jej odstránenie.";
570c608
< 		$admtext['lastmodified'] = "Dátum poslednej aktualizácie";
---
> 		$admtext['lastmodified'] = "Posledná aktualizácia";
596d633
< 		$admtext['foremptystring'] = "Ak chcete zada» prázdny re»azec, nechajte toto pole prázdne a kliknite na \"Prida» >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "In¹trukcie: «ahaním polo¾iek alebo dvojklikom na polo¾ky vµavo presúvajte ich do zoznamov vpravo. Na preúsporiadanie »ahajte ich hore a dole. Opätovným dvojklikom ich odstránite.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Pre prázdny re»azec nechajte to pole prázdne a kliknite na >>";
651,655d690
< 		$admtext['selectimportfile'] = "Vyberte súbor na import dát.";
< 		$admtext['importgedcom'] = "Zvoµte zdrojový súbor na import (¹tandardný formát GEDCOM 5.5)";
< 		$admtext['addreplacedata'] = "Pridávanie alebo nahradzovanie genealogických dát mô¾e trva» niekoµko minút v závislosti od veµkosti súboru";
< 		$admtext['fromyourcomputer'] = "z vá¹ho poèítaèa";
< 		$admtext['importdata'] = "Importova» údaje";
657,660d691
< 		$admtext['replace'] = "Nahradi» (vo vybranom strome)";
< 		$admtext['desttree'] = "Cieµový strom";
< 		$admtext['selectdesttree'] = "Vyberte alebo zadajte cieµový strom.";
< 		$admtext['selectexisting'] = "Importova» do";
668,673d698
< 		$admtext['ucaselast'] = "Previes» v¹etky priezviská na veµké písmená";
< 		$admtext['norecalc'] = "Neprepoèítava» znova znaèku ®ijúca";
< 		$admtext['autooffset'] = "Zaèa» èíslova» ID èísla od prvého voµného èísla";
< 
< 		$admtext['mustselecttree'] = "Musíte zvoli» strom predtým ako vyberiete túto mo¾nos».";
< 		$admtext['importmedia'] = "Importova» média, ak existujú";
675d699
< 		$admtext['neweronly'] = "Nahradi» len v prípade, ak sú údaje nov¹ie";
677,692d700
< 		$admtext['onwebserver'] = "zo servera (z prieèinka GEDCOM)";
< 		$admtext['eventsonly'] = "Importova» len vlastné typy udalostí (nebudú sa vklada», nahrádza» alebo pripája» ¾iadne údaje)";
< 		$admtext['imphints'] = "Vysvetlenie: V¹etky aktuálne údaje znamená v¹etky osoby, rodiny, zdroje a poznámky (spojenie s médiámi sa nepreru¹í, ak zostanú ID èísla rovnaké). Porovnávanie odpovedajúcich záznamov je v¾dy zalo¾ené len na ID èíslach. Nové záznamy sú v¾dy pridané. Pridaním sa importujú v¹etky záznamy s novými ID èíslami.";
< 		$admtext['allevents'] = "Prija» dáta pre v¹etky vlastné typy udalostí";
< 		$admtext['destbranch'] = "Cieµová vetva (nepovinná)";
< 		$admtext['inframe'] = "(v ráme)";
< 		$admtext['getstart'] = "Ako zaèa»";
< 		$admtext['importlatlong'] = "Importova» údaje o zemepisnej då¾ke / ¹írke, ak existujú";
< 		$admtext['opening'] = "Otváram";
< 		$admtext['reopen'] = "Znova otváram";
< 		$admtext['uploading'] = "Nahrávam";
< 		$admtext['stop'] = "Zastavi»";
< 		$admtext['stopped'] = "Import zastavený";
< 		$admtext['resume'] = "Pokraèova»";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Záznam prístupov";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Starý ¹týl importu (bez zobrazenia priebehu)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Aktualizácia";
> 		$admtext['need_upgrade'] = "Ukonèi» tieto aktualizaèné in¹trukcie";
> 		$admtext['upgrade_missing'] = "Zdá sa, ¾e chýba aktualizaèný súbor. Mo¾no, ¾e ste to u¾ urobili.";
> 		$admtext['delete_upgrade'] = "Keï skonèíte, kliknite sem na odstránenie aktualizácie a návrat k menu.";
723d733
< 		$admtext['author'] = "Autor";
783c793
< 		$admtext['mainpara'] = "Úvodný odstavec";  //1, 4, 6, 7, 8
---
> 		$admtext['mainpara'] = "Úvodný odsek";  //1, 4, 6, 7, 8
792,793c802,803
< 		$admtext['searchpara'] = "Odstavec hµadania"; //6
< 		$admtext['fhpara'] = "Odstavec rodinnej histórie"; //6
---
> 		$admtext['searchpara'] = "Odsek hµadania"; //6
> 		$admtext['fhpara'] = "Odsek rodinnej histórie"; //6
796,797c806,807
< 		$admtext['mwpara'] = "Odstavec hµadaných"; //6
< 		$admtext['respara'] = "Odstavec zdrojov"; //6
---
> 		$admtext['mwpara'] = "Odsek hµadaných"; //6
> 		$admtext['respara'] = "Odsek zdrojov"; //6
804,809c814,819
< 		$admtext['momside'] = "Popis matkinej strany"; //8
< 		$admtext['dadside'] = "Popis otcovej strany"; //8
< 		$admtext['momperson'] = "ID èíslo osoby z matkinej strany"; //8
< 		$admtext['momtree'] = "ID èíslo stromu z matkinej strany"; //8
< 		$admtext['dadperson'] = "ID èíslo osoby z otcovej strany"; //8
< 		$admtext['dadtree'] = "ID èíslo stromu z otcovej strany"; //8
---
> 		$admtext['momside'] = "Popis matkinej strany"; //8, 20
> 		$admtext['dadside'] = "Popis otcovej strany"; //8, 20
> 		$admtext['momperson'] = "ID èíslo osoby z matkinej strany"; //8, 20
> 		$admtext['momtree'] = "ID èíslo stromu z matkinej strany"; //8, 20
> 		$admtext['dadperson'] = "ID èíslo osoby z otcovej strany"; //8, 20
> 		$admtext['dadtree'] = "ID èíslo stromu z otcovej strany"; //8, 20
813c823
< 		$admtext['featurepara1'] = "Zaujímavos» 1, odstavec"; //4
---
> 		$admtext['featurepara1'] = "Zaujímavos» 1, odsek"; //4
817c827
< 		$admtext['featurepara2'] = "Zaujímavos» 2, odstavec"; //4
---
> 		$admtext['featurepara2'] = "Zaujímavos» 2, odsek"; //4
821c831
< 		$admtext['featurepara3'] = "Zaujímavos» 3, odstavec"; //4
---
> 		$admtext['featurepara3'] = "Zaujímavos» 3, odsek"; //4
825c835
< 		$admtext['featurepara4'] = "Zaujímavos» 4, odstavec"; //4
---
> 		$admtext['featurepara4'] = "Zaujímavos» 4, odsek"; //4
837c847
< 		$admtext['featurepara'] = "Odstavec zaujímavostí"; //9, 10
---
> 		$admtext['featurepara'] = "Odsek zaujímavostí"; //9, 10
843c853
< 		$admtext['featurespara'] = "Odstavec zaujímavostí";
---
> 		$admtext['featurespara'] = "Odsek zaujímavostí";
863c873
< 		$admtext['featurepara5'] = "Zaujímavos» 5, odstavec"; //15
---
> 		$admtext['featurepara5'] = "Zaujímavos» 5, odsek"; //15
867c877
< 		$admtext['featurepara6'] = "Zaujímavos» 6, odstavec"; //15
---
> 		$admtext['featurepara6'] = "Zaujímavos» 6, odsek"; //15
870c880
< 		$admtext['featurepara7'] = "Zaujímavos» 7, odstavec"; //15
---
> 		$admtext['featurepara7'] = "Zaujímavos» 7, odsek"; //15
873,876c883,886
< 		$admtext['featurepara8'] = "Zaujímavos» 8, odstavec"; //15
< 		$admtext['sidebarhead1'] = "Záhlavie boèného panela 1"; //15
< 		$admtext['sidebarhead2'] = " Záhlavie boèného panela 2"; //15
< 		$admtext['sidebarhead3'] = " Záhlavie boèného panela 3"; //15
---
> 		$admtext['featurepara8'] = "Zaujímavos» 8, odsek"; //15
> 		$admtext['sidebarhead1'] = " Záhlavie postranného panela 1"; //15
> 		$admtext['sidebarhead2'] = " Záhlavie postranného panela 2"; //15
> 		$admtext['sidebarhead3'] = " Záhlavie postranného panela 3"; //15
879c889
< 		$admtext['textpara1'] = "Text 1, odstavec"; //15
---
> 		$admtext['textpara1'] = "Text 1, odsek"; //15
882c892
< 		$admtext['textpara2'] = "Text 2, odstavec"; //15
---
> 		$admtext['textpara2'] = "Text 2, odsek"; //15
884,887c894,980
< 		$admtext['textpara3'] = "Text 3, odstavec"; //15
< 		$admtext['subhead1'] = "Podzáhlavie 1"; //15
< 		$admtext['subhead2'] = "Podzáhlavie 2"; //15
< 
---
> 		$admtext['textpara3'] = "Text 3, odsek"; //15
> 		$admtext['subhead1'] = "Podnadpis 1"; //15
> 		$admtext['subhead2'] = "Podnadpis 2"; //15
> 		//added in 12.2
> 		$admtext['quotehead'] = "Záhlavie citátov";
> 		$admtext['quotesubhead'] = "Podnadpis citátov";
> 		$admtext['sniptitle'] = "Nadpis krátkeho filmu";
> 		$admtext['snipname'] = "Názov krátkeho filmu";
> 		$admtext['snipinfoone'] = "Prvý riadok krátkeho filmu";
> 		$admtext['snipinfotwo'] = "Druhý riadok krátkeho filmu";
> 		$admtext['snipimage'] = "Obrázok krátkeho filmu";
> 		$admtext['snipperson'] = "ID osoby krátkeho filmu";
> 		$admtext['sniptree'] = "ID stromu krátkeho filmu";
> 		$admtext['quote'] = "Citát";
> 		$admtext['link'] = "Odkaz";
> 		$admtext['featuretitle7'] = "Zaujímavos» 7 nadpis";
> 		$admtext['featuretitle8'] = "Zaujímavos» 8 nadpis";
> 		$admtext['featuretitle9'] = "Zaujímavos» 9 nadpis";
> 		$admtext['featurethumb9'] = "Zaujímavos» 9 miniatúra"; //15
> 		$admtext['featurelink9'] = "Zaujímavos» 9 odkaz"; //15
> 		$admtext['featurepara9'] = "Zaujímavos» 9 odsekc"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "¥avý obrázok záhlavia";
> 		$admtext['rightimg'] = "Pravý obrázok záhlavia";
> 		$admtext['photoption'] = "Mo¾nosti fotografie sú<br />&nbsp;&nbsp;(statická alebo náhodná)";
> 		$admtext['randomphotowidth'] = "©írka náhodnej fotografie";
> 		$admtext['randomphotoheight'] = "Vý¹ka náhodnej fotografie";
> 		$admtext['randomphotomediatypeID'] = "Kolekcia náhodných fotografií";
> 		$admtext['momheading'] = "Nadpis materskej rodiny";
> 		$admtext['mompara'] = "Odsek materskej rodiny";
> 		$admtext['mompagelink'] = "Odkaz materskej rodiny";
> 		$admtext['dadheading'] = "Nadpis otcovskej rodiny";
> 		$admtext['dadpara'] = "Odsek otcovskej rodiny";
> 		$admtext['dadpagelink'] = "Odkaz otcovskej rodiny";
> 		$admtext['spmomheading'] = "Nadpis materskej rodiny partnera";
> 		$admtext['spmompara'] = "Odsek materskej rodiny partnera";
> 		$admtext['spmompagelink'] = "Odkaz materskej rodiny partnera";
> 		$admtext['spmomside'] = "Návestie materskej strany partnera";
> 		$admtext['spdadside'] = "Návestie otcovskej strany partnera";
> 		$admtext['spmomperson'] = "ID osoby materskej strany partnera";
> 		$admtext['spmomtree'] = "ID stromu materskej strany partnera";
> 		$admtext['spdadheading'] = "Nadpis otcovskej rodiny partnera";
> 		$admtext['spdadpara'] = "Odsek otcovskej rodiny partnera";
> 		$admtext['spdadpagelink'] = "Odkaz otcovskej rodiny partnera";
> 		$admtext['spdadperson'] = "ID osoby otcovskej strany partnera";
> 		$admtext['spdadtree'] = "ID stromu otcovskej strany partnera";
> 		$admtext['storiesheading'] = "Príbehy na¹ej rodiny";
> 		$admtext['nbrsurnames'] = "Poèet priezvísk<br />&nbsp;&nbsp; v mraku (v cloud-e) priezvísk";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Miniatúra zaujímavosti";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Nadpis snímky";
> 		$admtext['slideimg'] = "Obrázok snímky";
> 		$admtext['slideheadline'] = "Titulok snímky";
> 		$admtext['slidetext'] = "Text snímky";
> 		$admtext['slidelink'] = "Odkaz snímky";
> 		$admtext['slidelinktext'] = "Názov odkazu snímky";
> 		$admtext['featurelink'] = "Odkaz zaujímavosti";
> 		$admtext['featurelinktext'] = "Názov odkazu zaujímavosti";
> 		$admtext['featuretitle'] = "Nadpis zaujímavosti";
> 		$admtext['featuresub'] = "Podnadpis zaujímavosti";
> 		$admtext['quoteimg'] = "Obrázok citácie";
> 		$admtext['quotelink'] = "Odkaz citácie";
> 		$admtext['quotelinktext'] = "Názov odkazu citácie";
> 		$admtext['sidebarpara'] = "Odsek postranného panela";
> 		$admtext['sidebarlink'] = "Odkaz postranného panela";
> 		$admtext['sidebarlinktext'] = "Názov odkazu postranného panela";
> 		$admtext['sidebarimg'] = "Obrázok postranného panela";
> 		$admtext['sidebartitle'] = "Nadpis postranného panela";
> 		$admtext['sidebarsub'] = "Podnadpis postranného panela";
> 		$admtext['snipheadline'] = "Titulok krátkeho filmu";
> 		$admtext['snipsubhead'] = "Podtitulok krátkeho filmu";
> 		$admtext['snipimg'] = "Obrázok krátkeho filmu";
> 		$admtext['sniplink'] = "Odkaz krátkeho filmu";
> 		$admtext['sniplinktext'] = "Názov odkazu krátkeho filmu";
> 		$admtext['linktext'] = "Text odkazu";
> 		$admtext['footerheadline'] = "Titulok päty";
> 		$admtext['footerpara'] = "Text päty";
> 		$admtext['footerlink'] = "Odkaz päty";
> 		$admtext['footerlinktext'] = "Názov odkazu päty";
> 		$admtext['footerheadline'] = "Titulok päty";
> 		$admtext['footerpara'] = "Text päty";
> 		$admtext['footerlink'] = "Odkaz päty";
> 		$admtext['footerlinktext'] = "Názov odkazu päty";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vy¾aduje verziu 5.3 alebo vy¹¹iu.)";
---
> 		$admtext['phpreq'] = "(TNG vy¾aduje verziu 5.6 alebo vy¹¹iu.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1263c1354
<         $admtext['mailuser'] = "Pou¾ívateµ. meno pre email";
---
>         $admtext['mailuser'] = "Pou¾ívateµské meno pre email";
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Zmeni» príchodzie prefixy tak, aby odpovedali nastaveniam TNG";
> 		$admtext['sortevents'] = "Zoradi» udalosti podµa";
> 		$admtext['sortbydate'] = "Dátum udalostí";
> 		$admtext['sortbytype'] = "Typ udalostí";
> 		$admtext['allowsuggest'] = "Povoli» pripomienky od náv¹tevníkov";
> 		$admtext['livingchecked'] = "Nastavenie oznaèenia ®ijúci pre nových µudí a rodiny";
> 		$admtext['maxmarried'] = "Oznaèi» rodinu ako ¾ijúcu, ak sa sobá¹ili menej ako<br/>toµko rokov";
> 		$admtext['imagetags'] = "Obdå¾niky";
> 		$admtext['allowcsv'] = "Povoli» s»ahovanie súborov vo formáte CSV pre zostavy";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Mo¾nosti zálohovania";
> 		$admtext['dosql'] = "Exportova» ako SQL";
> 		$admtext['dodrop'] = "Vlo¾i» DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Vlo¾i» CREATE TABLE";
> 		$admtext['onrestore'] = "Mo¾nosti obnovy";
> 		$admtext['dodel'] = "Najprv odstráòte predchádzajúci obsah";
> 		$admtext['download'] = "Stiahnutie";
> 		$admtext['altbirthtypes'] = "Udalosti alternatívneho narodenia";
> 		$admtext['dtformat'] = "Formát tabuliek";
> 		$admtext['conchart'] = "Schéma spojení";
> 		$admtext['maxropt'] = "Maximálny poèet vyhµadávacích behov spojení";
> 		$admtext['maxlopt'] = "Maximálna då¾ka ciest spojenia";
> 		$admtext['showtxtopt'] = "Zobrazi» textové vyjadrenie cesty";
> 		$admtext['compactboxopt'] = "Zobrazi» rámèeky osôb v kompaktnej forme";
> 		$admtext['sortbyopt'] = "Triedi» cesty podµa";
> 		$admtext['anchoridopt'] = "ID ukotvenia";
> 		$admtext['maxmopt'] = "Maximálny poèet man¾elstiev v spojení";
> 		$admtext['saveincfg'] = "Ulo¾i» do konfiguraènej cesty (viï Základné nastavenie)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Geokódovanie sa nedá vykona»";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Nerobi» geokódovanie";
1436d1549
< 		$admtext['backtosecondary'] = "Spä» na druhotné procesy";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Spä» k obslu¾ným programom Post-import";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Vylúèi» poznámky";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zozipova» a zahrnú» mediálne súbory";
> 		$admtext['downloadzip'] = "Stiahnu» ZIP súbory";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Zobrazi» len pou¾ívateµov so zakázaným prístupom";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Povoli» zobrazenie neverejných poznámok";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Ak je vybratý jediný strom, posla» info aj administrátorom";
1616,1617c1738
< 		$admtext['logagain'] = "Kliknutím se znovu prihlásite.";
< 		//added in 8.1.0
---
> 		$admtext['logagain'] = "Kliknutím sa znovu prihláste.";
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1670c1789
< 		$admtext['not_living'] = "Osoba oznaèená ako ¾ijúca má doteraj¹í dátum úmrtia";
---
> 		$admtext['not_living'] = "Osoba oznaèená ako ¾ijúca má dátum úmrtia";
1677c1796
< 		$admtext['modlist'] = "Zoznam módov";
---
> 		$admtext['modlist'] = "Zoznam modov";
1684c1803
< 		$admtext['nomods'] = "V prieèinku módov sa nena¹li ¾iadne definièné súbory módu (xxx)";
---
> 		$admtext['nomods'] = "V prieèinku modov sa nena¹li ¾iadne definièné súbory modu (xxx)";
1697d1815
< 		//changed in 9.0.0
1699,1701c1817,1818
< 		//added in 9.0.0
< 		$admtext['needmodupdate'] = "Vy¾aduje sa aktualizácia módu";
< 		$admtext['cannotinstall'] = "Tento mód nemo¾no nain¹talova»";
---
> 		$admtext['needmodupdate'] = "Vy¾aduje sa aktualizácia modu";
> 		$admtext['cannotinstall'] = "Tento mod nemo¾no nain¹talova»";
1713c1830
< 		$admtext['logoptions'] = "Protokol mana¾éra módov";
---
> 		$admtext['logoptions'] = "Protokol mana¾éra modov";
1716c1833
< 		$admtext['modname'] = "Názov módu";
---
> 		$admtext['modname'] = "Názov modu";
1718c1835
< 		$admtext['modifyoptions'] = "Upravi» mo¾nosti mana¾éra módov";
---
> 		$admtext['modifyoptions'] = "Upravi» mo¾nosti mana¾éra modov";
1722,1723c1839,1840
< 		$admtext['showlogfile'] = "Zobrazi» protokol akcií mana¾éra módov";
< 		$admtext['recentactions'] = "posledné akcie, ktoré vykonal mana¾ér módov";
---
> 		$admtext['showlogfile'] = "Zobrazi» protokol akcií mana¾éra modov";
> 		$admtext['recentactions'] = "posledné akcie, ktoré vykonal mana¾ér modov";
1726,1728c1843,1845
< 		$admtext['modsyntax'] = "Syntax módov";
< 		$admtext['modguidelines'] = "Úvod k módom";
< 		$admtext['filemod'] = "Súbor xxx je upravený módom";
---
> 		$admtext['modsyntax'] = "Syntax modov";
> 		$admtext['modguidelines'] = "Úvod k modom";
> 		$admtext['filemod'] = "Súbor xxx je upravený modom";
1733c1850
< 		$admtext['tngmods'] = "Módy pre TNG ";
---
> 		$admtext['tngmods'] = "Mody pre TNG ";
1753c1870
< 		$admtext['cantproc'] = "nemo¾no odstráni» mód";
---
> 		$admtext['cantproc'] = "nemo¾no odstráni» mod";
1769c1886
< 		$admtext['modrem'] = "mód odin¹talovaný";
---
> 		$admtext['modrem'] = "mod odin¹talovaný";
1775c1892
< 		$admtext['nocfgfile'] = "súbor módu nebol nájdený";
---
> 		$admtext['nocfgfile'] = "súbor modu nebol nájdený";
1787c1904
< 		$admtext['return'] = "Návrat do mana¾éra módov";
---
> 		$admtext['return'] = "Návrat do mana¾éra modov";
1795,1797c1912,1914
< 		$admtext['allowdeletepartial'] = "Povoli» Odstráni» vybrané z èiastoène nain¹talovaných módov";
< 		$admtext['allowdeleteinstalled'] = "Povoli» Odstráni» zo samostatne in¹talovaných módov";
< 		$admtext['showwarnings'] = "Zobrazi» upozornenia módov v poli Stav";
---
> 		$admtext['allowdeletepartial'] = "Povoli» Odstráni» vybrané pre èiastoène nain¹talované mody";
> 		$admtext['allowdeleteinstalled'] = "Povoli» Odstráni» pre samostatne nain¹talované mody";
> 		$admtext['showwarnings'] = "Zobrazi» upozornenia modov v poli Stav";
1831c1948
< 		$admtext['formodname'] = "pre názov módu ";
---
> 		$admtext['formodname'] = "pre názov modu ";
1854c1971
< 		$admtext['selectmod'] = "Vyberte konfiguraèný súbor módu na uká¾ku tabuµkových výsledkov analyzátora";
---
> 		$admtext['selectmod'] = "Vyberte konfiguraèný súbor modu na uká¾ku tabuµkových výsledkov analyzátora";
1858c1975
< 		$admtext['custtextfixes'] = "Aktualizované pokyny módu odporúèajú, aby pou¾ívateµský text bol vsúvaný pred komentáre na zaèiatok súboru cust_text.php tak, aby módy nemali vplyv na ruèné zmeny pou¾ívateµa urobené za komentovanými riadkami.";
---
> 		$admtext['custtextfixes'] = "Aktualizované pokyny modu odporúèajú, aby pou¾ívateµský text bol vsúvaný pred komentáre na zaèiatok súboru cust_text.php tak, aby mody nemali vplyv na ruèné zmeny pou¾ívateµa urobené za komentovanými riadkami.";
1861c1978
< 		$admtext['compressnames'] = "Zhusti» názvy módov v zozname módov";
---
> 		$admtext['compressnames'] = "Zhusti» názvy modov v zozname modov";
1866,1868c1983,1985
< 		$admtext['newanchor'] = "Nový komentovaný riadok by sa nemal preklada» v jazykových súboroch, preto¾e vývojári módu ho mô¾u pou¾i» ako kotvu na vkladanie pou¾ívateµského textu pred tento nový komentovaný riadok.";
< 		$admtext['translateissue'] = "Ak prelo¾ite nový komentovaný riadok, in¹talácie módu zlyhajú.";
< 		$admtext['privatemod'] = "Neverejný mód";
---
> 		$admtext['newanchor'] = "Nový komentovaný riadok by sa nemal preklada» v jazykových súboroch, preto¾e vývojári modu ho mô¾u pou¾i» ako kotvu na vkladanie pou¾ívateµského textu pred tento nový komentovaný riadok.";
> 		$admtext['translateissue'] = "Ak prelo¾ite nový komentovaný riadok, in¹talácie modu zlyhajú.";
> 		$admtext['privatemod'] = "Neverejný mod";
1871,1872c1988,1989
< 		$admtext['confdelmod'] = "Naozaj chcete tento mód odstráni» z vá¹ho systému?";
< 		$admtext['allowdeletesupport'] = "Dovoli» vymazanie prieèinka, ak je vymazaný mód";
---
> 		$admtext['confdelmod'] = "Naozaj chcete tento mod odstráni» z vá¹ho systému?";
> 		$admtext['allowdeletesupport'] = "Dovoli» vymazanie prieèinka, ak je vymazaný mod";
1874,1877c1991,1994
< 		$admtext['delpartinfo'] = "Mali by ste nastavi» túto voµbu na Áno len vtedy, ak ste zabudli odin¹talova» predchádzajúce verzie módu pred in¹talovaním novej verzie.";
< 		$admtext['delinstinfo'] = "Mali by ste nastavi» túto voµbu na Áno len vtedy, ak ste nain¹talovali novú verziu módu a predchádzajúca verzia sa stále ukazuje ako nain¹talovaná.";
< 		$admtext['updateopts'] = "Vá¹ súbor mmconfig.php potrebuje by» zaktualizovaný! Prosím, kliknite na vy¹¹ie uvedenú kartu Voµby a potom na tlaèidlo Ulo¾i».";
< 		$admtext['confdelmod1'] = "Naozaj chcete vymaza» tento mód z vá¹ho systému? Nemô¾ete vráti» spä» túto operáciu!";
---
> 		$admtext['delpartinfo'] = "Mali by ste nastavi» túto voµbu na Áno len vtedy, ak ste zabudli odin¹talova» predchádzajúce verzie modu pred in¹talovaním novej verzie.";
> 		$admtext['delinstinfo'] = "Mali by ste nastavi» túto voµbu na Áno len vtedy, ak ste nain¹talovali novú verziu modu a predchádzajúca verzia sa stále ukazuje ako nain¹talovaná.";
> 		$admtext['updateopts'] = "Vá¹ súbor mmconfig.php potrebuje by» zaktualizovaný! Prosím, kliknite na vy¹¹ie uvedenú kartu Mo¾nosti a potom na tlaèidlo Ulo¾i».";
> 		$admtext['confdelmod1'] = "Naozaj chcete vymaza» tento mod z vá¹ho systému? Nemô¾ete vráti» spä» túto operáciu!";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "V¹etky mody";
> 		$admtext['installedmods'] = "Len nain¹talované mody";
> 		$admtext['partinstmods'] = "Nain¹talované + èiastoène nain¹talované mody";
> 		$admtext['showanalyzeractions'] = "Zobrazi» akcie v analyzátore modov";
> 		$admtext['badchar'] = "Neplatný znak";
1886d2008
< 		$admtext['test_number'] = "Èíslo testu";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Èíslo testu";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Dr¾a» test ako neverejný";
> 		$admtext['multivalues'] = "Pri rozsahu hodnôt pou¾ijte pomlèku";
> 		$admtext['changestogroup'] = "Zmeny v DNA skupine";
> 		$admtext['modifydnagroup'] = "Upravi» existujúcu DNA skupinu";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Pripojte tento DNA test k osobe";
1947c2078
< $admtext['state'] = "©tát";
---
> $admtext['state'] = "©tát/kraj";
1965d2095
< $admtext['otherevents'] = "Ïal¹ie udalosti";
2022c2152
< $admtext['lastmodified'] = "Dátum poslednej aktualizácie";
---
> $admtext['lastmodified'] = "Posledná aktualizácia";
2032c2162
< $admtext['username'] = "Pou¾ívateµ. meno";
---
> $admtext['username'] = "Pou¾ívateµské meno";
2050,2051d2179
< $admtext['savereturn'] = "Vráti» sa na túto stránku";
< $admtext['saveback'] = "Vráti» sa na menu";
2058,2059d2185
< $admtext['secondary'] = "Druhotné procesy";
< $admtext['commas'] = "Oddeli» jednotlivé polo¾ky èiarkou";
2103c2229
< $admtext['matches'] = "Zhoduje sa";
---
> $admtext['matches'] = "Záznamy";
2129,2130d2254
< $admtext['secondarymaint'] = "Druhotné procesy";
< $admtext['customeventtypes'] = "Vlastné typy udalostí";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2233c2354
< $admtext['modmgr'] = "Mana¾ér módov";
---
> $admtext['modmgr'] = "Mana¾ér modov";
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Typ";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Priezviská";
> $admtext['subhead'] = "Podtitul";
> $admtext['image'] = "Obrázok";
> $admtext['author'] = "Autor";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Ako zaèa»";
> $admtext['showlog'] = "Záznam prístupov";
> $admtext['nobirthinfo'] = "Chýbajú informácie o narodení";
> //changed in 13.0
> $admtext['savereturn'] = "Ulo¾i» + Zosta»";
> $admtext['saveback'] = "Ulo¾i» + Koniec";
> //added in 13.0
> $admtext['allitemsdeleted'] = "V¹etky polo¾ky boli úspe¹ne vymazané.";
> $admtext['private'] = "Súkromné";
> $admtext['imgtags'] = "Obrázkové znaèky";
> 
> $admtext['removelink'] = "Odstráni» odkaz";
> $admtext['eloptions'] = "Prejs» alebo vymaza»";
> $admtext['pleaseenter'] = "Zadajte, prosím, ";
> 
> $admtext['nolinks'] = "E¹te neexistujú ¾iadne odkazy";
> $admtext['nogeocode'] = "Geokódovanie sa nedá vykona»";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Vybra» základný obrázok"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Typy udalostí/atribútov";
> $admtext['secondary'] = "Obslu¾né programy Post-import";
> $admtext['otherevents'] = "Iné udalosti/atribúty";
> //added in 14.0
> $admtext['newlinks'] = "Vytvorené odkazy";
> $admtext['newcemlinks'] = "Vytvorené odkazy na cintoríny";
> $admtext['utility'] = "Obslu¾ný program";
> $admtext['linktype'] = "Typ";
> $admtext['move'] = "Presun";
> $admtext['copy'] = "Kópia";
> $admtext['title2'] = "Názov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Slovak/alltext.php TNG1403/languages/Slovak/alltext.php
5c5
< $dates['JANUARY'] = "január";
---
> $dates['JANUARY'] = "január";
7c7
< $dates['FEBRUARY'] = "február";
---
> $dates['FEBRUARY'] = "február";
11,16c11,16
< $dates['APRIL'] = "apríl";
< $dates['MAY'] = "máj";
< $dates['JUN'] = "jún";
< $dates['JUNE'] = "jún";
< $dates['JUL'] = "júl";
< $dates['JULY'] = "júl";
---
> $dates['APRIL'] = "apríl";
> $dates['MAY'] = "máj";
> $dates['JUN'] = "jún";
> $dates['JUNE'] = "jún";
> $dates['JUL'] = "júl";
> $dates['JULY'] = "júl";
22c22
< $dates['OCTOBER'] = "október";
---
> $dates['OCTOBER'] = "október";
28c28
< $dates['ABOUT'] = "pribli¾ne";
---
> $dates['ABOUT'] = "pribli¾ne";
38c38
< $dates['Y'] = "Áno, dátum neznámy";
---
> $dates['Y'] = "�no, dátum neznámy";
43,44c43,44
< $text['cannotexecutequery'] = "Dotaz sa nedá vykona»";
< $text['to'] = "a¾";
---
> $text['cannotexecutequery'] = "Dotaz sa nedá vykona»";
> $text['to'] = "a¾";
46,47c46,47
< $text['text_next'] = "Ïal¹í";
< $text['text_prev'] = "Predchádzajúci";
---
> $text['text_next'] = "�al¹í";
> $text['text_prev'] = "Predchádzajúci";
50,59c50,59
< $text['forgot1'] = "<strong>Zabudli ste svoje pou¾ívateµské meno alebo heslo?</strong><br />Napí¹te dole svoju emailovú adresu, aby sme vám mohli posla» va¹e pou¾ívateµské meno.";
< $text['forgot2'] = "Napí¹te svoju emailovú adresu hore a svoje pou¾ívateµské meno dole, aby znova sa vám mohlo nastavi» heslo (po¹leme vám doèasné heslo).";
< $text['newpass'] = "Va¹e nové doèasné heslo";
< $text['usersent'] = "Va¹e pou¾ívateµské meno vám bolo poslané na va¹u emailovú adresu.";
< $text['pwdsent'] = "Va¹e doèasné heslo vám bolo poslané na va¹u emailovú adresu.";
< $text['loginnotsent2'] = "Emailová adresa, kterou jste zapsali, neodpovídá ¾ádnému u¾ivatelskému úètu. ®ádné údaje vám nebyly zaslány.";
< $text['loginnotsent3'] = "Emailová adresa a pou¾ívateµské meno, ktoré ste napísali, neodpovedá ¾iadnemu pou¾ívateµskému úètu. Neboli vám poslané ¾iadne údaje.";
< $text['logininfo'] = "Va¹e prihlasovacie údaje";
< $text['collapseall'] = "Zbali» v¹etko";
< $text['expandall'] = "Rozbali» v¹etko";
---
> $text['forgot1'] = "<strong>Zabudli ste svoje pou¾ívateµské meno alebo heslo?</strong><br />Napí¹te dole svoju emailovú adresu, aby sme vám mohli posla» va¹e pou¾ívateµské meno.";
> $text['forgot2'] = "Napí¹te svoju emailovú adresu hore a svoje pou¾ívateµské meno dole, aby znova sa vám mohlo nastavi» heslo (po¹leme vám doèasné heslo).";
> $text['newpass'] = "Va¹e nové doèasné heslo";
> $text['usersent'] = "Va¹e pou¾ívateµské meno vám bolo poslané na va¹u emailovú adresu.";
> $text['pwdsent'] = "Va¹e doèasné heslo vám bolo poslané na va¹u emailovú adresu.";
> $text['loginnotsent2'] = "Emailová adresa, ktorú ste napísali, neodpovedá ¾iadnemu pou¾ívateµskému úètu. Neboli vám poslané ¾iadne údaje.";
> $text['loginnotsent3'] = "Emailová adresa a pou¾ívateµské meno, ktoré ste napísali, neodpovedá ¾iadnemu pou¾ívateµskému úètu. Neboli vám poslané ¾iadne údaje.";
> $text['logininfo'] = "Va¹e prihlasovacie údaje";
> $text['collapseall'] = "Zbali» v¹etko";
> $text['expandall'] = "Rozbali» v¹etko";
64c64
< $text['headstones'] = "Náhrobky";
---
> $text['headstones'] = "Náhrobky";
66,67c66,67
< $text['recordings'] = "Zvukové záznamy";
< $text['videos'] = "Videá";
---
> $text['recordings'] = "Zvukové záznamy";
> $text['videos'] = "Videá";
70c70
< $admtext['placelevel'] = "Úroveò miesta";
---
> $admtext['placelevel'] = "Úroveò miesta";
75c75
< $admtext['level5'] = "©tát/kraj";
---
> $admtext['level5'] = "©tát/kraj";
77c77
< $admtext['level0'] = "Nenastavené";
---
> $admtext['level0'] = "Nenastavené";
79,82c79,82
< $text['male'] = "Mu¾";
< $text['female'] = "®ena";
< $text['closewindow'] = "Zavrie» okno";
< $text['loading'] = "Nahrávam...";
---
> $text['male'] = "Mu¾";
> $text['female'] = "®ena";
> $text['closewindow'] = "Zavrie» okno";
> $text['loading'] = "Nahrávam...";
85,86c85,86
< $text['none'] = "®iadny";
< $text['mainton'] = "Re¾im údr¾by je zapnutý";
---
> $text['none'] = "®iadne";
> $text['mainton'] = "Re¾im údr¾by je zapnutý";
88,93c88,92
< //moved here in 8.0.0
< $text['living'] = "®ijúci";
< $admtext['text_private'] = "Neverejné";
< $admtext['confunlink'] = "Ste si istý, ¾e chcete odpoji» túto osobu ako partnera od tejto rodiny?";
< $admtext['confunlinkc'] = "Ste si istý, ¾e chcete odpoji» túto osobu ako die»a od tejto rodiny?";
< $admtext['confremchild'] = "Ste si istý, ¾e chcete odstráni» toto die»a z tejto rodiny? Táto osoba nebude vymazaná z databázy.";
---
> $text['living'] = "®ijúci";
> $admtext['text_private'] = "Neverejné";
> $admtext['confunlink'] = "Ste si istý, ¾e chcete odpoji» túto osobu ako partnera od tejto rodiny?";
> $admtext['confunlinkc'] = "Ste si istý, ¾e chcete odpoji» túto osobu ako die»a od tejto rodiny?";
> $admtext['confremchild'] = "Ste si istý, ¾e chcete odstráni» toto die»a z tejto rodiny? Táto osoba nebude vymazaná z databázy.";
95c94
< $admtext['yes'] = "Áno";
---
> $admtext['yes'] = "�no";
98c97
< $admtext['DEAT'] = "Úmrtie";
---
> $admtext['DEAT'] = "Úmrtie";
103c102
< $admtext['NICK'] = "Prezývka";
---
> $admtext['NICK'] = "Prezývka";
107,121c106,117
< $admtext['SLGC'] = "Peèatenie s rodièmi (CJKSpd)";
< $admtext['MARR'] = "Sobá¹";
< $admtext['SLGS'] = "Peèatenie s partnerom (CJKSpd)";
< $admtext['hello'] = "Dobrý deò";
< $admtext['activated'] = "Vá¹ pou¾ívateµský úèet bol aktivováný.";
< $admtext['infois'] = "Údaje na prihlásenie sú";
< $admtext['subjectline'] = "Vá¹ pou¾ívateµský úèet bol aktivovaný.";
< 
< //moved here in 8.1.0
< $admtext['adopted'] = "adoptované";
< $admtext['birth'] = "narodené";
< $admtext['foster'] = "vzaté do opatrovania";
< $admtext['sealing'] = "peèatené";
< //added in 11.0.3
< $admtext['putative'] = "domnelý";
---
> $admtext['SLGC'] = "Peèatenie s rodièmi (CJKSpd)";
> $admtext['MARR'] = "Sobá¹";
> $admtext['SLGS'] = "Peèatenie s partnerom (CJKSpd)";
> $admtext['hello'] = "Dobrý deò";
> $admtext['activated'] = "Vá¹ pou¾ívateµský úèet bol aktivováný.";
> $admtext['infois'] = "Údaje na prihlásenie sú";
> $admtext['subjectline'] = "Vá¹ pou¾ívateµský úèet bol aktivovaný.";
> $admtext['adopted'] = "adoptované";
> $admtext['birth'] = "narodené";
> $admtext['foster'] = "vzaté do opatrovania";
> $admtext['sealing'] = "peèatené";
> $admtext['putative'] = "domnelý";
123,126c119
< //added in 9.0.0
< $text['editprofile'] = "Upravi» profil";
< 
< //moved here in 9.0.0
---
> $text['editprofile'] = "Upravi» profil";
128,129c121,122
< $text['legal'] = "Právny"; //as in page size
< $text['sunday'] = "Nedeµa";  //first day of week on calendar
---
> $text['legal'] = "Právny"; //as in page size
> $text['sunday'] = "Nedeµa";  //first day of week on calendar
133c126
< $text['thursday'] = "©tvrtok";
---
> $text['thursday'] = "©tvrtok";
137,140c130
< $text['startswith'] = "zaèína na";
< 
< //moved here in 9.0.4
< $text['top'] = "Vrch";
---
> $text['startswith'] = "zaèína na";
142,146c132,136
< //moved here in 10.0.0
< $text['startingind'] = "Východzia osoba";
< $text['enteremail'] = "Zadajte, prosím, platnú emailovú adresu.";
< $text['page'] = "Stránka";
< $text['go'] = "Choï";
---
> $text['top'] = "Top";
> $text['startingind'] = "Východzia osoba";
> $text['enteremail'] = "Zadajte, prosím, platnú emailovú adresu.";
> $text['page'] = "Stránka";
> $text['go'] = "Choï";
148,149d137
< 
< //added in 10.0.0
151,156c139,142
< $admtext['INIT'] = "Zasvätenie (CJKSpd)";
< $admtext['step'] = "Nevlastné die»a";
< $text['switchm'] = "Prepnú» na mobilnú verziu";
< $text['switchs'] = "Prepnú» na ¹tandardnú verziu";
< 
< //added in 11.0.0
---
> $admtext['INIT'] = "Zasvätenie (CJKSpd)";
> $admtext['step'] = "Nevlastné die»a";
> $text['switchm'] = "Prepnú» na mobilnú verziu";
> $text['switchs'] = "Prepnú» na ¹tandardnú verziu";
158,159c144
< $admtext['preflang'] = "Preferovaný jazyk";
< $text['problem'] = "Vyskytla sa chyba v softvéri TNG. Mô¾e to by» spôsobené in¹taláciou,  neúplnou aktualizáciou alebo chybou v programe. Ak ste majiteµom webového sídla, mô¾ete kontaktova» podporu TNG, aby vám pomohla pri rie¹ení tohto problému. Prosím, skopírujte ni¾¹ie uvedený dotaz a vlo¾te  ho do va¹ej správy.";
---
> $admtext['preflang'] = "Preferovaný jazyk";
161c146
< $text['fanchart'] = "Vejárovitá schéma";
---
> $text['fanchart'] = "Vejárovitá schéma";
163d147
< //moved here in 12.0.0
166,182c150,164
< $admtext['allbranches'] = "V¹etky vetvy";
< $admtext['active'] = "Aktivova»";
< $admtext['select'] = "Vybra»";
< $admtext['selectall'] = "Vybra» v¹etko";
< $admtext['clearall'] = "Vyèisti» v¹etko";
< $admtext['medialinks'] = "Odkazy na médium";
< 
< //added here in 12.0.0
< $text['testgroup'] = "Testovaná skupina";
< $text['test_number'] = "Èíslo/názov testu";
< $text['test_info_display'] = "Informácia o teste na zobrazenie";
< $text['confirmed'] = "Potvrdené";
< $text['predicted'] = "Predpovedané";
< $admtext['ancestral_surnames'] = "Zdedené priezviská";
< $admtext['admin_notes'] = "Poznámky administrátora";
< $admtext['mda'] = "Najvzdialenej¹í predok";
< $admtext['mrca'] = "Najbli¾¹í spoloèný predok";
---
> $admtext['allbranches'] = "V¹etky vetvy";
> $admtext['active'] = "Aktivova»";
> $admtext['select'] = "Vybra»";
> $admtext['selectall'] = "Vybra» v¹etko";
> $admtext['clearall'] = "Vyèisti» v¹etko";
> $admtext['medialinks'] = "Odkazy na médium";
> 
> $text['testgroup'] = "Testovaná skupina";
> $text['test_info_display'] = "Informácia o teste na zobrazenie";
> $text['confirmed'] = "Potvrdené";
> $text['predicted'] = "Predpovedané";
> $admtext['ancestral_surnames'] = "Zdedené priezviská";
> $admtext['admin_notes'] = "Poznámky administrátora";
> $admtext['mda'] = "Najvzdialenej¹í predok";
> $admtext['mrca'] = "Najbli¾¹í spoloèný predok";
184,186c166,168
< $admtext['ref_seq'] = "Referenèná sekvencia";
< $admtext['rsrs'] = "RSRS (Rekon¹truovaná Sapiens referenèná sekvencia)";
< $admtext['rcrs'] = "rCRS (revidovaná Cambridgeská referenèná sekvencia)";
---
> $admtext['ref_seq'] = "Referenèná sekvencia";
> $admtext['rsrs'] = "RSRS (Rekon¹truovaná Sapiens referenèná sekvencia)";
> $admtext['rcrs'] = "rCRS (revidovaná Cambridgeská referenèná sekvencia)";
190,192c172,174
< $admtext['coding_reg'] = "Kódovanie regionálnych rozdielov";
< $text['keep_name_private'] = "Dr¾a» meno ako neverejné";
< $text['test_results'] = "Výsledky testu";
---
> $admtext['coding_reg'] = "Kódovanie regionálnych rozdielov";
> $text['keep_name_private'] = "Dr¾a» meno ako neverejné";
> $text['test_results'] = "Výsledky testu";
194,195c176,177
< $admtext['vendor'] = "Dodávateµ";
< $admtext['markers'] = "Poèet markerov";
---
> $admtext['vendor'] = "Dodávateµ";
> $admtext['markers'] = "Poèet markerov";
197,198c179,180
< $admtext['termsnp'] = "Koneèný SNP";
< $admtext['signsnp'] = "Významné SNP";
---
> $admtext['termsnp'] = "Koneèný SNP";
> $admtext['signsnp'] = "Významné SNP";
202a185,252
> $admtext['xtra_mut'] = "Extra mutácie";
> $text['test_number'] = "Èíslo/názov testu";
> $admtext['match_date'] = "Dátum zhody";
> $admtext['gedmatchID'] = "ID GED-zhody";
> $admtext['ydna_haplogroup'] = "Y-DNA haploskupina";
> $admtext['mtdna_haplogroup'] = "mtDNA haploskupina";
> $admtext['relationship_section'] = "Sekcia príbuzenských vz»ahov";
> $admtext['relationship_range'] = "Rozsah príbuzenských vz»ahov";
> $admtext['suggested_relationship'] = "Navrhované";
> $admtext['actual_relationship'] = "Aktuálne príbuzenské vz»ahy";
> $admtext['related_side'] = "Súvisiaca vetva";
> $admtext['shared_dna'] = "Zdieµaná DNA";
> $admtext['shared centimorgans'] = "Celkovo zdieµané cM";
> $admtext['shared_segments'] = "Zdieµané segmenty";
> $admtext['largest_segment'] = "Najväè¹í segment";
> $admtext['chromosome'] = "Chromozóm è.";
> $admtext['segment_start'] = "Zaèiatok segmentu";
> $admtext['segment_end'] = "Koniec segmentu";
> $admtext['centiMorgans'] = "centimorgany";
> $admtext['matchingSNPs'] = "Poèet zhodných SNP";
> $admtext['xmatch'] = "X-zhoda";
> $text['keep_test_private'] = "Neverejný test";
> $text['shared_dna'] = "Zdieµaný segment DNA";
> $text['for_match'] = "pre túto zhodu";
> $admtext['keeptest'] = "Ochrana testu";
> $admtext['keepname'] = "Ochrana mena";
> $admtext['allgroups'] = "V¹etky skupiny";
> $admtext['alltypes'] = "V¹etky typy";
> $admtext['generation_num'] = "Generácie pre zdedené priezviská";
> 
> $text['birthabbr'] = "nar.";
> $text['chrabbr'] = "krst.";
> $text['deathabbr'] = "zomr.";  //from descend
> $text['burialabbr'] = "poch.";  //from descend
> $text['marrabbr'] = "sob.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Nájs» v¹etky osoby s udalos»ami na tomto mieste";
> $text['firstpage'] = "Prvá stránka";
> $text['lastpage'] = "Posledná stránka";
> 
> //changed in 13.0.0
> $text['problem'] = "Vyskytla sa chyba v TNG softvéri. Èo robi»? <p>Ak ste práve in¹talovali aktualizáciu softvéru, asi ste preskoèili èas» in¹talaèných in¹trukcií. Vrá»te sa na stránku readme a znova si preèítajte in¹trukcie. Zvlá¹» dávajte pozor pri bode o databázovej ¹truktúre.</p><p>Ak ste teraz in¹talovali TNG prvýkrát, mali by ste e¹te vytvori» databázové tabuµky. Vrá»te sa na stránku readme.html a nájdite tento bod.</p><p>Ak ste vlastníkom sídla stránok, mô¾ete kontaktova» TNG podporu pre ïal¹iu pomoc s týmto problémom. Prosím, skopírujte ni¾¹ie uvedené informácie a prilepte ich do svojej správy.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "®iadna vetva";
> 
> //added in 14.0
> $text['oneyear'] = "rok";
> $text['pwdcodelink'] = "Po kliknutí na tento odkaz vám bude odoslané doèasné heslo.";
> $text['pwdcodesent'] = "Odkaz na obnovenie hesla bol odoslaný na va¹u emailovú adresu.";
> $text['moved'] = "Presunuté";
> $text['citation'] = "Citácia";
> $text['other'] = "Iné";
> $text['death'] = "Úmrtie";
> $text['burial'] = "Pohreb";
> $text['cremation'] = "Kremácia";
> $text['marriage'] = "Sobá¹";
> $text['divorce'] = "Rozvod";
> $text['bylength'] = "Kroky";
> $text['bymarriages'] = "Man¾elstvá";
> $text['none'] = "®iadne";
> 
> //moved here in 14.0
> $text['family'] = "Rodina";
> $text['source'] = "Zdroj";
> $text['repository'] = "Archív";
> $text['place'] = "Miesto";
> $admtext['BAPM'] = "Krst";
204,205c254
< //moved here in 12.0.0
< $admtext['xtra_mut'] = "Extra mutácie";
---
> $text['glang'] = "sk";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Slovak/text.php TNG1403/languages/Slovak/text.php
7c7
< 		$text['callnum'] = "Volacie èíslo";
---
> 		$text['callnum'] = "Archívne èíslo";
69d68
< 		$text['general'] = "V¹eobecné";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Prosím, vyberte dve osoby.";
---
> 		$text['select2inds'] = "Prosím, vyberte dvoch jednotlivcov.";
90c90
< 		$text['sameperson'] = "Tieto dve osoby sú toto¾né";
---
> 		$text['sameperson'] = "Títo dvaja jednotlivci sú tá istá osoba.";
93c93
< 		$text['sometimes'] = "(Pou¾itie iného poètu generácií mô¾e niekedy da» iný výsledok.)";
---
> 		$text['sometimes'] = "(Niekedy kontrola cez rôzny poèet generácií dáva odli¹ný výsledok.)";
144c144
< 		$text['dospouses2'] = "Zobrazi» partnerov";
---
> 		$text['dospouses2'] = "Zobrazi» man¾elov";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Hµada» spojenia";
> 		$text['findrel2'] = "Nájs» vz»ahy a iné spojenia";
> 		$text['makeme2nd'] = "Pou¾i» moje ID";
> 		$text['usebookmarks'] = "Pou¾i» zálo¾ky";
> 		$text['select2inds'] = "Prosím, vyberte dvoch jednotlivcov.";
> 		$text['indinfofor'] = "Info jednotlivca pre";
> 		$text['nobookmarks'] = "Nie je ¾iadna zálo¾ka na pou¾itie";
> 		$text['bkmtitle'] = "Osoby nájdené pri zálo¾kách";
> 		$text['bkminfo'] = "Vyberte osobu:";
> 		$text['sortpathsby'] = "Triedi» cesty podµa poètu";
> 		$text['sortbyshort'] = "Triedi» podµa";
> 		$text['bylengthshort'] = "Då¾ka";
> 		$text['badID1'] = ": zlé ID osoby 1 - prosím, vrá»te sa spä» a opravte to";
> 		$text['badID2'] = ": zlé ID osoby 2 - prosím, vrá»te sa spä» a opravte to";
> 		$text['notintree'] = ": osoba s týmto ID nie je v aktuálnej stromovej databáze.";
> 		$text['sameperson'] = "Títo dvaja jednotlivci sú tá istá osoba.";;
> 		$text['nopaths'] = "Tieto osoby nie sú spojené.";
> 		$text['nopaths1'] = "Nie sú ¾iadne ïal¹ie spojenia krat¹ie ako xxx";
> 		$text['nopaths2'] = "pri xxx krokoch hµadania";
> 		$text['longestpath'] = "(najdlh¹ia doteraz kontrolovaná cesta bola xxx krokov dlhá)";
> 		$text['relevantpaths'] = "Poèet nájdených odli¹ných relevantných ciest: xxx";
> 		$text['skipMarr'] = "(naviac, poèet nájdených ciest, ale nezobrazených kvôli veµkému poètu sobá¹ov bol: xxx)";
> 		$text['mjaor'] = "alebo";
> 		$text['connectionsto'] = "Spojenia k ";
> 		$text['findanotherpers'] = "Nájs» ïal¹iu osobu...";
> 		$text['sometimes'] = "(Niekedy kontrola cez rôzny poèet generácií dáva odli¹ný výsledok.)";
> 		$text['anotherpath'] = "Hµada» ïal¹ie spojenia";
> 		$text['xpath'] = "Cesta ";
> 		$text['primary'] = "Zaèiatoèná osoba"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Koneèná osoba";
> 		$text['parent'] = "Rodiè";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "his daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "otec";
> 		$text['hmother'] = "matka";
> 		$text['hhusband'] = "man¾el";
> 		$text['hwife'] = "man¾elka";
> 		$text['hson'] = "syn";
> 		$text['hdaughter'] = "dcéra";
> 		$text['maxruns'] = "Maximálny poèet ciest, ktoré sa majú skontrolova»";
> 		$text['maxrshort'] = "Maximálne cesty";
> 		$text['maxlength'] = "Cesty spojenia nie dlh¹ie ako";
> 		$text['maxlshort'] = "Maximálna då¾ka";
> 		$text['xstep'] = "krok";
> 		$text['xsteps'] = "kroky";
> 		$text['xmarriages'] = "xxx sobá¹e";
> 		$text['xmarriage'] = "1 sobá¹";
> 		$text['showspouses'] = "Zobrazi» oboch man¾elov";
> 		$text['showTxt'] = "Zobrazi» textový popis cesty";
> 		$text['showTxtshort'] = "Textový popis";
> 		$text['compactBox'] = "Zobrazenie kompaktných okienok osôb";
> 		$text['compactBoxshort'] = "Kompaktné okienka";
> 		$text['paths'] = "Cesty";
> 		$text['dospouses2'] = "Zobrazi» man¾elov";
> 		$text['maxmopt'] = "Max. man¾elstvá podµa spojenia";
> 		$text['maxm'] = "Max. man¾elstvá";
> 		$text['arerelated'] = "Tieto osoby sú príbuzné - ich vz»ah je ukázaný v Ceste 1";
> 		$text['simplerel'] = "JednoduchÈ hµadanie vzªahu";
196d264
< 		$text['scrollnote'] = "Poznámka: Na zobrazenie diagramu mô¾ete pou¾i» posuvník dole alebo doprava.";
199d266
< 		$text['popupnote2'] = " = Nový rodokmeò";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabuµky";
> 		$text['dtchildren'] = "Deti";
> 		$text['dtgrandchildren'] = "Vnúèatá";
> 		$text['dtggrandchildren'] = "Pravnúèatá";
> 		$text['dtgggrandchildren'] = "Prapravnúèatá"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "®iadni potomkovia";
> 		$text['dtgen'] = "Gen.";
> 		$text['dttotal'] = "Celkom";
> 		$text['dtselect'] = "Vybra»";
> 		$text['dteachfulltable'] = "Ka¾dá plná tabuµka bude ma»";
> 		$text['dtrows'] = "riadky";
> 		$text['dtdisplayingtable'] = "Zobrazenie tabuµky";
> 		$text['dtgototable'] = "Choï na tabuµku:";
> 		$text['fcinstrdn'] = "Zobrazi» rodinu s man¾elmi";
> 		$text['fcinstrup'] = "Zobrazi» rodinu s rodièmi";
> 		$text['fcinstrplus'] = "Vybra» iných man¾elov";
> 		$text['fcinstrfam'] = "Vybra» iných rodièov";
381,384c467,468
< 		$text['firstpage'] = "Prvá stránka";
< 		$text['lastpage'] = "Posledná stránka";
< 		$text['photoowner'] = "Majiteµ/Pôvodca";
< 		$text['nocemetery'] = "®iadny cintorín";
---
> 		$text['photoowner'] = "Vlastník originálu";
> 		$text['nocemetery'] = "Cintorín neuvedený";
399,400c483,484
< 		$text['iptc120'] = "Titulok";
< 		$text['iptc122'] = "Titulok vytvoril";
---
> 		$text['iptc120'] = "Popis";
> 		$text['iptc122'] = "Popis vytvoril";
411c495
< 		$text['viewitem'] = "Prezrite si túto polo¾ku";
---
> 		$text['viewitem'] = "Prezrie» túto polo¾ku";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Prepnú» znaèky";
445c531
< 		$text['byoccurrence'] = " zoradených podµa poèetnosti";
---
> 		$text['byoccurrence'] = "zoradených podµa poèetnosti";
453c539
< 		$text['numoccurrences'] = "celkový poèet miest v závorke";
---
> 		$text['numoccurrences'] = "celkový poèet miest v zátvorke";
509c595
< 		$text['browsealltrees'] = "Prehliadava» v¹etky stromy";
---
> 		$text['browsealltrees'] = "Prehliada» v¹etky stromy";
519c605
< 		$text['username'] = "Pou¾ívateµ. meno";
---
> 		$text['username'] = "Pou¾ívateµské meno";
535c621
< 		$text['success'] = "Ïakujeme, va¹a registrácia prebehla úspe¹ne. Budeme vás informova», kedy vá¹ úèet bude aktívny, alebo ak budú potrebné ïal¹ie informácie.";
---
> 		$text['success'] = "Ïakujeme, va¹a registrácia prebehla úspe¹ne. Administrátor systému vás bude informova» kedy vá¹ úèet bude aktívny alebo ak budú potrebné ïal¹ie informácie.";
539c625
< 		$text['loginsent'] = "Prihlasovacie údaje boli odosláné";
---
> 		$text['loginsent'] = "Prihlasovacie údaje boli odoslané";
544c630
< 		$text['accmail'] = "POZNÁMKA: Aby ste mohli prija» email z tejto administrátorskej stránky ohµadom vá¹ho úètu, skontrolujte, prosím, èi neblokujete emaily z tejto domény.";
---
> 		$text['accmail'] = "POZNÁMKA: Aby ste mohli prija» email od administrátora ohµadom vá¹ho úètu, skontrolujte, prosím, èi vá¹ emailový program neblokuje emaily z tejto domény.";
547c633
< 		$text['nousers'] = "Tento formulár nemo¾no pou¾i», kým nebude vytvorený aspoò jeden záznam pou¾ívateµa. Ak ste majiteµom týchto stránok, choïte do ponuky Admin/Pou¾ívatelia a vytvorte si úèet administrátora.";
---
> 		$text['nousers'] = "Tento formulár nemo¾no pou¾i», kým nebude vytvorený aspoò jeden záznam pou¾ívateµa. Ak ste majiteµom týchto stránok, choïte do ponuky Administrácia >> Pou¾ívatelia a vytvorte si úèet administrátora.";
549d634
< 		//changed in 8.0.0
552c637
< 		$text['accinactive'] = "Nastavenie úètu mô¾ete urobi» v Admin/Pou¾ívatelia/Preskúma». Úèet zostane neaktívny, kým aspoò raz záznam neupravíte a neulo¾íte.";
---
> 		$text['accinactive'] = "Nastavenie úètu mô¾ete urobi» v Administrácia >> Pou¾ívatelia >> Hµada». Úèet zostane neaktívny, kým aspoò raz záznam neupravíte a neulo¾íte.";
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "E¹te raz nové heslo";
> 		$text['resetsuccess'] = "Úspech: Heslo bolo obnovené";
> 		$text['resetfail'] = "Neúspech: Heslo nebolo obnovené";
> 		$text['failreason0'] = " (neznáma chyba databázy)";
> 		$text['failreason2'] = " (nemáte oprávnenie na zmenu vá¹ho hesla)";
> 		$text['failreason3'] = " (heslá sa nezhodujú)";
565c656
< 		$text['browseallbranches'] = "Prehliadava» v¹etky vetvy";
---
> 		$text['browseallbranches'] = "Prehliada» v¹etky vetvy";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Celkový poèet citácií zdroja";
618d710
< 		$text['loginfirst'] = "Najskôr sa musíte prihlási».";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Najskôr sa musíte prihlási».";
629,630d722
< 		$text['zoomin'] = "Priblí¾i»";
< 		$text['zoomout'] = "Oddiali»";
649c741
< 		$text['mode_values'] = "Hodnoty módu";
---
> 		$text['mode_values'] = "Hodnoty modu";
655,656c747
< 		$text['fastmutating'] = "Rýchle mutovanie";
< 		$text['dna_info_head'] = "Informácia k DNA testu";
---
> 		$text['fastmutating'] = "Rýchle mutácie";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Porovna» vybrané testy mtDNA";
> 		$text['dnatestscompare_atdna'] = "Porovna» vybrané testy atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNP";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Zvlá¹tne mutácie";
> 		$text['mrca'] = "Najbli¾¹í spoloèný predok";
> 		$text['ydna_test'] = "Testy Y-DNA";
> 		$text['mtdna_test'] = "Testy mtDNA (mitochondriálne)";
> 		$text['atdna_test'] = "Testy atDNA (autozomálne)";
> 		$text['segment_start'] = "Zaèiatok";
> 		$text['segment_end'] = "Koniec";
> 		$text['suggested_relationship'] = "Navrhnuté";
> 		$text['actual_relationship'] = "Aktuálne";
> 		$text['12markers'] = "Markery 1-12";
> 		$text['25markers'] = "Markery 13-25";
> 		$text['37markers'] = "Markery 26-37";
> 		$text['67markers'] = "Markery 38-67";
> 		$text['111markers'] = "Markery 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Na porovnanie je potrebné vybra» aspoò dva testy.";
664c780
< $text['matches'] = "Zhody";
---
> $text['matches'] = "Záznamy";
670,671d785
< $text['birthabbr'] = "n.";
< $text['chrabbr'] = "k.";
675d788
< $text['family'] = "Rodina"; //from getperson
685d797
< $text['deathabbr'] = "z.";  //from descend
706d817
< $text['burialabbr'] = "pohr.";  //from descend
712d822
< $text['place'] = "Miesto";
715d824
< $text['marrabbr'] = "s.";
730,731c839,840
< $text['relationship2'] = "Príbuz. vz»ah"; //different in some languages, at least in German (Beziehung)
< $text['timeline'] = "Èasová os";
---
> $text['relationship2'] = "Vz»ah"; //different in some languages, at least in German (Beziehung)
> $text['timeline'] = "Èasová línia";
738d846
< $text['source'] = "Zdroj";
766d873
< $text['repository'] = "Archív";
770d876
< $text['findplaces'] = "Nájs» v¹etky osoby s udalos»ami na tomto mieste";
804d909
< $text['glang'] = "&amp;hl=cs";
816d920
< $text['none'] = "®iadny";
831c935
< $text['mostwanted'] = "Najhµadanej¹ie";
---
> $text['mostwanted'] = "Hµadá sa";
840c944
< $text['searchtngnet'] = "Prehµada» TNG sie» (GENDEX)";
---
> $text['searchtngnet'] = "Prehliada» TNG sie» (GENDEX)";
859c963
< $text['mnufeatures'] = "Ïal¹ie vlastnosti";
---
> $text['mnufeatures'] = "Ïal¹ie mo¾nosti";
888c992
< $text['location'] = "Umiestnenie";
---
> $text['location'] = "Miesto";
902c1006
< $text['features'] = "Vlastnosti";
---
> $text['features'] = "Zaujímavosti";
924d1027
< $text['otherevents'] = "Iné udalosti";
931,932c1034,1035
< $text['searchsite'] = "Prehµadáva» toto sídlo";
< $text['searchsitemenu'] = "Sídlo hµadania";
---
> $text['searchsite'] = "Hµada» v tomto webovom sídle";
> $text['searchsitemenu'] = "Hµadanie";
947c1050
< $text['takenby'] = "Zobral: ";
---
> $text['takenby'] = "Testovaná osoba";
952,954d1054
< $text['test_info'] = "Informácia o teste";
< $text['people_have'] = "osoby prepojili DNA test na";
< $text['person_has'] = "osoba prepojila DNA test na";
964,966c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA testy sú zdru¾ené s";
> $text['testislinked'] = "DNA test je zdru¾ený s";
> 
> //added in 12.2
> $text['quicklinks'] = "Rýchle odkazy";
> $text['yourname'] = "Va¹e meno";
> $text['youremail'] = "Va¹a emailová adresa";
> $text['liketoadd'] = "Akékoµvek informácie, ktoré chcete prida»";
> $text['webmastermsg'] = "Správa správcu webu";
> $text['gallery'] = "Zobrazi» galériu";
> $text['wasborn_male'] = "sa narodil";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "sa narodila"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "bol pokrstený";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "bola pokrstená";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "zomrel";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "zomrela";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "bol pochovaný"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "bola pochovaná"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "bol spopolnený";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "bola spopolnená";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "bol sobá¹ený s";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "bola sobá¹ená s";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "bol rozvedený";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "bola rozvedená";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " v ";			// used as a preposition to the location
> $text['onthisdate'] = " dòa ";		// when used with full date
> $text['inthisyear'] = " v ";		// when used with year only or month / year dates
> $text['and'] = "a ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informácia o teste DNA";
> //added in 13.0
> $text['visitor'] = "Náv¹tevník";
> 
> $text['popupnote2'] = " = Nový rodokmeò";
> 
> //moved here in 14.0
> $text['zoomin'] = "Priblí¾i»";
> $text['zoomout'] = "Oddiali»";
> $text['scrollnote'] = "Poznámka: Na zobrazenie diagramu mô¾ete pou¾i» posuvník dole alebo doprava.";
> $text['general'] = "V¹eobecne";
> 
> //changed in 14.0
> $text['otherevents'] = "Iné udalosti";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Spojenia";
> $text['continue'] = "Pokraèova»";
> $text['title2'] = "Názov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Slovak-UTF8/admintext.php TNG1403/languages/Slovak-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Zadajte, prosím, ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Vyberte súbor na import dát.";
> 		$admtext['addreplacedata'] = "Pridávanie alebo nahradzovanie genealogických dát môže trvať niekoľko minút v závislosti od veľkosti súboru";
> 		$admtext['fromyourcomputer'] = "z vášho po�íta�a";
> 		$admtext['importdata'] = "Importovať údaje";
> 		$admtext['replace'] = "Nahradiť (vo vybranom strome)";
> 		$admtext['desttree'] = "Cieľový strom";
> 		$admtext['selectdesttree'] = "Vyberte alebo zadajte cieľový strom.";
> 		$admtext['selectexisting'] = "Importovať do";
> 		$admtext['ucaselast'] = "Previesť všetky priezviská na veľké písmená";
> 		$admtext['norecalc'] = "Neprepo�ítavať znova ozna�enie Žijúca";
> 		$admtext['autooffset'] = "Za�ať �íslovať ID �ísla od prvého voľného �ísla";
> 		$admtext['mustselecttree'] = "Musíte zvoliť strom predtým ako vyberiete túto možnosť.";
> 		$admtext['onwebserver'] = "zo servera (z prie�inka GEDCOM)";
> 		$admtext['imphints'] = "Vysvetlenie: Všetky aktuálne údaje znamená všetky osoby, rodiny, zdroje a poznámky (spojenie s médiámi sa nepreruší, ak zostanú ID �ísla rovnaké). Porovnávanie odpovedajúcich záznamov je vždy založené len na ID �íslach. Nové záznamy sú vždy pridané. Pridaním sa importujú všetky záznamy s novými ID �íslami.";
> 		$admtext['destbranch'] = "Cieľová vetva (nepovinná)";
> 		$admtext['importlatlong'] = "Importovať údaje o zemepisnej dĺžke / šírke, ak existujú";
> 		$admtext['opening'] = "Otváram";
> 		$admtext['reopen'] = "Znova otváram";
> 		$admtext['uploading'] = "Nahrávam";
> 		$admtext['stop'] = "Zastaviť";
> 		$admtext['stopped'] = "Import zastavený";
> 		$admtext['resume'] = "Pokra�ovať";
> 		$admtext['neweronly'] = "Nahradiť len v prípade, ak sú údaje novšie";
> 		$admtext['oldimport'] = "Starý štýl importu (bez zobrazenia priebehu)";
> 		$admtext['importgedcom'] = "Import súboru GEDCOM (môže byť skomprimovaný)";
> 		$admtext['stopbackup'] = "Stop! Je dobrý nápad zálohovať si svoje aktuálne údaje pred pokra�ovaním.";
> 		$admtext['importmedia'] = "Importovať média, ak existujú";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Preverte, �i sú správne prefixy a sufixy (vi� Základné nastavenie) pre tento súbor.";
> 		$admtext['chkimpsettings'] = "Pre viac volieb skontrolujte Nastavenia importu.";
> 		$admtext['eventsonly'] = "Import len používateľských typov udalostí a atribútov (žiadne údaje sa nepridávajú, nenahradzujú ani nepripájajú)";
> 		$admtext['allevents'] = "Akceptovať údaje pre všetky nové typy udalostí a atribúty";
> 		$admtext['finishingimporting'] = "Dokon�ovanie...";
> 		$admtext['fileuploadfailed'] = "Nahrávanie súboru zlyhalo. Asi súbor je príliš veľký. Skúste použiť FTP na nahratie súboru do vášho prie�inka GEDCOM, vyberte a importujte súbor odtiaľ.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Zmeniť existujúci typ udalosti";
135,139c169
< 		$admtext['entertypedesc'] = "Zadajte typ/popis pre tento nový typ udalosti.";
< 		$admtext['enterdisplay'] = "Zadajte názov pre tento nový typ udalosti.";
< 		$admtext['existingeventtypeinfo'] = "Informácie o existujúcich typoch udalostí";
< 		$admtext['neweventtypeinfo'] = "Informácie o nových typoch udalostí";
< 		$admtext['tag'] = "Zna�ka";
---
> 		$admtext['tag'] = "Tag";
144,146c174
< 		$admtext['typerequired'] = "Pri použití vlastných zna�iek, kde zna�ka = \"EVEN\", sa povinne vyžaduje \"Typ/Popis\". Pre všetky ostatné zna�ky je tento údaj nepovinný.";
< 		$admtext['addnewevtype'] = "Pridať nový typ udalosti";
< 		$admtext['createnewevtype'] = "Vytvoriť záznam nového typu udalosti";
---
> 		$admtext['typerequired'] = "Pri použití vlastných GEDCOM tagov (kde tag = \"EVEN\") to je hodnota TYPE a vyžaduje sa. Pre všetky ostatné tagy je táto hodnota nepovinná.";
149,150d176
< 		$admtext['existingevtypes'] = "Existujúce typy udalostí";
< 		$admtext['edsevtypes'] = "Upraviť, vymazať alebo zoradiť existujúce typy udalostí";
152,154c178
< 		$admtext['confdeleteevtype'] = "Naozaj chcete vymazať tento typ udalosti?";
< 		$admtext['selecttag'] = "Vybrať zna�ku (tag)";
< 		$admtext['selectentertag'] = "Prosím, vyberte alebo zadajte zna�ku (tag) pro tento typ udalosti.";
---
> 		$admtext['selecttag'] = "Vybrať tag";
208d231
< 		$admtext['changestoallevtypes'] = "Zmeny ku všetkým typom udalostí";
214d236
< 		$admtext['BAPM'] = "Krst";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Ste si istý, že chcete vymazať tento typ udalosti? Všetky udalosti tohto typu tiež budú vymazané.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Pridať nový typ";
> 		$admtext['createnewevtype'] = "Vytvoriť nový atribút alebo záznam typu udalostí";
> 		$admtext['modifyeventtype'] = "Editovať existujúci typ";
> 		$admtext['entertypedesc'] = "Prosím, vložte typ/popis pre tento nový atribút alebo typ udalostí.";
> 		$admtext['enterdisplay'] = "Prosím, vložte zobrazovací reťazec pre tento nový atribút alebo typ udalostí.";
> 		$admtext['existingeventtypeinfo'] = "Informácia o existujúcom atribúte alebo type udalostí";
> 		$admtext['neweventtypeinfo'] = "Informácia o novom atribúte alebo type udalostí";
> 		$admtext['existingevtypes'] = "Existujúci atribút alebo typ udalostí";
> 		$admtext['edsevtypes'] = "Upraviť, odstrániť alebo zotriediť predtým vložené atribúty a typy udalostí";
> 		$admtext['selectentertag'] = "Prosím, vyberte alebo vložte zna�ku (tag) pre tento atribút alebo typ udalostí.";
> 		$admtext['changestoallevtypes'] = "Zmeny ku všetkým atribútom alebo typom udalostí";
268d303
< 		$admtext['nobirthinfo'] = "Chýbajú informácie o narodení";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Vybrať základný obrázok"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Uložiť + Noví rodi�ia";
> 		$admtext['savenewspouse'] = "Uložiť + Nový partner";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt. narodenia";
354d391
< 		$admtext['enterphotodesc'] = "Zadajte, prosím, popis obrázka.";
388d424
< 		$admtext['photoowner'] = "Majiteľ/zdroj";
417d452
< 		$admtext['imgmap'] = "Klikacia mapa obrázka";
490d524
< 		$admtext['mapinstr3'] = "Ak chcete prepojiť ur�itú oblasť tejto fotografie s nejakou osobou, vyberte najprv strom, do ktorého táto osoba patrí, a potom vytvorte obdĺžnik požadovanej oblasti. To urobíte kliknutím do ľavého horného rohu oblasti a potom ťahaním do pravého dolného rohu. Prípadne môžete kliknúť do ľavého horného rohu a potom znova do pravého dolného rohu. Potom sa objaví okno, pomocou ktorého môžete vybrať danú osobu. Po vykonaní výberu bude kód klikacej mapy pridaný do nižšie uvedeného poľa. Tento postup opakujte podľa potreby pre �alšie oblasti obrázka.";
495d528
< 		$admtext['removelink'] = "Odstrániť odkaz";
502d534
< 		$admtext['eloptions'] = "Prejsť alebo vymazať";
509d540
< 		$admtext['nolinks'] = "Ešte neexistujú žiadne odkazy";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML obrazová mapa (pre spätnú kompatibilitu)";
> 		$admtext['photoowner'] = "Vlastník originálu";
> 		$admtext['nothumb'] = "Žiadna miniatúra";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Položka sa nemôže pridať, najpravdepodobnejšie preto, lebo súbor je príliš veľký, a tak nemôže sa nahrať alebo použiť pri vytváraní miniatúry.";
> 		$admtext['moved'] = "Presunuté";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Prosím, vložte názov alebo popis pre toto médium.";
> 		$admtext['mapinstr3'] = "Na pripojenie oblasti danej fotografie k osobe, rodine alebo inému objektu najprv vyberte odpovedajúci strom a typ objektu, potom vytvorte obdĺžník pre požadovanú oblasť. Robí sa to kliknutím do ľavého horného rohu oblasti a potom ťahaním do pravého dolného rohu. Iný spôsob: môžete kliknúť do ľavého horného rohu a potom do pravého dolného rohu oblasti. Potom vysúvacie okienko pomôže vám vybrať osobu alebo iný objekt. Vyberte si, potom zopakujte tento proces podľa potreby pre �alšie oblasti. Kliknutím na existujúcu oblasť ju vyberiete a potom ťahaním ju presuniete, alebo kliknite na \"X\" na jej odstránenie.";
570c608
< 		$admtext['lastmodified'] = "Dátum poslednej aktualizácie";
---
> 		$admtext['lastmodified'] = "Posledná aktualizácia";
596d633
< 		$admtext['foremptystring'] = "Ak chcete zadať prázdny reťazec, nechajte toto pole prázdne a kliknite na \"Pridať >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Inštrukcie: Ťahaním položiek alebo dvojklikom na položky vľavo presúvajte ich do zoznamov vpravo. Na preúsporiadanie ťahajte ich hore a dole. Opätovným dvojklikom ich odstránite.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Pre prázdny reťazec nechajte to pole prázdne a kliknite na >>";
651,655d690
< 		$admtext['selectimportfile'] = "Vyberte súbor na import dát.";
< 		$admtext['importgedcom'] = "Zvoľte zdrojový súbor na import (štandardný formát GEDCOM 5.5)";
< 		$admtext['addreplacedata'] = "Pridávanie alebo nahradzovanie genealogických dát môže trvať niekoľko minút v závislosti od veľkosti súboru";
< 		$admtext['fromyourcomputer'] = "z vášho po�íta�a";
< 		$admtext['importdata'] = "Importovať údaje";
657,660d691
< 		$admtext['replace'] = "Nahradiť (vo vybranom strome)";
< 		$admtext['desttree'] = "Cieľový strom";
< 		$admtext['selectdesttree'] = "Vyberte alebo zadajte cieľový strom.";
< 		$admtext['selectexisting'] = "Importovať do";
668,673d698
< 		$admtext['ucaselast'] = "Previesť všetky priezviská na veľké písmená";
< 		$admtext['norecalc'] = "Neprepo�ítavať znova zna�ku Žijúca";
< 		$admtext['autooffset'] = "Za�ať �íslovať ID �ísla od prvého voľného �ísla";
< 
< 		$admtext['mustselecttree'] = "Musíte zvoliť strom predtým ako vyberiete túto možnosť.";
< 		$admtext['importmedia'] = "Importovať média, ak existujú";
675d699
< 		$admtext['neweronly'] = "Nahradiť len v prípade, ak sú údaje novšie";
677,692d700
< 		$admtext['onwebserver'] = "zo servera (z prie�inka GEDCOM)";
< 		$admtext['eventsonly'] = "Importovať len vlastné typy udalostí (nebudú sa vkladať, nahrádzať alebo pripájať žiadne údaje)";
< 		$admtext['imphints'] = "Vysvetlenie: Všetky aktuálne údaje znamená všetky osoby, rodiny, zdroje a poznámky (spojenie s médiámi sa nepreruší, ak zostanú ID �ísla rovnaké). Porovnávanie odpovedajúcich záznamov je vždy založené len na ID �íslach. Nové záznamy sú vždy pridané. Pridaním sa importujú všetky záznamy s novými ID �íslami.";
< 		$admtext['allevents'] = "Prijať dáta pre všetky vlastné typy udalostí";
< 		$admtext['destbranch'] = "Cieľová vetva (nepovinná)";
< 		$admtext['inframe'] = "(v ráme)";
< 		$admtext['getstart'] = "Ako za�ať";
< 		$admtext['importlatlong'] = "Importovať údaje o zemepisnej dĺžke / šírke, ak existujú";
< 		$admtext['opening'] = "Otváram";
< 		$admtext['reopen'] = "Znova otváram";
< 		$admtext['uploading'] = "Nahrávam";
< 		$admtext['stop'] = "Zastaviť";
< 		$admtext['stopped'] = "Import zastavený";
< 		$admtext['resume'] = "Pokra�ovať";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Záznam prístupov";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Starý štýl importu (bez zobrazenia priebehu)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Aktualizácia";
> 		$admtext['need_upgrade'] = "Ukon�iť tieto aktualiza�né inštrukcie";
> 		$admtext['upgrade_missing'] = "Zdá sa, že chýba aktualiza�ný súbor. Možno, že ste to už urobili.";
> 		$admtext['delete_upgrade'] = "Ke� skon�íte, kliknite sem na odstránenie aktualizácie a návrat k menu.";
723d733
< 		$admtext['author'] = "Autor";
783c793
< 		$admtext['mainpara'] = "Úvodný odstavec";  //1, 4, 6, 7, 8
---
> 		$admtext['mainpara'] = "Úvodný odsek";  //1, 4, 6, 7, 8
792,793c802,803
< 		$admtext['searchpara'] = "Odstavec hľadania"; //6
< 		$admtext['fhpara'] = "Odstavec rodinnej histórie"; //6
---
> 		$admtext['searchpara'] = "Odsek hľadania"; //6
> 		$admtext['fhpara'] = "Odsek rodinnej histórie"; //6
796,797c806,807
< 		$admtext['mwpara'] = "Odstavec hľadaných"; //6
< 		$admtext['respara'] = "Odstavec zdrojov"; //6
---
> 		$admtext['mwpara'] = "Odsek hľadaných"; //6
> 		$admtext['respara'] = "Odsek zdrojov"; //6
804,809c814,819
< 		$admtext['momside'] = "Popis matkinej strany"; //8
< 		$admtext['dadside'] = "Popis otcovej strany"; //8
< 		$admtext['momperson'] = "ID �íslo osoby z matkinej strany"; //8
< 		$admtext['momtree'] = "ID �íslo stromu z matkinej strany"; //8
< 		$admtext['dadperson'] = "ID �íslo osoby z otcovej strany"; //8
< 		$admtext['dadtree'] = "ID �íslo stromu z otcovej strany"; //8
---
> 		$admtext['momside'] = "Popis matkinej strany"; //8, 20
> 		$admtext['dadside'] = "Popis otcovej strany"; //8, 20
> 		$admtext['momperson'] = "ID �íslo osoby z matkinej strany"; //8, 20
> 		$admtext['momtree'] = "ID �íslo stromu z matkinej strany"; //8, 20
> 		$admtext['dadperson'] = "ID �íslo osoby z otcovej strany"; //8, 20
> 		$admtext['dadtree'] = "ID �íslo stromu z otcovej strany"; //8, 20
813c823
< 		$admtext['featurepara1'] = "Zaujímavosť 1, odstavec"; //4
---
> 		$admtext['featurepara1'] = "Zaujímavosť 1, odsek"; //4
817c827
< 		$admtext['featurepara2'] = "Zaujímavosť 2, odstavec"; //4
---
> 		$admtext['featurepara2'] = "Zaujímavosť 2, odsek"; //4
821c831
< 		$admtext['featurepara3'] = "Zaujímavosť 3, odstavec"; //4
---
> 		$admtext['featurepara3'] = "Zaujímavosť 3, odsek"; //4
825c835
< 		$admtext['featurepara4'] = "Zaujímavosť 4, odstavec"; //4
---
> 		$admtext['featurepara4'] = "Zaujímavosť 4, odsek"; //4
837c847
< 		$admtext['featurepara'] = "Odstavec zaujímavostí"; //9, 10
---
> 		$admtext['featurepara'] = "Odsek zaujímavostí"; //9, 10
843c853
< 		$admtext['featurespara'] = "Odstavec zaujímavostí";
---
> 		$admtext['featurespara'] = "Odsek zaujímavostí";
863c873
< 		$admtext['featurepara5'] = "Zaujímavosť 5, odstavec"; //15
---
> 		$admtext['featurepara5'] = "Zaujímavosť 5, odsek"; //15
867c877
< 		$admtext['featurepara6'] = "Zaujímavosť 6, odstavec"; //15
---
> 		$admtext['featurepara6'] = "Zaujímavosť 6, odsek"; //15
870c880
< 		$admtext['featurepara7'] = "Zaujímavosť 7, odstavec"; //15
---
> 		$admtext['featurepara7'] = "Zaujímavosť 7, odsek"; //15
873,876c883,886
< 		$admtext['featurepara8'] = "Zaujímavosť 8, odstavec"; //15
< 		$admtext['sidebarhead1'] = "Záhlavie bo�ného panela 1"; //15
< 		$admtext['sidebarhead2'] = " Záhlavie bo�ného panela 2"; //15
< 		$admtext['sidebarhead3'] = " Záhlavie bo�ného panela 3"; //15
---
> 		$admtext['featurepara8'] = "Zaujímavosť 8, odsek"; //15
> 		$admtext['sidebarhead1'] = " Záhlavie postranného panela 1"; //15
> 		$admtext['sidebarhead2'] = " Záhlavie postranného panela 2"; //15
> 		$admtext['sidebarhead3'] = " Záhlavie postranného panela 3"; //15
879c889
< 		$admtext['textpara1'] = "Text 1, odstavec"; //15
---
> 		$admtext['textpara1'] = "Text 1, odsek"; //15
882c892
< 		$admtext['textpara2'] = "Text 2, odstavec"; //15
---
> 		$admtext['textpara2'] = "Text 2, odsek"; //15
884,887c894,980
< 		$admtext['textpara3'] = "Text 3, odstavec"; //15
< 		$admtext['subhead1'] = "Podzáhlavie 1"; //15
< 		$admtext['subhead2'] = "Podzáhlavie 2"; //15
< 
---
> 		$admtext['textpara3'] = "Text 3, odsek"; //15
> 		$admtext['subhead1'] = "Podnadpis 1"; //15
> 		$admtext['subhead2'] = "Podnadpis 2"; //15
> 		//added in 12.2
> 		$admtext['quotehead'] = "Záhlavie citátov";
> 		$admtext['quotesubhead'] = "Podnadpis citátov";
> 		$admtext['sniptitle'] = "Nadpis krátkeho filmu";
> 		$admtext['snipname'] = "Názov krátkeho filmu";
> 		$admtext['snipinfoone'] = "Prvý riadok krátkeho filmu";
> 		$admtext['snipinfotwo'] = "Druhý riadok krátkeho filmu";
> 		$admtext['snipimage'] = "Obrázok krátkeho filmu";
> 		$admtext['snipperson'] = "ID osoby krátkeho filmu";
> 		$admtext['sniptree'] = "ID stromu krátkeho filmu";
> 		$admtext['quote'] = "Citát";
> 		$admtext['link'] = "Odkaz";
> 		$admtext['featuretitle7'] = "Zaujímavosť 7, nadpis";
> 		$admtext['featuretitle8'] = "Zaujímavosť 8, nadpis";
> 		$admtext['featuretitle9'] = "Zaujímavosť 9, nadpis";
> 		$admtext['featurethumb9'] = "Zaujímavosť 9, miniatúra"; //15
> 		$admtext['featurelink9'] = "Zaujímavosť 9, odkaz"; //15
> 		$admtext['featurepara9'] = "Zaujímavosť 9, odsek"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Ľavý obrázok záhlavia";
> 		$admtext['rightimg'] = "Pravý obrázok záhlavia";
> 		$admtext['photoption'] = "Možnosti fotografie sú<br />&nbsp;&nbsp; (statická alebo náhodná)";
> 		$admtext['randomphotowidth'] = "Šírka náhodnej fotografie";
> 		$admtext['randomphotoheight'] = "Výška náhodnej fotografie";
> 		$admtext['randomphotomediatypeID'] = "Kolekcia náhodných fotografií";
> 		$admtext['momheading'] = "Nadpis materskej rodiny";
> 		$admtext['mompara'] = "Odsek materskej rodiny";
> 		$admtext['mompagelink'] = "Odkaz materskej rodinny";
> 		$admtext['dadheading'] = "Nadpis otcovskej rodiny";
> 		$admtext['dadpara'] = "Odsek otcovskej rodiny";
> 		$admtext['dadpagelink'] = "Odkaz otcovskej rodiny";
> 		$admtext['spmomheading'] = "Nadpis materskej rodiny partnera";
> 		$admtext['spmompara'] = "Odsek materskej rodiny partnera";
> 		$admtext['spmompagelink'] = "Odkaz materskej rodiny partnera";
> 		$admtext['spmomside'] = "Návestie materskej strany partnera";
> 		$admtext['spdadside'] = "Návestie otcovskej strany partnera";
> 		$admtext['spmomperson'] = "ID osoby materskej strany partnera";
> 		$admtext['spmomtree'] = "ID stromu materskej strany partnera";
> 		$admtext['spdadheading'] = "Nadpis otcovskej rodiny partnera";
> 		$admtext['spdadpara'] = "Odsek otcovskej rodiny partnera";
> 		$admtext['spdadpagelink'] = "Odkaz otcovskej rodiny partnera";
> 		$admtext['spdadperson'] = "ID osoby otcovskej strany partnera";
> 		$admtext['spdadtree'] = "ID stromu otcovskej strany partnera";
> 		$admtext['storiesheading'] = "Príbehy našej rodiny";
> 		$admtext['nbrsurnames'] = "Po�et priezvísk<br />&nbsp;&nbsp; v mraku( v cloud-e) priezvísk";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Miniatúra zaujímavosti";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Nadpis snímky";
> 		$admtext['slideimg'] = "Obrázok snímky";
> 		$admtext['slideheadline'] = "Titulok snímky";
> 		$admtext['slidetext'] = "Text snímky";
> 		$admtext['slidelink'] = "Odkaz snímky";
> 		$admtext['slidelinktext'] = "Názov odkazu snímky";
> 		$admtext['featurelink'] = "Odkaz zaujímavosti";
> 		$admtext['featurelinktext'] = "Názov odkazu zaujímavosti";
> 		$admtext['featuretitle'] = "Nadpis zaujímavosti";
> 		$admtext['featuresub'] = "Podnadpis zaujímavosti";
> 		$admtext['quoteimg'] = "Obrázok citácie";
> 		$admtext['quotelink'] = "Odkaz citácie";
> 		$admtext['quotelinktext'] = "Názov odkazu citácie";
> 		$admtext['sidebarpara'] = "Odsek postranného panela";
> 		$admtext['sidebarlink'] = "Odkaz postranného panela";
> 		$admtext['sidebarlinktext'] = "Názov odkazu postranného panela";
> 		$admtext['sidebarimg'] = "Obrázok postranného panela";
> 		$admtext['sidebartitle'] = "Nadpis postranného panela";
> 		$admtext['sidebarsub'] = "Podnadpis postranného pásu";
> 		$admtext['snipheadline'] = "Titulok krátkeho filmu";
> 		$admtext['snipsubhead'] = "Podtitulok krátkeho filmu";
> 		$admtext['snipimg'] = "Obrázok krátkeho filmu";
> 		$admtext['sniplink'] = "Odkaz krátkeho filmu";
> 		$admtext['sniplinktext'] = "Názov odkazu krátkeho filmu";
> 		$admtext['linktext'] = "Text odkazu";
> 		$admtext['footerheadline'] = "Titulok päty";
> 		$admtext['footerpara'] = "Text päty";
> 		$admtext['footerlink'] = "Odkaz päty";
> 		$admtext['footerlinktext'] = "Názov odkazu päty";
> 		$admtext['footerheadline'] = "Titulok päty";
> 		$admtext['footerpara'] = "Text päty";
> 		$admtext['footerlink'] = "Odkaz päty";
> 		$admtext['footerlinktext'] = "Názov odkazu päty";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG vyžaduje verziu 5.3 alebo vyššiu.)";
---
> 		$admtext['phpreq'] = "(TNG vyžaduje verziu 5.6 alebo vyššiu.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1263c1354
<         $admtext['mailuser'] = "Používateľ. meno pre email";
---
>         $admtext['mailuser'] = "Používateľské meno pre email";
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Zmeniť príchodzie prefixy tak, aby odpovedali nastaveniam TNG";
> 		$admtext['sortevents'] = "Zoradiť udalosti podľa";
> 		$admtext['sortbydate'] = "Dátum udalostí";
> 		$admtext['sortbytype'] = "Typ udalostí";
> 		$admtext['allowsuggest'] = "Povoliť pripomienky od návštevníkov";
> 		$admtext['livingchecked'] = "Nastavenie ozna�enia Žijúci pre nových ľudí a rodiny";
> 		$admtext['maxmarried'] = "Ozna�iť rodinu ako žijúcu, ak sa sobášili menej ako<br/>toľko rokov";
> 		$admtext['imagetags'] = "Obdĺžniky";
> 		$admtext['allowcsv'] = "Povoliť sťahovanie súborov vo formáte CSV pre zostavy";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Možnosti zálohovania";
> 		$admtext['dosql'] = "Exportovať ako SQL";
> 		$admtext['dodrop'] = "Vložiť DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Vložiť CREATE TABLE";
> 		$admtext['onrestore'] = "Možnosti obnovy";
> 		$admtext['dodel'] = "Najprv odstráňte predchádzajúci obsah";
> 		$admtext['download'] = "Stiahnutie";
> 		$admtext['altbirthtypes'] = "Udalosti alternatívneho narodenia";
> 		$admtext['dtformat'] = "Formát tabuliek";
> 		$admtext['conchart'] = "Schéma spojení";
> 		$admtext['maxropt'] = "Maximálny po�et vyhľadávacích behov spojení";
> 		$admtext['maxlopt'] = "Maximálna dĺžka ciest spojenia";
> 		$admtext['showtxtopt'] = "Zobraziť textové vyjadrenie cesty";
> 		$admtext['compactboxopt'] = "Zobraziť rám�eky osôb v kompaktnej forme";
> 		$admtext['sortbyopt'] = "Triediť cesty podľa";
> 		$admtext['anchoridopt'] = "ID ukotvenia";
> 		$admtext['maxmopt'] = "Maximálny po�et manželstiev v spojení";
> 		$admtext['saveincfg'] = "Uložiť do konfigura�nej cesty (vi� Základné nastavenie)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Geokódovanie sa nedá vykonať";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Nerobiť geokódovanie";
1436d1549
< 		$admtext['backtosecondary'] = "Späť na druhotné procesy";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Späť k obslužným programom Post-import";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Vylú�iť poznámky";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zozipovať a zahrnúť mediálne súbory";
> 		$admtext['downloadzip'] = "Stiahnuť ZIP súbory";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Zobraziť len používateľov so zakázaným prístupom";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Povoliť zobrazenie neverejných poznámok";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Ak je vybratý jediný strom, poslať info aj administrátorom";
1616,1617c1738
< 		$admtext['logagain'] = "Kliknutím se znovu prihlásite.";
< 		//added in 8.1.0
---
> 		$admtext['logagain'] = "Kliknutím sa znovu prihláste.";
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1670c1789
< 		$admtext['not_living'] = "Osoba ozna�ená ako žijúca má doterajší dátum úmrtia";
---
> 		$admtext['not_living'] = "Osoba ozna�ená ako žijúca má dátum úmrtia";
1677c1796
< 		$admtext['modlist'] = "Zoznam módov";
---
> 		$admtext['modlist'] = "Zoznam modov";
1684c1803
< 		$admtext['nomods'] = "V prie�inku módov sa nenašli žiadne defini�né súbory módu (xxx)";
---
> 		$admtext['nomods'] = "V prie�inku modov sa nenašli žiadne defini�né súbory modu (xxx)";
1697d1815
< 		//changed in 9.0.0
1699,1701c1817,1818
< 		//added in 9.0.0
< 		$admtext['needmodupdate'] = "Vyžaduje sa aktualizácia módu";
< 		$admtext['cannotinstall'] = "Tento mód nemožno nainštalovať";
---
> 		$admtext['needmodupdate'] = "Vyžaduje sa aktualizácia modu";
> 		$admtext['cannotinstall'] = "Tento mod nemožno nainštalovať";
1713c1830
< 		$admtext['logoptions'] = "Protokol manažéra módov";
---
> 		$admtext['logoptions'] = "Protokol manažéra modov";
1716c1833
< 		$admtext['modname'] = "Názov módu";
---
> 		$admtext['modname'] = "Názov modu";
1718c1835
< 		$admtext['modifyoptions'] = "Upraviť možnosti manažéra módov";
---
> 		$admtext['modifyoptions'] = "Upraviť možnosti manažéra modov";
1722,1723c1839,1840
< 		$admtext['showlogfile'] = "Zobraziť protokol akcií manažéra módov";
< 		$admtext['recentactions'] = "posledné akcie, ktoré vykonal manažér módov";
---
> 		$admtext['showlogfile'] = "Zobraziť protokol akcií manažéra modov";
> 		$admtext['recentactions'] = "posledné akcie, ktoré vykonal manažér modov";
1726,1728c1843,1845
< 		$admtext['modsyntax'] = "Syntax módov";
< 		$admtext['modguidelines'] = "Úvod k módom";
< 		$admtext['filemod'] = "Súbor xxx je upravený módom";
---
> 		$admtext['modsyntax'] = "Syntax modov";
> 		$admtext['modguidelines'] = "Úvod k modom";
> 		$admtext['filemod'] = "Súbor xxx je upravený modom";
1733c1850
< 		$admtext['tngmods'] = "Módy pre TNG ";
---
> 		$admtext['tngmods'] = "Mody pre TNG ";
1753c1870
< 		$admtext['cantproc'] = "nemožno odstrániť mód";
---
> 		$admtext['cantproc'] = "nemožno odstrániť mod";
1769c1886
< 		$admtext['modrem'] = "mód odinštalovaný";
---
> 		$admtext['modrem'] = "mod odinštalovaný";
1787c1904
< 		$admtext['return'] = "Návrat do manažéra módov";
---
> 		$admtext['return'] = "Návrat do manažéra modov";
1795,1797c1912,1914
< 		$admtext['allowdeletepartial'] = "Povoliť Odstrániť vybrané z �iasto�ne nainštalovaných módov";
< 		$admtext['allowdeleteinstalled'] = "Povoliť Odstrániť zo samostatne inštalovaných módov";
< 		$admtext['showwarnings'] = "Zobraziť upozornenia módov v poli Stav";
---
> 		$admtext['allowdeletepartial'] = "Povoliť Odstrániť vybrané pre �iasto�ne nainštalované mody";
> 		$admtext['allowdeleteinstalled'] = "Povoliť Odstrániť pre samostatne nainštalované mody";
> 		$admtext['showwarnings'] = "Zobraziť upozornenia modov v poli Stav";
1831c1948
< 		$admtext['formodname'] = "pre názov módu ";
---
> 		$admtext['formodname'] = "pre názov modu ";
1854c1971
< 		$admtext['selectmod'] = "Vyberte konfigura�ný súbor módu na ukážku tabuľkových výsledkov analyzátora";
---
> 		$admtext['selectmod'] = "Vyberte konfigura�ný súbor modu na ukážku tabuľkových výsledkov analyzátora";
1858c1975
< 		$admtext['custtextfixes'] = "Aktualizované pokyny módu odporú�ajú, aby používateľský text bol vsúvaný pred komentáre na za�iatok súboru cust_text.php tak, aby módy nemali vplyv na ru�né zmeny používateľa urobené za komentovanými riadkami.";
---
> 		$admtext['custtextfixes'] = "Aktualizované pokyny modu odporú�ajú, aby používateľský text bol vsúvaný pred komentáre na za�iatok súboru cust_text.php tak, aby mody nemali vplyv na ru�né zmeny používateľa urobené za komentovanými riadkami.";
1861c1978
< 		$admtext['compressnames'] = "Zhustiť názvy módov v zozname módov";
---
> 		$admtext['compressnames'] = "Zhustiť názvy modov v zozname modov";
1866,1868c1983,1985
< 		$admtext['newanchor'] = "Nový komentovaný riadok by sa nemal prekladať v jazykových súboroch, pretože vývojári módu ho môžu použiť ako kotvu na vkladanie používateľského textu pred tento nový komentovaný riadok.";
< 		$admtext['translateissue'] = "Ak preložite nový komentovaný riadok, inštalácie módu zlyhajú.";
< 		$admtext['privatemod'] = "Neverejný mód";
---
> 		$admtext['newanchor'] = "Nový komentovaný riadok by sa nemal prekladať v jazykových súboroch, pretože vývojári modu ho môžu použiť ako kotvu na vkladanie používateľského textu pred tento nový komentovaný riadok.";
> 		$admtext['translateissue'] = "Ak preložite nový komentovaný riadok, inštalácie modu zlyhajú.";
> 		$admtext['privatemod'] = "Neverejný mod";
1871,1872c1988,1989
< 		$admtext['confdelmod'] = "Naozaj chcete tento mód odstrániť z vášho systému?";
< 		$admtext['allowdeletesupport'] = "Dovoliť vymazanie prie�inka, ak je vymazaný mód";
---
> 		$admtext['confdelmod'] = "Naozaj chcete tento mod odstrániť z vášho systému?";
> 		$admtext['allowdeletesupport'] = "Dovoliť vymazanie prie�inka, ak je vymazaný mod";
1874,1877c1991,1994
< 		$admtext['delpartinfo'] = "Mali by ste nastaviť túto voľbu na �no len vtedy, ak ste zabudli odinštalovať predchádzajúce verzie módu pred inštalovaním novej verzie.";
< 		$admtext['delinstinfo'] = "Mali by ste nastaviť túto voľbu na �no len vtedy, ak ste nainštalovali novú verziu módu a predchádzajúca verzia sa stále ukazuje ako nainštalovaná.";
< 		$admtext['updateopts'] = "Váš súbor mmconfig.php potrebuje byť zaktualizovaný! Prosím, kliknite na vyššie uvedenú kartu Voľby a potom na tla�idlo Uložiť.";
< 		$admtext['confdelmod1'] = "Naozaj chcete vymazať tento mód z vášho systému? Nemôžete vrátiť späť túto operáciu!";
---
> 		$admtext['delpartinfo'] = "Mali by ste nastaviť túto voľbu na �no len vtedy, ak ste zabudli odinštalovať predchádzajúce verzie modu pred inštalovaním novej verzie.";
> 		$admtext['delinstinfo'] = "Mali by ste nastaviť túto voľbu na �no len vtedy, ak ste nainštalovali novú verziu modu a predchádzajúca verzia sa stále ukazuje ako nainštalovaná.";
> 		$admtext['updateopts'] = "Váš súbor mmconfig.php potrebuje byť zaktualizovaný! Prosím, kliknite na vyššie uvedenú kartu Možnosti a potom na tla�idlo Uložiť.";
> 		$admtext['confdelmod1'] = "Naozaj chcete vymazať tento mod z vášho systému? Nemôžete vrátiť späť túto operáciu!";
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "VÅ¡etky mody";
> 		$admtext['installedmods'] = "Len nainštalované mody";
> 		$admtext['partinstmods'] = "Nainštalované + �iasto�ne nainštalované mody";
> 		$admtext['showanalyzeractions'] = "Zobraziť akcie v analyzátore modov";
> 		$admtext['badchar'] = "Neplatný znak";
1886d2008
< 		$admtext['test_number'] = "Číslo testu";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Číslo testu";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Držať test ako neverejný";
> 		$admtext['multivalues'] = "Pri rozsahu hodnôt použijte poml�ku";
> 		$admtext['changestogroup'] = "Zmeny v DNA skupine";
> 		$admtext['modifydnagroup'] = "Upraviť existujúcu DNA skupinu";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Pripojte tento DNA test k osobe";
1947c2078
< $admtext['state'] = "Štát";
---
> $admtext['state'] = "Štát/kraj";
1965d2095
< $admtext['otherevents'] = "Ďalšie udalosti";
2022c2152
< $admtext['lastmodified'] = "Dátum poslednej aktualizácie";
---
> $admtext['lastmodified'] = "Posledná aktualizácia";
2032c2162
< $admtext['username'] = "Používateľ. meno";
---
> $admtext['username'] = "Používateľské meno";
2050,2051d2179
< $admtext['savereturn'] = "Vrátiť sa na túto stránku";
< $admtext['saveback'] = "Vrátiť sa na menu";
2058,2059d2185
< $admtext['secondary'] = "Druhotné procesy";
< $admtext['commas'] = "Oddeliť jednotlivé položky �iarkou";
2103c2229
< $admtext['matches'] = "Zhoduje sa";
---
> $admtext['matches'] = "Záznamy";
2129,2130d2254
< $admtext['secondarymaint'] = "Druhotné procesy";
< $admtext['customeventtypes'] = "Vlastné typy udalostí";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2233c2354
< $admtext['modmgr'] = "Manažér módov";
---
> $admtext['modmgr'] = "Manažér modov";
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Typ";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Priezviská";
> $admtext['subhead'] = "Podtitul";
> $admtext['image'] = "Obrázok";
> $admtext['author'] = "Autor";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Ako za�ať";
> $admtext['showlog'] = "Záznam prístupov";
> $admtext['nobirthinfo'] = "Chýbajú informácie o narodení";
> //changed in 13.0
> $admtext['savereturn'] = "Uložiť + Zostať";
> $admtext['saveback'] = "Uložiť + Koniec";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Všetky položky boli úspešne vymazané.";
> $admtext['private'] = "Súkromné";
> $admtext['imgtags'] = "Obrázkové zna�ky";
> 
> $admtext['removelink'] = "Odstrániť odkaz";
> $admtext['eloptions'] = "Prejsť alebo vymazať";
> $admtext['pleaseenter'] = "Zadajte, prosím, ";
> 
> $admtext['nolinks'] = "Ešte neexistujú žiadne odkazy";
> $admtext['nogeocode'] = "Geokódovanie sa nedá vykonať";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Vybrať základný obrázok"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Typy udalostí/atribútov";
> $admtext['secondary'] = "Obslužné programy Post-import";
> $admtext['otherevents'] = "Iné udalosti/atribúty";
> //added in 14.0
> $admtext['newlinks'] = "Vytvorené odkazy";
> $admtext['newcemlinks'] = "Vytvorené odkazy na cintoríny";
> $admtext['utility'] = "Obslužný program";
> $admtext['linktype'] = "Typ";
> $admtext['move'] = "Presun";
> $admtext['copy'] = "Kópia";
> $admtext['title2'] = "Názov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Slovak-UTF8/alltext.php TNG1403/languages/Slovak-UTF8/alltext.php
55c55
< $text['loginnotsent2'] = "Emailová adresa, kterou jste zapsali, neodpovídá žádnému uživatelskému ú�tu. Žádné údaje vám nebyly zaslány.";
---
> $text['loginnotsent2'] = "Emailová adresa, ktorú ste napísali, neodpovedá žiadnemu používateľskému ú�tu. Neboli vám poslané žiadne údaje.";
85c85
< $text['none'] = "Žiadny";
---
> $text['none'] = "Žiadne";
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139,142c132
< //moved here in 9.0.4
< $text['top'] = "Vrch";
< 
< //moved here in 10.0.0
---
> $text['top'] = "Top";
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Vyskytla sa chyba v softvéri TNG. Môže to byť spôsobené inštaláciou,  neúplnou aktualizáciou alebo chybou v programe. Ak ste majiteľom webového sídla, môžete kontaktovať podporu TNG, aby vám pomohla pri riešení tohto problému. Prosím, skopírujte nižšie uvedený dotaz a vložte  ho do vašej správy.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Číslo/názov testu";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Číslo/názov testu";
> $admtext['match_date'] = "Dátum zhody";
> $admtext['gedmatchID'] = "ID GED-zhody";
> $admtext['ydna_haplogroup'] = "Y-DNA haploskupina";
> $admtext['mtdna_haplogroup'] = "mtDNA haploskupina";
> $admtext['relationship_section'] = "Sekcia príbuzenských vzťahov";
> $admtext['relationship_range'] = "Rozsah príbuzenských vzťahov";
> $admtext['suggested_relationship'] = "Navrhované";
> $admtext['actual_relationship'] = "Aktuálne príbuzenské vzťahy";
> $admtext['related_side'] = "Súvisiaca vetva";
> $admtext['shared_dna'] = "Zdieľaná DNA";
> $admtext['shared centimorgans'] = "Celkovo zdieľané cM";
> $admtext['shared_segments'] = "Zdieľané segmenty";
> $admtext['largest_segment'] = "Najvä�ší segment";
> $admtext['chromosome'] = "Chromozóm �.";
> $admtext['segment_start'] = "Za�iatok segmentu";
> $admtext['segment_end'] = "Koniec segmentu";
> $admtext['centiMorgans'] = "centimorgany";
> $admtext['matchingSNPs'] = "Po�et zhodných SNP";
> $admtext['xmatch'] = "X-zhoda";
> $text['keep_test_private'] = "Neverejný test";
> $text['shared_dna'] = "Zdieľaný segment DNA";
> $text['for_match'] = "pre túto zhodu";
> $admtext['keeptest'] = "Ochrana testu";
> $admtext['keepname'] = "Ochrana mena";
> $admtext['allgroups'] = "VÅ¡etky skupiny";
> $admtext['alltypes'] = "VÅ¡etky typy";
> $admtext['generation_num'] = "Generácie pre zdedené priezviská";
> 
> $text['birthabbr'] = "nar.";
> $text['chrabbr'] = "krst.";
> $text['deathabbr'] = "zomr.";  //from descend
> $text['burialabbr'] = "poch..";  //from descend
> $text['marrabbr'] = "sob.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Nájsť všetky osoby s udalosťami na tomto mieste";
> $text['firstpage'] = "Prvá stránka";
> $text['lastpage'] = "Posledná stránka";
> 
> //changed in 13.0.0
> $text['problem'] = "Vyskytla sa chyba v TNG softvéri. Čo robiť? <p>Ak ste práve inštalovali aktualizáciu softvéru, asi ste presko�ili �asť inštala�ných inštrukcií. Vráťte sa na stránku readme a znova si pre�ítajte inštrukcie. Zvlášť dávajte pozor pri bode o databázovej štruktúre.</p><p>Ak ste teraz inštalovali TNG prvýkrát, mali by ste ešte vytvoriť databázové tabuľky. Vráťte sa na stránku readme.html a nájdite tento bod.</p><p>Ak ste vlastníkom sídla stránok, môžete kontaktovať TNG podporu pre �alšiu pomoc s týmto problémom. Prosím, skopírujte nižšie uvedené informácie a prilepte ich do svojej správy.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Žiadna vetva";
> 
> //added in 14.0
> $text['oneyear'] = "rok";
> $text['pwdcodelink'] = "Po kliknutí na tento odkaz vám bude odoslané do�asné heslo.";
> $text['pwdcodesent'] = "Odkaz na obnovenie hesla bol odoslaný na vašu emailovú adresu.";
> $text['moved'] = "Presunuté";
> $text['citation'] = "Citácia";
> $text['other'] = "Iné";
> $text['death'] = "Úmrtie";
> $text['burial'] = "Pohreb";
> $text['cremation'] = "Kremácia";
> $text['marriage'] = "Sobáš";
> $text['divorce'] = "Rozvod";
> $text['bylength'] = "Kroky";
> $text['bymarriages'] = "Manželstvá";
> $text['none'] = "Žiadne";
> 
> //moved here in 14.0
> $text['family'] = "Rodina";
> $text['source'] = "Zdroj";
> $text['repository'] = "Archív";
> $text['place'] = "Miesto";
> $admtext['BAPM'] = "Krst";
> 
> $text['glang'] = "sk";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Slovak-UTF8/text.php TNG1403/languages/Slovak-UTF8/text.php
7c7
< 		$text['callnum'] = "Volacie �íslo";
---
> 		$text['callnum'] = "Archívne �íslo";
69d68
< 		$text['general'] = "Všeobecné";
77a77
> 	case "connections":
83c83
< 		$text['select2inds'] = "Prosím, vyberte dve osoby.";
---
> 		$text['select2inds'] = "Prosím, vyberte dvoch jednotlivcov.";
90c90
< 		$text['sameperson'] = "Tieto dve osoby sú totožné";
---
> 		$text['sameperson'] = "Títo dvaja jednotlivci sú tá istá osoba.";
93c93
< 		$text['sometimes'] = "(Použitie iného po�tu generácií môže niekedy dať iný výsledok.)";
---
> 		$text['sometimes'] = "(Niekedy kontrola cez rôzny po�et generácií dáva odlišný výsledok.)";
144c144
< 		$text['dospouses2'] = "Zobraziť partnerov";
---
> 		$text['dospouses2'] = "Zobraziť manželov";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Hľadať spojenia";
> 		$text['findrel2'] = "Nájsť vzťahy a iné spojenia";
> 		$text['makeme2nd'] = "Použiť moje ID";
> 		$text['usebookmarks'] = "Použiť záložky";
> 		$text['select2inds'] = "Prosím, vyberte dvoch jednotlivcov.";
> 		$text['indinfofor'] = "Info jednotlivca pre";
> 		$text['nobookmarks'] = "Nie je žiadna záložka na použitie";
> 		$text['bkmtitle'] = "Osoby nájdené pri záložkách";
> 		$text['bkminfo'] = "Vyberte osobu:";
> 		$text['sortpathsby'] = "Triediť cesty podľa po�tu";
> 		$text['sortbyshort'] = "Triediť podľa";
> 		$text['bylengthshort'] = "Dĺžka";
> 		$text['badID1'] = ": zlé ID osoby 1 - prosím, vráťte sa späť a opravte to";
> 		$text['badID2'] = ": zlé ID osoby 2 - prosím, vráťte sa späť a opravte to";
> 		$text['notintree'] = ": osoba s týmto ID nie je v aktuálnej stromovej databáze.";
> 		$text['sameperson'] = "Títo dvaja jednotlivci sú tá istá osoba.";;
> 		$text['nopaths'] = "Tieto osoby nie sú spojené.";
> 		$text['nopaths1'] = "Nie sú žiadne �alšie spojenia kratšie ako xxx";
> 		$text['nopaths2'] = "pri xxx krokoch hľadania";
> 		$text['longestpath'] = "(najdlhšia doteraz kontrolovaná cesta bola xxx krokov dlhá)";
> 		$text['relevantpaths'] = "Po�et nájdených odlišných relevantných ciest: xxx";
> 		$text['skipMarr'] = "(naviac, po�et nájdených ciest, ale nezobrazených kvôli veľkému po�tu sobášov bol: xxx)";
> 		$text['mjaor'] = "alebo";
> 		$text['connectionsto'] = "Spojenia k ";
> 		$text['findanotherpers'] = "Nájsť �alšiu osobu...";
> 		$text['sometimes'] = "(Niekedy kontrola cez rôzny po�et generácií dáva odlišný výsledok.)";
> 		$text['anotherpath'] = "Hľadať �alšie spojenia";
> 		$text['xpath'] = "Cesta ";
> 		$text['primary'] = "Za�iato�ná osoba"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Kone�ná osoba";
> 		$text['parent'] = "Rodi�";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "his daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "otec";
> 		$text['hmother'] = "matka";
> 		$text['hhusband'] = "manžel";
> 		$text['hwife'] = "manželka";
> 		$text['hson'] = "syn";
> 		$text['hdaughter'] = "dcéra";
> 		$text['maxruns'] = "Maximálny po�et ciest, ktoré sa majú skontrolovať";
> 		$text['maxrshort'] = "Maximálne cesty";
> 		$text['maxlength'] = "Cesty spojenia nie dlhšie ako";
> 		$text['maxlshort'] = "Maximálna dĺžka";
> 		$text['xstep'] = "krok";
> 		$text['xsteps'] = "kroky";
> 		$text['xmarriages'] = "xxx sobáše";
> 		$text['xmarriage'] = "1 sobáš";
> 		$text['showspouses'] = "Zobraziť oboch manželov";
> 		$text['showTxt'] = "Zobraziť textový popis cesty";
> 		$text['showTxtshort'] = "Textový popis";
> 		$text['compactBox'] = "Zobrazenie kompaktných okienok osôb";
> 		$text['compactBoxshort'] = "Kompaktné okienka";
> 		$text['paths'] = "Cesty";
> 		$text['dospouses2'] = "Zobraziť manželov";
> 		$text['maxmopt'] = "Max. manželstvá podľa spojenia";
> 		$text['maxm'] = "Max. manželstvá";
> 		$text['arerelated'] = "Tieto osoby sú príbuzné - ich vzťah je ukázaný v Ceste 1";
> 		$text['simplerel'] = "Jednoduché hľadanie vzťahu";
196d264
< 		$text['scrollnote'] = "Poznámka: Na zobrazenie diagramu môžete použiť posuvník dole alebo doprava.";
199d266
< 		$text['popupnote2'] = " = Nový rodokmeň";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabuľky";
> 		$text['dtchildren'] = "Deti";
> 		$text['dtgrandchildren'] = "Vnú�atá";
> 		$text['dtggrandchildren'] = "Pravnú�atá";
> 		$text['dtgggrandchildren'] = "Prapravnú�atá"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Žiadni potomkovia";
> 		$text['dtgen'] = "Gen.";
> 		$text['dttotal'] = "Celkom";
> 		$text['dtselect'] = "Vybrať";
> 		$text['dteachfulltable'] = "Každá plná tabuľka bude mať";
> 		$text['dtrows'] = "riadky";
> 		$text['dtdisplayingtable'] = "Zobrazenie tabuľky";
> 		$text['dtgototable'] = "Cho� na tabuľku:";
> 		$text['fcinstrdn'] = "Zobraziť rodinu s manželmi";
> 		$text['fcinstrup'] = "Zobraziť rodinu s rodi�mi";
> 		$text['fcinstrplus'] = "Vybrať iných manželov";
> 		$text['fcinstrfam'] = "Vybrať iných rodi�ov";
381,384c467,468
< 		$text['firstpage'] = "Prvá stránka";
< 		$text['lastpage'] = "Posledná stránka";
< 		$text['photoowner'] = "Majiteľ/Pôvodca";
< 		$text['nocemetery'] = "Žiadny cintorín";
---
> 		$text['photoowner'] = "Vlastník originálu";
> 		$text['nocemetery'] = "Cintorín neuvedený";
399,400c483,484
< 		$text['iptc120'] = "Titulok";
< 		$text['iptc122'] = "Titulok vytvoril";
---
> 		$text['iptc120'] = "Popis";
> 		$text['iptc122'] = "Popis vytvoril";
411c495
< 		$text['viewitem'] = "Prezrite si túto položku";
---
> 		$text['viewitem'] = "Prezrieť túto položku";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Prepnúť zna�ky";
445c531
< 		$text['byoccurrence'] = " zoradených podľa po�etnosti";
---
> 		$text['byoccurrence'] = "zoradených podľa po�etnosti";
453c539
< 		$text['numoccurrences'] = "celkový po�et miest v závorke";
---
> 		$text['numoccurrences'] = "celkový po�et miest v zátvorke";
509c595
< 		$text['browsealltrees'] = "Prehliadavať všetky stromy";
---
> 		$text['browsealltrees'] = "Prehliadať všetky stromy";
519c605
< 		$text['username'] = "Používateľ. meno";
---
> 		$text['username'] = "Používateľské meno";
535c621
< 		$text['success'] = "Ďakujeme, vaša registrácia prebehla úspešne. Budeme vás informovať, kedy váš ú�et bude aktívny, alebo ak budú potrebné �alšie informácie.";
---
> 		$text['success'] = "Ďakujeme, vaša registrácia prebehla úspešne. Administrátor systému vás informovať kedy váš ú�et bude aktívny alebo ak budú potrebné �alšie informácie.";
539c625
< 		$text['loginsent'] = "Prihlasovacie údaje boli odosláné";
---
> 		$text['loginsent'] = "Prihlasovacie údaje boli odoslané";
544c630
< 		$text['accmail'] = "POZN�MKA: Aby ste mohli prijať email z tejto administrátorskej stránky ohľadom vášho ú�tu, skontrolujte, prosím, �i neblokujete emaily z tejto domény.";
---
> 		$text['accmail'] = "POZN�MKA: Aby ste mohli prijať email od administrátora ohľadom vášho ú�tu, skontrolujte, prosím, �i váš emailový program neblokuje emaily z tejto domény.";
547c633
< 		$text['nousers'] = "Tento formulár nemožno použiť, kým nebude vytvorený aspoň jeden záznam používateľa. Ak ste majiteľom týchto stránok, cho�te do ponuky Admin/Používatelia a vytvorte si ú�et administrátora.";
---
> 		$text['nousers'] = "Tento formulár nemožno použiť, kým nebude vytvorený aspoň jeden záznam používateľa. Ak ste majiteľom týchto stránok, cho�te do ponuky Administrácia >> Používatelia a vytvorte si ú�et administrátora.";
549d634
< 		//changed in 8.0.0
552c637
< 		$text['accinactive'] = "Nastavenie ú�tu môžete urobiť v Admin/Používatelia/Preskúmať. Ú�et zostane neaktívny, kým aspoň raz záznam neupravíte a neuložíte.";
---
> 		$text['accinactive'] = "Nastavenie ú�tu môžete urobiť v Administrácia >> Používatelia >> Hľadať. Ú�et zostane neaktívny, kým aspoň raz záznam neupravíte a neuložíte.";
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Ešte raz nové heslo";
> 		$text['resetsuccess'] = "Úspech: Heslo bolo obnovené";
> 		$text['resetfail'] = "Neúspech: Heslo nebolo obnovené";
> 		$text['failreason0'] = " (neznáma chyba databázy)";
> 		$text['failreason2'] = " (nemáte oprávnenie na zmenu vášho hesla)";
> 		$text['failreason3'] = " (heslá sa nezhodujú)";
565c656
< 		$text['browseallbranches'] = "Prehliadavať všetky vetvy";
---
> 		$text['browseallbranches'] = "Prehliadať všetky vetvy";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Celkový po�et citácií zdroja";
618d710
< 		$text['loginfirst'] = "Najskôr sa musíte prihlásiť.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Zistili sa používateľské záznamy. Na pokra�ovanie musíte sa najprv prihlásiť alebo odstrániť všetky záznamy z tabuľky používateľov.";
629,630d722
< 		$text['zoomin'] = "Priblížiť";
< 		$text['zoomout'] = "Oddialiť";
649c741
< 		$text['mode_values'] = "Hodnoty módu";
---
> 		$text['mode_values'] = "Hodnoty modu";
655,656c747
< 		$text['fastmutating'] = "Rýchle mutovanie";
< 		$text['dna_info_head'] = "Informácia k DNA testu";
---
> 		$text['fastmutating'] = "Rýchle mutácie";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Porovnať vybrané testy mtDNA";
> 		$text['dnatestscompare_atdna'] = "Porovnať vybrané testy atDNA";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNP";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Zvláštne mutácie";
> 		$text['mrca'] = "Najbližší spolo�ný predok";
> 		$text['ydna_test'] = "Testy Y-DNA";
> 		$text['mtdna_test'] = "Testy mtDNA (mitochondriálne)";
> 		$text['atdna_test'] = "Testy atDNA (autozomálne)";
> 		$text['segment_start'] = "Za�iatok";
> 		$text['segment_end'] = "Koniec";
> 		$text['suggested_relationship'] = "Navrhnuté";
> 		$text['actual_relationship'] = "Aktuálne";
> 		$text['12markers'] = "Markery 1-12";
> 		$text['25markers'] = "Markery 13-25";
> 		$text['37markers'] = "Markery 26-37";
> 		$text['67markers'] = "Markery 38-67";
> 		$text['111markers'] = "Markery 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "Na porovnanie je potrebné vybrať aspoň dva testy.";
664c780
< $text['matches'] = "Zhody";
---
> $text['matches'] = "Záznamy";
670,671d785
< $text['birthabbr'] = "n.";
< $text['chrabbr'] = "k.";
675d788
< $text['family'] = "Rodina"; //from getperson
685d797
< $text['deathabbr'] = "z.";  //from descend
706d817
< $text['burialabbr'] = "pohr.";  //from descend
712d822
< $text['place'] = "Miesto";
715d824
< $text['marrabbr'] = "s.";
730,731c839,840
< $text['relationship2'] = "Príbuz. vzťah"; //different in some languages, at least in German (Beziehung)
< $text['timeline'] = "Časová os";
---
> $text['relationship2'] = "Vzťah"; //different in some languages, at least in German (Beziehung)
> $text['timeline'] = "Časová línia";
738d846
< $text['source'] = "Zdroj";
766d873
< $text['repository'] = "Archív";
770d876
< $text['findplaces'] = "Nájsť všetky osoby s udalosťami na tomto mieste";
804d909
< $text['glang'] = "&amp;hl=cs";
816d920
< $text['none'] = "Žiadny";
831c935
< $text['mostwanted'] = "Najhľadanejšie";
---
> $text['mostwanted'] = "Hľadá sa";
840c944
< $text['searchtngnet'] = "Prehľadať TNG sieť (GENDEX)";
---
> $text['searchtngnet'] = "Prehliadať TNG sieť (GENDEX)";
859c963
< $text['mnufeatures'] = "Ďalšie vlastnosti";
---
> $text['mnufeatures'] = "Ďalšie možnosti";
888c992
< $text['location'] = "Umiestnenie";
---
> $text['location'] = "Miesto";
902c1006
< $text['features'] = "Vlastnosti";
---
> $text['features'] = "Zaujímavosti";
924d1027
< $text['otherevents'] = "Iné udalosti";
931,932c1034,1035
< $text['searchsite'] = "Prehľadávať toto sídlo";
< $text['searchsitemenu'] = "Sídlo hľadania";
---
> $text['searchsite'] = "Hľadať v tomto webovom sídle";
> $text['searchsitemenu'] = "Hľadanie";
947c1050
< $text['takenby'] = "Zobral: ";
---
> $text['takenby'] = "Testovaná osoba";
952,954d1054
< $text['test_info'] = "Informácia o teste";
< $text['people_have'] = "osoby prepojili DNA test na";
< $text['person_has'] = "osoba prepojila DNA test na";
964,966c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA testy sú združené s";
> $text['testislinked'] = "DNA test je združený s";
> 
> //added in 12.2
> $text['quicklinks'] = "Rýchle odkazy";
> $text['yourname'] = "Vaše meno";
> $text['youremail'] = "Vaša emailová adresa";
> $text['liketoadd'] = "Akékoľvek informácie, ktoré chcete pridať";
> $text['webmastermsg'] = "Správa správcu webu";
> $text['gallery'] = "Zobraziť galériu";
> $text['wasborn_male'] = "sa narodil";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "sa narodila"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "bol pokrstený";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "bola pokrstená";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "zomrel";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "zomrela";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "bol pochovaný"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "bola pochovaná"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "bol spopolnený";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "bola spopolnená";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "bol sobášený s";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "bola sobášená s";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "bol rozvedený";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "bola rozvedená";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " v ";			// used as a preposition to the location
> $text['onthisdate'] = " dňa ";		// when used with full date
> $text['inthisyear'] = " v ";		// when used with year only or month / year dates
> $text['and'] = "a ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informácia o teste DNA";
> //added in 13.0
> $text['visitor'] = "Návštevník";
> 
> $text['popupnote2'] = " = Nový rodokmeň";
> 
> //moved here in 14.0
> $text['zoomin'] = "Priblížiť";
> $text['zoomout'] = "Oddialiť";
> $text['scrollnote'] = "Ťahajte alebo rolujte, aby ste si pozreli viac z tohto diagramu.";
> $text['general'] = "VÅ¡eobecne";
> 
> //changed in 14.0
> $text['otherevents'] = "Iné udalosti";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Spojenia";
> $text['continue'] = "Pokra�ovať";
> $text['title2'] = "Názov"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
Only in TNG1403/languages: Slovenian-UTF8
diff -r TNG/languages/Spanish/admintext.php TNG1403/languages/Spanish/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Por favor, ingrese un ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Por favor, seleccione un archivo para importar.";
> 		$admtext['addreplacedata'] = "Añadir o reemplazar su genealogía (puede tardar varios minutos, dependiendo del tamaño del archivo)";
> 		$admtext['fromyourcomputer'] = "Desde su PC";
> 		$admtext['importdata'] = "Importar Datos";
> 		$admtext['replace'] = "Reemplazar (en árbol seleccionado)";
> 		$admtext['desttree'] = "Arbol de destino";
> 		$admtext['selectdesttree'] = "Por favor, seleccione o ingrese un árbol de destino.";
> 		$admtext['selectexisting'] = "Importar a";
> 		$admtext['ucaselast'] = "Todos los apellidos en mayúsculas";
> 		$admtext['norecalc'] = "No re-calcular marcas de individuos vivos";
> 		$admtext['autooffset'] = "Comenzar IDs con el primer número disponible";
> 		$admtext['mustselecttree'] = "Debe seleccionar un árbol antes de poder utilizar esta opción.";
> 		$admtext['onwebserver'] = "Desde el sitio web (en la carpeta GEDCOM)";
> 		$admtext['imphints'] = "Consejos: Todos los Datos Actuales significa todas las personas, familias, fuentes y notas (los medios asociados no se pierden siempre que los ID permanezcan iguales). Las coincidencias se basan siempre sólo en los ID. Los registros nuevos son siempre añadidos. Adjuntar importa todos los registros con nuevo ID.";
> 		$admtext['destbranch'] = "Rama de Destino (opcional)";
> 		$admtext['importlatlong'] = "Importar datos de Latitud / longitud si existe";
> 		$admtext['opening'] = "Abriendo";
> 		$admtext['reopen'] = "Reabriendo";
> 		$admtext['uploading'] = "Cargando";
> 		$admtext['stop'] = "Detener";
> 		$admtext['stopped'] = "Importación interrumpida";
> 		$admtext['resume'] = "Clic aquí para reanudar";
> 		$admtext['neweronly'] = "Reemplazar sólo si es nuevo";
> 		$admtext['oldimport'] = "Importar al viejo estilo (sin barra de progreso)";
> 		$admtext['importgedcom'] = "Importe archivo GEDCOM (puede estar comprimido)";
> 		$admtext['stopbackup'] = "Pare! Es una buena idea hacer copia de sus datos actuales antes de proceder.";
> 		$admtext['importmedia'] = "Importar medio, si existe";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Importar Sólo Tipo de Eventos Personalizados (sin datos añadidos, reemplazados o adjuntos)";
> 		$admtext['allevents'] = "Aceptar datos para todo nuevo Tipo de Evento personalizado";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Editar Tipo de Evento Existente";
135,138d168
< 		$admtext['entertypedesc'] = "Por favor, ingrese tipo/descripción para este nuevo tipo de evento.";
< 		$admtext['enterdisplay'] = "Por favor, escriba un texto de pantalla para este nuevo tipo de evento.";
< 		$admtext['existingeventtypeinfo'] = "Información de Tipo de Evento Existente";
< 		$admtext['neweventtypeinfo'] = "Información de Nuevo Tipo de Evento";
145,146d174
< 		$admtext['addnewevtype'] = "Añadir Nuevo Tipo de Evento";
< 		$admtext['createnewevtype'] = "Crear registro de nuevo tipo de evento";
149,150d176
< 		$admtext['existingevtypes'] = "Tipos de Eventos Existentes";
< 		$admtext['edsevtypes'] = "Editar, borrar u ordenar tipos de eventos previamente añadidos";
152d177
< 		$admtext['confdeleteevtype'] = "¿Está seguro que quiere borrar este tipo de evento?";
154d178
< 		$admtext['selectentertag'] = "Por favor, seleccione o ingrese la etiqueta para este tipo de evento.";
208d231
< 		$admtext['changestoallevtypes'] = "Cambios a todos los tipos de evento";
214d236
< 		$admtext['BAPM'] = "Bautismo";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Esta seguro que quiere eliminar este tipo de evento? Todos los eventos de este  tipo serán eliminados.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Añadir Nuevo Tipo de Evento";
> 		$admtext['createnewevtype'] = "Crear registro de nuevo tipo de evento";
> 		$admtext['modifyeventtype'] = "Editar Tipo de Evento Existente";
> 		$admtext['entertypedesc'] = "Por favor, ingrese tipo/descripción para este nuevo tipo de evento.";
> 		$admtext['enterdisplay'] = "Por favor, escriba un texto de pantalla para este nuevo tipo de evento.";
> 		$admtext['existingeventtypeinfo'] = "Información de Tipo de Evento Existente";
> 		$admtext['neweventtypeinfo'] = "Información de Nuevo Tipo de Evento";
> 		$admtext['existingevtypes'] = "Tipos de Eventos Existentes";
> 		$admtext['edsevtypes'] = "Editar, borrar u ordenar tipos de eventos previamente añadidos";
> 		$admtext['selectentertag'] = "Por favor, seleccione o ingrese la etiqueta para este tipo de evento.";
> 		$admtext['changestoallevtypes'] = "Cambios a todos los tipos de evento";
268d303
< 		$admtext['nobirthinfo'] = "Sin información de nacimiento";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Elegir<br/>foto<br/>por defecto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Salvar + Nuevo Padre";
> 		$admtext['savenewspouse'] = "Salvar + Nueva Esposa";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Por favor, ingrese una descripción de la imagen.";
388d424
< 		$admtext['photoowner'] = "Propietario/Fuente";
417d452
< 		$admtext['imgmap'] = "Mapa de Imagen";
490d524
< 		$admtext['mapinstr3'] = "Para vincular un región de esta foto a un individuo específico, seleccione el árbol del individuo, defina la forma y las dimensiones de la región y luego haga Clic en el centro de la región correspondiente en la foto. Una ventana emergente le ayudará a seleccionar el individuo. Después de realizar la selección, el código del mapa de imagen se añadirá en el box de abajo. Repita este procedimiento cada vez que sea necesario para las regiones adicionales.";
495d528
< 		$admtext['removelink'] = "Quitar Enlace";
502d534
< 		$admtext['eloptions'] = "Explorar o Eliminar";
509d540
< 		$admtext['nolinks'] = "Todavía no existen enlaces";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Mapa de la Imagen HTML (para compatibilidad con versiones anteriores)";
> 		$admtext['photoowner'] = "Propietario del original";
> 		$admtext['nothumb'] = "No hay miniatura";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "The item could not be added, most likely because the file was too large and could not be uploaded or used to make a thumbnail.";
> 		$admtext['moved'] = "Moved";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Por favor, ingrese una descripción de la imagen.";
> 		$admtext['mapinstr3'] = "Para enlazar la región de esta foto a un individuo, primero seleccione el árbol del individuo, después cree un rectángulo para la region deseada. Esto se hace dando click en la parte superior izquierda de la región y luego arrastrándolo a a la esquina inferior derecha. Alternativamente, usted puede hacer click en la esquina superior izquierda y después click en la esquina inferior derecha. Una ventana de dialogo lo ayudara a seleccionar el individuo. Haga su selección, después repita el proceso para cada región que necesite. Haga click en una región existente para seleccionarla, después arrástrela para moverla o haga click en 'X' para borrarla.";
596d633
< 		$admtext['foremptystring'] = "Para una cadena vacía, deje este campo en blanco y haga Clic en \"Añadir »»\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions: Drag or double-click items at left into lists at right. Drag up and down to re-order. Double-click again to remove.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Para una cadena vacía, deje este campo en blanco y haga Clic en \"Añadir »»\"";
651,655d690
< 		$admtext['selectimportfile'] = "Por favor, seleccione un archivo para importar.";
< 		$admtext['importgedcom'] = "Importar GEDCOM (formato 5.5 estándar)";
< 		$admtext['addreplacedata'] = "Añadir o reemplazar su genealogía (puede tardar varios minutos, dependiendo del tamaño del archivo)";
< 		$admtext['fromyourcomputer'] = "Desde su PC";
< 		$admtext['importdata'] = "Importar Datos";
657,660d691
< 		$admtext['replace'] = "Reemplazar (en árbol seleccionado)";
< 		$admtext['desttree'] = "Arbol de destino";
< 		$admtext['selectdesttree'] = "Por favor, seleccione o ingrese un árbol de destino.";
< 		$admtext['selectexisting'] = "Importar a";
668,673d698
< 		$admtext['ucaselast'] = "Todos los apellidos en mayúsculas";
< 		$admtext['norecalc'] = "No re-calcular marcas de individuos vivos";
< 		$admtext['autooffset'] = "Comenzar IDs con el primer número disponible";
< 
< 		$admtext['mustselecttree'] = "Debe seleccionar un árbol antes de poder utilizar esta opción.";
< 		$admtext['importmedia'] = "Importar medio, si existe";
675d699
< 		$admtext['neweronly'] = "Reemplazar sólo si es nuevo";
677,692d700
< 		$admtext['onwebserver'] = "Desde el sitio web (en la carpeta GEDCOM)";
< 		$admtext['eventsonly'] = "Importar Sólo Tipo de Eventos Personalizados (sin datos añadidos, reemplazados o adjuntos)";
< 		$admtext['imphints'] = "Consejos: Todos los Datos Actuales significa todas las personas, familias, fuentes y notas (los medios asociados no se pierden siempre que los ID permanezcan iguales). Las coincidencias se basan siempre sólo en los ID. Los registros nuevos son siempre añadidos. Adjuntar importa todos los registros con nuevo ID.";
< 		$admtext['allevents'] = "Aceptar datos para todo nuevo Tipo de Evento personalizado";
< 		$admtext['destbranch'] = "Rama de Destino (opcional)";
< 		$admtext['inframe'] = "(en cuadro)";
< 		$admtext['getstart'] = "Comenzando";
< 		$admtext['importlatlong'] = "Importar datos de Latitud / longitud si existe";
< 		$admtext['opening'] = "Abriendo";
< 		$admtext['reopen'] = "Reabriendo";
< 		$admtext['uploading'] = "Cargando";
< 		$admtext['stop'] = "Detener";
< 		$admtext['stopped'] = "Importación interrumpida";
< 		$admtext['resume'] = "Clic aquí para reanudar";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Registro de cambios";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Importar al viejo estilo (sin barra de progreso)";
713c719,724
< 		$admtext['task_mapkey'] = "Consiga un map key de Google para mostrar el mapa";
---
> 		$admtext['task_mapkey'] = "Get a map key from Google to enable maps display";
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Autor";
804,809c814,819
< 		$admtext['momside'] = "Etiqueta del Lado de la Madre"; //8
< 		$admtext['dadside'] = "Etiqueta del Lado del Padre"; //8
< 		$admtext['momperson'] = "ID persona del Lado de la Madre"; //8
< 		$admtext['momtree'] = "ID árbol del Lado de la Madre"; //8
< 		$admtext['dadperson'] = "ID persona del Lado del Padre"; //8
< 		$admtext['dadtree'] = "ID árbol del Lado del Padre"; //8
---
> 		$admtext['momside'] = "Etiqueta del Lado de la Madre"; //8, 20
> 		$admtext['dadside'] = "Etiqueta del Lado del Padre"; //8, 20
> 		$admtext['momperson'] = "ID persona del Lado de la Madre"; //8, 20
> 		$admtext['momtree'] = "ID árbol del Lado de la Madre"; //8, 20
> 		$admtext['dadperson'] = "ID persona del Lado del Padre"; //8, 20
> 		$admtext['dadtree'] = "ID árbol del Lado del Padre"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Encabezado de comillas";
> 		$admtext['quotesubhead'] = "Subtítulo de citas";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Nombre de la función";
> 		$admtext['snipinfoone'] = "Featurette primera línea";
> 		$admtext['snipinfotwo'] = "Featurette segunda línea";
> 		$admtext['snipimage'] = "Imagen destacada";
> 		$admtext['snipperson'] = "ID de persona de Featurette";
> 		$admtext['sniptree'] = "ID del árbol de características";
> 		$admtext['quote'] = "Cita";
> 		$admtext['link'] = "Enlace";
> 		$admtext['featuretitle7'] = "Caracteristica del titulo 7";
> 		$admtext['featuretitle8'] = "Caracteristica del titulo 8";
> 		$admtext['featuretitle9'] = "Caracteristica del titulo 9";
> 		$admtext['featurethumb9'] = "Caracteristica del la minitura 9"; //15
> 		$admtext['featurelink9'] = "Caracteristica del enlace 9"; //15
> 		$admtext['featurepara9'] = "Caracteristica del paragrafo 9"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Encabezado de la Imagen Izquierda";
> 		$admtext['rightimg'] = "Encabezado de la Imagen Derecha";
> 		$admtext['photoption'] = "Opciones de la Foto son<br />&nbsp;&nbsp;(estática o aleatoria)";
> 		$admtext['randomphotowidth'] = "Ancho de la Foto Aleatoria";
> 		$admtext['randomphotoheight'] = "Alto de la Foto Alatoria";
> 		$admtext['randomphotomediatypeID'] = "Colección de Fotos al Azar";
> 		$admtext['momheading'] = "Encabezamiento de la Familia Materna";
> 		$admtext['mompara'] = "Parrafo de la Familia Materna";
> 		$admtext['mompagelink'] = "Enlace de la Pagina de la Familia Materna";
> 		$admtext['dadheading'] = "Encabezamiento de la Familia Paterna";
> 		$admtext['dadpara'] = "Parrafo de la Familia Paterna";
> 		$admtext['dadpagelink'] = "Enlace de la Pagina de la Familia Paterna";
> 		$admtext['spmomheading'] = "Encabezamiento de la Familia Materna del Conyuge";
> 		$admtext['spmompara'] = "Parrafo de la Familia Materna del Cónyuge";
> 		$admtext['spmompagelink'] = "Enlace de la Pagina de la Familia Materna del Cónyuge";
> 		$admtext['spmomside'] = "Etiqueta del lado Materno del Cónyuge";
> 		$admtext['spdadside'] = "Lado Paterno del Cónyuge";
> 		$admtext['spmomperson'] = "personID lado Materno del Cónyuge";
> 		$admtext['spmomtree'] = "treeID lado Materno del Conyuge";
> 		$admtext['spdadheading'] = "Encabezamiento de la Famila Paterna del Cónyuge";
> 		$admtext['spdadpara'] = "Parrafo de la Familia Paterna del Conyuge";
> 		$admtext['spdadpagelink'] = "Enlace de la Pagina de la Familia Paterna del Conyuge";
> 		$admtext['spdadperson'] = "personID lado Paterno del Cónyuge";
> 		$admtext['spdadtree'] = "treeID lado Paterno del Cónyuge";
> 		$admtext['storiesheading'] = "Nuestras Historias Familiares";
> 		$admtext['nbrsurnames'] = "Numero de Apellidos<br />&nbsp;&nbsp; en la Nube de Apellidos";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Caracteristica del la minitura";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG requiere la versión 5.3 o superior.)";
---
> 		$admtext['phpreq'] = "(TNG requiere la versión 7.0 o superior.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = " Cambie los prefijos existentes para que coincidan con la configuración de TNG";
> 		$admtext['sortevents'] = "Ordenar eventos por";
> 		$admtext['sortbydate'] = "Fecha del Evento";
> 		$admtext['sortbytype'] = "Tipo de Evento";
> 		$admtext['allowsuggest'] = "Permita sugerencias de los visitantes";
> 		$admtext['livingchecked'] = "Living flag para personas y familias nuevas";
> 		$admtext['maxmarried'] = "Marque como familia si esta casada menos<br/>de estos años";
> 		$admtext['imagetags'] = "Rectangulos";
> 		$admtext['allowcsv'] = "Permite bajar reportes tipo CSV";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Export as SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of connection search runs";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Display textual path statement";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages in connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "no se pudo hacer geocode";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "No geocodifique";
1436d1549
< 		$admtext['backtosecondary'] = "Volver a procesos secundarios";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Volver a procesos secundarios";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Excluya notas";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip and include media files";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Mostrar solo usuarios deshabilitados";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Todos los Mods";
> 		$admtext['installedmods'] = "S&oacute;lo mods instalados";
> 		$admtext['partinstmods'] = "Mods instalados + parcialmente instalados";
> 		$admtext['showanalyzeractions'] = "Mostrar acciones en el analizador de mods";
> 		$admtext['badchar'] = "Caracter invalido";
1886d2008
< 		$admtext['test_number'] = "Prueba Numero";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Prueba Numero";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Vincular este test de ADN  a una persona";
1965d2095
< $admtext['otherevents'] = "Otros Eventos";
2050,2051d2179
< $admtext['savereturn'] = "Volver a esta página";
< $admtext['saveback'] = "Volver al menú";
2058,2059d2185
< $admtext['secondary'] = "Procesos Secundarios";
< $admtext['commas'] = "Separar entradas múltiples con comas";
2101c2227
< $admtext['nobranch'] = "Ninguna Rama";
---
> $admtext['nobranch'] = "No hay Ramas";
2129,2130d2254
< $admtext['secondarymaint'] = "Procesos Secundarios";
< $admtext['customeventtypes'] = "Tipos de Eventos Personalizados";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tipo";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Surnames";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Imagen";
> $admtext['author'] = "Autor";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Comenzando";
> $admtext['showlog'] = "Registro de cambios";
> $admtext['nobirthinfo'] = "Sin información de nacimiento";
> //changed in 13.0
> $admtext['savereturn'] = "Salvar + Permanecer";
> $admtext['saveback'] = "Salvar + Salir";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Todos los ítems fueron borrados satisfactoriamente.";
> $admtext['private'] = "Privado";
> $admtext['imgtags'] = "Etiqueta de la Imagen";
> 
> $admtext['removelink'] = "Quitar Enlace";
> $admtext['eloptions'] = "Explorar o Eliminar";
> $admtext['pleaseenter'] = "Por favor, ingrese un ";
> 
> $admtext['nolinks'] = "Todavía no existen enlaces";
> $admtext['nogeocode'] = "no se pudo hacer geocode";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Elegir<br/>foto<br/>por defecto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Tipos de Eventos Personalizados";
> $admtext['secondary'] = "Procesos Secundarios";
> $admtext['otherevents'] = "Otros Eventos";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Tipo";
> $admtext['move'] = "Move";
> $admtext['copy'] = "Copy";
> $admtext['title2'] = "Título"; //para medios, fuentes, etc. (no para personas)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Spanish/alltext.php TNG1403/languages/Spanish/alltext.php
32c32
< $dates['AFTER'] = "Después";
---
> $dates['AFTER'] = "Después";
38c38
< $dates['Y'] = "Sí, fecha desconocida";
---
> $dates['Y'] = "Sí, fecha desconocida";
50,57c50,57
< $text['forgot1'] = "<strong>¿Olvidó su nombre de usuario y contraseña?</strong><br />Ingrese su dirección de e-mail abajo para que le sea enviado su nombre de usuario.";
< $text['forgot2'] = "Ingrese su e-mail arriba y su nombre de usuario abajo para regenerar su contraseña (se le enviará una contraseña temporaria).";
< $text['newpass'] = "Su nueva contraseña temporaria";
< $text['usersent'] = "Su nombre de usuario ha sido enviado a su dirección de e-mail.";
< $text['pwdsent'] = "Su nueva contraseña temporaria ha sido enviada a su dirección de e-mail.";
< $text['loginnotsent2'] = "La dirección de e-mail que ha proporcionado no coincide con ninguna de las cuentas de usuarios actualmente registradas. No se envió información.";
< $text['loginnotsent3'] = "La dirección de e-mail y el nombre de usuario que ha proporcionado no coincide con ninguna de las cuentas de usuarios registradas. No se envió información.";
< $text['logininfo'] = "Su información de acceso";
---
> $text['forgot1'] = "<strong>¿Olvidó su nombre de usuario y contraseña?</strong><br />Ingrese su dirección de e-mail abajo para que le sea enviado su nombre de usuario.";
> $text['forgot2'] = "Ingrese su e-mail arriba y su nombre de usuario abajo para regenerar su contraseña (se le enviará una contraseña temporaria).";
> $text['newpass'] = "Su nueva contraseña temporaria";
> $text['usersent'] = "Su nombre de usuario ha sido enviado a su dirección de e-mail.";
> $text['pwdsent'] = "Su nueva contraseña temporaria ha sido enviada a su dirección de e-mail.";
> $text['loginnotsent2'] = "La dirección de e-mail que ha proporcionado no coincide con ninguna de las cuentas de usuarios actualmente registradas. No se envió información.";
> $text['loginnotsent3'] = "La dirección de e-mail y el nombre de usuario que ha proporcionado no coincide con ninguna de las cuentas de usuarios registradas. No se envió información.";
> $text['logininfo'] = "Su información de acceso";
64c64
< $text['headstones'] = "Lápidas";
---
> $text['headstones'] = "Lápidas";
71,72c71,72
< $admtext['level1'] = "Dirección";
< $admtext['level2'] = "Ubicación";
---
> $admtext['level1'] = "Dirección";
> $admtext['level2'] = "Ubicación";
74c74
< $admtext['level4'] = "Municipio/Alcaldía";
---
> $admtext['level4'] = "Municipio/Alcaldía";
76c76
< $admtext['level6'] = "País";
---
> $admtext['level6'] = "País";
79c79
< $text['male'] = "Varón";
---
> $text['male'] = "Varón";
86c86
< $text['mainton'] = "El Modo Mantenimiento está Activado";
---
> $text['mainton'] = "El Modo Mantenimiento está Activado";
88d87
< //moved here in 8.0.0
90,93c89,92
< $admtext['text_private'] = "Privatizar la información del propietario";
< $admtext['confunlink'] = "¿Esta seguro que quiere desvincular este individuo como esposo en esta familia?";
< $admtext['confunlinkc'] = "¿Estás seguro que quiere desvincular este individuo como hijo en esta familia?";
< $admtext['confremchild'] = "¿Está seguro que quiere quitar este hijo de esta familia? El individuo no será borrado de la base de datos.";
---
> $admtext['text_private'] = "Privatizar la información del propietario";
> $admtext['confunlink'] = "¿Esta seguro que quiere desvincular este individuo como esposo en esta familia?";
> $admtext['confunlinkc'] = "¿Estás seguro que quiere desvincular este individuo como hijo en esta familia?";
> $admtext['confremchild'] = "¿Está seguro que quiere quitar este hijo de esta familia? El individuo no será borrado de la base de datos.";
95c94
< $admtext['yes'] = "Sí";
---
> $admtext['yes'] = "Sí";
104c103
< $admtext['TITL'] = "Título";
---
> $admtext['TITL'] = "Título";
109c108
< $admtext['SLGS'] = "Sellado de Cónyuge (LDS)";
---
> $admtext['SLGS'] = "Sellado de Cónyuge (LDS)";
111,112c110,111
< $admtext['activated'] = "Su cuenta de usuario en genealogía ha sido activada.";
< $admtext['infois'] = "Su información de acceso es la siguiente";
---
> $admtext['activated'] = "Su cuenta de usuario en genealogía ha sido activada.";
> $admtext['infois'] = "Su información de acceso es la siguiente";
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
135c128
< $text['saturday'] = "Sábado";
---
> $text['saturday'] = "Sábado";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
144,145c134,135
< $text['enteremail'] = "Por favor, escriba una dirección de e-mail válida.";
< $text['page'] = "Página";
---
> $text['enteremail'] = "Por favor, escriba una dirección de e-mail válida.";
> $text['page'] = "Página";
147,151c137,139
< $text['years'] = "años";
< 
< //added in 10.0.0
< $admtext['CONL'] = "Confirmación (LDS)";
< $admtext['INIT'] = "Iniciación (LDS)";
---
> $text['years'] = "años";
> $admtext['CONL'] = "Confirmación (LDS)";
> $admtext['INIT'] = "Iniciación (LDS)";
153,156c141,142
< $text['switchm'] = "Cambio de sitio móvil";
< $text['switchs'] = "Cambio de sitio estándar";
< 
< //added in 11.0.0
---
> $text['switchm'] = "Cambio de sitio móvil";
> $text['switchs'] = "Cambio de sitio estándar";
159d144
< $text['problem'] = "Un error ocurrio en el software de TNG. Esto puede ser debido a un error en el arranque, una mejora incompleta o un bug del programa. Si Usted es el propietario del sitio, por favor contacte el soporte de TNG para ayuda con este problemap with this problema. Por favor copie la cpnsulta a continuacion y peguela en su mensaje";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
182c164
< $admtext['mrca'] = "Antepasado común mas reciente";
---
> $admtext['mrca'] = "Antepasado común mas reciente";
203,204d184
< 
< //moved here in 12.0.0
205a186,256
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "n.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "f.";  //from descend
> $text['burialabbr'] = "ent.";  //from descend
> $text['marrabbr'] = "c.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Buscar todos los individuos que registran eventos en este lugar.";
> $text['firstpage'] = "Primera Página";
> $text['lastpage'] = "Última Página";
> 
> //changed in 13.0.0
> $text['problem'] = " Un error ha ocurrido en el software de TNG. Que hacer:<p>Si usted acaba de instalar un upgrade, debe haber omitido parte de las instrucciones de instalación. Vaya  nuevamente al \"reademe page\" del upgrade y relea las instrucciones. Ponga especial atención a los pasos de la estructura de la base datos.</p><p>Si usted instalo TNG por primera vez, debe crear nuevamente las tablas de la base de datos. Regrese a la pagina readme.html para seguir este paso.</p><p>Si usted es el propietario del sitio, por favor contacte al soporte de TNG para ayuda con este problema. Por favor copie el error abajo y peguelo en su mensaje.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "No hay Ramas";
> 
> //added in 14.0
> $text['oneyear'] = "año";
> $text['pwdcodelink'] = " Haga clic en este enlace y le enviaremos una contraseña temporal";
> $text['pwdcodesent'] = " Se ha enviado un enlace a su dirección de correo electrónico para restablecer la contraseña";
> $text['moved'] = "Movido";
> $text['citation'] = "Cita";
> $text['other'] = "Otra Información";
> $text['death'] = "Fallecimiento";
> $text['burial'] = "Entierro";
> $text['cremation'] = "Incineración";
> $text['marriage'] = "Matrimonio";
> $text['divorce'] = "Divorcio";
> $text['bylength'] = "Pasos";
> $text['bymarriages'] = "Matrimonios";
> $text['none'] = "Ninguno";
> 
> $
> 
> //moved here in 14.0
> $text['family'] = "Familia";
> $text['source'] = "Fuente";
> $text['repository'] = "Repositorio";
> $text['place'] = "Lugar";
> $admtext['BAPM'] = "Bautismo";
> 
> $text['glang'] = "es";
208c259
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c261
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Spanish/cust_text.php TNG1403/languages/Spanish/cust_text.php
5,6d4
< //Ponga sus propios mensajes personalizados aquí, como este:
< //$text[messagename] = "Este es el mensaje";
diff -r TNG/languages/Spanish/text.php TNG1403/languages/Spanish/text.php
69d68
< 		$text['general'] = "General";
77a77
> 	case "connections":
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Search for connections";
> 		$text['findrel2'] = "Buscar Parentesco";
> 		$text['makeme2nd'] = "Use my ID";
> 		$text['usebookmarks'] = "Use bookmarks";
> 		$text['select2inds'] = "Por favor, seleccionar dos individuos.";
> 		$text['indinfofor'] = "Información individual para";
> 		$text['nobookmarks'] = "There is no bookmark to use";
> 		$text['bkmtitle'] = "Persons found in bookmarks";
> 		$text['bkminfo'] = "Select a person:";
> 		$text['sortpathsby'] = "Sort paths by number of";
> 		$text['sortbyshort'] = "Sort by";
> 		$text['bylengthshort'] = "Length";
> 		$text['badID1'] = ": bad person1 ID - please go back and correct";
> 		$text['badID2'] = ": bad person2 ID - please go back and correct";
> 		$text['notintree'] = ": the person with this ID is not in the current tree database.";
> 		$text['sameperson'] = "Los dos individuos son la misma persona.";;
> 		$text['nopaths'] = "These persons are not connected.";
> 		$text['nopaths1'] = "No more connections shorter than xxx";
> 		$text['nopaths2'] = "in xxx search steps";
> 		$text['longestpath'] = "(longest path checked so far was xxx steps long)";
> 		$text['relevantpaths'] = "The number of different relevant paths found: xxx";
> 		$text['skipMarr'] = "(in addition, the number of paths found but not displayed due to too many marriages was: xxx)";
> 		$text['mjaor'] = "or";
> 		$text['connectionsto'] = "Connections to ";
> 		$text['findanotherpers'] = "Find another person...";
> 		$text['sometimes'] = "(Tenga en cuenta que el cambio del número de generaciones puede producir resultados diversos.)";
> 		$text['anotherpath'] = "Search for other connections";
> 		$text['xpath'] = "Path ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Parent";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "her daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "father";
> 		$text['hmother'] = "mother";
> 		$text['hhusband'] = "husband";
> 		$text['hwife'] = "wife";
> 		$text['hson'] = "son";
> 		$text['hdaughter'] = "daughter";
> 		$text['maxruns'] = "Max number of paths to be checked";
> 		$text['maxrshort'] = "Max paths";
> 		$text['maxlength'] = "Connection paths no longer than";
> 		$text['maxlshort'] = "Max length";
> 		$text['xstep'] = "step";
> 		$text['xsteps'] = "steps";
> 		$text['xmarriages'] = "xxx marriages";
> 		$text['xmarriage'] = "1 marriage";
> 		$text['showspouses'] = "Show both spouses";
> 		$text['showTxt'] = "Show textual path description";
> 		$text['showTxtshort'] = "Textual desc.";
> 		$text['compactBox'] = "Show person boxes compacted";
> 		$text['compactBoxshort'] = "Compact boxes";
> 		$text['paths'] = "Paths";
> 		$text['dospouses2'] = "Mostrar Cónyuges";
> 		$text['maxmopt'] = "Maximo de matrimonios por conexión";
> 		$text['maxm'] = "Maximo de matrimonios";
> 		$text['arerelated'] = "Estas personas son familiares - su relación se muestra en el paso 1";
> 		$text['simplerel'] = "Busqueda simple de relaciones";
196d264
< 		$text['scrollnote'] = "Notas: Es posible que tenga que desplazarse hacia abajo o hacia la derecha para ver el cuadro.";
199d266
< 		$text['popupnote2'] = " = Nuevo árbol";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tables";
> 		$text['dtchildren'] = "Children";
> 		$text['dtgrandchildren'] = "Grandchildren";
> 		$text['dtggrandchildren'] = "Great grandchildren";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "No descendants";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Select";
> 		$text['dteachfulltable'] = "Each full table will have";
> 		$text['dtrows'] = "rows";
> 		$text['dtdisplayingtable'] = "Displaying table";
> 		$text['dtgototable'] = "Go to table:";
> 		$text['fcinstrdn'] = "Show family with spouse";
> 		$text['fcinstrup'] = "Show family with parents";
> 		$text['fcinstrplus'] = "Select other spouses";
> 		$text['fcinstrfam'] = "Select other parents";
381,383c467
< 		$text['firstpage'] = "Primera Página";
< 		$text['lastpage'] = "Última Página";
< 		$text['photoowner'] = "Propietario/Fuente";
---
> 		$text['photoowner'] = "Propietario del original";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Alternar Etiquetas";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "New password again";
> 		$text['resetsuccess'] = "Success: Password has been reset";
> 		$text['resetfail'] = "Failure: Password not reset";
> 		$text['failreason0'] = " (unknown database error)";
> 		$text['failreason2'] = " (you don't have permission to change your password)";
> 		$text['failreason3'] = " (passwords did not match)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total Source Citations";
618d710
< 		$text['loginfirst'] = "Usted debe primero ingresar.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Records de usuarios detectados. Para seguir, debe entrar primero o quitar todos los récords de la tabla de usuarios.";
629,630d722
< 		$text['zoomin'] = "Acercar";
< 		$text['zoomout'] = "Alejar";
656d747
< 		$text['dna_info_head'] = "Informacion del Test DNA";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "n.";
< $text['chrabbr'] = "c.";
675d788
< $text['family'] = "Familia"; //from getperson
685d797
< $text['deathabbr'] = "f.";  //from descend
706d817
< $text['burialabbr'] = "ent.";  //from descend
712d822
< $text['place'] = "Lugar";
715d824
< $text['marrabbr'] = "c.";
738d846
< $text['source'] = "Fuente";
766d873
< $text['repository'] = "Repositorio";
770d876
< $text['findplaces'] = "Buscar todos los individuos que registran eventos en este lugar.";
804d909
< $text['glang'] = "&amp;hl=es";
816d920
< $text['none'] = "Ninguno";
924d1027
< $text['otherevents'] = "Otros Eventos";
952,953d1054
< $text['people_have'] = "personas han vinculado una prueba de ADN a";
< $text['person_has'] = "persona ha vinculado un testDNA a";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Enlaces rápidos";
> $text['yourname'] = "Tu nombre";
> $text['youremail'] = "Su dirección de correo electrónico";
> $text['liketoadd'] = "Cualquier información que desee agregar";
> $text['webmastermsg'] = "Mensaje de webmaster";
> $text['gallery'] = "Ver galería";
> $text['wasborn_male'] = "nació";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "nació"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "fue bautizado";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "fue bautizada";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "falleció";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "falleció";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "fue sepultado"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "fue sepultada"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "fue incinerado";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "fue incinerada";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "se casó con";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "se casó con";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "se divorció";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "se divorció";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " en ";			// used as a preposition to the location
> $text['onthisdate'] = " el ";		// when used with full date
> $text['inthisyear'] = " en ";		// when used with year only or month / year dates
> $text['and'] = "and ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informacion del Test DNA";
> //added in 13.0
> $text['visitor'] = "Visitantes";
> 
> $text['popupnote2'] = " = Nuevo árbol";
> 
> //moved here in 14.0
> $text['zoomin'] = "Acercar";
> $text['zoomout'] = "Alejar";
> $text['scrollnote'] = "Arrastre o baje para ver toda la tabla";
> $text['general'] = "General";
> 
> //changed in 14.0
> $text['otherevents'] = "Otros Eventos";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connections";
> $text['continue'] = "Continue";
> $text['title2'] = "Título"; //para medios, fuentes, etc. (no para personas)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Spanish-UTF8/admintext.php TNG1403/languages/Spanish-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Por favor, ingrese un ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Por favor, seleccione un archivo para importar.";
> 		$admtext['addreplacedata'] = "Añadir o reemplazar su genealogía (puede tardar varios minutos, dependiendo del tamaño del archivo)";
> 		$admtext['fromyourcomputer'] = "Desde su PC";
> 		$admtext['importdata'] = "Importar Datos";
> 		$admtext['replace'] = "Reemplazar (en árbol seleccionado)";
> 		$admtext['desttree'] = "Arbol de destino";
> 		$admtext['selectdesttree'] = "Por favor, seleccione o ingrese un árbol de destino.";
> 		$admtext['selectexisting'] = "Importar a";
> 		$admtext['ucaselast'] = "Todos los apellidos en mayúsculas";
> 		$admtext['norecalc'] = "No re-calcular marcas de individuos vivos";
> 		$admtext['autooffset'] = "Comenzar IDs con el primer número disponible";
> 		$admtext['mustselecttree'] = "Debe seleccionar un árbol antes de poder utilizar esta opción.";
> 		$admtext['onwebserver'] = "Desde el sitio web (en la carpeta GEDCOM)";
> 		$admtext['imphints'] = "Consejos: Todos los Datos Actuales significa todas las personas, familias, fuentes y notas (los medios asociados no se pierden siempre que los ID permanezcan iguales). Las coincidencias se basan siempre sólo en los ID. Los registros nuevos son siempre añadidos. Adjuntar importa todos los registros con nuevo ID.";
> 		$admtext['destbranch'] = "Rama de Destino (opcional)";
> 		$admtext['importlatlong'] = "Importar datos de Latitud / longitud si existe";
> 		$admtext['opening'] = "Abriendo";
> 		$admtext['reopen'] = "Reabriendo";
> 		$admtext['uploading'] = "Cargando";
> 		$admtext['stop'] = "Detener";
> 		$admtext['stopped'] = "Importación interrumpida";
> 		$admtext['resume'] = "Clic aquí para reanudar";
> 		$admtext['neweronly'] = "Reemplazar sólo si es nuevo";
> 		$admtext['oldimport'] = "Importar al viejo estilo (sin barra de progreso)";
> 		$admtext['importgedcom'] = "Importe archivo GEDCOM (puede estar comprimido)";
> 		$admtext['stopbackup'] = "Pare! Es una buena idea hacer copia de sus datos actuales antes de proceder.";
> 		$admtext['importmedia'] = "Importar medio, si existe";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Make sure the Prefixes and Suffixes (General Settings) are correct for this file.";
> 		$admtext['chkimpsettings'] = "Check the Import Settings for more options.";
> 		$admtext['eventsonly'] = "Importar Sólo Tipo de Eventos Personalizados (sin datos añadidos, reemplazados o adjuntos)";
> 		$admtext['allevents'] = "Aceptar datos para todo nuevo Tipo de Evento personalizado";
> 		$admtext['finishingimporting'] = "Finishing...";
> 		$admtext['fileuploadfailed'] = "File upload failed. Could mean file is too large. Try using FTP to upload the file to your GEDCOM folder, then select and import from there.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Editar Tipo de Evento Existente";
135,138d168
< 		$admtext['entertypedesc'] = "Por favor, ingrese tipo/descripción para este nuevo tipo de evento.";
< 		$admtext['enterdisplay'] = "Por favor, escriba un texto de pantalla para este nuevo tipo de evento.";
< 		$admtext['existingeventtypeinfo'] = "Información de Tipo de Evento Existente";
< 		$admtext['neweventtypeinfo'] = "Información de Nuevo Tipo de Evento";
145,146d174
< 		$admtext['addnewevtype'] = "Añadir Nuevo Tipo de Evento";
< 		$admtext['createnewevtype'] = "Crear registro de nuevo tipo de evento";
149,150d176
< 		$admtext['existingevtypes'] = "Tipos de Eventos Existentes";
< 		$admtext['edsevtypes'] = "Editar, borrar u ordenar tipos de eventos previamente añadidos";
152d177
< 		$admtext['confdeleteevtype'] = "¿Está seguro que quiere borrar este tipo de evento?";
154d178
< 		$admtext['selectentertag'] = "Por favor, seleccione o ingrese la etiqueta para este tipo de evento.";
208d231
< 		$admtext['changestoallevtypes'] = "Cambios a todos los tipos de evento";
214d236
< 		$admtext['BAPM'] = "Bautismo";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Esta seguro que quiere eliminar este tipo de evento? Todos los eventos de este  tipo serán eliminados.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Añadir Nuevo Tipo de Evento";
> 		$admtext['createnewevtype'] = "Crear registro de nuevo tipo de evento";
> 		$admtext['modifyeventtype'] = "Editar Tipo de Evento Existente";
> 		$admtext['entertypedesc'] = "Por favor, ingrese tipo/descripción para este nuevo tipo de evento.";
> 		$admtext['enterdisplay'] = "Por favor, escriba un texto de pantalla para este nuevo tipo de evento.";
> 		$admtext['existingeventtypeinfo'] = "Información de Tipo de Evento Existente";
> 		$admtext['neweventtypeinfo'] = "Información de Nuevo Tipo de Evento";
> 		$admtext['existingevtypes'] = "Tipos de Eventos Existentes";
> 		$admtext['edsevtypes'] = "Editar, borrar u ordenar tipos de eventos previamente añadidos";
> 		$admtext['selectentertag'] = "Por favor, seleccione o ingrese la etiqueta para este tipo de evento.";
> 		$admtext['changestoallevtypes'] = "Cambios a todos los tipos de evento";
268d303
< 		$admtext['nobirthinfo'] = "Sin información de nacimiento";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Elegir<br/>foto<br/>por defecto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Salvar + Nuevo Padre";
> 		$admtext['savenewspouse'] = "Salvar + Nueva Esposa";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Birth";
354d391
< 		$admtext['enterphotodesc'] = "Por favor, ingrese una descripción de la imagen.";
388d424
< 		$admtext['photoowner'] = "Propietario/Fuente";
417d452
< 		$admtext['imgmap'] = "Mapa de Imagen";
490d524
< 		$admtext['mapinstr3'] = "Para vincular un región de esta foto a un individuo específico, seleccione el árbol del individuo, defina la forma y las dimensiones de la región y luego haga Clic en el centro de la región correspondiente en la foto. Una ventana emergente le ayudará a seleccionar el individuo. Después de realizar la selección, el código del mapa de imagen se añadirá en el box de abajo. Repita este procedimiento cada vez que sea necesario para las regiones adicionales.";
495d528
< 		$admtext['removelink'] = "Quitar Enlace";
502d534
< 		$admtext['eloptions'] = "Explorar o Eliminar";
509d540
< 		$admtext['nolinks'] = "Todavía no existen enlaces";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "Mapa de la Imagen HTML (para compatibilidad con versiones anteriores)";
> 		$admtext['photoowner'] = "Propietario del original";
> 		$admtext['nothumb'] = "No hay miniatura";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "The item could not be added, most likely because the file was too large and could not be uploaded or used to make a thumbnail.";
> 		$admtext['moved'] = "Moved";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Por favor, ingrese una descripción de la imagen.";
> 		$admtext['mapinstr3'] = "Para enlazar la región de esta foto a un individuo, primero seleccione el árbol del individuo, después cree un rectángulo para la region deseada. Esto se hace dando click en la parte superior izquierda de la región y luego arrastrándolo a a la esquina inferior derecha. Alternativamente, usted puede hacer click en la esquina superior izquierda y después click en la esquina inferior derecha. Una ventana de dialogo lo ayudara a seleccionar el individuo. Haga su selección, después repita el proceso para cada región que necesite. Haga click en una región existente para seleccionarla, después arrástrela para moverla o haga click en 'X' para borrarla.";
596d633
< 		$admtext['foremptystring'] = "Para una cadena vacía, deje este campo en blanco y haga Clic en \"Añadir »»\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instructions: Drag or double-click items at left into lists at right. Drag up and down to re-order. Double-click again to remove.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "Para una cadena vacía, deje este campo en blanco y haga Clic en \"Añadir »»\"";
651,655d690
< 		$admtext['selectimportfile'] = "Por favor, seleccione un archivo para importar.";
< 		$admtext['importgedcom'] = "Importar GEDCOM (formato 5.5 estándar)";
< 		$admtext['addreplacedata'] = "Añadir o reemplazar su genealogía (puede tardar varios minutos, dependiendo del tamaño del archivo)";
< 		$admtext['fromyourcomputer'] = "Desde su PC";
< 		$admtext['importdata'] = "Importar Datos";
657,660d691
< 		$admtext['replace'] = "Reemplazar (en árbol seleccionado)";
< 		$admtext['desttree'] = "Arbol de destino";
< 		$admtext['selectdesttree'] = "Por favor, seleccione o ingrese un árbol de destino.";
< 		$admtext['selectexisting'] = "Importar a";
668,673d698
< 		$admtext['ucaselast'] = "Todos los apellidos en mayúsculas";
< 		$admtext['norecalc'] = "No re-calcular marcas de individuos vivos";
< 		$admtext['autooffset'] = "Comenzar IDs con el primer número disponible";
< 
< 		$admtext['mustselecttree'] = "Debe seleccionar un árbol antes de poder utilizar esta opción.";
< 		$admtext['importmedia'] = "Importar medio, si existe";
675d699
< 		$admtext['neweronly'] = "Reemplazar sólo si es nuevo";
677,692d700
< 		$admtext['onwebserver'] = "Desde el sitio web (en la carpeta GEDCOM)";
< 		$admtext['eventsonly'] = "Importar Sólo Tipo de Eventos Personalizados (sin datos añadidos, reemplazados o adjuntos)";
< 		$admtext['imphints'] = "Consejos: Todos los Datos Actuales significa todas las personas, familias, fuentes y notas (los medios asociados no se pierden siempre que los ID permanezcan iguales). Las coincidencias se basan siempre sólo en los ID. Los registros nuevos son siempre añadidos. Adjuntar importa todos los registros con nuevo ID.";
< 		$admtext['allevents'] = "Aceptar datos para todo nuevo Tipo de Evento personalizado";
< 		$admtext['destbranch'] = "Rama de Destino (opcional)";
< 		$admtext['inframe'] = "(en cuadro)";
< 		$admtext['getstart'] = "Comenzando";
< 		$admtext['importlatlong'] = "Importar datos de Latitud / longitud si existe";
< 		$admtext['opening'] = "Abriendo";
< 		$admtext['reopen'] = "Reabriendo";
< 		$admtext['uploading'] = "Cargando";
< 		$admtext['stop'] = "Detener";
< 		$admtext['stopped'] = "Importación interrumpida";
< 		$admtext['resume'] = "Clic aquí para reanudar";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Registro de cambios";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Importar al viejo estilo (sin barra de progreso)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Upgrade";
> 		$admtext['need_upgrade'] = "Finish these upgrade instructions";
> 		$admtext['upgrade_missing'] = "The upgrade file seems to be missing, so you might be done already.";
> 		$admtext['delete_upgrade'] = "When you're finished, click here to delete the upgrade file and return to the menu.";
723d733
< 		$admtext['author'] = "Autor";
804,809c814,819
< 		$admtext['momside'] = "Etiqueta del Lado de la Madre"; //8
< 		$admtext['dadside'] = "Etiqueta del Lado del Padre"; //8
< 		$admtext['momperson'] = "ID persona del Lado de la Madre"; //8
< 		$admtext['momtree'] = "ID árbol del Lado de la Madre"; //8
< 		$admtext['dadperson'] = "ID persona del Lado del Padre"; //8
< 		$admtext['dadtree'] = "ID árbol del Lado del Padre"; //8
---
> 		$admtext['momside'] = "Etiqueta del Lado de la Madre"; //8, 20
> 		$admtext['dadside'] = "Etiqueta del Lado del Padre"; //8, 20
> 		$admtext['momperson'] = "ID persona del Lado de la Madre"; //8, 20
> 		$admtext['momtree'] = "ID árbol del Lado de la Madre"; //8, 20
> 		$admtext['dadperson'] = "ID persona del Lado del Padre"; //8, 20
> 		$admtext['dadtree'] = "ID árbol del Lado del Padre"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Encabezado de comillas";
> 		$admtext['quotesubhead'] = "Subtítulo de citas";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Nombre de la función";
> 		$admtext['snipinfoone'] = "Featurette primera línea";
> 		$admtext['snipinfotwo'] = "Featurette segunda línea";
> 		$admtext['snipimage'] = "Imagen destacada";
> 		$admtext['snipperson'] = "ID de persona de Featurette";
> 		$admtext['sniptree'] = "ID del árbol de características";
> 		$admtext['quote'] = "Cita";
> 		$admtext['link'] = "Enlace";
> 		$admtext['featuretitle7'] = "Caracteristica del titulo 7";
> 		$admtext['featuretitle8'] = "Caracteristica del titulo 8";
> 		$admtext['featuretitle9'] = "Caracteristica del titulo 9";
> 		$admtext['featurethumb9'] = "Caracteristica del la minitura 9"; //15
> 		$admtext['featurelink9'] = "Caracteristica del enlace 9"; //15
> 		$admtext['featurepara9'] = "Caracteristica del paragrafo 9"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Encabezado de la Imagen Izquierda";
> 		$admtext['rightimg'] = "Encabezado de la Imagen Derecha";
> 		$admtext['photoption'] = "Opciones de la Foto son<br />&nbsp;&nbsp;(estática o aleatoria)";
> 		$admtext['randomphotowidth'] = "Ancho de la Foto Aleatoria";
> 		$admtext['randomphotoheight'] = "Alto de la Foto Alatoria";
> 		$admtext['randomphotomediatypeID'] = "Colección de Fotos al Azar";
> 		$admtext['momheading'] = "Encabezamiento de la Familia Materna";
> 		$admtext['mompara'] = "Parrafo de la Familia Materna";
> 		$admtext['mompagelink'] = "Enlace de la Pagina de la Familia Materna";
> 		$admtext['dadheading'] = "Encabezamiento de la Familia Paterna";
> 		$admtext['dadpara'] = "Parrafo de la Familia Paterna";
> 		$admtext['dadpagelink'] = "Enlace de la Pagina de la Familia Paterna";
> 		$admtext['spmomheading'] = "Encabezamiento de la Familia Materna del Conyuge";
> 		$admtext['spmompara'] = "Parrafo de la Familia Materna del Cónyuge";
> 		$admtext['spmompagelink'] = "Enlace de la Pagina de la Familia Materna del Cónyuge";
> 		$admtext['spmomside'] = "Etiqueta del lado Materno del Cónyuge";
> 		$admtext['spdadside'] = "Lado Paterno del Cónyuge";
> 		$admtext['spmomperson'] = "personID lado Materno del Cónyuge";
> 		$admtext['spmomtree'] = "treeID lado Materno del Conyuge";
> 		$admtext['spdadheading'] = "Encabezamiento de la Famila Paterna del Cónyuge";
> 		$admtext['spdadpara'] = "Parrafo de la Familia Paterna del Conyuge";
> 		$admtext['spdadpagelink'] = "Enlace de la Pagina de la Familia Paterna del Conyuge";
> 		$admtext['spdadperson'] = "personID lado Paterno del Cónyuge";
> 		$admtext['spdadtree'] = "treeID lado Paterno del Cónyuge";
> 		$admtext['storiesheading'] = "Nuestras Historias Familiares";
> 		$admtext['nbrsurnames'] = "Numero de Apellidos<br />&nbsp;&nbsp; en la Nube de Apellidos";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Caracteristica del paragrafo";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
910c1003
< 		$admtext['phpreq'] = "(TNG requiere la versión 5.3 o superior.)";
---
> 		$admtext['phpreq'] = "(TNG requiere la versión 7.0 o superior.)";
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = " Cambie los prefijos existentes para que coincidan con la configuración de TNG";
> 		$admtext['sortevents'] = "Ordenar eventos por";
> 		$admtext['sortbydate'] = "Fecha del Evento";
> 		$admtext['sortbytype'] = "Tipo de Evento";
> 		$admtext['allowsuggest'] = "Permita sugerencias de los visitantes";
> 		$admtext['livingchecked'] = "Living flag para personas y familias nuevas";
> 		$admtext['maxmarried'] = "Marque como familia si esta casada menos<br/>de estos años";
> 		$admtext['imagetags'] = "Rectangulos";
> 		$admtext['allowcsv'] = "Permite bajar reportes tipo CSV";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup options";
> 		$admtext['dosql'] = "Export as SQL";
> 		$admtext['dodrop'] = "Include DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Include CREATE TABLE";
> 		$admtext['onrestore'] = "Restore options";
> 		$admtext['dodel'] = "Delete previous content first";
> 		$admtext['download'] = "Download";
> 		$admtext['altbirthtypes'] = "Alternate birth events";
> 		$admtext['dtformat'] = "Tables Format";
> 		$admtext['conchart'] = "Connections Chart";
> 		$admtext['maxropt'] = "Max number of connection search runs";
> 		$admtext['maxlopt'] = "Max length of connection paths";
> 		$admtext['showtxtopt'] = "Display textual path statement";
> 		$admtext['compactboxopt'] = "Show person boxes in compact form";
> 		$admtext['sortbyopt'] = "Sort paths by";
> 		$admtext['anchoridopt'] = "Anchor ID";
> 		$admtext['maxmopt'] = "Max marriages in connection";
> 		$admtext['saveincfg'] = "Store in config path (see General Settings)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "no se pudo hacer geocode";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "No geocodifique";
1436d1549
< 		$admtext['backtosecondary'] = "Volver a procesos secundarios";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Volver a procesos secundarios";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Excluya notas";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zip and include media files";
> 		$admtext['downloadzip'] = "Download ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Mostrar solo usuarios deshabilitados";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Also send to admins when a single tree is selected";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Todos los Mods";
> 		$admtext['installedmods'] = "Sólo mods instalados";
> 		$admtext['partinstmods'] = "Mods instalados + parcialmente instalados";
> 		$admtext['showanalyzeractions'] = "Mostrar acciones en el analizador de mods";
> 		$admtext['badchar'] = "Caracter invalido";
1886d2008
< 		$admtext['test_number'] = "Prueba Numero";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Prueba Numero";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Vincular este test de ADN  a una persona";
1965d2095
< $admtext['otherevents'] = "Otros Eventos";
2050,2051d2179
< $admtext['savereturn'] = "Volver a esta página";
< $admtext['saveback'] = "Volver al menú";
2058,2059d2185
< $admtext['secondary'] = "Procesos Secundarios";
< $admtext['commas'] = "Separar entradas múltiples con comas";
2101c2227
< $admtext['nobranch'] = "Ninguna Rama";
---
> $admtext['nobranch'] = "No hay Ramas";
2129,2130d2254
< $admtext['secondarymaint'] = "Procesos Secundarios";
< $admtext['customeventtypes'] = "Tipos de Eventos Personalizados";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Tipo";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Surnames";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Imagen";
> $admtext['author'] = "Autor";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Comenzando";
> $admtext['showlog'] = "Registro de cambios";
> $admtext['nobirthinfo'] = "Sin información de nacimiento";
> //changed in 13.0
> $admtext['savereturn'] = "Salvar + Permanecer";
> $admtext['saveback'] = "Salvar + Salir";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Todos los ítems fueron borrados satisfactoriamente.";
> $admtext['private'] = "Privado";
> $admtext['imgtags'] = "Etiqueta de la Imagen";
> 
> $admtext['removelink'] = "Quitar Enlace";
> $admtext['eloptions'] = "Explorar o Eliminar";
> $admtext['pleaseenter'] = "Por favor, ingrese un ";
> 
> $admtext['nolinks'] = "Todavía no existen enlaces";
> $admtext['nogeocode'] = "no se pudo hacer geocode";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Elegir<br/>foto<br/>por defecto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Tipos de Eventos Personalizados";
> $admtext['secondary'] = "Procesos Secundarios";
> $admtext['otherevents'] = "Otros Eventos";
> //added in 14.0
> $admtext['newlinks'] = "Links created";
> $admtext['newcemlinks'] = "Cemetery links created";
> $admtext['utility'] = "Utility";
> $admtext['linktype'] = "Tipo";
> $admtext['move'] = "Move";
> $admtext['copy'] = "Copy";
> $admtext['title2'] = "Título"; //para medios, fuentes, etc. (no para personas)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Spanish-UTF8/alltext.php TNG1403/languages/Spanish-UTF8/alltext.php
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Un error ocurrio en el software de TNG. Esto puede ser debido a un error en el arranque, una mejora incompleta o un bug del programa. Si Usted es el propietario del sitio, por favor contacte el soporte de TNG para ayuda con este problemap with this problema. Por favor copie la cpnsulta a continuacion y peguela en su mensaje";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "n.";
> $text['chrabbr'] = "c.";
> $text['deathabbr'] = "f.";  //from descend
> $text['burialabbr'] = "ent.";  //from descend
> $text['marrabbr'] = "c.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Buscar todos los individuos que registran eventos en este lugar.";
> $text['firstpage'] = "Primera Página";
> $text['lastpage'] = "Última Página";
> 
> //changed in 13.0.0
> $text['problem'] = " Un error ha ocurrido en el software de TNG. Que hacer:<p>Si usted acaba de instalar un upgrade, debe haber omitido parte de las instrucciones de instalación. Vaya  nuevamente al \"reademe page\" del upgrade y relea las instrucciones. Ponga especial atención a los pasos de la estructura de la base datos.</p><p>Si usted instalo TNG por primera vez, debe crear nuevamente las tablas de la base de datos. Regrese a la pagina readme.html para seguir este paso.</p><p>Si usted es el propietario del sitio, por favor contacte al soporte de TNG para ayuda con este problema. Por favor copie el error abajo y peguelo en su mensaje.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "No hay Ramas";
> 
> //added in 14.0
> $text['oneyear'] = "año";
> $text['pwdcodelink'] = " Haga clic en este enlace y le enviaremos una contraseña temporal";
> $text['pwdcodesent'] = " Se ha enviado un enlace a su dirección de correo electrónico para restablecer la contraseña";
> $text['moved'] = "Movido";
> $text['citation'] = "Cita";
> $text['other'] = "Otra Información";
> $text['death'] = "Fallecimiento";
> $text['burial'] = "Entierro";
> $text['cremation'] = "Incineración";
> $text['marriage'] = "Matrimonio";
> $text['divorce'] = "Divorcio";
> $text['bylength'] = "Pasos";
> $text['bymarriages'] = "Matrimonios";
> $text['none'] = "Ninguno";
> 
> //moved here in 14.0
> $text['family'] = "Familia";
> $text['source'] = "Fuente";
> $text['repository'] = "Repositorio";
> $text['place'] = "Lugar";
> $admtext['BAPM'] = "Bautismo";
> 
> $text['glang'] = "es";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
diff -r TNG/languages/Spanish-UTF8/cust_text.php TNG1403/languages/Spanish-UTF8/cust_text.php
5,6d4
< //Ponga sus propios mensajes personalizados aquí, como este:
< //$text[messagename] = "Este es el mensaje";
diff -r TNG/languages/Spanish-UTF8/text.php TNG1403/languages/Spanish-UTF8/text.php
69d68
< 		$text['general'] = "General";
77a77
> 	case "connections":
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Search for connections";
> 		$text['findrel2'] = "Buscar Parentesco";
> 		$text['makeme2nd'] = "Use my ID";
> 		$text['usebookmarks'] = "Use bookmarks";
> 		$text['select2inds'] = "Por favor, seleccionar dos individuos.";
> 		$text['indinfofor'] = "Información individual para";
> 		$text['nobookmarks'] = "There is no bookmark to use";
> 		$text['bkmtitle'] = "Persons found in bookmarks";
> 		$text['bkminfo'] = "Select a person:";
> 		$text['sortpathsby'] = "Sort paths by number of";
> 		$text['sortbyshort'] = "Sort by";
> 		$text['bylengthshort'] = "Length";
> 		$text['badID1'] = ": bad person1 ID - please go back and correct";
> 		$text['badID2'] = ": bad person2 ID - please go back and correct";
> 		$text['notintree'] = ": the person with this ID is not in the current tree database.";
> 		$text['sameperson'] = "Los dos individuos son la misma persona.";;
> 		$text['nopaths'] = "These persons are not connected.";
> 		$text['nopaths1'] = "No more connections shorter than xxx";
> 		$text['nopaths2'] = "in xxx search steps";
> 		$text['longestpath'] = "(longest path checked so far was xxx steps long)";
> 		$text['relevantpaths'] = "The number of different relevant paths found: xxx";
> 		$text['skipMarr'] = "(in addition, the number of paths found but not displayed due to too many marriages was: xxx)";
> 		$text['mjaor'] = "or";
> 		$text['connectionsto'] = "Connections to ";
> 		$text['findanotherpers'] = "Find another person...";
> 		$text['sometimes'] = "(Tenga en cuenta que el cambio del número de generaciones puede producir resultados diversos.)";
> 		$text['anotherpath'] = "Search for other connections";
> 		$text['xpath'] = "Path ";
> 		$text['primary'] = "Start Person"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "End Person";
> 		$text['parent'] = "Parent";
> 		$text['mhfather'] = "his father";
> 		$text['mhmother'] = "his mother";
> 		$text['mhhusband'] = "his husband";
> 		$text['mhwife'] = "his wife";
> 		$text['mhson'] = "his son";
> 		$text['mhdaughter'] = "her daughter";
> 		$text['fhfather'] = "her father";
> 		$text['fhmother'] = "her mother";
> 		$text['fhhusband'] = "her husband";
> 		$text['fhwife'] = "her wife";
> 		$text['fhson'] = "her son";
> 		$text['fhdaughter'] = "her daughter";
> 		$text['hfather'] = "father";
> 		$text['hmother'] = "mother";
> 		$text['hhusband'] = "husband";
> 		$text['hwife'] = "wife";
> 		$text['hson'] = "son";
> 		$text['hdaughter'] = "daughter";
> 		$text['maxruns'] = "Max number of paths to be checked";
> 		$text['maxrshort'] = "Max paths";
> 		$text['maxlength'] = "Connection paths no longer than";
> 		$text['maxlshort'] = "Max length";
> 		$text['xstep'] = "step";
> 		$text['xsteps'] = "steps";
> 		$text['xmarriages'] = "xxx marriages";
> 		$text['xmarriage'] = "1 marriage";
> 		$text['showspouses'] = "Show both spouses";
> 		$text['showTxt'] = "Show textual path description";
> 		$text['showTxtshort'] = "Textual desc.";
> 		$text['compactBox'] = "Show person boxes compacted";
> 		$text['compactBoxshort'] = "Compact boxes";
> 		$text['paths'] = "Paths";
> 		$text['dospouses2'] = "Mostrar Cónyuges";
> 		$text['maxmopt'] = "Maximo de matrimonios por conexión";
> 		$text['maxm'] = "Maximo de matrimonios";
> 		$text['arerelated'] = "Estas personas son familiares - su relación se muestra en el paso 1";
> 		$text['simplerel'] = "Busqueda simple de relaciones";
196d264
< 		$text['scrollnote'] = "Notas: Es posible que tenga que desplazarse hacia abajo o hacia la derecha para ver el cuadro.";
199d266
< 		$text['popupnote2'] = " = Nuevo árbol";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tables";
> 		$text['dtchildren'] = "Children";
> 		$text['dtgrandchildren'] = "Grandchildren";
> 		$text['dtggrandchildren'] = "Great grandchildren";
> 		$text['dtgggrandchildren'] = "Great grandchildren"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "0"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "No descendants";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Total";
> 		$text['dtselect'] = "Select";
> 		$text['dteachfulltable'] = "Each full table will have";
> 		$text['dtrows'] = "rows";
> 		$text['dtdisplayingtable'] = "Displaying table";
> 		$text['dtgototable'] = "Go to table:";
> 		$text['fcinstrdn'] = "Show family with spouse";
> 		$text['fcinstrup'] = "Show family with parents";
> 		$text['fcinstrplus'] = "Select other spouses";
> 		$text['fcinstrfam'] = "Select other parents";
381,383c467
< 		$text['firstpage'] = "Primera Página";
< 		$text['lastpage'] = "Última Página";
< 		$text['photoowner'] = "Propietario/Fuente";
---
> 		$text['photoowner'] = "Propietario del original";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Alternar Etiquetas";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "New password again";
> 		$text['resetsuccess'] = "Success: Password has been reset";
> 		$text['resetfail'] = "Failure: Password not reset";
> 		$text['failreason0'] = " (unknown database error)";
> 		$text['failreason2'] = " (you don't have permission to change your password)";
> 		$text['failreason3'] = " (passwords did not match)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Total Source Citations";
618d710
< 		$text['loginfirst'] = "Usted debe primero ingresar.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Records de usuarios detectados. Para seguir, debe entrar primero o quitar todos los récords de la tabla de usuarios.";
629,630d722
< 		$text['zoomin'] = "Acercar";
< 		$text['zoomout'] = "Alejar";
656d747
< 		$text['dna_info_head'] = "Informacion del Test DNA";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "n.";
< $text['chrabbr'] = "c.";
675d788
< $text['family'] = "Familia"; //from getperson
685d797
< $text['deathabbr'] = "f.";  //from descend
706d817
< $text['burialabbr'] = "ent.";  //from descend
712d822
< $text['place'] = "Lugar";
715d824
< $text['marrabbr'] = "c.";
738d846
< $text['source'] = "Fuente";
766d873
< $text['repository'] = "Repositorio";
770d876
< $text['findplaces'] = "Buscar todos los individuos que registran eventos en este lugar.";
804d909
< $text['glang'] = "&amp;hl=es";
816d920
< $text['none'] = "Ninguno";
924d1027
< $text['otherevents'] = "Otros Eventos";
952,953d1054
< $text['people_have'] = "personas han vinculado una prueba de ADN a";
< $text['person_has'] = "persona ha vinculado un testDNA a";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Enlaces rápidos";
> $text['yourname'] = "Tu nombre";
> $text['youremail'] = "Su dirección de correo electrónico";
> $text['liketoadd'] = "Cualquier información que desee agregar";
> $text['webmastermsg'] = "Mensaje de webmaster";
> $text['gallery'] = "Ver galería";
> $text['wasborn_male'] = "nació";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "nació"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "fue bautizado";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "fue bautizada";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "falleció";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "falleció";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "fue sepultado"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "fue sepultada"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "fue incinerado";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "fue incinerada";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "se casó con";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "se casó con";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "se divorció";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "se divorció";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " en ";			// used as a preposition to the location
> $text['onthisdate'] = " el ";		// when used with full date
> $text['inthisyear'] = " en ";		// when used with year only or month / year dates
> $text['and'] = "and ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Informacion del Test DNA";
> //added in 13.0
> $text['visitor'] = "Visitantes";
> 
> $text['popupnote2'] = " = Nuevo árbol";
> 
> //moved here in 14.0
> $text['zoomin'] = "Acercar";
> $text['zoomout'] = "Alejar";
> $text['scrollnote'] = "Arrastre o baje para ver toda la tabla";
> $text['general'] = "General";
> 
> //changed in 14.0
> $text['otherevents'] = "Otros Eventos";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Connections";
> $text['continue'] = "Continue";
> $text['title2'] = "Título"; //para medios, fuentes, etc. (no para personas)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Swedish/admintext.php TNG1403/languages/Swedish/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Skriv in en ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Välj fil att importera.";
> 		$admtext['addreplacedata'] = "Lägg till eller ersätt i databasen (kan ta flera minuter beroende på filstorlek)";
> 		$admtext['fromyourcomputer'] = "Från din dator";
> 		$admtext['importdata'] = "Importera data";
> 		$admtext['replace'] = "Ersätt (i det valda trädet)";
> 		$admtext['desttree'] = "Träd till vilket importen ska göras";
> 		$admtext['selectdesttree'] = "Välj eller skriv in till vilket träd importen ska göras.";
> 		$admtext['selectexisting'] = "Importera till";
> 		$admtext['ucaselast'] = "Alla efternamn med VERSALER";
> 		$admtext['norecalc'] = "Gör ej ny beräkning av definionen Levande";
> 		$admtext['autooffset'] = "Starta ID vid första tillgängliga nummer";
> 		$admtext['mustselecttree'] = "Du måste välja ett träd innan du kan göra detta val.";
> 		$admtext['onwebserver'] = "På webserver (i GEDCOM-mappen)";
> 		$admtext['imphints'] = "Tips: \"All befintlig data\" betyder alla personer, familjer, källor och noteringar (media-länkar förloras ej så länge ID kvarstår). Interna länkar baseras alltid enbart på ID. Nya poster läggs alltid till.<br> \"Lägg till alla poster\" importerar alla poster med nya ID.";
> 		$admtext['destbranch'] = "Destinations-gren (valfri)";
> 		$admtext['importlatlong'] = "Importera data för latitud/longitud om det finns";
> 		$admtext['opening'] = "Öppnar";
> 		$admtext['reopen'] = "Åter-öppnar";
> 		$admtext['uploading'] = "Laddar upp";
> 		$admtext['stop'] = "Stoppa";
> 		$admtext['stopped'] = "Import stoppad";
> 		$admtext['resume'] = "Återuppta";
> 		$admtext['neweronly'] = "Ersätt endast om nyare";
> 		$admtext['oldimport'] = "Äldre import (ingen förloppsindikator)";
> 		$admtext['importgedcom'] = "Importera GEDCOM-fil (även zippad)";
> 		$admtext['stopbackup'] = "Stopp! Vi rekommenderar att du säkerhetskopierar dina nuvarande data innan du fortsätter.";
> 		$admtext['importmedia'] = "Importera media om sådant finns";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Kontrollera att  Prefix och Suffix (Allmäna Inställningar) är korrekta för denna fil.";
> 		$admtext['chkimpsettings'] = "Se inställningarna för Import för flera alternativ.";
> 		$admtext['eventsonly'] = "Importera endast egna händelsetyper och attribut (ingen data läggs till eller ändras)";
> 		$admtext['allevents'] = "Acceptera data för alla nya händelser och attribut";
> 		$admtext['finishingimporting'] = "Avslutar...";
> 		$admtext['fileuploadfailed'] = "Filuppladdningen misslyckades, möljigen är filen för stor. Försök ladda upp filen till din GEDCOM-mapp med FTP, importera sedan därifrån.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Ändra befintlig händelsetyp";
135,138d168
< 		$admtext['entertypedesc'] = "Skriv in typ/beskrivning av denna nya händelsetyp.";
< 		$admtext['enterdisplay'] = "Skriv in en benämning för denna nya händelsetyp.";
< 		$admtext['existingeventtypeinfo'] = "Information om befintlig händelsetyp";
< 		$admtext['neweventtypeinfo'] = "Information om ny händelsetyp";
145,146d174
< 		$admtext['addnewevtype'] = "Lägg till händelsetyp";
< 		$admtext['createnewevtype'] = "Skapa ny händelstyp";
149,150d176
< 		$admtext['existingevtypes'] = "Befintliga händelsetyper";
< 		$admtext['edsevtypes'] = "Redigera, ta bort eller sortera tidigare införda händelsetyper";
152d177
< 		$admtext['confdeleteevtype'] = "Är Du säker på att Du vill radera denna händelsetyp?";
154d178
< 		$admtext['selectentertag'] = "Välj etikett för denna händelsetyp.";
208d231
< 		$admtext['changestoallevtypes'] = "Ändringar i alla händelsetyper";
214d236
< 		$admtext['BAPM'] = "Dop";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Är det säkert att du vill ta bort denna händelsetyp? Alla händelser baserade på händelsetypen kommer också att tas bort.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Lägg till ny Typ";
> 		$admtext['createnewevtype'] = "Skapa en ny post för händelse- eller attributtyp";
> 		$admtext['modifyeventtype'] = "Redigera befintlig Typ";
> 		$admtext['entertypedesc'] = "Skriv in en typ/beskrivning för denna nya händelse- eller attributtyp.";
> 		$admtext['enterdisplay'] = "Skriv in en visningstext för denna nya händelse- eller attributtyp.";
> 		$admtext['existingeventtypeinfo'] = "Information om befintlig händelse- eller attributtyp";
> 		$admtext['neweventtypeinfo'] = "Information om ny händelse- eller attributtyp";
> 		$admtext['existingevtypes'] = "Befintliga händelse- eller attributtyper";
> 		$admtext['edsevtypes'] = "Redigera, radera eller sortera tidigare händelse- eller attributtyper";
> 		$admtext['selectentertag'] = "Välj eller skriv in taggen för denna händelse- eller attributtyp.";
> 		$admtext['changestoallevtypes'] = "Ändringar för alla händelse- och attributtyper";
268d303
< 		$admtext['nobirthinfo'] = "Ingen födelseinformation";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Valj<br/>standard-<br/>foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Spara + Nya föräldrar";
> 		$admtext['savenewspouse'] = "Spara + Ny make/maka";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Födelse";
354d391
< 		$admtext['enterphotodesc'] = "Skriv in en bildbeskrivning.";
388d424
< 		$admtext['photoowner'] = "Ägare/Källa";
417d452
< 		$admtext['imgmap'] = "Bildkarta";
490d524
< 		$admtext['mapinstr3'] = "För att länka delar av detta foto till personer, välj först personens träd och markera sedan önskad del av bilden med en rektangel. Detta görs genom att klicka i övre vänstra hörnet, dra musen till nedre högra hörnet och sedan släppa upp knappen. Alternativt kan man klicka med musen i övre vänstra och sedan i undre högra hörnet. En popup-dialog visas därefter som hjälper dig att länka markerad bildyta till rätt person. När du är färdig med din länkning så kommer HTML-kod att läggas till i rutan nedan. Upprepa sedan denna procedur för önskat antal länkningar.";
495d528
< 		$admtext['removelink'] = "Radera länk";
502d534
< 		$admtext['eloptions'] = "Bläddra eller radera";
509d540
< 		$admtext['nolinks'] = "Inga länkar finns ännu";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML bildkarta (för bakåtkompabilitet)";
> 		$admtext['photoowner'] = "Ägare av original";
> 		$admtext['nothumb'] = "Ingen frimärksbild";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Detta foto kunde inte läggas till, troligen pga att filen är för stor för att laddas upp eller för att skapa en frimärksbild.";
> 		$admtext['moved'] = "Flyttad";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Skriv in titel och beskrivning för detta media.";
> 		$admtext['mapinstr3'] = "För att länka en del av detta foto till en person, familj eller annan enhet, välj först träd och enhetstyp, skapa sedan en rektangel för den önskade ytan. Detta sker genom att klicka övre vänstra hörnet av ytan, och sedan dra till nedre högra hörnet. Alternativt kan du klicka övre vänstra hörnet och sedan det nedre högra. En popup-box kommer då att hjälpa dig att välja person eller enhet. Välj, och repetera sedan denna process om du vill välja flera ytor. Klicka en befintlig yta för att välja, dra sedan för ätt flytta, eller klicka 'X' för att radera.";
596d633
< 		$admtext['foremptystring'] = "För nollsträng, lämna detta fält blankt och klicka på \"Lägg till >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instruktioner: Dra eller dubbelklicka rubrikerna till vänser för att föra över dem till höger. Dra upp och ner för att sortera om. Dubbelklicka igen för att ta bort.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "För att skapa en tom sträng, lämna detta fält blankt och klicka >>";
651,655d690
< 		$admtext['selectimportfile'] = "Välj fil att importera.";
< 		$admtext['importgedcom'] = "Importera GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Lägg till eller ersätt i databasen (kan ta flera minuter beroende på filstorlek)";
< 		$admtext['fromyourcomputer'] = "Från din dator";
< 		$admtext['importdata'] = "Importera data";
657,660d691
< 		$admtext['replace'] = "Ersätt (i det valda trädet)";
< 		$admtext['desttree'] = "Träd till vilket importen ska göras";
< 		$admtext['selectdesttree'] = "Välj eller skriv in till vilket träd importen ska göras.";
< 		$admtext['selectexisting'] = "Importera till";
668,673d698
< 		$admtext['ucaselast'] = "Alla efternamn med VERSALER";
< 		$admtext['norecalc'] = "Gör ej ny beräkning av definionen Levande";
< 		$admtext['autooffset'] = "Starta ID vid första tillgängliga nummer";
< 
< 		$admtext['mustselecttree'] = "Du måste välja ett träd innan du kan göra detta val.";
< 		$admtext['importmedia'] = "Importera media om sådant finns";
675d699
< 		$admtext['neweronly'] = "Ersätt endast om nyare";
677,692d700
< 		$admtext['onwebserver'] = "På webserver (i GEDCOM-mappen)";
< 		$admtext['eventsonly'] = "Importera endast egendefinierade händelsetyper";
< 		$admtext['imphints'] = "Tips: \"All befintlig data\" betyder alla personer, familjer, källor och noteringar (media-länkar förloras ej så länge ID kvarstår). Interna länkar baseras alltid enbart på ID. Nya poster läggs alltid till.<br> \"Lägg till alla poster\" importerar alla poster med nya ID.";
< 		$admtext['allevents'] = "Acceptera data för alla nya egendefinierade händelsetyper";
< 		$admtext['destbranch'] = "Destinations-gren (valfri)";
< 		$admtext['inframe'] = "(i ram)";
< 		$admtext['getstart'] = "Starthjälp";
< 		$admtext['importlatlong'] = "Importera data för latitud/longitud om det finns";
< 		$admtext['opening'] = "Öppnar";
< 		$admtext['reopen'] = "Åter-öppnar";
< 		$admtext['uploading'] = "Laddar upp";
< 		$admtext['stop'] = "Stoppa";
< 		$admtext['stopped'] = "Import stoppad";
< 		$admtext['resume'] = "Återuppta";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Visa loggen";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Äldre import (ingen förloppsindikator)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Uppgradera";
> 		$admtext['need_upgrade'] = "Avsluta dessa uppgraderingsinstruktioner";
> 		$admtext['upgrade_missing'] = "Uppgraderingsfilen verkar saknas, så du är kanske redan klar.";
> 		$admtext['delete_upgrade'] = "När du är klar, klicka här för att radera uuppgraderingsfilen och återgå till menyn.";
723d733
< 		$admtext['author'] = "Författare";
804,809c814,819
< 		$admtext['momside'] = "Morssidans märke"; //8
< 		$admtext['dadside'] = "Farssidans märke"; //8
< 		$admtext['momperson'] = "Morssidans person-ID"; //8
< 		$admtext['momtree'] = "Morssidans träd-ID"; //8
< 		$admtext['dadperson'] = "Farssidans person-ID"; //8
< 		$admtext['dadtree'] = "Farssidans träd-ID"; //8
---
> 		$admtext['momside'] = "Morssidans märke"; //8, 20
> 		$admtext['dadside'] = "Farssidans märke"; //8, 20
> 		$admtext['momperson'] = "Morssidans person-ID"; //8, 20
> 		$admtext['momtree'] = "Morssidans träd-ID"; //8, 20
> 		$admtext['dadperson'] = "Farssidans person-ID"; //8, 20
> 		$admtext['dadtree'] = "Farssidans träd-ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Citatrubrik";
> 		$admtext['quotesubhead'] = "Citat subheader";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Featurette name";
> 		$admtext['snipinfoone'] = "Featurette first line";
> 		$admtext['snipinfotwo'] = "Featurette andra raden";
> 		$admtext['snipimage'] = "Featurette image";
> 		$admtext['snipperson'] = "Featurette person ID";
> 		$admtext['sniptree'] = "Featurette tree ID";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Länk";
> 		$admtext['featuretitle7'] = "Artikel 7 titel";
> 		$admtext['featuretitle8'] = "Artikel 8 titel";
> 		$admtext['featuretitle9'] = "Artikel 9 titel";
> 		$admtext['featurethumb9'] = "Artikel 9 frimärksbild"; //15
> 		$admtext['featurelink9'] = "Artikel 9 länk"; //15
> 		$admtext['featurepara9'] = "Artikel 9 stycke"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Vänster bild i sidhuvud";
> 		$admtext['rightimg'] = "Höger bild i sidhuvud";
> 		$admtext['photoption'] = "Fotoinställningar är<br />&nbsp;&nbsp;(förinställda eller godtyckliga)";
> 		$admtext['randomphotowidth'] = "Godtycklig fotobredd";
> 		$admtext['randomphotoheight'] = "Godtycklig fotohöjd";
> 		$admtext['randomphotomediatypeID'] = "Godtycklig fotokollektion";
> 		$admtext['momheading'] = "Rubrik morssida";
> 		$admtext['mompara'] = "Stycke morssida";
> 		$admtext['mompagelink'] = "Sidlänk morssida";
> 		$admtext['dadheading'] = "Rubrik farssida";
> 		$admtext['dadpara'] = "Stycke farssida";
> 		$admtext['dadpagelink'] = "Sidlänk farssida";
> 		$admtext['spmomheading'] = "Rubrik makes/makas morssida";
> 		$admtext['spmompara'] = "Stycke makes/makas morssida";
> 		$admtext['spmompagelink'] = "Sidlänk makes/makas morssida";
> 		$admtext['spmomside'] = "Etikett makes/makas morssida";
> 		$admtext['spdadside'] = "Etikett makes/makas farssida";
> 		$admtext['spmomperson'] = "Person-ID makes/makas morssida";
> 		$admtext['spmomtree'] = "Träd-ID makes/makas morssida";
> 		$admtext['spdadheading'] = "Rubrik makes/makas farssida";
> 		$admtext['spdadpara'] = "Stycke makes/makas farssida";
> 		$admtext['spdadpagelink'] = "Sidlänk makes/makas farssida";
> 		$admtext['spdadperson'] = "Person-ID makes/makas farssida";
> 		$admtext['spdadtree'] = "Träd-ID makes/makas farssida";
> 		$admtext['storiesheading'] = "Våra släkthistorier";
> 		$admtext['nbrsurnames'] = "Antal efternamn<br />&nbsp;&nbsp; i namnmolnet";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Artikel frimärksbild";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1340c1425
< 		$admtext['mediatrees'] = "Dela upp media i tre mappar";
---
> 		$admtext['mediatrees'] = "Dela upp media i separata mappar per träd";
1359,1361c1444,1446
< 		$admtext['cookieapproval'] = "Visa meddelande om godkännande av cookies"; 
< 		$admtext['dataprotectmsg'] = "Visa länk till dataskyddspolicy"; 
< 		$admtext['nointernet'] = "Jag använder TNG offline"; 
---
> 		$admtext['cookieapproval'] = "Visa meddelande om godkännande av cookies";
> 		$admtext['dataprotectmsg'] = "Visa länk till dataskyddspolicy";
> 		$admtext['nointernet'] = "Jag använder TNG offline";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Ändra inkommande prefix så att de matchar inställningarna i TNG";
> 		$admtext['sortevents'] = "Sortera händelser efter";
> 		$admtext['sortbydate'] = "Händelsdatum";
> 		$admtext['sortbytype'] = "Händelsetyp";
> 		$admtext['allowsuggest'] = "Tillåt besökare att lämna förslag";
> 		$admtext['livingchecked'] = "Markera nya personer och familjer som levande";
> 		$admtext['maxmarried'] = "Markera familjer som levande om gifta färre än<br/>detta antal år";
> 		$admtext['imagetags'] = "Rektanglar";
> 		$admtext['allowcsv'] = "Tillåt nedladdning av rapporter i CSV-format";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup-alternativ";
> 		$admtext['dosql'] = "Exportera som SQL";
> 		$admtext['dodrop'] = "Inkludera DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Inkludera CREATE TABLE";
> 		$admtext['onrestore'] = "Återställ alternativen";
> 		$admtext['dodel'] = "Radera först tidigare innehåll";
> 		$admtext['download'] = "Ladda ner";
> 		$admtext['altbirthtypes'] = "Alternativa födelsetyper";
> 		$admtext['dtformat'] = "Tabellformat";
> 		$admtext['conchart'] = "Kopplingsdiagram";
> 		$admtext['maxropt'] = "Max antal sökningar av kopplingar";
> 		$admtext['maxlopt'] = "Max längd för kopplingars sökvägar";
> 		$admtext['showtxtopt'] = "Visa sökvägssammanställning i textformat";
> 		$admtext['compactboxopt'] = "Visa personrutor i kompakt format";
> 		$admtext['sortbyopt'] = "Sortera sökvägar på";
> 		$admtext['anchoridopt'] = "Ankar-ID";
> 		$admtext['maxmopt'] = "Max antal vigslar i koppling";
> 		$admtext['saveincfg'] = "Spara i konfigureringssökväg (se Allmänna Inställningar)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kunde inte geokodas";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Ingen geokodning";
1436d1549
< 		$admtext['backtosecondary'] = "Tillbaka till sekundära processer";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Tillbaka till verktygen för post-import";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exkludera noteringar";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zippa och inkludera mediafiler";
> 		$admtext['downloadzip'] = "Ladda ner ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1606c1722
< 		$admtext['consented'] = "Godkänt "; 
---
> 		$admtext['consented'] = "Godkänt ";
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Visa enbart inaktiverade användare";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Skicka också till admins när ett enskilt träd väljs";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alla Moddar";
> 		$admtext['installedmods'] = "Enbart installerade Moddar";
> 		$admtext['partinstmods'] = "Installerade + Delvis Installerade Moddar";
> 		$admtext['showanalyzeractions'] = "Visa aktiviteter i Mod-Analysator";
> 		$admtext['badchar'] = "Ogiltigt tecken"; 
1886d2008
< 		$admtext['test_number'] = "Testnummer";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testnummer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Länka detta DNA-test till en person"; 
1965d2095
< $admtext['otherevents'] = "Andra händelser";
2050,2051d2179
< $admtext['savereturn'] = "återvänd till denna sida";
< $admtext['saveback'] = "återvänd till förra menyn";
2058,2059d2185
< $admtext['secondary'] = "Sekundära processer";
< $admtext['commas'] = "Separarera flera uppgifter med komma";
2129,2130d2254
< $admtext['secondarymaint'] = "Sekundära underhållsprocesser";
< $admtext['customeventtypes'] = "Egendefinierade händelsetyper";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Typ";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Efternamn";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Bild";
> $admtext['author'] = "Författare";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Starthjälp";
> $admtext['showlog'] = "Visa loggen";
> $admtext['nobirthinfo'] = "Ingen födelseinformation";
> //changed in 13.0
> $admtext['savereturn'] = "Spara + Stanna kvar på sidan";
> $admtext['saveback'] = "Spara + Lämna sidan";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alla poster har tagits bort.";
> $admtext['private'] = "Privat";
> $admtext['imgtags'] = "Bildtaggar";
> 
> $admtext['removelink'] = "Radera länk";
> $admtext['eloptions'] = "Bläddra eller radera";
> $admtext['pleaseenter'] = "Skriv in en ";
> 
> $admtext['nolinks'] = "Inga länkar finns ännu";
> $admtext['nogeocode'] = "Kunde inte geokodas";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Valj<br/>standard-<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Händelse / Typ av attribut";
> $admtext['secondary'] = "Post-import Verktyg";
> $admtext['otherevents'] = "Andra Händelser / Attribut";
> //added in 14.0
> $admtext['newlinks'] = "Länkar skapade";
> $admtext['newcemlinks'] = "Länkar till gravplatser skapade";
> $admtext['utility'] = "Verktyg";
> $admtext['linktype'] = "Typ";
> $admtext['move'] = "Flytta";
> $admtext['copy'] = "Kopiera";
> $admtext['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Swedish/alltext.php TNG1403/languages/Swedish/alltext.php
29,30c29,30
< $dates['BEF'] = "fö";
< $dates['BEFORE'] = "före";
---
> $dates['BEF'] = "fö";
> $dates['BEFORE'] = "före";
36c36
< $dates['FROM'] = "från";
---
> $dates['FROM'] = "från";
38c38
< $dates['Y'] = "Ja, datum okänt";
---
> $dates['Y'] = "Ja, datum okänt";
43c43
< $text['cannotexecutequery'] = "Kan inte utföra sökningen";
---
> $text['cannotexecutequery'] = "Kan inte utföra sökningen";
46,56c46,56
< $text['text_next'] = "Nästa";
< $text['text_prev'] = "Föregående";
< $text['clickdisplay'] = "Klicka för att visa";
< $text['clickhide'] = "Klicka för att gömma";
< $text['forgot1'] = "<strong>Har du glömt användarnamn eller lösenord?</strong><br />Skriv in din e-postadress nedan för att få ditt användarnamn skickat till dig.";
< $text['forgot2'] = "Skriv in din e-post ovan och ditt användarnamn nedan för att återställa ditt lösenord (ett tillfälligt lösenord kommer att skickas till dig).";
< $text['newpass'] = "Ditt nya temporära lösenord";
< $text['usersent'] = "Ditt användarnamn har skickats till din e-postadress.";
< $text['pwdsent'] = "Ditt nya tillfälliga lösenord har skickats till din e-postadress.";
< $text['loginnotsent2'] = "Den e-postadress du angav finns inte i användardatabasen. Ingen information har skickats.";
< $text['loginnotsent3'] = "Den e-postadress och användarnamn du angav finns inte i användardatabasen. Ingen information har skickats.";
---
> $text['text_next'] = "Nästa";
> $text['text_prev'] = "Föregående";
> $text['clickdisplay'] = "Klicka för att visa";
> $text['clickhide'] = "Klicka för att gömma";
> $text['forgot1'] = "<strong>Har du glömt användarnamn eller lösenord?</strong><br />Skriv in din e-postadress nedan för att få ditt användarnamn skickat till dig.";
> $text['forgot2'] = "Skriv in din e-post ovan och ditt användarnamn nedan för att återställa ditt lösenord (ett tillfälligt lösenord kommer att skickas till dig).";
> $text['newpass'] = "Ditt nya temporära lösenord";
> $text['usersent'] = "Ditt användarnamn har skickats till din e-postadress.";
> $text['pwdsent'] = "Ditt nya tillfälliga lösenord har skickats till din e-postadress.";
> $text['loginnotsent2'] = "Den e-postadress du angav finns inte i användardatabasen. Ingen information har skickats.";
> $text['loginnotsent3'] = "Den e-postadress och användarnamn du angav finns inte i användardatabasen. Ingen information har skickats.";
70c70
< $admtext['placelevel'] = "Plats-nivå";
---
> $admtext['placelevel'] = "Plats-nivå";
72c72
< $admtext['level2'] = "Område";
---
> $admtext['level2'] = "Område";
74c74
< $admtext['level4'] = "Län";
---
> $admtext['level4'] = "Län";
81c81
< $text['closewindow'] = "Stäng detta fönster";
---
> $text['closewindow'] = "Stäng detta fönster";
86c86
< $text['mainton'] = "Underhållsläge är PÅ";
---
> $text['mainton'] = "Underhållsläge är PÅ";
88d87
< //moved here in 8.0.0
91,93c90,92
< $admtext['confunlink'] = "Är du säker att du vill frikoppla denna person som make/maka i denna familj?";
< $admtext['confunlinkc'] = "Är du säker på att du vill avlänka denna individ som barn i denna familj?";
< $admtext['confremchild'] = "Är du säker att du vill frikoppla detta barn från denna familj? Personen kommer inte att raderas från databasen.";
---
> $admtext['confunlink'] = "Är du säker att du vill frikoppla denna person som make/maka i denna familj?";
> $admtext['confunlinkc'] = "Är du säker på att du vill avlänka denna individ som barn i denna familj?";
> $admtext['confremchild'] = "Är du säker att du vill frikoppla detta barn från denna familj? Personen kommer inte att raderas från databasen.";
97,98c96,97
< $admtext['BIRT'] = "Födelse";
< $admtext['DEAT'] = "Död";
---
> $admtext['BIRT'] = "Födelse";
> $admtext['DEAT'] = "Död";
102c101
< $admtext['ENDL'] = "Begåvning (LDS)";
---
> $admtext['ENDL'] = "Begåvning (LDS)";
107c106
< $admtext['SLGC'] = "Beseglad till föräldrar (LDS)";
---
> $admtext['SLGC'] = "Beseglad till föräldrar (LDS)";
111,115c110,112
< $admtext['activated'] = "Ditt släktforskarkonto har aktiverats";
< $admtext['infois'] = "Din inloggningsinformation är";
< $admtext['subjectline'] = "Ditt släktforskarkonto har aktiverats.";
< 
< //moved here in 8.1.0
---
> $admtext['activated'] = "Ditt släktforskarkonto har aktiverats";
> $admtext['infois'] = "Din inloggningsinformation är";
> $admtext['subjectline'] = "Ditt släktforskarkonto har aktiverats.";
117c114
< $admtext['birth'] = "födelse";
---
> $admtext['birth'] = "födelse";
120,121c117
< //added in 11.0.3
< $admtext['putative'] = "förmodade";
---
> $admtext['putative'] = "förmodade";
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
129,130c122,123
< $text['sunday'] = "Söndag";  //first day of week on calendar
< $text['monday'] = "Måndag";
---
> $text['sunday'] = "Söndag";  //first day of week on calendar
> $text['monday'] = "MÃ¥ndag";
135,137c128,130
< $text['saturday'] = "Lördag";
< $text['contains'] = "innehåller";
< $text['startswith'] = "börjar med";
---
> $text['saturday'] = "Lördag";
> $text['contains'] = "innehåller";
> $text['startswith'] = "börjar med";
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
147,149c137
< $text['years'] = "år";
< 
< //added in 10.0.0
---
> $text['years'] = "Ã¥r";
155,156d142
< 
< //added in 11.0.0
158,159c144
< $admtext['preflang'] = "Valt språk";
< $text['problem'] = "Ett fel uppstod i TNG-programmet. Detta kan bero på installationsfel, ofullständig uppgradering eller programfel. Om du är ägare till sajten, kontakta TNG-supporten för hjälp med problemet. Kopiera query-texten nedan och klistra in den i ditt meddelande.";
---
> $admtext['preflang'] = "Valt språk";
161c146
< $text['fanchart'] = "Solfjäderdiagram";
---
> $text['fanchart'] = "Solfjäderdiagram";
163d147
< //moved here in 12.0.0
171c155
< $admtext['medialinks'] = "Media-länkar";
---
> $admtext['medialinks'] = "Media-länkar";
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
180c162
< $admtext['admin_notes'] = "Administratörens noteringar";
---
> $admtext['admin_notes'] = "Administratörens noteringar";
182,183c164,165
< $admtext['mrca'] = "Närmaste gemensam ana";
< $admtext['marker_values'] = "Markörvärden";
---
> $admtext['mrca'] = "Närmaste gemensam ana";
> $admtext['marker_values'] = "Markörvärden";
191c173
< $text['keep_name_private'] = "Behåll namnet privat";
---
> $text['keep_name_private'] = "Behåll namnet privat";
194,195c176,177
< $admtext['vendor'] = "Säljare";
< $admtext['markers'] = "Antal testade STR-markörer";
---
> $admtext['vendor'] = "Säljare";
> $admtext['markers'] = "Antal testade STR-markörer";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "f.";
> $text['chrabbr'] = "dp.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "bg.";  //from descend
> $text['marrabbr'] = "v.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Hitta alla personer med händelser på denna plats";
> $text['firstpage'] = "Första sidan";
> $text['lastpage'] = "Sista sidan";
> 
> //changed in 13.0.0
> $text['problem'] = "Ett fel har inträffat i programvaran för TNG. Gör så här:<p>Om du precis har installerat en uppgradering, så kan du ha missat en del av installationsanvisningarna. Gå tillbaka till ReadMe/LäsMig-sidan för uppgraderingen och kontrollera anvisningarna. Var extra noga med alla instruktioner som rör databasens struktur.</p><p>Om du precis har installerat TNG för första gången, så kan du behöva skapa tabeller i databasen. Gå tillbaka till Readme.html-sidan och leta efter detta steg bland anvisningarna. </p><p>Om du är webbplatsens ägare, så kan du kontakta TNG-supporten för mer hjälp med detta problem. Vänligen kopiera databasfrågan nedan (SQL) och klista in i ditt meddelande.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Ingen gren";
> 
> //added in 14.0
> $text['oneyear'] = "Ã¥r";
> $text['pwdcodelink'] = "Klicka denna länk för att få ett temporärt lösenord skickat till dig";
> $text['pwdcodesent'] = "En länk för återställning av lösenord har skickats till din e-postadress.";
> $text['moved'] = "Flyttad";
> $text['citation'] = "Citat";
> $text['other'] = "Annat";
> $text['death'] = "Död";
> $text['burial'] = "Begravning";
> $text['cremation'] = "Kremering";
> $text['marriage'] = "Vigsel";
> $text['divorce'] = "Skilsmässa";
> $text['bylength'] = "Steg";
> $text['bymarriages'] = "Vigslar";
> $text['none'] = "Ingen";
> 
> //moved here in 14.0
> $text['family'] = "Familj";
> $text['source'] = "Källa";
> $text['repository'] = "Arkiv";
> $text['place'] = "Plats";
> $admtext['BAPM'] = "Dop";
> 
> $text['glang'] = "sv";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Swedish: data_protection_policy.php
diff -r TNG/languages/Swedish/text.php TNG1403/languages/Swedish/text.php
69d68
< 		$text['general'] = "Allmänt";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "De två individerna är en och samma person.";
---
> 		$text['sameperson'] = "De två individerna är samma person.";
93c93
< 		$text['sometimes'] = "(Ibland får man olika resultat om man söker över olika antal generationer.)";
---
> 		$text['sometimes'] = "(Ibland får man ett annat resultat om man söker över ett annat antal generationer.)";
144c144
< 		$text['dospouses2'] = "Visa Makar";
---
> 		$text['dospouses2'] = "Visa makar";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Sök kopplingar";
> 		$text['findrel2'] = "Hitta relationer och andra kopplingar";
> 		$text['makeme2nd'] = "Använd mitt ID";
> 		$text['usebookmarks'] = "Använd bokmärken";
> 		$text['select2inds'] = "Välj två individer.";
> 		$text['indinfofor'] = "Individ-info för";
> 		$text['nobookmarks'] = "Det finns inget bokmärke att använda";
> 		$text['bkmtitle'] = "Personer funna bland bokmärken";
> 		$text['bkminfo'] = "Välj en person:";
> 		$text['sortpathsby'] = "Sortera sökvägar på antal";
> 		$text['sortbyshort'] = "Sortera på";
> 		$text['bylengthshort'] = "Längd";
> 		$text['badID1'] = ": felaktigt person1-ID - gå tillbaka och rätta";
> 		$text['badID2'] = ": felaktigt person2-ID - gå tillbaka och rätta";
> 		$text['notintree'] = ": personen med detta ID finns inte i det valda trädet.";
> 		$text['sameperson'] = "De två individerna är samma person.";;
> 		$text['nopaths'] = "Dessa personer är inte kopplade.";
> 		$text['nopaths1'] = "Inga fler kopplingar kortare än xxx";
> 		$text['nopaths2'] = "i xxx söksteg";
> 		$text['longestpath'] = "(längsta kontrollerade sökväg hittills var xxx steg lång)";
> 		$text['relevantpaths'] = "Antal unika relevanta sökvägar funna: xxx";
> 		$text['skipMarr'] = "(dessutom  hittades följande antal sökvägar som inte visas pga för många vigslar: xxx)";
> 		$text['mjaor'] = "eller";
> 		$text['connectionsto'] = "Kopplingar till ";
> 		$text['findanotherpers'] = "Hitta ytterligare person...";
> 		$text['sometimes'] = "(Ibland får man ett annat resultat om man söker över ett annat antal generationer.)";
> 		$text['anotherpath'] = "Sök efter ytterligare kopplingar";
> 		$text['xpath'] = "Sökväg ";
> 		$text['primary'] = "Startperson"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Slutperson";
> 		$text['parent'] = "Förälder";
> 		$text['mhfather'] = "hans far";
> 		$text['mhmother'] = "hans mor";
> 		$text['mhhusband'] = "hans make";
> 		$text['mhwife'] = "hans hustru";
> 		$text['mhson'] = "hans son";
> 		$text['mhdaughter'] = "hans dotter";
> 		$text['fhfather'] = "hennes far";
> 		$text['fhmother'] = "hennes mor";
> 		$text['fhhusband'] = "hennes make";
> 		$text['fhwife'] = "hennes hustru";
> 		$text['fhson'] = "hennes son";
> 		$text['fhdaughter'] = "hennes dotter";
> 		$text['hfather'] = "far";
> 		$text['hmother'] = "mor";
> 		$text['hhusband'] = "make";
> 		$text['hwife'] = "maka";
> 		$text['hson'] = "son";
> 		$text['hdaughter'] = "dotter";
> 		$text['maxruns'] = "Max antal sökvägar att kontrollera";
> 		$text['maxrshort'] = "Max sökvägar";
> 		$text['maxlength'] = "Kopplingsvägar ej längre än";
> 		$text['maxlshort'] = "Max längd";
> 		$text['xstep'] = "steg";
> 		$text['xsteps'] = "steg";
> 		$text['xmarriages'] = "xxx vigslar";
> 		$text['xmarriage'] = "1 vigsel";
> 		$text['showspouses'] = "Visa båda makarna";
> 		$text['showTxt'] = "Visa sökvägsbeskrivningen i textformat";
> 		$text['showTxtshort'] = "Beskr. i textformat";
> 		$text['compactBox'] = "Visa kompakta personrutor";
> 		$text['compactBoxshort'] = "Kompakta rutor";
> 		$text['paths'] = "Sökvägar";
> 		$text['dospouses2'] = "Visa makar";
> 		$text['maxmopt'] = "Max vigslar per koppling"; 
> 		$text['maxm'] = "Max vigslar"; 
> 		$text['arerelated'] = "Dessa personer är släkt - deras släktskap visas i Sökväg 1";
> 		$text['simplerel'] = "Enkel släktskapssökning";
196d264
< 		$text['scrollnote'] = "OBS! Du måste kanske bläddra nedåt eller till höger för att se diagrammet.";
199d266
< 		$text['popupnote2'] = " = Ny antavla";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabeller";
> 		$text['dtchildren'] = "Barn";
> 		$text['dtgrandchildren'] = "Barnbarn";
> 		$text['dtggrandchildren'] = "Barnbarnsbarn";
> 		$text['dtgggrandchildren'] = "Barnbarnsbarnsbarn"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "1"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Inga ättlingar";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totalt";
> 		$text['dtselect'] = "Välj";
> 		$text['dteachfulltable'] = "Varje hel tabell kommer att ha";
> 		$text['dtrows'] = "rader";
> 		$text['dtdisplayingtable'] = "Visar tabell";
> 		$text['dtgototable'] = "Gå till tabell:";
> 		$text['fcinstrdn'] = "Visa familj med make/maka";
> 		$text['fcinstrup'] = "Visa familj med föräldrar";
> 		$text['fcinstrplus'] = "Välj andra makar/makor";
> 		$text['fcinstrfam'] = "Välj andra föräldrar";
381,383c467
< 		$text['firstpage'] = "Första sidan";
< 		$text['lastpage'] = "Sista sidan";
< 		$text['photoowner'] = "Ägare/Källa";
---
> 		$text['photoowner'] = "Ägare av original";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Växla taggar";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Nytt lösenord igen";
> 		$text['resetsuccess'] = "OK: Lösenordet har ändrats";
> 		$text['resetfail'] = "FEL: Lösenordet har inte ändrats";
> 		$text['failreason0'] = " (okänt databasfel)";
> 		$text['failreason2'] = " (du har inte rättigheter att ändra ditt lösenord)";
> 		$text['failreason3'] = " (lösendordet passade inte)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totalt antal Källhänvisningar";
618d710
< 		$text['loginfirst'] = "Du måste först logga in.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Vi har hittat dataposter för existerande användare. För att fortsätta måste du först logga in och tömma användar-tabellen.";
629,630d722
< 		$text['zoomin'] = "Zooma In";
< 		$text['zoomout'] = "Zooma Ut";
656d747
< 		$text['dna_info_head'] = "Information om DNA-test";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "f.";
< $text['chrabbr'] = "dp.";
675d788
< $text['family'] = "Familj"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
706d817
< $text['burialabbr'] = "bg.";  //from descend
712d822
< $text['place'] = "Plats";
715d824
< $text['marrabbr'] = "v.";
738d846
< $text['source'] = "Källa";
766d873
< $text['repository'] = "Arkiv";
770d876
< $text['findplaces'] = "Hitta alla personer med händelser på denna plats";
804d909
< $text['glang'] = "&amp;hl=sv";
816d920
< $text['none'] = "Ingen";
924d1027
< $text['otherevents'] = "Andra Händelser";
952,953d1054
< $text['people_have'] = "personer har länkat ett DNA-test till";
< $text['person_has'] = "person har länkat ett DNA-test till";
956,959c1057,1060
< $text['cookieuse'] = "OBS: Denna sajt använder cookies."; 
< $text['dataprotect'] = "Dataskyddspolicy "; 
< $text['viewpolicy'] = "Visa policy"; 
< $text['understand'] = "Jag förstår"; 
---
> $text['cookieuse'] = "OBS: Denna sajt använder cookies.";
> $text['dataprotect'] = "Dataskyddspolicy ";
> $text['viewpolicy'] = "Visa policy";
> $text['understand'] = "Jag förstår";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Snabblänkar";
> $text['yourname'] = "Ditt namn";
> $text['youremail'] = "Din e-postadress";
> $text['liketoadd'] = "All information du vill lägga till";
> $text['webmastermsg'] = "Webmastermeddelande";
> $text['gallery'] = "Se Galleri";
> $text['wasborn_male'] = "föddes";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "föddes"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "döptes";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "döptes";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "dog";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "dog";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "begravdes"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "begravdes"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "kremerades";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "kremerades";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "gift";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "gift";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "skildes";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "skildes";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " i ";			// used as a preposition to the location
> $text['onthisdate'] = " den ";		// when used with full date
> $text['inthisyear'] = " ";		// when used with year only or month / year dates
> $text['and'] = "och ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Information om DNA-test";
> //added in 13.0
> $text['visitor'] = "Besökare";
> 
> $text['popupnote2'] = " = Ny antavla";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zooma In";
> $text['zoomout'] = "Zooma Ut";
> $text['scrollnote'] = "Dra eller skrolla för att se mer av diagrammet.";
> $text['general'] = "Allmänt";
> 
> //changed in 14.0
> $text['otherevents'] = "Andra Händelser och Attribut";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Kopplingar";
> $text['continue'] = "Fortsätt";
> $text['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Swedish-UTF8/admintext.php TNG1403/languages/Swedish-UTF8/admintext.php
80d79
< 		$admtext['pleaseenter'] = "Skriv in en ";
128a128,162
> 		//moved here in 14.0
> 		$admtext['selectimportfile'] = "Välj fil att importera.";
> 		$admtext['addreplacedata'] = "Lägg till eller ersätt i databasen (kan ta flera minuter beroende på filstorlek)";
> 		$admtext['fromyourcomputer'] = "Från din dator";
> 		$admtext['importdata'] = "Importera data";
> 		$admtext['replace'] = "Ersätt (i det valda trädet)";
> 		$admtext['desttree'] = "Träd till vilket importen ska göras";
> 		$admtext['selectdesttree'] = "Välj eller skriv in till vilket träd importen ska göras.";
> 		$admtext['selectexisting'] = "Importera till";
> 		$admtext['ucaselast'] = "Alla efternamn med VERSALER";
> 		$admtext['norecalc'] = "Gör ej ny beräkning av definionen Levande";
> 		$admtext['autooffset'] = "Starta ID vid första tillgängliga nummer";
> 		$admtext['mustselecttree'] = "Du måste välja ett träd innan du kan göra detta val.";
> 		$admtext['onwebserver'] = "PÃ¥ webserver (i GEDCOM-mappen)";
> 		$admtext['imphints'] = "Tips: \"All befintlig data\" betyder alla personer, familjer, källor och noteringar (media-länkar förloras ej så länge ID kvarstår). Interna länkar baseras alltid enbart på ID. Nya poster läggs alltid till.<br> \"Lägg till alla poster\" importerar alla poster med nya ID.";
> 		$admtext['destbranch'] = "Destinations-gren (valfri)";
> 		$admtext['importlatlong'] = "Importera data för latitud/longitud om det finns";
> 		$admtext['opening'] = "Öppnar";
> 		$admtext['reopen'] = "Åter-öppnar";
> 		$admtext['uploading'] = "Laddar upp";
> 		$admtext['stop'] = "Stoppa";
> 		$admtext['stopped'] = "Import stoppad";
> 		$admtext['resume'] = "Ã…teruppta";
> 		$admtext['neweronly'] = "Ersätt endast om nyare";
> 		$admtext['oldimport'] = "Äldre import (ingen förloppsindikator)";
> 		$admtext['importgedcom'] = "Importera GEDCOM-fil (även zippad)";
> 		$admtext['stopbackup'] = "Stopp! Vi rekommenderar att du säkerhetskopierar dina nuvarande data innan du fortsätter.";
> 		$admtext['importmedia'] = "Importera media om sådant finns";
> 		//changed in 14.0
> 		$admtext['chkprefixes'] = "Kontrollera att  Prefix och Suffix (Allmäna Inställningar) är korrekta för denna fil.";
> 		$admtext['chkimpsettings'] = "Se inställningarna för Import för flera alternativ.";
> 		$admtext['eventsonly'] = "Importera endast egna händelsetyper och attribut (ingen data läggs till eller ändras)";
> 		$admtext['allevents'] = "Acceptera data för alla nya händelser och attribut";
> 		$admtext['finishingimporting'] = "Avslutar...";
> 		$admtext['fileuploadfailed'] = "Filuppladdningen misslyckades, möljigen är filen för stor. Försök ladda upp filen till din GEDCOM-mapp med FTP, importera sedan därifrån.";
129a164
> 
133d167
< 		$admtext['modifyeventtype'] = "Ändra befintlig händelsetyp";
135,138d168
< 		$admtext['entertypedesc'] = "Skriv in typ/beskrivning av denna nya händelsetyp.";
< 		$admtext['enterdisplay'] = "Skriv in en benämning för denna nya händelsetyp.";
< 		$admtext['existingeventtypeinfo'] = "Information om befintlig händelsetyp";
< 		$admtext['neweventtypeinfo'] = "Information om ny händelsetyp";
145,146d174
< 		$admtext['addnewevtype'] = "Lägg till händelsetyp";
< 		$admtext['createnewevtype'] = "Skapa ny händelstyp";
149,150d176
< 		$admtext['existingevtypes'] = "Befintliga händelsetyper";
< 		$admtext['edsevtypes'] = "Redigera, ta bort eller sortera tidigare införda händelsetyper";
152d177
< 		$admtext['confdeleteevtype'] = "Är Du säker på att Du vill radera denna händelsetyp?";
154d178
< 		$admtext['selectentertag'] = "Välj etikett för denna händelsetyp.";
208d231
< 		$admtext['changestoallevtypes'] = "Ändringar i alla händelsetyper";
214d236
< 		$admtext['BAPM'] = "Dop";
226a249,262
> 		//changed in 13.0
> 		$admtext['confdeleteevtype'] = "Är det säkert att du vill ta bort denna händelsetyp? Alla händelser baserade på händelsetypen kommer också att tas bort.";
> 		//changed in 14.0
> 		$admtext['addnewevtype'] = "Lägg till ny Typ";
> 		$admtext['createnewevtype'] = "Skapa en ny post för händelse- eller attributtyp";
> 		$admtext['modifyeventtype'] = "Redigera befintlig Typ";
> 		$admtext['entertypedesc'] = "Skriv in en typ/beskrivning för denna nya händelse- eller attributtyp.";
> 		$admtext['enterdisplay'] = "Skriv in en visningstext för denna nya händelse- eller attributtyp.";
> 		$admtext['existingeventtypeinfo'] = "Information om befintlig händelse- eller attributtyp";
> 		$admtext['neweventtypeinfo'] = "Information om ny händelse- eller attributtyp";
> 		$admtext['existingevtypes'] = "Befintliga händelse- eller attributtyper";
> 		$admtext['edsevtypes'] = "Redigera, radera eller sortera tidigare händelse- eller attributtyper";
> 		$admtext['selectentertag'] = "Välj eller skriv in taggen för denna händelse- eller attributtyp.";
> 		$admtext['changestoallevtypes'] = "Ändringar för alla händelse- och attributtyper";
268d303
< 		$admtext['nobirthinfo'] = "Ingen födelseinformation";
332,333d366
< 		//added in 9.0.0
< 		$admtext['choosedef'] = "Valj<br/>standard-<br/>foto"; //has to fit in a small box
338a372,376
> 		//added in 13.0
> 		$admtext['savenewparent'] = "Spara + Nya föräldrar";
> 		$admtext['savenewspouse'] = "Spara + Ny make/maka";
> 		//added in 14.0
> 		$admtext['ALTBE'] = "Alt Födelse";
354d391
< 		$admtext['enterphotodesc'] = "Skriv in en bildbeskrivning.";
388d424
< 		$admtext['photoowner'] = "Ägare/Källa";
417d452
< 		$admtext['imgmap'] = "Bildkarta";
490d524
< 		$admtext['mapinstr3'] = "För att länka delar av detta foto till personer, välj först personens träd och markera sedan önskad del av bilden med en rektangel. Detta görs genom att klicka i övre vänstra hörnet, dra musen till nedre högra hörnet och sedan släppa upp knappen. Alternativt kan man klicka med musen i övre vänstra och sedan i undre högra hörnet. En popup-dialog visas därefter som hjälper dig att länka markerad bildyta till rätt person. När du är färdig med din länkning så kommer HTML-kod att läggas till i rutan nedan. Upprepa sedan denna procedur för önskat antal länkningar.";
495d528
< 		$admtext['removelink'] = "Radera länk";
502d534
< 		$admtext['eloptions'] = "Bläddra eller radera";
509d540
< 		$admtext['nolinks'] = "Inga länkar finns ännu";
538d568
< 		//added in 8.0.0
542d571
< 		//added in 9.0.0
544d572
< 		//added in 9.2.0
552d579
< 		//added in 11.0.0
555a583,593
> 		//changed in 13.0
> 		$admtext['imgmap'] = "HTML bildkarta (för bakåtkompabilitet)";
> 		$admtext['photoowner'] = "Ägare av original";
> 		$admtext['nothumb'] = "Ingen frimärksbild";
> 		//added in 14.0
> 		$admtext['photonotuploaded'] = "Detta foto kunde inte läggas till, troligen pga att filen är för stor för att laddas upp eller för att skapa en frimärksbild.";
> 		$admtext['moved'] = "Flyttad";
> 		$admtext['url'] = "URL";
> 		//changed in 14.0
> 		$admtext['enterphotodesc'] = "Skriv in titel och beskrivning för detta media.";
> 		$admtext['mapinstr3'] = "För att länka en del av detta foto till en person, familj eller annan enhet, välj först träd och enhetstyp, skapa sedan en rektangel för den önskade ytan. Detta sker genom att klicka övre vänstra hörnet av ytan, och sedan dra till nedre högra hörnet. Alternativt kan du klicka övre vänstra hörnet och sedan det nedre högra. En popup-box kommer då att hjälpa dig att välja person eller enhet. Välj, och repetera sedan denna process om du vill välja flera ytor. Klicka en befintlig yta för att välja, dra sedan för ätt flytta, eller klicka 'X' för att radera.";
596d633
< 		$admtext['foremptystring'] = "För nollsträng, lämna detta fält blankt och klicka på \"Lägg till >>.\"";
635d671
< 		//added in 9.1.1
646a683,686
> 		//added in 14.0
> 		$admtext['instr'] = "Instruktioner: Dra eller dubbelklicka rubrikerna till vänser för att föra över dem till höger. Dra upp och ner för att sortera om. Dubbelklicka igen för att ta bort.";
> 		//changed in 14.0
> 		$admtext['foremptystring'] = "För att skapa en tom sträng, lämna detta fält blankt och klicka >>";
651,655d690
< 		$admtext['selectimportfile'] = "Välj fil att importera.";
< 		$admtext['importgedcom'] = "Importera GEDCOM (standard 5.5 format)";
< 		$admtext['addreplacedata'] = "Lägg till eller ersätt i databasen (kan ta flera minuter beroende på filstorlek)";
< 		$admtext['fromyourcomputer'] = "Från din dator";
< 		$admtext['importdata'] = "Importera data";
657,660d691
< 		$admtext['replace'] = "Ersätt (i det valda trädet)";
< 		$admtext['desttree'] = "Träd till vilket importen ska göras";
< 		$admtext['selectdesttree'] = "Välj eller skriv in till vilket träd importen ska göras.";
< 		$admtext['selectexisting'] = "Importera till";
668,673d698
< 		$admtext['ucaselast'] = "Alla efternamn med VERSALER";
< 		$admtext['norecalc'] = "Gör ej ny beräkning av definionen Levande";
< 		$admtext['autooffset'] = "Starta ID vid första tillgängliga nummer";
< 
< 		$admtext['mustselecttree'] = "Du måste välja ett träd innan du kan göra detta val.";
< 		$admtext['importmedia'] = "Importera media om sådant finns";
675d699
< 		$admtext['neweronly'] = "Ersätt endast om nyare";
677,692d700
< 		$admtext['onwebserver'] = "PÃ¥ webserver (i GEDCOM-mappen)";
< 		$admtext['eventsonly'] = "Importera endast egendefinierade händelsetyper";
< 		$admtext['imphints'] = "Tips: \"All befintlig data\" betyder alla personer, familjer, källor och noteringar (media-länkar förloras ej så länge ID kvarstår). Interna länkar baseras alltid enbart på ID. Nya poster läggs alltid till.<br> \"Lägg till alla poster\" importerar alla poster med nya ID.";
< 		$admtext['allevents'] = "Acceptera data för alla nya egendefinierade händelsetyper";
< 		$admtext['destbranch'] = "Destinations-gren (valfri)";
< 		$admtext['inframe'] = "(i ram)";
< 		$admtext['getstart'] = "Starthjälp";
< 		$admtext['importlatlong'] = "Importera data för latitud/longitud om det finns";
< 		$admtext['opening'] = "Öppnar";
< 		$admtext['reopen'] = "Åter-öppnar";
< 		$admtext['uploading'] = "Laddar upp";
< 		$admtext['stop'] = "Stoppa";
< 		$admtext['stopped'] = "Import stoppad";
< 		$admtext['resume'] = "Ã…teruppta";
< 		//changed in 8.0.0
< 		$admtext['showlog'] = "Visa loggen";
695,696d702
< 		//added in 9.0.0
< 		$admtext['oldimport'] = "Äldre import (ingen förloppsindikator)";
713a720,724
> 		//added in 14.0
> 		$admtext['upgrade'] = "Uppgradera";
> 		$admtext['need_upgrade'] = "Avsluta dessa uppgraderingsinstruktioner";
> 		$admtext['upgrade_missing'] = "Uppgraderingsfilen verkar saknas, så du är kanske redan klar.";
> 		$admtext['delete_upgrade'] = "När du är klar, klicka här för att radera uuppgraderingsfilen och återgå till menyn.";
723d733
< 		$admtext['author'] = "Författare";
804,809c814,819
< 		$admtext['momside'] = "Morssidans märke"; //8
< 		$admtext['dadside'] = "Farssidans märke"; //8
< 		$admtext['momperson'] = "Morssidans person-ID"; //8
< 		$admtext['momtree'] = "Morssidans träd-ID"; //8
< 		$admtext['dadperson'] = "Farssidans person-ID"; //8
< 		$admtext['dadtree'] = "Farssidans träd-ID"; //8
---
> 		$admtext['momside'] = "Morssidans märke"; //8, 20
> 		$admtext['dadside'] = "Farssidans märke"; //8, 20
> 		$admtext['momperson'] = "Morssidans person-ID"; //8, 20
> 		$admtext['momtree'] = "Morssidans träd-ID"; //8, 20
> 		$admtext['dadperson'] = "Farssidans person-ID"; //8, 20
> 		$admtext['dadtree'] = "Farssidans träd-ID"; //8, 20
887c897,980
< 
---
> 		//added in 12.2
> 		$admtext['quotehead'] = "Citatrubrik";
> 		$admtext['quotesubhead'] = "Citat subheader";
> 		$admtext['sniptitle'] = "Featurette title";
> 		$admtext['snipname'] = "Featurette name";
> 		$admtext['snipinfoone'] = "Featurette first line";
> 		$admtext['snipinfotwo'] = "Featurette andra raden";
> 		$admtext['snipimage'] = "Featurette image";
> 		$admtext['snipperson'] = "Featurette person ID";
> 		$admtext['sniptree'] = "Featurette tree ID";
> 		$admtext['quote'] = "Citat";
> 		$admtext['link'] = "Länk";
> 		$admtext['featuretitle7'] = "Artikel 7 titel";
> 		$admtext['featuretitle8'] = "Artikel 8 titel";
> 		$admtext['featuretitle9'] = "Artikel 9 titel";
> 		$admtext['featurethumb9'] = "Artikel 9 frimärksbild"; //15
> 		$admtext['featurelink9'] = "Artikel 9 länk"; //15
> 		$admtext['featurepara9'] = "Artikel 9 stycke"; //15
> 		//added in 13.0
> 		$admtext['leftimg'] = "Vänster bild i sidhuvud";
> 		$admtext['rightimg'] = "Höger bild i sidhuvud";
> 		$admtext['photoption'] = "Fotoinställningar är<br />&nbsp;&nbsp;(förinställda eller godtyckliga)";
> 		$admtext['randomphotowidth'] = "Godtycklig fotobredd";
> 		$admtext['randomphotoheight'] = "Godtycklig fotohöjd";
> 		$admtext['randomphotomediatypeID'] = "Godtycklig fotokollektion";
> 		$admtext['momheading'] = "Rubrik morssida";
> 		$admtext['mompara'] = "Stycke morssida";
> 		$admtext['mompagelink'] = "Sidlänk morssida";
> 		$admtext['dadheading'] = "Rubrik farssida";
> 		$admtext['dadpara'] = "Stycke farssida";
> 		$admtext['dadpagelink'] = "Sidlänk farssida";
> 		$admtext['spmomheading'] = "Rubrik makes/makas morssida";
> 		$admtext['spmompara'] = "Stycke makes/makas morssida";
> 		$admtext['spmompagelink'] = "Sidlänk makes/makas morssida";
> 		$admtext['spmomside'] = "Etikett makes/makas morssida";
> 		$admtext['spdadside'] = "Etikett makes/makas farssida";
> 		$admtext['spmomperson'] = "Person-ID makes/makas morssida";
> 		$admtext['spmomtree'] = "Träd-ID makes/makas morssida";
> 		$admtext['spdadheading'] = "Rubrik makes/makas farssida";
> 		$admtext['spdadpara'] = "Stycke makes/makas farssida";
> 		$admtext['spdadpagelink'] = "Sidlänk makes/makas farssida";
> 		$admtext['spdadperson'] = "Person-ID makes/makas farssida";
> 		$admtext['spdadtree'] = "Träd-ID makes/makas farssida";
> 		$admtext['storiesheading'] = "Våra släkthistorier";
> 		$admtext['nbrsurnames'] = "Antal efternamn<br />&nbsp;&nbsp; i namnmolnet";
> 		//added in 13.0.4
> 		$admtext['featurethumb'] = "Artikel frimärksbild";
> 		//added in 13.1
> 		$admtext['slidetitle'] = "Slide Title";
> 		$admtext['slideimg'] = "Slide Image";
> 		$admtext['slideheadline'] = "Slide Headline";
> 		$admtext['slidetext'] = "Slide Text";
> 		$admtext['slidelink'] = "Slide Link";
> 		$admtext['slidelinktext'] = "Slide Link Name";
> 		$admtext['featurelink'] = "Feature Link";
> 		$admtext['featurelinktext'] = "Feature Link Name";
> 		$admtext['featuretitle'] = "Feature Title";
> 		$admtext['featuresub'] = "Feature Subtitle";
> 		$admtext['quoteimg'] = "Quote Image";
> 		$admtext['quotelink'] = "Quote Link";
> 		$admtext['quotelinktext'] = "Quote Link Name";
> 		$admtext['sidebarpara'] = "Sidebar Paragraph";
> 		$admtext['sidebarlink'] = "Sidebar Link";
> 		$admtext['sidebarlinktext'] = "Sidebar Link Name";
> 		$admtext['sidebarimg'] = "Sidebar Image";
> 		$admtext['sidebartitle'] = "Sidebar Title";
> 		$admtext['sidebarsub'] = "Sidebar Subtitle";
> 		$admtext['snipheadline'] = "Featurette Headline";
> 		$admtext['snipsubhead'] = "Featurette Subhead";
> 		$admtext['snipimg'] = "Featurette Image";
> 		$admtext['sniplink'] = "Featurette Link";
> 		$admtext['sniplinktext'] = "Featurette Link Name";
> 		$admtext['linktext'] = "Link Text";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['footerheadline'] = "Footer Headline";
> 		$admtext['footerpara'] = "Footer Text";
> 		$admtext['footerlink'] = "Footer Link";
> 		$admtext['footerlinktext'] = "Footer Link Name";
> 		$admtext['headerlink'] = "Header Link";
> 		$admtext['headerlinktext'] = "Header Link Name";
> 	
1232d1324
< 		//added in 8.0.0
1255d1346
< 		//added in 9.0.0
1278d1368
< 		//changed in 10.0.0
1280d1369
< 		//added in 10.0.0
1293d1381
< 		//added in 10.1.0
1296d1383
< 		//added in 10.1.2
1298d1384
<         //added in 11.0.0
1330d1415
< 		//changed in 11.0.2
1340c1425
< 		$admtext['mediatrees'] = "Dela upp media i tre mappar";
---
> 		$admtext['mediatrees'] = "Dela upp media i separata mappar per träd";
1359,1361c1444,1446
< 		$admtext['cookieapproval'] = "Visa meddelande om godkännande av cookies"; 
< 		$admtext['dataprotectmsg'] = "Visa länk till dataskyddspolicy"; 
< 		$admtext['nointernet'] = "Jag använder TNG offline"; 
---
> 		$admtext['cookieapproval'] = "Visa meddelande om godkännande av cookies";
> 		$admtext['dataprotectmsg'] = "Visa länk till dataskyddspolicy";
> 		$admtext['nointernet'] = "Jag använder TNG offline";
1362a1448,1476
> 		//added in 13.0
> 		$admtext['coerce'] = "Ändra inkommande prefix så att de matchar inställningarna i TNG";
> 		$admtext['sortevents'] = "Sortera händelser efter";
> 		$admtext['sortbydate'] = "Händelsdatum";
> 		$admtext['sortbytype'] = "Händelsetyp";
> 		$admtext['allowsuggest'] = "Tillåt besökare att lämna förslag";
> 		$admtext['livingchecked'] = "Markera nya personer och familjer som levande";
> 		$admtext['maxmarried'] = "Markera familjer som levande om gifta färre än<br/>detta antal år";
> 		$admtext['imagetags'] = "Rektanglar";
> 		$admtext['allowcsv'] = "Tillåt nedladdning av rapporter i CSV-format";
> 		//added in 14.0
> 		$admtext['onbackup'] = "Backup-alternativ";
> 		$admtext['dosql'] = "Exportera som SQL";
> 		$admtext['dodrop'] = "Inkludera DROP TABLE IF EXISTS";
> 		$admtext['docreate'] = "Inkludera CREATE TABLE";
> 		$admtext['onrestore'] = "Återställ alternativen";
> 		$admtext['dodel'] = "Radera först tidigare innehåll";
> 		$admtext['download'] = "Ladda ner";
> 		$admtext['altbirthtypes'] = "Alternativa födelsetyper";
> 		$admtext['dtformat'] = "Tabellformat";
> 		$admtext['conchart'] = "Kopplingsdiagram";
> 		$admtext['maxropt'] = "Max antal sökningar av kopplingar";
> 		$admtext['maxlopt'] = "Max längd för kopplingars sökvägar";
> 		$admtext['showtxtopt'] = "Visa sökvägssammanställning i textformat";
> 		$admtext['compactboxopt'] = "Visa personrutor i kompakt format";
> 		$admtext['sortbyopt'] = "Sortera sökvägar på";
> 		$admtext['anchoridopt'] = "Ankar-ID";
> 		$admtext['maxmopt'] = "Max antal vigslar i koppling";
> 		$admtext['saveincfg'] = "Spara i konfigureringssökväg (se Allmänna Inställningar)";
1395d1508
< 		//added in 8.0.0
1416d1528
<         $admtext['nogeocode'] = "Kunde inte geokodas";
1423a1536,1537
> 		//added in 13.0.0
> 		$admtext['donotgeocode'] = "Ingen geokodning";
1436d1549
< 		$admtext['backtosecondary'] = "Tillbaka till sekundära processer";
1456a1570,1571
> 		//changed in 14.0
> 		$admtext['backtosecondary'] = "Tillbaka till verktygen för post-import";
1501d1615
< 		//added in 8.0.0
1507d1620
< 		//changed in 9.0.0
1513a1627,1631
> 		//added in 13.0
> 		$admtext['exnotes'] = "Exkludera noteringar";
> 		//added in 14.0
> 		$admtext['exportmediafiles'] = "Zippa och inkludera mediafiler";
> 		$admtext['downloadzip'] = "Ladda ner ZIP";
1575d1692
< 		//added in 8.0.0
1598d1714
<         //added in 9.0.0
1606c1722
< 		$admtext['consented'] = "Godkänt "; 
---
> 		$admtext['consented'] = "Godkänt ";
1607a1724,1729
> 		//added in 13.0
> 		$admtext['disabledonly'] = "Visa enbart inaktiverade användare";
> 		//added in 13.1
> 		$admtext['allow_private_notes'] = "Allow to view private notes";
> 		//added in 14.0
> 		$admtext['sendtoadmins'] = "Skicka också till admins när ett enskilt träd väljs";
1617d1738
< 		//added in 8.1.0
1640d1760
< 		//added in 9.0.0
1656d1775
< 	//added in 8.0.0
1697d1815
< 		//changed in 9.0.0
1699d1816
< 		//added in 9.0.0
1879a1997,2002
> 		//added in 14.0.0
> 		$admtext['allmods'] = "Alla Moddar";
> 		$admtext['installedmods'] = "Enbart installerade Moddar";
> 		$admtext['partinstmods'] = "Installerade + Delvis Installerade Moddar";
> 		$admtext['showanalyzeractions'] = "Visa aktiviteter i Mod-Analysator";
> 		$admtext['badchar'] = "Ogiltigt tecken"; 
1886d2008
< 		$admtext['test_number'] = "Testnummer";
1918a2041,2049
> 		// changed in 12.1.0
> 		$admtext['test_number'] = "Testnummer";
> 		//added in 12.1.0
> 		$admtext['privatetest'] = "Keep Test Private";
> 		$admtext['multivalues'] = "Use dashes between multi-values";
> 		$admtext['changestogroup'] = "Changes to DNA Group";
> 		$admtext['modifydnagroup'] = "Edit Existing DNA Group";
> 		//added in 14.0
> 		$admtext['dnalinkssubt'] = "Länka detta DNA-test till en person"; 
1965d2095
< $admtext['otherevents'] = "Andra händelser";
2050,2051d2179
< $admtext['savereturn'] = "återvänd till denna sida";
< $admtext['saveback'] = "återvänd till förra menyn";
2058,2059d2185
< $admtext['secondary'] = "Sekundära processer";
< $admtext['commas'] = "Separarera flera uppgifter med komma";
2129,2130d2254
< $admtext['secondarymaint'] = "Sekundära underhållsprocesser";
< $admtext['customeventtypes'] = "Egendefinierade händelsetyper";
2219d2342
< //changed in 8.0.0
2223d2345
< //moved here in 8.0.0
2228d2349
< //added in 8.0.0
2236d2356
< //moved here in 9.0.0
2245d2364
< //added in 9.0.0
2277,2279d2395
< //changed in 9.2.0
< $admtext['linktype'] = "Typ";
< //moved here in 10.0.0
2282d2397
< //added in 10.0.0
2305a2421,2425
> //added in 12.2
> $admtext['surnames'] = "Efternamn";
> $admtext['subhead'] = "Subhead";
> $admtext['image'] = "Bild";
> $admtext['author'] = "Författare";
2310,2311c2430,2465
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //moved here in 13.0.0
> $admtext['getstart'] = "Starthjälp";
> $admtext['showlog'] = "Visa loggen";
> $admtext['nobirthinfo'] = "Ingen födelseinformation";
> //changed in 13.0
> $admtext['savereturn'] = "Spara + Stanna kvar på sidan";
> $admtext['saveback'] = "Spara + Lämna sidan";
> //added in 13.0
> $admtext['allitemsdeleted'] = "Alla poster har tagits bort.";
> $admtext['private'] = "Privat";
> $admtext['imgtags'] = "Bildtaggar";
> 
> $admtext['removelink'] = "Radera länk";
> $admtext['eloptions'] = "Bläddra eller radera";
> $admtext['pleaseenter'] = "Skriv in en ";
> 
> $admtext['nolinks'] = "Inga länkar finns ännu";
> $admtext['nogeocode'] = "Kunde inte geokodas";
> 
> //moved here in 14.0
> $admtext['choosedef'] = "Valj<br/>standard-<br/>foto"; //has to fit in a small box
> //changed in 14.0
> $admtext['customeventtypes'] = "Händelse / Typ av attribut";
> $admtext['secondary'] = "Post-import Verktyg";
> $admtext['otherevents'] = "Andra Händelser / Attribut";
> //added in 14.0
> $admtext['newlinks'] = "Länkar skapade";
> $admtext['newcemlinks'] = "Länkar till gravplatser skapade";
> $admtext['utility'] = "Verktyg";
> $admtext['linktype'] = "Typ";
> $admtext['move'] = "Flytta";
> $admtext['copy'] = "Kopiera";
> $admtext['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
diff -r TNG/languages/Swedish-UTF8/alltext.php TNG1403/languages/Swedish-UTF8/alltext.php
88d87
< //moved here in 8.0.0
114,115d112
< 
< //moved here in 8.1.0
120d116
< //added in 11.0.3
123d118
< //added in 9.0.0
125,126d119
< 
< //moved here in 9.0.0
139d131
< //moved here in 9.0.4
141,142d132
< 
< //moved here in 10.0.0
148,149d137
< 
< //added in 10.0.0
155,156d142
< 
< //added in 11.0.0
159d144
< $text['problem'] = "Ett fel uppstod i TNG-programmet. Detta kan bero på installationsfel, ofullständig uppgradering eller programfel. Om du är ägare till sajten, kontakta TNG-supporten för hjälp med problemet. Kopiera query-texten nedan och klistra in den i ditt meddelande.";
163d147
< //moved here in 12.0.0
173d156
< //added here in 12.0.0
175d157
< $text['test_number'] = "Test Number/Name";
203,204d184
< 
< //moved here in 12.0.0
205a186,254
> $text['test_number'] = "Test Number/Name";
> $admtext['match_date'] = "Match Date";
> $admtext['gedmatchID'] = "GEDmatch ID";
> $admtext['ydna_haplogroup'] = "Y-DNA Haplogroup";
> $admtext['mtdna_haplogroup'] = "mtDNA Haplogroup";
> $admtext['relationship_section'] = "Relationship Section";
> $admtext['relationship_range'] = "Relationship Range";
> $admtext['suggested_relationship'] = "Suggested";
> $admtext['actual_relationship'] = "Actual Relationship";
> $admtext['related_side'] = "Related Branch";
> $admtext['shared_dna'] = "Shared DNA";
> $admtext['shared centimorgans'] = "Total shared cMs";
> $admtext['shared_segments'] = "Shared segments";
> $admtext['largest_segment'] = "Largest Segment";
> $admtext['chromosome'] = "Chromosome No";
> $admtext['segment_start'] = "Segment Start";
> $admtext['segment_end'] = "Segment End";
> $admtext['centiMorgans'] = "centiMorgans";
> $admtext['matchingSNPs'] = "Matching SNPs";
> $admtext['xmatch'] = "X-Match";
> $text['keep_test_private'] = "Private Test";
> $text['shared_dna'] = "Shared DNA Segment";
> $text['for_match'] = "for this match";
> $admtext['keeptest'] = "Test Privacy";
> $admtext['keepname'] = "Name Privacy";
> $admtext['allgroups'] = "All Groups";
> $admtext['alltypes'] = "All Types";
> $admtext['generation_num'] = "Generations For Ancestral Surnames";
> 
> $text['birthabbr'] = "f.";
> $text['chrabbr'] = "dp.";
> $text['deathabbr'] = "d.";  //from descend
> $text['burialabbr'] = "bg.";  //from descend
> $text['marrabbr'] = "v.";
> 
> //moved here fron text.php in TNG 13.0
> $text['findplaces'] = "Hitta alla personer med händelser på denna plats";
> $text['firstpage'] = "Första sidan";
> $text['lastpage'] = "Sista sidan";
> 
> //changed in 13.0.0
> $text['problem'] = "Ett fel har inträffat i programvaran för TNG. Gör så här:<p>Om du precis har installerat en uppgradering, så kan du ha missat en del av installationsanvisningarna. Gå tillbaka till ReadMe/LäsMig-sidan för uppgraderingen och kontrollera anvisningarna. Var extra noga med alla instruktioner som rör databasens struktur.</p><p>Om du precis har installerat TNG för första gången, så kan du behöva skapa tabeller i databasen. Gå tillbaka till Readme.html-sidan och leta efter detta steg bland anvisningarna. </p><p>Om du är webbplatsens ägare, så kan du kontakta TNG-supporten för mer hjälp med detta problem. Vänligen kopiera databasfrågan nedan (SQL) och klista in i ditt meddelande.</p>";
> //added in 13.0.0
> $admtext['nobranch'] = "Ingen gren";
> 
> //added in 14.0
> $text['oneyear'] = "Ã¥r";
> $text['pwdcodelink'] = "Klicka denna länk för att få ett temporärt lösenord skickat till dig";
> $text['pwdcodesent'] = "En länk för återställning av lösenord har skickats till din e-postadress.";
> $text['moved'] = "Flyttad";
> $text['citation'] = "Citat";
> $text['other'] = "Annat";
> $text['death'] = "Död";
> $text['burial'] = "Begravning";
> $text['cremation'] = "Kremering";
> $text['marriage'] = "Vigsel";
> $text['divorce'] = "Skilsmässa";
> $text['bylength'] = "Steg";
> $text['bymarriages'] = "Vigslar";
> $text['none'] = "Ingen";
> 
> //moved here in 14.0
> $text['family'] = "Familj";
> $text['source'] = "Källa";
> $text['repository'] = "Arkiv";
> $text['place'] = "Plats";
> $admtext['BAPM'] = "Dop";
> 
> $text['glang'] = "sv";
208c257
< $english = $session_charset == "UTF-8" ? "English-UTF8" : "English";
---
> $english = $_SESSION['session_charset'] == "UTF-8" ? "English-UTF8" : "English";
210c259
< @include("cust_text.php");
---
> @include(dirname(__FILE__) . "/cust_text.php");
Only in TNG1403/languages/Swedish-UTF8: data_protection_policy.php
diff -r TNG/languages/Swedish-UTF8/text.php TNG1403/languages/Swedish-UTF8/text.php
69d68
< 		$text['general'] = "Allmänt";
77a77
> 	case "connections":
90c90
< 		$text['sameperson'] = "De två individerna är en och samma person.";
---
> 		$text['sameperson'] = "De två individerna är samma person.";
93c93
< 		$text['sometimes'] = "(Ibland får man olika resultat om man söker över olika antal generationer.)";
---
> 		$text['sometimes'] = "(Ibland får man ett annat resultat om man söker över ett annat antal generationer.)";
144c144
< 		$text['dospouses2'] = "Visa Makar";
---
> 		$text['dospouses2'] = "Visa makar";
171a172,240
> 		//added in 14.0
> 		$text['pathscalc'] = "Sök kopplingar";
> 		$text['findrel2'] = "Hitta relationer och andra kopplingar";
> 		$text['makeme2nd'] = "Använd mitt ID";
> 		$text['usebookmarks'] = "Använd bokmärken";
> 		$text['select2inds'] = "Välj två individer.";
> 		$text['indinfofor'] = "Individ-info för";
> 		$text['nobookmarks'] = "Det finns inget bokmärke att använda";
> 		$text['bkmtitle'] = "Personer funna bland bokmärken";
> 		$text['bkminfo'] = "Välj en person:";
> 		$text['sortpathsby'] = "Sortera sökvägar på antal";
> 		$text['sortbyshort'] = "Sortera på";
> 		$text['bylengthshort'] = "Längd";
> 		$text['badID1'] = ": felaktigt person1-ID - gå tillbaka och rätta";
> 		$text['badID2'] = ": felaktigt person2-ID - gå tillbaka och rätta";
> 		$text['notintree'] = ": personen med detta ID finns inte i det valda trädet.";
> 		$text['sameperson'] = "De två individerna är samma person.";;
> 		$text['nopaths'] = "Dessa personer är inte kopplade.";
> 		$text['nopaths1'] = "Inga fler kopplingar kortare än xxx";
> 		$text['nopaths2'] = "i xxx söksteg";
> 		$text['longestpath'] = "(längsta kontrollerade sökväg hittills var xxx steg lång)";
> 		$text['relevantpaths'] = "Antal unika relevanta sökvägar funna: xxx";
> 		$text['skipMarr'] = "(dessutom  hittades följande antal sökvägar som inte visas pga för många vigslar: xxx)";
> 		$text['mjaor'] = "eller";
> 		$text['connectionsto'] = "Kopplingar till ";
> 		$text['findanotherpers'] = "Hitta ytterligare person...";
> 		$text['sometimes'] = "(Ibland får man ett annat resultat om man söker över ett annat antal generationer.)";
> 		$text['anotherpath'] = "Sök efter ytterligare kopplingar";
> 		$text['xpath'] = "Sökväg ";
> 		$text['primary'] = "Startperson"; // note: used for both Start and End if text['fin'] not set
> 		$text['secondary'] = "Slutperson";
> 		$text['parent'] = "Förälder";
> 		$text['mhfather'] = "hans far";
> 		$text['mhmother'] = "hans mor";
> 		$text['mhhusband'] = "hans make";
> 		$text['mhwife'] = "hans hustru";
> 		$text['mhson'] = "hans son";
> 		$text['mhdaughter'] = "hans dotter";
> 		$text['fhfather'] = "hennes far";
> 		$text['fhmother'] = "hennes mor";
> 		$text['fhhusband'] = "hennes make";
> 		$text['fhwife'] = "hennes hustru";
> 		$text['fhson'] = "hennes son";
> 		$text['fhdaughter'] = "hennes dotter";
> 		$text['hfather'] = "far";
> 		$text['hmother'] = "mor";
> 		$text['hhusband'] = "make";
> 		$text['hwife'] = "maka";
> 		$text['hson'] = "son";
> 		$text['hdaughter'] = "dotter";
> 		$text['maxruns'] = "Max antal sökvägar att kontrollera";
> 		$text['maxrshort'] = "Max sökvägar";
> 		$text['maxlength'] = "Kopplingsvägar ej längre än";
> 		$text['maxlshort'] = "Max längd";
> 		$text['xstep'] = "steg";
> 		$text['xsteps'] = "steg";
> 		$text['xmarriages'] = "xxx vigslar";
> 		$text['xmarriage'] = "1 vigsel";
> 		$text['showspouses'] = "Visa båda makarna";
> 		$text['showTxt'] = "Visa sökvägsbeskrivningen i textformat";
> 		$text['showTxtshort'] = "Beskr. i textformat";
> 		$text['compactBox'] = "Visa kompakta personrutor";
> 		$text['compactBoxshort'] = "Kompakta rutor";
> 		$text['paths'] = "Sökvägar";
> 		$text['dospouses2'] = "Visa makar";
> 		$text['maxmopt'] = "Max vigslar per koppling"; 
> 		$text['maxm'] = "Max vigslar"; 
> 		$text['arerelated'] = "Dessa personer är släkt - deras släktskap visas i Sökväg 1";
> 		$text['simplerel'] = "Enkel släktskapssökning";
196d264
< 		$text['scrollnote'] = "OBS! Du måste kanske bläddra nedåt eller till höger för att se diagrammet.";
199d266
< 		$text['popupnote2'] = " = Ny antavla";
263a331,349
> 		//added in 14.0
> 		$text['dtformat'] = "Tabeller";
> 		$text['dtchildren'] = "Barn";
> 		$text['dtgrandchildren'] = "Barnbarn";
> 		$text['dtggrandchildren'] = "Barnbarnsbarn";
> 		$text['dtgggrandchildren'] = "Barnbarnsbarnsbarn"; //For 2x great grandchildren, 3x great grandchildren, etc. Usually different in Scandinavian languages
> 		$text['greatoffset'] = "1"; //Scandinavian languages should set this to 1 so counting starts a generation later
> 		$text['dtnodescendants'] = "Inga ättlingar";
> 		$text['dtgen'] = "Gen";
> 		$text['dttotal'] = "Totalt";
> 		$text['dtselect'] = "Välj";
> 		$text['dteachfulltable'] = "Varje hel tabell kommer att ha";
> 		$text['dtrows'] = "rader";
> 		$text['dtdisplayingtable'] = "Visar tabell";
> 		$text['dtgototable'] = "GÃ¥ till tabell:";
> 		$text['fcinstrdn'] = "Visa familj med make/maka";
> 		$text['fcinstrup'] = "Visa familj med föräldrar";
> 		$text['fcinstrplus'] = "Välj andra makar/makor";
> 		$text['fcinstrfam'] = "Välj andra föräldrar";
381,383c467
< 		$text['firstpage'] = "Första sidan";
< 		$text['lastpage'] = "Sista sidan";
< 		$text['photoowner'] = "Ägare/Källa";
---
> 		$text['photoowner'] = "Ägare av original";
435a520,521
> 		//added in 13.0
> 		$text['toggletags'] = "Växla taggar";
549d634
< 		//changed in 8.0.0
556d640
< 		//added in 8.0.0
560a645,651
> 		//added in 14.0
> 		$text['newpassword2'] = "Nytt lösenord igen";
> 		$text['resetsuccess'] = "OK: Lösenordet har ändrats";
> 		$text['resetfail'] = "FEL: Lösenordet har inte ändrats";
> 		$text['failreason0'] = " (okänt databasfel)";
> 		$text['failreason2'] = " (du har inte rättigheter att ändra ditt lösenord)";
> 		$text['failreason3'] = " (lösendordet passade inte)";
591a683,684
> 		//added in 14.0
> 		$text['totalsourcecitations'] = "Totalt antal Källhänvisningar";
618d710
< 		$text['loginfirst'] = "Du måste först logga in.";
625a718,719
> 		//changed in 13.0.0
> 		$text['loginfirst'] = "Vi har hittat dataposter för existerande användare. För att fortsätta måste du först logga in och tömma användar-tabellen.";
629,630d722
< 		$text['zoomin'] = "Zooma In";
< 		$text['zoomout'] = "Zooma Ut";
656d747
< 		$text['dna_info_head'] = "Information om DNA-test";
659a751,775
> 		//added in 12.1.0
> 		$text['dnatestscompare_mtdna'] = "Compare selected mtDNA Tests";
> 		$text['dnatestscompare_atdna'] = "Compare selected atDNA Tests";
> 		$text['chromosome'] = "Chr";
> 		$text['centiMorgans'] = "cM";
> 		$text['snps'] = "SNPs";
> 		$text['y_haplogroup'] = "Y-DNA";
> 		$text['mt_haplogroup'] = "mtDNA";
> 		$text['sequence'] = "Ref";
> 		$text['extra_mutations'] = "Extra Mutations";
> 		$text['mrca'] = "MRC Ancestor";
> 		$text['ydna_test'] = "Y-DNA Tests";
> 		$text['mtdna_test'] = "mtDNA (Mitochondrial) Tests";
> 		$text['atdna_test'] = "atDNA (autosomal) Tests";
> 		$text['segment_start'] = "Start";
> 		$text['segment_end'] = "End";
> 		$text['suggested_relationship'] = "Suggested";
> 		$text['actual_relationship'] = "Actual";
> 		$text['12markers'] = "Markers 1-12";
> 		$text['25markers'] = "Markers 13-25";
> 		$text['37markers'] = "Markers 26-37";
> 		$text['67markers'] = "Markers 38-67";
> 		$text['111markers'] = "Markers 68-111";
> 		//added in 13.1
> 		$text['comparemore'] = "At least two tests must be selected to compare.";
670,671d785
< $text['birthabbr'] = "f.";
< $text['chrabbr'] = "dp.";
675d788
< $text['family'] = "Familj"; //from getperson
685d797
< $text['deathabbr'] = "d.";  //from descend
706d817
< $text['burialabbr'] = "bg.";  //from descend
712d822
< $text['place'] = "Plats";
715d824
< $text['marrabbr'] = "v.";
738d846
< $text['source'] = "Källa";
766d873
< $text['repository'] = "Arkiv";
770d876
< $text['findplaces'] = "Hitta alla personer med händelser på denna plats";
804d909
< $text['glang'] = "&amp;hl=sv";
816d920
< $text['none'] = "Ingen";
924d1027
< $text['otherevents'] = "Andra Händelser";
952,953d1054
< $text['people_have'] = "personer har länkat ett DNA-test till";
< $text['person_has'] = "person har länkat ett DNA-test till";
956,959c1057,1060
< $text['cookieuse'] = "OBS: Denna sajt använder cookies."; 
< $text['dataprotect'] = "Dataskyddspolicy "; 
< $text['viewpolicy'] = "Visa policy"; 
< $text['understand'] = "Jag förstår"; 
---
> $text['cookieuse'] = "OBS: Denna sajt använder cookies.";
> $text['dataprotect'] = "Dataskyddspolicy ";
> $text['viewpolicy'] = "Visa policy";
> $text['understand'] = "Jag förstår";
963,965c1064,1117
< @include_once("captcha_text.php");
< @include_once("alltext.php");
< if(!$alltextloaded) getAllTextPath();
---
> //added in 12.1.0
> $text['testsarelinked'] = "DNA tests are associated with";
> $text['testislinked'] = "DNA test is associated with";
> 
> //added in 12.2
> $text['quicklinks'] = "Snabblänkar";
> $text['yourname'] = "Ditt namn";
> $text['youremail'] = "Din e-postadress";
> $text['liketoadd'] = "All information du vill lägga till";
> $text['webmastermsg'] = "Webmastermeddelande";
> $text['gallery'] = "Se Galleri";
> $text['wasborn_male'] = "föddes";  	// same as $text['wasborn'] if no gender verb
> $text['wasborn_female'] = "föddes"; 	// same as $text['wasborn'] if no gender verb
> $text['waschristened_male'] = "döptes";	// same as $text['waschristened'] if no gender verb
> $text['waschristened_female'] = "döptes";	// same as $text['waschristened'] if no gender verb
> $text['died_male'] = "dog";	// same as $text['anddied'] of no gender verb
> $text['died_female'] = "dog";	// same as $text['anddied'] of no gender verb
> $text['wasburied_male'] = "begravdes"; 	// same as $text['wasburied'] if no gender verb
> $text['wasburied_female'] = "begravdes"; 	// same as $text['wasburied'] if no gender verb
> $text['wascremated_male'] = "kremerades";		// same as $text['wascremated'] if no gender verb
> $text['wascremated_female'] = "kremerades";	// same as $text['wascremated'] if no gender verb
> $text['wasmarried_male'] = "gift";	// same as $text['wasmarried'] if no gender verb
> $text['wasmarried_female'] = "gift";	// same as $text['wasmarried'] if no gender verb
> $text['wasdivorced_male'] = "skildes";	// might be the same as $text['divorce'] but as a verb
> $text['wasdivorced_female'] = "skildes";	// might be the same as $text['divorce'] but as a verb
> $text['inplace'] = " i ";			// used as a preposition to the location
> $text['onthisdate'] = " den ";		// when used with full date
> $text['inthisyear'] = " ";		// when used with year only or month / year dates
> $text['and'] = "och ";				// used in conjunction with wasburied or was cremated
> 
> //moved here in 12.2.1
> $text['dna_info_head'] = "Information om DNA-test";
> //added in 13.0
> $text['visitor'] = "Besökare";
> 
> $text['popupnote2'] = " = Ny antavla";
> 
> //moved here in 14.0
> $text['zoomin'] = "Zooma In";
> $text['zoomout'] = "Zooma Ut";
> $text['scrollnote'] = "Dra eller skrolla för att se mer av diagrammet.";
> $text['general'] = "Allmänt";
> 
> //changed in 14.0
> $text['otherevents'] = "Andra Händelser och Attribut";
> 
> //added in 14.0
> $text['times'] = "x";
> $text['connections'] = "Kopplingar";
> $text['continue'] = "Fortsätt";
> $text['title2'] = "Titel"; //for media, sources, etc (not people)
> 
> @include_once(dirname(__FILE__) . "/alltext.php");
> if(empty($alltextloaded)) getAllTextPath();
Only in TNG1403/languages: Turkish-UTF8
diff -r TNG/logconfig.php TNG1403/logconfig.php
3a4
> $logsaveconfig = "";
diff -r TNG/loginlib.php TNG1403/loginlib.php
2c2
< 	if($p && !$cms['support'])
---
> 	if(!empty($p) && !$cms['support'])
9c9
< 	if( $message ) {
---
> 	if(!empty($message)) {
22c22
< 		<input type="text" name="tngusername" class="loginfont <?php echo $loginfieldclass; ?>" id="tngusername" /><br/>
---
> 		<input type="text" name="tngusername" class="<?php echo $loginfieldclass; ?>" id="tngusername" style="font-size: 16pt; height: auto" /><br/>
25c25,26
< 		<input type="password" name="tngpassword" class="loginfont <?php echo $loginfieldclass; ?>" id="tngpassword" />
---
> 		<input type="password" name="tngpassword" class="<?php echo $pwdfieldclass; ?>" id="tngpassword" style="font-size: 16pt; height: auto" />
> 		<img src="<?php echo $cms['tngpath']; ?>img/pwdon.png" id="pwdicon" class="pwdicon" onclick="togglePwd('tngpassword','pwdicon');"/>
29c30,34
< 			<input type="password" name="newpassword" class="medfield" id="newpassword" />
---
> 			<input type="password" name="newpassword" class="medfield" id="newpassword" style="font-size: 16pt; height: auto" />
> 			<img src="<?php echo $cms['tngpath']; ?>img/pwdon.png" id="newpwdicon" class="pwdicon" onclick="togglePwd('newpassword','newpwdicon');"/>
> 			<div class="loginprompt"><?php echo $text['newpassword2']; ?>: </div>
> 			<input type="password" name="newpassword2" class="medfield" id="newpassword2" style="font-size: 16pt; height: auto" onkeyup="if($('#newpassword').val() == $('#newpassword2').val()) {$('#loginsubmit').prop('disabled',false);} else {$('#loginsubmit').prop('disabled',true);}"/>
> 			<img src="<?php echo $cms['tngpath']; ?>img/pwdon.png" id="newpwdicon2" class="pwdicon" onclick="togglePwd('newpassword2','newpwdicon2');"/>
34c39
< 		<input type="checkbox" name="resetpass" value="1" onclick="if(this.checked) {document.getElementById('resetrow').style.display='';} else {document.getElementById('resetrow').style.display='none';}" /> <?php echo $text['resetpass']; ?>
---
> 		<input type="checkbox" name="resetpass" value="1" onclick="if(this.checked) {$('#resetrow').show(); $('#loginsubmit').prop('disabled',true);} else {$('#resetrow').hide(); $('#loginsubmit').prop('disabled',false);}" /> <?php echo $text['resetpass']; ?>
37c42
< 		<input type="submit" class="<?php echo $loginbtnclass; ?>" value="<?php echo $text['login']; ?>" />
---
> 		<input type="submit" class="<?php echo $loginbtnclass; ?>" id="loginsubmit" value="<?php echo $text['login']; ?>" />
diff -r TNG/login.php TNG1403/login.php
5c5
< session_start();
---
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
13a14
> $pwdfieldclass = "medpwdfield";
diff -r TNG/logout.php TNG1403/logout.php
3,6c3,7
< if($cms['events']){include('cmsevents.php'); cms_logout();}
< session_start();
< $session_language = $_SESSION['session_language'];
< $session_charset = $_SESSION['session_charset'];
---
> if(!empty($cms['events'])){include('cmsevents.php'); cms_logout();}
> 
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
> $session_language = isset($_SESSION['session_language']) ? $_SESSION['session_language'] : $language;
> $session_charset = isset($_SESSION['session_charset']) ? $_SESSION['session_charset'] : $charset;
16c17
< session_start();
---
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
19c20,21
< if($_GET['admin_login'])
---
> 
> if(!empty($_GET['admin_login']))
diff -r TNG/log.php TNG1403/log.php
3c3
< 	global $text, $currentuser, $currentuserdesc, $cms, $rootpath, $_SERVER, $time_offset, $subroot, $exusers, $session_charset;
---
> 	global $text, $currentuser, $currentuserdesc, $cms, $rootpath, $_SERVER, $time_offset, $subroot, $exusers, $session_charset, $badhosts, $charset;
13c13
< 	$string = strip_tags($string, "<a>");
---
> 	$string = "<td class=\"databack\">" . strip_tags($string, "<a>") . "</td>";
40a41,42
> 	$remhost = $charset == "UTF-8" ? mb_convert_encoding($remhost, 'UTF-8', 'ISO-8859-1') : mb_convert_encoding($remhost, 'ISO-8859-1', 'UTF-8');
> 
42c44
< 		$string .= " {$text['accessedby']} {$text['user']}: $currentuser";
---
> 		$string .= "<td class=\"databack\">{$text['user']}: $currentuser</td>";
44c46
< 		$string .= " {$text['accessedby']} $remhost";
---
> 		$string .= "<td class=\"databack\">$remhost";
45a48
> 		$string .= "</td>";
63,69c66,68
< 					if(function_exists ('current_time'))
< 					// we're in a WordPress Environment
< 						$updated = date ("D d M Y H:i:s", current_time ('timestamp', 0));
< 					else
< 					// it's not a WordPress Environment
< 						$updated = date ("D d M Y H:i:s", time() + ( 3600 * $time_offset ) ); //End of addition for time stamp discrepancies with WordPress
< 					array_unshift( $lines, "$updated $string.\n" );
---
> 					$updated = date ("D d M Y H:i:s", time() + ( 3600 * intval($time_offset) ) );
> 					$updated = $charset == "UTF-8" ? mb_convert_encoding($updated, 'UTF-8', 'ISO-8859-1') : mb_convert_encoding($updated, 'ISO-8859-1', 'UTF-8');
> 					array_unshift( $lines, "<tr><td class=\"databack\">$updated</td>" . trim($string) . "</tr>\n" );
diff -r TNG/medialib.php TNG1403/medialib.php
6c6
< 	$eventID = $plink['eventID'];
---
> 	$eventID = !empty($plink['eventID']) ? $plink['eventID'] : "";
diff -r TNG/mediatypes.php TNG1403/mediatypes.php
19a20,23
> 	if($newtype['type'] == 1 && (empty($newtype['icon']) || $newtype['icon'] == "img/"))
> 		$newtype['icon'] = "img/tng_photo.gif";
> 	if($newtype['type'] == 1 && (empty($newtype['thumb']) || $newtype['thumb'] == "img/"))
> 		$newtype['thumb'] = "img/photos_thumb.png";
40c44
< 	global $photopath, $documentpath, $headstonepath, $historypath, $mediapath, $mediatypes_table, $mediatypes, $cms;
---
> 	global $photopath, $documentpath, $headstonepath, $historypath, $mediapath, $mediatypes_table, $mediatypes, $albums_table, $cms;
129a134,135
> 		}
> 		tng_free_result($result);
130a137,141
> 	if(!isset($_SESSION['albumcount'])) {
> 		$query = "SELECT count(*) as acount FROM $albums_table";
> 		$result = @tng_query($query);
> 		$row = tng_fetch_assoc($result);
> 		$_SESSION['albumcount'] = $row['acount'];
Only in TNG1403: micro_deletetrees.php
diff -r TNG/micro_dnalinks.php TNG1403/micro_dnalinks.php
1a2
> 	if( empty($tngconfig) ) exit;
2a4
> 	$usetree = $row['gedcom'];
14c16
< 			$linkrows .= "<a href=\"#\" title=\"{$admtext['removelink']}\" onclick=\"return deleteDnaLink({$plink['mlinkID']});\" title=\"{$admtext['removelink']}\" class=\"smallicon admin-delete-icon\"></a>";
---
> 			$linkrows .= "<a href=\"#\" title=\"{$admtext['removelink']}\" onclick=\"return deleteDnaLink({$plink['mlinkID']});\" class=\"smallicon admin-delete-icon\"></a>";
26c28
< 			<td class="normal" colspan="2"><?php echo $admtext['id']; ?></td>
---
> 			<td class="normal" colspan="3"><?php echo $admtext['id']; ?></td>
42c44
< 			<td><a href="#" onclick="return findItem('I','newlink',null,findform.tree1.options[findform.tree1.selectedIndex].value,'<?php echo $assignedbranch; ?>','m_<?php echo $mediaID; ?>');" title="<?php echo $admtext['find']; ?>" class="smallicon admin-find-icon"></a></td>
---
> 			<td><a href="#" onclick="return findItem('I','newlink',null,findform.tree1.options[findform.tree1.selectedIndex].value,'<?php echo $assignedbranch; ?>');" title="<?php echo $admtext['find']; ?>" class="smallicon admin-find-icon"></a></td>
48c50
< 	<table cellpadding="3" cellspacing="1" id="linktable" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" id="linktable" class="normal rounded-table">
diff -r TNG/micro_medialinks.php TNG1403/micro_medialinks.php
9a10,13
> 			if( $plink['linktype'] === "F" ) {
> 				$plink['husband'] = $plink['hpersonID'];
> 				$plink['wife'] = $plink['wpersonID'];
> 			}
26a31
> 				$husb['title'] = $plink['htitle'];
35a41
> 				$wife['title'] = $plink['wtitle'];
52c58
< 				$name = truncateIt($plink['title'],100);
---
> 				$name = truncateIt($plink['sourcetitle'],100);
93c99
< 			$linkrows .= "<td class=\"lightback normal\">" . $admtext[$type] . "</td><td class=\"lightback normal\">$name$id";
---
> 			$linkrows .= "<td class=\"lightback normal\">" . $admtext[$type] . "</td><td class=\"lightback normal\" id=\"sort_{$plink['mlinkID']}\">$name$id";
95c101
< 				$linkrows .= " (<a href=\"admin_ordermedia.php?tree1={$plink['gedcom']}&linktype1=$linktype&mediatypeID=$mediatypeID&newlink1=$entityID&event1=$eventID\">{$admtext['text_sort']}</a>)";
---
> 				$linkrows .= " (<a href=\"admin_ordermedia.php?tree1={$plink['gedcom']}&amp;linktype1=$linktype&amp;mediatypeID=$mediatypeID&amp;newlink1=$entityID&amp;event1=$eventID\">{$admtext['text_sort']}</a>)";
148c154
< 	<table cellpadding="3" cellspacing="1" id="linktable" class="normal">
---
> 	<table cellpadding="3" cellspacing="1" id="linktable" class="normal rounded-table">
diff -r TNG/micro_newsource.php TNG1403/micro_newsource.php
15c15
< 	if( !$assignedtree && $numtrees > 1 )
---
> 	if( !$assignedtree && (!isset($numtrees) || $numtrees > 1) )
25c25
< 	<tr><td valign="top"><?php echo $admtext['actualtext']; ?>:</td><td><textarea cols="50" rows="5" name="actualtext"></textarea></td></tr>
---
> 	<tr><td valign="top"><?php echo $admtext['actualtext']; ?>:</td><td><textarea cols="80" rows="15" name="actualtext"></textarea></td></tr>
Only in TNG1403: micro_reports.php
diff -r TNG/mmconfig.php TNG1403/mmconfig.php
8,12d7
< $options['fix_header'] = "1";
< $options['adjust_headers'] = "0";
< $options['use_striping'] = "1";
< $options['stripe_after'] = "3";
< $options['show_warnings'] = "1";
14c9,12
< $options['show_analyzer'] = "0";
---
> $options['show_analyzer'] = "1";
> $options['show_analyzeractions'] = "0";
> $options['show_developer'] = "0";
> $options['show_updates'] = "1";
16a15
> $options['delete_support'] = "0";
diff -r TNG/modinfo_demo.php TNG1403/modinfo_demo.php
60d59
< $flags['tabs'] = $tngconfig['tabs'];
diff -r TNG/mostwanted.php TNG1403/mostwanted.php
5c5
< if($cms['events']){include('cmsevents.php'); cms_whatsnew();}
---
> if(!empty($cms['events'])){include('cmsevents.php'); cms_whatsnew();}
24c24
< 	global $gotImageJpeg, $maxmediafilesize;
---
> 	global $gotImageJpeg, $maxmediafilesize, $allow_private;
26c26
< 	$mediatext = "<table class=\"whiteback\" cellpadding=\"8\" cellspacing=\"2\" width=\"100%\">\n";
---
> 	$mediatext = "<table class=\"tfixed whiteback\" cellpadding=\"8\" cellspacing=\"2\" width=\"100%\">\n";
30c30
< 		lastname, firstname, lnprefix, suffix, prefix, $people_table.title as title, living, private, nameorder, branch
---
> 		lastname, firstname, lnprefix, suffix, prefix, $people_table.title as title, $people_table.living, $people_table.private, nameorder, branch
40a41
> 		$row['allow_private'] = !$row['private'] || $allow_private;
44d44
< 		$href = getMediaHREF($row,0);
45a46
> 			$href = getMediaHREF($row,0);
54c55
< 		$mediatext .= "<span><strong>{$row['mwtitle']}</strong></span><br /><br />";
---
> 		$mediatext .= "<span class=\"media-title\">{$row['mwtitle']}</span><br /><br />";
87c88
< $flags = array();
---
> //$flags = array();
diff -r TNG/newacctform.php TNG1403/newacctform.php
2a3
> $ID = "";
4c5
< if($cms['events']){include('cmsevents.php'); cms_register();}
---
> if(!empty($cms['events'])){include('cmsevents.php'); cms_register();}
89,91c90,92
< 		<tr><td valign="top"><?php echo $text['username']; ?>*:</td><td><input type="text" name="username" size="20" maxlength="20" /></td></tr>
< 		<tr><td valign="top"><?php echo $text['password']; ?>*:</td><td><input type="password" name="password" size="20" maxlength="20" /></td></tr>
< 		<tr><td valign="top"><?php echo $text['pwdagain']; ?>*:</td><td><input type="password" name="password2" size="20" maxlength="20" /></td></tr>
---
> 		<tr><td valign="top"><?php echo $text['username']; ?>*:</td><td><input type="text" name="username" size="50" maxlength="50" /></td></tr>
> 		<tr><td valign="top"><?php echo $text['password']; ?>*:</td><td><input type="password" name="password" size="50" maxlength="50" /></td></tr>
> 		<tr><td valign="top"><?php echo $text['pwdagain']; ?>*:</td><td><input type="password" name="password2" size="50" maxlength="50" /></td></tr>
96c97
< 		<tr><td valign="top"><?php echo $text['website']; ?>:</td><td><input type="text" name="website" size="50" maxlength="100" value="http://" /></td></tr>
---
> 		<tr><td valign="top"><?php echo $text['website']; ?>:</td><td><input type="text" name="website" size="50" maxlength="100" value="https://" /></td></tr>
101a103,109
> <?php
> 		$query = "SELECT languageID, display FROM $languages_table ORDER BY display";
> 		$langresult = tng_query($query);
> 		$numlangs = tng_num_rows($langresult);
> 
> 		if($numlangs > 1) {
> ?>
108,110d115
< 		$query = "SELECT languageID, display FROM $languages_table ORDER BY display";
< 		$langresult = tng_query($query);
< 
117a123,126
> <?php
> 		}
> 		tng_free_result($langresult);
> ?>
135a145,151
> <?php
> 	if($numlangs <= 1) {
> ?>
> 	<input type="hidden" name="preflang" value="">
> <?php
> 	}
> ?>
diff -r TNG/pedbox.php TNG1403/pedbox.php
4c4
< 	global $photosext, $tree, $medialinks_table, $media_table, $text, $tngconfig, $cms;
---
> 	global $photosext, $tree, $medialinks_table, $media_table, $text, $tngconfig, $cms, $allow_private;
9c9
< 	$query = "SELECT $media_table.mediaID, medialinkID, alwayson, thumbpath, mediatypeID, usecollfolder FROM ($media_table, $medialinks_table)
---
> 	$query = "SELECT $media_table.mediaID, $media_table.gedcom, medialinkID, alwayson, private, thumbpath, mediatypeID, usecollfolder FROM ($media_table, $medialinks_table)
14,16c14,18
< 	$photocheck = "";
< 	if($row['thumbpath']) {
< 		if( $row['alwayson'] || checkLivingLinks($row['mediaID'])) {
---
> 	$treestr = !empty($tngconfig['mediatrees']) && $row['gedcom'] ? $row['gedcom'] . "/" : "";
> 
> 	$photocheck = $photolink = "";
> 	if(!empty($row['thumbpath'])) {
> 		if( $row['alwayson'] || (checkLivingLinks($row['mediaID']) && (!$row['private'] || $allow_private))) {
19,20c21,22
< 			$photocheck = "$usefolder/" . $row['thumbpath'];
< 			$photoref = "$usefolder/" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] ));
---
> 			$photocheck = "$usefolder/$treestr" . $row['thumbpath'];
> 			$photoref = $cms['tngpath'] . "$usefolder/$treestr" . str_replace("%2F","/",rawurlencode( $row['thumbpath'] ));
26d27
< 		$photolink = "";
diff -r TNG/pedconfig.php TNG1403/pedconfig.php
15,16c15,16
< $pedigree['vwidth'] = "100";
< $pedigree['vheight'] = "42";
---
> $pedigree['vwidth'] = "90";
> $pedigree['vheight'] = "150";
18c18
< $pedigree['vfontsize'] = "7";
---
> $pedigree['vfontsize'] = "8";
20a21
> $pedigree['pagesize'] = "letter";
31d31
< $pedigree['event'] = "over";
47a48,50
> $pedigree['dvwidth'] = "90";
> $pedigree['dvheight'] = "150";
> $pedigree['dvfontsize'] = "8";
51a55,61
> $pedigree['maxropt'] = "999";
> $pedigree['maxlopt'] = "30";
> $pedigree['showtxtopt'] = false;
> $pedigree['compactboxopt'] = false;
> $pedigree['sortbyopt'] = "length";
> $pedigree['anchoridopt'] = "";
> $pedigree['maxmopt'] = "2";
diff -r TNG/pedigree.php TNG1403/pedigree.php
13a14,20
> 
> if( !isset($pedigree['namesizeshift']) ) $pedigree['namesizeshift'] = 0;
> if( !isset($pedigree['datessizeshift']) ) $pedigree['datessizeshift'] = 0;
> if( !isset($pedigree['popupinfosizeshift']) ) $pedigree['popupinfosizeshift'] = 0;
> 
> if(!isset($display)) $display = "";
> if(!isset($generations)) $generations = "";
119c126
< $arrltpath = $rootpath . $endrootpath . "img/ArrowRight.gif";
---
> $arrltpath = $rootpath . $endrootpath . "img/ArrowLeft.gif";
167c174
< if($tngprint) {
---
> if(!empty($tngprint)) {
209c216
< $parentset = $parentset ? intval($parentset) : 0;
---
> $parentset = isset($parentset) ? intval($parentset) : 0;
308c315
< 		$flags['scripting'] .=  "#leftarrow { position:absolute; visibility:hidden; top:" . ( $offsetV + intval( ($boxheighttouse - $offpageimgh) / 2) + 1 ) . "px; left:$offsetH" . "px;z-index:5; }\n";
---
> 		$flags['css'] .=  "#leftarrow { position:absolute; visibility:hidden; top:" . ( $offsetV + intval( ($boxheighttouse - $offpageimgh) / 2) + 1 ) . "px; left:$offsetH" . "px;z-index:5; }\n";
317,318c324,325
< 		$flags['scripting'] .= "#popleft { font-size:$popupinfosizetouse" . "pt; }\n";
< 		$flags['scripting'] .= "#popabbrleft { font-size:$popupinfosizetouse" . "pt; }\n";
---
> 		$flags['css'] .= "#popleft { font-size:$popupinfosizetouse" . "pt; }\n";
> 		$flags['css'] .= "#popabbrleft { font-size:$popupinfosizetouse" . "pt; }\n";
321c328
< 	$flags['scripting'] .= "#img$slot {max-width:" . $maxside . "px; max-height:" . $maxside . "px;}\n";
---
> 	$flags['css'] .= "#img$slot {max-width:" . $maxside . "px; max-height:" . $maxside . "px;}\n";
325c332,334
< 	$icons = $display != "box" ? " onmouseover=\"if(jQuery('#ic$slot').length) jQuery('#ic$slot').show();\" onmouseout=\"if(jQuery('#ic$slot').length) jQuery('#ic$slot').hide();\"" : "";
---
> 	$icons = !isset($display) || $display != "box" ? " onmouseover=\"if(jQuery('#ic$slot').length) jQuery('#ic$slot').show();\" onmouseout=\"if(jQuery('#ic$slot').length) jQuery('#ic$slot').hide();\"" : "";
> 
> 	$boxes .= "<div onmouseenter=\"cancelTimer($slot);if(jQuery('#downarrow$slot').css('visibility')!='hidden') setPopup($slot, $offsetV,$boxheighttouse);\" onmouseleave=\"setTimer($slot)\">";
330c339
< 	$boxes .= "\n<!-- popup for $name -->\n\n";
---
> 	$boxes .= "\n<!-- popup for slot $slot -->\n\n";
333,334c342
< 	$cancelt = $pedigree['event'] == "over" ? " onmouseout=\"cancelTimer($slot)\"" : "";
< 	$boxes .= "<div class=\"downarrow\" id=\"downarrow$slot\" onmouse{$pedigree['event']}=\"setPopup($slot, $offsetV,$boxheighttouse)\"$cancelt style=\"width:{$pedigree['boxwidth']}" . "px; text-align:center; top:" . ($offsetV + $boxheighttouse + $pedigree['borderwidth'] + $pedigree['shadowoffset'] + 1) . "px;left:" . ($offsetH  - 1) . "px;\">\n";
---
> 	$boxes .= "<div class=\"downarrow\" id=\"downarrow$slot\" style=\"width:{$pedigree['boxwidth']}" . "px; text-align:center; top:" . ($offsetV + $boxheighttouse + $pedigree['borderwidth'] + $pedigree['shadowoffset'] + 1) . "px;left:" . ($offsetH  - 1) . "px;\">\n";
344a353
> 	$boxes .= "</div>";
391c400
< if( !$tngprint ) $tngprint = 0;
---
> if(empty($tngprint)) $tngprint = 0;
419,420c428,431
< $flags['scripting'] .= "var allow_add = $allow_add;\n";
< $flags['scripting'] .= "var allow_edit = $allow_edit;\n";
---
> $allow_add_str = $allow_add ? "1" : "";
> $flags['scripting'] .= "var allow_add = '$allow_add_str';\n";
> $allow_edit_str = $allow_edit ? "1" : "";
> $flags['scripting'] .= "var allow_edit = '$allow_edit_str';\n";
458,462c469,473
< $flags['scripting'] .= "<style type=\"text/css\">\n";
< $flags['scripting'] .= ".pedborder {background-color:{$pedigree['bordercolor']};}\n";
< $flags['scripting'] .= ".pedshadow {background-color:{$pedigree['shadowcolor']};}\n";
< $flags['scripting'] .= ".popup { position:absolute; visibility:hidden; background-color:{$pedigree['popupcolor']}; z-index:8 }\n";
< $flags['scripting'] .= ".pboxname { font-size:{$pedigree['boxnamesize']}pt; text-align:{$pedigree['boxalign']}; }\n";
---
> $flags['css'] = "<style type=\"text/css\">\n/*<![CDATA[*/\n";
> $flags['css'] .= ".pedborder {background-color:{$pedigree['bordercolor']};}\n";
> $flags['css'] .= ".pedshadow {background-color:{$pedigree['shadowcolor']};}\n";
> $flags['css'] .= ".popup { position:absolute; visibility:hidden; background-color:{$pedigree['popupcolor']}; z-index:8 }\n";
> $flags['css'] .= ".pboxname { font-size:{$pedigree['boxnamesize']}pt; text-align:{$pedigree['boxalign']}; }\n";
466c477
< $flags['scripting'] .= "</style>\n";
---
> $flags['css'] .= "/*]]>*/\n</style>\n";
472d482
< $flags['tabs'] = $tngconfig['tabs'];
490c500
< $innermenu .= "<a href=\"$vertical_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=vertical&amp;generations=$generations\" class=\"lightlink$chtlinkstyle\" id=\"pedchartlnk\">{$text['pedvertical']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
---
> $innermenu .= "<a href=\"$vertical_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=vertical&amp;generations=$generations\" class=\"lightlink\" id=\"pedchartlnk\">{$text['pedvertical']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
505c515
< 	echo "<span class=\"normal\">(" . $text['scrollnote'];
---
> 	echo "<span class=\"normal\">" . $text['scrollnote'];
511c521,523
< 	echo ")</span>";
---
> 	echo "</span>";
> 	echo "<div id=\"mag-icons-div\" class=\"mag-icons\" alt=\"\"><img src=\"img/zoomin.png\" id=\"zoom-in\" onclick=\"panzoom.zoomIn;\" alt=\"{$text['zoomin']}\"/><img src=\"img/zoomreset.png\" id=\"zoom-reset\" alt=\"{$text['tng_reset']}\"/><img src=\"img/zoomout.png\" id=\"zoom-out\" alt=\"{$text['zoomout']}\"/></div>\n";
> 	echo "<div id=\"loading\" style=\"position:absolute; margin-top:10px\"><img src=\"{$cms['tngpath']}img/spinner.gif\" alt=\"\" />{$text['loading']}</div>\n";
514,516c526,528
< <br/>
< <div align="left" style="position:relative;margin-top:8px;margin-bottom:16px;height:<?php echo (20 + $pedigree['borderwidth'] + ($pedigree['maxheight'] - $pedigree['boxVsep']) + $pedigree['shadowoffset']); ?>px;" id="outer">
< <div id="loading"><img src="<?php echo $cms['tngpath']; ?>img/spinner.gif" alt="" /> <?php echo $text['loading']; ?></div>
---
> <div style="position:relative;margin-top:8px;margin-bottom:16px;height:<?php echo (20 + $pedigree['borderwidth'] + ($pedigree['maxheight'] - $pedigree['boxVsep']) + $pedigree['shadowoffset']); ?>px;" id="outer">
> 	<div class="panzoom" id="vcontainer" style="overflow:visible">
> 		<div id="inner" style="position:relative;width:<?php echo $pedigree['maxwidth']; ?>px;height:<?php echo (20 + $pedigree['borderwidth'] + ($pedigree['maxheight'] - $pedigree['boxVsep']) + $pedigree['shadowoffset']); ?>px;">
519a532,533
> 		</div>
> 	</div>
521d534
< <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/rpt_utils.js"></script>
531c544
< if($needperson && $allow_add) {
---
> if(!empty($needperson) && $allow_add) {
535c548
< 	nplitbox = new LITBox('admin_newperson2.php?tree=<?php echo $tree; ?>&needped=1',{width:620,height:600});
---
> 	nplitbox = new LITBox('admin_newperson2.php?tree=<?php echo $tree; ?>&needped=1',{width:650,height:670});
551c564
< 	if($needperson && $allow_add) {
---
> 	if(!empty($needperson) && $allow_add) {
559a573,574
> <script src="js/panzoom.min.js"></script>
> <script src="js/tngzoom.js"></script>
diff -r TNG/pedigreetext.php TNG1403/pedigreetext.php
23c23
< if(isset($parentset)) $parentset = intval($parentset);
---
> $parentset = isset($parentset) ? intval($parentset) : 0;
45a46,47
> 	$row['famc'] = "";
> 	$rights['both'] = false;
215,216c217,218
< 			if( $result2 ) {
< 				$newrow = tng_fetch_assoc( $result2 );
---
> 			$newrow = tng_fetch_assoc( $result2 );
> 			if( $newrow ) {
228d229
< 				tng_free_result($result2);
229a231
> 			tng_free_result($result2);
271d272
< $flags['tabs'] = $tngconfig['tabs'];
287c288
< 	$innermenu .= "<select name=\"generations\" class=\"verysmall\" onchange=\"window.location.href='$pedigreetext_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;display=$display&amp;generations=' + this.options[this.selectedIndex].value\">\n";
---
> 	$innermenu .= "<select name=\"generations\" class=\"verysmall\" onchange=\"window.location.href='$pedigreetext_url" . "personID=$personID&amp;tree=$tree&amp;parentset=$parentset&amp;generations=' + this.options[this.selectedIndex].value\">\n";
317d317
< <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/rpt_utils.js"></script>
diff -r TNG/personlib.php TNG1403/personlib.php
11c11,17
< 	global $text, $placesearch_url, $cms, $tngconfig;
---
> 	global $text, $placesearch_url, $cms, $tngconfig, $tree;
> 
> 	$varlist = array('birthdate','birthplace','altbirthdate','altbirthplace','deathdate','deathplace','burialdate','burialplace' );
> 	foreach( $varlist as $myindex ) {
> 		if( !isset( $thisperson[$myindex] ) )
> 			$thisperson[$myindex] = '';
> 	}
13a20
> 	$birthplace = "";
16,17c23,26
< 		$icon = "<img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\" />";
<         $treestr = $tngconfig['places1tree'] ? "" : "tree=$tree&amp;";
---
> 		$icon = "<img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" alt=\"{$text['findplaces']}\" style=\"width: 9px; height: 9px;\" />";
> 
>         $treestr = !empty($tngconfig['places1tree']) ? "" : "tree=$tree&amp;";
> 
25a35
> 			$birthplace = $thisperson['birthplace'];
28c38
< 			$birthstring .= $thisperson['birthplace'];
---
> 			$birthstring .= $birthplace;
30c40
<                 $birthstring .= $placelinkbegin . urlencode($thisperson['birthplace']) . $placelinkend;
---
>                 $birthstring .= $placelinkbegin . urlencode($birthplace) . $placelinkend;
37a48
> 			$birthplace = $thisperson['altbirthplace'];
40c51
< 			$birthstring .= $thisperson['altbirthplace'];
---
> 			$birthstring .= $birthplace;
42c53
<                 $birthstring .= $placelinkbegin . urlencode($thisperson['altbirthplace']) . $placelinkend;
---
>                 $birthstring .= $placelinkbegin . urlencode($birthplace) . $placelinkend;
48c59,61
<             $birthstring .= ", &nbsp; " . doStrong($text['deathabbr']) . " ";
---
>         	if(empty($birthplace))
>             	$birthstring .= " &nbsp; ";
>             $birthstring .= doStrong($text['deathabbr']) . " ";
59c72,74
<         	$birthstring .= ", &nbsp; " . doStrong($text['burialabbr']) . " ";
---
>         	if(empty($birthplace))
>         		$birthstring .= " &nbsp; ";
>         	$birthstring .= doStrong($text['burialabbr']) . " ";
87c102
< 		$citations[$key] .= $citations[$key] ? ",$citationsctr" : $citationsctr;
---
> 		$citations[$key] = isset($citations[$key]) ? $citations[$key].",$citationsctr" : $citationsctr;
105c120
< 		if( $citrow['shorttitle'] ) {
---
> 		if( $citrow['author'] ) {
107c122
< 			$newstring .= $citrow['shorttitle'];
---
> 			$newstring .= $citrow['author'];
109c124
< 		else if( $citrow['title'] ) {
---
> 		if( $citrow['shorttitle'] ) {
111c126
< 			$newstring .= $citrow['title'];
---
> 			$newstring .= insertLinks($citrow['shorttitle']);
113c128
< 		if( $citrow['author'] ) {
---
> 		else if( $citrow['title'] ) {
115c130
< 			$newstring .= $citrow['author'];
---
> 			$newstring .= insertLinks($citrow['title']);
121,125c136
< 		if( $citrow['callnum'] ) {
< 			if( $newstring ) $newstring .= ", ";
< 			$newstring .= $citrow['callnum'] . ".";
< 		}
< 		if( $citrow['other'] ) {
---
> 		if( $citrow['citedate'] ) {
127c138
< 			$newstring .= $citrow['other'];
---
> 			$newstring .= displayDate($citrow['citedate']);
132a144,147
> 		if( $citrow['callnum'] ) {
> 			if( $newstring ) $newstring .= ", ";
> 			$newstring .= $citrow['callnum'] . ".";
> 		}
137c152
< 		if( $citrow['citedate'] ) {
---
> 		if( $citrow['other'] ) {
139c154
< 			$newstring .= displayDate($citrow['citedate']);
---
> 			$newstring .= $citrow['other'];
166c181
< 	if( $citations[$citekey] ) {
---
> 	if( !empty($citations[$citekey]) ) {
197c212
< 	global $notelinks_table, $xnotes_table, $tree, $eventtypes_table, $events_table, $text, $eventswithnotes, $allow_private;
---
> 	global $notelinks_table, $xnotes_table, $tree, $eventtypes_table, $events_table, $text, $eventswithnotes, $allow_private, $allow_private_notes, $rightbranch;
214c229
< 		$precusttitles = array( "ABBR"=>$text['shorttitle'], "CALN"=>$text['callnum'], "AUTH"=>$text['author'], "PUBL"=>$text['publisher'], "TITL"=>$text['title'] );
---
> 		$precusttitles = array( "ABBR"=>$text['shorttitle'], "CALN"=>$text['callnum'], "AUTH"=>$text['author'], "PUBL"=>$text['publisher'], "TITL"=>$text['title2'] );
218c233
< 	$secretstr = $allow_private ? "" : " AND secret != \"1\"";
---
> 	$secretstr = (!empty($allow_private_notes) && $rightbranch) || (!empty($_SESSION['mypersonID']) && $_SESSION['mygedcom'] == $tree && $_SESSION['mypersonID'] == $persfamID) ? "" : " AND secret != \"1\"";
235a251
> 		if( empty($note['note'])) $note['note'] = "";
246c262,264
< 				$custnotes[$key] = array( "title"=>$currtitle, "text"=>"");
---
> 
> 				$custnotes[$key] = array( "title"=>$currtitle, "text"=>"", "cite"=>"", "xnote"=>"");
> 
250c268
< 				if( $postcusttitles[$currevent] ) {
---
> 				if( !empty($postcusttitles[$currevent] ) ) {
252c270
< 					$postcustnotes[$currsig] = array( "title"=>$postcusttitles[$currevent], "text"=>"");
---
> 					$postcustnotes[$currsig] = array( "title"=>$postcusttitles[$currevent], "text"=>"", "cite"=>"", "xnote"=>"");
256c274,281
< 					$currtitle = $precusttitles[$currevent] ? $precusttitles[$currevent] : " ";
---
> 					if( !empty($precusttitles[$currevent]) ) {
> 						$currtitle = $precusttitles[$currevent];
> 					}
> 					else {
> 						$curtitle = " ";
> 						$precusttitles[$currevent] = '';
> 					}
> 
258c283
< 						$gennotes[$currsig] = array( "title"=>$precusttitles[$currevent], "text"=>"");
---
> 						$gennotes[$currsig] = array( "title"=>$precusttitles[$currevent], "text"=>"", "cite"=>"", "xnote"=>"");
262c287
< 						$precustnotes[$currsig] = array( "title"=>$precusttitles[$currevent], "text"=>"");
---
> 						$precustnotes[$currsig] = array( "title"=>$precusttitles[$currevent], "text"=>"", "cite"=>"", "xnote"=>"");
269a295,298
> 				if(!isset($gennotes[$currsig]['text'])) $gennotes[$currsig]['text'] = '';
> 				if(!isset($gennotes[$currsig]['cite'])) $gennotes[$currsig]['cite'] = '';
> 				if(!isset($gennotes[$currsig]['xnote'])) $gennotes[$currsig]['xnote'] = '';
> 
275a305,308
> 				if(!isset($precustnotes[$currsig]['text'])) $precustnotes[$currsig]['text'] = '';
> 				if(!isset($precustnotes[$currsig]['cite'])) $precustnotes[$currsig]['cite'] = '';
> 				if(!isset($precustnotes[$currsig]['xnote'])) $precustnotes[$currsig]['xnote'] = '';
> 
281a315,318
> 				if(!isset($custnotes[$key]['text'])) $custnotes[$key]['text']= '';
> 				if(!isset($custnotes[$key]['cite'])) $custnotes[$key]['cite'] = '';
> 				if(!isset($custnotes[$key]['xnote'])) $custnotes[$key]['xnote'] = '';
> 
287a325,328
> 				if(!isset($postcustnotes[$currsig]['text'])) $postcustnotes[$currsig]['text'] = '';
> 				if(!isset($postcustnotes[$currsig]['cite'])) $postcustnotes[$currsig]['cite'] = '';
> 				if(!isset($postcustnotes[$currsig]['xnote'])) $postcustnotes[$currsig]['xnote'] = '';
> 
371c412
< 	if( $matches[1] ) {
---
> 	if( isset($matches[1])) {
421c462
< 	if( $map['key'] && $data['place'] && !$data['nomap'] ) {
---
> 	if( !empty($map['key']) && !empty($data['place']) && empty($data['nomap'] )) {
435c476
< 			$pinplacelevel = $custevent['placelevel'] ? ${"pinplacelevel" . $custevent['placelevel']} : $pinplacelevel0;
---
> 			$pinplacelevel = !empty($custevent['placelevel']) && intval($custevent['placelevel']) > 0 ? ${"pinplacelevel" . $custevent['placelevel']} : $pinplacelevel0;
448c489
< 				"description"=>$info[0],
---
> 				"description"=>(isset($info[0]) ? $info : ""),
457c498
< $datewidth = $thumbmaxw + 20 > 104 ? $thumbmaxw + 20 : 104;
---
> $datewidth = $thumbmaxw + 20 > 124 ? $thumbmaxw + 20 : 124;
464a506,512
> 	$notearea = $tngconfig['scrollnotes'] ? " class=\"notearea\"" : "";
> 
> 	$myindexlist = array('type','event','entity','date','place','collapse','fact','xnote');
> 	foreach($myindexlist as $myindex ) {
> 		if(!isset($data[$myindex])) $data[$myindex] = '';
> 	}
> 
487c535
< 	$dateplace = $data['date'] || $data['place'] ? 1 : 0;
---
> 	$dateplace = !empty($data['date']) || !empty($data['place']) ? 1 : 0;
489c537,538
< 	$toggle = $data['collapse'] ? " style=\"display:none\"" : "";
---
> 	$toggle = !empty($data['collapse']) ? " style=\"display:none\"" : "";
> 	if( !isset($notearray)) $notearray = array();
501a551
> 
525,526c575,576
<                 $treestr = $tngconfig['places1tree'] ? "" : "&amp;tree=$tree";
< 				$output .= " <a href=\"$placesearch_url" . "psearch=" . urlencode($data['place']) . $treestr . "\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\" /></a>$cite&nbsp;</td>\n";
---
>                 $treestr = !empty($tngconfig['places1tree']) ? "" : "&amp;tree=$tree";
> 				$output .= " <a href=\"$placesearch_url" . "psearch=" . urlencode($data['place']) . $treestr . "\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" alt=\"{$text['findplaces']}\" style=\"width: 9px; height: 9px; border:0\" /></a>$cite&nbsp;</td>\n";
533a584
> 
534a586
> 
535a588
> 
537a591
> 
539c593,594
< 		$cite .= $data['xnote'] ? reorderCitation( $data['xnote'] . "_" ) : "";
---
> 		$cite .= !empty($data['xnote']) ? reorderCitation( $data['xnote'] . "_" ) : "";
> 
541c596,597
< 			for( $i = 0; $i < count( $data['fact'] ); $i++ ) {
---
> 			$num_facts = count($data['fact']);
> 			for( $i = 0; $i < $num_facts; $i++ ) {
567,573c623,627
< 	if( $notestogether ) {
< 		if( $notes ) {
< 			$rows++;
< 			if( $output ) $output .= "<tr class=\"t{$eventcounter}\"$toggle>\n";
< 			$output .= "<td valign=\"top\" colspan=\"2\" class=\"databack\">$notes</td>\n";
< 			$output .= "</tr>\n";
< 		}
---
> 	if( $notestogether && $notes ) {
> 		$rows++;
> 		if( $output ) $output .= "<tr class=\"t{$eventcounter}\"$toggle>\n";
> 		$output .= "<td valign=\"top\" colspan=\"2\" class=\"databack normal\"><div{$notearea}>$notes</div></td>\n";
> 		$output .= "</tr>\n";
574a629
> 
581c636
< 	$mediaoutput = "";
---
> 	$mediaoutput = $thumbdivs = "";
583c638,641
< 	if(count($media_array)) {
---
> 	$mediacount = count($media_array);
> 	if($mediacount) {
> 		if( !isset( $sitever ) ) $sitever = '';
> 		$doThumbs = !empty($tngconfig['mediathumbs']) && $mediacount > 1 ? $sitever != "mobile" && $tngconfig['mediathumbs'] == "1" : false;
585,589c643,656
< 			$rows++;
< 			if( $output ) $mediaoutput .= "<tr class=\"t{$eventcounter}\"$toggle>\n";
< 			if( $item['imgsrc'] ) {
< 				$mediaoutput .= "<td valign=\"top\" class=\"databack\" align=\"center\">{$item['imgsrc']}</td>\n";
< 				$thumbcount++;
---
> 			if($doThumbs) {
> 				$thumbdivs .= "<div class=\"inline-thumb\">{$item['imgsrc']}</div>";
> 			}
> 			else {
> 				$rows++;
> 				if( $output ) $mediaoutput .= "<tr class=\"t{$eventcounter}\"$toggle>\n";
> 				if( $item['imgsrc'] ) {
> 					$mediaoutput .= "<td valign=\"top\" class=\"databack\" align=\"center\">{$item['imgsrc']}</td>\n";
> 					$thumbcount++;
> 				}
> 				else
> 					$mediaoutput .= "<td valign=\"top\" class=\"databack\">&nbsp;</td>";
> 				$mediaoutput .= "<td valign=\"top\" class=\"databack\">{$item['name']}<br />" . nl2br($item['description']) . "</td>\n";
> 				$mediaoutput .= "</tr>\n";
591,594d657
< 			else
< 				$mediaoutput .= "<td valign=\"top\" class=\"databack\">&nbsp;</td>";
< 			$mediaoutput .= "<td valign=\"top\" class=\"databack\">{$item['name']}<br />" . nl2br($item['description']) . "</td>\n";
< 			$mediaoutput .= "</tr>\n";
597a661,664
> 		if($thumbdivs) {
> 			$mediaoutput .= "<tr class=\"t{$eventcounter}\"$toggle><td class=\"databack\" colspan=\"2\">$thumbdivs</td></tr>\n";
> 			$rows++;
> 		}
602,604c669,671
< 		$editicon = $tentative_edit && $data['event'] && $data['event'] != "NAME" ? "<img src=\"{$cms['tngpath']}img/tng_edit.gif\" border=\"0\" alt=\"{$text['editevent']}\" title=\"{$text['editevent']}\" align=\"absmiddle\" onclick=\"tnglitbox = new LITBox('$tentedit_url" . "tree=$tree&amp;persfamID={$data['entity']}&amp;type={$data['type']}&amp;event={$data['event']}&amp;title={$data['text']}',{width:500,height:500});\" class=\"fakelink\" />" : "";
< 		if($data['collapse'] && $rows > 1) {
< 			$toggleicon = "<img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"toggleicon\" id=\"t{$eventcounter}\" title=\"{$text['expand']}\"/>";
---
> 		$editicon = $tentative_edit && $data['event'] && $data['event'] != "NAME" ? "&nbsp;<img src=\"{$cms['tngpath']}img/tng_edit.gif\" border=\"0\" alt=\"{$text['editevent']}\" title=\"{$text['editevent']}\" align=\"absmiddle\" onclick=\"tnglitbox = new LITBox('$tentedit_url" . "tree=$tree&amp;persfamID={$data['entity']}&amp;type={$data['type']}&amp;event={$data['event']}&amp;title={$data['text']}',{width:500,height:500});\" class=\"fakelink\" />" : "";
> 		if(!empty($data['collapse']) && $rows > 1) {
> 			$toggleicon = "<img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"toggleicon\" alt=\"\" id=\"t{$eventcounter}\" title=\"{$text['expand']}\"/>";
610c677
< 		$rowspan = $rows > 1 && !$data['collapse'] ? " rowspan=\"$rows\"" : "";
---
> 		$rowspan = $rows > 1 && empty($data['collapse']) ? " rowspan=\"$rows\"" : "";
627c694,696
< 	$query = "SELECT display, eventdate, eventdatetr, eventplace, age, agency, cause, addressID, info, tag, description, eventID, collapse, ldsevent FROM ($events_table, $eventtypes_table) WHERE persfamID = \"$entityID\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND gedcom = \"$tree\" AND keep = \"1\" AND parenttag = \"\" ORDER BY ordernum, tag, description, eventdatetr, info, eventID";
---
> 	$query = "SELECT display, eventdate, eventdatetr, eventplace, age, agency, cause, addressID, info, tag, description, eventID, collapse, ldsevent FROM ($events_table, $eventtypes_table) 
> 		WHERE persfamID = \"$entityID\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND gedcom = \"$tree\" AND keep = \"1\" AND parenttag = \"\" 
> 		ORDER BY ordernum, tag, description, eventdatetr, info, eventID";
629a699
> 		$xnote = '';
637c707
< 				if( $fact[1] ) {
---
> 				if( isset( $fact[1] ) ) {
734c804
< 			familyID, people.personID as personID2
---
> 			familyID, people.personID as personID2, linktype, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, husband, wife
792c862
< 	$albums = $albums_array['-x--general--x-'];
---
> 	$albums = !empty($albums_array['-x--general--x-']) ? $albums_array['-x--general--x-'] : '';
808c878
< 					$albumrows .= "<td valign=\"top\" class=\"databack\" align=\"center\" style=\"width:$datewidth" . "px\">{$item['imgsrc']}</td><td valign=\"top\" class=\"databack\">";
---
> 					$albumrows .= "<td valign=\"top\" class=\"databack\" align=\"center\" style=\"width:$datewidth" . "px;border-radius:0px;\">{$item['imgsrc']}</td><td valign=\"top\" class=\"databack\">";
828c898
< function getMedia( $entity, $linktype ) {
---
> function getMedia( $entity, $linktype, $all = false ) {
830c900
< 	global $livedefault, $mediapath, $mediatypes_assoc, $tngconfig, $rootpath;
---
> 	global $livedefault, $mediapath, $mediatypes_assoc, $tngconfig, $rootpath, $allow_private;
836a907
> 	$mlflag = ($linktype == "C" || !$linktype) ? 0 : 1;
838c909
< 	$query = "SELECT medialinkID, description, notes, altdescription, altnotes, usecollfolder, mediatypeID, personID, $medialinks_table.mediaID as mediaID, thumbpath, status, plot, eventID, alwayson, path, form, abspath, newwindow
---
> 	$query = "SELECT medialinkID, description, notes, altdescription, altnotes, usecollfolder, mediatypeID, personID, $medialinks_table.mediaID as mediaID, thumbpath, status, plot, eventID, alwayson, path, form, abspath, newwindow, $media_table.gedcom, private
844c915
< 	$query .= " $always	ORDER BY eventID, mediatypeID, ordernum";
---
> 	$query .= " $always	ORDER BY ordernum, eventID, mediatypeID, mediaID";
851c922
< 		$eventID = $medialink['eventID'] && ($linktype == "L" || ($entity['allow_living'] && $entity['allow_private'])) ? $medialink['eventID'] : "-x--general--x-";
---
> 		$eventID = !$all && $medialink['eventID'] && ($linktype == "L" || ($entity['allow_living'] && $entity['allow_private'])) ? $medialink['eventID'] : "-x--general--x-";
854,855c925,928
< 		$medialink['allow_living'] = $medialink['alwayson'] || checkLivingLinks($medialink['mediaID']) ? 1 : 0;
< 		$thismedia['imgsrc'] = getSmallPhoto($medialink);
---
> 		$medialink['allow_living'] = checkLivingLinks($medialink['mediaID']);
> 		$medialink['allow_private'] = !$medialink['private'] || $allow_private;
> 		$showmedia = $medialink['alwayson'] || ($medialink['allow_living'] && $medialink['allow_private']);
>  		$thismedia['imgsrc'] = getSmallPhoto($medialink);
857c930,931
< 		if( !$medialink['allow_living'] && ($nonames || $tngconfig['nnpriv']) ) {
---
> 		$thismedia['href'] = "";
> 		if( !$showmedia && ($nonames || $tngconfig['nnpriv']) ) {
863,864c937,938
< 			$thismedia['description'] = truncateIt(getXrefNotes(($medialink['altnotes'] ? $medialink['altnotes'] : $medialink['notes']),$tree),$tngconfig['maxnoteprev']);
< 			if( !$medialink['allow_living'] )
---
> 			$thismedia['description'] = truncateIt(getXrefNotes(($medialink['altnotes'] ? $medialink['altnotes'] : $medialink['notes']),$tree),(!empty($tngconfig['maxnoteprev']) ? $tngconfig['maxnoteprev'] : 0));
> 			if( !$showmedia )
867c941
< 				$thismedia['href'] = getMediaHREF($medialink,1);
---
> 				$thismedia['href'] = getMediaHREF($medialink,$mlflag);
873c947,950
< 					$thismedia['imgsrc'] .= "<div class=\"media-prev\" id=\"prev{$medialink['mediaID']}_$medialinkID\" style=\"display:none\"></div>";
---
> 					$thismedia['imgsrc'] .= "<div class=\"media-prev\" id=\"prev{$medialink['mediaID']}";
> 					if($linktype != "C")
> 						$thismedia['imgsrc'] .= "_$medialinkID";
> 					$thismedia['imgsrc'] .= "\" style=\"display:none\"></div>";
876,877c953,960
< 					if( $gotImageJpeg && isPhoto($medialink) && checkMediaFileSize("$rootpath$usefolder/" . $medialink['path']))
< 						$thismedia['imgsrc'] .=  " class=\"media-preview\" id=\"img-{$medialink['mediaID']}-{$medialinkID}-" . urlencode("$usefolder/{$medialink['path']}") . "\"";				
---
> 					if( $gotImageJpeg && isPhoto($medialink) && checkMediaFileSize("$rootpath$usefolder/" . $medialink['path'])) {
> 						$thismedia['imgsrc'] .=  " class=\"media-preview\" id=\"img-{$medialink['mediaID']}";
> 						if($linktype == "C")
> 							$thismedia['imgsrc'] .= "-0";	
> 						else
> 							$thismedia['imgsrc'] .= "-{$medialinkID}";	
> 						$thismedia['imgsrc'] .= "-" . urlencode("$usefolder/{$medialink['path']}") . "\"";		
> 					}		
892c975
< 		if( $medialink['eventID'] && ($linktype == "L" || ($entity['allow_living'] && $entity['allow_private']))) {
---
> 		if( !$all && $medialink['eventID'] && ($linktype == "L" || ($entity['allow_living'] && $entity['allow_private']))) {
914c997
< 	global $tableid, $cellnumber, $text, $datewidth, $mediatypes_display, $mediatypes_like, $tngconfig, $sitever, $num_collapsed;
---
> 	global $tableid, $cellnumber, $text, $datewidth, $mediatypes_display, $mediatypes_like, $tngconfig, $sitever, $num_collapsed, $cms;
917c1000,1001
< 	$media = $media_array['-x--general--x-'][$mediatypeID];
---
> 
> 	$media = isset($media_array['-x--general--x-'][$mediatypeID]) ? $media_array['-x--general--x-'][$mediatypeID] : "";
936,937c1020,1021
< 			$titlemsg = $text[$mediatypeID] ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
< 			$hidemedia = $tngconfig['hidemedia'] && $totalmedia > 1;
---
> 			$titlemsg = !empty($text[$mediatypeID]) ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
> 			$hidemedia = !empty($tngconfig['hidemedia']) && $totalmedia > 1;
946c1030
< 				if(count($media) > 1 && ($mediatypeID == "photos" || $mediatypes_like[$mediatypeID] == "photos")) {
---
> 				if(count($media) > 1 && ($mediatypeID == "photos" || in_array($mediatypeID, $mediatypes_like['photos']))) {
980c1064
< 						$mediarows .= "<td valign=\"top\" class=\"databack\" align=\"center\" style=\"width:$datewidth" . "px\">{$item['imgsrc']}</td><td valign=\"top\" class=\"databack\">";
---
> 						$mediarows .= "<td valign=\"top\" class=\"databack\" align=\"center\" style=\"width:$datewidth" . "px;border-radius:0px;\">{$item['imgsrc']}</td><td valign=\"top\" class=\"databack\">";
989c1073
< 			if(!$tngconfig['ssdisabled'] && $mediacount >= 3 && $slidelink && $sitever != "mobile") {
---
> 			if(empty($tngconfig['ssdisabled']) && $mediacount >= 3 && $slidelink && $sitever != "mobile") {
995,996c1079,1081
<  			$toggleicon = $hidemedia ? "<img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"toggleicon\" id=\"m{$prefix}{$mediatypeID}\" title=\"{$text['expand']}\"/>" : "";
< 			$mediatext .= "<td valign=\"top\" class=\"fieldnameback indleftcol lm{$prefix}{$mediatypeID}\"$cellid";
---
>  			$toggleicon = $hidemedia ? "<img src=\"{$cms['tngpath']}img/tng_sort_desc.gif\" class=\"toggleicon\" alt=\"\" id=\"m{$prefix}{$mediatypeID}\" title=\"{$text['expand']}\"/>" : "";
>  			$rcclass = $prefix ? "" : "rc-ll";
> 			$mediatext .= "<td valign=\"top\" class=\"fieldnameback indleftcol {$rcclass} lm{$prefix}{$mediatypeID}\"$cellid";
1025c1110
< 	global $mediatypes_assoc, $mediapath, $showalbum_url, $sitever;
---
> 	global $mediatypes_assoc, $mediapath, $showalbum_url, $sitever, $tree;
1033,1035c1118,1120
< 	$mediaID = $trow['mediaID'];
< 	$tmediatypeID = $trow['mediatypeID'];
< 	$tusefolder = $trow['usecollfolder'] ? $mediatypes_assoc[$tmediatypeID] : $mediapath;
---
> 	$mediaID = isset($trow['mediaID']) ? $trow['mediaID'] : "";
> 	$tmediatypeID = isset($trow['mediatypeID']) ? $trow['mediatypeID'] : "";
> 	$tusefolder = !empty($trow['usecollfolder']) ? $mediatypes_assoc[$tmediatypeID] : $mediapath;
1039c1124
< 	if( $trow['thumbpath'] && file_exists( "$rootpath$tusefolder/{$trow['thumbpath']}" ) ) {
---
> 	if( !empty($trow['thumbpath']) && file_exists( "$rootpath$tusefolder/{$trow['thumbpath']}" ) ) {
1051,1053c1136,1138
< 				if( $prow['fbranch'] != NULL ) $prow['branch'] = $prow['fbranch'];
< 				if( $prow['fliving'] != NULL ) $prow['living'] = $prow['fliving'];
< 				if( $prow['fprivate'] != NULL ) $prow['private'] = $prow['fprivate'];
---
> 				if( !empty($prow['fbranch']) ) $prow['branch'] = $prow['fbranch'];
> 				if( !empty($prow['fliving']) ) $prow['living'] = $prow['fliving'];
> 				if( !empty($prow['fprivate']) ) $prow['private'] = $prow['fprivate'];
1056,1057c1141,1142
< 				$prow['allow_living'] == $rights['living'];
< 				$prow['allow_private'] == $rights['private'];
---
> 				$prow['allow_living'] = $rights['living'];
> 				$prow['allow_private'] = $rights['private'];
1107c1192
< 		$fact[$i] = $row['isrepo'] ? "" : $text['address'] . ":";
---
> 		$fact[$i] = !empty($row['isrepo']) ? "" : $text['address'] . ":";
1130c1215
< 			$link = strpos($addr['www'],"http") !== 0 ? "http://" . $addr['www'] : $addr['www'];
---
> 			$link = strpos($addr['www'],"http") !== 0 ? "https://" . $addr['www'] : $addr['www'];
diff -r TNG/places100.php TNG1403/places100.php
5c5
< $topnum = preg_replace("/[^0-9]/", '', $topnum);
---
> $topnum = isset($topnum) ? preg_replace("/[^0-9]/", '', $topnum) : "";
58c58
< if(!$decodedfirstchar) $decodedfirstchar = $text['top'] . " $topnum";
---
> if( empty($decodedfirstchar) ) $decodedfirstchar = $text['top'] . " $topnum";
73c73
< if( $psearch )
---
> if( !empty($psearch) )
76,77c76
< $offsetorg = $offset;
< $offset = $offset ? $offset + 1 : 1;
---
> $offset = !empty($offset) ? $offset + 1 : 1;
95d93
< 	$noplace = urlencode($text['noplace']);
105c103
< 		$searchlink = $specificcount ? " <a href=\"$placesearch_url" . "{$treestr}psearch=$place2\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"\" width=\"9\" height=\"9\" /></a>" : "";
---
> 		$searchlink = $specificcount ? " <a href=\"$placesearch_url" . "{$treestr}psearch=$place2\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" border=\"0\" alt=\"\" width=\"9\" height=\"9\" /></a>" : "";
diff -r TNG/places-all.php TNG1403/places-all.php
11c11
<     $treestr3 = "tree=$tree&";
---
>     $treestr3 = "tree=$tree&amp;";
111,121c111,114
< 				$poffset = $stretch ? "" : "offset=$offset&";
< 				if(substr($place['wholeplace'],0,1) == ',' && trim(substr($place[wholeplace],1)) == $place['myplace']) {
< 					$place3 = addslashes($place['wholeplace']);
< 					$commaOnEnd = true;
< 					$place2 = urlencode($place['wholeplace']);
< 					$placetitle = $place['wholeplace'];
< 				}
< 				else {
< 					$place3 = addslashes($place['myplace']);
< 					$placetitle = $place['myplace'];
< 				}
---
> 				$poffset = !empty($stretch) ? "" : "offset=$offset&amp;";
> 
> 				$place3 = addslashes($place['myplace']);
> 				$placetitle = $place['myplace'];
129,130c122,123
< 				$searchlink = $specificcount ? " <a href=\"$placesearch_url" . "{$treestr3}psearch=$place2\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"$text[findplaces]\" width=\"9\" height=\"9\" /></a>" : "";
< 				if( $place['placecount'] > 1 || ($place['myplace'] != $place['wholeplace'] && !$commaOnEnd) ) {
---
> 				$searchlink = $specificcount ? " <a href=\"$placesearch_url" . "{$treestr3}psearch=$place2\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\" /></a>" : "";
> 				if( $place['placecount'] > 1 || !$commaOnEnd ) {
132c125
< 					if($tree && !$tngconfig['places1tree']) $name .= "tree={$place['gedcom']}&";
---
> 					if($tree && !$tngconfig['places1tree']) $name .= "tree={$place['gedcom']}&amp;";
diff -r TNG/placesearch.php TNG1403/placesearch.php
23a24,25
> $psearchns = $psearch;
> $psearch = addslashes($psearch);
25,30d26
< if (get_magic_quotes_gpc() == 0) {
< 	$psearchns = $psearch;
< 	$psearch = addslashes($psearch);
< }
< else
< 	$psearchns = stripslashes($psearch);
33a30,31
> $mcharsetstr = "&amp;oe=$session_charset";
> 
35c33
< if($order)
---
> if( !empty($order) )
69c67
< 	global $eventtypes_table, $text, $tree, $people_table, $families_table, $trees_table, $offset, $page, $psearch, $maxsearchresults;
---
> 	global $eventtypes_table, $text, $tree, $people_table, $families_table, $trees_table, $offset, $page, $psearch, $maxsearchresults, $numtrees;
153c151
< 			$query = "SELECT $families_table.ID, $families_table.familyID, $families_table.living, $families_table.private, $families_table.branch, p1.lastname as p1lastname, p2.lastname as p2lastname, $place, $datefield, $families_table.gedcom, treename
---
> 			$query = "SELECT $families_table.ID, $families_table.familyID, husband, wife, $families_table.living, $families_table.private, $families_table.branch, p1.lastname as p1lastname, p2.lastname as p2lastname, $place, $datefield, $families_table.gedcom, treename
169c167
< 			$query = "SELECT $people_table.ID, $people_table.personID, lastname, lnprefix, firstname, $people_table.living, $people_table.private, $people_table.branch, prefix, suffix, nameorder, $place, $datefield, $people_table.gedcom, treename
---
> 			$query = "SELECT $people_table.ID, $people_table.personID, lastname, lnprefix, firstname, $people_table.living, $people_table.private, $people_table.branch, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, $place, $datefield, $people_table.gedcom, treename
206c204
< 	<table cellpadding="3" cellspacing="1" border="0" width="100%" class="whiteback">
---
> 	<table cellpadding="3" cellspacing="1" border="0" width="100%" class="thfixed whiteback normal">
208,211c206,209
< 			<td class="fieldnameback"><span class="fieldname">&nbsp;</span></td>
< 			<td class="fieldnameback"><span class="fieldname nw">&nbsp;<b><?php echo $namestr; ?></b>&nbsp;</span></td>
< 			<td class="fieldnameback" colspan="2"><span class="fieldname">&nbsp;<b><?php echo $datestr; ?></b>&nbsp;</span></td>
< 			<td class="fieldnameback"><span class="fieldname nw">&nbsp;<b><?php echo $text[$idtext]; ?></b>&nbsp;</span></td>
---
> 			<th class="fieldnameback"><span class="fieldname">&nbsp;</span></th>
> 			<th class="fieldnameback"><span class="fieldname nw">&nbsp;<b><?php echo $namestr; ?></b>&nbsp;</span></th>
> 			<th class="fieldnameback" colspan="2"><span class="fieldname">&nbsp;<b><?php echo $datestr; ?></b>&nbsp;</span></th>
> 			<th class="fieldnameback"><span class="fieldname nw">&nbsp;<b><?php echo $text[$idtext]; ?></b>&nbsp;</span></th>
215c213
< 			<td class="fieldnameback"><span class="fieldname">&nbsp;<b><?php echo $text['tree']; ?></b>&nbsp;</span></td>
---
> 			<th class="fieldnameback"><span class="fieldname">&nbsp;<b><?php echo $text['tree']; ?></b>&nbsp;</span></th>
277c275
< 	$logurlstring = "&tree=$tree";
---
> 	$logurlstring = "&amp;tree=$tree";
286c284
< 	$urlstring = $logurlstring = $wherestr2 = "";
---
> 	$urlstring = $logurlstring = $wherestr2 = $treerow['treename'] = "";
301d298
< $flags['tabs'] = $tngconfig['tabs'];
303,304c300,303
< if( $map['key'] && $isConnected)
<     $flags['scripting'] .= "<script type=\"text/javascript\" src=\"{$http}://maps.googleapis.com/maps/api/js?language={$text['glang']}$mapkeystr\"></script>\n";
---
> if( $map['key'] && $isConnected) {
> 	if( !isset($flags['scripting']) ) $flags['scripting'] = "";
> 	$flags['scripting'] .= "<script type=\"text/javascript\" src=\"{$http}://maps.googleapis.com/maps/api/js?language={$text['glang']}$mapkeystr\"></script>\n";
> }
317c316,319
< $rightbranch = 1;
---
> if(!$tngconfig['places1tree'])
> 	$rightbranch = checktree($tree);
> else
> 	$rightbranch = 1;
328c330
< 			echo "<br /><div id=\"map\" style=\"width: {$map['hstw']}; height: {$map['hsth']}; margin-bottom:20px;\" class=\"rounded10\"></div>\n";
---
> 			echo "<br /><div id=\"map\" style=\"width: {$map['indw']}; height: {$map['indh']}; margin-bottom:20px;\" class=\"rounded10\"></div>\n";
333c335
<     		echo "<br /><span><strong>{$text['tree']}:</strong> {$prow['treename']}</span><br />\n";
---
>     		echo "<p><strong>{$text['tree']}:</strong> {$prow['treename']}</p>\n";
335,336c337,338
< 			$notes = nl2br( truncateIt(getXrefNotes($prow['notes'],$prow['gedcom']),$tngconfig['maxnoteprev']) );
< 			echo "<span><strong>{$text['notes']}:</strong> $notes</span><br />";
---
> 			$notes = nl2br( getXrefNotes($prow['notes'],$prow['gedcom']) );
> 			echo "<p><strong>{$text['notes']}:</strong><br />\n" . nl2br(insertLinks($notes)) . "</p>";
338d339
< 
345c346
< 			$placeleveltext = $placelevel != "0" ? $admtext['level'.$placelevel] . "&nbsp;:&nbsp;" : "";
---
> 			$placeleveltext = $placelevel > 0 ? $admtext['level'.$placelevel] . "&nbsp;:&nbsp;" : "";
349,350c350
< 			echo "<a href=\"{$http}://www.openstreetmap.org/#map=$zoom/$lat/$long\" target=\"_blank\"><img src=\"{$cms['tngpath']}img/Openstreetmap_logo_small.png\"> OpenStreetMap</a><br /><br />"; // add external link to Google Maps for Directions in the balloon
< 			$codednotes .= "<br /><br /><a href=\"{$http}://maps.google.com/maps?f=q{$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($codedplace)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $codedplace";
---
> 			$codednotes .= "<br /><br /><a href=\"{$http}://maps.google.com/maps?f=q&amp;hl={$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($codedplace)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $codedplace";
355c355
< 					$locations2map[$l2mCount]= array("pinplacelevel"=>$pinplacelevel,"lat"=>$lat,"long"=>$long,"zoom"=>$zoom,"htmlcontent"=>"<div class=\"mapballoon normal\">$placeleveltext<br />$codedplace$codednotes</div>");
---
> 					$locations2map[$l2mCount]= array("place"=>$codedplace,"pinplacelevel"=>$pinplacelevel,"lat"=>$lat,"long"=>$long,"zoom"=>$zoom,"htmlcontent"=>"<div class=\"mapballoon normal\">$placeleveltext<br />$codedplace$codednotes</div>");
360c360
< 			echo "<a href=\"{$http}://maps.google.com/maps?f=q{$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($codedplace)&amp;z=12&amp;om=1&amp;iwloc=addr\" target=\"_blank\"><img src=\"{$cms['tngpath']}google_marker.php?image=$pinplacelevel.png&amp;text=$l2mCount\" alt=\"\" border=\"0\" /></a><strong>$placeleveltext</strong><span class=\"normal\"><strong>{$text['latitude']}:</strong> {$prow['latitude']}, <strong>{$text['longitude']}:</strong> {$prow['longitude']}</span><br /><br />";
---
> 			echo "<a href=\"{$http}://maps.google.com/maps?f=q&amp;hl={$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($codedplace)&amp;z=12&amp;om=1&amp;iwloc=addr\" target=\"_blank\"><img src=\"{$cms['tngpath']}google_marker.php?image=$pinplacelevel.png&amp;text=$l2mCount\" alt=\"\" border=\"0\" /></a><strong>$placeleveltext</strong><span class=\"normal\"><strong>{$text['latitude']}:</strong> {$prow['latitude']}, <strong>{$text['longitude']}:</strong> {$prow['longitude']}</span><br /><br />";
364c364
< 			echo "<span><strong>{$text['latitude']}:</strong> {$prow['latitude']}, <strong>{$text['longitude']}:</strong> {$prow['longitude']}</span><br /><br />";
---
> 			echo "<p><strong>{$text['latitude']}:</strong> {$prow['latitude']}, <strong>{$text['longitude']}:</strong> {$prow['longitude']}</p><br />";
415c415
< $displaymsgs = array("birth" => $text['birth'],"altbirth"=> $text['christened'],"death"=> $text['died'],"burial"=> $text['buried']);
---
> $displaymsgs = array("birth" => $text['birth'],"altbirth"=> $admtext['CHR'],"death"=> $text['death'],"burial"=> $text['burial']);
427c427
< $displaymsgs = array("marr" => $text['married'],"div"=> $text['divorced']);
---
> $displaymsgs = array("marr" => $text['marriage'],"div"=> $text['divorce']);
diff -r TNG/places-oneletter.php TNG1403/places-oneletter.php
9c9,11
< $psearch = trim($psearch);
---
> $psearch_org = isset($psearch) ? cleanItLite($psearch) : "";
> $psearch = isset($psearch) ? cleanIt(trim($psearch)) : "";
> if( !isset($firstchar) ) $firstchar = "";
19c21
<     $treestr3 = "tree=$tree&";
---
>     $treestr3 = "tree=$tree&amp;";
22c24
<     $logstring = "<a href=\"$places_oneletter_url" . "firstchar=$firstchar&amp;psearch=$psearch&amp;tree=$tree$offsetstr$stretchstr\">{$text['placelist']}: $decodedfirstchar ({$text['tree']}: $tree)</a>";
---
>     $logstring = "<a href=\"$places_oneletter_url" . "firstchar=$firstchar&amp;psearch=$psearch_org&amp;tree=$tree$offsetstr$stretchstr\">{$text['placelist']}: $decodedfirstchar ({$text['tree']}: $tree)</a>";
30c32
<     $logstring = "<a href=\"$places_oneletter_url" . "firstchar=$firstchar&amp;psearch=$psearch$offsetstr$stretchstr\">{$text['placelist']}: $decodedfirstchar</a>";
---
>     $logstring = "<a href=\"$places_oneletter_url" . "firstchar=$firstchar&amp;psearch=$psearch_org$offsetstr$stretchstr\">{$text['placelist']}: $decodedfirstchar</a>";
34,35c36,38
< $offsetorg = $offset;
< $offset = $offset ? $offset + 1 : 1;
---
> $offsetorg = isset($offset) ? $offset : 0;
> $offset = !empty($offset) ? $offset + 1 : 1;
> $wherestr_one = $wherestr2;
43,44c46,47
< 	$psearchslashed = get_magic_quotes_gpc() == 0 ? addslashes($psearch) : $psearch;
< 	$wherestr .= $offsetorg ? "trim(substring_index(place,',',-$offsetorg)) = \"$psearchslashed\"" : "place LIKE \"%$psearch%\"";
---
> 	$psearchslashed = addslashes($psearch_org);
> 	$wherestr .= $offsetorg ? "trim(substring_index(place,',',-$offsetorg)) = \"$psearchslashed\"" : "place LIKE \"%$psearch_org%\"";
50c53
< if( $stretch ) {
---
> if( !empty($stretch) ) {
59,61c62,64
< $result = tng_query($query);
< if( tng_num_rows( $result ) == 1 ) {
< 	$row = tng_fetch_assoc( $result );
---
> $presult = tng_query($query);
> if( tng_num_rows( $presult ) == 1 ) {
> 	$row = tng_fetch_assoc( $presult );
65c68
< 		$result = tng_query($query);
---
> 		$presult = tng_query($query);
81c84
< if($tree && !$tngconfig['places1tree'])
---
> if(!$tngconfig['places1tree'])
83a87,113
> $linkstr = "";
> 
> $query = "SELECT ucase(left(trim(substring_index(place,',',-$offset)),1)) as firstchar, count(ucase(left(trim(substring_index(place,',',-$offset)),1))) as placecount FROM $places_table WHERE trim(substring_index(place,',',-$offset)) != \"\" $wherestr_one GROUP BY firstchar ORDER by firstchar";
> $result = tng_query($query);
> if( $result ) {
> 	$initialchar = 1;
> 	
> 	while( $place = tng_fetch_assoc( $result ) ) {
> 		if( $initialchar != 1 ) { 
> 			$linkstr .= " ";
> 		}
> 		if( $place['firstchar'] != "" ) {
> 			$urlfirstchar = urlencode($place['firstchar']);
> 			$countstr = $text['placesstarting'] . ": " . $place['firstchar'] . " (" . number_format($place['placecount']) . " " . $text['totalnames'] . ")";
> 			$linkstr .= "<a href=\"$places_oneletter_url" . "firstchar=$urlfirstchar&amp;{$treestr}offset=$offsetorg&amp;psearch=$psearch_org\" class=\"snlink\" title=\"$countstr\">{$place['firstchar']}</a> ";
> 		}
> 		$initialchar++;
> 	}
> 	tng_free_result($result);
> }
> ?>
> 
> <div class="titlebox normal">
> 	<p class="subhead"><strong><?php echo $text['placesstarting']; ?></strong></p>
> 	<p class="firstchars"><?php echo $linkstr; ?></p>
> 
> <?php
87d116
< <div class="titlebox">
96d124
< </div>
98,99c126,127
< 
< <br />
---
> </div>
> <br/>
111c139
< <table class="sntable">
---
> <table class="sntable normal">
114,115c142,143
< $topnum = tng_num_rows($result);
< if( $result ) {
---
> $topnum = tng_num_rows($presult);
> if( $presult ) {
125c153
< 	while( $place = tng_fetch_assoc( $result ) ) {
---
> 	while( $place = tng_fetch_assoc( $presult ) ) {
129c157
< 			$poffset = $stretch ? "" : "offset=$offset&amp;";
---
> 			$poffset = !empty($stretch) ? "" : "offset=$offset&amp;";
147c175
< 			$searchlink = $specificcount ? " <a href=\"$placesearch_url" . "{$treestr3}psearch=$place2\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\" /></a>" : "";
---
> 			$searchlink = $specificcount ? " <a href=\"$placesearch_url" . "{$treestr3}psearch=$place2\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\" /></a>" : "";
173c201
< 	tng_free_result($result);
---
> 	tng_free_result($presult);
diff -r TNG/places.php TNG1403/places.php
38,41d37
< $linkstr2col1 = "";
< $linkstr2col2 = "";
< $linkstr3col1 = "";
< $linkstr3col2 = "";
45,46c41,43
< $offsetorg = $offset;
< $offset = $offset ? $offset + 1 : 1;
---
> $offsetorg = isset($offset) ? $offset : 0;
> $offset = !empty($offset) ? $offset + 1 : 1;
> if( !isset($psearch) ) $psearch = "";
60c57
< 			$linkstr .= "<a href=\"$places_oneletter_url" . "firstchar=$urlfirstchar&amp;{$treestr}offset=$offsetorg&amp;psearch=$psearch\" class=\"snlink\" title=\"$countstr\">$place[firstchar]</a> ";
---
> 			$linkstr .= "<a href=\"$places_oneletter_url" . "firstchar=$urlfirstchar&amp;{$treestr}offset=$offsetorg&amp;psearch=$psearch\" class=\"snlink\" title=\"$countstr\">{$place['firstchar']}</a> ";
90a88
> 			if( !isset($linkstr2col[$col]) ) $linkstr2col[$col] = "";
136c134,135
< 	echo $linkstr2col[$i];
---
> 	if(isset($linkstr2col[$i]))
> 		echo $linkstr2col[$i];
diff -r TNG/processlogin.php TNG1403/processlogin.php
11,13c11,13
< $tngusername = mysqli_real_escape_string($link, $tngusername);
< $tngpassword = mysqli_real_escape_string($link, $tngpassword);
< $newpassword = mysqli_real_escape_string($link, $newpassword);
---
> $tngusername = isset($tngusername) ? mysqli_real_escape_string($link, $tngusername) : "";
> $tngpassword = isset($tngpassword) ? mysqli_real_escape_string($link, $tngpassword) : "";
> $newpassword = isset($newpassword) ? mysqli_real_escape_string($link, $newpassword) : "";
15,16c15,16
< if($admin_login) {
< 	$home_url = $continue ? "admin_main.php" : "admin.php";
---
> if(!empty($admin_login)) {
> 	$home_url = "admin.php";
18c18
< 	$dest_url = $_SESSION['destinationpage8'] && $continue ? $_SESSION['destinationpage8'] : $home_url;
---
> 	$dest_url = isset($_SESSION['destinationpage8']) && $continue ? $_SESSION['destinationpage8'] : $home_url;
28,30c28,31
< if( tng_num_rows( $result ) ) {
< 	$row = tng_fetch_assoc( $result );
< 	$type = $encrypted ? $encrypted : $row['password_type'];
---
> $row = tng_fetch_assoc($result);
> 
> if( tng_num_rows( $result ) === 1 && $tngusername == $row['username']) {
> 	$type = !empty($encrypted) ? $encrypted : $row['password_type'];
40c41
< 	    $result2 = tng_query($query) or die ("Cannot execute query: $query");
---
> 	    $result2 = tng_query($query2) or die ("Cannot execute query: $query");
58c59
< 		if(!$admin_login || $allow_admin) {
---
> 		if(empty($admin_login) || $allow_admin) {
60,62c61,73
< 			if($resetpass && $newpassword && $row['allow_profile']) {
< 				$password_type = PasswordType();
< 				$query = "UPDATE $users_table SET password=\"" . PasswordEncode($newpassword) . "\", lastlogin=\"$newdate\", password_type=\"$password_type\" WHERE userID=\"{$row['userID']}\"";
---
> 			if(!empty($resetpass) && $newpassword) {
> 				if(!$row['allow_profile'])
> 					$success = 2;    // inadequate permissions
> 				elseif($newpassword != $newpassword2)
> 					$success = 3;    // passwords did not match
> 				else {
> 					$row['password_type'] = PasswordType();
> 					$row['password'] = PasswordEncode($newpassword);
> 					$query = "UPDATE $users_table SET password=\"{$row['password']}\", lastlogin=\"$newdate\", password_type=\"{$row['password_type']}\" WHERE userID=\"{$row['userID']}\"";
> 					$uresult = tng_query($query);
> 					$success = tng_affected_rows();
> 				}
> 				$password_url = getURL( "pwdupdate", 1 ) . "success=" . $success;
64c75
< 			else
---
> 			else {
66,67c77,79
< 			$uresult = tng_query($query) or die ("Cannot execute query: $query");
< 			if( $remember ) {
---
> 				$uresult = tng_query($query) or die ("Cannot execute query: $query");
> 			}
> 			if( !empty($remember) ) {
72c84
< 			if($admin_login)
---
> 			if(!empty($admin_login))
97a110
>             $allow_private_notes = $_SESSION['allow_private_notes'] = $row['allow_private_notes'];
132c145
< 			$headerstr = $dest_url;
---
> 			$headerstr = !empty($password_url) ? $password_url . "&dest=$dest_url" : $dest_url;
diff -r TNG/processvars.php TNG1403/processvars.php
27c27,29
< 		if(is_string($value))
---
> 		if(is_string($value)) {
> 			if(strpos($value,"php://") !== false || strpos($value,".iconv") !== false)
> 				die("Sorry!");
28a31
> 		}
33a37,38
> 		if(is_string($value) && (strpos($value,"php://") !== false || strpos($value,".iconv") !== false))
> 			die("Sorry!");
41a47
> if(isset($branch)) $branch = preg_replace("/[^A-Za-z0-9\._\-]/", '', $branch);
diff -r TNG/pwdlib.php TNG1403/pwdlib.php
14a15
>         if( !isset($tngconfig['password_type']) ) $tngconfig['password_type'] = "";
diff -r TNG/pwdlib-phpass.php TNG1403/pwdlib-phpass.php
5c5
< # Version 0.3 / genuine.
---
> # Version 0.5 / genuine.
33c33
< 	function PasswordHash($iteration_count_log2, $portable_hashes)
---
> 	function __construct($iteration_count_log2, $portable_hashes)
47a48,52
> 	function PasswordHash($iteration_count_log2, $portable_hashes)
> 	{
> 		self::__construct($iteration_count_log2, $portable_hashes);
> 	}
> 
51c56
< 		if (is_readable('/dev/urandom') &&
---
> 		if (@is_readable('/dev/urandom') &&
62,63c67
< 				$output .=
< 				    pack('H*', md5($this->random_state));
---
> 				$output .= md5($this->random_state, TRUE);
107c111
< 		if (substr($setting, 0, 2) == $output)
---
> 		if (substr($setting, 0, 2) === $output)
112c116
< 		if ($id != '$P$' && $id != '$H$')
---
> 		if ($id !== '$P$' && $id !== '$H$')
122c126
< 		if (strlen($salt) != 8)
---
> 		if (strlen($salt) !== 8)
125,128c129,132
< 		# We're kind of forced to use MD5 here since it's the only
< 		# cryptographic primitive available in all versions of PHP
< 		# currently in use.  To implement our own low-level crypto
< 		# in PHP would result in much worse performance and
---
> 		# We were kind of forced to use MD5 here since it's the only
> 		# cryptographic primitive that was available in all versions
> 		# of PHP in use.  To implement our own low-level crypto in PHP
> 		# would have resulted in much worse performance and
131,141c135,138
< 		if (PHP_VERSION >= '5') {
< 			$hash = md5($salt . $password, TRUE);
< 			do {
< 				$hash = md5($hash . $password, TRUE);
< 			} while (--$count);
< 		} else {
< 			$hash = pack('H*', md5($salt . $password));
< 			do {
< 				$hash = pack('H*', md5($hash . $password));
< 			} while (--$count);
< 		}
---
> 		$hash = md5($salt . $password, TRUE);
> 		do {
> 			$hash = md5($hash . $password, TRUE);
> 		} while (--$count);
149,166d145
< 	function gensalt_extended($input)
< 	{
< 		$count_log2 = min($this->iteration_count_log2 + 8, 24);
< 		# This should be odd to not reveal weak DES keys, and the
< 		# maximum valid value is (2**24 - 1) which is odd anyway.
< 		$count = (1 << $count_log2) - 1;
< 
< 		$output = '_';
< 		$output .= $this->itoa64[$count & 0x3f];
< 		$output .= $this->itoa64[($count >> 6) & 0x3f];
< 		$output .= $this->itoa64[($count >> 12) & 0x3f];
< 		$output .= $this->itoa64[($count >> 18) & 0x3f];
< 
< 		$output .= $this->encode64($input, 3);
< 
< 		return $output;
< 	}
< 
212c191
< 		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
---
> 		if (CRYPT_BLOWFISH === 1 && !$this->portable_hashes) {
216,225c195
< 			if (strlen($hash) == 60)
< 				return $hash;
< 		}
< 
< 		if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
< 			if (strlen($random) < 3)
< 				$random = $this->get_random_bytes(3);
< 			$hash =
< 			    crypt($password, $this->gensalt_extended($random));
< 			if (strlen($hash) == 20)
---
> 			if (strlen($hash) === 60)
234c204
< 		if (strlen($hash) == 34)
---
> 		if (strlen($hash) === 34)
246c216
< 		if ($hash[0] == '*')
---
> 		if ($hash[0] === '*')
249c219,223
< 		return $hash == $stored_hash;
---
> 		# This is not constant-time.  In order to keep the code simple,
> 		# for timing safety we currently rely on the salts being
> 		# unpredictable, which they are at least in the non-fallback
> 		# cases (that is, when we use /dev/urandom and bcrypt).
> 		return $hash === $stored_hash;
253c227
< ?>
---
> ?>
\ No newline at end of file
Only in TNG1403: pwdupdate.php
diff -r TNG/randomphoto.php TNG1403/randomphoto.php
11c11
< $query = "SELECT DISTINCT $media_table.mediaID, $media_table.description, path, alwayson, usecollfolder, mediatypeID, gedcom FROM $media_table WHERE mediatypeID = \"$rp_mediatypeID\" AND (abspath is NULL OR abspath = \"0\") ORDER BY RAND()";
---
> $query = "SELECT DISTINCT $media_table.mediaID, $media_table.description, path, alwayson, usecollfolder, mediatypeID, gedcom FROM $media_table WHERE mediatypeID = \"$rp_mediatypeID\" AND COALESCE(private,0) = 0 AND (abspath is NULL OR abspath = \"0\") ORDER BY RAND()";
12a13,14
> $usefolder = $treestr = "";
> $found = false;
20a23
> 			$found = true;
39a43
> 				$found = true;
47,59c51,53
< if(strpos($rp_maxwidth,"%") !== FALSE) {
< 	$dimensions = "width=\"$rp_maxwidth\"";
< }
< else {
< 	$usefolder = $imgrow['usecollfolder'] ? $mediatypes_assoc[$rp_mediatypeID]  : $mediapath;
< 	$photoinfo = @GetImageSize( "$rootpath$usefolder/" . $imgrow['path'] );
< 	$photowtouse = $photoinfo[0];
< 	$photohtouse = $photoinfo[1];
< 
< 	//these lines do the resizing
< 	if( $rp_maxheight && $photohtouse > $rp_maxheight ) {
< 	    $photowtouse = intval( $rp_maxheight * $photowtouse / $photohtouse );
< 	    $photohtouse = $rp_maxheight;
---
> if($found) {
> 	if(strpos($rp_maxwidth,"%") !== FALSE) {
> 		$dimensions = "width=\"$rp_maxwidth\"";
61,63c55,70
< 	if( $rp_maxwidth && $photowtouse > $rp_maxwidth ) {
< 	    $photohtouse = intval( $rp_maxwidth * $photohtouse / $photowtouse );
< 	    $photowtouse = $rp_maxwidth;
---
> 	else {
> 		$usefolder = $imgrow['usecollfolder'] ? $mediatypes_assoc[$rp_mediatypeID]  : $mediapath;
> 		$photoinfo = @GetImageSize( "$rootpath$usefolder/" . $imgrow['path'] );
> 		$photowtouse = $photoinfo[0];
> 		$photohtouse = $photoinfo[1];
> 
> 		//these lines do the resizing
> 		if( $rp_maxheight && $photohtouse > $rp_maxheight ) {
> 		    $photowtouse = intval( $rp_maxheight * $photowtouse / $photohtouse );
> 		    $photohtouse = $rp_maxheight;
> 		}
> 		if( $rp_maxwidth && $photowtouse > $rp_maxwidth ) {
> 		    $photohtouse = intval( $rp_maxwidth * $photohtouse / $photowtouse );
> 		    $photowtouse = $rp_maxwidth;
> 		}
> 		$dimensions = "width=\"$photowtouse\" height=\"$photohtouse\"";
65,66d71
< 	$dimensions = "width=\"$photowtouse\" height=\"$photohtouse\"";
< }
68,73c73,79
< echo "<div class=\"indexphototable\">\n";
< echo "<a href=\"{$showmedia_url}mediaID={$imgrow['mediaID']}\"><img class=\"indexphoto rounded4\" border=\"0\" src=\"$usefolder/$treestr".str_replace("%2F","/",rawurlencode($imgrow['path']))."\" {$dimensions} alt=\"{$imgrow['description']}\" title=\"{$imgrow['description']}\" /></a>";
< echo "<div style=\"padding: 5px\">\n";
< echo "<em><a href=\"{$showmedia_url}mediaID={$imgrow['mediaID']}\">{$imgrow['description']}</a></em>\n";
< echo "</div>\n";
< echo "</div>\n";
---
> 	echo "<div class=\"indexphototable\">\n";
> 	echo "<a href=\"{$showmedia_url}mediaID={$imgrow['mediaID']}\"><img class=\"indexphoto rounded4\" border=\"0\" src=\"$usefolder/$treestr".str_replace("%2F","/",rawurlencode($imgrow['path']))."\" {$dimensions} alt=\"{$imgrow['description']}\" title=\"{$imgrow['description']}\" /></a>";
> 	echo "<div style=\"padding: 5px\">\n";
> 	echo "<em><a href=\"{$showmedia_url}mediaID={$imgrow['mediaID']}\">{$imgrow['description']}</a></em>\n";
> 	echo "</div>\n";
> 	echo "</div>\n";
> }
diff -r TNG/readme.html TNG1403/readme.html
83a84,87
> 	else if( !checkEmail(form.newemail.value)) {
> 		msgfield.innerHTML = "Please enter a valid email address.";
> 		msgfield.className = "red";
> 	}
143a148
> languages["Chinese-UTF8"] = "Chinese (UTF-8)";
148a154
> languages["Croatian"] = "Croatian (ISO-8859-1)";
156a163
> languages["FrenchQC-UTF8"] = "French (Quebec) (UTF-8)";
159c166,167
< languages["Greek"] = "Greek (UTF-8)";
---
> languages["Greek-UTF8"] = "Greek (UTF-8)";
> languages["Hungarian-UTF8"] = "Hungarian (UTF-8)";
172a181,183
> languages["SerbianCyrillic-UTF8"] = "Serbian Cyrillic (UTF-8)";
> languages["Slovak-UTF8"] = "Slovak (UTF-8)";
> languages["Slovak"] = "Slovak (ISO-8859-1)";
176a188
> languages["Turkish-UTF8"] = "Turkish (UTF-8)";
347,351c359,363
< 			TNG Forum: <a href="http://tng.community" target="_blank">http://tng.community</a><br />
< 			TNG Wiki: <a href="http://tng.lythgoes.net/wiki" target="_blank">http://tng.lythgoes.net/wiki</a><br />
< 			TNG info: <a href="http://www.tngsitebuilding.com" target="_blank">http://www.tngsitebuilding.com</a><br />
< 			PHP info: <a href="http://www.php.net" target="_blank">http://www.php.net</a><br/>
< 			MySQL info: <a href="http://www.mysql.com" target="_blank">http://www.mysql.com</a><br /><br />
---
> 			TNG Forum: <a href="https://tng.community" target="_blank">https://tng.community</a><br />
> 			TNG Wiki: <a href="https://tng.lythgoes.net/wiki" target="_blank">https://tng.lythgoes.net/wiki</a><br />
> 			TNG info: <a href="https://tngsitebuilding.com" target="_blank">https://www.tngsitebuilding.com</a><br />
> 			PHP info: <a href="https://php.net" target="_blank">https://www.php.net</a><br/>
> 			MySQL info: <a href="https://mysql.com" target="_blank">https://www.mysql.com</a><br /><br />
354,355c366,367
< 			<a href="http://lythgoes.net/mailman/listinfo/tngusers2_lythgoes.net">Discussion List Options</a><br />
< 			<a href="http://lythgoes.net/pipermail/tngusers2_lythgoes.net/">Discussion List Archives</a><br />
---
> 			<a href="https://lythgoes.net/mailman/listinfo/tngusers2_lythgoes.net">Discussion List Options</a><br />
> 			<a href="https://lythgoes.net/pipermail/tngusers2_lythgoes.net/">Discussion List Archives</a><br />
375c387
< 			<p>Please complete these steps IN ORDER. If you stop part way and come back later, you can start again where you left off (if you start over from the beginning and permissions cannot be set on some files, that's OK). If you have questions, or if anything refuses to work, please look over at the corresponding steps in the <a href="javascript: startAt('s1');">More Information</a> section.</p>
---
> 			<p>Please complete these steps IN ORDER. If you stop part way and come back later, you can start again where you left off (if you start over from the beginning and permissions cannot be set on some files, that's OK). If you have questions, please look over at the corresponding steps in the <a href="javascript: startAt('s1');">More Information</a> section.</p>
381c393
< 				<li><p>If you were viewing this guide on your home computer, close the page now and browse to it on your website instead (for example, "http://www.mysite.com/readme.html"). 
---
> 				<li><p>If you were viewing this guide on your home computer, close the page now and browse to it on your website instead (for example, "https://www.mysite.com/readme.html"). 
450c462
< 					If you don't know this information, ask your web host. They may want you to create the database yourself, but they can show you how. Most people will not need to enter anything for the Port or Socket.
---
> 					If you don't know this information, ask your web host. They may want you to create the database yourself, but they can show you how. Most people will not need to enter anything for the Port or Socket. Note: If you are creating your database and the database user, make sure your database user is granted ALL rights to the database before completing this step.
469c481
< 					This uses default table names with a "tng_" prefix. To use custom names, create the tables from the More Information section. If you're using UTF-8 as your character set, you should set the collation to utf8_general_ci, utf8_unicode_ci or similar. If you're not using UTF-8, latin_swedish_ci is a common choice. If you're not sure,
---
> 					This uses default table names with a "tng_" prefix. If you want to use a different prefix, enter it below. If you're using UTF-8 as your character set, you should set the collation to utf8_general_ci, utf8_unicode_ci or similar. If you're not using UTF-8, latin_swedish_ci is a common choice. If you're not sure,
473a486
> 						<tr><td>Table Prefix:</td><td><input type="text" name="table_prefix" id="table_prefix1" value="tng_"/></td></tr>
514c527
< 				This is optional (if you like plain vanilla or plan to build your own design from scratch). Otherwise, see the choices at <a href="http://lythgoes.net/genealogy/templates.php" target="_blank">http://lythgoes.net/genealogy/templates.php</a>). You may change the template again later from Admin/Setup/Template Settings.
---
> 				This is optional (if you like plain vanilla or plan to build your own design from scratch). Otherwise, see the choices at <a href="https://tngsitebuilding.com/templates.php" target="_blank">https://tngsitebuilding.com/templates.php</a>). You may change the template again later from Admin/Setup/Template Settings.
521a535,537
> 									<option value="21">21</option>
> 									<option value="20">20</option>
> 									<option value="19">19</option>
560c576
< 			<p>You might also want to read the <a href="http://tng.lythgoes.net/wiki/index.php?title=Category:Getting_Started" target="_blank">Getting Started</a> articles on the TNG Wiki for additional information.</p>
---
> 			<p>You might also want to read the <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:Getting_Started" target="_blank">Getting Started</a> articles on the TNG Wiki for additional information.</p>
576,577c592
< 			<p><em><b>If you downloaded TNG from the Internet:</b></em><br />
< 			The file you downloaded is a <b>zip</b> file, which means it actually contains quite a few files all "zipped up"
---
> 			<p>The file you downloaded is a <b>zip</b> file, which means it actually contains quite a few files all "zipped up"
581,583c596,598
< 			A few you might look at are <a href="http://www.winzip.com" target="_blank">WinZip</a> or
< 			<a href="http://www.pkzip.com" target="_blank">PKZip</a> for Windows, or
< 			<a href="http://www.maczipit.com/" target="_blank">ZipIt</a> or <a href="http://www.stuffit.com" target="_blank">StuffIt</a> for Mac.</p>
---
> 			A few you might look at are <a href="https://www.winzip.com" target="_blank">WinZip</a> or
> 			<a href="https://www.pkzip.com" target="_blank">PKZip</a> for Windows, or
> 			<a href="https://www.maczipit.com/" target="_blank">ZipIt</a> or <a href="https://www.stuffit.com" target="_blank">StuffIt</a> for Mac.</p>
621c636
< 			<p>If you want your address (ie, http://www.yoursite.com) to take you directly to your genealogy,
---
> 			<p>If you want your address (ie, https://www.yoursite.com) to take you directly to your genealogy,
649c664
< 			load the readme.html page from your remote site instead (for example, "http://www.mysite.com/readme.html"). 
---
> 			load the readme.html page from your remote site instead (for example, "https://www.mysite.com/readme.html"). 
688,689c703,704
< 			<a href="http://www.versiontracker.com" target="_blank">VersionTracker.com</a> or
< 			<a href="http://www.macupdate.com" target="_blank">MacUpdate.com</a>) or Fetch (available at <a href="http://fetchsoftworks.com/fetch/download/">Fetchsoftworks.com</a>) to do the permissions settings in a
---
> 			<a href="https://www.versiontracker.com" target="_blank">VersionTracker.com</a> or
> 			<a href="https://www.macupdate.com" target="_blank">MacUpdate.com</a>) or Fetch (available at <a href="https://fetchsoftworks.com/fetch/download/">Fetchsoftworks.com</a>) to do the permissions settings in a
692c707
< 			<p>For more information, please see the TNG Wiki article <a href="http://tng.lythgoes.net/wiki/index.php?title=Permissions_Explained" target="_blank">Permissions Explained</a>.</p>
---
> 			<p>For more information, please see the TNG Wiki article <a href="https://tng.lythgoes.net/wiki/index.php?title=Permissions_Explained" target="_blank">Permissions Explained</a>.</p>
749,750d763
< 			<p>If you have PHP 5, please make sure you use <b>extension=php_mysql.dll</b> and copy <b>lib-mysql.dll</b> to where PHP can find it.</p>
< 
901c914
< 			to the <b>Admin/Setup area</b> at http://www.yoursite.com/genealogy/admin_setup.php (if you're reading this
---
> 			to the <b>Admin/Setup area</b> at https://www.yoursite.com/genealogy/admin_setup.php (if you're reading this
924c937
< 			You can read more about <a href="http://tng.lythgoes.net/wiki/index.php?title=Installing_TNG_as_UTF-8" target="_blank">using TNG with UTF-8 here</a>.</p>
---
> 			You can read more about <a href="https://tng.lythgoes.net/wiki/index.php?title=Installing_TNG_as_UTF-8" target="_blank">using TNG with UTF-8 here</a>.</p>
957c970
< 			<a href="http://tng.lythgoes.net/wiki/index.php?title=Database_-_Creating" target="_blank">this page</a> on the TNG Wiki. Note: If you plan to use TNG
---
> 			<a href="https://tng.lythgoes.net/wiki/index.php?title=Database_-_Creating" target="_blank">this page</a> on the TNG Wiki. Note: If you plan to use TNG
981c994
< 			<p>More information on these parameters is available on <a href="http://tng.lythgoes.net/wiki/index.php?title=Setup_-_Database" target="_blank">this page</a> on the TNG Wiki. 
---
> 			<p>More information on these parameters is available on <a href="https://tng.lythgoes.net/wiki/index.php?title=Setup_-_Database" target="_blank">this page</a> on the TNG Wiki. 
1000c1013
< 			by going to the <b>Admin/Setup area</b> at http://www.yoursite.com/genealogy/admin_setup.php (if you're reading this
---
> 			by going to the <b>Admin/Setup area</b> at https://www.yoursite.com/genealogy/admin_setup.php (if you're reading this
1010,1011c1023
< 			5.	You may have just forgotten to assign the user to your database.<br />
< 			6.	If you are running MySQL 4.1 with anything less than PHP 5, the difference in password authentication schemes could cause a problem. Check here for instructions on how to fix this: <a href="http://dev.mysql.com/docss/mysql/en/Old_client.html" target="_blank">http://dev.mysql.com/docss/mysql/en/Old_client.html</a></p>
---
> 			5.	You may have just forgotten to assign the user to your database.</p>
1058a1071
> 							<tr><td valign="top"><span class="normal">Image Tags:</span></td><td><input type="text" value="tng_image_tags" name="image_tags_table" size="20"></td></tr>
1099c1112
< 			4. If you are running MySQL 4.1 with anything less than PHP 5, the difference in password authentication schemes could cause a problem. Check here for instructions on how to fix this: <a href="http://dev.mysql.com/docss/refman/5.0/en/old-client.html" target="_blank">http://dev.mysql.com/docss/mysql/en/Old_client.html</a></p>
---
> 			</p>
1112c1125
< 			go to the <b>Admin area</b> at http://www.yoursite.com/genealogy/admin.php (if you're reading this
---
> 			go to the <b>Admin area</b> at https://www.yoursite.com/genealogy/admin.php (if you're reading this
1121c1134
< 			<p>You might also look at the TNG Wiki article on <a href="http://tng.lythgoes.net/wiki/index.php?title=General_Settings" target="_blank">General Settings</a>,
---
> 			<p>You might also look at the TNG Wiki article on <a href="https://tng.lythgoes.net/wiki/index.php?title=General_Settings" target="_blank">General Settings</a>,
1125,1127c1138
< 			<p><b>NOTE on the Root Path setting:</b> The value you see here the first time should be the correct value,
< 			so you shouldn't have to tamper with this. If you do, you can retrieve the original value by blanking
< 			out the value and saving the page. You must then return to the Settings page and save it again. </p>
---
> 			<p><b>NOTE on the Root Path setting:</b> You can leave this blank unless you want to point to a specific location other than the actual root. </p>
1155c1166
< 			<a href="http://tng.lythgoes.net/wiki/index.php?title=Media_-_Import" target="_blank">Setup - Import Settings</a>.</p>
---
> 			<a href="https://tng.lythgoes.net/wiki/index.php?title=Media_-_Import" target="_blank">Setup - Import Settings</a>.</p>
1159c1170
< 			<p>For more information, see the TNG Wiki article on <a href="http://tng.lythgoes.net/wiki/index.php?title=Google_Maps_-_Getting_Started" target="_blank">Google Maps - Getting Started</a>. </p>
---
> 			<p>For more information, see the TNG Wiki article on <a href="https://tng.lythgoes.net/wiki/index.php?title=Google_Maps_-_Getting_Started" target="_blank">Google Maps - Getting Started</a>. </p>
1163c1174
< 			<p>For more information, see the TNG Wiki article on <a href="http://tng.lythgoes.net/wiki/index.php?title=Template_Settings" taret="_blank">Template Settings</a>.</p>
---
> 			<p>For more information, see the TNG Wiki article on <a href="https://tng.lythgoes.net/wiki/index.php?title=Templates_-_Getting_Started" taret="_blank">Template Settings</a>.</p>
1243c1254
< 			<p>For more information, see the TNG Wiki article <a href="http://tng.lythgoes.net/wiki/index.php?title=Setup_-_Tree" target="_blank">Setup - Tree</a>,
---
> 			<p>For more information, see the TNG Wiki article <a href="https://tng.lythgoes.net/wiki/index.php?title=Setup_-_Tree" target="_blank">Setup - Tree</a>,
1264c1275
< 			TNG Wiki article on <a href="http://tng.lythgoes.net/wiki/index.php?title=Category:Charset" target="_blank">Character Sets</a>.</p>
---
> 			TNG Wiki article on <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:Charset" target="_blank">Character Sets</a>.</p>
1285,1286c1296,1297
< 			<a href="http://tng.lythgoes.net/wiki/index.php?title=Import_Data" target="_blank">Importing Data</a> and
< 			<a href="http://tng.lythgoes.net/wiki/index.php?title=Setup_-_Import_Settings#Local_Paths" target="_blank">Importing Media</a>.</p>
---
> 			<a href="https://tng.lythgoes.net/wiki/index.php?title=Import_Data" target="_blank">Importing Data</a> and
> 			<a href="https://tng.lythgoes.net/wiki/index.php?title=Setup_-_Import_Settings#Local_Paths" target="_blank">Importing Media</a>.</p>
1354c1365
< 			<p>From this area you can also create a GENDEX file to enable your site to be indexed at <a href="http://www.gendexnetwork.org">GenDex Network</a> or <a href="http://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.</p>
---
> 			<p>From this area you can also create a GENDEX file to enable your site to be indexed at <!--<a href="https://www.gendexnetwork.org">GenDex Network</a> or --><a href="https://www.familytreeseeker.com">FamilyTreeSeeker.com</a>.</p>
1392c1403
< 			<p>For more information, please see the TNG Wiki article <a href="http://tng.lythgoes.net/wiki/index.php?title=Media_-_Import" target="_blank">Media - Import</a>.</p>
---
> 			<p>For more information, please see the TNG Wiki article <a href="https://tng.lythgoes.net/wiki/index.php?title=Media_-_Import" target="_blank">Media - Import</a>.</p>
1413c1424
< 			<p>For more information, please see the TNG Wiki articles <a href="http://tng.lythgoes.net/wiki/index.php?title=Category:Data_Protection" target="_blank">Data Protection</a>.</p>
---
> 			<p>For more information, please see the TNG Wiki articles <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:Data_Protection" target="_blank">Data Protection</a>.</p>
1433c1444
< 			<a href="http://tng.lythgoes.net/wiki/index.php?title=Template_Settings">Template Settings</a>
---
> 			<a href="https://tng.lythgoes.net/wiki/index.php?title=Template_Settings">Template Settings</a>
1436c1447
<  			<p>More information on templates can be found on <a href="http://tng.lythgoes.net/wiki/index.php?title=Category:Templates" target="_blank">this page</a> on the TNG Wiki.</p>
---
>  			<p>More information on templates can be found on <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:Templates" target="_blank">this page</a> on the TNG Wiki.</p>
1470c1481
< 			<a href="http://www.htmlhelp.com/reference/css" target="_blank">http://www.htmlhelp.com/reference/css</a>,
---
> 			<a href="https://www.htmlhelp.com/reference/css" target="_blank">https://www.htmlhelp.com/reference/css</a>,
1480c1491
< 			has been made writeable, then go to the page <b>switchcolor.php</b> in your browser (http://www.yoursite.com/genealogy/switchcolor.php).
---
> 			has been made writeable, then go to the page <b>switchcolor.php</b> in your browser (https://www.yoursite.com/genealogy/switchcolor.php).
1486c1497
< 			<a href="http://lythgoes.net/genealogy/switchcolor.php" target="_blank">http://lythgoes.net/genealogy/switchcolor.php</a>.</p>
---
> 			<a href="https://lythgoes.net/genealogy/switchcolor.php" target="_blank">https://lythgoes.net/genealogy/switchcolor.php</a>.</p>
1541,1542c1552,1553
< 			<a href="http://tng.lythgoes.net/wiki/index.php?title=Home_Pages_-_Getting_Started" target="_blank">Home Pages - Getting Started</a> and
< 			<a href="http://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Getting_Started" target="_blank">User Pages - Getting Started</a>.</p>
---
> 			<a href="https://tng.lythgoes.net/wiki/index.php?title=Home_Pages_-_Getting_Started" target="_blank">Home Pages - Getting Started</a> and
> 			<a href="https://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Getting_Started" target="_blank">User Pages - Getting Started</a>.</p>
1564c1575
< 			To use the RSS newsfeed feature, open your favorite RSS reader and subscribe with this URL: http://yourdomain.com/yourgenealogyfolder/tngrss.php.
---
> 			To use the RSS newsfeed feature, open your favorite RSS reader and subscribe with this URL: https://yourdomain.com/yourgenealogyfolder/tngrss.php.
1576c1587
< 			You might also want to read the <a href="http://tng.lythgoes.net/wiki/index.php?title=Category:Getting_Started" target="_blank">Getting Started</a>
---
> 			You might also want to read the <a href="https://tng.lythgoes.net/wiki/index.php?title=Category:Getting_Started" target="_blank">Getting Started</a>
diff -r TNG/recaptchalib.php TNG1403/recaptchalib.php
124c124
< $recaptchaResponse->errorCodes = $answers [error-codes];
---
> $recaptchaResponse->errorCodes = $answers['error-codes'];
diff -r TNG/register.php TNG1403/register.php
1,211c1,226
< <?php
< $textpart = "pedigree";
< include("tng_begin.php");
< 
< if(!$personID) die("no args");
< include($subroot . "pedconfig.php");
< include($cms['tngpath'] . "personlib.php" );
< include($cms['tngpath'] . "reglib.php" );
< 
< $getperson_url = getURL( "getperson", 1 );
< $register_url = getURL( "register", 1 );
< $descend_url = getURL( "descend", 1 );
< $descendtext_url = getURL( "descendtext", 1 );
< $familygroup_url = getURL( "familygroup", 1 );
< $desctracker_url = getURL( "desctracker", 1 );
< $pdfform_url = getURL( "rpt_pdfform", 1 );
< 
< if($tngmore)
< 	$pedigree['regnotes'] = 1;
< elseif($tngless)
< 	$pedigree['regnotes'] = 0;
< 
< $generation = 1;
< $personcount = 1;
< 
< $currgen = array();
< $nextgen = array();
< 
< $result = getPersonFullPlusDates($tree, $personID);
< if( $result ) {
< 	$row = tng_fetch_assoc( $result );
< 	$righttree = checktree($tree);
< 	$rightbranch = $righttree ? checkbranch($row['branch']) : false;
< 	$rights = determineLivingPrivateRights($row, $righttree, $rightbranch);
< 	$row['allow_living'] = $rights['living'];
< 	$row['allow_private'] = $rights['private'];
< 	$row['name'] = getName( $row );
< 	$logname = $tngconfig['nnpriv'] && $row['private'] ? $admtext['text_private'] : ($nonames && $row['living'] ? $text['living'] : $row['name']);
< 	$row['genlist'] = "";
< 	$row['trail'] = $personID;
< 	$row['number'] = 1;
< 	$row['spouses'] = getSpouses( $personID, $row['sex'] );
< 	array_push( $currgen, $row );
< }
< 
< $treeResult = getTreeSimple($tree);
< $treerow = tng_fetch_assoc($treeResult);
< $disallowgedcreate = $treerow['disallowgedcreate'];
< $allowpdf = !$treerow['disallowpdf'] || ($allow_pdf && $rightbranch);
< tng_free_result($treeResult);
< 
< writelog( "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree\">{$text['descendfor']} $logname ($personID)</a>" );
< preparebookmark( "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree\">{$text['descendfor']} {$row['name']} ($personID)</a>" );
< 
< $flags['tabs'] = $tngconfig['tabs'];
< $flags['scripting'] = "<script type=\"text/javascript\">var tnglitbox;</script>\n";
< tng_header( $row['name'], $flags );
< 
< $photostr = showSmallPhoto( $personID, $row['name'], $rights['both'], 0, false, $row['sex'] );
< echo tng_DrawHeading( $photostr, $row['name'], getYears( $row ) );
< 
< if( !$pedigree['maxdesc'] ) $pedigree['maxdesc'] = 12;
< if( !$pedigree['initdescgens'] ) $pedigree['initdescgens'] = 4;
< if( !$generations )
<     $generations = $pedigree['initdescgens'];
< else if( $generations > $pedigree['maxdesc'] )
< 	$generations = $pedigree['maxdesc'];
< else
< 	$generations = intval( $generations );
< 
< $detail_link = "{$register_url}personID=$personID&tree=$tree&generations=$generations";
< if($pedigree['regnotes'])
< 	$detail_link = "<a href=\"{$detail_link}&tngless=1\">{$text['lessdetail']}</a>";
< else
< 	$detail_link = "<a href=\"{$detail_link}&tngmore=1\">{$text['moredetail']}</a>";
< 
< $innermenu = $text['generations'] . ": &nbsp;";
< $innermenu .= "<select name=\"generations\" class=\"verysmall\" onchange=\"window.location.href='$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=' + this.options[this.selectedIndex].value\">\n";
< for( $i = 1; $i <= $pedigree['maxdesc']; $i++ ) {
<     $innermenu .= "<option value=\"$i\"";
<     if( $i == $generations ) $innermenu .= " selected=\"selected\"";
<     $innermenu .= ">$i</option>\n";
< }
< $innermenu .= "</select>&nbsp;&nbsp;&nbsp;\n";
< $innermenu .= "<a href=\"$descend_url" . "personID=$personID&amp;tree=$tree&amp;display=standard&amp;generations=$generations\" class=\"lightlink\">{$text['pedstandard']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< $innermenu .= "<a href=\"$descend_url" . "personID=$personID&amp;tree=$tree&amp;display=compact&amp;generations=$generations\" class=\"lightlink\">{$text['pedcompact']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< $innermenu .= "<a href=\"$descendtext_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['pedtextonly']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< $innermenu .= "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink3\">{$text['regformat']}</a>\n";
< if($generations <= 12 && $allowpdf)
< 	$innermenu .= " &nbsp;&nbsp; | &nbsp;&nbsp; <a href=\"#\" class=\"lightlink\" onclick=\"tnglitbox = new LITBox('$pdfform_url" . "pdftype=desc&amp;personID=$personID&amp;tree=$tree&amp;generations=$generations',{width:350,height:350});return false;\">PDF</a>\n";
< 
< 	echo getFORM( "register", "get", "form1", "form1" );
< 	echo tng_menu( "I", "descend", $personID, $innermenu );
< 	echo "</form>\n";
< ?>
< <div class="titleboxmedium">
< 	<div class="float-right"><?php echo $detail_link; ?></div>
< <!-- <div align="left"> -->
< <?php
< //$userAgent = strtolower($_SERVER['HTTP_USER_AGENT']);
< //$is_mozilla = preg_match('/mozilla/', $userAgent) && !preg_match('/compatible/', $userAgent) ? 1 : 0;
< while( count( $currgen ) && $generation <= $generations ) {
< 	//echo "<span class=\"subhead\"><strong>{$text['generation']}: $generation</strong></span><br/>\n";
< 	echo "<span class=\"subhead\"><strong>{$text['generation']}: $generation</strong></span><br/><br />\n";
< 		//echo "<ol class=\"normal\">\n";
< 		echo "<ol style=\"list-style-type:none; padding:0px; margin:0px;\">";
< 	while( $row = array_shift( $currgen ) ) {
< 		//echo "<li value=\"{$row['number']}\" style=\"vertical-align:top\">\n";
< 		echo "<li>";
< 		//if(!$is_mozilla)
< 			//echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
< 			echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td width=\"40\" class=\"aligntop\" align=\"right\">";
< 			echo "{$row['number']}.&nbsp;&nbsp;</td><td>";
< 		echo showSmallPhoto( $row['personID'], $row['name'], $row['allow_living'] && $row['allow_private'], 0, false, $row['sex'] );
< 		echo "<a href=\"$getperson_url" . "personID={$row['personID']}&amp;tree=$tree\" name=\"p{$row['personID']}\" id=\"p{$row['personID']}\">{$row['name']}</a>";
< 		if( $row['genlist'] )
< 			echo " <a href=\"$desctracker_url" . "trail={$row['trail']}&amp;tree=$tree\" title=\"{$text['graphdesc']}\"><img src=\"{$cms['tngpath']}img/dchart.gif\" width=\"10\" height=\"9\" alt=\"{$text['graphdesc']}\" border=\"0\"/></a> ({$row['genlist']})";
< 		echo getVitalDates( $row );
< 		echo getOtherEvents($row);
< 		if( $row['allow_living'] && $row['allow_private'] && $pedigree['regnotes'] ) {
< 			$notes = buildRegNotes(getRegNotes( $row['personID'], "I" ));
< 			if( $notes ) {
< 				echo "<p>{$text['notes']}:<br/>";
< 				echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
< 			}
< 		}
< 		else $notes = "";
< 
< 		$fname = $row['firstname'];
< 		$firstfirstname = getFirstNameOnly( $row );
< 		$newlist = $row['number'] . ".<a href=\"#\" onclick=\"jQuery('#p{$row['personID']}').animate({scrollTop: -200},'slow'); return false;\">$firstfirstname</a><sup style=\"font-size:8px;top:-2px\">$generation</sup>";
< 		if( $row['genlist'] ) $newlist .= ", " . $row['genlist'];
< 		while( $spouserow = array_shift( $row['spouses'] ) ) {
< 			//$famrights = determineLivingPrivateRights($spouserow, $righttree);
< 			//$spouserow['allow_living'] = $famrights['living'];
< 			//$spouserow['allow_private'] = $famrights['private'];
< 
< 			if($spouserow['marrdate'] || $spouserow['marrplace']) {
< 				echo "<p>$firstfirstname " . strtolower($text['wasmarried']) . " <a href=\"$getperson_url" . "personID={$spouserow['personID']}&amp;tree=$tree\">{$spouserow['name']}</a>";
< 				echo getSpouseDates( $spouserow );
< 			}
< 			else
< 				echo "<p>$firstfirstname " . strtolower($text['wasmarried']) . " <a href=\"$getperson_url" . "personID={$spouserow['personID']}&amp;tree=$tree\">{$spouserow['name']}</a>.";
< 			$spouseinfo = getVitalDates( $spouserow );
< 			$spparents = $spouserow['personID'] ? getSpouseParents( $spouserow['personID'], $spouserow['sex'] ) : $text['unknown'];
< 			if( $spouseinfo ) {
< 				$spname = getName( $spouserow );
< 				$spfirstfirstname = getFirstNameOnly( $spouserow, " " );
< 				echo " $spfirstfirstname $spparents $spouseinfo";
< 			}
< 			else
< 				echo " $spparents";
< 			echo " [<a href=\"$familygroup_url" . "familyID={$spouserow['familyID']}&amp;tree=$tree\">{$text['groupsheet']}</a>]</p>\n";
< 
< 			if($pedigree['regnotes']) {
< 				if($famrights['both']) {
< 					$notes = buildRegNotes(getRegNotes( $spouserow['familyID'], "F" ));
< 					if( $notes ) {
< 						echo "<p>{$text['notes']}:<br/>";
< 						echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>";
< 					}
< 				}
< 			}
< 
< 			$result2 = getChildrenData($tree, $spouserow['familyID']);
< 			if( $result2 && tng_num_rows( $result2 ) ) {
< 				echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>{$text['children']}:<br/>\n<ol>\n";
< 				while( $childrow = tng_fetch_assoc( $result2 ) ) {
< 					$childID = $childrow['personID'];
< 					if( $nextgen[$childID] ) {
< 						$displaycount = $nextgen[$childID]['number'];
< 						$name = $nextgen[$childID]['name'];
< 						$vitaldates = getVitalDates( $nextgen[$childID] );
< 					}
< 					else {
< 						$personcount++;
< 						$displaycount = $personcount;
< 						$childrow['spouses'] = getSpouses( $childID, $childrow['sex'] );
< 						$childrow['genlist'] = $newlist;
< 						$childrow['trail'] = $row['trail'] . ",{$spouserow['familyID']},$childID";
< 						$childrow['number'] = $personcount;
< 						$crights = determineLivingPrivateRights($childrow, $righttree);
< 						$childrow['allow_living'] = $crights['living'];
< 						$childrow['allow_private'] = $crights['private'];
< 						$childrow['name'] = $name = getName( $childrow );
< 						$vitaldates = getVitalDates( $childrow );
< 						if( $childrow['spouses'] || !$pedigree['regnosp'] )
< 							$nextgen[$childID] = $childrow;
< 					}
< 					echo "<li style=\"list-style-type:lower-roman\">$displaycount. <a href=\"#\" onclick=\"if(jQuery('#p$childID').length) {jQuery('html, body').animate({scrollTop: jQuery('#p$childID').offset().top-10},'slow');}else{window.location.href='$getperson_url" . "personID=$childID&amp;tree=$tree';} return false;\">$name</a> &nbsp;<a href=\"$desctracker_url" . "trail={$childrow['trail']}&amp;tree=$tree\"><img src=\"{$cms['tngpath']}img/dchart.gif\" width=\"10\" height=\"9\" alt=\"{$text['graphdesc']}\" border=\"0\"/></a> $vitaldates</li>\n";
< 				}
< 				echo "</ol>\n</td></tr></table>\n";
< 				tng_free_result( $result2 );
< 			}
< 		}
< 		//if(!$is_mozilla)
< 			echo "</td></tr></table>";
< 		echo "<br clear=\"all\"/></li>\n";
< 	}
< 	$currgen = $nextgen;
< 	unset( $nextgen );
< 	$nextgen = array();
< 	$generation++;
< 	echo "</ol>\n<br/>\n";
< }
< ?>
< 
< </div>
< <script type="text/javascript" src="<?php echo $cms['tngpath']; ?>js/rpt_utils.js"></script>
< <?php
< 	tng_footer( "" );
---
> <?php
> $textpart = "pedigree";
> include("tng_begin.php");
> 
> if(!$personID) die("no args");
> include($subroot . "pedconfig.php");
> include($cms['tngpath'] . "personlib.php" );
> include($cms['tngpath'] . "reglib.php" );
> 
> $getperson_url = getURL( "getperson", 1 );
> $register_url = getURL( "register", 1 );
> $descend_url = getURL( "descend", 1 );
> $descendvert_url = getURL( "descendvert", 1 );
> $descendtext_url = getURL( "descendtext", 1 );
> $familygroup_url = getURL( "familygroup", 1 );
> $familychart_url = getURL( "familychart", 1 );
> $desctracker_url = getURL( "desctracker", 1 );
> $descendtables_url = getURL( "descendtables", 1 );
> $pdfform_url = getURL( "rpt_pdfform", 1 );
> 
> if(!empty($tngmore))
> 	$pedigree['regnotes'] = 1;
> elseif(!empty($tngless))
> 	$pedigree['regnotes'] = 0;
> 
> $generation = 1;
> $personcount = 1;
> 
> $currgen = array();
> $nextgen = array();
> 
> $result = getPersonFullPlusDates($tree, $personID);
> if( $result ) {
> 	$row = tng_fetch_assoc( $result );
> 	$righttree = checktree($tree);
> 	$rightbranch = $righttree ? checkbranch($row['branch']) : false;
> 	$rights = determineLivingPrivateRights($row, $righttree, $rightbranch);
> 	$row['allow_living'] = $rights['living'];
> 	$row['allow_private'] = $rights['private'];
> 	$row['allow_private_notes'] = $rights['private_notes'];
> 	$row['name'] = getName( $row );
> 	$logname = $tngconfig['nnpriv'] && $row['private'] ? $admtext['text_private'] : ($nonames && $row['living'] ? $text['living'] : $row['name']);
> 	$row['genlist'] = "";
> 	$row['trail'] = $personID;
> 	$row['number'] = 1;
> 	$row['spouses'] = getSpouses( $personID, $row['sex'] );
> 	array_push( $currgen, $row );
> }
> 
> $treeResult = getTreeSimple($tree);
> $treerow = tng_fetch_assoc($treeResult);
> $disallowgedcreate = $treerow['disallowgedcreate'];
> $allowpdf = !$treerow['disallowpdf'] || ($allow_pdf && $rightbranch);
> tng_free_result($treeResult);
> 
> writelog( "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree\">{$text['descendfor']} $logname ($personID)</a>" );
> preparebookmark( "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree\">{$text['descendfor']} {$row['name']} ($personID)</a>" );
> 
> $flags['scripting'] = "<script type=\"text/javascript\">var tnglitbox;</script>\n";
> tng_header( $row['name'], $flags );
> 
> $photostr = showSmallPhoto( $personID, $row['name'], $rights['both'], 0, false );
> echo tng_DrawHeading( $photostr, $row['name'], getYears( $row ) );
> 
> if( !$pedigree['maxdesc'] ) $pedigree['maxdesc'] = 12;
> if( !$pedigree['initdescgens'] ) $pedigree['initdescgens'] = 4;
> if( !$generations )
>     $generations = $pedigree['initdescgens'];
> else if( $generations > $pedigree['maxdesc'] )
> 	$generations = $pedigree['maxdesc'];
> else
> 	$generations = intval( $generations );
> 
> $detail_link = "{$register_url}personID=$personID&amp;tree=$tree&amp;generations=$generations";
> if($pedigree['regnotes'])
> 	$detail_link = "<a href=\"{$detail_link}&amp;tngless=1\">{$text['lessdetail']}</a>";
> else
> 	$detail_link = "<a href=\"{$detail_link}&amp;tngmore=1\">{$text['moredetail']}</a>";
> 
> $innermenu = $text['generations'] . ": &nbsp;";
> $innermenu .= "<select name=\"generations\" class=\"verysmall\" onchange=\"window.location.href='$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=' + this.options[this.selectedIndex].value\">\n";
> for( $i = 1; $i <= $pedigree['maxdesc']; $i++ ) {
>     $innermenu .= "<option value=\"$i\"";
>     if( $i == $generations ) $innermenu .= " selected=\"selected\"";
>     $innermenu .= ">$i</option>\n";
> }
> $innermenu .= "</select>&nbsp;&nbsp;&nbsp;\n";
> $innermenu .= "<a href=\"$descend_url" . "personID=$personID&amp;tree=$tree&amp;display=standard&amp;generations=$generations\" class=\"lightlink\">{$text['pedstandard']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> $innermenu .= "<a href=\"$descend_url" . "personID=$personID&amp;tree=$tree&amp;display=compact&amp;generations=$generations\" class=\"lightlink\">{$text['pedcompact']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> $innermenu .= "<a href=\"$descendvert_url" . "personID=$personID&amp;tree=$tree&amp;&amp;generations=$generations\" class=\"lightlink\">{$text['pedvertical']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> $innermenu .= "<a href=\"$descendtext_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['pedtextonly']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
> $innermenu .= "<a href=\"$register_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink3\">{$text['regformat']}</a> &nbsp;&nbsp; | &nbsp;&nbsp;\n";
> $innermenu .= "<a href=\"$descendtables_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations\" class=\"lightlink\">{$text['dtformat']}</a>\n";
> if($generations <= 12 && $allowpdf)
> 	$innermenu .= " &nbsp;&nbsp; | &nbsp;&nbsp; <a href=\"#\" class=\"lightlink\" onclick=\"tnglitbox = new LITBox('$pdfform_url" . "pdftype=desc&amp;personID=$personID&amp;tree=$tree&amp;generations=$generations',{width:350,height:350});return false;\">PDF</a>\n";
> 
> 	echo getFORM( "register", "get", "form1", "form1" );
> 	echo tng_menu( "I", "descend", $personID, $innermenu );
> 	echo "</form>\n";
> ?>
> <div class="titleboxmedium">
> 	<div class="float-right"><?php echo $detail_link; ?></div>
> <!-- <div align="left"> -->
> <?php
> //$userAgent = strtolower($_SERVER['HTTP_USER_AGENT']);
> //$is_mozilla = preg_match('/mozilla/', $userAgent) && !preg_match('/compatible/', $userAgent) ? 1 : 0;
> while( count( $currgen ) && $generation <= $generations ) {
> 	//echo "<span class=\"subhead\"><strong>{$text['generation']}: $generation</strong></span><br/>\n";
> 	echo "<span class=\"subhead\"><strong>{$text['generation']}: $generation</strong></span><br/><br />\n";
> 		//echo "<ol class=\"normal\">\n";
> 		echo "<ol style=\"list-style-type:none; padding:0px; margin:0px;\">";
> 	while( $row = array_shift( $currgen ) ) {
> 		//echo "<li value=\"{$row['number']}\" style=\"vertical-align:top\">\n";
> 		echo "<li>";
> 		//if(!$is_mozilla)
> 			//echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
> 			echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td width=\"40\" class=\"aligntop\" align=\"right\">";
> 			echo "{$row['number']}.&nbsp;&nbsp;</td><td>";
> 		echo showSmallPhoto( $row['personID'], $row['name'], $row['allow_living'] && $row['allow_private'], 0, false );
> 		echo "<a href=\"$getperson_url" . "personID={$row['personID']}&amp;tree=$tree\" name=\"p{$row['personID']}\" id=\"p{$row['personID']}\">{$row['name']}</a>";
> 		if( $row['genlist'] )
> 			echo " <a href=\"$desctracker_url" . "trail={$row['trail']}&amp;tree=$tree\" title=\"{$text['graphdesc']}\"><img src=\"{$cms['tngpath']}img/dchart.gif\" width=\"10\" height=\"9\" alt=\"{$text['graphdesc']}\" border=\"0\"/></a> ({$row['genlist']})";
> 		echo getVitalDates( $row );
> 		echo getOtherEvents($row);
> 		if( $row['allow_living'] && $row['allow_private'] && $pedigree['regnotes'] ) {
> 			$notes = buildRegNotes(getRegNotes( $row['personID'], "I" ));
> 			if( $notes ) {
> 				echo "<p>{$text['notes']}:<br/>";
> 				echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>\n";
> 			}
> 		}
> 		else $notes = "";
> 
> 		$fname = $row['firstname'];
> 		$firstfirstname = getFirstNameOnly( $row );
> 		$personsex = $row['sex'];
> 		$newlist = $row['number'] . ".<a href=\"#\" onclick=\"jQuery('html, body').animate({scrollTop: jQuery('#p{$row['personID']}').offset().top-50},'slow'); return false;\">$firstfirstname</a><sup style=\"font-size:8px;top:-2px\">$generation</sup>";
> 		if( $row['genlist'] ) $newlist .= ", " . $row['genlist'];
> 		while( $spouserow = array_shift( $row['spouses'] ) ) {
> 			//$famrights = determineLivingPrivateRights($spouserow, $righttree);
> 			//$spouserow['allow_living'] = $famrights['living'];
> 			//$spouserow['allow_private'] = $famrights['private'];
> 
> 			$marriagemsg = ($personsex == "F") ? $text['wasmarried_female'] :  $text['wasmarried_male'];
> 			if( !isset($spouserow['personID']) ) $spouserow['personID'] = "";
> 			if($spouserow['marrdate'] || $spouserow['marrplace']) {
> 				echo "<p>$firstfirstname " . $marriagemsg . " <a href=\"$getperson_url" . "personID={$spouserow['personID']}&amp;tree=$tree\">{$spouserow['name']}</a>";
> 				echo getSpouseDates( $spouserow , $personsex );
> 			}
> 			else {
> 				$spousename = $spouserow['name'] ? $spouserow['name'] : $text['unknown'];
> 				echo "<p>{$text['family']}/{$text['spouse']}: <a href=\"$getperson_url" . "personID={$spouserow['personID']}&amp;tree=$tree\">$spousename</a>.";
> 			}
> 			if($spouserow['personID']) {
> 				$spouseinfo = getVitalDates( $spouserow );
> 				$spparents = getSpouseParents( $spouserow['personID'], $spouserow['sex'] );
> 			}
> 			else {
> 				$spouseinfo = "";
> 				$spparents = $text['unknown'];
> 			}
> 			if( $spouseinfo ) {
> 				$spname = getName( $spouserow );
> 				$spfirstfirstname = getFirstNameOnly( $spouserow, " " );
> 				echo " $spfirstfirstname $spparents $spouseinfo";
> 			}
> 			if(!$tngprint)
> 				echo " [<a href=\"$familygroup_url" . "familyID={$spouserow['familyID']}&amp;tree=$tree\">{$text['groupsheet']}</a>] [<a href=\"$familychart_url" ."familyID={$spouserow['familyID']}&amp;tree=$tree\">{$text['familychart']}</a>]</p>\n";
> 
> 			if($pedigree['regnotes']) {
> 				if(!empty($famrights['both'])) {
> 					$notes = buildRegNotes(getRegNotes( $spouserow['familyID'], "F" ));
> 					if( $notes ) {
> 						echo "<p>{$text['notes']}:<br/>";
> 						echo "<blockquote class=\"blocknote\">\n$notes</blockquote>\n</p>";
> 					}
> 				}
> 			}
> 
> 			$result2 = getChildrenData($tree, $spouserow['familyID']);
> 			if( $result2 && tng_num_rows( $result2 ) ) {
> 				echo "<table cellpadding=\"0\" cellspacing=\"0\"><tr><td>{$text['children']}:<br/>\n<ol>\n";
> 				while( $childrow = tng_fetch_assoc( $result2 ) ) {
> 					$childID = $childrow['personID'];
> 					if(!empty($nextgen[$childID])) {
> 						$displaycount = $nextgen[$childID]['number'];
> 						$name = $nextgen[$childID]['name'];
> 						$vitaldates = getVitalDates( $nextgen[$childID] );
> 						$childrow['trail'] = $row['trail'] . ",{$spouserow['familyID']},$childID";
> 					}
> 					else {
> 						$personcount++;
> 						$displaycount = $personcount;
> 						$childrow['spouses'] = getSpouses( $childID, $childrow['sex'] );
> 						$childrow['genlist'] = $newlist;
> 						$childrow['trail'] = $row['trail'] . ",{$spouserow['familyID']},$childID";
> 						$childrow['number'] = $personcount;
> 						$crights = determineLivingPrivateRights($childrow, $righttree);
> 						$childrow['allow_living'] = $crights['living'];
> 						$childrow['allow_private'] = $crights['private'];
> 						$childrow['name'] = $name = getName( $childrow );
> 						$vitaldates = getVitalDates( $childrow );
> 						if( $childrow['spouses'] || !$pedigree['regnosp'] )
> 							$nextgen[$childID] = $childrow;
> 					}
> 					echo "<li style=\"list-style-type:lower-roman\">$displaycount. <a href=\"#\" onclick=\"if(jQuery('#p$childID').length) {jQuery('html, body').animate({scrollTop: jQuery('#p$childID').offset().top-50},'slow');}else{window.location.href='$getperson_url" . "personID=$childID&amp;tree=$tree';} return false;\">$name</a> &nbsp;<a href=\"$desctracker_url" . "trail={$childrow['trail']}&amp;tree=$tree\"><img src=\"{$cms['tngpath']}img/dchart.gif\" width=\"10\" height=\"9\" alt=\"{$text['graphdesc']}\" border=\"0\"/></a> $vitaldates</li>\n";
> 				}
> 				echo "</ol>\n</td></tr></table>\n";
> 				tng_free_result( $result2 );
> 			}
> 		}
> 		//if(!$is_mozilla)
> 			echo "</td></tr></table>";
> 		echo "<br clear=\"all\"/></li>\n";
> 	}
> 	$currgen = $nextgen;
> 	unset( $nextgen );
> 	$nextgen = array();
> 	$generation++;
> 	echo "</ol>\n<br/>\n";
> }
> ?>
> 
> </div>
> <?php
> 	tng_footer( "" );
diff -r TNG/reglib.php TNG1403/reglib.php
1,326c1,353
< <?php
< function getSpouses( $personID, $sex ) {
< 	global $tree, $righttree;
< 
< 	$spouses = array();
< 	if( $sex == "M" ) {
< 		$self = "husband";
< 		$spouse = "wife";
< 		$spouseorder = "husborder";
< 	}
< 	else if( $sex == "F" ){
< 		$self = "wife";
< 		$spouse = "husband";
< 		$spouseorder = "wifeorder";
< 	}
< 	else {
< 		$self = $spouse = $spouseorder = "";
< 	}
< 
< 	if( $spouse )
< 		$result = getSpouseFamilyData($tree, $self, $personID, $spouseorder);
< 	else
< 		$result = getSpouseFamilyDataUnion($tree, $personID, $spouseorder);
< 	$marrtot = tng_num_rows($result);
< 	if( !$marrtot ) {
< 		$result = getSpouseFamilyDataUnion($tree, $personID, $spouseorder);
< 		$self = $spouse = $spouseorder = "";
< 	}
< 	while( $row = tng_fetch_assoc( $result ) ) {
< 		if( !$spouse )
< 			$spouse = $row['husband'] == $personID ? "wife" : "husband";
< 		$result2 = getPersonData($tree, $row[$spouse]);
< 		$spouserow =  tng_fetch_assoc( $result2 );
< 		$spouserow['familyID'] = $row['familyID'];
< 		$spouserow['marrdate'] = $row['marrdate'];
< 		$spouserow['marrplace'] = $row['marrplace'];
< 		$spouserow['marrtype'] = $row['marrtype'];
< 		$spouserow['divdate'] = $row['divdate'];
< 		$spouserow['divplace'] = $row['divplace'];
< 		$spouserow['fliving'] = $row['living'];
< 
< 		$famrights = determineLivingPrivateRights($row, $righttree);
< 		$sprights = determineLivingPrivateRights($spouserow, $righttree);
< 		$spouserow['allow_living'] = $sprights['living'] && $famrights['living'];
< 		$spouserow['allow_private'] = $sprights['private'] && $famrights['private'];
< 		
< 		$spouserow['name'] = getName( $spouserow );
< 		array_push( $spouses, $spouserow );
< 	}
< 	tng_free_result( $result );
< 
< 	return $spouses;
< }
< 
< function getSpouseParents( $personID, $sex) {
< 	global $tree, $righttree, $text, $admtext, $getperson_url;
< 
< 	if( $sex == "M" ) {
< 		$childtext = $text['sonof'];
< 	}
< 	else if( $sex == "F" ){
< 		$childtext = $text['daughterof'];
< 	}
< 	else {
< 		$childtext = $text['childof'];
< 	}
< 
< 	$allparents = "";
< 	$parents = getChildFamily($tree, $personID, "ordernum");
< 
< 	if ( $parents && tng_num_rows( $parents ) ) {
< 		while ( $parent = tng_fetch_assoc( $parents ) )
< 		{
< 			$parentstr = "";
< 			$gotfather = getParentData($tree, $parent['familyID'], "husband");
< 
< 		     if( $gotfather ) {
< 				$fathrow =  tng_fetch_assoc( $gotfather );
< 				if( $fathrow['firstname'] || $fathrow['lastname'] ) {
< 					$frights = determineLivingPrivateRights($fathrow, $righttree);
< 					$fathrow['allow_living'] = $frights['living'];
< 					$fathrow['allow_private'] = $frights['private'];
< 					$fathname = getName( $fathrow );
< 					if( $fathrow['name'] == $text['living'] ) $fathrow['firstname'] = $text['living'];
< 					if( $fathrow['name'] == $admtext['text_private'] ) $fathrow['firstname'] = $admtext['text_private'];
< 					$parentstr .= "<a href=\"#\" onclick=\"if(jQuery('#p{$fathrow['personID']}').length) {jQuery('html, body').animate({scrollTop: jQuery('#p{$fathrow['personID']}').offset().top-10},'slow');}else{window.location.href='$getperson_url" . "personID={$fathrow['personID']}&amp;tree=$tree';} return false;\">$fathname</a>";
< 				}
< 				tng_free_result( $gotfather );
< 			}
< 
< 			$gotmother = getParentData($tree, $parent['familyID'], "wife");
< 
< 			if( $gotmother ) {
< 				$mothrow =  tng_fetch_assoc( $gotmother );
< 				if( $mothrow['firstname'] || $mothrow['lastname'] ) {
< 					$mrights = determineLivingPrivateRights($mothrow, $righttree);
< 					$mothrow['allow_living'] = $mrights['living'];
< 					$mothrow['allow_private'] = $mrights['private'];
< 					$mothname = getName( $mothrow );
< 					if( $mothrow['name'] == $text['living'] ) $mothrow['firstname'] = $text['living'];
< 					if( $mothrow['name'] == $admtext['text_private'] ) $mothrow['firstname'] = $admtext['text_private'];
< 					if( $parentstr ) $parentstr .= " {$text['text_and']} ";
< 					$parentstr .= "<a href=\"#\" onclick=\"if(jQuery('#p{$mothrow['personID']}').length) {jQuery('html, body').animate({scrollTop: jQuery('#p{$mothrow['personID']}').offset().top-10},'slow');}else{window.location.href='$getperson_url" . "personID={$mothrow['personID']}&amp;tree=$tree';} return false;\">$mothname</a>";
< 				}
< 				tng_free_result( $gotmother );
< 			}
< 			if( $parentstr ) {
< 				$parentstr = "$childtext $parentstr";
< 				$allparents .= $allparents ? ", $parentstr" : $parentstr;
< 			}
< 		}
< 		tng_free_result($parents);
< 	}
< 	if( $allparents ) $allparents = "($allparents)";
< 	
< 	return $allparents;
< }
< 
< function getVitalDates( $row, $needparents = null ) {
< 	global $text;
< 	
< 	$vitalinfo = "";
< 	
< 	if( $row['allow_living'] && $row['allow_private'] ) {
< 		if( $row['birthdate'] || $row['birthplace'] ) {
< 			$vitalinfo .= " {$text['wasborn']} " . displayDate( $row['birthdate'] );
< 			if($row['birthplace'])
< 				$vitalinfo .= ", " . $row['birthplace'];
< 		}
< 		if( $row['altbirthdate'] || $row['altbirthplace'] ){
< 			if( $vitalinfo ) $vitalinfo .= ";";
< 			$vitalinfo .= " " . tng_strtolower($text['waschristened']) . " " . displayDate( $row['altbirthdate'] );
< 			if($row['altbirthplace'])
< 				$vitalinfo .= ", " . $row['altbirthplace'];
< 		}
< 		if($needparents) {
< 			$spparents = getSpouseParents($row['personID'], $row['sex']);
< 			if($spparents) $vitalinfo .= " " . $spparents;
< 		}
< 
< 		if( $row['deathdate'] || $row['deathplace'] ) {
< 			if( $vitalinfo ) $vitalinfo .= ";";
< 			$vitalinfo .= " " . tng_strtolower($text['anddied']) . " " . displayDate( $row['deathdate'] );
< 			if($row['deathplace'])
< 				$vitalinfo .= ", " . $row['deathplace'];
< 		}
< 		if( $row['burialdate'] || $row['burialplace'] ){
< 			if( $vitalinfo ) $vitalinfo .= ";";
< 			$burialmsg = $row['burialtype'] ? $text['wascremated'] : $text['wasburied'];
< 			$vitalinfo .= " " . tng_strtolower($burialmsg) . " " . displayDate( $row['burialdate'] );
< 			if($row['burialplace'])
< 				$vitalinfo .= ", " . $row['burialplace'];
< 		}
< 	}
< 	if( $vitalinfo ) $vitalinfo .= ". ";
< 	return $vitalinfo;
< }
< 
< function getSpouseDates( $row ) {
< 	global $text;
< 	
< 	$spouseinfo = "";
< 	
< 	if( $row['allow_living'] && $row['allow_private'] ) {
< 		if( $row['marrdate'] || $row['marrplace'] || $row['marrtype'] ) {
< 			$spouseinfo .= " " . displayDate( $row['marrdate'] );
< 			if( $row['marrtype'] ) $spouseinfo .= " ({$row['marrtype']})";
< 			if( ( $row['marrdate'] || $row['marrtype'] ) && $row['marrplace'] )
< 				$spouseinfo .= ", ";
< 			$spouseinfo .= $row['marrplace'];
< 		}
< 		if($row['divdate'] || $row['divplace']) {
< 			$spouseinfo .= "; " . strtolower($text['divorced']) . " ";
< 			if($row['divdate']) {
< 				$spouseinfo .= displayDate($row['divdate']);
< 				if($row['divplace']) $spouseinfo .= ", ";
< 			}
< 			$spouseinfo .= $row['divplace'];
< 		}
< 	}
< 	if( $spouseinfo ) $spouseinfo .= ".";
< 	return $spouseinfo;
< }
< 
< function getOtherEvents($row) {
< 	global $tree, $eventtypes_table, $events_table, $text, $pedigree;
< 
< 	$otherEvents = "";
< 	if($pedigree['regnotes'] && $row['allow_living'] && $row['allow_private']) {
< 		$query = "SELECT display, eventdate, eventdatetr, eventplace, age, agency, cause, addressID, info, tag, description, eventID FROM ($events_table, $eventtypes_table) WHERE persfamID = \"{$row['personID']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND gedcom = \"$tree\" AND keep = \"1\" AND parenttag = \"\" ORDER BY eventdatetr, ordernum, tag, description, info, eventID";
< 		$custevents = tng_query($query);
< 		while ( $custevent = tng_fetch_assoc( $custevents ) )	{
< 			$displayval = getEventDisplay( $custevent['display'] );
< 			$fact = array();
< 			if( $custevent['info'] ) {
< 				$fact = checkXnote( $custevent['info'] );
< 				if( $fact[1] ) {
< 					$xnote = $fact[1];
< 					array_pop( $fact );
< 				}
< 			}
< 			$extras = getFact( $custevent );
< 			$fact = ( count( $fact ) && $fact[0] != "" ) ? array_merge( $fact, $extras ) : $extras;
< 			$thisEvent = $custevent['eventdate'] ? displayDate($custevent['eventdate']) : "";
< 			if($custevent['eventplace']) {
< 				if($thisEvent) $thisEvent .= ", ";
< 				$thisEvent .= $custevent['eventplace'];
< 			}
< 			if(count($fact)) {
< 		 		foreach($fact as $f) {
< 					if($thisEvent) $thisEvent .= "; ";
< 					$thisEvent .= $f;
< 				}
< 			}
< 			if($thisEvent)
< 				$otherEvents .= "<li>$displayval: " . $thisEvent . "</li>\n";
< 		}
< 		tng_free_result( $custevents );
< 	}
< 	if($otherEvents)
< 		$otherEvents = "<p>{$text['otherevents']}:\n<ul class=\"regevents\">$otherEvents</ul></p>\n";
< 	return $otherEvents;
< }
< 
< function getRegNotes( $persfamID, $flag ) {
< 	global $notelinks_table, $xnotes_table, $tree, $eventtypes_table, $events_table, $text, $eventswithnotes;
< 	
< 	$custnotes = array();
< 	$gennotes = array();
< 	$precustnotes = array();
< 	$postcustnotes = array();
< 	$finalnotesarray = array();
< 	
< 	if( $flag == "I" ) {
< 		$precusttitles = array( "BIRT"=>$text['birth'], "CHR"=>$text['christened'], "NAME"=>$text['name'], "TITL"=>$text['title'], "NSFX"=>$text['suffix'], "NICK"=>$text['nickname'], "BAPL"=>$text['baptizedlds'], "CONL"=>$text['conflds'], "INIT"=>$text['initlds'], "ENDL"=>$text['endowedlds'] );
< 		$postcusttitles = array( "DEAT"=>$text['died'], "BURI"=>$text['buried'], "SLGC"=>$text['sealedplds'] );
< 	}
< 	elseif( $flag == "F" ) {
< 		$precusttitles = array( "MARR"=>$text['married'], "SLGS"=>$text['sealedslds'], "DIV"=>$text['divorced'] );
< 		$postcusttitles = array();
< 	}
< 	else {
< 		$precusttitles = array( "ABBR"=>$text['shorttitle'], "CALN"=>$text['callnum'], "AUTH"=>$text['author'], "PUBL"=>$text['publisher'], "TITL"=>$text['title'] );
< 		$postcusttitles = array();
< 	}
< 		
< 	$query = "SELECT display, $xnotes_table.note as note, $notelinks_table.eventID as eventID FROM $notelinks_table 
< 		LEFT JOIN  $xnotes_table on $notelinks_table.xnoteID = $xnotes_table.ID AND $notelinks_table.gedcom = $xnotes_table.gedcom 
< 		LEFT JOIN $events_table ON $notelinks_table.eventID = $events_table.eventID 
< 		LEFT JOIN $eventtypes_table on $eventtypes_table.eventtypeID = $events_table.eventtypeID 
< 		WHERE $notelinks_table.persfamID=\"$persfamID\" AND $notelinks_table.gedcom=\"$tree\" AND secret!=\"1\"
< 		ORDER BY eventdatetr, $eventtypes_table.ordernum, tag";
< 	$notelinks = tng_query($query);
< 
< 	$currevent = "";
< 	$type = 0;
< 	while( $note = tng_fetch_assoc( $notelinks ) ) {
< 		if( !$note['eventID'] ) $note['eventID'] = "--x-general-x--";
< 		if( $note['eventID'] != $currevent ) {
< 			$currevent = $note['eventID'];
< 			$currtitle = "";
< 		}
< 		if( !$currtitle ) {
< 			if( $note['display'] ) {
< 				$currtitle = getEventDisplay( $note['display'] );
< 				$key = "cust$currevent";
< 				$custnotes[$key] = array( "title"=>$currtitle, "text"=>"");
< 				$type = 2;
< 			}
< 			else {
< 				if( $postcusttitles[$currevent] ) {
< 					$currtitle = $postcusttitles[$currevent];
< 					$postcustnotes[$currevent] = array( "title"=>$postcusttitles[$currevent], "text"=>"");
< 					$type = 3;
< 				}
< 				else {
< 					$currtitle = $precusttitles[$currevent] ? $precusttitles[$currevent] : " ";
< 					if( $note['eventID'] == "--x-general-x--" ) {
< 						$gennotes[$currevent] = array( "title"=>$precusttitles[$currevent], "text"=>"");
< 						$type = 0;
< 					}
< 					else {
< 						$precustnotes[$currevent] = array( "title"=>$precusttitles[$currevent], "text"=>"");
< 						$type = 1;
< 					}
< 				}
< 			}
< 		}
< 		switch( $type ) {
< 			case 0:
< 				if( $gennotes[$currevent]['text'] ) $gennotes[$currevent]['text'] .= "<br/><br/>";
< 				$gennotes[$currevent]['text'] .= nl2br($note['note']) . "\n";
< 				break;
< 			case 1:
< 				if( $precustnotes[$currevent]['text'] ) $precustnotes[$currevent]['text'] .= "<br/><br/>";
< 				$precustnotes[$currevent]['text'] .= nl2br($note['note']) . "\n";
< 				break;
< 			case 2:
< 				if( $custnotes[$key]['text'] ) $custnotes[$key]['text'] .= "<br/><br/>";
< 				$custnotes[$key]['text'] .= nl2br($note['note']) . "\n";
< 				break;
< 			case 3:
< 				if( $postcustnotes[$currevent]['text'] ) $postcustnotes[$currevent]['text'] .= "<br/><br/>";
< 				$postcustnotes[$currevent]['text'] .= nl2br($note['note']) . "\n";
< 				break;
< 		}
< 	}
< 	$finalnotesarray = array_merge( $gennotes, $precustnotes, $custnotes, $postcustnotes );	
< 	tng_free_result($notelinks);
< 	
< 	return $finalnotesarray;
< }
< 
< function buildRegNotes( $notearray ) {
< 	global $text;
< 	
< 	$notes = "";
< 	foreach( $notearray as $key => $note ) {
< 		if( $notes )
< 			$notes .= "<br/><br/>\n";
< 		if( $note['title'] )
< 			$notes .= $note['title'] . ":<br/>\n";
< 		$notes .= $note['text'] . "\n";
< 	}
< 	return $notes;
< }
---
> <?php
> function getSpouses( $personID, $sex ) {
> 	global $tree, $righttree;
> 
> 	$spouses = array();
> 	if( $sex == "M" ) {
> 		$self = "husband";
> 		$spouse = "wife";
> 		$spouseorder = "husborder";
> 	}
> 	else if( $sex == "F" ){
> 		$self = "wife";
> 		$spouse = "husband";
> 		$spouseorder = "wifeorder";
> 	}
> 	else {
> 		$self = $spouse = $spouseorder = "";
> 	}
> 
> 	if( $spouse )
> 		$result = getSpouseFamilyData($tree, $self, $personID, $spouseorder);
> 	else
> 		$result = getSpouseFamilyDataUnion($tree, $personID, $spouseorder);
> 	$marrtot = tng_num_rows($result);
> 	if( !$marrtot ) {
> 		$result = getSpouseFamilyDataUnion($tree, $personID, $spouseorder);
> 		$self = $spouse = $spouseorder = "";
> 	}
> 	while( $row = tng_fetch_assoc( $result ) ) {
> 		if( !$spouse )
> 			$spouse = $row['husband'] == $personID ? "wife" : "husband";
> 		$result2 = getPersonData($tree, $row[$spouse]);
> 		$spouserow =  tng_fetch_assoc( $result2 );
> 		$spouserow['gedcom'] = $row['gedcom'];
> 		$spouserow['husband'] = $row['husband'];
> 		$spouserow['wife'] = $row['wife'];
> 		$spouserow['familyID'] = $row['familyID'];
> 		$spouserow['marrdate'] = $row['marrdate'];
> 		$spouserow['marrdatetr'] = $row['marrdatetr'];
> 		$spouserow['marrplace'] = $row['marrplace'];
> 		$spouserow['marrtype'] = $row['marrtype'];
> 		$spouserow['divdate'] = $row['divdate'];
> 		$spouserow['divdatetr'] = $row['divdatetr'];
> 		$spouserow['divplace'] = $row['divplace'];
> 		$spouserow['living'] = $row['living'];
> 		$spouserow['private'] = $row['private'];
> 		$spouserow['branch'] = $row['branch'];
> 
> 		$famrights = determineLivingPrivateRights($row, $righttree);
> 		$sprights = determineLivingPrivateRights($spouserow, $righttree);
> 		$spouserow['allow_living'] = $sprights['living'] && $famrights['living'];
> 		$spouserow['allow_private'] = $sprights['private'] && $famrights['private'];
> 
> 		$spouserow['name'] = !empty($spouserow[$spouse]) ? getName( $spouserow ) : "";
> 		array_push( $spouses, $spouserow );
> 	}
> 	tng_free_result( $result );
> 
> 	return $spouses;
> }
> 
> function getSpouseParents( $personID, $sex) {
> 	global $tree, $righttree, $text, $admtext, $getperson_url;
> 
> 	if( $sex == "M" ) {
> 		$childtext = $text['sonof'];
> 	}
> 	else if( $sex == "F" ){
> 		$childtext = $text['daughterof'];
> 	}
> 	else {
> 		$childtext = $text['childof'];
> 	}
> 
> 	$allparents = "";
> 	$parents = getChildFamily($tree, $personID, "ordernum");
> 
> 	if ( $parents && tng_num_rows( $parents ) ) {
> 		while ( $parent = tng_fetch_assoc( $parents ) )
> 		{
> 			$parentstr = "";
> 			$gotfather = getParentData($tree, $parent['familyID'], "husband");
> 
> 			$fathrow =  tng_fetch_assoc( $gotfather );
> 			if( $fathrow ) {
> 				if( $fathrow['firstname'] || $fathrow['lastname'] ) {
> 					$frights = determineLivingPrivateRights($fathrow, $righttree);
> 					$fathrow['allow_living'] = $frights['living'];
> 					$fathrow['allow_private'] = $frights['private'];
> 					$fathname = getName( $fathrow );
> 					//if( $fathrow['name'] == $text['living'] ) $fathrow['firstname'] = $text['living'];
> 					//if( $fathrow['name'] == $admtext['text_private'] ) $fathrow['firstname'] = $admtext['text_private'];
> 					$parentstr .= "<a href=\"#\" onclick=\"if(jQuery('#p{$fathrow['personID']}').length) {jQuery('html, body').animate({scrollTop: jQuery('#p{$fathrow['personID']}').offset().top-10},'slow');}else{window.location.href='$getperson_url" . "personID={$fathrow['personID']}&amp;tree=$tree';} return false;\">$fathname</a>";
> 				}
> 				tng_free_result( $gotfather );
> 			}
> 
> 			$gotmother = getParentData($tree, $parent['familyID'], "wife");
> 
> 			$mothrow =  tng_fetch_assoc( $gotmother );
> 			if( $mothrow ) {
> 				if( $mothrow['firstname'] || $mothrow['lastname'] ) {
> 					$mrights = determineLivingPrivateRights($mothrow, $righttree);
> 					$mothrow['allow_living'] = $mrights['living'];
> 					$mothrow['allow_private'] = $mrights['private'];
> 					$mothname = getName( $mothrow );
> 					//if( $mothrow['name'] == $text['living'] ) $mothrow['firstname'] = $text['living'];
> 					//if( $mothrow['name'] == $admtext['text_private'] ) $mothrow['firstname'] = $admtext['text_private'];
> 					if( $parentstr ) $parentstr .= " {$text['text_and']} ";
> 					$parentstr .= "<a href=\"#\" onclick=\"if(jQuery('#p{$mothrow['personID']}').length) {jQuery('html, body').animate({scrollTop: jQuery('#p{$mothrow['personID']}').offset().top-10},'slow');}else{window.location.href='$getperson_url" . "personID={$mothrow['personID']}&amp;tree=$tree';} return false;\">$mothname</a>";
> 				}
> 				tng_free_result( $gotmother );
> 			}
> 			if( $parentstr ) {
> 				$parentstr = "$childtext $parentstr";
> 				$allparents .= $allparents ? ", $parentstr" : $parentstr;
> 			}
> 		}
> 		tng_free_result($parents);
> 	}
> 	if( $allparents ) $allparents = "($allparents)";
> 
> 	return $allparents;
> }
> 
> function getVitalDates( $row, $needparents = null ) {
> 	global $text;
> 
> 	$vitalinfo = "";
> 
> 	if( $row['allow_living'] && $row['allow_private'] ) {
> 		if( !empty($row['birthdate']) || !empty($row['birthplace']) ) {
> 			$bornmsg = ($row['sex'] == "F") ? $text['wasborn_female'] : $text['wasborn_male'];
> 			$vitalinfo .= " " . $bornmsg . printDate( $row['birthdatetr'], $row['birthdate'] );
> 			if(!empty($row['birthplace']))
> 				$vitalinfo .= " " . trim($text['inplace']) . " " . $row['birthplace'];
> 		}
> 		if( !empty($row['altbirthdate']) || !empty($row['altbirthplace']) ){
> 			if( $vitalinfo ) $vitalinfo .= ";";
> 			$christenedmsg = ($row['sex'] == "F") ? $text['waschristened_female'] : $text['waschristened_male'];
> 			$vitalinfo .= " " . $christenedmsg .  printDate( $row['altbirthdatetr'], $row['altbirthdate'] );
> 			if(!empty($row['altbirthplace']))
> 				$vitalinfo .= " " . trim($text['inplace']) . " " . $row['altbirthplace'];
> 		}
> 		if($needparents) {
> 			$spparents = getSpouseParents($row['personID'], $row['sex']);
> 			if($spparents) $vitalinfo .= " " . $spparents;
> 		}
> 
> 		if( !empty($row['deathdate']) || !empty($row['deathplace']) ) {
> 			if( $vitalinfo ) $vitalinfo .= ";";
> 			$diedmsg = ($row['sex'] == "F") ? $text['died_female'] : $text['died_male'];
> 			if($row['deathdate'] == "Y")
> 				$vitalinfo .=  " " . $text['and'] . $diedmsg;
> 			else {
> 				$vitalinfo .= " " . $diedmsg . printDate( $row['deathdatetr'], $row['deathdate'] );
> 				}
> 			if(!empty($row['deathplace']))
> 				$vitalinfo .= $text['inplace'] . $row['deathplace'];
> 		}
> 		if( !empty($row['burialdate']) || !empty($row['burialplace']) ){
> 			if( $vitalinfo ) $vitalinfo .= ";";
> 			$buriedmsg = ($row['sex'] == "F") ? $text['wasburied_female'] : $text['wasburied_male'];
> 			$crematedmsg = ($row['sex'] == "F") ? $text['wascremated_female'] : $text['wascremated_male'];
> 			$burialmsg = $row['burialtype'] ? $crematedmsg : $buriedmsg;
> 			if (substr($row['burialdatetr'],0,10) == "0000-00-00")  // no date
> 				$vitalinfo .= " $burialmsg " ;
> 			else {
> 				$vitalinfo .= " " . $burialmsg . printDate( $row['burialdatetr'], $row['burialdate'] );
> 				}
> 			if(!empty($row['burialplace']))
> 				$vitalinfo .= $text['inplace'] . $row['burialplace'];
> 		}
> 	}
> 	if( $vitalinfo ) $vitalinfo .= ". ";
> 	return $vitalinfo;
> }
> 
> function getSpouseDates( $row , $personsex) {
> 	global $text;
> 
> 	$spouseinfo = "";
> 
> 	if( $row['allow_living'] && $row['allow_private'] ) {
> 		if( $row['marrdate'] || $row['marrplace'] || $row['marrtype'] ) {
> 			$spouseinfo .= printDate( $row['marrdatetr'], $row['marrdate'] );
> 			if( $row['marrtype'] ) $spouseinfo .= " ({$row['marrtype']})";
> 			if( ( $row['marrdate'] || $row['marrtype'] ) && $row['marrplace'] )
> 				$spouseinfo .= $text['inplace'];
> 			$spouseinfo .= $row['marrplace'];
> 		}
> 		if($row['divdate'] || $row['divplace']) {
> 			$divorcemsg = ($personsex == "F") ? $text['wasdivorced_female'] :  $text['wasdivorced_male'];
> 			if($row['divdate']) {
> 				if($row['divdate'] == "Y")
> 					$spouseinfo .= ", " . $text['and'] . $divorcemsg;
> 				else
> 					$spouseinfo .= ", " . $text['and'] . $divorcemsg . "  " .  printDate($row['divdatetr'], $row['divdate']);
> 			}
> 			if($row['divplace'])
> 				$spouseinfo .= "  " . $text['inplace'] . $row['divplace'];
> 			//$spouseinfo .= ". ";
> 		}
> 	}
> 	if( $spouseinfo ) $spouseinfo .= ".";
> 	return $spouseinfo;
> }
> 
> function getOtherEvents($row) {
> 	global $tree, $eventtypes_table, $events_table, $text, $pedigree;
> 
> 	$otherEvents = "";
> 	if($pedigree['regnotes'] && $row['allow_living'] && $row['allow_private']) {
> 		$query = "SELECT display, eventdate, eventdatetr, eventplace, age, agency, cause, addressID, info, tag, description, eventID FROM ($events_table, $eventtypes_table) WHERE persfamID = \"{$row['personID']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID AND gedcom = \"$tree\" AND keep = \"1\" AND parenttag = \"\" ORDER BY eventdatetr, ordernum, tag, description, info, eventID";
> 		$custevents = tng_query($query);
> 		while ( $custevent = tng_fetch_assoc( $custevents ) )	{
> 			$displayval = getEventDisplay( $custevent['display'] );
> 			$fact = array();
> 			if( $custevent['info'] ) {
> 				$fact = checkXnote( $custevent['info'] );
> 				if(!empty($fact[1])) {
> 					$xnote = $fact[1];
> 					array_pop( $fact );
> 				}
> 			}
> 			$extras = getFact( $custevent );
> 			$fact = ( count( $fact ) && $fact[0] != "" ) ? array_merge( $fact, $extras ) : $extras;
> 			$thisEvent = $custevent['eventdate'] ? displayDate($custevent['eventdate']) : "";
> 			if($custevent['eventplace']) {
> 				if($thisEvent) $thisEvent .= ", ";
> 				$thisEvent .= $custevent['eventplace'];
> 			}
> 			if(count($fact)) {
> 		 		foreach($fact as $f) {
> 					if($thisEvent) $thisEvent .= "; ";
> 					$thisEvent .= $f;
> 				}
> 			}
> 			if($thisEvent)
> 				$otherEvents .= "<li>$displayval: " . $thisEvent . "</li>\n";
> 		}
> 		tng_free_result( $custevents );
> 	}
> 	if($otherEvents)
> 		$otherEvents = "<p>{$text['otherevents']}:\n<ul class=\"regevents\">$otherEvents</ul></p>\n";
> 	return $otherEvents;
> }
> 
> function getRegNotes( $persfamID, $flag ) {
> 	global $notelinks_table, $xnotes_table, $tree, $eventtypes_table, $events_table, $text, $eventswithnotes;
> 
> 	$custnotes = array();
> 	$gennotes = array();
> 	$precustnotes = array();
> 	$postcustnotes = array();
> 	$finalnotesarray = array();
> 
> 	if( $flag == "I" ) {
> 		$precusttitles = array( "BIRT"=>$text['birth'], "CHR"=>$text['christened'], "NAME"=>$text['name'], "TITL"=>$text['title'], "NSFX"=>$text['suffix'], "NICK"=>$text['nickname'], "BAPL"=>$text['baptizedlds'], "CONL"=>$text['conflds'], "INIT"=>$text['initlds'], "ENDL"=>$text['endowedlds'] );
> 		$postcusttitles = array( "DEAT"=>$text['died'], "BURI"=>$text['buried'], "SLGC"=>$text['sealedplds'] );
> 	}
> 	elseif( $flag == "F" ) {
> 		$precusttitles = array( "MARR"=>$text['married'], "SLGS"=>$text['sealedslds'], "DIV"=>$text['divorced'] );
> 		$postcusttitles = array();
> 	}
> 	else {
> 		$precusttitles = array( "ABBR"=>$text['shorttitle'], "CALN"=>$text['callnum'], "AUTH"=>$text['author'], "PUBL"=>$text['publisher'], "TITL"=>$text['title2'] );
> 		$postcusttitles = array();
> 	}
> 
> 	$query = "SELECT display, $xnotes_table.note as note, $notelinks_table.eventID as eventID, $notelinks_table.ID as ID FROM $notelinks_table
> 		LEFT JOIN  $xnotes_table on $notelinks_table.xnoteID = $xnotes_table.ID AND $notelinks_table.gedcom = $xnotes_table.gedcom
> 		LEFT JOIN $events_table ON $notelinks_table.eventID = $events_table.eventID
> 		LEFT JOIN $eventtypes_table on $eventtypes_table.eventtypeID = $events_table.eventtypeID
> 		WHERE $notelinks_table.persfamID=\"$persfamID\" AND $notelinks_table.gedcom=\"$tree\" AND secret!=\"1\"
> 		ORDER BY eventdatetr, $eventtypes_table.ordernum, tag, $notelinks_table.ordernum, ID";
> 	$notelinks = tng_query($query);
> 
> 	$currevent = "";
> 	$type = 0;
> 	while( $note = tng_fetch_assoc( $notelinks ) ) {
> 		if( !$note['eventID'] ) $note['eventID'] = "--x-general-x--";
> 		if( $note['eventID'] != $currevent ) {
> 			$currevent = $note['eventID'];
> 			$currtitle = "";
> 		}
> 		if( !$currtitle ) {
> 			if( $note['display'] ) {
> 				$currtitle = getEventDisplay( $note['display'] );
> 				$key = "cust$currevent";
> 				$custnotes[$key] = array( "title"=>$currtitle, "text"=>"");
> 				$type = 2;
> 			}
> 			else {
> 				if(!empty($postcusttitles[$currevent])) {
> 					$currtitle = $postcusttitles[$currevent];
> 					$postcustnotes[$currevent] = array( "title"=>$postcusttitles[$currevent], "text"=>"");
> 					$type = 3;
> 				}
> 				else {
> 					$currtitle = !empty($precusttitles[$currevent]) ? $precusttitles[$currevent] : " ";
> 					if( $note['eventID'] == "--x-general-x--" ) {
> 						if(!empty($precusttitles[$currevent]))
> 							$gennotes[$currevent] = array( "title"=>$precusttitles[$currevent], "text"=>"");
> 						else
> 							$gennotes[$currevent] = array( "title"=>"", "text"=>"");
> 						$type = 0;
> 					}
> 					else {
> 						$precustnotes[$currevent] = array( "title"=>$precusttitles[$currevent], "text"=>"");
> 						$type = 1;
> 					}
> 				}
> 			}
> 		}
> 		switch( $type ) {
> 			case 0:
> 				if( $gennotes[$currevent]['text'] ) $gennotes[$currevent]['text'] .= "<br/><br/>";
> 				$gennotes[$currevent]['text'] .= nl2br($note['note']) . "\n";
> 				break;
> 			case 1:
> 				if( $precustnotes[$currevent]['text'] ) $precustnotes[$currevent]['text'] .= "<br/><br/>";
> 				$precustnotes[$currevent]['text'] .= nl2br($note['note']) . "\n";
> 				break;
> 			case 2:
> 				if( $custnotes[$key]['text'] ) $custnotes[$key]['text'] .= "<br/><br/>";
> 				$custnotes[$key]['text'] .= nl2br($note['note']) . "\n";
> 				break;
> 			case 3:
> 				if( $postcustnotes[$currevent]['text'] ) $postcustnotes[$currevent]['text'] .= "<br/><br/>";
> 				$postcustnotes[$currevent]['text'] .= nl2br($note['note']) . "\n";
> 				break;
> 		}
> 	}
> 	$finalnotesarray = array_merge( $gennotes, $precustnotes, $custnotes, $postcustnotes );
> 	tng_free_result($notelinks);
> 
> 	return $finalnotesarray;
> }
> 
> function buildRegNotes( $notearray ) {
> 	global $text;
> 
> 	$notes = "";
> 	foreach( $notearray as $key => $note ) {
> 		if( $notes )
> 			$notes .= "<br/><br/>\n";
> 		if( $note['title'] )
> 			$notes .= $note['title'] . ":<br/>\n";
> 		$notes .= $note['text'] . "\n";
> 	}
> 	return $notes;
> }
diff -r TNG/relateform.php TNG1403/relateform.php
7,8c7,13
< $relatepersonID = $_SESSION['relatepersonID'];
< $relatetreeID = $_SESSION['relatetreeID'];
---
> $relatepersonID = isset($_SESSION['relatepersonID']) ? $_SESSION['relatepersonID'] : "";
> $relatetreeID = isset($_SESSION['relatetreeID']) ? $_SESSION['relatetreeID'] : "";
> 
> if( !isset($primaryID) ) 
> 	$primaryID = "";
> else
> 	$primaryID = preg_replace("/[^A-Za-z0-9_\-. ]/", '', $primaryID);
11,12c16,17
< if( $result ) {
< 	$row = tng_fetch_assoc( $result );
---
> $row = tng_fetch_assoc( $result );
> if( $row ) {
19,26c24,31
<             $birthdate = "";
<             if ( $row['birthdate'] ) {
<                 $birthdate = "{$text['birthabbr']} " . displayDate($row['birthdate']);
<             }
<             else if ( $row['altbirthdate'] ) {
<                 $birthdate = "{$text['chrabbr']} " . displayDate($row['altbirthdate']);
<             }
<             if($birthdate) $birthdate = "($birthdate)";
---
>         $birthdate = "";
>         if ( $row['birthdate'] ) {
>             $birthdate = "{$text['birthabbr']} " . displayDate($row['birthdate']);
>         }
>         else if ( $row['altbirthdate'] ) {
>             $birthdate = "{$text['chrabbr']} " . displayDate($row['altbirthdate']);
>         }
>         if($birthdate) $birthdate = "($birthdate)";
38a44,54
> } 
> else {
> 	$namestr = "";
> 	$rights['both'] = false;
> 	$row = array(
> 		"sex" => "",
> 		"allow_living" => false,
> 		"allow_private" => false
> 	);
> 	$namestrplus = "";
> 	$namestr2 = "";
42d57
< $flags['tabs'] = $tngconfig['tabs'];
55a71
> $connect_url = getURL( "connections-form", 1 );
58c74
< $maxupgen = $pedigree['maxupgen'] ? $pedigree['maxupgen'] : 15;
---
> $maxupgen = !empty($pedigree['maxupgen']) ? $pedigree['maxupgen'] : 15;
61c77,78
< <span class="subhead"><strong><?php echo $text['findrel']; ?></strong></span><br/>
---
> <br/>
> <p class="subhead"><strong><?php echo $text['relcalc']; ?></strong></p>
63,80c80,94
< <table class="normal">
< 	<tr>
< 		<td valign="top">
< 			<table>
< 				<tr>
< 					<td><span class="normal"><strong><?php echo $text['person1']; ?> </strong></span></td>
< 					<td><div id="name1" class="normal"><?php echo $namestr; ?></div></td>
< 				</tr>
< 				<tr>
< 					<td><span class="normal"><?php echo $text['changeto']; ?> </span></td>
< 					<td><span class="normal">
< 						<input type="text" name="altprimarypersonID" id="altprimarypersonID" size="10" />  <input type="button" name="find1" value="<?php echo $text['find']; ?>" onclick="findItem('I','altprimarypersonID','name1','<?php echo $tree; ?>');" />
< 					</span>
< 					</td>
< 				</tr><tr><td colspan="2">&nbsp;</td></tr>
< 				<tr>
< 					<td><span class="normal"><strong><?php echo $text['person2']; ?> </strong></span></td>
< 					<td>
---
> <div style="float:left; padding-right: 15px; padding-bottom: 15px">
> 	<table>
> 		<tr>
> 			<td><strong><?php echo $text['person1']; ?> </strong></td>
> 			<td><div id="name1"><?php echo $namestr; ?></div></td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $text['changeto']; ?> </td>
> 			<td>
> 				<input type="text" name="altprimarypersonID" id="altprimarypersonID" size="10" />  <input type="button" name="find1" value="<?php echo $text['find']; ?>" onclick="findItem('I','altprimarypersonID','name1','<?php echo $tree; ?>');" />
> 			</td>
> 		</tr><tr><td colspan="2">&nbsp;</td></tr>
> 		<tr>
> 			<td><strong><?php echo $text['person2']; ?> </strong></td>
> 			<td>
82,98c96,114
< 					if( $relatepersonID && $relatetreeID == $tree ) {
< 						$query = "SELECT firstname, lastname, lnprefix, prefix, suffix, nameorder, living, private, branch, birthdate, altbirthdate FROM $people_table WHERE personID = \"$relatepersonID\" AND gedcom = \"$tree\"";
< 						$result2 = tng_query($query);
< 						if( $result2 ) {
< 							$row2 = tng_fetch_assoc( $result2 );
< 							$rights2 = determineLivingPrivateRights($row2, $righttree);
< 							$row2['allow_living'] = $rights2['living'];
< 							$row2['allow_private'] = $rights2['private'];
<  							if( $row2['allow_living'] ) {
< 								$birthdate = $row2['birthdate'] ? $row2['birthdate'] : $row2['altbirthdate'];
< 								$birthdate = " ($birthdate)";
< 							}
< 							else
< 								$birthdate = "";
< 							$namestr2 = getName( $row2 ) . "$birthdate - $relatepersonID";
< 							tng_free_result($result2);
< 						}
---
> 			$namestr2 = "";
> 			if( $relatepersonID && $relatetreeID == $tree ) {
> 				$result2 = getPersonDataPlusDates($tree, $relatepersonID);
> 				$row2 = tng_fetch_assoc( $result2 );
> 				if( $row2 ) {
> 					$rightbranch2 = checkbranch($row2['branch']);
> 					$rights2 = determineLivingPrivateRights($row2, $righttree, $rightbranch2);
> 					$row2['allow_living'] = $rights2['living'];
> 					$row2['allow_private'] = $rights2['private'];
> 					if( $rights2['both'] ) {
> 			            $birthdate = "";
> 			            if ( $row2['birthdate'] ) {
> 			                $birthdate = "{$text['birthabbr']} " . displayDate($row2['birthdate']);
> 			            }
> 			            else if ( $row2['altbirthdate'] ) {
> 			                $birthdate = "{$text['chrabbr']} " . displayDate($row2['altbirthdate']);
> 			            }
> 			            if($birthdate) $birthdate = "($birthdate)";
> 						$namestrplus2 =  " $birthdate - $relatepersonID";
100,101c116,123
< 					echo "<div id=\"name2\" class=\"normal\">$namestr2</div><input type=\"hidden\" name=\"savedpersonID\" value=\"$relatepersonID\" /></td></tr>\n";
< 					echo "<tr><td><span class=\"normal\">{$text['changeto']} </span></td><td>";
---
> 					else
> 						$namestrplus2 =  " - $relatepersonID";
> 					$namestr2 = getName( $row2 ) . $namestrplus2;
> 				}
> 				tng_free_result($result2);
> 			}
> 			echo "<div id=\"name2\">$namestr2</div><input type=\"hidden\" name=\"savedpersonID\" value=\"$relatepersonID\" /></td></tr>\n";
> 			echo "<tr><td>{$text['changeto']} </td><td>";
103,114c125,136
< 					<input type="text" name="secondpersonID" id="secondpersonID" size="10" />  <input type="button" name="find2" value="<?php echo $text['find']; ?>" onclick="findItem('I','secondpersonID','name2','<?php echo $tree; ?>');" />
< 					</td>
< 				</tr>
< 			</table>
< 		</td>
< 		<td valign="top">
< 			<div class="searchsidebar">
< 				<table>
< 					<tr>
< 						<td><?php echo $text['maxrels']; ?>:</td>
< 						<td valign="bottom">
< 							<select name="maxrels">
---
> 			<input type="text" name="secondpersonID" id="secondpersonID" size="10" />  <input type="button" name="find2" value="<?php echo $text['find']; ?>" onclick="findItem('I','secondpersonID','name2','<?php echo $tree; ?>');" />
> 			</td>
> 		</tr>
> 	</table>
> </div>
> 
> <div>
> 	<table>
> 		<tr>
> 			<td><?php echo $text['maxrels']; ?>:</td>
> 			<td valign="bottom">
> 				<select name="maxrels">
116,123c138,145
< 						$initrels = $pedigree['initrels'] ? $pedigree['initrels'] : 1;
< 						$maxrels = $pedigree['maxrels'] ? $pedigree['maxrels'] : 15;
< 						$dorels = $dorels ? $dorels : $initrels;
< 					    for( $i = 1; $i <= $maxrels; $i++ ) {
< 					        echo "<option value=\"$i\"";
< 					        if( $i == $dorels ) echo " selected=\"selected\"";
< 					        echo ">$i</option>\n";
< 					    }
---
> 			$initrels = !empty($pedigree['initrels']) ? $pedigree['initrels'] : 1;
> 			$maxrels = !empty($pedigree['maxrels']) ? $pedigree['maxrels'] : 15;
> 			$dorels = !empty($dorels) ? $dorels : $initrels;
> 		    for( $i = 1; $i <= $maxrels; $i++ ) {
> 		        echo "<option value=\"$i\"";
> 		        if( $i == $dorels ) echo " selected=\"selected\"";
> 		        echo ">$i</option>\n";
> 		    }
125,132c147,153
< 							</select>
< 						</td>
< 					</tr>
< 					<tr><td colspan="2">&nbsp;</td></tr>
< 					<tr>
< 						<td><?php echo $text['dospouses']; ?>:&nbsp;</td>
< 						<td valign="bottom">
< 							<select name="disallowspouses">
---
> 				</select>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $text['dospouses']; ?>:&nbsp;</td>
> 			<td valign="bottom">
> 				<select name="disallowspouses">
134,140c155,161
< 							$dospouses = $dospouses ? $dospouses : 1;
< 					        echo "<option value=\"0\"";
< 					        if( $dospouses ) echo " selected=\"selected\"";
< 					        echo ">{$admtext['yes']}</option>\n";
< 					        echo "<option value=\"1\"";
< 					        if( !$dospouses ) echo " selected=\"selected\"";
< 					        echo ">{$admtext['no']}</option>\n";
---
> 				$dospouses = !empty($dospouses) ? $dospouses : 1;
> 		        echo "<option value=\"0\"";
> 		        if( $dospouses ) echo " selected=\"selected\"";
> 		        echo ">{$admtext['yes']}</option>\n";
> 		        echo "<option value=\"1\"";
> 		        if( !$dospouses ) echo " selected=\"selected\"";
> 		        echo ">{$admtext['no']}</option>\n";
142,149c163,169
< 							</select> <?php //echo $text['sometimes']; ?>
< 						</td>
< 					</tr>
< 					<tr><td colspan="2">&nbsp;</td></tr>
< 					<tr>
< 						<td><?php echo $text['gencheck']; ?>:</td>
< 						<td valign="bottom">
< 							<select name="generations">
---
> 				</select> <?php //echo $text['sometimes']; ?>
> 			</td>
> 		</tr>
> 		<tr>
> 			<td><?php echo $text['gencheck']; ?>:</td>
> 			<td valign="bottom">
> 				<select name="generations">
151,157c171,176
< 						$dogens = $dogens ? $dogens : $pedigree['maxupgen'];
< 						$maxgens = $pedigree['maxupgen'] ? $pedigree['maxupgen'] : 15;
< 					    for( $i = 1; $i <= $maxgens; $i++ ) {
< 					        echo "<option value=\"$i\"";
< 					        if( $i == $dogens ) echo " selected=\"selected\"";
< 					        echo ">$i</option>\n";
< 					    }
---
> 			$dogens = !empty($dogens) ? $dogens : $maxupgen;
> 		    for( $i = 1; $i <= $maxupgen; $i++ ) {
> 		        echo "<option value=\"$i\"";
> 		        if( $i == $dogens ) echo " selected=\"selected\"";
> 		        echo ">$i</option>\n";
> 		    }
159,167c178,183
< 							</select> <?php //echo $text['sometimes']; ?>
< 						</td>
< 					</tr>
< 				</table>
< 			</div>
< 		</td>
< 	</tr>
< </table>
< <br/>
---
> 				</select> <?php //echo $text['sometimes']; ?>
> 			</td>
> 		</tr>
> 	</table>
> </div>
> <br style="clear: both"/>
170c186
< <input type="submit" value="<?php echo $text['calculate']; ?>" id="calcbtn" class="btn" <?php if( !$relatepersonID ) echo "onclick=\"if( form1.secondpersonID.value.length == 0 ) {alert('{$text['select2inds']}'); return false;}\""; ?> />
---
> <input type="submit" value="<?php echo $text['calculate']; ?>" id="calcbtn" class="btn" <?php if( !$relatepersonID ) echo "onclick=\"if( form1.secondpersonID.value.length == 0 ) {alert('{$text['select2inds']}'); return false;}\""; ?> /> &nbsp; &nbsp; <a href="<?php echo $connect_url . "primaryID={$primaryID}&tree={$tree}"; ?>" class="subhead"><?php echo $text['anotherpath']; ?></a>
diff -r TNG/relationship.php TNG1403/relationship.php
6a7,9
> include($cms['tngpath'] . "zoom-lib.php");
> 
> $flags['scripting'] = "<script src=\"js/panzoom.min.js\"></script>\n";
8d10
< $relate_url = getURL( "relateform", 1 );
9a12,13
> $relateform_url = getURL( "relateform", 1 );
> $connect_url = getURL( "connections-form", 1 );
14a19,20
> $zoomcode = "";
> $relevant=0;
21c27
< if( !$generations || $generations > $pedigree['maxupgen'])
---
> if( empty($generations) || $generations > $pedigree['maxupgen'])
93c99
< 						$greatmsg = $greats > 1 ? "$greats x" : "";
---
> 						$greatmsg = $greats > 1 ? "$greats {$text['times']}" : "";
104c110
< 					$greatmsg = $greats > 1 ? "$greats x" : "";
---
> 					$greatmsg = $greats > 1 ? "$greats {$text['times']}" : "";
111c117
< 					$greatmsg = $greats > 1 ? "$greats x" : "";
---
> 					$greatmsg = $greats > 1 ? "$greats {$text['times']}" : "";
119c125
< 					$cousinmsg = $cousins > 1 ? "$cousins x" : "";
---
> 					$cousinmsg = $cousins > 1 ? "$cousins {$text['times']}" : "";
170c176
< 					$greatmsg = $greats > 1 ? "$greats x" : "";
---
> 					$greatmsg = $greats > 1 ? "$greats {$text['times']}" : "";
188a195,196
> 		else
> 			$spousemsg = "";
217c225
< if( $secondpersonID ) {
---
> if(!empty($secondpersonID)) {
226c234
< if( $altprimarypersonID )
---
> if(!empty($altprimarypersonID))
229c237,240
< if(is_numeric($primarypersonID)) $primarypersonID = $tngconfig['personprefix'] . $primarypersonID . $tngconfig['personsuffix'];
---
> if(is_numeric($primarypersonID)) 
> 	$primarypersonID = $tngconfig['personprefix'] . $primarypersonID . $tngconfig['personsuffix'];
> else
> 	$primarypersonID = preg_replace("/[^A-Za-z0-9_\-. ]/", '', $primarypersonID);
278c289
< 	$pedigree['chartlink'] = "<img src=\"{$cms['tngpath']}img/Chart.gif\" border=\"0\" $chartlinkimg[3] title=\"{$text['popupnote2']}\" alt=\"\" />";
---
> 	$pedigree['chartlink'] = "<img src=\"{$cms['tngpath']}img/Chart.gif\" border=\"0\" $chartlinkimg[3] title=\"{$text['pedigree']}\" alt=\"\" />";
351c362
< 	$namefontsztouse = $pedigree['boxnamesize'] - 3;
---
> 	$namefontsztouse = $pedigree['boxnamesize'];
355c366
<     $result = getPersonData($tree, $drawpersonID);
---
>     $result = getPersonDataPlusDates($tree, $drawpersonID);
378c389
< 			$iconlinks .= "<a href=\"{$pedigree['url']}personID=$drawpersonID&amp;tree=$tree&amp;display=standard&amp;generations=" . $pedigree['initpedgens'] . "\" title=\"{$text['popupnote2']}\">{$pedigree['chartlink']}</a>\n";
---
> 			$iconlinks .= "<a href=\"{$pedigree['url']}personID=$drawpersonID&amp;tree=$tree&amp;display=standard&amp;generations=" . $pedigree['initpedgens'] . "\" title=\"{$text['pedigree']}\">{$pedigree['chartlink']}</a>\n";
386c397
< 		$tableheight = $pedigree['puboxheight'];
---
> 		$tableheight = $pedigree['puboxheight'] . "px";
418d428
< 	echo "<div style=\"position:absolute;background-color:{$pedigree['shadowcolor']}; top:" . ($gens->offsetV - intval($pedigree['linewidth']/2) + $pedigree['shadowoffset'] + 1) . "px;left:" . ($pedigree['leftindent'] + intval($pedigree['puboxwidth']/2) + $pedigree['shadowoffset'] + 1) . "px;height:{$pedigree['linewidth']}px;width:" . ((2 * $pedigree['puboxwidth']) + $pedigree['boxHsep'] + $pedigree['leftindent'] + 1) . "px;z-index:1;overflow:hidden;\"></div>\n";
435c445
< 	global $pedigree, $totalRelationships, $needmore, $gens, $maxrels, $session_norels;
---
> 	global $pedigree, $totalRelationships, $needmore, $gens, $maxrels, $session_norels, $saveindent, $relevant, $zoomcode;
440c450,454
< 	echo "<div id=\"tngchart\" align=\"left\" style=\"position:relative;\">\n";
---
>     echo includeZoomIcons(++$relevant) . "<br/>";
>     $zoomcode .= includeZoomScript($relevant);
>     echo "\n<div class='outer'>\n";
>     echo "<div class=\"panzoom\" id=\"vcontainer{$relevant}\">\n";
> 	echo "<div id=\"inner\" align=\"left\" style=\"position:relative;\">\n";
501c515
< 	echo "</div>\n";
---
> 	echo "</div></div></div>\n";
634c648
< 			$nextcouple = $gens->uplist[$lastup][$gens->upptr];
---
> 			$nextcouple = isset($gens->uplist[$lastup][$gens->upptr]) ? $gens->uplist[$lastup][$gens->upptr] : null;
641c655
< 			$nextcouple = $gens->uplist[$gensup][$gens->upptr];
---
> 			$nextcouple = isset($gens->uplist[$gensup][$gens->upptr]) ? $gens->uplist[$gensup][$gens->upptr] : null;
663a678
> 	$gensup = $gens->upcount;
776d790
< $flags['tabs'] = $tngconfig['tabs'];
809,810c823
< 	$innermenu .= "<a href=\"#\" class=\"lightlink\" onclick=\"document.form1.submit();\">{$text['refresh']}</a> &nbsp;&nbsp; | &nbsp;&nbsp; \n";
< 	$innermenu .= "<a href=\"$relate_url" . "primaryID=$primarypersonID&amp;tree=$tree\" class=\"lightlink\">{$text['findanother']}</a>\n";
---
> 	$innermenu .= "<a href=\"#\" class=\"lightlink\" onclick=\"document.form1.submit();\">{$text['refresh']}</a>\n";
821a835,836
> 	if( !$tngprint )
> 		echo "{$text['scrollnote']} &nbsp; | &nbsp; <a href=\"{$connect_url}primaryID={$primarypersonID}&tree={$tree}\">{$text['anotherpath']}</a> &nbsp; | &nbsp; <a href=\"{$relateform_url}primaryID={$primarypersonID}&tree={$tree}\">{$text['simplerel']}</a>";
869c884,895
< <script type="text/javascript">jQuery(document).ready(function(){jQuery('#searching').hide();});</script>
---
> <script type="text/javascript">
> //<![CDATA[
> 
> 	if(typeof zoomstep == 'undefined')
> 	    zoomstep = 0.2;
> 	jQuery(document).ready(function(){
> 		jQuery('#searching').hide();
> <?php echo $zoomcode; ?>
> 	});
> 
> //]]>
> </script>
diff -r TNG/reports.php TNG1403/reports.php
8c8
< $query = "SELECT reportname, reportdesc, reportID FROM $reports_table WHERE active = 1 ORDER BY rank, reportname";
---
> $query = "SELECT reportname, reportdesc, reportID FROM $reports_table WHERE active = 1 ORDER BY ranking, reportname";
31c31
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
33c33
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback normal\">";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\">";
diff -r TNG/rpt_descend.php TNG1403/rpt_descend.php
29c29
< $hangind = 0.25;    // how much to indent lines when more than one is needed
---
> $hangind = 0.125;    // how much to indent lines when more than one is needed
65c65
< $pdf->SetTitle($title);
---
> $pdf->SetTitle($title, $uni);
67c67
< 			'image' => $blankform ? "" : getPdfSmallPhoto($personID, $rights['living'] && $rights['private'], $row['sex']),
---
> 			'image' => getPdfSmallPhoto($personID, $rights['living'] && $rights['private'], $row['sex']),
112c112
< 	    if ($genchld[$j] > 0) {
---
> 	    if (isset($genchld[$j]) && $genchld[$j] > 0) {
132c132
<     	$pdf->MultiCell(0, $dy, $infoDescend[$i]['number'].$sep.$namestring, 0, 'L', 0, $x+$hangind);
---
>     	$pdf->MultiCell(0, $dy, $infoDescend[$i]['number'].$sep.$namestring, 0, 'L', 0, $hangind);
139c139
<     	$pdf->MultiCell(0, $dy, $namestring, 0, 'L', 0, $x+$hangind);
---
>     	$pdf->MultiCell(0, $dy, $namestring, 0, 'L', 0, $hangind);
182c182
< 	    $spousestr = '';
---
> 	    $spousestr = $vitalinfo = "";
251c251
< 			$infoDescend[$j]['number'] = "${henrynum}${n}";
---
> 			$infoDescend[$j]['number'] = $henrynum . $n;
253c253
< 			$infoDescend[$j]['number'] = "${num}.${n}";
---
> 				$infoDescend[$j]['number'] = $num . "." . $n;
255c255
< 			$infoDescend[$j]['number'] = "${num}.".chr(96+$level).${n};
---
> 				$infoDescend[$j]['number'] = $num . "." . chr(96+$level) . $n;
diff -r TNG/rpt_fam.php TNG1403/rpt_fam.php
38a39,40
> if ( !isset($blankform) ) $blankform = 0;
> if ( !isset($citesources) ) $citesources = 0;
56c58
< $pdf->SetTitle($title);
---
> $pdf->SetTitle($title, $uni);
129c131
< 		spouseLine($text['spouse'], $spousename, $marrplace, $cite1, $cite2);
---
> 		spouseLine($text['spouse'], "", "", "", "");
143,144c145,146
< 	displayIndividual($famrow['husband'], 1, 1);
< 	titleLine($text['children']);
---
> 		displayIndividual($famrow['husband'], 1, 1);
> 		titleLine($text['children']);
146,155c148,157
< 	// for each child
< 	$query = "SELECT $people_table.personID as personID, branch, firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, famc, sex, birthdate, birthplace, altbirthdate, altbirthplace, haskids, deathdate, deathplace, burialdate, burialplace, burialtype, baptdate, baptplace, confdate, confplace, initdate, initplace, endldate, endlplace, sealdate, sealplace FROM $people_table, $children_table WHERE $people_table.personID = $children_table.personID AND $children_table.familyID = \"$famrow[familyID]\" AND $people_table.gedcom = \"$tree\" AND $children_table.gedcom = \"$tree\" ORDER BY ordernum";
< 	$children= tng_query($query);
< 	if ($children && tng_num_rows($children)) {
< 	    $childcount = 0;
< 	    while ($childrow = tng_fetch_assoc($children)) {
< 		$childcount++;
< 		displayChild($childrow['personID'], $childcount);
< 	    }
< 	}
---
> 		// for each child
> 		$query = "SELECT $people_table.personID as personID, branch, $people_table.gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, living, private, famc, sex, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, haskids, deathdate, deathplace, burialdate, burialplace, burialtype, baptdate, baptplace, confdate, confplace, initdate, initplace, endldate, endlplace, sealdate, sealplace FROM $people_table, $children_table WHERE $people_table.personID = $children_table.personID AND $children_table.familyID = \"{$famrow['familyID']}\" AND $people_table.gedcom = \"$tree\" AND $children_table.gedcom = \"$tree\" ORDER BY ordernum";
> 		$children= tng_query($query);
> 		if ($children && tng_num_rows($children)) {
> 		    $childcount = 0;
> 		    while ($childrow = tng_fetch_assoc($children)) {
> 			$childcount++;
> 			displayChild($childrow['personID'], $childcount);
> 		    }
> 		}
192c194
<     if ($citesources) {
---
>     if ($citesources && !empty($citestring)) {
274c276
< 			    dateLine($text['conflds'], displayDate($row['confdate']), $ind['confplace'], $cite);
---
> 			    dateLine($text['conflds'], displayDate($ind['confdate']), $ind['confplace'], $cite);
276c278
< 			    dateLine($text['initlds'], displayDate($row['initdate']), $ind['initplace'], $cite);
---
> 			    dateLine($text['initlds'], displayDate($ind['initdate']), $ind['initplace'], $cite);
295c297
<     	$query = "SELECT familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $families_table.living as fliving, $families_table.private as fprivate, $families_table.branch as fbranch, $people_table.living as living, $people_table.private as private, $people_table.branch as branch, marrdate, marrplace, sealdate, sealplace FROM $families_table ";
---
>     	$query = "SELECT familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, $families_table.living as fliving, $families_table.private as fprivate, $families_table.branch as fbranch, $people_table.living as living, $people_table.private as private, $people_table.branch as branch, $people_table.gedcom as gedcom, marrdate, marrplace, sealdate, sealplace FROM $families_table ";
297c299
< 			$query .= "LEFT JOIN $people_table on $families_table.wife = $people_table.personID AND $families_table.gedcom = $people_table.gedcom WHERE husband = \"{$ind['personID']}\" AND $people_table.gedcom = \"$tree\" $restriction ORDER BY husborder";
---
> 			$query .= "LEFT JOIN $people_table on $families_table.wife = $people_table.personID AND $families_table.gedcom = $people_table.gedcom WHERE husband = \"{$ind['personID']}\" AND $people_table.gedcom = \"$tree\" ORDER BY husborder";
299c301
< 			$query .= "LEFT JOIN $people_table on $families_table.husband = $people_table.personID AND $families_table.gedcom = $people_table.gedcom WHERE wife = \"{$ind['personID']}\" AND $people_table.gedcom = \"$tree\" $restriction ORDER BY wifeorder";
---
> 			$query .= "LEFT JOIN $people_table on $families_table.husband = $people_table.personID AND $families_table.gedcom = $people_table.gedcom WHERE wife = \"{$ind['personID']}\" AND $people_table.gedcom = \"$tree\" ORDER BY wifeorder";
326a329
> 		$cite1 = $cite2 = "";
398c401
< 		    dateLine($text['conflds'], displayDate($row['confdate']), $ind['confplace'], $cite);
---
> 		    dateLine($text['conflds'], displayDate($ind['confdate']), $ind['confplace'], $cite);
400c403
< 		    dateLine($text['initlds'], displayDate($row['initdate']), $ind['initplace'], $cite);
---
> 		    dateLine($text['initlds'], displayDate($ind['initdate']), $ind['initplace'], $cite);
412,413c415,416
< 		$cite1 = $cite2 = "";
< 		$query = "SELECT YEAR(birthdatetr) AS birthyear, YEAR(deathdatetr) AS deathyear, familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $people_table.living, $people_table.private, $people_table.branch FROM ($families_table, $people_table) WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.husband AND $people_table.gedcom = \"$tree\"";
---
> 		$cite1 = $cite2 = $fathername = $fatherID = $mothername = $motherID = "";
> 		$query = "SELECT YEAR(birthdatetr) AS birth, YEAR(deathdatetr) AS death, familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom FROM ($families_table, $people_table) WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.husband AND $people_table.gedcom = \"$tree\"";
417,422d419
< 		$prights = determineLivingPrivateRights($parent, $righttree);
< 		$parent['allow_living'] = $prights['living'];
< 		$parent['allow_private'] = $prights['private'];
< 
< 		$fathername = getName( $parent ) . generateYears($parent);
< 		$fatherID = $parent['personID'];
424,427c421,432
< 
< 		if ($citesources && $prights['both']) {
< 		    getCitations($fatherID, 0);
< 		    $cite1 = reorderCitation($fatherID."_NAME", 0);
---
> 		if ($parent) {
> 			$prights = determineLivingPrivateRights($parent, $righttree);
> 			$parent['allow_living'] = $prights['living'];
> 			$parent['allow_private'] = $prights['private'];
> 
> 			$fathername = getName( $parent ) . generateYears($parent);
> 			$fatherID = $parent['personID'];
> 
> 			if ($citesources && $prights['both']) {
> 				getCitations($fatherID, 0);
> 				$cite1 = reorderCitation($fatherID."_NAME", 0);
> 			}
429,430c434,436
< 
< 		$query = "SELECT YEAR(birthdatetr) AS birthyear, YEAR(deathdatetr) AS deathyear, familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, $people_table.living, $people_table.private, $people_table.branch FROM ($families_table, $people_table) WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.wife AND $people_table.gedcom = \"$tree\"";
---
> 		
> 		// Add name and permission fields to the query.
> 		$query = "SELECT YEAR(birthdatetr) AS birth, YEAR(deathdatetr) AS death, familyID, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, $people_table.living, $people_table.private, $people_table.branch, $people_table.gedcom FROM ($families_table, $people_table) WHERE $families_table.familyID = \"{$ind['famc']}\" AND $families_table.gedcom = \"$tree\" AND $people_table.personID = $families_table.wife AND $people_table.gedcom = \"$tree\"";
434,439d439
< 		$prights = determineLivingPrivateRights($parent, $righttree);
< 		$parent['allow_living'] = $prights['living'];
< 		$parent['allow_private'] = $prights['private'];
< 
< 		$mothername = getName( $parent ) . generateYears($parent);
< 		$motherID = $parent['personID'];
441,444c441,452
< 
< 		if ($citesources && $prights['both']) {
< 		    getCitations($motherID, 0);
< 		    $cite2 = reorderCitation($motherID."_NAME", 0);
---
> 		if ($parent) {
> 			$prights = determineLivingPrivateRights($parent, $righttree);
> 			$parent['allow_living'] = $prights['living'];
> 			$parent['allow_private'] = $prights['private'];
> 
> 			$mothername = getName( $parent ) . generateYears($parent);
> 			$motherID = $parent['personID'];
> 
> 			if ($citesources && $prights['both']) {
> 				getCitations($motherID, 0);
> 				$cite2 = reorderCitation($motherID."_NAME", 0);
> 			}
diff -r TNG/rpt_ind.php TNG1403/rpt_ind.php
39a40,41
> if ( !isset($blankform) ) $blankform = 0;
> if ( !isset($citesources) ) $citesources = 0;
58c60
< $pdf->SetTitle($title);
---
> $pdf->SetTitle($title, $uni);
162c164
< 				if( $fact[1] ) {
---
> 				if( !empty($fact[1]) ) {
228,230c230,232
< 	    		$gotfather = getParentSimplePlusDates($tree, $parent['familyID'], "husband");
< 	    		if ($gotfather) {
< 				$fathrow = tng_fetch_assoc($gotfather);
---
>     		$gotfather = getParentSimplePlusDates($tree, $parent['familyID'], "husband");
> 			$fathrow = tng_fetch_assoc($gotfather);
>     		if($fathrow) {
253,254c255,256
< 			if( $gotmother ) {
< 				$mothrow =  tng_fetch_assoc( $gotmother );
---
> 			$mothrow = tng_fetch_assoc($gotmother);
>     		if ($mothrow) {
278c280
< 					doubleLine($text['sealedplds'], displayDate($parent['sealdate']), $text['place'], $row['sealplace']);
---
> 					doubleLine($text['sealedplds'], displayDate($parent['sealdate']), $text['place'], $parent['sealplace']);
322c324
< 		    $spouse = $marriagerow['husband'] == $personID ? wife : husband;
---
> 		    $spouse = $marriagerow['husband'] == $personID ? 'wife' : 'husband';
367,368c369,370
< 				    getCitations($child['pID'], 0);
< 				$cite = reorderCitation($child['pID']."_NAME", 0);
---
> 				    getCitations($child['personID'], 0);
> 				$cite = reorderCitation($child['personID']."_NAME", 0);
diff -r TNG/rpt_pdfform.php TNG1403/rpt_pdfform.php
26a27
> 	$lblFontSizes = array();
37a39
> 	$lblFontSizes = array();
321c323
< 	$pagesize = $_COOKIE['tng_pagesize'] ? $_COOKIE['tng_pagesize'] : $pedigree['pagesize'];
---
> 	$pagesize = isset($_COOKIE['tng_pagesize']) ? $_COOKIE['tng_pagesize'] : $pedigree['pagesize'];
349c351
< 	        <option value="legal<?php if($pagesize == "legal") echo "selected=\"selected\""; ?>"><?php echo $text['legal']; ?></option>
---
> 	        <option value="legal"<?php if($pagesize == "legal") echo "selected=\"selected\""; ?>><?php echo $text['legal']; ?></option>
diff -r TNG/rpt_pedigree.php TNG1403/rpt_pedigree.php
28c28,29
< if ($blankform) 
---
> if ( !isset($blankform) ) $blankform = 0;
> if ($blankform)
39c40
< $pdf->SetTitle($title);
---
> $pdf->SetTitle($title, $uni);
96c97
<     $pdf->CellFit($w, $lineheight+$xh, ($ind['firstname'] || $ind['lastname'] ? getName($ind) : ''), 0, 1, 'L', 0, '', 1, 0);
---
>     $pdf->CellFit($w, $lineheight+$xh, (!empty($ind['firstname']) || !empty($ind['lastname']) ? getName($ind) : ''), 0, 1, 'L', 0, '', 1, 0);
107a109
> 	if (!isset($ind[$data])) $ind[$data] = "";
174,175c176,177
< 	$yarea = $paperdim[h] - $botmrg - $topy - $moretopmrg;	// amount of y dimension we have to work with
< 	$xwid = ($paperdim[w] - $lftmrg - $rtmrg - $leftindent - ($boxspacing * 2)) / 3;
---
> 	$yarea = $paperdim['h'] - $botmrg - $topy - $moretopmrg;	// amount of y dimension we have to work with
> 	$xwid = ($paperdim['w'] - $lftmrg - $rtmrg - $leftindent - ($boxspacing * 2)) / 3;
179c181
< 	$x = $paperdim[w] - $rtmrg - $xwid;
---
> 	$x = $paperdim['w'] - $rtmrg - $xwid;
204c206
< 	$xwid = $xwid + $leftindex - $boxspacing;
---
> 	$xwid = $xwid + $leftindent - $boxspacing;
222,223c224,225
< 	$yarea = $paperdim[h] - $botmrg - $topy - $moretopmrg;	// amount of y dimension we have to work with
< 	$xwid = ($paperdim[w] - $lftmrg - $rtmrg - $leftindent - ($boxspacing * 3)) / 4;
---
> 	$yarea = $paperdim['h'] - $botmrg - $topy - $moretopmrg;	// amount of y dimension we have to work with
> 	$xwid = ($paperdim['w'] - $lftmrg - $rtmrg - $leftindent - ($boxspacing * 3)) / 4;
227c229
< 	$x = $paperdim[w] - $rtmrg - $xwid;
---
> 	$x = $paperdim['w'] - $rtmrg - $xwid;
258c260
< 	$xwid = $xwid + $leftindex - $boxspacing;
---
> 	$xwid = $xwid + $leftindent - $boxspacing;
340,341c342,343
< 	$yarea = $paperdim[h] - $botmrg - $topy - $moretopmrg;	// amount of y dimension we have to work with
< 	$xwid = ($paperdim[w] - $lftmrg - $rtmrg - $leftindent - ($boxspacing * 2)) / 3;
---
> 	$yarea = $paperdim['h'] - $botmrg - $topy - $moretopmrg;	// amount of y dimension we have to work with
> 	$xwid = ($paperdim['w'] - $lftmrg - $rtmrg - $leftindent - ($boxspacing * 2)) / 3;
345c347
< 	$x = $paperdim[w] - $rtmrg - $xwid;
---
> 	$x = $paperdim['w'] - $rtmrg - $xwid;
402c404
< 	$xwid = $xwid + $leftindex - $boxspacing;
---
> 	$xwid = $xwid + $leftindent - $boxspacing;
423,424c425,426
< 	$yarea = $paperdim[h] - $botmrg - $topy - $moretopmrg;	// amount of y dimension we have to work with
< 	$xwid = ($paperdim[w] - $lftmrg - $rtmrg - $leftindent - ($boxspacing * 3)) / 4;
---
> 	$yarea = $paperdim['h'] - $botmrg - $topy - $moretopmrg;	// amount of y dimension we have to work with
> 	$xwid = ($paperdim['w'] - $lftmrg - $rtmrg - $leftindent - ($boxspacing * 3)) / 4;
428c430
< 	$x = $paperdim[w] - $rtmrg - $xwid;
---
> 	$x = $paperdim['w'] - $rtmrg - $xwid;
521c523
< 	$xwid = $xwid + $leftindex - $boxspacing;
---
> 	$xwid = $xwid + $leftindent - $boxspacing;
539c541
<     $pdf->rect($x, $boxtop, $w, $h);
---
> 	$pdf->RoundedRect($x, $boxtop, $w, $h, .1, '1234', '');
diff -r TNG/rpt_utils.php TNG1403/rpt_utils.php
8,9c8,19
< 		if ($ind['birthdate'] == '') { $bdate = '    '; } else { $bdate = displayDate($ind['birthdate']); }
< 		if ($ind['deathdate'] == '') { $ddate = '    '; } else { $ddate = displayDate($ind['deathdate']); }
---
>     	if($ind['birthdate'])
>     		$bdate = displayDate($ind['birthdate']);
>     	elseif($ind['altbirthdate'])
>     		$bdate = displayDate($ind['altbirthdate']);
>     	else
>     		$bdate = '    ';
>     	if($ind['deathdate'])
>     		$ddate = displayDate($ind['deathdate']);
>     	elseif($ind['burialdate'])
>     		$ddate = displayDate($ind['burialdate']);
>     	else
>     		$ddate = '    ';
36c46
< 	global $photosext, $tree, $medialinks_table, $media_table, $cms, $tngconfig;
---
> 	global $photosext, $tree, $medialinks_table, $media_table, $cms, $tngconfig, $allow_private;
38c48
< 	$query = "SELECT $media_table.mediaID, medialinkID, alwayson, mediatypeID, usecollfolder, thumbpath, usecollfolder FROM ($media_table, $medialinks_table)
---
> 	$query = "SELECT $media_table.mediaID, medialinkID, alwayson, private, mediatypeID, usecollfolder, thumbpath, usecollfolder FROM ($media_table, $medialinks_table)
43,44c53,55
< 	if($row['thumbpath']) {
< 		if( $row['alwayson'] || $rights || checkLivingLinks($row['mediaID'])) {
---
> 	$photocheck = $photoref = "";
> 	if(!empty($row['thumbpath'])) {
> 		if( $row['alwayson'] || (($rights || checkLivingLinks($row['mediaID'])) && (!$row['private'] || $allow_private))) {
66a78,79
> 			if(!file_exists( $photoref ))
> 				$photoref = "";
135c148
<     global $pdf, $lftmrg, $paperdim, $rtmrg, $botmrg;
---
>     global $pdf, $lftmrg, $paperdim, $rtmrg, $botmrg, $y;
171c184
< 	    if ($ancestorInfo[$i][$j]['personID'] != 'X' && $ancestorInfo[$i][$j]['personID'] != '') {
---
> 	    if(!empty($ancestorInfo[$i][$j]['personID']) && $ancestorInfo[$i][$j]['personID'] != 'X') {
175,176c188,189
< 		if ($result) {
< 		    $row = tng_fetch_assoc($result);
---
> 		$row = tng_fetch_assoc($result);
> 		if(!empty($row)) {
181,183c194,196
< 		    $result =getParentData($tree, $familyID, "husband");
< 		    if ($result) {
< 				$row =  tng_fetch_assoc($result);
---
> 		    $result = getParentData($tree, $familyID, "husband");
> 			$row = tng_fetch_assoc($result);
> 			if($row) {
211,212c224,225
< 		    if ($result) {
< 				$row =  tng_fetch_assoc($result);
---
> 			$row = tng_fetch_assoc($result);
> 			if($row) {
237c250,258
< 	    }
---
> 		else {
> 			$ancestorInfo[$i+1][2*$j]['personID'] = "";
> 			$ancestorInfo[$i+1][2*$j+1]['personID'] = "";
> 		}
> 		}
> 		else {
> 			$ancestorInfo[$i+1][2*$j]['personID'] = "";
> 			$ancestorInfo[$i+1][2*$j+1]['personID'] = "";
> 		}
diff -r TNG/savelanguage2.php TNG1403/savelanguage2.php
6c6,8
< session_start();
---
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
> if(empty($instance)) $instance = "";
> 
8c10,11
< eval( "\$newlanguage = preg_replace(\"/[^0-9]/\", '', \$newlanguage$instance);" );
---
> //$newlanguage = preg_replace("/[^0-9]/", '', $newlanguage);
> $newlanguage = preg_replace("/[^0-9]/", "", ${"newlanguage".$instance});
15,17c18,27
< $session_language = $_SESSION['session_language'] = $row['folder'];
< $session_charset = $_SESSION['session_charset'] = $row['charset'];
< $session_norels = $_SESSION['session_norels'] = $row['norels'];
---
> if(!empty($row)) {
> 	$session_language = $_SESSION['session_language'] = $row['folder'];
> 	$session_charset = $_SESSION['session_charset'] = $row['charset'];
> 	$session_norels = $_SESSION['session_norels'] = $row['norels'];
> }
> else {
> 	$session_language = $_SESSION['session_language'] = "";
> 	$session_charset = $_SESSION['session_charset'] = "";
> 	$session_norels = $_SESSION['session_norels'] = 0;
> }
19c29
< if(file_exists($languages_path . $row['folder'])) {
---
> if(!empty( $row['folder']) && file_exists($languages_path . $row['folder'])) {
33,34c43,48
< else
< 	header( "Location: " . $_SERVER['HTTP_REFERER'] );
---
> else {
> 	if ( empty( $_SERVER['HTTP_REFERER'] ) )
> 		header( "Location: " . dirname($_SERVER['REQUEST_URI'])."/" );
> 	else
> 		header( "Location: " . $_SERVER['HTTP_REFERER'] );
> }
diff -r TNG/savelanguage.php TNG1403/savelanguage.php
4a5,6
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
> if(!isset($newlanguage)) die('Sorry!');
6c8
< session_start();
---
> $newlanguage = preg_replace("/[^0-9]/", '', $newlanguage);
Only in TNG1403: scrollbuttons.php
diff -r TNG/searchform.php TNG1403/searchform.php
5c5
< if($cms['events']){include('cmsevents.php'); cms_search();}
---
> if(!empty($cms['events'])){include('cmsevents.php'); cms_search();}
17,47c17,49
< if( $_SESSION['tng_search_tree'] ) $tree = $_SESSION['tng_search_tree'];
< if( $_SESSION['tng_search_branch'] ) $branch = $_SESSION['tng_search_branch'];
< $lnqualify = $_SESSION['tng_search_lnqualify'];
< $mylastname = $_SESSION['tng_search_lastname'];
< $fnqualify = $_SESSION['tng_search_fnqualify'];
< $myfirstname = $_SESSION['tng_search_firstname'];
< $idqualify = $_SESSION['tng_search_idqualify'];
< $mypersonid = $_SESSION['tng_search_personid'];
< $bpqualify = $_SESSION['tng_search_bpqualify'];
< $mybirthplace = $_SESSION['tng_search_birthplace'];
< $byqualify = $_SESSION['tng_search_byqualify'];
< $mybirthyear = $_SESSION['tng_search_birthyear'];
< $cpqualify = $_SESSION['tng_search_cpqualify'];
< $myaltbirthplace = $_SESSION['tng_search_altbirthplace'];
< $cyqualify = $_SESSION['tng_search_cyqualify'];
< $myaltbirthyear = $_SESSION['tng_search_altbirthyear'];
< $dpqualify = $_SESSION['tng_search_dpqualify'];
< $mydeathplace = $_SESSION['tng_search_deathplace'];
< $dyqualify = $_SESSION['tng_search_dyqualify'];
< $mydeathyear = $_SESSION['tng_search_deathyear'];
< $brpqualify = $_SESSION['tng_search_brpqualify'];
< $myburialplace = $_SESSION['tng_search_burialplace'];
< $bryqualify = $_SESSION['tng_search_bryqualify'];
< $myburialyear = $_SESSION['tng_search_burialyear'];
< $mybool = $_SESSION['tng_search_bool'];
< $showdeath = $_SESSION['tng_search_showdeath'];
< $showspouse = $_SESSION['tng_search_showspouse'];
< $mygender = $_SESSION['tng_search_gender'];
< $mysplname = $_SESSION['tng_search_mysplname'];
< $spqualify = $_SESSION['tng_search_spqualify'];
< $nr = $_SESSION['tng_nr'];
---
> $saved_cust_events = isset($_COOKIE['tng_search_people_post']['cust_events']) ? explode(",",stripslashes($_COOKIE['tng_search_people_post']['cust_events'])) : [];
> 
> if( !empty($_SESSION['tng_search_tree']) ) $tree = $_SESSION['tng_search_tree'];
> if( !empty($_SESSION['tng_search_branch']) ) $branch = $_SESSION['tng_search_branch'];
> $lnqualify = isset($_SESSION['tng_search_lnqualify']) ? $_SESSION['tng_search_lnqualify'] : "";
> $mylastname = isset($_SESSION['tng_search_lastname']) ? $_SESSION['tng_search_lastname'] : "";
> $fnqualify = isset($_SESSION['tng_search_fnqualify']) ? $_SESSION['tng_search_fnqualify'] : "";
> $myfirstname = isset($_SESSION['tng_search_firstname']) ? $_SESSION['tng_search_firstname'] : "";
> $idqualify = isset($_SESSION['tng_search_idqualify']) ? $_SESSION['tng_search_idqualify'] : "";
> $mypersonid = isset($_SESSION['tng_search_personid']) ? $_SESSION['tng_search_personid'] : "";
> $bpqualify = isset($_SESSION['tng_search_bpqualify']) ? $_SESSION['tng_search_bpqualify'] : "";
> $mybirthplace = isset($_SESSION['tng_search_birthplace']) ? $_SESSION['tng_search_birthplace'] : "";
> $byqualify = isset($_SESSION['tng_search_byqualify']) ? $_SESSION['tng_search_byqualify'] : "";
> $mybirthyear = isset($_SESSION['tng_search_birthyear']) ? $_SESSION['tng_search_birthyear'] : "";
> $cpqualify = isset($_SESSION['tng_search_cpqualify']) ? $_SESSION['tng_search_cpqualify'] : "";
> $myaltbirthplace = isset($_SESSION['tng_search_altbirthplace']) ? $_SESSION['tng_search_altbirthplace'] : "";
> $cyqualify = isset($_SESSION['tng_search_cyqualify']) ? $_SESSION['tng_search_cyqualify'] : "";
> $myaltbirthyear = isset($_SESSION['tng_search_altbirthyear']) ? $_SESSION['tng_search_altbirthyear'] : "";
> $dpqualify = isset($_SESSION['tng_search_dpqualify']) ? $_SESSION['tng_search_dpqualify'] : "";
> $mydeathplace = isset($_SESSION['tng_search_deathplace']) ? $_SESSION['tng_search_deathplace'] : "";
> $dyqualify = isset($_SESSION['tng_search_dyqualify']) ? $_SESSION['tng_search_dyqualify'] : "";
> $mydeathyear = isset($_SESSION['tng_search_deathyear']) ? $_SESSION['tng_search_deathyear'] : "";
> $brpqualify = isset($_SESSION['tng_search_brpqualify']) ? $_SESSION['tng_search_brpqualify'] : "";
> $myburialplace = isset($_SESSION['tng_search_burialplace']) ? $_SESSION['tng_search_burialplace'] : "";
> $bryqualify = isset($_SESSION['tng_search_bryqualify']) ? $_SESSION['tng_search_bryqualify'] : "";
> $myburialyear = isset($_SESSION['tng_search_burialyear']) ? $_SESSION['tng_search_burialyear'] : "";
> $mybool = isset($_SESSION['tng_search_bool']) ? $_SESSION['tng_search_bool'] : "";
> $showdeath = isset($_SESSION['tng_search_showdeath']) ? $_SESSION['tng_search_showdeath'] : "";
> $showspouse = isset($_SESSION['tng_search_showspouse']) ? $_SESSION['tng_search_showspouse'] : "";
> $mygender = isset($_SESSION['tng_search_gender']) ? $_SESSION['tng_search_gender'] : "";
> $mysplname = isset($_SESSION['tng_search_mysplname']) ? $_SESSION['tng_search_mysplname'] : "";
> $spqualify = isset($_SESSION['tng_search_spqualify']) ? $_SESSION['tng_search_spqualify'] : "";
> $nr = isset($_SESSION['tng_nr']) ? $_SESSION['tng_nr'] : "";
51a54,62
> function displayToggle($id,$state,$target,$headline) {
> 	global $text;
> 
> 	$rval = "<a href=\"#\" onclick=\"return toggleSection('$target','$id');\" class=\"togglehead\" style=\"color:black\"><div class=\"subhead\"><img src=\"img/" . ($state ? "tng_collapse.gif" : "tng_expand.gif") . "\" title=\"{$text['clickdisplay']}\" alt=\"{$text['clickdisplay']}\" width=\"15\" height=\"15\" border=\"0\" id=\"$id\">";
> 	$rval .= "<strong class=\"th-indent\">$headline</strong></div></a>\n";
> 
> 	return $rval;
> }
> 
107c118
< function toggleSection( flag ) {
---
> function toggleEvSection( flag ) {
120a132,144
> function removeEvCookie( item, eventtypeID, type ) {
> 	var params = {eventtypeID: eventtypeID, type: type};
> 	jQuery.ajax({
> 		url: '<?php echo $cms['tngpath']; ?>ajx_remove_event_cookie.php',
> 		data: params,
> 		dataType: 'html',
> 		success: function(req) {
> 			$(item).hide();
> 			toggleSection('evt'+eventtypeID,'arr'+eventtypeID);
> 		}
> 	})
> }
> 
204c228
< 			if($branch) {
---
> 			if(!empty($branch)) {
217c241
< <h1 class="header"><span class="headericon" id="search-hdr-icon"></span><?php echo $text['searchnames'];?></h1><br clear="all" />
---
> <h1 class="header"><span class="headericon" id="search-hdr-icon"></span><?php echo $text['searchnames'];?></h1><br />
219c243
< if($msg)
---
> if(!empty($msg))
223a248
> echo "<div class=\"titlebox\" style=\"overflow:auto\">\n";
228c253
< 	<table cellspacing="1" cellpadding="4" class="normal">
---
> 	<table cellspacing="1" cellpadding="4" class="normal rounded-table">
257c282
< 				<input type="text" name="myfirstname" value="<?php echo $myfirstname; ?>" />
---
> 				<input type="text" name="myfirstname" class="longfield" value="<?php echo $myfirstname; ?>" />
273c298
< 				<input type="text" name="mylastname" value="<?php echo $mylastname; ?>" />
---
> 				<input type="text" name="mylastname" class="longfield" value="<?php echo $mylastname; ?>" />
289c314
< 				<input type="text" name="mypersonid" value="<?php echo $mypersonid; ?>" />
---
> 				<input type="text" name="mypersonid" class="longfield" value="<?php echo $mypersonid; ?>" />
321c346
< 				<input type="text" name="mybirthplace" value="<?php echo $mybirthplace; ?>" />
---
> 				<input type="text" name="mybirthplace" class="longfield" value="<?php echo $mybirthplace; ?>" />
337c362
< 				<input type="text" name="mybirthyear" value="<?php echo $mybirthyear; ?>" />
---
> 				<input type="text" name="mybirthyear" class="longfield" value="<?php echo $mybirthyear; ?>" />
352c377
< 				<input type="text" name="myaltbirthplace" value="<?php echo $myaltbirthplace; ?>" />
---
> 				<input type="text" name="myaltbirthplace" class="longfield" value="<?php echo $myaltbirthplace; ?>" />
368c393
< 				<input type="text" name="myaltbirthyear" value="<?php echo $myaltbirthyear; ?>" />
---
> 				<input type="text" name="myaltbirthyear" class="longfield" value="<?php echo $myaltbirthyear; ?>" />
383c408
< 				<input type="text" name="mydeathplace" value="<?php echo $mydeathplace; ?>" />
---
> 				<input type="text" name="mydeathplace" class="longfield" value="<?php echo $mydeathplace; ?>" />
399c424
< 				<input type="text" name="mydeathyear" value="<?php echo $mydeathyear; ?>" />
---
> 				<input type="text" name="mydeathyear" class="longfield" value="<?php echo $mydeathyear; ?>" />
414c439
< 				<input type="text" name="myburialplace" value="<?php echo $myburialplace; ?>" />
---
> 				<input type="text" name="myburialplace" class="longfield" value="<?php echo $myburialplace; ?>" />
430c455
< 				<input type="text" name="myburialyear" value="<?php echo $myburialyear; ?>" />
---
> 				<input type="text" name="myburialyear" class="longfield" value="<?php echo $myburialyear; ?>" />
447c472,534
< 				<input type="text" name="mysplname" value="<?php echo $mysplname; ?>" />
---
> 				<input type="text" name="mysplname" class="longfield" value="<?php echo $mysplname; ?>" />
> 				<br/><span class="smaller"><em>*<?php echo $text['spousemore']; ?></em></span>
> 			</td>
> 		</tr>
> 		<tr><td colspan="2">&nbsp;</td></tr>
> 		<tr>
> 			<td class="fieldnameback fieldname"><span class="normal"><?php echo $text['nickname'];?>:</span></td>
> 			<td class="databack">
> 				<select name="nnqualify" class="mediumfield">
> 		<?php
> 			foreach( $item_array as $item ) {
> 			    echo "<option value=\"$item[1]\"";
> 			    if( isset($nnqualify) && $nnqualify == $item[1] ) echo " selected=\"selected\"";
> 			    echo ">$item[0]</option>\n";
> 			}
> 		?>
> 				</select>
> 				<input type="text" name="mynickname" class="longfield" value="<?php echo isset($mynickname) ? $mynickname : ""; ?>" />
> 			</td>
> 		</tr>
> 		<tr>
> 			<td class="fieldnameback fieldname"><span class="normal"><?php echo $text['title'];?>:</span></td>
> 			<td class="databack">
> 				<select name="tqualify" class="mediumfield">
> 		<?php
> 			foreach( $item_array as $item ) {
> 			    echo "<option value=\"$item[1]\"";
> 			    if( isset($tqualify) && $tqualify == $item[1] ) echo " selected=\"selected\"";
> 			    echo ">$item[0]</option>\n";
> 			}
> 		?>
> 				</select>
> 				<input type="text" name="mytitle" class="longfield" value="<?php echo isset($mytitle) ? $mytitle : ""; ?>" />
> 			</td>
> 		</tr>
> 		<tr>
> 			<td class="fieldnameback fieldname"><span class="normal"><?php echo $text['prefix'];?>:</span></td>
> 			<td class="databack">
> 				<select name="pfqualify" class="mediumfield">
> 		<?php
> 			foreach( $item_array as $item ) {
> 			    echo "<option value=\"$item[1]\"";
> 			    if( isset($pfqualify) && $pfqualify == $item[1] ) echo " selected=\"selected\"";
> 			    echo ">$item[0]</option>\n";
> 			}
> 		?>
> 				</select>
> 				<input type="text" name="myprefix" class="longfield" value="<?php echo isset($myprefix) ? $myprefix : ""; ?>" />
> 			</td>
> 		</tr>
> 		<tr>
> 			<td class="fieldnameback fieldname"><span class="normal"><?php echo $text['suffix'];?>:</span></td>
> 			<td class="databack">
> 				<select name="sfqualify" class="mediumfield">
> 		<?php
> 			foreach( $item_array as $item ) {
> 			    echo "<option value=\"$item[1]\"";
> 			    if( isset($sfqualify) && $sfqualify == $item[1] ) echo " selected=\"selected\"";
> 			    echo ">$item[0]</option>\n";
> 			}
> 		?>
> 				</select>
> 				<input type="text" name="mysuffix" class="longfield" value="<?php echo isset($mysuffix) ? $mysuffix : ""; ?>" />
451d537
< 	<p class="smaller"><em>*<?php echo $text['spousemore']; ?></em></p>
454c540
< 	<hr size="1" />
---
> 	<br/>
456,458c542,544
< 	<ul id="descendantchart" class="normal">
< 		<li id="expand" class="othersearch"><a href="#" onclick="return toggleSection(1);" class="nounderline"><img src="<?php echo $cms['tngpath']; ?>img/tng_expand.gif" alt="" width="15" height="15" border="0" class="exp-cont" /><?php echo $text['clickdisplay']; ?></a></li>
< 		<li id="contract" class="othersearch" style="display:none;"><a href="#" onclick="return toggleSection(0);" class="nounderline"><img src="<?php echo $cms['tngpath']; ?>img/tng_collapse.gif" alt="" width="15" height="15" border="0" class="exp-cont" /><?php echo $text['clickhide']; ?></a></li>
---
> 	<ul class="normal">
> 		<li id="expand" class="othersearch"><a href="#" onclick="return toggleEvSection(1);" class="nounderline"><img src="<?php echo $cms['tngpath']; ?>img/tng_expand.gif" alt="" width="15" height="15" border="0" class="exp-cont" /><?php echo $text['clickdisplay']; ?></a></li>
> 		<li id="contract" class="othersearch" style="display:none;"><a href="#" onclick="return toggleEvSection(0);" class="nounderline"><img src="<?php echo $cms['tngpath']; ?>img/tng_collapse.gif" alt="" width="15" height="15" border="0" class="exp-cont" /><?php echo $text['clickhide']; ?></a></li>
460,522c546,547
< 	<table style="display:none" id="otherevents">
< 	<tr><td colspan="3">&nbsp;</td></tr>
< 	<tr>
< 		<td><span class="normal"><?php echo $text['nickname'];?>:</span></td>
< 		<td>
< 			<select name="nnqualify" class="mediumfield">
< 	<?php
< 		foreach( $item_array as $item ) {
< 		    echo "<option value=\"$item[1]\"";
< 		    if( $nnqualify == $item[1] ) echo " selected=\"selected\"";
< 		    echo ">$item[0]</option>\n";
< 		}
< 	?>
< 			</select>
< 		</td>
< 		<td><input type="text" name="mynickname" value="<?php echo $mynickname; ?>" /></td>
< 	</tr>
< 	<tr>
< 		<td><span class="normal"><?php echo $text['title'];?>:</span></td>
< 		<td>
< 			<select name="tqualify" class="mediumfield">
< 	<?php
< 		foreach( $item_array as $item ) {
< 		    echo "<option value=\"$item[1]\"";
< 		    if( $tqualify == $item[1] ) echo " selected=\"selected\"";
< 		    echo ">$item[0]</option>\n";
< 		}
< 	?>
< 			</select>
< 		</td>
< 		<td><input type="text" name="mytitle" value="<?php echo $mytitle; ?>" /></td>
< 	</tr>
< 	<tr>
< 		<td><span class="normal"><?php echo $text['prefix'];?>:</span></td>
< 		<td>
< 			<select name="pfqualify" class="mediumfield">
< 	<?php
< 		foreach( $item_array as $item ) {
< 		    echo "<option value=\"$item[1]\"";
< 		    if( $pfqualify == $item[1] ) echo " selected=\"selected\"";
< 		    echo ">$item[0]</option>\n";
< 		}
< 	?>
< 			</select>
< 		</td>
< 		<td><input type="text" name="myprefix" value="<?php echo $myprefix; ?>" /></td>
< 	</tr>
< 	<tr>
< 		<td><span class="normal"><?php echo $text['suffix'];?>:</span></td>
< 		<td>
< 			<select name="sfqualify" class="mediumfield">
< 	<?php
< 		foreach( $item_array as $item ) {
< 		    echo "<option value=\"$item[1]\"";
< 		    if( $sfqualify == $item[1] ) echo " selected=\"selected\"";
< 		    echo ">$item[0]</option>\n";
< 		}
< 	?>
< 			</select>
< 		</td>
< 		<td><input type="text" name="mysuffix" value="<?php echo $mysuffix; ?>" /></td>
< 	</tr>
< 	<tr><td colspan="3">&nbsp;</td></tr>
---
> 	<br/>
> 	<div id="otherevents" style="display:none">
536a562
> 		$saved_events_output = $reg_events_output = "";
538,544c564,580
< 			echo "<tr><td colspan=\"3\"><span class=\"normal\">{$row['displaymsg']}</span></td></tr>\n";
< 
< 			echo "<tr>\n";
< 			echo "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['fact']}:</span></td>\n";
< 			echo "<td>\n";
< 			//eval( "\$cfq = \$cfq$row[eventtypeID] = \$_SESSION[tng_search_cfq$row[eventtypeID]];" );
< 			echo "<select name=\"cfq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
---
> 			if(in_array($row['eventtypeID'], $saved_cust_events)) {
> 				$displaystr = "";
> 				$removestr = "{$text['remove']}";
> 			}
> 			else {
> 				$displaystr = " style=\"display:none\"";
> 				$removestr = "";
> 			}
> 			$out = "<div class=\"databack cust-event-block\">\n";
> 			$out .= "<div class=\"smallest remove-link\" onclick=\"removeEvCookie(this,'{$row['eventtypeID']}','people');\">$removestr</div>\n";
> 			$out .= displayToggle("arr{$row['eventtypeID']}",0,"evt{$row['eventtypeID']}",$row['displaymsg']);
> 			$out .= "<div id=\"evt{$row['eventtypeID']}\"{$displaystr}><br/>\n";
> 			$out .= "<table>\n";
> 			$out .= "<tr>\n";
> 			$out .= "<td style=\"padding-right:25px\"><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['fact']}:</span></td>\n";
> 			$out .= "<td>\n";
> 			$out .= "<select name=\"cfq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
546,548c582,583
< 			    echo "<option value=\"$item[1]\"";
< 			    //if( $cfq == $item[1] ) echo " SELECTED";
< 			    echo ">$item[0]</option>\n";
---
> 			    $out .= "<option value=\"$item[1]\"";
> 			    $out .= ">$item[0]</option>\n";
550,560c585,593
< 			echo "</select>\n";
< 			echo "</td>\n";
< 			//eval( "\$cef = \$cef$row[eventtypeID] = \$_SESSION[tng_search_cef$row[eventtypeID]];" );
< 			echo "<td><input type=\"text\" name=\"cef{$row['eventtypeID']}\" value=\"\" /></td>\n";
< 			echo "</tr>\n";
< 
< 			echo "<tr>\n";
< 			echo "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['place']}:</span></td>\n";
< 			echo "<td>\n";
< 			//eval( "\$cpq = \$cpq$row[eventtypeID] = \$_SESSION[tng_search_cpq$row[eventtypeID]];" );
< 			echo "<select name=\"cpq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
---
> 			$out .= "</select>\n";
> 			$out .= "</td>\n";
> 			$out .= "<td><input type=\"text\" name=\"cef{$row['eventtypeID']}\" class=\"longfield\" value=\"\" /></td>\n";
> 			$out .= "</tr>\n";
> 
> 			$out .= "<tr>\n";
> 			$out .= "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['place']}:</span></td>\n";
> 			$out .= "<td>\n";
> 			$out .= "<select name=\"cpq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
562,564c595,596
< 			    echo "<option value=\"$item[1]\"";
< 			    //if( $cpq == $item[1] ) echo " SELECTED";
< 			    echo ">$item[0]</option>\n";
---
> 			    $out .= "<option value=\"$item[1]\"";
> 			    $out .= ">$item[0]</option>\n";
566,576c598,606
< 			echo "</select>\n";
< 			echo "</td>\n";
< 			//eval( "\$cep = \$cep$row[eventtypeID] = \$_SESSION[tng_search_cep$row[eventtypeID]];" );
< 			echo "<td><input type=\"text\" name=\"cep{$row['eventtypeID']}\" value=\"\" /></td>\n";
< 			echo "</tr>\n";
< 
< 			echo "<tr>\n";
< 			echo "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['year']}:</span></td>\n";
< 			//eval( "\$cyq = \$cyq$row[eventtypeID] = \$_SESSION[tng_search_cyq$row[eventtypeID]];" );
< 			echo "<td>\n";
< 			echo "<select name=\"cyq$row[eventtypeID]\" class=\"mediumfield\">\n";
---
> 			$out .= "</select>\n";
> 			$out .= "</td>\n";
> 			$out .= "<td><input type=\"text\" name=\"cep{$row['eventtypeID']}\" class=\"longfield\" value=\"\" /></td>\n";
> 			$out .= "</tr>\n";
> 
> 			$out .= "<tr>\n";
> 			$out .= "<td><span class=\"normal\">&nbsp;&nbsp;&nbsp;{$text['year']}:</span></td>\n";
> 			$out .= "<td>\n";
> 			$out .= "<select name=\"cyq{$row['eventtypeID']}\" class=\"mediumfield\">\n";
580,582c610,611
< 				echo "<option value=\"$item[1]\"";
< 				//if( $cyq == $item[1] ) echo " SELECTED";
< 				echo ">$item[0]</option>\n";
---
> 				$out .= "<option value=\"$item[1]\"";
> 				$out .= ">$item[0]</option>\n";
585,586c614,615
< 			echo "</select>\n";
< 			echo "</td>\n";
---
> 			$out .= "</select>\n";
> 			$out .= "</td>\n";
588,589c617,627
< 			echo "<td><input type=\"text\" name=\"cey{$row['eventtypeID']}\" value=\"\" /></td>\n";
< 			echo "</tr>\n";
---
> 			$out .= "<td><input type=\"text\" name=\"cey{$row['eventtypeID']}\" class=\"longfield\" value=\"\" /></td>\n";
> 			$out .= "</tr>\n";
> 			$out .= "</table>\n";
> 			$out .= "</div>\n</div>\n";
> 			if(in_array($row['eventtypeID'], $saved_cust_events))
> 				$saved_events_output .= $out;
> 			else
> 				$reg_events_output .= $out;
> 	 	}
> 	 	if(!empty($saved_events_output)) {
> 		 	echo $saved_events_output . "<br/>";
590a629
> 		echo $reg_events_output;
592,598c631,632
< 		<tr>
< 			<td colspan="3"><br/>
< 				<input type="button" value="<?php echo $text['search'];?>" onclick="$('searchbtn').className='fieldnamebacksave';return makeURL();" /> <input type="button" value="<?php echo $text['resetall'];?>" onclick="resetValues();" />
< 			</td>
< 		</tr>
< 	</table>
< 	<hr size="1" />
---
> 		<br/>
> 	</div>
617d650
< 			<td></td>
633d665
< 			<td></td>
636c668
< 	<p class="normal">
---
> 	<p class="normal" style="max-width:350px">
645c677
< 		<a href="<?php echo $cms['tngpath']; ?>famsearchform.php" class="snlink">&raquo; <?php echo $text['searchfams']; ?></a>
---
> 		<a href="<?php echo $cms['tngpath']; ?>famsearchform.php" class="snlink">&raquo; <?php echo $text['searchfams']; ?></a><br/>
651c683,684
< <br clear="all"/>
---
> <br/>
> </div>
diff -r TNG/searchlib.php TNG1403/searchlib.php
39c39,49
< 			$mcolumn = substr($column,0,1) == "f" ? "father.metaphone" : "mother.metaphone";
---
> 			$metaphoneprefix = substr($column,0,1);
> 			if($metaphoneprefix == "f")
> 				$mcolumn = "father.metaphone";
> 			elseif($metaphoneprefix == "m")
> 				$mcolumn = "mother.metaphone";
> 			elseif(strpos($metaphoneprefix,'p.')!==false)    // $column is "p.lastname"
> 				$mcolumn = "p.metaphone";
> 			elseif(strpos($metaphoneprefix,'spouse.')!==false)     //$column is "TRIM(CONCAT_WS(' ',spouse.lnprefix,spouse.lastname))"
> 				$mcolumn = "spouse.metaphone";
> 			else
> 				$mcolumn = "metaphone";
61,63c71
< 		$value = urldecode(trim($value));
< 		if (get_magic_quotes_gpc() == 0)
< 			$value = addslashes( $value );
---
> 		$value = addslashes(urldecode(trim($value)));
70c78
< 		die("sorry");
---
> 		die("Error: Too many criteria chosen");
76c84
< 			$criteria = "($yearstr1 < $numvalue + 2 AND $yearstr2 > $numvalue - 2)";
---
> 			$criteria = "($yearstr1 <= $numvalue + 2 AND $yearstr2 >= $numvalue - 2)";
80c88
< 			$criteria = "($yearstr1 < $numvalue + 5 AND $yearstr2 > $numvalue - 5)";
---
> 			$criteria = "($yearstr1 <= $numvalue + 5 AND $yearstr2 >= $numvalue - 5)";
84c92
< 			$criteria = "($yearstr1 < $numvalue + 10 AND $yearstr2 > $numvalue - 10)";
---
> 			$criteria = "($yearstr1 <= $numvalue + 10 AND $yearstr2 >= $numvalue - 10)";
157c165
< 	global $dontdo, $cejoin, $eventtypes_table, $events_table, $text, $allwhere, $mybool;
---
> 	global $dontdo, $cejoin, $eventtypes_table, $events_table, $text, $allwhere, $mybool, $saved_cust_events;
163a172
> 	if(!isset($saved_cust_events)) $saved_cust_events = [];
179,180c188,189
< 			eval( "global \$$cefstr;" );
< 			eval( "\$cef = \$$cefstr;" );
---
> 			global $$cefstr;
> 			$cef = $$cefstr;
182,183c191,192
< 			eval( "global \$$cfqstr;" );
< 			eval( "\$cfq = \$$cfqstr;" );
---
> 			global $$cfqstr;
> 			$cfq = $$cfqstr;
195,196c204,205
< 			eval( "global \$$cepstr;" );
< 			eval( "\$cep = \$$cepstr;" );
---
> 			global $$cepstr;
> 			$cep = $$cepstr;
198,199c207,208
< 			eval( "global \$$cpqstr;" );
< 			eval( "\$cpq = \$$cpqstr;" );
---
> 			global $$cpqstr;
> 			$cpq = $$cpqstr;
211,212c220,221
< 			eval( "global \$$ceystr;" );
< 			eval( "\$cey = \$$ceystr;" );
---
> 			global $$ceystr;
> 			$cey = $$ceystr;
214,215c223,224
< 			eval( "global \$$cyqstr;" );
< 			eval( "\$cyq = \$$cyqstr;" );
---
> 			global $$cyqstr;
> 			$cyq = $$cyqstr;
225a235
> 				array_push($saved_cust_events, $row['eventtypeID']);
239,240c249,251
< 	//if( !$cejoin && $ecount )
< 		//$cejoin = "LEFT JOIN $events_table ON $treefield = $events_table.gedcom AND $persfamfield = $events_table.persfamID " ;
---
> 	$cookie_name = $type == "F" ? "tng_search_families_post[cust_events]" : "tng_search_people_post[cust_events]";
> 	setcookie($cookie_name, implode(",",array_unique($saved_cust_events)), time()+31536000, "/");
> 
diff -r TNG/search.php TNG1403/search.php
18c18
< $maxsearchresults = $nr ? ($nr < 200 ? $nr : 200) : ($_SESSION['tng_nr'] ? $_SESSION['tng_nr'] : $maxsearchresults);
---
> $maxsearchresults = !empty($nr) ? ($nr < 200 ? $nr : 200) : (!empty($_SESSION['tng_nr']) ? $_SESSION['tng_nr'] : $maxsearchresults);
21a22,31
> $varlist = array('bpqualify','branch','brpqualify','bryqualify','byqualify','cpqualify','cyqualify','dpqualify','dyqualify','ecount','fnqualify','idqualify','lnqualify','gequalify','myaltbirthplace','myaltbirthyear','mybirthplace','mybirthyear','myburialplace','myburialyear','mydeathplace','mydeathyear','myfirstname','mygender','mylastname','mynickname','mypersonid','myprefix','mysplname','mysuffix','mytitle','nnqualify','pfqualify','sfqualify','showdeath','showspouse','spqualify','tngprint','tqualify','urlstring');
> foreach($varlist as $var) {
> 	if( !isset(${$var}) ) 
> 		${$var} = "";
> }
> 		
> if( !isset($offset) ) $offset = 0;
> 
> $saved_cust_events = isset($_COOKIE['tng_search_people_post']['cust_events']) ? explode(",",stripslashes($_COOKIE['tng_search_people_post']['cust_events'])) : [];
> 
77c87
< $_SESSION['tng_nr'] = $nr;
---
> $_SESSION['tng_nr'] = isset($nr) ? $nr : $maxsearchresults;
148c158
< 		die("sorry");
---
> 		die("Error: Too many criteria chosen");
223c233
< $dontdo = array("ADDR","BIRT","CHR","DEAT","BURI","NICK","TITL","NSFX");
---
> $dontdo = array(); //array("ADDR","BIRT","CHR","DEAT","BURI","NICK","TITL","NSFX");
239c249,251
< 	$querystring .= $text['tree'] . " {$text['equals']} {$treerow['treename']}";
---
> 	$querystring .= $text['tree'] . " {$text['equals']} ";
> 	if(isset($treerow['treename']))
> 		$querystring .= $treerow['treename'];
248,253c260,264
< 		$query = "SELECT description FROM $branches_table WHERE gedcom = \"$tree\" AND branch = \"$branch\"";
< 		$branchresult = tng_query($query);
< 		$branchrow = tng_fetch_assoc($branchresult);
< 		tng_free_result($branchresult);
< 
< 		$querystring .= $text['branch'] . " {$text['equals']} {$branchrow['description']}";
---
> 		if($branch != "-1") {
> 			$query = "SELECT description FROM $branches_table WHERE gedcom = \"$tree\" AND branch = \"$branch\"";
> 			$branchresult = tng_query($query);
> 			$branchrow = tng_fetch_assoc($branchresult);
> 			tng_free_result($branchresult);
255c266,272
< 		$allwhere .= " AND p.branch like \"%$branch%\"";
---
> 			$querystring .= $text['branch'] . " {$text['equals']} {$branchrow['description']}";
> 			$allwhere .= " AND p.branch like \"%$branch%\"";
> 		}
> 		else {
> 			$querystring .= $text['branch'] . " {$text['equals']} {$admtext['nobranch']}";
> 			$allwhere .= " AND p.branch = \"\"";
> 		}
303,304c320,321
< 		p.branch, p.suffix, p.prefix, p.nameorder, p.title, p.birthplace, p.birthdate, p.deathplace, p.deathdate,
< 		p.altbirthdate, p.altbirthplace, p.burialdate, p.burialplace, p.gedcom, treename
---
> 		p.branch, p.suffix, p.prefix, p.nameorder, p.title, p.birthplace, p.birthdate, p.birthdatetr, p.deathplace, p.deathdate, p.deathdatetr,
> 		p.altbirthdate, p.altbirthdatetr, p.altbirthplace, p.burialdate, p.burialplace, p.gedcom, treename
323c340
< 	$query = "SELECT p.ID, p.personID, lastname, lnprefix, firstname, p.living, p.private, p.branch, nickname, prefix, suffix, nameorder, title, birthplace, birthdate, deathplace, deathdate, altbirthdate, altbirthplace, burialdate, burialplace, p.gedcom, treename $huswife
---
> 	$query = "SELECT p.ID, p.personID, lastname, lnprefix, firstname, p.living, p.private, p.branch, nickname, prefix, suffix, nameorder, title, birthplace, birthdate, birthdatetr, deathplace, deathdate, altbirthdate, altbirthdatetr, altbirthplace, burialdate, burialplace, p.gedcom, treename $huswife
380,381c397,398
< $heatmap = !$cejoin ? "<a href=\"$heatmap_url" . $_SERVER['QUERY_STRING'] . "\" class=\"snlink\">{$text['heatmap']}</a>" : "";
< if($pagenav && !$cejoin) $heatmap = " | " . $heatmap;
---
> $heatmap = !$cejoin && empty($mysplname) ? "<a href=\"$heatmap_url" . $_SERVER['QUERY_STRING'] . "\" class=\"snlink\">{$text['heatmap']}</a>" : "";
> if($pagenav && !$cejoin && empty($mysplname)) $heatmap = " | " . $heatmap;
399c416
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"columntoggle\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"columntoggle\"" . $headerr;
401c418
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"stack\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"stack\"" . $headerr;
403c420
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" data-tablesaw-mode=\"swipe\"" . $headerr;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"swipe\"" . $headerr;
405c422
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback\">\n";
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\">\n";
408c425
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback\">\n" . $header;
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"thfixed whiteback normal\">\n" . $header;
516c533
< 			$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, nameorder, living, private, branch, gedcom FROM $people_table WHERE personID = \"$spouseID\" AND gedcom = \"{$row['gedcom']}\"";
---
> 			$query = "SELECT lastname, lnprefix, firstname, nickname, prefix, suffix, nameorder, title, living, private, branch, gedcom, birthplace, birthdate, birthdatetr, deathplace, deathdate, altbirthdate, altbirthdatetr, altbirthplace, burialdate FROM $people_table WHERE personID = \"$spouseID\" AND gedcom = \"{$row['gedcom']}\"";
518,519c535,537
< 			if( $spresult ) {
< 				$sprow = tng_fetch_assoc($spresult);
---
> 			// Fix the logic, since a mysqli query always has data even when there are no rows.
> 			$sprow = tng_fetch_assoc($spresult);
> 			if( $sprow ) {
524d541
< 				tng_free_result($spresult);
525a543
> 			tng_free_result($spresult);
557c575
< 				$branchname = $branchnames[$key];
---
> 				$branchname = isset($branchnames[$key]) ? $branchnames[$key] : "";
diff -r TNG/searchsite.php TNG1403/searchsite.php
16c16
< if($msg)
---
> if(!empty($msg))
26c26
< 	<table cellspacing="1" cellpadding="4" class="normal">
---
> 	<table cellspacing="1" cellpadding="4" class="rounded-table normal">
diff -r TNG/sendlogin.php TNG1403/sendlogin.php
21a22
> $message = "";
34c35
< 		if($row['allow_profile']) {
---
> 		if( !empty($row['allow_profile']) ) {
59c60
< 		if( $row['username'] ) {
---
> 		if( !empty($row['username']) ) {
diff -r TNG/showalbum.php TNG1403/showalbum.php
28c28
< 	if( $ioffset ) {
---
> 	if( !empty($ioffset) ) {
34c34
< 		$newioffset = "";
---
> 		$newioffset = 0;
36a37
> 		$album2entities_table.linktype, people.title, people.birthdate, people.birthdatetr, people.altbirthdate, people.altbirthdatetr, people.deathdate, people.deathdatetr, husbpeople.title as htitle, wifepeople.title as wtitle,
38,40c39,41
< 		familyID, people.personID as personID2, wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname,
< 		wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname,
< 		husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID, reponame
---
> 		familyID, people.personID as personID2, wifepeople.personID as wife, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname,
> 		wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, husbpeople.personID as husband, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname,
> 		husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, $sources_table.title as stitle, $sources_table.sourceID, $repositories_table.repoID, reponame
55,57c56,61
< 		if( $prow['fbranch'] != NULL ) $prow['branch'] = $prow['fbranch'];
< 		if( $prow['fliving'] != NULL ) $prow['living'] = $prow['fliving'];
< 		if( $prow['fprivate'] != NULL ) $prow['private'] = $prow['fprivate'];
---
> 		if( $prow['linktype'] == "F" ) {
> 			$prow['branch'] = $prow['fbranch'];
> 			$prow['living'] = $prow['fliving'];
> 			$prow['private'] = $prow['fprivate'];
> 			unset($prow['personID']);
> 		}
74c78
< 			$sourcetext = $prow['title'] ? $prow['title'] : "{$text['source']}: {$prow['sourceID']}";
---
> 			$sourcetext = $prow['stitle'] ? $prow['stitle'] : "{$text['source']}: {$prow['sourceID']}";
90c94
< 			$query = "SELECT description from $events_table, $eventtypes_table WHERE eventID = \"{$prow['eventID']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID";
---
> 			$query = "SELECT display, tag from $events_table, $eventtypes_table WHERE eventID = \"{$prow['eventID']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID";
93c97
< 			$event = $erow['description'] ? $erow['description'] : $prow['eventID'];
---
> 			$event = $erow['display'] ? getEventDisplay($erow['display']) : $prow['tag'];
109c113
< 	$albumlinktext = "<table cellpadding=\"4\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"whiteback\">\n";
---
> 	$albumlinktext = "<table cellpadding=\"4\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tfixed whiteback\">\n";
117a122
> if( !isset($tnggallery) ) $tnggallery = "";
120d124
< 	if( !$tngconfig['thumbcols'] ) $tngconfig['thumbcols'] = 10;
121a126
> 	if( !isset($wherestr) ) $wherestr = "";
130a136
> if( !isset($offset) ) $offset = 0;
170c176
< $query = "SELECT DISTINCT $media_table.mediaID, albumlinkID, $media_table.description, $media_table.notes, thumbpath, alwayson, usecollfolder, mediatypeID, path, form, abspath, newwindow, $media_table.gedcom
---
> $query = "SELECT DISTINCT $media_table.mediaID, albumlinkID, $media_table.description, $media_table.notes, thumbpath, alwayson, usecollfolder, mediatypeID, path, form, abspath, newwindow, $media_table.gedcom, private
213c219
< $toplinks .= $allow_admin && $allow_edit ? "<a href=\"{$cms['tngpath']}" . "admin_editalbum.php?albumID=$albumID&amp;cw=1\" target=\"_blank\" class=\"snlink\">&raquo; {$text['editalbum']}</a> " : "";
---
> $toplinks .= $allow_admin && $allow_edit ? "<a href=\"{$cms['tngpath']}" . "admin_editalbum.php?albumID=$albumID&amp;cw=1\" target=\"blank\" class=\"snlink\">&raquo; {$text['editalbum']}</a> " : "";
225c231
< 	$header = "<tr><td class=\"fieldnameback\">&nbsp;</td>\n";
---
> 	$header = "<tr><td class=\"fieldnameback\" style=\"width:15px\">&nbsp;</td>\n";
233c239
< $header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" $tablewidth class=\"whiteback normal\">\n" . $header;
---
> $header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" $tablewidth class=\"tfixed whiteback normal\">\n" . $header;
245,246c251,252
< 		$families_table.living as fliving, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder,
< 		$medialinks_table.gedcom, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID, reponame, deathdate, burialdate, linktype
---
> 		$families_table.living as fliving, $families_table.private as fprivate, familyID, husband, wife, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, nameorder, people.title,
> 		$medialinks_table.gedcom, $sources_table.title as stitle, $sources_table.sourceID, $repositories_table.repoID, reponame, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, burialdate, linktype
257c263
< 	$foundprivate = 0;
---
> 	$foundprivate = $row['private'] && !$allow_private;
306c312
< 				$sourcetext = $prow['title'] ? $prow['title'] : $text['source'] . ": " . $prow['sourceID'];
---
> 				$sourcetext = $prow['stitle'] ? $prow['stitle'] : $text['source'] . ": " . $prow['sourceID'];
332c338,340
< 	$showAlbumInfo = $row['allow_living'] = $row['alwayson'] || (!$foundprivate && !$foundliving);
---
> 	$row['allow_living'] = !$foundliving;
> 	$row['allow_private'] = !$foundprivate;
> 	$showAlbumInfo = $row['alwayson'] || (!$foundprivate && !$foundliving);
345,346c353,354
< 	if( $row['allow_living'] || !$nonamesloc ) {
< 		$description = $showAlbumInfo ? "<a href=\"$href\">{$row['description']}</a>" : $row['description'];
---
> 	if( ($row['allow_living'] && $row['allow_private']) || !$nonamesloc ) {
> 		$description = $showAlbumInfo ? "<a href=\"$href\" class=\"media-title\">{$row['description']}</a>" : "<span class=\"media-title\">{$row['description']}</span>";
351c359
< 		$description = $text['living'];
---
> 		$description = "<span class=\"media-title\">{$text['living']}</span>";
354c362
< 	if( $row['status'] ) $notes = $text['status'] . ": " . $row['status'] . $notes;
---
> 	if( !empty($row['status']) ) $notes = $text['status'] . ": " . $row['status'] . $notes;
361,369c369,371
< 			if( $firstrow ) {
< 				$firstrow = 0;
< 				$mediatext .= "<tr>";
< 			}
< 			else if( ($i - 1 ) % $tngconfig['thumbcols'] == 0 ) {
< 				$mediatext .= "</tr>\n<tr>";
< 			}
< 			$mediatext .= "<td valign=\"top\" class=\"databack\" style=\"padding:10px\" align=\"center\">";
< 			$mediatext .= $href ? "<a href=\"$href\">$imgsrc</a></td>\n" : "$imgsrc</td>\n";
---
> 			$mediatext .= "<div class=\"databack gallery\" align=\"center\">";
> 			$mediatext .= $href ? "<a href=\"$href\">$imgsrc</a>\n" : "$imgsrc\n";
> 			$mediatext .= "</div>";
411c413
< if($firsthref && $sitever != "mobile")
---
> if($firsthref && $sitever != "mobile" && !$tngconfig['ssdisabled'])
diff -r TNG/showcfg.php TNG1403/showcfg.php
12,13c12,13
< include  'subroot.php';
< include $subroot.'config.php';
---
> //include  'subroot.php';
> //include $subroot.'config.php';
37d36
<    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
diff -r TNG/show_dna_test.php TNG1403/show_dna_test.php
1,271c1,323
< <?php
< $textpart = "dna";
< include("tng_begin.php");
< 
< if(!$testID) {header( "Location: thispagedoesnotexist.html" ); exit;}
< 
< include($cms['tngpath'] . "personlib.php" );
< 
< $getperson_url = getURL( "getperson", 1 );
< $show_dna_test_url = getURL( "show_dna_test", 1 );
< $placesearch_url = getURL( "placesearch", 1 );
< $familygroup_url = getURL( "familygroup", 1 );
< 
< $flags['imgprev'] = true;
< 
< $firstsection = 1;
< $firstsectionsave = "";
< $tableid = "";
< $cellnumber = 0;
< 
< $query = "SELECT * FROM $dna_tests_table WHERE testID = \"$testID\"";
< $result = tng_query($query);
< $dnarow = tng_fetch_assoc($result);
< if( !tng_num_rows($result) ) {
< 	tng_free_result($result);
< 	header( "Location: thispagedoesnotexist.html" );
< 	exit;
< }
< tng_free_result($result);
< 
< $testnum = ($allow_edit || $showtestnumbers) ? "{$dnarow['test_number']}" : "";
< $headline = "{$text['dna_test']}: {$dnarow['test_type']} $testnum";
< $logstring = "<a href=\"$show_dna_test_url" . "testID=$testID\">$headline</a>";
< writelog($logstring);
< preparebookmark($logstring);
< 
< $flags['tabs'] = $tngconfig['tabs'];
< tng_header( $headline, $flags );
< ?>
< 
< <h1 class="header"><span class="headericon" id="dna-hdr-icon"></span><?php echo $headline; ?></h1><br class="clearleft" />
< <?php
< $dnatext = "";
< $dnatext .= "<ul class=\"nopad\">\n";
< $dnatext .= beginSection("info");
< $dnatext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
< $dnatext .= "<col class=\"labelcol\"/><col style=\"width:{$datewidth}px\"/><col/>\n";
< 
< if($dnarow['test_type'] == "atDNA") $test_type = "atDNA (Autosomal)";
< elseif($dnarow['test_type'] == "mtDNA") $test_type = "mtDNA (Mitochondrial)";
< else
< 	$test_type = $dnarow['test_type'];
< 
< if($dnarow['personID']) {
< 	$dna_pers_result = getPersonSimple($dnarow['gedcom'], $dnarow['personID']);
< 	$dprow = tng_fetch_assoc($dna_pers_result);
< 	$dna_righttree = checktree($dnarow['gedcom']);
< 	$dna_rightbranch = $dna_righttree ? checkbranch($prow['branch']) : false;
< 	$dprights = determineLivingPrivateRights($dprow, $dna_righttree, $dna_rightbranch);
< 	$dprow['allow_living'] = $dprights['living'];
< 	$dprow['allow_private'] = $dprights['private'];
< 	$dna_namestr = getName( $dprow );
< 	$dna_namestr = "<a href=\"$getperson_url" . "personID={$dnarow['personID']}&tree={$dnarow['gedcom']}\">$dna_namestr</a>";
< 	if ($dnarow['private_dna'] && !$allow_edit) $dna_namestr = $admtext['text_private'];
< 	tng_free_result($dna_pers_result);
< } 
< else {
< 	$person_name = $dnarow['person_name'];
< 	$dna_namestr = ($dnarow['private_dna'] && !$allow_edit) ? $admtext['text_private'] : $person_name;
< }
< 
< $dnatext .= showEvent( array( "text"=>$text['takenby'], "fact"=>$dna_namestr ) );
< 
< if($dnarow['test_date'] && $dnarow['test_date'] != "0000-00-00") {
< 	$test_date = formatInternalDate($dnarow['test_date']);
< 	if ($dprights['both'])
< 		$dnatext .= showEvent( array( "text"=>$text['test_date'], "fact"=>$test_date ) );
< }
< 
< if( $dnarow['vendor'] )
< 	$dnatext .= showEvent( array( "text"=>$admtext['vendor'], "fact"=>$dnarow['vendor'] ) );
< 
< $dnatext .= showEvent( array( "text"=>$text['test_type'], "fact"=>$test_type ) );
< if ($dnarow['test_number'] && ($allow_edit || $showtestnumbers))
< $dnatext .= showEvent( array( "text"=>$text['test_number'], "fact"=>$dnarow['test_number'] ) );
<         $dnagroup = $dnarow['dna_group'];
< 	$dscquery = "SELECT description FROM $dna_groups_table WHERE dna_group='$dnagroup'";
< 	$dscresult = tng_query($dscquery);
<         $dscrow = tng_fetch_assoc( $dscresult );
<         tng_free_result($dscresult);
< 	$group = $dnagroup ? $dscrow['description'] : $text['none'];
< if( $dnarow['dna_group'] )
< 	$dnatext .= showEvent( array( "text"=>$text['testgroup'], "fact"=>$group ) );
< if($dnarow['MD_ancestorID']) {
< 	$dna_pers_result = getPersonData($dnarow['gedcom'], $dnarow['MD_ancestorID']);
< 	$ancrow = tng_fetch_assoc($dna_pers_result);
< 	$dna_righttree = checktree($dnarow['gedcom']);
< 	$dna_rightbranch = $dna_righttree ? checkbranch($prow['branch']) : false;
< 	$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
< 	$ancrow['allow_living'] = $dprights['living'];
< 	$ancrow['allow_private'] = $dprights['private'];
< 	$vitalinfo = getBirthInfo($ancrow);
< 	$anc_namestr = getName( $ancrow );
< 	$anc_namestr = "<a href=\"$getperson_url" . "personID={$dnarow['MD_ancestorID']}&tree={$dnarow['gedcom']}\">$anc_namestr</a>" . $vitalinfo;
< 
< 	tng_free_result($dna_pers_result);
< 
<         $ancestor_str = ($dnarow['test_type'] == "atDNA") ? $admtext['mrca'] : $admtext['mda'];
< 	$dnatext .= showEvent( array( "text"=>$admtext['mda'], "fact"=>$anc_namestr ) );
< }
< if($dnarow['MRC_ancestorID']) {
< 	if ($dnarow['MRC_ancestorID'][0] == $tngconfig['personprefix']) {
< 		$dna_mrca_result = getPersonData($dnarow['gedcom'], $dnarow['MRC_ancestorID']);
< 		$ancrow = tng_fetch_assoc($dna_mrca_result);
< 		$dna_righttree = checktree($dnarow['gedcom']);
< 		$dna_rightbranch = $dna_righttree ? checkbranch($prow['branch']) : false;
< 		$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
< 		$ancrow['allow_living'] = $dprights['living'];
< 		$ancrow['allow_private'] = $dprights['private'];
< 		$vitalinfo = getBirthInfo($ancrow);
< 		$anc_namestr = getName( $ancrow );
< 		$anc_namestr = "<a href=\"$getperson_url" . "personID={$dnarow['MRC_ancestorID']}&tree={$dnarow['gedcom']}\">$anc_namestr</a>" . $vitalinfo;
< 
< 		tng_free_result($dna_mrca_result);
< 
< 		$dnatext .= showEvent( array( "text"=>$admtext['mrca'], "fact"=>$anc_namestr ) );
< 	}
< 	else if ($dnarow['MRC_ancestorID'][0] == $tngconfig['familyprefix']) {
< 		$query = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$dnarow['MRC_ancestorID']}\" AND gedcom = \"{$dnarow['gedcom']}\"";
< 		$result = tng_query($query);
< 		$famrow = tng_fetch_assoc($result);
< 		tng_free_result($result);
< 
< 		$righttree = checktree($dnarow['gedcom']);
< 		$rightbranch = checkbranch($famrow['branch']);
< 		$rights = determineLivingPrivateRights($famrow, $righttree, $rightbranch);
< 		$famrow['allow_living'] = $rights['living'];
< 		$famrow['allow_private'] = $rights['private'];
< 
< 		$famname = getFamilyName( $famrow );
< 		$anc_namestr = "<a href=\"$familygroup_url" . "familyID={$dnarow['MRC_ancestorID']}&tree={$dnarow['gedcom']}\">$famname</a>";
< 		$anc_namestr = $text['family'] . ": " . "<a href=\"$familygroup_url" . "familyID={$dnarow['MRC_ancestorID']}&tree={$dnarow['gedcom']}\">$famname</a>";
< 		$dnatext .= showEvent( array( "text"=>$admtext['mrca'], "fact"=>$anc_namestr ) );
< 	}
< }
< 
< if( $dnarow['markers'] )
< 	$dnatext .= showEvent( array( "text"=>$admtext['markers'], "fact"=>$dnarow['markers'] ) );
< if( $dnarow['y_results'] ) {
< 	$dnatext .= "<tr>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">" . nl2br($admtext['marker_values']) . "&nbsp;</td>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"databack resultscol\" colspan=\"2\">{$dnarow['y_results']}</td>\n";
< 	$dnatext .= "</tr>\n";
< }
< if( $dnarow['haplogroup'] ) {
< 	if( $dnarow['confirmed'] )
< 		$dnarow['haplogroup'] = "<span class='confirmed_haplogroup'>" . $dnarow['haplogroup'] . " - " .$text['confirmed'] . "</span>";
< 	else 
< 		$dnarow['haplogroup'] = "<span class='predicted_haplogroup'>" . $dnarow['haplogroup'] . " - " .$text['predicted'] . "</span>";
< 	$dnatext .= showEvent( array( "text"=>$admtext['haplo'], "fact"=>$dnarow['haplogroup'] ) );
< 	}
< if( $dnarow['significant_snp'] )
< 	$dnatext .= showEvent( array( "text"=>$admtext['signsnp'], "fact"=>$dnarow['significant_snp'] ) );
< if( $dnarow['terminal_snp'] )
< 	$dnatext .= showEvent( array( "text"=>$admtext['termsnp'], "fact"=>$dnarow['terminal_snp'] ) );
< if( $dnarow['ref_seq'] ){
<         $fact = $dnarow['ref_seq'] == "rsrs" ? $admtext['rsrs'] : $admtext['rcrs'];
< 	$dnatext .= showEvent( array( "text"=>$admtext['ref_seq'], "fact"=>$fact ) );
< }
< if( $dnarow['hvr1_results'] )
< 	$dnatext .= showEvent( array( "text"=>$admtext['hvr1_values'], "fact"=>$dnarow['hvr1_results'] ) );
< if( $dnarow['hvr2_results'] )
< 	$dnatext .= showEvent( array( "text"=>$admtext['hvr2_values'], "fact"=>$dnarow['hvr2_results'] ) );
< if( $dnarow['xtra_mut'] )
< 	$dnatext .= showEvent( array( "text"=>$admtext['xtra_mut'], "fact"=>$dnarow['xtra_mut'] ) );
< if( $allow_admin && $dnarow['coding_reg'] )
< 	$dnatext .= showEvent( array( "text"=>$admtext['coding_reg'], "fact"=>$dnarow['coding_reg'] ) );
< if( $dnarow['surnames'] ) {
< 	$dnarow['surnames'] = $ancsurnameupper ? strtoupper($dnarow['surnames']) : $dnarow['surnames'];
< 	$dnatext .= showEvent( array( "text"=>$admtext['ancestral_surnames'], "fact"=>$dnarow['surnames'] ) );
< }
< 
< if( $dnarow['urls'] ) {
< 	$urls = showLinks($dnarow['urls']);
< 	if($urls) $urls = "<ul>$urls</ul>";
< 	$dnatext .= "<tr>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">{$text['links']}&nbsp;</td>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\">$urls</td>\n";
< 	$dnatext .= "</tr>\n";
< }
< //urls
< if( $dnarow['medialinks'] ) {
< 	$medialinks = showMediaLinks($dnarow['medialinks']);
< 	$dnatext .= "<tr>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">{$admtext['medialinks']}&nbsp;</td>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\">$medialinks</td>\n";
< 	$dnatext .= "</tr>\n";
< }
< if($dnarow['notes']) {
< 	$dnatext .= "<tr>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">" . nl2br($text['notes']) . "&nbsp;</td>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\"><div class=\"notearea\">{$dnarow['notes']}</div></td>\n";
< 	$dnatext .= "</tr>\n";
< }
< if($allow_admin && $dnarow['admin_notes']) {
< 	$dnatext .= "<tr>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">" . nl2br($admtext['admin_notes']) . "&nbsp;</td>\n";
< 	$dnatext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\"><div class=\"notearea resultscol\">{$dnarow['admin_notes']}</div></td>\n";
< 	$dnatext .= "</tr>\n";
< }
< 
< if( $soffset ) {
< 	$soffsetstr = "$soffset, ";
< 	$newsoffset = $soffset + 1;
< }
< else {
< 	$soffsetstr = "";
< 	$newsoffset = 0;
< }
< 
< $query = "SELECT $dna_links_table.personID, lastname, lnprefix, firstname, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, 
< 		deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, 
< 		IF(birthdatetr !='0000-00-00',birthdatetr,altbirthdatetr) as birth, 
< 		IF(deathdatetr !='0000-00-00',deathdatetr,burialdatetr) as death, 
< 		prefix, suffix, nameorder, $dna_links_table.gedcom, branch, living, private 
< 	FROM $dna_links_table, $people_table 
< 	WHERE testID = \"$testID\" AND $dna_links_table.personID = $people_table.personID AND $dna_links_table.gedcom = $people_table.gedcom
< 	ORDER BY birth DESC, lastname, firstname LIMIT $soffsetstr" . ($maxsearchresults + 1);
< $presult = tng_query($query);
< $numrows = tng_num_rows( $presult );
< if(!$numrows) $rightbranch = true;
< 
< $dnalinktext = "";
< while( $prow = tng_fetch_assoc( $presult ) ) {
< 	if( $dnalinktext ) $dnalinktext .= "\n";
< 	$righttree = checktree($prow['gedcom']);
< 	$rightbranch = $righttree ? checkbranch($prow['branch']) : false;
< 	$rights = determineLivingPrivateRights($prow, $righttree, $rightbranch);
< 	$prow['allow_living'] = $rights['living'];
< 	$prow['allow_private'] = $rights['private'];
< 	$vitalinfo = $rights['both'] ? getBirthInfo($prow) : "";
< 	$name = "<a href=\"$getperson_url" . "personID={$prow['personID']}&amp;tree={$prow['gedcom']}\">" . getName( $prow ) . "</a>" . $vitalinfo;
< 	if ($dnarow['private_dna'] && !$allow_edit && ($prow['personID'] == $dnarow['personID'])) $name = $admtext['text_private'];
< 	$dnalinktext .= $name;
< }
< if( $numrows >= $maxsearchresults ) 
< 	$dnalinktext .= "\n[<a href=\"$show_dna_test_url" . "testID=$testID&amp;foffset=$foffset&amp;soffset=" . ($newsoffset + $maxsearchresults) . "\">{$text['morelinks']}</a>]";
< tng_free_result( $presult );
< 
< if( $dnalinktext )
< 	$dnatext .= showEvent( array( "text"=>$text['indlinked'], "fact"=>$dnalinktext ) );
< 
< $dnatext .= "</table>\n";
< $dnatext .= "<br/>\n";
< $dnatext .= endSection("info");
< 
< $dnatext .= "</ul>\n";
< 
< $innermenu = "<span class=\"lightlink3\" id=\"tng_plink\">{$text['test_info']}</span>\n";
< 
< $emailaddr = "";
< echo tng_menu( "D", "dna", $testID, $innermenu );
< ?>	
< 
< <?php
< 	echo $dnatext;
< ?>
< <br />
< 
< <?php
< tng_footer( $flags );
---
> <?php
> $textpart = "dna";
> include("tng_begin.php");
> 
> if(!$testID) {header( "Location: thispagedoesnotexist.html" ); exit;}
> 
> include($cms['tngpath'] . "personlib.php" );
> 
> $getperson_url = getURL( "getperson", 1 );
> $show_dna_test_url = getURL( "show_dna_test", 1 );
> $placesearch_url = getURL( "placesearch", 1 );
> $familygroup_url = getURL( "familygroup", 1 );
> 
> $flags['imgprev'] = true;
> 
> $firstsection = 1;
> $firstsectionsave = "";
> $tableid = "";
> $cellnumber = 0;
> $testID = !empty($testID) ? cleanIt($testID) : "";
> if(!isset($tngconfig['scrollnotes'])) $tngconfig['scrollnotes'] = 1;
> $notearea = $tngconfig['scrollnotes'] ? " class=\"notearea\"" : "";
> 
> $query = "SELECT * FROM $dna_tests_table WHERE testID = \"$testID\"";
> $result = tng_query($query);
> $dnarow = tng_fetch_assoc($result);
> if( !tng_num_rows($result) || ($dnarow['private_test'] && !$allow_private) ) {
> 	header( "Location: thispagedoesnotexist.html" );
> 	exit;
> }
> 
> $testnum = ($allow_edit || $showtestnumbers) ? htmlspecialchars($dnarow['test_number']) : "";
> $headline = $text['dna_test'] . ": " . $dnarow['test_type'] . " " . $testnum;
> $logstring = "<a href=\"$show_dna_test_url" . "testID=$testID\">$headline</a>";
> writelog($logstring);
> preparebookmark($logstring);
> 
> tng_header( $headline, $flags );
> ?>
> 
> <h1 class="header"><span class="headericon" id="dna-hdr-icon"></span><?php echo $headline; ?></h1><br class="clearleft" />
> <?php
> $datewidth = 0;
> $dnatext = "";
> $dnatext .= "<ul class=\"nopad\">\n";
> $dnatext .= beginSection("info");
> $dnatext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
> $dnatext .= "<col class=\"labelcol\"/><col style=\"width:{$datewidth}px\"/><col />\n";
> 
> if($dnarow['test_type'] == "atDNA") $test_type = "atDNA (Autosomal)";
> elseif($dnarow['test_type'] == "mtDNA") $test_type = "mtDNA (Mitochondrial)";
> else
> 	$test_type = $dnarow['test_type'];
> 
> if($dnarow['personID']) {
> 	$dna_pers_result = getPersonSimple($dnarow['gedcom'], $dnarow['personID']);
> 	$dprow = tng_fetch_assoc($dna_pers_result);
> 	$dna_righttree = checktree($dprow['gedcom']);
> 	$dna_rightbranch = $dna_righttree ? checkbranch($dprow['branch']) : false;
> 	$dprights = determineLivingPrivateRights($dprow, $dna_righttree, $dna_rightbranch);
> 	$dprow['allow_living'] = $dprights['living'];
> 	$dprow['allow_private'] = $dprights['private'];
> 	$dna_namestr = getName( $dprow );
> 	$dna_namestr = "<a href=\"$getperson_url" . "personID={$dnarow['personID']}&amp;tree={$dnarow['gedcom']}\">$dna_namestr</a>";
> 	if ($dnarow['private_dna'] && !$allow_edit) $dna_namestr = $admtext['text_private'];
> 	tng_free_result($dna_pers_result);
> }
> else {
> 	$person_name = htmlspecialchars($dnarow['person_name']);
> 	$dna_namestr = ($dnarow['private_dna'] && !$allow_edit) ? $admtext['text_private'] : $person_name;
> 	$dprights['both'] = false;
> }
> 
> $dnatext .= showEvent( array( "text"=>$text['takenby'], "fact"=>$dna_namestr, "event"=>"", "type"=>"D", "entity"=>"" ) );
> 
> if( $dnarow['private_test'] && $allow_private )
> 	$dnatext .= showEvent( array( "text"=>$text['keep_test_private'], "fact"=>$admtext['yes'], "event"=>"", "type"=>"D", "entity"=>"" ) );
> if($dnarow['test_date'] && $dnarow['test_date'] != "0000-00-00") {
> 	$test_date = formatInternalDate($dnarow['test_date']);
> 	if (isset($dprights['both']))
> 		$dnatext .= showEvent( array( "text"=>$text['test_date'], "fact"=>$test_date, "event"=>"", "type"=>"D", "entity"=>"" ) );
> }
> if($dnarow['match_date'] && $dnarow['match_date'] != "0000-00-00") {
> 	$match_date = formatInternalDate($dnarow['match_date']);
> 	if($dprights['both'])
> 		$dnatext .= showEvent( array( "text"=>$admtext['match_date'], "fact"=>$match_date, "event"=>"", "type"=>"D", "entity"=>"" ) );
> }
> 
> if( $dnarow['vendor'] )
> 	$dnatext .= showEvent( array( "text"=>$admtext['vendor'], "fact"=>htmlspecialchars($dnarow['vendor']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> 
> $dnatext .= showEvent( array( "text"=>$text['test_type'], "fact"=>$test_type, "event"=>"", "type"=>"D", "entity"=>"" ) );
> if ($dnarow['test_number'] && ($allow_edit || $showtestnumbers))
> 	$dnatext .= showEvent( array( "text"=>$text['test_number'], "fact"=>htmlspecialchars($dnarow['test_number']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> $dnagroup = $dnarow['dna_group'];
> $dscquery = "SELECT description FROM $dna_groups_table WHERE dna_group='$dnagroup'";
> $dscresult = tng_query($dscquery);
> $dscrow = tng_fetch_assoc( $dscresult );
> tng_free_result($dscresult);
> $group = $dnagroup ? htmlspecialchars($dscrow['description']) : $text['none'];
> if( $dnarow['dna_group'] )
> 	$dnatext .= showEvent( array( "text"=>$text['testgroup'], "fact"=>$group, "event"=>"", "type"=>"D", "entity"=>"" ) );
> if($dnarow['GEDmatchID'] ) {
> 	if($dprights['both']) {
> 		$GEDmatch_str = "<a href=\"https://www.gedmatch.com/\" target=\"_blank\">" . htmlspecialchars($dnarow['GEDmatchID']) . "</a>";
> 		$dnatext .= showEvent( array( "text"=>$admtext['gedmatchID'], "fact"=>$GEDmatch_str, "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	}
> }
> if($dnarow['MD_ancestorID']) {
> 	$dna_pers_result = getPersonData($dnarow['gedcom'], $dnarow['MD_ancestorID']);
> 	$ancrow = tng_fetch_assoc($dna_pers_result);
> 	$dna_righttree = checktree($ancrow['gedcom']);
> 	$dna_rightbranch = $dna_righttree ? checkbranch($ancrow['branch']) : false;
> 	$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
> 	$ancrow['allow_living'] = $dprights['living'];
> 	$ancrow['allow_private'] = $dprights['private'];
> 	$vitalinfo = getBirthInfo($ancrow);
> 	$anc_namestr = getName( $ancrow );
> 	$anc_namestr = "<a href=\"$getperson_url" . "personID={$dnarow['MD_ancestorID']}&amp;tree={$dnarow['gedcom']}\">$anc_namestr</a>" . $vitalinfo;
> 
> 	tng_free_result($dna_pers_result);
> 
> 	$ancestor_str = ($dnarow['test_type'] == "atDNA") ? $admtext['mrca'] : $admtext['mda'];
> 	$dnatext .= showEvent( array( "text"=>$admtext['mda'], "fact"=>$anc_namestr, "event"=>"", "type"=>"D", "entity"=>"" ) );
> }
> if($dnarow['MRC_ancestorID']) {
> 	if ($dnarow['MRC_ancestorID'][0] == $tngconfig['personprefix']) {
> 		$dna_mrca_result = getPersonData($dnarow['gedcom'], $dnarow['MRC_ancestorID']);
> 		$ancrow = tng_fetch_assoc($dna_mrca_result);
> 		$dna_righttree = checktree($ancrow['gedcom']);
> 		$dna_rightbranch = $dna_righttree ? checkbranch($ancrow['branch']) : false;
> 		$dprights = determineLivingPrivateRights($ancrow, $dna_righttree, $dna_rightbranch);
> 		$ancrow['allow_living'] = $dprights['living'];
> 		$ancrow['allow_private'] = $dprights['private'];
> 		$vitalinfo = getBirthInfo($ancrow);
> 		$anc_namestr = getName( $ancrow );
> 		$anc_namestr = "<a href=\"$getperson_url" . "personID={$dnarow['MRC_ancestorID']}&amp;tree={$dnarow['gedcom']}\">$anc_namestr</a>" . $vitalinfo;
> 
> 		tng_free_result($dna_mrca_result);
> 
> 		$dnatext .= showEvent( array( "text"=>$admtext['mrca'], "fact"=>$anc_namestr, "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	}
> 	else if ($dnarow['MRC_ancestorID'][0] == $tngconfig['familyprefix']) {
> 		$query = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"{$dnarow['MRC_ancestorID']}\" AND gedcom = \"{$dnarow['gedcom']}\"";
> 		$result = tng_query($query);
> 		$famrow = tng_fetch_assoc($result);
> 		tng_free_result($result);
> 
> 		$righttree = checktree($dnarow['gedcom']);
> 		$rightbranch = checkbranch($famrow['branch']);
> 		$rights = determineLivingPrivateRights($famrow, $righttree, $rightbranch);
> 		$famrow['allow_living'] = $rights['living'];
> 		$famrow['allow_private'] = $rights['private'];
> 
> 		$famname = getFamilyName( $famrow );
> 		$anc_namestr = "<a href=\"$familygroup_url" . "familyID={$dnarow['MRC_ancestorID']}&amp;tree={$dnarow['gedcom']}\">$famname</a>";
> 		$anc_namestr = $text['family'] . ": " . "<a href=\"$familygroup_url" . "familyID={$dnarow['MRC_ancestorID']}&amp;tree={$dnarow['gedcom']}\">$famname</a>";
> 		$dnatext .= showEvent( array( "text"=>$admtext['mrca'], "fact"=>$anc_namestr, "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	}
> }
> 
> if( $dnarow['markers'] )
> 	$dnatext .= showEvent( array( "text"=>$admtext['markers'], "fact"=>htmlspecialchars($dnarow['markers']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> if( $dnarow['y_results'] ) {
> 	$dnatext .= "<tr>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">" . nl2br($admtext['marker_values']) . "&nbsp;</td>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"databack resultscol\" colspan=\"2\">" . htmlspecialchars($dnarow['y_results']) . "</td>\n";
> 	$dnatext .= "</tr>\n";
> }
> if( $dnarow['ydna_haplogroup'] ) {
> 	if( $dnarow['ydna_confirmed'] )
> 		$dnarow['haplogroup'] = "<span class='confirmed_haplogroup'>" . htmlspecialchars($dnarow['ydna_haplogroup']) . " - " . $text['confirmed'] . "</span>";
> 	else
> 		$dnarow['ydna_haplogroup'] = "<span class='predicted_haplogroup'>" . htmlspecialchars($dnarow['ydna_haplogroup']) . " - " . $text['predicted'] . "</span>";
> 	$dnatext .= showEvent( array( "text"=>$admtext['ydna_haplogroup'] , "fact"=>$dnarow['ydna_haplogroup'], "event"=>"", "type"=>"D", "entity"=>"" ) );
> }
> if( $dnarow['mtdna_haplogroup'] ) {
> 	if( $dnarow['mtdna_confirmed'] )
> 		$dnarow['haplogroup'] = "<span class='confirmed_haplogroup'>" . htmlspecialchars($dnarow['mtdna_haplogroup']) . " - " . $text['confirmed'] . "</span>";
> 	else
> 		$dnarow['mtdna_haplogroup'] = "<span class='predicted_haplogroup'>" . htmlspecialchars($dnarow['mtdna_haplogroup']) . " - " . $text['predicted'] . "</span>";
> 	$dnatext .= showEvent( array( "text"=>$admtext['mtdna_haplogroup'], "fact"=>$dnarow['mtdna_haplogroup'], "event"=>"", "type"=>"D", "entity"=>"" ) );
> }
> if( $dnarow['significant_snp'] )
> 	$dnatext .= showEvent( array( "text"=>$admtext['signsnp'], "fact"=>htmlspecialchars($dnarow['significant_snp']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> if( $dnarow['terminal_snp'] )
> 	$dnatext .= showEvent( array( "text"=>$admtext['termsnp'], "fact"=>htmlspecialchars($dnarow['terminal_snp']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> if( $dnarow['ref_seq'] ){
> 	$fact = $dnarow['ref_seq'] == "rsrs" ? $admtext['rsrs'] : $admtext['rcrs'];
> 	$dnatext .= showEvent( array( "text"=>$admtext['ref_seq'], "fact"=>$fact, "event"=>"", "type"=>"D", "entity"=>"" ) );
> }
> if( $dnarow['hvr1_results'] )
> 	$dnatext .= showEvent( array( "text"=>$admtext['hvr1_values'], "fact"=>htmlspecialchars($dnarow['hvr1_results']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> if( $dnarow['hvr2_results'] )
> 	$dnatext .= showEvent( array( "text"=>$admtext['hvr2_values'], "fact"=>htmlspecialchars($dnarow['hvr2_results']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> if( $dnarow['xtra_mut'] )
> 	$dnatext .= showEvent( array( "text"=>$admtext['xtra_mut'], "fact"=>htmlspecialchars($dnarow['xtra_mut']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> if( $allow_admin && $dnarow['coding_reg'] )
> 	$dnatext .= showEvent( array( "text"=>$admtext['coding_reg'], "fact"=>htmlspecialchars($dnarow['coding_reg']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> if( $allow_admin ) {
> 	if( $dnarow['shared_cMs'] ) {
> 		$total_shared = $admtext['shared centimorgans'] ."  " . htmlspecialchars($dnarow['shared_cMs']);
> 		if ($dnarow['shared_segments'])
> 			$total_shared .= " | " . htmlspecialchars($dnarow['shared_segments']) . " " . $admtext['shared_segments'];
> 		else
> 			$total_shared .= "";
> 		$dnatext .= showEvent( array( "text"=>$admtext['shared_dna'], "fact"=>$total_shared, "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	}
> 	if( $dnarow['chromosome'] && $dnarow['centiMorgans']) {
> 		$segment = $admtext['chromosome'] . "  " . htmlspecialchars($dnarow['chromosome']) . "  | " . htmlspecialchars($dnarow['centiMorgans']) . "  " . $admtext['centiMorgans'] . " ";
> 		$dnatext .= showEvent( array( "text"=>$admtext['largest_segment'], "fact"=>$segment, "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	}
> 	if( $dnarow['segment_start'] )
> 		$dnatext .= showEvent( array( "text"=>$admtext['segment_start'], "fact"=>htmlspecialchars($dnarow['segment_start']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	if( $dnarow['segment_end'] )
> 		$dnatext .= showEvent( array( "text"=>$admtext['segment_end'], "fact"=>htmlspecialchars($dnarow['segment_end']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	if( $dnarow['matching_SNPs'] )
> 		$dnatext .= showEvent( array( "text"=>$admtext['matchingSNPs'], "fact"=>htmlspecialchars($dnarow['matching_SNPs']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	if( $dnarow['relationship_range'] )
> 		$dnatext .= showEvent( array( "text"=>$admtext['relationship_range'], "fact"=>htmlspecialchars($dnarow['relationship_range']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	if( $dnarow['suggested_relationship'] )
> 		$dnatext .= showEvent( array( "text"=>$admtext['suggested_relationship'], "fact"=>htmlspecialchars($dnarow['suggested_relationship']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	if( $dnarow['actual_relationship'] )
> 		$dnatext .= showEvent( array( "text"=>$admtext['actual_relationship'], "fact"=>htmlspecialchars($dnarow['actual_relationship']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	if( $dnarow['related_side'] )
> 		$dnatext .= showEvent( array( "text"=>$admtext['related_side'], "fact"=>htmlspecialchars($dnarow['related_side']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> 	if( $dnarow['x_match'] )
> 		$dnatext .= showEvent( array( "text"=>$admtext['xmatch'], "fact"=>$admtext['yes'], "event"=>"", "type"=>"D", "entity"=>"" ) );
> }
> if( $dnarow['surnames'] ) {
> 	$dnarow['surnames'] = !empty($ancsurnameupper) ? strtoupper($dnarow['surnames']) : $dnarow['surnames'];
> 	$dnatext .= showEvent( array( "text"=>$admtext['ancestral_surnames'], "fact"=>htmlspecialchars($dnarow['surnames']), "event"=>"", "type"=>"D", "entity"=>"" ) );
> }
> 
> if( $dnarow['urls'] ) {
> 	$urls = showLinks(htmlspecialchars($dnarow['urls']));
> 	if($urls) $urls = "<ul>$urls</ul>";
> 	$dnatext .= "<tr>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">{$text['links']}&nbsp;</td>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\">$urls</td>\n";
> 	$dnatext .= "</tr>\n";
> }
> //urls
> if( $dnarow['medialinks'] ) {
> 	$medialinks = showMediaLinks(addslashes($dnarow['medialinks']));
> 	$dnatext .= "<tr>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">{$admtext['medialinks']}&nbsp;</td>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\">$medialinks</td>\n";
> 	$dnatext .= "</tr>\n";
> }
> if($dnarow['notes']) {
> 	$dnatext .= "<tr>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">" . nl2br($text['notes']) . "&nbsp;</td>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\"><div{$notearea}>" . $dnarow['notes'] . "</div></td>\n";
> 	$dnatext .= "</tr>\n";
> }
> if($allow_admin && $dnarow['admin_notes']) {
> 	$dnatext .= "<tr>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"fieldnameback fieldname\">" . nl2br($admtext['admin_notes']) . "&nbsp;</td>\n";
> 	$dnatext .= "<td valign=\"top\" class=\"databack\" colspan=\"2\"><div{$notearea}>" . $dnarow['admin_notes'] . "</div></td>\n";
> 	$dnatext .= "</tr>\n";
> }
> 
> if( isset( $soffset )) {
> 	$soffsetstr = "$soffset, ";
> 	$newsoffset = $soffset + 1;
> }
> else {
> 	$soffsetstr = "";
> 	$newsoffset = 0;
> }
> 
> $query = "SELECT $dna_links_table.personID, lastname, lnprefix, firstname, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace,
> 		deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace,
> 		IF(birthdatetr !='0000-00-00',birthdatetr,altbirthdatetr) as birth,
> 		IF(deathdatetr !='0000-00-00',deathdatetr,burialdatetr) as death,
> 		prefix, suffix, nameorder, title, $dna_links_table.gedcom, branch, living, private
> 	FROM $dna_links_table, $people_table
> 	WHERE testID = \"$testID\" AND $dna_links_table.personID = $people_table.personID AND $dna_links_table.gedcom = $people_table.gedcom
> 	ORDER BY birth DESC, lastname, firstname LIMIT $soffsetstr" . ($maxsearchresults + 1);
> $presult = tng_query($query);
> $numrows = tng_num_rows( $presult );
> if(!$numrows) $rightbranch = true;
> 
> $dnalinktext = "";
> while( $prow = tng_fetch_assoc( $presult ) ) {
> 	if( $dnalinktext ) $dnalinktext .= "\n";
> 	$righttree = checktree($prow['gedcom']);
> 	$rightbranch = $righttree ? checkbranch($prow['branch']) : false;
> 	$rights = determineLivingPrivateRights($prow, $righttree, $rightbranch);
> 	$prow['allow_living'] = $rights['living'];
> 	$prow['allow_private'] = $rights['private'];
> 	$vitalinfo = $rights['both'] ? getBirthInfo($prow) : "";
> 	$name = "<a href=\"$getperson_url" . "personID={$prow['personID']}&amp;tree={$prow['gedcom']}\">" . getName( $prow ) . "</a>" . $vitalinfo;
> 	if ($dnarow['private_dna'] && !$allow_edit && ($prow['personID'] == $dnarow['personID'])) $name = $admtext['text_private'];
> 	$dnalinktext .= $name;
> }
> if( $numrows >= $maxsearchresults )
> 	$dnalinktext .= "\n[<a href=\"$show_dna_test_url" . "testID=$testID&amp;foffset=$foffset&amp;soffset=" . ($newsoffset + $maxsearchresults) . "\">{$text['morelinks']}</a>]";
> tng_free_result( $presult );
> 
> if( $dnalinktext )
> 	$dnatext .= showEvent( array( "text"=>$text['indlinked'], "fact"=>$dnalinktext, "event"=>"", "type"=>"D", "entity"=>"" ) );
> 
> $dnatext .= "</table>\n";
> $dnatext .= "<br/>\n";
> $dnatext .= endSection("info");
> 
> $dnatext .= "</ul>\n";
> 
> $innermenu = "<span class=\"lightlink3\" id=\"tng_plink\">{$text['test_info']}</span>\n";
> 
> $emailaddr = "";
> echo tng_menu( "D", "dna", $testID, $innermenu );
> ?>
> 
> <?php
> 	echo $dnatext;
> ?>
> <br />
> 
> <?php
> tng_footer( $flags );
diff -r TNG/showlog.php TNG1403/showlog.php
11c11
< if($cms['events']){include('cmsevents.php'); cms_logs();}
---
> if(isset($cms['events'])){include('cmsevents.php'); cms_logs();}
20c20
< $logxml_url  = getURL("ajx_logxml",0);
---
> $logxml_url  = getURL("ajx_logxml",1);
23c23
< if( $autorefresh )
---
> if( isset($autorefresh) )
31,32c31,33
< if( $autorefresh )
< 	echo "<p class=\"normal\"><a href=\"$showlog_url" . "autorefresh=0\">{$text['refreshoff']}</a></p>\n";
---
> echo treeDropdown(array('startform' => true, 'endform' => true, 'action' => 'showlog', 'method' => 'get', 'name' => 'form1', 'id' => 'form1'));
> if(isset( $autorefresh ))
> 	echo "<p class=\"normal\"><a href=\"$showlog_url" . "tree={$tree}\">{$text['refreshoff']}</a></p>\n";
34c35
< 	echo "<p class=\"normal\"><a href=\"$showlog_url" . "autorefresh=1\">{$text['autorefresh']}</a></p>\n";
---
> 	echo "<p class=\"normal\"><a href=\"$showlog_url" . "autorefresh=1&amp;tree={$tree}\">{$text['autorefresh']}</a></p>\n";
37a39
> 	<table class="rounded-table" cellspacing="1">
39d40
< if( !$autorefresh) {
42c43,52
< 		echo "$line<br/>\n";
---
> 		if(strpos($line, "<script") === false) {
> 			if(empty($tree) || strpos($line,"tree=$tree\"") !== false || strpos($line,"tree=$tree&") !== false || strpos($line,"tree=") === false) {
> 				if(strpos($line,"<tr>") !== 0)
> 					echo "<tr><td colspan=\"3\" class=\"databack\">$line</td></tr>\n";
> 				else
> 					echo "$line\n";
> 			}
> 		}
> 		else
> 			echo "<tr><td colspan=\"3\" class=\"databack\">" . htmlspecialchars($line) . "<strong>Please investigate this access</strong></td></tr>\n";
44d53
< }
45a55
> 	</table>
49c59
< if( $autorefresh ) {
---
> if(isset( $autorefresh )) {
53c63
<  	var loader1 = new net.ContentLoader('<?php echo $logxml_url ?>',FillPage,null,"POST",'');
---
>  	var loader1 = new net.ContentLoader('<?php echo $logxml_url . "tree={$tree}"?>',FillPage,null,"POST",'');
62c72
< refreshPage();
---
> var timer = setTimeout("refreshPage()",30000);
diff -r TNG/showmap.php TNG1403/showmap.php
31c31
< if( $offset ) {
---
> if(!empty($offset)) {
75c75,76
< $size = @GetImageSize( "$rootpath$headstonepath/" . $cemetery['maplink'] );
---
> $mcharsetstr = "&amp;oe=$session_charset";
> $chartlink = "<img src=\"{$cms['tngpath']}img/Chart.gif\" class=\"chartimg\" alt=\"\" />";
77,78c78,86
< if( $map['key'] && $isConnected)
<     $flags['scripting'] .= "<script type=\"text/javascript\" src=\"{$http}://maps.googleapis.com/maps/api/js?language={$text['glang']}$mapkeystr\"></script>\n";
---
> if( !empty($cemetery['maplink']) && file_exists("$rootpath$headstonepath/" . $cemetery['maplink']) )
> 	$size = GetImageSize( "$rootpath$headstonepath/" . $cemetery['maplink'] );
> else
> 	$size = false;
> 
> if( $map['key'] && $isConnected) {
> 	if( !isset($flags['scripting']) ) $flags['scripting'] = "";
> 	$flags['scripting'] .= "<script type=\"text/javascript\" src=\"{$http}://maps.googleapis.com/maps/api/js?language={$text['glang']}$mapkeystr\"></script>\n";
> }
90,91c98,99
< 	if( $cemetery['maplink'] )
< 		$infoblock .= "<img src=\"$headstonepath/{$cemetery['maplink']}\" border=\"0\" $size[3] alt=\"{$cemetery['cemname']}\" /><br/><br/>\n";
---
> 	if( !empty($cemetery['maplink']) && file_exists("$rootpath$headstonepath/" . $cemetery['maplink']) )
> 		$infoblock .= "<img src=\"$headstonepath/{$cemetery['maplink']}\" style=\"max-width: 100%; height: auto;\" alt=\"{$cemetery['cemname']}\" /><br/><br/>\n";
94c102
< 		$infoblock .= "<p><a href=\"{$cms['tngpath']}" . "admin_editcemetery.php?cemeteryID=$cemeteryID&amp;cw=1\" target=\"_blank\" class=\"snlink\">{$text['editcem']}</a></p>\n";
---
> 		$infoblock .= "<p><a href=\"{$cms['tngpath']}" . "admin_editcemetery.php?cemeteryID=$cemeteryID&amp;cw=1\" target=\"blank\" class=\"snlink\">{$text['editcem']}</a></p>\n";
118,119c126,127
< 			$codednotes .= "<br /><br /><a href=\"{$http}://maps.google.com/maps?f=q{$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($remoteballoontext)\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $localballooncemeteryname";
< 			$locations2map[$l2mCount] = array("zoom"=>$zoom,"lat"=>$lat,"long"=>$long,"pinplacelevel"=>$pinplacelevel,"htmlcontent"=>"<div class=\"mapballoon normal\">$localballooncemeteryname<br />$localballooncemeteryplace$codednotes</div>");
---
> 			$codednotes .= "<br /><br /><a href=\"{$http}://maps.google.com/maps?f=q&amp;hl={$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($remoteballoontext)\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $localballooncemeteryname";
> 			$cempin = array("zoom"=>$zoom,"lat"=>$lat,"long"=>$long,"pinplacelevel"=>$pinplacelevel,"htmlcontent"=>"<div class=\"mapballoon normal\">$localballooncemeteryname<br />$localballooncemeteryplace$codednotes</div>");
121,124c129
< 			$body .= "<a href=\"{$http}://www.openstreetmap.org/#map=$zoom/$lat/$long\" target=\"_blank\"><img src=\"{$cms['tngpath']}img/Openstreetmap_logo_small.png\"> OpenStreetMap</a><br /><br />"; // add external link to Google Maps for Directions in the balloon
< 			$body .= "<div style=\"padding-bottom:15px\"><a href=\"{$http}://maps.google.com/maps?f=q{$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($remoteballoontext)&amp;z=$zoom&amp;om=1&amp;iwloc=addr\" target=\"_blank\"><img src=\"{$cms['tngpath']}google_marker.php?image=$pinplacelevel2.png&amp;text=1\" alt=\"\" border=\"0\" /></a>";
< 			$map['pins']++;
< 	        $body .= "<span><strong>{$text['latitude']}:</strong> $lat, <strong>{$text['longitude']}:</strong> $long</span></div>";
---
> 			$body .= "<div style=\"padding-bottom:15px\"><span><strong>{$text['latitude']}:</strong> $lat, <strong>{$text['longitude']}:</strong> $long</span> | <a href=\"{$http}://maps.google.com/maps?f=q&amp;hl={$text['glang']}$mcharsetstr&amp;daddr=$lat,$long($remoteballoontext)\" target=\"_blank\">{$text['getdirections']}</a>{$text['directionsto']} $localballooncemeteryname</div>";
132c137,138
< $query = "SELECT mediaID, thumbpath, description, notes, usecollfolder, mediatypeID, path, form, abspath, newwindow from $media_table WHERE cemeteryID = \"$cemeteryID\" AND (mediatypeID != \"headstones\" OR linktocem = \"1\") ORDER BY description";
---
> $index_all = 0;
> $query = "SELECT mediaID, thumbpath, description, notes, usecollfolder, mediatypeID, path, form, abspath, private, newwindow from $media_table WHERE cemeteryID = \"$cemeteryID\" AND (mediatypeID != \"headstones\" OR linktocem = \"1\") ORDER BY description";
140c146
< 	$body .= "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback\" width=\"100%\">\n";
---
> 	$body .= "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback tfixed\" width=\"100%\">\n";
145a152,154
> 		$hs['allow_living'] = 1;
> 		$hs['allow_private'] = !$hs['private'] || $allow_private;
> 
148,151c157,164
< 		$description = $hs['description'];
< 		$notes = nl2br($hs['notes']);
< 
< 		$hs['allow_living'] = $hs['allow_private'] = 1;
---
> 		if($hs['allow_private']) {
> 			$description = $hs['description'];
> 			$notes = nl2br($hs['notes']);
> 		}
> 		else {
> 			$description = $text['livingphoto'];
> 			$notes = "";
> 		}
157c170
< 		$body .= "<td valign=\"top\" class=\"databack\" width=\"$thumbmaxw\">";
---
> 		$body .= "<td valign=\"top\" class=\"databack\" align=\"center\" width=\"$thumbmaxw\">";
186c199
< $query = "SELECT DISTINCT $media_table.mediaID, description, notes, path, thumbpath, status, plot, showmap, usecollfolder, mediatypeID, latitude, longitude, form, abspath, newwindow
---
> $query = "SELECT DISTINCT $media_table.mediaID, description, notes, path, thumbpath, status, plot, showmap, usecollfolder, mediatypeID, latitude, longitude, zoom, form, abspath, newwindow
188c201
< 	WHERE cemeteryID = \"$cemeteryID\"$typeclause $wherestr AND mediatypeID = \"headstones\" AND linktocem != \"1\" ORDER BY description LIMIT $newoffset" . $maxsearchresults;
---
> 	WHERE cemeteryID = \"$cemeteryID\" $wherestr AND mediatypeID = \"headstones\" AND linktocem != \"1\" ORDER BY description LIMIT $newoffset" . $maxsearchresults;
197c210
< 		$query = "SELECT count(DISTINCT $media_table.mediaID) as hscount FROM $media_table LEFT JOIN $medialinks_table on $media_table.mediaID = $medialinks_table.mediaID WHERE cemeteryID = \"$cemeteryID\"$typeclause $wherestr AND linktocem != \"1\"";
---
> 		$query = "SELECT count(DISTINCT $media_table.mediaID) as hscount FROM $media_table LEFT JOIN $medialinks_table on $media_table.mediaID = $medialinks_table.mediaID WHERE cemeteryID = \"$cemeteryID\" $wherestr AND linktocem != \"1\"";
211c224
< 	$tabledef = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback\" ";
---
> 	$tabledef = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback\" ";
220c233
< 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"whiteback\">\n" . $header;
---
> 		$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"thfixed whiteback\">\n" . $header;
240c253
< 		$query = "SELECT medialinkID, $medialinks_table.personID as personID, people.personID as personID2, familyID, people.living as living, people.private as private, people.branch as branch,
---
> 		$query = "SELECT medialinkID, $medialinks_table.personID as personID, people.personID as personID2, familyID, people.living as living, people.private as private, people.branch as branch, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr,
242c255
< 			people.prefix as prefix, people.suffix as suffix, nameorder, $medialinks_table.gedcom as gedcom, treename, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID,reponame, deathdate, burialdate, linktype
---
> 			people.prefix as prefix, people.suffix as suffix, nameorder, people.title as title, $medialinks_table.gedcom as gedcom, treename, $sources_table.title as stitle, $sources_table.sourceID, $repositories_table.repoID,reponame, deathdate, burialdate, linktype
284c297
< 				$sourcetext = $prow['title'] ? "{$text['source']}: {$prow['title']}" : "{$text['source']}: {$prow['sourceID']}";
---
> 				$sourcetext = $prow['stitle'] ? "{$text['source']}: {$prow['stitle']}" : "{$text['source']}: {$prow['sourceID']}";
325,326c338,371
< 			if($hs['plot']) $body .= "<br />";
< 			$body .= "{$text['latitude']}: {$hs['latitude']}, {$text['longitude']}: {$hs['longitude']}";
---
> 			$pin_num = $map['pins'] + 1;
> 			$coords = "$pin_num. {$text['latitude']}: {$hs['latitude']}, {$text['longitude']}: {$hs['longitude']}";
> 			if($hs['plot']) {
> 				$body .= "<br />";
> 				$hs['plot'] .= " | $coords";
> 			}
> 			else
> 				$hs['plot'] = $coords;
> 			$body .= $coords;
> 
> 			$balloondesc = @htmlspecialchars($description, ENT_QUOTES, $session_charset);
> 			//$balloonnotes = @htmlspecialchars($notes, ENT_QUOTES, $session_charset);
> 			$balloonnotes = tng_real_escape_string($notes);
> 			$balloonloc = @htmlspecialchars($hs['plot'], ENT_QUOTES, $session_charset);
> 			$balloonloc = tng_real_escape_string($balloonloc);
> 			$escaped_imgsrc = str_replace("'","\'",$imgsrc);
> 			$escaped_imgsrc = str_replace("\n","",$escaped_imgsrc);
> 			$locations2map[$l2mCount] = array(
> 				"placelevel"=>2,
> 				"pinplacelevel"=>$pinplacelevel2,
> 				"event"=>$text['headstonefor'],
> 				"htmlcontent"=>"<div class=\"mapballoon normal\">$escaped_imgsrc<strong><p>$balloondesc</strong></p><p>$balloonnotes</p><p>$balloonloc</p></div>",
> 				"lat"=>$hs['latitude'],
> 				"long"=>$hs['longitude'],
> 				"zoom"=>$hs['zoom'],
> 				"place"=>$description,
> 				"notes"=>truncateIt($notes,600),
> 				//"eventdate"=>"date",
> 				"description"=>$description,
> 				"fixedplace"=>$balloondesc
> 			);
> 			$l2mCount++;
> 			$map['pins']++;
> 			$index_all++;
349c394
< 		$tabledef = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" ";
---
> 		$tabledef = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw thfixed whiteback\" ";
383c428
< 			$placetxt = $row['burialplace'] . " <a href=\"$placesearch_url" . "tree=$tree&amp;psearch=" . urlencode( $row['burialplace'] ) . "\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\"></a>";
---
> 			$placetxt = $row['burialplace'] . " <a href=\"$placesearch_url" . "tree=$tree&amp;psearch=" . urlencode( $row['burialplace'] ) . "\" title=\"{$text['findplaces']}\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" border=\"0\" alt=\"{$text['findplaces']}\" width=\"9\" height=\"9\"></a>";
404,405c449,455
< if($map['key'] && $map['pins'])
< 	echo "<div id=\"map\" class=\"rounded10 cemmap\"></div>\n";
---
> if($map['key'] && ($cemcoords || $map['pins'])) {
> 	echo "<div id=\"map\" style=\"width: {$map['hstw']}; height: {$map['hsth']};\" class=\"rounded10 cemmap\"></div>\n";
> 	if($cemcoords && empty($map['pins'])) {
> 		$locations2map[$l2mCount] = $cempin;
> 		$map['pins'] = 1;
> 	}
> }
diff -r TNG/showmedialib.php TNG1403/showmedialib.php
20c20
< 		$iptc = iptcparse( $info['APP13'] );
---
> 		$iptc = isset($info['APP13']) ? iptcparse( $info['APP13'] ) : false;
35c35
< 						$keytext = $text[$newkey] ? $text[$newkey] : $key;
---
> 						$keytext = !empty($text[$newkey]) ? $text[$newkey] : $key;
39c39
< 							$fact = utf8_decode($fact);
---
> 							$fact = mb_convert_encoding($fact, 'ISO-8859-1', 'UTF-8');
43c43
< 							$fact = utf8_encode($fact);
---
> 							$fact = mb_convert_encoding($fact, 'UTF-8', 'ISO-8859-1');
69c69
< 		$query = "SELECT $media_table.mediaID, albumlinkID, ordernum, path, map, description, notes, width, height, datetaken, placetaken, owner, alwayson, abspath, usecollfolder, status, plot, cemeteryID, showmap, bodytext, form, newwindow, usenl, latitude, longitude, mediatypeID, gedcom
---
> 		$query = "SELECT $media_table.mediaID, albumlinkID, ordernum, path, map, description, notes, width, height, datetaken, placetaken, owner, alwayson, private, abspath, usecollfolder, status, plot, cemeteryID, showmap, bodytext, form, newwindow, usenl, latitude, longitude, mediatypeID, gedcom
85,87c85,87
< 		$mediasearch = $_SESSION['tng_mediasearch'];
< 		$tnggallery = $_SESSION['tng_gallery'];
< 		if( (!$requirelogin || !$treerestrict || !$assignedtree) && $_SESSION['tng_mediatree'] )
---
> 		$mediasearch = isset($_SESSION['tng_mediasearch']) ? $_SESSION['tng_mediasearch'] : "";
> 		$tnggallery = isset($_SESSION['tng_gallery']) ? $_SESSION['tng_gallery'] : "";
> 		if( (!$requirelogin || !$treerestrict || !$assignedtree) && !empty($_SESSION['tng_mediatree']) )
104,105c104,108
< 		if( $mediasearch )
< 			$wherestr .= " AND ($media_table.description LIKE \"%$mediasearch%\" OR $media_table.notes LIKE \"%$mediasearch%\" OR bodytext LIKE \"%$mediasearch%\")";
---
> 		if($mediasearch) {
> 			if( empty($mediasearch2) )
> 				$mediasearch2 = addslashes(cleanIt($mediasearch));
> 			$wherestr .= " AND ($media_table.description LIKE \"%$mediasearch%\" OR $media_table.notes LIKE \"%$mediasearch%\" OR bodytext LIKE \"%$mediasearch%\" OR owner LIKE \"%$mediasearch2%\")";
> 		}
111c114
< 		$query = "SELECT DISTINCT $media_table.mediaID, path, map, description, notes, width, height, datetaken, placetaken, owner, alwayson, abspath, usecollfolder, status, plot, cemeteryID, showmap, bodytext, form, newwindow, usenl, latitude, longitude, mediatypeID, gedcom 
---
> 		$query = "SELECT DISTINCT $media_table.mediaID, path, map, description, notes, width, height, datetaken, placetaken, owner, alwayson, private, abspath, usecollfolder, status, plot, cemeteryID, showmap, bodytext, form, newwindow, usenl, latitude, longitude, mediatypeID, gedcom 
127c130
< 		$query = "SELECT medialinkID, path, map, description, notes, altdescription, altnotes, width, height, datetaken, placetaken, owner, ordernum, alwayson, abspath, $media_table.mediaID as mediaID, usecollfolder, status, plot, cemeteryID, showmap, bodytext, form, newwindow, usenl, latitude, longitude, mediatypeID, $medialinks_table.gedcom
---
> 		$query = "SELECT medialinkID, path, map, description, notes, altdescription, altnotes, width, height, datetaken, placetaken, owner, ordernum, alwayson, private, abspath, $media_table.mediaID as mediaID, usecollfolder, status, plot, cemeteryID, showmap, bodytext, form, newwindow, usenl, latitude, longitude, mediatypeID, $media_table.gedcom
158,159c161,162
< 	$query = "SELECT $medialinks_table.medialinkID, $medialinks_table.personID as personID, $medialinks_table.gedcom as gedcom, linktype, people.living as living, people.private as private, people.branch as branch,
< 		$families_table.branch as fbranch, $families_table.living as fliving, $families_table.private as fprivate
---
> 	$query = "SELECT $medialinks_table.medialinkID, $medialinks_table.personID as personID, $medialinks_table.gedcom as gedcom, linktype, people.living as living, people.private as private, people.branch as branch, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr,
> 		$families_table.branch as fbranch, $families_table.living as fliving, $families_table.private as fprivate, $families_table.husband, $families_table.wife, $families_table.familyID
182c185
< 		if( !$prow['living'] && !$prow['private'] && $prow['linktype'] == 'I') {
---
> 		if( !$prow['living'] && !$prow['private'] && ($prow['linktype'] == '' || $prow['linktype'] == 'C')) {
184c187
< 				WHERE $citations_table.sourceID = '{$prow['personID']}' AND $citations_table.persfamID = $people_table.personID AND $citations_table.gedcom = $people_table.gedcom
---
> 				WHERE $citations_table.citationID = '{$prow['personID']}' AND $citations_table.persfamID = $people_table.personID AND $citations_table.gedcom = $people_table.gedcom
216,217c219,222
< 	$pagenum = ceil($page/$maxsearchresults);
< 	$pagenam = "";
---
> 	
> 	$pagenam = $pagenav = $prevlink = $firstlink = $lastlink = $nextlink = "";
> 	$maxresultsfactor = $tnggallery ? $maxsearchresults * 2 : $maxsearchresults;
> 	$pagenum = ceil($page/$maxresultsfactor);
221c226
< 			$pagenav .= "<a href=\"{$cms['tngpath']}admin_editmedia.php?mediaID=$mediaID&amp;cw=1\" target=\"_blank\" class=\"snlink\">&raquo; {$text['editmedia']}</a> &nbsp;&nbsp;&nbsp;";
---
> 			$pagenav .= "<a href=\"{$cms['tngpath']}admin_editmedia.php?mediaID=$mediaID&amp;cw=1\" target=\"blank\" class=\"snlink\">&raquo; {$text['editmedia']}</a> &nbsp;&nbsp;&nbsp;";
224c229
< 			$offset = floor( $page / $maxsearchresults ) * $maxsearchresults;
---
> 			$offset = floor( $page / $maxresultsfactor ) * $maxresultsfactor;
228c233
< 			$offset = floor( $page / $maxsearchresults ) * $maxsearchresults;
---
> 			$offset = floor( $page / $maxresultsfactor ) * $maxresultsfactor;
304c309
< 	global $assignedtree, $showmedia_url, $showrepo_url, $showsource_url, $getperson_url, $familygroup_url, $placesearch_url, $tngconfig;
---
> 	global $assignedtree, $showmedia_url, $showrepo_url, $showsource_url, $getperson_url, $familygroup_url, $placesearch_url, $tngconfig, $citations_table;
314,318c319,323
< 	$query = "SELECT $medialinks_table.medialinkID, $medialinks_table.personID as personID, people.burialtype, people.living as living, people.private as private, people.branch as branch, $medialinks_table.eventID, 
< 		$families_table.branch as fbranch, $families_table.living as fliving, $families_table.private as fprivate, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, people.nameorder, altdescription, altnotes, $medialinks_table.gedcom,
< 		familyID, people.personID as personID2, wifepeople.personID as wpersonID, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname,
< 		wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, husbpeople.personID as hpersonID, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname,
< 		husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, $sources_table.title, $sources_table.sourceID, $repositories_table.repoID, reponame
---
> 	$query = "SELECT $medialinks_table.medialinkID, $medialinks_table.personID as personID, people.burialtype, people.living as living, people.private as private, people.branch as branch, $medialinks_table.eventID,
> 		$families_table.branch as fbranch, $families_table.living as fliving, $families_table.private as fprivate, people.lastname as lastname, people.lnprefix as lnprefix, people.firstname as firstname, people.prefix as prefix, people.suffix as suffix, people.nameorder, people.title, altdescription, altnotes, $medialinks_table.gedcom,
> 		people.birthdate, people.birthdatetr, people.altbirthdate, people.altbirthdatetr, people.deathdate, people.deathdatetr, familyID, people.personID as personID2, wifepeople.personID as wpersonID, wifepeople.personID as wife, wifepeople.firstname as wfirstname, wifepeople.lnprefix as wlnprefix, wifepeople.lastname as wlastname,
> 		wifepeople.prefix as wprefix, wifepeople.suffix as wsuffix, husbpeople.personID as hpersonID, husbpeople.personID as husband, husbpeople.firstname as hfirstname, husbpeople.lnprefix as hlnprefix, husbpeople.lastname as hlastname,
> 		husbpeople.prefix as hprefix, husbpeople.suffix as hsuffix, $sources_table.title as stitle, $sources_table.sourceID, $repositories_table.repoID, reponame, linktype
326c331
< 		WHERE mediaID = \"$mediaID\"$wherestr2 AND linktype!=\"C\" ORDER BY people.lastname, people.lnprefix, people.firstname, hlastname, hlnprefix, hfirstname  LIMIT $ioffsetstr" . ($maxsearchresults + 1);
---
> 		WHERE mediaID = \"$mediaID\"$wherestr2 ORDER BY people.lastname, people.lnprefix, people.firstname, hlastname, hlnprefix, hfirstname  LIMIT $ioffsetstr" . ($maxsearchresults + 1);
331,332c336,338
< 	while( $count < $maxsearchresults && $prow = tng_fetch_assoc( $presult ) )
< 	{
---
> 	$citelinks = array();
> 	$need_semicolon = false;
> 	while( $count < $maxsearchresults && $prow = tng_fetch_assoc( $presult ) ) {
336c342,343
< 		if( $medialinktext ) $medialinktext .= "; ";
---
> 		if( $need_semicolon ) $medialinktext .= "; ";
> 		$need_semicolon = true;
347c354
< 			$sourcetext = $prow['title'] ? $prow['title'] : $text['source']. ": " . $prow['sourceID'];
---
> 			$sourcetext = $prow['stitle'] ? $prow['stitle'] : $text['source']. ": " . $prow['sourceID'];
357a365,402
> 		elseif( !$prow['linktype'] || $prow['linktype'] == "C") {
> 			$query = "SELECT persfamID, sourceID, gedcom from $citations_table WHERE citationID = \"{$prow['personID']}\"";
> 			$cresult = tng_query($query);
> 			$need_semicolon = false;
> 			if($cresult) {
> 				$crow = tng_fetch_assoc($cresult);
> 				if($crow) {
> 					$persfamID = $crow['persfamID'];
> 					if(!in_array($persfamID, $citelinks)) {
> 						$citelinks[] = $persfamID;
> 						if(substr($persfamID,0,1) == $tngconfig['personprefix'] || substr($persfamID,-1) == $tngconfig['personsuffix']) {
> 							$medialinktext .= "<a href=\"$getperson_url" . "personID=$persfamID&amp;tree={$crow['gedcom']}\">";
> 							$presult2 = getPersonSimple($prow['gedcom'],$persfamID);
> 							if($presult2) {
> 								$cprow = tng_fetch_assoc($presult2);
> 								$cprights = determineLivingPrivateRights($cprow);
> 								$cprow['allow_living'] = $cprights['living'];
> 								$cprow['allow_private'] = $cprights['private'];
> 								$medialinktext .= getName( $cprow ) . "</a>";
> 								$need_semicolon = true;
> 								tng_free_result($presult2);
> 							}
> 						}
> 						elseif(substr($persfamID,0,1) == $tngconfig['familyprefix'] || substr($persfamID,-1) == $tngconfig['familysuffix']) {
> 							$presult2 = getFamilyData($prow['gedcom'],$persfamID);
> 							if($presult2) {
> 								$famrow = tng_fetch_assoc($presult);
> 								$familyname = getFamilyName($famrow);
> 								$medialinktext .= "<a href=\"$familygroup_url" . "familyID=$persfamID&amp;tree={$crow['gedcom']}\">{$text['family']}: $familyname</a>";
> 								$need_semicolon = true;
> 								tng_free_result($presult2);
> 							}
> 						}
> 					}
> 				}
> 			}
> 			tng_free_result($cresult);
> 		}
369c414
< 				$event = $erow['display'] && is_numeric($prow['eventID']) ? getEventDisplay( $erow['display'] ) : ($admtext[$prow['eventID']] ? $admtext[$prow['eventID']] : $prow['eventID']);
---
> 				$event = !empty($erow['display']) && is_numeric($prow['eventID']) ? getEventDisplay( $erow['display'] ) : (!empty($admtext[$prow['eventID']]) ? $admtext[$prow['eventID']] : $prow['eventID']);
384c429
< 	global $mediatypeID, $description, $showmedia_url, $medialinkID, $albumlinkID, $mediatypes_like, $sitever;
---
> 	global $mediatypeID, $description, $showmedia_url, $medialinkID, $albumlinkID, $mediatypes_like, $sitever, $rootpath, $charset, $tngdomain;
392c437
< 		$imgrow['form'] = strtoupper($matches[1]);
---
> 		$imgrow['form'] = isset($matches[1]) ? strtoupper($matches[1]) : "";
427,428c472,473
< 				$width = $size[0];
< 				$height = $size[1];
---
> 				$width = isset($size[0]) ? $size[0] : "";
> 				$height = isset($size[1]) ? $size[1] : "";
437,438c482,483
< 					$medialinkstr = $medialinkID ? "&medialinkID=$medialinkID" : "";
< 					$albumlinkstr = $albumlinkID ? "&albumlinkID=$albumlinkID" : "";
---
> 					$medialinkstr = $medialinkID ? "&amp;medialinkID=$medialinkID" : "";
> 					$albumlinkstr = $albumlinkID ? "&amp;albumlinkID=$albumlinkID" : "";
477a523
> 						if( !isset($imgrow['medialinkID']) ) $imgrow['medialinkID'] = "";
479,480c525,540
< 					else
< 						echo "<div class=\"titlebox mediaalign\" id=\"imgdiv\"><img src=\"$mediasrc\" id=\"theimage\" border=\"0\" $mapstr alt=\"$description\" /></div>\n";
---
> 					else {
> 						$rectangles = getRectangles($imgrow['mediaID'], false);
> 						echo "<div class=\"titlebox mediaalign\"";
> 						if($rectangles) {
> 							echo " style=\"overflow: auto\"";
> 							$inner_div_beg = "<div style=\"position:relative;margin:auto;width:{$width}px;height:{$height}\">\n";
> 							$inner_div_end = "</div>\n";
> 						}
> 						else {
> 							echo " id=\"imgdiv\"";
> 							$inner_div_beg = $inner_div_end = "";
> 						}
> 						echo ">\n";
> 						echo "{$inner_div_beg}<img src=\"$mediasrc\" id=\"theimage\" border=\"0\" $mapstr alt=\"$description\" />\n{$rectangles}{$inner_div_end}";
> 						echo "</div>\n";
> 					}
506c566
< 					echo "<embed src=\"$mediasrc\"$widthstr$heightstr>\n";
---
> 					echo "<object data=\"$mediasrc\"$widthstr$heightstr>\n";
508,510c568,574
< 			elseif( in_array($imgrow['form'],$recordingtypes) ) {
< 				if(in_array($imgrow['form'],array("MP3","WAV","OGG")))
< 					echo "<audio $widthstr$heightstr controls>\n<source src=\"$mediasrc\">\n</audio>\n";
---
> 			elseif( $imgrow['form'] == "TXT" ) {
> 				echo "<p><pre style=\"word-wrap: break-word; white-space: pre-wrap;\">";
> 				$filetext=file_get_contents($rootpath.$cms['tngpath'].urldecode($mediasrc));
> 				if( $charset == "UTF-8" && !mb_check_encoding($filetext, 'UTF-8') )
> 					echo mb_convert_encoding($filetext, 'UTF-8', 'ISO-8859-1');
> 				elseif( $charset == "ISO-8859-1" && mb_check_encoding($filetext, 'UTF-8') )
> 					echo mb_convert_encoding($filetext, 'ISO-8859-1', 'UTF-8');
512c576,589
< 					echo "<embed src=\"$mediasrc\"$widthstr$heightstr>\n";
---
> 					echo $filetext;
> 				echo "</pre></p>\n";
> 			}
> 			elseif($imgrow['form'] == "PDF") {
> 				$widthstr = $imgrow['width'] ? $imgrow['width'] : "100%";
> 				$heightstr = $imgrow['height'] ? $imgrow['height'] : "700";
> 				echo "<object data=\"$mediasrc\" type=\"application/pdf\" width=\"100%\" height=\"$heightstr\"><p><a href=\"$mediasrc\">Download PDF</a></p></object>\n";
> 			}
> 			elseif($imgrow['form'] == "DOC" || $imgrow['form'] == "DOCX") {
> 				$widthstr = $imgrow['width'] ? $imgrow['width'] : "100%";
> 				$heightstr = $imgrow['height'] ? $imgrow['height'] : "700";
> 				$doc_url = substr($tngdomain,-1) == "/" ? $tngdomain . str_replace('\\', '/', $mediasrc) : $tngdomain . "/" . str_replace('\\', '/', $mediasrc);
> 				$doc_url = str_replace("'","&apos;",$doc_url);
> 				echo "<iframe src=\"https://view.officeapps.live.com/op/embed.aspx?src={$doc_url}\" align='center' width='100%' height='{$heightstr}'/>This is an embedded <a target='_blank' href='https://office.com'>Microsoft Office</a> document, powered by <a target='_blank' href='https://office.com/webapps'>Office Online</a>.</iframe>";			
523d599
< 		if($imgrow['path']) echo "<br/><br/>\n";
524a601
> 		if(!empty($imgrow['path'])) echo "<br/><br/>\n";
531c608
< 	return "<tr><td style=\"width:100px\" class=\"fieldnameback fieldname\">$label</td><td class=\"databack\">" . insertLinks($fact) . "</td></tr>\n";
---
> 	return "<tr><td style=\"width:150px\" class=\"fieldnameback fieldname\">$label</td><td class=\"databack\">" . insertLinks($fact) . "</td></tr>\n";
539c616
< 	$tabletext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" width=\"100%\" class=\"whiteback\">\n";
---
> 	$tabletext .= "<table border=\"0\" cellspacing=\"1\" cellpadding=\"4\" width=\"100%\" class=\"tfixed whiteback\">\n";
559c636
< 		if( in_array($imgrow['form'],$imagetypes) )
---
> 		if( in_array($imgrow['form'],$imagetypes) && isset($size[0]) && isset($size[1]) )
561c638,639
< 		$tabletext .= output_iptc_data( $info );
---
> 		if(isset($info))
> 			$tabletext .= output_iptc_data( $info );
606c684
< 		if( $cemetery['maplink'] && file_exists( "$rootpath$headstonepath/" . $cemetery['maplink'] ) ) {
---
> 		if( !empty($cemetery['maplink']) && file_exists("$rootpath$headstonepath/" . $cemetery['maplink']) ) {
629c707
< 			$hs['allow_living'] = 1;
---
> 			$hs['allow_living'] = $hs['allow_private'] = 1;
649a728,760
> 
> function getRectangles($mediaID, $show_at_start = true) {
> 	$result = getImageTags($mediaID);
> 
> 	$rectangles = "";
> 	while( $row = tng_fetch_assoc($result) ) {
> 		list($label, $media_link_url) = getImageTagInfo($row);
> 
> 		if($show_at_start) {
> 			$handlers = "";
> 			$more_style = "";
> 		}
> 		else {
> 			$more_style = "opacity:0;cursor:pointer";
> 			$handlers = "onmouseover=\"this.style.opacity = '1';\" onmouseout=\"this.style.opacity = toggle_off;\"";
> 			if($media_link_url) $handlers .= " onclick=\"window.location.href='{$media_link_url}'\"";
> 		}
> 		$rectangles .= "<div id=\"box_{$row['ID']}\" style=\"display:block; top:{$row['rtop']}px; left:{$row['rleft']}px; width:{$row['rwidth']}px; height:{$row['rheight']}px;{$more_style}\" $handlers class=\"mlbox bunselected\">\n";
> 		$label_top = $row['rheight'] + 1;
> 		$overhang = 100 - $row['rwidth'];
> 		if($overhang > 0) {
> 			$side = -1 * round($overhang/2);
> 			$stylestr = "left:{$side}px;right:{$side}px;"; 
> 		}
> 		else
> 			$stylestr = "";
> 		$rectangles .= "<div class=\"imagetag\" style=\"top:{$label_top}px;{$stylestr}\">{$label}</div>\n";
> 		$rectangles .= "</div>\n";
> 	}
> 	tng_free_result($result);
> 
> 	return $rectangles;
> }
diff -r TNG/showmedia.php TNG1403/showmedia.php
27,30c27,32
< $mediaID = preg_replace("/[^0-9]/", '', $mediaID);
< $medialinkID = preg_replace("/[^0-9]/", '', $medialinkID);
< $albumlinkID = preg_replace("/[^0-9]/", '', $albumlinkID);
< $cemeteryID = preg_replace("/[^0-9]/", '', $cemeteryID);
---
> $mediaID = isset($mediaID) ? preg_replace("/[^0-9]/", '', $mediaID) : "";
> $medialinkID = isset($medialinkID) ? preg_replace("/[^0-9]/", '', $medialinkID) : "";
> $albumlinkID = isset($albumlinkID) ? preg_replace("/[^0-9]/", '', $albumlinkID) : "";
> $cemeteryID = isset($cemeteryID) ? preg_replace("/[^0-9]/", '', $cemeteryID) : "";
> $tngprint = isset($tngprint) ? $tngprint : "";
> $albumID = $eventID = $personID = "";
101c103
< 			$query = "SELECT familyID, husband, wife, living, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"$personID\" AND gedcom = \"$tree\"";
---
> 			$query = "SELECT familyID, husband, wife, living, private, marrdate, gedcom, branch FROM $families_table WHERE familyID = \"$personID\" AND gedcom = \"$tree\"";
123c125
< 				$disallowgedcreate = $row['disallowgedcreate'];
---
> 				$disallowgedcreate = isset($row['disallowgedcreate']) ? $row['disallowgedcreate'] : false;
130a133,136
> if($imgrow['private'] && !$allow_private) {
> 	$livinginfo['noneprivate'] = false;
> 	$livinginfo['private'] = true;
> }
135a142,161
> if(!$tngconfig['ssdisabled'] && !$tngprint && $numitems > 1) {
> 	$sscontrols = " &nbsp;&nbsp;&nbsp; <a href=\"#\" onclick=\"return start();\" class=\"snlink\">&raquo; {$text['slidestart']}</a>\n";
> }
> else
> 	$sscontrols = "";
> 
> $imgviewer = $tngconfig['imgviewer'];
> 
> if($sitever != "mobile" && (!$imgviewer || in_array($imgrow['mediatypeID'],$mediatypes_like[$imgviewer]))) {
> 	$rquery = "SELECT count(*) as rcount FROM $image_tags_table WHERE mediaID=\"$mediaID\"";
> 	$rresult = @tng_query($rquery);
> 	$rrow = tng_fetch_assoc($rresult);
> 	$num_rects = $rrow['rcount'];
> 	if($num_rects)
> 		$sscontrols .= " &nbsp;&nbsp;&nbsp; <a href=\"#\" onclick=\"toggleRectangles();return false;\" class=\"snlink\">&raquo; {$text['toggletags']}</a>\n";
> 	tng_free_result($rresult);
> }
> else
> 	$num_rects = 0;
> 
139c165,166
< if( $noneliving || !$nonamesloc || $imgrow['alwayson'] ) {
---
> //if( $noneliving || !$nonamesloc || $imgrow['alwayson'] ) {
> if((($livinginfo['noneliving'] || !$nonames) && ($livinginfo['noneprivate'] || !$tngconfig['nnpriv'])) || $imgrow['alwayson']) {
142c169
< 	$mapnote = $info['gotmap'] ?  "<p>" . $text['mediamaptext'] . "</p>\n" : "";
---
> 	$mapnote = $info['gotmap'] || $num_rects ?  "<p>" . $text['mediamaptext'] . "</p>\n" : "";
149c176
< $mediatypeIDstr = $text[$mediatypeID] ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
---
> $mediatypeIDstr = !empty($text[$mediatypeID]) ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
164,165c191
< $flags['tabs'] = $tngconfig['tabs'];
< $flags['scripting'] .= "<link href=\"{$cms['tngpath']}css/media.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
---
> $flags['css'] = "<link href=\"{$cms['tngpath']}css/media.css?v=" . (filemtime($rootpath."css/media.css")) . "\" rel=\"stylesheet\" type=\"text/css\" />\n";
166a193
> 	if( !isset($flags['scripting']) ) $flags['scripting'] = "";
168c195
< 	$flags['scripting'] .= "<script type=\"text/javascript\">\n";
---
> 	$flags['scripting'] .= "<script type=\"text/javascript\">\n// <![CDATA[\n";
170c197
< 	$flags['scripting'] .= "</script>\n";
---
> 	$flags['scripting'] .= "//]]>\n</script>\n";
171a199,204
> 
> $imageFolder = $imgrow['usecollfolder'] ? $mediatypes_assoc[$mediatypeID] : $mediapath;
> $fixImagePath = str_replace(' ','%20',$imgrow['path']);
> $fbOGimage = "<meta property=\"og:image\" content=\"" . $tngdomain . "/" . $imageFolder . "/" . $fixImagePath . "\" />\n";
> $pageURL = $showmedia_url . "mediaID=" . $mediaID;
> 
174d206
< $imgviewer = $tngconfig['imgviewer'];
180,186c212
< $adjheight = $size['1'] - 1;
< 
< if(!$tngconfig['ssdisabled'] && !$tngprint && $numitems > 1) {
< 	$sscontrols = " &nbsp;&nbsp;&nbsp; <a href=\"#\" onclick=\"return start();\" class=\"snlink\">&raquo; {$text['slidestart']}</a>\n";
< }
< else
< 	$sscontrols = "";
---
> $adjheight = is_array($size) ? $size['1'] - 1 : -1;
188a215
> 	$years = "";
210a238
> 	if(!isset($row['sex'])) $row['sex'] = "";
224c252
<     	$titlemsg = $text[$mediatypeID] ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
---
>     	$titlemsg = !empty($text[$mediatypeID]) ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
250a279,280
> 
> 	echo "<p class=\"normal\" style=\"margin-top:2.5em\">$pagenav$sscontrols</p>";
254,255d283
< echo "<p class=\"normal\" style=\"margin-top:2.5em\">$pagenav$sscontrols</p>";
< 
261d288
<         echo "<br /><br />";
290a318
> 	if( !isset($ioffset) ) $ioffset = "";
305c333
< <div style="border:1px solid black;padding:5px;width:<?php echo $size['0']; ?>px;height:<?php echo $adjheight; ?>px">
---
> <div style="border:1px solid black;padding:5px;width:100%;height:300px">
310c338,356
< if(!$tngprint && !$tngconfig['ssdisabled']) {
---
> if(!$tngprint) {
> 	$flags['more'] = "<script type=\"text/javascript\">\n//<![CDATA[\nvar timeoutID;\nvar myslides;\nvar resumemsg='&gt; {$text['slideresume']}';;\n";
> 	if($num_rects) {
> 		$flags['more'] .= "var toggle_off = '0.0';\n";
> 		$flags['more'] .= "\nfunction toggleRectangles() {\n";
> 		$flags['more'] .= "if(toggle_off == '0.0')\n";
> 		$flags['more'] .= "toggle_off = '0.7';\n";
> 		$flags['more'] .= "else\n";
> 		$flags['more'] .= "toggle_off = '0.0';\n";
> 
> 		$imgviewer = $tngconfig['imgviewer'];
> 		if(!$imgviewer || in_array($imgrow['mediatypeID'],$mediatypes_like[$imgviewer]))
> 			$flags['more'] .= "jQuery('#iframe1').contents().find('.mlbox').css('opacity',toggle_off);\n";
> 		else
> 			$flags['more'] .= "jQuery('.mlbox').css('opacity',toggle_off);\n";
> 		$flags['more'] .= "}\n";
> 	}
> 
> 	if(!$tngconfig['ssdisabled']) {
314,335c360,381
< 	$flags['more'] = "<script type=\"text/javascript\">\n//<![CDATA[\nvar timeoutID;\nvar myslides;\nvar resumemsg='&gt; {$text['slideresume']}';;\n";
< 	$flags['more'] .= "var slidestopmsg = '&gt; {$text['slidestop']}';\n";
< 	$flags['more'] .= "var startmsg='&gt; {$text['slidestart']}';\n";
< 	$flags['more'] .= "var plussecsmsg = \"{$text['plussecs']}\";\n";
< 	$flags['more'] .= "var minussecsmsg = \"{$text['minussecs']}\";\n";
< 	$flags['more'] .= "var slidesecsmsg = \"{$text['slidesecs']}\";\n";
< 
< 	if($ss)
< 		$flags['more'] .= "jQuery(document).ready(start);\n";
< 	if($imgviewer && !in_array($imgrow['mediatypeID'],$mediatypes_like[$imgviewer])) {
< 		$flags['more'] .= "jQuery(document).ready(adjustWidth);\n";
< 		$flags['more'] .= "\nfunction adjustWidth() {\nif(jQuery('#imgdiv').length && jQuery('#theimage').width() > document.getElementById('imgdiv').clientWidth) \njQuery('#imgdiv').width(jQuery('#theimage').width() + \"px\");\n}\n";
< 	}
< 	$slideshowheader = preg_replace("/\"/", "&#34;",$slideshowheader);
< 	$flags['more'] .= $tngconfig['ssrepeat'] ? "\nrepeat = true;\n" : "\nrepeat = false;\n";
< 	$flags['more'] .= "\nfunction start() {\n";
< 	$flags['more'] .= "tnglitbox = new LITBox(\"$slideshow_url" . "mediaID=$mediaID&medialinkID=$medialinkID&albumlinkID=$albumlinkID&cemeteryID=$cemeteryID\",{width:900,height:675,title:'" . addslashes(truncateIt($slideshowheader,100)) . "',onremove:function(){tnglitbox=null;timeoutID=null;},doneLoading:startSlides});\n";
< 	$flags['more'] .= "jQuery('#slidetoggle').click(function() {stopshow();return false;});\n";
< 	$flags['more'] .= "return false;}\n";
< 	$flags['more'] .= "\nfunction startSlides() {\n";
< 	$flags['more'] .= "myslides = new Slideshow({timeout:$slidetime_micro, startingID:'$mediaID', mediaID:'$nextmediaID', medialinkID:'$nextmedialinkID', albumlinkID:'$nextalbumlinkID', cemeteryID:'$cemeteryID'});\n";
< 	$flags['more'] .= "}\n";
---
> 		$flags['more'] .= "var slidestopmsg = '&gt; {$text['slidestop']}';\n";
> 		$flags['more'] .= "var startmsg='&gt; {$text['slidestart']}';\n";
> 		$flags['more'] .= "var plussecsmsg = \"{$text['plussecs']}\";\n";
> 		$flags['more'] .= "var minussecsmsg = \"{$text['minussecs']}\";\n";
> 		$flags['more'] .= "var slidesecsmsg = \"{$text['slidesecs']}\";\n";
> 
> 		if( !empty($ss) )
> 			$flags['more'] .= "jQuery(document).ready(start);\n";
> 		if($imgviewer && !in_array($imgrow['mediatypeID'],$mediatypes_like[$imgviewer])) {
> 			$flags['more'] .= "jQuery(document).ready(adjustWidth);\n";
> 			$flags['more'] .= "\nfunction adjustWidth() {\nif(jQuery('#imgdiv').length && jQuery('#theimage').width() > document.getElementById('imgdiv').clientWidth) \njQuery('#imgdiv').width(jQuery('#theimage').width() + \"px\");\n}\n";
> 		}
> 		$slideshowheader = preg_replace("/\"/", "&#34;",$slideshowheader);
> 		$flags['more'] .= $tngconfig['ssrepeat'] ? "\nrepeat = true;\n" : "\nrepeat = false;\n";
> 		$flags['more'] .= "\nfunction start() {\n";
> 		$flags['more'] .= "tnglitbox = new LITBox(\"$slideshow_url" . "mediaID=$mediaID&medialinkID=$medialinkID&albumlinkID=$albumlinkID&cemeteryID=$cemeteryID\",{width:900,height:675,title:'" . addslashes(truncateIt($slideshowheader,100)) . "',onremove:function(){tnglitbox=null;timeoutID=null;},doneLoading:startSlides});\n";
> 		$flags['more'] .= "jQuery('#slidetoggle').click(function() {stopshow();return false;});\n";
> 		$flags['more'] .= "return false;}\n";
> 		$flags['more'] .= "\nfunction startSlides() {\n";
> 		$flags['more'] .= "myslides = new Slideshow({timeout:$slidetime_micro, startingID:'$mediaID', mediaID:'$nextmediaID', medialinkID:'$nextmedialinkID', albumlinkID:'$nextalbumlinkID', cemeteryID:'$cemeteryID'});\n";
> 		$flags['more'] .= "}\n";
> 	}
diff -r TNG/showmediaxmllib.php TNG1403/showmediaxmllib.php
9c9
< 	if(!$requirelogin || !$treerestrict || !$assignedtree) $tree = $row[gedcom];
---
> 	if(!$requirelogin || !$treerestrict || !$assignedtree) $tree = $row['gedcom'];
44a45,50
> if( !isset($personID) ) $personID = "";
> if( !isset($albumID) ) $albumID = "";
> if( !isset($albumlinkID) ) $albumlinkID = "";
> if( !isset($cemeteryID) ) $cemeteryID = "";
> if( !isset($eventID) ) $eventID = "";
> 
55a62
> $private_media = $imgrow['private'] && !$allow_private;
63c70
< if( $noneliving || !$nonamesloc || $imgrow['alwayson'] ) {
---
> if( !$private_media && ($noneliving || !$nonamesloc || $imgrow['alwayson']) ) {
68,70c75,78
< else
< 	$description = $notes = $text['living'];
< $logdesc = $nonamesloc && !$noneliving && !$imgrow['alwayson'] ? ($livinginfo['private'] ? $admtext['text_private'] : $text['living']) : $description;
---
> else {
> 	$description = $notes = ($imgrow['private'] || $livinginfo['private']) ? $admtext['text_private'] : $text['living'];
> }
> $logdesc = $description;
74c82
< $adjheight = $size[1] - 1;
---
> $adjheight = is_array($size) ? $size[1] - 1 : -1;
diff -r TNG/showrepo.php TNG1403/showrepo.php
30a31,33
> $righttree = checktree($tree);
> $rightbranch = $righttree ? true : false;
> 
36c39
< $logstring = "<a href=\"$showrepo_url" . "repoID=$repoID&amp;tree=$tree\">{$text['repo']} {$reporow['reponame']} ($repoID)</a>";
---
> $logstring = "<a href=\"$showrepo_url" . "repoID=$repoID&amp;tree=$tree\">{$text['repository']} {$reporow['reponame']} ($repoID)</a>";
40d42
< $flags['tabs'] = $tngconfig['tabs'];
51c53
< $repotext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
---
> $repotext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
56a59
> 	$reporow['age'] = $reporow['agency'] = $reporow['cause'] = "";
65c68,69
< ksort( $events );
---
> if(!$tngconfig['sortbydate'])
> 	ksort( $events );
68,69c72,73
< if( $allow_admin && $allow_edit )
< 	$repotext .= showEvent( array( "text"=>$text['repoid'], "date"=>$repoID, "place"=>"<a href=\"{$cms['tngpath']}" . "admin_editrepo.php?repoID=$repoID&amp;tree=$tree&amp;cw=1\" target=\"_blank\">{$text['edit']}</a>", "np"=>1  ) );
---
> if( $allow_admin && $allow_edit && $righttree)
> 	$repotext .= showEvent( array( "text"=>$text['repoid'], "date"=>$repoID, "place"=>"<a href=\"{$cms['tngpath']}" . "admin_editrepo.php?repoID=$repoID&amp;tree=$tree&amp;cw=1\" target=\"blank\">{$text['edit']}</a>", "np"=>1 ) );
71c75
< 	$repotext .= showEvent( array( "text"=>$text['repoid'], "date"=>$repoID  ) );
---
> 	$repotext .= showEvent( array( "text"=>$text['repoid'], "date"=>$repoID ) );
73c77
< if( $soffset ) {
---
> if( !empty($soffset) ) {
90a95
> 
92c97
< 	$repolinktext .= "\n[<a href=\"$showrepo_url" . "repoID=$repoID&amp;tree=$tree&amp;foffset=$foffset&amp;soffset=" . ($newsoffset + $maxsearchresults) . "\">{$text['moresrc']}</a>]";
---
> 	$repolinktext .= "\n[<a href=\"$showrepo_url" . "repoID=$repoID&amp;tree=$tree&amp;soffset=" . ($newsoffset + $maxsearchresults) . "\">{$text['moresrc']}</a>]";
125c130
< $innermenu = $num_collapsed ? "<div style=\"float:right\"><a href=\"#\" onclick=\"return toggleCollapsed(0)\" class=\"lightlink\">Expand all</a> &nbsp | &nbsp; <a href=\"#\" onclick=\"return toggleCollapsed(1)\" class=\"lightlink\">Collapse all</a> &nbsp;</div>" : "";
---
> $innermenu = $num_collapsed ? "<div style=\"float:right\"><a href=\"#\" onclick=\"return toggleCollapsed(0)\" class=\"lightlink\">Expand all</a> &nbsp; | &nbsp; <a href=\"#\" onclick=\"return toggleCollapsed(1)\" class=\"lightlink\">Collapse all</a> &nbsp;</div>" : "";
diff -r TNG/showreport.php TNG1403/showreport.php
40a41
> if( !isset($offset) ) $offset = 0;
51a53
> if( !isset($test) ) $test = "";
63a66
> $displaytext = "";
83c86,87
< 	for( $i = 0; $i < count( $displayfields ); $i++ ) {
---
> 	$num_displayfields = count($displayfields);
> 	for( $i = 0; $i < $num_displayfields; $i++ ) {
111,112c115,116
< 		if( !$displaymsg ) $displaymsg = $text[$dfield];
< 		if( !$displaymsg ) $displaymsg = $text[strtolower($dfield)];
---
> 		if( !$displaymsg ) $displaymsg = isset($text[$dfield]) ? $text[$dfield] : "";
> 		if( !$displaymsg ) $displaymsg = isset($text[strtolower($dfield)]) ? $text[strtolower($dfield)] : "";
114c118
< 		$displaytext .= $csv ? ($displaytext ? ",\"$displaymsg\"" : "\"$displaymsg\"") : "<td class=\"fieldnameback\"><span class=\"fieldname\"><strong>$displaymsg</strong></span></td>\n";
---
> 		$displaytext .= $csv ? ($displaytext ? ",\"$displaymsg\"" : "\"$displaymsg\"") : "<th class=\"fieldnameback\"><span class=\"fieldname\"><strong>$displaymsg</strong></span></th>\n";
156c160
< 	$displaystr = "$people_table.living, $people_table.private, lnprefix, prefix, suffix, $people_table.branch";
---
> 	$displaystr = "$people_table.living, $people_table.private, lnprefix, prefix, suffix, title, $people_table.branch, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr";
159c163,164
< 	for( $i = 0; $i < count( $displayfields ) - 1; $i++ ) {
---
> 	$num_displayfields = count( $displayfields ) - 1;
> 	for( $i = 0; $i < $num_displayfields; $i++ ) {
217,219c222,224
< 		if( !$displaymsg ) $displaymsg = $text[$dfield];
< 		if( !$displaymsg ) $displaymsg = $text[strtolower($dfield)];
< 		$displaytext .= $csv ? ($displaytext ? ",\"$displaymsg\"" : "\"$displaymsg\"") : "<td class=\"fieldnameback\"><span class=\"fieldname\"><strong>$displaymsg</strong></span></td>\n";
---
> 		if( !$displaymsg ) $displaymsg = isset($text[$dfield]) ? $text[$dfield] : "";
> 		if( !$displaymsg ) $displaymsg = isset($text[strtolower($dfield)]) ? $text[strtolower($dfield)] : "";
> 		$displaytext .= $csv ? ($displaytext ? ",\"$displaymsg\"" : "\"$displaymsg\"") : "<th class=\"fieldnameback\"><span class=\"fieldname\"><strong>$displaymsg</strong></span></th>\n";
231c236,237
< 	for( $i = 0; $i < count( $criteriafields ) - 1; $i++ ) {
---
> 	$num_criteriafields = count($criteriafields) - 1;
> 	for( $i = 0; $i < $num_criteriafields; $i++ ) {
232a239
> 		$truedate = 0;
247a255
> 			// Resolve an SQL error and the fact that this doesn't equal today, but now.
249,250c257,258
< 				if($time_offset > 0) 
< 					$criteriafields[$i] .= "DATE_ADD(NOW(), INTERVAL " . $time_offset . " HOUR)";
---
> 				if($time_offset > 0)
> 					$criteriafields[$i] = "SUBSTRING(DATE_ADD(NOW(), INTERVAL " . $time_offset . " HOUR), 1, 10)";
252c260
< 					$criteriafields[$i] .= "DATE_SUB(NOW(), INTERVAL " . $time_offset . " HOUR)";
---
> 					$criteriafields[$i] = "SUBSTRING(DATE_SUB(NOW(), INTERVAL " . $time_offset . " HOUR), 1, 10)";
255c263
< 				$criteriafields[$i] = "NOW()";
---
> 				$criteriafields[$i] = "SUBSTRING(NOW(), 1, 10)";
260a269,270
> 		else
> 			$truedate = 0;
310a321,323
> 				if( $i == 0 ) {
> 					$criteriafields[$i-1] = $criteriafields[$i];
> 				}
381c394,395
< 	for( $i = 0; $i < count( $orderbyfields ) - 1; $i++ ) {
---
> 	$num_orderbyfields = count($orderbyfields) - 1;
> 	for( $i = 0; $i < $num_orderbyfields; $i++ ) {
412c426
< 			if( in_array($orderfields[$i],$truedates) )
---
> 			if( isset($orderbyfields[$i]) && in_array($orderbyfields[$i],$truedates) )
414c428
< 			else
---
> 			else {
416,417c430,433
< 			$displaystr .= ", $newfield as yearonly$orderbyfields[$i]";
< 			$orderbystr .= "yearonly$orderbyfields[$i]";
---
> 				$orderbyfields[$i] = "";
> 			}
> 			$displaystr .= ", $newfield as yearonly{$orderbyfields[$i]}";
> 			$orderbystr .= "yearonly{$orderbyfields[$i]}";
522,523c538,541
< 		if( $totrows )
< 			echo "<p>{$text['matches']} $offsetplus {$text['to']} $numrowsplus {$text['of']} $totrows &nbsp; <a href=\"{$showreport_url}reportID=$reportID&csv=1&tree=$tree\" target=\"_blank\" class=\"snlink\">&raquo; {$text['csv']}</a></p>";
---
> 		if( $totrows ) {
> 			$csvlink = !isset($tngconfig['allowcsv']) || !$tngconfig['allowcsv'] ? "&nbsp; <a href=\"{$showreport_url}reportID=$reportID&amp;csv=1&amp;tree=$tree\" target=\"_blank\" class=\"snlink\">&raquo; {$text['csv']}</a>" : "";
> 			echo "<p>{$text['matches']} $offsetplus {$text['to']} $numrowsplus {$text['of']} $totrows{$csvlink}</p>";
> 		}
533,535c551,553
< <table cellpadding="3" cellspacing="1" border="0" class="whiteback">
< 	<tr>
< 		<td class="fieldnameback"><span class="fieldname">#</span></td>
---
> <table cellpadding="3" cellspacing="1" border="0" class="thfixed whiteback">
>    	<thead><tr>
> 		<th class="fieldnameback"><span class="fieldname">#</span></th>
540c558
< 	</tr>
---
> 	</tr></thead>
545c563
< 	$savetree = $tree;
---
> 	//$savetree = $tree;
547c565,566
< 		if(!$savetree) $tree = $row['gedcom'];
---
> 		//if(!$savetree && isset($row['gedcom'])) $tree = $row['gedcom'];
> 		if(!isset($row['sex'])) $row['sex'] = "";
559c578,579
< 		for( $i = 0; $i < count( $displayfields ) - 1; $i++ ) {
---
> 		$num_displayfields = count($displayfields) - 1;
> 		for( $i = 0; $i < $num_displayfields; $i++ ) {
565c585
< 				$data = $csv ? $namestr : showSmallPhoto( $row['personID'], $namestr, $rights['both'], 0, false, $row['sex'] ) . "<a href=\"$getperson_url" . "personID={$row['personID']}&amp;tree={$row['gedcom']}\">$namestr</a>";
---
> 				$data = $csv ? $namestr : showSmallPhoto( $row['personID'], $namestr, $rights['both'], 0, false, $row['sex'], $row['gedcom'] ) . "<a href=\"$getperson_url" . "personID={$row['personID']}&amp;tree={$row['gedcom']}\">$namestr</a>";
574c594
< 					$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, nameorder, gedcom, living, private, branch FROM $people_table WHERE personID = \"$spouseID\" AND gedcom = \"{$row['gedcom']}\"";
---
> 					$query = "SELECT lastname, lnprefix, firstname, prefix, suffix, title, nameorder, gedcom, living, private, branch, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr FROM $people_table WHERE personID = \"{$spouseID}\" AND gedcom = \"{$row['gedcom']}\"";
576c596
< 					if( $spresult ) {
---
> 					if( tng_num_rows($spresult) ) {
594c614
< 					$tempdate = $row[$thisfield];
---
> 					$tempdate = isset($row[$thisfield]) ? $row[$thisfield] : "";
599c619
< 						$rawdate = $row[$datedisp];
---
> 						$rawdate = isset($row[$datedisp]) ? $row[$datedisp] : "";
604c624
< 					$data = nl2br( $row[$thisfield] );
---
> 					$data = !is_null($row[$thisfield]) ? nl2br( $row[$thisfield] ) : "";
606c626
< 						$data .=  " <a href=\"$placesearch_url" . "{$treestr}psearch=" . urlencode($data) . "\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"\" width=\"9\" height=\"9\" /></a>";
---
> 						$data .=  " <a href=\"$placesearch_url" . "{$treestr}psearch=" . urlencode($data) . "\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" border=\"0\" alt=\"\" width=\"9\" height=\"9\" /></a>";
diff -r TNG/showsource.php TNG1403/showsource.php
42,44c42,44
< $rights = determineLivingPrivateRights($srcrow, $righttree, $rightbranch);
< $srcrow['allow_living'] = $rights['living'];
< $srcrow['allow_private'] = $rights['private'];
---
> $srcrow['allow_living'] = $allow_living;
> $srcrow['allow_private'] = $allow_private;
> $rights['both'] = $allow_living && $allow_private;
55d54
< $flags['tabs'] = $tngconfig['tabs'];
67c66
< $sourcetext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed\">\n";
---
> $sourcetext .= "<table cellspacing=\"1\" cellpadding=\"4\" class=\"whiteback tfixed normal\">\n";
70c69
< 	$sourcetext .= showEvent( array( "text"=>$text['title'], "fact"=>$srcrow['title'] ) );
---
> 	$sourcetext .= showEvent( array( "text"=>$text['title2'], "fact"=>insertLinks($srcrow['title']) ) );
72,73c71,72
< 	$sourcetext .= showEvent( array( "text"=>$text['shorttitle'], "fact"=>$srcrow['shorttitle'] ) );
< //if( $srcrow[type] ) $sourcetext .= showEvent( array( "text"=>$text[type], "fact"=>$srcrow[type] ) );
---
> 	$sourcetext .= showEvent( array( "text"=>$text['shorttitle'], "fact"=>insertLinks($srcrow['shorttitle']) ) );
> //if( $srcrow[type] ) $sourcetext .= showEvent( array( "text"=>$text['type'], "fact"=>$srcrow['type'] ) );
89c88,89
< ksort( $events );
---
> if(!$tngconfig['sortbydate'])
> 	ksort( $events );
92,93c92,93
< if( $allow_admin && $allow_edit )
< 	$sourcetext .= showEvent( array( "text"=>$text['sourceid'], "date"=>$sourceID, "place"=>"<a href=\"{$cms['tngpath']}admin_editsource.php?sourceID=$sourceID&amp;tree=$tree&amp;cw=1\" target=\"_blank\">{$text['edit']}</a>", "np"=>1  ) );
---
> if( $allow_admin && $allow_edit && $righttree )
> 	$sourcetext .= showEvent( array( "text"=>$text['sourceid'], "date"=>$sourceID, "place"=>"<a href=\"{$cms['tngpath']}admin_editsource.php?sourceID=$sourceID&amp;tree=$tree&amp;cw=1\" target=\"blank\">{$text['edit']}</a>", "np"=>1  ) );
96a97
> if( empty($ioffset) ) $ioffset = 0;
105c106,107
< if( $foffset ) {
---
> if( empty($foffset) ) $foffset = 0;
> if( !empty($foffset) ) {
114c116
< $query = "SELECT DISTINCT $citations_table.persfamID, $citations_table.gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, branch FROM $citations_table, $people_table WHERE $citations_table.persfamID = $people_table.personID AND $citations_table.gedcom = $people_table.gedcom AND $citations_table.gedcom = \"$tree\" AND $citations_table.sourceID = '$sourceID' ORDER BY lastname, firstname LIMIT $ioffsetstr" . ($maxsearchresults + 1);
---
> $query = "SELECT DISTINCT $citations_table.persfamID, $citations_table.gedcom, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, living, private, branch FROM $citations_table, $people_table WHERE $citations_table.persfamID = $people_table.personID AND $citations_table.gedcom = $people_table.gedcom AND $citations_table.gedcom = \"$tree\" AND $citations_table.sourceID = '$sourceID' ORDER BY lastname, firstname LIMIT $ioffsetstr" . ($maxsearchresults + 1);
116a119
> $total_citations = $numrows;
145a149
> $total_citations += $numrows;
157c161
< 	$sourcelinktext .= "<a href=\"$familygroup_url" . "familyID=$srow[familyID]&amp;tree={$srow['gedcom']}\">{$text['family']}: " . getFamilyName( $srow ) . "</a>";
---
> 	$sourcelinktext .= "<a href=\"$familygroup_url" . "familyID={$srow['familyID']}&amp;tree={$srow['gedcom']}\">{$text['family']}: " . getFamilyName( $srow ) . "</a>";
164c168
< 	$sourcetext .= showEvent( array( "text"=>$text['indlinked'], "fact"=>$sourcelinktext ) );
---
> 	$sourcetext .= showEvent( array( "text"=>$text['indlinked'] . " ($total_citations)", "fact"=>$sourcelinktext ) );
193c197
< $innermenu = $num_collapsed ? "<div style=\"float:right\"><a href=\"#\" onclick=\"return toggleCollapsed(0)\" class=\"lightlink\">Expand all</a> &nbsp | &nbsp; <a href=\"#\" onclick=\"return toggleCollapsed(1)\" class=\"lightlink\">Collapse all</a> &nbsp;</div>" : "";
---
> $innermenu = $num_collapsed ? "<div style=\"float:right\"><a href=\"#\" onclick=\"return toggleCollapsed(0)\" class=\"lightlink\">Expand all</a> &nbsp; | &nbsp; <a href=\"#\" onclick=\"return toggleCollapsed(1)\" class=\"lightlink\">Collapse all</a> &nbsp;</div>" : "";
diff -r TNG/showtree.php TNG1403/showtree.php
27d26
< $flags['tabs'] = $tngconfig['tabs'];
diff -r TNG/siteversion.php TNG1403/siteversion.php
3,14c3,14
< 	$ua = $_SERVER['HTTP_USER_AGENT'];
< 	$tablet = stristr($ua, 'Tablet') || stristr($ua, 'iPad') || (stristr($ua, 'Android') && !stristr($ua, 'Mobile')) || stristr($ua, 'Android 3') || stristr($ua, 'Android 4') && !stristr($ua, 'Mobile') || stristr($ua, 'Touch');
< 	$mobile = !$nomobile && (stristr($ua, 'Android') || stristr($ua, 'webOS') || stristr($ua, 'Blackberry') || stristr($ua, 'iPhone')
< 		 || stristr($ua, 'iPod') || stristr($ua, 'Kindle') || stristr($ua, 'facebookexternalhit') || stristr($ua, 'Twitterbot')
< 		 || stristr($ua, 'Pinterest') || stristr($ua, 'Silk') || stristr($ua, 'IEMobile'));
< 	if($tablet)
< 		$sitever = "tablet";
< 	else if($mobile)
< 		$sitever = "mobile";
< 	else
< 		$sitever = "standard";
< 
---
> 	$sitever = "standard";
> 	if(!empty($_SERVER['HTTP_USER_AGENT'])) {
> 		$ua = $_SERVER['HTTP_USER_AGENT'];
> 		$tablet = stristr($ua, 'Tablet') || stristr($ua, 'iPad') || (stristr($ua, 'Android') && !stristr($ua, 'Mobile')) || stristr($ua, 'Android 3') || stristr($ua, 'Android 4') && !stristr($ua, 'Mobile') || stristr($ua, 'Touch');
> 		$mobile = !$nomobile && (stristr($ua, 'Android') || stristr($ua, 'webOS') || stristr($ua, 'Blackberry') || stristr($ua, 'iPhone')
> 			 || stristr($ua, 'iPod') || stristr($ua, 'Kindle') || stristr($ua, 'facebookexternalhit') || stristr($ua, 'Twitterbot')
> 			 || stristr($ua, 'Pinterest') || stristr($ua, 'Silk') || stristr($ua, 'IEMobile'));
> 		if($tablet)
> 			$sitever = "tablet";
> 		else if($mobile)
> 			$sitever = "mobile";
> 	}
diff -r TNG/statistics.php TNG1403/statistics.php
6a7,9
> //$cachemode = 0;
> //$cachetime = 86400;
> 
36c39
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" style=\"maxwidth: 350px\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"maxwidth: 350px; width:100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
38c41
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"500\" class=\"whiteback normal\">";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"500\" class=\"thfixed whiteback normal\">";
48a52,53
> //include('cache-begin.php');
> 
52c57
< $lastimportdate = $treerow['lastimportdate'];
---
> $lastimportdate = isset($treerow['lastimportdate']) ? $treerow['lastimportdate'] : "";
102a108,113
> $query = "SELECT count(citationid) as scitcount FROM $citations_table $wherestr";
> $result =  tng_query($query);
> $row = tng_fetch_assoc( $result );
> $totalsourcecitations = number_format($row['scitcount']);
> tng_free_result($result);
> 
125c136
< $query = "SELECT personID, firstname, lnprefix, lastname, birthdate, altbirthdate, gedcom, living, private, branch
---
> $query = "SELECT personID, firstname, lnprefix, lastname, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, gedcom, living, private, branch
241c252
< 	$titlestr = $text[$mediatypeID] ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
---
> 	$titlestr = !empty($text[$mediatypeID]) ? $text[$mediatypeID] : $mediatypes_display[$mediatypeID];
254a266,268
> echo "<tr><td class=\"databack\"><span class=\"normal\">{$text['totalsourcecitations']}</span></td>\n";
> echo "<td class=\"databack\" align=\"right\"><span class=\"normal\">$totalsourcecitations &nbsp;</span></td></tr>\n";
> 
268c282
< 	if(substr($lastimport,11,8) != "00:00:00")
---
> 	if(substr($lastimportdate,11,8) != "00:00:00")
270c284
< 	$importdate = strftime("%d %b %Y %H:%M:%S",$importtime);
---
> 	$importdate = date("d M Y H:i:s", $importtime);
287,288c301,302
< $query = "SELECT personID, firstname, lnprefix, lastname, gedcom, living, private, branch, YEAR( deathdatetr ) - YEAR( birthdatetr )
< 	AS yearsold, DAYOFYEAR( deathdatetr ) - DAYOFYEAR( birthdatetr ) AS daysold,
---
> $query = "SELECT personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, title, gedcom, living, private, branch, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr,
> 	YEAR( deathdatetr ) - YEAR( birthdatetr ) AS yearsold, DAYOFYEAR( deathdatetr ) - DAYOFYEAR( birthdatetr ) AS daysold,
312a327,328
> 	$line['allow_living'] = $rights['living'];
> 	$line['allow_private'] = $rights['private'];
321,326c337
< 	if($allowed)
< 		echo "$firstname $lnprefix $lastname";
< 	elseif($line['private'])
< 		echo $admtext['text_private'];
< 	else
< 		echo $text['living'];
---
> 	echo getName($line);
338,340c349,351
< $width = $sitever == "standard" ? "500" : "100%";
< echo "<table width=\"$width\" cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"whiteback\">\n";
< echo "<tr><td  valign=\"top\" class=\"fieldnameback\"><span class=\"fieldname\"><sup><font size=\"1\">1</font></sup>&nbsp;</span></td>";
---
> $width = $sitever == "standard" ? "500px" : "100%";
> echo "<table style=\"width:$width\" cellpadding=\"3\" cellspacing=\"1\" border=\"0\" class=\"tfixed whiteback\">\n";
> echo "<tr><td  valign=\"top\" class=\"fieldnameback\" style=\"width:10px\"><span class=\"fieldname\"><sup><font size=\"1\">1</font></sup>&nbsp;</span></td>";
432a444
> //include('cache-end.php');
diff -r TNG/stdsitecredit.php TNG1403/stdsitecredit.php
3c3
< 	$sitecredit = "<p class=\"smaller center\">{$text['pwrdby']} <a href=\"http://www.tngsitebuilding.com\" class=\"footer\" target=\"_blank\" title=\"Learn more about TNG\">The Next Generation of Genealogy Sitebuilding</a> &copy;, v. $tng_version,  {$text['writby']} Darrin Lythgoe 2001-" . date('Y') . ".</p>\n";
---
> 	$sitecredit = "<p class=\"smaller center\">{$text['pwrdby']} <a href=\"https://tngsitebuilding.com\" class=\"footer\" target=\"_blank\" title=\"Learn more about TNG\">The Next Generation of Genealogy Sitebuilding</a> v. $tng_version,  {$text['writby']} Darrin Lythgoe  &copy; 2001-" . date('Y') . ".</p>\n";
6c6
< 		if($tngconfig['dataprotect'] && strpos($_SERVER['REQUEST_URI'],"/data_protection_policy.php") === FALSE) {
---
> 		if(!empty($tngconfig['dataprotect']) && strpos($_SERVER['REQUEST_URI'],"/data_protection_policy.php") === FALSE) {
14c14
< 	if($tngconfig['footermsg']) {
---
> 	if(!empty($tngconfig['footermsg'])) {
diff -r TNG/subroot.php TNG1403/subroot.php
2c2
< error_reporting(E_ERROR);
---
> error_reporting(E_ALL & ~E_NOTICE);
diff -r TNG/suggest.php TNG1403/suggest.php
6c6
< if($cms['events']){include('cmsevents.php'); cms_contact();}
---
> if(!empty($cms['events'])){include('cmsevents.php'); cms_contact();}
18c18
< 	var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,6})$/;
---
> 	var reg = /^([A-Za-z0-9_\-\.+])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,6})$/;
49,51c49,51
< $enttype = preg_replace("/[^A-Za-z0-9_\-. ]/", '', $enttype);
< $ID = preg_replace("/[^A-Za-z0-9_\-. ]/", '', $ID);
< $page = strip_tags( $page );
---
> $enttype = isset($enttype) ? preg_replace("/[^A-Za-z0-9_\-. ]/", '', $enttype) : "";
> $ID = isset($ID) ? preg_replace("/[^A-Za-z0-9_\-. ]/", '', $ID) : "";
> $page = isset($page) ? strip_tags( $page ) : "";
66,67c66,68
< 	if( $result ) {
< 		$row = tng_fetch_assoc($result);
---
> 	$row = tng_fetch_assoc($result);
> 	tng_free_result($result);
> 	if( $row ) {
72d72
< 		tng_free_result($result);
89,91c89,92
< 	$rights = determineLivingPrivateRights($row, $righttree);
< 	$row['allow_living'] = $rights['living'];
< 	$row['allow_private'] = $rights['private'];
---
> 	if( $row ) {
> 		$rights = determineLivingPrivateRights($row, $righttree);
> 		$row['allow_living'] = $rights['living'];
> 		$row['allow_private'] = $rights['private'];
93,110c94,113
<     if( $row['husband'] ) {
<         $result = getPersonSimple($tree, $row['husband']);
<         $prow = tng_fetch_assoc( $result );
<         tng_free_result($result);
< 		$prights = determineLivingPrivateRights($prow, $righttree);
< 		$prow['allow_living'] = $prights['living'];
< 		$prow['allow_private'] = $prights['private'];
<         $hname = getName( $prow );
<     }
<     if( $row['wife'] ) {
<         $result = getPersonSimple($tree, $row['wife']);
<         $prow = tng_fetch_assoc( $result );
<         tng_free_result($result);
< 		$prights = determineLivingPrivateRights($prow, $righttree);
< 		$prow['allow_living'] = $prights['living'];
< 		$prow['allow_private'] = $prights['private'];
<         $wname = getName( $prow );
<     }
---
> 		if( $row['husband'] ) {
> 	        $result = getPersonSimple($tree, $row['husband']);
> 	        $prow = tng_fetch_assoc( $result );
> 	        tng_free_result($result);
> 			$prights = determineLivingPrivateRights($prow, $righttree);
> 			$prow['allow_living'] = $prights['living'];
> 			$prow['allow_private'] = $prights['private'];
> 	        $hname = getName( $prow );
> 	    }
> 	    if( $row['wife'] ) {
> 	        $result = getPersonSimple($tree, $row['wife']);
> 	        $prow = tng_fetch_assoc( $result );
> 	        tng_free_result($result);
> 			$prights = determineLivingPrivateRights($prow, $righttree);
> 			$prow['allow_living'] = $prights['living'];
> 			$prow['allow_private'] = $prights['private'];
> 	        $wname = getName( $prow );
> 	    }
> 	}
>     $row['sex'] = '';
115c118
< 	$years = $years = $row['marrdate'] && $row['allow_living'] && $row['allow_private'] ? $text['marrabbr'] . " " . displayDate( $row['marrdate'] ) : "";
---
> 	$years = $years = !empty($row['marrdate']) && !empty($row['allow_living']) && !empty($row['allow_private']) ? $text['marrabbr'] . " " . displayDate( $row['marrdate'] ) : "";
129a133,140
> 	$query = "SELECT count(personID) as ccount FROM $citations_table, $people_table
> 		WHERE $citations_table.sourceID = '$ID' AND $citations_table.persfamID = $people_table.personID AND $citations_table.gedcom = $people_table.gedcom AND private = '1'";
> 	$sresult = tng_query($query);
> 	$srow = tng_fetch_assoc( $sresult );
> 	tng_free_result($sresult);
> 	$row['private'] = $srow['ccount'] ? 1 : 0;
> 	$row['sex'] = "";
> 	if( !isset($row['title']) ) $row['title'] = "";
134d144
< 	tng_free_result( $sresult );
145a156,158
> 	$row['sex'] = "";
> 	if( !isset($row['reponame']) ) $row['reponame'] = "";
> 	$years = "";
152a166,167
> 	$row['sex'] = "";
> 	$years = "";
160,161c175
< 	$flags['tabs'] = $tngconfig['tabs'];
< 	$headline = $text['suggestchange'] . ": $name";
---
> 		$headline = $text['suggestchange'] . ": $name";
183c197
< if( $message ) {
---
> if(!empty($message)) {
207c221
< <table border="0" cellspacing="1" cellpadding="4" class="whiteback normal">
---
> <table border="0" cellspacing="1" cellpadding="4" class="tfixed whiteback normal" style="width:80%">
209c223
< <tr><td class="fieldnameback"><span class="fieldname"><?php echo $text['email']; ?>:&nbsp; </span></td><td class="databack"><input type="text" name="<?php echo $_SESSION['tng_email']; ?>" class="longfield" value="<?php echo $preemail; ?>" /> &nbsp; <input type="checkbox" name="mailme" value="1" /><?php echo $text['mailme']; ?></td></tr>
---
> <tr><td class="fieldnameback"><span class="fieldname"><?php echo $text['email']; ?>:&nbsp; </span></td><td class="databack"><input type="text" name="<?php echo $_SESSION['tng_email']; ?>" class="longfield" value="<?php echo $preemail; ?>" /></td></tr>
diff -r TNG/surname_cloud.class.php TNG1403/surname_cloud.class.php
57c57
< 		$result = tng_query($query) or die ("$text[cannotexecutequery]: $query");
---
> 		$result = tng_query($query) or die ("{$text['cannotexecutequery']}: $query");
79a80,82
> 		if(!isset($countArray[0]['count']))
> 			return;
> 		
diff -r TNG/surnames100.php TNG1403/surnames100.php
5c5
< $topnum = preg_replace("/[^0-9]/", '', $topnum);
---
> $topnum = !empty($topnum) ? preg_replace("/[^0-9]/", '', $topnum) : 100;
29a30
> <input type="hidden" name="tree" value="<?php echo $tree; ?>" />
diff -r TNG/surnames-oneletter.php TNG1403/surnames-oneletter.php
11,12c11,12
< $firstchar = mb_substr($firstchar,0,1,$charset);
< $decodedfirstchar = stripslashes(urldecode($firstchar));
---
> $primaryfirstchar = !empty($firstchar) ? mb_substr($firstchar,0,1,$charset) : "";
> $decodedfirstchar = stripslashes(urldecode($primaryfirstchar));
16c16
< $logstring = "<a href=\"$surnames_oneletter_url" . "firstchar=$firstchar&amp;tree=$tree\">" . xmlcharacters($text['surnamelist'] . ": {$text['beginswith']} $decodedfirstchar$treestr") . "</a>";
---
> $logstring = "<a href=\"$surnames_oneletter_url" . "firstchar=$primaryfirstchar&amp;tree=$tree\">" . xmlcharacters($text['surnamelist'] . ": {$text['beginswith']} $decodedfirstchar$treestr") . "</a>";
20a21,59
> 
> $wherestr = $tree ? "WHERE gedcom = \"$tree\"" : "";
> $treestr = $orgtree ? "&amp;tree=$tree" : "";
> 
> $allwhere = getLivingPrivateRestrictions($people_table, false, false);
> 
> if( $allwhere ) {
> 	$wherestr .= $wherestr ? " AND $allwhere" : "WHERE $allwhere";
> }
> 
> $linkstr = "";
> $nosurname = urlencode($text['nosurname']);
> $query = "SELECT ucase(left(lastname,1)) as firstchar, ucase( $binary left(lastname,1) ) as binfirstchar, count( ucase( left( lastname,1) ) ) as lncount FROM $people_table $wherestr GROUP BY binfirstchar ORDER by binfirstchar";
> $result = tng_query($query);
> if( $result ) {
> 	$initialchar = 1;
> 	
> 	while( $surname = tng_fetch_assoc( $result ) ) {
> 		if( $initialchar != 1 ) { 
> 			$linkstr .= " ";
> 		}
> 		if($session_charset == "UTF-8" && function_exists('mb_substr'))
> 			$firstchar = mb_substr($surname['firstchar'],0,1,'UTF-8');
> 		else
> 			$firstchar = substr($surname['firstchar'],0,1);
> 		$firstchar = strtoupper($firstchar);
> 		if( $firstchar == "" )
> 			$linkstr .= "<a href=\"$search_url" . "mylastname=$nosurname&amp;lnqualify=equals&amp;mybool=AND$treestr\" class=\"snlink\">" . $text['nosurname'] . "</a> ";
> 		else {
> 			//$urlfirstchar = urlencode($surname[firstchar]);
> 			$urlfirstchar = $firstchar;
> 			//if($charset == "UTF-8") $surname[firstchar] = utf8_encode($surname[firstchar]);
> 			$countstr = $text['surnamesstarting'] . ": " . $firstchar . " (" . number_format($surname['lncount']) . " " . $text['totalnames'] . ")";
> 			$linkstr .= "<a href=\"$surnames_oneletter_url" . "firstchar=$urlfirstchar$treestr\" class=\"snlink\" title=\"$countstr\">{$firstchar}</a>";
> 		}
> 		$initialchar++;
> 	}
> 	tng_free_result($result);
> }
25c64
< $hiddenfields[] = array('name' => 'firstchar', 'value' => $firstchar);
---
> $hiddenfields[] = array('name' => 'firstchar', 'value' => $primaryfirstchar);
28a68,74
> <div class="titlebox normal">
> 	<p class="subhead"><strong><?php echo $text['surnamesstarting']; ?></strong></p>
> 	<p class="firstchars"><?php echo $linkstr; ?></p>
> 	<br/><?php echo "<a href=\"$surnames_all_url" . "tree=$tree\">{$text['showallsurnames']}</a> ({$text['sortedalpha']}) &nbsp; | &nbsp; <a href=\"$surnames_url" . "tree=$tree\">{$text['mainsurnamepage']}</a>"; ?>
> </div>
> 
> <br />
32d77
< 	<p class="smaller"><?php echo $text['showmatchingsurnames'] . "&nbsp;&nbsp;&nbsp;<a href=\"$surnames_url" . "tree=$tree\">{$text['mainsurnamepage']}</a> &nbsp;|&nbsp; <a href=\"$surnames_all_url" . "tree=$tree\">{$text['showallsurnames']}</a>"; ?></p>
34c79
< <table class="sntable">
---
> <table class="sntable normal">
38,43d82
< $treestr = $orgtree ? "&amp;tree=$tree" : "";
< 
< $more = getLivingPrivateRestrictions($people_table, false, false);
< if($more) {
< 	$wherestr .= " AND " . $more;
< }
48,49c87,88
< $firstchar = $firstchar == "\"" ? "\\\"" : $firstchar;
< $query = "SELECT ucase( $binary $surnamestr ) as lastname, $surnamestr as lowername, ucase($binary lastname) as binlast, count( ucase($binary lastname) ) as lncount FROM $people_table WHERE ucase($binary TRIM(lastname)) LIKE \"$firstchar%\" $wherestr GROUP BY lowername ORDER by binlast";
---
> $primaryfirstchar = $primaryfirstchar == "\"" ? "\\\"" : $primaryfirstchar;
> $query = "SELECT ucase( $binary $surnamestr ) as lastname, $surnamestr as lowername, ucase($binary lastname) as binlast, count( ucase($binary lastname) ) as lncount FROM $people_table WHERE ucase($binary TRIM(lastname)) LIKE \"$primaryfirstchar%\" $wherestr GROUP BY lowername ORDER by binlast";
diff -r TNG/surnames.php TNG1403/surnames.php
10c10
< $treestr = $tree ? " ($text[tree]: $tree)" : "";
---
> $treestr = $tree ? " ({$text['tree']}: $tree)" : "";
43d42
< 	$wherestr2 .= " AND $allwhere";
98a98
> 		if( !isset($linkstr2col[$col]) ) $linkstr2col[$col] = "";
diff -r TNG/switchcolor2.php TNG1403/switchcolor2.php
18a19,26
> 
> 	if( !$rootpath ) {
> 		$rootpath = dirname(__FILE__) . "/";
> 		if (preg_match("/WIN/i",PHP_OS)) {
> 		    $rootpath = str_replace("\\","/",$rootpath);
> 		}
> 	}
> 
diff -r TNG/switchcolor.php TNG1403/switchcolor.php
6,9c6,9
< <script language="JavaScript" src="js/popupwindow.js"></script>
< <script language="JavaScript" src="js/anchorposition.js"></script>
< <script language="JavaScript" src="js/colorpicker2.js"></script>
< <SCRIPT language="JavaScript" type="text/javascript">
---
> <script src="js/popupwindow.js"></script>
> <script src="js/anchorposition.js"></script>
> <script src="js/colorpicker2.js"></script>
> <script type="text/javascript">
34c34
< Try this link instead: <a href="http://lythgoes.net/genealogy/switchcolor.php">http://lythgoes.net/genealogy/switchcolor.php</a>.</p>
---
> Try this link instead: <a href="https://lythgoes.net/genealogy/switchcolor.php">https://lythgoes.net/genealogy/switchcolor.php</a>.</p>
diff -r TNG/switchtree.php TNG1403/switchtree.php
2c2
< session_start();
---
> if(session_status() !== PHP_SESSION_ACTIVE) session_start();
diff -r TNG/tabledefs.php TNG1403/tabledefs.php
11a12,22
> function addPrefix($table,$prefix) {
> 	return ($prefix && strpos($table,$prefix) !== 0) ? $prefix . $table : $table;
> }
> 
> if(empty($collation)) {
> 	$query = "SELECT @@collation_database AS collation";
> 	$result = performQuery($query);
> 	$collation = tng_fetch_assoc($result);
> 	$collation = $collation['collation'];
> }
> 
12a24
> $engine = strpos($collation, "utf8mb4") === false ? "MYISAM" : "InnoDb ROW_FORMAT=DYNAMIC";
13a26,28
> if(!isset($table_prefix)) $table_prefix = "";
> 
> $address_table = addPrefix($address_table,$table_prefix);
17c32
< 	addressID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	addressID INT NOT NULL AUTO_INCREMENT,
30c45
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
32a48
> $albums_table = addPrefix($albums_table,$table_prefix);
36c52
< 	albumID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	albumID INT NOT NULL AUTO_INCREMENT,
39c55
< 	alwayson TINYINT(4) NULL,
---
> 	alwayson TINYINT NULL,
41c57
< 	active TINYINT(4) NOT NULL,
---
> 	active TINYINT NOT NULL,
44c60
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
46a63
> $albumlinks_table = addPrefix($albumlinks_table,$table_prefix);
50,53c67,70
< 	albumlinkID INT(11) NOT NULL AUTO_INCREMENT,
< 	albumID INT(11) NOT NULL,
< 	mediaID INT(11) NOT NULL,
< 	ordernum INT(11) NULL,
---
> 	albumlinkID INT NOT NULL AUTO_INCREMENT,
> 	albumID INT NOT NULL,
> 	mediaID INT NOT NULL,
> 	ordernum INT NULL,
57c74
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
59a77
> $album2entities_table = addPrefix($album2entities_table,$table_prefix);
63c81
< 	alinkID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	alinkID INT NOT NULL AUTO_INCREMENT,
68c86
< 	albumID INT(11) NOT NULL,
---
> 	albumID INT NOT NULL,
73c91
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
75a94
> $assoc_table = addPrefix($assoc_table,$table_prefix);
79c98
< 	assocID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	assocID INT NOT NULL AUTO_INCREMENT,
87c106
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
89a109
> $branches_table = addPrefix($branches_table,$table_prefix);
97,101c117,121
< 	agens INT(11) NOT NULL,
< 	dgens INT(11) NOT NULL,
< 	dagens INT(11) NOT NULL,
< 	inclspouses TINYINT(4) NOT NULL,
< 	action TINYINT(4) NOT NULL,
---
> 	agens INT NOT NULL,
> 	dgens INT NOT NULL,
> 	dagens INT NOT NULL,
> 	inclspouses TINYINT NOT NULL,
> 	action TINYINT NOT NULL,
104c124
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
106a127
> $branchlinks_table = addPrefix($branchlinks_table,$table_prefix);
110c131
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
116c137
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
118a140
> $cemeteries_table = addPrefix($cemeteries_table,$table_prefix);
122c144
< 	cemeteryID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	cemeteryID INT NOT NULL AUTO_INCREMENT,
131c153
< 	zoom TINYINT(4) NULL,
---
> 	zoom TINYINT NULL,
137c159
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
139a162
> $children_table = addPrefix($children_table,$table_prefix);
143c166
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
152,154c175,177
< 	haskids TINYINT(4) NOT NULL,
< 	ordernum SMALLINT(6) NOT NULL,
< 	parentorder TINYINT(4) NOT NULL,
---
> 	haskids TINYINT NOT NULL,
> 	ordernum SMALLINT NOT NULL,
> 	parentorder TINYINT NOT NULL,
158c181
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
160a184
> $citations_table = addPrefix($citations_table,$table_prefix);
164c188
< 	citationID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	citationID INT NOT NULL AUTO_INCREMENT,
179c203
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
181a206
> $countries_table = addPrefix($countries_table,$table_prefix);
187c212
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
189a215
> $dna_groups_table = addPrefix($dna_groups_table,$table_prefix);
197c223
< 	action tinyint(4) NOT NULL, 
---
> 	action TINYINT NOT NULL, 
199c225
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
201a228
> $dna_links_table = addPrefix($dna_links_table,$table_prefix);
205,206c232,233
< 	ID int(11) NOT NULL AUTO_INCREMENT,
< 	testID int(11) NOT NULL,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
> 	testID INT NOT NULL,
211c238
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
213a241
> $dna_tests_table = addPrefix($dna_tests_table,$table_prefix);
217c245
< 	testID int(11) NOT NULL AUTO_INCREMENT,
---
> 	testID INT NOT NULL AUTO_INCREMENT,
222a251
> 	match_date date NOT NULL,
227,228c256,258
< 	haplogroup varchar(40) NOT NULL,
< 	significant_snp varchar(80) NOT NULL,
---
> 	mtdna_haplogroup varchar(40) NOT NULL,
> 	ydna_haplogroup VARCHAR(30) NOT NULL,
> 	significant_snp varchar(255) NOT NULL,
231c261
< 	y_results varchar(340) NOT NULL,
---
> 	y_results varchar(512) NOT NULL,
234c264,265
< 	confirmed varchar(2) NOT NULL,
---
> 	mtdna_confirmed varchar(2) NOT NULL,
> 	ydna_confirmed varchar(2) NOT NULL,
238c269
< 	surnamesopt tinyint(4) NOT NULL,
---
> 	surnamesopt TINYINT NOT NULL,
239a271
> 	private_test VARCHAR(2) NOT NULL,
249a282,294
> 	GEDmatchID VARCHAR(30) NOT NULL,
> 	relationship_range VARCHAR(80) NOT NULL,
> 	suggested_relationship VARCHAR(80) NOT NULL,
> 	actual_relationship VARCHAR(40) NOT NULL,
> 	related_side VARCHAR(120) NOT NULL,
> 	shared_cMs VARCHAR(10) NOT NULL,
> 	shared_segments VARCHAR(10) NOT NULL,
> 	chromosome VARCHAR(4) NOT NULL,
> 	segment_start VARCHAR(40) NOT NULL,
> 	segment_end VARCHAR(40) NOT NULL,
> 	centiMorgans VARCHAR(40) NOT NULL,
> 	matching_SNPs VARCHAR(10) NOT NULL,
> 	x_match VARCHAR(2) NOT NULL,
252c297
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
254a300
> $events_table = addPrefix($events_table,$table_prefix);
258c304
< 	eventID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	eventID INT NOT NULL AUTO_INCREMENT,
261c307
< 	eventtypeID INT(11) NOT NULL,
---
> 	eventtypeID INT NOT NULL,
274c320
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
276a323
> $eventtypes_table = addPrefix($eventtypes_table,$table_prefix);
280c327
< 	eventtypeID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	eventtypeID INT NOT NULL AUTO_INCREMENT,
284,287c331,334
< 	keep TINYINT(4) NOT NULL,
< 	collapse TINYINT(4) NOT NULL,
< 	ordernum SMALLINT(6) NOT NULL,
< 	ldsevent TINYINT(4) NOT NULL,
---
> 	keep TINYINT NOT NULL,
> 	collapse TINYINT NOT NULL,
> 	ordernum SMALLINT NOT NULL,
> 	ldsevent TINYINT NOT NULL,
292c339
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
294a342
> $families_table = addPrefix($families_table,$table_prefix);
298c346
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
314,315c362,363
< 	husborder TINYINT(4) NOT NULL,
< 	wifeorder TINYINT(4) NOT NULL,
---
> 	husborder TINYINT NOT NULL,
> 	wifeorder TINYINT NOT NULL,
317,318c365,366
< 	living TINYINT(4) NOT NULL,
< 	private TINYINT(4) NOT NULL,
---
> 	living TINYINT NOT NULL,
> 	private TINYINT NOT NULL,
320,322c368,370
< 	changedby VARCHAR(20) NOT NULL,
< 	edituser VARCHAR(20) NOT NULL,
< 	edittime INT(11) NOT NULL,
---
> 	changedby VARCHAR(100) NOT NULL,
> 	edituser VARCHAR(100) NOT NULL,
> 	edittime INT NOT NULL,
330c378
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
332a381,400
> $image_tags_table = addPrefix($image_tags_table,$table_prefix);
> $query = "DROP TABLE IF EXISTS $image_tags_table";
> $result = performQuery($query);
> $query = "CREATE TABLE $image_tags_table (
> 	ID INT NOT NULL AUTO_INCREMENT,
> 	mediaID INT NOT NULL,
> 	rtop INT NOT NULL,
> 	rleft INT NOT NULL,
> 	rheight INT NOT NULL,
> 	rwidth INT NOT NULL,
> 	gedcom VARCHAR(20) NOT NULL,
> 	linktype CHAR(1) NOT NULL,
> 	persfamID VARCHAR(100) NOT NULL,
> 	label VARCHAR(64) NOT NULL,
> 	PRIMARY KEY (ID),
> 	UNIQUE mediaID (mediaID,gedcom,persfamID)
> ) ENGINE = $engine $collationstr";
> $result = performQuery($query,$image_tags_table);
> 
> $languages_table = addPrefix($languages_table,$table_prefix);
336c404
< 	languageID SMALLINT(6) NOT NULL AUTO_INCREMENT,
---
> 	languageID SMALLINT NOT NULL AUTO_INCREMENT,
342c410
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
344a413
> $medialinks_table = addPrefix($medialinks_table,$table_prefix);
348c417
< 	medialinkID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	medialinkID INT NOT NULL AUTO_INCREMENT,
353c422
< 	mediaID INT(11) NOT NULL,
---
> 	mediaID INT NOT NULL,
357c426
< 	dontshow TINYINT(4) NOT NULL,
---
> 	dontshow TINYINT NOT NULL,
360,362c429,431
< 	UNIQUE mediaID (gedcom, personID, mediaID, eventID),
< 	INDEX personID (gedcom, personID, ordernum)
< ) ENGINE = MYISAM $collationstr";
---
> 	UNIQUE mediaID (gedcom, personID(22), mediaID, eventID),
> 	INDEX personID (gedcom, personID(22), ordernum)
> ) ENGINE = $engine $collationstr";
364a434
> $media_table = addPrefix($media_table,$table_prefix);
368c438
< 	mediaID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	mediaID INT NOT NULL AUTO_INCREMENT,
380c450
< 	alwayson TINYINT(4) NULL,
---
> 	alwayson TINYINT NULL,
382c452
< 	abspath TINYINT(4) NULL,
---
> 	abspath TINYINT NULL,
384,385c454,455
< 	showmap SMALLINT(6) NULL,
< 	cemeteryID INT(11) NULL,
---
> 	showmap SMALLINT NULL,
> 	cemeteryID INT NULL,
387c457
< 	linktocem TINYINT(4) NULL,
---
> 	linktocem TINYINT NULL,
390,392c460,464
< 	zoom TINYINT(4) NULL,
< 	width SMALLINT(6) NULL,
< 	height SMALLINT(6) NULL,
---
> 	zoom TINYINT NULL,
> 	width SMALLINT NULL,
> 	height SMALLINT NULL,
> 	left_value SMALLINT NOT NULL,
> 	top_value SMALLINT NOT NULL,
394,396c466,469
< 	usenl TINYINT(4) NULL,
< 	newwindow TINYINT(4) NULL,
< 	usecollfolder TINYINT(4) NULL,
---
> 	usenl TINYINT NULL,
> 	newwindow TINYINT NULL,
> 	usecollfolder TINYINT NULL,
> 	private TINYINT NOT NULL,
398c471
< 	changedby VARCHAR(20) NOT NULL,
---
> 	changedby VARCHAR(100) NOT NULL,
405c478
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
407a481
> $mediatypes_table = addPrefix($mediatypes_table,$table_prefix);
418,419c492,493
< 	disabled TINYINT(4) NOT NULL,
< 	ordernum TINYINT(4) NOT NULL,
---
> 	disabled TINYINT NOT NULL,
> 	ordernum TINYINT NOT NULL,
423c497
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
439,450c513
< /*
< $query = "DROP TABLE IF EXISTS $mhrequests_table";
< $result = performQuery($query);
< $query = "CREATE TABLE $mhrequests_table (
< 	externalId VARCHAR(128) NOT NULL,
< 	answer TEXT NOT NULL,
< 	expiresOn VARCHAR(50) NOT NULL,
< 	PRIMARY KEY (externalId)
< ) ENGINE = MYISAM $collationstr";
< $result = performQuery($query,$mhrequests_table);
< */
< 
---
> $mostwanted_table = addPrefix($mostwanted_table,$table_prefix);
454c517
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
461c524
< 	mediaID INT(11) NOT NULL,
---
> 	mediaID INT NOT NULL,
464c527
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
466a530
> $notelinks_table = addPrefix($notelinks_table,$table_prefix);
470c534
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
473c537
< 	xnoteID INT(11) NOT NULL,
---
> 	xnoteID INT NOT NULL,
476c540
< 	secret TINYINT(4) NOT NULL,
---
> 	secret TINYINT NOT NULL,
479c543
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
481a546
> $people_table = addPrefix($people_table,$table_prefix);
485c550
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
493c558
< 	sex TINYTEXT NOT NULL,
---
> 	sex VARCHAR(25) NOT NULL,
497a563
> 	altbirthtype VARCHAR(5) NOT NULL,
504c570
< 	burialtype TINYINT(4) NOT NULL,
---
> 	burialtype TINYINT NOT NULL,
522c588
< 	nameorder TINYINT(4) NOT NULL,
---
> 	nameorder TINYINT NOT NULL,
525,526c591,592
< 	living TINYINT(4) NOT NULL,
< 	private TINYINT(4) NOT NULL,
---
> 	living TINYINT NOT NULL,
> 	private TINYINT NOT NULL,
528,530c594,596
< 	changedby VARCHAR(20) NOT NULL,
< 	edituser VARCHAR(20) NOT NULL,
< 	edittime INT(11) NOT NULL,
---
> 	changedby VARCHAR(100) NOT NULL,
> 	edituser VARCHAR(100) NOT NULL,
> 	edittime INT NOT NULL,
546c612
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
548a615
> $places_table = addPrefix($places_table,$table_prefix);
552c619
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
557,560c624,627
< 	zoom TINYINT(4) NULL,
< 	placelevel TINYINT(4) NULL,
< 	temple TINYINT(4) NOT NULL,
<     geoignore TINYINT(4) NOT NULL,
---
> 	zoom TINYINT NULL,
> 	placelevel TINYINT NULL,
> 	temple TINYINT NOT NULL,
>     geoignore TINYINT NOT NULL,
561a629,630
> 	changedate DATETIME NOT NULL,
> 	changedby VARCHAR(100) NOT NULL,
565c634
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
567a637
> $reports_table = addPrefix($reports_table,$table_prefix);
571c641
< 	reportID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	reportID INT NOT NULL AUTO_INCREMENT,
574c644
< 	rank INT(11) NOT NULL,
---
> 	ranking INT NOT NULL,
579c649
< 	active TINYINT(4) NOT NULL,
---
> 	active TINYINT NOT NULL,
582,583c652,653
< 	INDEX rank (rank)
< ) ENGINE = MYISAM $collationstr";
---
> 	INDEX ranking (ranking)
> ) ENGINE = $engine $collationstr";
585a656
> $repositories_table = addPrefix($repositories_table,$table_prefix);
589c660
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
593c664
< 	addressID INT(11) NOT NULL,
---
> 	addressID INT NOT NULL,
595c666
< 	changedby VARCHAR(20) NOT NULL,
---
> 	changedby VARCHAR(100) NOT NULL,
599c670
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
601a673
> $saveimport_table = addPrefix($saveimport_table,$table_prefix);
605,613c677,686
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
< 	filename VARCHAR(100) NULL,
< 	icount INT(11) NULL,
< 	ioffset INT(11) NULL,
< 	fcount INT(11) NULL,
< 	foffset INT(11) NULL,
< 	scount INT(11) NULL,
< 	soffset INT(11) NULL,
< 	offset INT(11) NULL,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
> 	filename VARCHAR(255) NULL,
> 	icount INT NULL,
> 	ioffset INT NULL,
> 	fcount INT NULL,
> 	foffset INT NULL,
> 	scount INT NULL,
> 	soffset INT NULL,
> 	fileoffset INT NULL,
> 	barwidth INT NOT NULL,
617,628c690,701
< 	ncount INT(11) NULL,
< 	noffset INT(11) NULL,
< 	rcount INT(11) NULL,
< 	roffset INT(11) NULL,
< 	mcount INT(11) NULL,
<     pcount INT(11) NULL,
< 	ucaselast TINYINT(4) NULL,
< 	norecalc TINYINT(4) NULL,
< 	media TINYINT(4) NULL,
< 	neweronly TINYINT(4) NULL,
< 	allevents TINYINT(4) NULL,
< 	lasttype TINYINT(4) NULL,
---
> 	ncount INT NULL,
> 	noffset INT NULL,
> 	rcount INT NULL,
> 	roffset INT NULL,
> 	mcount INT NULL,
>     pcount INT NULL,
> 	ucaselast TINYINT NULL,
> 	norecalc TINYINT NULL,
> 	media TINYINT NULL,
> 	neweronly TINYINT NULL,
> 	allevents TINYINT NULL,
> 	lasttype TINYINT NULL,
631c704
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
633a707
> $sources_table = addPrefix($sources_table,$table_prefix);
637c711
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
651c725
< 	changedby VARCHAR(20) NOT NULL,
---
> 	changedby VARCHAR(100) NOT NULL,
656c730
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
658a733
> $states_table = addPrefix($states_table,$table_prefix);
664c739
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
666a742
> $temp_events_table = addPrefix($temp_events_table,$table_prefix);
670c746
< 	tempID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	tempID INT NOT NULL AUTO_INCREMENT,
685c761
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
688a765
> $templates_table = addPrefix($templates_table,$table_prefix);
692c769
< 	id int(11) NOT NULL AUTO_INCREMENT,
---
> 	id INT NOT NULL AUTO_INCREMENT,
694c771
< 	ordernum int(11) NOT NULL,
---
> 	ordernum INT NOT NULL,
701c778
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
704d780
< include($subroot . "templateconfig.php");
721a798
> $tlevents_table = addPrefix($tlevents_table,$table_prefix);
725,727c802,804
<    tleventID INT(11) NOT NULL AUTO_INCREMENT,
<    evday TINYINT(4) NOT NULL,
<    evmonth TINYINT(4) NOT NULL,
---
>    tleventID INT NOT NULL AUTO_INCREMENT,
>    evday TINYINT NOT NULL,
>    evmonth TINYINT NOT NULL,
729,730c806,807
<    endday TINYINT(4) NOT NULL,
<    endmonth TINYINT(4) NOT NULL,
---
>    endday TINYINT NOT NULL,
>    endmonth TINYINT NOT NULL,
737c814
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
739a817
> $trees_table = addPrefix($trees_table,$table_prefix);
754,756c832,834
< 	secret TINYINT(4) NOT NULL,
< 	disallowgedcreate TINYINT(4) NOT NULL,
<     disallowpdf TINYINT(4) NOT NULL,
---
> 	secret TINYINT NOT NULL,
> 	disallowgedcreate TINYINT NOT NULL,
>     disallowpdf TINYINT NOT NULL,
760c838
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
762a841
> $users_table = addPrefix($users_table,$table_prefix);
766c845
< 	userID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	userID INT NOT NULL AUTO_INCREMENT,
775,784c854,865
< 	allow_edit TINYINT(4) NOT NULL,
< 	allow_add TINYINT(4) NOT NULL,
< 	tentative_edit TINYINT(4) NOT NULL,
< 	allow_delete TINYINT(4) NOT NULL,
< 	allow_lds TINYINT(4) NOT NULL,
< 	allow_ged TINYINT(4) NOT NULL,
< 	allow_pdf TINYINT(4) NOT NULL,
< 	allow_living TINYINT(4) NOT NULL,
< 	allow_private TINYINT(4) NOT NULL,
< 	allow_profile TINYINT(4) NOT NULL,
---
> 	allow_edit TINYINT NOT NULL,
> 	allow_add TINYINT NOT NULL,
> 	tentative_edit TINYINT NOT NULL,
> 	allow_delete TINYINT NOT NULL,
> 	allow_lds TINYINT NOT NULL,
> 	allow_ged TINYINT NOT NULL,
> 	allow_pdf TINYINT NOT NULL,
> 	allow_living TINYINT NOT NULL,
> 	allow_private TINYINT NOT NULL,
> 	allow_private_notes TINYINT NOT NULL,
> 	allow_private_media TINYINT NOT NULL,
> 	allow_profile TINYINT NOT NULL,
795c876
< 	languageID SMALLINT(6) NOT NULL,
---
> 	languageID SMALLINT NOT NULL,
797c878
< 	disabled TINYINT(4) NOT NULL,
---
> 	disabled TINYINT NOT NULL,
801c882
< 	no_email TINYINT(4) NULL,
---
> 	no_email TINYINT NULL,
802a884
> 	reset_pwd_code VARCHAR(30) NULL,
805c887
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
807a890
> $xnotes_table = addPrefix($xnotes_table,$table_prefix);
811c894
< 	ID INT(11) NOT NULL AUTO_INCREMENT,
---
> 	ID INT NOT NULL AUTO_INCREMENT,
818c901
< ) ENGINE = MYISAM $collationstr";
---
> ) ENGINE = $engine $collationstr";
diff -r TNG/templateconfig.php TNG1403/templateconfig.php
1,367c1,8783
< <?php
< $tmp['t1_mainimage'] = "img/home-photo.jpg";
< $tmp['t1_titlechoice'] = "text";
< $tmp['t1_maintitle'] = "Our Family History";
< $tmp['t1_titleimage'] = "img/home-title.gif";
< $tmp['t1_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
< volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
< Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
< et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
< $tmp['t1_headimgplustitle'] = "img/header-title.gif";
< $tmp['t2_mainimage'] = "img/mainphoto.jpg";
< $tmp['t2_titlechoice'] = "text";
< $tmp['t2_maintitle'] = "Our Family<br />Genealogy Pages";
< $tmp['t2_titleimage'] = "img/homeheader.gif";
< $tmp['t2_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
< volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
< Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
< et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
< $tmp['t2_pedperson'] = "I1";
< $tmp['t2_pedtree'] = "mytreeid";
< $tmp['t2_phhistperson'] = "I1";
< $tmp['t2_phhisttree'] = "mytreeid";
< $tmp['t2_headimg'] = "img/headerphoto.jpg";
< $tmp['t2_headtitleimg'] = "img/headertitle.gif";
< $tmp['t3_mainimage'] = "img/mainstreet.jpg";
< $tmp['t3_titlechoice'] = "text";
< $tmp['t3_maintitle'] = "Our Family History";
< $tmp['t3_titleimage'] = "img/title.gif";
< $tmp['t3_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
< volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
< Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
< et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
< $tmp['t3_headimg'] = "img/headerphoto.jpg";
< $tmp['t3_headtitleimg'] = "img/headertitle.gif";
< $tmp['t4_titlechoice'] = "text";
< $tmp['t4_titleimg'] = "img/title.gif";
< $tmp['t4_headtitle1'] = "Our Family";
< $tmp['t4_headtitle2'] = "Genealogy Pages";
< $tmp['t4_mainimage'] = "img/bigphoto.jpg";
< $tmp['t4_photocaption'] = "Mt. Pleasant, Utah, about 1915";
< $tmp['t4_headline'] = "Main Feature";
< $tmp['t4_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
< volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
< Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
< et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
< $tmp['t4_featuretitle1'] = "Feature Story 1";
< $tmp['t4_featurelink1'] = "histories/feature1.php";
< $tmp['t4_featurethumb1'] = "img/featurethumb1.gif";
< $tmp['t4_featurepara1'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
< $tmp['t4_featuretitle2'] = "Feature Story 2";
< $tmp['t4_featurelink2'] = "histories/feature2.php";
< $tmp['t4_featurethumb2'] = "img/featurethumb2.gif";
< $tmp['t4_featurepara2'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
< $tmp['t4_featuretitle3'] = "Feature Story 3";
< $tmp['t4_featurelink3'] = "histories/feature3.php";
< $tmp['t4_featurethumb3'] = "img/featurethumb3.gif";
< $tmp['t4_featurepara3'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
< $tmp['t4_featuretitle4'] = "Feature Story 4";
< $tmp['t4_featurelink4'] = "histories/feature4.php";
< $tmp['t4_featurethumb4'] = "img/featurethumb1.gif";
< $tmp['t4_featurepara4'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
< $tmp['t4_headimg'] = "img/smallphoto.jpg";
< $tmp['t5_maintitle'] = "Our Family History and Ancestry";
< $tmp['t5_mainimage'] = "img/mediumphoto.jpg";
< $tmp['t5_headimg'] = "img/smallphoto.jpg";
< $tmp['t5_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed
< diam nonummy nibh euismod tincidunt ut laoreet dolore magna
< aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud
< exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea
< commodo consequat. Duis autem vel eum iriure dolor in hendrerit in
< vulputate velit esse molestie consequat, vel illum dolore eu
< feugiat nulla facilisis at vero eros et accumsan et iusto odio
< dignissim qui blandit praesent luptatum zzril delenit a.";
< $tmp['t6_maintitle'] = "Our Family History";
< $tmp['t6_headimg'] = "img/titlebottom.jpg";
< $tmp['t6_mainpara'] = "This is where you can welcome the user to your site.";
< $tmp['t6_searchpara'] = "To search the genealogy database, enter a name below. You will find many families!";
< $tmp['t6_fhpara'] = "You can use this section to link to some of your more interesting family histories.";
< $tmp['t6_hisside'] = "His Side";
< $tmp['t6_herside'] = "Her Side";
< $tmp['t6_fhlinkshis'] = "<a href=\"extrastree.php?personID=I1&amp;tree=T0001&amp;showall=1\">Individual 1</a><br/>
< <a href=\"extrastree.php?personID=I2&amp;tree=T0001&amp;showall=1\">Individual 2</a><br/>";
< $tmp['t6_fhlinkshers'] = "<a href=\"extrastree.php?personID=I3&amp;tree=T0001&amp;showall=1\">Individual 3</a><br/>
< <a href=\"extrastree.php?personID=I4&amp;tree=T0001&amp;showall=1\">Individual 4</a><br/>";
< $tmp['t6_mwpara'] = "Use this section to display information about individuals you are actively researching.";
< $tmp['t6_respara'] = "List resources here that you would like to share with others.";
< $tmp['t6_reslinks'] = "<a href=\"http://www.ancestry.com\" target=\"_blank\">Ancestry.com</a><br />
< <a href=\"http://www.fold3.com\" target=\"_blank\">Fold3.com</a><br />
< <a href=\"http://lythgoes.net/genealogy/software.php\" target=\"_blank\">TNG Software</a>";
< $tmp['t7_mainimage'] = "img/bigphoto.jpg";
< $tmp['t7_titlechoice'] = "image";
< $tmp['t7_maintitle'] = "Our Family<br />History";
< $tmp['t7_titleimg'] = "img/logo.jpg";
< $tmp['t7_photocaption'] = "Mt. Pleasant, Utah, about 1915";
< $tmp['t7_headline'] = "Main Feature";
< $tmp['t7_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
< volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
< Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
< et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
< $tmp['t7_newstext'] = "This section can be used for brief news announcements";
< $tmp['t8_headimg'] = "img/titletop.jpg";
< $tmp['t8_mainpara'] = "This is where you can welcome a user to your site.  You might also give them some basic information on navigating and links to any help or FAQ pages you may have.";
< $tmp['t8_latestnews'] = "<b>5 Jan 2009</b> - Added a whole new look to my site.<br/><br/>
< <b>25 Dec 2008</b> - Put years and years of work into my family research.<br/><br/>";
< $tmp['t8_featurespara'] = "<p><a href=\"mostwanted.php\">Most Wanted</a> - I am looking for information about these ancestors.  Can you help?</p>
< <p><a href=\"whatsnew.php\">What's New</a> - View the latest updates made to the site.</p>";
< $tmp['t8_menutitle'] = "Site Menu";
< $tmp['t8_headtitle1'] = "surname";
< $tmp['t8_headtitle2'] = "genealogy";
< $tmp['t8_headtitle3'] = "pages";
< $tmp['t8_headsubtitle'] = "genealogy of the surname family";
< $tmp['t8_momside'] = "Mom's Side";
< $tmp['t8_momsidenames'] = "(Smith/Jones)";
< $tmp['t8_momperson'] = "I1";
< $tmp['t8_momtree'] = "mytreeid";
< $tmp['t8_dadside'] = "Dad's Side";
< $tmp['t8_dadsidenames'] = "(Johnson/Williams)";
< $tmp['t8_dadperson'] = "I2";
< $tmp['t8_dadtree'] = "mytreeid";
< $tmp['t9_maintitle'] = "Our Family History";
< $tmp['t9_headsubtitle'] = "genealogy of the surname family";
< $tmp['t9_headimg'] = "img/header-object.png";
< $tmp['t9_welcome'] = "Welcome!";
< $tmp['t9_mainimage'] = "img/annie-age17-recolored.jpg";
< $tmp['t9_dadside'] = "His Side";
< $tmp['t9_dadperson'] = "I2";
< $tmp['t9_dadtree'] = "mytreeid";
< $tmp['t9_momside'] = "Her Side";
< $tmp['t9_momperson'] = "I1";
< $tmp['t9_momtree'] = "mytreeid";
< $tmp['t9_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t9_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Cras elit nisl, rhoncus nec iaculis ultricies, feugiat eget sapien. Pellentesque ac felis tellus.</p>
< <p>Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices. Phasellus elit dolor, porttitor id consectetur sit amet, posuere id magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
< <p>Suspendisse pharetra auctor pharetra. Nunc a sollicitudin est. Curabitur ullamcorper gravida felis, sit amet scelerisque lorem iaculis sed. Donec vel neque in neque porta venenatis sed sit amet lectus. Fusce ornare elit nisl, feugiat bibendum lorem. Vivamus pretium dictum sem vel laoreet. In fringilla pharetra purus, semper vulputate ligula cursus in. Donec at nunc nec dui laoreet porta eu eu ipsum. Sed eget lacus sit amet risus elementum dictum.</p>";
< $tmp['t9_featurelinks'] = "Feature 1, showmedia.php?mediaID=xxx
< Feature 2, histories/feature2.php
< Feature 3, http://www.other-web-site.com/feature3.html";
< $tmp['t9_featurepara'] = "Lorem ipsum dolor sit amet. Nam sit amet sem. Mauris a ante.";
< $tmp['t9_reslinks'] = "Ancestry, http://www.ancestry.com
< Archives.com, http://www.archives.com
< Cyndi's List, http://cyndislist.com
< FamilySearch, http://www.familysearch.org
< Find a Grave, http://www.findagrave.com
< Fold3, http://www.fold3.com
< Rootsweb, http://www.rootsweb.com
< TNG, http://www.tngsitebuilding.com";
< $tmp['t10_maintitle'] = "Our Family History";
< $tmp['t10_headsubtitle'] = "genealogy of the surname family";
< $tmp['t10_headimg'] = "img/header-object.png";
< $tmp['t10_welcome'] = "Welcome!";
< $tmp['t10_mainimage'] = "img/beatrice-carlisle-soft.jpg";
< $tmp['t10_dadside'] = "His Side";
< $tmp['t10_dadperson'] = "I2";
< $tmp['t10_dadtree'] = "mytreeid";
< $tmp['t10_momside'] = "Her Side";
< $tmp['t10_momperson'] = "I1";
< $tmp['t10_momtree'] = "mytreeid";
< $tmp['t10_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t10_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Cras elit nisl, rhoncus nec iaculis ultricies, feugiat eget sapien. Pellentesque ac felis tellus.</p>
< <p>Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices. Phasellus elit dolor, porttitor id consectetur sit amet, posuere id magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
< <p>Suspendisse pharetra auctor pharetra. Nunc a sollicitudin est. Curabitur ullamcorper gravida felis, sit amet scelerisque lorem iaculis sed. Donec vel neque in neque porta venenatis sed sit amet lectus. Fusce ornare elit nisl, feugiat bibendum lorem. Vivamus pretium dictum sem vel laoreet. In fringilla pharetra purus, semper vulputate ligula cursus in. Donec at nunc nec dui laoreet porta eu eu ipsum. Sed eget lacus sit amet risus elementum dictum.</p>";
< $tmp['t10_featurelinks'] = "Feature 1, showmedia.php?mediaID=xxx
< Feature 2, histories/feature2.php
< Feature 3, http://www.other-web-site.com/feature3.html";
< $tmp['t10_featurepara'] = "Lorem ipsum dolor sit amet. Nam sit amet sem. Mauris a ante.";
< $tmp['t10_reslinks'] = "Ancestry, http://www.ancestry.com
< Archives.com, http://www.archives.com
< Cyndi's List, http://cyndislist.com
< FamilySearch, http://www.familysearch.org
< Find a Grave, http://www.findagrave.com
< Fold3, http://www.fold3.com
< Rootsweb, http://www.rootsweb.com
< TNG, http://www.tngsitebuilding.com";
< $tmp['t11_maintitle'] = "Our Family History";
< $tmp['t11_mainimage'] = "img/mainphoto.jpg";
< $tmp['t11_dadside'] = "His Side";
< $tmp['t11_dadperson'] = "I2";
< $tmp['t11_dadtree'] = "mytreeid";
< $tmp['t11_momside'] = "Her Side";
< $tmp['t11_momperson'] = "I1";
< $tmp['t11_momtree'] = "mytreeid";
< $tmp['t11_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t11_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
< vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
< Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
< congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
< imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
< $tmp['t12_maintitle'] = "Our Family Genealogy Pages";
< $tmp['t12_headsubtitle'] = "Discovering our American, Canadian and European Ancestors";
< $tmp['t12_headimg'] = "img/book.png";
< $tmp['t12_welcome'] = "Welcome!";
< $tmp['t12_mainpara'] = "<p>This is where you can welcome a user to your site. You might also give them some basic information on navigating and links to any help or FAQ pages you may have.</p>
< <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Cras elit nisl, rhoncus nec iaculis ultricies, feugiat eget sapien. Pellentesque ac felis tellus.</p>
< <p>Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices. Phasellus elit dolor, porttitor id consectetur sit amet, posuere id magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
< <p>Suspendisse pharetra auctor pharetra. Nunc a sollicitudin est. Curabitur ullamcorper gravida felis, sit amet scelerisque lorem iaculis sed. Donec vel neque in neque porta venenatis sed sit amet lectus. Fusce ornare elit nisl, feugiat bibendum lorem. Vivamus pretium dictum sem vel laoreet. In fringilla pharetra purus, semper vulputate ligula cursus in. Donec at nunc nec dui laoreet porta eu eu ipsum. Sed eget lacus sit amet risus elementum dictum.</p>";
< $tmp['t12_photol'] = "img/charlemagne1.jpg";
< $tmp['t12_phototitlel'] = "Emperor Charlemagne";
< $tmp['t12_photocaptionl'] = "King Charles I of France (Charlemagne) is a grandfather to many persons in our family tree. As a result we have many kings, queens, dukes, duchesses, etc. as grandparents and cousins.";
< $tmp['t12_featurelink1'] = "http://en.wikipedia.org/wiki/Charlemagne";
< $tmp['t12_photor'] = "img/augustinegrignon.jpg";
< $tmp['t12_phototitler'] = "Augustin Grignon";
< $tmp['t12_photocaptionr'] = "Augustin Grignon was a fur trader and general entrepreneur in the Fox River Valley in territorial Wisconsin, surviving into its early years of statehood.";
< $tmp['t12_featurelink2'] = "http://en.wikipedia.org/wiki/Augustin_Grignon";
< $tmp['t12_topsurnames'] = "Top 100 Surnames in Our Family Tree";
< $tmp['t13_maintitle'] = "Our Family History";
< $tmp['t13_mainimage'] = "img/mainphoto.jpg";
< $tmp['t13_dadside'] = "His Side";
< $tmp['t13_dadperson'] = "I2";
< $tmp['t13_dadtree'] = "mytreeid";
< $tmp['t13_momside'] = "Her Side";
< $tmp['t13_momperson'] = "I1";
< $tmp['t13_momtree'] = "mytreeid";
< $tmp['t13_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t13_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
< vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
< Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
< congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
< imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
< $tmp['t14_maintitle'] = "Our Family History";
< $tmp['t14_headsubtitle'] = "The Genealogy of the Surname Family";
< $tmp['t14_mainimage'] = "img/mainphoto.jpg";
< $tmp['t14_photocaption'] = "Wedding photo for Niels Jensen and Nicolena Rolfsen, about 1852.";
< $tmp['t14_headimg'] = "img/smallphoto.jpg";
< $tmp['t14_headimg2'] = "img/smallphoto2.jpg";
< $tmp['t14_headimg3'] = "img/smallphoto3.jpg";
< $tmp['t14_dadside'] = "His Side";
< $tmp['t14_dadperson'] = "I2";
< $tmp['t14_dadtree'] = "mytreeid";
< $tmp['t14_momside'] = "Her Side";
< $tmp['t14_momperson'] = "I1";
< $tmp['t14_momtree'] = "mytreeid";
< $tmp['t14_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t14_welcome'] = "Welcome!";
< $tmp['t14_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
< vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
< Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
< congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
< imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
< $tmp['t15_maintitle'] = "History of the Surname Family";
< $tmp['t15_titleimg'] = "img/lublin.jpg";
< $tmp['t15_dadside'] = "His Side";
< $tmp['t15_dadperson'] = "I2";
< $tmp['t15_dadtree'] = "mytreeid";
< $tmp['t15_momside'] = "Her Side";
< $tmp['t15_momperson'] = "I1";
< $tmp['t15_momtree'] = "mytreeid";
< $tmp['t15_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t15_subhead1'] = "Featured Article";
< $tmp['t15_featuretitle1'] = "Feature Title 1";
< $tmp['t15_mainimage'] = "img/woman-sepia.jpg";
< $tmp['t15_featurelink1'] = "histories/feature1.php";
< $tmp['t15_featurepara1'] = "<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.</p>";
< $tmp['t15_subhead2'] = "Other Featured Articles";
< $tmp['t15_featurethumb2'] = "img/children.jpg";
< $tmp['t15_featuretitle2'] = "Feature Title 2";
< $tmp['t15_featurelink2'] = "histories/feature2.php";
< $tmp['t15_featurepara2'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit in eum non pereat sed habeat vitam aeternam non enim misit Deus Filium suum in mundum ut iudicet mundum sed ut salvetur mundus per ipsum qui credit in eum non iudicatur qui autem non credit iam iudicatus est quia non credidit in nomine unigeniti Filii Dei hoc est autem iudicium quia lux venit in mundum et dilexerunt</p>";
< $tmp['t15_featurethumb3'] = "img/women.jpg";
< $tmp['t15_featuretitle3'] = "Feature Title 3";
< $tmp['t15_featurelink3'] = "histories/feature3.php";
< $tmp['t15_featurepara3'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit in eum non pereat sed habeat vitam aeternam non enim misit Deus Filium suum in mundum ut iudicet mundum sed ut salvetur mundus per ipsum qui credit in eum non iudicatur qui autem non credit iam iudicatus est quia non credidit in nomine unigeniti Filii Dei hoc est autem iudicium quia lux venit in mundum et dilexerunt</p>";
< $tmp['t15_sidebarhead1'] = "Sidebar Heading 1";
< $tmp['t15_featurethumb4'] = "img/thumb1.jpg";
< $tmp['t15_featuretitle4'] = "Feature Title 4";
< $tmp['t15_featurelink4'] = "histories/feature4.php";
< $tmp['t15_featurepara4'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
< $tmp['t15_featurethumb5'] = "img/thumb2.jpg";
< $tmp['t15_featuretitle5'] = "Feature Title 5";
< $tmp['t15_featurelink5'] = "histories/feature5.php";
< $tmp['t15_featurepara5'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
< $tmp['t15_featurethumb6'] = "img/thumb3.jpg";
< $tmp['t15_featuretitle6'] = "Feature Title 6";
< $tmp['t15_featurelink6'] = "histories/feature6.php";
< $tmp['t15_featurepara6'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
< $tmp['t15_sidebarhead2'] = "Sidebar Heading 2";
< $tmp['t15_featurethumb7'] = "img/family-tracks.jpg";
< $tmp['t15_featurelink7'] = "histories/feature7.php";
< $tmp['t15_featurepara7'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
< $tmp['t15_sidebarhead3'] = "Sidebar Heading 3";
< $tmp['t15_featurethumb8'] = "img/men.jpg";
< $tmp['t15_featurelink8'] = "histories/feature8.php";
< $tmp['t15_featurepara8'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
< $tmp['t15_texttitle1'] = "Text Title 1";
< $tmp['t15_textlink1'] = "custom_page1.php";
< $tmp['t15_textpara1'] = "<p>Verbum hoc erat in principio apud Deum omnia per ipsum facta sunt et sine ipso factum est nihil quod factum est in ipso vita erat et vita erat lux hominum et lux in tenebris lucet et tenebrae eam non conprehenderunt fuit homo missus.</p><p>factum est et habitavit in nobis et vidimus gloriam eius gloriam quasi unigeniti a Patre plenum gratiae et veritatis.</p>";
< $tmp['t15_texttitle2'] = "Text Title 2";
< $tmp['t15_textlink2'] = "custom_page2.php";
< $tmp['t15_textpara2'] = "<p>Verbum hoc erat in principio apud Deum omnia per ipsum facta sunt et sine ipso factum est nihil quod factum est in ipso vita erat et vita erat lux hominum et lux in tenebris lucet et tenebrae eam non conprehenderunt fuit homo missus.</p><p>factum est et habitavit in nobis et vidimus gloriam eius gloriam quasi unigeniti a Patre plenum gratiae et veritatis.</p>";
< $tmp['t15_texttitle3'] = "Text Title 3";
< $tmp['t15_textpara3'] = "<p>In principio erat Verbum et Verbum erat apud Deum et Deus erat Verbum hoc erat in principio apud Deum omnia per ipsum</p>";
< $tmp['t16_maintitle'] = "Surname Genealogy Pages";
< $tmp['t16_welcome'] = "Welcome!";
< $tmp['t16_mainimage'] = "img/mainphoto.jpg";
< $tmp['t16_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
< vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
< Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
< congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
< imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
< $tmp['t16_featuretitle1'] = "Feature 1 (optional)";
< $tmp['t16_featurepara1'] = "<p>Add your own content, or blank out the headline and feature text in the Template Settings to remove this box.</p>";
< $tmp['t16_dadside'] = "His Side";
< $tmp['t16_dadperson'] = "I2";
< $tmp['t16_dadtree'] = "mytreeid";
< $tmp['t16_momside'] = "Her Side";
< $tmp['t16_momperson'] = "I1";
< $tmp['t16_momtree'] = "mytreeid";
< $tmp['t16_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t17_maintitle'] = "Surname Genealogy Pages";
< $tmp['t17_headsubtitle'] = "a history of the surname family";
< $tmp['t17_welcome'] = "Welcome!";
< $tmp['t17_mainimage'] = "img/family.jpg";
< $tmp['t17_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
< vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
< Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
< congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
< imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
< $tmp['t17_featuretitle1'] = "Feature 1 (optional)";
< $tmp['t17_featurepara1'] = "<p>Add your own content, or blank out the headline and feature text in the Template Settings to remove this box.</p>";
< $tmp['t17_dadside'] = "His Side";
< $tmp['t17_dadperson'] = "I2";
< $tmp['t17_dadtree'] = "mytreeid";
< $tmp['t17_momside'] = "Her Side";
< $tmp['t17_momperson'] = "I1";
< $tmp['t17_momtree'] = "mytreeid";
< $tmp['t17_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t17_featurelink1'] = "histories/feature1.php";
< $tmp['t17_featuretitle1'] = "Feature Title 1";
< $tmp['t17_featurepara1'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit</p>";
< $tmp['t17_featurelink2'] = "histories/feature2.php";
< $tmp['t17_featuretitle2'] = "Feature Title 2";
< $tmp['t17_featurepara2'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit in eum non pereat sed habeat vitam aeternam non enim misit Deus Filium suum in mundum ut iudicet mundum sed ut salvetur mundus per ipsum qui credit in eum non iudicatur qui autem non credit iam iudicatus est quia non credidit in nomine unigeniti Filii Dei hoc est autem iudicium quia lux venit in mundum et dilexerunt</p>";
< $tmp['t17_featurethumb2'] = "img/thumb3.jpg";
< $tmp['t18_maintitle'] = "Surname Genealogy Pages";
< $tmp['t18_headsubtitle'] = "a history of the surname family";
< $tmp['t18_welcome'] = "Welcome!";
< $tmp['t18_mainimage'] = "img/wedding.jpg";
< $tmp['t18_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
< vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
< Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
< congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
< imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
< $tmp['t18_featuretitle1'] = "Feature 1 (optional)";
< $tmp['t18_featurepara1'] = "<p>Add your own content, or blank out the headline and feature text in the Template Settings to remove this box.</p>";
< $tmp['t18_dadside'] = "His Side";
< $tmp['t18_dadperson'] = "I2";
< $tmp['t18_dadtree'] = "mytreeid";
< $tmp['t18_momside'] = "Her Side";
< $tmp['t18_momperson'] = "I1";
< $tmp['t18_momtree'] = "mytreeid";
< $tmp['t18_featurelinks'] = "Third Link, http://tngsitebuilding.com
< Fourth Link, http://tngsitebuilding.com/blog";
< $tmp['t18_featurelink1'] = "histories/feature1.php";
< $tmp['t18_featuretitle1'] = "Feature Title 1";
< $tmp['t18_featurepara1'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit</p>";
< $tmp['t18_featurelink2'] = "histories/feature2.php";
< $tmp['t18_featuretitle2'] = "Feature Title 2";
< $tmp['t18_featurepara2'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit in eum non pereat sed habeat vitam aeternam non enim misit Deus Filium suum in mundum ut iudicet mundum sed ut salvetur mundus per ipsum qui credit in eum non iudicatur qui autem non credit iam iudicatus est quia non credidit in nomine unigeniti Filii Dei hoc est autem iudicium quia lux venit in mundum et dilexerunt</p>";
< $tmp['t18_featurethumb2'] = "img/thumb3.jpg";
< ?>
---
> <?php
> $tmp['t1_mainimage'] = "img/home-photo.jpg";
> $tmp['t1_titlechoice'] = "text";
> $tmp['t1_maintitle'] = "Our Family History";
> $tmp['t1_titleimage'] = "img/home-title.gif";
> $tmp['t1_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
> volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
> Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
> et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
> $tmp['t1_headimgplustitle'] = "img/header-title.gif";
> $tmp['t2_mainimage'] = "img/mainphoto.jpg";
> $tmp['t2_titlechoice'] = "text";
> $tmp['t2_maintitle'] = "Our Family<br />Genealogy Pages";
> $tmp['t2_titleimage'] = "img/homeheader.gif";
> $tmp['t2_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
> volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
> Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
> et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
> $tmp['t2_pedperson'] = "I1";
> $tmp['t2_pedtree'] = "mytreeid";
> $tmp['t2_phhistperson'] = "I1";
> $tmp['t2_phhisttree'] = "mytreeid";
> $tmp['t2_headimg'] = "img/headerphoto.jpg";
> $tmp['t2_headtitleimg'] = "img/headertitle.gif";
> $tmp['t3_mainimage'] = "img/mainstreet.jpg";
> $tmp['t3_titlechoice'] = "text";
> $tmp['t3_maintitle'] = "Our Family History";
> $tmp['t3_titleimage'] = "img/title.gif";
> $tmp['t3_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
> volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
> Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
> et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
> $tmp['t3_headimg'] = "img/headerphoto.jpg";
> $tmp['t3_headtitleimg'] = "img/headertitle.gif";
> $tmp['t4_titlechoice'] = "text";
> $tmp['t4_titleimg'] = "img/title.gif";
> $tmp['t4_headtitle1'] = "Our Family";
> $tmp['t4_headtitle2'] = "Genealogy Pages";
> $tmp['t4_mainimage'] = "img/bigphoto.jpg";
> $tmp['t4_photocaption'] = "Mt. Pleasant, Utah, about 1915";
> $tmp['t4_headline'] = "Main Feature";
> $tmp['t4_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
> volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
> Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
> et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
> $tmp['t4_featuretitle1'] = "Feature Story 1";
> $tmp['t4_featurelink1'] = "histories/feature1.php";
> $tmp['t4_featurethumb1'] = "img/featurethumb1.gif";
> $tmp['t4_featurepara1'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
> $tmp['t4_featuretitle2'] = "Feature Story 2";
> $tmp['t4_featurelink2'] = "histories/feature2.php";
> $tmp['t4_featurethumb2'] = "img/featurethumb2.gif";
> $tmp['t4_featurepara2'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
> $tmp['t4_featuretitle3'] = "Feature Story 3";
> $tmp['t4_featurelink3'] = "histories/feature3.php";
> $tmp['t4_featurethumb3'] = "img/featurethumb3.gif";
> $tmp['t4_featurepara3'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
> $tmp['t4_featuretitle4'] = "Feature Story 4";
> $tmp['t4_featurelink4'] = "histories/feature4.php";
> $tmp['t4_featurethumb4'] = "img/featurethumb1.gif";
> $tmp['t4_featurepara4'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
> $tmp['t4_headimg'] = "img/smallphoto.jpg";
> $tmp['t5_maintitle'] = "Our Family History and Ancestry";
> $tmp['t5_mainimage'] = "img/mediumphoto.jpg";
> $tmp['t5_headimg'] = "img/smallphoto.jpg";
> $tmp['t5_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed
> diam nonummy nibh euismod tincidunt ut laoreet dolore magna
> aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud
> exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea
> commodo consequat. Duis autem vel eum iriure dolor in hendrerit in
> vulputate velit esse molestie consequat, vel illum dolore eu
> feugiat nulla facilisis at vero eros et accumsan et iusto odio
> dignissim qui blandit praesent luptatum zzril delenit a.";
> $tmp['t6_maintitle'] = "Our Family History";
> $tmp['t6_headimg'] = "img/titlebottom.jpg";
> $tmp['t6_mainpara'] = "This is where you can welcome the user to your site.";
> $tmp['t6_searchpara'] = "To search the genealogy database, enter a name below. You will find many families!";
> $tmp['t6_fhpara'] = "You can use this section to link to some of your more interesting family histories.";
> $tmp['t6_hisside'] = "His Side";
> $tmp['t6_herside'] = "Her Side";
> $tmp['t6_fhlinkshis'] = "<a href=\"extrastree.php?personID=I1&amp;tree=T0001&amp;showall=1\">Individual 1</a><br/>
> <a href=\"extrastree.php?personID=I2&amp;tree=T0001&amp;showall=1\">Individual 2</a><br/>";
> $tmp['t6_fhlinkshers'] = "<a href=\"extrastree.php?personID=I3&amp;tree=T0001&amp;showall=1\">Individual 3</a><br/>
> <a href=\"extrastree.php?personID=I4&amp;tree=T0001&amp;showall=1\">Individual 4</a><br/>";
> $tmp['t6_mwpara'] = "Use this section to display information about individuals you are actively researching.";
> $tmp['t6_respara'] = "List resources here that you would like to share with others.";
> $tmp['t6_reslinks'] = "<a href=\"https://www.ancestry.com\" target=\"_blank\">Ancestry.com</a><br />
> <a href=\"https://fold3.com\" target=\"_blank\">Fold3.com</a><br />
> <a href=\"https://tngsitebuilding.com\" target=\"_blank\">TNG Software</a>";
> $tmp['t7_mainimage'] = "img/bigphoto.jpg";
> $tmp['t7_titlechoice'] = "image";
> $tmp['t7_maintitle'] = "Our Family<br />History";
> $tmp['t7_titleimg'] = "img/logo.jpg";
> $tmp['t7_photocaption'] = "Mt. Pleasant, Utah, about 1915";
> $tmp['t7_headline'] = "Main Feature";
> $tmp['t7_mainpara'] = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
> volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
> Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros
> et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit a";
> $tmp['t7_newstext'] = "This section can be used for brief news announcements";
> $tmp['t8_headimg'] = "img/titletop.jpg";
> $tmp['t8_mainpara'] = "This is where you can welcome a user to your site.  You might also give them some basic information on navigating and links to any help or FAQ pages you may have.";
> $tmp['t8_latestnews'] = "<b>5 Jan 2009</b> - Added a whole new look to my site.<br/><br/>
> <b>25 Dec 2008</b> - Put years and years of work into my family research.<br/><br/>";
> $tmp['t8_featurespara'] = "<p><a href=\"mostwanted.php\">Most Wanted</a> - I am looking for information about these ancestors.  Can you help?</p>
> <p><a href=\"whatsnew.php\">What's New</a> - View the latest updates made to the site.</p>";
> $tmp['t8_menutitle'] = "Site Menu";
> $tmp['t8_headtitle1'] = "surname";
> $tmp['t8_headtitle2'] = "genealogy";
> $tmp['t8_headtitle3'] = "pages";
> $tmp['t8_headsubtitle'] = "genealogy of the surname family";
> $tmp['t8_momside'] = "Mom's Side";
> $tmp['t8_momsidenames'] = "(Smith/Jones)";
> $tmp['t8_momperson'] = "I1";
> $tmp['t8_momtree'] = "mytreeid";
> $tmp['t8_dadside'] = "Dad's Side";
> $tmp['t8_dadsidenames'] = "(Johnson/Williams)";
> $tmp['t8_dadperson'] = "I2";
> $tmp['t8_dadtree'] = "mytreeid";
> $tmp['t9_maintitle'] = "Our Family History";
> $tmp['t9_headsubtitle'] = "genealogy of the surname family";
> $tmp['t9_headimg'] = "img/header-object.png";
> $tmp['t9_welcome'] = "Welcome!";
> $tmp['t9_mainimage'] = "img/annie-age17-recolored.jpg";
> $tmp['t9_dadside'] = "His Side";
> $tmp['t9_dadperson'] = "I2";
> $tmp['t9_dadtree'] = "mytreeid";
> $tmp['t9_momside'] = "Her Side";
> $tmp['t9_momperson'] = "I1";
> $tmp['t9_momtree'] = "mytreeid";
> $tmp['t9_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t9_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Cras elit nisl, rhoncus nec iaculis ultricies, feugiat eget sapien. Pellentesque ac felis tellus.</p>
> <p>Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices. Phasellus elit dolor, porttitor id consectetur sit amet, posuere id magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
> <p>Suspendisse pharetra auctor pharetra. Nunc a sollicitudin est. Curabitur ullamcorper gravida felis, sit amet scelerisque lorem iaculis sed. Donec vel neque in neque porta venenatis sed sit amet lectus. Fusce ornare elit nisl, feugiat bibendum lorem. Vivamus pretium dictum sem vel laoreet. In fringilla pharetra purus, semper vulputate ligula cursus in. Donec at nunc nec dui laoreet porta eu eu ipsum. Sed eget lacus sit amet risus elementum dictum.</p>";
> $tmp['t9_featurelinks'] = "Feature 1, showmedia.php?mediaID=xxx
> Feature 2, histories/feature2.php
> Feature 3, https://www.other-web-site.com/feature3.html";
> $tmp['t9_featurepara'] = "Lorem ipsum dolor sit amet. Nam sit amet sem. Mauris a ante.";
> $tmp['t9_reslinks'] = "Ancestry, https://www.ancestry.com
> Archives.com, https://archives.com
> Cyndi's List, https://cyndislist.com
> FamilySearch, https://familysearch.org
> Find a Grave, https://findagrave.com
> Fold3, https://fold3.com
> Rootsweb, https://rootsweb.com
> TNG, https://tngsitebuilding.com";
> $tmp['t10_maintitle'] = "Our Family History";
> $tmp['t10_headsubtitle'] = "genealogy of the surname family";
> $tmp['t10_headimg'] = "img/header-object.png";
> $tmp['t10_welcome'] = "Welcome!";
> $tmp['t10_mainimage'] = "img/beatrice-carlisle-soft.jpg";
> $tmp['t10_dadside'] = "His Side";
> $tmp['t10_dadperson'] = "I2";
> $tmp['t10_dadtree'] = "mytreeid";
> $tmp['t10_momside'] = "Her Side";
> $tmp['t10_momperson'] = "I1";
> $tmp['t10_momtree'] = "mytreeid";
> $tmp['t10_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t10_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Cras elit nisl, rhoncus nec iaculis ultricies, feugiat eget sapien. Pellentesque ac felis tellus.</p>
> <p>Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices. Phasellus elit dolor, porttitor id consectetur sit amet, posuere id magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
> <p>Suspendisse pharetra auctor pharetra. Nunc a sollicitudin est. Curabitur ullamcorper gravida felis, sit amet scelerisque lorem iaculis sed. Donec vel neque in neque porta venenatis sed sit amet lectus. Fusce ornare elit nisl, feugiat bibendum lorem. Vivamus pretium dictum sem vel laoreet. In fringilla pharetra purus, semper vulputate ligula cursus in. Donec at nunc nec dui laoreet porta eu eu ipsum. Sed eget lacus sit amet risus elementum dictum.</p>";
> $tmp['t10_featurelinks'] = "Feature 1, showmedia.php?mediaID=xxx
> Feature 2, histories/feature2.php
> Feature 3, https://www.other-web-site.com/feature3.html";
> $tmp['t10_featurepara'] = "Lorem ipsum dolor sit amet. Nam sit amet sem. Mauris a ante.";
> $tmp['t10_reslinks'] = "Ancestry, https://www.ancestry.com
> Archives.com, https://archives.com
> Cyndi's List, https://cyndislist.com
> FamilySearch, https://familysearch.org
> Find a Grave, https://findagrave.com
> Fold3, https://fold3.com
> Rootsweb, https://rootsweb.com
> TNG, https://tngsitebuilding.com";
> $tmp['t11_maintitle'] = "Our Family History";
> $tmp['t11_mainimage'] = "img/mainphoto.jpg";
> $tmp['t11_dadside'] = "His Side";
> $tmp['t11_dadperson'] = "I2";
> $tmp['t11_dadtree'] = "mytreeid";
> $tmp['t11_momside'] = "Her Side";
> $tmp['t11_momperson'] = "I1";
> $tmp['t11_momtree'] = "mytreeid";
> $tmp['t11_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t11_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
> vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
> Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
> congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
> imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
> $tmp['t12_maintitle'] = "Our Family Genealogy Pages";
> $tmp['t12_headsubtitle'] = "Discovering our American, Canadian and European Ancestors";
> $tmp['t12_headimg'] = "img/book.png";
> $tmp['t12_welcome'] = "Welcome!";
> $tmp['t12_mainpara'] = "<p>This is where you can welcome a user to your site. You might also give them some basic information on navigating and links to any help or FAQ pages you may have.</p>
> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Cras elit nisl, rhoncus nec iaculis ultricies, feugiat eget sapien. Pellentesque ac felis tellus.</p>
> <p>Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices. Phasellus elit dolor, porttitor id consectetur sit amet, posuere id magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
> <p>Suspendisse pharetra auctor pharetra. Nunc a sollicitudin est. Curabitur ullamcorper gravida felis, sit amet scelerisque lorem iaculis sed. Donec vel neque in neque porta venenatis sed sit amet lectus. Fusce ornare elit nisl, feugiat bibendum lorem. Vivamus pretium dictum sem vel laoreet. In fringilla pharetra purus, semper vulputate ligula cursus in. Donec at nunc nec dui laoreet porta eu eu ipsum. Sed eget lacus sit amet risus elementum dictum.</p>";
> $tmp['t12_photol'] = "img/charlemagne1.jpg";
> $tmp['t12_phototitlel'] = "Emperor Charlemagne";
> $tmp['t12_photocaptionl'] = "King Charles I of France (Charlemagne) is a grandfather to many persons in our family tree. As a result we have many kings, queens, dukes, duchesses, etc. as grandparents and cousins.";
> $tmp['t12_featurelink1'] = "https://en.wikipedia.org/wiki/Charlemagne";
> $tmp['t12_photor'] = "img/augustinegrignon.jpg";
> $tmp['t12_phototitler'] = "Augustin Grignon";
> $tmp['t12_photocaptionr'] = "Augustin Grignon was a fur trader and general entrepreneur in the Fox River Valley in territorial Wisconsin, surviving into its early years of statehood.";
> $tmp['t12_featurelink2'] = "https://en.wikipedia.org/wiki/Augustin_Grignon";
> $tmp['t12_topsurnames'] = "Top 100 Surnames in Our Family Tree";
> $tmp['t13_maintitle'] = "Our Family History";
> $tmp['t13_mainimage'] = "img/mainphoto.jpg";
> $tmp['t13_dadside'] = "His Side";
> $tmp['t13_dadperson'] = "I2";
> $tmp['t13_dadtree'] = "mytreeid";
> $tmp['t13_momside'] = "Her Side";
> $tmp['t13_momperson'] = "I1";
> $tmp['t13_momtree'] = "mytreeid";
> $tmp['t13_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t13_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
> vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
> Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
> congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
> imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
> $tmp['t14_maintitle'] = "Our Family History";
> $tmp['t14_headsubtitle'] = "The Genealogy of the Surname Family";
> $tmp['t14_mainimage'] = "img/mainphoto.jpg";
> $tmp['t14_photocaption'] = "Wedding photo for Niels Jensen and Nicolena Rolfsen, about 1852.";
> $tmp['t14_headimg'] = "img/smallphoto.jpg";
> $tmp['t14_headimg2'] = "img/smallphoto2.jpg";
> $tmp['t14_headimg3'] = "img/smallphoto3.jpg";
> $tmp['t14_dadside'] = "His Side";
> $tmp['t14_dadperson'] = "I2";
> $tmp['t14_dadtree'] = "mytreeid";
> $tmp['t14_momside'] = "Her Side";
> $tmp['t14_momperson'] = "I1";
> $tmp['t14_momtree'] = "mytreeid";
> $tmp['t14_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t14_welcome'] = "Welcome!";
> $tmp['t14_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
> vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
> Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
> congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
> imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
> $tmp['t15_maintitle'] = "History of the Surname Family";
> $tmp['t15_titleimg'] = "img/lublin.jpg";
> $tmp['t15_dadside'] = "His Side";
> $tmp['t15_dadperson'] = "I2";
> $tmp['t15_dadtree'] = "mytreeid";
> $tmp['t15_momside'] = "Her Side";
> $tmp['t15_momperson'] = "I1";
> $tmp['t15_momtree'] = "mytreeid";
> $tmp['t15_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t15_subhead1'] = "Featured Article";
> $tmp['t15_featuretitle1'] = "Feature Title 1";
> $tmp['t15_mainimage'] = "img/woman-sepia.jpg";
> $tmp['t15_featurelink1'] = "histories/feature1.php";
> $tmp['t15_featurepara1'] = "<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.</p>";
> $tmp['t15_subhead2'] = "Other Featured Articles";
> $tmp['t15_featurethumb2'] = "img/children.jpg";
> $tmp['t15_featuretitle2'] = "Feature Title 2";
> $tmp['t15_featurelink2'] = "histories/feature2.php";
> $tmp['t15_featurepara2'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit in eum non pereat sed habeat vitam aeternam non enim misit Deus Filium suum in mundum ut iudicet mundum sed ut salvetur mundus per ipsum qui credit in eum non iudicatur qui autem non credit iam iudicatus est quia non credidit in nomine unigeniti Filii Dei hoc est autem iudicium quia lux venit in mundum et dilexerunt</p>";
> $tmp['t15_featurethumb3'] = "img/women.jpg";
> $tmp['t15_featuretitle3'] = "Feature Title 3";
> $tmp['t15_featurelink3'] = "histories/feature3.php";
> $tmp['t15_featurepara3'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit in eum non pereat sed habeat vitam aeternam non enim misit Deus Filium suum in mundum ut iudicet mundum sed ut salvetur mundus per ipsum qui credit in eum non iudicatur qui autem non credit iam iudicatus est quia non credidit in nomine unigeniti Filii Dei hoc est autem iudicium quia lux venit in mundum et dilexerunt</p>";
> $tmp['t15_sidebarhead1'] = "Sidebar Heading 1";
> $tmp['t15_featurethumb4'] = "img/thumb1.jpg";
> $tmp['t15_featuretitle4'] = "Feature Title 4";
> $tmp['t15_featurelink4'] = "histories/feature4.php";
> $tmp['t15_featurepara4'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
> $tmp['t15_featurethumb5'] = "img/thumb2.jpg";
> $tmp['t15_featuretitle5'] = "Feature Title 5";
> $tmp['t15_featurelink5'] = "histories/feature5.php";
> $tmp['t15_featurepara5'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
> $tmp['t15_featurethumb6'] = "img/thumb3.jpg";
> $tmp['t15_featuretitle6'] = "Feature Title 6";
> $tmp['t15_featurelink6'] = "histories/feature6.php";
> $tmp['t15_featurepara6'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
> $tmp['t15_sidebarhead2'] = "Sidebar Heading 2";
> $tmp['t15_featurethumb7'] = "img/family-tracks.jpg";
> $tmp['t15_featurelink7'] = "histories/feature7.php";
> $tmp['t15_featurepara7'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
> $tmp['t15_sidebarhead3'] = "Sidebar Heading 3";
> $tmp['t15_featurethumb8'] = "img/men.jpg";
> $tmp['t15_featurelink8'] = "histories/feature8.php";
> $tmp['t15_featurepara8'] = "<p>fieri his qui credunt in nomine eius qui non ex sanguinibus neque ex voluntate carnis neque ex voluntate</p>";
> $tmp['t15_texttitle1'] = "Text Title 1";
> $tmp['t15_textlink1'] = "custom_page1.php";
> $tmp['t15_textpara1'] = "<p>Verbum hoc erat in principio apud Deum omnia per ipsum facta sunt et sine ipso factum est nihil quod factum est in ipso vita erat et vita erat lux hominum et lux in tenebris lucet et tenebrae eam non conprehenderunt fuit homo missus.</p><p>factum est et habitavit in nobis et vidimus gloriam eius gloriam quasi unigeniti a Patre plenum gratiae et veritatis.</p>";
> $tmp['t15_texttitle2'] = "Text Title 2";
> $tmp['t15_textlink2'] = "custom_page2.php";
> $tmp['t15_textpara2'] = "<p>Verbum hoc erat in principio apud Deum omnia per ipsum facta sunt et sine ipso factum est nihil quod factum est in ipso vita erat et vita erat lux hominum et lux in tenebris lucet et tenebrae eam non conprehenderunt fuit homo missus.</p><p>factum est et habitavit in nobis et vidimus gloriam eius gloriam quasi unigeniti a Patre plenum gratiae et veritatis.</p>";
> $tmp['t15_texttitle3'] = "Text Title 3";
> $tmp['t15_textpara3'] = "<p>In principio erat Verbum et Verbum erat apud Deum et Deus erat Verbum hoc erat in principio apud Deum omnia per ipsum</p>";
> $tmp['t16_maintitle'] = "Surname Genealogy Pages";
> $tmp['t16_welcome'] = "Welcome!";
> $tmp['t16_mainimage'] = "img/mainphoto.jpg";
> $tmp['t16_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
> vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
> Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
> congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
> imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
> $tmp['t16_featuretitle1'] = "Feature 1 (optional)";
> $tmp['t16_featurepara1'] = "<p>Add your own content, or blank out the headline and feature text in the Template Settings to remove this box.</p>";
> $tmp['t16_dadside'] = "His Side";
> $tmp['t16_dadperson'] = "I2";
> $tmp['t16_dadtree'] = "mytreeid";
> $tmp['t16_momside'] = "Her Side";
> $tmp['t16_momperson'] = "I1";
> $tmp['t16_momtree'] = "mytreeid";
> $tmp['t16_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t17_maintitle'] = "Surname Genealogy Pages";
> $tmp['t17_headsubtitle'] = "a history of the surname family";
> $tmp['t17_welcome'] = "Welcome!";
> $tmp['t17_mainimage'] = "img/family.jpg";
> $tmp['t17_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
> vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
> Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
> congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
> imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
> $tmp['t17_featuretitle1'] = "Feature 1 (optional)";
> $tmp['t17_featurepara1'] = "<p>Add your own content, or blank out the headline and feature text in the Template Settings to remove this box.</p>";
> $tmp['t17_dadside'] = "His Side";
> $tmp['t17_dadperson'] = "I2";
> $tmp['t17_dadtree'] = "mytreeid";
> $tmp['t17_momside'] = "Her Side";
> $tmp['t17_momperson'] = "I1";
> $tmp['t17_momtree'] = "mytreeid";
> $tmp['t17_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t17_featurelink1'] = "histories/feature1.php";
> $tmp['t17_featuretitle1'] = "Feature Title 1";
> $tmp['t17_featurepara1'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit</p>";
> $tmp['t17_featurelink2'] = "histories/feature2.php";
> $tmp['t17_featuretitle2'] = "Feature Title 2";
> $tmp['t17_featurepara2'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit in eum non pereat sed habeat vitam aeternam non enim misit Deus Filium suum in mundum ut iudicet mundum sed ut salvetur mundus per ipsum qui credit in eum non iudicatur qui autem non credit iam iudicatus est quia non credidit in nomine unigeniti Filii Dei hoc est autem iudicium quia lux venit in mundum et dilexerunt</p>";
> $tmp['t17_featurethumb2'] = "img/thumb3.jpg";
> $tmp['t18_maintitle'] = "Surname Genealogy Pages";
> $tmp['t18_headsubtitle'] = "a history of the surname family";
> $tmp['t18_welcome'] = "Welcome!";
> $tmp['t18_mainimage'] = "img/wedding.jpg";
> $tmp['t18_mainpara'] = "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet congue vulputate, nisi erat iaculis nibh,
> vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin imperdiet arcu, vitae dignissim est posuere id.
> Duis placerat justo eu nunc interdum ultrices. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam pharetra, tellus sit amet
> congue vulputate, nisi erat iaculis nibh, vitae feugiat sapien ante eget mauris. Pellentesque ac felis tellus. Aenean sollicitudin
> imperdiet arcu, vitae dignissim est posuere id. Duis placerat justo eu nunc interdum ultrices.</p>";
> $tmp['t18_featuretitle1'] = "Feature 1 (optional)";
> $tmp['t18_featurepara1'] = "<p>Add your own content, or blank out the headline and feature text in the Template Settings to remove this box.</p>";
> $tmp['t18_dadside'] = "His Side";
> $tmp['t18_dadperson'] = "I2";
> $tmp['t18_dadtree'] = "mytreeid";
> $tmp['t18_momside'] = "Her Side";
> $tmp['t18_momperson'] = "I1";
> $tmp['t18_momtree'] = "mytreeid";
> $tmp['t18_featurelinks'] = "Third Link, https://tngsitebuilding.com
> Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t18_featurelink1'] = "histories/feature1.php";
> $tmp['t18_featuretitle1'] = "Feature Title 1";
> $tmp['t18_featurepara1'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit</p>";
> $tmp['t18_featurelink2'] = "histories/feature2.php";
> $tmp['t18_featuretitle2'] = "Feature Title 2";
> $tmp['t18_featurepara2'] = "<p>ei quomodo possunt haec fieri respondit Iesus et dixit ei tu es magister Israhel et haec ignoras amen amen dico tibi quia quod scimus loquimur et quod vidimus testamur et testimonium nostrum non accipitis si terrena dixi vobis et non creditis quomodo si dixero vobis caelestia credetis et nemo ascendit in caelum nisi qui descendit de caelo Filius hominis qui est in caelo et sicut Moses exaltavit serpentem in deserto ita exaltari oportet Filium hominis ut omnis qui credit in ipso non pereat sed habeat vitam aeternam sic enim dilexit Deus mundum ut Filium suum unigenitum daret ut omnis qui credit in eum non pereat sed habeat vitam aeternam non enim misit Deus Filium suum in mundum ut iudicet mundum sed ut salvetur mundus per ipsum qui credit in eum non iudicatur qui autem non credit iam iudicatus est quia non credidit in nomine unigeniti Filii Dei hoc est autem iudicium quia lux venit in mundum et dilexerunt</p>";
> $tmp['t18_featurethumb2'] = "img/thumb3.jpg";
> $tmp['t19_maintitle'] = "Your Genealogy Site";
> $tmp['t19_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t19_headimg'] = "img/logo.png";
> $tmp['t19_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t19_headline-1'] = "Share your ancestor's story";
> $tmp['t19_subhead-1'] = "Researchers live for stories and facts";
> $tmp['t19_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t19_headline-2'] = "Find people you never knew";
> $tmp['t19_subhead-2'] = "Enjoy our pictures and if you have pictures, please share them with us";
> $tmp['t19_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t19_headline-3'] = "Searching for clues";
> $tmp['t19_subhead-3'] = "We hope you find your ancestors here!";
> $tmp['t19_featuretitle1'] = "The Chosen";
> $tmp['t19_featurepara1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t19_featurelink1'] = "histories/feature1.php";
> $tmp['t19_featuretitle2'] = "The Bones of My Bones";
> $tmp['t19_featurepara2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<br> <em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t19_featurethumb2'] = "img/topleft.jpg";
> $tmp['t19_featurelinks'] = "";
> $tmp['t19_featurelink2'] = "";
> $tmp['t19_featuretitle3'] = "Featured Topic";
> $tmp['t19_featurepara3'] = "This paragraph can describe either ancestors, places, any Featured relative or whatever you wish to add here. There is a button below it to click for MORE information.";
> $tmp['t19_featurelink3'] = "";
> $tmp['t19_featuretitle4'] = "Links and Events";
> $tmp['t19_dadside'] = "His Side";
> $tmp['t19_dadperson'] = "I2";
> $tmp['t19_dadtree'] = "mytreeid";
> $tmp['t19_momside'] = "Her Side";
> $tmp['t19_momperson'] = "I1";
> $tmp['t19_momtree'] = "mytreeid";
> $tmp['t19_link-1'] = "Link 1 code";
> $tmp['t19_texttitle1'] = "Name of Link 1";
> $tmp['t19_link-2'] = "Link 2 code";
> $tmp['t19_texttitle2'] = "Name of Link 2";
> $tmp['t19_link-3'] = "Link 3 Code";
> $tmp['t19_texttitle3'] = "Name of Link 3";
> $tmp['t19_textpara1'] = "Short Paragraph Goes Here";
> $tmp['t19_headline'] = "Our Families";
> $tmp['t19_subhead1'] = "Our Ancestors Were Adventurers";
> $tmp['t19_sniptitle-1'] = "Fred Smith Family";
> $tmp['t19_snipname-1'] = "Fred Smith";
> $tmp['t19_snipinfoone-1'] = "Born 1862";
> $tmp['t19_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t19_snipimage-1'] = "snip1.jpg";
> $tmp['t19_snipperson-1'] = "";
> $tmp['t19_sniptree-1'] = "";
> $tmp['t19_sniptitle-2'] = "Dan Jones Family";
> $tmp['t19_snipname-2'] = "Dan Jones";
> $tmp['t19_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t19_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t19_snipimage-2'] = "snip2.jpg";
> $tmp['t19_snipperson-2'] = "";
> $tmp['t19_sniptree-2'] = "";
> $tmp['t19_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t19_snipname-3'] = "Peter Ryan";
> $tmp['t19_snipinfoone-3'] = "Family Name";
> $tmp['t19_snipinfotwo-3'] = "Information";
> $tmp['t19_snipimage-3'] = "snip3.jpg";
> $tmp['t19_snipperson-3'] = "";
> $tmp['t19_sniptree-3'] = "";
> $tmp['t19_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t19_snipname-4'] = "Roy Robbins";
> $tmp['t19_snipinfoone-4'] = "Family Name";
> $tmp['t19_snipinfotwo-4'] = "Information";
> $tmp['t19_snipimage-4'] = "snip4.jpg";
> $tmp['t19_snipperson-4'] = "";
> $tmp['t19_sniptree-4'] = "";
> $tmp['t19_featuretitle5'] = "Herman John Franklin";
> $tmp['t19_featurethumb5'] = "img/herman.jpg";
> $tmp['t19_featurepara5'] = "Herman John Franklin is the father of Robert Franklin. Bobby was adopted when he was approximately six years old.";
> $tmp['t19_featurelink5'] = "";
> $tmp['t19_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t19_quotesubhead'] = "We Hope You Enjoy Them";
> $tmp['t19_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t19_author-1'] = "Mark Twain";
> $tmp['t19_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t19_author-2'] = "Howard K. Nixon";
> $tmp['t19_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t19_author-3'] = "Jimmy Carter";
> $tmp['t19_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t19_author-4'] = "Florence King";
> $tmp['t19_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t19_author-5'] = "Ellen";
> $tmp['t19_featuretitle6'] = "Fredrick P. Valley";
> $tmp['t19_featurethumb6'] = "img/man.jpg";
> $tmp['t19_featurepara6'] = "Fred is the grandfather of Robert Franklin. His parents were Reuben E. Valley and Sarah Ann Trucker.";
> $tmp['t19_featurelink6'] = "";
> $tmp['t19_ttitletext'] = "Footer Text";
> $tmp['t19_link'] = "Link or email address";
> $tmp['t19_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> $tmp['t20_titlechoice'] = "text";
> $tmp['t20_leftimg'] = "img/left-photo.jpg";
> $tmp['t20_titleimg'] = "img/title.gif";
> $tmp['t20_rightimg'] = "img/right-photo.jpg";
> $tmp['t20_headtitle1'] = "Our Families Genealogy";
> $tmp['t20_headtitle2'] = " and their Heritage";
> $tmp['t20_photoption'] = "static";
> $tmp['t20_mainimage'] = "img/bigphoto.jpg";
> $tmp['t20_photocaption'] = "Mt. Pleasant, Utah, about 1915";
> $tmp['t20_randomphotowidth'] = "350";
> $tmp['t20_randomphotoheight'] = "250";
> $tmp['t20_randomphotomediatypeID'] = "photos";
> $tmp['t20_dadheading'] = "Paternal Family";
> $tmp['t20_dadpagelink'] = "histories/paternal.php";
> $tmp['t20_dadpara'] = "<p>Write a brief paragraph describing your  paternal side of the family tree, describing</p><ul><li>where they originate,</li><li>their migration to a different location, </li><li>their migration path and </li><li>where they finally settled.</li></ul><p>Or use this paragraph for a different reason and change the heading accordingly.</p>";
> $tmp['t20_dadside'] = "Paternal Ancestors";
> $tmp['t20_dadperson'] = "I4";
> $tmp['t20_dadtree'] = "";
> $tmp['t20_momheading'] = "Maternal Family";
> $tmp['t20_mompagelink'] = "histories/maternal.php";
> $tmp['t20_mompara'] = "<p>Write a brief paragraph describing your maternal side of the family tree, describing</p><ul><li>where they originate,</li><li>their migration to a different location, </li><li>their migration path and </li><li>where they finally settled.</li></ul><p>Or use this paragraph for a different reason and change the heading accordingly.</p>";
> $tmp['t20_momside'] = "Maternal Ancestors";
> $tmp['t20_momperson'] = "I5";
> $tmp['t20_momtree'] = "";
> $tmp['t20_spdadheading'] = "Spouse's Paternal Family";
> $tmp['t20_spdadpagelink'] = "histories/spouse_paternal.php";
> $tmp['t20_spdadpara'] = "<p>Write a brief paragraph describing your spouse's paternal side of the family tree, describing</p><ul><li>where they originate,</li><li>their migration to a different location, </li><li>their migration path and </li><li>where they finally settled.</li></ul><p>Or use this paragraph for a different reason and change the heading accordingly. </p><p>Copy the histories/paternal.php file to your preferred subfolder, rename it to spouse_paternal.php, and update the Spouse Paternal Page Link accordingly.</p>";
> $tmp['t20_spdadside'] = "Spouse Paternal Ancestors";
> $tmp['t20_spdadperson'] = "I28";
> $tmp['t20_spdadtree'] = "";
> $tmp['t20_spmomheading'] = "Spouse's Maternal Family";
> $tmp['t20_spmompagelink'] = "histories/spouse_maternal.php";
> $tmp['t20_spmompara'] = "<p>Write a brief paragraph describing your spouse's maternal side of the family tree, describing</p><ul><li>where they originate,</li><li>their migration to a different location, </li><li>their migration path and </li><li>where they finally settled.</li></ul><p>Or use this paragraph for a different reason and change the heading accordingly.</p><p>Copy the histories/maternal.php file to your preferred subfolder, rename it to spouse_maternal.php, and update the Spouse Maternal Page Link accordingly.</p>";
> $tmp['t20_spmomside'] = "Spouse Maternal Ancestors";
> $tmp['t20_spmomperson'] = "I29";
> $tmp['t20_spmomtree'] = "";
> $tmp['t20_sidebarhead1'] = "Our Ancestors";
> $tmp['t20_sidebarhead2'] = "Our Stories";
> $tmp['t20_sidebarhead3'] = "Other Topics";
> $tmp['t20_storiesheading'] = "Our Family Stories";
> $tmp['t20_featuretitle1'] = "Family Story 1";
> $tmp['t20_featurelink1'] = "histories/family1.php";
> $tmp['t20_featurethumb1'] = "img/featurethumb1.gif";
> $tmp['t20_featurepara1'] = "Create a brief description of Family Story 1 that you saved in histories/family1.php or update the feature link with the correct php script name.  Copy the family1.php script provided as an example in the template histories/folder.  <a href=\"histories/family1.php\">More information</a> ...";
> $tmp['t20_featuretitle2'] = "Family Story 2";
> $tmp['t20_featurelink2'] = "histories/family2.php";
> $tmp['t20_featurethumb2'] = "img/featurethumb2.gif";
> $tmp['t20_featurepara2'] = "Create a brief description of Family Story 2 that you saved in histories/family2.php or update the feature link with the correct php script name.  Copy and rename the family1.php script provided as an example in the template histories/folder. <a href=\"histories/family2.php\">More information</a> ...";
> $tmp['t20_featuretitle3'] = "Family Story 3";
> $tmp['t20_featurelink3'] = "histories/family3.php";
> $tmp['t20_featurethumb3'] = "img/featurethumb3.gif";
> $tmp['t20_featurepara3'] = "Create a brief description of Family Story 3 that you saved in histories/family3.php or update the feature link with the correct php script name.  Copy and rename the family1.php script provided as an example in the template histories/folder.  <a href=\"histories/family3.php\">More information</a> ...";
> $tmp['t20_featuretitle4'] = "Family Story 4";
> $tmp['t20_featurelink4'] = "histories/family4.php";
> $tmp['t20_featurethumb4'] = "img/featurethumb1.gif";
> $tmp['t20_featurepara4'] = "Create a brief description of Family Story 4 that you saved in histories/family4.php or update the feature link with the correct php script name.   Copy and rename the family1.php script provided as an example in the template histories/folder.   <a href=\"histories/family4.php\">More information</a> ...";
> $tmp['t20_featuretitle5'] = "Family Story 5";
> $tmp['t20_featurelink5'] = "histories/family5.php";
> $tmp['t20_featurethumb5'] = "img/featurethumb2.gif";
> $tmp['t20_featurepara5'] = "Create a brief description of Family Story 5 that you saved in histories/family5.php or update the feature link with the correct php script name.   Copy and rename the family1.php script provided as an example in the template folder.   <a href=\"histories/family5.php\">More information</a> ...";
> $tmp['t20_featuretitle6'] = "Family Story 6";
> $tmp['t20_featurelink6'] = "histories/family6.php";
> $tmp['t20_featurethumb6'] = "img/featurethumb3.gif";
> $tmp['t20_featurepara6'] = "Create a brief description of Family Story 6 that you saved in histories/family6.php or update the feature link with the correct php script name.   Copy and rename the family1.php script provided as an example in the template folder.   <a href=\"histories/family6.php\">More information</a> ...";
> $tmp['t20_topsurnames'] = "The 40 most frequent last names on our site";
> $tmp['t20_nbrsurnames'] = "40";
> 
> $tmp['t21_maintitle'] = "Template 21";
> $tmp['t21_headimg'] = "img/logo.png";
> $tmp['t21_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t21_dadside'] = "His Side";
> $tmp['t21_dadperson'] = "I2";
> $tmp['t21_dadtree'] = "mytreeid";
> $tmp['t21_momside'] = "Her Side";
> $tmp['t21_momperson'] = "I1";
> $tmp['t21_momtree'] = "mytreeid";
> $tmp['t21_link-1'] = "https://genealogywebtemplates.com";
> $tmp['t21_texttitle1'] = "GWT";
> $tmp['t21_link-2'] = "browsemedia.php?mediatypeID=histories";
> $tmp['t21_texttitle2'] = "Histories";
> $tmp['t21_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t21_slideheadline-1'] = "Finding our ancestors is exciting!";
> $tmp['t21_slidetext-1'] = "We hope we help you find your spot in our family";
> $tmp['t21_slidelink-1'] = "histories/place1.php";
> $tmp['t21_slidelinktext-1'] = "Histories";
> $tmp['t21_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t21_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t21_slidetext-2'] = "If you find something we don't have, please share with us.";
> $tmp['t21_slidelink-2'] = "histories/story1.php";
> $tmp['t21_slidelinktext-2'] = "Stories";
> $tmp['t21_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t21_slideheadline-3'] = "We love to search through old records and photos!";
> $tmp['t21_slidetext-3'] = "It's what we do for fun!";
> $tmp['t21_slidelink-3'] = "histories/story1.php";
> $tmp['t21_slidelinktext-3'] = "Family";
> $tmp['t21_featuretitle-1'] = "Welcome to Our Genealogy Site";
> $tmp['t21_featurepara-1'] = "We're so pleased you dropped in to visit our site. We've worked for years on this family and its connections to our ancestors. This is dummy text. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus.</p><p>Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus.";
> $tmp['t21_featurelink-1'] = "browsemedia.php?mediatypeID=histories";
> $tmp['t21_featurelinktext-1'] = "Our Histories";
> $tmp['t21_featuretitle-2'] = "Template 21";
> $tmp['t21_featurepara-2'] = "Need a new look for your TNG or your html genealogy site? We can help!";
> $tmp['t21_featuretitle-3'] = "The Chosen";
> $tmp['t21_featurepara-3'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t21_featurethumb-3'] = "img/wagon.jpg";
> $tmp['t21_featurelink-3'] = "";
> $tmp['t21_sidebartitle-1'] = "Meet Our Family";
> $tmp['t21_sidebartitle-2'] = "Our Pages";
> $tmp['t21_sidebarpara-2'] = "You can use this area to add links to your history pages, people pages or your favorite resources.";
> $tmp['t21_sidebarlink-1'] = "histories/place1.php";
> $tmp['t21_sidebarlinktext-1'] = "Old Homeplace";
> $tmp['t21_sidebarlink-2'] = "histories/story1.php";
> $tmp['t21_sidebarlinktext-2'] = "Coming to America";
> $tmp['t21_sidebarlink-3'] = "histories/story2.php";
> $tmp['t21_sidebarlinktext-3'] = "Moving to France";
> $tmp['t21_sidebarlink-4'] = "histories/places2.php";
> $tmp['t21_sidebarlinktext-4'] = "Irish Ancestors";
> $tmp['t21_sidebarlink-5'] = "histories/feedingdogs.php";
> $tmp['t21_sidebarlinktext-5'] = "Grandmother Feeding the Dogs";
> $tmp['t21_headline-1'] = "Discover Our Family";
> $tmp['t21_snipimage-1'] = "img/top1.jpg";
> $tmp['t21_snipname-1'] = "Ancestor's Name";
> $tmp['t21_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t21_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t21_snipimage-2'] = "img/top2.jpg";
> $tmp['t21_snipname-2'] = "Ancestor's Name";
> $tmp['t21_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t21_sniplink-2'] = "";
> $tmp['t21_snipimage-3'] = "img/top3.jpg";
> $tmp['t21_snipname-3'] = "Ancestor's Name";
> $tmp['t21_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t21_sniplink-3'] = "";
> $tmp['t21_snipimage-4'] = "img/top4.jpg";
> $tmp['t21_snipname-4'] = "Ancestor's Name";
> $tmp['t21_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t21_sniplink-4'] = "";
> $tmp['t21_featuretitle-4'] = "The Bones of My Bones";
> $tmp['t21_featurepara-4'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. 'It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.' <em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t21_featurethumb-4'] = "img/familyphotos.jpg";
> $tmp['t21_featurelink-4'] = "";
> $tmp['t21_topsurnames'] = "Top 100 Surnames";
> $tmp['t21_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t21_footerheadline-1'] = "Quick Links";
> $tmp['t21_footerheadline-2'] = "Contact Us";
> $tmp['t21_footerlink-1'] = "suggest.php";
> $tmp['t21_footerlinktext-1'] = "Contact Us";
> $tmp['t21_footerlink-2'] = "surnames.php";
> $tmp['t21_footerlinktext-2'] = "Our Surnames";
> $tmp['t21_footerlink-3'] = "histories/story1.php";
> $tmp['t21_footerlinktext-3'] = "Our Stories";
> $tmp['t21_footerheadline-4'] = "Webmaster Message";
> $tmp['t21_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t200_maintitle'] = "History of the Surname Family";
> $tmp['t200_dadside'] = "His Side";
> $tmp['t200_dadperson'] = "I2";
> $tmp['t200_dadtree'] = "mytreeid";
> $tmp['t200_momside'] = "Her Side";
> $tmp['t200_momperson'] = "I1";
> $tmp['t200_momtree'] = "mytreeid";
> $tmp['t200_featurelinks'] = "Third Link, https://tngsitebuilding.com, Fourth Link, https://genealogywebtemplates.com/";
> $tmp['t200_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t200_mainimage'] = "img/topleft.jpg";
> $tmp['t200_subhead1'] = "Featured Article";
> $tmp['t200_headimg'] = "img/familyimage.jpg";
> $tmp['t200_featurelink1'] = "histories/feature1.php";
> $tmp['t200_featurepara1'] = "<p>Welcome!</p><p>We're glad you dropped in!</p><p>Hope you like our new look!</p>";
> $tmp['t200_featurepara2'] = "This paragraph has a class of: dropcap. It makes the first letter of the paragraph larger and a different color. This template has a seamless integration with TNG as well as an almost seamless integration with its matching html template as shown on https://genealogywebtemplates.com/. <br><br> We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t200_sniptitle-1'] = "Fred Smith Family";
> $tmp['t200_snipname-1'] = "Fred Smith";
> $tmp['t200_snipinfoone-1'] = "Born 1862";
> $tmp['t200_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t200_snipimage-1'] = "img/snip1.jpg";
> $tmp['t200_snipperson-1'] = "";
> $tmp['t200_sniptree-1'] = "";
> $tmp['t200_sniptitle-2'] = "Dan Jones Family";
> $tmp['t200_snipname-2'] = "Dan Jones";
> $tmp['t200_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t200_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t200_snipimage-2'] = "img/snip2.jpg";
> $tmp['t200_snipperson-2'] = "";
> $tmp['t200_sniptree-2'] = "";
> $tmp['t200_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t200_snipname-3'] = "Peter Ryan";
> $tmp['t200_snipinfoone-3'] = "Family Name";
> $tmp['t200_snipinfotwo-3'] = "Information";
> $tmp['t200_snipimage-3'] = "img/snip3.jpg";
> $tmp['t200_snipperson-3'] = "";
> $tmp['t200_sniptree-3'] = "";
> $tmp['t200_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t200_snipname-4'] = "Roy Robbins";
> $tmp['t200_snipinfoone-4'] = "Family Name";
> $tmp['t200_snipinfotwo-4'] = "Information";
> $tmp['t200_snipimage-4'] = "img/snip4.jpg";
> $tmp['t200_snipperson-4'] = "";
> $tmp['t200_sniptree-4'] = "";
> $tmp['t200_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t200_snipname-5'] = "Barry Rogers";
> $tmp['t200_snipinfoone-5'] = "Family Name";
> $tmp['t200_snipinfotwo-5'] = "Information";
> $tmp['t200_snipimage-5'] = "img/snip5.jpg";
> $tmp['t200_snipperson-5'] = "";
> $tmp['t200_sniptree-5'] = "";
> $tmp['t200_sniptitle-6'] = "Albert Ross Family";
> $tmp['t200_snipname-6'] = "Albert Ross";
> $tmp['t200_snipinfoone-6'] = "Family Name";
> $tmp['t200_snipinfotwo-6'] = "Information";
> $tmp['t200_snipimage-6'] = "img/snip6.jpg";
> $tmp['t200_snipperson-6'] = "";
> $tmp['t200_sniptree-6'] = "";
> $tmp['t200_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t200_snipname-7'] = "Alvy Boardman";
> $tmp['t200_snipinfoone-7'] = "Family Name";
> $tmp['t200_snipinfotwo-7'] = "Information";
> $tmp['t200_snipimage-7'] = "img/snip7.jpg";
> $tmp['t200_snipperson-7'] = "";
> $tmp['t200_sniptree-7'] = "";
> $tmp['t200_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t200_snipname-8'] = "Paul Johnson";
> $tmp['t200_snipinfoone-8'] = "Family Name";
> $tmp['t200_snipinfotwo-8'] = "Information";
> $tmp['t200_snipimage-8'] = "img/snip8.jpg";
> $tmp['t200_snipperson-8'] = "";
> $tmp['t200_sniptree-8'] = "";
> $tmp['t200_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t200_quotesubhead'] = "We hope you enjoy them!";
> $tmp['t200_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t200_author-1'] = "Mark Twain";
> $tmp['t200_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t200_author-2'] = "Howard K. Nixon";
> $tmp['t200_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t200_author-3'] = "Jimmy Carter";
> $tmp['t200_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t200_author-4'] = "Florence King";
> $tmp['t200_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t200_author-5'] = "Ellen";
> $tmp['t200_ttitletext'] = "Footer Text";
> $tmp['t200_link'] = "Link or email address";
> $tmp['t200_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> 
> $tmp['t201_maintitle'] = "Template 201";
> $tmp['t201_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t201_headimg'] = "img/logo.png";
> $tmp['t201_dadperson'] = "I2";
> $tmp['t201_dadtree'] = "mytreeid";
> $tmp['t201_headerlinktext-1'] = "Holley Side";
> $tmp['t201_momperson'] = "I1";
> $tmp['t201_momtree'] = "mytreeid";
> $tmp['t201_headerlinktext-2'] = "Boardman Side";
> $tmp['t201_headerlink-3'] = "surnames.php";
> $tmp['t201_headerlinktext-3'] = "Surnames";
> $tmp['t201_headerlink-4'] = "histories/index.php";
> $tmp['t201_headerlinktext-4'] = "Histories";
> $tmp['t201_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t201_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t201_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t201_slidelink-1'] = "histories/place1.php";
> $tmp['t201_slidelinktext-1'] = "Histories";
> $tmp['t201_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t201_slideheadline-2'] = "Our Smith Family";
> $tmp['t201_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.";
> $tmp['t201_slidelink-2'] = "histories/story1.php";
> $tmp['t201_slidelinktext-2'] = "Stories";
> $tmp['t201_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t201_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t201_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air' we were looking for!";
> $tmp['t201_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t201_slidelinktext-3'] = "GWT";
> $tmp['t201_featuretitle-1'] = "Our Family's Trees";
> $tmp['t201_featurelink-1'] = "searchsite.php";
> $tmp['t201_featurepara-1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t201_featuretitle-2'] = "The Bones of My Bone";
> $tmp['t201_featurepara-2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. ";
> $tmp['t201_featurethumb-1'] = "img/album.jpg";
> $tmp['t201_headline-1'] = "Our Fabulous Families";
> $tmp['t201_snipname-1'] = "Ancestor's Name";
> $tmp['t201_snipperson-1'] = "";
> $tmp['t201_sniptree-1'] = "";
> $tmp['t201_snipimage-1'] = "img/250x250-1.jpg";
> $tmp['t201_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t201_snipname-2'] = "Ancestor's Name";
> $tmp['t201_snipperson-2'] = "";
> $tmp['t201_sniptree-2'] = "";
> $tmp['t201_snipimage-2'] = "img/250x250-2.jpg";
> $tmp['t201_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t201_snipname-3'] = "Ancestor's Name";
> $tmp['t201_snipperson-3'] = "";
> $tmp['t201_sniptree-3'] = "";
> $tmp['t201_snipimage-3'] = "img/250x250-3.jpg";
> $tmp['t201_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t201_snipname-4'] = "Ancestor's Name";
> $tmp['t201_snipperson-4'] = "";
> $tmp['t201_sniptree-4'] = "";
> $tmp['t201_snipimage-4'] = "img/250x250-4.jpg";
> $tmp['t201_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t201_headline-3'] = "Spotlight on What's New";
> $tmp['t201_featuretitle-3'] = "Our Great Grandmother";
> $tmp['t201_featurepara-3'] = "Place information here about your ancestors in the picture - Where they lived, who their parents were, etc.";
> $tmp['t201_featurethumb-3'] = "img/project1.jpg";
> $tmp['t201_featurelink-3'] = "https://genealogywebtemplates.com/webs/gwt201/index.html";
> $tmp['t201_featuretitle-4'] = "Fun At The Farm";
> $tmp['t201_featurepara-4'] = "Place information here about your ancestors in the picture - Where they lived, who their parents were, etc.";
> $tmp['t201_featurethumb-4'] = "img/project2.jpg";
> $tmp['t201_featurelink-4'] = "";
> $tmp['t201_featuretitle-5'] = "After Church";
> $tmp['t201_featurepara-5'] = "Place information here about your ancestors in the picture - Where they lived, who their parents were, etc.";
> $tmp['t201_featurethumb-5'] = "img/project3.jpg";
> $tmp['t201_featurelink-5'] = "";
> $tmp['t201_featuretitle-6'] = "Restoring the Memory";
> $tmp['t201_featurepara-6'] = "That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. </p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t201_topsurnames'] = "Top 50 Surnames";
> $tmp['t201_sidebartitle-1'] = "Cousins, cousins & more cousins...";
> $tmp['t201_sidebarimg-1'] = "img/ancestor1.jpg";
> $tmp['t201_sidebarlink-1'] = "histories/family1.php";
> $tmp['t201_sidebarlinktext-1'] = "Ancestor's Name";
> $tmp['t201_sidebarpara-1'] = "Add information about this ancestor here. You can use a couple of sentences. Click on the name for more information.";
> $tmp['t201_sidebarimg-2'] = "img/ancestor2.jpg";
> $tmp['t201_sidebarlink-2'] = "histories/family2.php";
> $tmp['t201_sidebarlinktext-2'] = "Ancestor's Name";
> $tmp['t201_sidebarpara-2'] = "Add information about this ancestor here. You can use a couple of sentences. Click on the name for more information.";
> $tmp['t201_sidebarimg-3'] = "img/ancestor3.jpg";
> $tmp['t201_sidebarlink-3'] = "histories/family3.php";
> $tmp['t201_sidebarlinktext-3'] = "Ancestor's Name";
> $tmp['t201_sidebarpara-3'] = "Add information about this ancestor here. You can use a couple of sentences. Click on the name for more information.";
> $tmp['t201_sidebarimg-4'] = "img/ancestor4.jpg";
> $tmp['t201_sidebarlink-4'] = "histories/story1.php";
> $tmp['t201_sidebarlinktext-4'] = "Ancestor's Name";
> $tmp['t201_sidebarpara-4'] = "Add information about this ancestor here. You can use a couple of sentences. Click on the name for more information.";
> $tmp['t201_sidebarimg-5'] = "img/ancestor5.jpg";
> $tmp['t201_sidebarlink-5'] = "histories/story2.php";
> $tmp['t201_sidebarlinktext-5'] = "Ancestor's Name";
> $tmp['t201_sidebarpara-5'] = "Add information about this ancestor here. You can use a couple of sentences. Click on the name for more information.";
> $tmp['t201_sidebarimg-6'] = "img/ancestor6.jpg";
> $tmp['t201_sidebarlink-6'] = "histories/stylingyourpage.php";
> $tmp['t201_sidebarlinktext-6'] = "Ancestor's Name";
> $tmp['t201_sidebarpara-6'] = "Add information about this ancestor here. You can use a couple of sentences. Click on the name for more information.";
> $tmp['t201_footerheadline-1'] = "Quick Links";
> $tmp['t201_footerheadline-2'] = "Contact";
> $tmp['t201_footerlinktext-1'] = "Contact Me";
> $tmp['t201_footerlink-2'] = "histories/home.php";
> $tmp['t201_footerlinktext-2'] = "Our Stories";
> $tmp['t201_footerlink-3'] = "https://genealogywebtemplates.com";
> $tmp['t201_footerlinktext-3'] = "Genealogy Web Templates";
> $tmp['t201_footerheadline-4'] = "Webmaster Message";
> $tmp['t201_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t202_maintitle'] = "Template 202";
> $tmp['t202_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t202_headimg'] = "img/logo.png";
> $tmp['t202_dadside'] = "His Side";
> $tmp['t202_dadperson'] = "I2";
> $tmp['t202_dadtree'] = "mytreeid";
> $tmp['t202_headerlinktext-1'] = "Holley Side";
> $tmp['t202_momperson'] = "I1";
> $tmp['t202_momtree'] = "mytreeid";
> $tmp['t202_headerlinktext-2'] = "Boardman Side";
> $tmp['t202_headerlink-3'] = "surnames.php";
> $tmp['t202_headerlinktext-3'] = "Surnames";
> $tmp['t202_headerlink-4'] = "histories/index.php";
> $tmp['t202_headerlinktext-4'] = "Histories";
> $tmp['t202_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t202_slideheadline-1'] = "Ancestor hunting is exciting!";
> $tmp['t202_slidetext-1'] = "We hope we help you with your hunt.";
> $tmp['t202_slidelink-1'] = "histories/place1.php";
> $tmp['t202_slidelinktext-1'] = "Histories";
> $tmp['t202_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t202_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t202_slidetext-2'] = "Please share with us.<br>";
> $tmp['t202_slidelink-2'] = "histories/story1.php";
> $tmp['t202_slidelinktext-2'] = "Stories";
> $tmp['t202_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t202_slideheadline-3'] = "We love TNG!";
> $tmp['t202_slidetext-3'] = "We also love our new look from Genealogy Web Templates.";
> $tmp['t202_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t202_slidelinktext-3'] = "GWT";
> $tmp['t202_featuretitle-1'] = "Our Family";
> $tmp['t202_featurepara-1'] = "We are happy you dropped in! We hope you find common ancestors in our 'labor of love'. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. </p><p>We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. </p><p>It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.</p>";
> $tmp['t202_featurelink-1'] = "histories/home.php";
> $tmp['t202_featurelinktext-1'] = "Histories";
> $tmp['t202_featuretitle-2'] = "My Family";
> $tmp['t202_featurepara-2'] = "This is text that goes with My Family. Add text here to give your visitors a bit more about this topic. Use the link button to send your visitors to the correct place.";
> $tmp['t202_featurethumb-2'] = "img/icon1.jpg";
> $tmp['t202_featurelink-2'] = "surnames.php";
> $tmp['t202_featurelinktext-2'] = "Our Surnames";
> $tmp['t202_featuretitle-3'] = "Immigrating";
> $tmp['t202_featurepara-3'] = "This is text that goes with Immigrating. Add text here to give your visitors a bit more about this topic. Use the link button to send your visitors to the correct place.";
> $tmp['t202_featurethumb-3'] = "img/ship.jpg";
> $tmp['t202_featurelink-3'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t202_featurelinktext-3'] = "Our Photos";
> $tmp['t202_featuretitle-4'] = "Our Resources";
> $tmp['t202_featurepara-4'] = "This is text that goes with Our Resources. Add text here to give your visitors a bit more about this topic. Use the link button to send your visitors to the correct place.";
> $tmp['t202_featurethumb-4'] = "img/icon2.jpg";
> $tmp['t202_featurelink-4'] = "browsesources.php";
> $tmp['t202_featurelinktext-4'] = "Resources";
> $tmp['t202_featuretitle-5'] = "Bones of My Bones";
> $tmp['t202_featurepara-5'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. <br><br>It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. ";
> $tmp['t202_featurethumb-5'] = "img/couple.jpg";
> $tmp['t202_featurelink-5'] = "histories/place1.php";
> $tmp['t202_featurelinktext-5'] = "Places";
> $tmp['t202_tree-5'] = "";
> $tmp['t202_person-5'] = "";
> $tmp['t202_featuretitle-6'] = "A Scribed Called";
> $tmp['t202_featurepara-6'] = "It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are.<br><br> So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<br><br><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t202_featurethumb-6'] = "img/family.jpg";
> $tmp['t202_featurelink-6'] = "histories/feature6.php";
> $tmp['t202_tree-6'] = "";
> $tmp['t202_person-6'] = "";
> $tmp['t202_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t202_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t202_sidebarimg-1'] = "img/family1.jpg";
> $tmp['t202_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t202_sidebarlink-1'] = "histories/place1.php";
> $tmp['t202_sidebarsub-2'] = "Events";
> $tmp['t202_sidebarimg-2'] = "img/family2.jpg";
> $tmp['t202_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t202_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t202_sidebarsub-3'] = "Pictures of Family";
> $tmp['t202_sidebarimg-3'] = "img/family3.jpg";
> $tmp['t202_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t202_sidebarlink-3'] = "";
> $tmp['t202_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t202_sidebarimg-4'] = "img/family4.jpg";
> $tmp['t202_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t202_sidebarlink-4'] = "";
> $tmp['t202_sidebartitle-5'] = "Random Photos";
> $tmp['t202_sidebarpara-5'] = "<em>If you do not wish to have a Random Photo section, just remove it in the index.php and you can use this as a sidebar text section. </em>";
> $tmp['t202_featuretitle-7'] = "Our Pages";
> $tmp['t202_featurepara-7'] = "You can use this area to add your extra history or person pages.";
> $tmp['t202_link-1'] = "histories/index.php";
> $tmp['t202_linktext-1'] = "Our History Pages";
> $tmp['t202_link-2'] = "histories/story1.php";
> $tmp['t202_linktext-2'] = "Our Stories";
> $tmp['t202_link-3'] = "http://usgenweb.org";
> $tmp['t202_linktext-3'] = "USGenWeb";
> $tmp['t202_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t202_linktext-4'] = "Genealogy Web Templates";
> $tmp['t202_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t202_linktext-5'] = "TNG Forum";
> $tmp['t202_author-1'] = "Mark Twain";
> $tmp['t202_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t202_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t202_quotelink-1'] = "histories/place1.php";
> $tmp['t202_author-2'] = "Howard K. Nixon";
> $tmp['t202_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t202_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t202_quotelink-2'] = "";
> $tmp['t202_author-3'] = "Jimmy Carter";
> $tmp['t202_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t202_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t202_quotelink-3'] = "";
> $tmp['t202_author-4'] = "Florence King";
> $tmp['t202_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t202_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t202_quotelink-4'] = "";
> $tmp['t202_author-5'] = "Ellen";
> $tmp['t202_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t202_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t202_quotelink-5'] = "";
> $tmp['t202_author-6'] = "Uncle Ralph";
> $tmp['t202_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t202_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t202_quotelink-6'] = "";
> $tmp['t202_topsurnames'] = "Top 20 Surnames";
> $tmp['t202_textpara1'] = "You can use this area for your Surname Cloud or you can delete the surname cloud in the index.php and use this area for text.";
> $tmp['t202_footerheadline-1'] = "Quick Links";
> $tmp['t202_footerheadline-2'] = "Contact Us";
> $tmp['t202_footerlink-1'] = "suggest.php";
> $tmp['t202_footerlinktext-1'] = "Contact Us";
> $tmp['t202_footerlink-2'] = "surnames.php";
> $tmp['t202_footerlinktext-2'] = "Our Surnames";
> $tmp['t202_footerlink-3'] = "histories/story1.php";
> $tmp['t202_footerlinktext-3'] = "Our Stories";
> $tmp['t202_footerheadline-4'] = "Webmaster Message";
> $tmp['t202_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t203_maintitle'] = "GWT Template 203";
> $tmp['t203_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t203_headimg'] = "img/logo.png";
> 
> $tmp['t203_dadside'] = "His Side";
> $tmp['t203_dadperson'] = "I2";
> $tmp['t203_dadtree'] = "mytreeid";
> $tmp['t203_momside'] = "Her Side";
> $tmp['t203_momperson'] = "I1";
> $tmp['t203_momtree'] = "mytreeid";
> 
> $tmp['t203_welcome'] = "Welcome to Our Web!";
> $tmp['t203_headline-1'] = "Our Goal is to create a great place to find information.";
> $tmp['t203_subhead-1'] = "Have a Look Around! Donate Material!";
> $tmp['t203_textlink1'] = "surnames.php";
> $tmp['t203_textlink2'] = "Our Families";
> 
> // 5 pictures on top row
> 
> $tmp['t203_headline-2'] = " Pictures From Our Families";
> $tmp['t203_subhead-2'] = "Take a look at our ancestors.";
> $tmp['t203_snipname-1'] = "Samantha";
> $tmp['t203_snipimage-1'] = "img/250x250-1.jpg";
> $tmp['t203_sniptree-1'] = "";
> $tmp['t203_snipperson-1'] = "";
> $tmp['t203_snipname-2'] = "Altha ";
> $tmp['t203_snipimage-2'] = "img/250x250-2.jpg";
> $tmp['t203_sniptree-2'] = "";
> $tmp['t203_snipperson-2'] = "";
> $tmp['t203_snipname-3'] = "Robert";
> $tmp['t203_snipimage-3'] = "img/250x250-3.jpg";
> $tmp['t203_sniptree-3'] = "";
> $tmp['t203_snipperson-3'] = "";
> $tmp['t203_snipname-4'] = "Martha";
> $tmp['t203_snipimage-4'] = "img/250x250-4.jpg";
> $tmp['t203_sniptree-4'] = "";
> $tmp['t203_snipperson-4'] = "";
> $tmp['t203_snipname-5'] = "Thomas";
> $tmp['t203_snipimage-5'] = "img/250x250-5.jpg";
> $tmp['t203_sniptree-5'] = "";
> $tmp['t203_snipperson-5'] = "";
> $tmp['t203_featuretitle1'] = "Welcome to Template 203";
> $tmp['t203_featurepara1'] = "We're so happy you stopped by! We hope you like our new look. We have a matching html template should you wish to integrate this family tree site with seamlessly with your html site.</p><p>We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. <br><br>We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. <br><br>It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t203_featuretitle2'] = "They are the Bones of My Bones";
> $tmp['t203_featurethumb2'] = "img/album.jpg";
> $tmp['t203_featurelink2'] = "";
> $tmp['t203_featurepara2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. <br><br>It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. <br><br>So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t203_headline-3'] = "Our Family Research";
> $tmp['t203_featuretitle3'] = "French Research";
> $tmp['t203_subhead-3'] = "Marsha";
> $tmp['t203_featurethumb3'] = "img/project1.jpg";
> $tmp['t203_featurelink3'] = "";
> $tmp['t203_featurepara3'] = "This is the research information we've found. We love the new sources available to us. We certainly wish that we had the ability to read French. Many of our ancestors were from Acadia as well as France.";
> $tmp['t203_featuretitle4'] = "Herman";
> $tmp['t203_subhead-4'] = "Born April 14, 1928";
> $tmp['t203_featurethumb4'] = "img/project2.jpg";
> $tmp['t203_featurelink4'] = "";
> $tmp['t203_featurepara4'] = "This text goes in the second box describing Herman";
> $tmp['t203_featuretitle5'] = "Our Sources";
> $tmp['t203_subhead-5'] = "Books and Census Records";
> $tmp['t203_featurethumb5'] = "img/project3.jpg";
> $tmp['t203_featurelink5'] = "";
> $tmp['t203_featurepara5'] = "This text goes in the third box describing the Books";
> $tmp['t203_ttitletext'] = "Footer Text";
> $tmp['t203_link'] = "Link or email address";
> $tmp['t203_latestnews'] = "This is the text in the bottom left box. You can use it to add research information, your thoughts, anything you'd like. You can talk about how you document your research, your favorite research source, anything that comes to mind.";
> 
> $tmp['t204_maintitle'] = "GWT Template 204";
> $tmp['t204_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t204_headimg'] = "img/logo.png";
> $tmp['t204_headline-1'] = "My ancestor's story...";
> $tmp['t204_subhead-1'] = "I hope you enjoy the fruits of my research.";
> $tmp['t204_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t204_headline-2'] = "Looking for clues?";
> $tmp['t204_subhead-2'] = "Hopefully you can find answers in my site!";
> $tmp['t204_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t204_headline-3'] = "If you have something to add";
> $tmp['t204_subhead-3'] = "Please send it to me! I'm always looking for family!";
> $tmp['t204_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t204_featuretitle1'] = "What fun! We're riding in our new car! Wouldn't you just love to go for a spin!";
> $tmp['t204_featurethumb1'] = "img/top1.jpg";
> $tmp['t204_tree-1'] = "";
> $tmp['t204_person-1'] = "I237";
> $tmp['t204_headline'] = "Template 204";
> $tmp['t204_featurepara1'] = "We hope you enjoy your visit to our site. If you have anything to add, please don't hesitate to contact us. We are always looking for family!";
> $tmp['t204_featurepara2'] = "";
> $tmp['t204_featuretitle2'] = "The Chosen";
> $tmp['t204_featurethumb2'] = "img/BourgeoisRobertPaul200.jpg";
> $tmp['t204_featurepara2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. ";
> $tmp['t204_featurelink2'] = "browsesources.php";
> $tmp['t204_tree-2'] = "";
> $tmp['t204_person-2'] = "";
> $tmp['t204_featuretitle3'] = "The Bones of my Bones";
> $tmp['t204_featurethumb3'] = "img/mayesMarthaAnnMarshall200.jpg";
> $tmp['t204_featurepara3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.by Della M. Cummings Wright Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t204_featurelink3'] = "browsesources.php";
> $tmp['t204_tree-3'] = "";
> $tmp['t204_person-3'] = "";
> $tmp['t204_featuretitle4'] = "Sunday After Church";
> $tmp['t204_featurepara4'] = "Look at the background! It must have been a cold day for a baptism. Everyone has on coats and the preacher is in the river with the couple.";
> $tmp['t204_featurethumb4'] = "img/top3.jpg";
> $tmp['t204_tree-4'] = "";
> $tmp['t204_person-4'] = "";
> $tmp['t204_featuretitle5'] = "Taking a Sunday Buggy Ride";
> $tmp['t204_featurepara5'] = "This couple is enjoying their Sunday drive after church. I guess our tradition of visiting relatives on Sunday began with these two!.";
> $tmp['t204_featurethumb5'] = "img/top2.jpg";
> $tmp['t204_tree-5'] = "";
> $tmp['t204_person-5'] = "";
> $tmp['t204_quotehead'] = "We hope you laugh out loud!";
> $tmp['t204_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t204_author-1'] = "Mark Twain";
> $tmp['t204_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t204_author-2'] = "Howard K. Nixon";
> $tmp['t204_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t204_author-3'] = "Jimmy Carter";
> $tmp['t204_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t204_author-4'] = "Florence King";
> $tmp['t204_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t204_author-5'] = "Ellen";
> $tmp['t204_featuretitle5'] = "First main feature title";
> $tmp['t204_featurepara5'] = "This is the paragraph(s) of text that goes with the top image. This is the paragraph(s) of text that goes with the top image. This is the paragraph(s) of text that goes with the top image.";
> $tmp['t204_featurethumb5'] = "img/family.jpg";
> $tmp['t204_featurelink5'] = "histories/feature5.php";
> $tmp['t204_tree-5'] = "";
> $tmp['t204_person-5'] = "";
> $tmp['t204_featuretitle6'] = "Herman John Bourgeois";
> $tmp['t204_featurepara6'] = "Herman John Bourgeois is the father of Robert \"Bobby\" Bourgeois. \"Bobby\" was adopted by his mother's new husband when he was approximately six years old.";
> $tmp['t204_featurethumb6'] = "img/family.jpg";
> $tmp['t204_featurelink6'] = "histories/feature6.php";
> $tmp['t204_tree-6'] = "";
> $tmp['t204_person-6'] = "I237";
> $tmp['t204_featuretitle7'] = "Cynthia Frederick";
> $tmp['t204_featurepara7'] = "Daughter of James H. Frady and Martha Crawford was born in 1881 in Gilmer County, Georgia. She married Elijah L. Pell in October 1908.";
> $tmp['t204_featurethumb7'] = "img/fradySinthaAltha300.jpg";
> $tmp['t204_featurelink7'] = "histories/feature8.php";
> $tmp['t204_tree-7'] = "";
> $tmp['t204_person-7'] = "I1479";
> $tmp['t204_featuretitle8'] = "Clairville & Emily Savoy";
> $tmp['t204_featurepara8'] = "Emily [Amelea] Smith was the wife of Clairville J. Savoy. She is the daughter of Ursin Smith and Doralisa LeBlanc.";
> $tmp['t204_featurethumb8'] = "img/melanconClairvilleEmily300.jpg";
> $tmp['t204_featurelink8'] = "histories/feature8.php";
> $tmp['t204_tree-8'] = "";
> $tmp['t204_person-8'] = "I2508";
> $tmp['t204_featuretitle9'] = "Lillian & John Mayer";
> $tmp['t204_featurepara9'] = "Lillian & John Mayer were the children of John Mayer [b. 1873] and Loretta L. Hughes. They had four other siblings: Robert P., Velma, Juanita and Thelma.";
> $tmp['t204_featurethumb9'] = "img/melanconClairvilleEmily300.jpg";
> $tmp['t204_featurelink9'] = "histories/feature8.php";
> $tmp['t204_tree-9'] = "";
> $tmp['t204_person-9'] = "I496";
> $tmp['t204_ttitletext'] = "Footer Text";
> $tmp['t204_link'] = "Link or email address";
> $tmp['t204_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know. Thank you, Marsha";
> 
> $tmp['t205_maintitle'] = "GWT Template 205";
> $tmp['t205_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t205_headimg'] = "img/logo.png";
> $tmp['t205_dadside'] = "His Side";
> $tmp['t205_dadperson'] = "I2";
> $tmp['t205_dadtree'] = "mytreeid";
> $tmp['t205_momside'] = "Her Side";
> $tmp['t205_momperson'] = "I1";
> $tmp['t205_momtree'] = "mytreeid";
> $tmp['t205_featurelinks'] = "TNG, https://tngsitebuilding.com GWT, https://genealogywebtemplates.com";
> $tmp['t205_welcome'] = "We Do It Right!";
> $tmp['t205_texttitle1'] = "Check Out Our Ancestors";
> $tmp['t205_headline-1'] = "Surnames";
> $tmp['t205_headline-2'] = "Photos";
> $tmp['t205_headline-3'] = "What's New";
> $tmp['t205_featuretitle1'] = "Template 205";
> $tmp['t205_subhead-1'] = "If you have any contributions you'd like to add, please contact me.";
> $tmp['t205_featurepara1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t205_mainpara'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\" <br>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.\"";
> $tmp['t205_featurethumb2'] = "img/topleft.jpg";
> $tmp['t205_featurelink2'] = "https://genealogywebtemplates.com";
> $tmp['t205_tree-5'] = "";
> $tmp['t205_person-5'] = "";
> $tmp['t205_headline-4'] = "Check Out Our Ancestors";
> $tmp['t205_snipname-1'] = "Angel";
> $tmp['t205_snipimage-1'] = "img/person1.jpg";
> $tmp['t205_sniptree-1'] = "";
> $tmp['t205_snipperson-1'] = "";
> $tmp['t205_snipinfoone-1'] = "Information about the above picture goes in this area.";
> $tmp['t205_snipname-2'] = "Samuel and Sarah";
> $tmp['t205_snipimage-2'] = "img/person2.jpg";
> $tmp['t205_sniptree-2'] = "";
> $tmp['t205_snipperson-2'] = "";
> $tmp['t205_snipinfoone-2'] = "Information about the above picture goes in this area.";
> $tmp['t205_snipname-3'] = "Cynthia and Altha";
> $tmp['t205_snipimage-3'] = "img/person3.jpg";
> $tmp['t205_sniptree-3'] = "";
> $tmp['t205_snipperson-3'] = "";
> $tmp['t205_snipinfoone-3'] = "Information about the above picture goes in this area.";
> $tmp['t205_snipname-4'] = "Cynthia and Altha";
> $tmp['t205_snipimage-4'] = "img/person4.jpg";
> $tmp['t205_sniptree-4'] = "";
> $tmp['t205_snipperson-4'] = "";
> $tmp['t205_snipinfoone-4'] = "Information about the above picture goes in this area.";
> $tmp['t205_quotehead'] = "We hope you laugh out loud!";
> $tmp['t205_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t205_author-1'] = "Mark Twain";
> $tmp['t205_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t205_author-2'] = "Howard K. Nixon";
> $tmp['t205_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t205_author-3'] = "Jimmy Carter";
> $tmp['t205_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t205_author-4'] = "Florence King";
> $tmp['t205_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t205_author-5'] = "Ellen";
> $tmp['t205_featuretitle3'] = "New Source!";
> $tmp['t205_featurethumb3'] = "img/icon1.jpg";
> $tmp['t205_featurelink3'] = "https://genealogywebtemplates.com/webs/gwt205/index.html";
> $tmp['t205_featurepara3'] = "We have the matching html template. Check it out on the 'MORE' button!";
> $tmp['t205_featuretitle4'] = "Finally found them!";
> $tmp['t205_featurethumb4'] = "img/icon2.jpg";
> $tmp['t205_featurelink4'] = "";
> $tmp['t205_featurepara4'] = "They really were hiding under a rock! We're so happy that we found them!";
> $tmp['t205_featuretitle5'] = "DNA Results are in!";
> $tmp['t205_featurethumb5'] = "img/icon3.jpg";
> $tmp['t205_featurelink5'] = "";
> $tmp['t205_featurepara5'] = "You think you know who you are, but when you have a DNA test, it sometimes can rock your world!";
> $tmp['t205_texttitle2'] = "Extra! Extra! Read All About It";
> $tmp['t205_textpara2'] = "This is a great place to add special information, new people you've just found, or just a place to say, 'Hello.'";
> $tmp['t205_ttitletext'] = "Footer Text";
> $tmp['t205_link'] = "Link or email address";
> $tmp['t205_latestnews'] = "We strive to document all of our information presented on this site. If you have something to add, please send it to us. <p>Thanks, Marsha</p>";
> 
> $tmp['t206_maintitle'] = "Template 206";
> $tmp['t206_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t206_headimg'] = "img/logo.png";
> $tmp['t206_headline-1'] = "My ancestor's story...";
> $tmp['t206_subhead-1'] = "I hope you enjoy the fruits of my research.";
> $tmp['t206_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t206_headline-2'] = "Looking for clues?";
> $tmp['t206_subhead-2'] = "Hopefully you can find answers in my site!";
> $tmp['t206_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t206_headline-3'] = "If you have something to add";
> $tmp['t206_subhead-3'] = "Please send it to me! I'm always looking for family!";
> $tmp['t206_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t206_featuretitle1'] = "Welcome, Family!!!";
> $tmp['t206_featurepara1'] = "We are so excited that you found our site! We hope you enjoy our new look and all of our family tree information.</p><p> We hope you can find new information on your family. We strive to document all of our sources. </p>We also have an html version of this template should you wish to have a seamless connection with your html site. Check out the MORE button below!";
> $tmp['t206_featurelink1'] = "https://genealogywebtemplates.com/webs/gwt206/index.html";
> $tmp['t206_featuretitle2'] = "Our Bourgeois Family";
> $tmp['t206_featurepara2'] = "We are so excited to have found this side of our family! Joseph Bourgeois was born in St. Charles Parish, Louisiana in 1736.";
> $tmp['t206_featurethumb2'] = "img/icon1.jpg";
> $tmp['t206_featurelink2'] = "surnames.php";
> $tmp['t206_featuretitle3'] = "Our Family";
> $tmp['t206_featurepara3'] = "It was great fun to see our family's journey to Louisiana on one of the seven original ships bound for New Orleans. He made the voyage with his wife and children from France..";
> $tmp['t206_featurethumb3'] = "img/icon2.jpg";
> $tmp['t206_featurelink3'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t206_featuretitle4'] = "Our Research";
> $tmp['t206_featurepara4'] = "Finding the old ship's manifest with our ancestors' names included was just thrilling! Tracing our ancestors and finding the DNA tracking was great.";
> $tmp['t206_featurethumb4'] = "img/icon2.jpg";
> $tmp['t206_featurelink4'] = "browsesources.php";
> $tmp['t206_headline'] = "Welcome to Our Family";
> $tmp['t206_featuretitle5'] = "The Chosen";
> $tmp['t206_featurepara5'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t206_featurethumb5'] = "img/boy1.jpg";
> $tmp['t206_featurelink5'] = "histories/feature5.php";
> $tmp['t206_tree-5'] = "";
> $tmp['t206_person-5'] = "";
> $tmp['t206_featuretitle6'] = "Bones of Our Bones";
> $tmp['t206_featurepara6'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.'<br><br><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.'</em>";
> $tmp['t206_featurethumb6'] = "img/family.jpg";
> $tmp['t206_featurelink6'] = "https://genealogywebtemplates.com";
> $tmp['t206_tree-6'] = "";
> $tmp['t206_person-6'] = "I2506";
> $tmp['t206_featuretitle7'] = "Herman";
> $tmp['t206_featurepara7'] = "Herman was adopted by his mother's new husband when he was approximately six years old.";
> $tmp['t206_featurethumb7'] = "img/smallman.jpg";
> $tmp['t206_featurelink7'] = "histories/feature8.php";
> $tmp['t206_tree-7'] = "";
> $tmp['t206_person-7'] = "I237";
> $tmp['t206_featuretitle8'] = "Georgia";
> $tmp['t206_featurepara8'] = "Short information about Georgia.";
> $tmp['t206_featurethumb8'] = "img/smallwoman.jpg";
> $tmp['t206_featurelink8'] = "https://genealogywebtemplates.com";
> $tmp['t206_tree-8'] = "";
> $tmp['t206_person-8'] = "";
> $tmp['t206_quotehead'] = "We hope you laugh out loud!";
> $tmp['t206_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t206_author-1'] = "Mark Twain";
> $tmp['t206_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t206_author-2'] = "Howard K. Nixon";
> $tmp['t206_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t206_author-3'] = "Jimmy Carter";
> $tmp['t206_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t206_author-4'] = "Florence King";
> $tmp['t206_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t206_author-5'] = "Ellen";
> $tmp['t206_headline-4'] = "Our Fabulous Families";
> $tmp['t206_snipname-1'] = "Marie Champagne";
> $tmp['t206_snipimage-1'] = "img/person1.jpg";
> $tmp['t206_snipperson-1'] = "I2203";
> $tmp['t206_sniptree-1'] = "2";
> $tmp['t206_snipname-2'] = "Samuel Bourgeois";
> $tmp['t206_snipimage-2'] = "img/person2.jpg";
> $tmp['t206_snipperson-2'] = "P464";
> $tmp['t206_sniptree-2'] = "2";
> $tmp['t206_snipname-3'] = "Henry Boudreaux";
> $tmp['t206_snipimage-3'] = "img/person3.jpg";
> $tmp['t206_snipperson-3'] = "P2225";
> $tmp['t206_sniptree-3'] = "2";
> $tmp['t206_snipname-4'] = "Elizabeth Morris";
> $tmp['t206_snipimage-4'] = "img/person4.jpg";
> $tmp['t206_snipperson-4'] = "P2909";
> $tmp['t206_sniptree-4'] = "2";
> $tmp['t206_ttitletext'] = "Footer Text";
> $tmp['t206_link'] = "Link or Email Address";
> $tmp['t206_latestnews'] = "This is the text in the bottom left box. You can use it to add research information, your thoughts, anything you'd like. You can talk about how you document your research, your favorite research source, anything that comes to mind.";
> 
> $tmp['t207_maintitle'] = "GWT Template 207";
> $tmp['t207_headsubtitle'] = "In Search of Family";
> $tmp['t207_headimg'] = "img/logo.png";
> $tmp['t207_dadperson'] = "I2";
> $tmp['t207_dadtree'] = "mytreeid";
> $tmp['t207_headerlinktext-1'] = "Holley Side";
> $tmp['t207_momperson'] = "I1";
> $tmp['t207_momtree'] = "mytreeid";
> $tmp['t207_headerlinktext-2'] = "Boardman Side";
> $tmp['t207_headerlink-3'] = "surnames.php";
> $tmp['t207_headerlinktext-3'] = "Surnames";
> $tmp['t207_headerlink-4'] = "histories/index.php";
> $tmp['t207_headerlinktext-4'] = "Histories";
> $tmp['t207_mainimage-1'] = "img/person1.jpg";
> $tmp['t207_mainimage-2'] = "img/person2.jpg";
> $tmp['t207_mainimage-3'] = "img/person3.jpg";
> $tmp['t207_welcome'] = "Welcome to Template 207!";
> $tmp['t207_mainimage'] = "img/man1.jpg";
> $tmp['t207_mainpara'] = "We are so happy you dropped in! We hope we can help you in your ancestor quest. If you have information to add, please don't hesitate to contact us. We're always looking for ways to increase our family tree.</p><p>All sources are documented to the best of our ability. We do not place information on our web that is a maybe it's true piece of information. If it's not documented, then we search for documentation of the facts. We use many sources of documentation, including, but not limited to census records, military records, family Bibles, cemetery records, wills and more. When we find the source information, a picture is taken of the source and added to this web. This way everyone can see what weve added and what exactly the source says.</p><p>We hope you like the new look of our web. It is from Genealogy Web Templates: . There is a nice selection of templates on the site. We worked with Darrin to create a perfectly fitted template that compliments his program. All of his functionality works perfectly and is surrounded by our styling code. Each template has its own template folder and is uploaded to the web.</p><p>Once uploaded, TNG recognizes the folder. The selection will automatically appear in the templates setting. You must have the latest version of TNG, as the coding for all of the Genealogy Web Templates has only been added to the latest version. Go to TNG for information on the latest version. Enjoy your new look! We have an html version of this template should you wish to have a seamless interface with your html site. Check out the MORE button below!";
> $tmp['t207_featuretitle1'] = "The Chosen";
> $tmp['t207_featurepara1'] = " We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t207_featurethumb1'] = "img/soldier-sm.jpg";
> $tmp['t207_person-1'] = "";
> $tmp['t207_headline-1'] = "Take a look at our family";
> $tmp['t207_subhead-1'] = "They were so brave!";
> $tmp['t207_sniptitle-1'] = "Robert D.";
> $tmp['t207_snipname-1'] = "Robert Robbins";
> $tmp['t207_snipimage-1'] = "img/snip1.jpg";
> $tmp['t207_sniptree-1'] = "I2068";
> $tmp['t207_snipperson-1'] = "";
> $tmp['t207_snipinfoone-1'] = "He and his wife had five children";
> $tmp['t207_snipinfotwo-1'] = "They were married for 50 years.";
> $tmp['t207_sniptitle-2'] = "Chelsea Turner";
> $tmp['t207_snipname-2'] = "Chelsie";
> $tmp['t207_snipimage-2'] = "img/snip2.jpg";
> $tmp['t207_sniptree-2'] = "";
> $tmp['t207_snipperson-2'] = "I492";
> $tmp['t207_snipinfoone-2'] = "Chelsie moved from Ireland in the early 1860s.";
> $tmp['t207_snipinfotwo-2'] = "Her parents soon followed.";
> $tmp['t207_sniptitle-3'] = "Martha Montgomery";
> $tmp['t207_snipname-3'] = "Martha";
> $tmp['t207_snipimage-3'] = "img/snip3.jpg";
> $tmp['t207_sniptree-3'] = "";
> $tmp['t207_snipperson-3'] = "I471";
> $tmp['t207_snipinfoone-3'] = "Martha was the daughter of James A. Montgomery.";
> $tmp['t207_snipinfotwo-3'] = "She was born in 1849 in Tennessee. She married William T. Turner in 1868.";
> $tmp['t207_sniptitle-4'] = "Emily Brown";
> $tmp['t207_snipname-4'] = "Emmie";
> $tmp['t207_snipimage-4'] = "img/snip4.jpg";
> $tmp['t207_sniptree-4'] = "";
> $tmp['t207_snipperson-4'] = "I2506";
> $tmp['t207_snipinfoone-4'] = "Born in 1847, she is the daughter of some great parents.";
> $tmp['t207_snipinfotwo-4'] = "Emily [Amelea] She married Joseph.";
> $tmp['t207_featuretitle2'] = "The Bones of My Bone";
> $tmp['t207_featurethumb2'] = "img/family.jpg";
> $tmp['t207_featurelink2'] = "https://genealogywebtemplates.com";
> $tmp['t207_featurepara2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation.<br><br>It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are.<br><br>So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t207_featuretitle3'] = "Georgia Valley";
> $tmp['t207_featurethumb3'] = "img/person2.jpg";
> $tmp['t207_featurelink3'] = "https://genealogywebtemplates.com";
> $tmp['t207_featurepara3'] = "This short paragraph is about the picture above";
> $tmp['t207_quotehead'] = "Enjoy the Humor!";
> $tmp['t207_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t207_author-1'] = "Mark Twain";
> $tmp['t207_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t207_author-2'] = "Howard K. Nixon";
> $tmp['t207_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t207_author-3'] = "Jimmy Carter";
> $tmp['t207_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t207_author-4'] = "Florence King";
> $tmp['t207_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t207_author-5'] = "Ellen";
> $tmp['t207_featuretitle4'] = "Fred and Nettie";
> $tmp['t207_featurethumb4'] = "img/person3.jpg";
> $tmp['t207_featurelink4'] = "https://genealogywebtemplates.com";
> $tmp['t207_featurepara4'] = "This short paragraph is about the picture above";
> $tmp['t207_footerheadline-1'] = "Quick Links";
> $tmp['t207_footerheadline-2'] = "Contact";
> $tmp['t207_footerlinktext-1'] = "Contact Me";
> $tmp['t207_footerlink-2'] = "histories/home.php";
> $tmp['t207_footerlinktext-2'] = "Our Stories";
> $tmp['t207_footerlink-3'] = "https://genealogywebtemplates.com";
> $tmp['t207_footerlinktext-3'] = "Genealogy Web Templates";
> $tmp['t207_footerheadline-4'] = "Webmaster Message";
> $tmp['t207_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t208_maintitle'] = "Template 208";
> $tmp['t208_headsubtitle'] = "In Search of Our Ancestors";
> $tmp['t208_headimg'] = "img/logo.png";
> $tmp['t208_headline-1'] = "Share your ancestor's story";
> $tmp['t208_dadperson'] = "I2";
> $tmp['t208_dadtree'] = "mytreeid";
> $tmp['t208_headerlinktext-1'] = "Holley Side";
> $tmp['t208_momperson'] = "I1";
> $tmp['t208_momtree'] = "mytreeid";
> $tmp['t208_headerlinktext-2'] = "Boardman Side";
> $tmp['t208_headerlink-3'] = "surnames.php";
> $tmp['t208_headerlinktext-3'] = "Surnames";
> $tmp['t208_headerlink-4'] = "histories/index.php";
> $tmp['t208_headerlinktext-4'] = "Histories";
> $tmp['t208_subhead-1'] = "Researchers live for stories and facts";
> $tmp['t208_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t208_headline-2'] = "Searching for clues?";
> $tmp['t208_subhead-2'] = "We hope you can find answers here";
> $tmp['t208_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t208_headline-3'] = "Find picture of family you never knew";
> $tmp['t208_subhead-3'] = "Enjoy our pictures and if you have pictures, please share them with us";
> $tmp['t208_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t208_welcome'] = "Template 208";
> $tmp['t208_mainpara'] = "We are happy you stopped by to check out our website. We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates. Please stop in and check them out.</p><p>The images in the slide show as well as the saying in the slide show are easily changed. The images are sized at 1680 pixels by 600 pixels. If you need your images sized, just send them to me. I'll size them at no charge!	This template integrates beautifully with TNG! From starting your new tree to applying this tree to your current tree, we think you'll love your new look! It's as easy as using a FTP program to upload your new template. If you have trouble, we can help.";
> $tmp['t208_featuretitle1'] = "The Chosen";
> $tmp['t208_featurepara1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t208_featurethumb1'] = "img/boy1.jpg";
> $tmp['t208_featurelink1'] = "";
> $tmp['t208_featuretitle2'] = "The Bones of My Bones";
> $tmp['t208_featurepara2'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em> ";
> $tmp['t208_featurethumb2'] = "img/cameo.jpg";
> $tmp['t208_featurelink2'] = "";
> $tmp['t208_featuretitle3'] = "Herman";
> $tmp['t208_featurepara3'] = "This paragraph is about the picture above.";
> $tmp['t208_featurethumb3'] = "img/man2.jpg";
> $tmp['t208_tree-3'] = "";
> $tmp['t208_person-3'] = "";
> $tmp['t208_featuretitle4'] = "Frederick";
> $tmp['t208_featurepara4'] = "This paragraph is about the picture above";
> $tmp['t208_featurethumb4'] = "img/smallman.jpg";
> $tmp['t208_tree-4'] = "";
> $tmp['t208_person-4'] = "";
> $tmp['t208_featuretitle5'] = "Camilla";
> $tmp['t208_featurepara5'] = "This paragraph is about the picture above.";
> $tmp['t208_featurethumb5'] = "img/smallwoman.jpg";
> $tmp['t208_tree-5'] = "";
> $tmp['t208_person-5'] = "";
> $tmp['t208_sniptitle-1'] = "Lillian Martin";
> $tmp['t208_snipimage-1'] = "img/person1.jpg";
> $tmp['t208_sniptree-1'] = "";
> $tmp['t208_snipperson-1'] = "";
> $tmp['t208_snipinfoone-1'] = "This text goes with Lillian Martin";
> $tmp['t208_sniptitle-2'] = "Malcom Board";
> $tmp['t208_snipimage-2'] = "img/person2.jpg";
> $tmp['t208_sniptree-2'] = "";
> $tmp['t208_snipperson-2'] = "";
> $tmp['t208_snipinfoone-2'] = "This text goes with Malcolm Board.";
> $tmp['t208_sniptitle-3'] = "Emily and Fredrick";
> $tmp['t208_snipimage-3'] = "img/person3.jpg";
> $tmp['t208_sniptree-3'] = "";
> $tmp['t208_snipperson-3'] = "";
> $tmp['t208_snipinfoone-3'] = "This text goes with Emily and Frederick.";
> $tmp['t208_sniptitle-4'] = "Suzanne and Katherine";
> $tmp['t208_snipimage-4'] = "img/person4.jpg";
> $tmp['t208_sniptree-4'] = "";
> $tmp['t208_snipperson-4'] = "";
> $tmp['t208_snipinfoone-4'] = "This text goes with Suzanne and Katherine.";
> $tmp['t208_footerheadline-1'] = "Quick Links";
> $tmp['t208_footerheadline-2'] = "Contact";
> $tmp['t208_footerlinktext-1'] = "Contact Me";
> $tmp['t208_footerlink-2'] = "histories/home.php";
> $tmp['t208_footerlinktext-2'] = "Our Stories";
> $tmp['t208_footerlink-3'] = "https://genealogywebtemplates.com";
> $tmp['t208_footerlinktext-3'] = "Genealogy Web Templates";
> $tmp['t208_footerheadline-4'] = "Webmaster Message";
> $tmp['t208_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t209_maintitle'] = "TNG Template 209";
> $tmp['t209_headsubtitle'] = "Searching for Ancestors";
> $tmp['t209_headimg'] = "img/logo.png";
> $tmp['t209_dadside'] = "His Side";
> $tmp['t209_dadperson'] = "I2";
> $tmp['t209_dadtree'] = "mytreeid";
> $tmp['t209_momside'] = "Her Side";
> $tmp['t209_momperson'] = "I1";
> $tmp['t209_momtree'] = "mytreeid";
> $tmp['t209_featurelinks'] = "Third Link, https://tngsitebuilding.com Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t209_headline-1'] = "Share your ancestor's story";
> $tmp['t209_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t209_headline-2'] = "Searching for clues?";
> $tmp['t209_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t209_headline-3'] = "Find picture of family you never knew";
> $tmp['t209_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t209_welcome'] = "Welcome to Our Genealogy Site";
> $tmp['t209_mainpara'] = "It is easy to add your welcome text here. You can tell about yourself, your research, your family tree.</p><p>The images in the slide show as well as the saying in the slide show are easily changed. The images are sized at 400 pixels by 400 pixels. Although they appear round, they are each just a square image. The appearance of the image is styled by the css (Cascading Style Sheet) file. If you need your images sized, just send them to me. I'll size them at no charge!</p><p>	This template integrates beautifully with TNG! From starting your new tree to applying this tree to your current tree, we think you'll love your new look! It's as easy as using a FTP program to upload your new template. If you have trouble, we can help.</p><p>We also have the matching html template should you want a seamless interface between your family tree and the html site. Check out the MORE button below. ";
> $tmp['t209_sniptitle-1'] = "Herman Frederick";
> $tmp['t209_snipimage-1'] = "img/300x300-1.jpg";
> $tmp['t209_sniptree-1'] = "";
> $tmp['t209_snipperson-1'] = "";
> $tmp['t209_snipinfoone-1'] = "This is a short sentence about Herman";
> $tmp['t209_sniptitle-2'] = "Elise";
> $tmp['t209_snipimage-2'] = "img/300x300-2.jpg";
> $tmp['t209_sniptree-2'] = "";
> $tmp['t209_snipperson-2'] = "";
> $tmp['t209_snipinfoone-2'] = "This is a short sentence about Elise.";
> $tmp['t209_sniptitle-3'] = "Cynthia and Altha";
> $tmp['t209_snipimage-3'] = "img/300x300-3.jpg";
> $tmp['t209_sniptree-3'] = "";
> $tmp['t209_snipperson-3'] = "";
> $tmp['t209_snipinfoone-3'] = "This is a short sentence about Cynthia and Altha.";
> $tmp['t209_sniptitle-4'] = "Claire Grace";
> $tmp['t209_snipimage-4'] = "img/300x300-4.jpg";
> $tmp['t209_sniptree-4'] = "";
> $tmp['t209_snipperson-4'] = "";
> $tmp['t209_snipinfoone-4'] = "This is a short sentence about Claire.";
> $tmp['t209_featuretitle1'] = "Template 209";
> $tmp['t209_featurepara1'] = "Welcome to our website. </p><p>We hope you like our new look. We love the way the template showcases our family members.</p><p> Please let us know if you like it as well. We've tried to give you plenty of space for your content and your images.</p><p>We hope you find our research useful for your family. All of our sources have been documented to the best of our ability.";
> $tmp['t209_featuretitle2'] = "The Chosen";
> $tmp['t209_featurepara2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t209_tree-2'] = "";
> $tmp['t209_person-2'] = "";
> $tmp['t209_featurethumb2'] = "img/couple.jpg";
> $tmp['t209_featurelink2'] = "";
> $tmp['t209_featuretitle3'] = "They are the Bones of My Bones";
> $tmp['t209_featurepara3'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. <br><br><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t209_tree-3'] = "";
> $tmp['t209_person-3'] = "";
> $tmp['t209_featurethumb3'] = "img/soldier.jpg";
> $tmp['t209_featurelink3'] = "";
> $tmp['t209_featuretitle4'] = "Herman";
> $tmp['t209_featurepara4'] = "This is the short paragraph about Herman.";
> $tmp['t209_featurethumb4'] = "img/man2.jpg";
> $tmp['t209_tree-4'] = "";
> $tmp['t209_person-4'] = "";
> $tmp['t209_featuretitle5'] = "Georgie";
> $tmp['t209_featurepara5'] = "This is the short paragraph about Georgie";
> $tmp['t209_featurethumb5'] = "img/smallman.jpg";
> $tmp['t209_tree-5'] = "";
> $tmp['t209_person-5'] = "";
> $tmp['t209_featuretitle6'] = "Camilla";
> $tmp['t209_featurepara6'] = "This is the short paragraph about Camilla";
> $tmp['t209_featurethumb6'] = "img/smallwoman.jpg";
> $tmp['t209_tree-6'] = "";
> $tmp['t209_person-6'] = "";
> $tmp['t209_quotehead'] = "Enjoy the Humor!";
> $tmp['t209_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t209_author-1'] = "Mark Twain";
> $tmp['t209_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t209_author-2'] = "Howard K. Nixon";
> $tmp['t209_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t209_author-3'] = "Jimmy Carter";
> $tmp['t209_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t209_author-4'] = "Florence King";
> $tmp['t209_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t209_author-5'] = "Ellen";
> $tmp['t209_ttitletext'] = "Footer Text";
> $tmp['t209_link'] = "Link or email address";
> $tmp['t209_latestnews'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t210_maintitle'] = "Template 210";
> $tmp['t210_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t210_headimg'] = "img/logo.png";
> $tmp['t210_headline-1'] = "My ancestor's story...";
> $tmp['t210_subhead-1'] = "I hope you enjoy the fruits of my research.";
> $tmp['t210_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t210_headline-2'] = "Looking for clues?";
> $tmp['t210_subhead-2'] = "Hopefully you can find answers in my site!";
> $tmp['t210_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t210_headline-3'] = "If you have something to add";
> $tmp['t210_subhead-3'] = "Please send it to me! I'm always looking for family!";
> $tmp['t210_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t210_featuretitle1'] = "Only used if the slide show text is not used. Email me to change the template.";
> $tmp['t210_featurepara1'] = "This is only used if the slide show text is not used. Must be 'unhidden'";
> $tmp['t210_featurelink1'] = "only used if slide show text is not used. Must be 'unhidden'";
> $tmp['t210_featuretitle2'] = "Cemetery Information";
> $tmp['t210_featurepara2'] = "This is text that goes with Cemetery Information.";
> $tmp['t210_featurethumb2'] = "img/icon1.jpg";
> $tmp['t210_featurelink2'] = "surnames.php";
> $tmp['t210_featuretitle3'] = "Ship's Manifest";
> $tmp['t210_featurepara3'] = "This is text that goes with Ship's Manifest.";
> $tmp['t210_featurethumb3'] = "img/ship.jpg";
> $tmp['t210_featurelink3'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t210_featuretitle4'] = "You choose all 3 box titles";
> $tmp['t210_featurepara4'] = "Add you text for this box.";
> $tmp['t210_featurethumb4'] = "img/icon2.jpg";
> $tmp['t210_featurelink4'] = "browsesources.php";
> $tmp['t210_headline'] = "Our Family's Journey";
> $tmp['t210_featuretitle5'] = "The Chosen";
> $tmp['t210_featurepara5'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. <br><br>We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. <br><br>It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t210_featurethumb5'] = "img/boy1.jpg";
> $tmp['t210_featurelink5'] = "histories/feature5.php";
> $tmp['t210_tree-5'] = "";
> $tmp['t210_person-5'] = "";
> $tmp['t210_featuretitle6'] = "The Bones of Our Bone";
> $tmp['t210_featurepara6'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. <br><br>It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. <br><br>It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<br><br><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t210_featurethumb6'] = "img/family.jpg";
> $tmp['t210_featurelink6'] = "histories/feature6.php";
> $tmp['t210_tree-6'] = "";
> $tmp['t210_person-6'] = "";
> $tmp['t210_featuretitle7'] = "Edna Smith";
> $tmp['t210_featurepara7'] = "This is the paragraph(s) of text that goes with Edna.";
> $tmp['t210_featurethumb7'] = "img/smallwoman.jpg";
> $tmp['t210_featurelink7'] = "histories/feature8.php";
> $tmp['t210_tree-7'] = "";
> $tmp['t210_person-7'] = "";
> $tmp['t210_featuretitle8'] = "Jones Family";
> $tmp['t210_featurepara8'] = "This is the paragraph(s) of text that goes with the Jones family.";
> $tmp['t210_featurethumb8'] = "img/man1.jpg";
> $tmp['t210_featurelink8'] = "histories/feature8.php";
> $tmp['t210_tree-8'] = "";
> $tmp['t210_person-8'] = "";
> $tmp['t210_quotehead'] = "We hope you laugh out loud!";
> $tmp['t210_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t210_author-1'] = "Mark Twain";
> $tmp['t210_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t210_author-2'] = "Howard K. Nixon";
> $tmp['t210_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t210_author-3'] = "Jimmy Carter";
> $tmp['t210_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t210_author-4'] = "Florence King";
> $tmp['t210_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t210_author-5'] = "Ellen";
> $tmp['t210_ttitletext'] = "Footer Text";
> $tmp['t210_link'] = "Link or email address";
> $tmp['t210_latestnews'] = "This is the text in the bottom left box. You can use it to add research information, your thoughts, anything you'd like. You can talk about how you document your research, your favorite research source, anything that comes to mind.";
> 
> $tmp['t211_maintitle'] = "GWT Template 211";
> $tmp['t211_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t211_headimg'] = "img/logo.png";
> $tmp['t211_welcome'] = "Welcome to Template 211!";
> $tmp['t211_texttitle1'] = "If you have any contributions you'd like to add, please contact me.";
> $tmp['t211_headline-1'] = "Surnames";
> $tmp['t211_link-1'] = "surnames.php";
> $tmp['t211_headline-2'] = "Photos";
> $tmp['t211_link-2'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t211_headline-3'] = "What's New";
> $tmp['t211_link-3'] = "whatsnew.php";
> $tmp['t211_subhead-1'] = "We love sharing our ancestor's story.";
> $tmp['t211_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t211_subhead-2'] = "It's hard to imagine all of the hardships they went through.";
> $tmp['t211_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t211_subhead-3'] = "We hope they would look down and be proud of us!";
> $tmp['t211_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t211_welcome'] = "If you have any contributions you would like to add, please contact me.";
> $tmp['t211_mainpara'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t211_featuretitle1'] = "Bones of My Bones";
> $tmp['t211_featurepara1'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<br>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t211_featurethumb1'] = "img/topleft.jpg";
> $tmp['t211_featurelink1'] = "";
> $tmp['t211_snipname-1'] = "Robert";
> $tmp['t211_snipimage-1'] = "img/300x300-1.jpg";
> $tmp['t211_sniptree-1'] = "";
> $tmp['t211_snipperson-1'] = "";
> $tmp['t211_snipinfoone-1'] = "This is a short paragraph about Robert.";
> $tmp['t211_snipname-2'] = "Angel";
> $tmp['t211_snipimage-2'] = "img/300x300-2.jpg";
> $tmp['t211_sniptree-2'] = "";
> $tmp['t211_snipperson-2'] = "";
> $tmp['t211_snipinfoone-2'] = "This is a short paragraph about Angel.";
> $tmp['t211_snipname-3'] = "Lillian & Frederick";
> $tmp['t211_snipimage-3'] = "img/300x300-3.jpg";
> $tmp['t211_sniptree-3'] = "";
> $tmp['t211_snipperson-3'] = "";
> $tmp['t211_snipinfoone-3'] = "This is a short paragraph about Lillian and Frederick.";
> $tmp['t211_snipname-4'] = "Martha";
> $tmp['t211_snipimage-4'] = "img/300x300-4.jpg";
> $tmp['t211_sniptree-4'] = "";
> $tmp['t211_snipperson-4'] = "";
> $tmp['t211_snipinfoone-4'] = "This is a short paragraph about Martha.";
> $tmp['t211_featuretitle2'] = "Bourgeois Family";
> $tmp['t211_featurethumb2'] = "img/icon1.jpg";
> $tmp['t211_featurelink2'] = "https://genealogywebtemplates.com";
> $tmp['t211_featurepara2'] = "We are so excited to have found this side of our family. Joseph Bourgeois was born in St. Charles Parish, LA in 1736.";
> $tmp['t211_featuretitle3'] = "Boudreaux Family";
> $tmp['t211_featurethumb3'] = "img/ship.jpg";
> $tmp['t211_featurelink3'] = "https://genealogywebtemplates.com";
> $tmp['t211_featurepara3'] = "It was great fun to see our family's journey to Louisiana on one of the seven original ships bound for New Orleans.";
> $tmp['t211_featuretitle4'] = "Our Research";
> $tmp['t211_featurethumb4'] = "img/icon2.jpg";
> $tmp['t211_featurelink4'] = "https://genealogywebtemplates.com";
> $tmp['t211_featurepara4'] = "Finding the old ship's manifest with our ancestors' names was just thrilling. Love to find new information!";
> $tmp['t211_ttitletext'] = "Footer Text";
> $tmp['t211_link'] = "Link or email address";
> $tmp['t211_latestnews'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t212_maintitle'] = "Template 212";
> $tmp['t212_headsubtitle'] = "Searching for Ancestors";
> $tmp['t212_headimg'] = "img/logo.png";
> $tmp['t212_dadside'] = "His Side";
> $tmp['t212_dadperson'] = "I2";
> $tmp['t212_dadtree'] = "mytreeid";
> $tmp['t212_momside'] = "Her Side";
> $tmp['t212_momperson'] = "I1";
> $tmp['t212_momtree'] = "mytreeid";
> $tmp['t212_featurelinks'] = "TNG, https://tngsitebuilding.com GWT, https://genealogywebtemplates.com";
> $tmp['t212_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t212_slideheadline-1'] = "Share your ancestor's story";
> $tmp['t212_slidetext-1'] = "Love the stories and facts";
> $tmp['t212_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t212_slideheadline-2'] = "Searching for clues?";
> $tmp['t212_slidetext-2'] = "Find answers here";
> $tmp['t212_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t212_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t212_slidetext-3'] = "We also love our new look from Genealogy Web Templates.";
> $tmp['t212_featuretitle-1'] = "Welcome to Our Site!";
> $tmp['t212_featurepara-1'] = "We are happy that you dropped in! We have quite a few names in our family tree. We'd love to have your information for the site.</p><p>This this begins the second paragraph. You can begin and end paragrapshs easily in the template settings box. This template integrates beautifully with TNG; however, you must install the template messages file or I can install it for you. It's easy, just ftp the information. There are detailed instructions on my TNG help page in Genealogy Web Templates.</p><p>The images in the slide show as well as the saying in the slide show are easily changed. The images must be sized at 300 pixels by 300 pixels. If you need your images sized, just send them to me. I'll size them at no charge!";
> $tmp['t212_featuretitle-2'] = "The Chosen";
> $tmp['t212_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t212_featurethum-2'] = "img/sideimg1.jpg";
> $tmp['t212_featurelink-2'] = "surnames.php";
> $tmp['t212_featurelinktext-2'] = "Our Surnames";
> $tmp['t212_featuretitle-3'] = "The Bones of My Bones";
> $tmp['t212_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do.</p><p> With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p><em> by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t212_featurethumb-3'] = "img/sideimg.jpg";
> $tmp['t212_featurelink-3'] = "";
> $tmp['t212_featurelinktext-3'] = "";
> $tmp['t212_featuretitle-4'] = "Celeste Boudreaux ";
> $tmp['t212_featurepara-4'] = "You can add information here about the person below. You can write about who the person married, where they lived and what they did that was unusual. Remember to keep it brief.";
> $tmp['t212_featurethumb-4'] = "img/img1.jpg";
> $tmp['t212_tree-4'] = "";
> $tmp['t212_person-4'] = "";
> $tmp['t212_featuretitle-5'] = "Mary Beesley";
> $tmp['t212_featurepara-5'] = "You can add information here about the person below. You can write about who the person married, where they lived and what they did that was unusual. Remember to keep it brief.";
> $tmp['t212_featurethumb-5'] = "img/img2.jpg";
> $tmp['t212_tree-5'] = "";
> $tmp['t212_person-5'] = "";
> $tmp['t212_featuretitle-6'] = "Robert Drayton ";
> $tmp['t212_featurepara-6'] = "You can add information here about the person below. You can write about who the person married, where they lived and what they did that was unusual. Remember to keep it brief.";
> $tmp['t212_featurethumb-6'] = "img/img3.jpg";
> $tmp['t212_tree-6'] = "";
> $tmp['t212_person-6'] = "";
> $tmp['t212_featuretitle-7'] = "Abigal Summer";
> $tmp['t212_featurepara-7'] = "You can add information here about the person below. You can write about who the person married, where they lived and what they did that was unusual. Remember to keep it brief.";
> $tmp['t212_featurethumb-7'] = "img/img4.jpg";
> $tmp['t212_tree-7'] = "";
> $tmp['t212_person-7'] = "";
> $tmp['t212_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t212_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t212_sidebarimg-1'] = "img/family1.jpg";
> $tmp['t212_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t212_sidebarlink-1'] = "histories/place1.php";
> $tmp['t212_sidebarsub-2'] = "Events";
> $tmp['t212_sidebarimg-2'] = "img/family2.jpg";
> $tmp['t212_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t212_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t212_sidebarsub-3'] = "Pictures of Family";
> $tmp['t212_sidebarimg-3'] = "img/family3.jpg";
> $tmp['t212_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t212_sidebarlink-3'] = "";
> $tmp['t212_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t212_sidebarimg-4'] = "img/family4.jpg";
> $tmp['t212_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t212_sidebarlink-4'] = "";
> $tmp['t212_snipheadline-1'] = "Our Families";
> $tmp['t212_snipsubhead-1'] = "They were explorers!";
> $tmp['t212_sniptitle-1'] = "Fred Smith";
> $tmp['t212_snipname-1'] = "Fredrick Smith";
> $tmp['t212_snipinfoone-1'] = "Born 1862";
> $tmp['t212_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t212_snipimage-1'] = "img/snip1.jpg";
> $tmp['t212_snipperson-1'] = "";
> $tmp['t212_sniptree-1'] = "";
> $tmp['t212_sniptitle-2'] = "Dan Jones";
> $tmp['t212_snipname-2'] = "Daniel Jones";
> $tmp['t212_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t212_snipinfotwo-2'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t212_snipimage-2'] = "img/snip2.jpg";
> $tmp['t212_snipperson-2'] = "";
> $tmp['t212_sniptree-2'] = "";
> $tmp['t212_sniptitle-3'] = "Peter Ryan";
> $tmp['t212_snipname-3'] = "Peter C. Ryan";
> $tmp['t212_snipinfoone-3'] = "Information";
> $tmp['t212_snipinfotwo-3'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t212_snipperson-3'] = "";
> $tmp['t212_snipimage-3'] = "img/snip3.jpg";
> $tmp['t212_sniptree-3'] = "";
> $tmp['t212_sniptitle-4'] = "Roy Robbins";
> $tmp['t212_snipname-4'] = "Roy B. Robbins";
> $tmp['t212_snipinfoone-4'] = "Information";
> $tmp['t212_snipinfotwo-4'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t212_snipimage-4'] = "img/snip4.jpg";
> $tmp['t212_snipperson-4'] = "";
> $tmp['t212_sniptree-4'] = "";
> $tmp['t212_featuretitle-8'] = "Our Pages";
> $tmp['t212_featurepara-8'] = "You can use this area to add your extra history or person pages.";
> $tmp['t212_link-1'] = "histories/index.php";
> $tmp['t212_linktext-1'] = "Our History Pages";
> $tmp['t212_link-2'] = "histories/story1.php";
> $tmp['t212_linktext-2'] = "Our Stories";
> $tmp['t212_link-3'] = "http://usgenweb.org";
> $tmp['t212_linktext-3'] = "USGenWeb";
> $tmp['t212_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t212_linktext-4'] = "Genealogy Web Templates";
> $tmp['t212_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t212_linktext-5'] = "TNG Forum";
> $tmp['t212_author-1'] = "Mark Twain";
> $tmp['t212_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t212_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t212_quotelink-1'] = "histories/place1.php";
> $tmp['t212_author-2'] = "Howard K. Nixon";
> $tmp['t212_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t212_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t212_quotelink-2'] = "";
> $tmp['t212_author-3'] = "Jimmy Carter";
> $tmp['t212_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t212_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t212_quotelink-3'] = "";
> $tmp['t212_author-4'] = "Florence King";
> $tmp['t212_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t212_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t212_quotelink-4'] = "";
> $tmp['t212_author-5'] = "Ellen";
> $tmp['t212_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t212_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t212_quotelink-5'] = "";
> $tmp['t212_author-6'] = "Uncle Ralph";
> $tmp['t212_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t212_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t212_quotelink-6'] = "";
> $tmp['t212_topsurnames'] = "Top 20 Surnames";
> $tmp['t212_textpara1'] = "You can use this area for your Surname Cloud or you can delete the surname cloud in the index.php and use this area for text.";
> $tmp['t212_footerheadline-1'] = "Quick Links";
> $tmp['t212_footerheadline-2'] = "Contact Us";
> $tmp['t212_footerlink-1'] = "suggest.php";
> $tmp['t212_footerlinktext-1'] = "Contact Us";
> $tmp['t212_footerlink-2'] = "surnames.php";
> $tmp['t212_footerlinktext-2'] = "Our Surnames";
> $tmp['t212_footerlink-3'] = "histories/story1.php";
> $tmp['t212_footerlinktext-3'] = "Our Stories";
> $tmp['t212_footerheadline-4'] = "Webmaster Message";
> $tmp['t212_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t213_maintitle'] = "Template 213";
> $tmp['t213_headsubtitle'] = "Searching for Ancestors";
> $tmp['t213_headimg'] = "img/logo.png";
> $tmp['t213_sniptitle-1'] = "Claire Grace";
> $tmp['t213_snipperson-1'] = "I2506";
> $tmp['t213_sniptree-1'] = "";
> $tmp['t213_snipimage-1'] = "img/top1.jpg";
> $tmp['t213_sniptitle-2'] = "Lillian Martin";
> $tmp['t213_snipperson-2'] = "I471";
> $tmp['t213_sniptree-2'] = "";
> $tmp['t213_snipimage-2'] = "img/top2.jpg";
> $tmp['t213_headline-1'] = "Share your ancestor's story";
> $tmp['t213_subhead-1'] = "Researchers live for stories and facts";
> $tmp['t213_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t213_headline-2'] = "Searching for clues?";
> $tmp['t213_subhead-2'] = "We hope you can find answers here";
> $tmp['t213_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t213_headline-3'] = "Find picture of family you never knew";
> $tmp['t213_subhead-3'] = "Enjoy our pictures and if you have pictures, please share them with us";
> $tmp['t213_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t213_sniptitle-3'] = "Martha Shall";
> $tmp['t213_snipperson-3'] = "I237";
> $tmp['t213_sniptree-3'] = "";
> $tmp['t213_snipimage-3'] = "img/top3.jpg";
> $tmp['t213_sniptitle-4'] = "Fred Smith";
> $tmp['t213_snipperson-4'] = "I1479";
> $tmp['t213_sniptree-4'] = "";
> $tmp['t213_snipimage-4'] = "img/top4.jpg";
> $tmp['t213_welcome'] = "Template 213";
> $tmp['t213_textpara1'] = "Welcome to our website. We hope you like our new look. We love the way the template showcases our family members. Please let us know if you like it as well. We've tried to give you plenty of space for your content and your images.<br>We hope you find our research useful for your family. All of our sources have been documented to the best of our ability. <br><br>We also have the matching html template should you want a seamless interface between your family tree and the html site. Check out the MORE button below.";
> $tmp['t213_featuretitle1'] = "The Chosen";
> $tmp['t213_person-1'] = "I471 ";
> $tmp['t213_tree-1'] = "";
> $tmp['t213_featurethumb1'] = "img/album.jpg";
> $tmp['t213_featurepara1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t213_featurelink1'] = "More";
> $tmp['t213_featuretitle2'] = "The Bones of My Bone";
> $tmp['t213_person-2'] = "I2508";
> $tmp['t213_tree-2'] = "";
> $tmp['t213_featurethumb2'] = "img/soldier.jpg";
> $tmp['t213_featurepara2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t213_featurelink2'] = "More";
> $tmp['t213_featuretitle3'] = "George Valley";
> $tmp['t213_person-3'] = "I237";
> $tmp['t213_tree-3'] = "";
> $tmp['t213_featurethumb3'] = "img/man-side.jpg";
> $tmp['t213_featurepara3'] = "Short paragraph about George Valley.";
> $tmp['t213_featuretitle4'] = "Ramilla Ford";
> $tmp['t213_person-4'] = "I207";
> $tmp['t213_tree-4'] = "";
> $tmp['t213_featurethumb4'] = "img/woman-side.jpg";
> $tmp['t213_featurepara4'] = "Short paragraph about Ramilla Ford.";
> $tmp['t213_featuretitle5'] = "Jones Family";
> $tmp['t213_person-5'] = "I1669";
> $tmp['t213_tree-5'] = "";
> $tmp['t213_featurethumb5'] = "img/man1.jpg";
> $tmp['t213_featurepara5'] = "Short paragraph about Jones Family.";
> $tmp['t213_quotehead'] = "We Hope You Laugh!";
> $tmp['t213_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t213_author-1'] = "Mark Twain";
> $tmp['t213_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t213_author-2'] = "Howard K. Nixon";
> $tmp['t213_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t213_author-3'] = "Jimmy Carter";
> $tmp['t213_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t213_author-4'] = "Florence King";
> $tmp['t213_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t213_author-5'] = "Ellen";
> $tmp['t213_headline-5'] = "Meet Our Ancestors";
> $tmp['t213_sniptitle-5'] = "Herman Frederick";
> $tmp['t213_snipperson-5'] = "I237";
> $tmp['t213_sniptree-5'] = "";
> $tmp['t213_snipimage-5'] = "img/300x300-1.jpg";
> $tmp['t213_snipinfoone-5'] = "Short paragraph about Herman Frederick.";
> $tmp['t213_sniptitle-6'] = "John France";
> $tmp['t213_snipperson-6'] = "I1431";
> $tmp['t213_sniptree-6'] = "";
> $tmp['t213_snipimage-6'] = "img/300x300-2.jpg";
> $tmp['t213_snipinfoone-6'] = "Short paragraph about John France";
> $tmp['t213_featuretitle9'] = "Claire Grace";
> $tmp['t213_snipperson-7'] = "I1479";
> $tmp['t213_sniptree-7'] = "";
> $tmp['t213_snipimage-7'] = "img/300x300-3.jpg";
> $tmp['t213_snipinfoone-7'] = "Short paragraph about Claire Grace.";
> $tmp['t213_featuretitle10'] = "Martin Smith";
> $tmp['t213_snipperson-8'] = "I237";
> $tmp['t213_sniptree-8'] = "";
> $tmp['t213_snipimage-8'] = "img/300x300-4.jpg";
> $tmp['t213_snipinfoone-8'] = "Short paragraph about Martin and Lillian Smith.";
> $tmp['t213_ttitletext'] = "Footer Text";
> $tmp['t213_link'] = "Link, text or email address";
> $tmp['t213_latestnews'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t214_dadperson'] = "I2";
> $tmp['t214_dadtree'] = "mytreeid";
> $tmp['t214_linktext-1'] = "Holley Side";
> $tmp['t214_momperson'] = "I1";
> $tmp['t214_momtree'] = "mytreeid";
> $tmp['t214_linktext-2'] = "Boardman Side";
> $tmp['t214_link-3'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t214_linktext-3'] = "Histories";
> $tmp['t214_link-4'] = "surnames.php";
> $tmp['t214_linktext-4'] = "Surnames";
> $tmp['t214_headimg'] = "img/logo.png";
> $tmp['t214_maintitle'] = "Template 214";
> $tmp['t214_headsubtitle'] = "We are into our ancestors!";
> $tmp['t214_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t214_slideheadline-1'] = "Finding our ancestors is exciting!";
> $tmp['t214_slidetext-1'] = "We hope we help you find your spot in our family.";
> $tmp['t214_slidelink-1'] = "histories/place1.php";
> $tmp['t214_slidelinktext-1'] = "Histories";
> $tmp['t214_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t214_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t214_slidetext-2'] = "If you find something we don't have, please share with us.<br>";
> $tmp['t214_slidelink-2'] = "histories/story1.php";
> $tmp['t214_slidelinktext-2'] = "Stories";
> $tmp['t214_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t214_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t214_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br>";
> $tmp['t214_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t214_slidelinktext-3'] = "GWT";
> $tmp['t214_featuretitle-1'] = "Welcome to our genealogy site!";
> $tmp['t214_featurepara-1'] = "The following text is filler text. You will use your text here. Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. </p><p>In atsvulpate velt esse meleste at semper manet sola.Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t214_featurelink-1'] = "";
> $tmp['t214_featurelinktext-1'] = "";
> $tmp['t214_featuretitle-2'] = "The Chosen";
> $tmp['t214_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family, you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t214_featurethumb-2'] = "img/wagon.jpg";
> $tmp['t214_featurelink-2'] = "histories/place1.php";
> $tmp['t214_featurelinktext-2'] = "See More";
> $tmp['t214_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t214_featurethumb-3'] = "img/familyphotos.jpg";
> $tmp['t214_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. <em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t214_featurelink-3'] = "histories/place1.php";
> $tmp['t214_featurelinktext-3'] = "Mother's Side";
> $tmp['t214_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t214_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t214_sidebartitle-1'] = "Herman Brown";
> $tmp['t214_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t214_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-1'] = "histories/family1.php";
> $tmp['t214_sidebarlinktext-1'] = "His Story";
> $tmp['t214_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t214_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t214_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-2'] = "surnames.php";
> $tmp['t214_sidebarlinktext-2'] = "See Camilla";
> $tmp['t214_sidebartitle-3'] = "Susan Smith";
> $tmp['t214_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t214_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-3'] = "";
> $tmp['t214_sidebarlinktext-3'] = "";
> $tmp['t214_sidebartitle-4'] = "Eric Martinson";
> $tmp['t214_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t214_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t214_sidebarlinktext-4'] = "See Erik";
> $tmp['t214_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t214_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t214_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-5'] = "";
> $tmp['t214_sidebarlinktext-5'] = "";
> $tmp['t214_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t214_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t214_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-6'] = "";
> $tmp['t214_sidebarlinktext-6'] = "";
> $tmp['t214_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t214_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t214_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-7'] = "";
> $tmp['t214_sidebarlinktext-7'] = "";
> $tmp['t214_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t214_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t214_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-8'] = "";
> $tmp['t214_sidebarlinktext-8'] = "";
> $tmp['t214_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t214_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t214_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-9'] = "";
> $tmp['t214_sidebarlinktext-9'] = "";
> $tmp['t214_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t214_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t214_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t214_sidebarlink-10'] = "";
> $tmp['t214_sidebarlinktext-10'] = "";
> $tmp['t214_sidebarsub-2'] = "Our Pages";
> $tmp['t214_subhead2'] = "You can use this area to add your extra history or person pages.";
> $tmp['t214_sidebarlink-11'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t214_sidebarlinktext-11'] = "Our History Pages";
> $tmp['t214_sidebarlink-12'] = "histories/story1.php";
> $tmp['t214_sidebarlinktext-12'] = "Our Stories";
> $tmp['t214_sidebarlink-13'] = "https://usgenweb.org";
> $tmp['t214_sidebarlinktext-13'] = "USGenWeb";
> $tmp['t214_sidebarlink-14'] = "https://genealogywebtemplates.com";
> $tmp['t214_sidebarlinktext-14'] = "Genealogy Web Templates";
> $tmp['t214_sidebarlink-15'] = "https://tng.community/index.php?/forums/";
> $tmp['t214_sidebarlinktext-15'] = "TNG Forum";
> $tmp['t214_snipheadline-1'] = "Discover Our Family";
> $tmp['t214_snipimg-1'] = "img/top1.jpg";
> $tmp['t214_snipname-1'] = "Ancestor's Name";
> $tmp['t214_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t214_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t214_snipimg-2'] = "img/top2.jpg";
> $tmp['t214_snipname-2'] = "Ancestor's Name";
> $tmp['t214_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t214_sniplink-2'] = "histories/place1.php";
> $tmp['t214_snipimg-3'] = "img/top3.jpg";
> $tmp['t214_snipname-3'] = "Ancestor's Name";
> $tmp['t214_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t214_sniplink-3'] = "surnames.php";
> $tmp['t214_snipimg-4'] = "img/top4.jpg";
> $tmp['t214_snipname-4'] = "Ancestor's Name";
> $tmp['t214_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t214_sniplink-4'] = "histories/family1.php";
> $tmp['t214_snipimg-5'] = "img/top1.jpg";
> $tmp['t214_snipname-5'] = "Ancestor's Name";
> $tmp['t214_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t214_sniplink-5'] = "histories/place1.php";
> $tmp['t214_snipimg-6'] = "img/top2.jpg";
> $tmp['t214_snipname-6'] = "Ancestor's Name";
> $tmp['t214_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t214_sniplink-6'] = "histories/family2.php";
> $tmp['t214_snipimg-7'] = "img/top3.jpg";
> $tmp['t214_snipname-7'] = "Ancestor's Name";
> $tmp['t214_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t214_sniplink-7'] = "histories/story1.php";
> $tmp['t214_snipimg-8'] = "img/top4.jpg";
> $tmp['t214_snipname-8'] = "Ancestor's Name";
> $tmp['t214_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t214_sniplink-8'] = "histories/story2.php";
> $tmp['t214_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t214_author-1'] = "Mark Twain";
> $tmp['t214_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t214_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t214_quotelink-1'] = "histories/place1.php";
> $tmp['t214_author-2'] = "Howard K. Nixon";
> $tmp['t214_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t214_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t214_quotelink-2'] = "";
> $tmp['t214_author-3'] = "Jimmy Carter";
> $tmp['t214_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t214_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t214_quotelink-3'] = "";
> $tmp['t214_author-4'] = "Florence King";
> $tmp['t214_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t214_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t214_quotelink-4'] = "";
> $tmp['t214_author-5'] = "Ellen";
> $tmp['t214_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t214_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t214_quotelink-5'] = "";
> $tmp['t214_author-6'] = "Uncle Ralph";
> $tmp['t214_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t214_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t214_quotelink-6'] = "";
> $tmp['t214_topsurnames'] = "Our Top Surnames";
> $tmp['t214_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t214_footerheadline-1'] = "Quick Links";
> $tmp['t214_footerheadline-2'] = "Contact Us";
> $tmp['t214_footerlink-1'] = "suggest.php";
> $tmp['t214_footerlinktext-1'] = "Contact Us";
> $tmp['t214_footerlink-2'] = "surnames.php";
> $tmp['t214_footerlinktext-2'] = "Our Surnames";
> $tmp['t214_footerlink-3'] = "histories/story1.php";
> $tmp['t214_footerlinktext-3'] = "Our Stories";
> $tmp['t214_footerheadline-4'] = "Webmaster Message";
> $tmp['t214_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t215_maintitle'] = "Template 215";
> $tmp['t215_headsubtitle'] = "Following Our Ancestors Journeys";
> $tmp['t215_headline-1'] = "Tracing our familys history";
> $tmp['t215_subhead-1'] = "Through time";
> $tmp['t215_headline'] = "Template 215";
> $tmp['t215_featurethumb1'] = "img/topsection1.jpg";
> $tmp['t215_featuretitle1'] = "We Are Happy You Dropped By!";
> $tmp['t215_featurepara1'] = "We are so excited that you found our site! We hope you enjoy our family tree information. We hope you can find new information on your family. We strive to document all of our sources. We are happy you stopped by to check out our website. We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates. Please stop in and check them out. The image in the parallax background is easily changed, or if you like the current image, you can use it. The image is sized at 1600 pixels by 945 pixels. If you need your images sized, just send them to me. I'll size them at no charge! This template integrates beautifully with TNG! From starting your new tree to applying this tree to your current tree, we think you'll love your new look! It's as easy as using a FTP program to upload your new template. If you have trouble, we can help. If you have trouble, we can help.<br><br>We also have a matching HTML template. Using it with your TNG site gives you a seamless interface between your family tree and the html template. Check it out on the More link.";
> $tmp['t215_featurelink1'] = 'https://genealogywebtemplates.com/webs/gwt215/index.html';
> $tmp['t215_featuretitle2'] = "The Chosen";
> $tmp['t215_featurepara2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t215_featurethumb2'] = 'img/top.jpg';
> $tmp['t215_featurelink2'] = 'More';
> $tmp['t215_person-2'] = 'img/top1.jpg';
> $tmp['t215_tree-2'] = '';
> $tmp['t215_featurethumb2'] = '';
> $tmp['t215_person-3'] = '';
> $tmp['t215_tree-3'] = '';
> $tmp['t215_featurethumb3'] = 'img/top2.jpg';
> $tmp['t215_person-4'] = '';
> $tmp['t215_tree-4'] = '';
> $tmp['t215_featurethumb4'] = 'img/top3.jpg';
> $tmp['t215_featuretitle3'] = 'The bones of my bone';
> $tmp['t215_featurepara3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t215_featurelink3'] = 'More';
> $tmp['t215_headline-4'] = 'Check Out Our Ancestors';
> $tmp['t215_featuretitle4'] = 'They worked hard to get us where we are today';
> $tmp['t215_featuretitle5'] = "Robert Robbins";
> $tmp['t215_person-5'] = "I1479";
> $tmp['t215_tree-5'] = "";
> $tmp['t215_featurethumb5'] = "img/300x300-1.jpg";
> $tmp['t215_featurepara5'] = "This area is the purple box on the left with text for Robert Robbins";
> $tmp['t215_featuretitle6'] = "Angel Smith";
> $tmp['t215_person-6'] = "I237";
> $tmp['t215_tree-6'] = "";
> $tmp['t215_featurethumb6'] = "img/300x300-2.jpg";
> $tmp['t215_featurepara6'] = "This area is the green box in the middle with text for Angel Smith.";
> $tmp['t215_featuretitle7'] = "Lillian & Patrick";
> $tmp['t215_person-7'] = "";
> $tmp['t215_tree-7'] = "";
> $tmp['t215_featurethumb7'] = "img/300x300-3.jpg";
> $tmp['t215_featurepara7'] = "This area is the purple box on the right with text for Lillian & Patrick";
> $tmp['t215_featuretitle8'] = "Our Thoughts";
> $tmp['t215_featurethumb8'] = "img/icon1.jpg";
> $tmp['t215_featurepara8'] = "This is information that is placed in the bottom box for the user to have another short space for content";
> $tmp['t215_featurelink8'] = "https://genealogywebtemplates.com";
> $tmp['t215_quotehead'] = "We Hope You Laugh!";
> $tmp['t215_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t215_author-1'] = "Mark Twain";
> $tmp['t215_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t215_author-2'] = "Howard K. Nixon";
> $tmp['t215_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t215_author-3'] = "Jimmy Carter";
> $tmp['t215_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t215_author-4'] = "Florence King";
> $tmp['t215_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t215_author-5'] = "Ellen";
> $tmp['t215_ttitletext'] = "Footer Text";
> $tmp['t215_link'] = "Link or email address";
> $tmp['t215_latestnews'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t216_maintitle'] = "Template 216";
> $tmp['t216_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t216_headimg'] = "img/logo.png";
> $tmp['t216_dadperson'] = "I2";
> $tmp['t216_dadtree'] = "mytreeid";
> $tmp['t216_sidebarlinktext-1'] = "Holley Side";
> $tmp['t216_momperson'] = "I1";
> $tmp['t216_momtree'] = "mytreeid";
> $tmp['t216_sidebarlinktext-2'] = "Boardman Side";
> $tmp['t216_sidebarlinktext-3'] = "Our History Pages";
> $tmp['t216_sidebarlink-3'] = "histories/index.php";
> $tmp['t216_sidebarlinktext-4'] = "Surnames";
> $tmp['t216_sidebarlink-4'] = "surnames.php";
> $tmp['t216_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t216_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t216_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t216_slidelink-1'] = "histories/place1.php";
> $tmp['t216_slidelinktext-1'] = "Histories";
> $tmp['t216_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t216_slideheadline-2'] = "Our Smith Family";
> $tmp['t216_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.";
> $tmp['t216_slidelink-2'] = "histories/story1.php";
> $tmp['t216_slidelinktext-2'] = "Stories";
> $tmp['t216_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t216_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t216_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air' we were looking for!";
> $tmp['t216_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t216_slidelinktext-3'] = "GWT";
> $tmp['t216_welcome'] = "Welcome to Template 216";
> $tmp['t216_featuresub-1'] = "We Are Happy You Dropped By!";
> $tmp['t216_featurethumb-1'] = "img/topsection1.jpg";
> $tmp['t216_featurepara-1'] = "We are so excited that you found our site! We hope you enjoy our family tree information. We hope you can find new information on your family. We strive to document all of our sources. We are happy you stopped by to check out our website.</p><p>We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates. Please stop in and check them out. The image in the parallax background is easily changed, or if you like the current image, you can use it. The image is sized at 1600 pixels by 945 pixels.</p><p>The image to the left is 350 pixels 445 pixels. I wouldn't recommend using any larger image than this, although you can easily use a smaller one. When I saw this image, I just loved it, so I had to find a place to use her! She isn't a family member, but it just didn't matter!</p><p>If you need your images sized for the homepage, just send them to me. I'll size them at no charge! </p><p>Thanks again,</p><p><em>Marsha</em>";
> $tmp['t216_featurelink-1'] = "surnames.php";
> $tmp['t216_featurelinktext-1'] = "See More";
> $tmp['t216_featuretitle-2'] = "Our Families";
> $tmp['t216_featuretitle-3'] = "Featured Articles";
> $tmp['t216_featurethumb-3'] = "img/place4.jpg";
> $tmp['t216_featurepara-3'] = "This cemetery is one of the oldest in the city. Many of our family members are buried there as early at 1868. Add information here about this cemetery. Where is the place located? Who lived there? What other details are interesting";
> $tmp['t216_featurelinktext-3'] = "Greenwood Cemetery";
> $tmp['t216_featurelink-3'] = "histories/story1.php";
> $tmp['t216_featurethumb-4'] = "img/place3.jpg";
> $tmp['t216_featurepara-4'] = "This old store and post office was used by many in the town. Great grandfather, Samuel was the first postmaster. Add information here about this general store. Where is the place located? Who lived there? What other details are interesting";
> $tmp['t216_featurelinktext-4'] = "General Store";
> $tmp['t216_featurelink-4'] = "histories/place1.php";
> $tmp['t216_featurethumb-5'] = "img/place1.jpg";
> $tmp['t216_featurepara-5'] = "Family Reunion for our huge Smith family is coming up! Mark your calendar now for June 28-30. Where is the place located? Who is the contact person? What do we need to bring? Add important information here about this fabulous event.";
> $tmp['t216_featurelinktext-5'] = "Family Reunion";
> $tmp['t216_featurelink-5'] = "histories/place1.php";
> $tmp['t216_featurethumb-6'] = "img/place2.jpg";
> $tmp['t216_featurepara-6'] = "Join us for the celebration of marriage of these two wonderful people. The wedding and reception will be held in this lovely venu. Add information here about this event. Where is the place located? Lodging information for out of town visitors.";
> $tmp['t216_featurelinktext-6'] = "Tony and Tina's Wedding";
> $tmp['t216_featurelink-6'] = "histories/place2.php";
> $tmp['t216_featuretitle-7'] = "Featured Ancestors";
> $tmp['t216_featurethumb-7'] = "img/family1.jpg";
> $tmp['t216_featurepara-7'] = "This paragraph is about Ancestor 1. To add this person's page to the link, navigate to the page, copy the link and then paste it in the link field on the template settings page. Add details in order to have this person come alive!";
> $tmp['t216_featurelinktext-7'] = "Ancestor 1";
> $tmp['t216_featurelink-7'] = "histories/family1.php";
> $tmp['t216_featurethumb-8'] = "img/family2.jpg";
> $tmp['t216_featurepara-8'] = "This paragraph is about Ancestor 2. Add information here about this person or couple. Add interesting details about his or her life. Where were they born? Who were their parents? Did they have siblings? Add details in order to have this person come alive!";
> $tmp['t216_featurelinktext-8'] = "Ancestor 2";
> $tmp['t216_featurelink-8'] = "histories/family2.php";
> $tmp['t216_featurethumb-9'] = "img/family3.jpg";
> $tmp['t216_featurepara-9'] = "This paragraph is about Ancestor 3. Add information here about this person or couple. Add interesting details about his or her life. Where were they born? Who were their parents? Did they have siblings? Add details in order to have this person come alive!";
> $tmp['t216_featurelinktext-9'] = "Ancestor 3";
> $tmp['t216_featurelink-9'] = "histories/family3.php";
> $tmp['t216_featurethumb-10'] = "img/family4.jpg";
> $tmp['t216_featurepara-10'] = "This paragraph is about Ancestor 4. Add information here about this person or couple. Add interesting details about his or her life. Where were they born? Who were their parents? Did they have siblings? Add details in order to have this person come alive!";
> $tmp['t216_featurelinktext-10'] = "Ancestor 4";
> $tmp['t216_featurelink-10'] = "histories/story1.php";
> $tmp['t216_snipheadline-1'] = "Our Family";
> $tmp['t216_sniptitle-1'] = "Fred Smith";
> $tmp['t216_snipname-1'] = "Fred Smith";
> $tmp['t216_snipinfoone-1'] = "Born 1862";
> $tmp['t216_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t216_snipimage-1'] = "img/snip1.jpg";
> $tmp['t216_snipperson-1'] = "";
> $tmp['t216_sniptree-1'] = "";
> $tmp['t216_sniptitle-2'] = "Dan Jones";
> $tmp['t216_snipname-2'] = "Dan Jones";
> $tmp['t216_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t216_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t216_snipimage-2'] = "img/snip2.jpg";
> $tmp['t216_snipperson-2'] = "";
> $tmp['t216_sniptree-2'] = "";
> $tmp['t216_sniptitle-3'] = "Peter Ryan";
> $tmp['t216_snipname-3'] = "Peter Ryan";
> $tmp['t216_snipinfoone-3'] = "Short Fact";
> $tmp['t216_snipinfotwo-3'] = "Additional information on this ancestor: Birth, death, marriage, spouse";
> $tmp['t216_snipimage-3'] = "img/snip3.jpg";
> $tmp['t216_snipperson-3'] = "";
> $tmp['t216_sniptree-3'] = "";
> $tmp['t216_sniptitle-4'] = "Roy Robbins";
> $tmp['t216_snipname-4'] = "Roy Robbins";
> $tmp['t216_snipinfoone-4'] = "Short Fact";
> $tmp['t216_snipinfotwo-4'] = "Additional information on this ancestor: Birth, death, marriage, spouse";
> $tmp['t216_snipimage-4'] = "img/snip4.jpg";
> $tmp['t216_snipperson-4'] = "";
> $tmp['t216_sniptree-4'] = "";
> $tmp['t216_sniptitle-5'] = "Barry Rogers";
> $tmp['t216_snipname-5'] = "Barry Rogers";
> $tmp['t216_snipinfoone-5'] = "Short Fact";
> $tmp['t216_snipinfotwo-5'] = "Additional information on this ancestor: Birth, death, marriage, spouse";
> $tmp['t216_snipimage-5'] = "img/snip5.jpg";
> $tmp['t216_snipperson-5'] = "";
> $tmp['t216_sniptree-5'] = "";
> $tmp['t216_sniptitle-6'] = "Albert Ross";
> $tmp['t216_snipname-6'] = "Albert Ross";
> $tmp['t216_snipinfoone-6'] = "Short Fact";
> $tmp['t216_snipinfotwo-6'] = "Additional information on this ancestor: Birth, death, marriage, spouse";
> $tmp['t216_snipimage-6'] = "img/snip6.jpg";
> $tmp['t216_snipperson-6'] = "";
> $tmp['t216_sniptree-6'] = "";
> $tmp['t216_sniptitle-7'] = "Alvy Boardman";
> $tmp['t216_snipname-7'] = "Alvy Boardman";
> $tmp['t216_snipinfoone-7'] = "Short Fact";
> $tmp['t216_snipinfotwo-7'] = "Additional information on this ancestor: Birth, death, marriage, spouse";
> $tmp['t216_snipimage-7'] = "img/snip7.jpg";
> $tmp['t216_snipperson-7'] = "";
> $tmp['t216_sniptree-7'] = "";
> $tmp['t216_sniptitle-8'] = "Paul Johnson";
> $tmp['t216_snipname-8'] = "Paul Johnson";
> $tmp['t216_snipinfoone-8'] = "Short Fact";
> $tmp['t216_snipinfotwo-8'] = "Additional information on this ancestor: Birth, death, marriage, spouse";
> $tmp['t216_snipimage-8'] = "img/snip8.jpg";
> $tmp['t216_snipperson-8'] = "";
> $tmp['t216_sniptree-8'] = "";
> $tmp['t216_featuretitle-11'] = "The Chosen";
> $tmp['t216_featurepara-11'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t216_featurethumb-11'] = "img/wagon.jpg";
> $tmp['t216_featurelink-11'] = "histories/family3.php";
> $tmp['t216_featurelinktext-11'] = "See More";
> $tmp['t216_featuretitle-12'] = "Our Pages";
> $tmp['t216_featurepara-12'] = "You can use this area to add extra links to places, people or add external links.";
> $tmp['t216_link-1'] = "histories/home.php";
> $tmp['t216_linktext-1'] = "Our History Pages";
> $tmp['t216_link-2'] = "surnames.php";
> $tmp['t216_linktext-2'] = "Surnames";
> $tmp['t216_link-3'] = "histories/story1.php";
> $tmp['t216_linktext-3'] = "Our Stories";
> $tmp['t216_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t216_linktext-4'] = "Genealogy Web Templates";
> $tmp['t216_link-5'] = "https://www.tngsitebuilding.com/";
> $tmp['t216_linktext-5'] = "The Next Generation of Genealogy Sitebuilding";
> $tmp['t216_featuretitle-13'] = "Our Photos";
> $tmp['t216_featurepara-13'] = "If you would rather just have a text area here, just delete the coding for Random Photo in the index.php page.";
> $tmp['t216_topsurnames'] = "Top 30 Surnames";
> $tmp['t216_textpara1'] = "If you would rather have a paragraph than the surnames cloud, you can remove it in the index.php. And use this line for your text.";
> $tmp['t216_footerheadline-1'] = "Quick Links";
> $tmp['t216_footerheadline-2'] = "Contact Us";
> $tmp['t216_footerlink-1'] = "suggest.php";
> $tmp['t216_footerlinktext-1'] = "Contact Us";
> $tmp['t216_footerlink-2'] = "surnames.php";
> $tmp['t216_footerlinktext-2'] = "Our Surnames";
> $tmp['t216_footerlink-3'] = "histories/story1.php";
> $tmp['t216_footerlinktext-3'] = "Our Stories";
> $tmp['t216_footerheadline-4'] = "Webmaster Message";
> $tmp['t216_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t217_headimg'] = "img/logo.png";
> $tmp['t217_maintitle'] = "Template 217";
> $tmp['t217_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t217_dadside'] = "His Side";
> $tmp['t217_dadperson'] = "I2";
> $tmp['t217_dadtree'] = "mytreeid";
> $tmp['t217_momside'] = "Her Side";
> $tmp['t217_momperson'] = "I1";
> $tmp['t217_momtree'] = "mytreeid";
> $tmp['t217_featurelinks'] = "TNG, https://www.tngsitebuilding.com, GWT, https://genealogywebtemplates.com";
> $tmp['t217_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t217_headline-1'] = "Share your ancestor's story";
> $tmp['t217_subhead-1'] = "Researchers live for stories and facts";
> $tmp['t217_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t217_headline-2'] = "Find people you never knew";
> $tmp['t217_subhead-2'] = "Enjoy our pictures and if you have pictures, please share them with us";
> $tmp['t217_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t217_headline-3'] = "Searching for clues";
> $tmp['t217_subhead-3'] = "We hope you find your ancestors here!";
> $tmp['t217_featuretitle1'] = "Our Family Name";
> $tmp['t217_featurepara1'] = "We are so excited that you found our site! We hope you enjoy our family tree information. We hope you can find new information on your family. We strive to document all of our sources. We are happy you stopped by to check out our website.</p><p>We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates. Please stop in and check them out.";
> $tmp['t217_featuretitle2'] = "The Chosen";
> $tmp['t217_featurethumb2'] = "img/woman3.jpg";
> $tmp['t217_featurepara2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t217_featurelink2'] = "surnames.php";
> $tmp['t217_featuretitle3'] = "The Bones of My Bones";
> $tmp['t217_featurethumb3'] = "img/family1.jpg";
> $tmp['t217_featurepara3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t217_featurelink3'] = "";
> $tmp['t217_headline-4'] = "Spotlight on Ancestors";
> $tmp['t217_featuretitle4'] = "Herman";
> $tmp['t217_person-1'] = "";
> $tmp['t217_tree-1'] = "";
> $tmp['t217_featurethumb4'] = "img/father1.jpg";
> $tmp['t217_featurepara4'] = "Add text that you've found interesting on the above ancestor.";
> $tmp['t217_featurelink4'] = "";
> $tmp['t217_featuretitle5'] = "Camilla";
> $tmp['t217_person-2'] = "";
> $tmp['t217_tree-2'] = "";
> $tmp['t217_featurethumb5'] = "img/mother1.jpg";
> $tmp['t217_featurepara5'] = "Add text that you've found interesting on the above ancestor.";
> $tmp['t217_featurelink5'] = "";
> $tmp['t217_quotehead'] = "Enjoy the Humor!";
> $tmp['t217_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t217_author-1'] = "Mark Twain";
> $tmp['t217_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t217_author-2'] = "Howard K. Nixon";
> $tmp['t217_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t217_author-3'] = "Jimmy Carter";
> $tmp['t217_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t217_author-4'] = "Florence King";
> $tmp['t217_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t217_author-5'] = "Ellen";
> $tmp['t217_headline'] = "Our Families";
> $tmp['t217_sniptitle-1'] = "Fred Smith";
> $tmp['t217_snipperson-1'] = "";
> $tmp['t217_sniptree-1'] = "";
> $tmp['t217_snipimage-1'] = "img/snip1.jpg";
> $tmp['t217_snipinfoone-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t217_sniptitle-2'] = "Dan Jones";
> $tmp['t217_snipperson-2'] = "";
> $tmp['t217_sniptree-2'] = "";
> $tmp['t217_snipimage-2'] = "img/snip2.jpg";
> $tmp['t217_snipinfoone-2'] = "Add text that you've found interesting on the above ancestor.";
> $tmp['t217_sniptitle-3'] = "Peter Ryan";
> $tmp['t217_snipperson-3'] = "";
> $tmp['t217_sniptree-3'] = "";
> $tmp['t217_snipimage-3'] = "img/snip3.jpg";
> $tmp['t217_snipinfoone-3'] = "Add text that you've found interesting on the above ancestor.";
> $tmp['t217_sniptitle-4'] = "Roy Robbins";
> $tmp['t217_snipperson-4'] = "";
> $tmp['t217_sniptree-4'] = "";
> $tmp['t217_snipimage-4'] = "img/snip4.jpg";
> $tmp['t217_snipinfoone-4'] = "Add text that you've found interesting on the above ancestor.";
> $tmp['t217_sniptitle-5'] = "Susan Pike";
> $tmp['t217_snipperson-5'] = "";
> $tmp['t217_sniptree-5'] = "";
> $tmp['t217_snipimage-5'] = "img/snip5.jpg";
> $tmp['t217_snipinfoone-5'] = "Add text that you've found interesting on the above ancestor.";
> $tmp['t217_ttitletext'] = "Footer Text";
> $tmp['t217_link'] = "Link or email address";
> $tmp['t217_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> 
> $tmp['t218_dadside'] = "His Side | ";
> $tmp['t218_dadperson'] = "I2";
> $tmp['t218_dadtree'] = "mytreeid";
> $tmp['t218_momside'] = "Her Side | ";
> $tmp['t218_momperson'] = "I1";
> $tmp['t218_momtree'] = "mytreeid";
> $tmp['t218_featurelinks'] = "| TNG, https://tngsitebuilding.com, | GWT, https://genealogywebtemplates.com/";
> $tmp['t218_headimg'] = "img/logo.png";
> $tmp['t218_maintitle'] = "Template 218";
> $tmp['t218_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t218_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t218_headline-1'] = "Share your ancestor's story";
> $tmp['t218_subhead-1'] = "Researchers live for stories and facts";
> $tmp['t218_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t218_headline-2'] = "Find people you never knew";
> $tmp['t218_subhead-2'] = "Enjoy our pictures and if you have pictures, please share them with us";
> $tmp['t218_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t218_headline-3'] = "Searching for clues";
> $tmp['t218_subhead-3'] = "We hope you find your ancestors here!";
> $tmp['t218_welcome'] = "Template 218";
> $tmp['t218_featuretitle1'] = "The Chosen";
> $tmp['t218_featurethumb1'] = "img/topleft.jpg";
> $tmp['t218_featurepara1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t218_featurelink1'] = "surnames.php";
> $tmp['t218_headline-4'] = "Father's Side";
> $tmp['t218_sniptitle-1'] = "Fred Smith";
> $tmp['t218_snipname-1'] = "Fredrick Smith";
> $tmp['t218_snipinfoone-1'] = "Born 1862";
> $tmp['t218_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t218_snipimage-1'] = "img/snip1.jpg";
> $tmp['t218_snipperson-1'] = "";
> $tmp['t218_sniptree-1'] = "";
> $tmp['t218_sniptitle-2'] = "Dan Jones";
> $tmp['t218_snipname-2'] = "Daniel Jones";
> $tmp['t218_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t218_snipinfotwo-2'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t218_snipimage-2'] = "img/snip2.jpg";
> $tmp['t218_snipperson-2'] = "";
> $tmp['t218_sniptree-2'] = "";
> $tmp['t218_sniptitle-3'] = "Peter Ryan";
> $tmp['t218_snipname-3'] = "Peter C. Ryan";
> $tmp['t218_snipinfoone-3'] = "Information";
> $tmp['t218_snipinfotwo-3'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t218_snipperson-3'] = "";
> $tmp['t218_snipimage-3'] = "img/snip3.jpg";
> $tmp['t218_sniptree-3'] = "";
> $tmp['t218_sniptitle-4'] = "Roy Robbins";
> $tmp['t218_snipname-4'] = "Roy B. Robbins";
> $tmp['t218_snipinfoone-4'] = "Information";
> $tmp['t218_snipinfotwo-4'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t218_snipimage-4'] = "img/snip4.jpg";
> $tmp['t218_snipperson-4'] = "";
> $tmp['t218_sniptree-4'] = "";
> $tmp['t218_featuretitle2'] = "The Bones of My Bones";
> $tmp['t218_featurethumb2'] = "img/family1.jpg";
> $tmp['t218_featurepara2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t218_featurelink2'] = "";
> $tmp['t218_headline-5'] = "Mother's Side";
> $tmp['t218_sniptitle-5'] = "Barry Rogers";
> $tmp['t218_snipname-5'] = "Barry M. Rogers";
> $tmp['t218_snipinfoone-5'] = "Information";
> $tmp['t218_snipinfotwo-5'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t218_snipimage-5'] = "img/snip5.jpg";
> $tmp['t218_snipperson-5'] = "";
> $tmp['t218_sniptree-5'] = "";
> $tmp['t218_sniptitle-6'] = "Albert Ross";
> $tmp['t218_snipname-6'] = "Albert D. Ross";
> $tmp['t218_snipinfoone-6'] = "Information";
> $tmp['t218_snipinfotwo-6'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t218_snipimage-6'] = "img/snip6.jpg";
> $tmp['t218_snipperson-6'] = "";
> $tmp['t218_sniptree-6'] = "";
> $tmp['t218_sniptitle-7'] = "Alvy Boardman";
> $tmp['t218_snipname-7'] = "Alvy C. Boardman";
> $tmp['t218_snipinfoone-7'] = "Information";
> $tmp['t218_snipinfotwo-7'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t218_snipimage-7'] = "img/snip7.jpg";
> $tmp['t218_snipperson-7'] = "";
> $tmp['t218_sniptree-7'] = "";
> $tmp['t218_sniptitle-8'] = "Paul Johnson ";
> $tmp['t218_snipname-8'] = "Paul D. Johnson";
> $tmp['t218_snipinfoone-8'] = "Information";
> $tmp['t218_snipinfotwo-8'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t218_snipimage-8'] = "img/snip8.jpg";
> $tmp['t218_snipperson-8'] = "";
> $tmp['t218_sniptree-8'] = "";
> $tmp['t218_featuretitle3'] = "Choices";
> $tmp['t218_featurepara3'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.  Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t218_featurelink3'] = "surnames.php";
> $tmp['t218_quotehead'] = "Fun Facts About Our Ancestors!";
> $tmp['t218_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t218_author-1'] = "Mark Twain";
> $tmp['t218_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t218_author-2'] = "Howard K. Nixon";
> $tmp['t218_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t218_author-3'] = "Jimmy Carter";
> $tmp['t218_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t218_author-4'] = "Florence King";
> $tmp['t218_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t218_author-5'] = "Ellen";
> $tmp['t218_featuretitle4'] = "Our Thoughts";
> $tmp['t218_featurepara4'] = "This is a great place to thank people that helped you with research or another place to add a bit of content.";
> $tmp['t218_featurelink4'] = "surnames.php";
> $tmp['t218_ttitletext'] = "Footer Text";
> $tmp['t218_link'] = "Link or email address";
> $tmp['t218_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> 
> $tmp['t219_maintitle'] = "Template 219";
> $tmp['t219_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t219_headimg'] = "img/logo.png";
> $tmp['t219_snipname-1'] = "Robert Robbins";
> $tmp['t219_snipperson-1'] = "";
> $tmp['t219_sniptree-1'] = "";
> $tmp['t219_snipimage-1'] = "top1.jpg";
> $tmp['t219_snipinfoone-1'] = "Born 1862. He married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t219_snipname-2'] = "Charlotte Turner";
> $tmp['t219_snipperson-2'] = "";
> $tmp['t219_sniptree-2'] = "";
> $tmp['t219_snipimage-2'] = "top2.jpg";
> $tmp['t219_snipinfoone-2'] = "Immigrated from Ireland when she was 16 years old with her parents, Joseph and Elisa.";
> $tmp['t219_snipname-3'] = "Christina Martin";
> $tmp['t219_snipperson-3'] = "";
> $tmp['t219_sniptree-3'] = "";
> $tmp['t219_snipimage-3'] = "top3.jpg";
> $tmp['t219_snipinfoone-3'] = "Christina married Samuel Matthews. She died a few weeks after her third child was born.";
> $tmp['t219_snipname-4'] = "Samuel Matthews";
> $tmp['t219_snipperson-4'] = "";
> $tmp['t219_sniptree-4'] = "";
> $tmp['t219_snipimage-4'] = "top4.jpg";
> $tmp['t219_snipinfoone-4'] = "Samuel, born 1867, married Christina Matthews. He is the son of Frederick and Suzanne Matthews.";
> $tmp['t219_featuretitle1'] = "Welcome To Our Site";
> $tmp['t219_featurepara1'] = "This genealogy template gives you great sections to place not only your written content about your ancestors, but also gives you many places to add pictures and events. We hope you enjoy it! ";
> $tmp['t219_headline-1'] = "Events";
> $tmp['t219_subhead-1'] = "Family Reunion";
> $tmp['t219_featurethumb2'] = "img/family1.jpg";
> $tmp['t219_featurepara2'] = "Nov. 3 at 3:00 pm. <br>Community Center<br>Your City, Your State";
> $tmp['t219_featurelink2'] = "surnames.php";
> $tmp['t219_headline-2'] = "Person of the Week";
> $tmp['t219_subhead-2'] = "Mary Smith";
> $tmp['t219_featurethumb3'] = "img/family2.jpg";
> $tmp['t219_featurepara3'] = "1876-1932 <br>Married John Ramey<br>Had 5 children.";
> $tmp['t219_featurelink3'] = "";
> $tmp['t219_headline-3'] = "Our Ancestors";
> $tmp['t219_snipname-5'] = "Mark and Linda";
> $tmp['t219_snipperson-5'] = "";
> $tmp['t219_sniptree-5'] = "";
> $tmp['t219_snipimage-5'] = "img/bottom1.jpg";
> $tmp['t219_snipinfoone-5'] = "Add information here about this ancestor... where they lived, how many children, husband/wife.";
> $tmp['t219_snipname-6'] = "Charlotte Turner";
> $tmp['t219_snipperson-6'] = "";
> $tmp['t219_sniptree-6'] = "";
> $tmp['t219_snipimage-6'] = "img/bottom2.jpg";
> $tmp['t219_snipinfoone-6'] = "Add information here about this ancestor... where they lived, how many children, husband/wife.";
> $tmp['t219_snipname-7'] = "Christina Martin";
> $tmp['t219_snipperson-7'] = "";
> $tmp['t219_sniptree-7'] = "";
> $tmp['t219_snipimage-7'] = "img/bottom3.jpg";
> $tmp['t219_snipinfoone-7'] = "Add information here about this ancestor... where they lived, how many children, husband/wife.";
> $tmp['t219_snipname-8'] = "Samuel Matthews";
> $tmp['t219_snipperson-8'] = "";
> $tmp['t219_sniptree-8'] = "";
> $tmp['t219_snipimage-8'] = "img/bottom4.jpg";
> $tmp['t219_snipinfoone-8'] = "Add information here about this ancestor... where they lived, how many children, husband/wife.";
> $tmp['t219_featuretitle4'] = "The Chosen";
> $tmp['t219_featurepara4'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t219_featurelink4'] = "";
> $tmp['t219_ttitletext'] = "Footer Text";
> $tmp['t219_link'] = "Link or email address";
> $tmp['t219_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> 
> $tmp['t220_dadside'] = "His Side | ";
> $tmp['t220_dadperson'] = "I2";
> $tmp['t220_dadtree'] = "mytreeid";
> $tmp['t220_momside'] = "Her Side | ";
> $tmp['t220_momperson'] = "I1";
> $tmp['t220_momtree'] = "mytreeid";
> $tmp['t220_featurelinks'] = "TNG, https://tngsitebuilding.com | GWT, https://genealogywebtemplates.com/";
> $tmp['t220_maintitle'] = "Template 220";
> $tmp['t220_headsubtitle'] = "Welcome To Our Family";
> $tmp['t220_featurethumb1'] = "img/family1.jpg";
> $tmp['t220_headline-1'] = "His Side";
> $tmp['t220_texttitle1'] = "Joseph Prince";
> $tmp['t220_subhead1'] = "Born 1827 - Died 1909";
> $tmp['t220_person-1'] = "";
> $tmp['t220_tree-1'] = "";
> $tmp['t220_featurethumb2'] = "img/family2.jpg";
> $tmp['t220_headline-2'] = "Her Side";
> $tmp['t220_texttitle2'] = "Martha Matthews";
> $tmp['t220_subhead2'] = "Born 1829 - Died 1919";
> $tmp['t220_person-2'] = "";
> $tmp['t220_tree-2'] = "";
> $tmp['t220_welcome'] = "Welcome to Template 220";
> $tmp['t220_featuretitle3'] = "The Chosen";
> $tmp['t220_featurethumb3'] = "img/topleft.jpg";
> $tmp['t220_featurepara3'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t220_featurelink3'] = "surnames.php";
> $tmp['t220_headline-3'] = "Our Families";
> $tmp['t220_texttitle3'] = "Our Ancestors Were Adventurers";
> $tmp['t220_sniptitle-1'] = "Fred Smith";
> $tmp['t220_snipname-1'] = "Fredrick Smith";
> $tmp['t220_snipinfoone-1'] = "Born 1862";
> $tmp['t220_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t220_snipimage-1'] = "img/snip1.jpg";
> $tmp['t220_snipperson-1'] = "";
> $tmp['t220_sniptree-1'] = "";
> $tmp['t220_sniptitle-2'] = "Dan Jones";
> $tmp['t220_snipname-2'] = "Daniel Jones";
> $tmp['t220_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t220_snipinfotwo-2'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t220_snipimage-2'] = "img/snip2.jpg";
> $tmp['t220_snipperson-2'] = "";
> $tmp['t220_sniptree-2'] = "";
> $tmp['t220_sniptitle-3'] = "Peter Ryan";
> $tmp['t220_snipname-3'] = "Peter C. Ryan";
> $tmp['t220_snipinfoone-3'] = "Information";
> $tmp['t220_snipinfotwo-3'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t220_snipperson-3'] = "";
> $tmp['t220_snipimage-3'] = "img/snip3.jpg";
> $tmp['t220_sniptree-3'] = "";
> $tmp['t220_sniptitle-4'] = "Roy Robbins";
> $tmp['t220_snipname-4'] = "Roy B. Robbins";
> $tmp['t220_snipinfoone-4'] = "Information";
> $tmp['t220_snipinfotwo-4'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t220_snipimage-4'] = "img/snip4.jpg";
> $tmp['t220_snipperson-4'] = "";
> $tmp['t220_sniptree-4'] = "";
> $tmp['t220_featuretitle4'] = "The Bones of My Bones";
> $tmp['t220_featurepara4'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"\<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t220_featurelink4'] = "";
> $tmp['t220_featurethumb5'] = "img/ancestor1.jpg";
> $tmp['t220_featuretitle5'] = "Wow! Take a look at this!";
> $tmp['t220_featurepara5'] = "Good, I expected it. Now, listen to me. Up to this time I have been Mr. Fogg's adversary. I am now in his game. 'Aha!' cried Passepartout; 'you are convinced he is an honest man?' 'No,' replied Fix coldly, 'I think him a rascal. Sh! don't budge, and let me speak. As long as Mr. Fogg was on English ground, it was for my interest to detain him there until my warrant of arrest arrived. I did everything I could to keep him back.";
> $tmp['t220_featurelink5'] = "";
> $tmp['t220_featurethumb6'] = "img/ancestor2.jpg";
> $tmp['t220_featuretitle6'] = "You asked for it... We listened.";
> $tmp['t220_featurepara6'] = "And I shall get my brains,' added the Scarecrow joyfully. 'And I shall get my courage,' said the Lion thoughtfully. 'And I shall get back to Kansas,' cried Dorothy, clapping her hands. 'Oh, let us start for the Emerald City tomorrow!' The next day they called the Winkies together and bade them good-bye. The Winkies were sorry to have them go, and they had grown fond of the Tin Woodman.";
> $tmp['t220_featurelink6'] = "";
> $tmp['t220_headline4'] = "This Week's Featured Ancestors";
> $tmp['t220_texttitle4'] = "These could be the newest ancestors you added to your site or random ancestors.";
> $tmp['t220_snipname-5'] = "Suzanne Martin";
> $tmp['t220_snipinfoone-5'] = "Aunt to Frances Martin, mother to Thomas Martin";
> $tmp['t220_snipinfotwo-5'] = "Give a small bit of information about the person in this space.";
> $tmp['t220_snipimage-5'] = "img/person1.jpg";
> $tmp['t220_snipperson-5'] = "";
> $tmp['t220_sniptree-5'] = "";
> $tmp['t220_snipname-6'] = "Bill Wilson";
> $tmp['t220_snipinfoone-6'] = "Son of Samuel Wilson and Mary Jane Andrews.";
> $tmp['t220_snipinfotwo-6'] = "Give a small bit of information about the person in this space.";
> $tmp['t220_snipimage-6'] = "img/person2.jpg";
> $tmp['t220_snipperson-6'] = "";
> $tmp['t220_sniptree-6'] = "";
> $tmp['t220_snipname-7'] = "Elizabeth Wells";
> $tmp['t220_snipinfoone-7'] = "Great grandmother to Mark Wells.";
> $tmp['t220_snipinfotwo-7'] = "Give a small bit of information about the person in this space.";
> $tmp['t220_snipimage-7'] = "img/person3.jpg";
> $tmp['t220_snipperson-7'] = "";
> $tmp['t220_sniptree-7'] = "";
> $tmp['t220_snipname-8'] = "Frank Lee";
> $tmp['t220_snipinfoone-8'] = "Grandson of Robert E. Lee";
> $tmp['t220_snipinfotwo-8'] = "Give a small bit of information about the person in this space.";
> $tmp['t220_snipimage-8'] = "img/person4.jpg";
> $tmp['t220_snipperson-8'] = "";
> $tmp['t220_sniptree-8'] = "";
> $tmp['t220_ttitletext'] = "Footer Text";
> $tmp['t220_link'] = "Link or email address";
> $tmp['t220_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> 
> $tmp['t221_maintitle'] = "Template 221";
> $tmp['t221_headingimg'] = "img/logo.png";
> $tmp['t221_headsubtitle'] = "Searching for Ancestors";
> $tmp['t221_featurethumb1'] = "img/top1.jpg";
> $tmp['t221_person-1'] = "";
> $tmp['t221_tree-1'] = "";
> $tmp['t221_featuretitle1'] = "Holley";
> $tmp['t221_headline-1'] = "My ancestor's story...";
> $tmp['t221_subhead-1'] = "I hope you enjoy the fruits of my research.";
> $tmp['t221_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t221_headline-2'] = "Looking for clues?";
> $tmp['t221_subhead-2'] = "Hopefully you can find answers in my site!";
> $tmp['t221_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t221_headline-3'] = "If you have something to add";
> $tmp['t221_subhead-3'] = "Please send it to me! I'm always looking for family!";
> $tmp['t221_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t221_featurethumb2'] = "img/top2.jpg";
> $tmp['t221_person-2'] = "";
> $tmp['t221_tree-2'] = "";
> $tmp['t221_featuretitle2'] = "Brown";
> $tmp['t221_welcome'] = "Welcome to Template 221";
> $tmp['t221_featurepara1'] = "Thanks for stopping by to check out our website. We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates as well. Please go by and check them out.";
> $tmp['t221_featuretitle3'] = "The Chosen";
> $tmp['t221_featurethumb3'] = "img/topleft.jpg";
> $tmp['t221_featurepara3'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t221_featurelink3'] = "";
> $tmp['t221_featuretitle4'] = "The Bones of My Bones";
> $tmp['t221_featurethumb4'] = "img/album.jpg";
> $tmp['t221_featurepara4'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t221_featurelink4'] = "";
> $tmp['t221_headline-4'] = "Our Ancestors";
> $tmp['t221_sniptitle-1'] = "Holley";
> $tmp['t221_snipimage-1'] = "img/person1.jpg";
> $tmp['t221_snipperson-1'] = "";
> $tmp['t221_sniptree-1'] = "";
> $tmp['t221_snipinfoone-1'] = "Short information here";
> $tmp['t221_sniptitle-2'] = "Chandler";
> $tmp['t221_snipimage-2'] = "img/person2.jpg";
> $tmp['t221_snipperson-2'] = "";
> $tmp['t221_sniptree-2'] = "";
> $tmp['t221_snipinfoone-2'] = "Short information here";
> $tmp['t221_sniptitle-3'] = "Bryant";
> $tmp['t221_snipimage-3'] = "img/person3.jpg";
> $tmp['t221_snipperson-3'] = "";
> $tmp['t221_sniptree-3'] = "";
> $tmp['t221_snipinfoone-3'] = "Short information here";
> $tmp['t221_sniptitle-4'] = "Lewis";
> $tmp['t221_snipimage-4'] = "img/person4.jpg";
> $tmp['t221_snipperson-4'] = "";
> $tmp['t221_sniptree-4'] = "";
> $tmp['t221_snipinfoone-4'] = "Short information here";
> $tmp['t221_sniptitle-5'] = "Brown";
> $tmp['t221_snipimage-5'] = "img/person5.jpg";
> $tmp['t221_snipperson-5'] = "";
> $tmp['t221_sniptree-5'] = "";
> $tmp['t221_snipinfoone-5'] = "Short information here";
> $tmp['t221_sniptitle-6'] = "Lima";
> $tmp['t221_snipimage-6'] = "img/person6.jpg";
> $tmp['t221_snipperson-6'] = "";
> $tmp['t221_sniptree-6'] = "";
> $tmp['t221_snipinfoone-6'] = "Short information here";
> $tmp['t221_sniptitle-7'] = "Green";
> $tmp['t221_snipimage-7'] = "img/person7.jpg";
> $tmp['t221_snipperson-7'] = "";
> $tmp['t221_sniptree-7'] = "";
> $tmp['t221_snipinfoone-7'] = "Short information here";
> $tmp['t221_sniptitle-8'] = "Cutler";
> $tmp['t221_snipimage-8'] = "img/person8.jpg";
> $tmp['t221_snipperson-8'] = "";
> $tmp['t221_sniptree-8'] = "";
> $tmp['t221_snipinfoone-8'] = "Short information here";
> $tmp['t221_quotehead'] = "Quotes From Our Family";
> $tmp['t221_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t221_author-1'] = "Mark Twain";
> $tmp['t221_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t221_author-2'] = "Howard K. Nixon";
> $tmp['t221_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t221_author-3'] = "Jimmy Carter";
> $tmp['t221_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t221_author-4'] = "Florence King";
> $tmp['t221_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t221_author-5'] = "Ellen";
> $tmp['t221_featuretitle5'] = "Our Thoughts";
> $tmp['t221_featurepara5'] = "This is information that is placed in the bottom box for the user to have another short space for comments.  It could also be used to thank contributors.";
> $tmp['t221_featurelink5'] = "";
> $tmp['t221_ttitletext'] = "Footer Text";
> $tmp['t221_link'] = "Link or email address";
> $tmp['t221_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> $tmp['t222_dadside'] = "His Side | ";
> $tmp['t222_dadperson'] = "I2";
> $tmp['t222_dadtree'] = "mytreeid";
> $tmp['t222_momside'] = "Her Side | ";
> $tmp['t222_momperson'] = "I1";
> $tmp['t222_momtree'] = "mytreeid";
> $tmp['t222_featurelinks'] = "GWT, https://genealogywebtemplates.com/";
> $tmp['t222_maintitle'] = "Your Genealogy Site";
> $tmp['t222_headsubtitle'] = "Welcome to Our Family Site";
> $tmp['t222_welcome'] = "Welcome to Template 222";
> $tmp['t222_featuretitle3'] = "The Chosen";
> $tmp['t222_featurethumb3'] = "img/top.jpg";
> $tmp['t222_featurepara3'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t222_featurelink3'] = "surnames.php";
> $tmp['t222_headline-1'] = "Our Families";
> $tmp['t222_featuretitle4'] = "Ancestor's Name";
> $tmp['t222_featurethumb4'] = "img/family1.jpg";
> $tmp['t222_featurepara4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t222_featurelink4'] = "";
> $tmp['t222_featuretitle5'] = "Events";
> $tmp['t222_featurethumb5'] = "img/family2.jpg";
> $tmp['t222_featurepara5'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t222_featurelink5'] = "";
> $tmp['t222_featuretitle6'] = "Pictures of Family";
> $tmp['t222_featurethumb6'] = "img/family3.jpg";
> $tmp['t222_featurepara6'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t222_featurelink6'] = "";
> $tmp['t222_featurethumb7'] = "img/ancestor1.jpg";
> $tmp['t222_featuretitle7'] = "Wow! Take a look at this!";
> $tmp['t222_featurepara7'] = "Good, I expected it. Now, listen to me. Up to this time I have been Mr. Fogg's adversary. I am now in his game. 'Aha!' cried Passepartout; 'you are convinced he is an honest man?' 'No,' replied Fix coldly, 'I think him a rascal. Sh! don't budge, and let me speak. As long as Mr. Fogg was on English ground, it was for my interest to detain him there until my warrant of arrest arrived. I did everything I could to keep him back.";
> $tmp['t222_featurelink7'] = "";
> $tmp['t222_featurethumb8'] = "img/ancestor2.jpg";
> $tmp['t222_featuretitle8'] = "A Fun Time With Family!";
> $tmp['t222_featurepara8'] = "And I shall get my brains,' added the Scarecrow joyfully. 'And I shall get my courage,' said the Lion thoughtfully. 'And I shall get back to Kansas,' cried Dorothy, clapping her hands. 'Oh, let us start for the Emerald City tomorrow!' The next day they called the Winkies together and bade them good-bye. The Winkies were sorry to have them go, and they had grown fond of the Tin Woodman.";
> $tmp['t222_featurelink8'] = "";
> $tmp['t222_headline-2'] = "Our Families";
> $tmp['t222_texttitle2'] = "They were explorers!";
> $tmp['t222_sniptitle-1'] = "Fred Smith";
> $tmp['t222_snipname-1'] = "Fredrick Smith";
> $tmp['t222_snipinfoone-1'] = "Born 1862";
> $tmp['t222_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t222_snipimage-1'] = "img/snip1.jpg";
> $tmp['t222_snipperson-1'] = "";
> $tmp['t222_sniptree-1'] = "";
> $tmp['t222_sniptitle-2'] = "Dan Jones";
> $tmp['t222_snipname-2'] = "Daniel Jones";
> $tmp['t222_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t222_snipinfotwo-2'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t222_snipimage-2'] = "img/snip2.jpg";
> $tmp['t222_snipperson-2'] = "";
> $tmp['t222_sniptree-2'] = "";
> $tmp['t222_sniptitle-3'] = "Peter Ryan";
> $tmp['t222_snipname-3'] = "Peter C. Ryan";
> $tmp['t222_snipinfoone-3'] = "Information";
> $tmp['t222_snipinfotwo-3'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t222_snipperson-3'] = "";
> $tmp['t222_snipimage-3'] = "img/snip3.jpg";
> $tmp['t222_sniptree-3'] = "";
> $tmp['t222_sniptitle-4'] = "Roy Robbins";
> $tmp['t222_snipname-4'] = "Roy B. Robbins";
> $tmp['t222_snipinfoone-4'] = "Information";
> $tmp['t222_snipinfotwo-4'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t222_snipimage-4'] = "img/snip4.jpg";
> $tmp['t222_snipperson-4'] = "";
> $tmp['t222_sniptree-4'] = "";
> $tmp['t222_featuretitle9'] = "The Bones of My Bone";
> $tmp['t222_featurepara9'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t222_featurelink9'] = "https://genealogywebtemplates.com";
> $tmp['t222_headline-3'] = "Surnames";
> $tmp['t222_ttitletext'] = "Footer Text";
> $tmp['t222_link'] = "Link or email address";
> $tmp['t222_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> $tmp['t223_maintitle'] = "Template 223";
> $tmp['t223_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t223_headimg'] = "img/logo.png";
> $tmp['t223_dadside'] = "His Side | ";
> $tmp['t223_dadperson'] = "I2";
> $tmp['t223_dadtree'] = "mytreeid";
> $tmp['t223_momside'] = "Her Side | ";
> $tmp['t223_momperson'] = "I1";
> $tmp['t223_momtree'] = "mytreeid";
> $tmp['t223_featurelinks'] = "| GWT, https://genealogywebtemplates.com/";
> $tmp['t223_featurethumb1'] = "img/top1.jpg";
> $tmp['t223_headline-1'] = "Katherine Hepburn";
> $tmp['t223_featurethumb2'] = "img/top2.jpg";
> $tmp['t223_headline-2'] = "Cary Grant";
> $tmp['t223_featurethumb3'] = "img/top3.jpg";
> $tmp['t223_headline-3'] = "Ingrid Bergman";
> $tmp['t223_featurethumb4'] = "img/top4.jpg";
> $tmp['t223_headline-4'] = "Greta Garbo";
> $tmp['t223_featurethumb5'] = "img/top5.jpg";
> $tmp['t223_headline-5'] = "Marlon &amp; Bette Brando";
> $tmp['t223_featurethumb6'] = "img/top6.jpg";
> $tmp['t223_headline-6'] = "Elizabeth Taylor";
> $tmp['t223_featurethumb7'] = "img/top7.jpg";
> $tmp['t223_headline-7'] = "Henry Fonda Family";
> $tmp['t223_featurethumb8'] = "img/top8.jpg";
> $tmp['t223_headline-8'] = "Clark Gable";
> $tmp['t223_featurethumb9'] = "img/top9.jpg";
> $tmp['t223_headline-9'] = "James Cagney";
> $tmp['t223_featurethumb-10'] = "img/top10.jpg";
> $tmp['t223_headline-10'] = "Spencer Tracy Family";
> $tmp['t223_featurethumb-11'] = "img/top11.jpg";
> $tmp['t223_headline-11'] = "Gregory Peck Family";
> $tmp['t223_featurethumb-12'] = "img/top12.jpg";
> $tmp['t223_headline-12'] = "Laurence Olivier";
> $tmp['t223_welcome'] = "Template 223";
> $tmp['t223_titleimage'] = "img/top.jpg";
> $tmp['t223_mainpara'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. </p><p>The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.";
> $tmp['t223_headline'] = "Spotlight on People &amp; Places";
> $tmp['t223_snipimage-1'] = "img/spotlight1.jpg";
> $tmp['t223_featurelink1'] = "";
> $tmp['t223_snipname-1'] = "Ireland";
> $tmp['t223_snipimage-2'] = "img/spotlight2.jpg";
> $tmp['t223_featurelink2'] = "";
> $tmp['t223_snipname-2'] = "Cemetery";
> $tmp['t223_snipimage-3'] = "img/spotlight3.jpg";
> $tmp['t223_featurelink3'] = "";
> $tmp['t223_snipname-3'] = "Grandmother";
> $tmp['t223_snipimage-4'] = "img/spotlight4.jpg";
> $tmp['t223_featurelink4'] = "";
> $tmp['t223_snipname-4'] = "Old Homestead";
> $tmp['t223_subhead-1'] = "Our Families";
> $tmp['t223_snipname-5'] = "Family Member 1";
> $tmp['t223_snipperson-5'] = "";
> $tmp['t223_sniptree-5'] = "";
> $tmp['t223_snipimage-5'] = "img/family1.jpg";
> $tmp['t223_snipinfoone-5'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.";
> $tmp['t223_snipname-6'] = "Family Member 2";
> $tmp['t223_snipperson-6'] = "";
> $tmp['t223_sniptree-6'] = "";
> $tmp['t223_snipimage-6'] = "img/family2.jpg";
> $tmp['t223_snipinfoone-6'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.";
> $tmp['t223_snipname-7'] = "Family Member 3";
> $tmp['t223_snipperson-7'] = "";
> $tmp['t223_sniptree-7'] = "";
> $tmp['t223_snipimage-7'] = "img/family3.jpg";
> $tmp['t223_snipinfoone-7'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.";
> $tmp['t223_snipname-8'] = "Family Member 4";
> $tmp['t223_snipperson-8'] = "";
> $tmp['t223_sniptree-8'] = "";
> $tmp['t223_snipimage-8'] = "img/family4.jpg";
> $tmp['t223_snipinfoone-8'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.";
> $tmp['t223_quotehead'] = "Our Favorite Genealogy Quotes!";
> $tmp['t223_headline-13'] = "We Love to Laugh";
> $tmp['t223_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t223_author-1'] = "Mark Twain";
> $tmp['t223_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t223_author-2'] = "Howard K. Nixon";
> $tmp['t223_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t223_author-3'] = "Jimmy Carter";
> $tmp['t223_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t223_author-4'] = "Florence King";
> $tmp['t223_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t223_author-5'] = "Ellen";
> $tmp['t223_ttitletext'] = "Footer Text";
> $tmp['t223_link'] = "Link or email address";
> $tmp['t223_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> $tmp['t224_maintitle'] = "Template 224";
> $tmp['t224_headsubtitle'] = "Genealogy Spoken Here";
> $tmp['t224_headimg'] = "img/logo.png";
> $tmp['t224_dadside'] = "His Side | ";
> $tmp['t224_dadperson'] = "I2";
> $tmp['t224_dadtree'] = "mytreeid";
> $tmp['t224_momside'] = "Her Side | ";
> $tmp['t224_momperson'] = "I1";
> $tmp['t224_momtree'] = "mytreeid";
> $tmp['t224_featurelinks'] = "GWT, https://genealogywebtemplates.com";
> $tmp['t224_featuretitle1'] = "Welcome to Our Site";
> $tmp['t224_featurepara1'] = "We hope you find everything you are looking for and many things you haven't thought of yet!</p><p>We're still researching, so give us a call!";
> $tmp['t224_featurethumb1'] = "img/ancestor.jpg";
> $tmp['t224_subhead-1'] = "Thanks for visiting!";
> $tmp['t224_featurethumb2'] = "img/top1.jpg";
> $tmp['t224_person-2'] = "";
> $tmp['t224_tree-2'] = "";
> $tmp['t224_featurethumb3'] = "img/top2.jpg";
> $tmp['t224_person-3'] = "";
> $tmp['t224_tree-3'] = "";
> $tmp['t224_featurethumb4'] = "img/mainimage1.jpg";
> $tmp['t224_featuretitle4'] = "Slider Left  - Image 1";
> $tmp['t224_featurethumb5'] = "img/mainimage2.jpg";
> $tmp['t224_featuretitle5'] = "Slider Left  - Image 2";
> $tmp['t224_featurethumb6'] = "img/mainimage3.jpg";
> $tmp['t224_featuretitle6'] = "Slider Left  - Image 3";
> $tmp['t224_featurethumb7'] = "img/mainimage4.jpg";
> $tmp['t224_featuretitle7'] = "Slider Right - Image 4";
> $tmp['t224_featurethumb8'] = "img/mainimage5.jpg";
> $tmp['t224_featuretitle8'] = "Slider Right - Image 5";
> $tmp['t224_featurethumb9'] = "img/mainimage6.jpg";
> $tmp['t224_featuretitle9'] = "Slider Right - Image 6";
> $tmp['t224_welcome'] = "Template 224";
> $tmp['t224_headline-4'] = "The Chosen";
> $tmp['t224_featurepara4'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us.";
> $tmp['t224_headline-10'] = "William Smith Family";
> $tmp['t224_featurethumb10'] = "img/ancestor1.jpg";
> $tmp['t224_featurepara10'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t224_featurethumb11'] = "img/ancestor1.jpg";
> $tmp['t224_featurepara11'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t224_link-1'] = "surnames.php";
> $tmp['t224_headline-11'] = "William Smith Family";
> $tmp['t224_featurepara11'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t224_link-2'] = "";
> $tmp['t224_featurethumb11'] = "img/ancestor1.jpg";
> $tmp['t224_subhead-2'] = "Spotlight on Family";
> $tmp['t224_snipname-1'] = "Ancestor's Name";
> $tmp['t224_snipimage-1'] = "img/family1.jpg";
> $tmp['t224_snipinfoone-1'] = "Place information here about this family member or place.  Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t224_featurelink1'] = "";
> $tmp['t224_snipname-2'] = "Events";
> $tmp['t224_snipimage-2'] = "img/family2.jpg";
> $tmp['t224_snipinfoone-2'] = "Place information here about this family member or place.  Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t224_featurelink2'] = "";
> $tmp['t224_snipname-3'] = "Family";
> $tmp['t224_snipimage-3'] = "img/family3.jpg";
> $tmp['t224_snipinfoone-3'] = "Place information here about this family member or place.  Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t224_featurelink3'] = "";
> $tmp['t224_snipname-4'] = "Ancestor's Name";
> $tmp['t224_snipimage-4'] = "img/family4.jpg";
> $tmp['t224_snipinfoone-4'] = "Place information here about this family member or place.  Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t224_featurelink4'] = "";
> $tmp['t224_quotehead'] = "Genealogy Quotes";
> $tmp['t224_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t224_author-1'] = "Mark Twain";
> $tmp['t224_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t224_author-2'] = "Howard K. Nixon";
> $tmp['t224_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t224_author-3'] = "Jimmy Carter";
> $tmp['t224_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t224_author-4'] = "Florence King";
> $tmp['t224_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t224_author-5'] = "Ellen";
> $tmp['t224_subhead-3'] = "Spotlight on People &amp; Places";
> $tmp['t224_snipimage-5'] = "img/spotlight1.jpg";
> $tmp['t224_snipname-5'] = "Ireland";
> $tmp['t224_featurelink5'] = "";
> $tmp['t224_snipimage-6'] = "img/spotlight2.jpg";
> $tmp['t224_snipname-6'] = "Cemetery";
> $tmp['t224_featurelink6'] = "";
> $tmp['t224_snipimage-7'] = "img/spotlight3.jpg";
> $tmp['t224_snipname-7'] = "Grandmother";
> $tmp['t224_featurelink7'] = "";
> $tmp['t224_snipimage-8'] = "img/spotlight4.jpg";
> $tmp['t224_snipname-8'] = "Old Homestead";
> $tmp['t224_featurelink8'] = "";
> $tmp['t224_ttitletext'] = "Footer Text";
> $tmp['t224_link'] = "Link, text or email address";
> $tmp['t224_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> $tmp['t225_maintitle'] = "Your Family Name";
> $tmp['t225_headsubtitle'] = "Genealogy Spoken Here";
> $tmp['t225_headimg'] = "img/logo.png";
> $tmp['t225_dadside'] = "His Side | ";
> $tmp['t225_dadperson'] = "I2";
> $tmp['t225_dadtree'] = "mytreeid";
> $tmp['t225_momside'] = "Her Side | ";
> $tmp['t225_momperson'] = "I1";
> $tmp['t225_momtree'] = "mytreeid";
> $tmp['t225_featurelinks'] = "GWT, https://genealogywebtemplates.com";
> $tmp['t225_mainimage-1'] = "img/mainimage1.jpg";
> $tmp['t225_headline-1'] = "Our Great Grandparents";
> $tmp['t225_subhead-1'] = "Susan &amp; Fred Holley";
> $tmp['t225_mainimage-2'] = "img/mainimage2.jpg";
> $tmp['t225_headline-2'] = "Greenwood Cemetery";
> $tmp['t225_subhead-2'] = "Rangefield, Germany";
> $tmp['t225_mainimage-3'] = "img/mainimage3.jpg";
> $tmp['t225_headline-3'] = "Mom &amp; Dad Smith";
> $tmp['t225_subhead-3'] = "Our Parents Are Our Rock!";
> $tmp['t225_snipname-1'] = "Fred Smith";
> $tmp['t225_snipperson-1'] = "";
> $tmp['t225_sniptree-1'] = "";
> $tmp['t225_snipimage-1'] = "img/top1.jpg";
> $tmp['t225_snipname-2'] = "John Doe";
> $tmp['t225_snipperson-2'] = "";
> $tmp['t225_sniptree-2'] = "";
> $tmp['t225_snipimage-2'] = "img/top2.jpg";
> $tmp['t225_snipname-3'] = "Deborah Smith";
> $tmp['t225_snipperson-3'] = "";
> $tmp['t225_sniptree-3'] = "";
> $tmp['t225_snipimage-3'] = "img/top3.jpg";
> $tmp['t225_snipname-4'] = "Alvin Boudreaux";
> $tmp['t225_snipperson-4'] = "";
> $tmp['t225_sniptree-4'] = "";
> $tmp['t225_snipimage-4'] = "img/top4.jpg";
> $tmp['t225_welcome'] = "Template 225";
> $tmp['t225_featuretitle1'] = "The Chosen";
> $tmp['t225_featurepara1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t225_featuretitle2'] = "Will Smith Family";
> $tmp['t225_featurethumb2'] = "img/ancestor1.jpg";
> $tmp['t225_featurepara2'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes oversaw swore that while a more some where one more agreeably spoiled less more.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t225_featurelink2'] = "";
> $tmp['t225_featuretitle3'] = "Fred Jones Family";
> $tmp['t225_featurethumb3'] = "img/ancestor1.jpg";
> $tmp['t225_featurepara3'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes oversaw swore that while a more some where one more agreeably spoiled less more.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t225_featurelink3'] = "surnames.php";
> $tmp['t225_subhead-4'] = "Spotlight on Family";
> $tmp['t225_featuretitle4'] = "Ancestor's Name";
> $tmp['t225_featurethumb4'] = "img/family1.jpg";
> $tmp['t225_featurepara4'] = "Place information here about this family member or place.  Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t225_featurelink4'] = "";
> $tmp['t225_featuretitle5'] = "Events";
> $tmp['t225_featurethumb5'] = "img/family2.jpg";
> $tmp['t225_featurepara5'] = "Place information here about this family member or place.  Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t225_featurelink5'] = "";
> $tmp['t225_featuretitle6'] = "Place";
> $tmp['t225_featurethumb6'] = "img/family3.jpg";
> $tmp['t225_featurepara6'] = "Place information here about this family member or place.  Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t225_featurelink6'] = "";
> $tmp['t225_featuretitle7'] = "Ancestor's Name";
> $tmp['t225_featurethumb7'] = "img/family4.jpg";
> $tmp['t225_featurepara7'] = "Place information here about this family member or place.  Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t225_featurelink7'] = "";
> $tmp['t225_quotehead'] = "Genealogy Quotes";
> $tmp['t225_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t225_author-1'] = "Mark Twain";
> $tmp['t225_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t225_author-2'] = "Howard K. Nixon";
> $tmp['t225_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t225_author-3'] = "Jimmy Carter";
> $tmp['t225_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t225_author-4'] = "Florence King";
> $tmp['t225_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t225_author-5'] = "Ellen";
> $tmp['t225_ttitletext'] = "Footer Text";
> $tmp['t225_link'] = "Link, text or email address";
> $tmp['t225_latestnews'] = "We strive to document all of our sources in this family tree. If you have something to add, please let us know.";
> 
> $tmp['t226_maintitle'] = "Template 226";
> $tmp['t226_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t226_headimg'] = "img/logo.png";
> $tmp['t226_dadperson'] = "I2";
> $tmp['t226_dadtree'] = "mytreeid";
> $tmp['t226_headerlinktext-1'] = "Holley Side";
> $tmp['t226_momperson'] = "I1";
> $tmp['t226_momtree'] = "mytreeid";
> $tmp['t226_headerlinktext-2'] = "Boardman Side";
> $tmp['t226_headerlink-3'] = "surnames.php";
> $tmp['t226_headerlinktext-3'] = "Surnames";
> $tmp['t226_headerlink-4'] = "histories/index.php";
> $tmp['t226_headerlinktext-4'] = "Histories";
> $tmp['t226_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t226_slideheadline-1'] = "Ancestor hunting is exciting!";
> $tmp['t226_slidetext-1'] = "We hope we help you with your hunt.";
> $tmp['t226_slidelink-1'] = "histories/place1.php";
> $tmp['t226_slidelinktext-1'] = "Histories";
> $tmp['t226_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t226_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t226_slidetext-2'] = "Please share with us.<br>";
> $tmp['t226_slidelink-2'] = "histories/story1.php";
> $tmp['t226_slidelinktext-2'] = "Stories";
> $tmp['t226_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t226_slideheadline-3'] = "We love TNG!";
> $tmp['t226_slidetext-3'] = "We also love our new look from Genealogy Web Templates.";
> $tmp['t226_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t226_slidelinktext-3'] = "GWT";
> $tmp['t226_featuretitle-1'] = "Our Family";
> $tmp['t226_featurepara-1'] = "We are happy you dropped in! We hope you find common ancestors in our 'labor of love'. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. </p><p>We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. </p><p>It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.</p>";
> $tmp['t226_featurelink-1'] = "histories/home.php";
> $tmp['t226_featurelinktext-1'] = "Histories";
> $tmp['t226_featuretitle-2'] = "Bones of My Bones";
> $tmp['t226_featurepara-2'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. <br><br>It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. ";
> $tmp['t226_featurethumb-2'] = "img/couple.jpg";
> $tmp['t226_featurelink-2'] = "histories/place1.php";
> $tmp['t226_featurelinktext-2'] = "Places";
> $tmp['t226_tree-2'] = "";
> $tmp['t226_person-2'] = "";
> $tmp['t226_featuretitle-3'] = "A Scribed Called";
> $tmp['t226_featurepara-3'] = "It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are.<br><br> So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<br><br><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t226_featurethumb-3'] = "img/family.jpg";
> $tmp['t226_featurelink-3'] = "histories/feature6.php";
> $tmp['t226_tree-3'] = "";
> $tmp['t226_person-3'] = "";
> $tmp['t226_featuretitle-4'] = "Take a look at our family's roots!";
> $tmp['t226_featuresub-4'] = "Family";
> $tmp['t226_featurethumb-4'] = "img/family5.jpg";
> $tmp['t226_featurepara-4'] = "This is information about your family members. You can add information here and then link to the person or you can link to a histories page. This is an easy way to gain interest from your visitors. If they like what they see, they'll click on the 'More' button.";
> $tmp['t226_featurelink-4'] = "histories/index.php";
> $tmp['t226_featuresub-5'] = "Cemeteries";
> $tmp['t226_featurethumb-5'] = "img/family6.jpg";
> $tmp['t226_featurepara-5'] = "This is information about your family members. You can add information here and then link to the person or you can link to a histories page. This is an easy way to gain interest from your visitors. If they like what they see, they'll click on the 'More' button.";
> $tmp['t226_featurelink-5'] = "surnames.php";
> $tmp['t226_featuresub-6'] = "The Coast";
> $tmp['t226_featurethumb-6'] = "img/family8.jpg";
> $tmp['t226_featurepara-6'] = "This is information about your family members. You can add information here and then link to the person or you can link to a histories page. This is an easy way to gain interest from your visitors. If they like what they see, they'll click on the 'More' button.";
> $tmp['t226_featurelink-6'] = "";
> $tmp['t226_featuresub-7'] = "Ireland";
> $tmp['t226_featurethumb-7'] = "img/family7.jpg";
> $tmp['t226_featurepara-7'] = "This is information about your family members. You can add information here and then link to the person or you can link to a histories page. This is an easy way to gain interest from your visitors. If they like what they see, they'll click on the 'More' button.";
> $tmp['t226_featurelink-7'] = "";
> $tmp['t226_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t226_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t226_sidebarimg-1'] = "img/family1sm.jpg";
> $tmp['t226_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t226_sidebarlink-1'] = "histories/place1.php";
> $tmp['t226_sidebarsub-2'] = "Events";
> $tmp['t226_sidebarimg-2'] = "img/family2sm.jpg";
> $tmp['t226_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t226_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t226_sidebarsub-3'] = "Pictures of Family";
> $tmp['t226_sidebarimg-3'] = "img/family3sm.jpg";
> $tmp['t226_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t226_sidebarlink-3'] = "";
> $tmp['t226_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t226_sidebarimg-4'] = "img/family4sm.jpg";
> $tmp['t226_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t226_sidebarlink-4'] = "";
> $tmp['t226_sidebarsub-5'] = "Pictures of Family";
> $tmp['t226_sidebarimg-5'] = "img/family5sm.jpg";
> $tmp['t226_sidebarpara-5'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t226_sidebarlink-5'] = "";
> $tmp['t226_sidebarsub-6'] = "Ancestor's Name";
> $tmp['t226_sidebarimg-6'] = "img/family6sm.jpg";
> $tmp['t226_sidebarpara-6'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t226_sidebarlink-6'] = "";
> $tmp['t226_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t226_quotesubhead'] = "We hope you enjoy them!";
> $tmp['t226_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t226_author-1'] = "Mark Twain";
> $tmp['t226_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t226_author-2'] = "Howard K. Nixon";
> $tmp['t226_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t226_author-3'] = "Jimmy Carter";
> $tmp['t226_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t226_author-4'] = "Florence King";
> $tmp['t226_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t226_author-5'] = "Ellen";
> $tmp['t226_headline-1'] = "Discover Our Family";
> $tmp['t226_snipimg-1'] = "img/top1.jpg";
> $tmp['t226_snipname-1'] = "Ancestor's Name";
> $tmp['t226_snipinfoone-1'] = "Mauris fermentum tortor non enim aliquet condimentum. Nam aliquam pretium feugiat.";
> $tmp['t226_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t226_snipimg-2'] = "img/top2.jpg";
> $tmp['t226_snipname-2'] = "Ancestor's Name";
> $tmp['t226_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t226_sniplink-2'] = "histories/place1.php";
> $tmp['t226_snipimg-3'] = "img/top3.jpg";
> $tmp['t226_snipname-3'] = "Ancestor's Name";
> $tmp['t226_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t226_sniplink-3'] = "surnames.php";
> $tmp['t226_snipimg-4'] = "img/top4.jpg";
> $tmp['t226_snipname-4'] = "Ancestor's Name";
> $tmp['t226_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t226_sniplink-4'] = "histories/family1.php";
> $tmp['t226_snipimg-5'] = "img/top1.jpg";
> $tmp['t226_snipname-5'] = "Ancestor's Name";
> $tmp['t226_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t226_sniplink-5'] = "histories/place1.php";
> $tmp['t226_snipimg-6'] = "img/top2.jpg";
> $tmp['t226_snipname-6'] = "Ancestor's Name";
> $tmp['t226_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t226_sniplink-6'] = "histories/family2.php";
> $tmp['t226_snipimg-7'] = "img/top3.jpg";
> $tmp['t226_snipname-7'] = "Ancestor's Name";
> $tmp['t226_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t226_sniplink-7'] = "histories/story1.php";
> $tmp['t226_snipimg-8'] = "img/top4.jpg";
> $tmp['t226_snipname-8'] = "Ancestor's Name";
> $tmp['t226_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t226_sniplink-8'] = "histories/story2.php";
> $tmp['t226_footerheadline-1'] = "Quick Links";
> $tmp['t226_footerheadline-2'] = "Contact Us";
> $tmp['t226_footerlink-1'] = "suggest.php";
> $tmp['t226_footerlinktext-1'] = "Contact Us";
> $tmp['t226_footerlink-2'] = "surnames.php";
> $tmp['t226_footerlinktext-2'] = "Our Surnames";
> $tmp['t226_footerlink-3'] = "histories/story1.php";
> $tmp['t226_footerlinktext-3'] = "Our Stories";
> $tmp['t226_footerheadline-4'] = "Webmaster Message";
> $tmp['t226_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t227_headimg'] = "img/logo.png";
> $tmp['t227_maintitle'] = "Template 227";
> $tmp['t227_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t227_link-1'] = "suggest.php?page=Our+Histories";
> $tmp['t227_linktext-1'] = "Contact Us";
> $tmp['t227_link-2'] = "surnames.php";
> $tmp['t227_linktext-2'] = "Surnames";
> $tmp['t227_link-3'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t227_linktext-3'] = "History Pages";
> $tmp['t227_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t227_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t227_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t227_slidelink-1'] = "histories/place1.php";
> $tmp['t227_slidelinktext-1'] = "Histories";
> $tmp['t227_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t227_slideheadline-2'] = "Our Smith Family";
> $tmp['t227_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.";
> $tmp['t227_slidelink-2'] = "histories/story1.php";
> $tmp['t227_slidelinktext-2'] = "Stories";
> $tmp['t227_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t227_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t227_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for!";
> $tmp['t227_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t227_slidelinktext-3'] = "GWT";
> $tmp['t227_featuretitle-1'] = "Our Family's Genealogy";
> $tmp['t227_featurethumb-1'] = "img/woman.jpg";
> $tmp['t227_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t227_featurelink-1'] = "";
> $tmp['t227_featurelinktext-1'] = "";
> $tmp['t227_featuretitle-2'] = "The Chosen";
> $tmp['t227_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t227_featurethumb-2'] = "img/top1.jpg";
> $tmp['t227_featurelink-2'] = "histories/story2.php";
> $tmp['t227_featurelinktext-2'] = "See More";
> $tmp['t227_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t227_featurethumb-3'] = "img/top2.jpg";
> $tmp['t227_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"\<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t227_featurelink-3'] = "histories/place1.php";
> $tmp['t227_featurelinktext-3'] = "See More";
> $tmp['t227_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t227_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, you will need to remove them in the index.php file.</em>";
> $tmp['t227_sidebartitle-1'] = "Herman Brown";
> $tmp['t227_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t227_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-1'] = "histories/family1.php";
> $tmp['t227_sidebarlinktext-1'] = "His Story";
> $tmp['t227_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t227_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t227_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-2'] = "surnames.php";
> $tmp['t227_sidebarlinktext-2'] = "See Camilla";
> $tmp['t227_sidebartitle-3'] = "Susan Smith";
> $tmp['t227_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t227_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-3'] = "";
> $tmp['t227_sidebarlinktext-3'] = "";
> $tmp['t227_sidebartitle-4'] = "Eric Martinson";
> $tmp['t227_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t227_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t227_sidebarlinktext-4'] = "See Erik";
> $tmp['t227_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t227_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t227_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-5'] = "";
> $tmp['t227_sidebarlinktext-5'] = "";
> $tmp['t227_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t227_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t227_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-6'] = "";
> $tmp['t227_sidebarlinktext-6'] = "";
> $tmp['t227_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t227_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t227_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-7'] = "";
> $tmp['t227_sidebarlinktext-7'] = "";
> $tmp['t227_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t227_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t227_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-8'] = "";
> $tmp['t227_sidebarlinktext-8'] = "";
> $tmp['t227_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t227_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t227_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-9'] = "";
> $tmp['t227_sidebarlinktext-9'] = "";
> $tmp['t227_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t227_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t227_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t227_sidebarlink-10'] = "";
> $tmp['t227_sidebarlinktext-10'] = "";
> $tmp['t227_sidebarsub-2'] = "Our Pages";
> $tmp['t227_subhead2'] = "You can use this area to add your extra history or person pages.";
> $tmp['t227_sidebarlink-11'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t227_sidebarlinktext-11'] = "Our History Pages";
> $tmp['t227_sidebarlink-12'] = "history/story1.php";
> $tmp['t227_sidebarlinktext-12'] = "Our Stories";
> $tmp['t227_sidebarlink-13'] = "https://usgenweb.org";
> $tmp['t227_sidebarlinktext-13'] = "USGenWeb";
> $tmp['t227_sidebarlink-14'] = "https://genealogywebtemplates.com";
> $tmp['t227_sidebarlinktext-14'] = "Genealogy Web Templates";
> $tmp['t227_sidebarlink-15'] = "https://tng.community/index.php?/forums/";
> $tmp['t227_sidebarlinktext-15'] = "TNG Forum";
> $tmp['t227_headline-1'] = "Discover Our Family";
> $tmp['t227_snipname-1'] = "Uncle Festus";
> $tmp['t227_snipimg-1'] = "img/topbox1.png";
> $tmp['t227_snipinfoone-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesu";
> $tmp['t227_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t227_snipname-2'] = "Aunt Margaret";
> $tmp['t227_snipimg-2'] = "img/topbox2.png";
> $tmp['t227_snipinfoone-2'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et male.";
> $tmp['t227_sniplink-2'] = "histories/place1.php";
> $tmp['t227_snipname-3'] = "Great Grandmother";
> $tmp['t227_snipimg-3'] = "img/topbox3.png";
> $tmp['t227_snipinfoone-3'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et male.";
> $tmp['t227_sniplink-3'] = "surnames.php";
> $tmp['t227_snipname-4'] = "Lidia Jones";
> $tmp['t227_snipimg-4'] = "img/topbox1.png";
> $tmp['t227_snipinfoone-4'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et male.";
> $tmp['t227_sniplink-4'] = "histories/family1.php";
> $tmp['t227_snipname-5'] = "Samuel Smith";
> $tmp['t227_snipimg-5'] = "img/topbox2.png";
> $tmp['t227_snipinfoone-5'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et male.";
> $tmp['t227_sniplink-5'] = "histories/place1.php";
> $tmp['t227_snipname-6'] = "Frederick Jones";
> $tmp['t227_snipimg-6'] = "img/topbox3.png";
> $tmp['t227_snipinfoone-6'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et male.";
> $tmp['t227_sniplink-6'] = "histories/family2.php";
> $tmp['t227_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t227_author-1'] = "Mark Twain";
> $tmp['t227_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t227_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t227_quotelink-1'] = "histories/place1.php";
> $tmp['t227_author-2'] = "Howard K. Nixon";
> $tmp['t227_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t227_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t227_quotelink-2'] = "";
> $tmp['t227_author-3'] = "Jimmy Carter";
> $tmp['t227_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t227_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t227_quotelink-3'] = "";
> $tmp['t227_author-4'] = "Florence King";
> $tmp['t227_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t227_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t227_quotelink-4'] = "";
> $tmp['t227_author-5'] = "Ellen";
> $tmp['t227_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t227_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t227_quotelink-5'] = "";
> $tmp['t227_author-6'] = "Uncle Ralph";
> $tmp['t227_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t227_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t227_quotelink-6'] = "";
> $tmp['t227_footerheadline-1'] = "Quick Links";
> $tmp['t227_footerheadline-2'] = "Contact Us";
> $tmp['t227_footerlink-1'] = "suggest.php";
> $tmp['t227_footerlinktext-1'] = "Contact Us";
> $tmp['t227_footerlink-2'] = "surnames.php";
> $tmp['t227_footerlinktext-2'] = "Our Surnames";
> $tmp['t227_footerlink-3'] = "histories/story1.php";
> $tmp['t227_footerlinktext-3'] = "Our Stories";
> $tmp['t227_footerheadline-4'] = "Webmaster Message";
> $tmp['t227_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t228_link-1'] = "https://www.tngsitebuilding.com/";
> $tmp['t228_linktext-1'] = "TNG";
> $tmp['t228_link-2'] = "https://genealogywebtemplates.com";
> $tmp['t228_linktext-2'] = "GWT";
> $tmp['t228_link-3'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t228_linktext-3'] = "History Files";
> $tmp['t228_link-4'] = "surnames.php";
> $tmp['t228_linktext-4'] = "Surnames";
> $tmp['t228_headimg'] = "img/logo.png";
> $tmp['t228_maintitle'] = "Template 228";
> $tmp['t228_headsubtitle'] = "We Love Finding Ancestors!";
> $tmp['t228_headline-1'] = "Finding Ancestors";
> $tmp['t228_subhead-1'] = "It's What We Do.";
> $tmp['t228_subhead-2'] = "Take a look at all of the great information we've gathered!";
> $tmp['t228_link-5'] = "suggest.php?page=Our+Histories";
> $tmp['t228_linktext-5'] = "Contact Us";
> $tmp['t228_slideimg-1'] = "img/top1.jpg";
> $tmp['t228_slidetitle-1'] = "Slider 1";
> $tmp['t228_slideheadline-1'] = "Subtitle 1";
> $tmp['t228_slidetext-1'] = "Text 1";
> $tmp['t228_slidelink-1'] = "surnames.php";
> $tmp['t228_slideimg-2'] = "img/top2.jpg";
> $tmp['t228_slidetitle-2'] = "Slider 2";
> $tmp['t228_slideheadline-2'] = "Subtitle 2";
> $tmp['t228_slidetext-2'] = "Text 2";
> $tmp['t228_slidelink-2'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t228_slideimg-3'] = "img/top3.jpg";
> $tmp['t228_slidetitle-3'] = "Slider 3";
> $tmp['t228_slideheadline-3'] = "Subtitle 3";
> $tmp['t228_slidetext-3'] = "Text 3";
> $tmp['t228_slidelink-3'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t228_featuretitle-1'] = "Our Family's Genealogy";
> $tmp['t228_featurethumb-1'] = "img/letters.jpg";
> $tmp['t228_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t228_featuretitle-2'] = "The Chosen";
> $tmp['t228_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t228_featurelink-2'] = "histories/story2.php";
> $tmp['t228_featurelinktext-2'] = "See More";
> $tmp['t228_headline-2'] = "Our Ancestors";
> $tmp['t228_sniptitle-1'] = "Fred Smith Family";
> $tmp['t228_snipname-1'] = "Fred Smith";
> $tmp['t228_snipinfoone-1'] = "Born 1862";
> $tmp['t228_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t228_snipimage-1'] = "img/snip1.jpg";
> $tmp['t228_snipperson-1'] = "";
> $tmp['t228_sniptree-1'] = "";
> $tmp['t228_sniptitle-2'] = "Dan Jones Family";
> $tmp['t228_snipname-2'] = "Dan Jones";
> $tmp['t228_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t228_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t228_snipimage-2'] = "img/snip2.jpg";
> $tmp['t228_snipperson-2'] = "";
> $tmp['t228_sniptree-2'] = "";
> $tmp['t228_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t228_snipname-3'] = "Peter Ryan";
> $tmp['t228_snipinfoone-3'] = "Family Name";
> $tmp['t228_snipinfotwo-3'] = "Information";
> $tmp['t228_snipimage-3'] = "img/snip3.jpg";
> $tmp['t228_snipperson-3'] = "";
> $tmp['t228_sniptree-3'] = "";
> $tmp['t228_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t228_snipname-4'] = "Roy Robbins";
> $tmp['t228_snipinfoone-4'] = "Family Name";
> $tmp['t228_snipinfotwo-4'] = "Information";
> $tmp['t228_snipimage-4'] = "img/snip4.jpg";
> $tmp['t228_snipperson-4'] = "";
> $tmp['t228_sniptree-4'] = "";
> $tmp['t228_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t228_snipname-5'] = "Barry Rogers";
> $tmp['t228_snipinfoone-5'] = "Family Name";
> $tmp['t228_snipinfotwo-5'] = "Information";
> $tmp['t228_snipimage-5'] = "img/snip5.jpg";
> $tmp['t228_snipperson-5'] = "";
> $tmp['t228_sniptree-5'] = "";
> $tmp['t228_sniptitle-6'] = "Albert Ross Family";
> $tmp['t228_snipname-6'] = "Albert Ross";
> $tmp['t228_snipinfoone-6'] = "Family Name";
> $tmp['t228_snipinfotwo-6'] = "Information";
> $tmp['t228_snipimage-6'] = "img/snip6.jpg";
> $tmp['t228_snipperson-6'] = "";
> $tmp['t228_sniptree-6'] = "";
> $tmp['t228_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t228_snipname-7'] = "Alvy Boardman";
> $tmp['t228_snipinfoone-7'] = "Family Name";
> $tmp['t228_snipinfotwo-7'] = "Information";
> $tmp['t228_snipimage-7'] = "img/snip7.jpg";
> $tmp['t228_snipperson-7'] = "";
> $tmp['t228_sniptree-7'] = "";
> $tmp['t228_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t228_snipname-8'] = "Paul Johnson";
> $tmp['t228_snipinfoone-8'] = "Family Name";
> $tmp['t228_snipinfotwo-8'] = "Information";
> $tmp['t228_snipimage-8'] = "img/snip8.jpg";
> $tmp['t228_snipperson-8'] = "";
> $tmp['t228_sniptree-8'] = "";
> $tmp['t228_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t228_featurethumb-3'] = "img/top2.jpg";
> $tmp['t228_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"\<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t228_featurelink-3'] = "histories/place1.php";
> $tmp['t228_featurelinktext-3'] = "See More";
> $tmp['t228_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t228_author-1'] = "Mark Twain";
> $tmp['t228_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t228_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t228_quotelink-1'] = "histories/place1.php";
> $tmp['t228_author-2'] = "Howard K. Nixon";
> $tmp['t228_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t228_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t228_quotelink-2'] = "";
> $tmp['t228_author-3'] = "Jimmy Carter";
> $tmp['t228_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t228_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t228_quotelink-3'] = "";
> $tmp['t228_author-4'] = "Florence King";
> $tmp['t228_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t228_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t228_quotelink-4'] = "";
> $tmp['t228_author-5'] = "Ellen";
> $tmp['t228_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t228_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t228_quotelink-5'] = "";
> $tmp['t228_author-6'] = "Aunt Suzie";
> $tmp['t228_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t228_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t228_quotelink-6'] = "";
> $tmp['t228_sidebartitle-1'] = "Our Extra Pages";
> $tmp['t228_sidebarsub-1'] = "You can use this area to add your extra history pages, ancestor pages or outside links.";
> $tmp['t228_sidebarlink-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t228_sidebarlinktext-1'] = "Our History Pages";
> $tmp['t228_sidebarlink-2'] = "histories/story1.php";
> $tmp['t228_sidebarlinktext-2'] = "Our Stories";
> $tmp['t228_sidebarlink-3'] = "https://usgenweb.org";
> $tmp['t228_sidebarlinktext-3'] = "USGenWeb";
> $tmp['t228_sidebarlink-4'] = "https://genealogywebtemplates.com";
> $tmp['t228_sidebarlinktext-4'] = "Genealogy Web Templates";
> $tmp['t228_sidebarlink-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t228_sidebarlinktext-5'] = "TNG Forum";
> $tmp['t228_topsurnames'] = "Our Top Surnames";
> $tmp['t228_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t228_footerheadline-1'] = "Quick Links";
> $tmp['t228_footerheadline-2'] = "Contact Us";
> $tmp['t228_footerlink-1'] = "suggest.php";
> $tmp['t228_footerlinktext-1'] = "Contact Us";
> $tmp['t228_footerlink-2'] = "surnames.php";
> $tmp['t228_footerlinktext-2'] = "Our Surnames";
> $tmp['t228_footerlink-3'] = "histories/story1.php";
> $tmp['t228_footerlinktext-3'] = "Our Stories";
> $tmp['t228_footerheadline-4'] = "Webmaster Message";
> $tmp['t228_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t229_headimg'] = "img/logo.png";
> $tmp['t229_maintitle'] = "Template 229";
> $tmp['t229_headsubtitle'] = "We Love Finding Ancestors!";
> $tmp['t229_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t229_linktext-1'] = "Histories";
> $tmp['t229_link-2'] = "surnames.php";
> $tmp['t229_linktext-2'] = "Surnames";
> $tmp['t229_link-3'] = "https://genealogywebtemplates.com";
> $tmp['t229_linktext-3'] = "Genealogy Web Templates";
> $tmp['t229_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t229_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t229_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t229_slidelink-1'] = "histories/place1.php";
> $tmp['t229_slidelinktext-1'] = "Histories";
> $tmp['t229_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t229_slideheadline-2'] = "Our Smith Family";
> $tmp['t229_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.";
> $tmp['t229_slidelink-2'] = "histories/story1.php";
> $tmp['t229_slidelinktext-2'] = "Stories";
> $tmp['t229_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t229_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t229_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air' we were looking for!";
> $tmp['t229_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t229_slidelinktext-3'] = "GWT";
> $tmp['t229_featuretitle-1'] = "Welcome to our Genealogy Site";
> $tmp['t229_featurethumb-1'] = "img/letters.jpg";
> $tmp['t229_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t229_featuretitle-2'] = "The Chosen";
> $tmp['t229_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t229_featurelink-2'] = "histories/story2.php";
> $tmp['t229_featurelinktext-2'] = "See More";
> $tmp['t229_headline-1'] = "Discover Our Family";
> $tmp['t229_snipimg-1'] = "img/top1.jpg";
> $tmp['t229_snipname-1'] = "Ancestor's Name";
> $tmp['t229_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t229_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t229_snipimg-2'] = "img/top2.jpg";
> $tmp['t229_snipname-2'] = "Ancestor's Name";
> $tmp['t229_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t229_sniplink-2'] = "histories/place1.php";
> $tmp['t229_snipimg-3'] = "img/top3.jpg";
> $tmp['t229_snipname-3'] = "Ancestor's Name";
> $tmp['t229_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t229_sniplink-3'] = "surnames.php";
> $tmp['t229_snipimg-4'] = "img/top4.jpg";
> $tmp['t229_snipname-4'] = "Ancestor's Name";
> $tmp['t229_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t229_sniplink-4'] = "histories/family1.php";
> $tmp['t229_snipimg-5'] = "img/top1.jpg";
> $tmp['t229_snipname-5'] = "Ancestor's Name";
> $tmp['t229_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t229_sniplink-5'] = "histories/place1.php";
> $tmp['t229_snipimg-6'] = "img/top2.jpg";
> $tmp['t229_snipname-6'] = "Ancestor's Name";
> $tmp['t229_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t229_sniplink-6'] = "histories/family2.php";
> $tmp['t229_snipimg-7'] = "img/top3.jpg";
> $tmp['t229_snipname-7'] = "Ancestor's Name";
> $tmp['t229_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t229_sniplink-7'] = "histories/story1.php";
> $tmp['t229_snipimg-8'] = "img/top4.jpg";
> $tmp['t229_snipname-8'] = "Ancestor's Name";
> $tmp['t229_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t229_sniplink-8'] = "histories/story2.php";
> $tmp['t229_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t229_featurethumb-3'] = "img/bottom.jpg";
> $tmp['t229_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"\<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t229_featurelink-3'] = "histories/place1.php";
> $tmp['t229_featurelinktext-3'] = "See More";
> $tmp['t229_topsurnames'] = "Our Top Surnames";
> $tmp['t229_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t229_author-1'] = "Mark Twain";
> $tmp['t229_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t229_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t229_quotelink-1'] = "histories/place1.php";
> $tmp['t229_author-2'] = "Howard K. Nixon";
> $tmp['t229_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t229_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t229_quotelink-2'] = "";
> $tmp['t229_author-3'] = "Jimmy Carter";
> $tmp['t229_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t229_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t229_quotelink-3'] = "";
> $tmp['t229_author-4'] = "Florence King";
> $tmp['t229_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t229_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t229_quotelink-4'] = "";
> $tmp['t229_author-5'] = "Ellen";
> $tmp['t229_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t229_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t229_quotelink-5'] = "";
> $tmp['t229_author-6'] = "Uncle Ralph";
> $tmp['t229_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t229_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t229_quotelink-6'] = "";
> $tmp['t229_footerheadline-1'] = "Quick Links";
> $tmp['t229_footerheadline-2'] = "Contact Us";
> $tmp['t229_footerlink-1'] = "suggest.php";
> $tmp['t229_footerlinktext-1'] = "Contact Us";
> $tmp['t229_footerlink-2'] = "surnames.php";
> $tmp['t229_footerlinktext-2'] = "Our Surnames";
> $tmp['t229_footerlink-3'] = "histories/story1.php";
> $tmp['t229_footerlinktext-3'] = "Our Stories";
> $tmp['t229_footerheadline-4'] = "Webmaster Message";
> $tmp['t229_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t230_dadside'] = "His Side | ";
> $tmp['t230_dadperson'] = "I2";
> $tmp['t230_dadtree'] = "mytreeid";
> $tmp['t230_momside'] = "Her Side | ";
> $tmp['t230_momperson'] = "I1";
> $tmp['t230_momtree'] = "mytreeid";
> $tmp['t230_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t230_linktext-1'] = "Histories";
> $tmp['t230_link-2'] = "surnames.php";
> $tmp['t230_linktext-2'] = "Surnames";
> $tmp['t230_headimg'] = "img/logo.png";
> $tmp['t230_maintitle'] = "Template 230";
> $tmp['t230_headsubtitle'] = "Our Search Continues...";
> $tmp['t230_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t230_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t230_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t230_slidelink-1'] = "histories/place1.php";
> $tmp['t230_slidelinktext-1'] = "Histories";
> $tmp['t230_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t230_slideheadline-2'] = "Our Smith Family";
> $tmp['t230_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.<br><br><br>";
> $tmp['t230_slidelink-2'] = "histories/story1.php";
> $tmp['t230_slidelinktext-2'] = "Stories";
> $tmp['t230_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t230_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t230_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br><br><br>";
> $tmp['t230_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t230_slidelinktext-3'] = "GWT";
> $tmp['t230_featuretitle-1'] = "Welcome to our genealogy site!";
> $tmp['t230_featurethumb-1'] = "img/top1.jpg";
> $tmp['t230_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa.Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. </p><p>Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti. Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.</p><p>Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. ";
> $tmp['t230_featurelink-1'] = "";
> $tmp['t230_featurelinktext-1'] = "";
> $tmp['t230_featuretitle-2'] = "The Chosen";
> $tmp['t230_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t230_featurethumb-2'] = "img/letters.jpg";
> $tmp['t230_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t230_featurethumb-3'] = "img/familyphotos.jpg";
> $tmp['t230_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t230_featurelink-3'] = "histories/place1.php";
> $tmp['t230_featurelinktext-3'] = "See More";
> $tmp['t230_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t230_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, you will need to remove them in the index.php file.</em>";
> $tmp['t230_sidebartitle-1'] = "Herman Brown";
> $tmp['t230_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t230_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-1'] = "histories/family1.php";
> $tmp['t230_sidebarlinktext-1'] = "His Story";
> $tmp['t230_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t230_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t230_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-2'] = "surnames.php";
> $tmp['t230_sidebarlinktext-2'] = "See Camilla";
> $tmp['t230_sidebartitle-3'] = "Susan Smith";
> $tmp['t230_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t230_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-3'] = "";
> $tmp['t230_sidebarlinktext-3'] = "";
> $tmp['t230_sidebartitle-4'] = "Eric Martinson";
> $tmp['t230_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t230_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t230_sidebarlinktext-4'] = "See Erik";
> $tmp['t230_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t230_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t230_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-5'] = "";
> $tmp['t230_sidebarlinktext-5'] = "";
> $tmp['t230_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t230_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t230_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-6'] = "";
> $tmp['t230_sidebarlinktext-6'] = "";
> $tmp['t230_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t230_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t230_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-7'] = "";
> $tmp['t230_sidebarlinktext-7'] = "";
> $tmp['t230_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t230_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t230_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-8'] = "";
> $tmp['t230_sidebarlinktext-8'] = "";
> $tmp['t230_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t230_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t230_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-9'] = "";
> $tmp['t230_sidebarlinktext-9'] = "";
> $tmp['t230_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t230_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t230_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t230_sidebarlink-10'] = "";
> $tmp['t230_sidebarlinktext-10'] = "";
> $tmp['t230_sidebarsub-2'] = "Our Pages";
> $tmp['t230_subhead2'] = "You can use this area to add your extra history or person pages.";
> $tmp['t230_sidebarlink-11'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t230_sidebarlinktext-11'] = "Our History Pages";
> $tmp['t230_sidebarlink-12'] = "histories/story1.php";
> $tmp['t230_sidebarlinktext-12'] = "Our Stories";
> $tmp['t230_sidebarlink-13'] = "https://usgenweb.org";
> $tmp['t230_sidebarlinktext-13'] = "USGenWeb";
> $tmp['t230_sidebarlink-14'] = "https://genealogywebtemplates.com";
> $tmp['t230_sidebarlinktext-14'] = "Genealogy Web Templates";
> $tmp['t230_sidebarlink-15'] = "https://tng.community/index.php?/forums/";
> $tmp['t230_sidebarlinktext-15'] = "TNG Forum";
> $tmp['t230_snipheadline-1'] = "Our Ancestors";
> $tmp['t230_sniptitle-1'] = "Fred Smith Family";
> $tmp['t230_snipname-1'] = "Fred Smith";
> $tmp['t230_snipinfoone-1'] = "Born 1862";
> $tmp['t230_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t230_snipimage-1'] = "img/snip1.jpg";
> $tmp['t230_snipperson-1'] = "";
> $tmp['t230_sniptree-1'] = "";
> $tmp['t230_sniptitle-2'] = "Dan Jones Family";
> $tmp['t230_snipname-2'] = "Dan Jones";
> $tmp['t230_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t230_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t230_snipimage-2'] = "img/snip2.jpg";
> $tmp['t230_snipperson-2'] = "";
> $tmp['t230_sniptree-2'] = "";
> $tmp['t230_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t230_snipname-3'] = "Peter Ryan";
> $tmp['t230_snipinfoone-3'] = "Family Name";
> $tmp['t230_snipinfotwo-3'] = "Information";
> $tmp['t230_snipimage-3'] = "img/snip3.jpg";
> $tmp['t230_snipperson-3'] = "";
> $tmp['t230_sniptree-3'] = "";
> $tmp['t230_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t230_snipname-4'] = "Roy Robbins";
> $tmp['t230_snipinfoone-4'] = "Family Name";
> $tmp['t230_snipinfotwo-4'] = "Information";
> $tmp['t230_snipimage-4'] = "img/snip4.jpg";
> $tmp['t230_snipperson-4'] = "";
> $tmp['t230_sniptree-4'] = "";
> $tmp['t230_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t230_snipname-5'] = "Barry Rogers";
> $tmp['t230_snipinfoone-5'] = "Family Name";
> $tmp['t230_snipinfotwo-5'] = "Information";
> $tmp['t230_snipimage-5'] = "img/snip5.jpg";
> $tmp['t230_snipperson-5'] = "";
> $tmp['t230_sniptree-5'] = "";
> $tmp['t230_sniptitle-6'] = "Albert Ross Family";
> $tmp['t230_snipname-6'] = "Albert Ross";
> $tmp['t230_snipinfoone-6'] = "Family Name";
> $tmp['t230_snipinfotwo-6'] = "Information";
> $tmp['t230_snipimage-6'] = "img/snip6.jpg";
> $tmp['t230_snipperson-6'] = "";
> $tmp['t230_sniptree-6'] = "";
> $tmp['t230_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t230_snipname-7'] = "Alvy Boardman";
> $tmp['t230_snipinfoone-7'] = "Family Name";
> $tmp['t230_snipinfotwo-7'] = "Information";
> $tmp['t230_snipimage-7'] = "img/snip7.jpg";
> $tmp['t230_snipperson-7'] = "";
> $tmp['t230_sniptree-7'] = "";
> $tmp['t230_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t230_snipname-8'] = "Paul Johnson";
> $tmp['t230_snipinfoone-8'] = "Family Name";
> $tmp['t230_snipinfotwo-8'] = "Information";
> $tmp['t230_snipimage-8'] = "img/snip8.jpg";
> $tmp['t230_snipperson-8'] = "";
> $tmp['t230_sniptree-8'] = "";
> $tmp['t230_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t230_author-1'] = "Mark Twain";
> $tmp['t230_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t230_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t230_quotelink-1'] = "histories/place1.php";
> $tmp['t230_author-2'] = "Howard K. Nixon";
> $tmp['t230_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t230_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t230_quotelink-2'] = "";
> $tmp['t230_author-3'] = "Jimmy Carter";
> $tmp['t230_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t230_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t230_quotelink-3'] = "";
> $tmp['t230_author-4'] = "Florence King";
> $tmp['t230_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t230_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t230_quotelink-4'] = "";
> $tmp['t230_author-5'] = "Ellen";
> $tmp['t230_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t230_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t230_quotelink-5'] = "";
> $tmp['t230_author-6'] = "Uncle Ralph";
> $tmp['t230_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t230_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t230_quotelink-6'] = "";
> $tmp['t230_topsurnames'] = "Our Top Surnames";
> $tmp['t230_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t230_footerheadline-1'] = "Quick Links";
> $tmp['t230_footerheadline-2'] = "Contact Us";
> $tmp['t230_footerlink-1'] = "suggest.php";
> $tmp['t230_footerlinktext-1'] = "Contact Us";
> $tmp['t230_footerlink-2'] = "surnames.php";
> $tmp['t230_footerlinktext-2'] = "Our Surnames";
> $tmp['t230_footerlink-3'] = "histories/story1.php";
> $tmp['t230_footerlinktext-3'] = "Our Stories";
> $tmp['t230_footerheadline-4'] = "Webmaster Message";
> $tmp['t230_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t231_maintitle'] = "Template 231";
> $tmp['t231_headsubtitle'] = "We are into our ancestors!";
> $tmp['t231_headimg'] = "img/logo.png";
> $tmp['t231_dadperson'] = "I2";
> $tmp['t231_dadtree'] = "mytreeid";
> $tmp['t231_headerlinktext-1'] = "Holley Side";
> $tmp['t231_momperson'] = "I1";
> $tmp['t231_momtree'] = "mytreeid";
> $tmp['t231_headerlinktext-2'] = "Boardman Side";
> $tmp['t231_headerlink-3'] = "surnames.php";
> $tmp['t231_headerlinktext-3'] = "Surnames";
> $tmp['t231_headerlink-4'] = "histories/index.php";
> $tmp['t231_headerlinktext-4'] = "Histories";
> $tmp['t231_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t231_slideheadline-1'] = "Finding our ancestors is exciting!";
> $tmp['t231_slidetext-1'] = "We hope we help you find your spot in our family.";
> $tmp['t231_slidelink-1'] = "histories/place1.php";
> $tmp['t231_slidelinktext-1'] = "Histories";
> $tmp['t231_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t231_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t231_slidetext-2'] = "If you find something we don't have, please share with us.<br>";
> $tmp['t231_slidelink-2'] = "histories/story1.php";
> $tmp['t231_slidelinktext-2'] = "Stories";
> $tmp['t231_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t231_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t231_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br>";
> $tmp['t231_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t231_slidelinktext-3'] = "GWT";
> $tmp['t231_featuretitle-1'] = "Welcome to our genealogy site!";
> $tmp['t231_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.</p><p>Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. ";
> $tmp['t231_featurelink-1'] = "";
> $tmp['t231_featurelinktext-1'] = "";
> $tmp['t231_featuretitle-2'] = "The Chosen";
> $tmp['t231_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t231_featurethumb-2'] = "img/wagon.jpg";
> $tmp['t231_featurelink-2'] = "histories/place1.php";
> $tmp['t231_featurelinktext-2'] = "See More";
> $tmp['t231_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t231_featurethumb-3'] = "img/familyphotos.jpg";
> $tmp['t231_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. <em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t231_featurelink-3'] = "histories/place1.php";
> $tmp['t231_featurelinktext-3'] = "Mother's Side";
> $tmp['t231_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t231_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t231_sidebartitle-1'] = "Herman Brown";
> $tmp['t231_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t231_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-1'] = "histories/family1.php";
> $tmp['t231_sidebarlinktext-1'] = "His Story";
> $tmp['t231_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t231_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t231_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-2'] = "surnames.php";
> $tmp['t231_sidebarlinktext-2'] = "See Camilla";
> $tmp['t231_sidebartitle-3'] = "Susan Smith";
> $tmp['t231_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t231_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-3'] = "";
> $tmp['t231_sidebarlinktext-3'] = "";
> $tmp['t231_sidebartitle-4'] = "Eric Masterson";
> $tmp['t231_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t231_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t231_sidebarlinktext-4'] = "See Erik";
> $tmp['t231_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t231_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t231_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-5'] = "";
> $tmp['t231_sidebarlinktext-5'] = "";
> $tmp['t231_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t231_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t231_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-6'] = "";
> $tmp['t231_sidebarlinktext-6'] = "";
> $tmp['t231_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t231_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t231_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-7'] = "";
> $tmp['t231_sidebarlinktext-7'] = "";
> $tmp['t231_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t231_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t231_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-8'] = "";
> $tmp['t231_sidebarlinktext-8'] = "";
> $tmp['t231_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t231_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t231_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-9'] = "";
> $tmp['t231_sidebarlinktext-9'] = "";
> $tmp['t231_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t231_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t231_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t231_sidebarlink-10'] = "";
> $tmp['t231_sidebarlinktext-10'] = "";
> $tmp['t231_sidebarsub-2'] = "Our Pages";
> $tmp['t231_subhead2'] = "You can use this area to add your extra history or person pages.";
> $tmp['t231_sidebarlink-11'] = "histories/index.php";
> $tmp['t231_sidebarlinktext-11'] = "Our History Pages";
> $tmp['t231_sidebarlink-12'] = "histories/story1.php";
> $tmp['t231_sidebarlinktext-12'] = "Our Stories";
> $tmp['t231_sidebarlink-13'] = "http://usgenweb.org";
> $tmp['t231_sidebarlinktext-13'] = "USGenWeb";
> $tmp['t231_sidebarlink-14'] = "https://genealogywebtemplates.com";
> $tmp['t231_sidebarlinktext-14'] = "Genealogy Web Templates";
> $tmp['t231_sidebarlink-15'] = "https://tng.community/index.php?/forums/";
> $tmp['t231_sidebarlinktext-15'] = "TNG Forum";
> $tmp['t231_snipheadline-1'] = "Discover Our Family";
> $tmp['t231_snipimg-1'] = "img/top1.jpg";
> $tmp['t231_snipname-1'] = "Ancestor's Name";
> $tmp['t231_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t231_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t231_snipimg-2'] = "img/top2.jpg";
> $tmp['t231_snipname-2'] = "Ancestor's Name";
> $tmp['t231_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t231_sniplink-2'] = "histories/place1.php";
> $tmp['t231_snipimg-3'] = "img/top3.jpg";
> $tmp['t231_snipname-3'] = "Ancestor's Name";
> $tmp['t231_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t231_sniplink-3'] = "surnames.php";
> $tmp['t231_snipimg-4'] = "img/top4.jpg";
> $tmp['t231_snipname-4'] = "Ancestor's Name";
> $tmp['t231_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t231_sniplink-4'] = "histories/family1.php";
> $tmp['t231_snipimg-5'] = "img/top1.jpg";
> $tmp['t231_snipname-5'] = "Ancestor's Name";
> $tmp['t231_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t231_sniplink-5'] = "histories/place1.php";
> $tmp['t231_snipimg-6'] = "img/top2.jpg";
> $tmp['t231_snipname-6'] = "Ancestor's Name";
> $tmp['t231_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t231_sniplink-6'] = "histories/family2.php";
> $tmp['t231_snipimg-7'] = "img/top3.jpg";
> $tmp['t231_snipname-7'] = "Ancestor's Name";
> $tmp['t231_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t231_sniplink-7'] = "histories/story1.php";
> $tmp['t231_snipimg-8'] = "img/top4.jpg";
> $tmp['t231_snipname-8'] = "Ancestor's Name";
> $tmp['t231_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t231_sniplink-8'] = "histories/story2.php";
> $tmp['t231_topsurnames'] = "Our Top Surnames";
> $tmp['t231_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t231_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t231_author-1'] = "Mark Twain";
> $tmp['t231_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t231_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t231_quotelink-1'] = "histories/place1.php";
> $tmp['t231_author-2'] = "Howard K. Nixon";
> $tmp['t231_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t231_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t231_quotelink-2'] = "";
> $tmp['t231_author-3'] = "Jimmy Carter";
> $tmp['t231_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t231_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t231_quotelink-3'] = "";
> $tmp['t231_author-4'] = "Florence King";
> $tmp['t231_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t231_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t231_quotelink-4'] = "";
> $tmp['t231_author-5'] = "Ellen";
> $tmp['t231_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t231_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t231_quotelink-5'] = "";
> $tmp['t231_author-6'] = "Uncle Ralph";
> $tmp['t231_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t231_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t231_quotelink-6'] = "";
> $tmp['t231_footerheadline-1'] = "Quick Links";
> $tmp['t231_footerheadline-2'] = "Contact Us";
> $tmp['t231_footerlink-1'] = "suggest.php";
> $tmp['t231_footerlinktext-1'] = "Contact Us";
> $tmp['t231_footerlink-2'] = "surnames.php";
> $tmp['t231_footerlinktext-2'] = "Our Surnames";
> $tmp['t231_footerlink-3'] = "histories/story1.php";
> $tmp['t231_footerlinktext-3'] = "Our Stories";
> $tmp['t231_footerheadline-4'] = "Webmaster Message";
> $tmp['t231_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t232_headimg'] = "img/logo.png";
> $tmp['t232_maintitle'] = "Template 232";
> $tmp['t232_headsubtitle'] = "We Love Finding Ancestors!";
> $tmp['t232_link-1'] = "histories/index.php";
> $tmp['t232_linktext-1'] = "Histories";
> $tmp['t232_link-2'] = "surnames.php";
> $tmp['t232_linktext-2'] = "Surnames";
> $tmp['t232_link-3'] = "https://genealogywebtemplates.com";
> $tmp['t232_linktext-3'] = "Genealogy Web Templates";
> $tmp['t232_link-4'] = "https://www.tngsitebuilding.com/";
> $tmp['t232_linktext-4'] = "TNG";
> $tmp['t232_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t232_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t232_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t232_slidelink-1'] = "histories/place1.php";
> $tmp['t232_slidelinktext-1'] = "Histories";
> $tmp['t232_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t232_slideheadline-2'] = "Our Smith Family";
> $tmp['t232_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.";
> $tmp['t232_slidelink-2'] = "histories/story1.php";
> $tmp['t232_slidelinktext-2'] = "Stories";
> $tmp['t232_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t232_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t232_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air' we were looking for!";
> $tmp['t232_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t232_slidelinktext-3'] = "GWT";
> $tmp['t232_featuretitle-1'] = "Welcome to our Genealogy Site";
> $tmp['t232_featurethumb-1'] = "img/letters.jpg";
> $tmp['t232_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t232_featuretitle-2'] = "The Chosen";
> $tmp['t232_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family, you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t232_featurelink-2'] = "histories/story2.php";
> $tmp['t232_featurelinktext-2'] = "See More";
> $tmp['t232_snipheadline-1'] = "Our Families";
> $tmp['t232_sniptitle-1'] = "Fred Smith";
> $tmp['t232_snipname-1'] = "Fred Smith";
> $tmp['t232_snipinfoone-1'] = "Born 1862";
> $tmp['t232_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t232_snipimage-1'] = "img/snip1.jpg";
> $tmp['t232_snipperson-1'] = "";
> $tmp['t232_sniptree-1'] = "";
> $tmp['t232_sniptitle-2'] = "Dan Jones";
> $tmp['t232_snipname-2'] = "Dan Jones";
> $tmp['t232_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t232_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t232_snipimage-2'] = "img/snip2.jpg";
> $tmp['t232_snipperson-2'] = "";
> $tmp['t232_sniptree-2'] = "";
> $tmp['t232_sniptitle-3'] = "Peter Ryan";
> $tmp['t232_snipname-3'] = "Peter Ryan";
> $tmp['t232_snipinfoone-3'] = "Family Name";
> $tmp['t232_snipinfotwo-3'] = "Information";
> $tmp['t232_snipimage-3'] = "img/snip3.jpg";
> $tmp['t232_snipperson-3'] = "";
> $tmp['t232_sniptree-3'] = "";
> $tmp['t232_sniptitle-4'] = "Roy Robbins";
> $tmp['t232_snipname-4'] = "Roy Robbins";
> $tmp['t232_snipinfoone-4'] = "Family Name";
> $tmp['t232_snipinfotwo-4'] = "Information";
> $tmp['t232_snipimage-4'] = "img/snip4.jpg";
> $tmp['t232_snipperson-4'] = "";
> $tmp['t232_sniptree-4'] = "";
> $tmp['t232_sniptitle-5'] = "Barry Rogers";
> $tmp['t232_snipname-5'] = "Barry Rogers";
> $tmp['t232_snipinfoone-5'] = "Family Name";
> $tmp['t232_snipinfotwo-5'] = "Information";
> $tmp['t232_snipimage-5'] = "img/snip5.jpg";
> $tmp['t232_snipperson-5'] = "";
> $tmp['t232_sniptree-5'] = "";
> $tmp['t232_sniptitle-6'] = "Albert Ross";
> $tmp['t232_snipname-6'] = "Albert Ross";
> $tmp['t232_snipinfoone-6'] = "Family Name";
> $tmp['t232_snipinfotwo-6'] = "Information";
> $tmp['t232_snipimage-6'] = "img/snip6.jpg";
> $tmp['t232_snipperson-6'] = "";
> $tmp['t232_sniptree-6'] = "";
> $tmp['t232_sniptitle-7'] = "Alvy Boardman";
> $tmp['t232_snipname-7'] = "Alvy Boardman";
> $tmp['t232_snipinfoone-7'] = "Family Name";
> $tmp['t232_snipinfotwo-7'] = "Information";
> $tmp['t232_snipimage-7'] = "img/snip7.jpg";
> $tmp['t232_snipperson-7'] = "";
> $tmp['t232_sniptree-7'] = "";
> $tmp['t232_sniptitle-8'] = "Paul Johnson";
> $tmp['t232_snipname-8'] = "Paul Johnson";
> $tmp['t232_snipinfoone-8'] = "Family Name";
> $tmp['t232_snipinfotwo-8'] = "Information";
> $tmp['t232_snipimage-8'] = "img/snip8.jpg";
> $tmp['t232_snipperson-8'] = "";
> $tmp['t232_sniptree-8'] = "";
> $tmp['t232_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t232_featurethumb-3'] = "img/familyphotos.jpg";
> $tmp['t232_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do.";
> $tmp['t232_featuretitle-4'] = "With Love and Caring";
> $tmp['t232_featurepara-4'] = "With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"\<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t232_featurelink-4'] = "histories/family3.php";
> $tmp['t232_featurelinktext-4'] = "See More";
> $tmp['t232_quotehead'] = "Oh, the places to go and people to see...";
> $tmp['t232_quoteimg-1'] = "img/family1.jpg";
> $tmp['t232_subhead-1'] = "France";
> $tmp['t232_author-1'] = "Paris was the city that most of ancestors hailed from.";
> $tmp['t232_quote-1'] = "Research on your particular person or topic. You can also add a link to a person or page.";
> $tmp['t232_quotelink-1'] = "histories/story1.php";
> $tmp['t232_quoteimg-2'] = "img/family2.jpg";
> $tmp['t232_subhead-2'] = "Cemeteries";
> $tmp['t232_author-2'] = "Check out our list of our ancestors' cemeteries online.";
> $tmp['t232_quote-2'] = "Research on your particular person or topic. You can also add a link to a person or page.";
> $tmp['t232_quotelink-2'] = "histories/place1.php";
> $tmp['t232_quoteimg-3'] = "img/family1.jpg";
> $tmp['t232_subhead-3'] = "Susan Wells";
> $tmp['t232_author-3'] = "Grandmother to Susan B. and John Wells.";
> $tmp['t232_quote-3'] = "Research on your particular person or topic. You can also add a link to a person or page.";
> $tmp['t232_quotelink-3'] = "histories/person1.php";
> $tmp['t232_quoteimg-4'] = "img/family2.jpg";
> $tmp['t232_subhead-4'] = "Frank Lee";
> $tmp['t232_author-4'] = "Great Uncle to Amanda F. Southerland.";
> $tmp['t232_quote-4'] = "Research on your particular person or topic. You can also add a link to a person or page.";
> $tmp['t232_quotelink-4'] = "histories/story2.php";
> $tmp['t232_featuretitle-5'] = "Random Photos";
> $tmp['t232_featurepara-5'] = "Below are photos from our gallery.";
> $tmp['t232_topsurnames'] = "Our Top Surnames";
> $tmp['t232_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t232_footerheadline-1'] = "Quick Links";
> $tmp['t232_footerheadline-2'] = "Contact Us";
> $tmp['t232_footerlink-1'] = "suggest.php";
> $tmp['t232_footerlinktext-1'] = "Contact Us";
> $tmp['t232_footerlink-2'] = "surnames.php";
> $tmp['t232_footerlinktext-2'] = "Our Surnames";
> $tmp['t232_footerlink-3'] = "histories/story1.php";
> $tmp['t232_footerlinktext-3'] = "Our Stories";
> $tmp['t232_footerheadline-4'] = "Webmaster Message";
> $tmp['t232_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t233_headimg'] = "img/logo.png";
> $tmp['t233_maintitle'] = "Template 233";
> $tmp['t233_headsubtitle'] = "We Love Our Ancestors";
> $tmp['t233_link-1'] = "surnames.php";
> $tmp['t233_linktext-1'] = "Our Surnames";
> $tmp['t233_link-2'] = "histories/index.php";
> $tmp['t233_linktext-2'] = "Boudreaux Side";
> $tmp['t233_link-3'] = "histories/place1.php";
> $tmp['t233_linktext-3'] = "Our Places";
> $tmp['t233_slideheadline-1'] = "Finding Ancestors";
> $tmp['t233_slideheadline-2'] = "It's What We Do";
> $tmp['t233_slideheadline-3'] = "Take a look at all of the great information we've gathered!";
> $tmp['t233_slidelink-1'] = "histories/place1.php";
> $tmp['t233_slidelinktext-1'] = "Histories";
> $tmp['t233_featuretitle-1'] = "Welcome to our genealogy site!";
> $tmp['t233_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t233_featuretitle-2'] = "The Chosen";
> $tmp['t233_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t233_featurethumb-2'] = "img/wagon.jpg";
> $tmp['t233_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t233_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t233_sidebartitle-1'] = "Herman Brown";
> $tmp['t233_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t233_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-1'] = "histories/family1.php";
> $tmp['t233_sidebarlinktext-1'] = "His Story";
> $tmp['t233_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t233_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t233_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-2'] = "surnames.php";
> $tmp['t233_sidebarlinktext-2'] = "See Camilla";
> $tmp['t233_sidebartitle-3'] = "Susan Smith";
> $tmp['t233_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t233_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-3'] = "";
> $tmp['t233_sidebarlinktext-3'] = "";
> $tmp['t233_sidebartitle-4'] = "Eric Martinson";
> $tmp['t233_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t233_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t233_sidebarlinktext-4'] = "See Erik";
> $tmp['t233_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t233_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t233_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-5'] = "";
> $tmp['t233_sidebarlinktext-5'] = "";
> $tmp['t233_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t233_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t233_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-6'] = "";
> $tmp['t233_sidebarlinktext-6'] = "";
> $tmp['t233_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t233_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t233_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-7'] = "";
> $tmp['t233_sidebarlinktext-7'] = "";
> $tmp['t233_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t233_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t233_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-8'] = "";
> $tmp['t233_sidebarlinktext-8'] = "";
> $tmp['t233_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t233_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t233_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-9'] = "";
> $tmp['t233_sidebarlinktext-9'] = "";
> $tmp['t233_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t233_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t233_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t233_sidebarlink-10'] = "";
> $tmp['t233_sidebarlinktext-10'] = "";
> $tmp['t233_snipheadline-1'] = "Discover Our Family";
> $tmp['t233_snipimg-1'] = "img/top1.jpg";
> $tmp['t233_snipname-1'] = "Ancestor's Name";
> $tmp['t233_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t233_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t233_snipimg-2'] = "img/top2.jpg";
> $tmp['t233_snipname-2'] = "Ancestor's Name";
> $tmp['t233_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t233_sniplink-2'] = "histories/place1.php";
> $tmp['t233_snipimg-3'] = "img/top3.jpg";
> $tmp['t233_snipname-3'] = "Ancestor's Name";
> $tmp['t233_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t233_sniplink-3'] = "surnames.php";
> $tmp['t233_snipimg-4'] = "img/top4.jpg";
> $tmp['t233_snipname-4'] = "Ancestor's Name";
> $tmp['t233_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t233_sniplink-4'] = "histories/family1.php";
> $tmp['t233_snipimg-5'] = "img/top1.jpg";
> $tmp['t233_snipname-5'] = "Ancestor's Name";
> $tmp['t233_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t233_sniplink-5'] = "histories/place1.php";
> $tmp['t233_snipimg-6'] = "img/top2.jpg";
> $tmp['t233_snipname-6'] = "Ancestor's Name";
> $tmp['t233_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t233_sniplink-6'] = "histories/family2.php";
> $tmp['t233_snipimg-7'] = "img/top3.jpg";
> $tmp['t233_snipname-7'] = "Ancestor's Name";
> $tmp['t233_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t233_sniplink-7'] = "histories/story1.php";
> $tmp['t233_snipimg-8'] = "img/top4.jpg";
> $tmp['t233_snipname-8'] = "Ancestor's Name";
> $tmp['t233_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t233_sniplink-8'] = "histories/story2.php";
> $tmp['t233_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t233_featurethumb-3'] = "img/familyphotos.jpg";
> $tmp['t233_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. <em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t233_featurelink-3'] = "histories/place1.php";
> $tmp['t233_featurelinktext-3'] = "Mother's Side";
> $tmp['t233_featuretitle-4'] = "New Addition";
> $tmp['t233_featurethumb-4'] = "img/top5.jpg";
> $tmp['t233_featurepara-4'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. ";
> $tmp['t233_featurelink-4'] = "histories/place1.php";
> $tmp['t233_featurelinktext-4'] = "Mother's Side";
> $tmp['t233_featuretitle-5'] = "Look What We Found!";
> $tmp['t233_featurethumb-5'] = "img/top6.jpg";
> $tmp['t233_featurepara-5'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. ";
> $tmp['t233_featurelink-5'] = "histories/index.php";
> $tmp['t233_featurelinktext-5'] = "More Stories";
> $tmp['t233_featuretitle-6'] = "Visiting the Homestead";
> $tmp['t233_featurethumb-6'] = "img/top7.jpg";
> $tmp['t233_featurepara-6'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. ";
> $tmp['t233_featurelink-6'] = "histories/place1.php";
> $tmp['t233_featurelinktext-6'] = "Our Homestead";
> $tmp['t233_topsurnames'] = "Our Top Surnames";
> $tmp['t233_author-1'] = "Mark Twain";
> $tmp['t233_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t233_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t233_quotelink-1'] = "histories/place1.php";
> $tmp['t233_author-2'] = "Howard K. Nixon";
> $tmp['t233_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t233_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t233_quotelink-2'] = "";
> $tmp['t233_author-3'] = "Jimmy Carter";
> $tmp['t233_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t233_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t233_quotelink-3'] = "";
> $tmp['t233_author-4'] = "Florence King";
> $tmp['t233_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t233_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t233_quotelink-4'] = "";
> $tmp['t233_author-5'] = "Ellen";
> $tmp['t233_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t233_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t233_quotelink-5'] = "";
> $tmp['t233_author-6'] = "Uncle Ralph";
> $tmp['t233_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t233_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t233_quotelink-6'] = "";
> $tmp['t233_featuretitle-7'] = "Our Pages";
> $tmp['t233_featuresub-7'] = "You can use this area to add your extra history or person pages.";
> $tmp['t233_link-4'] = "histories/index.php";
> $tmp['t233_linktext-4'] = "Our History Pages";
> $tmp['t233_link-5'] = "histories/story1.php";
> $tmp['t233_linktext-5'] = "Our Stories";
> $tmp['t233_link-6'] = "https://usgenweb.org";
> $tmp['t233_linktext-6'] = "USGenWeb";
> $tmp['t233_link-7'] = "https://genealogywebtemplates.com";
> $tmp['t233_linktext-7'] = "Genealogy Web Templates";
> $tmp['t233_link-8'] = "https://tng.community/index.php?/forums/";
> $tmp['t233_linktext-8'] = "TNG Forum";
> $tmp['t233_featuretitle-8'] = "About Us";
> $tmp['t233_featurepara-8'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t233_featurethumb-8'] = "img/about.jpg";
> $tmp['t233_footerheadline-1'] = "Quick Links";
> $tmp['t233_footerheadline-2'] = "Contact Us";
> $tmp['t233_footerlink-1'] = "suggest.php";
> $tmp['t233_footerlinktext-1'] = "Contact Us";
> $tmp['t233_footerlink-2'] = "surnames.php";
> $tmp['t233_footerlinktext-2'] = "Our Surnames";
> $tmp['t233_footerlink-3'] = "histories/story1.php";
> $tmp['t233_footerlinktext-3'] = "Our Stories";
> $tmp['t233_footerheadline-4'] = "Webmaster Message";
> $tmp['t233_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t234_headimg'] = "img/logo.png";
> $tmp['t234_maintitle'] = "Template 234";
> $tmp['t234_headsubtitle'] = "Looking for ancestors is what we love!";
> $tmp['t234_link-1'] = "surnames.php";
> $tmp['t234_linktext-1'] = "Our Surnames";
> $tmp['t234_link-2'] = "histories/index.php";
> $tmp['t234_linktext-2'] = "Boudreaux Side";
> $tmp['t234_link-3'] = "histories/place1.php";
> $tmp['t234_linktext-3'] = "Our Places";
> $tmp['t234_link-4'] = "histories/story1.php";
> $tmp['t234_linktext-4'] = "Our Stories";
> $tmp['t234_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t234_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t234_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t234_slidelink-1'] = "histories/place1.php";
> $tmp['t234_slidelinktext-1'] = "Histories";
> $tmp['t234_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t234_slideheadline-2'] = "Our Smith Family";
> $tmp['t234_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.<br><br><br>";
> $tmp['t234_slidelink-2'] = "histories/story1.php";
> $tmp['t234_slidelinktext-2'] = "Stories";
> $tmp['t234_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t234_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t234_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br><br><br>";
> $tmp['t234_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t234_slidelinktext-3'] = "GWT";
> $tmp['t234_featuretitle-1'] = "Welcome to our genealogy site!";
> $tmp['t234_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t234_featurethumb-1'] = "img/top1.jpg";
> $tmp['t234_featurelink-1'] = "histories/story1.php";
> $tmp['t234_featurelinktext-1'] = "Mother's Side";
> $tmp['t234_featuretitle-2'] = "The Chosen";
> $tmp['t234_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family, you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t234_featurethumb-2'] = "img/top2.jpg";
> $tmp['t234_featurelink-2'] = "histories/place1.php";
> $tmp['t234_featurelinktext-2'] = "Father's Side";
> $tmp['t234_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t234_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t234_sidebartitle-1'] = "Herman Brown";
> $tmp['t234_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t234_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-1'] = "histories/family1.php";
> $tmp['t234_sidebarlinktext-1'] = "His Story";
> $tmp['t234_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t234_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t234_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-2'] = "surnames.php";
> $tmp['t234_sidebarlinktext-2'] = "See Camilla";
> $tmp['t234_sidebartitle-3'] = "Susan Smith";
> $tmp['t234_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t234_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-3'] = "";
> $tmp['t234_sidebarlinktext-3'] = "";
> $tmp['t234_sidebartitle-4'] = "Eric Martinson";
> $tmp['t234_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t234_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t234_sidebarlinktext-4'] = "See Erik";
> $tmp['t234_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t234_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t234_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-5'] = "";
> $tmp['t234_sidebarlinktext-5'] = "";
> $tmp['t234_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t234_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t234_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-6'] = "";
> $tmp['t234_sidebarlinktext-6'] = "";
> $tmp['t234_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t234_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t234_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-7'] = "";
> $tmp['t234_sidebarlinktext-7'] = "";
> $tmp['t234_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t234_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t234_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-8'] = "";
> $tmp['t234_sidebarlinktext-8'] = "";
> $tmp['t234_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t234_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t234_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-9'] = "";
> $tmp['t234_sidebarlinktext-9'] = "";
> $tmp['t234_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t234_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t234_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t234_sidebarlink-10'] = "";
> $tmp['t234_sidebarlinktext-10'] = "";
> $tmp['t234_snipheadline-1'] = "Our Family";
> $tmp['t234_sniptitle-1'] = "Fred Smith Family";
> $tmp['t234_snipname-1'] = "Fred Smith";
> $tmp['t234_snipinfoone-1'] = "Born 1862";
> $tmp['t234_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t234_snipimage-1'] = "img/snip1.jpg";
> $tmp['t234_snipperson-1'] = "";
> $tmp['t234_sniptree-1'] = "";
> $tmp['t234_sniptitle-2'] = "Dan Jones Family";
> $tmp['t234_snipname-2'] = "Dan Jones";
> $tmp['t234_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t234_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t234_snipimage-2'] = "img/snip2.jpg";
> $tmp['t234_snipperson-2'] = "";
> $tmp['t234_sniptree-2'] = "";
> $tmp['t234_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t234_snipname-3'] = "Peter Ryan";
> $tmp['t234_snipinfoone-3'] = "Family Name";
> $tmp['t234_snipinfotwo-3'] = "Information";
> $tmp['t234_snipimage-3'] = "img/snip3.jpg";
> $tmp['t234_snipperson-3'] = "";
> $tmp['t234_sniptree-3'] = "";
> $tmp['t234_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t234_snipname-4'] = "Roy Robbins";
> $tmp['t234_snipinfoone-4'] = "Family Name";
> $tmp['t234_snipinfotwo-4'] = "Information";
> $tmp['t234_snipimage-4'] = "img/snip4.jpg";
> $tmp['t234_snipperson-4'] = "";
> $tmp['t234_sniptree-4'] = "";
> $tmp['t234_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t234_snipname-5'] = "Barry Rogers";
> $tmp['t234_snipinfoone-5'] = "Family Name";
> $tmp['t234_snipinfotwo-5'] = "Information";
> $tmp['t234_snipimage-5'] = "img/snip5.jpg";
> $tmp['t234_snipperson-5'] = "";
> $tmp['t234_sniptree-5'] = "";
> $tmp['t234_sniptitle-6'] = "Albert Ross Family";
> $tmp['t234_snipname-6'] = "Albert Ross";
> $tmp['t234_snipinfoone-6'] = "Family Name";
> $tmp['t234_snipinfotwo-6'] = "Information";
> $tmp['t234_snipimage-6'] = "img/snip6.jpg";
> $tmp['t234_snipperson-6'] = "";
> $tmp['t234_sniptree-6'] = "";
> $tmp['t234_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t234_snipname-7'] = "Alvy Boardman";
> $tmp['t234_snipinfoone-7'] = "Family Name";
> $tmp['t234_snipinfotwo-7'] = "Information";
> $tmp['t234_snipimage-7'] = "img/snip7.jpg";
> $tmp['t234_snipperson-7'] = "";
> $tmp['t234_sniptree-7'] = "";
> $tmp['t234_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t234_snipname-8'] = "Paul Johnson";
> $tmp['t234_snipinfoone-8'] = "Family Name";
> $tmp['t234_snipinfotwo-8'] = "Information";
> $tmp['t234_snipimage-8'] = "img/snip8.jpg";
> $tmp['t234_snipperson-8'] = "";
> $tmp['t234_sniptree-8'] = "";
> $tmp['t234_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t234_featurethumb-3'] = "img/familyphotos.jpg";
> $tmp['t234_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. <em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t234_featurelink-3'] = "histories/place1.php";
> $tmp['t234_featurelinktext-3'] = "Mother's Side";
> $tmp['t234_featuretitle-4'] = "Our Pages";
> $tmp['t234_featurepara-4'] = "You can use this area to add extra links to places, people or add external links.";
> $tmp['t234_link-5'] = "histories/index.php";
> $tmp['t234_linktext-5'] = "Our History Pages";
> $tmp['t234_link-6'] = "surnames.php";
> $tmp['t234_linktext-6'] = "Surnames";
> $tmp['t234_link-7'] = "histories/story1.php";
> $tmp['t234_linktext-7'] = "Link 3";
> $tmp['t234_link-8'] = "https://genealogywebtemplates.com";
> $tmp['t234_linktext-8'] = "Genealogy Web Templates";
> $tmp['t234_link-9'] = "https://www.tngsitebuilding.com/";
> $tmp['t234_linktext-9'] = "The Next Generation of Genealogy Sitebuilding";
> $tmp['t234_headline-2'] = "Random Photos";
> $tmp['t234_topsurnames'] = "Top 40 Surnames";
> $tmp['t234_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t234_footerheadline-1'] = "Quick Links";
> $tmp['t234_footerheadline-2'] = "Contact Us";
> $tmp['t234_footerlink-1'] = "suggest.php";
> $tmp['t234_footerlinktext-1'] = "Contact Us";
> $tmp['t234_footerlink-2'] = "surnames.php";
> $tmp['t234_footerlinktext-2'] = "Our Surnames";
> $tmp['t234_footerlink-3'] = "histories/story1.php";
> $tmp['t234_footerlinktext-3'] = "Our Stories";
> $tmp['t234_footerheadline-4'] = "Webmaster Message";
> $tmp['t234_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t235_headimg'] = "img/logo.png";
> $tmp['t235_maintitle'] = "Template 235";
> $tmp['t235_headsubtitle'] = "Our Search Continues...";
> $tmp['t235_link-1'] = "histories/index.php";
> $tmp['t235_linktext-1'] = "Histories";
> $tmp['t235_link-2'] = "https://www.tngsitebuilding.com/";
> $tmp['t235_linktext-2'] = "TNG";
> $tmp['t235_link-3'] = "https://genealogywebtemplates.com";
> $tmp['t235_linktext-3'] = "GWT";
> $tmp['t235_link-4'] = "surnames.php";
> $tmp['t235_linktext-4'] = "Surnames";
> $tmp['t235_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t235_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t235_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t235_slidelink-1'] = "histories/place1.php";
> $tmp['t235_slidelinktext-1'] = "Histories";
> $tmp['t235_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t235_slideheadline-2'] = "Our Smith Family";
> $tmp['t235_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.<br><br><br>";
> $tmp['t235_slidelink-2'] = "histories/story1.php";
> $tmp['t235_slidelinktext-2'] = "Stories";
> $tmp['t235_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t235_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t235_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br><br><br>";
> $tmp['t235_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t235_slidelinktext-3'] = "GWT";
> $tmp['t235_headline-1'] = "Welcome to our genealogy site!";
> $tmp['t235_featuresub-1'] = "We are so pleased you dropped by. We hope you find the information we've gathered through the years exciting and fun to search through. We are always looking for ancestors as well as collateral families. If you have information to add which you believe would be helpful to our site, please send us a note. </p><p>Thank you and enjoy our journey! <em>Marsha</em>";
> $tmp['t235_featuretitle-1'] = "Ralph Emerson";
> $tmp['t235_featurethumb-1'] = "img/top5.jpg";
> $tmp['t235_featurepara-1'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore.";
> $tmp['t235_featurelink-1'] = "histories/story1.php";
> $tmp['t235_featurelinktext-1'] = "Stories";
> $tmp['t235_featuretitle-2'] = "Going Home";
> $tmp['t235_featurethumb-2'] = "img/top7.jpg";
> $tmp['t235_featurepara-2'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore.";
> $tmp['t235_featurelink-2'] = "histories/place1.php";
> $tmp['t235_featurelinktext-2'] = "Homeplace";
> $tmp['t235_featuretitle-3'] = "The Chosen";
> $tmp['t235_featurepara-3'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t235_featurethumb-3'] = "img/wagon.jpg";
> $tmp['t235_featurelink-3'] = "";
> $tmp['t235_featurelinktext-3'] = "";
> $tmp['t235_featuretitle-4'] = "Captain Smith";
> $tmp['t235_featurethumb-4'] = "img/top6.jpg";
> $tmp['t235_featurepara-4'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore.";
> $tmp['t235_featurelink-4'] = "histories/family1.php";
> $tmp['t235_featurelinktext-4'] = "His Story";
> $tmp['t235_featuretitle-5'] = "Cemetery";
> $tmp['t235_featurethumb-5'] = "img/top8.jpg";
> $tmp['t235_featurepara-5'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore.";
> $tmp['t235_featurelink-5'] = "histories/place2.php";
> $tmp['t235_featurelinktext-5'] = "Our Cemeteries";
> $tmp['t235_featuretitle-6'] = "The Bones of My Bone";
> $tmp['t235_featurethumb-6'] = "img/map.jpg";
> $tmp['t235_featurepara-6'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do.";
> $tmp['t235_featurelink-6'] = "";
> $tmp['t235_featurelinktext-6'] = "";
> $tmp['t235_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t235_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t235_sidebarimg-1'] = "img/family1.jpg";
> $tmp['t235_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t235_sidebarlink-1'] = "histories/place1.php";
> $tmp['t235_sidebarsub-2'] = "Events";
> $tmp['t235_sidebarimg-2'] = "img/family2.jpg";
> $tmp['t235_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t235_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t235_sidebarsub-3'] = "Pictures of Family";
> $tmp['t235_sidebarimg-3'] = "img/family3.jpg";
> $tmp['t235_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t235_sidebarlink-3'] = "";
> $tmp['t235_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t235_sidebarimg-4'] = "img/family4.jpg";
> $tmp['t235_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t235_sidebarlink-4'] = "";
> $tmp['t235_sidebarsub-5'] = "Ancestor's Name";
> $tmp['t235_sidebarimg-5'] = "img/family1.jpg";
> $tmp['t235_sidebarpara-5'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t235_sidebarlink-5'] = "histories/place1.php";
> $tmp['t235_sidebarsub-6'] = "Events";
> $tmp['t235_sidebarimg-6'] = "img/family2.jpg";
> $tmp['t235_sidebarpara-6'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t235_sidebarlink-6'] = "histories/stories2.php";
> $tmp['t235_sidebartitle-7'] = "Random Photos";
> $tmp['t235_snipheadline-1'] = "Our Ancestors Speak Volumes";
> $tmp['t235_snipimg-1'] = "img/top1.jpg";
> $tmp['t235_snipname-1'] = "Ancestor's Name";
> $tmp['t235_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t235_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t235_snipimg-2'] = "img/top2.jpg";
> $tmp['t235_snipname-2'] = "Ancestor's Name";
> $tmp['t235_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t235_sniplink-2'] = "histories/place1.php";
> $tmp['t235_snipimg-3'] = "img/top3.jpg";
> $tmp['t235_snipname-3'] = "Ancestor's Name";
> $tmp['t235_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t235_sniplink-3'] = "surnames.php";
> $tmp['t235_snipimg-4'] = "img/top4.jpg";
> $tmp['t235_snipname-4'] = "Ancestor's Name";
> $tmp['t235_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t235_sniplink-4'] = "histories/family1.php";
> $tmp['t235_snipimg-5'] = "img/top1.jpg";
> $tmp['t235_snipname-5'] = "Ancestor's Name";
> $tmp['t235_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t235_sniplink-5'] = "histories/place1.php";
> $tmp['t235_snipimg-6'] = "img/top2.jpg";
> $tmp['t235_snipname-6'] = "Ancestor's Name";
> $tmp['t235_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t235_sniplink-6'] = "histories/family2.php";
> $tmp['t235_snipimg-7'] = "img/top3.jpg";
> $tmp['t235_snipname-7'] = "Ancestor's Name";
> $tmp['t235_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t235_sniplink-7'] = "histories/story1.php";
> $tmp['t235_snipimg-8'] = "img/top4.jpg";
> $tmp['t235_snipname-8'] = "Ancestor's Name";
> $tmp['t235_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t235_sniplink-8'] = "histories/story2.php";
> $tmp['t235_featuretitle-7'] = "With Love and Caring";
> $tmp['t235_featurethumb-7'] = "img/familyphotos.jpg";
> $tmp['t235_featurepara-7'] = "With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p>It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. <br><br>So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.'<br><br>~<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson, Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t235_featurelink-7'] = "";
> $tmp['t235_featurelinktext-7'] = "";
> $tmp['t235_author-1'] = "Mark Twain";
> $tmp['t235_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t235_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t235_quotelink-1'] = "histories/place1.php";
> $tmp['t235_author-2'] = "Howard K. Nixon";
> $tmp['t235_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t235_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t235_quotelink-2'] = "";
> $tmp['t235_author-3'] = "Jimmy Carter";
> $tmp['t235_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t235_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t235_quotelink-3'] = "";
> $tmp['t235_author-4'] = "Florence King";
> $tmp['t235_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t235_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t235_quotelink-4'] = "";
> $tmp['t235_author-5'] = "Ellen";
> $tmp['t235_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t235_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t235_quotelink-5'] = "";
> $tmp['t235_author-6'] = "Uncle Ralph";
> $tmp['t235_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t235_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t235_quotelink-6'] = "";
> $tmp['t235_featuretitle-8'] = "Our Pages";
> $tmp['t235_featurepara-8'] = "You can use this area to add your extra history or person pages.";
> $tmp['t235_link-5'] = "histories/index.php";
> $tmp['t235_linktext-5'] = "Our History Pages";
> $tmp['t235_link-6'] = "histories/story1.php";
> $tmp['t235_linktext-6'] = "Our Stories";
> $tmp['t235_link-7'] = "https://usgenweb.org";
> $tmp['t235_linktext-7'] = "USGenWeb";
> $tmp['t235_link-8'] = "https://genealogywebtemplates.com";
> $tmp['t235_linktext-8'] = "Genealogy Web Templates";
> $tmp['t235_link-9'] = "https://tng.community/index.php?/forums/";
> $tmp['t235_linktext-9'] = "TNG Forum";
> $tmp['t235_featuretitle-9'] = "About Us";
> $tmp['t235_featurepara-9'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t235_featurethumb-9'] = "img/about.jpg";
> $tmp['t235_footerheadline-1'] = "Quick Links";
> $tmp['t235_footerheadline-2'] = "Contact Us";
> $tmp['t235_footerlink-1'] = "suggest.php";
> $tmp['t235_footerlinktext-1'] = "Contact Us";
> $tmp['t235_footerlink-2'] = "surnames.php";
> $tmp['t235_footerlinktext-2'] = "Our Surnames";
> $tmp['t235_footerlink-3'] = "histories/story1.php";
> $tmp['t235_footerlinktext-3'] = "Our Stories";
> $tmp['t235_footerheadline-4'] = "Webmaster Message";
> $tmp['t235_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t236_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t236_linktext-1'] = "Our History Pages |";
> $tmp['t236_link-2'] = "histories/story1.php";
> $tmp['t236_linktext-2'] = "Our Stories |";
> $tmp['t236_link-3'] = "https://genealogywebtemplates.com";
> $tmp['t236_linktext-3'] = "GWT";
> $tmp['t236_maintitle'] = "Template 236";
> $tmp['t236_headimg'] = "img/logo.png";
> $tmp['t236_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t236_headline-1'] = "Welcome!";
> $tmp['t236_subhead-1'] = "We're glad you dropped in.";
> $tmp['t236_subhead-2'] = "Take a look at all of the great information we've gathered!";
> $tmp['t236_link-5'] = "suggest.php?page=Our+Histories";
> $tmp['t236_linktext-5'] = "Contact Us";
> $tmp['t236_slideimg-1'] = "img/top1.jpg";
> $tmp['t236_slidetitle-1'] = "Slider 1";
> $tmp['t236_slideheadline-1'] = "Subtitle 1";
> $tmp['t236_slidetext-1'] = "Text 1";
> $tmp['t236_slidelink-1'] = "surnames.php";
> $tmp['t236_slideimg-2'] = "img/top2.jpg";
> $tmp['t236_slidetitle-2'] = "Slider 2";
> $tmp['t236_slideheadline-2'] = "Subtitle 2";
> $tmp['t236_slidetext-2'] = "Text 2";
> $tmp['t236_slidelink-2'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t236_slideimg-3'] = "img/top3.jpg";
> $tmp['t236_slidetitle-3'] = "Slider 3";
> $tmp['t236_slideheadline-3'] = "Subtitle 3";
> $tmp['t236_slidetext-3'] = "Text 3";
> $tmp['t236_slidelink-3'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t236_featuretitle-1'] = "Our Family's Genealogy";
> $tmp['t236_featurethumb-1'] = "img/topleft.jpg";
> $tmp['t236_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t236_featuretitle-2'] = "The Chosen";
> $tmp['t236_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t236_featurelink-2'] = "histories/story2.php";
> $tmp['t236_featurelinktext-2'] = "See More";
> $tmp['t236_slideheadline-4'] = "Family Pictures";
> $tmp['t236_slidetitle-4'] = "Hamburg, Germany";
> $tmp['t236_slideimg-4'] = "img/fambox1.jpg";
> $tmp['t236_slidelink-4'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t236_slidetext-4'] = "The official name reflects Hamburg's history as a member of the medieval Hanseatic League and a free imperial city of the Holy Roman Empire. Before the 1871 Unification of Germany, it was a fully sovereign city state, and before 1919 formed a civic republic headed constitutionally by a class of hereditary grand burghers or Hanseaten. Beset by disasters such as the Great Fire of Hamburg, North Sea flood of 1962 and military conflicts including World War II bombing raids, the city has managed to recover and emerge wealthier after each catastrophe. ~ Wiki";
> $tmp['t236_slidelink-4'] = "histories/place2.php";
> $tmp['t236_slidelinktext-4'] = "Hamburg";
> $tmp['t236_slidetitle-5'] = "Postcard from Family";
> $tmp['t236_slideimg-5'] = "img/fambox2.jpg";
> $tmp['t236_slidelink-5'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t236_slidetext-5'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t236_slidelink-5'] = "histories/place1.php";
> $tmp['t236_slidelinktext-5'] = "Italy";
> $tmp['t236_slidetitle-6'] = "Great Grandparents";
> $tmp['t236_slideimg-6'] = "img/fambox3.jpg";
> $tmp['t236_slidelink-6'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t236_slidetext-6'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t236_slidelink-6'] = "histories/family2.php";
> $tmp['t236_slidelinktext-6'] = "Family";
> $tmp['t236_slidetitle-7'] = "Family Farm";
> $tmp['t236_slideimg-7'] = "img/fambox4.jpg";
> $tmp['t236_slidetext-7'] = "histories/place1.php";
> $tmp['t236_slidetext-7'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t236_slidelink-7'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t236_slidelinktext-7'] = "Farm";
> $tmp['t236_snipheadline-1'] = "Our Ancestors";
> $tmp['t236_sniptitle-1'] = "Fred Smith Family";
> $tmp['t236_snipname-1'] = "Fred Smith";
> $tmp['t236_snipinfoone-1'] = "Born 1862";
> $tmp['t236_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t236_snipimage-1'] = "img/snip1.jpg";
> $tmp['t236_snipperson-1'] = "";
> $tmp['t236_sniptree-1'] = "";
> $tmp['t236_sniptitle-2'] = "Dan Jones Family";
> $tmp['t236_snipname-2'] = "Dan Jones";
> $tmp['t236_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t236_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t236_snipimage-2'] = "img/snip2.jpg";
> $tmp['t236_snipperson-2'] = "";
> $tmp['t236_sniptree-2'] = "";
> $tmp['t236_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t236_snipname-3'] = "Peter Ryan";
> $tmp['t236_snipinfoone-3'] = "Family Name";
> $tmp['t236_snipinfotwo-3'] = "Information";
> $tmp['t236_snipimage-3'] = "img/snip3.jpg";
> $tmp['t236_snipperson-3'] = "";
> $tmp['t236_sniptree-3'] = "";
> $tmp['t236_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t236_snipname-4'] = "Roy Robbins";
> $tmp['t236_snipinfoone-4'] = "Family Name";
> $tmp['t236_snipinfotwo-4'] = "Information";
> $tmp['t236_snipimage-4'] = "img/snip4.jpg";
> $tmp['t236_snipperson-4'] = "";
> $tmp['t236_sniptree-4'] = "";
> $tmp['t236_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t236_snipname-5'] = "Barry Rogers";
> $tmp['t236_snipinfoone-5'] = "Family Name";
> $tmp['t236_snipinfotwo-5'] = "Information";
> $tmp['t236_snipimage-5'] = "img/snip5.jpg";
> $tmp['t236_snipperson-5'] = "";
> $tmp['t236_sniptree-5'] = "";
> $tmp['t236_sniptitle-6'] = "Albert Ross Family";
> $tmp['t236_snipname-6'] = "Albert Ross";
> $tmp['t236_snipinfoone-6'] = "Family Name";
> $tmp['t236_snipinfotwo-6'] = "Information";
> $tmp['t236_snipimage-6'] = "img/snip6.jpg";
> $tmp['t236_snipperson-6'] = "";
> $tmp['t236_sniptree-6'] = "";
> $tmp['t236_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t236_snipname-7'] = "Alvy Boardman";
> $tmp['t236_snipinfoone-7'] = "Family Name";
> $tmp['t236_snipinfotwo-7'] = "Information";
> $tmp['t236_snipimage-7'] = "img/snip7.jpg";
> $tmp['t236_snipperson-7'] = "";
> $tmp['t236_sniptree-7'] = "";
> $tmp['t236_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t236_snipname-8'] = "Paul Johnson";
> $tmp['t236_snipinfoone-8'] = "Family Name";
> $tmp['t236_snipinfotwo-8'] = "Information";
> $tmp['t236_snipimage-8'] = "img/snip8.jpg";
> $tmp['t236_snipperson-8'] = "";
> $tmp['t236_sniptree-8'] = "";
> $tmp['t236_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t236_featurethumb-3'] = "img/top2.jpg";
> $tmp['t236_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. <br><br>It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. <br><br>So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t236_featurelink-3'] = "histories/place1.php";
> $tmp['t236_featurelinktext-3'] = "See More";
> $tmp['t236_author-1'] = "Mark Twain";
> $tmp['t236_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t236_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t236_quotelink-1'] = "histories/place1.php";
> $tmp['t236_author-2'] = "Howard K. Nixon";
> $tmp['t236_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t236_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t236_quotelink-2'] = "";
> $tmp['t236_author-3'] = "Jimmy Carter";
> $tmp['t236_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t236_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t236_quotelink-3'] = "";
> $tmp['t236_author-4'] = "Florence King";
> $tmp['t236_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t236_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t236_quotelink-4'] = "";
> $tmp['t236_author-5'] = "Ellen";
> $tmp['t236_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t236_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t236_quotelink-5'] = "";
> $tmp['t236_author-6'] = "Aunt Suzie";
> $tmp['t236_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t236_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t236_quotelink-6'] = "";
> $tmp['t236_sidebartitle-1'] = "Our Extra Pages";
> $tmp['t236_sidebarsub-1'] = "You can use this area to add your extra history pages, ancestor pages or outside links.";
> $tmp['t236_sidebarlink-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t236_sidebarlinktext-1'] = "Our History Pages";
> $tmp['t236_sidebarlink-2'] = "histories/story1.php";
> $tmp['t236_sidebarlinktext-2'] = "Our Stories";
> $tmp['t236_sidebarlink-3'] = "https://usgenweb.org";
> $tmp['t236_sidebarlinktext-3'] = "USGenWeb";
> $tmp['t236_sidebarlink-4'] = "https://genealogywebtemplates.com";
> $tmp['t236_sidebarlinktext-4'] = "Genealogy Web Templates";
> $tmp['t236_sidebarlink-5'] = "https://tng.community/index.php?/forums";
> $tmp['t236_sidebarlinktext-5'] = "TNG Forum";
> $tmp['t236_topsurnames'] = "Our Top Surnames";
> $tmp['t236_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t236_footerheadline-1'] = "Quick Links";
> $tmp['t236_footerheadline-2'] = "Contact Us";
> $tmp['t236_footerlink-1'] = "suggest.php";
> $tmp['t236_footerlinktext-1'] = "Contact Us";
> $tmp['t236_footerlink-2'] = "surnames.php";
> $tmp['t236_footerlinktext-2'] = "Our Surnames";
> $tmp['t236_footerlink-3'] = "histories/story1.php";
> $tmp['t236_footerlinktext-3'] = "Our Stories";
> $tmp['t236_footerheadline-4'] = "Webmaster Message";
> $tmp['t236_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t237_maintitle'] = "Template 237";
> $tmp['t237_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t237_headimg'] = "img/logo.png";
> $tmp['t237_link-1'] = "histories/index.php";
> $tmp['t237_linktext-1'] = "Histories";
> $tmp['t237_link-2'] = "https://www.tngsitebuilding.com/";
> $tmp['t237_linktext-2'] = "TNG";
> $tmp['t237_link-3'] = "https://genealogywebtemplates.com";
> $tmp['t237_linktext-3'] = "GWT";
> $tmp['t237_link-4'] = "surnames.php";
> $tmp['t237_linktext-4'] = "Surnames";
> $tmp['t237_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t237_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t237_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t237_slidelink-1'] = "histories/place1.php";
> $tmp['t237_slidelinktext-1'] = "Histories";
> $tmp['t237_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t237_slideheadline-2'] = "Our Smith Family";
> $tmp['t237_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.<br><br><br>";
> $tmp['t237_slidelink-2'] = "histories/story1.php";
> $tmp['t237_slidelinktext-2'] = "Stories";
> $tmp['t237_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t237_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t237_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br><br><br>";
> $tmp['t237_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t237_slidelinktext-3'] = "GWT";
> $tmp['t237_featuretitle-1'] = "Our Family's Genealogy";
> $tmp['t237_featurethumb-1'] = "img/letters.jpg";
> $tmp['t237_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t237_featuretitle-2'] = "The Chosen";
> $tmp['t237_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t237_featurelink-2'] = "histories/story2.php";
> $tmp['t237_featurelinktext-2'] = "Our Story";
> $tmp['t237_headline-1'] = "Meet Our Family";
> $tmp['t237_snipimg-1'] = "img/top1.jpg";
> $tmp['t237_snipname-1'] = "Ancestor's Name";
> $tmp['t237_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t237_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t237_snipimg-2'] = "img/top2.jpg";
> $tmp['t237_snipname-2'] = "Ancestor's Name";
> $tmp['t237_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t237_sniplink-2'] = "histories/place1.php";
> $tmp['t237_snipimg-3'] = "img/top3.jpg";
> $tmp['t237_snipname-3'] = "Ancestor's Name";
> $tmp['t237_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t237_sniplink-3'] = "surnames.php";
> $tmp['t237_snipimg-4'] = "img/top4.jpg";
> $tmp['t237_snipname-4'] = "Ancestor's Name";
> $tmp['t237_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t237_sniplink-4'] = "histories/family1.php";
> $tmp['t237_snipimg-5'] = "img/top1.jpg";
> $tmp['t237_snipname-5'] = "Ancestor's Name";
> $tmp['t237_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t237_sniplink-5'] = "histories/place1.php";
> $tmp['t237_snipimg-6'] = "img/top2.jpg";
> $tmp['t237_snipname-6'] = "Ancestor's Name";
> $tmp['t237_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t237_sniplink-6'] = "histories/family2.php";
> $tmp['t237_snipimg-7'] = "img/top3.jpg";
> $tmp['t237_snipname-7'] = "Ancestor's Name";
> $tmp['t237_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t237_sniplink-7'] = "histories/story1.php";
> $tmp['t237_snipimg-8'] = "img/top4.jpg";
> $tmp['t237_snipname-8'] = "Ancestor's Name";
> $tmp['t237_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t237_sniplink-8'] = "histories/story2.php";
> $tmp['t237_headline-2'] = "Our Fabulous Families";
> $tmp['t237_author-1'] = "Mark Twain";
> $tmp['t237_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t237_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t237_quotelink-1'] = "histories/place1.php";
> $tmp['t237_author-2'] = "Howard K. Nixon";
> $tmp['t237_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t237_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t237_quotelink-2'] = "";
> $tmp['t237_author-3'] = "Jimmy Carter";
> $tmp['t237_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t237_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t237_quotelink-3'] = "";
> $tmp['t237_author-4'] = "Florence King";
> $tmp['t237_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t237_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t237_quotelink-4'] = "";
> $tmp['t237_author-5'] = "Ellen";
> $tmp['t237_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t237_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t237_quotelink-5'] = "";
> $tmp['t237_author-6'] = "Uncle Ralph";
> $tmp['t237_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t237_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t237_quotelink-6'] = "";
> $tmp['t237_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t237_featurethumb-3'] = "img/wagon.jpg";
> $tmp['t237_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.'<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t237_featurelink-3'] = "histories/place1.php";
> $tmp['t237_featurelinktext-3'] = "See More";
> $tmp['t237_headline-4'] = "Spotlight on Family";
> $tmp['t237_featuretitle-4'] = "Adella Brown";
> $tmp['t237_featurepara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t237_featurethumb-4'] = "img/project1.jpg";
> $tmp['t237_featurelink-4'] = "story1.php";
> $tmp['t237_featurelinktext-4'] = "See Adela";
> $tmp['t237_featuretitle-5'] = "Irish Roots";
> $tmp['t237_featurepara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t237_featurethumb-5'] = "img/project2.jpg";
> $tmp['t237_featurelink-5'] = "place1.php";
> $tmp['t237_featurelinktext-5'] = "Ireland";
> $tmp['t237_featuretitle-6'] = "Our Boudreaux Family";
> $tmp['t237_featurepara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t237_featurethumb-6'] = "img/project3.jpg";
> $tmp['t237_featurelink-6'] = "family1.php";
> $tmp['t237_featurelinktext-6'] = "Our Family";
> $tmp['t237_featuretitle-7'] = "Our Random Photos";
> $tmp['t237_featurepara-7'] = "This is the sentence above the Random Photo area or you can choose to make it a paragraph and remove the Random Photo out located in the index.php file.";
> $tmp['t237_topsurnames'] = "Top Surnames";
> $tmp['t237_textpara1'] = "This is the sentence above the Top 40 Surnames area or you can choose to make it a paragraph and remove the Surname Cloud located in the index.php file.";
> $tmp['t237_footerheadline-1'] = "Quick Links";
> $tmp['t237_footerheadline-2'] = "Contact Us";
> $tmp['t237_footerlink-1'] = "suggest.php";
> $tmp['t237_footerlinktext-1'] = "Contact Us";
> $tmp['t237_footerlink-2'] = "surnames.php";
> $tmp['t237_footerlinktext-2'] = "Our Surnames";
> $tmp['t237_footerlink-3'] = "histories/story1.php";
> $tmp['t237_footerlinktext-3'] = "Our Stories";
> $tmp['t237_footerheadline-4'] = "Webmaster Message";
> $tmp['t237_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t238_maintitle'] = "Template 238";
> $tmp['t238_headsubtitle'] = "Our Journey Through Time";
> $tmp['t238_headimg'] = "img/logo.png";
> $tmp['t238_dadperson'] = "I2";
> $tmp['t238_dadtree'] = "mytreeid";
> $tmp['t238_headerlinktext-1'] = "Holley Side";
> $tmp['t238_momperson'] = "I1";
> $tmp['t238_momtree'] = "mytreeid";
> $tmp['t238_headerlinktext-2'] = "Boardman Side";
> $tmp['t238_headerlink-3'] = "surnames.php";
> $tmp['t238_headerlinktext-3'] = "Surnames";
> $tmp['t238_headerlink-4'] = "histories/index.php";
> $tmp['t238_headerlinktext-4'] = "Histories";
> $tmp['t238_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t238_slidetext-1'] = "Welcome to our genealogy site!";
> $tmp['t238_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t238_slidetext-2'] = "We hope you enjoy looking through our family.";
> $tmp['t238_slidelink-2'] = "";
> $tmp['t238_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t238_slidetext-3'] = "We hope our research helps you find what you are looking for! <br>";
> $tmp['t238_featuretitle-1'] = "Our Family";
> $tmp['t238_featurepara-1'] = "We are so excited to have found this side of our family! Joseph was born in St. Charles Parish, Louisiana in 1736. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus.";
> $tmp['t238_featurelink-1'] = "surnames.php";
> $tmp['t238_featurelinktext-1'] = "Our Surnames";
> $tmp['t238_featuretitle-2'] = "Our Mother's Family";
> $tmp['t238_featurepara-2'] = "This is text that goes with our mother's family. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus.";
> $tmp['t238_featurethumb-2'] = "img/icon1.jpg";
> $tmp['t238_featurelink-2'] = "histories/story2.php";
> $tmp['t238_featurelinktext-2'] = "Our Story";
> $tmp['t238_featuretitle-3'] = "We came to America";
> $tmp['t238_featurepara-3'] = "This is text that goes with we came to America. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus.";
> $tmp['t238_featurethumb-3'] = "img/ship.jpg";
> $tmp['t238_featurelink-3'] = "histories/story1.php";
> $tmp['t238_featurelinktext-3'] = "Dad's Story";
> $tmp['t238_featuretitle-4'] = "Our Resources";
> $tmp['t238_featurepara-4'] = "This is text that goes with our resources. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus.";
> $tmp['t238_featurethumb-4'] = "img/icon2.jpg";
> $tmp['t238_featurelink-4'] = "browsesources.php";
> $tmp['t238_featurelinktext-4'] = "Resources";
> $tmp['t238_headline'] = "Welcome to Template 238";
> $tmp['t238_featuretitle-5'] = "The Chosen";
> $tmp['t238_featurepara-5'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t238_featurethumb-5'] = "img/couple.jpg";
> $tmp['t238_featurelink-5'] = "histories/index.php";
> $tmp['t238_featurelinktext-5'] = "Our History";
> $tmp['t238_featuretitle-6'] = "Bones of My Bones";
> $tmp['t238_featurepara-6'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us.<br><br> It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are.<br><br> So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<br><br><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t238_featurethumb-6'] = "img/family.jpg";
> $tmp['t238_featurelink-6'] = "histories/place1.php";
> $tmp['t238_featurelinktext-6'] = "Our Places";
> $tmp['t238_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t238_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t238_sidebartitle-1'] = "Herman Bourgeois";
> $tmp['t238_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t238_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-1'] = "histories/family1.php";
> $tmp['t238_sidebarlinktext-1'] = "His Story";
> $tmp['t238_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t238_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t238_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-2'] = "surnames.php";
> $tmp['t238_sidebarlinktext-2'] = "See Camilla";
> $tmp['t238_sidebartitle-3'] = "Susan Melancon";
> $tmp['t238_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t238_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-3'] = "";
> $tmp['t238_sidebarlinktext-3'] = "";
> $tmp['t238_sidebartitle-4'] = "Erik Markinson";
> $tmp['t238_sidebarimg-4'] = "img/father1.jpg";
> $tmp['t238_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t238_sidebarlinktext-4'] = "See Erik";
> $tmp['t238_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t238_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t238_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-5'] = "";
> $tmp['t238_sidebarlinktext-5'] = "";
> $tmp['t238_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t238_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t238_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-6'] = "";
> $tmp['t238_sidebarlinktext-6'] = "";
> $tmp['t238_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t238_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t238_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-7'] = "";
> $tmp['t238_sidebarlinktext-7'] = "";
> $tmp['t238_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t238_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t238_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-8'] = "";
> $tmp['t238_sidebarlinktext-8'] = "";
> $tmp['t238_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t238_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t238_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-9'] = "";
> $tmp['t238_sidebarlinktext-9'] = "";
> $tmp['t238_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t238_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t238_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t238_sidebarlink-10'] = "";
> $tmp['t238_sidebarlinktext-10'] = "";
> $tmp['t238_author-1'] = "Mark Twain";
> $tmp['t238_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t238_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t238_quotelink-1'] = "histories/place1.php";
> $tmp['t238_author-2'] = "Howard K. Nixon";
> $tmp['t238_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t238_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t238_quotelink-2'] = "";
> $tmp['t238_author-3'] = "Jimmy Carter";
> $tmp['t238_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t238_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t238_quotelink-3'] = "";
> $tmp['t238_author-4'] = "Florence King";
> $tmp['t238_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t238_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t238_quotelink-4'] = "";
> $tmp['t238_author-5'] = "Ellen";
> $tmp['t238_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t238_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t238_quotelink-5'] = "";
> $tmp['t238_author-6'] = "Uncle Ralph";
> $tmp['t238_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t238_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t238_quotelink-6'] = "";
> $tmp['t238_footerheadline-1'] = "Quick Links";
> $tmp['t238_footerheadline-2'] = "Contact Us";
> $tmp['t238_footerlink-1'] = "suggest.php";
> $tmp['t238_footerlinktext-1'] = "Contact Us";
> $tmp['t238_footerlink-2'] = "surnames.php";
> $tmp['t238_footerlinktext-2'] = "Our Surnames";
> $tmp['t238_footerlink-3'] = "histories/story1.php";
> $tmp['t238_footerlinktext-3'] = "Our Stories";
> $tmp['t238_footerheadline-4'] = "Webmaster Message";
> $tmp['t238_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t239_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t239_linktext-1'] = "Our History Pages |";
> $tmp['t239_link-2'] = "histories/story1.php";
> $tmp['t239_linktext-2'] = "Our Stories |";
> $tmp['t239_link-3'] = "https://usgenweb.org";
> $tmp['t239_linktext-3'] = "USGenWeb";
> $tmp['t239_maintitle'] = "Template 239";
> $tmp['t239_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t239_headimg'] = "img/logo.png";
> $tmp['t239_welcome'] = "Welcome to Our Web";
> $tmp['t239_headline-1'] = "Our Goal is to create a great place to find and share information.";
> $tmp['t239_subhead-1'] = "Enjoy looking around! If you have additional materials, please contact us.";
> $tmp['t239_textlink1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t239_texttitle1'] = "Our Families";
> $tmp['t239_featuretitle-1'] = "Our Genealogy Research";
> $tmp['t239_featurethumb-1'] = "img/album.jpg";
> $tmp['t239_featurepara-1'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t239_featuretitle-2'] = "The Chosen";
> $tmp['t239_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t239_featurelink-2'] = "histories/story2.php";
> $tmp['t239_featurelinktext-2'] = "Our Story";
> $tmp['t239_headline-2'] = "Discovering Our Family";
> $tmp['t239_snipimg-1'] = "img/top1.jpg";
> $tmp['t239_snipname-1'] = "Ancestor's Name";
> $tmp['t239_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t239_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t239_snipimg-2'] = "img/top2.jpg";
> $tmp['t239_snipname-2'] = "Ancestor's Name";
> $tmp['t239_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t239_sniplink-2'] = "histories/place1.php";
> $tmp['t239_snipimg-3'] = "img/top3.jpg";
> $tmp['t239_snipname-3'] = "Ancestor's Name";
> $tmp['t239_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t239_sniplink-3'] = "surnames.php";
> $tmp['t239_snipimg-4'] = "img/top4.jpg";
> $tmp['t239_snipname-4'] = "Ancestor's Name";
> $tmp['t239_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t239_sniplink-4'] = "histories/family1.php";
> $tmp['t239_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t239_featurethumb-3'] = "img/letter.jpg";
> $tmp['t239_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.'<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t239_featurelink-3'] = "histories/place1.php";
> $tmp['t239_featurelinktext-3'] = "See More";
> $tmp['t239_headline-3'] = "Meet Our Mother's Side";
> $tmp['t239_snipimg-5'] = "img/top1.jpg";
> $tmp['t239_snipname-5'] = "Ancestor's Name";
> $tmp['t239_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t239_sniplink-5'] = "histories/place1.php";
> $tmp['t239_snipimg-6'] = "img/top2.jpg";
> $tmp['t239_snipname-6'] = "Ancestor's Name";
> $tmp['t239_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t239_sniplink-6'] = "histories/family2.php";
> $tmp['t239_snipimg-7'] = "img/top3.jpg";
> $tmp['t239_snipname-7'] = "Ancestor's Name";
> $tmp['t239_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t239_sniplink-7'] = "histories/story1.php";
> $tmp['t239_snipimg-8'] = "img/top4.jpg";
> $tmp['t239_snipname-8'] = "Ancestor's Name";
> $tmp['t239_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t239_sniplink-8'] = "histories/story2.php";
> $tmp['t239_author-1'] = "Mark Twain";
> $tmp['t239_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t239_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t239_quotelink-1'] = "histories/place1.php";
> $tmp['t239_author-2'] = "Howard K. Nixon";
> $tmp['t239_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t239_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t239_quotelink-2'] = "";
> $tmp['t239_author-3'] = "Jimmy Carter";
> $tmp['t239_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t239_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t239_quotelink-3'] = "";
> $tmp['t239_author-4'] = "Florence King";
> $tmp['t239_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t239_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t239_quotelink-4'] = "";
> $tmp['t239_author-5'] = "Ellen";
> $tmp['t239_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t239_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t239_quotelink-5'] = "";
> $tmp['t239_author-6'] = "Uncle Ralph";
> $tmp['t239_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t239_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t239_quotelink-6'] = "";
> $tmp['t239_featuretitle-4'] = "Our Pages";
> $tmp['t239_featuresub-4'] = "You can use this area to add your extra history or person pages.";
> $tmp['t239_link-4'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t239_linktext-4'] = "Our History Pages";
> $tmp['t239_link-5'] = "histories/story1.php";
> $tmp['t239_linktext-5'] = "Our Stories";
> $tmp['t239_link-6'] = "https://usgenweb.org";
> $tmp['t239_linktext-6'] = "USGenWeb";
> $tmp['t239_link-7'] = "https://genealogywebtemplates.com";
> $tmp['t239_linktext-7'] = "Genealogy Web Templates";
> $tmp['t239_link-8'] = "https://tng.community/index.php?/forums/";
> $tmp['t239_linktext-8'] = "TNG Forum";
> $tmp['t239_featuretitle-5'] = "About Us";
> $tmp['t239_featurepara-5'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t239_featurethumb-5'] = "img/about.jpg";
> $tmp['t239_footerheadline-1'] = "Quick Links";
> $tmp['t239_footerheadline-2'] = "Contact Us";
> $tmp['t239_footerlink-1'] = "suggest.php";
> $tmp['t239_footerlinktext-1'] = "Contact Us";
> $tmp['t239_footerlink-2'] = "surnames.php";
> $tmp['t239_footerlinktext-2'] = "Our Surnames";
> $tmp['t239_footerlink-3'] = "histories/story1.php";
> $tmp['t239_footerlinktext-3'] = "Our Stories";
> $tmp['t239_footerheadline-4'] = "Webmaster Message";
> $tmp['t239_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t240_maintitle'] = "Template 240";
> $tmp['t240_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t240_headimg'] = "img/logo.png";
> $tmp['t240_titleimg'] = "img/flourish.png";
> $tmp['t240_link-1'] = "surnames.php";
> $tmp['t240_linktext-1'] = "Our Surnames";
> $tmp['t240_link-2'] = "histories/index.php";
> $tmp['t240_linktext-2'] = "Boudreaux Side";
> $tmp['t240_link-3'] = "histories/place1.php";
> $tmp['t240_linktext-3'] = "Our Places";
> $tmp['t240_link-4'] = "histories/story1.php";
> $tmp['t240_linktext-4'] = "Our Stories";
> $tmp['t240_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t240_slideheadline-1'] = "My Ancestor's Story";
> $tmp['t240_slidetext-1'] = "I hope you enjoy the fruits of my research.";
> $tmp['t240_slidelink-1'] = "histories/place1.php";
> $tmp['t240_slidelinktext-1'] = "Histories";
> $tmp['t240_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t240_slideheadline-2'] = "Looking for Clues";
> $tmp['t240_slidetext-2'] = "Hopefully you can find answers in this site!";
> $tmp['t240_slidelink-2'] = "histories/story1.php";
> $tmp['t240_slidelinktext-2'] = "Stories";
> $tmp['t240_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t240_slideheadline-3'] = "If you have something to add";
> $tmp['t240_slidetext-3'] = "Please send it to me! I'm always looking for family!<br>";
> $tmp['t240_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t240_slidelinktext-3'] = "GWT";
> $tmp['t240_featuretitle-1'] = "Welcome to Our Site!";
> $tmp['t240_featurepara-1'] = "We are so please you dropped in to check us out. We have been 'doing' genealogy for more than 30 years! You'd think after all that time, we'd have all the answers! Not even close. We are always looking for new cousins and related families. Please let us know how you fit into our puzzle. The following text is filler text. You will use your text here. Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_featurelink-1'] = "";
> $tmp['t240_featurelinktext-1'] = "";
> $tmp['t240_featuretitle-2'] = "The Chosen";
> $tmp['t240_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t240_featurethumb-2'] = "img/child.jpg";
> $tmp['t240_featurelink-2'] = "browsesources.php";
> $tmp['t240_featurelinktext-2'] = "Resources";
> $tmp['t240_featuretitle-3'] = "The Bones of My Bones";
> $tmp['t240_featurethumb-3'] = "img/family1.jpg";
> $tmp['t240_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.by Della M. Cummings Wright Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t240_featurelink-3'] = "histories/index.php";
> $tmp['t240_featurelinktext-3'] = "Our History";
> $tmp['t240_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t240_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, you will need to remove them in the index.php file.</em>";
> $tmp['t240_sidebartitle-1'] = "Herman Brown";
> $tmp['t240_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t240_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-1'] = "histories/family1.php";
> $tmp['t240_sidebarlinktext-1'] = "His Story";
> $tmp['t240_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t240_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t240_sidebarpara-2'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-2'] = "surnames.php";
> $tmp['t240_sidebarlinktext-2'] = "See Camilla";
> $tmp['t240_sidebartitle-3'] = "Susan Smith";
> $tmp['t240_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t240_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-3'] = "";
> $tmp['t240_sidebarlinktext-3'] = "";
> $tmp['t240_sidebartitle-4'] = "Erik Martinson";
> $tmp['t240_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t240_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t240_sidebarlinktext-4'] = "See Erik";
> $tmp['t240_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t240_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t240_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-5'] = "";
> $tmp['t240_sidebarlinktext-5'] = "";
> $tmp['t240_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t240_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t240_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-6'] = "";
> $tmp['t240_sidebarlinktext-6'] = "";
> $tmp['t240_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t240_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t240_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-7'] = "";
> $tmp['t240_sidebarlinktext-7'] = "";
> $tmp['t240_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t240_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t240_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-8'] = "";
> $tmp['t240_sidebarlinktext-8'] = "";
> $tmp['t240_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t240_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t240_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-9'] = "";
> $tmp['t240_sidebarlinktext-9'] = "";
> $tmp['t240_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t240_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t240_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t240_sidebarlink-10'] = "";
> $tmp['t240_sidebarlinktext-10'] = "";
> $tmp['t240_sidebarsub-2'] = "Our Pages";
> $tmp['t240_subhead2'] = "You can use this area to add your extra history or person pages.";
> $tmp['t240_sidebarlink-11'] = "histories/index.php";
> $tmp['t240_sidebarlinktext-11'] = "Our History Pages";
> $tmp['t240_sidebarlink-12'] = "histories/story1.php";
> $tmp['t240_sidebarlinktext-12'] = "Our Stories";
> $tmp['t240_sidebarlink-13'] = "https://usgenweb.org";
> $tmp['t240_sidebarlinktext-13'] = "USGenWeb";
> $tmp['t240_sidebarlink-14'] = "https://genealogywebtemplates.com";
> $tmp['t240_sidebarlinktext-14'] = "Genealogy Web Templates";
> $tmp['t240_sidebarlink-15'] = "https://tng.community/index.php?/forums/";
> $tmp['t240_sidebarlinktext-15'] = "TNG Forum";
> $tmp['t240_snipheadline-1'] = "Discover Our Family";
> $tmp['t240_snipimg-1'] = "img/top1.jpg";
> $tmp['t240_snipname-1'] = "Ancestor's Name";
> $tmp['t240_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t240_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t240_snipimg-2'] = "img/top2.jpg";
> $tmp['t240_snipname-2'] = "Ancestor's Name";
> $tmp['t240_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t240_sniplink-2'] = "histories/place1.php";
> $tmp['t240_snipimg-3'] = "img/top3.jpg";
> $tmp['t240_snipname-3'] = "Ancestor's Name";
> $tmp['t240_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t240_sniplink-3'] = "surnames.php";
> $tmp['t240_snipimg-4'] = "img/top4.jpg";
> $tmp['t240_snipname-4'] = "Ancestor's Name";
> $tmp['t240_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t240_sniplink-4'] = "histories/family1.php";
> $tmp['t240_snipimg-5'] = "img/top1.jpg";
> $tmp['t240_snipname-5'] = "Ancestor's Name";
> $tmp['t240_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t240_sniplink-5'] = "histories/place1.php";
> $tmp['t240_snipimg-6'] = "img/top2.jpg";
> $tmp['t240_snipname-6'] = "Ancestor's Name";
> $tmp['t240_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t240_sniplink-6'] = "histories/family2.php";
> $tmp['t240_snipimg-7'] = "img/top3.jpg";
> $tmp['t240_snipname-7'] = "Ancestor's Name";
> $tmp['t240_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t240_sniplink-7'] = "histories/story1.php";
> $tmp['t240_snipimg-8'] = "img/top4.jpg";
> $tmp['t240_snipname-8'] = "Ancestor's Name";
> $tmp['t240_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t240_sniplink-8'] = "histories/story2.php";
> $tmp['t240_topsurnames'] = "Our Top Surnames";
> $tmp['t240_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t240_author-1'] = "Mark Twain";
> $tmp['t240_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t240_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t240_quotelink-1'] = "histories/place1.php";
> $tmp['t240_author-2'] = "Howard K. Nixon";
> $tmp['t240_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t240_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t240_quotelink-2'] = "";
> $tmp['t240_author-3'] = "Jimmy Carter";
> $tmp['t240_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t240_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t240_quotelink-3'] = "";
> $tmp['t240_author-4'] = "Florence King";
> $tmp['t240_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t240_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t240_quotelink-4'] = "";
> $tmp['t240_author-5'] = "Ellen";
> $tmp['t240_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t240_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t240_quotelink-5'] = "";
> $tmp['t240_author-6'] = "Uncle Ralph";
> $tmp['t240_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t240_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t240_quotelink-6'] = "";
> $tmp['t240_footerheadline-1'] = "Quick Links";
> $tmp['t240_footerheadline-2'] = "Contact Us";
> $tmp['t240_footerlink-1'] = "suggest.php";
> $tmp['t240_footerlinktext-1'] = "Contact Us";
> $tmp['t240_footerlink-2'] = "surnames.php";
> $tmp['t240_footerlinktext-2'] = "Our Surnames";
> $tmp['t240_footerlink-3'] = "histories/story1.php";
> $tmp['t240_footerlinktext-3'] = "Our Stories";
> $tmp['t240_footerheadline-4'] = "Webmaster Message";
> $tmp['t240_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t241_maintitle'] = "Template 241";
> $tmp['t241_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t241_headimg'] = "img/logo.png";
> $tmp['t241_dadside'] = "His Side";
> $tmp['t241_dadperson'] = "I2";
> $tmp['t241_dadtree'] = "mytreeid";
> $tmp['t241_momside'] = "Her Side";
> $tmp['t241_momperson'] = "I1";
> $tmp['t241_momtree'] = "mytreeid";
> $tmp['t241_featurelinks'] = "TNG, https://tngsitebuilding.com GWT, https://genealogywebtemplates.com";
> $tmp['t241_slideheadline-1'] = "Finding Ancestors";
> $tmp['t241_slideheadline-2'] = "It's What We Do";
> $tmp['t241_slideheadline-3'] = "Take a look at all of the great information we've gathered!";
> $tmp['t241_slidelink-1'] = "histories/place1.php";
> $tmp['t241_slidelinktext-1'] = "Histories";
> $tmp['t241_headline-1'] = "Surnames";
> $tmp['t241_link-1'] = "surnames.php";
> $tmp['t241_headline-2'] = "Photos";
> $tmp['t241_link-2'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t241_headline-3'] = "Our History";
> $tmp['t241_link-3'] = "histories/index.php";
> $tmp['t241_featuretitle-1'] = "Template 241";
> $tmp['t241_featuresub-1'] = "If you have any contributions you'd like to add, please contact me.";
> $tmp['t241_featurepara-1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t241_featuresub-2'] = "The Bones of My Bone";
> $tmp['t241_featurepara-2'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\" <br>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.\"";
> $tmp['t241_featurethumb-2'] = "img/topleft.jpg";
> $tmp['t241_featurelink-2'] = "histories/place1.php";
> $tmp['t241_featurelinktext-2'] = "The Homeplace";
> $tmp['t241_snipheadline-1'] = "Check Out Our Ancestors";
> $tmp['t241_sniptitle-1'] = "Fred Smith Family";
> $tmp['t241_snipname-1'] = "Fred Smith";
> $tmp['t241_snipinfoone-1'] = "Born 1862";
> $tmp['t241_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t241_snipimage-1'] = "img/snip1.jpg";
> $tmp['t241_snipperson-1'] = "";
> $tmp['t241_sniptree-1'] = "";
> $tmp['t241_sniptitle-2'] = "Dan Jones Family";
> $tmp['t241_snipname-2'] = "Dan Jones";
> $tmp['t241_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t241_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t241_snipimage-2'] = "img/snip2.jpg";
> $tmp['t241_snipperson-2'] = "";
> $tmp['t241_sniptree-2'] = "";
> $tmp['t241_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t241_snipname-3'] = "Peter Ryan";
> $tmp['t241_snipinfoone-3'] = "Family Name";
> $tmp['t241_snipinfotwo-3'] = "Information";
> $tmp['t241_snipimage-3'] = "img/snip3.jpg";
> $tmp['t241_snipperson-3'] = "";
> $tmp['t241_sniptree-3'] = "";
> $tmp['t241_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t241_snipname-4'] = "Roy Robbins";
> $tmp['t241_snipinfoone-4'] = "Family Name";
> $tmp['t241_snipinfotwo-4'] = "Information";
> $tmp['t241_snipimage-4'] = "img/snip4.jpg";
> $tmp['t241_snipperson-4'] = "";
> $tmp['t241_sniptree-4'] = "";
> $tmp['t241_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t241_snipname-5'] = "Barry Rogers";
> $tmp['t241_snipinfoone-5'] = "Family Name";
> $tmp['t241_snipinfotwo-5'] = "Information";
> $tmp['t241_snipimage-5'] = "img/snip5.jpg";
> $tmp['t241_snipperson-5'] = "";
> $tmp['t241_sniptree-5'] = "";
> $tmp['t241_sniptitle-6'] = "Albert Ross Family";
> $tmp['t241_snipname-6'] = "Albert Ross";
> $tmp['t241_snipinfoone-6'] = "Family Name";
> $tmp['t241_snipinfotwo-6'] = "Information";
> $tmp['t241_snipimage-6'] = "img/snip6.jpg";
> $tmp['t241_snipperson-6'] = "";
> $tmp['t241_sniptree-6'] = "";
> $tmp['t241_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t241_snipname-7'] = "Alvy Boardman";
> $tmp['t241_snipinfoone-7'] = "Family Name";
> $tmp['t241_snipinfotwo-7'] = "Information";
> $tmp['t241_snipimage-7'] = "img/snip7.jpg";
> $tmp['t241_snipperson-7'] = "";
> $tmp['t241_sniptree-7'] = "";
> $tmp['t241_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t241_snipname-8'] = "Paul Johnson";
> $tmp['t241_snipinfoone-8'] = "Family Name";
> $tmp['t241_snipinfotwo-8'] = "Information";
> $tmp['t241_snipimage-8'] = "img/snip8.jpg";
> $tmp['t241_snipperson-8'] = "";
> $tmp['t241_sniptree-8'] = "";
> $tmp['t241_featuresub-3'] = "Our Fabulous Family!";
> $tmp['t241_featuretitle-3'] = "New Source!";
> $tmp['t241_featurethumb-3'] = "img/icon1.jpg";
> $tmp['t241_featurepara-3'] = "Check out our new source! You'll be amazed!";
> $tmp['t241_featurelink-3'] = "browserepos.php";
> $tmp['t241_featurelinktext-3'] = "Sources";
> $tmp['t241_featuretitle-4'] = "Finally Found Them!";
> $tmp['t241_featurethumb-4'] = "img/icon2.jpg";
> $tmp['t241_featurepara-4'] = "They really were hiding under a rock! We're so happy that we found them!";
> $tmp['t241_featurelink-4'] = "";
> $tmp['t241_featurelinktext-4'] = "";
> $tmp['t241_featuretitle-5'] = "Results Are In!";
> $tmp['t241_featurethumb-5'] = "img/icon3.jpg";
> $tmp['t241_featurepara-5'] = "You think you know who you are, but when you have a DNA test, it sometimes can rock your world!";
> $tmp['t241_featurelink-5'] = "";
> $tmp['t241_featurelinktext-5'] = "";
> $tmp['t241_sidebartitle-1'] = "Our Extra Pages";
> $tmp['t241_sidebarsub-1'] = "You can use this area to add your extra history pages, ancestor pages or outside links.";
> $tmp['t241_sidebarlink-1'] = "histories/index.php";
> $tmp['t241_sidebarlinktext-1'] = "Our History Pages";
> $tmp['t241_sidebarlink-2'] = "histories/story1.php";
> $tmp['t241_sidebarlinktext-2'] = "Our Stories";
> $tmp['t241_sidebarlink-3'] = "https://usgenweb.org";
> $tmp['t241_sidebarlinktext-3'] = "USGenWeb";
> $tmp['t241_sidebarlink-4'] = "https://genealogywebtemplates.com";
> $tmp['t241_sidebarlinktext-4'] = "Genealogy Web Templates";
> $tmp['t241_sidebarlink-5'] = "https://tng.community/index.php?/forums";
> $tmp['t241_sidebarlinktext-5'] = "TNG Forum";
> $tmp['t241_author-1'] = "Mark Twain";
> $tmp['t241_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t241_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t241_quotelink-1'] = "histories/place1.php";
> $tmp['t241_author-2'] = "Howard K. Nixon";
> $tmp['t241_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t241_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t241_quotelink-2'] = "";
> $tmp['t241_author-3'] = "Jimmy Carter";
> $tmp['t241_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t241_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t241_quotelink-3'] = "";
> $tmp['t241_author-4'] = "Florence King";
> $tmp['t241_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t241_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t241_quotelink-4'] = "";
> $tmp['t241_author-5'] = "Ellen";
> $tmp['t241_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t241_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t241_quotelink-5'] = "";
> $tmp['t241_author-6'] = "Aunt Suzie";
> $tmp['t241_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t241_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t241_quotelink-6'] = "";
> $tmp['t241_topsurnames'] = "Top 30 Surnames";
> $tmp['t241_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t241_footerheadline-1'] = "Quick Links";
> $tmp['t241_footerheadline-2'] = "Contact Us";
> $tmp['t241_footerlink-1'] = "suggest.php";
> $tmp['t241_footerlinktext-1'] = "Contact Us";
> $tmp['t241_footerlink-2'] = "surnames.php";
> $tmp['t241_footerlinktext-2'] = "Our Surnames";
> $tmp['t241_footerlink-3'] = "histories/story1.php";
> $tmp['t241_footerlinktext-3'] = "Our Stories";
> $tmp['t241_footerheadline-4'] = "Webmaster Message";
> $tmp['t241_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t242_maintitle'] = "Template 242";
> $tmp['t242_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t242_headimg'] = "img/logo.png";
> $tmp['t242_dadperson'] = "I2";
> $tmp['t242_dadtree'] = "mytreeid";
> $tmp['t242_headerlinktext-1'] = "Holley Side";
> $tmp['t242_momperson'] = "I1";
> $tmp['t242_momtree'] = "mytreeid";
> $tmp['t242_headerlinktext-2'] = "Boardman Side";
> $tmp['t242_headerlink-3'] = "surnames.php";
> $tmp['t242_headerlinktext-3'] = "Surnames";
> $tmp['t242_headerlink-4'] = "histories/index.php";
> $tmp['t242_headerlinktext-4'] = "Histories";
> $tmp['t242_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t242_slideheadline-1'] = "My ancestor's story...";
> $tmp['t242_slidetext-1'] = "I hope you enjoy the fruits of my research.";
> $tmp['t242_slidelink-1'] = "histories/index.php";
> $tmp['t242_slidelinktext-1'] = "Histories";
> $tmp['t242_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t242_slideheadline-2'] = "Looking for clues?";
> $tmp['t242_slidetext-2'] = "Hopefully you can find answers in my site!";
> $tmp['t242_slidelink-2'] = "histories/place1.php";
> $tmp['t242_slidelinktext-2'] = "Places";
> $tmp['t242_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t242_slideheadline-3'] = "If you have something to add";
> $tmp['t242_slidetext-3'] = "Please send it to me! I'm always looking for family!";
> $tmp['t242_slidelink-3'] = "histories/story1.php";
> $tmp['t242_slidelinktext-3'] = "Stories";
> $tmp['t242_featuretitle-1'] = "Welcome, Family!!!";
> $tmp['t242_featurepara-1'] = "We are so excited that you found our site! We hope you enjoy our new look and all of our family tree information.</p><p> We hope you can find new information on your family. We strive to document all of our sources.";
> $tmp['t242_featurelink-1'] = "histories/index.php";
> $tmp['t242_featurelinktext-1'] = "Our Histories";
> $tmp['t242_featuretitle-2'] = "Our Bourgeois Family";
> $tmp['t242_featurepara-2'] = "We are so excited to have found this side of our family! Joseph Bourgeois was born in St. Charles Parish, Louisiana in 1736.";
> $tmp['t242_featurethumb-2'] = "img/icon1.jpg";
> $tmp['t242_featurelink-2'] = "surnames.php";
> $tmp['t242_featurelinktext-2'] = "See Joseph";
> $tmp['t242_featuretitle-3'] = "Our Family";
> $tmp['t242_featurepara-3'] = "It was great fun to see our family's journey to Louisiana on one of the seven original ships bound for New Orleans. He made the voyage with his wife and children from France..";
> $tmp['t242_featurethumb-3'] = "img/icon2.jpg";
> $tmp['t242_featurelink-3'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t242_featurelinktext-3'] = "Photos";
> $tmp['t242_featuretitle-4'] = "Our Research";
> $tmp['t242_featurepara-4'] = "Finding the old ship's manifest with our ancestors' names included was just thrilling! Tracing our ancestors and finding the DNA tracking was great.";
> $tmp['t242_featurethumb-4'] = "img/icon3.jpg";
> $tmp['t242_featurelink-4'] = "browsesources.php";
> $tmp['t242_featurelinktext-4'] = "Resources";
> $tmp['t242_featuretitle-5'] = "Welcome to Our Site";
> $tmp['t242_featuresub-5'] = "The Chosen";
> $tmp['t242_featurepara-5'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t242_featurethumb-5'] = "img/couple.jpg";
> $tmp['t242_tree-5'] = "";
> $tmp['t242_person-5'] = "";
> $tmp['t242_featurelink-5'] = "histories/index.php";
> $tmp['t242_featurelinktext-5'] = "Histories";
> $tmp['t242_featuretitle-6'] = "Bones of Our Bones";
> $tmp['t242_featurepara-6'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.'<br><br><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.'</em>";
> $tmp['t242_featurethumb-6'] = "img/family.jpg";
> $tmp['t242_tree-6'] = "";
> $tmp['t242_person-6'] = "I2506";
> $tmp['t242_featurelink-6'] = "histories/place1.php";
> $tmp['t242_featurelinktext-6'] = "The Homeplace";
> $tmp['t242_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t242_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, you will need to remove them in the index.php file.</em>";
> $tmp['t242_sidebartitle-1'] = "Herman Brown";
> $tmp['t242_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t242_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-1'] = "histories/family1.php";
> $tmp['t242_sidebarlinktext-1'] = "His Story";
> $tmp['t242_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t242_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t242_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-2'] = "surnames.php";
> $tmp['t242_sidebarlinktext-2'] = "See Camilla";
> $tmp['t242_sidebartitle-3'] = "Susan Smith";
> $tmp['t242_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t242_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-3'] = "";
> $tmp['t242_sidebarlinktext-3'] = "";
> $tmp['t242_sidebartitle-4'] = "Eric Masterson";
> $tmp['t242_sidebarimg-4'] = "img/father1.jpg";
> $tmp['t242_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t242_sidebarlinktext-4'] = "See Eric";
> $tmp['t242_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t242_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t242_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-5'] = "";
> $tmp['t242_sidebarlinktext-5'] = "";
> $tmp['t242_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t242_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t242_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-6'] = "";
> $tmp['t242_sidebarlinktext-6'] = "";
> $tmp['t242_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t242_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t242_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-7'] = "";
> $tmp['t242_sidebarlinktext-7'] = "";
> $tmp['t242_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t242_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t242_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-8'] = "";
> $tmp['t242_sidebarlinktext-8'] = "";
> $tmp['t242_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t242_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t242_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-9'] = "";
> $tmp['t242_sidebarlinktext-9'] = "";
> $tmp['t242_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t242_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t242_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t242_sidebarlink-10'] = "";
> $tmp['t242_sidebarlinktext-10'] = "";
> $tmp['t242_sidebarsub-2'] = "Our Pages";
> $tmp['t242_subhead2'] = "You can use this area to add your extra history or person pages.";
> $tmp['t242_sidebarlink-11'] = "histories/index.php";
> $tmp['t242_sidebarlinktext-11'] = "Our History Pages";
> $tmp['t242_sidebarlink-12'] = "histories/story1.php";
> $tmp['t242_sidebarlinktext-12'] = "Our Stories";
> $tmp['t242_sidebarlink-13'] = "http://usgenweb.org";
> $tmp['t242_sidebarlinktext-13'] = "USGenWeb";
> $tmp['t242_sidebarlink-14'] = "https://genealogywebtemplates.com";
> $tmp['t242_sidebarlinktext-14'] = "Genealogy Web Templates";
> $tmp['t242_sidebarlink-15'] = "https://tng.community/index.php?/forums/";
> $tmp['t242_sidebarlinktext-15'] = "TNG Forum";
> $tmp['t242_snipheadline-1'] = "Discover Our Family";
> $tmp['t242_snipimg-1'] = "img/top1.jpg";
> $tmp['t242_snipname-1'] = "Ancestor's Name";
> $tmp['t242_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t242_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t242_snipimg-2'] = "img/top2.jpg";
> $tmp['t242_snipname-2'] = "Ancestor's Name";
> $tmp['t242_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t242_sniplink-2'] = "histories/place1.php";
> $tmp['t242_snipimg-3'] = "img/top3.jpg";
> $tmp['t242_snipname-3'] = "Ancestor's Name";
> $tmp['t242_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t242_sniplink-3'] = "surnames.php";
> $tmp['t242_snipimg-4'] = "img/top4.jpg";
> $tmp['t242_snipname-4'] = "Ancestor's Name";
> $tmp['t242_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t242_sniplink-4'] = "histories/family1.php";
> $tmp['t242_snipimg-5'] = "img/top1.jpg";
> $tmp['t242_snipname-5'] = "Ancestor's Name";
> $tmp['t242_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t242_sniplink-5'] = "histories/place1.php";
> $tmp['t242_snipimg-6'] = "img/top2.jpg";
> $tmp['t242_snipname-6'] = "Ancestor's Name";
> $tmp['t242_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t242_sniplink-6'] = "histories/family2.php";
> $tmp['t242_snipimg-7'] = "img/top3.jpg";
> $tmp['t242_snipname-7'] = "Ancestor's Name";
> $tmp['t242_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t242_sniplink-7'] = "histories/story1.php";
> $tmp['t242_snipimg-8'] = "img/top4.jpg";
> $tmp['t242_snipname-8'] = "Ancestor's Name";
> $tmp['t242_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t242_sniplink-8'] = "histories/story2.php";
> $tmp['t242_topsurnames'] = "Our Top Surnames";
> $tmp['t242_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t242_author-1'] = "Mark Twain";
> $tmp['t242_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t242_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t242_quotelink-1'] = "histories/place1.php";
> $tmp['t242_author-2'] = "Howard K. Nixon";
> $tmp['t242_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t242_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t242_quotelink-2'] = "";
> $tmp['t242_author-3'] = "Jimmy Carter";
> $tmp['t242_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t242_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t242_quotelink-3'] = "";
> $tmp['t242_author-4'] = "Florence King";
> $tmp['t242_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t242_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t242_quotelink-4'] = "";
> $tmp['t242_author-5'] = "Ellen";
> $tmp['t242_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t242_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t242_quotelink-5'] = "";
> $tmp['t242_author-6'] = "Uncle Ralph";
> $tmp['t242_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t242_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t242_quotelink-6'] = "";
> $tmp['t242_footerheadline-1'] = "Quick Links";
> $tmp['t242_footerheadline-2'] = "Contact Us";
> $tmp['t242_footerlink-1'] = "suggest.php";
> $tmp['t242_footerlinktext-1'] = "Contact Us";
> $tmp['t242_footerlink-2'] = "surnames.php";
> $tmp['t242_footerlinktext-2'] = "Our Surnames";
> $tmp['t242_footerlink-3'] = "histories/story1.php";
> $tmp['t242_footerlinktext-3'] = "Our Stories";
> $tmp['t242_footerheadline-4'] = "Webmaster Message";
> $tmp['t242_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t243_maintitle'] = "Template 243";
> $tmp['t243_headsubtitle'] = "In Search of Family";
> $tmp['t243_headimg'] = "img/logo.png";
> $tmp['t243_dadperson'] = "I2";
> $tmp['t243_dadtree'] = "mytreeid";
> $tmp['t243_headerlinktext-1'] = "Holley Side";
> $tmp['t243_momperson'] = "I1";
> $tmp['t243_momtree'] = "mytreeid";
> $tmp['t243_headerlinktext-2'] = "Boardman Side";
> $tmp['t243_headerlink-3'] = "surnames.php";
> $tmp['t243_headerlinktext-3'] = "Surnames";
> $tmp['t243_headerlink-4'] = "histories/index.php";
> $tmp['t243_headerlinktext-4'] = "Histories";
> $tmp['t243_mainimage-1'] = "img/person1.jpg";
> $tmp['t243_tree-1'] = "";
> $tmp['t243_person-1'] = "";
> $tmp['t243_mainimage-2'] = "img/person2.jpg";
> $tmp['t243_tree-2'] = "";
> $tmp['t243_person-3'] = "";
> $tmp['t243_mainimage-3'] = "img/person3.jpg";
> $tmp['t243_tree-2'] = "";
> $tmp['t243_person-3'] = "";
> $tmp['t243_welcome'] = "Welcome to Our Site";
> $tmp['t243_mainimage'] = "img/man1.jpg";
> $tmp['t243_mainpara'] = "We are so happy you dropped in! We hope we can help you in your ancestor quest. If you have information to add, please don't hesitate to contact us. We're always looking for ways to increase our family tree.</p><p>All sources are documented to the best of our ability. We do not place information on our web that is a maybe it's true piece of information. If it's not documented, then we search for documentation of the facts. We use many sources of documentation, including, but not limited to census records, military records, family Bibles, cemetery records, wills and more. When we find the source information, a picture is taken of the source and added to this web. This way everyone can see what weve added and what exactly the source says.</p><p>We hope you like the new look of our web. It is from Genealogy Web Templates: . There is a nice selection of templates on the site. We worked with Darrin to create a perfectly fitted template that compliments his program. All of his functionality works perfectly and is surrounded by our styling code. Each template has its own template folder and is uploaded to the web.</p><p>Once uploaded, TNG recognizes the folder. The selection will automatically appear in the templates setting. You must have the latest version of TNG, as the coding for all of the Genealogy Web Templates has only been added to the latest version. Go to TNG for information on the latest version. Enjoy your new look! We have an html version of this template should you wish to have a seamless interface with your html site. Check out the MORE button below!";
> $tmp['t243_featuretitle-1'] = "The Chosen";
> $tmp['t243_featurepara-1'] = " We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t243_featurethumb-1'] = "img/soldier-sm.jpg";
> $tmp['t243_featurelink-1'] = "histories/place1.php";
> $tmp['t243_featurelinktext-1'] = "Ireland";
> $tmp['t243_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t243_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t243_sidebarimg-1'] = "img/family1.jpg";
> $tmp['t243_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t243_sidebarlink-1'] = "histories/place1.php";
> $tmp['t243_sidebarsub-2'] = "Events";
> $tmp['t243_sidebarimg-2'] = "img/family2.jpg";
> $tmp['t243_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t243_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t243_sidebarsub-3'] = "Pictures of Family";
> $tmp['t243_sidebarimg-3'] = "img/family3.jpg";
> $tmp['t243_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t243_sidebarlink-3'] = "";
> $tmp['t243_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t243_sidebarimg-4'] = "img/family4.jpg";
> $tmp['t243_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t243_sidebarlink-4'] = "";
> $tmp['t243_sidebarsub-5'] = "Ancestor's Name";
> $tmp['t243_sidebarimg-5'] = "img/family1.jpg";
> $tmp['t243_sidebarpara-5'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t243_sidebarlink-5'] = "histories/place1.php";
> $tmp['t243_sidebarsub-6'] = "Events";
> $tmp['t243_sidebarimg-6'] = "img/family2.jpg";
> $tmp['t243_sidebarpara-6'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t243_sidebarlink-6'] = "histories/stories2.php";
> $tmp['t243_sidebartitle-7'] = "Random Photos";
> $tmp['t243_sniptitle-1'] = "Robert D.";
> $tmp['t243_snipname-1'] = "Robert Robbins";
> $tmp['t243_snipimage-1'] = "img/snip1.jpg";
> $tmp['t243_sniptree-1'] = "I2068";
> $tmp['t243_snipperson-1'] = "";
> $tmp['t243_snipinfoone-1'] = "He and his wife had five children";
> $tmp['t243_snipinfotwo-1'] = "They were married for 50 years.";
> $tmp['t243_sniptitle-2'] = "Chelsea Turner";
> $tmp['t243_snipname-2'] = "Chelsie";
> $tmp['t243_snipimage-2'] = "img/snip2.jpg";
> $tmp['t243_sniptree-2'] = "";
> $tmp['t243_snipperson-2'] = "I492";
> $tmp['t243_snipinfoone-2'] = "Chelsie moved from Ireland in the early 1860s.";
> $tmp['t243_snipinfotwo-2'] = "Her parents soon followed.";
> $tmp['t243_sniptitle-3'] = "Martha Montgomery";
> $tmp['t243_snipname-3'] = "Martha";
> $tmp['t243_snipimage-3'] = "img/snip3.jpg";
> $tmp['t243_sniptree-3'] = "";
> $tmp['t243_snipperson-3'] = "I471";
> $tmp['t243_snipinfoone-3'] = "Martha was the daughter of James A. Montgomery.";
> $tmp['t243_snipinfotwo-3'] = "She was born in 1849 in Tennessee. She married William T. Turner in 1868.";
> $tmp['t243_sniptitle-4'] = "Emily Brown";
> $tmp['t243_snipname-4'] = "Emmie";
> $tmp['t243_snipimage-4'] = "img/snip4.jpg";
> $tmp['t243_sniptree-4'] = "";
> $tmp['t243_snipperson-4'] = "I2506";
> $tmp['t243_snipinfoone-4'] = "Born in 1847, she is the daughter of some great parents.";
> $tmp['t243_snipinfotwo-4'] = "Emily [Amelea] She married Joseph.";
> $tmp['t243_sniptitle-5'] = "Lenora Roberts";
> $tmp['t243_snipname-5'] = "Lenora";
> $tmp['t243_snipimage-5'] = "img/snip5.jpg";
> $tmp['t243_sniptree-5'] = "";
> $tmp['t243_snipperson-5'] = "I471";
> $tmp['t243_snipinfoone-5'] = "Lenora was the daughter of Thomas C. Boudreaux.";
> $tmp['t243_snipinfotwo-5'] = "She was born in 1921 in Alabama. She married Samuel Roberts in 1942.";
> $tmp['t243_sniptitle-6'] = "Emily Brown";
> $tmp['t243_snipname-6'] = "Emmie";
> $tmp['t243_snipimage-6'] = "img/snip6.jpg";
> $tmp['t243_sniptree-6'] = "";
> $tmp['t243_snipperson-6'] = "I2506";
> $tmp['t243_snipinfoone-6'] = "Born in 1849, she is the daughter of some great parents.";
> $tmp['t243_snipinfotwo-6'] = "Emily [Amelea] She married Patrick Brown.";
> $tmp['t243_featuretitle-2'] = "The Bones of My Bone";
> $tmp['t243_featurethumb-2'] = "img/family.jpg";
> $tmp['t243_featurepara-2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation.<br><br>It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are.<br><br>So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t243_featurelink-2'] = "histories/story1.php";
> $tmp['t243_featurelinktext-2'] = "Our Stories";
> $tmp['t243_author-1'] = "Mark Twain";
> $tmp['t243_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t243_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t243_quotelink-1'] = "histories/place1.php";
> $tmp['t243_author-2'] = "Howard K. Nixon";
> $tmp['t243_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t243_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t243_quotelink-2'] = "";
> $tmp['t243_author-3'] = "Jimmy Carter";
> $tmp['t243_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t243_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t243_quotelink-3'] = "";
> $tmp['t243_author-4'] = "Florence King";
> $tmp['t243_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t243_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t243_quotelink-4'] = "";
> $tmp['t243_author-5'] = "Ellen";
> $tmp['t243_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t243_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t243_quotelink-5'] = "";
> $tmp['t243_author-6'] = "Uncle Ralph";
> $tmp['t243_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t243_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t243_quotelink-6'] = "";
> $tmp['t243_featuretitle-3'] = "Our Pages";
> $tmp['t243_featuresub-3'] = "You can use this area to add your extra history or person pages.";
> $tmp['t243_link-1'] = "histories/index.php";
> $tmp['t243_linktext-1'] = "Our History Pages";
> $tmp['t243_link-2'] = "histories/story1.php";
> $tmp['t243_linktext-2'] = "Our Stories";
> $tmp['t243_link-3'] = "http://usgenweb.org";
> $tmp['t243_linktext-3'] = "USGenWeb";
> $tmp['t243_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t243_linktext-4'] = "Genealogy Web Templates";
> $tmp['t243_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t243_linktext-5'] = "TNG Forum";
> $tmp['t243_featuretitle-4'] = "About Us";
> $tmp['t243_featurepara-4'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t243_featurethumb-4'] = "img/about.jpg";
> $tmp['t243_footerheadline-1'] = "Quick Links";
> $tmp['t243_footerheadline-2'] = "Contact Us";
> $tmp['t243_footerlink-1'] = "suggest.php";
> $tmp['t243_footerlinktext-1'] = "Contact Us";
> $tmp['t243_footerlink-2'] = "surnames.php";
> $tmp['t243_footerlinktext-2'] = "Our Surnames";
> $tmp['t243_footerlink-3'] = "histories/story1.php";
> $tmp['t243_footerlinktext-3'] = "Our Stories";
> $tmp['t243_footerheadline-4'] = "Webmaster Message";
> $tmp['t243_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t244_maintitle'] = "Template 244";
> $tmp['t244_headsubtitle'] = "In Search of Our Ancestors";
> $tmp['t244_headimg'] = "img/logo.png";
> $tmp['t244_dadperson'] = "I2";
> $tmp['t244_dadtree'] = "mytreeid";
> $tmp['t244_headerlinktext-1'] = "Holley Side";
> $tmp['t244_momperson'] = "I1";
> $tmp['t244_momtree'] = "mytreeid";
> $tmp['t244_headerlinktext-2'] = "Boardman Side";
> $tmp['t244_headerlink-3'] = "surnames.php";
> $tmp['t244_headerlinktext-3'] = "Surnames";
> $tmp['t244_headerlink-4'] = "histories/index.php";
> $tmp['t244_headerlinktext-4'] = "Histories";
> $tmp['t244_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t244_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t244_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t244_slidelink-1'] = "histories/place1.php";
> $tmp['t244_slidelinktext-1'] = "Histories";
> $tmp['t244_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t244_slideheadline-2'] = "Our Smith Family";
> $tmp['t244_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.";
> $tmp['t244_slidelink-2'] = "histories/story1.php";
> $tmp['t244_slidelinktext-2'] = "Stories";
> $tmp['t244_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t244_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t244_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air' we were looking for!";
> $tmp['t244_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t244_slidelinktext-3'] = "GWT";
> $tmp['t244_welcome'] = "Welcome to Our Site";
> $tmp['t244_mainpara'] = "We are happy you stopped by to check out our website. We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates. Please stop in and check them out.</p><p>The images in the slide show as well as the saying in the slide show are easily changed. The images are sized at 1680 pixels by 600 pixels. If you need your images sized, just send them to me. I'll size them at no charge!	This template integrates beautifully with TNG! From starting your new tree to applying this tree to your current tree, we think you'll love your new look! It's as easy as using a FTP program to upload your new template. If you have trouble, we can help.";
> $tmp['t244_featuretitle-1'] = "The Chosen";
> $tmp['t244_featurepara-1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t244_featurethumb-1'] = "img/boy1.jpg";
> $tmp['t244_featurelink-1'] = "histories/story1.php";
> $tmp['t244_featurelinktext-1'] = "Mother's Side";
> $tmp['t244_featuretitle-2'] = "The Bones of My Bones";
> $tmp['t244_featurepara-2'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em> ";
> $tmp['t244_featurethumb-2'] = "img/cameo.jpg";
> $tmp['t244_featurelink-2'] = "histories/place1.php";
> $tmp['t244_featurelinktext-2'] = "Mother's Side";
> $tmp['t244_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t244_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t244_sidebartitle-1'] = "Herman Brown";
> $tmp['t244_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t244_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-1'] = "histories/family1.php";
> $tmp['t244_sidebarlinktext-1'] = "His Story";
> $tmp['t244_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t244_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t244_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-2'] = "surnames.php";
> $tmp['t244_sidebarlinktext-2'] = "See Camilla";
> $tmp['t244_sidebartitle-3'] = "Susan Smith";
> $tmp['t244_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t244_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-3'] = "";
> $tmp['t244_sidebarlinktext-3'] = "";
> $tmp['t244_sidebartitle-4'] = "Eric Martinson";
> $tmp['t244_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t244_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t244_sidebarlinktext-4'] = "See Eric";
> $tmp['t244_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t244_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t244_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-5'] = "";
> $tmp['t244_sidebarlinktext-5'] = "";
> $tmp['t244_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t244_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t244_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-6'] = "";
> $tmp['t244_sidebarlinktext-6'] = "";
> $tmp['t244_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t244_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t244_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-7'] = "";
> $tmp['t244_sidebarlinktext-7'] = "";
> $tmp['t244_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t244_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t244_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-8'] = "";
> $tmp['t244_sidebarlinktext-8'] = "";
> $tmp['t244_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t244_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t244_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-9'] = "";
> $tmp['t244_sidebarlinktext-9'] = "";
> $tmp['t244_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t244_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t244_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t244_sidebarlink-10'] = "";
> $tmp['t244_sidebarlinktext-10'] = "";
> $tmp['t244_sidebarsub-2'] = "Our Pages";
> $tmp['t244_subhead2'] = "You can use this area to add your extra history or person pages.";
> $tmp['t244_sidebarlink-11'] = "histories/index.php";
> $tmp['t244_sidebarlinktext-11'] = "Our History Pages";
> $tmp['t244_sidebarlink-12'] = "histories/story1.php";
> $tmp['t244_sidebarlinktext-12'] = "Our Stories";
> $tmp['t244_sidebarlink-13'] = "http://usgenweb.org";
> $tmp['t244_sidebarlinktext-13'] = "USGenWeb";
> $tmp['t244_sidebarlink-14'] = "https://genealogywebtemplates.com";
> $tmp['t244_sidebarlinktext-14'] = "Genealogy Web Templates";
> $tmp['t244_sidebarlink-15'] = "https://tng.community/index.php?/forums/";
> $tmp['t244_sidebarlinktext-15'] = "TNG Forum";
> $tmp['t244_sniptitle-1'] = "Lillian Martin";
> $tmp['t244_snipimage-1'] = "img/person1.jpg";
> $tmp['t244_sniptree-1'] = "";
> $tmp['t244_snipperson-1'] = "";
> $tmp['t244_snipinfoone-1'] = "This text goes with Lillian Martin. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. ";
> $tmp['t244_sniplink-1'] = "histories/index.php";
> $tmp['t244_sniplinktext-1'] = "See Lillian";
> $tmp['t244_sniptitle-2'] = "Malcom Board";
> $tmp['t244_snipimage-2'] = "img/person2.jpg";
> $tmp['t244_sniptree-2'] = "";
> $tmp['t244_snipperson-2'] = "";
> $tmp['t244_snipinfoone-2'] = "This text goes with Malcolm Board. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. ";
> $tmp['t244_sniplink-2'] = "histories/place.php";
> $tmp['t244_sniplinktext-2'] = "Ireland";
> $tmp['t244_sniptitle-3'] = "Emily and Fredrick";
> $tmp['t244_snipimage-3'] = "img/person3.jpg";
> $tmp['t244_sniptree-3'] = "";
> $tmp['t244_snipperson-3'] = "";
> $tmp['t244_snipinfoone-3'] = "This text goes with Emily and Frederick. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. ";
> $tmp['t244_sniplink-3'] = "histories/story1.php";
> $tmp['t244_sniplinktext-3'] = "See More";
> $tmp['t244_sniptitle-4'] = "Suzanne and Katherine";
> $tmp['t244_snipimage-4'] = "img/person4.jpg";
> $tmp['t244_sniptree-4'] = "";
> $tmp['t244_snipperson-4'] = "";
> $tmp['t244_snipinfoone-4'] = "This text goes with Suzanne and Katherine. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. ";
> $tmp['t244_sniplink-4'] = "histories/story2.php";
> $tmp['t244_sniplinktext-4'] = "Our Family";
> $tmp['t244_footerheadline-1'] = "Quick Links";
> $tmp['t244_footerheadline-2'] = "Contact Us";
> $tmp['t244_footerlink-1'] = "suggest.php";
> $tmp['t244_footerlinktext-1'] = "Contact Us";
> $tmp['t244_footerlink-2'] = "surnames.php";
> $tmp['t244_footerlinktext-2'] = "Our Surnames";
> $tmp['t244_footerlink-3'] = "histories/story1.php";
> $tmp['t244_footerlinktext-3'] = "Our Stories";
> $tmp['t244_footerheadline-4'] = "Webmaster Message";
> $tmp['t244_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t245_maintitle'] = "TNG Template 245";
> $tmp['t245_headsubtitle'] = "Searching for Ancestors";
> $tmp['t245_headimg'] = "img/logo.png";
> $tmp['t245_dadside'] = "His Side";
> $tmp['t245_dadperson'] = "I2";
> $tmp['t245_dadtree'] = "mytreeid";
> $tmp['t245_momside'] = "Her Side";
> $tmp['t245_momperson'] = "I1";
> $tmp['t245_momtree'] = "mytreeid";
> $tmp['t245_featurelinks'] = "Third Link, https://tngsitebuilding.com Fourth Link, https://tngsitebuilding.com/blog";
> $tmp['t245_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t245_slideheadline-1'] = "Share your ancestor's story with us. We'd love to hear it!";
> $tmp['t245_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t245_slideheadline-2'] = "Searching for clues? We hope our research helps you to find family and connect with our research";
> $tmp['t245_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t245_slideheadline-3'] = "Find information about our large family that you might not have known! We love a good story about our ancestors!";
> $tmp['t245_featuretitle-1'] = "Welcome to Our Genealogy Site";
> $tmp['t245_featurepara-1'] = "It is easy to add your welcome text here. You can tell about yourself, your research, your family tree.The images in the slide show as well as the saying in the slide show are easily changed. The images are sized at 400 pixels by 400 pixels. Although they appear round, they are each just a square image. The appearance of the image is styled by the css (Cascading Style Sheet) file. If you need your images sized, just send them to me. I'll size them at no charge!</p><p>	This template integrates beautifully with TNG! From starting your new tree to applying this tree to your current tree, we think you'll love your new look! It's as easy as using a FTP program to upload your new template. If you have trouble, we can help.</p><p>We also have the matching html template should you want a seamless interface between your family tree and the html site.";
> $tmp['t245_featurelink-1'] = "histories/story1.php";
> $tmp['t245_featurelinktext-1'] = "Our Story";
> $tmp['t245_featuretitle-2'] = "Welcome To Our Site";
> $tmp['t245_featurepara-2'] = "Welcome to our website. We hope you like our new look. We love the way the template showcases our family members. Please let us know if you like it as well. We've tried to give you plenty of space for your content and your images. We hope you find our research useful for your family. All of our sources have been documented to the best of our ability.";
> $tmp['t245_featurelink-2'] = "";
> $tmp['t245_featurelinktext-2'] = "";
> $tmp['t245_featuretitle-3'] = "The Chosen";
> $tmp['t245_featurepara-3'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t245_tree-3'] = "";
> $tmp['t245_person-3'] = "";
> $tmp['t245_featurethumb-3'] = "img/couple.jpg";
> $tmp['t245_featurelink-3'] = "histories/story1.php";
> $tmp['t245_featurelinktext-3'] = "Our Story";
> $tmp['t245_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t245_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, you will need to remove them in the index.php file.</em>";
> $tmp['t245_sidebartitle-1'] = "Herman Brown";
> $tmp['t245_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t245_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-1'] = "histories/family1.php";
> $tmp['t245_sidebarlinktext-1'] = "His Story";
> $tmp['t245_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t245_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t245_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-2'] = "surnames.php";
> $tmp['t245_sidebarlinktext-2'] = "See Camilla";
> $tmp['t245_sidebartitle-3'] = "Susan Smith";
> $tmp['t245_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t245_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-3'] = "";
> $tmp['t245_sidebarlinktext-3'] = "";
> $tmp['t245_sidebartitle-4'] = "Erik Masterson";
> $tmp['t245_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t245_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t245_sidebarlinktext-4'] = "See Erik";
> $tmp['t245_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t245_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t245_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-5'] = "";
> $tmp['t245_sidebarlinktext-5'] = "";
> $tmp['t245_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t245_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t245_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-6'] = "";
> $tmp['t245_sidebarlinktext-6'] = "";
> $tmp['t245_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t245_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t245_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-7'] = "";
> $tmp['t245_sidebarlinktext-7'] = "";
> $tmp['t245_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t245_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t245_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-8'] = "";
> $tmp['t245_sidebarlinktext-8'] = "";
> $tmp['t245_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t245_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t245_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-9'] = "";
> $tmp['t245_sidebarlinktext-9'] = "";
> $tmp['t245_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t245_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t245_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t245_sidebarlink-10'] = "";
> $tmp['t245_sidebarlinktext-10'] = "";
> $tmp['t245_snipheadline-1'] = "Our Ancestors";
> $tmp['t245_sniptitle-1'] = "Fred Smith Family";
> $tmp['t245_snipname-1'] = "Fred Smith";
> $tmp['t245_snipinfoone-1'] = "Born 1862";
> $tmp['t245_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t245_snipimage-1'] = "img/snip1.jpg";
> $tmp['t245_snipperson-1'] = "";
> $tmp['t245_sniptree-1'] = "";
> $tmp['t245_sniptitle-2'] = "Dan Jones Family";
> $tmp['t245_snipname-2'] = "Dan Jones";
> $tmp['t245_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t245_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t245_snipimage-2'] = "img/snip2.jpg";
> $tmp['t245_snipperson-2'] = "";
> $tmp['t245_sniptree-2'] = "";
> $tmp['t245_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t245_snipname-3'] = "Peter Ryan";
> $tmp['t245_snipinfoone-3'] = "Family Name";
> $tmp['t245_snipinfotwo-3'] = "Information";
> $tmp['t245_snipimage-3'] = "img/snip3.jpg";
> $tmp['t245_snipperson-3'] = "";
> $tmp['t245_sniptree-3'] = "";
> $tmp['t245_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t245_snipname-4'] = "Roy Robbins";
> $tmp['t245_snipinfoone-4'] = "Family Name";
> $tmp['t245_snipinfotwo-4'] = "Information";
> $tmp['t245_snipimage-4'] = "img/snip4.jpg";
> $tmp['t245_snipperson-4'] = "";
> $tmp['t245_sniptree-4'] = "";
> $tmp['t245_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t245_snipname-5'] = "Barry Rogers";
> $tmp['t245_snipinfoone-5'] = "Family Name";
> $tmp['t245_snipinfotwo-5'] = "Information";
> $tmp['t245_snipimage-5'] = "img/snip5.jpg";
> $tmp['t245_snipperson-5'] = "";
> $tmp['t245_sniptree-5'] = "";
> $tmp['t245_sniptitle-6'] = "Albert Ross Family";
> $tmp['t245_snipname-6'] = "Albert Ross";
> $tmp['t245_snipinfoone-6'] = "Family Name";
> $tmp['t245_snipinfotwo-6'] = "Information";
> $tmp['t245_snipimage-6'] = "img/snip6.jpg";
> $tmp['t245_snipperson-6'] = "";
> $tmp['t245_sniptree-6'] = "";
> $tmp['t245_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t245_snipname-7'] = "Alvy Boardman";
> $tmp['t245_snipinfoone-7'] = "Family Name";
> $tmp['t245_snipinfotwo-7'] = "Information";
> $tmp['t245_snipimage-7'] = "img/snip7.jpg";
> $tmp['t245_snipperson-7'] = "";
> $tmp['t245_sniptree-7'] = "";
> $tmp['t245_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t245_snipname-8'] = "Paul Johnson";
> $tmp['t245_snipinfoone-8'] = "Family Name";
> $tmp['t245_snipinfotwo-8'] = "Information";
> $tmp['t245_snipimage-8'] = "img/snip8.jpg";
> $tmp['t245_snipperson-8'] = "";
> $tmp['t245_sniptree-8'] = "";
> $tmp['t245_featuretitle-4'] = "They are the Bones of My Bones";
> $tmp['t245_featurepara-4'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. <br><br><em>by Della M. Cummings Wright, Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson, Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t245_tree-4'] = "";
> $tmp['t245_person-4'] = "";
> $tmp['t245_featurethumb-4'] = "img/soldier.jpg";
> $tmp['t245_featurelink-4'] = "histories/place1.php";
> $tmp['t245_featurelinktext-4'] = "Ireland";
> $tmp['t245_author-1'] = "Mark Twain";
> $tmp['t245_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t245_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t245_quotelink-1'] = "histories/place1.php";
> $tmp['t245_author-2'] = "Howard K. Nixon";
> $tmp['t245_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t245_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t245_quotelink-2'] = "";
> $tmp['t245_author-3'] = "Jimmy Carter";
> $tmp['t245_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t245_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t245_quotelink-3'] = "";
> $tmp['t245_author-4'] = "Florence King";
> $tmp['t245_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t245_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t245_quotelink-4'] = "";
> $tmp['t245_author-5'] = "Ellen";
> $tmp['t245_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t245_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t245_quotelink-5'] = "";
> $tmp['t245_author-6'] = "Uncle Ralph";
> $tmp['t245_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t245_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t245_quotelink-6'] = "";
> $tmp['t245_featuretitle-5'] = "Our Pages";
> $tmp['t245_featuresub-5'] = "You can use this area to add your extra history or person pages.";
> $tmp['t245_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t245_linktext-1'] = "Our History Pages";
> $tmp['t245_link-2'] = "histories/story1.php";
> $tmp['t245_linktext-2'] = "Our Stories";
> $tmp['t245_link-3'] = "https://usgenweb.org";
> $tmp['t245_linktext-3'] = "USGenWeb";
> $tmp['t245_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t245_linktext-4'] = "Genealogy Web Templates";
> $tmp['t245_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t245_linktext-5'] = "TNG Forum";
> $tmp['t245_featuretitle-6'] = "About Us";
> $tmp['t245_featurepara-6'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t245_featurethumb-6'] = "img/about.jpg";
> $tmp['t245_footerheadline-1'] = "Quick Links";
> $tmp['t245_footerheadline-2'] = "Contact Us";
> $tmp['t245_footerlink-1'] = "suggest.php";
> $tmp['t245_footerlinktext-1'] = "Contact Us";
> $tmp['t245_footerlink-2'] = "surnames.php";
> $tmp['t245_footerlinktext-2'] = "Our Surnames";
> $tmp['t245_footerlink-3'] = "histories/story1.php";
> $tmp['t245_footerlinktext-3'] = "Our Stories";
> $tmp['t245_footerheadline-4'] = "Webmaster Message";
> $tmp['t245_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t246_maintitle'] = "Template 246";
> $tmp['t246_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t246_headimg'] = "img/logo.png";
> $tmp['t246_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t246_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t246_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t246_slidelink-1'] = "histories/place1.php";
> $tmp['t246_slidelinktext-1'] = "Histories";
> $tmp['t246_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t246_slideheadline-2'] = "Our Smith Family";
> $tmp['t246_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.<br><br><br>";
> $tmp['t246_slidelink-2'] = "histories/story1.php";
> $tmp['t246_slidelinktext-2'] = "Stories";
> $tmp['t246_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t246_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t246_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br><br><br>";
> $tmp['t246_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t246_slidelinktext-3'] = "GWT";
> $tmp['t246_featuretitle-1'] = "Cemetery Information";
> $tmp['t246_featurepara-1'] = "This is text that goes with Cemetery Information. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t246_featurethumb-1'] = "img/icon1.jpg";
> $tmp['t246_featurelink-1'] = "surnames.php";
> $tmp['t246_featurelinktext-1'] = "Cemetery lists";
> $tmp['t246_featuretitle-2'] = "Ship's Manifest";
> $tmp['t246_featurepara-2'] = "This is text that goes with Ship's Manifest.The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t246_featurethumb-2'] = "img/ship.jpg";
> $tmp['t246_featurelink-2'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t246_featurelinktext-2'] = "Our Photos";
> $tmp['t246_featuretitle-3'] = "Our History";
> $tmp['t246_featurepara-3'] = "Add you text for this box.The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t246_featurethumb-3'] = "img/icon2.jpg";
> $tmp['t246_featurelink-3'] = "histories/index.php";
> $tmp['t246_featurelinktext-3'] = "Homestead";
> $tmp['t246_featuretitle-4'] = "Our Family's Journey";
> $tmp['t245_featurepara-4'] = "Welcome to our website. We hope you like our new look. We love the way the template showcases our family members. Please let us know if you like it as well. We've tried to give you plenty of space for your content and your images. We hope you find our research useful for your family. All of our sources have been documented to the best of our ability.";
> $tmp['t246_featuretitle-5'] = "The Chosen";
> $tmp['t246_featurepara-5'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. <br><br>We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. <br><br>It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t246_featurethumb-5'] = "img/boy1.jpg";
> $tmp['t246_tree-5'] = "";
> $tmp['t246_person-5'] = "";
> $tmp['t246_featurelink-5'] = "histories/place1.php";
> $tmp['t246_featurelinktext-5'] = "Ireland";
> $tmp['t246_featuretitle-6'] = "The Bones of Our Bone";
> $tmp['t246_featurepara-6'] = "It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen. The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. <br><br>It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. <br><br>It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<br><br><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t246_featurethumb-6'] = "img/family.jpg";
> $tmp['t246_tree-6'] = "";
> $tmp['t246_person-6'] = "";
> $tmp['t246_featurelink-6'] = "histories/story1.php";
> $tmp['t246_featurelinktext-6'] = "Our Stories";
> $tmp['t246_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t246_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t246_sidebartitle-1'] = "Herman Brown";
> $tmp['t246_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t246_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-1'] = "histories/family1.php";
> $tmp['t246_sidebarlinktext-1'] = "His Story";
> $tmp['t246_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t246_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t246_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-2'] = "surnames.php";
> $tmp['t246_sidebarlinktext-2'] = "See Camilla";
> $tmp['t246_sidebartitle-3'] = "Susan Smith";
> $tmp['t246_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t246_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-3'] = "";
> $tmp['t246_sidebarlinktext-3'] = "";
> $tmp['t246_sidebartitle-4'] = "Eric Martinson";
> $tmp['t246_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t246_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t246_sidebarlinktext-4'] = "See Erik";
> $tmp['t246_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t246_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t246_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-5'] = "";
> $tmp['t246_sidebarlinktext-5'] = "";
> $tmp['t246_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t246_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t246_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-6'] = "";
> $tmp['t246_sidebarlinktext-6'] = "";
> $tmp['t246_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t246_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t246_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-7'] = "";
> $tmp['t246_sidebarlinktext-7'] = "";
> $tmp['t246_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t246_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t246_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-8'] = "";
> $tmp['t246_sidebarlinktext-8'] = "";
> $tmp['t246_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t246_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t246_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-9'] = "";
> $tmp['t246_sidebarlinktext-9'] = "";
> $tmp['t246_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t246_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t246_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t246_sidebarlink-10'] = "";
> $tmp['t246_sidebarlinktext-10'] = "";
> $tmp['t246_snipheadline-1'] = "Discover Our Family";
> $tmp['t246_snipimg-1'] = "img/top1.jpg";
> $tmp['t246_snipname-1'] = "Ancestor's Name";
> $tmp['t246_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t246_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t246_snipimg-2'] = "img/top2.jpg";
> $tmp['t246_snipname-2'] = "Ancestor's Name";
> $tmp['t246_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t246_sniplink-2'] = "histories/place1.php";
> $tmp['t246_snipimg-3'] = "img/top3.jpg";
> $tmp['t246_snipname-3'] = "Ancestor's Name";
> $tmp['t246_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t246_sniplink-3'] = "surnames.php";
> $tmp['t246_snipimg-4'] = "img/top4.jpg";
> $tmp['t246_snipname-4'] = "Ancestor's Name";
> $tmp['t246_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t246_sniplink-4'] = "histories/family1.php";
> $tmp['t246_snipimg-5'] = "img/top1.jpg";
> $tmp['t246_snipname-5'] = "Ancestor's Name";
> $tmp['t246_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t246_sniplink-5'] = "histories/place1.php";
> $tmp['t246_snipimg-6'] = "img/top2.jpg";
> $tmp['t246_snipname-6'] = "Ancestor's Name";
> $tmp['t246_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t246_sniplink-6'] = "histories/family2.php";
> $tmp['t246_snipimg-7'] = "img/top3.jpg";
> $tmp['t246_snipname-7'] = "Ancestor's Name";
> $tmp['t246_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t246_sniplink-7'] = "histories/story1.php";
> $tmp['t246_snipimg-8'] = "img/top4.jpg";
> $tmp['t246_snipname-8'] = "Ancestor's Name";
> $tmp['t246_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t246_sniplink-8'] = "histories/story2.php";
> $tmp['t246_featuretitle-7'] = "Our Pages";
> $tmp['t246_featuresub-7'] = "You can use this area to add your extra history or person pages.";
> $tmp['t246_link-1'] = "histories/index.php";
> $tmp['t246_linktext-1'] = "Our History Pages";
> $tmp['t246_link-2'] = "histories/story1.php";
> $tmp['t246_linktext-2'] = "Our Stories";
> $tmp['t246_link-3'] = "https://usgenweb.org";
> $tmp['t246_linktext-3'] = "USGenWeb";
> $tmp['t246_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t246_linktext-4'] = "Genealogy Web Templates";
> $tmp['t246_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t246_linktext-5'] = "TNG Forum";
> $tmp['t246_topsurnames'] = "Top Surnames";
> $tmp['t246_textpara1'] = "This is the sentence above the Top 40 Surnames area or you can choose to make it a paragraph and remove the Surname Cloud located in the index.php file.";
> $tmp['t246_footerheadline-1'] = "Quick Links";
> $tmp['t246_footerheadline-2'] = "Contact Us";
> $tmp['t246_footerlink-1'] = "suggest.php";
> $tmp['t246_footerlinktext-1'] = "Contact Us";
> $tmp['t246_footerlink-2'] = "surnames.php";
> $tmp['t246_footerlinktext-2'] = "Our Surnames";
> $tmp['t246_footerlink-3'] = "histories/story1.php";
> $tmp['t246_footerlinktext-3'] = "Our Stories";
> $tmp['t246_footerheadline-4'] = "Webmaster Message";
> $tmp['t246_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t247_maintitle'] = "Template 247";
> $tmp['t247_headsubtitle'] = "Our Family's Journey";
> $tmp['t247_headimg'] = "img/logo.png";
> $tmp['t247_dadperson'] = "I2";
> $tmp['t247_dadtree'] = "mytreeid";
> $tmp['t247_headerlinktext-1'] = "Holley Side";
> $tmp['t247_momperson'] = "I1";
> $tmp['t247_momtree'] = "mytreeid";
> $tmp['t247_headerlinktext-2'] = "Boardman Side";
> $tmp['t247_headerlink-3'] = "surnames.php";
> $tmp['t247_headerlinktext-3'] = "Surnames";
> $tmp['t247_headerlink-4'] = "histories/index.php";
> $tmp['t247_headerlinktext-4'] = "Histories";
> $tmp['t247_welcome'] = "Welcome";
> $tmp['t247_texttitle1'] = "If you have any contributions you'd like to add, please contact me.";
> $tmp['t247_headline-1'] = "Surnames";
> $tmp['t247_link-5'] = "surnames.php";
> $tmp['t247_headline-2'] = "Photos";
> $tmp['t247_link-6'] = "browsemedia.php?mediatypeID=photos";
> $tmp['t247_headline-3'] = "What's New";
> $tmp['t247_link-7'] = "whatsnew.php";
> $tmp['t247_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t247_slideheadline-1'] = "We love sharing our ancestor's story.";
> $tmp['t247_slidetext-1'] = "We hope that you will find the information you are looking for.";
> $tmp['t247_slidelink-1'] = "histories/place1.php";
> $tmp['t247_slidelinktext-1'] = "Histories";
> $tmp['t247_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t247_slideheadline-2'] = "It's hard to imagine all of the hardships they went through.";
> $tmp['t247_slidetext-2'] = "We've been most fortunate to find many Irish deeds, births, deaths and marriage records.<br>";
> $tmp['t247_slidelink-2'] = "histories/story1.php";
> $tmp['t247_slidelinktext-2'] = "Stories";
> $tmp['t247_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t247_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t247_slidetext-3'] = "We hope they would look down and be proud of us!<br>";
> $tmp['t247_slidelink-3'] = "histories/index.php";
> $tmp['t247_slidelinktext-3'] = "Our Family";
> $tmp['t247_featuretitle-1'] = "Welcome to our work of love!";
> $tmp['t247_featurepara-1'] = "We are so pleased you dropped in! Please let us know if you have any additional information to add, as we are always looking! The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t247_featuretitle-2'] = "The Chosen";
> $tmp['t247_featurethumb-2'] = "img/topleft.jpg";
> $tmp['t247_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t247_featurelink-2'] = "surnames.php";
> $tmp['t247_featurelinktext-2'] = "Our Family";
> $tmp['t247_snipheadline-1'] = "Our Ancestors";
> $tmp['t247_sniptitle-1'] = "Fred Smith Family";
> $tmp['t247_snipname-1'] = "Fred Smith";
> $tmp['t247_snipinfoone-1'] = "Born 1862";
> $tmp['t247_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t247_snipimage-1'] = "img/snip1.jpg";
> $tmp['t247_snipperson-1'] = "";
> $tmp['t247_sniptree-1'] = "";
> $tmp['t247_sniptitle-2'] = "Dan Jones Family";
> $tmp['t247_snipname-2'] = "Dan Jones";
> $tmp['t247_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t247_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t247_snipimage-2'] = "img/snip2.jpg";
> $tmp['t247_snipperson-2'] = "";
> $tmp['t247_sniptree-2'] = "";
> $tmp['t247_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t247_snipname-3'] = "Peter Ryan";
> $tmp['t247_snipinfoone-3'] = "Family Name";
> $tmp['t247_snipinfotwo-3'] = "Information";
> $tmp['t247_snipimage-3'] = "img/snip3.jpg";
> $tmp['t247_snipperson-3'] = "";
> $tmp['t247_sniptree-3'] = "";
> $tmp['t247_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t247_snipname-4'] = "Roy Robbins";
> $tmp['t247_snipinfoone-4'] = "Family Name";
> $tmp['t247_snipinfotwo-4'] = "Information";
> $tmp['t247_snipimage-4'] = "img/snip4.jpg";
> $tmp['t247_snipperson-4'] = "";
> $tmp['t247_sniptree-4'] = "";
> $tmp['t247_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t247_snipname-5'] = "Barry Rogers";
> $tmp['t247_snipinfoone-5'] = "Family Name";
> $tmp['t247_snipinfotwo-5'] = "Information";
> $tmp['t247_snipimage-5'] = "img/snip5.jpg";
> $tmp['t247_snipperson-5'] = "";
> $tmp['t247_sniptree-5'] = "";
> $tmp['t247_sniptitle-6'] = "Albert Ross Family";
> $tmp['t247_snipname-6'] = "Albert Ross";
> $tmp['t247_snipinfoone-6'] = "Family Name";
> $tmp['t247_snipinfotwo-6'] = "Information";
> $tmp['t247_snipimage-6'] = "img/snip6.jpg";
> $tmp['t247_snipperson-6'] = "";
> $tmp['t247_sniptree-6'] = "";
> $tmp['t247_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t247_snipname-7'] = "Alvy Boardman";
> $tmp['t247_snipinfoone-7'] = "Family Name";
> $tmp['t247_snipinfotwo-7'] = "Information";
> $tmp['t247_snipimage-7'] = "img/snip7.jpg";
> $tmp['t247_snipperson-7'] = "";
> $tmp['t247_sniptree-7'] = "";
> $tmp['t247_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t247_snipname-8'] = "Paul Johnson";
> $tmp['t247_snipinfoone-8'] = "Family Name";
> $tmp['t247_snipinfotwo-8'] = "Information";
> $tmp['t247_snipimage-8'] = "img/snip8.jpg";
> $tmp['t247_snipperson-8'] = "";
> $tmp['t247_sniptree-8'] = "";
> $tmp['t247_featuretitle-3'] = "Bones of My Bones";
> $tmp['t247_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.<br>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t247_featurethumb-3'] = "img/album.jpg";
> $tmp['t247_featurelink-3'] = "";
> $tmp['t247_featurelink-3'] = "surnames.php";
> $tmp['t247_featurelinktext-3'] = "Our Family";
> $tmp['t247_featuretitle-4'] = "Bourgeois Family";
> $tmp['t247_featurethumb-4'] = "img/icon1.jpg";
> $tmp['t247_featurepara-4'] = "We are so excited to have found this side of our family. Joseph Bourgeois was born in St. Charles Parish, LA in 1736.";
> $tmp['t247_featurelink-4'] = "history/story1.php";
> $tmp['t247_featurelinktext-4'] = "Joseph";
> $tmp['t247_featuretitle-5'] = "Boudreaux Family";
> $tmp['t247_featurethumb-5'] = "img/ship.jpg";
> $tmp['t247_featurepara-5'] = "It was great fun to see our family's journey to Louisiana on one of the seven original ships bound for New Orleans.";
> $tmp['t247_featurelink-5'] = "https://genealogywebtemplates.com";
> $tmp['t247_featurelinktext-5'] = "GWT";
> $tmp['t247_featuretitle-6'] = "Our Research";
> $tmp['t247_featurethumb-6'] = "img/icon3.jpg";
> $tmp['t247_featurepara-6'] = "Finding the old ship's manifest with our ancestors' names was just thrilling. Love to find new information!";
> $tmp['t247_featurelink-6'] = "surnames.php";
> $tmp['t247_featurelinktext-6'] = "Surnames";
> $tmp['t247_sidebartitle-1'] = "Our Pages";
> $tmp['t247_sidebarsub-1'] = "You can use this area to add your extra history or person pages.";
> $tmp['t247_sidebarlink-1'] = "histories/index.php";
> $tmp['t247_sidebarlinktext-1'] = "Our History Pages";
> $tmp['t247_sidebarlink-2'] = "histories/story1.php";
> $tmp['t247_sidebarlinktext-2'] = "Our Stories";
> $tmp['t247_sidebarlink-3'] = "http://usgenweb.org";
> $tmp['t247_sidebarlinktext-3'] = "USGenWeb";
> $tmp['t247_sidebarlink-4'] = "https://genealogywebtemplates.com";
> $tmp['t247_sidebarlinktext-4'] = "Genealogy Web Templates";
> $tmp['t247_sidebarlink-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t247_sidebarlinktext-5'] = "TNG Forum";
> $tmp['t247_topsurnames'] = "Our Top Surnames";
> $tmp['t247_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t247_footerheadline-1'] = "Quick Links";
> $tmp['t247_footerheadline-2'] = "Contact Us";
> $tmp['t247_footerlink-1'] = "suggest.php";
> $tmp['t247_footerlinktext-1'] = "Contact Us";
> $tmp['t247_footerlink-2'] = "surnames.php";
> $tmp['t247_footerlinktext-2'] = "Our Surnames";
> $tmp['t247_footerlink-3'] = "histories/story1.php";
> $tmp['t247_footerlinktext-3'] = "Our Stories";
> $tmp['t247_footerheadline-4'] = "Webmaster Message";
> $tmp['t247_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t248_maintitle'] = "Template 248";
> $tmp['t248_headsubtitle'] = "Searching for Ancestors";
> $tmp['t248_headimg'] = "img/logo.png";
> $tmp['t248_dadside'] = "His Side";
> $tmp['t248_dadperson'] = "I2";
> $tmp['t248_dadtree'] = "mytreeid";
> $tmp['t248_momside'] = "Her Side";
> $tmp['t248_momperson'] = "I1";
> $tmp['t248_momtree'] = "mytreeid";
> $tmp['t248_featurelinks'] = "TNG, https://tngsitebuilding.com GWT, https://genealogywebtemplates.com";
> $tmp['t248_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t248_slideheadline-1'] = "Share your ancestor's story";
> $tmp['t248_slidetext-1'] = "Love the stories and facts";
> $tmp['t248_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t248_slideheadline-2'] = "Searching for clues?";
> $tmp['t248_slidetext-2'] = "Find answers here";
> $tmp['t248_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t248_slideheadline-3'] = "Picture of family you never knew";
> $tmp['t248_slidetext-3'] = "Enjoy our pictures";
> $tmp['t248_featuretitle-1'] = "Welcome to Our Site!";
> $tmp['t248_featuresub-1'] = "We are happy that you dropped in! We have quite a few names in our Boudreaux - Bourgeois family. This is the centered text.";
> $tmp['t248_featurepara-1'] = "This is the left aligned text: The images in the slide show as well as the saying in the slide show are easily changed. The images must be sized at 300 pixels by 300 pixels. If you need your images sized, just send them to me. I'll size them at no charge!utton below.</p><p> This is formatted exactly like the paragraph above. This template integrates beautifully with TNG! From starting your new tree to applying this tree to your current tree, we think you'll love your new look!";
> $tmp['t248_mainpara-1'] = "The last paragraph is ALWAYS in italics. You don't have to do anything for this paragraph to show up in italics! Just start typing!";
> $tmp['t248_featuretitle-2'] = "Template 248";
> $tmp['t248_featurepara-2'] = "We were excited to learn that one of our ancestors was on one of the original ships sailing from France to the port of New Orleans. Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud.";
> $tmp['t248_featuretitle-3'] = "The Chosen";
> $tmp['t248_featurepara-3'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t248_featurethumb-3'] = "img/sideimg1.jpg";
> $tmp['t248_featurelink-3'] = "histories/family1.php";
> $tmp['t248_featurelinktext-3'] = "See Camilla";
> $tmp['t248_featuretitle-4'] = "The Bones of My Bones";
> $tmp['t248_featurepara-4'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t248_featurethumb-4'] = "img/sideimg.jpg";
> $tmp['t248_featurelink-4'] = "histories/story1.php";
> $tmp['t248_featurelinktext-4'] = "Stories";
> $tmp['t248_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t248_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t248_sidebartitle-1'] = "Herman Brown";
> $tmp['t248_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t248_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-1'] = "histories/family1.php";
> $tmp['t248_sidebarlinktext-1'] = "His Story";
> $tmp['t248_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t248_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t248_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-2'] = "surnames.php";
> $tmp['t248_sidebarlinktext-2'] = "See Camilla";
> $tmp['t248_sidebartitle-3'] = "Susan Smith";
> $tmp['t248_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t248_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-3'] = "";
> $tmp['t248_sidebarlinktext-3'] = "";
> $tmp['t248_sidebartitle-4'] = "Eric Martinson";
> $tmp['t248_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t248_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t248_sidebarlinktext-4'] = "See Erik";
> $tmp['t248_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t248_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t248_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-5'] = "";
> $tmp['t248_sidebarlinktext-5'] = "";
> $tmp['t248_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t248_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t248_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-6'] = "";
> $tmp['t248_sidebarlinktext-6'] = "";
> $tmp['t248_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t248_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t248_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-7'] = "";
> $tmp['t248_sidebarlinktext-7'] = "";
> $tmp['t248_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t248_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t248_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-8'] = "";
> $tmp['t248_sidebarlinktext-8'] = "";
> $tmp['t248_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t248_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t248_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-9'] = "";
> $tmp['t248_sidebarlinktext-9'] = "";
> $tmp['t248_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t248_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t248_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t248_sidebarlink-10'] = "";
> $tmp['t248_sidebarlinktext-10'] = "";
> $tmp['t248_snipheadline-1'] = "Our Ancestors";
> $tmp['t248_sniptitle-1'] = "Fred Smith Family";
> $tmp['t248_snipname-1'] = "Fred Smith";
> $tmp['t248_snipinfoone-1'] = "Born 1862";
> $tmp['t248_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t248_snipimage-1'] = "img/snip1.jpg";
> $tmp['t248_snipperson-1'] = "";
> $tmp['t248_sniptree-1'] = "";
> $tmp['t248_sniptitle-2'] = "Dan Jones Family";
> $tmp['t248_snipname-2'] = "Dan Jones";
> $tmp['t248_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t248_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t248_snipimage-2'] = "img/snip2.jpg";
> $tmp['t248_snipperson-2'] = "";
> $tmp['t248_sniptree-2'] = "";
> $tmp['t248_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t248_snipname-3'] = "Peter Ryan";
> $tmp['t248_snipinfoone-3'] = "Family Name";
> $tmp['t248_snipinfotwo-3'] = "Information";
> $tmp['t248_snipimage-3'] = "img/snip3.jpg";
> $tmp['t248_snipperson-3'] = "";
> $tmp['t248_sniptree-3'] = "";
> $tmp['t248_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t248_snipname-4'] = "Roy Robbins";
> $tmp['t248_snipinfoone-4'] = "Family Name";
> $tmp['t248_snipinfotwo-4'] = "Information";
> $tmp['t248_snipimage-4'] = "img/snip4.jpg";
> $tmp['t248_snipperson-4'] = "";
> $tmp['t248_sniptree-4'] = "";
> $tmp['t248_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t248_snipname-5'] = "Barry Rogers";
> $tmp['t248_snipinfoone-5'] = "Family Name";
> $tmp['t248_snipinfotwo-5'] = "Information";
> $tmp['t248_snipimage-5'] = "img/snip5.jpg";
> $tmp['t248_snipperson-5'] = "";
> $tmp['t248_sniptree-5'] = "";
> $tmp['t248_sniptitle-6'] = "Albert Ross Family";
> $tmp['t248_snipname-6'] = "Albert Ross";
> $tmp['t248_snipinfoone-6'] = "Family Name";
> $tmp['t248_snipinfotwo-6'] = "Information";
> $tmp['t248_snipimage-6'] = "img/snip6.jpg";
> $tmp['t248_snipperson-6'] = "";
> $tmp['t248_sniptree-6'] = "";
> $tmp['t248_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t248_snipname-7'] = "Alvy Boardman";
> $tmp['t248_snipinfoone-7'] = "Family Name";
> $tmp['t248_snipinfotwo-7'] = "Information";
> $tmp['t248_snipimage-7'] = "img/snip7.jpg";
> $tmp['t248_snipperson-7'] = "";
> $tmp['t248_sniptree-7'] = "";
> $tmp['t248_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t248_snipname-8'] = "Paul Johnson";
> $tmp['t248_snipinfoone-8'] = "Family Name";
> $tmp['t248_snipinfotwo-8'] = "Information";
> $tmp['t248_snipimage-8'] = "img/snip8.jpg";
> $tmp['t248_snipperson-8'] = "";
> $tmp['t248_sniptree-8'] = "";
> $tmp['t248_featuretitle-5'] = "Our Photos";
> $tmp['t248_featurepara-5'] = "Below are our random photos. If you do not wish this photo box to appear, you can delete it in the index.php and use this area as a text area.";
> $tmp['t248_featuretitle-6'] = "Our Pages";
> $tmp['t248_featuresub-6'] = "You can use this area to add your extra history or person pages.";
> $tmp['t248_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t248_linktext-1'] = "Our History Pages";
> $tmp['t248_link-2'] = "histories/story1.php";
> $tmp['t248_linktext-2'] = "Our Stories";
> $tmp['t248_link-3'] = "https://usgenweb.org";
> $tmp['t248_linktext-3'] = "USGenWeb";
> $tmp['t248_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t248_linktext-4'] = "Genealogy Web Templates";
> $tmp['t248_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t248_linktext-5'] = "TNG Forum";
> $tmp['t248_featuretitle-7'] = "About Us";
> $tmp['t248_featurepara-7'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t248_featurethumb-7'] = "img/about.jpg";
> $tmp['t248_footerheadline-1'] = "Quick Links";
> $tmp['t248_footerheadline-2'] = "Contact Us";
> $tmp['t248_footerlink-1'] = "suggest.php";
> $tmp['t248_footerlinktext-1'] = "Contact Us";
> $tmp['t248_footerlink-2'] = "surnames.php";
> $tmp['t248_footerlinktext-2'] = "Our Surnames";
> $tmp['t248_footerlink-3'] = "histories/story1.php";
> $tmp['t248_footerlinktext-3'] = "Our Stories";
> $tmp['t248_footerheadline-4'] = "Webmaster Message";
> $tmp['t248_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t249_maintitle'] = "Template 249";
> $tmp['t249_headsubtitle'] = "Searching for Ancestors";
> $tmp['t249_headimg'] = "img/logo.png";
> $tmp['t249_sniptitle-1'] = "Claire Grace";
> $tmp['t249_snipperson-1'] = "I2506";
> $tmp['t249_sniptree-1'] = "";
> $tmp['t249_snipimage-1'] = "img/top1.jpg";
> $tmp['t249_sniptitle-2'] = "Lillian Martin";
> $tmp['t249_snipperson-2'] = "I471";
> $tmp['t249_sniptree-2'] = "";
> $tmp['t249_snipimage-2'] = "img/top2.jpg";
> $tmp['t249_slidetitle-1'] = "Share your ancestor's story";
> $tmp['t249_slidetext-1'] = "Researchers live for stories and facts";
> $tmp['t249_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t249_slidetitle-2'] = "Searching for clues?";
> $tmp['t249_slidetext-2'] = "We hope you can find answers here";
> $tmp['t249_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t249_slidetitle-3'] = "Find picture of family you never knew";
> $tmp['t249_slidetext-3'] = "Enjoy our pictures and if you have pictures, please share them with us";
> $tmp['t249_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t249_sniptitle-3'] = "Martha Shall";
> $tmp['t249_snipperson-3'] = "I237";
> $tmp['t249_sniptree-3'] = "";
> $tmp['t249_snipimage-3'] = "img/top3.jpg";
> $tmp['t249_sniptitle-4'] = "Fred Smith";
> $tmp['t249_snipperson-4'] = "I1479";
> $tmp['t249_sniptree-4'] = "";
> $tmp['t249_snipimage-4'] = "img/top4.jpg";
> $tmp['t249_welcome'] = "Template 249";
> $tmp['t249_textpara1'] = "Welcome to our website. We hope you like our new look. We love the way the template showcases our family members. Please let us know if you like it as well. We've tried to give you plenty of space for your content and your images.<br>We hope you find our research useful for your family. All of our sources have been documented to the best of our ability. <br><br>We also have the matching html template should you want a seamless interface between your family tree and the html site. Check out the MORE button below.";
> $tmp['t249_featuretitle-1'] = "The Chosen";
> $tmp['t249_person-1'] = "I471 ";
> $tmp['t249_tree-1'] = "";
> $tmp['t249_featurethumb-1'] = "img/album.jpg";
> $tmp['t249_featurepara-1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t249_featurelink-1'] = "histories/index.php";
> $tmp['t249_featurelinktext-1'] = "Our History";
> $tmp['t249_featuretitle-2'] = "The Bones of My Bone";
> $tmp['t249_person-2'] = "I2508";
> $tmp['t249_tree-2'] = "";
> $tmp['t249_featurethumb-2'] = "img/book.jpg";
> $tmp['t249_featurepara-2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do.";
> $tmp['t249_featurelink-2'] = "histories/story1.php";
> $tmp['t249_featurelinktext-2'] = "Our Story";
> $tmp['t249_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t249_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t249_sidebarimg-1'] = "img/family1.jpg";
> $tmp['t249_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t249_sidebarlink-1'] = "histories/place1.php";
> $tmp['t249_sidebarsub-2'] = "Events";
> $tmp['t249_sidebarimg-2'] = "img/family2.jpg";
> $tmp['t249_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t249_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t249_sidebarsub-3'] = "Pictures of Family";
> $tmp['t249_sidebarimg-3'] = "img/family3.jpg";
> $tmp['t249_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t249_sidebarlink-3'] = "";
> $tmp['t249_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t249_sidebarimg-4'] = "img/family4.jpg";
> $tmp['t249_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t249_sidebarlink-4'] = "";
> $tmp['t249_featuretitle-3'] = "With Love and Caring";
> $tmp['t249_featurepara-3'] = "With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t249_featurelink-3'] = "histories/story1.php";
> $tmp['t249_featurelinktext-3'] = "Our Story";
> $tmp['t249_snipheadline-5'] = "Our Ancestors Speak Volumes";
> $tmp['t249_snipimg-5'] = "img/top1.jpg";
> $tmp['t249_snipname-5'] = "Ancestor's Name";
> $tmp['t249_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t249_sniplink-5'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t249_snipimg-6'] = "img/top2.jpg";
> $tmp['t249_snipname-6'] = "Ancestor's Name";
> $tmp['t249_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t249_sniplink-6'] = "histories/place1.php";
> $tmp['t249_snipimg-7'] = "img/top3.jpg";
> $tmp['t249_snipname-7'] = "Ancestor's Name";
> $tmp['t249_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t249_sniplink-7'] = "surnames.php";
> $tmp['t249_snipimg-8'] = "img/top4.jpg";
> $tmp['t249_snipname-8'] = "Ancestor's Name";
> $tmp['t249_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t249_sniplink-8'] = "histories/family1.php";
> $tmp['t249_snipheadline-9'] = "Our Mother's Side";
> $tmp['t249_snipimg-9'] = "img/top1.jpg";
> $tmp['t249_snipname-9'] = "Ancestor's Name";
> $tmp['t249_snipinfoone-9'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t249_sniplink-9'] = "histories/place1.php";
> $tmp['t249_snipimg-10'] = "img/top2.jpg";
> $tmp['t249_snipname-10'] = "Ancestor's Name";
> $tmp['t249_snipinfoone-10'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t249_sniplink-10'] = "histories/family2.php";
> $tmp['t249_snipimg-11'] = "img/top3.jpg";
> $tmp['t249_snipname-11'] = "Ancestor's Name";
> $tmp['t249_snipinfoone-11'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t249_sniplink-11'] = "histories/story1.php";
> $tmp['t249_snipimg-12'] = "img/top4.jpg";
> $tmp['t249_snipname-12'] = "Ancestor's Name";
> $tmp['t249_snipinfoone-12'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t249_sniplink-12'] = "histories/story2.php";
> $tmp['t249_featuretitle-4'] = "Our Photos";
> $tmp['t249_featurepara-4'] = "If you would rather just have a text area here, just delete the coding for Random Photo in the index.php page.";
> $tmp['t249_featuretitle-5'] = "Our Pages";
> $tmp['t249_featurepara-5'] = "You can use this area to add your extra history or person pages.";
> $tmp['t249_link-5'] = "histories/index.php";
> $tmp['t249_linktext-5'] = "Our History Pages";
> $tmp['t249_link-6'] = "histories/story1.php";
> $tmp['t249_linktext-6'] = "Our Stories";
> $tmp['t249_link-7'] = "https://usgenweb.org";
> $tmp['t249_linktext-7'] = "USGenWeb";
> $tmp['t249_link-8'] = "https://genealogywebtemplates.com";
> $tmp['t249_linktext-8'] = "Genealogy Web Templates";
> $tmp['t249_link-9'] = "https://tng.community/index.php?/forums/";
> $tmp['t249_linktext-9'] = "TNG Forum";
> $tmp['t249_featuretitle-6'] = "About Us";
> $tmp['t249_featurepara-6'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t249_featurethumb-6'] = "img/about.jpg";
> $tmp['t249_footerheadline-1'] = "Quick Links";
> $tmp['t249_footerheadline-2'] = "Contact Us";
> $tmp['t249_footerlink-1'] = "suggest.php";
> $tmp['t249_footerlinktext-1'] = "Contact Us";
> $tmp['t249_footerlink-2'] = "surnames.php";
> $tmp['t249_footerlinktext-2'] = "Our Surnames";
> $tmp['t249_footerlink-3'] = "histories/story1.php";
> $tmp['t249_footerlinktext-3'] = "Our Stories";
> $tmp['t249_footerheadline-4'] = "Webmaster Message";
> $tmp['t249_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t250_dadperson'] = "I2";
> $tmp['t250_dadtree'] = "mytreeid";
> $tmp['t250_linktext-1'] = "Holley Side";
> $tmp['t250_momperson'] = "I1";
> $tmp['t250_momtree'] = "mytreeid";
> $tmp['t250_linktext-2'] = "Boardman Side";
> $tmp['t250_link-3'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t250_linktext-3'] = "Histories";
> $tmp['t250_link-4'] = "surnames.php";
> $tmp['t250_linktext-4'] = "Surnames";
> $tmp['t250_headimg'] = "img/logo.png";
> $tmp['t250_maintitle'] = "Template 250";
> $tmp['t250_headsubtitle'] = "We are into our ancestors!";
> $tmp['t250_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t250_slideheadline-1'] = "Finding our ancestors is exciting!";
> $tmp['t250_slidetext-1'] = "We hope we help you find your spot in our family.";
> $tmp['t250_slidelink-1'] = "histories/place1.php";
> $tmp['t250_slidelinktext-1'] = "Histories";
> $tmp['t250_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t250_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t250_slidetext-2'] = "If you find something we don't have, please share with us.<br>";
> $tmp['t250_slidelink-2'] = "histories/story1.php";
> $tmp['t250_slidelinktext-2'] = "Stories";
> $tmp['t250_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t250_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t250_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br>";
> $tmp['t250_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t250_slidelinktext-3'] = "GWT";
> $tmp['t250_featuretitle-1'] = "Welcome to our genealogy site!";
> $tmp['t250_featurepara-1'] = "The following text is filler text. You will use your text here. Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. </p><p>In atsvulpate velt esse meleste at semper manet sola.Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t250_featurelink-1'] = "";
> $tmp['t250_featurelinktext-1'] = "";
> $tmp['t250_featuretitle-2'] = "The Chosen";
> $tmp['t250_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family, you would be proud of us. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t250_featurethumb-2'] = "img/wagon.jpg";
> $tmp['t250_featurelink-2'] = "histories/place1.php";
> $tmp['t250_featurelinktext-2'] = "See More";
> $tmp['t250_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t250_featurethumb-3'] = "img/familyphotos.jpg";
> $tmp['t250_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. <em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t250_featurelink-3'] = "histories/place1.php";
> $tmp['t250_featurelinktext-3'] = "Mother's Side";
> $tmp['t250_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t250_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t250_sidebartitle-1'] = "Herman Brown";
> $tmp['t250_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t250_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-1'] = "histories/family1.php";
> $tmp['t250_sidebarlinktext-1'] = "His Story";
> $tmp['t250_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t250_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t250_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-2'] = "surnames.php";
> $tmp['t250_sidebarlinktext-2'] = "See Camilla";
> $tmp['t250_sidebartitle-3'] = "Susan Smith";
> $tmp['t250_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t250_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-3'] = "";
> $tmp['t250_sidebarlinktext-3'] = "";
> $tmp['t250_sidebartitle-4'] = "Erik Martinson";
> $tmp['t250_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t250_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t250_sidebarlinktext-4'] = "See Erik";
> $tmp['t250_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t250_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t250_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-5'] = "";
> $tmp['t250_sidebarlinktext-5'] = "";
> $tmp['t250_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t250_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t250_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-6'] = "";
> $tmp['t250_sidebarlinktext-6'] = "";
> $tmp['t250_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t250_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t250_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-7'] = "";
> $tmp['t250_sidebarlinktext-7'] = "";
> $tmp['t250_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t250_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t250_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-8'] = "";
> $tmp['t250_sidebarlinktext-8'] = "";
> $tmp['t250_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t250_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t250_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-9'] = "";
> $tmp['t250_sidebarlinktext-9'] = "";
> $tmp['t250_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t250_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t250_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t250_sidebarlink-10'] = "";
> $tmp['t250_sidebarlinktext-10'] = "";
> $tmp['t250_sidebarsub-2'] = "Our Pages";
> $tmp['t250_subhead2'] = "You can use this area to add your extra history or person pages.";
> $tmp['t250_sidebarlink-11'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t250_sidebarlinktext-11'] = "Our History Pages";
> $tmp['t250_sidebarlink-12'] = "histories/story1.php";
> $tmp['t250_sidebarlinktext-12'] = "Our Stories";
> $tmp['t250_sidebarlink-13'] = "https://usgenweb.org";
> $tmp['t250_sidebarlinktext-13'] = "USGenWeb";
> $tmp['t250_sidebarlink-14'] = "https://genealogywebtemplates.com";
> $tmp['t250_sidebarlinktext-14'] = "Genealogy Web Templates";
> $tmp['t250_sidebarlink-15'] = "https://tng.community/index.php?/forums/";
> $tmp['t250_sidebarlinktext-15'] = "TNG Forum";
> $tmp['t250_snipheadline-1'] = "Discover Our Family";
> $tmp['t250_snipimg-1'] = "img/top1.jpg";
> $tmp['t250_snipname-1'] = "Ancestor's Name";
> $tmp['t250_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t250_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t250_snipimg-2'] = "img/top2.jpg";
> $tmp['t250_snipname-2'] = "Ancestor's Name";
> $tmp['t250_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t250_sniplink-2'] = "histories/place1.php";
> $tmp['t250_snipimg-3'] = "img/top3.jpg";
> $tmp['t250_snipname-3'] = "Ancestor's Name";
> $tmp['t250_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t250_sniplink-3'] = "surnames.php";
> $tmp['t250_snipimg-4'] = "img/top4.jpg";
> $tmp['t250_snipname-4'] = "Ancestor's Name";
> $tmp['t250_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t250_sniplink-4'] = "histories/family1.php";
> $tmp['t250_snipimg-5'] = "img/top1.jpg";
> $tmp['t250_snipname-5'] = "Ancestor's Name";
> $tmp['t250_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t250_sniplink-5'] = "histories/place1.php";
> $tmp['t250_snipimg-6'] = "img/top2.jpg";
> $tmp['t250_snipname-6'] = "Ancestor's Name";
> $tmp['t250_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t250_sniplink-6'] = "histories/family2.php";
> $tmp['t250_snipimg-7'] = "img/top3.jpg";
> $tmp['t250_snipname-7'] = "Ancestor's Name";
> $tmp['t250_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t250_sniplink-7'] = "histories/story1.php";
> $tmp['t250_snipimg-8'] = "img/top4.jpg";
> $tmp['t250_snipname-8'] = "Ancestor's Name";
> $tmp['t250_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t250_sniplink-8'] = "histories/story2.php";
> $tmp['t250_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t250_author-1'] = "Mark Twain";
> $tmp['t250_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t250_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t250_quotelink-1'] = "histories/place1.php";
> $tmp['t250_author-2'] = "Howard K. Nixon";
> $tmp['t250_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t250_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t250_quotelink-2'] = "";
> $tmp['t250_author-3'] = "Jimmy Carter";
> $tmp['t250_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t250_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t250_quotelink-3'] = "";
> $tmp['t250_author-4'] = "Florence King";
> $tmp['t250_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t250_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t250_quotelink-4'] = "";
> $tmp['t250_author-5'] = "Ellen";
> $tmp['t250_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t250_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t250_quotelink-5'] = "";
> $tmp['t250_author-6'] = "Uncle Ralph";
> $tmp['t250_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t250_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t250_quotelink-6'] = "";
> $tmp['t250_topsurnames'] = "Our Top Surnames";
> $tmp['t250_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t250_footerheadline-1'] = "Quick Links";
> $tmp['t250_footerheadline-2'] = "Contact Us";
> $tmp['t250_footerlink-1'] = "suggest.php";
> $tmp['t250_footerlinktext-1'] = "Contact Us";
> $tmp['t250_footerlink-2'] = "surnames.php";
> $tmp['t250_footerlinktext-2'] = "Our Surnames";
> $tmp['t250_footerlink-3'] = "histories/story1.php";
> $tmp['t250_footerlinktext-3'] = "Our Stories";
> $tmp['t250_footerheadline-4'] = "Webmaster Message";
> $tmp['t250_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t251_headimg'] = "img/logo.png";
> $tmp['t251_maintitle'] = "Template 251";
> $tmp['t251_headsubtitle'] = "Following Our Ancestors Journeys";
> $tmp['t251_headline-1'] = "Tracing our family's history";
> $tmp['t251_subhead-1'] = "Through time";
> $tmp['t251_featuretitle-1'] = "Welcome to our site!";
> $tmp['t251_featurethumb-1'] = "img/topsection1.jpg";
> $tmp['t251_featuresub-1'] = "We Are Happy You Dropped By!";
> $tmp['t251_featurepara-1'] = "We are so excited that you found our site! We hope you enjoy our family tree information. We hope you can find new information on your family. We strive to document all of our sources. We are happy you stopped by to check out our website. We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates. Please stop in and check them out. The image in the parallax background is easily changed, or if you like the current image, you can use it. The image is sized at 1600 pixels by 945 pixels. If you need your images sized, just send them to me. I'll size them at no charge! This template integrates beautifully with TNG! From starting your new tree to applying this tree to your current tree, we think you'll love your new look! It's as easy as using a FTP program to upload your new template. If you have trouble, we can help. If you have trouble, we can help.<br><br>We also have a matching HTML template. Using it with your TNG site gives you a seamless interface between your family tree and the html template. Check it out on the More link.";
> $tmp['t251_featurelink-1'] = 'https://genealogywebtemplates.com/webs/gwt251/index.html';
> $tmp['t251_featurelinktext-1'] = "Our History";
> $tmp['t251_featuretitle-2'] = "The Chosen";
> $tmp['t251_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. It goes to seeing a cemetery about to be lost forever to weeds and indifference and saying - I can't let this happen.";
> $tmp['t251_featurethumb-2'] = 'img/wagon.jpg';
> $tmp['t251_featurelink-2'] = 'browsemedia.php?mediatypeID=histories.php';
> $tmp['t251_featurelinktext-2'] = "Our Stories";
> $tmp['t251_snipheadline-1'] = "Our Family";
> $tmp['t251_sniptitle-1'] = "Fred Smith Family";
> $tmp['t251_snipname-1'] = "Fred Smith";
> $tmp['t251_snipinfoone-1'] = "Born 1862";
> $tmp['t251_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t251_snipimage-1'] = "img/snip1.jpg";
> $tmp['t251_snipperson-1'] = "";
> $tmp['t251_sniptree-1'] = "";
> $tmp['t251_sniptitle-2'] = "Dan Jones Family";
> $tmp['t251_snipname-2'] = "Dan Jones";
> $tmp['t251_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t251_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t251_snipimage-2'] = "img/snip2.jpg";
> $tmp['t251_snipperson-2'] = "";
> $tmp['t251_sniptree-2'] = "";
> $tmp['t251_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t251_snipname-3'] = "Peter Ryan";
> $tmp['t251_snipinfoone-3'] = "Family Name";
> $tmp['t251_snipinfotwo-3'] = "Information";
> $tmp['t251_snipimage-3'] = "img/snip3.jpg";
> $tmp['t251_snipperson-3'] = "";
> $tmp['t251_sniptree-3'] = "";
> $tmp['t251_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t251_snipname-4'] = "Roy Robbins";
> $tmp['t251_snipinfoone-4'] = "Family Name";
> $tmp['t251_snipinfotwo-4'] = "Information";
> $tmp['t251_snipimage-4'] = "img/snip4.jpg";
> $tmp['t251_snipperson-4'] = "";
> $tmp['t251_sniptree-4'] = "";
> $tmp['t251_featuretitle-3'] = "Our Mother's Side";
> $tmp['t251_featurepara-3'] = "This text is filler text. You would replace it with your text. You can choose your topic and title. Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum. ";
> $tmp['t251_featurelink-3'] = "histories/place1.php";
> $tmp['t251_featurelinktext-3'] = "Mother's Story";
> $tmp['t251_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t251_snipname-5'] = "Barry Rogers";
> $tmp['t251_snipinfoone-5'] = "Family Name";
> $tmp['t251_snipinfotwo-5'] = "Information";
> $tmp['t251_snipimage-5'] = "img/snip5.jpg";
> $tmp['t251_snipperson-5'] = "";
> $tmp['t251_sniptree-5'] = "";
> $tmp['t251_sniptitle-6'] = "Albert Ross Family";
> $tmp['t251_snipname-6'] = "Albert Ross";
> $tmp['t251_snipinfoone-6'] = "Family Name";
> $tmp['t251_snipinfotwo-6'] = "Information";
> $tmp['t251_snipimage-6'] = "img/snip6.jpg";
> $tmp['t251_snipperson-6'] = "";
> $tmp['t251_sniptree-6'] = "";
> $tmp['t251_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t251_snipname-7'] = "Alvy Boardman";
> $tmp['t251_snipinfoone-7'] = "Family Name";
> $tmp['t251_snipinfotwo-7'] = "Information";
> $tmp['t251_snipimage-7'] = "img/snip7.jpg";
> $tmp['t251_snipperson-7'] = "";
> $tmp['t251_sniptree-7'] = "";
> $tmp['t251_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t251_snipname-8'] = "Paul Johnson";
> $tmp['t251_snipinfoone-8'] = "Family Name";
> $tmp['t251_snipinfotwo-8'] = "Information";
> $tmp['t251_snipimage-8'] = "img/snip8.jpg";
> $tmp['t251_snipperson-8'] = "";
> $tmp['t251_sniptree-8'] = "";
> $tmp['t251_featuretitle-4'] = 'The bones of my bone';
> $tmp['t251_featurepara-4'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.";
> $tmp['t251_featurelink-4'] = "histories/place1.php";
> $tmp['t251_featurelinktext-4'] = "The Homeplace";
> $tmp['t251_author-1'] = "Mark Twain";
> $tmp['t251_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t251_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t251_quotelink-1'] = "histories/place1.php";
> $tmp['t251_author-2'] = "Howard K. Nixon";
> $tmp['t251_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t251_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t251_quotelink-2'] = "";
> $tmp['t251_author-3'] = "Jimmy Carter";
> $tmp['t251_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t251_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t251_quotelink-3'] = "";
> $tmp['t251_author-4'] = "Florence King";
> $tmp['t251_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t251_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t251_quotelink-4'] = "";
> $tmp['t251_author-5'] = "Ellen";
> $tmp['t251_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t251_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t251_quotelink-5'] = "";
> $tmp['t251_author-6'] = "Uncle Ralph";
> $tmp['t251_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t251_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t251_quotelink-6'] = "";
> $tmp['t251_featuretitle-5'] = "Our Pages";
> $tmp['t251_featuresub-5'] = "You can use this area to add your extra history or person pages.";
> $tmp['t251_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t251_linktext-1'] = "Our History Pages";
> $tmp['t251_link-2'] = "histories/story1.php";
> $tmp['t251_linktext-2'] = "Our Stories";
> $tmp['t251_link-3'] = "https://usgenweb.org";
> $tmp['t251_linktext-3'] = "USGenWeb";
> $tmp['t251_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t251_linktext-4'] = "Genealogy Web Templates";
> $tmp['t251_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t251_linktext-5'] = "TNG Forum";
> $tmp['t251_featuretitle-6'] = "About Us";
> $tmp['t251_featurepara-6'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t251_featurethumb-6'] = "img/about.jpg";
> $tmp['t251_footerheadline-1'] = "Quick Links";
> $tmp['t251_footerheadline-2'] = "Contact Us";
> $tmp['t251_footerlink-1'] = "suggest.php";
> $tmp['t251_footerlinktext-1'] = "Contact Us";
> $tmp['t251_footerlink-2'] = "surnames.php";
> $tmp['t251_footerlinktext-2'] = "Our Surnames";
> $tmp['t251_footerlink-3'] = "histories/story1.php";
> $tmp['t251_footerlinktext-3'] = "Our Stories";
> $tmp['t251_footerheadline-4'] = "Webmaster Message";
> $tmp['t251_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t252_maintitle'] = "Template 252";
> $tmp['t252_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t252_headimg'] = "img/logo.png";
> $tmp['t252_dadperson'] = "I2";
> $tmp['t252_dadtree'] = "mytreeid";
> $tmp['t252_headerlinktext-1'] = "Holley Side";
> $tmp['t252_momperson'] = "I1";
> $tmp['t252_momtree'] = "mytreeid";
> $tmp['t252_headerlinktext-2'] = "Boardman Side";
> $tmp['t252_headerlink-3'] = "surnames.php";
> $tmp['t252_headerlinktext-3'] = "Surnames";
> $tmp['t252_headerlink-4'] = "histories/index.php";
> $tmp['t252_headerlinktext-4'] = "Histories";
> $tmp['t252_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t252_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t252_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t252_slidelink-1'] = "histories/place1.php";
> $tmp['t252_slidelinktext-1'] = "Histories";
> $tmp['t252_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t252_slideheadline-2'] = "Our Smith Family";
> $tmp['t252_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.";
> $tmp['t252_slidelink-2'] = "histories/story1.php";
> $tmp['t252_slidelinktext-2'] = "Stories";
> $tmp['t252_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t252_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t252_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air' we were looking for!";
> $tmp['t252_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t252_slidelinktext-3'] = "GWT";
> $tmp['t252_welcome'] = "Welcome to our site!";
> $tmp['t252_featuresub-1'] = "We Are Happy You Dropped By!";
> $tmp['t252_featurethumb-1'] = "img/topsection1.jpg";
> $tmp['t252_featurepara-1'] = "We are so excited that you found our site! We hope you enjoy our family tree information. We hope you can find new information on your family. We strive to document all of our sources. We are happy you stopped by to check out our website.</p><p>We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates. Please stop in and check them out. The image in the parallax background is easily changed, or if you like the current image, you can use it. The image is sized at 1600 pixels by 945 pixels.</p><p>The image to the left is 350 pixels 445 pixels. I wouldn't recommend using any larger image than this, although you can easily use a smaller one. When I saw this image, I just loved it, so I had to find a place to use her! She isn't a family member, but it just didn't matter!</p><p>If you need your images sized for the homepage, just send them to me. I'll size them at no charge! </p><p>Thanks again,</p><p><em>Marsha</em>";
> $tmp['t252_featurelink-1'] = "surnames.php";
> $tmp['t252_featurelinktext-1'] = "See More";
> $tmp['t252_featuretitle-2'] = "Our Families";
> $tmp['t252_featuretitle-3'] = "Featured Articles";
> $tmp['t252_featurethumb-3'] = "img/place4.jpg";
> $tmp['t252_featurepara-3'] = "This cemetery is one of the oldest in the city. Many of our family members are buried there as early at 1868. Add information here about this cemetery. Where is the place located? Who lived there? What other details are interesting";
> $tmp['t252_featurelinktext-3'] = "Greenwood Cemetery";
> $tmp['t252_featurelink-3'] = "histories/story1.php";
> $tmp['t252_featurethumb-4'] = "img/place3.jpg";
> $tmp['t252_featurepara-4'] = "This old store and post office was used by many in the town. Great grandfather, Samuel was the first postmaster. Add information here about this general store. Where is the place located? Who lived there? What other details are interesting";
> $tmp['t252_featurelinktext-4'] = "General Store";
> $tmp['t252_featurelink-4'] = "histories/place1.php";
> $tmp['t252_featurethumb-5'] = "img/place1.jpg";
> $tmp['t252_featurepara-5'] = "Family Reunion for our huge Smith family is coming up! Mark your calendar now for June 28-30. Where is the place located? Who is the contact person? What do we need to bring? Add important information here about this fabulous event.";
> $tmp['t252_featurelinktext-5'] = "Family Reunion";
> $tmp['t252_featurelink-5'] = "histories/place1.php";
> $tmp['t252_featurethumb-6'] = "img/place2.jpg";
> $tmp['t252_featurepara-6'] = "Join us for the celebration of marriage of these two wonderful people. The wedding and reception will be held in this lovely venu. Add information here about this event. Where is the place located? Lodging information for out of town visitors.";
> $tmp['t252_featurelinktext-6'] = "Tony and Tina's Wedding";
> $tmp['t252_featurelink-6'] = "histories/place2.php";
> $tmp['t252_featuretitle-7'] = "Featured Ancestors";
> $tmp['t252_featurethumb-7'] = "img/family1.jpg";
> $tmp['t252_featurepara-7'] = "This paragraph is about Ancestor 1. To add this person's page to the link, navigate to the page, copy the link and then paste it in the link field on the template settings page. Add details in order to have this person come alive!";
> $tmp['t252_featurelinktext-7'] = "Ancestor 1";
> $tmp['t252_featurelink-7'] = "histories/family1.php";
> $tmp['t252_featurethumb-8'] = "img/family2.jpg";
> $tmp['t252_featurepara-8'] = "This paragraph is about Ancestor 2. Add information here about this person or couple. Add interesting details about his or her life. Where were they born? Who were their parents? Did they have siblings? Add details in order to have this person come alive!";
> $tmp['t252_featurelinktext-8'] = "Ancestor 2";
> $tmp['t252_featurelink-8'] = "histories/family2.php";
> $tmp['t252_featurethumb-9'] = "img/family3.jpg";
> $tmp['t252_featurepara-9'] = "This paragraph is about Ancestor 3. Add information here about this person or couple. Add interesting details about his or her life. Where were they born? Who were their parents? Did they have siblings? Add details in order to have this person come alive!";
> $tmp['t252_featurelinktext-9'] = "Ancestor 3";
> $tmp['t252_featurelink-9'] = "histories/family3.php";
> $tmp['t252_featurethumb-10'] = "img/family4.jpg";
> $tmp['t252_featurepara-10'] = "This paragraph is about Ancestor 4. Add information here about this person or couple. Add interesting details about his or her life. Where were they born? Who were their parents? Did they have siblings? Add details in order to have this person come alive!";
> $tmp['t252_featurelinktext-10'] = "Ancestor 4";
> $tmp['t252_featurelink-10'] = "histories/story1.php";
> $tmp['t252_snipheadline-1'] = "Our Family";
> $tmp['t252_sniptitle-1'] = "Fred Smith";
> $tmp['t252_snipname-1'] = "Fred Smith";
> $tmp['t252_snipinfoone-1'] = "Born 1862";
> $tmp['t252_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t252_snipimage-1'] = "img/snip1.jpg";
> $tmp['t252_snipperson-1'] = "";
> $tmp['t252_sniptree-1'] = "";
> $tmp['t252_sniptitle-2'] = "Dan Jones";
> $tmp['t252_snipname-2'] = "Dan Jones";
> $tmp['t252_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t252_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t252_snipimage-2'] = "img/snip2.jpg";
> $tmp['t252_snipperson-2'] = "";
> $tmp['t252_sniptree-2'] = "";
> $tmp['t252_sniptitle-3'] = "Peter Ryan";
> $tmp['t252_snipname-3'] = "Peter Ryan";
> $tmp['t252_snipinfoone-3'] = "Family Name";
> $tmp['t252_snipinfotwo-3'] = "Information";
> $tmp['t252_snipimage-3'] = "img/snip3.jpg";
> $tmp['t252_snipperson-3'] = "";
> $tmp['t252_sniptree-3'] = "";
> $tmp['t252_sniptitle-4'] = "Roy Robbins";
> $tmp['t252_snipname-4'] = "Roy Robbins";
> $tmp['t252_snipinfoone-4'] = "Family Name";
> $tmp['t252_snipinfotwo-4'] = "Information";
> $tmp['t252_snipimage-4'] = "img/snip4.jpg";
> $tmp['t252_snipperson-4'] = "";
> $tmp['t252_sniptree-4'] = "";
> $tmp['t252_sniptitle-5'] = "Barry Rogers";
> $tmp['t252_snipname-5'] = "Barry Rogers";
> $tmp['t252_snipinfoone-5'] = "Family Name";
> $tmp['t252_snipinfotwo-5'] = "Information";
> $tmp['t252_snipimage-5'] = "img/snip5.jpg";
> $tmp['t252_snipperson-5'] = "";
> $tmp['t252_sniptree-5'] = "";
> $tmp['t252_sniptitle-6'] = "Albert Ross";
> $tmp['t252_snipname-6'] = "Albert Ross";
> $tmp['t252_snipinfoone-6'] = "Family Name";
> $tmp['t252_snipinfotwo-6'] = "Information";
> $tmp['t252_snipimage-6'] = "img/snip6.jpg";
> $tmp['t252_snipperson-6'] = "";
> $tmp['t252_sniptree-6'] = "";
> $tmp['t252_sniptitle-7'] = "Alvy Boardman";
> $tmp['t252_snipname-7'] = "Alvy Boardman";
> $tmp['t252_snipinfoone-7'] = "Family Name";
> $tmp['t252_snipinfotwo-7'] = "Information";
> $tmp['t252_snipimage-7'] = "img/snip7.jpg";
> $tmp['t252_snipperson-7'] = "";
> $tmp['t252_sniptree-7'] = "";
> $tmp['t252_sniptitle-8'] = "Paul Johnson";
> $tmp['t252_snipname-8'] = "Paul Johnson";
> $tmp['t252_snipinfoone-8'] = "Family Name";
> $tmp['t252_snipinfotwo-8'] = "Information";
> $tmp['t252_snipimage-8'] = "img/snip8.jpg";
> $tmp['t252_snipperson-8'] = "";
> $tmp['t252_sniptree-8'] = "";
> $tmp['t252_featuretitle-11'] = "The Chosen";
> $tmp['t252_featurepara-11'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t252_featurethumb-11'] = "img/wagon.jpg";
> $tmp['t252_featurelink-11'] = "histories/family3.php";
> $tmp['t252_featurelinktext-11'] = "See More";
> $tmp['t252_featuretitle-12'] = "Our Pages";
> $tmp['t252_featurepara-12'] = "You can use this area to add extra links to places, people or add external links.";
> $tmp['t252_link-1'] = "histories/home.php";
> $tmp['t252_linktext-1'] = "Our History Pages";
> $tmp['t252_link-2'] = "surnames.php";
> $tmp['t252_linktext-2'] = "Surnames";
> $tmp['t252_link-3'] = "histories/story1.php";
> $tmp['t252_linktext-3'] = "Our Stories";
> $tmp['t252_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t252_linktext-4'] = "Genealogy Web Templates";
> $tmp['t252_link-5'] = "https://www.tngsitebuilding.com/";
> $tmp['t252_linktext-5'] = "The Next Generation of Genealogy Sitebuilding";
> $tmp['t252_featuretitle-13'] = "Our Photos";
> $tmp['t252_featurepara-13'] = "If you would rather just have a text area here, just delete the coding for Random Photo in the index.php page.";
> $tmp['t252_topsurnames'] = "Top 30 Surnames";
> $tmp['t252_textpara1'] = "If you would rather have a paragraph than the surnames cloud, you can remove it in the index.php. And use this line for your text.";
> $tmp['t252_footerheadline-1'] = "Quick Links";
> $tmp['t252_footerheadline-2'] = "Contact Us";
> $tmp['t252_footerlink-1'] = "suggest.php";
> $tmp['t252_footerlinktext-1'] = "Contact Us";
> $tmp['t252_footerlink-2'] = "surnames.php";
> $tmp['t252_footerlinktext-2'] = "Our Surnames";
> $tmp['t252_footerlink-3'] = "histories/story1.php";
> $tmp['t252_footerlinktext-3'] = "Our Stories";
> $tmp['t252_footerheadline-4'] = "Webmaster Message";
> $tmp['t252_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t253_headimg'] = "img/logo.png";
> $tmp['t253_maintitle'] = "Template 253";
> $tmp['t253_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t253_dadside'] = "His Side";
> $tmp['t253_dadperson'] = "I2";
> $tmp['t253_dadtree'] = "mytreeid";
> $tmp['t253_momside'] = "Her Side";
> $tmp['t253_momperson'] = "I1";
> $tmp['t253_momtree'] = "mytreeid";
> $tmp['t253_featurelinks'] = "TNG, https://www.tngsitebuilding.com";
> $tmp['t253_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t253_slideheadline-1'] = "Finding our ancestors is exciting!";
> $tmp['t253_slidetext-1'] = "We hope we help you find your spot in our family.";
> $tmp['t253_slidelink-1'] = "histories/place1.php";
> $tmp['t253_slidelinktext-1'] = "Histories";
> $tmp['t253_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t253_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t253_slidetext-2'] = "If you find something we don't have, please share with us.<br>";
> $tmp['t253_slidelink-2'] = "histories/story1.php";
> $tmp['t253_slidelinktext-2'] = "Stories";
> $tmp['t253_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t253_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t253_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br>";
> $tmp['t253_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t253_slidelinktext-3'] = "GWT";
> $tmp['t253_featuretitle-1'] = "Welcome to our genealogy site!";
> $tmp['t253_featurepara-1'] = "The following text is filler text. You will use your text here. Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. </p><p>In atsvulpate velt esse meleste at semper manet sola.Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t253_featuretitle-2'] = "The Chosen";
> $tmp['t253_featurethumb-2'] = "img/woman3.jpg";
> $tmp['t253_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t253_featurelink-2'] = "surnames.php";
> $tmp['t253_featurelinktext-3'] = "Our Surnames";
> $tmp['t253_snipheadline-1'] = "Discover Our Family";
> $tmp['t253_snipimg-1'] = "img/top1.jpg";
> $tmp['t253_snipname-1'] = "Ancestor's Name";
> $tmp['t253_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t253_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t253_snipimg-2'] = "img/top2.jpg";
> $tmp['t253_snipname-2'] = "Ancestor's Name";
> $tmp['t253_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t253_sniplink-2'] = "histories/place1.php";
> $tmp['t253_snipimg-3'] = "img/top3.jpg";
> $tmp['t253_snipname-3'] = "Ancestor's Name";
> $tmp['t253_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t253_sniplink-3'] = "surnames.php";
> $tmp['t253_snipimg-4'] = "img/top4.jpg";
> $tmp['t253_snipname-4'] = "Ancestor's Name";
> $tmp['t253_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t253_sniplink-4'] = "histories/family1.php";
> $tmp['t253_snipimg-5'] = "img/top1.jpg";
> $tmp['t253_snipname-5'] = "Ancestor's Name";
> $tmp['t253_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t253_sniplink-5'] = "histories/place1.php";
> $tmp['t253_snipimg-6'] = "img/top2.jpg";
> $tmp['t253_snipname-6'] = "Ancestor's Name";
> $tmp['t253_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t253_sniplink-6'] = "histories/top3.php";
> $tmp['t253_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t253_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t253_sidebartitle-1'] = "Herman Brown";
> $tmp['t253_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t253_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-1'] = "histories/family1.php";
> $tmp['t253_sidebarlinktext-1'] = "His Story";
> $tmp['t253_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t253_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t253_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-2'] = "surnames.php";
> $tmp['t253_sidebarlinktext-2'] = "See Camilla";
> $tmp['t253_sidebartitle-3'] = "Susan Smith";
> $tmp['t253_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t253_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-3'] = "";
> $tmp['t253_sidebarlinktext-3'] = "";
> $tmp['t253_sidebartitle-4'] = "Erik Masterson";
> $tmp['t253_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t253_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t253_sidebarlinktext-4'] = "See Erik";
> $tmp['t253_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t253_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t253_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-5'] = "";
> $tmp['t253_sidebarlinktext-5'] = "";
> $tmp['t253_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t253_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t253_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-6'] = "";
> $tmp['t253_sidebarlinktext-6'] = "";
> $tmp['t253_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t253_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t253_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-7'] = "";
> $tmp['t253_sidebarlinktext-7'] = "";
> $tmp['t253_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t253_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t253_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-8'] = "";
> $tmp['t253_sidebarlinktext-8'] = "";
> $tmp['t253_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t253_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t253_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-9'] = "";
> $tmp['t253_sidebarlinktext-9'] = "";
> $tmp['t253_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t253_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t253_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t253_sidebarlink-10'] = "";
> $tmp['t253_sidebarlinktext-10'] = "";
> $tmp['t253_featuretitle-3'] = "The Bones of My Bones";
> $tmp['t253_featurethumb-3'] = "img/family1.jpg";
> $tmp['t253_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. 'It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.'<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t253_featurelink-3'] = "";
> $tmp['t253_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t253_author-1'] = "Mark Twain";
> $tmp['t253_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t253_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t253_quotelink-1'] = "histories/place1.php";
> $tmp['t253_author-2'] = "Howard K. Nixon";
> $tmp['t253_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t253_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t253_quotelink-2'] = "";
> $tmp['t253_author-3'] = "Jimmy Carter";
> $tmp['t253_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t253_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t253_quotelink-3'] = "";
> $tmp['t253_author-4'] = "Florence King";
> $tmp['t253_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t253_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t253_quotelink-4'] = "";
> $tmp['t253_author-5'] = "Ellen";
> $tmp['t253_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t253_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t253_quotelink-5'] = "";
> $tmp['t253_author-6'] = "Uncle Ralph";
> $tmp['t253_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t253_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t253_quotelink-6'] = "";
> $tmp['t253_featuretitle-4'] = "Our Photos";
> $tmp['t253_featurepara-4'] = "If you would rather just have a text area here, just delete the coding for Random Photo in the index.php page.";
> $tmp['t253_featuretitle-5'] = "Our Pages";
> $tmp['t253_featurepara-5'] = "You can use this area to add your extra history or person pages.";
> $tmp['t253_link-5'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t253_linktext-5'] = "Our History Pages";
> $tmp['t253_link-6'] = "histories/story1.php";
> $tmp['t253_linktext-6'] = "Our Stories";
> $tmp['t253_link-7'] = "https://usgenweb.org";
> $tmp['t253_linktext-7'] = "USGenWeb";
> $tmp['t253_link-8'] = "https://genealogywebtemplates.com";
> $tmp['t253_linktext-8'] = "Genealogy Web Templates";
> $tmp['t253_link-9'] = "https://tng.community/index.php?/forums/";
> $tmp['t253_linktext-9'] = "TNG Forum";
> $tmp['t253_topsurnames'] = "Our Top Surnames";
> $tmp['t253_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t253_footerheadline-1'] = "Quick Links";
> $tmp['t253_footerheadline-2'] = "Contact Us";
> $tmp['t253_footerlink-1'] = "suggest.php";
> $tmp['t253_footerlinktext-1'] = "Contact Us";
> $tmp['t253_footerlink-2'] = "surnames.php";
> $tmp['t253_footerlinktext-2'] = "Our Surnames";
> $tmp['t253_footerlink-3'] = "histories/story1.php";
> $tmp['t253_footerlinktext-3'] = "Our Stories";
> $tmp['t253_footerheadline-4'] = "Webmaster Message";
> $tmp['t253_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t254_dadside'] = "His Side | ";
> $tmp['t254_dadperson'] = "I2";
> $tmp['t254_dadtree'] = "mytreeid";
> $tmp['t254_momside'] = "Her Side | ";
> $tmp['t254_momperson'] = "I1";
> $tmp['t254_momtree'] = "mytreeid";
> $tmp['t254_featurelinks'] = "| TNG, https://tngsitebuilding.com, | GWT, https://genealogywebtemplates.com/";
> $tmp['t254_headimg'] = "img/logo.png";
> $tmp['t254_maintitle'] = "Template 254";
> $tmp['t254_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t254_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t254_slideheadline-1'] = "Welcome to our genealogy site!";
> $tmp['t254_slidetext-1'] = "We are very happy you dropped by. We hope that you will find the information you are looking for. We strive to document all of our sources, so the information you find here is the most accurate we can find.";
> $tmp['t254_slidelink-1'] = "histories/place1.php";
> $tmp['t254_slidelinktext-1'] = "Histories";
> $tmp['t254_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t254_slideheadline-2'] = "Our Smith Family";
> $tmp['t254_slidetext-2'] = "Our Smith family dates from Ireland in the early 1600s. We've been most fortunate to find many Irish deeds, births, deaths and marriage records.<br><br><br>";
> $tmp['t254_slidelink-2'] = "histories/story1.php";
> $tmp['t254_slidelinktext-2'] = "Stories";
> $tmp['t254_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t254_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t254_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br><br><br>";
> $tmp['t254_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t254_slidelinktext-3'] = "GWT";
> $tmp['t254_featuretitle-1'] = "Welcome to our site!";
> $tmp['t254_featurepara-1'] = "The following text is filler text. You will use your text here. Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. </p><p>In atsvulpate velt esse meleste at semper manet sola.Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t254_featuretitle-2'] = "The Chosen";
> $tmp['t254_featurethumb-2'] = "img/topleft.jpg";
> $tmp['t254_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t254_featurelink-2'] = "surnames.php";
> $tmp['t254_featurelinktext-2'] = "Our Surnames";
> $tmp['t254_snipheadline-1'] = "Father's Side";
> $tmp['t254_sniptitle-1'] = "Fred Smith";
> $tmp['t254_snipname-1'] = "Fredrick Smith";
> $tmp['t254_snipinfoone-1'] = "Born 1862";
> $tmp['t254_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t254_snipimage-1'] = "img/snip1.jpg";
> $tmp['t254_snipperson-1'] = "";
> $tmp['t254_sniptree-1'] = "";
> $tmp['t254_sniptitle-2'] = "Dan Jones";
> $tmp['t254_snipname-2'] = "Daniel Jones";
> $tmp['t254_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t254_snipinfotwo-2'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t254_snipimage-2'] = "img/snip2.jpg";
> $tmp['t254_snipperson-2'] = "";
> $tmp['t254_sniptree-2'] = "";
> $tmp['t254_sniptitle-3'] = "Peter Ryan";
> $tmp['t254_snipname-3'] = "Peter C. Ryan";
> $tmp['t254_snipinfoone-3'] = "Information";
> $tmp['t254_snipinfotwo-3'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t254_snipperson-3'] = "";
> $tmp['t254_snipimage-3'] = "img/snip3.jpg";
> $tmp['t254_sniptree-3'] = "";
> $tmp['t254_sniptitle-4'] = "Roy Robbins";
> $tmp['t254_snipname-4'] = "Roy B. Robbins";
> $tmp['t254_snipinfoone-4'] = "Information";
> $tmp['t254_snipinfotwo-4'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t254_snipimage-4'] = "img/snip4.jpg";
> $tmp['t254_snipperson-4'] = "";
> $tmp['t254_sniptree-4'] = "";
> $tmp['t254_featuretitle-3'] = "The Bones of My Bones";
> $tmp['t254_featurethumb-3'] = "img/family1.jpg";
> $tmp['t254_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"\<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t254_featurelink-3'] = "histories/story1.php";
> $tmp['t254_featurelinktext-3'] = "Father's Story";
> $tmp['t254_snipheadline-2'] = "Mother's Side";
> $tmp['t254_sniptitle-5'] = "Barry Rogers";
> $tmp['t254_snipname-5'] = "Barry M. Rogers";
> $tmp['t254_snipinfoone-5'] = "Information";
> $tmp['t254_snipinfotwo-5'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t254_snipimage-5'] = "img/snip5.jpg";
> $tmp['t254_snipperson-5'] = "";
> $tmp['t254_sniptree-5'] = "";
> $tmp['t254_sniptitle-6'] = "Albert Ross";
> $tmp['t254_snipname-6'] = "Albert D. Ross";
> $tmp['t254_snipinfoone-6'] = "Information";
> $tmp['t254_snipinfotwo-6'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t254_snipimage-6'] = "img/snip6.jpg";
> $tmp['t254_snipperson-6'] = "";
> $tmp['t254_sniptree-6'] = "";
> $tmp['t254_sniptitle-7'] = "Alvy Boardman";
> $tmp['t254_snipname-7'] = "Alvy C. Boardman";
> $tmp['t254_snipinfoone-7'] = "Information";
> $tmp['t254_snipinfotwo-7'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t254_snipimage-7'] = "img/snip7.jpg";
> $tmp['t254_snipperson-7'] = "";
> $tmp['t254_sniptree-7'] = "";
> $tmp['t254_sniptitle-8'] = "Paul Johnson ";
> $tmp['t254_snipname-8'] = "Paul D. Johnson";
> $tmp['t254_snipinfoone-8'] = "Information";
> $tmp['t254_snipinfotwo-8'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t254_snipimage-8'] = "img/snip8.jpg";
> $tmp['t254_snipperson-8'] = "";
> $tmp['t254_sniptree-8'] = "";
> $tmp['t254_featuretitle-4'] = "Choices";
> $tmp['t254_featurepara-4'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.  Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris. ";
> $tmp['t254_featurelink-4'] = "histories/story2.php";
> $tmp['t254_featurelinktext-4'] = "Mother's Story";
> $tmp['t254_author-1'] = "Mark Twain";
> $tmp['t254_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t254_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t254_quotelink-1'] = "histories/place1.php";
> $tmp['t254_author-2'] = "Howard K. Nixon";
> $tmp['t254_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t254_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t254_quotelink-2'] = "";
> $tmp['t254_author-3'] = "Jimmy Carter";
> $tmp['t254_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t254_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t254_quotelink-3'] = "";
> $tmp['t254_author-4'] = "Florence King";
> $tmp['t254_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t254_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t254_quotelink-4'] = "";
> $tmp['t254_author-5'] = "Ellen";
> $tmp['t254_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t254_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t254_quotelink-5'] = "";
> $tmp['t254_author-6'] = "Uncle Ralph";
> $tmp['t254_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t254_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t254_quotelink-6'] = "";
> $tmp['t254_featuretitle-5'] = "Our Pages";
> $tmp['t254_featurepara-5'] = "You can use this area to add your extra history or person pages.";
> $tmp['t254_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t254_linktext-1'] = "Our History Pages";
> $tmp['t254_link-2'] = "histories/story1.php";
> $tmp['t254_linktext-2'] = "Our Stories";
> $tmp['t254_link-3'] = "https://usgenweb.org";
> $tmp['t254_linktext-3'] = "USGenWeb";
> $tmp['t254_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t254_linktext-4'] = "Genealogy Web Templates";
> $tmp['t254_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t254_linktext-5'] = "TNG Forum";
> $tmp['t254_featuretitle-6'] = "About Us";
> $tmp['t254_featurepara-6'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t254_featurethumb-6'] = "img/about.jpg";
> $tmp['t254_footerheadline-1'] = "Quick Links";
> $tmp['t254_footerheadline-2'] = "Contact Us";
> $tmp['t254_footerlink-1'] = "suggest.php";
> $tmp['t254_footerlinktext-1'] = "Contact Us";
> $tmp['t254_footerlink-2'] = "surnames.php";
> $tmp['t254_footerlinktext-2'] = "Our Surnames";
> $tmp['t254_footerlink-3'] = "histories/story1.php";
> $tmp['t254_footerlinktext-3'] = "Our Stories";
> $tmp['t254_footerheadline-4'] = "Webmaster Message";
> $tmp['t254_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t255_maintitle'] = "Template 255";
> $tmp['t255_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t255_headimg'] = "img/logo.png";
> $tmp['t255_snipname-1'] = "Robert Robbins";
> $tmp['t255_snipperson-1'] = "";
> $tmp['t255_sniptree-1'] = "";
> $tmp['t255_snipimage-1'] = "img/top1.jpg";
> $tmp['t255_snipinfoone-1'] = "Born 1862. He married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t255_sniplink-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t255_snipname-2'] = "Charlotte Turner";
> $tmp['t255_snipperson-2'] = "";
> $tmp['t255_sniptree-2'] = "";
> $tmp['t255_snipimage-2'] = "img/top2.jpg";
> $tmp['t255_snipinfoone-2'] = "Immigrated from Ireland when she was 16 years old with her parents, Joseph and Elisa.";
> $tmp['t255_sniplink-2'] = "";
> $tmp['t255_snipname-3'] = "Christina Martin";
> $tmp['t255_snipperson-3'] = "";
> $tmp['t255_sniptree-3'] = "";
> $tmp['t255_snipimage-3'] = "img/top3.jpg";
> $tmp['t255_snipinfoone-3'] = "Christina married Samuel Matthews. She died a few weeks after her third child was born.";
> $tmp['t255_sniplink-3'] = "";
> $tmp['t255_snipname-4'] = "Samuel Matthews";
> $tmp['t255_snipperson-4'] = "";
> $tmp['t255_sniptree-4'] = "";
> $tmp['t255_snipimage-4'] = "img/top4.jpg";
> $tmp['t255_snipinfoone-4'] = "Samuel, born 1867, married Christina Matthews. He is the son of Frederick and Suzanne Matthews.";
> $tmp['t255_sniplink-4'] = "";
> $tmp['t255_featuretitle-1'] = "Welcome To Our Site";
> $tmp['t255_featurepara-1'] = "This genealogy template gives you great sections to place not only your written content about your ancestors, but also gives you many places to add pictures and events. We hope you enjoy it! This is filler text. Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum. ";
> $tmp['t255_featuretitle-2'] = "Events";
> $tmp['t255_featurethumb-2'] = "img/family1.jpg";
> $tmp['t255_featuresub-2'] = "Family Reunion";
> $tmp['t255_featurepara-2'] = "Nov. 3 at 3:00 pm. <br>Community Center<br>Your City, Your State";
> $tmp['t255_featurelink-2'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t255_featurelinktext-2'] = "Event Schedule";
> $tmp['t255_featuretitle-3'] = "Person of the Week";
> $tmp['t255_featurethumb-3'] = "img/family2.jpg";
> $tmp['t255_featuresub-3'] = "Mary Smith";
> $tmp['t255_featurepara-3'] = "1876-1932 <br>Married John Ramey<br>Had 5 children.";
> $tmp['t255_featurelink-3'] = "surnames.php";
> $tmp['t255_featurelinktext-3'] = "See Mary";
> $tmp['t255_featuretitle-4'] = "The Chosen";
> $tmp['t255_featurepara-4'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t255_featurelink-4'] = "histories/story2.php";
> $tmp['t255_featurelinktext-4'] = "Our Stories";
> $tmp['t255_snipheadline-1'] = "Our Ancestors";
> $tmp['t255_snipname-5'] = "Mark and Linda";
> $tmp['t255_snipperson-5'] = "";
> $tmp['t255_sniptree-5'] = "";
> $tmp['t255_snipimage-5'] = "img/bottom1.jpg";
> $tmp['t255_snipinfoone-5'] = "Add information here about this ancestor... where they lived, how many children, husband/wife.";
> $tmp['t255_sniplink-5'] = "histories/place1.php";
> $tmp['t255_snipname-6'] = "Charlotte Turner";
> $tmp['t255_snipperson-6'] = "";
> $tmp['t255_sniptree-6'] = "";
> $tmp['t255_snipimage-6'] = "img/bottom2.jpg";
> $tmp['t255_snipinfoone-6'] = "Add information here about this ancestor... where they lived, how many children, husband/wife.";
> $tmp['t255_sniplink-6'] = "";
> $tmp['t255_snipname-7'] = "Christina Martin";
> $tmp['t255_snipperson-7'] = "";
> $tmp['t255_sniptree-7'] = "";
> $tmp['t255_snipimage-7'] = "img/bottom3.jpg";
> $tmp['t255_snipinfoone-7'] = "Add information here about this ancestor... where they lived, how many children, husband/wife.";
> $tmp['t255_sniplink-7'] = "";
> $tmp['t255_snipname-8'] = "Samuel Matthews";
> $tmp['t255_snipperson-8'] = "";
> $tmp['t255_sniptree-8'] = "";
> $tmp['t255_snipimage-8'] = "img/bottom4.jpg";
> $tmp['t255_snipinfoone-8'] = "Add information here about this ancestor... where they lived, how many children, husband/wife.";
> $tmp['t255_sniplink-8'] = "";
> $tmp['t255_featuretitle-5'] = "The Bones of My Bone";
> $tmp['t255_featurepara-5'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do.";
> $tmp['t255_featurelink-5'] = "histories/family1.php";
> $tmp['t255_featurelinktext-5'] = "Our Family";
> $tmp['t255_author-1'] = "Mark Twain";
> $tmp['t255_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t255_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t255_quotelink-1'] = "histories/place1.php";
> $tmp['t255_author-2'] = "Howard K. Nixon";
> $tmp['t255_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t255_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t255_quotelink-2'] = "";
> $tmp['t255_author-3'] = "Jimmy Carter";
> $tmp['t255_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t255_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t255_quotelink-3'] = "";
> $tmp['t255_author-4'] = "Florence King";
> $tmp['t255_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t255_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t255_quotelink-4'] = "";
> $tmp['t255_author-5'] = "Ellen";
> $tmp['t255_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t255_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t255_quotelink-5'] = "";
> $tmp['t255_author-6'] = "Uncle Ralph";
> $tmp['t255_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t255_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t255_quotelink-6'] = "";
> $tmp['t255_featuretitle-6'] = "Our Pages";
> $tmp['t255_featurepara-6'] = "You can use this area to add your extra history or person pages.";
> $tmp['t255_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t255_linktext-1'] = "Our History Pages";
> $tmp['t255_link-2'] = "histories/story1.php";
> $tmp['t255_linktext-2'] = "Our Stories";
> $tmp['t255_link-3'] = "https://usgenweb.org";
> $tmp['t255_linktext-3'] = "USGenWeb";
> $tmp['t255_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t255_linktext-4'] = "Genealogy Web Templates";
> $tmp['t255_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t255_linktext-5'] = "TNG Forum";
> $tmp['t255_topsurnames'] = "Top 20 Surnames";
> $tmp['t255_textpara1'] = "You can use this area for your Surname Cloud or you can delete the surname cloud in the index.php and use this area for text.";
> $tmp['t255_footerheadline-1'] = "Quick Links";
> $tmp['t255_footerheadline-2'] = "Contact Us";
> $tmp['t255_footerlink-1'] = "suggest.php";
> $tmp['t255_footerlinktext-1'] = "Contact Us";
> $tmp['t255_footerlink-2'] = "surnames.php";
> $tmp['t255_footerlinktext-2'] = "Our Surnames";
> $tmp['t255_footerlink-3'] = "histories/story1.php";
> $tmp['t255_footerlinktext-3'] = "Our Stories";
> $tmp['t255_footerheadline-4'] = "Webmaster Message";
> $tmp['t255_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t256_dadside'] = "His Side | ";
> $tmp['t256_dadperson'] = "I2";
> $tmp['t256_dadtree'] = "mytreeid";
> $tmp['t256_momside'] = "Her Side | ";
> $tmp['t256_momperson'] = "I1";
> $tmp['t256_momtree'] = "mytreeid";
> $tmp['t256_featurelinks'] = "TNG, https://tngsitebuilding.com";
> $tmp['t256_maintitle'] = "Template 256";
> $tmp['t256_headsubtitle'] = "Welcome To Our Family";
> $tmp['t256_featurethumb-1'] = "img/family1.jpg";
> $tmp['t256_featuretitle-1'] = "Joseph Prince";
> $tmp['t256_featuresub-1'] = "Born 1827 - Died 1909";
> $tmp['t256_featurepara-1'] = "Family Records";
> $tmp['t256_featurelink-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t256_featurethumb-2'] = "img/family2.jpg";
> $tmp['t256_featuretitle-2'] = "Martha Matthews";
> $tmp['t256_featuresub-2'] = "Born 1829 - Died 1919";
> $tmp['t256_featurepara-2'] = "New Information";
> $tmp['t256_featurelink-2'] = "histories/story1.php";
> $tmp['t256_featuretitle-3'] = "Welcome to our site!";
> $tmp['t256_featuresub-3'] = "The Chosen";
> $tmp['t256_featurethumb-3'] = "img/topleft.jpg";
> $tmp['t256_featurepara-3'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t256_featurelink-3'] = "surnames.php";
> $tmp['t256_featurelinktext-3'] = "Our Surnames";
> $tmp['t256_snipheadline-1'] = "Our Families";
> $tmp['t256_snipsubhead-1'] = "Our Ancestors Were Adventurers";
> $tmp['t256_sniptitle-1'] = "Fred Smith";
> $tmp['t256_snipname-1'] = "Fredrick Smith";
> $tmp['t256_snipinfoone-1'] = "Born 1862";
> $tmp['t256_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t256_snipimage-1'] = "img/snip1.jpg";
> $tmp['t256_snipperson-1'] = "";
> $tmp['t256_sniptree-1'] = "";
> $tmp['t256_sniptitle-2'] = "Dan Jones";
> $tmp['t256_snipname-2'] = "Daniel Jones";
> $tmp['t256_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t256_snipinfotwo-2'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t256_snipimage-2'] = "img/snip2.jpg";
> $tmp['t256_snipperson-2'] = "";
> $tmp['t256_sniptree-2'] = "";
> $tmp['t256_sniptitle-3'] = "Peter Ryan";
> $tmp['t256_snipname-3'] = "Peter C. Ryan";
> $tmp['t256_snipinfoone-3'] = "Information";
> $tmp['t256_snipinfotwo-3'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t256_snipperson-3'] = "";
> $tmp['t256_snipimage-3'] = "img/snip3.jpg";
> $tmp['t256_sniptree-3'] = "";
> $tmp['t256_sniptitle-4'] = "Roy Robbins";
> $tmp['t256_snipname-4'] = "Roy B. Robbins";
> $tmp['t256_snipinfoone-4'] = "Information";
> $tmp['t256_snipinfotwo-4'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t256_snipimage-4'] = "img/snip4.jpg";
> $tmp['t256_snipperson-4'] = "";
> $tmp['t256_sniptree-4'] = "";
> $tmp['t256_featuretitle-4'] = "The Bones of My Bones";
> $tmp['t256_featurepara-4'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"\<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t256_featurelink-4'] = "histories/place1.php";
> $tmp['t256_featurelinktext-4'] = "Our Homestead";
> $tmp['t256_slideheadline-4'] = "Family Pictures";
> $tmp['t256_slidetitle-4'] = "Hamburg, Germany";
> $tmp['t256_slideimg-4'] = "img/fambox1.jpg";
> $tmp['t256_slidelink-4'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t256_slidetext-4'] = "The official name reflects Hamburg's history as a member of the medieval Hanseatic League and a free imperial city of the Holy Roman Empire. Before the 1871 Unification of Germany, it was a fully sovereign city state, and before 1919 formed a civic republic headed constitutionally by a class of hereditary grand burghers or Hanseaten. Beset by disasters such as the Great Fire of Hamburg, North Sea flood of 1962 and military conflicts including World War II bombing raids, the city has managed to recover and emerge wealthier after each catastrophe. ~ Wiki";
> $tmp['t256_link-4'] = "histories/place2.php";
> $tmp['t256_slidelinktext-4'] = "Hamburg";
> $tmp['t256_slidetitle-5'] = "Postcard from Family";
> $tmp['t256_slideimg-5'] = "img/fambox2.jpg";
> $tmp['t256_slidelink-5'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t256_slidetext-5'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t256_link-5'] = "histories/place2.php";
> $tmp['t256_slidelinktext-5'] = "Hamburg";
> $tmp['t256_slidetitle-6'] = "Great Grandparents";
> $tmp['t256_slideimg-6'] = "img/fambox3.jpg";
> $tmp['t256_slidelink-6'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t256_slidetext-6'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t256_link-6'] = "histories/family2.php";
> $tmp['t256_slidelinktext-6'] = "Family";
> $tmp['t256_slidetitle-7'] = "Family Farm";
> $tmp['t256_slideimg-7'] = "img/fambox4.jpg";
> $tmp['t256_link-7'] = "histories/place1.php";
> $tmp['t256_slidetext-7'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t256_slidelink-7'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t256_slidelinktext-7'] = "Farm";
> $tmp['t256_featurethumb-5'] = "img/ancestor1.jpg";
> $tmp['t256_featuretitle-5'] = "Wow! Take a look at this!";
> $tmp['t256_featurepara-5'] = "Good, I expected it. Now, listen to me. Up to this time I have been Mr. Fogg's adversary. I am now in his game. 'Aha!' cried Passepartout; 'you are convinced he is an honest man?' 'No,' replied Fix coldly, 'I think him a rascal. Sh! don't budge, and let me speak. As long as Mr. Fogg was on English ground, it was for my interest to detain him there until my warrant of arrest arrived. I did everything I could to keep him back.";
> $tmp['t256_featurelink-5'] = "histories/place2.php";
> $tmp['t256_featurelinktext-5'] = "Ireland";
> $tmp['t256_featurethumb-6'] = "img/ancestor2.jpg";
> $tmp['t256_featuretitle-6'] = "You asked for it... We listened.";
> $tmp['t256_featurepara-6'] = "And I shall get my brains,' added the Scarecrow joyfully. 'And I shall get my courage,' said the Lion thoughtfully. 'And I shall get back to Kansas,' cried Dorothy, clapping her hands. 'Oh, let us start for the Emerald City tomorrow!' The next day they called the Winkies together and bade them good-bye. The Winkies were sorry to have them go, and they had grown fond of the Tin Woodman.";
> $tmp['t256_featurelink-6'] = "";
> $tmp['t256_featurelinktext-6'] = "";
> $tmp['t256_snipheadline-2'] = "This Week's Featured Ancestors";
> $tmp['t256_snipsubhead-2'] = "These could be the newest ancestors you added to your site or random ancestors.";
> $tmp['t256_snipname-5'] = "Suzanne Martin";
> $tmp['t256_snipperson-5'] = "";
> $tmp['t256_sniptree-5'] = "";
> $tmp['t256_snipinfoone-5'] = "Aunt to Frances Martin, mother to Thomas Martin";
> $tmp['t256_snipinfotwo-5'] = "Give a small bit of information about the person in this space.";
> $tmp['t256_snipimage-5'] = "img/person1.jpg";
> $tmp['t256_sniplink-5'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t256_snipname-6'] = "Bill Wilson";
> $tmp['t256_snipperson-6'] = "";
> $tmp['t256_sniptree-6'] = "";
> $tmp['t256_snipinfoone-6'] = "Son of Samuel Wilson and Mary Jane Andrews.";
> $tmp['t256_snipinfotwo-6'] = "Give a small bit of information about the person in this space.";
> $tmp['t256_snipimage-6'] = "img/person2.jpg";
> $tmp['t256_sniplink-6'] = "histories/place2.php";
> $tmp['t256_snipname-7'] = "Elizabeth Wells";
> $tmp['t256_snipperson-7'] = "";
> $tmp['t256_sniptree-7'] = "";
> $tmp['t256_snipinfoone-7'] = "Great grandmother to Mark Wells.";
> $tmp['t256_snipinfotwo-7'] = "Give a small bit of information about the person in this space.";
> $tmp['t256_snipimage-7'] = "img/person3.jpg";
> $tmp['t256_sniplink-7'] = "surnames.php";
> $tmp['t256_snipname-8'] = "Frank Lee";
> $tmp['t256_snipperson-8'] = "";
> $tmp['t256_sniptree-8'] = "";
> $tmp['t256_snipinfoone-8'] = "Grandson of Robert E. Lee";
> $tmp['t256_snipinfotwo-8'] = "Give a small bit of information about the person in this space.";
> $tmp['t256_snipimage-8'] = "img/person4.jpg";
> $tmp['t256_sniplink-8'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t256_footerheadline-1'] = "Quick Links";
> $tmp['t256_footerheadline-2'] = "Contact Us";
> $tmp['t256_footerlink-1'] = "suggest.php";
> $tmp['t256_footerlinktext-1'] = "Contact Us";
> $tmp['t256_footerlink-2'] = "surnames.php";
> $tmp['t256_footerlinktext-2'] = "Our Surnames";
> $tmp['t256_footerlink-3'] = "histories/story1.php";
> $tmp['t256_footerlinktext-3'] = "Our Stories";
> $tmp['t256_footerheadline-4'] = "Webmaster Message";
> $tmp['t256_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t257_maintitle'] = "Template 257";
> $tmp['t257_headimg'] = "img/logo.png";
> $tmp['t257_headsubtitle'] = "Searching for Ancestors";
> $tmp['t257_dadperson'] = "I2";
> $tmp['t257_dadtree'] = "mytreeid";
> $tmp['t257_headerlinktext-1'] = "Holley Side";
> $tmp['t257_momperson'] = "I1";
> $tmp['t257_momtree'] = "mytreeid";
> $tmp['t257_headerlinktext-2'] = "Boardman Side";
> $tmp['t257_headerlink-3'] = "surnames.php";
> $tmp['t257_headerlinktext-3'] = "Surnames";
> $tmp['t257_headerlink-4'] = "histories/index.php";
> $tmp['t257_headerlinktext-4'] = "Histories";
> $tmp['t257_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t257_slideheadline-1'] = "Finding our ancestors is exciting!";
> $tmp['t257_slidetext-1'] = "We hope we help you find your spot in our family.";
> $tmp['t257_slidelink-1'] = "histories/place1.php";
> $tmp['t257_slidelinktext-1'] = "Histories";
> $tmp['t257_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t257_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t257_slidetext-2'] = "If you find something we don't have, please share with us.<br>";
> $tmp['t257_slidelink-2'] = "histories/story1.php";
> $tmp['t257_slidelinktext-2'] = "Stories";
> $tmp['t257_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t257_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t257_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br>";
> $tmp['t257_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t257_slidelinktext-3'] = "GWT";
> $tmp['t257_featurethumb-1'] = "img/top1.jpg";
> $tmp['t257_person-1'] = "";
> $tmp['t257_tree-1'] = "";
> $tmp['t257_featuretitle-1'] = "Holley";
> $tmp['t257_featurethumb-2'] = "img/top2.jpg";
> $tmp['t257_person-2'] = "";
> $tmp['t257_tree-2'] = "";
> $tmp['t257_featuretitle-2'] = "Brown";
> $tmp['t257_featuretitle-3'] = "Welcome to our site!";
> $tmp['t257_featurepara-3'] = "Thanks for stopping by to check out our website. We hope you like our new look! We're pretty pleased with it! Genealogy Web templates has a great selection of premium TNG templates as well. Please go by and check them out.";
> $tmp['t257_featurethumb-3'] = "img/topleft.jpg";
> $tmp['t257_featuretitle-4'] = "The Chosen";
> $tmp['t257_featurepara-4'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t257_featurelink-4'] = "histories/place2.php";
> $tmp['t257_featurelinktext-4'] = "Homeplace";
> $tmp['t257_snipheadline-1'] = "Our Ancestors";
> $tmp['t257_snipname-1'] = "Frederick Holley";
> $tmp['t257_snipimg-1'] = "img/person1.jpg";
> $tmp['t257_snipinfoone-1'] = "Short information here. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t257_sniplink-1'] = "histories/person1.php";
> $tmp['t257_sniplinktext-1'] = "Fred's Story";
> $tmp['t257_snipname-2'] = "Celeste Chandler";
> $tmp['t257_snipimg-2'] = "img/person2.jpg";
> $tmp['t257_snipinfoone-2'] = "Short information here. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t257_sniplink-2'] = "";
> $tmp['t257_sniplinktext-2'] = "";
> $tmp['t257_snipname-3'] = "Anthony Bryant";
> $tmp['t257_snipimg-3'] = "img/person3.jpg";
> $tmp['t257_snipinfoone-3'] = "Short information here. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t257_sniplink-3'] = "";
> $tmp['t257_sniplinktext-3'] = "";
> $tmp['t257_snipname-4'] = "Helen Lewis";
> $tmp['t257_snipimg-4'] = "img/person4.jpg";
> $tmp['t257_snipinfoone-4'] = "Short information here. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t257_sniplink-4'] = "";
> $tmp['t257_sniplinktext-4'] = "";
> $tmp['t257_snipname-5'] = "Raymond Brown";
> $tmp['t257_snipimg-5'] = "img/person5.jpg";
> $tmp['t257_snipinfoone-5'] = "Short information here. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t257_sniplink-5'] = "";
> $tmp['t257_sniplinktext-5'] = "";
> $tmp['t257_snipname-6'] = "Maryanne Lima";
> $tmp['t257_snipimg-6'] = "img/person6.jpg";
> $tmp['t257_snipinfoone-6'] = "Short information here. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t257_sniplink-6'] = "";
> $tmp['t257_sniplinktext-6'] = "";
> $tmp['t257_snipname-7'] = "Samuel Green";
> $tmp['t257_snipimg-7'] = "img/person7.jpg";
> $tmp['t257_snipinfoone-7'] = "Short information here. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t257_sniplink-7'] = "";
> $tmp['t257_sniplinktext-7'] = "";
> $tmp['t257_snipname-8'] = "Angela Cutler";
> $tmp['t257_snipimg-8'] = "img/person8.jpg";
> $tmp['t257_snipinfoone-8'] = "Short information here. The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst.";
> $tmp['t257_sniplink-8'] = "";
> $tmp['t257_sniplinktext-8'] = "";
> $tmp['t257_featuretitle-5'] = "The Bones of My Bones";
> $tmp['t257_featurepara-5'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us.</p><p>It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do.</p><p> With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do.";
> $tmp['t257_featurethumb-5'] = "img/wagon.jpg";
> $tmp['t257_featurelink-5'] = "histories/index.php";
> $tmp['t257_featurelinktext-5'] = "Our Stories";
> $tmp['t257_featuretitle-6'] = "Our Pages";
> $tmp['t257_featurepara-6'] = "You can use this area to add your extra history or person pages.";
> $tmp['t257_link-1'] = "histories/index.php";
> $tmp['t257_linktext-1'] = "Our History Pages";
> $tmp['t257_link-2'] = "histories/story1.php";
> $tmp['t257_linktext-2'] = "Our Stories";
> $tmp['t257_link-3'] = "http://usgenweb.org";
> $tmp['t257_linktext-3'] = "USGenWeb";
> $tmp['t257_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t257_linktext-4'] = "Genealogy Web Templates";
> $tmp['t257_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t257_linktext-5'] = "TNG Forum";
> $tmp['t257_featuretitle-7'] = "About Us";
> $tmp['t257_featurepara-7'] = "We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t257_featurethumb-7'] = "img/about.jpg";
> $tmp['t257_topsurnames'] = "Top 20 Surnames";
> $tmp['t257_textpara1'] = "You can use this area for your Surname Cloud or you can delete the surname cloud in the index.php and use this area for text.";
> $tmp['t257_footerheadline-1'] = "Quick Links";
> $tmp['t257_footerheadline-2'] = "Contact Us";
> $tmp['t257_footerlink-1'] = "suggest.php";
> $tmp['t257_footerlinktext-1'] = "Contact Us";
> $tmp['t257_footerlink-2'] = "surnames.php";
> $tmp['t257_footerlinktext-2'] = "Our Surnames";
> $tmp['t257_footerlink-3'] = "histories/story1.php";
> $tmp['t257_footerlinktext-3'] = "Our Stories";
> $tmp['t257_footerheadline-4'] = "Webmaster Message";
> $tmp['t257_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t258_dadside'] = "His Side | ";
> $tmp['t258_dadperson'] = "I2";
> $tmp['t258_dadtree'] = "mytreeid";
> $tmp['t258_momside'] = "Her Side | ";
> $tmp['t258_momperson'] = "I1";
> $tmp['t258_momtree'] = "mytreeid";
> $tmp['t258_featurelinks'] = "GWT, https://genealogywebtemplates.com/";
> $tmp['t258_headimg'] = "img/logo.png";
> $tmp['t258_maintitle'] = "Template 258";
> $tmp['t258_headsubtitle'] = "Genealogy is our life!";
> $tmp['t258_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t258_slideheadline-1'] = "Finding our ancestors is exciting!";
> $tmp['t258_slidetext-1'] = "We hope we help you find your spot in our family.";
> $tmp['t258_slidelink-1'] = "histories/place1.php";
> $tmp['t258_slidelinktext-1'] = "Histories";
> $tmp['t258_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t258_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t258_slidetext-2'] = "If you find something we don't have, please share with us.<br>";
> $tmp['t258_slidelink-2'] = "histories/story1.php";
> $tmp['t258_slidelinktext-2'] = "Stories";
> $tmp['t258_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t258_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t258_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br>";
> $tmp['t258_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t258_slidelinktext-3'] = "GWT";
> $tmp['t258_featuretitle-1'] = "Welcome to our site!";
> $tmp['t258_featurethumb-1'] = "img/wagon.jpg";
> $tmp['t258_featurepara-1'] = "This genealogy template gives you great sections to place not only your written content about your ancestors, but also gives you many places to add pictures and events. We hope you enjoy it! This is filler text. Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum. </p><p>Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum. Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t258_featuretitle-2'] = "The Chosen";
> $tmp['t258_featurethumb-2'] = "img/cemetery.jpg";
> $tmp['t258_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, 'You have a wonderful family; you would be proud of us.'. How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t258_featurelink-2'] = "";
> $tmp['t258_featurelinktext-2'] = "";
> $tmp['t258_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t258_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t258_sidebarimg-1'] = "img/family1.jpg";
> $tmp['t258_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t258_sidebarlink-1'] = "histories/place1.php";
> $tmp['t258_sidebarsub-2'] = "Events";
> $tmp['t258_sidebarimg-2'] = "img/family2.jpg";
> $tmp['t258_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t258_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t258_sidebarsub-3'] = "Pictures of Family";
> $tmp['t258_sidebarimg-3'] = "img/family3.jpg";
> $tmp['t258_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t258_sidebarlink-3'] = "";
> $tmp['t258_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t258_sidebarimg-4'] = "img/family4.jpg";
> $tmp['t258_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t258_sidebarlink-4'] = "";
> $tmp['t258_sidebartitle-5'] = "Random Photos";
> $tmp['t258_sidebarpara-5'] = "<em>If you do not wish to have a Random Photo section, just remove it in the index.php and you can use this as a sidebar text section. </em>";
> $tmp['t258_featuretitle-3'] = "The Bones of My Bone";
> $tmp['t258_featurepara-3'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. 'It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. ";
> $tmp['t258_featurelink-3'] = "";
> $tmp['t258_featurelinktext-3'] = "";
> $tmp['t258_snipheadline-1'] = "Our Families";
> $tmp['t258_snipsubhead-1'] = "They were explorers!";
> $tmp['t258_sniptitle-1'] = "Fred Smith";
> $tmp['t258_snipname-1'] = "Fredrick Smith";
> $tmp['t258_snipinfoone-1'] = "Born 1862";
> $tmp['t258_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t258_snipimage-1'] = "img/snip1.jpg";
> $tmp['t258_snipperson-1'] = "";
> $tmp['t258_sniptree-1'] = "";
> $tmp['t258_sniptitle-2'] = "Dan Jones";
> $tmp['t258_snipname-2'] = "Daniel Jones";
> $tmp['t258_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t258_snipinfotwo-2'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t258_snipimage-2'] = "img/snip2.jpg";
> $tmp['t258_snipperson-2'] = "";
> $tmp['t258_sniptree-2'] = "";
> $tmp['t258_sniptitle-3'] = "Peter Ryan";
> $tmp['t258_snipname-3'] = "Peter C. Ryan";
> $tmp['t258_snipinfoone-3'] = "Information";
> $tmp['t258_snipinfotwo-3'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t258_snipperson-3'] = "";
> $tmp['t258_snipimage-3'] = "img/snip3.jpg";
> $tmp['t258_sniptree-3'] = "";
> $tmp['t258_sniptitle-4'] = "Roy Robbins";
> $tmp['t258_snipname-4'] = "Roy B. Robbins";
> $tmp['t258_snipinfoone-4'] = "Information";
> $tmp['t258_snipinfotwo-4'] = "Add text that you've found interesting on this ancestor.";
> $tmp['t258_snipimage-4'] = "img/snip4.jpg";
> $tmp['t258_snipperson-4'] = "";
> $tmp['t258_sniptree-4'] = "";
> $tmp['t258_featuretitle-6'] = "With Love and Caring";
> $tmp['t258_featurepara-6'] = "With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. \"\It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.\"<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t258_featurelink-6'] = "histories/story2.php";
> $tmp['t258_featurelinktext-6'] = "Our Story";
> $tmp['t258_slideheadline-4'] = "Family Pictures";
> $tmp['t258_slidetitle-4'] = "Hamburg, Germany";
> $tmp['t258_slideimg-4'] = "img/fambox1.jpg";
> $tmp['t258_slidelink-4'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t258_slidetext-4'] = "The official name reflects Hamburg's history as a member of the medieval Hanseatic League and a free imperial city of the Holy Roman Empire. Before the 1871 Unification of Germany, it was a fully sovereign city state, and before 1919 formed a civic republic headed constitutionally by a class of hereditary grand burghers or Hanseaten. Beset by disasters such as the Great Fire of Hamburg, North Sea flood of 1962 and military conflicts including World War II bombing raids, the city has managed to recover and emerge wealthier after each catastrophe. ~ Wiki";
> $tmp['t258_link-4'] = "histories/place2.php";
> $tmp['t258_slidelinktext-4'] = "Hamburg";
> $tmp['t258_slidetitle-5'] = "Postcard from Family";
> $tmp['t258_slideimg-5'] = "img/fambox2.jpg";
> $tmp['t258_slidelink-5'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t258_slidetext-5'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t258_link-5'] = "histories/place2.php";
> $tmp['t258_slidelinktext-5'] = "Hamburg";
> $tmp['t258_slidetitle-6'] = "Great Grandparents";
> $tmp['t258_slideimg-6'] = "img/fambox3.jpg";
> $tmp['t258_slidelink-6'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t258_slidetext-6'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t258_link-6'] = "histories/family2.php";
> $tmp['t258_slidelinktext-6'] = "Family";
> $tmp['t258_slidetitle-7'] = "Family Farm";
> $tmp['t258_slideimg-7'] = "img/fambox4.jpg";
> $tmp['t258_link-7'] = "histories/place1.php";
> $tmp['t258_slidetext-7'] = "The following text is filler text. You will use your text here. Donec neque urna, ultrices et sagittis sit amet, cursus ut quam. In hac habitasse platea dictumst. Maecenas velit tellus, iaculis sit amet faucibus sit amet, imperdiet quis lacus. Nulla turpis nulla, aliquam at eleifend sed, viverra ac massa. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti.&nbsp; Praesent dolor urna, scelerisque sed convallis nec, consequat quis velit. Quisque eu eros id lacus elementum mattis sit amet vel mauris.";
> $tmp['t258_slidelink-7'] = "getperson.php?personID=I1495&tree=tree1";
> $tmp['t258_slidelinktext-7'] = "Farm";
> $tmp['t258_featuretitle-7'] = "Our Pages";
> $tmp['t258_featurepara-7'] = "You can use this area to add your extra history or person pages.";
> $tmp['t258_link-1'] = "histories/index.php";
> $tmp['t258_linktext-1'] = "Our History Pages";
> $tmp['t258_link-2'] = "histories/story1.php";
> $tmp['t258_linktext-2'] = "Our Stories";
> $tmp['t258_link-3'] = "https://usgenweb.org";
> $tmp['t258_linktext-3'] = "USGenWeb";
> $tmp['t258_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t258_linktext-4'] = "Genealogy Web Templates";
> $tmp['t258_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t258_linktext-5'] = "TNG Forum";
> $tmp['t258_author-1'] = "Mark Twain";
> $tmp['t258_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t258_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t258_quotelink-1'] = "histories/place1.php";
> $tmp['t258_author-2'] = "Howard K. Nixon";
> $tmp['t258_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t258_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t258_quotelink-2'] = "";
> $tmp['t258_author-3'] = "Jimmy Carter";
> $tmp['t258_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t258_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t258_quotelink-3'] = "";
> $tmp['t258_author-4'] = "Florence King";
> $tmp['t258_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t258_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t258_quotelink-4'] = "";
> $tmp['t258_author-5'] = "Ellen";
> $tmp['t258_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t258_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t258_quotelink-5'] = "";
> $tmp['t258_author-6'] = "Uncle Ralph";
> $tmp['t258_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t258_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t258_quotelink-6'] = "";
> $tmp['t258_topsurnames'] = "Top 20 Surnames";
> $tmp['t258_textpara1'] = "You can use this area for your Surname Cloud or you can delete the surname cloud in the index.php and use this area for text.";
> $tmp['t258_footerheadline-1'] = "Quick Links";
> $tmp['t258_footerheadline-2'] = "Contact Us";
> $tmp['t258_footerlink-1'] = "suggest.php";
> $tmp['t258_footerlinktext-1'] = "Contact Us";
> $tmp['t258_footerlink-2'] = "surnames.php";
> $tmp['t258_footerlinktext-2'] = "Our Surnames";
> $tmp['t258_footerlink-3'] = "histories/story1.php";
> $tmp['t258_footerlinktext-3'] = "Our Stories";
> $tmp['t258_footerheadline-4'] = "Webmaster Message";
> $tmp['t258_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t259_maintitle'] = "Template 259";
> $tmp['t259_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t259_headimg'] = "img/logo.png";
> $tmp['t259_dadside'] = "His Side | ";
> $tmp['t259_dadperson'] = "I2";
> $tmp['t259_dadtree'] = "mytreeid";
> $tmp['t259_momside'] = "Her Side | ";
> $tmp['t259_momperson'] = "I1";
> $tmp['t259_momtree'] = "mytreeid";
> $tmp['t259_featurelinks'] = "| GWT, https://genealogywebtemplates.com/";
> $tmp['t259_slideimg-1'] = "img/top1.jpg";
> $tmp['t259_slidetext-1'] = "Catherine Hepburn";
> $tmp['t259_slideimg-2'] = "img/top2.jpg";
> $tmp['t259_slidetext-2'] = "Cary Grant";
> $tmp['t259_slideimg-3'] = "img/top3.jpg";
> $tmp['t259_slidetext-3'] = "Ingrid Bergman";
> $tmp['t259_slideimg-4'] = "img/top4.jpg";
> $tmp['t259_slidetext-4'] = "Greta Garbo";
> $tmp['t259_slideimg-5'] = "img/top5.jpg";
> $tmp['t259_slidetext-5'] = "Marlon &amp; Bette Brando";
> $tmp['t259_slideimg-6'] = "img/top6.jpg";
> $tmp['t259_slidetext-6'] = "Elizabeth Taylor";
> $tmp['t259_slideimg-7'] = "img/top7.jpg";
> $tmp['t259_slidetext-7'] = "Henry Fonda Family";
> $tmp['t259_slideimg-8'] = "img/top8.jpg";
> $tmp['t259_slidetext-8'] = "Clark Gable";
> $tmp['t259_slideimg-9'] = "img/top9.jpg";
> $tmp['t259_slidetext-9'] = "James Cagney";
> $tmp['t259_slideimg-10'] = "img/top10.jpg";
> $tmp['t259_slidetext-10'] = "Spencer Tracy Family";
> $tmp['t259_slideimg-11'] = "img/top11.jpg";
> $tmp['t259_slidetext-11'] = "Gregory Peck Family";
> $tmp['t259_slideimg-12'] = "img/top12.jpg";
> $tmp['t259_slidetext-12'] = "Laurence Olivier";
> $tmp['t259_featuretitle-1'] = "Welcome to our site!";
> $tmp['t259_featurethumb-1'] = "img/top.jpg";
> $tmp['t259_featurepara-1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\". How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do. ";
> $tmp['t259_featuretitle-2'] = "The Bone of My Bone";
> $tmp['t259_featurepara-2'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors were able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.";
> $tmp['t259_featurelink-2'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t259_featurelinktext-2'] = "Our History";
> $tmp['t259_snipheadline-1'] = "Spotlight on People &amp; Places";
> $tmp['t259_snipimage-1'] = "img/spotlight1.jpg";
> $tmp['t259_sniplink-1'] = "";
> $tmp['t259_snipname-1'] = "Ireland";
> $tmp['t259_snipimage-2'] = "img/spotlight2.jpg";
> $tmp['t259_sniplink-2'] = "";
> $tmp['t259_snipname-2'] = "Cemetery";
> $tmp['t259_snipimage-3'] = "img/spotlight3.jpg";
> $tmp['t259_sniplink-3'] = "";
> $tmp['t259_snipname-3'] = "Grandmother";
> $tmp['t259_snipimage-4'] = "img/spotlight4.jpg";
> $tmp['t259_sniplink-4'] = "";
> $tmp['t259_snipname-4'] = "Old Homestead";
> $tmp['t259_featuretitle-3'] = "Our Father's Side";
> $tmp['t259_featurepara-3'] = "This genealogy template gives you great sections to place not only your written content about your ancestors, but also gives you many places to add pictures and events. We hope you enjoy it! This is filler text. Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum. ";
> $tmp['t259_featurelink-3'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t259_featurelinktext-3'] = "Our History";
> $tmp['t259_snipheadline-5'] = "Discover Our Family";
> $tmp['t259_snipimg-5'] = "img/family1.jpg";
> $tmp['t259_snipname-5'] = "Ancestor's Name";
> $tmp['t259_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t259_sniplink-5'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t259_snipimg-6'] = "img/family2.jpg";
> $tmp['t259_snipname-6'] = "Ancestor's Name";
> $tmp['t259_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t259_sniplink-6'] = "histories/place1.php";
> $tmp['t259_snipimg-7'] = "img/family3.jpg";
> $tmp['t259_snipname-7'] = "Ancestor's Name";
> $tmp['t259_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t259_sniplink-7'] = "surnames.php";
> $tmp['t259_snipimg-8'] = "img/family4.jpg";
> $tmp['t259_snipname-8'] = "Ancestor's Name";
> $tmp['t259_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t259_sniplink-8'] = "histories/family1.php";
> $tmp['t259_featuretitle-4'] = "Our Mother's Side";
> $tmp['t259_featurepara-4'] = "This section is a great place to describe the following images.Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes swore. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum. ";
> $tmp['t259_featurelink-4'] = "";
> $tmp['t259_featurelinktext-4'] = "";
> $tmp['t259_snipimg-9'] = "img/family1.jpg";
> $tmp['t259_snipname-9'] = "Ancestor's Name";
> $tmp['t259_snipinfoone-9'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t259_sniplink-9'] = "histories/place1.php";
> $tmp['t259_snipimg-10'] = "img/family2.jpg";
> $tmp['t259_snipname-10'] = "Ancestor's Name";
> $tmp['t259_snipinfoone-10'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t259_sniplink-10'] = "histories/family2.php";
> $tmp['t259_snipimg-11'] = "img/family3.jpg";
> $tmp['t259_snipname-11'] = "Ancestor's Name";
> $tmp['t259_snipinfoone-11'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t259_sniplink-11'] = "histories/story1.php";
> $tmp['t259_snipimg-12'] = "img/family4.jpg";
> $tmp['t259_snipname-12'] = "Ancestor's Name";
> $tmp['t259_snipinfoone-12'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t259_sniplink-12'] = "histories/story2.php";
> $tmp['t259_featuretitle-5'] = "Our Pages";
> $tmp['t259_featurepara-5'] = "You can use this area to add your extra history or person pages.";
> $tmp['t259_link-1'] = "browsemedia.php?mediatypeID=histories.php";
> $tmp['t259_linktext-1'] = "Our History Pages";
> $tmp['t259_link-2'] = "histories/story1.php";
> $tmp['t259_linktext-2'] = "Our Stories";
> $tmp['t259_link-3'] = "https://usgenweb.org";
> $tmp['t259_linktext-3'] = "USGenWeb";
> $tmp['t259_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t259_linktext-4'] = "Genealogy Web Templates";
> $tmp['t259_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t259_linktext-5'] = "TNG Forum";
> $tmp['t259_topsurnames'] = "Our Top Surnames";
> $tmp['t259_textpara1'] = "You can use this area for a short sentence before the Surname Cloud or you can take out the Surname Cloud in the index.php and use this area as a text area.";
> $tmp['t259_footerheadline-1'] = "Quick Links";
> $tmp['t259_footerheadline-2'] = "Contact Us";
> $tmp['t259_footerlink-1'] = "suggest.php";
> $tmp['t259_footerlinktext-1'] = "Contact Us";
> $tmp['t259_footerlink-2'] = "surnames.php";
> $tmp['t259_footerlinktext-2'] = "Our Surnames";
> $tmp['t259_footerlink-3'] = "histories/story1.php";
> $tmp['t259_footerlinktext-3'] = "Our Stories";
> $tmp['t259_footerheadline-4'] = "Webmaster Message";
> $tmp['t259_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t260_maintitle'] = "Template 260";
> $tmp['t260_headsubtitle'] = "Genealogy Spoken Here";
> $tmp['t260_headimg'] = "img/logo.png";
> $tmp['t260_dadside'] = "His Side | ";
> $tmp['t260_dadperson'] = "I2";
> $tmp['t260_dadtree'] = "mytreeid";
> $tmp['t260_momside'] = "Her Side | ";
> $tmp['t260_momperson'] = "I1";
> $tmp['t260_momtree'] = "mytreeid";
> $tmp['t260_featurelinks'] = "GWT, https://genealogywebtemplates.com";
> $tmp['t260_featuretitle-1'] = "Welcome to Our Site";
> $tmp['t260_featurepara-1'] = "We hope you find everything you are looking for and many things you haven't thought of yet!</p><p>We're still researching, so give us a call!";
> $tmp['t260_featurethumb-1'] = "img/ancestor.jpg";
> $tmp['t260_featuresub-1'] = "Thanks for visiting!";
> $tmp['t260_mainimage-2'] = "img/top1.jpg";
> $tmp['t260_person-2'] = "";
> $tmp['t260_tree-2'] = "";
> $tmp['t260_mainimage-3'] = "img/top2.jpg";
> $tmp['t260_person-3'] = "";
> $tmp['t260_tree-3'] = "";
> $tmp['t260_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t260_slidetext-1'] = "Slider Left  - Image 1";
> $tmp['t260_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t260_slidetext-2'] = "Slider Left  - Image 2";
> $tmp['t260_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t260_slidetext-3'] = "Slider Left  - Image 3";
> $tmp['t260_slideimg-4'] = "img/mainimage4.jpg";
> $tmp['t260_slidetext-4'] = "Slider Right - Image 4";
> $tmp['t260_slideimg-5'] = "img/mainimage5.jpg";
> $tmp['t260_slidetext-5'] = "Slider Right - Image 5";
> $tmp['t260_slideimg-6'] = "img/mainimage6.jpg";
> $tmp['t260_slidetext-6'] = "Slider Right - Image 6";
> $tmp['t260_featuretitle-2'] = "Welcome to our site!";
> $tmp['t260_featuresub-2'] = "The Chosen";
> $tmp['t260_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, You have a wonderful family; you would be proud of us.";
> $tmp['t260_featuretitle-3'] = "William Smith Family";
> $tmp['t260_featurepara-3'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t260_featurelink-3'] = "histories/family1.php";
> $tmp['t260_featurelinktext-3'] = "His Story";
> $tmp['t260_featurethumb-3'] = "img/ancestor1.jpg";
> $tmp['t260_featuretitle-4'] = " Abraham Bourgeois";
> $tmp['t260_featurepara-4'] = "Place information here about this family member or place. Since spilled yikes convulsively habitually then skillful until camel goodness hurriedly walrus like wow much that cutting together agonizing flew far one human mawkishly much because and urchin but zebra pertly impala crooked far.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t260_featurethumb-4'] = "img/ancestor2.jpg";
> $tmp['t260_featurelink-4'] = "histories/place1.php";
> $tmp['t260_featurelinktext-4'] = "Homestead";
> $tmp['t260_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t260_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t260_sidebarimg-1'] = "img/family1.jpg";
> $tmp['t260_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t260_sidebarlink-1'] = "histories/place1.php";
> $tmp['t260_sidebarsub-2'] = "Events";
> $tmp['t260_sidebarimg-2'] = "img/family2.jpg";
> $tmp['t260_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t260_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t260_sidebarsub-3'] = "Pictures of Family";
> $tmp['t260_sidebarimg-3'] = "img/family3.jpg";
> $tmp['t260_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t260_sidebarlink-3'] = "";
> $tmp['t260_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t260_sidebarimg-4'] = "img/family4.jpg";
> $tmp['t260_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t260_sidebarlink-4'] = "";
> $tmp['t260_sidebartitle-2'] = "Our Photos";
> $tmp['t260_snipheadline-1'] = "Spotlight on People & Places";
> $tmp['t260_snipimg-1'] = "img/postcard1.jpg";
> $tmp['t260_snipname-1'] = "Ancestor's Name";
> $tmp['t260_snipinfoone-1'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t260_sniplink-1'] = "getperson.php?personID=I2203&tree=tree1";
> $tmp['t260_snipimg-2'] = "img/postcard2.jpg";
> $tmp['t260_snipname-2'] = "Ancestor's Name";
> $tmp['t260_snipinfoone-2'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t260_sniplink-2'] = "histories/place1.php";
> $tmp['t260_snipimg-3'] = "img/postcard3.jpg";
> $tmp['t260_snipname-3'] = "Ancestor's Name";
> $tmp['t260_snipinfoone-3'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t260_sniplink-3'] = "surnames.php";
> $tmp['t260_snipimg-4'] = "img/postcard4.jpg";
> $tmp['t260_snipname-4'] = "Ancestor's Name";
> $tmp['t260_snipinfoone-4'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t260_sniplink-4'] = "histories/family1.php";
> $tmp['t260_snipimg-5'] = "img/postcard1.jpg";
> $tmp['t260_snipname-5'] = "Ancestor's Name";
> $tmp['t260_snipinfoone-5'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t260_sniplink-5'] = "histories/place1.php";
> $tmp['t260_snipimg-6'] = "img/postcard2.jpg";
> $tmp['t260_snipname-6'] = "Ancestor's Name";
> $tmp['t260_snipinfoone-6'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t260_sniplink-6'] = "histories/family2.php";
> $tmp['t260_snipimg-7'] = "img/postcard3.jpg";
> $tmp['t260_snipname-7'] = "Ancestor's Name";
> $tmp['t260_snipinfoone-7'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t260_sniplink-7'] = "histories/story1.php";
> $tmp['t260_snipimg-8'] = "img/postcard4.jpg";
> $tmp['t260_snipname-8'] = "Ancestor's Name";
> $tmp['t260_snipinfoone-8'] = "Your text about the above ancestor, place or reference goes here.";
> $tmp['t260_sniplink-8'] = "histories/story2.php";
> $tmp['t260_featuretitle-5'] = "With Love and Caring";
> $tmp['t260_featurethumb-5'] = "img/familyphotos.jpg";
> $tmp['t260_featurepara-5'] = "With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p>It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. <br><br>So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.'<br><br>~<em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t260_featurelink-5'] = "";
> $tmp['t260_featurelinktext-5'] = "";
> $tmp['t260_featuretitle-6'] = "Our Pages";
> $tmp['t260_featurepara-6'] = "You can use this area to add your extra history or person pages.";
> $tmp['t260_link-1'] = "histories/index.php";
> $tmp['t260_linktext-1'] = "Our History Pages";
> $tmp['t260_link-2'] = "histories/story1.php";
> $tmp['t260_linktext-2'] = "Our Stories";
> $tmp['t260_link-3'] = "https://usgenweb.org";
> $tmp['t260_linktext-3'] = "USGenWeb";
> $tmp['t260_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t260_linktext-4'] = "Genealogy Web Templates";
> $tmp['t260_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t260_linktext-5'] = "TNG Forum";
> $tmp['t260_author-1'] = "Mark Twain";
> $tmp['t260_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t260_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t260_quotelink-1'] = "histories/place1.php";
> $tmp['t260_author-2'] = "Howard K. Nixon";
> $tmp['t260_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t260_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t260_quotelink-2'] = "";
> $tmp['t260_author-3'] = "Jimmy Carter";
> $tmp['t260_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t260_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t260_quotelink-3'] = "";
> $tmp['t260_author-4'] = "Florence King";
> $tmp['t260_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t260_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t260_quotelink-4'] = "";
> $tmp['t260_author-5'] = "Ellen";
> $tmp['t260_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t260_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t260_quotelink-5'] = "";
> $tmp['t260_author-6'] = "Uncle Ralph";
> $tmp['t260_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t260_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t260_quotelink-6'] = "";
> $tmp['t260_topsurnames'] = "Our Top Surnames";
> $tmp['t260_textpara1'] = "You can use this area for a short sentence before the Surname Cloud or you can take out the Surname Cloud in the index.php and use this area as a text area.";
> $tmp['t260_footerheadline-1'] = "Quick Links";
> $tmp['t260_footerheadline-2'] = "Contact Us";
> $tmp['t260_footerlink-1'] = "suggest.php";
> $tmp['t260_footerlinktext-1'] = "Contact Us";
> $tmp['t260_footerlink-2'] = "surnames.php";
> $tmp['t260_footerlinktext-2'] = "Our Surnames";
> $tmp['t260_footerlink-3'] = "histories/story1.php";
> $tmp['t260_footerlinktext-3'] = "Our Stories";
> $tmp['t260_footerheadline-4'] = "Webmaster Message";
> $tmp['t260_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t261_maintitle'] = "Template 261";
> $tmp['t261_headsubtitle'] = "Genealogy Spoken Here";
> $tmp['t261_headimg'] = "img/logo.png";
> $tmp['t261_dadside'] = "His Side | ";
> $tmp['t261_dadperson'] = "I2";
> $tmp['t261_dadtree'] = "mytreeid";
> $tmp['t261_momside'] = "Her Side | ";
> $tmp['t261_momperson'] = "I1";
> $tmp['t261_momtree'] = "mytreeid";
> $tmp['t261_featurelinks'] = "GWT, https://genealogywebtemplates.com";
> $tmp['t261_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t261_slideheadline-1'] = "Our Great Grandparents";
> $tmp['t261_slidetext-1'] = "Susan &amp; Fred Holley";
> $tmp['t261_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t261_slideheadline-2'] = "Greenwood Cemetery";
> $tmp['t261_slidetext-2'] = "Rangefield, Germany";
> $tmp['t261_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t261_slideheadline-3'] = "Mom &amp; Dad Smith";
> $tmp['t261_slidetext-3'] = "Our Parents Are Our Rock!";
> $tmp['t261_headline-1'] = "Fred Smith";
> $tmp['t261_person-1'] = "";
> $tmp['t261_tree-1'] = "";
> $tmp['t261_mainimage-1'] = "img/top1.jpg";
> $tmp['t261_headline-2'] = "John Doe";
> $tmp['t261_person-2'] = "";
> $tmp['t261_tree-2'] = "";
> $tmp['t261_mainimage-2'] = "img/top2.jpg";
> $tmp['t261_headline-3'] = "Deborah Smith";
> $tmp['t261_person-3'] = "";
> $tmp['t261_tree-3'] = "";
> $tmp['t261_mainimage-3'] = "img/top3.jpg";
> $tmp['t261_headline-4'] = "Alvin Boudreaux";
> $tmp['t261_person-4'] = "";
> $tmp['t261_tree-4'] = "";
> $tmp['t261_mainimage-4'] = "img/top4.jpg";
> $tmp['t261_featuretitle-1'] = "Welcome to our site!";
> $tmp['t261_featuresub-1'] = "The Chosen";
> $tmp['t261_featurepara-1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t261_featuretitle-2'] = "Will Smith Family";
> $tmp['t261_featurethumb-2'] = "img/ancestor1.jpg";
> $tmp['t261_featurepara-2'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes oversaw swore that while a more some where one more agreeably spoiled less more.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t261_featurelink-2'] = "histories/place2.php";
> $tmp['t261_featurelinktext-2'] = "Homestead";
> $tmp['t261_featuretitle-3'] = "Fred Jones Family";
> $tmp['t261_featurethumb-3'] = "img/ancestor1.jpg";
> $tmp['t261_featurepara-3'] = "Negatively since poignantly much unkindly some goodness regarding jeez telepathic frightening up excepting yikes oversaw swore that while a more some where one more agreeably spoiled less more.</p><p>Barked moaned up crooked a without jeepers more some and lemur rose yikes adventurous widely joyful outside a near boastful.";
> $tmp['t261_featurelink-3'] = "surnames.php";
> $tmp['t261_featurelinktext-3'] = "Our Surnames";
> $tmp['t261_sidebartitle-1'] = "Spotlight on Family";
> $tmp['t261_sidebarsub-1'] = "Ancestor's Name";
> $tmp['t261_sidebarimg-1'] = "img/family1.jpg";
> $tmp['t261_sidebarpara-1'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t261_sidebarlink-1'] = "histories/place1.php";
> $tmp['t261_sidebarsub-2'] = "Events";
> $tmp['t261_sidebarimg-2'] = "img/family2.jpg";
> $tmp['t261_sidebarpara-2'] = "Gratuitous octopus niacin, sodium glutimate. Quote meon an estimate et non interruptus stadium.";
> $tmp['t261_sidebarlink-2'] = "histories/stories2.php";
> $tmp['t261_sidebarsub-3'] = "Pictures of Family";
> $tmp['t261_sidebarimg-3'] = "img/family3.jpg";
> $tmp['t261_sidebarpara-3'] = "Sic tempus fugit esperanto hiccup. Glorious baklava ex librus hup hey ad infinitum. Non sequitur condominium facile et geranium incognito.";
> $tmp['t261_sidebarlink-3'] = "";
> $tmp['t261_sidebarsub-4'] = "Ancestor's Name";
> $tmp['t261_sidebarimg-4'] = "img/family4.jpg";
> $tmp['t261_sidebarpara-4'] = "Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t261_sidebarlink-4'] = "";
> $tmp['t261_sidebartitle-2'] = "Our Photos";
> $tmp['t261_snipheadline-1'] = "Our Ancestors";
> $tmp['t261_sniptitle-1'] = "Fred Smith Family";
> $tmp['t261_snipname-1'] = "Fred Smith";
> $tmp['t261_snipinfoone-1'] = "Born 1862";
> $tmp['t261_snipinfotwo-1'] = "Married Ellie Capon Had 5 children: Susan, John, Steve, Frank, Lilly";
> $tmp['t261_snipimage-1'] = "img/snip1.jpg";
> $tmp['t261_snipperson-1'] = "";
> $tmp['t261_sniptree-1'] = "";
> $tmp['t261_sniptitle-2'] = "Dan Jones Family";
> $tmp['t261_snipname-2'] = "Dan Jones";
> $tmp['t261_snipinfoone-2'] = "Immigrated from Ireland";
> $tmp['t261_snipinfotwo-2'] = "Add text explaining your Family Name";
> $tmp['t261_snipimage-2'] = "img/snip2.jpg";
> $tmp['t261_snipperson-2'] = "";
> $tmp['t261_sniptree-2'] = "";
> $tmp['t261_sniptitle-3'] = "Peter Ryan Family";
> $tmp['t261_snipname-3'] = "Peter Ryan";
> $tmp['t261_snipinfoone-3'] = "Family Name";
> $tmp['t261_snipinfotwo-3'] = "Information";
> $tmp['t261_snipimage-3'] = "img/snip3.jpg";
> $tmp['t261_snipperson-3'] = "";
> $tmp['t261_sniptree-3'] = "";
> $tmp['t261_sniptitle-4'] = "Roy Robbins Family";
> $tmp['t261_snipname-4'] = "Roy Robbins";
> $tmp['t261_snipinfoone-4'] = "Family Name";
> $tmp['t261_snipinfotwo-4'] = "Information";
> $tmp['t261_snipimage-4'] = "img/snip4.jpg";
> $tmp['t261_snipperson-4'] = "";
> $tmp['t261_sniptree-4'] = "";
> $tmp['t261_sniptitle-5'] = "Barry Rogers Family";
> $tmp['t261_snipname-5'] = "Barry Rogers";
> $tmp['t261_snipinfoone-5'] = "Family Name";
> $tmp['t261_snipinfotwo-5'] = "Information";
> $tmp['t261_snipimage-5'] = "img/snip5.jpg";
> $tmp['t261_snipperson-5'] = "";
> $tmp['t261_sniptree-5'] = "";
> $tmp['t261_sniptitle-6'] = "Albert Ross Family";
> $tmp['t261_snipname-6'] = "Albert Ross";
> $tmp['t261_snipinfoone-6'] = "Family Name";
> $tmp['t261_snipinfotwo-6'] = "Information";
> $tmp['t261_snipimage-6'] = "img/snip6.jpg";
> $tmp['t261_snipperson-6'] = "";
> $tmp['t261_sniptree-6'] = "";
> $tmp['t261_sniptitle-7'] = "Alvy Boardman Family";
> $tmp['t261_snipname-7'] = "Alvy Boardman";
> $tmp['t261_snipinfoone-7'] = "Family Name";
> $tmp['t261_snipinfotwo-7'] = "Information";
> $tmp['t261_snipimage-7'] = "img/snip7.jpg";
> $tmp['t261_snipperson-7'] = "";
> $tmp['t261_sniptree-7'] = "";
> $tmp['t261_sniptitle-8'] = "Paul Johnson Family";
> $tmp['t261_snipname-8'] = "Paul Johnson";
> $tmp['t261_snipinfoone-8'] = "Family Name";
> $tmp['t261_snipinfotwo-8'] = "Information";
> $tmp['t261_snipimage-8'] = "img/snip8.jpg";
> $tmp['t261_snipperson-8'] = "";
> $tmp['t261_sniptree-8'] = "";
> $tmp['t261_quotehead'] = "Our Favorite Genealogy Quotes";
> $tmp['t261_author-1'] = "Mark Twain";
> $tmp['t261_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t261_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t261_quotelink-1'] = "histories/place1.php";
> $tmp['t261_author-2'] = "Howard K. Nixon";
> $tmp['t261_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t261_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t261_quotelink-2'] = "";
> $tmp['t261_author-3'] = "Jimmy Carter";
> $tmp['t261_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t261_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t261_quotelink-3'] = "";
> $tmp['t261_author-4'] = "Florence King";
> $tmp['t261_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t261_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t261_quotelink-4'] = "";
> $tmp['t261_author-5'] = "Ellen";
> $tmp['t261_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t261_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t261_quotelink-5'] = "";
> $tmp['t261_author-6'] = "Uncle Ralph";
> $tmp['t261_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t261_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t261_quotelink-6'] = "";
> $tmp['t261_topsurnames'] = "Our Top Surnames";
> $tmp['t261_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t261_footerheadline-1'] = "Quick Links";
> $tmp['t261_footerheadline-2'] = "Contact Us";
> $tmp['t261_footerlink-1'] = "suggest.php";
> $tmp['t261_footerlinktext-1'] = "Contact Us";
> $tmp['t261_footerlink-2'] = "surnames.php";
> $tmp['t261_footerlinktext-2'] = "Our Surnames";
> $tmp['t261_footerlink-3'] = "histories/story1.php";
> $tmp['t261_footerlinktext-3'] = "Our Stories";
> $tmp['t261_footerheadline-4'] = "Webmaster Message";
> $tmp['t261_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t262_maintitle'] = "Template 262";
> $tmp['t262_headsubtitle'] = "Our Family's Journey Through Time";
> $tmp['t262_headimg'] = "img/logo.png";
> $tmp['t262_dadside'] = "His Side | ";
> $tmp['t262_dadperson'] = "I2";
> $tmp['t262_dadtree'] = "mytreeid";
> $tmp['t262_momside'] = "Her Side | ";
> $tmp['t262_momperson'] = "I1";
> $tmp['t262_momtree'] = "mytreeid";
> $tmp['t262_featurelinks'] = "GWT, https://genealogywebtemplates.com";
> $tmp['t262_featuretitle-1'] = "Our Family's History";
> $tmp['t262_featuresub-1'] = "The Brown Family";
> $tmp['t262_featurepara-1'] = "This website is about our Brown Family. We hope you enjoy looking through our 30 years of research. If you have anything to add or if you have documents or pictures you would like to share, we would love to have them. Thank you for visiting our site!";
> $tmp['t262_featurelink-1'] = "histories/place2.php";
> $tmp['t262_featurelinktext-1'] = "Histories";
> $tmp['t262_featuretitle-2'] = "Welcome to Our Site";
> $tmp['t262_featurethumb-2'] = "img/topright.jpg";
> $tmp['t262_featurepara-2'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes.<br><br>Those who have gone before cry out to us: \"Tell our story.\" So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t262_featuretitle-3'] = "Father's Side";
> $tmp['t262_featuresub-3'] = "His Father";
> $tmp['t262_featurethumb-3'] = "img/family1.jpg";
> $tmp['t262_featurepara-3'] = "Add a brief paragraph about the person you have chosen to be in this area. It does not necessarily have to be his father, it can be anyone.";
> $tmp['t262_featurelink-3'] = "histories/home.php";
> $tmp['t262_featurelinktext-3'] = "Father";
> $tmp['t262_featuretitle-4'] = "Mother's Side";
> $tmp['t262_featuresub-4'] = "His Mother";
> $tmp['t262_featurethumb-4'] = "img/family2.jpg";
> $tmp['t262_featurepara-4'] = "Add a brief paragraph about the person you have chosen to be in this area. It does not necessarily have to be his mother, it can be anyone.";
> $tmp['t262_featurelink-4'] = "histories/home.php";
> $tmp['t262_featurelinktext-4'] = "Mother";
> $tmp['t262_featuretitle-5'] = "Mother's Side";
> $tmp['t262_featuresub-5'] = "Her Father";
> $tmp['t262_featurethumb-5'] = "img/family3.jpg";
> $tmp['t262_featurepara-5'] = "Add a brief paragraph about the person you have chosen to be in this area. It does not necessarily have to be her father, it can be anyone.";
> $tmp['t262_featurelink-5'] = "histories/home.php";
> $tmp['t262_featurelinktext-5'] = "Father";
> $tmp['t262_featuretitle-6'] = "Mother's Side";
> $tmp['t262_featuresub-6'] = "Her Mother";
> $tmp['t262_featurethumb-6'] = "img/family4.jpg";
> $tmp['t262_featurepara-6'] = "Add a brief paragraph about the person you have chosen to be in this area. It does not necessarily have to her a mother, it can be anyone.";
> $tmp['t262_featurelink-6'] = "histories/home.php";
> $tmp['t262_featurelinktext-6'] = "Mother";
> $tmp['t262_featuretitle-7'] = "Bones of my bone...";
> $tmp['t262_featurepara-7'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors ere able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t262_featurelink-7'] = "";
> $tmp['t262_featurelinktext-7'] = "";
> $tmp['t262_snipheadline-1'] = "Our Family Was Adventurous";
> $tmp['t262_snipname-1'] = "Fred Smith";
> $tmp['t262_snipimage-1'] = "img/snip1.jpg";
> $tmp['t262_snipinfoone-1'] = "Give information about Fred in this area. You can list birth, marriage or death information or you can list something personal about him.";
> $tmp['t262_snipperson-1'] = "";
> $tmp['t262_sniptree-1'] = "";
> $tmp['t262_snipname-2'] = "Elizabeth Franz";
> $tmp['t262_snipimage-2'] = "img/snip2.jpg";
> $tmp['t262_snipinfoone-2'] = "Give information about Elizabeth in this area. You can list birth, marriage or death information or you can list something personal about her.";
> $tmp['t262_snipperson-2'] = "";
> $tmp['t262_sniptree-2'] = "";
> $tmp['t262_snipname-3'] = "Collette McFall";
> $tmp['t262_snipimage-3'] = "img/snip3.jpg";
> $tmp['t262_snipinfoone-3'] = "Give information about Collette in this area. You can list birth, marriage or death information or you can list something personal about her.";
> $tmp['t262_snipperson-3'] = "";
> $tmp['t262_sniptree-3'] = "";
> $tmp['t262_snipname-4'] = "Albert Bourgeois";
> $tmp['t262_snipimage-4'] = "img/snip4.jpg";
> $tmp['t262_snipinfoone-4'] = "Give information about Albert in this area. You can list birth, marriage or death information or you can list something personal about him.";
> $tmp['t262_snipperson-4'] = "";
> $tmp['t262_sniptree-4'] = "";
> $tmp['t262_featuretitle-8'] = "Our Pages";
> $tmp['t262_featurepara-8'] = "You can use this area to add your extra history or person pages.";
> $tmp['t262_link-1'] = "histories/index.php";
> $tmp['t262_linktext-1'] = "Our History Pages";
> $tmp['t262_link-2'] = "histories/story1.php";
> $tmp['t262_linktext-2'] = "Our Stories";
> $tmp['t262_link-3'] = "http://usgenweb.org";
> $tmp['t262_linktext-3'] = "USGenWeb";
> $tmp['t262_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t262_linktext-4'] = "Genealogy Web Templates";
> $tmp['t262_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t262_linktext-5'] = "TNG Forum";
> $tmp['t262_featuretitle-9'] = "About Us";
> $tmp['t262_featurethumb-9'] = "img/about.jpg";
> $tmp['t262_featurepara-9'] = "	We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t262_topsurnames'] = "Our Top Surnames";
> $tmp['t262_textpara1'] = "You can use this area for a short sentence before the surname cloud.";
> $tmp['t262_footerheadline-1'] = "Quick Links";
> $tmp['t262_footerheadline-2'] = "Contact Us";
> $tmp['t262_footerlink-1'] = "suggest.php";
> $tmp['t262_footerlinktext-1'] = "Contact Me";
> $tmp['t262_footerlink-2'] = "histories/home.php";
> $tmp['t262_footerlinktext-2'] = "Our Stories";
> $tmp['t262_footerlink-3'] = "https://genealogywebtemplates.com";
> $tmp['t262_footerlinktext-3'] = "Genealogy Web Templates";
> $tmp['t262_footerheadline-4'] = "Webmaster Message";
> $tmp['t262_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> 
> $tmp['t263_maintitle'] = "Template 263";
> $tmp['t263_headsubtitle'] = "Loving Genealogy";
> $tmp['t263_headimg'] = "img/logo.png";
> $tmp['t263_slideimg-1'] = "img/mainimage1.jpg";
> $tmp['t263_slideheadline-1'] = "Finding our ancestors is exciting!";
> $tmp['t263_slidetext-1'] = "We hope we help you find your spot in our family.";
> $tmp['t263_slidelink-1'] = "histories/place1.php";
> $tmp['t263_slidelinktext-1'] = "Histories";
> $tmp['t263_slideimg-2'] = "img/mainimage2.jpg";
> $tmp['t263_slideheadline-2'] = "Sharing information is what we do.";
> $tmp['t263_slidetext-2'] = "If you find something we don't have, please share with us.<br>";
> $tmp['t263_slidelink-2'] = "histories/story1.php";
> $tmp['t263_slidelinktext-2'] = "Stories";
> $tmp['t263_slideimg-3'] = "img/mainimage3.jpg";
> $tmp['t263_slideheadline-3'] = "We love the ease of using TNG!";
> $tmp['t263_slidetext-3'] = "We also love our new look from Genealogy Web Templates. It is just the 'breath of fresh air we were looking for! <br>";
> $tmp['t263_slidelink-3'] = "https://genealogywebtemplates.com";
> $tmp['t263_slidelinktext-3'] = "GWT";
> $tmp['t263_featuretitle-1'] = "Our Family's History";
> $tmp['t263_featurepara-1'] = "We are the chosen. In each family there is one who seems called to find the ancestors. To put flesh on their bones and make them live again. To tell the family story and to feel that somehow they know and approve. Doing genealogy is not a cold gathering of facts but, instead, breathing life into all who have gone before. We are the story tellers of the tribe. All tribes have one. We have been called, as it were, by our genes. Those who have gone before cry out to us: Tell our story. So, we do. In finding them, we somehow find ourselves. How many graves have I stood before now and cried? I have lost count. How many times have I told the ancestors, \"You have a wonderful family; you would be proud of us.\" How many times have I walked up to a grave and felt somehow there was love there for me? I cannot say. It goes beyond just documenting facts. It goes to who I am, and why I do the things I do.";
> $tmp['t263_featurethumb-1'] = "img/tree.jpg";
> $tmp['t263_featurelink-1'] = "histories/place2.php";
> $tmp['t263_featurelinktext-1'] = "Histories";
> $tmp['t263_sidebarsub-1'] = "Meet Our Ancestors";
> $tmp['t263_subhead1'] = "<em>Click on the tabs below to reveal the contents of the tab. You can have up to 10 tabs. If you use less than 10 tabs, all you need to do is leave the ones you're not using blank.</em>";
> $tmp['t263_sidebartitle-1'] = "Herman Brown";
> $tmp['t263_sidebarimg-1'] = "img/father1.jpg";
> $tmp['t263_sidebarpara-1'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-1'] = "histories/family1.php";
> $tmp['t263_sidebarlinktext-1'] = "His Story";
> $tmp['t263_sidebartitle-2'] = "Camilla Johnson";
> $tmp['t263_sidebarimg-2'] = "img/mother1.jpg";
> $tmp['t263_sidebarpara-2'] = "Camilla's Story. This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-2'] = "surnames.php";
> $tmp['t263_sidebarlinktext-2'] = "See Camilla";
> $tmp['t263_sidebartitle-3'] = "Susan Smith";
> $tmp['t263_sidebarimg-3'] = "img/mother1.jpg";
> $tmp['t263_sidebarpara-3'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-3'] = "";
> $tmp['t263_sidebarlinktext-3'] = "";
> $tmp['t263_sidebartitle-4'] = "Eric Martinson";
> $tmp['t263_sidebarimg-4'] = "img/erikv.jpg";
> $tmp['t263_sidebarpara-4'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-4'] = "getperson.php?personID=I2070&tree=tree1";
> $tmp['t263_sidebarlinktext-4'] = "See Erik";
> $tmp['t263_sidebartitle-5'] = "Your Ancestor or Place #5";
> $tmp['t263_sidebarimg-5'] = "img/mother1.jpg";
> $tmp['t263_sidebarpara-5'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-5'] = "";
> $tmp['t263_sidebarlinktext-5'] = "";
> $tmp['t263_sidebartitle-6'] = "Your Ancestor or Place #6";
> $tmp['t263_sidebarimg-6'] = "img/mother1.jpg";
> $tmp['t263_sidebarpara-6'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-6'] = "";
> $tmp['t263_sidebarlinktext-6'] = "";
> $tmp['t263_sidebartitle-7'] = "Your Ancestor or Place #7";
> $tmp['t263_sidebarimg-7'] = "img/mother1.jpg";
> $tmp['t263_sidebarpara-7'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-7'] = "";
> $tmp['t263_sidebarlinktext-7'] = "";
> $tmp['t263_sidebartitle-8'] = "Your Ancestor or Place #8";
> $tmp['t263_sidebarimg-8'] = "img/mother1.jpg";
> $tmp['t263_sidebarpara-8'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-8'] = "";
> $tmp['t263_sidebarlinktext-8'] = "";
> $tmp['t263_sidebartitle-9'] = "Your Ancestor or Place #9";
> $tmp['t263_sidebarimg-9'] = "img/mother1.jpg";
> $tmp['t263_sidebarpara-9'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-9'] = "";
> $tmp['t263_sidebarlinktext-9'] = "";
> $tmp['t263_sidebartitle-10'] = "Your Ancestor or Place #10";
> $tmp['t263_sidebarimg-10'] = "img/mother1.jpg";
> $tmp['t263_sidebarpara-10'] = "This is information about the person, place or story shown in the above image.</p><p>Wisi nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola. Ut lacreet dolore magna. Wisi e nim admin im veniam, quis nostrud. In atsvulpate velt esse meleste at semper manet sola.";
> $tmp['t263_sidebarlink-10'] = "";
> $tmp['t263_sidebarlinktext-10'] = "";
> $tmp['t263_sidebartitle-11'] = "Random Photos";
> $tmp['t263_sidebarpara-11'] = "This text is located right under the title.";
> $tmp['t263_featuretitle-2'] = "Take a look at some of our favorite ancestors!";
> $tmp['t263_featuresub-2'] = "Ancestor 1 Name";
> $tmp['t263_featurethumb-2'] = "img/family1.jpg";
> $tmp['t263_featurepara-2'] = "Add a brief paragraph about the person you have chosen to be in this area. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t263_featurelink-2'] = "histories/home.php";
> $tmp['t263_featuresub-3'] = "Ancestor 2 Name";
> $tmp['t263_featurethumb-3'] = "img/family2.jpg";
> $tmp['t263_featurepara-3'] = "Add a brief paragraph about the person you have chosen to be in this area. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t263_featurelink-3'] = "histories/home.php";
> $tmp['t263_featuresub-4'] = "Ancestor 3 Name";
> $tmp['t263_featurethumb-4'] = "img/family3.jpg";
> $tmp['t263_featurepara-4'] = "Add a brief paragraph about the person you have chosen to be in this area. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t263_featurelink-4'] = "histories/home.php";
> $tmp['t263_featuresub-5'] = "Ancestor 4 Name";
> $tmp['t263_featurethumb-5'] = "img/family4.jpg";
> $tmp['t263_featurepara-5'] = "Add a brief paragraph about the person you have chosen to be in this area. Epsum factorial non deposit quid pro quo hic escorol. Olypian quarrels et gorilla congolium sic ad nauseum.";
> $tmp['t263_featurelink-5'] = "histories/home.php";
> $tmp['t263_snipheadline-1'] = "Our Family Was Adventurous";
> $tmp['t263_snipname-1'] = "Harry Smith";
> $tmp['t263_snipimage-1'] = "img/snip1.jpg";
> $tmp['t263_snipinfoone-1'] = "Give information about Fred in this area. You can list birth, marriage or death information or you can list something personal about him.";
> $tmp['t263_snipperson-1'] = "";
> $tmp['t263_sniptree-1'] = "";
> $tmp['t263_snipname-2'] = "Elizabeth Franz";
> $tmp['t263_snipimage-2'] = "img/snip2.jpg";
> $tmp['t263_snipinfoone-2'] = "Give information about Elizabeth in this area. You can list birth, marriage or death information or you can list something personal about her.";
> $tmp['t263_snipperson-2'] = "";
> $tmp['t263_sniptree-2'] = "";
> $tmp['t263_snipname-3'] = "Collette McFall";
> $tmp['t263_snipimage-3'] = "img/snip3.jpg";
> $tmp['t263_snipinfoone-3'] = "Give information about Collette in this area. You can list birth, marriage or death information or you can list something personal about her.";
> $tmp['t263_snipperson-3'] = "";
> $tmp['t263_sniptree-3'] = "";
> $tmp['t263_snipname-4'] = "Olivia Bourgeois";
> $tmp['t263_snipimage-4'] = "img/snip4.jpg";
> $tmp['t263_snipinfoone-4'] = "Give information about Albert in this area. You can list birth, marriage or death information or you can list something personal about him.";
> $tmp['t263_snipperson-4'] = "";
> $tmp['t263_sniptree-4'] = "";
> $tmp['t263_featuretitle-6'] = "The bones of my bone...";
> $tmp['t263_featurethumb-6'] = "img/couple.jpg";
> $tmp['t263_featurepara-6'] = "The bones here are bones of my bone and flesh of my flesh. It goes to doing something about it. It goes to pride in what our ancestors ere able to accomplish. How they contributed to what we are today. It goes to respecting their hardships and losses, their never giving in or giving up, their resoluteness to go on and build a life for their family. It goes to deep pride that the fathers fought and some died to make and keep us a nation. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before. It goes to a deep and immense understanding that they were doing it for us. It is of equal pride and love that our mothers struggled to give us birth, without them we could not exist, and so we love each one, as far back as we can reach. That we might be born who we are. That we might remember them. So we do. With love and caring and scribing each fact of their existence, because we are they and they are the sum of who we are. So, as a scribe called, I tell the story of my family. It is up to that one called in the next generation to answer the call and take my place in the long line of family storytellers. That is why I do my family genealogy, and that is what calls those young and old to step up and restore the memory or greet those who we had never known before.</p><p><em>by Della M. Cummings Wright; Rewritten by her granddaughter Dell Jo Ann McGinnis Johnson; Edited and Reworded by Tom Dunn, 1943.</em>";
> $tmp['t263_author-1'] = "Mark Twain";
> $tmp['t263_quoteimg-1'] = "img/ticker1.jpg";
> $tmp['t263_quote-1'] = "Why waste your money looking up your family tree? Just go into politics and your opponents will do it for you.";
> $tmp['t263_quotelink-1'] = "histories/place1.php";
> $tmp['t263_author-2'] = "Howard K. Nixon";
> $tmp['t263_quoteimg-2'] = "img/ticker2.jpg";
> $tmp['t263_quote-2'] = "Everyone has ancestors and it is only a question of going back far enough to find a good one.";
> $tmp['t263_quotelink-2'] = "";
> $tmp['t263_author-3'] = "Jimmy Carter";
> $tmp['t263_quoteimg-3'] = "img/ticker3.jpg";
> $tmp['t263_quote-3'] = "We've uncovered some embarrassing ancestors in the not-too-distant past. Some horse thieves, and some people killed on Saturday nights. One of my relatives, unfortunately, was even in the newspaper business.";
> $tmp['t263_quotelink-3'] = "";
> $tmp['t263_author-4'] = "Florence King";
> $tmp['t263_quoteimg-4'] = "img/ticker4.jpg";
> $tmp['t263_quote-4'] = "Southerners are so devoted to genealogy that we see a family tree under every bush.";
> $tmp['t263_quotelink-4'] = "";
> $tmp['t263_author-5'] = "Ellen";
> $tmp['t263_quoteimg-5'] = "img/ticker5.jpg";
> $tmp['t263_quote-5'] = "My grandmother started walking five miles a day when she was sixty. She's ninety-seven now, and we don't know where the hell she is.";
> $tmp['t263_quotelink-5'] = "";
> $tmp['t263_author-6'] = "Uncle Ralph";
> $tmp['t263_quoteimg-6'] = "img/ticker6.jpg";
> $tmp['t263_quote-6'] = "You can use this area to place information about family or places. Just add them in!";
> $tmp['t263_quotelink-6'] = "";
> $tmp['t263_featuretitle-7'] = "Our Favorite Links";
> $tmp['t263_link-1'] = "histories/index.php";
> $tmp['t263_linktext-1'] = "Our History Pages";
> $tmp['t263_link-2'] = "histories/story1.php";
> $tmp['t263_linktext-2'] = "Our Stories";
> $tmp['t263_link-3'] = "http://usgenweb.org";
> $tmp['t263_linktext-3'] = "USGenWeb";
> $tmp['t263_link-4'] = "https://genealogywebtemplates.com";
> $tmp['t263_linktext-4'] = "Genealogy Web Templates";
> $tmp['t263_link-5'] = "https://tng.community/index.php?/forums/";
> $tmp['t263_linktext-5'] = "TNG Forum";
> $tmp['t263_featuretitle-8'] = "About Us";
> $tmp['t263_featurethumb-8'] = "img/about.jpg";
> $tmp['t263_featurepara-8'] = "	We've been researching this family name for over 30 years. I found lots of information at the State Archives, but once the internet exploded with genealogy, many more doors have been opened for me to research.</p><p>If you have something you would like to add or if you would like to submit documents for inclusion on this web, please let me know.";
> $tmp['t263_footerheadline-1'] = "Quick Links";
> $tmp['t263_footerheadline-2'] = "Contact Us";
> $tmp['t263_footerlink-1'] = "suggest.php";
> $tmp['t263_footerlinktext-1'] = "Contact Me";
> $tmp['t263_footerlink-2'] = "histories/home.php";
> $tmp['t263_footerlinktext-2'] = "Our Stories";
> $tmp['t263_footerlink-3'] = "https://genealogywebtemplates.com";
> $tmp['t263_footerlinktext-3'] = "Genealogy Web Templates";
> $tmp['t263_footerheadline-4'] = "Webmaster Message";
> $tmp['t263_footerpara-4'] = "We make every effort to document our research. If you have something you would like to add, please contact us.";
> ?>
\ No newline at end of file
Only in TNG1403: template_importer.php
diff -r TNG/templates/template1/css/templatestyle.css TNG1403/templates/template1/css/templatestyle.css
2a3,23
> /* added in TNG 12.1 as overrides to TNG genstyle.css for DNA Compare reports for template 1  */
> .overflowauto {
> 	width: 98vw;
> }
> /*  reduce overflowauto for laptops and tablets */
> @media only screen and (max-width:1280px) {
> 	.overflowauto {
> 		width: 98vw;
> 	}
> }
> @media only screen and (max-width:1024px) {
> 	.overflowauto {
> 		width: 96vw;
> 	}
> }
> @media only screen and (max-width:768px) {
> 	.overflowauto {
> 		width: 95vw;
> 	}
> }
> /* end overrides of for DNA Compare reports */
8a30,32
> div.icons {
> 	position: absolute;
> }
12a37,45
> 	margin: 10px 20px 10px 20px;
> }
> 
> .t1-sidebar {
> 	background-color: #ddd;
> 	border-radius: 10px;
> 	border: 1px solid #999;
> 	padding: 10px;
> 	box-shadow: 3px 3px 5px 0px #999;
80,82d112
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #c2c2c2, #a2a2a2);
< 	background-image:     url(../img/ArrowDown.gif), -ms-linear-gradient(top, #c2c2c2, #a2a2a2);
< 	background-image:      url(../img/ArrowDown.gif), -o-linear-gradient(top, #c2c2c2, #a2a2a2);
105,107d134
< 	background-image:    -moz-linear-gradient(top, #c2c2c2, #a2a2a2);
< 	background-image:     -ms-linear-gradient(top, #c2c2c2, #a2a2a2);
< 	background-image:      -o-linear-gradient(top, #c2c2c2, #a2a2a2);
111c138
< .databack {
---
> .databack, .reportcol li:hover {
117c144
< 	background-color: #D9D9D9;  
---
> 	background-color: #D9D9D9;
135d161
< 	font-family:Georgia,Arial,sans-serif;
147d172
< 	font-family:Georgia,Arial,sans-serif;
152d176
< 	font-family:Georgia,Arial,sans-serif;
156a181,184
> .maintitle, .mmaintitle, a.toptitle, .admin-banner h1 {
>   	font-family:Georgia,Arial,sans-serif;
> }
> 
170,171c198,201
< 
< }
\ No newline at end of file
---
> 	body {
> 		margin: 8px;
> 	}
> }
diff -r TNG/templates/template1/css/tngmobile.css TNG1403/templates/template1/css/tngmobile.css
3d2
<   background-image: -moz-linear-gradient(to bottom, #444477 0%, #222255 100%);
diff -r TNG/templates/template1/css/tngtabs1.css TNG1403/templates/template1/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template1/css/tngtabs2.css TNG1403/templates/template1/css/tngtabs2.css
15d14
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template1/footer.php TNG1403/templates/template1/footer.php
6c6
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template1/img: arrowright2.gif
diff -r TNG/templates/template1/index.php TNG1403/templates/template1/index.php
15c15
< <table class="indexpage">
---
> <table class="indexpage" cellspacing="10">
59c59
< 		<td valign="top" class="normal">
---
> 		<td valign="top" class="normal t1-sidebar">
62c62
< 		echo "<p><strong>{$text['welcome']}, $currentuserdesc.</strong></p>\n";
---
> 		echo "<strong>{$text['welcome']}, $currentuserdesc.</strong><br /><br />\n";
166c166
< 	if( $allow_admin ) {
---
> 	if(!empty($allow_admin)) {
169c169
< 	echo "<li><a href=\"suggest.php?page=$title\">{$text['contactus']}</a></li>\n";
---
> 	echo "<li><a href=\"suggest.php?page=" . urlencode($title) . "\">{$text['contactus']}</a></li>\n";
182c182
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template1/topmenu.php TNG1403/templates/template1/topmenu.php
11c11
< 	<div style="float:left;"><img src="<?php echo $cms['tngpath'] . $templatepath; ?>img/header-image.gif" alt="" width="93" height="72" border="0" /></div>
---
> 	<div style="float:left; margin-right:10px"><img src="<?php echo $cms['tngpath'] . $templatepath; ?><?php echo $tmp['t1_headimgplustitle']; ?>" alt="" width="93" height="72" border="0" /></div>
diff -r TNG/templates/template10/css/templatestyle.css TNG1403/templates/template10/css/templatestyle.css
0a1,2
> /* templatestyle.css for template 10 overrides to TNG genstyle.css   */
> 
430c432,436
<   filter: dropshadow(color=#333333, offx=3, offy=3);
---
>   filter: drop-shadow(color=#333333, offx=3, offy=3);
> }
> 
> .admin-banner h1 {
>   font-family: Impact, Arial, Helvetica, Sans-Serif;
828d833
<   -moz-border-radius: 6px 6px 6px 6px;
1082d1086
<   -moz-border-radius: 6px 6px 6px 6px;
1268d1271
<   -moz-border-radius: 4px 4px 4px 4px;
1804c1807
< .databack {
---
> .databack, .reportcol li:hover {
1816a1820,1823
> .adminbody {
>   background-color: #9ba7aa;
> }
> 
1859d1865
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #E7F7FA, #B7C7c8);
1884d1889
< 	background-image:    -moz-linear-gradient(top, #E7F7FA, #B7C7c8);
1893a1899,1902
> div.icons {
>   position: absolute;
> }
> 
diff -r TNG/templates/template10/css/tngmobile.css TNG1403/templates/template10/css/tngmobile.css
7d6
<   background-image: -moz-linear-gradient(to bottom, #135C5A 0%, #04302F 100%);
diff -r TNG/templates/template10/css/tngtabs1.css TNG1403/templates/template10/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template10/css/tngtabs2.css TNG1403/templates/template10/css/tngtabs2.css
15d14
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template10/footer.php TNG1403/templates/template10/footer.php
30c30
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template10/img: arrowright2.gif
diff -r TNG/templates/template10/index.php TNG1403/templates/template10/index.php
136c136
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
188c188
< 	    echo "<p><strong>{$text['welcome']}, $currentuserdesc.</strong> <a href=\"logout.php\">{$text['mnulogout']}</a></p>\n";
---
> 	    echo "<p class=\"subhead\"><strong>{$text['welcome']}, $currentuserdesc.</strong> <a href=\"logout.php\">{$text['mnulogout']}</a></p>\n";
200c200
< 			echo "<p>$loginContent</p>\n";
---
> 			echo "<p class=\"subhead\">$loginContent</p>\n";
296c296
< 							echo showLinks($tmp['t10_featurelinks']);
---
> 							echo showLinks($tmp['t10_featurelinks'], true);
336c336
< 							echo showLinks($tmp['t10_reslinks']);
---
> 							echo showLinks($tmp['t10_reslinks'], true);
366c366
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template11/css/templatestyle.css TNG1403/templates/template11/css/templatestyle.css
0a1,2
> /* templatestyle.css for template 11 overrides to TNG genstyle.css   */
> 
212d213
< 	-moz-border-radius: 10px;
215d215
<   -moz-box-shadow:    1px 1px 2px 1px #666;
351d350
< 	-moz-border-radius: 10px;
354d352
<   -moz-box-shadow:    1px 1px 2px 1px #666;
531c529
<   width: 200px;
---
>   width: 240px;
605,607d602
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #FAF0F8, #CAC0C8);
< 	background-image:     url(../img/ArrowDown.gif), -ms-linear-gradient(top, #FAF0F8, #CAC0C8);
< 	background-image:      url(../img/ArrowDown.gif), -o-linear-gradient(top, #FAF0F8, #CAC0C8);
632,634d626
< 	background-image:    -moz-linear-gradient(top, #FAF0F8, #CAC0C8);
< 	background-image:     -ms-linear-gradient(top, #FAF0F8, #CAC0C8);
< 	background-image:      -o-linear-gradient(top, #FAF0F8, #CAC0C8);
638c630
< .databack {
---
> .databack, .reportcol li:hover {
701a694,697
> .admin-banner h1 {
>   font-family: Georgia, "Times New Roman", Times, Serif;
> }
> 
754,755c750
< 		  -moz-box-shadow:none;
< 		  -webkit-box-shadow: none;
---
> 	  -webkit-box-shadow: none;
759d753
< 		  -moz-box-shadow:none;
diff -r TNG/templates/template11/css/tngmobile.css TNG1403/templates/template11/css/tngmobile.css
7d6
<   background-image: -moz-linear-gradient(to bottom, #B366A5 0%, #8A407D 100%);
diff -r TNG/templates/template11/css/tngtabs1.css TNG1403/templates/template11/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template11/css/tngtabs2.css TNG1403/templates/template11/css/tngtabs2.css
15d14
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template11/footer.php TNG1403/templates/template11/footer.php
20c20
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template11/img: arrowright2.gif
diff -r TNG/templates/template11/index.php TNG1403/templates/template11/index.php
74c74
< 																$text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=$title", $text['contactus_long'] );
---
> 																$text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=" . urlencode($title), $text['contactus_long'] );
106c106
< 											    <input type="text" value="" name="myfirstname" />
---
> 											    <input type="text" value="" name="myfirstname" class="mediumfield" />
109c109
< 											    <input type="text" value="" name="mylastname" />
---
> 											    <input type="text" value="" name="mylastname" class="mediumfield" /><br/>
211c211
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
227c227
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template12/css/templatestyle.css TNG1403/templates/template12/css/templatestyle.css
0a1,2
> /* templatestyle.css for template 12 overrides to TNG genstyle.css   */
> 
69a72,75
> .admin-banner h1 {
>   font-family: 'Palatino Linotype', Georgia, "Times New Roman", Times, Serif;
> }
> 
201d206
<    -moz-background-origin: border !important;
209d213
<    -moz-box-sizing: border-box;
230,232d233
<    background: -moz-linear-gradient(top, rgba(0, 0, 0, 0.11) 0, rgba(158, 135, 110, 0.16) 250px) no-repeat, url('../img/page.png'), -moz-linear-gradient(top, #181510 0, #846F58 250px) no-repeat;
<    background: -o-linear-gradient(top, rgba(0, 0, 0, 0.11) 0, rgba(158, 135, 110, 0.16) 250px) no-repeat, url('../img/page.png'), -o-linear-gradient(top, #181510 0, #846F58 250px) no-repeat;
<    background: -ms-linear-gradient(top, rgba(0, 0, 0, 0.11) 0, rgba(158, 135, 110, 0.16) 250px) no-repeat, url('../img/page.png'), -ms-linear-gradient(top, #181510 0, #846F58 250px) no-repeat;
322,324d322
<   -moz-transform: rotate(0deg);
<   -o-transform: rotate(0deg);
<   -ms-transform: rotate(0deg);
356,358d353
<   -moz-transform: rotate(0deg);
<   -o-transform: rotate(0deg);
<   -ms-transform: rotate(0deg);
386,388d380
<   -moz-transform: rotate(0deg);
<   -o-transform: rotate(0deg);
<   -ms-transform: rotate(0deg);
405d396
<    -moz-border-radius:20px;
425,427d415
<    background: -moz-linear-gradient(top, #DBCBAE 0, #B08E4F 87%, #A28349 100%) no-repeat;
<    background: -o-linear-gradient(top, #DBCBAE 0, #B08E4F 87%, #A28349 100%) no-repeat;
<    background: -ms-linear-gradient(top, #DBCBAE 0, #B08E4F 87%, #A28349 100%) no-repeat;
432d419
<    -moz-border-radius:20px;
436d422
<    -moz-box-shadow:1px 1px 3px 2px rgba(0, 0, 0, 0.15);
501d486
<    -moz-box-sizing: border-box;
536d520
<    -moz-border-radius:8px;
570,572d553
<    background: -moz-linear-gradient(top, #D4C6B0 0, #A4885B 84%, #947B51 100%) no-repeat;
<    background: -o-linear-gradient(top, #D4C6B0 0, #A4885B 84%, #947B51 100%) no-repeat;
<    background: -ms-linear-gradient(top, #D4C6B0 0, #A4885B 84%, #947B51 100%) no-repeat;
576d556
<    -moz-border-radius:8px;
596,598d575
<    background: -moz-linear-gradient(top, #D4C6B0 0, #A4885B 84%, #947B51 100%) no-repeat;
<    background: -o-linear-gradient(top, #D4C6B0 0, #A4885B 84%, #947B51 100%) no-repeat;
<    background: -ms-linear-gradient(top, #D4C6B0 0, #A4885B 84%, #947B51 100%) no-repeat;
602d578
<    -moz-border-radius:8px;
635d610
<    -moz-border-radius:8px;
693d667
<    -moz-border-radius:8px;
716d689
<    -moz-border-radius:8px;
842d814
<    -moz-border-radius:20px 20px 0 0;
857c829
<    margin: 0 auto 0 auto;
---
>    margin: 22px auto 0 auto;
896d867
<    -moz-box-sizing: border-box;
938d908
<    -moz-box-shadow: none;
947d916
<    -moz-border-radius:2px;
1296,1297c1265,1266
< .databack {
< 	background-color: #f9f9f9;
---
> .databack, .reportcol li:hover {
> 	background-color: #e7dbd0;
1323a1293,1296
> .adminbody {
>    background-color: #ccbaa9;
> }
> 
diff -r TNG/templates/template12/css/tngmobile.css TNG1403/templates/template12/css/tngmobile.css
8d7
<   background-image: -moz-linear-gradient(to bottom, #6B584A 0%, #413226 100%);
diff -r TNG/templates/template12/css/tngtabs1.css TNG1403/templates/template12/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template12/css/tngtabs2.css TNG1403/templates/template12/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template12/footer.php TNG1403/templates/template12/footer.php
16c16
< 								echo tng_footer($flags);
---
> 								tng_footer($flags);
Only in TNG1403/templates/template12/img: arrowright2.gif
diff -r TNG/templates/template12/index.php TNG1403/templates/template12/index.php
83c83
< echo tng_footer($flags);
---
> tng_footer($flags);
diff -r TNG/templates/template13/css/templatestyle.css TNG1403/templates/template13/css/templatestyle.css
1c1,16
< @import url(https://fonts.googleapis.com/css?family=Marcellus+SC);
---
> /* templatestyle.css for template 13 overrides to TNG genstyle.css   */
> 
> /* @import url(https://fonts.googleapis.com/css?family=Marcellus+SC); */
> 
> @font-face {
>   font-family: 'Marcellus SC';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/marcellus-sc-v13-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/marcellus-sc-v13-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/marcellus-sc-v13-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/marcellus-sc-v13-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/marcellus-sc-v13-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/marcellus-sc-v13-latin-regular.svg#MarcellusSC') format('svg'); /* Legacy iOS */
> }
32,34c47,49
< margin: 20px 0;
<    font-weight: normal;
<    text-transform: uppercase;
---
>   margin: 20px 0;
>   font-weight: normal;
>   text-transform: uppercase;
200d214
<     position:absolute;
214d227
< 	-moz-border-radius: 10px;
217d229
<   -moz-box-shadow:    1px 1px 2px 1px #666;
353d364
< 	-moz-border-radius: 10px;
356d366
<   -moz-box-shadow:    1px 1px 2px 1px #666;
533c543
<   width: 200px;
---
>   width: 240px;
607,609d616
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #eeeef3, #ceced3);
< 	background-image:     url(../img/ArrowDown.gif), -ms-linear-gradient(top, #eeeef3, #ceced3);
< 	background-image:      url(../img/ArrowDown.gif), -o-linear-gradient(top, #eeeef3, #ceced3);
634,636d640
< 	background-image:    -moz-linear-gradient(top, #eeeef3, #ceced3);
< 	background-image:     -ms-linear-gradient(top, #eeeef3, #ceced3);
< 	background-image:      -o-linear-gradient(top, #eeeef3, #ceced3);
640c644
< .databack {
---
> .databack, .reportcol li:hover {
681d684
< 	font-family: 'Marcellus SC', Georgia, "Times New Roman", Times, Serif;
690d692
< 	font-family: 'Marcellus SC', Georgia, "Times New Roman", Times, Serif;
704d705
< 	font-family: 'Marcellus SC', Georgia, "Times New Roman", Times, Serif;
707a709,712
> h2.site-head, h2.site-head a, .mmaintitle, .big-header, .admin-banner h1, .top-rounded-headline h1 {
>   font-family: 'Marcellus SC', Georgia, "Times New Roman", Times, Serif;
> }
> 
741d745
< 	-moz-column-count:2; /* Firefox */
778c782
< 		width: 95%
---
> 		width: 100%
783,784c787
< 		  -moz-box-shadow:none;
< 		  -webkit-box-shadow: none;
---
> 		-webkit-box-shadow: none;
790,791c793
< 		  -moz-box-shadow:none;
< 		  -webkit-box-shadow: none;
---
> 	  -webkit-box-shadow: none;
821d822
< 		-moz-column-count:1; /* Firefox */
diff -r TNG/templates/template13/css/tngmobile.css TNG1403/templates/template13/css/tngmobile.css
7d6
<   background-image: -moz-linear-gradient(top, #5974AC 0%, #30497C 100%);
diff -r TNG/templates/template13/css/tngtabs1.css TNG1403/templates/template13/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template13/css/tngtabs2.css TNG1403/templates/template13/css/tngtabs2.css
15d14
< 	-moz-border-radius: 4px 4px 0px 0px;
Only in TNG1403/templates/template13: fonts
diff -r TNG/templates/template13/footer.php TNG1403/templates/template13/footer.php
20c20
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template13/img: arrowright2.gif
diff -r TNG/templates/template13/index.php TNG1403/templates/template13/index.php
14c14
< $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=$title", $text['contactus_long'] );
---
> $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=" . urlencode($title), $text['contactus_long'] );
107c107
< 											    <input type="text" value="" name="myfirstname" />
---
> 											    <input type="text" value="" name="myfirstname" id="myfirstname" class="mediumfield" />
110c110
< 											    <input type="text" value="" name="mylastname" />
---
> 											    <input type="text" value="" name="mylastname" id="mylastname" class="mediumfield" /><br/>
131c131,132
< 		echo "<li><a href=\"login.php\">{$text['mnulogon']}</a></li>";
---
> 		if( empty($tngconfig['showlogin']) )
> 			echo "<li><a href=\"login.php\">{$text['mnulogon']}</a></li>";
134c135
< 			<li><a href="newacctform.php"><?php echo $text['mnuregister']; ?></a></li></p>
---
> 			<li><a href="newacctform.php"><?php echo $text['mnuregister']; ?></a></li>
212c213
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
228c229
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template14/css/templatestyle.css TNG1403/templates/template14/css/templatestyle.css
1c1,16
< @import url(https://fonts.googleapis.com/css?family=Playball);
---
> /* templatestyle.css for template 14 overrides to TNG genstyle.css   */
> 
> /* @import url(https://fonts.googleapis.com/css?family=Playball); */
> 
> @font-face {
>   font-family: 'Playball';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/playball-v16-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/playball-v16-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/playball-v16-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/playball-v16-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/playball-v16-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/playball-v16-latin-regular.svg#Playball') format('svg'); /* Legacy iOS */
> }
197d211
<     position:absolute;
212,214d225
< 	background-image: -moz-linear-gradient(top, #e2b993, #b28963);
< 	background-image: -ms-linear-gradient(top, #e2b993, #b28963);
< 	background-image: -o-linear-gradient(top, #e2b993, #b28963);
216d226
< 	-moz-border-radius: 10px;
219d228
<   -moz-box-shadow:    1px 1px 2px 1px #333;
353d361
< 	-moz-border-radius: 10px;
356d363
<   -moz-box-shadow:    1px 1px 2px 1px #333;
515d521
<   -moz-box-shadow:    7px 7px 8px 0px #444;
590,592d595
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #e2b993, #b28963);
< 	background-image:     url(../img/ArrowDown.gif), -ms-linear-gradient(top, #e2b993, #b28963);
< 	background-image:      url(../img/ArrowDown.gif), -o-linear-gradient(top, #e2b993, #b28963);
617,619d619
< 	background-image:    -moz-linear-gradient(top, #e2b993, #b28963);
< 	background-image:     -ms-linear-gradient(top, #e2b993, #b28963);
< 	background-image:      -o-linear-gradient(top, #e2b993, #b28963);
623c623
< .databack {
---
> .databack, .reportcol li:hover {
634a635,638
> .adminbody {
> 	background: #e2b993;
> }
> 
699d702
< 	-moz-box-shadow:    4px 4px 6px 0px #444;
720a724,727
> .admin-banner h1 {
> 	font-family: 'Playball', Georgia, "Times New Roman", Times, Serif;
> }
> 
768d774
< 	-moz-box-shadow:    4px 4px 6px 0px #777;
814d819
< 		  -moz-box-shadow:none;
849d853
< 		  -moz-box-shadow:none;
diff -r TNG/templates/template14/css/tngmobile.css TNG1403/templates/template14/css/tngmobile.css
8d7
<   background-image: -moz-linear-gradient(to bottom, #AA0000 0%, #770000 100%);
diff -r TNG/templates/template14/css/tngtabs1.css TNG1403/templates/template14/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template14/css/tngtabs2.css TNG1403/templates/template14/css/tngtabs2.css
15d14
< 	-moz-border-radius: 4px 4px 0px 0px;
Only in TNG1403/templates/template14: fonts
diff -r TNG/templates/template14/footer.php TNG1403/templates/template14/footer.php
22c22
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template14/img: arrowright2.gif
diff -r TNG/templates/template14/index.php TNG1403/templates/template14/index.php
14c14
< $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=$title", $text['contactus_long'] );
---
> $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=" . urlencode($title), $text['contactus_long'] );
39c39,40
< 	echo showLinks($tmp['t14_featurelinks'],false,"","<span class=\"l\"></span><span class=\"r\"></span><span class=\"t\">xxx</span>");
---
> 	if($tmp['t14_featurelinks'])
> 		echo showLinks($tmp['t14_featurelinks'],false,"","<span class=\"l\"></span><span class=\"r\"></span><span class=\"t\">xxx</span>");
77c78
< 															    <input type="text" value="" name="myfirstname" />
---
> 															    <input type="text" value="" name="myfirstname" class="mediumfield" />
80c81
< 															    <input type="text" value="" name="mylastname" />
---
> 															    <input type="text" value="" name="mylastname" class="mediumfield" />
101c102,103
< 		echo "<li><a href=\"login.php\">{$text['mnulogon']}</a></li>";
---
> 		if( empty($tngconfig['showlogin']) )
> 			echo "<li><a href=\"login.php\">{$text['mnulogon']}</a></li>";
231c233
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
257c259
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template14/topmenu.php TNG1403/templates/template14/topmenu.php
33c33,34
< 	echo showLinks($tmp['t14_featurelinks'],false,"","<span class=\"l\"></span><span class=\"r\"></span><span class=\"t\">xxx</span>");
---
> 	if($tmp['t14_featurelinks'])
> 		echo showLinks($tmp['t14_featurelinks'],false,"","<span class=\"l\"></span><span class=\"r\"></span><span class=\"t\">xxx</span>");
diff -r TNG/templates/template15/css/templatestyle.css TNG1403/templates/template15/css/templatestyle.css
1c1,16
< @import url(https://fonts.googleapis.com/css?family=IM+Fell+Great+Primer);
---
> /* templatestyle.css for template 15 overrides to TNG genstyle.css   */
> 
> /* @import url(https://fonts.googleapis.com/css?family=IM+Fell+Great+Primer); */
> 
> @font-face {
>   font-family: 'IM Fell Great Primer';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/im-fell-great-primer-v21-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/im-fell-great-primer-v21-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/im-fell-great-primer-v21-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/im-fell-great-primer-v21-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/im-fell-great-primer-v21-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/im-fell-great-primer-v21-latin-regular.svg#IMFellGreatPrimer') format('svg'); /* Legacy iOS */
> }
69,75c84,85
< /* tables */
< 
< /*
< body {
< 	font-family:Roboto, sans-serif;
< 	background-color:#fff;
< 	color:#222;
---
> #thomebody h2, #tsidebar h3, #tmenu, h1, .plainheader, .adminsubhead {
> 	font-family: 'IM Fell Great Primer', sans-serif;
77c87,88
< */
---
> 
> /* tables */
105c116
< 	width:750px;
---
> 	width:850px;
210c221
< 	margin-right:30px;
---
> 	margin-right:45px;
430a442,446
> 
> .adminbody {
> 	background-color: #ccbaa9;
> }
> 
547d562
< .featured-content img,
595c610
< 	width:360px;
---
> 	width:400px;
627c642
< @media only screen and (max-width:1139px) {
---
> @media only screen and (max-width:1220px) {
753,755d767
< ::-moz-placeholder,
< :-moz-placeholder,
< :-ms-input-placeholder ,
807c819
< .databack { background-color:#D1C5B7; }
---
> .databack, .reportcol li:hover { background-color:#D1C5B7; }
919,932d930
< 
< @font-face {
<   font-family:'Roboto';
<   font-style:normal;
<   font-weight:300;
<   src:local('Roboto Light'), local('Roboto-Light'), url(https://fonts.Tgstatic.com/s/roboto/v13/Hgo13k-tfSpn0qi1SFdUfT8E0i7KZn-EPnyo3HZu7kw.woff) format('woff');
< }
< @font-face {
<   font-family:'Roboto';
<   font-style:normal;
<   font-weight:400;
<   src:local('Roboto Regular'), local('Roboto-Regular'), url(https://fonts.gstatic.com/s/roboto/v13/2UX7WLTfW3W8TclTUvlFyQ.woff) format('woff');
< }
< 
956a955,958
> }
> 
> .scroll-to-top {
> 	background-color: #D1C5B7;
diff -r TNG/templates/template15/css/tngmobile.css TNG1403/templates/template15/css/tngmobile.css
32a33,41
> }
> 
> .content {
>   float: left;
>   margin-right: 20px;
> }
> 
> .sidebar-primary {
>   float: left;
diff -r TNG/templates/template15/css/tngtabs1.css TNG1403/templates/template15/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template15/css/tngtabs2.css TNG1403/templates/template15/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
Only in TNG1403/templates/template15: fonts
diff -r TNG/templates/template15/footer.php TNG1403/templates/template15/footer.php
68c68
< 				echo tng_footer($flags);
---
> 				tng_footer($flags);
Only in TNG1403/templates/template15/img: arrowright2.gif
Binary files TNG/templates/template15/img/children.jpg and TNG1403/templates/template15/img/children.jpg differ
Binary files TNG/templates/template15/img/woman-sepia.jpg and TNG1403/templates/template15/img/woman-sepia.jpg differ
Binary files TNG/templates/template15/img/women.jpg and TNG1403/templates/template15/img/women.jpg differ
diff -r TNG/templates/template15/index.php TNG1403/templates/template15/index.php
20a21,23
> 							<?php
> 								if(!empty($tmp['t15_featurelink1'])) {
> 							?>
22a26,33
> 									<h2 class="entry-title"><a href="<?php echo $tmp['t15_featurelink1']; ?>"><?php echo getTemplateMessage('t15_featuretitle1'); ?></a></h2>
> 								</header>
> 							<?php
> 								}
> 								else {
> 							?>
> 								<img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_mainimage']; ?>" id="mainphoto" class="" alt="main image">
> 								<header class="entry-header">
24a36,38
> 							<?php
> 								}
> 							?>
37a52,54
> 							<?php
> 								if(!empty($tmp['t15_featurelink2'])) {
> 							?>
39c56
< 								<img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_featurethumb2']; ?>" alt="Lorem Ipsum" title="" class="" height="200" width="360"></a>
---
> 								<img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_featurethumb2']; ?>" alt="" title="" class="" width="405"></a>
42a60,70
> 							<?php
> 								}
> 								else {
> 							?>
> 								<img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_featurethumb2']; ?>" alt="" title="" class="" width="405">
> 								<header class="entry-header">
> 									<h2 class="entry-title"><?php echo getTemplateMessage('t15_featuretitle2'); ?></h2>
> 								</header>
> 							<?php
> 								}
> 							?>
48c76,80
< 								<a href="<?php echo $tmp['t15_featurelink3']; ?>" title="" class="alignnone"><img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_featurethumb3']; ?>" class="" alt="interest" height="200" width="360"></a>
---
> 							<?php
> 								if(!empty($tmp['t15_featurelink3'])) {
> 							?>
> 								<a href="<?php echo $tmp['t15_featurelink3']; ?>" title="" class="alignnone">
> 									<img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_featurethumb3']; ?>" alt="" title=""class="" width="405"></a>
51a84,94
> 							<?php
> 								}
> 								else {
> 							?>
> 								<img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_featurethumb3']; ?>" alt="" title="" class="" width="405">
> 								<header class="entry-header">
> 									<h2 class="entry-title"><?php echo getTemplateMessage('t15_featuretitle3'); ?></h2>
> 								</header>
> 							<?php
> 								}
> 							?>
93a137,139
> 						<?php
> 							if(!empty($tmp['t15_featurelink7'])) {
> 						?>
94a141,148
> 						<?php
> 							}
> 							else {
> 						?>
> 							<img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_featurethumb7']; ?>" class="" alt="" height="150" width="150">
> 						<?php
> 							}
> 						?>
101a156,158
> 						<?php
> 							if(!empty($tmp['t15_featurelink8'])) {
> 						?>
102a160,167
> 						<?php
> 							}
> 							else {
> 						?>
> 							<img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t15_featurethumb8']; ?>" class="" alt="" height="200" width="360">
> 						<?php
> 							}
> 						?>
109a175
> 		<br clear="both"/>
112,113c178,182
< echo tng_footer($flags);
< ?>
\ No newline at end of file
---
> tng_footer($flags);
> ?>
> 
> </body>
> </html>
\ No newline at end of file
diff -r TNG/templates/template15/topmenu.php TNG1403/templates/template15/topmenu.php
8a9
> <div class="scroll-to-top"><a href="#"><img src="<?php echo $cms['tngpath']; ?>img/backtotop.png" alt="" /></a></div>
14c15
< 				<li class="first menu-item current-menu-item"><a href="<?php echo $cms['tngpath'] . $homepage; ?>">Home</a></li>
---
> 				<li class="first menu-item current-menu-item"><a href="<?php echo $cms['tngpath'] . $homepage; ?>"><?php echo $text['homepage'];?></a></li>
26c27,28
< 	echo showLinks($tmp['t15_featurelinks'],false,"menu-item");
---
> 	if($tmp['t15_featurelinks'])
> 		echo showLinks($tmp['t15_featurelinks'],false,"menu-item");
diff -r TNG/templates/template16/css/templatestyle.css TNG1403/templates/template16/css/templatestyle.css
4,5c4,30
< @import url('https://fonts.googleapis.com/css?family=Rochester');
< @import url('https://fonts.googleapis.com/css?family=Quicksand:300');
---
> /* @import url('https://fonts.googleapis.com/css?family=Rochester'); */
> /* @import url('https://fonts.googleapis.com/css?family=Quicksand:300'); */
> /* rochester-regular - latin */
> @font-face {
>   font-family: 'Rochester';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/rochester-v18-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/rochester-v18-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/rochester-v18-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/rochester-v18-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/rochester-v18-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/rochester-v18-latin-regular.svg#Rochester') format('svg'); /* Legacy iOS */
> }
> @font-face {
>   font-family: 'Quicksand';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/quicksand-v30-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/quicksand-v30-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/quicksand-v30-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/quicksand-v30-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/quicksand-v30-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/quicksand-v30-latin-regular.svg#Quicksand') format('svg'); /* Legacy iOS */
> }
7c32
< #thomebody h2, #tsidebar h3, #tmenu, h1 {
---
> #thomebody h2, #tsidebar h3, #tmenu, h1, .plainheader, .adminsubhead, .admintotal {
28c53
< .databack, .snlink, div.innercontainer, ul.tngdd .langmenu, ul.tngdd .stubmenu, .LB_window {
---
> .databack, .snlink, div.innercontainer, ul.tngdd .langmenu, ul.tngdd .stubmenu, .LB_window, .reportcol li:hover {
31a57,60
> div.icons {
> 	position: absolute;
> }
> 
305a335,342
> .top-rounded-headline {
>     padding: 15px 15px 0px 20px;
> }
> 
> .searchsidebar {
> 	margin-right: 160px;
> }
> 
347a385,390
> }
> 
> @media (max-width: 1250px) {
> 	.searchsidebar {
> 		position: unset;
> 	}
diff -r TNG/templates/template16/css/tngmobile.css TNG1403/templates/template16/css/tngmobile.css
12d11
<   background-image: -moz-linear-gradient(to bottom, #5e8db5 0%, #2e5d85 100%);
diff -r TNG/templates/template16/css/tngtabs1.css TNG1403/templates/template16/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template16/css/tngtabs2.css TNG1403/templates/template16/css/tngtabs2.css
13d12
< 	padding: 0.4em 1em 0.3em 8px;
15d13
< 	-moz-border-radius: 4px 4px 0px 0px;
Only in TNG1403/templates/template16: fonts
diff -r TNG/templates/template16/footer.php TNG1403/templates/template16/footer.php
8c8
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template16/img: arrowright2.gif
diff -r TNG/templates/template16/index.php TNG1403/templates/template16/index.php
115c115
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
131c131
< 						<h2><?php echo getTemplateMessage('t16_welcome'); ?></h3>
---
> 						<h2><?php echo getTemplateMessage('t16_welcome'); ?></h2>
194c194
< 						<h2><?php echo $feature_headline ?></h3>
---
> 						<h2><?php echo $feature_headline ?></h2>
203c203
< 						<h2><?php echo $text['whatsnew'] . " | <a href=\"$whatsnew_url\">" . $text['more'] . "</a>"; ?></h3>
---
> 						<h2><?php echo $text['whatsnew'] . " | <a href=\"$whatsnew_url\">" . $text['more'] . "</a>"; ?></h2>
210c210
< 						<h2><?php echo $text['surnames'] . " | <a href=\"$surnames_url\">" . $text['more'] . "</a>"; ?></h3>
---
> 						<h2><?php echo $text['surnames'] . " | <a href=\"$surnames_url\">" . $text['more'] . "</a>"; ?></h2>
222c222
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
227c227,230
< </div>
\ No newline at end of file
---
> </div>
> 
> </body>
> </html>
\ No newline at end of file
diff -r TNG/templates/template16/topmenu.php TNG1403/templates/template16/topmenu.php
41c41,42
< 	echo showLinks($tmp['t16_featurelinks'],false);
---
> 	if($tmp['t16_featurelinks'])
> 		echo showLinks($tmp['t16_featurelinks'],false);
diff -r TNG/templates/template17/css/templatestyle.css TNG1403/templates/template17/css/templatestyle.css
1c1,39
< @import url('https://fonts.googleapis.com/css?family=Lusitana:400,700|Montserrat:400,500');
---
> /* templatestyle.css for template 17 overrides to TNG genstyle.css   */
> 
> /* @import url('https://fonts.googleapis.com/css?family=Lusitana:400,700|Montserrat:400,500'); */
> @font-face {
>   font-family: 'Lusitana';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/lusitana-v13-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/lusitana-v13-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/lusitana-v13-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/lusitana-v13-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/lusitana-v13-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/lusitana-v13-latin-regular.svg#Lusitana') format('svg'); /* Legacy iOS */
> }
> @font-face {
>   font-family: 'Montserrat';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/montserrat-v25-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/montserrat-v25-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/montserrat-v25-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/montserrat-v25-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/montserrat-v25-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/montserrat-v25-latin-regular.svg#Montserrat') format('svg'); /* Legacy iOS */
> }
> @font-face {
>   font-family: 'Montserrat';
>   font-style: normal;
>   font-weight: 500;
>   src: url('../fonts/montserrat-v25-latin-500.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/montserrat-v25-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/montserrat-v25-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/montserrat-v25-latin-500.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/montserrat-v25-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/montserrat-v25-latin-500.svg#Montserrat') format('svg'); /* Legacy iOS */
> }
162d199
< 	-moz-column-count:4; /* Firefox */
208c245
< .databack {
---
> .databack, .reportcol li:hover {
221a259,262
> .adminbody {
> 	background-color: #ccbaa9;
> }
> 
351d391
< 		-moz-column-count:2; /* Firefox */
370d409
< 		-moz-column-count:1; /* Firefox */
diff -r TNG/templates/template17/css/tngmobile.css TNG1403/templates/template17/css/tngmobile.css
14d13
<   background-image: -moz-linear-gradient(to bottom, #D99860 0%, #9b5520 100%);
diff -r TNG/templates/template17/css/tngtabs1.css TNG1403/templates/template17/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template17/css/tngtabs2.css TNG1403/templates/template17/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
Only in TNG1403/templates/template17: fonts
diff -r TNG/templates/template17/footer.php TNG1403/templates/template17/footer.php
7c7
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template17/img: arrowright2.gif
diff -r TNG/templates/template17/index.php TNG1403/templates/template17/index.php
186c186
< 	<h2><a href="<?php echo $tmp['t17_featurelink1']; ?>" title=""><?php echo getTemplateMessage('t17_featuretitle2'); ?></a></h2>
---
> 	<h2><a href="<?php echo $tmp['t17_featurelink2']; ?>" title=""><?php echo getTemplateMessage('t17_featuretitle2'); ?></a></h2>
189c189
< 		<div class="two-cols"><img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t17_featurethumb2']; ?>" alt="Lorem Ipsum" title="">
---
> 		<div class="two-cols"><img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t17_featurethumb2']; ?>" alt="" title="">
238c238
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
252c252
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
254a255,257
> 
> </body>
> </html>
\ No newline at end of file
diff -r TNG/templates/template17/topmenu.php TNG1403/templates/template17/topmenu.php
31c31,32
< 	echo showLinks($tmp['t17_featurelinks'],false);
---
> 	if($tmp['t17_featurelinks'])
> 		echo showLinks($tmp['t17_featurelinks'],false);
diff -r TNG/templates/template18/css/templatestyle.css TNG1403/templates/template18/css/templatestyle.css
1c1,27
< @import url('https://fonts.googleapis.com/css?family=Dancing+Script|Dosis:400,500');
---
> /* templatestyle.css for template 18 overrides to TNG genstyle.css   */
> 
> /* @import url('https://fonts.googleapis.com/css?family=Dancing+Script|Dosis:400,500'); */
> @font-face {
>   font-family: 'Dancing Script';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/dancing-script-v24-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/dancing-script-v24-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/dancing-script-v24-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/dancing-script-v24-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/dancing-script-v24-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/dancing-script-v24-latin-regular.svg#DancingScript') format('svg'); /* Legacy iOS */
> }
> @font-face {
>   font-family: 'Dosis';
>   font-style: normal;
>   font-weight: 400;
>   src: url('../fonts/dosis-v27-latin-regular.eot'); /* IE9 Compat Modes */
>   src: local(''),
>        url('../fonts/dosis-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
>        url('../fonts/dosis-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
>        url('../fonts/dosis-v27-latin-regular.woff') format('woff'), /* Modern Browsers */
>        url('../fonts/dosis-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
>        url('../fonts/dosis-v27-latin-regular.svg#Dosis') format('svg'); /* Legacy iOS */
> }
184d209
< 	-moz-column-count:4; /* Firefox */
226c251
< .databack {
---
> .databack, .reportcol li:hover {
239a265,268
> .adminbody {
> 	background-color: #8fc1e3;
> }
> 
272,275d300
< div.innercontainer {
<     border-bottom: 1px solid #999;
< }
< 
374d398
< 		-moz-column-count:2; /* Firefox */
393d416
< 		-moz-column-count:1; /* Firefox */
diff -r TNG/templates/template18/css/tngmobile.css TNG1403/templates/template18/css/tngmobile.css
14d13
<   background-image: -moz-linear-gradient(to bottom, #8fc1e3 0%, #4b8cb7 100%);
diff -r TNG/templates/template18/css/tngtabs1.css TNG1403/templates/template18/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template18/css/tngtabs2.css TNG1403/templates/template18/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
Only in TNG1403/templates/template18: fonts
diff -r TNG/templates/template18/footer.php TNG1403/templates/template18/footer.php
7c7
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template18/img: arrowright2.gif
diff -r TNG/templates/template18/index.php TNG1403/templates/template18/index.php
1,253c1,256
< <?php
< include($cms['tngpath'] . "surname_cloud.class.php");
< $flags['noicons'] = true;
< $flags['noheader'] = true;
< $flags['nobody'] = true;
< $tngconfig['showshare'] = false;
< tng_header( $sitename ? "" : $text['ourhist'], $flags );
< if(!$cms['support'] && $sitever != "mobile")
< 	echo "<body id=\"bodytop\" class=\"" . pathinfo(basename($_SERVER['SCRIPT_NAME']), PATHINFO_FILENAME) . " homebody\">\n";
< 
< $dadlabel = getTemplateMessage('t18_dadside');
< $momlabel = getTemplateMessage('t18_momside');
< ?>
< 
< <style>
< body {
< 	margin: 0px;
< 	background-color: #31708E;
< }
< 
< #mcontent {
< 	padding-top: 0px;
< }
< 
< #big-block-1 {
< 	background: url('<?php echo $cms['tngpath'] . $templatepath; ?><?php echo $tmp['t18_mainimage']; ?>');
< 	background-repeat: no-repeat;
< 	background-position: center 33%;
< 	background-size: 100% auto;
< 	height: 250px;
< }
< </style>
< 
< <div class="theader">
< 	<div id="thomemast" class="mast">
< 		<h1><?php echo getTemplateMessage('t18_maintitle'); ?></h1>
< 		<span class="tsubtitle"><?php echo getTemplateMessage('t18_headsubtitle'); ?></span>
< 	</div>
< 	<div id="tmenu">
< 		<ul>
< <?php
< 	if($dadlabel) {
< ?>
< 			<li>
< 				<a href="<?php echo $cms['tngpath']; ?>pedigree.php?personID=<?php echo $tmp['t18_dadperson']; ?>&amp;tree=<?php echo $tmp['t18_dadtree']; ?>"><?php echo $dadlabel; ?></a>
< 			</li>
< <?php		
< 	}
< 	if($momlabel) {
< ?>
< 			<li>
< 				<a href="<?php echo $cms['tngpath']; ?>pedigree.php?personID=<?php echo $tmp['t18_momperson']; ?>&amp;tree=<?php echo $tmp['t18_momtree']; ?>"><?php echo $momlabel; ?></a>
< 			</li>
< <?php		
< 	}
< 	echo showLinks($tmp['t18_featurelinks'],false);
< ?>
< 		</ul>
< 	</div>
< </div>
< <div class="tblock" id="big-block-1">
< 	<!--
< 	<div class="quote">
< 		<h2><?php echo getTemplateMessage('t18_welcome'); ?></h2>
< 		<p>Some other text goes here. Something about your family. Maybe a few paragraphs. blah blah blah blah.</p>
< 	</div>
< -->
< </div>
< <div class="tblock-dark" id="big-block-2">
< 	<div id="linkarea">
< 		<ul class="left-indent">
< 			<li class="linkcol">
< 				<article class="post">
< 					<header class="entry-header">
< 						<h2 class="entry-title"><?php echo getTemplateMessage('t18_welcome'); ?></h2></a>
< 					</header>
< 					<div class="entry-content">
< 						<?php echo getTemplateMessage('t18_mainpara'); ?>
< 					</div>
< <?php
< 	if( $currentuser ) {
< 	    echo "<p class=\"entry-content\"><strong>{$text['welcome']}, $currentuserdesc.</strong></p>\n";
< 		echo "<ul class=\"home-menus\">\n";
< 
< 		echo "<li><a href=\"logout.php\">{$text['mnulogout']}</a></li>\n";
< 	}
< 	else {
< 		echo "<ul class=\"home-menus\">\n";
< 		echo "<li><a href=\"login.php\">{$text['mnulogon']}</a></li>";
< 		if(!$tngconfig['disallowreg']) {
< ?>
< 			<li><a href="newacctform.php"><?php echo $text['mnuregister']; ?></a></li></p>
< <?php
< 		}
< 	}
< 
< 	echo "</ul>\n";
< ?>
< 					<br />
< 				</article>
< 			</li>
< 			<li class="linkcol">
< 				<article class="post">
<        				<h2 class="entry-title"><?php echo $text['search']; ?></h2>
< 					<form method="get" name="searchform" action="search.php" class="entry-content" id="home-search-box">
< 						<div style="display:inline-block;">
< 						  	<label for="myfirstname"><?php echo $text['firstname']; ?></label><br/>
< 						    <input type="text" value="" name="myfirstname" />
< 						    <br /><br />
< 						  	<label for="mylastname"><?php echo $text['lastname']; ?></label><br/>
< 						    <input type="text" value="" name="mylastname" />
< 						    <br/>
< 							<input type="hidden" name="mybool" value="AND" />
< 						</div>
< 						<div style="display:inline-block;vertical-align:top;padding:15px">
< 							<input type="submit" id="search-submit" class="btn" value="<?php echo $text['search']; ?>" />
< 							<br /><br />
< 							<ul class="home-menus">
< 								<li><a href="surnames.php"><?php echo $text['surnames']; ?></a></li>
< 								<li><a href="searchform.php"><?php echo $text['mnuadvancedsearch']; ?></a></li>
< 							</ul>
< 						</div>
< 					</form>
< 
< <?php
< 	if($chooselang) {
< ?>
< 														<div class="left-indent">
< 															<br/>
< <?php
< 		$query = "SELECT languageID, display, folder FROM $languages_table ORDER BY display";
< 		$result = tng_query($query);
< 		$numlangs = tng_num_rows( $result );
< 
< 		if($numlangs > 1) {
< 			echo getFORM( "savelanguage2", "get", "tngmenu3", "" );
< 			echo "<select name=\"newlanguage3\" id=\"newlanguage3\" style=\"font-size:11px;\" onchange=\"document.tngmenu3.submit();\">";
< 
< 			while( $row = tng_fetch_assoc($result)) {
< 				echo "<option value=\"{$row['languageID']}\"";
< 				if( $languages_path . $row['folder'] == $mylanguage )
< 					echo " selected=\"selected\"";
< 				echo ">{$row['display']}</option>\n";
< 			}
< 			echo "</select>\n";
< 			echo "<input type=\"hidden\" name=\"instance\" value=\"3\" /></form>\n";
< 		}
< 
< 		tng_free_result($result);
< ?>
< 														</div>
< <?php
< 	}
< ?>
< 
< 					<div class="left-indent">
< 						<h3 class="entry-title"><?php echo $text['contactus']; ?></h3>
< 						<p class="entry-content"><img src="<?php echo $cms['tngpath'] . $templatepath; ?>img/email.gif" alt="email image" class="emailimg" /><?php echo $text['contactus_long']; ?></p>
< 					</div>
< 				</article>
< 			</li>
< 			<li class="linkcol">
< 				<article class="post">
< 					<header class="entry-header">
< 						<a href="<?php echo $tmp['t18_featurelink1']; ?>" title="" class="alignnone"><h2 class="entry-title"><?php echo getTemplateMessage('t18_featuretitle1'); ?></h2></a>
< 					</header>
< 					<div class="entry-content">
< 						<?php 
< 							echo getTemplateMessage('t18_featurepara1'); 
< 							$tl1 = getTemplateMessage('t18_featurelink1');
< 							if($tl1) {
< 						?>
< 							<p><a class="footer-link" href="<?php echo $tl1; ?>"><?php echo $text['more']; ?> ...</a></p>
< 						<?php
< 							}
< 						?>
< 					</div>
< 				</article>
< 			</li>
< 		</ul>
< 	</div>
< 	<div style="clear:left"></div>
< </div>
< <div class="tblock" id="big-block-3">
< 	<h2><a href="<?php echo $tmp['t18_featurelink2']; ?>" title=""><?php echo getTemplateMessage('t18_featuretitle2'); ?></a></h2>
< 	<div class="left-indent mainsection">
< 		<br/>
< 		<div class="two-cols"><img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t18_featurethumb2']; ?>" alt="Lorem Ipsum" title="">
< 		<?php 
< 			echo getTemplateMessage('t18_featurepara2'); 
< 			$tl2 = getTemplateMessage('t18_featurelink2');
< 			if($tl2) {
< 		?>
< 			<p><a class="footer-link" href="<?php echo $tl2; ?>"><?php echo $text['more']; ?> ...</a></p>
< 		<?php
< 			}
< 		?>
< 	</div>
< 	</div>
< 	<div style="clear:left"></div>
< </div>
< <div id="tfooter">
< 	<div class="other-features">
< 		<h2><?php echo $text['mnufeatures']; ?></h2>
< 	</div>
< 	<div class="linkcol2">
< 		<ul class="fancy_list newspaper2">
< 			<li><a href="whatsnew.php"><?php echo $text['mnuwhatsnew']; ?></a></li>
< 			<li><a href="mostwanted.php"><?php echo $text['mostwanted']; ?></a></li>
< 			<li><a href="places.php"><?php echo $text['places']; ?></a></li>
< 			<li><a href="browsenotes.php"><?php echo $text['notes']; ?></a></li>
< 			<li><a href="anniversaries.php"><?php echo $text['anniversaries']; ?></a></li>
< 			<li><a href="calendar.php"><?php echo $text['calendar']; ?></a></li>
< 			<li><a href="reports.php"><?php echo $text['reports']; ?></a></li>
< 			<li><a href="statistics.php"><?php echo $text['mnustatistics']; ?></a></li>
< <?php
< 	foreach( $mediatypes as $mediatype ) {
< 		if(!$mediatype['disabled']) {
< 			echo "<li><a href=\"browsemedia.php?mediatypeID={$mediatype['ID']}\">{$mediatype['display']}</a></li>\n";
< 		}
< 	}
< ?>
< 			<li><a href="browsemedia.php"><?php echo $text['allmedia']; ?></a></li>
< 			<li><a href="browsealbums.php"><?php echo $text['albums']; ?></a></li>
< 			<li><a href="cemeteries.php"><?php echo $text['mnucemeteries']; ?></a></li>
< 			<li><a href="browsesources.php"><?php echo $text['mnusources']; ?></a></li>
< 			<li><a href="browserepos.php"><?php echo $text['repositories']; ?></a></li>
< <?php
<     if( !$tngconfig['hidedna'] ) {
< ?>
< 			<li><a href="browse_dna_tests.php"><?php echo $text['dna_tests']; ?></a></li>
< <?php
< 	}
< ?>
< 			<li><a href="bookmarks.php"><?php echo $text['bookmarks']; ?></a></li>
< <?php
< 	if( $allow_admin ) {
< ?>
< 			<li><a href="showlog.php"><?php echo $text['mnushowlog']; ?></a></li>
< 			<li><a href="admin.php"><?php echo $text['mnuadmin']; ?></a></li>
< <?php
< 	}
< ?>
< 		</ul>
< 	</div>
< 	<div style="clear:left"></div>
< </div>
< <div id="subfooter">
< <?php
< 	$flags['basicfooter'] = true;
< 	echo tng_footer($flags);
< ?>
< </div>
---
> <?php
> include($cms['tngpath'] . "surname_cloud.class.php");
> $flags['noicons'] = true;
> $flags['noheader'] = true;
> $flags['nobody'] = true;
> $tngconfig['showshare'] = false;
> tng_header( $sitename ? "" : $text['ourhist'], $flags );
> if(!$cms['support'] && $sitever != "mobile")
> 	echo "<body id=\"bodytop\" class=\"" . pathinfo(basename($_SERVER['SCRIPT_NAME']), PATHINFO_FILENAME) . " homebody\">\n";
> 
> $dadlabel = getTemplateMessage('t18_dadside');
> $momlabel = getTemplateMessage('t18_momside');
> ?>
> 
> <style>
> body {
> 	margin: 0px;
> 	background-color: #31708E;
> }
> 
> #mcontent {
> 	padding-top: 0px;
> }
> 
> #big-block-1 {
> 	background: url('<?php echo $cms['tngpath'] . $templatepath; ?><?php echo $tmp['t18_mainimage']; ?>');
> 	background-repeat: no-repeat;
> 	background-position: center 33%;
> 	background-size: 100% auto;
> 	height: 250px;
> }
> </style>
> 
> <div class="theader">
> 	<div id="thomemast" class="mast">
> 		<h1><?php echo getTemplateMessage('t18_maintitle'); ?></h1>
> 		<span class="tsubtitle"><?php echo getTemplateMessage('t18_headsubtitle'); ?></span>
> 	</div>
> 	<div id="tmenu">
> 		<ul>
> <?php
> 	if($dadlabel) {
> ?>
> 			<li>
> 				<a href="<?php echo $cms['tngpath']; ?>pedigree.php?personID=<?php echo $tmp['t18_dadperson']; ?>&amp;tree=<?php echo $tmp['t18_dadtree']; ?>"><?php echo $dadlabel; ?></a>
> 			</li>
> <?php		
> 	}
> 	if($momlabel) {
> ?>
> 			<li>
> 				<a href="<?php echo $cms['tngpath']; ?>pedigree.php?personID=<?php echo $tmp['t18_momperson']; ?>&amp;tree=<?php echo $tmp['t18_momtree']; ?>"><?php echo $momlabel; ?></a>
> 			</li>
> <?php		
> 	}
> 	echo showLinks(getTemplateMessage('t18_featurelinks'),false);
> ?>
> 		</ul>
> 	</div>
> </div>
> <div class="tblock" id="big-block-1">
> 	<!--
> 	<div class="quote">
> 		<h2><?php echo getTemplateMessage('t18_welcome'); ?></h2>
> 		<p>Some other text goes here. Something about your family. Maybe a few paragraphs. blah blah blah blah.</p>
> 	</div>
> -->
> </div>
> <div class="tblock-dark" id="big-block-2">
> 	<div id="linkarea">
> 		<ul class="left-indent">
> 			<li class="linkcol">
> 				<article class="post">
> 					<header class="entry-header">
> 						<h2 class="entry-title"><?php echo getTemplateMessage('t18_welcome'); ?></h2></a>
> 					</header>
> 					<div class="entry-content">
> 						<?php echo getTemplateMessage('t18_mainpara'); ?>
> 					</div>
> <?php
> 	if( $currentuser ) {
> 	    echo "<p class=\"entry-content\"><strong>{$text['welcome']}, $currentuserdesc.</strong></p>\n";
> 		echo "<ul class=\"home-menus\">\n";
> 
> 		echo "<li><a href=\"logout.php\">{$text['mnulogout']}</a></li>\n";
> 	}
> 	else {
> 		echo "<ul class=\"home-menus\">\n";
> 		echo "<li><a href=\"login.php\">{$text['mnulogon']}</a></li>";
> 		if(!$tngconfig['disallowreg']) {
> ?>
> 			<li><a href="newacctform.php"><?php echo $text['mnuregister']; ?></a></li></p>
> <?php
> 		}
> 	}
> 
> 	echo "</ul>\n";
> ?>
> 					<br />
> 				</article>
> 			</li>
> 			<li class="linkcol">
> 				<article class="post">
>        				<h2 class="entry-title"><?php echo $text['search']; ?></h2>
> 					<form method="get" name="searchform" action="search.php" class="entry-content" id="home-search-box">
> 						<div style="display:inline-block;">
> 						  	<label for="myfirstname"><?php echo $text['firstname']; ?></label><br/>
> 						    <input type="text" value="" name="myfirstname" />
> 						    <br /><br />
> 						  	<label for="mylastname"><?php echo $text['lastname']; ?></label><br/>
> 						    <input type="text" value="" name="mylastname" />
> 						    <br/>
> 							<input type="hidden" name="mybool" value="AND" />
> 						</div>
> 						<div style="display:inline-block;vertical-align:top;padding:15px">
> 							<input type="submit" id="search-submit" class="btn" value="<?php echo $text['search']; ?>" />
> 							<br /><br />
> 							<ul class="home-menus">
> 								<li><a href="surnames.php"><?php echo $text['surnames']; ?></a></li>
> 								<li><a href="searchform.php"><?php echo $text['mnuadvancedsearch']; ?></a></li>
> 							</ul>
> 						</div>
> 					</form>
> 
> <?php
> 	if($chooselang) {
> ?>
> 														<div class="left-indent">
> 															<br/>
> <?php
> 		$query = "SELECT languageID, display, folder FROM $languages_table ORDER BY display";
> 		$result = tng_query($query);
> 		$numlangs = tng_num_rows( $result );
> 
> 		if($numlangs > 1) {
> 			echo getFORM( "savelanguage2", "get", "tngmenu3", "" );
> 			echo "<select name=\"newlanguage3\" id=\"newlanguage3\" style=\"font-size:11px;\" onchange=\"document.tngmenu3.submit();\">";
> 
> 			while( $row = tng_fetch_assoc($result)) {
> 				echo "<option value=\"{$row['languageID']}\"";
> 				if( $languages_path . $row['folder'] == $mylanguage )
> 					echo " selected=\"selected\"";
> 				echo ">{$row['display']}</option>\n";
> 			}
> 			echo "</select>\n";
> 			echo "<input type=\"hidden\" name=\"instance\" value=\"3\" /></form>\n";
> 		}
> 
> 		tng_free_result($result);
> ?>
> 														</div>
> <?php
> 	}
> ?>
> 
> 					<div class="left-indent">
> 						<h3 class="entry-title"><?php echo $text['contactus']; ?></h3>
> 						<p class="entry-content"><img src="<?php echo $cms['tngpath'] . $templatepath; ?>img/email.gif" alt="email image" class="emailimg" /><?php echo $text['contactus_long']; ?></p>
> 					</div>
> 				</article>
> 			</li>
> 			<li class="linkcol">
> 				<article class="post">
> 					<header class="entry-header">
> 						<a href="<?php echo $tmp['t18_featurelink1']; ?>" title="" class="alignnone"><h2 class="entry-title"><?php echo getTemplateMessage('t18_featuretitle1'); ?></h2></a>
> 					</header>
> 					<div class="entry-content">
> 						<?php 
> 							echo getTemplateMessage('t18_featurepara1'); 
> 							$tl1 = getTemplateMessage('t18_featurelink1');
> 							if($tl1) {
> 						?>
> 							<p><a class="footer-link" href="<?php echo $tl1; ?>"><?php echo $text['more']; ?> ...</a></p>
> 						<?php
> 							}
> 						?>
> 					</div>
> 				</article>
> 			</li>
> 		</ul>
> 	</div>
> 	<div style="clear:left"></div>
> </div>
> <div class="tblock" id="big-block-3">
> 	<h2><a href="<?php echo $tmp['t18_featurelink2']; ?>" title=""><?php echo getTemplateMessage('t18_featuretitle2'); ?></a></h2>
> 	<div class="left-indent mainsection">
> 		<br/>
> 		<div class="two-cols"><img src="<?php echo $cms['tngpath'] . $templatepath . $tmp['t18_featurethumb2']; ?>" alt="Lorem Ipsum" title="">
> 		<?php 
> 			echo getTemplateMessage('t18_featurepara2'); 
> 			$tl2 = getTemplateMessage('t18_featurelink2');
> 			if($tl2) {
> 		?>
> 			<p><a class="footer-link" href="<?php echo $tl2; ?>"><?php echo $text['more']; ?> ...</a></p>
> 		<?php
> 			}
> 		?>
> 	</div>
> 	</div>
> 	<div style="clear:left"></div>
> </div>
> <div id="tfooter">
> 	<div class="other-features">
> 		<h2><?php echo $text['mnufeatures']; ?></h2>
> 	</div>
> 	<div class="linkcol2">
> 		<ul class="fancy_list newspaper2">
> 			<li><a href="whatsnew.php"><?php echo $text['mnuwhatsnew']; ?></a></li>
> 			<li><a href="mostwanted.php"><?php echo $text['mostwanted']; ?></a></li>
> 			<li><a href="places.php"><?php echo $text['places']; ?></a></li>
> 			<li><a href="browsenotes.php"><?php echo $text['notes']; ?></a></li>
> 			<li><a href="anniversaries.php"><?php echo $text['anniversaries']; ?></a></li>
> 			<li><a href="calendar.php"><?php echo $text['calendar']; ?></a></li>
> 			<li><a href="reports.php"><?php echo $text['reports']; ?></a></li>
> 			<li><a href="statistics.php"><?php echo $text['mnustatistics']; ?></a></li>
> <?php
> 	foreach( $mediatypes as $mediatype ) {
> 		if(!$mediatype['disabled']) {
> 			echo "<li><a href=\"browsemedia.php?mediatypeID={$mediatype['ID']}\">{$mediatype['display']}</a></li>\n";
> 		}
> 	}
> ?>
> 			<li><a href="browsemedia.php"><?php echo $text['allmedia']; ?></a></li>
> 			<li><a href="browsealbums.php"><?php echo $text['albums']; ?></a></li>
> 			<li><a href="cemeteries.php"><?php echo $text['mnucemeteries']; ?></a></li>
> 			<li><a href="browsesources.php"><?php echo $text['mnusources']; ?></a></li>
> 			<li><a href="browserepos.php"><?php echo $text['repositories']; ?></a></li>
> <?php
>     if( !$tngconfig['hidedna'] ) {
> ?>
> 			<li><a href="browse_dna_tests.php"><?php echo $text['dna_tests']; ?></a></li>
> <?php
> 	}
> ?>
> 			<li><a href="bookmarks.php"><?php echo $text['bookmarks']; ?></a></li>
> <?php
> 	if( !empty($allow_admin) ) {
> ?>
> 			<li><a href="showlog.php"><?php echo $text['mnushowlog']; ?></a></li>
> 			<li><a href="admin.php"><?php echo $text['mnuadmin']; ?></a></li>
> <?php
> 	}
> ?>
> 		</ul>
> 	</div>
> 	<div style="clear:left"></div>
> </div>
> <div id="subfooter">
> <?php
> 	$flags['basicfooter'] = true;
> 	tng_footer($flags);
> ?>
> </div>
> 
> </body>
> </html>
\ No newline at end of file
diff -r TNG/templates/template18/topmenu.php TNG1403/templates/template18/topmenu.php
31c31,32
< 	echo showLinks($tmp['t18_featurelinks'],false);
---
> 	if($tmp['t18_featurelinks'])
> 		echo showLinks(getTemplateMessage('t18_featurelinks'),false);
Only in TNG1403/templates: template19
diff -r TNG/templates/template2/css/templatestyle.css TNG1403/templates/template2/css/templatestyle.css
2a3,28
> /* override to TNG genstyle.css for DNA Compare reports for template 2   */
> .overflowauto {
> 	width: 98vw;
> }
> /*  reduce overflowauto for laptops and tablets */
> @media only screen and (min-width:1200px) and (max-width:1550px) {
> 	.overflowauto {
> 		width: 97.5vw;
> 	}
> }
> @media only screen and (max-width:1280px) {
> 	.overflowauto {
> 		width: 97vw;
> 	}
> }
> @media only screen and (max-width:1024px) {
> 	.overflowauto {
> 		width: 96vw;
> 	}
> }
> @media only screen and (max-width:768px) {
> 	.overflowauto {
> 		width: 95vw;
> 	}
> }
> 
29a56,59
> .adminbody {
> 	background-color: #e0e0bd;
> }
> 
254c284
< div.innercontainer, ul.tngdd .langmenu, ul.tngdd .stubmenu, .databack {
---
> div.innercontainer, ul.tngdd .langmenu, ul.tngdd .stubmenu, .databack, .reportcol li:hover {
260c290,294
< 	background-color: #FFF6DB;  
---
> 	background-color: #FFF6DB;
> }
> 
> div.icons {
> 	position: absolute;
279,280c313
< 	font-family:Georgia,Arial,sans-serif;
< 	color:#676037;
---
> 	color:#403911;
284d316
< 	font-family:Georgia,Arial,sans-serif;
290,291c322
< 	font-family:Georgia,Arial,sans-serif;
< 	color:#676037;
---
> 	color: #403911;
297d327
< 	font-family:Georgia,Arial,sans-serif;
301a332,339
> .maintitle, .mmaintitle, .smalltitle, .headertitle, .admin-banner h1 {
>   	font-family:Georgia,Arial,sans-serif;
> }
> 
> a.smalltitle, a.smalltitle:link {
> 	color: #403911;
> }
> 
diff -r TNG/templates/template2/css/tngtabs1.css TNG1403/templates/template2/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template2/css/tngtabs2.css TNG1403/templates/template2/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template2/footer.php TNG1403/templates/template2/footer.php
18c18
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template2/img: arrowright2.gif
diff -r TNG/templates/template2/index.php TNG1403/templates/template2/index.php
64c64
< 		echo "<div style=\"max-width:390px;padding-left:20px\">$mainpara</div><br/>\n";
---
> 		echo "<div style=\"max-width:600px;padding-left:20px;color:#333\">$mainpara</div><br/>\n";
119,120c119,120
< 								<td valign="top"><a href="<?php echo $cms['tngpath']; ?>showlog.php" class="sidelink"><?php if( $allow_admin ) echo $text['mnushowlog']; ?></a></td><td>&nbsp;&nbsp;&nbsp;</td>
< 								<td valign="top"><a href="<?php echo $cms['tngpath']; ?>admin.php" class="sidelink"><?php if( $allow_admin ) echo $text['mnuadmin']; ?></a>&nbsp;</td><td>&nbsp;&nbsp;&nbsp;</td>
---
> 								<td valign="top"><a href="<?php echo $cms['tngpath']; ?>showlog.php" class="sidelink"><?php if( !empty($allow_admin) ) echo $text['mnushowlog']; ?></a></td><td>&nbsp;&nbsp;&nbsp;</td>
> 								<td valign="top"><a href="<?php echo $cms['tngpath']; ?>admin.php" class="sidelink"><?php if( !empty($allow_admin) ) echo $text['mnuadmin']; ?></a>&nbsp;</td><td>&nbsp;&nbsp;&nbsp;</td>
176c176
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates: template20
Only in TNG1403/templates: template21
diff -r TNG/templates/template3/css/templatestyle.css TNG1403/templates/template3/css/templatestyle.css
2a3,29
> /* override to TNG genstyle.css for DNA Compare reports for template 3   */
> .overflowauto {
> 	width: 98vw;
> }
> /*  reduce overflowauto for laptops and tablets */
> @media only screen and (min-width:1200px) and (max-width:1550px) {
> 	.overflowauto {
> 		width: 97.9vw;
> 	}
> }
> @media only screen and (max-width:1280px) {
> 	.overflowauto {
> 		width: 97.5vw;
> 	}
> }
> @media only screen and (max-width:1024px) {
> 	.overflowauto {
> 		width: 97vw;
> 	}
> }
> @media only screen and (max-width:768px) {
> 	.overflowauto {
> 		width: 95vw;
> 	}
> }
> /* end overrides of for DNA Compare reports */
> 
10a38
> 	margin: 10px 20px 10px 20px;
32a61,64
> .adminbody {
> 	background-color: #efddb2;
> }
> 
50d81
< 	-moz-column-count:2; /* Firefox */
68d98
<   -moz-box-shadow:    1px 1px 2px 1px #666;
123c153
< 	width: 800;
---
> 	width: 800px;
198,200d227
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #E8D5A9, #B8A579);
< 	background-image:     url(../img/ArrowDown.gif), -ms-linear-gradient(top, #E8D5A9, #B8A579);
< 	background-image:      url(../img/ArrowDown.gif), -o-linear-gradient(top, #E8D5A9, #B8A579);
223,225d249
< 	background-image:    -moz-linear-gradient(top, #E8D5A9, #B8A579);
< 	background-image:     -ms-linear-gradient(top, #E8D5A9, #B8A579);
< 	background-image:      -o-linear-gradient(top, #E8D5A9, #B8A579);
229c253
< .databack {
---
> .databack, .reportcol li:hover {
235c259
< 	background-color: #DFD1B4;  
---
> 	background-color: #DFD1B4;
248d271
< 	font-family:Georgia,Arial,sans-serif;
253d275
< 	font-family:Georgia,Arial,sans-serif;
266d287
< 	font-family:Georgia,Arial,sans-serif;
269a291,294
> .maintitle, .mmaintitle, .toptitle, .admin-banner h1 {
>   	font-family:Georgia,Arial,sans-serif;
> }
> 
291a317,319
> 	body {
> 		margin: 8px;
> 	}
diff -r TNG/templates/template3/css/tngmobile.css TNG1403/templates/template3/css/tngmobile.css
3d2
<   background-image: -moz-linear-gradient(to bottom, #5E8B50 0%, #2E5C1F 100%);
diff -r TNG/templates/template3/css/tngtabs1.css TNG1403/templates/template3/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template3/css/tngtabs2.css TNG1403/templates/template3/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template3/footer.php TNG1403/templates/template3/footer.php
3c3
< <table width="100%" cellspacing="0" cellpadding="5" class="tableborder rounded4 t3shadow">
---
> <table style="width: 100%; border-spacing: 0px; padding: 5px;" class="tableborder rounded4 t3shadow">
9c9
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template3/img: arrowright2.gif
diff -r TNG/templates/template3/index.php TNG1403/templates/template3/index.php
112d111
< 			<a href="<?php echo $cms['tngpath']; ?>browsemedia.php?mediatypeID=headstones"><?php echo $text['mnutombstones']; ?></a> &nbsp;|&nbsp;
140c139
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
160c159
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template3/topmenu.php TNG1403/templates/template3/topmenu.php
5c5
< <table width="100%" cellspacing="0" cellpadding="5" class="tableborder rounded10 t3shadow">
---
> <table style="width: 100%; border-spacing: 0px; padding: 5px;" class="tableborder rounded10 t3shadow">
diff -r TNG/templates/template4/css/templatestyle.css TNG1403/templates/template4/css/templatestyle.css
2a3,28
> /* override to TNG genstyle.css for DNA Compare reports for template 4   */
> .overflowauto {
> 	width: 87vw;
> }
> /*  reduce overflowauto for laptops and tablets */
> @media only screen and (min-width:1280px) and (max-width:1550px) {
> 	.overflowauto {
> 		width: 85vw;
> 	}
> }
> @media only screen and (max-width:1280px) {
> 	.overflowauto {
> 		width: 80vw;
> 	}
> }
> @media only screen and (max-width:1024px) {
> 	.overflowauto {
> 		width: 78vw;
> 	}
> }
> @media only screen and (max-width:768px) {
> 	.overflowauto {
> 		width: 67vw;
> 	}
> }
> 
126c152,156
< 	filter: dropshadow(color=#000000, offx=1, offy=1);
---
> 	filter: drop-shadow(color=#000000, offx=1, offy=1);
> }
> 
> .admin-banner h1 {
>   font-family: Georgia, "Times New Roman", Times, Serif;
194a225
> 	width: 100%;
243d273
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #E5E5B1, #C5C591);
268d297
< 	background-image:    -moz-linear-gradient(top, #E5E5B1, #C5C591);
274c303
< .databack {
---
> .databack, .reportcol li:hover {
280c309
< 	background-color: #DDDDBB;  
---
> 	background-color: #DDDDBB;
290a320,326
> .margin-top {
> 	margin-top: 10px;
> }
> .margin-bottom {
> 	margin-bottom: 10px;
> }
> 
307c343
< 	filter: dropshadow(color=#000000, offx=1, offy=1);
---
> 	filter: drop-shadow(color=#000000, offx=1, offy=1);
336a373,375
> 	.menuback {
> 		width: 140px;
> 	}
diff -r TNG/templates/template4/css/tngmobile.css TNG1403/templates/template4/css/tngmobile.css
7d6
<   background-image: -moz-linear-gradient(to bottom, #bb0000 0%, #880000 100%);
diff -r TNG/templates/template4/css/tngtabs1.css TNG1403/templates/template4/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template4/css/tngtabs2.css TNG1403/templates/template4/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template4/family1.php TNG1403/templates/template4/family1.php
2,11c2
<    global $cms;
< include( "../begin.php");   
< if( !$cms['support'] )
< 	$cms['tngpath'] = "../";   // set path for a subfolder
< include($cms['tngpath'] ."genlib.php");
< include($cms['tngpath'] ."getlang.php");
< include($cms['tngpath'] ."$mylanguage/text.php");
< 
< include($cms['tngpath'] ."checklogin.php");
< include($cms['tngpath'] . "log.php" );
---
> include("tng_begin.php");
56c47
< For additional information see the TNG Wiki article on creating User Pages or histories using the historytemplate.php file at http://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Getting_Started and http://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Multi-Language
---
> For additional information see the TNG Wiki article on creating User Pages or histories using the historytemplate.php file at https://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Getting_Started and https://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Multi-Language
diff -r TNG/templates/template4/feature1.php TNG1403/templates/template4/feature1.php
2,10c2
< include( "../begin.php");   
< if( !$cms['support'] )
< 	$cms['tngpath'] = "../";
< include($cms['tngpath'] ."genlib.php");
< include($cms['tngpath'] ."getlang.php");
< include($cms['tngpath'] ."$mylanguage/text.php");
< 
< include($cms['tngpath'] ."checklogin.php");
< include($cms['tngpath'] . "log.php" );
---
> include("tng_begin.php");
40c32
< For additional information see the TNG Wiki article on creating User Pages or histories using the historytemplate.php file at http://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Getting_Started and http://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Multi-Language
---
> For additional information see the TNG Wiki article on creating User Pages or histories using the historytemplate.php file at https://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Getting_Started and https://tng.lythgoes.net/wiki/index.php?title=User_Pages_-_Multi-Language
diff -r TNG/templates/template4/footer.php TNG1403/templates/template4/footer.php
16c16
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template4/img: arrowright2.gif
diff -r TNG/templates/template4/index.php TNG1403/templates/template4/index.php
12c12
< $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=$title", $text['contactus_long'] );
---
> $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=" . urlencode($title), $text['contactus_long'] );
27,28c27,28
< 			<tr><td><span class="fieldname"><?php echo $text['mnufirstname']; ?>:<br /><input type="text" name="myfirstname" class="searchbox" size="14" /></span></td></tr>
< 			<tr><td><span class="fieldname"><?php echo $text['mnulastname']; ?>: <br /><input type="text" name="mylastname" class="searchbox" size="14" /></span></td></tr>
---
> 			<tr><td><span class="fieldname"><?php echo $text['mnufirstname']; ?>:<br /><input type="text" name="myfirstname" class="mediumfield" size="14" /></span></td></tr>
> 			<tr><td><span class="fieldname"><?php echo $text['mnulastname']; ?>: <br /><input type="text" name="mylastname" class="mediumfield" size="14" /></span></td></tr>
51c51
< 		echo "<li><a href=\"mostwanted.php\" class=\"lightlink\">{$text['mostwanted']}</a></li>\n";
---
> 		echo "<li class=\"margin-bottom\"><a href=\"mostwanted.php\" class=\"lightlink\">{$text['mostwanted']}</a></li>\n";
58d57
< 
61c60,61
< 		echo "<li><a href=\"cemeteries.php\" class=\"lightlink\">{$text['mnucemeteries']}</a></li>\n";
---
> 
> 		echo "<li class=\"margin-top\"><a href=\"cemeteries.php\" class=\"lightlink\">{$text['mnucemeteries']}</a></li>\n";
73c73
< 		if( $allow_admin ) {
---
> 		if( !empty($allow_admin) ) {
78c78
< 		echo "<li><a href=\"suggest.php?page=$title\" class=\"lightlink\">{$text['contactus']}</a></li>\n";
---
> 		echo "<li><a href=\"suggest.php?page=" . urlencode($title) . "\" class=\"lightlink\">{$text['contactus']}</a></li>\n";
222c222
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template4/topmenu.php TNG1403/templates/template4/topmenu.php
14,15c14,15
< 			<tr><td><span class="fieldname"><?php echo $text['mnufirstname']; ?>:<br /><input type="text" name="myfirstname" class="searchbox" size="14" /></span></td></tr>
< 			<tr><td><span class="fieldname"><?php echo $text['mnulastname']; ?>: <br /><input type="text" name="mylastname" class="searchbox" size="14" /></span></td></tr>
---
> 			<tr><td><span class="fieldname"><?php echo $text['mnufirstname']; ?>:<br /><input type="text" name="myfirstname" class="mediumfield" size="14" /></span></td></tr>
> 			<tr><td><span class="fieldname"><?php echo $text['mnulastname']; ?>: <br /><input type="text" name="mylastname" class="mediumfield" size="14" /></span></td></tr>
38c38
< 	echo "<li><a href=\"{$cms['tngpath']}mostwanted.php\" class=\"lightlink\">{$text['mostwanted']}</a></li>\n";
---
> 	echo "<li class=\"margin-bottom\"><a href=\"{$cms['tngpath']}mostwanted.php\" class=\"lightlink\">{$text['mostwanted']}</a></li>\n";
45d44
< 
48c47,48
< 	echo "<li><a href=\"{$cms['tngpath']}cemeteries.php\" class=\"lightlink\">{$text['mnucemeteries']}</a></li>\n";
---
> 	
> 	echo "<li class=\"margin-top\"><a href=\"{$cms['tngpath']}cemeteries.php\" class=\"lightlink\">{$text['mnucemeteries']}</a></li>\n";
diff -r TNG/templates/template5/css/templatestyle.css TNG1403/templates/template5/css/templatestyle.css
2a3,7
> /* override to TNG genstyle.css for DNA Compare reports for template 5   */
> .overflowauto {
> 	width: 94vw;
> }
> 
37c42
< .databack {
---
> .databack, .reportcol li:hover {
43c48
< 	background-color: #EEEEDD;  
---
> 	background-color: #EEEEDD;
380,382d384
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #CBE9ED, #9BB9BD);
< 	background-image:     url(../img/ArrowDown.gif), -ms-linear-gradient(top, #CBE9ED, #9BB9BD);
< 	background-image:      url(../img/ArrowDown.gif), -o-linear-gradient(top, #CBE9ED, #9BB9BD);
405,407d406
< 	background-image:    -moz-linear-gradient(top, #CBE9ED, #9BB9BD);
< 	background-image:     -ms-linear-gradient(top, #CBE9ED, #9BB9BD);
< 	background-image:      -o-linear-gradient(top, #CBE9ED, #9BB9BD);
diff -r TNG/templates/template5/css/tngmobile.css TNG1403/templates/template5/css/tngmobile.css
3d2
<   background-image: -moz-linear-gradient(to bottom, #729FA7 0%, #37717C 100%);
diff -r TNG/templates/template5/css/tngtabs1.css TNG1403/templates/template5/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template5/css/tngtabs2.css TNG1403/templates/template5/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template5/footer.php TNG1403/templates/template5/footer.php
4c4
< <tr><td class="tablesubheader" align="center"><div class="topmenu" style="text-align:center">
---
> <tr><td class="tablesubheader"><div class="topmenu" style="text-align:center">
30c30
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template5/img: arrowright2.gif
diff -r TNG/templates/template5/index.php TNG1403/templates/template5/index.php
13c13
< $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=$title", $text['contactus_long'] );
---
> $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=" . urlencode($title), $text['contactus_long'] );
88c88
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
192c192
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template5/topmenu.php TNG1403/templates/template5/topmenu.php
65c65
< 	  		<table width="100%" cellspacing="0" cellpadding="7" border="0"><tr><td style="border-collapse:separate">
---
> 	  		<table style="width: 100%; border-spacing: 0px; padding: 7px; border: 0px;"><tr><td style="border-collapse:separate">
diff -r TNG/templates/template6/css/templatestyle.css TNG1403/templates/template6/css/templatestyle.css
2a3,23
> /* override to TNG genstyle.css for DNA Compare reports for template 6   */
> .overflowauto {
> 	width: 99vw;
> }
> /*  reduce overflowauto for laptops and tablets */
> @media only screen and (min-width:1200px) and (max-width:1550px) {
> 	.overflowauto {
> 		width: 98vw;
> 	}
> }
> @media only screen and (max-width:1280px) {
> 	.overflowauto {
> 		width: 97vw;
> 	}
> }
> @media only screen and (max-width:768px) {
> 	.overflowauto {
> 		width: 96vw;
> 	}
> }
> 
52c73
< .databack {
---
> .databack, .reportcol li:hover {
58c79,83
< 	background-color: #FCF9F3;  
---
> 	background-color: #FCF9F3;
> }
> 
> div.icons {
> 	position: absolute;
81a107,110
> .adminbody {
> 	background-color: #bfa17b;
> }
> 
diff -r TNG/templates/template6/css/tngtabs1.css TNG1403/templates/template6/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template6/css/tngtabs2.css TNG1403/templates/template6/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template6/footer.php TNG1403/templates/template6/footer.php
14c14
< 				echo tng_footer($flags);
---
> 				tng_footer($flags);
Only in TNG1403/templates/template6/img: arrowright2.gif
diff -r TNG/templates/template6/index.php TNG1403/templates/template6/index.php
103c103
< 	    [<a href="http://www.gendexnetwork.org">GenDex Network</a>]<br />[<a href="http://www.familytreeseeker.com">FamilyTreeSeeker.com</a>]</p>
---
> 	    [<a href="https://www.familytreeseeker.com">FamilyTreeSeeker.com</a>]</p>
265c265
< echo tng_footer('');
---
> tng_footer('');
diff -r TNG/templates/template7/css/templatestyle.css TNG1403/templates/template7/css/templatestyle.css
2a3,28
> /* override to TNG genstyle.css for DNA Compare reports for template 7   */
> .overflowauto {
> 	width: 87vw;
> }
> /*  reduce overflowauto for laptops and tablets */
> @media only screen and (min-width:1200px) and (max-width:1550px) {
> 	.overflowauto {
> 		width: 84vw;
> 	}
> }
> @media only screen and (max-width:1280px) {
> 	.overflowauto {
> 		width: 80vw;
> 	}
> }
> @media only screen and (max-width:1024px) {
> 	.overflowauto {
> 		width: 78vw;
> 	}
> }
> @media only screen and (max-width:768px) {
> 	.overflowauto {
> 		width: 67vw;
> 	}
> }
> 
30c56
< 	background-color : #edead9;
---
> 	background-color : #fff;
33a60
> 	margin: 0px;
50,53c77,78
< .databack {
< 	/*these 2 lines added in 5.0*/
< 	border-right: 1px solid #f2f2e9;
< 	border-bottom: 1px solid #f2f2e9;
---
> .databack, .reportcol li:hover {
> 	border: 1px solid #ccc;
58c83
< 	background-color: #EEEEDD;  
---
> 	background-color: #EEEEDD;
120d144
< 	-moz-border-radius: 4px;
131d154
< 	-moz-border-radius: 4px;
147a171,174
> .adminbody {
> 	background-color:  #edead9;
> }
> 
194a222
> 	padding-right: 10px;
diff -r TNG/templates/template7/css/tngmobile.css TNG1403/templates/template7/css/tngmobile.css
3d2
<   background-image: -moz-linear-gradient(to bottom, #C5BD93 0%, #A59C6F 100%);
diff -r TNG/templates/template7/css/tngtabs1.css TNG1403/templates/template7/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template7/css/tngtabs2.css TNG1403/templates/template7/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template7/footer.php TNG1403/templates/template7/footer.php
14c14
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template7/img: arrowright2.gif
diff -r TNG/templates/template7/index.php TNG1403/templates/template7/index.php
84c84
< 	else {
---
> 	elseif( empty($tngconfig['showlogin']) ) {
112c112
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
117c117
< 	echo "<a href=\"suggest.php?page=$title\" class=\"lightlink\">{$text['contactus']}</a><br />\n";
---
> 	echo "<a href=\"suggest.php?page=" . urlencode($title) . "\" class=\"lightlink\">{$text['contactus']}</a><br />\n";
191c191
< 					$tngquery = "SELECT lastname, firstname, changedate, personID, gedcom, living, private, branch, lnprefix, title, suffix, prefix FROM $people_table ORDER BY changedate DESC LIMIT 10";
---
> 					$tngquery = "SELECT lastname, firstname, changedate, personID, gedcom, living, private, branch, lnprefix, title, suffix, prefix, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr FROM $people_table ORDER BY changedate DESC LIMIT 10";
194c194
< 					$found = tng_num_rows( $resulttng );
---
> 					$lastadd = "";
242c242
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/templates/template7/topmenu.php TNG1403/templates/template7/topmenu.php
83c83
< 	else {
---
> 	elseif( empty($tngconfig['showlogin']) ) {
diff -r TNG/templates/template8/css/templatestyle.css TNG1403/templates/template8/css/templatestyle.css
5c5
< 	background: #211a16 url(../img/border.gif) repeat-y;
---
> 	background: #211a16;
78c78
< .databack {
---
> .databack, .reportcol li:hover {
102a103,106
> .adminbody {
> 	background-image: url(../img/bg.gif);
> }
> 
148d151
< 	-moz-border-radius: 10px 0px 0px 10px;
196d198
< 	-moz-border-radius: 3px 4px 4px 3px;
258d259
<     width: 8px;
diff -r TNG/templates/template8/css/tngmobile.css TNG1403/templates/template8/css/tngmobile.css
7d6
<   background-image: -moz-linear-gradient(to bottom, #6B584A 0%, #413226 100%);
diff -r TNG/templates/template8/css/tngtabs1.css TNG1403/templates/template8/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template8/css/tngtabs2.css TNG1403/templates/template8/css/tngtabs2.css
16d15
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template8/footer.php TNG1403/templates/template8/footer.php
8c8
< 				echo tng_footer($flags);
---
> 				tng_footer($flags);
Only in TNG1403/templates/template8/img: arrowright2.gif
diff -r TNG/templates/template8/index.php TNG1403/templates/template8/index.php
49a50
> 		<li><a href="browsealbums.php"<?php echo $text['albums']; ?></a></li>
118c119
< 	$text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=$title", $text['contactus_long'] );
---
> 	$text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=" . urlencode($title), $text['contactus_long'] );
147c148
< echo tng_footer($flags);
---
> tng_footer($flags);
diff -r TNG/templates/template8/topmenu.php TNG1403/templates/template8/topmenu.php
59c59
<     $title = getTemplateMessage('t6_maintitle'); 
---
>     $title = "";
diff -r TNG/templates/template9/css/templatestyle.css TNG1403/templates/template9/css/templatestyle.css
0a1,2
> /* templatestyle.css for template 9 overrides to TNG genstyle.css   */
> 
349a352,355
> .admin-banner h1 {
>   font-family: "Lucida Calligraphy","Apple Chancery",Arial, Helvetica, Sans-Serif;
> }
> 
753d758
<   -moz-border-radius: 6px 6px 6px 6px;
937d941
<   -moz-border-radius: 4px 4px 4px 4px;
1529d1532
<   -moz-border-radius: 6px 6px 6px 6px;
1774c1777
< .databack {
---
> .databack, .reportcol li:hover {
1777a1781,1784
> div.icons {
>   position: absolute;
> }
> 
1830d1836
< 	background-image:    url(../img/ArrowDown.gif), -moz-linear-gradient(top, #f5efe9, #c5bfb9);
1855d1860
< 	background-image:    -moz-linear-gradient(top, #f5efe9, #c5bfb9);
1944c1949
<       filter: dropshadow(color=#333333, offx=1, offy=1);
---
>       filter: drop-shadow(color=#333333, offx=1, offy=1);
diff -r TNG/templates/template9/css/tngmobile.css TNG1403/templates/template9/css/tngmobile.css
7d6
<   background-image: -moz-linear-gradient(to bottom, #DF632D 0%, #B44211 100%);
diff -r TNG/templates/template9/css/tngtabs1.css TNG1403/templates/template9/css/tngtabs1.css
34a35
> 	position: relative;
49a51
> 	position: relative;
diff -r TNG/templates/template9/css/tngtabs2.css TNG1403/templates/template9/css/tngtabs2.css
15d14
< 	-moz-border-radius: 4px 4px 0px 0px;
diff -r TNG/templates/template9/footer.php TNG1403/templates/template9/footer.php
18c18
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
Only in TNG1403/templates/template9/img: arrowright2.gif
diff -r TNG/templates/template9/index.php TNG1403/templates/template9/index.php
30c30
< $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=$title", $text['contactus_long'] );
---
> $text['contactus_long'] = str_replace( "suggest.php", "suggest.php?page=" . urlencode($title), $text['contactus_long'] );
132c132
< 	if( $allow_admin ) {
---
> 	if( !empty($allow_admin) ) {
184c184
< 	    echo "<p><strong>{$text['welcome']}, $currentuserdesc.</strong> <a href=\"logout.php\">{$text['mnulogout']}</a></p>\n";
---
> 	    echo "<p class=\"subhead\"><strong>{$text['welcome']}, $currentuserdesc.</strong> <a href=\"logout.php\">{$text['mnulogout']}</a></p>\n";
196c196
< 			echo "<p>$loginContent</p>\n";
---
> 			echo "<p class=\"subhead\">$loginContent</p>\n";
292c292
< 							echo showLinks($tmp['t9_featurelinks']);
---
> 							echo showLinks($tmp['t9_featurelinks'], true);
332c332
< 							echo showLinks($tmp['t9_reslinks']);
---
> 							echo showLinks($tmp['t9_reslinks'], true);
356c356
< 	echo tng_footer($flags);
---
> 	tng_footer($flags);
diff -r TNG/tfpdf.php TNG1403/tfpdf.php
1,2408c1,2391
< <?php
< /*******************************************************************************
< * tFPDF (based on FPDF 1.7)                                                    *
< *                                                                              *
< * Version:  1.24                                                               *
< * Date:     2011-09-24                                                         *
< * Author:   Ian Back <ianb@bpm1.com>                                           *
< * License:  LGPL                                                               *
< *******************************************************************************/
< 
< define('tFPDF_VERSION','1.24');
< 
< class tFPDF
< {
< 
< var $unifontSubset;
< var $page;               // current page number
< var $n;                  // current object number
< var $offsets;            // array of object offsets
< var $buffer;             // buffer holding in-memory PDF
< var $pages;              // array containing pages
< var $state;              // current document state
< var $compress;           // compression flag
< var $k;                  // scale factor (number of points in user unit)
< var $DefOrientation;     // default orientation
< var $CurOrientation;     // current orientation
< var $StdPageSizes;       // standard page sizes
< var $DefPageSize;        // default page size
< var $CurPageSize;        // current page size
< var $PageSizes;          // used for pages with non default sizes or orientations
< var $wPt, $hPt;          // dimensions of current page in points
< var $w, $h;              // dimensions of current page in user unit
< var $lMargin;            // left margin
< var $tMargin;            // top margin
< var $rMargin;            // right margin
< var $bMargin;            // page break margin
< var $cMargin;            // cell margin
< var $x, $y;              // current position in user unit
< var $lasth;              // height of last printed cell
< var $LineWidth;          // line width in user unit
< var $fontpath;           // path containing fonts
< var $CoreFonts;          // array of core font names
< var $fonts;              // array of used fonts
< var $FontFiles;          // array of font files
< var $diffs;              // array of encoding differences
< var $FontFamily;         // current font family
< var $FontStyle;          // current font style
< var $underline;          // underlining flag
< var $CurrentFont;        // current font info
< var $FontSizePt;         // current font size in points
< var $FontSize;           // current font size in user unit
< var $DrawColor;          // commands for drawing color
< var $FillColor;          // commands for filling color
< var $TextColor;          // commands for text color
< var $ColorFlag;          // indicates whether fill and text colors are different
< var $ws;                 // word spacing
< var $images;             // array of used images
< var $PageLinks;          // array of links in pages
< var $links;              // array of internal links
< var $AutoPageBreak;      // automatic page breaking
< var $PageBreakTrigger;   // threshold used to trigger page breaks
< var $InHeader;           // flag set when processing header
< var $InFooter;           // flag set when processing footer
< var $ZoomMode;           // zoom display mode
< var $LayoutMode;         // layout display mode
< var $title;              // title
< var $subject;            // subject
< var $author;             // author
< var $keywords;           // keywords
< var $creator;            // creator
< var $AliasNbPages;       // alias for total number of pages
< var $PDFVersion;         // PDF version number
< 
< /*******************************************************************************
< *                                                                              *
< *                               Public methods                                 *
< *                                                                              *
< *******************************************************************************/
< function tFPDF($orientation='P', $unit='mm', $size='A4')
< {
<   global $session_charset;
< 
<   $this->charset = $session_charset;
< 
< 	// Some checks
< 	$this->_dochecks();
< 	// Initialization of properties
< 	$this->page = 0;
< 	$this->n = 2;
< 	$this->buffer = '';
< 	$this->pages = array();
< 	$this->PageSizes = array();
< 	$this->state = 0;
< 	$this->fonts = array();
< 	$this->FontFiles = array();
< 	$this->diffs = array();
< 	$this->images = array();
< 	$this->links = array();
< 	$this->InHeader = false;
< 	$this->InFooter = false;
< 	$this->lasth = 0;
< 	$this->FontFamily = '';
< 	$this->FontStyle = '';
< 	$this->FontSizePt = 12;
< 	$this->underline = false;
< 	$this->DrawColor = '0 G';
< 	$this->FillColor = '0 g';
< 	$this->TextColor = '0 g';
< 	$this->ColorFlag = false;
< 	$this->ws = 0;
< 	// Font path
< 	if(defined('FPDF_FONTPATH'))
< 	{
< 		$this->fontpath = FPDF_FONTPATH;
< 		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
< 			$this->fontpath .= '/';
< 	}
< 	elseif(is_dir(dirname(__FILE__).'/font'))
< 		$this->fontpath = dirname(__FILE__).'/font/';
< 	else
< 		$this->fontpath = '';
< 	// Core fonts
< 	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats');
< 	// Scale factor
< 	if($unit=='pt')
< 		$this->k = 1;
< 	elseif($unit=='mm')
< 		$this->k = 72/25.4;
< 	elseif($unit=='cm')
< 		$this->k = 72/2.54;
< 	elseif($unit=='in')
< 		$this->k = 72;
< 	else
< 		$this->Error('Incorrect unit: '.$unit);
< 	// Page sizes
< 	$this->StdPageSizes = array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
< 		'letter'=>array(612,792), 'legal'=>array(612,1008));
< 	$size = $this->_getpagesize($size);
< 	$this->DefPageSize = $size;
< 	$this->CurPageSize = $size;
< 	// Page orientation
< 	$orientation = strtolower($orientation);
< 	if($orientation=='p' || $orientation=='portrait')
< 	{
< 		$this->DefOrientation = 'P';
< 		$this->w = $size[0];
< 		$this->h = $size[1];
< 	}
< 	elseif($orientation=='l' || $orientation=='landscape')
< 	{
< 		$this->DefOrientation = 'L';
< 		$this->w = $size[1];
< 		$this->h = $size[0];
< 	}
< 	else
< 		$this->Error('Incorrect orientation: '.$orientation);
< 	$this->CurOrientation = $this->DefOrientation;
< 	$this->wPt = $this->w*$this->k;
< 	$this->hPt = $this->h*$this->k;
< 	// Page margins (1 cm)
< 	$margin = 28.35/$this->k;
< 	$this->SetMargins($margin,$margin);
< 	// Interior cell margin (1 mm)
< 	$this->cMargin = $margin/10;
< 	// Line width (0.2 mm)
< 	$this->LineWidth = .567/$this->k;
< 	// Automatic page break
< 	$this->SetAutoPageBreak(true,2*$margin);
< 	// Default display mode
< 	$this->SetDisplayMode('default');
< 	// Enable compression
< 	$this->SetCompression(true);
< 	// Set default PDF version number
< 	$this->PDFVersion = '1.3';
< }
< 
< function SetMargins($left, $top, $right=null)
< {
< 	// Set left, top and right margins
< 	$this->lMargin = $left;
< 	$this->tMargin = $top;
< 	if($right===null)
< 		$right = $left;
< 	$this->rMargin = $right;
< }
< 
< function SetLeftMargin($margin)
< {
< 	// Set left margin
< 	$this->lMargin = $margin;
< 	if($this->page>0 && $this->x<$margin)
< 		$this->x = $margin;
< }
< 
< function SetTopMargin($margin)
< {
< 	// Set top margin
< 	$this->tMargin = $margin;
< }
< 
< function SetRightMargin($margin)
< {
< 	// Set right margin
< 	$this->rMargin = $margin;
< }
< 
< function SetAutoPageBreak($auto, $margin=0)
< {
< 	// Set auto page break mode and triggering margin
< 	$this->AutoPageBreak = $auto;
< 	$this->bMargin = $margin;
< 	$this->PageBreakTrigger = $this->h-$margin;
< }
< 
< function SetDisplayMode($zoom, $layout='default')
< {
< 	// Set display mode in viewer
< 	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
< 		$this->ZoomMode = $zoom;
< 	else
< 		$this->Error('Incorrect zoom display mode: '.$zoom);
< 	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
< 		$this->LayoutMode = $layout;
< 	else
< 		$this->Error('Incorrect layout display mode: '.$layout);
< }
< 
< function SetCompression($compress)
< {
< 	// Set page compression
< 	if(function_exists('gzcompress'))
< 		$this->compress = $compress;
< 	else
< 		$this->compress = false;
< }
< 
< function SetTitle($title, $isUTF8=false)
< {
< 	// Title of document
< 	if($isUTF8)
< 		$title = $this->_UTF8toUTF16($title);
< 	$this->title = utf8_decode($title);
< }
< 
< function SetSubject($subject, $isUTF8=false)
< {
< 	// Subject of document
< 	if($isUTF8)
< 		$subject = $this->_UTF8toUTF16($subject);
< 	$this->subject = $subject;
< }
< 
< function SetAuthor($author, $isUTF8=false)
< {
< 	// Author of document
< 	if($isUTF8)
< 		$author = $this->_UTF8toUTF16($author);
< 	$this->author = $author;
< }
< 
< function SetKeywords($keywords, $isUTF8=false)
< {
< 	// Keywords of document
< 	if($isUTF8)
< 		$keywords = $this->_UTF8toUTF16($keywords);
< 	$this->keywords = $keywords;
< }
< 
< function SetCreator($creator, $isUTF8=false)
< {
< 	// Creator of document
< 	if($isUTF8)
< 		$creator = $this->_UTF8toUTF16($creator);
< 	$this->creator = $creator;
< }
< 
< function AliasNbPages($alias='{nb}')
< {
< 	// Define an alias for total number of pages
< 	$this->AliasNbPages = $alias;
< }
< 
< function Error($msg)
< {
< 	// Fatal error
< 	die('<b>FPDF error:</b> '.$msg);
< }
< 
< function Open()
< {
< 	// Begin document
< 	$this->state = 1;
< }
< 
< function Close()
< {
< 	// Terminate document
< 	if($this->state==3)
< 		return;
< 	if($this->page==0)
< 		$this->AddPage();
< 	// Page footer
< 	$this->InFooter = true;
< 	$this->Footer();
< 	$this->InFooter = false;
< 	// Close page
< 	$this->_endpage();
< 	// Close document
< 	$this->_enddoc();
< }
< 
< function AddPage($orientation='', $size='')
< {
< 	// Start a new page
< 	if($this->state==0)
< 		$this->Open();
< 	$family = $this->FontFamily;
< 	$style = $this->FontStyle.($this->underline ? 'U' : '');
< 	$fontsize = $this->FontSizePt;
< 	$lw = $this->LineWidth;
< 	$dc = $this->DrawColor;
< 	$fc = $this->FillColor;
< 	$tc = $this->TextColor;
< 	$cf = $this->ColorFlag;
< 	if($this->page>0)
< 	{
< 		// Page footer
< 		$this->InFooter = true;
< 		$this->Footer();
< 		$this->InFooter = false;
< 		// Close page
< 		$this->_endpage();
< 	}
< 	// Start new page
< 	$this->_beginpage($orientation,$size);
< 	// Set line cap style to square
< 	$this->_out('2 J');
< 	// Set line width
< 	$this->LineWidth = $lw;
< 	$this->_out(sprintf('%.2F w',$lw*$this->k));
< 	// Set font
< 	if($family)
< 		$this->SetFont($family,$style,$fontsize);
< 	// Set colors
< 	$this->DrawColor = $dc;
< 	if($dc!='0 G')
< 		$this->_out($dc);
< 	$this->FillColor = $fc;
< 	if($fc!='0 g')
< 		$this->_out($fc);
< 	$this->TextColor = $tc;
< 	$this->ColorFlag = $cf;
< 	// Page header
< 	$this->InHeader = true;
< 	$this->Header();
< 	$this->InHeader = false;
< 	// Restore line width
< 	if($this->LineWidth!=$lw)
< 	{
< 		$this->LineWidth = $lw;
< 		$this->_out(sprintf('%.2F w',$lw*$this->k));
< 	}
< 	// Restore font
< 	if($family)
< 		$this->SetFont($family,$style,$fontsize);
< 	// Restore colors
< 	if($this->DrawColor!=$dc)
< 	{
< 		$this->DrawColor = $dc;
< 		$this->_out($dc);
< 	}
< 	if($this->FillColor!=$fc)
< 	{
< 		$this->FillColor = $fc;
< 		$this->_out($fc);
< 	}
< 	$this->TextColor = $tc;
< 	$this->ColorFlag = $cf;
< }
< 
< function Header()
< {
< 	// To be implemented in your own inherited class
< }
< 
< function Footer()
< {
< 	// To be implemented in your own inherited class
< }
< 
< function PageNo()
< {
< 	// Get current page number
< 	return $this->page;
< }
< 
< function SetDrawColor($r, $g=null, $b=null)
< {
< 	// Set color for all stroking operations
< 	if(($r==0 && $g==0 && $b==0) || $g===null)
< 		$this->DrawColor = sprintf('%.3F G',$r/255);
< 	else
< 		$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
< 	if($this->page>0)
< 		$this->_out($this->DrawColor);
< }
< 
< function SetFillColor($r, $g=null, $b=null)
< {
< 	// Set color for all filling operations
< 	if(($r==0 && $g==0 && $b==0) || $g===null)
< 		$this->FillColor = sprintf('%.3F g',$r/255);
< 	else
< 		$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
< 	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
< 	if($this->page>0)
< 		$this->_out($this->FillColor);
< }
< 
< function SetTextColor($r, $g=null, $b=null)
< {
< 	// Set color for text
< 	if(($r==0 && $g==0 && $b==0) || $g===null)
< 		$this->TextColor = sprintf('%.3F g',$r/255);
< 	else
< 		$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
< 	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
< }
< 
< function GetStringWidth($s)
< {
< 	// Get width of a string in the current font
< 	$s = (string)$s;
< 	$cw = &$this->CurrentFont['cw'];
< 	$w=0;
< 	if ($this->unifontSubset) {
< 		$unicode = $this->UTF8StringToArray($s);
< 		foreach($unicode as $char) {
< 			if (isset($cw[$char])) { $w += (ord($cw[2*$char])<<8) + ord($cw[2*$char+1]); }
< 			else if($char>0 && $char<128 && isset($cw[chr($char)])) { $w += $cw[chr($char)]; }
< 			else if(isset($this->CurrentFont['desc']['MissingWidth'])) { $w += $this->CurrentFont['desc']['MissingWidth']; }
< 			else if(isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; }
< 			else { $w += 500; }
< 		}
< 	}
< 	else {
< 		$l = strlen($s);
< 		for($i=0;$i<$l;$i++)
< 			$w += $cw[$s[$i]];
< 	}
< 	return $w*$this->FontSize/1000;
< }
< 
< function SetLineWidth($width)
< {
< 	// Set line width
< 	$this->LineWidth = $width;
< 	if($this->page>0)
< 		$this->_out(sprintf('%.2F w',$width*$this->k));
< }
< 
< function Line($x1, $y1, $x2, $y2)
< {
< 	// Draw a line
< 	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
< }
< 
< function Rect($x, $y, $w, $h, $style='')
< {
< 	// Draw a rectangle
< 	if($style=='F')
< 		$op = 'f';
< 	elseif($style=='FD' || $style=='DF')
< 		$op = 'B';
< 	else
< 		$op = 'S';
< 	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
< }
< 
< function AddFont($family, $style='', $file='', $uni=false)
< {
< 	//echo "fam=$family, style=$style<br>";
< 	// Add a TrueType, OpenType or Type1 font
< 	$ucFamily = $family;
< 	if(!$uni) $family = strtolower($family);
< 	$style = strtoupper($style);
< 	if($file=='') {
< 	   if ($uni) {
< 		$file = str_replace(' ','',$family).strtolower($style).'.ttf';
< 	   }
< 	   else {
< 		$file = str_replace(' ','',$family).strtolower($style).'.php';
< 	   }
< 	}
< 	$fontkey = $family.$style;
< 	//echo "setting key=$fontkey<br>\n";
< 	if(isset($this->fonts[$fontkey]))
< 		return;
< 
< 	if ($uni) {
< 		if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file )) { $ttffilename = _SYSTEM_TTFONTS.$file ; }
< 		else { $ttffilename = $this->_getfontpath().'unifont/'.$ucFamily . "/" . $file ; }
< 		$unifilename = $this->_getfontpath().'unifont/'.$ucFamily . "/" . strtolower(substr($file ,0,(strpos($file ,'.'))));
< 		$name = '';
< 		$originalsize = 0;
< 		$ttfstat = stat($ttffilename);
< 		if (file_exists($unifilename.'.mtx.php')) {
< 			include($unifilename.'.mtx.php');
< 		}
< 		if (!isset($type) ||  !isset($name) || $originalsize != $ttfstat['size']) {
< 			$ttffile = $ttffilename;
< 			require_once($this->_getfontpath().'unifont/ttfonts.php');
< 			$ttf = new TTFontFile();
< 			$ttf->getMetrics($ttffile);
< 			$cw = $ttf->charWidths;
< 			$name = preg_replace('/[ ()]/','',$ttf->fullName);
< 
< 			$desc= array('Ascent'=>round($ttf->ascent),
< 			'Descent'=>round($ttf->descent),
< 			'CapHeight'=>round($ttf->capHeight),
< 			'Flags'=>$ttf->flags,
< 			'FontBBox'=>'['.round($ttf->bbox[0])." ".round($ttf->bbox[1])." ".round($ttf->bbox[2])." ".round($ttf->bbox[3]).']',
< 			'ItalicAngle'=>$ttf->italicAngle,
< 			'StemV'=>round($ttf->stemV),
< 			'MissingWidth'=>round($ttf->defaultWidth));
< 			$up = round($ttf->underlinePosition);
< 			$ut = round($ttf->underlineThickness);
< 			$originalsize = $ttfstat['size']+0;
< 			$type = 'TTF';
< 			// Generate metrics .php file
< 			$s='<?php'."\n";
< 			$s.='$name=\''.$name."';\n";
< 			$s.='$type=\''.$type."';\n";
< 			$s.='$desc='.var_export($desc,true).";\n";
< 			$s.='$up='.$up.";\n";
< 			$s.='$ut='.$ut.";\n";
< 			$s.='$ttffile=\''.$ttffile."';\n";
< 			$s.='$originalsize='.$originalsize.";\n";
< 			$s.='$fontkey=\''.$fontkey."';\n";
< 			$s.="?>";
< 			if (is_writable(dirname($this->_getfontpath().'unifont/'.'x'))) {
< 				$fh = fopen($unifilename.'.mtx.php',"w");
< 				fwrite($fh,$s,strlen($s));
< 				fclose($fh);
< 				$fh = fopen($unifilename.'.cw.dat',"wb");
< 				fwrite($fh,$cw,strlen($cw));
< 				fclose($fh);
< 				@unlink($unifilename.'.cw127.php');
< 			}
< 			unset($ttf);
< 		}
< 		else {
< 			$cw = @file_get_contents($unifilename.'.cw.dat'); 
< 		}
< 		$i = count($this->fonts)+1;
< 		if(!empty($this->AliasNbPages))
< 			$sbarr = range(0,57);
< 		else
< 			$sbarr = range(0,32);
< 		$this->fonts[$fontkey] = array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'ttffile'=>$ttffile, 'fontkey'=>$fontkey, 'subset'=>$sbarr, 'unifilename'=>$unifilename);
< 
< 		$this->FontFiles[$fontkey]=array('length1'=>$originalsize, 'type'=>"TTF", 'ttffile'=>$ttffile);
< 		$this->FontFiles[$file]=array('type'=>"TTF");
< 		unset($cw);
< 	}
< 	else {
< 		$info = $this->_loadfont($family . "/" . $file);
< 		$info['i'] = count($this->fonts)+1;
< 		if(!empty($info['diff']))
< 		{
< 			// Search existing encodings
< 			$n = array_search($info['diff'],$this->diffs);
< 			if(!$n)
< 			{
< 				$n = count($this->diffs)+1;
< 				$this->diffs[$n] = $info['diff'];
< 			}
< 			$info['diffn'] = $n;
< 		}
< 		if(!empty($info['file']))
< 		{
< 			// Embedded font
< 			if($info['type']=='TrueType')
< 				$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
< 			else
< 				$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
< 		}
< 		$this->fonts[$fontkey] = $info;
< 	}
< }
< 
< function SetFont($family, $style='', $size=0)
< {
< 	//if($this->charset == "UTF-8")
< 		//$style = "";
< 	// Select a font; size given in points
< 	if($family=='')
< 		$family = $this->FontFamily;
< 	//else
< 		//$family = strtolower($family);
< 	if($this->charset != "UTF-8") {
< 		$style = strtoupper($style);
< 		if(strpos($style,'U')!==false)
< 		{
< 			$this->underline = true;
< 			$style = str_replace('U','',$style);
< 		}
< 		else
< 			$this->underline = false;
< 		if($style=='IB')
< 			$style = 'BI';
< 		if($size==0)
< 			$size = $this->FontSizePt;
< 	}
< 	//$style = strtolower($style);
< 	// Test if font is already selected
< 	//echo "testing $family, style=$style<br>\n";
< 	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
< 		return;
< 	// Test if font is already loaded
< 	$fontkey = $family.$style;
< 	//echo "fontkey $fontkey<br>\n";
< 	if(!isset($this->fonts[$fontkey]))
< 	{
< 		// Test if one of the core fonts
< 		if($family=='arial')
< 			$family = 'helvetica';
< 		if(in_array($family,$this->CoreFonts))
< 		{
< 			if($family=='symbol' || $family=='zapfdingbats')
< 				$style = '';
< 			$fontkey = $family.$style;
< 			if(!isset($this->fonts[$fontkey]))
< 				$this->AddFont($family,$style);
< 		}
< 		else
< 			$this->Error('Undefined font: '.$family.' '.$style);
< 	}
< 	// Select it
< 	//echo "got $family<br>\n";
< 	$this->FontFamily = $family;
< 	$this->FontStyle = $style;
< 	$this->FontSizePt = $size;
< 	$this->FontSize = $size/$this->k;
< 	$this->CurrentFont = &$this->fonts[$fontkey];
< 	if ($this->fonts[$fontkey]['type']=='TTF') { $this->unifontSubset = true; }
< 	else { $this->unifontSubset = false; }
< 	if($this->page>0)
< 		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
< }
< 
< function SetFontSize($size)
< {
< 	// Set font size in points
< 	if($this->FontSizePt==$size)
< 		return;
< 	$this->FontSizePt = $size;
< 	$this->FontSize = $size/$this->k;
< 	if($this->page>0)
< 		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
< }
< 
< function AddLink()
< {
< 	// Create a new internal link
< 	$n = count($this->links)+1;
< 	$this->links[$n] = array(0, 0);
< 	return $n;
< }
< 
< function SetLink($link, $y=0, $page=-1)
< {
< 	// Set destination of internal link
< 	if($y==-1)
< 		$y = $this->y;
< 	if($page==-1)
< 		$page = $this->page;
< 	$this->links[$link] = array($page, $y);
< }
< 
< function Link($x, $y, $w, $h, $link)
< {
< 	// Put a link on the page
< 	$this->PageLinks[$this->page][] = array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
< }
< 
< function Text($x, $y, $txt)
< {
< 	// Output a string
< 	if ($this->unifontSubset)
< 	{
< 		$txt2 = '('.$this->_escape($this->UTF8ToUTF16BE($txt, false)).')';
< 		foreach($this->UTF8StringToArray($txt) as $uni)
< 			$this->CurrentFont['subset'][$uni] = $uni;
< 	}
< 	else 
< 		$txt2 = '('.$this->_escape($txt).')';
< 	$s = sprintf('BT %.2F %.2F Td %s Tj ET',$x*$this->k,($this->h-$y)*$this->k,$txt2);
< 	if($this->underline && $txt!='')
< 		$s .= ' '.$this->_dounderline($x,$y,$txt);
< 	if($this->ColorFlag)
< 		$s = 'q '.$this->TextColor.' '.$s.' Q';
< 	$this->_out($s);
< }
< 
< function AcceptPageBreak()
< {
< 	// Accept automatic page break or not
< 	return $this->AutoPageBreak;
< }
< 
< function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
< {
< 	// Output a cell
< 	$k = $this->k;
< 	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
< 	{
< 		// Automatic page break
< 		$x = $this->x;
< 		$ws = $this->ws;
< 		if($ws>0)
< 		{
< 			$this->ws = 0;
< 			$this->_out('0 Tw');
< 		}
< 		$this->AddPage($this->CurOrientation,$this->CurPageSize);
< 		$this->x = $x;
< 		if($ws>0)
< 		{
< 			$this->ws = $ws;
< 			$this->_out(sprintf('%.3F Tw',$ws*$k));
< 		}
< 	}
< 	if($w==0)
< 		$w = $this->w-$this->rMargin-$this->x;
< 	$s = '';
< 	if($fill || $border==1)
< 	{
< 		if($fill)
< 			$op = ($border==1) ? 'B' : 'f';
< 		else
< 			$op = 'S';
< 		$s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
< 	}
< 	if(is_string($border))
< 	{
< 		$x = $this->x;
< 		$y = $this->y;
< 		if(strpos($border,'L')!==false)
< 			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
< 		if(strpos($border,'T')!==false)
< 			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
< 		if(strpos($border,'R')!==false)
< 			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
< 		if(strpos($border,'B')!==false)
< 			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
< 	}
< 	if($txt!=='')
< 	{
< 		if($align=='R')
< 			$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
< 		elseif($align=='C')
< 			$dx = ($w-$this->GetStringWidth($txt))/2;
< 		else
< 			$dx = $this->cMargin;
< 		if($this->ColorFlag)
< 			$s .= 'q '.$this->TextColor.' ';
< 
< 		// If multibyte, Tw has no effect - do word spacing using an adjustment before each space
< 		if ($this->ws && $this->unifontSubset) {
< 			foreach($this->UTF8StringToArray($txt) as $uni)
< 				$this->CurrentFont['subset'][$uni] = $uni;
< 			$space = $this->_escape($this->UTF8ToUTF16BE(' ', false));
< 			$s .= sprintf('BT 0 Tw %.2F %.2F Td [',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k);
< 			$t = explode(' ',$txt);
< 			$numt = count($t);
< 			for($i=0;$i<$numt;$i++) {
< 				$tx = $t[$i];
< 				$tx = '('.$this->_escape($this->UTF8ToUTF16BE($tx, false)).')';
< 				$s .= sprintf('%s ',$tx);
< 				if (($i+1)<$numt) {
< 					$adj = -($this->ws*$this->k)*1000/$this->FontSizePt;
< 					$s .= sprintf('%d(%s) ',$adj,$space);
< 				}
< 			}
< 			$s .= '] TJ';
< 			$s .= ' ET';
< 		}
< 		else {
< 			if ($this->unifontSubset)
< 			{
< 				$txt2 = '('.$this->_escape($this->UTF8ToUTF16BE($txt, false)).')';
< 				foreach($this->UTF8StringToArray($txt) as $uni)
< 					$this->CurrentFont['subset'][$uni] = $uni;
< 			}
< 			else
< 				$txt2='('.str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt))).')';
< 			$s .= sprintf('BT %.2F %.2F Td %s Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
< 		}
< 		if($this->underline)
< 			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
< 		if($this->ColorFlag)
< 			$s .= ' Q';
< 		if($link)
< 			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
< 	}
< 	if($s)
< 		$this->_out($s);
< 	$this->lasth = $h;
< 	if($ln>0)
< 	{
< 		// Go to next line
< 		$this->y += $h;
< 		if($ln==1)
< 			$this->x = $this->lMargin;
< 	}
< 	else
< 		$this->x += $w;
< }
< 
< function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
< {
< 	// Output text with automatic or explicit line breaks
< 	$cw = &$this->CurrentFont['cw'];
< 	if($w==0)
< 		$w = $this->w-$this->rMargin-$this->x;
< 	$wmax = ($w-2*$this->cMargin);
< 	$s = str_replace("\r",'',$txt);
< 	if ($this->unifontSubset) {
< 		$nb=mb_strlen($s, 'utf-8');
< 		while($nb>0 && mb_substr($s,$nb-1,1,'utf-8')=="\n")	$nb--;
< 	}
< 	else {
< 		$nb = strlen($s);
< 		if($nb>0 && $s[$nb-1]=="\n")
< 			$nb--;
< 	}
< 	$b = 0;
< 	if($border)
< 	{
< 		if($border==1)
< 		{
< 			$border = 'LTRB';
< 			$b = 'LRT';
< 			$b2 = 'LR';
< 		}
< 		else
< 		{
< 			$b2 = '';
< 			if(strpos($border,'L')!==false)
< 				$b2 .= 'L';
< 			if(strpos($border,'R')!==false)
< 				$b2 .= 'R';
< 			$b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;
< 		}
< 	}
< 	$sep = -1;
< 	$i = 0;
< 	$j = 0;
< 	$l = 0;
< 	$ns = 0;
< 	$nl = 1;
< 	while($i<$nb)
< 	{
< 		// Get next character
< 		if ($this->unifontSubset) {
< 			$c = mb_substr($s,$i,1,'UTF-8');
< 		}
< 		else {
< 			$c=$s[$i];
< 		}
< 		if($c=="\n")
< 		{
< 			// Explicit line break
< 			if($this->ws>0)
< 			{
< 				$this->ws = 0;
< 				$this->_out('0 Tw');
< 			}
< 			if ($this->unifontSubset) {
< 				$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),$b,2,$align,$fill);
< 			}
< 			else {
< 				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
< 			}
< 			$i++;
< 			$sep = -1;
< 			$j = $i;
< 			$l = 0;
< 			$ns = 0;
< 			$nl++;
< 			if($border && $nl==2)
< 				$b = $b2;
< 			continue;
< 		}
< 		if($c==' ')
< 		{
< 			$sep = $i;
< 			$ls = $l;
< 			$ns++;
< 		}
< 
< 		if ($this->unifontSubset) { $l += $this->GetStringWidth($c); }
< 		else { $l += $cw[$c]*$this->FontSize/1000; }
< 
< 		if($l>$wmax)
< 		{
< 			// Automatic line break
< 			if($sep==-1)
< 			{
< 				if($i==$j)
< 					$i++;
< 				if($this->ws>0)
< 				{
< 					$this->ws = 0;
< 					$this->_out('0 Tw');
< 				}
< 				if ($this->unifontSubset) {
< 					$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),$b,2,$align,$fill);
< 				}
< 				else {
< 					$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
< 				}
< 			}
< 			else
< 			{
< 				if($align=='J')
< 				{
< 					$this->ws = ($ns>1) ? ($wmax-$ls)/($ns-1) : 0;
< 					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
< 				}
< 				if ($this->unifontSubset) {
< 					$this->Cell($w,$h,mb_substr($s,$j,$sep-$j,'UTF-8'),$b,2,$align,$fill);
< 				}
< 				else {
< 					$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
< 				}
< 				$i = $sep+1;
< 			}
< 			$sep = -1;
< 			$j = $i;
< 			$l = 0;
< 			$ns = 0;
< 			$nl++;
< 			if($border && $nl==2)
< 				$b = $b2;
< 		}
< 		else
< 			$i++;
< 	}
< 	// Last chunk
< 	if($this->ws>0)
< 	{
< 		$this->ws = 0;
< 		$this->_out('0 Tw');
< 	}
< 	if($border && strpos($border,'B')!==false)
< 		$b .= 'B';
< 	if ($this->unifontSubset) {
< 		$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),$b,2,$align,$fill);
< 	}
< 	else {
< 		$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
< 	}
< 	$this->x = $this->lMargin;
< }
< 
< function Write($h, $txt, $link='')
< {
< 	// Output text in flowing mode
< 	$cw = &$this->CurrentFont['cw'];
< 	$w = $this->w-$this->rMargin-$this->x;
< 
< 	$wmax = ($w-2*$this->cMargin);
< 	$s = str_replace("\r",'',$txt);
< 	if ($this->unifontSubset) {
< 		$nb = mb_strlen($s, 'UTF-8');
< 		if($nb==1 && $s==" ") {
< 			$this->x += $this->GetStringWidth($s);
< 			return;
< 		}
< 	}
< 	else {
< 		$nb = strlen($s);
< 	}
< 	$sep = -1;
< 	$i = 0;
< 	$j = 0;
< 	$l = 0;
< 	$nl = 1;
< 	while($i<$nb)
< 	{
< 		// Get next character
< 		if ($this->unifontSubset) {
< 			$c = mb_substr($s,$i,1,'UTF-8');
< 		}
< 		else {
< 			$c = $s[$i];
< 		}
< 		if($c=="\n")
< 		{
< 			// Explicit line break
< 			if ($this->unifontSubset) {
< 				$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,2,'',0,$link);
< 			}
< 			else {
< 				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
< 			}
< 			$i++;
< 			$sep = -1;
< 			$j = $i;
< 			$l = 0;
< 			if($nl==1)
< 			{
< 				$this->x = $this->lMargin;
< 				$w = $this->w-$this->rMargin-$this->x;
< 				$wmax = ($w-2*$this->cMargin);
< 			}
< 			$nl++;
< 			continue;
< 		}
< 		if($c==' ')
< 			$sep = $i;
< 
< 		if ($this->unifontSubset) { $l += $this->GetStringWidth($c); }
< 		else { $l += $cw[$c]*$this->FontSize/1000; }
< 
< 		if($l>$wmax)
< 		{
< 			// Automatic line break
< 			if($sep==-1)
< 			{
< 				if($this->x>$this->lMargin)
< 				{
< 					// Move to next line
< 					$this->x = $this->lMargin;
< 					$this->y += $h;
< 					$w = $this->w-$this->rMargin-$this->x;
< 					$wmax = ($w-2*$this->cMargin);
< 					$i++;
< 					$nl++;
< 					continue;
< 				}
< 				if($i==$j)
< 					$i++;
< 				if ($this->unifontSubset) {
< 					$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,2,'',0,$link);
< 				}
< 				else {
< 					$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
< 				}
< 			}
< 			else
< 			{
< 				if ($this->unifontSubset) {
< 					$this->Cell($w,$h,mb_substr($s,$j,$sep-$j,'UTF-8'),0,2,'',0,$link);
< 				}
< 				else {
< 					$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);
< 				}
< 				$i = $sep+1;
< 			}
< 			$sep = -1;
< 			$j = $i;
< 			$l = 0;
< 			if($nl==1)
< 			{
< 				$this->x = $this->lMargin;
< 				$w = $this->w-$this->rMargin-$this->x;
< 				$wmax = ($w-2*$this->cMargin);
< 			}
< 			$nl++;
< 		}
< 		else
< 			$i++;
< 	}
< 	// Last chunk
< 	if($i!=$j) {
< 		if ($this->unifontSubset) {
< 			$this->Cell($l,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,0,'',0,$link);
< 		}
< 		else {
< 			$this->Cell($l,$h,substr($s,$j),0,0,'',0,$link);
< 		}
< 	}
< }
< 
< function Ln($h=null)
< {
< 	// Line feed; default value is last cell height
< 	$this->x = $this->lMargin;
< 	if($h===null)
< 		$this->y += $this->lasth;
< 	else
< 		$this->y += $h;
< }
< 
< function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
< {
< 	// Put an image on the page
< 	if(!isset($this->images[$file]))
< 	{
< 		// First use of this image, get info
< 		if($type=='')
< 		{
< 			$pos = strrpos($file,'.');
< 			if(!$pos)
< 				$this->Error('Image file has no extension and no type was specified: '.$file);
< 			$type = substr($file,$pos+1);
< 		}
< 		$type = strtolower($type);
< 		if($type=='jpeg')
< 			$type = 'jpg';
< 		$mtd = '_parse'.$type;
< 		if(!method_exists($this,$mtd))
< 			$this->Error('Unsupported image type: '.$type);
< 		$info = $this->$mtd($file);
< 		$info['i'] = count($this->images)+1;
< 		$this->images[$file] = $info;
< 	}
< 	else
< 		$info = $this->images[$file];
< 
< 	// Automatic width and height calculation if needed
< 	if($w==0 && $h==0)
< 	{
< 		// Put image at 96 dpi
< 		$w = -96;
< 		$h = -96;
< 	}
< 	if($w<0)
< 		$w = -$info['w']*72/$w/$this->k;
< 	if($h<0)
< 		$h = -$info['h']*72/$h/$this->k;
< 	if($w==0)
< 		$w = $h*$info['w']/$info['h'];
< 	if($h==0)
< 		$h = $w*$info['h']/$info['w'];
< 
< 	// Flowing mode
< 	if($y===null)
< 	{
< 		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
< 		{
< 			// Automatic page break
< 			$x2 = $this->x;
< 			$this->AddPage($this->CurOrientation,$this->CurPageSize);
< 			$this->x = $x2;
< 		}
< 		$y = $this->y;
< 		$this->y += $h;
< 	}
< 
< 	if($x===null)
< 		$x = $this->x;
< 	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
< 	if($link)
< 		$this->Link($x,$y,$w,$h,$link);
< }
< 
< function GetX()
< {
< 	// Get x position
< 	return $this->x;
< }
< 
< function SetX($x)
< {
< 	// Set x position
< 	if($x>=0)
< 		$this->x = $x;
< 	else
< 		$this->x = $this->w+$x;
< }
< 
< function GetY()
< {
< 	// Get y position
< 	return $this->y;
< }
< 
< function SetY($y)
< {
< 	// Set y position and reset x
< 	$this->x = $this->lMargin;
< 	if($y>=0)
< 		$this->y = $y;
< 	else
< 		$this->y = $this->h+$y;
< }
< 
< function SetXY($x, $y)
< {
< 	// Set x and y positions
< 	$this->SetY($y);
< 	$this->SetX($x);
< }
< 
< function Output($name='', $dest='')
< {
< 	// Output PDF to some destination
< 	if($this->state<3)
< 		$this->Close();
< 	$dest = strtoupper($dest);
< 	if($dest=='')
< 	{
< 		if($name=='')
< 		{
< 			$name = 'doc.pdf';
< 			$dest = 'I';
< 		}
< 		else
< 			$dest = 'F';
< 	}
< 	switch($dest)
< 	{
< 		case 'I':
< 			// Send to standard output
< 			$this->_checkoutput();
< 			if(PHP_SAPI!='cli')
< 			{
< 				// We send to a browser
< 				header('Content-Type: application/pdf');
< 				header('Content-Disposition: inline; filename="'.$name.'"');
< 				header('Cache-Control: private, max-age=0, must-revalidate');
< 				header('Pragma: public');
< 			}
< 			echo $this->buffer;
< 			break;
< 		case 'D':
< 			// Download file
< 			$this->_checkoutput();
< 			header('Content-Type: application/x-download');
< 			header('Content-Disposition: attachment; filename="'.$name.'"');
< 			header('Cache-Control: private, max-age=0, must-revalidate');
< 			header('Pragma: public');
< 			echo $this->buffer;
< 			break;
< 		case 'F':
< 			// Save to local file
< 			$f = fopen($name,'wb');
< 			if(!$f)
< 				$this->Error('Unable to create output file: '.$name);
< 			fwrite($f,$this->buffer,strlen($this->buffer));
< 			fclose($f);
< 			break;
< 		case 'S':
< 			// Return as a string
< 			return $this->buffer;
< 		default:
< 			$this->Error('Incorrect output destination: '.$dest);
< 	}
< 	return '';
< }
< 
< /*******************************************************************************
< *                                                                              *
< *                              Protected methods                               *
< *                                                                              *
< *******************************************************************************/
< function _dochecks()
< {
< 	// Check availability of %F
< 	if(sprintf('%.1F',1.0)!='1.0')
< 		$this->Error('This version of PHP is not supported');
< 	// Check availability of mbstring
< 	if(!function_exists('mb_strlen'))
< 		$this->Error('mbstring extension is not available');
< 	// Check mbstring overloading
< 	if(ini_get('mbstring.func_overload') & 2)
< 		$this->Error('mbstring overloading must be disabled');
< 	// Ensure runtime magic quotes are disabled
< 	if(get_magic_quotes_runtime())
< 		@set_magic_quotes_runtime(0);
< }
< 
< function _getfontpath()
< {
< 	return $this->fontpath;
< }
< 
< function _checkoutput()
< {
< 	if(PHP_SAPI!='cli')
< 	{
< 		if(headers_sent($file,$line))
< 			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
< 	}
< 	if(ob_get_length())
< 	{
< 		// The output buffer is not empty
< 		if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))
< 		{
< 			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
< 			ob_clean();
< 		}
< 		else
< 			$this->Error("Some data has already been output, can't send PDF file");
< 	}
< }
< 
< function _getpagesize($size)
< {
< 	if(is_string($size))
< 	{
< 		$size = strtolower($size);
< 		if(!isset($this->StdPageSizes[$size]))
< 			$this->Error('Unknown page size: '.$size);
< 		$a = $this->StdPageSizes[$size];
< 		return array($a[0]/$this->k, $a[1]/$this->k);
< 	}
< 	else
< 	{
< 		if($size[0]>$size[1])
< 			return array($size[1], $size[0]);
< 		else
< 			return $size;
< 	}
< }
< 
< function _beginpage($orientation, $size)
< {
< 	$this->page++;
< 	$this->pages[$this->page] = '';
< 	$this->state = 2;
< 	$this->x = $this->lMargin;
< 	$this->y = $this->tMargin;
< 	$this->FontFamily = '';
< 	// Check page size and orientation
< 	if($orientation=='')
< 		$orientation = $this->DefOrientation;
< 	else
< 		$orientation = strtoupper($orientation[0]);
< 	if($size=='')
< 		$size = $this->DefPageSize;
< 	else
< 		$size = $this->_getpagesize($size);
< 	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
< 	{
< 		// New size or orientation
< 		if($orientation=='P')
< 		{
< 			$this->w = $size[0];
< 			$this->h = $size[1];
< 		}
< 		else
< 		{
< 			$this->w = $size[1];
< 			$this->h = $size[0];
< 		}
< 		$this->wPt = $this->w*$this->k;
< 		$this->hPt = $this->h*$this->k;
< 		$this->PageBreakTrigger = $this->h-$this->bMargin;
< 		$this->CurOrientation = $orientation;
< 		$this->CurPageSize = $size;
< 	}
< 	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
< 		$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
< }
< 
< function _endpage()
< {
< 	$this->state = 1;
< }
< 
< function _loadfont($font)
< {
< 	// Load a font definition file from the font directory
< 	include($this->fontpath.$font);
< 	$a = get_defined_vars();
< 	if(!isset($a['name']))
< 		$this->Error('Could not include font definition file');
< 	return $a;
< }
< 
< function _escape($s)
< {
< 	// Escape special characters in strings
< 	$s = str_replace('\\','\\\\',$s);
< 	$s = str_replace('(','\\(',$s);
< 	$s = str_replace(')','\\)',$s);
< 	$s = str_replace("\r",'\\r',$s);
< 	return $s;
< }
< 
< function _textstring($s)
< {
< 	// Format a text string
< 	return '('.$this->_escape($s).')';
< }
< 
< function _UTF8toUTF16($s)
< {
< 	// Convert UTF-8 to UTF-16BE with BOM
< 	$res = "\xFE\xFF";
< 	$nb = strlen($s);
< 	$i = 0;
< 	while($i<$nb)
< 	{
< 		$c1 = ord($s[$i++]);
< 		if($c1>=224)
< 		{
< 			// 3-byte character
< 			$c2 = ord($s[$i++]);
< 			$c3 = ord($s[$i++]);
< 			$res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
< 			$res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
< 		}
< 		elseif($c1>=192)
< 		{
< 			// 2-byte character
< 			$c2 = ord($s[$i++]);
< 			$res .= chr(($c1 & 0x1C)>>2);
< 			$res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
< 		}
< 		else
< 		{
< 			// Single-byte character
< 			$res .= "\0".chr($c1);
< 		}
< 	}
< 	return $res;
< }
< 
< function _dounderline($x, $y, $txt)
< {
< 	// Underline text
< 	$up = $this->CurrentFont['up'];
< 	$ut = $this->CurrentFont['ut'];
< 	$w = $this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
< 	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
< }
< 
< function _parsejpg($file)
< {
< 	// Extract info from a JPEG file
< 	$a = getimagesize($file);
< 	if(!$a)
< 		$this->Error('Missing or incorrect image file: '.$file);
< 	if($a[2]!=2)
< 		$this->Error('Not a JPEG file: '.$file);
< 	if(!isset($a['channels']) || $a['channels']==3)
< 		$colspace = 'DeviceRGB';
< 	elseif($a['channels']==4)
< 		$colspace = 'DeviceCMYK';
< 	else
< 		$colspace = 'DeviceGray';
< 	$bpc = isset($a['bits']) ? $a['bits'] : 8;
< 	$data = file_get_contents($file);
< 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
< }
< 
< function _parsepng($file)
< {
< 	// Extract info from a PNG file
< 	$f = fopen($file,'rb');
< 	if(!$f)
< 		$this->Error('Can\'t open image file: '.$file);
< 	$info = $this->_parsepngstream($f,$file);
< 	fclose($f);
< 	return $info;
< }
< 
< function _parsepngstream($f, $file)
< {
< 	// Check signature
< 	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
< 		$this->Error('Not a PNG file: '.$file);
< 
< 	// Read header chunk
< 	$this->_readstream($f,4);
< 	if($this->_readstream($f,4)!='IHDR')
< 		$this->Error('Incorrect PNG file: '.$file);
< 	$w = $this->_readint($f);
< 	$h = $this->_readint($f);
< 	$bpc = ord($this->_readstream($f,1));
< 	if($bpc>8)
< 		$this->Error('16-bit depth not supported: '.$file);
< 	$ct = ord($this->_readstream($f,1));
< 	if($ct==0 || $ct==4)
< 		$colspace = 'DeviceGray';
< 	elseif($ct==2 || $ct==6)
< 		$colspace = 'DeviceRGB';
< 	elseif($ct==3)
< 		$colspace = 'Indexed';
< 	else
< 		$this->Error('Unknown color type: '.$file);
< 	if(ord($this->_readstream($f,1))!=0)
< 		$this->Error('Unknown compression method: '.$file);
< 	if(ord($this->_readstream($f,1))!=0)
< 		$this->Error('Unknown filter method: '.$file);
< 	if(ord($this->_readstream($f,1))!=0)
< 		$this->Error('Interlacing not supported: '.$file);
< 	$this->_readstream($f,4);
< 	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
< 
< 	// Scan chunks looking for palette, transparency and image data
< 	$pal = '';
< 	$trns = '';
< 	$data = '';
< 	do
< 	{
< 		$n = $this->_readint($f);
< 		$type = $this->_readstream($f,4);
< 		if($type=='PLTE')
< 		{
< 			// Read palette
< 			$pal = $this->_readstream($f,$n);
< 			$this->_readstream($f,4);
< 		}
< 		elseif($type=='tRNS')
< 		{
< 			// Read transparency info
< 			$t = $this->_readstream($f,$n);
< 			if($ct==0)
< 				$trns = array(ord(substr($t,1,1)));
< 			elseif($ct==2)
< 				$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
< 			else
< 			{
< 				$pos = strpos($t,chr(0));
< 				if($pos!==false)
< 					$trns = array($pos);
< 			}
< 			$this->_readstream($f,4);
< 		}
< 		elseif($type=='IDAT')
< 		{
< 			// Read image data block
< 			$data .= $this->_readstream($f,$n);
< 			$this->_readstream($f,4);
< 		}
< 		elseif($type=='IEND')
< 			break;
< 		else
< 			$this->_readstream($f,$n+4);
< 	}
< 	while($n);
< 
< 	if($colspace=='Indexed' && empty($pal))
< 		$this->Error('Missing palette in '.$file);
< 	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
< 	if($ct>=4)
< 	{
< 		// Extract alpha channel
< 		if(!function_exists('gzuncompress'))
< 			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
< 		$data = gzuncompress($data);
< 		$color = '';
< 		$alpha = '';
< 		if($ct==4)
< 		{
< 			// Gray image
< 			$len = 2*$w;
< 			for($i=0;$i<$h;$i++)
< 			{
< 				$pos = (1+$len)*$i;
< 				$color .= $data[$pos];
< 				$alpha .= $data[$pos];
< 				$line = substr($data,$pos+1,$len);
< 				$color .= preg_replace('/(.)./s','$1',$line);
< 				$alpha .= preg_replace('/.(.)/s','$1',$line);
< 			}
< 		}
< 		else
< 		{
< 			// RGB image
< 			$len = 4*$w;
< 			for($i=0;$i<$h;$i++)
< 			{
< 				$pos = (1+$len)*$i;
< 				$color .= $data[$pos];
< 				$alpha .= $data[$pos];
< 				$line = substr($data,$pos+1,$len);
< 				$color .= preg_replace('/(.{3})./s','$1',$line);
< 				$alpha .= preg_replace('/.{3}(.)/s','$1',$line);
< 			}
< 		}
< 		unset($data);
< 		$data = gzcompress($color);
< 		$info['smask'] = gzcompress($alpha);
< 		if($this->PDFVersion<'1.4')
< 			$this->PDFVersion = '1.4';
< 	}
< 	$info['data'] = $data;
< 	return $info;
< }
< 
< function _readstream($f, $n)
< {
< 	// Read n bytes from stream
< 	$res = '';
< 	while($n>0 && !feof($f))
< 	{
< 		$s = fread($f,$n);
< 		if($s===false)
< 			$this->Error('Error while reading stream');
< 		$n -= strlen($s);
< 		$res .= $s;
< 	}
< 	if($n>0)
< 		$this->Error('Unexpected end of stream');
< 	return $res;
< }
< 
< function _readint($f)
< {
< 	// Read a 4-byte integer from stream
< 	$a = unpack('Ni',$this->_readstream($f,4));
< 	return $a['i'];
< }
< 
< function _parsegif($file)
< {
< 	// Extract info from a GIF file (via PNG conversion)
< 	if(!function_exists('imagepng'))
< 		$this->Error('GD extension is required for GIF support');
< 	if(!function_exists('imagecreatefromgif'))
< 		$this->Error('GD has no GIF read support');
< 	$im = imagecreatefromgif($file);
< 	if(!$im)
< 		$this->Error('Missing or incorrect image file: '.$file);
< 	imageinterlace($im,0);
< 	$f = @fopen('php://temp','rb+');
< 	if($f)
< 	{
< 		// Perform conversion in memory
< 		ob_start();
< 		imagepng($im);
< 		$data = ob_get_clean();
< 		imagedestroy($im);
< 		fwrite($f,$data);
< 		rewind($f);
< 		$info = $this->_parsepngstream($f,$file);
< 		fclose($f);
< 	}
< 	else
< 	{
< 		// Use temporary file
< 		$tmp = tempnam('.','gif');
< 		if(!$tmp)
< 			$this->Error('Unable to create a temporary file');
< 		if(!imagepng($im,$tmp))
< 			$this->Error('Error while saving to temporary file');
< 		imagedestroy($im);
< 		$info = $this->_parsepng($tmp);
< 		unlink($tmp);
< 	}
< 	return $info;
< }
< 
< function _newobj()
< {
< 	// Begin a new object
< 	$this->n++;
< 	$this->offsets[$this->n] = strlen($this->buffer);
< 	$this->_out($this->n.' 0 obj');
< }
< 
< function _putstream($s)
< {
< 	$this->_out('stream');
< 	$this->_out($s);
< 	$this->_out('endstream');
< }
< 
< function _out($s)
< {
< 	// Add a line to the document
< 	if($this->state==2)
< 		$this->pages[$this->page] .= $s."\n";
< 	else
< 		$this->buffer .= $s."\n";
< }
< 
< function _putpages()
< {
< 	$nb = $this->page;
< 	if(!empty($this->AliasNbPages))
< 	{
< 		// Replace number of pages in fonts using subsets
< 		$alias = $this->UTF8ToUTF16BE($this->AliasNbPages, false);
< 		$r = $this->UTF8ToUTF16BE("$nb", false);
< 		for($n=1;$n<=$nb;$n++)
< 			$this->pages[$n] = str_replace($alias,$r,$this->pages[$n]);
< 		// Now repeat for no pages in non-subset fonts
< 		for($n=1;$n<=$nb;$n++)
< 			$this->pages[$n] = str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
< 	}
< 	if($this->DefOrientation=='P')
< 	{
< 		$wPt = $this->DefPageSize[0]*$this->k;
< 		$hPt = $this->DefPageSize[1]*$this->k;
< 	}
< 	else
< 	{
< 		$wPt = $this->DefPageSize[1]*$this->k;
< 		$hPt = $this->DefPageSize[0]*$this->k;
< 	}
< 	$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
< 	for($n=1;$n<=$nb;$n++)
< 	{
< 		// Page
< 		$this->_newobj();
< 		$this->_out('<</Type /Page');
< 		$this->_out('/Parent 1 0 R');
< 		if(isset($this->PageSizes[$n]))
< 			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
< 		$this->_out('/Resources 2 0 R');
< 		if(isset($this->PageLinks[$n]))
< 		{
< 			// Links
< 			$annots = '/Annots [';
< 			foreach($this->PageLinks[$n] as $pl)
< 			{
< 				$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
< 				$annots .= '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
< 				if(is_string($pl[4]))
< 					$annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
< 				else
< 				{
< 					$l = $this->links[$pl[4]];
< 					$h = isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
< 					$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);
< 				}
< 			}
< 			$this->_out($annots.']');
< 		}
< 		if($this->PDFVersion>'1.3')
< 			$this->_out('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
< 		$this->_out('/Contents '.($this->n+1).' 0 R>>');
< 		$this->_out('endobj');
< 		// Page content
< 		$p = ($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];
< 		$this->_newobj();
< 		$this->_out('<<'.$filter.'/Length '.strlen($p).'>>');
< 		$this->_putstream($p);
< 		$this->_out('endobj');
< 	}
< 	// Pages root
< 	$this->offsets[1] = strlen($this->buffer);
< 	$this->_out('1 0 obj');
< 	$this->_out('<</Type /Pages');
< 	$kids = '/Kids [';
< 	for($i=0;$i<$nb;$i++)
< 		$kids .= (3+2*$i).' 0 R ';
< 	$this->_out($kids.']');
< 	$this->_out('/Count '.$nb);
< 	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
< 	$this->_out('>>');
< 	$this->_out('endobj');
< }
< 
< function _putfonts()
< {
< 	$nf=$this->n;
< 	foreach($this->diffs as $diff)
< 	{
< 		// Encodings
< 		$this->_newobj();
< 		$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
< 		$this->_out('endobj');
< 	}
< 	foreach($this->FontFiles as $file=>$info)
< 	{
< 	   if (!isset($info['type']) || $info['type']!='TTF') {
< 		// Font file embedding
< 		$this->_newobj();
< 		$this->FontFiles[$file]['n']=$this->n;
< 		$font='';
< 		$f=fopen($this->_getfontpath().$file,'rb',1);
< 		if(!$f)
< 			$this->Error('Font file not found');
< 		while(!feof($f))
< 			$font.=fread($f,8192);
< 		fclose($f);
< 		$compressed=(substr($file,-2)=='.z');
< 		if(!$compressed && isset($info['length2']))
< 		{
< 			$header=(ord($font[0])==128);
< 			if($header)
< 			{
< 				// Strip first binary header
< 				$font=substr($font,6);
< 			}
< 			if($header && ord($font[$info['length1']])==128)
< 			{
< 				// Strip second binary header
< 				$font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
< 			}
< 		}
< 		$this->_out('<</Length '.strlen($font));
< 		if($compressed)
< 			$this->_out('/Filter /FlateDecode');
< 		$this->_out('/Length1 '.$info['length1']);
< 		if(isset($info['length2']))
< 			$this->_out('/Length2 '.$info['length2'].' /Length3 0');
< 		$this->_out('>>');
< 		$this->_putstream($font);
< 		$this->_out('endobj');
< 	   }
< 	}
< 	foreach($this->fonts as $k=>$font)
< 	{
< 		// Font objects
< 		//$this->fonts[$k]['n']=$this->n+1;
< 		$type = $font['type'];
< 		$name = $font['name'];
< 		//echo "name=$name, type=$type<br>\n";
< 		if($type=='Core' || $type == 'core')
< 		{
< 			// Standard font
< 			$this->fonts[$k]['n']=$this->n+1;
< 			$this->_newobj();
< 			$this->_out('<</Type /Font');
< 			$this->_out('/BaseFont /'.$name);
< 			$this->_out('/Subtype /Type1');
< 			if($name!='Symbol' && $name!='ZapfDingbats')
< 				$this->_out('/Encoding /WinAnsiEncoding');
< 			$this->_out('>>');
< 			$this->_out('endobj');
< 		}
< 		elseif($type=='Type1' || $type=='TrueType')
< 		{
< 			// Additional Type1 or TrueType font
< 			$this->fonts[$k]['n']=$this->n+1;
< 			$this->_newobj();
< 			$this->_out('<</Type /Font');
< 			$this->_out('/BaseFont /'.$name);
< 			$this->_out('/Subtype /'.$type);
< 			$this->_out('/FirstChar 32 /LastChar 255');
< 			$this->_out('/Widths '.($this->n+1).' 0 R');
< 			$this->_out('/FontDescriptor '.($this->n+2).' 0 R');
< 			if($font['enc'])
< 			{
< 				if(isset($font['diff']))
< 					$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
< 				else
< 					$this->_out('/Encoding /WinAnsiEncoding');
< 			}
< 			$this->_out('>>');
< 			$this->_out('endobj');
< 			// Widths
< 			$this->_newobj();
< 			$cw=&$font['cw'];
< 			$s='[';
< 			for($i=32;$i<=255;$i++)
< 				$s.=$cw[chr($i)].' ';
< 			$this->_out($s.']');
< 			$this->_out('endobj');
< 			// Descriptor
< 			$this->_newobj();
< 			$s='<</Type /FontDescriptor /FontName /'.$name;
< 			foreach($font['desc'] as $k=>$v)
< 				$s.=' /'.$k.' '.$v;
< 			$file=$font['file'];
< 			if($file)
< 				$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
< 			$this->_out($s.'>>');
< 			$this->_out('endobj');
< 		}
< 		// TrueType embedded SUBSETS or FULL
< 		else if ($type=='TTF') {
< 			$this->fonts[$k]['n']=$this->n+1;
< 			require_once($this->_getfontpath().'unifont/ttfonts.php');
< 			$ttf = new TTFontFile();
< 			$fontname = 'MPDFAA'.'+'.$font['name'];
< 			$subset = $font['subset'];
< 			unset($subset[0]);
< 			$ttfontstream = $ttf->makeSubset($font['ttffile'], $subset);
< 			$ttfontsize = strlen($ttfontstream);
< 			$fontstream = gzcompress($ttfontstream);
< 			$codeToGlyph = $ttf->codeToGlyph;
< 			unset($codeToGlyph[0]);
< 
< 			// Type0 Font
< 			// A composite font - a font composed of other fonts, organized hierarchically
< 			$this->_newobj();
< 			$this->_out('<</Type /Font');
< 			$this->_out('/Subtype /Type0');
< 			$this->_out('/BaseFont /'.$fontname.'');
< 			$this->_out('/Encoding /Identity-H'); 
< 			$this->_out('/DescendantFonts ['.($this->n + 1).' 0 R]');
< 			$this->_out('/ToUnicode '.($this->n + 2).' 0 R');
< 			$this->_out('>>');
< 			$this->_out('endobj');
< 
< 			// CIDFontType2
< 			// A CIDFont whose glyph descriptions are based on TrueType font technology
< 			$this->_newobj();
< 			$this->_out('<</Type /Font');
< 			$this->_out('/Subtype /CIDFontType2');
< 			$this->_out('/BaseFont /'.$fontname.'');
< 			$this->_out('/CIDSystemInfo '.($this->n + 2).' 0 R'); 
< 			$this->_out('/FontDescriptor '.($this->n + 3).' 0 R');
< 			if (isset($font['desc']['MissingWidth'])){
< 				$this->_out('/DW '.$font['desc']['MissingWidth'].''); 
< 			}
< 
< 			$this->_putTTfontwidths($font, $ttf->maxUni);
< 
< 			$this->_out('/CIDToGIDMap '.($this->n + 4).' 0 R');
< 			$this->_out('>>');
< 			$this->_out('endobj');
< 
< 			// ToUnicode
< 			$this->_newobj();
< 			$toUni = "/CIDInit /ProcSet findresource begin\n";
< 			$toUni .= "12 dict begin\n";
< 			$toUni .= "begincmap\n";
< 			$toUni .= "/CIDSystemInfo\n";
< 			$toUni .= "<</Registry (Adobe)\n";
< 			$toUni .= "/Ordering (UCS)\n";
< 			$toUni .= "/Supplement 0\n";
< 			$toUni .= ">> def\n";
< 			$toUni .= "/CMapName /Adobe-Identity-UCS def\n";
< 			$toUni .= "/CMapType 2 def\n";
< 			$toUni .= "1 begincodespacerange\n";
< 			$toUni .= "<0000> <FFFF>\n";
< 			$toUni .= "endcodespacerange\n";
< 			$toUni .= "1 beginbfrange\n";
< 			$toUni .= "<0000> <FFFF> <0000>\n";
< 			$toUni .= "endbfrange\n";
< 			$toUni .= "endcmap\n";
< 			$toUni .= "CMapName currentdict /CMap defineresource pop\n";
< 			$toUni .= "end\n";
< 			$toUni .= "end";
< 			$this->_out('<</Length '.(strlen($toUni)).'>>');
< 			$this->_putstream($toUni);
< 			$this->_out('endobj');
< 
< 			// CIDSystemInfo dictionary
< 			$this->_newobj();
< 			$this->_out('<</Registry (Adobe)'); 
< 			$this->_out('/Ordering (UCS)');
< 			$this->_out('/Supplement 0');
< 			$this->_out('>>');
< 			$this->_out('endobj');
< 
< 			// Font descriptor
< 			$this->_newobj();
< 			$this->_out('<</Type /FontDescriptor');
< 			$this->_out('/FontName /'.$fontname);
< 			foreach($font['desc'] as $kd=>$v) {
< 				if ($kd == 'Flags') { $v = $v | 4; $v = $v & ~32; }	// SYMBOLIC font flag
< 				$this->_out(' /'.$kd.' '.$v);
< 			}
< 			$this->_out('/FontFile2 '.($this->n + 2).' 0 R');
< 			$this->_out('>>');
< 			$this->_out('endobj');
< 
< 			// Embed CIDToGIDMap
< 			// A specification of the mapping from CIDs to glyph indices
< 			$cidtogidmap = '';
< 			$cidtogidmap = str_pad('', 256*256*2, "\x00");
< 			foreach($codeToGlyph as $cc=>$glyph) {
< 				$cidtogidmap[$cc*2] = chr($glyph >> 8);
< 				$cidtogidmap[$cc*2 + 1] = chr($glyph & 0xFF);
< 			}
< 			$cidtogidmap = gzcompress($cidtogidmap);
< 			$this->_newobj();
< 			$this->_out('<</Length '.strlen($cidtogidmap).'');
< 			$this->_out('/Filter /FlateDecode');
< 			$this->_out('>>');
< 			$this->_putstream($cidtogidmap);
< 			$this->_out('endobj');
< 
< 			//Font file 
< 			$this->_newobj();
< 			$this->_out('<</Length '.strlen($fontstream));
< 			$this->_out('/Filter /FlateDecode');
< 			$this->_out('/Length1 '.$ttfontsize);
< 			$this->_out('>>');
< 			$this->_putstream($fontstream);
< 			$this->_out('endobj');
< 			unset($ttf);
< 		} 
< 		else
< 		{
< 			// Allow for additional types
< 			$this->fonts[$k]['n'] = $this->n+1;
< 			$mtd='_put'.strtolower($type);
< 			echo "mtd=$mtd";
< 			if(!method_exists($this,$mtd))
< 				$this->Error('Unsupported font type: '.$type);
< 			$this->$mtd($font);
< 		}
< 	}
< }
< 
< function _putTTfontwidths(&$font, $maxUni) {
< 	if (file_exists($font['unifilename'].'.cw127.php')) {
< 		include($font['unifilename'].'.cw127.php') ;
< 		$startcid = 128;
< 	}
< 	else {
< 		$rangeid = 0;
< 		$range = array();
< 		$prevcid = -2;
< 		$prevwidth = -1;
< 		$interval = false;
< 		$startcid = 1;
< 	}
< 	$cwlen = $maxUni + 1; 
< 
< 	// for each character
< 	for ($cid=$startcid; $cid<$cwlen; $cid++) {
< 		if ($cid==128 && (!file_exists($font['unifilename'].'.cw127.php'))) {
< 			if (is_writable(dirname($this->_getfontpath().'unifont/x'))) {
< 				$fh = fopen($font['unifilename'].'.cw127.php',"wb");
< 				$cw127='<?php'."\n";
< 				$cw127.='$rangeid='.$rangeid.";\n";
< 				$cw127.='$prevcid='.$prevcid.";\n";
< 				$cw127.='$prevwidth='.$prevwidth.";\n";
< 				if ($interval) { $cw127.='$interval=true'.";\n"; }
< 				else { $cw127.='$interval=false'.";\n"; }
< 				$cw127.='$range='.var_export($range,true).";\n";
< 				$cw127.="?>";
< 				fwrite($fh,$cw127,strlen($cw127));
< 				fclose($fh);
< 			}
< 		}
< 		if ($font['cw'][$cid*2] == "\00" && $font['cw'][$cid*2+1] == "\00") { continue; }
< 		$width = (ord($font['cw'][$cid*2]) << 8) + ord($font['cw'][$cid*2+1]);
< 		if ($width == 65535) { $width = 0; }
< 		if ($cid > 255 && (!isset($font['subset'][$cid]) || !$font['subset'][$cid])) { continue; }
< 		if (!isset($font['dw']) || (isset($font['dw']) && $width != $font['dw'])) {
< 			if ($cid == ($prevcid + 1)) {
< 				if ($width == $prevwidth) {
< 					if ($width == $range[$rangeid][0]) {
< 						$range[$rangeid][] = $width;
< 					}
< 					else {
< 						array_pop($range[$rangeid]);
< 						// new range
< 						$rangeid = $prevcid;
< 						$range[$rangeid] = array();
< 						$range[$rangeid][] = $prevwidth;
< 						$range[$rangeid][] = $width;
< 					}
< 					$interval = true;
< 					$range[$rangeid]['interval'] = true;
< 				} else {
< 					if ($interval) {
< 						// new range
< 						$rangeid = $cid;
< 						$range[$rangeid] = array();
< 						$range[$rangeid][] = $width;
< 					}
< 					else { $range[$rangeid][] = $width; }
< 					$interval = false;
< 				}
< 			} else {
< 				$rangeid = $cid;
< 				$range[$rangeid] = array();
< 				$range[$rangeid][] = $width;
< 				$interval = false;
< 			}
< 			$prevcid = $cid;
< 			$prevwidth = $width;
< 		}
< 	}
< 	$prevk = -1;
< 	$nextk = -1;
< 	$prevint = false;
< 	foreach ($range as $k => $ws) {
< 		$cws = count($ws);
< 		if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR ($cws < 4))) {
< 			if (isset($range[$k]['interval'])) { unset($range[$k]['interval']); }
< 			$range[$prevk] = array_merge($range[$prevk], $range[$k]);
< 			unset($range[$k]);
< 		}
< 		else { $prevk = $k; }
< 		$nextk = $k + $cws;
< 		if (isset($ws['interval'])) {
< 			if ($cws > 3) { $prevint = true; }
< 			else { $prevint = false; }
< 			unset($range[$k]['interval']);
< 			--$nextk;
< 		}
< 		else { $prevint = false; }
< 	}
< 	$w = '';
< 	foreach ($range as $k => $ws) {
< 		if (count(array_count_values($ws)) == 1) { $w .= ' '.$k.' '.($k + count($ws) - 1).' '.$ws[0]; }
< 		else { $w .= ' '.$k.' [ '.implode(' ', $ws).' ]' . "\n"; }
< 	}
< 	$this->_out('/W ['.$w.' ]');
< }
< 
< function _putimages()
< {
< 	foreach(array_keys($this->images) as $file)
< 	{
< 		$this->_putimage($this->images[$file]);
< 		unset($this->images[$file]['data']);
< 		unset($this->images[$file]['smask']);
< 	}
< }
< 
< function _putimage(&$info)
< {
< 	$this->_newobj();
< 	$info['n'] = $this->n;
< 	$this->_out('<</Type /XObject');
< 	$this->_out('/Subtype /Image');
< 	$this->_out('/Width '.$info['w']);
< 	$this->_out('/Height '.$info['h']);
< 	if($info['cs']=='Indexed')
< 		$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
< 	else
< 	{
< 		$this->_out('/ColorSpace /'.$info['cs']);
< 		if($info['cs']=='DeviceCMYK')
< 			$this->_out('/Decode [1 0 1 0 1 0 1 0]');
< 	}
< 	$this->_out('/BitsPerComponent '.$info['bpc']);
< 	if(isset($info['f']))
< 		$this->_out('/Filter /'.$info['f']);
< 	if(isset($info['dp']))
< 		$this->_out('/DecodeParms <<'.$info['dp'].'>>');
< 	if(isset($info['trns']) && is_array($info['trns']))
< 	{
< 		$trns = '';
< 		for($i=0;$i<count($info['trns']);$i++)
< 			$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
< 		$this->_out('/Mask ['.$trns.']');
< 	}
< 	if(isset($info['smask']))
< 		$this->_out('/SMask '.($this->n+1).' 0 R');
< 	$this->_out('/Length '.strlen($info['data']).'>>');
< 	$this->_putstream($info['data']);
< 	$this->_out('endobj');
< 	// Soft mask
< 	if(isset($info['smask']))
< 	{
< 		$dp = '/Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$info['w'];
< 		$smask = array('w'=>$info['w'], 'h'=>$info['h'], 'cs'=>'DeviceGray', 'bpc'=>8, 'f'=>$info['f'], 'dp'=>$dp, 'data'=>$info['smask']);
< 		$this->_putimage($smask);
< 	}
< 	// Palette
< 	if($info['cs']=='Indexed')
< 	{
< 		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
< 		$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];
< 		$this->_newobj();
< 		$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
< 		$this->_putstream($pal);
< 		$this->_out('endobj');
< 	}
< }
< 
< function _putxobjectdict()
< {
< 	foreach($this->images as $image)
< 		$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
< }
< 
< function _putresourcedict()
< {
< 	$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
< 	$this->_out('/Font <<');
< 	foreach($this->fonts as $font) {
< 		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
< 	}
< 	$this->_out('>>');
< 	$this->_out('/XObject <<');
< 	$this->_putxobjectdict();
< 	$this->_out('>>');
< }
< 
< function _putresources()
< {
< 	$this->_putfonts();
< 	$this->_putimages();
< 	// Resource dictionary
< 	$this->offsets[2] = strlen($this->buffer);
< 	$this->_out('2 0 obj');
< 	$this->_out('<<');
< 	$this->_putresourcedict();
< 	$this->_out('>>');
< 	$this->_out('endobj');
< }
< 
< function _putinfo()
< {
< 	$this->_out('/Producer '.$this->_textstring('tFPDF '.tFPDF_VERSION));
< 	if(!empty($this->title))
< 		$this->_out('/Title '.$this->_textstring($this->title));
< 	if(!empty($this->subject))
< 		$this->_out('/Subject '.$this->_textstring($this->subject));
< 	if(!empty($this->author))
< 		$this->_out('/Author '.$this->_textstring($this->author));
< 	if(!empty($this->keywords))
< 		$this->_out('/Keywords '.$this->_textstring($this->keywords));
< 	if(!empty($this->creator))
< 		$this->_out('/Creator '.$this->_textstring($this->creator));
< 	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
< }
< 
< function _putcatalog()
< {
< 	$this->_out('/Type /Catalog');
< 	$this->_out('/Pages 1 0 R');
< 	if($this->ZoomMode=='fullpage')
< 		$this->_out('/OpenAction [3 0 R /Fit]');
< 	elseif($this->ZoomMode=='fullwidth')
< 		$this->_out('/OpenAction [3 0 R /FitH null]');
< 	elseif($this->ZoomMode=='real')
< 		$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
< 	elseif(!is_string($this->ZoomMode))
< 		$this->_out('/OpenAction [3 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
< 	if($this->LayoutMode=='single')
< 		$this->_out('/PageLayout /SinglePage');
< 	elseif($this->LayoutMode=='continuous')
< 		$this->_out('/PageLayout /OneColumn');
< 	elseif($this->LayoutMode=='two')
< 		$this->_out('/PageLayout /TwoColumnLeft');
< }
< 
< function _putheader()
< {
< 	$this->_out('%PDF-'.$this->PDFVersion);
< }
< 
< function _puttrailer()
< {
< 	$this->_out('/Size '.($this->n+1));
< 	$this->_out('/Root '.$this->n.' 0 R');
< 	$this->_out('/Info '.($this->n-1).' 0 R');
< }
< 
< function _enddoc()
< {
< 	$this->_putheader();
< 	$this->_putpages();
< 	$this->_putresources();
< 	// Info
< 	$this->_newobj();
< 	$this->_out('<<');
< 	$this->_putinfo();
< 	$this->_out('>>');
< 	$this->_out('endobj');
< 	// Catalog
< 	$this->_newobj();
< 	$this->_out('<<');
< 	$this->_putcatalog();
< 	$this->_out('>>');
< 	$this->_out('endobj');
< 	// Cross-ref
< 	$o = strlen($this->buffer);
< 	$this->_out('xref');
< 	$this->_out('0 '.($this->n+1));
< 	$this->_out('0000000000 65535 f ');
< 	for($i=1;$i<=$this->n;$i++)
< 		$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
< 	// Trailer
< 	$this->_out('trailer');
< 	$this->_out('<<');
< 	$this->_puttrailer();
< 	$this->_out('>>');
< 	$this->_out('startxref');
< 	$this->_out($o);
< 	$this->_out('%%EOF');
< 	$this->state = 3;
< }
< 
< // ********* NEW FUNCTIONS *********
< // Converts UTF-8 strings to UTF16-BE.
< function UTF8ToUTF16BE($str, $setbom=true) {
< 	$outstr = "";
< 	if ($setbom) {
< 		$outstr .= "\xFE\xFF"; // Byte Order Mark (BOM)
< 	}
< 	$outstr .= mb_convert_encoding($str, 'UTF-16BE', 'UTF-8');
< 	return $outstr;
< }
< 
< // Converts UTF-8 strings to codepoints array
< function UTF8StringToArray($str) {
<    $out = array();
<    $len = strlen($str);
<    for ($i = 0; $i < $len; $i++) {
< 	$uni = -1;
<       $h = ord($str[$i]);
<       if ( $h <= 0x7F )
<          $uni = $h;
<       elseif ( $h >= 0xC2 ) {
<          if ( ($h <= 0xDF) && ($i < $len -1) )
<             $uni = ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F);
<          elseif ( ($h <= 0xEF) && ($i < $len -2) )
<             $uni = ($h & 0x0F) << 12 | (ord($str[++$i]) & 0x3F) << 6
<                                        | (ord($str[++$i]) & 0x3F);
<          elseif ( ($h <= 0xF4) && ($i < $len -3) )
<             $uni = ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12
<                                        | (ord($str[++$i]) & 0x3F) << 6
<                                        | (ord($str[++$i]) & 0x3F);
<       }
< 	if ($uni >= 0) {
< 		$out[] = $uni;
< 	}
<    }
<    return $out;
< }
< 
< 
< // UTF-8 to codepoint array conversion.
< // Correctly handles all illegal UTF-8 sequences.
< function utf8_to_codepoints(&$txt) {
<   $l = strlen($txt);
<   $out = array();
<   for ($i = 0; $i < $l; ++$i) {
<     $c = ord($txt{$i});
<     // ASCII
<     if ($c < 0x80) {
<       $out[] = ord($txt{$i});
<     }
<     // Lost continuation byte
<     else if ($c < 0xC0) {
<       $out[] = 0xFFFD;
<       continue;
<     }
<     // Multibyte sequence leading byte
<     else {
<       if ($c < 0xE0) {
<         $s = 2;
<       }
<       else if ($c < 0xF0) {
<         $s = 3;
<       }
<       else if ($c < 0xF8) {
<         $s = 4;
<       }
<       // 5/6 byte sequences not possible for Unicode.
<       else {
<         $out[] = 0xFFFD;
<         while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; }
<         continue;
<       }
<       
<       $q = array($c);
<       // Fetch rest of sequence
<       while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
<       
<       // Check length
<       if (count($q) != $s) {
<         $out[] = 0xFFFD;
<         continue;
<       }
<       
<       switch ($s) {
<         case 2:
<           $cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80);
<           // Overlong sequence
<           if ($cp < 0x80) {
<             $out[] = 0xFFFD;
<           }
<           else {
<             $out[] = $cp;
<           }
<           continue;
< 
<         case 3:
<           $cp = (($q[0] ^ 0xE0) << 12) | (($q[1] ^ 0x80) << 6) | ($q[2] ^ 0x80);
<           // Overlong sequence
<           if ($cp < 0x800) {
<             $out[] = 0xFFFD;
<           }
<           // Check for UTF-8 encoded surrogates (caused by a bad UTF-8 encoder)
<           else if ($c > 0xD800 && $c < 0xDFFF) {
<             $out[] = 0xFFFD;
<           }
<           else {
<             $out[] = $cp;
<           }
<           continue;
< 
<         case 4:
<           $cp = (($q[0] ^ 0xF0) << 18) | (($q[1] ^ 0x80) << 12) | (($q[2] ^ 0x80) << 6) | ($q[3] ^ 0x80);
<           // Overlong sequence
<           if ($cp < 0x10000) {
<             $out[] = 0xFFFD;
<           }
<           // Outside of the Unicode range
<           else if ($cp >= 0x10FFFF) {
<             $out[] = 0xFFFD;
<           }
<           else {
<             $out[] = $cp;
<           }
<           continue;
<       }
<     }
<   }
<   return $out;
< }
< 
< // End of class
< }
< 
< // Handle special IE contype request
< if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=='contype')
< {
< 	header('Content-Type: application/pdf');
< 	exit;
< }
< 
< ?>
---
> <?php
> /*******************************************************************************
> * tFPDF (based on FPDF 1.85)                                                   *
> *                                                                              *
> * Version:  1.33                                                               *
> * Date:     2022-12-20                                                         *
> * Authors:  Ian Back <ianb@bpm1.com>                                           *
> *           Tycho Veltmeijer <tfpdf@tychoveltmeijer.nl> (versions 1.30+)       *
> * License:  LGPL                                                               *
> *******************************************************************************/
> 
> class tFPDF
> {
> const VERSION = '1.33';
> protected $unifontSubset;
> protected $page;               // current page number
> protected $n;                  // current object number
> protected $offsets;            // array of object offsets
> protected $buffer;             // buffer holding in-memory PDF
> protected $pages;              // array containing pages
> protected $state;              // current document state
> protected $compress;           // compression flag
> protected $k;                  // scale factor (number of points in user unit)
> protected $DefOrientation;     // default orientation
> protected $CurOrientation;     // current orientation
> protected $StdPageSizes;       // standard page sizes
> protected $DefPageSize;        // default page size
> protected $CurPageSize;        // current page size
> protected $CurRotation;        // current page rotation
> protected $PageInfo;           // page-related data
> protected $wPt, $hPt;          // dimensions of current page in points
> protected $w, $h;              // dimensions of current page in user unit
> protected $lMargin;            // left margin
> protected $tMargin;            // top margin
> protected $rMargin;            // right margin
> protected $bMargin;            // page break margin
> protected $cMargin;            // cell margin
> protected $x, $y;              // current position in user unit
> protected $lasth;              // height of last printed cell
> protected $LineWidth;          // line width in user unit
> protected $fontpath;           // path containing fonts
> protected $CoreFonts;          // array of core font names
> protected $fonts;              // array of used fonts
> protected $FontFiles;          // array of font files
> protected $encodings;          // array of encodings
> protected $cmaps;              // array of ToUnicode CMaps
> protected $FontFamily;         // current font family
> protected $FontStyle;          // current font style
> protected $underline;          // underlining flag
> protected $CurrentFont;        // current font info
> protected $FontSizePt;         // current font size in points
> protected $FontSize;           // current font size in user unit
> protected $DrawColor;          // commands for drawing color
> protected $FillColor;          // commands for filling color
> protected $TextColor;          // commands for text color
> protected $ColorFlag;          // indicates whether fill and text colors are different
> protected $WithAlpha;          // indicates whether alpha channel is used
> protected $ws;                 // word spacing
> protected $images;             // array of used images
> protected $PageLinks;          // array of links in pages
> protected $links;              // array of internal links
> protected $AutoPageBreak;      // automatic page breaking
> protected $PageBreakTrigger;   // threshold used to trigger page breaks
> protected $InHeader;           // flag set when processing header
> protected $InFooter;           // flag set when processing footer
> protected $AliasNbPages;       // alias for total number of pages
> protected $ZoomMode;           // zoom display mode
> protected $LayoutMode;         // layout display mode
> protected $metadata;           // document properties
> protected $CreationDate;       // document creation date
> protected $PDFVersion;         // PDF version number
> 
> /*******************************************************************************
> *                               Public methods                                 *
> *******************************************************************************/
> 
> function __construct($orientation='P', $unit='mm', $size='A4')
> {
> 	// Some checks
> 	$this->_dochecks();
> 	// Initialization of properties
> 	$this->state = 0;
> 	$this->page = 0;
> 	$this->n = 2;
> 	$this->buffer = '';
> 	$this->pages = array();
> 	$this->PageInfo = array();
> 	$this->fonts = array();
> 	$this->FontFiles = array();
> 	$this->encodings = array();
> 	$this->cmaps = array();
> 	$this->images = array();
> 	$this->links = array();
> 	$this->InHeader = false;
> 	$this->InFooter = false;
> 	$this->lasth = 0;
> 	$this->FontFamily = '';
> 	$this->FontStyle = '';
> 	$this->FontSizePt = 12;
> 	$this->underline = false;
> 	$this->DrawColor = '0 G';
> 	$this->FillColor = '0 g';
> 	$this->TextColor = '0 g';
> 	$this->ColorFlag = false;
> 	$this->WithAlpha = false;
> 	$this->ws = 0;
> 	// Font path
> 	if(defined('FPDF_FONTPATH'))
> 	{
> 		$this->fontpath = FPDF_FONTPATH;
> 		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
> 			$this->fontpath .= '/';
> 	}
> 	elseif(is_dir(dirname(__FILE__).'/font'))
> 		$this->fontpath = dirname(__FILE__).'/font/';
> 	else
> 		$this->fontpath = '';
> 	// Core fonts
> 	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats');
> 	// Scale factor
> 	if($unit=='pt')
> 		$this->k = 1;
> 	elseif($unit=='mm')
> 		$this->k = 72/25.4;
> 	elseif($unit=='cm')
> 		$this->k = 72/2.54;
> 	elseif($unit=='in')
> 		$this->k = 72;
> 	else
> 		$this->Error('Incorrect unit: '.$unit);
> 	// Page sizes
> 	$this->StdPageSizes = array('a2'=>array(1190.55,1683.78), 'a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
> 		'letter'=>array(612,792), 'legal'=>array(612,1008), 'ledger'=>array(1224,792), 'tabloid'=>array(792,1224));
> 	$size = $this->_getpagesize($size);
> 	$this->DefPageSize = $size;
> 	$this->CurPageSize = $size;
> 	// Page orientation
> 	$orientation = strtolower($orientation);
> 	if($orientation=='p' || $orientation=='portrait')
> 	{
> 		$this->DefOrientation = 'P';
> 		$this->w = $size[0];
> 		$this->h = $size[1];
> 	}
> 	elseif($orientation=='l' || $orientation=='landscape')
> 	{
> 		$this->DefOrientation = 'L';
> 		$this->w = $size[1];
> 		$this->h = $size[0];
> 	}
> 	else
> 		$this->Error('Incorrect orientation: '.$orientation);
> 	$this->CurOrientation = $this->DefOrientation;
> 	$this->wPt = $this->w*$this->k;
> 	$this->hPt = $this->h*$this->k;
> 	// Page rotation
> 	$this->CurRotation = 0;
> 	// Page margins (1 cm)
> 	$margin = 28.35/$this->k;
> 	$this->SetMargins($margin,$margin);
> 	// Interior cell margin (1 mm)
> 	$this->cMargin = $margin/10;
> 	// Line width (0.2 mm)
> 	$this->LineWidth = .567/$this->k;
> 	// Automatic page break
> 	$this->SetAutoPageBreak(true,2*$margin);
> 	// Default display mode
> 	$this->SetDisplayMode('default');
> 	// Enable compression
> 	$this->SetCompression(true);
> 	// Metadata
> 	$this->metadata = array('Producer'=>'tFPDF '.self::VERSION);
> 	// Set default PDF version number
> 	$this->PDFVersion = '1.3';
> }
> 
> function SetMargins($left, $top, $right=null)
> {
> 	// Set left, top and right margins
> 	$this->lMargin = $left;
> 	$this->tMargin = $top;
> 	if($right===null)
> 		$right = $left;
> 	$this->rMargin = $right;
> }
> 
> function SetLeftMargin($margin)
> {
> 	// Set left margin
> 	$this->lMargin = $margin;
> 	if($this->page>0 && $this->x<$margin)
> 		$this->x = $margin;
> }
> 
> function SetTopMargin($margin)
> {
> 	// Set top margin
> 	$this->tMargin = $margin;
> }
> 
> function SetRightMargin($margin)
> {
> 	// Set right margin
> 	$this->rMargin = $margin;
> }
> 
> function SetAutoPageBreak($auto, $margin=0)
> {
> 	// Set auto page break mode and triggering margin
> 	$this->AutoPageBreak = $auto;
> 	$this->bMargin = $margin;
> 	$this->PageBreakTrigger = $this->h-$margin;
> }
> 
> function SetDisplayMode($zoom, $layout='default')
> {
> 	// Set display mode in viewer
> 	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
> 		$this->ZoomMode = $zoom;
> 	else
> 		$this->Error('Incorrect zoom display mode: '.$zoom);
> 	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
> 		$this->LayoutMode = $layout;
> 	else
> 		$this->Error('Incorrect layout display mode: '.$layout);
> }
> 
> function SetCompression($compress)
> {
> 	// Set page compression
> 	if(function_exists('gzcompress'))
> 		$this->compress = $compress;
> 	else
> 		$this->compress = false;
> }
> 
> function SetTitle($title, $isUTF8=false)
> {
> 	// Title of document
> 	$this->metadata['Title'] = $isUTF8 ? $title : $this->_UTF8encode($title);
> }
> 
> function SetAuthor($author, $isUTF8=false)
> {
> 	// Author of document
> 	$this->metadata['Author'] = $isUTF8 ? $author : $this->_UTF8encode($author);
> }
> 
> function SetSubject($subject, $isUTF8=false)
> {
> 	// Subject of document
> 	$this->metadata['Subject'] = $isUTF8 ? $subject : $this->_UTF8encode($subject);
> }
> 
> function SetKeywords($keywords, $isUTF8=false)
> {
> 	// Keywords of document
> 	$this->metadata['Keywords'] = $isUTF8 ? $keywords : $this->_UTF8encode($keywords);
> }
> 
> function SetCreator($creator, $isUTF8=false)
> {
> 	// Creator of document
> 	$this->metadata['Creator'] = $isUTF8 ? $creator : $this->_UTF8encode($creator);
> }
> 
> function AliasNbPages($alias='{nb}')
> {
> 	// Define an alias for total number of pages
> 	$this->AliasNbPages = $alias;
> }
> 
> function Error($msg)
> {
> 	// Fatal error
> 	throw new Exception('tFPDF error: '.$msg);
> }
> 
> function Close()
> {
> 	// Terminate document
> 	if($this->state==3)
> 		return;
> 	if($this->page==0)
> 		$this->AddPage();
> 	// Page footer
> 	$this->InFooter = true;
> 	$this->Footer();
> 	$this->InFooter = false;
> 	// Close page
> 	$this->_endpage();
> 	// Close document
> 	$this->_enddoc();
> }
> 
> function AddPage($orientation='', $size='', $rotation=0)
> {
> 	// Start a new page
> 	if($this->state==3)
> 		$this->Error('The document is closed');
> 	$family = $this->FontFamily;
> 	$style = $this->FontStyle.($this->underline ? 'U' : '');
> 	$fontsize = $this->FontSizePt;
> 	$lw = $this->LineWidth;
> 	$dc = $this->DrawColor;
> 	$fc = $this->FillColor;
> 	$tc = $this->TextColor;
> 	$cf = $this->ColorFlag;
> 	if($this->page>0)
> 	{
> 		// Page footer
> 		$this->InFooter = true;
> 		$this->Footer();
> 		$this->InFooter = false;
> 		// Close page
> 		$this->_endpage();
> 	}
> 	// Start new page
> 	$this->_beginpage($orientation,$size,$rotation);
> 	// Set line cap style to square
> 	$this->_out('2 J');
> 	// Set line width
> 	$this->LineWidth = $lw;
> 	$this->_out(sprintf('%.2F w',$lw*$this->k));
> 	// Set font
> 	if($family)
> 		$this->SetFont($family,$style,$fontsize);
> 	// Set colors
> 	$this->DrawColor = $dc;
> 	if($dc!='0 G')
> 		$this->_out($dc);
> 	$this->FillColor = $fc;
> 	if($fc!='0 g')
> 		$this->_out($fc);
> 	$this->TextColor = $tc;
> 	$this->ColorFlag = $cf;
> 	// Page header
> 	$this->InHeader = true;
> 	$this->Header();
> 	$this->InHeader = false;
> 	// Restore line width
> 	if($this->LineWidth!=$lw)
> 	{
> 		$this->LineWidth = $lw;
> 		$this->_out(sprintf('%.2F w',$lw*$this->k));
> 	}
> 	// Restore font
> 	if($family)
> 		$this->SetFont($family,$style,$fontsize);
> 	// Restore colors
> 	if($this->DrawColor!=$dc)
> 	{
> 		$this->DrawColor = $dc;
> 		$this->_out($dc);
> 	}
> 	if($this->FillColor!=$fc)
> 	{
> 		$this->FillColor = $fc;
> 		$this->_out($fc);
> 	}
> 	$this->TextColor = $tc;
> 	$this->ColorFlag = $cf;
> }
> 
> function Header()
> {
> 	// To be implemented in your own inherited class
> }
> 
> function Footer()
> {
> 	// To be implemented in your own inherited class
> }
> 
> function PageNo()
> {
> 	// Get current page number
> 	return $this->page;
> }
> 
> function SetDrawColor($r, $g=null, $b=null)
> {
> 	// Set color for all stroking operations
> 	if(($r==0 && $g==0 && $b==0) || $g===null)
> 		$this->DrawColor = sprintf('%.3F G',$r/255);
> 	else
> 		$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
> 	if($this->page>0)
> 		$this->_out($this->DrawColor);
> }
> 
> function SetFillColor($r, $g=null, $b=null)
> {
> 	// Set color for all filling operations
> 	if(($r==0 && $g==0 && $b==0) || $g===null)
> 		$this->FillColor = sprintf('%.3F g',$r/255);
> 	else
> 		$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
> 	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
> 	if($this->page>0)
> 		$this->_out($this->FillColor);
> }
> 
> function SetTextColor($r, $g=null, $b=null)
> {
> 	// Set color for text
> 	if(($r==0 && $g==0 && $b==0) || $g===null)
> 		$this->TextColor = sprintf('%.3F g',$r/255);
> 	else
> 		$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
> 	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
> }
> 
> function GetStringWidth($s)
> {
> 	// Get width of a string in the current font
> 	$s = (string)$s;
> 	$cw = $this->CurrentFont['cw'];
> 	$w=0;
> 	if ($this->unifontSubset) {
> 		$unicode = $this->UTF8StringToArray($s);
> 		foreach($unicode as $char) {
> 			if (isset($cw[2*$char])) { $w += (ord($cw[2*$char])<<8) + ord($cw[2*$char+1]); }
> 			else if($char>0 && $char<128 && isset($cw[chr($char)])) { $w += $cw[chr($char)]; }
> 			else if(isset($this->CurrentFont['desc']['MissingWidth'])) { $w += $this->CurrentFont['desc']['MissingWidth']; }
> 			else if(isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; }
> 			else { $w += 500; }
> 		}
> 	}
> 	else {
> 		$l = strlen($s);
> 		for($i=0;$i<$l;$i++)
> 			$w += $cw[$s[$i]];
> 	}
> 	return $w*$this->FontSize/1000;
> }
> 
> function SetLineWidth($width)
> {
> 	// Set line width
> 	$this->LineWidth = $width;
> 	if($this->page>0)
> 		$this->_out(sprintf('%.2F w',$width*$this->k));
> }
> 
> function Line($x1, $y1, $x2, $y2)
> {
> 	// Draw a line
> 	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
> }
> 
> function Rect($x, $y, $w, $h, $style='')
> {
> 	// Draw a rectangle
> 	if($style=='F')
> 		$op = 'f';
> 	elseif($style=='FD' || $style=='DF')
> 		$op = 'B';
> 	else
> 		$op = 'S';
> 	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
> }
> 
> function AddFont($family, $style='', $file='', $uni=false)
> {
> 	// Add a TrueType, OpenType or Type1 font
> 	$ucFamily = $family;
> 	$family = strtolower($family);
> 	$style = strtoupper($style);
> 	if($style=='IB')
> 		$style = 'BI';
> 	if($file=='') {
> 	   if ($uni) {
> 			$file = str_replace(' ','',$ucFamily).'/'.str_replace(' ','',$ucFamily).$style.'.ttf';
> 		}
> 		else {
> 			$file = str_replace(' ','',$family).'/'.str_replace(' ','',$family).strtolower($style).'.php';
> 	   }
> 	}
> 	$fontkey = $family.$style;
> 	if(isset($this->fonts[$fontkey]))
> 		return;
> 	if ($uni) {
> 		if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file )) { $ttffilename = _SYSTEM_TTFONTS.$file ; }
> 		else { $ttffilename = $this->fontpath.'unifont/'.$file ; }
> 		$unifilename = $this->fontpath.'unifont/'.$ucFamily.'/'.$family.strtolower($style);
> 		$name = '';
> 		$originalsize = 0;
> 		$ttfstat = stat($ttffilename);
> 		if (file_exists($unifilename.'.mtx.php')) {
> 			include($unifilename.'.mtx.php');
> 		}
> 		if (!isset($type) ||  !isset($name) || $originalsize != $ttfstat['size']) {
> 			$ttffile = $ttffilename;
> 			require_once($this->fontpath.'unifont/ttfonts.php');
> 			$ttf = new TTFontFile();
> 			$ttf->getMetrics($ttffile);
> 			$cw = $ttf->charWidths;
> 			$name = preg_replace('/[ ()]/','',$ttf->fullName);
> 
> 			$desc= array('Ascent'=>round($ttf->ascent),
> 			'Descent'=>round($ttf->descent),
> 			'CapHeight'=>round($ttf->capHeight),
> 			'Flags'=>$ttf->flags,
> 			'FontBBox'=>'['.round($ttf->bbox[0])." ".round($ttf->bbox[1])." ".round($ttf->bbox[2])." ".round($ttf->bbox[3]).']',
> 			'ItalicAngle'=>$ttf->italicAngle,
> 			'StemV'=>round($ttf->stemV),
> 			'MissingWidth'=>round($ttf->defaultWidth));
> 			$up = round($ttf->underlinePosition);
> 			$ut = round($ttf->underlineThickness);
> 			$originalsize = $ttfstat['size']+0;
> 			$type = 'TTF';
> 			// Generate metrics .php file
> 			$s='<?php'."\n";
> 			$s.='$name=\''.$name."';\n";
> 			$s.='$type=\''.$type."';\n";
> 			$s.='$desc='.var_export($desc,true).";\n";
> 			$s.='$up='.$up.";\n";
> 			$s.='$ut='.$ut.";\n";
> 			$s.='$ttffile=\''.$ttffile."';\n";
> 			$s.='$originalsize='.$originalsize.";\n";
> 			$s.='$fontkey=\''.$fontkey."';\n";
> 			$s.="?>";
> 			if (is_writable(dirname($this->fontpath.'unifont/'.'x'))) {
> 				$fh = fopen($unifilename.'.mtx.php',"w");
> 				fwrite($fh,$s,strlen($s));
> 				fclose($fh);
> 				$fh = fopen($unifilename.'.cw.dat',"wb");
> 				fwrite($fh,$cw,strlen($cw));
> 				fclose($fh);
> 				if (file_exists($unifilename.'.cw127.php')) {
> 					unlink($unifilename.'.cw127.php');
> 				}
> 			}
> 			unset($ttf);
> 		}
> 		else {
> 			$cw = @file_get_contents($unifilename.'.cw.dat');
> 		}
> 		$i = count($this->fonts)+1;
> 		if(!empty($this->AliasNbPages))
> 			$sbarr = range(0,57);
> 		else
> 			$sbarr = range(0,32);
> 		$this->fonts[$fontkey] = array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'ttffile'=>$ttffile, 'fontkey'=>$fontkey, 'subset'=>$sbarr, 'unifilename'=>$unifilename);
> 
> 		$this->FontFiles[$fontkey]=array('length1'=>$originalsize, 'type'=>"TTF", 'ttffile'=>$ttffile);
> 		$this->FontFiles[$file]=array('type'=>"TTF");
> 		unset($cw);
> 	}
> 	else {
> 		$info = $this->_loadfont($file);
> 		$info['i'] = count($this->fonts)+1;
> 		if(!empty($info['file']))
> 		{
> 			// Embedded font
> 			if($info['type']=='TrueType')
> 				$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
> 			else
> 				$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
> 		}
> 		$this->fonts[$fontkey] = $info;
> 	}
> }
> 
> function SetFont($family, $style='', $size=0)
> {
> 	// Select a font; size given in points
> 	if($family=='')
> 		$family = $this->FontFamily;
> 	else
> 		$family = strtolower($family);
> 	$style = strtoupper($style);
> 	if(strpos($style,'U')!==false)
> 	{
> 		$this->underline = true;
> 		$style = str_replace('U','',$style);
> 	}
> 	else
> 		$this->underline = false;
> 	if($style=='IB')
> 		$style = 'BI';
> 	if($size==0)
> 		$size = $this->FontSizePt;
> 	// Test if font is already selected
> 	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
> 		return;
> 
> 	// Test if font is already loaded
> 	$fontkey = $family.$style;
> 	if(!isset($this->fonts[$fontkey]))
> 	{
> 		// Test if one of the core fonts
> 		if($family=='arial')
> 			$family = 'helvetica';
> 		if(in_array($family,$this->CoreFonts))
> 		{
> 			if($family=='symbol' || $family=='zapfdingbats')
> 				$style = '';
> 			$fontkey = $family.$style;
> 			if(!isset($this->fonts[$fontkey]))
> 				$this->AddFont($family,$style);
> 		}
> 		else
> 			$this->Error('Undefined font: '.$family.' '.$style);
> 	}
> 	// Select it
> 	$this->FontFamily = $family;
> 	$this->FontStyle = $style;
> 	$this->FontSizePt = $size;
> 	$this->FontSize = $size/$this->k;
> 	$this->CurrentFont = &$this->fonts[$fontkey];
> 	if ($this->fonts[$fontkey]['type']=='TTF') { $this->unifontSubset = true; }
> 	else { $this->unifontSubset = false; }
> 	if($this->page>0)
> 		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
> }
> 
> function SetFontSize($size)
> {
> 	// Set font size in points
> 	if($this->FontSizePt==$size)
> 		return;
> 	$this->FontSizePt = $size;
> 	$this->FontSize = $size/$this->k;
> 	if($this->page>0)
> 		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
> }
> 
> function AddLink()
> {
> 	// Create a new internal link
> 	$n = count($this->links)+1;
> 	$this->links[$n] = array(0, 0);
> 	return $n;
> }
> 
> function SetLink($link, $y=0, $page=-1)
> {
> 	// Set destination of internal link
> 	if($y==-1)
> 		$y = $this->y;
> 	if($page==-1)
> 		$page = $this->page;
> 	$this->links[$link] = array($page, $y);
> }
> 
> function Link($x, $y, $w, $h, $link)
> {
> 	// Put a link on the page
> 	$this->PageLinks[$this->page][] = array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
> }
> 
> function Text($x, $y, $txt)
> {
> 	// Output a string
> 	$txt = (string)$txt;
> 	if(!isset($this->CurrentFont))
> 		$this->Error('No font has been set');
> 	if ($this->unifontSubset)
> 	{
> 		$txt2 = '('.$this->_escape($this->UTF8ToUTF16BE($txt, false)).')';
> 		foreach($this->UTF8StringToArray($txt) as $uni)
> 			$this->CurrentFont['subset'][$uni] = $uni;
> 	}
> 	else
> 		$txt2 = '('.$this->_escape($txt).')';
> 	$s = sprintf('BT %.2F %.2F Td %s Tj ET',$x*$this->k,($this->h-$y)*$this->k,$txt2);
> 	if($this->underline && $txt!='')
> 		$s .= ' '.$this->_dounderline($x,$y,$txt);
> 	if($this->ColorFlag)
> 		$s = 'q '.$this->TextColor.' '.$s.' Q';
> 	$this->_out($s);
> }
> 
> function AcceptPageBreak()
> {
> 	// Accept automatic page break or not
> 	return $this->AutoPageBreak;
> }
> 
> function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
> {
> 	// Output a cell
> 	$txt = (string)$txt;
> 	$k = $this->k;
> 	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
> 	{
> 		// Automatic page break
> 		$x = $this->x;
> 		$ws = $this->ws;
> 		if($ws>0)
> 		{
> 			$this->ws = 0;
> 			$this->_out('0 Tw');
> 		}
> 		$this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
> 		$this->x = $x;
> 		if($ws>0)
> 		{
> 			$this->ws = $ws;
> 			$this->_out(sprintf('%.3F Tw',$ws*$k));
> 		}
> 	}
> 	if($w==0)
> 		$w = $this->w-$this->rMargin-$this->x;
> 	$s = '';
> 	if($fill || $border==1)
> 	{
> 		if($fill)
> 			$op = ($border==1) ? 'B' : 'f';
> 		else
> 			$op = 'S';
> 		$s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
> 	}
> 	if(is_string($border))
> 	{
> 		$x = $this->x;
> 		$y = $this->y;
> 		if(strpos($border,'L')!==false)
> 			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
> 		if(strpos($border,'T')!==false)
> 			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
> 		if(strpos($border,'R')!==false)
> 			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
> 		if(strpos($border,'B')!==false)
> 			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
> 	}
> 	if($txt!=='')
> 	{
> 		if(!isset($this->CurrentFont))
> 			$this->Error('No font has been set');
> 		if($align=='R')
> 			$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
> 		elseif($align=='C')
> 			$dx = ($w-$this->GetStringWidth($txt))/2;
> 		else
> 			$dx = $this->cMargin;
> 		if($this->ColorFlag)
> 			$s .= 'q '.$this->TextColor.' ';
> 		// If multibyte, Tw has no effect - do word spacing using an adjustment before each space
> 		if ($this->ws && $this->unifontSubset) {
> 			foreach($this->UTF8StringToArray($txt) as $uni)
> 				$this->CurrentFont['subset'][$uni] = $uni;
> 			$space = $this->_escape($this->UTF8ToUTF16BE(' ', false));
> 			$s .= sprintf('BT 0 Tw %.2F %.2F Td [',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k);
> 			$t = explode(' ',$txt);
> 			$numt = count($t);
> 			for($i=0;$i<$numt;$i++) {
> 				$tx = $t[$i];
> 				$tx = '('.$this->_escape($this->UTF8ToUTF16BE($tx, false)).')';
> 				$s .= sprintf('%s ',$tx);
> 				if (($i+1)<$numt) {
> 					$adj = -($this->ws*$this->k)*1000/$this->FontSizePt;
> 					$s .= sprintf('%d(%s) ',$adj,$space);
> 				}
> 			}
> 			$s .= '] TJ';
> 			$s .= ' ET';
> 		}
> 		else {
> 			if ($this->unifontSubset)
> 			{
> 				$txt2 = '('.$this->_escape($this->UTF8ToUTF16BE($txt, false)).')';
> 				foreach($this->UTF8StringToArray($txt) as $uni)
> 					$this->CurrentFont['subset'][$uni] = $uni;
> 			}
> 			else
> 				$txt2='('.$this->_escape($txt).')';
> 			$s .= sprintf('BT %.2F %.2F Td %s Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
> 		}
> 		if($this->underline)
> 			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
> 		if($this->ColorFlag)
> 			$s .= ' Q';
> 		if($link)
> 			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
> 	}
> 	if($s)
> 		$this->_out($s);
> 	$this->lasth = $h;
> 	if($ln>0)
> 	{
> 		// Go to next line
> 		$this->y += $h;
> 		if($ln==1)
> 			$this->x = $this->lMargin;
> 	}
> 	else
> 		$this->x += $w;
> }
> 
> //function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
> function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $hangIndent=0)
> {
> 	// Output text with automatic or explicit line breaks
> 	if(!isset($this->CurrentFont))
> 		$this->Error('No font has been set');
> 	$cw = $this->CurrentFont['cw'];
> 	if($w==0)
> 		$w = $this->w-$this->rMargin-$this->x;
> 	$wmax = ($w-2*$this->cMargin);
> 	//$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
> 	$s = str_replace("\r",'',(string)$txt);
> 	if ($this->unifontSubset) {
> 		$nb=mb_strlen($s, 'utf-8');
> 		while($nb>0 && mb_substr($s,$nb-1,1,'utf-8')=="\n")	$nb--;
> 	}
> 	else {
> 		$nb = strlen($s);
> 		if($nb>0 && $s[$nb-1]=="\n")
> 			$nb--;
> 	}
> 	$b = 0;
> 	if($border)
> 	{
> 		if($border==1)
> 		{
> 			$border = 'LTRB';
> 			$b = 'LRT';
> 			$b2 = 'LR';
> 		}
> 		else
> 		{
> 			$b2 = '';
> 			if(strpos($border,'L')!==false)
> 				$b2 .= 'L';
> 			if(strpos($border,'R')!==false)
> 				$b2 .= 'R';
> 			$b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;
> 		}
> 	}
> 	$sep = -1;
> 	$i = 0;
> 	$j = 0;
> 	$l = 0;
> 	$ns = 0;
> 	$nl = 1;
> 	while($i<$nb)
> 	{
> 		// Get next character
> 		if ($this->unifontSubset) {
> 			$c = mb_substr($s,$i,1,'UTF-8');
> 		}
> 		else {
> 			$c=$s[$i];
> 		}
> 		if($c=="\n")
> 		{
> 			// Explicit line break
> 			if($this->ws>0)
> 			{
> 				$this->ws = 0;
> 				$this->_out('0 Tw');
> 			}
> 			if ($this->unifontSubset) {
> 				$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),$b,2,$align,$fill);
> 			}
> 			else {
> 				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
> 			}
> 			$i++;
> 			$sep = -1;
> 			$j = $i;
> 			$l = 0;
> 			$ns = 0;
> 			$nl++;
> 			if($border && $nl==2)
> 				$b = $b2;
> 			continue;
> 		}
> 		if($c==' ')
> 		{
> 			$sep = $i;
> 			$ls = $l;
> 			$ns++;
> 		}
> 
> 		if ($this->unifontSubset) { $l += $this->GetStringWidth($c); }
> 		else { $l += $cw[$c]*$this->FontSize/1000; }
> 
> 		if($l>$wmax)
> 		{
> 			// Automatic line break
> 			if($sep==-1)
> 			{
> 				if($i==$j)
> 					$i++;
> 				if($this->ws>0)
> 				{
> 					$this->ws = 0;
> 					$this->_out('0 Tw');
> 				}
> 				if ($this->unifontSubset) {
> 					$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),$b,2,$align,$fill);
> 					if ($hangIndent > 0 && $j == 0) {
> 						$this->SetX($this->x + $hangIndent);
> 						$wmax -= $hangIndent;
> 					}
> 				}
> 				else {
> 					$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
> 					if ($hangIndent > 0 && $j == 0) {
> 						$this->SetX($this->x + $hangIndent);
> 						$wmax -= $hangIndent;
> 					}
> 				}
> 			}
> 			else
> 			{
> 				if($align=='J')
> 				{
> 					$this->ws = ($ns>1) ? ($wmax-$ls)/($ns-1) : 0;
> 					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
> 				}
> 				if ($this->unifontSubset) {
> 					$this->Cell($w,$h,mb_substr($s,$j,$sep-$j,'UTF-8'),$b,2,$align,$fill);
> 					if ($hangIndent > 0 && $j == 0) {
> 						$this->SetX($this->x + $hangIndent);
> 						$wmax -= $hangIndent;
> 					}
> 				}
> 				else {
> 					$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
> 					if ($hangIndent > 0 && $j == 0) {
> 						$this->SetX($this->x + $hangIndent);
> 						$wmax -= $hangIndent;
> 					}
> 				}
> 				$i = $sep+1;
> 			}
> 			$sep = -1;
> 			$j = $i;
> 			$l = 0;
> 			$ns = 0;
> 			$nl++;
> 			if($border && $nl==2)
> 				$b = $b2;
> 		}
> 		else
> 			$i++;
> 	}
> 	// Last chunk
> 	if($this->ws>0)
> 	{
> 		$this->ws = 0;
> 		$this->_out('0 Tw');
> 	}
> 	if($border && strpos($border,'B')!==false)
> 		$b .= 'B';
> 	if ($this->unifontSubset) {
> 		$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),$b,2,$align,$fill);
> 	}
> 	else {
> 		$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
> 	}
> 	$this->x = $this->lMargin;
> }
> 
> function Write($h, $txt, $link='')
> {
> 	// Output text in flowing mode
> 	if(!isset($this->CurrentFont))
> 		$this->Error('No font has been set');
> 	$cw = $this->CurrentFont['cw'];
> 	$w = $this->w-$this->rMargin-$this->x;
> 	$wmax = ($w-2*$this->cMargin);
> 	$s = str_replace("\r",'',(string)$txt);
> 	if ($this->unifontSubset) {
> 		$nb = mb_strlen($s, 'UTF-8');
> 		if($nb==1 && $s==" ") {
> 			$this->x += $this->GetStringWidth($s);
> 			return;
> 		}
> 	}
> 	else {
> 		$nb = strlen($s);
> 	}
> 	$sep = -1;
> 	$i = 0;
> 	$j = 0;
> 	$l = 0;
> 	$nl = 1;
> 	while($i<$nb)
> 	{
> 		// Get next character
> 		if ($this->unifontSubset) {
> 			$c = mb_substr($s,$i,1,'UTF-8');
> 		}
> 		else {
> 			$c = $s[$i];
> 		}
> 		if($c=="\n")
> 		{
> 			// Explicit line break
> 			if ($this->unifontSubset) {
> 				$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,2,'',false,$link);
> 			}
> 			else {
> 				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
> 			}
> 			$i++;
> 			$sep = -1;
> 			$j = $i;
> 			$l = 0;
> 			if($nl==1)
> 			{
> 				$this->x = $this->lMargin;
> 				$w = $this->w-$this->rMargin-$this->x;
> 				$wmax = ($w-2*$this->cMargin);
> 			}
> 			$nl++;
> 			continue;
> 		}
> 		if($c==' ')
> 			$sep = $i;
> 
> 		if ($this->unifontSubset) { $l += $this->GetStringWidth($c); }
> 		else { $l += $cw[$c]*$this->FontSize/1000; }
> 
> 		if($l>$wmax)
> 		{
> 			// Automatic line break
> 			if($sep==-1)
> 			{
> 				if($this->x>$this->lMargin)
> 				{
> 					// Move to next line
> 					$this->x = $this->lMargin;
> 					$this->y += $h;
> 					$w = $this->w-$this->rMargin-$this->x;
> 					$wmax = ($w-2*$this->cMargin);
> 					$i++;
> 					$nl++;
> 					continue;
> 				}
> 				if($i==$j)
> 					$i++;
> 				if ($this->unifontSubset) {
> 					$this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,2,'',false,$link);
> 				}
> 				else {
> 					$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
> 				}
> 			}
> 			else
> 			{
> 				if ($this->unifontSubset) {
> 					$this->Cell($w,$h,mb_substr($s,$j,$sep-$j,'UTF-8'),0,2,'',false,$link);
> 				}
> 				else {
> 					$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);
> 				}
> 				$i = $sep+1;
> 			}
> 			$sep = -1;
> 			$j = $i;
> 			$l = 0;
> 			if($nl==1)
> 			{
> 				$this->x = $this->lMargin;
> 				$w = $this->w-$this->rMargin-$this->x;
> 				$wmax = ($w-2*$this->cMargin);
> 			}
> 			$nl++;
> 		}
> 		else
> 			$i++;
> 	}
> 	// Last chunk
> 	if($i!=$j) {
> 		if ($this->unifontSubset) {
> 			$this->Cell($l,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,0,'',false,$link);
> 		}
> 		else {
> 			$this->Cell($l,$h,substr($s,$j),0,0,'',false,$link);
> 		}
> 	}
> }
> 
> function Ln($h=null)
> {
> 	// Line feed; default value is the last cell height
> 	$this->x = $this->lMargin;
> 	if($h===null)
> 		$this->y += $this->lasth;
> 	else
> 		$this->y += $h;
> }
> 
> function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
> {
> 	// Put an image on the page
> 	if($file=='')
> 		$this->Error('Image file name is empty');
> 	if(!isset($this->images[$file]))
> 	{
> 		// First use of this image, get info
> 		if($type=='')
> 		{
> 			$pos = strrpos($file,'.');
> 			if(!$pos)
> 				$this->Error('Image file has no extension and no type was specified: '.$file);
> 			$type = substr($file,$pos+1);
> 		}
> 		$type = strtolower($type);
> 		if($type=='jpeg')
> 			$type = 'jpg';
> 		$mtd = '_parse'.$type;
> 		if(!method_exists($this,$mtd))
> 			$this->Error('Unsupported image type: '.$type);
> 		$info = $this->$mtd($file);
> 		$info['i'] = count($this->images)+1;
> 		$this->images[$file] = $info;
> 	}
> 	else
> 		$info = $this->images[$file];
> 
> 	// Automatic width and height calculation if needed
> 	if($w==0 && $h==0)
> 	{
> 		// Put image at 96 dpi
> 		$w = -96;
> 		$h = -96;
> 	}
> 	if($w<0)
> 		$w = -$info['w']*72/$w/$this->k;
> 	if($h<0)
> 		$h = -$info['h']*72/$h/$this->k;
> 	if($w==0)
> 		$w = $h*$info['w']/$info['h'];
> 	if($h==0)
> 		$h = $w*$info['h']/$info['w'];
> 
> 	// Flowing mode
> 	if($y===null)
> 	{
> 		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
> 		{
> 			// Automatic page break
> 			$x2 = $this->x;
> 			$this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
> 			$this->x = $x2;
> 		}
> 		$y = $this->y;
> 		$this->y += $h;
> 	}
> 
> 	if($x===null)
> 		$x = $this->x;
> 	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
> 	if($link)
> 		$this->Link($x,$y,$w,$h,$link);
> }
> 
> function GetPageWidth()
> {
> 	// Get current page width
> 	return $this->w;
> }
> 
> function GetPageHeight()
> {
> 	// Get current page height
> 	return $this->h;
> }
> 
> function GetX()
> {
> 	// Get x position
> 	return $this->x;
> }
> 
> function SetX($x)
> {
> 	// Set x position
> 	if($x>=0)
> 		$this->x = $x;
> 	else
> 		$this->x = $this->w+$x;
> }
> 
> function GetY()
> {
> 	// Get y position
> 	return $this->y;
> }
> 
> function SetY($y, $resetX=true)
> {
> 	// Set y position and optionally reset x
> 	if($y>=0)
> 		$this->y = $y;
> 	else
> 		$this->y = $this->h+$y;
> 	if($resetX)
> 		$this->x = $this->lMargin;
> }
> 
> function SetXY($x, $y)
> {
> 	// Set x and y positions
> 	$this->SetX($x);
> 	$this->SetY($y,false);
> }
> 
> function Output($dest='', $name='', $isUTF8=false)
> {
> 	// Output PDF to some destination
> 	$this->Close();
> 	if(strlen($name)==1 && strlen($dest)!=1)
> 	{
> 		// Fix parameter order
> 		$tmp = $dest;
> 		$dest = $name;
> 		$name = $tmp;
> 	}
> 	if($dest=='')
> 		$dest = 'I';
> 	if($name=='')
> 		$name = 'doc.pdf';
> 	switch(strtoupper($dest))
> 	{
> 		case 'I':
> 			// Send to standard output
> 			$this->_checkoutput();
> 			if(PHP_SAPI!='cli')
> 			{
> 				// We send to a browser
> 				header('Content-Type: application/pdf');
> 				header('Content-Disposition: inline; '.$this->_httpencode('filename',$name,$isUTF8));
> 				header('Cache-Control: private, max-age=0, must-revalidate');
> 				header('Pragma: public');
> 			}
> 			echo $this->buffer;
> 			break;
> 		case 'D':
> 			// Download file
> 			$this->_checkoutput();
> 			header('Content-Type: application/pdf');
> 			header('Content-Disposition: attachment; '.$this->_httpencode('filename',$name,$isUTF8));
> 			header('Cache-Control: private, max-age=0, must-revalidate');
> 			header('Pragma: public');
> 			echo $this->buffer;
> 			break;
> 		case 'F':
> 			// Save to local file
> 			if(!file_put_contents($name,$this->buffer))
> 				$this->Error('Unable to create output file: '.$name);
> 			break;
> 		case 'S':
> 			// Return as a string
> 			return $this->buffer;
> 		default:
> 			$this->Error('Incorrect output destination: '.$dest);
> 	}
> 	return '';
> }
> 
> /*******************************************************************************
> *                              Protected methods                               *
> *******************************************************************************/
> 
> protected function _dochecks()
> {
> 	// Check availability of mbstring
> 	if(!function_exists('mb_strlen'))
> 		$this->Error('mbstring extension is not available');
> }
> 
> protected function _checkoutput()
> {
> 	if(PHP_SAPI!='cli')
> 	{
> 		if(headers_sent($file,$line))
> 			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
> 	}
> 	if(ob_get_length())
> 	{
> 		// The output buffer is not empty
> 		if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))
> 		{
> 			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
> 			ob_clean();
> 		}
> 		else
> 			$this->Error("Some data has already been output, can't send PDF file");
> 	}
> }
> 
> protected function _getpagesize($size)
> {
> 	if(is_string($size))
> 	{
> 		$size = strtolower($size);
> 		if(!isset($this->StdPageSizes[$size]))
> 			$this->Error('Unknown page size: '.$size);
> 		$a = $this->StdPageSizes[$size];
> 		return array($a[0]/$this->k, $a[1]/$this->k);
> 	}
> 	else
> 	{
> 		if($size[0]>$size[1])
> 			return array($size[1], $size[0]);
> 		else
> 			return $size;
> 	}
> }
> 
> protected function _beginpage($orientation, $size, $rotation)
> {
> 	$this->page++;
> 	$this->pages[$this->page] = '';
> 	$this->PageLinks[$this->page] = array();
> 	$this->state = 2;
> 	$this->x = $this->lMargin;
> 	$this->y = $this->tMargin;
> 	$this->FontFamily = '';
> 	// Check page size and orientation
> 	if($orientation=='')
> 		$orientation = $this->DefOrientation;
> 	else
> 		$orientation = strtoupper($orientation[0]);
> 	if($size=='')
> 		$size = $this->DefPageSize;
> 	else
> 		$size = $this->_getpagesize($size);
> 	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
> 	{
> 		// New size or orientation
> 		if($orientation=='P')
> 		{
> 			$this->w = $size[0];
> 			$this->h = $size[1];
> 		}
> 		else
> 		{
> 			$this->w = $size[1];
> 			$this->h = $size[0];
> 		}
> 		$this->wPt = $this->w*$this->k;
> 		$this->hPt = $this->h*$this->k;
> 		$this->PageBreakTrigger = $this->h-$this->bMargin;
> 		$this->CurOrientation = $orientation;
> 		$this->CurPageSize = $size;
> 	}
> 	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
> 		$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
> 	if($rotation!=0)
> 	{
> 		if($rotation%90!=0)
> 			$this->Error('Incorrect rotation value: '.$rotation);
> 		$this->PageInfo[$this->page]['rotation'] = $rotation;
> 	}
> 	$this->CurRotation = $rotation;
> }
> 
> protected function _endpage()
> {
> 	$this->state = 1;
> }
> 
> protected function _loadfont($font)
> {
> 	// Load a font definition file from the font directory
> 	//if(strpos($font,'/')!==false || strpos($font,"\\")!==false)
> 	//	$this->Error('Incorrect font definition file name: '.$font);
> 	include($this->fontpath.$font);
> 	if(!isset($name))
> 		$this->Error('Could not include font definition file');
> 	if(isset($enc))
> 		$enc = strtolower($enc);
> 	if(!isset($subsetted))
> 		$subsetted = false;
> 	return get_defined_vars();
> }
> 
> protected function _isascii($s)
> {
> 	// Test if string is ASCII
> 	$nb = strlen($s);
> 	for($i=0;$i<$nb;$i++)
> 	{
> 		if(ord($s[$i])>127)
> 			return false;
> 	}
> 	return true;
> }
> 
> protected function _httpencode($param, $value, $isUTF8)
> {
> 	// Encode HTTP header field parameter
> 	if($this->_isascii($value))
> 		return $param.'="'.$value.'"';
> 	if(!$isUTF8)
> 		$value = $this->_UTF8encode($value);
> 	return $param."*=UTF-8''".rawurlencode($value);
> }
> 
> protected function _UTF8encode($s)
> {
> 	// Convert ISO-8859-1 to UTF-8
> 	return mb_convert_encoding($s,'UTF-8','ISO-8859-1');
> }
> 
> protected function _UTF8toUTF16($s)
> {
> 	// Convert UTF-8 to UTF-16BE with BOM
> 	return "\xFE\xFF".mb_convert_encoding($s,'UTF-16BE','UTF-8');
> }
> 
> protected function _escape($s)
> {
> 	// Escape special characters
> 	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false)
> 		return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
> 	else
> 		return $s;
> }
> 
> protected function _textstring($s)
> {
> 	// Format a text string
> 	if(!$this->_isascii($s))
> 		$s = $this->_UTF8toUTF16($s);
> 	return '('.$this->_escape($s).')';
> }
> 
> protected function _dounderline($x, $y, $txt)
> {
> 	// Underline text
> 	$up = $this->CurrentFont['up'];
> 	$ut = $this->CurrentFont['ut'];
> 	$w = $this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
> 	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
> }
> 
> protected function _parsejpg($file)
> {
> 	// Extract info from a JPEG file
> 	$a = getimagesize($file);
> 	if(!$a)
> 		$this->Error('Missing or incorrect image file: '.$file);
> 	if($a[2]!=2)
> 		$this->Error('Not a JPEG file: '.$file);
> 	if(!isset($a['channels']) || $a['channels']==3)
> 		$colspace = 'DeviceRGB';
> 	elseif($a['channels']==4)
> 		$colspace = 'DeviceCMYK';
> 	else
> 		$colspace = 'DeviceGray';
> 	$bpc = isset($a['bits']) ? $a['bits'] : 8;
> 	$data = file_get_contents($file);
> 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
> }
> 
> protected function _parsepng($file)
> {
> 	// Extract info from a PNG file
> 	$f = fopen($file,'rb');
> 	if(!$f)
> 		$this->Error('Can\'t open image file: '.$file);
> 	$info = $this->_parsepngstream($f,$file);
> 	fclose($f);
> 	return $info;
> }
> 
> protected function _parsepngstream($f, $file)
> {
> 	// Check signature
> 	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
> 		$this->Error('Not a PNG file: '.$file);
> 
> 	// Read header chunk
> 	$this->_readstream($f,4);
> 	if($this->_readstream($f,4)!='IHDR')
> 		$this->Error('Incorrect PNG file: '.$file);
> 	$w = $this->_readint($f);
> 	$h = $this->_readint($f);
> 	$bpc = ord($this->_readstream($f,1));
> 	if($bpc>8)
> 		$this->Error('16-bit depth not supported: '.$file);
> 	$ct = ord($this->_readstream($f,1));
> 	if($ct==0 || $ct==4)
> 		$colspace = 'DeviceGray';
> 	elseif($ct==2 || $ct==6)
> 		$colspace = 'DeviceRGB';
> 	elseif($ct==3)
> 		$colspace = 'Indexed';
> 	else
> 		$this->Error('Unknown color type: '.$file);
> 	if(ord($this->_readstream($f,1))!=0)
> 		$this->Error('Unknown compression method: '.$file);
> 	if(ord($this->_readstream($f,1))!=0)
> 		$this->Error('Unknown filter method: '.$file);
> 	if(ord($this->_readstream($f,1))!=0)
> 		$this->Error('Interlacing not supported: '.$file);
> 	$this->_readstream($f,4);
> 	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
> 
> 	// Scan chunks looking for palette, transparency and image data
> 	$pal = '';
> 	$trns = '';
> 	$data = '';
> 	do
> 	{
> 		$n = $this->_readint($f);
> 		$type = $this->_readstream($f,4);
> 		if($type=='PLTE')
> 		{
> 			// Read palette
> 			$pal = $this->_readstream($f,$n);
> 			$this->_readstream($f,4);
> 		}
> 		elseif($type=='tRNS')
> 		{
> 			// Read transparency info
> 			$t = $this->_readstream($f,$n);
> 			if($ct==0)
> 				$trns = array(ord(substr($t,1,1)));
> 			elseif($ct==2)
> 				$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
> 			else
> 			{
> 				$pos = strpos($t,chr(0));
> 				if($pos!==false)
> 					$trns = array($pos);
> 			}
> 			$this->_readstream($f,4);
> 		}
> 		elseif($type=='IDAT')
> 		{
> 			// Read image data block
> 			$data .= $this->_readstream($f,$n);
> 			$this->_readstream($f,4);
> 		}
> 		elseif($type=='IEND')
> 			break;
> 		else
> 			$this->_readstream($f,$n+4);
> 	}
> 	while($n);
> 
> 	if($colspace=='Indexed' && empty($pal))
> 		$this->Error('Missing palette in '.$file);
> 	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
> 	if($ct>=4)
> 	{
> 		// Extract alpha channel
> 		if(!function_exists('gzuncompress'))
> 			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
> 		$data = gzuncompress($data);
> 		$color = '';
> 		$alpha = '';
> 		if($ct==4)
> 		{
> 			// Gray image
> 			$len = 2*$w;
> 			for($i=0;$i<$h;$i++)
> 			{
> 				$pos = (1+$len)*$i;
> 				$color .= $data[$pos];
> 				$alpha .= $data[$pos];
> 				$line = substr($data,$pos+1,$len);
> 				$color .= preg_replace('/(.)./s','$1',$line);
> 				$alpha .= preg_replace('/.(.)/s','$1',$line);
> 			}
> 		}
> 		else
> 		{
> 			// RGB image
> 			$len = 4*$w;
> 			for($i=0;$i<$h;$i++)
> 			{
> 				$pos = (1+$len)*$i;
> 				$color .= $data[$pos];
> 				$alpha .= $data[$pos];
> 				$line = substr($data,$pos+1,$len);
> 				$color .= preg_replace('/(.{3})./s','$1',$line);
> 				$alpha .= preg_replace('/.{3}(.)/s','$1',$line);
> 			}
> 		}
> 		unset($data);
> 		$data = gzcompress($color);
> 		$info['smask'] = gzcompress($alpha);
> 		$this->WithAlpha = true;
> 		if($this->PDFVersion<'1.4')
> 			$this->PDFVersion = '1.4';
> 	}
> 	$info['data'] = $data;
> 	return $info;
> }
> 
> protected function _readstream($f, $n)
> {
> 	// Read n bytes from stream
> 	$res = '';
> 	while($n>0 && !feof($f))
> 	{
> 		$s = fread($f,$n);
> 		if($s===false)
> 			$this->Error('Error while reading stream');
> 		$n -= strlen($s);
> 		$res .= $s;
> 	}
> 	if($n>0)
> 		$this->Error('Unexpected end of stream');
> 	return $res;
> }
> 
> protected function _readint($f)
> {
> 	// Read a 4-byte integer from stream
> 	$a = unpack('Ni',$this->_readstream($f,4));
> 	return $a['i'];
> }
> 
> protected function _parsegif($file)
> {
> 	// Extract info from a GIF file (via PNG conversion)
> 	if(!function_exists('imagepng'))
> 		$this->Error('GD extension is required for GIF support');
> 	if(!function_exists('imagecreatefromgif'))
> 		$this->Error('GD has no GIF read support');
> 	$im = imagecreatefromgif($file);
> 	if(!$im)
> 		$this->Error('Missing or incorrect image file: '.$file);
> 	imageinterlace($im,0);
> 	ob_start();
> 	imagepng($im);
> 	$data = ob_get_clean();
> 	imagedestroy($im);
> 	$f = fopen('php://temp','rb+');
> 	if(!$f)
> 		$this->Error('Unable to create memory stream');
> 	fwrite($f,$data);
> 	rewind($f);
> 	$info = $this->_parsepngstream($f,$file);
> 	fclose($f);
> 	return $info;
> }
> 
> protected function _out($s)
> {
> 	// Add a line to the document
> 	if($this->state==2)
> 		$this->pages[$this->page] .= $s."\n";
> 	elseif($this->state==1)
> 		$this->_put($s);
> 	elseif($this->state==0)
> 		$this->Error('No page has been added yet');
> 	elseif($this->state==3)
> 		$this->Error('The document is closed');
> }
> 
> protected function _put($s)
> {
> 	$this->buffer .= $s."\n";
> }
> 
> protected function _getoffset()
> {
> 	return strlen($this->buffer);
> }
> 
> protected function _newobj($n=null)
> {
> 	// Begin a new object
> 	if($n===null)
> 		$n = ++$this->n;
> 	$this->offsets[$n] = $this->_getoffset();
> 	$this->_put($n.' 0 obj');
> }
> 
> protected function _putstream($data)
> {
> 	$this->_put('stream');
> 	$this->_put($data);
> 	$this->_put('endstream');
> }
> 
> protected function _putstreamobject($data)
> {
> 	if($this->compress)
> 	{
> 		$entries = '/Filter /FlateDecode ';
> 		$data = gzcompress($data);
> 	}
> 	else
> 		$entries = '';
> 	$entries .= '/Length '.strlen($data);
> 	$this->_newobj();
> 	$this->_put('<<'.$entries.'>>');
> 	$this->_putstream($data);
> 	$this->_put('endobj');
> }
> 
> protected function _putlinks($n)
> {
> 	foreach($this->PageLinks[$n] as $pl)
> 	{
> 		$this->_newobj();
> 		$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
> 		$s = '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
> 		if(is_string($pl[4]))
> 			$s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
> 		else
> 		{
> 			$l = $this->links[$pl[4]];
> 			if(isset($this->PageInfo[$l[0]]['size']))
> 				$h = $this->PageInfo[$l[0]]['size'][1];
> 			else
> 				$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
> 			$s .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
> 		}
> 		$this->_put($s);
> 		$this->_put('endobj');
> 	}
> }
> 
> protected function _putpage($n)
> {
> 	$this->_newobj();
> 	$this->_put('<</Type /Page');
> 	$this->_put('/Parent 1 0 R');
> 	if(isset($this->PageInfo[$n]['size']))
> 		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
> 	if(isset($this->PageInfo[$n]['rotation']))
> 		$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
> 	$this->_put('/Resources 2 0 R');
> 	if(!empty($this->PageLinks[$n]))
> 	{
> 		$s = '/Annots [';
> 		foreach($this->PageLinks[$n] as $pl)
> 			$s .= $pl[5].' 0 R ';
> 		$s .= ']';
> 		$this->_put($s);
> 	}
> 	if($this->WithAlpha)
> 		$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
> 	$this->_put('/Contents '.($this->n+1).' 0 R>>');
> 	$this->_put('endobj');
> 	// Page content
> 	if(!empty($this->AliasNbPages)) {
> 		$alias = $this->UTF8ToUTF16BE($this->AliasNbPages, false);
> 		$r = $this->UTF8ToUTF16BE($this->page, false);
> 		$this->pages[$n] = str_replace($alias,$r,$this->pages[$n]);
> 		// Now repeat for no pages in non-subset fonts
> 		$this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
> 	}
> 	$this->_putstreamobject($this->pages[$n]);
> 	// Link annotations
> 	$this->_putlinks($n);
> }
> 
> protected function _putpages()
> {
> 	$nb = $this->page;
> 	$n = $this->n;
> 	for($i=1;$i<=$nb;$i++)
> 	{
> 		$this->PageInfo[$i]['n'] = ++$n;
> 		$n++;
> 		foreach($this->PageLinks[$i] as &$pl)
> 			$pl[5] = ++$n;
> 		unset($pl);
> 	}
> 	for($i=1;$i<=$nb;$i++)
> 		$this->_putpage($i);
> 	// Pages root
> 	$this->_newobj(1);
> 	$this->_put('<</Type /Pages');
> 	$kids = '/Kids [';
> 	for($i=1;$i<=$nb;$i++)
> 		$kids .= $this->PageInfo[$i]['n'].' 0 R ';
> 	$kids .= ']';
> 	$this->_put($kids);
> 	$this->_put('/Count '.$nb);
> 	if($this->DefOrientation=='P')
> 	{
> 		$w = $this->DefPageSize[0];
> 		$h = $this->DefPageSize[1];
> 	}
> 	else
> 	{
> 		$w = $this->DefPageSize[1];
> 		$h = $this->DefPageSize[0];
> 	}
> 	$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$w*$this->k,$h*$this->k));
> 	$this->_put('>>');
> 	$this->_put('endobj');
> }
> 
> protected function _putfonts()
> {
> 	foreach($this->FontFiles as $file=>$info)
> 	{
> 		if (!isset($info['type']) || $info['type']!='TTF') {
> 			// Font file embedding
> 			$this->_newobj();
> 			$this->FontFiles[$file]['n'] = $this->n;
> 			$font = file_get_contents($this->fontpath.$file,true);
> 			if(!$font)
> 				$this->Error('Font file not found: '.$file);
> 			$compressed = (substr($file,-2)=='.z');
> 			if(!$compressed && isset($info['length2']))
> 				$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
> 			$this->_put('<</Length '.strlen($font));
> 			if($compressed)
> 				$this->_put('/Filter /FlateDecode');
> 			$this->_put('/Length1 '.$info['length1']);
> 			if(isset($info['length2']))
> 				$this->_put('/Length2 '.$info['length2'].' /Length3 0');
> 			$this->_put('>>');
> 			$this->_putstream($font);
> 			$this->_put('endobj');
> 		}
> 	}
> 	foreach($this->fonts as $k=>$font)
> 	{
> 		// Encoding
> 		if(isset($font['diff']))
> 		{
> 			if(!isset($this->encodings[$font['enc']]))
> 			{
> 				$this->_newobj();
> 				$this->_put('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$font['diff'].']>>');
> 				$this->_put('endobj');
> 				$this->encodings[$font['enc']] = $this->n;
> 			}
> 		}
> 		// ToUnicode CMap
> 		if(isset($font['uv']))
> 		{
> 			if(isset($font['enc']))
> 				$cmapkey = $font['enc'];
> 			else
> 				$cmapkey = $font['name'];
> 			if(!isset($this->cmaps[$cmapkey]))
> 			{
> 				$cmap = $this->_tounicodecmap($font['uv']);
> 				$this->_putstreamobject($cmap);
> 				$this->cmaps[$cmapkey] = $this->n;
> 			}
> 		}
> 		// Font object
> 		$type = $font['type'];
> 		$name = $font['name'];
> 		if($type=='Core')
> 		{
> 			// Core font
> 			$this->fonts[$k]['n'] = $this->n+1;
> 			$this->_newobj();
> 			$this->_put('<</Type /Font');
> 			$this->_put('/BaseFont /'.$name);
> 			$this->_put('/Subtype /Type1');
> 			if($name!='Symbol' && $name!='ZapfDingbats')
> 				$this->_put('/Encoding /WinAnsiEncoding');
> 			if(isset($font['uv']))
> 				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
> 			$this->_put('>>');
> 			$this->_put('endobj');
> 		}
> 		elseif($type=='Type1' || $type=='TrueType')
> 		{
> 			// Additional Type1 or TrueType/OpenType font
> 			if(isset($font['subsetted']) && $font['subsetted'])
> 				$name = 'AAAAAA+'.$name;
> 			$this->fonts[$k]['n'] = $this->n+1;
> 			$this->_newobj();
> 			$this->_put('<</Type /Font');
> 			$this->_put('/BaseFont /'.$name);
> 			$this->_put('/Subtype /'.$type);
> 			$this->_put('/FirstChar 32 /LastChar 255');
> 			$this->_put('/Widths '.($this->n+1).' 0 R');
> 			$this->_put('/FontDescriptor '.($this->n+2).' 0 R');
> 
> 			if($font['enc'])
> 			{
> 				if(isset($font['diff']))
> 					$this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
> 				else
> 					$this->_put('/Encoding /WinAnsiEncoding');
> 			}
> 
> 			if(isset($font['uv']))
> 				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
> 			$this->_put('>>');
> 			$this->_put('endobj');
> 			// Widths
> 			$this->_newobj();
> 			$cw = $font['cw'];
> 			$s = '[';
> 			for($i=32;$i<=255;$i++)
> 				$s .= $cw[chr($i)].' ';
> 			$this->_put($s.']');
> 			$this->_put('endobj');
> 			// Descriptor
> 			$this->_newobj();
> 			$s = '<</Type /FontDescriptor /FontName /'.$name;
> 			foreach($font['desc'] as $k=>$v)
> 				$s .= ' /'.$k.' '.$v;
> 
> 			if(!empty($font['file']))
> 				$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
> 			$this->_put($s.'>>');
> 			$this->_put('endobj');
> 		}
> 		// TrueType embedded SUBSETS or FULL
> 		else if ($type=='TTF') {
> 			$this->fonts[$k]['n']=$this->n+1;
> 			require_once($this->fontpath.'unifont/ttfonts.php');
> 			$ttf = new TTFontFile();
> 			$fontname = 'MPDFAA'.'+'.$font['name'];
> 			$subset = $font['subset'];
> 			unset($subset[0]);
> 			$ttfontstream = $ttf->makeSubset($font['ttffile'], $subset);
> 			$ttfontsize = strlen($ttfontstream);
> 			$fontstream = gzcompress($ttfontstream);
> 			$codeToGlyph = $ttf->codeToGlyph;
> 			unset($codeToGlyph[0]);
> 
> 			// Type0 Font
> 			// A composite font - a font composed of other fonts, organized hierarchically
> 			$this->_newobj();
> 			$this->_put('<</Type /Font');
> 			$this->_put('/Subtype /Type0');
> 			$this->_put('/BaseFont /'.$fontname.'');
> 			$this->_put('/Encoding /Identity-H');
> 			$this->_put('/DescendantFonts ['.($this->n + 1).' 0 R]');
> 			$this->_put('/ToUnicode '.($this->n + 2).' 0 R');
> 			$this->_put('>>');
> 			$this->_put('endobj');
> 
> 			// CIDFontType2
> 			// A CIDFont whose glyph descriptions are based on TrueType font technology
> 			$this->_newobj();
> 			$this->_put('<</Type /Font');
> 			$this->_put('/Subtype /CIDFontType2');
> 			$this->_put('/BaseFont /'.$fontname.'');
> 			$this->_put('/CIDSystemInfo '.($this->n + 2).' 0 R');
> 			$this->_put('/FontDescriptor '.($this->n + 3).' 0 R');
> 			if (isset($font['desc']['MissingWidth'])){
> 				$this->_out('/DW '.$font['desc']['MissingWidth'].'');
> 			}
> 
> 			$this->_putTTfontwidths($font, $ttf->maxUni);
> 
> 			$this->_put('/CIDToGIDMap '.($this->n + 4).' 0 R');
> 			$this->_put('>>');
> 			$this->_put('endobj');
> 
> 			// ToUnicode
> 			$this->_newobj();
> 			$toUni = "/CIDInit /ProcSet findresource begin\n";
> 			$toUni .= "12 dict begin\n";
> 			$toUni .= "begincmap\n";
> 			$toUni .= "/CIDSystemInfo\n";
> 			$toUni .= "<</Registry (Adobe)\n";
> 			$toUni .= "/Ordering (UCS)\n";
> 			$toUni .= "/Supplement 0\n";
> 			$toUni .= ">> def\n";
> 			$toUni .= "/CMapName /Adobe-Identity-UCS def\n";
> 			$toUni .= "/CMapType 2 def\n";
> 			$toUni .= "1 begincodespacerange\n";
> 			$toUni .= "<0000> <FFFF>\n";
> 			$toUni .= "endcodespacerange\n";
> 			$toUni .= "1 beginbfrange\n";
> 			$toUni .= "<0000> <FFFF> <0000>\n";
> 			$toUni .= "endbfrange\n";
> 			$toUni .= "endcmap\n";
> 			$toUni .= "CMapName currentdict /CMap defineresource pop\n";
> 			$toUni .= "end\n";
> 			$toUni .= "end";
> 			$this->_put('<</Length '.(strlen($toUni)).'>>');
> 			$this->_putstream($toUni);
> 			$this->_put('endobj');
> 
> 			// CIDSystemInfo dictionary
> 			$this->_newobj();
> 			$this->_put('<</Registry (Adobe)');
> 			$this->_put('/Ordering (UCS)');
> 			$this->_put('/Supplement 0');
> 			$this->_put('>>');
> 			$this->_put('endobj');
> 
> 			// Font descriptor
> 			$this->_newobj();
> 			$this->_put('<</Type /FontDescriptor');
> 			$this->_put('/FontName /'.$fontname);
> 			foreach($font['desc'] as $kd=>$v) {
> 				if ($kd == 'Flags') { $v = $v | 4; $v = $v & ~32; }	// SYMBOLIC font flag
> 				$this->_out(' /'.$kd.' '.$v);
> 			}
> 			$this->_put('/FontFile2 '.($this->n + 2).' 0 R');
> 			$this->_put('>>');
> 			$this->_put('endobj');
> 
> 			// Embed CIDToGIDMap
> 			// A specification of the mapping from CIDs to glyph indices
> 			$cidtogidmap = '';
> 			$cidtogidmap = str_pad('', 256*256*2, "\x00");
> 			foreach($codeToGlyph as $cc=>$glyph) {
> 				$cidtogidmap[$cc*2] = chr($glyph >> 8);
> 				$cidtogidmap[$cc*2 + 1] = chr($glyph & 0xFF);
> 			}
> 			$cidtogidmap = gzcompress($cidtogidmap);
> 			$this->_newobj();
> 			$this->_put('<</Length '.strlen($cidtogidmap).'');
> 			$this->_put('/Filter /FlateDecode');
> 			$this->_put('>>');
> 			$this->_putstream($cidtogidmap);
> 			$this->_put('endobj');
> 
> 			//Font file
> 			$this->_newobj();
> 			$this->_put('<</Length '.strlen($fontstream));
> 			$this->_put('/Filter /FlateDecode');
> 			$this->_put('/Length1 '.$ttfontsize);
> 			$this->_put('>>');
> 			$this->_putstream($fontstream);
> 			$this->_put('endobj');
> 			unset($ttf);
> 		}
> 		else
> 		{
> 			// Allow for additional types
> 			$this->fonts[$k]['n'] = $this->n+1;
> 			$mtd = '_put'.strtolower($type);
> 			if(!method_exists($this,$mtd))
> 				$this->Error('Unsupported font type: '.$type);
> 			$this->$mtd($font);
> 		}
> 	}
> }
> 
> protected function _putTTfontwidths($font, $maxUni) {
> 	if (file_exists($font['unifilename'].'.cw127.php')) {
> 		include($font['unifilename'].'.cw127.php') ;
> 		$startcid = 128;
> 	}
> 	else {
> 		$rangeid = 0;
> 		$range = array();
> 		$prevcid = -2;
> 		$prevwidth = -1;
> 		$interval = false;
> 		$startcid = 1;
> 	}
> 	$cwlen = $maxUni + 1;
> 
> 	// for each character
> 	for ($cid=$startcid; $cid<$cwlen; $cid++) {
> 		if ($cid==128 && (!file_exists($font['unifilename'].'.cw127.php'))) {
> 			if (is_writable(dirname($this->fontpath.'unifont/x'))) {
> 				$fh = fopen($font['unifilename'].'.cw127.php',"wb");
> 				$cw127='<?php'."\n";
> 				$cw127.='$rangeid='.$rangeid.";\n";
> 				$cw127.='$prevcid='.$prevcid.";\n";
> 				$cw127.='$prevwidth='.$prevwidth.";\n";
> 				if ($interval) { $cw127.='$interval=true'.";\n"; }
> 				else { $cw127.='$interval=false'.";\n"; }
> 				$cw127.='$range='.var_export($range,true).";\n";
> 				$cw127.="?>";
> 				fwrite($fh,$cw127,strlen($cw127));
> 				fclose($fh);
> 			}
> 		}
> 		if ((!isset($font['cw'][$cid*2]) || !isset($font['cw'][$cid*2+1])) ||
>                     ($font['cw'][$cid*2] == "\00" && $font['cw'][$cid*2+1] == "\00")) { continue; }
> 
> 		$width = (ord($font['cw'][$cid*2]) << 8) + ord($font['cw'][$cid*2+1]);
> 		if ($width == 65535) { $width = 0; }
> 		if ($cid > 255 && (!isset($font['subset'][$cid]) || !$font['subset'][$cid])) { continue; }
> 		if (!isset($font['dw']) || (isset($font['dw']) && $width != $font['dw'])) {
> 			if ($cid == ($prevcid + 1)) {
> 				if ($width == $prevwidth) {
> 					if ($width == $range[$rangeid][0]) {
> 						$range[$rangeid][] = $width;
> 					}
> 					else {
> 						array_pop($range[$rangeid]);
> 						// new range
> 						$rangeid = $prevcid;
> 						$range[$rangeid] = array();
> 						$range[$rangeid][] = $prevwidth;
> 						$range[$rangeid][] = $width;
> 					}
> 					$interval = true;
> 					$range[$rangeid]['interval'] = true;
> 				} else {
> 					if ($interval) {
> 						// new range
> 						$rangeid = $cid;
> 						$range[$rangeid] = array();
> 						$range[$rangeid][] = $width;
> 					}
> 					else { $range[$rangeid][] = $width; }
> 					$interval = false;
> 				}
> 			} else {
> 				$rangeid = $cid;
> 				$range[$rangeid] = array();
> 				$range[$rangeid][] = $width;
> 				$interval = false;
> 			}
> 			$prevcid = $cid;
> 			$prevwidth = $width;
> 		}
> 	}
> 	$prevk = -1;
> 	$nextk = -1;
> 	$prevint = false;
> 	foreach ($range as $k => $ws) {
> 		$cws = count($ws);
> 		if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR ($cws < 4))) {
> 			if (isset($range[$k]['interval'])) { unset($range[$k]['interval']); }
> 			$range[$prevk] = array_merge($range[$prevk], $range[$k]);
> 			unset($range[$k]);
> 		}
> 		else { $prevk = $k; }
> 		$nextk = $k + $cws;
> 		if (isset($ws['interval'])) {
> 			if ($cws > 3) { $prevint = true; }
> 			else { $prevint = false; }
> 			unset($range[$k]['interval']);
> 			--$nextk;
> 		}
> 		else { $prevint = false; }
> 	}
> 	$w = '';
> 	foreach ($range as $k => $ws) {
> 		if (count(array_count_values($ws)) == 1) { $w .= ' '.$k.' '.($k + count($ws) - 1).' '.$ws[0]; }
> 		else { $w .= ' '.$k.' [ '.implode(' ', $ws).' ]' . "\n"; }
> 	}
> 	$this->_out('/W ['.$w.' ]');
> }
> 
> protected function _tounicodecmap($uv)
> {
> 	$ranges = '';
> 	$nbr = 0;
> 	$chars = '';
> 	$nbc = 0;
> 	foreach($uv as $c=>$v)
> 	{
> 		if(is_array($v))
> 		{
> 			$ranges .= sprintf("<%02X> <%02X> <%04X>\n",$c,$c+$v[1]-1,$v[0]);
> 			$nbr++;
> 		}
> 		else
> 		{
> 			$chars .= sprintf("<%02X> <%04X>\n",$c,$v);
> 			$nbc++;
> 		}
> 	}
> 	$s = "/CIDInit /ProcSet findresource begin\n";
> 	$s .= "12 dict begin\n";
> 	$s .= "begincmap\n";
> 	$s .= "/CIDSystemInfo\n";
> 	$s .= "<</Registry (Adobe)\n";
> 	$s .= "/Ordering (UCS)\n";
> 	$s .= "/Supplement 0\n";
> 	$s .= ">> def\n";
> 	$s .= "/CMapName /Adobe-Identity-UCS def\n";
> 	$s .= "/CMapType 2 def\n";
> 	$s .= "1 begincodespacerange\n";
> 	$s .= "<00> <FF>\n";
> 	$s .= "endcodespacerange\n";
> 	if($nbr>0)
> 	{
> 		$s .= "$nbr beginbfrange\n";
> 		$s .= $ranges;
> 		$s .= "endbfrange\n";
> 	}
> 	if($nbc>0)
> 	{
> 		$s .= "$nbc beginbfchar\n";
> 		$s .= $chars;
> 		$s .= "endbfchar\n";
> 	}
> 	$s .= "endcmap\n";
> 	$s .= "CMapName currentdict /CMap defineresource pop\n";
> 	$s .= "end\n";
> 	$s .= "end";
> 	return $s;
> }
> 
> protected function _putimages()
> {
> 	foreach(array_keys($this->images) as $file)
> 	{
> 		$this->_putimage($this->images[$file]);
> 		unset($this->images[$file]['data']);
> 		unset($this->images[$file]['smask']);
> 	}
> }
> 
> protected function _putimage(&$info)
> {
> 	$this->_newobj();
> 	$info['n'] = $this->n;
> 	$this->_put('<</Type /XObject');
> 	$this->_put('/Subtype /Image');
> 	$this->_put('/Width '.$info['w']);
> 	$this->_put('/Height '.$info['h']);
> 	if($info['cs']=='Indexed')
> 		$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
> 	else
> 	{
> 		$this->_put('/ColorSpace /'.$info['cs']);
> 		if($info['cs']=='DeviceCMYK')
> 			$this->_put('/Decode [1 0 1 0 1 0 1 0]');
> 	}
> 	$this->_put('/BitsPerComponent '.$info['bpc']);
> 	if(isset($info['f']))
> 		$this->_put('/Filter /'.$info['f']);
> 	if(isset($info['dp']))
> 		$this->_put('/DecodeParms <<'.$info['dp'].'>>');
> 	if(isset($info['trns']) && is_array($info['trns']))
> 	{
> 		$trns = '';
> 		for($i=0;$i<count($info['trns']);$i++)
> 			$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
> 		$this->_put('/Mask ['.$trns.']');
> 	}
> 	if(isset($info['smask']))
> 		$this->_put('/SMask '.($this->n+1).' 0 R');
> 	$this->_put('/Length '.strlen($info['data']).'>>');
> 	$this->_putstream($info['data']);
> 	$this->_put('endobj');
> 	// Soft mask
> 	if(isset($info['smask']))
> 	{
> 		$dp = '/Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$info['w'];
> 		$smask = array('w'=>$info['w'], 'h'=>$info['h'], 'cs'=>'DeviceGray', 'bpc'=>8, 'f'=>$info['f'], 'dp'=>$dp, 'data'=>$info['smask']);
> 		$this->_putimage($smask);
> 	}
> 	// Palette
> 	if($info['cs']=='Indexed')
> 		$this->_putstreamobject($info['pal']);
> }
> 
> protected function _putxobjectdict()
> {
> 	foreach($this->images as $image)
> 		$this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
> }
> 
> protected function _putresourcedict()
> {
> 	$this->_put('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
> 	$this->_put('/Font <<');
> 	foreach($this->fonts as $font)
> 		$this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
> 	$this->_put('>>');
> 	$this->_put('/XObject <<');
> 	$this->_putxobjectdict();
> 	$this->_put('>>');
> }
> 
> protected function _putresources()
> {
> 	$this->_putfonts();
> 	$this->_putimages();
> 	// Resource dictionary
> 	$this->_newobj(2);
> 	$this->_put('<<');
> 	$this->_putresourcedict();
> 	$this->_put('>>');
> 	$this->_put('endobj');
> }
> 
> protected function _putinfo()
> {
> 	$date = @date('YmdHisO',$this->CreationDate);
> 	$this->metadata['CreationDate'] = 'D:'.substr($date,0,-2)."'".substr($date,-2)."'";
> 	foreach($this->metadata as $key=>$value)
> 		$this->_put('/'.$key.' '.$this->_textstring($value));
> }
> 
> protected function _putcatalog()
> {
> 	$n = $this->PageInfo[1]['n'];
> 	$this->_put('/Type /Catalog');
> 	$this->_put('/Pages 1 0 R');
> 	if($this->ZoomMode=='fullpage')
> 		$this->_put('/OpenAction ['.$n.' 0 R /Fit]');
> 	elseif($this->ZoomMode=='fullwidth')
> 		$this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
> 	elseif($this->ZoomMode=='real')
> 		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
> 	elseif(!is_string($this->ZoomMode))
> 		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
> 	if($this->LayoutMode=='single')
> 		$this->_put('/PageLayout /SinglePage');
> 	elseif($this->LayoutMode=='continuous')
> 		$this->_put('/PageLayout /OneColumn');
> 	elseif($this->LayoutMode=='two')
> 		$this->_put('/PageLayout /TwoColumnLeft');
> }
> 
> protected function _putheader()
> {
> 	$this->_put('%PDF-'.$this->PDFVersion);
> }
> 
> protected function _puttrailer()
> {
> 	$this->_put('/Size '.($this->n+1));
> 	$this->_put('/Root '.$this->n.' 0 R');
> 	$this->_put('/Info '.($this->n-1).' 0 R');
> }
> 
> protected function _enddoc()
> {
> 	$this->CreationDate = time();
> 	$this->_putheader();
> 	$this->_putpages();
> 	$this->_putresources();
> 	// Info
> 	$this->_newobj();
> 	$this->_put('<<');
> 	$this->_putinfo();
> 	$this->_put('>>');
> 	$this->_put('endobj');
> 	// Catalog
> 	$this->_newobj();
> 	$this->_put('<<');
> 	$this->_putcatalog();
> 	$this->_put('>>');
> 	$this->_put('endobj');
> 	// Cross-ref
> 	$offset = $this->_getoffset();
> 	$this->_put('xref');
> 	$this->_put('0 '.($this->n+1));
> 	$this->_put('0000000000 65535 f ');
> 	for($i=1;$i<=$this->n;$i++)
> 		$this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
> 	// Trailer
> 	$this->_put('trailer');
> 	$this->_put('<<');
> 	$this->_puttrailer();
> 	$this->_put('>>');
> 	$this->_put('startxref');
> 	$this->_put($offset);
> 	$this->_put('%%EOF');
> 	$this->state = 3;
> }
> 
> // ********* NEW FUNCTIONS *********
> // Converts UTF-8 strings to UTF16-BE.
> protected function UTF8ToUTF16BE($str, $setbom=true) {
> 	$outstr = "";
> 	if ($setbom) {
> 		$outstr .= "\xFE\xFF"; // Byte Order Mark (BOM)
> 	}
> 	$outstr .= mb_convert_encoding($str, 'UTF-16BE', 'UTF-8');
> 	return $outstr;
> }
> 
> // Converts UTF-8 strings to codepoints array
> protected function UTF8StringToArray($str) {
>    $out = array();
>    $len = strlen($str);
>    for ($i = 0; $i < $len; $i++) {
> 	$uni = -1;
>       $h = ord($str[$i]);
>       if ( $h <= 0x7F )
>          $uni = $h;
>       elseif ( $h >= 0xC2 ) {
>          if ( ($h <= 0xDF) && ($i < $len -1) )
>             $uni = ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F);
>          elseif ( ($h <= 0xEF) && ($i < $len -2) )
>             $uni = ($h & 0x0F) << 12 | (ord($str[++$i]) & 0x3F) << 6
>                                        | (ord($str[++$i]) & 0x3F);
>          elseif ( ($h <= 0xF4) && ($i < $len -3) )
>             $uni = ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12
>                                        | (ord($str[++$i]) & 0x3F) << 6
>                                        | (ord($str[++$i]) & 0x3F);
>       }
> 	if ($uni >= 0) {
> 		$out[] = $uni;
> 	}
>    }
>    return $out;
> }
> 
> }
> ?>
\ No newline at end of file
Only in TNG: timeline_2.3.0
Only in TNG1403: timeline_2.3.1
diff -r TNG/timeline2.php TNG1403/timeline2.php
8,9c8,10
< $timeline = $_SESSION['timeline'];
< $tng_message = $_SESSION['tng_message'];
---
> if( !isset($pedigree['event']) ) $pedigree['event'] = "over";
> $timeline = isset($_SESSION['timeline']) ? $_SESSION['timeline'] : "";
> $tng_message = isset($_SESSION['tng_message']) ? $_SESSION['tng_message'] : "";
43c44
< elseif( $_SESSION['timeline_chartwidth'] )
---
> elseif(!empty($_SESSION['timeline_chartwidth']))
122c123
< 			$spouse = $marriagerow['husband'] == $personID ? wife : husband;
---
> 			$spouse = $marriagerow['husband'] == $personID ? 'wife' : 'husband';
231c232
< $earliest = date('Y');
---
> $earliest = intval(date('Y'));
234,235c235,236
< 	parse_str( $timeentry );
< 	$query = "SELECT firstname, lnprefix, lastname, prefix, suffix, nameorder, living, private, branch, sex,
---
> 	parse_str( $timeentry, $output );
> 	$query = "SELECT firstname, lnprefix, lastname, prefix, suffix, nameorder, title, living, private, branch, gedcom, sex, personID,
239c240
< 		FROM $people_table WHERE personID = \"$timeperson\" AND gedcom = \"$timetree\"";
---
> 		FROM $people_table WHERE personID = \"{$output['timeperson']}\" AND gedcom = \"{$output['timetree']}\"";
244,245c245,246
< 		$newtimeentry['personID'] = $timeperson;
< 		$newtimeentry['tree'] = $timetree;
---
> 		$newtimeentry['personID'] = $output['timeperson'];
> 		$newtimeentry['tree'] = $output['timetree'];
271a273
> 			$newtimeentry['sex'] = $row2['sex'];
278c280
< 		$newtimeentry['name'] = "<a href=\"$getperson_url" . "personID=$timeperson&amp;tree=$timetree\">$namestr2</a>";
---
> 		$newtimeentry['name'] = "<a href=\"$getperson_url" . "personID={$output['timeperson']}&amp;tree={$output['timetree']}\">$namestr2</a>";
287,288c289,290
< if(!$latest) $latest = "\"\"";
< if(!$earliest) $earliest = "\"\"";
---
> if(!$latest) $latest = 0;
> if(!$earliest) $earliest = 0;
313c315
< 	$newentry = $tlevents[$evyear] ? $tlevents[$evyear] . "\n - " : " - ";
---
> 	$newentry = !empty($tlevents[$evyear]) ? $tlevents[$evyear] . "\n - " : " - ";
326c328
< 	$tlevents2[$evyear] = $tlevents2[$evyear] ? $tlevents2[$evyear] . "\n$newstring" : $newstring;
---
> 	$tlevents2[$evyear] = !empty($tlevents2[$evyear]) ? $tlevents2[$evyear] . "\n$newstring" : $newstring;
336d337
< $flags['tabs'] = $tngconfig['tabs'];
340,344c341,345
< $mpct = $pedigree['mpct'] ? $pedigree['mpct'] : 0;
< $ypct = $pedigree['ypct'] ? $pedigree['ypct'] : 100 - $mpct;
< $ymult = $pedigree['ymult'] ? $pedigree['ymult'] : 10;
< $ypixels = $pedigree['ypixels'] ? $pedigree['ypixels'] : 10;
< $mpixels = $pedigree['mpixels'] ? $pedigree['mpixels'] : 50;
---
> $mpct = !empty($pedigree['mpct']) ? $pedigree['mpct'] : 0;
> $ypct = !empty($pedigree['ypct']) ? $pedigree['ypct'] : 100 - $mpct;
> $ymult = !empty($pedigree['ymult']) ? $pedigree['ymult'] : 10;
> $ypixels = !empty($pedigree['ypixels']) ? $pedigree['ypixels'] : 10;
> $mpixels = !empty($pedigree['mpixels']) ? $pedigree['mpixels'] : 50;
371,372c372,373
< 		var Timeline_ajax_url = \"" . $cms['tngpath'] ."timeline_2.3.0/timeline_ajax/simile-ajax-api.js\";
< 	    var Timeline_urlPrefix = \"" . $cms['tngpath'] ."timeline_2.3.0/timeline_js/\";
---
> 		var Timeline_ajax_url = \"" . $cms['tngpath'] ."timeline_2.3.1/timeline_ajax/simile-ajax-api.js\";
> 	    var Timeline_urlPrefix = \"" . $cms['tngpath'] ."timeline_2.3.1/timeline_js/\";
376c377
< 	$flags['scripting'] .= "<script type=\"text/javascript\" src=\"" . $cms['tngpath'] ."timeline_2.3.0/timeline_js/timeline-api.js\"></script>\n";
---
> 	$flags['scripting'] .= "<script type=\"text/javascript\" src=\"" . $cms['tngpath'] ."timeline_2.3.1/timeline_js/timeline-api.js\"></script>\n";
378c379
< $flags['scripting'] .= "<link href=\"{$cms['tngpath']}css/timeline.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
---
> $flags['css'] = "<link href=\"{$cms['tngpath']}css/timeline.css?v=" . (filemtime($rootpath."css/timeline.css")) . "\" rel=\"stylesheet\" type=\"text/css\" />\n";
473c474
< 	echo "<table cellspacing=\"0\" cellpadding=\"0\"><tr><td class=\"nw\"><span class=\"normal\">{$timeentry['name']}</span></td></tr><tr><td><div class=\"fieldnameback\" style=\"font-size:0;height:10px;width:$spanwidth" . "px;z-index:3\"></div></td></tr></table>\n";
---
> 	echo "<table cellspacing=\"0\" cellpadding=\"0\"><tr><td class=\"nw\"><span class=\"normal\">{$timeentry['name']}</span></td></tr><tr><td><div class=\"fieldnameback\" style=\"font-size:0;height:10px;padding:0px;width:$spanwidth" . "px;z-index:3\"></div></td></tr></table>\n";
476,477c477,478
< 	echo "<div id=\"popup$numlines\" class=\"popup\" style=\"background-color:{$pedigree['popupcolor']}; top:" . ($top + 25) . "px; left:" . ($spanleft - 5) . "px;\" onmouseover=\"cancelTimer($numlines)\" onmouseout=\"setTimer($numlines)\">\n";
< 	echo "<table class=\"popuptable\" style=\"border-color: {$pedigree['bordercolor']};\" cellpadding=\"1\" cellspacing=\"0\"><tr><td>\n";
---
> 	echo "<div id=\"popup$numlines\" class=\"popup\" style=\"background-color:{$pedigree['popupcolor']}; top:" . ($top + 25) . "px; left:" . ($spanleft - 5) . "px;\" onmouseover=\"cancelTimer($numlines)\" onmouseout=\"setTimerHide($numlines)\">\n";
> 	echo "<table class=\"popuptable\" cellpadding=\"1\" cellspacing=\"0\"><tr><td>\n";
533,538c534,541
< <table cellpadding="3" cellspacing="1" border="0" width="100%" class="whiteback">
< 	<tr>
< 		<td class="fieldnameback" width="20">&nbsp;</td>
< 		<td class="fieldnameback" width="50"><span class="fieldname"><strong>&nbsp;<?php echo $text['date']; ?></strong></span></td>
< 		<td class="fieldnameback"><span class="fieldname"><strong>&nbsp;<?php echo $text['event']; ?></strong></span></td>
< 	</tr>
---
> <table cellpadding="3" cellspacing="1" border="0" width="100%" class="thfixed whiteback normal">
> 	<thead>
> 		<tr>
> 			<th class="fieldnameback" width="20">&nbsp;</th>
> 			<th class="fieldnameback fieldname" width="50"><strong>&nbsp;<?php echo $text['date']; ?></strong></th>
> 			<th class="fieldnameback fieldname"><strong>&nbsp;<?php echo $text['event']; ?></strong></th>
> 		</tr>
> 	</thead>
554c557
< <script language="JavaScript" type="text/javascript">
---
> <script type="text/javascript">
diff -r TNG/timeline.php TNG1403/timeline.php
5c5
< $timeline = $_SESSION['timeline'];
---
> $timeline = isset($_SESSION['timeline']) ? $_SESSION['timeline'] : "";
9c9
< if( $newwidth )
---
> if(!empty($newwidth))
22c22
< 	if( $$nextpersonID != "" ) {
---
> 	if( isset($$nextpersonID) && $$nextpersonID != "" ) {
30a31
> if( !isset($timetree) ) $timetree = "";
35,38c36,39
< 	parse_str( $timeentry );
< 	$todelete = $timetree . "_" . $timeperson;
< 	if( $$todelete != "1" ) {
< 		$result2 = getPersonDataPlusDates($timetree, $timeperson);
---
> 	parse_str( $timeentry, $output );
> 	$todelete = $output['timetree'] . "_" . $output['timeperson'];
> 	if( empty($$todelete) || $$todelete != "1" ) {
> 		$result2 = getPersonDataPlusDates($output['timetree'], $output['timeperson']);
41c42
< 			$rights = determineLivingPrivateRights($row2, $timetree);
---
> 			$rights = determineLivingPrivateRights($row2, $output['timetree']);
45c46
< 				$tng_message .= $text['noliving'] . ": " . getName( $row2 ) . " ($timeperson)<br/>\n";
---
> 				$tng_message .= $text['noliving'] . ": " . getName( $row2 ) . " ({$output['timeperson']})<br/>\n";
47c48
< 				$tng_message .= $text['nobirth'] . ": " . getName( $row2 ) . " ($timeperson)<br/>\n";
---
> 				$tng_message .= $text['nobirth'] . ": " . getName( $row2 ) . " ({$output['timeperson']})<br/>\n";
57a59
> if( !isset($newwidth) ) $newwidth = "";
diff -r TNG/tng_begin.php TNG1403/tng_begin.php
2c2
< include("begin.php");
---
> include_once("begin.php");
13,14c13,14
< if((strpos($_SERVER['SCRIPT_NAME'],"/changelanguage.php") === FALSE && strpos($_SERVER['SCRIPT_NAME'],"/newacctform.php") === FALSE && 
< 	strpos($_SERVER['SCRIPT_NAME'],"/login.php") === FALSE && !$nologin && (strpos($_SERVER['SCRIPT_NAME'],"/suggest.php") === FALSE || $enttype)) || $_SESSION['currentuser'])
---
> if((strpos($_SERVER['SCRIPT_NAME'],"/changelanguage.php") === FALSE && strpos($_SERVER['SCRIPT_NAME'],"/newacctform.php") === FALSE && strpos($_SERVER['SCRIPT_NAME'],"/addnewacct.php") === FALSE &&
> 	strpos($_SERVER['SCRIPT_NAME'],"/login.php") === FALSE && (!isset($nologin) || !$nologin) && (strpos($_SERVER['SCRIPT_NAME'],"/suggest.php") === FALSE || !empty($enttype))) || !empty($_SESSION['currentuser']))
17,18c17,18
< 	$currentuser = $_SESSION['currentuser'];
< 	$currentuserdesc = $_SESSION['currentuserdesc'];
---
> 	$currentuser = isset($_SESSION['currentuser']) ? $_SESSION['currentuser'] : "";
> 	$currentuserdesc = isset($_SESSION['currentuserdesc']) ? $_SESSION['currentuserdesc'] : "";
diff -r TNG/TNG_captcha.php TNG1403/TNG_captcha.php
1,130c1,91
< <?php
< // based on the code supplied by the reCAPTCHA web site
< // with modifications by Roger Moffat and Bryan S. Larson to work with TNG
< // Version: No Captcha reCAPTCHA v10.1.0.3 last modified 23 Feb 2015 by Bryan S. Larson
< // This update adds a feature to 'remember' if a visitor has successfully completed a reCAPTCHA challenge, no further challenges will be presented to that visitor during the visit.
< 
< global $currentuser;
< if ( $currentuser || $_SESSION['passedcaptcha'])
< 	return;
< 
< include_once($cms['tngpath'] . "$mylanguage/admintext.php");
< require_once($cms['tngpath'] . "recaptchalib.php");
< 
< // Sign up for a reCAPTCHA account from https://www.google.com/recaptcha/admin/create
< // Once your account is created, enter your assigned keys
< // in customconfig.php or uncomment the next 2 lines and enter it below.
< //$siteKey = "yoursiteKeyHere";
< //$secret = "yoursecretKeyHere";
< 
< $tngSiteKey = $siteKey ? $siteKey : $tngconfig['sitekey'];
< $tngSecret = $secret ? $secret : $tngconfig['secret'];
< 
< if($tngSiteKey && $tngSecret) {
< 
<     // In the next group of 2 lines, comment out the line that you do NOT want
<     //as the Theme. The last uncommented line will be in effect.
< 
<     $captchatheme = "light";
<     //$captchatheme = "dark";
< 
< 
<     // This "switch" statement sets the language code for the reCAPTCHA 
<     switch ($mylanguage) {
<         case "languages/English-UTF8":
<             $captchalang = "en";
<             break;
<         case "languages/English":
<             $captchalang = "en";
<             break;
<         case "languages/Dutch-UTF8":
<             $captchalang = "nl";
<             break;
<         case "languages/Dutch":
<             $captchalang = "nl";
<             break;
<         case "languages/French-UTF8":
<             $captchalang = "fr";
<             break;
<         case "languages/French":
<             $captchalang = "fr";
<             break;
<         case "languages/German-UTF8":
<             $captchalang = "de";
<             break;
<         case "languages/German":
<             $captchalang = "de";
<             break;
<         case "languages/PortugeseBR-UTF8":
<             $captchalang = "pt";
<             break;
<         case "languages/PortugeseBR":
<             $captchalang = "pt";
<             break;
<         case "languages/Russian-UTF8":
<             $captchalang = "ru";
<             break;
<         case "languages/Russian":
<             $captchalang = "ru";
<             break;
<         case "languages/Spanish-UTF8":
<             $captchalang = "es";
<             break;
<         case "languages/Spanish":
<             $captchalang = "es";
<             break;
<         case "languages/Turkish-UTF8":
<             $captchalang = "tr";
<             break;
<         case "languages/Turkish":
<             $captchalang = "tr";
<             break;
<     }
< 
<     // The response from reCAPTCHA
<     $resp = null;
<     // The error code from reCAPTCHA, if any
<     $error = null;
< 
<     $reCaptcha = new ReCaptcha($tngSecret);
< 
<     # was there a reCAPTCHA response?
<     if ($_POST["g-recaptcha-response"]) {
<     		$resp = $reCaptcha->verifyResponse(
<     										$_SERVER["REMOTE_ADDR"],
<     										$_POST["g-recaptcha-response"]
<     );
<     }
< 
<     if ($resp != null && $resp->success) {
<     		$_SESSION['passedcaptcha'] = 'true';
<                     return;
<     }										
<     // if the response from the reCAPTCHA is valid, return to suggest.php
< 
< /*
< echo "<script type=\"text/javascript\">
<         var RecaptchaOptions = {
<            lang : '$captchalang',
<            theme : '$captchatheme'
<         };
<         </script>\n";
< */
<  ?>
< 
< 	<form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
< 		<div class="g-recaptcha" data-sitekey="<?php echo $tngSiteKey;?>" data-theme="<?php echo $captchatheme;?>"></div>
< 			<script type="text/javascript"
< 			src="https://www.google.com/recaptcha/api.js?hl=<?php echo $lang;?>">
< 			</script>
< 	<br/>
< 		<input type="submit" value="<?php echo $admtext['text_continue']; ?>" />
< 		<input type="hidden" name="enttype" value="<?php echo $enttype; ?>" />
< 		<input type="hidden" name="ID" value="<?php echo $ID; ?>" />
< 		<input type="hidden" name="tree" value="<?php echo $tree; ?>" />
< 	</form>
< 	<input type="hidden" name="fingerprint" value="realperson" />
< <?php
<     	tng_footer( "" );
<     	exit;
<     }
---
> <?php
> // based on the code supplied by the reCAPTCHA web site
> // with modifications by Roger Moffat and Bryan S. Larson to work with TNG
> // Version: No Captcha reCAPTCHA v10.1.0.3 last modified 23 Feb 2015 by Bryan S. Larson
> // This update adds a feature to 'remember' if a visitor has successfully completed a reCAPTCHA challenge, no further challenges will be presented to that visitor during the visit.
> 
> global $currentuser, $enttype;
> // The $_SESSION variable is not set upon initial entry.
> if ( $currentuser || !empty($_SESSION['passedcaptcha']) )
> 	return;
> 
> include_once($cms['tngpath'] . "$mylanguage/admintext.php");
> require_once($cms['tngpath'] . "recaptchalib.php");
> 
> // Sign up for a reCAPTCHA account from https://www.google.com/recaptcha/admin/create
> // Once your account is created, enter your assigned keys
> // in customconfig.php or uncomment the next 2 lines and enter it below.
> //$siteKey = "yoursiteKeyHere";
> //$secret = "yoursecretKeyHere";
> 
> // These variables seem to not be set.
> $tngSiteKey = !empty($siteKey) ? $siteKey : $tngconfig['sitekey'];
> $tngSecret = !empty($secret) ? $secret : $tngconfig['secret'];
> 
> if($tngSiteKey && $tngSecret) {
> 
>     // In the next group of 2 lines, comment out the line that you do NOT want
>     //as the Theme. The last uncommented line will be in effect.
> 
>     $captchatheme = "light";
>     //$captchatheme = "dark";
> 
> 
>     // This "switch" statement sets the language code for the reCAPTCHA 
>     $captchalang = isset($text['glang']) ? $text['glang'] : "";
> 
>     // The response from reCAPTCHA
>     $resp = null;
>     // The error code from reCAPTCHA, if any
>     $error = null;
> 
>     $reCaptcha = new ReCaptcha($tngSecret);
>     if (empty($reCaptcha->_secret)) {
>         $reCaptcha->ReCaptcha($tngSecret);
>     }
> 
>     # was there a reCAPTCHA response?
> 	// There isn't a response the first time.
>     if (!empty($_POST["g-recaptcha-response"])) {
>     		$resp = $reCaptcha->verifyResponse(
>     										$_SERVER["REMOTE_ADDR"],
>     										$_POST["g-recaptcha-response"]
>     );
>     }
> 
>     if ($resp != null && $resp->success) {
>     		$_SESSION['passedcaptcha'] = 'true';
>                     return;
>     }										
>     // if the response from the reCAPTCHA is valid, return to suggest.php
> 
> /*
> echo "<script type=\"text/javascript\">
>         var RecaptchaOptions = {
>            lang : '$captchalang',
>            theme : '$captchatheme'
>         };
>         </script>\n";
> */
>     $uri = $_SERVER['REQUEST_URI'];
> 	// Typo in the regex
>     $uri = preg_replace("/[^a-zA-Z0-9\s_.%&\/=?\-#]/", "", $uri);
> 
>  ?>
> 
> 	<form action="<?php echo $uri; ?>" method="post">
> 		<div class="g-recaptcha" data-sitekey="<?php echo $tngSiteKey;?>" data-theme="<?php echo $captchatheme;?>"></div>
> 			<script type="text/javascript"
> 			src="https://www.google.com/recaptcha/api.js<?php echo !empty($captchalang) ? "?hl=" . $captchalang : "";?>">
> 			</script>
> 	<br/>
> 		<input type="submit" value="<?php echo $admtext['text_continue']; ?>" />
> 		<input type="hidden" name="enttype" value="<?php echo $enttype; ?>" />
> 		<input type="hidden" name="ID" value="<?php echo $ID; ?>" />
> 		<input type="hidden" name="tree" value="<?php echo $tree; ?>" />
> 	</form>
> 	<input type="hidden" name="fingerprint" value="realperson" />
> <?php
>     	tng_footer( "" );
>     	exit;
>     }
diff -r TNG/tngconnect.php TNG1403/tngconnect.php
5,6c5,6
< 	if(!trim($dbport)) $dbport = null;
< 	if(!trim($dbsocket)) $dbsocket = null;
---
> 	$dbport = !empty($dbport) ? trim($dbport) : null;
> 	$dbsocket = !empty($dbsocket) ? trim($dbsocket) : null;
7a8
> 	//mysqli_report(MYSQLI_REPORT_OFF);
10,11c11,24
< 		if($session_charset == 'UTF-8')
< 			tng_set_charset($link, 'utf8');
---
> 		if($session_charset == 'UTF-8') {
> 			$query = "SELECT @@collation_database AS collation";
> 			$result = mysqli_query($link, $query);
> 
> 			$collation = tng_fetch_assoc($result);
> 			$collation = $collation['collation'];
> 			tng_free_result($result);
> 
> 			if( strpos($collation, "utf8mb4") !== false ) {
> 				tng_set_charset($link, 'utf8mb4');
> 			} else {
> 				tng_set_charset($link, 'utf8');
> 			}
> 		}
28c41,46
< 	return mysqli_affected_rows($link);
---
> 	try {
> 		$return = mysqli_affected_rows($link);
> 	} catch (mysqli_sql_exception $e) {
> 		$return = 0;
> 	}
> 	return $return;
32c50,55
< 	return mysqli_stmt_affected_rows($stmt);
---
> 	try {
> 		$return = mysqli_stmt_affected_rows($stmt);
> 	} catch (mysqli_sql_exception $e) {
> 		$return = 0;
> 	}
> 	return $return;
36,37c59,64
< 	global $link;
< 	return @mysqli_connect($dbhost, $dbusername, $dbpassword, $dbname, $dbport, $dbsocket);
---
> 	try {
> 		$link = mysqli_connect($dbhost, $dbusername, $dbpassword, $dbname, $dbport, $dbsocket);
> 	} catch (mysqli_sql_exception $e) {
> 		$link = false;
> 	}
> 	return $link;
41c68,73
< 	return mysqli_data_seek($result, $offset);
---
> 	try {
> 		$return = mysqli_data_seek($result, $offset);
> 	} catch (mysqli_sql_exception $e) {
> 		$return = false;
> 	}
> 	return $return;
66,67c98
< 	eval("\$fieldinfo = \$fielddef->$info;");
< 	return $fieldinfo;
---
> 	return $fielddef->$info;
91c122,128
< 	return mysqli_real_escape_string($link, $escapestr);
---
> 
> 	if(isset($escapestr)) {
> 		$return = mysqli_real_escape_string($link, $escapestr);
> 	} else {
> 		$return = "";
> 	}
> 	return $return;
95c132,137
< 	return mysqli_num_fields($result);
---
> 	try {
> 		$return = mysqli_num_fields($result);
> 	} catch (mysqli_sql_exception $e) {
> 		$return = 0;
> 	}
> 	return $return;
99c141,146
< 	return mysqli_num_rows($result);
---
> 	try {
> 		$return = mysqli_num_rows($result);
> 	} catch (mysqli_sql_exception $e) {
> 		$return = 0;
> 	}
> 	return $return;
103c150,155
< 	return mysqli_set_charset($link, $charset);
---
> 	try {
> 		$return = mysqli_set_charset($link, $charset);
> 	} catch (mysqli_sql_exception $e) {
> 		$return = false;
> 	}
> 	return $return;
107c159,164
< 	return mysqli_select_db($link, $dbname);
---
> 	try {
> 		$return = mysqli_select_db($link, $dbname);
> 	} catch (mysqli_sql_exception $e) {
> 		$return = false;
> 	}
> 	return $return;
114a172,177
> 	if(!$stmt) {
> 		$error = mysqli_error($link);
> 		$errorstr = $error ? "<br /><br />$error" : "";
> 		echo $text['problem'] . "<br /><br />{$text['query']}: $query<br />" . implode(" | ", $params) . " " . $errorstr;
> 		exit;
> 	}
119a183,185
> 	if(!$stmt) {
> 		return 0;
> 	}
126c192,197
<     return mysqli_prepare($link, $query);
---
> 	try {
> 		$result = mysqli_prepare($link, $query);
> 	} catch (mysqli_sql_exception $e) {
> 		$result = false;
> 	}
> 	return $result;
132,136c203,217
< 	call_user_func_array(array($stmt,'bind_param'),$params);
< 	if(!mysqli_stmt_execute($stmt)) {
< 		$error = mysqli_error($link);
< 		$errorstr = $error ? "<br/><br/>$error" : "";
< 		echo $text['problem'] . "<br><br>{$text['query']}: $query<br/>" . implode(" | ", $params) . " " . $errorstr;
---
> 	try {
> 		call_user_func_array(array($stmt,'bind_param'),$params);
> 	} catch (Error $e) {
> 		$errorstr = $e->getMessage();
> 		echo $text['problem'] . "<br /><br />{$text['query']}: $query<br />" . implode(" | ", $params) . "<br /><br />" . $errorstr;
> 		exit;
> 	}
> 	try {
> 		mysqli_stmt_execute($stmt);
> 		$affected_rows = tng_stmt_affected_rows($stmt);
> 		mysqli_stmt_close($stmt);
> 	} catch (mysqli_sql_exception $e) {
> 		mysqli_stmt_close($stmt);
> 		$errorstr = $e->getMessage();
> 		echo $text['problem'] . "<br /><br />{$text['query']}: $query<br />" . implode(" | ", $params) . "<br /><br />" . $errorstr;
139,140d219
< 	$affected_rows = tng_stmt_affected_rows($stmt);
< 	mysqli_stmt_close($stmt);
146,150c225,238
< 	call_user_func_array(array($stmt,'bind_param'),$params);
< 	@mysqli_stmt_execute($stmt);
< 	$affected_rows = tng_stmt_affected_rows($stmt);
< 	mysqli_stmt_close($stmt);
< 	
---
> 	try {
> 		call_user_func_array(array($stmt,'bind_param'),$params);
> 	} catch (Error $e) {
> 		return 0;
> 	}
> 	try {
> 		mysqli_stmt_execute($stmt);
> 		$affected_rows = tng_stmt_affected_rows($stmt);
> 		mysqli_stmt_close($stmt);
> 	} catch (mysqli_sql_exception $e) {
> 		mysqli_stmt_close($stmt);
> 		$affected_rows = -1;
> 	}
> 
157c245,249
< 	$result = mysqli_query($link, $query);
---
> 	try {
> 		$result = mysqli_query($link, $query);
> 	} catch (mysqli_sql_exception $e) {
> 		$result = false;
> 	}
160,161c252,253
< 		$errorstr = $error ? "<br/><br/>$error" : "";
< 		echo $text['problem'] . "<br><br>{$text['query']}: $query$errorstr";
---
> 		$errorstr = $error ? "<br /><br />$error" : "";
> 		echo $text['problem'] . "<br /><br />{$text['query']}: $query$errorstr";
170c262,266
< 	$result = @mysqli_query($link, $query);
---
> 	try {
> 		$result = mysqli_query($link, $query);
> 	} catch (mysqli_sql_exception $e) {
> 		$result = false;
> 	}
diff -r TNG/tngdblib.php TNG1403/tngdblib.php
64c64
< 	$query = "SELECT $people_table.personID as personID, $people_table.gedcom as gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, 
---
> 	$query = "SELECT $people_table.personID as personID, $people_table.gedcom as gedcom, firstname, lnprefix, lastname, prefix, suffix, title, nameorder, 
78c78
< 	$query = "SELECT $people_table.personID as personID, $people_table.gedcom as gedcom, firstname, lnprefix, lastname, prefix, suffix, nameorder, birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, burialdate, sex, living, private, branch, ordernum,
---
>     $query = "SELECT $people_table.personID as personID, $people_table.gedcom as gedcom, firstname, lnprefix, lastname, prefix, suffix, title, nameorder, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, deathdate, deathdatetr, deathplace, burialdate, sex, living, private, branch, ordernum,
138c138
<     $query = "SELECT $people_table.gedcom, personID, lastname, lnprefix, firstname, prefix, suffix, nameorder, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, burialtype, marrdate, marrplace,
---
>     $query = "SELECT $people_table.gedcom, personID, lastname, lnprefix, firstname, prefix, suffix, title, nameorder, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, altbirthplace, deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace, burialtype, marrdate, marrplace,
150,151c150,152
< 	$query = "SELECT $people_table.gedcom, personID, firstname, lnprefix, lastname, prefix, suffix, nameorder, sex, $people_table.living, $people_table.private, $people_table.branch,
< 			IF(birthdate!='',YEAR(birthdatetr),YEAR(altbirthdatetr)) as birth, IF(deathdate!='',YEAR(deathdatetr),YEAR(burialdatetr)) as death, $people_table.gedcom
---
>     $query = "SELECT $people_table.gedcom, personID, firstname, lnprefix, lastname, prefix, suffix, title, nameorder, sex, $people_table.living, $people_table.private, $people_table.branch,
>             IF(birthdate!='',YEAR(birthdatetr),YEAR(altbirthdatetr)) as birth, IF(deathdate!='',YEAR(deathdatetr),YEAR(burialdatetr)) as death, $people_table.gedcom,
>             birthdate, birthdatetr, altbirthdatetr, deathdate, deathdatetr, burialdatetr
174,175c175,176
< 	$query = "SELECT $people_table.gedcom, personID, lastname, lnprefix, firstname, prefix, suffix, nameorder, birthdate,
< 		YEAR(birthdatetr) as birthyear, deathdate, YEAR(deathdatetr) as deathyear, $people_table.living, $people_table.private, $people_table.branch
---
>     $query = "SELECT $people_table.gedcom, personID, lastname, lnprefix, firstname, prefix, suffix, nameorder, title, birthdate, birthdatetr, altbirthdate, altbirthdatetr,
> 		YEAR(birthdatetr) as birthyear, deathdate, YEAR(deathdatetr) as deathyear, burialdate, $people_table.living, $people_table.private, $people_table.branch
197c198
< 	$query = "SELECT gedcom, husband, wife, living, private, branch, marrdate, marrdatetr, marrplace, divdate, divdatetr, divplace, familyID
---
> 	$query = "SELECT gedcom, husband, wife, living, private, branch, marrdate, marrdatetr, marrplace, marrtype, divdate, divdatetr, divplace, familyID
245c246
< 	$query = "SELECT gedcom, husband, wife, familyID, marrdate, marrplace, marrtype, divdate, divplace, living, private, branch
---
>     $query = "SELECT gedcom, husband, wife, familyID, marrdate, marrdatetr, marrplace, marrtype, divdate, divdatetr, divplace, living, private, branch
257c258
< 	$query = "SELECT gedcom, husband, wife, familyID, marrdate, marrplace, marrtype, divdate, divplace, living, private, branch
---
>     $query = "SELECT gedcom, husband, wife, familyID, marrdate, marrdatetr, marrplace, marrtype, divdate, divdatetr, divplace, living, private, branch
261c262
<             SELECT gedcom, husband, wife, familyID, marrdate, marrplace, marrtype, divdate, divplace, living, private, branch
---
>             SELECT gedcom, husband, wife, familyID, marrdate, marrdatetr, marrplace, marrtype, divdate, divdatetr, divplace, living, private, branch
343c344
<    	$query = "SELECT UPPER(personID) as personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, nickname, sex, nameorder, living, private, branch,
---
>    	$query = "SELECT UPPER(personID) as personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, title, nickname, sex, nameorder, living, private, branch,
355c356
<     $query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, sex, nameorder, living, private, branch,
---
>     $query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, title, sex, nameorder, living, private, branch,
390c391
< 	$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, sex, nameorder, living, private, branch, birthdate, birthdatetr, altbirthdatetr, deathdate
---
> 	$query = "SELECT personID, gedcom, firstname, lnprefix, lastname, prefix, suffix, title, sex, nameorder, living, private, branch, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, deathdate, deathdatetr, deathplace, burialdate, burialdatetr, burialplace
diff -r TNG/tngfiletypes.php TNG1403/tngfiletypes.php
2c2
< $imagetypes = array( "JPG", "GIF","PNG","JPEG","GIFF" );
---
> $imagetypes = array( "JPG", "GIF", "PNG", "JPEG", "GIFF", "JFIF" );
4c4
< $historytypes = array( "DOC", "TXT", "PHP", "HTM", "HTML", "WPD" );
---
> $historytypes = array( "DOC", "DOCX", "TXT", "PHP", "HTM", "HTML", "WPD" );
diff -r TNG/tngmaillib.php TNG1403/tngmaillib.php
4a5,6
> 	// In case that one time wasn't just a fluke.
> 	$success = false;
10a13,14
> 			// New exception handling
> 			require_once("class.exception.php");
15c19,20
< 			$mail = new PHPMailer($options);
---
> 			// Update for the new namespace security.
> 			$mail = new PHPMailer\PHPMailer\PHPMailer($options);
27,47c32,81
< 			$mail->IsSMTP();               // set mailer to use SMTP
< 			$mail->Host = $tngconfig['mailhost'];  // specify main and backup server or localhost
< 			$mail->SMTPAuth = true;     // turn on SMTP authentication
< 			$mail->Username = $tngconfig['mailuser'];  // SMTP username
< 			$mail->Password = $tngconfig['mailpass']; // SMTP password
< 			if(!empty($tngconfig['mailenc']))
< 				$mail->SMTPSecure = $tngconfig['mailenc']; // SMTP encryption
< 			//It should be same as that of the SMTP user
< 			$mail->Port = $tngconfig['mailport'];
< 
< 			$mail->From = $from_email;	//Default From email same as smtp user
< 			$mail->FromName = $from_name;
< 
< 			$mail->AddAddress($to_email, $to_name); //Email address where you wish to receive/collect those emails.
< 	        $mail->AddReplyTo($replyto, $from_name);
< 
< 			$mail->CharSet = strtolower($session_charset);
< 			//$mail->WordWrap = 50;
< 			if($session_charset && strtoupper($session_charset) != "ISO-8859-1") {
< 				$mail->IsHTML(true);                                  // set email format to HTML
< 				$body = nl2br($body);
---
> 			// Make sure to use try/catch to keep the errors safe.
> 			try {
> 				$mail->IsSMTP();               // set mailer to use SMTP
> 				$mail->Host = $tngconfig['mailhost'];  // specify main and backup server or localhost
> 				$mail->SMTPAuth = true;     // turn on SMTP authentication
> 				$mail->Username = $tngconfig['mailuser'];  // SMTP username
> 				$mail->Password = $tngconfig['mailpass']; // SMTP password
> 				if(!empty($tngconfig['mailenc']))
> 					$mail->SMTPSecure = $tngconfig['mailenc']; // SMTP encryption
> 				//It should be same as that of the SMTP user
> 				$mail->Port = $tngconfig['mailport'];
> 
> 				$mail->From = $from_email;	//Default From email same as smtp user
> 				$mail->FromName = $from_name;
> 
> 				$mail->AddAddress($to_email, $to_name); //Email address where you wish to receive/collect those emails.
> 				$mail->AddReplyTo($replyto, $from_name);
> 
> 				$mail->CharSet = strtolower($session_charset);
> 				//$mail->WordWrap = 50;
> 				if($session_charset && strtoupper($session_charset) != "ISO-8859-1") {
> 					$mail->IsHTML(true);                                  // set email format to HTML
> 					$body = nl2br($body);
> 				}
> 
> 				$mail->Subject = $subject;
> 				$mail->Body    = $body;
> 
> 				$success = $mail->Send();
> 
> 				if(!$success)
> 				{
> 					error_log('Mailer Error: ' . $mail->ErrorInfo, 0);
> 					error_log($subject, 0);
> 					error_log($body, 0);
> 					echo 'Mailer Error: ' . $mail->ErrorInfo;
> 				}
> 			} catch (Exception $e) {
> 				error_log($e->getMessage(), 0);
> 				error_log($e->getTraceAsString(), 0);
> 				error_log($subject, 0);
> 				error_log($body, 0);
> 				echo $e->getMessage();
> 				$success = false;
> 			} catch (\Exception $e) { //The leading slash means the Global PHP Exception class will be caught
> 				error_log($e->getMessage(), 0);
> 				error_log($subject, 0);
> 				error_log($body, 0);
> 				echo $e->getMessage(); //Boring error messages from anything else!
> 				$success = false;
49,53d82
< 
< 			$mail->Subject = $subject;
< 			$mail->Body    = $body;
< 
< 			$success = $mail->Send();
diff -r TNG/tngpdf.php TNG1403/tngpdf.php
29a30
> var $bold;	    	// character weight being used
36c37
< function TNGPDF($orientation='P',$unit='mm',$format='A4') 
---
> function __construct($orientation='P',$unit='mm',$format='A4') 
42c43
<   tFPDF::tFPDF($orientation, $unit, $format);
---
>   tFPDF::__construct($orientation, $unit, $format);
67,70c68,71
< 		$mqr=get_magic_quotes_runtime();
<         if(version_compare(PHP_VERSION, '5.3.0', '<')){
<             set_magic_quotes_runtime(0);
<         }
---
> 		//$mqr=get_magic_quotes_runtime();
>         //if(version_compare(PHP_VERSION, '5.3.0', '<')){
>             //set_magic_quotes_runtime(0);
>         //}
83,85c84,86
<         if(version_compare(PHP_VERSION, '5.3.0', '<')){
<             set_magic_quotes_runtime($mqr);
<         }
---
>         //if(version_compare(PHP_VERSION, '5.3.0', '<')){
>             //set_magic_quotes_runtime($mqr);
>         //}
129c130
< 		$c=$s{$i};
---
> 		$c=$s[$i];
226c227
< 	    if ($e{0} == '/') {
---
> 	    if ($e[0] == '/') {
354a356,357
> 	if(!isset($titleConfig['image'])) $titleConfig['image'] = "";
> 	if(!isset($titleConfig['outline'])) $titleConfig['outline'] = "";
423c426
<     $txt = "$text[maintby] $dbowner";
---
>     $txt = "{$text['maintby']} $dbowner";
519a523,576
> function RoundedRect($x, $y, $w, $h, $r, $corners = '1234', $style = '') {
>     $k = $this->k;
>     $hp = $this->h;
>     if($style=='F')
>         $op='f';
>     elseif($style=='FD' || $style=='DF')
>         $op='B';
>     else
>         $op='S';
>     $MyArc = 4/3 * (sqrt(2) - 1);
>     $this->_out(sprintf('%.2F %.2F m',($x+$r)*$k,($hp-$y)*$k ));
> 
>     $xc = $x+$w-$r;
>     $yc = $y+$r;
>     $this->_out(sprintf('%.2F %.2F l', $xc*$k,($hp-$y)*$k ));
>     if (strpos($corners, '2')===false)
>         $this->_out(sprintf('%.2F %.2F l', ($x+$w)*$k,($hp-$y)*$k ));
>     else
>         $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc);
> 
>     $xc = $x+$w-$r;
>     $yc = $y+$h-$r;
>     $this->_out(sprintf('%.2F %.2F l',($x+$w)*$k,($hp-$yc)*$k));
>     if (strpos($corners, '3')===false)
>         $this->_out(sprintf('%.2F %.2F l',($x+$w)*$k,($hp-($y+$h))*$k));
>     else
>         $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r);
> 
>     $xc = $x+$r;
>     $yc = $y+$h-$r;
>     $this->_out(sprintf('%.2F %.2F l',$xc*$k,($hp-($y+$h))*$k));
>     if (strpos($corners, '4')===false)
>         $this->_out(sprintf('%.2F %.2F l',($x)*$k,($hp-($y+$h))*$k));
>     else
>         $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc);
> 
>     $xc = $x+$r ;
>     $yc = $y+$r;
>     $this->_out(sprintf('%.2F %.2F l',($x)*$k,($hp-$yc)*$k ));
>     if (strpos($corners, '1')===false)
>     {
>         $this->_out(sprintf('%.2F %.2F l',($x)*$k,($hp-$y)*$k ));
>         $this->_out(sprintf('%.2F %.2F l',($x+$r)*$k,($hp-$y)*$k ));
>     }
>     else
>         $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r);
>     $this->_out($op);
> }
> 
> function _Arc($x1, $y1, $x2, $y2, $x3, $y3) {
>     $h = $this->h;
>     $this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $x1*$this->k, ($h-$y1)*$this->k,
>         $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k));
> }
diff -r TNG/tngrobots.php TNG1403/tngrobots.php
17c17
< if( $tngprint )
---
> if(!empty($tngprint))
55a56
> 		case "img_viewer":
diff -r TNG/tngrss.php TNG1403/tngrss.php
29c29
< 	global $getperson_url, $livedefault, $whatsnew, $wherestr2, $showmap_url, $thumbmaxw, $events_table, $eventtypes_table, $tngconfig;
---
> 	global $getperson_url, $livedefault, $whatsnew, $wherestr, $wherestr2, $showmap_url, $thumbmaxw, $events_table, $eventtypes_table, $tngconfig;
36a37,38
> 	if(empty($wherestr)) $wherestr = "";
> 	if(empty($wherestr2)) $wherestr2 = "";
91c93
< 				$mediatext = "$text[family]: " . getFamilyName( $prow );
---
> 				$mediatext = "{$text['family']}: " . getFamilyName( $prow );
99c101
< 				$medialink = $showrepo_url . "repoID={$prow['repoID']}&amp;tree=$prow[gedcom]";
---
> 				$medialink = $showrepo_url . "repoID={$prow['repoID']}&amp;tree={$prow['gedcom']}";
102c104
< 				$medialink = $placesearch_url . "psearch={$prow['personID']}&amp;tree=$prow[gedcom]";
---
> 				$medialink = $placesearch_url . "psearch={$prow['personID']}&amp;tree={$prow['gedcom']}";
106,107c108,109
< 				$query = "SELECT description from $events_table, $eventtypes_table WHERE eventID = \"$prow[eventID]\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID";
< 				$eresult = tng_query($query) or die ("$text[cannotexecutequery]: $query");
---
> 				$query = "SELECT description from $events_table, $eventtypes_table WHERE eventID = \"{$prow['eventID']}\" AND $events_table.eventtypeID = $eventtypes_table.eventtypeID";
> 				$eresult = tng_query($query) or die ("{$text['cannotexecutequery']}: $query");
121c123
< 			if( ($foundliving || $foundprivate) && !$row['alwayson'] ) $notes .= " ($text[livingphoto])";
---
> 			if( ($foundliving || $foundprivate) && !$row['alwayson'] ) $notes .= " ({$text['livingphoto']})";
125c127
< 			$notes = "($text[livingphoto])";
---
> 			$notes = "({$text['livingphoto']})";
131c133
< 		if( $row['status'] ) $notes = "$text[status]: $row[status]. $notes";
---
> 		if( $row['status'] ) $notes = "{$text['status']}: {$row['status']}. $notes";
160c162
< $item .=  "<rss version=\"2.0\" xmlns:atom=\"{$http}://www.w3.org/2005/Atom\">\n";
---
> $item =  "<rss version=\"2.0\" xmlns:atom=\"{$http}://www.w3.org/2005/Atom\">\n";
173c175
< if($personID) {
---
> if(!empty($personID)) {
176c178
< elseif($familyID) {
---
> elseif(!empty($familyID)) {
185c187
< if($rssimage) {                            // define $rssimage in your customconfig.php file this will allow you to put a logo on your feed once you have subscribed
---
> if(!empty($rssimage)) {                            // define $rssimage in your customconfig.php file this will allow you to put a logo on your feed once you have subscribed
210c212
< if(!$personID && !$familyID) {             // only feed the changes when not monitoring an person or a family
---
> if(empty($personID) && empty($familyID)) {             // only feed the changes when not monitoring an person or a family
213c215
< 		$mediatypeID = $mediatype[ID];
---
> 		$mediatypeID = $mediatype['ID'];
228c230
< if(!$familyID) {    // if a family is NOT specified (ie: we are looking for a personID or the What's New
---
> if(empty($familyID)) {    // if a family is NOT specified (ie: we are looking for a personID or the What's New
287,288c289,290
< if($familyID) {
< 	$whereclause = "WHERE $families_table.familyID = \"$familyID\"$privacystr ORDER BY changedate LIMIT $change_limit";
---
> if(!empty($familyID)) {
> 	$whereclause = "WHERE $families_table.familyID = \"$familyID\" ORDER BY changedate LIMIT $change_limit";
291c293
< 	$whereclause = $change_cutoff ? "WHERE TO_DAYS(NOW()) - TO_DAYS($families_table.changedate) <= $change_cutoff$privacystr" : "WHERE 1=1$privacystr";
---
> 	$whereclause = $change_cutoff ? "WHERE TO_DAYS(NOW()) - TO_DAYS($families_table.changedate) <= $change_cutoff" : "WHERE 1=1";
295c297
< if (!$personID) {
---
> if (empty($personID)) {
diff -r TNG/tngsendmail.php TNG1403/tngsendmail.php
2a3
> $tngconfig['maint'] = "";
8c9
< if($enttype)
---
> if(!empty($enttype))
15,16c16,21
< $emailfield = $_SESSION['tng_email'];
< eval("\$youremail = \$$emailfield;");
---
> if(!empty($_SESSION['tng_email'])) {
> 	$emailfield = $_SESSION['tng_email'];
> 	$youremail = $$emailfield;
> }
> else
> 	$youremail = "";
19,20c24,29
< $commentsfield = $_SESSION['tng_comments'];
< eval("\$comments = \$$commentsfield;");
---
> if(!empty($_SESSION['tng_comments'])) {
> 	$commentsfield = $_SESSION['tng_comments'];
> 	$comments = $$commentsfield;
> }
> else
> 	$comments = "";
23,24c32,37
< $yournamefield = $_SESSION['tng_yourname'];
< eval("\$yourname = \$$yournamefield;");
---
> if(!empty($_SESSION['tng_yourname'])) {
> 	$yournamefield = $_SESSION['tng_yourname'];
> 	$yourname = $$yournamefield;
> }
> else
> 	$yourname = "";
61c74
< 	$query = "SELECT firstname, lnprefix, lastname, prefix, suffix, sex, nameorder, living, private, branch, disallowgedcreate, IF(birthdatetr !='0000-00-00',YEAR(birthdatetr),YEAR(altbirthdatetr)) as birth, IF(deathdatetr !='0000-00-00',YEAR(deathdatetr),YEAR(burialdatetr)) as death
---
> 	$query = "SELECT firstname, lnprefix, lastname, prefix, suffix, title, sex, nameorder, living, private, branch, $people_table.gedcom, disallowgedcreate, IF(birthdatetr !='0000-00-00',YEAR(birthdatetr),YEAR(altbirthdatetr)) as birth, IF(deathdatetr !='0000-00-00',YEAR(deathdatetr),YEAR(burialdatetr)) as death
134c147
< if($currentuser)
---
> if(!empty($currentuser))
139,146c152,153
< if( $success ) {
< 	$message = "mailsent";
< 	if( $mailme ) {
< 		tng_sendmail($yourname, $emailtouse, $yourname, $youremail, $subject, $body, $emailaddr, $youremail);
< 	}
< }
< else
< 	$message = "mailnotsent&sowner=" . urlencode($owner) . "&ssendemail=" . urlencode($sendemail);
---
> $message = $success ? "mailsent" : $message = "mailnotsent&sowner=" . urlencode($owner) . "&ssendemail=" . urlencode($sendemail);
> 
diff -r TNG/treelib.php TNG1403/treelib.php
53a54
> 	if(!isset($branch)) $branch = "";
diff -r TNG/version.php TNG1403/version.php
4c4
< $tng_version = "12.0.2";
---
> $tng_version = "14.0.3";
6c6
< $tng_date = "22 September 2018";
---
> $tng_date = "22 September 2023";
diff -r TNG/verticalchart.php TNG1403/verticalchart.php
7a8,9
> include $cms['tngpath'] . "pedbox.php";
> 
16a19,21
> if ($pedigree['inclphotos'] && (trim($photopath) == "" || trim($photosext) == "" )) $pedigree['inclphotos'] = false;
> 
> if(!isset($generations)) $generations = 0;
48,49c53,59
< writelog( "<a href=\"$vertical_url" . "personID=$personID&amp;tree=$tree&amp;generations=$gens&amp;display=$display\">" . xmlcharacters("{$text['pedigreefor']} $logname ($personID)") . "</a> $gens " . $gentext );
< preparebookmark( "<a href=\"$vertical_url" . "personID=$personID&amp;tree=$tree&amp;generations=$gens&amp;display=$display\">" . xmlcharacters("{$text['pedigreefor']} $pedname ($personID)") . "</a> $gens " . $gentext );
---
> if(!isset($display)) $display = "";
> if(!isset($gentext)) $gentext = "";
> if(!isset($pedname)) $pedname = "";
> if(!isset($parentset)) $parentset = "";
> 
> writelog( "<a href=\"$vertical_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations&amp;display=$display\">" . xmlcharacters("{$text['pedigreefor']} $logname ($personID)") . "</a> $generations " . $gentext );
> preparebookmark( "<a href=\"$vertical_url" . "personID=$personID&amp;tree=$tree&amp;generations=$generations&amp;display=$display\">" . xmlcharacters("{$text['pedigreefor']} $pedname ($personID)") . "</a> $generations " . $gentext );
51d60
< $flags['tabs'] = $tngconfig['tabs'];
53c62
< $flags['scripting'] = "<link href=\"{$cms['tngpath']}css/verticalchart.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
---
> $flags['css'] = "<link href=\"{$cms['tngpath']}css/verticalchart.css?v=" . (filemtime($rootpath."css/verticalchart.css")) . "\" rel=\"stylesheet\" type=\"text/css\" />\n";
75c84
< 	if($gens <= 6 && $allowpdf)
---
> 	if($generations <= 6 && $allowpdf)
82,83c91,92
< $height = $pedigree['vheight'] ? $pedigree['vheight'] : 42;
< $width = $pedigree['vwidth'] ? $pedigree['vwidth'] : 100;
---
> $height = $pedigree['vheight'] ? $pedigree['vheight'] : 150;
> $width = $pedigree['vwidth'] ? $pedigree['vwidth'] : 90;
85c94
< $fontsize = $pedigree['vfontsize'] ? $pedigree['vfontsize'] : 7;
---
> $fontsize = $pedigree['vfontsize'] ? $pedigree['vfontsize'] : 8;
87a97
> $highestx = 0;
253c263,264
< 	for ($next = $num+1; $next <= count($generation); $next++)
---
> 	$num_generations = count($generation);
> 	for ($next = $num+1; $next <= $num_generations; $next++)
311c322
< 	global $width, $height, $spacing, $fontsize, $start_person, $session_charset, $cms, $templatepath, $text, $containerheight;
---
> 	global $width, $height, $spacing, $fontsize, $start_person, $session_charset, $cms, $templatepath, $text, $containerheight, $highestx, $pedigree, $vertical_url, $tngprint;
331a343,344
> 				if($person['xpos'] > $highestx)
> 					$highestx = $person['xpos'];
350a364,367
> 				if($gen_num == count($gens) && ($person['father'] || $person['mother'])) {
> 					$row[$rows-$gen_num] .= "<a href=\"{$vertical_url}tree={$_GET['tree']}&personID={$person['personID']}\" title=\"{$text['pedigreefor']} {$person['name']}\" class=\"vpedlink\" style=\"left:" . ($person['xpos'] - 12 + ($width / 2)) . "px;top:" . ($ypos - 20) . "px\"><img src=\"img/ArrowUpYellow.gif\" /></a>";
> 				}
> 
356,358c373,387
< 						$row [$rows-$gen_num] .= "\t\t<div class=\"box\" style=\"left:{$person['xpos']}px;top:{$ypos}px;width:{$width}px\">\r\n\t\t\t<div class=\"inner databack\">\r\n\t\t\t\t<div>\r\n\t\t\t\t\t";
< 						$url = htmlentities("getperson.php?personID={$person['personID']}&tree={$_GET['tree']}");
< 						$row [$rows-$gen_num] .= "<a" . ($person['display'] ? " title=\"{$bio}\"" : "") . " href=\"{$url}\">{$person['name']}</a><br>" . getGenderIcon($person['sex'], -2);
---
> 					$row [$rows-$gen_num] .= "\t\t<div class=\"box\" style=\"left:{$person['xpos']}px;top:{$ypos}px;width:{$width}px\">\r\n\t\t\t<div class=\"inner databack\">\r\n\t\t\t\t<div>\r\n\t\t\t\t\t";
> 					$url = htmlentities("getperson.php?personID={$person['personID']}&tree={$_GET['tree']}");
> 					//$row [$rows-$gen_num] .= "<a" . ($person['display'] ? " title=\"{$bio}\"" : "") . " href=\"{$url}\">{$person['name']}</a><br>" . getGenderIcon($person['sex'], -2);
> 
> 					$rights = determineLivingPrivateRights($person);
> 					$photo_block = "";
> 					if($pedigree['inclphotos']) {
> 						$photo = getPhotoSrc($person['personID'], $rights['both'], $person['sex']);
> 						if ($photo['link'] != "") $photo_block .= "<a href=\"" . $cms['tngpath'] . $photo['link'] . "\">";
> 						if ($photo['ref'] != "") $photo_block .= "<img src=\"" . $photo['ref'] . "\" alt=\"\" style=\"display:block\" class=\"vertphoto rounded4\" />";
> 						if ($photo['link'] != "") $photo_block .= "</a>";
> 					}
> 
> 					$row [$rows-$gen_num] .= $photo_block . "<a" . ($person['display'] ? " title=\"{$bio}\"" : "") . " href=\"{$url}\">{$person['name']}</a><br>" . getGenderIcon($person['sex'], -2);
> 
377a407
> 		width:'.($highestx+$width+2*$spacing).'px; //double the spacing to give a little padding on the end
405,408c435,443
< 	</style>
< 	<div id="vcontainer">';
< 	$html .= implode ($row, "\r\n");
< 	$html .= '	</div>';
---
> 	</style>';
> 	if(!$tngprint) {
> 		$html .= '<span class="normal">' . $text['scrollnote'] . '</span>
> 		<div id="mag-icons-div" class="mag-icons"><img src="img/zoomin.png" id="zoom-in" onclick="panzoom.zoomIn;" alt="' . $text['zoomin'] . '"/><img src="img/zoomreset.png" id="zoom-reset" alt="' . $text['tng_reset'] . '"/><img src="img/zoomout.png" id="zoom-out" alt="' . $text['zoomout'] . '"/></div>';
> 	}
> 	$html .= '<div align="left" style="position:relative;" id="outer">
> 	<div id="vcontainer" class="panzoom" style="overflow:visible">';
> 	$html .= implode ("\r\n", $row);
> 	$html .= '	</div></div>';
411a447,464
> ?>
> <script type="text/javascript">
> //<![CDATA[
> jQuery(document).ready(function() {
> 	jQuery('#vcontainer').draggable();
> 	$("#vcontainer").on("mousedown touchstart", function(e) {
> 	    $(this).addClass('grabbing')
> 	})
> 
> 	$("#vcontainer").on("mouseup touchend", function(e) {
> 	    $(this).removeClass('grabbing')
> 	})
> });
> //]]>
> </script>
> <script src="js/panzoom.min.js"></script>
> <script src="js/tngzoom.js"></script>
> <?php
diff -r TNG/whatsnew.php TNG1403/whatsnew.php
5c5
< if($cms['events']){include('cmsevents.php'); cms_whatsnew();}
---
> if(!empty($cms['events'])){include('cmsevents.php'); cms_whatsnew();}
27a28,30
> $query = "SET SQL_BIG_SELECTS=1";
> $result = tng_query($query);
> 
82c85
< $header = "";
---
> $header = $header2 = "";
88c91
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"tablesaw whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"tablesaw thfixed whiteback normal\" data-tablesaw-mode=\"$tabletype\"{$headerr}>\n";
90c93
< 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" width=\"100%\" class=\"whiteback normal\">";
---
> 	$header = "<table cellpadding=\"3\" cellspacing=\"1\" border=\"0\" style=\"width:100%\" class=\"thfixed whiteback normal\">";
204c207
<             $birthplacestr .= "psearch=" . urlencode($birthplace) . "\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" border=\"0\" alt=\"\" width=\"9\" height=\"9\" /></a>";
---
>             $birthplacestr .= "psearch=" . urlencode($birthplace) . "\"><img src=\"{$cms['tngpath']}img/tng_search_small.gif\" class=\"placeimg\" border=\"0\" alt=\"\" width=\"9\" height=\"9\" /></a>";
diff -r TNG/widget_whatsnew.php TNG1403/widget_whatsnew.php
33c33
< 	global $livedefault, $wherestr2, $thumbmaxw, $altstr, $tngconfig, $maxmediafilesize;
---
> 	global $livedefault, $wherestr2, $thumbmaxw, $tngconfig, $maxmediafilesize, $hsfields, $cutoffstr;
37c37
< 	$query = "SELECT distinct $media_table.mediaID as mediaID, description $altstr, $media_table.notes, thumbpath, path, form, mediatypeID, $media_table.gedcom as gedcom, alwayson, usecollfolder, DATE_FORMAT(changedate,'%e %b %Y') as changedatef, changedby, status, plot, abspath, newwindow $hsfields
---
> 	$query = "SELECT distinct $media_table.mediaID as mediaID, description, $media_table.notes, thumbpath, path, form, mediatypeID, $media_table.gedcom as gedcom, alwayson, usecollfolder, DATE_FORMAT(changedate,'%e %b %Y') as changedatef, changedby, status, plot, abspath, newwindow, private $hsfields
54c54
< 	$gotImageJpeg = function_exists(imageJpeg);
---
> 	$gotImageJpeg = function_exists('imageJpeg');
60a61
> 			birthdate, birthdatetr, altbirthdate, altbirthdatetr, deathdate, deathdatetr, husband, wife,
66c67
< 			WHERE mediaID = \"{$row['mediaID']}\"$Wherestr2 ORDER BY lastname, lnprefix, firstname, $medialinks_table.personID";
---
> 			WHERE mediaID = \"{$row['mediaID']}\"$wherestr2 ORDER BY lastname, lnprefix, firstname, $medialinks_table.personID";
69c70
< 		$foundprivate = 0;
---
> 		$foundprivate = $row['private'] && !$allow_private;
95c96,98
< 		$showPhotoInfo = $row['allow_living'] = $row['alwayson'] || (!$foundprivate && !$foundliving);
---
> 		$row['allow_living'] = !$foundliving || $row['alwayson'];
> 		$row['allow_private'] = !$foundprivate || $row['alwayson'];
> 		$showPhotoInfo = $row['allow_living'] && $row['allow_private'];
99d101
< 		$notes = $wherestr && $row['altnotes'] ? $row['altnotes'] : $row['notes'];
101c103
< 		$description = $wherestr && $row['altdescription'] ? $row['altdescription'] : $row['description'];
---
> 		$description = $row['description'];
155c157
< $query = "SELECT p.personID, lastname, lnprefix, firstname, birthdate, prefix, suffix, nameorder, living, private, branch, DATE_FORMAT(changedate,'%e %b %Y') as changedatef, changedby, LPAD(SUBSTRING_INDEX(birthdate, ' ', -1),4,'0') as birthyear, birthplace, altbirthdate, LPAD(SUBSTRING_INDEX(altbirthdate, ' ', -1),4,'0') as altbirthyear, altbirthplace, p.gedcom as gedcom, treename
---
> $query = "SELECT p.personID, lastname, lnprefix, firstname, birthdate, prefix, suffix, title, nameorder, living, private, branch, DATE_FORMAT(changedate,'%e %b %Y') as changedatef, changedby, LPAD(SUBSTRING_INDEX(birthdate, ' ', -1),4,'0') as birthyear, birthdate, birthdatetr, birthplace, altbirthdate, altbirthdatetr, LPAD(SUBSTRING_INDEX(altbirthdate, ' ', -1),4,'0') as altbirthyear, altbirthplace, deathdate, deathdatetr, p.gedcom as gedcom, treename
Only in TNG1403: zoom-lib.php