dictionaries | 2 +- include/sfx2/strings.hrc | 42 ++++++++++++++++++++++++++++++++---------- sfx2/inc/strings.hxx | 40 ++++++++++++++++++++++++++++++---------- sfx2/source/doc/doctempl.cxx | 42 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 104 insertions(+), 22 deletions(-)
New commits: commit 29c07c224d8b51ff9bf417eb2e3960cd0f9612fd Author: Gabor Kelemen <[email protected]> Date: Wed Nov 29 01:06:46 2017 +0100 tdf#114088 Translate default template names Change-Id: I173364d723e0afd7275b469aea1f2e8cb105fdab Reviewed-on: https://gerrit.libreoffice.org/45450 Tested-by: Jenkins <[email protected]> Reviewed-by: Andras Timar <[email protected]> (cherry picked from commit d635da1972f15862bb283e77787243fbff8361a6) Reviewed-on: https://gerrit.libreoffice.org/46160 diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index aceb597db301..d323efd25258 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -267,16 +267,38 @@ #define SFX_STR_SIDEBAR_RESTORE NC_("SFX_STR_SIDEBAR_RESTORE", "Restore Default") #define SFX_STR_SIDEBAR_HIDE_SIDEBAR NC_("SFX_STR_SIDEBAR_HIDE_SIDEBAR", "Close Sidebar") -#define STR_TEMPLATE_NAME1 NC_("STR_TEMPLATE_NAME1", "Abstract Green") -#define STR_TEMPLATE_NAME2 NC_("STR_TEMPLATE_NAME2", "Abstract Red") -#define STR_TEMPLATE_NAME3 NC_("STR_TEMPLATE_NAME3", "Abstract Yellow") -#define STR_TEMPLATE_NAME4 NC_("STR_TEMPLATE_NAME4", "Bright Blue") -#define STR_TEMPLATE_NAME5 NC_("STR_TEMPLATE_NAME5", "DNA") -#define STR_TEMPLATE_NAME6 NC_("STR_TEMPLATE_NAME6", "Inspiration") -#define STR_TEMPLATE_NAME7 NC_("STR_TEMPLATE_NAME7", "Lush Green") -#define STR_TEMPLATE_NAME8 NC_("STR_TEMPLATE_NAME8", "Metropolis") -#define STR_TEMPLATE_NAME9 NC_("STR_TEMPLATE_NAME9", "Sunset") -#define STR_TEMPLATE_NAME10 NC_("STR_TEMPLATE_NAME10", "Vintage") +// Translators: default Impress template names +#define STR_TEMPLATE_NAME1 NC_("STR_TEMPLATE_NAME1", "Alizarin") +#define STR_TEMPLATE_NAME2 NC_("STR_TEMPLATE_NAME2", "Beehive") +#define STR_TEMPLATE_NAME3 NC_("STR_TEMPLATE_NAME3", "Blue Curve") +#define STR_TEMPLATE_NAME4 NC_("STR_TEMPLATE_NAME4", "Blueprint Plans") +#define STR_TEMPLATE_NAME5 NC_("STR_TEMPLATE_NAME5", "Bright Blue") +#define STR_TEMPLATE_NAME6 NC_("STR_TEMPLATE_NAME6", "Classy Red") +#define STR_TEMPLATE_NAME7 NC_("STR_TEMPLATE_NAME7", "DNA") +#define STR_TEMPLATE_NAME8 NC_("STR_TEMPLATE_NAME8", "Focus") +#define STR_TEMPLATE_NAME9 NC_("STR_TEMPLATE_NAME9", "Forestbird") +#define STR_TEMPLATE_NAME10 NC_("STR_TEMPLATE_NAME10", "Impress") +#define STR_TEMPLATE_NAME11 NC_("STR_TEMPLATE_NAME11", "Inspiration") +#define STR_TEMPLATE_NAME12 NC_("STR_TEMPLATE_NAME12", "Lights") +#define STR_TEMPLATE_NAME13 NC_("STR_TEMPLATE_NAME13", "Lush Green") +#define STR_TEMPLATE_NAME14 NC_("STR_TEMPLATE_NAME14", "Metropolis") +#define STR_TEMPLATE_NAME15 NC_("STR_TEMPLATE_NAME15", "Midnightblue") +#define STR_TEMPLATE_NAME16 NC_("STR_TEMPLATE_NAME16", "Nature Illustration") +#define STR_TEMPLATE_NAME17 NC_("STR_TEMPLATE_NAME17", "Pencil") +#define STR_TEMPLATE_NAME18 NC_("STR_TEMPLATE_NAME18", "Piano") +#define STR_TEMPLATE_NAME19 NC_("STR_TEMPLATE_NAME19", "Portfolio") +#define STR_TEMPLATE_NAME20 NC_("STR_TEMPLATE_NAME20", "Progress") +#define STR_TEMPLATE_NAME21 NC_("STR_TEMPLATE_NAME21", "Sunset") +#define STR_TEMPLATE_NAME22 NC_("STR_TEMPLATE_NAME22", "Vintage") +#define STR_TEMPLATE_NAME23 NC_("STR_TEMPLATE_NAME23", "Vivid") +// Translators: default Writer template names +#define STR_TEMPLATE_NAME24 NC_("STR_TEMPLATE_NAME24", "CV") +#define STR_TEMPLATE_NAME25 NC_("STR_TEMPLATE_NAME25", "Resume") +#define STR_TEMPLATE_NAME26 NC_("STR_TEMPLATE_NAME26", "Default") +#define STR_TEMPLATE_NAME27 NC_("STR_TEMPLATE_NAME27", "Modern") +#define STR_TEMPLATE_NAME28 NC_("STR_TEMPLATE_NAME28", "Modern business letter sans-serif") +#define STR_TEMPLATE_NAME29 NC_("STR_TEMPLATE_NAME29", "Modern business letter serif") +#define STR_TEMPLATE_NAME30 NC_("STR_TEMPLATE_NAME30", "Businesscard with logo") #define STR_CLEAR_CHAR NC_("STR_CLEAR_CHAR", "Remove") #define STR_CLEAR_ALL_CHAR NC_("STR_CLEAR_ALL_CHAR", "Clear All") diff --git a/sfx2/inc/strings.hxx b/sfx2/inc/strings.hxx index 9fb8ccf070fe..fe7f3d7b15d4 100644 --- a/sfx2/inc/strings.hxx +++ b/sfx2/inc/strings.hxx @@ -13,16 +13,36 @@ #define STR_HTML_GENERATOR "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION (%1)" // Do not translate STR_TEMPLATE_NAME*_DEF names!! -#define STR_TEMPLATE_NAME1_DEF "Abstract Green" -#define STR_TEMPLATE_NAME2_DEF "Abstract Red" -#define STR_TEMPLATE_NAME3_DEF "Abstract Yellow" -#define STR_TEMPLATE_NAME4_DEF "Bright Blue" -#define STR_TEMPLATE_NAME5_DEF "DNA" -#define STR_TEMPLATE_NAME6_DEF "Inspiration" -#define STR_TEMPLATE_NAME7_DEF "Lush Green" -#define STR_TEMPLATE_NAME8_DEF "Metropolis" -#define STR_TEMPLATE_NAME9_DEF "Sunset" -#define STR_TEMPLATE_NAME10_DEF "Vintage" +#define STR_TEMPLATE_NAME1_DEF "Alizarin" +#define STR_TEMPLATE_NAME2_DEF "Beehive" +#define STR_TEMPLATE_NAME3_DEF "Blue_Curve" +#define STR_TEMPLATE_NAME4_DEF "Blueprint_Plans" +#define STR_TEMPLATE_NAME5_DEF "Bright Blue" +#define STR_TEMPLATE_NAME6_DEF "Classy_Red" +#define STR_TEMPLATE_NAME7_DEF "DNA" +#define STR_TEMPLATE_NAME8_DEF "Focus" +#define STR_TEMPLATE_NAME9_DEF "Forestbird" +#define STR_TEMPLATE_NAME10_DEF "Impress" +#define STR_TEMPLATE_NAME11_DEF "Inspiration" +#define STR_TEMPLATE_NAME12_DEF "Lights" +#define STR_TEMPLATE_NAME13_DEF "LushGreen" +#define STR_TEMPLATE_NAME14_DEF "Metropolis" +#define STR_TEMPLATE_NAME15_DEF "Midnightblue" +#define STR_TEMPLATE_NAME16_DEF "Nature_Illustration" +#define STR_TEMPLATE_NAME17_DEF "Pencil" +#define STR_TEMPLATE_NAME18_DEF "Piano" +#define STR_TEMPLATE_NAME19_DEF "Portfolio" +#define STR_TEMPLATE_NAME20_DEF "Progress" +#define STR_TEMPLATE_NAME21_DEF "Sunset" +#define STR_TEMPLATE_NAME22_DEF "Vintage" +#define STR_TEMPLATE_NAME23_DEF "Vivid" +#define STR_TEMPLATE_NAME24_DEF "CV" +#define STR_TEMPLATE_NAME25_DEF "Resume" +#define STR_TEMPLATE_NAME26_DEF "Default" +#define STR_TEMPLATE_NAME27_DEF "Modern" +#define STR_TEMPLATE_NAME28_DEF "Modern business letter sans-serif" +#define STR_TEMPLATE_NAME29_DEF "Modern business letter serif" +#define STR_TEMPLATE_NAME30_DEF "Businesscard-with-logo" #define SFX_ST_EDIT "..." diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index e963a8b7797a..f5beabedfe78 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -481,7 +481,27 @@ OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString) STR_TEMPLATE_NAME7_DEF, STR_TEMPLATE_NAME8_DEF, STR_TEMPLATE_NAME9_DEF, - STR_TEMPLATE_NAME10_DEF + STR_TEMPLATE_NAME10_DEF, + STR_TEMPLATE_NAME11_DEF, + STR_TEMPLATE_NAME12_DEF, + STR_TEMPLATE_NAME13_DEF, + STR_TEMPLATE_NAME14_DEF, + STR_TEMPLATE_NAME15_DEF, + STR_TEMPLATE_NAME16_DEF, + STR_TEMPLATE_NAME17_DEF, + STR_TEMPLATE_NAME18_DEF, + STR_TEMPLATE_NAME19_DEF, + STR_TEMPLATE_NAME20_DEF, + STR_TEMPLATE_NAME21_DEF, + STR_TEMPLATE_NAME22_DEF, + STR_TEMPLATE_NAME23_DEF, + STR_TEMPLATE_NAME24_DEF, + STR_TEMPLATE_NAME25_DEF, + STR_TEMPLATE_NAME26_DEF, + STR_TEMPLATE_NAME27_DEF, + STR_TEMPLATE_NAME28_DEF, + STR_TEMPLATE_NAME29_DEF, + STR_TEMPLATE_NAME30_DEF }; const char* STR_TEMPLATE_NAME[] = @@ -496,6 +516,26 @@ OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString) STR_TEMPLATE_NAME8, STR_TEMPLATE_NAME9, STR_TEMPLATE_NAME10, + STR_TEMPLATE_NAME11, + STR_TEMPLATE_NAME12, + STR_TEMPLATE_NAME13, + STR_TEMPLATE_NAME14, + STR_TEMPLATE_NAME15, + STR_TEMPLATE_NAME16, + STR_TEMPLATE_NAME17, + STR_TEMPLATE_NAME18, + STR_TEMPLATE_NAME19, + STR_TEMPLATE_NAME20, + STR_TEMPLATE_NAME21, + STR_TEMPLATE_NAME22, + STR_TEMPLATE_NAME23, + STR_TEMPLATE_NAME24, + STR_TEMPLATE_NAME25, + STR_TEMPLATE_NAME26, + STR_TEMPLATE_NAME27, + STR_TEMPLATE_NAME28, + STR_TEMPLATE_NAME29, + STR_TEMPLATE_NAME30 }; assert(SAL_N_ELEMENTS(aTemplateNames) == SAL_N_ELEMENTS(STR_TEMPLATE_NAME)); commit 87dc8399911b8534e590a3a65ac1f5a2e05fbb73 Author: László Németh <[email protected]> Date: Wed Dec 6 18:30:20 2017 +0100 Updated core Project: dictionaries 15e706c827258d471dfff9a88096a5c10ed7a9c9 tdf#95024 update Hungarian spelling dictionary â improved affix rules â extended pronunciation and common misspelling data for improved Hunspell suggestions - new and fixed words Change-Id: Ib8b9c371abcb764c3225180be2f0d6a21f757f09 Reviewed-on: https://gerrit.libreoffice.org/45975 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> (cherry picked from commit daa1165deae904b035dae296e97811fb2c4f771d) Reviewed-on: https://gerrit.libreoffice.org/46168 diff --git a/dictionaries b/dictionaries index 1773e0e987d4..15e706c82725 160000 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 1773e0e987d4ebe4b328b87a40f8f7155d12606d +Subproject commit 15e706c827258d471dfff9a88096a5c10ed7a9c9
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
