Lots of tiny message changes.

* Mostly punctuation updates so that the same message is used consistently in all of StatusNet.
* Some cases of "Title Case" removed, because that does not appear to be used consistently.

diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index 5b3f412adcd552833f0f3be4f9ef915573b8f767..5fbc46518b2f5ec884d2bad3b81c01a52ac25a15 100644 (file)
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -153,7 +153,7 @@ class ApiDirectMessageAction extends ApiAuthAction
             $this->showJsonDirectMessages();
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index 43673977073abbb23dd93e7c337f37e3d2d884fa..3618f940183d08f3303fe519d95d86ca312674b4 100644 (file)
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -96,7 +96,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -116,7 +116,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
 
         if ($this->user->hasFave($this->notice)) {
             $this->clientError(
-                _('This status is already a favorite!'),
+                _('This status is already a favorite.'),
                 403,
                 $this->format
             );

diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index f131d1c7f2c4a9c25b6f58f7f4a5288fa2d0077f..c4daf480e6f9bd5ab1cd812d0a9b45bbbf92eb1e 100644 (file)
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -97,7 +97,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -119,7 +119,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
 
         if (!$fave->find(true)) {
             $this->clientError(
-                _('That status is not a favorite!'),
+                _('That status is not a favorite.'),
                 403,
                 $this->favorite
             );

diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index a824e734bf89bcdefaac2d644a8aadf3bbb647e2..1de2cc32e0ba906362e8f5832fa9497910649d5d 100644 (file)
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -97,7 +97,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index 3d9b7e001cd304aae1986e792aa928fcb6b84e43..91c6fd032439e7bdc68c621fec5bcb64458ec4c1 100644 (file)
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -97,7 +97,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -117,7 +117,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
 
         if ($this->user->id == $this->other->id) {
             $this->clientError(
-                _("You cannot unfollow yourself!"),
+                _("You cannot unfollow yourself."),
                 403,
                 $this->format
             );

diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index 8fc436738862662daaa9853bfcecea5e97cee40f..73ecc9249a1d437c43aa5f74cefe6ed46f865294 100644 (file)
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -126,7 +126,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
         parent::handle($args);
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), 404);
+            $this->clientError(_('API method not found.'), 404);
             return;
         }
 

diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index 8827d1c5ce0774da30de682dd4a9fd0bb080ec25..028d76a7822a99c5bf2f3b6a46d9743280a4054a 100644 (file)
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -133,7 +133,7 @@ class ApiGroupCreateAction extends ApiAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 08348e97bd4306bc0e745243355a12783f865f85..69ead0b531af95c53f9cf82148eb5a3c19ddd30e 100644 (file)
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -111,7 +111,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 400,
                 $this->format
             );

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 4b718bce67b5f0b2e68937f558ed3836ef42bda0..3309d63e7b8b921bdd91cdb2d952917e8b291b88 100644 (file)
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -152,7 +152,7 @@ class ApiGroupJoinAction extends ApiAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 7321ff5d26b8ab95ff112eca87053b99492f090d..6f8d40527b7ecdae845c504f3fddf6871f5f1c68 100644 (file)
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -138,7 +138,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 4cf657579d6e7dcbff85d99c8ec71ecd7dbd391a..66b67a030e0899bf3aceb60e6ae568d748d6af59 100644 (file)
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -129,7 +129,7 @@ class ApiGroupListAction extends ApiBareAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index c597839a8823432fa5dcc0646b2c2369d214e5dc..1921c1f193f3396e4c5d42c2007515487b649280 100644 (file)
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -117,7 +117,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index dd2843161ac13668db300a9ce00cd6a1b3b2f8e6..3c7c8e88350de063c5adc051947997ed554c34cc 100644 (file)
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -103,7 +103,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index aae4d249c3e8ecb9cd80ee416b55288091425afb..7aa49b1bf37c71c77763ea781b199814eca6ed76 100644 (file)
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -102,7 +102,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
             $this->showSingleJsonGroup($this->group);
             break;
         default:
-            $this->clientError(_('API method not found!'), 404, $this->format);
+            $this->clientError(_('API method not found.'), 404, $this->format);
             break;
         }
 

diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index f2c459e6fd5ddc4db5c99d3dd434b2be143bbb1b..7b4017531cc73de9e5de3a516f8fa1ef67f9564b 100644 (file)
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -85,7 +85,7 @@ class ApiHelpTestAction extends ApiPrivateAuthAction
             $this->endDocument('json');
         } else {
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 8dc8793b53adc88ddb4faf3fb8c68bb4831a9140..f7d52f020813d5285bb5e2d42f2f46f833bba743 100644 (file)
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -99,7 +99,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
         parent::handle($args);
 
         if (!in_array($this->format, array('xml', 'json'))) {
-             $this->clientError(_('API method not found!'), $code = 404);
+             $this->clientError(_('API method not found.'), $code = 404);
              return;
         }
 

diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php
index 2efd59b37f9b75420f2514cc25e3e354987a50e6..f7a3dd60a0d075774a21d390311469b771759f85 100644 (file)
--- a/actions/apistatusesretweets.php
+++ b/actions/apistatusesretweets.php
@@ -109,7 +109,7 @@ class ApiStatusesRetweetsAction extends ApiAuthAction
             $this->showJsonTimeline($strm);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index e26c009c44520beb4aa0494dc38d18824790beab..0315d2953eac7604acdd161c9533b22c2df4504b 100644 (file)
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -105,7 +105,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
         parent::handle($args);
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             return;
         }
 

diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index ed1d151bfcfc5856a1f99832d91b3d79eaad6cef..ab96f2e5f9f27e1466ba66dc091a2fe8d62c850f 100644 (file)
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -130,7 +130,7 @@ class ApiStatusnetConfigAction extends ApiAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index bbf891a899847d0bdbc8ba224deefaabea47ce4d..5109cd8062090a677069a58c136cc001e461c9a1 100644 (file)
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -90,7 +90,7 @@ class ApiStatusnetVersionAction extends ApiPrivateAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 2c691bb84cf746296f699465fe171f8c94744718..0ba324057e753d84cd22463d13f51584f5de60e9 100644 (file)
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -108,7 +108,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
         parent::handle($args);
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             return;
         }
 

diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 700f6e0fdcd3051e7cda4b520f0eaa6952d9bac1..1027d97d440047f77c3401b9b446b070a974137f 100644 (file)
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -143,7 +143,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 9ec7447e64d317593c87d5bb81a083e5ceaf29bc..ef58b103c5406b35e297c64193d5f32e055f8f3e 100644 (file)
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -153,7 +153,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 22c577f397ba5072413767a3510018b586ece83d..af414c680403e557361d15ef3c9e1b554353bee4 100644 (file)
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -147,7 +147,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );

diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 5f5ea37b13dbe17d8a0cc9d342d4d5ae7342b671..828eae6cf6f912382f350afe2fe17ba716041bc9 100644 (file)
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -153,7 +153,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 19f40aebc9a818e582385b9a00154407c27e6044..9dc2162cc45fa738e8c368c0b8841f19ef3f677a 100644 (file)
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -148,7 +148,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 633f3c36e6b73e2510bf2b8c396674f944b8938a..3f4a46c0fa16e2bc6b55483d32304cce6e0807da 100644 (file)
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -128,7 +128,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelineretweetedbyme.php b/actions/apitimelineretweetedbyme.php
index 1e65678ad5bc4bc6fad9438bb3c8e26c01828505..88652c3fdc7955668f3658bc942ece5dfc339b5c 100644 (file)
--- a/actions/apitimelineretweetedbyme.php
+++ b/actions/apitimelineretweetedbyme.php
@@ -119,7 +119,7 @@ class ApiTimelineRetweetedByMeAction extends ApiAuthAction
             break;
 
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
index 681b0b9e9ed8e67d5d20dda76718925244f54ad1..113ab96d2c676474aaeb015c4edc3a19b7d4ac69 100644 (file)
--- a/actions/apitimelineretweetedtome.php
+++ b/actions/apitimelineretweetedtome.php
@@ -118,7 +118,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
             break;
 
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php
index 479bff431589b51d2e38dccc34e9b1ee1f84901e..6ca2c779cb9aade7514dd6991e69045a3d396047 100644 (file)
--- a/actions/apitimelineretweetsofme.php
+++ b/actions/apitimelineretweetsofme.php
@@ -119,7 +119,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
             break;
 
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 1a50520f4543ca11642baeebb6e52e73ceaf719a..1427d23b6a45d70e0f93f26292f11d25b8c4f1d1 100644 (file)
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -138,7 +138,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }

diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 14c62a52e7db10f8e0e31f266571dccd71c83161..830b16941dc8898ccfc0453ca23a2eb384203d85 100644 (file)
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -162,7 +162,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
 

diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index aa7aec5a414fe39e02c876a1bdf632189ba71ab8..a7fe0dcc1e2cddfa68a6f23038e53e7c7bcc4bc2 100644 (file)
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -98,7 +98,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction
         }
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             return;
         }
 

diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 934f14ec45250aedeb2787fc3e2e0387049a41a8..0b4caf5bf34e742928bba6aed4e3651a271e2a43 100644 (file)
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -70,14 +70,14 @@ class BlockedfromgroupAction extends GroupDesignAction
         }
 
         if (!$nickname) {
-            $this->clientError(_('No nickname'), 404);
+            $this->clientError(_('No nickname.'), 404);
             return false;
         }
 
         $this->group = User_group::staticGet('nickname', $nickname);
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            $this->clientError(_('No such group.'), 404);
             return false;
         }
 

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index ba8e86d0f495b7d4227b32ba1f0820b3cb3f471f..69cb1ebe87982e912dc41ba19d0d740ff0a8e303 100644 (file)
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -155,7 +155,7 @@ class DeletenoticeAction extends Action
 
         if (!$token || $token != common_session_token()) {
             $this->showForm(_('There was a problem with your session token. ' .
-                              ' Try again, please.'));
+                              'Try again, please.'));
             return;
         }
 

diff --git a/actions/editgroup.php b/actions/editgroup.php
index cf160803563ddc651459fe60393a4feb9aeadecb..ad0b6e185dcfe97c801a0787e382a4982bb21be6 100644 (file)
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -81,7 +81,7 @@ class EditgroupAction extends GroupDesignAction
         }
 
         if (!$nickname) {
-            $this->clientError(_('No nickname'), 404);
+            $this->clientError(_('No nickname.'), 404);
             return false;
         }
 
@@ -93,14 +93,14 @@ class EditgroupAction extends GroupDesignAction
         }
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            $this->clientError(_('No such group.'), 404);
             return false;
         }
 
         $cur = common_current_user();
 
         if (!$cur->isAdmin($this->group)) {
-            $this->clientError(_('You must be an admin to edit the group'), 403);
+            $this->clientError(_('You must be an admin to edit the group.'), 403);
             return false;
         }
 
@@ -165,7 +165,7 @@ class EditgroupAction extends GroupDesignAction
     {
         $cur = common_current_user();
         if (!$cur->isAdmin($this->group)) {
-            $this->clientError(_('You must be an admin to edit the group'), 403);
+            $this->clientError(_('You must be an admin to edit the group.'), 403);
             return;
         }
 

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 761aaa8f31f397bcd2dbb3fad24c4efa4bfefd83..bfef2970dabbe1bc4a352220009bc8976077de13 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -57,7 +57,7 @@ class EmailsettingsAction extends AccountSettingsAction
 
     function title()
     {
-        return _('Email Settings');
+        return _('Email settings');
     }
 
     /**
@@ -118,7 +118,7 @@ class EmailsettingsAction extends AccountSettingsAction
             } else {
                 $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
-                $this->input('email', _('Email Address'),
+                $this->input('email', _('Email address'),
                              ($this->arg('email')) ? $this->arg('email') : null,
                              _('Email address, like "UserName@example.org"'));
                 $this->elementEnd('li');
@@ -328,7 +328,7 @@ class EmailsettingsAction extends AccountSettingsAction
             return;
         }
         if (!Validate::email($email, common_config('email', 'check_domain'))) {
-            $this->showForm(_('Not a valid email address'));
+            $this->showForm(_('Not a valid email address.'));
             return;
         } else if ($user->email == $email) {
             $this->showForm(_('That is already your email address.'));

diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index f65bf511afb622d7d70b818f6b6d901f379da68a..5af7109cb4074c3da2670cec4fabb7384a870e4a 100644 (file)
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -71,7 +71,7 @@ class GroupbyidAction extends Action
         $id = $this->arg('id');
 
         if (!$id) {
-            $this->clientError(_('No ID'));
+            $this->clientError(_('No ID.'));
             return false;
         }
 
@@ -80,7 +80,7 @@ class GroupbyidAction extends Action
         $this->group = User_group::staticGet('id', $id);
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            $this->clientError(_('No such group.'), 404);
             return false;
         }
 

diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 1c998efe1e215772beb8e96facbd4084341ab7ff..e290ba5141e270ac8d4295bba1eb88872f0d53fd 100644 (file)
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -81,7 +81,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
         }
 
         if (!$nickname) {
-            $this->clientError(_('No nickname'), 404);
+            $this->clientError(_('No nickname.'), 404);
             return false;
         }
 
@@ -94,14 +94,14 @@ class GroupDesignSettingsAction extends DesignSettingsAction
         }
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            $this->clientError(_('No such group.'), 404);
             return false;
         }
 
         $cur = common_current_user();
 
         if (!$cur->isAdmin($this->group)) {
-            $this->clientError(_('You must be an admin to edit the group'), 403);
+            $this->clientError(_('You must be an admin to edit the group.'), 403);
             return false;
         }
 
@@ -284,7 +284,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
             if (empty($id)) {
                 common_log_db_error($id, 'INSERT', __FILE__);
-                $this->showForm(_('Unable to save your design settings!'));
+                $this->showForm(_('Unable to save your design settings.'));
                 return;
             }
 
@@ -294,7 +294,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
             if (empty($result)) {
                 common_log_db_error($original, 'UPDATE', __FILE__);
-                $this->showForm(_('Unable to save your design settings!'));
+                $this->showForm(_('Unable to save your design settings.'));
                 $this->group->query('ROLLBACK');
                 return;
             }

diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index a9dc7eb1d99a8e87adebf2e1f21e6c049f3e36f3..f197aef33ec489baf748ab2b17fbb5f1e90f1227 100644 (file)
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -83,7 +83,7 @@ class GrouplogoAction extends GroupDesignAction
         }
 
         if (!$nickname) {
-            $this->clientError(_('No nickname'), 404);
+            $this->clientError(_('No nickname.'), 404);
             return false;
         }
 
@@ -96,14 +96,14 @@ class GrouplogoAction extends GroupDesignAction
         }
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            $this->clientError(_('No such group.'), 404);
             return false;
         }
 
         $cur = common_current_user();
 
         if (!$cur->isAdmin($this->group)) {
-            $this->clientError(_('You must be an admin to edit the group'), 403);
+            $this->clientError(_('You must be an admin to edit the group.'), 403);
             return false;
         }
 
@@ -175,7 +175,7 @@ class GrouplogoAction extends GroupDesignAction
 
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            $this->serverError(_('User without matching profile'));
+            $this->serverError(_('User without matching profile.'));
             return;
         }
 

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 5c59594c56b20bdad0f243cb5a816fb6b6e2a2c4..0f47c268dd30eda6bd4094bc7acbca56c3259031 100644 (file)
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -73,14 +73,14 @@ class GroupmembersAction extends GroupDesignAction
         }
 
         if (!$nickname) {
-            $this->clientError(_('No nickname'), 404);
+            $this->clientError(_('No nickname.'), 404);
             return false;
         }
 
         $this->group = User_group::staticGet('nickname', $nickname);
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            $this->clientError(_('No such group.'), 404);
             return false;
         }
 

diff --git a/actions/imsettings.php b/actions/imsettings.php
index f57933b43f28473ac4bca190559df4ccf29c1698..751c6117cd1c3d4ca96f19e35a2d01a08a64666d 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -56,7 +56,7 @@ class ImsettingsAction extends ConnectSettingsAction
 
     function title()
     {
-        return _('IM Settings');
+        return _('IM settings');
     }
 
     /**
@@ -121,7 +121,7 @@ class ImsettingsAction extends ConnectSettingsAction
             } else {
                 $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
-                $this->input('jabber', _('IM Address'),
+                $this->input('jabber', _('IM address'),
                              ($this->arg('jabber')) ? $this->arg('jabber') : null,
                              sprintf(_('Jabber or GTalk address, '.
                                        'like "UserName@example.org". '.

diff --git a/actions/joingroup.php b/actions/joingroup.php
index 5ca34bd9ccb99dfc0b68c7521358863969d64c01..05e33e7cb13163812117b47852cc403e4488e976 100644 (file)
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -73,21 +73,21 @@ class JoingroupAction extends Action
         }
 
         if (!$nickname) {
-            $this->clientError(_('No nickname'), 404);
+            $this->clientError(_('No nickname.'), 404);
             return false;
         }
 
         $this->group = User_group::staticGet('nickname', $nickname);
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            $this->clientError(_('No such group.'), 404);
             return false;
         }
 
         $cur = common_current_user();
 
         if ($cur->isMember($this->group)) {
-            $this->clientError(_('You are already a member of that group'), 403);
+            $this->clientError(_('You are already a member of that group.'), 403);
             return false;
         }
 
@@ -125,7 +125,7 @@ class JoingroupAction extends Action
 
         if (!$result) {
             common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(sprintf(_('Could not join user %1$s to group %2$s'),
+            $this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'),
                                        $cur->nickname, $this->group->nickname));
         }
 

diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 250ade221eff031920a6b8a739de20552e4f2cf4..9ad7d6e7c821a247cdc1961e1cbed593dc785991 100644 (file)
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -129,7 +129,7 @@ class MakeadminAction extends Action
                                               'profile_id' => $this->profile->id));
 
         if (empty($member)) {
-            $this->serverError(_('Can\'t get membership record for %1$s in group %2$s'),
+            $this->serverError(_('Can\'t get membership record for %1$s in group %2$s.'),
                                $this->profile->getBestName(),
                                $this->group->getBestName());
         }
@@ -142,7 +142,7 @@ class MakeadminAction extends Action
 
         if (!$result) {
             common_log_db_error($member, 'UPDATE', __FILE__);
-            $this->serverError(_('Can\'t make %1$s an admin for group %2$s'),
+            $this->serverError(_('Can\'t make %1$s an admin for group %2$s.'),
                                $this->profile->getBestName(),
                                $this->group->getBestName());
         }

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 350452091378203c7967b87c38cd48248f1cee9f..25e58feab30c294ec6ef7bec4857a29de5316760 100644 (file)
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -182,7 +182,7 @@ class NewmessageAction extends Action
             $this->elementEnd('head');
             $this->elementStart('body');
             $this->element('p', array('id' => 'command_result'),
-                sprintf(_('Direct message to %s sent'),
+                sprintf(_('Direct message to %s sent.'),
                     $this->other->nickname));
             $this->elementEnd('body');
             $this->elementEnd('html');

diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index d39c7c449ae81b834178f09b9bc6c673c88774c2..3779fcfaaaeb94c90bd4dc47c4d47be23386524f 100644 (file)
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -305,7 +305,7 @@ class PathsAdminPanelForm extends AdminForm
         $this->unli();
 
         $this->li();
-        $this->input('sslserver', _('SSL Server'),
+        $this->input('sslserver', _('SSL server'),
                      _('Server to direct SSL requests to'), 'site');
         $this->unli();
         $this->out->elementEnd('ul');

diff --git a/actions/showgroup.php b/actions/showgroup.php
index c0de4c653bd55d7170057f8269d79b14f30d42eb..06ae572e8107efd72ff30d82449fae612de7bd0c 100644 (file)
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -118,7 +118,7 @@ class ShowgroupAction extends GroupDesignAction
         }
 
         if (!$nickname) {
-            $this->clientError(_('No nickname'), 404);
+            $this->clientError(_('No nickname.'), 404);
             return false;
         }
 
@@ -134,7 +134,7 @@ class ShowgroupAction extends GroupDesignAction
                 common_redirect(common_local_url('groupbyid', $args), 301);
                 return false;
             } else {
-                $this->clientError(_('No such group'), 404);
+                $this->clientError(_('No such group.'), 404);
                 return false;
             }
         }

diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 5e29f4c19124bae6df47c0211d3944361bca2ebd..dd388a18a2f1c6ac757b9196fcb59b85329d95bd 100644 (file)
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -151,10 +151,10 @@ class SiteadminpanelAction extends AdminPanelAction
         $values['site']['email'] = common_canonical_email($values['site']['email']);
 
         if (empty($values['site']['email'])) {
-            $this->clientError(_('You must have a valid contact email address'));
+            $this->clientError(_('You must have a valid contact email address.'));
         }
         if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) {
-            $this->clientError(_('Not a valid email address'));
+            $this->clientError(_('Not a valid email address.'));
         }
 
         // Validate timezone
@@ -169,7 +169,7 @@ class SiteadminpanelAction extends AdminPanelAction
 
         if (!is_null($values['site']['language']) &&
             !in_array($values['site']['language'], array_keys(get_nice_language_list()))) {
-            $this->clientError(sprintf(_('Unknown language "%s"'), $values['site']['language']));
+            $this->clientError(sprintf(_('Unknown language "%s".'), $values['site']['language']));
         }
 
         // Validate report URL

diff --git a/actions/smssettings.php b/actions/smssettings.php
index 672abcef8c15587e0eda8e089578e4bbea496c0a..751495d57aad809a548ad990a9a63bc251073ddc 100644 (file)
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -55,7 +55,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
     function title()
     {
-        return _('SMS Settings');
+        return _('SMS settings');
     }
 
     /**
@@ -135,7 +135,7 @@ class SmssettingsAction extends ConnectSettingsAction
             } else {
                 $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
-                $this->input('sms', _('SMS Phone number'),
+                $this->input('sms', _('SMS phone number'),
                              ($this->arg('sms')) ? $this->arg('sms') : null,
                              _('Phone number, no punctuation or spaces, '.
                                'with area code'));

diff --git a/actions/tagother.php b/actions/tagother.php
index e9e13b939b10d31946bb8b6e088a4b530a5283d8..735d876da29bb70dfefb0c2acec50ef13d092740 100644 (file)
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -163,8 +163,8 @@ class TagotherAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->showForm(_('There was a problem with your session token.'.
-                              ' Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 4a5863489ec7249d54f3011b82a75dab17d63c8b..dbb4e41538fbc8ccda75f1d74ee698e69c65de32 100644 (file)
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -81,7 +81,7 @@ class UnsubscribeAction extends Action
         $other = Profile::staticGet('id', $other_id);
 
         if (!$other) {
-            $this->clientError(_('No profile with that id.'));
+            $this->clientError(_('No profile with that ID.'));
             return;
         }
 

diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 31a097970dc6bd5f63024c783c53156694a78311..1cf87800069f531440800d7661bd362279e6bdeb 100644 (file)
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -207,7 +207,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
 
             if (empty($id)) {
                 common_log_db_error($id, 'INSERT', __FILE__);
-                $this->showForm(_('Unable to save your design settings!'));
+                $this->showForm(_('Unable to save your design settings.'));
                 return;
             }
 
@@ -217,7 +217,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
 
             if (empty($result)) {
                 common_log_db_error($original, 'UPDATE', __FILE__);
-                $this->showForm(_('Unable to save your design settings!'));
+                $this->showForm(_('Unable to save your design settings.'));
                 $user->query('ROLLBACK');
                 return;
             }
@@ -260,7 +260,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
 
         if (empty($id)) {
             common_log_db_error($id, 'INSERT', __FILE__);
-            $this->showForm(_('Unable to save your design settings!'));
+            $this->showForm(_('Unable to save your design settings.'));
             return;
         }
 
@@ -270,7 +270,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
 
         if (empty($result)) {
             common_log_db_error($original, 'UPDATE', __FILE__);
-            $this->showForm(_('Unable to save your design settings!'));
+            $this->showForm(_('Unable to save your design settings.'));
             $user->query('ROLLBACK');
             return;
         }

diff --git a/lib/command.php b/lib/command.php
index 080d83959f137c038776c778ae9b361160e9ba84..5a1a8bf33af6c333bbdc8f21d58c2c57821cbbc8 100644 (file)
--- a/lib/command.php
+++ b/lib/command.php
@@ -315,7 +315,7 @@ class WhoisCommand extends Command
         $whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
                          $recipient->profileurl);
         if ($recipient->fullname) {
-            $whois .= "\n" . sprintf(_('Fullname: %s'), $recipient->fullname);
+            $whois .= "\n" . sprintf(_('Full name: %s'), $recipient->fullname);
         }
         if ($recipient->location) {
             $whois .= "\n" . sprintf(_('Location: %s'), $recipient->location);

diff --git a/lib/common.php b/lib/common.php
index fb5e5919e054037de16f4c499ef2cd83b3f0be96..7342c177a66091bacfef35a22ab960f4b9f6ebf7 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -197,7 +197,7 @@ function _have_config()
 // XXX: Find a way to use htmlwriter for this instead of handcoded markup
 if (!_have_config()) {
   echo '<p>'. _('No configuration file found. ') .'</p>';
-  echo '<p>'. _('I looked for configuration files in the following places: ') .'<br/> '. implode($_config_files, '<br/>');
+  echo '<p>'. _('I looked for configuration files in the following places: ') .'<br /> '. implode($_config_files, '<br />');
   echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
   echo '<a href="install.php">'. _('Go to the installer.') .'</a>';
   exit;

diff --git a/lib/mail.php b/lib/mail.php
index 472a88e061c117a21121ef70f0525b030a736f60..c724764cc8fc5f28cc35ca78bc6ebbc0e5a2e711 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -251,11 +251,11 @@ function mail_subscribe_notify_profile($listenee, $other)
                         common_config('site', 'name'),
                         $other->profileurl,
                         ($other->location) ?
-                        sprintf(_("Location: %s\n"), $other->location) : '',
+                        sprintf(_("Location: %s"), $other->location) . "\n" : '',
                         ($other->homepage) ?
-                        sprintf(_("Homepage: %s\n"), $other->homepage) : '',
+                        sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '',
                         ($other->bio) ?
-                        sprintf(_("Bio: %s\n\n"), $other->bio) : '',
+                        sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '',
                         common_config('site', 'name'),
                         common_local_url('emailsettings'));
 
@@ -652,4 +652,3 @@ function mail_notify_attn($user, $notice)
     common_init_locale();
     mail_to_user($user, $subject, $body);
 }
-

diff --git a/lib/mediafile.php b/lib/mediafile.php
index 29d752f0c6c9a8489e7b209ea356af9677e07a07..e3d5b1dbcc40a1a7cbf58af5d4c316ff221f5af9 100644 (file)
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -176,7 +176,7 @@ class MediaFile
             // Should never actually get here
 
             @unlink($_FILES[$param]['tmp_name']);
-            throw new ClientException(_('File exceeds user\'s quota!'));
+            throw new ClientException(_('File exceeds user\'s quota.'));
             return;
         }
 
@@ -198,7 +198,7 @@ class MediaFile
             }
 
         } else {
-            throw new ClientException(_('Could not determine file\'s mime-type!'));
+            throw new ClientException(_('Could not determine file\'s MIME type.'));
             return;
         }
 
@@ -213,7 +213,7 @@ class MediaFile
 
             // Should never actually get here
 
-            throw new ClientException(_('File exceeds user\'s quota!'));
+            throw new ClientException(_('File exceeds user\'s quota.'));
             return;
         }
 
@@ -234,7 +234,7 @@ class MediaFile
                     $stream['uri'] . ' ' . $filepath));
             }
         } else {
-            throw new ClientException(_('Could not determine file\'s mime-type!'));
+            throw new ClientException(_('Could not determine file\'s MIME type.'));
             return;
         }
 
@@ -272,7 +272,7 @@ class MediaFile
             $hint = '';
         }
         throw new ClientException(sprintf(
-            _('%s is not a supported filetype on this server.'), $filetype) . $hint);
+            _('%s is not a supported file type on this server.'), $filetype) . $hint);
     }
 
     static function respectsQuota($user, $filesize)
@@ -286,4 +286,4 @@ class MediaFile
         }
     }
 
-}
\ No newline at end of file
+}

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 89f63e32116f37a14838f123e2e412004838a234..e1207774fd9bdbff91e93fe739c09a4426b54843 100644 (file)
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -123,7 +123,7 @@ class SubscriptionListItem extends ProfileListItem
             }
             $this->out->elementEnd('ul');
         } else {
-            $this->out->text(_('(none)'));
+            $this->out->text(_('(None)'));
         }
         $this->out->elementEnd('dd');
         $this->out->elementEnd('dl');

diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 20105b602e94da6995de987a80e7188a1041967b..cef9c4bd074e7d049e25ddf2d8281726cd36b78d 100755 (executable)
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -298,7 +298,7 @@ class XMPPDaemon extends Daemon
         $content_shortened = common_shorten_links($body);
         if (Notice::contentTooLong($content_shortened)) {
           $from = jabber_normalize_jid($pl['from']);
-          $this->from_site($from, sprintf(_("Message too long - maximum is %d characters, you sent %d"),
+          $this->from_site($from, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
                                           Notice::maxContent(),
                                           mb_strlen($content_shortened)));
           return;