Merge some gettext strings to one line so translation tools are happier

darcs-hash:20080713044608-533db-ee16aecee9b6d82b22ce6a25f6a9573c23eee9f8.gz

diff --git a/actions/avatar.php b/actions/avatar.php
index 1029abd1e6286a4fba5f2da02c7a8404661cacde..ebfbd72952e9d1bec9ec315d3c958c948de38e4b 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -24,12 +24,7 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 class AvatarAction extends SettingsAction {
 
     function get_instructions() {
-               return _('Upload a new "avatar" (user image) here. ' .
-                                 'You can\'t edit the picture after you upload it, so ' .
-                                 'make sure it\'s more or less square. ' .
-                                 'It must be under the site license, also. ' .
-                                 'Use a picture that belongs to you and that you ' .
-                                 'want to share.');
+               return _('Upload a new "avatar" (user image) here. You can\'t edit the picture after you upload it, so make sure it\'s more or less square. It must be under the site license, also. Use a picture that belongs to you and that you want to share.');
        }
 
        function show_form($msg=NULL, $success=false) {

diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 36af83840cee34c0963915ebf41ae0699baea3a3..2f0020cedf9c170ac1f3abc182240c9e001349dc 100644 (file)
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -53,11 +53,7 @@ class FinishopenidloginAction extends Action {
                } else {
                        global $config;
                        common_element('div', 'instructions',
-                                                  sprintf(_('This is the first time you\'ve logged into %s' .
-                                    ' so we must connect your OpenID to a local account. ' .
-                                    ' You can either create a new account, or connect with ' .
-                                    ' your existing account, if you have one.'
-                                    ), $config['site']['name']));
+                                                  sprintf(_('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), $config['site']['name']));
                }
        }
 
@@ -89,8 +85,7 @@ class FinishopenidloginAction extends Action {
                common_element('h2', NULL,
                                           _('Connect existing account'));
                common_element('p', NULL,
-                                          _('If you already have an account, login with your username and password '.
-                                                 'to connect it to your OpenID.'));
+                                          _('If you already have an account, login with your username and password to connect it to your OpenID.'));
                common_input('nickname', _('Existing nickname'));
                common_password('password', _('Password'));
                common_submit('connect', _('Connect'));

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 1bc9a0281f5398e43739fabb342bc57f9d31f26b..8b30d418cc368dbecf4297a812fbf3dc87db103d 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -25,9 +25,7 @@ require_once(INSTALLDIR.'/lib/jabber.php');
 class ImsettingsAction extends SettingsAction {
 
        function get_instructions() {
-               return _('You can send and receive notices through '.
-                               'Jabber/GTalk [instant messages](%%doc.im%%). Configure '.
-                               'your address and settings below.');
+               return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.');
        }
 
        function show_form($msg=NULL, $success=false) {
@@ -56,17 +54,15 @@ class ImsettingsAction extends SettingsAction {
                                common_element('span', 'input_instructions',
                                              sprintf(_('Awaiting confirmation on this address. Check your ' .
                                                'Jabber/GTalk account for a message with further ' .
-                                               'instructions. (Did you add %s to your buddy list?)'),
-                                 jabber_daemon_address()));
+                                               'instructions. (Did you add %s to your buddy list?)',
+                                 jabber_daemon_address())));
                                common_hidden('jabber', $confirm->address);
                                common_element_end('p');
                                common_submit('cancel', _('Cancel'));
                        } else {
                                common_input('jabber', _('IM Address'),
                                                        ($this->arg('jabber')) ? $this->arg('jabber') : NULL,
-                                                sprintf(_('Jabber or GTalk address, like "UserName@example.org". ' .
-                                                   'First, make sure to add %s' .
-                              ' to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
+                                                sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
                                common_submit('add', _('Add'));
                        }
                }
@@ -191,8 +187,7 @@ class ImsettingsAction extends SettingsAction {
                                                                   $jabber);
                }
 
-               $msg = sprintf(_('A confirmation code was sent to the IM address you added. ' .
-                       'You must approve %s for sending messages to you.'), jabber_daemon_address());
+               $msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address());
 
                $this->show_form($msg, TRUE);
        }

diff --git a/actions/login.php b/actions/login.php
index 0f2dec1a41e38ba9403f4eedcde91b9a0b83e7ed..003d6613f7425f6c954341aa01fca3d35e2cbc13 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -109,21 +109,10 @@ class LoginAction extends Action {
        }
 
        function get_instructions() {
-               if (common_logged_in() &&
-                       !common_is_real_login() &&
-                       common_get_returnto())
-               {
-                       # rememberme logins have to reauthenticate before
-                       # changing any profile settings (cookie-stealing protection)
-                       return _('For security reasons, please re-enter your ' .
-                                        'user name and password ' .
-                                        'before changing your settings.');
-               } else {
-                       return _('Login with your username and password. ' .
-                                        'Don\'t have a username yet? ' .
-                                        '[Register](%%action.register%%) a new account, or ' .
-                                        'try [OpenID](%%action.openidlogin%%). ');
-               }
+               return _('Login with your username and password. ' .
+                                 'Don\'t have a username yet? ' .
+                                 '[Register](%%action.register%%) a new account, or ' .
+                                 'try [OpenID](%%action.openidlogin%%). ');
        }
 
        function show_top($error=NULL) {

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 107665fb79d90719c40ec9782b2e658f4670c8a9..a98829cd87f32d6005045289ee1bc6c4877c915a 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -54,7 +54,7 @@ class NewnoticeAction extends Action {
                }
 
                $notice->rendered = common_render_content($notice->content, $notice);
-               
+
                $id = $notice->insert();
 
                if (!$id) {

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index ab383fab436152cdb42f3f37a40275f9b0ede2d3..29de0ad7cae17f3c0588f642d3f254981dee9beb 100644 (file)
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -27,8 +27,7 @@ define(NOTICES_PER_PAGE, 20);
 class NoticesearchAction extends SearchAction {
 
        function get_instructions() {
-               return _('Search for notices on %%site.name%% by their contents. ' .
-                                 'Separate search terms by spaces; they must be 3 characters or more.');
+               return _('Search for notices on %%site.name%% by their contents. Separate search terms by spaces; they must be 3 characters or more.');
        }
 
        function get_title() {

diff --git a/actions/register.php b/actions/register.php
index 28b122bc98a2275df547e5f469f5ddedf0994ac1..02677d241235986f5817c62a2223b7defbbe4299 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -181,8 +181,7 @@ class RegisterAction extends Action {
                common_input('email', _('Email'), NULL,
                                         _('Used only for updates, announcements, and password recovery'));
                common_checkbox('rememberme', _('Remember me'), false,
-                               _('Automatically login in the future; ' .
-                                  'not for shared computers!'));
+                               _('Automatically login in the future; not for shared computers!'));
                common_element_start('p');
                common_element('input', array('type' => 'checkbox',
                                                                          'id' => 'license',

diff --git a/lib/util.php b/lib/util.php
index c1fc8c78105f76dad2f2f4098db495a9158b3216..f7b66c07df40532659afd55258c4f6de07c62074 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -234,11 +234,7 @@ function common_show_footer() {
        } else {
                $instr = _('**%%site.name%%** is a microblogging service. ');
        }
-       $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) ' .
-                        'microblogging software, version %s, ' .
-                        'available under the ' .
-                        '[GNU Affero General Public License]' .
-                        '(http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
+       $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
     $output = common_markup_to_html($instr);
     common_raw($output);
        common_element_end('div');
@@ -1062,7 +1058,7 @@ function common_log($priority, $msg, $filename=NULL) {
        if ($logfile) {
                $log = fopen($logfile, "a");
                if ($log) {
-                       static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR', 
+                       static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR',
                                                                                          'LOG_WARNING', 'LOG_NOTICE', 'LOG_INFO', 'LOG_DEBUG');
                        $output = date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n";
                        fwrite($log, $output);