Fix the lowercase letter in the name of twin style to match the other occurrences.

Add loading translation catalog during twin style initialization.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f1a743b321)

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
 	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

CMakeL10n.txt

@@ -0,0 +1,23 @@
+#################################################
+#
+#  (C) 2019 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+##### include our cmake modules #################
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

CMakeLists.txt

@@ -7,13 +7,13 @@
 ############################################
 
 
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 2.8.12 )
 
 
 #### general package setup
 
 project( tde-style-ia-ora )
-set( VERSION R14.1.0 )
+set( VERSION R14.0.11 )
 
 
 #### include essential cmake modules
@@ -45,6 +45,12 @@ option( WITH_ALL_OPTIONS "Enable all optional support" OFF
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
 
 
+##### user requested modules
+
+option( BUILD_ALL          "Build all" ON )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
 ##### configure checks
 
 include( ConfigureChecks.cmake )
@@ -64,6 +70,11 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
 add_subdirectory( src )
 
 
+##### other data ################################
+
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
+
+
 ##### write configure files
 
 configure_file( config.h.cmake config.h @ONLY )

admin

@@ -1 +1 @@
-Subproject commit ae96f3ea4882e243513827da7c2ab889af3b1608
+Subproject commit 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8f

cmake

@@ -1 +0,0 @@
-Subproject commit 63b5532a298ccf95e310ae853ff53ade506daf7e

src/CMakeL10n.txt

@@ -0,0 +1,10 @@
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )
+
+tde_l10n_create_template(
+  CATALOG "desktop_files/tde-style-ia-ora-desktops"
+  SOURCES_DESKTOP
+    widget/ia_ora.themerc
+    twin/iaora.desktop
+)

src/twin/CMakeL10n.txt

@@ -0,0 +1,7 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+  CATALOG "messages/twin_iaora/"
+  SOURCES .
+  X-POT ${CMAKE_SOURCE_DIR}/../../../core/tde-i18n/template/messages/tdebase/twin_clients.pot
+)

src/twin/config/config.cpp

@@ -42,6 +42,7 @@ IaOraConfig::IaOraConfig(TDEConfig* config, TQWidget* parent)
     // create the configuration object
     m_config = new TDEConfig("twiniaorarc");
     TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_iaora");
 
     // create and show the configuration dialog
     m_dialog = new ConfigDialog(parent);

src/twin/iaora.cpp

@@ -27,6 +27,8 @@
 #include <tqimage.h>
 #include <tqapplication.h>
 #include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 
@@ -41,6 +43,9 @@ namespace KWinIaOra
 
 IaOraHandler::IaOraHandler()
 {
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_iaora");
+
     memset(m_pixmaps, 0, sizeof(TQPixmap*)*NumPixmaps*2*2); // set elements to 0
     memset(m_bitmaps, 0, sizeof(TQBitmap*)*NumButtonIcons*2);
 

src/twin/iaora.desktop

@@ -1,5 +1,4 @@
 [Desktop Entry]
+Name=Ia Ora
 Encoding=UTF-8
-Icon=
-Name=Ia ora
 X-TDE-Library=twin3_iaora

src/widget/ia_ora.cpp

@@ -3457,5 +3457,3 @@ bool MandrivaStyle::isFormWidget(const TQWidget* widget) const
 
     return true;
 }
-
-// vim: ts=4 et sw=4

src/widget/ia_ora.h

@@ -328,5 +328,3 @@ private:
 };
 
 #endif
-
-// vim: ts=4 et sw=4

src/widget/ia_ora.themerc

@@ -1,6 +1,6 @@
 [Misc]
 Name=Ia Ora
 Comment=Mandriva Widget Style
+
 [KDE]
 WidgetStyle=ia_ora
-

translations/desktop_files/tde-style-ia-ora-desktops.pot

@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-12 13:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: widget/ia_ora.themerc:2 twin/iaora.desktop:2
+msgid "Ia Ora"
+msgstr ""
+
+#. Comment
+#: widget/ia_ora.themerc:3
+msgid "Mandriva Widget Style"
+msgstr ""

translations/messages/twin_iaora/twin_iaora.pot

@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2021-07-12 12:47+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
+#, ignore-inconsistent
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
+#, ignore-inconsistent
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: iaoraclient.cpp:58
+msgid "Ia Ora"
+msgstr ""