[pLog-svn] r2444 - plog/trunk/locale

[reto at devel.plogworld.net]

Author: reto
Date: 2005-09-03 11:28:58 +0000 (Sat, 03 Sep 2005)
New Revision: 2444

Modified:
   plog/trunk/locale/locale_en_UK.php
Log:
ok, this is getting embarrassing. i'm not touching svn again today :/

Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php	2005-09-03 11:25:40 UTC (rev 2443)
+++ plog/trunk/locale/locale_en_UK.php	2005-09-03 11:28:58 UTC (rev 2444)
@@ -919,7 +919,7 @@
 $messages['blogs_purged_ok'] = 'Blogs purged successfully';
 $messages['help_use_http_accept_language_detection'] = 'Most web browsers such as Mozilla Firefox, Safari or Internet Explorer send at least one language code the user <i>should</i> understand. If this feature is activated, pLog tries to serve the user with the requested language if it\'s available. [Default = No]';
 
-<<<<<<< .mine
+
 $messages['error_invalid_blog_category'] = 'Invalid blog category';
 $messages['error_adding_blog_category'] = 'There was an error adding the blog category';
 $messages['newBlogCategory'] = 'New Blog Category';
@@ -931,6 +931,4 @@
 $messages['blog_categories_deleted_ok'] = '%s blog categories deleted successfully';
 $messages['error_deleting_blog_category2'] = 'There was an error removing the blog category with id %s';
 
-?>=======
 ?>
->>>>>>> .r2442