Index: gotwo.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gotwo/gotwo.module,v
retrieving revision 1.5.2.2
diff -u -p -r1.5.2.2 gotwo.module
--- gotwo.module	29 Oct 2007 17:22:12 -0000	1.5.2.2
+++ gotwo.module	30 Oct 2007 17:00:01 -0000
@@ -101,8 +101,8 @@ function gotwo_menu($may_cache) {
       'type' => MENU_CALLBACK
     );
     $items[] = array(
-      'path' => 'admin/build/gotwo/remove', 
-      'callback' => '__gotwo_remove_page',
+      'path' => 'admin/build/gotwo/delete', 
+      'callback' => '__gotwo_delete_page',
       'access' => user_access('edit entries'),
       'type' => MENU_CALLBACK
     );
@@ -380,7 +380,7 @@ function __gotwo_list() {
         $go->cnt
       )
     );
-    if (user_access('edit entries')) $rows[$i]['data'][] = l(t('reset'), 'admin/build/gotwo/reset/'.$go->gid, array('title' => t('Reset the counter'))).' '.l(t('remove'), 'admin/build/gotwo/remove/'.$go->gid);
+    if (user_access('edit gotwo entries')) $rows[$i]['data'][] = l(t('reset'), 'admin/build/gotwo/reset/'.$go->gid, array('title' => t('Reset the counter'))).' | '.l(t('delete'), 'admin/build/gotwo/delete/'.$go->gid);
   }
 
   if (!$rows) {
@@ -404,8 +404,8 @@ function __gotwo_reset($gid) {
 /**
  * Remove a go entry
  */
-function __gotwo_remove_page($gid) {
-	return drupal_get_form('__gotwo_remove',$gid);
+function __gotwo_delete_page($gid) {
+	return drupal_get_form('__gotwo_delete',$gid);
 }
 
 /**
@@ -413,11 +413,11 @@ function __gotwo_remove_page($gid) {
 * All forms are located below here
 */
 
-function __gotwo_remove($gid){
+function __gotwo_delete($gid){
   $res = db_fetch_object(db_query('SELECT * FROM {gotwo} WHERE gid = %d', $gid));
   $form['gid'] = array('#type' => 'value', '#value' => $gid);
   return confirm_form( $form,
-    t('Are you sure you want to remove the go entry with the label %label ?', array('%label' => theme('placeholder', $res->src))), 
+    t('Are you sure you want to delete the go entry with the label %label ?', array('%label' => $res->src)), 
     'admin/build/gotwo', t('This action cannot be undone. The link will become broken, a new one might be automatically created when a node linking to it is edited.'),
     t('Delete'), t('Cancel'));
 }
@@ -426,7 +426,7 @@ function __gotwo_remove($gid){
 /**
  * Remove entry form submitted
  */
-function __gotwo_remove_submit($form_id, $form_values) {
+function __gotwo_delete_submit($form_id, $form_values) {
   if ($form_values['confirm']) {
     db_query('DELETE FROM {gotwo} WHERE gid = %d', $form_values['gid']);
   }