From 00657aef09d854c74fb426a935a3e8b1fc390bb0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 11 Jun 2017 20:56:30 +0100 Subject: migrate to boost::gettext * all .ui files go from to e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a --- .../uiconfig/dbreport/ui/backgrounddialog.ui | 6 +-- reportdesign/uiconfig/dbreport/ui/chardialog.ui | 16 +++---- .../uiconfig/dbreport/ui/condformatdialog.ui | 4 +- reportdesign/uiconfig/dbreport/ui/conditionwin.ui | 44 +++++++++---------- .../uiconfig/dbreport/ui/datetimedialog.ui | 12 +++--- reportdesign/uiconfig/dbreport/ui/floatingfield.ui | 14 +++--- .../uiconfig/dbreport/ui/floatingnavigator.ui | 4 +- reportdesign/uiconfig/dbreport/ui/floatingsort.ui | 50 +++++++++++----------- reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui | 4 +- reportdesign/uiconfig/dbreport/ui/navigatormenu.ui | 14 +++--- reportdesign/uiconfig/dbreport/ui/pagedialog.ui | 8 ++-- .../uiconfig/dbreport/ui/pagenumberdialog.ui | 28 ++++++------ 12 files changed, 102 insertions(+), 102 deletions(-) (limited to 'reportdesign/uiconfig/dbreport/ui') diff --git a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui index c08ef8bfd0b5..81f06b43ac9e 100644 --- a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui @@ -1,11 +1,11 @@ - + False 6 - Section Setup + Section Setup dialog @@ -97,7 +97,7 @@ True False 0.4699999988079071 - Background + Background False diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui index 47491da9b178..8fc9aa4da781 100644 --- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui @@ -1,11 +1,11 @@ - + False 6 - Character Settings + Character Settings dialog @@ -96,7 +96,7 @@ True False - Font + Font False @@ -109,7 +109,7 @@ True False - Font Effects + Font Effects 1 @@ -123,7 +123,7 @@ True False - Position + Position 2 @@ -137,7 +137,7 @@ True False - Asian Layout + Asian Layout 3 @@ -151,7 +151,7 @@ True False - Highlighting + Highlighting 4 @@ -165,7 +165,7 @@ True False - Alignment + Alignment 5 diff --git a/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui b/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui index a336a5bfbc8f..623ffc6c4755 100644 --- a/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui @@ -1,13 +1,13 @@ - + False True True 6 - Conditional Formatting + Conditional Formatting dialog diff --git a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui index 9c141ffdc11f..b5bb144de770 100644 --- a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui +++ b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui @@ -1,6 +1,6 @@ - + @@ -53,8 +53,8 @@ True False - Field Value Is - Expression Is + Field Value Is + Expression Is @@ -68,14 +68,14 @@ True False - between - not between - equal to - not equal to - greater than - less than - greater than or equal to - less than or equal to + between + not between + equal to + not equal to + greater than + less than + greater than or equal to + less than or equal to @@ -104,7 +104,7 @@ - ... + ... True True True @@ -127,7 +127,7 @@ True False - and + and False @@ -155,7 +155,7 @@ - ... + ... True True True @@ -217,7 +217,7 @@ True False .uno:Bold - Bold + Bold True cmd/sc_bold.png @@ -232,7 +232,7 @@ True False .uno:Italic - Italic + Italic True cmd/sc_italic.png @@ -247,7 +247,7 @@ True False .uno:Underline - Underline + Underline True cmd/sc_underline.png @@ -272,7 +272,7 @@ True False .uno:BackgroundColor - Background Color + Background Color True cmd/sc_backgroundcolor.png @@ -287,7 +287,7 @@ True False .uno:FontColor - Font Color + Font Color True cmd/sc_fontcolor.png @@ -302,7 +302,7 @@ True False .uno:FontDialog - Character Formatting + Character Formatting True cmd/sc_fontdialog.png @@ -368,7 +368,7 @@ 6 - - + - True True True @@ -382,7 +382,7 @@ - + + + True True True diff --git a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui index 065a46346028..3b877c6ba235 100644 --- a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Date and Time + Date and Time dialog @@ -84,7 +84,7 @@ 12 - _Include Date + _Include Date True True False @@ -105,7 +105,7 @@ False 12 0 - _Format: + _Format: True datelistbox @@ -116,7 +116,7 @@ - Include _Time + Include _Time True True False @@ -137,7 +137,7 @@ False 12 0 - Fo_rmat: + Fo_rmat: True timelistbox diff --git a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui index 050cc6104a1c..da3057f645fa 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui @@ -1,6 +1,6 @@ - + True @@ -8,7 +8,7 @@ True True 6 - Sorting and Grouping + Sorting and Grouping utility @@ -27,7 +27,7 @@ True False - Sort Ascending + Sort Ascending True cmd/sc_sortup.png @@ -40,7 +40,7 @@ True False - Sort Descending + Sort Descending True cmd/sc_sortdown.png @@ -53,7 +53,7 @@ True False - Remove sorting + Remove sorting True cmd/sc_removefiltersort.png @@ -76,7 +76,7 @@ True False - Insert + Insert True @@ -95,7 +95,7 @@ True False start - Highlight the fields to insert into the selected section of the template, then click Insert or press Enter. + Highlight the fields to insert into the selected section of the template, then click Insert or press Enter. True 60 0 diff --git a/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui b/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui index e4d3ef8d8107..5163b146441e 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui @@ -1,13 +1,13 @@ - + True False True 6 - Report navigator + Report navigator utility diff --git a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui index d29f7b102e52..40fe9c3f67b9 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui @@ -1,6 +1,6 @@ - + True @@ -8,7 +8,7 @@ True True 6 - Sorting and Grouping + Sorting and Grouping utility @@ -50,7 +50,7 @@ True False 0 - Group actions + Group actions True toolbox @@ -72,7 +72,7 @@ True False - Move up + Move up True cmd/sc_moveup.png @@ -85,7 +85,7 @@ True False - Move down + Move down True cmd/sc_movedown.png @@ -98,7 +98,7 @@ True False - Delete + Delete True cmd/sc_deleterows.png @@ -149,7 +149,7 @@ True False - Groups + Groups @@ -189,7 +189,7 @@ True False 0 - Sorting + Sorting True sorting @@ -205,7 +205,7 @@ True False 0 - Group Header + Group Header True header @@ -221,7 +221,7 @@ True False 0 - Group Footer + Group Footer True footer @@ -237,7 +237,7 @@ True False 0 - Group On + Group On True group @@ -253,7 +253,7 @@ True False 0 - Group Interval + Group Interval True interval @@ -269,7 +269,7 @@ True False 0 - Keep Together + Keep Together True keep @@ -287,8 +287,8 @@ True 0 - Ascending - Descending + Ascending + Descending @@ -305,8 +305,8 @@ True 0 - Present - Not present + Present + Not present @@ -323,9 +323,9 @@ True 0 - No - Whole Group - With First Detail + No + Whole Group + With First Detail @@ -342,8 +342,8 @@ True 1 - Present - Not present + Present + Not present @@ -360,7 +360,7 @@ True 0 - Each Value + Each Value @@ -391,7 +391,7 @@ True False - Properties + Properties @@ -433,7 +433,7 @@ True False - Help + Help diff --git a/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui b/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui index b9df6f291084..b4825b5916cb 100644 --- a/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui +++ b/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - _Delete + _Delete True diff --git a/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui b/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui index 2b3cab082f74..29da91edc09c 100644 --- a/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui +++ b/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Sorting and Grouping... + Sorting and Grouping... True @@ -23,7 +23,7 @@ True False - Page Header/Footer... + Page Header/Footer... True @@ -31,7 +31,7 @@ True False - Report Header/Footer... + Report Header/Footer... True @@ -45,7 +45,7 @@ True False - New Function + New Function True @@ -59,7 +59,7 @@ True False - Properties... + Properties... True @@ -67,7 +67,7 @@ True False - _Delete + _Delete True diff --git a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui index 9a8061da18a5..5fa08b2a48ab 100644 --- a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Page Setup + Page Setup dialog @@ -96,7 +96,7 @@ True False - Page + Page False @@ -110,7 +110,7 @@ True False 0.4699999988079071 - Background + Background 1 diff --git a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui index 50c54bf0b56d..0fe1de492856 100644 --- a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Page Numbers + Page Numbers dialog @@ -95,7 +95,7 @@ 6 - _Page N + _Page N True True False @@ -113,7 +113,7 @@ - Page _N of M + Page _N of M True True False @@ -137,7 +137,7 @@ True False - Format + Format @@ -174,7 +174,7 @@ 6 - _Top of Page (Header) + _Top of Page (Header) True True False @@ -192,7 +192,7 @@ - _Bottom of Page (Footer) + _Bottom of Page (Footer) True True False @@ -216,7 +216,7 @@ True False - Position + Position @@ -259,9 +259,9 @@ start True - Left - Center - Right + Left + Center + Right @@ -274,7 +274,7 @@ True False 0 - _Alignment: + _Alignment: True alignment @@ -285,7 +285,7 @@ - Show Number on First Page + Show Number on First Page True True False @@ -306,7 +306,7 @@ True False - General + General -- cgit