2021-04-13 David Klann <dklann@broadcasttool.com>

* Changed the way in which the VU Meter UDP port is chosen. One
       can now specify the base port number and the maximum number of UDP
       ports to consider when caed(8) sets up the VU meter port.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

ChangeLog

@@ -21427,3 +21427,7 @@
 	* Updated the build package list for RHEL 7 in 'INSTALL'.
 2021-04-13 Fred Gleason <fredg@paravelsystems.com>
 	* Updated the build package list for Ubuntu 20.04 LTS in 'INSTALL'.
+2021-04-13 David Klann <dklann@broadcasttool.com>
+       * Changed the way in which the VU Meter UDP port is chosen. One
+       can now specify the base port number and the maximum number of UDP
+       ports to consider when caed(8) sets up the VU meter port.

conf/rd.conf-sample

@@ -164,3 +164,15 @@ TranscodingDelay=0
 
 ; Lock memory in RDAirPlay
 ; LockRdairplayMemory=Yes
+
+; Number at which to start looking for available UDP ports for VU
+; meters. You should only change this if you have another service
+; using UDP Port numbers in the range MeterPortBaseNumber to
+; (MeterPortBaseNumber + MeterPortRange) (extremely rare).
+; MeterPortBaseNumber=30000
+
+; Maximum number of UDP Ports to consider for VU meters. You may need
+; to change this if you have many (say, more than 80) Rivendell
+; dropboxes configured. Rivendell imposes a hard limit of 999 on this
+; setting.
+; MeterPortRange=100

lib/librd_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name></name>
     <message>

lib/librd_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name></name>
     <message>

lib/librd_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -1274,7 +1276,7 @@ Color</translation>
     </message>
     <message>
         <source>ARTIST</source>
-        <translation type="obsolete">ARTISTA<byte value="x9"/></translation>
+        <translation type="obsolete">ARTISTA	</translation>
     </message>
     <message>
         <source>CLIENT</source>

lib/librd_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>QObject</name>
     <message>

lib/librd_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name></name>
     <message>

lib/librd_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name></name>
     <message>

lib/librd_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name></name>
     <message>
@@ -89,7 +91,7 @@
     </message>
     <message>
         <source>PLAY</source>
-        <translation type="unfinished">SIMPLES<byte value="x9"/></translation>
+        <translation type="unfinished">SIMPLES	</translation>
     </message>
     <message>
         <source>SEGUE</source>
@@ -3281,7 +3283,7 @@ Por Favor, cheque suas configurações e tenbte outra vez.</translation>
     </message>
     <message>
         <source>PLAY</source>
-        <translation type="obsolete">SIMPLES<byte value="x9"/></translation>
+        <translation type="obsolete">SIMPLES	</translation>
     </message>
     <message>
         <source>SEGUE</source>

lib/rd.h

@@ -625,6 +625,18 @@
  */
 #define RD_GPIO_EVENT_DAYS 30
 
+/*
+ * Starting UDP port for cae_meter_socket.
+ * Default 'MeterPortBaseNumber=' value in rd.conf(5)
+ */
+#define RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT 30000
+
+/*
+ * Maximum number of UDP ports to consider for cae_meter_socket.
+ * Default 'MeterPortRange' value in rd.conf(5)
+ */
+#define RD_METER_SOCKET_PORT_RANGE 100
+
 /*
  * Height/Width for QTreeWidget, QTableWidget and QListView widgets
  */

lib/rdcae.cpp

@@ -63,9 +63,15 @@ RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent)
   // Meter Connection
   //
   cae_meter_socket=new QUdpSocket(this);
-  for(int16_t i=30000;i<30100;i++) {
+  cae_meter_base_port=cae_config->meterBasePort();
-    if(cae_meter_socket->bind(i)) {
+  cae_meter_port_range=cae_config->meterPortRange();
-      i=31000;
+  if(cae_meter_port_range>999) {
+    cae_meter_port_range=999;
+  }
+  for(int16_t i=cae_meter_base_port;
+      i<(cae_meter_base_port+cae_meter_port_range);i++) {
+    if(cae_meter_socket->bind(QHostAddress(),i)) {
+      i=(cae_meter_base_port+cae_meter_port_range)+1;
     }
   }
 

lib/rdcae.h

@@ -111,6 +111,8 @@ class RDCae : public QObject
   int cae_handle[RD_MAX_CARDS][RD_MAX_STREAMS];
   unsigned cae_pos[RD_MAX_CARDS][RD_MAX_STREAMS];
   QUdpSocket *cae_meter_socket;
+  int cae_meter_base_port;
+  int cae_meter_port_range;
   short cae_input_levels[RD_MAX_CARDS][RD_MAX_PORTS][2];
   short cae_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2];
   short cae_stream_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2];

lib/rdconfig.cpp

@@ -381,6 +381,18 @@ bool RDConfig::lockRdairplayMemory() const
 }
 
 
+int RDConfig::meterBasePort() const
+{
+  return conf_meter_base_port;
+}
+
+
+int RDConfig::meterPortRange() const
+{
+  return conf_meter_port_range;
+}
+
+
 uid_t RDConfig::uid() const
 {
   return conf_uid;
@@ -589,6 +601,10 @@ bool RDConfig::load()
     profile->boolValue("Hacks","DisableMaintChecks",false);
   conf_lock_rdairplay_memory=
     profile->boolValue("Hacks","LockRdairplayMemory",false);
+  conf_meter_base_port=
+    profile->intValue("Hacks","MeterPortBaseNumber",RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT);
+  conf_meter_port_range=
+    profile->intValue("Hacks","MeterPortRange",RD_METER_SOCKET_PORT_RANGE);
   if((user=getpwnam(profile->stringValue("Identity","AudioOwner").toUtf8()))!=NULL) {
     conf_uid=user->pw_uid;
   }
@@ -712,6 +728,8 @@ void RDConfig::clear()
   conf_jack_ports[1].clear();
   conf_disable_maint_checks=false;
   conf_lock_rdairplay_memory=false;
+  conf_meter_base_port=RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT;
+  conf_meter_port_range=RD_METER_SOCKET_PORT_RANGE;
   conf_uid=65535;
   conf_gid=65535;
   conf_pypad_uid=65535;

lib/rdconfig.h

@@ -2,7 +2,7 @@
 //
 // A container class for a Rivendell Base Configuration
 //
-//   (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -100,6 +100,8 @@ class RDConfig
   QString jackPort(int num,int endpt) const;
   bool disableMaintChecks() const;
   bool lockRdairplayMemory() const;
+  int meterBasePort() const;
+  int meterPortRange() const;
   bool enableMixerLogging() const;
   uid_t uid() const;
   gid_t gid() const;
@@ -170,6 +172,8 @@ class RDConfig
   QString conf_http_user_agent;
   bool conf_disable_maint_checks;
   bool conf_lock_rdairplay_memory;
+  int conf_meter_base_port;
+  int conf_meter_port_range;
   std::vector<QString> conf_jack_ports[2];
   uid_t conf_uid;
   gid_t conf_gid;

rdadmin/rdadmin_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>@default</name>
     <message>

rdadmin/rdadmin_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>@default</name>
     <message>

rdadmin/rdadmin_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>@default</name>
     <message>

rdadmin/rdadmin_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddFeed</name>
     <message>

rdadmin/rdadmin_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>@default</name>
     <message>

rdadmin/rdadmin_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>@default</name>
     <message>

rdadmin/rdadmin_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>@default</name>
     <message>
@@ -3066,7 +3068,7 @@ Isto para popular os recursos de áudio na Base de Dados.</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation>Baixa<byte value="x9"/></translation>
+        <translation>Baixa	</translation>
     </message>
     <message>
         <source>None</source>

rdairplay/rdairplay_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditEvent</name>
     <message>

rdairplay/rdairplay_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditEvent</name>
     <message>

rdairplay/rdairplay_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditEvent</name>
     <message>

rdairplay/rdairplay_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditEvent</name>
     <message>

rdairplay/rdairplay_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditEvent</name>
     <message>

rdairplay/rdairplay_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditEvent</name>
     <message>

rdairplay/rdairplay_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditEvent</name>
     <message>

rdcartslots/rdcartslots_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdcartslots/rdcartslots_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdcartslots/rdcartslots_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdcartslots/rdcartslots_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdcartslots/rdcartslots_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdcartslots/rdcartslots_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdcastmanager/rdcastmanager_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditCast</name>
     <message>

rdcastmanager/rdcastmanager_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditCast</name>
     <message>

rdcastmanager/rdcastmanager_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditCast</name>
     <message>

rdcastmanager/rdcastmanager_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditCast</name>
     <message>

rdcastmanager/rdcastmanager_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditCast</name>
     <message>

rdcastmanager/rdcastmanager_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditCast</name>
     <message>

rdcastmanager/rdcastmanager_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>EditCast</name>
     <message>

rdcatch/rdcatch_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddRecording</name>
     <message>

rdcatch/rdcatch_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddRecording</name>
     <message>

rdcatch/rdcatch_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddRecording</name>
     <message>

rdcatch/rdcatch_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddRecording</name>
     <message>

rdcatch/rdcatch_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddRecording</name>
     <message>

rdcatch/rdcatch_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddRecording</name>
     <message>

rdcatch/rdcatch_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddRecording</name>
     <message>

rdhpi/rdhpi_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>RDHPIPlayStream</name>
     <message>

rdhpi/rdhpi_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>RDHPIPlayStream</name>
     <message>

rdhpi/rdhpi_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>RDHPIPlayStream</name>
     <message>

rdhpi/rdhpi_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>RDHPIPlayStream</name>
     <message>

rdhpi/rdhpi_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>RDHPIPlayStream</name>
     <message>

rdhpi/rdhpi_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>RDHPIPlayStream</name>
     <message>

rdhpi/rdhpi_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>RDHPIPlayStream</name>
     <message>

rdlibrary/rdlibrary_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AudioCart</name>
     <message>
@@ -1363,9 +1365,9 @@ Přesto smazat?</translation>
     </message>
     <message>
         <source>Deleting cart %06u will also empty the clipboard.
-      <byte value="x9"/>Do you still want to proceed?</source>
+      	Do you still want to proceed?</source>
         <translation type="obsolete">Smazání vozíku %06u vyprázdní také schránku
-      <byte value="x9"/>Přesto pokračovat?</translation>
+      	Přesto pokračovat?</translation>
     </message>
     <message>
         <source>Empty Clipboard</source>

rdlibrary/rdlibrary_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AudioCart</name>
     <message>
@@ -1340,9 +1342,9 @@ verwendet. Trotzdem löschen?</translation>
     </message>
     <message>
         <source>Deleting cart %06u will also empty the clipboard.
-      <byte value="x9"/>Do you still want to proceed?</source>
+      	Do you still want to proceed?</source>
         <translation type="obsolete">Den Cart %06u zu löschen wird auch die Zwischenablage leeren
-      <byte value="x9"/>Trotzdem fortfahren?</translation>
+      	Trotzdem fortfahren?</translation>
     </message>
     <message>
         <source>Empty Clipboard</source>

rdlibrary/rdlibrary_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AudioCart</name>
     <message>
@@ -1361,9 +1363,9 @@ Do you still want to delete it?</source>
     </message>
     <message>
         <source>Deleting cart %06u will also empty the clipboard.
-      <byte value="x9"/>Do you still want to proceed?</source>
+      	Do you still want to proceed?</source>
         <translation type="obsolete">Al eliminar el cartucho %06u también se vaciará el portapapeles.
-      <byte value="x9"/>¿Desea continuar?</translation>
+      	¿Desea continuar?</translation>
     </message>
     <message>
         <source>rdlibrary : </source>

rdlibrary/rdlibrary_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AudioCart</name>
     <message>

rdlibrary/rdlibrary_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AudioCart</name>
     <message>
@@ -1322,9 +1324,9 @@ Vil du sletta ho likevel?</translation>
     </message>
     <message>
         <source>Deleting cart %06u will also empty the clipboard.
-      <byte value="x9"/>Do you still want to proceed?</source>
+      	Do you still want to proceed?</source>
         <translation type="obsolete">Viss du slettar korga %06u, tømer du utklyppstavla.
-      <byte value="x9"/>Vil du halda fram?</translation>
+      	Vil du halda fram?</translation>
     </message>
     <message>
         <source>Empty Clipboard</source>

rdlibrary/rdlibrary_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AudioCart</name>
     <message>
@@ -1322,9 +1324,9 @@ Vil du sletta ho likevel?</translation>
     </message>
     <message>
         <source>Deleting cart %06u will also empty the clipboard.
-      <byte value="x9"/>Do you still want to proceed?</source>
+      	Do you still want to proceed?</source>
         <translation type="obsolete">Viss du slettar korga %06u, tømer du utklyppstavla.
-      <byte value="x9"/>Vil du halda fram?</translation>
+      	Vil du halda fram?</translation>
     </message>
     <message>
         <source>Empty Clipboard</source>

rdlibrary/rdlibrary_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AudioCart</name>
     <message>
@@ -1329,9 +1331,9 @@ Você ainda quer deletá-lo?</translation>
     </message>
     <message>
         <source>Deleting cart %06u will also empty the clipboard.
-      <byte value="x9"/>Do you still want to proceed?</source>
+      	Do you still want to proceed?</source>
         <translation type="obsolete">Deletar o Cartão %06u também esvaziará o clipboard.
-      <byte value="x9"/>Você ainda quer proceder?</translation>
+      	Você ainda quer proceder?</translation>
     </message>
     <message>
         <source>Empty Clipboard</source>

rdlogedit/rdlogedit_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddMeta</name>
     <message>

rdlogedit/rdlogedit_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddMeta</name>
     <message>

rdlogedit/rdlogedit_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddMeta</name>
     <message>

rdlogedit/rdlogedit_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddMeta</name>
     <message>

rdlogedit/rdlogedit_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddMeta</name>
     <message>

rdlogedit/rdlogedit_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddMeta</name>
     <message>

rdlogedit/rdlogedit_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddMeta</name>
     <message>

rdlogin/rdlogin_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdlogin/rdlogin_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdlogin/rdlogin_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdlogin/rdlogin_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdlogin/rdlogin_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdlogin/rdlogin_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdlogin/rdlogin_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdlogmanager/rdlogmanager_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddClock</name>
     <message>

rdlogmanager/rdlogmanager_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddClock</name>
     <message>

rdlogmanager/rdlogmanager_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddClock</name>
     <message>

rdlogmanager/rdlogmanager_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddClock</name>
     <message>

rdlogmanager/rdlogmanager_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddClock</name>
     <message>

rdlogmanager/rdlogmanager_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddClock</name>
     <message>

rdlogmanager/rdlogmanager_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>AddClock</name>
     <message>

rdmonitor/rdmonitor_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdmonitor/rdmonitor_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdmonitor/rdmonitor_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdmonitor/rdmonitor_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdmonitor/rdmonitor_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdmonitor/rdmonitor_nn.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdmonitor/rdmonitor_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdpanel/rdpanel_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdpanel/rdpanel_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdpanel/rdpanel_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdpanel/rdpanel_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdpanel/rdpanel_pt_BR.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdselect/rdselect_cs.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdselect/rdselect_de.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdselect/rdselect_es.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdselect/rdselect_fr.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>

rdselect/rdselect_nb.ts

@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
 <context>
     <name>MainWidget</name>
     <message>