Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-26 17:38:15 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-22 18:50:20 -04:00
commit 94d4293d6d
11 changed files with 99 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17872,3 +17872,5 @@
from the RPM 'opsguide' sub-package. from the RPM 'opsguide' sub-package.
* Removed the 'qt-devel' dependency from the RPM 'rivendell' * Removed the 'qt-devel' dependency from the RPM 'rivendell'
package. package.
2018-10-22 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression with Qt4 build of rdadmin(1)

4
rdadmin/Makefile.am
View File

@ -38,8 +38,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdadmin_*.qm rm -f $(DESTDIR)$(prefix)/share/rivendell/rdadmin_*.qm
all: all:
lupdate rdadmin.pro lupdate-qt4 rdadmin.pro
lrelease rdadmin.pro lrelease-qt4 rdadmin.pro
bin_PROGRAMS = rdadmin bin_PROGRAMS = rdadmin

36
rdadmin/rdadmin.pro
View File

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

10
rdadmin/rdadmin_cs.ts
View File

@ -1,4 +1,6 @@
<!DOCTYPE TS><TS> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context> <context>
<name>@default</name> <name>@default</name>
<message> <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> <source>Event Carts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>RDAdmin - </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditDropbox</name> <name>EditDropbox</name>
@ -3545,7 +3551,7 @@ Přepsat?</translation>
</message> </message>
<message> <message>
<source>Unable to write file &quot;</source> <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>
<message> <message>
<source>Checking the Library for duplicates.</source> <source>Checking the Library for duplicates.</source>

12
rdadmin/rdadmin_de.ts
View File

@ -1,4 +1,6 @@
<!DOCTYPE TS><TS> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context> <context>
<name>@default</name> <name>@default</name>
<message> <message>
@ -1056,6 +1058,10 @@ configured to run the CAE service in order to populate the audio resources datab
<source>Event Carts</source> <source>Event Carts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>RDAdmin - </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditDropbox</name> <name>EditDropbox</name>
@ -3451,6 +3457,10 @@ Overwrite?</source>
<source>Mcast Address for Notifications</source> <source>Mcast Address for Notifications</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Unable to write file &quot;</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditStation</name> <name>EditStation</name>

14
rdadmin/rdadmin_es.ts
View File

@ -1,4 +1,6 @@
<!DOCTYPE TS><TS> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context> <context>
<name>@default</name> <name>@default</name>
<message> <message>
@ -1130,6 +1132,10 @@ computador para obtener los recursos de audio de dicho equipo.</translation>
<source>Event Carts</source> <source>Event Carts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>RDAdmin - </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditDropbox</name> <name>EditDropbox</name>
@ -3084,7 +3090,7 @@ computador para obtener los recursos de audio de dicho equipo.</translation>
</message> </message>
<message> <message>
<source>No</source> <source>No</source>
<translation type="unfinished"></translation> <translation type="unfinished">No</translation>
</message> </message>
<message> <message>
<source>Yes</source> <source>Yes</source>
@ -3574,6 +3580,10 @@ Overwrite?</source>
<source>Mcast Address for Notifications</source> <source>Mcast Address for Notifications</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Unable to write file &quot;</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditStation</name> <name>EditStation</name>

12
rdadmin/rdadmin_fr.ts
View File

@ -1,4 +1,6 @@
<!DOCTYPE TS><TS> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context> <context>
<name>AddFeed</name> <name>AddFeed</name>
<message> <message>
@ -759,6 +761,10 @@ configured to run the CAE service in order to populate the audio resources datab
<source>Event Carts</source> <source>Event Carts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>RDAdmin - </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditDropbox</name> <name>EditDropbox</name>
@ -3016,6 +3022,10 @@ Overwrite?</source>
<source>Mcast Address for Notifications</source> <source>Mcast Address for Notifications</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Unable to write file &quot;</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditStation</name> <name>EditStation</name>

12
rdadmin/rdadmin_nb.ts
View File

@ -1,4 +1,6 @@
<!DOCTYPE TS><TS> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context> <context>
<name>@default</name> <name>@default</name>
<message> <message>
@ -1038,6 +1040,10 @@ configured to run the CAE service in order to populate the audio resources datab
<source>Event Carts</source> <source>Event Carts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>RDAdmin - </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditDropbox</name> <name>EditDropbox</name>
@ -3437,6 +3443,10 @@ Overwrite?</source>
<source>Mcast Address for Notifications</source> <source>Mcast Address for Notifications</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Unable to write file &quot;</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditStation</name> <name>EditStation</name>

12
rdadmin/rdadmin_nn.ts
View File

@ -1,4 +1,6 @@
<!DOCTYPE TS><TS> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context> <context>
<name>@default</name> <name>@default</name>
<message> <message>
@ -1038,6 +1040,10 @@ configured to run the CAE service in order to populate the audio resources datab
<source>Event Carts</source> <source>Event Carts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>RDAdmin - </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditDropbox</name> <name>EditDropbox</name>
@ -3437,6 +3443,10 @@ Overwrite?</source>
<source>Mcast Address for Notifications</source> <source>Mcast Address for Notifications</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Unable to write file &quot;</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditStation</name> <name>EditStation</name>

14
rdadmin/rdadmin_pt_BR.ts
View File

@ -1,4 +1,6 @@
<!DOCTYPE TS><TS> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context> <context>
<name>@default</name> <name>@default</name>
<message> <message>
@ -1027,6 +1029,10 @@ configured to run the CAE service in order to populate the audio resources datab
<source>Event Carts</source> <source>Event Carts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>RDAdmin - </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditDropbox</name> <name>EditDropbox</name>
@ -2693,7 +2699,7 @@ Isto para popular os recursos de áudio na Base de Dados.</translation>
</message> </message>
<message> <message>
<source>Low</source> <source>Low</source>
<translation>Baixa<byte value="x9"/></translation> <translation>Baixa </translation>
</message> </message>
<message> <message>
<source>None</source> <source>None</source>
@ -3438,6 +3444,10 @@ Overwrite?</source>
<source>Mcast Address for Notifications</source> <source>Mcast Address for Notifications</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Unable to write file &quot;</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditStation</name> <name>EditStation</name>

2
rivendell.spec.in
View File

@ -97,7 +97,7 @@ associated with.
%build %build
%configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@ %configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@
make -j make -j 10
%install %install