diff --git a/ChangeLog b/ChangeLog index 0538e65a..2e74aa61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 + * Fixed regression with Qt4 build of rdadmin(1) diff --git a/rdadmin/Makefile.am b/rdadmin/Makefile.am index e381206c..1dfdf72e 100644 --- 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 diff --git a/rdadmin/rdadmin.pro b/rdadmin/rdadmin.pro index 3a0c10d2..813691b0 100644 --- 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 -// -// 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 +# +# 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 diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 688d3c92..c35ebe9a 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -1,4 +1,6 @@ - + + + @default @@ -1128,6 +1130,10 @@ nastaveném pro běh služby CAE pro naplnění databáze se zdroji zvuku.Event Carts + + RDAdmin - + + EditDropbox @@ -3545,7 +3551,7 @@ Přepsat? Unable to write file " - Nelze zapsat soubor " + Nelze zapsat soubor " Checking the Library for duplicates. diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 3d0c3ced..dcde5c1d 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -1,4 +1,6 @@ - + + + @default @@ -1056,6 +1058,10 @@ configured to run the CAE service in order to populate the audio resources datab Event Carts + + RDAdmin - + + EditDropbox @@ -3451,6 +3457,10 @@ Overwrite? Mcast Address for Notifications + + Unable to write file " + + EditStation diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index d22176b6..3170f487 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -1,4 +1,6 @@ - + + + @default @@ -1130,6 +1132,10 @@ computador para obtener los recursos de audio de dicho equipo. Event Carts + + RDAdmin - + + EditDropbox @@ -3084,7 +3090,7 @@ computador para obtener los recursos de audio de dicho equipo. No - + No Yes @@ -3574,6 +3580,10 @@ Overwrite? Mcast Address for Notifications + + Unable to write file " + + EditStation diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index 7f4509ff..66a4fa8e 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -1,4 +1,6 @@ - + + + AddFeed @@ -759,6 +761,10 @@ configured to run the CAE service in order to populate the audio resources datab Event Carts + + RDAdmin - + + EditDropbox @@ -3016,6 +3022,10 @@ Overwrite? Mcast Address for Notifications + + Unable to write file " + + EditStation diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index f7c102ef..9aef32c4 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -1,4 +1,6 @@ - + + + @default @@ -1038,6 +1040,10 @@ configured to run the CAE service in order to populate the audio resources datab Event Carts + + RDAdmin - + + EditDropbox @@ -3437,6 +3443,10 @@ Overwrite? Mcast Address for Notifications + + Unable to write file " + + EditStation diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index f7c102ef..9aef32c4 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -1,4 +1,6 @@ - + + + @default @@ -1038,6 +1040,10 @@ configured to run the CAE service in order to populate the audio resources datab Event Carts + + RDAdmin - + + EditDropbox @@ -3437,6 +3443,10 @@ Overwrite? Mcast Address for Notifications + + Unable to write file " + + EditStation diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index a7c3ba2f..ae7a1956 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -1,4 +1,6 @@ - + + + @default @@ -1027,6 +1029,10 @@ configured to run the CAE service in order to populate the audio resources datab Event Carts + + RDAdmin - + + EditDropbox @@ -2693,7 +2699,7 @@ Isto para popular os recursos de áudio na Base de Dados. Low - Baixa + Baixa None @@ -3438,6 +3444,10 @@ Overwrite? Mcast Address for Notifications + + Unable to write file " + + EditStation diff --git a/rivendell.spec.in b/rivendell.spec.in index 011cc690..2a93057c 100644 --- 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