diff options
Diffstat (limited to 'xmlsecurity')
26 files changed, 159 insertions, 411 deletions
diff --git a/xmlsecurity/AllLangMoTarget_xsc.mk b/xmlsecurity/AllLangMoTarget_xsc.mk new file mode 100644 index 000000000000..90b80207cee3 --- /dev/null +++ b/xmlsecurity/AllLangMoTarget_xsc.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,xsc)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,xsc,xmlsecurity)) + +# vim: set noet sw=4 ts=4: diff --git a/xmlsecurity/AllLangResTarget_xsec.mk b/xmlsecurity/AllLangResTarget_xsec.mk deleted file mode 100644 index d2fce602fd8d..000000000000 --- a/xmlsecurity/AllLangResTarget_xsec.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,xmlsec)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,xmlsec,xmlsecurity)) - -$(eval $(call gb_AllLangResTarget_add_srs,xmlsec,\ - xmlsec/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,xmlsec/res)) - -$(eval $(call gb_SrsTarget_set_include,xmlsec/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/xmlsecurity/inc \ - -I$(SRCDIR)/xmlsecurity/source/dialogs \ -)) - -$(eval $(call gb_SrsTarget_add_files,xmlsec/res,\ - xmlsecurity/source/dialogs/certificateviewer.src \ - xmlsecurity/source/dialogs/digitalsignaturesdialog.src \ - xmlsecurity/source/component/warnbox.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index b14729ffc405..23435b0512a9 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\ Library_xmlsecurity \ Library_xsec_fw \ Library_xsec_xmlsec \ + UIConfig_xmlsec \ )) $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\ @@ -25,8 +26,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\ )) $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\ - AllLangResTarget_xsec \ - UIConfig_xmlsec \ + AllLangMoTarget_xsc \ )) # failing diff --git a/xmlsecurity/inc/global.hrc b/xmlsecurity/inc/global.hrc deleted file mode 100644 index 00dfdd33cc58..000000000000 --- a/xmlsecurity/inc/global.hrc +++ /dev/null @@ -1,29 +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 . - */ - -#ifndef INCLUDED_XMLSECURITY_INC_GLOBAL_HRC -#define INCLUDED_XMLSECURITY_INC_GLOBAL_HRC - -// global resource ids - -#define RID_XMLSECWB_NO_MOZILLA_PROFILE 1013 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 07008a0b5181..3bfbe07dabc5 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -252,7 +252,6 @@ #include <i18nlangtag/languagetag.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/typed_flags_set.hxx> -#include <rsc/rsc-vcl-shared-types.hxx> #include <sot/formats.hxx> #include <svtools/AccessibleBrowseBoxObjType.hxx> #include <svtools/accessibletableprovider.hxx> @@ -278,7 +277,6 @@ #include <tools/mapunit.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> diff --git a/xmlsecurity/inc/resourcemanager.hxx b/xmlsecurity/inc/resourcemanager.hxx index 659c65bc0431..cba9e7061f98 100644 --- a/xmlsecurity/inc/resourcemanager.hxx +++ b/xmlsecurity/inc/resourcemanager.hxx @@ -34,7 +34,7 @@ class LocaleDataWrapper; namespace XmlSec { - ResMgr* GetResMgr(); + const std::locale& GetResLocale(); const LocaleDataWrapper& GetLocaleData(); DateTime GetDateTime( const css::util::DateTime& _rDT ); @@ -51,9 +51,9 @@ namespace XmlSec OUString GetHexString( const css::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak = 0xFFFF ); } -inline OUString XsResId(sal_uInt16 nId) +inline OUString XsResId(const char* pId) { - return ResId(nId, *XmlSec::GetResMgr()); + return Translate::get(pId, XmlSec::GetResLocale()); } #endif diff --git a/xmlsecurity/inc/strings.hrc b/xmlsecurity/inc/strings.hrc new file mode 100644 index 000000000000..b572082ec6cf --- /dev/null +++ b/xmlsecurity/inc/strings.hrc @@ -0,0 +1,58 @@ +/* -*- 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 . + */ + +#ifndef INCLUDED_XMLSECURITY_INC_STRINGS_HRC +#define INCLUDED_XMLSECURITY_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_CERTIFICATE_NOT_VALIDATED NC_("STR_CERTIFICATE_NOT_VALIDATED", "The certificate could not be validated.") +#define STR_HEADERBAR NC_("STR_HEADERBAR", "Field\tValue") +#define STR_VERSION NC_("STR_VERSION", "Version") +#define STR_SERIALNUM NC_("STR_SERIALNUM", "Serial Number") +#define STR_ISSUER NC_("STR_ISSUER", "Issuer") +#define STR_VALIDFROM NC_("STR_VALIDFROM", "Valid From") +#define STR_VALIDTO NC_("STR_VALIDTO", "Valid to") +#define STR_SUBJECT NC_("STR_SUBJECT", "Subject") +#define STR_SUBJECT_PUBKEY_ALGO NC_("STR_SUBJECT_PUBKEY_ALGO", "Subject Algorithm") +#define STR_SUBJECT_PUBKEY_VAL NC_("STR_SUBJECT_PUBKEY_VAL", "Public Key") +#define STR_SIGNATURE_ALGO NC_("STR_SIGNATURE_ALGO", "Signature Algorithm") +#define STR_USE NC_("STR_USE", "Certificate Use") +#define STR_THUMBPRINT_SHA1 NC_("STR_THUMBPRINT_SHA1", "Thumbprint SHA1") +#define STR_THUMBPRINT_MD5 NC_("STR_THUMBPRINT_MD5", "Thumbprint MD5") + +#define STR_XMLSECDLG_OLD_ODF_FORMAT NC_("STR_XMLSECDLG_OLD_ODF_FORMAT", "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. " \ + "Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. " \ + "Thus no signatures can be added or removed to this document.\n\n" \ + "Save document in ODF 1.2 format and add all desired signatures again.") +#define STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN NC_("STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN", "Adding or removing a macro signature will remove all document signatures.\n" \ + "Do you really want to continue?") +#define STR_XMLSECDLG_QUERY_REALLYREMOVE NC_("STR_XMLSECDLG_QUERY_REALLYREMOVE", "Document signature cannot be restored, once removed.\n" \ + "Do you really want to remove selected signature?") + +#define STR_XMLSECDLG_SIGNING_FAILED NC_("STR_XMLSECDLG_SIGNING_FAILED", "An error occurred while adding the signature.") +#define STR_XMLSECDLG_NO_CERT_MANAGER NC_("STR_XMLSECDLG_NO_CERT_MANAGER", "Could not find any certificate manager.") +#define STR_XMLSECDLG_NO_CERT_FOUND NC_("STR_XMLSECDLG_NO_CERT_FOUND", "Could not find the certificate.") + +#define RID_XMLSECWB_NO_MOZILLA_PROFILE NC_("RID_XMLSECWB_NO_MOZILLA_PROFILE", "Digital signatures functionality could not be used, because no Mozilla user profile was found. Please check the Mozilla installation.") + + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index f092a7370ff3..6449ed254787 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -25,7 +25,7 @@ #include <certificateviewer.hxx> #include <macrosecurity.hxx> #include <biginteger.hxx> -#include <global.hrc> +#include <strings.hrc> #include <pdfsignaturehelper.hxx> #include <sax/tools/converter.hxx> diff --git a/xmlsecurity/source/component/warnbox.src b/xmlsecurity/source/component/warnbox.src deleted file mode 100644 index 38f090ce6f6c..000000000000 --- a/xmlsecurity/source/component/warnbox.src +++ /dev/null @@ -1,27 +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 <global.hrc> - -String RID_XMLSECWB_NO_MOZILLA_PROFILE -{ - Text [ en-US ] = "Digital signatures functionality could not be used, because no Mozilla user profile was found. Please check the Mozilla installation." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index e4afcacf4714..1b7d94b5bdd7 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -29,8 +29,9 @@ #include <unotools/datetime.hxx> #include <svtools/treelistentry.hxx> -#include "dialogs.hrc" +#include "strings.hrc" #include "resourcemanager.hxx" +#include "svtools/controldims.hxx" #include "bitmaps.hlst" #include <vcl/settings.hxx> diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src deleted file mode 100644 index a3820fc59117..000000000000 --- a/xmlsecurity/source/dialogs/certificateviewer.src +++ /dev/null @@ -1,92 +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 "dialogs.hrc" - -String STR_CERTIFICATE_NOT_VALIDATED -{ - Text [ en-US ] = "The certificate could not be validated."; -}; - -String STR_HEADERBAR -{ - Text [ en-US ] = "Field\tValue"; -}; - -String STR_VERSION -{ - Text [ en-US ] = "Version"; -}; - -String STR_SERIALNUM -{ - Text [ en-US ] = "Serial Number"; -}; - -String STR_ISSUER -{ - Text [ en-US ] = "Issuer"; -}; - -String STR_VALIDFROM -{ - Text [ en-US ] = "Valid From"; -}; - -String STR_VALIDTO -{ - Text [ en-US ] = "Valid to"; -}; - -String STR_SUBJECT -{ - Text [ en-US ] = "Subject"; -}; - -String STR_SUBJECT_PUBKEY_ALGO -{ - Text [ en-US ] = "Subject Algorithm"; -}; - -String STR_SUBJECT_PUBKEY_VAL -{ - Text [ en-US ] = "Public Key"; -}; - -String STR_SIGNATURE_ALGO -{ - Text [ en-US ] = "Signature Algorithm"; -}; - -String STR_USE -{ - Text [ en-US ] = "Certificate Use"; -}; - -String STR_THUMBPRINT_SHA1 -{ - Text [ en-US ] = "Thumbprint SHA1"; -}; - -String STR_THUMBPRINT_MD5 -{ - Text [ en-US ] = "Thumbprint MD5"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc deleted file mode 100644 index a0abefacb401..000000000000 --- a/xmlsecurity/source/dialogs/dialogs.hrc +++ /dev/null @@ -1,45 +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 . - */ - -#ifndef INCLUDED_XMLSECURITY_SOURCE_DIALOGS_DIALOGS_HRC -#define INCLUDED_XMLSECURITY_SOURCE_DIALOGS_DIALOGS_HRC - -#include <svtools/controldims.hrc> -#include <global.hrc> - -#define STR_HEADERBAR 256 -#define STR_VERSION 257 -#define STR_SERIALNUM 258 -#define STR_ISSUER 259 -#define STR_VALIDFROM 260 -#define STR_VALIDTO 261 -#define STR_SUBJECT 262 -#define STR_SUBJECT_PUBKEY_ALGO 263 -#define STR_SUBJECT_PUBKEY_VAL 264 -#define STR_SIGNATURE_ALGO 266 -#define STR_THUMBPRINT_SHA1 267 -#define STR_THUMBPRINT_MD5 268 -#define STR_USE 271 - -// --------- tab page Certificate viewer - General --------- -#define STR_CERTIFICATE_NOT_VALIDATED 269 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 85edf4391561..2b79174c615f 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -49,8 +49,7 @@ #include <tools/time.hxx> #include <svtools/treelistentry.hxx> -#include "dialogs.hrc" -#include "digitalsignaturesdialog.hrc" +#include "strings.hrc" #include "resourcemanager.hxx" #include <vcl/layout.hxx> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc deleted file mode 100644 index c56c26da96d1..000000000000 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc +++ /dev/null @@ -1,34 +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 . - */ - -#ifndef INCLUDED_DIGITALSIGNATURESDIALOG_HRC -#define INCLUDED_DIGITALSIGNATURESDIALOG_HRC - -//global.hrc in inc starts at 1000 -#define RID_DIGITALSIGNATUREDLG_START 2000 - -#define STR_XMLSECDLG_OLD_ODF_FORMAT RID_DIGITALSIGNATUREDLG_START -#define STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN (RID_DIGITALSIGNATUREDLG_START + 1) -#define STR_XMLSECDLG_QUERY_REALLYREMOVE (RID_DIGITALSIGNATUREDLG_START + 2) -#define STR_XMLSECDLG_SIGNING_FAILED (RID_DIGITALSIGNATUREDLG_START + 3) -#define STR_XMLSECDLG_NO_CERT_MANAGER (RID_DIGITALSIGNATUREDLG_START + 4) -#define STR_XMLSECDLG_NO_CERT_FOUND (RID_DIGITALSIGNATUREDLG_START + 5) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src deleted file mode 100644 index a01f7d1a33b6..000000000000 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src +++ /dev/null @@ -1,59 +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 "dialogs.hrc" -#include "digitalsignaturesdialog.hrc" - -String STR_XMLSECDLG_OLD_ODF_FORMAT -{ - Text [ en-US ] = - "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. " - "Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. " - "Thus no signatures can be added or removed to this document.\n\n" - "Save document in ODF 1.2 format and add all desired signatures again."; -}; - -String STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN -{ - Text [ en-US ] = "Adding or removing a macro signature will remove all document signatures.\n" - "Do you really want to continue?"; -}; - -String STR_XMLSECDLG_QUERY_REALLYREMOVE -{ - Text [ en-US ] = "Document signature cannot be restored, once removed.\n" - "Do you really want to remove selected signature?"; -}; - -String STR_XMLSECDLG_SIGNING_FAILED -{ - Text [ en-US ] = "An error occurred while adding the signature."; -}; - -String STR_XMLSECDLG_NO_CERT_MANAGER -{ - Text [ en-US ] = "Could not find any certificate manager."; -}; - -String STR_XMLSECDLG_NO_CERT_FOUND -{ - Text [ en-US ] = "Could not find the certificate."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 63a112361280..7616d5fd9992 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -41,7 +41,7 @@ #include <vcl/msgbox.hxx> -#include "dialogs.hrc" +#include "strings.hrc" #include "resourcemanager.hxx" using namespace ::com::sun::star; diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index 5b04868e52a1..9296c02a89d4 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -32,13 +32,10 @@ using namespace std; namespace XmlSec { - static ResMgr* pResMgr = nullptr; - - ResMgr* GetResMgr() + const std::locale& GetResLocale() { - if (!pResMgr) - pResMgr = ResMgr::CreateResMgr("xmlsec"); - return pResMgr; + static const std::locale loc = Translate::Create("xsc", Application::GetSettings().GetUILanguageTag()); + return loc; } const LocaleDataWrapper& GetLocaleData() diff --git a/xmlsecurity/uiconfig/ui/certdetails.ui b/xmlsecurity/uiconfig/ui/certdetails.ui index 75fec82e52f9..ae9a27bd7438 100644 --- a/xmlsecurity/uiconfig/ui/certdetails.ui +++ b/xmlsecurity/uiconfig/ui/certdetails.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="xsc"> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkBox" id="CertDetails"> diff --git a/xmlsecurity/uiconfig/ui/certgeneral.ui b/xmlsecurity/uiconfig/ui/certgeneral.ui index 3bf3792a54de..b570b32348a6 100644 --- a/xmlsecurity/uiconfig/ui/certgeneral.ui +++ b/xmlsecurity/uiconfig/ui/certgeneral.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="xsc"> <requires lib="gtk+" version="3.10"/> <object class="GtkBox" id="box1"> <property name="visible">True</property> @@ -29,7 +29,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Certificate Information</property> + <property name="label" translatable="yes" context="certgeneral|label1">Certificate Information</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -67,7 +67,7 @@ <property name="margin_right">36</property> <property name="margin_bottom">108</property> <property name="xalign">0</property> - <property name="label" translatable="yes">This certificate is validated.</property> + <property name="label" translatable="yes" context="certgeneral|hintnotrust">This certificate is validated.</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -100,7 +100,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Issued to: </property> + <property name="label" translatable="yes" context="certgeneral|issued_to">Issued to: </property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -127,7 +127,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Issued by: </property> + <property name="label" translatable="yes" context="certgeneral|issued_by">Issued by: </property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -153,7 +153,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Valid from:</property> + <property name="label" translatable="yes" context="certgeneral|valid_from">Valid from:</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -184,7 +184,7 @@ <object class="GtkLabel" id="privatekey"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">You have a private key that corresponds to this certificate.</property> + <property name="label" translatable="yes" context="certgeneral|privatekey">You have a private key that corresponds to this certificate.</property> </object> <packing> <property name="expand">False</property> @@ -204,7 +204,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Valid to:</property> + <property name="label" translatable="yes" context="certgeneral|valid_to">Valid to:</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/xmlsecurity/uiconfig/ui/certpage.ui b/xmlsecurity/uiconfig/ui/certpage.ui index a1207161e9bf..c6e3e71d752a 100644 --- a/xmlsecurity/uiconfig/ui/certpage.ui +++ b/xmlsecurity/uiconfig/ui/certpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.0 on Thu Jan 30 10:32:36 2014 --> -<interface> +<interface domain="xsc"> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkBox" id="CertPage"> @@ -23,7 +23,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Certification path</property> + <property name="label" translatable="yes" context="certpage|label1">Certification path</property> <property name="use_underline">True</property> <property name="mnemonic_widget">signatures:border</property> </object> @@ -36,7 +36,7 @@ </child> <child> <object class="GtkButton" id="viewcert"> - <property name="label" translatable="yes">View Certificate...</property> + <property name="label" translatable="yes" context="certpage|viewcert">View Certificate...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -87,7 +87,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Certification status</property> + <property name="label" translatable="yes" context="certpage|label2">Certification status</property> <property name="use_underline">True</property> <property name="mnemonic_widget">status:border</property> </object> @@ -124,7 +124,7 @@ <object class="GtkLabel" id="certok"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">The certificate is OK.</property> + <property name="label" translatable="yes" context="certpage|certok">The certificate is OK.</property> </object> <packing> <property name="expand">False</property> @@ -136,7 +136,7 @@ <object class="GtkLabel" id="certnotok"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">The certificate could not be validated.</property> + <property name="label" translatable="yes" context="certpage|certnotok">The certificate could not be validated.</property> </object> <packing> <property name="expand">False</property> diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui index 487bebdf8764..84924a6ebdda 100644 --- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui +++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="xsc"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="DigitalSignaturesDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Digital Signatures</property> + <property name="title" translatable="yes" context="digitalsignaturesdialog|DigitalSignaturesDialog">Digital Signatures</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -67,7 +67,7 @@ <object class="GtkLabel" id="dochint"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">The following have signed the document content: </property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|dochint">The following have signed the document content: </property> <property name="xalign">0</property> </object> <packing> @@ -99,7 +99,7 @@ <property name="layout_style">spread</property> <child> <object class="GtkButton" id="view"> - <property name="label" translatable="yes">View Certificate...</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|view">View Certificate...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -112,7 +112,7 @@ </child> <child> <object class="GtkButton" id="sign"> - <property name="label" translatable="yes">Sign Document...</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|sign">Sign Document...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -126,7 +126,7 @@ </child> <child> <object class="GtkButton" id="remove"> - <property name="label" translatable="yes">Remove</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|remove">Remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -139,7 +139,7 @@ </child> <child> <object class="GtkButton" id="start_certmanager"> - <property name="label" translatable="yes">Start Certificate Manager...</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|start_certmanager">Start Certificate Manager...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -167,7 +167,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Signed by </property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|signed">Signed by </property> </object> <packing> <property name="left_attach">0</property> @@ -179,7 +179,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Digital ID issued by </property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|issued">Digital ID issued by </property> </object> <packing> <property name="left_attach">1</property> @@ -191,7 +191,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Date</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|date">Date</property> </object> <packing> <property name="left_attach">2</property> @@ -202,7 +202,7 @@ <object class="GtkLabel" id="description"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Description</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|description">Description</property> </object> <packing> <property name="left_attach">3</property> @@ -213,7 +213,7 @@ <object class="GtkLabel" id="type"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Signature type</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|type">Signature type</property> </object> <packing> <property name="left_attach">4</property> @@ -230,7 +230,7 @@ <object class="GtkLabel" id="macrohint"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">The following have signed the document macro:</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|macrohint">The following have signed the document macro:</property> <property name="xalign">0</property> </object> <packing> @@ -242,7 +242,7 @@ <object class="GtkLabel" id="packagehint"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">The following have signed this package:</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|packagehint">The following have signed this package:</property> <property name="xalign">0</property> </object> <packing> @@ -260,7 +260,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">The signatures in this document are valid</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|validft">The signatures in this document are valid</property> <property name="xalign">0</property> </object> <packing> @@ -284,7 +284,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">The signatures in this document are invalid</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|invalidft">The signatures in this document are invalid</property> <property name="xalign">0</property> </object> <packing> @@ -297,7 +297,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Not all parts of the document are signed</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|oldsignatureft">Not all parts of the document are signed</property> <property name="xalign">0</property> </object> <packing> @@ -310,7 +310,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Certificate could not be validated</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|notvalidatedft">Certificate could not be validated</property> <property name="xalign">0</property> </object> <packing> @@ -359,7 +359,7 @@ </child> <child> <object class="GtkCheckButton" id="adescompliant"> - <property name="label" translatable="yes">Use AdES-compliant signature when there is a choice</property> + <property name="label" translatable="yes" context="digitalsignaturesdialog|adescompliant">Use AdES-compliant signature when there is a choice</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui b/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui index 9a4c17cb39a3..4b4d3b41f521 100644 --- a/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui +++ b/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="xsc"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="MacroSecurityDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Macro Security</property> + <property name="title" translatable="yes" context="macrosecuritydialog|MacroSecurityDialog">Macro Security</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -97,7 +97,7 @@ <object class="GtkLabel" id="SecurityLevelPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Security Level</property> + <property name="label" translatable="yes" context="macrosecuritydialog|SecurityLevelPage">Security Level</property> </object> <packing> <property name="tab_fill">False</property> @@ -110,7 +110,7 @@ <object class="GtkLabel" id="SecurityTrustPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Trusted Sources</property> + <property name="label" translatable="yes" context="macrosecuritydialog|SecurityTrustPage">Trusted Sources</property> </object> <packing> <property name="position">1</property> diff --git a/xmlsecurity/uiconfig/ui/securitylevelpage.ui b/xmlsecurity/uiconfig/ui/securitylevelpage.ui index 78674f0f6704..32260fec6225 100644 --- a/xmlsecurity/uiconfig/ui/securitylevelpage.ui +++ b/xmlsecurity/uiconfig/ui/securitylevelpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="xsc"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="SecurityLevelPage"> <property name="visible">True</property> @@ -11,7 +11,7 @@ <property name="row_homogeneous">True</property> <child> <object class="GtkRadioButton" id="low:wrap"> - <property name="label" translatable="yes">_Low (not recommended). + <property name="label" translatable="yes" context="securitylevelpage|low">_Low (not recommended). All macros will be executed without confirmation. Use this setting only if you are certain that all documents that will be opened are safe.</property> <property name="visible">True</property> @@ -29,7 +29,7 @@ Use this setting only if you are certain that all documents that will be opened </child> <child> <object class="GtkRadioButton" id="med:wrap"> - <property name="label" translatable="yes">_Medium. + <property name="label" translatable="yes" context="securitylevelpage|med">_Medium. Confirmation required before executing macros from untrusted sources.</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -46,7 +46,7 @@ Confirmation required before executing macros from untrusted sources.</property> </child> <child> <object class="GtkRadioButton" id="high:wrap"> - <property name="label" translatable="yes">H_igh. + <property name="label" translatable="yes" context="securitylevelpage|high">H_igh. Only signed macros from trusted sources are allowed to run. Unsigned macros are disabled.</property> <property name="visible">True</property> @@ -65,7 +65,7 @@ Unsigned macros are disabled.</property> </child> <child> <object class="GtkRadioButton" id="vhigh:wrap"> - <property name="label" translatable="yes">_Very high. + <property name="label" translatable="yes" context="securitylevelpage|vhigh">_Very high. Only macros from trusted file locations are allowed to run. All other macros, regardless whether signed or not, are disabled.</property> <property name="visible">True</property> diff --git a/xmlsecurity/uiconfig/ui/securitytrustpage.ui b/xmlsecurity/uiconfig/ui/securitytrustpage.ui index 9e464d23c459..5e0a8472f594 100644 --- a/xmlsecurity/uiconfig/ui/securitytrustpage.ui +++ b/xmlsecurity/uiconfig/ui/securitytrustpage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="xsc"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkBox" id="SecurityTrustPage"> <property name="visible">True</property> @@ -40,7 +40,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="viewcert"> - <property name="label" translatable="yes">_View...</property> + <property name="label" translatable="yes" context="securitytrustpage|viewcert">_View...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -83,7 +83,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Issued to</property> + <property name="label" translatable="yes" context="securitytrustpage|to">Issued to</property> </object> <packing> <property name="left_attach">0</property> @@ -97,7 +97,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Issued by</property> + <property name="label" translatable="yes" context="securitytrustpage|by">Issued by</property> </object> <packing> <property name="left_attach">1</property> @@ -111,7 +111,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Expiration date</property> + <property name="label" translatable="yes" context="securitytrustpage|date">Expiration date</property> </object> <packing> <property name="left_attach">2</property> @@ -169,7 +169,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Trusted Certificates</property> + <property name="label" translatable="yes" context="securitytrustpage|label3">Trusted Certificates</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -212,7 +212,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Document macros are always executed if they have been opened from one of the following locations.</property> + <property name="label" translatable="yes" context="securitytrustpage|label8">Document macros are always executed if they have been opened from one of the following locations.</property> <property name="wrap">True</property> <property name="max_width_chars">56</property> </object> @@ -231,7 +231,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="addfile"> - <property name="label" translatable="yes">A_dd...</property> + <property name="label" translatable="yes" context="securitytrustpage|addfile">A_dd...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -318,7 +318,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Trusted File Locations</property> + <property name="label" translatable="yes" context="securitytrustpage|label4">Trusted File Locations</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui index 57494738eda0..ac6c253dabdd 100644 --- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui +++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="xsc"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="SelectCertificateDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Select Certificate</property> + <property name="title" translatable="yes" context="selectcertificatedialog|SelectCertificateDialog">Select Certificate</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -89,7 +89,7 @@ <object class="GtkLabel" id="issuedto"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Issued to </property> + <property name="label" translatable="yes" context="selectcertificatedialog|issuedto">Issued to </property> </object> <packing> <property name="left_attach">0</property> @@ -100,7 +100,7 @@ <object class="GtkLabel" id="issuedby"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Issued by</property> + <property name="label" translatable="yes" context="selectcertificatedialog|issuedby">Issued by</property> </object> <packing> <property name="left_attach">1</property> @@ -111,7 +111,7 @@ <object class="GtkLabel" id="usage"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Certificate usage</property> + <property name="label" translatable="yes" context="selectcertificatedialog|usage">Certificate usage</property> </object> <packing> <property name="left_attach">2</property> @@ -122,7 +122,7 @@ <object class="GtkLabel" id="expiration"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Expiration date</property> + <property name="label" translatable="yes" context="selectcertificatedialog|expiration">Expiration date</property> </object> <packing> <property name="left_attach">3</property> @@ -133,7 +133,7 @@ <object class="GtkLabel" id="type"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Type</property> + <property name="label" translatable="yes" context="selectcertificatedialog|type">Type</property> </object> <packing> <property name="left_attach">4</property> @@ -145,42 +145,42 @@ <object class="GtkLabel" id="STR_DIGITAL_SIGNATURE"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Digital signature</property> + <property name="label" translatable="yes" context="selectcertificatedialog|STR_DIGITAL_SIGNATURE">Digital signature</property> </object> <object class="GtkLabel" id="STR_NON_REPUDIATION"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Non-repudiation</property> + <property name="label" translatable="yes" context="selectcertificatedialog|STR_NON_REPUDIATION">Non-repudiation</property> </object> <object class="GtkLabel" id="STR_KEY_ENCIPHERMENT"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Key encipherment</property> + <property name="label" translatable="yes" context="selectcertificatedialog|STR_KEY_ENCIPHERMENT">Key encipherment</property> </object> <object class="GtkLabel" id="STR_DATA_ENCIPHERMENT"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Data encipherment</property> + <property name="label" translatable="yes" context="selectcertificatedialog|STR_DATA_ENCIPHERMENT">Data encipherment</property> </object> <object class="GtkLabel" id="STR_KEY_AGREEMENT"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Key Agreement</property> + <property name="label" translatable="yes" context="selectcertificatedialog|STR_KEY_AGREEMENT">Key Agreement</property> </object> <object class="GtkLabel" id="STR_KEY_CERT_SIGN"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Certificate signature verification</property> + <property name="label" translatable="yes" context="selectcertificatedialog|STR_KEY_CERT_SIGN">Certificate signature verification</property> </object> <object class="GtkLabel" id="STR_CRL_SIGN"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">CRL signature verification</property> + <property name="label" translatable="yes" context="selectcertificatedialog|STR_CRL_SIGN">CRL signature verification</property> </object> <object class="GtkLabel" id="STR_ENCIPHER_ONLY"> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">Only for encipherment</property> + <property name="label" translatable="yes" context="selectcertificatedialog|STR_ENCIPHER_ONLY">Only for encipherment</property> </object> </child> </object> @@ -195,7 +195,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="ypad">1</property> - <property name="label" translatable="yes">Select the certificate you want to use for signing:</property> + <property name="label" translatable="yes" context="selectcertificatedialog|label1">Select the certificate you want to use for signing:</property> </object> <packing> <property name="left_attach">0</property> @@ -219,7 +219,7 @@ </child> <child> <object class="GtkButton" id="viewcert"> - <property name="label" translatable="yes">View Certificate...</property> + <property name="label" translatable="yes" context="selectcertificatedialog|viewcert">View Certificate...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -239,7 +239,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Description:</property> + <property name="label" translatable="yes" context="selectcertificatedialog|label2">Description:</property> </object> <packing> <property name="expand">False</property> diff --git a/xmlsecurity/uiconfig/ui/viewcertdialog.ui b/xmlsecurity/uiconfig/ui/viewcertdialog.ui index 8507d85c0fcc..c9464f9cf3e1 100644 --- a/xmlsecurity/uiconfig/ui/viewcertdialog.ui +++ b/xmlsecurity/uiconfig/ui/viewcertdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="xsc"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="ViewCertDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">View Certificate</property> + <property name="title" translatable="yes" context="viewcertdialog|ViewCertDialog">View Certificate</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -69,7 +69,7 @@ <object class="GtkLabel" id="general"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">General</property> + <property name="label" translatable="yes" context="viewcertdialog|general">General</property> </object> <packing> <property name="tab_fill">False</property> @@ -82,7 +82,7 @@ <object class="GtkLabel" id="details"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Details</property> + <property name="label" translatable="yes" context="viewcertdialog|details">Details</property> </object> <packing> <property name="position">1</property> @@ -96,7 +96,7 @@ <object class="GtkLabel" id="path"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Certification Path</property> + <property name="label" translatable="yes" context="viewcertdialog|path">Certification Path</property> </object> <packing> <property name="position">2</property> |