diff options
author | Daniel Silva <danielfaleirosilva@gmail.com> | 2018-07-22 20:29:38 -0300 |
---|---|---|
committer | Daniel Silva <danielfaleirosilva@gmail.com> | 2018-11-29 13:02:16 -0200 |
commit | 86c60a6af62bf50d5a6e7bc59bb29bfc1983584a (patch) | |
tree | 668a9d1ac77870a1f61dab4d7aa4530963ae20eb /vcl | |
parent | 8cbdc6a068ad88fc43a98bd0f88fcb7c4ad3ebd9 (diff) |
Adds 16k papers to print files in vcl and paper files in i18nutil
Change-Id: Iacb5903e1a51134b65836f33948a1cf5cfc3af0d
Reviewed-on: https://gerrit.libreoffice.org/57832
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/print.hrc | 6 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc index a6a5f5069559..91c11309aed5 100644 --- a/vcl/inc/print.hrc +++ b/vcl/inc/print.hrc @@ -56,7 +56,7 @@ const char* RID_STR_PAPERNAMES[] = NC_("RID_STR_PAPERNAMES", "#10 Envelope"), NC_("RID_STR_PAPERNAMES", "#11 Envelope"), NC_("RID_STR_PAPERNAMES", "#12 Envelope"), - NC_("RID_STR_PAPERNAMES", "16 Kai"), + NC_("RID_STR_PAPERNAMES", "16 Kai (16k)"), NC_("RID_STR_PAPERNAMES", "32 Kai"), NC_("RID_STR_PAPERNAMES", "Big 32 Kai"), NC_("RID_STR_PAPERNAMES", "B4 (JIS)"), @@ -104,8 +104,10 @@ const char* RID_STR_PAPERNAMES[] = NC_("RID_STR_PAPERNAMES", "Arch D"), NC_("RID_STR_PAPERNAMES", "Arch E"), NC_("RID_STR_PAPERNAMES", "Screen 16:9"), - // To translators: This is the last entry of the sequence of paper size names NC_("RID_STR_PAPERNAMES", "Screen 16:10"), + NC_("RID_STR_PAPERNAMES", "16k (195 x 270)"), + // To translators: This is the last entry of the sequence of paper size names + NC_("RID_STR_PAPERNAMES", "16k (197 x 273)") }; #endif // INCLUDED_VCL_INC_PRINT_HRC diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index a651fb6a5d99..7d64f7f10178 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1443,7 +1443,7 @@ OUString Printer::GetPaperName( Paper ePaper ) PAPER_DOUBLEPOSTCARD_JP, PAPER_A6, PAPER_12x11, PAPER_A7, PAPER_A8, PAPER_A9, PAPER_A10, PAPER_B0_ISO, PAPER_B1_ISO, PAPER_B2_ISO, PAPER_B3_ISO, PAPER_B7_ISO, PAPER_B8_ISO, PAPER_B9_ISO, PAPER_B10_ISO, PAPER_ENV_C2, PAPER_ENV_C7, PAPER_ENV_C8, PAPER_ARCHA, PAPER_ARCHB, PAPER_ARCHC, PAPER_ARCHD, - PAPER_ARCHE, PAPER_SCREEN_16_9, PAPER_SCREEN_16_10 + PAPER_ARCHE, PAPER_SCREEN_16_9, PAPER_SCREEN_16_10, PAPER_16K_195x270, PAPER_16K_197x273 }; assert(SAL_N_ELEMENTS(PaperIndex) == SAL_N_ELEMENTS(RID_STR_PAPERNAMES) && "localized paper name count wrong"); for (size_t i = 0; i < SAL_N_ELEMENTS(PaperIndex); ++i) |