summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2011-06-09 08:57:26 +0000
committerfisharebest <fisharebest@gmail.com>2011-06-09 08:57:26 +0000
commit7c56a49065ca86d2d1f3ad55ec56b3427fc53ebb (patch)
tree011a765f19f2eabd1d9059ff2d242ec910ce7d8c
parent789e2ffc063b99930b2c49fd69ce54ae85d387b2 (diff)
downloadwebtrees-7c56a49065ca86d2d1f3ad55ec56b3427fc53ebb.tar.gz
webtrees-7c56a49065ca86d2d1f3ad55ec56b3427fc53ebb.tar.bz2
webtrees-7c56a49065ca86d2d1f3ad55ec56b3427fc53ebb.zip
Improve the English phrasing of new messages
-rw-r--r--family.php8
-rw-r--r--individual.php8
-rw-r--r--library/WT/Gedcom/Tag.php2
-rw-r--r--mediaviewer.php8
-rw-r--r--modules_v2/review_changes/module.php2
-rw-r--r--note.php8
-rw-r--r--repo.php8
-rw-r--r--source.php8
8 files changed, 26 insertions, 26 deletions
diff --git a/family.php b/family.php
index 05d8d52d66..dd66e498ec 100644
--- a/family.php
+++ b/family.php
@@ -35,15 +35,15 @@ if ($controller->family && $controller->family->canDisplayName()) {
print_header($controller->getPageTitle());
if ($controller->family->isMarkedDeleted()) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> this deletion.', $controller->family->getHtmlUrl().'&amp;action=accept', $controller->family->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You should review the deletion and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> it.', $controller->family->getHtmlUrl().'&amp;action=accept', $controller->family->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted, but the deletion needs to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.'), '</p>';
}
} elseif (find_updated_record($controller->family->getXref(), WT_GED_ID)!==null) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> the changes.', $controller->family->getHtmlUrl().'&amp;action=accept', $controller->family->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. You should review the changes and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> them.', $controller->family->getHtmlUrl().'&amp;action=accept', $controller->family->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed, but the changes need to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.'), '</p>';
}
} elseif ($controller->accept_success) {
echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been accepted.'), '</p>';
diff --git a/individual.php b/individual.php
index 5d694f41d7..efcf9fb162 100644
--- a/individual.php
+++ b/individual.php
@@ -41,15 +41,15 @@ if ($controller->indi && $controller->indi->canDisplayName()) {
print_header($controller->getPageTitle());
if ($controller->indi->isMarkedDeleted()) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> this deletion.', $controller->indi->getHtmlUrl().'&amp;action=accept', $controller->indi->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You should review the deletion and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> it.', $controller->indi->getHtmlUrl().'&amp;action=accept', $controller->indi->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted, but the deletion needs to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.'), '</p>';
}
} elseif (find_updated_record($controller->indi->getXref(), WT_GED_ID)!==null) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> the changes.', $controller->indi->getHtmlUrl().'&amp;action=accept', $controller->indi->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. You should review the changes and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> them.', $controller->indi->getHtmlUrl().'&amp;action=accept', $controller->indi->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed, but the changes need to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.'), '</p>';
}
} elseif ($controller->accept_success) {
echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been accepted.'), '</p>';
diff --git a/library/WT/Gedcom/Tag.php b/library/WT/Gedcom/Tag.php
index 6b640e112b..ec3154b148 100644
--- a/library/WT/Gedcom/Tag.php
+++ b/library/WT/Gedcom/Tag.php
@@ -309,7 +309,7 @@ class WT_Gedcom_Tag {
case 'NOTE': return /* I18N: gedcom tag NOTE */ WT_I18N::translate('Note');
case 'NPFX': return /* I18N: gedcom tag NPFX */ WT_I18N::translate('Name prefix');
case 'NSFX': return /* I18N: gedcom tag NSFX */ WT_I18N::translate('Name suffix');
- case 'OBJE': return /* I18N: gedcom tag OBJE */ WT_I18N::translate('Multimedia object');
+ case 'OBJE': return /* I18N: gedcom tag OBJE */ WT_I18N::translate('Media object');
case 'OCCU': return /* I18N: gedcom tag OCCU */ WT_I18N::translate('Occupation');
case 'OCCU:AGNC': return WT_I18N::translate('Employer');
case 'ORDI': return /* I18N: gedcom tag ORDI */ WT_I18N::translate('Ordinance');
diff --git a/mediaviewer.php b/mediaviewer.php
index 682ed588f8..ed153f4b10 100644
--- a/mediaviewer.php
+++ b/mediaviewer.php
@@ -36,15 +36,15 @@ if ($controller->mediaobject && $controller->mediaobject->canDisplayName()) {
print_header($controller->getPageTitle());
if ($controller->mediaobject->isMarkedDeleted()) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> this deletion.', $controller->mediaobject->getHtmlUrl().'&amp;action=accept', $controller->mediaobject->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You should review the deletion and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> it.', $controller->mediaobject->getHtmlUrl().'&amp;action=accept', $controller->mediaobject->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted, but the deletion needs to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.'), '</p>';
}
} elseif (find_updated_record($controller->mediaobject->getXref(), WT_GED_ID)!==null) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> the changes.', $controller->mediaobject->getHtmlUrl().'&amp;action=accept', $controller->mediaobject->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. You should review the changes and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> them.', $controller->mediaobject->getHtmlUrl().'&amp;action=accept', $controller->mediaobject->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed, but the changes need to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.'), '</p>';
}
} elseif ($controller->accept_success) {
echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been accepted.'), '</p>';
diff --git a/modules_v2/review_changes/module.php b/modules_v2/review_changes/module.php
index ff196d0a26..912ad1fa40 100644
--- a/modules_v2/review_changes/module.php
+++ b/modules_v2/review_changes/module.php
@@ -130,7 +130,7 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
case 'SOUR':
case 'OBJE':
$content.=$block ? '<br />' : ' ';
- $content.='<a href="'.$record->getHtmlUrl().'">'.WT_I18N::translate('View the changes.').'</a>';
+ $content.='<a href="'.$record->getHtmlUrl().'">'.WT_I18N::translate('View the changes').'</a>';
break;
}
$content.='<br />';
diff --git a/note.php b/note.php
index a995c56da0..018484ee6a 100644
--- a/note.php
+++ b/note.php
@@ -35,15 +35,15 @@ if ($controller->note && $controller->note->canDisplayName()) {
print_header($controller->getPageTitle());
if ($controller->note->isMarkedDeleted()) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> this deletion.', $controller->note->getHtmlUrl().'&amp;action=accept', $controller->note->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You should review the deletion and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> it.', $controller->note->getHtmlUrl().'&amp;action=accept', $controller->note->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted, but the deletion needs to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.'), '</p>';
}
} elseif (find_updated_record($controller->note->getXref(), WT_GED_ID)!==null) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> the changes.', $controller->note->getHtmlUrl().'&amp;action=accept', $controller->note->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. You should review the changes and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> them.', $controller->note->getHtmlUrl().'&amp;action=accept', $controller->note->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed, but the changes need to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.'), '</p>';
}
} elseif ($controller->accept_success) {
echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been accepted.'), '</p>';
diff --git a/repo.php b/repo.php
index aa42a9ae9e..2f6c6f5169 100644
--- a/repo.php
+++ b/repo.php
@@ -35,15 +35,15 @@ if ($controller->repository && $controller->repository->canDisplayName()) {
print_header($controller->getPageTitle());
if ($controller->repository->isMarkedDeleted()) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> this deletion.', $controller->repository->getHtmlUrl().'&amp;action=accept', $controller->repository->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You should review the deletion and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> it.', $controller->repository->getHtmlUrl().'&amp;action=accept', $controller->repository->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted, but the deletion needs to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.'), '</p>';
}
} elseif (find_updated_record($controller->repository->getXref(), WT_GED_ID)!==null) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> the changes.', $controller->repository->getHtmlUrl().'&amp;action=accept', $controller->repository->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. You should review the changes and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> them.', $controller->repository->getHtmlUrl().'&amp;action=accept', $controller->repository->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed, but the changes need to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.'), '</p>';
}
} elseif ($controller->accept_success) {
echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been accepted.'), '</p>';
diff --git a/source.php b/source.php
index 84e64ea978..cfbee428d3 100644
--- a/source.php
+++ b/source.php
@@ -35,15 +35,15 @@ if ($controller->source && $controller->source->canDisplayName()) {
print_header($controller->getPageTitle());
if ($controller->source->isMarkedDeleted()) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> this deletion.', $controller->source->getHtmlUrl().'&amp;action=accept', $controller->source->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. You should review the deletion and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> it.', $controller->source->getHtmlUrl().'&amp;action=accept', $controller->source->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted, but the deletion needs to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.'), '</p>';
}
} elseif (find_updated_record($controller->source->getXref(), WT_GED_ID)!==null) {
if (WT_USER_CAN_ACCEPT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed. You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> the changes.', $controller->source->getHtmlUrl().'&amp;action=accept', $controller->source->getHtmlUrl().'&amp;action=undo'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. You should review the changes and then <a href="%1$s">accept</a> or <a href="%2$s">reject</a> them.', $controller->source->getHtmlUrl().'&amp;action=accept', $controller->source->getHtmlUrl().'&amp;action=undo'), '</p>';
} elseif (WT_USER_CAN_EDIT) {
- echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed, but the changes need to be reviewed by a moderator.'), '</p>';
+ echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.'), '</p>';
}
} elseif ($controller->accept_success) {
echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been accepted.'), '</p>';