[Libreoffice-commits] core.git: vcl/AllLangResTarget_vcl.mk vcl/inc vcl/source

[Andras Timar]

 vcl/AllLangResTarget_vcl.mk |    1 +
 vcl/inc/svids.hrc           |    6 ++++++
 vcl/source/app/svapp.cxx    |   10 +++++-----
 vcl/source/src/app.src      |   37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)

New commits:
commit e4b98408f60fdbe8248540da58bde8a9bf00c461
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Feb 2 22:38:58 2016 +0100

    tdf#97512 make strings localizable
    
    Change-Id: I518918689e81475e9aaf0023cf91f4860531ad1e
    Reviewed-on: https://gerrit.libreoffice.org/22063
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 7c286bf..822b3a2 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 d66ea92..e23fdc5 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -178,6 +178,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 b22812e..b0d9111 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 0000000..91d9df1
--- /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: */