Add Portuguese voice files

Common/AudioUnit.cpp

@@ -83,6 +83,10 @@ void CAudioUnit::setLanguage(TEXT_LANG language)
 			ambeFileName = wxT("no_NO.ambe");
 			indxFileName = wxT("no_NO.indx");
 			break;
+		case TL_PORTUGUES:
+			ambeFileName = wxT("pt_PT.ambe");
+			indxFileName = wxT("pt_PT.indx");
+			break;
 		default:
 			ambeFileName = wxT("en_GB.ambe");
 			indxFileName = wxT("en_GB.indx");

Common/RepeaterHandler.cpp

@@ -2462,7 +2462,7 @@ void CRepeaterHandler::writeLinkingTo(const wxString &callsign)
 			text.Printf(wxT("Kobler til %s"), callsign.c_str());
 			break;
 		case TL_PORTUGUES:
-			text.Printf(wxT("Conectando, %s"), callsign.c_str());
+			text.Printf(wxT("A ligar a %s"), callsign.c_str());
 			break;
 		default:
 			text.Printf(wxT("Linking to %s"), callsign.c_str());
@@ -2512,7 +2512,7 @@ void CRepeaterHandler::writeLinkedTo(const wxString &callsign)
 			text.Printf(wxT("Tilkoblet %s"), callsign.c_str());
 			break;
 		case TL_PORTUGUES:
-			text.Printf(wxT("Conectado a %s"), callsign.c_str());
+			text.Printf(wxT("Ligado a %s"), callsign.c_str());
 			break;
 		default:
 			text.Printf(wxT("Linked to %s"), callsign.c_str());
@@ -2562,7 +2562,7 @@ void CRepeaterHandler::writeNotLinked()
 			text = wxT("Ikke linket");
 			break;
 		case TL_PORTUGUES:
-			text = wxT("Desconectado");
+			text = wxT("Desligado");
 			break;
 		default:
 			text = wxT("Not linked");
@@ -2622,8 +2622,8 @@ void CRepeaterHandler::writeIsBusy(const wxString& callsign)
 			tempText.Printf(wxT("%s er opptatt"), callsign.c_str());
 			break;
 		case TL_PORTUGUES:
-			text = wxT("Desconectado");
+			text = wxT("Desligado");
-			tempText.Printf(wxT("%s, ocupado"), callsign.c_str());
+			tempText.Printf(wxT("%s ocupado"), callsign.c_str());
 			break;
 		default:
 			text = wxT("Not linked");
@@ -2678,7 +2678,7 @@ void CRepeaterHandler::ccsLinkMade(const wxString& callsign, DIRECTION direction
 			text.Printf(wxT("Tilkoblet %s"), callsign.c_str());
 			break;
 		case TL_PORTUGUES:
-			text.Printf(wxT("Conectado a %s"), callsign.c_str());
+			text.Printf(wxT("Ligado a %s"), callsign.c_str());
 			break;
 		default:
 			text.Printf(wxT("Linked to %s"), callsign.c_str());
@@ -2750,7 +2750,7 @@ void CRepeaterHandler::ccsLinkEnded(const wxString&, DIRECTION direction)
 			tempText = wxT("CCS er avsluttet");
 			break;
 		case TL_PORTUGUES:
-			text = wxT("Desconectado");
+			text = wxT("Desligado");
 			tempText = wxT("CCS terminou");
 			break;
 		default:
@@ -2829,7 +2829,7 @@ void CRepeaterHandler::ccsLinkFailed(const wxString& dtmf, DIRECTION direction)
 			tempText.Printf(wxT("%s ukjent"), dtmf.c_str());
 			break;
 		case TL_PORTUGUES:
-			text = wxT("Desconectado");
+			text = wxT("Desligado");
 			tempText.Printf(wxT("%s desconhecido"), dtmf.c_str());
 			break;
 		default:

Data/Makefile

@@ -13,6 +13,8 @@ install:
 	install -g root -o root -m 0644 TIME_en_US.indx  $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 TIME_fr_FR.ambe  $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 TIME_fr_FR.indx  $(DESTDIR)$(DATADIR)
+	install -g root -o root -m 0644 TIME_pt_PT.ambe  $(DESTDIR)$(DATADIR)
+	install -g root -o root -m 0644 TIME_pt_PT.indx  $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 TIME_se_SE.ambe  $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 TIME_se_SE.indx  $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 de_DE.ambe $(DESTDIR)$(DATADIR)
@@ -33,5 +35,7 @@ install:
 	install -g root -o root -m 0644 no_NO.indx $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 pl_PL.ambe $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 pl_PL.indx $(DESTDIR)$(DATADIR)
+	install -g root -o root -m 0644 pt_PT.ambe $(DESTDIR)$(DATADIR)
+	install -g root -o root -m 0644 pt_PT.indx $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 se_SE.ambe $(DESTDIR)$(DATADIR)
 	install -g root -o root -m 0644 se_SE.indx $(DESTDIR)$(DATADIR)

Data/TIME_pt_PT.indx

@@ -0,0 +1,42 @@
+E	69	23
+Sao	95	34
+um_quarto_para_a	132	54
+um_quarto_para_o	189	49
+um_quarto_para_as	240	61
+meia-noite	305	55
+uma	363	25
+duas	391	36
+tres	431	37
+quatro	472	33
+cinco	509	35
+seis	547	43
+sete	593	36
+oito	633	29
+nove	665	36
+dez	705	39
+onze	747	33
+meio-dia	784	52
+hora	839	26
+horas	868	31
+e_um_quarto	902	50
+e_meia	955	39
+da_manha	996	41
+da_tarde	1040	43
+da_noite	1086	42
+zero	1131	33
+doze	1167	34
+treze	1204	33
+catorze	1241	40
+quinze	1285	33
+dezasseis	1321	44
+dezassete	1368	49
+dezoito	1420	40
+dezanove	1463	42
+vinte	1508	37
+vinte-e-uma	1549	45
+vinte-e-duas	1597	51
+vinte-e-tres	1653	51
+e	1707	22
+trinta	1733	33
+quarenta-e-cinco	1774	57
+minutos	1834	47

Data/pt_PT.indx

@@ -0,0 +1,44 @@
+0	69	32
+1	105	22
+2	131	38
+3	173	36
+4	215	32
+5	250	35
+6	289	42
+7	335	36
+8	375	28
+9	407	36
+alpha	446	32
+bravo	481	33
+charlie	518	39
+delta	561	37
+A	602	23
+B	628	30
+C	661	35
+D	699	32
+E	735	23
+F	761	34
+G	798	35
+H	837	35
+I	875	23
+J	901	36
+K	944	33
+L	981	29
+M	1014	33
+N	1051	34
+O	1088	23
+P	1116	28
+Q	1149	30
+R	1182	31
+S	1216	36
+T	1257	28
+U	1289	26
+V	1318	34
+W	1355	36
+X	1394	44
+Y	1441	48
+Z	1492	34
+linkedto	1530	44
+notlinked	1595	54
+linkingto	1655	42
+isbusy	1722	59

TimeServer/TimeServerThread.cpp

@@ -897,18 +897,18 @@ wxArrayString CTimeServerThread::sendTimePtPT(unsigned int hour, unsigned int mi
 			hour = 0U;
 	}
 
-	if (hour == 1U || hour == 13U)
+	if (hour == 0U || hour == 12U || hour == 1U || hour == 13U || min == 45U)
 		words.Add(wxT("E"));
-	else if (hour == 0U || hour == 12U)
-		words.Add(wxT("Es"));
 	else
 		words.Add(wxT("Sao"));
 
 	if (min == 45U) {
-		if (hour == 0U || hour == 12U || hour == 1U || hour == 13U)
+		if (hour == 0U || hour == 1U || hour == 13U)
-			words.Add(wxT("quinze_para"));
+			words.Add(wxT("um_quarto_para_a"));
+		else if (hour == 12U)
+			words.Add(wxT("um_quarto_para_o"));
 		else
-			words.Add(wxT("quinze_para_as"));
+			words.Add(wxT("um_quarto_para_as"));
 	}
 
 	if (hour == 0U) {
@@ -935,17 +935,27 @@ wxArrayString CTimeServerThread::sendTimePtPT(unsigned int hour, unsigned int mi
 		words.Add(wxT("dez"));
 	} else if (hour == 11U || hour == 23U) {
 		words.Add(wxT("onze"));
-	} else {
+	} else if (hour == 12U) {
 		words.Add(wxT("meio-dia"));
 	}
 
-	if (min == 0U)
+	if (min == 0U) {
-		words.Add(wxT("hora"));
+		if (hour == 1U || hour == 13U)
-	else if (min == 15U)
+			words.Add(wxT("hora"));
-		words.Add(wxT("e_quinze"));
+		else if (hour != 0U && hour != 12U)
+			words.Add(wxT("horas"));
+	} else if (min == 15U)
+		words.Add(wxT("e_um_quarto"));
 	else if (min == 30U)
 		words.Add(wxT("e_meia"));
 
+	if (hour > 0U && hour < 12U)
+		words.Add(wxT("da_manha"));
+	else if (hour > 12U && hour < 20U)
+		words.Add(wxT("da_tarde"));
+	else if (hour >= 20U && hour <= 23U)
+		words.Add(wxT("da_noite"));
+
 	return words;
 }
 

debian/opendv-base.install

@@ -20,6 +20,8 @@ usr/share/opendv/no_NO.ambe
 usr/share/opendv/no_NO.indx
 usr/share/opendv/pl_PL.ambe
 usr/share/opendv/pl_PL.indx
+usr/share/opendv/pt_PT.ambe
+usr/share/opendv/pt_PT.indx
 usr/share/opendv/se_SE.ambe
 usr/share/opendv/se_SE.indx
 usr/share/opendv/TIME_de_DE.ambe
@@ -30,5 +32,7 @@ usr/share/opendv/TIME_en_US.ambe
 usr/share/opendv/TIME_en_US.indx
 usr/share/opendv/TIME_fr_FR.ambe
 usr/share/opendv/TIME_fr_FR.indx
+usr/share/opendv/TIME_pt_PT.ambe
+usr/share/opendv/TIME_pt_PT.indx
 usr/share/opendv/TIME_se_SE.ambe
 usr/share/opendv/TIME_se_SE.indx

ircDDBGateway32.nsi

@@ -71,6 +71,8 @@ Section "Repeater Program Files" SecProgram
   File "Data\TIME_en_US.indx"
   File "Data\TIME_fr_FR.ambe"
   File "Data\TIME_fr_FR.indx"
+  File "Data\TIME_pt_PT.ambe"
+  File "Data\TIME_pt_PT.indx"
   File "Data\TIME_se_SE.ambe"
   File "Data\TIME_se_SE.indx"
   File "Data\de_DE.ambe"
@@ -91,6 +93,8 @@ Section "Repeater Program Files" SecProgram
   File "Data\no_NO.indx"
   File "Data\pl_PL.ambe"
   File "Data\pl_PL.indx"
+  File "Data\pt_PT.ambe"
+  File "Data\pt_PT.indx"
   File "Data\se_SE.ambe"
   File "Data\se_SE.indx"
 

ircDDBGateway64.nsi

@@ -71,6 +71,8 @@ Section "Repeater Program Files" SecProgram
   File "Data\TIME_en_US.indx"
   File "Data\TIME_fr_FR.ambe"
   File "Data\TIME_fr_FR.indx"
+  File "Data\TIME_pt_PT.ambe"
+  File "Data\TIME_pt_PT.indx"
   File "Data\TIME_se_SE.ambe"
   File "Data\TIME_se_SE.indx"
   File "Data\de_DE.ambe"
@@ -91,6 +93,8 @@ Section "Repeater Program Files" SecProgram
   File "Data\no_NO.indx"
   File "Data\pl_PL.ambe"
   File "Data\pl_PL.indx"
+  File "Data\pt_PT.ambe"
+  File "Data\pt_PT.indx"
   File "Data\se_SE.ambe"
   File "Data\se_SE.indx"