diff options
| author | Greg Roach <fisharebest@gmail.com> | 2013-09-21 15:12:15 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2013-09-21 15:26:43 +0100 |
| commit | fe536f924de8a8c2a60e69d0d9724255a47696c9 (patch) | |
| tree | 08a0aae770f7e5cbb88853d38076c1fcceee1cc2 /includes | |
| parent | 9f68e4d70cc6aec46f2d74386cdd455e6f220b79 (diff) | |
| download | webtrees-fe536f924de8a8c2a60e69d0d9724255a47696c9.tar.gz webtrees-fe536f924de8a8c2a60e69d0d9724255a47696c9.tar.bz2 webtrees-fe536f924de8a8c2a60e69d0d9724255a47696c9.zip | |
Update language files. Tidy up some capitalisation in en_US.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/authentication.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_edit.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/includes/authentication.php b/includes/authentication.php index c7b5bda97a..ef8765d508 100644 --- a/includes/authentication.php +++ b/includes/authentication.php @@ -275,7 +275,7 @@ function addMessage($message) { if (isset($message['from_name'])) { $message['body'] = WT_I18N::translate('Your Name:') . ' ' . $message['from_name'] . WT_Mail::EOL . - WT_I18N::translate('Email Address:')." ".$message['from_email'] . WT_Mail::EOL . WT_Mail::EOL . + WT_I18N::translate('Email address:')." ".$message['from_email'] . WT_Mail::EOL . WT_Mail::EOL . $message['body']; } if (!userIsAdmin($user_id_from)) { diff --git a/includes/functions/functions.php b/includes/functions/functions.php index 1d7c5cbd42..dfb394ccdf 100644 --- a/includes/functions/functions.php +++ b/includes/functions/functions.php @@ -1775,7 +1775,7 @@ function get_relationship_name_from_path($path, WT_Individual $person1=null, WT_ while ($path2) { $tmp=WT_I18N::translate( // I18N: A complex relationship, such as “third-cousin’s great-uncle” - '%1$s\'s %2$s', + '%1$s’s %2$s', get_relationship_name_from_path($path1, null, null), // TODO: need the actual people get_relationship_name_from_path($path2, null, null) ); diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php index 8bd1626188..3de08e9d1e 100644 --- a/includes/functions/functions_edit.php +++ b/includes/functions/functions_edit.php @@ -550,7 +550,7 @@ function add_simple_tag($tag, $upperlevel='', $label='', $extra=null) { } } else if ($fact=="TEMP") { - echo select_edit_control($element_name, WT_Gedcom_Code_Temp::templeNames(), WT_I18N::translate('No Temple - Living Ordinance'), $value); + echo select_edit_control($element_name, WT_Gedcom_Code_Temp::templeNames(), WT_I18N::translate('No temple - living ordinance'), $value); } else if ($fact=="ADOP") { echo edit_field_adop($element_name, $value); } else if ($fact=="PEDI") { diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 77f4f91161..3da26dad44 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -317,7 +317,7 @@ function whoisonline() { $content .= '<div class="logged_in_name">'; $content .= WT_Filter::escapeHtml(getUserFullName($user_id) . ' - ' . $user_name); if (true || WT_USER_ID!=$user_id && get_user_setting($user_id, 'contactmethod')!="none") { - $content .= ' <a class="icon-email" href="#" onclick="return message(\'' . WT_Filter::escapeJs($user_name) . '\', \'\', \'' . WT_Filter::escapeJs(get_query_url()) . '\');" title="' . WT_I18N::translate('Send Message').'"></a>'; + $content .= ' <a class="icon-email" href="#" onclick="return message(\'' . WT_Filter::escapeJs($user_name) . '\', \'\', \'' . WT_Filter::escapeJs(get_query_url()) . '\');" title="' . WT_I18N::translate('Send message').'"></a>'; } $i++; $content .= '</div>'; @@ -879,7 +879,7 @@ function format_fact_place(WT_Fact $event, $anchor=false, $sub_records=false, $l if ($lds) { if (preg_match('/2 TEMP (.*)/', $event->getGedcom(), $match)) { $tcode=trim($match[1]); - $html.='<br>'.WT_I18N::translate('LDS Temple').': '.WT_Gedcom_Code_Temp::templeName($match[1]); + $html.='<br>'.WT_I18N::translate('LDS temple').': '.WT_Gedcom_Code_Temp::templeName($match[1]); } if (preg_match('/2 STAT (.*)/', $event->getGedcom(), $match)) { $html.='<br>'.WT_I18N::translate('Status').': '.WT_Gedcom_Code_Stat::statusName($match[1]); |
