Skip to content

Commit

Permalink
Merge pull request #1757 from phl0/renameRecv
Browse files Browse the repository at this point in the history
  • Loading branch information
magicbug authored Nov 8, 2022
2 parents 161941d + 951be84 commit a9076bb
Show file tree
Hide file tree
Showing 24 changed files with 107 additions and 107 deletions.
6 changes: 3 additions & 3 deletions application/controllers/Dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ public function index()
$QSLStatsBreakdownArray =$this->logbook_model->get_QSLStats($logbooks_locations_array);

$data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent'];
$data['total_qsl_recv'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested'];

$data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent'];
$data['total_eqsl_recv'] = $QSLStatsBreakdownArray['eQSL_Received'];
$data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received'];

$data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent'];
$data['total_lotw_recv'] = $QSLStatsBreakdownArray['LoTW_Received'];
$data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received'];

$data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);

Expand Down
6 changes: 3 additions & 3 deletions application/controllers/Visitor.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ public function index($public_slug = NULL)
$QSLStatsBreakdownArray =$this->logbook_model->get_QSLStats($logbooks_locations_array);

$data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent'];
$data['total_qsl_recv'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested'];

$data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent'];
$data['total_eqsl_recv'] = $QSLStatsBreakdownArray['eQSL_Received'];
$data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received'];

$data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent'];
$data['total_lotw_recv'] = $QSLStatsBreakdownArray['LoTW_Received'];
$data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received'];

$data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);

Expand Down
4 changes: 2 additions & 2 deletions application/language/bulgarian/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
$lang['gen_hamradio_callsign'] = 'Инициал';
$lang['gen_hamradio_mode'] = 'Режим';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_recv'] = 'Recv\'d';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Обхват';
$lang['gen_hamradio_band_rx'] = 'Обхват (RX)';
$lang['gen_hamradio_frequency'] = 'Честота';
Expand All @@ -73,7 +73,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Локатор';
$lang['gen_hamradio_transmit_power'] = 'Мощност на предавателя (W)';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
$lang['gen_hamradio_callsign'] = '呼号';
$lang['gen_hamradio_mode'] = '模式';
$lang['gen_hamradio_rst_sent'] = '';
$lang['gen_hamradio_rst_recv'] = '';
$lang['gen_hamradio_rst_rcvd'] = '';
$lang['gen_hamradio_band'] = '频段';
$lang['gen_hamradio_band_rx'] = '频段 (RX)';
$lang['gen_hamradio_frequency'] = '频率';
Expand All @@ -73,7 +73,7 @@
$lang['gen_hamradio_rsts'] = '信号报告 (发)';
$lang['gen_hamradio_rstr'] = '信号报告 (收)';
$lang['gen_hamradio_exchange_sent_short'] = '信号交换 (发)';
$lang['gen_hamradio_exchange_recv_short'] = '信号交换 (收)';
$lang['gen_hamradio_exchange_rcvd_short'] = '信号交换 (收)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = '定位器';
$lang['gen_hamradio_transmit_power'] = '发射功率 (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/czech/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
$lang['gen_hamradio_callsign'] = 'Značka';
$lang['gen_hamradio_mode'] = 'Mód';
$lang['gen_hamradio_rst_sent'] = 'Odesláno';
$lang['gen_hamradio_rst_recv'] = 'Přijato';
$lang['gen_hamradio_rst_rcvd'] = 'Přijato';
$lang['gen_hamradio_band'] = 'Pásmo';
$lang['gen_hamradio_band_rx'] = 'Pásmo (RX)';
$lang['gen_hamradio_frequency'] = 'Kmitočet';
Expand All @@ -69,7 +69,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Lokátor';
$lang['gen_hamradio_transmit_power'] = 'Výkon (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/dutch/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
$lang['gen_hamradio_callsign'] = 'Roepletters';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Verzonden';
$lang['gen_hamradio_rst_recv'] = 'Ontvangen';
$lang['gen_hamradio_rst_rcvd'] = 'Ontvangen';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frequentie';
Expand All @@ -60,7 +60,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Verz (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Ontv (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Ontv (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Vermogen (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/english/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
$lang['gen_hamradio_callsign'] = 'Callsign';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_recv'] = 'Recv\'d';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frequency';
Expand All @@ -81,7 +81,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Transmit Power (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/finnish/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
$lang['gen_hamradio_callsign'] = 'Kutsumerkki';
$lang['gen_hamradio_mode'] = 'Lähetelaji';
$lang['gen_hamradio_rst_sent'] = 'Annettu raportti';
$lang['gen_hamradio_rst_recv'] = 'Saatu raportti';
$lang['gen_hamradio_rst_rcvd'] = 'Saatu raportti';
$lang['gen_hamradio_band'] = 'Bandi';
$lang['gen_hamradio_band_rx'] = 'Bandi (RX)';
$lang['gen_hamradio_frequency'] = 'Taajuus';
Expand All @@ -73,7 +73,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Lokaattori';
$lang['gen_hamradio_transmit_power'] = 'Lähetysteho (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/french/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
$lang['gen_hamradio_callsign'] = 'Indicatif';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Envoyé';
$lang['gen_hamradio_rst_recv'] = 'Reçu';
$lang['gen_hamradio_rst_rcvd'] = 'Reçu';
$lang['gen_hamradio_band'] = 'Bande';
$lang['gen_hamradio_band_rx'] = 'Bande (RX)';
$lang['gen_hamradio_frequency'] = 'Frequence';
Expand All @@ -69,7 +69,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Puissance Emission (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/german/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
$lang['gen_hamradio_callsign'] = 'Rufzeichen';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Gegeben';
$lang['gen_hamradio_rst_recv'] = 'Erhalten';
$lang['gen_hamradio_rst_rcvd'] = 'Erhalten';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frequenz';
Expand All @@ -80,7 +80,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Sendeleistung (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/italian/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
$lang['gen_hamradio_callsign'] = 'Nominativo';
$lang['gen_hamradio_mode'] = 'Modo';
$lang['gen_hamradio_rst_sent'] = 'Inviato';
$lang['gen_hamradio_rst_recv'] = 'Ricevuto';
$lang['gen_hamradio_rst_rcvd'] = 'Ricevuto';
$lang['gen_hamradio_band'] = 'Banda';
$lang['gen_hamradio_band_rx'] = 'Banda (RX)';
$lang['gen_hamradio_frequency'] = 'Frequenza';
Expand All @@ -81,7 +81,7 @@
$lang['gen_hamradio_rsts'] = 'RST (I)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Scambio (I)';
$lang['gen_hamradio_exchange_recv_short'] = 'Scambio (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Scambio (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locatore';
$lang['gen_hamradio_transmit_power'] = 'Potenza di Trasmissione (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/polish/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
$lang['gen_hamradio_callsign'] = 'Znak';
$lang['gen_hamradio_mode'] = 'Modulacja';
$lang['gen_hamradio_rst_sent'] = 'Wysłany';
$lang['gen_hamradio_rst_recv'] = 'Odebrany\'d';
$lang['gen_hamradio_rst_rcvd'] = 'Odebrany\'d';
$lang['gen_hamradio_band'] = 'Pasmo';
$lang['gen_hamradio_band_rx'] = 'Pasmo (RX)';
$lang['gen_hamradio_frequency'] = 'Częstotliwość';
Expand All @@ -75,7 +75,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Wymiana (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Wymiana (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Wymiana (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Lokator';
$lang['gen_hamradio_transmit_power'] = 'Moc nadajnika (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/spanish/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
$lang['gen_hamradio_callsign'] = 'Indicativo';
$lang['gen_hamradio_mode'] = 'Modo';
$lang['gen_hamradio_rst_sent'] = 'Enviado';
$lang['gen_hamradio_rst_recv'] = 'Recibido';
$lang['gen_hamradio_rst_rcvd'] = 'Recibido';
$lang['gen_hamradio_band'] = 'Banda';
$lang['gen_hamradio_band_rx'] = 'Banda (Recepción)';
$lang['gen_hamradio_frequency'] = 'Frecuencia';
Expand All @@ -73,7 +73,7 @@
$lang['gen_hamradio_rsts'] = 'RST (Enviada)';
$lang['gen_hamradio_rstr'] = 'RST (Recibida)';
$lang['gen_hamradio_exchange_sent_short'] = 'Intercambio (Env)';
$lang['gen_hamradio_exchange_recv_short'] = 'Intercambio (Recib)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Intercambio (Recib)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Localizador';
$lang['gen_hamradio_transmit_power'] = 'Potencia de transmisión (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/swedish/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
$lang['gen_hamradio_callsign'] = 'Signal';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Skickat';
$lang['gen_hamradio_rst_recv'] = 'Mottagen\'d';
$lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frekvens';
Expand All @@ -81,7 +81,7 @@
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Lokator';
$lang['gen_hamradio_transmit_power'] = 'Effekt (W)';
Expand Down
4 changes: 2 additions & 2 deletions application/language/turkish/general_words_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
$lang['gen_hamradio_callsign'] = 'Çagrı kodu';
$lang['gen_hamradio_mode'] = 'Mod';
$lang['gen_hamradio_rst_sent'] = 'Gönderilen';
$lang['gen_hamradio_rst_recv'] = 'Alınan';
$lang['gen_hamradio_rst_rcvd'] = 'Alınan';
$lang['gen_hamradio_band'] = 'Bant';
$lang['gen_hamradio_band_rx'] = 'Bant (RX)';
$lang['gen_hamradio_frequency'] = 'Frekans';
Expand All @@ -80,7 +80,7 @@
$lang['gen_hamradio_rsts'] = 'RST (G)';
$lang['gen_hamradio_rstr'] = 'RST (A)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (G)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (A)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (A)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Konum kodu';
$lang['gen_hamradio_transmit_power'] = 'Yayın Gücü (W)';
Expand Down
Loading

0 comments on commit a9076bb

Please sign in to comment.