conflict resolving for plugin manager update

darcs-hash:20060131211639-7ad00-910dc1d06c7375284fc351376c4a6af49dc41c27.gz

lib/plugins/plugin/lang/en/lang.php

@@ -9,8 +9,6 @@
 $lang['menu'] = 'Manage Plugins'; 
 
 // custom language strings for the plugin
-$lang['refresh'] = "Refresh list of installed plugins";
-$lang['refresh_x'] = "Use this option if you have altered any of your plugins manually"; 
 $lang['download'] = "Download and install a new plugin";
 $lang['manage'] = "Installed Plugins";
 
@@ -18,7 +16,6 @@ $lang['btn_info'] = 'info';
 $lang['btn_update'] = 'update';
 $lang['btn_delete'] = 'delete';
 $lang['btn_settings'] = 'settings';
-$lang['btn_refresh'] = 'Refresh';
 $lang['btn_download'] = 'Download';
 
 $lang['url']              = 'URL';
@@ -31,9 +28,6 @@ $lang['unknown']          = 'unknown';
 // ..ing = header message
 // ..ed = success message
 
-$lang['refreshing'] = 'Refreshing ...';
-$lang['refreshed'] = 'Plugin refresh completed.';
-
 $lang['updating']         = 'Updating ...';
 $lang['updated']          = 'Plugin %s updated successfully';
 $lang['updates']          = 'The following plugins have been updated successfully';
@@ -74,4 +68,4 @@ $lang['error_copy']       = 'There was a file copy error while attempting to ins
 $lang['error_delete']     = 'There was an error while attempting to delete plugin <em>%s</em>.  '.
                             'The most probably cause is insufficient file or directory access permissions';
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
\ No newline at end of file
+//Setup VIM: ex: et ts=4 enc=utf-8 :