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 --- sw/source/ui/dochdl/dochdl.src | 65 ----------------------------------------- sw/source/ui/dochdl/selglos.cxx | 2 +- 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 sw/source/ui/dochdl/dochdl.src (limited to 'sw/source/ui/dochdl') diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src deleted file mode 100644 index e2de36634542..000000000000 --- a/sw/source/ui/dochdl/dochdl.src +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dochdl.hrc" -#include "globals.hrc" - -String STR_NOGLOS -{ - Text [ en-US ] = "AutoText for Shortcut '%1' not found." ; -}; - -String STR_NO_TABLE -{ - Text [ en-US ] = "A table with no rows or no cells cannot be inserted"; -}; - -String STR_TABLE_TOO_LARGE -{ - Text [ en-US ] = "The table cannot be inserted because it is too large"; -}; - -String STR_ERR_INSERT_GLOS -{ - Text [ en-US ] = "AutoText could not be created." ; -}; - -String STR_CLPBRD_FORMAT_ERROR -{ - Text [ en-US ] = "Requested clipboard format is not available." ; -}; - -String STR_PRIVATETEXT -{ - Text [ en-US ] = "%PRODUCTNAME Writer" ; -}; -String STR_PRIVATEGRAPHIC -{ - Text [ en-US ] = "Image [%PRODUCTNAME Writer]" ; -}; -String STR_PRIVATEOLE -{ - Text [ en-US ] = "Object [%PRODUCTNAME Writer]" ; -}; -String STR_DDEFORMAT -{ - Text [ en-US ] = "DDE link" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index 2332d2a7e2aa..dd70fbdada59 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -21,7 +21,7 @@ #include "selglos.hxx" -#include "dochdl.hrc" +#include "strings.hrc" #include SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) -- cgit