Fixed conflict in 'ChangeLog'

2025-07-24 16:38:13 +02:00 · 2018-10-22 18:50:20 -04:00 · 2018-10-22 18:50:20 -04:00 · 94d4293d6d
commit 94d4293d6d
parent 41dcafe2a2 b146a10281
11 changed files with 99 additions and 31 deletions
--- a/2
+++ b/2
@ -17872,3 +17872,5 @@
 	from the RPM 'opsguide' sub-package.
 	* Removed the 'qt-devel' dependency from the RPM 'rivendell'
 	package.
+2018-10-22 Patrick Linstruth <patrick@deltecent.com>
+	* Fixed regression with Qt4 build of rdadmin(1)
--- a/rdadmin/Makefile.am
+++ b/rdadmin/Makefile.am
@ -38,8 +38,8 @@ uninstall-local:
 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdadmin_*.qm

 all:	
-	lupdate rdadmin.pro
-	lrelease rdadmin.pro
+	lupdate-qt4 rdadmin.pro
+	lrelease-qt4 rdadmin.pro

 bin_PROGRAMS = rdadmin

--- a/rdadmin/rdadmin.pro
+++ b/rdadmin/rdadmin.pro
@ -1,21 +1,21 @@
-// rdadmin.pro
-//
-// The QMake project file for RDAdmin.
-//
-// (C) Copyright 2003-2005,2016 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
-//   published by the Free Software Foundation.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public
-//   License along with this program; if not, write to the Free Software
-//   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# rdadmin.pro
+#
+# The QMake project file for RDAdmin.
+#
+# (C) Copyright 2003-2005,2016 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
+#   published by the Free Software Foundation.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 TEMPLATE = app

--- a/rdadmin/rdadmin_cs.ts
+++ b/rdadmin/rdadmin_cs.ts
@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
    <name>@default</name>
    <message>
@ -1128,6 +1130,10 @@ nastaveném pro běh služby CAE pro naplnění databáze se zdroji zvuku.</tran
        <source>Event Carts</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>RDAdmin - </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditDropbox</name>
@ -3545,7 +3551,7 @@ Přepsat?</translation>
    </message>
    <message>
        <source>Unable to write file &quot;</source>
-        <translation type="obsolete">Nelze zapsat soubor &quot;</translation>
+        <translation type="unfinished">Nelze zapsat soubor &quot;</translation>
    </message>
    <message>
        <source>Checking the Library for duplicates.</source>
--- a/rdadmin/rdadmin_de.ts
+++ b/rdadmin/rdadmin_de.ts
@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
    <name>@default</name>
    <message>
@ -1056,6 +1058,10 @@ configured to run the CAE service in order to populate the audio resources datab
        <source>Event Carts</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>RDAdmin - </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditDropbox</name>
@ -3451,6 +3457,10 @@ Overwrite?</source>
        <source>Mcast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Unable to write file &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_es.ts
+++ b/rdadmin/rdadmin_es.ts
@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
    <name>@default</name>
    <message>
@ -1130,6 +1132,10 @@ computador para obtener los recursos de audio de dicho equipo.</translation>
        <source>Event Carts</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>RDAdmin - </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditDropbox</name>
@ -3084,7 +3090,7 @@ computador para obtener los recursos de audio de dicho equipo.</translation>
    </message>
    <message>
        <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No</translation>
    </message>
    <message>
        <source>Yes</source>
@ -3574,6 +3580,10 @@ Overwrite?</source>
        <source>Mcast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Unable to write file &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_fr.ts
+++ b/rdadmin/rdadmin_fr.ts
@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
    <name>AddFeed</name>
    <message>
@ -759,6 +761,10 @@ configured to run the CAE service in order to populate the audio resources datab
        <source>Event Carts</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>RDAdmin - </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditDropbox</name>
@ -3016,6 +3022,10 @@ Overwrite?</source>
        <source>Mcast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Unable to write file &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_nb.ts
+++ b/rdadmin/rdadmin_nb.ts
@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
    <name>@default</name>
    <message>
@ -1038,6 +1040,10 @@ configured to run the CAE service in order to populate the audio resources datab
        <source>Event Carts</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>RDAdmin - </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditDropbox</name>
@ -3437,6 +3443,10 @@ Overwrite?</source>
        <source>Mcast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Unable to write file &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_nn.ts
+++ b/rdadmin/rdadmin_nn.ts
@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
    <name>@default</name>
    <message>
@ -1038,6 +1040,10 @@ configured to run the CAE service in order to populate the audio resources datab
        <source>Event Carts</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>RDAdmin - </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditDropbox</name>
@ -3437,6 +3443,10 @@ Overwrite?</source>
        <source>Mcast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Unable to write file &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_pt_BR.ts
+++ b/rdadmin/rdadmin_pt_BR.ts
@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
 <context>
    <name>@default</name>
    <message>
@ -1027,6 +1029,10 @@ configured to run the CAE service in order to populate the audio resources datab
        <source>Event Carts</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>RDAdmin - </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditDropbox</name>
@ -2693,7 +2699,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>
@ -3438,6 +3444,10 @@ Overwrite?</source>
        <source>Mcast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Unable to write file &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rivendell.spec.in
+++ b/rivendell.spec.in
@ -97,7 +97,7 @@ associated with.

 %build
 %configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@
-make -j
+make -j 10


 %install