From 9d58ffdafa0f25c0c2c28cdcddbd82ec6354b970 Mon Sep 17 00:00:00 2001
From: Alexandre Franke <afranke@gnome.org>
Date: Sat, 2 Nov 2024 17:20:27 +0100
Subject: [PATCH] strings: harmonize drag-and-drop spelling

---
 data/org.gnome.evolution.calendar.gschema.xml.in | 2 +-
 data/org.gnome.evolution.mail.gschema.xml.in     | 8 ++++----
 src/mail/mail-config.ui                          | 4 ++--
 src/modules/calendar/e-calendar-preferences.ui   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in
index e7358a9125..d6a0fa63e3 100644
--- a/data/org.gnome.evolution.calendar.gschema.xml.in
+++ b/data/org.gnome.evolution.calendar.gschema.xml.in
@@ -526,7 +526,7 @@
     </key>
     <key name="allow-event-dnd" type="b">
       <default>true</default>
-      <_summary>Allow drag and drop of events in the Calendar.</_summary>
+      <_summary>Allow drag-and-drop of events in the Calendar.</_summary>
       <_description>This influences the Day view, the Work Week view, the Week view and the Month view.</_description>
     </key>
     <key name="send-reminder-with-event" type="b">
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index ff664b353a..12af89d23b 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -649,13 +649,13 @@
     </key>
     <key name="prompt-on-folder-drop-copy" type="s">
       <default>'ask'</default>
-      <_summary>Asks whether to copy a folder by drag &amp; drop in the folder tree</_summary>
-      <_description>Possible values are: “never” — do not allow copy with drag &amp; drop of folders in folder tree, “always” — allow copy with drag &amp; drop of folders in folder tree without asking, or “ask” — (or any other value) will ask user.</_description>
+      <_summary>Asks whether to copy a folder by drag-and-drop in the folder tree</_summary>
+      <_description>Possible values are: “never” — do not allow copy with drag-and-drop of folders in folder tree, “always” — allow copy with drag-and-drop of folders in folder tree without asking, or “ask” — (or any other value) will ask user.</_description>
     </key>
     <key name="prompt-on-folder-drop-move" type="s">
       <default>'ask'</default>
-      <_summary>Asks whether to move a folder by drag &amp; drop in the folder tree</_summary>
-      <_description>Possible values are: “never” — do not allow move with drag &amp; drop of folders in folder tree, “always” — allow move with drag &amp; drop of folders in folder tree without asking, or “ask” — (or any other value) will ask user.</_description>
+      <_summary>Asks whether to move a folder by drag-and-drop in the folder tree</_summary>
+      <_description>Possible values are: “never” — do not allow move with drag-and-drop of folders in folder tree, “always” — allow move with drag-and-drop of folders in folder tree without asking, or “ask” — (or any other value) will ask user.</_description>
     </key>
     <key name="prompt-on-private-list-reply" type="b">
       <default>true</default>
diff --git a/src/mail/mail-config.ui b/src/mail/mail-config.ui
index b74c1e31bc..68e56a98eb 100644
--- a/src/mail/mail-config.ui
+++ b/src/mail/mail-config.ui
@@ -3987,7 +3987,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="chk-prompt-on-folder-drop-copy">
-            <property name="label" translatable="yes" comments="This is in the context of: Ask for confirmation before...">Copy _folder by Drag &amp; Drop in folder tree</property>
+            <property name="label" translatable="yes" comments="This is in the context of: Ask for confirmation before...">Copy _folder by drag-and-drop in folder tree</property>
             <property name="margin-start">12</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -4004,7 +4004,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="chk-prompt-on-folder-drop-move">
-            <property name="label" translatable="yes" comments="This is in the context of: Ask for confirmation before...">_Move folder by Drag &amp; Drop in folder tree</property>
+            <property name="label" translatable="yes" comments="This is in the context of: Ask for confirmation before...">_Move folder by drag-and-drop in folder tree</property>
             <property name="margin-start">12</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
diff --git a/src/modules/calendar/e-calendar-preferences.ui b/src/modules/calendar/e-calendar-preferences.ui
index 5a5e1e5a10..40924f6e42 100644
--- a/src/modules/calendar/e-calendar-preferences.ui
+++ b/src/modules/calendar/e-calendar-preferences.ui
@@ -883,7 +883,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="allow_event_dnd">
-            <property name="label" translatable="yes">Allow dra_g and drop of events</property>
+            <property name="label" translatable="yes">Allow dra_g-and-drop of events</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>