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

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

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. ' .
+		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.');
-				  '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) {

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' .
+						   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']));
-                                    ' 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 '.
+					   _('If you already have an account, login with your username and password to connect it to your OpenID.'));
-						  'to connect it to your OpenID.'));
 		common_input('nickname', _('Existing nickname'));
 		common_password('password', _('Password'));
 		common_submit('connect', _('Connect'));

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 '.
+		return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.');
-		   		'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?)'),
+			  	                'instructions. (Did you add %s to your buddy list?)',
-                                 jabber_daemon_address()));
+                                 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". ' .
+						 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()));
-						    '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. ' .
+		$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());
-			'You must approve %s for sending messages to you.'), jabber_daemon_address());
 
 		$this->show_form($msg, TRUE);
 	}

actions/login.php

@@ -109,21 +109,10 @@ class LoginAction extends Action {
 	}
 
 	function get_instructions() {
-		if (common_logged_in() &&
+		return _('Login with your username and password. ' .
-			!common_is_real_login() &&
+				  'Don\'t have a username yet? ' .
-			common_get_returnto())
+				  '[Register](%%action.register%%) a new account, or ' .
-		{
+				  'try [OpenID](%%action.openidlogin%%). ');
-			# 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%%). ');
-		}
 	}
 
 	function show_top($error=NULL) {

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. ' .
+		return _('Search for notices on %%site.name%% by their contents. Separate search terms by spaces; they must be 3 characters or more.');
-				  'Separate search terms by spaces; they must be 3 characters or more.');
 	}
 
 	function get_title() {

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; ' .
+		                _('Automatically login in the future; not for shared computers!'));
-		                   'not for shared computers!'));
 		common_element_start('p');
 		common_element('input', array('type' => 'checkbox',
 									  'id' => 'license',

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/) ' .
+	$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);
-		         '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');