[wp-cvs] wordpress/wp-admin edit-comments.php, 1.25,
1.26 moderation.php, 1.11, 1.12 options-discussion.php, 1.16,
1.17 options-misc.php, 1.10, 1.11 options-permalink.php, 1.34,
1.35 options-reading.php, 1.10, 1.11 options-writing.php, 1.19,
1.20 options.php, 1.24, 1.25 post.php, 1.66, 1.67 profile.php,
1.23, 1.24
Ryan Boren
rboren at users.sourceforge.net
Sun Jun 13 11:15:00 CDT 2004
- Previous message: [wp-cvs]
wordpress index.php, 1.75, 1.76 wp-comments-popup.php, 1.12,
1.13 wp-comments.php, 1.20, 1.21 wp-login.php, 1.24, 1.25
- Next message: [wp-cvs] wordpress/wp-admin upgrade-functions.php,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17856/wp-admin
Modified Files:
edit-comments.php moderation.php options-discussion.php
options-misc.php options-permalink.php options-reading.php
options-writing.php options.php post.php profile.php
Log Message:
Mark some strings for translation and improve string consistency. From Albert. http://mosquito.wordpress.org/bug_view_page.php?bug_id=0000024
Index: options-reading.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-reading.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** options-reading.php 11 Jun 2004 18:23:12 -0000 1.10
--- options-reading.php 13 Jun 2004 16:14:57 -0000 1.11
***************
*** 2,6 ****
require_once('../wp-includes/wp-l10n.php');
! $title = 'Reading Options';
$parent_file = 'options-general.php';
--- 2,6 ----
require_once('../wp-includes/wp-l10n.php');
! $title = __('Reading Options');
$parent_file = 'options-general.php';
***************
*** 69,73 ****
<th width="33%" scope="row"><?php _e('Show the most recent:') ?></th>
<td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php echo get_settings('posts_per_rss'); ?>" size="3" />
! posts </td>
</tr>
<tr valign="top">
--- 69,73 ----
<th width="33%" scope="row"><?php _e('Show the most recent:') ?></th>
<td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php echo get_settings('posts_per_rss'); ?>" size="3" />
! <?php _('posts') ?></td>
</tr>
<tr valign="top">
***************
*** 75,82 ****
<td><label>
<input name="rss_use_excerpt" type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?> />
! full text</label> <br />
<label>
<input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> />
! summary</label> </td>
</tr>
</table>
--- 75,82 ----
<td><label>
<input name="rss_use_excerpt" type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?> />
! <?php _e('full text') ?></label> <br>
<label>
<input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> />
! <?php _('summary') ?></label> </td>
</tr>
</table>
Index: options-discussion.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-discussion.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** options-discussion.php 11 Jun 2004 18:23:12 -0000 1.16
--- options-discussion.php 13 Jun 2004 16:14:57 -0000 1.17
***************
*** 2,6 ****
require_once('../wp-includes/wp-l10n.php');
! $title = 'Discussion Options';
$parent_file = 'options-general.php';
--- 2,6 ----
require_once('../wp-includes/wp-l10n.php');
! $title = __('Discussion Options');
$parent_file = 'options-general.php';
***************
*** 69,73 ****
</fieldset>
<fieldset class="options">
! <legend><?php _e('Email me whenever:') ?></legend>
<ul>
<li>
--- 69,73 ----
</fieldset>
<fieldset class="options">
! <legend><?php _e('E-mail me whenever:') ?></legend>
<ul>
<li>
***************
*** 94,98 ****
<label for="require_name_email">
<input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> />
! <?php _e('User must fill out name and email') ?> </label>
</li>
</ul>
--- 94,98 ----
<label for="require_name_email">
<input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> />
! <?php _e('User must fill out name and e-mail') ?> </label>
</li>
</ul>
***************
*** 102,106 ****
<p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
! <p><?php _e('When a comment contains any of these words in its content, name, URI, email, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://wiki.wordpress.org/index.php/SpamWords">Common spam words</a>.') ?></p>
<p>
<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php echo get_settings('moderation_keys'); ?></textarea>
--- 102,106 ----
<p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
! <p><?php _e('When a comment contains any of these words in its content, name, URI, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://wiki.wordpress.org/index.php/SpamWords">Common spam words</a>.') ?></p>
<p>
<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php echo get_settings('moderation_keys'); ?></textarea>
Index: options-writing.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-writing.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** options-writing.php 11 Jun 2004 18:23:12 -0000 1.19
--- options-writing.php 13 Jun 2004 16:14:57 -0000 1.20
***************
*** 63,69 ****
</tr>
<tr valign="top">
! <th width="33%" scope="row"> Size of the writing box:</th>
<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php echo get_settings('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " />
! lines </td>
</tr>
<tr valign="top">
--- 63,69 ----
</tr>
<tr valign="top">
! <th width="33%" scope="row"> <?php _e('Size of the writing box:') ?></th>
<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php echo get_settings('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " />
! <?php _e('lines') ?></td>
</tr>
<tr valign="top">
***************
*** 96,101 ****
</fieldset>
<fieldset class="options">
! <legend><?php _e('Writing by Email') ?></legend>
! <p><?php printf(__('To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5)) ?></p>
<table width="100%" cellspacing="2" cellpadding="5" class="editform">
--- 96,101 ----
</fieldset>
<fieldset class="options">
! <legend><?php _e('Writing by e-mail') ?></legend>
! <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5)) ?></p>
<table width="100%" cellspacing="2" cellpadding="5" class="editform">
Index: options-misc.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-misc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** options-misc.php 11 Jun 2004 18:23:12 -0000 1.10
--- options-misc.php 13 Jun 2004 16:14:57 -0000 1.11
***************
*** 2,6 ****
require_once('../wp-includes/wp-l10n.php');
! $title = 'Miscellaneous Options';
$parent_file = 'options-general.php';
--- 2,6 ----
require_once('../wp-includes/wp-l10n.php');
! $title = __('Miscellaneous Options');
$parent_file = 'options-general.php';
Index: options.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** options.php 11 Jun 2004 18:23:12 -0000 1.24
--- options.php 13 Jun 2004 16:14:57 -0000 1.25
***************
*** 1,4 ****
<?php
! $title = 'Options';
$this_file = 'options.php';
$parent_file = 'options-general.php';
--- 1,6 ----
<?php
! require_once('../wp-includes/wp-l10n.php');
!
! $title = __('Options');
$this_file = 'options.php';
$parent_file = 'options-general.php';
Index: moderation.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/moderation.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** moderation.php 11 Jun 2004 18:23:12 -0000 1.11
--- moderation.php 13 Jun 2004 16:14:57 -0000 1.12
***************
*** 152,156 ****
echo "\n\t<li id='comment-$comment->comment_ID'>";
?>
! <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('Email:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_email) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
<?php comment_text() ?>
<p><?php
--- 152,156 ----
echo "\n\t<li id='comment-$comment->comment_ID'>";
?>
! <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_email) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
<?php comment_text() ?>
<p><?php
Index: edit-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-comments.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** edit-comments.php 11 Jun 2004 18:23:11 -0000 1.25
--- edit-comments.php 13 Jun 2004 16:14:57 -0000 1.26
***************
*** 35,39 ****
<input type="submit" name="submit" value="<?php _e('Search') ?>" />
<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
! <?php _e('(Searches within comment text, email, URI, and IP address.)') ?>
</fieldset>
</form>
--- 35,39 ----
<input type="submit" name="submit" value="<?php _e('Search') ?>" />
<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
! <?php _e('(Searches within comment text, e-mail, URI, and IP address.)') ?>
</fieldset>
</form>
***************
*** 80,84 ****
}
?>
! <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('Email:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_email) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
<?php comment_text() ?>
--- 80,84 ----
}
?>
! <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_email) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
<?php comment_text() ?>
***************
*** 114,118 ****
<th scope="col">*</th>
<th scope="col">' . __('Name') . '</th>
! <th scope="col">' . __('Email') . '</th>
<th scope="col">' . __('IP') . '</th>
<th scope="col">' . __('Comment Excerpt') . '</th>
--- 114,118 ----
<th scope="col">*</th>
<th scope="col">' . __('Name') . '</th>
! <th scope="col">' . __('E-mail') . '</th>
<th scope="col">' . __('IP') . '</th>
<th scope="col">' . __('Comment Excerpt') . '</th>
Index: options-permalink.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-permalink.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** options-permalink.php 11 Jun 2004 18:23:12 -0000 1.34
--- options-permalink.php 13 Jun 2004 16:14:57 -0000 1.35
***************
*** 90,94 ****
<p> In general for this you must use mod_rewrite, however if you put a filename at the beginning WordPress will attempt to use that to pass the arguments, for example:</p>
<p><code>/index.php/archives/%year%/%monthnum%/%day%/%postname%/</code> </p>
! <p>If you use this option you can ignore the mod_rewrite rules. </p>') ?>
<form name="form" action="options-permalink.php" method="post">
<p><?php _e('Use the template tags above to create a virtual site structure:') ?></p>
--- 90,94 ----
<p> In general for this you must use mod_rewrite, however if you put a filename at the beginning WordPress will attempt to use that to pass the arguments, for example:</p>
<p><code>/index.php/archives/%year%/%monthnum%/%day%/%postname%/</code> </p>
! <p>If you use this option you can ignore the mod_rewrite rules.</p>') ?>
<form name="form" action="options-permalink.php" method="post">
<p><?php _e('Use the template tags above to create a virtual site structure:') ?></p>
Index: profile.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/profile.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** profile.php 11 Jun 2004 18:23:12 -0000 1.23
--- profile.php 13 Jun 2004 16:14:58 -0000 1.24
***************
*** 65,69 ****
return false;
} else if (!is_email($_POST["newuser_email"])) {
! die (__("<strong>ERROR</strong>: the email address isn't correct"));
return false;
}
--- 65,69 ----
return false;
} else if (!is_email($_POST["newuser_email"])) {
! die (__("<strong>ERROR</strong>: the e-mail address isn't correct"));
return false;
}
***************
*** 158,162 ****
<p> <strong><?php _e('Nickname:') ?></strong> <?php echo $profiledata->user_nickname ?> </p>
! <p> <strong><?php _e('Email:') ?></strong> <?php echo make_clickable($profiledata->user_email) ?>
</p>
--- 158,162 ----
<p> <strong><?php _e('Nickname:') ?></strong> <?php echo $profiledata->user_nickname ?> </p>
! <p> <strong><?php _e('E-mail:') ?></strong> <?php echo make_clickable($profiledata->user_email) ?>
</p>
***************
*** 276,280 ****
</tr>
<tr>
! <th scope="row"><?php _e('Email:') ?></th>
<td><input type="text" name="newuser_email" id="newuser_email2" value="<?php echo $profiledata->user_email ?>" /></td>
</tr>
--- 276,280 ----
</tr>
<tr>
! <th scope="row"><?php _e('E-mail:') ?></th>
<td><input type="text" name="newuser_email" id="newuser_email2" value="<?php echo $profiledata->user_email ?>" /></td>
</tr>
Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** post.php 11 Jun 2004 18:23:12 -0000 1.66
--- post.php 13 Jun 2004 16:14:57 -0000 1.67
***************
*** 512,516 ****
echo "<table border=\"0\">\n";
echo "<tr><td>" . __('Author:') . "</td><td>" . $commentdata["comment_author"] . "</td></tr>\n";
! echo "<tr><td>" . __('E-Mail:') . "</td><td>" . $commentdata["comment_author_email"] . "</td></tr>\n";
echo "<tr><td>". __('URL:') . "</td><td>" . $commentdata["comment_author_url"] . "</td></tr>\n";
echo "<tr><td>". __('Comment:') . "</td><td>" . stripslashes($commentdata["comment_content"]) . "</td></tr>\n";
--- 512,516 ----
echo "<table border=\"0\">\n";
echo "<tr><td>" . __('Author:') . "</td><td>" . $commentdata["comment_author"] . "</td></tr>\n";
! echo "<tr><td>" . __('E-mail:') . "</td><td>" . $commentdata["comment_author_email"] . "</td></tr>\n";
echo "<tr><td>". __('URL:') . "</td><td>" . $commentdata["comment_author_url"] . "</td></tr>\n";
echo "<tr><td>". __('Comment:') . "</td><td>" . stripslashes($commentdata["comment_content"]) . "</td></tr>\n";
***************
*** 791,797 ****
?>
<div class="wrap">
! <?php printf(__('<p>Since you’re a newcomer, you’ll have to wait for an admin to raise your level to 1, in order to be authorized to post blog items.<br />
! You can also <a href="mailto:%s?subject=Blog posting permission">e-mail the admin</a> to ask for a promotion.<br />
! When you’re promoted, just reload this page and you’ll be able to blog. :)</p>'), get_settings('admin_email')); ?>
</div>
<?php
--- 791,798 ----
?>
<div class="wrap">
! <p><?php printf(__('Since you’re a newcomer, you’ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
! You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
! When you’re promoted, just reload this page and you’ll be able to blog. :)'), get_settings('admin_email')); ?>
! </p>
</div>
<?php
- Previous message: [wp-cvs]
wordpress index.php, 1.75, 1.76 wp-comments-popup.php, 1.12,
1.13 wp-comments.php, 1.20, 1.21 wp-login.php, 1.24, 1.25
- Next message: [wp-cvs] wordpress/wp-admin upgrade-functions.php,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list