cui/qa/uitest/dialogs/pastedlg.py | 4 ++--
include/svtools/strings.hrc | 30 +++++++++++++++---------------
sc/inc/strings.hrc | 3 ++-
sc/source/ui/docshell/docsh.cxx | 4 ++--
sd/inc/strings.hrc | 7 +++++--
sd/source/ui/docshell/docshel4.cxx | 4 ++--
sot/source/base/exchange.cxx | 2 +-
svtools/source/dialogs/insdlg.cxx | 8 ++++----
sw/inc/strings.hrc | 8 ++++----
9 files changed, 37 insertions(+), 33 deletions(-)
New commits:
commit a2f7eb5f8ea7f3ae50aea72de8b15c3364493285
Author: heiko tietze <tietze.he...@gmail.com>
Date: Tue Apr 3 17:19:36 2018 +0200
tdf#89453 - Improve the wording of "Paste Special" options
User fiendly captions with short names in parenthesis
Change-Id: I07a1effa5b03423c4b48e6ca6066f7d1e3445248
Reviewed-on: https://gerrit.libreoffice.org/52336
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/cui/qa/uitest/dialogs/pastedlg.py
b/cui/qa/uitest/dialogs/pastedlg.py
index 93973178c254..4c17adac33d3 100644
--- a/cui/qa/uitest/dialogs/pastedlg.py
+++ b/cui/qa/uitest/dialogs/pastedlg.py
@@ -36,8 +36,8 @@ class Test(UITestCase):
items.append(get_state_as_dict(formats)["SelectEntryText"])
# Make sure there is no RTF vs Richtext duplication.
- self.assertTrue("Formatted text [RTF]" in items)
- self.assertFalse("Formatted text [Richtext]" in items)
+ self.assertTrue("Rich text formatting (RTF)" in items)
+ self.assertFalse("Rich text formatting (Richtext)" in items)
# Close the dialog and the document.
self.ui_test.close_dialog_through_button(pasteSpecial.getChild("cancel"))
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index 5413f7794daa..b5d7b8bb9655 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -27,15 +27,15 @@
#define STR_REPEAT NC_("STR_REPEAT", "~Repeat: ")
#define STR_FORMAT_STRING NC_("STR_FORMAT_STRING",
"Unformatted text")
-#define STR_FORMAT_ID_STRING_TSVC
NC_("STR_FORMAT_ID_STRING_TSVC", "Unformatted text [TSV-Calc]")
-#define STR_FORMAT_BITMAP NC_("STR_FORMAT_BITMAP",
"Bitmap")
-#define STR_FORMAT_GDIMETAFILE NC_("STR_FORMAT_GDIMETAFILE",
"GDI metafile")
-#define STR_FORMAT_RTF NC_("STR_FORMAT_RTF",
"Formatted text [RTF]")
-#define STR_FORMAT_ID_RICHTEXT NC_("STR_FORMAT_ID_RICHTEXT",
"Formatted text [Richtext]")
-#define STR_FORMAT_ID_DRAWING NC_("STR_FORMAT_ID_DRAWING",
"Drawing format")
-#define STR_FORMAT_ID_SVXB NC_("STR_FORMAT_ID_SVXB",
"SVXB (StarView bitmap/animation)")
+#define STR_FORMAT_ID_STRING_TSVC
NC_("STR_FORMAT_ID_STRING_TSVC", "Unformatted text (TSV-Calc)")
+#define STR_FORMAT_BITMAP NC_("STR_FORMAT_BITMAP",
"Bitmap Image (BMP)")
+#define STR_FORMAT_GDIMETAFILE NC_("STR_FORMAT_GDIMETAFILE",
"Graphics Device Interface metafile (GDI)")
+#define STR_FORMAT_RTF NC_("STR_FORMAT_RTF", "Rich
text formatting (RTF)")
+#define STR_FORMAT_ID_RICHTEXT NC_("STR_FORMAT_ID_RICHTEXT",
"Rich text formatting (Richtext)")
+#define STR_FORMAT_ID_DRAWING NC_("STR_FORMAT_ID_DRAWING",
"%PRODUCTNAME drawing format")
+#define STR_FORMAT_ID_SVXB NC_("STR_FORMAT_ID_SVXB",
"StarView bitmap/animation (SVXB)")
#define STR_FORMAT_ID_INTERNALLINK_STATE
NC_("STR_FORMAT_ID_INTERNALLINK_STATE", "Status Info from Svx Internal Link")
-#define STR_FORMAT_ID_SOLK NC_("STR_FORMAT_ID_SOLK",
"SOLK (%PRODUCTNAME Link)")
+#define STR_FORMAT_ID_SOLK NC_("STR_FORMAT_ID_SOLK",
"%PRODUCTNAME Link (SOLK)")
#define STR_FORMAT_ID_NETSCAPE_BOOKMARK
NC_("STR_FORMAT_ID_NETSCAPE_BOOKMARK", "Netscape Bookmark")
#define STR_FORMAT_ID_STARSERVER
NC_("STR_FORMAT_ID_STARSERVER", "Star server format")
#define STR_FORMAT_ID_STAROBJECT
NC_("STR_FORMAT_ID_STAROBJECT", "Star object format")
@@ -65,13 +65,13 @@
#define STR_FORMAT_ID_STARMATH_40
NC_("STR_FORMAT_ID_STARMATH_40", "StarMath 4.0 object")
#define STR_FORMAT_ID_STARMATH_50
NC_("STR_FORMAT_ID_STARMATH_50", "StarMath 5.0 object")
#define STR_FORMAT_ID_STAROBJECT_PAINTDOC
NC_("STR_FORMAT_ID_STAROBJECT_PAINTDOC", "StarObject Paint object")
-#define STR_FORMAT_ID_HTML NC_("STR_FORMAT_ID_HTML",
"HTML (HyperText Markup Language)")
-#define STR_FORMAT_ID_HTML_SIMPLE
NC_("STR_FORMAT_ID_HTML_SIMPLE", "HTML format")
-#define STR_FORMAT_ID_BIFF_5 NC_("STR_FORMAT_ID_BIFF_5",
"Biff5 (Microsoft Excel 5.0/95)")
-#define STR_FORMAT_ID_BIFF_8 NC_("STR_FORMAT_ID_BIFF_8",
"Biff8 (Microsoft Excel 97/2000/XP/2003)")
+#define STR_FORMAT_ID_HTML NC_("STR_FORMAT_ID_HTML",
"HyperText Markup Language (HTML)")
+#define STR_FORMAT_ID_HTML_SIMPLE
NC_("STR_FORMAT_ID_HTML_SIMPLE", "Stripped HyperText Markup Language (Simple
HTML)")
+#define STR_FORMAT_ID_BIFF_5 NC_("STR_FORMAT_ID_BIFF_5",
"Microsoft Excel Binary Interchange Format 5.0/95 (Biff5)")
+#define STR_FORMAT_ID_BIFF_8 NC_("STR_FORMAT_ID_BIFF_8",
"Microsoft Excel Binary Interchange Format 97/2000/XP/2003 (Biff8)")
#define STR_FORMAT_ID_SYLK NC_("STR_FORMAT_ID_SYLK",
"Sylk")
-#define STR_FORMAT_ID_LINK NC_("STR_FORMAT_ID_LINK", "DDE
link" )
-#define STR_FORMAT_ID_DIF NC_("STR_FORMAT_ID_DIF", "DIF")
+#define STR_FORMAT_ID_LINK NC_("STR_FORMAT_ID_LINK",
"Dynamic Data Exchange (DDE link)" )
+#define STR_FORMAT_ID_DIF NC_("STR_FORMAT_ID_DIF", "Data
Interchange Format (DIF)")
#define STR_FORMAT_ID_MSWORD_DOC
NC_("STR_FORMAT_ID_MSWORD_DOC", "Microsoft Word object")
#define STR_FORMAT_ID_STAR_FRAMESET_DOC
NC_("STR_FORMAT_ID_STAR_FRAMESET_DOC", "StarFrameSet object")
#define STR_FORMAT_ID_OFFICE_DOC
NC_("STR_FORMAT_ID_OFFICE_DOC", "Office document object")
@@ -94,7 +94,7 @@
#define STR_FORMAT_ID_DIALOG_60 NC_("STR_FORMAT_ID_DIALOG_60",
"OpenOffice.org 1.0 dialog")
#define STR_FORMAT_ID_FILEGRPDESCRIPTOR
NC_("STR_FORMAT_ID_FILEGRPDESCRIPTOR", "Link")
#define STR_FORMAT_ID_HTML_NO_COMMENT
NC_("STR_FORMAT_ID_HTML_NO_COMMENT", "HTML format without comments")
-#define STR_FORMAT_ID_PNG_BITMAP
NC_("STR_FORMAT_ID_PNG_BITMAP", "PNG Bitmap")
+#define STR_FORMAT_ID_PNG_BITMAP
NC_("STR_FORMAT_ID_PNG_BITMAP", "Portable Network Graphic (PNG)")
#define STR_ERROR_OBJNOCREATE NC_("STR_ERROR_OBJNOCREATE",
"Object % could not be inserted.")
#define STR_ERROR_OBJNOCREATE_FROM_FILE
NC_("STR_ERROR_OBJNOCREATE_FROM_FILE", "Object from file % could not be
inserted.")
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 29ee57ae53f8..7c3890a3ff4e 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -24,7 +24,8 @@
// Strings for interface names -------------------------------------------
-#define SCSTR_LONG_SCDOC_NAME
NC_("SCSTR_LONG_SCDOC_NAME", "%PRODUCTNAME %PRODUCTVERSION Spreadsheet")
+#define SCSTR_LONG_SCDOC_NAME_60
NC_("SCSTR_LONG_SCDOC_NAME", "%PRODUCTNAME Spreadsheet format (calc6)")
+#define SCSTR_LONG_SCDOC_NAME_80
NC_("SCSTR_LONG_SCDOC_NAME", "%PRODUCTNAME %PRODUCTVERSION Spreadsheet")
#define SCSTR_SHORT_SCDOC_NAME
NC_("SCSTR_SHORT_SCDOC_NAME", "Spreadsheet")
#define SCSTR_UNDEFINED NC_("SCSTR_UNDEFINED", "-
undefined -")
#define SCSTR_NONE NC_("SCSTR_NONE", "- none
-")
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e59ee43400e8..fc84c7250148 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -188,14 +188,14 @@ void ScDocShell::FillClass( SvGlobalName* pClassName,
{
*pClassName = SvGlobalName( SO3_SC_CLASSID_60 );
*pFormat = SotClipboardFormatId::STARCALC_60;
- *pFullTypeName = ScResId( SCSTR_LONG_SCDOC_NAME );
+ *pFullTypeName = ScResId( SCSTR_LONG_SCDOC_NAME_60 );
*pShortTypeName = ScResId( SCSTR_SHORT_SCDOC_NAME );
}
else if ( nFileFormat == SOFFICE_FILEFORMAT_8 )
{
*pClassName = SvGlobalName( SO3_SC_CLASSID_60 );
*pFormat = bTemplate ?
SotClipboardFormatId::STARCALC_8_TEMPLATE : SotClipboardFormatId::STARCALC_8;
- *pFullTypeName = "calc8";
+ *pFullTypeName = ScResId( SCSTR_LONG_SCDOC_NAME_80 );
*pShortTypeName = ScResId(SCSTR_SHORT_SCDOC_NAME);
}
else
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 1a5a829044ec..61af7e91c616 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -189,11 +189,14 @@
#define STR_NEW_CUSTOMSHOW
NC_("STR_NEW_CUSTOMSHOW", "New Custom Slide Show")
#define STR_COPY_CUSTOMSHOW
NC_("STR_COPY_CUSTOMSHOW", "Copy ")
#define STR_IMPRESS_DOCUMENT
NC_("STR_IMPRESS_DOCUMENT", "Presentation")
-#define STR_IMPRESS_DOCUMENT_FULLTYPE_60
NC_("STR_IMPRESS_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME %PRODUCTVERSION
Presentation")
+#define STR_IMPRESS_DOCUMENT_FULLTYPE_60
NC_("STR_IMPRESS_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME Presentation format
(Impress 6)")
#define STR_GRAPHIC_DOCUMENT
NC_("STR_GRAPHIC_DOCUMENT", "Drawing")
-#define STR_GRAPHIC_DOCUMENT_FULLTYPE_60
NC_("STR_GRAPHIC_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME %PRODUCTVERSION Drawing")
+#define STR_GRAPHIC_DOCUMENT_FULLTYPE_60
NC_("STR_GRAPHIC_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME Drawing format (Draw 6)")
#define STR_BREAK_METAFILE
NC_("STR_BREAK_METAFILE", "Ungroup Metafile(s)...")
#define STR_BREAK_FAIL NC_("STR_BREAK_FAIL",
"It was not possible to ungroup all drawing objects.")
+#define STR_IMPRESS_DOCUMENT_FULLTYPE_80
NC_("STR_IMPRESS_DOCUMENT_FULLTYPE_80", "%PRODUCTNAME %PRODUCTVERSION
Presentation")
+#define STR_GRAPHIC_DOCUMENT_FULLTYPE_80
NC_("STR_GRAPHIC_DOCUMENT_FULLTYPE_80", "%PRODUCTNAME %PRODUCTVERSION Drawing")
+
// HtmlExport
#define STR_PUBDLG_SAMENAME
NC_("STR_PUBDLG_SAMENAME", "A design already exists with this name.\nDo you
want to replace it?")
#define STR_HTMLATTR_TEXT
NC_("STR_HTMLATTR_TEXT", "Text")
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index 65c10937fa48..61c8b65ee6b9 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -950,13 +950,13 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
{
*pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60);
*pFormat = bTemplate ? SotClipboardFormatId::STARDRAW_8_TEMPLATE :
SotClipboardFormatId::STARDRAW_8;
- *pFullTypeName = "Draw 8"; // HACK: method will be removed with
new storage API
+ *pFullTypeName = SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_80); //
HACK: method will be removed with new storage API
}
else
{
*pClassName = SvGlobalName(SO3_SIMPRESS_CLASSID_60);
*pFormat = bTemplate ?
SotClipboardFormatId::STARIMPRESS_8_TEMPLATE :
SotClipboardFormatId::STARIMPRESS_8;
- *pFullTypeName = "Impress 8"; // HACK: method will be removed with
new storage API
+ *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_80); //
HACK: method will be removed with new storage API
}
}
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index e69ae15d8ae8..80cb3ef42300 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -73,7 +73,7 @@ namespace
/* 12 SotClipboardFormatId::SVXB*/ {
"application/x-openoffice-svxb;windows_formatname=\"SVXB (StarView
Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 13 SotClipboardFormatId::SVIM*/ {
"application/x-openoffice-svim;windows_formatname=\"SVIM (StarView
ImageMap)\"", "SVIM (StarView ImageMap)",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 14 SotClipboardFormatId::XFA*/ {
"application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"",
"XFA (XOutDev FillAttr)", &cppu::UnoType<Sequence<sal_Int8>>::get() },
- /* 15 SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT*/ {
"application/vnd.oasis.opendocument.text-flat-xml", "EditEngine ODF",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
+ /* 15 SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT*/ {
"application/vnd.oasis.opendocument.text-flat-xml", "Flat XML format
(EditEngine ODF)", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 16 SotClipboardFormatId::INTERNALLINK_STATE*/ {
"application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo
vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 17 SotClipboardFormatId::SOLK*/ {
"application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"",
"SOLK (StarOffice Link)", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 18 SotClipboardFormatId::NETSCAPE_BOOKMARK*/ {
"application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape
Bookmark\"", "Netscape Bookmark", &cppu::UnoType<Sequence<sal_Int8>>::get() },
diff --git a/svtools/source/dialogs/insdlg.cxx
b/svtools/source/dialogs/insdlg.cxx
index a7ed5ca32c1a..1ccd6114c416 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -196,10 +196,10 @@ OUString SvPasteObjectHelper::GetSotFormatUIName(
SotClipboardFormatId nId )
static const SotResourcePair aSotResourcePairs[] =
{
- { SotClipboardFormatId::STRING, STR_FORMAT_STRING },
- { SotClipboardFormatId::BITMAP, STR_FORMAT_BITMAP },
- { SotClipboardFormatId::GDIMETAFILE,
STR_FORMAT_GDIMETAFILE },
- { SotClipboardFormatId::RTF, STR_FORMAT_RTF },
+ { SotClipboardFormatId::STRING, STR_FORMAT_STRING },
+ { SotClipboardFormatId::BITMAP, STR_FORMAT_BITMAP },
+ { SotClipboardFormatId::GDIMETAFILE, STR_FORMAT_GDIMETAFILE },
+ { SotClipboardFormatId::RTF, STR_FORMAT_RTF },
{ SotClipboardFormatId::DRAWING, STR_FORMAT_ID_DRAWING },
{ SotClipboardFormatId::SVXB, STR_FORMAT_ID_SVXB },
{ SotClipboardFormatId::INTERNALLINK_STATE,
STR_FORMAT_ID_INTERNALLINK_STATE },
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 8564b1877f15..cb801c38ac60 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -761,10 +761,10 @@
#define STR_TABLE_TOO_LARGE NC_("STR_TABLE_TOO_LARGE",
"The table cannot be inserted because it is too large")
#define STR_ERR_INSERT_GLOS NC_("STR_ERR_INSERT_GLOS",
"AutoText could not be created.")
#define STR_CLPBRD_FORMAT_ERROR NC_("STR_CLPBRD_FORMAT_ERROR",
"Requested clipboard format is not available.")
-#define STR_PRIVATETEXT NC_("STR_PRIVATETEXT",
"%PRODUCTNAME Writer")
-#define STR_PRIVATEGRAPHIC NC_("STR_PRIVATEGRAPHIC",
"Image [%PRODUCTNAME Writer]")
-#define STR_PRIVATEOLE NC_("STR_PRIVATEOLE", "Object
[%PRODUCTNAME Writer]")
-#define STR_DDEFORMAT NC_("STR_DDEFORMAT", "DDE
link")
+#define STR_PRIVATETEXT NC_("STR_PRIVATETEXT",
"%PRODUCTNAME %PRODUCTVERSION Text Document")
+#define STR_PRIVATEGRAPHIC NC_("STR_PRIVATEGRAPHIC",
"Image (%PRODUCTNAME %PRODUCTVERSION Text Document)")
+#define STR_PRIVATEOLE NC_("STR_PRIVATEOLE", "Object
(%PRODUCTNAME %PRODUCTVERSION Text Document)")
+#define STR_DDEFORMAT NC_("STR_DDEFORMAT", "Dynamic
Data Exchange (DDE link)")
#define STR_DELETE_ALL_NOTES NC_("STR_DELETE_ALL_NOTES",
"All Comments")
#define STR_FORMAT_ALL_NOTES NC_("STR_FORMAT_ALL_NOTES",
"All Comments")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
