Merge translation files from master branch.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.gitmodules

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

CMakeL10n.txt

@@ -0,0 +1,58 @@
+#################################################
+#
+#  (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 )
+
+
+##### prepare strings from data files ###########
+
+## style names
+file( GLOB_RECURSE _style_files
+      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/data/styles/*.xml )
+unset( _styles_l10n )
+foreach( _style_file ${_style_files} )
+    get_filename_component( _style_name "${_style_file}" NAME_WE )
+    string( REPLACE "_" " " _style_name "${_style_name}" )
+    set( _styles_l10n "${_styles_l10n}i18n(\"${_style_name}\");\n" )
+endforeach( )
+file( WRITE "${CMAKE_CURRENT_SOURCE_DIR}/data/styles/.tde_l10n" "${_styles_l10n}" )
+
+## font attributes
+set( _fonts_attribs "data/fonts/mappings/*.xml" )
+foreach( _fonts_attrib
+    "rosegarden-font-encoding,name"
+    "font-information,origin"
+    "font-information,copyright"
+    "font-information,mapped-by"
+    "font-information,type" )
+
+    set( _fonts_attribs "${_fonts_attribs}:${_fonts_attrib}" )
+endforeach( )
+
+
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "rosegarden"
+    SOURCES
+        "src"
+        "doc/en/tips"
+        "data/styles/.tde_l10n"
+    ATTRIBUTES
+        ${_fonts_attribs}
+)

CMakeLists.txt

@@ -99,8 +99,8 @@ add_definitions(
 )
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
-set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
 
 ##### source directories ########################

ConfigureChecks.cmake

@@ -9,27 +9,26 @@
 #
 #################################################
 
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
 ##### check for gcc visibility support #########
-# FIXME
-# This should check for [T]Qt3 visibility support
 
 if( WITH_GCC_VISIBILITY )
-  if( NOT UNIX )
-    tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" )
-  endif( NOT UNIX )
-  set( __KDE_HAVE_GCC_VISIBILITY 1 )
-  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+  tde_setup_gcc_visibility( )
 endif( )
 
 
-if( BUILD_TRANSLATIONS AND NOT DEFINED MSGFMT_EXECUTABLE )
-  find_program( MSGFMT_EXECUTABLE msgfmt )
-  if( NOT MSGFMT_EXECUTABLE )
-    tde_message_fatal( "msgfmt program is required, but was not found on your system" )
-  endif( )
-endif( )
-
 # Initialize some variables
 SET(HAVE_XFT FALSE)
 SET(HAVE_ALSA FALSE)
@@ -243,7 +242,3 @@ check_include_file( systems.h HAVE_SYSTEMS_H )
 check_include_file( linux/inotify.h HAVE_INOTIFY )
 
 check_function_exists( statvfs HAVE_STATVFS )
-
-# common required stuff
-find_package( TQt )
-find_package( TDE )

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit f9148018b2f8a11fd830712c1b508046cc34ff22

cmake

@@ -1 +1 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463
+Subproject commit c51d14850ff2ed8051e840db9df1698f84af4216

data/desktop/x-rosegarden.desktop

@@ -2,7 +2,7 @@
 Comment=Rosegarden file
 Comment[fr]=Fichier Rosegarden
 Hidden=false
-Icon=x-rosegarden.png
+Icon=x-rosegarden
 MimeType=audio/x-rosegarden
 Patterns=*.rg;*.RG
 Type=MimeType

rosegarden.lsm

@@ -1,16 +0,0 @@
-Begin4
-Title:          Rosegarden
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    MIDI and audio sequencer and musical notation editor
-Keywords:       TDE Qt JACK ALSA
-Author:         Guillaume Laurent <glaurent@telegraph-road.org>
-                Chris Cannam <cannam@all-day-breakfast.com>
-                Richard Bown <bownie@bownie.com>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://www.rosegardenmusic.com/
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End

src/base/AudioDevice.cpp

@@ -23,14 +23,7 @@
 #include "Instrument.h"
 
 #include <cstdio>
-
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 
 namespace Rosegarden

src/base/AudioPluginInstance.cpp

@@ -23,13 +23,7 @@
 
 #include <iostream>
 #include <cstring>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 namespace Rosegarden
 {

src/base/BaseProperties.cpp

@@ -19,13 +19,7 @@
 
 #include "BaseProperties.h"
 #include <vector>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 namespace Rosegarden
 {

src/base/Colour.cpp

@@ -24,13 +24,7 @@
 */
 
 #include "Colour.h"
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 namespace Rosegarden 
 {

src/base/ColourMap.cpp

@@ -24,13 +24,7 @@
 */
 
 #include <string>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 #include "ColourMap.h"
 #include "XmlExportable.h"

src/base/Composition.cpp

@@ -32,13 +32,7 @@
 #include <algorithm>
 #include <cmath>
 #include <typeinfo>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 using std::cerr;
 using std::endl;

src/base/Configuration.cpp

@@ -28,16 +28,10 @@
 
 #include <string>
 #include <algorithm>
+#include <sstream>
 
 #include "Configuration.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 
 namespace Rosegarden
 {

src/base/ControlParameter.cpp

@@ -19,12 +19,7 @@
     COPYING included with this distribution for more information.
 */
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 #include "ControlParameter.h"
 #include "MidiTypes.h"

src/base/Event.cpp

@@ -22,16 +22,11 @@
 #include <cstdio>
 #include <cctype>
 #include <iostream>
+#include <sstream>
+
 #include "Event.h"
 #include "XmlExportable.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 namespace Rosegarden 
 {
 using std::string;

src/base/Instrument.cpp

@@ -20,19 +20,13 @@
 */
 
 #include <stdio.h>
+#include <sstream>
 
 #include "Instrument.h"
 #include "MidiDevice.h"
 #include "AudioPluginInstance.h"
 #include "AudioLevel.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 
 namespace Rosegarden
 {

src/base/Marker.cpp

@@ -19,17 +19,11 @@
     COPYING included with this distribution for more information.
 */
 
+#include <sstream>
 
 #include "Marker.h"
 #include "misc/Debug.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 namespace Rosegarden
 {
 

src/base/MidiDevice.cpp

@@ -28,13 +28,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <set>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 
 namespace Rosegarden

src/base/NotationTypes.cpp

@@ -28,12 +28,7 @@
 #include <cstdlib> // for atoi
 #include <limits.h> // for SHRT_MIN
 #include <cassert>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#else
 #include <sstream>
-#endif
 
 //dmm This will make everything excruciatingly slow if defined:
 //#define DEBUG_PITCH
@@ -481,19 +476,10 @@ Key::Key(int accidentalCount, bool isSharp, bool isMinor) :
         }
     }
 
-#if (__GNUC__ < 3)
-    std::ostrstream os;
-#else
     std::ostringstream os;
-#endif
-
     os << "No " << (isMinor ? "minor" : "major") << " key with "
        << accidentalCount << (isSharp ? " sharp(s)" : " flat(s)");
 
-#if (__GNUC__ < 3)
-    os << std::ends;
-#endif
-
     throw BadKeySpec(os.str());
 }
 
@@ -514,19 +500,11 @@ Key::Key(int tonicPitch, bool isMinor) :
         }
     }
 
-#if (__GNUC__ < 3)
-    std::ostrstream os;
-#else
     std::ostringstream os;
-#endif
 
     os << "No " << (isMinor ? "minor" : "major") << " key with tonic pitch "
        << tonicPitch;
 
-#if (__GNUC__ < 3)
-    os << std::ends;
-#endif
-
     throw BadKeySpec(os.str());
 }
     

src/base/RealTime.cpp

@@ -20,13 +20,7 @@
 */
 
 #include <iostream>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 #include "RealTime.h"
 #include "sys/time.h"

src/base/SoftSynthDevice.cpp

@@ -25,14 +25,7 @@
 
 #include <cstdio>
 #include <cstdlib>
-
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 
 namespace Rosegarden

src/base/Studio.cpp

@@ -20,6 +20,7 @@
 */
 
 #include <iostream>
+#include <sstream>
 
 #include "Studio.h"
 #include "MidiDevice.h"
@@ -30,12 +31,6 @@
 #include "Track.h"
 #include "Composition.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
 
 using std::cerr;
 using std::endl;

src/base/Track.cpp

@@ -22,13 +22,7 @@
 #include "Track.h"
 #include <iostream>
 #include <cstdio>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
 
 #include "Composition.h"
 #include "StaffExportTypes.h"

src/gui/editors/notation/NoteFontMap.cpp

@@ -785,11 +785,11 @@ const
 {
     SymbolDataMap::const_iterator i = m_data.find(charName);
     if (i == m_data.end())
-        return false;
+        return 0;
 
     SizeDataMap::const_iterator si = m_sizes.find(size);
     if (si == m_sizes.end())
-        return false;
+        return 0;
 
     int fontId = i->second.getFontId();
 
@@ -802,7 +802,7 @@ const
 
     SystemFontNameMap::const_iterator fni = m_systemFontNames.find(fontId);
     if (fontId < 0 || fni == m_systemFontNames.end())
-        return false;
+        return 0;
     TQString fontName = fni->second;
 
     CharBaseMap::const_iterator bi = m_bases.find(fontId);

src/misc/stableheaders.h

@@ -23,7 +23,6 @@
 #include <sstream>
 #include <stack>
 #include <string>
-#include <strstream>
 #include <utility>
 #include <vector>
 

src/sound/AudioFileManager.cpp

@@ -27,13 +27,8 @@
 #include <cstdio>   // sprintf
 #include <cstdlib>
 #include <pthread.h>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
+
 
 #include <kapp.h>
 #include <tdelocale.h>

src/sound/Audit.h

@@ -24,13 +24,8 @@
 
 #include <string>
 #include <iostream>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
 #include <sstream>
-#endif
+
 
 // A staggeringly simple-minded audit trail implementation.
 

src/sound/BWFAudioFile.cpp

@@ -18,17 +18,11 @@
     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
+#include <sstream>
 
 #include "BWFAudioFile.h"
 #include "RealTime.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 using std::cout;
 using std::cerr;
 using std::endl;

src/sound/MidiFile.cpp

@@ -27,6 +27,7 @@
 #include <string>
 #include <cstdio>
 #include <algorithm>
+#include <sstream>
 
 #include "Midi.h"
 #include "MidiFile.h"
@@ -46,13 +47,6 @@
 
 //#define MIDI_DEBUG 1
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 #include <kapp.h>
 
 namespace Rosegarden

src/sound/WAVAudioFile.cpp

@@ -19,16 +19,11 @@
     COPYING included with this distribution for more information.
 */
 
+#include <sstream>
+
 #include "WAVAudioFile.h"
 #include "RealTime.h"
 
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
 using std::cout;
 using std::cerr;
 using std::endl;