mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ic3103e6ed1052fbc292f235e1e3104a61579519d
Reviewed-on: https://gerrit.libreoffice.org/16062
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
This commit is contained in:
Yousuf Philips
2015-06-03 19:52:10 +04:00
parent 856233d2ef
commit ca6997fbb8
2 changed files with 31 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sd/source/ui/app/menuids_tmpl.src
View File

@@ -430,7 +430,7 @@
Identifier = SID_OBJECT_ALIGN ; \ Identifier = SID_OBJECT_ALIGN ; \
Command = ".uno:AlignObjetMenu" ; \ Command = ".uno:AlignObjetMenu" ; \
HelpId = CMD_SID_OBJECT_ALIGN ; \ HelpId = CMD_SID_OBJECT_ALIGN ; \
Text [ en-US ] = "Al~ignment" ; \ Text [ en-US ] = "Al~ign" ; \
SubMenu = Menu\ SubMenu = Menu\
{\ {\
ItemList = \ ItemList = \
@@ -653,7 +653,7 @@
{\ {\
Identifier = SID_SET_DEFAULT ; \ Identifier = SID_SET_DEFAULT ; \
HelpId = CMD_SID_SET_DEFAULT ; \ HelpId = CMD_SID_SET_DEFAULT ; \
Text [ en-US ] = "~Default" ; \ Text [ en-US ] = "~Default Formatting" ; \
}; };
#define MN_FONTWORK\ #define MN_FONTWORK\
@@ -669,14 +669,14 @@
{\ {\
Identifier = SID_ORIGINAL_SIZE ; \ Identifier = SID_ORIGINAL_SIZE ; \
HelpId = CMD_SID_ORIGINAL_SIZE ; \ HelpId = CMD_SID_ORIGINAL_SIZE ; \
Text [ en-US ] = "~Original Size" ; \ Text [ en-US ] = "Restore ~Original Size" ; \
}; };
#define MN_CROP\ #define MN_CROP\
MenuItem\ MenuItem\
{\ {\
Identifier = SID_OBJECT_CROP ; \ Identifier = SID_OBJECT_CROP ; \
Text [ en-US ] = "Crop Image" ; \ Text [ en-US ] = "Crop I~mage" ; \
}; };
#define MN_GLUE_INSERT_POINT\ #define MN_GLUE_INSERT_POINT\

115
sd/source/ui/app/popup2_tmpl.src
View File

@@ -35,25 +35,19 @@
{ {
MN_SET_DEFAULT MN_SET_DEFAULT
SEPARATOR SEPARATOR
MN_TRANSFORM
MN_LINE MN_LINE
MN_AREA MN_AREA
MN_TEXTATTR MN_TEXTATTR
MN_TRANSFORM
MN_FONTWORK MN_FONTWORK
SEPARATOR SEPARATOR
MN_CHAR_PARAGRAPH MN_CHAR_PARAGRAPH
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_CONVERT MNSUB_CONVERT
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION
@@ -74,26 +68,20 @@
{ {
MN_SET_DEFAULT MN_SET_DEFAULT
SEPARATOR SEPARATOR
MN_TRANSFORM
MN_LINE MN_LINE
MN_AREA MN_AREA
MN_TEXTATTR MN_TEXTATTR
MN_OUTLINE_TEXT_AUTOFIT MN_OUTLINE_TEXT_AUTOFIT
MN_TRANSFORM
MN_FONTWORK MN_FONTWORK
SEPARATOR SEPARATOR
MN_CHAR_PARAGRAPH MN_CHAR_PARAGRAPH
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_CONVERT MNSUB_CONVERT
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION
@@ -112,16 +100,17 @@
{ {
ItemList = ItemList =
{ {
MN_TRANSFORM
MN_LINE MN_LINE
MN_AREA MN_AREA
MN_TEXTATTR MN_TEXTATTR
MN_TRANSFORM SEPARATOR
MN_EDIT_POINTS MN_EDIT_POINTS
SEPARATOR SEPARATOR
MN_CHAR_PARAGRAPH MN_CHAR_PARAGRAPH
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_MIRROR MNSUB_MIRROR
MNSUB_CONVERT MNSUB_CONVERT
@@ -129,12 +118,6 @@
MN_LEAVE_GROUP MN_LEAVE_GROUP
MN_DISMANTLE MN_DISMANTLE
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION
@@ -157,8 +140,8 @@
MN_LINE MN_LINE
MN_AREA MN_AREA
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_MIRROR MNSUB_MIRROR
// #i37263# // #i37263#
@@ -186,23 +169,18 @@
{ {
ItemList = ItemList =
{ {
MN_3D_WIN
SEPARATOR
MN_TRANSFORM
MN_LINE MN_LINE
MN_AREA MN_AREA
MN_TRANSFORM
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_CONVERT MNSUB_CONVERT
SEPARATOR SEPARATOR
MN_ENTER_GROUP MN_ENTER_GROUP
MN_3D_WIN
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
@@ -222,12 +200,12 @@
{ {
ItemList = ItemList =
{ {
MN_TRANSFORM
MN_LINE MN_LINE
MN_AREA MN_AREA
MN_TRANSFORM
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_CONVERT MNSUB_CONVERT
SEPARATOR SEPARATOR
@@ -235,12 +213,6 @@
MN_LEAVE_GROUP MN_LEAVE_GROUP
MN_3D_WIN MN_3D_WIN
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION
@@ -259,24 +231,18 @@
{ {
ItemList = ItemList =
{ {
MN_TRANSFORM
MN_LINE MN_LINE
MN_AREA MN_AREA
MN_TRANSFORM
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_CONVERT MNSUB_CONVERT
SEPARATOR SEPARATOR
MN_LEAVE_GROUP MN_LEAVE_GROUP
MN_3D_WIN MN_3D_WIN
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION
@@ -295,25 +261,20 @@
{ {
ItemList = ItemList =
{ {
MN_TRANSFORM
MN_LINE MN_LINE
MN_AREA MN_AREA
MN_TRANSFORM SEPARATOR
MN_EDIT_POINTS MN_EDIT_POINTS
SEPARATOR SEPARATOR
MN_CHAR_PARAGRAPH MN_CHAR_PARAGRAPH
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_MIRROR MNSUB_MIRROR
MNSUB_CONVERT MNSUB_CONVERT
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
SEPARATOR SEPARATOR
MN_UNGROUP MN_UNGROUP
MN_ENTER_GROUP MN_ENTER_GROUP
@@ -335,10 +296,9 @@
{ {
MN_TRANSFORM MN_TRANSFORM
MN_LINE MN_LINE
MN_EDIT_POINTS
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_MIRROR MNSUB_MIRROR
MNSUB_CONVERT MNSUB_CONVERT
@@ -369,9 +329,8 @@
MN_LINE MN_LINE
MN_CONNECTION MN_CONNECTION
MN_TRANSFORM MN_TRANSFORM
MN_EDIT_POINTS
SEPARATOR SEPARATOR
MN_CHAR_PARAGRAPH MN_EDIT_POINTS
SEPARATOR SEPARATOR
MN_POSITION MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
@@ -381,12 +340,6 @@
MN_LEAVE_GROUP MN_LEAVE_GROUP
MN_DISMANTLE MN_DISMANTLE
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION
@@ -549,10 +502,10 @@
{ {
ItemList = ItemList =
{ {
MenuItem { ITEM_CHANGE_PICTURE };
MenuItem { ITEM_SAVE_GRAPHIC };
MenuItem { ITEM_COMPRESS_GRAPHIC };
MenuItem { ITEM_EXTERNAL_EDIT }; MenuItem { ITEM_EXTERNAL_EDIT };
MenuItem { ITEM_CHANGE_PICTURE };
MenuItem { ITEM_COMPRESS_GRAPHIC };
MenuItem { ITEM_SAVE_GRAPHIC };
SEPARATOR SEPARATOR
MN_CROP MN_CROP
MN_ORIGINAL_SIZE MN_ORIGINAL_SIZE
@@ -607,12 +560,6 @@
MN_BREAK MN_BREAK
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION
@@ -652,17 +599,11 @@
{ {
MN_TRANSFORM MN_TRANSFORM
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MN_BREAK MN_BREAK
// #i68101#
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
// #i68101#
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION
@@ -809,13 +750,11 @@
}; };
}; };
SEPARATOR SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE MN_DISTRIBUTE
MNSUB_CONVERT MNSUB_CONVERT
SEPARATOR
MN_OBJECT_TITLE_DESCRIPTION
MN_NAME_GROUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR SEPARATOR
MN_ACTION MN_ACTION