2017-09-01 Fred Gleason <fredg@paravelsystems.com>

* Renamed 'Origin' field to 'Ingest' in the 'Cut Info/Record' dialog
	in RDLibrary.

ChangeLog

@@ -16011,3 +16011,6 @@
 	* Added 'src_hostname' and 'user_name' parameters to the
 	'RDCut::checkInRecording()' method in 'lib/rdcut.cpp' and
 	'lib/rdcut.h'.
+2017-09-01 Fred Gleason <fredg@paravelsystems.com>
+	* Renamed 'Origin' field to 'Ingest' in the 'Cut Info/Record' dialog
+	in RDLibrary.

rdlibrary/rdlibrary_cs.ts

@@ -1357,7 +1357,7 @@ Přesto smazat?</translation>
     </message>
     <message>
         <source>Origin</source>
-        <translation>Původ</translation>
+        <translation type="obsolete">Původ</translation>
     </message>
     <message>
         <source>ISRC</source>
@@ -1582,11 +1582,15 @@ Přesto uložit?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Source Host</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>unknown</source>
+        <source>Ingest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdlibrary/rdlibrary_de.ts

@@ -1334,7 +1334,7 @@ verwendet. Trotzdem löschen?</translation>
     </message>
     <message>
         <source>Origin</source>
-        <translation>HERKUNFT</translation>
+        <translation type="obsolete">HERKUNFT</translation>
     </message>
     <message>
         <source>ISRC</source>
@@ -1559,11 +1559,15 @@ Trotzdem speichern?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Source Host</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>unknown</source>
+        <source>Ingest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdlibrary/rdlibrary_es.ts

@@ -1339,7 +1339,7 @@ Do you still want to delete it?</source>
     </message>
     <message>
         <source>Origin</source>
-        <translation>Origen</translation>
+        <translation type="obsolete">Origen</translation>
     </message>
     <message>
         <source>Weight</source>
@@ -1564,11 +1564,15 @@ Do you still want to save?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Source Host</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>unknown</source>
+        <source>Ingest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdlibrary/rdlibrary_fr.ts

@@ -1181,10 +1181,6 @@ Do you still want to delete it?</source>
         <source>&amp;Outcue</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Origin</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>ISRC</source>
         <translation type="unfinished"></translation>
@@ -1401,11 +1397,15 @@ Do you still want to save?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Source Host</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>unknown</source>
+        <source>Ingest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdlibrary/rdlibrary_nb.ts

@@ -1330,7 +1330,7 @@ Vil du sletta ho likevel?</translation>
     </message>
     <message>
         <source>Origin</source>
-        <translation>Opphav</translation>
+        <translation type="obsolete">Opphav</translation>
     </message>
     <message>
         <source>ISRC</source>
@@ -1555,11 +1555,15 @@ Vil du lagra likevel?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Source Host</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>unknown</source>
+        <source>Ingest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdlibrary/rdlibrary_nn.ts

@@ -1330,7 +1330,7 @@ Vil du sletta ho likevel?</translation>
     </message>
     <message>
         <source>Origin</source>
-        <translation>Opphav</translation>
+        <translation type="obsolete">Opphav</translation>
     </message>
     <message>
         <source>ISRC</source>
@@ -1555,11 +1555,15 @@ Vil du lagra likevel?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Source Host</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>unknown</source>
+        <source>Ingest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdlibrary/rdlibrary_pt_BR.ts

@@ -1332,7 +1332,7 @@ Você ainda quer deletá-lo?</translation>
     </message>
     <message>
         <source>Origin</source>
-        <translation>Origem</translation>
+        <translation type="obsolete">Origem</translation>
     </message>
     <message>
         <source>ISRC</source>
@@ -1557,11 +1557,15 @@ Você ainda quer salvar?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Source Host</source>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>unknown</source>
+        <source>Ingest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdlibrary/record_cut.cpp

@@ -162,24 +162,24 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,
   cut_isrc_label->setFont(font);
   cut_isrc_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
-  //
-  // Cut Origin
-  //
-  cut_origin_edit=new QLineEdit(this);
-  cut_origin_edit->setReadOnly(true);
-  cut_origin_label=new QLabel(cut_origin_edit,tr("Origin")+":",this);
-  cut_origin_label->setFont(font);
-  cut_origin_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-
   //
   // Cut Source
   //
   cut_source_edit=new QLineEdit(this);
   cut_source_edit->setReadOnly(true);
-  cut_source_label=new QLabel(cut_source_edit,tr("Source Host")+":",this);
+  cut_source_label=new QLabel(cut_source_edit,tr("Source")+":",this);
   cut_source_label->setFont(font);
   cut_source_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
+  //
+  // Cut Ingest
+  //
+  cut_ingest_edit=new QLineEdit(this);
+  cut_ingest_edit->setReadOnly(true);
+  cut_ingest_label=new QLabel(cut_ingest_edit,tr("Ingest")+":",this);
+  cut_ingest_label->setFont(font);
+  cut_ingest_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+
   //
   // Cut Play Date Time
   //
@@ -421,14 +421,14 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,
     user="";
   }
   if(valid) {
-    cut_origin_edit->setText(user+cut_origin_name+" - "+
+    cut_ingest_edit->setText(cut_origin_name+" - "+
 	       	     cut_origin_datetime.toString("M/d/yyyy hh:mm:ss"));
   }
   if(rec_cut->sourceHostname().isEmpty()) {
     cut_source_edit->setText("["+tr("unknown")+"]");
   }
   else {
-    cut_source_edit->setText(rec_cut->sourceHostname());
+    cut_source_edit->setText(user+rec_cut->sourceHostname());
   }
   cut_isci_edit->setText(rec_cut->isci());
   cut_isrc_edit->setText(rec_cut->isrc(RDCut::FormattedIsrc));
@@ -682,7 +682,7 @@ void RecordCut::recordData()
     rec_cut->setOriginName(rdstation_conf->name());
     cut_origin_name=rdstation_conf->name();
     cut_origin_datetime=QDateTime::currentDateTime();
-    cut_origin_edit->setText(cut_origin_name+" - "+
+    cut_ingest_edit->setText(cut_origin_name+" - "+
 			    cut_origin_datetime.toString("M/d/yyyy hh:mm:ss"));
     rdcae->loadRecord(rec_card_no[0],rec_port_no[0],rec_name,rec_format,
 			rec_channels,rec_samprate,rec_bitrate*rec_channels);
@@ -1051,11 +1051,11 @@ void RecordCut::resizeEvent(QResizeEvent *e)
   cut_isrc_label->setGeometry(0,76,85,20);
   cut_isrc_edit->setGeometry(90,76,w-100,20);
 
-  cut_origin_label->setGeometry(0,105,85,20);
+  cut_source_label->setGeometry(0,105,85,20);
-  cut_origin_edit->setGeometry(90,105,w-100,20);
+  cut_source_edit->setGeometry(90,105,w-100,20);
 
-  cut_source_label->setGeometry(0,127,85,20);
+  cut_ingest_label->setGeometry(0,127,85,20);
-  cut_source_edit->setGeometry(90,127,w-100,20);
+  cut_ingest_edit->setGeometry(90,127,w-100,20);
 
   cut_playdate_label->setGeometry(0,149,85,20);
   cut_playdate_edit->setGeometry(90,149,130,20);

rdlibrary/record_cut.h

@@ -93,8 +93,8 @@ class RecordCut : public QDialog
    QLineEdit *cut_isrc_edit;
    QLabel *cut_isci_label;
    QLineEdit *cut_isci_edit;
-   QLabel *cut_origin_label;
+   QLabel *cut_ingest_label;
-   QLineEdit *cut_origin_edit;
+   QLineEdit *cut_ingest_edit;
    QLabel *cut_source_label;
    QLineEdit *cut_source_edit;
    QLabel *cut_weight_label;