summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2016-02-02 22:38:58 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-02-05 15:34:02 +0000
commit1b6e2453c3ac4298f6b2b557e5e6510ec6619518 (patch)
treea3fd16082bcf593c63289c38849d58f5e672a0c3
parentdea370d7bb0ce4b8190dc98976b2691fce659952 (diff)
tdf#97512 make strings localizable
Reviewed-on: https://gerrit.libreoffice.org/22063 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit e4b98408f60fdbe8248540da58bde8a9bf00c461) Change-Id: I518918689e81475e9aaf0023cf91f4860531ad1e Reviewed-on: https://gerrit.libreoffice.org/22070 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--vcl/AllLangResTarget_vcl.mk1
-rw-r--r--vcl/inc/svids.hrc6
-rw-r--r--vcl/source/app/svapp.cxx10
-rw-r--r--vcl/source/src/app.src37
4 files changed, 49 insertions, 5 deletions
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 7c286bf4523e..822b3a24b679 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
))
$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
+ vcl/source/src/app.src \
vcl/source/src/btntext.src \
vcl/source/src/helptext.src \
vcl/source/src/menu.src \
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 62e32033d41c..04ecc9422bd2 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -177,6 +177,12 @@
#define SV_FUNIT_STRINGS 10700
+#define SV_APP_CPUTHREADS 10800
+#define SV_APP_OSVERSION 10801
+#define SV_APP_UIRENDER 10802
+#define SV_APP_GL 10803
+#define SV_APP_DEFAULT 10804
+
#define SV_ICON_SIZE48_START 20000
#define SV_ICON_SIZE32_START 21000
#define SV_ICON_SIZE16_START 23000
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 0f5780801b76..ef0847d56d5b 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1189,7 +1189,7 @@ OUString Application::GetHWOSConfInfo()
ImplSVData* pSVData = ImplGetSVData();
OUStringBuffer aDetails;
- aDetails.append( "CPU Threads: " );
+ aDetails.append( VclResId(SV_APP_CPUTHREADS).toString() );
aDetails.append( (sal_Int32)
std::thread::hardware_concurrency() );
aDetails.append( "; " );
@@ -1200,15 +1200,15 @@ OUString Application::GetHWOSConfInfo()
else
aVersion = "-";
- aDetails.append( "OS Version: " );
+ aDetails.append( VclResId(SV_APP_OSVERSION).toString() );
aDetails.append( aVersion );
aDetails.append( "; " );
- aDetails.append( "UI Render: " );
+ aDetails.append( VclResId(SV_APP_UIRENDER).toString() );
if ( OpenGLWrapper::isVCLOpenGLEnabled() )
- aDetails.append( "GL" );
+ aDetails.append( VclResId(SV_APP_GL).toString() );
else
- aDetails.append( "default" );
+ aDetails.append( VclResId(SV_APP_DEFAULT).toString() );
aDetails.append( "; " );
return aDetails.makeStringAndClear();
diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
new file mode 100644
index 000000000000..91d9df128c4c
--- /dev/null
+++ b/vcl/source/src/app.src
@@ -0,0 +1,37 @@
+/* -*- 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/.
+ */
+
+#include "svids.hrc"
+
+String SV_APP_CPUTHREADS
+{
+ Text [en-US] = "CPU Threads: ";
+};
+
+String SV_APP_OSVERSION
+{
+ Text [en-US] = "OS Version: ";
+};
+
+String SV_APP_UIRENDER
+{
+ Text [en-US] = "UI Render: ";
+};
+
+String SV_APP_GL
+{
+ Text [en-US] = "GL";
+};
+
+String SV_APP_DEFAULT
+{
+ Text [ en-US ] = "default";
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */