tags: rename OP_MAIN_MODIFY_LABEL/TAGS

diff --git a/curs_main.c b/curs_main.c
index 5ac152ff182dd9c28cbc21bbcfb64b6170899d7f..2f522c4d4a67aca5c08c983ec8764fc9cab33a83 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -1854,8 +1854,8 @@ int mutt_index_menu(void)
       }
 
 #endif
-      case OP_MAIN_MODIFY_LABELS:
-      case OP_MAIN_MODIFY_LABELS_THEN_HIDE:
+      case OP_MAIN_MODIFY_TAGS:
+      case OP_MAIN_MODIFY_TAGS_THEN_HIDE:
       {
         if (!Context || ((Context->magic != MUTT_NOTMUCH) && (Context->magic != MUTT_IMAP)))
         {
@@ -1871,7 +1871,7 @@ int mutt_index_menu(void)
           break;
         else if (rc == 0)
         {
-          mutt_message(_("No label specified, aborting."));
+          mutt_message(_("No tag specified, aborting."));
           break;
         }
 
@@ -1883,7 +1883,7 @@ int mutt_index_menu(void)
 
           if (!Context->quiet)
           {
-            snprintf(msgbuf, sizeof(msgbuf), _("Update labels..."));
+            snprintf(msgbuf, sizeof(msgbuf), _("Update tags..."));
             mutt_progress_init(&progress, msgbuf, MUTT_PROGRESS_MSG, 1, Context->tagged);
           }
 
@@ -1898,7 +1898,7 @@ int mutt_index_menu(void)
               if (!Context->quiet)
                 mutt_progress_update(&progress, ++px, -1);
               hdr_tags_commit(Context, Context->hdrs[Context->v2r[j]], buf);
-              if (op == OP_MAIN_MODIFY_LABELS_THEN_HIDE)
+              if (op == OP_MAIN_MODIFY_TAGS_THEN_HIDE)
               {
                 bool still_queried = false;
 #ifdef USE_NOTMUCH
@@ -1921,10 +1921,10 @@ int mutt_index_menu(void)
         {
           if (hdr_tags_commit(Context, CURHDR, buf))
           {
-            mutt_message(_("Failed to modify labels, aborting."));
+            mutt_message(_("Failed to modify tags, aborting."));
             break;
           }
-          if (op == OP_MAIN_MODIFY_LABELS_THEN_HIDE)
+          if (op == OP_MAIN_MODIFY_TAGS_THEN_HIDE)
           {
             CURHDR->quasi_deleted = true;
             Context->changed = true;

diff --git a/functions.h b/functions.h
index 36b0faebccc2c56f53b244383ba31bb9b7e212f1..0f4ab849af079d5640b65275e2501e48fe5b9356 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -213,8 +213,8 @@ const struct Binding OpMain[] = { /* map: index */
   { "sidebar-toggle-virtual",    OP_SIDEBAR_TOGGLE_VIRTUAL,         NULL },
   { "sidebar-toggle-visible",    OP_SIDEBAR_TOGGLE_VISIBLE,         NULL },
 #endif
-  { "modify-labels",             OP_MAIN_MODIFY_LABELS,             NULL },
-  { "modify-labels-then-hide",   OP_MAIN_MODIFY_LABELS_THEN_HIDE,   NULL },
+  { "modify-labels",             OP_MAIN_MODIFY_TAGS,             NULL },
+  { "modify-labels-then-hide",   OP_MAIN_MODIFY_TAGS_THEN_HIDE,   NULL },
 
 #ifdef USE_NOTMUCH
   { "change-vfolder",            OP_MAIN_CHANGE_VFOLDER,            NULL },
@@ -350,8 +350,8 @@ const struct Binding OpPager[] = { /* map: pager */
   { "sidebar-toggle-virtual",    OP_SIDEBAR_TOGGLE_VIRTUAL,       NULL },
   { "sidebar-toggle-visible",    OP_SIDEBAR_TOGGLE_VISIBLE,       NULL },
 #endif
-  { "modify-labels",             OP_MAIN_MODIFY_LABELS,           NULL },
-  { "modify-labels-then-hide",   OP_MAIN_MODIFY_LABELS_THEN_HIDE, NULL },
+  { "modify-labels",             OP_MAIN_MODIFY_TAGS,           NULL },
+  { "modify-labels-then-hide",   OP_MAIN_MODIFY_TAGS_THEN_HIDE, NULL },
 
 #ifdef USE_NOTMUCH
   { "change-vfolder",            OP_MAIN_CHANGE_VFOLDER,          NULL },

diff --git a/opcodes.h b/opcodes.h
index b266a9345306870e6c4a66f9d90465935c058650..2187b8997a87eba6d6af6d1ce0a00c5f090c7c2a 100644 (file)
--- a/opcodes.h
+++ b/opcodes.h
@@ -234,8 +234,8 @@
   _fmt(OP_MAIN_SHOW_LIMIT,                N_("show currently active limit pattern")) \
   _fmt(OP_MAIN_COLLAPSE_THREAD,           N_("collapse/uncollapse current thread")) \
   _fmt(OP_MAIN_COLLAPSE_ALL,              N_("collapse/uncollapse all threads")) \
-  _fmt(OP_MAIN_MODIFY_LABELS,             N_("modify (notmuch) tags")) \
-  _fmt(OP_MAIN_MODIFY_LABELS_THEN_HIDE,   N_("modify labels and then hide message")) \
+  _fmt(OP_MAIN_MODIFY_TAGS,             N_("modify (notmuch/imap) tags")) \
+  _fmt(OP_MAIN_MODIFY_TAGS_THEN_HIDE,   N_("modify (notmuch/imap) tags and then hide message")) \
 
 #define OPS_CRYPT(_fmt) \
   _fmt(OP_DECRYPT_SAVE,                   N_("make decrypted copy and delete")) \