tdf#86614 Adjusting some text entries and rearranging and removing others

Change-Id: Ic3103e6ed1052fbc292f235e1e3104a61579519d
Reviewed-on: https://gerrit.libreoffice.org/16062
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 9ed590a..bf30830 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -430,7 +430,7 @@
        Identifier = SID_OBJECT_ALIGN ; \
        Command = ".uno:AlignObjetMenu" ; \
        HelpId = CMD_SID_OBJECT_ALIGN ; \
        Text [ en-US ] = "Al~ignment" ; \
        Text [ en-US ] = "Al~ign" ; \
        SubMenu = Menu\
        {\
            ItemList = \
@@ -653,7 +653,7 @@
    {\
        Identifier = SID_SET_DEFAULT ; \
        HelpId = CMD_SID_SET_DEFAULT ; \
        Text [ en-US ] = "~Default" ; \
        Text [ en-US ] = "~Default Formatting" ; \
    };

#define MN_FONTWORK\
@@ -669,14 +669,14 @@
    {\
        Identifier = SID_ORIGINAL_SIZE ; \
        HelpId = CMD_SID_ORIGINAL_SIZE ; \
        Text [ en-US ] = "~Original Size" ; \
        Text [ en-US ] = "Restore ~Original Size" ; \
    };

#define MN_CROP\
    MenuItem\
    {\
        Identifier = SID_OBJECT_CROP ; \
        Text [ en-US ] = "Crop Image" ; \
        Text [ en-US ] = "Crop I~mage" ; \
    };

#define MN_GLUE_INSERT_POINT\
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index f9a2122..28c858f 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -35,25 +35,19 @@
    {
        MN_SET_DEFAULT
        SEPARATOR
        MN_TRANSFORM
        MN_LINE
        MN_AREA
        MN_TEXTATTR
        MN_TRANSFORM
        MN_FONTWORK
        SEPARATOR
        MN_CHAR_PARAGRAPH
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_CONVERT

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION
@@ -74,26 +68,20 @@
    {
        MN_SET_DEFAULT
        SEPARATOR
        MN_TRANSFORM
        MN_LINE
        MN_AREA
        MN_TEXTATTR
        MN_OUTLINE_TEXT_AUTOFIT
        MN_TRANSFORM
        MN_FONTWORK
        SEPARATOR
        MN_CHAR_PARAGRAPH
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_CONVERT

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION
@@ -112,16 +100,17 @@
{
    ItemList =
    {
        MN_TRANSFORM
        MN_LINE
        MN_AREA
        MN_TEXTATTR
        MN_TRANSFORM
        SEPARATOR
        MN_EDIT_POINTS
        SEPARATOR
        MN_CHAR_PARAGRAPH
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_MIRROR
        MNSUB_CONVERT
@@ -129,12 +118,6 @@
        MN_LEAVE_GROUP
        MN_DISMANTLE

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION
@@ -157,8 +140,8 @@
        MN_LINE
        MN_AREA
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_MIRROR
        // #i37263#
@@ -186,23 +169,18 @@
{
    ItemList =
    {
        MN_3D_WIN
        SEPARATOR
        MN_TRANSFORM
        MN_LINE
        MN_AREA
        MN_TRANSFORM
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_CONVERT
        SEPARATOR
        MN_ENTER_GROUP
        MN_3D_WIN

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
@@ -222,12 +200,12 @@
{
    ItemList =
    {
        MN_TRANSFORM
        MN_LINE
        MN_AREA
        MN_TRANSFORM
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_CONVERT
        SEPARATOR
@@ -235,12 +213,6 @@
        MN_LEAVE_GROUP
        MN_3D_WIN

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION
@@ -259,24 +231,18 @@
{
    ItemList =
    {
        MN_TRANSFORM
        MN_LINE
        MN_AREA
        MN_TRANSFORM
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_CONVERT
        SEPARATOR
        MN_LEAVE_GROUP
        MN_3D_WIN

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION
@@ -295,25 +261,20 @@
{
    ItemList =
    {
        MN_TRANSFORM
        MN_LINE
        MN_AREA
        MN_TRANSFORM
        SEPARATOR
        MN_EDIT_POINTS
        SEPARATOR
        MN_CHAR_PARAGRAPH
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_MIRROR
        MNSUB_CONVERT

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

        SEPARATOR
        MN_UNGROUP
        MN_ENTER_GROUP
@@ -335,10 +296,9 @@
    {
        MN_TRANSFORM
        MN_LINE
        MN_EDIT_POINTS
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_MIRROR
        MNSUB_CONVERT
@@ -369,9 +329,8 @@
        MN_LINE
        MN_CONNECTION
        MN_TRANSFORM
        MN_EDIT_POINTS
        SEPARATOR
        MN_CHAR_PARAGRAPH
        MN_EDIT_POINTS
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
@@ -381,12 +340,6 @@
        MN_LEAVE_GROUP
        MN_DISMANTLE

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION
@@ -549,10 +502,10 @@
{
    ItemList =
    {
        MenuItem { ITEM_CHANGE_PICTURE };
        MenuItem { ITEM_SAVE_GRAPHIC };
        MenuItem { ITEM_COMPRESS_GRAPHIC };
        MenuItem { ITEM_EXTERNAL_EDIT };
        MenuItem { ITEM_CHANGE_PICTURE };
        MenuItem { ITEM_COMPRESS_GRAPHIC };
        MenuItem { ITEM_SAVE_GRAPHIC };
        SEPARATOR
        MN_CROP
        MN_ORIGINAL_SIZE
@@ -607,12 +560,6 @@

        MN_BREAK

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION
@@ -652,17 +599,11 @@
    {
        MN_TRANSFORM
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MN_BREAK

        // #i68101#
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP
        // #i68101#

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION
@@ -809,13 +750,11 @@
            };
        };
        SEPARATOR
        MN_POSITION
        MN_OBJECT_ALIGN
        MN_POSITION
        MN_DISTRIBUTE
        MNSUB_CONVERT
        SEPARATOR
        MN_OBJECT_TITLE_DESCRIPTION
        MN_NAME_GROUP

#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
        SEPARATOR
        MN_ACTION