Commit 990de56c authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents 4b1c9f28 c085d112
Pipeline #26095 passed with stage
in 26 minutes and 27 seconds
......@@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE gui>
<gui version="545" name="kmmainwin" translationDomain="kmail">
<gui version="546" name="kmmainwin" translationDomain="kmail">
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
......@@ -222,6 +222,7 @@
<Separator/>
<Action name="tools_automatic_archiving"/>
<Separator/>
<Action name="switch_application_language" group="settings_configure"/>
<Action name="options_configure_keybinding" group="settings_configure"/>
<Action name="kmail_configure_notifications" group="settings_configure"/>
<Action name="options_configure_toolbars" group="settings_configure" />
......
......@@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE gui>
<gui version="545" name="kmmainwin" translationDomain="kmail">
<gui version="546" name="kmmainwin" translationDomain="kmail">
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
......@@ -222,6 +222,7 @@
<Separator/>
<Action name="tools_automatic_archiving"/>
<Separator/>
<Action name="switch_application_language" group="settings_configure"/>
<Action name="options_configure_keybinding" group="settings_configure"/>
<Action name="kmail_configure_notifications" group="settings_configure"/>
<Action name="options_configure_toolbars" group="settings_configure" />
......
<!DOCTYPE gui>
<gui version="530" name="kmreadermainwin" translationDomain="kmail">
<gui version="531" name="kmreadermainwin" translationDomain="kmail">
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
......@@ -76,6 +76,7 @@
<Merge name="StandardToolBarMenuHandler"/>
<Action name="options_show_menubar" group="settings_configure" />
<Separator/>
<Action name="switch_application_language" group="settings_configure"/>
<Action name="options_configure_keybinding" group="settings_configure"/>
<Action name="options_configure_toolbars" group="settings_configure" />
<Action name="kmail_configure_kmail" group="settings_configure"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment