Convert line endings from CRLF DOS style to CR Unix style

diff --git a/etc/templates/ro/faxrcvd-error.txt b/etc/templates/ro/faxrcvd-error.txt
index b9d2c20554224f94bd0d9600e277acebe7705b95..7f6c80e3db797e8b3ac188f0512c575621135e57 100644 (file)
--- a/etc/templates/ro/faxrcvd-error.txt
+++ b/etc/templates/ro/faxrcvd-error.txt
@@ -1,8 +1,9 @@
 From: FAX Agent <$FROMADDR>
 Subject: Fax primit de la "$SENDER"
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
-$FILE (ftp://pepper:4559/$FILE):                                  
+$FILE (ftp://$HOSTNAME:$PORT/$FILE):                                  
 Expeditor:        $SENDER
 Pagini:           $PAGES
 Calitate:         $QUALITY
@@ -15,8 +16,8 @@ Eroare:           $ERRCORRECT
 CallID1:          $CALLID1
 CallID2:          $CALLID2
 Recepţionat pe:   $DEVICE
-CommID:           $COMMID (ftp://pepper:4559/log/$COMMID)      
+CommID:           $COMMID (ftp://$HOSTNAME:$PORT/log/c$COMMID)      
 
 Au fost recepţionate erori:
 $SESSION_LOG
-    
\ No newline at end of file
+

diff --git a/etc/templates/ro/faxrcvd-failure.txt b/etc/templates/ro/faxrcvd-failure.txt
index 8491165ee64f65c6d29c20d5fffef24c4f6c65f4..09469b0aa4a2c236baa2cb6e45c9f952b582e0a4 100644 (file)
--- a/etc/templates/ro/faxrcvd-failure.txt
+++ b/etc/templates/ro/faxrcvd-failure.txt
@@ -1,9 +1,11 @@
 From: FAX Agent <$FROMADDR>
 Subject: Fax primit de la "$SENDER"
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Faxul nu a fost primit.
 
 $MSG
 
 Urmează transcriptul sesiunii:
+

diff --git a/etc/templates/ro/faxrcvd-notify-error.txt b/etc/templates/ro/faxrcvd-notify-error.txt
index bc35f0dbf4980a9b0fb7684fd92161d7f5458f05..f829f3004408af0970be3901e059e9538fd7b8f0 100644 (file)
--- a/etc/templates/ro/faxrcvd-notify-error.txt
+++ b/etc/templates/ro/faxrcvd-notify-error.txt
@@ -1,8 +1,9 @@
 From: FAX Agent <$FROMADDR>
 Subject: Fax primit cu erori de la "$SENDER"
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
-$FILE (ftp://pepper:4559/$FILE):                                  
+$FILE (ftp://$HOSTNAME:$PORT/$FILE):                                  
 Expeditor:        $SENDER
 Pagini:           $PAGES
 Caliate:          $QUALITY
@@ -15,8 +16,9 @@ Eroare:           $ERRCORRECT
 CallID1:          $CALLID1
 CallID2:          $CALLID2
 Recepţionat pe:   $DEVICE
-CommID:           $COMMID (ftp://pepper:4559/log/$COMMID)      
+CommID:           $COMMID (ftp://$HOSTNAME:$PORT/log/c$COMMID)      
 
 
 Transcriptul sesiunii:
 $SESSION_LOG
+

diff --git a/etc/templates/ro/faxrcvd-notify-success.txt b/etc/templates/ro/faxrcvd-notify-success.txt
index b5de327d57737800a1768317e1e1e208646a9991..17e99950df5d1a340ee535ae8778cb17f71776b1 100644 (file)
--- a/etc/templates/ro/faxrcvd-notify-success.txt
+++ b/etc/templates/ro/faxrcvd-notify-success.txt
@@ -1,8 +1,9 @@
 From: FAX Agent <$FROMADDR>
 Subject: Fax primit de la "$SENDER"
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
-$FILE (ftp://pepper:4559/$FILE):
+$FILE (ftp://$HOSTNAME:$PORT/$FILE):
 Expeditor:        $SENDER
 Pagini:           $PAGES
 Caliate:          $QUALITY
@@ -15,4 +16,5 @@ Eroare:           $ERRCORRECT
 CallID1:          $CALLID1
 CallID2:          $CALLID2
 Recepţionat pe:   $DEVICE
-CommID:           $COMMID (ftp://$HOSTNAME:$PORT/log/$COMMID) 
+CommID:           $COMMID (ftp://$HOSTNAME:$PORT/log/c$COMMID) 
+

diff --git a/etc/templates/ro/faxrcvd-success.txt b/etc/templates/ro/faxrcvd-success.txt
index d5e30b3d3870a1987548d6985703cddb58bf7035..c3f1d30b724d07d87825ece505a79737068d6f46 100644 (file)
--- a/etc/templates/ro/faxrcvd-success.txt
+++ b/etc/templates/ro/faxrcvd-success.txt
@@ -1,8 +1,9 @@
 From: FAX Agent <$FROMADDR>
 Subject: Fax primit de la "$SENDER"
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
-$FILE (ftp://$HOSTNAME:4559/$FILE):                                  
+$FILE (ftp://$HOSTNAME:$PORT/$FILE):                                  
 Expeditor:        $SENDER
 Pagini:           $PAGES
 Calitate:         $QUALITY
@@ -15,4 +16,5 @@ Eroare:           $ERRCORRECT
 CallID1:          $CALLID1
 CallID2:          $CALLID2
 Recepţionat pe:   $DEVICE
-CommID:           $COMMID (ftp://$HOSTNAME:4559/log/$COMMID)      
+CommID:           $COMMID (ftp://$HOSTNAME:$PORT/log/c$COMMID)      
+

diff --git a/etc/templates/ro/notify-blocked.txt b/etc/templates/ro/notify-blocked.txt
index 6e1e55305af8c89e2f21a6e63f3d39d48c1585d5..8610baee5dc432f401227d6fee8c8a3f9b3183ac 100644 (file)
--- a/etc/templates/ro/notify-blocked.txt
+++ b/etc/templates/ro/notify-blocked.txt
@@ -2,9 +2,11 @@ To: $SENDTO
 Subject: Fax către $DESTINATION este blocat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Este întârziat pentru că:
 
 $faxstatus
 
-Sesiunea va fi procesată cât de repede este posibil.
+Sesiunea va fi procesată cât mai repede posibil.
+

diff --git a/etc/templates/ro/notify-done-page.txt b/etc/templates/ro/notify-done-page.txt
index 69439d17a48e6db5cc2ade4021d07611098b5aa7..6b1121ad1cf259713baa38294e79b564f92ee08f 100644 (file)
--- a/etc/templates/ro/notify-done-page.txt
+++ b/etc/templates/ro/notify-done-page.txt
@@ -2,6 +2,7 @@ To: $SENDTO
 Subject: Pager către $DESTINATION finalizat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 A fost finalizat cu succes.
 Dialoguri:   $tottries (schimburi cu dispozitivul conectat)
@@ -21,3 +22,4 @@ $faxstatus
 ---- Urmează transcriptul sesiunii ----
 
 $SESSION_LOG
+

diff --git a/etc/templates/ro/notify-done.txt b/etc/templates/ro/notify-done.txt
index 0db6d0e27804f98a10523b38bde3acd9d95c7ae4..62c013c327b3b0075137ac98ce689309166c29d6 100644 (file)
--- a/etc/templates/ro/notify-done.txt
+++ b/etc/templates/ro/notify-done.txt
@@ -2,6 +2,7 @@ To: $SENDTO
 Subject: Fax către $DESTINATION finalizat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 $THISJOBTYPE către $number a fost finalizar cu succes.
 Pagini:              $npages
@@ -30,3 +31,4 @@ $faxstatus
 ---- Urmează transcriptul sesiunii ----
 
 $SESSION_LOG
+

diff --git a/etc/templates/ro/notify-failed-page.txt b/etc/templates/ro/notify-failed-page.txt
index d42a23d9968ac3d314635795e6b499b2be672b8d..f3d599b757a362c7a9ee43c8060221c72d75698b 100644 (file)
--- a/etc/templates/ro/notify-failed-page.txt
+++ b/etc/templates/ro/notify-failed-page.txt
@@ -2,6 +2,7 @@ To: $SENDTO
 Subject: Pager către $DESTINATION eşuat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Pager eşuat pentru că:
 
@@ -12,7 +13,7 @@ $faxstatus
 
 $SESSION_LOG
 
----- Statut sesiune netransmisă ----
+---- Starea sesiunii netransmise ----
 Destinaţie:         $number
 JobID:              $jobid
 GroupID:            $groupid
@@ -24,7 +25,7 @@ Expediat de:        $client
 Lăţime pagină:      $pagewidth (mm)
 Lungime pagină:     $pagelength (mm)
 Rezoluţie:          $resolution (lpi)
-Statut:             $faxstatus
+Stare:              $faxstatus
 Dialoguri:          $tottries
 Formare numere:     $ndials
 Apeluri:            $totdials
@@ -33,3 +34,4 @@ Număr total pagini: $totpages
 Încercări:          $ntries
 Număr director:     $dirnum
 Destinaţie:         $number
+

diff --git a/etc/templates/ro/notify-failed.txt b/etc/templates/ro/notify-failed.txt
index d836ffb96ef41008af9a515297e1b767c33a8ff3..f82e594d30388c798741052f030c5cbc2522ec43 100644 (file)
--- a/etc/templates/ro/notify-failed.txt
+++ b/etc/templates/ro/notify-failed.txt
@@ -1,6 +1,7 @@
 Subject: Fax către $DESTINATION eşuat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Fax eşuat pentru că:
 
@@ -11,7 +12,7 @@ $faxstatus
 
 $SESSION_LOG
 
----- Statut sesiune netransmisă ----
+---- Starea sesiunii netransmise ----
 Destinaţie:         $number
 JobID:              $jobid
 GroupID:            $groupid
@@ -23,7 +24,7 @@ Expediat de:        $client
 Lăţime pagină:      $pagewidth (mm)
 Lungime pagină:     $pagelength (mm)
 Rezoluţie:          $resolution (lpi)
-Statut:             $faxstatus
+Stare:              $faxstatus
 Dialoguri:          $tottries
 Formare numere:     $ndials
 Apeluri:            $totdials
@@ -32,3 +33,4 @@ Număr total pagini: $totpages
 Încercări:          $ntries
 Număr director:     $dirnum
 Destinaţie:         $number
+

diff --git a/etc/templates/ro/notify-format_failed.txt b/etc/templates/ro/notify-format_failed.txt
index b949ec6a2fc2c10af5b224d5853c3e461f6bf72f..7ab852fd52f85ab4622338d50eb80c9668652101 100644 (file)
--- a/etc/templates/ro/notify-format_failed.txt
+++ b/etc/templates/ro/notify-format_failed.txt
@@ -2,6 +2,7 @@ To: $SENDTO
 Subject: Fax către $DESTINATION eşuat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Eşuat datorită faptului că a eşuat conversiea
 documentului în fax. Convertorul a returnat:
@@ -12,7 +13,7 @@ $faxstatus
 Verificaţi dacă documentele PostScript nu conţin
 fonturi non-standard sau instrucţiuni invalide.
 
----- Statut sesiune netransmisă ----
+---- Starea sesiunii netransmise ----
 Destinaţie:         $number
 JobID:              $jobid
 GroupID:            $groupid
@@ -24,7 +25,7 @@ Expediat de:        $client
 Lăţime pagină:      $pagewidth (mm)
 Lungime pagină:     $pagelength (mm)
 Rezoluţie:          $resolution (lpi)
-Statut:             $faxstatus
+Stare:              $faxstatus
 Dialoguri:          $tottries
 Formare numere:     $ndials
 Apeluri:            $totdials
@@ -33,3 +34,5 @@ Număr total pagini: $totpages
 Încercări:          $ntries
 Număr director:     $dirnum
 Destinaţie:         $number
+
+

diff --git a/etc/templates/ro/notify-no_formatter.txt b/etc/templates/ro/notify-no_formatter.txt
index 90cf76d1db390f65bfd18d710b2f103ccbe5aa6c..793a2e6fbea48bd8d70452053f7c43cafce8b6c3 100644 (file)
--- a/etc/templates/ro/notify-no_formatter.txt
+++ b/etc/templates/ro/notify-no_formatter.txt
@@ -2,11 +2,12 @@ To: $SENDTO
 Subject: Fax către $DESTINATION eşuat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
  
 Programul pentru conversia documentului nu a fost găsit.
 
----- Statut sesiune netransmisă ----
+---- Starea sesiunii netransmise ----
 Destinaţie:         $number
 JobID:              $jobid
 GroupID:            $groupid
@@ -18,7 +19,7 @@ Expediat de:        $client
 Lăţime pagină:      $pagewidth (mm)
 Lungime pagină:     $pagelength (mm)
 Rezoluţie:          $resolution (lpi)
-Statut:             $faxstatus
+Stare:              $faxstatus
 Dialoguri:          $tottries
 Formare numere:     $ndials
 Apeluri:            $totdials
@@ -27,3 +28,5 @@ Număr total pagini: $totpages
 Încercări:          $ntries
 Număr director:     $dirnum
 Destinaţie:         $number
+
+

diff --git a/etc/templates/ro/notify-poll_no_document.txt b/etc/templates/ro/notify-poll_no_document.txt
index 75fc2abf08d201ad8bb492a44f4f1e78aeafec14..aa2f56201f0df8073201daaf4ceea3bc4334e85d 100644 (file)
--- a/etc/templates/ro/notify-poll_no_document.txt
+++ b/etc/templates/ro/notify-poll_no_document.txt
@@ -2,8 +2,10 @@ To: $SENDTO
 Subject: Comentariu despre fax
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 O încercare de aşezare în coadă nu poate fi finalizată
 pentru că nu a fost găsit nici un document pentru recuperare.
 
 Durata de procesare a fost $JTIME.
+

diff --git a/etc/templates/ro/notify-poll_rejected.txt b/etc/templates/ro/notify-poll_rejected.txt
index 6f965260f396ec525bbb697a9689c230444fc6ba..9d7eda10bae79aa59459d9bf968a6c67c0c89118 100644 (file)
--- a/etc/templates/ro/notify-poll_rejected.txt
+++ b/etc/templates/ro/notify-poll_rejected.txt
@@ -2,8 +2,10 @@ To: $SENDTO
 Subject: Comentariu despre fax
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 O incercare de aşezare în coadă nu poate fi finalizată
 deoarece cealaltă parte a refuzat solicitarea dumneavoastră.
 
 Durata de procesare a fost $JTIME.
+

diff --git a/etc/templates/ro/notify-reject.txt b/etc/templates/ro/notify-reject.txt
index eedcb1d1ac9b85513d98cd15147369cc956591d9..53ef7030d8f5e80c51104bc928a978c9e98e1939 100644 (file)
--- a/etc/templates/ro/notify-reject.txt
+++ b/etc/templates/ro/notify-reject.txt
@@ -2,12 +2,13 @@ To: $SENDTO
 Subject: Fax către $DESTINATION eşuat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Fax eşuat pentru că:
 
 $faxstatus
 
----- Statut sesiune netransmisă ----
+---- Starea sesiunii netransmise ----
 Destinaţie:         $number
 JobID:              $jobid
 GroupID:            $groupid
@@ -19,7 +20,7 @@ Expediat de:        $client
 Lăţime pagină:      $pagewidth (mm)
 Lungime pagină:     $pagelength (mm)
 Rezoluţie:          $resolution (lpi)
-Statut:             $faxstatus
+Stare:              $faxstatus
 Dialoguri:          $tottries
 Formare numere:     $ndials
 Apeluri:            $totdials
@@ -28,3 +29,4 @@ Număr total pagini: $totpages
 Încercări:          $ntries
 Număr director:     $dirnum
 Destinaţie:         $number
+

diff --git a/etc/templates/ro/notify-removed.txt b/etc/templates/ro/notify-removed.txt
index 4e535395e50af3da593636806ef282b29f76ca6b..968513435b29ca6848c286db6b6e15b0e9169934 100644 (file)
--- a/etc/templates/ro/notify-removed.txt
+++ b/etc/templates/ro/notify-removed.txt
@@ -2,5 +2,7 @@ To: $SENDTO
 Subject: Fax către $DESTINATION şters din coadă
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Fax-ul a fost şters din coadă.
+

diff --git a/etc/templates/ro/notify-requeued.txt b/etc/templates/ro/notify-requeued.txt
index 6dd7d51a6f758ea56392057c7182ce616eabb48c..6e430f63b7be0269176ad17248f52d4c35be1e5b 100644 (file)
--- a/etc/templates/ro/notify-requeued.txt
+++ b/etc/templates/ro/notify-requeued.txt
@@ -2,9 +2,11 @@ To: $SENDTO
 Subject: Fax către $DESTINATION 
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Nu a fost trimis din cauza:
 
 $faxstatus
 
 Se va face o nouă încercare la $NEXT
+

diff --git a/etc/templates/ro/notify-timedout.txt b/etc/templates/ro/notify-timedout.txt
index c3c6371b2fea933405e359c04007eb2160949b50..f77abc8b8936471f336243e3ddab1e92a7190cd8 100644 (file)
--- a/etc/templates/ro/notify-timedout.txt
+++ b/etc/templates/ro/notify-timedout.txt
@@ -2,11 +2,12 @@ To: $SENDTO
 Subject: Fax către $DESTINATION eşuat
 From: $FROMADDR
 Content-type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: Quoted-Printable
 
 Nu a putut fi finalizat înainte de termen.
 
 
----- Statut sesiune netransmisă ----
+---- Starea sesiunii netransmise ----
 Destinaţie:         $number
 JobID:              $jobid
 GroupID:            $groupid
@@ -18,7 +19,7 @@ Expediat de:        $client
 Lăţime pagină:      $pagewidth (mm)
 Lungime pagină:     $pagelength (mm)
 Rezoluţie:          $resolution (lpi)
-Statut:             $faxstatus
+Stare:              $faxstatus
 Dialoguri:          $tottries
 Formare numere:     $ndials
 Apeluri:            $totdials
@@ -27,3 +28,4 @@ Număr total pagini: $totpages
 Încercări:          $ntries
 Număr director:     $dirnum
 Destinaţie:         $number
+