Combine import/upload

66 files changed, 609 insertions, 514 deletions

diff --git a/README.md b/README.md
index 15d47279f9..1d9453d0ba 100644
--- a/README.md
+++ b/README.md
@@ -240,7 +240,7 @@ over. Follow these steps to update a GEDCOM that has already been imported:
   configuration page. On the line  relating to this particular family tree (GEDCOM)
   file (or a new one) click either IMPORT or UPLOAD.
 * Take careful note of the media items option (_“If you have created media objects
-  in **webtrees**, and have edited your gedcom off-line using a program that
+  in **webtrees**, and have edited your data off-line using software that
   deletes media objects, then tick this box to merge the current media objects
   with the new GEDCOM.”_) In most cases you should leave this box **UNCHECKED**.
 * Click “SAVE”. **webtrees** will validate the GEDCOM again before importing.
diff --git a/admin_trees_config.php b/admin_trees_config.php
index 41c17df184..951716fb40 100644
--- a/admin_trees_config.php
+++ b/admin_trees_config.php
@@ -320,7 +320,6 @@ case 'general':
 	$WT_TREE->setPreference('WATERMARK_THUMB', Filter::postBool('WATERMARK_THUMB'));
 	$WT_TREE->setPreference('WEBMASTER_USER_ID', Filter::post('WEBMASTER_USER_ID'));
 	$WT_TREE->setPreference('WEBTREES_EMAIL', Filter::post('WEBTREES_EMAIL'));
-	$WT_TREE->setPreference('WORD_WRAPPED_NOTES', Filter::postBool('WORD_WRAPPED_NOTES'));
 	$WT_TREE->setPreference('title', Filter::post('title'));
 
 	// Only accept valid folders for MEDIA_DIRECTORY
@@ -784,19 +783,6 @@ $controller
 		</div>
 	</fieldset>
 
-	<!-- WORD_WRAPPED_NOTES -->
-	<fieldset class="form-group">
-		<legend class="control-label col-sm-3">
-			<?php echo /* I18N: A configuration setting */ I18N::translate('Add spaces where notes were wrapped'); ?>
-		</legend>
-		<div class="col-sm-9">
-			<?php echo radio_buttons('WORD_WRAPPED_NOTES', $no_yes, $WT_TREE->getPreference('WORD_WRAPPED_NOTES'), 'class="radio-inline"'); ?>
-			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “Add spaces where notes were wrapped” configuration setting */ I18N::translate('Some genealogy programs wrap notes at word boundaries while others wrap notes anywhere.  This can cause webtrees to run words together.  Setting this to <b>Yes</b> will add a space between words where they are wrapped in the original GEDCOM during the import process.  If you have already imported the file you will need to re-import it.'); ?>
-			</p>
-		</div>
-	</fieldset>
-
 	<!-- XXXXX_ID_PREFIX -->
 	<fieldset class="form-group">
 		<legend class="control-label col-sm-3">
@@ -1079,33 +1065,6 @@ $controller
 		</div>
 	</div>
 
-	<!-- GEDCOM_MEDIA_PATH -->
-	<div class="form-group">
-		<label class="control-label col-sm-3" for="GEDCOM_MEDIA_PATH">
-			<?php echo /* I18N: /* I18N: A configuration setting.  A media path (e.g. c:\aaa\bbb\ccc\ddd.jpeg) in a GEDCOM file */ I18N::translate('GEDCOM media path'); ?>
-		</label>
-		<div class="col-sm-9">
-			<input
-				class="form-control"
-				dir="ltr"
-				id="GEDCOM_MEDIA_PATH"
-				maxlength="255"
-				name="GEDCOM_MEDIA_PATH"
-				type="text"
-				value="<?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?>"
-				>
-			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. A “path” is something like “C:\Documents\My_User\Genealogy\Photos\Gravestones\John_Smith.jpeg” */ I18N::translate('Some genealogy applications create GEDCOM files that contain media filenames with full paths.  These paths will not exist on the web-server.  To allow webtrees to find the file, the first part of the path must be removed.'); ?>
-			</p>
-			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names; “GEDCOM media path” is a configuration setting */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then the GEDCOM media path would be %3$s.', Html::filename('/home/fab/documents/family/photo.jpeg'), Html::filename('family/photo.jpeg'), Html::filename('/home/fab/documents/')); ?>
-			</p>
-			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting */ I18N::translate('This setting is only used when you read or write GEDCOM files.'); ?>
-			</p>
-		</div>
-	</div>
-
 	<h3><?php echo I18N::translate('Media files'); ?></h3>
 
 	<!-- MEDIA_UPLOAD -->
diff --git a/admin_trees_download.php b/admin_trees_download.php
index 4fda08cc04..940178910d 100644
--- a/admin_trees_download.php
+++ b/admin_trees_download.php
@@ -109,42 +109,80 @@ $controller->pageHeader();
 
 <form class="form form-horizontal">
 	<input type="hidden" name="action" value="download">
-	<input type="hidden" name="ged" value="<?php echo WT_GEDCOM; ?>">
-	<div id="tree-download">
-		<dl>
-			<dt>
-				<?php echo I18N::translate('Zip file(s)'), help_link('download_zipped'); ?>
-			</dt>
-			<dd>
+	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
+
+	<!-- EXPORT OPTIONS -->
+	<fieldset class="form-group">
+		<legend class="control-label col-sm-3">
+			<?php echo I18N::translate('Export options'); ?>
+		</legend>
+
+		<!-- ZIP FILES -->
+		<div class="col-sm-9">
+			<label>
 				<input type="checkbox" name="zip" value="yes">
-			</dd>
-			<dt>
-				<?php echo I18N::translate('Apply privacy settings?'), help_link('apply_privacy'); ?>
-			</dt>
-			<dd>
-				<input type="radio" name="privatize_export" value="none" checked>&nbsp;&nbsp;<?php echo I18N::translate('None'); ?>
-				<br>
-				<input type="radio" name="privatize_export" value="gedadmin">&nbsp;&nbsp;<?php echo I18N::translate('Manager'); ?>
-				<br>
-				<input type="radio" name="privatize_export" value="user">&nbsp;&nbsp;<?php echo I18N::translate('Member'); ?>
-				<br>
-				<input type="radio" name="privatize_export" value="visitor">&nbsp;&nbsp;<?php echo I18N::translate('Visitor'); ?>
-			</dd>
-			<dt>
-				<?php echo I18N::translate('Convert from UTF-8 to ANSI (ISO-8859-1)'), help_link('utf8_ansi'); ?>
-			</dt>
-			<dd>
+				<?php echo I18N::translate('Compress the GEDCOM file'); ?>
+			</label>
+			<p class="small muted">
+				<?php echo I18N::translate('To reduce the size of the download, you can compress the data into a .ZIP file.  You will need to uncompress the .ZIP file before you can use it.'); ?>
+			</p>
+
+		<!-- CONVERT TO ISO8859-1 -->
+			<label>
 				<input type="checkbox" name="convert" value="yes">
-			</dd>
-			<dt>
-				<?php echo I18N::translate('Add the GEDCOM media path to filenames'), help_link('GEDCOM_MEDIA_PATH'); ?>
-			</dt>
-			<dd>
-				<input type="checkbox" name="conv_path" value="<?php echo Filter::escapeHtml($GEDCOM_MEDIA_PATH); ?>">
-				<span dir="auto"><?php echo Filter::escapeHtml($GEDCOM_MEDIA_PATH); ?></span>
-			</dd>
-		</dl>
+				<?php echo I18N::translate('Convert from UTF-8 to ISO-8859-1'); ?>
+			</label>
+			<p class="small muted">
+				<?php echo I18N::translate('webtrees uses UTF-8 encoding for accented letters, special characters and non-latin scripts.  If you want to use this GEDCOM file with genealogy software that does not support UTF-8, then you can convert the text to ISO-8859-1 encoding.'); ?>
+			</p>
+
+			<!-- GEDCOM_MEDIA_PATH -->
+			<?php if ($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')): ?>
+			<label>
+				<input type="checkbox" name="conv_path" value="<?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?>">
+				<?php echo /* I18N: A media path (e.g. c:\aaa\bbb\ccc\ddd.jpeg) in a GEDCOM file */ I18N::translate('Add the GEDCOM media path to filenames'); ?>
+			</label>
+			<p>
+				<?php echo /* I18N: %s is the name of a folder. */ I18N::translate('%s will be prepended to media filenames.', '<code dir="ltr">' . Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')) . '</code>'); ?>
+			</p>
+			<?php endif; ?>
+		</div>
+	</fieldset>
+
+	<!-- PRIVACY OPTIONS -->
+	<fieldset class="form-group">
+		<legend class="control-label col-sm-3">
+			<?php echo I18N::translate('Apply privacy settings'); ?>
+		</legend>
+
+		<div class="col-sm-9">
+			<label>
+				<input type="radio" name="privatize_export" value="none" checked>
+				<?php echo I18N::translate('None'); ?>
+			</label>
+			<br>
+			<label>
+				<input type="radio" name="privatize_export" value="gedadmin">
+				<?php echo I18N::translate('Manager'); ?>
+			</label>
+			<br>
+			<label>
+				<input type="radio" name="privatize_export" value="user">
+				<?php echo I18N::translate('Member'); ?>
+			</label>
+			<br>
+			<label>
+				<input type="radio" name="privatize_export" value="visitor">
+				<?php echo I18N::translate('Visitor'); ?>
+			</label>
+		</div>
+	</fieldset>
+
+	<div class="form-group">
+		<div class="col-sm-offset-3 col-sm-9">
+			<button type="submit" class="btn btn-primary">
+				<?php echo /* I18N: A button label */ I18N::translate('continue'); ?>
+			</button>
+		</div>
 	</div>
-	<br>
-	<input type="submit" value="<?php echo I18N::translate('continue'); ?>">
 </form>
diff --git a/admin_trees_manage.php b/admin_trees_manage.php
index 86dde31783..b3953f08e1 100644
--- a/admin_trees_manage.php
+++ b/admin_trees_manage.php
@@ -28,6 +28,7 @@ require './includes/session.php';
 
 $controller = new PageController;
 $controller
+	->addExternalJavascript(WT_ADMIN_JS_URL)
 	->restrictAccess(Auth::isAdmin() || Auth::isManager($WT_TREE))
 	->setPageTitle(I18N::translate('Manage family trees'));
 
@@ -69,28 +70,44 @@ case 'new_tree':
 
 	return;
 case 'replace_upload':
-	$gedcom_id  = Filter::postInteger('gedcom_id');
-	$keep_media = Filter::postBool('keep_media');
-	$tree       = Tree::findById($gedcom_id);
+	$gedcom_id          = Filter::postInteger('gedcom_id');
+	$keep_media         = Filter::post('keep_media', '1', '0');
+	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+	$tree               = Tree::findById($gedcom_id);
 
 	if (Filter::checkCsrf() && $tree) {
-		foreach ($_FILES as $FILE) {
-			if ($FILE['error'] == 0 && is_readable($FILE['tmp_name'])) {
-				$tree->importGedcomFile($FILE['tmp_name'], $FILE['name'], $keep_media);
+		$tree->setPreference('keep_media', $keep_media);
+		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+		if (isset($_FILES[0])) {
+			if ($_FILES[0]['error'] == 0 && is_readable($_FILES[0]['tmp_name'])) {
+				$tree->importGedcomFile($_FILES[0]['tmp_name'], $_FILES[0]['name']);
 			}
+		} else {
+			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
 		}
 	}
 	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
 	return;
 case 'replace_import':
-	$basename   = basename(Filter::post('tree_name'));
-	$gedcom_id  = Filter::postInteger('gedcom_id');
-	$keep_media = Filter::postBool('keep_media');
-	$tree       = Tree::findById($gedcom_id);
+	$basename           = basename(Filter::post('tree_name'));
+	$gedcom_id          = Filter::postInteger('gedcom_id');
+	$keep_media         = Filter::post('keep_media', '1', '0');
+	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+	$tree               = Tree::findById($gedcom_id);
 
-	if (Filter::checkCsrf() && $tree && $basename) {
-		$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename, $keep_media);
+	if (Filter::checkCsrf() && $tree) {
+		$tree->setPreference('keep_media', $keep_media);
+		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+		if ($basename) {
+			$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
+		} else {
+			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
+		}
 	}
 	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
@@ -138,15 +155,10 @@ $default_tree_name .= $default_tree_number;
 
 // Process GET actions
 switch (Filter::get('action')) {
-case 'uploadform':
 case 'importform':
-	if (Filter::get('action') === 'uploadform') {
-		$controller->setPageTitle(I18N::translate('Upload family tree'));
-	} else {
-		$controller->setPageTitle(I18N::translate('Import family tree'));
-	}
-
-	$controller->pageHeader();
+	$controller
+		->setPageTitle(I18N::translate('Import a GEDCOM file') . ' — ' . $WT_TREE->getTitleHtml())
+		->pageHeader();
 
 	?>
 	<ol class="breadcrumb small">
@@ -163,51 +175,124 @@ case 'importform':
 	if (!$tree) {
 		break;
 	}
-	echo '<p>', /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file.', $tree->getTitleHtml()), '</p>';
-	// the javascript in the next line strips any path associated with the file before comparing it to the current GEDCOM name (both Chrome and IE8 include c:\fakepath\ in the filename).
-	$previous_gedcom_filename = $tree->getPreference('gedcom_filename');
-	echo '<form name="replaceform" method="post" enctype="multipart/form-data" onsubmit="var newfile = document.replaceform.tree_name.value; newfile = newfile.substr(newfile.lastIndexOf(\'\\\\\')+1); if (newfile!=\'', Filter::escapeHtml($previous_gedcom_filename), '\' && \'\' != \'', Filter::escapeHtml($previous_gedcom_filename), '\') return confirm(\'', Filter::escapeHtml(I18N::translate('You have selected a GEDCOM file with a different name.  Is this correct?')), '\'); else return true;">';
-	echo '<input type="hidden" name="gedcom_id" value="', $tree->getTreeId(), '">';
-	echo Filter::getCsrf();
-	if (Filter::get('action') == 'uploadform') {
-		echo '<input type="hidden" name="action" value="replace_upload">';
-		echo '<input type="file" name="tree_name">';
-	} else {
-		echo '<input type="hidden" name="action" value="replace_import">';
-		$d = opendir(WT_DATA_DIR);
-		$files = array();
-		while (($f = readdir($d)) !== false) {
-			if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
-				$fp = fopen(WT_DATA_DIR . $f, 'rb');
-				$header = fread($fp, 64);
-				fclose($fp);
-				if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
-					$files[] = $f;
-				}
-			}
-		}
-		if ($files) {
-			sort($files);
-			echo WT_DATA_DIR, '<select name="tree_name">';
-			foreach ($files as $gedcom_file) {
-				echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
-				if ($gedcom_file === $previous_gedcom_filename) {
-					echo ' selected';
-				}
-				echo'>', Filter::escapeHtml($gedcom_file), '</option>';
-			}
-			echo '</select>';
-		} else {
-			echo '<p>', /* I18N: %s is the name of a folder */ I18N::translate('No GEDCOM files found.  You need to copy files to the “%s” folder on your server.', WT_DATA_DIR);
-			echo '</form>';
+	$gedcom_filename = $tree->getPreference('gedcom_filename')
+	?>
+	<p>
+		<?php echo /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', $tree->getTitleHtml()); ?>
+	</p>
+	<form class="form form-horizontal" name="gedcomimportform" method="post" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?php echo Filter::escapeHtml(I18N::translate('You have selected a GEDCOM file with a different name.  Is this correct?')); ?>');">
+		<input type="hidden" name="gedcom_id" value="<?php echo $tree->getTreeId(); ?>">
+		<input type="hidden" id="gedcom_filename" value="<?php echo Filter::escapeHtml($gedcom_filename); ?>">
+		<?php echo Filter::getCsrf(); ?>
 
-			return;
-		}
-	}
-	echo '<br><br><input type="checkbox" name="keep_media" value="1">';
-	echo I18N::translate('If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file.');
-	echo '<br><br><input type="submit" value="', /* I18N: A button label */ I18N::translate('continue'), '">';
-	echo '</form>';
+		<fieldset class="form-group">
+			<legend class="control-label col-sm-3">
+				<?php echo /* I18N: A configuration setting */ I18N::translate('Select a GEDCOM file to import'); ?>
+			</legend>
+			<div class="col-sm-9">
+				<div class="row">
+					<label class="col-sm-3">
+						<input type="radio" name="action" id="import-computer" value="replace_upload" checked>
+						<?php echo I18N::translate('A file on your computer'); ?>
+					</label>
+					<div class="col-sm-9">
+						<div class="btn btn-default">
+							<input type="file" name="tree_name" id="import-computer-file">
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<label class="col-sm-3">
+						<input type="radio" name="action" id="import-server" value="replace_import">
+						<?php echo I18N::translate('A file on the server'); ?>
+					</label>
+					<div class="col-sm-9">
+						<div class="input-group">
+							<span class="input-group-addon">
+								<?php echo WT_DATA_DIR; ?>
+							</span>
+							<?php
+							$d = opendir(WT_DATA_DIR);
+							$files = array();
+							while (($f = readdir($d)) !== false) {
+								if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
+									$fp = fopen(WT_DATA_DIR . $f, 'rb');
+									$header = fread($fp, 64);
+									fclose($fp);
+									if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
+										$files[] = $f;
+									}
+								}
+							}
+							echo '<select name="tree_name" class="form-control" id="import-server-file">';
+							sort($files);
+							foreach ($files as $gedcom_file) {
+								echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
+								if ($gedcom_file === $gedcom_filename) {
+									echo ' selected';
+								}
+								echo'>', Filter::escapeHtml($gedcom_file), '</option>';
+							}
+							if (!$files) {
+								echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
+							}
+							echo '</select>';
+							?>
+						</div>
+					</div>
+				</div>
+			</div>
+		</fieldset>
+
+		<hr>
+
+		<fieldset class="form-group">
+			<legend class="control-label col-sm-3">
+				<?php echo I18N::translate('Import options'); ?>
+			</legend>
+			<div class="col-sm-9">
+				<label>
+					<input type="checkbox" name="keep_media" value="1" <?php if ($tree->getPreference('keep_media')) echo 'checked'; ?>>
+					<?php echo /* I18N: A configuration setting */ I18N::translate('Keep media objects'); ?>
+				</label>
+				<p class="small text-muted">
+					<?php echo I18N::translate('If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file.'); ?>
+				</p>
+				<label>
+					<input type="checkbox" name="WORD_WRAPPED_NOTES" value="1" <?php if ($tree->getPreference('WORD_WRAPPED_NOTES')) echo 'checked'; ?>>
+					<?php echo I18N::translate('Add spaces where long lines were wrapped'); ?>
+				</label>
+				<p class="small text-muted">
+					<?php echo I18N::translate('If you created this GEDCOM file using genealogy software that omits spaces when splitting long lines, then select this option to reinsert the missing spaces.'); ?>
+				</p>
+				<label for="GEDCOM_MEDIA_PATH">
+					<?php echo /* I18N: A media path (e.g. c:\aaa\bbb\ccc\ddd.jpeg) in a GEDCOM file */ I18N::translate('Remove the GEDCOM media path from filenames'); ?>
+				</label>
+				<input
+					class="form-control"
+					dir="ltr"
+					id="GEDCOM_MEDIA_PATH"
+					maxlength="255"
+					name="GEDCOM_MEDIA_PATH"
+					type="text"
+					value="<?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?>"
+					>
+				<p class="small text-muted">
+					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. A “path” is something like “C:\Documents\Genealogy\Photos\John_Smith.jpeg” */ I18N::translate('Some genealogy software creates GEDCOM files that contain media filenames with full paths.  These paths will not exist on the web-server.  To allow webtrees to find the file, the first part of the path must be removed.'); ?>
+					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then the you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>'); ?>
+				</p>
+			</fieldset>
+		</div>
+
+		<div class="form-group">
+			<div class="col-sm-offset-3 col-sm-9">
+				<button type="submit" class="btn btn-primary">
+					<?php echo /* I18N: A button label */ I18N::translate('continue'); ?>
+				</button>
+			</div>
+		</div>
+	</form>
+	<?php
 
 	return;
 }
@@ -474,11 +559,11 @@ $controller->pageHeader();
 									</span>
 								</a>
 							</li>
-							<!-- UPLOAD -->
+							<!-- UPLOAD/IMPORT -->
 							<li>
 								<i class="fa fa-li fa-upload"></i>
-								<a href="?action=uploadform&amp;gedcom_id=<?php echo $tree->getTreeId(); ?>">
-									<?php echo I18N::translate('Upload'); ?>
+								<a href="?action=importform&amp;gedcom_id=<?php echo $tree->getTreeId(); ?>">
+									<?php echo I18N::translate('Import'); ?>
 									<span class="sr-only">
 										<?php echo $tree->getTitleHtml(); ?>
 									</span>
@@ -496,16 +581,6 @@ $controller->pageHeader();
 									</a>
 								</form>
 							</li>
-							<!-- IMPORT -->
-							<li>
-								<i class="fa fa-li fa-file-text-o"></i>
-								<a href="?action=importform&amp;gedcom_id=<?php echo $tree->getTreeId(); ?>">
-									<?php echo I18N::translate('Import'); ?>
-									<span class="sr-only">
-										<?php echo $tree->getTitleHtml(); ?>
-									</span>
-								</a>
-							</li>
 						</ul>
 					</div>
 				</div>
diff --git a/app/Tree.php b/app/Tree.php
index 11ce8ef438..245bc3a6a8 100644
--- a/app/Tree.php
+++ b/app/Tree.php
@@ -698,24 +698,23 @@ class Tree {
 	 *
 	 * @param string  $path       The full path to the (possibly temporary) file.
 	 * @param string  $filename   The preferred filename, for export/download.
-	 * @param boolean $keep_media Whether to retain any existing media records
 	 *
 	 * @throws \Exception
 	 */
-	public function importGedcomFile($path, $filename, $keep_media) {
+	public function importGedcomFile($path, $filename) {
 		// Read the file in blocks of roughly 64K.  Ensure that each block
 		// contains complete gedcom records.  This will ensure we don’t split
 		// multi-byte characters, as well as simplifying the code to import
 		// each block.
 
 		$file_data = '';
-		$fp = fopen($path, 'rb');
+		$fp        = fopen($path, 'rb');
 
 		// Don’t allow the user to cancel the request.  We do not want to be left with an incomplete transaction.
 		ignore_user_abort(true);
 
 		Database::beginTransaction();
-		$this->deleteGenealogyData($keep_media);
+		$this->deleteGenealogyData($this->getPreference('keep_media'));
 		$this->setPreference('gedcom_filename', $filename);
 		$this->setPreference('imported', '0');
 
diff --git a/assets/js-1.7.0/admin.js b/assets/js-1.7.0/admin.js
index cfd7a383f9..2b3a977fcb 100644
--- a/assets/js-1.7.0/admin.js
+++ b/assets/js-1.7.0/admin.js
@@ -61,12 +61,36 @@ function updatePrivacyFeedback() {
 	setPrivacyFeedback("[name=SHOW_PRIVATE_RELATIONSHIPS]", "members", show_private_relationships >= 1);
 }
 
+// Onsubmit validation for the import/upload GEDCOM form
+function checkGedcomImportForm(message) {
+	var old_file = jQuery("#gedcom_filename").val();
+	var method   = jQuery("input[name=action]:checked").val();
+	var new_file = method === "replace_import" ? jQuery("#import-server-file").val() : jQuery("#import-computer-file").find(":selected").val();
+
+	// Some browsers include c:\fakepath\ in the filename.
+	new_file = new_file.replace(/.*[\/\\]/, '');
+	if (new_file !== old_file && old_file !== '') {
+		return confirm(message);
+	} else {
+		return true;
+	}
+}
+
 /**
- * Activate the privacy feedback labels.
+ * Add handlers to various screen elements
  */
 jQuery(document).ready(function() {
+	// Activate the privacy feedback labels.
 	updatePrivacyFeedback();
 	jQuery("[name=REQUIRE_AUTHENTICATION], [name=HIDE_LIVE_PEOPLE], [name=SHOW_DEAD_PEOPLE], [name=SHOW_LIVING_NAMES], [name=SHOW_PRIVATE_RELATIONSHIPS]").on("change", function () {
 		updatePrivacyFeedback();
 	});
+
+	// Import from file on server/computer
+	jQuery("#import-server-file").on("focus", function () {
+		jQuery("#import-server").prop("checked", true);
+	});
+	jQuery("#import-computer-file").on("focus", function () {
+		jQuery("#import-computer").prop("checked", true);
+	});
 });
diff --git a/includes/functions/functions_export.php b/includes/functions/functions_export.php
index f0a35d52ab..73407edfce 100644
--- a/includes/functions/functions_export.php
+++ b/includes/functions/functions_export.php
@@ -164,7 +164,7 @@ function convert_media_path($rec, $path) {
  * @param resource $gedout        Handle to a writable stream
  * @param string[] $exportOptions Export options are as follows:
  *                                'privatize':    which Privacy rules apply?  (none, visitor, user, manager)
- *                                'toANSI':       should the output be produced in ANSI instead of UTF-8?  (yes, no)
+ *                                'toANSI':       should the output be produced in ISO-8859-1 instead of UTF-8?  (yes, no)
  *                                'path':         what constant should prefix all media file paths?  (eg: media/  or c:\my pictures\my family
  *                                'slashes':      what folder separators apply to media file paths?  (forward, backward)
  *
diff --git a/language/ar.po b/language/ar.po
index d82616fd5e..ebc2e2f68c 100644
--- a/language/ar.po
+++ b/language/ar.po
@@ -2042,8 +2042,8 @@ msgstr "تطبيق التصحيحات التلقائية لبيانات المش
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "تطبيق إعدادات الخصوصية؟"
+msgid "Apply privacy settings"
+msgstr "تطبيق إعدادات الخصوصية"
 
 #: admin_users.php:99
 #, php-format
@@ -4028,8 +4028,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "تحويل من UTF-8 إلى ISO-8859-1) ANSI)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "تحويل من UTF-8 إلى ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7448,7 +7448,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "عند الرغبة في إضافة ملاحظة لهذا السجل، يتم ذلك بالنقر على الرابط."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "إن كان هناك كائنات وسائط موجودة في webtrees وتم تعديل المشجر خارج النظام ببرنامج يزيل كائنات الوسائط من المشجر، فيجب التأشير على المربع ليتم دمج كائنات الوسائط الموجودة مع المشجر الجديد."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14598,7 +14598,7 @@ msgstr "تصفح الموقع متوقف مؤقتاً"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "هذا سيحذف جميع المعلومات من المشجر “%s” ويستبدلها بمعلومات من ملف GEDCOM آخر."
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/bg.po b/language/bg.po
index 34a922fbb8..09b3b18132 100644
--- a/language/bg.po
+++ b/language/bg.po
@@ -1949,7 +1949,7 @@ msgstr "Използванне на автоматичен пакетен апд
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr "Приложи настройките Конфиденциалност"
 
 #: admin_users.php:99
@@ -3926,8 +3926,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Конвертирай от UTF-8  в  ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Конвертирай от UTF-8  в  ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/bs.po b/language/bs.po
index fba6d20c20..dc1ae58beb 100644
--- a/language/bs.po
+++ b/language/bs.po
@@ -1971,8 +1971,8 @@ msgstr "Primjeni automatske ispravke u vašim genealoškim podacima."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Postavi postavke privatnosti?"
+msgid "Apply privacy settings"
+msgstr "Postavi postavke privatnosti"
 
 #: admin_users.php:99
 #, php-format
@@ -3950,8 +3950,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Prevedi iz UTF-8 u ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Prevedi iz UTF-8 u ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7370,7 +7370,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14505,7 +14505,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/ca.po b/language/ca.po
index d11136f7d0..573d778a72 100644
--- a/language/ca.po
+++ b/language/ca.po
@@ -1953,7 +1953,7 @@ msgstr "Aplica correccions automàtiques de les dades genealògiques."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr "Aplica paràmetres de privadesa"
 
 #: admin_users.php:99
@@ -3930,8 +3930,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Converteix d’UTF-8 a ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Converteix d’UTF-8 a ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7350,7 +7350,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Si teniu una nota per afegir a aquest registre, aquest és el lloc per fer-ho.<br><br>Polseu l’enllaç i s’obrirà una finestra on podeu entrar-hi la nota. En acabar polseu el botó sota el quadre , tanqueu la finestra i llestos."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "&nbsp;Si heu creat objectes multimèdia a webtrees i heu editat el GEDCOM fora de línia utilitzant un programa que n’elimina, llavors marqueu aquesta casella per combinar els objectes multimèdia actuals amb el nou GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14480,7 +14480,7 @@ msgstr "Lloc web indisponible temporalment"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Això esborrarà totes les dades genealògiques de «%s» i les substituirà per les d’un altre GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20154,8 +20154,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Configuració de l’arbre genealògic"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Per a una visualització òptima en Internet, webtrees utilitzeu la codificació del jocs de caràcters UTF-8. Alguns programes, Family Tree Maker, per exemple, no admet la importació de fitxers GEDCOM codificats en UTF-8. En marcar aquesta casella es convertirà el fitxer de <b>UTF-8</b> a <b>ANSI (ISO-8859-1)</b>.<br><br>El format que necessiteu depèn del programa que utilitzeu per treballar amb el fitxer descarregat GEDCOM. Si no n’esteu segur, mireu-vos la documentació del programa.<br><br>Tingueu en compte que per a que als caràcters especials no es modifiquin, heureu de consevar el fitxer en format UTF-8 i convertir-lo al mètode del vostre manipulant aquests caràcters especials per algun altre mitjà. Consulteu el manual del programa del venedor o autor.<br><br>. En aquest <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Artíclr Wikipedia\"><b>Artícle Wikipedia</b></a> trobareu informació completa i enllaços sobre UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Per a una visualització òptima en Internet, webtrees utilitzeu la codificació del jocs de caràcters UTF-8. Alguns programes, Family Tree Maker, per exemple, no admet la importació de fitxers GEDCOM codificats en UTF-8. En marcar aquesta casella es convertirà el fitxer de <b>UTF-8</b> a <b>ISO-8859-1</b>.<br><br>El format que necessiteu depèn del programa que utilitzeu per treballar amb el fitxer descarregat GEDCOM. Si no n’esteu segur, mireu-vos la documentació del programa.<br><br>Tingueu en compte que per a que als caràcters especials no es modifiquin, heureu de consevar el fitxer en format UTF-8 i convertir-lo al mètode del vostre manipulant aquests caràcters especials per algun altre mitjà. Consulteu el manual del programa del venedor o autor.<br><br>. En aquest <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Artíclr Wikipedia\"><b>Artícle Wikipedia</b></a> trobareu informació completa i enllaços sobre UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "De %s per a %s"
diff --git a/language/cs.po b/language/cs.po
index 2baf221bea..2cf8f4b2d5 100644
--- a/language/cs.po
+++ b/language/cs.po
@@ -1978,8 +1978,8 @@ msgstr "Použít automatické opravy na vaše rodokmenová data."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Použít nastavení soukromí?"
+msgid "Apply privacy settings"
+msgstr "Použít nastavení soukromí"
 
 #: admin_users.php:99
 #, php-format
@@ -3957,8 +3957,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Chcete změnit kódování v tomto GEDCOM souboru z UTF-8 na ANSI (ISO-8859-1)?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Chcete změnit kódování v tomto GEDCOM souboru z UTF-8 na ISO-8859-1?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7377,7 +7377,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Pokud chcete přidat k tomuto záznamu poznámku, toto je správné místo.<br><br>Klikněte na odkaz, objeví se okno, kam ji můžete zapsat. Až skončíte, klikněte na tlačítko a zavřete okno, to je vše."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Pokud jste vytvořil objekty médií ve webtrees, a upravil jste GEDCOM offline použitím programu, který maže objekty médií, potom zkontrolujte toto políčko, abyste mohl spojit současné objekty médií s novým GEDCOMem."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14512,7 +14512,7 @@ msgstr "Tyto stránky jsou dočasně nedostupné"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Vymaže všechna rodokmenová data z „%s“ a nahradí je daty z jiného GEDCOMu."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20196,8 +20196,8 @@ msgstr "…"
 #~ msgid "Filenames are not allowed to have the extension „%s”."
 #~ msgstr "Jména souborů nesmí mít příponu „%s“."
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Pro nejlepší zobrazení na internetu, webtrees používá znakovou sadu UTF-8. Některé programy, například Family Tree Maker, nepodporují importování souborů GEDCOM kódovaných v UTF-8. Zaškrtnutím tohoto políčka provedete konverzi z <b>UTF-8</b> na <b>ANSI (ISO-8859-1)</b>.<br><br>Formát, který potřebujete, závisí na programu, který používáte při práci s vašimi staženými soubory GEDCOM. Pokud si nejste jistí, prohlédněte si dokumentaci daného programu.<br><br>Aby zůstaly nezměněny speciální znaky, udržujte soubor v UTF-8 a převeďte ho do vašeho programu jinými prostředky. Zeptejte se výrobce programu nebo autora.<br><br>Tento <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>článek na Wikipedii</b></a> obsahuje vyčerpávající informace a odkazy k UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Pro nejlepší zobrazení na internetu, webtrees používá znakovou sadu UTF-8. Některé programy, například Family Tree Maker, nepodporují importování souborů GEDCOM kódovaných v UTF-8. Zaškrtnutím tohoto políčka provedete konverzi z <b>UTF-8</b> na <b>ISO-8859-1</b>.<br><br>Formát, který potřebujete, závisí na programu, který používáte při práci s vašimi staženými soubory GEDCOM. Pokud si nejste jistí, prohlédněte si dokumentaci daného programu.<br><br>Aby zůstaly nezměněny speciální znaky, udržujte soubor v UTF-8 a převeďte ho do vašeho programu jinými prostředky. Zeptejte se výrobce programu nebo autora.<br><br>Tento <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>článek na Wikipedii</b></a> obsahuje vyčerpávající informace a odkazy k UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Od %s k %s"
diff --git a/language/da.po b/language/da.po
index 4e837dcbca..4d2d5fcfec 100644
--- a/language/da.po
+++ b/language/da.po
@@ -1953,8 +1953,8 @@ msgstr "Påfør automatisk rettelser til dine slægtsforskningsdata."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Anvend privatlivsindstillinger?"
+msgid "Apply privacy settings"
+msgstr "Anvend privatlivsindstillinger"
 
 #: admin_users.php:99
 #, php-format
@@ -3930,8 +3930,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Ønsker du at konvertere fra UTF-8 til ANSI (ISO-8859-1)?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Ønsker du at konvertere fra UTF-8 til ISO-8859-1?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7350,7 +7350,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Hvis du har en note du vil tilføje til denne post, er dette stedet at gøre det.<br><br>Klik på linket og der åbnes et vindue hvor du kan skrive din note. Når du er færdig klikker du på knappen \"tilføj\". Derefter gemmes noten og vinduet lukkes."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Hvis du har oprettet medieobjekter i webtrees og har redigeret din gedcom på din computer med et program der sletter medieobjekter, skal du sætte flueben her for at flette de nuværende medieobjekter med den nye GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14480,7 +14480,7 @@ msgstr "Dette websted er ikke tilgængeligt i øjeblikket"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Dette sletter al slægtsdata fra “%s” og erstatter den med data fra en anden GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20154,8 +20154,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Konfiguration af familietræet"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "For optimal visning på Internettet gør webtrees bruf af UTF-8 charactersettet. Enkelte programmer, såsom Family Tree Maker understøtter ikke import af GEDCOM-filer i UTF-8-formatet. Sæt flueben her for at konvertere filen fra <b>UTF-8</b> til <b>ANSI (ISO-8859-1)</b>.<br><br>Formatet afhænger af hvilket program du arbejder i med din downloadede GEDCOM-fil. Hvis du ikke er sikker bør du undersøge dokumentationen til programmet.<br><br>Bemærk, at for at bevare specialtegn skal du downloade filen i UTF-8-format og konvertere til dit program på andre måder. Forhør eventuelt producenten af programmet<br><br>Denne<a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia artikel</b></a> indeholder omfattende information og links omhandlende UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "For optimal visning på Internettet gør webtrees bruf af UTF-8 charactersettet. Enkelte programmer, såsom Family Tree Maker understøtter ikke import af GEDCOM-filer i UTF-8-formatet. Sæt flueben her for at konvertere filen fra <b>UTF-8</b> til <b>ISO-8859-1</b>.<br><br>Formatet afhænger af hvilket program du arbejder i med din downloadede GEDCOM-fil. Hvis du ikke er sikker bør du undersøge dokumentationen til programmet.<br><br>Bemærk, at for at bevare specialtegn skal du downloade filen i UTF-8-format og konvertere til dit program på andre måder. Forhør eventuelt producenten af programmet<br><br>Denne<a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia artikel</b></a> indeholder omfattende information og links omhandlende UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Fra %s til %s"
diff --git a/language/de.po b/language/de.po
index 148a3b161c..610413b925 100644
--- a/language/de.po
+++ b/language/de.po
@@ -1949,8 +1949,8 @@ msgstr "Stapelverarbeitung zur Änderung Ihrer genealogischen Daten."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Datenschutzeinstellungen verwenden?"
+msgid "Apply privacy settings"
+msgstr "Datenschutzeinstellungen verwenden"
 
 #: admin_users.php:99
 #, php-format
@@ -3926,8 +3926,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Möchten Sie diese GEDCOM Datei vom UTF-8 in den ANSI (ISO-8859-1) Zeichensatz konvertieren?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Möchten Sie diese GEDCOM Datei vom UTF-8 in den ISO-8859-1 Zeichensatz konvertieren?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Wenn Sie eine Notiz zu diesem Datensatz ergänzen möchten, ist dies der richtige Ort, es zu tun.<br><br>Klicken Sie einfach auf den Link, dann öffnet sich ein Fenster, in dem Sie Ihre Notiz eingeben können. Wenn Sie die Eingabe beendet haben, klicken Sie einfach auf die Schaltfläche unter dem Feld, um das Fenster zu schließen. Das ist alles."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Wenn Sie die Medienobjekte in webtrees erstellt haben und Sie Ihre GEDCOM-Datei mit Hilfe einer anderen Software auf Ihrem Computer erstellt oder bearbeitet haben, die Medienobjekte löscht, dann aktivieren Sie dieses Feld, damit die aktuellen Medienobjekte mit der neuen GEDCOM verknüpft werden."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14477,7 +14477,7 @@ msgstr "Diese Webseite ist vorübergehend nicht verfügbar."
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Dies wird die Genealogischen Daten von „%s“ löschen und sie durch Daten einer andern GEDCOM ersetzen."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20151,8 +20151,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Stammbaum Konfiguration"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "webtrees benutzt intern den UTF-8 Zeichensatz, der das Bearbeiten von Texten in fast allen Sprachen der Welt ermöglicht.  Einige Programme, wie zum Beispiel Family Tree Maker, haben überhaupt keine Unterstützung für den UTF-8 Zeichensatz.  Wenn Sie diese Option ankreuzen, wandelt webtrees die Ausgabe-Datei in den <b>ANSI (ISO-8859-1)</b> Zeichensatz um.<br><br>Ob die Ausgabe-Datei so konvertiert werden muss, kommt darauf an, ob das Ziel-Programm den UTF-8 Zeichensatz unterstützt.  Im Fragefall müssen Sie sich an die Dokumentation des Programms wenden.<br><br>Bitte beachten Sie, dass manche besondere Zeichen nicht im ANSI (ISO-8859-1) Zeichensatz vorhanden sind und Sie deshalb den UTF-8 Ausgangszeichensatz behalten sollten.  In diesem Fall müssen Sie auch eine andere Methode finden, die besonderen Zeichen in das andere Programm einzugeben.  Sie müssen sich wahrscheinlich auch an den Hersteller Ihres Programms wenden.<br><br>Ausführliche Informationen über UTF-8 können Sie in diesem <a href=\"http://de.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia Eintrag\"><b>Wikipedia Eintrag</b></a> finden."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "webtrees benutzt intern den UTF-8 Zeichensatz, der das Bearbeiten von Texten in fast allen Sprachen der Welt ermöglicht.  Einige Programme, wie zum Beispiel Family Tree Maker, haben überhaupt keine Unterstützung für den UTF-8 Zeichensatz.  Wenn Sie diese Option ankreuzen, wandelt webtrees die Ausgabe-Datei in den <b>ISO-8859-1</b> Zeichensatz um.<br><br>Ob die Ausgabe-Datei so konvertiert werden muss, kommt darauf an, ob das Ziel-Programm den UTF-8 Zeichensatz unterstützt.  Im Fragefall müssen Sie sich an die Dokumentation des Programms wenden.<br><br>Bitte beachten Sie, dass manche besondere Zeichen nicht im ISO-8859-1 Zeichensatz vorhanden sind und Sie deshalb den UTF-8 Ausgangszeichensatz behalten sollten.  In diesem Fall müssen Sie auch eine andere Methode finden, die besonderen Zeichen in das andere Programm einzugeben.  Sie müssen sich wahrscheinlich auch an den Hersteller Ihres Programms wenden.<br><br>Ausführliche Informationen über UTF-8 können Sie in diesem <a href=\"http://de.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia Eintrag\"><b>Wikipedia Eintrag</b></a> finden."
 
 #~ msgid "From %s to %s"
 #~ msgstr "vom %s bis %s"
diff --git a/language/el.po b/language/el.po
index ff4c96e34e..ca19d366aa 100644
--- a/language/el.po
+++ b/language/el.po
@@ -1953,8 +1953,8 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Εφαρμογή ρυθμίσεων ιδιωτικοποίησης;"
+msgid "Apply privacy settings"
+msgstr "Εφαρμογή ρυθμίσεων ιδιωτικοποίησης"
 
 #: admin_users.php:99
 #, php-format
@@ -3930,8 +3930,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Θέλετε να μετατρέψετε αυτό το GEDCOM από UTF-8 σε ANSI (ISO-8859-1);"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Θέλετε να μετατρέψετε αυτό το GEDCOM από UTF-8 σε ISO-8859-1;"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7350,7 +7350,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14481,7 +14481,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/en_GB.po b/language/en_GB.po
index b6442b53d4..71a723de66 100644
--- a/language/en_GB.po
+++ b/language/en_GB.po
@@ -1955,7 +1955,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3932,7 +3932,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7352,8 +7352,8 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
-msgstr "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then tick this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
+msgstr "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using software that deletes media objects, then tick this box to merge the current media objects with the new GEDCOM file."
 
 #: modules_v3/recent_changes/module.php:173
 msgid "If you hide an empty block, you will not be able to change its configuration until it becomes visible by no longer being empty."
@@ -14482,8 +14482,8 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
-msgstr "This will delete all the genealogy data from ‘%s’ and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
+msgstr "This will delete all the genealogy data from ‘%s’ and replace it with data from a GEDCOM file."
 
 #: modules_v3/googlemap/module.php:1817
 msgid "This will list all the places from the selected GEDCOM file.  By default this will NOT INCLUDE places that are fully matched between the GEDCOM file and the GoogleMap tables"
diff --git a/language/en_US.po b/language/en_US.po
index 9ce7c72294..a933ecd938 100644
--- a/language/en_US.po
+++ b/language/en_US.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/es.po b/language/es.po
index 68b6044083..87fdeaa149 100644
--- a/language/es.po
+++ b/language/es.po
@@ -1954,8 +1954,8 @@ msgstr "Hacer correcciones/cambios automáticamente en sus datos genealógicos."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "¿Aplicar ajustes de privacidad?"
+msgid "Apply privacy settings"
+msgstr "Aplicar ajustes de privacidad"
 
 #: admin_users.php:99
 #, php-format
@@ -3931,8 +3931,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Convertir de UTF-8 a ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Convertir de UTF-8 a ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7351,7 +7351,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Si debe agregar una nota a esta persona (o personas), éste es el lugar para hacerlo.<br>El proceso es simple, haga clic en el vínculo y aparecerá una ventana desplegable, donde podrá introducir la nota.<br><br>Cuando haya finalizado la escritura, haga clic en el botón bajo la casilla y cierre la ventana desplegable."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Si ha creado objetos audivisuales con webtrees, y ha editado gedcom off-line con un programa que elimina estos objetos, marque esta casilla para combinar los objetos actual con la nueva GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14481,7 +14481,7 @@ msgstr "Este sitio web no está disponible en este momento"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Se borrarán todos los datos genealógicos de «%s» y reemplazarlos con datos de otra GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20152,8 +20152,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Configuración del árbol genealógico"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Para una visualización óptima en Internet, webtrees usa la codificación UTF-8 de caracteres.  Algunos programas, Family Tree Maker, por ejemplo, no se admite la importación de archivos GEDCOM codificados en UTF-8.  Al marcar esta casilla convertirá el archivo de <b>UTF-8</b> para <b>ANSI (ISO-8859-1)</b>.<br><br>El formato que necesita depende del programa que se utiliza para trabajar con su archivo GEDCOM descargado.  Si no está seguro, consulte la documentación de dicho programa.<br><br>Nota que para los caracteres especiales que no han cambiado, tendrá que mantener el archivo en UTF-8 y convertirlo en método de su programa para el manejo de estos caracteres especiales por algún otro medio.  Consulte al fabricante de su programa o autor.<br><br>Este <a target=\"_blank\" href=\"http://en.wikipedia.org/wiki/UTF-8\" title=\"artículo de Wikipedia\"><b>artículo de Wikipedia</b></a> contiene información completa y enlaces sobre UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Para una visualización óptima en Internet, webtrees usa la codificación UTF-8 de caracteres.  Algunos programas, Family Tree Maker, por ejemplo, no se admite la importación de archivos GEDCOM codificados en UTF-8.  Al marcar esta casilla convertirá el archivo de <b>UTF-8</b> para <b>ISO-8859-1</b>.<br><br>El formato que necesita depende del programa que se utiliza para trabajar con su archivo GEDCOM descargado.  Si no está seguro, consulte la documentación de dicho programa.<br><br>Nota que para los caracteres especiales que no han cambiado, tendrá que mantener el archivo en UTF-8 y convertirlo en método de su programa para el manejo de estos caracteres especiales por algún otro medio.  Consulte al fabricante de su programa o autor.<br><br>Este <a target=\"_blank\" href=\"http://en.wikipedia.org/wiki/UTF-8\" title=\"artículo de Wikipedia\"><b>artículo de Wikipedia</b></a> contiene información completa y enlaces sobre UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Desde %s hasta %s"
diff --git a/language/et.po b/language/et.po
index 8ef0600f89..cfacfc3a20 100644
--- a/language/et.po
+++ b/language/et.po
@@ -1954,8 +1954,8 @@ msgstr "Rakenda oma sugupuu andmetele automaatne parandus"
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Rakenda privaatsusseaded?"
+msgid "Apply privacy settings"
+msgstr "Rakenda privaatsusseaded"
 
 #: admin_users.php:99
 #, php-format
@@ -3931,8 +3931,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Konverteeritud UTF-8'st ANSI (ISO-8859-1) vormingusse."
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Konverteeritud UTF-8'st ISO-8859-1 vormingusse."
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7351,7 +7351,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14482,7 +14482,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/af.po b/language/extra/af.po
index d9d0e00a79..1ed3561d9b 100644
--- a/language/extra/af.po
+++ b/language/extra/af.po
@@ -1948,7 +1948,7 @@ msgstr "Pas outomatiese korreksies toe op u stamboomdata."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3925,7 +3925,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7345,7 +7345,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14475,7 +14475,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/dv.po b/language/extra/dv.po
index 6117cb50ff..5b0e7cb81e 100644
--- a/language/extra/dv.po
+++ b/language/extra/dv.po
@@ -1927,7 +1927,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3902,7 +3902,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7322,7 +7322,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14447,7 +14447,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/en_AU.po b/language/extra/en_AU.po
index ae19a162fa..7601c3622c 100644
--- a/language/extra/en_AU.po
+++ b/language/extra/en_AU.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
@@ -20084,8 +20084,8 @@ msgstr ""
 #~ msgid "Deleting old genealogy data…"
 #~ msgstr "Deleting old family tree data…"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Ticking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Ticking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
 
 #~ msgid "If the option <b>Allow visitors to request account registration</b> is enabled this setting controls whether the admin must approve the registration.<br><br>Setting this to <b>Yes</b> will require that all new users first verify themselves and then be approved by an admin before they can login.  With this setting on <b>No</b>, the “Approved by administrator” checkbox will be checked automatically when users verify their account, thus allowing an immediate login afterwards without admin intervention."
 #~ msgstr "If the option <b>Allow visitors to request account registration</b> is enabled this setting controls whether the admin must approve the registration.<br><br>Setting this to <b>Yes</b> will require that all new users first verify themselves and then be approved by an admin before they can login.  With this setting on <b>No</b>, the “Approved by administrator” tickbox will be ticked automatically when users verify their account, thus allowing an immediate login afterwards without admin intervention."
diff --git a/language/extra/fa.po b/language/extra/fa.po
index daceaedc75..29e804f117 100644
--- a/language/extra/fa.po
+++ b/language/extra/fa.po
@@ -1935,8 +1935,8 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "اجرای تنظیمات خصوصی؟"
+msgid "Apply privacy settings"
+msgstr "اجرای تنظیمات خصوصی"
 
 #: admin_users.php:99
 #, php-format
@@ -3912,8 +3912,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "تبدیل از ANSI(ISO-8859-1) به UTF-8"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "تبدیل از ISO-8859-1 به UTF-8"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7332,7 +7332,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14459,7 +14459,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/fo.po b/language/extra/fo.po
index 43a2517689..63edaea519 100644
--- a/language/extra/fo.po
+++ b/language/extra/fo.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,8 +3926,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Formbroyt úr UTF-8 til ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Formbroyt úr UTF-8 til ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14477,7 +14477,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/fr_CA.po b/language/extra/fr_CA.po
index d5f709a7e4..56d04af8a0 100644
--- a/language/extra/fr_CA.po
+++ b/language/extra/fr_CA.po
@@ -1951,8 +1951,8 @@ msgstr "Appliquer automatiquement des corrections par lot à vos données géné
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Appliquer les règles de restrictions d’accès ?"
+msgid "Apply privacy settings"
+msgstr "Appliquer les règles de restrictions d’accès"
 
 #: admin_users.php:99
 #, php-format
@@ -3928,8 +3928,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Convertir ce fichier GEDCOM format UTF-8 en format ANSI (ISO-8859-1) ?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Convertir ce fichier GEDCOM format UTF-8 en format ISO-8859-1 ?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7348,7 +7348,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Si vous avez une note à ajouter à ce disque, c’est l’endroit pour le faire.<br><br>Il suffit de cliquer sur le lien, une fenêtre s’ouvrira, et vous pouvez taper votre note. Lorsque vous avez fini de taper, cliquez simplement sur le bouton ci-dessous, fermez la fenêtre, et c’est tout."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Si vous avez créé des objets médias dans webtrees, et avez modifié votre GEDCOM hors-ligne en utilisant un programme qui supprime les objets médias, cochez cette case pour fusionner les objets média en cours avec le nouveau GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14478,7 +14478,7 @@ msgstr "Ce site est momentanément indisponible"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Toutes les données généalogiques de “%s” seront effacées, elles seront remplacées par les données provenant d’un autre GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20152,8 +20152,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Configurer l’arbre généalogique"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Pour un affichage optimal sur Internet, webtrees utilise le jeu de caractères UTF-8. Certains programmes, Family Tree Maker par exemple, ne prennent pas en charge l’importation de fichiers GEDCOM codés en UTF-8. Cocher cette case vous permet de convertir le fichier d’<b>UTF-8</b> en <b>ANSI (ISO-8859-1)</b>. <br><br>Le format dont vous avez besoin dépend du programme que vous utilisez. Si vous n’êtes pas sûr, consultez la documentation de votre programme.<br><br>Notez que pour les caractères spéciaux restent inchangés, vous aurez besoin de garder le fichier en UTF-8 puis de le convertir par d’autres moyens pour votre programme. Consultez la documentation, le fabricant ou l’auteur de votre programme.<br><br>Cet <a href=\"http://fr.wikipedia.org/wiki/UTF-8\" target=\"_blank\"><b>article Wikipedia</b></a> contient des informations détaillées et des liens sur UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Pour un affichage optimal sur Internet, webtrees utilise le jeu de caractères UTF-8. Certains programmes, Family Tree Maker par exemple, ne prennent pas en charge l’importation de fichiers GEDCOM codés en UTF-8. Cocher cette case vous permet de convertir le fichier d’<b>UTF-8</b> en <b>ISO-8859-1</b>. <br><br>Le format dont vous avez besoin dépend du programme que vous utilisez. Si vous n’êtes pas sûr, consultez la documentation de votre programme.<br><br>Notez que pour les caractères spéciaux restent inchangés, vous aurez besoin de garder le fichier en UTF-8 puis de le convertir par d’autres moyens pour votre programme. Consultez la documentation, le fabricant ou l’auteur de votre programme.<br><br>Cet <a href=\"http://fr.wikipedia.org/wiki/UTF-8\" target=\"_blank\"><b>article Wikipedia</b></a> contient des informations détaillées et des liens sur UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "de %s à %s"
diff --git a/language/extra/gl.po b/language/extra/gl.po
index a10d1c7c7b..6887d30c72 100644
--- a/language/extra/gl.po
+++ b/language/extra/gl.po
@@ -1949,7 +1949,7 @@ msgstr "Aplicar correccións automáticas para os seus datos xenealóxicos."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14478,7 +14478,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/id.po b/language/extra/id.po
index 37c1963e04..b5b736e923 100644
--- a/language/extra/id.po
+++ b/language/extra/id.po
@@ -1932,7 +1932,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3907,8 +3907,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Konversi dari UTF-8 ke ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Konversi dari UTF-8 ke ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7327,7 +7327,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14453,7 +14453,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/ja.po b/language/extra/ja.po
index c97eed28b4..adffa4330c 100644
--- a/language/extra/ja.po
+++ b/language/extra/ja.po
@@ -1927,7 +1927,7 @@ msgstr "貴方の家系データへの自動修正適用"
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3902,7 +3902,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7322,7 +7322,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14447,7 +14447,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/ko.po b/language/extra/ko.po
index 34b6a8e330..9a96fe0f7a 100644
--- a/language/extra/ko.po
+++ b/language/extra/ko.po
@@ -1927,7 +1927,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3902,7 +3902,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7322,7 +7322,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14447,7 +14447,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/lv.po b/language/extra/lv.po
index 0cb2517cf1..c4edbe8cc2 100644
--- a/language/extra/lv.po
+++ b/language/extra/lv.po
@@ -1969,7 +1969,7 @@ msgstr "Izmantot automātisko koriģēšanu jūsu ģeneoloģiskajiem datiem."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3948,7 +3948,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7368,7 +7368,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14503,7 +14503,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/mi.po b/language/extra/mi.po
index 190117dfb0..ad26a439cc 100644
--- a/language/extra/mi.po
+++ b/language/extra/mi.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/ms.po b/language/extra/ms.po
index 26f35061e8..e45d45e6e5 100644
--- a/language/extra/ms.po
+++ b/language/extra/ms.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/ne.po b/language/extra/ne.po
index 1f44a4bb56..edbce91a75 100644
--- a/language/extra/ne.po
+++ b/language/extra/ne.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/oc.po b/language/extra/oc.po
index 72bcaa43f1..68fbe106f0 100644
--- a/language/extra/oc.po
+++ b/language/extra/oc.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/ro.po b/language/extra/ro.po
index 54a917082f..57ef8b2196 100644
--- a/language/extra/ro.po
+++ b/language/extra/ro.po
@@ -1972,7 +1972,7 @@ msgstr "Aplică corecţii automate la datele tale genealogice."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3950,8 +3950,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Converteşte din UTF-8 în ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Converteşte din UTF-8 în ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7370,7 +7370,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14505,7 +14505,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/sl.po b/language/extra/sl.po
index 08150cd8f5..01a483d37c 100644
--- a/language/extra/sl.po
+++ b/language/extra/sl.po
@@ -1998,8 +1998,8 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Uporabi nastavitve zasebnosti?"
+msgid "Apply privacy settings"
+msgstr "Uporabi nastavitve zasebnosti"
 
 #: admin_users.php:99
 #, php-format
@@ -3979,8 +3979,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Spremeni UTF-8 v ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Spremeni UTF-8 v ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7399,7 +7399,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14539,7 +14539,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/sr.po b/language/extra/sr.po
index 8502b0ac37..ca4812c48d 100644
--- a/language/extra/sr.po
+++ b/language/extra/sr.po
@@ -1976,7 +1976,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3955,7 +3955,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7375,7 +7375,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14510,7 +14510,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/sr@Latn.po b/language/extra/sr@Latn.po
index 4e0326b380..e583c92568 100644
--- a/language/extra/sr@Latn.po
+++ b/language/extra/sr@Latn.po
@@ -1976,7 +1976,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3955,7 +3955,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7375,7 +7375,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14510,7 +14510,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/ta.po b/language/extra/ta.po
index b59e66dc99..763a0fac6e 100644
--- a/language/extra/ta.po
+++ b/language/extra/ta.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/tt.po b/language/extra/tt.po
index fc0c7afe6a..5b09eb3d84 100644
--- a/language/extra/tt.po
+++ b/language/extra/tt.po
@@ -1930,7 +1930,7 @@ msgstr "Генеалогик мәгълүматларга автомат төз�
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3906,8 +3906,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "UTF-8 форматыннан ANSI (ISO-8859-1) форматына күчерергә"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "UTF-8 форматыннан ISO-8859-1 форматына күчерергә"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7326,7 +7326,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14452,7 +14452,7 @@ msgstr "Сәхифә вакытлыча ябык"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/yi.po b/language/extra/yi.po
index 086ee333c5..c82df98564 100644
--- a/language/extra/yi.po
+++ b/language/extra/yi.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr "בייַטן פון UTF-8 צו ANSI ISO-8859-1"
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr "דעם וועבזייַטל איז צייַטווייַליק נישט �
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/extra/zh_TW.po b/language/extra/zh_TW.po
index 726553fa03..8c967eacd5 100644
--- a/language/extra/zh_TW.po
+++ b/language/extra/zh_TW.po
@@ -1927,7 +1927,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3902,7 +3902,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7322,7 +7322,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14447,7 +14447,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/fi.po b/language/fi.po
index 565f482e3f..1d3937be3e 100644
--- a/language/fi.po
+++ b/language/fi.po
@@ -1949,8 +1949,8 @@ msgstr "Sovella automaattisia korjauksia sukututkimustietoihisi."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Käytä yksityisyysasetukset?"
+msgid "Apply privacy settings"
+msgstr "Käytä yksityisyysasetukset"
 
 #: admin_users.php:99
 #, php-format
@@ -3926,8 +3926,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Muunna tämä UTF-8-koodattu GEDCOM ANSI (ISO-8859-1) muotoon"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Muunna tämä UTF-8-koodattu GEDCOM ISO-8859-1 muotoon"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Jos sinulla on lisätietoa tähän tietueeseen, lisää se tässä.<br><br>Klikkaa linkkiä ja uusi ikkuna avautuu, ja voit kirjoittaa lisätietosi. Kun olet valmis, klikkaa painiketta ikkunan alapuolella ja sulje ikkuna."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Jos olet tuonut mediakohteita webtreesiin ja sitten muuttanut gedcom-sukututkimusaineistoasi jollakin muulla ohjelmalla, joka poistaa mediaa, niin valitse tämä ruutu. Silloin aikaisemmat mediakohteet yhdistetään takaisin muutettuun aineistoon."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr "Tämä sivusto on tilapäisesti poissa käytöstä"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Tämä poistaa kaikki sukututkimustiedot ”%s” sta ja korvaa ne toisen GEDCOMin tiedoilla."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20150,8 +20150,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Sukupuun asetukset"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "webtrees käyttää UTF-8 merkistöä esittääkseen sivustot parhaalla mahdollisella tavalle internetissä. Jotkut ohjelmat, esim. Family Tree Maker, eivät tue GEDCOM tiedostojen tuontia UTF-8 muodossa. Tämä valintaruutu muuntaa tiedoston muodosta <b>UTF-8</b> muotoon <b>ANSI (ISO-8859-1)</b>.<br><br>Merkkikoodisto jonka tarvitset, riippuu ohjelmasta jota käytät ladatun GEDCOM-tiedoston kanssa. Jos et ole varma, tutki ohjelmasi käyttöohjeet.<br><br>Huomaa, että jos haluat pitää erikoismerkit muuttumattomina, sinun tulee säilyttää tiedosto UTF-8 muotoisena ja muuntaa se käyttäen jotain sopivaa muuntotapaa. Kysy ohjelmasi valmistajalta tai kirjoittajalta.<br><a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> sisältää kattavat tiedot ja linkit UTF-8:sta."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "webtrees käyttää UTF-8 merkistöä esittääkseen sivustot parhaalla mahdollisella tavalle internetissä. Jotkut ohjelmat, esim. Family Tree Maker, eivät tue GEDCOM tiedostojen tuontia UTF-8 muodossa. Tämä valintaruutu muuntaa tiedoston muodosta <b>UTF-8</b> muotoon <b>ISO-8859-1</b>.<br><br>Merkkikoodisto jonka tarvitset, riippuu ohjelmasta jota käytät ladatun GEDCOM-tiedoston kanssa. Jos et ole varma, tutki ohjelmasi käyttöohjeet.<br><br>Huomaa, että jos haluat pitää erikoismerkit muuttumattomina, sinun tulee säilyttää tiedosto UTF-8 muotoisena ja muuntaa se käyttäen jotain sopivaa muuntotapaa. Kysy ohjelmasi valmistajalta tai kirjoittajalta.<br><a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> sisältää kattavat tiedot ja linkit UTF-8:sta."
 
 #~ msgid "From %s to %s"
 #~ msgstr "%s - %s"
diff --git a/language/fr.po b/language/fr.po
index 4603a5ff22..be7041f3b8 100644
--- a/language/fr.po
+++ b/language/fr.po
@@ -1953,8 +1953,8 @@ msgstr "Appliquer des corrections automatiques à vos données généalogiques."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Appliquer les règles de restrictions d’accès ?"
+msgid "Apply privacy settings"
+msgstr "Appliquer les règles de restrictions d’accès"
 
 #: admin_users.php:99
 #, php-format
@@ -3930,8 +3930,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Convertir du format UTF-8 au format ANSI (ISO-8859-1)&nbsp;?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Convertir du format UTF-8 au format ISO-8859-1&nbsp;?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7350,7 +7350,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Si vous avez une note à ajouter à ce disque, c’est l’endroit pour le faire.<br><br>Il suffit de cliquer sur le lien, une fenêtre s’ouvrira, et vous pouvez taper votre note. Lorsque vous avez fini de taper, cliquez simplement sur le bouton ci-dessous, fermez la fenêtre, et c’est tout."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Si vous avez créé des objets médias dans webtrees, et avez modifié votre GEDCOM hors-ligne à l’aide d’un programme qui supprime les objets média, cochez cette case pour fusionner les objets média en cours avec le nouveau GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14480,7 +14480,7 @@ msgstr "Ce site est momentanément indisponible"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Toutes les données généalogiques de “%s” seront effacées et seront remplacées par les données provenant d’un autre GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20154,8 +20154,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Configurer l’arbre généalogique"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Pour un affichage optimal sur Internet, webtrees utilise le jeu de caractères UTF-8. Certains programmes, Family Tree Maker par exemple, ne prennent pas en charge l’importation de fichiers GEDCOM codés en UTF-8. Cocher cette case vous permet de convertir le fichier d’<b>UTF-8</b> en <b>ANSI (ISO-8859-1)</b>.<br><br>Le format dont vous avez besoin dépend du programme que vous utilisez. Si vous n’êtes pas sûr, consultez la documentation de votre programme.<br><br>Notez que pour les caractères spéciaux restent inchangés, vous aurez besoin de garder le fichier en UTF-8 puis de le convertir par d’autres moyens pour votre programme. Consultez pour cela la documentation, le fabricant ou l’auteur de votre programme.<br><br>Cet <a href=\"http://fr.wikipedia.org/wiki/UTF-8\" target=\"_blank\"><b>article Wikipedia</b></a> contient des informations détaillées et des liens sur UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Pour un affichage optimal sur Internet, webtrees utilise le jeu de caractères UTF-8. Certains programmes, Family Tree Maker par exemple, ne prennent pas en charge l’importation de fichiers GEDCOM codés en UTF-8. Cocher cette case vous permet de convertir le fichier d’<b>UTF-8</b> en <b>ISO-8859-1</b>.<br><br>Le format dont vous avez besoin dépend du programme que vous utilisez. Si vous n’êtes pas sûr, consultez la documentation de votre programme.<br><br>Notez que pour les caractères spéciaux restent inchangés, vous aurez besoin de garder le fichier en UTF-8 puis de le convertir par d’autres moyens pour votre programme. Consultez pour cela la documentation, le fabricant ou l’auteur de votre programme.<br><br>Cet <a href=\"http://fr.wikipedia.org/wiki/UTF-8\" target=\"_blank\"><b>article Wikipedia</b></a> contient des informations détaillées et des liens sur UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "de %s à %s"
diff --git a/language/he.po b/language/he.po
index 120e03e2de..4866bbc48c 100644
--- a/language/he.po
+++ b/language/he.po
@@ -1953,8 +1953,8 @@ msgstr "הפעל תיקונים אוטומטיים לנתוני חקר המשפ�
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "הפעל הגדרות פרטיות?"
+msgid "Apply privacy settings"
+msgstr "הפעל הגדרות פרטיות"
 
 #: admin_users.php:99
 #, php-format
@@ -3930,8 +3930,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "הסב מ-UTF-8 ל-(ANSI (ISO-8859-1?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "הסב מ-UTF-8 ל-ISO-8859-1?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7350,7 +7350,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "אם ברצונך להוסיף הערה לרשומה זו, כאן המקום.<br><br>לחץ על הקישור, יפתח חלון ותוכל להקליד את הערתך. כאשר סיימת להקליד את ההערה, לחץ על הכפתור מתחת לתיבה, סגור את החלון, וזה הכל."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "אם יצרת ב-webtrees ישויות מדיה, וערכת את ה-GEDCOM שלך בצורה לא מקוונת באמצעות תכנית שמוחקת ישויות מדיה, אז עליך לבחור את הטיבה הזו כדי למזג את ישויות המדיה הנוכחיים עם ה-GEDCOM החדש."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14480,7 +14480,7 @@ msgstr "אתר האינטרנט הזה אינו זמין באופן זמני."
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "פעולה זו ימחק את כל הנתונים הגנאלוגיים מן “%s” ויחליף אותו עם נתוני GEDCOM אחרת."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20154,8 +20154,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "תצורת עץ משפחה"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "לתצוגה אופטימאלית באינטרנט webtrees משתמש במערך אותיות UTF-8. תוכניות כמו למשל Family Tree Maker, אינן תומכות בייבוא קבצי GEDCOM מוצפנים ב-UTF-8. בחירת התיבה תתרגם את הקובץ מ-<b>UTF-8</b> ל-<b><span dir=\"ltr\">ANSI (ISO-8859-1)</span></b>.<br><br>המבנה הדרוש תלוי בתוכנה שבה תרצה להשתמש בקובץ ה-GEDCOM שהורד. בדוק את התיעוד של התוכנה הזאת, אם אינך בטוח.<br><br>שים לב שכדי שסימנים מיוחדים ישמרו ללא שינוי, עליך להוריד את הקובץ ב-UTF-8 ולהסב לשיטת טיפול של התוכנית שלך בסימנים המיוחדים הללו בדרך אחרת. התייעץ עם יצרן או עורך התוכנה שלך.<br><br>הכתבה הבאה <a href=\"http://he.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"כתבה של ויקיפדיה\"><b>של ויקיפדיה</b></a> כוללת מידע וקישורים מקיפים על UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "לתצוגה אופטימאלית באינטרנט webtrees משתמש במערך אותיות UTF-8. תוכניות כמו למשל Family Tree Maker, אינן תומכות בייבוא קבצי GEDCOM מוצפנים ב-UTF-8. בחירת התיבה תתרגם את הקובץ מ-<b>UTF-8</b> ל-<b><span dir=\"ltr\">ISO-8859-1</span></b>.<br><br>המבנה הדרוש תלוי בתוכנה שבה תרצה להשתמש בקובץ ה-GEDCOM שהורד. בדוק את התיעוד של התוכנה הזאת, אם אינך בטוח.<br><br>שים לב שכדי שסימנים מיוחדים ישמרו ללא שינוי, עליך להוריד את הקובץ ב-UTF-8 ולהסב לשיטת טיפול של התוכנית שלך בסימנים המיוחדים הללו בדרך אחרת. התייעץ עם יצרן או עורך התוכנה שלך.<br><br>הכתבה הבאה <a href=\"http://he.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"כתבה של ויקיפדיה\"><b>של ויקיפדיה</b></a> כוללת מידע וקישורים מקיפים על UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "מ%s עד %s"
diff --git a/language/hr.po b/language/hr.po
index 9c00308017..aa3fb45519 100644
--- a/language/hr.po
+++ b/language/hr.po
@@ -1977,7 +1977,7 @@ msgstr "Primijeni automatsku korekciju na vaše genealoške podatke."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr "Postavi postavke privatnosti"
 
 #: admin_users.php:99
@@ -3956,8 +3956,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Prevedi sa UTF-8 u ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Prevedi sa UTF-8 u ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7376,7 +7376,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Ako imate bilješku koju želite dodati ovom zapisu.<br><br>Samo kliknite na link, prozor će se otvoriti, i možete upisati svoju bilješku. Kada je pisanje gotovo, kliknite na dnu prozora gumb „spremi”, zatvorite prozor, i to je sve."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Ako ste kreirali medijski objekt u webrees, i uređivali svoj GEDCOM koristeći program koji briše medija objekte, uključite ovu opciju da spojite trenutne objekte sa novim GEDCOM-om."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14512,7 +14512,7 @@ msgstr "Ove web stranice su privremeno nedostupne"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Ovo će obrisati sve genealoške podatke iz „%s” i prepisati sa podacima iz drugog GEDCOM-a."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20193,8 +20193,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Oblikovanje obiteljskog stabla"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Za optimalan prikaz na internetu, webtrees koristi UTF-8 kodnu stranicu. Neki programi, Family Tree Maker na primjer, ne podržava učitavanje GEDCOM datoteke kodiranu u UTF-8. Uključenjem ove opcije će konvertirati datoteku iz <b>UTF-8</b> u <b>ANSI (ISO-8859-1)</b>.<br><br> Format koji trebate ovisi o programu koji koristite za rad sa GEDCOM datokom. Ako niste sigurni, konzultirajte dokumentaciju tog programa.<br><br>Da bi posebni znakovi ostali nepromijenjeni, trebate držati datoteku u UTF-8 formatu i pretvoriti ju za svoj program a obradu tih posebnih znakova raditi nekim drugim sredstvima."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Za optimalan prikaz na internetu, webtrees koristi UTF-8 kodnu stranicu. Neki programi, Family Tree Maker na primjer, ne podržava učitavanje GEDCOM datoteke kodiranu u UTF-8. Uključenjem ove opcije će konvertirati datoteku iz <b>UTF-8</b> u <b>ISO-8859-1</b>.<br><br> Format koji trebate ovisi o programu koji koristite za rad sa GEDCOM datokom. Ako niste sigurni, konzultirajte dokumentaciju tog programa.<br><br>Da bi posebni znakovi ostali nepromijenjeni, trebate držati datoteku u UTF-8 formatu i pretvoriti ju za svoj program a obradu tih posebnih znakova raditi nekim drugim sredstvima."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Od %s do %s"
diff --git a/language/hu.po b/language/hu.po
index e216ec06f5..2b58a4d20d 100644
--- a/language/hu.po
+++ b/language/hu.po
@@ -1954,8 +1954,8 @@ msgstr "Automatikusan kijavítja a családfában található hibákat."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Milyen bizalmi beállításokat alkalmazzon?"
+msgid "Apply privacy settings"
+msgstr "Milyen bizalmi beállításokat alkalmazzon"
 
 #: admin_users.php:99
 #, php-format
@@ -3931,8 +3931,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Át szeretné konvertálni ezt a GEDCOM-ot UTF-8-ról ANSI (ISO-8859-1)-ra?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Át szeretné konvertálni ezt a GEDCOM-ot UTF-8-ról ISO-8859-1-ra?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7351,7 +7351,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Ha létrehozott médiaobjektumokat a webtrees-ben és a gedcom adatokat egy külső programmal szerkesztette amely felülírta ezeket a médiabejegyzéseket, jelölje be ezt a mezőt, hogy összevonja a jelenlegi bejegyzéseket az új GEDCOM adatokkal."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14482,7 +14482,7 @@ msgstr "Ez az oldal ideiglenesen nem elérhető."
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Ez kitörli az összes családfa adatot a(z) „%s” bejegyzésből és felülírja egy másik GEDCOM adataival."
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/is.po b/language/is.po
index 6561e97482..d016ec2627 100644
--- a/language/is.po
+++ b/language/is.po
@@ -1949,8 +1949,8 @@ msgstr "Setja í gang sjálfvirkar leiðréttingar á ættfræðigögnum þínum
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Setja á friðhelgis stillingu?"
+msgid "Apply privacy settings"
+msgstr "Setja á friðhelgis stillingu"
 
 #: admin_users.php:99
 #, php-format
@@ -3926,8 +3926,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Umbreyta frá UTF-8 í ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Umbreyta frá UTF-8 í ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Ef þú ert með glósu til að bæta við þessa færslu, þá getur þú gert það hér.<br><br>Smelltu á þessa krækju, gluggi mun þá opnast og þú getur slegið inn þína glósu. Þegar þú hefur lokið við innsláttinn, smelltu þá bara á hnappinn hér fyrir neðan kassann, lokaðu glugganum og þá er þetta komið."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Ef þú hefur stofnað miðilshluta í webtrees og hefur breytt þínum gedcom fyrir utan vefinn með öðru forriti sem eyðir miðilshlutum, hakaðu þá við þennan kassa til að steypa saman núverandi miðilshlutum við nýtt GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr "Þessi vefsíða er tímabundið óaðgengileg."
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Þetta mun eyða öllum ættfræðigögnum frá „%s“ og skipta þeim út með gögnum frá öðrum GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/it.po b/language/it.po
index 1aa4733222..e756488f67 100644
--- a/language/it.po
+++ b/language/it.po
@@ -1955,8 +1955,8 @@ msgstr "Applica correzioni automatiche alle proprie informazioni genealogiche."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Applicare le impostazioni della privacy?"
+msgid "Apply privacy settings"
+msgstr "Applicare le impostazioni della privacy"
 
 #: admin_users.php:99
 #, php-format
@@ -3932,8 +3932,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Converti da UTF-8 ad ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Converti da UTF-8 ad ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7352,7 +7352,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Questo è il punto in cui è possibile aggiungere una nota a questo record.<br><br>Basta cliccare sul collegamento: verrà aperta una finestra in cui inserire la propria nota.  Una volta inserite le informazioni, basta cliccare il pulsante sotto la casella, poi chiudere la finestra. Tutto qui."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Se sono stati creati degli oggetti multimediali in webtrees, e successivamente il gedcom è stato modificato sul proprio PC con un programma che ha rimosso tali oggetti, selezionare questa casella di controllo per unire gli oggetti multimediali correnti con il nuovo GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14482,7 +14482,7 @@ msgstr "Questo sito è temporaneamente non disponibile"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Questo cancellerà tutti i dati genealogici da «%s» e li sostituirà con i dati di un altro GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20156,8 +20156,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Configurazione albero genealogico"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Per una visualizzazione ottimale su internet, webtrees usa il set di caratteri UTF-8.  Alcuni programmi, come ad esempio Family Tree Maker, non supportano l’importazione di file GEDCOM codificati in UTF-8.  Se si seleziona questa casella il file verrà convertito da <b>UTF-8</b> ad <b>ANSI (ISO-8859-1)</b>.<br><br>Il formato più adatto alle proprie esigenze dipende dalla programma utilizzato per lavorare con il file GEDCOM scaricato.  In caso di incertezza, consultare la documentazione del programma.<br><br>Si noti che per mantenere invariati i caratteri speciali è necessario conservare il file in UTF-8 e convertirlo nel formato usato dal proprio programma con altre modalità: consultare al riguardo il produttore o l’autore del proprio programma.<br><br>Questo <a href=\"http://it.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Articolo di Wikipedia\"><b>articolo di Wikipedia</b></a> contiene molte informazioni e vari collegamenti sulla codifica UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Per una visualizzazione ottimale su internet, webtrees usa il set di caratteri UTF-8.  Alcuni programmi, come ad esempio Family Tree Maker, non supportano l’importazione di file GEDCOM codificati in UTF-8.  Se si seleziona questa casella il file verrà convertito da <b>UTF-8</b> ad <b>ISO-8859-1</b>.<br><br>Il formato più adatto alle proprie esigenze dipende dalla programma utilizzato per lavorare con il file GEDCOM scaricato.  In caso di incertezza, consultare la documentazione del programma.<br><br>Si noti che per mantenere invariati i caratteri speciali è necessario conservare il file in UTF-8 e convertirlo nel formato usato dal proprio programma con altre modalità: consultare al riguardo il produttore o l’autore del proprio programma.<br><br>Questo <a href=\"http://it.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Articolo di Wikipedia\"><b>articolo di Wikipedia</b></a> contiene molte informazioni e vari collegamenti sulla codifica UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Da %s a %s"
diff --git a/language/ka.po b/language/ka.po
index c7675060ab..9934c704bf 100644
--- a/language/ka.po
+++ b/language/ka.po
@@ -1927,8 +1927,8 @@ msgstr "Применить автоматические изменения в в
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Применить права доступа?"
+msgid "Apply privacy settings"
+msgstr "Применить права доступа"
 
 #: admin_users.php:99
 #, php-format
@@ -3902,8 +3902,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "კონვერტაცია UTF-8 დან ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "კონვერტაცია UTF-8 დან ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7322,7 +7322,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Если вы создали медиаобъекты в webtrees, но ввели изменения используя программу которая удаляет медиаобъекты, то поставьте флажок, чтобы объединить медиаобъекты с новыми генеалогическим древом."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14447,7 +14447,7 @@ msgstr "საიტი დროებით გამორთულია"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Это удалит все генеалогические данные из “%s” и заменит их на данные из другого GEDCOM-файла."
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/lt.po b/language/lt.po
index c7f734be79..65029bef4a 100644
--- a/language/lt.po
+++ b/language/lt.po
@@ -1977,8 +1977,8 @@ msgstr "Taikyti automatinį jūsų genealogijos duomenų koregavimą."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Pritaikyti saugumo nustatymus?"
+msgid "Apply privacy settings"
+msgstr "Pritaikyti saugumo nustatymus"
 
 #: admin_users.php:99
 #, php-format
@@ -3956,8 +3956,8 @@ msgstr "Valdymo skydas"
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Konvertuoti iš UTF-8 į ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Konvertuoti iš UTF-8 į ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7376,7 +7376,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Jei įtraukėte video, foto ar audio failus, ir naudojant programą redagavote savo GEDCOM neprisijungę prie kilmės medžio puslapio (off-line), kuri ištrina video, foto ar audio failus, tada pažymėkite šį langelį, kad sujungtų esamus video, foto ar audio failus su nauju GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14511,7 +14511,7 @@ msgstr "Šis tinklapis laikinai nepasiekiamas"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Tai ištrins visus genealoginius duomenis iš „%s“ ir pakeis duomenimis iš kito GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/mr.po b/language/mr.po
index 9b632bdda8..a7bb024e0f 100644
--- a/language/mr.po
+++ b/language/mr.po
@@ -1949,7 +1949,7 @@ msgstr ""
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
+msgid "Apply privacy settings"
 msgstr ""
 
 #: admin_users.php:99
@@ -3926,7 +3926,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr ""
 
 #: library/WT/Stats.php:6118
@@ -7346,7 +7346,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr ""
 
 #: modules_v3/recent_changes/module.php:173
@@ -14476,7 +14476,7 @@ msgstr ""
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr ""
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/nb.po b/language/nb.po
index cb100a0eb2..fe4eec51aa 100644
--- a/language/nb.po
+++ b/language/nb.po
@@ -1951,8 +1951,8 @@ msgstr "Gjør automatiserte forandringer over hele databasen"
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Anvend innstillinger for personvern?"
+msgid "Apply privacy settings"
+msgstr "Anvend innstillinger for personvern"
 
 #: admin_users.php:99
 #, php-format
@@ -3928,8 +3928,8 @@ msgstr "Kontrollpanel"
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Konvertere fra UTF-8 til ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Konvertere fra UTF-8 til ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7348,7 +7348,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Hvis du vil føyet et notat til denne posten, er dette stedet.<br><br>Klikk på lenken, og et vindu vil komme opp der du kan skrive inn ditt notat. Når du er ferdig, klikk på «Legg til» øverst eller nederst og lukk vinduet."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Hvis du har oprettet medieobjekter i webtrees og har redigeret din gedcom på din PC (offline) med et program som sletter medieobjekter, sett kryss her for å flette eksisterende medieobjekter med den nye GEDCOM-filen."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14478,7 +14478,7 @@ msgstr "Dette nettstedet er for øyeblikket ikke tilgjengelig"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Dette vil slette alle slektsdata fra «%s» og erstatte dem med data fra en annen GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20152,8 +20152,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Konfigurasjon av familietre"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "For den best mulige visning på nettet bruker webtrees tegnsettet UTF-8. Noen programmer, som for eksempel Family Tree Maker, kan ikke importere GEDCOM-filer i UTF-8. Hvis du krysser av denne ruten, vil filen konverteres fra <b>UTF-8</b> til <b>ANSI (ISO-8859-1)</b> ved nedlastningen.<br><br>Hvilket format du trenger, avhenger av hvilket program du skal arbeide med den nedlastede GEDCOM-filen i. Les programmets dokumentasjon hvis du er i tvil.<br><br>Merk at for at spesialtegn skal forbli uforandret, må du beholde filen i UTF-8 og finne en annen måte å konvertere den på til et format der ditt program kan behandle spesialtegn.  Kontakt evt. programmets produsent eller forfatter.<br><br>Denne <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia-artikkel\"><b>Wikipedia-artikkelen</b></a> inneholder omfattende informasjon om UTF-8, med nyttige lenker videre til andre nettsteder."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "For den best mulige visning på nettet bruker webtrees tegnsettet UTF-8. Noen programmer, som for eksempel Family Tree Maker, kan ikke importere GEDCOM-filer i UTF-8. Hvis du krysser av denne ruten, vil filen konverteres fra <b>UTF-8</b> til <b>ISO-8859-1</b> ved nedlastningen.<br><br>Hvilket format du trenger, avhenger av hvilket program du skal arbeide med den nedlastede GEDCOM-filen i. Les programmets dokumentasjon hvis du er i tvil.<br><br>Merk at for at spesialtegn skal forbli uforandret, må du beholde filen i UTF-8 og finne en annen måte å konvertere den på til et format der ditt program kan behandle spesialtegn.  Kontakt evt. programmets produsent eller forfatter.<br><br>Denne <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia-artikkel\"><b>Wikipedia-artikkelen</b></a> inneholder omfattende informasjon om UTF-8, med nyttige lenker videre til andre nettsteder."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Fra %s til %s"
diff --git a/language/nl.po b/language/nl.po
index 7b44eb278f..06d72ba40c 100644
--- a/language/nl.po
+++ b/language/nl.po
@@ -1955,8 +1955,8 @@ msgstr "Pas automatische correcties toe op uw genealogische data."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Privacy-instellingen toepassen?"
+msgid "Apply privacy settings"
+msgstr "Privacy-instellingen toepassen"
 
 #: admin_users.php:99
 #, php-format
@@ -3932,8 +3932,8 @@ msgstr "Control panel"
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Converteer  van UTF-8 naar ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Converteer  van UTF-8 naar ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7352,7 +7352,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Heeft u een notitie om aan dit record toe te voegen, dan kan dat hier.<br><br>Klik op de link en een venster zal openen waarin de tekst getypt kan worden. Is de tekst klaar, dan wordt door het klikken op <b>Opslaan<b> het venster gesloten en de tekst opgeslagen."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Als u mediaobjecten hebt gecreëerd in webtrees, en uw gedcom off-line gewijzigd hebt met een programma dat mediaobjecten verwijdert, vink dan dit vakje aan om uw huidige mediaobjecten samen te voegen met het nieuwe GEDCOM bestand."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14482,7 +14482,7 @@ msgstr "Deze website is tijdelijk niet beschikbaar"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Dit zal alle genealogische data van ‘%s’ verwijderen en het vervangen door data van een andere GEDCOM"
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/nn.po b/language/nn.po
index e9952bb3b4..8ab2f83007 100644
--- a/language/nn.po
+++ b/language/nn.po
@@ -1955,8 +1955,8 @@ msgstr "Utfør automatiske endringar i heile databasen"
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Nytte innstillingar for personvern?"
+msgid "Apply privacy settings"
+msgstr "Nytte innstillingar for personvern"
 
 #: admin_users.php:99
 #, php-format
@@ -3932,8 +3932,8 @@ msgstr "Kontrollpanel"
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Konvertere frå UTF-8 til ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Konvertere frå UTF-8 til ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7352,7 +7352,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Om du vil leggje til eit notat til denne posten, er dette staden.<br><br>Klikk på lenka, og eit vindauge vil kome opp der du kan skrive inn notatet. Når du er ferdig, klikk <b>Legg til</b> og lukk vindauget."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Om du har oppretta medieobjekt i webtrees, og har redigert di GEDCOM-fil i eit anna program som slettar medieobjekt, kryss av her for å flette eksisterande medieobjekt med den nye GEDCOM-fila."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14482,7 +14482,7 @@ msgstr "Denne nettstaden er for augneblinken ikkje tilgjengeleg"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Dette vil slette alle slektsdata frå «%s» og erstatte dei med data frå ein annan GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20156,8 +20156,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Konfigurasjon av familietre"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "For best mogeleg syning på nettet nyttar webtrees teiknsettet UTF-8. Nokon program, som til dømes Family Tree Maker, kan ikkje importere GEDCOM-filer i UTF-8. Om du kryssar av denne ruta, vil fila konverterast frå <b>UTF-8</b> til <b>ANSI (ISO-8859-1)</b> ved nedlasting.<br><br>Kva format du treng, avheng av kva program du skal arbeide med den nedlasta GEDCOM-fila i. Les programmet sin dokumentasjon om du er i tvil.<br><br>Merk, for at spesialteikn skal stå uforandra, må du behalde fila i UTF-8 og finne ein annan måte å konvertere den på, til eit format der ditt program kan handsame spesialteikn.  Kontakt evt. programmet sin produsent eller forfattar.<br><br>Denne <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia-artikkel\"><b>Wikipedia-artikkelen</b></a> inneheld omfattende informasjon om UTF-8, med nyttige lenker vidare til andre nettstadar."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "For best mogeleg syning på nettet nyttar webtrees teiknsettet UTF-8. Nokon program, som til dømes Family Tree Maker, kan ikkje importere GEDCOM-filer i UTF-8. Om du kryssar av denne ruta, vil fila konverterast frå <b>UTF-8</b> til <b>ISO-8859-1</b> ved nedlasting.<br><br>Kva format du treng, avheng av kva program du skal arbeide med den nedlasta GEDCOM-fila i. Les programmet sin dokumentasjon om du er i tvil.<br><br>Merk, for at spesialteikn skal stå uforandra, må du behalde fila i UTF-8 og finne ein annan måte å konvertere den på, til eit format der ditt program kan handsame spesialteikn.  Kontakt evt. programmet sin produsent eller forfattar.<br><br>Denne <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia-artikkel\"><b>Wikipedia-artikkelen</b></a> inneheld omfattende informasjon om UTF-8, med nyttige lenker vidare til andre nettstadar."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Frå %s til %s"
diff --git a/language/pl.po b/language/pl.po
index 2d9d1ecbe2..11e56ccc8e 100644
--- a/language/pl.po
+++ b/language/pl.po
@@ -1976,8 +1976,8 @@ msgstr "Stosowanie automatycznych korekt do danych genealogicznych."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Czy zastosować ustawienia prywatności?"
+msgid "Apply privacy settings"
+msgstr "Czy zastosować ustawienia prywatności"
 
 #: admin_users.php:99
 #, php-format
@@ -3955,8 +3955,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Konwertuj z UTF-8 do ANSI"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Konwertuj z UTF-8 do ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7375,7 +7375,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Tutaj można dodać notatkę do danego wpisu.<br><br>Po kliknięciu na odnośnik otworzy się nowe okno, w którym będzie można wprowadzić treść notatki. Następnie należy kliknąć przycisk poniżej i zamknąć okno."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Jeśli utworzyłeś obiekty multimedialne w webtrees, a następnie edytowałeś dany plik GEDCOM używając innego programu, który usuwa takie obiekty, zaznacz to pole aby połączyć istniejące obiekty multimedialne z nowym plikiem GEDCOM."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14511,7 +14511,7 @@ msgstr "Ta strona jest chwilowo niedostępna"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Spowoduje to usunięcie wszystkich danych genealogicznych „%s” i zastąpienie ich danymi z innego pliku GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20193,8 +20193,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Konfiguracja drzewa genealogicznego"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "webtrees korzysta ze standardu kodowania UTF-8, który zapewnia poprawne kodowanie stron internetowych. Niektóre aplikacje, takie jak Family Tree Maker, nie obsługują importowania plików GEDCOM zakodowanych w UTF-8. Zaznaczenie tej opcji spowoduje przekonwertowanie pliku z <b>UTF-8</b> do <b>ANSI (ISO-8859-1)</b>.<br><br>Format, który jest potrzebny zależy od aplikacji, której użytkownik chce używać do pracy z pobranym plikiem GEDCOM. Jeśli nie wiadomo, co wybrać, należy zajrzeć do dokumentacji danej aplikacji.<br><br>Należy pamiętać, aby korzystać ze znaków specjalnych, trzeba pozostawić plik w formacie UTF-8 i w inny sposób przekonwertować go do formatu, jaki dana aplikacja może obsłużyć. Należy skontaktować się z producentem lub autorem danej aplikacji.<br><br>Ten <a href=\"http://pl.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Artykuł w Wikipedii na temat UTF-8\"><b>artykuł w Wikipedii</b></a> zawiera kompleksowe informacje i odnośniki na temat standardu UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "webtrees korzysta ze standardu kodowania UTF-8, który zapewnia poprawne kodowanie stron internetowych. Niektóre aplikacje, takie jak Family Tree Maker, nie obsługują importowania plików GEDCOM zakodowanych w UTF-8. Zaznaczenie tej opcji spowoduje przekonwertowanie pliku z <b>UTF-8</b> do <b>ISO-8859-1</b>.<br><br>Format, który jest potrzebny zależy od aplikacji, której użytkownik chce używać do pracy z pobranym plikiem GEDCOM. Jeśli nie wiadomo, co wybrać, należy zajrzeć do dokumentacji danej aplikacji.<br><br>Należy pamiętać, aby korzystać ze znaków specjalnych, trzeba pozostawić plik w formacie UTF-8 i w inny sposób przekonwertować go do formatu, jaki dana aplikacja może obsłużyć. Należy skontaktować się z producentem lub autorem danej aplikacji.<br><br>Ten <a href=\"http://pl.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Artykuł w Wikipedii na temat UTF-8\"><b>artykuł w Wikipedii</b></a> zawiera kompleksowe informacje i odnośniki na temat standardu UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Od %s do %s"
diff --git a/language/pt.po b/language/pt.po
index 35ef481845..645edec8ce 100644
--- a/language/pt.po
+++ b/language/pt.po
@@ -1954,8 +1954,8 @@ msgstr "Aplicar correções automáticas em seu dados genealógicos."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Aplicar medidas de privacidade?"
+msgid "Apply privacy settings"
+msgstr "Aplicar medidas de privacidade"
 
 #: admin_users.php:99
 #, php-format
@@ -3931,8 +3931,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Converter o arquivo GEDCOM do formato UTF-8 para ANSI (ISO-8859-1)?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Converter o arquivo GEDCOM do formato UTF-8 para ISO-8859-1?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7351,7 +7351,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Se você criou objetos de mídia no webtrees, e editou o seu gedcom off-line usando um programa que exclui os objetos de mídia, assinale esta opção para mesclar os objetos atuais com o GEDCOM novo."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14481,7 +14481,7 @@ msgstr "Este site web está temporariamente indisponível"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Isto excluirá todos os dados genealógicos de «%s» e o substituirá com os dados de outro GEDCOM"
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/pt_BR.po b/language/pt_BR.po
index 75e233cbe0..734f101cab 100644
--- a/language/pt_BR.po
+++ b/language/pt_BR.po
@@ -1953,8 +1953,8 @@ msgstr "Aplicar correções automáticas em seu dados genealógicos."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Aplicar medidas de privacidade?"
+msgid "Apply privacy settings"
+msgstr "Aplicar medidas de privacidade"
 
 #: admin_users.php:99
 #, php-format
@@ -3930,8 +3930,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Converter o arquivo GEDCOM do formato UTF-8 para ANSI (ISO-8859-1)?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Converter o arquivo GEDCOM do formato UTF-8 para ISO-8859-1?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7350,7 +7350,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Se você tiver uma nota a acrescentar a este registro, este é o lugar para isso.<br><br>Basta clicar no link, uma janela será aberta, e você pode digitar a sua nota. Quando você terminar de digitar, basta clicar no botão abaixo da caixa, fechar a janela, e isso é tudo."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Se você criou objetos de mídia no webtrees, e editou o seu gedcom off-line usando um programa que exclui os objetos de mídia, assinale esta opção para mesclar os objetos atuais com o GEDCOM novo."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14480,7 +14480,7 @@ msgstr "Este site web está temporariamente indisponível"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Isto excluirá todos os dados genealógicos de “%s” e o substituirá com os dados de outro GEDCOM"
 
 #: modules_v3/googlemap/module.php:1817
@@ -20154,8 +20154,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Configuração da árvore genealógica"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Para melhor exibição na Internet, webtrees usa o conjunto de caracteres UTF-8. Alguns programas, como o Family Tree Maker por exemplo, não suportam importação de arquivos GEDCOM codificados com UTF-8. Marcando esta caixa, você converterá o arquivo de <b>UTF-8</b> para <b>ANSI (ISO-8859-1)</b>.<br><br>O formato que você precisa depende do programa que você usa para trabalhar com arquivos GEDCOM baixados. Se você não tem certeza, consulte a documentação do programa.<br><br>Note que para caracteres especiais permanecerem inalterados, você precisará manter o arquivo em UTF-8 e converter o método de manipulação do seu programa para estes caracteres especiais por outros meios. Consulte o produtor ou autor de seu programa.<br><br>Este <a href=\"http://pt.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Artigo Wikipedia\"><b> artigo da Wikipedia</b></a> contém maiores informações e links sobre UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Para melhor exibição na Internet, webtrees usa o conjunto de caracteres UTF-8. Alguns programas, como o Family Tree Maker por exemplo, não suportam importação de arquivos GEDCOM codificados com UTF-8. Marcando esta caixa, você converterá o arquivo de <b>UTF-8</b> para <b>ISO-8859-1</b>.<br><br>O formato que você precisa depende do programa que você usa para trabalhar com arquivos GEDCOM baixados. Se você não tem certeza, consulte a documentação do programa.<br><br>Note que para caracteres especiais permanecerem inalterados, você precisará manter o arquivo em UTF-8 e converter o método de manipulação do seu programa para estes caracteres especiais por outros meios. Consulte o produtor ou autor de seu programa.<br><br>Este <a href=\"http://pt.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Artigo Wikipedia\"><b> artigo da Wikipedia</b></a> contém maiores informações e links sobre UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "De %s até %s"
diff --git a/language/ru.po b/language/ru.po
index 757a92543e..9140a4e6b2 100644
--- a/language/ru.po
+++ b/language/ru.po
@@ -1980,8 +1980,8 @@ msgstr "Применить автоматические изменения в в
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Применить права доступа?"
+msgid "Apply privacy settings"
+msgstr "Применить права доступа"
 
 #: admin_users.php:99
 #, php-format
@@ -3959,8 +3959,8 @@ msgstr "Панель управления"
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Преобразовать из UTF-8 на ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Преобразовать из UTF-8 на ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7379,7 +7379,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Здесь Вы можете добавить примечание к записи.<br><br>При нажатии на ссылку откроется новое окно, в котором можно ввести текст заметки. Далее следует нажать на кнопку ниже и закрыть окно."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Если Вы создали медиаобъекты в webtrees, но ввели изменения используя программу которая удаляет медиаобъекты, то поставьте флажок, чтобы объединить медиаобъекты с новыми генеалогическим деревом."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14514,7 +14514,7 @@ msgstr "Сайт временно недоступен"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Это удалит все генеалогические данные из «%s» и заменит их на данные из другого GEDCOM-файла."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20201,8 +20201,8 @@ msgstr "Смотреть персону"
 #~ msgid "Family tree configuration"
 #~ msgstr "Конфигурация генеалогического дерева"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Для оптимального отображения в интернете, webtrees использует UTF-8 кодировку. Некоторые программы, например, Family Tree Maker, не поддерживают импорт GEDCOM-файлов, закодированных в UTF-8. При установке этого флажка, файл в кодировке <b>UTF-8</b> будет преобразоваться в файл кодировке <b>ANSI (ISO-8859-1)</b>.<br><br>Формат, который Вам нужен, зависит от программы, которую Вы используете для работы с Вашим загружаемым файлом GEDCOM. Если Вы не уверены какой формат файла, пожалуйста, обратитесь к документации программы.<br><br>Обратите внимание, что специальные символы остаются неизменными, необходимо сохранить файл в кодировке UTF-8 и преобразовать его для Вашей программы, методом обработки этих специальных символов с помощью других средств. Обратитесь к изготовителю программы или к автору.<br><br><a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Статья в Википедии\"><b>Статья в Википедии</b></a> содержит полную информацию и ссылки о кодировке UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Для оптимального отображения в интернете, webtrees использует UTF-8 кодировку. Некоторые программы, например, Family Tree Maker, не поддерживают импорт GEDCOM-файлов, закодированных в UTF-8. При установке этого флажка, файл в кодировке <b>UTF-8</b> будет преобразоваться в файл кодировке <b>ISO-8859-1</b>.<br><br>Формат, который Вам нужен, зависит от программы, которую Вы используете для работы с Вашим загружаемым файлом GEDCOM. Если Вы не уверены какой формат файла, пожалуйста, обратитесь к документации программы.<br><br>Обратите внимание, что специальные символы остаются неизменными, необходимо сохранить файл в кодировке UTF-8 и преобразовать его для Вашей программы, методом обработки этих специальных символов с помощью других средств. Обратитесь к изготовителю программы или к автору.<br><br><a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Статья в Википедии\"><b>Статья в Википедии</b></a> содержит полную информацию и ссылки о кодировке UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "С %s до %s"
diff --git a/language/sk.po b/language/sk.po
index 6f79999043..a714482d10 100644
--- a/language/sk.po
+++ b/language/sk.po
@@ -1976,8 +1976,8 @@ msgstr "Použiť automatické úpravy na vaše genealogické údaje."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Použiť nastavenie utajenia?"
+msgid "Apply privacy settings"
+msgstr "Použiť nastavenie utajenia"
 
 #: admin_users.php:99
 #, php-format
@@ -3955,8 +3955,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Chcete zmeniť kódovanie v tomto GEDCOM súbore z UTF-8 na ANSI (ISO-8859-1)?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Chcete zmeniť kódovanie v tomto GEDCOM súbore z UTF-8 na ISO-8859-1?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7375,7 +7375,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Ak chcete pridať k tomuto záznamu poznámku, toto je to správne miesto.<br><br>Kliknite na odkaz, objaví sa okno, kam ju môžete zapísať. Až skončíte, kliknite na tlačidlo a zatvorte okno, a to je všetko."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Ak ste vytvoril objekty médií vo webtrees, a upravil ste GEDCOM súbor takým programom mimo webtrees, ktorý maže objekty médií, potom zaškrtnite toto políčko, aby ste spojili súčasné objekty médií s upraveným GEDCOMom."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14510,7 +14510,7 @@ msgstr "Táto stránka je dočasne nedostupná"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Toto zmaže všetky genealogické dáta z „%s“ a prepíše ich dátami z iného GEDCOMu."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20185,8 +20185,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Konfigurácia rodokmeňa"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Pre optimálne zobrazenie na internete, webtrees používa znakovú sadu UTF-8. Niektoré programy, napríklad Family Tree Maker, nepodporujú importovanie súborov GEDCOM kódovaných v UTF-8. Zaškrtnutím tohoto políčka vykonáte konverziu z <b>UTF-8</b> na <b>ANSI (ISO-8859-1)</b>.<br><br>Formát, ktorý potrebujete, závisí od programu, ktorý používáte pri práci s vašimi súbormi GEDCOM. Ak si nieste istý, prečítajte si dokumentáciu daného programu.<br><br>Aby zostali nezmenené špeciálne znaky, udržujte súbor v UTF-8 a preveďte ho do vašeho programu inými prostriedkami. Spýtajte sa výrobcu programu alebo autora.<br><br>Tento <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>článok na Wikipédii</b></a> obsahuje vyčerpávajúce informácie a odkazy k UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Pre optimálne zobrazenie na internete, webtrees používa znakovú sadu UTF-8. Niektoré programy, napríklad Family Tree Maker, nepodporujú importovanie súborov GEDCOM kódovaných v UTF-8. Zaškrtnutím tohoto políčka vykonáte konverziu z <b>UTF-8</b> na <b>ISO-8859-1</b>.<br><br>Formát, ktorý potrebujete, závisí od programu, ktorý používáte pri práci s vašimi súbormi GEDCOM. Ak si nieste istý, prečítajte si dokumentáciu daného programu.<br><br>Aby zostali nezmenené špeciálne znaky, udržujte súbor v UTF-8 a preveďte ho do vašeho programu inými prostriedkami. Spýtajte sa výrobcu programu alebo autora.<br><br>Tento <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>článok na Wikipédii</b></a> obsahuje vyčerpávajúce informácie a odkazy k UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Od %s do %s"
diff --git a/language/sv.po b/language/sv.po
index d1049ecfaf..bee22d6dae 100644
--- a/language/sv.po
+++ b/language/sv.po
@@ -1953,8 +1953,8 @@ msgstr "Applicera automatiska korrektioner till dina genealogiska data."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Tillämpa integritetsinställningar?"
+msgid "Apply privacy settings"
+msgstr "Tillämpa integritetsinställningar"
 
 #: admin_users.php:99
 #, php-format
@@ -3930,8 +3930,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Vill du konvertera från UTF-8 till ANSI(ISO-8859-1)?"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Vill du konvertera från UTF-8 till ISO-8859-1?"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7350,7 +7350,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Om du har en anteckning att lägga till denna datapost, är du på rätt plats.<br><br>Klicka länken och ett fönster öppnas och du kan skriva din anteckning. När du har skrivit färdigt, klicka på knappen nedanför rutan och stäng fönstret."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Om du skapat media objekt i webtrees, och har redigerat din gedcom off-line med ett program som tar bort media-object, då välj denna ruta för att sammanfoga de nuvarande media objekten med den nya GEDCOM-filen."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14480,7 +14480,7 @@ msgstr "Denna sajt är otillgänglig för tillfället"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Radera all släktdata från “%s” och ersätt dem med data från annan GEDCOM."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20154,8 +20154,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Släktträds konfiguration"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "För att bättre optimera visandet av tecken på internet använder webtrees UTF-8 teckentabell. Vissa program t.ex. Family Tree Maker, stödjer inte import av GEDCOM-filer kodade i UTF-8. Bocka denna ruta, så konverteras filen från <b>UTF-8</b> till <b>ANSI (ISO-8859-1)</b>.<br><br>Formatet du behöver beror på programmet du använder när du nedladdar GEDCOM-filer, om du inte är säker, konsultera programmets dokumentation.<br><br>För att special tecken skall lämnas oförändrade, behöver du hålla filen i UTF-8 och konvertera den till programmets metod för hantering av dessa specialtecken på annat sätt. Konsultera ditt programs tillverkare eller upphovsman.<br><br>Denna <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia artikel\"><b>Wikipedia artikel</b></a> innehåller omfattande information och länkar om UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "För att bättre optimera visandet av tecken på internet använder webtrees UTF-8 teckentabell. Vissa program t.ex. Family Tree Maker, stödjer inte import av GEDCOM-filer kodade i UTF-8. Bocka denna ruta, så konverteras filen från <b>UTF-8</b> till <b>ISO-8859-1</b>.<br><br>Formatet du behöver beror på programmet du använder när du nedladdar GEDCOM-filer, om du inte är säker, konsultera programmets dokumentation.<br><br>För att special tecken skall lämnas oförändrade, behöver du hålla filen i UTF-8 och konvertera den till programmets metod för hantering av dessa specialtecken på annat sätt. Konsultera ditt programs tillverkare eller upphovsman.<br><br>Denna <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia artikel\"><b>Wikipedia artikel</b></a> innehåller omfattande information och länkar om UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Från %s till %s"
diff --git a/language/tr.po b/language/tr.po
index c0666e423c..73fefb71e4 100644
--- a/language/tr.po
+++ b/language/tr.po
@@ -1927,8 +1927,8 @@ msgstr "Soyağacı verilerinize otomatik düzeltmeleri uygulayın."
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Mahremiyet ayarları uygula?"
+msgid "Apply privacy settings"
+msgstr "Mahremiyet ayarları uygula"
 
 #: admin_users.php:99
 #, php-format
@@ -3902,8 +3902,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "UTF-8 den ANSI (ISO-8859-1) dönüştür"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "UTF-8 den ISO-8859-1 dönüştür"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7322,7 +7322,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Bu kayda eklemek için bir notunuz var ise bu alanı kullanabilirsiniz. Bunun için<br><br>linke tıkladığınızda açılan pencerede notunuzu yazabilirsiniz. İşiniz bittiğinde aşağıdaki kutunun altındaki düğmeye tıklayarak pencereyi kapatabilirsiniz."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Eğer webtrees içinde medya öğeleri oluşturdunuz  ve medya öğelerini silen harici bir program kullanarak gedcom doyanızı düzenlediniz ise yeni GEDCOM ile güncel medya öğeleri birleştirmek için bu kutuyu işaretleyin."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14447,7 +14447,7 @@ msgstr "Bu web sitesi geçici olarak kullanılamıyor"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Bu “%s” soyağacının tüm verileri silerek bir başka GEDCOM verileri yüklenecektir."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20114,8 +20114,8 @@ msgstr "Soyisimsiz"
 #~ msgid "Family tree configuration"
 #~ msgstr "Aile ağacı yapılandırma"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "İnternette en iyi görsel sonucu alabilmek için, webtrees UTF-8 karakter kümesini kullanır. Bazı programlar, örneğin Family Tree Maker UTF-8 kodlamalı GEDCOM dosyasını desteklemez. Bu kutucuğu işaretleyerek dosyayı <b>UTF-8</b> den <b>ANSI (ISO-8859-1)</b> ye dönüştürecektir.<br><br>İhtiyacınız olan format indirdiğiniz GEDCOM dosyasını kullanacağınız programa bağlıdır. Eğer emin değilseniz, kullandığınız programın dökümantasyonunu inceleyeniz.<br><br> Özel karakterlerin değişmediğinden emin olmak için dosyayı UTF-8 kodlamasında tutmalı, kullsndığınız programın formatına dönüştiriken bu özel karakterleri dikkate alan bir yöntem kullanmalısınız. Bunun için programınızın üreticisine başvurunuz.<br><br>Bu <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia makalesi\"><b>Wikipedia makalesi</b></a> UTF-8 hakkında detaylı bilgi ve bağlantılar içermektedir."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "İnternette en iyi görsel sonucu alabilmek için, webtrees UTF-8 karakter kümesini kullanır. Bazı programlar, örneğin Family Tree Maker UTF-8 kodlamalı GEDCOM dosyasını desteklemez. Bu kutucuğu işaretleyerek dosyayı <b>UTF-8</b> den <b>ISO-8859-1</b> ye dönüştürecektir.<br><br>İhtiyacınız olan format indirdiğiniz GEDCOM dosyasını kullanacağınız programa bağlıdır. Eğer emin değilseniz, kullandığınız programın dökümantasyonunu inceleyeniz.<br><br> Özel karakterlerin değişmediğinden emin olmak için dosyayı UTF-8 kodlamasında tutmalı, kullsndığınız programın formatına dönüştiriken bu özel karakterleri dikkate alan bir yöntem kullanmalısınız. Bunun için programınızın üreticisine başvurunuz.<br><br>Bu <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia makalesi\"><b>Wikipedia makalesi</b></a> UTF-8 hakkında detaylı bilgi ve bağlantılar içermektedir."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Buradan %s buraya %s"
diff --git a/language/uk.po b/language/uk.po
index 316ac7d331..54cdd7d36d 100644
--- a/language/uk.po
+++ b/language/uk.po
@@ -1971,8 +1971,8 @@ msgstr "Застосувати автоматичні зміни в ваших �
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Застосувати права доступу?"
+msgid "Apply privacy settings"
+msgstr "Застосувати права доступу"
 
 #: admin_users.php:99
 #, php-format
@@ -3950,8 +3950,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Перетворити з UTF-8 на ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Перетворити з UTF-8 на ISO-8859-1"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7370,7 +7370,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr ""
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Якщо ви створили медіаоб'екти в webtrees, але ввели зміни використовуючи програму що видаляє медіаоб'екти, то поставте прапорець, щоб об'єднати медіаоб'екти з новими генеалогічним древом."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14505,7 +14505,7 @@ msgstr "Сайт тимчасово недоступний"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Це видалить всі генеалогічні дані з «%s» і замінить їх на дані з іншого GEDCOM-файла."
 
 #: modules_v3/googlemap/module.php:1817
diff --git a/language/vi.po b/language/vi.po
index a85f05db5c..5c0b5ef296 100644
--- a/language/vi.po
+++ b/language/vi.po
@@ -1931,8 +1931,8 @@ msgstr "Thực hiện tự động chỉnh sửa cho số liệu gia phả của
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "Có áp dụng thiết đặt riêng tư không?"
+msgid "Apply privacy settings"
+msgstr "Có áp dụng thiết đặt riêng tư không"
 
 #: admin_users.php:99
 #, php-format
@@ -3906,8 +3906,8 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
-msgstr "Có muốn mã hóa từ UTF-8 sang ANSI (ISO-8859-1)??"
+msgid "Convert from UTF-8 to ISO-8859-1"
+msgstr "Có muốn mã hóa từ UTF-8 sang ISO-8859-1??"
 
 #: library/WT/Stats.php:6118
 msgid "Cook Islands"
@@ -7326,7 +7326,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "Nếu bạn có một chú thích bổ sung vào bản ghi này, đây là nơi để làm như vậy<br><br>Chỉ cần nhấp vào liên kết, một cửa sổ sẽ mở ra, và bạn có thể đánh vào ghi chú của bạn. Khi bạn đã kết thúc đánh máy, chỉ cần nhấp vào nút bên dưới hộp, đóng cửa sổ, và thế là xong."
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "Nếu bạn tạo ra một đối tượng hình/phim ở webtrees, và đã sửa chữa file GEDCOM không trực tuyền thì hãy dùng chương trình này để xóa đối tượng hình/phim, rồi kiểm hộp này để hòa đối tượng đó vào GEDCOM mới."
 
 #: modules_v3/recent_changes/module.php:173
@@ -14451,7 +14451,7 @@ msgstr "Site hiện tạm thời không hoạt động"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "Việc này sẽ xóa bỏ mọi chi tiết gia phả của “%s” và thay thế bằng số liệu từ một file GEDCOM khác."
 
 #: modules_v3/googlemap/module.php:1817
@@ -20118,8 +20118,8 @@ msgstr "…"
 #~ msgid "Family tree configuration"
 #~ msgstr "Thiết đặt cấu hình cây gia đình"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "Để hiển thị tối ưu trên internet, webtrees sử dụng bộ ký tự UTF-8. Vài chương trình, như Family Tree Maker chẳng hạn, không hỗ trợ nhập file GEDCOM dùng bộ mã UTF-8.  Đánh dấu kiểm vào hộp này sẽ chuyển đổi file từ <b>UTF-8</b> sang <b>ANSI (ISO-8859-1)</b>.<br><br>Bộ mã bạn cần tùy vào chương trình bạn sử dụng chạy được với file GEDCOM bại tải về. Nếu bạn không biết chắc, tham khảo tài liệu của chương trình đó,<br><br>Lưu ý là để các ký tự đặc biệt vẫn không đổi, bạn cần giữ file ở bộ mã UTF-8 và chuyển chúng theo phương pháp của chương trình xử lý các ký tự đặc biệt này bằng các phương pháp khác. Tham khảo tác giả hay công ty soạn chương trình.<br><br>Bài <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia</b></a> đề cập các thông tin tổng quát và liên kết về UTF-8."
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "Để hiển thị tối ưu trên internet, webtrees sử dụng bộ ký tự UTF-8. Vài chương trình, như Family Tree Maker chẳng hạn, không hỗ trợ nhập file GEDCOM dùng bộ mã UTF-8.  Đánh dấu kiểm vào hộp này sẽ chuyển đổi file từ <b>UTF-8</b> sang <b>ISO-8859-1</b>.<br><br>Bộ mã bạn cần tùy vào chương trình bạn sử dụng chạy được với file GEDCOM bại tải về. Nếu bạn không biết chắc, tham khảo tài liệu của chương trình đó,<br><br>Lưu ý là để các ký tự đặc biệt vẫn không đổi, bạn cần giữ file ở bộ mã UTF-8 và chuyển chúng theo phương pháp của chương trình xử lý các ký tự đặc biệt này bằng các phương pháp khác. Tham khảo tác giả hay công ty soạn chương trình.<br><br>Bài <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia</b></a> đề cập các thông tin tổng quát và liên kết về UTF-8."
 
 #~ msgid "From %s to %s"
 #~ msgstr "Từ %s đến %s"
diff --git a/language/zh_CN.po b/language/zh_CN.po
index 25bb6c5403..ef8dd908ea 100644
--- a/language/zh_CN.po
+++ b/language/zh_CN.po
@@ -1932,8 +1932,8 @@ msgstr "应用自动更正你的家谱数据。"
 #: admin_trees_download.php:122 modules_v3/clippings/module.php:190
 #: modules_v3/clippings/module.php:198 modules_v3/clippings/module.php:581
 #: modules_v3/clippings/module.php:590
-msgid "Apply privacy settings?"
-msgstr "设置隐私？"
+msgid "Apply privacy settings"
+msgstr "设置隐私"
 
 #: admin_users.php:99
 #, php-format
@@ -3907,7 +3907,7 @@ msgstr ""
 
 #: admin_trees_download.php:134 modules_v3/clippings/module.php:205
 #: modules_v3/clippings/module.php:598
-msgid "Convert from UTF-8 to ANSI (ISO-8859-1)"
+msgid "Convert from UTF-8 to ISO-8859-1"
 msgstr "从UTF-8转换为ANSI(ISO-8859-1)"
 
 #: library/WT/Stats.php:6118
@@ -7327,7 +7327,7 @@ msgid "If you have a note to add to this record, this is the place to do so.<br>
 msgstr "这里记事添加到这个记录。<br><br>点击这个链接时,将打开一个新窗口,你可以输入你的记事。当你打完字,就点击下面的按钮,关闭该窗口。"
 
 #: admin_trees_manage.php:207
-msgid "If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file."
+msgid "If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file."
 msgstr "如果您已经在webtrees创建了媒体对象,并脱机使用一个程序与新gedcom编辑你的gedcom,删除媒体对象,合并当前媒体对象就要勾这个选项。"
 
 #: modules_v3/recent_changes/module.php:173
@@ -14452,7 +14452,7 @@ msgstr "该网站暂时不可用"
 #. I18N: %s is the name of a family tree
 #: admin_trees_manage.php:165
 #, php-format
-msgid "This will delete all the genealogy data from “%s” and replace it with data from another GEDCOM file."
+msgid "This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file."
 msgstr "从%s删除所有的家谱资料并用另一个GEDCOM取代它的数据。"
 
 #: modules_v3/googlemap/module.php:1817
@@ -20113,8 +20113,8 @@ msgstr "缺少姓氏"
 #~ msgid "Family tree configuration"
 #~ msgstr "家谱配置"
 
-#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ANSI (ISO-8859-1)</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
-#~ msgstr "为获得在互联网上最佳显示,webtrees 使用utf - 8字符集。一些程序,例如,家谱制造商不支持导入GEDCOM文件编码在UTF-8。检查这个箱子将会把文件从<b>UTF-8</b>到<b> ANSI(iso - 8859 - 1)</b>。<br><br>格式需要取决于你使用的程序处理你的下载文件GEDCOM。如果你不确定,请参考相关文档的程序。<br><br>注意特殊字符保持不变,你需要把文件用UTF-8编码,转换程序的方法来处理这些特殊字符被一些其他手段。咨询你的程序的制造商或作者。<br><br><a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b></b>维基百科的文章</>包含全面的信息和链接关于utf - 8。"
+#~ msgid "For optimal display on the internet, webtrees uses the UTF-8 character set.  Some programs, Family Tree Maker for example, do not support importing GEDCOM files encoded in UTF-8.  Checking this box will convert the file from <b>UTF-8</b> to <b>ISO-8859-1</b>.<br><br>The format you need depends on the program you use to work with your downloaded GEDCOM file.  If you aren’t sure, consult the documentation of that program.<br><br>Note that for special characters to remain unchanged, you will need to keep the file in UTF-8 and convert it to your program’s method for handling these special characters by some other means.  Consult your program’s manufacturer or author.<br><br>This <a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b>Wikipedia article</b></a> contains comprehensive information and links about UTF-8."
+#~ msgstr "为获得在互联网上最佳显示,webtrees 使用utf - 8字符集。一些程序,例如,家谱制造商不支持导入GEDCOM文件编码在UTF-8。检查这个箱子将会把文件从<b>UTF-8</b>到<b> ISO-8859-1</b>。<br><br>格式需要取决于你使用的程序处理你的下载文件GEDCOM。如果你不确定,请参考相关文档的程序。<br><br>注意特殊字符保持不变,你需要把文件用UTF-8编码,转换程序的方法来处理这些特殊字符被一些其他手段。咨询你的程序的制造商或作者。<br><br><a href=\"http://en.wikipedia.org/wiki/UTF-8\" target=\"_blank\" title=\"Wikipedia article\"><b></b>维基百科的文章</>包含全面的信息和链接关于utf - 8。"
 
 #~ msgid "From %s to %s"
 #~ msgstr "从 %s 到 %s"
diff --git a/modules_v3/clippings/module.php b/modules_v3/clippings/module.php
index e175472fa5..7d092d674a 100644
--- a/modules_v3/clippings/module.php
+++ b/modules_v3/clippings/module.php
@@ -182,7 +182,7 @@ class clippings_WT_Module extends Module implements ModuleMenuInterface, ModuleS
 					<td class="optionbox"><input type="checkbox" name="IncludeMedia" value="yes"></td></tr>
 
 					<?php if (WT_USER_GEDCOM_ADMIN) {	?>
-						<tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings?'), help_link('apply_privacy'); ?></td>
+						<tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'), help_link('apply_privacy'); ?></td>
 						<td class="optionbox">
 							<input type="radio" name="privatize_export" value="none" checked> <?php echo I18N::translate('None'); ?><br>
 							<input type="radio" name="privatize_export" value="gedadmin"> <?php echo I18N::translate('Manager'); ?><br>
@@ -190,14 +190,14 @@ class clippings_WT_Module extends Module implements ModuleMenuInterface, ModuleS
 							<input type="radio" name="privatize_export" value="visitor"> <?php echo I18N::translate('Visitor'); ?>
 						</td></tr>
 					<?php } elseif (WT_USER_CAN_ACCESS) {	?>
-						<tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings?'), help_link('apply_privacy'); ?></td>
+						<tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'), help_link('apply_privacy'); ?></td>
 						<td class="optionbox">
 							<input type="radio" name="privatize_export" value="user" checked> <?php echo I18N::translate('Member'); ?><br>
 							<input type="radio" name="privatize_export" value="visitor"> <?php echo I18N::translate('Visitor'); ?>
 						</td></tr>
 					<?php } ?>
 
-					<tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Convert from UTF-8 to ANSI (ISO-8859-1)'), help_link('utf8_ansi'); ?></td>
+					<tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Convert from UTF-8 to ISO-8859-1'), help_link('utf8_ansi'); ?></td>
 					<td class="optionbox"><input type="checkbox" name="convert" value="yes"></td></tr>
 
 					<tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Add the GEDCOM media path to filenames'), help_link('GEDCOM_MEDIA_PATH'); ?></td>
@@ -573,7 +573,7 @@ class clippings_WT_Module extends Module implements ModuleMenuInterface, ModuleS
 
 		if (WT_USER_GEDCOM_ADMIN) {
 			$out .=
-				'<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings?') . help_link('apply_privacy') . '</td>' .
+				'<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . help_link('apply_privacy') . '</td>' .
 				'<td class="optionbox">' .
 				'	<input type="radio" name="privatize_export" value="none" checked> ' . I18N::translate('None') . '<br>' .
 				'	<input type="radio" name="privatize_export" value="gedadmin"> ' . I18N::translate('Manager') . '<br>' .
@@ -582,7 +582,7 @@ class clippings_WT_Module extends Module implements ModuleMenuInterface, ModuleS
 				'</td></tr>';
 		} elseif (WT_USER_CAN_ACCESS) {
 			$out .=
-				'<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings?') . help_link('apply_privacy') . '</td>' .
+				'<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . help_link('apply_privacy') . '</td>' .
 				'<td class="list_value">' .
 				'	<input type="radio" name="privatize_export" value="user" checked> ' . I18N::translate('Member') . '<br>' .
 				'	<input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') .
@@ -590,7 +590,7 @@ class clippings_WT_Module extends Module implements ModuleMenuInterface, ModuleS
 		}
 
 		$out .= '
-		<tr><td class="descriptionbox width50 wrap">'. I18N::translate('Convert from UTF-8 to ANSI (ISO-8859-1)') . help_link('utf8_ansi') . '</td>
+		<tr><td class="descriptionbox width50 wrap">'. I18N::translate('Convert from UTF-8 to ISO-8859-1') . help_link('utf8_ansi') . '</td>
 		<td class="optionbox"><input type="checkbox" name="convert" value="yes"></td></tr>
 
 		<tr>